From 5c370c0b2a93fcb0f1c1af04fb4d0f5451cb349c Mon Sep 17 00:00:00 2001 From: Default email Date: Wed, 15 May 2024 17:35:15 +0200 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 33d1e753c82ffc557b4a585c77de43d4c922ebb5 --- third_party/nixpkgs/.git-blame-ignore-revs | 9 + third_party/nixpkgs/.github/CODEOWNERS | 31 +- third_party/nixpkgs/.github/labeler.yml | 13 + .../nixpkgs/.github/workflows/backport.yml | 2 +- .../nixpkgs/.github/workflows/basic-eval.yml | 2 +- .../.github/workflows/check-by-name.yml | 36 +- .../.github/workflows/check-cherry-picks.yml | 2 +- .../workflows/check-maintainers-sorted.yaml | 2 +- .../.github/workflows/check-nix-format.yml | 11 +- .../.github/workflows/editorconfig.yml | 2 +- .../.github/workflows/manual-nixos.yml | 2 +- .../.github/workflows/manual-nixpkgs.yml | 2 +- .../nixpkgs/.github/workflows/nix-parse.yml | 2 +- .../.github/workflows/periodic-merge-24h.yml | 2 +- .../.github/workflows/periodic-merge-6h.yml | 2 +- .../workflows/update-terraform-providers.yml | 4 +- third_party/nixpkgs/CONTRIBUTING.md | 3 +- third_party/nixpkgs/doc/README.md | 4 +- .../special/fhs-environments.section.md | 8 +- third_party/nixpkgs/doc/default.nix | 2 +- third_party/nixpkgs/doc/hooks/zig.section.md | 4 +- .../doc/languages-frameworks/cuda.section.md | 2 +- .../doc/languages-frameworks/gnome.section.md | 38 +- .../doc/languages-frameworks/go.section.md | 2 +- .../languages-frameworks/haskell.section.md | 74 +- .../pkg-config.section.md | 12 +- .../languages-frameworks/python.section.md | 4 - .../nixpkgs/doc/stdenv/meta.chapter.md | 2 +- third_party/nixpkgs/lib/default.nix | 4 +- third_party/nixpkgs/lib/deprecated/README.md | 11 + .../{deprecated.nix => deprecated/misc.nix} | 0 third_party/nixpkgs/lib/fetchers.nix | 1 + third_party/nixpkgs/lib/gvariant.nix | 61 +- third_party/nixpkgs/lib/licenses.nix | 10 + third_party/nixpkgs/lib/lists.nix | 50 +- third_party/nixpkgs/lib/systems/default.nix | 2 + third_party/nixpkgs/lib/systems/doubles.nix | 2 +- third_party/nixpkgs/lib/systems/examples.nix | 7 +- third_party/nixpkgs/lib/systems/parse.nix | 6 +- third_party/nixpkgs/lib/tests/misc.nix | 27 + third_party/nixpkgs/lib/tests/release.nix | 2 +- third_party/nixpkgs/lib/tests/systems.nix | 6 +- .../nixpkgs/maintainers/maintainer-list.nix | 551 +- .../maintainers/scripts/eval-release.nix | 2 +- .../scripts/kde/collect-missing-deps.py | 4 + .../maintainers/scripts/luarocks-packages.csv | 43 +- third_party/nixpkgs/maintainers/team-list.nix | 35 +- .../configuration/abstractions.section.md | 4 +- .../profiles/graphical.section.md | 2 +- .../manual/configuration/x-windows.chapter.md | 4 +- .../nixpkgs/nixos/doc/manual/default.nix | 8 +- .../installing-from-other-distro.section.md | 4 +- .../installing-virtualbox-guest.section.md | 4 +- .../manual/installation/upgrading.chapter.md | 4 +- .../manual/release-notes/rl-2405.section.md | 330 +- third_party/nixpkgs/nixos/lib/qemu-common.nix | 2 + third_party/nixpkgs/nixos/lib/systemd-lib.nix | 93 +- .../nixpkgs/nixos/lib/systemd-types.nix | 32 +- .../nixos/lib/systemd-unit-options.nix | 8 + .../nixpkgs/nixos/lib/testing/driver.nix | 2 +- third_party/nixpkgs/nixos/lib/utils.nix | 8 +- .../nixpkgs/nixos/modules/config/malloc.nix | 19 +- .../nixos/modules/config/no-x-libs.nix | 5 +- .../nixpkgs/nixos/modules/config/terminfo.nix | 2 +- .../modules/config/xdg/terminal-exec.nix | 54 + .../nixos/modules/hardware/openrazer.nix | 61 +- .../hardware/video/intel-gpu-tools.nix | 25 + .../nixos/modules/installer/tools/tools.nix | 2 +- .../nixos/modules/misc/documentation.nix | 1 + .../nixpkgs/nixos/modules/module-list.nix | 19 +- .../nixos/modules/profiles/graphical.nix | 6 +- .../nixos/modules/profiles/perlless.nix | 2 +- .../nixos/modules/programs/_1password-gui.nix | 16 +- .../nixos/modules/programs/_1password.nix | 10 +- .../nixpkgs/nixos/modules/programs/adb.nix | 10 +- .../nixpkgs/nixos/modules/programs/alvr.nix | 16 +- .../nixos/modules/programs/appgate-sdp.nix | 6 +- .../nixpkgs/nixos/modules/programs/atop.nix | 54 +- .../nixos/modules/programs/ausweisapp.nix | 8 +- .../nixos/modules/programs/autojump.nix | 12 +- .../nixos/modules/programs/bandwhich.nix | 10 +- .../nixos/modules/programs/bash-my-aws.nix | 6 +- .../modules/programs/bash/bash-completion.nix | 6 +- .../nixos/modules/programs/bash/bash.nix | 48 +- .../nixos/modules/programs/bash/blesh.nix | 9 +- .../nixos/modules/programs/bash/ls-colors.nix | 6 +- .../modules/programs/bash/undistract-me.nix | 16 +- .../nixos/modules/programs/browserpass.nix | 6 +- .../nixpkgs/nixos/modules/programs/calls.nix | 6 +- .../nixpkgs/nixos/modules/programs/cdemu.nix | 24 +- .../nixos/modules/programs/cfs-zen-tweaks.nix | 8 +- .../nixos/modules/programs/chromium.nix | 44 +- .../nixpkgs/nixos/modules/programs/cnping.nix | 6 +- .../command-not-found/command-not-found.nix | 12 +- .../nixpkgs/nixos/modules/programs/criu.nix | 8 +- .../programs/digitalbitbox/default.nix | 10 +- .../nixos/modules/programs/dmrconfig.nix | 12 +- .../nixos/modules/programs/droidcam.nix | 4 +- .../modules/programs/dublin-traceroute.nix | 10 +- .../nixos/modules/programs/ecryptfs.nix | 6 +- .../nixos/modules/programs/environment.nix | 10 +- .../nixpkgs/nixos/modules/programs/evince.nix | 15 +- .../modules/programs/extra-container.nix | 5 +- .../nixos/modules/programs/feedbackd.nix | 8 +- .../nixos/modules/programs/file-roller.nix | 15 +- .../nixos/modules/programs/firefox.nix | 52 +- .../nixos/modules/programs/firejail.nix | 40 +- .../nixpkgs/nixos/modules/programs/fish.nix | 86 +- .../nixos/modules/programs/flashrom.nix | 10 +- .../nixos/modules/programs/flexoptix-app.nix | 8 +- .../nixos/modules/programs/freetds.nix | 12 +- .../nixpkgs/nixos/modules/programs/fuse.nix | 16 +- .../nixpkgs/nixos/modules/programs/fzf.nix | 5 +- .../nixos/modules/programs/gamemode.nix | 20 +- .../nixos/modules/programs/gamescope.nix | 36 +- .../nixpkgs/nixos/modules/programs/geary.nix | 8 +- .../nixpkgs/nixos/modules/programs/git.nix | 34 +- .../nixos/modules/programs/gnome-disks.nix | 17 +- .../nixos/modules/programs/gnome-terminal.nix | 15 +- .../nixpkgs/nixos/modules/programs/gpaste.nix | 15 +- .../nixos/modules/programs/gphoto2.nix | 10 +- .../nixos/modules/programs/haguichi.nix | 6 +- .../nixos/modules/programs/hamster.nix | 4 +- .../nixpkgs/nixos/modules/programs/htop.nix | 24 +- .../nixpkgs/nixos/modules/programs/i3lock.nix | 14 +- .../nixpkgs/nixos/modules/programs/iftop.nix | 6 +- .../nixpkgs/nixos/modules/programs/iotop.nix | 6 +- .../nixpkgs/nixos/modules/programs/java.nix | 12 +- .../modules/programs/joycond-cemuhook.nix | 3 +- .../nixpkgs/nixos/modules/programs/k3b.nix | 8 +- .../nixos/modules/programs/k40-whisperer.nix | 12 +- .../nixos/modules/programs/kbdlight.nix | 6 +- .../nixpkgs/nixos/modules/programs/kclock.nix | 5 +- .../nixos/modules/programs/kdeconnect.nix | 7 +- .../nixpkgs/nixos/modules/programs/less.nix | 64 +- .../nixos/modules/programs/liboping.nix | 8 +- .../nixpkgs/nixos/modules/programs/light.nix | 20 +- .../nixos/modules/programs/mdevctl.nix | 5 +- .../nixpkgs/nixos/modules/programs/mepo.nix | 17 +- .../nixos/modules/programs/mininet.nix | 6 +- .../nixpkgs/nixos/modules/programs/msmtp.nix | 32 +- .../nixpkgs/nixos/modules/programs/mtr.nix | 12 +- .../nixpkgs/nixos/modules/programs/nbd.nix | 6 +- .../nixpkgs/nixos/modules/programs/neovim.nix | 76 +- .../nixos/modules/programs/nethoscope.nix | 10 +- .../nixpkgs/nixos/modules/programs/nncp.nix | 23 +- .../nixos/modules/programs/noisetorch.nix | 8 +- .../nixpkgs/nixos/modules/programs/npm.nix | 8 +- .../nixos/modules/programs/oblogout.nix | 4 +- .../nixos/modules/programs/openvpn3.nix | 12 +- .../modules/programs/pantheon-tweaks.nix | 8 +- .../nixos/modules/programs/plotinus.nix | 8 +- .../nixos/modules/programs/proxychains.nix | 71 +- .../nixpkgs/nixos/modules/programs/qt5ct.nix | 4 +- .../nixos/modules/programs/rust-motd.nix | 34 +- .../nixos/modules/programs/seahorse.nix | 16 +- .../nixos/modules/programs/sedutil.nix | 6 +- .../nixpkgs/nixos/modules/programs/shadow.nix | 53 +- .../nixos/modules/programs/sharing.nix | 5 +- .../nixos/modules/programs/singularity.nix | 63 +- .../nixpkgs/nixos/modules/programs/slock.nix | 10 +- .../nixos/modules/programs/soundmodem.nix | 10 +- .../nixos/modules/programs/spacefm.nix | 16 +- .../nixpkgs/nixos/modules/programs/ssh.nix | 136 +- .../nixpkgs/nixos/modules/programs/steam.nix | 72 +- .../nixos/modules/programs/streamdeck-ui.nix | 18 +- .../nixpkgs/nixos/modules/programs/sysdig.nix | 6 +- .../programs/system-config-printer.nix | 6 +- .../nixos/modules/programs/systemtap.nix | 8 +- .../nixos/modules/programs/thefuck.nix | 14 +- .../nixpkgs/nixos/modules/programs/thunar.nix | 14 +- .../nixos/modules/programs/traceroute.nix | 8 +- .../nixos/modules/programs/turbovnc.nix | 8 +- .../nixpkgs/nixos/modules/programs/udevil.nix | 6 +- .../nixpkgs/nixos/modules/programs/usbtop.nix | 6 +- .../nixpkgs/nixos/modules/programs/vim.nix | 12 +- .../nixos/modules/programs/wavemon.nix | 8 +- .../modules/programs/wayland/hyprland.nix | 42 +- .../nixos/modules/programs/wayland/river.nix | 22 +- .../nixos/modules/programs/wayland/sway.nix | 50 +- .../nixos/modules/programs/wayland/waybar.nix | 10 +- .../programs/wayland/wayland-session.nix | 12 +- .../nixpkgs/nixos/modules/programs/weylus.nix | 16 +- .../nixos/modules/programs/wireshark.nix | 10 +- .../nixos/modules/programs/wshowkeys.nix | 34 +- .../nixpkgs/nixos/modules/programs/xastir.nix | 8 +- .../nixpkgs/nixos/modules/programs/xfconf.nix | 8 +- .../nixos/modules/programs/xfs_quota.nix | 48 +- .../nixpkgs/nixos/modules/programs/xonsh.nix | 14 +- .../nixos/modules/programs/xss-lock.nix | 29 +- .../nixos/modules/programs/xwayland.nix | 20 +- .../nixpkgs/nixos/modules/programs/yabar.nix | 60 +- .../nixos/modules/programs/ydotool.nix | 83 + .../nixpkgs/nixos/modules/programs/zmap.nix | 6 +- .../nixos/modules/programs/zsh/oh-my-zsh.nix | 52 +- .../modules/programs/zsh/zsh-autoenv.nix | 8 +- .../programs/zsh/zsh-autosuggestions.nix | 32 +- .../programs/zsh/zsh-syntax-highlighting.nix | 50 +- .../nixos/modules/programs/zsh/zsh.nix | 86 +- .../nixos/modules/security/isolate.nix | 133 + .../nixpkgs/nixos/modules/security/pam.nix | 4 +- .../modules/security/systemd-confinement.nix | 36 +- .../modules/services/audio/navidrome.nix | 162 +- .../modules/services/backup/borgbackup.nix | 32 +- .../nixos/modules/services/backup/restic.nix | 19 +- .../modules/services/backup/znapzend.nix | 10 + .../modules/services/cluster/k3s/default.nix | 44 +- .../modules/services/databases/postgresql.nix | 35 +- .../modules/services/databases/redis.nix | 11 +- .../services/desktop-managers/plasma6.nix | 11 +- .../services/desktops/gnome/at-spi2-core.nix | 23 +- .../desktops/gnome/evolution-data-server.nix | 36 +- .../desktops/gnome/glib-networking.nix | 16 +- .../gnome/gnome-browser-connector.nix | 13 - .../desktops/gnome/gnome-initial-setup.nix | 18 +- .../services/desktops/gnome/gnome-keyring.nix | 18 +- .../desktops/gnome/gnome-online-accounts.nix | 18 +- .../desktops/gnome/gnome-online-miners.nix | 18 +- .../desktops/gnome/gnome-remote-desktop.nix | 30 +- .../desktops/gnome/gnome-settings-daemon.nix | 20 +- .../desktops/gnome/gnome-user-share.nix | 16 +- .../modules/services/desktops/gnome/rygel.nix | 18 +- .../modules/services/desktops/gnome/sushi.nix | 18 +- .../desktops/gnome/tracker-miners.nix | 18 +- .../services/desktops/gnome/tracker.nix | 22 +- .../nixos/modules/services/desktops/gvfs.nix | 17 +- .../desktops/pipewire/wireplumber.nix | 183 +- .../services/display-managers/default.nix | 35 +- .../services/display-managers/greetd.nix | 14 +- .../services/display-managers/sddm.nix | 4 +- .../nixos/modules/services/editors/emacs.md | 41 - .../modules/services/hardware/kanata.nix | 49 +- .../services/{x11 => }/hardware/libinput.nix | 12 +- .../cdi-generate.nix | 60 - .../default.nix | 40 - .../nvidia-container-toolkit/cdi-generate.nix | 35 + .../nvidia-container-toolkit/default.nix | 127 + .../modules/services/hardware/thermald.nix | 4 +- .../nixos/modules/services/hardware/udev.nix | 14 +- .../services/home-automation/ebusd.nix | 159 +- .../modules/services/home-automation/evcc.nix | 1 + .../wyoming/faster-whisper.nix | 2 + .../modules/services/logging/logrotate.nix | 2 +- .../modules/services/logging/promtail.nix | 4 + .../nixos/modules/services/mail/mailman.nix | 11 +- .../nixos/modules/services/mail/roundcube.nix | 7 +- .../modules/services/mail/stalwart-mail.nix | 1 + .../services/matrix/appservice-irc.nix | 3 +- .../nixos/modules/services/matrix/conduit.nix | 4 +- .../services/matrix/mautrix-signal.nix | 249 + .../nixos/modules/services/misc/bcg.nix | 6 +- .../modules/services/misc/devpi-server.nix | 128 + .../nixos/modules/services/misc/gitea.nix | 2 +- .../nixos/modules/services/misc/gitlab.nix | 46 +- .../modules/services/misc/heisenbridge.nix | 2 +- .../nixos/modules/services/misc/portunus.nix | 14 +- .../modules/services/misc/private-gpt.nix | 121 + .../nixos/modules/services/misc/tzupdate.nix | 2 +- .../nixos/modules/services/misc/wastebin.nix | 2 +- .../modules/services/misc/zoneminder.nix | 2 +- .../modules/services/monitoring/arbtt.nix | 2 +- .../services/monitoring/parsedmarc.nix | 8 +- .../prometheus/exporters/apcupsd.nix | 3 +- .../prometheus/exporters/artifactory.nix | 3 +- .../monitoring/prometheus/exporters/bind.nix | 3 +- .../monitoring/prometheus/exporters/bird.nix | 8 +- .../prometheus/exporters/bitcoin.nix | 7 +- .../prometheus/exporters/blackbox.nix | 8 +- .../prometheus/exporters/buildkite-agent.nix | 9 +- .../prometheus/exporters/collectd.nix | 10 +- .../monitoring/prometheus/exporters/dmarc.nix | 3 +- .../prometheus/exporters/dnsmasq.nix | 8 +- .../prometheus/exporters/domain.nix | 3 +- .../prometheus/exporters/dovecot.nix | 8 +- .../monitoring/prometheus/exporters/flow.nix | 9 +- .../prometheus/exporters/fritzbox.nix | 3 +- .../monitoring/prometheus/exporters/idrac.nix | 2 +- .../prometheus/exporters/imap-mailstat.nix | 11 +- .../prometheus/exporters/influxdb.nix | 3 +- .../monitoring/prometheus/exporters/ipmi.nix | 9 +- .../monitoring/prometheus/exporters/jitsi.nix | 8 +- .../monitoring/prometheus/exporters/json.nix | 9 +- .../prometheus/exporters/junos-czerwonk.nix | 9 +- .../monitoring/prometheus/exporters/kea.nix | 8 +- .../prometheus/exporters/keylight.nix | 3 +- .../monitoring/prometheus/exporters/knot.nix | 8 +- .../monitoring/prometheus/exporters/lnd.nix | 3 +- .../monitoring/prometheus/exporters/mail.nix | 14 +- .../prometheus/exporters/mikrotik.nix | 9 +- .../monitoring/prometheus/exporters/minio.nix | 9 +- .../prometheus/exporters/modemmanager.nix | 3 +- .../prometheus/exporters/mongodb.nix | 12 +- .../monitoring/prometheus/exporters/nats.nix | 5 +- .../prometheus/exporters/nextcloud.nix | 8 +- .../monitoring/prometheus/exporters/nginx.nix | 11 +- .../prometheus/exporters/nginxlog.nix | 3 +- .../monitoring/prometheus/exporters/node.nix | 10 +- .../monitoring/prometheus/exporters/nut.nix | 8 +- .../prometheus/exporters/openldap.nix | 3 +- .../prometheus/exporters/pgbouncer.nix | 9 +- .../prometheus/exporters/pihole.nix | 8 +- .../monitoring/prometheus/exporters/ping.nix | 2 +- .../prometheus/exporters/postfix.nix | 10 +- .../prometheus/exporters/postgres.nix | 9 +- .../prometheus/exporters/process.nix | 8 +- .../monitoring/prometheus/exporters/pve.nix | 8 +- .../prometheus/exporters/py-air-control.nix | 3 +- .../monitoring/prometheus/exporters/redis.nix | 3 +- .../prometheus/exporters/restic.nix | 13 +- .../prometheus/exporters/rspamd.nix | 11 +- .../prometheus/exporters/script.nix | 8 +- .../prometheus/exporters/shelly.nix | 3 +- .../prometheus/exporters/smartctl.nix | 3 +- .../prometheus/exporters/smokeping.nix | 3 +- .../monitoring/prometheus/exporters/snmp.nix | 9 +- .../monitoring/prometheus/exporters/sql.nix | 8 +- .../prometheus/exporters/statsd.nix | 3 +- .../prometheus/exporters/surfboard.nix | 3 +- .../prometheus/exporters/systemd.nix | 7 +- .../monitoring/prometheus/exporters/tor.nix | 3 +- .../prometheus/exporters/unbound.nix | 11 +- .../monitoring/prometheus/exporters/unifi.nix | 9 +- .../prometheus/exporters/unpoller.nix | 3 +- .../monitoring/prometheus/exporters/v2ray.nix | 3 +- .../prometheus/exporters/varnish.nix | 10 +- .../prometheus/exporters/wireguard.nix | 10 +- .../monitoring/prometheus/exporters/zfs.nix | 7 +- .../services/monitoring/rustdesk-server.nix | 6 +- .../modules/services/monitoring/vmagent.nix | 116 +- .../services/networking/adguardhome.nix | 120 +- .../modules/services/networking/clatd.nix | 81 + .../services/networking/firewall-nftables.nix | 18 + .../modules/services/networking/hostapd.nix | 17 +- .../modules/services/networking/inadyn.nix | 250 + .../modules/services/networking/jotta-cli.md | 27 + .../modules/services/networking/jotta-cli.nix | 43 + .../modules/services/networking/knot.nix | 2 +- .../services/networking/netbird/coturn.nix | 6 +- .../services/networking/networkmanager.nix | 2 +- .../modules/services/networking/pixiecore.nix | 6 +- .../modules/services/networking/pppd.nix | 2 +- .../modules/services/networking/radvd.nix | 13 +- .../modules/services/networking/smokeping.nix | 63 +- .../modules/services/networking/ssh/sshd.nix | 21 +- .../modules/services/networking/sunshine.nix | 15 +- .../modules/services/networking/tailscale.nix | 2 +- .../modules/services/networking/tayga.nix | 26 +- .../modules/services/networking/trust-dns.nix | 6 +- .../modules/services/networking/vsftpd.nix | 2 +- .../services/security/oauth2-proxy-nginx.nix | 130 + .../{oauth2_proxy.nix => oauth2-proxy.nix} | 257 +- .../services/security/oauth2_proxy_nginx.nix | 91 - .../modules/services/security/step-ca.nix | 2 +- .../nixos/modules/services/security/vault.nix | 4 +- .../services/security/vaultwarden/default.nix | 16 +- .../nixos/modules/services/system/dbus.nix | 14 +- .../modules/services/web-apps/akkoma.nix | 6 +- .../modules/services/web-apps/castopod.nix | 2 +- .../nixos/modules/services/web-apps/coder.nix | 3 +- .../modules/services/web-apps/gotosocial.nix | 2 +- .../modules/services/web-apps/keycloak.nix | 2 +- .../modules/services/web-apps/limesurvey.nix | 16 +- .../modules/services/web-apps/mediawiki.nix | 4 +- .../modules/services/web-apps/miniflux.nix | 15 +- .../nixos/modules/services/web-apps/movim.nix | 22 +- .../modules/services/web-apps/nextcloud.md | 23 +- .../modules/services/web-apps/nextcloud.nix | 30 +- .../modules/services/web-apps/plausible.nix | 9 +- .../modules/services/web-apps/pretalx.nix | 57 +- .../modules/services/web-apps/pretix.nix | 12 +- .../services/web-apps/your_spotify.nix | 191 + .../services/web-servers/caddy/default.nix | 5 +- .../modules/services/web-servers/garage.nix | 45 +- .../services/web-servers/nginx/default.nix | 14 +- .../modules/services/web-servers/traefik.nix | 2 +- .../services/x11/desktop-managers/budgie.nix | 2 +- .../x11/desktop-managers/cinnamon.nix | 3 +- .../services/x11/desktop-managers/deepin.nix | 2 +- .../services/x11/desktop-managers/default.nix | 20 +- .../x11/desktop-managers/enlightenment.nix | 2 +- .../services/x11/desktop-managers/gnome.nix | 103 +- .../services/x11/desktop-managers/lxqt.nix | 2 +- .../services/x11/desktop-managers/mate.nix | 3 +- .../x11/desktop-managers/pantheon.nix | 2 +- .../services/x11/desktop-managers/plasma5.nix | 2 +- .../services/x11/desktop-managers/xfce.nix | 2 +- .../services/x11/display-managers/default.nix | 30 +- .../modules/services/x11/hardware/cmt.nix | 4 +- .../services/x11/hardware/synaptics.nix | 6 +- .../services/x11/window-managers/clfswm.nix | 2 +- .../services/x11/window-managers/default.nix | 14 +- .../nixos/modules/services/x11/xserver.nix | 3 - .../activation/switch-to-configuration.pl | 3 + .../system/activation/switchable-system.nix | 107 +- .../nixos/modules/system/activation/test.nix | 4 +- .../modules/system/activation/top-level.nix | 23 +- .../nixos/modules/system/boot/binfmt.nix | 2 +- .../modules/system/boot/loader/grub/grub.nix | 5 +- .../boot/loader/systemd-boot/systemd-boot.nix | 28 +- .../nixos/modules/system/boot/networkd.nix | 2 + .../nixos/modules/system/boot/systemd.nix | 23 +- .../modules/system/boot/systemd/initrd.nix | 16 +- .../modules/system/boot/systemd/user.nix | 12 +- .../nixos/modules/tasks/filesystems/zfs.nix | 34 +- .../modules/testing/test-instrumentation.nix | 2 + .../modules/virtualisation/containers.nix | 62 +- .../virtualisation/digital-ocean-config.nix | 2 +- .../nixos/modules/virtualisation/incus.nix | 99 +- .../nixos/modules/virtualisation/lxc.nix | 9 +- .../nixos/modules/virtualisation/lxd.nix | 9 +- .../modules/virtualisation/podman/default.nix | 10 +- .../nixos/modules/virtualisation/qemu-vm.nix | 18 +- .../nixpkgs/nixos/release-combined.nix | 8 +- third_party/nixpkgs/nixos/release-small.nix | 4 +- third_party/nixpkgs/nixos/tests/acme.nix | 32 +- .../nixpkgs/nixos/tests/adguardhome.nix | 85 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 20 +- third_party/nixpkgs/nixos/tests/archi.nix | 4 +- third_party/nixpkgs/nixos/tests/avahi.nix | 2 +- .../nixpkgs/nixos/tests/bittorrent.nix | 2 +- third_party/nixpkgs/nixos/tests/caddy.nix | 2 +- third_party/nixpkgs/nixos/tests/castopod.nix | 2 +- third_party/nixpkgs/nixos/tests/clatd.nix | 189 + third_party/nixpkgs/nixos/tests/coder.nix | 4 +- .../nixpkgs/nixos/tests/containers-bridge.nix | 2 +- .../nixos/tests/containers-imperative.nix | 2 +- .../nixpkgs/nixos/tests/containers-ip.nix | 2 +- .../nixos/tests/containers-portforward.nix | 2 +- .../nixpkgs/nixos/tests/devpi-server.nix | 35 + third_party/nixpkgs/nixos/tests/elk.nix | 2 +- .../nixpkgs/nixos/tests/fcitx5/default.nix | 3 + third_party/nixpkgs/nixos/tests/firefox.nix | 6 +- third_party/nixpkgs/nixos/tests/firewall.nix | 2 +- third_party/nixpkgs/nixos/tests/fish.nix | 2 + third_party/nixpkgs/nixos/tests/forgejo.nix | 6 +- .../nixpkgs/nixos/tests/garage/default.nix | 1 + .../tests/garage/with-3node-replication.nix | 8 +- third_party/nixpkgs/nixos/tests/gvisor.nix | 2 +- .../nixpkgs/nixos/tests/incus/container.nix | 88 +- .../nixpkgs/nixos/tests/incus/default.nix | 21 +- .../nixos/tests/incus/incusd-options.nix | 110 + .../nixos/tests/incus/lxd-to-incus.nix | 12 +- .../nixpkgs/nixos/tests/incus/openvswitch.nix | 8 +- .../nixpkgs/nixos/tests/incus/preseed.nix | 63 - .../nixos/tests/incus/socket-activated.nix | 9 +- .../nixpkgs/nixos/tests/incus/storage.nix | 12 +- third_party/nixpkgs/nixos/tests/incus/ui.nix | 7 +- .../nixos/tests/incus/virtual-machine.nix | 24 +- .../nixpkgs/nixos/tests/initrd-network.nix | 2 +- .../nixos/tests/installed-tests/default.nix | 2 +- .../tests/installed-tests/gnome-photos.nix | 2 +- third_party/nixpkgs/nixos/tests/ipv6.nix | 2 +- third_party/nixpkgs/nixos/tests/isolate.nix | 38 + third_party/nixpkgs/nixos/tests/jenkins.nix | 2 +- third_party/nixpkgs/nixos/tests/jotta-cli.nix | 25 + .../nixpkgs/nixos/tests/k3s/default.nix | 18 +- third_party/nixpkgs/nixos/tests/k3s/etcd.nix | 196 +- .../nixpkgs/nixos/tests/k3s/multi-node.nix | 218 +- .../nixpkgs/nixos/tests/k3s/single-node.nix | 131 +- third_party/nixpkgs/nixos/tests/kanidm.nix | 19 +- third_party/nixpkgs/nixos/tests/knot.nix | 4 + third_party/nixpkgs/nixos/tests/libinput.nix | 2 +- third_party/nixpkgs/nixos/tests/libreswan.nix | 6 +- third_party/nixpkgs/nixos/tests/login.nix | 2 +- third_party/nixpkgs/nixos/tests/logrotate.nix | 90 +- third_party/nixpkgs/nixos/tests/misc.nix | 287 +- third_party/nixpkgs/nixos/tests/mumble.nix | 2 +- third_party/nixpkgs/nixos/tests/munin.nix | 2 +- third_party/nixpkgs/nixos/tests/nat.nix | 2 +- .../nixpkgs/nixos/tests/nextcloud/default.nix | 2 +- .../nixpkgs/nixos/tests/nfs/simple.nix | 2 +- third_party/nixpkgs/nixos/tests/nginx-sso.nix | 2 +- third_party/nixpkgs/nixos/tests/openssh.nix | 94 +- third_party/nixpkgs/nixos/tests/patroni.nix | 2 +- .../nixpkgs/nixos/tests/pgvecto-rs.nix | 2 +- .../nixpkgs/nixos/tests/postgresql-jit.nix | 15 +- .../nixos/tests/postgresql-wal-receiver.nix | 198 +- third_party/nixpkgs/nixos/tests/printing.nix | 2 +- .../nixpkgs/nixos/tests/private-gpt.nix | 27 + .../nixos/tests/prometheus-exporters.nix | 2 +- third_party/nixpkgs/nixos/tests/promscale.nix | 60 - third_party/nixpkgs/nixos/tests/proxy.nix | 2 +- third_party/nixpkgs/nixos/tests/qtile.nix | 34 + third_party/nixpkgs/nixos/tests/quake3.nix | 2 +- third_party/nixpkgs/nixos/tests/rabbitmq.nix | 2 +- third_party/nixpkgs/nixos/tests/radicale.nix | 2 +- third_party/nixpkgs/nixos/tests/samba.nix | 2 +- third_party/nixpkgs/nixos/tests/simple.nix | 2 +- third_party/nixpkgs/nixos/tests/smokeping.nix | 14 +- third_party/nixpkgs/nixos/tests/ssh-keys.nix | 12 + .../nixpkgs/nixos/tests/stalwart-mail.nix | 12 +- third_party/nixpkgs/nixos/tests/swayfx.nix | 207 + .../nixpkgs/nixos/tests/switch-test.nix | 28 +- .../nixpkgs/nixos/tests/syncthing-relay.nix | 2 +- .../nixos/tests/systemd-confinement.nix | 184 - .../tests/systemd-confinement/checkperms.py | 187 + .../tests/systemd-confinement/default.nix | 274 + .../nixos/tests/systemd-initrd-modprobe.nix | 12 +- third_party/nixpkgs/nixos/tests/systemd.nix | 13 +- third_party/nixpkgs/nixos/tests/tayga.nix | 19 +- third_party/nixpkgs/nixos/tests/udisks2.nix | 3 +- .../nixpkgs/nixos/tests/virtualbox.nix | 1 - .../nixos/tests/web-apps/gotosocial.nix | 2 +- .../nixpkgs/nixos/tests/web-apps/pretalx.nix | 4 + third_party/nixpkgs/nixos/tests/ydotool.nix | 115 + .../nixpkgs/nixos/tests/your_spotify.nix | 33 + .../accessibility/dasher/default.nix | 4 +- .../accessibility/mousetweaks/default.nix | 6 +- .../accessibility/squeekboard/default.nix | 18 +- .../accessibility/wvkbd/default.nix | 4 +- .../applications/audio/ardour/default.nix | 4 +- .../pkgs/applications/audio/ario/default.nix | 4 +- .../applications/audio/audacious/plugins.nix | 5 + .../applications/audio/audacity/default.nix | 8 +- .../audio/audio-recorder/default.nix | 4 +- .../audio/bambootracker/default.nix | 8 +- .../pkgs/applications/audio/beast/patch.patch | 187 - .../audio/bitwig-studio/bitwig-studio3.nix | 4 +- .../audio/bitwig-studio/bitwig-studio4.nix | 4 +- .../audio/bitwig-studio/bitwig-studio5.nix | 8 +- .../applications/audio/buzztrax/default.nix | 4 +- .../applications/audio/castopod/default.nix | 2 +- .../pkgs/applications/audio/cava/default.nix | 4 +- .../pkgs/applications/audio/cider/default.nix | 2 - .../audio/cmus/option-debugging.patch | 42 - .../audio/csound/csound-qt/default.nix | 8 +- .../applications/audio/deadbeef/default.nix | 4 +- .../applications/audio/denemo/default.nix | 4 +- .../applications/audio/easyabc/default.nix | 4 +- .../applications/audio/easytag/default.nix | 6 +- .../audio/ensemble-chorus/default.nix | 5 + .../juice-cxx-packing-fix.diff | 55 + .../applications/audio/exaile/default.nix | 4 +- .../pkgs/applications/audio/faust/faust2.nix | 12 +- .../applications/audio/feishin/default.nix | 123 +- .../applications/audio/flac123/default.nix | 22 - .../applications/audio/flacon/default.nix | 4 +- .../applications/audio/ft2-clone/default.nix | 4 +- .../applications/audio/g4music/default.nix | 4 +- .../audio/galaxy-buds-client/default.nix | 2 - .../applications/audio/gbsplay/default.nix | 32 - .../pkgs/applications/audio/gmpc/default.nix | 4 +- .../audio/gnome-podcasts/default.nix | 2 +- .../audio/go-musicfox/default.nix | 6 +- .../applications/audio/goodvibes/default.nix | 4 +- .../applications/audio/gpodder/default.nix | 4 +- .../applications/audio/grandorgue/default.nix | 4 +- .../applications/audio/gspeech/default.nix | 4 +- .../applications/audio/gst123/default.nix | 4 +- .../applications/audio/guitarix/default.nix | 4 +- .../audio/hivelytracker/default.nix | 4 +- .../applications/audio/hushboard/default.nix | 4 +- .../indicator-sound-switcher/default.nix | 4 +- .../applications/audio/jmusicbot/default.nix | 4 +- .../applications/audio/lingot/default.nix | 4 +- .../audio/listenbrainz-mpd/default.nix | 6 +- .../audio/littlegptracker/default.nix | 2 +- .../applications/audio/lollypop/default.nix | 64 +- .../applications/audio/lyrebird/default.nix | 4 +- .../pkgs/applications/audio/mixxx/default.nix | 11 +- .../applications/audio/mmlgui/default.nix | 6 +- .../audio/monkeys-audio/default.nix | 4 +- .../applications/audio/mopidy/spotify.nix | 6 +- .../applications/audio/mopidy/youtube.nix | 3 +- .../applications/audio/mpdevil/default.nix | 6 +- .../applications/audio/mpg321/default.nix | 53 - .../pkgs/applications/audio/muse/default.nix | 2 +- .../applications/audio/museeks/default.nix | 2 - .../applications/audio/musescore/default.nix | 9 +- .../audio/music-player/default.nix | 2 +- .../pkgs/applications/audio/muso/default.nix | 4 +- .../pkgs/applications/audio/mympd/default.nix | 4 +- .../applications/audio/ncspot/default.nix | 8 +- .../applications/audio/nuclear/default.nix | 4 - .../applications/audio/opustags/default.nix | 4 +- .../applications/audio/paprefs/default.nix | 4 +- .../audio/pavucontrol/default.nix | 4 +- .../applications/audio/pithos/default.nix | 4 +- .../applications/audio/plexamp/default.nix | 6 +- .../pkgs/applications/audio/praat/default.nix | 8 +- .../applications/audio/pt2-clone/default.nix | 4 +- .../audio/pulseeffects-legacy/default.nix | 4 +- .../applications/audio/pyradio/default.nix | 10 +- .../pkgs/applications/audio/qmmp/default.nix | 4 +- .../applications/audio/qpwgraph/default.nix | 4 +- .../applications/audio/qsynth/default.nix | 4 +- .../applications/audio/quodlibet/default.nix | 4 +- .../audio/radiotray-ng/default.nix | 4 +- .../applications/audio/reaper/default.nix | 8 +- .../applications/audio/rhythmbox/default.nix | 6 +- .../audio/roomeqwizard/default.nix | 4 +- .../pkgs/applications/audio/sfxr/default.nix | 4 +- .../applications/audio/snapcast/default.nix | 17 +- .../pkgs/applications/audio/snd/default.nix | 4 +- .../applications/audio/sonata/default.nix | 4 +- .../applications/audio/sonic-pi/default.nix | 9 +- .../applications/audio/sonixd/default.nix | 3 - .../audio/sound-juicer/default.nix | 6 +- .../audio/soundconverter/default.nix | 4 +- .../audio/soundsource/default.nix | 6 +- .../pkgs/applications/audio/spek/default.nix | 4 +- .../pkgs/applications/audio/spot/default.nix | 20 +- .../audio/spotify-player/default.nix | 6 +- .../pkgs/applications/audio/spotify/linux.nix | 4 +- .../applications/audio/spotifyd/default.nix | 2 +- .../audio/squeezelite/default.nix | 6 +- .../audio/sublime-music/default.nix | 4 +- .../applications/audio/surge-XT/default.nix | 4 +- .../applications/audio/tidal-hifi/default.nix | 4 +- .../applications/audio/touchosc/default.nix | 8 +- .../applications/audio/transcribe/default.nix | 4 +- .../pkgs/applications/audio/tuner/default.nix | 4 +- .../applications/audio/vcv-rack/default.nix | 5 +- .../audio/vgmplay-libvgm/default.nix | 2 +- .../applications/audio/vgmstream/default.nix | 28 +- .../audio/virtual-ans/default.nix | 4 +- .../pkgs/applications/audio/vocal/default.nix | 4 +- .../applications/audio/waylyrics/default.nix | 26 +- .../pkgs/applications/audio/ymuse/default.nix | 4 +- .../audio/youtube-music/default.nix | 12 +- .../applications/audio/zrythm/default.nix | 103 +- .../backup/areca/fix-javah-bug.diff | 24 - .../applications/backup/deja-dup/default.nix | 2 +- .../applications/backup/ludusavi/default.nix | 24 +- .../backup/pika-backup/default.nix | 6 +- .../backup/proxmox-backup-client/Cargo.lock | 1185 +- .../backup/proxmox-backup-client/default.nix | 28 +- .../applications/backup/timeshift/wrapper.nix | 4 +- .../blockchains/bitcoin-abc/default.nix | 4 +- .../blockchains/bitcoin-knots/default.nix | 9 +- .../blockchains/bitcoin/default.nix | 4 +- .../blockchains/btcdeb/default.nix | 6 +- .../blockchains/clboss/default.nix | 4 +- .../blockchains/crypto-org-wallet/default.nix | 8 +- .../blockchains/exodus/default.nix | 12 +- .../blockchains/framesh/default.nix | 1 - .../blockchains/groestlcoin/default.nix | 7 +- .../ledger-live-desktop/default.nix | 11 +- .../applications/blockchains/lnd/default.nix | 19 +- .../blockchains/miniscript/default.nix | 35 +- .../blockchains/mycrypto/default.nix | 15 +- .../blockchains/openethereum/Cargo.lock | 5476 -- .../blockchains/openethereum/default.nix | 62 - .../blockchains/optimism/default.nix | 6 +- .../blockchains/polkadot/Cargo.lock | 2136 +- .../blockchains/polkadot/default.nix | 18 +- .../blockchains/solana-validator/default.nix | 3 +- .../blockchains/sparrow/default.nix | 53 +- .../blockchains/sparrow/publickey.asc | 90 + .../blockchains/sparrow/update.sh | 26 - .../blockchains/terra-station/default.nix | 10 +- .../applications/blockchains/ton/default.nix | 6 +- .../blockchains/trezor-suite/default.nix | 6 +- .../blockchains/wasabibackend/default.nix | 2 - .../blockchains/wasabiwallet/default.nix | 4 +- .../blockchains/zecwallet-lite/default.nix | 2 - .../display-managers/greetd/gtkgreet.nix | 4 +- .../display-managers/greetd/tuigreet.nix | 6 +- .../display-managers/greetd/wlgreet.nix | 13 + .../lightdm-enso-os-greeter/default.nix | 4 +- .../lightdm-mini-greeter/default.nix | 4 +- .../lightdm-slick-greeter/default.nix | 4 +- .../lightdm-tiny-greeter/default.nix | 4 +- .../display-managers/lightdm/gtk-greeter.nix | 6 +- .../editors/android-studio/common.nix | 6 +- .../editors/apostrophe/default.nix | 59 - .../applications/editors/bluefish/default.nix | 4 +- .../applications/editors/bluej/default.nix | 4 +- .../editors/codeblocks/default.nix | 4 +- .../applications/editors/eclipse/default.nix | 50 +- .../pkgs/applications/editors/ed/sources.nix | 4 +- .../elisp-packages/elpa-devel-generated.nix | 1280 +- .../emacs/elisp-packages/elpa-generated.nix | 1197 +- .../manual-packages/acm-terminal/default.nix | 22 +- .../manual-packages/ebuild-mode/default.nix | 21 +- .../manual-packages/lsp-bridge/default.nix | 25 +- .../manual-packages/lspce/default.nix | 2 +- .../tree-sitter-langs/default.nix | 3 +- .../manual-packages/xapian-lite/default.nix | 2 +- .../emacs/elisp-packages/nongnu-generated.nix | 554 +- .../elisp-packages/recipes-archive-melpa.json | 5033 +- .../applications/editors/emacs/make-emacs.nix | 50 +- .../editors/focuswriter/default.nix | 4 +- .../applications/editors/formiko/default.nix | 4 +- .../pkgs/applications/editors/fte/default.nix | 33 - .../applications/editors/geany/default.nix | 4 +- .../applications/editors/gedit/default.nix | 12 +- .../editors/gnome-builder/default.nix | 13 +- .../editors/gnome-inform7/default.nix | 8 +- .../editors/gnome-latex/default.nix | 21 +- .../applications/editors/gobby/default.nix | 4 +- .../editors/greenfoot/default.nix | 4 +- .../applications/editors/hexedit/default.nix | 25 - .../editors/jedit/build.xml.patch | 257 - .../applications/editors/jedit/default.nix | 147 +- .../editors/jetbrains/bin/versions.json | 480 +- .../editors/jetbrains/default.nix | 11 + .../editors/jetbrains/plugins/plugins.json | 311 +- .../applications/editors/kakoune/default.nix | 28 +- .../applications/editors/kile/default.nix | 73 +- .../applications/editors/l3afpad/default.nix | 4 +- .../applications/editors/lapce/Cargo.lock | 3024 +- .../applications/editors/lapce/default.nix | 29 +- .../editors/lifeograph/default.nix | 4 +- .../applications/editors/marker/default.nix | 4 +- .../editors/mindforger/default.nix | 4 +- .../applications/editors/nano/default.nix | 13 +- .../applications/editors/neovim/utils.nix | 2 +- .../applications/editors/neovim/wrapper.nix | 6 +- .../applications/editors/pinegrow/default.nix | 4 +- .../applications/editors/poke/default.nix | 69 +- .../applications/editors/pulsar/default.nix | 33 +- .../editors/quartus-prime/default.nix | 12 +- .../editors/standardnotes/default.nix | 19 +- .../applications/editors/sublime/3/common.nix | 4 +- .../applications/editors/sublime/4/common.nix | 4 +- .../applications/editors/texmaker/default.nix | 4 +- .../editors/textadept/default.nix | 4 +- .../applications/editors/textadept/deps.nix | 17 +- .../applications/editors/thiefmd/default.nix | 4 +- .../applications/editors/tijolo/default.nix | 4 +- .../pkgs/applications/editors/vim/common.nix | 6 +- .../pkgs/applications/editors/vim/full.nix | 4 +- .../pkgs/applications/editors/vim/macvim.nix | 3 +- .../editors/vim/plugins/build-vim-plugin.nix | 3 +- .../editors/vim/plugins/deprecated.json | 14 +- .../editors/vim/plugins/generated.nix | 1358 +- .../vim/plugins/nvim-treesitter/generated.nix | 648 +- .../editors/vim/plugins/overrides.nix | 47 +- .../editors/vim/plugins/vim-clap/Cargo.lock | 1335 +- .../editors/vim/plugins/vim-clap/default.nix | 4 +- .../editors/vim/plugins/vim-plugin-names | 10 +- .../editors/vim/plugins/vim-utils.nix | 1 + .../WakaTime.vscode-wakatime/default.nix | 33 +- .../chenglou92.rescript-vscode/default.nix | 21 +- .../rescript-editor-analysis.nix | 22 +- .../default.nix | 19 +- .../editors/vscode/extensions/default.nix | 149 +- .../default.nix | 4 +- .../hashicorp.terraform/default.nix | 6 +- .../jackmacwindows.craftos-pc/default.nix | 4 +- .../extensions/jebbs.plantuml/default.nix | 20 +- .../vscode/extensions/language-packs.nix | 8 +- .../extensions/mktplcExtRefToFetchArgs.nix | 9 +- .../ms-dotnettools.csdevkit/default.nix | 185 +- .../ms-dotnettools.csharp/default.nix | 113 +- .../extensions/ms-python.python/default.nix | 86 +- .../ms-python.vscode-pylance/default.nix | 4 +- .../extensions/ms-toolsai.jupyter/default.nix | 7 +- .../ms-vscode-remote.remote-ssh/default.nix | 13 +- .../extensions/ms-vscode.cpptools/default.nix | 37 +- .../ms-vsliveshare.vsliveshare/default.nix | 6 +- .../myriad-dreamin.tinymist/default.nix | 4 +- .../extensions/nvarner.typst-lsp/default.nix | 4 +- .../extensions/reditorsupport.r/default.nix | 42 + .../rust-lang.rust-analyzer/default.nix | 71 +- .../vscode/extensions/sumneko.lua/default.nix | 7 +- .../tekumara.typos-vscode/default.nix | 64 + .../vscode/extensions/updateSettings.nix | 54 +- .../vscode/extensions/updateSettingsTest.nix | 4 +- .../vadimcn.vscode-lldb/default.nix | 73 +- .../extensions/vadimcn.vscode-lldb/lldb.nix | 20 +- .../vscode/extensions/vscode-utils.nix | 187 +- .../editors/vscode/extensions/vscodeEnv.nix | 103 +- .../vscode/extensions/vscodeEnvTest.nix | 24 +- .../vscode/extensions/vscodeExts2nix.nix | 36 +- .../extensions/vscodeWithConfiguration.nix | 75 +- .../applications/editors/vscode/generic.nix | 2 +- .../applications/editors/vscode/vscode.nix | 16 +- .../editors/xed-editor/default.nix | 4 +- .../emulators/bsnes/ares/default.nix | 4 +- .../emulators/bsnes/bsnes-hd/default.nix | 4 +- .../applications/emulators/cdemu/analyzer.nix | 37 +- .../applications/emulators/cdemu/client.nix | 34 +- .../cdemu/{base.nix => common-drv-attrs.nix} | 23 +- .../applications/emulators/cdemu/daemon.nix | 22 +- .../pkgs/applications/emulators/cdemu/gui.nix | 39 +- .../emulators/cdemu/libmirage.nix | 26 +- .../applications/emulators/cdemu/vhba.nix | 2 +- .../applications/emulators/cemu/default.nix | 8 +- .../emulators/craftos-pc/default.nix | 24 +- .../emulators/desmume/default.nix | 4 +- .../emulators/dolphin-emu/default.nix | 2 - .../emulators/dolphin-emu/primehack.nix | 2 +- .../emulators/flycast/default.nix | 4 +- .../emulators/fuse-emulator/default.nix | 4 +- .../emulators/lambda-delta/default.nix | 4 + .../applications/emulators/mame/default.nix | 4 +- .../applications/emulators/pcem/default.nix | 4 +- .../applications/emulators/pcsxr/default.nix | 4 +- .../emulators/retroarch/cores.nix | 7 +- .../emulators/retroarch/hashes.json | 133 +- .../emulators/retroarch/retroarch-assets.nix | 10 +- .../emulators/retroarch/update_cores.py | 8 +- .../applications/emulators/ripes/default.nix | 6 +- .../applications/emulators/ruffle/default.nix | 4 +- .../emulators/sameboy/default.nix | 6 +- .../applications/emulators/vbam/default.nix | 6 +- .../applications/emulators/vice/default.nix | 4 +- .../pkgs/applications/emulators/wine/base.nix | 92 +- .../wine/darwin-metal-compat-pre8.12.patch | 22 - .../wine/darwin-metal-compat-pre8.18.patch | 12 - .../emulators/wine/darwin-metal-compat.patch | 13 - .../emulators/wine/darwin-qos.patch | 12 - .../applications/emulators/wine/sources.nix | 10 +- .../applications/emulators/wine/staging.nix | 8 +- .../file-managers/krusader/default.nix | 4 +- .../file-managers/nnn/default.nix | 2 +- .../file-managers/pcmanfm/default.nix | 4 +- .../file-managers/ranger/default.nix | 16 +- .../file-managers/spacefm/default.nix | 4 +- .../applications/finance/irpf/default.nix | 6 +- .../pkgs/applications/gis/grass/default.nix | 4 +- .../applications/gis/qgis/unwrapped-ltr.nix | 4 +- .../pkgs/applications/gis/qgis/unwrapped.nix | 4 +- .../gis/zombietrackergps/default.nix | 74 +- .../graphics/ImageMagick/default.nix | 4 +- .../applications/graphics/akira/default.nix | 4 +- .../applications/graphics/avocode/default.nix | 4 +- .../applications/graphics/ciano/default.nix | 4 +- .../graphics/cloudcompare/default.nix | 4 +- .../graphics/cq-editor/default.nix | 63 - .../applications/graphics/curtail/default.nix | 4 +- .../graphics/darktable/default.nix | 9 +- .../darktable/fix_darwin_x86_compile.patch | 22 + .../applications/graphics/dia/default.nix | 4 +- .../applications/graphics/drawing/default.nix | 4 +- .../applications/graphics/drawio/default.nix | 6 +- .../graphics/emulsion/default.nix | 6 +- .../graphics/figma-linux/default.nix | 4 +- .../applications/graphics/fondo/default.nix | 4 +- .../applications/graphics/gcolor3/default.nix | 4 +- .../applications/graphics/geeqie/default.nix | 4 +- .../applications/graphics/gimp/default.nix | 4 +- .../graphics/gnome-photos/default.nix | 6 +- .../applications/graphics/goxel/default.nix | 4 +- .../graphics/gscan2pdf/default.nix | 13 +- .../graphics/gscreenshot/default.nix | 6 +- .../applications/graphics/gthumb/default.nix | 6 +- .../graphics/halftone/default.nix | 6 +- .../applications/graphics/hugin/default.nix | 4 +- .../applications/graphics/hydrus/default.nix | 29 +- .../graphics/icon-library/default.nix | 6 +- .../graphics/ideogram/default.nix | 4 +- .../applications/graphics/imagej/default.nix | 4 +- .../graphics/inkscape/default.nix | 4 +- .../inkscape/extensions/textext/default.nix | 4 +- .../graphics/kgraphviewer/default.nix | 4 +- .../applications/graphics/komikku/default.nix | 6 +- .../graphics/komorebi/default.nix | 4 +- .../graphics/kphotoalbum/default.nix | 4 +- .../graphics/lightburn/default.nix | 4 +- .../applications/graphics/mypaint/default.nix | 27 +- .../graphics/ocrfeeder/default.nix | 6 +- .../graphics/oculante/default.nix | 10 +- .../graphics/openscad/default.nix | 4 +- .../applications/graphics/pdfcpu/default.nix | 6 +- .../applications/graphics/pencil/default.nix | 4 +- .../applications/graphics/photoqt/default.nix | 4 +- .../graphics/pick-colour-picker/default.nix | 4 +- .../applications/graphics/pinta/default.nix | 4 +- .../applications/graphics/pizarra/default.nix | 4 +- .../graphics/processing/default.nix | 4 +- .../applications/graphics/pureref/default.nix | 4 - .../graphics/rawtherapee/default.nix | 4 +- .../graphics/shotwell/default.nix | 10 +- .../applications/graphics/shutter/default.nix | 4 +- .../graphics/snapshot/default.nix | 4 +- .../graphics/solvespace/default.nix | 4 +- .../graphics/structorizer/default.nix | 4 +- .../graphics/symbolic-preview/default.nix | 6 +- .../graphics/synfigstudio/default.nix | 4 +- .../applications/graphics/tev/default.nix | 8 +- .../graphics/texturepacker/default.nix | 4 +- .../applications/graphics/upscayl/default.nix | 8 +- .../graphics/vengi-tools/default.nix | 4 +- .../graphics/xournalpp/default.nix | 6 +- .../applications/graphics/xpano/default.nix | 4 +- .../applications/graphics/yed/default.nix | 6 +- .../pkgs/applications/kde/audiotube.nix | 4 +- .../pkgs/applications/kde/filelight.nix | 2 +- .../nixpkgs/pkgs/applications/kde/kasts.nix | 4 +- .../nixpkgs/pkgs/applications/kde/kcalc.nix | 1 - .../pkgs/applications/kde/kdeconnect-kde.nix | 1 - .../applications/kde/kdenlive/default.nix | 4 +- .../pkgs/applications/kde/kolourpaint.nix | 1 - .../pkgs/applications/kde/kwalletmanager.nix | 1 - .../kde/partitionmanager/default.nix | 4 +- .../applications/kde/plasmatube/default.nix | 4 +- .../pkgs/applications/kde/skanlite.nix | 4 +- .../pkgs/applications/kde/spectacle.nix | 4 +- .../nixpkgs/pkgs/applications/kde/yakuake.nix | 1 - .../misc/1password-gui/default.nix | 2 +- .../applications/misc/1password-gui/linux.nix | 4 +- .../applications/misc/1password/default.nix | 14 +- .../applications/misc/1password/update.sh | 42 + .../misc/HentaiAtHome/default.nix | 4 +- .../pkgs/applications/misc/ablog/default.nix | 4 +- .../applications/misc/almanah/default.nix | 6 +- .../applications/misc/appeditor/default.nix | 4 +- .../applications/misc/audio/sox/default.nix | 2 +- .../pkgs/applications/misc/authy/default.nix | 68 - .../misc/auto-multiple-choice/default.nix | 4 +- .../misc/avalonia-ilspy/default.nix | 4 +- .../pkgs/applications/misc/avizo/default.nix | 4 +- .../misc/bambu-studio/default.nix | 115 +- .../misc/bambu-studio/orca-slicer.nix | 60 +- .../applications/misc/barrier/default.nix | 4 +- .../applications/misc/bazecor/default.nix | 6 +- .../applications/misc/bleachbit/default.nix | 4 +- .../applications/misc/blender/darwin.patch | 67 +- .../applications/misc/blender/default.nix | 62 +- .../applications/misc/break-time/default.nix | 4 +- .../applications/misc/caerbannog/default.nix | 4 +- .../applications/misc/calibre/default.nix | 10 +- .../applications/misc/cartridges/default.nix | 6 +- .../applications/misc/cbatticon/default.nix | 4 +- .../applications/misc/cherrytree/default.nix | 4 +- .../pkgs/applications/misc/cipher/default.nix | 4 +- .../applications/misc/clight/clight-gui.nix | 34 + .../pkgs/applications/misc/clipit/default.nix | 4 +- .../pkgs/applications/misc/cobalt/default.nix | 6 +- .../pkgs/applications/misc/cobang/default.nix | 8 +- .../applications/misc/cointop/default.nix | 2 +- .../applications/misc/confclerk/default.nix | 4 +- .../pkgs/applications/misc/cotp/default.nix | 6 +- .../misc/devdocs-desktop/default.nix | 6 +- .../applications/misc/dialect/default.nix | 13 +- .../applications/misc/diebahn/default.nix | 8 +- .../applications/misc/diffuse/default.nix | 4 +- .../applications/misc/dockbarx/default.nix | 4 +- .../applications/misc/electrum/default.nix | 24 + .../electrum/ltc-aiorpcX-version-bump.patch | 44 + .../pkgs/applications/misc/electrum/ltc.nix | 20 + .../applications/misc/elogind/default.nix | 10 +- .../applications/misc/exercism/default.nix | 6 +- .../applications/misc/fbmenugen/default.nix | 4 +- .../pkgs/applications/misc/fead/default.nix | 16 +- .../applications/misc/feedbackd/default.nix | 4 +- .../pkgs/applications/misc/findex/default.nix | 4 +- .../misc/firefly-desktop/default.nix | 3 +- .../pkgs/applications/misc/fluidd/default.nix | 4 +- .../misc/fluxboxlauncher/default.nix | 4 +- .../misc/font-manager/default.nix | 15 +- .../applications/misc/fontfinder/default.nix | 4 +- .../applications/misc/formatter/default.nix | 4 +- .../applications/misc/foxtrotgps/default.nix | 4 +- .../applications/misc/freemind/default.nix | 83 +- .../pkgs/applications/misc/fspy/default.nix | 4 - .../pkgs/applications/misc/fuzzel/default.nix | 2 +- .../misc/gImageReader/default.nix | 4 +- .../applications/misc/gallery-dl/default.nix | 2 +- .../pkgs/applications/misc/gcstar/default.nix | 4 +- .../applications/misc/genxword/default.nix | 4 +- .../applications/misc/gkrellm/default.nix | 4 +- .../pkgs/applications/misc/glom/default.nix | 4 +- .../pkgs/applications/misc/gmtp/default.nix | 4 +- .../applications/misc/gnome-frog/default.nix | 8 +- ...date-compatible-with-non-flatpak-env.patch | 24 +- .../misc/gnome-multi-writer/default.nix | 6 +- .../misc/gnome-recipes/default.nix | 6 +- .../applications/misc/gnome-tecla/default.nix | 4 +- .../applications/misc/gnome-usage/default.nix | 4 +- .../misc/golden-cheetah-bin/default.nix | 4 +- .../misc/goldendict-ng/default.nix | 10 +- .../applications/misc/goldendict/default.nix | 4 +- .../applications/misc/gollum/Gemfile.lock | 10 +- .../pkgs/applications/misc/gollum/gemset.nix | 16 +- .../applications/misc/gpsprune/default.nix | 4 +- .../applications/misc/gpu-viewer/default.nix | 4 +- .../applications/misc/gpx-viewer/default.nix | 4 +- .../pkgs/applications/misc/gpxsee/default.nix | 4 +- .../applications/misc/gradience/default.nix | 1 + .../pkgs/applications/misc/gramps/default.nix | 4 +- .../misc/gremlin-console/default.nix | 4 +- .../pkgs/applications/misc/grsync/default.nix | 4 +- .../pkgs/applications/misc/gum/default.nix | 6 +- .../pkgs/applications/misc/gummi/default.nix | 4 +- .../pkgs/applications/misc/gxkb/default.nix | 18 +- .../applications/misc/hamster/default.nix | 4 +- .../pkgs/applications/misc/has/default.nix | 4 +- .../applications/misc/hcl2json/default.nix | 6 +- .../pkgs/applications/misc/hmm/default.nix | 5 +- .../misc/hmm/rustc-serialize-fix.patch | 16 + .../misc/holochain-launcher/default.nix | 4 +- .../hyprland-autoname-workspaces/default.nix | 6 +- .../applications/misc/input-leap/default.nix | 4 +- .../misc/joplin-desktop/default.nix | 3 - .../pkgs/applications/misc/josm/default.nix | 6 +- .../applications/misc/jotta-cli/default.nix | 4 +- .../pkgs/applications/misc/jrnl/default.nix | 2 +- .../misc/k40-whisperer/default.nix | 4 +- .../applications/misc/kdbplus/default.nix | 76 - .../applications/misc/keepassxc/default.nix | 4 +- .../pkgs/applications/misc/keeweb/default.nix | 4 +- .../applications/misc/keymapp/default.nix | 4 +- .../misc/keystore-explorer/default.nix | 4 +- .../applications/misc/kile-wl/default.nix | 3 +- .../misc/klipper-estimator/default.nix | 6 +- .../misc/klipperscreen/default.nix | 4 +- .../pkgs/applications/misc/kratos/default.nix | 30 +- .../applications/misc/krename/default.nix | 4 +- .../pkgs/applications/misc/kupfer/default.nix | 4 +- .../pkgs/applications/misc/logseq/default.nix | 8 +- .../applications/misc/lunatask/default.nix | 6 +- .../pkgs/applications/misc/lutris/default.nix | 4 +- .../applications/misc/mainsail/default.nix | 4 +- .../misc/maliit-keyboard/default.nix | 4 +- .../applications/misc/markets/default.nix | 4 +- .../applications/misc/marktext/default.nix | 9 +- .../applications/misc/meerk40t/default.nix | 4 +- .../pkgs/applications/misc/minder/default.nix | 4 +- .../applications/misc/minigalaxy/default.nix | 4 +- .../misc/mission-center/Cargo.lock | 1311 +- .../misc/mission-center/default.nix | 7 +- .../misc/mission-center/gatherer-Cargo.lock | 530 +- .../misc/mobilecoin-wallet/default.nix | 2 +- .../misc/mysql-workbench/default.nix | 4 +- .../misc/neo4j-desktop/default.nix | 10 +- .../applications/misc/notable/default.nix | 11 +- .../applications/misc/notesnook/default.nix | 3 - .../applications/misc/notifymuch/default.nix | 4 +- .../misc/ns-usbloader/default.nix | 4 +- .../misc/numberstation/default.nix | 4 +- .../applications/misc/nwg-bar/default.nix | 4 +- .../misc/nwg-displays/default.nix | 8 +- .../misc/nwg-dock-hyprland/default.nix | 10 +- .../applications/misc/nwg-menu/default.nix | 4 +- .../applications/misc/nwg-panel/default.nix | 10 +- .../applications/misc/nwg-wrapper/default.nix | 4 +- .../applications/misc/octoprint/default.nix | 5 +- .../pkgs/applications/misc/onagre/default.nix | 41 - .../applications/misc/onboard/default.nix | 4 +- .../pkgs/applications/misc/openlp/default.nix | 4 +- .../pkgs/applications/misc/oranda/default.nix | 6 +- .../applications/misc/orca/fix-paths.patch | 88 - .../applications/misc/otpclient/default.nix | 4 +- .../applications/misc/oversteer/default.nix | 4 +- .../pkgs/applications/misc/oxker/default.nix | 6 +- .../applications/misc/pattypan/default.nix | 4 +- .../applications/misc/pdf-quench/default.nix | 4 +- .../applications/misc/pdfarranger/default.nix | 6 +- .../pkgs/applications/misc/pdfpc/default.nix | 4 +- .../misc/pdfsam-basic/default.nix | 8 +- .../applications/misc/pdfslicer/default.nix | 4 +- .../applications/misc/perkeep/default.nix | 2 +- .../applications/misc/pgmodeler/default.nix | 4 +- .../pkgs/applications/misc/phoc/default.nix | 10 +- .../pkgs/applications/misc/plank/default.nix | 4 +- .../applications/misc/playonlinux/default.nix | 4 +- .../misc/polar-bookshelf/default.nix | 4 +- .../misc/polar-bookshelf1/default.nix | 4 +- .../misc/polychromatic/default.nix | 4 +- .../pkgs/applications/misc/premid/default.nix | 4 +- .../applications/misc/printrun/default.nix | 4 +- .../misc/process-compose/default.nix | 6 +- .../misc/projectlibre/default.nix | 89 +- .../applications/misc/protonup-qt/default.nix | 7 +- .../misc/prusa-slicer/default.nix | 4 +- .../pkgs/applications/misc/pueue/default.nix | 2 +- .../applications/misc/pytrainer/default.nix | 4 +- .../pkgs/applications/misc/qcad/default.nix | 4 +- .../pkgs/applications/misc/qtpass/default.nix | 3 - .../pkgs/applications/misc/raider/default.nix | 4 +- .../applications/misc/redshift/default.nix | 4 +- .../applications/misc/regextester/default.nix | 4 +- .../misc/remarkable/rmview/default.nix | 3 +- .../applications/misc/remnote/default.nix | 6 +- .../applications/misc/remontoire/default.nix | 4 +- .../applications/misc/resp-app/default.nix | 1 + .../applications/misc/rofi-rbw/default.nix | 4 +- .../applications/misc/rofi-top/default.nix | 4 +- .../pkgs/applications/misc/rofi/wrapper.nix | 4 +- .../applications/misc/rootbar/default.nix | 4 +- .../applications/misc/safeeyes/default.nix | 4 +- .../applications/misc/sequeler/default.nix | 4 +- .../applications/misc/shipments/default.nix | 4 +- .../pkgs/applications/misc/siglo/default.nix | 4 +- .../applications/misc/skytemple/default.nix | 6 +- .../pkgs/applications/misc/slic3r/default.nix | 4 +- .../pkgs/applications/misc/smpq/default.nix | 27 - .../misc/snapmaker-luban/default.nix | 4 +- .../applications/misc/snapper-gui/default.nix | 4 +- .../pkgs/applications/misc/solaar/default.nix | 8 +- .../pkgs/applications/misc/sqls/default.nix | 2 +- .../pkgs/applications/misc/ssw/default.nix | 4 +- .../pkgs/applications/misc/sticky/default.nix | 4 +- .../misc/streamdeck-ui/default.nix | 4 +- .../pkgs/applications/misc/survex/default.nix | 4 +- .../pkgs/applications/misc/swappy/default.nix | 4 +- .../misc/sway-launcher-desktop/default.nix | 2 +- .../misc/swaynotificationcenter/default.nix | 8 +- .../misc/swaysettings/default.nix | 4 +- .../applications/misc/sweethome3d/default.nix | 3 +- .../applications/misc/sweethome3d/editors.nix | 3 +- .../default.nix | 4 +- .../misc/taskwarrior-tui/default.nix | 6 +- .../misc/terminal-stocks/default.nix | 6 +- .../misc/themechanger/default.nix | 4 +- .../pkgs/applications/misc/tint2/default.nix | 4 +- .../pkgs/applications/misc/tipp10/default.nix | 2 +- .../misc/todoist-electron/default.nix | 5 +- .../misc/transifex-cli/default.nix | 4 +- .../pkgs/applications/misc/ttdl/default.nix | 6 +- .../pkgs/applications/misc/tuba/default.nix | 6 +- .../pkgs/applications/misc/tuhi/default.nix | 4 +- .../applications/misc/tui-journal/default.nix | 6 +- .../misc/twitch-chat-downloader/default.nix | 2 +- .../applications/misc/tzupdate/default.nix | 2 +- .../applications/misc/udiskie/default.nix | 4 +- .../applications/misc/ulauncher/default.nix | 4 +- .../applications/misc/unipicker/default.nix | 41 - .../pkgs/applications/misc/upwork/default.nix | 4 +- .../applications/misc/urlscan/default.nix | 4 +- .../pkgs/applications/misc/valent/default.nix | 2 +- .../applications/misc/variety/default.nix | 4 +- .../applications/misc/veracrypt/default.nix | 4 +- .../pkgs/applications/misc/viking/default.nix | 4 +- .../applications/misc/volnoti/default.nix | 6 +- .../pkgs/applications/misc/waybar/default.nix | 211 - .../applications/misc/waypaper/default.nix | 8 +- .../pkgs/applications/misc/wmenu/default.nix | 15 +- .../applications/misc/wofi-emoji/default.nix | 41 +- .../pkgs/applications/misc/wofi/default.nix | 4 +- .../applications/misc/workrave/default.nix | 4 +- .../applications/misc/xautoclick/default.nix | 4 +- .../misc/xdgmenumaker/default.nix | 4 +- .../pkgs/applications/misc/xiphos/default.nix | 4 +- .../pkgs/applications/misc/xmrig/default.nix | 4 +- .../pkgs/applications/misc/xneur/default.nix | 4 +- .../pkgs/applications/misc/xpad/default.nix | 4 +- .../pkgs/applications/misc/yambar/default.nix | 4 +- .../misc/zathura/core/default.nix | 4 +- .../pkgs/applications/misc/zettlr/default.nix | 4 +- .../pkgs/applications/misc/zettlr/generic.nix | 12 +- .../applications/networking/Sylk/default.nix | 6 +- .../networking/avalanchego/default.nix | 6 +- .../networking/browsers/badwolf/default.nix | 4 +- .../networking/browsers/brave/default.nix | 12 +- .../networking/browsers/brave/make-brave.nix | 4 +- .../networking/browsers/castor/default.nix | 4 +- .../networking/browsers/chromium/common.nix | 78 +- .../networking/browsers/chromium/default.nix | 77 +- .../chromium/patches/widevine-79.patch | 13 - ...e-disable-auto-download-allow-bundle.patch | 27 + .../networking/browsers/chromium/update.py | 5 - .../browsers/chromium/upstream-info.nix | 28 +- .../networking/browsers/dillo/default.nix | 63 - .../networking/browsers/eolie/default.nix | 6 +- .../networking/browsers/ephemeral/default.nix | 4 +- .../browsers/firefox-bin/beta_sources.nix | 818 +- .../browsers/firefox-bin/default.nix | 4 +- .../firefox-bin/developer-edition_sources.nix | 818 +- .../browsers/firefox-bin/release_sources.nix | 818 +- .../networking/browsers/firefox/common.nix | 19 +- .../networking/browsers/firefox/packages.nix | 16 +- .../networking/browsers/floorp/default.nix | 4 +- .../networking/browsers/ladybird/default.nix | 2 + .../networking/browsers/librewolf/src.json | 14 +- .../networking/browsers/luakit/default.nix | 4 +- .../browsers/microsoft-edge/default.nix | 12 +- .../networking/browsers/midori/default.nix | 4 +- .../browsers/mullvad-browser/default.nix | 12 +- .../networking/browsers/netsurf/browser.nix | 4 +- .../networking/browsers/nyxt/default.nix | 4 +- .../networking/browsers/opera/default.nix | 8 +- .../networking/browsers/palemoon/bin.nix | 12 +- .../networking/browsers/polypane/default.nix | 4 +- .../networking/browsers/surf/default.nix | 4 +- .../browsers/tor-browser/default.nix | 18 +- .../networking/browsers/vimb/default.nix | 4 +- .../networking/browsers/vivaldi/default.nix | 6 +- .../browsers/yandex-browser/default.nix | 16 +- .../applications/networking/calls/default.nix | 4 +- .../networking/cloudflared/default.nix | 4 +- .../networking/cluster/acorn/default.nix | 32 - .../networking/cluster/argo/default.nix | 6 +- .../networking/cluster/argocd/default.nix | 6 +- .../networking/cluster/arkade/default.nix | 4 +- .../networking/cluster/atlantis/default.nix | 6 +- .../networking/cluster/atmos/default.nix | 6 +- .../networking/cluster/cilium/default.nix | 4 +- .../networking/cluster/civo/default.nix | 6 +- .../networking/cluster/clusterctl/default.nix | 13 +- .../networking/cluster/cmctl/default.nix | 6 +- .../networking/cluster/fn-cli/default.nix | 4 +- .../networking/cluster/gatekeeper/default.nix | 4 +- .../networking/cluster/glooctl/default.nix | 4 +- .../cluster/helm/chart-testing/default.nix | 6 +- .../cluster/helm/plugins/default.nix | 4 +- .../cluster/helm/plugins/helm-git.nix | 8 +- .../cluster/helm/plugins/helm-mapkubeapis.nix | 34 + .../cluster/helm/plugins/helm-unittest.nix | 6 +- .../networking/cluster/hubble/default.nix | 4 +- .../networking/cluster/istioctl/default.nix | 6 +- .../networking/cluster/k0sctl/default.nix | 15 +- .../cluster/k3s/1_26/chart-versions.nix | 16 +- .../cluster/k3s/1_27/chart-versions.nix | 16 +- .../networking/cluster/k3s/1_27/versions.nix | 12 +- .../cluster/k3s/1_28/chart-versions.nix | 16 +- .../networking/cluster/k3s/1_28/versions.nix | 12 +- .../cluster/k3s/1_29/chart-versions.nix | 16 +- .../networking/cluster/k3s/1_29/versions.nix | 16 +- .../cluster/k3s/1_30/chart-versions.nix | 10 + .../networking/cluster/k3s/1_30/versions.nix | 14 + .../networking/cluster/k3s/builder.nix | 161 +- .../networking/cluster/k3s/default.nix | 59 +- .../networking/cluster/k3s/update-script.sh | 20 +- .../networking/cluster/k8sgpt/default.nix | 12 +- .../networking/cluster/kaniko/default.nix | 4 +- .../networking/cluster/kn/default.nix | 4 +- .../networking/cluster/krane/Gemfile.lock | 12 +- .../networking/cluster/krane/gemset.nix | 20 +- .../cluster/kube-router/default.nix | 6 +- .../cluster/kubebuilder/default.nix | 12 +- .../networking/cluster/kubecolor/default.nix | 6 +- .../cluster/kubeconform/default.nix | 4 +- .../cluster/kubectl-cnpg/default.nix | 6 +- .../cluster/kubectl-explore/default.nix | 6 +- .../cluster/kubectl-gadget/default.nix | 6 +- .../cluster/kubectl-klock/default.nix | 6 +- .../networking/cluster/kubedb-cli/default.nix | 4 +- .../networking/cluster/kubefirst/default.nix | 4 +- .../networking/cluster/kubelogin/default.nix | 6 +- .../networking/cluster/kubeone/default.nix | 6 +- .../networking/cluster/kubernetes/default.nix | 4 +- .../networking/cluster/kubeshark/default.nix | 4 +- .../networking/cluster/kubevela/default.nix | 6 +- .../networking/cluster/kubevpn/default.nix | 4 +- .../networking/cluster/kuma/default.nix | 6 +- .../networking/cluster/kuttl/default.nix | 6 +- .../networking/cluster/kyverno/default.nix | 6 +- .../networking/cluster/lens/linux.nix | 4 +- .../networking/cluster/linkerd/edge.nix | 6 +- .../networking/cluster/minikube/default.nix | 6 +- .../networking/cluster/nerdctl/default.nix | 14 +- .../networking/cluster/nomad-pack/default.nix | 9 +- .../networking/cluster/nomad/default.nix | 2 +- .../networking/cluster/nova/default.nix | 6 +- .../networking/cluster/openlens/default.nix | 2 - .../networking/cluster/opentofu/default.nix | 8 +- .../networking/cluster/pachyderm/default.nix | 6 +- .../networking/cluster/pluto/default.nix | 6 +- .../networking/cluster/pv-migrate/default.nix | 6 +- .../networking/cluster/rke/default.nix | 6 +- .../networking/cluster/stern/default.nix | 6 +- .../networking/cluster/talosctl/default.nix | 6 +- .../cluster/temporal-cli/default.nix | 7 +- .../networking/cluster/temporal/default.nix | 8 +- .../networking/cluster/terraform/default.nix | 7 +- .../networking/cluster/timoni/default.nix | 6 +- .../networking/cluster/velero/default.nix | 6 +- .../networking/cluster/waypoint/default.nix | 82 - .../networking/cluster/werf/default.nix | 9 +- .../networking/cluster/yor/default.nix | 4 +- .../networking/cluster/zarf/default.nix | 6 +- .../networking/coreth/default.nix | 6 +- .../networking/cozy-drive/default.nix | 10 +- .../networking/datovka/default.nix | 4 +- .../networking/discordo/default.nix | 8 +- .../networking/dnscontrol/default.nix | 6 +- .../applications/networking/dropbox/cli.nix | 4 +- .../applications/networking/dsvpn/default.nix | 2 +- .../feedreaders/fluent-reader/default.nix | 2 - .../feedreaders/gnome-feeds/default.nix | 4 +- .../feedreaders/newsflash/Cargo.lock | 872 +- .../feedreaders/newsflash/default.nix | 16 +- .../newsflash/hardcode-version.patch | 12 + .../feedreaders/rssguard/default.nix | 4 +- .../networking/firewalld/default.nix | 4 +- .../networking/flexget/default.nix | 6 +- .../networking/ftp/filezilla/default.nix | 4 +- .../networking/ftp/taxi/default.nix | 4 +- .../applications/networking/gnmic/default.nix | 6 +- .../gnome-network-displays/default.nix | 4 +- .../applications/networking/gns3/server.nix | 12 +- .../google-drive-ocamlfuse/default.nix | 4 +- .../networking/hpmyroom/default.nix | 5 +- .../networking/ids/suricata/default.nix | 8 +- .../networking/ids/zeek/default.nix | 2 +- .../instant-messengers/alfaview/default.nix | 8 +- .../instant-messengers/armcord/default.nix | 4 +- .../instant-messengers/beeper/default.nix | 11 +- .../caprine-bin/build-from-appimage.nix | 7 +- .../chatterino2/default.nix | 4 +- .../instant-messengers/chatty/default.nix | 2 +- .../cinny-desktop/default.nix | 34 +- .../instant-messengers/cinny/default.nix | 5 + .../instant-messengers/coyim/default.nix | 4 +- .../instant-messengers/dino/default.nix | 6 + .../dino/fix-compile-new-vala-c.diff | 16 + .../instant-messengers/discord/default.nix | 38 +- .../instant-messengers/discord/linux.nix | 4 +- .../instant-messengers/element/pin.nix | 10 +- .../instant-messengers/feishu/default.nix | 2 +- .../instant-messengers/ferdium/default.nix | 6 +- .../flare-signal/Cargo.lock | 1217 +- .../flare-signal/default.nix | 12 +- .../instant-messengers/fluffychat/default.nix | 5 +- .../fluffychat/pubspec.lock.json | 833 +- .../instant-messengers/fractal/Cargo.lock | 2420 +- .../instant-messengers/fractal/default.nix | 13 +- .../instant-messengers/franz/default.nix | 4 +- .../instant-messengers/franz/generic.nix | 9 +- .../instant-messengers/gajim/default.nix | 6 +- .../instant-messengers/hamsket/default.nix | 3 +- .../jami/config/pjsip_args_common | 19 - .../jami/config/pjsip_args_linux | 1 - .../jami/config/pjsip_patches | 1 - .../instant-messengers/jami/default.nix | 94 +- .../jitsi-meet-electron/default.nix | 6 +- .../instant-messengers/keet/default.nix | 2 - .../mattermost-desktop/default.nix | 4 +- .../instant-messengers/mikutter/default.nix | 4 +- .../instant-messengers/pidgin/default.nix | 4 +- .../instant-messengers/profanity/default.nix | 4 +- .../instant-messengers/psi-plus/default.nix | 2 +- .../instant-messengers/qq/default.nix | 8 +- .../instant-messengers/qq/sources.nix | 11 +- .../instant-messengers/qq/update.sh | 6 +- .../instant-messengers/rambox/default.nix | 9 +- .../rocketchat-desktop/default.nix | 4 +- .../session-desktop/default.nix | 2 - .../instant-messengers/signal-cli/default.nix | 4 +- .../signal-desktop/default.nix | 17 +- .../signal-desktop/generic.nix | 26 +- .../signal-desktop/signal-desktop-aarch64.nix | 4 +- .../signal-desktop/signal-desktop-beta.nix | 4 +- .../signal-desktop/signal-desktop.nix | 4 +- .../signalbackup-tools/default.nix | 4 +- .../skypeforlinux/default.nix | 4 +- .../instant-messengers/slack/default.nix | 2 +- .../telegram/telegram-desktop/default.nix | 8 +- .../telegram/telegram-desktop/tg_owt.nix | 2 +- .../threema-desktop/default.nix | 140 +- .../instant-messengers/twitch-tui/default.nix | 6 +- .../vk-messenger/default.nix | 4 +- .../instant-messengers/wavebox/default.nix | 4 +- .../whatsapp-for-linux/default.nix | 20 +- .../wire-desktop/default.nix | 4 +- .../instant-messengers/zoom-us/default.nix | 16 +- .../instant-messengers/zulip/default.nix | 1 - .../networking/ipfs-cluster/default.nix | 6 +- .../networking/irc/catgirl/default.nix | 4 +- .../networking/irc/glowing-bear/default.nix | 2 +- .../networking/irc/irccloud/default.nix | 8 +- .../networking/irc/ircdog/default.nix | 4 +- .../networking/irc/srain/default.nix | 12 +- .../applications/networking/iroh/default.nix | 6 +- .../networking/maestral-qt/default.nix | 4 +- .../mailreaders/astroid/default.nix | 4 +- .../mailreaders/ayatana-webmail/default.nix | 4 +- .../networking/mailreaders/balsa/default.nix | 4 +- .../mailreaders/bluemail/default.nix | 4 +- .../mailreaders/bubblemail/default.nix | 4 +- .../mailreaders/claws-mail/default.nix | 4 +- .../mailreaders/electron-mail/default.nix | 14 +- .../evolution/evolution-ews/default.nix | 4 +- .../evolution/evolution/default.nix | 10 +- .../mailreaders/mailnag/default.nix | 6 +- .../mailreaders/mailspring/linux.nix | 4 +- .../networking/mailreaders/mblaze/default.nix | 10 +- .../mailreaders/notmuch/default.nix | 37 +- .../mailreaders/thunderbird-bin/default.nix | 4 +- .../thunderbird-bin/release_sources.nix | 530 +- .../mailreaders/thunderbird/packages.nix | 49 +- .../mailreaders/tutanota-desktop/default.nix | 8 +- .../applications/networking/n8n/default.nix | 4 + .../networking/netmaker/default.nix | 6 +- .../newsreaders/liferea/default.nix | 4 +- .../networking/newsreaders/pan/default.nix | 4 +- .../newsreaders/raven-reader/default.nix | 2 - ...y-copy-dbus-files-into-the-store-dir.patch | 7 +- .../networking/nextcloud-client/default.nix | 4 +- .../networking/nextdns/default.nix | 6 +- .../networking/onionshare/default.nix | 30 +- .../networking/p2p/deluge/default.nix | 4 +- .../networking/p2p/flood/default.nix | 8 +- .../networking/p2p/gnunet/gtk.nix | 4 +- .../networking/p2p/libutp/3.4.nix | 2 +- .../networking/p2p/qbittorrent/default.nix | 4 +- .../networking/p2p/storrent/default.nix | 2 +- .../networking/p2p/transgui/default.nix | 6 +- .../p2p/transmission-remote-gtk/default.nix | 4 +- .../networking/p2p/transmission/4.nix | 4 +- .../networking/p2p/transmission/default.nix | 4 +- .../networking/p2p/xd/default.nix | 6 +- .../networking/protonmail-bridge/default.nix | 6 +- .../networking/protonvpn-gui/default.nix | 8 +- .../networking/protonvpn-gui/legacy.nix | 4 +- .../networking/pyload-ng/default.nix | 8 +- .../networking/remote/anydesk/default.nix | 22 +- .../remote/citrix-workspace/generic.nix | 4 +- .../networking/remote/freerdp/3.nix | 208 + .../networking/remote/freerdp/default.nix | 5 +- .../remote/nice-dcv-client/default.nix | 4 +- .../networking/remote/remmina/default.nix | 26 +- .../networking/remote/rustdesk/default.nix | 6 +- .../networking/remote/teamviewer/default.nix | 3 +- .../remote/vmware-horizon-client/default.nix | 2 +- .../networking/remote/xrdp/default.nix | 45 +- .../xrdp/pulseaudio-module-xrdp/default.nix | 4 +- .../networking/seaweedfs/default.nix | 6 +- .../networking/shellhub-agent/default.nix | 6 +- .../networking/sniffers/wireshark/default.nix | 4 +- .../networking/station/default.nix | 8 +- .../networking/sync/lcsync/default.nix | 4 +- .../networking/sync/rclone/default.nix | 2 +- .../configure.ac-fix-failing-IPv6-check.patch | 12 - .../networking/sync/rsync/default.nix | 12 +- .../rsync/rsync-fortified-strlcpy-fix.patch | 49 - .../networking/sync/storj-uplink/default.nix | 6 +- .../networking/sync/wdt/default.nix | 6 +- .../networking/syncplay/default.nix | 12 +- .../networking/syncthing/default.nix | 6 +- .../applications/networking/taler/default.nix | 147 - .../networking/termius/default.nix | 4 +- .../networking/trayscale/default.nix | 7 +- .../upnp-router-control/default.nix | 4 +- .../applications/networking/warp/default.nix | 17 +- .../networking/weather/meteo/default.nix | 6 +- .../networking/wgnord/default.nix | 1 + .../applications/networking/xpipe/default.nix | 4 +- .../applications/networking/yaup/default.nix | 4 +- .../applications/office/abiword/default.nix | 4 +- .../applications/office/agenda/default.nix | 4 +- .../applications/office/appflowy/default.nix | 4 +- .../applications/office/autokey/default.nix | 4 +- .../office/banana-accounting/default.nix | 4 +- .../office/beamerpresenter/default.nix | 4 +- .../applications/office/bookworm/default.nix | 4 +- .../applications/office/clockify/default.nix | 45 +- .../applications/office/espanso/default.nix | 2 +- .../applications/office/gnote/default.nix | 8 +- .../gnucash/0005-disable-test-lots.patch | 11 + .../applications/office/gnucash/default.nix | 17 +- .../applications/office/gnumeric/default.nix | 4 +- .../applications/office/grisbi/default.nix | 4 +- .../pkgs/applications/office/gtg/default.nix | 6 +- .../applications/office/homebank/default.nix | 8 +- .../applications/office/jabref/default.nix | 4 +- .../applications/office/jameica/default.nix | 4 +- .../office/libreoffice/wrapper.nix | 2 +- .../applications/office/mendeley/default.nix | 6 +- .../pkgs/applications/office/mmex/default.nix | 4 +- .../applications/office/morgen/default.nix | 4 +- .../applications/office/notes-up/default.nix | 4 +- .../office/notion-app-enhanced/default.nix | 7 +- .../pkgs/applications/office/osmo/default.nix | 4 +- .../office/p3x-onenote/default.nix | 7 +- .../office/paperless-ngx/default.nix | 4 + .../office/paperwork/paperwork-backend.nix | 8 + .../office/paperwork/paperwork-gtk.nix | 4 +- .../applications/office/pinpoint/default.nix | 2 +- .../applications/office/planify/default.nix | 8 +- .../applications/office/planner/default.nix | 2 +- .../applications/office/portfolio/default.nix | 8 +- .../applications/office/pympress/default.nix | 4 +- .../applications/office/qownnotes/default.nix | 4 +- .../applications/office/spice-up/default.nix | 4 +- .../applications/office/ticktick/default.nix | 4 +- .../applications/office/timeline/default.nix | 4 +- .../applications/office/timeular/default.nix | 10 +- .../office/treesheets/default.nix | 14 +- .../applications/office/trilium/desktop.nix | 4 +- .../applications/office/tryton/default.nix | 8 +- .../pkgs/applications/office/tusk/default.nix | 3 - .../applications/office/wpsoffice/default.nix | 1 + .../pkgs/applications/office/zim/default.nix | 4 +- .../applications/office/zotero/default.nix | 4 +- .../applications/office/zotero/zotero_7.nix | 4 +- .../applications/printing/pappl/default.nix | 2 +- .../pkgs/applications/radio/chirp/default.nix | 15 +- .../applications/radio/cloudlog/default.nix | 4 +- .../applications/radio/cqrlog/default.nix | 4 +- .../pkgs/applications/radio/dsd/default.nix | 2 +- .../pkgs/applications/radio/flamp/default.nix | 4 +- .../applications/radio/fldigi/default.nix | 9 +- .../applications/radio/gnuradio/default.nix | 4 +- .../applications/radio/gnuradio/wrapper.nix | 8 +- .../pkgs/applications/radio/gqrx/default.nix | 4 +- .../radio/gridtracker/default.nix | 4 +- .../pkgs/applications/radio/grig/default.nix | 4 +- .../pkgs/applications/radio/qlog/default.nix | 4 +- .../pkgs/applications/radio/quisk/default.nix | 4 +- .../pkgs/applications/radio/tqsl/default.nix | 8 +- .../pkgs/applications/radio/uhd/default.nix | 145 +- .../science/astronomy/gildas/aarch64.patch | 12 - .../science/astronomy/gildas/clang.patch | 83 +- .../science/astronomy/gildas/cpp-darwin.patch | 17 + .../science/astronomy/gildas/default.nix | 13 +- .../science/astronomy/gpredict/default.nix | 4 +- .../science/astronomy/phd2/default.nix | 4 +- .../science/astronomy/siril/default.nix | 23 +- .../science/astronomy/stellarium/default.nix | 4 +- .../science/biology/conglomerate/default.nix | 62 +- .../science/biology/dssp/default.nix | 25 +- .../science/biology/igv/default.nix | 8 +- .../science/biology/jbrowse/default.nix | 10 +- .../science/biology/last/default.nix | 4 +- .../science/biology/mafft/default.nix | 58 +- .../science/biology/messer-slim/default.nix | 4 +- .../science/biology/migrate/default.nix | 34 +- .../science/biology/seqtk/default.nix | 13 +- .../science/biology/sortmerna/default.nix | 13 +- .../science/chemistry/chemtool/default.nix | 4 +- .../science/chemistry/jmol/default.nix | 4 +- .../science/chemistry/octopus/default.nix | 4 +- .../science/chemistry/pymol/default.nix | 62 +- .../science/electronics/digital/default.nix | 21 +- .../science/electronics/gtkwave/default.nix | 8 +- .../electronics/horizon-eda/default.nix | 4 +- .../science/electronics/kicad/default.nix | 4 +- .../science/electronics/kicad/versions.nix | 24 +- .../science/electronics/nvc/default.nix | 4 +- .../electronics/openboardview/default.nix | 4 +- .../science/electronics/simulide/default.nix | 80 +- .../science/engineering/brmodelo/default.nix | 58 +- .../science/logic/alt-ergo/default.nix | 4 +- .../science/logic/cedille/default.nix | 2 +- .../science/logic/coq/default.nix | 4 +- .../science/logic/eprover/default.nix | 4 +- .../science/logic/lean4/default.nix | 2 +- .../science/logic/tlaplus/toolbox.nix | 4 +- .../science/logic/why3/default.nix | 8 +- .../applications/science/math/R/default.nix | 8 +- .../science/math/eigenmath/default.nix | 6 +- .../science/math/getdp/default.nix | 2 +- .../science/math/gretl/default.nix | 4 +- .../science/math/gurobi/default.nix | 4 +- .../science/math/lrcalc/default.nix | 5 + .../science/math/nasc/default.nix | 4 +- .../science/math/pynac/default.nix | 18 +- .../science/math/qalculate-gtk/default.nix | 8 +- .../science/math/qalculate-qt/default.nix | 4 +- .../science/math/rofi-calc/default.nix | 4 +- .../sage/patches/linbox-1.7-upgrade.patch | 58 - .../science/math/sage/sage-src.nix | 7 + .../science/math/sage/sagelib.nix | 6 + .../science/math/wxmaxima/default.nix | 8 +- .../science/medicine/xmedcon/default.nix | 4 +- .../misc/gplates/boost-placeholders.patch | 75 - .../science/misc/gplates/default.nix | 4 +- .../misc/graphia/breakpad-sigstksz.patch | 13 - .../science/misc/rink/default.nix | 10 +- .../science/misc/root/default.nix | 70 +- .../science/misc/root/setup-hook.sh | 4 +- .../science/misc/root/sw_vers.patch | 2 +- .../science/misc/snakemake/default.nix | 4 +- .../science/physics/crystfel/default.nix | 54 +- .../physics/crystfel/gui-path-issue.patch | 27 + .../link-to-argp-standalone-if-needed.patch | 18 +- .../science/physics/xnec2c/default.nix | 8 +- .../betaflight-configurator/default.nix | 8 +- .../emuflight-configurator/default.nix | 4 +- .../robotics/inav-configurator/default.nix | 4 +- .../science/robotics/mujoco/default.nix | 14 +- .../applications/search/recoll/default.nix | 6 +- .../applications/system/asusctl/Cargo.lock | 3624 +- .../applications/system/asusctl/default.nix | 50 +- .../applications/system/monitor/default.nix | 4 +- .../system/thumbdrives/default.nix | 4 +- .../blackbox-terminal/default.nix | 3 + .../gnome-console/default.nix | 4 +- .../terminal-emulators/guake/default.nix | 44 +- .../guake/no-compile-schemas.patch | 34 + .../terminal-emulators/kitty/default.nix | 5 +- .../terminal-emulators/kitty/themes.nix | 10 +- .../terminal-emulators/lxterminal/default.nix | 4 +- .../terminal-emulators/mlterm/default.nix | 4 +- .../terminal-emulators/terminator/default.nix | 15 +- .../terminal-emulators/termite/default.nix | 4 +- .../terminal-emulators/tym/default.nix | 4 +- .../terminal-emulators/x3270/default.nix | 73 +- .../version-management/commitizen/default.nix | 4 +- .../version-management/datalad/default.nix | 4 +- .../version-management/deepgit/default.nix | 4 +- .../version-management/delta/default.nix | 7 +- .../version-management/gerrit/default.nix | 4 +- .../version-management/gfold/default.nix | 29 +- .../version-management/gg/default.nix | 1 - .../version-management/gh/default.nix | 6 +- .../version-management/ghorg/default.nix | 4 +- .../version-management/git-absorb/default.nix | 2 +- .../version-management/git-backup/default.nix | 2 +- .../git-branchless/default.nix | 2 +- .../version-management/git-cliff/default.nix | 7 +- .../git-codereview/default.nix | 4 +- .../version-management/git-cola/default.nix | 4 +- .../git-credential-oauth/default.nix | 6 +- .../version-management/git-extras/default.nix | 4 +- .../version-management/git-gone/default.nix | 2 +- .../git-interactive-rebase-tool/default.nix | 7 +- .../version-management/git-lfs/default.nix | 2 +- .../git-machete/default.nix | 4 +- .../version-management/git-mit/default.nix | 6 +- .../git-quick-stats/default.nix | 4 +- .../git-quickfix/default.nix | 2 +- .../git-reparent/default.nix | 2 +- .../git-subtrac/default.nix | 2 +- .../version-management/git-test/default.nix | 2 +- .../version-management/git-town/default.nix | 26 +- .../version-management/git-trim/default.nix | 2 +- .../git-vanity-hash/default.nix | 15 +- .../version-management/gitbatch/default.nix | 9 +- .../version-management/gitkraken/default.nix | 4 +- .../version-management/gitlab/data.json | 12 +- .../gitlab/gitaly/default.nix | 6 +- ...Disable-inmemory-storage-driver-test.patch | 38 - .../gitlab-container-registry/default.nix | 13 +- .../gitlab/gitlab-pages/default.nix | 4 +- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitnuro/default.nix | 8 +- .../gitprompt-rs/default.nix | 18 +- .../version-management/gitsign/default.nix | 6 +- .../version-management/glab/default.nix | 6 +- .../version-management/hut/default.nix | 6 +- .../version-management/jujutsu/default.nix | 6 +- .../version-management/lab/default.nix | 2 +- .../version-management/meld/default.nix | 4 +- .../pass-git-helper/default.nix | 4 +- .../version-management/radicle-cli/Cargo.lock | 6892 -- .../radicle-cli/default.nix | 88 - .../radicle-upstream/default.nix | 85 - .../version-management/sourcehut/default.nix | 8 + .../version-management/stgit/default.nix | 6 +- .../sublime-merge/common.nix | 4 +- .../sublime-merge/default.nix | 12 +- .../version-management/tig/default.nix | 4 +- .../video/anilibria-winmaclinux/default.nix | 4 +- .../applications/video/bombono/default.nix | 4 +- .../applications/video/byzanz/default.nix | 4 +- .../video/ccextractor/default.nix | 2 +- .../applications/video/clapper/default.nix | 56 +- .../video/davinci-resolve/default.nix | 27 +- .../applications/video/devede/default.nix | 4 +- .../applications/video/dvdstyler/default.nix | 4 +- .../video/electronplayer/electronplayer.nix | 9 +- .../applications/video/entangle/default.nix | 4 +- .../applications/video/flowblade/default.nix | 8 +- .../video/gnome-mplayer/default.nix | 4 +- .../applications/video/gnomecast/default.nix | 4 +- .../video/go-chromecast/default.nix | 2 +- .../pkgs/applications/video/go2tv/default.nix | 6 +- .../gpu-screen-recorder-gtk.nix | 4 +- .../applications/video/handbrake/default.nix | 4 +- .../applications/video/haruna/default.nix | 12 +- .../applications/video/hypnotix/default.nix | 4 +- .../video/imagination/default.nix | 4 +- .../video/jellyfin-mpv-shim/default.nix | 4 +- .../pkgs/applications/video/kazam/default.nix | 4 +- .../addons/inputstream-adaptive/default.nix | 8 +- .../video/kodi/addons/jellyfin/default.nix | 4 +- .../video/kodi/addons/keymap/default.nix | 4 +- .../kodi/addons/pvr-hdhomerun/default.nix | 4 +- .../video/kodi/addons/pvr-hts/default.nix | 4 +- .../kodi/addons/pvr-iptvsimple/default.nix | 4 +- .../kodi/addons/pvr-vdr-vnsi/default.nix | 4 +- .../addons/visualization-projectm/default.nix | 4 +- .../video/kodi/addons/youtube/default.nix | 4 +- .../pkgs/applications/video/lbry/default.nix | 12 +- .../losslesscut-bin/build-from-appimage.nix | 7 +- .../applications/video/makemkv/default.nix | 58 +- .../video/media-downloader/default.nix | 4 +- .../applications/video/mkvtoolnix/default.nix | 10 +- .../applications/video/molotov/default.nix | 1 - .../video/mpv/scripts/buildLua.nix | 152 +- .../video/mpv/scripts/chapterskip.nix | 26 +- .../video/mpv/scripts/convert.nix | 35 +- .../applications/video/mpv/scripts/cutter.nix | 17 +- .../video/mpv/scripts/default.nix | 213 +- .../video/mpv/scripts/dynamic-crop.nix | 9 +- .../video/mpv/scripts/evafast.nix | 28 + .../video/mpv/scripts/inhibit-gnome.nix | 19 +- .../video/mpv/scripts/manga-reader.nix | 29 + .../applications/video/mpv/scripts/memo.nix | 27 + .../video/mpv/scripts/modernx-zydezu.nix | 20 +- .../video/mpv/scripts/modernx.nix | 15 +- .../applications/video/mpv/scripts/mpris.nix | 21 +- .../video/mpv/scripts/mpv-cheatsheet.nix | 14 +- .../video/mpv/scripts/mpv-notify-send.nix | 44 + .../video/mpv/scripts/mpv-osc-modern.nix | 11 +- .../video/mpv/scripts/mpv-playlistmanager.nix | 16 +- .../video/mpv/scripts/mpv-slicing.nix | 34 + .../video/mpv/scripts/mpv-webm.nix | 22 +- .../applications/video/mpv/scripts/mpv.nix | 41 +- .../video/mpv/scripts/mpvacious.nix | 31 +- .../video/mpv/scripts/occivink.nix | 72 +- .../applications/video/mpv/scripts/quack.nix | 24 +- .../video/mpv/scripts/quality-menu.nix | 15 +- .../applications/video/mpv/scripts/reload.nix | 20 +- .../video/mpv/scripts/simple-mpv-webui.nix | 22 +- .../mpv/scripts/sponsorblock-minimal.nix | 14 +- .../video/mpv/scripts/sponsorblock.nix | 19 +- .../video/mpv/scripts/thumbfast.nix | 17 +- .../video/mpv/scripts/thumbnail.nix | 10 +- .../applications/video/mpv/scripts/uosc.nix | 17 +- .../video/mpv/scripts/videoclip.nix | 43 + .../video/mpv/scripts/visualizer.nix | 6 +- .../video/mpv/scripts/vr-reversal.nix | 14 +- .../video/mpv/scripts/webtorrent-mpv-hook.nix | 17 +- .../video/mpv/scripts/youtube-upnext.nix | 33 + .../applications/video/mythtv/default.nix | 2 +- .../applications/video/obs-studio/default.nix | 6 +- .../advanced-scene-switcher/default.nix | 4 +- .../obs-studio/plugins/input-overlay.nix | 4 +- .../plugins/obs-backgroundremoval/default.nix | 32 +- .../obs-studio/plugins/obs-command-source.nix | 4 +- .../obs-studio/plugins/obs-mute-filter.nix | 4 +- .../obs-studio/plugins/obs-ndi/default.nix | 4 +- .../obs-studio/plugins/obs-shaderfilter.nix | 4 +- .../plugins/obs-vertical-canvas.nix | 4 +- .../obs-studio/plugins/obs-webkitgtk.nix | 4 +- .../video/open-in-mpv/default.nix | 4 +- .../video/openshot-qt/default.nix | 10 +- .../pkgs/applications/video/peek/default.nix | 4 +- .../video/pipe-viewer/default.nix | 10 +- .../applications/video/pitivi/default.nix | 4 +- .../video/plex-mpv-shim/default.nix | 4 +- .../applications/video/recapp/default.nix | 4 +- .../applications/video/rtabmap/default.nix | 8 +- .../applications/video/screenkey/default.nix | 6 +- .../applications/video/shotcut/default.nix | 4 +- .../video/streamlink-twitch-gui/bin.nix | 4 +- .../applications/video/streamlink/default.nix | 11 +- .../video/subtitleeditor/default.nix | 4 +- .../applications/video/tartube/default.nix | 4 +- .../applications/video/timelens/default.nix | 4 +- .../pkgs/applications/video/vcs/default.nix | 2 +- .../pkgs/applications/video/vdr/default.nix | 4 +- .../applications/video/vdr/markad/default.nix | 4 +- .../video/vdr/softhddevice/default.nix | 4 +- .../video/wf-recorder/default.nix | 2 +- .../applications/video/xplayer/default.nix | 4 +- .../cloud-hypervisor/Cargo.lock | 974 +- .../cloud-hypervisor/default.nix | 18 +- .../virtualization/conmon-rs/default.nix | 6 +- .../virtualization/conmon/default.nix | 6 +- .../virtualization/containerd/default.nix | 6 +- .../virtualization/cri-o/default.nix | 4 +- .../virtualization/crosvm/default.nix | 10 +- .../virtualization/crun/default.nix | 4 +- .../virtualization/ddev/default.nix | 4 +- .../virtualization/distrobox/default.nix | 6 +- .../virtualization/docker-slim/default.nix | 2 +- .../virtualization/docker/buildx.nix | 4 +- .../virtualization/docker/compose.nix | 6 +- .../virtualization/docker/default.nix | 14 +- .../virtualization/dumb-init/default.nix | 4 +- .../virtualization/ecs-agent/default.nix | 4 +- .../virtualization/firecracker/default.nix | 2 +- .../virtualization/kraft/default.nix | 6 +- .../virtualization/podman-tui/default.nix | 19 +- .../virtualization/podman/default.nix | 23 +- .../podman/hardcode-paths.patch | 41 +- .../virtualization/qemu/default.nix | 8 +- .../virtualization/quickgui/default.nix | 39 +- .../virtualization/singularity/generic.nix | 297 +- .../virtualization/singularity/packages.nix | 157 +- .../virtualization/tart/default.nix | 4 +- .../virtualization/virt-manager/default.nix | 4 +- .../virtualization/virt-viewer/default.nix | 4 +- .../virtualization/virtualbox/default.nix | 11 +- .../guest-additions-iso/default.nix | 19 +- .../window-managers/dk/default.nix | 4 +- .../window-managers/eww/default.nix | 44 - .../window-managers/hackedbox/default.nix | 2 + .../hyprwm/hyprland/default.nix | 97 +- .../hyprwm/hyprland/plugins.nix | 6 +- .../hyprwm/hyprland/udis86.nix | 15 - .../hyprwm/hyprland/wlroots.nix | 21 - .../window-managers/i3/lock-fancy.nix | 61 +- .../window-managers/jay/default.nix | 29 +- .../window-managers/miriway/default.nix | 6 +- .../window-managers/sommelier/default.nix | 6 +- .../window-managers/wayfire/wcm.nix | 4 +- .../window-managers/weston/default.nix | 4 +- .../pkgs/build-support/appimage/default.nix | 15 +- .../build-fhsenv-bubblewrap/buildFHSEnv.nix | 8 +- .../build-fhsenv-bubblewrap/default.nix | 24 +- .../dlang/builddubpackage/default.nix | 39 +- .../dlang/dub-to-nix/default.nix | 9 +- .../dlang/dub-to-nix/dub-to-nix.py | 62 +- .../dotnet/build-dotnet-module/default.nix | 10 +- .../build-support/fetchgit/nix-prefetch-git | 2 +- .../pkgs/build-support/fetchgit/tests.nix | 7 + .../pkgs/build-support/flutter/default.nix | 4 +- .../nixpkgs/pkgs/build-support/go/module.nix | 20 +- .../nixpkgs/pkgs/build-support/go/package.nix | 2 +- .../kernel/compress-firmware-xz.nix | 29 - .../kernel/compress-firmware.nix | 43 + .../build-support/kernel/modules-closure.sh | 2 +- .../nixpkgs/pkgs/build-support/lib/meson.nix | 4 + .../node/fetch-npm-deps/Cargo.lock | 515 +- .../node/fetch-npm-deps/Cargo.toml | 21 +- .../node/fetch-npm-deps/default.nix | 4 +- .../node/fetch-npm-deps/src/cacache.rs | 11 +- .../node/fetch-npm-deps/src/main.rs | 7 +- .../node/fetch-npm-deps/src/parse/lock.rs | 2 +- .../node/fetch-npm-deps/src/util.rs | 19 +- .../php/build-composer-project.nix | 85 - .../pkgs/build-support/php/build-pecl.nix | 98 +- .../build-support/php/builders/default.nix | 8 + .../builders/v1/build-composer-project.nix | 111 + .../v1}/build-composer-repository.nix | 87 +- .../v1}/hooks/composer-install-hook.sh | 9 +- .../v1}/hooks/composer-repository-hook.sh | 2 +- .../php/builders/v1/hooks/default.nix | 45 + .../v1}/hooks/php-script-utils.bash | 0 .../pkgs/build-support/php/hooks/default.nix | 40 - .../php/pkgs/composer-local-repo-plugin.nix | 31 +- .../build-support/php/pkgs/composer-phar.nix | 40 +- .../rust/build-rust-package/default.nix | 6 +- .../rust/hooks/cargo-build-hook.sh | 9 +- .../rust/replace-workspace-values.py | 42 +- .../setup-hooks/wrap-gapps-hook/default.nix | 16 +- .../testers/hasPkgConfigModules/tester.nix | 32 +- .../testers/hasPkgConfigModules/tests.nix | 15 +- .../trivial-builders/default.nix | 10 +- .../nixpkgs/pkgs/build-support/vm/default.nix | 9 + .../pkgs/by-name/_0/_0xpropo/package.nix | 4 +- .../_4d-minesweeper}/package.nix | 0 .../pkgs/by-name/_6/_64gram/package.nix | 4 +- .../pkgs/by-name/ab/ab-av1/package.nix | 2 +- .../by-name/ad/adafruit-nrfutil/package.nix | 6 + .../pkgs/by-name/ad/adbtuifm/package.nix | 25 + .../nixpkgs/pkgs/by-name/ad/adrs/package.nix | 26 + .../pkgs/by-name/ad/adwsteamgtk/package.nix | 4 +- .../pkgs/by-name/ae/aegisub/package.nix | 4 +- .../pkgs/by-name/ae/aeron-cpp/package.nix | 12 +- .../pkgs/by-name/af/affine/package.nix | 4 +- .../nixpkgs/pkgs/by-name/ag/ags/package.nix | 62 +- .../pkgs/by-name/ai/airlift/package.nix | 4 +- .../pkgs/by-name/al/alacarte/package.nix | 70 + .../by-name/al/alephone-durandal/package.nix | 4 +- .../by-name/al/alephone-infinity/package.nix | 4 +- .../by-name/al/alephone-marathon/package.nix | 4 +- .../pkgs/by-name/al/alephone/package.nix | 6 +- .../pkgs/by-name/al/alsa-ucm-conf/package.nix | 17 +- .../pkgs/by-name/al/altdns/package.nix | 53 + .../nixpkgs/pkgs/by-name/al/alvr/package.nix | 2 - .../pkgs/by-name/am/am2rlauncher/package.nix | 7 +- .../an/ananicy-rules-cachyos/package.nix} | 29 +- .../nixpkgs/pkgs/by-name/an/anchor/Cargo.lock | 1152 +- .../pkgs/by-name/an/anchor/package.nix | 4 +- .../pkgs/by-name/an/annotator/package.nix | 4 +- .../nixpkgs/pkgs/by-name/an/ansel/package.nix | 11 +- .../pkgs/by-name/an/antares/package.nix | 6 +- .../pkgs/by-name/an/anyrun/package.nix | 4 +- .../pkgs/by-name/an/anytype/package.nix | 7 +- .../pkgs/by-name/ap/aphorme/package.nix | 52 + .../pkgs/by-name/ap/api-linter/package.nix | 6 +- .../pkgs/by-name/ap/apostrophe/package.nix | 118 + .../nixpkgs/pkgs/by-name/ap/apt/package.nix | 4 +- .../nixpkgs/pkgs/by-name/ap/apvlv/package.nix | 4 +- .../pkgs/by-name/ar/arc-browser/package.nix | 4 +- .../pkgs/by-name/ar/arduino-ide/package.nix | 5 +- .../nixpkgs/pkgs/by-name/ar/argc/package.nix | 66 + .../pkgs/by-name/ar/aribb24/package.nix | 52 + .../by-name/ar/ark-pixel-font/package.nix | 8 +- .../pkgs/by-name/ar/arrow-cpp/package.nix | 16 +- .../nixpkgs/pkgs/by-name/ar/arrpc/package.nix | 10 +- .../as/ascii-draw/fix_palette_data_dir.patch | 38 - .../pkgs/by-name/as/ascii-draw/package.nix | 8 +- .../pkgs/by-name/as/asm-lsp/package.nix | 11 +- .../as/assemblyscript/package.nix} | 0 .../pkgs/by-name/as/ast-grep/package.nix | 6 +- .../by-name/as/async-profiler/package.nix | 46 + .../nixpkgs/pkgs/by-name/at/atac/package.nix | 8 +- .../nixpkgs/pkgs/by-name/at/atf/package.nix | 89 + .../pkgs/by-name/at/athens/package.nix | 6 +- .../pkgs/by-name/at/atlauncher/package.nix | 4 +- .../pkgs/by-name/au/audiness/package.nix | 9 +- .../pkgs/by-name/au/audio-sharing/package.nix | 6 +- .../by-name/au/audiobookshelf/source.json | 10 +- .../pkgs/by-name/au/autopsy/package.nix | 49 + .../pkgs/by-name/au/autosuspend/package.nix | 6 +- .../pkgs/by-name/ax/ax25ms/package.nix | 64 + .../ay/ayatana-indicator-datetime/package.nix | 35 +- .../ay/ayatana-indicator-messages/package.nix | 8 +- .../ay/ayatana-indicator-session/package.nix | 4 +- .../by-name/ba/backgroundremover/package.nix | 10 +- .../pkgs/by-name/ba/badkeys/package.nix | 45 + .../bc}/bcc/absolute-ausyscall.patch | 0 .../bcc/fix-deadlock-detector-import.patch | 0 .../bc}/bcc/libbcc-path.patch | 0 .../bc/bcc/package.nix} | 0 .../nixpkgs/pkgs/by-name/be/bee/package.nix | 6 +- .../by-name/be/beekeeper-studio/package.nix | 7 +- .../be/bevelbar/package.nix} | 28 +- .../pkgs/by-name/bi/biglybt/package.nix | 8 +- .../bi/bilibili/package.nix} | 0 .../waylyrics => by-name/bi/bite}/Cargo.lock | 4335 +- .../nixpkgs/pkgs/by-name/bi/bite/package.nix | 110 + .../pkgs/by-name/bi/bitmagnet/package.nix | 10 +- .../bl/blanket/package.nix} | 57 +- .../pkgs/by-name/bl/blockbench/package.nix | 6 +- .../pkgs/by-name/bl/bluetuith/package.nix | 2 +- .../pkgs/by-name/bl/bluez-tools/package.nix | 2 +- .../nixpkgs/pkgs/by-name/bl/bluez/package.nix | 7 +- .../pkgs/by-name/bn/bngblaster/package.nix | 35 +- .../pkgs/by-name/bo/boehmgc/package.nix | 8 +- .../pkgs/by-name/bo/boogie/package.nix | 4 +- .../pkgs/by-name/bo/boxbuddy/package.nix | 6 +- .../pkgs/by-name/bp/bpftop/package.nix | 6 +- .../bp/bpftrace/package.nix} | 0 .../nixpkgs/pkgs/by-name/br/broom/package.nix | 28 + .../nixpkgs/pkgs/by-name/br/bruno/package.nix | 6 +- .../bt/btrfs-assistant/package.nix} | 0 .../bt/btrfs-auto-snapshot/package.nix | 75 + .../pkgs/by-name/bu/buckle/package.nix | 13 +- .../pkgs/by-name/bu/bugstalker/package.nix | 104 + .../pkgs/by-name/bu/bustle/package.nix | 61 + .../nixpkgs/pkgs/by-name/bu/butt/package.nix | 8 +- .../pkgs/by-name/bu/buttermanager/package.nix | 4 +- .../pkgs/by-name/c2/c2fmzq/package.nix | 6 +- .../ca/caddy/package.nix} | 10 +- .../nixpkgs/pkgs/by-name/ca/caido/package.nix | 3 +- .../pkgs/by-name/ca/caligula/package.nix | 42 + .../by-name/ca/cargo-autoinherit/package.nix | 6 +- .../pkgs/by-name/ca/cargo-bloat/package.nix | 6 +- .../pkgs/by-name/ca/cargo-expand/package.nix | 6 +- .../ca/cargo-geiger/allow-warnings.patch | 12 + .../ca/cargo-geiger/package.nix} | 22 +- .../by-name/ca/cargo-information/Cargo.lock | 382 +- .../by-name/ca/cargo-information/package.nix | 5 +- .../pkgs/by-name/ca/cargo-make/package.nix | 6 +- .../ca/cargo-profiler/package.nix} | 0 .../pkgs/by-name/ca/cargo-raze/package.nix | 55 + .../ca/cargo-raze/rustc-serialize-fix.patch | 29 + .../pkgs/by-name/ca/cargo-shear/package.nix | 34 +- .../ca/cargo-wasi/package.nix} | 4 +- .../ca/castxml/package.nix} | 50 +- .../ca/catppuccin-sddm-corners/package.nix} | 6 +- .../by-name/ca/catppuccin-sddm/package.nix | 80 + .../ca/catppuccin/package.nix} | 0 .../cd}/cdecl/cdecl-2.5-lex.patch | 0 .../nixpkgs/pkgs/by-name/cd/cdecl/package.nix | 82 + .../cdecl/test_remove_interactive_line.patch | 10 + .../nixpkgs/pkgs/by-name/ce/cent/package.nix | 33 + .../pkgs/by-name/ce/centrifugo/package.nix | 6 +- .../pkgs/by-name/ce/cert-viewer/package.nix | 19 + .../pkgs/by-name/ch/chemacs2/package.nix | 48 + .../pkgs/by-name/ch/chezmoi/package.nix | 53 + .../pkgs/by-name/ch/chrysalis/package.nix | 5 +- .../pkgs/by-name/ci/circom/package.nix | 6 +- .../pkgs/by-name/cl/clairvoyant/package.nix | 16 +- .../pkgs/by-name/cl/clamtk/package.nix | 4 +- .../by-name/cl/clash-verge-rev/package.nix | 4 +- .../pkgs/by-name/cl/clash-verge/package.nix | 4 +- .../nixpkgs/pkgs/by-name/cl/clatd/package.nix | 3 + .../cl/cli11/package.nix} | 30 +- .../pkgs/by-name/cl/clipcat/package.nix | 17 +- .../pkgs/by-name/cl/clipse/package.nix | 4 +- .../nixpkgs/pkgs/by-name/cm/cmake/package.nix | 4 +- .../pkgs/by-name/co/cockpit/package.nix | 4 +- .../co/codeberg-cli/package.nix} | 42 +- .../pkgs/by-name/co/codeium/package.nix | 10 +- .../co/codux/package.nix} | 5 +- .../pkgs/by-name/co/committed/package.nix | 43 + .../pkgs/by-name/co/connman-gtk/package.nix | 4 +- .../by-name/co/connman-notify/package.nix | 4 +- .../pkgs/by-name/co/converseen/package.nix | 4 +- .../co/coost/package.nix} | 34 +- .../nixpkgs/pkgs/by-name/co/coppwr/Cargo.lock | 2246 +- .../pkgs/by-name/co/coppwr/package.nix | 11 +- .../pkgs/by-name/co/cosmic-edit/Cargo.lock | 1353 +- .../pkgs/by-name/co/cosmic-edit/package.nix | 17 +- .../pkgs/by-name/co/cosmic-icons/package.nix | 6 +- .../pkgs/by-name/co/cosmic-store/Cargo.lock | 373 +- .../pkgs/by-name/co/cosmic-store/package.nix | 12 +- .../co/cosmic-tasks}/Cargo.lock | 8052 +- .../pkgs/by-name/co/cosmic-tasks/package.nix | 101 + .../pkgs/by-name/co/cosmic-term/Cargo.lock | 1339 +- .../pkgs/by-name/co/cosmic-term/package.nix | 17 +- .../pkgs/by-name/co/cowsql/package.nix | 2 +- .../nixpkgs/pkgs/by-name/cp/cpu-x/package.nix | 8 +- .../pkgs/by-name/cr/criterion/package.nix | 117 + .../cr/criterion/tests/001-version.nix | 25 + .../by-name/cr/criterion/tests/test_dummy.c | 7 + .../pkgs/by-name/cr/crunchy-cli/Cargo.lock | 287 +- .../pkgs/by-name/cr/crunchy-cli/package.nix | 4 +- .../pkgs/by-name/cr/cryptor/package.nix | 4 +- .../pkgs/by-name/cs/csharpier/package.nix | 4 +- .../pkgs/by-name/cs/csvkit/package.nix | 4 +- .../pkgs/by-name/cs/csvlens/package.nix | 6 +- .../cs/csvq/package.nix} | 7 +- .../nixpkgs/pkgs/by-name/cu/cue/package.nix | 7 +- .../pkgs/by-name/cu/cups-printers/package.nix | 32 +- .../pkgs/by-name/cu/cursewords/package.nix | 2 +- .../da/dapr-cli/package.nix} | 0 .../da/darklua/package.nix} | 16 +- .../pkgs/by-name/da/daytona-bin/package.nix | 12 +- .../pkgs/by-name/de/delfin/package.nix | 8 +- .../pkgs/by-name/de/dep-scan/package.nix | 4 +- .../pkgs/by-name/de/devcontainer/package.nix | 6 +- .../pkgs/by-name/de/devenv/package.nix | 10 +- .../pkgs/by-name/di/diffedit3/package.nix | 30 + .../pkgs/by-name/di/digikam/package.nix | 18 +- .../nixpkgs/pkgs/by-name/di/dillo/package.nix | 87 + .../di/dillong/package.nix} | 50 +- .../nixpkgs/pkgs/by-name/di/dim/package.nix | 23 +- .../di/discord-gamesdk/package.nix} | 21 +- .../di/discordchatexporter-cli/deps.nix | 23 +- .../di/discordchatexporter-cli/package.nix | 4 +- .../by-name/di/discover-overlay/package.nix | 16 +- .../nixpkgs/pkgs/by-name/di/disko/package.nix | 4 +- .../pkgs/by-name/di/displaycal/package.nix | 4 +- .../pkgs/by-name/di/dissent/package.nix | 6 +- .../dm/dmarc-report-converter/package.nix | 4 +- .../nixpkgs/pkgs/by-name/do/docfd/package.nix | 50 +- .../do/dooit/package.nix} | 0 .../pkgs/by-name/do/door-knocker/package.nix | 4 +- .../do/doppler/package.nix} | 0 .../pkgs/by-name/do/dorion/package.nix | 8 +- .../pkgs/by-name/do/doublecmd/package.nix | 4 +- .../do}/downonspot/Cargo.lock.patch | 0 .../do/downonspot/package.nix} | 8 +- .../nixpkgs/pkgs/by-name/dp/dpp/package.nix | 4 +- .../nixpkgs/pkgs/by-name/dp/dps8m/package.nix | 47 + .../du/dualsensectl/package.nix} | 37 +- .../pkgs/by-name/du/dumbpipe/package.nix | 34 + .../pkgs/by-name/du/dune3d/package.nix | 8 +- .../nixpkgs/pkgs/by-name/du/dunst/package.nix | 77 +- .../nixpkgs/pkgs/by-name/dx/dxvk/package.nix | 83 +- .../pkgs/by-name/dx/dxvk/setup_dxvk.sh | 89 +- .../pkgs/by-name/dx/dxvk_1/package.nix | 60 +- .../pkgs/by-name/dx/dxvk_2/package.nix | 60 +- .../by-name/dy/dynamodb-local/package.nix | 6 +- .../nixpkgs/pkgs/by-name/e1/e1s/package.nix | 26 + .../pkgs/by-name/ea/earlyoom/package.nix | 4 +- .../ec/eclint/package.nix} | 0 .../pkgs/by-name/ed/eduvpn-client/package.nix | 4 +- .../pkgs/by-name/ei/eigenlayer/package.nix | 6 +- .../pkgs/by-name/ek/eksctl/package.nix | 6 +- .../en/endlessh-go/package.nix} | 12 +- .../pkgs/by-name/en/engage/package.nix | 13 +- .../by-name/et/etlegacy-unwrapped/package.nix | 4 +- .../pkgs/by-name/et/etlegacy/package.nix | 2 +- .../nixpkgs/pkgs/by-name/ew/eww/package.nix | 72 + .../nixpkgs/pkgs/by-name/ez/eza/package.nix | 6 +- .../pkgs/by-name/fa/fasole/package.nix | 23 + .../pkgs/by-name/fa/fastahack/package.nix | 43 + .../fa/fastfetch/package.nix} | 18 +- .../pkgs/by-name/fe/feather/package.nix | 4 +- .../pkgs/by-name/ff/ff2mpv-rust/Cargo.lock | 112 - .../pkgs/by-name/ff/ff2mpv-rust/package.nix | 48 +- .../pkgs/by-name/ff/fflogs/package.nix | 37 + .../pkgs/by-name/fg/fgqcanvas/package.nix | 53 + .../pkgs/by-name/fi/files-cli/package.nix | 6 +- .../pkgs/by-name/fi/find-billy/package.nix | 70 + .../pkgs/by-name/fi/firefly-iii/package.nix | 11 +- .../pkgs/by-name/fi/firefoxpwa/Cargo.lock | 1316 +- .../pkgs/by-name/fi/firefoxpwa/package.nix | 82 +- .../pkgs/by-name/fl/flac123/package.nix | 39 + .../pkgs/by-name/fl/flarectl/package.nix | 6 +- .../pkgs/by-name/fl/flashgbx/package.nix | 63 + .../pkgs/by-name/fl/flashprog/package.nix | 10 +- .../fl/flowtime/package.nix} | 4 +- .../nixpkgs/pkgs/by-name/fm/fmtoy/package.nix | 6 +- .../nixpkgs/pkgs/by-name/fn/fnott/package.nix | 4 +- .../fo/fontfor/package.nix} | 26 +- .../pkgs/by-name/fo/forbidden/package.nix | 10 +- .../pkgs/by-name/fo/forge-sparks/package.nix | 16 +- .../package-json-npm-build-frontend.patch | 10 +- .../fo/forgejo/package.nix} | 26 +- .../fo}/forgejo/static-root-path.patch | 8 +- .../fr/fragments/package.nix} | 27 +- .../pkgs/by-name/fr/frankenphp/package.nix | 9 +- .../pkgs/by-name/fr/free42/package.nix | 4 +- .../pkgs/by-name/fr/freecad/package.nix | 4 +- .../pkgs/by-name/fr/freefilesync/package.nix | 16 +- .../pkgs/by-name/fr/fretboard/package.nix | 22 +- .../nixpkgs/pkgs/by-name/ft/fte/package.nix | 59 + .../fu/furnace/package.nix} | 64 +- .../audio => by-name/fu}/furnace/update.sh | 0 .../nixpkgs/pkgs/by-name/fw/fwupd/package.nix | 8 +- .../pkgs/by-name/fz/fzf-make/package.nix | 6 +- .../fz/fzf/package.nix} | 20 +- .../nixpkgs/pkgs/by-name/ga/galah/package.nix | 32 + .../pkgs/by-name/ga/gamescope/package.nix | 6 +- .../pkgs/by-name/ga/garnet/package.nix | 4 +- .../pkgs/by-name/gb/gbsplay/package.nix | 43 + .../nixpkgs/pkgs/by-name/ge/gema/package.nix | 36 + .../pkgs/by-name/ge/germinal/package.nix | 4 +- .../pkgs/by-name/gh/gh-notify/package.nix | 6 +- .../pkgs/by-name/gh/gh-poi/package.nix | 6 +- .../pkgs/by-name/gh/ghciwatch/package.nix | 40 + .../pkgs/by-name/gi/gickup/package.nix | 4 +- .../pkgs/by-name/gi/git-instafix/package.nix | 6 +- .../gi/git-standup/package.nix} | 16 +- .../pkgs/by-name/gi/githooks/package.nix | 85 + .../by-name/gi/github-desktop/package.nix | 4 +- .../by-name/gi/gitlab-ci-local/package.nix | 6 +- .../pkgs/by-name/gi/gittuf/package.nix | 6 +- .../nixpkgs/pkgs/by-name/gi/gitu/package.nix | 6 +- .../pkgs/by-name/gi/gitversion/package.nix | 20 + .../pkgs/by-name/gl/glance/package.nix | 32 + .../pkgs/by-name/gl/glasskube/package.nix | 8 +- .../pkgs/by-name/gl/glsl_analyzer/package.nix | 39 + .../gl/glycin-loaders/fix-glycin-paths.patch | 35 +- .../by-name/gl/glycin-loaders/package.nix | 10 +- .../pkgs/by-name/gm/gmetronome/package.nix | 8 +- .../gn/gnome-online-accounts-gtk/package.nix | 48 + .../pkgs/by-name/go/go-camo/package.nix | 6 +- .../by-name/go/go-cover-treemap/package.nix | 28 + .../pkgs/by-name/go/go-errorlint/package.nix | 6 +- .../pkgs/by-name/go/go-judge/package.nix | 6 +- .../pkgs/by-name/go/go-landlock/package.nix | 30 + .../by-name/go/go-passbolt-cli/package.nix | 52 + .../nixpkgs/pkgs/by-name/go/godns/package.nix | 6 +- .../go/godot_4-export-templates/package.nix | 13 + .../go/google-chrome/package.nix} | 65 +- .../pkgs/by-name/go/gophish/package.nix | 30 + .../go/got/package.nix} | 23 +- .../pkgs/by-name/gp/gpscorrelate/package.nix | 4 +- .../pkgs/by-name/gp/gpt4all/package.nix | 9 +- .../pkgs/by-name/gp/gptscript/package.nix | 13 +- .../pkgs/by-name/gr/grafana-kiosk/package.nix | 28 + .../gr/graphene-hardened-malloc/package.nix} | 28 +- .../by-name/gr/graphite-cli/package-lock.json | 10 +- .../pkgs/by-name/gr/graphite-cli/package.nix | 6 +- .../pkgs/by-name/gr/greenmask/package.nix | 50 + .../by-name/gr/gruvbox-plus-icons/package.nix | 10 +- .../gr/grype/package.nix} | 12 +- .../pkgs/by-name/gt/gtimelog/package.nix | 4 +- .../by-name/gt/gtk-session-lock/package.nix | 57 + .../pkgs/by-name/gt/gtkhash/package.nix | 4 +- .../pkgs/by-name/gu/guile-goblins/package.nix | 4 +- .../pkgs/by-name/gu/guile-lzlib/package.nix | 4 +- .../pkgs/by-name/gv/gvisor/package.nix | 2 +- .../nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock | 75 +- .../pkgs/by-name/ha/halloy/package.nix | 98 +- .../nixpkgs/pkgs/by-name/ha/halo/package.nix | 72 + .../pkgs/by-name/ha/hamtransfer/package.nix | 42 + .../by-name/ha/handheld-daemon/package.nix | 4 +- .../pkgs/by-name/ha/hashid/package.nix | 25 + .../ha/hatch/package.nix} | 23 +- .../pkgs/by-name/hb/hb-honeypot/package.nix | 38 + .../pkgs/by-name/he/hexedit/package.nix | 31 + .../pkgs/by-name/hi/hieroglyphic/package.nix | 75 + .../pkgs/by-name/hi/hifile/package.nix | 2 - .../pkgs/by-name/ho/home-manager/package.nix | 6 +- .../pkgs/by-name/ho/hoppscotch/package.nix | 38 +- .../pkgs/by-name/ht/htb-toolkit/package.nix | 25 +- .../by-name/ht/httpie-desktop/package.nix | 23 + .../nixpkgs/pkgs/by-name/hu/hugo/package.nix | 6 +- .../hu/humioctl/package.nix} | 0 .../pkgs/by-name/hy/hyprcursor/package.nix | 4 +- .../pkgs/by-name/hy/hyprdim/Cargo.lock | 1213 - .../pkgs/by-name/hy/hyprdim/package.nix | 11 +- .../hy/hyprland-activewindow/package.nix | 24 + .../hy/hyprland-monitor-attached/package.nix | 6 +- .../hy/hyprland-workspaces/package.nix | 28 + .../pkgs/by-name/hy/hyprlock/package.nix | 53 +- .../nixpkgs/pkgs/by-name/i2/i2p/package.nix | 4 +- .../pkgs/by-name/i3/i3bar-river/package.nix | 6 +- .../pkgs/by-name/ic/icloudpd/package.nix | 4 +- .../pkgs/by-name/ic/icnsify/package.nix | 29 + .../pkgs/by-name/ig/igvm-tooling/package.nix | 78 + .../pkgs/by-name/im/immersed-vr/linux.nix | 4 - .../pkgs/by-name/im/imposm/package.nix | 34 + .../nixpkgs/pkgs/by-name/in/incus/client.nix | 5 +- .../nixpkgs/pkgs/by-name/in/incus/generic.nix | 10 +- .../nixpkgs/pkgs/by-name/in/incus/package.nix | 6 +- .../pkgs/by-name/in/inotify-info/package.nix | 13 +- .../pkgs/by-name/in/inshellisense/package.nix | 6 +- .../pkgs/by-name/in/integresql/package.nix | 2 +- .../pkgs/by-name/in/intune-portal/package.nix | 4 +- .../pkgs/by-name/ir/iredis/package.nix | 2 +- .../pkgs/by-name/ir/ironbar/package.nix | 110 +- .../nixpkgs/pkgs/by-name/is/iscc/package.nix | 63 + .../pkgs/by-name/ja/jailer/package.nix | 83 + .../nixpkgs/pkgs/by-name/ja/jan/package.nix | 5 +- .../nixpkgs/pkgs/by-name/ja/jazz2/package.nix | 9 +- .../by-name/je/jetbrains-toolbox/package.nix | 7 +- .../nixpkgs/pkgs/by-name/ji/jigmo/package.nix | 2 +- .../pkgs/by-name/ji/jikken/package.nix | 44 + .../nixpkgs/pkgs/by-name/jn/jnv/package.nix | 6 +- .../pkgs/by-name/js/jsoncons/package.nix | 4 +- .../nixpkgs/pkgs/by-name/jt/jtdx/package.nix | 16 + .../nixpkgs/pkgs/by-name/ju/just/package.nix | 6 +- .../ka/kanidm/package.nix} | 26 +- .../ka/karmor/package.nix} | 0 .../pkgs/by-name/ka/katriawm/package.nix | 35 +- .../nixpkgs/pkgs/by-name/kc/kchat/package.nix | 2 +- .../pkgs/by-name/kc/kcl-cli/package.nix | 6 +- .../pkgs/by-name/kd/kdotool/package.nix | 30 + .../nixpkgs/pkgs/by-name/ke/keto/package.nix | 45 + .../nixpkgs/pkgs/by-name/ke/keydb/package.nix | 16 +- .../nixpkgs/pkgs/by-name/ki/ki/package.nix | 69 + ...deprecated-distutils-with-setuptools.patch | 13 + .../ki/ki/update-to-newer-anki-versions.patch | 141 + .../pkgs/by-name/ki/kittysay/package.nix | 6 +- .../nixpkgs/pkgs/by-name/km/kmeet/package.nix | 2 +- .../nixpkgs/pkgs/by-name/ko/komac/package.nix | 14 +- .../pkgs/by-name/ko/konbucase/package.nix | 4 +- .../by-name/ko/koodo-reader/fix-isdev.patch | 13 + .../by-name/ko/koodo-reader/mime-types.xml | 58 + .../pkgs/by-name/ko/koodo-reader/package.json | 312 + .../pkgs/by-name/ko/koodo-reader/package.nix | 133 + .../koodo-reader/update-react-i18next.patch | 58 + .../nixpkgs/pkgs/by-name/ko/kor/package.nix | 6 +- .../ko/kotlin-interactive-shell/package.nix | 45 + .../nixpkgs/pkgs/by-name/kt/ktfmt/package.nix | 7 +- .../pin-default-maven-plugin-versions.patch | 60 + .../pkgs/by-name/ky/kyua/kyua-check-hook.sh | 10 + .../nixpkgs/pkgs/by-name/ky/kyua/package.nix | 119 + .../by-name/ky/kyverno-chainsaw/package.nix | 6 +- .../pkgs/by-name/la/labelle/package.nix | 8 +- .../by-name/la/labwc-gtktheme/package.nix | 6 +- .../la/labwc-menu-generator/package.nix | 2 +- .../by-name/la/labwc-tweaks-gtk/package.nix | 54 + .../pkgs/by-name/la/labwc-tweaks/package.nix | 32 +- .../nixpkgs/pkgs/by-name/la/labwc/package.nix | 4 +- .../nixpkgs/pkgs/by-name/la/lacus/package.nix | 8 +- .../nixpkgs/pkgs/by-name/la/lager/package.nix | 17 +- .../pkgs/by-name/la/laudanum/package.nix | 31 + .../nixpkgs/pkgs/by-name/lb/lbd/package.nix | 48 + .../pkgs/by-name/lb/lbreakouthd/package.nix | 4 +- .../nixpkgs/pkgs/by-name/lc/lc0/package.nix | 72 + .../pkgs/by-name/le/ledger/package.nix | 2 +- .../pkgs/by-name/le/lefthook/package.nix | 4 +- .../pkgs/by-name/le/lexical/package.nix | 7 +- .../pkgs/by-name/li/libation/package.nix | 43 +- .../pkgs/by-name/li/libcpuid/package.nix | 4 +- .../pkgs/by-name/li/libdict/package.nix | 2 +- .../pkgs/by-name/li/libgedit-gfls/package.nix | 55 + .../li/libgedit-gtksourceview/package.nix | 4 +- .../li/libgedit-tepl/package.nix} | 33 +- .../by-name/li/libiconv-darwin/meson.build | 303 + .../by-name/li/libiconv-darwin/meson.options | 1 + .../by-name/li/libiconv-darwin/nixpkgs_test.c | 82 + .../by-name/li/libiconv-darwin/package.nix | 95 + .../pkgs/by-name/li/libiff/package.nix | 34 + .../pkgs/by-name/li/libilbm/package.nix | 38 + .../pkgs/by-name/li/libmamba/package.nix | 60 + .../pkgs/by-name/li/libmediainfo/package.nix | 4 +- .../pkgs/by-name/li/libmsgraph/package.nix | 73 + .../pkgs/by-name/li/libsbml/package.nix | 58 + .../pkgs/by-name/li/libscfg/package.nix | 24 + .../pkgs/by-name/li/libstrophe/package.nix | 1 - .../pkgs/by-name/li/libui-ng/package.nix | 12 +- .../pkgs/by-name/li/license-go/package.nix | 36 + .../pkgs/by-name/li/lightningcss/package.nix | 3 + .../pkgs/by-name/li/lilipod/package.nix | 70 + .../pkgs/by-name/li/limine/package.nix | 4 +- .../pkgs/by-name/li/listen1/package.nix | 1 - .../pkgs/by-name/li/litmusctl/package.nix | 43 + .../pkgs/by-name/li/littlefs-fuse/package.nix | 4 +- .../pkgs/by-name/li/live555/package.nix | 41 +- .../pkgs/by-name/li/livekit-cli/package.nix | 6 +- .../pkgs/by-name/li/livekit/package.nix | 6 +- .../nixpkgs/pkgs/by-name/li/livi/package.nix | 4 +- .../pkgs/by-name/ll/llama-cpp/package.nix | 15 +- .../pkgs/by-name/ll/llm-ls/package.nix | 12 +- .../nixpkgs/pkgs/by-name/lm/lms/package.nix | 86 + .../pkgs/by-name/lm/lmstudio/darwin.nix | 28 + .../pkgs/by-name/lm/lmstudio/linux.nix | 29 + .../pkgs/by-name/lm/lmstudio/package.nix | 39 +- .../nixpkgs/pkgs/by-name/lo/local-ai/lib.nix | 30 + .../pkgs/by-name/lo/local-ai/module.nix | 64 + .../pkgs/by-name/lo/local-ai/package.nix | 59 +- .../pkgs/by-name/lo/local-ai/tests.nix | 342 +- .../nixpkgs/pkgs/by-name/lo/lorem/package.nix | 24 +- .../nixpkgs/pkgs/by-name/lo/loupe/package.nix | 10 +- .../by-name/lo/louvain-community/package.nix | 2 +- .../pkgs/by-name/lp/lprint/package.nix | 2 +- .../pkgs/by-name/lu/lubelogger/package.nix | 4 +- .../nixpkgs/pkgs/by-name/lu/lumafly/deps.nix | 729 + .../pkgs/by-name/lu/lumafly/package.nix | 75 + .../pkgs/by-name/lu/lunacy/package.nix | 4 +- .../pkgs/by-name/lu/lunar-client/package.nix | 5 +- .../pkgs/by-name/lu/luneta/dub-lock.json | 24 + .../pkgs/by-name/lu/luneta/package.nix | 44 + .../pkgs/by-name/lu/lutgen/package.nix | 6 +- .../nixpkgs/pkgs/by-name/lu/lutok/package.nix | 87 + .../by-name/lx/lx-music-desktop/package.nix | 88 + .../nixpkgs/pkgs/by-name/lx/lxc/4428.diff | 78 + .../lx}/lxc/docbook-hack.patch | 0 .../lx/lxc/package.nix} | 28 +- .../pkgs/by-name/lx/lxd-lts/package.nix | 2 +- .../by-name/lx/lxd-unwrapped-lts/package.nix | 7 +- .../pkgs/by-name/lx/lxgw-neoxihei/package.nix | 4 +- .../by-name/lx/lxgw-wenkai-tc/package.nix | 30 + .../ma/maa-assistant-arknights/pin.json | 8 +- .../pkgs/by-name/ma/maa-cli/package.nix | 6 +- .../pkgs/by-name/ma/mac-robber/package.nix | 43 + .../pkgs/by-name/ma/makejinja/package.nix | 52 + .../pkgs/by-name/ma/makima/package.nix | 6 +- .../ma/mako/package.nix} | 25 +- .../pkgs/by-name/ma/maltego/package.nix | 20 +- .../by-name/ma/markdown-oxide/package.nix | 4 +- .../pkgs/by-name/ma/marwaita-x/package.nix | 48 + .../pkgs/by-name/ma/materialx/package.nix | 76 + .../pkgs/by-name/ma/mathemagix/package.nix | 48 + .../matrix-authentication-service/Cargo.lock | 2145 +- .../matrix-authentication-service/package.nix | 14 +- .../pkgs/by-name/ma/matugen/package.nix | 34 + .../pkgs/by-name/ma/maxfetch/package.nix | 39 + .../pkgs/by-name/mc/mcap-cli/package.nix | 6 +- .../pkgs/by-name/mc/mcomix/package.nix | 4 +- .../pkgs/by-name/me/mealie/package.nix | 2 +- .../pkgs/by-name/me/mediainfo-gui/package.nix | 4 +- .../pkgs/by-name/me/mediainfo/package.nix | 4 +- .../pkgs/by-name/me/mednafen/package.nix | 4 +- .../pkgs/by-name/me/mednaffe/package.nix | 4 +- .../pkgs/by-name/me/megapixels/package.nix | 4 +- .../me/meli/package.nix} | 17 +- .../me/melonDS/package.nix} | 31 +- .../pkgs/by-name/me/menulibre/package.nix | 4 +- .../mg/mgba/package.nix} | 39 +- .../pkgs/by-name/mi/mihomo/package.nix | 6 +- .../pkgs/by-name/mi/mimikatz/package.nix | 31 + .../pkgs/by-name/mi/mini-calc/package.nix | 27 +- .../pkgs/by-name/mi/minijinja/package.nix | 6 +- .../nixpkgs/pkgs/by-name/mi/miru/package.nix | 5 +- .../by-name/mi/misconfig-mapper/package.nix | 33 + .../mi/missidentify/fix-darwin-build.patch | 11 + .../pkgs/by-name/mi/missidentify/package.nix | 56 + .../nixpkgs/pkgs/by-name/mi/mixxc/package.nix | 67 + .../pkgs/by-name/mk/mkjson/generated.nix | 46 + .../pkgs/by-name/mk/mkjson/package.nix | 1 + .../nixpkgs/pkgs/by-name/mo/mo/package.nix | 36 + .../pkgs/by-name/mo/modprobed-db/package.nix | 4 +- .../mo/mold/package.nix} | 4 +- .../pkgs/by-name/mo/monaspace/package.nix | 4 +- .../pkgs/by-name/mo/moneydance/package.nix | 21 +- .../pkgs/by-name/mo/monophony/package.nix | 4 +- .../pkgs/by-name/mo/mosdepth/package.nix | 4 +- .../nixpkgs/pkgs/by-name/mo/movim/package.nix | 67 +- .../nixpkgs/pkgs/by-name/mq/mqttx/package.nix | 3 - .../pkgs/by-name/my/mycelium/Cargo.lock | 35 +- .../pkgs/by-name/my/mycelium/package.nix | 4 +- .../my/mysql84/no-force-outline-atomics.patch | 24 + .../pkgs/by-name/my/mysql84/package.nix | 78 + .../pkgs/by-name/my/mystmd/package.nix | 8 +- .../nixpkgs/pkgs/by-name/my/myxer/package.nix | 4 +- .../pkgs/by-name/na/namespace-cli/package.nix | 6 +- .../na/nanoboyadvance/dont-fetch-glad.patch | 14 + .../by-name/na/nanoboyadvance/package.nix | 66 + .../na/navidrome/package.nix} | 9 +- .../nixpkgs/pkgs/by-name/na/nawk/package.nix | 4 +- .../pkgs/by-name/ne/nekoray/package.nix | 6 +- .../nixpkgs/pkgs/by-name/ne/nemu/package.nix | 108 + .../pkgs/by-name/ne/neothesia/Cargo.lock | 4672 + .../pkgs/by-name/ne/neothesia/package.nix | 70 + .../ne/neovide/package.nix} | 0 .../ne}/neovide/skia-externals.json | 0 .../ne/neovim-unwrapped/package.nix} | 2 +- .../system_rplugin_manifest.patch | 0 .../neovim-unwrapped}/treesitter-parsers.nix | 0 .../update-treesitter-parsers.py | 0 .../pkgs/by-name/ne/nestopia-ue/package.nix | 4 +- .../pkgs/by-name/ne/netclient/package.nix | 6 +- .../pkgs/by-name/ne/netscanner/package.nix | 6 +- .../pkgs/by-name/ne/nezha-agent/package.nix | 6 +- .../pkgs/by-name/nf/nf-test/package.nix | 58 + .../ng/nginx-language-server/package.nix | 44 + .../ng/nginx-sso/package.nix} | 2 +- .../nixpkgs/pkgs/by-name/nh/nh/package.nix | 6 +- .../pkgs/by-name/ni/nibtools/package.nix | 46 + .../nixpkgs/pkgs/by-name/ni/nickel/Cargo.lock | 89 +- .../pkgs/by-name/ni/nickel/package.nix | 9 +- .../pkgs/by-name/ni/nim_lk/package.nix | 35 +- .../pkgs/by-name/ni/nimdow/package.nix | 10 +- .../pkgs/by-name/ni/nimlsp/package.nix | 2 +- .../pkgs/by-name/ni/nitter/package.nix | 2 +- .../pkgs/by-name/ni/nix-inspect/package.nix | 10 +- .../by-name/ni/nix-search-cli/package.nix | 8 +- .../pkgs/by-name/ni/nix-web/package.nix | 21 +- .../by-name/ni/nixos-anywhere/package.nix | 9 +- .../pkgs/by-name/no/nodeinfo/package.nix | 33 + .../nixpkgs/pkgs/by-name/no/nom/package.nix | 6 +- .../pkgs/by-name/no/normcap/package.nix | 13 +- .../by-name/no/nosql-workbench/package.nix | 7 +- .../pkgs/by-name/no/novops/package.nix | 6 +- .../nixpkgs/pkgs/by-name/nr/nray/package.nix | 37 + .../pkgs/by-name/nr/nrfconnect/package.nix | 9 +- .../nixpkgs/pkgs/by-name/nr/nrr/package.nix | 6 +- .../by-name/nu/nuclei-templates/package.nix | 4 +- .../pkgs/by-name/nw/nwg-drawer/package.nix | 4 +- .../pkgs/by-name/nw/nwg-hello/package.nix | 4 +- .../pkgs/by-name/nx/nxengine-evo/assets.nix | 37 + .../pkgs/by-name/nx/nxengine-evo/package.nix | 92 + .../pkgs/by-name/oc/ocenaudio/package.nix | 4 +- .../pkgs/by-name/oc/ocis-bin/package.nix | 2 +- .../pkgs/by-name/oe/oelint-adv/package.nix | 4 +- .../nixpkgs/pkgs/by-name/of/offat/package.nix | 4 +- .../oh/oh-my-posh/package.nix} | 6 +- .../nixpkgs/pkgs/by-name/ol/olvid/package.nix | 8 +- .../pkgs/by-name/om/omnictl/package.nix | 6 +- .../pkgs/by-name/on/onagre/package.nix | 58 + .../pkgs/by-name/on/onedriver/package.nix | 7 +- .../by-name/on/onevpl-intel-gpu/package.nix | 4 +- .../by-name/on/onlyoffice-bin/package.nix | 4 +- .../on/onlyoffice-bin_latest/package.nix | 7 +- .../pkgs/by-name/op/open-scq30/package.nix | 6 +- .../op/openasar/package.nix} | 35 +- .../pkgs/by-name/op/opencomposite/package.nix | 13 +- .../pkgs/by-name/op/openfga-cli/package.nix | 55 + .../pkgs/by-name/op/openfga/package.nix | 58 + .../pkgs/by-name/op/openpgl/package.nix | 6 +- .../by-name/op/openpomodoro-cli/package.nix | 33 + .../pkgs/by-name/op/openrocket/package.nix | 4 +- .../by-name/op/openscad-unstable/package.nix | 4 +- .../pkgs/by-name/op/opensplat/package.nix | 89 + .../pkgs/by-name/op/openswitcher/package.nix | 4 +- .../pkgs/by-name/op/openturns/package.nix | 99 + .../by-name/op/openvas-scanner/package.nix | 4 +- .../op/openvr/package.nix} | 7 +- .../op}/openvswitch/generic.nix | 79 +- .../linux => by-name/op}/openvswitch/lts.nix | 0 .../op/openvswitch/package.nix} | 0 .../disable-bash-arg-completion-test.patch | 0 .../openvswitch/patches/fix-python313.patch | 12 + .../op}/openvswitch/update.nu | 6 +- .../pkgs/by-name/or/orca/fix-paths.patch | 75 + .../or/orca/package.nix} | 37 +- .../pkgs/by-name/or/orchard/package.nix | 6 +- .../nixpkgs/pkgs/by-name/ot/oterm/package.nix | 46 +- .../pkgs/by-name/pa/pablodraw/package.nix | 4 +- .../pa/pahole/package.nix} | 0 .../pahole/threading-reproducibility.patch | 0 .../pkgs/by-name/pa/paper-age/package.nix | 6 +- .../pkgs/by-name/pa/paper-clip/package.nix | 4 +- .../pkgs/by-name/pa/paper-plane/package.nix | 4 +- .../pa/paperless-asn-qr-codes/package.nix | 42 + .../nixpkgs/pkgs/by-name/pa/papers/Cargo.lock | 1251 + .../pkgs/by-name/pa/papers/package.nix | 133 + .../by-name/pa/parallel-hashmap/package.nix | 49 + .../pkgs/by-name/pa/parsedmarc/package.nix | 41 + .../pkgs/by-name/pa/parsify/package.nix | 2 - .../nixpkgs/pkgs/by-name/pa/passt/package.nix | 4 +- .../pkgs/by-name/pa/patch2pr/package.nix | 6 +- .../nixpkgs/pkgs/by-name/pa/payme/package.nix | 6 +- .../pkgs/by-name/pd/pdfannots/package.nix | 2 +- .../pd/pdns-recursor/package.nix} | 4 +- .../pkgs/by-name/pe/peergos/package.nix | 55 +- .../pe/perf_data_converter/package.nix | 2 +- .../pkgs/by-name/pg/pgagroal/package.nix | 2 +- .../pkgs/by-name/pg/pgcopydb/package.nix | 2 +- .../pkgs/by-name/pg/pgmoneta/package.nix | 6 +- .../nixpkgs/pkgs/by-name/ph/phel/package.nix | 6 +- .../pkgs/by-name/ph/photocollage/package.nix | 4 +- .../pkgs/by-name/ph/photonvision/package.nix | 6 +- .../pkgs/by-name/ph/phpdocumentor/package.nix | 3 + .../pkgs/by-name/ph/phpunit/package.nix | 9 +- .../pkgs/by-name/pi/pinact/package.nix | 6 +- .../pkgs/by-name/pi/pingtunnel/package.nix | 32 + .../pkgs/by-name/pi/piv-agent/package.nix | 2 +- .../nixpkgs/pkgs/by-name/pi/pixi/Cargo.lock | 848 +- .../nixpkgs/pkgs/by-name/pi/pixi/package.nix | 12 +- .../pkgs/by-name/pl/plasticity/package.nix | 8 +- .../nixpkgs/pkgs/by-name/pl/pls/package.nix | 8 +- .../pkgs/by-name/po/poethepoet/package.nix | 4 +- .../by-name/po/pokemon-cursor/package.nix | 50 + .../pkgs/by-name/po/polybar/package.nix | 3 +- .../nixpkgs/pkgs/by-name/po/pom/package.nix | 25 + .../pkgs/by-name/po/popcorntime/package.nix | 11 +- .../pkgs/by-name/po/portablemc/package.nix | 97 + .../po/portablemc/use-builtin-java.patch | 47 + .../nixpkgs/pkgs/by-name/po/pot/package.nix | 4 +- .../pkgs/by-name/po/powersploit/package.nix | 6 +- .../pkgs/by-name/po/powersupply/package.nix | 4 +- .../pkgs/by-name/pp/ppsspp/package.nix | 130 +- .../pkgs/by-name/pr/pragtical/package.nix | 86 + .../pkgs/by-name/pr/pretalx/package.nix | 8 +- .../pkgs/by-name/pr/pretix/package.nix | 17 +- .../pkgs/by-name/pr/primesieve/package.nix | 4 +- .../pkgs/by-name/pr/private-gpt/package.nix | 17 + .../pkgs/by-name/pr/promptfoo/package.nix | 6 +- .../nixpkgs/pkgs/by-name/pr/proto/package.nix | 6 +- .../pkgs/by-name/pr/protoc-gen-js/package.nix | 2 +- .../pr/protoc-gen-rust/package.nix} | 0 .../pkgs/by-name/pr/proton-ge-bin/package.nix | 4 +- .../by-name/pr/protonmail-desktop/package.nix | 4 +- .../pkgs/by-name/pr/protonplus/package.nix | 65 + .../pkgs/by-name/pr/prowler/package.nix | 2 + .../ps/ps_mem/package.nix} | 18 +- .../pkgs/by-name/pt/ptyxis/package.nix | 66 + .../pkgs/by-name/pu/pupdate/package.nix | 4 +- .../pkgs/by-name/pu/puppet-bolt/package.nix | 6 +- .../pkgs/by-name/pw/pw3270/package.nix | 4 +- .../pkgs/by-name/pw/pwndbg/package.nix | 22 +- .../nixpkgs/pkgs/by-name/pw/pwru/package.nix | 4 +- .../pkgs/by-name/py/pyprland/package.nix | 24 +- .../pkgs/by-name/py/pyright/package.nix | 8 +- .../pkgs/by-name/qr/qrtool/package.nix | 6 +- .../by-name/qu/quark-goldleaf/package.nix | 4 +- .../pkgs/by-name/qu/quarkus/package.nix | 4 +- .../qu/quickemu/package.nix} | 51 +- .../pkgs/by-name/qu/quickjs-ng/package.nix | 2 +- .../pkgs/by-name/qu/quicktype/package.nix | 2 +- .../ra/radicale/package.nix} | 5 +- .../pkgs/by-name/ra/radicle-node/package.nix | 62 + .../nixpkgs/pkgs/by-name/ra/rage/package.nix | 2 +- .../pkgs/by-name/ra/ratslap/package.nix | 20 +- .../nixpkgs/pkgs/by-name/rc/rclip/package.nix | 6 +- .../nixpkgs/pkgs/by-name/re/redka/package.nix | 30 + .../re/{redocly-cli => redocly}/package.nix | 31 +- .../re/refinery-cli/package.nix} | 0 .../nixpkgs/pkgs/by-name/re/regal/package.nix | 23 + .../pkgs/by-name/re/regina/package.nix | 4 +- .../by-name/re/renode-dts2repl/package.nix | 6 +- .../by-name/re/renode-unstable/package.nix | 4 +- .../re/renpy/package.nix} | 99 +- .../re}/renpy/shutup-erofs-errors.patch | 0 .../pkgs/by-name/re/retool/package.nix | 9 +- .../nixpkgs/pkgs/by-name/re/retrospy/deps.nix | 154 + .../pkgs/by-name/re/retrospy/package.nix | 89 + .../pkgs/by-name/re/retrospy/update.sh | 17 + .../nixpkgs/pkgs/by-name/rh/rHttp/package.nix | 27 + .../nixpkgs/pkgs/by-name/ri/ride/mk.patch | 34 + .../nixpkgs/pkgs/by-name/ri/ride/package.nix | 152 + .../pkgs/by-name/ri/rifiuti/package.nix | 64 + .../pkgs/by-name/ri/ripsecrets/package.nix | 6 +- .../pkgs/by-name/ri/river-bnf/package.nix | 2 +- .../pkgs/by-name/ri/river-filtile/package.nix | 31 + .../nixpkgs/pkgs/by-name/rk/rkbin/package.nix | 2 +- .../pkgs/by-name/rk/rkboot/package.nix | 43 + .../nixpkgs/pkgs/by-name/rm/rmenu/Cargo.lock | 260 +- .../nixpkgs/pkgs/by-name/rm/rmenu/package.nix | 8 +- .../rm/rmfakecloud/package.nix} | 0 .../rm}/rmfakecloud/webui.nix | 0 .../nixpkgs/pkgs/by-name/rm/rmg/package.nix | 7 +- .../pkgs/by-name/ro/rofimoji/package.nix | 6 +- .../nixpkgs/pkgs/by-name/ro/rosa/package.nix | 16 +- .../pkgs/by-name/ro/route-graph/package.nix | 10 +- .../pkgs/by-name/ro/roxterm/package.nix | 4 +- .../nixpkgs/pkgs/by-name/rp/rpcs3/package.nix | 8 +- .../nixpkgs/pkgs/by-name/rq/rqbit/Cargo.lock | 187 +- .../nixpkgs/pkgs/by-name/rq/rqbit/package.nix | 6 +- .../pkgs/by-name/rt/rtaudio_6/package.nix | 68 + .../pkgs/by-name/rw/rwpspread/package.nix | 6 +- .../nixpkgs/pkgs/by-name/ry/ryujinx/deps.nix | 2 +- .../pkgs/by-name/ry/ryujinx/package.nix | 6 +- .../s0/s0ix-selftest-tool/package.nix} | 63 +- .../sa/sabnzbd/package.nix} | 7 +- .../pkgs/by-name/sa/samrewritten/package.nix | 2 +- .../pkgs/by-name/sa/sarasa-gothic/package.nix | 4 +- .../pkgs/by-name/sa/sarif-tools/package.nix | 4 + .../pkgs/by-name/sa/satellite/package.nix | 4 +- .../pkgs/by-name/sb/sbom-utility/package.nix | 6 +- .../pkgs/by-name/sc/scalingo/package.nix | 4 +- .../sc/scc/package.nix} | 22 +- .../pkgs/by-name/sc/scenefx/package.nix | 64 + .../sc/scotch/package.nix} | 38 +- .../pkgs/by-name/sc/screenly-cli/package.nix | 6 +- .../pkgs/by-name/sd/SDL2_mixer/package.nix | 82 + ...-incompatible-pointer-comparison-fix.patch | 0 .../by-name/sd/SDL2_mixer_2_0/package.nix | 40 + .../pkgs/by-name/sd/SDL2_net/package.nix | 50 + .../pkgs/by-name/se/seabird/package.nix | 6 +- .../pkgs/by-name/se/sendme/package.nix | 6 +- .../pkgs/by-name/sh/shell-gpt/package.nix | 51 + .../pkgs/by-name/sh/shopware-cli/package.nix | 6 +- .../sh/showmethekey/package.nix} | 12 +- .../pkgs/by-name/si/silverbullet/package.nix | 4 +- .../nixpkgs/pkgs/by-name/si/simde/package.nix | 4 +- .../pkgs/by-name/si/simdutf/package.nix | 4 +- .../si/simplex-chat-desktop/package.nix | 10 +- .../pkgs/by-name/si/simplotask/package.nix | 4 +- .../pkgs/by-name/si/sispmctl/package.nix | 4 +- .../pkgs/by-name/si/siyuan/package-lock.json | 7762 ++ .../pkgs/by-name/si/siyuan/package.nix | 100 + .../by-name/si/siyuan/set-pandoc-path.patch | 13 + .../sk/sketchybar-app-font/package.nix} | 8 +- .../sk/sketchybar/package.nix} | 57 +- .../sk}/skhd/org.nixos.skhd.plist | 0 .../sk/skhd/package.nix} | 32 +- .../pkgs/by-name/sk/skimpdf/package.nix | 36 + .../pkgs/by-name/sl/slimserver/package.nix | 206 +- .../pkgs/by-name/sl/slumber/package.nix | 30 + .../pkgs/by-name/sm/smartgithg/package.nix | 8 +- .../nixpkgs/pkgs/by-name/sm/smpq/package.nix | 36 + .../pkgs/by-name/sn/snapcraft/package.nix | 4 +- .../sn/snes9x/package.nix} | 125 +- .../pkgs/by-name/sn/snipe-it/package.nix | 8 +- .../by-name/sn/snippetexpandergui/package.nix | 4 +- .../by-name/sn/snippetexpanderx/package.nix | 4 +- .../pkgs/by-name/so/solana-cli/package.nix | 3 +- .../pkgs/by-name/so/soupault/package.nix | 10 +- .../pkgs/by-name/sp/spacedrive/package.nix | 14 +- .../sp/spectral-language-server/package.json | 159 + .../sp/spectral-language-server/package.nix | 109 + .../pkgs/by-name/sp/spicetify-cli/package.nix | 4 +- .../pkgs/by-name/sp/spirit/package.nix | 6 +- .../pkgs/by-name/sp/spotube/package.nix | 4 +- .../pkgs/by-name/sq/squirreldisk/package.nix | 4 +- .../pkgs/by-name/ss/sse2neon/package.nix | 41 + .../pkgs/by-name/st/stackit-cli/package.nix | 25 +- .../nixpkgs/pkgs/by-name/st/stats/package.nix | 22 +- .../st/stduuid/package.nix} | 14 +- .../pkgs/by-name/st/step-cli/package.nix | 41 + .../pkgs/by-name/st/stirling-pdf/package.nix | 4 +- .../pkgs/by-name/st/stlink-tool/package.nix | 41 + .../pkgs/by-name/st/stormlib/package.nix | 64 +- .../pkgs/by-name/st/strictdoc/package.nix | 4 +- .../nixpkgs/pkgs/by-name/st/sttr/package.nix | 6 +- .../pkgs/by-name/su/superfile/package.nix | 32 + .../pkgs/by-name/su/supersonic/package.nix | 6 +- .../pkgs/by-name/su/surrealdb/package.nix | 13 +- .../by-name/sw/sway-easyfocus/package.nix | 4 +- .../by-name/sw/sway-unwrapped/package.nix | 24 +- .../nixpkgs/pkgs/by-name/sw/sway/package.nix | 17 +- .../pkgs/by-name/sw/swaybg/package.nix | 4 +- .../sw/swayfx-unwrapped/fix-paths.patch | 11 + .../load-configuration-from-etc.patch | 48 + .../by-name/sw/swayfx-unwrapped/package.nix | 129 +- .../sway-config-nixos-paths.patch | 21 + .../sway-config-no-nix-store-references.patch | 21 + .../pkgs/by-name/sw/swayimg/package.nix | 2 +- .../pkgs/by-name/sw/swayosd/package.nix | 4 +- .../sw/switch-to-configuration-ng/.gitignore | 1 + .../sw/switch-to-configuration-ng/Cargo.lock | 527 + .../sw/switch-to-configuration-ng/Cargo.toml | 19 + .../sw/switch-to-configuration-ng/build.rs | 30 + .../sw/switch-to-configuration-ng/package.nix | 36 + .../sw/switch-to-configuration-ng/src/main.rs | 2077 + .../pkgs/by-name/sw/switcheroo/package.nix | 8 +- .../nixpkgs/pkgs/by-name/sw/swww/Cargo.lock | 138 +- .../nixpkgs/pkgs/by-name/sw/swww/package.nix | 32 +- .../sy/syft/package.nix} | 6 +- .../pkgs/by-name/sy/symfony-cli/package.nix | 15 +- .../pkgs/by-name/sy/symphony/package.nix | 37 + .../pkgs/by-name/sy/syslogng/package.nix | 18 +- .../pkgs/by-name/sy/systemctl-tui/package.nix | 6 +- .../nixpkgs/pkgs/by-name/ta/tabby/Cargo.lock | 2809 +- .../nixpkgs/pkgs/by-name/ta/tabby/package.nix | 11 +- .../ta/tailscale-nginx-auth/package.nix | 8 +- .../by-name/ta/taler-exchange/package.nix | 97 + .../by-name/ta/taler-merchant/package.nix | 88 + .../ta/tartan/package.nix} | 31 +- .../pkgs/by-name/ta/taskwarrior3/package.nix | 25 +- .../nixpkgs/pkgs/by-name/td/tdl/package.nix | 6 +- .../nixpkgs/pkgs/by-name/td/tdnf/package.nix | 77 + .../nixpkgs/pkgs/by-name/te/tecoc/package.nix | 2 +- .../nixpkgs/pkgs/by-name/te/templ/package.nix | 6 +- .../nixpkgs/pkgs/by-name/te/tenki/package.nix | 6 +- .../nixpkgs/pkgs/by-name/te/tenv/package.nix | 6 +- .../pkgs/by-name/te/termsonic/package.nix | 33 + .../te/terraform-compliance/package.nix} | 0 .../te/terraform-plugin-docs/package.nix | 6 +- .../te/terragrunt/package.nix} | 6 +- .../by-name/te/tetrio-desktop/package.json | 22 - .../by-name/te/tetrio-desktop/package.nix | 9 +- .../by-name/te/tetrio-desktop/tetrio-plus.nix | 22 +- .../pkgs/by-name/te/tetrio-desktop/yarn.lock | 348 - .../pkgs/by-name/te/textsnatcher/package.nix | 4 +- .../by-name/th/the-powder-toy/package.nix | 75 + .../pkgs/by-name/th/themix-gui/package.nix | 6 +- .../pkgs/by-name/ti/tilemaker/package.nix | 2 +- .../nixpkgs/pkgs/by-name/ti/tilix/package.nix | 4 +- .../pkgs/by-name/ti/tiny-dfr/package.nix | 40 + .../pkgs/by-name/ti/tinymist/Cargo.lock | 190 +- .../pkgs/by-name/ti/tinymist/package.nix | 6 +- .../nixpkgs/pkgs/by-name/tk/tkdiff/189.patch | 71 - .../nixpkgs/pkgs/by-name/tk/tkdiff/194.patch | 15 - .../pkgs/by-name/tk/tkdiff/package.nix | 15 +- .../nixpkgs/pkgs/by-name/tl/tlrc/package.nix | 6 +- .../pkgs/by-name/to/tootik/package.nix | 6 +- .../pkgs/by-name/to/torctl/package.nix | 32 + .../pkgs/by-name/to/torrentstream/deps.nix | 66 +- .../pkgs/by-name/to/torrentstream/package.nix | 28 +- .../nixpkgs/pkgs/by-name/tp/tplay/cargo.diff | 13 - .../nixpkgs/pkgs/by-name/tp/tplay/package.nix | 19 +- .../nixpkgs/pkgs/by-name/tr/trak/package.nix | 34 + .../pkgs/by-name/tr/treedome/package.nix | 4 +- .../tr/treefmt/package.nix} | 0 .../pkgs/by-name/tr/treefmt2/package.nix | 33 + .../tr/tribler/package.nix} | 141 +- .../pkgs/by-name/tr/trickest-cli/package.nix | 33 + .../pkgs/by-name/tr/troubadix/package.nix | 4 +- .../nixpkgs/pkgs/by-name/tt/tt/package.nix | 35 + .../pkgs/by-name/tu/tuifimanager/package.nix | 60 +- .../tw/twiggy/package.nix} | 0 .../pkgs/by-name/tw/twitch-dl/package.nix | 25 +- .../pkgs/by-name/ty/typos-lsp/package.nix | 8 +- .../pkgs/by-name/ty/typstyle/Cargo.lock | 2 +- .../pkgs/by-name/ty/typstyle/package.nix | 14 +- .../pkgs/by-name/uc/ucblogo/package.nix | 44 + .../pkgs/by-name/uc/uclibc-ng/package.nix | 4 +- .../pkgs/by-name/ue/ueberzugpp/package.nix | 4 +- .../pkgs/by-name/ue/ueviewer/package.nix | 97 + .../pkgs/by-name/uh/uhttpmock_1_0/package.nix | 56 + .../nixpkgs/pkgs/by-name/ui/uiua/package.nix | 54 +- .../nixpkgs/pkgs/by-name/un/unciv/package.nix | 4 +- .../pkgs/by-name/un/unipicker/package.nix | 47 + .../pkgs/by-name/un/unison/package.nix | 8 +- .../universal-android-debloater/package.nix | 6 +- .../nixpkgs/pkgs/by-name/un/unrar/package.nix | 4 +- .../up/upbound/package.nix} | 6 +- .../pkgs/by-name/up/updatecli/package.nix | 6 +- .../pkgs/by-name/up/uplosi/package.nix | 6 +- .../nixpkgs/pkgs/by-name/up/ups/package.nix | 24 + .../nixpkgs/pkgs/by-name/up/upsun/package.nix | 19 +- .../nixpkgs/pkgs/by-name/us/usql/package.nix | 6 +- .../nixpkgs/pkgs/by-name/us/ustr/package.nix | 52 + .../us}/ustr/va_args.patch | 0 .../nixpkgs/pkgs/by-name/uu/uuu/package.nix | 4 +- .../nixpkgs/pkgs/by-name/uv/uv/Cargo.lock | 514 +- .../nixpkgs/pkgs/by-name/uv/uv/package.nix | 8 +- .../nixpkgs/pkgs/by-name/ux/uxn/package.nix | 6 +- .../ux/uxplay/package.nix} | 35 +- .../pkgs/by-name/va/vale-ls/package.nix | 61 + .../pkgs/by-name/va/valkey/package.nix | 85 + .../va/valkey/use_system_jemalloc.patch | 15 + .../pkgs/by-name/va/valuta/package.nix | 65 + .../nixpkgs/pkgs/by-name/va/varia/package.nix | 4 +- .../pkgs/by-name/va/vaults/package.nix | 4 +- .../pkgs/by-name/vc/vcpkg-tool/package.nix | 4 +- .../nixpkgs/pkgs/by-name/vc/vcpkg/package.nix | 4 +- .../vd/vdhcoapp/ffmpeg-filepicker.patch | 46 + .../pkgs/by-name/vd/vdhcoapp/filepicker.nix | 40 + .../pkgs/by-name/vd/vdhcoapp/package.nix | 83 + .../pkgs/by-name/ve/vencord/package-lock.json | 134 +- .../pkgs/by-name/ve/vencord/package.nix | 10 +- .../pkgs/by-name/ve/vesktop/package.nix | 23 +- .../by-name/vi/victoriametrics/package.nix | 4 +- .../vi/vis/package.nix} | 4 +- .../nixpkgs/pkgs/by-name/vl/vlc/package.nix | 4 +- .../pkgs/by-name/vu/vunnel/package.nix | 4 +- .../wa/wapm/package.nix} | 5 +- .../pkgs/by-name/wa/warp-terminal/package.nix | 12 +- .../by-name/wa/warp-terminal/versions.json | 8 +- .../pkgs/by-name/wa/waybar/package.nix | 203 + .../pkgs/by-name/wa/waycheck/package.nix | 10 +- .../wb/wbg/package.nix} | 4 +- .../pkgs/by-name/we/weasis/package.nix | 4 +- .../we}/webcord-vencord/add-extension.patch | 0 .../we/webcord-vencord/package.nix} | 19 +- .../we/webcord/package.nix} | 66 +- .../nixpkgs/pkgs/by-name/we/webcord/update.sh | 15 + .../pkgs/by-name/we/wechat-uos/package.nix | 35 +- .../wh/whatsapp-emoji-font/package.nix | 4 +- .../pkgs/by-name/wh/whistle/package.nix | 8 +- .../by-name/wi/windows10-icons/package.nix | 36 + .../nixpkgs/pkgs/by-name/wi/wio/package.nix | 6 +- .../wi/wireguard-vanity-keygen/package.nix | 6 +- .../pkgs/by-name/wi/wiremock/package.nix | 4 +- .../pkgs/by-name/wi/wireviz/package.nix | 36 + .../wi/wizer/package.nix} | 0 .../by-name/wl/wl-clip-persist/package.nix | 36 + .../pkgs/by-name/wl/wljoywake/package.nix | 48 + .../pkgs/by-name/wl/wlogout/package.nix | 4 +- .../pkgs/by-name/wl/wlr-layout-ui/package.nix | 6 +- .../by-name/wo/workout-tracker/package.nix | 4 +- .../pkgs/by-name/wo/wowup-cf/package.nix | 37 + .../wp/wpaperd/package.nix} | 26 +- .../nixpkgs/pkgs/by-name/wt/wtfis/package.nix | 4 +- .../wt/wttrbar/package.nix} | 6 +- .../pkgs/by-name/xa/xarcan/package.nix | 12 +- .../xc}/xcaddy/inject_version_info.diff | 0 .../xc/xcaddy/package.nix} | 4 +- .../xc}/xcaddy/use_tmpdir_on_darwin.diff | 0 .../pkgs/by-name/xc/xclicker/package.nix | 19 +- .../xd/xdg-terminal-exec-mkhl/package.nix | 27 + .../nixpkgs/pkgs/by-name/xe/xemu/package.nix | 8 +- .../nixpkgs/pkgs/by-name/xe/xeol/package.nix | 6 +- .../nixpkgs/pkgs/by-name/xe/xeve/package.nix | 4 +- .../nixpkgs/pkgs/by-name/xh/xhosts/Cargo.lock | 67 + .../pkgs/by-name/xh/xhosts/package.nix | 34 + .../nixpkgs/pkgs/by-name/xi/xiu/package.nix | 2 +- .../xl/xlights/package.nix} | 16 +- .../xm/xml-tooling-c/package.nix} | 37 +- .../pkgs/by-name/xn/xnlinkfinder/package.nix | 55 + .../nixpkgs/pkgs/by-name/xp/xplr/package.nix | 8 +- .../xp/xpointerbarrier/package.nix} | 22 +- .../ya/yabai/package.nix} | 122 +- .../pkgs/by-name/ya/yamlscript/package.nix | 4 +- .../by-name/ya/yazi-unwrapped/package.nix | 9 +- .../yd/ydotool/package.nix} | 38 +- .../pkgs/by-name/ye/yesplaymusic/package.nix | 4 +- .../nixpkgs/pkgs/by-name/yo/yofi/package.nix | 50 + .../pkgs/by-name/yo/your_spotify/client.nix | 58 + .../pkgs/by-name/yo/your_spotify/package.json | 10 + .../pkgs/by-name/yo/your_spotify/package.nix | 85 + .../pkgs/by-name/yo/youtrack/package.nix | 4 +- .../pkgs/by-name/yt/ytdownloader/package.nix | 4 +- .../yt/ytermusic}/Cargo.lock | 5155 +- .../pkgs/by-name/yt/ytermusic/package.nix | 54 + .../pkgs/by-name/za/zapzap/package.nix | 4 +- .../pkgs/by-name/ze/zed-editor/Cargo.lock | 1022 +- .../pkgs/by-name/ze/zed-editor/package.nix | 65 +- .../pkgs/by-name/zp/zpaqfranz/package.nix | 4 +- .../by-name/zw/zwave-js-server/package.nix | 6 +- .../pkgs/by-name/zx/zxtune/package.nix | 4 +- .../pkgs/common-updater/unstable-updater.nix | 228 +- .../documentation/gnome-user-docs/default.nix | 4 +- .../documentation/scheme-manpages/default.nix | 4 +- .../pkgs/data/fonts/0xproto/default.nix | 4 +- .../pkgs/data/fonts/3270font/default.nix | 2 +- .../pkgs/data/fonts/apl386/default.nix | 2 +- .../pkgs/data/fonts/barlow/default.nix | 2 +- .../pkgs/data/fonts/cascadia-code/default.nix | 6 +- .../pkgs/data/fonts/cooper-hewitt/default.nix | 2 +- .../pkgs/data/fonts/cozette/default.nix | 6 +- .../pkgs/data/fonts/font-awesome/default.nix | 4 +- .../pkgs/data/fonts/fraunces/default.nix | 2 +- .../data/fonts/ia-writer-duospace/default.nix | 2 +- .../nixpkgs/pkgs/data/fonts/iosevka/bin.nix | 2 +- .../pkgs/data/fonts/iosevka/default.nix | 6 +- .../pkgs/data/fonts/iosevka/variants.nix | 180 +- .../data/fonts/jetbrains-mono/default.nix | 2 +- .../pkgs/data/fonts/julia-mono/default.nix | 4 +- .../fonts/kanji-stroke-order-font/default.nix | 34 +- .../pkgs/data/fonts/lxgw-wenkai/default.nix | 4 +- .../pkgs/data/fonts/martian-mono/default.nix | 2 +- .../pkgs/data/fonts/rhodium-libre/default.nix | 2 +- .../data/fonts/undefined-medium/default.nix | 6 +- .../pkgs/data/fonts/work-sans/default.nix | 2 +- .../pkgs/data/fonts/xkcd-font/default.nix | 2 +- .../data/icons/kora-icon-theme/default.nix | 4 +- .../data/icons/nordzy-icon-theme/default.nix | 4 +- .../icons/numix-icon-theme-circle/default.nix | 4 +- .../icons/numix-icon-theme-square/default.nix | 4 +- .../data/icons/numix-icon-theme/default.nix | 4 +- .../data/icons/papirus-icon-theme/default.nix | 4 +- .../pkgs/data/icons/tau-hydrogen/default.nix | 2 +- .../icons/tela-circle-icon-theme/default.nix | 4 +- .../data/icons/tela-icon-theme/default.nix | 4 +- .../data/icons/whitesur-cursors/default.nix | 11 +- .../icons/whitesur-icon-theme/default.nix | 4 +- .../data/misc/cldr-annotations/default.nix | 6 +- .../data/misc/dbip-country-lite/default.nix | 4 +- .../nixpkgs/pkgs/data/misc/hackage/pin.json | 8 +- .../default.nix | 2 +- .../pkgs/data/misc/unicode-emoji/default.nix | 8 +- .../v2ray-domain-list-community/default.nix | 11 +- .../pkgs/data/misc/wireless-regdb/default.nix | 4 +- .../data/themes/alacritty-theme/default.nix | 14 +- .../data/themes/catppuccin-gtk/default.nix | 4 +- .../data/themes/colloid-gtk-theme/default.nix | 4 +- .../data/themes/dracula-theme/default.nix | 12 +- .../data/themes/flat-remix-gnome/default.nix | 8 +- .../data/themes/fluent-gtk-theme/default.nix | 20 +- .../themes/graphite-gtk-theme/default.nix | 4 +- .../kde-rounded-corners/default.nix | 4 +- .../pkgs/data/themes/matcha/default.nix | 4 +- .../material-kwin-decoration/default.nix | 6 +- .../themes/nixos-bgrt-plymouth/default.nix | 2 +- .../pkgs/data/themes/onestepback/default.nix | 12 +- .../pkgs/data/themes/orchis-theme/default.nix | 4 +- .../pkgs/data/themes/vimix/default.nix | 4 +- .../pkgs/data/themes/whitesur/default.nix | 14 +- .../nixpkgs/pkgs/data/themes/yaru/default.nix | 4 +- .../budgie/budgie-control-center/default.nix | 4 +- .../budgie/budgie-desktop-view/default.nix | 4 +- .../budgie/budgie-desktop/default.nix | 4 +- .../budgie/budgie-desktop/wrapper.nix | 4 +- .../budgie-gsettings-overrides/default.nix | 3 - .../budgie/budgie-screensaver/default.nix | 4 +- .../pkgs/desktops/budgie/magpie/default.nix | 4 +- .../pkgs/desktops/cinnamon/bulky/default.nix | 4 +- .../cinnamon/cinnamon-common/default.nix | 35 +- .../cinnamon-control-center/default.nix | 8 +- .../cinnamon/cinnamon-desktop/default.nix | 4 +- .../cinnamon/cinnamon-menus/default.nix | 4 +- .../cinnamon/cinnamon-screensaver/default.nix | 4 +- .../cinnamon/cinnamon-session/default.nix | 4 +- .../cinnamon-settings-daemon/default.nix | 4 +- .../cinnamon/mint-artwork/default.nix | 6 +- .../cinnamon/mint-l-icons/default.nix | 4 +- .../cinnamon/mint-x-icons/default.nix | 4 +- .../cinnamon/mint-y-icons/default.nix | 4 +- .../pkgs/desktops/cinnamon/muffin/default.nix | 4 +- .../pkgs/desktops/cinnamon/nemo/default.nix | 4 +- .../pkgs/desktops/cinnamon/pix/default.nix | 4 +- .../desktops/cinnamon/warpinator/default.nix | 4 +- .../pkgs/desktops/cinnamon/xapp/default.nix | 4 +- .../desktops/cinnamon/xreader/default.nix | 4 +- .../desktops/cinnamon/xviewer/default.nix | 4 +- .../core/dde-control-center/default.nix | 4 +- .../desktops/deepin/core/dde-dock/default.nix | 4 +- .../deepin/core/dde-file-manager/default.nix | 4 +- .../deepin/core/dde-session-shell/default.nix | 4 +- .../nixpkgs/pkgs/desktops/deepin/default.nix | 5 + .../deepin/go-package/dde-api/default.nix | 4 +- .../deepin/go-package/dde-daemon/default.nix | 4 +- .../deepin/go-package/startdde/default.nix | 4 +- .../deepin/library/dtk6core/default.nix | 84 + .../library/dtk6core/fix-pkgconfig-path.patch | 14 + .../library/dtk6core/fix-pri-path.patch | 17 + .../library/dtk6declarative/default.nix | 70 + .../dtk6declarative/fix-pkgconfig-path.patch | 14 + .../dtk6declarative/fix-pri-path.patch | 15 + .../deepin/library/dtk6gui/default.nix | 74 + .../library/dtk6gui/fix-pkgconfig-path.patch | 16 + .../deepin/library/dtk6gui/fix-pri-path.patch | 17 + .../library/dtk6systemsettings/default.nix | 63 + .../deepin/library/dtk6widget/default.nix | 83 + .../dtk6widget/fix-build-on-qt-6_7.patch | 20 + .../dtk6widget/fix-pkgconfig-path.patch | 14 + .../library/dtk6widget/fix-pri-path.patch | 17 + .../desktops/enlightenment/rage/default.nix | 4 +- .../gnome/apps/accerciser/default.nix | 6 +- .../desktops/gnome/apps/cheese/default.nix | 6 +- .../gnome/apps/file-roller/default.nix | 20 +- .../pkgs/desktops/gnome/apps/ghex/default.nix | 6 +- .../gnome/apps/gnome-boxes/default.nix | 14 +- .../gnome/apps/gnome-calendar/default.nix | 6 +- .../gnome/apps/gnome-characters/default.nix | 6 +- .../gnome/apps/gnome-clocks/default.nix | 6 +- .../gnome/apps/gnome-connections/default.nix | 10 +- .../gnome/apps/gnome-logs/default.nix | 6 +- .../gnome/apps/gnome-maps/default.nix | 22 +- .../gnome/apps/gnome-music/default.nix | 6 +- .../gnome/apps/gnome-nettool/default.nix | 4 +- .../gnome/apps/gnome-notes/default.nix | 6 +- .../apps/gnome-power-manager/default.nix | 4 +- .../apps/gnome-sound-recorder/default.nix | 2 +- .../gnome/apps/gnome-text-editor/default.nix | 6 +- .../gnome/apps/gnome-weather/default.nix | 6 +- .../desktops/gnome/apps/polari/default.nix | 13 +- .../desktops/gnome/apps/seahorse/default.nix | 6 +- .../desktops/gnome/apps/vinagre/default.nix | 10 +- .../gnome/core/adwaita-icon-theme/default.nix | 4 +- .../desktops/gnome/core/baobab/default.nix | 6 +- .../desktops/gnome/core/caribou/default.nix | 6 +- .../gnome/core/dconf-editor/default.nix | 6 +- .../pkgs/desktops/gnome/core/eog/default.nix | 6 +- .../desktops/gnome/core/epiphany/default.nix | 6 +- .../desktops/gnome/core/evince/default.nix | 12 +- .../core/evolution-data-server/default.nix | 14 +- .../hardcode-gsettings.patch | 38 +- .../pkgs/desktops/gnome/core/gdm/default.nix | 10 +- .../desktops/gnome/core/gdm/fix-paths.patch | 20 +- .../gnome/core/gnome-backgrounds/default.nix | 4 +- .../core/gnome-bluetooth/1.0/default.nix | 4 +- .../gnome/core/gnome-bluetooth/default.nix | 4 +- .../gnome/core/gnome-calculator/default.nix | 8 +- .../core/gnome-color-manager/default.nix | 1 + .../gnome/core/gnome-contacts/default.nix | 8 +- .../core/gnome-control-center/default.nix | 17 +- .../core/gnome-control-center/paths.patch | 49 +- .../gnome/core/gnome-dictionary/default.nix | 10 +- .../gnome/core/gnome-disk-utility/default.nix | 10 +- .../gnome/core/gnome-font-viewer/default.nix | 4 +- .../core/gnome-initial-setup/default.nix | 10 +- .../gnome/core/gnome-keyring/default.nix | 13 +- .../core/gnome-online-miners/default.nix | 6 +- .../core/gnome-remote-desktop/default.nix | 27 +- .../gnome/core/gnome-screenshot/default.nix | 4 +- .../desktops/gnome/core/gnome-session/ctl.nix | 4 +- .../gnome/core/gnome-session/default.nix | 11 +- .../core/gnome-settings-daemon/43/default.nix | 4 +- .../core/gnome-settings-daemon/default.nix | 8 +- .../core/gnome-shell-extensions/default.nix | 6 +- .../gnome/core/gnome-shell/default.nix | 28 +- .../gnome/core/gnome-shell/fix-paths.patch | 13 - .../core/gnome-shell/greeter-logo-size.patch | 8 +- .../gnome/core/gnome-software/default.nix | 18 +- .../core/gnome-system-monitor/default.nix | 22 +- .../gnome/core/gnome-terminal/default.nix | 17 +- .../gnome/core/gnome-tour/default.nix | 4 +- .../desktops/gnome/core/gucharmap/default.nix | 6 +- .../gnome/core/libgnome-keyring/default.nix | 2 +- .../desktops/gnome/core/mutter/43/default.nix | 4 +- .../desktops/gnome/core/mutter/default.nix | 10 +- .../desktops/gnome/core/nautilus/default.nix | 8 +- .../gnome/core/nautilus/extension_dir.patch | 2 - .../desktops/gnome/core/rygel/default.nix | 6 +- .../gnome/core/simple-scan/default.nix | 16 +- .../desktops/gnome/core/sushi/default.nix | 8 +- .../desktops/gnome/core/totem/default.nix | 6 +- .../desktops/gnome/core/yelp-xsl/default.nix | 2 +- .../pkgs/desktops/gnome/core/yelp/default.nix | 6 +- .../desktops/gnome/core/zenity/default.nix | 2 +- .../gnome/devtools/devhelp/default.nix | 6 +- .../gnome/extensions/buildGnomeExtension.nix | 3 +- .../desktops/gnome/extensions/default.nix | 2 +- .../gnome/extensions/extensionOverrides.nix | 6 +- .../gnome/extensions/extensionRenames.nix | 3 + .../desktops/gnome/extensions/extensions.json | 278 +- .../gnome-browser-connector/default.nix | 4 +- .../gnome/extensions/gsconnect/default.nix | 8 +- .../gnome/extensions/pop-shell/fix-gjs.patch | 12 + .../gnome/extensions/valent/default.nix | 2 +- .../gnome/games/aisleriot/default.nix | 12 +- .../desktops/gnome/games/atomix/default.nix | 6 +- .../gnome/games/five-or-more/default.nix | 6 +- .../gnome/games/four-in-a-row/default.nix | 6 +- .../gnome/games/gnome-2048/default.nix | 6 +- .../gnome/games/gnome-chess/default.nix | 6 +- .../gnome/games/gnome-klotski/default.nix | 6 +- .../gnome/games/gnome-mahjongg/default.nix | 2 +- .../gnome/games/gnome-mines/default.nix | 6 +- .../gnome/games/gnome-nibbles/default.nix | 6 +- .../gnome/games/gnome-robots/default.nix | 6 +- .../gnome/games/gnome-sudoku/default.nix | 6 +- .../gnome/games/gnome-taquin/default.nix | 6 +- .../gnome/games/gnome-tetravex/default.nix | 6 +- .../desktops/gnome/games/hitori/default.nix | 6 +- .../desktops/gnome/games/iagno/default.nix | 6 +- .../gnome/games/lightsoff/default.nix | 10 +- .../gnome/games/quadrapassel/default.nix | 6 +- .../gnome/games/swell-foop/default.nix | 31 +- .../desktops/gnome/games/tali/default.nix | 6 +- .../desktops/gnome/misc/geary/default.nix | 6 +- .../pkgs/desktops/gnome/misc/gitg/default.nix | 6 +- .../gnome/misc/gnome-applets/default.nix | 6 +- .../gnome/misc/gnome-flashback/default.nix | 14 +- .../gnome/misc/gnome-packagekit/default.nix | 4 +- .../gnome/misc/gnome-panel/default.nix | 10 +- .../gnome/misc/gnome-panel/wrapper.nix | 4 +- .../gnome/misc/gnome-tweaks/default.nix | 23 +- .../desktops/gnome/misc/gpaste/default.nix | 26 +- .../desktops/gnome/misc/metacity/default.nix | 10 +- .../gnome/misc/nautilus-python/default.nix | 6 +- .../desktops/gnome/misc/pomodoro/default.nix | 4 +- .../lomiri-system-settings/default.nix | 38 +- .../lomiri-system-settings/wrapper.nix | 4 +- .../lomiri/applications/lomiri/default.nix | 4 +- .../2001-Mark-problematic-tests.patch | 25 +- .../lomiri/qml/lomiri-ui-toolkit/default.nix | 38 +- .../lomiri/services/content-hub/default.nix | 4 +- .../services/lomiri-thumbnailer/default.nix | 4 +- .../pkgs/desktops/lumina/lumina/default.nix | 4 +- .../lxde/core/lxappearance/default.nix | 4 +- .../desktops/lxde/core/lxsession/default.nix | 4 +- .../pkgs/desktops/lxqt/libfm-qt/default.nix | 4 +- .../pkgs/desktops/lxqt/lximage-qt/default.nix | 4 +- .../lxqt/lxqt-notificationd/default.nix | 4 +- .../lxqt/lxqt-openssh-askpass/default.nix | 4 +- .../pkgs/desktops/lxqt/lxqt-panel/default.nix | 4 +- .../pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 2 + .../lxqt/xdg-desktop-portal-lxqt/default.nix | 4 +- .../pkgs/desktops/mate/atril/default.nix | 4 +- .../desktops/mate/caja-extensions/default.nix | 4 +- .../pkgs/desktops/mate/caja/default.nix | 4 +- .../desktops/mate/caja/with-extensions.nix | 4 +- .../pkgs/desktops/mate/engrampa/default.nix | 4 +- .../pkgs/desktops/mate/eom/default.nix | 4 +- .../pkgs/desktops/mate/marco/default.nix | 4 +- .../desktops/mate/mate-applets/default.nix | 4 +- .../pkgs/desktops/mate/mate-calc/default.nix | 4 +- .../mate/mate-control-center/default.nix | 4 +- .../desktops/mate/mate-desktop/default.nix | 4 +- .../mate/mate-indicator-applet/default.nix | 4 +- .../pkgs/desktops/mate/mate-media/default.nix | 4 +- .../desktops/mate/mate-netbook/default.nix | 4 +- .../mate/mate-notification-daemon/default.nix | 4 +- .../pkgs/desktops/mate/mate-panel/default.nix | 6 +- .../desktops/mate/mate-panel/with-applets.nix | 4 +- .../mate/mate-power-manager/default.nix | 4 +- .../mate/mate-screensaver/default.nix | 4 +- .../mate/mate-session-manager/default.nix | 4 +- .../mate/mate-settings-daemon/default.nix | 4 +- .../mate/mate-settings-daemon/wrapped.nix | 4 +- .../mate/mate-system-monitor/default.nix | 4 +- .../desktops/mate/mate-terminal/default.nix | 4 +- .../pkgs/desktops/mate/mate-tweak/default.nix | 4 +- .../desktops/mate/mate-user-share/default.nix | 4 +- .../pkgs/desktops/mate/mate-utils/default.nix | 4 +- .../pkgs/desktops/mate/mozo/default.nix | 4 +- .../pkgs/desktops/mate/pluma/default.nix | 4 +- .../pantheon/apps/appcenter/default.nix | 4 +- .../apps/elementary-calendar/default.nix | 4 +- .../apps/elementary-camera/default.nix | 4 +- .../pantheon/apps/elementary-code/default.nix | 4 +- .../pantheon/apps/elementary-dock/default.nix | 4 +- .../apps/elementary-files/default.nix | 4 +- .../pantheon/apps/elementary-mail/default.nix | 4 +- .../apps/elementary-photos/default.nix | 4 +- .../apps/elementary-screenshot/default.nix | 4 +- .../apps/elementary-tasks/default.nix | 4 +- .../apps/elementary-terminal/default.nix | 4 +- .../apps/elementary-videos/default.nix | 4 +- .../pantheon/apps/switchboard/default.nix | 4 +- .../pantheon/apps/switchboard/wrapper.nix | 4 +- .../desktop/elementary-greeter/default.nix | 6 +- .../desktop/file-roller-contract/default.nix | 2 +- .../pantheon/desktop/gala/default.nix | 4 +- .../pantheon/desktop/wingpanel/default.nix | 4 +- .../pantheon/desktop/wingpanel/wrapper.nix | 4 +- .../desktops/pantheon/granite/7/default.nix | 4 +- .../desktops/pantheon/granite/default.nix | 4 +- .../pantheon/services/contractor/default.nix | 4 +- .../elementary-capnet-assist/default.nix | 4 +- .../elementary-notifications/default.nix | 10 +- .../elementary-settings-daemon/default.nix | 4 +- .../pantheon-agent-geoclue2/default.nix | 4 +- .../pantheon-agent-polkit/default.nix | 4 +- .../wingpanel-indicator-ayatana/default.nix | 2 +- .../plasma-5/3rdparty/addons/polonium.nix | 6 +- .../plasma-5/kde-gtk-config/default.nix | 4 +- .../pkgs/desktops/rox/rox-filer/default.nix | 4 +- .../xfce/applications/catfish/default.nix | 4 +- .../xfce4-panel-profiles/default.nix | 60 +- .../xfce/core/libxfce4windowing/default.nix | 2 +- .../nixpkgs/pkgs/desktops/xfce/default.nix | 3 +- .../pkgs/desktops/xfce/mkXfceDerivation.nix | 4 +- .../xfce4-dockbarx-plugin/default.nix | 4 +- .../xfce4-namebar-plugin/default.nix | 43 - .../beam-modules/erlang-ls/default.nix | 4 +- .../beam-modules/erlang-ls/rebar-deps.nix | 9 +- .../beam-modules/ex_doc/default.nix | 2 +- .../development/beam-modules/fetch-hex.nix | 2 +- .../development/compilers/aspectj/default.nix | 4 +- .../compilers/ballerina/default.nix | 4 +- .../pkgs/development/compilers/c0/default.nix | 4 +- .../development/compilers/c3c/default.nix | 33 +- .../ensure-consistency-of-cargo-lock.patch | 1165 - .../compilers/cakelisp/default.nix | 6 +- .../compilers/chicken/5/overrides.nix | 36 +- .../compilers/circt/circt-llvm.nix | 6 +- .../development/compilers/circt/default.nix | 7 +- .../development/compilers/corretto/11.nix | 19 +- .../development/compilers/corretto/21.nix | 26 + .../compilers/corretto/mk-corretto.nix | 6 +- .../dart/package-source-builders/default.nix | 2 + .../sqlcipher_flutter_libs/default.nix | 45 + .../sqlite3/default.nix | 30 + .../development/compilers/dart/sources.nix | 12 +- .../compilers/dotnet/build-dotnet.nix | 39 +- .../development/compilers/dotnet/common.nix | 48 +- .../dotnet/record-downloaded-packages.patch | 42 - .../development/compilers/dotnet/stage0.nix | 8 - .../development/compilers/dtc/default.nix | 6 + .../development/compilers/ecl/default.nix | 4 +- .../development/compilers/erg/default.nix | 6 +- .../development/compilers/flix/default.nix | 4 +- .../compilers/flutter/versions/3_19/data.json | 76 +- .../development/compilers/flutter/wrapper.nix | 4 +- .../compilers/gcc/common/pre-configure.nix | 25 - .../pkgs/development/compilers/ghc/8.10.7.nix | 10 +- .../pkgs/development/compilers/ghc/9.10.1.nix | 4 + .../compilers/ghc/common-hadrian.nix | 84 +- .../compilers/ghcjs/8.10/common-overrides.nix | 1 + .../development/compilers/ghdl/default.nix | 2 +- .../development/compilers/gnu-cim/default.nix | 4 +- .../pkgs/development/compilers/go/1.21.nix | 4 +- .../go/go_no_vendor_checks-1.16.patch | 23 - .../development/compilers/haxe/default.nix | 8 +- .../development/compilers/idris2/idris2.nix | 10 +- .../development/compilers/inform6/default.nix | 4 +- .../compilers/inklecate/default.nix | 2 - .../development/compilers/julia/default.nix | 14 +- .../patches/1.9/0001-skip-building-doc.patch | 25 - .../development/compilers/kotlin/default.nix | 4 +- .../development/compilers/llvm/12/default.nix | 51 +- .../compilers/llvm/12/llvm/default.nix | 357 - .../development/compilers/llvm/13/default.nix | 46 +- .../compilers/llvm/13/llvm/default.nix | 315 - .../development/compilers/llvm/14/default.nix | 27 +- .../compilers/llvm/14/llvm/default.nix | 323 - .../development/compilers/llvm/15/default.nix | 63 +- .../compilers/llvm/15/llvm/default.nix | 442 - .../development/compilers/llvm/16/default.nix | 56 +- .../compilers/llvm/16/llvm/default.nix | 435 - .../development/compilers/llvm/17/default.nix | 56 +- .../compilers/llvm/17/llvm/default.nix | 431 - .../development/compilers/llvm/18/default.nix | 58 +- .../clang/clang-6-10-LLVMgold-path.patch | 15 - .../compilers/llvm/common/clang/default.nix | 6 +- .../libsanitizer-no-cyclades-11.patch | 80 - .../llvm/common/libcxxabi/no-threads.patch | 12 - .../llvm/{18 => common}/llvm/default.nix | 333 +- .../compilers/llvm/common/mlir/default.nix | 11 +- .../compilers/llvm/git/default.nix | 56 +- .../compilers/llvm/git/llvm/default.nix | 435 - .../development/compilers/miranda/default.nix | 6 +- .../development/compilers/mruby/default.nix | 2 +- .../development/compilers/nasm/default.nix | 4 +- .../development/compilers/nim/default.nix | 8 +- .../pkgs/development/compilers/ocaml/5.2.nix | 7 +- .../compilers/ocaml/ber-metaocaml.nix | 19 +- .../development/compilers/odin/default.nix | 12 +- .../development/compilers/open-watcom/v2.nix | 4 +- .../compilers/openjdk/openjfx/11.nix | 22 +- .../compilers/openjdk/openjfx/17.nix | 22 +- .../compilers/openjdk/openjfx/19.nix | 24 +- .../compilers/openjdk/openjfx/20.nix | 24 +- .../compilers/openjdk/openjfx/21.nix | 24 +- .../compilers/openjdk/openjfx/22.nix | 18 +- .../development/compilers/orc/default.nix | 2 +- .../development/compilers/osl/default.nix | 4 +- .../development/compilers/rasm/default.nix | 2 +- .../pkgs/development/compilers/rust/1_77.nix | 4 +- .../pkgs/development/compilers/rust/rustc.nix | 2 +- .../development/compilers/sbcl/default.nix | 51 +- .../dynamic-space-size-envvar-feature.patch | 63 + .../dynamic-space-size-envvar-tests.patch | 104 + .../sbcl/fix-2.4.0-aarch64-darwin.patch | 39 - .../compilers/scryer-prolog/default.nix | 8 +- .../development/compilers/shaderc/default.nix | 18 +- .../patches/force-unwrap-file-handles.patch | 33 - .../development/compilers/terra/default.nix | 3 +- .../development/compilers/tvm/default.nix | 4 +- .../compilers/typescript/default.nix | 2 +- .../development/compilers/vala/default.nix | 16 +- .../pkgs/development/compilers/zig/hook.nix | 4 +- .../compilers/zig/shell-completions.nix | 2 +- .../pkgs/development/compilers/zulu/22.nix | 6 +- .../pkgs/development/compilers/zz/Cargo.lock | 961 - .../pkgs/development/compilers/zz/default.nix | 52 - .../coq-modules/compcert/default.nix | 3 +- .../coq-modules/coq-lsp/default.nix | 2 +- .../coq-modules/coq-record-update/default.nix | 3 +- .../coq-modules/coqide/default.nix | 4 +- .../development/coq-modules/corn/default.nix | 2 + .../coq-modules/math-classes/default.nix | 2 + .../coq-modules/ssprove/default.nix | 48 + .../vscoq-language-server/default.nix | 4 +- .../arduino/arduino-core/chrootenv.nix | 1 - .../embedded/arduino/arduino-core/default.nix | 5 +- .../development/embedded/bossa/default.nix | 10 + .../embedded/fpga/openfpgaloader/default.nix | 2 +- .../embedded/stm32/stm32cubemx/default.nix | 6 +- .../guile-modules/guile-git/default.nix | 4 +- .../guile-modules/guile-lib/default.nix | 4 +- .../haskell-modules/cabal2nix-unstable.nix | 6 +- .../haskell-modules/configuration-common.nix | 201 +- .../haskell-modules/configuration-darwin.nix | 18 + .../configuration-ghc-8.10.x.nix | 3 - .../configuration-ghc-9.6.x.nix | 10 + .../configuration-ghc-9.8.x.nix | 18 +- .../haskell-modules/configuration-ghcjs.nix | 2 +- .../configuration-hackage2nix/broken.yaml | 31 +- .../configuration-hackage2nix/main.yaml | 24 +- .../configuration-hackage2nix/stackage.yaml | 66 +- .../transitive-broken.yaml | 33 +- .../haskell-modules/configuration-nix.nix | 106 +- .../haskell-modules/generic-builder.nix | 30 +- .../haskell-modules/hackage-packages.nix | 2856 +- .../haskell-modules/make-package-set.nix | 14 +- .../patches/git-annex-no-usr-prefix.patch | 13 + .../interpreters/boron/default.nix | 4 +- .../interpreters/clojure/default.nix | 4 +- .../interpreters/emilua/default.nix | 79 +- .../development/interpreters/erlang/25.nix | 4 +- .../development/interpreters/erlang/26.nix | 4 +- .../interpreters/erlang/27-rc2.nix | 6 - .../interpreters/erlang/27-rc3.nix | 6 + .../interpreters/erlang/generic-builder.nix | 4 +- .../interpreters/femtolisp/default.nix | 2 +- .../interpreters/gnudatalanguage/default.nix | 4 +- .../interpreters/gtk-server/default.nix | 4 +- .../interpreters/janet/default.nix | 4 +- .../interpreters/jruby/default.nix | 4 +- .../lua-5/build-luarocks-package.nix | 2 + .../interpreters/lua-5/hooks/default.nix | 13 - .../interpreters/lua-5/hooks/setup-hook.sh | 54 +- .../interpreters/lua-5/interpreter.nix | 15 +- .../development/interpreters/lua-5/utils.sh | 54 + .../interpreters/lua-5/wrap-lua.nix | 2 - .../development/interpreters/lua-5/wrap.sh | 2 + .../interpreters/lua-5/wrapper.nix | 4 +- .../interpreters/luajit/default.nix | 14 +- .../development/interpreters/luau/default.nix | 2 +- .../interpreters/nelua/default.nix | 15 +- .../interpreters/ngn-k/default.nix | 2 +- .../pkgs/development/interpreters/php/8.2.nix | 4 +- .../pkgs/development/interpreters/php/8.3.nix | 4 +- .../interpreters/picoc/default.nix | 29 +- .../python/cpython/2.7/default.nix | 1 - .../interpreters/python/cpython/default.nix | 1 - .../interpreters/python/default.nix | 4 +- .../interpreters/python/pypy/default.nix | 2 +- .../python/python-packages-base.nix | 5 +- .../interpreters/python/rustpython/Cargo.lock | 994 +- .../python/rustpython/default.nix | 7 +- .../interpreters/racket/default.nix | 4 +- .../interpreters/racket/racket_7_9.nix | 4 +- .../development/interpreters/rakudo/zef.nix | 4 +- .../interpreters/risor/default.nix | 6 +- .../development/interpreters/ruby/default.nix | 14 +- .../interpreters/ruby/rubygems/default.nix | 4 +- .../development/interpreters/wamr/default.nix | 4 +- .../interpreters/wasmtime/default.nix | 7 +- .../development/interpreters/zuo/default.nix | 2 +- .../pkgs/development/julia-modules/depot.nix | 5 + .../development/libraries/SDL2/default.nix | 2 +- .../development/libraries/SDL2_mixer/2_0.nix | 34 - .../libraries/SDL2_mixer/default.nix | 74 - .../libraries/SDL2_net/default.nix | 30 - .../libraries/accounts-qt/default.nix | 20 +- .../development/libraries/adns/default.nix | 1 - .../development/libraries/aravis/default.nix | 6 +- .../libraries/armadillo/default.nix | 4 +- .../libraries/at-spi2-core/default.nix | 4 +- .../libraries/audio/mbelib/default.nix | 2 +- .../libraries/audio/rtaudio/default.nix | 1 + .../libraries/audio/zix/default.nix | 5 +- .../libraries/aws-c-auth/default.nix | 4 +- .../libraries/aws-c-cal/default.nix | 4 +- .../libraries/aws-c-common/default.nix | 4 +- .../libraries/aws-c-io/default.nix | 4 +- .../libraries/aws-c-mqtt/default.nix | 4 +- .../libraries/aws-c-s3/default.nix | 4 +- .../libraries/aws-c-sdkutils/default.nix | 4 +- .../libraries/aws-crt-cpp/default.nix | 4 +- .../libraries/aws-sdk-cpp/default.nix | 4 +- .../libraries/ayatana-ido/default.nix | 4 +- .../development/libraries/babl/default.nix | 29 +- .../libraries/babl/dev-prefix.patch | 29 + .../development/libraries/bamf/default.nix | 4 +- .../pkgs/development/libraries/botan/2.0.nix | 4 +- .../pkgs/development/libraries/c-blosc/1.nix | 2 +- .../pkgs/development/libraries/c-blosc/2.nix | 2 +- .../libraries/catboost/default.nix | 30 +- .../libraries/catboost/remove-conan.patch | 16 +- .../pkgs/development/libraries/catch2/3.nix | 5 +- .../development/libraries/cegui/default.nix | 9 +- .../development/libraries/cista/default.nix | 9 +- .../development/libraries/cjson/default.nix | 4 +- .../development/libraries/codec2/default.nix | 10 +- .../libraries/cpp-utilities/default.nix | 8 +- .../libraries/criterion/default.nix | 50 - .../libraries/crossguid/default.nix | 6 +- .../libraries/ctranslate2/default.nix | 4 +- .../libraries/dbus-cplusplus/default.nix | 7 +- .../development/libraries/dconf/default.nix | 2 +- .../development/libraries/draco/default.nix | 2 +- .../development/libraries/drogon/default.nix | 4 +- .../development/libraries/duckdb/default.nix | 1 + .../libraries/duckdb/versions.json | 6 +- .../development/libraries/enchant/2.x.nix | 4 +- .../development/libraries/faac/default.nix | 11 +- .../development/libraries/faudio/default.nix | 4 +- .../development/libraries/ffmpeg/generic.nix | 21 + .../development/libraries/fizz/default.nix | 2 +- .../development/libraries/folks/default.nix | 6 +- .../libraries/functionalplus/default.nix | 4 +- .../pkgs/development/libraries/gcr/4.nix | 8 +- .../development/libraries/gcr/default.nix | 8 +- .../libraries/gdk-pixbuf/default.nix | 4 +- .../development/libraries/geis/default.nix | 4 +- .../development/libraries/gensio/default.nix | 4 +- .../development/libraries/geoclue/default.nix | 4 +- .../development/libraries/geos/default.nix | 3 +- .../development/libraries/gexiv2/default.nix | 2 +- .../libraries/gfbgraph/default.nix | 2 +- .../development/libraries/giflib/default.nix | 15 +- .../development/libraries/gjs/default.nix | 8 +- .../gjs/disable-introspection-test.patch | 12 + .../development/libraries/gl3w/default.nix | 2 +- .../pkgs/development/libraries/glfw/3.x.nix | 31 +- .../libraries/glib-networking/default.nix | 4 +- .../development/libraries/glib/default.nix | 143 +- .../glib/elementary-terminal-support.patch | 4 +- .../libraries/glib/glib-appinfo-watch.patch | 26 +- .../glib/schema-override-variable.patch | 4 +- .../libraries/glib/skip-timer-test.patch | 17 - .../libraries/glib/split-dev-programs.patch | 34 +- .../libraries/glibc/2.39-master.patch | 8526 +- .../development/libraries/glibc/common.nix | 17 +- .../development/libraries/glibc/default.nix | 3 +- .../development/libraries/glibmm/2.68.nix | 4 +- .../development/libraries/glibmm/default.nix | 4 +- .../pkgs/development/libraries/gmime/3.nix | 78 +- .../gnome-online-accounts/default.nix | 29 +- .../libraries/gnome-video-effects/default.nix | 2 +- .../development/libraries/gnu-efi/default.nix | 4 +- .../development/libraries/gnutls/default.nix | 17 +- .../gobject-introspection/default.nix | 10 +- .../development/libraries/gom/default.nix | 2 +- .../development/libraries/goocanvas/2.x.nix | 2 +- .../development/libraries/goocanvas/3.x.nix | 2 +- .../libraries/goocanvas/default.nix | 2 +- .../libraries/goocanvasmm/default.nix | 2 +- .../libraries/grilo-plugins/default.nix | 2 +- .../development/libraries/grilo/default.nix | 2 +- .../development/libraries/grpc/default.nix | 2 +- .../gsettings-desktop-schemas/default.nix | 4 +- .../development/libraries/gsound/default.nix | 2 +- .../development/libraries/gspell/default.nix | 2 +- .../libraries/gstreamer/bad/default.nix | 25 +- .../libraries/gstreamer/bad/fix-paths.patch | 26 +- .../libraries/gstreamer/base/default.nix | 9 +- .../libraries/gstreamer/core/default.nix | 9 +- .../libraries/gstreamer/default.nix | 3 +- .../libraries/gstreamer/devtools/default.nix | 4 +- .../libraries/gstreamer/ges/default.nix | 4 +- .../libraries/gstreamer/good/default.nix | 14 +- .../gstreamer/icamerasrc/default.nix | 2 +- .../libraries/gstreamer/libav/default.nix | 4 +- .../libraries/gstreamer/rs/Cargo.lock | 3242 +- .../libraries/gstreamer/rs/default.nix | 55 +- .../gstreamer/rtsp-server/default.nix | 4 +- .../libraries/gstreamer/ugly/default.nix | 6 +- .../libraries/gstreamer/vaapi/default.nix | 4 +- .../libraries/gstreamer/viperfx/default.nix | 4 +- .../libraries/gtk-frdp/default.nix | 14 +- .../libraries/gtk-mac-integration/default.nix | 2 +- .../pkgs/development/libraries/gtk/3.x.nix | 2 +- .../pkgs/development/libraries/gtk/4.x.nix | 27 +- .../libraries/gtkimageview/default.nix | 2 +- .../pkgs/development/libraries/gtkmm/4.x.nix | 4 +- .../libraries/gtksourceview/3.x.nix | 2 +- .../libraries/gtksourceview/4.x.nix | 2 +- .../libraries/gtksourceview/5.x.nix | 10 +- .../development/libraries/gumbo/default.nix | 4 +- .../libraries/gupnp-dlna/default.nix | 2 +- .../development/libraries/gusb/default.nix | 4 +- .../development/libraries/gvfs/default.nix | 16 +- .../development/libraries/hax11/default.nix | 2 +- .../libraries/howard-hinnant-date/default.nix | 7 + .../libraries/hunspell/dictionaries.nix | 6 +- .../development/libraries/hyena/default.nix | 2 +- .../development/libraries/icu/make-icu.nix | 16 +- .../libraries/intel-gmmlib/default.nix | 4 +- .../libraries/intel-media-driver/default.nix | 4 +- .../libraries/ipu6-camera-hal/default.nix | 2 +- .../development/libraries/jansson/default.nix | 2 +- .../libraries/java/commons/bcel/default.nix | 4 +- .../libraries/java/commons/io/default.nix | 4 +- .../java/commons/logging/default.nix | 4 +- .../libraries/jellyfin-ffmpeg/default.nix | 13 +- .../libraries/json-glib/default.nix | 2 +- .../libraries/kddockwidgets/default.nix | 18 +- .../libraries/kde-frameworks/kded.nix | 4 +- .../development/libraries/lasem/default.nix | 2 +- .../development/libraries/ldutils/default.nix | 32 +- .../libraries/leatherman/default.nix | 4 +- .../libraries/level-zero/default.nix | 4 +- .../libraries/libaccounts-glib/default.nix | 14 +- .../libraries/libadwaita/default.nix | 4 +- .../libraries/libajantv2/default.nix | 15 + .../development/libraries/libaom/default.nix | 13 +- .../libraries/libarchive/default.nix | 30 +- .../libraries/libbluray/default.nix | 11 +- .../development/libraries/libcec/default.nix | 2 +- .../development/libraries/libcec/platform.nix | 2 +- .../libraries/libchamplain/default.nix | 2 +- .../libraries/libcifpp/default.nix | 10 +- .../libraries/libcloudproviders/default.nix | 2 +- .../libraries/libcxxrt/default.nix | 12 +- .../libraries/libdatachannel/default.nix | 4 +- .../libraries/libdazzle/default.nix | 2 +- .../libraries/libdevil/default.nix | 2 + .../development/libraries/libdex/default.nix | 13 +- .../libraries/libdigidocpp/default.nix | 4 +- .../development/libraries/libdovi/Cargo.lock | 492 +- .../development/libraries/libdovi/default.nix | 4 +- .../libraries/libeatmydata/default.nix | 9 - .../development/libraries/libepc/default.nix | 2 +- .../libraries/libfyaml/default.nix | 2 +- .../libraries/libgbinder/default.nix | 4 +- .../libraries/libgdata/default.nix | 2 +- .../development/libraries/libgee/default.nix | 2 +- .../libraries/libgit2-glib/default.nix | 2 +- .../libraries/libglibutil/default.nix | 4 +- .../libraries/libgnome-games-support/2.0.nix | 2 +- .../libgnome-games-support/default.nix | 2 +- .../libraries/libgnome-keyring/default.nix | 2 +- .../libraries/libgnomekbd/default.nix | 4 +- .../development/libraries/libgnt/default.nix | 18 +- .../development/libraries/libgrss/default.nix | 2 +- .../libraries/libgudev/default.nix | 2 +- .../libraries/libgweather/default.nix | 6 +- .../development/libraries/libgxps/default.nix | 2 +- .../libraries/libhandy/default.nix | 2 +- .../libraries/libhdhomerun/default.nix | 2 +- .../development/libraries/libical/default.nix | 8 + .../libraries/libiconv/default.nix | 2 + .../libraries/libimagequant/default.nix | 2 +- .../development/libraries/libime/default.nix | 10 +- .../libraries/libirecovery/default.nix | 4 +- .../development/libraries/libjxl/default.nix | 9 +- .../libraries/libkqueue/default.nix | 2 +- .../development/libraries/libks/default.nix | 4 +- .../development/libraries/liblc3/default.nix | 9 +- .../development/libraries/libmad/default.nix | 3 +- .../development/libraries/libmcfp/default.nix | 4 +- .../libraries/libmodulemd/default.nix | 26 +- .../libraries/libmodulemd/glib-devdoc.patch | 13 - .../development/libraries/libopus/default.nix | 5 +- .../libopus/fix-pkg-config-paths.patch | 13 - .../development/libraries/liboqs/default.nix | 15 +- .../libraries/libowlevelzs/default.nix | 2 +- .../libraries/libpanel/default.nix | 4 +- .../development/libraries/libpeas/2.x.nix | 6 +- .../development/libraries/libpeas/default.nix | 6 +- .../libraries/libpg_query/default.nix | 2 +- .../libraries/libproxy/default.nix | 19 +- .../libraries/libqalculate/default.nix | 4 +- .../development/libraries/libqb/default.nix | 10 +- .../libraries/librealsense/default.nix | 2 +- .../libraries/librecast/default.nix | 4 +- .../libraries/libressl/default.nix | 4 +- .../development/libraries/librest/1.0.nix | 2 +- .../development/libraries/librest/default.nix | 2 +- .../development/libraries/librime/default.nix | 4 +- .../development/libraries/librsvg/default.nix | 2 +- .../libraries/libsecret/default.nix | 11 +- .../libraries/libsegfault/default.nix | 2 +- .../libraries/libshumate/default.nix | 28 +- .../development/libraries/libsolv/default.nix | 6 +- .../development/libraries/libsoup/3.x.nix | 2 +- .../development/libraries/libsoup/default.nix | 2 +- .../development/libraries/libsv/default.nix | 9 +- .../development/libraries/libtiff/4.5.nix | 86 - .../development/libraries/libtiff/default.nix | 5 +- .../libraries/libtiff/headers-4.5.patch | 16 - .../libraries/libtiff/libtiff_t.nix | 73 + .../libtiff/rename-version-4.5.patch | 21 - .../development/libraries/libubox/default.nix | 4 + .../libraries/libucontext/default.nix | 2 +- .../development/libraries/libunique/3.x.nix | 2 +- .../libraries/libunique/default.nix | 2 +- .../libraries/libunwind/default.nix | 2 +- .../development/libraries/liburcu/default.nix | 3 +- .../development/libraries/libusb1/default.nix | 15 +- .../development/libraries/libuv/default.nix | 6 +- .../development/libraries/libva/default.nix | 4 + .../development/libraries/libvgm/default.nix | 6 +- .../development/libraries/libvirt/default.nix | 11 + .../libraries/libvisual/default.nix | 3 + .../development/libraries/libvmaf/default.nix | 2 +- .../libraries/libwacom/default.nix | 4 +- .../development/libraries/libwebp/default.nix | 6 +- .../libraries/libxcrypt/default.nix | 14 +- .../libraries/libxkbcommon/default.nix | 13 +- .../libxkbcommon/disable-x11com.patch | 17 + .../libraries/libxlsxwriter/default.nix | 12 +- .../development/libraries/libxmlb/default.nix | 4 +- .../libxmlb/installed-tests-path.patch | 3 +- .../development/libraries/libz/default.nix | 6 +- .../libraries/libzapojit/default.nix | 2 +- .../development/libraries/libzim/default.nix | 4 +- .../development/libraries/llhttp/default.nix | 18 +- .../libraries/malcontent/default.nix | 4 +- .../development/libraries/mdk-sdk/default.nix | 4 +- .../development/libraries/mesa/default.nix | 392 +- .../libraries/mimalloc/default.nix | 4 +- .../libraries/minilibx/default.nix | 2 +- .../development/libraries/miniz/default.nix | 37 +- .../development/libraries/mlt/default.nix | 4 +- .../development/libraries/mongoc/default.nix | 4 +- .../development/libraries/mpich/default.nix | 4 +- .../libraries/msgpack-c/default.nix | 9 +- .../development/libraries/ncnn/default.nix | 4 +- .../development/libraries/ndi/default.nix | 22 +- .../development/libraries/ndi/version.json | 2 +- .../development/libraries/ngtcp2/gnutls.nix | 4 +- .../development/libraries/nng/default.nix | 4 +- .../pkgs/development/libraries/nss/latest.nix | 4 +- .../development/libraries/nsync/default.nix | 4 +- .../libraries/nvidia-vaapi-driver/default.nix | 4 +- .../development/libraries/ogre/default.nix | 6 +- .../libraries/onnxruntime/default.nix | 4 +- .../development/libraries/openbabel/2.nix | 2 + .../development/libraries/opendht/default.nix | 4 +- .../pkgs/development/libraries/openexr/3.nix | 5 + .../libraries/openexr/disable-iex-test.patch | 16 +- .../libraries/openimagedenoise/default.nix | 28 +- .../libraries/opensaml-cpp/default.nix | 7 +- .../development/libraries/openssl/default.nix | 29 +- .../libraries/openturns/default.nix | 82 - .../development/libraries/openvdb/default.nix | 2 +- .../libraries/openvino/default.nix | 6 +- .../libraries/openxr-loader/default.nix | 4 +- .../development/libraries/p11-kit/default.nix | 5 - .../development/libraries/pango/default.nix | 4 +- .../development/libraries/pangomm/2.48.nix | 4 +- .../development/libraries/parson/default.nix | 2 +- .../development/libraries/pcre/default.nix | 15 +- .../development/libraries/pcre2/default.nix | 2 +- .../physics/fastnlo-toolkit/default.nix | 4 + .../libraries/physics/nlojet/default.nix | 2 + .../libraries/pinocchio/default.nix | 33 +- .../libraries/pipewire/default.nix | 2 +- .../libraries/pipewire/wireplumber.nix | 4 +- .../development/libraries/poco/default.nix | 4 +- .../libraries/python-qt/default.nix | 56 +- .../libraries/qmenumodel/default.nix | 2 + .../libraries/qt-5/5.15/default.nix | 9 + .../libraries/qt-5/modules/qtpurchasing.nix | 14 + .../libraries/qt-5/modules/qtquick3d.nix | 11 + .../development/libraries/qt-6/default.nix | 6 - .../libraries/qt-6/hooks/qmake-hook.sh | 6 - .../libraries/qt-6/hooks/qtbase-setup-hook.sh | 14 - .../libraries/qt-6/modules/qtbase.nix | 8 - .../libraries/qt-6/modules/qtmultimedia.nix | 4 +- .../fix-qtgui-include-incorrect-case.patch | 13 + .../libraries/qtkeychain/default.nix | 7 +- .../qtstyleplugin-kvantum/default.nix | 4 +- .../libraries/quantlib/default.nix | 4 +- .../development/libraries/quarto/default.nix | 4 +- .../development/libraries/quictls/default.nix | 6 +- .../libraries/rapidcheck/default.nix | 2 +- .../libraries/rapidyaml/default.nix | 5 +- .../development/libraries/re2/default.nix | 4 +- .../development/libraries/rnnoise/default.nix | 80 +- .../libraries/rnnoise/model-version.json | 4 + .../libraries/robin-map/default.nix | 4 +- .../development/libraries/rocksdb/default.nix | 4 +- .../libraries/rutabaga_gfx/default.nix | 18 +- .../development/libraries/s2n-tls/default.nix | 4 +- .../science/biology/bicpl/default.nix | 31 +- .../chemistry/avogadrolibs/fragments.patch | 13 - .../science/chemistry/mmtf-cpp/default.nix | 10 +- .../libraries/science/math/blis/default.nix | 4 +- .../libraries/science/math/clblas/default.nix | 9 +- .../libraries/science/math/ipopt/default.nix | 4 +- .../libraries/science/math/itpp/default.nix | 2 +- .../libraries/science/math/libtorch/bin.nix | 13 +- .../science/math/libtorch/binary-hashes.nix | 24 +- .../science/math/libtorch/prefetch.sh | 5 +- .../science/math/openblas/default.nix | 14 +- .../science/math/openspecfun/default.nix | 4 +- .../libraries/science/math/osi/default.nix | 4 +- .../math/petsc/filter_mpi_warnings.patch | 26 +- .../libraries/simdjson/default.nix | 4 +- .../development/libraries/snappy/default.nix | 9 +- .../libraries/spice-gtk/default.nix | 4 +- .../libraries/sqlcipher/default.nix | 4 +- .../development/libraries/sqlite/default.nix | 4 +- .../development/libraries/sqlite/tools.nix | 4 +- .../libraries/template-glib/default.nix | 4 +- .../libraries/the-foundation/default.nix | 4 +- .../development/libraries/tkrzw/default.nix | 4 +- .../development/libraries/tllist/default.nix | 2 +- .../libraries/totem-pl-parser/default.nix | 2 +- .../libraries/tpm2-tss/default.nix | 13 +- .../tpm2-tss/no-dynamic-loader-path.patch | 505 +- .../libraries/tracker-miners/default.nix | 6 +- .../development/libraries/tracker/default.nix | 8 +- .../development/libraries/ubus/default.nix | 4 + .../development/libraries/ucc/default.nix | 4 +- .../development/libraries/ucl/default.nix | 5 +- .../development/libraries/uclient/default.nix | 1 + .../development/libraries/ucx/default.nix | 4 +- .../libraries/uriparser/default.nix | 5 +- .../development/libraries/ustr/default.nix | 43 - .../libraries/ustream-ssl/default.nix | 6 +- .../development/libraries/vte/default.nix | 16 +- .../libraries/wayland/protocols.nix | 4 +- .../development/libraries/waylib/default.nix | 9 + .../libraries/webrtc-audio-processing/0.3.nix | 2 +- .../webrtc-audio-processing/default.nix | 3 +- .../libraries/wfa2-lib/default.nix | 4 +- .../libraries/wildmidi/default.nix | 8 +- .../development/libraries/wlroots/default.nix | 8 +- .../libraries/wlroots/protocols.nix | 4 +- .../libraries/wxwidgets/wxGTK32.nix | 2 + .../libraries/xcb-imdkit/default.nix | 4 +- .../xdg-desktop-portal-gnome/default.nix | 4 +- .../xdg-desktop-portal-gtk/default.nix | 4 +- .../xdg-desktop-portal-xapp/default.nix | 4 +- .../libraries/xdg-desktop-portal/default.nix | 6 +- .../libraries/xml-security-c/default.nix | 35 +- .../development/libraries/yyjson/default.nix | 2 +- .../lisp-modules-new-obsolete/.gitattributes | 1 - .../lisp-modules-new-obsolete/.gitignore | 3 - .../lisp-modules-new-obsolete/doc/api.md | 197 - .../lisp-modules-new-obsolete/doc/nix-cl.md | 98 - .../doc/quicklisp.md | 54 - .../lisp-modules-new-obsolete/doc/quirks.md | 5 - .../examples/abcl-package-set.nix | 24 - .../examples/abcl-with-packages.nix | 23 - .../examples/bordeaux-threads.nix | 43 - .../examples/sbcl-with-bt.nix | 31 - .../lisp-modules-new-obsolete/import/api.lisp | 18 - .../import/database/sqlite.lisp | 162 - .../lisp-modules-new-obsolete/import/init.sql | 41 - .../import/main.lisp | 40 - .../lisp-modules-new-obsolete/import/nix.lisp | 81 - .../import/org.lispbuilds.nix.asd | 24 - .../import/repository/quicklisp.lisp | 199 - .../import/util.lisp | 16 - .../lisp-modules-new-obsolete/imported.nix | 72088 ---------------- .../lisp-packages.nix | 418 - .../old-make-wrapper.sh | 155 - .../lisp-modules-new-obsolete/packages.nix | 336 - .../patches/cffi-libffi-darwin-ffi-h.patch | 14 - .../cl-freetype2-fix-grovel-includes.patch | 16 - .../cl-liballegro-nuklear-missing-dll.patch | 17 - ....glucose-binary-from-PATH-if-present.patch | 27 - .../magicl-dont-build-fortran-twice.patch | 21 - .../patches/swank-pure-paths.patch | 28 - .../lisp-modules-new-obsolete/ql-import.lisp | 6 - .../lisp-modules-new-obsolete/ql.nix | 239 - .../lisp-modules-new-obsolete/readme.md | 34 - .../lisp-modules-new-obsolete/shell.nix | 7 - .../test/lispPackagesToTest.txt | 395 - .../lisp-modules-new-obsolete/test/test.lisp | 94 - .../lisp-modules-obsolete/README.txt | 30 - .../lisp-modules-obsolete/asdf/2.26.nix | 38 - .../lisp-modules-obsolete/asdf/3.1.nix | 37 - .../lisp-modules-obsolete/asdf/default.nix | 37 - .../clwrapper/build-with-lisp.sh | 67 - .../clwrapper/cl-wrapper.sh | 134 - .../clwrapper/common-lisp.sh | 3 - .../clwrapper/default.nix | 57 - .../clwrapper/setup-hook.sh | 39 - .../lisp-modules-obsolete/define-package.nix | 120 - .../from-quicklisp/asdf-description.sh | 16 - .../barebones-quicklisp-expression.sh | 174 - .../from-quicklisp/quicklisp-beta-env.sh | 16 - .../from-quicklisp/quicklisp-dependencies.sh | 11 - .../from-quicklisp/urls-from-page.sh | 14 - .../lisp-modules-obsolete/lisp-packages.nix | 272 - .../openssl-lib-marked.nix | 18 - .../quicklisp-to-nix-output/_1am.nix | 25 - .../_3bmd-ext-code-blocks.nix | 39 - .../quicklisp-to-nix-output/_3bmd.nix | 34 - .../quicklisp-to-nix-output/access.nix | 40 - .../quicklisp-to-nix-output/acclimation.nix | 26 - .../quicklisp-to-nix-output/agutil.nix | 29 - .../quicklisp-to-nix-output/alexandria.nix | 27 - .../quicklisp-to-nix-output/anaphora.nix | 28 - .../quicklisp-to-nix-output/arnesi.nix | 35 - .../array-operations.nix | 32 - .../quicklisp-to-nix-output/array-utils.nix | 26 - .../quicklisp-to-nix-output/arrows.nix | 31 - .../asdf-package-system.nix | 26 - .../asdf-system-connections.nix | 27 - .../quicklisp-to-nix-output/babel.nix | 28 - .../quicklisp-to-nix-output/binomial-heap.nix | 26 - .../quicklisp-to-nix-output/binpack.nix | 28 - .../quicklisp-to-nix-output/blackbird.nix | 26 - .../bordeaux-threads.nix | 31 - .../buildnode-xhtml.nix | 49 - .../quicklisp-to-nix-output/buildnode.nix | 50 - .../quicklisp-to-nix-output/calispel.nix | 36 - .../quicklisp-to-nix-output/cffi-grovel.nix | 31 - .../cffi-toolchain.nix | 32 - .../cffi-uffi-compat.nix | 32 - .../quicklisp-to-nix-output/cffi.nix | 35 - .../quicklisp-to-nix-output/chanl.nix | 32 - .../quicklisp-to-nix-output/check-it.nix | 32 - .../quicklisp-to-nix-output/chipz.nix | 26 - .../quicklisp-to-nix-output/chunga.nix | 26 - .../circular-streams.nix | 37 - .../quicklisp-to-nix-output/cl-aa.nix | 26 - .../quicklisp-to-nix-output/cl-annot.nix | 26 - .../quicklisp-to-nix-output/cl-anonfun.nix | 25 - .../quicklisp-to-nix-output/cl-ansi-text.nix | 30 - .../cl-ascii-table.nix | 27 - .../quicklisp-to-nix-output/cl-async-repl.nix | 44 - .../quicklisp-to-nix-output/cl-async-ssl.nix | 45 - .../quicklisp-to-nix-output/cl-async.nix | 42 - .../quicklisp-to-nix-output/cl-base64.nix | 29 - .../cl-cffi-gtk-cairo.nix | 40 - .../cl-cffi-gtk-gdk-pixbuf.nix | 42 - .../cl-cffi-gtk-gdk.nix | 48 - .../cl-cffi-gtk-gio.nix | 42 - .../cl-cffi-gtk-glib.nix | 37 - .../cl-cffi-gtk-gobject.nix | 41 - .../cl-cffi-gtk-pango.nix | 43 - .../quicklisp-to-nix-output/cl-cffi-gtk.nix | 49 - .../cl-change-case.nix | 34 - .../quicklisp-to-nix-output/cl-cli.nix | 26 - .../quicklisp-to-nix-output/cl-colors.nix | 30 - .../quicklisp-to-nix-output/cl-colors2.nix | 31 - .../quicklisp-to-nix-output/cl-containers.nix | 34 - .../quicklisp-to-nix-output/cl-cookie.nix | 35 - .../quicklisp-to-nix-output/cl-css.nix | 25 - .../quicklisp-to-nix-output/cl-csv.nix | 38 - .../quicklisp-to-nix-output/cl-cuda.nix | 45 - .../cl-custom-hash-table.nix | 26 - .../quicklisp-to-nix-output/cl-dbi.nix | 31 - .../quicklisp-to-nix-output/cl-difflib.nix | 27 - .../quicklisp-to-nix-output/cl-digraph.nix | 26 - .../quicklisp-to-nix-output/cl-dot.nix | 26 - .../quicklisp-to-nix-output/cl-emb.nix | 26 - .../cl-environments.nix | 42 - .../quicklisp-to-nix-output/cl-fad.nix | 31 - .../quicklisp-to-nix-output/cl-form-types.nix | 42 - .../cl-fuse-meta-fs.nix | 41 - .../quicklisp-to-nix-output/cl-fuse.nix | 36 - .../quicklisp-to-nix-output/cl-fuzz.nix | 26 - .../quicklisp-to-nix-output/cl-geometry.nix | 27 - .../cl-gobject-introspection.nix | 32 - .../quicklisp-to-nix-output/cl-heap.nix | 26 - .../quicklisp-to-nix-output/cl-hooks.nix | 35 - .../quicklisp-to-nix-output/cl-html-diff.nix | 26 - .../quicklisp-to-nix-output/cl-html-parse.nix | 26 - .../cl-html5-parser.nix | 32 - .../quicklisp-to-nix-output/cl-interpol.nix | 32 - .../quicklisp-to-nix-output/cl-jpeg.nix | 26 - .../quicklisp-to-nix-output/cl-json.nix | 29 - .../quicklisp-to-nix-output/cl-l10n-cldr.nix | 27 - .../quicklisp-to-nix-output/cl-l10n.nix | 43 - .../quicklisp-to-nix-output/cl-libuv.nix | 31 - .../quicklisp-to-nix-output/cl-locale.nix | 38 - .../quicklisp-to-nix-output/cl-markup.nix | 26 - .../quicklisp-to-nix-output/cl-mustache.nix | 26 - .../quicklisp-to-nix-output/cl-mysql.nix | 29 - .../quicklisp-to-nix-output/cl-num-utils.nix | 34 - .../quicklisp-to-nix-output/cl-paths-ttf.nix | 28 - .../quicklisp-to-nix-output/cl-paths.nix | 26 - .../quicklisp-to-nix-output/cl-pattern.nix | 34 - .../quicklisp-to-nix-output/cl-pdf.nix | 28 - .../quicklisp-to-nix-output/cl-postgres.nix | 41 - .../cl-postgres_plus_local-time.nix | 37 - .../cl-ppcre-template.nix | 39 - .../cl-ppcre-unicode.nix | 34 - .../quicklisp-to-nix-output/cl-ppcre.nix | 28 - .../quicklisp-to-nix-output/cl-prevalence.nix | 35 - .../quicklisp-to-nix-output/cl-project.nix | 35 - .../quicklisp-to-nix-output/cl-protobufs.nix | 32 - .../quicklisp-to-nix-output/cl-qprint.nix | 29 - .../quicklisp-to-nix-output/cl-qrencode.nix | 30 - .../quicklisp-to-nix-output/cl-reexport.nix | 26 - .../quicklisp-to-nix-output/cl-semver.nix | 31 - .../quicklisp-to-nix-output/cl-shellwords.nix | 29 - .../quicklisp-to-nix-output/cl-slice.nix | 30 - .../quicklisp-to-nix-output/cl-smt-lib.nix | 31 - .../quicklisp-to-nix-output/cl-smtp.nix | 39 - .../cl-speedy-queue.nix | 27 - .../quicklisp-to-nix-output/cl-store.nix | 28 - .../quicklisp-to-nix-output/cl-svg.nix | 25 - .../cl-syntax-annot.nix | 34 - .../cl-syntax-anonfun.nix | 33 - .../cl-syntax-markup.nix | 33 - .../quicklisp-to-nix-output/cl-syntax.nix | 31 - .../quicklisp-to-nix-output/cl-syslog.nix | 34 - .../quicklisp-to-nix-output/cl-test-more.nix | 35 - .../cl-typesetting.nix | 29 - .../quicklisp-to-nix-output/cl-unicode.nix | 31 - .../cl-unification.nix | 30 - .../quicklisp-to-nix-output/cl-utilities.nix | 26 - .../quicklisp-to-nix-output/cl-vectors.nix | 27 - .../quicklisp-to-nix-output/cl-webkit2.nix | 44 - .../quicklisp-to-nix-output/cl-who.nix | 28 - .../quicklisp-to-nix-output/cl-xmlspam.nix | 35 - .../quicklisp-to-nix-output/cl_plus_ssl.nix | 39 - .../clack-handler-hunchentoot.nix | 55 - .../quicklisp-to-nix-output/clack-socket.nix | 29 - .../quicklisp-to-nix-output/clack-test.nix | 80 - .../quicklisp-to-nix-output/clack.nix | 40 - .../quicklisp-to-nix-output/classowary.nix | 30 - .../quicklisp-to-nix-output/clfswm.nix | 26 - .../quicklisp-to-nix-output/closer-mop.nix | 26 - .../closure-common.nix | 30 - .../quicklisp-to-nix-output/closure-html.nix | 34 - .../clsql-postgresql-socket.nix | 32 - .../clsql-postgresql.nix | 32 - .../quicklisp-to-nix-output/clsql-sqlite3.nix | 32 - .../quicklisp-to-nix-output/clsql-uffi.nix | 31 - .../quicklisp-to-nix-output/clsql.nix | 30 - .../quicklisp-to-nix-output/clss.nix | 29 - .../clump-2-3-tree.nix | 27 - .../clump-binary-tree.nix | 27 - .../quicklisp-to-nix-output/clump.nix | 30 - .../quicklisp-to-nix-output/clunit.nix | 25 - .../quicklisp-to-nix-output/clunit2.nix | 25 - .../quicklisp-to-nix-output/clx.nix | 29 - .../quicklisp-to-nix-output/collectors.nix | 36 - .../quicklisp-to-nix-output/colorize.nix | 29 - .../command-line-arguments.nix | 32 - .../quicklisp-to-nix-output/css-lite.nix | 25 - .../css-selectors-simple-tree.nix | 52 - .../css-selectors-stp.nix | 52 - .../quicklisp-to-nix-output/css-selectors.nix | 51 - .../quicklisp-to-nix-output/cxml-stp.nix | 39 - .../quicklisp-to-nix-output/cxml.nix | 35 - .../quicklisp-to-nix-output/data-frame.nix | 34 - .../quicklisp-to-nix-output/data-table.nix | 40 - .../quicklisp-to-nix-output/dbd-mysql.nix | 35 - .../quicklisp-to-nix-output/dbd-postgres.nix | 39 - .../quicklisp-to-nix-output/dbd-sqlite3.nix | 38 - .../quicklisp-to-nix-output/dbi-test.nix | 36 - .../quicklisp-to-nix-output/dbi.nix | 42 - .../quicklisp-to-nix-output/dbus.nix | 51 - .../quicklisp-to-nix-output/defclass-std.nix | 29 - .../quicklisp-to-nix-output/dexador.nix | 51 - .../quicklisp-to-nix-output/dfio.nix | 39 - .../quicklisp-to-nix-output/dissect.nix | 26 - .../quicklisp-to-nix-output/djula.nix | 54 - .../quicklisp-to-nix-output/do-urlencode.nix | 29 - .../documentation-utils.nix | 28 - .../quicklisp-to-nix-output/drakma.nix | 40 - .../quicklisp-to-nix-output/eager-future2.nix | 31 - .../quicklisp-to-nix-output/enchant.nix | 30 - .../quicklisp-to-nix-output/esrap-peg.nix | 33 - .../quicklisp-to-nix-output/esrap.nix | 32 - .../external-program.nix | 31 - .../quicklisp-to-nix-output/fare-csv.nix | 25 - .../quicklisp-to-nix-output/fare-mop.nix | 29 - .../fare-quasiquote-extras.nix | 47 - .../fare-quasiquote-optima.nix | 46 - .../fare-quasiquote-readtable.nix | 33 - .../fare-quasiquote.nix | 29 - .../quicklisp-to-nix-output/fare-utils.nix | 27 - .../quicklisp-to-nix-output/fast-http.nix | 36 - .../quicklisp-to-nix-output/fast-io.nix | 34 - .../quicklisp-to-nix-output/fiasco.nix | 31 - .../file-attributes.nix | 34 - .../quicklisp-to-nix-output/fiveam.nix | 31 - .../quicklisp-to-nix-output/flexi-streams.nix | 30 - .../float-features.nix | 30 - .../quicklisp-to-nix-output/flow.nix | 29 - .../quicklisp-to-nix-output/fn.nix | 26 - .../quicklisp-to-nix-output/form-fiddle.nix | 30 - .../quicklisp-to-nix-output/fset.nix | 35 - .../quicklisp-to-nix-output/generic-cl.nix | 76 - .../generic-cl_dot_arithmetic.nix | 60 - .../generic-cl_dot_collector.nix | 62 - .../generic-cl_dot_comparison.nix | 57 - .../generic-cl_dot_container.nix | 60 - .../generic-cl_dot_internal.nix | 57 - .../generic-cl_dot_iterator.nix | 61 - .../generic-cl_dot_lazy-seq.nix | 68 - .../generic-cl_dot_map.nix | 65 - .../generic-cl_dot_math.nix | 60 - .../generic-cl_dot_object.nix | 60 - .../generic-cl_dot_sequence.nix | 67 - .../generic-cl_dot_set.nix | 69 - .../quicklisp-to-nix-output/gettext.nix | 31 - .../quicklisp-to-nix-output/global-vars.nix | 26 - .../quicklisp-to-nix-output/glsl-docs.nix | 28 - .../quicklisp-to-nix-output/glsl-spec.nix | 26 - .../quicklisp-to-nix-output/glsl-symbols.nix | 27 - .../quicklisp-to-nix-output/heap.nix | 25 - .../quicklisp-to-nix-output/html-encode.nix | 26 - .../quicklisp-to-nix-output/http-body.nix | 50 - .../hu_dot_dwim_dot_asdf.nix | 29 - .../hu_dot_dwim_dot_common-lisp.nix | 29 - .../hu_dot_dwim_dot_common.nix | 37 - .../hu_dot_dwim_dot_def.nix | 36 - .../hu_dot_dwim_dot_def_plus_swank.nix | 37 - .../hu_dot_dwim_dot_defclass-star.nix | 37 - .../hu_dot_dwim_dot_stefil.nix | 31 - ...im_dot_stefil_plus_hu_dot_dwim_dot_def.nix | 37 - ...il_plus_hu_dot_dwim_dot_def_plus_swank.nix | 43 - .../hu_dot_dwim_dot_stefil_plus_swank.nix | 34 - .../quicklisp-to-nix-output/hunchensocket.nix | 48 - .../quicklisp-to-nix-output/hunchentoot.nix | 54 - .../quicklisp-to-nix-output/idna.nix | 27 - .../quicklisp-to-nix-output/ieee-floats.nix | 29 - .../inferior-shell.nix | 55 - .../introspect-environment.nix | 27 - .../quicklisp-to-nix-output/iolib.nix | 47 - .../iolib_dot_asdf.nix | 28 - .../iolib_dot_base.nix | 35 - .../iolib_dot_common-lisp.nix | 31 - .../iolib_dot_conf.nix | 30 - .../iolib_dot_grovel.nix | 40 - .../quicklisp-to-nix-output/ironclad.nix | 62 - .../quicklisp-to-nix-output/iterate.nix | 29 - .../quicklisp-to-nix-output/jonathan.nix | 43 - .../quicklisp-to-nix-output/jpl-queues.nix | 32 - .../quicklisp-to-nix-output/jpl-util.nix | 25 - .../quicklisp-to-nix-output/jsown.nix | 26 - .../quicklisp-to-nix-output/kmrcl.nix | 28 - .../lack-component.nix | 35 - .../lack-middleware-backtrace.nix | 36 - .../quicklisp-to-nix-output/lack-util.nix | 39 - .../quicklisp-to-nix-output/lack.nix | 42 - .../quicklisp-to-nix-output/lambda-fiddle.nix | 27 - .../quicklisp-to-nix-output/legit.nix | 35 - .../quicklisp-to-nix-output/let-plus.nix | 30 - .../quicklisp-to-nix-output/lev.nix | 29 - .../quicklisp-to-nix-output/lfarm-client.nix | 42 - .../quicklisp-to-nix-output/lfarm-common.nix | 42 - .../quicklisp-to-nix-output/lfarm-server.nix | 41 - .../quicklisp-to-nix-output/lfarm-ssl.nix | 43 - .../quicklisp-to-nix-output/lift.nix | 26 - .../quicklisp-to-nix-output/lisp-binary.nix | 37 - .../lisp-namespace.nix | 28 - .../quicklisp-to-nix-output/lisp-stat.nix | 49 - .../quicklisp-to-nix-output/lisp-unit.nix | 26 - .../quicklisp-to-nix-output/lisp-unit2.nix | 39 - .../quicklisp-to-nix-output/lla.nix | 37 - .../quicklisp-to-nix-output/local-time.nix | 32 - .../quicklisp-to-nix-output/log4cl.nix | 32 - .../quicklisp-to-nix-output/lparallel.nix | 28 - .../quicklisp-to-nix-output/lquery.nix | 32 - .../quicklisp-to-nix-output/make-hash.nix | 26 - .../quicklisp-to-nix-output/map-set.nix | 25 - .../quicklisp-to-nix-output/marshal.nix | 27 - .../quicklisp-to-nix-output/md5.nix | 25 - .../quicklisp-to-nix-output/metabang-bind.nix | 27 - .../metatilities-base.nix | 27 - .../quicklisp-to-nix-output/mgl-pax.nix | 39 - .../quicklisp-to-nix-output/minheap.nix | 26 - .../misc-extensions.nix | 26 - .../mk-string-metrics.nix | 27 - .../quicklisp-to-nix-output/mmap.nix | 33 - .../quicklisp-to-nix-output/moptilities.nix | 26 - .../more-conditions.nix | 35 - .../quicklisp-to-nix-output/mt19937.nix | 26 - .../quicklisp-to-nix-output/myway.nix | 33 - .../named-readtables.nix | 31 - .../quicklisp-to-nix-output/nbd.nix | 33 - .../net-telent-date.nix | 26 - .../net_dot_didierverna_dot_asdf-flv.nix | 27 - .../quicklisp-to-nix-output/nibbles.nix | 29 - .../quicklisp-to-nix-output/num-utils.nix | 33 - .../quicklisp-to-nix-output/optima.nix | 28 - .../quicklisp-to-nix-output/osicat.nix | 33 - .../quicklisp-to-nix-output/parachute.nix | 31 - .../quicklisp-to-nix-output/parenscript.nix | 29 - .../parse-declarations-1_dot_0.nix | 27 - .../quicklisp-to-nix-output/parse-float.nix | 30 - .../quicklisp-to-nix-output/parse-number.nix | 28 - .../quicklisp-to-nix-output/parseq.nix | 28 - .../parser-combinators.nix | 31 - .../parser_dot_common-rules.nix | 39 - .../quicklisp-to-nix-output/pcall-queue.nix | 28 - .../quicklisp-to-nix-output/pcall.nix | 31 - .../physical-quantities.nix | 30 - .../quicklisp-to-nix-output/plump.nix | 30 - .../quicklisp-to-nix-output/postmodern.nix | 50 - .../quicklisp-to-nix-output/proc-parse.nix | 29 - .../quicklisp-to-nix-output/prove-asdf.nix | 26 - .../quicklisp-to-nix-output/prove.nix | 34 - .../quicklisp-to-nix-output/ptester.nix | 25 - .../quicklisp-to-nix-output/puri.nix | 28 - .../pythonic-string-reader.nix | 30 - .../quasiquote-2_dot_0.nix | 31 - .../quicklisp-to-nix-output/query-fs.nix | 44 - .../quicklisp-to-nix-output/quri.nix | 31 - .../quicklisp-to-nix-output/rfc2388.nix | 25 - .../quicklisp-to-nix-output/rove.nix | 31 - .../quicklisp-to-nix-output/rt.nix | 25 - .../quicklisp-to-nix-output/s-sql.nix | 43 - .../quicklisp-to-nix-output/s-sysdeps.nix | 33 - .../quicklisp-to-nix-output/s-xml.nix | 28 - .../quicklisp-to-nix-output/salza2.nix | 34 - .../quicklisp-to-nix-output/select.nix | 30 - .../quicklisp-to-nix-output/serapeum.nix | 63 - .../simple-date-time.nix | 26 - .../quicklisp-to-nix-output/simple-date.nix | 30 - .../simple-inferiors.nix | 33 - .../quicklisp-to-nix-output/simple-tasks.nix | 31 - .../quicklisp-to-nix-output/slynk.nix | 30 - .../quicklisp-to-nix-output/smart-buffer.nix | 30 - .../quicklisp-to-nix-output/smug.nix | 27 - .../quicklisp-to-nix-output/spinneret.nix | 67 - .../split-sequence.nix | 31 - .../quicklisp-to-nix-output/sqlite.nix | 30 - .../static-dispatch.nix | 43 - .../static-vectors.nix | 36 - .../quicklisp-to-nix-output/stefil.nix | 30 - .../quicklisp-to-nix-output/str.nix | 33 - .../quicklisp-to-nix-output/string-case.nix | 26 - .../quicklisp-to-nix-output/stumpwm.nix | 28 - .../quicklisp-to-nix-output/swank.nix | 25 - .../quicklisp-to-nix-output/swap-bytes.nix | 31 - .../quicklisp-to-nix-output/sycamore.nix | 29 - .../quicklisp-to-nix-output/symbol-munger.nix | 31 - .../quicklisp-to-nix-output/trees.nix | 28 - .../quicklisp-to-nix-output/trivia.nix | 45 - .../trivia_dot_balland2006.nix | 45 - .../trivia_dot_level0.nix | 31 - .../trivia_dot_level1.nix | 33 - .../trivia_dot_level2.nix | 40 - .../trivia_dot_quasiquote.nix | 46 - .../trivia_dot_trivial.nix | 45 - .../trivial-arguments.nix | 27 - .../trivial-backtrace.nix | 26 - .../trivial-clipboard.nix | 27 - .../quicklisp-to-nix-output/trivial-cltl2.nix | 27 - .../trivial-features.nix | 27 - .../trivial-file-size.nix | 30 - .../trivial-garbage.nix | 29 - .../trivial-gray-streams.nix | 27 - .../trivial-indent.nix | 27 - .../trivial-macroexpand-all.nix | 27 - .../trivial-main-thread.nix | 35 - .../quicklisp-to-nix-output/trivial-mimes.nix | 27 - .../trivial-package-local-nicknames.nix | 27 - .../quicklisp-to-nix-output/trivial-shell.nix | 27 - .../quicklisp-to-nix-output/trivial-types.nix | 26 - .../quicklisp-to-nix-output/trivial-utf-8.nix | 30 - .../trivial-with-current-source-form.nix | 28 - .../quicklisp-to-nix-output/type-i.nix | 38 - .../quicklisp-to-nix-output/uax-15.nix | 31 - .../quicklisp-to-nix-output/uffi.nix | 25 - .../quicklisp-to-nix-output/uiop.nix | 25 - .../quicklisp-to-nix-output/unit-test.nix | 25 - .../quicklisp-to-nix-output/unix-options.nix | 26 - .../quicklisp-to-nix-output/unix-opts.nix | 28 - .../usocket-server.nix | 32 - .../quicklisp-to-nix-output/usocket.nix | 27 - .../utilities_dot_print-items.nix | 31 - .../utilities_dot_print-tree.nix | 32 - .../quicklisp-to-nix-output/uuid.nix | 30 - .../quicklisp-to-nix-output/varjo.nix | 39 - .../vas-string-metrics.nix | 27 - .../quicklisp-to-nix-output/vecto.nix | 31 - .../quicklisp-to-nix-output/vom.nix | 25 - .../wild-package-inferred-system.nix | 30 - .../quicklisp-to-nix-output/woo.nix | 47 - .../quicklisp-to-nix-output/wookie.nix | 52 - .../quicklisp-to-nix-output/xembed.nix | 27 - .../quicklisp-to-nix-output/xkeyboard.nix | 29 - .../xml_dot_location.nix | 48 - .../quicklisp-to-nix-output/xmls.nix | 28 - .../quicklisp-to-nix-output/xpath.nix | 38 - .../quicklisp-to-nix-output/xsubseq.nix | 25 - .../quicklisp-to-nix-output/yacc.nix | 25 - .../quicklisp-to-nix-output/yason.nix | 28 - .../quicklisp-to-nix-output/zpb-ttf.nix | 26 - .../quicklisp-to-nix-output/zpng.nix | 28 - .../quicklisp-to-nix-overrides.nix | 295 - .../quicklisp-to-nix-systems.txt | 259 - .../quicklisp-to-nix.nix | 5247 -- .../quicklisp-to-nix/invocation.emb | 7 - .../quicklisp-to-nix/nix-package.emb | 23 - .../quicklisp-to-nix/parasitic-invocation.emb | 1 - .../quicklisp-to-nix/ql-to-nix.lisp | 327 - .../quicklisp-to-nix/quicklisp-bootstrap.lisp | 76 - .../quicklisp-to-nix/system-info.lisp | 493 - .../quicklisp-to-nix/top-package.emb | 13 - .../quicklisp-to-nix/util.lisp | 178 - .../lisp-modules-obsolete/quicklisp.sh | 85 - .../lisp-modules-obsolete/shell.nix | 38 - .../development/lisp-modules/packages.nix | 79 +- .../lua-modules/generated-packages.nix | 3487 +- .../development/lua-modules/nfd/default.nix | 14 +- .../development/lua-modules/overrides.nix | 78 +- .../pkgs/development/lua-modules/toml.patch | 24 +- .../development/lua-modules/updater/.flake8 | 2 + .../lua-modules/updater/updater.py | 21 +- .../development/misc/brev-cli/default.nix | 4 +- .../pkgs/development/misc/h3/default.nix | 2 +- .../pkgs/development/misc/loc/default.nix | 2 +- .../pkgs/development/misc/resholve/README.md | 26 +- .../pkgs/development/misc/resholve/source.nix | 4 +- .../pkgs/development/misc/resholve/test.nix | 116 +- .../development/misc/yelp-tools/default.nix | 2 +- .../development/mobile/genymotion/default.nix | 7 +- .../ocaml-modules/alcotest/default.nix | 10 +- .../development/ocaml-modules/awa/default.nix | 4 +- .../ocaml-modules/binning/default.nix | 23 + .../ocaml-modules/biotk/default.nix | 56 + .../development/ocaml-modules/bwd/default.nix | 4 +- .../ocaml-modules/ca-certs-nss/default.nix | 4 +- .../ocaml-modules/cmarkit/default.nix | 2 +- .../ocaml-modules/csexp/default.nix | 2 +- .../development/ocaml-modules/cstruct/ppx.nix | 4 +- .../dune-action-plugin/default.nix | 2 +- .../dune-configurator/default.nix | 2 +- .../ocaml-modules/dune-glob/default.nix | 2 +- .../dune-private-libs/default.nix | 2 +- .../ocaml-modules/earlybird/default.nix | 4 +- .../ocaml-modules/eliom/default.nix | 11 +- .../ocaml-modules/gen_js_api/default.nix | 4 +- .../development/ocaml-modules/iri/default.nix | 4 +- .../ocaml-modules/janestreet/0.15.nix | 14 + .../ocaml-modules/janestreet/0.16.nix | 26 +- .../ocaml-modules/janestreet/old.nix | 639 - .../ocaml-modules/lacaml/default.nix | 4 +- .../ocaml-modules/letsencrypt/default.nix | 4 +- .../development/ocaml-modules/lun/default.nix | 2 +- .../ocaml-modules/miou/default.nix | 2 +- .../ocaml-modules/mldoc/default.nix | 2 +- .../development/ocaml-modules/mtime/1_x.nix | 22 - .../ocaml-modules/ninja_utils/default.nix | 22 + .../ocaml-modules/ocaml-lsp/jsonrpc.nix | 2 +- .../ocaml-modules/ocaml-version/default.nix | 4 +- .../ocamlformat/ocamlformat-lib.nix | 2 +- .../ocamlformat/ocamlformat-rpc-lib.nix | 2 +- .../ocaml-modules/ocamlformat/ocamlformat.nix | 2 +- .../ocaml-modules/odoc-parser/default.nix | 18 +- .../ocaml-modules/odoc/default.nix | 10 +- .../ocaml-modules/pecu/default.nix | 8 +- .../ocaml-modules/phylogenetics/default.nix | 22 +- .../ocaml-modules/ppx_tools/default.nix | 5 +- .../ppx_yojson_conv_lib/default.nix | 2 +- .../ocaml-modules/ppxlib/default.nix | 6 +- .../ocaml-modules/riot/default.nix | 2 +- .../ocaml-modules/sedlex/default.nix | 2 +- .../ocaml-modules/streaming/default.nix | 26 + .../ocaml-modules/syslog-message/default.nix | 6 +- .../ocaml-modules/tsdl-ttf/default.nix | 4 +- .../ocaml-modules/unstrctrd/default.nix | 8 +- .../ocaml-modules/uring/default.nix | 5 +- .../ocaml-modules/visitors/default.nix | 2 +- .../development/ocaml-modules/zmq/default.nix | 4 +- .../development/octave-modules/ga/default.nix | 4 +- .../perl-modules/ImageExifTool/default.nix | 26 +- .../development/php-packages/amqp/default.nix | 10 +- .../development/php-packages/apcu/default.nix | 22 +- .../development/php-packages/ast/default.nix | 9 +- .../development/php-packages/box/default.nix | 12 +- .../php-packages/castor/default.nix | 15 +- .../php-packages/composer/default.nix | 40 +- .../php-packages/couchbase/default.nix | 16 +- .../php-packages/datadog_trace/default.nix | 69 +- .../php-packages/deployer/default.nix | 12 +- .../development/php-packages/ds/default.nix | 11 +- .../php-packages/event/default.nix | 14 +- .../php-packages/gnupg/default.nix | 13 +- .../development/php-packages/grpc/default.nix | 9 +- .../php-packages/grumphp/default.nix | 7 +- .../php-packages/igbinary/default.nix | 5 +- .../php-packages/imagick/default.nix | 8 +- .../php-packages/inotify/default.nix | 4 +- .../php-packages/ioncube-loader/default.nix | 20 +- .../php-packages/mailparse/default.nix | 6 +- .../php-packages/maxminddb/default.nix | 7 +- .../php-packages/memcache/default.nix | 17 +- .../php-packages/memcached/default.nix | 20 +- .../php-packages/meminfo/default.nix | 6 +- .../php-packages/memprof/default.nix | 16 +- .../php-packages/mongodb/default.nix | 57 +- .../development/php-packages/oci8/default.nix | 33 +- .../php-packages/openswoole/default.nix | 12 +- .../php-packages/opentelemetry/default.nix | 13 +- .../development/php-packages/pcov/default.nix | 11 +- .../php-packages/pdlib/default.nix | 8 +- .../php-packages/pdo_sqlsrv/default.nix | 9 +- .../php-packages/phalcon/default.nix | 14 +- .../development/php-packages/phan/default.nix | 52 +- .../php-packages/phing/default.nix | 50 +- .../php-packages/phive/default.nix | 7 +- .../php-packages/php-codesniffer/default.nix | 7 +- .../php-packages/php-cs-fixer/default.nix | 7 +- .../php-parallel-lint/default.nix | 7 +- .../php-packages/phpinsights/composer.lock | 1100 +- .../php-packages/phpinsights/default.nix | 9 +- .../php-packages/phpmd/default.nix | 7 +- .../php-packages/phpspy/default.nix | 13 +- .../php-packages/phpstan/default.nix | 12 +- .../php-packages/pinba/default.nix | 8 +- .../php-packages/protobuf/default.nix | 6 +- .../php-packages/psalm/default.nix | 7 +- .../php-packages/psysh/default.nix | 6 +- .../php-packages/rdkafka/default.nix | 12 +- .../php-packages/redis/default.nix | 14 +- .../php-packages/relay/default.nix | 157 +- .../development/php-packages/rrd/default.nix | 12 +- .../php-packages/smbclient/default.nix | 7 +- .../php-packages/snuffleupagus/default.nix | 39 +- .../development/php-packages/spx/default.nix | 14 +- .../php-packages/sqlsrv/default.nix | 12 +- .../development/php-packages/ssh2/default.nix | 6 +- .../php-packages/swoole/default.nix | 20 +- .../development/php-packages/uv/default.nix | 7 +- .../development/php-packages/vld/default.nix | 12 +- .../php-packages/xdebug/default.nix | 9 +- .../development/php-packages/yaml/default.nix | 12 +- .../development/php-packages/zstd/default.nix | 19 +- .../python-modules/accelerate/default.nix | 29 +- .../accessible-pygments/default.nix | 11 +- .../python-modules/accupy/default.nix | 19 +- .../python-modules/acoustics/default.nix | 1 - .../python-modules/acquire/default.nix | 8 +- .../adafruit-platformdetect/default.nix | 25 +- .../python-modules/adal/default.nix | 9 +- .../python-modules/adext/default.nix | 39 +- .../python-modules/aeppl/default.nix | 31 +- .../python-modules/aesara/default.nix | 24 +- .../python-modules/ailment/default.nix | 4 +- .../aioairzone-cloud/default.nix | 4 +- .../python-modules/aioamqp/default.nix | 13 +- .../python-modules/aioautomower/default.nix | 48 +- .../python-modules/aioazuredevops/default.nix | 55 +- .../python-modules/aiobotocore/default.nix | 4 +- .../python-modules/aiocache/default.nix | 54 +- .../python-modules/aiocontextvars/default.nix | 12 +- .../python-modules/aiocsv/default.nix | 32 +- .../python-modules/aiodhcpwatcher/default.nix | 1 + .../python-modules/aiodiscover/default.nix | 41 +- .../python-modules/aiodns/default.nix | 32 +- .../python-modules/aioeagle/default.nix | 26 +- .../python-modules/aioesphomeapi/default.nix | 4 +- .../python-modules/aiofiles/default.nix | 1 - .../python-modules/aiogram/default.nix | 74 +- .../python-modules/aiohttp-isal/default.nix | 56 + .../python-modules/aiohttp-jinja2/default.nix | 17 +- .../aiohttp-openmetrics/default.nix | 9 +- .../aiohttp-session/default.nix | 59 + .../python-modules/aiohttp/default.nix | 22 +- .../python-modules/aiokafka/default.nix | 12 +- .../python-modules/aiolyric/default.nix | 33 +- .../python-modules/aiomcache/default.nix | 49 + .../python-modules/aiomisc-pytest/default.nix | 44 +- .../python-modules/aiomisc/default.nix | 4 +- .../python-modules/aiomqtt/default.nix | 6 +- .../aiomultiprocess/default.nix | 26 +- .../python-modules/aiomysensors/default.nix | 43 +- .../python-modules/aiomysql/default.nix | 6 +- .../python-modules/aiopegelonline/default.nix | 35 +- .../python-modules/aiorpcx/default.nix | 4 +- .../python-modules/aiortm/default.nix | 4 +- .../python-modules/aiorun/default.nix | 8 +- .../python-modules/aioshelly/default.nix | 37 +- .../python-modules/aiosmtpd/default.nix | 10 +- .../python-modules/aiounifi/default.nix | 4 +- .../python-modules/aiovodafone/default.nix | 39 +- .../python-modules/aiowinreg/default.nix | 30 +- .../python-modules/airthings-ble/default.nix | 45 +- .../python-modules/airtouch5py/default.nix | 53 + .../python-modules/albumentations/default.nix | 23 +- .../python-modules/alembic/default.nix | 6 +- .../aliyun-python-sdk-kms/default.nix | 28 +- .../python-modules/allure-behave/default.nix | 4 +- .../python-modules/allure-pytest/default.nix | 4 +- .../allure-python-commons-test/default.nix | 4 +- .../allure-python-commons/default.nix | 4 +- .../amaranth-boards/default.nix | 6 +- .../python-modules/amaranth-soc/default.nix | 2 +- .../python-modules/amaranth/default.nix | 2 +- .../androidtvremote2/default.nix | 35 +- .../python-modules/angr/default.nix | 4 +- .../python-modules/anova-wifi/default.nix | 35 +- .../python-modules/ansible-compat/default.nix | 6 +- .../python-modules/ansible-kernel/default.nix | 7 +- .../python-modules/ansible-runner/default.nix | 13 +- .../python-modules/ansible/core.nix | 2 +- .../python-modules/ansible/default.nix | 4 +- .../python-modules/ansiwrap/default.nix | 19 +- .../python-modules/anthropic/default.nix | 59 +- .../python-modules/anywidget/default.nix | 4 +- .../python-modules/apipkg/default.nix | 6 +- .../python-modules/apispec/default.nix | 4 +- .../python-modules/app-model/default.nix | 41 +- .../python-modules/apprise/default.nix | 62 +- .../python-modules/approvaltests/default.nix | 14 +- .../python-modules/apscheduler/default.nix | 9 +- .../python-modules/aranet4/default.nix | 33 +- .../python-modules/archinfo/default.nix | 4 +- .../python-modules/argcomplete/default.nix | 4 +- .../python-modules/argilla/default.nix | 278 +- .../python-modules/argostranslate/default.nix | 4 +- .../python-modules/art/default.nix | 6 +- .../python-modules/asana/default.nix | 21 +- .../python-modules/asciitree/default.nix | 19 +- .../python-modules/asdf/default.nix | 65 +- .../python-modules/ase/default.nix | 34 +- .../python-modules/asgineer/default.nix | 6 +- .../python-modules/aspell-python/default.nix | 7 +- .../python-modules/asteval/default.nix | 43 +- .../astropy-healpix/default.nix | 9 +- .../python-modules/astroquery/default.nix | 13 +- .../python-modules/asyncio-dgram/default.nix | 37 +- .../python-modules/asyncssh/default.nix | 17 +- .../python-modules/asyncwhois/default.nix | 47 +- .../python-modules/atomman/default.nix | 16 +- .../python-modules/atpublic/default.nix | 8 +- .../atsim-potentials/default.nix | 30 +- .../python-modules/attacut/default.nix | 73 + .../python-modules/aubio/default.nix | 15 +- .../python-modules/audiotools/default.nix | 5 +- .../python-modules/augmax/default.nix | 13 +- .../python-modules/autobahn/default.nix | 19 +- .../development/python-modules/av/default.nix | 10 + .../python-modules/avro/default.nix | 13 +- .../python-modules/avwx-engine/default.nix | 84 + .../python-modules/awkward-cpp/default.nix | 8 +- .../python-modules/awkward/default.nix | 11 +- .../python-modules/awscrt/default.nix | 4 +- .../python-modules/awswrangler/default.nix | 78 +- .../development/python-modules/ax/default.nix | 6 +- .../python-modules/azure-cosmos/default.nix | 35 +- .../python-modules/azure-identity/default.nix | 4 +- .../python-modules/azure-mgmt-cdn/default.nix | 7 +- .../azure-mgmt-compute/default.nix | 46 +- .../azure-mgmt-containerservice/default.nix | 33 +- .../azure-mgmt-datafactory/default.nix | 4 +- .../azure-mgmt-frontdoor/default.nix | 40 +- .../azure-mgmt-recoveryservices/default.nix | 4 +- .../default.nix | 30 +- .../python-modules/b2sdk/default.nix | 7 +- .../default.nix | 2 +- .../backports-shutil-which/default.nix | 5 +- .../python-modules/bash-kernel/default.nix | 20 +- .../python-modules/bash-kernel/test.ipynb | 26 + .../python-modules/bayespy/default.nix | 43 +- .../bc-detect-secrets/default.nix | 50 +- .../python-modules/bdffont/default.nix | 4 +- .../beancount-black/default.nix | 4 +- .../beancount-parser/default.nix | 4 +- .../python-modules/beartype/default.nix | 4 +- .../python-modules/before-after/default.nix | 2 +- .../python-modules/bellows/default.nix | 55 +- .../python-modules/betterproto/default.nix | 1 + .../python-modules/bibtexparser/default.nix | 1 - .../python-modules/bids-validator/default.nix | 4 +- .../bimmer-connected/default.nix | 10 +- .../binance-connector/default.nix | 61 + .../python-modules/biom-format/default.nix | 71 + .../biopython/close_parser_on_time.patch | 18 + .../python-modules/biopython/default.nix | 27 +- .../python-modules/birch/default.nix | 6 +- .../python-modules/bitbox02/default.nix | 38 +- .../python-modules/black/default.nix | 4 +- .../python-modules/blackjax/default.nix | 24 +- .../python-modules/bleak/default.nix | 4 +- .../python-modules/bloodyad/default.nix | 47 +- .../bluetooth-adapters/default.nix | 10 +- .../bluetooth-auto-recovery/default.nix | 41 +- .../python-modules/bokeh/default.nix | 6 +- .../bokeh/hardcode-nodejs-npmjs-paths.patch | 11 +- .../python-modules/borb/default.nix | 2 +- .../python-modules/boto3-stubs/default.nix | 4 +- .../python-modules/botocore-stubs/default.nix | 4 +- .../python-modules/botocore/default.nix | 4 +- .../python-modules/botorch/default.nix | 4 +- .../python-modules/boxx/default.nix | 4 +- .../python-modules/branca/default.nix | 4 +- .../python-modules/breathe/default.nix | 5 + .../python-modules/breezy/default.nix | 2 +- .../python-modules/bsddb3/default.nix | 10 +- .../python-modules/bthome-ble/default.nix | 51 +- .../python-modules/btrfs/default.nix | 4 +- .../python-modules/bugsnag/default.nix | 4 +- .../python-modules/build/default.nix | 4 +- .../python-modules/cachelib/default.nix | 4 +- .../python-modules/cachier/default.nix | 4 +- .../python-modules/cadquery/default.nix | 100 - .../python-modules/cartopy/default.nix | 4 +- .../casa-formats-io/default.nix | 51 +- .../cassandra-driver/default.nix | 4 +- .../python-modules/cbor/default.nix | 2 +- .../python-modules/cbor2/default.nix | 4 +- .../python-modules/cdcs/default.nix | 43 +- .../python-modules/celery/default.nix | 65 +- .../python-modules/cepa/default.nix | 48 - .../python-modules/cgen/default.nix | 2 +- .../python-modules/chai/default.nix | 8 + .../character-encoding-utils/default.nix | 4 +- .../python-modules/chart-studio/default.nix | 4 +- .../chat-downloader/default.nix | 2 +- .../python-modules/cheroot/default.nix | 4 +- .../python-modules/chromadb/default.nix | 114 +- .../python-modules/clarifai-grpc/default.nix | 4 +- .../python-modules/clarifai/default.nix | 4 +- .../python-modules/claripy/default.nix | 4 +- .../python-modules/cle/default.nix | 6 +- .../click-didyoumean/default.nix | 27 +- .../python-modules/click-spinner/default.nix | 36 +- .../python-modules/clickgen/default.nix | 4 +- .../python-modules/cloudevents/default.nix | 55 + .../python-modules/cloudflare/default.nix | 4 +- .../python-modules/coffea/default.nix | 25 +- .../python-modules/cohere/default.nix | 31 +- .../python-modules/comicon/default.nix | 5 +- .../python-modules/command-runner/default.nix | 34 +- .../conda-libmamba-solver/default.nix | 47 + .../conda-package-handling/default.nix | 30 + .../conda-package-streaming/default.nix | 35 + .../python-modules/conda/0001-conda_exe.patch | 51 + .../python-modules/conda/default.nix | 91 +- .../python-modules/contexttimer/default.nix | 3 + .../python-modules/contourpy/default.nix | 6 +- .../python-modules/controku/default.nix | 4 +- .../python-modules/coordinates/default.nix | 30 +- .../python-modules/coredis/default.nix | 4 +- .../python-modules/cornice/default.nix | 38 +- .../python-modules/courlan/default.nix | 56 +- .../python-modules/coverage/default.nix | 4 +- .../craft-application/default.nix | 38 +- .../python-modules/cramjam/default.nix | 39 +- .../python-modules/crc/default.nix | 37 +- .../python-modules/croniter/default.nix | 4 +- .../python-modules/cryptacular/default.nix | 27 - .../python-modules/cryptodatahub/default.nix | 10 +- .../python-modules/cryptoparser/default.nix | 44 +- .../python-modules/css-inline/Cargo.lock | 689 +- .../python-modules/css-inline/default.nix | 7 +- .../python-modules/curio/default.nix | 2 +- .../python-modules/curl-cffi/default.nix | 49 + .../curl-cffi/use-system-libs.patch | 23 + .../python-modules/customtkinter/default.nix | 53 + .../python-modules/cvxpy/default.nix | 15 +- .../python-modules/cycler/default.nix | 1 - .../cyclonedx-python-lib/default.nix | 68 +- .../python-modules/cymem/default.nix | 18 +- .../python-modules/cypari2/default.nix | 5 + .../python-modules/cypherpunkpay/default.nix | 1 + .../python-modules/cysignals/default.nix | 5 + .../development/python-modules/cython/0.nix | 1 - .../python-modules/cython/default.nix | 10 +- .../python-modules/cytoolz/default.nix | 1 - .../python-modules/dask-awkward/default.nix | 2 + .../python-modules/dask-expr/default.nix | 62 + .../python-modules/dask-glm/default.nix | 2 + .../python-modules/dask-jobqueue/default.nix | 4 +- .../python-modules/dask-ml/default.nix | 42 +- .../python-modules/dask-yarn/default.nix | 27 +- .../python-modules/dask/default.nix | 50 +- .../databricks-connect/default.nix | 4 +- .../dataclasses-json/default.nix | 18 +- .../python-modules/datasets/default.nix | 4 +- .../python-modules/datashader/default.nix | 4 +- .../python-modules/datashape/default.nix | 1 - .../python-modules/dbt-core/default.nix | 4 +- .../python-modules/dbt-redshift/default.nix | 4 +- .../python-modules/dbus-fast/default.nix | 37 +- .../python-modules/dbus-python/default.nix | 94 +- .../dbus-python/fix-includedir.patch | 8 - .../python-modules/dbutils/default.nix | 18 +- .../python-modules/deebot-client/default.nix | 51 +- .../python-modules/deepl/default.nix | 4 +- .../desktop-notifier/default.nix | 14 +- .../python-modules/detect-secrets/default.nix | 2 +- .../python-modules/devito/default.nix | 24 +- .../python-modules/diffusers/default.nix | 26 +- .../python-modules/dirigera/default.nix | 4 +- .../dissect-archive/default.nix | 45 + .../python-modules/dissect-btrfs/default.nix | 4 +- .../python-modules/dissect-cim/default.nix | 39 +- .../python-modules/dissect-clfs/default.nix | 35 +- .../dissect-cobaltstrike/default.nix | 43 +- .../dissect-cstruct/default.nix | 29 +- .../python-modules/dissect-esedb/default.nix | 4 +- .../python-modules/dissect-etl/default.nix | 35 +- .../dissect-eventlog/default.nix | 6 +- .../dissect-evidence/default.nix | 35 +- .../dissect-executable/default.nix | 29 +- .../python-modules/dissect-extfs/default.nix | 6 +- .../python-modules/dissect-fat/default.nix | 29 +- .../python-modules/dissect-ffs/default.nix | 39 +- .../dissect-hypervisor/default.nix | 41 +- .../python-modules/dissect-jffs/default.nix | 4 +- .../python-modules/dissect-ntfs/default.nix | 6 +- .../python-modules/dissect-ole/default.nix | 33 +- .../python-modules/dissect-regf/default.nix | 6 +- .../dissect-shellitem/default.nix | 39 +- .../python-modules/dissect-sql/default.nix | 39 +- .../dissect-squashfs/default.nix | 37 +- .../python-modules/dissect-target/default.nix | 54 +- .../dissect-thumbcache/default.nix | 35 +- .../python-modules/dissect-util/default.nix | 4 +- .../python-modules/dissect-vmfs/default.nix | 6 +- .../python-modules/dissect-volume/default.nix | 6 +- .../python-modules/dissect-xfs/default.nix | 39 +- .../python-modules/dissect/default.nix | 84 +- .../python-modules/distributed/default.nix | 8 +- .../python-modules/dj-rest-auth/default.nix | 67 +- .../python-modules/django-allauth/default.nix | 6 + .../django-auth-ldap/default.nix | 4 +- .../django-bootstrap3/default.nix | 4 +- .../django-bootstrap4/default.nix | 4 +- .../django-bootstrap5/default.nix | 36 +- .../django-configurations/default.nix | 4 +- .../django-extensions/default.nix | 22 +- .../django-hierarkey/default.nix | 18 +- .../python-modules/django-ipware/default.nix | 4 +- .../django-mailman3/default.nix | 27 +- .../django-model-utils/default.nix | 4 +- .../python-modules/django-mysql/default.nix | 14 +- .../python-modules/django-otp/default.nix | 4 +- .../django-statici18n/default.nix | 7 +- .../django-tastypie/default.nix | 30 +- .../development/python-modules/django/4.nix | 21 +- .../development/python-modules/django/5.nix | 20 +- .../python-modules/dkimpy/default.nix | 4 +- .../python-modules/dm-control/default.nix | 98 + .../dnf-plugins-core/default.nix | 4 +- .../python-modules/dnf4/default.nix | 7 +- .../python-modules/dnfile/default.nix | 2 +- .../python-modules/dnslib/default.nix | 2 +- .../python-modules/docformatter/default.nix | 6 + .../python-modules/docplex/default.nix | 16 +- .../docstr-coverage/default.nix | 4 +- .../python-modules/docutils/default.nix | 34 +- .../python-modules/dogpile-cache/default.nix | 4 +- .../python-modules/dogtail/default.nix | 4 +- .../python-modules/domeneshop/default.nix | 14 +- .../python-modules/drawsvg/default.nix | 61 + .../drf-spectacular/default.nix | 74 +- .../python-modules/dropbox/default.nix | 12 +- .../python-modules/dropmqttapi/default.nix | 23 +- .../python-modules/ducc0/default.nix | 25 +- .../python-modules/duckdb-engine/default.nix | 25 +- .../duckdb-engine/remote_data.patch | 24 - .../python-modules/duckdb/default.nix | 7 +- .../duckduckgo-search/default.nix | 98 +- .../python-modules/dulwich/default.nix | 19 +- .../python-modules/dungeon-eos/default.nix | 2 +- .../python-modules/dwdwfsapi/default.nix | 13 +- .../python-modules/ecdsa/default.nix | 4 +- .../python-modules/eigenpy/default.nix | 4 +- .../python-modules/einops/default.nix | 4 +- .../elastic-transport/default.nix | 19 +- .../python-modules/elasticsearch/default.nix | 4 +- .../python-modules/elasticsearch8/default.nix | 4 +- .../python-modules/elkm1-lib/default.nix | 41 +- .../python-modules/emcee/default.nix | 4 +- .../python-modules/emv/default.nix | 61 +- .../python-modules/env-canada/default.nix | 13 +- .../python-modules/epitran/default.nix | 58 + .../python-modules/equinox/default.nix | 17 +- .../python-modules/etelemetry/default.nix | 40 +- .../python-modules/eve/default.nix | 2 +- .../eventlet/remove-distutils-usage.patch | 143 - .../python-modules/exchangelib/default.nix | 4 +- .../python-modules/execnb/default.nix | 37 +- .../python-modules/execnet/default.nix | 4 +- .../python-modules/explorerscript/default.nix | 2 +- .../python-modules/eyed3/default.nix | 7 - .../python-modules/faker/default.nix | 4 +- .../python-modules/fakeredis/default.nix | 68 +- .../python-modules/fast-histogram/default.nix | 6 +- .../python-modules/fastai/default.nix | 4 +- .../python-modules/fastapi/default.nix | 4 +- .../python-modules/fastbencode/default.nix | 35 +- .../python-modules/fastcore/default.nix | 32 +- .../python-modules/faster-fifo/default.nix | 8 + .../python-modules/faster-whisper/default.nix | 14 +- .../python-modules/fastpair/default.nix | 42 - .../python-modules/ffmpy/default.nix | 8 +- .../file-read-backwards/default.nix | 29 +- .../python-modules/filedate/default.nix | 59 + .../python-modules/filelock/default.nix | 4 +- .../python-modules/fitbit/default.nix | 2 +- .../python-modules/flake8-bugbear/default.nix | 4 +- .../flask-appbuilder/default.nix | 2 - .../python-modules/flask-restx/default.nix | 2 +- .../python-modules/flask/default.nix | 4 +- .../python-modules/flax/default.nix | 8 +- .../python-modules/flexmock/default.nix | 4 +- .../python-modules/flit/default.nix | 1 - .../python-modules/flow-record/default.nix | 53 +- .../python-modules/flynt/default.nix | 42 +- .../python-modules/folium/default.nix | 1 - .../python-modules/fontbakery/default.nix | 4 +- .../python-modules/fontbakery/tests.nix | 5 +- .../python-modules/fontmake/default.nix | 6 +- .../python-modules/fonttools/default.nix | 4 +- .../python-modules/fpdf2/default.nix | 3 + .../python-modules/fpylll/default.nix | 5 + .../python-modules/frozendict/default.nix | 11 +- .../python-modules/fsspec-xrootd/default.nix | 4 +- .../python-modules/fuzzytm/default.nix | 34 +- .../python-modules/fyta-cli/default.nix | 4 +- .../python-modules/gamble/default.nix | 21 +- .../python-modules/garminconnect/default.nix | 4 +- .../python-modules/gcovr/default.nix | 2 +- .../python-modules/gdown/default.nix | 4 +- .../python-modules/gekko/default.nix | 2 +- .../python-modules/gemfileparser/default.nix | 37 +- .../python-modules/gensim/default.nix | 11 + .../python-modules/geoalchemy2/default.nix | 12 +- .../python-modules/geopandas/default.nix | 16 +- .../python-modules/getjump/default.nix | 2 +- .../geventhttpclient/default.nix | 42 +- .../python-modules/gflanguages/default.nix | 4 +- .../python-modules/gguf/default.nix | 33 + .../python-modules/gipc/default.nix | 54 +- .../python-modules/git-versioner/default.nix | 34 + .../python-modules/glean-parser/default.nix | 6 +- .../python-modules/glob2/default.nix | 2 +- .../python-modules/globre/default.nix | 29 - .../python-modules/globus-sdk/default.nix | 22 +- .../python-modules/glymur/default.nix | 47 +- .../python-modules/glymur/set-lib-paths.patch | 16 + .../python-modules/glyphsets/default.nix | 6 +- .../python-modules/glyphslib/default.nix | 4 +- .../python-modules/gmpy2/default.nix | 5 + .../python-modules/goodwe/default.nix | 4 +- .../google-ai-generativelanguage/default.nix | 4 +- .../google-api-python-client/default.nix | 37 +- .../python-modules/google-auth/default.nix | 4 +- .../google-cloud-asset/default.nix | 47 +- .../google-cloud-bigquery-storage/default.nix | 4 +- .../google-cloud-bigquery/default.nix | 8 +- .../google-cloud-dlp/default.nix | 4 +- .../google-cloud-iam/default.nix | 9 +- .../google-cloud-kms/default.nix | 4 +- .../google-cloud-monitoring/default.nix | 41 +- .../google-cloud-secret-manager/default.nix | 31 +- .../google-cloud-spanner/default.nix | 51 +- .../google-generativeai/default.nix | 4 +- .../python-modules/govee-ble/default.nix | 41 +- .../govee-local-api/default.nix | 40 +- .../python-modules/gradio-pdf/default.nix | 2 +- .../python-modules/gradio/client.nix | 12 +- .../python-modules/gradio/default.nix | 8 +- .../python-modules/graphviz/default.nix | 18 +- .../python-modules/graphviz/paths.patch | 16 +- .../python-modules/griffe/default.nix | 4 +- .../grpcio-channelz/default.nix | 4 +- .../python-modules/grpcio-status/default.nix | 4 +- .../python-modules/grpcio-testing/default.nix | 4 +- .../python-modules/grpcio-tools/default.nix | 4 +- .../python-modules/grpcio/default.nix | 4 +- .../python-modules/gst-python/default.nix | 4 +- .../python-modules/gurobipy/default.nix | 14 +- .../python-modules/h5py/default.nix | 19 +- .../h5py/mpi4py-requirement.patch | 13 + .../python-modules/habluetooth/default.nix | 12 +- .../python-modules/hahomematic/default.nix | 4 +- .../python-modules/hatchling/default.nix | 4 +- .../python-modules/hawkauthlib/default.nix | 37 +- .../python-modules/hdf5plugin/default.nix | 2 +- .../python-modules/heatzypy/default.nix | 40 +- .../python-modules/hid/default.nix | 28 +- .../hikari-lightbulb/default.nix | 48 + .../python-modules/hikari/default.nix | 4 +- .../python-modules/hikvision/default.nix | 34 +- .../python-modules/hishel/default.nix | 4 +- .../python-modules/hjson/default.nix | 35 +- .../python-modules/holidays/default.nix | 4 +- .../python-modules/homematicip/default.nix | 113 +- .../python-modules/hstspreload/default.nix | 23 +- .../python-modules/html-text/default.nix | 40 +- .../python-modules/html2text/default.nix | 24 +- .../python-modules/htseq/default.nix | 72 +- .../python-modules/http-parser/default.nix | 36 +- .../python-modules/http-sf/default.nix | 29 +- .../python-modules/httpcore/default.nix | 7 +- .../python-modules/httpx-sse/default.nix | 54 + .../python-modules/httpx-ws/default.nix | 68 + .../huggingface-hub/default.nix | 10 +- .../python-modules/hvac/default.nix | 4 +- .../python-modules/hypercorn/default.nix | 32 +- .../python-modules/hypothesis/default.nix | 4 +- .../python-modules/iapws/default.nix | 4 +- .../python-modules/ibis-framework/default.nix | 17 +- .../ibm-cloud-sdk-core/default.nix | 4 +- .../python-modules/ical/default.nix | 43 +- .../development/python-modules/id/default.nix | 33 +- .../python-modules/identify/default.nix | 33 +- .../python-modules/idna/default.nix | 9 +- .../python-modules/igraph/default.nix | 4 +- .../python-modules/ihm/default.nix | 4 +- .../python-modules/imagededup/default.nix | 10 + .../python-modules/imageio/default.nix | 8 +- .../importlib-metadata/default.nix | 9 +- .../importlib-resources/default.nix | 9 +- .../python-modules/in-n-out/default.nix | 4 +- .../python-modules/indexed-zstd/default.nix | 4 +- .../python-modules/inflect/default.nix | 12 +- .../influxdb-client/default.nix | 4 +- .../python-modules/influxdb/default.nix | 50 +- .../python-modules/inform/default.nix | 4 +- .../python-modules/instructor/default.nix | 71 +- .../python-modules/intbitset/default.nix | 25 +- .../internetarchive/default.nix | 6 +- .../python-modules/ipycanvas/default.nix | 19 +- .../python-modules/ipykernel/default.nix | 6 +- .../python-modules/ipympl/default.nix | 6 +- .../python-modules/ipynbname/default.nix | 13 +- .../python-modules/ipyniivue/default.nix | 8 +- .../python-modules/ipyparallel/default.nix | 1 - .../ipython-genutils/default.nix | 1 - .../python-modules/ipython/default.nix | 7 +- .../python-modules/ipyvue/default.nix | 16 +- .../python-modules/ipywidgets/default.nix | 1 - .../python-modules/isal/default.nix | 67 + .../python-modules/islpy/default.nix | 74 +- .../python-modules/itemadapter/default.nix | 2 +- .../python-modules/itemloaders/default.nix | 2 +- .../python-modules/iterable-io/default.nix | 37 + .../python-modules/itsdangerous/default.nix | 15 +- .../jaraco-collections/default.nix | 4 +- .../jaraco-functools/default.nix | 14 +- .../python-modules/jax/default.nix | 12 +- .../development/python-modules/jaxlib/bin.nix | 67 +- .../python-modules/jaxlib/default.nix | 40 +- .../python-modules/jaxopt/default.nix | 20 +- .../jedi-language-server/default.nix | 7 + .../jenkins-job-builder/default.nix | 4 +- .../python-modules/jinja2/default.nix | 16 +- .../python-modules/jiwer/default.nix | 12 +- .../python-modules/joblib/default.nix | 13 +- .../python-modules/jplephem/default.nix | 4 +- .../python-modules/jpylyzer/default.nix | 15 +- .../python-modules/json-logging/default.nix | 23 +- .../json-schema-for-humans/default.nix | 58 +- .../json-stream-rs-tokenizer/default.nix | 4 +- .../python-modules/jsonpickle/default.nix | 4 +- .../python-modules/jupyter-book/default.nix | 2 +- .../python-modules/jupyter-cache/default.nix | 2 +- .../python-modules/jupyter-client/default.nix | 1 - .../jupyter-collaboration/default.nix | 6 +- .../python-modules/jupyter-core/default.nix | 5 + .../jupyter-repo2docker/default.nix | 2 +- .../jupyterlab-server/default.nix | 4 +- .../python-modules/jupyterlab/default.nix | 4 +- .../python-modules/jupytext/default.nix | 13 +- .../python-modules/kasa-crypt/default.nix | 35 +- .../python-modules/kazoo/default.nix | 4 +- .../python-modules/kbcstorage/default.nix | 4 +- .../python-modules/keras/default.nix | 6 +- .../python-modules/keyrings-alt/default.nix | 6 +- .../python-modules/kombu/default.nix | 4 +- .../python-modules/kornia-rs/Cargo.lock | 1598 + .../python-modules/kornia-rs/default.nix | 60 + .../kornia-rs/kornia-rs-from-crates.patch | 12 + .../python-modules/kornia/default.nix | 7 +- .../python-modules/kserve/default.nix | 119 + .../python-modules/lacuscore/default.nix | 4 +- .../langchain-community/default.nix | 4 +- .../python-modules/langchain-core/default.nix | 4 +- .../python-modules/langchain/default.nix | 10 +- .../python-modules/langsmith/default.nix | 9 +- .../python-modules/language-data/default.nix | 46 +- .../python-modules/lark/default.nix | 2 +- .../python-modules/latex2mathml/default.nix | 6 +- .../python-modules/launchpadlib/default.nix | 2 +- .../lazr-restfulclient/default.nix | 2 +- .../python-modules/lazr-uri/default.nix | 2 +- .../python-modules/ldappool/default.nix | 58 +- .../python-modules/ldfparser/default.nix | 37 +- .../python-modules/ledgerblue/default.nix | 23 +- .../python-modules/levenshtein/default.nix | 53 +- .../python-modules/lib4sbom/default.nix | 61 + .../python-modules/libgravatar/default.nix | 30 + .../python-modules/libmambapy/default.nix | 93 + .../python-modules/libpcap/default.nix | 19 +- .../python-modules/libretranslate/default.nix | 4 +- .../python-modules/librosa/default.nix | 34 +- .../lightning-utilities/default.nix | 16 +- .../python-modules/line-profiler/default.nix | 1 - .../python-modules/linknlink/default.nix | 29 +- .../python-modules/litellm/default.nix | 4 +- .../llama-index-agent-openai/default.nix | 4 +- .../llama-index-core/default.nix | 4 +- .../llama-index-embeddings-openai/default.nix | 29 +- .../default.nix | 29 +- .../llama-index-llms-ollama/default.nix | 4 +- .../llama-index-llms-openai/default.nix | 4 +- .../default.nix | 4 +- .../llama-index-program-openai/default.nix | 7 +- .../llama-index-readers-database/default.nix | 4 +- .../llama-index-readers-file/default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 4 +- .../python-modules/llama-parse/default.nix | 4 +- .../llamaindex-py-client/default.nix | 4 +- .../python-modules/llvmlite/default.nix | 1 - .../python-modules/lmfit/default.nix | 17 +- .../python-modules/loadcredential/default.nix | 34 + .../python-modules/localstack-ext/default.nix | 44 +- .../python-modules/localstack/default.nix | 11 +- .../python-modules/lockfile/default.nix | 15 +- .../python-modules/logilab/common.nix | 44 +- .../python-modules/logutils/default.nix | 27 +- .../python-modules/loopy/default.nix | 61 +- .../python-modules/losant-rest/default.nix | 38 +- .../python-modules/lsassy/default.nix | 4 +- .../python-modules/m2crypto/default.nix | 54 +- .../python-modules/macfsevents/default.nix | 2 +- .../python-modules/maestral/default.nix | 27 +- .../magic-wormhole-mailbox-server/default.nix | 39 +- .../magic-wormhole-transit-relay/default.nix | 25 +- .../python-modules/magic-wormhole/default.nix | 16 +- .../python-modules/magika/default.nix | 4 +- .../python-modules/mahotas/default.nix | 14 +- .../python-modules/mailchecker/default.nix | 4 +- .../python-modules/mako/default.nix | 4 +- .../python-modules/malduck/default.nix | 60 +- .../python-modules/mandown/default.nix | 7 +- .../python-modules/manga-ocr/default.nix | 65 + .../manga-ocr/package_data.patch | 12 + .../python-modules/manim-slides/default.nix | 19 +- .../python-modules}/manim/default.nix | 52 +- .../python-modules}/manim/failing_tests.nix | 0 .../manim/pytest-report-header.patch | 0 .../python-modules/marimo/default.nix | 4 +- .../python-modules/markdown/default.nix | 16 +- .../marshmallow-dataclass/default.nix | 4 +- .../marshmallow-enum/default.nix | 43 - .../python-modules/mashumaro/default.nix | 4 +- .../python-modules/mat2/default.nix | 4 +- .../matplotlib-inline/default.nix | 26 +- .../python-modules/matplotlib/default.nix | 33 +- .../python-modules/maxminddb/default.nix | 4 +- .../python-modules/mayavi/default.nix | 7 +- .../mdformat-mkdocs/default.nix | 4 +- .../python-modules/mdtraj/default.nix | 30 +- .../python-modules/mecab-python3/default.nix | 7 +- .../python-modules/mechanize/default.nix | 44 +- .../python-modules/meilisearch/default.nix | 31 +- .../memory-allocator/default.nix | 5 + .../python-modules/meraki/default.nix | 4 +- .../python-modules/merge3/default.nix | 2 +- .../python-modules/meross-iot/default.nix | 37 +- .../python-modules/mesa/default.nix | 3 +- .../python-modules/meson-python/default.nix | 6 +- .../python-modules/mesonpep517/default.nix | 1 - .../0001-setup.py-use-valid-semver.patch | 26 + ...002-core-remove-IDAPython-dependency.patch | 65 + .../python-modules/miasm/default.nix | 58 + .../python-modules/mike/default.nix | 2 +- .../python-modules/milksnake/default.nix | 10 +- .../python-modules/minari/default.nix | 88 + .../mindsdb-evaluator/default.nix | 4 +- .../python-modules/minidb/default.nix | 29 +- .../python-modules/minio/default.nix | 4 +- .../python-modules/mizani/default.nix | 8 +- .../default.nix | 4 +- .../mkdocs-rss-plugin/default.nix | 4 +- .../mkdocs-simple-hooks/default.nix | 43 - .../mkdocs-swagger-ui-tag/default.nix | 4 +- .../mkdocstrings-python/default.nix | 4 +- .../python-modules/mkdocstrings/default.nix | 4 +- .../python-modules/ml-dtypes/default.nix | 5 +- .../python-modules/mlflow/default.nix | 4 +- .../python-modules/mmengine/default.nix | 11 +- .../python-modules/mocket/default.nix | 4 +- .../python-modules/mockito/default.nix | 2 +- .../python-modules/model-bakery/default.nix | 35 +- .../python-modules/monty/default.nix | 4 +- .../python-modules/mpegdash/default.nix | 36 + .../python-modules/mpi4py/default.nix | 4 +- .../python-modules/mplhep/default.nix | 4 +- .../python-modules/mpmath/default.nix | 5 + .../python-modules/msgraph-sdk/default.nix | 4 +- .../msoffcrypto-tool/default.nix | 43 +- .../python-modules/mujoco/default.nix | 4 +- .../multipledispatch/default.nix | 1 - .../python-modules/mypy-protobuf/default.nix | 60 +- .../python-modules/myst-docutils/default.nix | 4 +- .../python-modules/myst-nb/default.nix | 2 +- .../python-modules/myst-parser/default.nix | 15 +- .../python-modules/nanobind/default.nix | 74 + .../python-modules/nanomsg-python/default.nix | 19 +- .../python-modules/nanotime/default.nix | 25 +- .../python-modules/napari-console/default.nix | 43 +- .../python-modules/napari/default.nix | 94 +- .../python-modules/nats-python/default.nix | 37 +- .../python-modules/naturalsort/default.nix | 24 +- .../python-modules/nbconvert/default.nix | 4 +- .../python-modules/nbdev/default.nix | 34 +- .../python-modules/nbformat/default.nix | 2 +- .../python-modules/nbmake/default.nix | 74 + .../python-modules/nbsphinx/default.nix | 13 +- .../python-modules/ndspy/default.nix | 2 +- .../python-modules/nebula3-python/default.nix | 41 +- .../python-modules/neo/default.nix | 4 +- .../python-modules/neo4j/default.nix | 41 +- .../python-modules/nestedtext/default.nix | 4 +- .../python-modules/netcdf4/default.nix | 6 +- .../nettigo-air-monitor/default.nix | 4 +- .../python-modules/netutils/default.nix | 4 +- .../python-modules/networkx/default.nix | 9 +- .../python-modules/nidaqmx/default.nix | 1 - .../python-modules/nilearn/default.nix | 4 +- .../python-modules/nocasedict/default.nix | 4 +- .../python-modules/noiseprotocol/default.nix | 23 +- .../python-modules/normality/default.nix | 43 +- .../python-modules/nose-exclude/default.nix | 1 - .../python-modules/nose-xunitmp/default.nix | 39 + .../python-modules/notus-scanner/default.nix | 52 +- .../python-modules/numba-scipy/default.nix | 4 +- .../python-modules/numba/default.nix | 3 +- .../python-modules/numexpr/default.nix | 50 +- ...usage-of-distutils-in-_core-code_gen.patch | 71 - .../python-modules/numpy/default.nix | 8 +- .../python-modules/numpyro/default.nix | 13 +- .../python-modules/nvchecker/default.nix | 12 +- .../python-modules/nvidia-ml-py/default.nix | 4 +- .../python-modules/objax/default.nix | 10 +- .../replace-deprecated-device_buffers.patch | 14 + .../python-modules/oci/default.nix | 4 +- .../python-modules/ocrmypdf/default.nix | 21 +- .../ocrmypdf/use-pillow-heif.patch | 26 + .../python-modules/oelint-parser/default.nix | 4 +- .../python-modules/oemthermostat/default.nix | 38 +- .../python-modules/okta/default.nix | 4 +- .../python-modules/ollama/default.nix | 46 +- .../python-modules/ome-zarr/default.nix | 21 + .../python-modules/omegaconf/default.nix | 14 +- .../python-modules/onetimepass/default.nix | 29 +- .../onnxconverter-common/default.nix | 1 - .../python-modules/onnxruntime/default.nix | 2 +- .../open-clip-torch/default.nix | 2 + .../python-modules/openai-triton/default.nix | 2 +- .../python-modules/openai-whisper/default.nix | 10 +- .../python-modules/openai/default.nix | 4 +- .../python-modules/openrazer/daemon.nix | 2 +- .../opentelemetry-api/default.nix | 19 +- .../opentelemetry-instrumentation/default.nix | 6 +- .../python-modules/openusd/default.nix | 5 + .../openwrt-ubus-rpc/default.nix | 27 +- .../python-modules/opower/default.nix | 4 +- .../python-modules/optimum/default.nix | 4 +- .../python-modules/optree/default.nix | 60 + .../python-modules/opuslib/default.nix | 17 +- .../python-modules/oracledb/default.nix | 34 +- .../orange-canvas-core/default.nix | 4 +- .../orange-widget-base/default.nix | 4 +- .../python-modules/orange3/default.nix | 40 +- .../python-modules/orjson/default.nix | 8 +- .../python-modules/osc-sdk-python/default.nix | 19 +- .../python-modules/ovoenergy/default.nix | 46 +- .../python-modules/owslib/default.nix | 8 +- .../python-modules/paddle2onnx/default.nix | 4 +- .../pandas-datareader/default.nix | 21 +- .../python-modules/pandas/default.nix | 2 +- .../python-modules/panel/default.nix | 6 +- .../python-modules/panphon/default.nix | 61 + .../python-modules/papermill/default.nix | 20 +- .../python-modules/papis/default.nix | 2 +- .../parametrize-from-file/default.nix | 4 +- .../python-modules/parquet/default.nix | 44 +- .../python-modules/parsedmarc/default.nix | 23 +- .../python-modules/parsel/default.nix | 4 +- .../python-modules/parso/default.nix | 4 +- .../python-modules/particle/default.nix | 4 +- .../python-modules/paste/default.nix | 4 +- .../python-modules/path/default.nix | 4 +- .../python-modules/pathlib/default.nix | 27 - .../python-modules/paypalhttp/default.nix | 5 + .../python-modules/pcffont/default.nix | 44 + .../python-modules/pdfminer-six/default.nix | 2 +- .../python-modules/pdfx/default.nix | 2 +- .../python-modules/pdm-backend/default.nix | 12 +- .../python-modules/pdoc/default.nix | 2 +- .../python-modules/peaqevcore/default.nix | 4 +- .../python-modules/peco/default.nix | 31 +- .../python-modules/peewee/default.nix | 4 +- .../python-modules/pettingzoo/default.nix | 135 + .../python-modules/pexpect/default.nix | 5 + .../python-modules/pg8000/default.nix | 16 +- .../python-modules/pglast/default.nix | 2 +- .../python-modules/phik/default.nix | 50 +- .../python-modules/phonenumbers/default.nix | 4 +- .../python-modules/phunspell/default.nix | 53 + .../python-modules/pick/default.nix | 33 +- .../python-modules/piep/default.nix | 2 +- .../python-modules/pikepdf/default.nix | 4 +- .../python-modules/pikepdf/paths.patch | 16 +- .../python-modules/pillow-heif/default.nix | 8 +- .../python-modules/pillow/default.nix | 8 +- .../pinecone-client/default.nix | 4 +- .../pip-system-certs/default.nix | 43 + .../python-modules/pip-tools/default.nix | 3 + .../fix-setup-py-bad-syntax-detection.patch | 25 +- .../python-modules/pipdeptree/default.nix | 41 +- .../python-modules/pipe/default.nix | 42 + .../pipenv-poetry-migrate/default.nix | 4 +- .../pixel-font-builder/default.nix | 18 +- .../python-modules/plaid-python/default.nix | 4 +- .../plantuml-markdown/default.nix | 4 +- .../python-modules/playwright/default.nix | 2 +- .../playwrightcapture/default.nix | 4 +- .../python-modules/plotly/default.nix | 4 +- .../python-modules/plotnine/default.nix | 10 +- .../python-modules/plumbum/default.nix | 4 +- .../python-modules/pluthon/default.nix | 2 +- .../pmdsky-debug-py/default.nix | 2 +- .../python-modules/polars/default.nix | 22 +- .../python-modules/polyswarm-api/default.nix | 47 +- .../python-modules/portion/default.nix | 49 + .../python-modules/potentials/default.nix | 55 +- .../python-modules/pplpy/default.nix | 5 + .../python-modules/pretty-errors/default.nix | 40 + .../python-modules/primecountpy/default.nix | 5 + .../python-modules/private-gpt/default.nix | 119 + .../python-modules/protego/default.nix | 2 +- .../python-modules/proton-core/default.nix | 8 +- .../default.nix | 8 +- .../proton-keyring-linux/default.nix | 8 +- .../proton-vpn-api-core/default.nix | 6 +- .../proton-vpn-connection/default.nix | 4 +- .../default.nix | 8 +- .../proton-vpn-killswitch/default.nix | 8 +- .../default.nix | 8 +- .../proton-vpn-network-manager/default.nix | 4 +- .../proton-vpn-session/default.nix | 4 +- .../python-modules/proxy-py/default.nix | 4 +- .../python-modules/psd-tools/default.nix | 4 +- .../python-modules/psrpcore/default.nix | 38 +- .../python-modules/psycopg2cffi/default.nix | 47 +- .../publicsuffixlist/default.nix | 4 +- .../python-modules/pubnub/default.nix | 4 +- .../python-modules/pure-protobuf/default.nix | 4 +- .../python-modules/puremagic/default.nix | 30 +- .../python-modules/pvlib/default.nix | 57 +- .../python-modules/pwkit/default.nix | 40 + .../python-modules/pxml/default.nix | 37 - .../python-modules/py-desmume/default.nix | 2 +- .../python-modules/py-libzfs/default.nix | 12 +- .../python-modules/py-pdf-parser/default.nix | 2 +- .../py-synologydsm-api/default.nix | 4 +- .../python-modules/py-zabbix/default.nix | 31 +- .../python-modules/py3buddy/default.nix | 23 +- .../python-modules/py65/default.nix | 36 +- .../python-modules/pyais/default.nix | 49 + .../python-modules/pyaml/default.nix | 4 +- .../python-modules/pyannote-core/default.nix | 42 +- .../pyannote-database/default.nix | 43 +- .../pyannote-pipeline/default.nix | 48 +- .../python-modules/pyarrow/default.nix | 12 - .../python-modules/pyasn1/default.nix | 4 +- .../python-modules/pyathena/default.nix | 4 +- .../python-modules/pyatmo/default.nix | 2 +- .../python-modules/pybrowserid/default.nix | 34 +- .../python-modules/pycec/default.nix | 6 +- .../python-modules/pycomm3/default.nix | 47 + .../python-modules/pycparser/default.nix | 7 +- .../pycrdt-websocket/default.nix | 20 +- .../python-modules/pycrdt/Cargo.lock | 141 +- .../python-modules/pycrdt/default.nix | 11 +- .../python-modules/pyct/default.nix | 4 +- .../python-modules/pycups/default.nix | 4 +- .../pydantic-yaml-0/default.nix | 1 + .../python-modules/pydash/default.nix | 43 +- .../pydata-sphinx-theme/default.nix | 2 +- .../python-modules/pydeck/default.nix | 4 +- .../python-modules/pydevd/default.nix | 17 +- .../python-modules/pydrawise/default.nix | 45 +- .../python-modules/pyelftools/default.nix | 29 +- .../python-modules/pyenphase/default.nix | 4 +- .../python-modules/pyerfa/default.nix | 21 +- .../python-modules/pyexploitdb/default.nix | 32 +- .../python-modules/pyfaidx/default.nix | 43 +- .../python-modules/pyfakefs/default.nix | 6 +- .../python-modules/pyfftw/default.nix | 1 - .../python-modules/pyfibaro/default.nix | 4 +- .../python-modules/pyfritzhome/default.nix | 4 +- .../python-modules/pyftpdlib/default.nix | 37 +- .../python-modules/pyfxa/default.nix | 8 +- .../python-modules/pygame-ce/default.nix | 123 + .../pygame-ce/fix-dependency-finding.patch | 41 + .../pygame-ce/skip-surface-tests.patch | 26 + .../python-modules/pygame-gui/default.nix | 22 +- .../python-modules/pygame-sdl2/default.nix | 55 +- .../python-modules/pygame/default.nix | 8 + .../python-modules/pyglet/default.nix | 2 +- .../python-modules/pygobject/3.nix | 5 +- .../python-modules/pygraphviz/default.nix | 6 +- .../python-modules/pygsl/default.nix | 18 +- .../pygtkspellcheck/default.nix | 2 +- .../python-modules/pyinsteon/default.nix | 48 +- .../python-modules/pyjet/default.nix | 35 - .../python-modules/pyjson5/default.nix | 44 + .../python-modules/pykalman/default.nix | 4 +- .../python-modules/pykdtree/default.nix | 9 +- .../python-modules/pykka/default.nix | 2 +- .../python-modules/pylint/default.nix | 121 +- .../python-modules/pylutron/default.nix | 26 +- .../python-modules/pymatgen/default.nix | 100 +- .../python-modules/pymc/default.nix | 19 +- .../pymdown-extensions/default.nix | 5 + .../python-modules/pymilter/default.nix | 20 +- .../pymongo-inmemory/default.nix | 6 +- .../python-modules/pymongo/default.nix | 23 +- .../python-modules/pymysql/default.nix | 10 +- .../python-modules/pynetbox/default.nix | 2 + .../python-modules/pynmeagps/default.nix | 40 +- .../python-modules/pynotifier/default.nix | 44 + .../python-modules/pynvml/default.nix | 7 + .../python-modules/pynws/default.nix | 49 +- .../python-modules/pyomo/default.nix | 36 +- .../python-modules/pyopencl/default.nix | 1 - .../python-modules/pyopenssl/default.nix | 8 +- .../python-modules/pyotgw/default.nix | 35 +- .../python-modules/pyphen/default.nix | 6 +- .../python-modules/pypresence/default.nix | 2 +- .../pyproject-metadata/default.nix | 18 +- .../python-modules/pyqt-builder/default.nix | 6 +- .../python-modules/pyqt6-charts/default.nix | 4 +- .../pyqt6-webengine/default.nix | 4 +- ...ument-to-the-proxy-style-initializer.patch | 25 + .../python-modules/pyqtdarktheme/default.nix | 70 + .../python-modules/pyqtgraph/default.nix | 6 +- .../python-modules/pyrad/default.nix | 66 +- .../python-modules/pyramid-beaker/default.nix | 4 +- .../python-modules/pyrender/default.nix | 11 +- .../python-modules/pyrfxtrx/default.nix | 19 +- .../python-modules/pyrisco/default.nix | 29 +- .../python-modules/pysam/default.nix | 4 +- .../python-modules/pyscard/default.nix | 70 +- .../python-modules/pyscss/default.nix | 6 +- .../python-modules/pysendfile/default.nix | 36 +- .../pysigma-backend-elasticsearch/default.nix | 33 +- .../pysigma-backend-insightidr/default.nix | 4 +- .../pysigma-backend-opensearch/default.nix | 42 +- .../python-modules/pysigma/default.nix | 46 +- .../python-modules/pysimplegui/default.nix | 4 +- .../python-modules/pyslurm/default.nix | 17 +- .../python-modules/pysqlitecipher/default.nix | 2 +- .../python-modules/pystemd/default.nix | 5 +- .../python-modules/pytapo/default.nix | 34 +- .../python-modules/pytensor/default.nix | 13 +- .../python-modules/pytest-ansible/default.nix | 4 +- .../pytest-dependency/default.nix | 2 +- .../pytest-fixture-config/default.nix | 29 +- .../pytest-json-report/default.nix | 38 +- .../pytest-markdown-docs/default.nix | 48 + .../python-modules/pytest-mock/default.nix | 4 +- .../python-modules/pytest-mpl/default.nix | 4 +- .../python-modules/pytest-mypy/default.nix | 2 +- .../python-modules/pytest-order/default.nix | 12 +- .../pytest-playwright/default.nix | 4 +- .../pytest-server-fixtures/default.nix | 43 +- .../python-modules/pytest-shutil/default.nix | 45 +- .../python-modules/pytest-twisted/default.nix | 2 +- .../pytest-virtualenv/default.nix | 46 +- .../python-modules/python-creole/default.nix | 9 + .../python-dbusmock/default.nix | 2 + .../python-ecobee-api/default.nix | 32 +- .../python-glanceclient/default.nix | 69 +- .../default.nix | 68 + .../python-modules/python-hosts/default.nix | 4 +- .../python-modules/python-jose/default.nix | 7 +- .../python-keycloak/default.nix | 48 +- .../python-modules/python-ldap/default.nix | 44 +- .../python-lsp-black/default.nix | 15 +- .../python-lsp-ruff/default.nix | 6 +- .../python-matter-server/default.nix | 4 +- .../python-motionmount/default.nix | 4 +- .../python-modules/python-musicpd/default.nix | 4 +- .../python-novaclient/default.nix | 2 + .../python-roborock/default.nix | 4 +- .../python-modules/python-tado/default.nix | 34 +- .../python-telegram-bot/default.nix | 4 +- .../python-modules/python-twitter/default.nix | 2 +- .../python-modules/python-whois/default.nix | 38 +- .../python-modules/python3-gnutls/default.nix | 12 +- .../python-modules/pytibber/default.nix | 22 +- .../pytikz-allefeld/default.nix | 9 +- .../python-modules/pytm/default.nix | 4 +- .../python-modules/pytools/default.nix | 4 +- .../pytorch-lightning/default.nix | 4 +- .../python-modules/pytrydan/default.nix | 47 +- .../python-modules/pyunpack/default.nix | 4 +- .../python-modules/pyvex/default.nix | 4 +- .../python-modules/pyvis/default.nix | 9 +- .../python-modules/pyvista/default.nix | 4 +- .../python-modules/pywavefront/default.nix | 45 + .../python-modules/pywavelets/default.nix | 45 +- .../python-modules/pywaze/default.nix | 39 +- .../python-modules/pywbem/default.nix | 4 +- .../python-modules/pywlroots/default.nix | 4 +- .../python-modules/pyzufall/default.nix | 30 - .../python-modules/qdldl/default.nix | 4 +- .../python-modules/qdrant-client/default.nix | 4 +- .../python-modules/qrcode/default.nix | 3 + .../python-modules/qtconsole/default.nix | 14 +- .../python-modules/qtile/default.nix | 17 +- .../quantile-forest/default.nix | 62 + .../python-modules/quantiphy/default.nix | 6 +- .../python-modules/quixote/default.nix | 40 + .../python-modules/rapidgzip/default.nix | 4 +- .../python-modules/rarfile/default.nix | 56 +- .../readme-renderer/default.nix | 12 +- .../recipe-scrapers/default.nix | 4 +- .../python-modules/recommonmark/default.nix | 1 - .../recurring-ical-events/default.nix | 8 +- .../python-modules/redis-om/default.nix | 4 +- .../python-modules/redis/default.nix | 4 +- .../python-modules/referencing/default.nix | 46 +- .../python-modules/reikna/default.nix | 1 - .../python-modules/relatorio/default.nix | 4 +- .../python-modules/remi/default.nix | 15 +- .../reportlab-qrcode/default.nix | 49 + .../python-modules/reportlab/default.nix | 4 +- .../python-modules/reproject/default.nix | 13 +- .../python-modules/reptor/default.nix | 4 +- .../requests-download/default.nix | 1 - .../python-modules/requests-mock/default.nix | 19 +- .../requirements-detector/default.nix | 14 +- .../python-modules/resend/default.nix | 35 +- .../python-modules/resolvelib/default.nix | 28 +- .../python-modules/reuse/default.nix | 42 +- .../python-modules/rfc6555/default.nix | 2 +- .../python-modules/rich-rst/default.nix | 34 +- .../python-modules/riscv-config/default.nix | 4 +- .../python-modules/rlcard/default.nix | 77 + .../python-modules/rnginline/default.nix | 20 +- .../python-modules/rns/default.nix | 31 +- .../python-modules/roadlib/default.nix | 31 +- .../python-modules/roadtx/default.nix | 39 +- .../default.nix | 2 +- .../default.nix | 6 +- .../robotstatuschecker/default.nix | 2 +- .../python-modules/rokuecp/default.nix | 59 +- .../python-modules/rpy2/default.nix | 10 +- .../development/python-modules/rq/default.nix | 20 +- .../python-modules/rst2pdf/default.nix | 8 +- .../python-modules/rtsp-to-webrtc/default.nix | 37 +- .../python-modules/rubicon-objc/default.nix | 62 + .../python-modules/s3fs/default.nix | 2 - .../python-modules/s3transfer/default.nix | 4 +- .../python-modules/sacn/default.nix | 4 +- .../python-modules/safetensors/default.nix | 6 +- .../python-modules/safety/default.nix | 8 +- .../python-modules/sagemaker/default.nix | 4 +- .../python-modules/samplerate/default.nix | 43 +- .../python-modules/sanix/default.nix | 42 + .../python-modules/sarif-tools/default.nix | 69 + .../python-modules/scalene/default.nix | 21 +- .../python-modules/schemdraw/default.nix | 14 +- .../python-modules/schwifty/default.nix | 11 +- .../python-modules/scikit-bio/default.nix | 85 +- .../python-modules/scikit-build/default.nix | 2 + .../python-modules/scikit-learn/default.nix | 19 +- .../scikit-posthocs/default.nix | 9 +- .../python-modules/scikit-rf/default.nix | 6 +- .../python-modules/scipy/default.nix | 6 +- .../python-modules/scooby/default.nix | 4 +- .../python-modules/scrapy/default.nix | 13 +- .../python-modules/sdkmanager/default.nix | 4 +- .../python-modules/seaborn/default.nix | 1 - .../sentence-transformers/default.nix | 4 +- .../python-modules/setuptools-dso/default.nix | 2 +- .../setuptools-gettext/default.nix | 43 +- .../setuptools-scm-git-archive/default.nix | 2 +- .../python-modules/setuptools/default.nix | 4 +- .../setuptools/setuptools-distutils-C++.patch | 32 +- .../python-modules/shap/default.nix | 4 +- .../python-modules/shimmy/default.nix | 92 + .../python-modules/shiv/default.nix | 4 +- .../sigstore-protobuf-specs/default.nix | 4 +- .../python-modules/skein/default.nix | 21 +- .../python-modules/skl2onnx/default.nix | 1 - .../python-modules/skodaconnect/default.nix | 4 +- .../python-modules/skytemple-dtef/default.nix | 2 +- .../skytemple-eventserver/default.nix | 2 +- .../skytemple-files/default.nix | 2 +- .../skytemple-icons/default.nix | 2 +- .../python-modules/skytemple-rust/default.nix | 2 +- .../skytemple-ssb-debugger/default.nix | 6 +- .../skytemple-ssb-emulator/default.nix | 2 +- .../python-modules/slicedimage/default.nix | 5 +- .../python-modules/slicer/default.nix | 30 +- .../smart-meter-texas/default.nix | 15 +- .../python-modules/smart-open/default.nix | 11 + .../python-modules/smtpdfix/default.nix | 4 +- .../default.nix | 4 +- .../snakemake-storage-plugin-s3/default.nix | 4 +- .../python-modules/snaptime/default.nix | 9 +- .../python-modules/snorkel/default.nix | 4 +- .../snowflake-sqlalchemy/default.nix | 4 +- .../social-auth-app-django/default.nix | 4 +- .../social-auth-core/default.nix | 4 +- .../python-modules/softlayer/default.nix | 4 +- .../python-modules/solax/default.nix | 8 +- .../python-modules/soundcloud-v2/default.nix | 2 +- .../python-modules/sounddevice/default.nix | 1 - .../python-modules/soundfile/default.nix | 1 - .../annotation-test/default.nix | 4 +- .../spacy-transformers/default.nix | 47 +- .../spacy/annotation-test/default.nix | 4 +- .../python-modules/spacy/default.nix | 4 +- .../speechrecognition/default.nix | 41 +- .../python-modules/spglib/default.nix | 4 +- .../python-modules/sphinx-autoapi/default.nix | 2 + .../sphinx-autobuild/default.nix | 35 +- .../sphinx-autodoc-typehints/default.nix | 4 +- .../sphinx-book-theme/default.nix | 2 +- .../sphinx-codeautolink/default.nix | 4 +- .../sphinx-comments/default.nix | 2 +- .../python-modules/sphinx-design/default.nix | 2 +- .../sphinx-external-toc/default.nix | 2 +- .../python-modules/sphinx-intl/default.nix | 6 +- .../sphinx-jupyterbook-latex/default.nix | 4 +- .../sphinx-multitoc-numbering/default.nix | 2 +- .../python-modules/sphinx-pytest/default.nix | 2 + .../sphinx-rtd-theme/default.nix | 5 + .../python-modules/sphinx-thebe/default.nix | 2 +- .../sphinx-togglebutton/default.nix | 2 +- .../python-modules/sphinx/default.nix | 23 +- .../default.nix | 4 +- .../sphinxcontrib-jquery/default.nix | 2 + .../sphinxcontrib-tikz/default.nix | 4 +- .../python-modules/spyder/default.nix | 14 +- .../python-modules/spylls/default.nix | 54 + .../sqlalchemy-utils/default.nix | 10 +- .../python-modules/sqlalchemy/default.nix | 4 +- .../python-modules/sqlbag/default.nix | 7 +- .../python-modules/sqlglot/default.nix | 4 +- .../python-modules/sqlite-anyio/default.nix | 42 + .../python-modules/sqlmap/default.nix | 4 +- .../python-modules/sqlmodel/default.nix | 35 +- .../python-modules/sqlparse/default.nix | 18 +- .../python-modules/sqlsoup/default.nix | 23 - .../python-modules/ssg/default.nix | 57 + .../python-modules/sshfs/default.nix | 4 +- .../python-modules/stack-data/default.nix | 34 +- .../python-modules/stanza/default.nix | 4 +- .../python-modules/starlette-wtf/default.nix | 6 +- .../python-modules/statsmodels/default.nix | 19 +- .../python-modules/stem/default.nix | 9 + .../python-modules/stim/default.nix | 2 +- .../python-modules/stix2-patterns/default.nix | 35 +- .../python-modules/stone/default.nix | 49 +- .../python-modules/strct/default.nix | 29 +- .../python-modules/streamlit/default.nix | 4 +- .../python-modules/streamz/default.nix | 24 +- .../python-modules/stripe/default.nix | 4 +- .../python-modules/succulent/default.nix | 9 +- .../python-modules/sunpy/default.nix | 4 +- .../python-modules/superqt/default.nix | 60 +- .../python-modules/sympy/default.nix | 5 + .../python-modules/tablib/default.nix | 4 +- .../python-modules/tabula-py/default.nix | 47 +- .../python-modules/tabulate/default.nix | 1 - .../python-modules/taskw-ng/default.nix | 47 +- .../tencentcloud-sdk-python/default.nix | 4 +- .../python-modules/tensordict/default.nix | 11 +- .../tensorflow-probability/default.nix | 5 +- .../python-modules/tensorflow/bin.nix | 8 +- .../python-modules/tensorflow/default.nix | 19 +- .../tesla-fleet-api/default.nix | 29 +- .../python-modules/testcontainers/default.nix | 6 +- .../python-modules/textdistance/default.nix | 4 +- .../python-modules/thriftpy2/default.nix | 38 +- .../python-modules/tidalapi/default.nix | 43 +- .../python-modules/tifffile/default.nix | 4 +- .../python-modules/tiledb/default.nix | 1 - .../python-modules/tilequant/default.nix | 2 +- .../python-modules/timecop/default.nix | 21 +- .../python-modules/timing-asgi/default.nix | 48 + .../python-modules/tinytuya/default.nix | 50 + .../python-modules/tokenizers/default.nix | 4 + .../python-modules/toolz/default.nix | 1 - .../development/python-modules/torch/bin.nix | 6 +- .../python-modules/torch/binary-hashes.nix | 107 +- .../python-modules/torch/default.nix | 12 +- .../python-modules/torch/prefetch.sh | 7 +- .../python-modules/torchaudio/bin.nix | 28 +- .../torchaudio/binary-hashes.nix | 107 +- .../python-modules/torchaudio/default.nix | 6 +- .../python-modules/torchaudio/prefetch.sh | 7 +- .../python-modules/torchmetrics/default.nix | 8 +- .../python-modules/torchrl/default.nix | 37 +- .../python-modules/torchsnapshot/default.nix | 71 + .../python-modules/torchvision/bin.nix | 6 +- .../torchvision/binary-hashes.nix | 103 +- .../python-modules/torchvision/default.nix | 4 +- .../python-modules/torchvision/prefetch.sh | 11 +- .../total-connect-client/default.nix | 39 +- .../python-modules/tox/default.nix | 4 +- .../python-modules/tpm2-pytss/default.nix | 5 + .../python-modules/tqdm/default.nix | 6 +- .../python-modules/trafilatura/default.nix | 72 +- .../python-modules/traitlets/default.nix | 5 +- .../python-modules/transformers/default.nix | 4 +- .../python-modules/transitions/default.nix | 34 +- .../python-modules/trimesh/default.nix | 6 +- .../python-modules/trio-asyncio/default.nix | 29 +- .../python-modules/trio-websocket/default.nix | 28 +- .../python-modules/trio/default.nix | 26 +- .../trove-classifiers/default.nix | 4 +- .../python-modules/truncnorm/default.nix | 44 + .../python-modules/trytond/default.nix | 4 +- .../python-modules/tubeup/default.nix | 2 +- .../python-modules/twill/default.nix | 51 +- .../python-modules/twine/default.nix | 1 - .../python-modules/twitch-python/default.nix | 2 +- .../python-modules/type-infer/default.nix | 6 +- .../python-modules/typed-settings/default.nix | 85 +- .../python-modules/typer/default.nix | 18 +- .../types-beautifulsoup4/default.nix | 26 +- .../python-modules/types-docutils/default.nix | 4 +- .../python-modules/types-mock/default.nix | 4 +- .../python-modules/types-pillow/default.nix | 4 +- .../python-modules/types-protobuf/default.nix | 4 +- .../python-modules/types-psutil/default.nix | 4 +- .../python-modules/types-psycopg2/default.nix | 4 +- .../types-pyopenssl/default.nix | 4 +- .../types-python-dateutil/default.nix | 4 +- .../python-modules/types-pytz/default.nix | 4 +- .../python-modules/types-pyyaml/default.nix | 4 +- .../python-modules/types-redis/default.nix | 4 +- .../types-s3transfer/default.nix | 4 +- .../types-setuptools/default.nix | 4 +- .../python-modules/types-toml/default.nix | 4 +- .../python-modules/types-tqdm/default.nix | 8 +- .../typeshed-client/default.nix | 37 +- .../python-modules/typical/default.nix | 60 +- .../typing-extensions/default.nix | 4 +- .../python-modules/uart-devices/default.nix | 48 + .../python-modules/ucsmsdk/default.nix | 4 +- .../python-modules/ufo2ft/default.nix | 6 +- .../python-modules/uncompyle6/default.nix | 14 +- .../python-modules/unidata-blocks/default.nix | 4 +- .../python-modules/unidiff/default.nix | 2 +- .../python-modules/units/default.nix | 22 - .../unittest-xml-reporting/default.nix | 46 +- .../python-modules/unstructured/default.nix | 4 +- .../python-modules/upb-lib/default.nix | 40 +- .../python-modules/uproot/default.nix | 10 +- .../python-modules/uptime/default.nix | 25 +- .../python-modules/uqbar/default.nix | 11 +- .../python-modules/urwid/default.nix | 4 +- .../python-modules/uvicorn/default.nix | 10 +- .../uxsim/add-qt-plugin-path-to-env.patch | 24 + .../python-modules/uxsim/default.nix | 69 + .../vacuum-map-parser-base/default.nix | 4 +- .../vacuum-map-parser-roborock/default.nix | 10 +- .../validator-collection/default.nix | 8 + .../python-modules/validators/default.nix | 33 +- .../python-modules/vdirsyncer/default.nix | 2 +- .../python-modules/versioningit/default.nix | 4 +- .../python-modules/verspec/default.nix | 2 +- .../python-modules/virt-firmware/default.nix | 4 +- .../virtualenv-clone/default.nix | 2 +- .../python-modules/virtualenv/default.nix | 4 +- .../python-modules/vt-py/default.nix | 4 +- .../python-modules/wadllib/default.nix | 2 +- .../python-modules/wasmer/default.nix | 16 +- .../watchdog-gevent/default.nix | 39 +- .../python-modules/weasel/default.nix | 1 + .../weaviate-client/default.nix | 63 +- .../python-modules/webauthn/default.nix | 4 +- .../python-modules/webdataset/default.nix | 14 +- .../python-modules/webexteamssdk/default.nix | 42 +- .../python-modules/werkzeug/default.nix | 13 +- .../python-modules/wheel-inspect/default.nix | 7 +- .../python-modules/wheel/default.nix | 4 +- .../wheezy-template/default.nix | 4 +- .../python-modules/whenever/default.nix | 4 +- .../widgetsnbextension/default.nix | 1 - .../python-modules/wikitextparser/default.nix | 6 +- .../python-modules/winacl/default.nix | 31 +- .../python-modules/wktutils/default.nix | 66 +- .../python-modules/woob/default.nix | 11 + .../python-modules/wsgidav/default.nix | 45 +- .../python-modules/wsgitools/default.nix | 24 +- .../python-modules/wurlitzer/default.nix | 4 +- .../python-modules/wxpython/4.2.nix | 4 +- .../xarray-dataclasses/default.nix | 6 + .../python-modules/xarray/default.nix | 1 - .../python-modules/xcffib/default.nix | 4 + .../python-modules/xdis/default.nix | 26 +- .../python-modules/xdot/default.nix | 4 +- .../python-modules/xiaomi-ble/default.nix | 54 +- .../python-modules/xml2rfc/default.nix | 4 +- .../python-modules/xmldiff/default.nix | 8 +- .../python-modules/xmlschema/default.nix | 4 +- .../python-modules/xmlsec/default.nix | 4 +- .../python-modules/yabadaba/default.nix | 51 +- .../python-modules/yalexs/default.nix | 4 +- .../python-modules/yamale/default.nix | 39 +- .../python-modules/yamlfix/default.nix | 26 +- .../python-modules/ydiff/default.nix | 10 +- .../python-modules/yolink-api/default.nix | 4 +- .../python-modules/youless-api/default.nix | 51 +- .../youtube-search-python/default.nix | 2 +- .../youtube-transcript-api/default.nix | 2 +- .../development/python-modules/yq/default.nix | 4 +- .../python-modules/ytmusicapi/default.nix | 31 +- .../python-modules/zarr/default.nix | 4 +- .../python-modules/zdaemon/default.nix | 4 +- .../zephyr-python-api/default.nix | 7 +- .../python-modules/zha-quirks/default.nix | 4 +- .../python-modules/zha/default.nix | 8 +- .../python-modules/ziafont/default.nix | 9 +- .../python-modules/ziamath/default.nix | 10 +- .../python-modules/zigpy/default.nix | 11 +- .../python-modules/zipp/default.nix | 4 +- .../python-modules/zlib-ng/default.nix | 4 +- .../zwave-js-server-python/default.nix | 37 +- .../python-modules/zxcvbn/default.nix | 2 +- .../pkgs/development/r-modules/default.nix | 106 +- .../development/r-modules/generic-builder.nix | 3 + .../rocm-modules/5/clr/default.nix | 13 +- .../rocm-modules/6/clr/default.nix | 27 +- .../development/rocm-modules/6/default.nix | 2 +- .../rocm-modules/6/miopen/default.nix | 5 + .../rocm-modules/6/rccl/default.nix | 4 +- .../rocm-modules/6/rocblas/default.nix | 170 +- .../rocm-modules/6/rocm-runtime/default.nix | 10 + .../rocm-modules/6/rocprim/default.nix | 9 + .../rocm-modules/6/tensile/default.nix | 20 +- .../ruby-modules/bundix/default.nix | 2 +- .../ruby-modules/bundler/default.nix | 4 +- .../ruby-modules/gem-config/default.nix | 18 +- .../ruby-modules/with-packages/Gemfile | 1 + .../build-skaware-package.nix | 5 +- .../skaware-packages/execline/default.nix | 8 +- .../skaware-packages/s6/default.nix | 8 +- .../skaware-packages/tipidee/default.nix | 7 +- .../pkgs/development/tools/abuild/default.nix | 7 +- .../pkgs/development/tools/air/default.nix | 4 +- .../development/tools/algolia-cli/default.nix | 6 +- .../pkgs/development/tools/allure/default.nix | 52 +- .../tools/altair-graphql-client/default.nix | 6 +- .../development/tools/amqpcat/default.nix | 4 +- .../pkgs/development/tools/amqpcat/shards.nix | 8 +- .../tools/analysis/actionlint/default.nix | 8 +- .../tools/analysis/brakeman/default.nix | 2 +- .../analysis/cargo-tarpaulin/default.nix | 6 +- .../tools/analysis/checkov/default.nix | 12 +- .../tools/analysis/checkstyle/default.nix | 4 +- .../tools/analysis/codeql/default.nix | 4 +- .../tools/analysis/cvehound/default.nix | 4 +- .../tools/analysis/flow/default.nix | 6 +- .../tools/analysis/frama-c/default.nix | 4 +- .../tools/analysis/hotspot/default.nix | 63 +- .../tools/analysis/jacoco/default.nix | 4 +- .../tools/analysis/nix-linter/default.nix | 2 +- .../tools/analysis/randoop/default.nix | 4 +- .../tools/analysis/smatch/default.nix | 2 +- .../tools/analysis/snyk/default.nix | 6 +- .../tools/analysis/stylelint/default.nix | 6 +- .../tflint-plugins/tflint-ruleset-aws.nix | 6 +- .../tflint-plugins/tflint-ruleset-google.nix | 6 +- .../tools/analysis/tflint/default.nix | 8 +- .../tools/analysis/tfsec/default.nix | 18 +- .../pkgs/development/tools/apko/default.nix | 6 +- .../pkgs/development/tools/argc/default.nix | 37 - .../tools/async-profiler/default.nix | 44 - .../tools/backblaze-b2/default.nix | 4 +- .../pkgs/development/tools/bacon/default.nix | 6 +- .../tools/bazel-watcher/default.nix | 8 +- .../pkgs/development/tools/bbin/default.nix | 4 +- .../pkgs/development/tools/bearer/default.nix | 6 +- .../development/tools/benthos/default.nix | 6 +- .../development/tools/biodiff/default.nix | 15 +- .../pkgs/development/tools/biome/default.nix | 8 +- .../pkgs/development/tools/bloom/default.nix | 2 +- .../pkgs/development/tools/buf/default.nix | 6 +- .../apache-maven/build-package.nix | 2 +- .../bazel/bazel_6/darwin_sleep.patch | 56 + .../build-managers/bazel/bazel_6/default.nix | 60 +- .../bazel/bazel_6/src-deps.json | 46 +- .../bazel/bazel_7/MODULE.bazel.lock | 1748 +- .../bazel/bazel_7/cpp-test-MODULE.bazel.lock | 1295 +- .../build-managers/bazel/bazel_7/default.nix | 6 +- .../bazel/bazel_7/nix-hacks.patch | 40 +- .../bazel_7/protobuf-test.MODULE.bazel.lock | 1114 +- .../bazel/buildtools/default.nix | 2 +- .../tools/build-managers/bazel/cpp-test.nix | 2 +- .../tools/build-managers/bazel/java-test.nix | 2 +- .../build-managers/bazel/protobuf-test.nix | 2 +- .../bazel/python-bin-path-test.nix | 2 +- .../tools/build-managers/bob/default.nix | 19 +- .../tools/build-managers/buck/default.nix | 2 +- .../tools/build-managers/moon/default.nix | 6 +- .../tools/build-managers/sbt/default.nix | 4 +- .../build-managers/scala-cli/sources.json | 10 +- .../tools/build-managers/xmake/default.nix | 4 +- .../development/tools/buildah/default.nix | 4 +- .../development/tools/buildkit/default.nix | 10 +- .../development/tools/buildpack/default.nix | 2 +- .../development/tools/bundletool/default.nix | 6 +- .../development/tools/cambalache/default.nix | 18 +- .../pkgs/development/tools/cdecl/default.nix | 26 - .../development/tools/changie/default.nix | 6 +- .../tools/check-jsonschema/default.nix | 4 +- .../pkgs/development/tools/click/default.nix | 4 +- .../development/tools/cloud-nuke/default.nix | 2 +- .../pkgs/development/tools/coder/default.nix | 22 +- .../pkgs/development/tools/coder/update.sh | 11 +- .../tools/confluent-cli/default.nix | 10 +- .../development/tools/conftest/default.nix | 6 +- .../continuous-integration/agola/default.nix | 6 +- .../cirrus-cli/default.nix | 6 +- .../codeberg-pages/default.nix | 5 +- .../codeberg-pages/disable_httptest.patch | 58 - .../drone-runner-docker/default.nix | 2 +- .../continuous-integration/drone/default.nix | 4 +- .../gitea-actions-runner/default.nix | 6 +- .../github-runner/default.nix | 9 +- .../gitlab-runner/default.nix | 6 +- .../development/tools/coursier/default.nix | 4 +- .../development/tools/cpm-cmake/default.nix | 4 +- .../tools/database/atlas/default.nix | 8 +- .../database/clickhouse-backup/default.nix | 6 +- .../tools/database/dbmate/default.nix | 6 +- .../tools/database/litecli/default.nix | 4 +- .../tools/database/pg_checksums/default.nix | 2 +- .../tools/database/sqlcheck/default.nix | 2 +- .../tools/database/sqlfluff/default.nix | 4 +- .../tools/database/sqlitebrowser/default.nix | 4 +- .../database/timescaledb-tune/default.nix | 2 +- .../tools/database/vitess/default.nix | 6 +- .../pkgs/development/tools/devbox/default.nix | 6 +- .../tools/devpi-client/default.nix | 73 +- .../tools/devpi-server/default.nix | 8 +- .../pkgs/development/tools/dive/default.nix | 16 +- .../pkgs/development/tools/doctl/default.nix | 4 +- .../tools/documentation/gtk-doc/default.nix | 4 +- .../pkgs/development/tools/dprint/default.nix | 6 +- .../development/tools/earthly/default.nix | 4 +- .../tools/electron/binary/default.nix | 47 +- .../tools/electron/binary/generic.nix | 4 +- .../tools/electron/binary/info.json | 57 + .../tools/electron/binary/print-hashes.sh | 38 - .../development/tools/electron/common.nix | 4 +- .../pkgs/development/tools/electron/info.json | 5847 +- .../pkgs/development/tools/electron/update.py | 794 +- .../development/tools/electron/wrapper.nix | 4 +- .../pkgs/development/tools/ent/default.nix | 14 +- .../development/tools/esbuild/default.nix | 2 +- .../development/tools/extism-cli/default.nix | 6 +- .../development/tools/faas-cli/default.nix | 4 +- .../tools/firebase-tools/default.nix | 6 +- .../pkgs/development/tools/flock/default.nix | 2 +- .../pkgs/development/tools/frugal/default.nix | 6 +- .../tools/fsautocomplete/default.nix | 8 +- .../development/tools/fsautocomplete/deps.nix | 34 +- .../pkgs/development/tools/gauge/default.nix | 14 +- .../development/tools/gauge/nix-check.patch | 50 + .../tools/gauge/plugins/default.nix | 14 + .../tools/gauge/plugins/dotnet/data.json | 5 + .../tools/gauge/plugins/dotnet/default.nix | 22 + .../tools/gauge/plugins/go/data.json | 15 + .../tools/gauge/plugins/go/default.nix | 19 + .../tools/gauge/plugins/html-report/data.json | 19 + .../gauge/plugins/html-report/default.nix | 19 + .../tools/gauge/plugins/java/data.json | 19 + .../tools/gauge/plugins/java/default.nix | 24 + .../tools/gauge/plugins/js/default.nix | 42 + .../tools/gauge/plugins/make-gauge-plugin.nix | 94 + .../tools/gauge/plugins/ruby/data.json | 19 + .../tools/gauge/plugins/ruby/default.nix | 19 + .../tools/gauge/plugins/screenshot/data.json | 19 + .../gauge/plugins/screenshot/default.nix | 19 + .../tools/gauge/plugins/xml-report/data.json | 19 + .../gauge/plugins/xml-report/default.nix | 19 + .../pkgs/development/tools/gauge/wrapper.nix | 59 + .../pkgs/development/tools/ginkgo/default.nix | 6 +- .../development/tools/git-ps-rs/default.nix | 6 +- .../pkgs/development/tools/glade/default.nix | 6 +- .../tools/glamoroustoolkit/default.nix | 4 +- .../tools/gnome-desktop-testing/default.nix | 2 +- .../development/tools/go-migrate/default.nix | 8 +- .../development/tools/go-minimock/default.nix | 6 +- .../development/tools/go-mockery/default.nix | 4 +- .../development/tools/go-swagger/default.nix | 6 +- .../development/tools/go-task/default.nix | 6 +- .../development/tools/go-toml/default.nix | 34 +- .../development/tools/goconvey/default.nix | 6 +- .../development/tools/godot/4/default.nix | 16 +- .../tools/golangci-lint/default.nix | 6 +- .../pkgs/development/tools/goperf/default.nix | 6 +- .../development/tools/goresym/default.nix | 6 +- .../development/tools/gotestsum/default.nix | 25 +- .../development/tools/gotools/default.nix | 2 +- .../development/tools/gqlgenc/default.nix | 4 +- .../tools/gtk-mac-bundler/default.nix | 2 +- .../hadrian/disable-hyperlinked-source.patch | 4 +- .../hadrian-9.8.1-allow-Cabal-3.10.patch | 4 +- .../tools/haskell/hadrian/hadrian.nix | 8 - .../tools/haskell/hadrian/make-hadrian.nix | 6 +- .../pkgs/development/tools/hcloud/default.nix | 6 +- .../pkgs/development/tools/heroku/default.nix | 8 +- .../development/tools/infisical/default.nix | 4 +- .../development/tools/infisical/hashes.json | 8 +- .../tools/java/jprofiler/default.nix | 2 +- .../pkgs/development/tools/jql/default.nix | 6 +- .../pkgs/development/tools/jqp/default.nix | 6 +- .../pkgs/development/tools/jtc/default.nix | 2 +- .../pkgs/development/tools/k6/default.nix | 4 +- .../pkgs/development/tools/kind/default.nix | 6 +- .../development/tools/kubeswitch/default.nix | 4 +- .../development/tools/kustomize/default.nix | 6 +- .../language-servers/csharp-ls/default.nix | 4 +- .../dot-language-server/default.nix | 2 +- .../tools/language-servers/fortls/default.nix | 6 +- .../language-servers/helm-ls/default.nix | 6 +- .../lua-language-server/default.nix | 6 +- .../tools/language-servers/metals/default.nix | 6 +- .../tools/language-servers/millet/default.nix | 2 +- .../language-servers/neocmakelsp/default.nix | 6 +- .../tools/language-servers/nil/default.nix | 2 +- .../tools/language-servers/nixd/default.nix | 27 +- .../tools/language-servers/pylyzer/Cargo.lock | 1021 + .../language-servers/pylyzer/default.nix | 11 +- .../language-servers/vhdl-ls/default.nix | 6 +- .../vscode-langservers-extracted/default.nix | 6 +- .../tools/language-servers/zls/default.nix | 13 +- .../tools/language-servers/zls/deps.nix | 19 +- .../development/tools/micronaut/default.nix | 4 +- .../development/tools/misc/act/default.nix | 6 +- .../development/tools/misc/astyle/default.nix | 4 +- .../development/tools/misc/awf/default.nix | 4 +- .../tools/misc/blackfire/default.nix | 12 +- .../tools/misc/blackfire/php-probe.nix | 32 +- .../development/tools/misc/c2ffi/default.nix | 3 + .../misc/cmake-language-server/default.nix | 4 +- .../disable-test-timeouts.patch | 13 +- .../development/tools/misc/cppi/default.nix | 2 +- .../development/tools/misc/csmith/default.nix | 2 + .../tools/misc/cwebbin/default.nix | 32 +- .../development/tools/misc/d-spy/default.nix | 4 +- .../tools/misc/dart-sass/default.nix | 8 +- .../tools/misc/dart-sass/pubspec.lock.json | 60 +- .../tools/misc/elfutils/default.nix | 16 +- .../development/tools/misc/gpuvis/default.nix | 4 +- .../tools/misc/hydra-cli/default.nix | 2 +- .../development/tools/misc/hydra/unstable.nix | 10 + .../development/tools/misc/ltrace/default.nix | 2 +- .../tools/misc/lttng-tools/default.nix | 4 +- .../tools/misc/lttng-ust/default.nix | 4 +- .../tools/misc/luarocks/default.nix | 7 +- .../tools/misc/luarocks/luarocks-nix.nix | 27 +- .../development/tools/misc/mkcert/default.nix | 2 +- .../tools/misc/msitools/default.nix | 2 +- .../tools/misc/n98-magerun2/default.nix | 6 +- .../tools/misc/nix-bisect/default.nix | 19 +- .../tools/misc/one_gadget/Gemfile.lock | 6 +- .../tools/misc/one_gadget/default.nix | 1 + .../tools/misc/one_gadget/gemset.nix | 8 +- .../tools/misc/patchelf/unstable.nix | 2 +- .../tools/misc/reviewdog/default.nix | 8 +- .../tools/misc/sccache/default.nix | 6 +- .../development/tools/misc/stlink/default.nix | 4 +- .../tools/misc/strace-analyzer/default.nix | 6 +- .../tools/misc/terracognita/default.nix | 2 +- .../tools/misc/terraform-ls/default.nix | 6 +- .../tools/misc/terraform-lsp/default.nix | 2 +- .../tools/misc/terraformer/default.nix | 2 +- .../tools/misc/terramate/default.nix | 9 +- .../development/tools/misc/terser/default.nix | 6 +- .../development/tools/misc/texinfo/common.nix | 7 +- .../development/tools/misc/texlab/default.nix | 8 +- .../development/tools/misc/tie/default.nix | 2 +- .../tools/misc/usb-modeswitch/default.nix | 5 +- .../misc/usb-modeswitch/pkg-config.patch | 14 + .../tools/mongosh/package-lock.json | 603 +- .../development/tools/mongosh/source.json | 8 +- .../tools/msgpack-tools/default.nix | 2 +- .../development/tools/mysql-shell/default.nix | 10 +- .../development/tools/nemiver/default.nix | 12 +- .../pkgs/development/tools/nwjs/default.nix | 16 +- .../pkgs/development/tools/ocaml/dune/1.nix | 2 +- .../pkgs/development/tools/ocaml/dune/2.nix | 2 +- .../pkgs/development/tools/ocaml/dune/3.nix | 6 +- .../tools/ocaml/ocp-index/default.nix | 4 +- .../development/tools/ocaml/opam/default.nix | 2 +- .../development/tools/ocaml/opam/opam.nix.pl | 2 +- .../pkgs/development/tools/okteto/default.nix | 12 +- .../pkgs/development/tools/ols/default.nix | 12 +- .../development/tools/opcr-policy/default.nix | 6 +- .../tools/open-policy-agent/default.nix | 4 +- .../pkgs/development/tools/packer/default.nix | 6 +- .../tools/parsing/tree-sitter/default.nix | 10 +- .../grammars/tree-sitter-commonlisp.json | 10 +- .../tree-sitter/grammars/tree-sitter-cpp.json | 10 +- .../grammars/tree-sitter-cuda.json | 10 +- .../grammars/tree-sitter-dart.json | 10 +- .../grammars/tree-sitter-elixir.json | 10 +- .../grammars/tree-sitter-fish.json | 10 +- .../grammars/tree-sitter-glsl.json | 10 +- .../grammars/tree-sitter-haskell.json | 10 +- .../grammars/tree-sitter-javascript.json | 10 +- .../grammars/tree-sitter-json.json | 10 +- .../grammars/tree-sitter-julia.json | 10 +- .../grammars/tree-sitter-just.json | 10 +- .../grammars/tree-sitter-latex.json | 10 +- .../grammars/tree-sitter-markdown.json | 10 +- .../tree-sitter/grammars/tree-sitter-nix.json | 10 +- .../grammars/tree-sitter-norg-meta.json | 10 +- .../grammars/tree-sitter-norg.json | 10 +- .../tree-sitter/grammars/tree-sitter-nu.json | 10 +- .../grammars/tree-sitter-ocaml.json | 10 +- .../grammars/tree-sitter-perl.json | 10 +- .../grammars/tree-sitter-python.json | 10 +- .../grammars/tree-sitter-query.json | 10 +- .../grammars/tree-sitter-rust.json | 10 +- .../grammars/tree-sitter-scheme.json | 10 +- .../grammars/tree-sitter-solidity.json | 10 +- .../grammars/tree-sitter-templ.json | 10 +- .../grammars/tree-sitter-tlaplus.json | 10 +- .../grammars/tree-sitter-typst.json | 10 +- .../grammars/tree-sitter-wing.json | 10 +- .../pkgs/development/tools/pet/default.nix | 6 +- .../development/tools/pgformatter/default.nix | 2 +- .../development/tools/pip-audit/default.nix | 46 +- .../pkgs/development/tools/poac/default.nix | 6 +- .../development/tools/prettierd/default.nix | 6 +- .../development/tools/prettierd/package.json | 14 +- .../tools/profiling/pprof/default.nix | 11 +- .../tools/profiling/sysprof/default.nix | 6 +- .../tools/protoc-gen-connect-go/default.nix | 6 +- .../tools/protoc-gen-entgrpc/default.nix | 6 +- .../tools/protoc-gen-go/default.nix | 4 +- .../development/tools/protolint/default.nix | 6 +- .../development/tools/prototool/default.nix | 2 +- .../pkgs/development/tools/pscale/default.nix | 6 +- .../tools/purescript/spago/default.nix | 88 +- .../tools/purescript/spago/spago.nix | 13 +- .../pkgs/development/tools/pyenv/default.nix | 4 +- .../development/tools/qtcreator/default.nix | 4 +- .../development/tools/railway/default.nix | 6 +- .../pkgs/development/tools/rain/default.nix | 6 +- .../pkgs/development/tools/rbspy/default.nix | 6 +- .../tools/redisinsight/default.nix | 151 +- .../development/tools/reindeer/default.nix | 10 +- .../pkgs/development/tools/ruff/default.nix | 6 +- .../tools/rust/cargo-about/default.nix | 35 +- .../tools/rust/cargo-binstall/default.nix | 6 +- .../tools/rust/cargo-bisect-rustc/default.nix | 66 +- .../tools/rust/cargo-c/default.nix | 10 +- .../tools/rust/cargo-clone/default.nix | 2 + .../tools/rust/cargo-deb/default.nix | 6 +- .../tools/rust/cargo-deny/default.nix | 6 +- .../tools/rust/cargo-duplicates/default.nix | 6 +- .../tools/rust/cargo-generate/default.nix | 6 +- .../tools/rust/cargo-llvm-lines/default.nix | 6 +- .../tools/rust/cargo-mutants/default.nix | 6 +- .../tools/rust/cargo-nextest/default.nix | 6 +- .../tools/rust/cargo-pgx/0_6_1.nix | 26 - .../tools/rust/cargo-pgx/0_7_1.nix | 26 - .../tools/rust/cargo-pgx/0_7_4.nix | 26 - .../rust/cargo-pgx/buildPgxExtension.nix | 160 - .../tools/rust/cargo-raze/default.nix | 48 - .../rust/cargo-semver-checks/default.nix | 6 +- .../tools/rust/cargo-show-asm/default.nix | 6 +- .../tools/rust/cargo-spellcheck/default.nix | 11 +- .../tools/rust/cargo-tally/default.nix | 6 +- .../tools/rust/cargo-tauri/default.nix | 6 +- .../tools/rust/cargo-whatfeatures/default.nix | 6 +- .../tools/rust/cargo-zigbuild/default.nix | 6 +- .../tools/rust/rust-analyzer/default.nix | 6 +- .../tools/rust/svd2rust/default.nix | 6 +- .../tools/rust/typeshare/default.nix | 6 +- .../pkgs/development/tools/rye/Cargo.lock | 384 +- .../pkgs/development/tools/rye/default.nix | 6 +- .../development/tools/scalafix/default.nix | 2 +- .../tools/scenebuilder/default.nix | 102 +- .../fix-default-maven-plugin-versions.patch | 60 + .../scenebuilder/pom-remove-javafx.patch | 28 + .../development/tools/sea-orm-cli/default.nix | 6 +- .../pkgs/development/tools/selene/default.nix | 6 +- .../tools/selenium/chromedriver/default.nix | 2 +- .../pkgs/development/tools/sem/default.nix | 4 +- .../development/tools/sentry-cli/default.nix | 8 +- .../tools/spring-boot-cli/default.nix | 4 +- .../pkgs/development/tools/sqldef/default.nix | 6 +- .../pkgs/development/tools/squawk/default.nix | 2 +- .../tools/supabase-cli/default.nix | 6 +- .../development/tools/swiftpm2nix/support.nix | 2 +- .../development/tools/tabnine/sources.json | 8 +- .../pkgs/development/tools/trunk/default.nix | 27 +- .../pkgs/development/tools/ttfb/default.nix | 6 +- .../development/tools/turso-cli/default.nix | 4 +- .../development/tools/twilio-cli/default.nix | 2 +- .../development/tools/txtpbfmt/default.nix | 8 +- .../pkgs/development/tools/typos/default.nix | 6 +- .../development/tools/uftrace/default.nix | 4 +- .../development/tools/unityhub/default.nix | 4 +- .../development/tools/vala-lint/default.nix | 6 +- .../pkgs/development/tools/vsce/default.nix | 4 +- .../pkgs/development/tools/wails/default.nix | 6 +- .../tools/wasm-bindgen-cli/default.nix | 6 +- .../pkgs/development/tools/wgo/default.nix | 4 +- .../pkgs/development/tools/wlcs/default.nix | 2 +- .../development/tools/yamlfmt/default.nix | 6 +- .../development/tools/yarn-berry/default.nix | 6 +- .../pkgs/development/tools/yarn/default.nix | 2 +- .../pkgs/development/tools/yq-go/default.nix | 6 +- .../pkgs/development/tools/zsv/default.nix | 2 +- .../pkgs/development/web/bloomrpc/default.nix | 4 - .../web/bootstrap-studio/default.nix | 2 - .../pkgs/development/web/bun/default.nix | 10 +- .../pkgs/development/web/cog/default.nix | 4 +- .../pkgs/development/web/cypress/default.nix | 4 +- .../pkgs/development/web/deno/default.nix | 6 +- .../pkgs/development/web/deno/librusty_v8.nix | 10 +- .../pkgs/development/web/flyctl/default.nix | 12 +- .../pkgs/development/web/ihp-new/default.nix | 4 +- .../pkgs/development/web/insomnia/default.nix | 4 +- .../node-npm-build-npm-package-logic.patch | 4 +- .../pkgs/development/web/nodejs/nodejs.nix | 2 +- .../web/nodejs/{v21.nix => v22.nix} | 4 +- .../pkgs/development/web/postman/darwin.nix | 4 +- .../pkgs/development/web/postman/default.nix | 2 +- .../pkgs/development/web/postman/linux.nix | 8 +- .../pkgs/development/web/publii/default.nix | 4 +- .../nixpkgs/pkgs/games/1oom/default.nix | 26 +- .../nixpkgs/pkgs/games/abuse/default.nix | 20 +- .../nixpkgs/pkgs/games/anki/Cargo.lock | 1454 +- third_party/nixpkgs/pkgs/games/anki/bin.nix | 9 +- .../nixpkgs/pkgs/games/anki/default.nix | 30 +- .../remove-the-gl-library-workaround.patch | 8 +- .../nixpkgs/pkgs/games/arena/default.nix | 3 +- .../pkgs/games/badlion-client/default.nix | 1 - .../nixpkgs/pkgs/games/chiaki/default.nix | 2 +- .../nixpkgs/pkgs/games/colobot/default.nix | 17 +- .../doom-ports/chocolate-doom/default.nix | 2 +- .../pkgs/games/doom-ports/dhewm3/default.nix | 2 +- .../games/doom-ports/doomretro/default.nix | 4 +- .../games/doom-ports/doomrunner/default.nix | 4 +- .../games/doom-ports/doomseeker/default.nix | 2 +- .../doom-ports/doomseeker/qt_build_fix.patch | 47 - .../doom-ports/eternity-engine/default.nix | 2 +- .../pkgs/games/doom-ports/gzdoom/default.nix | 4 +- .../pkgs/games/doom-ports/odamex/default.nix | 2 +- .../pkgs/games/doom-ports/slade/default.nix | 4 +- .../pkgs/games/doom-ports/slade/git.nix | 2 +- .../doom-ports/zandronum/alpha/default.nix | 2 +- .../games/doom-ports/zandronum/default.nix | 2 +- .../pkgs/games/dwarf-fortress/default.nix | 8 +- .../games/dwarf-fortress/dfhack/default.nix | 5 + .../dwarf-therapist/default.nix | 7 +- .../pkgs/games/dwarf-fortress/game.json | 3 + .../games/eduke32/convert-bmp-to-png.diff | 23 + .../nixpkgs/pkgs/games/eduke32/default.nix | 6 + .../pkgs/games/extremetuxracer/default.nix | 4 +- .../nixpkgs/pkgs/games/factorio/versions.json | 48 +- .../pkgs/games/fallout-ce/fallout2-ce.nix | 4 +- .../nixpkgs/pkgs/games/freeciv/default.nix | 18 +- .../nixpkgs/pkgs/games/gamehub/default.nix | 4 +- .../nixpkgs/pkgs/games/gnonograms/default.nix | 4 +- .../nixpkgs/pkgs/games/gnuchess/default.nix | 5 + .../nixpkgs/pkgs/games/gogui/default.nix | 45 +- .../nixpkgs/pkgs/games/grapejuice/default.nix | 4 +- .../nixpkgs/pkgs/games/gscrabble/default.nix | 4 +- .../nixpkgs/pkgs/games/gshogi/default.nix | 4 +- .../nixpkgs/pkgs/games/gtypist/default.nix | 2 + .../nixpkgs/pkgs/games/gweled/default.nix | 4 +- .../nixpkgs/pkgs/games/hmcl/default.nix | 4 +- .../nixpkgs/pkgs/games/instawow/default.nix | 12 +- .../nixpkgs/pkgs/games/jfsw/default.nix | 4 +- .../nixpkgs/pkgs/games/jumpnbump/default.nix | 4 +- .../nixpkgs/pkgs/games/katago/default.nix | 6 +- .../pkgs/games/liberation-circuit/default.nix | 4 +- .../nixpkgs/pkgs/games/linthesia/default.nix | 4 +- .../nixpkgs/pkgs/games/maptool/default.nix | 4 +- .../nixpkgs/pkgs/games/mindustry/default.nix | 1 + .../games/minecraft-servers/versions.json | 44 +- .../nixpkgs/pkgs/games/minecraft/default.nix | 7 +- .../nixpkgs/pkgs/games/nanosaur/default.nix | 6 +- .../nixpkgs/pkgs/games/nile/default.nix | 10 +- .../pkgs/games/nxengine-evo/default.nix | 68 - .../nixpkgs/pkgs/games/openclonk/default.nix | 24 +- .../nixpkgs/pkgs/games/openjk/default.nix | 6 +- .../nixpkgs/pkgs/games/openlierox/default.nix | 89 +- .../nixpkgs/pkgs/games/openrct2/default.nix | 12 +- .../nixpkgs/pkgs/games/openttd/jgrpp.nix | 4 +- .../nixpkgs/pkgs/games/openxcom/default.nix | 6 +- .../nixpkgs/pkgs/games/openxray/default.nix | 2 +- .../nixpkgs/pkgs/games/osu-lazer/bin.nix | 2 +- .../nixpkgs/pkgs/games/principia/default.nix | 4 +- .../pkgs/games/prismlauncher/default.nix | 10 +- .../pkgs/games/prismlauncher/wrapper.nix | 2 +- .../pkgs/games/rocksndiamonds/default.nix | 2 +- .../pkgs/games/runescape-launcher/default.nix | 4 +- .../pkgs/games/sgt-puzzles/default.nix | 4 +- .../nixpkgs/pkgs/games/shipwright/default.nix | 8 +- .../space-station-14-launcher.nix | 6 +- .../nixpkgs/pkgs/games/starsector/default.nix | 10 +- .../nixpkgs/pkgs/games/steam/fhsenv.nix | 4 + .../nixpkgs/pkgs/games/steam/runtime.nix | 16 +- .../pkgs/games/the-powder-toy/default.nix | 65 - .../pkgs/games/unvanquished/default.nix | 10 +- .../nixpkgs/pkgs/games/vassal/default.nix | 8 +- .../pkgs/games/vintagestory/default.nix | 4 +- .../nixpkgs/pkgs/games/vitetris/default.nix | 3 +- .../nixpkgs/pkgs/games/worldofgoo/default.nix | 2 +- .../nixpkgs/pkgs/games/xskat/default.nix | 2 + .../extra-cmake-modules/default.nix | 12 +- .../extra-cmake-modules/ecm-hook.sh | 2 +- .../pkgs/kde/frameworks/kdoctools/default.nix | 3 - .../kde/frameworks/kfilemetadata/default.nix | 3 +- .../kde/frameworks/kguiaddons/default.nix | 3 +- .../pkgs/kde/frameworks/kidletime/default.nix | 3 +- .../kde/frameworks/kwindowsystem/default.nix | 3 +- .../frameworks/qqc2-desktop-style/default.nix | 2 - .../pkgs/kde/frameworks/solid/default.nix | 6 +- .../pkgs/kde/gear/akonadi-search/default.nix | 3 +- .../pkgs/kde/gear/angelfish/default.nix | 3 +- .../nixpkgs/pkgs/kde/gear/arianna/default.nix | 2 - .../pkgs/kde/gear/ghostwriter/default.nix | 4 +- .../pkgs/kde/gear/gwenview/default.nix | 4 - .../nixpkgs/pkgs/kde/gear/kasts/default.nix | 2 - .../nixpkgs/pkgs/kde/gear/kcalc/default.nix | 3 +- .../pkgs/kde/gear/kdeconnect-kde/default.nix | 20 + .../kdeconnect-kde/hardcode-sshfs-path.patch | 13 + .../gear/kdeconnect-kde/remove-ssh-dss.patch | 13 + .../pkgs/kde/gear/kdepim-addons/default.nix | 5 +- .../pkgs/kde/gear/kio-extras/default.nix | 2 - .../nixpkgs/pkgs/kde/gear/koko/default.nix | 2 - .../pkgs/kde/gear/kopeninghours/default.nix | 1 + .../pkgs/kde/gear/plasmatube/default.nix | 7 +- .../nixpkgs/pkgs/kde/gear/sweeper/default.nix | 6 +- .../nixpkgs/pkgs/kde/gear/tokodon/default.nix | 5 +- .../pkgs/kde/generated/dependencies.json | 180 +- .../nixpkgs/pkgs/kde/generated/projects.json | 24 +- .../kde/generated/sources/frameworks.json | 432 +- .../pkgs/kde/generated/sources/plasma.json | 6 +- .../pkgs/kde/lib/mk-kde-derivation.nix | 18 +- .../nixpkgs/pkgs/kde/lib/move-dev-hook.sh | 5 +- .../pkgs/kde/misc/kirigami-addons/default.nix | 4 +- .../pkgs/kde/misc/ktextaddons/default.nix | 4 +- .../nixpkgs/pkgs/kde/misc/mpvqt/default.nix | 5 +- .../pkgs/kde/plasma/breeze-grub/default.nix | 2 + .../kde/plasma/kde-gtk-config/default.nix | 4 +- .../pkgs/kde/plasma/kwayland/default.nix | 3 +- ...er-CAP_SYS_NICE-from-the-ambient-set.patch | 40 + .../nixpkgs/pkgs/kde/plasma/kwin/default.nix | 1 + .../kde/plasma/layer-shell-qt/default.nix | 4 +- .../plasma/xdg-desktop-portal-kde/default.nix | 4 +- .../nixpkgs/pkgs/misc/autotiling/default.nix | 4 +- .../pkgs/misc/drivers/epsonscan2/default.nix | 14 +- .../misc/drivers/sc-controller/default.nix | 4 +- .../nixpkgs/pkgs/misc/fastly/default.nix | 6 +- .../pkgs/misc/jitsi-meet-prosody/default.nix | 4 +- .../nixpkgs/pkgs/misc/lilypond/unstable.nix | 4 +- .../nixpkgs/pkgs/misc/plasma-hud/default.nix | 4 +- .../nixpkgs/pkgs/misc/scrcpy/default.nix | 2 +- .../pkgs/misc/screensavers/alock/default.nix | 13 +- .../screensavers/light-locker/default.nix | 4 +- .../misc/screensavers/xlockmore/default.nix | 4 +- .../nixpkgs/pkgs/misc/sndio/default.nix | 16 +- .../nixpkgs/pkgs/misc/solfege/default.nix | 4 +- .../pkgs/misc/tmux-plugins/default.nix | 31 +- .../pkgs/os-specific/bsd/freebsd/default.nix | 123 +- .../bsd/freebsd/evdev-proto/default.nix | 11 +- .../os-specific/bsd/freebsd/lib/default.nix | 18 +- .../os-specific/bsd/freebsd/package-set.nix | 96 + .../13.1}/compat-fix-typedefs-locations.patch | 0 .../13.1}/compat-install-dirs.patch | 0 .../13.1}/libc-msun-arch-subdir.patch | 0 .../13.1}/libc-no-force--lcompiler-rt.patch | 0 .../13.1}/libnetbsd-do-install.patch | 0 .../13.1}/librpcsvc-include-subdir.patch | 0 .../freebsd/patches/13.1/mtree-Makefile.patch | 13 + .../13.1}/no-perms-BSD.include.dist.patch | 0 .../sys => patches/13.1}/sys-gnu-date.patch | 0 .../sys-no-explicit-intrinsics-dep.patch | 0 .../patches/14.0/bmake-no-compiler-rt.patch | 11 + .../14.0/compat-fix-typedefs-locations.patch | 32 + .../patches/14.0/compat-install-dirs.patch | 40 + .../14.0/install-bootstrap-Makefile.patch | 11 + .../patches/14.0/libc-msun-arch-subdir.patch | 11 + .../14.0/libc-no-force--lcompiler-rt.patch | 10 + .../patches/14.0/libnetbsd-do-install.patch | 32 + .../14.0/librpcsvc-include-subdir.patch | 11 + .../freebsd/patches/14.0/mtree-Makefile.patch | 13 + .../14.0/no-perms-BSD.include.dist.patch | 11 + .../14.0/rtld-no-force--lcompiler-rt.patch | 10 + .../freebsd/patches/14.0/sys-gnu-date.patch | 13 + .../14.0/sys-no-explicit-intrinsics-dep.patch | 42 + .../bsd/freebsd/pkgs/boot-install.nix | 9 +- .../bsd/freebsd/pkgs/compat/package.nix | 215 +- .../os-specific/bsd/freebsd/pkgs/config.nix | 36 +- .../pkgs/os-specific/bsd/freebsd/pkgs/csu.nix | 25 +- .../bsd/freebsd/pkgs/ctfconvert.nix | 25 +- .../bsd/freebsd/pkgs/filterSource.nix | 23 + .../freebsd/pkgs/freebsdSetupHook/package.nix | 4 +- .../pkgs/freebsdSetupHook/setup-hook.sh | 11 + .../os-specific/bsd/freebsd/pkgs/gencat.nix | 4 +- .../bsd/freebsd/pkgs/include/package.nix | 33 +- .../os-specific/bsd/freebsd/pkgs/install.nix | 76 +- .../bsd/freebsd/pkgs/libc/package.nix | 307 +- .../os-specific/bsd/freebsd/pkgs/libdwarf.nix | 21 +- .../os-specific/bsd/freebsd/pkgs/libelf.nix | 24 - .../os-specific/bsd/freebsd/pkgs/libmd.nix | 49 + .../bsd/freebsd/pkgs/libnetbsd/package.nix | 32 +- .../os-specific/bsd/freebsd/pkgs/libsbuf.nix | 4 +- .../os-specific/bsd/freebsd/pkgs/libspl.nix | 23 +- .../os-specific/bsd/freebsd/pkgs/libutil.nix | 9 +- .../os-specific/bsd/freebsd/pkgs/lorder.nix | 19 +- .../os-specific/bsd/freebsd/pkgs/make.nix | 27 +- .../bsd/freebsd/pkgs/makeMinimal.nix | 21 +- .../bsd/freebsd/pkgs/mkDerivation.nix | 218 +- .../bsd/freebsd/pkgs/mkcsmapper.nix | 22 + .../os-specific/bsd/freebsd/pkgs/mkesdb.nix | 19 + .../os-specific/bsd/freebsd/pkgs/mknod.nix | 4 +- .../os-specific/bsd/freebsd/pkgs/mtree.nix | 37 +- .../bsd/freebsd/pkgs/rpcgen/package.nix | 11 +- .../pkgs/os-specific/bsd/freebsd/pkgs/sed.nix | 3 +- .../os-specific/bsd/freebsd/pkgs/source.nix | 1 - .../os-specific/bsd/freebsd/pkgs/stat.nix | 19 +- .../os-specific/bsd/freebsd/pkgs/statHook.nix | 16 +- .../bsd/freebsd/pkgs/sys/package.nix | 120 +- .../os-specific/bsd/freebsd/pkgs/tsort.nix | 28 +- .../pkgs/os-specific/bsd/freebsd/update.py | 22 +- .../os-specific/bsd/freebsd/versions.json | 59 +- .../pkgs/os-specific/bsd/netbsd/default.nix | 1207 +- .../os-specific/bsd/netbsd/pkgs/cksum.nix | 8 + .../os-specific/bsd/netbsd/pkgs/column.nix | 7 + .../os-specific/bsd/netbsd/pkgs/common.nix | 3 + .../compat}/compat-cxx-safe-header.patch | 0 .../compat}/compat-dont-configure-twice.patch | 0 .../compat}/compat-no-force-native.patch | 0 .../{ => pkgs/compat}/compat-setup-hook.sh | 0 .../{ => pkgs/compat}/libbsd-overlay.pc | 0 .../bsd/netbsd/pkgs/compat/package.nix | 146 + .../os-specific/bsd/netbsd/pkgs/config.nix | 31 + .../pkgs/os-specific/bsd/netbsd/pkgs/csu.nix | 49 + .../pkgs/os-specific/bsd/netbsd/pkgs/dict.nix | 9 + .../netbsd/{ => pkgs/fts}/fts-setup-hook.sh | 0 .../bsd/netbsd/pkgs/fts/package.nix | 48 + .../os-specific/bsd/netbsd/pkgs/genassym.nix | 7 + .../os-specific/bsd/netbsd/pkgs/gencat.nix | 7 + .../os-specific/bsd/netbsd/pkgs/getconf.nix | 7 + .../bsd/netbsd/{ => pkgs/getent}/getent.patch | 0 .../bsd/netbsd/pkgs/getent/package.nix | 8 + .../os-specific/bsd/netbsd/pkgs/headers.nix | 17 + .../bsd/netbsd/pkgs/i18n_module.nix | 13 + .../os-specific/bsd/netbsd/pkgs/include.nix | 54 + .../{ => pkgs/install}/install-setup-hook.sh | 0 .../bsd/netbsd/pkgs/install/package.nix | 62 + .../os-specific/bsd/netbsd/pkgs/ld_elf_so.nix | 22 + .../os-specific/bsd/netbsd/pkgs/libarch.nix | 8 + .../pkgs/os-specific/bsd/netbsd/pkgs/libc.nix | 103 + .../os-specific/bsd/netbsd/pkgs/libcrypt.nix | 9 + .../os-specific/bsd/netbsd/pkgs/libcurses.nix | 33 + .../os-specific/bsd/netbsd/pkgs/libedit.nix | 32 + .../pkgs/os-specific/bsd/netbsd/pkgs/libm.nix | 14 + .../bsd/netbsd/pkgs/libossaudio.nix | 8 + .../os-specific/bsd/netbsd/pkgs/libpci.nix | 15 + .../bsd/netbsd/pkgs/libpthread/base.nix | 5 + .../bsd/netbsd/pkgs/libpthread/headers.nix | 12 + .../bsd/netbsd/pkgs/libpthread/package.nix | 28 + .../os-specific/bsd/netbsd/pkgs/libresolv.nix | 13 + .../os-specific/bsd/netbsd/pkgs/librpcsvc.nix | 31 + .../os-specific/bsd/netbsd/pkgs/librt.nix | 18 + .../bsd/netbsd/pkgs/libterminfo.nix | 51 + .../os-specific/bsd/netbsd/pkgs/libutil.nix | 42 + .../bsd/netbsd/{ => pkgs/locale}/locale.patch | 0 .../bsd/netbsd/pkgs/locale/package.nix | 9 + .../os-specific/bsd/netbsd/pkgs/lorder.nix | 25 + .../pkgs/os-specific/bsd/netbsd/pkgs/make.nix | 67 + .../bsd/netbsd/pkgs/makeMinimal.nix | 48 + .../pkgs/os-specific/bsd/netbsd/pkgs/man.nix | 17 + .../pkgs/os-specific/bsd/netbsd/pkgs/misc.nix | 9 + .../bsd/netbsd/pkgs/mkDerivation.nix | 113 + .../os-specific/bsd/netbsd/pkgs/mknod.nix | 7 + .../os-specific/bsd/netbsd/pkgs/mtree.nix | 8 + .../os-specific/bsd/netbsd/pkgs/nbperf.nix | 7 + .../netbsd/pkgs/netbsdSetupHook/package.nix | 3 + .../{ => pkgs/netbsdSetupHook}/setup-hook.sh | 1 + .../os-specific/bsd/netbsd/pkgs/rpcgen.nix | 7 + .../os-specific/bsd/netbsd/pkgs/stat/hook.nix | 17 + .../bsd/netbsd/pkgs/stat/package.nix | 28 + .../os-specific/bsd/netbsd/pkgs/sys/base.nix | 93 + .../bsd/netbsd/pkgs/sys/headers.nix | 49 + .../{ => pkgs/sys}/no-dynamic-linker.patch | 0 .../bsd/netbsd/pkgs/sys/package.nix | 49 + .../{ => pkgs/sys}/sys-headers-incsdir.patch | 0 .../pkgs/os-specific/bsd/netbsd/pkgs/tic.nix | 39 + .../os-specific/bsd/netbsd/pkgs/tsort.nix | 25 + .../os-specific/bsd/netbsd/pkgs/uudecode.nix | 13 + .../pkgs/os-specific/bsd/setup-hook.sh | 1 - .../darwin/apple-source-releases/default.nix | 3 - .../libiconv/default.nix | 38 - .../apple-source-releases/macos-11.0.1.nix | 1 - .../system_cmds/meson.build | 9 +- .../pkgs/os-specific/darwin/noah/default.nix | 2 +- .../os-specific/darwin/openwith/default.nix | 6 +- .../os-specific/darwin/raycast/default.nix | 4 +- .../os-specific/darwin/rectangle/default.nix | 4 +- .../pkgs/os-specific/darwin/utm/default.nix | 6 +- .../pkgs/os-specific/darwin/xcode/default.nix | 5 +- .../os-specific/linux/batman-adv/version.nix | 10 +- .../pkgs/os-specific/linux/below/default.nix | 6 +- .../os-specific/linux/busybox/default.nix | 2 +- .../linux/cpupower-gui/default.nix | 4 +- .../os-specific/linux/cpupower/default.nix | 1 + .../os-specific/linux/dbus-broker/default.nix | 4 +- .../linux/dbus-broker/disable-test.patch | 23 +- .../pkgs/os-specific/linux/ddcci/default.nix | 13 +- .../os-specific/linux/device-tree/default.nix | 2 +- .../os-specific/linux/digimend/default.nix | 13 +- .../os-specific/linux/dmidecode/default.nix | 6 +- .../pkgs/os-specific/linux/drbd/driver.nix | 25 +- .../pkgs/os-specific/linux/ell/default.nix | 2 +- .../pkgs/os-specific/linux/ena/default.nix | 10 +- .../ena/override-features-api-detection.patch | 55 + .../pkgs/os-specific/linux/ethq/default.nix | 2 +- .../pkgs/os-specific/linux/evdi/default.nix | 2 +- .../pkgs/os-specific/linux/ffado/default.nix | 4 +- .../firmware/firmware-manager/default.nix | 4 +- .../firmware/firmware-updater/default.nix | 25 +- .../firmware-updater/pubspec.lock.json | 424 +- .../firmware-updater/upgrade-file.patch | 13 + .../linux/firmware/fwupd-efi/default.nix | 8 +- .../firmware/ipu6-camera-bins/default.nix | 4 +- .../linux/firmware/ivsc-firmware/default.nix | 4 +- .../linux/firmware/linux-firmware/source.nix | 8 +- .../os-specific/linux/fscrypt/default.nix | 6 +- .../pkgs/os-specific/linux/fwts/default.nix | 4 +- .../linux/game-devices-udev-rules/default.nix | 6 +- .../linux/google-authenticator/default.nix | 4 +- .../os-specific/linux/guvcview/default.nix | 4 +- .../pkgs/os-specific/linux/hwdata/default.nix | 4 +- .../linux/intel-compute-runtime/default.nix | 4 +- .../os-specific/linux/iproute/default.nix | 8 +- .../linux/ipu6-drivers/default.nix | 2 +- .../os-specific/linux/ivsc-driver/default.nix | 2 +- .../pkgs/os-specific/linux/iwd/default.nix | 2 +- .../linux/kernel/common-config.nix | 19 +- .../pkgs/os-specific/linux/kernel/generic.nix | 52 +- .../os-specific/linux/kernel/htmldocs.nix | 18 +- .../os-specific/linux/kernel/kernels-org.json | 36 +- .../os-specific/linux/kernel/linux-libre.nix | 4 +- .../linux/kernel/linux-rt-5.10.nix | 6 +- .../linux/kernel/manual-config.nix | 9 +- .../linux/kernel/xanmod-kernels.nix | 11 +- .../os-specific/linux/kernel/zen-kernels.nix | 4 +- .../pkgs/os-specific/linux/kvmfr/default.nix | 3 - .../linux/kvmfr/linux-6-4-compat.patch | 16 - .../os-specific/linux/lenovo-legion/app.nix | 15 +- .../pkgs/os-specific/linux/libbpf/0.x.nix | 4 +- .../pkgs/os-specific/linux/libbpf/default.nix | 4 +- .../os-specific/linux/libcap-ng/default.nix | 4 +- .../os-specific/linux/libnvme/default.nix | 2 +- .../pkgs/os-specific/linux/libzbc/default.nix | 2 +- .../pkgs/os-specific/linux/libzbd/default.nix | 2 +- .../linux/lxc/add-meson-options.patch | 153 - .../linux/{vm-tools => mm-tools}/default.nix | 4 +- .../linux/mstflint_access/default.nix | 6 +- .../linux/mwprocapture/default.nix | 4 +- .../os-specific/linux/nct6687d/default.nix | 11 +- .../os-specific/linux/nftables/default.nix | 16 +- .../linux/nftables/fix-py-libnftables.patch | 13 - .../os-specific/linux/nftables/python.nix | 26 + .../linux/nixos-rebuild/nixos-rebuild.sh | 6 +- .../pkgs/os-specific/linux/nmon/default.nix | 4 +- .../os-specific/linux/nvidia-x11/default.nix | 18 +- .../os-specific/linux/nvidia-x11/settings.nix | 4 +- .../pkgs/os-specific/linux/pam/default.nix | 22 +- .../pkgs/os-specific/linux/piper/default.nix | 4 +- .../linux/power-profiles-daemon/default.nix | 9 + .../pkgs/os-specific/linux/r8125/default.nix | 4 +- .../os-specific/linux/restool/default.nix | 2 +- .../os-specific/linux/rtl8189es/default.nix | 6 +- .../os-specific/linux/rtl8189fs/default.nix | 6 +- .../os-specific/linux/rtl8192eu/default.nix | 8 +- .../os-specific/linux/rtl8723ds/default.nix | 6 +- .../os-specific/linux/rtl8812au/default.nix | 6 +- .../os-specific/linux/rtl8821cu/default.nix | 8 +- .../os-specific/linux/rtl8852au/default.nix | 52 + .../os-specific/linux/rtl8852bu/default.nix | 51 + .../linux/sgx/azure-dcap-client/default.nix | 6 +- .../os-specific/linux/sgx/psw/default.nix | 10 +- .../sgx/sdk/cppmicroservices-no-mtime.patch | 26 + .../os-specific/linux/sgx/sdk/default.nix | 48 +- .../linux/sgx/sdk/disable-downloads.patch | 26 + .../os-specific/linux/sgx/sdk/ipp-crypto.nix | 4 +- .../os-specific/linux/sgx/ssl/default.nix | 36 +- .../pkgs/os-specific/linux/sgx/ssl/tests.nix | 95 + .../pkgs/os-specific/linux/sysdig/default.nix | 40 +- .../os-specific/linux/systemd/default.nix | 7 +- .../pkgs/os-specific/linux/tbs/default.nix | 12 +- .../os-specific/linux/tiscamera/default.nix | 6 +- .../pkgs/os-specific/linux/tuna/default.nix | 4 +- .../os-specific/linux/uhk-agent/default.nix | 4 +- .../os-specific/linux/waydroid/default.nix | 4 +- .../os-specific/linux/zenmonitor/default.nix | 4 +- .../pkgs/os-specific/linux/zfs/2_2.nix | 8 +- .../pkgs/os-specific/linux/zfs/unstable.nix | 8 +- .../nixpkgs/pkgs/servers/adguardhome/bins.nix | 28 +- .../pkgs/servers/adguardhome/default.nix | 4 +- .../pkgs/servers/adguardhome/update.sh | 4 +- .../nixpkgs/pkgs/servers/aeron/default.nix | 20 +- .../pkgs/servers/akkoma/admin-fe/default.nix | 20 +- .../pkgs/servers/akkoma/admin-fe/deps.patch | 46 - .../pkgs/servers/akkoma/admin-fe/yarn.lock | 12493 --- .../pkgs/servers/akkoma/akkoma-fe/default.nix | 2 +- .../nixpkgs/pkgs/servers/akkoma/default.nix | 4 +- .../nixpkgs/pkgs/servers/akkoma/mix.nix | 3201 +- .../nixpkgs/pkgs/servers/baserow/default.nix | 2 +- .../nixpkgs/pkgs/servers/bindle/default.nix | 2 +- .../nixpkgs/pkgs/servers/bloat/default.nix | 2 +- .../pkgs/servers/blockbook/default.nix | 15 +- .../pkgs/servers/computing/slurm/default.nix | 4 +- .../pkgs/servers/computing/storm/default.nix | 38 +- .../nixpkgs/pkgs/servers/dgraph/default.nix | 4 +- .../nixpkgs/pkgs/servers/dns/bind/default.nix | 4 +- .../nixpkgs/pkgs/servers/dns/nsd/default.nix | 4 +- .../servers/elasticmq-server-bin/default.nix | 4 +- .../nixpkgs/pkgs/servers/endlessh/default.nix | 2 +- .../nixpkgs/pkgs/servers/etcd/3.5/default.nix | 2 +- .../nixpkgs/pkgs/servers/etcd/README.md | 26 + .../pkgs/servers/go-libp2p-daemon/default.nix | 6 +- .../nixpkgs/pkgs/servers/gonic/default.nix | 1 - .../pkgs/servers/gotosocial/default.nix | 15 +- .../nixpkgs/pkgs/servers/gpsd/default.nix | 4 +- .../0001-Define-configs-with-env-vars.patch | 29 +- ...-config-file-as-it-s-stored-in-etc-g.patch | 7 +- .../nixpkgs/pkgs/servers/grocy/default.nix | 65 +- .../pkgs/servers/guacamole-client/default.nix | 4 +- .../pkgs/servers/guacamole-server/default.nix | 4 +- .../home-assistant/component-packages.nix | 855 +- .../custom-components/default.nix | 4 + .../homematicip_local/default.nix | 4 +- .../custom-components/ntfy/default.nix | 30 + .../custom-components/smartir/default.nix | 24 +- .../custom-components/tuya_local/default.nix | 30 + .../waste_collection_schedule/default.nix | 13 +- .../xiaomi_gateway3/default.nix | 20 +- .../custom-components/xiaomi_miot/default.nix | 22 +- .../android-tv-card/default.nix | 39 + .../android-tv-card/dont-call-git.patch | 17 + .../button-card/default.nix | 52 + .../button-card/package.json | 78 + .../card-mod/default.nix | 37 + .../decluttering-card/default.nix | 36 + .../custom-lovelace-modules/default.nix | 12 + .../lg-webos-remote-control/default.nix | 37 + .../valetudo-map-card/default.nix | 39 + .../remove-git-dependency.patch | 64 + .../zigbee2mqtt-networkmap/default.nix | 19 +- .../zigbee2mqtt-networkmap/update.sh | 9 + .../pkgs/servers/home-assistant/default.nix | 174 +- .../pkgs/servers/home-assistant/frontend.nix | 4 +- .../pkgs/servers/home-assistant/intents.nix | 57 +- .../pkgs/servers/home-assistant/stubs.nix | 4 +- .../pkgs/servers/home-assistant/tests.nix | 22 +- ...ements.py => update-component-packages.py} | 2 +- .../pkgs/servers/home-assistant/update.py | 2 +- .../servers/home-automation/evcc/default.nix | 9 +- .../servers/homepage-dashboard/default.nix | 8 +- .../nixpkgs/pkgs/servers/hqplayerd/rygel.nix | 6 +- .../pkgs/servers/http/envoy/default.nix | 4 +- .../nixpkgs/pkgs/servers/http/jetty/12.x.nix | 4 +- .../pkgs/servers/http/nginx/stable.nix | 4 +- .../pkgs/servers/http/tomcat/default.nix | 8 +- .../pkgs/servers/hylafaxplus/default.nix | 4 +- .../pkgs/servers/hylafaxplus/libtiff-4.patch | 4 +- .../nixpkgs/pkgs/servers/icingaweb2/ipl.nix | 4 +- .../nixpkgs/pkgs/servers/imgproxy/default.nix | 6 +- .../pkgs/servers/invidious/default.nix | 57 +- .../nixpkgs/pkgs/servers/invidious/update.sh | 32 +- .../pkgs/servers/invidious/versions.json | 7 +- .../pkgs/servers/invidious/videojs.nix | 12 +- .../pkgs/servers/irc/ergochat/default.nix | 4 +- .../pkgs/servers/irc/ngircd/default.nix | 4 +- .../nixpkgs/pkgs/servers/jackett/default.nix | 4 +- .../nixpkgs/pkgs/servers/jellyfin/default.nix | 13 +- .../servers/jellyfin/disable-warnings.patch | 38 - .../pkgs/servers/jellyfin/nuget-deps.nix | 316 +- .../nixpkgs/pkgs/servers/jellyfin/web.nix | 57 +- .../pkgs/servers/jellyseerr/package.json | 2 +- .../nixpkgs/pkgs/servers/jellyseerr/pin.json | 6 +- .../nixpkgs/pkgs/servers/jicofo/default.nix | 4 +- .../servers/jitsi-videobridge/default.nix | 4 +- .../nixpkgs/pkgs/servers/keycloak/default.nix | 4 +- .../keycloak/keycloak-metrics-spi/default.nix | 9 +- .../nixpkgs/pkgs/servers/klipper/default.nix | 11 +- .../pkgs/servers/klipper/simulator.cfg | 1 + .../nixpkgs/pkgs/servers/knxd/default.nix | 4 +- .../nixpkgs/pkgs/servers/komga/default.nix | 4 +- .../nixpkgs/pkgs/servers/lidarr/default.nix | 8 +- .../dovecot/plugins/fts_xapian/default.nix | 4 +- .../servers/mail/spamassassin/default.nix | 8 +- .../pkgs/servers/mail/stalwart/default.nix | 9 +- .../pkgs/servers/matrix-conduit/default.nix | 7 +- .../pkgs/servers/matrix-synapse/default.nix | 6 +- .../matrix-hookshot/package.json | 5 +- .../matrix-synapse/matrix-hookshot/pin.json | 8 +- .../plugins/s3-storage-provider.nix | 2 +- .../matrix-synapse/sliding-sync/default.nix | 4 +- .../servers/matrix-synapse/tools/default.nix | 2 +- .../rust-synapse-compress-state/Cargo.lock | 1816 + .../default.nix} | 14 +- .../pkgs/servers/mattermost/default.nix | 8 +- .../nixpkgs/pkgs/servers/mediamtx/default.nix | 6 +- .../nixpkgs/pkgs/servers/metabase/default.nix | 4 +- .../nixpkgs/pkgs/servers/miniflux/default.nix | 6 +- .../nixpkgs/pkgs/servers/minio/default.nix | 6 +- .../nixpkgs/pkgs/servers/mir/default.nix | 2 + .../pkgs/servers/misc/gobgpd/default.nix | 6 +- .../pkgs/servers/misc/irrd/default.nix | 3 +- .../buildkite-agent-metrics/default.nix | 6 +- .../grafana-clickhouse-datasource/default.nix | 2 +- .../monitoring/mackerel-agent/default.nix | 6 +- .../matrix-alertmanager/default.nix | 2 +- .../pkgs/servers/monitoring/mtail/default.nix | 6 +- .../servers/monitoring/openobserve/Cargo.lock | 1990 +- .../monitoring/openobserve/default.nix | 8 +- .../prometheus/bitcoin-exporter.nix | 15 +- .../prometheus/cloudflare-exporter.nix | 6 +- .../monitoring/prometheus/consul-exporter.nix | 6 +- .../servers/monitoring/prometheus/default.nix | 8 +- .../prometheus/dnsmasq-exporter.nix | 8 +- .../monitoring/prometheus/fastly-exporter.nix | 6 +- .../gitlab-ci-pipelines-exporter.nix | 6 +- .../prometheus/graphite-exporter.nix | 22 +- .../monitoring/prometheus/mysqld-exporter.nix | 6 +- .../monitoring/prometheus/nats-exporter.nix | 6 +- .../monitoring/prometheus/node-exporter.nix | 6 +- .../prometheus/process-exporter.nix | 6 +- .../monitoring/prometheus/redis-exporter.nix | 6 +- .../monitoring/prometheus/snmp-exporter.nix | 6 +- .../monitoring/prometheus/tor-exporter.nix | 2 +- .../prometheus/unbound-exporter.nix | 2 +- .../servers/monitoring/telegraf/default.nix | 6 +- .../monitoring/uptime-kuma/default.nix | 6 +- .../servers/monitoring/vmagent/default.nix | 6 +- .../pkgs/servers/moonraker/default.nix | 8 +- .../pkgs/servers/nextcloud/default.nix | 22 +- .../pkgs/servers/nextcloud/packages/27.json | 90 +- .../pkgs/servers/nextcloud/packages/28.json | 112 +- .../nextcloud/packages/{26.json => 29.json} | 188 +- .../nextcloud/packages/nextcloud-apps.json | 1 + .../pkgs/servers/nosql/aerospike/default.nix | 4 +- .../nosql/apache-jena/fuseki-binary.nix | 5 + .../pkgs/servers/nosql/influxdb2/cli.nix | 6 +- .../pkgs/servers/nosql/influxdb2/default.nix | 2 +- .../pkgs/servers/nosql/mongodb/5.0.nix | 4 +- .../pkgs/servers/nosql/mongodb/6.0.nix | 4 +- .../pkgs/servers/nosql/mongodb/mongodb.nix | 9 +- .../pkgs/servers/nosql/neo4j/default.nix | 4 +- .../pkgs/servers/nosql/questdb/default.nix | 4 +- .../pkgs/servers/nosql/redis/default.nix | 2 +- .../onlyoffice-documentserver/default.nix | 2 +- .../servers/openvscode-server/default.nix | 6 +- .../pkgs/servers/osmocom/libasn1c/default.nix | 2 +- .../pkgs/servers/photoprism/backend.nix | 2 +- .../pkgs/servers/photoprism/default.nix | 4 +- .../pkgs/servers/photoprism/frontend.nix | 2 +- .../nixpkgs/pkgs/servers/pleroma/default.nix | 2 +- third_party/nixpkgs/pkgs/servers/plex/raw.nix | 7 +- .../pkgs/servers/pocketbase/default.nix | 6 +- .../nixpkgs/pkgs/servers/prowlarr/default.nix | 10 +- .../pkgs/servers/psitransfer/default.nix | 15 +- .../pkgs/servers/pulseaudio/default.nix | 4 +- .../nixpkgs/pkgs/servers/readarr/default.nix | 8 +- .../nixpkgs/pkgs/servers/redpanda/default.nix | 6 +- .../pkgs/servers/roadrunner/default.nix | 13 +- .../pkgs/servers/roon-server/default.nix | 4 +- .../nixpkgs/pkgs/servers/rpiplay/default.nix | 4 +- .../nixpkgs/pkgs/servers/samba/4.x.nix | 4 +- .../servers/search/meilisearch/default.nix | 7 +- .../servers/search/opensearch/default.nix | 4 +- .../pkgs/servers/search/qdrant/Cargo.lock | 1679 +- .../pkgs/servers/search/qdrant/default.nix | 8 +- .../pkgs/servers/search/typesense/default.nix | 4 +- .../servers/search/typesense/sources.json | 4 + .../pkgs/servers/search/typesense/update.sh | 1 + .../pkgs/servers/search/weaviate/default.nix | 6 +- .../nixpkgs/pkgs/servers/ser2net/default.nix | 4 +- .../pkgs/servers/sickbeard/sickgear.nix | 4 +- .../nixpkgs/pkgs/servers/smcroute/default.nix | 4 +- .../nixpkgs/pkgs/servers/snac2/default.nix | 4 +- .../pkgs/servers/snappymail/default.nix | 4 +- .../nixpkgs/pkgs/servers/sonarr/default.nix | 10 +- .../nixpkgs/pkgs/servers/spicedb/default.nix | 6 +- .../nixpkgs/pkgs/servers/spicedb/zed.nix | 6 +- .../nixpkgs/pkgs/servers/sql/dolt/default.nix | 6 +- .../servers/sql/mariadb/galera/default.nix | 4 +- .../pkgs/servers/sql/materialize/default.nix | 1 - .../pkgs/servers/sql/monetdb/default.nix | 4 +- .../pkgs/servers/sql/patroni/default.nix | 13 +- .../pkgs/servers/sql/postgresql/12.nix | 6 - .../pkgs/servers/sql/postgresql/13.nix | 4 - .../pkgs/servers/sql/postgresql/14.nix | 4 - .../pkgs/servers/sql/postgresql/15.nix | 6 - .../pkgs/servers/sql/postgresql/16.nix | 6 - .../pkgs/servers/sql/postgresql/default.nix | 1 - .../pkgs/servers/sql/postgresql/ext/citus.nix | 2 +- .../servers/sql/postgresql/ext/default.nix | 2 - .../pkgs/servers/sql/postgresql/ext/h3-pg.nix | 2 +- .../servers/sql/postgresql/ext/lantern.nix | 4 +- .../sql/postgresql/ext/pg_auto_failover.nix | 2 +- .../servers/sql/postgresql/ext/pg_bigm.nix | 2 +- .../sql/postgresql/ext/pg_roaringbitmap.nix | 2 +- .../servers/sql/postgresql/ext/pg_squeeze.nix | 2 +- .../pkgs/servers/sql/postgresql/ext/pgjwt.nix | 2 +- .../servers/sql/postgresql/ext/pgsodium.nix | 2 +- .../servers/sql/postgresql/ext/pgsql-http.nix | 2 +- .../sql/postgresql/ext/pgvecto-rs/default.nix | 5 +- .../servers/sql/postgresql/ext/pgvector.nix | 2 +- .../sql/postgresql/ext/plpgsql_check.nix | 2 +- .../sql/postgresql/ext/plv8/default.nix | 2 +- .../postgresql/ext/promscale_extension.nix | 59 - .../pkgs/servers/sql/postgresql/ext/smlar.nix | 2 +- .../servers/sql/postgresql/ext/tds_fdw.nix | 6 +- .../sql/postgresql/ext/timescaledb.nix | 2 +- .../pkgs/servers/sql/postgresql/generic.nix | 56 +- .../patches/disable-resolve_symlinks.patch | 12 - .../patches/hardcode-pgxs-path.patch | 14 - .../sql/postgresql/patches/less-is-more.patch | 5 +- .../patches/locale-binary-path.patch | 2 - .../patches/paths-for-split-outputs.patch | 11 + ...tch => paths-with-postgresql-suffix.patch} | 18 - ...h.patch => relative-to-symlinks-16+.patch} | 5 +- .../patches/relative-to-symlinks.patch | 13 + ...un-13.patch => socketdir-in-run-13+.patch} | 6 +- .../postgresql/patches/socketdir-in-run.patch | 2 - .../specify_pkglibdir_at_runtime.patch | 5 +- .../pkgs/servers/sql/rqlite/default.nix | 6 +- .../nixpkgs/pkgs/servers/sunshine/default.nix | 22 +- .../servers/sunshine/dont-build-webui.patch | 13 - .../pkgs/servers/sunshine/package-lock.json | 163 +- .../pkgs/servers/tailscale/default.nix | 23 +- .../nixpkgs/pkgs/servers/traefik/default.nix | 15 +- .../pkgs/servers/trickster/trickster.nix | 25 +- .../nixpkgs/pkgs/servers/unifi/default.nix | 4 +- .../unifiedpush-common-proxies/default.nix | 2 +- .../nixpkgs/pkgs/servers/uwsgi/default.nix | 4 +- .../nixpkgs/pkgs/servers/varnish/default.nix | 5 + .../nixpkgs/pkgs/servers/varnish/modules.nix | 12 +- .../nixpkgs/pkgs/servers/varnish/packages.nix | 6 +- .../pkgs/servers/vouch-proxy/default.nix | 6 +- .../web-apps/changedetection-io/default.nix | 4 +- .../discourse/assets_esbuild_from_path.patch | 13 - .../discourse/use_mv_instead_of_rename.patch | 22 - .../servers/web-apps/dolibarr/default.nix | 4 +- .../pkgs/servers/web-apps/galene/default.nix | 6 +- .../servers/web-apps/jitsi-meet/default.nix | 4 +- .../pkgs/servers/web-apps/kavita/default.nix | 20 +- .../servers/web-apps/kavita/nuget-deps.nix | 13 +- .../web-apps/kavita/restore-migrations.diff | 147 + .../pkgs/servers/web-apps/monica/default.nix | 4 +- .../pkgs/servers/web-apps/moodle/default.nix | 4 +- .../pkgs/servers/web-apps/netbox/default.nix | 4 +- .../pkgs/servers/web-apps/nifi/default.nix | 4 +- .../pkgs/servers/web-apps/outline/default.nix | 9 +- .../pkgs/servers/web-apps/pict-rs/default.nix | 6 +- .../servers/web-apps/plausible/default.nix | 2 +- .../pkgs/servers/web-apps/wiki-js/default.nix | 6 +- .../wordpress/packages/languages.json | 12 +- .../web-apps/wordpress/packages/plugins.json | 92 +- .../wordpress/packages/wordpress-plugins.json | 2 + .../nixpkgs/pkgs/servers/x11/xorg/default.nix | 200 +- .../pkgs/servers/x11/xorg/overrides.nix | 1 - .../pkgs/servers/x11/xorg/tarballs.list | 64 +- .../nixpkgs/pkgs/servers/x11/xorg/update.py | 116 + .../pkgs/servers/x11/xorg/xwayland.nix | 12 + .../pkgs/servers/xmpp/prosody/default.nix | 4 +- .../pkgs/servers/zigbee2mqtt/default.nix | 6 +- .../shells/bash/bash-completion/default.nix | 2 +- .../nixpkgs/pkgs/shells/carapace/default.nix | 6 +- .../pkgs/shells/fish/plugins/autopair.nix | 2 +- .../pkgs/shells/fish/plugins/default.nix | 4 + .../pkgs/shells/fish/plugins/forgit.nix | 4 +- .../pkgs/shells/fish/plugins/git-abbr.nix | 23 + .../pkgs/shells/fish/plugins/gruvbox.nix | 17 + .../pkgs/shells/fish/plugins/hydro.nix | 2 +- .../nixpkgs/pkgs/shells/hilbish/default.nix | 4 +- .../nixpkgs/pkgs/shells/hishtory/default.nix | 6 +- .../nixpkgs/pkgs/shells/ksh/default.nix | 38 +- .../nixpkgs/pkgs/shells/nsh/default.nix | 2 +- .../nixpkgs/pkgs/shells/nushell/default.nix | 8 +- .../shells/nushell/nu_scripts/default.nix | 6 +- .../pkgs/shells/nushell/plugins/formats.nix | 2 +- .../pkgs/shells/nushell/plugins/gstat.nix | 2 +- .../pkgs/shells/nushell/plugins/net.nix | 4 +- .../pkgs/shells/nushell/plugins/query.nix | 2 +- .../nixpkgs/pkgs/shells/rc-9front/default.nix | 2 +- .../pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +- .../shells/zsh/spaceship-prompt/default.nix | 4 +- .../nixpkgs/pkgs/shells/zsh/zimfw/default.nix | 4 +- .../pkgs/shells/zsh/zsh-fzf-tab/default.nix | 12 +- .../pkgs/shells/zsh/zsh-prezto/default.nix | 6 +- .../nixpkgs/pkgs/stdenv/cross/default.nix | 77 +- .../nixpkgs/pkgs/stdenv/darwin/default.nix | 41 +- .../pkgs/stdenv/generic/make-derivation.nix | 11 +- third_party/nixpkgs/pkgs/test/config.nix | 19 +- .../nixpkgs/pkgs/test/cuda/default.nix | 1 - .../nixpkgs/pkgs/tools/X11/arandr/default.nix | 4 +- .../pkgs/tools/X11/caffeine-ng/default.nix | 4 +- .../nixpkgs/pkgs/tools/X11/dispad/default.nix | 2 +- .../pkgs/tools/X11/imwheel/default.nix | 2 +- .../pkgs/tools/X11/nitrogen/default.nix | 2 +- .../pkgs/tools/X11/nx-libs/default.nix | 2 +- .../nixpkgs/pkgs/tools/X11/obconf/default.nix | 4 +- .../tools/X11/opentabletdriver/default.nix | 4 +- .../nixpkgs/pkgs/tools/X11/sbs/default.nix | 2 +- .../pkgs/tools/X11/skippy-xd/default.nix | 8 +- .../nixpkgs/pkgs/tools/X11/wmctrl/default.nix | 2 +- .../nixpkgs/pkgs/tools/X11/wpgtk/default.nix | 4 +- .../nixpkgs/pkgs/tools/X11/x11vnc/default.nix | 2 +- .../nixpkgs/pkgs/tools/X11/x2vnc/default.nix | 2 +- .../pkgs/tools/X11/xborders/default.nix | 4 +- .../nixpkgs/pkgs/tools/X11/xcalib/default.nix | 2 +- .../pkgs/tools/X11/xdg-utils/default.nix | 40 +- .../pkgs/tools/X11/xloadimage/default.nix | 2 +- .../nixpkgs/pkgs/tools/X11/xmacro/default.nix | 2 +- .../tools/X11/xmousepasteblock/default.nix | 2 +- .../nixpkgs/pkgs/tools/X11/xpra/default.nix | 6 +- .../pkgs/tools/X11/xpra/libfakeXinerama.nix | 2 +- .../nixpkgs/pkgs/tools/X11/xtrace/default.nix | 2 +- .../pkgs/tools/admin/aliyun-cli/default.nix | 6 +- .../pkgs/tools/admin/analog/default.nix | 2 +- .../admin/aws-encryption-sdk-cli/default.nix | 9 +- .../tools/admin/aws-google-auth/default.nix | 2 +- .../pkgs/tools/admin/aws-mfa/default.nix | 9 +- .../pkgs/tools/admin/aws-sso-cli/default.nix | 6 +- .../pkgs/tools/admin/awscli/default.nix | 156 +- .../pkgs/tools/admin/awscli2/default.nix | 6 +- .../tools/admin/awslimitchecker/default.nix | 44 +- .../pkgs/tools/admin/awsweeper/default.nix | 2 +- .../pkgs/tools/admin/azure-cli/default.nix | 30 +- .../admin/azure-cli/extensions-manual.nix | 16 + .../tools/admin/azure-cli/python-packages.nix | 12 +- .../pkgs/tools/admin/balena-cli/default.nix | 6 +- .../pkgs/tools/admin/certigo/default.nix | 2 +- .../pkgs/tools/admin/clair/default.nix | 8 +- .../docker-credential-helpers/default.nix | 2 +- .../pkgs/tools/admin/drawterm/default.nix | 6 +- .../pkgs/tools/admin/exoscale-cli/default.nix | 4 +- .../pkgs/tools/admin/fastlane/default.nix | 1 - .../tools/admin/fits-cloudctl/default.nix | 6 +- .../admin/gam/signal_files_as_env_vars.patch | 38 - .../tools/admin/gimme-aws-creds/default.nix | 4 +- .../admin/google-cloud-sdk/components.json | 993 +- .../tools/admin/google-cloud-sdk/data.nix | 22 +- .../tools/admin/google-cloud-sdk/default.nix | 13 +- .../google-cloud-sdk/withExtraComponents.nix | 64 +- .../pkgs/tools/admin/granted/default.nix | 6 +- .../pkgs/tools/admin/gtk-vnc/default.nix | 2 +- .../nixpkgs/pkgs/tools/admin/kics/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/lego/default.nix | 6 +- .../pkgs/tools/admin/pgadmin/default.nix | 24 +- .../pkgs/tools/admin/pgadmin/yarn.lock | 6701 +- .../pkgs/tools/admin/pulsarctl/default.nix | 26 +- .../pkgs/tools/admin/pulumi/default.nix | 57 +- .../pkgs/tools/admin/qovery-cli/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/sec/default.nix | 2 +- .../pkgs/tools/admin/stripe-cli/default.nix | 6 +- .../pkgs/tools/admin/swapspace/default.nix | 2 +- .../tools/admin/synapse-admin/default.nix | 19 +- .../tools/admin/synapse-admin/package.json | 78 +- .../pkgs/tools/admin/synapse-admin/yarn.lock | 11873 +-- .../pkgs/tools/admin/trivy/default.nix | 36 +- .../pkgs/tools/admin/winbox/default.nix | 4 +- .../tools/archivers/rpm2targz/default.nix | 2 +- .../tools/archivers/rpmextract/default.nix | 2 +- .../pkgs/tools/archivers/unp/default.nix | 2 +- .../pkgs/tools/archivers/xarchive/default.nix | 2 +- .../tools/archivers/xarchiver/default.nix | 4 +- .../pkgs/tools/audio/abcmidi/default.nix | 4 +- .../pkgs/tools/audio/alsaequal/default.nix | 2 +- .../pkgs/tools/audio/bpm-tools/default.nix | 2 +- .../pkgs/tools/audio/ezstream/default.nix | 2 +- .../pkgs/tools/audio/goxlr-utility/Cargo.lock | 5619 ++ .../tools/audio/goxlr-utility/default.nix | 17 +- .../pkgs/tools/audio/gvolicon/default.nix | 4 +- .../headset-charge-indicator/default.nix | 4 +- .../pkgs/tools/audio/kaldi/default.nix | 2 +- .../pkgs/tools/audio/liquidsoap/full.nix | 11 +- .../pkgs/tools/audio/mictray/default.nix | 4 +- .../pkgs/tools/audio/mp3cat/default.nix | 2 +- .../pkgs/tools/audio/mpdris2/default.nix | 4 +- .../tools/audio/mpris-scrobbler/default.nix | 4 +- .../pkgs/tools/audio/pa-applet/default.nix | 2 +- .../pkgs/tools/audio/pasystray/default.nix | 4 +- .../nixpkgs/pkgs/tools/audio/trx/default.nix | 2 +- .../pkgs/tools/audio/vgmtools/default.nix | 4 +- .../pkgs/tools/audio/volctl/default.nix | 6 +- .../audio/whisper-ctranslate2/default.nix | 4 +- .../tools/audio/wyoming/faster-whisper.nix | 1 + .../pkgs/tools/backup/bakelite/default.nix | 2 +- .../pkgs/tools/backup/bdsync/default.nix | 2 +- .../pkgs/tools/backup/borgmatic/default.nix | 4 +- .../pkgs/tools/backup/chunksync/default.nix | 2 +- .../pkgs/tools/backup/duplicity/default.nix | 20 +- .../pkgs/tools/backup/duply/default.nix | 2 +- .../pkgs/tools/backup/mt-st/default.nix | 2 +- .../nixpkgs/pkgs/tools/backup/mtx/default.nix | 2 +- .../pkgs/tools/backup/partimage/default.nix | 2 +- .../pkgs/tools/backup/sigtop/default.nix | 6 +- .../pkgs/tools/backup/stenc/default.nix | 2 +- .../pkgs/tools/backup/wal-g/default.nix | 2 +- .../pkgs/tools/backup/zfsbackup/default.nix | 2 +- .../pkgs/tools/backup/zrepl/default.nix | 2 +- .../tools/bluetooth/blueberry/default.nix | 4 +- .../pkgs/tools/bluetooth/blueman/default.nix | 4 +- .../bluetooth/obex-data-server/default.nix | 2 +- .../pkgs/tools/bootloaders/refind/default.nix | 7 +- .../pkgs/tools/cd-dvd/bchunk/default.nix | 2 +- .../pkgs/tools/cd-dvd/brasero/default.nix | 6 +- .../pkgs/tools/cd-dvd/ccd2iso/default.nix | 2 +- .../pkgs/tools/cd-dvd/cdi2iso/default.nix | 2 +- .../pkgs/tools/cd-dvd/cdimgtools/default.nix | 2 +- .../pkgs/tools/cd-dvd/cdrdao/default.nix | 2 +- .../pkgs/tools/cd-dvd/cdrkit/default.nix | 2 +- .../pkgs/tools/cd-dvd/cdrtools/default.nix | 2 +- .../pkgs/tools/cd-dvd/cuetools/default.nix | 2 +- .../tools/cd-dvd/dvd+rw-tools/default.nix | 2 +- .../pkgs/tools/cd-dvd/dvd-vr/default.nix | 2 +- .../pkgs/tools/cd-dvd/isomd5sum/default.nix | 2 +- .../pkgs/tools/cd-dvd/lsdvd/default.nix | 2 +- .../pkgs/tools/cd-dvd/mdf2iso/default.nix | 2 +- .../pkgs/tools/cd-dvd/nrg2iso/default.nix | 2 +- .../pkgs/tools/cd-dvd/vobcopy/default.nix | 2 +- .../pkgs/tools/compression/flips/default.nix | 6 +- .../tools/compression/imagelol/default.nix | 3 +- .../pkgs/tools/compression/lzop/default.nix | 2 +- .../tools/filesystems/afpfs-ng/default.nix | 2 +- .../filesystems/archivemount/default.nix | 2 +- .../tools/filesystems/bashmount/default.nix | 2 +- .../filesystems/bcache-tools/default.nix | 2 +- .../filesystems/bcachefs-tools/Cargo.lock | 871 - .../filesystems/bcachefs-tools/default.nix | 108 +- .../pkgs/tools/filesystems/bindfs/default.nix | 5 +- .../tools/filesystems/btrfs-progs/default.nix | 4 +- .../pkgs/tools/filesystems/ceph/default.nix | 9 +- .../tools/filesystems/chunkfs/default.nix | 2 +- .../pkgs/tools/filesystems/ciopfs/default.nix | 2 +- .../tools/filesystems/dislocker/default.nix | 2 +- .../tools/filesystems/djmount/default.nix | 2 +- .../tools/filesystems/duperemove/default.nix | 2 +- .../pkgs/tools/filesystems/dwarfs/default.nix | 2 +- .../tools/filesystems/e2tools/default.nix | 2 +- .../tools/filesystems/ext4magic/default.nix | 2 +- .../tools/filesystems/extundelete/default.nix | 2 +- .../tools/filesystems/f2fs-tools/default.nix | 16 +- .../tools/filesystems/fuseiso/default.nix | 2 +- .../pkgs/tools/filesystems/garage/default.nix | 1 + .../tools/filesystems/gcsfuse/default.nix | 14 +- .../tools/filesystems/genext2fs/default.nix | 2 +- .../tools/filesystems/genromfs/default.nix | 13 +- .../tools/filesystems/go-mtpfs/default.nix | 6 +- .../pkgs/tools/filesystems/grive2/default.nix | 2 +- .../tools/filesystems/moosefs/default.nix | 2 +- .../tools/filesystems/mount-zip/default.nix | 32 +- .../tools/filesystems/nilfs-utils/default.nix | 2 +- .../tools/filesystems/orangefs/default.nix | 2 +- .../filesystems/reiser4progs/default.nix | 2 +- .../filesystems/reiserfsprogs/default.nix | 2 +- .../tools/filesystems/s3backer/default.nix | 4 +- .../tools/filesystems/smbnetfs/default.nix | 2 +- .../filesystems/squashfs-tools-ng/default.nix | 4 +- .../tools/filesystems/stratis-cli/default.nix | 6 +- .../tools/filesystems/tar2ext4/default.nix | 4 +- .../tools/filesystems/u3-tool/default.nix | 2 +- .../tools/filesystems/ubidump/default.nix | 42 +- .../tools/filesystems/vmfs-tools/default.nix | 2 +- .../filesystems/wiimms-iso-tools/default.nix | 2 +- .../tools/filesystems/xtreemfs/default.nix | 3 +- .../tools/filesystems/zerofree/default.nix | 2 +- .../minecraft/fabric-installer/default.nix | 4 +- .../games/minecraft/mcaselector/default.nix | 12 +- .../pkgs/tools/games/mymcplus/default.nix | 4 +- .../pkgs/tools/games/opentracker/default.nix | 12 +- .../pkgs/tools/games/pokefinder/default.nix | 3 +- .../pkgs/tools/games/scarab/default.nix | 4 +- .../pkgs/tools/games/slipstream/default.nix | 2 +- .../tools/games/steam-rom-manager/default.nix | 4 +- .../tools/games/steamtinkerlaunch/default.nix | 20 +- .../nixpkgs/pkgs/tools/games/ukmm/Cargo.lock | 3173 +- .../nixpkgs/pkgs/tools/games/ukmm/default.nix | 32 +- .../pkgs/tools/graphics/agi/default.nix | 4 +- .../pkgs/tools/graphics/argyllcms/default.nix | 4 +- .../tools/graphics/astc-encoder/default.nix | 4 +- .../pkgs/tools/graphics/asymptote/default.nix | 82 +- .../pkgs/tools/graphics/dpic/default.nix | 4 +- .../graphics/dynamic-wallpaper/default.nix | 2 +- .../tools/graphics/enblend-enfuse/default.nix | 2 +- .../pkgs/tools/graphics/epstool/default.nix | 2 +- .../pkgs/tools/graphics/escrotum/default.nix | 4 +- .../pkgs/tools/graphics/fgallery/default.nix | 2 +- .../pkgs/tools/graphics/gifsicle/default.nix | 2 +- .../pkgs/tools/graphics/gifski/default.nix | 2 +- .../tools/graphics/gromit-mpx/default.nix | 4 +- .../pkgs/tools/graphics/guff/default.nix | 2 +- .../pkgs/tools/graphics/hobbits/default.nix | 4 +- .../pkgs/tools/graphics/icoutils/default.nix | 14 +- .../pkgs/tools/graphics/ifm/default.nix | 2 +- .../pkgs/tools/graphics/mscgen/default.nix | 2 +- .../pkgs/tools/graphics/netpbm/default.nix | 6 +- .../pkgs/tools/graphics/optar/default.nix | 2 +- .../pkgs/tools/graphics/oxipng/default.nix | 6 +- .../pkgs/tools/graphics/pdf2svg/default.nix | 2 +- .../pkgs/tools/graphics/pdftag/default.nix | 4 +- .../pkgs/tools/graphics/ploticus/default.nix | 5 +- .../pkgs/tools/graphics/pstoedit/default.nix | 2 +- .../realesrgan-ncnn-vulkan/cmakelists.patch | 22 +- .../realesrgan-ncnn-vulkan/default.nix | 2 +- .../pkgs/tools/graphics/resvg/default.nix | 2 +- .../pkgs/tools/graphics/s2png/default.nix | 2 +- .../pkgs/tools/graphics/sanjuuni/default.nix | 5 +- .../pkgs/tools/graphics/shotgun/default.nix | 2 +- .../tools/graphics/spirv-cross/default.nix | 2 +- .../pkgs/tools/graphics/svgbob/default.nix | 2 +- .../tools/graphics/svgcleaner/default.nix | 2 +- .../pkgs/tools/graphics/unpaper/default.nix | 2 +- .../tools/graphics/vulkan-cts/default.nix | 4 +- .../tools/graphics/vulkan-cts/sources.nix | 4 +- .../pkgs/tools/graphics/wallutils/default.nix | 22 +- .../pkgs/tools/graphics/wdisplays/default.nix | 4 +- .../pkgs/tools/graphics/xcftools/default.nix | 2 +- .../pkgs/tools/graphics/zbar/default.nix | 6 +- .../pkgs/tools/inputmethods/emote/default.nix | 4 +- .../tools/inputmethods/fcitx5/default.nix | 5 +- .../inputmethods/fcitx5/fcitx5-anthy.nix | 11 +- .../inputmethods/fcitx5/fcitx5-bamboo.nix | 4 +- .../inputmethods/fcitx5/fcitx5-chewing.nix | 4 +- .../fcitx5/fcitx5-chinese-addons.nix | 8 +- .../inputmethods/fcitx5/fcitx5-configtool.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-gtk.nix | 4 +- .../inputmethods/fcitx5/fcitx5-hangul.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-lua.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-m17n.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-qt.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-rime.nix | 8 +- .../tools/inputmethods/fcitx5/fcitx5-skk.nix | 4 +- .../fcitx5/fcitx5-table-extra.nix | 4 +- .../fcitx5/fcitx5-table-other.nix | 4 +- .../inputmethods/fcitx5/fcitx5-unikey.nix | 4 +- .../ibus-engines/ibus-anthy/default.nix | 4 +- .../ibus-engines/ibus-bamboo/default.nix | 4 +- .../ibus-engines/ibus-cangjie/default.nix | 4 +- .../ibus-engines/ibus-hangul/default.nix | 14 +- .../ibus-engines/ibus-kkc/default.nix | 2 +- .../ibus-engines/ibus-libpinyin/default.nix | 4 +- .../ibus-engines/ibus-m17n/default.nix | 4 +- .../ibus-engines/ibus-mozc/default.nix | 14 +- .../ibus-engines/ibus-table/default.nix | 4 +- .../ibus-typing-booster/default.nix | 4 +- .../ibus-engines/ibus-uniemoji/default.nix | 4 +- .../pkgs/tools/inputmethods/ibus/default.nix | 4 +- .../inputmethods/input-remapper/default.nix | 6 +- .../pkgs/tools/inputmethods/nabi/default.nix | 2 +- .../pkgs/tools/llm/shell_gpt/default.nix | 48 - .../pkgs/tools/misc/aescrypt/default.nix | 2 +- .../pkgs/tools/misc/aichat/default.nix | 6 +- .../tools/misc/alarm-clock-applet/default.nix | 4 +- .../pkgs/tools/misc/android-tools/default.nix | 4 +- .../pkgs/tools/misc/apparix/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/archi/default.nix | 19 +- .../misc/betterdiscord-installer/default.nix | 7 +- .../nixpkgs/pkgs/tools/misc/bfr/default.nix | 2 +- .../pkgs/tools/misc/bibtex2html/default.nix | 2 +- .../pkgs/tools/misc/bibtool/default.nix | 2 +- .../pkgs/tools/misc/bibutils/default.nix | 2 +- .../pkgs/tools/misc/birdfont/default.nix | 4 +- .../pkgs/tools/misc/bmap-tools/default.nix | 2 +- .../pkgs/tools/misc/bogofilter/default.nix | 2 +- .../pkgs/tools/misc/broadlink-cli/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/broot/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/ccze/default.nix | 2 +- .../pkgs/tools/misc/chezmoi/default.nix | 44 - .../pkgs/tools/misc/cht.sh/default.nix | 2 +- .../pkgs/tools/misc/ckb-next/default.nix | 2 +- .../pkgs/tools/misc/clipbuzz/default.nix | 6 +- .../pkgs/tools/misc/clipster/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/cloc/default.nix | 2 +- .../pkgs/tools/misc/contacts/default.nix | 2 +- .../tools/misc/coreboot-utils/default.nix | 2 +- .../pkgs/tools/misc/coreutils/default.nix | 3 + .../pkgs/tools/misc/cpulimit/default.nix | 2 +- .../pkgs/tools/misc/cpuminer/default.nix | 2 +- .../pkgs/tools/misc/csv2latex/default.nix | 2 +- .../pkgs/tools/misc/cyberchef/default.nix | 4 +- .../pkgs/tools/misc/dbus-map/default.nix | 2 +- .../pkgs/tools/misc/ddcutil/default.nix | 2 +- .../pkgs/tools/misc/diffoscope/default.nix | 50 +- .../pkgs/tools/misc/digitemp/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/duc/default.nix | 2 +- .../pkgs/tools/misc/dumptorrent/default.nix | 2 +- .../pkgs/tools/misc/edid-decode/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/edir/default.nix | 4 +- .../pkgs/tools/misc/envchain/default.nix | 4 +- .../pkgs/tools/misc/esphome/dashboard.nix | 4 +- .../pkgs/tools/misc/esphome/default.nix | 11 +- .../pkgs/tools/misc/esptool-ck/default.nix | 2 +- .../pkgs/tools/misc/ethtool/default.nix | 14 +- .../nixpkgs/pkgs/tools/misc/ets/default.nix | 18 +- .../pkgs/tools/misc/fclones/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/fd/default.nix | 6 +- .../pkgs/tools/misc/fdupes/default.nix | 29 +- .../pkgs/tools/misc/fedifetcher/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/fend/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/fffuu/default.nix | 5 +- .../pkgs/tools/misc/ffsend/default.nix | 2 +- .../pkgs/tools/misc/flashrom/default.nix | 2 +- .../pkgs/tools/misc/flexoptix-app/default.nix | 10 +- .../pkgs/tools/misc/fluent-bit/default.nix | 4 +- .../pkgs/tools/misc/fortune/default.nix | 2 +- .../pkgs/tools/misc/fsearch/default.nix | 4 +- .../pkgs/tools/misc/fsmark/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/fwup/default.nix | 4 +- .../pkgs/tools/misc/gaphor/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/geekbench/6.nix | 8 +- .../pkgs/tools/misc/geteltorito/default.nix | 2 +- .../misc/gh-markdown-preview/default.nix | 4 +- .../pkgs/tools/misc/gigalixir/default.nix | 4 +- .../pkgs/tools/misc/github-backup/default.nix | 4 +- .../pkgs/tools/misc/goaccess/default.nix | 41 +- .../google-cloud-bigtable-tool/default.nix | 6 +- .../misc/google-cloud-sql-proxy/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/goose/default.nix | 16 +- .../pkgs/tools/misc/goreleaser/default.nix | 7 +- .../pkgs/tools/misc/gparted/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/gpick/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/graylog/5.2.nix | 4 +- .../nixpkgs/pkgs/tools/misc/grub/default.nix | 2 +- .../pkgs/tools/misc/grub4dos/default.nix | 2 +- .../pkgs/tools/misc/gsmartcontrol/default.nix | 4 +- .../pkgs/tools/misc/gtkterm/default.nix | 8 +- .../nixpkgs/pkgs/tools/misc/gwe/default.nix | 4 +- .../pkgs/tools/misc/h5utils/default.nix | 2 +- .../pkgs/tools/misc/hakuneko/default.nix | 4 +- .../pkgs/tools/misc/hashit/default.nix | 4 +- .../pkgs/tools/misc/hdaps-gl/default.nix | 2 +- .../pkgs/tools/misc/heatseeker/default.nix | 2 +- .../pkgs/tools/misc/hebcal/default.nix | 2 +- .../pkgs/tools/misc/html-proofer/Gemfile.lock | 4 +- .../pkgs/tools/misc/html-proofer/gemset.nix | 4 +- .../pkgs/tools/misc/hueadm/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/hunt/default.nix | 2 +- .../pkgs/tools/misc/hwatch/default.nix | 6 +- .../tools/misc/hyperledger-fabric/default.nix | 2 +- .../pkgs/tools/misc/infracost/default.nix | 9 +- .../nixpkgs/pkgs/tools/misc/ink/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/ipxe/default.nix | 10 +- .../pkgs/tools/misc/jfrog-cli/default.nix | 6 +- .../pkgs/tools/misc/jugglinglab/default.nix | 4 +- .../pkgs/tools/misc/keychain/default.nix | 2 +- .../pkgs/tools/misc/kodi-cli/default.nix | 2 +- .../pkgs/tools/misc/kronometer/default.nix | 2 +- .../pkgs/tools/misc/latex2html/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/lbdb/default.nix | 2 +- .../tools/misc/lcdf-typetools/default.nix | 2 +- .../pkgs/tools/misc/ldapvi/default.nix | 2 +- .../pkgs/tools/misc/lesspipe/default.nix | 2 +- .../pkgs/tools/misc/limitcpu/default.nix | 2 +- .../pkgs/tools/misc/linuxquota/default.nix | 2 +- .../pkgs/tools/misc/loadlibrary/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/lrzsz/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/lsd/default.nix | 2 +- .../pkgs/tools/misc/makebootfat/default.nix | 2 +- .../pkgs/tools/misc/maker-panel/default.nix | 6 +- .../update-gerber-types-to-0.3.patch | 109 + .../pkgs/tools/misc/man-db/default.nix | 2 +- .../pkgs/tools/misc/massren/default.nix | 8 +- .../misc/mathpix-snipping-tool/default.nix | 7 +- .../pkgs/tools/misc/mbuffer/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/mcfly/default.nix | 6 +- .../pkgs/tools/misc/mdbtools/default.nix | 2 +- .../pkgs/tools/misc/memtest86+/default.nix | 2 +- .../pkgs/tools/misc/minicom/default.nix | 2 +- .../pkgs/tools/misc/minipro/default.nix | 5 +- .../nixpkgs/pkgs/tools/misc/mise/default.nix | 12 +- .../pkgs/tools/misc/mloader/default.nix | 2 +- .../pkgs/tools/misc/mlocate/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/moar/default.nix | 4 +- .../tools/misc/mongodb-compass/default.nix | 8 +- .../pkgs/tools/misc/moserial/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/most/default.nix | 2 +- .../pkgs/tools/misc/mprocs/default.nix | 2 +- .../pkgs/tools/misc/mstflint/default.nix | 15 +- .../nixpkgs/pkgs/tools/misc/mtm/default.nix | 2 +- .../tools/misc/mutagen-compose/default.nix | 6 +- .../pkgs/tools/misc/mutagen/default.nix | 2 +- .../pkgs/tools/misc/nagstamon/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/natls/default.nix | 2 +- .../nautilus-open-any-terminal/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/ncdu/default.nix | 10 +- .../nixpkgs/pkgs/tools/misc/noti/default.nix | 2 +- .../tools/misc/notify-desktop/default.nix | 2 +- .../pkgs/tools/misc/ntfy-sh/default.nix | 9 +- .../pkgs/tools/misc/octosql/default.nix | 4 +- .../pkgs/tools/misc/odyssey/default.nix | 2 +- .../tools/misc/opencorsairlink/default.nix | 2 +- .../misc/opentelemetry-collector/contrib.nix | 6 +- .../misc/opentelemetry-collector/default.nix | 6 +- .../pkgs/tools/misc/ostree/default.nix | 18 +- .../pkgs/tools/misc/otel-cli/default.nix | 10 +- .../otel-cli/patches/bin-echo-patch.patch | 21 + .../nixpkgs/pkgs/tools/misc/pal/default.nix | 2 +- .../pkgs/tools/misc/panoply/default.nix | 4 +- .../pkgs/tools/misc/parallel/default.nix | 4 +- .../pkgs/tools/misc/parallel/wrapper.nix | 22 +- .../pkgs/tools/misc/parcellite/default.nix | 4 +- .../pkgs/tools/misc/pastebinit/default.nix | 2 +- .../pkgs/tools/misc/pgcenter/default.nix | 2 +- .../pkgs/tools/misc/pgmetrics/default.nix | 2 +- .../pkgs/tools/misc/phrase-cli/default.nix | 6 +- .../pkgs/tools/misc/pipelight/default.nix | 2 +- .../pkgs/tools/misc/pkgdiff/default.nix | 2 +- .../pkgs/tools/misc/plotinus/default.nix | 4 +- .../pkgs/tools/misc/pokemonsay/default.nix | 14 +- .../pkgs/tools/misc/popsicle/default.nix | 4 +- .../pkgs/tools/misc/poweralertd/default.nix | 6 +- .../pkgs/tools/misc/pre-commit/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/pspg/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/pv/default.nix | 12 +- .../pkgs/tools/misc/qflipper/default.nix | 4 +- .../pkgs/tools/misc/qjoypad/default.nix | 2 +- .../pkgs/tools/misc/recoverjpeg/default.nix | 2 +- .../pkgs/tools/misc/remind/default.nix | 4 +- .../pkgs/tools/misc/remote-exec/default.nix | 4 +- .../tools/misc/riemann-c-client/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/rig/default.nix | 2 +- .../pkgs/tools/misc/ripdrag/default.nix | 6 +- .../pkgs/tools/misc/rmate-sh/default.nix | 2 +- .../pkgs/tools/misc/rmlint/default.nix | 4 +- .../pkgs/tools/misc/rpm-ostree/default.nix | 4 +- .../pkgs/tools/misc/rrdtool/default.nix | 2 +- .../tools/misc/rshim-user-space/default.nix | 2 +- .../pkgs/tools/misc/scanmem/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/scdl/default.nix | 6 +- .../tools/misc/sensible-utils/default.nix | 2 +- .../pkgs/tools/misc/shadowenv/default.nix | 2 +- .../pkgs/tools/misc/shelldap/default.nix | 10 +- .../pkgs/tools/misc/sixpair/default.nix | 2 +- .../pkgs/tools/misc/slsnif/default.nix | 2 +- .../pkgs/tools/misc/snapper/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/snore/default.nix | 2 +- .../pkgs/tools/misc/sonota/default.nix | 2 +- .../tools/misc/sqlite3-to-mysql/default.nix | 4 +- .../pkgs/tools/misc/starship/default.nix | 2 +- .../pkgs/tools/misc/staruml/default.nix | 4 +- .../pkgs/tools/misc/statserial/default.nix | 2 +- .../pkgs/tools/misc/subberthehut/default.nix | 2 +- .../pkgs/tools/misc/svtplay-dl/default.nix | 4 +- .../misc/system-config-printer/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/tbls/default.nix | 6 +- .../pkgs/tools/misc/tewisay/default.nix | 2 +- .../pkgs/tools/misc/timidity/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/tlp/default.nix | 1 + .../pkgs/tools/misc/tmpwatch/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/tmuxp/default.nix | 18 +- .../pkgs/tools/misc/topicctl/default.nix | 4 +- .../pkgs/tools/misc/toybox/default.nix | 4 +- .../pkgs/tools/misc/trackma/default.nix | 4 +- .../pkgs/tools/misc/trash-cli/default.nix | 4 +- .../pkgs/tools/misc/ttylog/default.nix | 2 +- .../pkgs/tools/misc/ttyplot/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/turbo/Cargo.lock | 13638 +++ .../nixpkgs/pkgs/tools/misc/turbo/default.nix | 11 +- .../nixpkgs/pkgs/tools/misc/turbo/wrapper.nix | 16 + .../tools/misc/twspace-crawler/default.nix | 2 +- .../pkgs/tools/misc/twspace-dl/default.nix | 2 +- .../pkgs/tools/misc/txt2man/default.nix | 2 +- .../pkgs/tools/misc/uhubctl/default.nix | 2 +- .../tools/misc/ultrastar-creator/default.nix | 2 +- .../tools/misc/ultrastar-manager/default.nix | 2 +- .../pkgs/tools/misc/undocker/default.nix | 33 +- .../pkgs/tools/misc/upterm/default.nix | 6 +- .../pkgs/tools/misc/url-parser/default.nix | 6 +- .../pkgs/tools/misc/urn-timer/default.nix | 6 +- .../pkgs/tools/misc/usbimager/default.nix | 9 +- .../nixpkgs/pkgs/tools/misc/uucp/default.nix | 27 +- .../nixpkgs/pkgs/tools/misc/vector/Cargo.lock | 1348 +- .../pkgs/tools/misc/vector/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/via/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/vial/default.nix | 6 +- .../pkgs/tools/misc/vorbisgain/default.nix | 2 +- .../pkgs/tools/misc/vrc-get/default.nix | 17 +- .../nixpkgs/pkgs/tools/misc/vsh/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/vtm/default.nix | 4 +- .../pkgs/tools/misc/wacomtablet/default.nix | 2 +- .../pkgs/tools/misc/wakapi/default.nix | 6 +- .../pkgs/tools/misc/wakatime/default.nix | 9 +- .../pkgs/tools/misc/wasm-tools/default.nix | 6 +- .../pkgs/tools/misc/watchexec/default.nix | 6 +- .../pkgs/tools/misc/woeusb-ng/default.nix | 4 +- .../pkgs/tools/misc/wootility/default.nix | 5 +- .../nixpkgs/pkgs/tools/misc/wv/default.nix | 17 +- .../nixpkgs/pkgs/tools/misc/wyrd/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/xclip/default.nix | 2 +- .../pkgs/tools/misc/xdaliclock/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/xflux/gui.nix | 4 +- .../pkgs/tools/misc/xfstests/default.nix | 2 +- .../pkgs/tools/misc/xprite-editor/default.nix | 2 +- .../pkgs/tools/misc/xvfb-run/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/yad/default.nix | 5 +- .../pkgs/tools/misc/yt-dlp/default.nix | 2 +- .../pkgs/tools/misc/ytarchive/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/z-lua/default.nix | 2 +- .../pkgs/tools/misc/zellij/default.nix | 8 +- .../zotero-translation-server/default.nix | 2 +- .../pkgs/tools/networking/6tunnel/default.nix | 2 +- .../networking/apc-temp-fetch/default.nix | 11 +- .../tools/networking/arpoison/default.nix | 2 +- .../pkgs/tools/networking/asleap/default.nix | 2 +- .../pkgs/tools/networking/axel/default.nix | 2 +- .../tools/networking/bacnet-stack/default.nix | 6 +- .../pkgs/tools/networking/bgpq4/default.nix | 4 +- .../tools/networking/biosdevname/default.nix | 2 +- .../tools/networking/boringtun/default.nix | 2 +- .../pkgs/tools/networking/brook/default.nix | 6 +- .../tools/networking/calendar-cli/default.nix | 8 +- .../tools/networking/cassowary/default.nix | 6 +- .../pkgs/tools/networking/castnow/default.nix | 2 +- .../pkgs/tools/networking/chaos/default.nix | 6 +- .../pkgs/tools/networking/checkip/default.nix | 6 +- .../pkgs/tools/networking/chrony/default.nix | 2 +- .../pkgs/tools/networking/cksfv/default.nix | 2 +- .../networking/cloud-custodian/default.nix | 4 +- .../networking/cloudflare-warp/default.nix | 33 +- .../pkgs/tools/networking/cntlm/default.nix | 2 +- .../pkgs/tools/networking/corerad/default.nix | 8 +- .../tools/networking/corkscrew/default.nix | 2 +- .../networking/curl-impersonate/default.nix | 18 +- .../curl/8.7.1-compression-fix.patch | 168 + .../pkgs/tools/networking/curl/default.nix | 6 + .../pkgs/tools/networking/ddns-go/default.nix | 4 +- .../pkgs/tools/networking/dibbler/default.nix | 29 - .../pkgs/tools/networking/dirb/default.nix | 2 +- .../pkgs/tools/networking/dnsmasq/default.nix | 2 +- .../tools/networking/dnsproxy/default.nix | 6 +- .../pkgs/tools/networking/easyrsa/default.nix | 2 +- .../pkgs/tools/networking/eggdrop/default.nix | 2 +- .../pkgs/tools/networking/email/default.nix | 2 +- .../pkgs/tools/networking/ferm/default.nix | 6 +- .../networking/ferm/import-ferm-wrapped.patch | 14 + .../pkgs/tools/networking/fping/default.nix | 21 +- .../tools/networking/getmail6/default.nix | 15 +- .../pkgs/tools/networking/ghz/default.nix | 7 +- .../pkgs/tools/networking/gobgp/default.nix | 6 +- .../pkgs/tools/networking/goflow2/default.nix | 10 +- .../tools/networking/goimapnotify/default.nix | 4 +- .../tools/networking/gp-saml-gui/default.nix | 4 +- .../pkgs/tools/networking/gping/default.nix | 2 +- .../tools/networking/graphqurl/default.nix | 6 +- .../tools/networking/grpc_cli/default.nix | 4 +- .../tools/networking/gupnp-tools/default.nix | 6 +- .../pkgs/tools/networking/gvpe/default.nix | 2 +- .../tools/networking/haguichi/default.nix | 4 +- .../pkgs/tools/networking/haproxy/default.nix | 4 +- .../pkgs/tools/networking/httperf/default.nix | 2 +- .../tools/networking/httptunnel/default.nix | 2 +- .../pkgs/tools/networking/hurl/default.nix | 6 +- .../tools/networking/hysteria/default.nix | 6 +- .../pkgs/tools/networking/i2pd/default.nix | 4 +- .../networking/ifstat-legacy/default.nix | 2 +- .../pkgs/tools/networking/ip2unix/default.nix | 11 +- .../pkgs/tools/networking/isync/default.nix | 2 +- .../pkgs/tools/networking/juicity/default.nix | 4 +- .../pkgs/tools/networking/jwhois/default.nix | 37 +- .../pkgs/tools/networking/kapp/default.nix | 6 +- .../pkgs/tools/networking/libnids/default.nix | 2 +- .../tools/networking/libreswan/default.nix | 58 +- .../tools/networking/linkchecker/default.nix | 32 +- .../pkgs/tools/networking/lychee/default.nix | 6 +- .../pkgs/tools/networking/maubot/default.nix | 1 + .../networking/maubot/plugins/generated.json | 165 +- .../tools/networking/maubot/plugins/update.py | 2 +- .../networking/memtier-benchmark/default.nix | 6 +- .../tools/networking/minidlna/default.nix | 2 +- .../tools/networking/minio-client/default.nix | 6 +- .../pkgs/tools/networking/miredo/default.nix | 2 +- .../pkgs/tools/networking/mmsd/default.nix | 2 +- .../pkgs/tools/networking/mockoon/default.nix | 2 - .../pkgs/tools/networking/motrix/default.nix | 2 - .../networking/mqttmultimeter/default.nix | 6 - .../pkgs/tools/networking/mtr/default.nix | 3 +- .../pkgs/tools/networking/mu/default.nix | 4 +- .../pkgs/tools/networking/nbd/default.nix | 2 +- .../pkgs/tools/networking/ndisc6/default.nix | 2 +- .../pkgs/tools/networking/ndjbdns/default.nix | 2 +- .../pkgs/tools/networking/nebula/default.nix | 6 +- .../pkgs/tools/networking/netbird/default.nix | 6 +- .../pkgs/tools/networking/netmask/default.nix | 2 +- .../pkgs/tools/networking/netrw/default.nix | 2 +- .../pkgs/tools/networking/nettee/default.nix | 2 +- .../networkd-dispatcher/default.nix | 13 +- .../networkmanager/applet/default.nix | 4 +- .../networking/networkmanager/default.nix | 8 +- .../networkmanager/fortisslvpn/default.nix | 2 +- .../networkmanager/l2tp/default.nix | 4 +- .../tools/networking/nfstrace/default.nix | 2 +- .../pkgs/tools/networking/ngrok/versions.json | 36 +- .../pkgs/tools/networking/noip/default.nix | 2 +- .../pkgs/tools/networking/ntttcp/default.nix | 2 +- .../pkgs/tools/networking/nzbget/default.nix | 12 +- .../pkgs/tools/networking/ockam/default.nix | 6 +- .../tools/networking/offlineimap/default.nix | 2 +- .../pkgs/tools/networking/oha/default.nix | 6 +- .../tools/networking/openfortivpn/default.nix | 4 +- .../pkgs/tools/networking/opensm/default.nix | 2 +- .../pkgs/tools/networking/openssh/common.nix | 4 +- .../pkgs/tools/networking/openssh/default.nix | 8 +- .../networking/openvpn/update-resolv-conf.nix | 2 +- .../tools/networking/openvpn3/default.nix | 4 +- .../networking/p2p/gtk-gnutella/default.nix | 2 +- .../tools/networking/packetdrill/default.nix | 2 +- .../pkgs/tools/networking/pdsh/default.nix | 2 +- .../pkgs/tools/networking/phodav/default.nix | 2 +- .../tools/networking/pixiecore/default.nix | 2 +- .../pkgs/tools/networking/pmacct/default.nix | 2 +- .../pkgs/tools/networking/ppp/default.nix | 2 +- .../pkgs/tools/networking/pptp/default.nix | 2 +- .../pkgs/tools/networking/pptpd/default.nix | 2 +- .../networking/proxychains-ng/default.nix | 21 +- .../tools/networking/quickserve/default.nix | 2 +- .../pkgs/tools/networking/ratman/default.nix | 2 +- .../pkgs/tools/networking/redir/default.nix | 2 +- .../tools/networking/requestly/default.nix | 2 - .../pkgs/tools/networking/s3cmd/default.nix | 2 +- .../networking/shadowsocks-rust/default.nix | 8 +- .../tools/networking/simpleproxy/default.nix | 2 +- .../tools/networking/sing-box/default.nix | 6 +- .../pkgs/tools/networking/sipsak/default.nix | 2 +- .../pkgs/tools/networking/sish/default.nix | 6 +- .../tools/networking/sitespeed-io/default.nix | 6 +- .../tools/networking/slirp4netns/default.nix | 6 +- .../tools/networking/speedtest-go/default.nix | 17 +- .../pkgs/tools/networking/sshpass/default.nix | 2 +- .../stevenblack-blocklist/default.nix | 9 +- .../networking/swagger-codegen3/default.nix | 5 +- .../tools/networking/tcp-cutter/default.nix | 2 +- .../networking/tcptraceroute/default.nix | 2 +- .../pkgs/tools/networking/tgt/default.nix | 2 +- .../tools/networking/tracebox/default.nix | 2 +- .../pkgs/tools/networking/trurl/default.nix | 4 +- .../pkgs/tools/networking/uget/default.nix | 4 +- .../pkgs/tools/networking/uqmi/default.nix | 2 + .../pkgs/tools/networking/v2ray/default.nix | 6 +- .../pkgs/tools/networking/vde2/default.nix | 2 +- .../pkgs/tools/networking/veilid/Cargo.lock | 575 +- .../pkgs/tools/networking/veilid/default.nix | 4 +- .../tools/networking/webalizer/default.nix | 2 +- .../pkgs/tools/networking/whois/default.nix | 2 +- .../networking/wireguard-tools/default.nix | 2 +- .../pkgs/tools/networking/wol/default.nix | 2 +- .../tools/networking/xdp-tools/default.nix | 2 +- .../pkgs/tools/networking/xl2tpd/default.nix | 2 +- .../pkgs/tools/networking/xnbd/default.nix | 2 +- .../pkgs/tools/networking/xray/default.nix | 6 +- .../pkgs/tools/networking/ytcc/default.nix | 2 +- .../pkgs/tools/networking/zap/default.nix | 6 +- .../tools/networking/zerotierone/Cargo.lock | 2494 +- .../tools/networking/zerotierone/default.nix | 9 +- .../tools/networking/zerotierone/update.sh | 2 +- .../pkgs/tools/networking/zrok/default.nix | 8 +- .../networking/zs-apc-spdu-ctl/default.nix | 2 +- .../tools/networking/zs-wait4host/default.nix | 2 +- .../pkgs/tools/networking/zssh/default.nix | 2 +- .../nix/nix-query-tree-viewer/default.nix | 4 +- .../tools/package-management/akku/default.nix | 2 +- .../checkinstall/default.nix | 2 +- .../package-management/comma/default.nix | 2 +- .../disnix/DisnixWebService/default.nix | 45 +- .../tools/package-management/dnf5/default.nix | 2 +- .../tools/package-management/lix/common.nix | 286 + .../tools/package-management/lix/default.nix | 60 + .../package-management/lix/doc/default.nix | 12 + .../tools/package-management/nfpm/default.nix | 8 +- .../tools/package-management/niff/default.nix | 1 - .../package-management/nix-eval-jobs/2.19.nix | 47 + .../nix-eval-jobs/default.nix | 4 +- .../tools/package-management/nix/default.nix | 150 +- .../tools/package-management/nix/nix-perl.nix | 66 +- .../nix/patches/2_3/CVE-2024-27297.patch | 375 - .../package-management/opkg-utils/default.nix | 2 +- .../tools/package-management/pdm/default.nix | 40 +- .../tools/package-management/pkg/default.nix | 4 +- .../poetry/plugins/poetry-plugin-export.nix | 4 +- .../pkgs/tools/security/aespipe/default.nix | 2 +- .../nixpkgs/pkgs/tools/security/afl/README.md | 19 - .../pkgs/tools/security/afl/default.nix | 82 - .../pkgs/tools/security/afl/libdislocator.nix | 35 - .../afl/qemu-patches/no-etc-install.patch | 13 - .../afl/qemu-patches/syscall-glibc2_30.diff | 51 - .../nixpkgs/pkgs/tools/security/afl/qemu.nix | 77 - .../pkgs/tools/security/agebox/default.nix | 13 +- .../pkgs/tools/security/aide/default.nix | 4 +- .../pkgs/tools/security/arti/default.nix | 8 +- .../aws-iam-authenticator/default.nix | 6 +- .../security/bash-supergenpass/default.nix | 2 +- .../tools/security/biscuit-cli/default.nix | 6 +- .../pkgs/tools/security/bpb/default.nix | 32 - .../security/buttercup-desktop/default.nix | 7 +- .../pkgs/tools/security/cdxgen/default.nix | 6 +- .../pkgs/tools/security/chntpw/default.nix | 2 +- .../pkgs/tools/security/clamav/default.nix | 6 +- .../pkgs/tools/security/cnquery/default.nix | 6 +- .../pkgs/tools/security/cnspec/default.nix | 6 +- .../pkgs/tools/security/crowdsec/default.nix | 6 +- .../tools/security/cryptomator/default.nix | 12 +- .../tools/security/cve-bin-tool/default.nix | 150 +- .../no-gsutil-python-dependency.patch | 12 - .../pkgs/tools/security/donkey/default.nix | 2 +- .../pkgs/tools/security/doona/default.nix | 2 +- .../pkgs/tools/security/duo-unix/default.nix | 2 +- ...er-c99-implicit-function-declaration.patch | 12 + .../pkgs/tools/security/ecdsatool/default.nix | 5 + ...er-c99-implicit-function-declaration.patch | 33 + .../pkgs/tools/security/efitools/default.nix | 2 +- .../pkgs/tools/security/eid-mw/default.nix | 4 +- .../pkgs/tools/security/exploitdb/default.nix | 4 +- .../pkgs/tools/security/fcrackzip/default.nix | 2 +- .../tools/security/feroxbuster/default.nix | 6 +- .../pkgs/tools/security/fpm2/default.nix | 2 +- .../pkgs/tools/security/fscan/default.nix | 6 +- .../pkgs/tools/security/gau/default.nix | 22 +- .../pkgs/tools/security/gencfsm/default.nix | 4 +- .../pkgs/tools/security/ggshield/default.nix | 54 +- .../pkgs/tools/security/ghauri/default.nix | 4 +- .../pkgs/tools/security/ghidra/build.nix | 4 +- .../tools/security/gnome-keysign/default.nix | 6 +- .../tools/security/gorilla-bin/default.nix | 2 +- .../pkgs/tools/security/gotestwaf/default.nix | 15 +- .../pkgs/tools/security/hashcash/default.nix | 2 +- .../pkgs/tools/security/hashdeep/default.nix | 2 +- .../tools/security/ibm-sw-tpm2/default.nix | 2 +- .../pkgs/tools/security/isolate/default.nix | 16 +- .../isolate/take-config-file-from-env.patch | 19 + .../pkgs/tools/security/jadx/default.nix | 2 +- .../pkgs/tools/security/kbs2/default.nix | 2 +- .../pkgs/tools/security/kestrel/default.nix | 6 +- .../pkgs/tools/security/keybase/gui.nix | 4 +- .../pkgs/tools/security/knowsmore/default.nix | 40 +- .../tools/security/kubeclarity/default.nix | 9 +- .../pkgs/tools/security/kubescape/default.nix | 41 +- .../tools/security/libmodsecurity/default.nix | 4 +- .../pkgs/tools/security/medusa/default.nix | 2 +- .../pkgs/tools/security/metasploit/Gemfile | 2 +- .../tools/security/metasploit/Gemfile.lock | 26 +- .../tools/security/metasploit/default.nix | 4 +- .../pkgs/tools/security/metasploit/gemset.nix | 38 +- .../pkgs/tools/security/mfcuk/default.nix | 2 +- .../pkgs/tools/security/mfoc/default.nix | 2 +- .../pkgs/tools/security/mkpasswd/default.nix | 2 +- .../pkgs/tools/security/monsoon/default.nix | 6 +- .../pkgs/tools/security/naabu/default.nix | 6 +- .../pkgs/tools/security/nasty/default.nix | 2 +- .../pkgs/tools/security/nmap/default.nix | 2 +- .../nixpkgs/pkgs/tools/security/nmap/qt.nix | 2 +- .../pkgs/tools/security/notation/default.nix | 13 +- .../pkgs/tools/security/nuclei/default.nix | 6 +- .../tools/security/onioncircuits/default.nix | 4 +- .../pkgs/tools/security/onlykey/default.nix | 4 +- .../security/openpgp-card-tools/default.nix | 6 +- .../tools/security/ospd-openvas/default.nix | 9 +- .../pkgs/tools/security/ossec/agent.nix | 2 +- .../pkgs/tools/security/ossec/server.nix | 2 +- .../tools/security/osv-scanner/default.nix | 6 +- .../pkgs/tools/security/paperkey/default.nix | 2 +- .../pkgs/tools/security/pass/rofi-pass.nix | 2 +- .../tools/security/passff-host/default.nix | 2 +- .../tools/security/pcsc-tools/default.nix | 27 +- .../pkgs/tools/security/pcsclite/default.nix | 50 +- .../security/pinentry-bemenu/default.nix | 4 +- .../pkgs/tools/security/pinentry/default.nix | 4 +- .../pkgs/tools/security/pius/default.nix | 2 +- .../pkgs/tools/security/prs/default.nix | 6 +- .../pkgs/tools/security/qdigidoc/default.nix | 15 +- .../tools/security/quark-engine/default.nix | 34 +- .../pkgs/tools/security/rarcrack/default.nix | 2 +- .../pkgs/tools/security/rbw/default.nix | 9 +- .../pkgs/tools/security/rustscan/default.nix | 35 +- .../pkgs/tools/security/schleuder/default.nix | 2 + .../pkgs/tools/security/semgrep/common.nix | 16 +- .../pkgs/tools/security/sherlock/default.nix | 13 +- .../tools/security/signing-party/default.nix | 2 +- .../pkgs/tools/security/snow/default.nix | 4 +- .../pkgs/tools/security/softhsm/default.nix | 7 +- .../pkgs/tools/security/sops/default.nix | 2 +- .../pkgs/tools/security/spire/default.nix | 4 +- .../pkgs/tools/security/ssdeep/default.nix | 2 +- .../pkgs/tools/security/ssh-audit/default.nix | 4 +- .../pkgs/tools/security/step-ca/default.nix | 37 +- .../pkgs/tools/security/step-cli/default.nix | 39 - .../pkgs/tools/security/sudo/default.nix | 2 +- .../pkgs/tools/security/tor/torsocks.nix | 2 +- .../tools/security/tpm2-tools/default.nix | 14 +- .../tools/security/trufflehog/default.nix | 6 +- .../pkgs/tools/security/vals/default.nix | 6 +- .../pkgs/tools/security/vault/default.nix | 6 +- .../pkgs/tools/security/vault/vault-bin.nix | 12 +- .../tools/security/web-eid-app/default.nix | 4 +- .../pkgs/tools/security/wipe/default.nix | 2 +- .../pkgs/tools/security/xsser/default.nix | 4 +- .../pkgs/tools/security/yara/default.nix | 9 + .../tools/security/yubihsm-shell/default.nix | 4 +- .../tools/system/acpica-tools/default.nix | 2 +- .../pkgs/tools/system/actkbd/default.nix | 2 +- .../pkgs/tools/system/amtterm/default.nix | 2 +- .../system/automatic-timezoned/default.nix | 6 +- .../nixpkgs/pkgs/tools/system/bar/default.nix | 2 +- .../pkgs/tools/system/cm-rgb/default.nix | 4 +- .../pkgs/tools/system/collectd/default.nix | 2 +- .../tools/system/consul-template/default.nix | 6 +- .../pkgs/tools/system/ctop/default.nix | 2 +- .../pkgs/tools/system/datefudge/default.nix | 2 +- .../pkgs/tools/system/dcfldd/default.nix | 2 +- .../system/dell-command-configure/default.nix | 5 +- .../pkgs/tools/system/fcron/default.nix | 2 +- .../nixpkgs/pkgs/tools/system/fio/default.nix | 2 +- .../pkgs/tools/system/gdmap/default.nix | 2 +- .../nixpkgs/pkgs/tools/system/gdu/default.nix | 34 +- .../pkgs/tools/system/gkraken/default.nix | 4 +- .../pkgs/tools/system/gptfdisk/default.nix | 2 +- .../pkgs/tools/system/hardinfo/default.nix | 2 +- .../pkgs/tools/system/incron/default.nix | 2 +- .../pkgs/tools/system/inxi/default.nix | 9 +- .../nixpkgs/pkgs/tools/system/ior/default.nix | 2 +- .../pkgs/tools/system/kanata/default.nix | 10 +- .../pkgs/tools/system/kmon/default.nix | 2 +- .../pkgs/tools/system/krakenx/default.nix | 2 +- .../pkgs/tools/system/lact/default.nix | 6 +- .../pkgs/tools/system/ledmon/default.nix | 2 +- .../pkgs/tools/system/loadwatch/default.nix | 2 +- .../pkgs/tools/system/memtester/default.nix | 2 +- .../pkgs/tools/system/pciutils/default.nix | 1 + .../pkgs/tools/system/proot/default.nix | 2 +- .../pkgs/tools/system/psensor/default.nix | 4 +- .../pkgs/tools/system/s-tui/default.nix | 2 +- .../pkgs/tools/system/setserial/default.nix | 2 +- .../pkgs/tools/system/skeema/default.nix | 35 +- .../pkgs/tools/system/stress-ng/default.nix | 4 +- .../pkgs/tools/system/stress/default.nix | 2 +- .../pkgs/tools/system/throttled/default.nix | 16 +- .../pkgs/tools/system/tree/default.nix | 2 +- .../nixpkgs/pkgs/tools/system/ts/default.nix | 2 +- .../pkgs/tools/system/vbetool/default.nix | 2 +- .../pkgs/tools/system/zenith/Cargo.lock | 755 +- .../pkgs/tools/system/zenith/default.nix | 8 +- .../nixpkgs/pkgs/tools/text/boxes/default.nix | 2 +- .../pkgs/tools/text/catdoc/default.nix | 2 +- .../pkgs/tools/text/comrak/default.nix | 6 +- .../pkgs/tools/text/convertlit/default.nix | 2 +- .../pkgs/tools/text/crowdin-cli/default.nix | 4 +- .../pkgs/tools/text/csview/default.nix | 6 +- .../pkgs/tools/text/diffsitter/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/enca/default.nix | 2 +- .../pkgs/tools/text/gtranslator/default.nix | 10 +- .../nixpkgs/pkgs/tools/text/gucci/default.nix | 17 +- .../pkgs/tools/text/kdiff3/default.nix | 4 +- .../pkgs/tools/text/languagetool/default.nix | 4 +- .../pkgs/tools/text/ltex-ls/default.nix | 2 +- .../nixpkgs/pkgs/tools/text/lv/default.nix | 2 +- .../tools/text/markdownlint-cli/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/mawk/default.nix | 2 +- .../pkgs/tools/text/mdbook-epub/default.nix | 8 +- .../tools/text/mdbook-open-on-gh/default.nix | 6 +- .../tools/text/mdbook-pagetoc/default.nix | 6 +- .../tools/text/multitran/data/default.nix | 2 +- .../tools/text/multitran/libbtree/default.nix | 2 +- .../tools/text/multitran/libfacet/default.nix | 2 +- .../text/multitran/libmtquery/default.nix | 2 +- .../text/multitran/libmtsupport/default.nix | 2 +- .../tools/text/multitran/mtutils/default.nix | 2 +- .../pkgs/tools/text/odt2txt/default.nix | 2 +- .../pkgs/tools/text/opencc/default.nix | 18 +- .../nixpkgs/pkgs/tools/text/ov/default.nix | 4 +- .../pkgs/tools/text/paperoni/default.nix | 2 +- .../pkgs/tools/text/patchutils/0.4.2.nix | 1 + .../patchutils/Revert-Fix-grepdiff-test.patch | 38 + .../pkgs/tools/text/poedit/default.nix | 4 +- .../pkgs/tools/text/popfile/default.nix | 2 +- .../tools/text/readability-cli/default.nix | 2 +- .../pkgs/tools/text/recode/default.nix | 8 +- .../pkgs/tools/text/riffdiff/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/rpl/default.nix | 2 +- .../pkgs/tools/text/rust-petname/default.nix | 6 +- .../pkgs/tools/text/snippetpixie/default.nix | 4 +- .../pkgs/tools/text/subedit/default.nix | 2 +- .../nixpkgs/pkgs/tools/text/tml/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/ugrep/default.nix | 4 +- .../pkgs/tools/text/unoconv/default.nix | 2 +- .../nixpkgs/pkgs/tools/text/vale/default.nix | 11 +- .../nixpkgs/pkgs/tools/text/vale/styles.nix | 8 +- .../nixpkgs/pkgs/tools/text/zoekt/default.nix | 9 +- .../pkgs/tools/text/zstxtns-utils/default.nix | 2 +- .../tools/typesetting/bibclean/default.nix | 2 +- .../tools/typesetting/pdf2djvu/default.nix | 2 +- .../tools/typesetting/pdfchain/default.nix | 4 +- .../tools/typesetting/pdfsandwich/default.nix | 2 +- .../typesetting/pulldown-cmark/default.nix | 6 +- .../tools/typesetting/satysfi/default.nix | 2 +- .../pkgs/tools/typesetting/ted/default.nix | 2 +- .../tools/typesetting/tex/catdvi/default.nix | 2 +- .../typesetting/tex/pgf-tikz/pgf-2.x.nix | 2 +- .../tools/typesetting/tex/texlive/bin.nix | 35 +- .../typesetting/tex/texlive/build-tex-env.nix | 18 +- .../typesetting/tex/texlive/build-tex-env.sh | 48 +- .../tex/texlive/build-texlive-package.nix | 205 +- .../tools/typesetting/tex/texlive/default.nix | 24 +- .../tex/texlive/generate-fixed-hashes.nix | 25 +- .../tools/typesetting/tex/texlive/tl2nix.sed | 9 +- .../tex/texlive/tlpdb-overrides.nix | 10 +- .../tools/typesetting/tex/texlive/tlpdb.nix | 4691 +- .../typesetting/tex/texpresso/default.nix | 6 +- .../typesetting/tex/texpresso/tectonic.nix | 4 +- .../pkgs/tools/typesetting/xmlto/default.nix | 80 +- .../blackmagic-desktop-video/default.nix | 4 +- .../pkgs/tools/video/go2rtc/default.nix | 6 +- .../nixpkgs/pkgs/tools/video/lux/default.nix | 6 +- .../pkgs/tools/video/rtmpdump/default.nix | 2 +- .../pkgs/tools/video/swfmill/default.nix | 2 +- .../tools/video/untrunc-anthwlock/default.nix | 13 +- .../pkgs/tools/video/vncrec/default.nix | 2 +- .../pkgs/tools/video/xjadeo/default.nix | 4 +- .../virtualization/cri-tools/default.nix | 4 +- .../tools/virtualization/govc/default.nix | 4 +- .../tools/virtualization/jumppad/default.nix | 15 +- .../tools/virtualization/mkosi/default.nix | 26 +- .../nixos-container/nixos-container.pl | 4 +- .../tools/virtualization/xva-img/default.nix | 2 +- .../aw-watcher-window-wayland/Cargo.lock | 4 +- .../aw-watcher-window-wayland/default.nix | 3 + .../rustc-serialize-fix.patch | 16 + .../pkgs/tools/wayland/clipman/default.nix | 6 +- .../pkgs/tools/wayland/gtklock/default.nix | 36 +- .../wayland/gtklock/playerctl-module.nix | 4 +- .../tools/wayland/gtklock/powerbar-module.nix | 4 +- .../tools/wayland/gtklock/userinfo-module.nix | 4 +- .../hyprland-per-window-layout/default.nix | 6 +- .../pkgs/tools/wayland/kanshi/default.nix | 11 +- .../pkgs/tools/wayland/mpvpaper/default.nix | 4 +- .../pkgs/tools/wayland/sirula/Cargo.lock | 966 + .../pkgs/tools/wayland/sirula/default.nix | 15 +- .../tools/wayland/way-displays/default.nix | 4 +- .../wayland/wayland-proxy-virtwl/default.nix | 2 +- .../pkgs/tools/wayland/waynergy/default.nix | 4 +- .../tools/wayland/wl-clip-persist/default.nix | 40 - .../tools/wayland/wl-clipboard/default.nix | 12 +- .../pkgs/tools/wayland/wl-mirror/default.nix | 2 +- .../pkgs/tools/wayland/wlsunset/default.nix | 4 +- .../pkgs/tools/wayland/wpaperd/Cargo.lock | 2041 - .../nixpkgs/pkgs/top-level/aliases.nix | 49 +- .../nixpkgs/pkgs/top-level/all-packages.nix | 773 +- .../nixpkgs/pkgs/top-level/beam-packages.nix | 2 +- third_party/nixpkgs/pkgs/top-level/config.nix | 6 + .../nixpkgs/pkgs/top-level/coq-packages.nix | 5 +- .../nixpkgs/pkgs/top-level/darwin-aliases.nix | 8 + .../pkgs/top-level/darwin-packages.nix | 4 +- .../pkgs/top-level/haskell-packages.nix | 36 +- .../nixpkgs/pkgs/top-level/java-packages.nix | 1 + .../nixpkgs/pkgs/top-level/linux-kernels.nix | 19 +- .../nixpkgs/pkgs/top-level/lua-packages.nix | 6 +- .../nixpkgs/pkgs/top-level/make-tarball.nix | 63 +- .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 33 +- .../pkgs/top-level/packages-config.nix | 2 - .../nixpkgs/pkgs/top-level/perl-packages.nix | 85 +- .../nixpkgs/pkgs/top-level/php-packages.nix | 20 +- .../nixpkgs/pkgs/top-level/python-aliases.nix | 14 +- .../pkgs/top-level/python-packages.nix | 219 +- .../top-level/release-attrpaths-superset.nix | 1 + .../nixpkgs/pkgs/top-level/release-cross.nix | 1 - .../pkgs/top-level/release-haskell.nix | 101 +- .../nixpkgs/pkgs/top-level/release-small.nix | 2 +- .../nixpkgs/pkgs/top-level/release.nix | 2 +- .../nixpkgs/pkgs/top-level/ruby-packages.nix | 21 + third_party/nixpkgs/pkgs/top-level/splice.nix | 22 +- third_party/nixpkgs/pkgs/top-level/stage.nix | 4 +- 7595 files changed, 198761 insertions(+), 236152 deletions(-) create mode 100644 third_party/nixpkgs/lib/deprecated/README.md rename third_party/nixpkgs/lib/{deprecated.nix => deprecated/misc.nix} (100%) create mode 100644 third_party/nixpkgs/nixos/modules/config/xdg/terminal-exec.nix create mode 100644 third_party/nixpkgs/nixos/modules/hardware/video/intel-gpu-tools.nix create mode 100644 third_party/nixpkgs/nixos/modules/programs/ydotool.nix create mode 100644 third_party/nixpkgs/nixos/modules/security/isolate.nix rename third_party/nixpkgs/nixos/modules/services/{x11 => }/hardware/libinput.nix (95%) delete mode 100644 third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/cdi-generate.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/default.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/matrix/mautrix-signal.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/misc/devpi-server.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/misc/private-gpt.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/clatd.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/inadyn.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/jotta-cli.md create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/jotta-cli.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/security/oauth2-proxy-nginx.nix rename third_party/nixpkgs/nixos/modules/services/security/{oauth2_proxy.nix => oauth2-proxy.nix} (69%) delete mode 100644 third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/your_spotify.nix create mode 100644 third_party/nixpkgs/nixos/tests/clatd.nix create mode 100644 third_party/nixpkgs/nixos/tests/devpi-server.nix create mode 100644 third_party/nixpkgs/nixos/tests/incus/incusd-options.nix delete mode 100644 third_party/nixpkgs/nixos/tests/incus/preseed.nix create mode 100644 third_party/nixpkgs/nixos/tests/isolate.nix create mode 100644 third_party/nixpkgs/nixos/tests/jotta-cli.nix create mode 100644 third_party/nixpkgs/nixos/tests/private-gpt.nix delete mode 100644 third_party/nixpkgs/nixos/tests/promscale.nix create mode 100644 third_party/nixpkgs/nixos/tests/qtile.nix create mode 100644 third_party/nixpkgs/nixos/tests/swayfx.nix delete mode 100644 third_party/nixpkgs/nixos/tests/systemd-confinement.nix create mode 100644 third_party/nixpkgs/nixos/tests/systemd-confinement/checkperms.py create mode 100644 third_party/nixpkgs/nixos/tests/systemd-confinement/default.nix create mode 100644 third_party/nixpkgs/nixos/tests/ydotool.nix create mode 100644 third_party/nixpkgs/nixos/tests/your_spotify.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/beast/patch.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/cmus/option-debugging.patch create mode 100644 third_party/nixpkgs/pkgs/applications/audio/ensemble-chorus/juice-cxx-packing-fix.diff delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/flac123/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/gbsplay/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/mpg321/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/backup/areca/fix-javah-bug.diff delete mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/openethereum/Cargo.lock delete mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/sparrow/publickey.asc delete mode 100755 third_party/nixpkgs/pkgs/applications/blockchains/sparrow/update.sh delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/fte/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/hexedit/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/jedit/build.xml.patch create mode 100644 third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix rename third_party/nixpkgs/pkgs/applications/emulators/cdemu/{base.nix => common-drv-attrs.nix} (62%) delete mode 100644 third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.12.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.18.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-qos.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/darktable/fix_darwin_x86_compile.patch create mode 100755 third_party/nixpkgs/pkgs/applications/misc/1password/update.sh delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/authy/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/clight/clight-gui.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/electrum/ltc-aiorpcX-version-bump.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/hmm/rustc-serialize-fix.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/kdbplus/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/onagre/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/smpq/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/unipicker/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/dillo/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/acorn/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_30/versions.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/hardcode-version.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_common delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_linux delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches create mode 100644 third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/3.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/taler/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/gnucash/0005-disable-test-lots.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/aarch64.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/cpp-darwin.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/misc/gplates/boost-placeholders.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/physics/crystfel/gui-path-issue.patch create mode 100644 third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/Cargo.lock delete mode 100644 third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/version-management/radicle-upstream/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/mpv/scripts/evafast.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/mpv/scripts/manga-reader.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/mpv/scripts/memo.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-slicing.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/mpv/scripts/videoclip.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/mpv/scripts/youtube-upnext.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/eww/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix delete mode 100644 third_party/nixpkgs/pkgs/build-support/kernel/compress-firmware-xz.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/kernel/compress-firmware.nix delete mode 100644 third_party/nixpkgs/pkgs/build-support/php/build-composer-project.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/php/builders/default.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-project.nix rename third_party/nixpkgs/pkgs/build-support/php/{ => builders/v1}/build-composer-repository.nix (53%) rename third_party/nixpkgs/pkgs/build-support/php/{ => builders/v1}/hooks/composer-install-hook.sh (94%) rename third_party/nixpkgs/pkgs/build-support/php/{ => builders/v1}/hooks/composer-repository-hook.sh (98%) create mode 100644 third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/default.nix rename third_party/nixpkgs/pkgs/build-support/php/{ => builders/v1}/hooks/php-script-utils.bash (100%) delete mode 100644 third_party/nixpkgs/pkgs/build-support/php/hooks/default.nix rename third_party/nixpkgs/pkgs/by-name/{4d/4d-minesweeper => _4/_4d-minesweeper}/package.nix (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ad/adbtuifm/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ad/adrs/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/al/alacarte/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/al/altdns/package.nix rename third_party/nixpkgs/pkgs/{misc/ananicy-rules-cachyos/default.nix => by-name/an/ananicy-rules-cachyos/package.nix} (50%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ap/aphorme/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ap/apostrophe/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ar/argc/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ar/aribb24/package.nix delete mode 100644 third_party/nixpkgs/pkgs/by-name/as/ascii-draw/fix_palette_data_dir.patch rename third_party/nixpkgs/pkgs/{development/compilers/assemblyscript/default.nix => by-name/as/assemblyscript/package.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/as/async-profiler/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/at/atf/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/au/autopsy/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ax/ax25ms/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ba/badkeys/package.nix rename third_party/nixpkgs/pkgs/{os-specific/linux => by-name/bc}/bcc/absolute-ausyscall.patch (100%) rename third_party/nixpkgs/pkgs/{os-specific/linux => by-name/bc}/bcc/fix-deadlock-detector-import.patch (100%) rename third_party/nixpkgs/pkgs/{os-specific/linux => by-name/bc}/bcc/libbcc-path.patch (100%) rename third_party/nixpkgs/pkgs/{os-specific/linux/bcc/default.nix => by-name/bc/bcc/package.nix} (100%) rename third_party/nixpkgs/pkgs/{tools/X11/bevelbar/default.nix => by-name/be/bevelbar/package.nix} (53%) rename third_party/nixpkgs/pkgs/{applications/video/bilibili/default.nix => by-name/bi/bilibili/package.nix} (100%) rename third_party/nixpkgs/pkgs/{applications/audio/waylyrics => by-name/bi/bite}/Cargo.lock (60%) create mode 100644 third_party/nixpkgs/pkgs/by-name/bi/bite/package.nix rename third_party/nixpkgs/pkgs/{applications/audio/blanket/default.nix => by-name/bl/blanket/package.nix} (55%) rename third_party/nixpkgs/pkgs/{os-specific/linux/bpftrace/default.nix => by-name/bp/bpftrace/package.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/br/broom/package.nix rename third_party/nixpkgs/pkgs/{tools/misc/btrfs-assistant/default.nix => by-name/bt/btrfs-assistant/package.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/bu/bugstalker/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/bu/bustle/package.nix rename third_party/nixpkgs/pkgs/{servers/caddy/default.nix => by-name/ca/caddy/package.nix} (81%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ca/caligula/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ca/cargo-geiger/allow-warnings.patch rename third_party/nixpkgs/pkgs/{development/tools/rust/cargo-geiger/default.nix => by-name/ca/cargo-geiger/package.nix} (74%) rename third_party/nixpkgs/pkgs/{development/tools/rust/cargo-profiler/default.nix => by-name/ca/cargo-profiler/package.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ca/cargo-raze/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ca/cargo-raze/rustc-serialize-fix.patch rename third_party/nixpkgs/pkgs/{development/tools/rust/cargo-wasi/default.nix => by-name/ca/cargo-wasi/package.nix} (91%) rename third_party/nixpkgs/pkgs/{development/tools/castxml/default.nix => by-name/ca/castxml/package.nix} (59%) rename third_party/nixpkgs/pkgs/{data/themes/catppuccin-sddm-corners/default.nix => by-name/ca/catppuccin-sddm-corners/package.nix} (89%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ca/catppuccin-sddm/package.nix rename third_party/nixpkgs/pkgs/{data/themes/catppuccin/default.nix => by-name/ca/catppuccin/package.nix} (100%) rename third_party/nixpkgs/pkgs/{development/tools => by-name/cd}/cdecl/cdecl-2.5-lex.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/cd/cdecl/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/cd/cdecl/test_remove_interactive_line.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/ce/cent/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ch/chemacs2/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ch/chezmoi/package.nix rename third_party/nixpkgs/pkgs/{development/tools/misc/cli11/default.nix => by-name/cl/cli11/package.nix} (65%) rename third_party/nixpkgs/pkgs/{applications/version-management/codeberg-cli/default.nix => by-name/co/codeberg-cli/package.nix} (56%) rename third_party/nixpkgs/pkgs/{applications/editors/codux/default.nix => by-name/co/codux/package.nix} (86%) create mode 100644 third_party/nixpkgs/pkgs/by-name/co/committed/package.nix rename third_party/nixpkgs/pkgs/{development/libraries/coost/default.nix => by-name/co/coost/package.nix} (55%) rename third_party/nixpkgs/pkgs/{servers/kanidm => by-name/co/cosmic-tasks}/Cargo.lock (56%) create mode 100644 third_party/nixpkgs/pkgs/by-name/co/cosmic-tasks/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/cr/criterion/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/cr/criterion/tests/001-version.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/cr/criterion/tests/test_dummy.c rename third_party/nixpkgs/pkgs/{development/tools/csvq/default.nix => by-name/cs/csvq/package.nix} (78%) rename third_party/nixpkgs/pkgs/{development/tools/dapr/cli/default.nix => by-name/da/dapr-cli/package.nix} (100%) rename third_party/nixpkgs/pkgs/{development/tools/darklua/default.nix => by-name/da/darklua/package.nix} (82%) create mode 100644 third_party/nixpkgs/pkgs/by-name/di/diffedit3/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/di/dillo/package.nix rename third_party/nixpkgs/pkgs/{applications/networking/browsers/dillong/default.nix => by-name/di/dillong/package.nix} (74%) rename third_party/nixpkgs/pkgs/{development/libraries/discord-gamesdk/default.nix => by-name/di/discord-gamesdk/package.nix} (84%) rename third_party/nixpkgs/pkgs/{tools/misc/dooit/default.nix => by-name/do/dooit/package.nix} (100%) rename third_party/nixpkgs/pkgs/{tools/security/doppler/default.nix => by-name/do/doppler/package.nix} (100%) rename third_party/nixpkgs/pkgs/{applications/misc => by-name/do}/downonspot/Cargo.lock.patch (100%) rename third_party/nixpkgs/pkgs/{applications/misc/downonspot/default.nix => by-name/do/downonspot/package.nix} (76%) create mode 100644 third_party/nixpkgs/pkgs/by-name/dp/dps8m/package.nix rename third_party/nixpkgs/pkgs/{tools/games/dualsensectl/default.nix => by-name/du/dualsensectl/package.nix} (56%) create mode 100644 third_party/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/e1/e1s/package.nix rename third_party/nixpkgs/pkgs/{development/tools/eclint/default.nix => by-name/ec/eclint/package.nix} (100%) rename third_party/nixpkgs/pkgs/{servers/endlessh-go/default.nix => by-name/en/endlessh-go/package.nix} (70%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ew/eww/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/fa/fasole/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/fa/fastahack/package.nix rename third_party/nixpkgs/pkgs/{tools/misc/fastfetch/default.nix => by-name/fa/fastfetch/package.nix} (85%) delete mode 100644 third_party/nixpkgs/pkgs/by-name/ff/ff2mpv-rust/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/by-name/ff/fflogs/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/fg/fgqcanvas/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/fi/find-billy/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/fl/flac123/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/fl/flashgbx/package.nix rename third_party/nixpkgs/pkgs/{applications/misc/flowtime/default.nix => by-name/fl/flowtime/package.nix} (92%) rename third_party/nixpkgs/pkgs/{tools/misc/fontfor/default.nix => by-name/fo/fontfor/package.nix} (65%) rename third_party/nixpkgs/pkgs/{applications/version-management => by-name/fo}/forgejo/package-json-npm-build-frontend.patch (58%) rename third_party/nixpkgs/pkgs/{applications/version-management/forgejo/default.nix => by-name/fo/forgejo/package.nix} (68%) rename third_party/nixpkgs/pkgs/{applications/version-management => by-name/fo}/forgejo/static-root-path.patch (60%) rename third_party/nixpkgs/pkgs/{applications/networking/p2p/fragments/default.nix => by-name/fr/fragments/package.nix} (60%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ft/fte/package.nix rename third_party/nixpkgs/pkgs/{applications/audio/furnace/default.nix => by-name/fu/furnace/package.nix} (66%) rename third_party/nixpkgs/pkgs/{applications/audio => by-name/fu}/furnace/update.sh (100%) rename third_party/nixpkgs/pkgs/{tools/misc/fzf/default.nix => by-name/fz/fzf/package.nix} (83%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ga/galah/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gb/gbsplay/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ge/gema/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gh/ghciwatch/package.nix rename third_party/nixpkgs/pkgs/{applications/version-management/git-standup/default.nix => by-name/gi/git-standup/package.nix} (72%) create mode 100644 third_party/nixpkgs/pkgs/by-name/gi/githooks/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gi/gitversion/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gl/glance/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gl/glsl_analyzer/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/go/go-cover-treemap/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/go/go-landlock/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/go/go-passbolt-cli/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/go/godot_4-export-templates/package.nix rename third_party/nixpkgs/pkgs/{applications/networking/browsers/google-chrome/default.nix => by-name/go/google-chrome/package.nix} (78%) create mode 100644 third_party/nixpkgs/pkgs/by-name/go/gophish/package.nix rename third_party/nixpkgs/pkgs/{applications/version-management/got/default.nix => by-name/go/got/package.nix} (77%) create mode 100644 third_party/nixpkgs/pkgs/by-name/gr/grafana-kiosk/package.nix rename third_party/nixpkgs/pkgs/{development/libraries/graphene-hardened-malloc/default.nix => by-name/gr/graphene-hardened-malloc/package.nix} (86%) create mode 100644 third_party/nixpkgs/pkgs/by-name/gr/greenmask/package.nix rename third_party/nixpkgs/pkgs/{tools/security/grype/default.nix => by-name/gr/grype/package.nix} (92%) create mode 100644 third_party/nixpkgs/pkgs/by-name/gt/gtk-session-lock/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ha/halo/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ha/hamtransfer/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ha/hashid/package.nix rename third_party/nixpkgs/pkgs/{development/tools/hatch/default.nix => by-name/ha/hatch/package.nix} (81%) create mode 100644 third_party/nixpkgs/pkgs/by-name/hb/hb-honeypot/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/he/hexedit/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/hi/hieroglyphic/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ht/httpie-desktop/package.nix rename third_party/nixpkgs/pkgs/{applications/logging/humioctl/default.nix => by-name/hu/humioctl/package.nix} (100%) delete mode 100644 third_party/nixpkgs/pkgs/by-name/hy/hyprdim/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/by-name/hy/hyprland-activewindow/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/hy/hyprland-workspaces/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ic/icnsify/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ig/igvm-tooling/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/im/imposm/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/is/iscc/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ja/jailer/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ji/jikken/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/jt/jtdx/package.nix rename third_party/nixpkgs/pkgs/{servers/kanidm/default.nix => by-name/ka/kanidm/package.nix} (79%) rename third_party/nixpkgs/pkgs/{applications/networking/cluster/karmor/default.nix => by-name/ka/karmor/package.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/kd/kdotool/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ke/keto/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ki/ki/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ki/ki/replace-deprecated-distutils-with-setuptools.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/ki/ki/update-to-newer-anki-versions.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/fix-isdev.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/mime-types.xml create mode 100644 third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/package.json create mode 100644 third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/update-react-i18next.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/ko/kotlin-interactive-shell/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/kt/ktfmt/pin-default-maven-plugin-versions.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/ky/kyua/kyua-check-hook.sh create mode 100644 third_party/nixpkgs/pkgs/by-name/ky/kyua/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/la/labwc-tweaks-gtk/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/la/laudanum/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lb/lbd/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lc/lc0/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libgedit-gfls/package.nix rename third_party/nixpkgs/pkgs/{development/libraries/tepl/default.nix => by-name/li/libgedit-tepl/package.nix} (51%) create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/meson.build create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/meson.options create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/nixpkgs_test.c create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libiff/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libilbm/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libmamba/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libmsgraph/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libsbml/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libscfg/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/license-go/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/lilipod/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/litmusctl/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lm/lms/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lm/lmstudio/darwin.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lm/lmstudio/linux.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lo/local-ai/lib.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lo/local-ai/module.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lu/lumafly/deps.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lu/lumafly/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lu/luneta/dub-lock.json create mode 100644 third_party/nixpkgs/pkgs/by-name/lu/luneta/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lu/lutok/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lx/lx-music-desktop/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lx/lxc/4428.diff rename third_party/nixpkgs/pkgs/{os-specific/linux => by-name/lx}/lxc/docbook-hack.patch (100%) rename third_party/nixpkgs/pkgs/{os-specific/linux/lxc/default.nix => by-name/lx/lxc/package.nix} (79%) create mode 100644 third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ma/mac-robber/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ma/makejinja/package.nix rename third_party/nixpkgs/pkgs/{applications/misc/mako/default.nix => by-name/ma/mako/package.nix} (65%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ma/marwaita-x/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ma/materialx/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ma/mathemagix/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ma/matugen/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ma/maxfetch/package.nix rename third_party/nixpkgs/pkgs/{applications/networking/mailreaders/meli/default.nix => by-name/me/meli/package.nix} (76%) rename third_party/nixpkgs/pkgs/{applications/emulators/melonDS/default.nix => by-name/me/melonDS/package.nix} (55%) rename third_party/nixpkgs/pkgs/{applications/emulators/mgba/default.nix => by-name/mg/mgba/package.nix} (87%) create mode 100644 third_party/nixpkgs/pkgs/by-name/mi/mimikatz/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/mi/missidentify/fix-darwin-build.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/mi/missidentify/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/mi/mixxc/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/mk/mkjson/generated.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/mk/mkjson/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/mo/mo/package.nix rename third_party/nixpkgs/pkgs/{development/tools/mold/default.nix => by-name/mo/mold/package.nix} (97%) create mode 100644 third_party/nixpkgs/pkgs/by-name/my/mysql84/no-force-outline-atomics.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/my/mysql84/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/na/nanoboyadvance/dont-fetch-glad.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/na/nanoboyadvance/package.nix rename third_party/nixpkgs/pkgs/{servers/misc/navidrome/default.nix => by-name/na/navidrome/package.nix} (88%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ne/nemu/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ne/neothesia/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/by-name/ne/neothesia/package.nix rename third_party/nixpkgs/pkgs/{applications/editors/neovim/neovide/default.nix => by-name/ne/neovide/package.nix} (100%) rename third_party/nixpkgs/pkgs/{applications/editors/neovim => by-name/ne}/neovide/skia-externals.json (100%) rename third_party/nixpkgs/pkgs/{applications/editors/neovim/default.nix => by-name/ne/neovim-unwrapped/package.nix} (99%) rename third_party/nixpkgs/pkgs/{applications/editors/neovim => by-name/ne/neovim-unwrapped}/system_rplugin_manifest.patch (100%) rename third_party/nixpkgs/pkgs/{applications/editors/neovim => by-name/ne/neovim-unwrapped}/treesitter-parsers.nix (100%) rename third_party/nixpkgs/pkgs/{applications/editors/neovim => by-name/ne/neovim-unwrapped}/update-treesitter-parsers.py (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/nf/nf-test/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ng/nginx-language-server/package.nix rename third_party/nixpkgs/pkgs/{servers/nginx-sso/default.nix => by-name/ng/nginx-sso/package.nix} (93%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ni/nibtools/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/no/nodeinfo/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/nr/nray/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/nx/nxengine-evo/assets.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/nx/nxengine-evo/package.nix rename third_party/nixpkgs/pkgs/{development/tools/oh-my-posh/default.nix => by-name/oh/oh-my-posh/package.nix} (89%) create mode 100644 third_party/nixpkgs/pkgs/by-name/on/onagre/package.nix rename third_party/nixpkgs/pkgs/{applications/networking/instant-messengers/discord/openasar.nix => by-name/op/openasar/package.nix} (54%) create mode 100644 third_party/nixpkgs/pkgs/by-name/op/openfga-cli/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/op/openfga/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/op/openpomodoro-cli/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/op/opensplat/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/op/openturns/package.nix rename third_party/nixpkgs/pkgs/{development/libraries/openvr/default.nix => by-name/op/openvr/package.nix} (92%) rename third_party/nixpkgs/pkgs/{os-specific/linux => by-name/op}/openvswitch/generic.nix (74%) rename third_party/nixpkgs/pkgs/{os-specific/linux => by-name/op}/openvswitch/lts.nix (100%) rename third_party/nixpkgs/pkgs/{os-specific/linux/openvswitch/default.nix => by-name/op/openvswitch/package.nix} (100%) rename third_party/nixpkgs/pkgs/{os-specific/linux => by-name/op}/openvswitch/patches/disable-bash-arg-completion-test.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/op/openvswitch/patches/fix-python313.patch rename third_party/nixpkgs/pkgs/{os-specific/linux => by-name/op}/openvswitch/update.nu (81%) create mode 100644 third_party/nixpkgs/pkgs/by-name/or/orca/fix-paths.patch rename third_party/nixpkgs/pkgs/{applications/misc/orca/default.nix => by-name/or/orca/package.nix} (83%) rename third_party/nixpkgs/pkgs/{development/tools/misc/pahole/default.nix => by-name/pa/pahole/package.nix} (100%) rename third_party/nixpkgs/pkgs/{development/tools/misc => by-name/pa}/pahole/threading-reproducibility.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/pa/paperless-asn-qr-codes/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/pa/papers/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/by-name/pa/papers/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/pa/parallel-hashmap/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/pa/parsedmarc/package.nix rename third_party/nixpkgs/pkgs/{servers/dns/pdns-recursor/default.nix => by-name/pd/pdns-recursor/package.nix} (94%) create mode 100644 third_party/nixpkgs/pkgs/by-name/pi/pingtunnel/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/po/pokemon-cursor/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/po/pom/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/po/portablemc/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/po/portablemc/use-builtin-java.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/pr/pragtical/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/pr/private-gpt/package.nix rename third_party/nixpkgs/pkgs/{development/tools/protoc-gen-rust/default.nix => by-name/pr/protoc-gen-rust/package.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/pr/protonplus/package.nix rename third_party/nixpkgs/pkgs/{tools/system/ps_mem/default.nix => by-name/ps/ps_mem/package.nix} (55%) create mode 100644 third_party/nixpkgs/pkgs/by-name/pt/ptyxis/package.nix rename third_party/nixpkgs/pkgs/{development/quickemu/default.nix => by-name/qu/quickemu/package.nix} (74%) rename third_party/nixpkgs/pkgs/{servers/radicale/3.x.nix => by-name/ra/radicale/package.nix} (91%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ra/radicle-node/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/re/redka/package.nix rename third_party/nixpkgs/pkgs/by-name/re/{redocly-cli => redocly}/package.nix (64%) rename third_party/nixpkgs/pkgs/{development/tools/refinery-cli/default.nix => by-name/re/refinery-cli/package.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/re/regal/package.nix rename third_party/nixpkgs/pkgs/{development/interpreters/renpy/default.nix => by-name/re/renpy/package.nix} (57%) rename third_party/nixpkgs/pkgs/{development/interpreters => by-name/re}/renpy/shutup-erofs-errors.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/re/retrospy/deps.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/re/retrospy/package.nix create mode 100755 third_party/nixpkgs/pkgs/by-name/re/retrospy/update.sh create mode 100644 third_party/nixpkgs/pkgs/by-name/rh/rHttp/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ri/ride/mk.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/ri/ride/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ri/rifiuti/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ri/river-filtile/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/rk/rkboot/package.nix rename third_party/nixpkgs/pkgs/{servers/rmfakecloud/default.nix => by-name/rm/rmfakecloud/package.nix} (100%) rename third_party/nixpkgs/pkgs/{servers => by-name/rm}/rmfakecloud/webui.nix (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/rt/rtaudio_6/package.nix rename third_party/nixpkgs/pkgs/{tools/system/s0ix-selftest-tool/default.nix => by-name/s0/s0ix-selftest-tool/package.nix} (50%) rename third_party/nixpkgs/pkgs/{servers/sabnzbd/default.nix => by-name/sa/sabnzbd/package.nix} (90%) create mode 100644 third_party/nixpkgs/pkgs/by-name/sa/sarif-tools/package.nix rename third_party/nixpkgs/pkgs/{development/tools/misc/scc/default.nix => by-name/sc/scc/package.nix} (61%) create mode 100644 third_party/nixpkgs/pkgs/by-name/sc/scenefx/package.nix rename third_party/nixpkgs/pkgs/{applications/science/math/scotch/default.nix => by-name/sc/scotch/package.nix} (64%) create mode 100644 third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer/package.nix rename third_party/nixpkgs/pkgs/{development/libraries/SDL2_mixer => by-name/sd/SDL2_mixer_2_0}/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/sd/SDL2_net/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/sh/shell-gpt/package.nix rename third_party/nixpkgs/pkgs/{applications/video/showmethekey/default.nix => by-name/sh/showmethekey/package.nix} (74%) create mode 100644 third_party/nixpkgs/pkgs/by-name/si/siyuan/package-lock.json create mode 100644 third_party/nixpkgs/pkgs/by-name/si/siyuan/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/si/siyuan/set-pandoc-path.patch rename third_party/nixpkgs/pkgs/{data/fonts/sketchybar-app-font/default.nix => by-name/sk/sketchybar-app-font/package.nix} (92%) rename third_party/nixpkgs/pkgs/{os-specific/darwin/sketchybar/default.nix => by-name/sk/sketchybar/package.nix} (61%) rename third_party/nixpkgs/pkgs/{os-specific/darwin => by-name/sk}/skhd/org.nixos.skhd.plist (100%) rename third_party/nixpkgs/pkgs/{os-specific/darwin/skhd/default.nix => by-name/sk/skhd/package.nix} (70%) create mode 100644 third_party/nixpkgs/pkgs/by-name/sk/skimpdf/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/sl/slumber/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/sm/smpq/package.nix rename third_party/nixpkgs/pkgs/{applications/emulators/snes9x/default.nix => by-name/sn/snes9x/package.nix} (51%) create mode 100644 third_party/nixpkgs/pkgs/by-name/sp/spectral-language-server/package.json create mode 100644 third_party/nixpkgs/pkgs/by-name/sp/spectral-language-server/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ss/sse2neon/package.nix rename third_party/nixpkgs/pkgs/{development/libraries/stduuid/default.nix => by-name/st/stduuid/package.nix} (51%) create mode 100644 third_party/nixpkgs/pkgs/by-name/st/step-cli/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/st/stlink-tool/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/su/superfile/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/fix-paths.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/load-configuration-from-etc.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/sway-config-nixos-paths.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/sway-config-no-nix-store-references.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/.gitignore create mode 100644 third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.toml create mode 100644 third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/build.rs create mode 100644 third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs rename third_party/nixpkgs/pkgs/{tools/admin/syft/default.nix => by-name/sy/syft/package.nix} (93%) create mode 100644 third_party/nixpkgs/pkgs/by-name/sy/symphony/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ta/taler-exchange/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ta/taler-merchant/package.nix rename third_party/nixpkgs/pkgs/{development/tools/analysis/tartan/default.nix => by-name/ta/tartan/package.nix} (67%) create mode 100644 third_party/nixpkgs/pkgs/by-name/td/tdnf/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/te/termsonic/package.nix rename third_party/nixpkgs/pkgs/{applications/networking/cluster/terraform-compliance/default.nix => by-name/te/terraform-compliance/package.nix} (100%) rename third_party/nixpkgs/pkgs/{applications/networking/cluster/terragrunt/default.nix => by-name/te/terragrunt/package.nix} (85%) delete mode 100644 third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/package.json delete mode 100644 third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/yarn.lock create mode 100644 third_party/nixpkgs/pkgs/by-name/th/the-powder-toy/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ti/tiny-dfr/package.nix delete mode 100644 third_party/nixpkgs/pkgs/by-name/tk/tkdiff/189.patch delete mode 100644 third_party/nixpkgs/pkgs/by-name/tk/tkdiff/194.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/to/torctl/package.nix delete mode 100644 third_party/nixpkgs/pkgs/by-name/tp/tplay/cargo.diff create mode 100644 third_party/nixpkgs/pkgs/by-name/tr/trak/package.nix rename third_party/nixpkgs/pkgs/{development/tools/treefmt/default.nix => by-name/tr/treefmt/package.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/tr/treefmt2/package.nix rename third_party/nixpkgs/pkgs/{applications/networking/p2p/tribler/default.nix => by-name/tr/tribler/package.nix} (53%) create mode 100644 third_party/nixpkgs/pkgs/by-name/tr/trickest-cli/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/tt/tt/package.nix rename third_party/nixpkgs/pkgs/{development/tools/twiggy/default.nix => by-name/tw/twiggy/package.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/uc/ucblogo/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ue/ueviewer/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/uh/uhttpmock_1_0/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/un/unipicker/package.nix rename third_party/nixpkgs/pkgs/{development/tools/upbound/default.nix => by-name/up/upbound/package.nix} (80%) create mode 100644 third_party/nixpkgs/pkgs/by-name/up/ups/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/us/ustr/package.nix rename third_party/nixpkgs/pkgs/{development/libraries => by-name/us}/ustr/va_args.patch (100%) rename third_party/nixpkgs/pkgs/{servers/uxplay/default.nix => by-name/ux/uxplay/package.nix} (70%) create mode 100644 third_party/nixpkgs/pkgs/by-name/va/vale-ls/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/va/valkey/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/va/valkey/use_system_jemalloc.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/va/valuta/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/vd/vdhcoapp/ffmpeg-filepicker.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/vd/vdhcoapp/filepicker.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/vd/vdhcoapp/package.nix rename third_party/nixpkgs/pkgs/{applications/editors/vis/default.nix => by-name/vi/vis/package.nix} (94%) rename third_party/nixpkgs/pkgs/{tools/package-management/wapm/cli/default.nix => by-name/wa/wapm/package.nix} (86%) create mode 100644 third_party/nixpkgs/pkgs/by-name/wa/waybar/package.nix rename third_party/nixpkgs/pkgs/{applications/misc/wbg/default.nix => by-name/wb/wbg/package.nix} (93%) rename third_party/nixpkgs/pkgs/{applications/networking/instant-messengers/webcord => by-name/we}/webcord-vencord/add-extension.patch (100%) rename third_party/nixpkgs/pkgs/{applications/networking/instant-messengers/webcord/webcord-vencord/default.nix => by-name/we/webcord-vencord/package.nix} (53%) rename third_party/nixpkgs/pkgs/{applications/networking/instant-messengers/webcord/default.nix => by-name/we/webcord/package.nix} (50%) create mode 100755 third_party/nixpkgs/pkgs/by-name/we/webcord/update.sh create mode 100644 third_party/nixpkgs/pkgs/by-name/wi/windows10-icons/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/wi/wireviz/package.nix rename third_party/nixpkgs/pkgs/{development/tools/wizer/default.nix => by-name/wi/wizer/package.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/wl/wl-clip-persist/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/wl/wljoywake/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/wo/wowup-cf/package.nix rename third_party/nixpkgs/pkgs/{tools/wayland/wpaperd/default.nix => by-name/wp/wpaperd/package.nix} (63%) rename third_party/nixpkgs/pkgs/{applications/misc/wttrbar/default.nix => by-name/wt/wttrbar/package.nix} (81%) rename third_party/nixpkgs/pkgs/{servers/caddy => by-name/xc}/xcaddy/inject_version_info.diff (100%) rename third_party/nixpkgs/pkgs/{servers/caddy/xcaddy/default.nix => by-name/xc/xcaddy/package.nix} (89%) rename third_party/nixpkgs/pkgs/{servers/caddy => by-name/xc}/xcaddy/use_tmpdir_on_darwin.diff (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/xh/xhosts/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/by-name/xh/xhosts/package.nix rename third_party/nixpkgs/pkgs/{applications/misc/xlights/default.nix => by-name/xl/xlights/package.nix} (59%) rename third_party/nixpkgs/pkgs/{development/libraries/xml-tooling-c/default.nix => by-name/xm/xml-tooling-c/package.nix} (53%) create mode 100644 third_party/nixpkgs/pkgs/by-name/xn/xnlinkfinder/package.nix rename third_party/nixpkgs/pkgs/{tools/X11/xpointerbarrier/default.nix => by-name/xp/xpointerbarrier/package.nix} (65%) rename third_party/nixpkgs/pkgs/{os-specific/darwin/yabai/default.nix => by-name/ya/yabai/package.nix} (57%) rename third_party/nixpkgs/pkgs/{tools/wayland/ydotool/default.nix => by-name/yd/ydotool/package.nix} (55%) create mode 100644 third_party/nixpkgs/pkgs/by-name/yo/yofi/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/yo/your_spotify/client.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/yo/your_spotify/package.json create mode 100644 third_party/nixpkgs/pkgs/by-name/yo/your_spotify/package.nix rename third_party/nixpkgs/pkgs/{applications/misc/onagre => by-name/yt/ytermusic}/Cargo.lock (55%) create mode 100644 third_party/nixpkgs/pkgs/by-name/yt/ytermusic/package.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch delete mode 100644 third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/cairo/ensure-consistency-of-cargo-lock.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/corretto/21.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/dart/package-source-builders/sqlcipher_flutter_libs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/dart/package-source-builders/sqlite3/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/dotnet/record-downloaded-packages.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ghc/9.10.1.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.9/0001-skip-building-doc.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/16/llvm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/17/llvm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/common/libcxxabi/no-threads.patch rename third_party/nixpkgs/pkgs/development/compilers/llvm/{18 => common}/llvm/default.nix (66%) delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-feature.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-tests.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/patches/force-unwrap-file-handles.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/zz/Cargo.lock delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/zz/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/coq-modules/ssprove/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/patches/git-annex-no-usr-prefix.patch delete mode 100644 third_party/nixpkgs/pkgs/development/interpreters/erlang/27-rc2.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/erlang/27-rc3.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/lua-5/utils.sh delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/2_0.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/babl/dev-prefix.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/criterion/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/gjs/disable-introspection-test.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/glib/skip-timer-test.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libmodulemd/glib-devdoc.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libopus/fix-pkg-config-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libtiff/4.5.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libtiff/headers-4.5.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libtiff/libtiff_t.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libtiff/rename-version-4.5.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/disable-x11com.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/openturns/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquick3d.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/rnnoise/model-version.json delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/ustr/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/.gitattributes delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/.gitignore delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/api.md delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/nix-cl.md delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/quicklisp.md delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/quirks.md delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/abcl-package-set.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/abcl-with-packages.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/bordeaux-threads.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/sbcl-with-bt.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/api.lisp delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/database/sqlite.lisp delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/init.sql delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/main.lisp delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/nix.lisp delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/org.lispbuilds.nix.asd delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/repository/quicklisp.lisp delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/util.lisp delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/imported.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/lisp-packages.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/old-make-wrapper.sh delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/packages.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cffi-libffi-darwin-ffi-h.patch delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cl-freetype2-fix-grovel-includes.patch delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cl-liballegro-nuklear-missing-dll.patch delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cl-sat.glucose-binary-from-PATH-if-present.patch delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/magicl-dont-build-fortran-twice.patch delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/swank-pure-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/ql-import.lisp delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/ql.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/readme.md delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/shell.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/test/lispPackagesToTest.txt delete mode 100755 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/test/test.lisp delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/README.txt delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/asdf/2.26.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/asdf/3.1.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/asdf/default.nix delete mode 100755 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/build-with-lisp.sh delete mode 100755 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/cl-wrapper.sh delete mode 100755 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/common-lisp.sh delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/setup-hook.sh delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/define-package.nix delete mode 100755 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/asdf-description.sh delete mode 100755 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/barebones-quicklisp-expression.sh delete mode 100755 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/quicklisp-beta-env.sh delete mode 100755 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/quicklisp-dependencies.sh delete mode 100755 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/urls-from-page.sh delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/lisp-packages.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/openssl-lib-marked.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/_1am.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/_3bmd.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/access.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/acclimation.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/agutil.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/alexandria.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/anaphora.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/arnesi.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/array-operations.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/array-utils.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/arrows.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/asdf-package-system.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/asdf-system-connections.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/babel.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/binomial-heap.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/binpack.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/blackbird.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/bordeaux-threads.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/buildnode-xhtml.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/buildnode.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/calispel.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi-grovel.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi-toolchain.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi-uffi-compat.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/chanl.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/check-it.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/chipz.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/chunga.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/circular-streams.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-aa.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-annot.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-anonfun.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ansi-text.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ascii-table.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-async-repl.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-async-ssl.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-async.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-base64.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-change-case.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cli.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-colors.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-colors2.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-containers.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cookie.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-css.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-csv.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cuda.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-custom-hash-table.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-dbi.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-difflib.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-digraph.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-dot.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-emb.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-environments.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fad.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-form-types.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fuse-meta-fs.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fuse.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fuzz.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-geometry.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-gobject-introspection.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-heap.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-hooks.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-html-diff.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-html-parse.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-html5-parser.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-interpol.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-jpeg.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-json.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-l10n-cldr.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-l10n.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-libuv.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-locale.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-markup.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-mustache.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-mysql.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-num-utils.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-paths-ttf.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-paths.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-pattern.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-pdf.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-postgres.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-postgres_plus_local-time.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ppcre-template.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ppcre-unicode.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ppcre.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-prevalence.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-project.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-protobufs.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-qprint.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-qrencode.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-reexport.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-semver.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-shellwords.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-slice.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-smt-lib.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-smtp.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-speedy-queue.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-store.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-svg.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax-annot.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax-anonfun.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax-markup.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syslog.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-test-more.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-typesetting.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-unicode.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-unification.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-utilities.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-vectors.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-webkit2.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-who.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-xmlspam.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl_plus_ssl.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack-handler-hunchentoot.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack-socket.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack-test.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/classowary.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clfswm.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/closer-mop.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/closure-common.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/closure-html.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-postgresql-socket.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-postgresql.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-sqlite3.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-uffi.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clss.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clump-2-3-tree.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clump-binary-tree.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clump.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clunit.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clunit2.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clx.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/collectors.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/colorize.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/command-line-arguments.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-lite.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-selectors-simple-tree.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-selectors-stp.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-selectors.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cxml-stp.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cxml.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/data-frame.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/data-table.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbd-mysql.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbd-postgres.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbd-sqlite3.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbi-test.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbi.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbus.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/defclass-std.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dexador.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dfio.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dissect.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/djula.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/do-urlencode.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/documentation-utils.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/drakma.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/eager-future2.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/enchant.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/esrap-peg.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/esrap.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/external-program.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-csv.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-mop.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote-extras.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote-optima.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote-readtable.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-utils.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fast-http.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fast-io.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fiasco.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/file-attributes.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fiveam.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/flexi-streams.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/float-features.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/flow.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fn.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/form-fiddle.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fset.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_arithmetic.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_collector.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_comparison.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_container.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_internal.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_iterator.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_lazy-seq.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_map.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_math.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_object.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_sequence.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_set.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/gettext.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/global-vars.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/glsl-docs.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/glsl-spec.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/glsl-symbols.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/heap.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/html-encode.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/http-body.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_common-lisp.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_common.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_def_plus_swank.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil_plus_swank.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hunchensocket.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hunchentoot.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/idna.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/ieee-floats.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/inferior-shell.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/introspect-environment.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_asdf.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_base.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_common-lisp.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_conf.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_grovel.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/ironclad.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iterate.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jonathan.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jpl-queues.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jpl-util.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jsown.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/kmrcl.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack-component.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack-middleware-backtrace.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack-util.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lambda-fiddle.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/legit.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/let-plus.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lev.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-client.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-common.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-server.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-ssl.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lift.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-binary.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-namespace.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-stat.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-unit.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-unit2.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lla.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/local-time.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/log4cl.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lparallel.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lquery.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/make-hash.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/map-set.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/marshal.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/md5.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/metabang-bind.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/metatilities-base.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mgl-pax.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/minheap.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/misc-extensions.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mk-string-metrics.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mmap.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/moptilities.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/more-conditions.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mt19937.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/myway.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/named-readtables.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/nbd.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/net-telent-date.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/nibbles.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/num-utils.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/optima.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/osicat.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parachute.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parenscript.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parse-float.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parse-number.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parseq.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parser-combinators.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parser_dot_common-rules.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/pcall-queue.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/pcall.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/physical-quantities.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/plump.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/postmodern.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/proc-parse.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/prove-asdf.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/prove.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/ptester.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/puri.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/pythonic-string-reader.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/quasiquote-2_dot_0.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/query-fs.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/quri.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/rfc2388.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/rove.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/rt.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/s-sql.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/s-sysdeps.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/s-xml.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/salza2.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/select.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/serapeum.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-date-time.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-date.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-inferiors.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-tasks.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/slynk.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/smart-buffer.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/smug.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/spinneret.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/split-sequence.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/sqlite.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/static-dispatch.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/static-vectors.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/stefil.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/str.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/string-case.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/stumpwm.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/swank.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/swap-bytes.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/sycamore.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/symbol-munger.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trees.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_balland2006.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_level0.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_level1.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_level2.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_quasiquote.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_trivial.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-arguments.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-backtrace.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-clipboard.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-cltl2.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-features.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-file-size.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-garbage.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-gray-streams.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-indent.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-macroexpand-all.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-main-thread.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-mimes.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-package-local-nicknames.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-shell.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-types.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-utf-8.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-with-current-source-form.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/type-i.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uax-15.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uffi.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uiop.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/unit-test.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/unix-options.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/unix-opts.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/usocket-server.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/usocket.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/utilities_dot_print-items.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/utilities_dot_print-tree.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uuid.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/varjo.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/vas-string-metrics.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/vecto.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/vom.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/wild-package-inferred-system.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/woo.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/wookie.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xembed.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xkeyboard.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xml_dot_location.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xmls.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xpath.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xsubseq.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/yacc.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/yason.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/zpb-ttf.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/zpng.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-overrides.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-systems.txt delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix.nix delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/invocation.emb delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/nix-package.emb delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/parasitic-invocation.emb delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/ql-to-nix.lisp delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/quicklisp-bootstrap.lisp delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/system-info.lisp delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/top-package.emb delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/util.lisp delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp.sh delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/shell.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/binning/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/biotk/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/old.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/1_x.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/ninja_utils/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/streaming/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiohttp-isal/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiohttp-session/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiomcache/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/airtouch5py/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/attacut/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/avwx-engine/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{backports_shutil_get_terminal_size => backports-shutil-get-terminal-size}/default.nix (95%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/test.ipynb create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/binance-connector/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/biom-format/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/biopython/close_parser_on_time.patch delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cloudevents/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/conda-libmamba-solver/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/conda-package-handling/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/conda-package-streaming/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/conda/0001-conda_exe.patch delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/curl-cffi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/curl-cffi/use-system-libs.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/customtkinter/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dbus-python/fix-includedir.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dissect-archive/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dm-control/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/drawsvg/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/remote_data.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/epitran/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/eventlet/remove-distutils-usage.patch delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/filedate/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/gguf/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/git-versioner/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/globre/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/glymur/set-lib-paths.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/h5py/mpi4py-requirement.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/hikari-lightbulb/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/httpx-sse/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/httpx-ws/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/isal/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/iterable-io/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/kornia-rs/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/kornia-rs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/kornia-rs/kornia-rs-from-crates.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/kserve/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/lib4sbom/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/libgravatar/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/libmambapy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/loadcredential/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/manga-ocr/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/manga-ocr/package_data.patch rename third_party/nixpkgs/pkgs/{applications/video => development/python-modules}/manim/default.nix (84%) rename third_party/nixpkgs/pkgs/{applications/video => development/python-modules}/manim/failing_tests.nix (100%) rename third_party/nixpkgs/pkgs/{applications/video => development/python-modules}/manim/pytest-report-header.patch (100%) delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/miasm/0001-setup.py-use-valid-semver.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/miasm/0002-core-remove-IDAPython-dependency.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/miasm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/minari/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mkdocs-simple-hooks/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mpegdash/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/nanobind/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/nbmake/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/nose-xunitmp/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/numpy/0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/objax/replace-deprecated-device_buffers.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/optree/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/panphon/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pathlib/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pcffont/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pettingzoo/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/phunspell/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pip-system-certs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pipe/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/portion/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pretty-errors/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/private-gpt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pwkit/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pxml/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pycomm3/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/fix-dependency-finding.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/skip-surface-tests.patch delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyjson5/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pynotifier/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyqtdarktheme/add-missing-argument-to-the-proxy-style-initializer.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyqtdarktheme/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytest-markdown-docs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-homeassistant-analytics/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pywavefront/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/quantile-forest/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/quixote/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/reportlab-qrcode/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/rlcard/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/rubicon-objc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sanix/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sarif-tools/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/shimmy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/spylls/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sqlite-anyio/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ssg/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/timing-asgi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tinytuya/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/torchsnapshot/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/truncnorm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/uart-devices/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/units/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/uxsim/add-qt-plugin-path-to-env.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/uxsim/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/argc/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/darwin_sleep.patch delete mode 100644 third_party/nixpkgs/pkgs/development/tools/cdecl/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/electron/binary/info.json delete mode 100755 third_party/nixpkgs/pkgs/development/tools/electron/binary/print-hashes.sh create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/nix-check.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/dotnet/data.json create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/dotnet/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/go/data.json create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/go/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/html-report/data.json create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/html-report/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/java/data.json create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/java/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/js/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/ruby/data.json create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/ruby/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/screenshot/data.json create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/screenshot/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/xml-report/data.json create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/plugins/xml-report/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gauge/wrapper.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/pkg-config.patch delete mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/0_6_1.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/0_7_1.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/0_7_4.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/buildPgxExtension.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch rename third_party/nixpkgs/pkgs/development/web/nodejs/{v21.nix => v22.nix} (79%) delete mode 100644 third_party/nixpkgs/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch create mode 100644 third_party/nixpkgs/pkgs/games/eduke32/convert-bmp-to-png.diff delete mode 100644 third_party/nixpkgs/pkgs/games/nxengine-evo/default.nix delete mode 100644 third_party/nixpkgs/pkgs/games/the-powder-toy/default.nix create mode 100644 third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/hardcode-sshfs-path.patch create mode 100644 third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/remove-ssh-dss.patch create mode 100644 third_party/nixpkgs/pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/package-set.nix rename third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/{pkgs/compat => patches/13.1}/compat-fix-typedefs-locations.patch (100%) rename third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/{pkgs/compat => patches/13.1}/compat-install-dirs.patch (100%) rename third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/{pkgs/libc => patches/13.1}/libc-msun-arch-subdir.patch (100%) rename third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/{pkgs/libc => patches/13.1}/libc-no-force--lcompiler-rt.patch (100%) rename third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/{pkgs/libnetbsd => patches/13.1}/libnetbsd-do-install.patch (100%) rename third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/{pkgs/libc => patches/13.1}/librpcsvc-include-subdir.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/mtree-Makefile.patch rename third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/{pkgs/include => patches/13.1}/no-perms-BSD.include.dist.patch (100%) rename third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/{pkgs/sys => patches/13.1}/sys-gnu-date.patch (100%) rename third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/{pkgs/sys => patches/13.1}/sys-no-explicit-intrinsics-dep.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/bmake-no-compiler-rt.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-fix-typedefs-locations.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-install-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/install-bootstrap-Makefile.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-msun-arch-subdir.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-no-force--lcompiler-rt.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libnetbsd-do-install.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/librpcsvc-include-subdir.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/mtree-Makefile.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/no-perms-BSD.include.dist.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/rtld-no-force--lcompiler-rt.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-gnu-date.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-no-explicit-intrinsics-dep.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkcsmapper.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkesdb.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/column.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/common.nix rename third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/{ => pkgs/compat}/compat-cxx-safe-header.patch (100%) rename third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/{ => pkgs/compat}/compat-dont-configure-twice.patch (100%) rename third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/{ => pkgs/compat}/compat-no-force-native.patch (100%) rename third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/{ => pkgs/compat}/compat-setup-hook.sh (100%) rename third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/{ => pkgs/compat}/libbsd-overlay.pc (100%) create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/config.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix rename third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/{ => pkgs/fts}/fts-setup-hook.sh (100%) create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix rename third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/{ => pkgs/getent}/getent.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/headers.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/include.nix rename third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/{ => pkgs/install}/install-setup-hook.sh (100%) create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/headers.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix rename third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/{ => pkgs/locale}/locale.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/make.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/man.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/package.nix rename third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/{ => pkgs/netbsdSetupHook}/setup-hook.sh (87%) create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/stat/hook.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix rename third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/{ => pkgs/sys}/no-dynamic-linker.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix rename third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/{ => pkgs/sys}/sys-headers-incsdir.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/ena/override-features-api-detection.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/upgrade-file.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/linux-6-4-compat.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/lxc/add-meson-options.patch rename third_party/nixpkgs/pkgs/os-specific/linux/{vm-tools => mm-tools}/default.nix (84%) delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/nftables/fix-py-libnftables.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/nftables/python.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/rtl8852au/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/rtl8852bu/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/cppmicroservices-no-mtime.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/disable-downloads.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/tests.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/deps.patch delete mode 100644 third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/yarn.lock create mode 100644 third_party/nixpkgs/pkgs/servers/etcd/README.md create mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/ntfy/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/tuya_local/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/dont-call-git.patch create mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.json create mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/decluttering-card/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/valetudo-map-card/remove-git-dependency.patch create mode 100755 third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh rename third_party/nixpkgs/pkgs/servers/home-assistant/{parse-requirements.py => update-component-packages.py} (99%) delete mode 100644 third_party/nixpkgs/pkgs/servers/jellyfin/disable-warnings.patch create mode 100644 third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state/Cargo.lock rename third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/{rust-synapse-compress-state.nix => rust-synapse-compress-state/default.nix} (67%) rename third_party/nixpkgs/pkgs/servers/nextcloud/packages/{26.json => 29.json} (74%) delete mode 100644 third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/promscale_extension.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch delete mode 100644 third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch create mode 100644 third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/paths-for-split-outputs.patch rename third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/{findstring.patch => paths-with-postgresql-suffix.patch} (65%) rename third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/{disable-normalize_exec_path.patch => relative-to-symlinks-16+.patch} (75%) create mode 100644 third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/relative-to-symlinks.patch rename third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/{socketdir-in-run-13.patch => socketdir-in-run-13+.patch} (51%) delete mode 100644 third_party/nixpkgs/pkgs/servers/sunshine/dont-build-webui.patch delete mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/discourse/assets_esbuild_from_path.patch delete mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch create mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/kavita/restore-migrations.diff create mode 100755 third_party/nixpkgs/pkgs/servers/x11/xorg/update.py create mode 100644 third_party/nixpkgs/pkgs/shells/fish/plugins/git-abbr.nix create mode 100644 third_party/nixpkgs/pkgs/shells/fish/plugins/gruvbox.nix create mode 100644 third_party/nixpkgs/pkgs/tools/admin/azure-cli/extensions-manual.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/admin/gam/signal_files_as_env_vars.patch create mode 100644 third_party/nixpkgs/pkgs/tools/audio/goxlr-utility/Cargo.lock delete mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock delete mode 100644 third_party/nixpkgs/pkgs/tools/llm/shell_gpt/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/maker-panel/update-gerber-types-to-0.3.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/otel-cli/patches/bin-echo-patch.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/turbo/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/tools/misc/turbo/wrapper.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/curl/8.7.1-compression-fix.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/dibbler/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/ferm/import-ferm-wrapped.patch create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/lix/common.nix create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/lix/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/lix/doc/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/2.19.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/package-management/nix/patches/2_3/CVE-2024-27297.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/security/afl/README.md delete mode 100644 third_party/nixpkgs/pkgs/tools/security/afl/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/afl/libdislocator.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/afl/qemu-patches/no-etc-install.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff delete mode 100644 third_party/nixpkgs/pkgs/tools/security/afl/qemu.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/bpb/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/cve-bin-tool/no-gsutil-python-dependency.patch create mode 100644 third_party/nixpkgs/pkgs/tools/security/ecdsatool/ctype-header-c99-implicit-function-declaration.patch create mode 100644 third_party/nixpkgs/pkgs/tools/security/ecdsatool/openssl-header-c99-implicit-function-declaration.patch create mode 100644 third_party/nixpkgs/pkgs/tools/security/isolate/take-config-file-from-env.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/security/step-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/patchutils/Revert-Fix-grepdiff-test.patch create mode 100644 third_party/nixpkgs/pkgs/tools/wayland/aw-watcher-window-wayland/rustc-serialize-fix.patch create mode 100644 third_party/nixpkgs/pkgs/tools/wayland/sirula/Cargo.lock delete mode 100644 third_party/nixpkgs/pkgs/tools/wayland/wl-clip-persist/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/wayland/wpaperd/Cargo.lock diff --git a/third_party/nixpkgs/.git-blame-ignore-revs b/third_party/nixpkgs/.git-blame-ignore-revs index 219efb6e2a..c0a31e826a 100644 --- a/third_party/nixpkgs/.git-blame-ignore-revs +++ b/third_party/nixpkgs/.git-blame-ignore-revs @@ -105,3 +105,12 @@ fb0e5be84331188a69b3edd31679ca6576edb75a # {pkgs/development/cuda-modules,pkgs/test/cuda,pkgs/top-level/cuda-packages.nix}: reformat all CUDA files with nixfmt-rfc-style 2023-03-01 802a1b4d3338f24cbc4efd704616654456d75a94 + +# postgresql: move packages.nix to ext/default.nix +719034f6f6749d624faa28dff259309fc0e3e730 + +# pkgs/os-specific/bsd: Reformat with nixfmt-rfc-style 2024-03-01 +3fe3b055adfc020e6a923c466b6bcd978a13069a + +# k3s: format with nixfmt-rfc-style +6cfcd3c75428ede517bc6b15a353d704837a2830 diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 7ddc221d21..47d5d399f1 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -13,7 +13,6 @@ # GitHub actions /.github/workflows @NixOS/Security @Mic92 @zowoq -/.github/workflows/merge-staging @FRidh # EditorConfig /.editorconfig @Mic92 @zowoq @@ -42,7 +41,7 @@ /pkgs/top-level/splice.nix @Ericson2314 /pkgs/top-level/release-cross.nix @Ericson2314 /pkgs/stdenv/generic @Ericson2314 -/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @piegamesde +/pkgs/stdenv/generic/check-meta.nix @Ericson2314 /pkgs/stdenv/cross @Ericson2314 /pkgs/build-support/cc-wrapper @Ericson2314 /pkgs/build-support/bintools-wrapper @Ericson2314 @@ -125,10 +124,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius @ma27 /pkgs/common-updater/scripts/update-source-version @jtojnar # Python-related code and docs -/maintainers/scripts/update-python-libraries @FRidh -/pkgs/development/interpreters/python @FRidh -/doc/languages-frameworks/python.section.md @FRidh @mweinelt -/pkgs/development/interpreters/python/hooks @FRidh @jonringer +/doc/languages-frameworks/python.section.md @mweinelt +/pkgs/development/interpreters/python/hooks @jonringer # Haskell /doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn @ncfavier @@ -140,18 +137,14 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius @ma27 /pkgs/top-level/haskell-packages.nix @sternenseemann @maralorn @ncfavier # Perl -/pkgs/development/interpreters/perl @stigtsp @zakame @dasJ -/pkgs/top-level/perl-packages.nix @stigtsp @zakame @dasJ -/pkgs/development/perl-modules @stigtsp @zakame @dasJ +/pkgs/development/interpreters/perl @stigtsp @zakame @dasJ @marcusramberg +/pkgs/top-level/perl-packages.nix @stigtsp @zakame @dasJ @marcusramberg +/pkgs/development/perl-modules @stigtsp @zakame @dasJ @marcusramberg # R /pkgs/applications/science/math/R @jbedo /pkgs/development/r-modules @jbedo -# Ruby -/pkgs/development/interpreters/ruby @marsam -/pkgs/development/ruby-modules @marsam - # Rust /pkgs/development/compilers/rust @Mic92 @zowoq @winterqt @figsoda /pkgs/build-support/rust @zowoq @winterqt @figsoda @@ -198,7 +191,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel # PostgreSQL and related stuff -/pkgs/servers/sql/postgresql @thoughtpolice @marsam +/pkgs/servers/sql/postgresql @thoughtpolice /nixos/modules/services/databases/postgresql.xml @thoughtpolice /nixos/modules/services/databases/postgresql.nix @thoughtpolice /nixos/tests/postgresql.nix @thoughtpolice @@ -312,13 +305,6 @@ nixos/modules/services/networking/networkmanager.nix @Janik-Haag # terraform providers /pkgs/applications/networking/cluster/terraform-providers @zowoq -# Matrix -/pkgs/servers/heisenbridge @piegamesde -/pkgs/servers/matrix-conduit @piegamesde -/nixos/modules/services/misc/heisenbridge.nix @piegamesde -/nixos/modules/services/misc/matrix-conduit.nix @piegamesde -/nixos/tests/matrix-conduit.nix @piegamesde - # Forgejo nixos/modules/services/misc/forgejo.nix @bendlas @emilylange pkgs/applications/version-management/forgejo @bendlas @emilylange @@ -359,8 +345,11 @@ pkgs/development/tools/continuous-integration/buildbot @Mic92 @zowoq # Pretix pkgs/by-name/pr/pretix/ @mweinelt +pkgs/by-name/pr/pretalx/ @mweinelt nixos/modules/services/web-apps/pretix.nix @mweinelt +nixos/modules/services/web-apps/pretalx.nix @mweinelt nixos/tests/web-apps/pretix.nix @mweinelt +nixos/tests/web-apps/pretalx.nix @mweinelt # incus/lxc/lxd nixos/maintainers/scripts/lxd/ @adamcstephens diff --git a/third_party/nixpkgs/.github/labeler.yml b/third_party/nixpkgs/.github/labeler.yml index d7adc601e5..57086953f8 100644 --- a/third_party/nixpkgs/.github/labeler.yml +++ b/third_party/nixpkgs/.github/labeler.yml @@ -113,6 +113,14 @@ - pkgs/applications/editors/jupyter-kernels/**/* - pkgs/applications/editors/jupyter/**/* +"6.topic: k3s": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/cluster/k3s/**/* + - nixos/tests/k3s/**/* + - pkgs/applications/networking/cluster/k3s/**/* + "6.topic: kernel": - any: - changed-files: @@ -369,3 +377,8 @@ - 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 diff --git a/third_party/nixpkgs/.github/workflows/backport.yml b/third_party/nixpkgs/.github/workflows/backport.yml index d4e91e6a2a..188d270974 100644 --- a/third_party/nixpkgs/.github/workflows/backport.yml +++ b/third_party/nixpkgs/.github/workflows/backport.yml @@ -20,7 +20,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) runs-on: ubuntu-latest steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs diff --git a/third_party/nixpkgs/.github/workflows/basic-eval.yml b/third_party/nixpkgs/.github/workflows/basic-eval.yml index 04e74f774c..1f787397f2 100644 --- a/third_party/nixpkgs/.github/workflows/basic-eval.yml +++ b/third_party/nixpkgs/.github/workflows/basic-eval.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14 with: diff --git a/third_party/nixpkgs/.github/workflows/check-by-name.yml b/third_party/nixpkgs/.github/workflows/check-by-name.yml index bdc223e3d3..e857c88f74 100644 --- a/third_party/nixpkgs/.github/workflows/check-by-name.yml +++ b/third_party/nixpkgs/.github/workflows/check-by-name.yml @@ -16,9 +16,14 @@ on: # so it shouldn't be a problem types: [opened, synchronize, reopened, edited] -permissions: - # We need this permission to cancel the workflow run if there's a merge conflict - actions: write +permissions: {} + +# Create a check-by-name concurrency group based on the pull request number. if +# an event triggers a run on the same PR while a previous run is still in +# progress, the previous run will be canceled and the new one will start. +concurrency: + group: check-by-name-${{ github.event.pull_request.number }} + cancel-in-progress: true jobs: check: @@ -39,7 +44,7 @@ jobs: # https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests # Retry the API query this many times - retryCount=3 + retryCount=5 # Start with 5 seconds, but double every retry retryInterval=5 while true; do @@ -72,31 +77,27 @@ jobs: if [[ "$mergeable" == "true" ]]; then echo "The PR can be merged, checking the merge commit $mergedSha" + echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" else - echo "The PR cannot be merged, it has a merge conflict, cancelling the workflow.." - gh api \ - --method POST \ - -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - /repos/"$GITHUB_REPOSITORY"/actions/runs/"$GITHUB_RUN_ID"/cancel - sleep 60 - # If it's still not canceled after a minute, something probably went wrong, just exit - exit 1 + echo "The PR cannot be merged, it has a merge conflict, skipping the rest.." fi - echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + if: env.mergedSha with: # pull_request_target checks out the base branch by default ref: ${{ env.mergedSha }} # Fetches the merge commit and its parents fetch-depth: 2 - name: Checking out base branch + if: env.mergedSha run: | base=$(mktemp -d) git worktree add "$base" "$(git rev-parse HEAD^1)" echo "base=$base" >> "$GITHUB_ENV" - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 + if: env.mergedSha - name: Fetching the pinned tool + if: env.mergedSha # Update the pinned version using pkgs/test/check-by-name/update-pinned-tool.sh run: | # The pinned version of the tooling to use @@ -107,6 +108,11 @@ jobs: # Adds a result symlink as a GC root nix-store --realise "$toolPath" --add-root result - name: Running nixpkgs-check-by-name + if: env.mergedSha + env: + # Force terminal colors to be enabled. The library that + # nixpkgs-check-by-name uses respects: https://bixense.com/clicolors/ + CLICOLOR_FORCE: 1 run: | if result/bin/nixpkgs-check-by-name --base "$base" .; then exit 0 diff --git a/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml b/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml index 8dfc3f6c06..0bee949c3d 100644 --- a/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml +++ b/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: fetch-depth: 0 filter: blob:none diff --git a/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml b/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml index 74012e2663..8de3318589 100644 --- a/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml +++ b/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/check-nix-format.yml b/third_party/nixpkgs/.github/workflows/check-nix-format.yml index c1d87faca2..6003c9a0b8 100644 --- a/third_party/nixpkgs/.github/workflows/check-nix-format.yml +++ b/third_party/nixpkgs/.github/workflows/check-nix-format.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge @@ -32,11 +32,20 @@ jobs: # Each environment variable beginning with NIX_FMT_PATHS_ is a list of # paths to check with nixfmt. env: + NIX_FMT_PATHS_BSD: pkgs/os-specific/bsd + NIX_FMT_PATHS_MPVSCRIPTS: pkgs/applications/video/mpv/scripts # Format paths related to the Nixpkgs CUDA ecosystem. NIX_FMT_PATHS_CUDA: | pkgs/development/cuda-modules pkgs/test/cuda pkgs/top-level/cuda-packages.nix + NIX_FMT_PATHS_K3S: | + nixos/modules/services/cluster/k3s + nixos/tests/k3s + pkgs/applications/networking/cluster/k3s + NIX_FMT_PATHS_VSCODE_EXTS: pkgs/applications/editors/vscode/extensions + NIX_FMT_PATHS_PHP_PACKAGES: pkgs/development/php-packages + NIX_FMT_PATHS_BUILD_SUPPORT_PHP: pkgs/build-support/php # Iterate over all environment variables beginning with NIX_FMT_PATHS_. run: | for env_var in "${!NIX_FMT_PATHS_@}"; do diff --git a/third_party/nixpkgs/.github/workflows/editorconfig.yml b/third_party/nixpkgs/.github/workflows/editorconfig.yml index 168e5bccae..b2b9672299 100644 --- a/third_party/nixpkgs/.github/workflows/editorconfig.yml +++ b/third_party/nixpkgs/.github/workflows/editorconfig.yml @@ -24,7 +24,7 @@ jobs: - name: print list of changed files run: | cat "$HOME/changed_files" - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/manual-nixos.yml b/third_party/nixpkgs/.github/workflows/manual-nixos.yml index 2ad0917205..a72b1adfea 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixos.yml +++ b/third_party/nixpkgs/.github/workflows/manual-nixos.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml index b56d89eccd..52aefa8472 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml +++ b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/nix-parse.yml b/third_party/nixpkgs/.github/workflows/nix-parse.yml index da2e942414..ffccf9d53d 100644 --- a/third_party/nixpkgs/.github/workflows/nix-parse.yml +++ b/third_party/nixpkgs/.github/workflows/nix-parse.yml @@ -24,7 +24,7 @@ jobs: if [[ -s "$HOME/changed_files" ]]; then echo "CHANGED_FILES=$HOME/changed_files" > "$GITHUB_ENV" fi - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml b/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml index 6adada59c5..7001dccb0d 100644 --- a/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml +++ b/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml @@ -41,7 +41,7 @@ jobs: into: staging-23.11 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0 diff --git a/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml b/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml index 6f188ee28d..0a22905260 100644 --- a/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml +++ b/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml @@ -39,7 +39,7 @@ jobs: into: staging name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0 diff --git a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml index 9b7ec5cc59..a1c949ba37 100644 --- a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml +++ b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml @@ -16,7 +16,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master runs-on: ubuntu-latest steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: nix_path: nixpkgs=channel:nixpkgs-unstable @@ -46,7 +46,7 @@ jobs: run: | git clean -f - name: create PR - uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e # v6.0.2 + uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83 # v6.0.4 with: body: | Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action. diff --git a/third_party/nixpkgs/CONTRIBUTING.md b/third_party/nixpkgs/CONTRIBUTING.md index 4b1a12362f..f40fb86ee5 100644 --- a/third_party/nixpkgs/CONTRIBUTING.md +++ b/third_party/nixpkgs/CONTRIBUTING.md @@ -321,7 +321,7 @@ All the review template samples provided in this section are generic and meant a To get more information about how to review specific parts of Nixpkgs, refer to the documents linked to in the [overview section][overview]. -If a pull request contains documentation changes that might require feedback from the documentation team, ping [@NixOS/documentation-reviewers](https://github.com/orgs/nixos/teams/documentation-reviewers) on the pull request. +If a pull request contains documentation changes that might require feedback from the documentation team, ping [@NixOS/documentation-team](https://github.com/orgs/nixos/teams/documentation-team) on the pull request. If you consider having enough knowledge and experience in a topic and would like to be a long-term reviewer for related submissions, please contact the current reviewers for that topic. They will give you information about the reviewing process. The main reviewers for a topic can be hard to find as there is no list, but checking past pull requests to see who reviewed or git-blaming the code to see who committed to that topic can give some hints. @@ -512,6 +512,7 @@ To get a sense for what changes are considered mass rebuilds, see [previously me - Check for unnecessary whitespace with `git diff --check` before committing. - If you have commits `pkg-name: oh, forgot to insert whitespace`: squash commits in this case. Use `git rebase -i`. + See [Squashing Commits](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#_squashing) for additional information. - For consistency, there should not be a period at the end of the commit message's summary line (the first line of the commit message). diff --git a/third_party/nixpkgs/doc/README.md b/third_party/nixpkgs/doc/README.md index 41afc090b3..a060876969 100644 --- a/third_party/nixpkgs/doc/README.md +++ b/third_party/nixpkgs/doc/README.md @@ -62,7 +62,7 @@ Allow linking arbitrary place in the text (e.g. individual list items, sentences They are defined using a hybrid of the link syntax with the attributes syntax known from headings, called [bracketed spans](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/bracketed_spans.md): ```markdown -- []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGAppsHook` will prepend it to `XDG_DATA_DIRS`. +- []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGApps*` hook will prepend it to `XDG_DATA_DIRS`. ``` #### Automatic links @@ -345,4 +345,4 @@ Typographic replacements are enabled. Check the [list of possible replacement pa ## Getting help -If you need documentation-specific help or reviews, ping [@NixOS/documentation-reviewers](https://github.com/orgs/nixos/teams/documentation-reviewers) on your pull request. +If you need documentation-specific help or reviews, ping [@NixOS/documentation-team](https://github.com/orgs/nixos/teams/documentation-team) on your pull request. diff --git a/third_party/nixpkgs/doc/build-helpers/special/fhs-environments.section.md b/third_party/nixpkgs/doc/build-helpers/special/fhs-environments.section.md index 8145fbd730..b87bb97278 100644 --- a/third_party/nixpkgs/doc/build-helpers/special/fhs-environments.section.md +++ b/third_party/nixpkgs/doc/build-helpers/special/fhs-environments.section.md @@ -6,7 +6,11 @@ It uses Linux' namespaces feature to create temporary lightweight environments w Accepted arguments are: - `name` - The name of the environment and the wrapper executable. + The name of the environment, and the wrapper executable if `pname` is unset. +- `pname` + The pname of the environment and the wrapper executable. +- `version` + The version of the environment. - `targetPkgs` Packages to be installed for the main host's architecture (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also installed. - `multiPkgs` @@ -53,4 +57,4 @@ You can create a simple environment using a `shell.nix` like this: Running `nix-shell` on it would drop you into a shell inside an FHS env where those libraries and binaries are available in FHS-compliant paths. Applications that expect an FHS structure (i.e. proprietary binaries) can run inside this environment without modification. You can build a wrapper by running your binary in `runScript`, e.g. `./bin/start.sh`. Relative paths work as expected. -Additionally, the FHS builder links all relocated gsettings-schemas (the glib setup-hook moves them to `share/gsettings-schemas/${name}/glib-2.0/schemas`) to their standard FHS location. This means you don't need to wrap binaries with `wrapGAppsHook`. +Additionally, the FHS builder links all relocated gsettings-schemas (the glib setup-hook moves them to `share/gsettings-schemas/${name}/glib-2.0/schemas`) to their standard FHS location. This means you don't need to wrap binaries with `wrapGApps*` hook. diff --git a/third_party/nixpkgs/doc/default.nix b/third_party/nixpkgs/doc/default.nix index 76aba1a03e..ca4091dc22 100644 --- a/third_party/nixpkgs/doc/default.nix +++ b/third_party/nixpkgs/doc/default.nix @@ -111,7 +111,7 @@ in pkgs.stdenv.mkDerivation { ${lib-docs}/index.md \ > ./functions/library.md substitute ./manual.md.in ./manual.md \ - --replace '@MANUAL_VERSION@' '${pkgs.lib.version}' + --replace-fail '@MANUAL_VERSION@' '${pkgs.lib.version}' mkdir -p out/media diff --git a/third_party/nixpkgs/doc/hooks/zig.section.md b/third_party/nixpkgs/doc/hooks/zig.section.md index 1a09491649..8bef293769 100644 --- a/third_party/nixpkgs/doc/hooks/zig.section.md +++ b/third_party/nixpkgs/doc/hooks/zig.section.md @@ -9,14 +9,14 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases. ```nix { lib , stdenv -, zig_0_11 +, zig }: stdenv.mkDerivation { # . . . nativeBuildInputs = [ - zig_0_11.hook + zig.hook ]; zigBuildFlags = [ "-Dman-pages=true" ]; diff --git a/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md b/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md index 9791018c7f..1b2005bb1e 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md @@ -148,4 +148,4 @@ All new projects should use the CUDA redistributables available in [`cudaPackage | Find libraries | `configurePhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contain CMake configuration files | | Find libraries | `buildPhase` or `patchelf` | Missing dependency on a `lib` or `static` output | Add the missing dependency | The `lib` or `static` output typically contain the libraries | -In the scenario you are unable to run the resulting binary: this is arguably the most complicated as it could be any combination of the previous reasons. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. As a first step, ensure that dependencies are patched with [`cudaPackages.autoAddDriverRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.autoAddDriverRunpath). Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary. +In the scenario you are unable to run the resulting binary: this is arguably the most complicated as it could be any combination of the previous reasons. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. As a first step, ensure that dependencies are patched with [`autoAddDriverRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=autoAddDriverRunpath). Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary. diff --git a/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md b/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md index e158cea0e5..7433277708 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md @@ -8,7 +8,7 @@ Programs in the GNOME universe are written in various languages but they all use [GSettings](https://developer.gnome.org/gio/stable/GSettings.html) API is often used for storing settings. GSettings schemas are required, to know the type and other metadata of the stored values. GLib looks for `glib-2.0/schemas/gschemas.compiled` files inside the directories of `XDG_DATA_DIRS`. -On Linux, GSettings API is implemented using [dconf](https://wiki.gnome.org/Projects/dconf) backend. You will need to add `dconf` [GIO module](#ssec-gnome-gio-modules) to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent. +On Linux, GSettings API is implemented using [dconf](https://gitlab.gnome.org/GNOME/dconf) backend. You will need to add `dconf` [GIO module](#ssec-gnome-gio-modules) to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent. Last you will need the dconf database D-Bus service itself. You can enable it using `programs.dconf.enable`. @@ -76,13 +76,13 @@ Previously, a GTK theme needed to be in `XDG_DATA_DIRS`. This is no longer neces ### GObject introspection typelibs {#ssec-gnome-typelibs} -[GObject introspection](https://wiki.gnome.org/Projects/GObjectIntrospection) allows applications to use C libraries in other languages easily. It does this through `typelib` files searched in `GI_TYPELIB_PATH`. +[GObject introspection](https://gitlab.gnome.org/GNOME/gobject-introspection) allows applications to use C libraries in other languages easily. It does this through `typelib` files searched in `GI_TYPELIB_PATH`. ### Various plug-ins {#ssec-gnome-plugins} -If your application uses [GStreamer](https://gstreamer.freedesktop.org/) or [Grilo](https://wiki.gnome.org/Projects/Grilo), you should set `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH`, respectively. +If your application uses [GStreamer](https://gstreamer.freedesktop.org/) or [Grilo](https://gitlab.gnome.org/GNOME/grilo), you should set `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH`, respectively. -## Onto `wrapGAppsHook` {#ssec-gnome-hooks} +## Onto `wrapGApps*` hooks {#ssec-gnome-hooks} Given the requirements above, the package expression would become messy quickly: @@ -102,27 +102,29 @@ Given the requirements above, the package expression would become messy quickly: } ``` -Fortunately, there is [`wrapGAppsHook`]{#ssec-gnome-hooks-wrapgappshook}. It works in conjunction with other setup hooks that populate environment variables, and it will then wrap all executables in `bin` and `libexec` directories using said variables. For convenience, it also adds `dconf.lib` for a GIO module implementing a GSettings backend using `dconf`, `gtk3` for GSettings schemas, and `librsvg` for GdkPixbuf loader to the closure. +Fortunately, we have a [family of hooks]{#ssec-gnome-hooks-wrapgappshook} that automate this. They work in conjunction with other setup hooks that populate environment variables, and will then wrap all executables in `bin` and `libexec` directories using said variables. -There is also [`wrapGAppsHook4`]{#ssec-gnome-hooks-wrapgappshook4}, which replaces GTK 3 with GTK 4. Instead of `wrapGAppsHook`, this should be used for all GTK4 applications. +- [`wrapGAppsHook3`]{#ssec-gnome-hooks-wrapgappshook3} for GTK 3 apps. For convenience, it also adds `dconf.lib` for a GIO module implementing a GSettings backend using `dconf`, `gtk3` for GSettings schemas, and `librsvg` for GdkPixbuf loader to the closure. +- [`wrapGAppsHook4`]{#ssec-gnome-hooks-wrapgappshook4} for GTK 4 apps. Same as `wrapGAppsHook3` but replaces `gtk3` with `gtk4`. +- [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook} for programs without a graphical interface. Same as the above but does not bring `gtk3` and `librsvg` into the closure. -In case you are packaging a program without a graphical interface, you might want to use [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook}, which runs the same script as `wrapGAppsHook` but does not bring `gtk3` and `librsvg` into the closure. +The hooks do the the following: -- `wrapGAppsHook` itself will add the package’s `share` directory to `XDG_DATA_DIRS`. +- `wrapGApps*` hook itself will add the package’s `share` directory to `XDG_DATA_DIRS`. -- []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGAppsHook` will prepend it to `XDG_DATA_DIRS`. +- []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGApps*` hook will prepend it to `XDG_DATA_DIRS`. -- []{#ssec-gnome-hooks-gdk-pixbuf} `gdk-pixbuf` setup hook will populate `GDK_PIXBUF_MODULE_FILE` with the path to biggest `loaders.cache` file from the dependencies containing [GdkPixbuf loaders](#ssec-gnome-gdk-pixbuf-loaders). This works fine when there are only two packages containing loaders (`gdk-pixbuf` and e.g. `librsvg`) – it will choose the second one, reasonably expecting that it will be bigger since it describes extra loader in addition to the default ones. But when there are more than two loader packages, this logic will break. One possible solution would be constructing a custom cache file for each package containing a program like `services/x11/gdk-pixbuf.nix` NixOS module does. `wrapGAppsHook` copies the `GDK_PIXBUF_MODULE_FILE` environment variable into the produced wrapper. +- []{#ssec-gnome-hooks-gdk-pixbuf} `gdk-pixbuf` setup hook will populate `GDK_PIXBUF_MODULE_FILE` with the path to biggest `loaders.cache` file from the dependencies containing [GdkPixbuf loaders](#ssec-gnome-gdk-pixbuf-loaders). This works fine when there are only two packages containing loaders (`gdk-pixbuf` and e.g. `librsvg`) – it will choose the second one, reasonably expecting that it will be bigger since it describes extra loader in addition to the default ones. But when there are more than two loader packages, this logic will break. One possible solution would be constructing a custom cache file for each package containing a program like `services/x11/gdk-pixbuf.nix` NixOS module does. `wrapGApps*` hook copies the `GDK_PIXBUF_MODULE_FILE` environment variable into the produced wrapper. - []{#ssec-gnome-hooks-gtk-drop-icon-theme-cache} One of `gtk3`’s setup hooks will remove `icon-theme.cache` files from package’s icon theme directories to avoid conflicts. Icon theme packages should prevent this with `dontDropIconThemeCache = true;`. -- []{#ssec-gnome-hooks-dconf} `dconf.lib` is a dependency of `wrapGAppsHook`, which then also adds it to the `GIO_EXTRA_MODULES` variable. +- []{#ssec-gnome-hooks-dconf} `dconf.lib` is a dependency of `wrapGApps*` hook, which then also adds it to the `GIO_EXTRA_MODULES` variable. - []{#ssec-gnome-hooks-hicolor-icon-theme} `hicolor-icon-theme`’s setup hook will add icon themes to `XDG_ICON_DIRS`. -- []{#ssec-gnome-hooks-gobject-introspection} `gobject-introspection` setup hook populates `GI_TYPELIB_PATH` variable with `lib/girepository-1.0` directories of dependencies, which is then added to wrapper by `wrapGAppsHook`. It also adds `share` directories of dependencies to `XDG_DATA_DIRS`, which is intended to promote GIR files but it also [pollutes the closures](https://github.com/NixOS/nixpkgs/issues/32790) of packages using `wrapGAppsHook`. +- []{#ssec-gnome-hooks-gobject-introspection} `gobject-introspection` setup hook populates `GI_TYPELIB_PATH` variable with `lib/girepository-1.0` directories of dependencies, which is then added to wrapper by `wrapGApps*` hook. It also adds `share` directories of dependencies to `XDG_DATA_DIRS`, which is intended to promote GIR files but it also [pollutes the closures](https://github.com/NixOS/nixpkgs/issues/32790) of packages using `wrapGApps*` hook. -- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`. +- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGApps*` hook. You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook: @@ -147,15 +149,15 @@ Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is the ### `GLib-GIO-ERROR **: 06:04:50.903: No GSettings schemas are installed on the system` {#ssec-gnome-common-issues-no-schemas} -There are no schemas available in `XDG_DATA_DIRS`. Temporarily add a random package containing schemas like `gsettings-desktop-schemas` to `buildInputs`. [`glib`](#ssec-gnome-hooks-glib) and [`wrapGAppsHook`](#ssec-gnome-hooks-wrapgappshook) setup hooks will take care of making the schemas available to application and you will see the actual missing schemas with the [next error](#ssec-gnome-common-issues-missing-schema). Or you can try looking through the source code for the actual schemas used. +There are no schemas available in `XDG_DATA_DIRS`. Temporarily add a random package containing schemas like `gsettings-desktop-schemas` to `buildInputs`. [`glib`](#ssec-gnome-hooks-glib) and [`wrapGApps*`](#ssec-gnome-hooks-wrapgappshook) setup hooks will take care of making the schemas available to application and you will see the actual missing schemas with the [next error](#ssec-gnome-common-issues-missing-schema). Or you can try looking through the source code for the actual schemas used. ### `GLib-GIO-ERROR **: 06:04:50.903: Settings schema ‘org.gnome.foo’ is not installed` {#ssec-gnome-common-issues-missing-schema} Package is missing some GSettings schemas. You can find out the package containing the schema with `nix-locate org.gnome.foo.gschema.xml` and let the hooks handle the wrapping as [above](#ssec-gnome-common-issues-no-schemas). -### When using `wrapGAppsHook` with special derivers you can end up with double wrapped binaries. {#ssec-gnome-common-issues-double-wrapped} +### When using `wrapGApps*` hook with special derivers you can end up with double wrapped binaries. {#ssec-gnome-common-issues-double-wrapped} -This is because derivers like `python.pkgs.buildPythonApplication` or `qt5.mkDerivation` have setup-hooks automatically added that produce wrappers with makeWrapper. The simplest way to workaround that is to disable the `wrapGAppsHook` automatic wrapping with `dontWrapGApps = true;` and pass the arguments it intended to pass to makeWrapper to another. +This is because derivers like `python.pkgs.buildPythonApplication` or `qt5.mkDerivation` have setup-hooks automatically added that produce wrappers with makeWrapper. The simplest way to workaround that is to disable the `wrapGApps*` hook automatic wrapping with `dontWrapGApps = true;` and pass the arguments it intended to pass to makeWrapper to another. In the case of a Python application it could look like: @@ -165,7 +167,7 @@ python3.pkgs.buildPythonApplication { version = "3.32.2"; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection # ... ]; @@ -187,7 +189,7 @@ mkDerivation { version = "3.47.0"; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 qmake # ... ]; diff --git a/third_party/nixpkgs/doc/languages-frameworks/go.section.md b/third_party/nixpkgs/doc/languages-frameworks/go.section.md index 2f4cb0326a..d98ecb1c04 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/go.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/go.section.md @@ -2,7 +2,7 @@ ## Building Go modules with `buildGoModule` {#ssec-language-go} -The function `buildGoModule` builds Go programs managed with Go modules. It builds [Go Modules](https://github.com/golang/go/wiki/Modules) through a two phase build: +The function `buildGoModule` builds Go programs managed with Go modules. It builds [Go Modules](https://go.dev/wiki/Modules) through a two phase build: - An intermediate fetcher derivation called `goModules`. This derivation will be used to fetch all the dependencies of the Go module. - A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output. diff --git a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md index 5d7796b554..dde55c329a 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md @@ -230,7 +230,7 @@ completely incompatible with packages from `haskellPackages`. Every haskell package set has its own haskell-aware `mkDerivation` which is used to build its packages. Generally you won't have to interact with this builder -since [cabal2nix][cabal2nix] can generate packages +since [cabal2nix](#haskell-cabal2nix) can generate packages using it for an arbitrary cabal package definition. Still it is useful to know the parameters it takes when you need to [override](#haskell-overriding-haskell-packages) a generated Nix expression. @@ -1123,18 +1123,75 @@ for [this to work][optparse-applicative-completions]. Note that this feature is automatically disabled when cross-compiling, since it requires executing the binaries in question. +## Import-from-Derivation helpers {#haskell-import-from-derivation} + +### cabal2nix {#haskell-cabal2nix} + +[`cabal2nix`][cabal2nix] can generate Nix package definitions for arbitrary +Haskell packages using [import from derivation][import-from-derivation]. +`cabal2nix` will generate Nix expressions that look like this: + +```nix +# cabal get mtl-2.2.1 && cd mtl-2.2.1 && cabal2nix . +{ mkDerivation, base, lib, transformers }: +mkDerivation { + pname = "mtl"; + version = "2.2.1"; + src = ./.; + libraryHaskellDepends = [ base transformers ]; + homepage = "http://github.com/ekmett/mtl"; + description = "Monad classes, using functional dependencies"; + license = lib.licenses.bsd3; +} +``` + +This expression should be called with `haskellPackages.callPackage`, which will +supply [`haskellPackages.mkDerivation`](#haskell-mkderivation) and the Haskell +dependencies as arguments. + +`callCabal2nix name src args` +: Create a package named `name` from the source derivation `src` using + `cabal2nix`. + + `args` are extra arguments provided to `haskellPackages.callPackage`. + +`callCabal2nixWithOptions name src opts args` +: Create a package named `name` from the source derivation `src` using + `cabal2nix`. + + `opts` are extra options for calling `cabal2nix`. If `opts` is a string, it + will be used as extra command line arguments for `cabal2nix`, e.g. `--subpath + path/to/dir/containing/cabal-file`. Otherwise, `opts` should be an AttrSet + which can contain the following attributes: + + `extraCabal2nixOptions` + : Extra command line arguments for `cabal2nix`. + + `srcModifier` + : A function which is used to modify the given `src` instead of the default + filter. + + The default source filter will remove all files from `src` except for + `.cabal` files and `package.yaml` files. + + + - `k3s`: was updated to version [v1.29](https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2), all previous versions (k3s_1_26, k3s_1_27, k3s_1_28) will be removed. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes) for more information. -- `himalaya` was updated to `v1.0.0-beta.4`, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.4) for details. +- `himalaya` was updated to v1.0.0-beta.4, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.4) for details. + +- `security.pam.enableSSHAgentAuth` was replaced by the `sshAgentAuth` attrset, and **only** + `authorized_keys` files listed in [`sshAgentAuth.authorizedKeysFiles`] are trusted, + defaulting to `/etc/ssh/authorized_keys.d/%u`. + ::: {.warning} + Users of {manpage}`pam_ssh_agent_auth(8)` must take care that the pubkeys they use (for instance with `sudo`) + are listed in [`sshAgentAuth.authorizedKeysFiles`]. + ::: + ::: {.note} + Previously, all `services.openssh.authorizedKeysFiles` were trusted, including `~/.ssh/authorized_keys`, + which results in an **insecure** configuration; see [#31611](https://github.com/NixOS/nixpkgs/issues/31611). + ::: + +[`sshAgentAuth.authorizedKeysFiles`]: #opt-security.pam.sshAgentAuth.authorizedKeysFiles - The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS. @@ -208,11 +248,13 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `cudaPackages.autoFixElfFiles` has been deprecated for `pkgs.autoFixElfFiles`. Functionality has not changed, but the setuphook has been renamed and moved to the top-level package scope. +- `appimageTools.wrapAppImage` now creates the binary at `$out/bin/${pname}` rather than `$out/bin/${pname}-${version}`, which will break downstream workarounds. + - `pdns` was updated to version [v4.9.x](https://doc.powerdns.com/authoritative/changelog/4.9.html), which introduces breaking changes. Check out the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-4-9-0) for details. - `unrar` was updated to v7. See [changelog](https://www.rarlab.com/unrar7notes.htm) for more information. -- `git-town` was updated from version `11` to `13`. See the [changelog](https://github.com/git-town/git-town/blob/main/CHANGELOG.md#1300-2024-03-22) for breaking changes. +- `git-town` was updated from version 11 to 13. See the [changelog](https://github.com/git-town/git-town/blob/main/CHANGELOG.md#1300-2024-03-22) for breaking changes. - `k9s` was updated to v0.31. There have been various breaking changes in the config file format, check out the changelog of [v0.29](https://github.com/derailed/k9s/releases/tag/v0.29.0), @@ -220,22 +262,25 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m [v0.31](https://github.com/derailed/k9s/releases/tag/v0.31.0) for details. It is recommended to back up your current configuration and let k9s recreate the new base configuration. +- the .csv format used to define lua packages to be updated via + `luarocks-packages-updater` has changed: `src` (URL towards a git repository) has now become `rockspec` (URL towards a rockspec) to remove ambiguity regarding which rockspec to use and simplify implementation. + - NixOS AMIs are now uploaded regularly to a new AWS Account. Instructions on how to use them can be found on . We are working on integration the data into the NixOS homepage. The list in `nixos/modules/virtualisation/amazon-ec2-amis.nix` will stop being updated and will be removed in the future. -- The option `services.postgresql.ensureUsers._.ensurePermissions` has been removed as it's +- The option `services.postgresql.ensureUsers._.ensurePermissions` has been removed as it is not declarative and is broken with newer postgresql versions. Consider using [](#opt-services.postgresql.ensureUsers._.ensureDBOwnership) - instead or a tool that's more suited for managing the data inside a postgresql database. + instead or a tool that is more suited for managing the data inside a postgresql database. - `idris2` was updated to v0.7.0. This version introduces breaking changes. Check out the [changelog](https://github.com/idris-lang/Idris2/blob/v0.7.0/CHANGELOG.md#v070) for details. -- `nvtop` family of packages was reorganized into nested attrset. `nvtop` has been renamed to `nvtopPackages.full`, and all `nvtop-{amd,nvidia,intel,msm}` packages are now named as `nvtopPackages.{amd,nvidia,intel,msm}` +- `nvtop` family of packages was reorganized into nested attrset. `nvtop` has been renamed to `nvtopPackages.full`, and all `nvtop-{amd,nvidia,intel,msm}` packages are now named as `nvtopPackages.{amd,nvidia,intel,msm}`. -- `neo4j` has been updated to 5, you may want to read the [release notes for Neo4j 5](https://neo4j.com/release-notes/database/neo4j-5/) +- `neo4j` has been updated to version 5. You may want to read the [release notes for Neo4j 5](https://neo4j.com/release-notes/database/neo4j-5/). - `services.neo4j.allowUpgrade` was removed and no longer has any effect. Neo4j 5 supports automatic rolling upgrades. @@ -243,43 +288,49 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `mongodb-4_4` has been removed as it has reached end of life. Consequently, `unifi7` and `unifi8` now use MongoDB 5.0 by default. +- `mongodb-5_0` and newer requires a cpu with the avx instruction set to run. + - `nitter` requires a `guest_accounts.jsonl` to be provided as a path or loaded into the default location at `/var/lib/nitter/guest_accounts.jsonl`. See [Guest Account Branch Deployment](https://github.com/zedeus/nitter/wiki/Guest-Account-Branch-Deployment) for details. - `boot.supportedFilesystems` and `boot.initrd.supportedFilesystems` are now attribute sets instead of lists. Assignment from lists as done previously is still supported, but checking whether a filesystem is enabled must now by done using `supportedFilesystems.fs or false` instead of using `lib.elem "fs" supportedFilesystems` as was done previously. - `services.aria2.rpcSecret` has been replaced with `services.aria2.rpcSecretFile`. This was done so that secrets aren't stored in the world-readable nix store. - To migrate, you will have create a file with the same exact string, and change + To migrate, you will have to create a file with the same exact string, and change your module options to point to that file. For example, `services.aria2.rpcSecret = "mysecret"` becomes `services.aria2.rpcSecretFile = "/path/to/secret_file"` where the file `secret_file` contains the string `mysecret`. +- The `system.forbiddenDependenciesRegex` option has been renamed to `system.forbiddenDependenciesRegexes` and now has the type of `listOf string` instead of `string` to accept multiple regexes. + - `openssh`, `openssh_hpn` and `openssh_gssapi` are now compiled without support for the DSA signature algorithm as it is being deprecated upstream. Users still relying on DSA keys should consider upgrading - to another signature algorithm. It is however possible, for the time being, to restore the DSA keys support using `override` to set `dsaKeysSupport = true`. + to another signature algorithm. However, for the time being it is possible to restore DSA key support using `override` to set `dsaKeysSupport = true`. -- `buildGoModule` now throws error when `vendorHash` is not specified. `vendorSha256`, deprecated in Nixpkgs 23.11, is now ignored and is no longer a `vendorHash` alias. +- `buildGoModule` now throws an error when `vendorHash` is not specified. `vendorSha256`, deprecated in Nixpkgs 23.11, is now ignored and is no longer a `vendorHash` alias. -- Invidious has changed its default database username from `kemal` to `invidious`. Setups involving an externally provisioned database (i.e. `services.invidious.database.createLocally == false`) should adjust their configuration accordingly. The old `kemal` user will not be removed automatically even when the database is provisioned automatically.(https://github.com/NixOS/nixpkgs/pull/265857) +- `services.invidious.settings.db.user`, the default database username has changed from `kemal` to `invidious`. Setups involving an externally-provisioned database (i.e. `services.invidious.database.createLocally == false`) should adjust their configuration accordingly. The old `kemal` user will not be removed automatically even when the database is provisioned automatically.(https://github.com/NixOS/nixpkgs/pull/265857). - `writeReferencesToFile` is deprecated in favour of the new trivial build helper `writeClosure`. The latter accepts a list of paths and has an unambiguous name and cleaner implementation. - `inetutils` now has a lower priority to avoid shadowing the commonly used `util-linux`. If one wishes to restore the default priority, simply use `lib.setPrio 5 inetutils` or override with `meta.priority = 5`. -- `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the freeform type and option named `services.paperless.settings`. +- `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the free-form type and option named `services.paperless.settings`. -- `davfs2`' `services.davfs2.extraConfig` setting has been deprecated and converted to the freeform type option named `services.davfs2.settings` according to RFC42. +- `davfs2`' `services.davfs2.extraConfig` setting has been deprecated and converted to the free-form type option named `services.davfs2.settings` according to RFC42. -- `services.homepage-dashboard` now takes it's configuration using native Nix expressions, rather than dumping templated configurations into `/var/lib/homepage-dashboard` where they were previously managed manually. There are now new options which allow the configuration of bookmarks, services, widgets and custom CSS/JS natively in Nix. +- `services.homepage-dashboard` now takes its configuration using native Nix expressions, rather than dumping templated configurations into `/var/lib/homepage-dashboard` where they were previously managed manually. There are now new options which allow the configuration of bookmarks, services, widgets and custom CSS/JS natively in Nix. - `hare` may now be cross-compiled. For that to work, however, `haredoc` needed to stop being built together with it. Thus, the latter is now its own package with the name of `haredoc`. -- The legacy and long deprecated systemd target `network-interfaces.target` has been removed. Use `network.target` instead. +- `network-interfaces.target` system target was removed as it has been deprecated for a long time. Use `network.target` instead. + +- `services.redis.vmOverCommit` now defaults to `true` and no longer enforces Transparent Hugepages (THP) to be disabled. Redis only works with THP configured to `madvise` which is the kernel's default. - `azure-cli` now has extension support. For example, to install the `aks-preview` extension, use ```nix environment.systemPackages = [ - (azure-cli.withExtensions [ azure-cli.extensions.aks-preview ]); + (azure-cli.withExtensions [ azure-cli.extensions.aks-preview ]) ]; ``` To make the `azure-cli` immutable and prevent clashes in case `azure-cli` is also installed via other package managers, some configuration files were moved into the derivation. @@ -291,17 +342,23 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - Proxies are now defined with a new option `settings.proxies` which takes a list of proxies. - Consult the [upstream documentation](https://github.com/fatedier/frp#example-usage) for more details on the changes. -- `mkosi` was updated to v20. Parts of the user interface have changed. Consult the - release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19) and - [v20](https://github.com/systemd/mkosi/releases/tag/v20) for a list of changes. +- `mkosi` was updated to v22. Parts of the user interface have changed. Consult the + release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19), + [v20](https://github.com/systemd/mkosi/releases/tag/v20), + [v21](https://github.com/systemd/mkosi/releases/tag/v21) and + [v22](https://github.com/systemd/mkosi/releases/tag/v22) for a list of changes. - `gonic` has been updated to v0.16.4. Config now requires `playlists-path` to be set. See the rest of the [v0.16.0 release notes](https://github.com/sentriz/gonic/releases/tag/v0.16.0) for more details. -- The `services.vikunja` systemd service now uses `vikunja` as dynamic user instead of `vikunja-api`. Database users might need to be changed. +- `services.vikunja` systemd service now uses `vikunja` as dynamic user instead of `vikunja-api`. Database users might need to be changed. -- The `services.vikunja.setupNginx` setting has been removed. Users now need to setup the webserver configuration on their own with a proxy pass to the vikunja service. +- `services.vikunja.setupNginx` setting has been removed. Users now need to setup the webserver configuration on their own with a proxy pass to the vikunja service. -- The `woodpecker-*` packages have been updated to v2 which includes [breaking changes](https://woodpecker-ci.org/docs/next/migrations#200). +- `services.vmagent` module deprecates `dataDir`, `group` and `user` setting in favor of systemd provided CacheDirectory and DynamicUser. + +- `services.vmagent.remoteWriteUrl` setting has been renamed to `services.vmagent.remoteWrite.url` and now defaults to `null`. + +- `woodpecker-*` packages have been updated to v2 which includes [breaking changes](https://woodpecker-ci.org/docs/next/migrations#200). - `services.nginx` will no longer advertise HTTP/3 availability automatically. This must now be manually added, preferably to each location block. Example: @@ -317,27 +374,31 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m } ``` -- The package `optparse-bash` is now dropped due to upstream inactivity. Alternatives available in Nixpkgs include [`argc`](https://github.com/sigoden/argc), [`argbash`](https://github.com/matejak/argbash), [`bashly`](https://github.com/DannyBen/bashly) and [`gum`](https://github.com/charmbracelet/gum), to name a few. +- `optparse-bash` is now dropped due to upstream inactivity. Alternatives available in Nixpkgs include [`argc`](https://github.com/sigoden/argc), [`argbash`](https://github.com/matejak/argbash), [`bashly`](https://github.com/DannyBen/bashly) and [`gum`](https://github.com/charmbracelet/gum), to name a few. -- The `kanata` package has been updated to v1.5.0, which includes [breaking changes](https://github.com/jtroo/kanata/releases/tag/v1.5.0). +- `kanata` package has been updated to v1.6.1, which includes breaking changes. Check out the changelog of [v1.5.0](https://github.com/jtroo/kanata/releases/tag/v1.5.0) and [v1.6.0](https://github.com/jtroo/kanata/releases/tag/v1.6.0) for details. -- The `craftos-pc` package has been updated to v2.8, which includes [breaking changes](https://github.com/MCJack123/craftos2/releases/tag/v2.8). +- `craftos-pc` package has been updated to v2.8, which includes [breaking changes](https://github.com/MCJack123/craftos2/releases/tag/v2.8). - Files are now handled in binary mode; this could break programs with embedded UTF-8 characters. - The ROM was updated to match ComputerCraft version v1.109.2. - The bundled Lua was updated to Lua v5.2, which includes breaking changes. See the [Lua manual](https://www.lua.org/manual/5.2/manual.html#8) for more information. - The WebSocket API [was rewritten](https://github.com/MCJack123/craftos2/issues/337), which introduced breaking changes. -- The `gtest` package has been updated past v1.13.0, which requires C++14 or higher. +- `gtest` package has been updated past v1.13.0, which requires C++14 or higher. -- The latest available version of Nextcloud is v28 (available as `pkgs.nextcloud28`). The installation logic is as follows: +- Nextcloud 26 has been removed since it's not maintained anymore by upstream. + +- The latest available version of Nextcloud is v29 (available as `pkgs.nextcloud29`). The installation logic is as follows: - If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**) - - If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud28` will be installed by default. + - If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud29` will be installed by default. - If [`system.stateVersion`](#opt-system.stateVersion) is >=23.11, `pkgs.nextcloud27` will be installed by default. - - Please note that an upgrade from v26 (or older) to v28 directly is not possible. Please upgrade to `nextcloud27` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud27;`](options.html#opt-services.nextcloud.package). + - Please note that an upgrade from v27 (or older) to v29 directly is not possible. Please upgrade to `nextcloud28` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud28;`](options.html#opt-services.nextcloud.package). + - Known warnings after the upgrade are documented in [](#module-services-nextcloud-known-warnings) from now on. + - The "Photos" app only displays Media from inside the `Photos` directory. This can be changed manually in the "Photos" tab below "Photos settings". - The vendored third party libraries have been mostly removed from `cudaPackages.nsight_systems`, which we now only ship for `cudaPackages_11_8` and later due to outdated dependencies. Users comfortable with the vendored dependencies may use `overrideAttrs` to amend the `postPatch` phase and the `meta.broken` correspondingly. Alternatively, one could package the deprecated `boost170` locally, as required for `cudaPackages_11_4.nsight_systems`. -- The `cudaPackages` package scope has been updated to `cudaPackages_12`. +- `cudaPackages` package scope has been updated to `cudaPackages_12`. - The deprecated `cudaPackages.cudatoolkit` has been replaced with a symlink-based wrapper for the splayed redistributable CUDA packages. The @@ -345,10 +406,19 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m like e.g. tensorflow. The original runfile-based `cudatoolkit` is still available as `cudatoolkit-legacy-runfile`. -- The `halloy` package was updated past 2024.5 which introduced a breaking change by switching the config format from YAML to TOML. See https://github.com/squidowl/halloy/releases/tag/2024.5 for details. +- `halloy` package was updated past 2024.5 which introduced a breaking change by switching the config format from YAML to TOML. See https://github.com/squidowl/halloy/releases/tag/2024.5 for details. + +- If `services.smokeping.webService` was enabled, smokeping is now served via nginx instead of thttpd. This change brings the following consequences: + - The default port for smokeping is now the nginx default port 80 instead of 8081. + - The option `services.smokeping.port` has been removed. To customize the port, use `services.nginx.virtualHosts.smokeping.listen.*.port`. + +- The `wpaperd` package has a breaking change moving to 1.0.1, previous version 0.3.0 had 2 different configuration files, one for wpaperd and one for the wallpapers. Remove the former and move the latter (`wallpaper.toml`) to `config.toml`. - Ada packages (libraries and tools) have been moved into the `gnatPackages` scope. `gnatPackages` uses the default GNAT compiler, `gnat12Packages` and `gnat13Packages` use the respective matching compiler version. +- Paths provided as `restartTriggers` and `reloadTriggers` for systemd units will now be copied into the nix store to make the behavior consistent. + Previously, `restartTriggers = [ ./config.txt ]`, if defined in a flake, would trigger a restart when any part of the flake changed; and if not defined in a flake, would never trigger a restart even if the contents of `config.txt` changed. + - `spark2014` has been renamed to `gnatprove`. A version of `gnatprove` matching different GNAT versions is available from the different `gnatPackages` sets. - `services.resolved.fallbackDns` can now be used to disable the upstream fallback servers entirely by setting it to an empty list. To get the previous behaviour of the upstream defaults set it to null, the new default, instead. @@ -362,10 +432,12 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `xxd` has been moved from `vim` default output to its own output to reduce closure size. The canonical way to reference it across all platforms is `unixtools.xxd`. -- The `stalwart-mail` package has been updated to v0.5.3, which includes [breaking changes](https://github.com/stalwartlabs/mail-server/blob/v0.5.3/UPGRADING.md). +- `stalwart-mail` package has been updated to v0.5.3, which includes [breaking changes](https://github.com/stalwartlabs/mail-server/blob/v0.5.3/UPGRADING.md). - `services.zope2` has been removed as `zope2` is unmaintained and was relying on Python2. +- `services.oauth2_proxy` was renamed to `services.oauth2-proxy`. Also the corresponding service, user and group were renamed. + - `services.avahi.nssmdns` got split into `services.avahi.nssmdns4` and `services.avahi.nssmdns6` which enable the mDNS NSS switch for IPv4 and IPv6 respectively. Since most mDNS responders only register IPv4 addresses, most users want to keep the IPv6 support disabled to avoid long timeouts. @@ -396,21 +468,30 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m upgrade NetBox by changing `services.netbox.package`. Database migrations will be run automatically. -- The executable file names for `firefox-devedition`, `firefox-beta`, `firefox-esr` now matches their package names, which is consistent with the `firefox-*-bin` packages. The desktop entries are also updated so that you can have multiple editions of firefox in your app launcher. +- `gauge` now supports installing plugins using nix. For the old imperative approach, switch to `gauge-unwrapped`. + You can load plugins from an existing gauge manifest file using `gauge.fromManifest ./path/to/manifest.json` or + specify plugins in nix using `gauge.withPlugins (p: with p; [ js html-report xml-report ])`. + +- `firefox-devedition`, `firefox-beta`, `firefox-esr` executable file names for now match their package names, which is consistent with the `firefox-*-bin` packages. The desktop entries are also updated so that you can have multiple editions of firefox in your app launcher. + +- `chromium` and `ungoogled-chromium` had a long stanging issue regarding Widevine DRM handling in nixpkgs fixed. + `chromium` now no longer automatically downloads Widevine when encountering DRM protected content. + To be able to play DRM protected content in `chromium` now, you have to explicitly opt-in as originally intended using `chromium.override { enableWideVine = true; }`. + This override has been added almost 10 years ago. - switch-to-configuration does not directly call systemd-tmpfiles anymore. Instead, the new artificial sysinit-reactivation.target is introduced which allows to restart multiple services that are ordered before sysinit.target and respect the ordering between the services. -- The `systemd.oomd` module behavior is changed as: +- `systemd.oomd` module behavior is changed as: - Raise ManagedOOMMemoryPressureLimit from 50% to 80%. This should make systemd-oomd kill things less often, and fix issues like [this](https://pagure.io/fedora-workstation/issue/358). - Reference: [commit](https://src.fedoraproject.org/rpms/systemd/c/806c95e1c70af18f81d499b24cd7acfa4c36ffd6?branch=806c95e1c70af18f81d499b24cd7acfa4c36ffd6) + Reference: [commit](https://src.fedoraproject.org/rpms/systemd/c/806c95e1c70af18f81d499b24cd7acfa4c36ffd6?branch=806c95e1c70af18f81d499b24cd7acfa4c36ffd6). - Remove swap policy. This helps prevent killing processes when user's swap is small. - - Expand the memory pressure policy to system.slice, user-.slice, and all user owned slices. Reference: [commit](https://src.fedoraproject.org/rpms/systemd/c/7665e1796f915dedbf8e014f0a78f4f576d609bb) + - Expand the memory pressure policy to system.slice, user-.slice, and all user owned slices. Reference: [commit](https://src.fedoraproject.org/rpms/systemd/c/7665e1796f915dedbf8e014f0a78f4f576d609bb). - `systemd.oomd.enableUserServices` is renamed to `systemd.oomd.enableUserSlices`. @@ -423,7 +504,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [watchdogd](https://troglobit.com/projects/watchdogd/), a system and process supervisor using watchdog timers. Available as [services.watchdogd](#opt-services.watchdogd.enable). -- The `jdt-language-server` package now uses upstream's provided python wrapper instead of our own custom wrapper. This results in the following breaking and notable changes: +- `jdt-language-server` package now uses upstream's provided python wrapper instead of our own custom wrapper. This results in the following breaking and notable changes: - The main binary for the package is now named `jdtls` instead of `jdt-language-server`, equivalent to what most editors expect the binary to be named. @@ -445,21 +526,23 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - Ruby plugin support has been disabled in DFHack. Many of the Ruby plugins have been converted to Lua, and support was removed upstream due to frequent crashes. -- The `livebook` package is now built as a `mix release` instead of an `escript`. +- `livebook` package is now built as a `mix release` instead of an `escript`. This means that configuration now has to be done using [environment variables](https://hexdocs.pm/livebook/readme.html#environment-variables) instead of command line arguments. This has the further implication that the `livebook` service configuration has changed: -- The `erlang_node_short_name`, `erlang_node_name`, `port` and `options` configuration parameters are gone, and have been replaced with an `environment` parameter. +- `erlang_node_short_name`, `erlang_node_name`, `port` and `options` configuration parameters are gone, and have been replaced with an `environment` parameter. Use the appropriate [environment variables](https://hexdocs.pm/livebook/readme.html#environment-variables) inside `environment` to configure the service instead. - `akkoma` now requires explicitly setting the base URL for uploaded media (`settings."Pleroma.Upload".base_url`), as well as for the media proxy if enabled (`settings."Media"`). This is recommended to be a separate (sub)domain to the one Akkoma is hosted at. See [here](https://meta.akkoma.dev/t/akkoma-stable-2024-03-securer-i-barely-know-her/681#explicit-upload-and-media-proxy-domains-5) for more details. -- The `crystal` package has been updated to 1.11.x, which has some breaking changes. +- `crystal` package has been updated to 1.11.x, which has some breaking changes. Refer to crystal's changelog for more information. ([v1.10](https://github.com/crystal-lang/crystal/blob/master/CHANGELOG.md#1100-2023-10-09), [v1.11](https://github.com/crystal-lang/crystal/blob/master/CHANGELOG.md#1110-2024-01-08)) -- The `erlang-ls` package no longer ships the `els_dap` binary as of v0.51.0. +- `erlang-ls` package no longer ships the `els_dap` binary as of v0.51.0. + +- `icu` no longer includes `install-sh` and `mkinstalldirs` in the shared folder. ## Other Notable Changes {#sec-release-24.05-notable-changes} @@ -467,14 +550,14 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `addDriverRunpath` has been added to facilitate the deprecation of the old `addOpenGLRunpath` setuphook. This change is motivated by the evolution of the setuphook to include all hardware acceleration. -- Cinnamon has been updated to 6.0. Please beware that the [Wayland session](https://blog.linuxmint.com/?p=4591) is still experimental in this release and could potentially [affect Xorg sessions](https://blog.linuxmint.com/?p=4639). We suggest a reboot when switching between sessions. +- `cinnamon` has been updated to 6.0. Please beware that the [Wayland session](https://blog.linuxmint.com/?p=4591) is still experimental in this release and could potentially [affect Xorg sessions](https://blog.linuxmint.com/?p=4639). We suggest a reboot when switching between sessions. -- MATE has been updated to 1.28. +- `mate` has been updated to 1.28. - To properly support panel plugins built with Wayland (in-process) support, we are introducing `services.xserver.desktopManager.mate.extraPanelApplets` option, please use that for installing panel applets. - Similarly, please use `services.xserver.desktopManager.mate.extraCajaExtensions` option for installing Caja extensions. - To use the Wayland session, enable `services.xserver.desktopManager.mate.enableWaylandSession`. This is opt-in for now as it is in early stage and introduces a new set of Wayfire closure. Due to [known issues with LightDM](https://github.com/canonical/lightdm/issues/63), we suggest using SDDM for display manager. -- The Budgie module installs gnome-terminal by default (instead of mate-terminal). +- `services.xserver.desktopManager.budgie` installs `gnome.gnome-terminal` by default (instead of `mate.mate-terminal`). - New `boot.loader.systemd-boot.xbootldrMountPoint` allows setting up a separate [XBOOTLDR partition](https://uapi-group.org/specifications/specs/boot_loader_specification/) to store boot files. Useful on systems with a small EFI System partition that cannot be easily repartitioned. @@ -483,19 +566,32 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `services.postgresql.extraPlugins` changed its type from just a list of packages to also a function that returns such a list. For example a config line like ``services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [ postgis ];`` is recommended to be changed to ``services.postgresql.extraPlugins = ps: with ps; [ postgis ];``; -- The Matrix homeserver [Synapse](https://element-hq.github.io/synapse/) module now supports configuring UNIX domain socket [listeners](#opt-services.matrix-synapse.settings.listeners) through the `path` option. +- `services.openssh` now has an option `authorizedKeysInHomedir`, controlling whether `~/.ssh/authorizedKeys` is + added to `authorizedKeysFiles`. + ::: {.note} + This option currently defaults to `true` for NixOS 24.05, preserving the previous behaviour. + This is expected to change in NixOS 24.11. + ::: + ::: {.warning} + Users should check that their SSH keys are in `users.users.*.openssh`, or that they have another way to access + and administer the system, before setting this option to `false`. + ::: + +- [`matrix-synapse`](https://element-hq.github.io/synapse/) homeserver module now supports configuring UNIX domain socket [`listeners`](#opt-services.matrix-synapse.settings.listeners) through the `path` option. The default replication worker on the main instance has been migrated away from TCP sockets to UNIX domain sockets. -- The initrd ssh daemon module got a new option to add authorized keys via a list of files using `boot.initrd.network.ssh.authorizedKeyFiles`. +- `boot.initrd.network.ssh.authorizedKeyFiles` is a new option in the initrd ssh daemon module, for adding authorized keys via list of files. + +- `appimage`, `appimageTools.wrapAppImage` and `buildFHSEnvBubblewrap` now properly accepts `pname` and `version`. - Programs written in [Nim](https://nim-lang.org/) are built with libraries selected by lockfiles. The `nimPackages` and `nim2Packages` sets have been removed. See https://nixos.org/manual/nixpkgs/unstable#nim for more information. -- Programs written in [D](https://dlang.org/) using the `dub` build system and package manager can now be built using `buildDubPackage` utilizing lockfiles provided by the new `dub-to-nix` helper program. +- `buildDubPackage` can now be used to build Programs written in [D](https://dlang.org/) using the `dub` build system and package manager. See the [D section](https://nixos.org/manual/nixpkgs/unstable#dlang) in the manual for more information. -- [Portunus](https://github.com/majewsky/portunus) has been updated to major version 2. +- [`portunus`](https://github.com/majewsky/portunus) has been updated to major version 2. This version of Portunus supports strong password hashes, but the legacy hash SHA-256 is also still supported to ensure a smooth migration of existing user accounts. After upgrading, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all user accounts to strong password hashes. Support for weak password hashes will be removed in NixOS 24.11. @@ -504,9 +600,9 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `libass` now uses the native CoreText backend on Darwin, which may fix subtitle rendering issues with `mpv`, `ffmpeg`, etc. -- [Lilypond](https://lilypond.org/index.html) and [Denemo](https://www.denemo.org) are now compiled with Guile 3.0. +- [`lilypond`](https://lilypond.org/index.html) and [`denemo`](https://www.denemo.org) are now compiled with Guile 3.0. -- Garage has been updated to v1.x.x. Users should read the [upstream release notes](https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v1.0.0) and follow the documentation when changing over their `services.garage.package` and performing this manual upgrade. +- `garage` has been updated to v1.x.x. Users should read the [upstream release notes](https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v1.0.0) and follow the documentation when changing over their `services.garage.package` and performing this manual upgrade. - The EC2 image module now enables the [Amazon SSM Agent](https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html) by default. @@ -520,7 +616,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `extraTrustedDomains` -> [`trusted_domains`](#opt-services.nextcloud.settings.trusted_domains) and - `trustedProxies` -> [`trusted_proxies`](#opt-services.nextcloud.settings.trusted_proxies). -- The option [`services.nextcloud.config.dbport`] of the Nextcloud module was removed to match upstream. +- `services.nextcloud.config.dbport` option of the Nextcloud module was removed to match upstream. The port can be specified in [`services.nextcloud.config.dbhost`](#opt-services.nextcloud.config.dbhost). - A new abstraction to create both read-only as well as writable overlay file @@ -528,7 +624,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m [fileSystems.overlay](#opt-fileSystems._name_.overlay.lowerdir). See also the [NixOS docs](#sec-overlayfs). -- systemd units can now specify the `Upholds=` and `UpheldBy=` unit dependencies via the aptly +- `systemd` units can now specify the `Upholds=` and `UpheldBy=` unit dependencies via the aptly named `upholds` and `upheldBy` options. These options get systemd to enforce that the dependencies remain continuosly running for as long as the dependent unit is in a running state. @@ -541,33 +637,27 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - New options were added to the dnsdist module to enable and configure a DNSCrypt endpoint (see `services.dnsdist.dnscrypt.enable`, etc.). The module can generate the DNSCrypt provider key pair, certificates and also performs their rotation automatically with no downtime. -- With a bump to `sonarr` v4, existing config database files will be upgraded automatically, but note that some old apparently-working configs [might actually be corrupt and fail to upgrade cleanly](https://forums.sonarr.tv/t/sonarr-v4-released/33089). +- `sonarr` version bumped to from 3.0.10 to 4.0.3. Consequently existing config database files will be upgraded automatically, but note that some old apparently-working configs [might actually be corrupt and fail to upgrade cleanly](https://forums.sonarr.tv/t/sonarr-v4-released/33089). -- The Yama LSM is now enabled by default in the kernel, which prevents ptracing +- The kernel Yama LSM is now enabled by default, which prevents ptracing non-child processes. This means you will not be able to attach gdb to an existing process, but will need to start that process from gdb (so it is a child). Or you can set `boot.kernel.sysctl."kernel.yama.ptrace_scope"` to 0. -- The netbird module now allows running multiple tunnels in parallel through [`services.netbird.tunnels`](#opt-services.netbird.tunnels). +- `netbird` module now allows running multiple tunnels in parallel through [`services.netbird.tunnels`](#opt-services.netbird.tunnels). - [Nginx virtual hosts](#opt-services.nginx.virtualHosts) using `forceSSL` or - `globalRedirect` can now have redirect codes other than 301 through + `globalRedirect` can now have redirect codes other than 301 through `redirectCode`. - `bacula` now allows to configure `TLS` for encrypted communication. - `redirectCode`. +- `libjxl` version bumped from 0.8.2 to 0.9.1 [dropped support for the butteraugli API](https://github.com/libjxl/libjxl/pull/2576). You will no longer be able to set `enableButteraugli` on `libaom`. -- `libjxl` 0.9.0 [dropped support for the butteraugli API](https://github.com/libjxl/libjxl/pull/2576). You will no longer be able to set `enableButteraugli` on `libaom`. - -- The source of the `mockgen` package has changed to the [go.uber.org/mock](https://github.com/uber-go/mock) fork because [the original repository is no longer maintained](https://github.com/golang/mock#gomock). - -- `security.pam.enableSSHAgentAuth` was renamed to `security.pam.sshAgentAuth.enable` and an `authorizedKeysFiles` - option was added, to control which `authorized_keys` files are trusted. It defaults to the previous behaviour, - **which is insecure**: see [#31611](https://github.com/NixOS/nixpkgs/issues/31611). +- `mockgen` package source has changed to the [go.uber.org/mock](https://github.com/uber-go/mock) fork because [the original repository is no longer maintained](https://github.com/golang/mock#gomock). - [](#opt-boot.kernel.sysctl._net.core.wmem_max_) changed from a string to an integer because of the addition of a custom merge option (taking the highest value defined to avoid conflicts between 2 services trying to set that value), just as [](#opt-boot.kernel.sysctl._net.core.rmem_max_) since 22.11. -- A new top-level package set, `pkgsExtraHardening` is added. This is a set of packages built with stricter hardening flags - those that have not yet received enough testing to be applied universally, those that are more likely to cause build failures or those that have drawbacks to their use (e.g. performance or required hardware features). +- `pkgsExtraHardening`, a new top-level package set, was added. This is a set of packages built with stricter hardening flags - those that have not yet received enough testing to be applied universally, those that are more likely to cause build failures or those that have drawbacks to their use (e.g. performance or required hardware features). - `services.zfs.zed.enableMail` now uses the global `sendmail` wrapper defined by an email module (such as msmtp or Postfix). It no longer requires using a special ZFS build with email support. @@ -576,59 +666,65 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `nextcloud-setup.service` no longer changes the group of each file & directory inside `/var/lib/nextcloud/{config,data,store-apps}` if one of these directories has the wrong owner group. This was part of transitioning the group used for `/var/lib/nextcloud`, but isn't necessary anymore. -- `services.kavita` now uses the freeform option `services.kavita.settings` for the application settings file. +- `services.kavita` now uses the free-form option `services.kavita.settings` for the application settings file. The options `services.kavita.ipAdresses` and `services.kavita.port` now exist at `services.kavita.settings.IpAddresses` and `services.kavita.settings.IpAddresses`. The file at `services.kavita.tokenKeyFile` now needs to contain a secret with 512+ bits instead of 128+ bits. - `kavita` has been updated to 0.8.0, requiring a manual forced library scan on all libraries for migration. Refer to upstream's [release notes](https://github.com/Kareadita/Kavita/releases/tag/v0.8.0) for details. -- The `krb5` module has been rewritten and moved to `security.krb5`, moving all options but `security.krb5.enable` and `security.krb5.package` into `security.krb5.settings`. +- `krb5` module has been rewritten and moved to `security.krb5`, moving all options but `security.krb5.enable` and `security.krb5.package` into `security.krb5.settings`. - `services.soju` now has a wrapper for the `sojuctl` command, pointed at the service config file. It also has the new option `adminSocket.enable`, which creates a unix admin socket at `/run/soju/admin`. -- Gitea 1.21 upgrade has several breaking changes, including: +- `gitea` upgrade to 1.21 has several breaking changes, including: - Custom themes and other assets that were previously stored in `custom/public/*` now belong in `custom/public/assets/*` - New instances of Gitea using MySQL now ignore the `[database].CHARSET` config option and always use the `utf8mb4` charset, existing instances should migrate via the `gitea doctor convert` CLI command. -- The `services.paperless` module no longer uses the previously downloaded NLTK data stored in `/var/cache/paperless/nltk`. This directory can be removed. +- `services.paperless` module no longer uses the previously downloaded NLTK data stored in `/var/cache/paperless/nltk`. This directory can be removed. -- The `services.teeworlds` module now has a wealth of configuration options, including a new `package` option. +- `services.teeworlds` module now has a wealth of configuration options, including a new `package` option. -- The `hardware.pulseaudio` module now sets permission of pulse user home directory to 755 when running in "systemWide" mode. It fixes [issue 114399](https://github.com/NixOS/nixpkgs/issues/114399). +- `hardware.pulseaudio` module now sets permission of pulse user home directory to 755 when running in "systemWide" mode. It fixes [issue 114399](https://github.com/NixOS/nixpkgs/issues/114399). -- The `services.networkmanager.extraConfig` was renamed to `services.networkmanager.settings` and was changed to use the ini type instead of using a multiline string. +- `services.networkmanager.extraConfig` was renamed to `services.networkmanager.settings` and was changed to use the ini type instead of using a multiline string. -- The module `services.github-runner` has been removed. To configure a single GitHub Actions Runner refer to `services.github-runners.*`. Note that this will trigger a new runner registration. +- `services.github-runner` module has been removed. To configure a single GitHub Actions Runner refer to `services.github-runners.*`. Note that this will trigger a new runner registration. -- The `services.slskd` has been refactored to include more configuation options in - the freeform `services.slskd.settings` option, and some defaults (including listen ports) +- `services.slskd` has been refactored to include more configuation options in + the free-form `services.slskd.settings` option, and some defaults (including listen ports) have been changed to match the upstream defaults. Additionally, disk logging is now disabled by default, and the log rotation timer has been removed. The nginx virtualhost option is now of the `vhost-options` type. -- The `btrbk` module now automatically selects and provides required compression +- `services.btrbk` now automatically selects and provides required compression program depending on the configured `stream_compress` option. Since this replaces the need for the `extraPackages` option, this option will be deprecated in future releases. -- The `mpich` package expression now requires `withPm` to be a list, e.g. `"hydra:gforker"` becomes `[ "hydra" "gforker" ]`. +- `mpich` package expression now requires `withPm` to be a list, e.g. `"hydra:gforker"` becomes `[ "hydra" "gforker" ]`. -- When merging systemd unit options (of type `unitOption`), +- `systemd`: when merging unit options (of type `unitOption`), if at least one definition is a list, all those which aren't are now lifted into a list, making it possible to accumulate definitions without resorting to `mkForce`, hence to retain the definitions not anticipating that need. -- YouTrack is bumped to 2023.3. The update is not performed automatically, it requires manual interaction. See the YouTrack section in the manual for details. +- Lisp modules: previously deprecated interface based on `common-lisp.sh` has now been removed. -- QtMultimedia has changed its default backend to `QT_MEDIA_BACKEND=ffmpeg` (previously `gstreamer` on Linux or `darwin` on MacOS). +- `youtrack` is bumped to 2023.3. The update is not performed automatically, it requires manual interaction. See the YouTrack section in the manual for details. + +- `qt6.qtmultimedia` has changed its default backend to `QT_MEDIA_BACKEND=ffmpeg` (previously `gstreamer` on Linux or `darwin` on MacOS). The previous native backends remain available but are now minimally maintained. Refer to [upstream documentation](https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend) for further details about each platform. -- The `drbd` out-of-tree Linux kernel driver has been added in version `9.2.7`. With it the DRBD 9.x features can be used instead of the 8.x features provided by the `8.4.11` in-tree driver. +- `drbd` out-of-tree Linux kernel driver has been added in version 9.2.7. With it the DRBD 9.x features can be used instead of the 8.x features provided by the 8.4.11 in-tree driver. -- The oil shell's c++ version is now available as `oils-for-unix`. The python version is still available as `oil` +- `oils-for-unix`, the oil shell's c++ version is now available. The python version is still available as `oil`. - `documentation.man.mandoc` now by default uses `MANPATH` to set the directories where mandoc will search for manual pages. This enables mandoc to find manual pages in Nix profiles. To set the manual search paths via the `mandoc.conf` configuration file like before, use `documentation.man.mandoc.settings.manpath` instead. -- The `grafana-loki` package was updated to 3.0.0 which includes [breaking changes](https://github.com/grafana/loki/releases/tag/v3.0.0) +- The `systemd-confinement` module extension is now compatible with `DynamicUser=true` and thus `ProtectSystem=strict` too. + +- `grafana-loki` package was updated to 3.0.0 which includes [breaking changes](https://github.com/grafana/loki/releases/tag/v3.0.0). + +- `programs.fish.package` now allows you to override the package used in the `fish` module. diff --git a/third_party/nixpkgs/nixos/lib/qemu-common.nix b/third_party/nixpkgs/nixos/lib/qemu-common.nix index b946f62d93..f1e19c5b3b 100644 --- a/third_party/nixpkgs/nixos/lib/qemu-common.nix +++ b/third_party/nixpkgs/nixos/lib/qemu-common.nix @@ -35,6 +35,8 @@ rec { aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=max,accel=kvm:tcg -cpu max"; powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; powerpc64-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; + riscv32-linux = "${qemuPkg}/bin/qemu-system-riscv32 -machine virt"; + riscv64-linux = "${qemuPkg}/bin/qemu-system-riscv64 -machine virt"; x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu max"; }; otherHostGuestMatrix = { diff --git a/third_party/nixpkgs/nixos/lib/systemd-lib.nix b/third_party/nixpkgs/nixos/lib/systemd-lib.nix index 198a710f05..0641da8e77 100644 --- a/third_party/nixpkgs/nixos/lib/systemd-lib.nix +++ b/third_party/nixpkgs/nixos/lib/systemd-lib.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs }: +{ config, lib, pkgs, utils }: let inherit (lib) @@ -14,10 +14,13 @@ let elem filter filterAttrs + flatten flip head isInt + isFloat isList + isPath length makeBinPath makeSearchPathOutput @@ -28,6 +31,7 @@ let optional optionalAttrs optionalString + pipe range replaceStrings reverseList @@ -149,7 +153,7 @@ in rec { "Systemd ${group} field `${name}' is outside the range [${toString min},${toString max}]"; assertRangeOrOneOf = name: min: max: values: group: attr: - optional (attr ? ${name} && !((min <= attr.${name} && max >= attr.${name}) || elem attr.${name} values)) + optional (attr ? ${name} && !(((isInt attr.${name} || isFloat attr.${name}) && min <= attr.${name} && max >= attr.${name}) || elem attr.${name} values)) "Systemd ${group} field `${name}' is not a value in range [${toString min},${toString max}], or one of ${toString values}"; assertMinimum = name: min: group: attr: @@ -366,9 +370,17 @@ in rec { // optionalAttrs (config.requisite != []) { Requisite = toString config.requisite; } // optionalAttrs (config ? restartTriggers && config.restartTriggers != []) - { X-Restart-Triggers = "${pkgs.writeText "X-Restart-Triggers-${name}" (toString config.restartTriggers)}"; } + { X-Restart-Triggers = "${pkgs.writeText "X-Restart-Triggers-${name}" (pipe config.restartTriggers [ + flatten + (map (x: if isPath x then "${x}" else x)) + toString + ])}"; } // optionalAttrs (config ? reloadTriggers && config.reloadTriggers != []) - { X-Reload-Triggers = "${pkgs.writeText "X-Reload-Triggers-${name}" (toString config.reloadTriggers)}"; } + { X-Reload-Triggers = "${pkgs.writeText "X-Reload-Triggers-${name}" (pipe config.reloadTriggers [ + flatten + (map (x: if isPath x then "${x}" else x)) + toString + ])}"; } // optionalAttrs (config.description != "") { Description = config.description; } // optionalAttrs (config.documentation != []) { @@ -385,8 +397,41 @@ in rec { }; }; - serviceConfig = { config, ... }: { - config.environment.PATH = mkIf (config.path != []) "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}"; + serviceConfig = { name, config, ... }: { + config = { + name = "${name}.service"; + environment.PATH = mkIf (config.path != []) "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}"; + }; + }; + + pathConfig = { name, config, ... }: { + config = { + name = "${name}.path"; + }; + }; + + socketConfig = { name, config, ... }: { + config = { + name = "${name}.socket"; + }; + }; + + sliceConfig = { name, config, ... }: { + config = { + name = "${name}.slice"; + }; + }; + + targetConfig = { name, config, ... }: { + config = { + name = "${name}.target"; + }; + }; + + timerConfig = { name, config, ... }: { + config = { + name = "${name}.timer"; + }; }; stage2ServiceConfig = { @@ -405,6 +450,7 @@ in rec { mountConfig = { config, ... }: { config = { + name = "${utils.escapeSystemdPath config.where}.mount"; mountConfig = { What = config.what; Where = config.where; @@ -418,6 +464,7 @@ in rec { automountConfig = { config, ... }: { config = { + name = "${utils.escapeSystemdPath config.where}.automount"; automountConfig = { Where = config.where; }; @@ -433,8 +480,8 @@ in rec { WantedBy=${concatStringsSep " " def.wantedBy} ''; - targetToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; + targetToUnit = def: + { inherit (def) name aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = '' [Unit] @@ -442,8 +489,8 @@ in rec { ''; }; - serviceToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; + serviceToUnit = def: + { inherit (def) name aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def ('' [Service] '' + (let env = cfg.globalEnvironment // def.environment; @@ -452,7 +499,7 @@ in rec { "Environment=${toJSON "${n}=${env.${n}}"}\n"; # systemd max line length is now 1MiB # https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af - in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)) + in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${def.name}.service’ is too long." else s) (attrNames env)) + (if def ? reloadIfChanged && def.reloadIfChanged then '' X-ReloadIfChanged=true '' else if (def ? restartIfChanged && !def.restartIfChanged) then '' @@ -463,8 +510,8 @@ in rec { '' + attrsToSection def.serviceConfig); }; - socketToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; + socketToUnit = def: + { inherit (def) name aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def '' [Socket] ${attrsToSection def.socketConfig} @@ -473,40 +520,40 @@ in rec { ''; }; - timerToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; + timerToUnit = def: + { inherit (def) name aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def '' [Timer] ${attrsToSection def.timerConfig} ''; }; - pathToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; + pathToUnit = def: + { inherit (def) name aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def '' [Path] ${attrsToSection def.pathConfig} ''; }; - mountToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; + mountToUnit = def: + { inherit (def) name aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def '' [Mount] ${attrsToSection def.mountConfig} ''; }; - automountToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; + automountToUnit = def: + { inherit (def) name aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def '' [Automount] ${attrsToSection def.automountConfig} ''; }; - sliceToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; + sliceToUnit = def: + { inherit (def) name aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def '' [Slice] ${attrsToSection def.sliceConfig} diff --git a/third_party/nixpkgs/nixos/lib/systemd-types.nix b/third_party/nixpkgs/nixos/lib/systemd-types.nix index c4c5771cff..f3bc8e06d9 100644 --- a/third_party/nixpkgs/nixos/lib/systemd-types.nix +++ b/third_party/nixpkgs/nixos/lib/systemd-types.nix @@ -5,8 +5,13 @@ let automountConfig makeUnit mountConfig + pathConfig + sliceConfig + socketConfig stage1ServiceConfig stage2ServiceConfig + targetConfig + timerConfig unitConfig ; @@ -48,29 +53,32 @@ let ; in -rec { +{ units = attrsOf (submodule ({ name, config, ... }: { options = concreteUnitOptions; - config = { unit = mkDefault (makeUnit name config); }; + config = { + name = mkDefault name; + unit = mkDefault (makeUnit name config); + }; })); services = attrsOf (submodule [ stage2ServiceOptions unitConfig stage2ServiceConfig ]); initrdServices = attrsOf (submodule [ stage1ServiceOptions unitConfig stage1ServiceConfig ]); - targets = attrsOf (submodule [ stage2CommonUnitOptions unitConfig ]); - initrdTargets = attrsOf (submodule [ stage1CommonUnitOptions unitConfig ]); + targets = attrsOf (submodule [ stage2CommonUnitOptions unitConfig targetConfig ]); + initrdTargets = attrsOf (submodule [ stage1CommonUnitOptions unitConfig targetConfig ]); - sockets = attrsOf (submodule [ stage2SocketOptions unitConfig ]); - initrdSockets = attrsOf (submodule [ stage1SocketOptions unitConfig ]); + sockets = attrsOf (submodule [ stage2SocketOptions unitConfig socketConfig]); + initrdSockets = attrsOf (submodule [ stage1SocketOptions unitConfig socketConfig ]); - timers = attrsOf (submodule [ stage2TimerOptions unitConfig ]); - initrdTimers = attrsOf (submodule [ stage1TimerOptions unitConfig ]); + timers = attrsOf (submodule [ stage2TimerOptions unitConfig timerConfig ]); + initrdTimers = attrsOf (submodule [ stage1TimerOptions unitConfig timerConfig ]); - paths = attrsOf (submodule [ stage2PathOptions unitConfig ]); - initrdPaths = attrsOf (submodule [ stage1PathOptions unitConfig ]); + paths = attrsOf (submodule [ stage2PathOptions unitConfig pathConfig ]); + initrdPaths = attrsOf (submodule [ stage1PathOptions unitConfig pathConfig ]); - slices = attrsOf (submodule [ stage2SliceOptions unitConfig ]); - initrdSlices = attrsOf (submodule [ stage1SliceOptions unitConfig ]); + slices = attrsOf (submodule [ stage2SliceOptions unitConfig sliceConfig ]); + initrdSlices = attrsOf (submodule [ stage1SliceOptions unitConfig sliceConfig ]); mounts = listOf (submodule [ stage2MountOptions unitConfig mountConfig ]); initrdMounts = listOf (submodule [ stage1MountOptions unitConfig mountConfig ]); diff --git a/third_party/nixpkgs/nixos/lib/systemd-unit-options.nix b/third_party/nixpkgs/nixos/lib/systemd-unit-options.nix index fc990a87f0..160f2bf948 100644 --- a/third_party/nixpkgs/nixos/lib/systemd-unit-options.nix +++ b/third_party/nixpkgs/nixos/lib/systemd-unit-options.nix @@ -65,6 +65,14 @@ in rec { ''; }; + name = lib.mkOption { + type = lib.types.str; + description = '' + The name of this systemd unit, including its extension. + This can be used to refer to this unit from other systemd units. + ''; + }; + overrideStrategy = mkOption { default = "asDropinIfExists"; type = types.enum [ "asDropinIfExists" "asDropin" ]; diff --git a/third_party/nixpkgs/nixos/lib/testing/driver.nix b/third_party/nixpkgs/nixos/lib/testing/driver.nix index 7eb06e0239..d4f8e0f0c6 100644 --- a/third_party/nixpkgs/nixos/lib/testing/driver.nix +++ b/third_party/nixpkgs/nixos/lib/testing/driver.nix @@ -139,7 +139,7 @@ in enableOCR = mkOption { description = '' Whether to enable Optical Character Recognition functionality for - testing graphical programs. See [Machine objects](`ssec-machine-objects`). + testing graphical programs. See [`Machine objects`](#ssec-machine-objects). ''; type = types.bool; default = false; diff --git a/third_party/nixpkgs/nixos/lib/utils.nix b/third_party/nixpkgs/nixos/lib/utils.nix index 4992113bdb..c1c1828a2c 100644 --- a/third_party/nixpkgs/nixos/lib/utils.nix +++ b/third_party/nixpkgs/nixos/lib/utils.nix @@ -35,7 +35,8 @@ let inherit (lib.strings) toJSON normalizePath escapeC; in -rec { +let +utils = rec { # Copy configuration files to avoid having the entire sources in the system closure copyFile = filePath: pkgs.runCommand (builtins.unsafeDiscardStringContext (baseNameOf filePath)) {} '' @@ -262,11 +263,12 @@ rec { filter (x: !(elem (getName x) namesToRemove)) packages; systemdUtils = { - lib = import ./systemd-lib.nix { inherit lib config pkgs; }; + lib = import ./systemd-lib.nix { inherit lib config pkgs utils; }; unitOptions = import ./systemd-unit-options.nix { inherit lib systemdUtils; }; types = import ./systemd-types.nix { inherit lib systemdUtils pkgs; }; network = { units = import ./systemd-network-units.nix { inherit lib systemdUtils; }; }; }; -} +}; +in utils diff --git a/third_party/nixpkgs/nixos/modules/config/malloc.nix b/third_party/nixpkgs/nixos/modules/config/malloc.nix index 4214ae5983..e414970b0b 100644 --- a/third_party/nixpkgs/nixos/modules/config/malloc.nix +++ b/third_party/nixpkgs/nixos/modules/config/malloc.nix @@ -9,8 +9,23 @@ let graphene-hardened = { libPath = "${pkgs.graphene-hardened-malloc}/lib/libhardened_malloc.so"; description = '' - An allocator designed to mitigate memory corruption attacks, such as - those caused by use-after-free bugs. + Hardened memory allocator coming from GrapheneOS project. + The default configuration template has all normal optional security + features enabled and is quite aggressive in terms of sacrificing + performance and memory usage for security. + ''; + }; + + graphene-hardened-light = { + libPath = "${pkgs.graphene-hardened-malloc}/lib/libhardened_malloc-light.so"; + description = '' + Hardened memory allocator coming from GrapheneOS project. + The light configuration template disables the slab quarantines, + write after free check, slot randomization and raises the guard + slab interval from 1 to 8 but leaves zero-on-free and slab canaries enabled. + The light configuration has solid performance and memory usage while still + being far more secure than mainstream allocators with much better security + properties. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix index c9a133d055..1d7976cef3 100644 --- a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix +++ b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix @@ -31,8 +31,11 @@ with lib; cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; fastfetch = super.fastfetch.override { vulkanSupport = false; waylandSupport = false; x11Support = false; }; + ffmpeg = super.ffmpeg.override { ffmpegVariant = "headless"; }; ffmpeg_4 = super.ffmpeg_4.override { ffmpegVariant = "headless"; }; ffmpeg_5 = super.ffmpeg_5.override { ffmpegVariant = "headless"; }; + ffmpeg_6 = super.ffmpeg_6.override { ffmpegVariant = "headless"; }; + ffmpeg_7 = super.ffmpeg_7.override { ffmpegVariant = "headless"; }; # dep of graphviz, libXpm is optional for Xpm support gd = super.gd.override { withXorg = false; }; ghostscript = super.ghostscript.override { cupsSupport = false; x11Support = false; }; @@ -44,7 +47,7 @@ with lib; gst_all_1 = super.gst_all_1 // { gst-plugins-bad = super.gst_all_1.gst-plugins-bad.override { guiSupport = false; }; gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableWayland = false; enableX11 = false; }; - gst-plugins-good = super.gst_all_1.gst-plugins-good.override { enableX11 = false; }; + gst-plugins-good = super.gst_all_1.gst-plugins-good.override { enableWayland = false; enableX11 = false; gtkSupport = false; qt5Support = false; qt6Support = false; }; }; imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; diff --git a/third_party/nixpkgs/nixos/modules/config/terminfo.nix b/third_party/nixpkgs/nixos/modules/config/terminfo.nix index 4b58605aa7..b538d749ff 100644 --- a/third_party/nixpkgs/nixos/modules/config/terminfo.nix +++ b/third_party/nixpkgs/nixos/modules/config/terminfo.nix @@ -31,7 +31,7 @@ with lib; # attrNames (filterAttrs # (_: drv: (builtins.tryEval (isDerivation drv && drv ? terminfo)).value) # pkgs) - environment.systemPackages = mkIf config.environment.enableAllTerminfo (map (x: x.terminfo) (with pkgs; [ + environment.systemPackages = mkIf config.environment.enableAllTerminfo (map (x: x.terminfo) (with pkgs.pkgsBuildBuild; [ alacritty contour foot diff --git a/third_party/nixpkgs/nixos/modules/config/xdg/terminal-exec.nix b/third_party/nixpkgs/nixos/modules/config/xdg/terminal-exec.nix new file mode 100644 index 0000000000..daf2055d2e --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/config/xdg/terminal-exec.nix @@ -0,0 +1,54 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.xdg.terminal-exec; + inherit (lib) mkIf mkEnableOption mkOption mkPackageOption types; +in +{ + meta.maintainers = with lib.maintainers; [ Cryolitia ]; + + ###### interface + + options = { + xdg.terminal-exec = { + enable = mkEnableOption "xdg-terminal-exec, the [proposed](https://gitlab.freedesktop.org/xdg/xdg-specs/-/merge_requests/46) Default Terminal Execution Specification"; + package = mkPackageOption pkgs "xdg-terminal-exec" { }; + settings = mkOption { + type = with types; attrsOf (listOf str); + default = { }; + description = '' + Configuration options for the Default Terminal Execution Specification. + + The keys are the desktop environments that are matched (case-insensitively) against `$XDG_CURRENT_DESKTOP`, + or `default` which is used when the current desktop environment is not found in the configuration. + The values are a list of terminals' [desktop file IDs](https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s02.html#desktop-file-id) to try in order of decreasing priority. + ''; + example = { + default = [ "kitty.desktop" ]; + GNOME = [ "com.raggesilver.BlackBox.desktop" "org.gnome.Terminal.desktop" ]; + }; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + environment = { + systemPackages = [ cfg.package ]; + + etc = lib.mapAttrs' ( + desktop: terminals: + # map desktop name such as GNOME to `xdg/gnome-xdg-terminals.list`, default to `xdg/xdg-terminals.list` + lib.nameValuePair ( + "xdg/${if desktop == "default" then "" else "${lib.toLower desktop}-"}xdg-terminals.list" + ) { text = lib.concatLines terminals; } + ) cfg.settings; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix b/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix index 99b5510543..6f61254a60 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix @@ -19,7 +19,9 @@ let [Startup] sync_effects_enabled = ${toPyBoolStr cfg.syncEffectsEnabled} devices_off_on_screensaver = ${toPyBoolStr cfg.devicesOffOnScreensaver} - mouse_battery_notifier = ${toPyBoolStr cfg.mouseBatteryNotifier} + battery_notifier = ${toPyBoolStr cfg.batteryNotifier.enable} + battery_notifier_freq = ${builtins.toString cfg.batteryNotifier.frequency} + battery_notifier_percent = ${builtins.toString cfg.batteryNotifier.percentage} [Statistics] key_statistics = ${toPyBoolStr cfg.keyStatistics} @@ -78,12 +80,39 @@ in ''; }; - mouseBatteryNotifier = mkOption { - type = types.bool; - default = true; + batteryNotifier = mkOption { description = '' - Mouse battery notifier. + Settings for device battery notifications. ''; + default = {}; + type = types.submodule { + options = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Mouse battery notifier. + ''; + }; + frequency = mkOption { + type = types.int; + default = 600; + description = '' + How often battery notifications should be shown (in seconds). + A value of 0 disables notifications. + ''; + }; + + percentage = mkOption { + type = types.int; + default = 33; + description = '' + At what battery percentage the device should reach before + sending notifications. + ''; + }; + }; + }; }; keyStatistics = mkOption { @@ -106,6 +135,10 @@ in }; }; + imports = [ + (mkRenamedOptionModule [ "hardware" "openrazer" "mouseBatteryNotifier" ] [ "hardware" "openrazer" "batteryNotifier" "enable" ]) + ]; + config = mkIf cfg.enable { boot.extraModulePackages = [ kernelPackages.openrazer ]; boot.kernelModules = drivers; @@ -127,15 +160,15 @@ in systemd.user.services.openrazer-daemon = { description = "Daemon to manage razer devices in userspace"; unitConfig.Documentation = "man:openrazer-daemon(8)"; - # Requires a graphical session so the daemon knows when the screensaver - # starts. See the 'devicesOffOnScreensaver' option. - wantedBy = [ "graphical-session.target" ]; - partOf = [ "graphical-session.target" ]; - serviceConfig = { - Type = "dbus"; - BusName = "org.razer"; - ExecStart = "${daemonExe} --foreground"; - Restart = "always"; + # Requires a graphical session so the daemon knows when the screensaver + # starts. See the 'devicesOffOnScreensaver' option. + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + serviceConfig = { + Type = "dbus"; + BusName = "org.razer"; + ExecStart = "${daemonExe} --foreground"; + Restart = "always"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/intel-gpu-tools.nix b/third_party/nixpkgs/nixos/modules/hardware/video/intel-gpu-tools.nix new file mode 100644 index 0000000000..b69fefcae1 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/video/intel-gpu-tools.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.hardware.intel-gpu-tools; +in +{ + options = { + hardware.intel-gpu-tools = { + enable = lib.mkEnableOption "a setcap wrapper for intel-gpu-tools"; + }; + }; + + config = lib.mkIf cfg.enable { + security.wrappers.intel_gpu_top = { + owner = "root"; + group = "root"; + source = "${pkgs.intel-gpu-tools}/bin/intel_gpu_top"; + capabilities = "cap_perfmon+ep"; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ kira-bruneau ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix index e7f9990e96..7f16b97440 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix @@ -185,7 +185,7 @@ in # }; # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; + # services.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. # users.users.alice = { diff --git a/third_party/nixpkgs/nixos/modules/misc/documentation.nix b/third_party/nixpkgs/nixos/modules/misc/documentation.nix index 2a25f8e564..26323e14b9 100644 --- a/third_party/nixpkgs/nixos/modules/misc/documentation.nix +++ b/third_party/nixpkgs/nixos/modules/misc/documentation.nix @@ -101,6 +101,7 @@ let libPath = filter (pkgs.path + "/lib"); pkgsLibPath = filter (pkgs.path + "/pkgs/pkgs-lib"); nixosPath = filter (pkgs.path + "/nixos"); + NIX_ABORT_ON_WARN = warningsAreErrors; modules = "[ " + concatMapStringsSep " " (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 29c373788c..b14b83a811 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -45,6 +45,7 @@ ./config/xdg/portals/lxqt.nix ./config/xdg/portals/wlr.nix ./config/xdg/sounds.nix + ./config/xdg/terminal-exec.nix ./config/zram.nix ./hardware/acpilight.nix ./hardware/all-firmware.nix @@ -106,6 +107,7 @@ ./hardware/video/bumblebee.nix ./hardware/video/capture/mwprocapture.nix ./hardware/video/displaylink.nix + ./hardware/video/intel-gpu-tools.nix ./hardware/video/nvidia.nix ./hardware/video/switcheroo-control.nix ./hardware/video/uvcvideo/default.nix @@ -306,6 +308,7 @@ ./programs/xwayland.nix ./programs/yabar.nix ./programs/yazi.nix + ./programs/ydotool.nix ./programs/yubikey-touch-detector.nix ./programs/zmap.nix ./programs/zsh/oh-my-zsh.nix @@ -325,6 +328,7 @@ ./security/duosec.nix ./security/google_oslogin.nix ./security/ipa.nix + ./security/isolate.nix ./security/krb5 ./security/lock-kernel-modules.nix ./security/misc.nix @@ -558,8 +562,9 @@ ./services/hardware/joycond.nix ./services/hardware/kanata.nix ./services/hardware/lcd.nix + ./services/hardware/libinput.nix ./services/hardware/lirc.nix - ./services/hardware/nvidia-container-toolkit-cdi-generator + ./services/hardware/nvidia-container-toolkit ./services/hardware/monado.nix ./services/hardware/nvidia-optimus.nix ./services/hardware/openrgb.nix @@ -662,6 +667,7 @@ ./services/matrix/maubot.nix ./services/matrix/mautrix-facebook.nix ./services/matrix/mautrix-meta.nix + ./services/matrix/mautrix-signal.nix ./services/matrix/mautrix-telegram.nix ./services/matrix/mautrix-whatsapp.nix ./services/matrix/mjolnir.nix @@ -694,6 +700,7 @@ ./services/misc/cpuminer-cryptonight.nix ./services/misc/db-rest.nix ./services/misc/devmon.nix + ./services/misc/devpi-server.nix ./services/misc/dictd.nix ./services/misc/disnix.nix ./services/misc/docker-registry.nix @@ -771,6 +778,7 @@ ./services/misc/polaris.nix ./services/misc/portunus.nix ./services/misc/preload.nix + ./services/misc/private-gpt.nix ./services/misc/prowlarr.nix ./services/misc/pufferpanel.nix ./services/misc/pykms.nix @@ -944,6 +952,7 @@ ./services/networking/charybdis.nix ./services/networking/chisel-server.nix ./services/networking/cjdns.nix + ./services/networking/clatd.nix ./services/networking/cloudflare-dyndns.nix ./services/networking/cloudflared.nix ./services/networking/cntlm.nix @@ -1012,6 +1021,7 @@ ./services/networking/icecream/daemon.nix ./services/networking/icecream/scheduler.nix ./services/networking/imaginary.nix + ./services/networking/inadyn.nix ./services/networking/inspircd.nix ./services/networking/iodine.nix ./services/networking/iperf3.nix @@ -1026,6 +1036,7 @@ ./services/networking/jigasi.nix ./services/networking/jitsi-videobridge.nix ./services/networking/jool.nix + ./services/networking/jotta-cli.nix ./services/networking/kea.nix ./services/networking/keepalived/default.nix ./services/networking/keybase.nix @@ -1253,8 +1264,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/oauth2-proxy-nginx.nix ./services/security/opensnitch.nix ./services/security/pass-secret-service.nix ./services/security/physlock.nix @@ -1420,6 +1431,7 @@ ./services/web-apps/windmill.nix ./services/web-apps/wordpress.nix ./services/web-apps/writefreely.nix + ./services/web-apps/your_spotify.nix ./services/web-apps/youtrack.nix ./services/web-apps/zabbix.nix ./services/web-apps/zitadel.nix @@ -1471,7 +1483,6 @@ ./services/x11/gdk-pixbuf.nix ./services/x11/hardware/cmt.nix ./services/x11/hardware/digimend.nix - ./services/x11/hardware/libinput.nix ./services/x11/hardware/synaptics.nix ./services/x11/hardware/wacom.nix ./services/x11/imwheel.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/graphical.nix b/third_party/nixpkgs/nixos/modules/profiles/graphical.nix index 8cc31652f8..72b865c584 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/graphical.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/graphical.nix @@ -7,10 +7,12 @@ services.xserver = { enable = true; desktopManager.plasma5.enable = true; - libinput.enable = true; # for touchpad support on many laptops }; - services.displayManager.sddm.enable = true; + services = { + displayManager.sddm.enable = true; + libinput.enable = true; # for touchpad support on many laptops + }; # Enable sound in virtualbox appliances. hardware.pulseaudio.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/profiles/perlless.nix b/third_party/nixpkgs/nixos/modules/profiles/perlless.nix index 90abd14f07..010e4f8f2a 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/perlless.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/perlless.nix @@ -26,6 +26,6 @@ # Check that the system does not contain a Nix store path that contains the # string "perl". - system.forbiddenDependenciesRegex = "perl"; + system.forbiddenDependenciesRegexes = ["perl"]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/_1password-gui.nix b/third_party/nixpkgs/nixos/modules/programs/_1password-gui.nix index b21e8783f6..04f36cf023 100644 --- a/third_party/nixpkgs/nixos/modules/programs/_1password-gui.nix +++ b/third_party/nixpkgs/nixos/modules/programs/_1password-gui.nix @@ -1,7 +1,5 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs._1password-gui; @@ -9,25 +7,25 @@ let in { imports = [ - (mkRemovedOptionModule [ "programs" "_1password-gui" "gid" ] '' + (lib.mkRemovedOptionModule [ "programs" "_1password-gui" "gid" ] '' A preallocated GID will be used instead. '') ]; options = { programs._1password-gui = { - enable = mkEnableOption "the 1Password GUI application"; + enable = lib.mkEnableOption "the 1Password GUI application"; - polkitPolicyOwners = mkOption { - type = types.listOf types.str; + polkitPolicyOwners = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; - example = literalExpression ''["user1" "user2" "user3"]''; + example = lib.literalExpression ''["user1" "user2" "user3"]''; description = '' A list of users who should be able to integrate 1Password with polkit-based authentication mechanisms. ''; }; - package = mkPackageOption pkgs "1Password GUI" { + package = lib.mkPackageOption pkgs "1Password GUI" { default = [ "_1password-gui" ]; }; }; @@ -39,7 +37,7 @@ in polkitPolicyOwners = cfg.polkitPolicyOwners; }; in - mkIf cfg.enable { + lib.mkIf cfg.enable { environment.systemPackages = [ package ]; users.groups.onepassword.gid = config.ids.gids.onepassword; diff --git a/third_party/nixpkgs/nixos/modules/programs/_1password.nix b/third_party/nixpkgs/nixos/modules/programs/_1password.nix index b87e9b776e..5dff199341 100644 --- a/third_party/nixpkgs/nixos/modules/programs/_1password.nix +++ b/third_party/nixpkgs/nixos/modules/programs/_1password.nix @@ -1,7 +1,5 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs._1password; @@ -9,22 +7,22 @@ let in { imports = [ - (mkRemovedOptionModule [ "programs" "_1password" "gid" ] '' + (lib.mkRemovedOptionModule [ "programs" "_1password" "gid" ] '' A preallocated GID will be used instead. '') ]; options = { programs._1password = { - enable = mkEnableOption "the 1Password CLI tool"; + enable = lib.mkEnableOption "the 1Password CLI tool"; - package = mkPackageOption pkgs "1Password CLI" { + package = lib.mkPackageOption pkgs "1Password CLI" { default = [ "_1password" ]; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; users.groups.onepassword-cli.gid = config.ids.gids.onepassword-cli; diff --git a/third_party/nixpkgs/nixos/modules/programs/adb.nix b/third_party/nixpkgs/nixos/modules/programs/adb.nix index d8c700bc36..62ab6ab413 100644 --- a/third_party/nixpkgs/nixos/modules/programs/adb.nix +++ b/third_party/nixpkgs/nixos/modules/programs/adb.nix @@ -1,16 +1,14 @@ { config, lib, pkgs, ... }: -with lib; - { - meta.maintainers = [ maintainers.mic92 ]; + meta.maintainers = [ lib.maintainers.mic92 ]; ###### interface options = { programs.adb = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to configure system to use Android Debug Bridge (adb). To grant access to a user, it must be part of adbusers group: @@ -21,7 +19,7 @@ with lib; }; ###### implementation - config = mkIf config.programs.adb.enable { + config = lib.mkIf config.programs.adb.enable { services.udev.packages = [ pkgs.android-udev-rules ]; environment.systemPackages = [ pkgs.android-tools ]; users.groups.adbusers = {}; diff --git a/third_party/nixpkgs/nixos/modules/programs/alvr.nix b/third_party/nixpkgs/nixos/modules/programs/alvr.nix index e5de06f115..da66200cf0 100644 --- a/third_party/nixpkgs/nixos/modules/programs/alvr.nix +++ b/third_party/nixpkgs/nixos/modules/programs/alvr.nix @@ -1,19 +1,17 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.alvr; in { options = { programs.alvr = { - enable = mkEnableOption "ALVR, the VR desktop streamer"; + enable = lib.mkEnableOption "ALVR, the VR desktop streamer"; - package = mkPackageOption pkgs "alvr" { }; + package = lib.mkPackageOption pkgs "alvr" { }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to open the default ports in the firewall for the ALVR server. @@ -22,14 +20,14 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - networking.firewall = mkIf cfg.openFirewall { + networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ 9943 9944 ]; allowedUDPPorts = [ 9943 9944 ]; }; }; - meta.maintainers = with maintainers; [ passivelemon ]; + meta.maintainers = with lib.maintainers; [ passivelemon ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/appgate-sdp.nix b/third_party/nixpkgs/nixos/modules/programs/appgate-sdp.nix index 6d61c87eeb..f4d4140571 100644 --- a/third_party/nixpkgs/nixos/modules/programs/appgate-sdp.nix +++ b/third_party/nixpkgs/nixos/modules/programs/appgate-sdp.nix @@ -1,15 +1,13 @@ { config, pkgs, lib, ... }: -with lib; - { options = { programs.appgate-sdp = { - enable = mkEnableOption "the AppGate SDP VPN client"; + enable = lib.mkEnableOption "the AppGate SDP VPN client"; }; }; - config = mkIf config.programs.appgate-sdp.enable { + config = lib.mkIf config.programs.appgate-sdp.enable { boot.kernelModules = [ "tun" ]; environment.systemPackages = [ pkgs.appgate-sdp ]; services.dbus.packages = [ pkgs.appgate-sdp ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/atop.nix b/third_party/nixpkgs/nixos/modules/programs/atop.nix index 618b641143..be82e43247 100644 --- a/third_party/nixpkgs/nixos/modules/programs/atop.nix +++ b/third_party/nixpkgs/nixos/modules/programs/atop.nix @@ -2,8 +2,6 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.atop; in @@ -14,31 +12,31 @@ in programs.atop = rec { - enable = mkEnableOption "Atop, a tool for monitoring system resources"; + enable = lib.mkEnableOption "Atop, a tool for monitoring system resources"; - package = mkPackageOption pkgs "atop" { }; + package = lib.mkPackageOption pkgs "atop" { }; netatop = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to install and enable the netatop kernel module. Note: this sets the kernel taint flag "O" for loading out-of-tree modules. ''; }; - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = config.boot.kernelPackages.netatop; - defaultText = literalExpression "config.boot.kernelPackages.netatop"; + defaultText = lib.literalExpression "config.boot.kernelPackages.netatop"; description = '' Which package to use for netatop. ''; }; }; - atopgpu.enable = mkOption { - type = types.bool; + atopgpu.enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to install and enable the atopgpud daemon to get information about @@ -46,8 +44,8 @@ in ''; }; - setuidWrapper.enable = mkOption { - type = types.bool; + setuidWrapper.enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to install a setuid wrapper for Atop. This is required to use some of @@ -56,24 +54,24 @@ in ''; }; - atopService.enable = mkOption { - type = types.bool; + atopService.enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable the atop service responsible for storing statistics for long-term analysis. ''; }; - atopRotateTimer.enable = mkOption { - type = types.bool; + atopRotateTimer.enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable the atop-rotate timer, which restarts the atop service daily to make sure the data files are rotate. ''; }; - atopacctService.enable = mkOption { - type = types.bool; + atopacctService.enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable the atopacct service which manages process accounting. @@ -81,8 +79,8 @@ in two refresh intervals. ''; }; - settings = mkOption { - type = types.attrs; + settings = lib.mkOption { + type = lib.types.attrs; default = { }; example = { flags = "a1f"; @@ -95,7 +93,7 @@ in }; }; - config = mkIf cfg.enable ( + config = lib.mkIf cfg.enable ( let atop = if cfg.atopgpu.enable then @@ -104,11 +102,11 @@ in cfg.package; in { - environment.etc = mkIf (cfg.settings != { }) { - atoprc.text = concatStrings - (mapAttrsToList + environment.etc = lib.mkIf (cfg.settings != { }) { + atoprc.text = lib.concatStrings + (lib.mapAttrsToList (n: v: '' - ${n} ${toString v} + ${n} ${builtins.toString v} '') cfg.settings); }; @@ -122,8 +120,8 @@ in wantedBy = [ (if type == "services" then "multi-user.target" else if type == "timers" then "timers.target" else null) ]; }; }; - mkService = mkSystemd "services"; - mkTimer = mkSystemd "timers"; + mkService = lib.mkSystemd "services"; + mkTimer = lib.mkSystemd "timers"; in { packages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/ausweisapp.nix b/third_party/nixpkgs/nixos/modules/programs/ausweisapp.nix index 0359e58c55..ebd6a3e13b 100644 --- a/third_party/nixpkgs/nixos/modules/programs/ausweisapp.nix +++ b/third_party/nixpkgs/nixos/modules/programs/ausweisapp.nix @@ -1,15 +1,13 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.ausweisapp; in { options.programs.ausweisapp = { - enable = mkEnableOption "AusweisApp"; + enable = lib.mkEnableOption "AusweisApp"; - openFirewall = mkOption { + openFirewall = lib.mkOption { description = '' Whether to open the required firewall ports for the Smartphone as Card Reader (SaC) functionality of AusweisApp. ''; @@ -18,7 +16,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ ausweisapp ]; networking.firewall.allowedUDPPorts = lib.optionals cfg.openFirewall [ 24727 ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/autojump.nix b/third_party/nixpkgs/nixos/modules/programs/autojump.nix index ecfc2f6580..5011d7e142 100644 --- a/third_party/nixpkgs/nixos/modules/programs/autojump.nix +++ b/third_party/nixpkgs/nixos/modules/programs/autojump.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.autojump; prg = config.programs; @@ -10,8 +8,8 @@ in options = { programs.autojump = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable autojump. @@ -22,12 +20,12 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.pathsToLink = [ "/share/autojump" ]; environment.systemPackages = [ pkgs.autojump ]; programs.bash.interactiveShellInit = "source ${pkgs.autojump}/share/autojump/autojump.bash"; - programs.zsh.interactiveShellInit = mkIf prg.zsh.enable "source ${pkgs.autojump}/share/autojump/autojump.zsh"; - programs.fish.interactiveShellInit = mkIf prg.fish.enable "source ${pkgs.autojump}/share/autojump/autojump.fish"; + programs.zsh.interactiveShellInit = lib.mkIf prg.zsh.enable "source ${pkgs.autojump}/share/autojump/autojump.zsh"; + programs.fish.interactiveShellInit = lib.mkIf prg.fish.enable "source ${pkgs.autojump}/share/autojump/autojump.fish"; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/bandwhich.nix b/third_party/nixpkgs/nixos/modules/programs/bandwhich.nix index 2c78584f2d..e2c55ca5be 100644 --- a/third_party/nixpkgs/nixos/modules/programs/bandwhich.nix +++ b/third_party/nixpkgs/nixos/modules/programs/bandwhich.nix @@ -1,15 +1,13 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.bandwhich; in { - meta.maintainers = with maintainers; [ Br1ght0ne ]; + meta.maintainers = with lib.maintainers; [ Br1ght0ne ]; options = { programs.bandwhich = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to add bandwhich to the global environment and configure a @@ -19,7 +17,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ bandwhich ]; security.wrappers.bandwhich = { owner = "root"; diff --git a/third_party/nixpkgs/nixos/modules/programs/bash-my-aws.nix b/third_party/nixpkgs/nixos/modules/programs/bash-my-aws.nix index 15e429a754..85618ad98f 100644 --- a/third_party/nixpkgs/nixos/modules/programs/bash-my-aws.nix +++ b/third_party/nixpkgs/nixos/modules/programs/bash-my-aws.nix @@ -1,7 +1,5 @@ { config, pkgs, lib, ... }: -with lib; - let prg = config.programs; cfg = prg.bash-my-aws; @@ -13,11 +11,11 @@ in { options = { programs.bash-my-aws = { - enable = mkEnableOption "bash-my-aws"; + enable = lib.mkEnableOption "bash-my-aws"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ bash-my-aws ]; programs.bash.interactiveShellInit = initScript; diff --git a/third_party/nixpkgs/nixos/modules/programs/bash/bash-completion.nix b/third_party/nixpkgs/nixos/modules/programs/bash/bash-completion.nix index b8e5b1bfa3..c973d36fdf 100644 --- a/third_party/nixpkgs/nixos/modules/programs/bash/bash-completion.nix +++ b/third_party/nixpkgs/nixos/modules/programs/bash/bash-completion.nix @@ -1,18 +1,16 @@ { config, lib, pkgs, ... }: -with lib; - let enable = config.programs.bash.enableCompletion; in { options = { - programs.bash.enableCompletion = mkEnableOption "Bash completion for all interactive bash shells" // { + programs.bash.enableCompletion = lib.mkEnableOption "Bash completion for all interactive bash shells" // { default = true; }; }; - config = mkIf enable { + config = lib.mkIf enable { programs.bash.promptPluginInit = '' # Check whether we're running a version of Bash that has support for # programmable completion. If we do, enable all modules installed in diff --git a/third_party/nixpkgs/nixos/modules/programs/bash/bash.nix b/third_party/nixpkgs/nixos/modules/programs/bash/bash.nix index 21ef8338d8..0f8c40da80 100644 --- a/third_party/nixpkgs/nixos/modules/programs/bash/bash.nix +++ b/third_party/nixpkgs/nixos/modules/programs/bash/bash.nix @@ -3,24 +3,22 @@ { config, lib, pkgs, ... }: -with lib; - let cfge = config.environment; cfg = config.programs.bash; - bashAliases = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "alias -- ${k}=${escapeShellArg v}") - (filterAttrs (k: v: v != null) cfg.shellAliases) + bashAliases = builtins.concatStringsSep "\n" ( + lib.mapAttrsFlatten (k: v: "alias -- ${k}=${lib.escapeShellArg v}") + (lib.filterAttrs (k: v: v != null) cfg.shellAliases) ); in { imports = [ - (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") + (lib.mkRemovedOptionModule [ "programs" "bash" "enable" ] "") ]; options = { @@ -28,7 +26,7 @@ in programs.bash = { /* - enable = mkOption { + enable = lib.mkOption { default = true; description = '' Whenever to configure Bash as an interactive shell. @@ -38,44 +36,44 @@ in set this variable if you have another shell configured with NixOS. ''; - type = types.bool; + type = lib.types.bool; }; */ - shellAliases = mkOption { + shellAliases = lib.mkOption { default = {}; description = '' Set of aliases for bash shell, which overrides {option}`environment.shellAliases`. See {option}`environment.shellAliases` for an option format description. ''; - type = with types; attrsOf (nullOr (either str path)); + type = with lib.types; attrsOf (nullOr (either str path)); }; - shellInit = mkOption { + shellInit = lib.mkOption { default = ""; description = '' Shell script code called during bash shell initialisation. ''; - type = types.lines; + type = lib.types.lines; }; - loginShellInit = mkOption { + loginShellInit = lib.mkOption { default = ""; description = '' Shell script code called during login bash shell initialisation. ''; - type = types.lines; + type = lib.types.lines; }; - interactiveShellInit = mkOption { + interactiveShellInit = lib.mkOption { default = ""; description = '' Shell script code called during interactive bash shell initialisation. ''; - type = types.lines; + type = lib.types.lines; }; - promptInit = mkOption { + promptInit = lib.mkOption { default = '' # Provide a nice prompt if the terminal supports it. if [ "$TERM" != "dumb" ] || [ -n "$INSIDE_EMACS" ]; then @@ -95,15 +93,15 @@ in description = '' Shell script code used to initialise the bash prompt. ''; - type = types.lines; + type = lib.types.lines; }; - promptPluginInit = mkOption { + promptPluginInit = lib.mkOption { default = ""; description = '' Shell script code used to initialise bash prompt plugins. ''; - type = types.lines; + type = lib.types.lines; internal = true; }; @@ -111,11 +109,11 @@ in }; - config = /* mkIf cfg.enable */ { + config = /* lib.mkIf cfg.enable */ { programs.bash = { - shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases; + shellAliases = builtins.mapAttrs (name: lib.mkDefault) cfge.shellAliases; shellInit = '' if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then @@ -196,11 +194,11 @@ in # Configuration for readline in bash. We use "option default" # priority to allow user override using both .text and .source. - environment.etc.inputrc.source = mkOptionDefault ./inputrc; + environment.etc.inputrc.source = lib.mkOptionDefault ./inputrc; - users.defaultUserShell = mkDefault pkgs.bashInteractive; + users.defaultUserShell = lib.mkDefault pkgs.bashInteractive; - environment.pathsToLink = optionals cfg.enableCompletion [ + environment.pathsToLink = lib.optionals cfg.enableCompletion [ "/etc/bash_completion.d" "/share/bash-completion" ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/bash/blesh.nix b/third_party/nixpkgs/nixos/modules/programs/bash/blesh.nix index ea342b0ce3..b5ca83a883 100644 --- a/third_party/nixpkgs/nixos/modules/programs/bash/blesh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/bash/blesh.nix @@ -1,16 +1,15 @@ { lib, config, pkgs, ... }: -with lib; let cfg = config.programs.bash.blesh; in { options = { - programs.bash.blesh.enable = mkEnableOption "blesh, a full-featured line editor written in pure Bash"; + programs.bash.blesh.enable = lib.mkEnableOption "blesh, a full-featured line editor written in pure Bash"; }; - config = mkIf cfg.enable { - programs.bash.interactiveShellInit = mkBefore '' + config = lib.mkIf cfg.enable { + programs.bash.interactiveShellInit = lib.mkBefore '' source ${pkgs.blesh}/share/blesh/ble.sh ''; }; - meta.maintainers = with maintainers; [ laalsaas ]; + meta.maintainers = with lib.maintainers; [ laalsaas ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/bash/ls-colors.nix b/third_party/nixpkgs/nixos/modules/programs/bash/ls-colors.nix index 254ee14c47..3ee00e93d4 100644 --- a/third_party/nixpkgs/nixos/modules/programs/bash/ls-colors.nix +++ b/third_party/nixpkgs/nixos/modules/programs/bash/ls-colors.nix @@ -1,18 +1,16 @@ { config, lib, pkgs, ... }: -with lib; - let enable = config.programs.bash.enableLsColors; in { options = { - programs.bash.enableLsColors = mkEnableOption "extra colors in directory listings" // { + programs.bash.enableLsColors = lib.mkEnableOption "extra colors in directory listings" // { default = true; }; }; - config = mkIf enable { + config = lib.mkIf enable { programs.bash.promptPluginInit = '' eval "$(${pkgs.coreutils}/bin/dircolors -b)" ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/bash/undistract-me.nix b/third_party/nixpkgs/nixos/modules/programs/bash/undistract-me.nix index 0e6465e048..af4f3a737d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/bash/undistract-me.nix +++ b/third_party/nixpkgs/nixos/modules/programs/bash/undistract-me.nix @@ -1,36 +1,34 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.bash.undistractMe; in { options = { programs.bash.undistractMe = { - enable = mkEnableOption "notifications when long-running terminal commands complete"; + enable = lib.mkEnableOption "notifications when long-running terminal commands complete"; - playSound = mkEnableOption "notification sounds when long-running terminal commands complete"; + playSound = lib.mkEnableOption "notification sounds when long-running terminal commands complete"; - timeout = mkOption { + timeout = lib.mkOption { default = 10; description = '' Number of seconds it would take for a command to be considered long-running. ''; - type = types.int; + type = lib.types.int; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { programs.bash.promptPluginInit = '' - export LONG_RUNNING_COMMAND_TIMEOUT=${toString cfg.timeout} + export LONG_RUNNING_COMMAND_TIMEOUT=${builtins.toString cfg.timeout} export UDM_PLAY_SOUND=${if cfg.playSound then "1" else "0"} . "${pkgs.undistract-me}/etc/profile.d/undistract-me.sh" ''; }; meta = { - maintainers = with maintainers; [ kira-bruneau ]; + maintainers = with lib.maintainers; [ kira-bruneau ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/browserpass.nix b/third_party/nixpkgs/nixos/modules/programs/browserpass.nix index 2894e237e3..ab6be266ea 100644 --- a/third_party/nixpkgs/nixos/modules/programs/browserpass.nix +++ b/third_party/nixpkgs/nixos/modules/programs/browserpass.nix @@ -1,12 +1,10 @@ { config, lib, pkgs, ... }: -with lib; - { - options.programs.browserpass.enable = mkEnableOption "Browserpass native messaging host"; + options.programs.browserpass.enable = lib.mkEnableOption "Browserpass native messaging host"; - config = mkIf config.programs.browserpass.enable { + config = lib.mkIf config.programs.browserpass.enable { environment.etc = let appId = "com.github.browserpass.native.json"; source = part: "${pkgs.browserpass}/lib/browserpass/${part}/${appId}"; diff --git a/third_party/nixpkgs/nixos/modules/programs/calls.nix b/third_party/nixpkgs/nixos/modules/programs/calls.nix index 0cf05f8a2e..36a4c51ddf 100644 --- a/third_party/nixpkgs/nixos/modules/programs/calls.nix +++ b/third_party/nixpkgs/nixos/modules/programs/calls.nix @@ -1,19 +1,17 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.calls; in { options = { programs.calls = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' GNOME calls: a phone dialer and call handler ''; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { programs.dconf.enable = true; environment.systemPackages = [ diff --git a/third_party/nixpkgs/nixos/modules/programs/cdemu.nix b/third_party/nixpkgs/nixos/modules/programs/cdemu.nix index 3ee8b2d8fc..1aac28af1d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/cdemu.nix +++ b/third_party/nixpkgs/nixos/modules/programs/cdemu.nix @@ -1,36 +1,34 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.cdemu; in { options = { programs.cdemu = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' {command}`cdemu` for members of {option}`programs.cdemu.group`. ''; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "cdrom"; description = '' Group that users must be in to use {command}`cdemu`. ''; }; - gui = mkOption { - type = types.bool; + gui = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to install the {command}`cdemu` GUI (gCDEmu). ''; }; - image-analyzer = mkOption { - type = types.bool; + image-analyzer = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to install the image analyzer. @@ -39,7 +37,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { boot = { extraModulePackages = [ config.boot.kernelPackages.vhba ]; @@ -68,8 +66,8 @@ in { environment.systemPackages = [ pkgs.cdemu-daemon pkgs.cdemu-client ] - ++ optional cfg.gui pkgs.gcdemu - ++ optional cfg.image-analyzer pkgs.image-analyzer; + ++ lib.optional cfg.gui pkgs.gcdemu + ++ lib.optional cfg.image-analyzer pkgs.image-analyzer; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/cfs-zen-tweaks.nix b/third_party/nixpkgs/nixos/modules/programs/cfs-zen-tweaks.nix index 28d1ef5992..bc16264039 100644 --- a/third_party/nixpkgs/nixos/modules/programs/cfs-zen-tweaks.nix +++ b/third_party/nixpkgs/nixos/modules/programs/cfs-zen-tweaks.nix @@ -2,8 +2,6 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.cfs-zen-tweaks; @@ -13,14 +11,14 @@ in { meta = { - maintainers = with maintainers; [ mkg20001 ]; + maintainers = with lib.maintainers; [ mkg20001 ]; }; options = { - programs.cfs-zen-tweaks.enable = mkEnableOption "CFS Zen Tweaks"; + programs.cfs-zen-tweaks.enable = lib.mkEnableOption "CFS Zen Tweaks"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.packages = [ pkgs.cfs-zen-tweaks ]; systemd.services.set-cfs-tweaks.wantedBy = [ diff --git a/third_party/nixpkgs/nixos/modules/programs/chromium.nix b/third_party/nixpkgs/nixos/modules/programs/chromium.nix index fa5abe957a..4d248dbe09 100644 --- a/third_party/nixpkgs/nixos/modules/programs/chromium.nix +++ b/third_party/nixpkgs/nixos/modules/programs/chromium.nix @@ -1,11 +1,9 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.chromium; - defaultProfile = filterAttrs (k: v: v != null) { + defaultProfile = lib.filterAttrs (k: v: v != null) { HomepageLocation = cfg.homepageLocation; DefaultSearchProviderEnabled = cfg.defaultSearchProviderEnabled; DefaultSearchProviderSearchURL = cfg.defaultSearchProviderSearchURL; @@ -19,14 +17,14 @@ in options = { programs.chromium = { - enable = mkEnableOption "{command}`chromium` policies"; + enable = lib.mkEnableOption "{command}`chromium` policies"; - enablePlasmaBrowserIntegration = mkEnableOption "Native Messaging Host for Plasma Browser Integration"; + enablePlasmaBrowserIntegration = lib.mkEnableOption "Native Messaging Host for Plasma Browser Integration"; - plasmaBrowserIntegrationPackage = mkPackageOption pkgs [ "plasma5Packages" "plasma-browser-integration" ] { }; + plasmaBrowserIntegrationPackage = lib.mkPackageOption pkgs [ "plasma5Packages" "plasma-browser-integration" ] { }; - extensions = mkOption { - type = with types; nullOr (listOf str); + extensions = lib.mkOption { + type = with lib.types; nullOr (listOf str); description = '' List of chromium extensions to install. For list of plugins ids see id in url of extensions on @@ -38,7 +36,7 @@ in for additional details. ''; default = null; - example = literalExpression '' + example = lib.literalExpression '' [ "chlffgpmiacpedhhbkiomidkjlcfhogd" # pushbullet "mbniclmhobmnbdlbpiphghaielnnpgdp" # lightshot @@ -48,36 +46,36 @@ in ''; }; - homepageLocation = mkOption { - type = types.nullOr types.str; + homepageLocation = lib.mkOption { + type = lib.types.nullOr lib.types.str; description = "Chromium default homepage"; default = null; example = "https://nixos.org"; }; - defaultSearchProviderEnabled = mkOption { - type = types.nullOr types.bool; + defaultSearchProviderEnabled = lib.mkOption { + type = lib.types.nullOr lib.types.bool; description = "Enable the default search provider."; default = null; example = true; }; - defaultSearchProviderSearchURL = mkOption { - type = types.nullOr types.str; + defaultSearchProviderSearchURL = lib.mkOption { + type = lib.types.nullOr lib.types.str; description = "Chromium default search provider url."; default = null; example = "https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}"; }; - defaultSearchProviderSuggestURL = mkOption { - type = types.nullOr types.str; + defaultSearchProviderSuggestURL = lib.mkOption { + type = lib.types.nullOr lib.types.str; description = "Chromium default search provider url for suggestions."; default = null; example = "https://encrypted.google.com/complete/search?output=chrome&q={searchTerms}"; }; - extraOpts = mkOption { - type = types.attrs; + extraOpts = lib.mkOption { + type = lib.types.attrs; description = '' Extra chromium policy options. A list of available policies can be found in the Chrome Enterprise documentation: @@ -85,7 +83,7 @@ in Make sure the selected policy is supported on Linux and your browser version. ''; default = {}; - example = literalExpression '' + example = lib.literalExpression '' { "BrowserSignin" = 0; "SyncDisabled" = true; @@ -99,8 +97,8 @@ in ''; }; - initialPrefs = mkOption { - type = types.attrs; + initialPrefs = lib.mkOption { + type = lib.types.attrs; description = '' Initial preferences are used to configure the browser for the first run. Unlike {option}`programs.chromium.extraOpts`, initialPrefs can be changed by users in the browser settings. @@ -108,7 +106,7 @@ in ''; default = {}; - example = literalExpression '' + example = lib.literalExpression '' { "first_run_tabs" = [ "https://nixos.org/" diff --git a/third_party/nixpkgs/nixos/modules/programs/cnping.nix b/third_party/nixpkgs/nixos/modules/programs/cnping.nix index 77cbf4d820..f4b5aa845b 100644 --- a/third_party/nixpkgs/nixos/modules/programs/cnping.nix +++ b/third_party/nixpkgs/nixos/modules/programs/cnping.nix @@ -1,18 +1,16 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.cnping; in { options = { programs.cnping = { - enable = mkEnableOption "a setcap wrapper for cnping"; + enable = lib.mkEnableOption "a setcap wrapper for cnping"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { security.wrappers.cnping = { source = "${pkgs.cnping}/bin/cnping"; capabilities = "cap_net_raw+ep"; diff --git a/third_party/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix b/third_party/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix index 4d2a89b515..a223e81172 100644 --- a/third_party/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix +++ b/third_party/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix @@ -5,8 +5,6 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.command-not-found; commandNotFound = pkgs.substituteAll { @@ -23,8 +21,8 @@ in { options.programs.command-not-found = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether interactive shells should show which Nix package (if @@ -32,7 +30,7 @@ in ''; }; - dbPath = mkOption { + dbPath = lib.mkOption { default = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite" ; description = '' Absolute path to programs.sqlite. @@ -40,11 +38,11 @@ in By default this file will be provided by your channel (nixexprs.tar.xz). ''; - type = types.path; + type = lib.types.path; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { programs.bash.interactiveShellInit = '' # This function is called whenever a command is not found. diff --git a/third_party/nixpkgs/nixos/modules/programs/criu.nix b/third_party/nixpkgs/nixos/modules/programs/criu.nix index 9414d0b27f..492a158923 100644 --- a/third_party/nixpkgs/nixos/modules/programs/criu.nix +++ b/third_party/nixpkgs/nixos/modules/programs/criu.nix @@ -1,14 +1,12 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.criu; in { options = { programs.criu = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Install {command}`criu` along with necessary kernel options. @@ -16,7 +14,7 @@ in { }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { system.requiredKernelConfig = with config.lib.kernelConfig; [ (isYes "CHECKPOINT_RESTORE") ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix b/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix index 10b5a88171..06d33966b4 100644 --- a/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix +++ b/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix @@ -1,29 +1,27 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.digitalbitbox; in { options.programs.digitalbitbox = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Installs the Digital Bitbox application and enables the complementary hardware module. ''; }; - package = mkPackageOption pkgs "digitalbitbox" { + package = lib.mkPackageOption pkgs "digitalbitbox" { extraDescription = '' This can be used to install a package with udev rules that differ from the defaults. ''; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; hardware.digitalbitbox = { enable = true; diff --git a/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix b/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix index 15338681e6..0078ca19f4 100644 --- a/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix +++ b/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix @@ -1,19 +1,17 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.dmrconfig; in { - meta.maintainers = with maintainers; [ ]; + meta.maintainers = with lib.maintainers; [ ]; ###### interface options = { programs.dmrconfig = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to configure system to enable use of dmrconfig. This enables the required udev rules and installs the program. @@ -21,12 +19,12 @@ in { relatedPackages = [ "dmrconfig" ]; }; - package = mkPackageOption pkgs "dmrconfig" { }; + package = lib.mkPackageOption pkgs "dmrconfig" { }; }; }; ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; services.udev.packages = [ cfg.package ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/droidcam.nix b/third_party/nixpkgs/nixos/modules/programs/droidcam.nix index 9843a1f5be..eef3997e6b 100644 --- a/third_party/nixpkgs/nixos/modules/programs/droidcam.nix +++ b/third_party/nixpkgs/nixos/modules/programs/droidcam.nix @@ -1,10 +1,8 @@ { lib, pkgs, config, ... }: -with lib; - { options.programs.droidcam = { - enable = mkEnableOption "DroidCam client"; + enable = lib.mkEnableOption "DroidCam client"; }; config = lib.mkIf config.programs.droidcam.enable { diff --git a/third_party/nixpkgs/nixos/modules/programs/dublin-traceroute.nix b/third_party/nixpkgs/nixos/modules/programs/dublin-traceroute.nix index 6ff8a5bdef..de9446ad73 100644 --- a/third_party/nixpkgs/nixos/modules/programs/dublin-traceroute.nix +++ b/third_party/nixpkgs/nixos/modules/programs/dublin-traceroute.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.dublin-traceroute; @@ -10,22 +8,22 @@ in { options = { programs.dublin-traceroute = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' dublin-traceroute, add it to the global environment and configure a setcap wrapper for it. ''; - package = mkPackageOption pkgs "dublin-traceroute" { }; + package = lib.mkPackageOption pkgs "dublin-traceroute" { }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; security.wrappers.dublin-traceroute = { owner = "root"; group = "root"; capabilities = "cap_net_raw+p"; - source = getExe cfg.package; + source = lib.getExe cfg.package; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/ecryptfs.nix b/third_party/nixpkgs/nixos/modules/programs/ecryptfs.nix index ced5eb26fb..8674f7ec80 100644 --- a/third_party/nixpkgs/nixos/modules/programs/ecryptfs.nix +++ b/third_party/nixpkgs/nixos/modules/programs/ecryptfs.nix @@ -1,16 +1,14 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.ecryptfs; in { options.programs.ecryptfs = { - enable = mkEnableOption "ecryptfs setuid mount wrappers"; + enable = lib.mkEnableOption "ecryptfs setuid mount wrappers"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { security.wrappers = { "mount.ecryptfs_private" = { diff --git a/third_party/nixpkgs/nixos/modules/programs/environment.nix b/third_party/nixpkgs/nixos/modules/programs/environment.nix index 8ac723f42f..8a565b7bca 100644 --- a/third_party/nixpkgs/nixos/modules/programs/environment.nix +++ b/third_party/nixpkgs/nixos/modules/programs/environment.nix @@ -4,8 +4,6 @@ { config, lib, ... }: -with lib; - let cfg = config.environment; @@ -20,14 +18,14 @@ in { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; # note: many programs exec() this directly, so default options for less must not # be specified here; do so in the default value of programs.less.envVariables instead - PAGER = mkDefault "less"; - EDITOR = mkDefault "nano"; + PAGER = lib.mkDefault "less"; + EDITOR = lib.mkDefault "nano"; }; # since we set PAGER to this above, make sure it's installed programs.less.enable = true; - environment.profiles = mkAfter + environment.profiles = lib.mkAfter [ "/nix/var/nix/profiles/default" "/run/current-system/sw" ]; @@ -53,7 +51,7 @@ in environment.extraInit = '' export NIX_USER_PROFILE_DIR="/nix/var/nix/profiles/per-user/$USER" - export NIX_PROFILES="${concatStringsSep " " (reverseList cfg.profiles)}" + export NIX_PROFILES="${builtins.concatStringsSep " " (lib.reverseList cfg.profiles)}" ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/evince.nix b/third_party/nixpkgs/nixos/modules/programs/evince.nix index cffc5127f1..a27e75e662 100644 --- a/third_party/nixpkgs/nixos/modules/programs/evince.nix +++ b/third_party/nixpkgs/nixos/modules/programs/evince.nix @@ -2,28 +2,19 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.evince; in { - # Added 2019-08-09 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "evince" "enable" ] - [ "programs" "evince" "enable" ]) - ]; - ###### interface options = { programs.evince = { - enable = mkEnableOption "Evince, the GNOME document viewer"; + enable = lib.mkEnableOption "Evince, the GNOME document viewer"; - package = mkPackageOption pkgs "evince" { }; + package = lib.mkPackageOption pkgs "evince" { }; }; @@ -32,7 +23,7 @@ in { ###### implementation - config = mkIf config.programs.evince.enable { + config = lib.mkIf config.programs.evince.enable { environment.systemPackages = [ cfg.package ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/extra-container.nix b/third_party/nixpkgs/nixos/modules/programs/extra-container.nix index c10ccd7691..6dcfba7971 100644 --- a/third_party/nixpkgs/nixos/modules/programs/extra-container.nix +++ b/third_party/nixpkgs/nixos/modules/programs/extra-container.nix @@ -1,16 +1,15 @@ { config, pkgs, lib, ... }: -with lib; let cfg = config.programs.extra-container; in { options = { - programs.extra-container.enable = mkEnableOption '' + programs.extra-container.enable = lib.mkEnableOption '' extra-container, a tool for running declarative NixOS containers without host system rebuilds ''; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.extra-container ]; boot.extraSystemdUnitPaths = [ "/etc/systemd-mutable/system" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/feedbackd.nix b/third_party/nixpkgs/nixos/modules/programs/feedbackd.nix index 9de604c34a..0c82c7840c 100644 --- a/third_party/nixpkgs/nixos/modules/programs/feedbackd.nix +++ b/third_party/nixpkgs/nixos/modules/programs/feedbackd.nix @@ -1,21 +1,19 @@ { pkgs, lib, config, ... }: -with lib; - let cfg = config.programs.feedbackd; in { options = { programs.feedbackd = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' the feedbackd D-BUS service and udev rules. Your user needs to be in the `feedbackd` group to trigger effects ''; - package = mkPackageOption pkgs "feedbackd" { }; + package = lib.mkPackageOption pkgs "feedbackd" { }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; services.dbus.packages = [ cfg.package ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/file-roller.nix b/third_party/nixpkgs/nixos/modules/programs/file-roller.nix index 4799f42d63..f64bd73285 100644 --- a/third_party/nixpkgs/nixos/modules/programs/file-roller.nix +++ b/third_party/nixpkgs/nixos/modules/programs/file-roller.nix @@ -2,28 +2,19 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.file-roller; in { - # Added 2019-08-09 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "file-roller" "enable" ] - [ "programs" "file-roller" "enable" ]) - ]; - ###### interface options = { programs.file-roller = { - enable = mkEnableOption "File Roller, an archive manager for GNOME"; + enable = lib.mkEnableOption "File Roller, an archive manager for GNOME"; - package = mkPackageOption pkgs [ "gnome" "file-roller" ] { }; + package = lib.mkPackageOption pkgs [ "gnome" "file-roller" ] { }; }; @@ -32,7 +23,7 @@ in { ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/firefox.nix b/third_party/nixpkgs/nixos/modules/programs/firefox.nix index 39b30be48d..f698c3999d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/firefox.nix +++ b/third_party/nixpkgs/nixos/modules/programs/firefox.nix @@ -1,7 +1,5 @@ { pkgs, config, lib, ... }: -with lib; - let cfg = config.programs.firefox; @@ -62,13 +60,13 @@ let in { options.programs.firefox = { - enable = mkEnableOption "the Firefox web browser"; + enable = lib.mkEnableOption "the Firefox web browser"; - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.firefox; description = "Firefox package to use."; - defaultText = literalExpression "pkgs.firefox"; + defaultText = lib.literalExpression "pkgs.firefox"; relatedPackages = [ "firefox" "firefox-beta-bin" @@ -78,13 +76,13 @@ in ]; }; - wrapperConfig = mkOption { - type = types.attrs; + wrapperConfig = lib.mkOption { + type = lib.types.attrs; default = {}; description = "Arguments to pass to Firefox wrapper"; }; - policies = mkOption { + policies = lib.mkOption { type = policyFormat.type; default = { }; description = '' @@ -100,8 +98,8 @@ in ''; }; - preferences = mkOption { - type = with types; attrsOf (oneOf [ bool int str ]); + preferences = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ bool int str ]); default = { }; description = '' Preferences to set from `about:config`. @@ -113,8 +111,8 @@ in ''; }; - preferencesStatus = mkOption { - type = types.enum [ "default" "locked" "user" "clear" ]; + preferencesStatus = lib.mkOption { + type = lib.types.enum [ "default" "locked" "user" "clear" ]; default = "locked"; description = '' The status of `firefox.preferences`. @@ -127,9 +125,9 @@ in ''; }; - languagePacks = mkOption { + languagePacks = lib.mkOption { # Available languages can be found in https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/ - type = types.listOf (types.enum ([ + type = lib.types.listOf (lib.types.enum ([ "ach" "af" "an" @@ -235,8 +233,8 @@ in ''; }; - autoConfig = mkOption { - type = types.lines; + autoConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' AutoConfig files can be used to set and lock preferences that are not covered @@ -247,19 +245,19 @@ in }; nativeMessagingHosts = ({ - packages = mkOption { - type = types.listOf types.package; + packages = lib.mkOption { + type = lib.types.listOf lib.types.package; default = []; description = '' Additional packages containing native messaging hosts that should be made available to Firefox extensions. ''; }; - }) // (mapAttrs (k: v: mkEnableOption "${v.name} support") nmhOptions); + }) // (builtins.mapAttrs (k: v: lib.mkEnableOption "${v.name} support") nmhOptions); }; config = let - forEachEnabledNmh = fn: flatten (mapAttrsToList (k: v: lib.optional cfg.nativeMessagingHosts.${k} (fn k v)) nmhOptions); - in mkIf cfg.enable { + forEachEnabledNmh = fn: lib.flatten (lib.mapAttrsToList (k: v: lib.optional cfg.nativeMessagingHosts.${k} (fn k v)) nmhOptions); + in lib.mkIf cfg.enable { warnings = forEachEnabledNmh (k: v: "The `programs.firefox.nativeMessagingHosts.${k}` option is deprecated, " + "please add `${v.package.pname}` to `programs.firefox.nativeMessagingHosts.packages` instead." @@ -278,18 +276,18 @@ in let policiesJSON = policyFormat.generate "firefox-policies.json" { inherit (cfg) policies; }; in - mkIf (cfg.policies != { }) { + lib.mkIf (cfg.policies != { }) { "firefox/policies/policies.json".source = "${policiesJSON}"; }; # Preferences are converted into a policy programs.firefox.policies = { DisableAppUpdate = true; - Preferences = (mapAttrs + Preferences = (builtins.mapAttrs (_: value: { Value = value; Status = cfg.preferencesStatus; }) cfg.preferences); - ExtensionSettings = listToAttrs (map - (lang: nameValuePair + ExtensionSettings = builtins.listToAttrs (builtins.map + (lang: builtins.nameValuePair "langpack-${lang}@firefox.mozilla.org" { installation_mode = "normal_installed"; @@ -300,5 +298,5 @@ in }; }; - meta.maintainers = with maintainers; [ danth ]; + meta.maintainers = with lib.maintainers; [ danth ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/firejail.nix b/third_party/nixpkgs/nixos/modules/programs/firejail.nix index 0510cf8c61..90da938182 100644 --- a/third_party/nixpkgs/nixos/modules/programs/firejail.nix +++ b/third_party/nixpkgs/nixos/modules/programs/firejail.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.firejail; @@ -21,13 +19,13 @@ let else { executable = value; desktop = null; profile = null; extraArgs = []; }; args = lib.escapeShellArgs ( opts.extraArgs - ++ (optional (opts.profile != null) "--profile=${toString opts.profile}") + ++ (lib.optional (opts.profile != null) "--profile=${builtins.toString opts.profile}") ); in '' cat <<_EOF >$out/bin/${command} #! ${pkgs.runtimeShell} -e - exec /run/wrappers/bin/firejail ${args} -- ${toString opts.executable} "\$@" + exec /run/wrappers/bin/firejail ${args} -- ${builtins.toString opts.executable} "\$@" _EOF chmod 0755 $out/bin/${command} @@ -40,30 +38,30 @@ let in { options.programs.firejail = { - enable = mkEnableOption "firejail, a sandboxing tool for Linux"; + enable = lib.mkEnableOption "firejail, a sandboxing tool for Linux"; - wrappedBinaries = mkOption { - type = types.attrsOf (types.either types.path (types.submodule { + wrappedBinaries = lib.mkOption { + type = lib.types.attrsOf (lib.types.either lib.types.path (lib.types.submodule { options = { - executable = mkOption { - type = types.path; + executable = lib.mkOption { + type = lib.types.path; description = "Executable to run sandboxed"; - example = literalExpression ''"''${lib.getBin pkgs.firefox}/bin/firefox"''; + example = lib.literalExpression ''"''${lib.getBin pkgs.firefox}/bin/firefox"''; }; - desktop = mkOption { - type = types.nullOr types.path; + desktop = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = ".desktop file to modify. Only necessary if it uses the absolute path to the executable."; - example = literalExpression ''"''${pkgs.firefox}/share/applications/firefox.desktop"''; + example = lib.literalExpression ''"''${pkgs.firefox}/share/applications/firefox.desktop"''; }; - profile = mkOption { - type = types.nullOr types.path; + profile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = "Profile to use"; - example = literalExpression ''"''${pkgs.firejail}/etc/firejail/firefox.profile"''; + example = lib.literalExpression ''"''${pkgs.firejail}/etc/firejail/firefox.profile"''; }; - extraArgs = mkOption { - type = types.listOf types.str; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = "Extra arguments to pass to firejail"; example = [ "--private=~/.firejail_home" ]; @@ -71,7 +69,7 @@ in { }; })); default = {}; - example = literalExpression '' + example = lib.literalExpression '' { firefox = { executable = "''${lib.getBin pkgs.firefox}/bin/firefox"; @@ -89,7 +87,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { security.wrappers.firejail = { setuid = true; owner = "root"; @@ -100,5 +98,5 @@ in { environment.systemPackages = [ pkgs.firejail ] ++ [ wrappedBins ]; }; - meta.maintainers = with maintainers; [ peterhoeg ]; + meta.maintainers = with lib.maintainers; [ peterhoeg ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/fish.nix b/third_party/nixpkgs/nixos/modules/programs/fish.nix index 2102a07cd0..5a6fdb9b5e 100644 --- a/third_party/nixpkgs/nixos/modules/programs/fish.nix +++ b/third_party/nixpkgs/nixos/modules/programs/fish.nix @@ -1,21 +1,19 @@ { config, lib, pkgs, ... }: -with lib; - let cfge = config.environment; cfg = config.programs.fish; - fishAbbrs = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "abbr -ag ${k} ${escapeShellArg v}") + fishAbbrs = lib.concatStringsSep "\n" ( + lib.mapAttrsFlatten (k: v: "abbr -ag ${k} ${lib.escapeShellArg v}") cfg.shellAbbrs ); - fishAliases = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") - (filterAttrs (k: v: v != null) cfg.shellAliases) + fishAliases = lib.concatStringsSep "\n" ( + lib.mapAttrsFlatten (k: v: "alias ${k} ${lib.escapeShellArg v}") + (lib.filterAttrs (k: v: v != null) cfg.shellAliases) ); envShellInit = pkgs.writeText "shellInit" cfge.shellInit; @@ -47,16 +45,18 @@ in programs.fish = { - enable = mkOption { + enable = lib.mkOption { default = false; description = '' Whether to configure fish as an interactive shell. ''; - type = types.bool; + type = lib.types.bool; }; - useBabelfish = mkOption { - type = types.bool; + package = lib.mkPackageOption pkgs "fish" { }; + + useBabelfish = lib.mkOption { + type = lib.types.bool; default = false; description = '' If enabled, the configured environment will be translated to native fish using [babelfish](https://github.com/bouk/babelfish). @@ -64,31 +64,31 @@ in ''; }; - vendor.config.enable = mkOption { - type = types.bool; + vendor.config.enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether fish should source configuration snippets provided by other packages. ''; }; - vendor.completions.enable = mkOption { - type = types.bool; + vendor.completions.enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether fish should use completion files provided by other packages. ''; }; - vendor.functions.enable = mkOption { - type = types.bool; + vendor.functions.enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether fish should autoload fish functions provided by other packages. ''; }; - shellAbbrs = mkOption { + shellAbbrs = lib.mkOption { default = {}; example = { gco = "git checkout"; @@ -97,63 +97,63 @@ in description = '' Set of fish abbreviations. ''; - type = with types; attrsOf str; + type = with lib.types; attrsOf str; }; - shellAliases = mkOption { + shellAliases = lib.mkOption { default = {}; description = '' Set of aliases for fish shell, which overrides {option}`environment.shellAliases`. See {option}`environment.shellAliases` for an option format description. ''; - type = with types; attrsOf (nullOr (either str path)); + type = with lib.types; attrsOf (nullOr (either str path)); }; - shellInit = mkOption { + shellInit = lib.mkOption { default = ""; description = '' Shell script code called during fish shell initialisation. ''; - type = types.lines; + type = lib.types.lines; }; - loginShellInit = mkOption { + loginShellInit = lib.mkOption { default = ""; description = '' Shell script code called during fish login shell initialisation. ''; - type = types.lines; + type = lib.types.lines; }; - interactiveShellInit = mkOption { + interactiveShellInit = lib.mkOption { default = ""; description = '' Shell script code called during interactive fish shell initialisation. ''; - type = types.lines; + type = lib.types.lines; }; - promptInit = mkOption { + promptInit = lib.mkOption { default = ""; description = '' Shell script code used to initialise fish prompt. ''; - type = types.lines; + type = lib.types.lines; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - programs.fish.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases; + programs.fish.shellAliases = lib.mapAttrs (name: lib.mkDefault) cfge.shellAliases; # Required for man completions documentation.man.generateCaches = lib.mkDefault true; - environment = mkMerge [ - (mkIf cfg.useBabelfish + environment = lib.mkMerge [ + (lib.mkIf cfg.useBabelfish { etc."fish/setEnvironment.fish".source = babelfishTranslate config.system.build.setEnvironment "setEnvironment"; etc."fish/shellInit.fish".source = babelfishTranslate envShellInit "shellInit"; @@ -161,7 +161,7 @@ in etc."fish/interactiveShellInit.fish".source = babelfishTranslate envInteractiveShellInit "interactiveShellInit"; }) - (mkIf (!cfg.useBabelfish) + (lib.mkIf (!cfg.useBabelfish) { etc."fish/foreign-env/shellInit".source = envShellInit; etc."fish/foreign-env/loginShellInit".source = envLoginShellInit; @@ -244,8 +244,8 @@ in patchedGenerator = pkgs.stdenv.mkDerivation { name = "fish_patched-completion-generator"; srcs = [ - "${pkgs.fish}/share/fish/tools/create_manpage_completions.py" - "${pkgs.fish}/share/fish/tools/deroff.py" + "${cfg.package}/share/fish/tools/create_manpage_completions.py" + "${cfg.package}/share/fish/tools/deroff.py" ]; unpackCmd = "cp $curSrc $(basename $curSrc)"; sourceRoot = "."; @@ -264,7 +264,7 @@ in pathName = substring storeLength (stringLength package - storeLength) package; in (package.name or pathName) + "_fish-completions") ( { inherit package; } // - optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; }) + lib.optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; }) '' mkdir -p $out if [ -d $package/share/man ]; then @@ -275,24 +275,24 @@ in pkgs.buildEnv { name = "system_fish-completions"; ignoreCollisions = true; - paths = map generateCompletions config.environment.systemPackages; + paths = builtins.map generateCompletions config.environment.systemPackages; }; } # include programs that bring their own completions { pathsToLink = [] - ++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d" - ++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d" - ++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d"; + ++ lib.optional cfg.vendor.config.enable "/share/fish/vendor_conf.d" + ++ lib.optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d" + ++ lib.optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d"; } - { systemPackages = [ pkgs.fish ]; } + { systemPackages = [ cfg.package ]; } { shells = [ "/run/current-system/sw/bin/fish" - "${pkgs.fish}/bin/fish" + (lib.getExe cfg.package) ]; } ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/flashrom.nix b/third_party/nixpkgs/nixos/modules/programs/flashrom.nix index 1b9b4493ef..dd398497c2 100644 --- a/third_party/nixpkgs/nixos/modules/programs/flashrom.nix +++ b/third_party/nixpkgs/nixos/modules/programs/flashrom.nix @@ -1,14 +1,12 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.flashrom; in { options.programs.flashrom = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Installs flashrom and configures udev rules for programmers @@ -16,10 +14,10 @@ in group. ''; }; - package = mkPackageOption pkgs "flashrom" { }; + package = lib.mkPackageOption pkgs "flashrom" { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.udev.packages = [ cfg.package ]; environment.systemPackages = [ cfg.package ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/flexoptix-app.nix b/third_party/nixpkgs/nixos/modules/programs/flexoptix-app.nix index 47a76da125..baa9e33882 100644 --- a/third_party/nixpkgs/nixos/modules/programs/flexoptix-app.nix +++ b/third_party/nixpkgs/nixos/modules/programs/flexoptix-app.nix @@ -1,19 +1,17 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.flexoptix-app; in { options = { programs.flexoptix-app = { - enable = mkEnableOption "FLEXOPTIX app + udev rules"; + enable = lib.mkEnableOption "FLEXOPTIX app + udev rules"; - package = mkPackageOption pkgs "flexoptix-app" { }; + package = lib.mkPackageOption pkgs "flexoptix-app" { }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; services.udev.packages = [ cfg.package ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/freetds.nix b/third_party/nixpkgs/nixos/modules/programs/freetds.nix index 8b52fc37c5..77daaa8fd3 100644 --- a/third_party/nixpkgs/nixos/modules/programs/freetds.nix +++ b/third_party/nixpkgs/nixos/modules/programs/freetds.nix @@ -2,8 +2,6 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.environment.freetds; @@ -14,10 +12,10 @@ in options = { - environment.freetds = mkOption { - type = types.attrsOf types.str; + environment.freetds = lib.mkOption { + type = lib.types.attrsOf lib.types.str; default = {}; - example = literalExpression '' + example = lib.literalExpression '' { MYDATABASE = ''' host = 10.0.2.100 port = 1433 @@ -40,14 +38,14 @@ in ###### implementation - config = mkIf (length (attrNames cfg) > 0) { + config = lib.mkIf (builtins.length (builtins.attrNames cfg) > 0) { environment.variables.FREETDSCONF = "/etc/freetds.conf"; environment.variables.FREETDS = "/etc/freetds.conf"; environment.variables.SYBASE = "${pkgs.freetds}"; environment.etc."freetds.conf" = { text = - (concatStrings (mapAttrsToList (name: value: + (lib.concatStrings (lib.mapAttrsToList (name: value: '' [${name}] ${value} diff --git a/third_party/nixpkgs/nixos/modules/programs/fuse.nix b/third_party/nixpkgs/nixos/modules/programs/fuse.nix index c15896efbb..7083194bd9 100644 --- a/third_party/nixpkgs/nixos/modules/programs/fuse.nix +++ b/third_party/nixpkgs/nixos/modules/programs/fuse.nix @@ -1,25 +1,23 @@ { config, lib, ... }: -with lib; - let cfg = config.programs.fuse; in { - meta.maintainers = with maintainers; [ primeos ]; + meta.maintainers = with lib.maintainers; [ primeos ]; options.programs.fuse = { - mountMax = mkOption { + mountMax = lib.mkOption { # In the C code it's an "int" (i.e. signed and at least 16 bit), but # negative numbers obviously make no sense: - type = types.ints.between 0 32767; # 2^15 - 1 + type = lib.types.ints.between 0 32767; # 2^15 - 1 default = 1000; description = '' Set the maximum number of FUSE mounts allowed to non-root users. ''; }; - userAllowOther = mkOption { - type = types.bool; + userAllowOther = lib.mkOption { + type = lib.types.bool; default = false; description = '' Allow non-root users to specify the allow_other or allow_root mount @@ -30,8 +28,8 @@ in { config = { environment.etc."fuse.conf".text = '' - ${optionalString (!cfg.userAllowOther) "#"}user_allow_other - mount_max = ${toString cfg.mountMax} + ${lib.optionalString (!cfg.userAllowOther) "#"}user_allow_other + mount_max = ${builtins.toString cfg.mountMax} ''; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/fzf.nix b/third_party/nixpkgs/nixos/modules/programs/fzf.nix index 0e7e519f04..66ad7d418d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/fzf.nix +++ b/third_party/nixpkgs/nixos/modules/programs/fzf.nix @@ -15,11 +15,12 @@ in environment.systemPackages = lib.mkIf (cfg.keybindings || cfg.fuzzyCompletion) [ pkgs.fzf ]; programs = { - bash.interactiveShellInit = lib.optionalString cfg.fuzzyCompletion '' + # load after programs.bash.enableCompletion + bash.promptPluginInit = lib.mkAfter (lib.optionalString cfg.fuzzyCompletion '' source ${pkgs.fzf}/share/fzf/completion.bash '' + lib.optionalString cfg.keybindings '' source ${pkgs.fzf}/share/fzf/key-bindings.bash - ''; + ''); zsh = { interactiveShellInit = lib.optionalString (!config.programs.zsh.ohMyZsh.enable) diff --git a/third_party/nixpkgs/nixos/modules/programs/gamemode.nix b/third_party/nixpkgs/nixos/modules/programs/gamemode.nix index 878f785074..14892f9c6e 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gamemode.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gamemode.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.gamemode; settingsFormat = pkgs.formats.ini { }; @@ -10,20 +8,20 @@ in { options = { programs.gamemode = { - enable = mkEnableOption "GameMode to optimise system performance on demand"; + enable = lib.mkEnableOption "GameMode to optimise system performance on demand"; - enableRenice = mkEnableOption "CAP_SYS_NICE on gamemoded to support lowering process niceness" // { + enableRenice = lib.mkEnableOption "CAP_SYS_NICE on gamemoded to support lowering process niceness" // { default = true; }; - settings = mkOption { + settings = lib.mkOption { type = settingsFormat.type; default = { }; description = '' System-wide configuration for GameMode (/etc/gamemode.ini). See gamemoded(8) man page for available settings. ''; - example = literalExpression '' + example = lib.literalExpression '' { general = { renice = 10; @@ -46,7 +44,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment = { systemPackages = [ pkgs.gamemode ]; etc."gamemode.ini".source = configFile; @@ -54,7 +52,7 @@ in security = { polkit.enable = true; - wrappers = mkIf cfg.enableRenice { + wrappers = lib.mkIf cfg.enableRenice { gamemoded = { owner = "root"; group = "root"; @@ -77,14 +75,14 @@ in # # This uses a link farm to make sure other wrapped executables # aren't included in PATH. - environment.PATH = mkForce (pkgs.linkFarm "pkexec" [ + environment.PATH = lib.mkForce (pkgs.linkFarm "pkexec" [ { name = "pkexec"; path = "${config.security.wrapperDir}/pkexec"; } ]); - serviceConfig.ExecStart = mkIf cfg.enableRenice [ + serviceConfig.ExecStart = lib.mkIf cfg.enableRenice [ "" # Tell systemd to clear the existing ExecStart list, to prevent appending to it. "${config.security.wrapperDir}/gamemoded" ]; @@ -95,6 +93,6 @@ in }; meta = { - maintainers = with maintainers; [ kira-bruneau ]; + maintainers = with lib.maintainers; [ kira-bruneau ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/gamescope.nix b/third_party/nixpkgs/nixos/modules/programs/gamescope.nix index af9ced4715..6a0b0a8fbd 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gamescope.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gamescope.nix @@ -3,30 +3,30 @@ , pkgs , ... }: -with lib; let +let cfg = config.programs.gamescope; gamescope = let wrapperArgs = - optional (cfg.args != [ ]) - ''--add-flags "${toString cfg.args}"'' - ++ builtins.attrValues (mapAttrs (var: val: "--set-default ${var} ${val}") cfg.env); + lib.optional (cfg.args != [ ]) + ''--add-flags "${builtins.toString cfg.args}"'' + ++ builtins.attrValues (builtins.mapAttrs (var: val: "--set-default ${var} ${val}") cfg.env); in pkgs.runCommand "gamescope" { nativeBuildInputs = [ pkgs.makeBinaryWrapper ]; } '' mkdir -p $out/bin makeWrapper ${cfg.package}/bin/gamescope $out/bin/gamescope --inherit-argv0 \ - ${toString wrapperArgs} + ${builtins.toString wrapperArgs} ''; in { options.programs.gamescope = { - enable = mkEnableOption "gamescope, the SteamOS session compositing window manager"; + enable = lib.mkEnableOption "gamescope, the SteamOS session compositing window manager"; - package = mkPackageOption pkgs "gamescope" { }; + package = lib.mkPackageOption pkgs "gamescope" { }; - capSysNice = mkOption { - type = types.bool; + capSysNice = lib.mkOption { + type = lib.types.bool; default = false; description = '' Add cap_sys_nice capability to the GameScope @@ -34,8 +34,8 @@ in ''; }; - args = mkOption { - type = types.listOf types.str; + args = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "--rt" "--prefer-vk-device 8086:9bc4" ]; description = '' @@ -43,10 +43,10 @@ in ''; }; - env = mkOption { - type = types.attrsOf types.str; + env = lib.mkOption { + type = lib.types.attrsOf lib.types.str; default = { }; - example = literalExpression '' + example = lib.literalExpression '' # for Prime render offload on Nvidia laptops. # Also requires `hardware.nvidia.prime.offload.enable`. { @@ -61,8 +61,8 @@ in }; }; - config = mkIf cfg.enable { - security.wrappers = mkIf cfg.capSysNice { + config = lib.mkIf cfg.enable { + security.wrappers = lib.mkIf cfg.capSysNice { gamescope = { owner = "root"; group = "root"; @@ -71,8 +71,8 @@ in }; }; - environment.systemPackages = mkIf (!cfg.capSysNice) [ gamescope ]; + environment.systemPackages = lib.mkIf (!cfg.capSysNice) [ gamescope ]; }; - meta.maintainers = with maintainers; [ nrdxp ]; + meta.maintainers = with lib.maintainers; [ nrdxp ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/geary.nix b/third_party/nixpkgs/nixos/modules/programs/geary.nix index 6103ee7df8..cfd5bed78d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/geary.nix +++ b/third_party/nixpkgs/nixos/modules/programs/geary.nix @@ -1,20 +1,18 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.geary; in { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; options = { - programs.geary.enable = mkEnableOption "Geary, a Mail client for GNOME"; + programs.geary.enable = lib.mkEnableOption "Geary, a Mail client for GNOME"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.gnome.geary ]; programs.dconf.enable = true; services.gnome.gnome-keyring.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/programs/git.nix b/third_party/nixpkgs/nixos/modules/programs/git.nix index 2a5d52f2d1..e4f6ce937f 100644 --- a/third_party/nixpkgs/nixos/modules/programs/git.nix +++ b/third_party/nixpkgs/nixos/modules/programs/git.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.git; in @@ -9,23 +7,23 @@ in { options = { programs.git = { - enable = mkEnableOption "git, a distributed version control system"; + enable = lib.mkEnableOption "git, a distributed version control system"; - package = mkPackageOption pkgs "git" { + package = lib.mkPackageOption pkgs "git" { example = "gitFull"; }; - config = mkOption { + config = lib.mkOption { type = - with types; + with lib.types; let gitini = attrsOf (attrsOf anything); in either gitini (listOf gitini) // { merge = loc: defs: let - config = foldl' - (acc: { value, ... }@x: acc // (if isList value then { + config = builtins.foldl' + (acc: { value, ... }@x: acc // (if builtins.isList value then { ordered = acc.ordered ++ value; } else { unordered = acc.unordered ++ [ x ]; @@ -55,25 +53,25 @@ in }; prompt = { - enable = mkEnableOption "automatically sourcing git-prompt.sh. This does not change $PS1; it simply provides relevant utility functions"; + enable = lib.mkEnableOption "automatically sourcing git-prompt.sh. This does not change $PS1; it simply provides relevant utility functions"; }; lfs = { - enable = mkEnableOption "git-lfs (Large File Storage)"; + enable = lib.mkEnableOption "git-lfs (Large File Storage)"; - package = mkPackageOption pkgs "git-lfs" { }; + package = lib.mkPackageOption pkgs "git-lfs" { }; }; }; }; - config = mkMerge [ - (mkIf cfg.enable { + config = lib.mkMerge [ + (lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - environment.etc.gitconfig = mkIf (cfg.config != [ ]) { - text = concatMapStringsSep "\n" generators.toGitINI cfg.config; + environment.etc.gitconfig = lib.mkIf (cfg.config != [ ]) { + text = lib.concatMapStringsSep "\n" lib.generators.toGitINI cfg.config; }; }) - (mkIf (cfg.enable && cfg.lfs.enable) { + (lib.mkIf (cfg.enable && cfg.lfs.enable) { environment.systemPackages = [ cfg.lfs.package ]; programs.git.config = { filter.lfs = { @@ -84,12 +82,12 @@ in }; }; }) - (mkIf (cfg.enable && cfg.prompt.enable) { + (lib.mkIf (cfg.enable && cfg.prompt.enable) { environment.interactiveShellInit = '' source ${cfg.package}/share/bash-completion/completions/git-prompt.sh ''; }) ]; - meta.maintainers = with maintainers; [ figsoda ]; + meta.maintainers = with lib.maintainers; [ figsoda ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/gnome-disks.nix b/third_party/nixpkgs/nixos/modules/programs/gnome-disks.nix index 4b128b4712..954f1fd9bc 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gnome-disks.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gnome-disks.nix @@ -2,29 +2,20 @@ { config, pkgs, lib, ... }: -with lib; - { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - # Added 2019-08-09 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "gnome-disks" "enable" ] - [ "programs" "gnome-disks" "enable" ]) - ]; - ###### interface options = { programs.gnome-disks = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable GNOME Disks daemon, a program designed to @@ -39,7 +30,7 @@ with lib; ###### implementation - config = mkIf config.programs.gnome-disks.enable { + config = lib.mkIf config.programs.gnome-disks.enable { environment.systemPackages = [ pkgs.gnome.gnome-disk-utility ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/gnome-terminal.nix b/third_party/nixpkgs/nixos/modules/programs/gnome-terminal.nix index 71a6b21788..a5dda83edd 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gnome-terminal.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gnome-terminal.nix @@ -2,8 +2,6 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.gnome-terminal; @@ -13,21 +11,14 @@ in { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - # Added 2019-08-19 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "gnome-terminal-server" "enable" ] - [ "programs" "gnome-terminal" "enable" ]) - ]; - options = { - programs.gnome-terminal.enable = mkEnableOption "GNOME Terminal"; + programs.gnome-terminal.enable = lib.mkEnableOption "GNOME Terminal"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.gnome.gnome-terminal ]; services.dbus.packages = [ pkgs.gnome.gnome-terminal ]; systemd.packages = [ pkgs.gnome.gnome-terminal ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/gpaste.nix b/third_party/nixpkgs/nixos/modules/programs/gpaste.nix index 1c34c86eb8..32b81434bd 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gpaste.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gpaste.nix @@ -1,22 +1,13 @@ # GPaste. { config, lib, pkgs, ... }: -with lib; - { - # Added 2019-08-09 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "gpaste" "enable" ] - [ "programs" "gpaste" "enable" ]) - ]; - ###### interface options = { programs.gpaste = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable GPaste, a clipboard manager. @@ -26,7 +17,7 @@ with lib; }; ###### implementation - config = mkIf config.programs.gpaste.enable { + config = lib.mkIf config.programs.gpaste.enable { environment.systemPackages = [ pkgs.gnome.gpaste ]; services.dbus.packages = [ pkgs.gnome.gpaste ]; systemd.packages = [ pkgs.gnome.gpaste ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/gphoto2.nix b/third_party/nixpkgs/nixos/modules/programs/gphoto2.nix index d99259b545..d9f09483f6 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gphoto2.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gphoto2.nix @@ -1,16 +1,14 @@ { config, lib, pkgs, ... }: -with lib; - { - meta.maintainers = [ maintainers.league ]; + meta.maintainers = [ lib.maintainers.league ]; ###### interface options = { programs.gphoto2 = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to configure system to use gphoto2. To grant digital camera access to a user, the user must @@ -22,7 +20,7 @@ with lib; }; ###### implementation - config = mkIf config.programs.gphoto2.enable { + config = lib.mkIf config.programs.gphoto2.enable { services.udev.packages = [ pkgs.libgphoto2 ]; environment.systemPackages = [ pkgs.gphoto2 ]; users.groups.camera = {}; diff --git a/third_party/nixpkgs/nixos/modules/programs/haguichi.nix b/third_party/nixpkgs/nixos/modules/programs/haguichi.nix index 4f48551cf1..fd769ac8d0 100644 --- a/third_party/nixpkgs/nixos/modules/programs/haguichi.nix +++ b/third_party/nixpkgs/nixos/modules/programs/haguichi.nix @@ -1,13 +1,11 @@ { lib, pkgs, config, ... }: -with lib; - { options.programs.haguichi = { - enable = mkEnableOption "Haguichi, a Linux GUI frontend to the proprietary LogMeIn Hamachi"; + enable = lib.mkEnableOption "Haguichi, a Linux GUI frontend to the proprietary LogMeIn Hamachi"; }; - config = mkIf config.programs.haguichi.enable { + config = lib.mkIf config.programs.haguichi.enable { environment.systemPackages = with pkgs; [ haguichi ]; services.logmein-hamachi.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/programs/hamster.nix b/third_party/nixpkgs/nixos/modules/programs/hamster.nix index 0bb56ad7ff..90cfc0f86a 100644 --- a/third_party/nixpkgs/nixos/modules/programs/hamster.nix +++ b/third_party/nixpkgs/nixos/modules/programs/hamster.nix @@ -1,12 +1,10 @@ { config, lib, pkgs, ... }: -with lib; - { meta.maintainers = pkgs.hamster.meta.maintainers; options.programs.hamster.enable = - mkEnableOption "hamster, a time tracking program"; + lib.mkEnableOption "hamster, a time tracking program"; config = lib.mkIf config.programs.hamster.enable { environment.systemPackages = [ pkgs.hamster ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/htop.nix b/third_party/nixpkgs/nixos/modules/programs/htop.nix index bf3d851081..1252b41e8b 100644 --- a/third_party/nixpkgs/nixos/modules/programs/htop.nix +++ b/third_party/nixpkgs/nixos/modules/programs/htop.nix @@ -1,29 +1,27 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.htop; fmt = value: - if isList value then concatStringsSep " " (map fmt value) else - if isString value then value else - if isBool value then if value then "1" else "0" else - if isInt value then toString value else - throw "Unrecognized type ${typeOf value} in htop settings"; + if builtins.isList value then builtins.concatStringsSep " " (builtins.map fmt value) else + if builtins.isString value then value else + if builtins.isBool value then if value then "1" else "0" else + if builtins.isInt value then builtins.toString value else + throw "Unrecognized type ${builtins.typeOf value} in htop settings"; in { options.programs.htop = { - package = mkPackageOption pkgs "htop" { }; + package = lib.mkPackageOption pkgs "htop" { }; - enable = mkEnableOption "htop process monitor"; + enable = lib.mkEnableOption "htop process monitor"; - settings = mkOption { - type = with types; attrsOf (oneOf [ str int bool (listOf (oneOf [ str int bool ])) ]); + settings = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ str int bool (listOf (oneOf [ str int bool ])) ]); default = {}; example = { hide_kernel_threads = true; @@ -38,7 +36,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; @@ -46,7 +44,7 @@ in environment.etc."htoprc".text = '' # Global htop configuration # To change set: programs.htop.settings.KEY = VALUE; - '' + concatStringsSep "\n" (mapAttrsToList (key: value: "${key}=${fmt value}") cfg.settings); + '' + builtins.concatStringsSep "\n" (lib.mapAttrsToList (key: value: "${key}=${fmt value}") cfg.settings); }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/i3lock.nix b/third_party/nixpkgs/nixos/modules/programs/i3lock.nix index 8068ecaf08..ff616144e2 100644 --- a/third_party/nixpkgs/nixos/modules/programs/i3lock.nix +++ b/third_party/nixpkgs/nixos/modules/programs/i3lock.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.i3lock; @@ -12,8 +10,8 @@ in { options = { programs.i3lock = { - enable = mkEnableOption "i3lock"; - package = mkPackageOption pkgs "i3lock" { + enable = lib.mkEnableOption "i3lock"; + package = lib.mkPackageOption pkgs "i3lock" { example = "i3lock-color"; extraDescription = '' ::: {.note} @@ -21,8 +19,8 @@ in { ::: ''; }; - u2fSupport = mkOption { - type = types.bool; + u2fSupport = lib.mkOption { + type = lib.types.bool; default = false; example = true; description = '' @@ -36,11 +34,11 @@ in { ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - security.wrappers.i3lock = mkIf cfg.u2fSupport { + security.wrappers.i3lock = lib.mkIf cfg.u2fSupport { setuid = true; owner = "root"; group = "root"; diff --git a/third_party/nixpkgs/nixos/modules/programs/iftop.nix b/third_party/nixpkgs/nixos/modules/programs/iftop.nix index c74714a9a6..d6e56c8fde 100644 --- a/third_party/nixpkgs/nixos/modules/programs/iftop.nix +++ b/third_party/nixpkgs/nixos/modules/programs/iftop.nix @@ -1,14 +1,12 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.iftop; in { options = { - programs.iftop.enable = mkEnableOption "iftop + setcap wrapper"; + programs.iftop.enable = lib.mkEnableOption "iftop + setcap wrapper"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.iftop ]; security.wrappers.iftop = { owner = "root"; diff --git a/third_party/nixpkgs/nixos/modules/programs/iotop.nix b/third_party/nixpkgs/nixos/modules/programs/iotop.nix index b7c1c69f9d..ba8d028f6b 100644 --- a/third_party/nixpkgs/nixos/modules/programs/iotop.nix +++ b/third_party/nixpkgs/nixos/modules/programs/iotop.nix @@ -1,14 +1,12 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.iotop; in { options = { - programs.iotop.enable = mkEnableOption "iotop + setcap wrapper"; + programs.iotop.enable = lib.mkEnableOption "iotop + setcap wrapper"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { security.wrappers.iotop = { owner = "root"; group = "root"; diff --git a/third_party/nixpkgs/nixos/modules/programs/java.nix b/third_party/nixpkgs/nixos/modules/programs/java.nix index f201f67b42..784add8096 100644 --- a/third_party/nixpkgs/nixos/modules/programs/java.nix +++ b/third_party/nixpkgs/nixos/modules/programs/java.nix @@ -3,8 +3,6 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.java; in @@ -14,7 +12,7 @@ in programs.java = { - enable = mkEnableOption "java" // { + enable = lib.mkEnableOption "java" // { description = '' Install and setup the Java development kit. @@ -30,19 +28,19 @@ in ''; }; - package = mkPackageOption pkgs "jdk" { + package = lib.mkPackageOption pkgs "jdk" { example = "jre"; }; - binfmt = mkEnableOption "binfmt to execute java jar's and classes"; + binfmt = lib.mkEnableOption "binfmt to execute java jar's and classes"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - boot.binfmt.registrations = mkIf cfg.binfmt { + boot.binfmt.registrations = lib.mkIf cfg.binfmt { java-class = { recognitionType = "extension"; magicOrExtension = "class"; diff --git a/third_party/nixpkgs/nixos/modules/programs/joycond-cemuhook.nix b/third_party/nixpkgs/nixos/modules/programs/joycond-cemuhook.nix index ebb0198ee6..6cdd198a7d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/joycond-cemuhook.nix +++ b/third_party/nixpkgs/nixos/modules/programs/joycond-cemuhook.nix @@ -1,8 +1,7 @@ { lib, pkgs, config, ... }: -with lib; { options.programs.joycond-cemuhook = { - enable = mkEnableOption "joycond-cemuhook, a program to enable support for cemuhook's UDP protocol for joycond devices."; + enable = lib.mkEnableOption "joycond-cemuhook, a program to enable support for cemuhook's UDP protocol for joycond devices."; }; config = lib.mkIf config.programs.joycond-cemuhook.enable { diff --git a/third_party/nixpkgs/nixos/modules/programs/k3b.nix b/third_party/nixpkgs/nixos/modules/programs/k3b.nix index 4d6385dab4..3e9435d3dc 100644 --- a/third_party/nixpkgs/nixos/modules/programs/k3b.nix +++ b/third_party/nixpkgs/nixos/modules/programs/k3b.nix @@ -1,12 +1,10 @@ { config, pkgs, lib, ... }: -with lib; - { # interface options.programs.k3b = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable k3b, the KDE disk burning application. @@ -22,7 +20,7 @@ with lib; }; # implementation - config = mkIf config.programs.k3b.enable { + config = lib.mkIf config.programs.k3b.enable { environment.systemPackages = with pkgs; [ k3b diff --git a/third_party/nixpkgs/nixos/modules/programs/k40-whisperer.nix b/third_party/nixpkgs/nixos/modules/programs/k40-whisperer.nix index 156ded6c39..0f29c476cb 100644 --- a/third_party/nixpkgs/nixos/modules/programs/k40-whisperer.nix +++ b/third_party/nixpkgs/nixos/modules/programs/k40-whisperer.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.k40-whisperer; pkg = cfg.package.override { @@ -10,20 +8,20 @@ let in { options.programs.k40-whisperer = { - enable = mkEnableOption "K40-Whisperer"; + enable = lib.mkEnableOption "K40-Whisperer"; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; description = '' Group assigned to the device when connected. ''; default = "k40"; }; - package = mkPackageOption pkgs "k40-whisperer" { }; + package = lib.mkPackageOption pkgs "k40-whisperer" { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.groups.${cfg.group} = {}; environment.systemPackages = [ pkg ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/kbdlight.nix b/third_party/nixpkgs/nixos/modules/programs/kbdlight.nix index 8a2a0057cf..934bb214c1 100644 --- a/third_party/nixpkgs/nixos/modules/programs/kbdlight.nix +++ b/third_party/nixpkgs/nixos/modules/programs/kbdlight.nix @@ -1,15 +1,13 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.kbdlight; in { - options.programs.kbdlight.enable = mkEnableOption "kbdlight"; + options.programs.kbdlight.enable = lib.mkEnableOption "kbdlight"; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.kbdlight ]; security.wrappers.kbdlight = { setuid = true; diff --git a/third_party/nixpkgs/nixos/modules/programs/kclock.nix b/third_party/nixpkgs/nixos/modules/programs/kclock.nix index c2299a3f1b..b69f358ec1 100644 --- a/third_party/nixpkgs/nixos/modules/programs/kclock.nix +++ b/third_party/nixpkgs/nixos/modules/programs/kclock.nix @@ -1,12 +1,11 @@ { lib, pkgs, config, ... }: -with lib; let cfg = config.programs.kclock; kclockPkg = pkgs.libsForQt5.kclock; in { - options.programs.kclock = { enable = mkEnableOption "KClock"; }; + options.programs.kclock = { enable = lib.mkEnableOption "KClock"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.dbus.packages = [ kclockPkg ]; environment.systemPackages = [ kclockPkg ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/kdeconnect.nix b/third_party/nixpkgs/nixos/modules/programs/kdeconnect.nix index 1431281405..dbdff1e447 100644 --- a/third_party/nixpkgs/nixos/modules/programs/kdeconnect.nix +++ b/third_party/nixpkgs/nixos/modules/programs/kdeconnect.nix @@ -1,8 +1,7 @@ { config, pkgs, lib, ... }: -with lib; { options.programs.kdeconnect = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' kdeconnect. Note that it will open the TCP and UDP port from @@ -11,7 +10,7 @@ with lib; `gnomeExtensions.gsconnect` as an alternative implementation if you use Gnome ''; - package = mkPackageOption pkgs [ "plasma5Packages" "kdeconnect-kde" ] { + package = lib.mkPackageOption pkgs [ "plasma5Packages" "kdeconnect-kde" ] { example = "gnomeExtensions.gsconnect"; }; }; @@ -19,7 +18,7 @@ with lib; let cfg = config.programs.kdeconnect; in - mkIf cfg.enable { + lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package pkgs.sshfs diff --git a/third_party/nixpkgs/nixos/modules/programs/less.nix b/third_party/nixpkgs/nixos/modules/programs/less.nix index 2cb7620075..c904fc2089 100644 --- a/third_party/nixpkgs/nixos/modules/programs/less.nix +++ b/third_party/nixpkgs/nixos/modules/programs/less.nix @@ -1,26 +1,24 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.less; configText = if (cfg.configFile != null) then (builtins.readFile cfg.configFile) else '' #command - ${concatStringsSep "\n" - (mapAttrsToList (command: action: "${command} ${action}") cfg.commands) + ${builtins.concatStringsSep "\n" + (lib.mapAttrsToList (command: action: "${command} ${action}") cfg.commands) } - ${optionalString cfg.clearDefaultCommands "#stop"} + ${lib.optionalString cfg.clearDefaultCommands "#stop"} #line-edit - ${concatStringsSep "\n" - (mapAttrsToList (command: action: "${command} ${action}") cfg.lineEditingKeys) + ${builtins.concatStringsSep "\n" + (lib.mapAttrsToList (command: action: "${command} ${action}") cfg.lineEditingKeys) } #env - ${concatStringsSep "\n" - (mapAttrsToList (variable: values: "${variable}=${values}") cfg.envVariables) + ${builtins.concatStringsSep "\n" + (lib.mapAttrsToList (variable: values: "${variable}=${values}") cfg.envVariables) } ''; @@ -35,12 +33,12 @@ in # note that environment.nix sets PAGER=less, and # therefore also enables this module - enable = mkEnableOption "less, a file pager"; + enable = lib.mkEnableOption "less, a file pager"; - configFile = mkOption { - type = types.nullOr types.path; + configFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; - example = literalExpression ''"''${pkgs.my-configs}/lesskey"''; + example = lib.literalExpression ''"''${pkgs.my-configs}/lesskey"''; description = '' Path to lesskey configuration file. @@ -50,8 +48,8 @@ in ''; }; - commands = mkOption { - type = types.attrsOf types.str; + commands = lib.mkOption { + type = lib.types.attrsOf lib.types.str; default = {}; example = { h = "noaction 5\\e("; @@ -60,8 +58,8 @@ in description = "Defines new command keys."; }; - clearDefaultCommands = mkOption { - type = types.bool; + clearDefaultCommands = lib.mkOption { + type = lib.types.bool; default = false; description = '' Clear all default commands. @@ -70,8 +68,8 @@ in ''; }; - lineEditingKeys = mkOption { - type = types.attrsOf types.str; + lineEditingKeys = lib.mkOption { + type = lib.types.attrsOf lib.types.str; default = {}; example = { e = "abort"; @@ -79,8 +77,8 @@ in description = "Defines new line-editing keys."; }; - envVariables = mkOption { - type = types.attrsOf types.str; + envVariables = lib.mkOption { + type = lib.types.attrsOf lib.types.str; default = { LESS = "-R"; }; @@ -90,17 +88,17 @@ in description = "Defines environment variables."; }; - lessopen = mkOption { - type = types.nullOr types.str; + lessopen = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = "|${pkgs.lesspipe}/bin/lesspipe.sh %s"; - defaultText = literalExpression ''"|''${pkgs.lesspipe}/bin/lesspipe.sh %s"''; + defaultText = lib.literalExpression ''"|''${pkgs.lesspipe}/bin/lesspipe.sh %s"''; description = '' Before less opens a file, it first gives your input preprocessor a chance to modify the way the contents of the file are displayed. ''; }; - lessclose = mkOption { - type = types.nullOr types.str; + lessclose = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' When less closes a file opened in such a way, it will call another program, called the input postprocessor, @@ -110,26 +108,26 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.less ]; environment.variables = { - LESSKEYIN_SYSTEM = toString lessKey; - } // optionalAttrs (cfg.lessopen != null) { + LESSKEYIN_SYSTEM = builtins.toString lessKey; + } // lib.optionalAttrs (cfg.lessopen != null) { LESSOPEN = cfg.lessopen; - } // optionalAttrs (cfg.lessclose != null) { + } // lib.optionalAttrs (cfg.lessclose != null) { LESSCLOSE = cfg.lessclose; }; - warnings = optional ( - cfg.clearDefaultCommands && (all (x: x != "quit") (attrValues cfg.commands)) + warnings = lib.optional ( + cfg.clearDefaultCommands && (builtins.all (x: x != "quit") (builtins.attrValues cfg.commands)) ) '' config.programs.less.clearDefaultCommands clears all default commands of less but there is no alternative binding for exiting. Consider adding a binding for 'quit'. ''; }; - meta.maintainers = with maintainers; [ johnazoidberg ]; + meta.maintainers = with lib.maintainers; [ johnazoidberg ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/liboping.nix b/third_party/nixpkgs/nixos/modules/programs/liboping.nix index 4433f9767d..5ff9ad74b1 100644 --- a/third_party/nixpkgs/nixos/modules/programs/liboping.nix +++ b/third_party/nixpkgs/nixos/modules/programs/liboping.nix @@ -1,16 +1,14 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.liboping; in { options.programs.liboping = { - enable = mkEnableOption "liboping"; + enable = lib.mkEnableOption "liboping"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ liboping ]; - security.wrappers = mkMerge (map ( + security.wrappers = lib.mkMerge (builtins.map ( exec: { "${exec}" = { owner = "root"; diff --git a/third_party/nixpkgs/nixos/modules/programs/light.nix b/third_party/nixpkgs/nixos/modules/programs/light.nix index b1584a1b3d..29fcc98a8e 100644 --- a/third_party/nixpkgs/nixos/modules/programs/light.nix +++ b/third_party/nixpkgs/nixos/modules/programs/light.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.light; @@ -10,9 +8,9 @@ in options = { programs.light = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to install Light backlight control command and udev rules granting access to members of the "video" group. @@ -20,8 +18,8 @@ in }; brightnessKeys = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable brightness control with keyboard keys. @@ -38,8 +36,8 @@ in ''; }; - step = mkOption { - type = types.int; + step = lib.mkOption { + type = lib.types.int; default = 10; description = '' The percentage value by which to increase/decrease brightness. @@ -51,14 +49,14 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.light ]; services.udev.packages = [ pkgs.light ]; - services.actkbd = mkIf cfg.brightnessKeys.enable { + services.actkbd = lib.mkIf cfg.brightnessKeys.enable { enable = true; bindings = let light = "${pkgs.light}/bin/light"; - step = toString cfg.brightnessKeys.step; + step = builtins.toString cfg.brightnessKeys.step; in [ { keys = [ 224 ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/mdevctl.nix b/third_party/nixpkgs/nixos/modules/programs/mdevctl.nix index be33835639..a7e7d01dff 100644 --- a/third_party/nixpkgs/nixos/modules/programs/mdevctl.nix +++ b/third_party/nixpkgs/nixos/modules/programs/mdevctl.nix @@ -1,14 +1,13 @@ { config, pkgs, lib, ... }: -with lib; let cfg = config.programs.mdevctl; in { options.programs.mdevctl = { - enable = mkEnableOption "Mediated Device Management"; + enable = lib.mkEnableOption "Mediated Device Management"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ mdevctl ]; environment.etc."mdevctl.d/scripts.d/notifiers/.keep".text = ""; diff --git a/third_party/nixpkgs/nixos/modules/programs/mepo.nix b/third_party/nixpkgs/nixos/modules/programs/mepo.nix index 22596892ff..783d2ad149 100644 --- a/third_party/nixpkgs/nixos/modules/programs/mepo.nix +++ b/third_party/nixpkgs/nixos/modules/programs/mepo.nix @@ -1,15 +1,14 @@ { pkgs, config, lib, ...}: -with lib; let cfg = config.programs.mepo; in { options.programs.mepo = { - enable = mkEnableOption "Mepo, a fast, simple and hackable OSM map viewer"; + enable = lib.mkEnableOption "Mepo, a fast, simple and hackable OSM map viewer"; locationBackends = { - gpsd = mkOption { - type = types.bool; + gpsd = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable location detection via gpsd. @@ -17,21 +16,21 @@ in ''; }; - geoclue = mkOption { - type = types.bool; + geoclue = lib.mkOption { + type = lib.types.bool; default = true; description = "Whether to enable location detection via geoclue"; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ mepo ] ++ lib.optional cfg.locationBackends.geoclue geoclue2-with-demo-agent ++ lib.optional cfg.locationBackends.gpsd gpsd; - services.geoclue2 = mkIf cfg.locationBackends.geoclue { + services.geoclue2 = lib.mkIf cfg.locationBackends.geoclue { enable = true; appConfig.where-am-i = { isAllowed = true; @@ -42,5 +41,5 @@ in services.gpsd.enable = cfg.locationBackends.gpsd; }; - meta.maintainers = with maintainers; [ laalsaas ]; + meta.maintainers = with lib.maintainers; [ laalsaas ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/mininet.nix b/third_party/nixpkgs/nixos/modules/programs/mininet.nix index a9190ed989..ab862b21fe 100644 --- a/third_party/nixpkgs/nixos/modules/programs/mininet.nix +++ b/third_party/nixpkgs/nixos/modules/programs/mininet.nix @@ -2,15 +2,13 @@ # kernel must have NETNS/VETH/SCHED { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.mininet; in { - options.programs.mininet.enable = mkEnableOption "Mininet, an emulator for rapid prototyping of Software Defined Networks"; + options.programs.mininet.enable = lib.mkEnableOption "Mininet, an emulator for rapid prototyping of Software Defined Networks"; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { virtualisation.vswitch.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/programs/msmtp.nix b/third_party/nixpkgs/nixos/modules/programs/msmtp.nix index 9c067bdc96..8a04acb3b7 100644 --- a/third_party/nixpkgs/nixos/modules/programs/msmtp.nix +++ b/third_party/nixpkgs/nixos/modules/programs/msmtp.nix @@ -1,27 +1,25 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.msmtp; in { - meta.maintainers = with maintainers; [ pacien ]; + meta.maintainers = with lib.maintainers; [ pacien ]; options = { programs.msmtp = { - enable = mkEnableOption "msmtp - an SMTP client"; + enable = lib.mkEnableOption "msmtp - an SMTP client"; - setSendmail = mkOption { - type = types.bool; + setSendmail = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to set the system sendmail to msmtp's. ''; }; - defaults = mkOption { - type = types.attrs; + defaults = lib.mkOption { + type = lib.types.attrs; default = {}; example = { aliases = "/etc/aliases"; @@ -34,8 +32,8 @@ in { ''; }; - accounts = mkOption { - type = with types; attrsOf attrs; + accounts = lib.mkOption { + type = with lib.types; attrsOf attrs; default = {}; example = { "default" = { @@ -59,8 +57,8 @@ in { ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra lines to add to the msmtp configuration verbatim. @@ -70,10 +68,10 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.msmtp ]; - services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail { + services.mail.sendmailSetuidWrapper = lib.mkIf cfg.setSendmail { program = "sendmail"; source = "${pkgs.msmtp}/bin/sendmail"; setuid = false; @@ -86,10 +84,10 @@ in { mkValueString = v: if v == true then "on" else if v == false then "off" - else generators.mkValueStringDefault {} v; + else lib.generators.mkValueStringDefault {} v; mkKeyValueString = k: v: "${k} ${mkValueString v}"; mkInnerSectionString = - attrs: concatStringsSep "\n" (mapAttrsToList mkKeyValueString attrs); + attrs: builtins.concatStringsSep "\n" (lib.mapAttrsToList mkKeyValueString attrs); mkAccountString = name: attrs: '' account ${name} ${mkInnerSectionString attrs} @@ -98,7 +96,7 @@ in { defaults ${mkInnerSectionString cfg.defaults} - ${concatStringsSep "\n" (mapAttrsToList mkAccountString cfg.accounts)} + ${builtins.concatStringsSep "\n" (lib.mapAttrsToList mkAccountString cfg.accounts)} ${cfg.extraConfig} ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/mtr.nix b/third_party/nixpkgs/nixos/modules/programs/mtr.nix index 6a767df15f..1a9deba989 100644 --- a/third_party/nixpkgs/nixos/modules/programs/mtr.nix +++ b/third_party/nixpkgs/nixos/modules/programs/mtr.nix @@ -1,15 +1,13 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.mtr; in { options = { programs.mtr = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to add mtr to the global environment and configure a @@ -17,12 +15,12 @@ in { ''; }; - package = mkPackageOption pkgs "mtr" { }; + package = lib.mkPackageOption pkgs "mtr" { }; }; }; - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ cfg.package ]; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; security.wrappers.mtr-packet = { owner = "root"; diff --git a/third_party/nixpkgs/nixos/modules/programs/nbd.nix b/third_party/nixpkgs/nixos/modules/programs/nbd.nix index fea9bc1ff7..1e319f0273 100644 --- a/third_party/nixpkgs/nixos/modules/programs/nbd.nix +++ b/third_party/nixpkgs/nixos/modules/programs/nbd.nix @@ -1,18 +1,16 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.nbd; in { options = { programs.nbd = { - enable = mkEnableOption "Network Block Device (nbd) support"; + enable = lib.mkEnableOption "Network Block Device (nbd) support"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ nbd ]; boot.kernelModules = [ "nbd" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/neovim.nix b/third_party/nixpkgs/nixos/modules/programs/neovim.nix index 6f6829444a..8fe6a664b6 100644 --- a/third_party/nixpkgs/nixos/modules/programs/neovim.nix +++ b/third_party/nixpkgs/nixos/modules/programs/neovim.nix @@ -1,14 +1,12 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.neovim; in { options.programs.neovim = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; example = true; description = '' @@ -21,8 +19,8 @@ in ''; }; - defaultEditor = mkOption { - type = types.bool; + defaultEditor = lib.mkOption { + type = lib.types.bool; default = false; description = '' When enabled, installs neovim and configures neovim to be the default editor @@ -30,44 +28,44 @@ in ''; }; - viAlias = mkOption { - type = types.bool; + viAlias = lib.mkOption { + type = lib.types.bool; default = false; description = '' Symlink {command}`vi` to {command}`nvim` binary. ''; }; - vimAlias = mkOption { - type = types.bool; + vimAlias = lib.mkOption { + type = lib.types.bool; default = false; description = '' Symlink {command}`vim` to {command}`nvim` binary. ''; }; - withRuby = mkOption { - type = types.bool; + withRuby = lib.mkOption { + type = lib.types.bool; default = true; description = "Enable Ruby provider."; }; - withPython3 = mkOption { - type = types.bool; + withPython3 = lib.mkOption { + type = lib.types.bool; default = true; description = "Enable Python 3 provider."; }; - withNodeJs = mkOption { - type = types.bool; + withNodeJs = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable Node provider."; }; - configure = mkOption { - type = types.attrs; + configure = lib.mkOption { + type = lib.types.attrs; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { customRC = ''' " here your custom configuration goes! @@ -86,31 +84,31 @@ in ''; }; - package = mkPackageOption pkgs "neovim-unwrapped" { }; + package = lib.mkPackageOption pkgs "neovim-unwrapped" { }; - finalPackage = mkOption { - type = types.package; + finalPackage = lib.mkOption { + type = lib.types.package; visible = false; readOnly = true; description = "Resulting customized neovim package."; }; - runtime = mkOption { + runtime = lib.mkOption { default = { }; - example = literalExpression '' + example = lib.literalExpression '' { "ftplugin/c.vim".text = "setlocal omnifunc=v:lua.vim.lsp.omnifunc"; } ''; description = '' Set of files that have to be linked in {file}`runtime`. ''; - type = with types; attrsOf (submodule ( + type = with lib.types; attrsOf (submodule ( { name, config, ... }: { options = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether this runtime directory should be generated. This @@ -118,49 +116,49 @@ in ''; }; - target = mkOption { - type = types.str; + target = lib.mkOption { + type = lib.types.str; description = '' Name of symlink. Defaults to the attribute name. ''; }; - text = mkOption { + text = lib.mkOption { default = null; - type = types.nullOr types.lines; + type = lib.types.nullOr lib.types.lines; description = "Text of the file."; }; - source = mkOption { + source = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = "Path of the source file."; }; }; - config.target = mkDefault name; + config.target = lib.mkDefault name; } )); }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.finalPackage ]; - environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim"); + environment.variables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim"); - environment.etc = listToAttrs (attrValues (mapAttrs + environment.etc = builtins.listToAttrs (builtins.attrValues (builtins.mapAttrs (name: value: { name = "xdg/nvim/${name}"; - value = removeAttrs + value = builtins.removeAttrs (value // { target = "xdg/nvim/${value.target}"; }) - (optionals (isNull value.source) [ "source" ]); + (lib.optionals (builtins.isNull value.source) [ "source" ]); }) cfg.runtime)); diff --git a/third_party/nixpkgs/nixos/modules/programs/nethoscope.nix b/third_party/nixpkgs/nixos/modules/programs/nethoscope.nix index 495548e9c6..7bc1f61b31 100644 --- a/third_party/nixpkgs/nixos/modules/programs/nethoscope.nix +++ b/third_party/nixpkgs/nixos/modules/programs/nethoscope.nix @@ -1,16 +1,14 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.nethoscope; in { - meta.maintainers = with maintainers; [ _0x4A6F ]; + meta.maintainers = with lib.maintainers; [ _0x4A6F ]; options = { programs.nethoscope = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to add nethoscope to the global environment and configure a @@ -20,7 +18,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ nethoscope ]; security.wrappers.nethoscope = { source = "${pkgs.nethoscope}/bin/nethoscope"; diff --git a/third_party/nixpkgs/nixos/modules/programs/nncp.nix b/third_party/nixpkgs/nixos/modules/programs/nncp.nix index aa2e7c7a6e..3feccef4cf 100644 --- a/third_party/nixpkgs/nixos/modules/programs/nncp.nix +++ b/third_party/nixpkgs/nixos/modules/programs/nncp.nix @@ -1,6 +1,5 @@ { config, lib, pkgs, ... }: -with lib; let nncpCfgFile = "/run/nncp.hjson"; programCfg = config.programs.nncp; @@ -11,10 +10,10 @@ in { options.programs.nncp = { enable = - mkEnableOption "NNCP (Node to Node copy) utilities and configuration"; + lib.mkEnableOption "NNCP (Node to Node copy) utilities and configuration"; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "uucp"; description = '' The group under which NNCP files shall be owned. @@ -23,10 +22,10 @@ in { ''; }; - package = mkPackageOption pkgs "nncp" { }; + package = lib.mkPackageOption pkgs "nncp" { }; - secrets = mkOption { - type = with types; listOf str; + secrets = lib.mkOption { + type = with lib.types; listOf str; example = [ "/run/keys/nncp.hjson" ]; description = '' A list of paths to NNCP configuration files that should not be @@ -35,7 +34,7 @@ in { ''; }; - settings = mkOption { + settings = lib.mkOption { type = settingsFormat.type; description = '' NNCP configuration, see @@ -52,7 +51,7 @@ in { }; - config = mkIf programCfg.enable { + config = lib.mkIf programCfg.enable { environment = { systemPackages = [ pkg ]; @@ -60,8 +59,8 @@ in { }; programs.nncp.settings = { - spool = mkDefault "/var/spool/nncp"; - log = mkDefault "/var/spool/nncp/log"; + spool = lib.mkDefault "/var/spool/nncp"; + log = lib.mkDefault "/var/spool/nncp/log"; }; systemd.tmpfiles.rules = [ @@ -77,7 +76,7 @@ in { script = '' umask u=rw nncpCfgDir=$(mktemp --directory nncp.XXX) - for f in ${jsonCfgFile} ${toString config.programs.nncp.secrets}; do + for f in ${jsonCfgFile} ${builtins.toString config.programs.nncp.secrets}; do tmpdir=$(mktemp --directory nncp.XXX) nncp-cfgdir -cfg $f -dump $tmpdir find $tmpdir -size 1c -delete diff --git a/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix b/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix index 70a0441bd7..5e37061d9a 100644 --- a/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix +++ b/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix @@ -1,17 +1,15 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.noisetorch; in { options.programs.noisetorch = { - enable = mkEnableOption "noisetorch (+ setcap wrapper), a virtual microphone device with noise suppression"; + enable = lib.mkEnableOption "noisetorch (+ setcap wrapper), a virtual microphone device with noise suppression"; - package = mkPackageOption pkgs "noisetorch" { }; + package = lib.mkPackageOption pkgs "noisetorch" { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { security.wrappers.noisetorch = { owner = "root"; group = "root"; diff --git a/third_party/nixpkgs/nixos/modules/programs/npm.nix b/third_party/nixpkgs/nixos/modules/programs/npm.nix index b379f0165b..470188b879 100644 --- a/third_party/nixpkgs/nixos/modules/programs/npm.nix +++ b/third_party/nixpkgs/nixos/modules/programs/npm.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.npm; in @@ -11,13 +9,13 @@ in options = { programs.npm = { - enable = mkEnableOption "{command}`npm` global config"; + enable = lib.mkEnableOption "{command}`npm` global config"; - package = mkPackageOption pkgs [ "nodePackages" "npm" ] { + package = lib.mkPackageOption pkgs [ "nodePackages" "npm" ] { example = "nodePackages_13_x.npm"; }; - npmrc = mkOption { + npmrc = lib.mkOption { type = lib.types.lines; description = '' The system-wide npm configuration. diff --git a/third_party/nixpkgs/nixos/modules/programs/oblogout.nix b/third_party/nixpkgs/nixos/modules/programs/oblogout.nix index a039b0623b..f09fbdc062 100644 --- a/third_party/nixpkgs/nixos/modules/programs/oblogout.nix +++ b/third_party/nixpkgs/nixos/modules/programs/oblogout.nix @@ -1,11 +1,9 @@ { config, lib, pkgs, ... }: -with lib; - { imports = [ - (mkRemovedOptionModule [ "programs" "oblogout" ] "programs.oblogout has been removed from NixOS. This is because the oblogout repository has been archived upstream.") + (lib.mkRemovedOptionModule [ "programs" "oblogout" ] "programs.oblogout has been removed from NixOS. This is because the oblogout repository has been archived upstream.") ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/openvpn3.nix b/third_party/nixpkgs/nixos/modules/programs/openvpn3.nix index 6415cccecb..10042b4447 100644 --- a/third_party/nixpkgs/nixos/modules/programs/openvpn3.nix +++ b/third_party/nixpkgs/nixos/modules/programs/openvpn3.nix @@ -1,19 +1,17 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.openvpn3; in { options.programs.openvpn3 = { - enable = mkEnableOption "the openvpn3 client"; - package = mkOption { - type = types.package; + enable = lib.mkEnableOption "the openvpn3 client"; + package = lib.mkOption { + type = lib.types.package; default = pkgs.openvpn3.override { enableSystemdResolved = config.services.resolved.enable; }; - defaultText = literalExpression ''pkgs.openvpn3.override { + defaultText = lib.literalExpression ''pkgs.openvpn3.override { enableSystemdResolved = config.services.resolved.enable; }''; description = '' @@ -22,7 +20,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.dbus.packages = [ cfg.package ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/pantheon-tweaks.nix b/third_party/nixpkgs/nixos/modules/programs/pantheon-tweaks.nix index 0b8a19ea22..b7258e2eb4 100644 --- a/third_party/nixpkgs/nixos/modules/programs/pantheon-tweaks.nix +++ b/third_party/nixpkgs/nixos/modules/programs/pantheon-tweaks.nix @@ -1,19 +1,17 @@ { config, lib, pkgs, ... }: -with lib; - { meta = { - maintainers = teams.pantheon.members; + maintainers = lib.teams.pantheon.members; }; ###### interface options = { - programs.pantheon-tweaks.enable = mkEnableOption "Pantheon Tweaks, an unofficial system settings panel for Pantheon"; + programs.pantheon-tweaks.enable = lib.mkEnableOption "Pantheon Tweaks, an unofficial system settings panel for Pantheon"; }; ###### implementation - config = mkIf config.programs.pantheon-tweaks.enable { + config = lib.mkIf config.programs.pantheon-tweaks.enable { services.xserver.desktopManager.pantheon.extraSwitchboardPlugs = [ pkgs.pantheon-tweaks ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/plotinus.nix b/third_party/nixpkgs/nixos/modules/programs/plotinus.nix index 41c75b69a2..835db049d8 100644 --- a/third_party/nixpkgs/nixos/modules/programs/plotinus.nix +++ b/third_party/nixpkgs/nixos/modules/programs/plotinus.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.plotinus; in @@ -15,21 +13,21 @@ in options = { programs.plotinus = { - enable = mkOption { + enable = lib.mkOption { default = false; description = '' Whether to enable the Plotinus GTK 3 plugin. Plotinus provides a popup (triggered by Ctrl-Shift-P) to search the menus of a compatible application. ''; - type = types.bool; + type = lib.types.bool; }; }; }; ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.plotinus}/share/gsettings-schemas/${pkgs.plotinus.name}" ]; environment.variables.GTK3_MODULES = [ "${pkgs.plotinus}/lib/libplotinus.so" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/proxychains.nix b/third_party/nixpkgs/nixos/modules/programs/proxychains.nix index b15475dac0..86bbf16a64 100644 --- a/third_party/nixpkgs/nixos/modules/programs/proxychains.nix +++ b/third_party/nixpkgs/nixos/modules/programs/proxychains.nix @@ -1,15 +1,14 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.programs.proxychains; configFile = '' ${cfg.chain.type}_chain - ${optionalString (cfg.chain.type == "random") + ${lib.optionalString (cfg.chain.type == "random") "chain_len = ${builtins.toString cfg.chain.length}"} - ${optionalString cfg.proxyDNS "proxy_dns"} - ${optionalString cfg.quietMode "quiet_mode"} + ${lib.optionalString cfg.proxyDNS "proxy_dns"} + ${lib.optionalString cfg.quietMode "quiet_mode"} remote_dns_subnet ${builtins.toString cfg.remoteDNSSubnet} tcp_read_time_out ${builtins.toString cfg.tcpReadTimeOut} tcp_connect_time_out ${builtins.toString cfg.tcpConnectTimeOut} @@ -22,20 +21,20 @@ let proxyOptions = { options = { - enable = mkEnableOption "this proxy"; + enable = lib.mkEnableOption "this proxy"; - type = mkOption { - type = types.enum [ "http" "socks4" "socks5" ]; + type = lib.mkOption { + type = lib.types.enum [ "http" "socks4" "socks5" ]; description = "Proxy type."; }; - host = mkOption { - type = types.str; + host = lib.mkOption { + type = lib.types.str; description = "Proxy host or IP address."; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; description = "Proxy port"; }; }; @@ -49,15 +48,15 @@ in { programs.proxychains = { - enable = mkEnableOption "proxychains configuration"; + enable = lib.mkEnableOption "proxychains configuration"; - package = mkPackageOption pkgs "proxychains" { + package = lib.mkPackageOption pkgs "proxychains" { example = "proxychains-ng"; }; chain = { - type = mkOption { - type = types.enum [ "dynamic" "strict" "random" ]; + type = lib.mkOption { + type = lib.types.enum [ "dynamic" "strict" "random" ]; default = "strict"; description = '' `dynamic` - Each connection will be done via chained proxies @@ -75,8 +74,8 @@ in { (or proxy chain, see {option}`programs.proxychains.chain.length`) from the list. ''; }; - length = mkOption { - type = types.nullOr types.int; + length = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; description = '' Chain length for random chain. @@ -84,47 +83,47 @@ in { }; }; - proxyDNS = mkOption { - type = types.bool; + proxyDNS = lib.mkOption { + type = lib.types.bool; default = true; description = "Proxy DNS requests - no leak for DNS data."; }; - quietMode = mkEnableOption "Quiet mode (no output from the library)"; + quietMode = lib.mkEnableOption "Quiet mode (no output from the library)"; - remoteDNSSubnet = mkOption { - type = types.enum [ 10 127 224 ]; + remoteDNSSubnet = lib.mkOption { + type = lib.types.enum [ 10 127 224 ]; default = 224; description = '' Set the class A subnet number to use for the internal remote DNS mapping, uses the reserved 224.x.x.x range by default. ''; }; - tcpReadTimeOut = mkOption { - type = types.int; + tcpReadTimeOut = lib.mkOption { + type = lib.types.int; default = 15000; description = "Connection read time-out in milliseconds."; }; - tcpConnectTimeOut = mkOption { - type = types.int; + tcpConnectTimeOut = lib.mkOption { + type = lib.types.int; default = 8000; description = "Connection time-out in milliseconds."; }; - localnet = mkOption { - type = types.str; + localnet = lib.mkOption { + type = lib.types.str; default = "127.0.0.0/255.0.0.0"; description = "By default enable localnet for loopback address ranges."; }; - proxies = mkOption { - type = types.attrsOf (types.submodule proxyOptions); + proxies = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule proxyOptions); description = '' Proxies to be used by proxychains. ''; - example = literalExpression '' + example = lib.literalExpression '' { myproxy = { type = "socks4"; host = "127.0.0.1"; @@ -140,11 +139,11 @@ in { ###### implementation - meta.maintainers = with maintainers; [ sorki ]; + meta.maintainers = with lib.maintainers; [ sorki ]; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - assertions = singleton { + assertions = lib.singleton { assertion = cfg.chain.type != "random" && cfg.chain.length == null; message = '' Option `programs.proxychains.chain.length` @@ -152,9 +151,9 @@ in { ''; }; - programs.proxychains.proxies = mkIf config.services.tor.client.enable + programs.proxychains.proxies = lib.mkIf config.services.tor.client.enable { - torproxy = mkDefault { + torproxy = lib.mkDefault { enable = true; type = "socks4"; host = "127.0.0.1"; diff --git a/third_party/nixpkgs/nixos/modules/programs/qt5ct.nix b/third_party/nixpkgs/nixos/modules/programs/qt5ct.nix index 3ff47b3559..bc7b28b9c6 100644 --- a/third_party/nixpkgs/nixos/modules/programs/qt5ct.nix +++ b/third_party/nixpkgs/nixos/modules/programs/qt5ct.nix @@ -1,9 +1,7 @@ { lib, ... }: -with lib; - { imports = [ - (mkRemovedOptionModule [ "programs" "qt5ct" "enable" ] "Use qt5.platformTheme = \"qt5ct\" instead.") + (lib.mkRemovedOptionModule [ "programs" "qt5ct" "enable" ] "Use qt5.platformTheme = \"qt5ct\" instead.") ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/rust-motd.nix b/third_party/nixpkgs/nixos/modules/programs/rust-motd.nix index 93240fcdd8..301b7cebb7 100644 --- a/third_party/nixpkgs/nixos/modules/programs/rust-motd.nix +++ b/third_party/nixpkgs/nixos/modules/programs/rust-motd.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.rust-motd; format = pkgs.formats.toml { }; @@ -24,10 +22,10 @@ let ''; in { options.programs.rust-motd = { - enable = mkEnableOption "rust-motd, a Message Of The Day (MOTD) generator"; - enableMotdInSSHD = mkOption { + enable = lib.mkEnableOption "rust-motd, a Message Of The Day (MOTD) generator"; + enableMotdInSSHD = lib.mkOption { default = true; - type = types.bool; + type = lib.types.bool; description = '' Whether to let `openssh` print the result when entering a new `ssh`-session. @@ -36,18 +34,18 @@ in { the latter option is incompatible with this module. ''; }; - refreshInterval = mkOption { + refreshInterval = lib.mkOption { default = "*:0/5"; - type = types.str; + type = lib.types.str; description = '' Interval in which the {manpage}`motd(5)` file is refreshed. For possible formats, please refer to {manpage}`systemd.time(7)`. ''; }; - order = mkOption { - type = types.listOf types.str; - default = attrNames cfg.settings; - defaultText = literalExpression "attrNames cfg.settings"; + order = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = builtins.attrNames cfg.settings; + defaultText = lib.literalExpression "attrNames cfg.settings"; description = '' The order of the sections in [](#opt-programs.rust-motd.settings). By default they are ordered alphabetically. @@ -79,8 +77,8 @@ in { makes sure that `uptime` is placed before `banner` in the motd. ''; }; - settings = mkOption { - type = types.attrsOf format.type; + settings = lib.mkOption { + type = lib.types.attrsOf format.type; description = '' Settings on what to generate. Please read the [upstream documentation](https://github.com/rust-motd/rust-motd/blob/main/README.md#configuration) @@ -88,14 +86,14 @@ in { ''; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { assertion = config.users.motd == null; message = '' `programs.rust-motd` is incompatible with `users.motd`! ''; } - { assertion = sort (a: b: a < b) cfg.order == attrNames cfg.settings; + { assertion = builtins.sort (a: b: a < b) cfg.order == builtins.attrNames cfg.settings; message = '' Please ensure that every section from `programs.rust-motd.settings` is present in `programs.rust-motd.order`. @@ -138,12 +136,12 @@ in { wantedBy = [ "timers.target" ]; timerConfig.OnCalendar = cfg.refreshInterval; }; - security.pam.services.sshd.text = mkIf cfg.enableMotdInSSHD (mkDefault (mkAfter '' + security.pam.services.sshd.text = lib.mkIf cfg.enableMotdInSSHD (lib.mkDefault (lib.mkAfter '' session optional ${pkgs.pam}/lib/security/pam_motd.so motd=/var/lib/rust-motd/motd '')); - services.openssh.extraConfig = mkIf (cfg.settings ? last_login && cfg.settings.last_login != {}) '' + services.openssh.extraConfig = lib.mkIf (cfg.settings ? last_login && cfg.settings.last_login != {}) '' PrintLastLog no ''; }; - meta.maintainers = with maintainers; [ ma27 ]; + meta.maintainers = with lib.maintainers; [ ma27 ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/seahorse.nix b/third_party/nixpkgs/nixos/modules/programs/seahorse.nix index c0a356bff5..53fff50e0a 100644 --- a/third_party/nixpkgs/nixos/modules/programs/seahorse.nix +++ b/third_party/nixpkgs/nixos/modules/programs/seahorse.nix @@ -2,25 +2,15 @@ { config, pkgs, lib, ... }: -with lib; - { - # Added 2019-08-27 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "seahorse" "enable" ] - [ "programs" "seahorse" "enable" ]) - ]; - - ###### interface options = { programs.seahorse = { - enable = mkEnableOption "Seahorse, a GNOME application for managing encryption keys and passwords in the GNOME Keyring"; + enable = lib.mkEnableOption "Seahorse, a GNOME application for managing encryption keys and passwords in the GNOME Keyring"; }; @@ -29,9 +19,9 @@ with lib; ###### implementation - config = mkIf config.programs.seahorse.enable { + config = lib.mkIf config.programs.seahorse.enable { - programs.ssh.askPassword = mkDefault "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass"; + programs.ssh.askPassword = lib.mkDefault "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass"; environment.systemPackages = [ pkgs.gnome.seahorse diff --git a/third_party/nixpkgs/nixos/modules/programs/sedutil.nix b/third_party/nixpkgs/nixos/modules/programs/sedutil.nix index c62ca24eaa..978aaa5c82 100644 --- a/third_party/nixpkgs/nixos/modules/programs/sedutil.nix +++ b/third_party/nixpkgs/nixos/modules/programs/sedutil.nix @@ -1,14 +1,12 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.sedutil; in { - options.programs.sedutil.enable = mkEnableOption "sedutil, to manage self encrypting drives that conform to the Trusted Computing Group OPAL 2.0 SSC specification"; + options.programs.sedutil.enable = lib.mkEnableOption "sedutil, to manage self encrypting drives that conform to the Trusted Computing Group OPAL 2.0 SSC specification"; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { boot.kernelParams = [ "libata.allow_tpm=1" ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/shadow.nix b/third_party/nixpkgs/nixos/modules/programs/shadow.nix index 2d20644ec5..f09bfaa539 100644 --- a/third_party/nixpkgs/nixos/modules/programs/shadow.nix +++ b/third_party/nixpkgs/nixos/modules/programs/shadow.nix @@ -1,15 +1,14 @@ # Configuration for the pwdutils suite of tools: passwd, useradd, etc. { config, lib, utils, pkgs, ... }: -with lib; let cfg = config.security.loginDefs; in { - options = with types; { + options = with lib.types; { security.loginDefs = { - package = mkPackageOption pkgs "shadow" { }; + package = lib.mkPackageOption pkgs "shadow" { }; - chfnRestrict = mkOption { + chfnRestrict = lib.mkOption { description = '' Use chfn SUID to allow non-root users to change their account GECOS information. ''; @@ -17,7 +16,7 @@ in default = null; }; - settings = mkOption { + settings = lib.mkOption { description = '' Config options for the /etc/login.defs file, that defines the site-specific configuration for the shadow password suite. @@ -35,68 +34,68 @@ in by systemd for features like ConditionUser=@system and systemd-sysusers */ options = { - DEFAULT_HOME = mkOption { + DEFAULT_HOME = lib.mkOption { description = "Indicate if login is allowed if we can't cd to the home directory."; default = "yes"; type = enum [ "yes" "no" ]; }; - ENCRYPT_METHOD = mkOption { + ENCRYPT_METHOD = lib.mkOption { description = "This defines the system default encryption algorithm for encrypting passwords."; # The default crypt() method, keep in sync with the PAM default default = "YESCRYPT"; type = enum [ "YESCRYPT" "SHA512" "SHA256" "MD5" "DES"]; }; - SYS_UID_MIN = mkOption { + SYS_UID_MIN = lib.mkOption { description = "Range of user IDs used for the creation of system users by useradd or newusers."; default = 400; type = int; }; - SYS_UID_MAX = mkOption { + SYS_UID_MAX = lib.mkOption { description = "Range of user IDs used for the creation of system users by useradd or newusers."; default = 999; type = int; }; - UID_MIN = mkOption { + UID_MIN = lib.mkOption { description = "Range of user IDs used for the creation of regular users by useradd or newusers."; default = 1000; type = int; }; - UID_MAX = mkOption { + UID_MAX = lib.mkOption { description = "Range of user IDs used for the creation of regular users by useradd or newusers."; default = 29999; type = int; }; - SYS_GID_MIN = mkOption { + SYS_GID_MIN = lib.mkOption { description = "Range of group IDs used for the creation of system groups by useradd, groupadd, or newusers"; default = 400; type = int; }; - SYS_GID_MAX = mkOption { + SYS_GID_MAX = lib.mkOption { description = "Range of group IDs used for the creation of system groups by useradd, groupadd, or newusers"; default = 999; type = int; }; - GID_MIN = mkOption { + GID_MIN = lib.mkOption { description = "Range of group IDs used for the creation of regular groups by useradd, groupadd, or newusers."; default = 1000; type = int; }; - GID_MAX = mkOption { + GID_MAX = lib.mkOption { description = "Range of group IDs used for the creation of regular groups by useradd, groupadd, or newusers."; default = 29999; type = int; }; - TTYGROUP = mkOption { + TTYGROUP = lib.mkOption { description = '' The terminal permissions: the login tty will be owned by the TTYGROUP group, and the permissions will be set to TTYPERM''; @@ -104,7 +103,7 @@ in type = str; }; - TTYPERM = mkOption { + TTYPERM = lib.mkOption { description = '' The terminal permissions: the login tty will be owned by the TTYGROUP group, and the permissions will be set to TTYPERM''; @@ -113,7 +112,7 @@ in }; # Ensure privacy for newly created home directories. - UMASK = mkOption { + UMASK = lib.mkOption { description = "The file mode creation mask is initialized to this value."; default = "077"; type = str; @@ -124,7 +123,7 @@ in }; }; - users.defaultUserShell = mkOption { + users.defaultUserShell = lib.mkOption { description = '' This option defines the default shell assigned to user accounts. This can be either a full system path or a shell package. @@ -132,7 +131,7 @@ in This must not be a store path, since the path is used outside the store (in particular in /etc/passwd). ''; - example = literalExpression "pkgs.zsh"; + example = lib.literalExpression "pkgs.zsh"; type = either path shellPackage; }; }; @@ -160,18 +159,18 @@ in ]; security.loginDefs.settings.CHFN_RESTRICT = - mkIf (cfg.chfnRestrict != null) cfg.chfnRestrict; + lib.mkIf (cfg.chfnRestrict != null) cfg.chfnRestrict; - environment.systemPackages = optional config.users.mutableUsers cfg.package - ++ optional (types.shellPackage.check config.users.defaultUserShell) config.users.defaultUserShell - ++ optional (cfg.chfnRestrict != null) pkgs.util-linux; + environment.systemPackages = lib.optional config.users.mutableUsers cfg.package + ++ lib.optional (lib.types.shellPackage.check config.users.defaultUserShell) config.users.defaultUserShell + ++ lib.optional (cfg.chfnRestrict != null) pkgs.util-linux; environment.etc = # Create custom toKeyValue generator # see https://man7.org/linux/man-pages/man5/login.defs.5.html for config specification let - toKeyValue = generators.toKeyValue { - mkKeyValue = generators.mkKeyValueDefault { } " "; + toKeyValue = lib.generators.toKeyValue { + mkKeyValue = lib.generators.mkKeyValueDefault { } " "; }; in { @@ -231,7 +230,7 @@ in newuidmap = mkSetuidRoot "${cfg.package.out}/bin/newuidmap"; newgidmap = mkSetuidRoot "${cfg.package.out}/bin/newgidmap"; } - // optionalAttrs config.users.mutableUsers { + // lib.optionalAttrs config.users.mutableUsers { chsh = mkSetuidRoot "${cfg.package.out}/bin/chsh"; passwd = mkSetuidRoot "${cfg.package.out}/bin/passwd"; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/sharing.nix b/third_party/nixpkgs/nixos/modules/programs/sharing.nix index 211dc98151..0fe8100bbc 100644 --- a/third_party/nixpkgs/nixos/modules/programs/sharing.nix +++ b/third_party/nixpkgs/nixos/modules/programs/sharing.nix @@ -1,8 +1,7 @@ { config, pkgs, lib, ... }: -with lib; { options.programs.sharing = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' sharing, a CLI tool for sharing files. Note that it will opens the 7478 port for TCP in the firewall, which is needed for it to function properly @@ -12,7 +11,7 @@ with lib; let cfg = config.programs.sharing; in - mkIf cfg.enable { + lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.sharing ]; networking.firewall.allowedTCPPorts = [ 7478 ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/singularity.nix b/third_party/nixpkgs/nixos/modules/programs/singularity.nix index 981417389e..bc989ad2db 100644 --- a/third_party/nixpkgs/nixos/modules/programs/singularity.nix +++ b/third_party/nixpkgs/nixos/modules/programs/singularity.nix @@ -1,22 +1,24 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: -with lib; let cfg = config.programs.singularity; in { options.programs.singularity = { - enable = mkEnableOption "singularity" // { + enable = lib.mkEnableOption "singularity" // { description = '' Whether to install Singularity/Apptainer with system-level overriding such as SUID support. ''; }; - package = mkPackageOption pkgs "singularity" { - example = "apptainer"; - }; - packageOverriden = mkOption { - type = types.nullOr types.package; + package = lib.mkPackageOption pkgs "singularity" { example = "apptainer"; }; + packageOverriden = lib.mkOption { + type = lib.types.nullOr lib.types.package; default = null; description = '' This option provides access to the overridden result of `programs.singularity.package`. @@ -39,8 +41,8 @@ in Use `lib.mkForce` to forcefully specify the overridden package. ''; }; - enableExternalLocalStateDir = mkOption { - type = types.bool; + enableExternalLocalStateDir = lib.mkOption { + type = lib.types.bool; default = true; example = false; description = '' @@ -51,22 +53,22 @@ in `/var/lib/''${projectName}/mnt/session`. ''; }; - enableFakeroot = mkOption { - type = types.bool; + enableFakeroot = lib.mkOption { + type = lib.types.bool; default = true; example = false; description = '' Whether to enable the `--fakeroot` support of Singularity/Apptainer. ''; }; - enableSuid = mkOption { - type = types.bool; + enableSuid = lib.mkOption { + type = lib.types.bool; # SingularityCE requires SETUID for most things. Apptainer prefers user # namespaces, e.g. `apptainer exec --nv` would fail if built # `--with-suid`: # > `FATAL: nvidia-container-cli not allowed in setuid mode` default = cfg.package.projectName != "apptainer"; - defaultText = literalExpression ''config.services.singularity.package.projectName != "apptainer"''; + defaultText = lib.literalExpression ''config.services.singularity.package.projectName != "apptainer"''; example = false; description = '' Whether to enable the SUID support of Singularity/Apptainer. @@ -74,28 +76,29 @@ in }; }; - config = mkIf cfg.enable { - programs.singularity.packageOverriden = (cfg.package.override ( - optionalAttrs cfg.enableExternalLocalStateDir { - externalLocalStateDir = "/var/lib"; - } // optionalAttrs cfg.enableFakeroot { - newuidmapPath = "/run/wrappers/bin/newuidmap"; - newgidmapPath = "/run/wrappers/bin/newgidmap"; - } // optionalAttrs cfg.enableSuid { - enableSuid = true; - starterSuidPath = "/run/wrappers/bin/${cfg.package.projectName}-suid"; - } - )); + config = lib.mkIf cfg.enable { + programs.singularity.packageOverriden = ( + cfg.package.override ( + lib.optionalAttrs cfg.enableExternalLocalStateDir { externalLocalStateDir = "/var/lib"; } + // lib.optionalAttrs cfg.enableFakeroot { + newuidmapPath = "/run/wrappers/bin/newuidmap"; + newgidmapPath = "/run/wrappers/bin/newgidmap"; + } + // lib.optionalAttrs cfg.enableSuid { + enableSuid = true; + starterSuidPath = "/run/wrappers/bin/${cfg.package.projectName}-suid"; + } + ) + ); environment.systemPackages = [ cfg.packageOverriden ]; - security.wrappers."${cfg.packageOverriden.projectName}-suid" = mkIf cfg.enableSuid { + security.wrappers."${cfg.packageOverriden.projectName}-suid" = lib.mkIf cfg.enableSuid { setuid = true; owner = "root"; group = "root"; source = "${cfg.packageOverriden}/libexec/${cfg.packageOverriden.projectName}/bin/starter-suid.orig"; }; - systemd.tmpfiles.rules = mkIf cfg.enableExternalLocalStateDir [ + systemd.tmpfiles.rules = lib.mkIf cfg.enableExternalLocalStateDir [ "d /var/lib/${cfg.packageOverriden.projectName}/mnt/session 0770 root root -" ]; }; - } diff --git a/third_party/nixpkgs/nixos/modules/programs/slock.nix b/third_party/nixpkgs/nixos/modules/programs/slock.nix index f39b4d5e92..ce24f662f2 100644 --- a/third_party/nixpkgs/nixos/modules/programs/slock.nix +++ b/third_party/nixpkgs/nixos/modules/programs/slock.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.slock; @@ -9,18 +7,18 @@ in { options = { programs.slock = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to install slock screen locker with setuid wrapper. ''; }; - package = mkPackageOption pkgs "slock" {}; + package = lib.mkPackageOption pkgs "slock" {}; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; security.wrappers.slock = { setuid = true; diff --git a/third_party/nixpkgs/nixos/modules/programs/soundmodem.nix b/third_party/nixpkgs/nixos/modules/programs/soundmodem.nix index ab992c63c6..5f57e24a45 100644 --- a/third_party/nixpkgs/nixos/modules/programs/soundmodem.nix +++ b/third_party/nixpkgs/nixos/modules/programs/soundmodem.nix @@ -1,26 +1,24 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.soundmodem; in { options = { programs.soundmodem = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to add Soundmodem to the global environment and configure a wrapper for 'soundmodemconfig' for users in the 'soundmodem' group. ''; }; - package = mkPackageOption pkgs "soundmodem" { }; + package = lib.mkPackageOption pkgs "soundmodem" { }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; users.groups.soundmodem = { }; diff --git a/third_party/nixpkgs/nixos/modules/programs/spacefm.nix b/third_party/nixpkgs/nixos/modules/programs/spacefm.nix index fec14fca48..73d48cf6a3 100644 --- a/third_party/nixpkgs/nixos/modules/programs/spacefm.nix +++ b/third_party/nixpkgs/nixos/modules/programs/spacefm.nix @@ -2,8 +2,6 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.spacefm; in @@ -14,21 +12,21 @@ in programs.spacefm = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to install SpaceFM and create {file}`/etc/spacefm/spacefm.conf`. ''; }; - settings = mkOption { - type = types.attrs; + settings = lib.mkOption { + type = lib.types.attrs; default = { tmp_dir = "/tmp"; terminal_su = "${pkgs.sudo}/bin/sudo"; }; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' { tmp_dir = "/tmp"; terminal_su = "''${pkgs.sudo}/bin/sudo"; @@ -46,10 +44,10 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.spaceFM ]; environment.etc."spacefm/spacefm.conf".text = - concatStrings (mapAttrsToList (n: v: "${n}=${toString v}\n") cfg.settings); + lib.concatStrings (lib.mapAttrsToList (n: v: "${n}=${builtins.toString v}\n") cfg.settings); }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/ssh.nix b/third_party/nixpkgs/nixos/modules/programs/ssh.nix index 2d25c7a936..0692dd46f7 100644 --- a/third_party/nixpkgs/nixos/modules/programs/ssh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/ssh.nix @@ -2,8 +2,6 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.ssh; @@ -17,16 +15,16 @@ let exec ${cfg.askPassword} "$@" ''; - knownHosts = attrValues cfg.knownHosts; + knownHosts = builtins.attrValues cfg.knownHosts; - knownHostsText = (flip (concatMapStringsSep "\n") knownHosts + knownHostsText = (lib.flip (lib.concatMapStringsSep "\n") knownHosts (h: assert h.hostNames != []; - optionalString h.certAuthority "@cert-authority " + concatStringsSep "," h.hostNames + " " - + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile) + lib.optionalString h.certAuthority "@cert-authority " + builtins.concatStringsSep "," h.hostNames + " " + + (if h.publicKey != null then h.publicKey else builtins.readFile h.publicKeyFile) )) + "\n"; knownHostsFiles = [ "/etc/ssh/ssh_known_hosts" ] - ++ map pkgs.copyPathToStore cfg.knownHostsFiles; + ++ builtins.map pkgs.copyPathToStore cfg.knownHostsFiles; in { @@ -36,21 +34,21 @@ in programs.ssh = { - enableAskPassword = mkOption { - type = types.bool; + enableAskPassword = lib.mkOption { + type = lib.types.bool; default = config.services.xserver.enable; - defaultText = literalExpression "config.services.xserver.enable"; + defaultText = lib.literalExpression "config.services.xserver.enable"; description = "Whether to configure SSH_ASKPASS in the environment."; }; - askPassword = mkOption { - type = types.str; + askPassword = lib.mkOption { + type = lib.types.str; default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; - defaultText = literalExpression ''"''${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"''; + defaultText = lib.literalExpression ''"''${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"''; description = "Program used by SSH to ask for passwords."; }; - forwardX11 = mkOption { + forwardX11 = lib.mkOption { type = with lib.types; nullOr bool; default = false; description = '' @@ -65,25 +63,25 @@ in ''; }; - setXAuthLocation = mkOption { - type = types.bool; + setXAuthLocation = lib.mkOption { + type = lib.types.bool; description = '' Whether to set the path to {command}`xauth` for X11-forwarded connections. This causes a dependency on X11 packages. ''; }; - pubkeyAcceptedKeyTypes = mkOption { - type = types.listOf types.str; + pubkeyAcceptedKeyTypes = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; example = [ "ssh-ed25519" "ssh-rsa" ]; description = '' - Specifies the key types that will be used for public key authentication. + Specifies the key lib.types that will be used for public key authentication. ''; }; - hostKeyAlgorithms = mkOption { - type = types.listOf types.str; + hostKeyAlgorithms = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; example = [ "ssh-ed25519" "ssh-rsa" ]; description = '' @@ -91,8 +89,8 @@ in ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra configuration text prepended to {file}`ssh_config`. Other generated @@ -102,8 +100,8 @@ in ''; }; - startAgent = mkOption { - type = types.bool; + startAgent = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to start the OpenSSH agent when you log in. The OpenSSH agent @@ -113,8 +111,8 @@ in ''; }; - agentTimeout = mkOption { - type = types.nullOr types.str; + agentTimeout = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "1h"; description = '' @@ -122,34 +120,34 @@ in ''; }; - agentPKCS11Whitelist = mkOption { - type = types.nullOr types.str; + agentPKCS11Whitelist = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; - example = literalExpression ''"''${pkgs.opensc}/lib/opensc-pkcs11.so"''; + example = lib.literalExpression ''"''${pkgs.opensc}/lib/opensc-pkcs11.so"''; description = '' A pattern-list of acceptable paths for PKCS#11 shared libraries that may be used with the -s option to ssh-add. ''; }; - package = mkPackageOption pkgs "openssh" { }; + package = lib.mkPackageOption pkgs "openssh" { }; - knownHosts = mkOption { + knownHosts = lib.mkOption { default = {}; - type = types.attrsOf (types.submodule ({ name, config, options, ... }: { + type = lib.types.attrsOf (lib.types.submodule ({ name, config, options, ... }: { options = { - certAuthority = mkOption { - type = types.bool; + certAuthority = lib.mkOption { + type = lib.types.bool; default = false; description = '' This public key is an SSH certificate authority, rather than an individual host's key. ''; }; - hostNames = mkOption { - type = types.listOf types.str; + hostNames = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ name ] ++ config.extraHostNames; - defaultText = literalExpression "[ ${name} ] ++ config.${options.extraHostNames}"; + defaultText = lib.literalExpression "[ ${name} ] ++ config.${options.extraHostNames}"; description = '' A list of host names and/or IP numbers used for accessing the host's ssh service. This list includes the name of the @@ -160,8 +158,8 @@ in `hostNames` list. ''; }; - extraHostNames = mkOption { - type = types.listOf types.str; + extraHostNames = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = '' A list of additional host names and/or IP numbers used for @@ -169,9 +167,9 @@ in `hostNames` is set explicitly. ''; }; - publicKey = mkOption { + publicKey = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg=="; description = '' The public key data for the host. You can fetch a public key @@ -180,9 +178,9 @@ in the key type and the key itself. ''; }; - publicKeyFile = mkOption { + publicKeyFile = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = '' The path to the public key file for the host. The public key file is read at build time and saved in the Nix store. @@ -204,7 +202,7 @@ in `extraHostNames` to add additional host names without disabling this default. ''; - example = literalExpression '' + example = lib.literalExpression '' { myhost = { extraHostNames = [ "myhost.mydomain.com" "10.10.1.4" ]; @@ -219,16 +217,16 @@ in ''; }; - knownHostsFiles = mkOption { + knownHostsFiles = lib.mkOption { default = []; - type = with types; listOf path; + type = with lib.types; listOf path; description = '' Files containing SSH host keys to set as global known hosts. `/etc/ssh/ssh_known_hosts` (which is generated by {option}`programs.ssh.knownHosts`) is always included. ''; - example = literalExpression '' + example = lib.literalExpression '' [ ./known_hosts (writeText "github.keys" ''' @@ -240,8 +238,8 @@ in ''; }; - kexAlgorithms = mkOption { - type = types.nullOr (types.listOf types.str); + kexAlgorithms = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = null; example = [ "curve25519-sha256@libssh.org" "diffie-hellman-group-exchange-sha256" ]; description = '' @@ -249,8 +247,8 @@ in ''; }; - ciphers = mkOption { - type = types.nullOr (types.listOf types.str); + ciphers = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = null; example = [ "chacha20-poly1305@openssh.com" "aes256-gcm@openssh.com" ]; description = '' @@ -258,8 +256,8 @@ in ''; }; - macs = mkOption { - type = types.nullOr (types.listOf types.str); + macs = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = null; example = [ "hmac-sha2-512-etm@openssh.com" "hmac-sha1" ]; description = '' @@ -274,13 +272,13 @@ in config = { programs.ssh.setXAuthLocation = - mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 == true || config.services.openssh.settings.X11Forwarding); + lib.mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 == true || config.services.openssh.settings.X11Forwarding); assertions = [ { assertion = cfg.forwardX11 == true -> cfg.setXAuthLocation; message = "cannot enable X11 forwarding without setting XAuth location"; } - ] ++ flip mapAttrsToList cfg.knownHosts (name: data: { + ] ++ lib.flip lib.mapAttrsToList cfg.knownHosts (name: data: { assertion = (data.publicKey == null && data.publicKeyFile != null) || (data.publicKey != null && data.publicKeyFile == null); message = "knownHost ${name} must contain either a publicKey or publicKeyFile"; @@ -296,22 +294,22 @@ in # Generated options from other settings Host * AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"} - GlobalKnownHostsFile ${concatStringsSep " " knownHostsFiles} + GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles} - ${optionalString cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"} + ${lib.optionalString cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"} ${lib.optionalString (cfg.forwardX11 != null) "ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}"} - ${optionalString (cfg.pubkeyAcceptedKeyTypes != []) "PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"} - ${optionalString (cfg.hostKeyAlgorithms != []) "HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}"} - ${optionalString (cfg.kexAlgorithms != null) "KexAlgorithms ${concatStringsSep "," cfg.kexAlgorithms}"} - ${optionalString (cfg.ciphers != null) "Ciphers ${concatStringsSep "," cfg.ciphers}"} - ${optionalString (cfg.macs != null) "MACs ${concatStringsSep "," cfg.macs}"} + ${lib.optionalString (cfg.pubkeyAcceptedKeyTypes != []) "PubkeyAcceptedKeyTypes ${builtins.concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"} + ${lib.optionalString (cfg.hostKeyAlgorithms != []) "HostKeyAlgorithms ${builtins.concatStringsSep "," cfg.hostKeyAlgorithms}"} + ${lib.optionalString (cfg.kexAlgorithms != null) "KexAlgorithms ${builtins.concatStringsSep "," cfg.kexAlgorithms}"} + ${lib.optionalString (cfg.ciphers != null) "Ciphers ${builtins.concatStringsSep "," cfg.ciphers}"} + ${lib.optionalString (cfg.macs != null) "MACs ${builtins.concatStringsSep "," cfg.macs}"} ''; environment.etc."ssh/ssh_known_hosts".text = knownHostsText; # FIXME: this should really be socket-activated for über-awesomeness. - systemd.user.services.ssh-agent = mkIf cfg.startAgent + systemd.user.services.ssh-agent = lib.mkIf cfg.startAgent { description = "SSH Agent"; wantedBy = [ "default.target" ]; unitConfig.ConditionUser = "!@system"; @@ -319,8 +317,8 @@ in { ExecStartPre = "${pkgs.coreutils}/bin/rm -f %t/ssh-agent"; ExecStart = "${cfg.package}/bin/ssh-agent " + - optionalString (cfg.agentTimeout != null) ("-t ${cfg.agentTimeout} ") + - optionalString (cfg.agentPKCS11Whitelist != null) ("-P ${cfg.agentPKCS11Whitelist} ") + + lib.optionalString (cfg.agentTimeout != null) ("-t ${cfg.agentTimeout} ") + + lib.optionalString (cfg.agentPKCS11Whitelist != null) ("-P ${cfg.agentPKCS11Whitelist} ") + "-a %t/ssh-agent"; StandardOutput = "null"; Type = "forking"; @@ -330,18 +328,18 @@ in # Allow ssh-agent to ask for confirmation. This requires the # unit to know about the user's $DISPLAY (via ‘systemctl # import-environment’). - environment.SSH_ASKPASS = optionalString cfg.enableAskPassword askPasswordWrapper; + environment.SSH_ASKPASS = lib.optionalString cfg.enableAskPassword askPasswordWrapper; environment.DISPLAY = "fake"; # required to make ssh-agent start $SSH_ASKPASS }; - environment.extraInit = optionalString cfg.startAgent + environment.extraInit = lib.optionalString cfg.startAgent '' if [ -z "$SSH_AUTH_SOCK" -a -n "$XDG_RUNTIME_DIR" ]; then export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent" fi ''; - environment.variables.SSH_ASKPASS = optionalString cfg.enableAskPassword cfg.askPassword; + environment.variables.SSH_ASKPASS = lib.optionalString cfg.enableAskPassword cfg.askPassword; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/steam.nix b/third_party/nixpkgs/nixos/modules/programs/steam.nix index 58aa0aa25b..d317398495 100644 --- a/third_party/nixpkgs/nixos/modules/programs/steam.nix +++ b/third_party/nixpkgs/nixos/modules/programs/steam.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.steam; gamescopeCfg = config.programs.gamescope; @@ -11,7 +9,7 @@ let in pkgs.writeShellScriptBin "steam-gamescope" '' ${builtins.concatStringsSep "\n" exports} - gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf + gamescope --steam ${builtins.toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf ''; gamescopeSessionFile = @@ -24,13 +22,13 @@ let '').overrideAttrs (_: { passthru.providedSessions = [ "steam" ]; }); in { options.programs.steam = { - enable = mkEnableOption "steam"; + enable = lib.mkEnableOption "steam"; - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.steam; - defaultText = literalExpression "pkgs.steam"; - example = literalExpression '' + defaultText = lib.literalExpression "pkgs.steam"; + example = lib.literalExpression '' pkgs.steam-small.override { extraEnv = { MANGOHUD = true; @@ -44,8 +42,8 @@ in { ''; apply = steam: steam.override (prev: { extraEnv = (lib.optionalAttrs (cfg.extraCompatPackages != [ ]) { - STEAM_EXTRA_COMPAT_TOOLS_PATHS = makeSearchPathOutput "steamcompattool" "" cfg.extraCompatPackages; - }) // (optionalAttrs cfg.extest.enable { + STEAM_EXTRA_COMPAT_TOOLS_PATHS = lib.makeSearchPathOutput "steamcompattool" "" cfg.extraCompatPackages; + }) // (lib.optionalAttrs cfg.extest.enable { LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so"; }) // (prev.extraEnv or {}); extraLibraries = pkgs: let @@ -55,7 +53,7 @@ in { then [ package ] ++ extraPackages else [ package32 ] ++ extraPackages32; in prevLibs ++ additionalLibs; - } // optionalAttrs (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) + } // lib.optionalAttrs (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) { buildFHSEnv = pkgs.buildFHSEnv.override { # use the setuid wrapped bubblewrap @@ -71,10 +69,10 @@ in { ''; }; - extraCompatPackages = mkOption { - type = types.listOf types.package; + extraCompatPackages = lib.mkOption { + type = lib.types.listOf lib.types.package; default = [ ]; - example = literalExpression '' + example = lib.literalExpression '' with pkgs; [ proton-ge-bin ] @@ -88,46 +86,46 @@ in { ''; }; - remotePlay.openFirewall = mkOption { - type = types.bool; + remotePlay.openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Open ports in the firewall for Steam Remote Play. ''; }; - dedicatedServer.openFirewall = mkOption { - type = types.bool; + dedicatedServer.openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Open ports in the firewall for Source Dedicated Server. ''; }; - localNetworkGameTransfers.openFirewall = mkOption { - type = types.bool; + localNetworkGameTransfers.openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Open ports in the firewall for Steam Local Network Game Transfers. ''; }; - gamescopeSession = mkOption { + gamescopeSession = lib.mkOption { description = "Run a GameScope driven Steam session from your display-manager"; default = {}; - type = types.submodule { + type = lib.types.submodule { options = { - enable = mkEnableOption "GameScope Session"; - args = mkOption { - type = types.listOf types.str; + enable = lib.mkEnableOption "GameScope Session"; + args = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; description = '' Arguments to be passed to GameScope for the session. ''; }; - env = mkOption { - type = types.attrsOf types.str; + env = lib.mkOption { + type = lib.types.attrsOf lib.types.str; default = { }; description = '' Environmental variables to be passed to GameScope for the session. @@ -137,20 +135,20 @@ in { }; }; - extest.enable = mkEnableOption '' + extest.enable = lib.mkEnableOption '' Load the extest library into Steam, to translate X11 input events to uinput events (e.g. for using Steam Input on Wayland) ''; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { hardware.opengl = { # this fixes the "glXChooseVisual failed" bug, context: https://github.com/NixOS/nixpkgs/issues/47932 enable = true; driSupport = true; driSupport32Bit = true; }; - security.wrappers = mkIf (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) { + security.wrappers = lib.mkIf (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) { # needed or steam fails bwrap = { owner = "root"; @@ -160,8 +158,8 @@ in { }; }; - programs.gamescope.enable = mkDefault cfg.gamescopeSession.enable; - services.displayManager.sessionPackages = mkIf cfg.gamescopeSession.enable [ gamescopeSessionFile ]; + programs.gamescope.enable = lib.mkDefault cfg.gamescopeSession.enable; + services.displayManager.sessionPackages = lib.mkIf cfg.gamescopeSession.enable [ gamescopeSessionFile ]; # optionally enable 32bit pulseaudio support if pulseaudio is enabled hardware.pulseaudio.support32Bit = config.hardware.pulseaudio.enable; @@ -174,25 +172,25 @@ in { ] ++ lib.optional cfg.gamescopeSession.enable steam-gamescope; networking.firewall = lib.mkMerge [ - (mkIf (cfg.remotePlay.openFirewall || cfg.localNetworkGameTransfers.openFirewall) { + (lib.mkIf (cfg.remotePlay.openFirewall || cfg.localNetworkGameTransfers.openFirewall) { allowedUDPPorts = [ 27036 ]; # Peer discovery }) - (mkIf cfg.remotePlay.openFirewall { + (lib.mkIf cfg.remotePlay.openFirewall { allowedTCPPorts = [ 27036 ]; allowedUDPPortRanges = [ { from = 27031; to = 27035; } ]; }) - (mkIf cfg.dedicatedServer.openFirewall { + (lib.mkIf cfg.dedicatedServer.openFirewall { allowedTCPPorts = [ 27015 ]; # SRCDS Rcon port allowedUDPPorts = [ 27015 ]; # Gameplay traffic }) - (mkIf cfg.localNetworkGameTransfers.openFirewall { + (lib.mkIf cfg.localNetworkGameTransfers.openFirewall { allowedTCPPorts = [ 27040 ]; # Data transfers }) ]; }; - meta.maintainers = teams.steam; + meta.maintainers = lib.teams.steam; } diff --git a/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix b/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix index 6bec2abdfb..a1366c4218 100644 --- a/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix +++ b/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix @@ -1,34 +1,32 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.streamdeck-ui; in { options.programs.streamdeck-ui = { - enable = mkEnableOption "streamdeck-ui"; + enable = lib.mkEnableOption "streamdeck-ui"; - autoStart = mkOption { + autoStart = lib.mkOption { default = true; - type = types.bool; + type = lib.types.bool; description = "Whether streamdeck-ui should be started automatically."; }; - package = mkPackageOption pkgs "streamdeck-ui" { + package = lib.mkPackageOption pkgs "streamdeck-ui" { default = [ "streamdeck-ui" ]; }; }; - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package - (mkIf cfg.autoStart (makeAutostartItem { name = "streamdeck-ui-noui"; package = cfg.package; })) + (lib.mkIf cfg.autoStart (pkgs.makeAutostartItem { name = "streamdeck-ui-noui"; package = cfg.package; })) ]; services.udev.packages = [ cfg.package ]; }; - meta.maintainers = with maintainers; [ majiir ]; + meta.maintainers = with lib.maintainers; [ majiir ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/sysdig.nix b/third_party/nixpkgs/nixos/modules/programs/sysdig.nix index cf2cbab5cf..47b95ef64e 100644 --- a/third_party/nixpkgs/nixos/modules/programs/sysdig.nix +++ b/third_party/nixpkgs/nixos/modules/programs/sysdig.nix @@ -1,13 +1,11 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.sysdig; in { - options.programs.sysdig.enable = mkEnableOption "sysdig, a tracing tool"; + options.programs.sysdig.enable = lib.mkEnableOption "sysdig, a tracing tool"; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.sysdig ]; boot.extraModulePackages = [ config.boot.kernelPackages.sysdig ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/system-config-printer.nix b/third_party/nixpkgs/nixos/modules/programs/system-config-printer.nix index 34592dd706..68b7897d64 100644 --- a/third_party/nixpkgs/nixos/modules/programs/system-config-printer.nix +++ b/third_party/nixpkgs/nixos/modules/programs/system-config-printer.nix @@ -1,7 +1,5 @@ { config, pkgs, lib, ... }: -with lib; - { ###### interface @@ -10,7 +8,7 @@ with lib; programs.system-config-printer = { - enable = mkEnableOption "system-config-printer, a Graphical user interface for CUPS administration"; + enable = lib.mkEnableOption "system-config-printer, a Graphical user interface for CUPS administration"; }; @@ -19,7 +17,7 @@ with lib; ###### implementation - config = mkIf config.programs.system-config-printer.enable { + config = lib.mkIf config.programs.system-config-printer.enable { environment.systemPackages = [ pkgs.system-config-printer diff --git a/third_party/nixpkgs/nixos/modules/programs/systemtap.nix b/third_party/nixpkgs/nixos/modules/programs/systemtap.nix index d23bd13fdd..e61e255e52 100644 --- a/third_party/nixpkgs/nixos/modules/programs/systemtap.nix +++ b/third_party/nixpkgs/nixos/modules/programs/systemtap.nix @@ -1,14 +1,12 @@ { config, lib, ... }: -with lib; - let cfg = config.programs.systemtap; in { options = { programs.systemtap = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Install {command}`systemtap` along with necessary kernel options. @@ -16,7 +14,7 @@ in { }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { system.requiredKernelConfig = with config.lib.kernelConfig; [ (isYes "DEBUG") ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/thefuck.nix b/third_party/nixpkgs/nixos/modules/programs/thefuck.nix index ba2e39c013..0e65352a1f 100644 --- a/third_party/nixpkgs/nixos/modules/programs/thefuck.nix +++ b/third_party/nixpkgs/nixos/modules/programs/thefuck.nix @@ -1,7 +1,5 @@ { config, pkgs, lib, ... }: -with lib; - let prg = config.programs; cfg = prg.thefuck; @@ -16,11 +14,11 @@ in { options = { programs.thefuck = { - enable = mkEnableOption "thefuck, an app which corrects your previous console command"; + enable = lib.mkEnableOption "thefuck, an app which corrects your previous console command"; - alias = mkOption { + alias = lib.mkOption { default = "fuck"; - type = types.str; + type = lib.types.str; description = '' `thefuck` needs an alias to be configured. @@ -30,11 +28,11 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ thefuck ]; programs.bash.interactiveShellInit = bashAndZshInitScript; - programs.zsh.interactiveShellInit = mkIf prg.zsh.enable bashAndZshInitScript; - programs.fish.interactiveShellInit = mkIf prg.fish.enable fishInitScript; + programs.zsh.interactiveShellInit = lib.mkIf prg.zsh.enable bashAndZshInitScript; + programs.fish.interactiveShellInit = lib.mkIf prg.fish.enable fishInitScript; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/thunar.nix b/third_party/nixpkgs/nixos/modules/programs/thunar.nix index 5ea2982dd9..76fcc9d829 100644 --- a/third_party/nixpkgs/nixos/modules/programs/thunar.nix +++ b/third_party/nixpkgs/nixos/modules/programs/thunar.nix @@ -1,29 +1,27 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.thunar; in { meta = { - maintainers = teams.xfce.members; + maintainers = lib.teams.xfce.members; }; options = { programs.thunar = { - enable = mkEnableOption "Thunar, the Xfce file manager"; + enable = lib.mkEnableOption "Thunar, the Xfce file manager"; - plugins = mkOption { + plugins = lib.mkOption { default = []; - type = types.listOf types.package; + type = lib.types.listOf lib.types.package; description = "List of thunar plugins to install."; - example = literalExpression "with pkgs.xfce; [ thunar-archive-plugin thunar-volman ]"; + example = lib.literalExpression "with pkgs.xfce; [ thunar-archive-plugin thunar-volman ]"; }; }; }; - config = mkIf cfg.enable ( + config = lib.mkIf cfg.enable ( let package = pkgs.xfce.thunar.override { thunarPlugins = cfg.plugins; }; in { diff --git a/third_party/nixpkgs/nixos/modules/programs/traceroute.nix b/third_party/nixpkgs/nixos/modules/programs/traceroute.nix index 6e04057ac5..0864dbe79d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/traceroute.nix +++ b/third_party/nixpkgs/nixos/modules/programs/traceroute.nix @@ -1,14 +1,12 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.traceroute; in { options = { programs.traceroute = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to configure a setcap wrapper for traceroute. @@ -17,7 +15,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { security.wrappers.traceroute = { owner = "root"; group = "root"; diff --git a/third_party/nixpkgs/nixos/modules/programs/turbovnc.nix b/third_party/nixpkgs/nixos/modules/programs/turbovnc.nix index fbb3a7bf22..c28b7f7d79 100644 --- a/third_party/nixpkgs/nixos/modules/programs/turbovnc.nix +++ b/third_party/nixpkgs/nixos/modules/programs/turbovnc.nix @@ -2,8 +2,6 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.turbovnc; in @@ -12,8 +10,8 @@ in programs.turbovnc = { - ensureHeadlessSoftwareOpenGL = mkOption { - type = types.bool; + ensureHeadlessSoftwareOpenGL = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to set up NixOS such that TurboVNC's built-in software OpenGL @@ -36,7 +34,7 @@ in }; - config = mkIf cfg.ensureHeadlessSoftwareOpenGL { + config = lib.mkIf cfg.ensureHeadlessSoftwareOpenGL { # TurboVNC has builtin support for Mesa llvmpipe's `swrast` # software rendering to implement GLX (OpenGL on Xorg). diff --git a/third_party/nixpkgs/nixos/modules/programs/udevil.nix b/third_party/nixpkgs/nixos/modules/programs/udevil.nix index 44b9dd9234..e4c0daea72 100644 --- a/third_party/nixpkgs/nixos/modules/programs/udevil.nix +++ b/third_party/nixpkgs/nixos/modules/programs/udevil.nix @@ -1,14 +1,12 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.udevil; in { - options.programs.udevil.enable = mkEnableOption "udevil, to mount filesystems without password"; + options.programs.udevil.enable = lib.mkEnableOption "udevil, to mount filesystems without password"; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { security.wrappers.udevil = { setuid = true; owner = "root"; diff --git a/third_party/nixpkgs/nixos/modules/programs/usbtop.nix b/third_party/nixpkgs/nixos/modules/programs/usbtop.nix index 4f13ce5f62..8b77b2bf51 100644 --- a/third_party/nixpkgs/nixos/modules/programs/usbtop.nix +++ b/third_party/nixpkgs/nixos/modules/programs/usbtop.nix @@ -1,15 +1,13 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.usbtop; in { options = { - programs.usbtop.enable = mkEnableOption "usbtop and required kernel module, to show estimated USB bandwidth"; + programs.usbtop.enable = lib.mkEnableOption "usbtop and required kernel module, to show estimated USB bandwidth"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ usbtop ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/vim.nix b/third_party/nixpkgs/nixos/modules/programs/vim.nix index eb3499fd24..8232340dde 100644 --- a/third_party/nixpkgs/nixos/modules/programs/vim.nix +++ b/third_party/nixpkgs/nixos/modules/programs/vim.nix @@ -1,13 +1,11 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.vim; in { options.programs.vim = { - defaultEditor = mkOption { - type = types.bool; + defaultEditor = lib.mkOption { + type = lib.types.bool; default = false; description = '' When enabled, installs vim and configures vim to be the default editor @@ -15,13 +13,13 @@ in { ''; }; - package = mkPackageOption pkgs "vim" { + package = lib.mkPackageOption pkgs "vim" { example = "vim-full"; }; }; - config = mkIf cfg.defaultEditor { + config = lib.mkIf cfg.defaultEditor { environment.systemPackages = [ cfg.package ]; - environment.variables = { EDITOR = mkOverride 900 "vim"; }; + environment.variables = { EDITOR = lib.mkOverride 900 "vim"; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/wavemon.nix b/third_party/nixpkgs/nixos/modules/programs/wavemon.nix index e5ccacba75..86bc7cc097 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wavemon.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wavemon.nix @@ -1,14 +1,12 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.wavemon; in { options = { programs.wavemon = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to add wavemon to the global environment and configure a @@ -18,7 +16,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ wavemon ]; security.wrappers.wavemon = { owner = "root"; diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/hyprland.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/hyprland.nix index 5891ff25e4..c963429f2e 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wayland/hyprland.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/hyprland.nix @@ -3,7 +3,7 @@ , pkgs , ... }: -with lib; let +let cfg = config.programs.hyprland; finalPortalPackage = cfg.portalPackage.override { @@ -12,7 +12,7 @@ with lib; let in { options.programs.hyprland = { - enable = mkEnableOption null // { + enable = lib.mkEnableOption null // { description = '' Whether to enable Hyprland, the dynamic tiling Wayland compositor that doesn't sacrifice on its looks. @@ -23,26 +23,26 @@ in ''; }; - package = mkPackageOption pkgs "hyprland" { }; + package = lib.mkPackageOption pkgs "hyprland" { }; - finalPackage = mkOption { - type = types.package; + finalPackage = lib.mkOption { + type = lib.types.package; readOnly = true; default = cfg.package.override { enableXWayland = cfg.xwayland.enable; }; - defaultText = literalExpression + defaultText = lib.literalExpression "`programs.hyprland.package` with applied configuration"; description = '' The Hyprland package after applying configuration. ''; }; - portalPackage = mkPackageOption pkgs "xdg-desktop-portal-hyprland" { }; + portalPackage = lib.mkPackageOption pkgs "xdg-desktop-portal-hyprland" { }; - xwayland.enable = mkEnableOption ("XWayland") // { default = true; }; + xwayland.enable = lib.mkEnableOption ("XWayland") // { default = true; }; - systemd.setPath.enable = mkEnableOption null // { + systemd.setPath.enable = lib.mkEnableOption null // { default = true; example = false; description = '' @@ -53,15 +53,15 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.finalPackage ]; - fonts.enableDefaultPackages = mkDefault true; - hardware.opengl.enable = mkDefault true; + fonts.enableDefaultPackages = lib.mkDefault true; + hardware.opengl.enable = lib.mkDefault true; programs = { - dconf.enable = mkDefault true; - xwayland.enable = mkDefault cfg.xwayland.enable; + dconf.enable = lib.mkDefault true; + xwayland.enable = lib.mkDefault cfg.xwayland.enable; }; security.polkit.enable = true; @@ -69,28 +69,28 @@ in services.displayManager.sessionPackages = [ cfg.finalPackage ]; xdg.portal = { - enable = mkDefault true; + enable = lib.mkDefault true; extraPortals = [ finalPortalPackage ]; - configPackages = mkDefault [ cfg.finalPackage ]; + configPackages = lib.mkDefault [ cfg.finalPackage ]; }; - systemd = mkIf cfg.systemd.setPath.enable { + systemd = lib.mkIf cfg.systemd.setPath.enable { user.extraConfig = '' DefaultEnvironment="PATH=$PATH:/run/current-system/sw/bin:/etc/profiles/per-user/%u/bin:/run/wrappers/bin" ''; }; }; - imports = with lib; [ - (mkRemovedOptionModule + imports = [ + (lib.mkRemovedOptionModule [ "programs" "hyprland" "xwayland" "hidpi" ] "XWayland patches are deprecated. Refer to https://wiki.hyprland.org/Configuring/XWayland" ) - (mkRemovedOptionModule + (lib.mkRemovedOptionModule [ "programs" "hyprland" "enableNvidiaPatches" ] "Nvidia patches are no longer needed" ) - (mkRemovedOptionModule + (lib.mkRemovedOptionModule [ "programs" "hyprland" "nvidiaPatches" ] "Nvidia patches are no longer needed" ) diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/river.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/river.nix index d0e309646b..6f8bafb155 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wayland/river.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/river.nix @@ -4,13 +4,13 @@ lib, ... }: -with lib; let +let cfg = config.programs.river; in { options.programs.river = { - enable = mkEnableOption "river, a dynamic tiling Wayland compositor"; + enable = lib.mkEnableOption "river, a dynamic tiling Wayland compositor"; - package = mkPackageOption pkgs "river" { + package = lib.mkPackageOption pkgs "river" { nullable = true; extraDescription = '' Set to `null` to not add any River package to your path. @@ -18,17 +18,17 @@ in { ''; }; - extraPackages = mkOption { - type = with types; listOf package; + extraPackages = lib.mkOption { + type = with lib.types; listOf package; default = with pkgs; [ swaylock foot dmenu ]; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' with pkgs; [ swaylock foot dmenu ]; ''; - example = literalExpression '' + example = lib.literalExpression '' with pkgs; [ termite rofi light ] @@ -42,15 +42,15 @@ in { }; config = - mkIf cfg.enable (mkMerge [ + lib.mkIf cfg.enable (lib.mkMerge [ { - environment.systemPackages = optional (cfg.package != null) cfg.package ++ cfg.extraPackages; + environment.systemPackages = lib.optional (cfg.package != null) cfg.package ++ cfg.extraPackages; # To make a river session available if a display manager like SDDM is enabled: - services.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; + services.displayManager.sessionPackages = lib.optionals (cfg.package != null) [ cfg.package ]; # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050913 - xdg.portal.config.river.default = mkDefault [ "wlr" "gtk" ]; + xdg.portal.config.river.default = lib.mkDefault [ "wlr" "gtk" ]; } (import ./wayland-session.nix { inherit lib pkgs; }) ]); diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix index 348e1db7cd..cec634b6b0 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix @@ -1,15 +1,13 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.sway; - wrapperOptions = types.submodule { + wrapperOptions = lib.types.submodule { options = let - mkWrapperFeature = default: description: mkOption { - type = types.bool; + mkWrapperFeature = default: description: lib.mkOption { + type = lib.types.bool; inherit default; example = !default; description = "Whether to make use of the ${description}"; @@ -50,18 +48,18 @@ let }; in { options.programs.sway = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' Sway, the i3-compatible tiling Wayland compositor. You can manually launch Sway by executing "exec sway" on a TTY. Copy /etc/sway/config to ~/.config/sway/config to modify the default configuration. See and "man 5 sway" for more information''; - package = mkOption { - type = with types; nullOr package; + package = lib.mkOption { + type = with lib.types; nullOr package; default = pkgs.sway; apply = p: if p == null then null else genFinalPackage p; - defaultText = literalExpression "pkgs.sway"; + defaultText = lib.literalExpression "pkgs.sway"; description = '' Sway package to use. If the package does not contain the override arguments `extraSessionCommands`, `extraOptions`, `withBaseWrapper`, `withGtkWrapper`, @@ -72,7 +70,7 @@ in { ''; }; - wrapperFeatures = mkOption { + wrapperFeatures = lib.mkOption { type = wrapperOptions; default = { }; example = { gtk = true; }; @@ -81,8 +79,8 @@ in { ''; }; - extraSessionCommands = mkOption { - type = types.lines; + extraSessionCommands = lib.mkOption { + type = lib.types.lines; default = ""; example = '' # SDL: @@ -102,8 +100,8 @@ in { ''; }; - extraOptions = mkOption { - type = types.listOf types.str; + extraOptions = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; example = [ "--verbose" @@ -116,15 +114,15 @@ in { ''; }; - extraPackages = mkOption { - type = with types; listOf package; + extraPackages = lib.mkOption { + type = with lib.types; listOf package; default = with pkgs; [ swaylock swayidle foot dmenu wmenu ]; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' with pkgs; [ swaylock swayidle foot dmenu wmenu ]; ''; - example = literalExpression '' + example = lib.literalExpression '' with pkgs; [ i3status i3status-rust termite rofi light @@ -140,8 +138,8 @@ in { }; - config = mkIf cfg.enable - (mkMerge [ + config = lib.mkIf cfg.enable + (lib.mkMerge [ { assertions = [ { @@ -154,27 +152,27 @@ in { ]; environment = { - systemPackages = optional (cfg.package != null) cfg.package ++ cfg.extraPackages; + systemPackages = lib.optional (cfg.package != null) cfg.package ++ cfg.extraPackages; # Needed for the default wallpaper: - pathsToLink = optionals (cfg.package != null) [ "/share/backgrounds/sway" ]; + pathsToLink = lib.optionals (cfg.package != null) [ "/share/backgrounds/sway" ]; etc = { "sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" '' # Import the most important environment variables into the D-Bus and systemd # user environments (e.g. required for screen sharing and Pinentry prompts): exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP ''; - } // optionalAttrs (cfg.package != null) { - "sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config"; + } // lib.optionalAttrs (cfg.package != null) { + "sway/config".source = lib.mkOptionDefault "${cfg.package}/etc/sway/config"; }; }; programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gnome3; # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050913 - xdg.portal.config.sway.default = mkDefault [ "wlr" "gtk" ]; + xdg.portal.config.sway.default = lib.mkDefault [ "wlr" "gtk" ]; # To make a Sway session available if a display manager like SDDM is enabled: - services.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; } + services.displayManager.sessionPackages = lib.optionals (cfg.package != null) [ cfg.package ]; } (import ./wayland-session.nix { inherit lib pkgs; }) ]); diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/waybar.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/waybar.nix index ffe889504c..ab811994be 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wayland/waybar.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/waybar.nix @@ -1,17 +1,15 @@ { lib, pkgs, config, ... }: -with lib; - let cfg = config.programs.waybar; in { options.programs.waybar = { - enable = mkEnableOption "waybar, a highly customizable Wayland bar for Sway and Wlroots based compositors"; - package = mkPackageOption pkgs "waybar" { }; + enable = lib.mkEnableOption "waybar, a highly customizable Wayland bar for Sway and Wlroots based compositors"; + package = lib.mkPackageOption pkgs "waybar" { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; systemd.user.services.waybar = { description = "Waybar as systemd service"; @@ -21,5 +19,5 @@ in }; }; - meta.maintainers = [ maintainers.FlorianFranzen ]; + meta.maintainers = [ lib.maintainers.FlorianFranzen ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/wayland-session.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/wayland-session.nix index da117ceae0..47ee0788e0 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wayland/wayland-session.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/wayland-session.nix @@ -1,19 +1,19 @@ -{ lib, pkgs, ... }: with lib; { +{ lib, pkgs, ... }: { security = { polkit.enable = true; pam.services.swaylock = {}; }; - hardware.opengl.enable = mkDefault true; - fonts.enableDefaultPackages = mkDefault true; + hardware.opengl.enable = lib.mkDefault true; + fonts.enableDefaultPackages = lib.mkDefault true; programs = { - dconf.enable = mkDefault true; - xwayland.enable = mkDefault true; + dconf.enable = lib.mkDefault true; + xwayland.enable = lib.mkDefault true; }; xdg.portal = { - enable = mkDefault true; + enable = lib.mkDefault true; extraPortals = [ # For screen sharing diff --git a/third_party/nixpkgs/nixos/modules/programs/weylus.nix b/third_party/nixpkgs/nixos/modules/programs/weylus.nix index a47dccb95c..d76e2f81b2 100644 --- a/third_party/nixpkgs/nixos/modules/programs/weylus.nix +++ b/third_party/nixpkgs/nixos/modules/programs/weylus.nix @@ -1,15 +1,13 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.weylus; in { - options.programs.weylus = with types; { - enable = mkEnableOption "weylus, which turns your smart phone into a graphic tablet/touch screen for your computer"; + options.programs.weylus = with lib.types; { + enable = lib.mkEnableOption "weylus, which turns your smart phone into a graphic tablet/touch screen for your computer"; - openFirewall = mkOption { + openFirewall = lib.mkOption { type = bool; default = false; description = '' @@ -17,7 +15,7 @@ in ''; }; - users = mkOption { + users = lib.mkOption { type = listOf str; default = [ ]; description = '' @@ -26,10 +24,10 @@ in ''; }; - package = mkPackageOption pkgs "weylus" { }; + package = lib.mkPackageOption pkgs "weylus" { }; }; - config = mkIf cfg.enable { - networking.firewall = mkIf cfg.openFirewall { + config = lib.mkIf cfg.enable { + networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ 1701 9001 ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/wireshark.nix b/third_party/nixpkgs/nixos/modules/programs/wireshark.nix index 2d947154e8..f5673e5940 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wireshark.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wireshark.nix @@ -1,28 +1,26 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.wireshark; wireshark = cfg.package; in { options = { programs.wireshark = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to add Wireshark to the global environment and configure a setcap wrapper for 'dumpcap' for users in the 'wireshark' group. ''; }; - package = mkPackageOption pkgs "wireshark-cli" { + package = lib.mkPackageOption pkgs "wireshark-cli" { example = "wireshark"; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ wireshark ]; users.groups.wireshark = {}; diff --git a/third_party/nixpkgs/nixos/modules/programs/wshowkeys.nix b/third_party/nixpkgs/nixos/modules/programs/wshowkeys.nix index f7b71d2bb0..1fef33e047 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wshowkeys.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wshowkeys.nix @@ -1,27 +1,31 @@ -{ config, lib, pkgs, ... }: - -with lib; - +{ + config, + lib, + pkgs, + ... +}: let cfg = config.programs.wshowkeys; -in { - meta.maintainers = with maintainers; [ primeos ]; - +in +{ options = { programs.wshowkeys = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' wshowkeys (displays keypresses on screen on supported Wayland compositors). It requires root permissions to read input events, but these permissions are dropped after startup''; + package = lib.mkPackageOption pkgs "wshowkeys" { }; }; }; - config = mkIf cfg.enable { - security.wrappers.wshowkeys = - { setuid = true; - owner = "root"; - group = "root"; - source = "${pkgs.wshowkeys}/bin/wshowkeys"; - }; + config = lib.mkIf cfg.enable { + security.wrappers.wshowkeys = { + setuid = true; + owner = "root"; + group = "root"; + source = lib.getExe cfg.package; + }; }; + + meta.maintainers = with lib.maintainers; [ primeos ]; } diff --git a/third_party/nixpkgs/nixos/modules/programs/xastir.nix b/third_party/nixpkgs/nixos/modules/programs/xastir.nix index d9c687289e..96201eb545 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xastir.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xastir.nix @@ -1,17 +1,15 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.xastir; in { - meta.maintainers = with maintainers; [ melling ]; + meta.maintainers = with lib.maintainers; [ melling ]; options.programs.xastir = { - enable = mkEnableOption "Xastir Graphical APRS client"; + enable = lib.mkEnableOption "Xastir Graphical APRS client"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ xastir ]; security.wrappers.xastir = { source = "${pkgs.xastir}/bin/xastir"; diff --git a/third_party/nixpkgs/nixos/modules/programs/xfconf.nix b/third_party/nixpkgs/nixos/modules/programs/xfconf.nix index 8e854b40e5..f2fda3b692 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xfconf.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xfconf.nix @@ -1,21 +1,19 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.xfconf; in { meta = { - maintainers = teams.xfce.members; + maintainers = lib.teams.xfce.members; }; options = { programs.xfconf = { - enable = mkEnableOption "Xfconf, the Xfce configuration storage system"; + enable = lib.mkEnableOption "Xfconf, the Xfce configuration storage system"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.xfce.xfconf ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/xfs_quota.nix b/third_party/nixpkgs/nixos/modules/programs/xfs_quota.nix index 8f70cc2d94..5ca05f4dc2 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xfs_quota.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xfs_quota.nix @@ -2,15 +2,13 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.xfs_quota; - limitOptions = opts: concatStringsSep " " [ - (optionalString (opts.sizeSoftLimit != null) "bsoft=${opts.sizeSoftLimit}") - (optionalString (opts.sizeHardLimit != null) "bhard=${opts.sizeHardLimit}") + limitOptions = opts: builtins.concatStringsSep " " [ + (lib.optionalString (opts.sizeSoftLimit != null) "bsoft=${opts.sizeSoftLimit}") + (lib.optionalString (opts.sizeHardLimit != null) "bhard=${opts.sizeHardLimit}") ]; in @@ -22,35 +20,35 @@ in options = { programs.xfs_quota = { - projects = mkOption { + projects = lib.mkOption { default = {}; - type = types.attrsOf (types.submodule { + type = lib.types.attrsOf (lib.types.submodule { options = { - id = mkOption { - type = types.int; + id = lib.mkOption { + type = lib.types.int; description = "Project ID."; }; - fileSystem = mkOption { - type = types.str; + fileSystem = lib.mkOption { + type = lib.types.str; description = "XFS filesystem hosting the xfs_quota project."; default = "/"; }; - path = mkOption { - type = types.str; + path = lib.mkOption { + type = lib.types.str; description = "Project directory."; }; - sizeSoftLimit = mkOption { - type = types.nullOr types.str; + sizeSoftLimit = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "30g"; description = "Soft limit of the project size"; }; - sizeHardLimit = mkOption { - type = types.nullOr types.str; + sizeHardLimit = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "50g"; description = "Hard limit of the project size."; @@ -75,18 +73,18 @@ in ###### implementation - config = mkIf (cfg.projects != {}) { + config = lib.mkIf (cfg.projects != {}) { environment.etc.projects.source = pkgs.writeText "etc-project" - (concatStringsSep "\n" (mapAttrsToList - (name: opts: "${toString opts.id}:${opts.path}") cfg.projects)); + (builtins.concatStringsSep "\n" (lib.mapAttrsToList + (name: opts: "${builtins.toString opts.id}:${opts.path}") cfg.projects)); environment.etc.projid.source = pkgs.writeText "etc-projid" - (concatStringsSep "\n" (mapAttrsToList - (name: opts: "${name}:${toString opts.id}") cfg.projects)); + (builtins.concatStringsSep "\n" (lib.mapAttrsToList + (name: opts: "${name}:${builtins.toString opts.id}") cfg.projects)); - systemd.services = mapAttrs' (name: opts: - nameValuePair "xfs_quota-${name}" { + systemd.services = lib.mapAttrs' (name: opts: + lib.nameValuePair "xfs_quota-${name}" { description = "Setup xfs_quota for project ${name}"; script = '' ${pkgs.xfsprogs.bin}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem} @@ -94,7 +92,7 @@ in ''; wantedBy = [ "multi-user.target" ]; - after = [ ((replaceStrings [ "/" ] [ "-" ] opts.fileSystem) + ".mount") ]; + after = [ ((builtins.replaceStrings [ "/" ] [ "-" ] opts.fileSystem) + ".mount") ]; restartTriggers = [ config.environment.etc.projects.source ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/xonsh.nix b/third_party/nixpkgs/nixos/modules/programs/xonsh.nix index fefe6b456c..eed5152ba6 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xonsh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xonsh.nix @@ -2,8 +2,6 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.xonsh; @@ -16,29 +14,29 @@ in programs.xonsh = { - enable = mkOption { + enable = lib.mkOption { default = false; description = '' Whether to configure xonsh as an interactive shell. ''; - type = types.bool; + type = lib.types.bool; }; - package = mkPackageOption pkgs "xonsh" { + package = lib.mkPackageOption pkgs "xonsh" { example = "xonsh.override { extraPackages = ps: [ ps.requests ]; }"; }; - config = mkOption { + config = lib.mkOption { default = ""; description = "Control file to customize your shell behavior."; - type = types.lines; + type = lib.types.lines; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.etc."xonsh/xonshrc".text = '' # /etc/xonsh/xonshrc: DO NOT EDIT -- this file has been generated automatically. diff --git a/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix b/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix index 1bb7390559..b818c52e14 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix @@ -1,26 +1,24 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.xss-lock; in { options.programs.xss-lock = { - enable = mkEnableOption "xss-lock"; + enable = lib.mkEnableOption "xss-lock"; - lockerCommand = mkOption { + lockerCommand = lib.mkOption { default = "${pkgs.i3lock}/bin/i3lock"; - defaultText = literalExpression ''"''${pkgs.i3lock}/bin/i3lock"''; - example = literalExpression ''"''${pkgs.i3lock-fancy}/bin/i3lock-fancy"''; - type = types.separatedString " "; + defaultText = lib.literalExpression ''"''${pkgs.i3lock}/bin/i3lock"''; + example = lib.literalExpression ''"''${pkgs.i3lock-fancy}/bin/i3lock-fancy"''; + type = lib.types.separatedString " "; description = "Locker to be used with xsslock"; }; - extraOptions = mkOption { + extraOptions = lib.mkOption { default = [ ]; example = [ "--ignore-sleep" ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = '' Additional command-line arguments to pass to {command}`xss-lock`. @@ -28,19 +26,24 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.user.services.xss-lock = { description = "XSS Lock Daemon"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; - serviceConfig.ExecStart = with lib; - strings.concatStringsSep " " ([ + serviceConfig.ExecStart = + builtins.concatStringsSep " " ([ "${pkgs.xss-lock}/bin/xss-lock" "--session \${XDG_SESSION_ID}" - ] ++ (map escapeShellArg cfg.extraOptions) ++ [ + ] ++ (builtins.map lib.escapeShellArg cfg.extraOptions) ++ [ "--" cfg.lockerCommand ]); serviceConfig.Restart = "always"; }; + + warnings = lib.mkIf (config.services.xserver.displayManager.startx.enable) [ + "xss-lock service only works if a displayManager is set; it doesn't work when services.xserver.displayManager.startx.enable = true" + ]; + }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/xwayland.nix b/third_party/nixpkgs/nixos/modules/programs/xwayland.nix index 3a8080fa4c..3df3dbf378 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xwayland.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xwayland.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.xwayland; @@ -10,13 +8,13 @@ in { options.programs.xwayland = { - enable = mkEnableOption "Xwayland (an X server for interfacing X11 apps with the Wayland protocol)"; + enable = lib.mkEnableOption "Xwayland (an X server for interfacing X11 apps with the Wayland protocol)"; - defaultFontPath = mkOption { - type = types.str; - default = optionalString config.fonts.fontDir.enable + defaultFontPath = lib.mkOption { + type = lib.types.str; + default = lib.optionalString config.fonts.fontDir.enable "/run/current-system/sw/share/X11/fonts"; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' optionalString config.fonts.fontDir.enable "/run/current-system/sw/share/X11/fonts" ''; description = '' @@ -24,12 +22,12 @@ in ''; }; - package = mkOption { - type = types.path; + package = lib.mkOption { + type = lib.types.path; default = pkgs.xwayland.override (oldArgs: { inherit (cfg) defaultFontPath; }); - defaultText = literalExpression '' + defaultText = lib.literalExpression '' pkgs.xwayland.override (oldArgs: { inherit (config.programs.xwayland) defaultFontPath; }) @@ -39,7 +37,7 @@ in }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # Needed by some applications for fonts and default settings environment.pathsToLink = [ "/share/X11" ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/yabar.nix b/third_party/nixpkgs/nixos/modules/programs/yabar.nix index 6e117506a2..0457f8e766 100644 --- a/third_party/nixpkgs/nixos/modules/programs/yabar.nix +++ b/third_party/nixpkgs/nixos/modules/programs/yabar.nix @@ -1,18 +1,16 @@ { lib, pkgs, config, ... }: -with lib; - let cfg = config.programs.yabar; - mapExtra = v: lib.concatStringsSep "\n" (mapAttrsToList ( - key: val: "${key} = ${if (isString val) then "\"${val}\"" else "${builtins.toString val}"};" + mapExtra = v: lib.concatStringsSep "\n" (lib.mapAttrsToList ( + key: val: "${key} = ${if (builtins.isString val) then "\"${val}\"" else "${builtins.toString val}"};" ) v); - listKeys = r: concatStringsSep "," (map (n: "\"${n}\"") (attrNames r)); + listKeys = r: builtins.concatStringsSep "," (builtins.map (n: "\"${n}\"") (builtins.attrNames r)); configFile = let - bars = mapAttrsToList ( + bars = lib.mapAttrsToList ( name: cfg: '' ${name}: { font: "${cfg.font}"; @@ -22,7 +20,7 @@ let block-list: [${listKeys cfg.indicators}] - ${concatStringsSep "\n" (mapAttrsToList ( + ${builtins.concatStringsSep "\n" (lib.mapAttrsToList ( name: cfg: '' ${name}: { exec: "${cfg.exec}"; @@ -36,21 +34,21 @@ let ) cfg.bars; in pkgs.writeText "yabar.conf" '' bar-list = [${listKeys cfg.bars}]; - ${concatStringsSep "\n" bars} + ${builtins.concatStringsSep "\n" bars} ''; in { options.programs.yabar = { - enable = mkEnableOption "yabar, a status bar for X window managers"; + enable = lib.mkEnableOption "yabar, a status bar for X window managers"; - package = mkOption { + package = lib.mkOption { default = pkgs.yabar-unstable; - defaultText = literalExpression "pkgs.yabar-unstable"; - example = literalExpression "pkgs.yabar"; - type = types.package; + defaultText = lib.literalExpression "pkgs.yabar-unstable"; + example = lib.literalExpression "pkgs.yabar"; + type = lib.types.package; # `yabar-stable` segfaults under certain conditions. - apply = x: if x == pkgs.yabar-unstable then x else flip warn x '' + apply = x: if x == pkgs.yabar-unstable then x else lib.flip lib.warn x '' It's not recommended to use `yabar' with `programs.yabar', the (old) stable release tends to segfault under certain circumstances: @@ -70,63 +68,63 @@ in ''; }; - bars = mkOption { + bars = lib.mkOption { default = {}; - type = types.attrsOf(types.submodule { + type = lib.types.attrsOf(lib.types.submodule { options = { - font = mkOption { + font = lib.mkOption { default = "sans bold 9"; example = "Droid Sans, FontAwesome Bold 9"; - type = types.str; + type = lib.types.str; description = '' The font that will be used to draw the status bar. ''; }; - position = mkOption { + position = lib.mkOption { default = "top"; example = "bottom"; - type = types.enum [ "top" "bottom" ]; + type = lib.types.enum [ "top" "bottom" ]; description = '' The position where the bar will be rendered. ''; }; - extra = mkOption { + extra = lib.mkOption { default = {}; - type = types.attrsOf types.str; + type = lib.types.attrsOf lib.types.str; description = '' An attribute set which contains further attributes of a bar. ''; }; - indicators = mkOption { + indicators = lib.mkOption { default = {}; - type = types.attrsOf(types.submodule { - options.exec = mkOption { + type = lib.types.attrsOf(lib.types.submodule { + options.exec = lib.mkOption { example = "YABAR_DATE"; - type = types.str; + type = lib.types.str; description = '' The type of the indicator to be executed. ''; }; - options.align = mkOption { + options.align = lib.mkOption { default = "left"; example = "right"; - type = types.enum [ "left" "center" "right" ]; + type = lib.types.enum [ "left" "center" "right" ]; description = '' Whether to align the indicator at the left or right of the bar. ''; }; - options.extra = mkOption { + options.extra = lib.mkOption { default = {}; - type = types.attrsOf (types.either types.str types.int); + type = lib.types.attrsOf (lib.types.either lib.types.str lib.types.int); description = '' An attribute set which contains further attributes of a indicator. @@ -147,7 +145,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.user.services.yabar = { description = "yabar service"; wantedBy = [ "graphical-session.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/ydotool.nix b/third_party/nixpkgs/nixos/modules/programs/ydotool.nix new file mode 100644 index 0000000000..f639e9283d --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/ydotool.nix @@ -0,0 +1,83 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.ydotool; +in +{ + meta = { + maintainers = with lib.maintainers; [ quantenzitrone ]; + }; + + options.programs.ydotool = { + enable = lib.mkEnableOption '' + ydotoold system service and install ydotool. + Add yourself to the 'ydotool' group to be able to use it. + ''; + }; + + config = lib.mkIf cfg.enable { + users.groups.ydotool = { }; + + systemd.services.ydotoold = { + description = "ydotoold - backend for ydotool"; + wantedBy = [ "multi-user.target" ]; + partOf = [ "multi-user.target" ]; + serviceConfig = { + Group = "ydotool"; + RuntimeDirectory = "ydotoold"; + RuntimeDirectoryMode = "0750"; + ExecStart = "${lib.getExe' pkgs.ydotool "ydotoold"} --socket-path=/run/ydotoold/socket --socket-perm=0660"; + + # hardening + + ## allow access to uinput + DeviceAllow = [ "/dev/uinput" ]; + DevicePolicy = "closed"; + + ## allow creation of unix sockets + RestrictAddressFamilies = [ "AF_UNIX" ]; + + CapabilityBoundingSet = ""; + IPAddressDeny = "any"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateNetwork = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ProtectUser = true; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + UMask = "0077"; + + # -> systemd-analyze security score 0.7 SAFE 😀 + }; + }; + + environment.variables = { + YDOTOOL_SOCKET = "/run/ydotoold/socket"; + }; + environment.systemPackages = with pkgs; [ ydotool ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/zmap.nix b/third_party/nixpkgs/nixos/modules/programs/zmap.nix index 827d9bedca..4f31d42c4a 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zmap.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zmap.nix @@ -1,15 +1,13 @@ { pkgs, config, lib, ... }: -with lib; - let cfg = config.programs.zmap; in { options.programs.zmap = { - enable = mkEnableOption "ZMap, a network scanner designed for Internet-wide network surveys"; + enable = lib.mkEnableOption "ZMap, a network scanner designed for Internet-wide network surveys"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.zmap ]; environment.etc."zmap/blacklist.conf".source = "${pkgs.zmap}/etc/zmap/blacklist.conf"; diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix index f2a5a7560e..2120cf1af0 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.zsh.ohMyZsh; @@ -20,7 +18,7 @@ let custom = if cfg.custom != null then cfg.custom - else if length cfg.customPkgs == 0 then null + else if builtins.length cfg.customPkgs == 0 then null else pkgs.linkFarm "oh-my-zsh-custom" [ (mkLinkFarmEntry' "themes") (mkLinkFarmEntry "completions" "site-functions") @@ -30,60 +28,60 @@ let in { imports = [ - (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "enable" ] [ "programs" "zsh" "ohMyZsh" "enable" ]) - (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "theme" ] [ "programs" "zsh" "ohMyZsh" "theme" ]) - (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ]) - (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ]) + (lib.mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "enable" ] [ "programs" "zsh" "ohMyZsh" "enable" ]) + (lib.mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "theme" ] [ "programs" "zsh" "ohMyZsh" "theme" ]) + (lib.mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ]) + (lib.mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ]) ]; options = { programs.zsh.ohMyZsh = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable oh-my-zsh. ''; }; - package = mkPackageOption pkgs "oh-my-zsh" { }; + package = lib.mkPackageOption pkgs "oh-my-zsh" { }; - plugins = mkOption { + plugins = lib.mkOption { default = []; - type = types.listOf(types.str); + type = lib.types.listOf(lib.types.str); description = '' List of oh-my-zsh plugins ''; }; - custom = mkOption { + custom = lib.mkOption { default = null; - type = with types; nullOr str; + type = with lib.types; nullOr str; description = '' Path to a custom oh-my-zsh package to override config of oh-my-zsh. (Can't be used along with `customPkgs`). ''; }; - customPkgs = mkOption { + customPkgs = lib.mkOption { default = []; - type = types.listOf types.package; + type = lib.types.listOf lib.types.package; description = '' List of custom packages that should be loaded into `oh-my-zsh`. ''; }; - theme = mkOption { + theme = lib.mkOption { default = ""; - type = types.str; + type = lib.types.str; description = '' Name of the theme to be used by oh-my-zsh. ''; }; - cacheDir = mkOption { + cacheDir = lib.mkOption { default = "$HOME/.cache/oh-my-zsh"; - type = types.str; + type = lib.types.str; description = '' Cache directory to be used by `oh-my-zsh`. Without this option it would default to the read-only nix store. @@ -92,10 +90,10 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # Prevent zsh from overwriting oh-my-zsh's prompt - programs.zsh.promptInit = mkDefault ""; + programs.zsh.promptInit = lib.mkDefault ""; environment.systemPackages = [ cfg.package ]; @@ -103,19 +101,19 @@ in # oh-my-zsh configuration generated by NixOS export ZSH=${cfg.package}/share/oh-my-zsh - ${optionalString (length(cfg.plugins) > 0) - "plugins=(${concatStringsSep " " cfg.plugins})" + ${lib.optionalString (builtins.length(cfg.plugins) > 0) + "plugins=(${builtins.concatStringsSep " " cfg.plugins})" } - ${optionalString (custom != null) + ${lib.optionalString (custom != null) "ZSH_CUSTOM=\"${custom}\"" } - ${optionalString (stringLength(cfg.theme) > 0) + ${lib.optionalString (builtins.stringLength(cfg.theme) > 0) "ZSH_THEME=\"${cfg.theme}\"" } - ${optionalString (cfg.cacheDir != null) '' + ${lib.optionalString (cfg.cacheDir != null) '' if [[ ! -d "${cfg.cacheDir}" ]]; then mkdir -p "${cfg.cacheDir}" fi diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autoenv.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autoenv.nix index f07fb5c24d..8e0c19f1af 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autoenv.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autoenv.nix @@ -1,18 +1,16 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.zsh.zsh-autoenv; in { options = { programs.zsh.zsh-autoenv = { - enable = mkEnableOption "zsh-autoenv"; - package = mkPackageOption pkgs "zsh-autoenv" { }; + enable = lib.mkEnableOption "zsh-autoenv"; + package = lib.mkPackageOption pkgs "zsh-autoenv" { }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { programs.zsh.interactiveShellInit = '' source ${cfg.package}/share/zsh-autoenv/autoenv.zsh ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix index 2e53e907d5..e046c21025 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix @@ -1,28 +1,26 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.zsh.autosuggestions; in { imports = [ - (mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestions" "enable" ]) + (lib.mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestions" "enable" ]) ]; options.programs.zsh.autosuggestions = { - enable = mkEnableOption "zsh-autosuggestions"; + enable = lib.mkEnableOption "zsh-autosuggestions"; - highlightStyle = mkOption { - type = types.str; + highlightStyle = lib.mkOption { + type = lib.types.str; default = "fg=8"; # https://github.com/zsh-users/zsh-autosuggestions/tree/v0.4.3#suggestion-highlight-style description = "Highlight style for suggestions ({fore,back}ground color)"; example = "fg=cyan"; }; - strategy = mkOption { - type = types.listOf (types.enum [ "history" "completion" "match_prev_cmd" ]); + strategy = lib.mkOption { + type = lib.types.listOf (lib.types.enum [ "history" "completion" "match_prev_cmd" ]); default = [ "history" ]; description = '' `ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated. @@ -37,18 +35,18 @@ in ''; }; - async = mkOption { - type = types.bool; + async = lib.mkOption { + type = lib.types.bool; default = true; description = "Whether to fetch suggestions asynchronously"; example = false; }; - extraConfig = mkOption { - type = with types; attrsOf str; + extraConfig = lib.mkOption { + type = lib.types.attrsOf lib.types.str; default = {}; description = "Attribute set with additional configuration values"; - example = literalExpression '' + example = lib.literalExpression '' { "ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" = "20"; } @@ -57,16 +55,16 @@ in }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { programs.zsh.interactiveShellInit = '' source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}" - export ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.strategy}) - ${optionalString (!cfg.async) "unset ZSH_AUTOSUGGEST_USE_ASYNC"} + export ZSH_AUTOSUGGEST_STRATEGY=(${builtins.concatStringsSep " " cfg.strategy}) + ${lib.optionalString (!cfg.async) "unset ZSH_AUTOSUGGEST_USE_ASYNC"} - ${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)} + ${builtins.concatStringsSep "\n" (lib.mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)} ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix index 46bc4fcb87..3f70c14048 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix @@ -1,27 +1,25 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.zsh.syntaxHighlighting; in { imports = [ - (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) - (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "enable" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) - (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "highlighters" ] [ "programs" "zsh" "syntaxHighlighting" "highlighters" ]) - (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "patterns" ] [ "programs" "zsh" "syntaxHighlighting" "patterns" ]) + (lib.mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) + (lib.mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "enable" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) + (lib.mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "highlighters" ] [ "programs" "zsh" "syntaxHighlighting" "highlighters" ]) + (lib.mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "patterns" ] [ "programs" "zsh" "syntaxHighlighting" "patterns" ]) ]; options = { programs.zsh.syntaxHighlighting = { - enable = mkEnableOption "zsh-syntax-highlighting"; + enable = lib.mkEnableOption "zsh-syntax-highlighting"; - highlighters = mkOption { + highlighters = lib.mkOption { default = [ "main" ]; # https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md - type = types.listOf(types.enum([ + type = lib.types.listOf(lib.types.enum([ "main" "brackets" "pattern" @@ -39,11 +37,11 @@ in ''; }; - patterns = mkOption { + patterns = lib.mkOption { default = {}; - type = types.attrsOf types.str; + type = lib.types.attrsOf lib.types.str; - example = literalExpression '' + example = lib.literalExpression '' { "rm -rf *" = "fg=white,bold,bg=red"; } @@ -56,11 +54,11 @@ in https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/pattern.md ''; }; - styles = mkOption { + styles = lib.mkOption { default = {}; - type = types.attrsOf types.str; + type = lib.types.attrsOf lib.types.str; - example = literalExpression '' + example = lib.literalExpression '' { "alias" = "fg=magenta,bold"; } @@ -76,30 +74,30 @@ in }; }; - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ zsh-syntax-highlighting ]; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.zsh-syntax-highlighting ]; assertions = [ { - assertion = length(attrNames cfg.patterns) > 0 -> elem "pattern" cfg.highlighters; + assertion = builtins.length(builtins.attrNames cfg.patterns) > 0 -> builtins.elem "pattern" cfg.highlighters; message = '' When highlighting patterns, "pattern" needs to be included in the list of highlighters. ''; } ]; - programs.zsh.interactiveShellInit = with pkgs; + programs.zsh.interactiveShellInit = lib.mkAfter (lib.concatStringsSep "\n" ([ - "source ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" - ] ++ optional (length(cfg.highlighters) > 0) - "ZSH_HIGHLIGHT_HIGHLIGHTERS=(${concatStringsSep " " cfg.highlighters})" - ++ optionals (length(attrNames cfg.patterns) > 0) - (mapAttrsToList ( + "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" + ] ++ lib.optional (builtins.length(cfg.highlighters) > 0) + "ZSH_HIGHLIGHT_HIGHLIGHTERS=(${builtins.concatStringsSep " " cfg.highlighters})" + ++ lib.optionals (builtins.length(builtins.attrNames cfg.patterns) > 0) + (lib.mapAttrsToList ( pattern: design: "ZSH_HIGHLIGHT_PATTERNS+=('${pattern}' '${design}')" ) cfg.patterns) - ++ optionals (length(attrNames cfg.styles) > 0) - (mapAttrsToList ( + ++ lib.optionals (builtins.length(builtins.attrNames cfg.styles) > 0) + (lib.mapAttrsToList ( styles: design: "ZSH_HIGHLIGHT_STYLES[${styles}]='${design}'" ) cfg.styles) diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix index d7e300b501..35d2cf4610 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix @@ -2,8 +2,6 @@ { config, lib, options, pkgs, ... }: -with lib; - let cfge = config.environment; @@ -11,9 +9,9 @@ let cfg = config.programs.zsh; opt = options.programs.zsh; - zshAliases = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "alias -- ${k}=${escapeShellArg v}") - (filterAttrs (k: v: v != null) cfg.shellAliases) + zshAliases = builtins.concatStringsSep "\n" ( + lib.mapAttrsFlatten (k: v: "alias -- ${k}=${lib.escapeShellArg v}") + (lib.filterAttrs (k: v: v != null) cfg.shellAliases) ); zshStartupNotes = '' @@ -42,7 +40,7 @@ in programs.zsh = { - enable = mkOption { + enable = lib.mkOption { default = false; description = '' Whether to configure zsh as an interactive shell. To enable zsh for @@ -50,43 +48,43 @@ in option for that user. To enable zsh system-wide use the {option}`users.defaultUserShell` option. ''; - type = types.bool; + type = lib.types.bool; }; - shellAliases = mkOption { + shellAliases = lib.mkOption { default = { }; description = '' Set of aliases for zsh shell, which overrides {option}`environment.shellAliases`. See {option}`environment.shellAliases` for an option format description. ''; - type = with types; attrsOf (nullOr (either str path)); + type = with lib.types; attrsOf (nullOr (either str path)); }; - shellInit = mkOption { + shellInit = lib.mkOption { default = ""; description = '' Shell script code called during zsh shell initialisation. ''; - type = types.lines; + type = lib.types.lines; }; - loginShellInit = mkOption { + loginShellInit = lib.mkOption { default = ""; description = '' Shell script code called during zsh login shell initialisation. ''; - type = types.lines; + type = lib.types.lines; }; - interactiveShellInit = mkOption { + interactiveShellInit = lib.mkOption { default = ""; description = '' Shell script code called during interactive zsh shell initialisation. ''; - type = types.lines; + type = lib.types.lines; }; - promptInit = mkOption { + promptInit = lib.mkOption { default = '' # Note that to manually override this in ~/.zshrc you should run `prompt off` # before setting your PS1 and etc. Otherwise this will likely to interact with @@ -97,27 +95,27 @@ in description = '' Shell script code used to initialise the zsh prompt. ''; - type = types.lines; + type = lib.types.lines; }; - histSize = mkOption { + histSize = lib.mkOption { default = 2000; description = '' Change history size. ''; - type = types.int; + type = lib.types.int; }; - histFile = mkOption { + histFile = lib.mkOption { default = "$HOME/.zsh_history"; description = '' Change history file. ''; - type = types.str; + type = lib.types.str; }; - setOptions = mkOption { - type = types.listOf types.str; + setOptions = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ "HIST_IGNORE_DUPS" "SHARE_HISTORY" @@ -130,25 +128,25 @@ in ''; }; - enableCompletion = mkOption { + enableCompletion = lib.mkOption { default = true; description = '' Enable zsh completion for all interactive zsh shells. ''; - type = types.bool; + type = lib.types.bool; }; - enableBashCompletion = mkOption { + enableBashCompletion = lib.mkOption { default = false; description = '' Enable compatibility with bash's programmable completion system. ''; - type = types.bool; + type = lib.types.bool; }; - enableGlobalCompInit = mkOption { + enableGlobalCompInit = lib.mkOption { default = cfg.enableCompletion; - defaultText = literalExpression "config.${opt.enableCompletion}"; + defaultText = lib.literalExpression "config.${opt.enableCompletion}"; description = '' Enable execution of compinit call for all interactive zsh shells. @@ -156,24 +154,24 @@ in `fpath` and a custom `compinit` call in the local config is required. ''; - type = types.bool; + type = lib.types.bool; }; - enableLsColors = mkOption { + enableLsColors = lib.mkOption { default = true; description = '' Enable extra colors in directory listings (used by `ls` and `tree`). ''; - type = types.bool; + type = lib.types.bool; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - programs.zsh.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases; + programs.zsh.shellAliases = builtins.mapAttrs (name: lib.mkDefault) cfge.shellAliases; environment.etc.zshenv.text = '' @@ -239,9 +237,9 @@ in if [ -n "$__ETC_ZSHRC_SOURCED" -o -n "$NOSYSZSHRC" ]; then return; fi __ETC_ZSHRC_SOURCED=1 - ${optionalString (cfg.setOptions != []) '' + ${lib.optionalString (cfg.setOptions != []) '' # Set zsh options. - setopt ${concatStringsSep " " cfg.setOptions} + setopt ${builtins.concatStringsSep " " cfg.setOptions} ''} # Alternative method of determining short and full hostname. @@ -249,19 +247,19 @@ in # Setup command line history. # Don't export these, otherwise other shells (bash) will try to use same HISTFILE. - SAVEHIST=${toString cfg.histSize} - HISTSIZE=${toString cfg.histSize} + SAVEHIST=${builtins.toString cfg.histSize} + HISTSIZE=${builtins.toString cfg.histSize} HISTFILE=${cfg.histFile} # Configure sane keyboard defaults. . /etc/zinputrc - ${optionalString cfg.enableGlobalCompInit '' + ${lib.optionalString cfg.enableGlobalCompInit '' # Enable autocompletion. autoload -U compinit && compinit ''} - ${optionalString cfg.enableBashCompletion '' + ${lib.optionalString cfg.enableBashCompletion '' # Enable compatibility with bash's completion system. autoload -U bashcompinit && bashcompinit ''} @@ -271,7 +269,7 @@ in ${cfg.interactiveShellInit} - ${optionalString cfg.enableLsColors '' + ${lib.optionalString cfg.enableLsColors '' # Extra colors for directory listings. eval "$(${pkgs.coreutils}/bin/dircolors -b)" ''} @@ -302,11 +300,11 @@ in environment.etc.zinputrc.text = builtins.readFile ./zinputrc; environment.systemPackages = [ pkgs.zsh ] - ++ optional cfg.enableCompletion pkgs.nix-zsh-completions; + ++ lib.optional cfg.enableCompletion pkgs.nix-zsh-completions; - environment.pathsToLink = optional cfg.enableCompletion "/share/zsh"; + environment.pathsToLink = lib.optional cfg.enableCompletion "/share/zsh"; - #users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh"; + #users.defaultUserShell = lib.mkDefault "/run/current-system/sw/bin/zsh"; environment.shells = [ diff --git a/third_party/nixpkgs/nixos/modules/security/isolate.nix b/third_party/nixpkgs/nixos/modules/security/isolate.nix new file mode 100644 index 0000000000..3cc0176f3d --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/security/isolate.nix @@ -0,0 +1,133 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkEnableOption mkPackageOption mkOption types mkIf maintainers; + + cfg = config.security.isolate; + configFile = pkgs.writeText "isolate-config.cf" '' + box_root=${cfg.boxRoot} + lock_root=${cfg.lockRoot} + cg_root=${cfg.cgRoot} + first_uid=${toString cfg.firstUid} + first_gid=${toString cfg.firstGid} + num_boxes=${toString cfg.numBoxes} + restricted_init=${if cfg.restrictedInit then "1" else "0"} + ${cfg.extraConfig} + ''; + isolate = pkgs.symlinkJoin { + name = "isolate-wrapped-${pkgs.isolate.version}"; + + paths = [ pkgs.isolate ]; + + nativeBuildInputs = [ pkgs.makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/isolate \ + --set ISOLATE_CONFIG_FILE ${configFile} + + wrapProgram $out/bin/isolate-cg-keeper \ + --set ISOLATE_CONFIG_FILE ${configFile} + ''; + }; +in +{ + options.security.isolate = { + enable = mkEnableOption '' + Sandbox for securely executing untrusted programs + ''; + + package = mkPackageOption pkgs "isolate-unwrapped" { }; + + boxRoot = mkOption { + type = types.path; + default = "/var/lib/isolate/boxes"; + description = '' + All sandboxes are created under this directory. + To avoid symlink attacks, this directory and all its ancestors + must be writeable only by root. + ''; + }; + + lockRoot = mkOption { + type = types.path; + default = "/run/isolate/locks"; + description = '' + Directory where lock files are created. + ''; + }; + + cgRoot = mkOption { + type = types.str; + default = "auto:/run/isolate/cgroup"; + description = '' + Control group which subgroups are placed under. + Either an explicit path to a subdirectory in cgroupfs, or "auto:file" to read + the path from "file", where it is put by `isolate-cg-helper`. + ''; + }; + + firstUid = mkOption { + type = types.numbers.between 1000 65533; + default = 60000; + description = '' + Start of block of UIDs reserved for sandboxes. + ''; + }; + + firstGid = mkOption { + type = types.numbers.between 1000 65533; + default = 60000; + description = '' + Start of block of GIDs reserved for sandboxes. + ''; + }; + + numBoxes = mkOption { + type = types.numbers.between 1000 65533; + default = 1000; + description = '' + Number of UIDs and GIDs to reserve, starting from + {option}`firstUid` and {option}`firstGid`. + ''; + }; + + restrictedInit = mkOption { + type = types.bool; + default = false; + description = '' + If true, only root can create sandboxes. + ''; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Extra configuration to append to the configuration file. + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ + isolate + ]; + + systemd.services.isolate = { + description = "Isolate control group hierarchy daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "notify"; + ExecStart = "${isolate}/bin/isolate-cg-keeper"; + Slice = "isolate.slice"; + Delegate = true; + }; + }; + + systemd.slices.isolate = { + description = "Isolate sandbox slice"; + }; + + meta.maintainers = with maintainers; [ virchau13 ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index a9bd28b154..5d3bed2fb0 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -1044,9 +1044,7 @@ in See [issue #31611](https://github.com/NixOS/nixpkgs/issues/31611) ::: ''; - example = [ "/etc/ssh/authorized_keys.d/%u" ]; - default = config.services.openssh.authorizedKeysFiles; - defaultText = literalExpression "config.services.openssh.authorizedKeysFiles"; + default = [ "/etc/ssh/authorized_keys.d/%u" ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix b/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix index 0304749b8d..041c900338 100644 --- a/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix +++ b/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix @@ -79,13 +79,20 @@ in { description = '' The value `full-apivfs` (the default) sets up private {file}`/dev`, {file}`/proc`, - {file}`/sys` and {file}`/tmp` file systems in a separate user - name space. + {file}`/sys`, {file}`/tmp` and {file}`/var/tmp` file systems + in a separate user name space. If this is set to `chroot-only`, only the file system name space is set up along with the call to {manpage}`chroot(2)`. + In all cases, unless `serviceConfig.PrivateTmp=true` is set, + both {file}`/tmp` and {file}`/var/tmp` paths are added to `InaccessiblePaths=`. + This is to overcome options like `DynamicUser=true` + implying `PrivateTmp=true` without letting it being turned off. + Beware however that giving processes the `CAP_SYS_ADMIN` and `@mount` privileges + can let them undo the effects of `InaccessiblePaths=`. + ::: {.note} This doesn't cover network namespaces and is solely for file system level isolation. @@ -98,8 +105,12 @@ in { wantsAPIVFS = lib.mkDefault (config.confinement.mode == "full-apivfs"); in lib.mkIf config.confinement.enable { serviceConfig = { - RootDirectory = "/var/empty"; - TemporaryFileSystem = "/"; + ReadOnlyPaths = [ "+/" ]; + RuntimeDirectory = [ "confinement/${mkPathSafeName name}" ]; + RootDirectory = "/run/confinement/${mkPathSafeName name}"; + InaccessiblePaths = [ + "-+/run/confinement/${mkPathSafeName name}" + ]; PrivateMounts = lib.mkDefault true; # https://github.com/NixOS/nixpkgs/issues/14645 is a future attempt @@ -148,16 +159,6 @@ in { + " Please either define a separate service or find a way to run" + " commands other than ExecStart within the chroot."; } - { assertion = !cfg.serviceConfig.DynamicUser or false; - message = "${whatOpt "DynamicUser"}. Please create a dedicated user via" - + " the 'users.users' option instead as this combination is" - + " currently not supported."; - } - { assertion = cfg.serviceConfig ? ProtectSystem -> cfg.serviceConfig.ProtectSystem == false; - message = "${whatOpt "ProtectSystem"}. ProtectSystem is not compatible" - + " with service confinement as it fails to remount /usr within" - + " our chroot. Please disable the option."; - } ]) config.systemd.services); config.systemd.packages = lib.concatLists (lib.mapAttrsToList (name: cfg: let @@ -183,6 +184,13 @@ in { echo "BindReadOnlyPaths=$realprog:/bin/sh" >> "$serviceFile" ''} + # If DynamicUser= is enabled, PrivateTmp=true is implied (and cannot be turned off). + # so disable them unless PrivateTmp=true is explicitely set. + ${lib.optionalString (!cfg.serviceConfig.PrivateTmp) '' + echo "InaccessiblePaths=-+/tmp" >> "$serviceFile" + echo "InaccessiblePaths=-+/var/tmp" >> "$serviceFile" + ''} + while read storePath; do if [ -L "$storePath" ]; then # Currently, systemd can't cope with symlinks in Bind(ReadOnly)Paths, diff --git a/third_party/nixpkgs/nixos/modules/services/audio/navidrome.nix b/third_party/nixpkgs/nixos/modules/services/audio/navidrome.nix index a5a7e805e3..ca1cd6ca43 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/navidrome.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/navidrome.nix @@ -1,11 +1,17 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ + config, + lib, + pkgs, + ... +}: let + inherit (lib) mkEnableOption mkPackageOption mkOption maintainers; + inherit (lib.types) bool str; cfg = config.services.navidrome; - settingsFormat = pkgs.formats.json {}; -in { + settingsFormat = pkgs.formats.json { }; +in +{ options = { services.navidrome = { @@ -13,9 +19,8 @@ in { package = mkPackageOption pkgs "navidrome" { }; - settings = mkOption rec { + settings = mkOption { type = settingsFormat.type; - apply = recursiveUpdate default; default = { Address = "127.0.0.1"; Port = 4533; @@ -23,62 +28,111 @@ in { example = { MusicFolder = "/mnt/music"; }; - description = '' - Configuration for Navidrome, see for supported values. - ''; + description = "Configuration for Navidrome, see for supported values."; + }; + + user = mkOption { + type = str; + default = "navidrome"; + description = "User under which Navidrome runs."; + }; + + group = mkOption { + type = str; + default = "navidrome"; + description = "Group under which Navidrome runs."; }; openFirewall = mkOption { - type = types.bool; + type = bool; default = false; description = "Whether to open the TCP port in the firewall"; }; }; }; - config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [cfg.settings.Port]; - - systemd.services.navidrome = { - description = "Navidrome Media Server"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = '' - ${cfg.package}/bin/navidrome --configfile ${settingsFormat.generate "navidrome.json" cfg.settings} - ''; - DynamicUser = true; - StateDirectory = "navidrome"; - WorkingDirectory = "/var/lib/navidrome"; - RuntimeDirectory = "navidrome"; - RootDirectory = "/run/navidrome"; - ReadWritePaths = ""; - BindPaths = lib.optional (cfg.settings ? DataFolder) cfg.settings.DataFolder; - BindReadOnlyPaths = [ - # navidrome uses online services to download additional album metadata / covers - "${config.environment.etc."ssl/certs/ca-certificates.crt".source}:/etc/ssl/certs/ca-certificates.crt" - builtins.storeDir - "/etc" - ] ++ lib.optional (cfg.settings ? MusicFolder) cfg.settings.MusicFolder; - CapabilityBoundingSet = ""; - RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; - RestrictNamespaces = true; - PrivateDevices = true; - PrivateUsers = true; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ "@system-service" "~@privileged" ]; - RestrictRealtime = true; - LockPersonality = true; - MemoryDenyWriteExecute = true; - UMask = "0066"; - ProtectHostname = true; + config = + let + inherit (lib) mkIf optional getExe; + WorkingDirectory = "/var/lib/navidrome"; + in + mkIf cfg.enable { + systemd = { + tmpfiles.settings.navidromeDirs = { + "${cfg.settings.DataFolder or WorkingDirectory}"."d" = { + mode = "700"; + inherit (cfg) user group; + }; + "${cfg.settings.CacheFolder or (WorkingDirectory + "/cache")}"."d" = { + mode = "700"; + inherit (cfg) user group; + }; + }; + services.navidrome = { + description = "Navidrome Media Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${getExe cfg.package} --configfile ${settingsFormat.generate "navidrome.json" cfg.settings} + ''; + User = cfg.user; + Group = cfg.group; + StateDirectory = "navidrome"; + inherit WorkingDirectory; + RuntimeDirectory = "navidrome"; + RootDirectory = "/run/navidrome"; + ReadWritePaths = ""; + BindPaths = + optional (cfg.settings ? DataFolder) cfg.settings.DataFolder + ++ optional (cfg.settings ? CacheFolder) cfg.settings.CacheFolder; + BindReadOnlyPaths = [ + # navidrome uses online services to download additional album metadata / covers + "${ + config.environment.etc."ssl/certs/ca-certificates.crt".source + }:/etc/ssl/certs/ca-certificates.crt" + builtins.storeDir + "/etc" + ] ++ optional (cfg.settings ? MusicFolder) cfg.settings.MusicFolder; + CapabilityBoundingSet = ""; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + RestrictRealtime = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + UMask = "0066"; + ProtectHostname = true; + }; + }; }; + + users.users = mkIf (cfg.user == "navidrome") { + navidrome = { + inherit (cfg) group; + isSystemUser = true; + }; + }; + + users.groups = mkIf (cfg.group == "navidrome") { navidrome = { }; }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.Port ]; }; - }; + meta.maintainers = with maintainers; [ nu-nu-ko ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix index 570f8931bd..04f9710080 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix @@ -33,13 +33,24 @@ let } trap on_exit EXIT + borgWrapper () { + local result + borg "$@" && result=$? || result=$? + if [[ -z "${toString cfg.failOnWarnings}" ]] && [[ "$result" == 1 ]]; then + echo "ignoring warning return value 1" + return 0 + else + return "$result" + fi + } + archiveName="${optionalString (cfg.archiveBaseName != null) (cfg.archiveBaseName + "-")}$(date ${cfg.dateFormat})" archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}" ${cfg.preHook} '' + optionalString cfg.doInit '' # Run borg init if the repo doesn't exist yet - if ! borg list $extraArgs > /dev/null; then - borg init $extraArgs \ + if ! borgWrapper list $extraArgs > /dev/null; then + borgWrapper init $extraArgs \ --encryption ${cfg.encryption.mode} \ $extraInitArgs ${cfg.postInit} @@ -48,7 +59,7 @@ let ( set -o pipefail ${optionalString (cfg.dumpCommand != null) ''${escapeShellArg cfg.dumpCommand} | \''} - borg create $extraArgs \ + borgWrapper create $extraArgs \ --compression ${cfg.compression} \ --exclude-from ${mkExcludeFile cfg} \ --patterns-from ${mkPatternsFile cfg} \ @@ -57,16 +68,16 @@ let ${if cfg.paths == null then "-" else escapeShellArgs cfg.paths} ) '' + optionalString cfg.appendFailedSuffix '' - borg rename $extraArgs \ + borgWrapper rename $extraArgs \ "::$archiveName$archiveSuffix" "$archiveName" '' + '' ${cfg.postCreate} '' + optionalString (cfg.prune.keep != { }) '' - borg prune $extraArgs \ + borgWrapper prune $extraArgs \ ${mkKeepArgs cfg} \ ${optionalString (cfg.prune.prefix != null) "--glob-archives ${escapeShellArg "${cfg.prune.prefix}*"}"} \ $extraPruneArgs - borg compact $extraArgs $extraCompactArgs + borgWrapper compact $extraArgs $extraCompactArgs ${cfg.postPrune} ''); @@ -488,6 +499,15 @@ in { default = true; }; + failOnWarnings = mkOption { + type = types.bool; + description = '' + Fail the whole backup job if any borg command returns a warning + (exit code 1), for example because a file changed during backup. + ''; + default = true; + }; + doInit = mkOption { type = types.bool; description = '' diff --git a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix index 8b56636c79..8be2649189 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix @@ -11,7 +11,7 @@ in description = '' Periodic backups to create with Restic. ''; - type = types.attrsOf (types.submodule ({ config, name, ... }: { + type = types.attrsOf (types.submodule ({ name, ... }: { options = { passwordFile = mkOption { type = types.str; @@ -206,12 +206,19 @@ in ]; }; + runCheck = mkOption { + type = types.bool; + default = (builtins.length config.services.restic.backups.${name}.checkOpts > 0); + defaultText = literalExpression ''builtins.length config.services.backups.${name}.checkOpts > 0''; + description = "Whether to run the `check` command with the provided `checkOpts` options."; + example = true; + }; + checkOpts = mkOption { type = types.listOf types.str; default = [ ]; description = '' - A list of options for 'restic check', which is run after - pruning. + A list of options for 'restic check'. ''; example = [ "--with-cache" @@ -298,7 +305,9 @@ in doBackup = (backup.dynamicFilesFrom != null) || (backup.paths != null && backup.paths != []); pruneCmd = optionals (builtins.length backup.pruneOpts > 0) [ (resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts)) - (resticCmd + " check " + (concatStringsSep " " backup.checkOpts)) + ]; + checkCmd = optionals backup.runCheck [ + (resticCmd + " check " + (concatStringsSep " " backup.checkOpts)) ]; # Helper functions for rclone remotes rcloneRemoteName = builtins.elemAt (splitString ":" backup.repository) 1; @@ -331,7 +340,7 @@ in serviceConfig = { Type = "oneshot"; ExecStart = (optionals doBackup [ "${resticCmd} backup ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} --files-from=${filesFromTmpFile}" ]) - ++ pruneCmd; + ++ pruneCmd ++ checkCmd; User = backup.user; RuntimeDirectory = "restic-backups-${name}"; CacheDirectory = "restic-backups-${name}"; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix b/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix index 71e5977c44..7f2c89edbf 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix @@ -315,6 +315,14 @@ in ''; }; + mailErrorSummaryTo = mkOption { + type = singleLineStr; + default = ""; + description = '' + Email address to send a summary to if "send task(s) failed". + ''; + }; + noDestroy = mkOption { type = bool; default = false; @@ -455,6 +463,8 @@ in "--loglevel=${cfg.logLevel}" (optionalString cfg.noDestroy "--nodestroy") (optionalString cfg.autoCreation "--autoCreation") + (optionalString (cfg.mailErrorSummaryTo != "") + "--mailErrorSummaryTo=${cfg.mailErrorSummaryTo}") (optionalString (enabledFeatures != []) "--features=${concatStringsSep "," enabledFeatures}") ]; in "${pkgs.znapzend}/bin/znapzend ${args}"; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix index 040cf7640d..4d18d378d7 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix @@ -1,15 +1,25 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let cfg = config.services.k3s; - removeOption = config: instruction: - lib.mkRemovedOptionModule ([ "services" "k3s" ] ++ config) instruction; + removeOption = + config: instruction: + lib.mkRemovedOptionModule ( + [ + "services" + "k3s" + ] + ++ config + ) instruction; in { - imports = [ - (removeOption [ "docker" ] "k3s docker option is no longer supported.") - ]; + imports = [ (removeOption [ "docker" ] "k3s docker option is no longer supported.") ]; # interface options.services.k3s = { @@ -33,7 +43,10 @@ in - `serverAddr` is required. ''; default = "server"; - type = types.enum [ "server" "agent" ]; + type = types.enum [ + "server" + "agent" + ]; }; serverAddr = mkOption { @@ -125,7 +138,8 @@ in message = "serverAddr or configPath (with 'server' key) should be set if role is 'agent'"; } { - assertion = cfg.role == "agent" -> cfg.configPath != null || cfg.tokenFile != null || cfg.token != ""; + assertion = + cfg.role == "agent" -> cfg.configPath != null || cfg.tokenFile != null || cfg.token != ""; message = "token or tokenFile or configPath (with 'token' or 'token-file' keys) should be set if role is 'agent'"; } { @@ -142,8 +156,14 @@ in systemd.services.k3s = { description = "k3s service"; - after = [ "firewall.service" "network-online.target" ]; - wants = [ "firewall.service" "network-online.target" ]; + after = [ + "firewall.service" + "network-online.target" + ]; + wants = [ + "firewall.service" + "network-online.target" + ]; wantedBy = [ "multi-user.target" ]; path = optional config.boot.zfs.enabled config.boot.zfs.package; serviceConfig = { @@ -159,9 +179,7 @@ in TasksMax = "infinity"; EnvironmentFile = cfg.environmentFile; ExecStart = concatStringsSep " \\\n " ( - [ - "${cfg.package}/bin/k3s ${cfg.role}" - ] + [ "${cfg.package}/bin/k3s ${cfg.role}" ] ++ (optional cfg.clusterInit "--cluster-init") ++ (optional cfg.disableAgent "--disable-agent") ++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}") diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix index 8a386b4848..8a9d8c210b 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix @@ -1,8 +1,31 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) + attrValues + concatMapStrings + concatStringsSep + const + elem + filterAttrs + isString + literalExpression + mapAttrs + mapAttrsToList + mkAfter + mkBefore + mkDefault + mkEnableOption + mkIf + mkMerge + mkOption + mkPackageOption + mkRemovedOptionModule + mkRenamedOptionModule + optionalString + types + versionAtLeast + ; cfg = config.services.postgresql; @@ -14,7 +37,7 @@ let # package = pkgs.postgresql_; # }; # works. - base = if cfg.enableJIT then cfg.package.withJIT else cfg.package; + base = if cfg.enableJIT then cfg.package.withJIT else cfg.package.withoutJIT; in if cfg.extraPlugins == [] then base @@ -24,7 +47,7 @@ let if true == value then "yes" else if false == value then "no" else if isString value then "'${lib.replaceStrings ["'"] ["''"] value}'" - else toString value; + else builtins.toString value; # The main PostgreSQL configuration file. configFile = pkgs.writeTextDir "postgresql.conf" (concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${toStr v}") (filterAttrs (const (x: x != null)) cfg.settings))); @@ -439,7 +462,7 @@ in config = mkIf cfg.enable { assertions = map ({ name, ensureDBOwnership, ... }: { - assertion = ensureDBOwnership -> builtins.elem name cfg.ensureDatabases; + assertion = ensureDBOwnership -> elem name cfg.ensureDatabases; message = '' For each database user defined with `services.postgresql.ensureUsers` and `ensureDBOwnership = true;`, a database with the same name must be defined @@ -537,7 +560,7 @@ in # Wait for PostgreSQL to be ready to accept connections. postStart = '' - PSQL="psql --port=${toString cfg.settings.port}" + PSQL="psql --port=${builtins.toString cfg.settings.port}" while ! $PSQL -d postgres -c "" 2> /dev/null; do if ! kill -0 "$MAINPID"; then exit 1; fi diff --git a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix index 1da2fa9f11..ad88a4f589 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix @@ -57,9 +57,9 @@ in { package = mkPackageOption pkgs "redis" { }; vmOverCommit = mkEnableOption '' - setting of vm.overcommit_memory to 1 + set `vm.overcommit_memory` sysctl to 1 (Suggested for Background Saving: ) - ''; + '' // { default = true; }; servers = mkOption { type = with types; attrsOf (submodule ({ config, name, ... }: { @@ -312,10 +312,9 @@ in { ''; }) enabledServers); - boot.kernel.sysctl = mkMerge [ - { "vm.nr_hugepages" = "0"; } - ( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } ) - ]; + boot.kernel.sysctl = mkIf cfg.vmOverCommit { + "vm.overcommit_memory" = "1"; + }; networking.firewall.allowedTCPPorts = concatMap (conf: optional conf.openFirewall conf.port diff --git a/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix b/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix index 856d36b8a3..842b0716b9 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktop-managers/plasma6.nix @@ -238,7 +238,7 @@ in { services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true); services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - services.xserver.libinput.enable = mkDefault true; + services.libinput.enable = mkDefault true; # Extra UDEV rules used by Solid services.udev.packages = [ @@ -286,6 +286,15 @@ in { kde-smartcard = lib.mkIf config.security.pam.p11.enable { p11Auth = true; }; }; + security.wrappers = { + kwin_wayland = { + owner = "root"; + group = "root"; + capabilities = "cap_sys_nice+ep"; + source = "${lib.getBin pkgs.kdePackages.kwin}/bin/kwin_wayland"; + }; + }; + programs.dconf.enable = true; programs.firefox.nativeMessagingHosts.packages = [kdePackages.plasma-browser-integration]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/at-spi2-core.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/at-spi2-core.nix index 446f363fce..6ed5b198fe 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/at-spi2-core.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/at-spi2-core.nix @@ -2,30 +2,19 @@ { config, lib, pkgs, ... }: -with lib; - { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; ###### interface - - # Added 2021-05-07 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "at-spi2-core" "enable" ] - [ "services" "gnome" "at-spi2-core" "enable" ] - ) - ]; - options = { services.gnome.at-spi2-core = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable at-spi2-core, a service for the Assistive Technologies @@ -43,14 +32,14 @@ with lib; ###### implementation - config = mkMerge [ - (mkIf config.services.gnome.at-spi2-core.enable { + config = lib.mkMerge [ + (lib.mkIf config.services.gnome.at-spi2-core.enable { environment.systemPackages = [ pkgs.at-spi2-core ]; services.dbus.packages = [ pkgs.at-spi2-core ]; systemd.packages = [ pkgs.at-spi2-core ]; }) - (mkIf (!config.services.gnome.at-spi2-core.enable) { + (lib.mkIf (!config.services.gnome.at-spi2-core.enable) { environment.sessionVariables = { NO_AT_BRIDGE = "1"; GTK_A11Y = "none"; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix index 34a91170d4..a43e8dadb4 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix @@ -2,44 +2,30 @@ { config, lib, pkgs, ... }: -with lib; - { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - # Added 2021-05-07 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "evolution-data-server" "enable" ] - [ "services" "gnome" "evolution-data-server" "enable" ] - ) - (mkRenamedOptionModule - [ "services" "gnome3" "evolution-data-server" "plugins" ] - [ "services" "gnome" "evolution-data-server" "plugins" ] - ) - ]; - ###### interface options = { services.gnome.evolution-data-server = { - enable = mkEnableOption "Evolution Data Server, a collection of services for storing addressbooks and calendars"; - plugins = mkOption { - type = types.listOf types.package; + enable = lib.mkEnableOption "Evolution Data Server, a collection of services for storing addressbooks and calendars"; + plugins = lib.mkOption { + type = lib.types.listOf lib.types.package; default = [ ]; description = "Plugins for Evolution Data Server."; }; }; programs.evolution = { - enable = mkEnableOption "Evolution, a Personal information management application that provides integrated mail, calendaring and address book functionality"; - plugins = mkOption { - type = types.listOf types.package; + enable = lib.mkEnableOption "Evolution, a Personal information management application that provides integrated mail, calendaring and address book functionality"; + plugins = lib.mkOption { + type = lib.types.listOf lib.types.package; default = [ ]; - example = literalExpression "[ pkgs.evolution-ews ]"; + example = lib.literalExpression "[ pkgs.evolution-ews ]"; description = "Plugins for Evolution."; }; @@ -52,15 +38,15 @@ with lib; let bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome.evolution-data-server) plugins; }; in - mkMerge [ - (mkIf config.services.gnome.evolution-data-server.enable { + lib.mkMerge [ + (lib.mkIf config.services.gnome.evolution-data-server.enable { environment.systemPackages = [ bundle ]; services.dbus.packages = [ bundle ]; systemd.packages = [ bundle ]; }) - (mkIf config.programs.evolution.enable { + (lib.mkIf config.programs.evolution.enable { services.gnome.evolution-data-server = { enable = true; plugins = [ pkgs.evolution ] ++ config.programs.evolution.plugins; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/glib-networking.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/glib-networking.nix index 1039605391..905901f470 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/glib-networking.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/glib-networking.nix @@ -2,29 +2,19 @@ { config, pkgs, lib, ... }: -with lib; - { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - # Added 2021-05-07 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "glib-networking" "enable" ] - [ "services" "gnome" "glib-networking" "enable" ] - ) - ]; - ###### interface options = { services.gnome.glib-networking = { - enable = mkEnableOption "network extensions for GLib"; + enable = lib.mkEnableOption "network extensions for GLib"; }; @@ -32,7 +22,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome.glib-networking.enable { + config = lib.mkIf config.services.gnome.glib-networking.enable { services.dbus.packages = [ pkgs.glib-networking ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix index 34fc24f7d5..4f0c36883a 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix @@ -9,19 +9,6 @@ in maintainers = teams.gnome.members; }; - imports = [ - # Added 2021-05-07 - (mkRenamedOptionModule - [ "services" "gnome3" "chrome-gnome-shell" "enable" ] - [ "services" "gnome" "gnome-browser-connector" "enable" ] - ) - # Added 2022-07-25 - (mkRenamedOptionModule - [ "services" "gnome" "chrome-gnome-shell" "enable" ] - [ "services" "gnome" "gnome-browser-connector" "enable" ] - ) - ]; - options = { services.gnome.gnome-browser-connector.enable = mkEnableOption '' native host connector for the GNOME Shell browser extension, a DBus service diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix index ceda493374..8deb12ec18 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix @@ -2,8 +2,6 @@ { config, pkgs, lib, ... }: -with lib; - let # GNOME initial setup's run is conditioned on whether @@ -45,24 +43,16 @@ in { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - # Added 2021-05-07 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "gnome-initial-setup" "enable" ] - [ "services" "gnome" "gnome-initial-setup" "enable" ] - ) - ]; - ###### interface options = { services.gnome.gnome-initial-setup = { - enable = mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system"; + enable = lib.mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system"; }; @@ -71,12 +61,12 @@ in ###### implementation - config = mkIf config.services.gnome.gnome-initial-setup.enable { + config = lib.mkIf config.services.gnome.gnome-initial-setup.enable { environment.systemPackages = [ pkgs.gnome.gnome-initial-setup ] - ++ optional (versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart + ++ lib.optional (lib.versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart ; systemd.packages = [ diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix index d821da164b..79bce0ade2 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix @@ -2,30 +2,20 @@ { config, pkgs, lib, ... }: -with lib; - { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - # Added 2021-05-07 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "gnome-keyring" "enable" ] - [ "services" "gnome" "gnome-keyring" "enable" ] - ) - ]; - ###### interface options = { services.gnome.gnome-keyring = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable GNOME Keyring daemon, a service designed to @@ -41,7 +31,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome.gnome-keyring.enable { + config = lib.mkIf config.services.gnome.gnome-keyring.enable { environment.systemPackages = [ pkgs.gnome.gnome-keyring ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix index 01f7e3695c..de3c378959 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix @@ -2,30 +2,20 @@ { config, pkgs, lib, ... }: -with lib; - { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - # Added 2021-05-07 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "gnome-online-accounts" "enable" ] - [ "services" "gnome" "gnome-online-accounts" "enable" ] - ) - ]; - ###### interface options = { services.gnome.gnome-online-accounts = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable GNOME Online Accounts daemon, a service that provides @@ -40,7 +30,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome.gnome-online-accounts.enable { + config = lib.mkIf config.services.gnome.gnome-online-accounts.enable { environment.systemPackages = [ pkgs.gnome-online-accounts ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-miners.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-miners.nix index 5f9039f68c..9496752ed3 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-miners.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-miners.nix @@ -2,30 +2,20 @@ { config, pkgs, lib, ... }: -with lib; - { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - # Added 2021-05-07 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "gnome-online-miners" "enable" ] - [ "services" "gnome" "gnome-online-miners" "enable" ] - ) - ]; - ###### interface options = { services.gnome.gnome-online-miners = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable GNOME Online Miners, a service that @@ -40,7 +30,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome.gnome-online-miners.enable { + config = lib.mkIf config.services.gnome.gnome-online-miners.enable { environment.systemPackages = [ pkgs.gnome.gnome-online-miners ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix index b5573d2fc2..d81a9edfa1 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix @@ -1,32 +1,36 @@ # Remote desktop daemon using Pipewire. { config, lib, pkgs, ... }: -with lib; - { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - # Added 2021-05-07 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "gnome-remote-desktop" "enable" ] - [ "services" "gnome" "gnome-remote-desktop" "enable" ] - ) - ]; - ###### interface options = { services.gnome.gnome-remote-desktop = { - enable = mkEnableOption "Remote Desktop support using Pipewire"; + enable = lib.mkEnableOption "Remote Desktop support using Pipewire"; }; }; ###### implementation - config = mkIf config.services.gnome.gnome-remote-desktop.enable { + config = lib.mkIf config.services.gnome.gnome-remote-desktop.enable { services.pipewire.enable = true; + services.dbus.packages = [ pkgs.gnome.gnome-remote-desktop ]; + + environment.systemPackages = [ pkgs.gnome.gnome-remote-desktop ]; systemd.packages = [ pkgs.gnome.gnome-remote-desktop ]; + systemd.tmpfiles.packages = [ pkgs.gnome.gnome-remote-desktop ]; + + # TODO: if possible, switch to using provided g-r-d sysusers.d + users = { + users.gnome-remote-desktop = { + isSystemUser = true; + group = "gnome-remote-desktop"; + home = "/var/lib/gnome-remote-desktop"; + }; + groups.gnome-remote-desktop = { }; + }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix index 9c68c9b76e..30b35f6690 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix @@ -2,8 +2,6 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.services.gnome.gnome-settings-daemon; @@ -13,28 +11,16 @@ in { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - imports = [ - (mkRemovedOptionModule - ["services" "gnome3" "gnome-settings-daemon" "package"] - "") - - # Added 2021-05-07 - (mkRenamedOptionModule - [ "services" "gnome3" "gnome-settings-daemon" "enable" ] - [ "services" "gnome" "gnome-settings-daemon" "enable" ] - ) - ]; - ###### interface options = { services.gnome.gnome-settings-daemon = { - enable = mkEnableOption "GNOME Settings Daemon"; + enable = lib.mkEnableOption "GNOME Settings Daemon"; }; @@ -43,7 +29,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.gnome.gnome-settings-daemon diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-user-share.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-user-share.nix index 38256af309..2c6d94b7bd 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-user-share.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-user-share.nix @@ -2,29 +2,19 @@ { config, pkgs, lib, ... }: -with lib; - { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - imports = [ - # Added 2021-05-07 - (mkRenamedOptionModule - [ "services" "gnome3" "gnome-user-share" "enable" ] - [ "services" "gnome" "gnome-user-share" "enable" ] - ) - ]; - ###### interface options = { services.gnome.gnome-user-share = { - enable = mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME"; + enable = lib.mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME"; }; @@ -33,7 +23,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome.gnome-user-share.enable { + config = lib.mkIf config.services.gnome.gnome-user-share.enable { environment.systemPackages = [ pkgs.gnome.gnome-user-share diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/rygel.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/rygel.nix index 8932d438cf..c980b239d5 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/rygel.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/rygel.nix @@ -1,38 +1,28 @@ # rygel service. { config, lib, pkgs, ... }: -with lib; - { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - imports = [ - # Added 2021-05-07 - (mkRenamedOptionModule - [ "services" "gnome3" "rygel" "enable" ] - [ "services" "gnome" "rygel" "enable" ] - ) - ]; - ###### interface options = { services.gnome.rygel = { - enable = mkOption { + enable = lib.mkOption { default = false; description = '' Whether to enable Rygel UPnP Mediaserver. You will need to also allow UPnP connections in firewall, see the following [comment](https://github.com/NixOS/nixpkgs/pull/45045#issuecomment-416030795). ''; - type = types.bool; + type = lib.types.bool; }; }; }; ###### implementation - config = mkIf config.services.gnome.rygel.enable { + config = lib.mkIf config.services.gnome.rygel.enable { environment.systemPackages = [ pkgs.gnome.rygel ]; services.dbus.packages = [ pkgs.gnome.rygel ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/sushi.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/sushi.nix index 3133a3a0d9..946030e4bb 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/sushi.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/sushi.nix @@ -2,30 +2,20 @@ { config, lib, pkgs, ... }: -with lib; - { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - imports = [ - # Added 2021-05-07 - (mkRenamedOptionModule - [ "services" "gnome3" "sushi" "enable" ] - [ "services" "gnome" "sushi" "enable" ] - ) - ]; - ###### interface options = { services.gnome.sushi = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable Sushi, a quick previewer for nautilus. @@ -39,7 +29,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome.sushi.enable { + config = lib.mkIf config.services.gnome.sushi.enable { environment.systemPackages = [ pkgs.gnome.sushi ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker-miners.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker-miners.nix index 9351007d30..d5d42cee9f 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker-miners.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker-miners.nix @@ -2,30 +2,20 @@ { config, pkgs, lib, ... }: -with lib; - { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - imports = [ - # Added 2021-05-07 - (mkRenamedOptionModule - [ "services" "gnome3" "tracker-miners" "enable" ] - [ "services" "gnome" "tracker-miners" "enable" ] - ) - ]; - ###### interface options = { services.gnome.tracker-miners = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable Tracker miners, indexing services for Tracker @@ -39,7 +29,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome.tracker-miners.enable { + config = lib.mkIf config.services.gnome.tracker-miners.enable { environment.systemPackages = [ pkgs.tracker-miners ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker.nix index fef399d011..45b679571c 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker.nix @@ -2,33 +2,23 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.services.gnome.tracker; in { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - imports = [ - # Added 2021-05-07 - (mkRenamedOptionModule - [ "services" "gnome3" "tracker" "enable" ] - [ "services" "gnome" "tracker" "enable" ] - ) - ]; - ###### interface options = { services.gnome.tracker = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable Tracker services, a search engine, @@ -36,8 +26,8 @@ in ''; }; - subcommandPackages = mkOption { - type = types.listOf types.package; + subcommandPackages = lib.mkOption { + type = lib.types.listOf lib.types.package; default = [ ]; internal = true; description = '' @@ -52,7 +42,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.tracker ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix index 09ac06d9f6..8a02cdd4a6 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix @@ -2,8 +2,6 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.services.gvfs; @@ -13,26 +11,19 @@ in { meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - # Added 2019-08-19 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome3" "gvfs" "enable" ] - [ "services" "gvfs" "enable" ]) - ]; - ###### interface options = { services.gvfs = { - enable = mkEnableOption "GVfs, a userspace virtual filesystem"; + enable = lib.mkEnableOption "GVfs, a userspace virtual filesystem"; # gvfs can be built with multiple configurations - package = mkPackageOption pkgs [ "gnome" "gvfs" ] { }; + package = lib.mkPackageOption pkgs [ "gnome" "gvfs" ] { }; }; @@ -41,7 +32,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/wireplumber.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/wireplumber.nix index 6ab62eb03c..c924801bcd 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/wireplumber.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/wireplumber.nix @@ -1,18 +1,40 @@ { config, lib, pkgs, ... }: let - inherit (builtins) attrNames concatMap length; + inherit (builtins) concatMap; inherit (lib) maintainers; - inherit (lib.attrsets) attrByPath filterAttrs; + inherit (lib.attrsets) attrByPath mapAttrsToList; inherit (lib.lists) flatten optional; inherit (lib.modules) mkIf; inherit (lib.options) literalExpression mkOption; - inherit (lib.strings) hasPrefix; - inherit (lib.types) bool listOf package; + inherit (lib.strings) concatStringsSep makeSearchPath; + inherit (lib.types) bool listOf attrsOf package lines; + inherit (lib.path) subpath; pwCfg = config.services.pipewire; cfg = pwCfg.wireplumber; pwUsedForAudio = pwCfg.audio.enable; + + json = pkgs.formats.json { }; + + configSectionsToConfFile = path: value: + pkgs.writeTextDir + path + (concatStringsSep "\n" ( + mapAttrsToList + (section: content: "${section} = " + (builtins.toJSON content)) + value + )); + + mapConfigToFiles = config: + mapAttrsToList + (name: value: configSectionsToConfFile "share/wireplumber/wireplumber.conf.d/${name}.conf" value) + config; + + mapScriptsToFiles = scripts: + mapAttrsToList + (relativePath: value: pkgs.writeTextDir (subpath.join ["share/wireplumber/scripts" relativePath]) value) + scripts; in { meta.maintainers = [ maintainers.k900 ]; @@ -33,6 +55,114 @@ in description = "The WirePlumber derivation to use."; }; + extraConfig = mkOption { + # Two layer attrset is necessary before using JSON, because of the whole + # config file not being a JSON object, but a concatenation of JSON objects + # in sections. + type = attrsOf (attrsOf json.type); + default = { }; + example = literalExpression ''{ + "log-level-debug" = { + "context.properties" = { + # Output Debug log messages as opposed to only the default level (Notice) + "log.level" = "D"; + }; + }; + "wh-1000xm3-ldac-hq" = { + "monitor.bluez.rules" = [ + { + matches = [ + { + # Match any bluetooth device with ids equal to that of a WH-1000XM3 + "device.name" = "~bluez_card.*"; + "device.product.id" = "0x0cd3"; + "device.vendor.id" = "usb:054c"; + } + ]; + actions = { + update-props = { + # Set quality to high quality instead of the default of auto + "bluez5.a2dp.ldac.quality" = "hq"; + }; + }; + } + ]; + }; + }''; + description = '' + Additional configuration for the WirePlumber daemon when run in + single-instance mode (the default in nixpkgs and currently the only + supported way to run WirePlumber configured via `extraConfig`). + + See also: + - [The configuration file][docs-the-conf-file] + - [Modifying configuration][docs-modifying-config] + - [Locations of files][docs-file-locations] + - and the [configuration section][docs-config-section] of the docs in general + + Note that WirePlumber (and PipeWire) use dotted attribute names like + `device.product.id`. These are not nested, but flat objects for WirePlumber/PipeWire, + so to write these in nix expressions, remember to quote them like `"device.product.id"`. + Have a look at the example for this. + + [docs-the-conf-file]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/conf_file.html + [docs-modifying-config]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/modifying_configuration.html + [docs-file-locations]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/locations.html + [docs-config-section]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration.html + ''; + }; + + extraScripts = mkOption { + type = attrsOf lines; + default = { }; + example = { + "test/hello-world.lua" = '' + print("Hello, world!") + ''; + }; + description = '' + Additional scripts for WirePlumber to be used by configuration files. + + Every item in this attrset becomes a separate lua file with the path + relative to the `scripts` directory specified in the name of the item. + The scripts get passed to the WirePlumber service via the `XDG_DATA_DIRS` + variable. Scripts specified here are preferred over those shipped with + WirePlumber if they occupy the same relative path. + + For a script to be loaded, it needs to be specified as part of a component, + and that component needs to be required by an active profile (e.g. `main`). + Components can be defined in config files either via `extraConfig` or `configPackages`. + + For the hello-world example, you'd have to add the following `extraConfig`: + ```nix + services.pipewire.wireplumber.extraConfig."99-hello-world" = { + "wireplumber.components" = [ + { + name = "test/hello-world.lua"; + type = "script/lua"; + provides = "custom.hello-world"; + } + ]; + + "wireplumber.profiles" = { + main = { + "custom.hello-world" = "required"; + }; + }; + }; + ``` + + See also: + - [Location of scripts][docs-file-locations-scripts] + - [Components & Profiles][docs-components-profiles] + - [Migration - Loading custom scripts][docs-migration-loading-custom-scripts] + + [docs-file-locations-scripts]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/locations.html#location-of-scripts + [docs-components-profiles]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/components_and_profiles.html + [docs-migration-loading-custom-scripts]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/migration.html#loading-custom-scripts + ''; + }; + configPackages = mkOption { type = listOf package; default = [ ]; @@ -57,7 +187,7 @@ in extraLv2Packages = mkOption { type = listOf package; - default = []; + default = [ ]; example = literalExpression "[ pkgs.lsp-plugins ]"; description = '' List of packages that provide LV2 plugins in `lib/lv2` that should @@ -96,9 +226,22 @@ in } ''; + extraConfigPkg = pkgs.buildEnv { + name = "wireplumber-extra-config"; + paths = mapConfigToFiles cfg.extraConfig; + pathsToLink = [ "/share/wireplumber/wireplumber.conf.d" ]; + }; + + extraScriptsPkg = pkgs.buildEnv { + name = "wireplumber-extra-scrips"; + paths = mapScriptsToFiles cfg.extraScripts; + pathsToLink = [ "/share/wireplumber/scripts" ]; + }; + configPackages = cfg.configPackages - ++ optional (!pwUsedForAudio) pwNotForAudioConfigPkg - ++ optional pwCfg.systemWide systemwideConfigPkg; + ++ [ extraConfigPkg extraScriptsPkg ] + ++ optional (!pwUsedForAudio) pwNotForAudioConfigPkg + ++ optional pwCfg.systemWide systemwideConfigPkg; configs = pkgs.buildEnv { name = "wireplumber-configs"; @@ -110,7 +253,7 @@ in ( concatMap (p: - attrByPath ["passthru" "requiredLv2Packages"] [] p + attrByPath [ "passthru" "requiredLv2Packages" ] [ ] p ) configPackages ); @@ -127,24 +270,10 @@ in assertion = !config.hardware.bluetooth.hsphfpd.enable; message = "Using WirePlumber conflicts with hsphfpd, as it provides the same functionality. `hardware.bluetooth.hsphfpd.enable` needs be set to false"; } - { - assertion = length - (attrNames - ( - filterAttrs - (name: value: - hasPrefix "wireplumber/" name || name == "wireplumber" - ) - config.environment.etc - )) == 1; - message = "Using `environment.etc.\"wireplumber<...>\"` directly is no longer supported in 24.05. Use `services.pipewire.wireplumber.configPackages` instead."; - } ]; environment.systemPackages = [ cfg.package ]; - environment.etc.wireplumber.source = "${configs}/share/wireplumber"; - systemd.packages = [ cfg.package ]; systemd.services.wireplumber.enable = pwCfg.systemWide; @@ -156,10 +285,16 @@ in systemd.services.wireplumber.environment = mkIf pwCfg.systemWide { # Force WirePlumber to use system dbus. DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/dbus/system_bus_socket"; + + # Make WirePlumber find our config/script files and lv2 plugins required by those + # (but also the configs/scripts shipped with WirePlumber) + XDG_DATA_DIRS = makeSearchPath "share" [ configs cfg.package ]; LV2_PATH = "${lv2Plugins}/lib/lv2"; }; - systemd.user.services.wireplumber.environment.LV2_PATH = - mkIf (!pwCfg.systemWide) "${lv2Plugins}/lib/lv2"; + systemd.user.services.wireplumber.environment = mkIf (!pwCfg.systemWide) { + XDG_DATA_DIRS = makeSearchPath "share" [ configs cfg.package ]; + LV2_PATH = "${lv2Plugins}/lib/lv2"; + }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/display-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/display-managers/default.nix index de3feb500f..feba4b163c 100644 --- a/third_party/nixpkgs/nixos/modules/services/display-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/display-managers/default.nix @@ -29,12 +29,6 @@ let fi '') cfg.sessionPackages} ''; - - dmDefault = config.services.xserver.desktopManager.default; - # fallback default for cases when only default wm is set - dmFallbackDefault = if dmDefault != null then dmDefault else "none"; - wmDefault = config.services.xserver.windowManager.default; - defaultSessionFromLegacyOptions = dmFallbackDefault + lib.optionalString (wmDefault != null && wmDefault != "none") "+${wmDefault}"; in { options = { @@ -119,20 +113,13 @@ in type = lib.types.nullOr lib.types.str // { description = "session name"; check = d: - lib.assertMsg (d != null -> (lib.types.str.check d && lib.elem d config.services.displayManager.sessionData.sessionNames)) '' + lib.assertMsg (d != null -> (lib.types.str.check d && lib.elem d cfg.sessionData.sessionNames)) '' Default graphical session, '${d}', not found. Valid names for 'services.displayManager.defaultSession' are: - ${lib.concatStringsSep "\n " cfg.displayManager.sessionData.sessionNames} + ${lib.concatStringsSep "\n " cfg.sessionData.sessionNames} ''; }; - default = - if dmDefault != null || wmDefault != null then - defaultSessionFromLegacyOptions - else - null; - defaultText = lib.literalMD '' - Taken from display manager settings or window manager settings, if either is set. - ''; + default = null; example = "gnome"; description = '' Graphical session to pre-select in the session chooser (only effective for GDM, LightDM and SDDM). @@ -192,20 +179,6 @@ in } ]; - warnings = - lib.mkIf (dmDefault != null || wmDefault != null) [ - '' - The following options are deprecated: - ${lib.concatStringsSep "\n " (map ({c, t}: t) (lib.filter ({c, t}: c != null) [ - { c = dmDefault; t = "- services.xserver.desktopManager.default"; } - { c = wmDefault; t = "- services.xserver.windowManager.default"; } - ]))} - Please use - services.displayManager.defaultSession = "${defaultSessionFromLegacyOptions}"; - instead. - '' - ]; - # Make xsessions and wayland sessions available in XDG_DATA_DIRS # as some programs have behavior that depends on them being present environment.sessionVariables.XDG_DATA_DIRS = lib.mkIf (cfg.sessionPackages != [ ]) [ @@ -214,7 +187,7 @@ in services.displayManager.sessionData = { desktops = installedSessions; - sessionNames = lib.concatMap (p: p.providedSessions) config.services.displayManager.sessionPackages; + sessionNames = lib.concatMap (p: p.providedSessions) cfg.sessionPackages; # We do not want to force users to set defaultSession when they have only single DE. autologinSession = if cfg.defaultSession != null then diff --git a/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix b/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix index c07b225fc4..118a3e1df3 100644 --- a/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix +++ b/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix @@ -27,6 +27,17 @@ in ''; }; + greeterManagesPlymouth = mkOption { + type = types.bool; + internal = true; + default = false; + description = '' + Don't configure the greetd service to wait for Plymouth to exit. + + Enable this if the greeter you're using can manage Plymouth itself to provide a smoother handoff. + ''; + }; + vt = mkOption { type = types.int; default = 1; @@ -72,8 +83,9 @@ in ]; After = [ "systemd-user-sessions.service" - "plymouth-quit-wait.service" "getty@${tty}.service" + ] ++ lib.optionals (!cfg.greeterManagesPlymouth) [ + "plymouth-quit-wait.service" ]; Conflicts = [ "getty@${tty}.service" diff --git a/third_party/nixpkgs/nixos/modules/services/display-managers/sddm.nix b/third_party/nixpkgs/nixos/modules/services/display-managers/sddm.nix index aaf1f0dcfc..a6bfa213fe 100644 --- a/third_party/nixpkgs/nixos/modules/services/display-managers/sddm.nix +++ b/third_party/nixpkgs/nixos/modules/services/display-managers/sddm.nix @@ -111,8 +111,8 @@ let let westonIni = (pkgs.formats.ini { }).generate "weston.ini" { libinput = { - enable-tap = xcfg.libinput.mouse.tapping; - left-handed = xcfg.libinput.mouse.leftHanded; + enable-tap = config.services.libinput.mouse.tapping; + left-handed = config.services.libinput.mouse.leftHanded; }; keyboard = { keymap_model = xcfg.xkb.model; diff --git a/third_party/nixpkgs/nixos/modules/services/editors/emacs.md b/third_party/nixpkgs/nixos/modules/services/editors/emacs.md index 885f927422..da10286751 100644 --- a/third_party/nixpkgs/nixos/modules/services/editors/emacs.md +++ b/third_party/nixpkgs/nixos/modules/services/editors/emacs.md @@ -366,44 +366,3 @@ convenient if you regularly edit Nix files. You can use `woman` to get completion of all available man pages. For example, type `M-x woman nixos-rebuild .` -### Editing DocBook 5 XML Documents {#sec-emacs-docbook-xml} - -Emacs includes -[nXML](https://www.gnu.org/software/emacs/manual/html_node/nxml-mode/Introduction.html), -a major-mode for validating and editing XML documents. When editing DocBook -5.0 documents, such as [this one](#book-nixos-manual), -nXML needs to be configured with the relevant schema, which is not -included. - -To install the DocBook 5.0 schemas, either add -{var}`pkgs.docbook5` to [](#opt-environment.systemPackages) -([NixOS](#sec-declarative-package-mgmt)), or run -`nix-env -f '' -iA docbook5` -([Nix](#sec-ad-hoc-packages)). - -Then customize the variable {var}`rng-schema-locating-files` to -include {file}`~/.emacs.d/schemas.xml` and put the following -text into that file: -::: {.example #ex-emacs-docbook-xml} -### nXML Schema Configuration (`~/.emacs.d/schemas.xml`) - -```xml - - - - - - - -``` -::: diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/kanata.nix b/third_party/nixpkgs/nixos/modules/services/hardware/kanata.nix index 333b2d2a88..46af3e36b9 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/kanata.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/kanata.nix @@ -5,6 +5,8 @@ with lib; let cfg = config.services.kanata; + upstreamDoc = "See [the upstream documentation](https://github.com/jtroo/kanata/blob/main/docs/config.adoc) and [example config files](https://github.com/jtroo/kanata/tree/main/cfg_samples) for more information."; + keyboard = { options = { devices = mkOption { @@ -22,28 +24,16 @@ let type = types.lines; example = '' (defsrc - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] \ - caps a s d f g h j k l ; ' ret - lsft z x c v b n m , . / rsft - lctl lmet lalt spc ralt rmet rctl) + caps) - (deflayer qwerty - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] \ - @cap a s d f g h j k l ; ' ret - lsft z x c v b n m , . / rsft - lctl lmet lalt spc ralt rmet rctl) - - (defalias - ;; tap within 100ms for capslk, hold more than 100ms for lctl - cap (tap-hold 100 100 caps lctl)) + (deflayermap (default-layer) + ;; tap caps lock as caps lock, hold caps lock as left control + caps (tap-hold 100 100 caps lctl)) ''; description = '' Configuration other than `defcfg`. - See [example config files](https://github.com/jtroo/kanata) - for more information. + ${upstreamDoc} ''; }; extraDefCfg = mkOption { @@ -55,8 +45,7 @@ let from the devices option) and `linux-continue-if-no-devs-found` (hardcoded to be yes). - See [example config files](https://github.com/jtroo/kanata) - for more information. + ${upstreamDoc} ''; }; extraArgs = mkOption { @@ -86,14 +75,20 @@ let in optionalString ((length devices) > 0) "linux-dev (${devicesString})"; - mkConfig = name: keyboard: pkgs.writeText "${mkName name}-config.kdb" '' - (defcfg - ${keyboard.extraDefCfg} - ${mkDevices keyboard.devices} - linux-continue-if-no-devs-found yes) + mkConfig = name: keyboard: pkgs.writeTextFile { + name = "${mkName name}-config.kdb"; + text = '' + (defcfg + ${keyboard.extraDefCfg} + ${mkDevices keyboard.devices} + linux-continue-if-no-devs-found yes) - ${keyboard.config} - ''; + ${keyboard.config} + ''; + checkPhase = '' + ${getExe cfg.package} --cfg "$target" --check --debug + ''; + }; mkService = name: keyboard: nameValuePair (mkName name) { wantedBy = [ "multi-user.target" ]; @@ -153,7 +148,7 @@ in options.services.kanata = { enable = mkEnableOption "kanata, a tool to improve keyboard comfort and usability with advanced customization"; package = mkPackageOption pkgs "kanata" { - example = "kanata-with-cmd"; + example = [ "kanata-with-cmd" ]; extraDescription = '' ::: {.note} If {option}`danger-enable-cmd` is enabled in any of the keyboards, the diff --git a/third_party/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix b/third_party/nixpkgs/nixos/modules/services/hardware/libinput.nix similarity index 95% rename from third_party/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix rename to third_party/nixpkgs/nixos/modules/services/hardware/libinput.nix index 54ff7d85a0..b8aa59035d 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/libinput.nix @@ -2,7 +2,7 @@ with lib; -let cfg = config.services.xserver.libinput; +let cfg = config.services.libinput; xorgBool = v: if v then "on" else "off"; @@ -223,7 +223,7 @@ let cfg = config.services.xserver.libinput; in { imports = - (map (option: mkRenamedOptionModule ([ "services" "xserver" "libinput" option ]) [ "services" "xserver" "libinput" "touchpad" option ]) [ + (map (option: mkRenamedOptionModule ([ "services" "xserver" "libinput" option ]) [ "services" "libinput" "touchpad" option ]) [ "accelProfile" "accelSpeed" "buttonMapping" @@ -242,11 +242,15 @@ in { "transformationMatrix" "disableWhileTyping" "additionalOptions" - ]); + ]) ++ [ + (mkRenamedOptionModule [ "services" "xserver" "libinput" "enable" ] [ "services" "libinput" "enable" ]) + (mkRenamedOptionModule [ "services" "xserver" "libinput" "mouse" ] [ "services" "libinput" "mouse" ]) + (mkRenamedOptionModule [ "services" "xserver" "libinput" "touchpad" ] [ "services" "libinput" "touchpad" ]) + ]; options = { - services.xserver.libinput = { + services.libinput = { enable = mkEnableOption "libinput" // { default = config.services.xserver.enable; defaultText = lib.literalExpression "config.services.xserver.enable"; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/cdi-generate.nix b/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/cdi-generate.nix deleted file mode 100644 index 1aaa2d07b9..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/cdi-generate.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - addDriverRunpath, - glibc, - jq, - lib, - nvidia-container-toolkit, - nvidia-driver, - runtimeShell, - writeScriptBin, -}: -let - mountOptions = { options = ["ro" "nosuid" "nodev" "bind"]; }; - mounts = [ - # FIXME: Making /usr mounts optional - { hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-control"; - containerPath = "/usr/bin/nvidia-cuda-mps-control"; } - { hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-server"; - containerPath = "/usr/bin/nvidia-cuda-mps-server"; } - { hostPath = lib.getExe' nvidia-driver "nvidia-debugdump"; - containerPath = "/usr/bin/nvidia-debugdump"; } - { hostPath = lib.getExe' nvidia-driver "nvidia-powerd"; - containerPath = "/usr/bin/nvidia-powerd"; } - { hostPath = lib.getExe' nvidia-driver "nvidia-smi"; - containerPath = "/usr/bin/nvidia-smi"; } - { hostPath = lib.getExe' nvidia-container-toolkit "nvidia-ctk"; - containerPath = "/usr/bin/nvidia-ctk"; } - { hostPath = "${lib.getLib glibc}/lib"; - containerPath = "${lib.getLib glibc}/lib"; } - - # FIXME: use closureinfo - { - hostPath = addDriverRunpath.driverLink; - containerPath = addDriverRunpath.driverLink; - } - { hostPath = "${lib.getLib glibc}/lib"; - containerPath = "${lib.getLib glibc}/lib"; } - { hostPath = "${lib.getLib glibc}/lib64"; - containerPath = "${lib.getLib glibc}/lib64"; } - ]; - jqAddMountExpression = ".containerEdits.mounts[.containerEdits.mounts | length] |= . +"; - mountsToJq = lib.concatMap - (mount: - ["${lib.getExe jq} '${jqAddMountExpression} ${builtins.toJSON (mount // mountOptions)}'"]) - mounts; -in -writeScriptBin "nvidia-cdi-generator" -'' -#! ${runtimeShell} - -function cdiGenerate { - ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} cdi generate \ - --format json \ - --ldconfig-path ${lib.getExe' glibc "ldconfig"} \ - --library-search-path ${lib.getLib nvidia-driver}/lib \ - --nvidia-ctk-path ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} -} - -cdiGenerate | \ - ${lib.concatStringsSep " | " mountsToJq} > $RUNTIME_DIRECTORY/nvidia-container-toolkit.json -'' diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/default.nix b/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/default.nix deleted file mode 100644 index 5aa3c72ee0..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - - options = { - - hardware.nvidia-container-toolkit-cdi-generator.enable = lib.mkOption { - default = false; - internal = true; - visible = false; - type = lib.types.bool; - description = '' - Enable dynamic CDI configuration for NVidia devices by running - nvidia-container-toolkit on boot. - ''; - }; - - }; - - config = { - - systemd.services.nvidia-container-toolkit-cdi-generator = lib.mkIf config.hardware.nvidia-container-toolkit-cdi-generator.enable { - description = "Container Device Interface (CDI) for Nvidia generator"; - wantedBy = [ "multi-user.target" ]; - after = [ "systemd-udev-settle.service" ]; - serviceConfig = { - RuntimeDirectory = "cdi"; - RemainAfterExit = true; - ExecStart = - let - script = pkgs.callPackage ./cdi-generate.nix { nvidia-driver = config.hardware.nvidia.package; }; - in - lib.getExe script; - Type = "oneshot"; - }; - }; - - }; - -} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix b/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix new file mode 100644 index 0000000000..ca769cc44e --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix @@ -0,0 +1,35 @@ +{ + glibc, + jq, + lib, + mounts, + nvidia-container-toolkit, + nvidia-driver, + runtimeShell, + writeScriptBin, +}: let + mkMount = {hostPath, containerPath, mountOptions}: { + inherit hostPath containerPath; + options = mountOptions; + }; + jqAddMountExpression = ".containerEdits.mounts[.containerEdits.mounts | length] |= . +"; + allJqMounts = lib.concatMap + (mount: + ["${lib.getExe jq} '${jqAddMountExpression} ${builtins.toJSON (mkMount mount)}'"]) + mounts; +in +writeScriptBin "nvidia-cdi-generator" +'' +#! ${runtimeShell} + +function cdiGenerate { + ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} cdi generate \ + --format json \ + --ldconfig-path ${lib.getExe' glibc "ldconfig"} \ + --library-search-path ${lib.getLib nvidia-driver}/lib \ + --nvidia-ctk-path ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} +} + +cdiGenerate | \ + ${lib.concatStringsSep " | " allJqMounts} > $RUNTIME_DIRECTORY/nvidia-container-toolkit.json +'' diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix new file mode 100644 index 0000000000..6c6bc667e6 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix @@ -0,0 +1,127 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + (lib.mkRenamedOptionModule + [ "virtualisation" "containers" "cdi" "dynamic" "nvidia" "enable" ] + [ "hardware" "nvidia-container-toolkit" "enable" ]) + ]; + + options = let + mountType = { + options = { + hostPath = lib.mkOption { + type = lib.types.str; + description = "Host path."; + }; + containerPath = lib.mkOption { + type = lib.types.str; + description = "Container path."; + }; + mountOptions = lib.mkOption { + default = [ "ro" "nosuid" "nodev" "bind" ]; + type = lib.types.listOf lib.types.str; + description = "Mount options."; + }; + }; + }; + in { + + hardware.nvidia-container-toolkit = { + enable = lib.mkOption { + default = false; + type = lib.types.bool; + description = '' + Enable dynamic CDI configuration for NVidia devices by running + nvidia-container-toolkit on boot. + ''; + }; + + mounts = lib.mkOption { + type = lib.types.listOf (lib.types.submodule mountType); + default = []; + description = "Mounts to be added to every container under the Nvidia CDI profile."; + }; + + mount-nvidia-executables = lib.mkOption { + default = true; + type = lib.types.bool; + description = '' + Mount executables nvidia-smi, nvidia-cuda-mps-control, nvidia-cuda-mps-server, + nvidia-debugdump, nvidia-powerd and nvidia-ctk on containers. + ''; + }; + + mount-nvidia-docker-1-directories = lib.mkOption { + default = true; + type = lib.types.bool; + description = '' + Mount nvidia-docker-1 directories on containers: /usr/local/nvidia/lib and + /usr/local/nvidia/lib64. + ''; + }; + }; + + }; + + config = { + + virtualisation.docker.daemon.settings = lib.mkIf + (config.hardware.nvidia-container-toolkit.enable && + (lib.versionAtLeast config.virtualisation.docker.package.version "25")) { + features.cdi = true; + }; + + hardware.nvidia-container-toolkit.mounts = let + nvidia-driver = config.hardware.nvidia.package; + in (lib.mkMerge [ + [{ hostPath = pkgs.addDriverRunpath.driverLink; + containerPath = pkgs.addDriverRunpath.driverLink; } + { hostPath = "${lib.getLib pkgs.glibc}/lib"; + containerPath = "${lib.getLib pkgs.glibc}/lib"; } + { hostPath = "${lib.getLib pkgs.glibc}/lib64"; + containerPath = "${lib.getLib pkgs.glibc}/lib64"; }] + (lib.mkIf config.hardware.nvidia-container-toolkit.mount-nvidia-executables + [{ hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-control"; + containerPath = "/usr/bin/nvidia-cuda-mps-control"; } + { hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-server"; + containerPath = "/usr/bin/nvidia-cuda-mps-server"; } + { hostPath = lib.getExe' nvidia-driver "nvidia-debugdump"; + containerPath = "/usr/bin/nvidia-debugdump"; } + { hostPath = lib.getExe' nvidia-driver "nvidia-powerd"; + containerPath = "/usr/bin/nvidia-powerd"; } + { hostPath = lib.getExe' nvidia-driver "nvidia-smi"; + containerPath = "/usr/bin/nvidia-smi"; }]) + # nvidia-docker 1.0 uses /usr/local/nvidia/lib{,64} + # e.g. + # - https://gitlab.com/nvidia/container-images/cuda/-/blob/e3ff10eab3a1424fe394899df0e0f8ca5a410f0f/dist/12.3.1/ubi9/base/Dockerfile#L44 + # - https://github.com/NVIDIA/nvidia-docker/blob/01d2c9436620d7dde4672e414698afe6da4a282f/src/nvidia/volumes.go#L104-L173 + (lib.mkIf config.hardware.nvidia-container-toolkit.mount-nvidia-docker-1-directories + [{ hostPath = "${lib.getLib nvidia-driver}/lib"; + containerPath = "/usr/local/nvidia/lib"; } + { hostPath = "${lib.getLib nvidia-driver}/lib"; + containerPath = "/usr/local/nvidia/lib64"; }]) + ]); + + systemd.services.nvidia-container-toolkit-cdi-generator = lib.mkIf config.hardware.nvidia-container-toolkit.enable { + description = "Container Device Interface (CDI) for Nvidia generator"; + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-udev-settle.service" ]; + serviceConfig = { + RuntimeDirectory = "cdi"; + RemainAfterExit = true; + ExecStart = + let + script = pkgs.callPackage ./cdi-generate.nix { + inherit (config.hardware.nvidia-container-toolkit) mounts; + nvidia-driver = config.hardware.nvidia.package; + }; + in + lib.getExe script; + Type = "oneshot"; + }; + }; + + }; + +} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix b/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix index 4f9202d13d..25cfd97016 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix @@ -50,8 +50,8 @@ in ${optionalString cfg.debug "--loglevel=debug"} \ ${optionalString cfg.ignoreCpuidCheck "--ignore-cpuid-check"} \ ${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \ - --dbus-enable \ - --adaptive + ${optionalString (cfg.configFile == null) "--adaptive"} \ + --dbus-enable ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix index 3db6616442..62603d20e2 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix @@ -167,10 +167,16 @@ let mv etc/udev/hwdb.bin $out ''; - compressFirmware = firmware: if (config.boot.kernelPackages.kernelAtLeast "5.3" && (firmware.compressFirmware or true)) then - pkgs.compressFirmwareXz firmware - else - id firmware; + compressFirmware = firmware: + let + inherit (config.boot.kernelPackages) kernelAtLeast; + in + if ! (firmware.compressFirmware or true) then + firmware + else + if kernelAtLeast "5.19" then pkgs.compressFirmwareZstd firmware + else if kernelAtLeast "5.3" then pkgs.compressFirmwareXz firmware + else firmware; # Udev has a 512-character limit for ENV{PATH}, so create a symlink # tree to work around this. diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix index aaf2ca1d77..ac9ec06639 100644 --- a/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix +++ b/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix @@ -4,41 +4,6 @@ with lib; let cfg = config.services.ebusd; - - package = pkgs.ebusd; - - arguments = [ - "${package}/bin/ebusd" - "--foreground" - "--updatecheck=off" - "--device=${cfg.device}" - "--port=${toString cfg.port}" - "--configpath=${cfg.configpath}" - "--scanconfig=${cfg.scanconfig}" - "--log=all:${cfg.logs.all}" - "--log=main:${cfg.logs.main}" - "--log=network:${cfg.logs.network}" - "--log=bus:${cfg.logs.bus}" - "--log=update:${cfg.logs.update}" - "--log=other:${cfg.logs.other}" - ] ++ lib.optionals cfg.readonly [ - "--readonly" - ] ++ lib.optionals cfg.mqtt.enable [ - "--mqtthost=${cfg.mqtt.host}" - "--mqttport=${toString cfg.mqtt.port}" - "--mqttuser=${cfg.mqtt.user}" - "--mqttpass=${cfg.mqtt.password}" - ] ++ lib.optionals cfg.mqtt.home-assistant [ - "--mqttint=${package}/etc/ebusd/mqtt-hassio.cfg" - "--mqttjson" - ] ++ lib.optionals cfg.mqtt.retain [ - "--mqttretain" - ] ++ cfg.extraArguments; - - usesDev = hasPrefix "/" cfg.device; - - command = concatStringsSep " " arguments; - in { meta.maintainers = with maintainers; [ nathan-gs ]; @@ -46,6 +11,8 @@ in options.services.ebusd = { enable = mkEnableOption "ebusd, a daemon for communication with eBUS heating systems"; + package = mkPackageOptionMD pkgs "ebusd" { }; + device = mkOption { type = types.str; default = ""; @@ -57,7 +24,8 @@ in ens:DEVICE for enhanced high speed serial device (only adapter v3 and newer with firmware since 20220731), DEVICE for serial device (normal speed, for all other serial adapters like adapter v2 as well as adapter v3 in non-enhanced mode), or [udp:]IP:PORT for network device. - https://github.com/john30/ebusd/wiki/2.-Run#device-options + + Source: ''; }; @@ -81,7 +49,7 @@ in type = types.str; default = "https://cfg.ebusd.eu/"; description = '' - Read CSV config files from PATH (local folder or HTTPS URL) [https://cfg.ebusd.eu/] + Directory to read CSV config files from. This can be a local folder or a URL. ''; }; @@ -95,65 +63,21 @@ in ''; }; - logs = { - main = mkOption { - type = types.enum [ "error" "notice" "info" "debug"]; - default = "info"; - description = '' - Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. - ''; - }; - - network = mkOption { - type = types.enum [ "error" "notice" "info" "debug"]; - default = "info"; - description = '' - Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. - ''; - }; - - bus = mkOption { - type = types.enum [ "error" "notice" "info" "debug"]; - default = "info"; - description = '' - Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. - ''; - }; - - update = mkOption { - type = types.enum [ "error" "notice" "info" "debug"]; - default = "info"; - description = '' - Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. - ''; - }; - - other = mkOption { - type = types.enum [ "error" "notice" "info" "debug"]; - default = "info"; - description = '' - Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. - ''; - }; - - all = mkOption { - type = types.enum [ "error" "notice" "info" "debug"]; - default = "info"; - description = '' - Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. - ''; - }; - }; + logs = let + # "all" must come first so it can be overridden by more specific areas + areas = [ "all" "main" "network" "bus" "update" "other" ]; + levels = [ "none" "error" "notice" "info" "debug" ]; + in listToAttrs (map (area: nameValuePair area (mkOption { + type = types.enum levels; + default = "notice"; + example = "debug"; + description = '' + Only write log for matching `AREA`s (${concatStringsSep "|" areas}) below or equal to `LEVEL` (${concatStringsSep "|" levels}) + ''; + })) areas); mqtt = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Adds support for MQTT - ''; - }; + enable = mkEnableOption "support for MQTT"; host = mkOption { type = types.str; @@ -179,13 +103,7 @@ in ''; }; - retain = mkOption { - type = types.bool; - default = false; - description = '' - Set the retain flag on all topics instead of only selected global ones - ''; - }; + retain = mkEnableOption "set the retain flag on all topics instead of only selected global ones"; user = mkOption { type = types.str; @@ -200,7 +118,6 @@ in The MQTT password. ''; }; - }; extraArguments = mkOption { @@ -210,25 +127,44 @@ in Extra arguments to the ebus daemon ''; }; - }; - config = mkIf (cfg.enable) { - + config = let + usesDev = hasPrefix "/" cfg.device; + in mkIf cfg.enable { systemd.services.ebusd = { description = "EBUSd Service"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = command; + ExecStart = let + args = cli.toGNUCommandLineShell { } (foldr (a: b: a // b) { } [ + { + inherit (cfg) device port configpath scanconfig readonly; + foreground = true; + updatecheck = "off"; + log = mapAttrsToList (name: value: "${name}:${value}") cfg.logs; + mqttretain = cfg.mqtt.retain; + } + (optionalAttrs cfg.mqtt.enable { + mqtthost = cfg.mqtt.host; + mqttport = cfg.mqtt.port; + mqttuser = cfg.mqtt.user; + mqttpass = cfg.mqtt.password; + }) + (optionalAttrs cfg.mqtt.home-assistant { + mqttint = "${cfg.package}/etc/ebusd/mqtt-hassio.cfg"; + mqttjson = true; + }) + ]); + in "${cfg.package}/bin/ebusd ${args} ${escapeShellArgs cfg.extraArguments}"; + DynamicUser = true; Restart = "on-failure"; # Hardening CapabilityBoundingSet = ""; - DeviceAllow = lib.optionals usesDev [ - cfg.device - ] ; + DeviceAllow = optionals usesDev [ cfg.device ]; DevicePolicy = "closed"; LockPersonality = true; MemoryDenyWriteExecute = false; @@ -254,9 +190,7 @@ in RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; - SupplementaryGroups = [ - "dialout" - ]; + SupplementaryGroups = [ "dialout" ]; SystemCallArchitectures = "native"; SystemCallFilter = [ "@system-service @pkey" @@ -265,6 +199,5 @@ in UMask = "0077"; }; }; - }; } diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/evcc.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/evcc.nix index cf4043c946..a952437b1b 100644 --- a/third_party/nixpkgs/nixos/modules/services/home-automation/evcc.nix +++ b/third_party/nixpkgs/nixos/modules/services/home-automation/evcc.nix @@ -63,6 +63,7 @@ in DynamicUser = true; LockPersonality = true; MemoryDenyWriteExecute = true; + Restart = "on-failure"; RestrictAddressFamilies = [ "AF_INET" "AF_INET6" diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/wyoming/faster-whisper.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/wyoming/faster-whisper.nix index cbff3ab3e6..d0fca6a41c 100644 --- a/third_party/nixpkgs/nixos/modules/services/home-automation/wyoming/faster-whisper.nix +++ b/third_party/nixpkgs/nixos/modules/services/home-automation/wyoming/faster-whisper.nix @@ -119,6 +119,8 @@ in wantedBy = [ "multi-user.target" ]; + # https://github.com/rhasspy/wyoming-faster-whisper/issues/27 + environment."HF_HUB_CACHE" = "/tmp"; serviceConfig = { DynamicUser = true; User = "wyoming-faster-whisper"; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix index 3e29828eba..9344277fc1 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix @@ -224,7 +224,7 @@ in and users are replaced by dummy users), so tests are complemented by a logrotate-checkconf service that is enabled by default. This extra check can be disabled by disabling it at the systemd level with the - {option}`services.systemd.services.logrotate-checkconf.enable` option. + {option}`systemd.services.logrotate-checkconf.enable` option. Conversely there are still things that might make this check fail incorrectly (e.g. a file path where we don't have access to intermediate directories): diff --git a/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix b/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix index a34bc07b6a..9eccd34cef 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix @@ -41,6 +41,10 @@ in { wantedBy = [ "multi-user.target" ]; stopIfChanged = false; + preStart = '' + ${lib.getExe pkgs.promtail} -config.file=${prettyJSON cfg.configuration} -check-syntax + ''; + serviceConfig = { Restart = "on-failure"; TimeoutStopSec = 10; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix b/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix index 7e7ca7e406..180c9800d7 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix @@ -534,14 +534,11 @@ in { hyperkittyApiKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64) secretKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64) - mailmanWebCfgTmp=$(mktemp) - jq -n '.MAILMAN_ARCHIVER_KEY=$archiver_key | .SECRET_KEY=$secret_key' \ + install -m 0440 -o root -g mailman \ + <(jq -n '.MAILMAN_ARCHIVER_KEY=$archiver_key | .SECRET_KEY=$secret_key' \ --arg archiver_key "$hyperkittyApiKey" \ - --arg secret_key "$secretKey" \ - >"$mailmanWebCfgTmp" - chown root:mailman "$mailmanWebCfgTmp" - chmod 440 "$mailmanWebCfgTmp" - mv -n "$mailmanWebCfgTmp" "$mailmanWebCfg" + --arg secret_key "$secretKey") \ + "$mailmanWebCfg" fi hyperkittyApiKey="$(jq -r .MAILMAN_ARCHIVER_KEY "$mailmanWebCfg")" diff --git a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix index 4499532ace..78f627d33e 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix @@ -7,7 +7,7 @@ let fpm = config.services.phpfpm.pools.roundcube; localDB = cfg.database.host == "localhost"; user = cfg.database.username; - phpWithPspell = pkgs.php81.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled); + phpWithPspell = pkgs.php83.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled); in { options.services.roundcube = { @@ -247,14 +247,15 @@ in (mkIf (cfg.database.host == "localhost") { requires = [ "postgresql.service" ]; after = [ "postgresql.service" ]; - path = [ config.services.postgresql.package ]; }) { wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + + path = [ config.services.postgresql.package ]; script = let - psql = "${lib.optionalString (!localDB) "PGPASSFILE=${cfg.database.passwordFile}"} ${pkgs.postgresql}/bin/psql ${lib.optionalString (!localDB) "-h ${cfg.database.host} -U ${cfg.database.username} "} ${cfg.database.dbname}"; + psql = "${lib.optionalString (!localDB) "PGPASSFILE=${cfg.database.passwordFile}"} psql ${lib.optionalString (!localDB) "-h ${cfg.database.host} -U ${cfg.database.username} "} ${cfg.database.dbname}"; in '' version="$(${psql} -t <<< "select value from system where name = 'roundcube-version';" || true)" diff --git a/third_party/nixpkgs/nixos/modules/services/mail/stalwart-mail.nix b/third_party/nixpkgs/nixos/modules/services/mail/stalwart-mail.nix index 9cc919fd11..08b07b885b 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/stalwart-mail.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/stalwart-mail.nix @@ -38,6 +38,7 @@ in { store.blob.path = mkDefault "${dataDir}/data/blobs"; storage.data = mkDefault "db"; storage.fts = mkDefault "db"; + storage.lookup = mkDefault "db"; storage.blob = mkDefault "blob"; resolver.type = mkDefault "system"; resolver.public-suffix = mkDefault ["https://publicsuffix.org/list/public_suffix_list.dat"]; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix b/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix index 9079016914..f4539a90f2 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix @@ -214,8 +214,9 @@ in { RestrictRealtime = true; PrivateMounts = true; SystemCallFilter = [ - "@system-service @pkey @chown" + "@system-service @pkey" "~@privileged @resources" + "@chown" ]; SystemCallArchitectures = "native"; # AF_UNIX is required to connect to a postgres socket. diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix b/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix index e6685af562..b1d9b04242 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix @@ -9,7 +9,7 @@ let configFile = format.generate "conduit.toml" cfg.settings; in { - meta.maintainers = with maintainers; [ pstn piegames ]; + meta.maintainers = with maintainers; [ pstn ]; options.services.matrix-conduit = { enable = mkEnableOption "matrix-conduit"; @@ -102,7 +102,7 @@ in default = {}; description = '' Generates the conduit.toml configuration file. Refer to - + for details on supported values. Note that database_path can not be edited because the service's reliance on systemd StateDir. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-signal.nix b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-signal.nix new file mode 100644 index 0000000000..faca10551a --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-signal.nix @@ -0,0 +1,249 @@ +{ lib +, config +, pkgs +, ... +}: +let + cfg = config.services.mautrix-signal; + dataDir = "/var/lib/mautrix-signal"; + registrationFile = "${dataDir}/signal-registration.yaml"; + settingsFile = "${dataDir}/config.yaml"; + settingsFileUnsubstituted = settingsFormat.generate "mautrix-signal-config-unsubstituted.json" cfg.settings; + settingsFormat = pkgs.formats.json { }; + appservicePort = 29328; + + # to be used with a list of lib.mkIf values + optOneOf = lib.lists.findFirst (value: value.condition) (lib.mkIf false null); + mkDefaults = lib.mapAttrsRecursive (n: v: lib.mkDefault v); + defaultConfig = { + homeserver.address = "http://localhost:8448"; + appservice = { + hostname = "[::]"; + port = appservicePort; + database.type = "sqlite3"; + database.uri = "file:${dataDir}/mautrix-signal.db?_txlock=immediate"; + id = "signal"; + bot = { + username = "signalbot"; + displayname = "Signal Bridge Bot"; + }; + as_token = ""; + hs_token = ""; + }; + bridge = { + username_template = "signal_{{.}}"; + displayname_template = "{{or .ProfileName .PhoneNumber \"Unknown user\"}}"; + double_puppet_server_map = { }; + login_shared_secret_map = { }; + command_prefix = "!signal"; + permissions."*" = "relay"; + relay.enabled = true; + }; + logging = { + min_level = "info"; + writers = lib.singleton { + type = "stdout"; + format = "pretty-colored"; + time_format = " "; + }; + }; + }; + +in +{ + options.services.mautrix-signal = { + enable = lib.mkEnableOption "mautrix-signal, a Matrix-Signal puppeting bridge."; + + settings = lib.mkOption { + apply = lib.recursiveUpdate defaultConfig; + type = settingsFormat.type; + default = defaultConfig; + description = '' + {file}`config.yaml` configuration as a Nix attribute set. + Configuration options should match those described in + [example-config.yaml](https://github.com/mautrix/signal/blob/master/example-config.yaml). + Secret tokens should be specified using {option}`environmentFile` + instead of this world-readable attribute set. + ''; + example = { + appservice = { + database = { + type = "postgres"; + uri = "postgresql:///mautrix_signal?host=/run/postgresql"; + }; + id = "signal"; + ephemeral_events = false; + }; + bridge = { + history_sync = { + request_full_sync = true; + }; + private_chat_portal_meta = true; + mute_bridging = true; + encryption = { + allow = true; + default = true; + require = true; + }; + provisioning = { + shared_secret = "disable"; + }; + permissions = { + "example.com" = "user"; + }; + }; + }; + }; + + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + File containing environment variables to be passed to the mautrix-signal service. + If an environment variable `MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET` is set, + then its value will be used in the configuration file for the option + `login_shared_secret_map` without leaking it to the store, using the configured + `homeserver.domain` as key. + See [here](https://github.com/mautrix/signal/blob/main/example-config.yaml) + for the documentation of `login_shared_secret_map`. + ''; + }; + + serviceDependencies = lib.mkOption { + type = with lib.types; listOf str; + default = (lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit) + ++ (lib.optional config.services.matrix-conduit.enable "conduit.service"); + defaultText = lib.literalExpression '' + (optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit) + ++ (optional config.services.matrix-conduit.enable "conduit.service") + ''; + description = '' + List of systemd units to require and wait for when starting the application service. + ''; + }; + + registerToSynapse = lib.mkOption { + type = lib.types.bool; + default = config.services.matrix-synapse.enable; + defaultText = lib.literalExpression '' + config.services.matrix-synapse.enable + ''; + description = '' + Whether to add the bridge's app service registration file to + `services.matrix-synapse.settings.app_service_config_files`. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + + users.users.mautrix-signal = { + isSystemUser = true; + group = "mautrix-signal"; + home = dataDir; + description = "Mautrix-Signal bridge user"; + }; + + users.groups.mautrix-signal = { }; + + services.matrix-synapse = lib.mkIf cfg.registerToSynapse { + settings.app_service_config_files = [ registrationFile ]; + }; + systemd.services.matrix-synapse = lib.mkIf cfg.registerToSynapse { + serviceConfig.SupplementaryGroups = [ "mautrix-signal" ]; + }; + + # Note: this is defined here to avoid the docs depending on `config` + services.mautrix-signal.settings.homeserver = optOneOf (with config.services; [ + (lib.mkIf matrix-synapse.enable (mkDefaults { + domain = matrix-synapse.settings.server_name; + })) + (lib.mkIf matrix-conduit.enable (mkDefaults { + domain = matrix-conduit.settings.global.server_name; + address = "http://localhost:${toString matrix-conduit.settings.global.port}"; + })) + ]); + + systemd.services.mautrix-signal = { + description = "mautrix-signal, a Matrix-Signal puppeting bridge."; + + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ] ++ cfg.serviceDependencies; + after = [ "network-online.target" ] ++ cfg.serviceDependencies; + # ffmpeg is required for conversion of voice messages + path = [ pkgs.ffmpeg-headless ]; + + preStart = '' + # substitute the settings file by environment variables + # in this case read from EnvironmentFile + test -f '${settingsFile}' && rm -f '${settingsFile}' + old_umask=$(umask) + umask 0177 + ${pkgs.envsubst}/bin/envsubst \ + -o '${settingsFile}' \ + -i '${settingsFileUnsubstituted}' + umask $old_umask + + # generate the appservice's registration file if absent + if [ ! -f '${registrationFile}' ]; then + ${pkgs.mautrix-signal}/bin/mautrix-signal \ + --generate-registration \ + --config='${settingsFile}' \ + --registration='${registrationFile}' + fi + chmod 640 ${registrationFile} + + umask 0177 + # 1. Overwrite registration tokens in config + # 2. If environment variable MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET + # is set, set it as the login shared secret value for the configured + # homeserver domain. + ${pkgs.yq}/bin/yq -s '.[0].appservice.as_token = .[1].as_token + | .[0].appservice.hs_token = .[1].hs_token + | .[0] + | if env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET then .bridge.login_shared_secret_map.[.homeserver.domain] = env.MAUTRIX_SIGNAL_BRIDGE_LOGIN_SHARED_SECRET else . end' \ + '${settingsFile}' '${registrationFile}' > '${settingsFile}.tmp' + mv '${settingsFile}.tmp' '${settingsFile}' + umask $old_umask + ''; + + serviceConfig = { + User = "mautrix-signal"; + Group = "mautrix-signal"; + EnvironmentFile = cfg.environmentFile; + StateDirectory = baseNameOf dataDir; + WorkingDirectory = dataDir; + ExecStart = '' + ${pkgs.mautrix-signal}/bin/mautrix-signal \ + --config='${settingsFile}' \ + --registration='${registrationFile}' + ''; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + Restart = "on-failure"; + RestartSec = "30s"; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ "@system-service" ]; + Type = "simple"; + UMask = 0027; + }; + restartTriggers = [ settingsFileUnsubstituted ]; + }; + }; + meta.maintainers = with lib.maintainers; [ niklaskorz ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/bcg.nix b/third_party/nixpkgs/nixos/modules/services/misc/bcg.nix index 626a67f66d..63c441833d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/bcg.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/bcg.nix @@ -149,20 +149,20 @@ in systemd.services.bcg = let envConfig = cfg.environmentFiles != []; finalConfig = if envConfig - then "$RUNTIME_DIRECTORY/bcg.config.yaml" + then "\${RUNTIME_DIRECTORY}/bcg.config.yaml" else configFile; in { description = "BigClown Gateway"; wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ] ++ lib.optional config.services.mosquitto.enable "mosquitto.service"; after = [ "network-online.target" ]; - preStart = '' + preStart = mkIf envConfig '' umask 077 ${pkgs.envsubst}/bin/envsubst -i "${configFile}" -o "${finalConfig}" ''; serviceConfig = { EnvironmentFile = cfg.environmentFiles; - ExecStart="${cfg.package}/bin/bcg -c ${finalConfig} -v ${cfg.verbose}"; + ExecStart = "${cfg.package}/bin/bcg -c ${finalConfig} -v ${cfg.verbose}"; RuntimeDirectory = "bcg"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/devpi-server.nix b/third_party/nixpkgs/nixos/modules/services/misc/devpi-server.nix new file mode 100644 index 0000000000..0234db4bc2 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/devpi-server.nix @@ -0,0 +1,128 @@ +{ + pkgs, + lib, + config, + ... +}: +with lib; +let + cfg = config.services.devpi-server; + + secretsFileName = "devpi-secret-file"; + + stateDirName = "devpi"; + + runtimeDir = "/run/${stateDirName}"; + serverDir = "/var/lib/${stateDirName}"; +in +{ + options.services.devpi-server = { + enable = mkEnableOption "Devpi Server"; + + package = mkPackageOption pkgs "devpi-server" { }; + + primaryUrl = mkOption { + type = types.str; + description = "Url for the primary node. Required option for replica nodes."; + }; + + replica = mkOption { + type = types.bool; + default = false; + description = '' + Run node as a replica. + Requires the secretFile option and the primaryUrl to be enabled. + ''; + }; + + secretFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to a shared secret file used for synchronization, + Required for all nodes in a replica/primary setup. + ''; + }; + + host = mkOption { + type = types.str; + default = "localhost"; + description = '' + domain/ip address to listen on + ''; + }; + + port = mkOption { + type = types.port; + default = 3141; + description = "The port on which Devpi Server will listen."; + }; + + openFirewall = mkEnableOption "opening the default ports in the firewall for Devpi Server"; + }; + + config = mkIf cfg.enable { + + systemd.services.devpi-server = { + enable = true; + description = "devpi PyPI-compatible server"; + documentation = [ "https://devpi.net/docs/devpi/devpi/stable/+d/index.html" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + # Since at least devpi-server 6.10.0, devpi requires the secrets file to + # have 0600 permissions. + preStart = + '' + cp ${cfg.secretFile} ${runtimeDir}/${secretsFileName} + chmod 0600 ${runtimeDir}/*${secretsFileName} + + if [ -f ${serverDir}/.nodeinfo ]; then + # already initialized the package index, exit gracefully + exit 0 + fi + ${cfg.package}/bin/devpi-init --serverdir ${serverDir} '' + + strings.optionalString cfg.replica "--role=replica --master-url=${cfg.primaryUrl}"; + + serviceConfig = { + Restart = "always"; + ExecStart = + let + args = + [ + "--request-timeout=5" + "--serverdir=${serverDir}" + "--host=${cfg.host}" + "--port=${builtins.toString cfg.port}" + ] + ++ lib.optionals (! isNull cfg.secretFile) [ + "--secretfile=${runtimeDir}/${secretsFileName}" + ] + ++ ( + if cfg.replica then + [ + "--role=replica" + "--master-url=${cfg.primaryUrl}" + ] + else + [ "--role=master" ] + ); + in + "${cfg.package}/bin/devpi-server ${concatStringsSep " " args}"; + DynamicUser = true; + StateDirectory = stateDirName; + RuntimeDirectory = stateDirName; + PrivateDevices = true; + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "strict"; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + + meta.maintainers = [ cafkafk ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix index e76ba0efd4..a8526688b0 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix @@ -722,5 +722,5 @@ in timerConfig.OnCalendar = cfg.dump.interval; }; }; - meta.maintainers = with lib.maintainers; [ srhb ma27 thehedgeh0g ]; + meta.maintainers = with lib.maintainers; [ srhb ma27 pyrox0 ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix index 43568f29dd..7b96a182f0 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -18,6 +18,8 @@ let gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket"; pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url; + gitlabVersionAtLeast = version: lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) version; + databaseConfig = let val = { adapter = "postgresql"; @@ -27,10 +29,16 @@ let encoding = "utf8"; pool = cfg.databasePool; } // cfg.extraDatabaseConfig; - in if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then { - production.main = val; - } else { - production = val; + in { + production = ( + if (gitlabVersionAtLeast "15.0") + then { main = val; } + else val + ) // lib.optionalAttrs (gitlabVersionAtLeast "15.9") { + ci = val // { + database_tasks = false; + }; + }; }; # We only want to create a database if we're actually going to connect to it. @@ -1168,7 +1176,7 @@ in { set -eu PSQL() { - psql --port=${toString pgsql.port} "$@" + psql --port=${toString pgsql.settings.port} "$@" } PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"' @@ -1348,7 +1356,7 @@ in { rm -f '${cfg.statePath}/config/database.yml' - ${if cfg.databasePasswordFile != null then '' + ${lib.optionalString (cfg.databasePasswordFile != null) '' db_password="$(<'${cfg.databasePasswordFile}')" export db_password @@ -1356,16 +1364,24 @@ in { >&2 echo "Database password was an empty string!" exit 1 fi + ''} - jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \ - '.${if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then "production.main" else "production"}.password = $ENV.db_password' \ - >'${cfg.statePath}/config/database.yml' - '' - else '' - jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \ - >'${cfg.statePath}/config/database.yml' - '' - } + # GitLab expects the `production.main` section to be the first entry in the file. + jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} '{ + production: [ + ${lib.optionalString (cfg.databasePasswordFile != null) ( + builtins.concatStringsSep "\n " ( + [ ".production${lib.optionalString (gitlabVersionAtLeast "15.0") ".main"}.password = $ENV.db_password" ] + ++ lib.optional (gitlabVersionAtLeast "15.9") "| .production.ci.password = $ENV.db_password" + ++ [ "|" ] + ) + )} .production + | to_entries[] + ] + | sort_by(.key) + | reverse + | from_entries + }' >'${cfg.statePath}/config/database.yml' ${utils.genJqSecretsReplacementSnippet gitlabConfig diff --git a/third_party/nixpkgs/nixos/modules/services/misc/heisenbridge.nix b/third_party/nixpkgs/nixos/modules/services/misc/heisenbridge.nix index de109e7266..54c298f1b5 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/heisenbridge.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/heisenbridge.nix @@ -210,5 +210,5 @@ in }; }; - meta.maintainers = [ lib.maintainers.piegames ]; + meta.maintainers = [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/portunus.nix b/third_party/nixpkgs/nixos/modules/services/misc/portunus.nix index ab78479c96..bdb35da788 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/portunus.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/portunus.nix @@ -231,12 +231,14 @@ in }; systemd.services = { - dex.serviceConfig = mkIf cfg.dex.enable { - # `dex.service` is super locked down out of the box, but we need some - # place to write the SQLite database. This creates $STATE_DIRECTORY below - # /var/lib/private because DynamicUser=true, but it gets symlinked into - # /var/lib/dex inside the unit - StateDirectory = "dex"; + dex = mkIf cfg.dex.enable { + serviceConfig = { + # `dex.service` is super locked down out of the box, but we need some + # place to write the SQLite database. This creates $STATE_DIRECTORY below + # /var/lib/private because DynamicUser=true, but it gets symlinked into + # /var/lib/dex inside the unit + StateDirectory = "dex"; + }; }; portunus = { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/private-gpt.nix b/third_party/nixpkgs/nixos/modules/services/misc/private-gpt.nix new file mode 100644 index 0000000000..9a3e5317cd --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/private-gpt.nix @@ -0,0 +1,121 @@ +{ config +, lib +, pkgs +, ... +}: +let + inherit (lib) types; + + format = pkgs.formats.yaml { }; + cfg = config.services.private-gpt; +in +{ + options = { + services.private-gpt = { + enable = lib.mkEnableOption "private-gpt for local large language models"; + package = lib.mkPackageOption pkgs "private-gpt" { }; + + stateDir = lib.mkOption { + type = types.path; + default = "/var/lib/private-gpt"; + description = "State directory of private-gpt."; + }; + + settings = lib.mkOption { + type = format.type; + default = { + llm = { + mode = "ollama"; + tokenizer = ""; + }; + embedding = { + mode = "ollama"; + }; + ollama = { + llm_model = "llama3"; + embedding_model = "nomic-embed-text"; + api_base = "http://localhost:11434"; + embedding_api_base = "http://localhost:11434"; + keep_alive = "5m"; + tfs_z = 1; + top_k = 40; + top_p = 0.9; + repeat_last_n = 64; + repeat_penalty = 1.2; + request_timeout = 120; + }; + vectorstore = { + database = "qdrant"; + }; + qdrant = { + path = "/var/lib/private-gpt/vectorstore/qdrant"; + }; + data = { + local_data_folder = "/var/lib/private-gpt"; + }; + openai = { }; + azopenai = { }; + }; + description = '' + settings-local.yaml for private-gpt + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.private-gpt = { + description = "Interact with your documents using the power of GPT, 100% privately, no data leaks"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + preStart = + let + config = format.generate "settings-local.yaml" (cfg.settings // { server.env_name = "local"; }); + in + '' + mkdir -p ${cfg.stateDir}/{settings,huggingface,matplotlib,tiktoken_cache} + cp ${cfg.package.cl100k_base.tiktoken} ${cfg.stateDir}/tiktoken_cache/9b5ad71b2ce5302211f9c61530b329a4922fc6a4 + cp ${pkgs.python3Packages.private-gpt}/${pkgs.python3.sitePackages}/private_gpt/settings.yaml ${cfg.stateDir}/settings/settings.yaml + cp "${config}" "${cfg.stateDir}/settings/settings-local.yaml" + chmod 600 "${cfg.stateDir}/settings/settings-local.yaml" + ''; + + environment = { + PGPT_PROFILES = "local"; + PGPT_SETTINGS_FOLDER = "${cfg.stateDir}/settings"; + HF_HOME = "${cfg.stateDir}/huggingface"; + TRANSFORMERS_OFFLINE = "1"; + HF_DATASETS_OFFLINE = "1"; + MPLCONFIGDIR = "${cfg.stateDir}/matplotlib"; + }; + + serviceConfig = { + ExecStart = lib.getExe cfg.package; + WorkingDirectory = cfg.stateDir; + StateDirectory = "private-gpt"; + RuntimeDirectory = "private-gpt"; + RuntimeDirectoryMode = "0755"; + PrivateTmp = true; + DynamicUser = true; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateUsers = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProcSubset = "pid"; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + UMask = "0077"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ drupol ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/tzupdate.nix b/third_party/nixpkgs/nixos/modules/services/misc/tzupdate.nix index eac1e1112a..be63bb179e 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/tzupdate.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/tzupdate.nix @@ -41,5 +41,5 @@ in { }; }; - meta.maintainers = [ maintainers.michaelpj ]; + meta.maintainers = [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/wastebin.nix b/third_party/nixpkgs/nixos/modules/services/misc/wastebin.nix index 3d0af28626..f24bf94fa5 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/wastebin.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/wastebin.nix @@ -10,7 +10,7 @@ in options.services.wastebin = { - enable = mkEnableOption "Wastenbin pastebin service"; + enable = mkEnableOption "Wastebin, a pastebin service"; package = mkPackageOption pkgs "wastebin" { }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix b/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix index 84c3a6710c..d09cd87feb 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix @@ -350,7 +350,7 @@ in { RestartSec = "10s"; CacheDirectory = dirs cacheDirs; RuntimeDirectory = dirName; - ReadWriteDirectories = lib.mkIf useCustomDir [ cfg.storageDir ]; + ReadWritePaths = lib.mkIf useCustomDir [ cfg.storageDir ]; StateDirectory = dirs (lib.optionals (!useCustomDir) libDirs); LogsDirectory = dirName; PrivateTmp = true; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/arbtt.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/arbtt.nix index 6dad6bdec3..cf9a236c07 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/arbtt.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/arbtt.nix @@ -45,5 +45,5 @@ in { }; }; - meta.maintainers = [ maintainers.michaelpj ]; + meta.maintainers = [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix index 9191a4a697..a14ade59c2 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix @@ -301,7 +301,7 @@ in description = '' The addresses to send outgoing mail to. ''; - apply = x: if x == [] then null else lib.concatStringsSep "," x; + apply = x: if x == [] || x == null then null else lib.concatStringsSep "," x; }; }; @@ -438,7 +438,7 @@ in ]; dashboards.settings.providers = lib.mkIf cfg.provision.grafana.dashboard [{ name = "parsedmarc"; - options.path = "${pkgs.python3Packages.parsedmarc.dashboard}"; + options.path = "${pkgs.parsedmarc.dashboard}"; }]; }; }; @@ -446,7 +446,7 @@ in services.parsedmarc.settings = lib.mkMerge [ (lib.mkIf cfg.provision.elasticsearch { elasticsearch = { - hosts = [ "localhost:9200" ]; + hosts = [ "http://localhost:9200" ]; ssl = false; }; }) @@ -530,7 +530,7 @@ in MemoryDenyWriteExecute = true; LockPersonality = true; SystemCallArchitectures = "native"; - ExecStart = "${pkgs.python3Packages.parsedmarc}/bin/parsedmarc -c /run/parsedmarc/parsedmarc.ini"; + ExecStart = "${lib.getExe pkgs.parsedmarc} -c /run/parsedmarc/parsedmarc.ini"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/apcupsd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/apcupsd.nix index 33a28ba132..f188fe1f68 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/apcupsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/apcupsd.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.apcupsd; + inherit (lib) mkOption types concatStringsSep; in { port = 9162; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/artifactory.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/artifactory.nix index 306726f47e..e98982c0dd 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/artifactory.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/artifactory.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.artifactory; + inherit (lib) mkOption types concatStringsSep; in { port = 9531; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bind.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bind.nix index 0f3a13900a..1c7dcf8b1e 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bind.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bind.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.bind; + inherit (lib) mkOption types concatStringsSep; in { port = 9119; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bird.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bird.nix index a020cd3d54..5d91eeed10 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bird.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bird.nix @@ -1,9 +1,13 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.bird; + inherit (lib) + mkOption + types + concatStringsSep + singleton + ; in { port = 9324; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix index b2bea158b0..e1b7dc91a0 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix @@ -1,13 +1,14 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.bitcoin; + inherit (lib) mkOption types concatStringsSep; in { port = 9332; extraOpts = { + package = lib.mkPackageOption pkgs "prometheus-bitcoin-exporter" { }; + rpcUser = mkOption { type = types.str; default = "bitcoinrpc"; @@ -66,7 +67,7 @@ in serviceOpts = { script = '' export BITCOIN_RPC_PASSWORD=$(cat ${cfg.rpcPasswordFile}) - exec ${pkgs.prometheus-bitcoin-exporter}/bin/bitcoind-monitor.py + exec ${cfg.package}/bin/bitcoind-monitor.py ''; environment = { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix index 80d0cfcc5e..33a1fdc528 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix @@ -1,10 +1,14 @@ { config, lib, pkgs, options, ... }: -with lib; - let logPrefix = "services.prometheus.exporter.blackbox"; cfg = config.services.prometheus.exporters.blackbox; + inherit (lib) + mkOption + types + concatStringsSep + escapeShellArg + ; # This ensures that we can deal with string paths, path types and # store-path strings with context. diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix index ff1ee6a517..0af1e33b2c 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix @@ -1,9 +1,14 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.buildkite-agent; + inherit (lib) + mkOption + types + concatStringsSep + optionalString + literalExpression + ; in { port = 9876; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix index 339eb8c3f5..6f4c936fd4 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -1,9 +1,15 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.collectd; + inherit (lib) + mkOption + mkEnableOption + types + optionalString + concatStringsSep + escapeShellArg + ; in { port = 9103; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix index 0f240cb30b..3674fab1e4 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.dmarc; + inherit (lib) mkOption types optionalString; json = builtins.toJSON { inherit (cfg) folders port; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix index f7ff2665f3..ba438ea74a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix @@ -1,9 +1,13 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.dnsmasq; + inherit (lib) + mkOption + types + concatStringsSep + escapeShellArg + ; in { port = 9153; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/domain.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/domain.nix index b2c8e6664c..c271a040d2 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/domain.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/domain.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.domain; + inherit (lib) concatStringsSep; in { port = 9222; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix index ca02f73729..f11e91fd76 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix @@ -1,9 +1,13 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.dovecot; + inherit (lib) + mkOption + types + escapeShellArg + concatStringsSep + ; in { port = 9166; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix index a9e2446d01..7719215952 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/flow.nix @@ -1,9 +1,14 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.flow; + inherit (lib) + mkOption + types + literalExpression + concatStringsSep + optionalString + ; in { port = 9590; extraOpts = { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix index fe1d183457..29470147c1 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.fritzbox; + inherit (lib) mkOption types concatStringsSep; in { port = 9133; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/idrac.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/idrac.nix index 3d1123e18a..54696187fe 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/idrac.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/idrac.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; let cfg = config.services.prometheus.exporters.idrac; + inherit (lib) mkOption types; configFile = if cfg.configurationPath != null then cfg.configurationPath diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix index c1e2a458f9..92d02a3f14 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.imap-mailstat; valueToString = value: @@ -13,6 +11,15 @@ let else "XXX ${toString value}" ) ); + inherit (lib) + mkOption + types + concatStrings + concatStringsSep + attrValues + mapAttrs + optionalString + ; createConfigFile = accounts: # unfortunately on toTOML yet # https://github.com/NixOS/nix/issues/3929 diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/influxdb.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/influxdb.nix index 9ac0c35bf8..3a5680439d 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/influxdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/influxdb.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.influxdb; + inherit (lib) mkOption types concatStringsSep; in { port = 9122; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix index a51c09d508..51db605908 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix @@ -1,10 +1,15 @@ { config, lib, pkgs, options, ... }: -with lib; - let logPrefix = "services.prometheus.exporter.ipmi"; cfg = config.services.prometheus.exporters.ipmi; + inherit (lib) + mkOption + types + concatStringsSep + optionals + escapeShellArg + ; in { port = 9290; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/jitsi.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/jitsi.nix index f6c2d9172f..6a6c003c19 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/jitsi.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/jitsi.nix @@ -1,9 +1,13 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.jitsi; + inherit (lib) + mkOption + types + escapeShellArg + concatStringsSep + ; in { port = 9700; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/json.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/json.nix index 1e4632f931..1c8db0ea3e 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/json.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/json.nix @@ -1,9 +1,14 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.json; + inherit (lib) + mkOption + types + escapeShellArg + concatStringsSep + mkRemovedOptionModule + ; in { port = 7979; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/junos-czerwonk.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/junos-czerwonk.nix index 75b8bb6504..3519cce6e8 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/junos-czerwonk.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/junos-czerwonk.nix @@ -1,9 +1,14 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.junos-czerwonk; + inherit (lib) + mkOption + types + escapeShellArg + mkIf + concatStringsSep + ; configFile = if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configurationFile); diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix index 88dc284a8c..d0f2eb6b8a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @@ -5,10 +5,14 @@ , ... }: -with lib; - let cfg = config.services.prometheus.exporters.kea; + inherit (lib) + mkOption + types + mkRenamedOptionModule + literalExpression + ; in { imports = [ (mkRenamedOptionModule [ "controlSocketPaths" ] [ "targets" ]) diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/keylight.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/keylight.nix index afdb664a0d..44169cce67 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/keylight.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/keylight.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.keylight; + inherit (lib) concatStringsSep; in { port = 9288; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix index 79d952dfb1..ed902fc27c 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix @@ -1,9 +1,13 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.knot; + inherit (lib) + mkOption + types + literalExpression + concatStringsSep + ; in { port = 9433; extraOpts = { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/lnd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/lnd.nix index cc8db6e1b4..edface276f 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/lnd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/lnd.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.lnd; + inherit (lib) mkOption types concatStringsSep; in { port = 9092; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix index 7ace5c1968..f6dd6f7eb9 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix @@ -1,9 +1,19 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.mail; + inherit (lib) + mkOption + types + mapAttrs' + nameValuePair + toLower + filterAttrs + escapeShellArg + literalExpression + mkIf + concatStringsSep + ; configFile = if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configFile); diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix index 9e0a98f0ba..cd438f13ed 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix @@ -1,9 +1,14 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.mikrotik; + inherit (lib) + mkOption + types + literalExpression + concatStringsSep + escapeShellArg + ; in { port = 9436; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/minio.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/minio.nix index e1edd364c8..8faff5908b 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/minio.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/minio.nix @@ -1,9 +1,14 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.minio; + inherit (lib) + mkOption + types + optionalString + concatStringsSep + escapeShellArg + ; in { port = 9290; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/modemmanager.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/modemmanager.nix index 37a2daebd9..37ff49b270 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/modemmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/modemmanager.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.modemmanager; + inherit (lib) mkOption types concatStringsSep; in { port = 9539; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mongodb.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mongodb.nix index 10d533a2bb..288434e93a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mongodb.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mongodb.nix @@ -1,9 +1,17 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.mongodb; + inherit (lib) + mkOption + types + optionalString + getExe + length + concatStringsSep + concatMapStringsSep + escapeShellArgs + ; in { port = 9216; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nats.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nats.nix index 83e60426f5..224ce474d5 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nats.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nats.nix @@ -1,11 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let - cfg = config.services.prometheus.exporters.nats; - + inherit (lib) mkOption types concatStringsSep; in { port = 7777; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix index f22c5e2e5c..d221bac842 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix @@ -1,9 +1,13 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.nextcloud; + inherit (lib) + mkOption + types + escapeShellArg + concatStringsSep + ; in { port = 9205; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix index d4939c7063..091ad2291d 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix @@ -1,9 +1,16 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.nginx; + inherit (lib) + mkOption + types + mkMerge + mkRemovedOptionModule + mkRenamedOptionModule + mkIf + concatStringsSep + ; in { port = 9113; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix index ebb13a8c3e..2b4fd12895 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.nginxlog; + inherit (lib) mkOption types; in { port = 9117; extraOpts = { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix index 8615bd0495..9d6b51ad14 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -1,9 +1,15 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.node; + inherit (lib) + mkOption + types + concatStringsSep + concatMapStringsSep + any + optionals + ; collectorIsEnabled = final: any (collector: (final == collector)) cfg.enabledCollectors; collectorIsDisabled = final: any (collector: (final == collector)) cfg.disabledCollectors; in diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nut.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nut.nix index e88059cea4..157bdadddf 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nut.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nut.nix @@ -1,9 +1,13 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.nut; + inherit (lib) + mkOption + types + optionalString + concatStringsSep + ; in { port = 9199; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/openldap.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/openldap.nix index 9c1b39bb3a..bb65bd2709 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/openldap.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/openldap.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.services.prometheus.exporters.openldap; + inherit (lib) mkOption types concatStringsSep; in { port = 9330; extraOpts = { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix index 725a5679e2..71b6026386 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix @@ -1,9 +1,14 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.pgbouncer; + inherit (lib) + mkOption + types + optionals + escapeShellArg + concatStringsSep + ; in { port = 9127; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix index 926626b5e7..30b260dc37 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix @@ -1,9 +1,13 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.pihole; + inherit (lib) + mkOption + types + mkRemovedOptionModule + optionalString + ; in { imports = [ diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ping.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ping.nix index a47db4c16f..9122a6be66 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ping.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ping.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, options, ... }: -with lib; let cfg = config.services.prometheus.exporters.ping; + inherit (lib) mkOption types concatStringsSep; settingsFormat = pkgs.formats.yaml {}; configFile = settingsFormat.generate "config.yml" cfg.settings; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix index 188a5f9a1a..7aa3622f16 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix @@ -1,9 +1,15 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.postfix; + inherit (lib) + mkOption + types + mkIf + escapeShellArg + concatStringsSep + optional + ; in { port = 9154; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix index 7ed71ff9e1..bf39238266 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix @@ -1,9 +1,14 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.postgres; + inherit (lib) + mkOption + types + mkIf + mkForce + concatStringsSep + ; in { port = 9187; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/process.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/process.nix index b041a957b6..8e5eceee06 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/process.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/process.nix @@ -1,9 +1,13 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.process; + inherit (lib) + mkOption + types + literalExpression + concatStringsSep + ; configFile = pkgs.writeText "process-exporter.yaml" (builtins.toJSON cfg.settings); in { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pve.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pve.nix index 96db49d959..8928577b69 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pve.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pve.nix @@ -1,8 +1,14 @@ { config, lib, pkgs, options, ... }: -with lib; let cfg = config.services.prometheus.exporters.pve; + inherit (lib) + mkOption + types + mkPackageOption + optionalString + optionalAttrs + ; # pve exporter requires a config file so create an empty one if configFile is not provided emptyConfigFile = pkgs.writeTextFile { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix index 66a8423f8f..d788ce363d 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.py-air-control; + inherit (lib) mkOption types; workingDir = "/var/lib/${cfg.stateDir}"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/redis.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/redis.nix index ee7d87e8e6..672e3dfe7b 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/redis.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/redis.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.redis; + inherit (lib) concatStringsSep; in { port = 9121; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/restic.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/restic.nix index aaf3c189a4..ef44803ba0 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/restic.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/restic.nix @@ -1,9 +1,18 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.restic; + inherit (lib) + mkOption + types + concatStringsSep + mkIf + mapAttrs' + splitString + toUpper + optionalAttrs + nameValuePair + ; in { port = 9753; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix index ee8047fb45..8993aee5d2 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix @@ -1,9 +1,16 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.rspamd; + inherit (lib) + mkOption + types + replaceStrings + mkRemovedOptionModule + recursiveUpdate + concatStringsSep + literalExpression + ; mkFile = conf: pkgs.writeText "rspamd-exporter-config.yml" (builtins.toJSON conf); diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/script.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/script.nix index 5fe8512f55..0967ce236a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/script.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/script.nix @@ -1,9 +1,13 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.script; + inherit (lib) + mkOption + types + literalExpression + concatStringsSep + ; configFile = pkgs.writeText "script-exporter.yaml" (builtins.toJSON cfg.settings); in { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/shelly.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/shelly.nix index 5b3cf10b65..be3e483c6e 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/shelly.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/shelly.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.shelly; + inherit (lib) mkOption types; in { port = 9784; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix index 84658c48c7..8aadd87abb 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.smartctl; + inherit (lib) mkOption types literalExpression; args = lib.escapeShellArgs ([ "--web.listen-address=${cfg.listenAddress}:${toString cfg.port}" "--smartctl.path=${pkgs.smartmontools}/bin/smartctl" diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smokeping.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smokeping.nix index 79ed5129dd..c3baed1503 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smokeping.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smokeping.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.smokeping; + inherit (lib) mkOption types concatStringsSep; goDuration = types.mkOptionType { name = "goDuration"; description = "Go duration (https://golang.org/pkg/time/#ParseDuration)"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix index 19ab31d735..dc10a9a2f9 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix @@ -1,10 +1,15 @@ { config, lib, pkgs, options, ... }: -with lib; - let logPrefix = "services.prometheus.exporters.snmp"; cfg = config.services.prometheus.exporters.snmp; + inherit (lib) + mkOption + types + literalExpression + escapeShellArg + concatStringsSep + ; # This ensures that we can deal with string paths, path types and # store-path strings with context. diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/sql.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/sql.nix index 4c4d8f8803..59715f5d33 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/sql.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/sql.nix @@ -1,7 +1,13 @@ { config, lib, pkgs, options, ... }: -with lib; let cfg = config.services.prometheus.exporters.sql; + inherit (lib) + mkOption + types + mapAttrs + mapAttrsToList + concatStringsSep + ; cfgOptions = { options = with types; { jobs = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/statsd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/statsd.nix index 94df86167e..b1bc65c9a4 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/statsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/statsd.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.statsd; + inherit (lib) concatStringsSep; in { port = 9102; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix index 0e16d27b9d..d848e263a3 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.surfboard; + inherit (lib) mkOption types concatStringsSep; in { port = 9239; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix index 2edd1de83e..52bad81ed7 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix @@ -1,9 +1,8 @@ { config, pkgs, lib, ... }: -with lib; - -let cfg = config.services.prometheus.exporters.systemd; - +let + cfg = config.services.prometheus.exporters.systemd; + inherit (lib) concatStringsSep; in { port = 9558; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/tor.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/tor.nix index 48406def98..d39112d0c2 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/tor.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/tor.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.tor; + inherit (lib) mkOption types concatStringsSep; in { port = 9130; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix index 0452f630c2..df6011e243 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix @@ -5,10 +5,17 @@ , ... }: -with lib; - let cfg = config.services.prometheus.exporters.unbound; + inherit (lib) + mkOption + types + mkRemovedOptionModule + optionalAttrs + optionalString + mkMerge + mkIf + ; in { imports = [ diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix index 82309febf6..07d177251f 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix @@ -1,9 +1,14 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.unifi; + inherit (lib) + mkOption + types + escapeShellArg + optionalString + concatStringsSep + ; in { port = 9130; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix index 0ea824fbf1..7b9ba4c5d1 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.unpoller; + inherit (lib) mkEnableOption generators; configFile = pkgs.writeText "prometheus-unpoller-exporter.json" (generators.toJSON {} { poller = { inherit (cfg.log) debug quiet; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix index 1582554c12..4fda15c9ee 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.v2ray; + inherit (lib) mkOption types concatStringsSep; in { port = 9299; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix index 811792674b..e94c513ae8 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix @@ -1,9 +1,15 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.varnish; + inherit (lib) + mkOption + types + mkDefault + optional + escapeShellArg + concatStringsSep + ; in { port = 9131; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix index 27c0c191c6..7a48c83642 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix @@ -1,9 +1,15 @@ { config, lib, pkgs, options, ... }: -with lib; - let cfg = config.services.prometheus.exporters.wireguard; + inherit (lib) + mkOption + types + mkRenamedOptionModule + mkEnableOption + optionalString + escapeShellArg + ; in { port = 9586; imports = [ diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/zfs.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/zfs.nix index ce9cd624dc..a685b94b82 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/zfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/zfs.nix @@ -1,9 +1,14 @@ { config, lib, pkgs, options, ... }: -with lib; let cfg = config.services.prometheus.exporters.zfs; + inherit (lib) + mkOption + types + concatStringsSep + concatMapStringsSep + ; in { port = 9134; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/rustdesk-server.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/rustdesk-server.nix index fcfd57167d..21e6128c72 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/rustdesk-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/rustdesk-server.nix @@ -53,15 +53,14 @@ in { Slice = "system-rustdesk.slice"; User = "rustdesk"; Group = "rustdesk"; + DynamicUser = "yes"; Environment = []; WorkingDirectory = "/var/lib/rustdesk"; StateDirectory = "rustdesk"; StateDirectoryMode = "0750"; LockPersonality = true; - NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; - PrivateTmp = true; PrivateUsers = true; ProtectClock = true; ProtectControlGroups = true; @@ -71,10 +70,7 @@ in { ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - ProtectSystem = "strict"; - RemoveIPC = true; RestrictNamespaces = true; - RestrictSUIDSGID = true; }; }; in lib.mkIf cfg.enable { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/vmagent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/vmagent.nix index cdcf157115..4838e0709d 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/vmagent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/vmagent.nix @@ -1,63 +1,62 @@ { config, pkgs, lib, ... }: -with lib; + let cfg = config.services.vmagent; settingsFormat = pkgs.formats.json { }; in { + imports = [ + (lib.mkRemovedOptionModule [ "services" "vmagent" "dataDir" ] "dataDir has been deprecated in favor of systemd provided CacheDirectory") + (lib.mkRemovedOptionModule [ "services" "vmagent" "user" ] "user has been deprecated in favor of systemd DynamicUser") + (lib.mkRemovedOptionModule [ "services" "vmagent" "group" ] "group has been deprecated in favor of systemd DynamicUser") + (lib.mkRenamedOptionModule [ "services" "vmagent" "remoteWriteUrl" ] [ "services" "vmagent" "remoteWrite" "url" ]) + ]; + options.services.vmagent = { - enable = mkEnableOption "vmagent"; + enable = lib.mkEnableOption "vmagent"; - user = mkOption { - default = "vmagent"; - type = types.str; - description = '' - User account under which vmagent runs. - ''; + package = lib.mkPackageOption pkgs "vmagent" { }; + + remoteWrite = { + url = lib.mkOption { + default = null; + type = lib.types.nullOr lib.types.str; + description = '' + Endpoint for prometheus compatible remote_write + ''; + }; + basicAuthUsername = lib.mkOption { + default = null; + type = lib.types.nullOr lib.types.str; + description = '' + Basic Auth username used to connect to remote_write endpoint + ''; + }; + basicAuthPasswordFile = lib.mkOption { + default = null; + type = lib.types.nullOr lib.types.str; + description = '' + File that contains the Basic Auth password used to connect to remote_write endpoint + ''; + }; }; - group = mkOption { - type = types.str; - default = "vmagent"; - description = '' - Group under which vmagent runs. - ''; - }; - - package = mkPackageOption pkgs "vmagent" { }; - - dataDir = mkOption { - type = types.str; - default = "/var/lib/vmagent"; - description = '' - The directory where vmagent stores its data files. - ''; - }; - - remoteWriteUrl = mkOption { - default = "http://localhost:8428/api/v1/write"; - type = types.str; - description = '' - The storage endpoint such as VictoriaMetrics - ''; - }; - - prometheusConfig = mkOption { + prometheusConfig = lib.mkOption { type = lib.types.submodule { freeformType = settingsFormat.type; }; description = '' Config for prometheus style metrics ''; }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to open the firewall for the default ports. ''; }; - extraArgs = mkOption { - type = types.listOf types.str; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = '' Extra args to pass to `vmagent`. See the docs: @@ -67,37 +66,36 @@ in { }; }; - config = mkIf cfg.enable { - users.groups = mkIf (cfg.group == "vmagent") { vmagent = { }; }; - - users.users = mkIf (cfg.user == "vmagent") { - vmagent = { - group = cfg.group; - description = "vmagent daemon user"; - home = cfg.dataDir; - isSystemUser = true; - }; - }; - - networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ 8429 ]; + config = lib.mkIf cfg.enable { + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ 8429 ]; systemd.services.vmagent = let prometheusConfig = settingsFormat.generate "prometheusConfig.yaml" cfg.prometheusConfig; + startCommandLine = lib.concatStringsSep " " ([ + "${cfg.package}/bin/vmagent" + "-promscrape.config=${prometheusConfig}" + ] ++ cfg.extraArgs + ++ lib.optionals (cfg.remoteWrite.url != null) [ + "-remoteWrite.url=${cfg.remoteWrite.url}" + "-remoteWrite.tmpDataPath=%C/vmagent/remote_write_tmp" + ] ++ lib.optional (cfg.remoteWrite.basicAuthUsername != null) "-remoteWrite.basicAuth.username=${cfg.remoteWrite.basicAuthUsername}" + ++ lib.optional (cfg.remoteWrite.basicAuthPasswordFile != null) "-remoteWrite.basicAuth.passwordFile=\${CREDENTIALS_DIRECTORY}/remote_write_basic_auth_password"); in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; description = "vmagent system service"; serviceConfig = { - User = cfg.user; - Group = cfg.group; + DynamicUser = true; + User = "vmagent"; + Group = "vmagent"; Type = "simple"; Restart = "on-failure"; - WorkingDirectory = cfg.dataDir; - ExecStart = "${cfg.package}/bin/vmagent -remoteWrite.url=${cfg.remoteWriteUrl} -promscrape.config=${prometheusConfig} ${escapeShellArgs cfg.extraArgs}"; + CacheDirectory = "vmagent"; + ExecStart = startCommandLine; + LoadCredential = lib.optional (cfg.remoteWrite.basicAuthPasswordFile != null) [ + "remote_write_basic_auth_password:${cfg.remoteWrite.basicAuthPasswordFile}" + ]; }; }; - - systemd.tmpfiles.rules = - [ "d '${cfg.dataDir}' 0755 ${cfg.user} ${cfg.group} -" ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix b/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix index 6958bcccf5..df9927351e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.adguardhome; + settingsFormat = pkgs.formats.yaml { }; args = concatStringsSep " " ([ "--no-check-update" @@ -12,27 +13,33 @@ let "--config /var/lib/AdGuardHome/AdGuardHome.yaml" ] ++ cfg.extraArgs); - configFile = pkgs.writeTextFile { - name = "AdGuardHome.yaml"; - text = builtins.toJSON cfg.settings; - checkPhase = "${pkgs.adguardhome}/bin/adguardhome -c $out --check-config"; - }; - defaultBindPort = 3000; - -in -{ - - imports = - let cfgPath = [ "services" "adguardhome" ]; - in - [ - (mkRenamedOptionModuleWith { sinceRelease = 2211; from = cfgPath ++ [ "host" ]; to = cfgPath ++ [ "settings" "bind_host" ]; }) - (mkRenamedOptionModuleWith { sinceRelease = 2211; from = cfgPath ++ [ "port" ]; to = cfgPath ++ [ "settings" "bind_port" ]; }) - ]; + settings = if (cfg.settings != null) then + cfg.settings // (if cfg.settings.schema_version < 23 then { + bind_host = cfg.host; + bind_port = cfg.port; + } else { + http.address = "${cfg.host}:${toString cfg.port}"; + }) + else + null; + configFile = + (settingsFormat.generate "AdGuardHome.yaml" settings).overrideAttrs (_: { + checkPhase = "${cfg.package}/bin/adguardhome -c $out --check-config"; + }); +in { options.services.adguardhome = with types; { enable = mkEnableOption "AdGuard Home network-wide ad blocker"; + package = mkOption { + type = package; + default = pkgs.adguardhome; + defaultText = literalExpression "pkgs.adguardhome"; + description = '' + The package that runs adguardhome. + ''; + }; + openFirewall = mkOption { default = false; type = bool; @@ -43,8 +50,8 @@ in }; allowDHCP = mkOption { - default = cfg.settings.dhcp.enabled or false; - defaultText = literalExpression ''config.services.adguardhome.settings.dhcp.enabled or false''; + default = settings.dhcp.enabled or false; + defaultText = literalExpression "config.services.adguardhome.settings.dhcp.enabled or false"; type = bool; description = '' Allows AdGuard Home to open raw sockets (`CAP_NET_RAW`), which is @@ -65,32 +72,34 @@ in ''; }; + host = mkOption { + default = "0.0.0.0"; + type = str; + description = '' + Host address to bind HTTP server to. + ''; + }; + + port = mkOption { + default = 3000; + type = port; + description = '' + Port to serve HTTP pages on. + ''; + }; + settings = mkOption { default = null; type = nullOr (submodule { - freeformType = (pkgs.formats.yaml { }).type; + freeformType = settingsFormat.type; options = { schema_version = mkOption { - default = pkgs.adguardhome.schema_version; - defaultText = literalExpression "pkgs.adguardhome.schema_version"; + default = cfg.package.schema_version; + defaultText = literalExpression "cfg.package.schema_version"; type = int; description = '' Schema version for the configuration. - Defaults to the `schema_version` supplied by `pkgs.adguardhome`. - ''; - }; - bind_host = mkOption { - default = "0.0.0.0"; - type = str; - description = '' - Host address to bind HTTP server to. - ''; - }; - bind_port = mkOption { - default = defaultBindPort; - type = port; - description = '' - Port to serve HTTP pages on. + Defaults to the `schema_version` supplied by `cfg.package`. ''; }; }; @@ -107,7 +116,7 @@ in Set this to `null` (default) for a non-declarative configuration without any Nix-supplied values. - Declarative configurations are supplied with a default `schema_version`, `bind_host`, and `bind_port`. + Declarative configurations are supplied with a default `schema_version`, and `http.address`. ::: ''; }; @@ -124,17 +133,25 @@ in config = mkIf cfg.enable { assertions = [ { - assertion = cfg.settings != null -> cfg.mutableSettings - || (hasAttrByPath [ "dns" "bind_host" ] cfg.settings) - || (hasAttrByPath [ "dns" "bind_hosts" ] cfg.settings); - message = - "AdGuard setting dns.bind_host or dns.bind_hosts needs to be configured for a minimal working configuration"; + assertion = cfg.settings != null + -> !(hasAttrByPath [ "bind_host" ] cfg.settings); + message = "AdGuard option `settings.bind_host' has been superseded by `services.adguardhome.host'"; } { - assertion = cfg.settings != null -> cfg.mutableSettings - || hasAttrByPath [ "dns" "bootstrap_dns" ] cfg.settings; - message = - "AdGuard setting dns.bootstrap_dns needs to be configured for a minimal working configuration"; + assertion = cfg.settings != null + -> !(hasAttrByPath [ "bind_port" ] cfg.settings); + message = "AdGuard option `settings.bind_host' has been superseded by `services.adguardhome.port'"; + } + { + assertion = settings != null -> cfg.mutableSettings + || hasAttrByPath [ "dns" "bootstrap_dns" ] settings; + message = "AdGuard setting dns.bootstrap_dns needs to be configured for a minimal working configuration"; + } + { + assertion = settings != null -> cfg.mutableSettings + || hasAttrByPath [ "dns" "bootstrap_dns" ] settings + && isList settings.dns.bootstrap_dns; + message = "AdGuard setting dns.bootstrap_dns needs to be a list"; } ]; @@ -147,7 +164,7 @@ in StartLimitBurst = 10; }; - preStart = optionalString (cfg.settings != null) '' + preStart = optionalString (settings != null) '' if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \ && [ "${toString cfg.mutableSettings}" = "1" ]; then # Writing directly to AdGuardHome.yaml results in empty file @@ -161,8 +178,9 @@ in serviceConfig = { DynamicUser = true; - ExecStart = "${pkgs.adguardhome}/bin/adguardhome ${args}"; - AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ] ++ optionals cfg.allowDHCP [ "CAP_NET_RAW" ]; + ExecStart = "${cfg.package}/bin/adguardhome ${args}"; + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ] + ++ optionals cfg.allowDHCP [ "CAP_NET_RAW" ]; Restart = "always"; RestartSec = 10; RuntimeDirectory = "AdGuardHome"; @@ -170,6 +188,6 @@ in }; }; - networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.bind_port or defaultBindPort ]; + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/clatd.nix b/third_party/nixpkgs/nixos/modules/services/networking/clatd.nix new file mode 100644 index 0000000000..de6cde4e97 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/clatd.nix @@ -0,0 +1,81 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.clatd; + + settingsFormat = pkgs.formats.keyValue {}; + + configFile = settingsFormat.generate "clatd.conf" cfg.settings; +in +{ + options = { + services.clatd = { + enable = mkEnableOption "clatd"; + + package = mkPackageOption pkgs "clatd" { }; + + settings = mkOption { + type = types.submodule ({ name, ... }: { + freeformType = settingsFormat.type; + }); + default = { }; + example = literalExpression '' + { + plat-prefix = "64:ff9b::/96"; + } + ''; + description = '' + Configuration of clatd. See [clatd Documentation](https://github.com/toreanderson/clatd/blob/master/README.pod#configuration). + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.clatd = { + description = "464XLAT CLAT daemon"; + documentation = [ "man:clatd(8)" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + startLimitIntervalSec = 0; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/clatd -c ${configFile}"; + + # Hardening + CapabilityBoundingSet = [ + "CAP_NET_ADMIN" + ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectProc = "invisible"; + ProtectSystem = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@network-io" + "@system-service" + "~@privileged" + "~@resources" + ]; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix b/third_party/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix index de33611384..a5ee7efc3c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix @@ -45,6 +45,18 @@ in This option only works with the nftables based firewall. ''; }; + + extraReversePathFilterRules = mkOption { + type = types.lines; + default = ""; + example = "fib daddr . mark . iif type local accept"; + description = '' + Additional nftables rules to be appended to the rpfilter-allow + chain. + + This option only works with the nftables based firewall. + ''; + }; }; }; @@ -79,6 +91,8 @@ in meta nfproto ipv4 udp sport . udp dport { 67 . 68, 68 . 67 } accept comment "DHCPv4 client/server" fib saddr . mark ${optionalString (cfg.checkReversePath != "loose") ". iif"} oif exists accept + jump rpfilter-allow + ${optionalString cfg.logReversePathDrops '' log level info prefix "rpfilter drop: " ''} @@ -86,6 +100,10 @@ in } ''} + chain rpfilter-allow { + ${cfg.extraReversePathFilterRules} + } + chain input { type filter hook input priority filter; policy drop; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix b/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix index 1bef5a1f0a..b678656f2e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix @@ -687,7 +687,7 @@ in { authentication = { mode = mkOption { default = "wpa3-sae"; - type = types.enum ["none" "wpa2-sha256" "wpa3-sae-transition" "wpa3-sae"]; + type = types.enum ["none" "wpa2-sha1" "wpa2-sha256" "wpa3-sae-transition" "wpa3-sae"]; description = '' Selects the authentication mode for this AP. @@ -695,7 +695,9 @@ in { and create an open AP. Use {option}`settings` together with this option if you want to configure the authentication manually. Any password options will still be effective, if set. - - {var}`"wpa2-sha256"`: WPA2-Personal using SHA256 (IEEE 802.11i/RSN). Passwords are set + - {var}`"wpa2-sha1"`: Not recommended. WPA2-Personal using HMAC-SHA1. Passwords are set + using {option}`wpaPassword` or preferably by {option}`wpaPasswordFile` or {option}`wpaPskFile`. + - {var}`"wpa2-sha256"`: WPA2-Personal using HMAC-SHA256 (IEEE 802.11i/RSN). Passwords are set using {option}`wpaPassword` or preferably by {option}`wpaPasswordFile` or {option}`wpaPskFile`. - {var}`"wpa3-sae-transition"`: Use WPA3-Personal (SAE) if possible, otherwise fallback to WPA2-SHA256. Only use if necessary and switch to the newer WPA3-SAE when possible. @@ -812,7 +814,7 @@ in { Warning: These entries will get put into a world-readable file in the Nix store! Using {option}`saePasswordFile` instead is recommended. - Not used when {option}`mode` is {var}`"wpa2-sha256"`. + Not used when {option}`mode` is {var}`"wpa2-sha1"` or {var}`"wpa2-sha256"`. ''; type = types.listOf (types.submodule { options = { @@ -884,7 +886,7 @@ in { parameters doesn't matter: `[|mac=][|vlanid=][|pk=][|id=]` - Not used when {option}`mode` is {var}`"wpa2-sha256"`. + Not used when {option}`mode` is {var}`"wpa2-sha1"` or {var}`"wpa2-sha256"`. ''; }; @@ -959,6 +961,9 @@ in { } // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae-transition") { wpa = 2; wpa_key_mgmt = "WPA-PSK-SHA256 SAE"; + } // optionalAttrs (bssCfg.authentication.mode == "wpa2-sha1") { + wpa = 2; + wpa_key_mgmt = "WPA-PSK"; } // optionalAttrs (bssCfg.authentication.mode == "wpa2-sha256") { wpa = 2; wpa_key_mgmt = "WPA-PSK-SHA256"; @@ -1186,8 +1191,8 @@ in { message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE in transition mode requires defining both a wpa password option and a sae password option''; } { - assertion = auth.mode == "wpa2-sha256" -> countWpaPasswordDefinitions == 1; - message = ''hostapd radio ${radio} bss ${bss}: uses WPA2-SHA256 which requires defining a wpa password option''; + assertion = (auth.mode == "wpa2-sha1" || auth.mode == "wpa2-sha256") -> countWpaPasswordDefinitions == 1; + message = ''hostapd radio ${radio} bss ${bss}: uses WPA2-PSK which requires defining a wpa password option''; } ]) radioCfg.networks)) diff --git a/third_party/nixpkgs/nixos/modules/services/networking/inadyn.nix b/third_party/nixpkgs/nixos/modules/services/networking/inadyn.nix new file mode 100644 index 0000000000..baa4302096 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/inadyn.nix @@ -0,0 +1,250 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.inadyn; + + # check if a value of an attrset is not null or an empty collection + nonEmptyValue = _: v: v != null && v != [ ] && v != { }; + + renderOption = k: v: + if builtins.elem k [ "provider" "custom" ] then + lib.concatStringsSep "\n" + (mapAttrsToList + (name: config: '' + ${k} ${name} { + ${lib.concatStringsSep "\n " (mapAttrsToList renderOption (filterAttrs nonEmptyValue config))} + }'') + v) + else if k == "include" then + "${k}(\"${v}\")" + else if k == "hostname" && builtins.isList v then + "${k} = { ${builtins.concatStringsSep ", " (map (s: "\"${s}\"") v)} }" + else if builtins.isBool v then + "${k} = ${boolToString v}" + else if builtins.isString v then + "${k} = \"${v}\"" + else + "${k} = ${toString v}"; + + configFile' = pkgs.writeText "inadyn.conf" + '' + # This file was generated by nix + # do not edit + + ${(lib.concatStringsSep "\n" (mapAttrsToList renderOption (filterAttrs nonEmptyValue cfg.settings)))} + ''; + + configFile = if (cfg.configFile != null) then cfg.configFile else configFile'; +in +{ + options.services.inadyn = with types; + let + providerOptions = + { + include = mkOption { + default = null; + description = "File to include additional settings for this provider from."; + type = nullOr path; + }; + ssl = mkOption { + default = true; + description = "Whether to use HTTPS for this DDNS provider."; + type = bool; + }; + username = mkOption { + default = null; + description = "Username for this DDNS provider."; + type = nullOr str; + }; + password = mkOption { + default = null; + description = '' + Password for this DDNS provider. + + WARNING: This will be world-readable in the nix store. + To store credentials securely, use the `include` or `configFile` options. + ''; + type = nullOr str; + }; + hostname = mkOption { + default = "*"; + example = "your.cool-domain.com"; + description = "Hostname alias(es)."; + type = either str (listOf str); + }; + }; + in + { + enable = mkEnableOption ('' + synchronise your machine's IP address with a dynamic DNS provider using inadyn + ''); + user = mkOption { + default = "inadyn"; + type = types.str; + description = '' + User account under which inadyn runs. + + ::: {.note} + If left as the default value this user will automatically be created + on system activation, otherwise you are responsible for + ensuring the user exists before the inadyn service starts. + ::: + ''; + }; + group = mkOption { + default = "inadyn"; + type = types.str; + description = '' + Group account under which inadyn runs. + + ::: {.note} + If left as the default value this user will automatically be created + on system activation, otherwise you are responsible for + ensuring the user exists before the inadyn service starts. + ::: + ''; + }; + interval = mkOption { + default = "*-*-* *:*:00"; + description = '' + How often to check the current IP. + Uses the format described in {manpage}`systemd.time(7)`"; + ''; + type = str; + }; + logLevel = lib.mkOption { + type = lib.types.enum [ "none" "err" "warning" "info" "notice" "debug" ]; + default = "notice"; + description = "Set inadyn's log level."; + }; + settings = mkOption { + default = { }; + description = "See `inadyn.conf (5)`"; + type = submodule { + freeformType = attrs; + options = { + allow-ipv6 = mkOption { + default = config.networking.enableIPv6; + defaultText = "`config.networking.enableIPv6`"; + description = "Whether to get IPv6 addresses from interfaces."; + type = bool; + }; + forced-update = mkOption { + default = 2592000; + description = "Duration (in seconds) after which an update is forced."; + type = ints.positive; + }; + provider = mkOption { + default = { }; + description = '' + Settings for DDNS providers built-in to inadyn. + + For a list of built-in providers, see `inadyn.conf (5)`. + ''; + type = attrsOf (submodule { + freeformType = attrs; + options = providerOptions; + }); + }; + custom = mkOption { + default = { }; + description = '' + Settings for custom DNS providers. + ''; + type = attrsOf (submodule { + freeformType = attrs; + options = providerOptions // { + ddns-server = mkOption { + description = "DDNS server name."; + type = str; + }; + ddns-path = mkOption { + description = '' + DDNS server path. + + See `inadnyn.conf (5)` for a list for format specifiers that can be used. + ''; + example = "/update?user=%u&password=%p&domain=%h&myip=%i"; + type = str; + }; + }; + }); + }; + }; + }; + }; + configFile = mkOption { + default = null; + description = '' + Configuration file for inadyn. + + Setting this will override all other configuration options. + + Passed to the inadyn service using LoadCredential. + ''; + type = nullOr path; + }; + }; + + config = lib.mkIf cfg.enable { + systemd = { + services.inadyn = { + description = "Update nameservers using inadyn"; + documentation = [ + "man:inadyn" + "man:inadyn.conf" + "file:${pkgs.inadyn}/share/doc/inadyn/README.md" + ]; + requires = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + startAt = cfg.interval; + serviceConfig = { + Type = "oneshot"; + ExecStart = ''${lib.getExe pkgs.inadyn} -f ${configFile} --cache-dir ''${CACHE_DIRECTORY}/inadyn -1 --foreground -l ${cfg.logLevel}''; + LoadCredential = "config:${configFile}"; + CacheDirectory = "inadyn"; + + User = cfg.user; + Group = cfg.group; + UMask = "0177"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictAddressFamilies = "AF_INET AF_INET6 AF_NETLINK"; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectSystem = "strict"; + ProtectProc = "invisible"; + ProtectHome = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = "@system-service"; + CapabilityBoundingSet = ""; + }; + }; + + timers.inadyn.timerConfig.Persistent = true; + }; + + users.users.inadyn = mkIf (cfg.user == "inadyn") { + group = cfg.group; + isSystemUser = true; + }; + + users.groups = mkIf (cfg.group == "inadyn") { + inadyn = { }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/jotta-cli.md b/third_party/nixpkgs/nixos/modules/services/networking/jotta-cli.md new file mode 100644 index 0000000000..335e5c8e38 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/jotta-cli.md @@ -0,0 +1,27 @@ +# Jottacloud Command-line Tool {#module-services-jotta-cli} + +The [Jottacloud Command-line Tool](https://docs.jottacloud.com/en/articles/1436834-jottacloud-command-line-tool) is a headless [Jottacloud](https://jottacloud.com) client. + +## Quick Start {#module-services-jotta-cli-quick-start} + +```nix +{ + services.jotta-cli.enable = true; +} +``` + +This adds `jotta-cli` to `environment.systemPackages` and starts a user service that runs `jottad` with the default options. + +## Example Configuration {#module-services-jotta-cli-example-configuration} + +```nix +services.jotta-cli = { + enable = true; + options = [ "slow" ]; + package = pkgs.jotta-cli; +}; +``` + +This uses `jotta-cli` and `jottad` from the `pkgs.jotta-cli` package and starts `jottad` in low memory mode. + +`jottad` is also added to `environment.systemPackages`, so `jottad --help` can be used to explore options. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/jotta-cli.nix b/third_party/nixpkgs/nixos/modules/services/networking/jotta-cli.nix new file mode 100644 index 0000000000..e0fa1ef332 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/jotta-cli.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.services.jotta-cli; +in { + options = { + services.jotta-cli = { + + enable = mkEnableOption "Jottacloud Command-line Tool"; + + options = mkOption { + default = [ "stdoutlog" "datadir" "%h/.jottad/" ]; + example = [ ]; + type = with types; listOf str; + description = "Command-line options passed to jottad."; + }; + + package = lib.mkPackageOption pkgs "jotta-cli" { }; + }; + }; + config = mkIf cfg.enable { + systemd.user.services.jottad = { + + description = "Jottacloud Command-line Tool daemon"; + + serviceConfig = { + Type = "notify"; + EnvironmentFile = "-%h/.config/jotta-cli/jotta-cli.env"; + ExecStart = "${lib.getExe' cfg.package "jottad"} ${concatStringsSep " " cfg.options}"; + Restart = "on-failure"; + }; + + wantedBy = [ "default.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + }; + environment.systemPackages = [ pkgs.jotta-cli ]; + }; + + meta.maintainers = with lib.maintainers; [ evenbrenden ]; + meta.doc = ./jotta-cli.md; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/knot.nix b/third_party/nixpkgs/nixos/modules/services/networking/knot.nix index 89d3ea5e96..145b4ad1dd 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/knot.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/knot.nix @@ -226,7 +226,7 @@ in { }; settings = mkOption { - type = types.submodule { freeformType = types.attrs; }; + type = (pkgs.formats.yaml {}).type; default = {}; description = '' Extra configuration as nix values. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/netbird/coturn.nix b/third_party/nixpkgs/nixos/modules/services/networking/netbird/coturn.nix index dd032abb2d..746d70a072 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/netbird/coturn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/netbird/coturn.nix @@ -148,10 +148,10 @@ in allowedUDPPorts = cfg.openPorts; allowedTCPPorts = cfg.openPorts; - allowedUDPPortRanges = [ + allowedUDPPortRanges = with config.services.coturn; [ { - from = cfg.minPort; - to = cfg.maxPort; + from = min-port; + to = max-port; } ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix index e33bbb2af1..b7143cf520 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -470,7 +470,7 @@ in - [main] - no-auto-default=* - ''' - + extraConfig.main.no-auto-default = "*"; + + settings.main.no-auto-default = "*"; }; ``` '' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pixiecore.nix b/third_party/nixpkgs/nixos/modules/services/networking/pixiecore.nix index e61d32e136..111cb7e355 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pixiecore.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pixiecore.nix @@ -6,7 +6,7 @@ let cfg = config.services.pixiecore; in { - meta.maintainers = with maintainers; [ bbigras danderson ]; + meta.maintainers = with maintainers; [ bbigras ]; options = { services.pixiecore = { @@ -82,8 +82,8 @@ in apiServer = mkOption { type = types.str; - example = "localhost:8080"; - description = "host:port to connect to the API. Ignored unless mode is set to 'api'"; + example = "http://localhost:8080"; + description = "URI to connect to the API. Ignored unless mode is set to 'api'"; }; extraArguments = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix b/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix index d937456efd..8310b119b5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix @@ -7,7 +7,7 @@ let in { meta = { - maintainers = with maintainers; [ danderson ]; + maintainers = with maintainers; [ ]; }; options = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/radvd.nix b/third_party/nixpkgs/nixos/modules/services/networking/radvd.nix index 4e3e501d2f..0143324a78 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/radvd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/radvd.nix @@ -33,6 +33,17 @@ in package = mkPackageOption pkgs "radvd" { }; + debugLevel = mkOption { + type = types.int; + default = 0; + example = 5; + description = '' + The debugging level is an integer in the range from 1 to 5, + from quiet to very verbose. A debugging level of 0 completely + turns off debugging. + ''; + }; + config = mkOption { type = types.lines; example = @@ -67,7 +78,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = - { ExecStart = "@${cfg.package}/bin/radvd radvd -n -u radvd -C ${confFile}"; + { ExecStart = "@${cfg.package}/bin/radvd radvd -n -u radvd -d ${toString cfg.debugLevel} -C ${confFile}"; Restart = "always"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix b/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix index 38d6e4452c..3fb3eac45c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix @@ -47,6 +47,13 @@ let in { + imports = [ + (mkRemovedOptionModule [ "services" "smokeping" "port" ] '' + The smokeping web service is now served by nginx. + In order to change the port, you need to change the nginx configuration under `services.nginx.virtualHosts.smokeping.listen.*.port`. + '') + ]; + options = { services.smokeping = { enable = mkEnableOption "smokeping service"; @@ -71,8 +78,8 @@ in }; cgiUrl = mkOption { type = types.str; - default = "http://${cfg.hostName}:${toString cfg.port}/smokeping.cgi"; - defaultText = literalExpression ''"http://''${hostName}:''${toString port}/smokeping.cgi"''; + default = "http://${cfg.hostName}/smokeping.cgi"; + defaultText = literalExpression ''"http://''${hostName}/smokeping.cgi"''; example = "https://somewhere.example.com/smokeping.cgi"; description = "URL to the smokeping cgi."; }; @@ -177,11 +184,6 @@ in which makes it bind to all interfaces. ''; }; - port = mkOption { - type = types.port; - default = 8081; - description = "TCP port to use for the web server."; - }; presentationConfig = mkOption { type = types.lines; default = '' @@ -312,17 +314,8 @@ in description = "smokeping daemon user"; home = smokepingHome; createHome = true; - # When `cfg.webService` is enabled, `thttpd` makes SmokePing available - # under `${cfg.host}:${cfg.port}/smokeping.fcgi` as per the `ln -s` below. - # We also want that going to `${cfg.host}:${cfg.port}` without `smokeping.fcgi` - # makes it easy for the user to find SmokePing. - # However `thttpd` does not seem to support easy redirections from `/` to `smokeping.fcgi` - # and only allows directory listings or `/` -> `index.html` resolution if the directory - # has `chmod 755` (see https://acme.com/software/thttpd/thttpd_man.html#PERMISSIONS, - # " directories should be 755 if you want to allow indexing"). - # Otherwise it shows `403 Forbidden` on `/`. - # Thus, we need to make `smokepingHome` (which is given to `thttpd -d` below) `755`. - homeMode = "755"; + # When `cfg.webService` is enabled, `nginx` requires read permissions on the home directory. + homeMode = "711"; }; users.groups.${cfg.user} = { }; systemd.services.smokeping = { @@ -342,21 +335,25 @@ in ${cfg.package}/bin/smokeping --static --config=${configPath} ''; }; - systemd.services.thttpd = mkIf cfg.webService { - requiredBy = [ "multi-user.target" ]; - requires = [ "smokeping.service" ]; - path = with pkgs; [ bash rrdtool smokeping thttpd ]; - serviceConfig = { - Restart = "always"; - ExecStart = lib.concatStringsSep " " (lib.concatLists [ - [ "${pkgs.thttpd}/bin/thttpd" ] - [ "-u ${cfg.user}" ] - [ ''-c "**.fcgi"'' ] - [ "-d ${smokepingHome}" ] - (lib.optional (cfg.host != null) "-h ${cfg.host}") - [ "-p ${builtins.toString cfg.port}" ] - [ "-D -nos" ] - ]); + + # use nginx to serve the smokeping web service + services.fcgiwrap.enable = mkIf cfg.webService true; + services.nginx = mkIf cfg.webService { + enable = true; + virtualHosts."smokeping" = { + serverName = mkDefault cfg.host; + locations."/" = { + root = smokepingHome; + index = "smokeping.fcgi"; + }; + locations."/smokeping.fcgi" = { + extraConfig = '' + include ${config.services.nginx.package}/conf/fastcgi_params; + fastcgi_pass unix:${config.services.fcgiwrap.socketAddress}; + fastcgi_param SCRIPT_FILENAME ${smokepingHome}/smokeping.fcgi; + fastcgi_param DOCUMENT_ROOT ${smokepingHome}; + ''; + }; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix index 5f2f6cb07a..0fdb708bf0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix @@ -296,6 +296,17 @@ in ''; }; + authorizedKeysInHomedir = mkOption { + type = types.bool; + default = true; + description = '' + Enables the use of the `~/.ssh/authorized_keys` file. + + Otherwise, the only files trusted by default are those in `/etc/ssh/authorized_keys.d`, + *i.e.* SSH keys from [](#opt-users.users._name_.openssh.authorizedKeys.keys). + ''; + }; + authorizedKeysCommand = mkOption { type = types.str; default = "none"; @@ -346,6 +357,7 @@ in violates the privacy of users and is not recommended. ''; }; + UsePAM = mkEnableOption "PAM authentication" // { default = true; }; UseDns = mkOption { type = types.bool; # apply if cfg.useDns then "yes" else "no" @@ -489,6 +501,8 @@ in {manpage}`sshd_config(5)` for details. ''; }; + # Disabled by default, since pam_motd handles this. + PrintMotd = mkEnableOption "printing /etc/motd when a user logs in interactively"; }; }); }; @@ -622,7 +636,7 @@ in networking.firewall.allowedTCPPorts = optionals cfg.openFirewall cfg.ports; - security.pam.services.sshd = + security.pam.services.sshd = lib.mkIf cfg.settings.UsePAM { startSession = true; showMotd = true; unixAuth = cfg.settings.PasswordAuthentication; @@ -632,14 +646,12 @@ in # https://github.com/NixOS/nixpkgs/pull/10155 # https://github.com/NixOS/nixpkgs/pull/41745 services.openssh.authorizedKeysFiles = - [ "%h/.ssh/authorized_keys" "/etc/ssh/authorized_keys.d/%u" ]; + lib.optional cfg.authorizedKeysInHomedir "%h/.ssh/authorized_keys" ++ [ "/etc/ssh/authorized_keys.d/%u" ]; services.openssh.settings.AuthorizedPrincipalsFile = mkIf (authPrincipalsFiles != {}) "/etc/ssh/authorized_principals.d/%u"; services.openssh.extraConfig = mkOrder 0 '' - UsePAM yes - Banner ${if cfg.banner == null then "none" else pkgs.writeText "ssh_banner" cfg.banner} AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"} @@ -657,7 +669,6 @@ in ${optionalString cfg.allowSFTP '' Subsystem sftp ${cfg.sftpServerExecutable} ${concatStringsSep " " cfg.sftpFlags} ''} - PrintMotd no # handled by pam_motd AuthorizedKeysFile ${toString cfg.authorizedKeysFiles} ${optionalString (cfg.authorizedKeysCommand != "none") '' AuthorizedKeysCommand ${cfg.authorizedKeysCommand} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/sunshine.nix b/third_party/nixpkgs/nixos/modules/services/networking/sunshine.nix index c115b9cd5c..ec78db1f3f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/sunshine.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/sunshine.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, utils, ... }: let - inherit (lib) mkEnableOption mkPackageOption mkOption mkIf mkDefault types optionals getExe; + inherit (lib) mkEnableOption mkPackageOption mkOption literalExpression mkIf mkDefault types optionals getExe; inherit (utils) escapeSystemdExecArgs; cfg = config.services.sunshine; @@ -32,6 +32,13 @@ in Whether to give the Sunshine binary CAP_SYS_ADMIN, required for DRM/KMS screen capture. ''; }; + autoStart = mkOption { + type = bool; + default = true; + description = '' + Whether sunshine should be started automatically. + ''; + }; settings = mkOption { default = { }; description = '' @@ -39,7 +46,7 @@ in See https://docs.lizardbyte.dev/projects/sunshine/en/latest/about/advanced_usage.html#configuration for syntax. ''; - example = '' + example = literalExpression '' { sunshine_name = "nixos"; } @@ -60,7 +67,7 @@ in description = '' Configuration for applications to be exposed to Moonlight. If this is set, no configuration is possible from the web UI, and must be by the `settings` option. ''; - example = '' + example = literalExpression '' { env = { PATH = "$(PATH):$(HOME)/.local/bin"; @@ -135,7 +142,7 @@ in systemd.user.services.sunshine = { description = "Self-hosted game stream host for Moonlight"; - wantedBy = [ "graphical-session.target" ]; + wantedBy = mkIf cfg.autoStart [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; wants = [ "graphical-session.target" ]; after = [ "graphical-session.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix index 2a77c0c7a2..a79e47d849 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix @@ -6,7 +6,7 @@ let cfg = config.services.tailscale; isNetworkd = config.networking.useNetworkd; in { - meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 mfrw ]; + meta.maintainers = with maintainers; [ mbaillie mfrw ]; options.services.tailscale = { enable = mkEnableOption "Tailscale client daemon"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tayga.nix b/third_party/nixpkgs/nixos/modules/services/networking/tayga.nix index 1a0df33fe8..9f118b243e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tayga.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tayga.nix @@ -16,6 +16,8 @@ let prefix ${strAddr cfg.ipv6.pool} dynamic-pool ${strAddr cfg.ipv4.pool} data-dir ${cfg.dataDir} + + ${concatStringsSep "\n" (mapAttrsToList (ipv4: ipv6: "map " + ipv4 + " " + ipv6) cfg.mappings)} ''; addrOpts = v: @@ -103,18 +105,38 @@ in dataDir = mkOption { type = types.path; default = "/var/lib/tayga"; - description = "Directory for persistent data"; + description = "Directory for persistent data."; }; tunDevice = mkOption { type = types.str; default = "nat64"; - description = "Name of the nat64 tun device"; + description = "Name of the nat64 tun device."; + }; + + mappings = mkOption { + type = types.attrsOf types.str; + default = {}; + description = "Static IPv4 -> IPv6 host mappings."; + example = literalExpression '' + { + "192.168.5.42" = "2001:db8:1:4444::1"; + "192.168.5.43" = "2001:db8:1:4444::2"; + "192.168.255.2" = "2001:db8:1:569::143"; + } + ''; }; }; }; config = mkIf cfg.enable { + assertions = [ + { + assertion = allUnique (attrValues cfg.mappings); + message = "Neither the IPv4 nor the IPv6 addresses must be entered twice in the mappings."; + } + ]; + networking.interfaces."${cfg.tunDevice}" = { virtual = true; virtualType = "tun"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/trust-dns.nix b/third_party/nixpkgs/nixos/modules/services/networking/trust-dns.nix index e6f8cc1581..039b7de263 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/trust-dns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/trust-dns.nix @@ -51,7 +51,7 @@ in package = mkPackageOption pkgs "trust-dns" { extraDescription = '' ::: {.note} - The package must provide `meta.mainProgram` which names the server binayr; any other utilities (client, resolver) are not needed. + The package must provide `meta.mainProgram` which names the server binary; any other utilities (client, resolver) are not needed. ::: ''; }; @@ -86,7 +86,7 @@ in type = types.listOf types.str; default = [ "0.0.0.0" ]; description = '' - List of ipv4 addresses on which to listen for DNS queries. + List of ipv4 addresses on which to listen for DNS queries. ''; }; listen_addrs_ipv6 = mkOption { @@ -114,7 +114,7 @@ in }; zones = mkOption { description = "List of zones to serve."; - default = {}; + default = []; type = types.listOf (types.coercedTo types.str (zone: { inherit zone; }) zoneType); }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/vsftpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/vsftpd.nix index 25f950600b..07b93e92a7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/vsftpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/vsftpd.nix @@ -278,7 +278,7 @@ in } { assertion = (cfg.enableVirtualUsers -> cfg.userDbPath != null) - && (cfg.enableVirtualUsers -> cfg.localUsers != null); + && (cfg.enableVirtualUsers -> cfg.localUsers); message = "vsftpd: If enableVirtualUsers is true, you need to setup both the userDbPath and localUsers options."; }]; diff --git a/third_party/nixpkgs/nixos/modules/services/security/oauth2-proxy-nginx.nix b/third_party/nixpkgs/nixos/modules/services/security/oauth2-proxy-nginx.nix new file mode 100644 index 0000000000..07192e7287 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/security/oauth2-proxy-nginx.nix @@ -0,0 +1,130 @@ +{ config, lib, ... }: +let + cfg = config.services.oauth2-proxy.nginx; +in +{ + options.services.oauth2-proxy.nginx = { + proxy = lib.mkOption { + type = lib.types.str; + default = config.services.oauth2-proxy.httpAddress; + defaultText = lib.literalExpression "config.services.oauth2-proxy.httpAddress"; + description = '' + The address of the reverse proxy endpoint for oauth2-proxy + ''; + }; + + domain = lib.mkOption { + type = lib.types.str; + description = '' + The domain under which the oauth2-proxy will be accesible and the path of cookies are set to. + This setting must be set to ensure back-redirects are working properly + if oauth2-proxy is configured with {option}`services.oauth2-proxy.cookie.domain` + or multiple {option}`services.oauth2-proxy.nginx.virtualHosts` that are not on the same domain. + ''; + }; + + virtualHosts = lib.mkOption { + type = let + vhostSubmodule = lib.types.submodule { + options = { + allowed_groups = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); + description = "List of groups to allow access to this vhost, or null to allow all."; + default = null; + }; + allowed_emails = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); + description = "List of emails to allow access to this vhost, or null to allow all."; + default = null; + }; + allowed_email_domains = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); + description = "List of email domains to allow access to this vhost, or null to allow all."; + default = null; + }; + }; + }; + oldType = lib.types.listOf lib.types.str; + convertFunc = x: + lib.warn "services.oauth2-proxy.nginx.virtualHosts should be an attrset, found ${lib.generators.toPretty {} x}" + lib.genAttrs x (_: {}); + newType = lib.types.attrsOf vhostSubmodule; + in lib.types.coercedTo oldType convertFunc newType; + default = {}; + example = { + "protected.foo.com" = { + allowed_groups = ["admins"]; + allowed_emails = ["boss@foo.com"]; + }; + }; + description = '' + Nginx virtual hosts to put behind the oauth2 proxy. + You can exclude specific locations by setting `auth_request off;` in the locations extraConfig setting. + ''; + }; + }; + + config.services.oauth2-proxy = lib.mkIf (cfg.virtualHosts != {} && (lib.hasPrefix "127.0.0.1:" cfg.proxy)) { + enable = true; + }; + + config.services.nginx = lib.mkIf (cfg.virtualHosts != {} && config.services.oauth2-proxy.enable) (lib.mkMerge ([ + { + virtualHosts.${cfg.domain}.locations."/oauth2/" = { + proxyPass = cfg.proxy; + extraConfig = '' + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Auth-Request-Redirect $scheme://$host$request_uri; + ''; + }; + } + ] ++ lib.optional (cfg.virtualHosts != {}) { + recommendedProxySettings = true; # needed because duplicate headers + } ++ (lib.mapAttrsToList (vhost: conf: { + virtualHosts.${vhost} = { + locations = { + "/oauth2/auth" = let + maybeQueryArg = name: value: + if value == null then null + else "${name}=${lib.concatStringsSep "," (builtins.map lib.escapeURL value)}"; + allArgs = lib.mapAttrsToList maybeQueryArg conf; + cleanArgs = builtins.filter (x: x != null) allArgs; + cleanArgsStr = lib.concatStringsSep "&" cleanArgs; + in { + # nginx doesn't support passing query string arguments to auth_request, + # so pass them here instead + proxyPass = "${cfg.proxy}/oauth2/auth?${cleanArgsStr}"; + extraConfig = '' + auth_request off; + proxy_set_header X-Scheme $scheme; + # nginx auth_request includes headers but not body + proxy_set_header Content-Length ""; + proxy_pass_request_body off; + ''; + }; + "@redirectToAuth2ProxyLogin" = { + return = "307 https://${cfg.domain}/oauth2/start?rd=$scheme://$host$request_uri"; + extraConfig = '' + auth_request off; + ''; + }; + }; + + extraConfig = '' + auth_request /oauth2/auth; + error_page 401 = @redirectToAuth2ProxyLogin; + + # pass information via X-User and X-Email headers to backend, + # requires running with --set-xauthrequest flag + auth_request_set $user $upstream_http_x_auth_request_user; + auth_request_set $email $upstream_http_x_auth_request_email; + proxy_set_header X-User $user; + proxy_set_header X-Email $email; + + # if you enabled --cookie-refresh, this is needed for it to work with auth_request + auth_request_set $auth_cookie $upstream_http_set_cookie; + add_header Set-Cookie $auth_cookie; + ''; + }; + }) cfg.virtualHosts))); +} diff --git a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix b/third_party/nixpkgs/nixos/modules/services/security/oauth2-proxy.nix similarity index 69% rename from third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix rename to third_party/nixpkgs/nixos/modules/services/security/oauth2-proxy.nix index abf1ce9ba0..78a772845a 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/oauth2-proxy.nix @@ -1,15 +1,12 @@ -# NixOS module for oauth2_proxy. - { config, lib, pkgs, ... }: -with lib; let - cfg = config.services.oauth2_proxy; + cfg = config.services.oauth2-proxy; - # oauth2_proxy provides many options that are only relevant if you are using + # oauth2-proxy provides many options that are only relevant if you are using # a certain provider. This set maps from provider name to a function that # takes the configuration and returns a string that can be inserted into the - # command-line to launch oauth2_proxy. + # command-line to launch oauth2-proxy. providerSpecificOptions = { azure = cfg: { azure-tenant = cfg.azure.tenant; @@ -20,7 +17,7 @@ let inherit (cfg.github) org team; }; }; - google = cfg: { google = with cfg.google; optionalAttrs (groups != []) { + google = cfg: { google = with cfg.google; lib.optionalAttrs (groups != []) { admin-email = adminEmail; service-account = serviceAccountJSON; group = groups; @@ -47,6 +44,7 @@ let reverse-proxy = reverseProxy; proxy-prefix = proxyPrefix; profile-url = profileURL; + oidc-issuer-url = oidcIssuerUrl; redeem-url = redeemURL; redirect-url = redirectURL; request-logging = requestLogging; @@ -72,28 +70,28 @@ let } // (getProviderOptions cfg cfg.provider) // cfg.extraConfig; mapConfig = key: attr: - optionalString (attr != null && attr != []) ( - if isDerivation attr then mapConfig key (toString attr) else - if (builtins.typeOf attr) == "set" then concatStringsSep " " - (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else - if (builtins.typeOf attr) == "list" then concatMapStringsSep " " (mapConfig key) attr else - if (builtins.typeOf attr) == "bool" then "--${key}=${boolToString attr}" else + lib.optionalString (attr != null && attr != []) ( + if lib.isDerivation attr then mapConfig key (toString attr) else + if (builtins.typeOf attr) == "set" then lib.concatStringsSep " " + (lib.mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else + if (builtins.typeOf attr) == "list" then lib.concatMapStringsSep " " (mapConfig key) attr else + if (builtins.typeOf attr) == "bool" then "--${key}=${lib.boolToString attr}" else if (builtins.typeOf attr) == "string" then "--${key}='${attr}'" else "--${key}=${toString attr}"); - configString = concatStringsSep " " (mapAttrsToList mapConfig allConfig); + configString = lib.concatStringsSep " " (lib.mapAttrsToList mapConfig allConfig); in { - options.services.oauth2_proxy = { - enable = mkEnableOption "oauth2_proxy"; + options.services.oauth2-proxy = { + enable = lib.mkEnableOption "oauth2-proxy"; - package = mkPackageOption pkgs "oauth2-proxy" { }; + package = lib.mkPackageOption pkgs "oauth2-proxy" { }; ############################################## # PROVIDER configuration # Taken from: https://github.com/oauth2-proxy/oauth2-proxy/blob/master/providers/providers.go - provider = mkOption { - type = types.enum [ + provider = lib.mkOption { + type = lib.types.enum [ "adfs" "azure" "bitbucket" @@ -115,31 +113,40 @@ in ''; }; - approvalPrompt = mkOption { - type = types.enum ["force" "auto"]; + approvalPrompt = lib.mkOption { + type = lib.types.enum ["force" "auto"]; default = "force"; description = '' OAuth approval_prompt. ''; }; - clientID = mkOption { - type = types.nullOr types.str; + clientID = lib.mkOption { + type = lib.types.nullOr lib.types.str; description = '' The OAuth Client ID. ''; example = "123456.apps.googleusercontent.com"; }; - clientSecret = mkOption { - type = types.nullOr types.str; + oidcIssuerUrl = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + The OAuth issuer URL. + ''; + example = "https://login.microsoftonline.com/{TENANT_ID}/v2.0"; + }; + + clientSecret = lib.mkOption { + type = lib.types.nullOr lib.types.str; description = '' The OAuth Client Secret. ''; }; - skipAuthRegexes = mkOption { - type = types.listOf types.str; + skipAuthRegexes = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = '' Skip authentication for requests matching any of these regular @@ -149,8 +156,8 @@ in # XXX: Not clear whether these two options are mutually exclusive or not. email = { - domains = mkOption { - type = types.listOf types.str; + domains = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = '' Authenticate emails with the specified domains. Use @@ -158,8 +165,8 @@ in ''; }; - addresses = mkOption { - type = types.nullOr types.lines; + addresses = lib.mkOption { + type = lib.types.nullOr lib.types.lines; default = null; description = '' Line-separated email addresses that are allowed to authenticate. @@ -167,8 +174,8 @@ in }; }; - loginURL = mkOption { - type = types.nullOr types.str; + loginURL = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' Authentication endpoint. @@ -180,8 +187,8 @@ in example = "https://provider.example.com/oauth/authorize"; }; - redeemURL = mkOption { - type = types.nullOr types.str; + redeemURL = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' Token redemption endpoint. @@ -193,8 +200,8 @@ in example = "https://provider.example.com/oauth/token"; }; - validateURL = mkOption { - type = types.nullOr types.str; + validateURL = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' Access token validation endpoint. @@ -206,10 +213,10 @@ in example = "https://provider.example.com/user/emails"; }; - redirectURL = mkOption { + redirectURL = lib.mkOption { # XXX: jml suspects this is always necessary, but the command-line # doesn't require it so making it optional. - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; default = null; description = '' The OAuth2 redirect URL. @@ -218,16 +225,16 @@ in }; azure = { - tenant = mkOption { - type = types.str; + tenant = lib.mkOption { + type = lib.types.str; default = "common"; description = '' Go to a tenant-specific or common (tenant-independent) endpoint. ''; }; - resource = mkOption { - type = types.str; + resource = lib.mkOption { + type = lib.types.str; description = '' The resource that is protected. ''; @@ -235,8 +242,8 @@ in }; google = { - adminEmail = mkOption { - type = types.str; + adminEmail = lib.mkOption { + type = lib.types.str; description = '' The Google Admin to impersonate for API calls. @@ -248,16 +255,16 @@ in ''; }; - groups = mkOption { - type = types.listOf types.str; + groups = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; description = '' Restrict logins to members of these Google groups. ''; }; - serviceAccountJSON = mkOption { - type = types.path; + serviceAccountJSON = lib.mkOption { + type = lib.types.path; description = '' The path to the service account JSON credentials. ''; @@ -265,16 +272,16 @@ in }; github = { - org = mkOption { - type = types.nullOr types.str; + org = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' Restrict logins to members of this organisation. ''; }; - team = mkOption { - type = types.nullOr types.str; + team = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' Restrict logins to members of this team. @@ -285,8 +292,8 @@ in #################################################### # UPSTREAM Configuration - upstream = mkOption { - type = with types; coercedTo str (x: [x]) (listOf str); + upstream = lib.mkOption { + type = with lib.types; coercedTo str (x: [x]) (listOf str); default = []; description = '' The http url(s) of the upstream endpoint or `file://` @@ -294,40 +301,40 @@ in ''; }; - passAccessToken = mkOption { - type = types.bool; + passAccessToken = lib.mkOption { + type = lib.types.bool; default = false; description = '' Pass OAuth access_token to upstream via X-Forwarded-Access-Token header. ''; }; - passBasicAuth = mkOption { - type = types.bool; + passBasicAuth = lib.mkOption { + type = lib.types.bool; default = true; description = '' Pass HTTP Basic Auth, X-Forwarded-User and X-Forwarded-Email information to upstream. ''; }; - basicAuthPassword = mkOption { - type = types.nullOr types.str; + basicAuthPassword = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' The password to set when passing the HTTP Basic Auth header. ''; }; - passHostHeader = mkOption { - type = types.bool; + passHostHeader = lib.mkOption { + type = lib.types.bool; default = true; description = '' Pass the request Host Header to upstream. ''; }; - signatureKey = mkOption { - type = types.nullOr types.str; + signatureKey = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' GAP-Signature request signature key. @@ -336,8 +343,8 @@ in }; cookie = { - domain = mkOption { - type = types.nullOr types.str; + domain = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' Optional cookie domains to force cookies to (ie: `.yourcompany.com`). @@ -347,33 +354,33 @@ in example = ".yourcompany.com"; }; - expire = mkOption { - type = types.str; + expire = lib.mkOption { + type = lib.types.str; default = "168h0m0s"; description = '' Expire timeframe for cookie. ''; }; - httpOnly = mkOption { - type = types.bool; + httpOnly = lib.mkOption { + type = lib.types.bool; default = true; description = '' Set HttpOnly cookie flag. ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "_oauth2_proxy"; description = '' The name of the cookie that the oauth_proxy creates. ''; }; - refresh = mkOption { + refresh = lib.mkOption { # XXX: Unclear what the behavior is when this is not specified. - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; default = null; description = '' Refresh the cookie after this duration; 0 to disable. @@ -381,15 +388,15 @@ in example = "168h0m0s"; }; - secret = mkOption { - type = types.nullOr types.str; + secret = lib.mkOption { + type = lib.types.nullOr lib.types.str; description = '' The seed string for secure cookies. ''; }; - secure = mkOption { - type = types.bool; + secure = lib.mkOption { + type = lib.types.bool; default = true; description = '' Set secure (HTTPS) cookie flag. @@ -400,8 +407,8 @@ in #################################################### # OAUTH2 PROXY configuration - httpAddress = mkOption { - type = types.str; + httpAddress = lib.mkOption { + type = lib.types.str; default = "http://127.0.0.1:4180"; description = '' HTTPS listening address. This module does not expose the port by @@ -411,8 +418,8 @@ in }; htpasswd = { - file = mkOption { - type = types.nullOr types.path; + file = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' Additionally authenticate against a htpasswd file. Entries must be @@ -420,8 +427,8 @@ in ''; }; - displayForm = mkOption { - type = types.bool; + displayForm = lib.mkOption { + type = lib.types.bool; default = true; description = '' Display username / password login form if an htpasswd file is provided. @@ -429,16 +436,16 @@ in }; }; - customTemplatesDir = mkOption { - type = types.nullOr types.path; + customTemplatesDir = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' Path to custom HTML templates. ''; }; - reverseProxy = mkOption { - type = types.bool; + reverseProxy = lib.mkOption { + type = lib.types.bool; default = false; description = '' In case when running behind a reverse proxy, controls whether headers @@ -448,8 +455,8 @@ in ''; }; - proxyPrefix = mkOption { - type = types.str; + proxyPrefix = lib.mkOption { + type = lib.types.str; default = "/oauth2"; description = '' The url root path that this proxy should be nested under. @@ -457,30 +464,30 @@ in }; tls = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to serve over TLS. ''; }; - certificate = mkOption { - type = types.path; + certificate = lib.mkOption { + type = lib.types.path; description = '' Path to certificate file. ''; }; - key = mkOption { - type = types.path; + key = lib.mkOption { + type = lib.types.path; description = '' Path to private key file. ''; }; - httpsAddress = mkOption { - type = types.str; + httpsAddress = lib.mkOption { + type = lib.types.str; default = ":443"; description = '' `addr:port` to listen on for HTTPS clients. @@ -492,8 +499,8 @@ in }; }; - requestLogging = mkOption { - type = types.bool; + requestLogging = lib.mkOption { + type = lib.types.bool; default = true; description = '' Log requests to stdout. @@ -504,42 +511,42 @@ in # UNKNOWN # XXX: Is this mandatory? Is it part of another group? Is it part of the provider specification? - scope = mkOption { + scope = lib.mkOption { # XXX: jml suspects this is always necessary, but the command-line # doesn't require it so making it optional. - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; default = null; description = '' OAuth scope specification. ''; }; - profileURL = mkOption { - type = types.nullOr types.str; + profileURL = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' Profile access endpoint. ''; }; - setXauthrequest = mkOption { - type = types.nullOr types.bool; + setXauthrequest = lib.mkOption { + type = lib.types.nullOr lib.types.bool; default = false; description = '' Set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode). Setting this to 'null' means using the upstream default (false). ''; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { default = {}; - type = types.attrsOf types.anything; + type = lib.types.attrsOf lib.types.anything; description = '' Extra config to pass to oauth2-proxy. ''; }; - keyFile = mkOption { - type = types.nullOr types.path; + keyFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' oauth2-proxy allows passing sensitive configuration via environment variables. @@ -547,28 +554,30 @@ in OAUTH2_PROXY_CLIENT_SECRET=asdfasdfasdf.apps.googleuserscontent.com and specify the path here. ''; - example = "/run/keys/oauth2_proxy"; + example = "/run/keys/oauth2-proxy"; }; - }; - config = mkIf cfg.enable { + imports = [ + (lib.mkRenamedOptionModule [ "services" "oauth2_proxy" ] [ "services" "oauth2-proxy" ]) + ]; - services.oauth2_proxy = mkIf (cfg.keyFile != null) { - clientID = mkDefault null; - clientSecret = mkDefault null; - cookie.secret = mkDefault null; + config = lib.mkIf cfg.enable { + services.oauth2-proxy = lib.mkIf (cfg.keyFile != null) { + clientID = lib.mkDefault null; + clientSecret = lib.mkDefault null; + cookie.secret = lib.mkDefault null; }; - users.users.oauth2_proxy = { + users.users.oauth2-proxy = { description = "OAuth2 Proxy"; isSystemUser = true; - group = "oauth2_proxy"; + group = "oauth2-proxy"; }; - users.groups.oauth2_proxy = {}; + users.groups.oauth2-proxy = {}; - systemd.services.oauth2_proxy = { + systemd.services.oauth2-proxy = { description = "OAuth2 Proxy"; path = [ cfg.package ]; wantedBy = [ "multi-user.target" ]; @@ -576,10 +585,10 @@ in after = [ "network-online.target" ]; serviceConfig = { - User = "oauth2_proxy"; + User = "oauth2-proxy"; Restart = "always"; ExecStart = "${cfg.package}/bin/oauth2-proxy ${configString}"; - EnvironmentFile = mkIf (cfg.keyFile != null) cfg.keyFile; + EnvironmentFile = lib.mkIf (cfg.keyFile != null) cfg.keyFile; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix b/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix deleted file mode 100644 index 87ea612768..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ config, lib, ... }: -with lib; -let - cfg = config.services.oauth2_proxy.nginx; -in -{ - options.services.oauth2_proxy.nginx = { - proxy = mkOption { - type = types.str; - default = config.services.oauth2_proxy.httpAddress; - defaultText = literalExpression "config.services.oauth2_proxy.httpAddress"; - description = '' - The address of the reverse proxy endpoint for oauth2_proxy - ''; - }; - - domain = mkOption { - type = types.str; - description = '' - The domain under which the oauth2_proxy will be accesible and the path of cookies are set to. - This setting must be set to ensure back-redirects are working properly - if oauth2-proxy is configured with {option}`services.oauth2_proxy.cookie.domain` - or multiple {option}`services.oauth2_proxy.nginx.virtualHosts` that are not on the same domain. - ''; - }; - - virtualHosts = mkOption { - type = types.listOf types.str; - default = []; - description = '' - A list of nginx virtual hosts to put behind the oauth2 proxy. - You can exclude specific locations by setting `auth_request off;` in the locations extraConfig setting. - ''; - }; - }; - - config.services.oauth2_proxy = mkIf (cfg.virtualHosts != [] && (hasPrefix "127.0.0.1:" cfg.proxy)) { - enable = true; - }; - - config.services.nginx = mkIf (cfg.virtualHosts != [] && config.services.oauth2_proxy.enable) (mkMerge ([ - { - virtualHosts.${cfg.domain}.locations."/oauth2/" = { - proxyPass = cfg.proxy; - extraConfig = '' - proxy_set_header X-Scheme $scheme; - proxy_set_header X-Auth-Request-Redirect $scheme://$host$request_uri; - ''; - }; - } - ] ++ optional (cfg.virtualHosts != []) { - recommendedProxySettings = true; # needed because duplicate headers - } ++ (map (vhost: { - virtualHosts.${vhost} = { - locations = { - "/oauth2/auth" = { - proxyPass = cfg.proxy; - extraConfig = '' - auth_request off; - proxy_set_header X-Scheme $scheme; - # nginx auth_request includes headers but not body - proxy_set_header Content-Length ""; - proxy_pass_request_body off; - ''; - }; - "@redirectToAuth2ProxyLogin" = { - return = "307 https://${cfg.domain}/oauth2/start?rd=$scheme://$host$request_uri"; - extraConfig = '' - auth_request off; - ''; - }; - }; - - extraConfig = '' - auth_request /oauth2/auth; - error_page 401 = @redirectToAuth2ProxyLogin; - - # pass information via X-User and X-Email headers to backend, - # requires running with --set-xauthrequest flag - auth_request_set $user $upstream_http_x_auth_request_user; - auth_request_set $email $upstream_http_x_auth_request_email; - proxy_set_header X-User $user; - proxy_set_header X-Email $email; - - # if you enabled --cookie-refresh, this is needed for it to work with auth_request - auth_request_set $auth_cookie $upstream_http_set_cookie; - add_header Set-Cookie $auth_cookie; - ''; - }; - }) cfg.virtualHosts))); -} diff --git a/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix b/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix index c708cb2b89..e9195fbd51 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix @@ -107,7 +107,7 @@ in UMask = "0077"; Environment = "HOME=%S/step-ca"; WorkingDirectory = ""; # override upstream - ReadWriteDirectories = ""; # override upstream + ReadWritePaths = ""; # override upstream # LocalCredential handles file permission problems arising from the use of DynamicUser. LoadCredential = "intermediate_password:${cfg.intermediatePasswordFile}"; diff --git a/third_party/nixpkgs/nixos/modules/services/security/vault.nix b/third_party/nixpkgs/nixos/modules/services/security/vault.nix index ab86da47b2..650f9bda99 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/vault.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/vault.nix @@ -56,8 +56,8 @@ in }; devRootTokenID = mkOption { - type = types.str; - default = false; + type = types.nullOr types.str; + default = null; description = '' Initial root token. This only applies when {option}`services.vault.dev` is true ''; diff --git a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix index b2920931f9..33957be437 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix @@ -131,21 +131,13 @@ in { Additional environment file as defined in {manpage}`systemd.exec(5)`. Secrets like {env}`ADMIN_TOKEN` and {env}`SMTP_PASSWORD` - may be passed to the service without adding them to the world-readable Nix store. + should be passed to the service without adding them to the world-readable Nix store. - Note that this file needs to be available on the host on which - `vaultwarden` is running. + Note that this file needs to be available on the host on which `vaultwarden` is running. - As a concrete example, to make the Admin UI available - (from which new users can be invited initially), + As a concrete example, to make the Admin UI available (from which new users can be invited initially), the secret {env}`ADMIN_TOKEN` needs to be defined as described - [here](https://github.com/dani-garcia/vaultwarden/wiki/Enabling-admin-page). - Setting `environmentFile` to `/var/lib/vaultwarden.env` - and ensuring permissions with e.g. - `chown vaultwarden:vaultwarden /var/lib/vaultwarden.env` - (the `vaultwarden` user will only exist after activating with - `enable = true;` before this), we can set the contents of the file to have - contents such as: + [here](https://github.com/dani-garcia/vaultwarden/wiki/Enabling-admin-page): ``` # Admin secret token, see diff --git a/third_party/nixpkgs/nixos/modules/services/system/dbus.nix b/third_party/nixpkgs/nixos/modules/services/system/dbus.nix index a9fc88e320..26f4eba707 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/dbus.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/dbus.nix @@ -39,7 +39,7 @@ in implementation = mkOption { type = types.enum [ "dbus" "broker" ]; - default = "broker"; + default = "dbus"; description = '' The implementation to use for the message bus defined by the D-Bus specification. Can be either the classic dbus daemon or dbus-broker, which aims to provide high @@ -147,6 +147,10 @@ in }; systemd.services.dbus = { + aliases = [ + # hack aiding to prevent dbus from restarting when switching from dbus-broker back to dbus + "dbus-broker.service" + ]; # Don't restart dbus-daemon. Bad things tend to happen if we do. reloadIfChanged = true; restartTriggers = [ @@ -158,6 +162,10 @@ in }; systemd.user.services.dbus = { + aliases = [ + # hack aiding to prevent dbus from restarting when switching from dbus-broker back to dbus + "dbus-broker.service" + ]; # Don't restart dbus-daemon. Bad things tend to happen if we do. reloadIfChanged = true; restartTriggers = [ @@ -184,6 +192,8 @@ in # https://github.com/NixOS/nixpkgs/issues/108643 systemd.services.dbus-broker = { aliases = [ + # allow other services to just depend on dbus, + # but also a hack aiding to prevent dbus from restarting when switching from dbus-broker back to dbus "dbus.service" ]; unitConfig = { @@ -203,6 +213,8 @@ in systemd.user.services.dbus-broker = { aliases = [ + # allow other services to just depend on dbus, + # but also a hack aiding to prevent dbus from restarting when switching from dbus-broker back to dbus "dbus.service" ]; # Don't restart dbus. Bad things tend to happen if we do. diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix index eca498549d..7c9bf6c465 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix @@ -817,11 +817,11 @@ in { base_url = mkOption { type = types.nullOr types.nonEmptyStr; default = if lib.versionOlder config.system.stateVersion "24.05" - then "${httpConf.scheme}://${httpConf.host}:${builtins.toString httpConf.port}/media/" + then "${httpConf.scheme}://${httpConf.host}:${builtins.toString httpConf.port}" else null; defaultText = literalExpression '' if lib.versionOlder config.system.stateVersion "24.05" - then "$\{httpConf.scheme}://$\{httpConf.host}:$\{builtins.toString httpConf.port}/media/" + then "$\{httpConf.scheme}://$\{httpConf.host}:$\{builtins.toString httpConf.port}" else null; ''; description = '' @@ -957,7 +957,7 @@ in { assertions = optionals (cfg.config.":pleroma".":media_proxy".enabled && cfg.config.":pleroma".":media_proxy".base_url == null) ['' `services.akkoma.config.":pleroma".":media_proxy".base_url` must be set when the media proxy is enabled. '']; - warnings = optionals (with config.security; (!sudo.enable) && (!sudo-rs.enable)) ['' + warnings = optionals (with config.security; cfg.installWrapper && (!sudo.enable) && (!sudo-rs.enable)) ['' The pleroma_ctl wrapper enabled by the installWrapper option relies on sudo, which appears to have been disabled through security.sudo.enable. '']; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/castopod.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/castopod.nix index 69ee670276..d3750c3dd3 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/castopod.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/castopod.nix @@ -17,7 +17,7 @@ let in { meta.doc = ./castopod.md; - meta.maintainers = with lib.maintainers; [ alexoundos misuzu ]; + meta.maintainers = with lib.maintainers; [ alexoundos ]; options.services = { castopod = { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/coder.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/coder.nix index 318a7c8fc1..5450adbe11 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/coder.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/coder.nix @@ -169,7 +169,7 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - environment = config.environment.extra // { + environment = cfg.environment.extra // { CODER_ACCESS_URL = cfg.accessUrl; CODER_WILDCARD_ACCESS_URL = cfg.wildcardAccessUrl; CODER_PG_CONNECTION_URL = "user=${cfg.database.username} ${optionalString (cfg.database.password != null) "password=${cfg.database.password}"} database=${cfg.database.database} host=${cfg.database.host} ${optionalString (cfg.database.sslmode != null) "sslmode=${cfg.database.sslmode}"}"; @@ -223,4 +223,5 @@ in { }; }; }; + meta.maintainers = pkgs.coder.meta.maintainers; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/gotosocial.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/gotosocial.nix index 8e0e1ad765..aee1edf66a 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/gotosocial.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/gotosocial.nix @@ -27,7 +27,7 @@ let in { meta.doc = ./gotosocial.md; - meta.maintainers = with lib.maintainers; [ misuzu blakesmith ]; + meta.maintainers = with lib.maintainers; [ blakesmith ]; options.services.gotosocial = { enable = lib.mkEnableOption "ActivityPub social network server"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix index cf1282b3d4..201085daa7 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix @@ -663,7 +663,7 @@ in '' + '' export KEYCLOAK_ADMIN=admin export KEYCLOAK_ADMIN_PASSWORD=${escapeShellArg cfg.initialAdminPassword} - kc.sh start --optimized + kc.sh --verbose start --optimized ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix index 0d0361584c..cdd60f572b 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/limesurvey.nix @@ -2,7 +2,7 @@ let - inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption; + inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption mkPackageOption; inherit (lib) literalExpression mapAttrs optional optionalString types; cfg = config.services.limesurvey; @@ -12,8 +12,6 @@ let group = config.services.httpd.group; stateDir = "/var/lib/limesurvey"; - pkg = pkgs.limesurvey; - configType = with types; oneOf [ (attrsOf configType) str int bool ] // { description = "limesurvey config type (str, int, bool or attribute set thereof)"; }; @@ -34,6 +32,8 @@ in options.services.limesurvey = { enable = mkEnableOption "Limesurvey web application"; + package = mkPackageOption pkgs "limesurvey" { }; + encryptionKey = mkOption { type = types.str; default = "E17687FC77CEE247F0E22BB3ECF27FDE8BEC310A892347EC13013ABA11AA7EB5"; @@ -240,7 +240,7 @@ in adminAddr = mkDefault cfg.virtualHost.adminAddr; extraModules = [ "proxy_fcgi" ]; virtualHosts.${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost { - documentRoot = mkForce "${pkg}/share/limesurvey"; + documentRoot = mkForce "${cfg.package}/share/limesurvey"; extraConfig = '' Alias "/tmp" "${stateDir}/tmp" @@ -256,7 +256,7 @@ in Options -Indexes - + SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/" @@ -277,7 +277,7 @@ in "d ${stateDir}/tmp/assets 0750 ${user} ${group} - -" "d ${stateDir}/tmp/runtime 0750 ${user} ${group} - -" "d ${stateDir}/tmp/upload 0750 ${user} ${group} - -" - "C ${stateDir}/upload 0750 ${user} ${group} - ${pkg}/share/limesurvey/upload" + "C ${stateDir}/upload 0750 ${user} ${group} - ${cfg.package}/share/limesurvey/upload" ]; systemd.services.limesurvey-init = { @@ -288,8 +288,8 @@ in environment.LIMESURVEY_CONFIG = limesurveyConfig; script = '' # update or install the database as required - ${pkgs.php81}/bin/php ${pkg}/share/limesurvey/application/commands/console.php updatedb || \ - ${pkgs.php81}/bin/php ${pkg}/share/limesurvey/application/commands/console.php install admin password admin admin@example.com verbose + ${pkgs.php81}/bin/php ${cfg.package}/share/limesurvey/application/commands/console.php updatedb || \ + ${pkgs.php81}/bin/php ${cfg.package}/share/limesurvey/application/commands/console.php install admin password admin admin@example.com verbose ''; serviceConfig = { User = user; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix index 7246fd93a2..b11626ec2d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix @@ -246,7 +246,9 @@ in passwordFile = mkOption { type = types.path; - description = "A file containing the initial password for the admin user."; + description = '' + A file containing the initial password for the administrator account "admin". + ''; example = "/run/keys/mediawiki-password"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix index d65d6db3cd..61243a63c5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: -with lib; let + inherit (lib) mkEnableOption mkPackageOption mkOption types literalExpression mkIf mkDefault; cfg = config.services.miniflux; defaultAddress = "localhost:8080"; @@ -20,8 +20,8 @@ in package = mkPackageOption pkgs "miniflux" { }; - createDatabaseLocally = lib.mkOption { - type = lib.types.bool; + createDatabaseLocally = mkOption { + type = types.bool; default = true; description = '' Whether a PostgreSQL database should be automatically created and @@ -66,6 +66,7 @@ in DATABASE_URL = lib.mkIf cfg.createDatabaseLocally "user=miniflux host=/run/postgresql dbname=miniflux"; RUN_MIGRATIONS = 1; CREATE_ADMIN = 1; + WATCHDOG = 1; }; services.postgresql = lib.mkIf cfg.createDatabaseLocally { @@ -96,12 +97,18 @@ in ++ lib.optionals cfg.createDatabaseLocally [ "postgresql.service" "miniflux-dbsetup.service" ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/miniflux"; + Type = "notify"; + ExecStart = lib.getExe cfg.package; User = "miniflux"; DynamicUser = true; RuntimeDirectory = "miniflux"; RuntimeDirectoryMode = "0750"; EnvironmentFile = cfg.adminCredentialsFile; + WatchdogSec = 60; + WatchdogSignal = "SIGKILL"; + Restart = "always"; + RestartSec = 5; + # Hardening CapabilityBoundingSet = [ "" ]; DeviceAllow = [ "" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/movim.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/movim.nix index bb88a185b4..29bed0e067 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/movim.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/movim.nix @@ -103,22 +103,20 @@ let lib.concatStringsSep "\n" [ (lib.optionalString brotli.enable '' echo -n "Precompressing static files with Brotli …" - find ${appDir}/public -type f ${findTextFileNames} \ - | ${lib.getExe pkgs.parallel} ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - "${lib.getExe brotli.package} --keep --quality=${builtins.toString brotli.compressionLevel} --output={}.br {}" - ]} + find ${appDir}/public -type f ${findTextFileNames} -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_broti" '' + file="$1" + ${lib.getExe brotli.package} --keep --quality=${builtins.toString brotli.compressionLevel} --output=$file.br $file + ''} echo " done." '') (lib.optionalString gzip.enable '' echo -n "Precompressing static files with Gzip …" - find ${appDir}/public -type f ${findTextFileNames} \ - | ${lib.getExe pkgs.parallel} ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - "${lib.getExe gzip.package} -c -${builtins.toString gzip.compressionLevel} {} > {}.gz" - ]} + find ${appDir}/public -type f ${findTextFileNames} -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_broti" '' + file="$1" + ${lib.getExe gzip.package} -c -${builtins.toString gzip.compressionLevel} $file > $file.gz + ''} echo " done." '') ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.md b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.md index 06a8712b0b..0b615deae4 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.md +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.md @@ -5,7 +5,7 @@ self-hostable cloud platform. The server setup can be automated using [services.nextcloud](#opt-services.nextcloud.enable). A desktop client is packaged at `pkgs.nextcloud-client`. -The current default by NixOS is `nextcloud28` which is also the latest +The current default by NixOS is `nextcloud29` which is also the latest major version available. ## Basic usage {#module-services-nextcloud-basic-usage} @@ -184,6 +184,27 @@ Alternatively, extra apps can also be declared with the [](#opt-services.nextclo When using this setting, apps can no longer be managed statefully because this can lead to Nextcloud updating apps that are managed by Nix. If you want automatic updates it is recommended that you use web interface to install apps. +## Known warnings {#module-services-nextcloud-known-warnings} + +### Failed to get an iterator for log entries: Logreader application only supports "file" log_type {#module-services-nextcloud-warning-logreader} + +This is because + +* our module writes logs into the journal (`journalctl -t Nextcloud`) +* the Logreader application that allows reading logs in the admin panel is enabled + by default and requires logs written to a file. + +The logreader application doesn't work, as it was the case before. The only change is that +it complains loudly now. So nothing actionable here by default. Alternatively you can + +* disable the logreader application to shut up the "error". + + We can't really do that by default since whether apps are enabled/disabled is part + of the application's state and tracked inside the database. + +* set [](#opt-services.nextcloud.settings.log_type) to "file" to be able to view logs + from the admin panel. + ## Maintainer information {#module-services-nextcloud-maintainer-info} As stated in the previous paragraph, we must provide a clean upgrade-path for Nextcloud diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index f179a9854e..36c8d2ed6d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -819,7 +819,8 @@ in { ++ (optional (versionOlder cfg.package.version "25") (upgradeWarning 24 "22.11")) ++ (optional (versionOlder cfg.package.version "26") (upgradeWarning 25 "23.05")) ++ (optional (versionOlder cfg.package.version "27") (upgradeWarning 26 "23.11")) - ++ (optional (versionOlder cfg.package.version "28") (upgradeWarning 27 "24.05")); + ++ (optional (versionOlder cfg.package.version "28") (upgradeWarning 27 "24.05")) + ++ (optional (versionOlder cfg.package.version "29") (upgradeWarning 28 "24.11")); services.nextcloud.package = with pkgs; mkDefault ( @@ -832,10 +833,12 @@ in { else if versionOlder stateVersion "23.05" then nextcloud25 else if versionOlder stateVersion "23.11" then nextcloud26 else if versionOlder stateVersion "24.05" then nextcloud27 - else nextcloud28 + else nextcloud29 ); - services.nextcloud.phpPackage = pkgs.php82; + services.nextcloud.phpPackage = + if versionOlder cfg.package.version "29" then pkgs.php82 + else pkgs.php83; services.nextcloud.phpOptions = mkMerge [ (mapAttrs (const mkOptionDefault) defaultPHPSettings) @@ -936,6 +939,7 @@ in { in { wantedBy = [ "multi-user.target" ]; + wants = [ "nextcloud-update-db.service" ]; before = [ "phpfpm-nextcloud.service" ]; after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; @@ -994,7 +998,7 @@ in { after = [ "nextcloud-setup.service" ]; environment.NEXTCLOUD_CONFIG_DIR = "${datadir}/config"; serviceConfig = { - Type = "oneshot"; + Type = "exec"; User = "nextcloud"; ExecCondition = "${lib.getExe phpPackage} -f ${webroot}/occ status -e"; ExecStart = "${lib.getExe phpPackage} -f ${webroot}/cron.php"; @@ -1010,6 +1014,20 @@ in { }; startAt = cfg.autoUpdateApps.startAt; }; + nextcloud-update-db = { + after = [ "nextcloud-setup.service" ]; + environment.NEXTCLOUD_CONFIG_DIR = "${datadir}/config"; + script = '' + ${occ}/bin/nextcloud-occ db:add-missing-columns + ${occ}/bin/nextcloud-occ db:add-missing-indices + ${occ}/bin/nextcloud-occ db:add-missing-primary-keys + ''; + serviceConfig = { + Type = "exec"; + User = "nextcloud"; + ExecCondition = "${lib.getExe phpPackage} -f ${webroot}/occ status -e"; + }; + }; }; services.phpfpm = { @@ -1102,10 +1120,10 @@ in { extraConfig = '' absolute_redirect off; location = /.well-known/carddav { - return 301 /remote.php/dav; + return 301 /remote.php/dav/; } location = /.well-known/caldav { - return 301 /remote.php/dav; + return 301 /remote.php/dav/; } location ~ ^/\.well-known/(?!acme-challenge|pki-validation) { return 301 /index.php$request_uri; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix index 8e49e591f7..1f909bbd67 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix @@ -276,8 +276,11 @@ in { ${lib.optionalString (cfg.mail.smtp.passwordFile != null) ''export SMTP_USER_PWD="$(< $CREDENTIALS_DIRECTORY/SMTP_USER_PWD )"''} - # setup - ${cfg.package}/createdb.sh + ${lib.optionalString cfg.database.postgres.setup '' + # setup + ${cfg.package}/createdb.sh + ''} + ${cfg.package}/migrate.sh export IP_GEOLOCATION_DB=${pkgs.dbip-country-lite}/share/dbip/dbip-country-lite.mmdb ${cfg.package}/bin/plausible eval "(Plausible.Release.prepare() ; Plausible.Auth.create_user(\"$ADMIN_USER_NAME\", \"$ADMIN_USER_EMAIL\", \"$ADMIN_USER_PWD\"))" @@ -326,6 +329,6 @@ in { ]; }; - meta.maintainers = with maintainers; [ ]; + meta.maintainers = with maintainers; [ xanderio ]; meta.doc = ./plausible.md; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix index e80eedf9f8..d0b1512f77 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/pretalx.nix @@ -24,7 +24,7 @@ in { meta = with lib; { - maintainers = teams.c3d2.members; + maintainers = with maintainers; [ hexa] ++ teams.c3d2.members; }; options.services.pretalx = { @@ -286,16 +286,16 @@ in virtualHosts.${cfg.nginx.domain} = { # https://docs.pretalx.org/administrator/installation.html#step-7-ssl extraConfig = '' - more_set_headers Referrer-Policy same-origin; - more_set_headers X-Content-Type-Options nosniff; + more_set_headers "Referrer-Policy: same-origin"; + more_set_headers "X-Content-Type-Options: nosniff"; ''; locations = { "/".proxyPass = "http://pretalx"; "/media/" = { - alias = "${cfg.settings.filesystem.data}/data/media/"; + alias = "${cfg.settings.filesystem.data}/media/"; extraConfig = '' access_log off; - more_set_headers Content-Disposition 'attachment; filename="$1"'; + more_set_headers 'Content-Disposition: attachment; filename="$1"'; expires 7d; ''; }; @@ -329,10 +329,47 @@ in serviceConfig = { User = "pretalx"; Group = "pretalx"; - StateDirectory = [ "pretalx" "pretalx/media" ]; + StateDirectory = [ + "pretalx" + "pretalx/media" + ]; + StateDirectoryMode = "0750"; LogsDirectory = "pretalx"; WorkingDirectory = cfg.settings.filesystem.data; SupplementaryGroups = [ "redis-pretalx" ]; + AmbientCapabilities = ""; + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "@chown" + ]; + UMask = "0027"; }; }; in { @@ -395,6 +432,8 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${lib.getExe' pythonEnv "celery"} -A pretalx.celery_app worker ${cfg.celery.extraArgs}"; }); + + nginx.serviceConfig.SupplementaryGroups = lib.mkIf cfg.nginx.enable [ "pretalx" ]; }; systemd.sockets.pretalx-web.socketConfig = { @@ -403,11 +442,9 @@ in }; users = { - groups."${cfg.group}" = {}; - users."${cfg.user}" = { + groups.${cfg.group} = {}; + users.${cfg.user} = { isSystemUser = true; - createHome = true; - home = cfg.settings.filesystem.data; inherit (cfg) group; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/pretix.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/pretix.nix index 22ee9769aa..498face745 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/pretix.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/pretix.nix @@ -468,7 +468,7 @@ in StateDirectory = [ "pretix" ]; - StateDirectoryMode = "0755"; + StateDirectoryMode = "0750"; CacheDirectory = "pretix"; LogsDirectory = "pretix"; WorkingDirectory = cfg.settings.pretix.datadir; @@ -507,7 +507,7 @@ in "~@privileged" "@chown" ]; - UMask = "0022"; + UMask = "0027"; }; }; in { @@ -561,6 +561,8 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${getExe' pythonEnv "celery"} -A pretix.celery_app worker ${cfg.celery.extraArgs}"; }; + + nginx.serviceConfig.SupplementaryGroups = mkIf cfg.nginx.enable [ "pretix" ]; }; systemd.sockets.pretix-web.socketConfig = { @@ -569,11 +571,9 @@ in }; users = { - groups."${cfg.group}" = {}; - users."${cfg.user}" = { + groups.${cfg.group} = {}; + users.${cfg.user} = { isSystemUser = true; - createHome = true; - home = cfg.settings.pretix.datadir; inherit (cfg) group; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/your_spotify.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/your_spotify.nix new file mode 100644 index 0000000000..3eb2ffef4f --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/your_spotify.nix @@ -0,0 +1,191 @@ +{ + pkgs, + config, + lib, + ... +}: let + inherit + (lib) + boolToString + concatMapAttrs + concatStrings + isBool + mapAttrsToList + mkEnableOption + mkIf + mkOption + mkPackageOption + optionalAttrs + types + mkDefault + ; + cfg = config.services.your_spotify; + + configEnv = concatMapAttrs (name: value: + optionalAttrs (value != null) { + ${name} = + if isBool value + then boolToString value + else toString value; + }) + cfg.settings; + + configFile = pkgs.writeText "your_spotify.env" (concatStrings (mapAttrsToList (name: value: "${name}=${value}\n") configEnv)); +in { + options.services.your_spotify = let + inherit (types) nullOr port str path package; + in { + enable = mkEnableOption "your_spotify"; + + enableLocalDB = mkEnableOption "a local mongodb instance"; + nginxVirtualHost = mkOption { + type = nullOr str; + default = null; + description = '' + If set creates an nginx virtual host for the client. + In most cases this should be the CLIENT_ENDPOINT without + protocol prefix. + ''; + }; + + package = mkPackageOption pkgs "your_spotify" {}; + + clientPackage = mkOption { + type = package; + description = "Client package to use."; + }; + + spotifySecretFile = mkOption { + type = path; + description = '' + A file containing the secret key of your Spotify application. + Refer to: [Creating the Spotify Application](https://github.com/Yooooomi/your_spotify#creating-the-spotify-application). + ''; + }; + + settings = mkOption { + description = '' + Your Spotify Configuration. Refer to [Your Spotify](https://github.com/Yooooomi/your_spotify) for definitions and values. + ''; + example = lib.literalExpression '' + { + CLIENT_ENDPOINT = "https://example.com"; + API_ENDPOINT = "https://api.example.com"; + SPOTIFY_PUBLIC = "spotify_client_id"; + } + ''; + type = types.submodule { + freeformType = types.attrsOf types.str; + options = { + CLIENT_ENDPOINT = mkOption { + type = str; + description = '' + The endpoint of your web application. + Has to include a protocol Prefix (e.g. `http://`) + ''; + example = "https://your_spotify.example.org"; + }; + API_ENDPOINT = mkOption { + type = str; + description = '' + The endpoint of your server + This api has to be reachable from the device you use the website from not from the server. + This means that for example you may need two nginx virtual hosts if you want to expose this on the + internet. + Has to include a protocol Prefix (e.g. `http://`) + ''; + example = "https://localhost:3000"; + }; + SPOTIFY_PUBLIC = mkOption { + type = str; + description = '' + The public client ID of your Spotify application. + Refer to: [Creating the Spotify Application](https://github.com/Yooooomi/your_spotify#creating-the-spotify-application) + ''; + }; + MONGO_ENDPOINT = mkOption { + type = str; + description = ''The endpoint of the Mongo database.''; + default = "mongodb://localhost:27017/your_spotify"; + }; + PORT = mkOption { + type = port; + description = "The port of the api server"; + default = 3000; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable { + services.your_spotify.clientPackage = mkDefault (cfg.package.client.override {apiEndpoint = cfg.settings.API_ENDPOINT;}); + systemd.services.your_spotify = { + after = ["network.target"]; + script = '' + export SPOTIFY_SECRET=$(< "$CREDENTIALS_DIRECTORY/SPOTIFY_SECRET") + ${lib.getExe' cfg.package "your_spotify_migrate"} + exec ${lib.getExe cfg.package} + ''; + serviceConfig = { + User = "your_spotify"; + Group = "your_spotify"; + DynamicUser = true; + EnvironmentFile = [configFile]; + StateDirectory = "your_spotify"; + LimitNOFILE = "1048576"; + PrivateTmp = true; + PrivateDevices = true; + StateDirectoryMode = "0700"; + Restart = "always"; + + LoadCredential = ["SPOTIFY_SECRET:${cfg.spotifySecretFile}"]; + + # Hardening + CapabilityBoundingSet = ""; + LockPersonality = true; + #MemoryDenyWriteExecute = true; # Leads to coredump because V8 does JIT + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "@pkey" + ]; + UMask = "0077"; + }; + wantedBy = ["multi-user.target"]; + }; + services.nginx = mkIf (cfg.nginxVirtualHost != null) { + enable = true; + virtualHosts.${cfg.nginxVirtualHost} = { + root = cfg.clientPackage; + locations."/".extraConfig = '' + add_header Content-Security-Policy "frame-ancestors 'none';" ; + add_header X-Content-Type-Options "nosniff" ; + try_files = $uri $uri/ /index.html ; + ''; + }; + }; + services.mongodb = mkIf cfg.enableLocalDB { + enable = true; + }; + }; + meta.maintainers = with lib.maintainers; [patrickdag]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix index 08ce50bff6..064a0c71b5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix @@ -360,14 +360,15 @@ in serviceConfig = let runOptions = ''--config ${configPath} ${optionalString (cfg.adapter != null) "--adapter ${cfg.adapter}"}''; in { + # Override the `ExecStart` line from upstream's systemd unit file by our own: # https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= # If the empty string is assigned to this option, the list of commands to start is reset, prior assignments of this option will have no effect. ExecStart = [ "" ''${cfg.package}/bin/caddy run ${runOptions} ${optionalString cfg.resume "--resume"}'' ]; # Validating the configuration before applying it ensures we’ll get a proper error that will be reported when switching to the configuration - ExecReload = [ "" ''${cfg.package}/bin/caddy reload ${runOptions} --force'' ]; + ExecReload = [ "" ] ++ lib.optional cfg.enableReload "${lib.getExe cfg.package} reload ${runOptions} --force"; User = cfg.user; Group = cfg.group; - ReadWriteDirectories = cfg.dataDir; + ReadWritePaths = [ cfg.dataDir ]; StateDirectory = mkIf (cfg.dataDir == "/var/lib/caddy") [ "caddy" ]; LogsDirectory = mkIf (cfg.logDir == "/var/log/caddy") [ "caddy" ]; Restart = "on-failure"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix index 39ea8f21b1..d2a5109e26 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix @@ -52,13 +52,6 @@ in type = types.path; description = "The main data storage, put this on your large storage (e.g. high capacity HDD)"; }; - - replication_mode = mkOption { - default = "none"; - type = types.enum ([ "none" "1" "2" "3" "2-dangerous" "3-dangerous" "3-degraded" 1 2 3 ]); - apply = v: toString v; - description = "Garage replication mode, defaults to none, see: for reference."; - }; }; }; description = "Garage configuration, see for reference."; @@ -71,6 +64,44 @@ in }; config = mkIf cfg.enable { + + assertions = [ + # We removed our module-level default for replication_mode. If a user upgraded + # to garage 1.0.0 while relying on the module-level default, they would be left + # with a config which evaluates and builds, but then garage refuses to start + # because either replication_factor or replication_mode is required. + # The replication_factor option also was `toString`'ed before, which is + # now not possible anymore, so we prompt the user to change it to a string + # if present. + # These assertions can be removed in NixOS 24.11, when all users have been + # warned once. + { + assertion = (cfg.settings ? replication_factor || cfg.settings ? replication_mode) || lib.versionOlder cfg.package "1.0.0"; + message = '' + Garage 1.0.0 requires an explicit replication factor to be set. + Please set replication_factor to 1 explicitly to preserve the previous behavior. + https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v1.0.0/doc/book/reference-manual/configuration.md#replication_factor + + ''; + } + { + assertion = lib.isString (cfg.settings.replication_mode or ""); + message = '' + The explicit `replication_mode` option in `services.garage.settings` + has been removed and is now handled by the freeform settings in order + to allow it being completely absent (for Garage 1.x). + That module option previously `toString`'ed the value it's configured + with, which is now no longer possible. + + You're still using a non-string here, please manually set it to + a string, or migrate to the separate setting keys introduced in 1.x. + + Refer to https://garagehq.deuxfleurs.fr/documentation/working-documents/migration-1/ + for the migration guide. + ''; + } + ]; + environment.etc."garage.toml" = { source = configFile; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 40470f535b..f9720c3629 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -142,7 +142,11 @@ let default_type application/octet-stream; ''; - configFile = pkgs.writers.writeNginxConfig "nginx.conf" '' + configFile = ( + if cfg.validateConfigFile + then pkgs.writers.writeNginxConfig + else pkgs.writeText + ) "nginx.conf" '' pid /run/nginx/nginx.pid; error_log ${cfg.logError}; daemon off; @@ -352,7 +356,8 @@ let # The acme-challenge location doesn't need to be added if we are not using any automated # certificate provisioning and can also be omitted when we use a certificate obtained via a DNS-01 challenge - acmeLocation = optionalString (vhost.enableACME || (vhost.useACMEHost != null && config.security.acme.certs.${vhost.useACMEHost}.dnsProvider == null)) + acmeName = if vhost.useACMEHost != null then vhost.useACMEHost else vhost.serverName; + acmeLocation = optionalString ((vhost.enableACME || vhost.useACMEHost != null) && config.security.acme.certs.${acmeName}.dnsProvider == null) # Rule for legitimate ACME Challenge requests (like /.well-known/acme-challenge/xxxxxxxxx) # We use ^~ here, so that we don't check any regexes (which could # otherwise easily override this intended match accidentally). @@ -829,7 +834,7 @@ in sslCiphers = mkOption { type = types.nullOr types.str; # Keep in sync with https://ssl-config.mozilla.org/#server=nginx&config=intermediate - default = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"; + default = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305"; description = "Ciphers to choose from when negotiating TLS handshakes."; }; @@ -1081,6 +1086,9 @@ in ''; description = "Declarative vhost config"; }; + validateConfigFile = lib.mkEnableOption '' + Validate configuration with pkgs.writeNginxConfig. + '' // { default = true; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix index 9c53455bcf..1a65ce2111 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix @@ -170,7 +170,7 @@ in { PrivateDevices = true; ProtectHome = true; ProtectSystem = "full"; - ReadWriteDirectories = cfg.dataDir; + ReadWritePaths = [ cfg.dataDir ]; RuntimeDirectory = "traefik"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/budgie.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/budgie.nix index 75ee82f1f9..b4e7390293 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -214,7 +214,7 @@ in { services.geoclue2.enable = mkDefault true; # for BCC's Privacy > Location Services panel. services.upower.enable = config.powerManagement.enable; # for Budgie's Status Indicator and BCC's Power panel. - services.xserver.libinput.enable = mkDefault true; # for BCC's Mouse panel. + services.libinput.enable = mkDefault true; # for BCC's Mouse panel. services.colord.enable = mkDefault true; # for BCC's Color panel. services.gnome.at-spi2-core.enable = mkDefault true; # for BCC's A11y panel. services.accounts-daemon.enable = mkDefault true; # for BCC's Users panel. diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 8c29b41c8c..2e0eef67c0 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -116,7 +116,7 @@ in services.touchegg.enable = mkDefault true; services.udisks2.enable = true; services.upower.enable = mkDefault config.powerManagement.enable; - services.xserver.libinput.enable = mkDefault true; + services.libinput.enable = mkDefault true; services.xserver.updateDbusEnvironment = true; networking.networkmanager.enable = mkDefault true; @@ -157,6 +157,7 @@ in # packages nemo-with-extensions + gnome-online-accounts-gtk cinnamon-control-center cinnamon-settings-daemon libgnomekbd diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix index 680ce7b9a9..30bd14adb4 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -61,7 +61,7 @@ in services.gnome.gnome-keyring.enable = mkDefault true; services.bamf.enable = mkDefault true; - services.xserver.libinput.enable = mkDefault true; + services.libinput.enable = mkDefault true; services.udisks2.enable = true; services.upower.enable = mkDefault config.powerManagement.enable; networking.networkmanager.enable = mkDefault true; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix index 6fe606f922..42e66e86e1 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/default.nix @@ -1,8 +1,7 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkOption types; xcfg = config.services.xserver; cfg = xcfg.desktopManager; @@ -59,7 +58,7 @@ in session = mkOption { internal = true; default = []; - example = singleton + example = lib.singleton { name = "kde"; bgSupport = true; start = "..."; @@ -73,26 +72,15 @@ in manage = "desktop"; start = d.start # literal newline to ensure d.start's last line is not appended to - + optionalString (needBGCond d) '' + + lib.optionalString (needBGCond d) '' if [ -e $HOME/.background-image ]; then - ${pkgs.feh}/bin/feh --bg-${cfg.wallpaper.mode} ${optionalString cfg.wallpaper.combineScreens "--no-xinerama"} $HOME/.background-image + ${pkgs.feh}/bin/feh --bg-${cfg.wallpaper.mode} ${lib.optionalString cfg.wallpaper.combineScreens "--no-xinerama"} $HOME/.background-image fi ''; }); }; - default = mkOption { - type = types.nullOr types.str; - default = null; - example = "none"; - description = '' - **Deprecated**, please use [](#opt-services.displayManager.defaultSession) instead. - - Default desktop manager loaded if none have been chosen. - ''; - }; - }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 09f90e1cd4..0a341ba133 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -96,7 +96,7 @@ in services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - services.xserver.libinput.enable = mkDefault true; + services.libinput.enable = mkDefault true; services.dbus.packages = [ e.efl ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix index 95c79cf961..fe50d930b5 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -1,8 +1,7 @@ { config, lib, pkgs, utils, ... }: -with lib; - let + inherit (lib) mkOption types mkDefault mkEnableOption literalExpression; cfg = config.services.xserver.desktopManager.gnome; serviceCfg = config.services.gnome; @@ -51,8 +50,8 @@ let destination = "/share/gnome-background-properties/nixos.xml"; }; - flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0; - flashbackWms = optional cfg.flashback.enableMetacity { + flashbackEnabled = cfg.flashback.enableMetacity || lib.length cfg.flashback.customSessions > 0; + flashbackWms = lib.optional cfg.flashback.enableMetacity { wmName = "metacity"; wmLabel = "Metacity"; wmCommand = "${pkgs.gnome.metacity}/bin/metacity"; @@ -67,73 +66,9 @@ in meta = { doc = ./gnome.md; - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; - imports = [ - # Added 2021-05-07 - (mkRenamedOptionModule - [ "services" "gnome3" "core-os-services" "enable" ] - [ "services" "gnome" "core-os-services" "enable" ] - ) - (mkRenamedOptionModule - [ "services" "gnome3" "core-shell" "enable" ] - [ "services" "gnome" "core-shell" "enable" ] - ) - (mkRenamedOptionModule - [ "services" "gnome3" "core-utilities" "enable" ] - [ "services" "gnome" "core-utilities" "enable" ] - ) - (mkRenamedOptionModule - [ "services" "gnome3" "core-developer-tools" "enable" ] - [ "services" "gnome" "core-developer-tools" "enable" ] - ) - (mkRenamedOptionModule - [ "services" "gnome3" "games" "enable" ] - [ "services" "gnome" "games" "enable" ] - ) - (mkRenamedOptionModule - [ "services" "gnome3" "experimental-features" "realtime-scheduling" ] - [ "services" "gnome" "experimental-features" "realtime-scheduling" ] - ) - (mkRenamedOptionModule - [ "services" "xserver" "desktopManager" "gnome3" "enable" ] - [ "services" "xserver" "desktopManager" "gnome" "enable" ] - ) - (mkRenamedOptionModule - [ "services" "xserver" "desktopManager" "gnome3" "sessionPath" ] - [ "services" "xserver" "desktopManager" "gnome" "sessionPath" ] - ) - (mkRenamedOptionModule - [ "services" "xserver" "desktopManager" "gnome3" "favoriteAppsOverride" ] - [ "services" "xserver" "desktopManager" "gnome" "favoriteAppsOverride" ] - ) - (mkRenamedOptionModule - [ "services" "xserver" "desktopManager" "gnome3" "extraGSettingsOverrides" ] - [ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverrides" ] - ) - (mkRenamedOptionModule - [ "services" "xserver" "desktopManager" "gnome3" "extraGSettingsOverridePackages" ] - [ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverridePackages" ] - ) - (mkRenamedOptionModule - [ "services" "xserver" "desktopManager" "gnome3" "debug" ] - [ "services" "xserver" "desktopManager" "gnome" "debug" ] - ) - (mkRenamedOptionModule - [ "services" "xserver" "desktopManager" "gnome3" "flashback" ] - [ "services" "xserver" "desktopManager" "gnome" "flashback" ] - ) - (mkRenamedOptionModule - [ "environment" "gnome3" "excludePackages" ] - [ "environment" "gnome" "excludePackages" ] - ) - (mkRemovedOptionModule - [ "services" "gnome" "experimental-features" "realtime-scheduling" ] - "Set `security.rtkit.enable = true;` to make realtime scheduling possible. (Still needs to be enabled using GSettings.)" - ) - ]; - options = { services.gnome = { @@ -248,8 +183,8 @@ in }; - config = mkMerge [ - (mkIf (cfg.enable || flashbackEnabled) { + config = lib.mkMerge [ + (lib.mkIf (cfg.enable || flashbackEnabled) { # Seed our configuration into nixos-generate-config system.nixos-generate-config.desktopConfiguration = ['' # Enable the GNOME Desktop Environment. @@ -264,7 +199,7 @@ in services.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ]; environment.extraInit = '' - ${concatMapStrings (p: '' + ${lib.concatMapStrings (p: '' if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} fi @@ -278,19 +213,19 @@ in environment.systemPackages = cfg.sessionPath; - environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1"; + environment.sessionVariables.GNOME_SESSION_DEBUG = lib.mkIf cfg.debug "1"; # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; }) - (mkIf flashbackEnabled { + (lib.mkIf flashbackEnabled { services.displayManager.sessionPackages = let wmNames = map (wm: wm.wmName) flashbackWms; namesAreUnique = lib.unique wmNames == wmNames; in - assert (assertMsg namesAreUnique "Flashback WM names must be unique."); + assert (lib.assertMsg namesAreUnique "Flashback WM names must be unique."); map (wm: pkgs.gnome.gnome-flashback.mkSessionForWm { @@ -318,7 +253,7 @@ in ++ (map (wm: gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms); }) - (mkIf serviceCfg.core-os-services.enable { + (lib.mkIf serviceCfg.core-os-services.enable { hardware.bluetooth.enable = mkDefault true; hardware.pulseaudio.enable = mkDefault true; programs.dconf.enable = true; @@ -339,7 +274,7 @@ in # services.packagekit.enable = mkDefault true; services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center + services.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center # Explicitly enabled since GNOME will be severely broken without these. xdg.mime.enable = true; @@ -371,7 +306,7 @@ in ]; }) - (mkIf serviceCfg.core-shell.enable { + (lib.mkIf serviceCfg.core-shell.enable { services.xserver.desktopManager.gnome.sessionPath = let mandatoryPackages = [ @@ -393,7 +328,7 @@ in services.gnome.gnome-user-share.enable = mkDefault true; services.gnome.rygel.enable = mkDefault true; services.gvfs.enable = true; - services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (mkDefault true)); systemd.packages = with pkgs.gnome; [ gnome-session @@ -408,10 +343,6 @@ in services.avahi.enable = mkDefault true; - xdg.portal.extraPortals = [ - pkgs.gnome.gnome-shell - ]; - services.geoclue2.enable = mkDefault true; services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent @@ -463,7 +394,7 @@ in }) # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-45/elements/core/meta-gnome-core-utilities.bst - (mkIf serviceCfg.core-utilities.enable { + (lib.mkIf serviceCfg.core-utilities.enable { environment.systemPackages = with pkgs.gnome; utils.removePackagesByName @@ -524,7 +455,7 @@ in ]; }) - (mkIf serviceCfg.games.enable { + (lib.mkIf serviceCfg.games.enable { environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [ aisleriot atomix @@ -550,7 +481,7 @@ in }) # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst - (mkIf serviceCfg.core-developer-tools.enable { + (lib.mkIf serviceCfg.core-developer-tools.enable { environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [ dconf-editor devhelp diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix index 1937bdcbd3..ac86c385bc 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -69,7 +69,7 @@ in services.upower.enable = config.powerManagement.enable; - services.xserver.libinput.enable = mkDefault true; + services.libinput.enable = mkDefault true; xdg.portal.lxqt.enable = mkDefault true; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix index 520d40d679..19235be4aa 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix @@ -84,11 +84,12 @@ in programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.gnome.at-spi2-core.enable = true; + services.gnome.glib-networking.enable = true; services.gnome.gnome-keyring.enable = true; services.udev.packages = [ pkgs.mate.mate-settings-daemon ]; services.gvfs.enable = true; services.upower.enable = config.powerManagement.enable; - services.xserver.libinput.enable = mkDefault true; + services.libinput.enable = mkDefault true; security.pam.services.mate-screensaver.unixAuth = true; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix index 57ccbaccb0..008bc65eb6 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -159,7 +159,7 @@ in services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ]; services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - services.xserver.libinput.enable = mkDefault true; + services.libinput.enable = mkDefault true; services.xserver.updateDbusEnvironment = true; services.zeitgeist.enable = mkDefault true; services.geoclue2.enable = mkDefault true; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 56fcd70dc9..7d80b9b264 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -348,7 +348,7 @@ in services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true); services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - services.xserver.libinput.enable = mkDefault true; + services.libinput.enable = mkDefault true; # Extra UDEV rules used by Solid services.udev.packages = [ diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix index c55d0021b6..85d0d199de 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -164,7 +164,7 @@ in services.gvfs.enable = true; services.tumbler.enable = true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); - services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager + services.libinput.enable = mkDefault true; # used in xfce4-settings-manager # Enable default programs programs.dconf.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix index 0f9b712c6d..87331a6658 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix @@ -9,9 +9,8 @@ { config, lib, options, pkgs, ... }: -with lib; - let + inherit (lib) mkOption types literalExpression optionalString; cfg = config.services.xserver; xorg = pkgs.xorg; @@ -91,7 +90,7 @@ let # Import environment variables into the systemd user environment. ${optionalString (cfg.displayManager.importedVariables != []) ( "/run/current-system/systemd/bin/systemctl --user import-environment " - + toString (unique cfg.displayManager.importedVariables) + + toString (lib.unique cfg.displayManager.importedVariables) )} # Speed up application start by 50-150ms according to @@ -222,13 +221,6 @@ in }; config = { - assertions = [ - { - assertion = cfg.desktopManager.default != null || cfg.windowManager.default != null -> cfg.displayManager.defaultSession == defaultSessionFromLegacyOptions; - message = "You cannot use both services.displayManager.defaultSession option and legacy options (services.xserver.desktopManager.default and services.xserver.windowManager.default)."; - } - ]; - services.displayManager.sessionData.wrapper = xsessionWrapper; services.xserver.displayManager.xserverBin = "${xorg.xorgserver.out}/bin/X"; @@ -254,8 +246,8 @@ in # that do not have upstream session files (those defined using services.{display,desktop,window}Manager.session options). services.displayManager.sessionPackages = let - dms = filter (s: s.manage == "desktop") cfg.displayManager.session; - wms = filter (s: s.manage == "window") cfg.displayManager.session; + dms = lib.filter (s: s.manage == "desktop") cfg.displayManager.session; + wms = lib.filter (s: s.manage == "window") cfg.displayManager.session; # Script responsible for starting the window manager and the desktop manager. xsession = dm: wm: pkgs.writeScript "xsession" '' @@ -283,16 +275,16 @@ in ''; in # We will generate every possible pair of WM and DM. - concatLists ( + lib.concatLists ( lib.mapCartesianProduct ({dm, wm}: let sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}"; script = xsession dm wm; desktopNames = if dm ? desktopNames - then concatStringsSep ";" dm.desktopNames + then lib.concatStringsSep ";" dm.desktopNames else sessionName; in - optional (dm.name != "none" || wm.name != "none") + lib.optional (dm.name != "none" || wm.name != "none") (pkgs.writeTextFile { name = "${sessionName}-xsession"; destination = "/share/xsessions/${sessionName}.desktop"; @@ -317,11 +309,11 @@ in }; imports = [ - (mkRemovedOptionModule [ "services" "xserver" "displayManager" "desktopManagerHandlesLidAndPower" ] + (lib.mkRemovedOptionModule [ "services" "xserver" "displayManager" "desktopManagerHandlesLidAndPower" ] "The option is no longer necessary because all display managers have already delegated lid management to systemd.") - (mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logsXsession" ] [ "services" "displayManager" "logToFile" ]) - (mkRenamedOptionModule [ "services" "xserver" "displayManager" "logToJournal" ] [ "services" "displayManager" "logToJournal" ]) - (mkRenamedOptionModule [ "services" "xserver" "displayManager" "extraSessionFilesPackages" ] [ "services" "displayManager" "sessionPackages" ]) + (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logsXsession" ] [ "services" "displayManager" "logToFile" ]) + (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "logToJournal" ] [ "services" "displayManager" "logToJournal" ]) + (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "extraSessionFilesPackages" ] [ "services" "displayManager" "sessionPackages" ]) ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/x11/hardware/cmt.nix b/third_party/nixpkgs/nixos/modules/services/x11/hardware/cmt.nix index 55d3d840ee..53906c5c71 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/hardware/cmt.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/hardware/cmt.nix @@ -46,10 +46,10 @@ in { assertions = [ { - assertion = !config.services.xserver.libinput.enable; + assertion = !config.services.libinput.enable; message = '' cmt and libinput are incompatible, meaning you cannot enable them both. - To use cmt you need to disable libinput with `services.xserver.libinput.enable = false` + To use cmt you need to disable libinput with `services.libinput.enable = false` If you haven't enabled it in configuration.nix, it's enabled by default on a different xserver module. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix b/third_party/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix index 4dfa917d8f..c43fdac6b1 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix @@ -30,7 +30,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable touchpad support. Deprecated: Consider services.xserver.libinput.enable."; + description = "Whether to enable touchpad support. Deprecated: Consider services.libinput.enable."; }; dev = mkOption { @@ -207,8 +207,8 @@ in { assertions = [ { - assertion = !config.services.xserver.libinput.enable; - message = "Synaptics and libinput are incompatible, you cannot enable both (in services.xserver)."; + assertion = !config.services.libinput.enable; + message = "Synaptics and libinput are incompatible, you cannot enable both."; } ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix index 5500c77a03..09b49962f2 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix @@ -10,7 +10,7 @@ in options = { services.xserver.windowManager.clfswm = { enable = mkEnableOption "clfswm"; - package = mkPackageOption pkgs [ "lispPackages" "clfswm" ] { }; + package = mkPackageOption pkgs [ "sbclPackages" "clfswm" ] { }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/default.nix index ec54e4cc12..85eb4c6614 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/default.nix @@ -1,8 +1,7 @@ { config, lib, ... }: -with lib; - let + inherit (lib) mkOption types; cfg = config.services.xserver.windowManager; in @@ -72,17 +71,6 @@ in }); }; - default = mkOption { - type = types.nullOr types.str; - default = null; - example = "wmii"; - description = '' - **Deprecated**, please use [](#opt-services.displayManager.defaultSession) instead. - - Default window manager loaded if none have been chosen. - ''; - }; - }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix index e13c273746..5a86d055c2 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix @@ -728,9 +728,6 @@ in rm -f /tmp/.X0-lock ''; - # TODO: move declaring the systemd service to its own mkIf - script = mkIf (config.systemd.services.display-manager.enable == true) "${config.services.displayManager.execCmd}"; - # Stop restarting if the display manager stops (crashes) 2 times # in one minute. Starting X typically takes 3-4s. startLimitIntervalSec = 30; diff --git a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl index ba45231465..cabc1dcc2d 100755 --- a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl +++ b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl @@ -472,6 +472,9 @@ sub handle_modified_unit { ## no critic(Subroutines::ProhibitManyArgs, Subroutin $units_to_reload->{$unit} = 1; record_unit($reload_list_file, $unit); } + elsif ($unit eq "dbus.service" || $unit eq "dbus-broker.service") { + # dbus service should only ever be reloaded, not started/stoped/restarted as that would break the system. + } elsif (!parse_systemd_bool(\%new_unit_info, "Service", "X-RestartIfChanged", 1) || parse_systemd_bool(\%new_unit_info, "Unit", "RefuseManualStop", 0) || parse_systemd_bool(\%new_unit_info, "Unit", "X-OnlyManualStart", 0)) { $units_to_skip->{$unit} = 1; } else { diff --git a/third_party/nixpkgs/nixos/modules/system/activation/switchable-system.nix b/third_party/nixpkgs/nixos/modules/system/activation/switchable-system.nix index d5bd8cc1dc..d70fefd092 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/switchable-system.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/switchable-system.nix @@ -4,52 +4,93 @@ let perlWrapped = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]); + description = extra: '' + Whether to include the capability to switch configurations. + + Disabling this makes the system unable to be reconfigured via `nixos-rebuild`. + + ${extra} + ''; + in { - options = { - system.switch.enable = lib.mkOption { + options.system.switch = { + enable = lib.mkOption { type = lib.types.bool; default = true; - description = '' - Whether to include the capability to switch configurations. - - Disabling this makes the system unable to be reconfigured via `nixos-rebuild`. - + description = description '' This is good for image based appliances where updates are handled outside the image. Reducing features makes the image lighter and slightly more secure. ''; }; + + enableNg = lib.mkOption { + type = lib.types.bool; + default = false; + description = description '' + Whether to use `switch-to-configuration-ng`, an experimental + re-implementation of `switch-to-configuration` with the goal of + replacing the original. + ''; + }; }; - config = lib.mkIf config.system.switch.enable { - system.activatableSystemBuilderCommands = '' - mkdir $out/bin - substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \ - --subst-var out \ - --subst-var-by toplevel ''${!toplevelVar} \ - --subst-var-by coreutils "${pkgs.coreutils}" \ - --subst-var-by distroId ${lib.escapeShellArg config.system.nixos.distroId} \ - --subst-var-by installBootLoader ${lib.escapeShellArg config.system.build.installBootLoader} \ - --subst-var-by localeArchive "${config.i18n.glibcLocales}/lib/locale/locale-archive" \ - --subst-var-by perl "${perlWrapped}" \ - --subst-var-by shell "${pkgs.bash}/bin/sh" \ - --subst-var-by su "${pkgs.shadow.su}/bin/su" \ - --subst-var-by systemd "${config.systemd.package}" \ - --subst-var-by utillinux "${pkgs.util-linux}" \ - ; + config = lib.mkMerge [ + { + assertions = [{ + assertion = with config.system.switch; enable -> !enableNg; + message = "Only one of system.switch.enable and system.switch.enableNg may be enabled at a time"; + }]; + } + (lib.mkIf config.system.switch.enable { + system.activatableSystemBuilderCommands = '' + mkdir $out/bin + substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \ + --subst-var out \ + --subst-var-by toplevel ''${!toplevelVar} \ + --subst-var-by coreutils "${pkgs.coreutils}" \ + --subst-var-by distroId ${lib.escapeShellArg config.system.nixos.distroId} \ + --subst-var-by installBootLoader ${lib.escapeShellArg config.system.build.installBootLoader} \ + --subst-var-by localeArchive "${config.i18n.glibcLocales}/lib/locale/locale-archive" \ + --subst-var-by perl "${perlWrapped}" \ + --subst-var-by shell "${pkgs.bash}/bin/sh" \ + --subst-var-by su "${pkgs.shadow.su}/bin/su" \ + --subst-var-by systemd "${config.systemd.package}" \ + --subst-var-by utillinux "${pkgs.util-linux}" \ + ; - chmod +x $out/bin/switch-to-configuration - ${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' - if ! output=$(${perlWrapped}/bin/perl -c $out/bin/switch-to-configuration 2>&1); then - echo "switch-to-configuration syntax is not valid:" - echo "$output" - exit 1 - fi - ''} - ''; - }; + chmod +x $out/bin/switch-to-configuration + ${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' + if ! output=$(${perlWrapped}/bin/perl -c $out/bin/switch-to-configuration 2>&1); then + echo "switch-to-configuration syntax is not valid:" + echo "$output" + exit 1 + fi + ''} + ''; + }) + (lib.mkIf config.system.switch.enableNg { + # Use a subshell so we can source makeWrapper's setup hook without + # affecting the rest of activatableSystemBuilderCommands. + system.activatableSystemBuilderCommands = '' + ( + source ${pkgs.buildPackages.makeWrapper}/nix-support/setup-hook + + mkdir $out/bin + ln -sf ${lib.getExe pkgs.switch-to-configuration-ng} $out/bin/switch-to-configuration + wrapProgram $out/bin/switch-to-configuration \ + --set OUT $out \ + --set TOPLEVEL ''${!toplevelVar} \ + --set DISTRO_ID ${lib.escapeShellArg config.system.nixos.distroId} \ + --set INSTALL_BOOTLOADER ${lib.escapeShellArg config.system.build.installBootLoader} \ + --set LOCALE_ARCHIVE ${config.i18n.glibcLocales}/lib/locale/locale-archive \ + --set SYSTEMD ${config.systemd.package} + ) + ''; + }) + ]; } diff --git a/third_party/nixpkgs/nixos/modules/system/activation/test.nix b/third_party/nixpkgs/nixos/modules/system/activation/test.nix index 8cf000451c..fd251d5289 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/test.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/test.nix @@ -5,7 +5,7 @@ }: let node-forbiddenDependencies-fail = nixos ({ ... }: { - system.forbiddenDependenciesRegex = "-dev$"; + system.forbiddenDependenciesRegexes = ["-dev$"]; environment.etc."dev-dependency" = { text = "${expect.dev}"; }; @@ -14,7 +14,7 @@ let boot.loader.grub.enable = false; }); node-forbiddenDependencies-succeed = nixos ({ ... }: { - system.forbiddenDependenciesRegex = "-dev$"; + system.forbiddenDependenciesRegexes = ["-dev$"]; system.extraDependencies = [ expect.dev ]; documentation.enable = false; fileSystems."/".device = "ignore-root-device"; diff --git a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix index 4cf3012646..ed0ece19f2 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -86,6 +86,7 @@ in ../build.nix (mkRemovedOptionModule [ "nesting" "clone" ] "Use `specialisation.«name» = { inheritParentConfig = true; configuration = { ... }; }` instead.") (mkRemovedOptionModule [ "nesting" "children" ] "Use `specialisation.«name».configuration = { ... }` instead.") + (mkRenamedOptionModule [ "system" "forbiddenDependenciesRegex" ] [ "system" "forbiddenDependenciesRegexes" ]) ]; options = { @@ -160,12 +161,12 @@ in ''; }; - system.forbiddenDependenciesRegex = mkOption { - default = ""; - example = "-dev$"; - type = types.str; + system.forbiddenDependenciesRegexes = mkOption { + default = []; + example = ["-dev$"]; + type = types.listOf types.str; description = '' - A POSIX Extended Regular Expression that matches store paths that + POSIX Extended Regular Expressions that match store paths that should not appear in the system closure, with the exception of {option}`system.extraDependencies`, which is not checked. ''; }; @@ -289,15 +290,14 @@ in "$out/configuration.nix" '' + optionalString - (config.system.forbiddenDependenciesRegex != "") - '' - if [[ $forbiddenDependenciesRegex != "" && -n $closureInfo ]]; then - if forbiddenPaths="$(grep -E -- "$forbiddenDependenciesRegex" $closureInfo/store-paths)"; then + (config.system.forbiddenDependenciesRegexes != []) (lib.concatStringsSep "\n" (map (regex: '' + if [[ ${regex} != "" && -n $closureInfo ]]; then + if forbiddenPaths="$(grep -E -- "${regex}" $closureInfo/store-paths)"; then echo -e "System closure $out contains the following disallowed paths:\n$forbiddenPaths" exit 1 fi fi - ''; + '') config.system.forbiddenDependenciesRegexes)); system.systemBuilderArgs = { @@ -319,8 +319,7 @@ in # option, as opposed to `system.extraDependencies`. passedChecks = concatStringsSep " " config.system.checks; } - // lib.optionalAttrs (config.system.forbiddenDependenciesRegex != "") { - inherit (config.system) forbiddenDependenciesRegex; + // lib.optionalAttrs (config.system.forbiddenDependenciesRegexes != []) { closureInfo = pkgs.closureInfo { rootPaths = [ # override to avoid infinite recursion (and to allow using extraDependencies to add forbidden dependencies) (config.system.build.toplevel.overrideAttrs (_: { extraDependencies = []; closureInfo = null; })) diff --git a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix index 3605ce5691..572bfeda7a 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix @@ -280,7 +280,7 @@ in { }; config = { - boot.binfmt.registrations = builtins.listToAttrs (map (system: { + boot.binfmt.registrations = builtins.listToAttrs (map (system: assert system != pkgs.system; { name = system; value = { config, ... }: let interpreter = getEmulator system; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix index fe340cfaed..9c36651d68 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix @@ -6,7 +6,6 @@ let concatMap concatMapStrings concatStrings - concatStringsSep escapeShellArg flip foldr @@ -491,10 +490,10 @@ in theme = mkOption { type = types.nullOr types.path; - example = literalExpression "pkgs.nixos-grub2-theme"; + example = literalExpression ''"''${pkgs.libsForQt5.breeze-grub}/grub/themes/breeze"''; default = null; description = '' - Grub theme to be used. + Path to the grub theme to be used. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 8b218cf1a6..cee8663f00 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -7,8 +7,22 @@ let efi = config.boot.loader.efi; + # We check the source code in a derivation that does not depend on the + # system configuration so that most users don't have to redo the check and require + # the necessary dependencies. + checkedSource = pkgs.runCommand "systemd-boot" { + preferLocalBuild = true; + } '' + install -m755 -D ${./systemd-boot-builder.py} $out + ${lib.getExe pkgs.buildPackages.mypy} \ + --no-implicit-optional \ + --disallow-untyped-calls \ + --disallow-untyped-defs \ + $out + ''; + systemdBootBuilder = pkgs.substituteAll rec { - src = ./systemd-boot-builder.py; + src = checkedSource; isExecutable = true; @@ -66,19 +80,9 @@ let ''; }; - checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" { } '' - mkdir -p $out/bin - install -m755 ${systemdBootBuilder} $out/bin/systemd-boot-builder - ${lib.getExe pkgs.buildPackages.mypy} \ - --no-implicit-optional \ - --disallow-untyped-calls \ - --disallow-untyped-defs \ - $out/bin/systemd-boot-builder - ''; - finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" '' #!${pkgs.runtimeShell} - ${checkedSystemdBootBuilder}/bin/systemd-boot-builder "$@" + ${systemdBootBuilder} "$@" ${cfg.extraInstallCommands} ''; in { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix index bb899c8d89..7f53efbf83 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -17,11 +17,13 @@ let "ManageForeignRoutingPolicyRules" "ManageForeignRoutes" "RouteTable" + "IPv6PrivacyExtensions" ]) (assertValueOneOf "SpeedMeter" boolValues) (assertInt "SpeedMeterIntervalSec") (assertValueOneOf "ManageForeignRoutingPolicyRules" boolValues) (assertValueOneOf "ManageForeignRoutes" boolValues) + (assertValueOneOf "IPv6PrivacyExtensions" (boolValues ++ ["prefer-public" "kernel"])) ]; sectionDHCPv4 = checkUnitConfig "DHCPv4" [ diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index aea6855f91..c82924763d 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -595,18 +595,17 @@ in }; systemd.units = - mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths - // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services - // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.slices - // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets - // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets - // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers - // listToAttrs (map - (v: let n = escapeSystemdPath v.where; - in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts) - // listToAttrs (map - (v: let n = escapeSystemdPath v.where; - in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts); + let + withName = cfgToUnit: cfg: lib.nameValuePair cfg.name (cfgToUnit cfg); + in + mapAttrs' (_: withName pathToUnit) cfg.paths + // mapAttrs' (_: withName serviceToUnit) cfg.services + // mapAttrs' (_: withName sliceToUnit) cfg.slices + // mapAttrs' (_: withName socketToUnit) cfg.sockets + // mapAttrs' (_: withName targetToUnit) cfg.targets + // mapAttrs' (_: withName timerToUnit) cfg.timers + // listToAttrs (map (withName mountToUnit) cfg.mounts) + // listToAttrs (map (withName automountToUnit) cfg.automounts); # Environment of PID 1 systemd.managerEnvironment = { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix index 00441b693d..cc32b2a15e 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix @@ -490,18 +490,18 @@ in { targets.initrd.aliases = ["default.target"]; units = - mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths - // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services - // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.slices - // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets - // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets - // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers + mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit v)) cfg.paths + // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit v)) cfg.services + // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit v)) cfg.slices + // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit v)) cfg.sockets + // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit v)) cfg.targets + // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit v)) cfg.timers // listToAttrs (map (v: let n = escapeSystemdPath v.where; - in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts) + in nameValuePair "${n}.mount" (mountToUnit v)) cfg.mounts) // listToAttrs (map (v: let n = escapeSystemdPath v.where; - in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts); + in nameValuePair "${n}.automount" (automountToUnit v)) cfg.automounts); # make sure all the /dev nodes are set up services.systemd-tmpfiles-setup-dev.wantedBy = ["sysinit.target"]; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix index 4c7b51ee22..2685cf7e28 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix @@ -175,12 +175,12 @@ in { }; systemd.user.units = - mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths - // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services - // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.slices - // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets - // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets - // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers; + mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit v)) cfg.paths + // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit v)) cfg.services + // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit v)) cfg.slices + // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit v)) cfg.sockets + // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit v)) cfg.targets + // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit v)) cfg.timers; # Generate timer units for all services that have a ‘startAt’ value. systemd.user.timers = diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix index 2c749d45d7..b75817a011 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix @@ -441,21 +441,45 @@ in {manpage}`systemd.time(7)`. ''; }; + + randomizedDelaySec = mkOption { + default = "6h"; + type = types.str; + example = "12h"; + description = '' + Add a randomized delay before each ZFS trim. + The delay will be chosen between zero and this value. + This value must be a time span in the format specified by + {manpage}`systemd.time(7)` + ''; + }; }; services.zfs.autoScrub = { enable = mkEnableOption "periodic scrubbing of ZFS pools"; interval = mkOption { - default = "Sun, 02:00"; + default = "monthly"; type = types.str; - example = "daily"; + example = "quarterly"; description = '' Systemd calendar expression when to scrub ZFS pools. See {manpage}`systemd.time(7)`. ''; }; + randomizedDelaySec = mkOption { + default = "6h"; + type = types.str; + example = "12h"; + description = '' + Add a randomized delay before each ZFS autoscrub. + The delay will be chosen between zero and this value. + This value must be a time span in the format specified by + {manpage}`systemd.time(7)` + ''; + }; + pools = mkOption { default = []; type = types.listOf types.str; @@ -862,6 +886,7 @@ in timerConfig = { OnCalendar = cfgScrub.interval; Persistent = "yes"; + RandomizedDelaySec = cfgScrub.randomizedDelaySec; }; }; }) @@ -879,7 +904,10 @@ in serviceConfig.ExecStart = "${pkgs.runtimeShell} -c 'for pool in $(zpool list -H -o name); do zpool trim $pool; done || true' "; }; - systemd.timers.zpool-trim.timerConfig.Persistent = "yes"; + systemd.timers.zpool-trim.timerConfig = { + Persistent = "yes"; + RandomizedDelaySec = cfgTrim.randomizedDelaySec; + }; }) ]; } diff --git a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix index 28abbe66ad..2b365bc555 100644 --- a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix +++ b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix @@ -218,6 +218,8 @@ in services.displayManager.logToJournal = true; + services.logrotate.enable = mkOverride 150 false; + # Make sure we use the Guest Agent from the QEMU package for testing # to reduce the closure size required for the tests. services.qemuGuest.package = pkgs.qemu_test.ga; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix index d726955307..c3639f660d 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix @@ -28,43 +28,6 @@ in description = "Enable the OCI seccomp BPF hook"; }; - cdi = { - dynamic.nvidia.enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable dynamic CDI configuration for NVidia devices by running nvidia-container-toolkit on boot. - ''; - }; - - static = mkOption { - type = types.attrs; - default = { }; - description = '' - Declarative CDI specification. Each key of the attribute set - will be mapped to a file in /etc/cdi. It is required for every - key to be provided in JSON format. - ''; - example = { - some-vendor = builtins.fromJSON '' - { - "cdiVersion": "0.5.0", - "kind": "some-vendor.com/foo", - "devices": [], - "containerEdits": [] - } - ''; - - some-other-vendor = { - cdiVersion = "0.5.0"; - kind = "some-other-vendor.com/bar"; - devices = []; - containerEdits = []; - }; - }; - }; - }; - containersConf.settings = mkOption { type = toml.type; default = { }; @@ -90,13 +53,6 @@ in storage.settings = mkOption { type = toml.type; - default = { - storage = { - driver = "overlay"; - graphroot = "/var/lib/containers/storage"; - runroot = "/run/containers/storage"; - }; - }; description = "storage.conf configuration"; }; @@ -150,8 +106,6 @@ in config = lib.mkIf cfg.enable { - hardware.nvidia-container-toolkit-cdi-generator.enable = lib.mkIf cfg.cdi.dynamic.nvidia.enable true; - virtualisation.containers.containersConf.cniPlugins = [ pkgs.cni-plugins ]; virtualisation.containers.containersConf.settings = { @@ -163,13 +117,13 @@ in }; }; - environment.etc = let - cdiStaticConfigurationFiles = (lib.attrsets.mapAttrs' - (name: value: - lib.attrsets.nameValuePair "cdi/${name}.json" - { text = builtins.toJSON value; }) - cfg.cdi.static); - in { + virtualisation.containers.storage.settings.storage = { + driver = lib.mkDefault "overlay"; + graphroot = lib.mkDefault "/var/lib/containers/storage"; + runroot = lib.mkDefault "/run/containers/storage"; + }; + + environment.etc = { "containers/containers.conf".source = toml.generate "containers.conf" cfg.containersConf.settings; @@ -183,7 +137,7 @@ in "containers/policy.json".source = if cfg.policy != { } then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy) else "${pkgs.skopeo.policy}/default-policy.json"; - } // cdiStaticConfigurationFiles; + }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-config.nix b/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-config.nix index 2d5bc0661d..4ef2b85551 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-config.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-config.nix @@ -41,7 +41,7 @@ with lib; kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; initrd.kernelModules = [ "virtio_scsi" ]; kernelModules = [ "virtio_pci" "virtio_net" ]; - loader.grub.devices = lib.mkDefault ["/dev/vda"]; + loader.grub.devices = ["/dev/vda"]; }; services.openssh = { enable = mkDefault true; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix b/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix index 08e8288fb2..87568390bd 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix @@ -9,7 +9,7 @@ let cfg = config.virtualisation.incus; preseedFormat = pkgs.formats.yaml { }; - serverBinPath = ''${pkgs.qemu_kvm}/libexec:${ + serverBinPath = ''/run/wrappers/bin:${pkgs.qemu_kvm}/libexec:${ lib.makeBinPath ( with pkgs; [ @@ -33,29 +33,41 @@ let gzip iproute2 iptables + iw kmod + libnvidia-container + libxfs lvm2 minio + minio-client nftables - qemu_kvm qemu-utils + qemu_kvm rsync + squashfs-tools-ng squashfsTools + sshfs + swtpm systemd thin-provisioning-tools util-linux virtiofsd + xdelta xz + ] + ++ lib.optionals config.security.apparmor.enable [ + apparmor-bin-utils (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" '') ] + ++ lib.optionals config.services.ceph.client.enable [ ceph-client ] + ++ lib.optionals config.virtualisation.vswitch.enable [ config.virtualisation.vswitch.package ] ++ lib.optionals config.boot.zfs.enabled [ config.boot.zfs.package "${config.boot.zfs.package}/lib/udev" ] - ++ lib.optionals config.virtualisation.vswitch.enable [ config.virtualisation.vswitch.package ] ) }''; @@ -93,6 +105,37 @@ let path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_VARS.fd"; } ]; + + environment = lib.mkMerge [ + { + INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; + INCUS_OVMF_PATH = ovmf; + INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids"; + PATH = lib.mkForce serverBinPath; + } + (lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; }) + ]; + + incus-startup = pkgs.writeShellScript "incus-startup" '' + case "$1" in + start) + systemctl is-active incus.service -q && exit 0 + exec incusd activateifneeded + ;; + + stop) + systemctl is-active incus.service -q || exit 0 + exec incusd shutdown + ;; + + *) + echo "unknown argument \`$1'" >&2 + exit 1 + ;; + esac + + exit 0 + ''; in { meta = { @@ -111,7 +154,12 @@ in package = lib.mkPackageOption pkgs "incus-lts" { }; - lxcPackage = lib.mkPackageOption pkgs "lxc" { }; + lxcPackage = lib.mkOption { + type = lib.types.package; + default = config.virtualisation.lxc.package; + defaultText = lib.literalExpression "config.virtualisation.lxc.package"; + description = "The lxc package to use."; + }; clientPackage = lib.mkOption { type = lib.types.package; @@ -120,6 +168,14 @@ in description = "The incus client package to use. This package is added to PATH."; }; + softDaemonRestart = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Allow for incus.service to be stopped without affecting running instances. + ''; + }; + preseed = lib.mkOption { type = lib.types.nullOr (lib.types.submodule { freeformType = preseedFormat.type; }); @@ -265,6 +321,8 @@ in systemd.services.incus = { description = "Incus Container and Virtual Machine Management Daemon"; + inherit environment; + wantedBy = lib.mkIf (!cfg.socketActivation) [ "multi-user.target" ]; after = [ "network-online.target" @@ -279,20 +337,10 @@ in wants = [ "network-online.target" ]; - environment = lib.mkMerge [ - { - INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; - INCUS_OVMF_PATH = ovmf; - INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids"; - PATH = lib.mkForce serverBinPath; - } - (lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; }) - ]; - serviceConfig = { ExecStart = "${cfg.package}/bin/incusd --group incus-admin"; ExecStartPost = "${cfg.package}/bin/incusd waitready --timeout=${cfg.startTimeout}"; - ExecStop = "${cfg.package}/bin/incus admin shutdown"; + ExecStop = lib.optionalString (!cfg.softDaemonRestart) "${cfg.package}/bin/incus admin shutdown"; KillMode = "process"; # when stopping, leave the containers alone Delegate = "yes"; @@ -307,6 +355,27 @@ in }; }; + systemd.services.incus-startup = lib.mkIf cfg.softDaemonRestart { + description = "Incus Instances Startup/Shutdown"; + + inherit environment; + + after = [ + "incus.service" + "incus.socket" + ]; + requires = [ "incus.socket" ]; + + serviceConfig = { + ExecStart = "${incus-startup} start"; + ExecStop = "${incus-startup} stop"; + RemainAfterExit = true; + TimeoutStartSec = "600s"; + TimeoutStopSec = "600s"; + Type = "oneshot"; + }; + }; + systemd.sockets.incus = { description = "Incus UNIX socket"; wantedBy = [ "sockets.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxc.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxc.nix index 7d7d48db92..1ef322588a 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/lxc.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxc.nix @@ -32,6 +32,7 @@ in {manpage}`lxc.system.conf(5)`. ''; }; + package = lib.mkPackageOption pkgs "lxc" { }; defaultConfig = lib.mkOption { @@ -57,19 +58,19 @@ in ###### implementation config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.lxc ]; + environment.systemPackages = [ cfg.package ]; environment.etc."lxc/lxc.conf".text = cfg.systemConfig; environment.etc."lxc/lxc-usernet".text = cfg.usernetConfig; environment.etc."lxc/default.conf".text = cfg.defaultConfig; systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ]; - security.apparmor.packages = [ pkgs.lxc ]; + security.apparmor.packages = [ cfg.package ]; security.apparmor.policies = { "bin.lxc-start".profile = '' - include ${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start + include ${cfg.package}/etc/apparmor.d/usr.bin.lxc-start ''; "lxc-containers".profile = '' - include ${pkgs.lxc}/etc/apparmor.d/lxc-containers + include ${cfg.package}/etc/apparmor.d/lxc-containers ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix index 51d9a94820..4c94b3dfe9 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix @@ -35,10 +35,11 @@ in { package = lib.mkPackageOption pkgs "lxd-lts" { }; - lxcPackage = lib.mkPackageOption pkgs "lxc" { - extraDescription = '' - Required for AppArmor profiles. - ''; + lxcPackage = lib.mkOption { + type = lib.types.package; + default = config.virtualisation.lxc.package; + defaultText = lib.literalExpression "config.virtualisation.lxc.package"; + description = "The lxc package to use."; }; zfsSupport = lib.mkOption { diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix b/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix index 4b1b67ac94..deb0b4d2c5 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix @@ -219,6 +219,11 @@ in systemd.services.podman.environment = config.networking.proxy.envVars; systemd.sockets.podman.wantedBy = [ "sockets.target" ]; systemd.sockets.podman.socketConfig.SocketGroup = "podman"; + # Podman does not support multiple sockets, as of podman 5.0.2, so we use + # a symlink. Unfortunately this does not let us use an alternate group, + # such as `docker`. + systemd.sockets.podman.socketConfig.Symlinks = + lib.mkIf cfg.dockerSocket.enable [ "/run/docker.sock" ]; systemd.user.services.podman.environment = config.networking.proxy.envVars; systemd.user.sockets.podman.wantedBy = [ "sockets.target" ]; @@ -239,11 +244,6 @@ in '') ]; - systemd.tmpfiles.rules = - lib.optionals cfg.dockerSocket.enable [ - "L! /run/docker.sock - - - - /run/podman/podman.sock" - ]; - users.groups.podman = { }; assertions = [ diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index 06c1253d1f..c30f4577fd 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -249,7 +249,7 @@ let ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ ${concatStringsSep " \\\n " (mapAttrsToList - (tag: share: "-virtfs local,path=${share.source},security_model=none,mount_tag=${tag}") + (tag: share: "-virtfs local,path=${share.source},security_model=${share.securityModel},mount_tag=${tag}") config.virtualisation.sharedDirectories)} \ ${drivesCmdLine config.virtualisation.qemu.drives} \ ${concatStringsSep " \\\n " config.virtualisation.qemu.options} \ @@ -462,6 +462,18 @@ in type = types.path; description = "The mount point of the directory inside the virtual machine"; }; + options.securityModel = mkOption { + type = types.enum [ "passthrough" "mapped-xattr" "mapped-file" "none" ]; + default = "mapped-xattr"; + description = '' + The security model to use for this share: + + - `passthrough`: files are stored using the same credentials as they are created on the guest (this requires QEMU to run as root) + - `mapped-xattr`: some of the file attributes like uid, gid, mode bits and link target are stored as file attributes + - `mapped-file`: the attributes are stored in the hidden .virtfs_metadata directory. Directories exported by this security model cannot interact with other unix tools + - `none`: same as "passthrough" except the sever won't report failures if it fails to set file attributes like ownership + ''; + }; }); default = { }; example = { @@ -1091,18 +1103,22 @@ in nix-store = mkIf cfg.mountHostNixStore { source = builtins.storeDir; target = "/nix/store"; + securityModel = "none"; }; xchg = { source = ''"$TMPDIR"/xchg''; + securityModel = "none"; target = "/tmp/xchg"; }; shared = { source = ''"''${SHARED_DIR:-$TMPDIR/xchg}"''; target = "/tmp/shared"; + securityModel = "none"; }; certs = mkIf cfg.useHostCerts { source = ''"$TMPDIR"/certs''; target = "/etc/ssl/certs"; + securityModel = "none"; }; }; diff --git a/third_party/nixpkgs/nixos/release-combined.nix b/third_party/nixpkgs/nixos/release-combined.nix index 39cbe85579..19223d46f6 100644 --- a/third_party/nixpkgs/nixos/release-combined.nix +++ b/third_party/nixpkgs/nixos/release-combined.nix @@ -43,7 +43,7 @@ in rec { name = "nixos-${nixos.channel.version}"; meta = { description = "Release-critical builds for the NixOS channel"; - maintainers = with pkgs.lib.maintainers; [ eelco ]; + maintainers = with pkgs.lib.maintainers; [ ]; }; constituents = pkgs.lib.concatLists [ [ "nixos.channel" ] @@ -82,7 +82,9 @@ in rec { (onFullSupported "nixos.tests.gitlab") (onFullSupported "nixos.tests.gnome") (onFullSupported "nixos.tests.gnome-xorg") - (onSystems ["x86_64-linux"] "nixos.tests.hibernate") + # FIXME: broken by QEMU 8.2.3 upgrade, reenable when fixed + # Upstream issue: https://gitlab.com/qemu-project/qemu/-/issues/2321 + # (onSystems ["x86_64-linux"] "nixos.tests.hibernate") (onFullSupported "nixos.tests.i3wm") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolDefault") @@ -110,7 +112,7 @@ in rec { (onFullSupported "nixos.tests.latestKernel.login") (onFullSupported "nixos.tests.lightdm") (onFullSupported "nixos.tests.login") - (onFullSupported "nixos.tests.misc") + (onFullSupported "nixos.tests.misc.default") (onFullSupported "nixos.tests.mutableUsers") (onFullSupported "nixos.tests.nat.firewall") (onFullSupported "nixos.tests.nat.standalone") diff --git a/third_party/nixpkgs/nixos/release-small.nix b/third_party/nixpkgs/nixos/release-small.nix index 091c2b1f30..b87a58f5ee 100644 --- a/third_party/nixpkgs/nixos/release-small.nix +++ b/third_party/nixpkgs/nixos/release-small.nix @@ -98,7 +98,7 @@ in rec { name = "nixos-${nixos.channel.version}"; meta = { description = "Release-critical builds for the NixOS channel"; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; }; constituents = lib.flatten [ [ @@ -124,7 +124,7 @@ in rec { "nixos.tests.firewall" "nixos.tests.ipv6" "nixos.tests.login" - "nixos.tests.misc" + "nixos.tests.misc.default" "nixos.tests.nat.firewall" "nixos.tests.nat.standalone" "nixos.tests.nfs4.simple" diff --git a/third_party/nixpkgs/nixos/tests/acme.nix b/third_party/nixpkgs/nixos/tests/acme.nix index d63a77fcdd..511d3c589f 100644 --- a/third_party/nixpkgs/nixos/tests/acme.nix +++ b/third_party/nixpkgs/nixos/tests/acme.nix @@ -99,7 +99,14 @@ serverAliases = [ "${server}-wildcard-alias.example.test" ]; useACMEHost = "example.test"; }; - }; + } // (lib.optionalAttrs (server == "nginx") { + # The nginx module supports using a different key than the hostname + different-key = vhostBaseData // { + serverName = "${server}-different-key.example.test"; + serverAliases = [ "${server}-different-key-alias.example.test" ]; + enableACME = true; + }; + }); }; # Used to determine if service reload was triggered @@ -653,20 +660,20 @@ in { webserver.succeed("systemctl restart caddy.service") check_connection_key_bits(client, "a.example.test", "384") - domains = ["http", "dns", "wildcard"] - for server, logsrc in [ - ("nginx", "journalctl -n 30 -u nginx.service"), - ("httpd", "tail -n 30 /var/log/httpd/*.log"), + common_domains = ["http", "dns", "wildcard"] + for server, logsrc, domains in [ + ("nginx", "journalctl -n 30 -u nginx.service", common_domains + ["different-key"]), + ("httpd", "tail -n 30 /var/log/httpd/*.log", common_domains), ]: wait_for_server = lambda: webserver.wait_for_unit(f"{server}.service") with subtest(f"Works with {server}"): try: switch_to(webserver, server) - # Skip wildcard domain for this check ([:-1]) - for domain in domains[:-1]: - webserver.wait_for_unit( - f"acme-finished-{server}-{domain}.example.test.target" - ) + for domain in domains: + if domain != "wildcard": + webserver.wait_for_unit( + f"acme-finished-{server}-{domain}.example.test.target" + ) except Exception as err: _, output = webserver.execute( f"{logsrc} && ls -al /var/lib/acme/acme-challenge" @@ -676,8 +683,9 @@ in { wait_for_server() - for domain in domains[:-1]: - check_issuer(webserver, f"{server}-{domain}.example.test", "pebble") + for domain in domains: + if domain != "wildcard": + check_issuer(webserver, f"{server}-{domain}.example.test", "pebble") for domain in domains: check_connection(client, f"{server}-{domain}.example.test") check_connection(client, f"{server}-{domain}-alias.example.test") diff --git a/third_party/nixpkgs/nixos/tests/adguardhome.nix b/third_party/nixpkgs/nixos/tests/adguardhome.nix index 80613ce825..005d54e17d 100644 --- a/third_party/nixpkgs/nixos/tests/adguardhome.nix +++ b/third_party/nixpkgs/nixos/tests/adguardhome.nix @@ -2,41 +2,39 @@ name = "adguardhome"; nodes = { - nullConf = { ... }: { services.adguardhome = { enable = true; }; }; + nullConf = { services.adguardhome.enable = true; }; - emptyConf = { lib, ... }: { + emptyConf = { services.adguardhome = { enable = true; + + settings = { }; }; }; - declarativeConf = { ... }: { + schemaVersionBefore23 = { + services.adguardhome = { + enable = true; + + settings.schema_version = 20; + }; + }; + + declarativeConf = { services.adguardhome = { enable = true; mutableSettings = false; - settings = { - schema_version = 0; - dns = { - bind_host = "0.0.0.0"; - bootstrap_dns = "127.0.0.1"; - }; - }; + settings.dns.bootstrap_dns = [ "127.0.0.1" ]; }; }; - mixedConf = { ... }: { + mixedConf = { services.adguardhome = { enable = true; mutableSettings = true; - settings = { - schema_version = 0; - dns = { - bind_host = "0.0.0.0"; - bootstrap_dns = "127.0.0.1"; - }; - }; + settings.dns.bootstrap_dns = [ "127.0.0.1" ]; }; }; @@ -70,11 +68,7 @@ allowDHCP = true; mutableSettings = false; settings = { - schema_version = 0; - dns = { - bind_host = "0.0.0.0"; - bootstrap_dns = "127.0.0.1"; - }; + dns.bootstrap_dns = [ "127.0.0.1" ]; dhcp = { # This implicitly enables CAP_NET_RAW enabled = true; @@ -104,33 +98,38 @@ testScript = '' with subtest("Minimal (settings = null) config test"): - nullConf.wait_for_unit("adguardhome.service") + nullConf.wait_for_unit("adguardhome.service") + nullConf.wait_for_open_port(3000) with subtest("Default config test"): - emptyConf.wait_for_unit("adguardhome.service") - emptyConf.wait_for_open_port(3000) + emptyConf.wait_for_unit("adguardhome.service") + emptyConf.wait_for_open_port(3000) + + with subtest("Default schema_version 23 config test"): + schemaVersionBefore23.wait_for_unit("adguardhome.service") + schemaVersionBefore23.wait_for_open_port(3000) with subtest("Declarative config test, DNS will be reachable"): - declarativeConf.wait_for_unit("adguardhome.service") - declarativeConf.wait_for_open_port(53) - declarativeConf.wait_for_open_port(3000) + declarativeConf.wait_for_unit("adguardhome.service") + declarativeConf.wait_for_open_port(53) + declarativeConf.wait_for_open_port(3000) with subtest("Mixed config test, check whether merging works"): - mixedConf.wait_for_unit("adguardhome.service") - mixedConf.wait_for_open_port(53) - mixedConf.wait_for_open_port(3000) - # Test whether merging works properly, even if nothing is changed - mixedConf.systemctl("restart adguardhome.service") - mixedConf.wait_for_unit("adguardhome.service") - mixedConf.wait_for_open_port(3000) + mixedConf.wait_for_unit("adguardhome.service") + mixedConf.wait_for_open_port(53) + mixedConf.wait_for_open_port(3000) + # Test whether merging works properly, even if nothing is changed + mixedConf.systemctl("restart adguardhome.service") + mixedConf.wait_for_unit("adguardhome.service") + mixedConf.wait_for_open_port(3000) with subtest("Testing successful DHCP start"): - dhcpConf.wait_for_unit("adguardhome.service") - client.systemctl("start network-online.target") - client.wait_for_unit("network-online.target") - # Test IP assignment via DHCP - dhcpConf.wait_until_succeeds("ping -c 5 10.0.10.100") - # Test hostname resolution over DHCP-provided DNS - dhcpConf.wait_until_succeeds("ping -c 5 client.lan") + dhcpConf.wait_for_unit("adguardhome.service") + client.systemctl("start network-online.target") + client.wait_for_unit("network-online.target") + # Test IP assignment via DHCP + dhcpConf.wait_until_succeeds("ping -c 5 10.0.10.100") + # Test hostname resolution over DHCP-provided DNS + dhcpConf.wait_until_succeeds("ping -c 5 client.lan") ''; } diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 232f10d7c2..c6ec2474e6 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -193,6 +193,7 @@ in { cinnamon = handleTest ./cinnamon.nix {}; cinnamon-wayland = handleTest ./cinnamon-wayland.nix {}; cjdns = handleTest ./cjdns.nix {}; + clatd = handleTest ./clatd.nix {}; clickhouse = handleTest ./clickhouse.nix {}; cloud-init = handleTest ./cloud-init.nix {}; cloud-init-hostname = handleTest ./cloud-init-hostname.nix {}; @@ -242,6 +243,7 @@ in { deepin = handleTest ./deepin.nix {}; deluge = handleTest ./deluge.nix {}; dendrite = handleTest ./matrix/dendrite.nix {}; + devpi-server = handleTest ./devpi-server.nix {}; dex-oidc = handleTest ./dex-oidc.nix {}; dhparams = handleTest ./dhparams.nix {}; disable-installer-tools = handleTest ./disable-installer-tools.nix {}; @@ -399,6 +401,7 @@ in { honk = runTest ./honk.nix; installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); invidious = handleTest ./invidious.nix {}; + isolate = handleTest ./isolate.nix {}; livebook-service = handleTest ./livebook-service.nix {}; pyload = handleTest ./pyload.nix {}; oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {}; @@ -422,7 +425,8 @@ in { icingaweb2 = handleTest ./icingaweb2.nix {}; iftop = handleTest ./iftop.nix {}; incron = handleTest ./incron.nix {}; - incus = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; }); + incus = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; inherit (pkgs) incus; }); + incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; }); influxdb = handleTest ./influxdb.nix {}; influxdb2 = handleTest ./influxdb2.nix {}; initrd-network-openvpn = handleTestOn [ "x86_64-linux" "i686-linux" ] ./initrd-network-openvpn {}; @@ -450,6 +454,7 @@ in { jirafeau = handleTest ./jirafeau.nix {}; jitsi-meet = handleTest ./jitsi-meet.nix {}; jool = import ./jool.nix { inherit pkgs runTest; }; + jotta-cli = handleTest ./jotta-cli.nix {}; k3s = handleTest ./k3s {}; kafka = handleTest ./kafka.nix {}; kanidm = handleTest ./kanidm.nix {}; @@ -753,6 +758,7 @@ in { pretix = runTest ./web-apps/pretix.nix; printing-socket = handleTest ./printing.nix { socket = true; }; printing-service = handleTest ./printing.nix { socket = false; }; + private-gpt = handleTest ./private-gpt.nix {}; privoxy = handleTest ./privoxy.nix {}; prometheus = handleTest ./prometheus.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; @@ -772,6 +778,7 @@ in { qgis = handleTest ./qgis.nix { qgisPackage = pkgs.qgis; }; qgis-ltr = handleTest ./qgis.nix { qgisPackage = pkgs.qgis-ltr; }; qownnotes = handleTest ./qownnotes.nix {}; + qtile = handleTest ./qtile.nix {}; quake3 = handleTest ./quake3.nix {}; quicktun = handleTest ./quicktun.nix {}; quorum = handleTest ./quorum.nix {}; @@ -782,6 +789,7 @@ in { rasdaemon = handleTest ./rasdaemon.nix {}; readarr = handleTest ./readarr.nix {}; redis = handleTest ./redis.nix {}; + redlib = handleTest ./redlib.nix {}; redmine = handleTest ./redmine.nix {}; restartByActivationScript = handleTest ./restart-by-activation-script.nix {}; restic-rest-server = handleTest ./restic-rest-server.nix {}; @@ -864,7 +872,9 @@ in { swap-partition = handleTest ./swap-partition.nix {}; swap-random-encryption = handleTest ./swap-random-encryption.nix {}; sway = handleTest ./sway.nix {}; - switchTest = handleTest ./switch-test.nix {}; + swayfx = handleTest ./swayfx.nix {}; + switchTest = handleTest ./switch-test.nix { ng = false; }; + switchTestNg = handleTest ./switch-test.nix { ng = true; }; sympa = handleTest ./sympa.nix {}; syncthing = handleTest ./syncthing.nix {}; syncthing-no-settings = handleTest ./syncthing-no-settings.nix {}; @@ -877,7 +887,7 @@ in { systemd-binfmt = handleTestOn ["x86_64-linux"] ./systemd-binfmt.nix {}; systemd-boot = handleTest ./systemd-boot.nix {}; systemd-bpf = handleTest ./systemd-bpf.nix {}; - systemd-confinement = handleTest ./systemd-confinement.nix {}; + systemd-confinement = handleTest ./systemd-confinement {}; systemd-coredump = handleTest ./systemd-coredump.nix {}; systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {}; systemd-credentials-tpm2 = handleTest ./systemd-credentials-tpm2.nix {}; @@ -941,7 +951,6 @@ in { tiddlywiki = handleTest ./tiddlywiki.nix {}; tigervnc = handleTest ./tigervnc.nix {}; timescaledb = handleTest ./timescaledb.nix {}; - promscale = handleTest ./promscale.nix {}; timezone = handleTest ./timezone.nix {}; tinc = handleTest ./tinc {}; tinydns = handleTest ./tinydns.nix {}; @@ -989,6 +998,7 @@ in { v2ray = handleTest ./v2ray.nix {}; varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; }; varnish74 = handleTest ./varnish.nix { package = pkgs.varnish74; }; + varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; }; vault = handleTest ./vault.nix {}; vault-agent = handleTest ./vault-agent.nix {}; vault-dev = handleTest ./vault-dev.nix {}; @@ -1030,7 +1040,9 @@ in { xterm = handleTest ./xterm.nix {}; xxh = handleTest ./xxh.nix {}; yabar = handleTest ./yabar.nix {}; + ydotool = handleTest ./ydotool.nix {}; yggdrasil = handleTest ./yggdrasil.nix {}; + your_spotify = handleTest ./your_spotify.nix {}; zammad = handleTest ./zammad.nix {}; zeronet-conservancy = handleTest ./zeronet-conservancy.nix {}; zfs = handleTest ./zfs.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/archi.nix b/third_party/nixpkgs/nixos/tests/archi.nix index 59f2e940c0..a8cb1c503d 100644 --- a/third_party/nixpkgs/nixos/tests/archi.nix +++ b/third_party/nixpkgs/nixos/tests/archi.nix @@ -24,7 +24,9 @@ import ./make-test-python.nix ({ lib, ... }: { machine.wait_for_window("Archi") # wait till main UI is open - machine.wait_for_text("Welcome to Archi") + # since OCR seems to be buggy wait_for_text was replaced by sleep, issue: #302965 + # machine.wait_for_text("Welcome to Archi") + machine.sleep(20) machine.screenshot("welcome-screen") ''; diff --git a/third_party/nixpkgs/nixos/tests/avahi.nix b/third_party/nixpkgs/nixos/tests/avahi.nix index d8f4d13340..4ae2f919f2 100644 --- a/third_party/nixpkgs/nixos/tests/avahi.nix +++ b/third_party/nixpkgs/nixos/tests/avahi.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix { name = "avahi"; meta = with pkgs.lib.maintainers; { - maintainers = [ eelco ]; + maintainers = [ ]; }; nodes = let diff --git a/third_party/nixpkgs/nixos/tests/bittorrent.nix b/third_party/nixpkgs/nixos/tests/bittorrent.nix index 473b05d4c9..b5f5982743 100644 --- a/third_party/nixpkgs/nixos/tests/bittorrent.nix +++ b/third_party/nixpkgs/nixos/tests/bittorrent.nix @@ -36,7 +36,7 @@ in { name = "bittorrent"; meta = with pkgs.lib.maintainers; { - maintainers = [ domenkozar eelco rob bobvanderlinden ]; + maintainers = [ domenkozar rob bobvanderlinden ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/caddy.nix b/third_party/nixpkgs/nixos/tests/caddy.nix index 41d8e57de4..0efe8f94e3 100644 --- a/third_party/nixpkgs/nixos/tests/caddy.nix +++ b/third_party/nixpkgs/nixos/tests/caddy.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "caddy"; meta = with pkgs.lib.maintainers; { - maintainers = [ xfix Br1ght0ne ]; + maintainers = [ Br1ght0ne ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/castopod.nix b/third_party/nixpkgs/nixos/tests/castopod.nix index 29bf8e8cac..3257cd3d36 100644 --- a/third_party/nixpkgs/nixos/tests/castopod.nix +++ b/third_party/nixpkgs/nixos/tests/castopod.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "castopod"; meta = with lib.maintainers; { - maintainers = [ alexoundos misuzu ]; + maintainers = [ alexoundos ]; }; nodes.castopod = { nodes, ... }: { diff --git a/third_party/nixpkgs/nixos/tests/clatd.nix b/third_party/nixpkgs/nixos/tests/clatd.nix new file mode 100644 index 0000000000..00021d87ba --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/clatd.nix @@ -0,0 +1,189 @@ +# This test verifies that we can ping an IPv4-only server from an IPv6-only +# client via a NAT64 router using CLAT on the client. The hosts and networks +# are configured as follows: +# +# +------ +# Client | clat Address: 192.0.0.1/32 (configured via clatd) +# | Route: default +# | +# | eth1 Address: 2001:db8::2/64 +# | | Route: default via 2001:db8::1 +# +--|--- +# | VLAN 3 +# +--|--- +# | eth2 Address: 2001:db8::1/64 +# Router | +# | nat64 Address: 64:ff9b::1/128 +# | Route: 64:ff9b::/96 +# | Address: 192.0.2.0/32 +# | Route: 192.0.2.0/24 +# | +# | eth1 Address: 100.64.0.1/24 +# +--|--- +# | VLAN 2 +# +--|--- +# Server | eth1 Address: 100.64.0.2/24 +# | Route: 192.0.2.0/24 via 100.64.0.1 +# +------ + +import ./make-test-python.nix ({ pkgs, lib, ... }: + +{ + name = "clatd"; + meta = with pkgs.lib.maintainers; { + maintainers = [ hax404 ]; + }; + + nodes = { + # The server is configured with static IPv4 addresses. RFC 6052 Section 3.1 + # disallows the mapping of non-global IPv4 addresses like RFC 1918 into the + # Well-Known Prefix 64:ff9b::/96. TAYGA also does not allow the mapping of + # documentation space (RFC 5737). To circumvent this, 100.64.0.2/24 from + # RFC 6589 (Carrier Grade NAT) is used here. + # To reach the IPv4 address pool of the NAT64 gateway, there is a static + # route configured. In normal cases, where the router would also source NAT + # the pool addresses to one IPv4 addresses, this would not be needed. + server = { + virtualisation.vlans = [ + 2 # towards router + ]; + networking = { + useDHCP = false; + interfaces.eth1 = lib.mkForce {}; + }; + systemd.network = { + enable = true; + networks."vlan1" = { + matchConfig.Name = "eth1"; + address = [ + "100.64.0.2/24" + ]; + routes = [ + { routeConfig = { Destination = "192.0.2.0/24"; Gateway = "100.64.0.1"; }; } + ]; + }; + }; + }; + + # The router is configured with static IPv4 addresses towards the server + # and IPv6 addresses towards the client. For NAT64, the Well-Known prefix + # 64:ff9b::/96 is used. NAT64 is done with TAYGA which provides the + # tun-interface nat64 and does the translation over it. The IPv6 packets + # are sent to this interfaces and received as IPv4 packets and vice versa. + # As TAYGA only translates IPv6 addresses to dedicated IPv4 addresses, it + # needs a pool of IPv4 addresses which must be at least as big as the + # expected amount of clients. In this test, the packets from the pool are + # directly routed towards the client. In normal cases, there would be a + # second source NAT44 to map all clients behind one IPv4 address. + router = { + boot.kernel.sysctl = { + "net.ipv4.ip_forward" = 1; + "net.ipv6.conf.all.forwarding" = 1; + }; + + virtualisation.vlans = [ + 2 # towards server + 3 # towards client + ]; + + networking = { + useDHCP = false; + useNetworkd = true; + firewall.enable = false; + interfaces.eth1 = lib.mkForce { + ipv4 = { + addresses = [ { address = "100.64.0.1"; prefixLength = 24; } ]; + }; + }; + interfaces.eth2 = lib.mkForce { + ipv6 = { + addresses = [ { address = "2001:db8::1"; prefixLength = 64; } ]; + }; + }; + }; + + services.tayga = { + enable = true; + ipv4 = { + address = "192.0.2.0"; + router = { + address = "192.0.2.1"; + }; + pool = { + address = "192.0.2.0"; + prefixLength = 24; + }; + }; + ipv6 = { + address = "2001:db8::1"; + router = { + address = "64:ff9b::1"; + }; + pool = { + address = "64:ff9b::"; + prefixLength = 96; + }; + }; + }; + }; + + # The client is configured with static IPv6 addresses. It has also a static + # default route towards the router. To reach the IPv4-only server, the + # client starts the clat daemon which starts and configures the local + # IPv4 -> IPv6 translation via Tayga. + client = { + virtualisation.vlans = [ + 3 # towards router + ]; + + networking = { + useDHCP = false; + interfaces.eth1 = lib.mkForce {}; + }; + + systemd.network = { + enable = true; + networks."vlan1" = { + matchConfig.Name = "eth1"; + address = [ + "2001:db8::2/64" + ]; + routes = [ + { routeConfig = { Destination = "::/0"; Gateway = "2001:db8::1"; }; } + ]; + }; + }; + + services.clatd = { + enable = true; + settings.plat-prefix = "64:ff9b::/96"; + }; + + environment.systemPackages = [ pkgs.mtr ]; + }; + }; + + testScript = '' + start_all() + + # wait for all machines to start up + for machine in client, router, server: + machine.wait_for_unit("network-online.target") + + with subtest("Wait for tayga and clatd"): + router.wait_for_unit("tayga.service") + client.wait_for_unit("clatd.service") + # clatd checks if this system has IPv4 connectivity for 10 seconds + client.wait_until_succeeds( + 'journalctl -u clatd -e | grep -q "Starting up TAYGA, using config file"' + ) + + with subtest("Test ICMP"): + client.wait_until_succeeds("ping -c 3 100.64.0.2 >&2") + + with subtest("Test ICMP and show a traceroute"): + client.wait_until_succeeds("mtr --show-ips --report-wide 100.64.0.2 >&2") + + client.log(client.execute("systemd-analyze security clatd.service")[1]) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/coder.nix b/third_party/nixpkgs/nixos/tests/coder.nix index 1281382728..fd1fa0cc30 100644 --- a/third_party/nixpkgs/nixos/tests/coder.nix +++ b/third_party/nixpkgs/nixos/tests/coder.nix @@ -1,8 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "coder"; - meta = with pkgs.lib.maintainers; { - maintainers = [ shyim ghuntley ]; - }; + meta.maintainers = pkgs.coder.meta.maintainers; nodes.machine = { pkgs, ... }: diff --git a/third_party/nixpkgs/nixos/tests/containers-bridge.nix b/third_party/nixpkgs/nixos/tests/containers-bridge.nix index d2e16299ed..3001db33ba 100644 --- a/third_party/nixpkgs/nixos/tests/containers-bridge.nix +++ b/third_party/nixpkgs/nixos/tests/containers-bridge.nix @@ -8,7 +8,7 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-bridge"; meta = { - maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ]; + maintainers = with lib.maintainers; [ aristid aszlig kampfschlaefer ]; }; nodes.machine = diff --git a/third_party/nixpkgs/nixos/tests/containers-imperative.nix b/third_party/nixpkgs/nixos/tests/containers-imperative.nix index fff00e4f73..ea1046b403 100644 --- a/third_party/nixpkgs/nixos/tests/containers-imperative.nix +++ b/third_party/nixpkgs/nixos/tests/containers-imperative.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-imperative"; meta = { - maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ]; + maintainers = with lib.maintainers; [ aristid aszlig kampfschlaefer ]; }; nodes.machine = diff --git a/third_party/nixpkgs/nixos/tests/containers-ip.nix b/third_party/nixpkgs/nixos/tests/containers-ip.nix index ecff99a3f0..034e5d6604 100644 --- a/third_party/nixpkgs/nixos/tests/containers-ip.nix +++ b/third_party/nixpkgs/nixos/tests/containers-ip.nix @@ -14,7 +14,7 @@ let in import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-ipv4-ipv6"; meta = { - maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ]; + maintainers = with lib.maintainers; [ aristid aszlig kampfschlaefer ]; }; nodes.machine = diff --git a/third_party/nixpkgs/nixos/tests/containers-portforward.nix b/third_party/nixpkgs/nixos/tests/containers-portforward.nix index b8c7aabc5a..1a9880fe93 100644 --- a/third_party/nixpkgs/nixos/tests/containers-portforward.nix +++ b/third_party/nixpkgs/nixos/tests/containers-portforward.nix @@ -8,7 +8,7 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "containers-portforward"; meta = { - maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ianwookim ]; + maintainers = with lib.maintainers; [ aristid aszlig kampfschlaefer ianwookim ]; }; nodes.machine = diff --git a/third_party/nixpkgs/nixos/tests/devpi-server.nix b/third_party/nixpkgs/nixos/tests/devpi-server.nix new file mode 100644 index 0000000000..2a16d49724 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/devpi-server.nix @@ -0,0 +1,35 @@ +import ./make-test-python.nix ({pkgs, ...}: let + server-port = 3141; +in { + name = "devpi-server"; + meta = with pkgs.lib.maintainers; { + maintainers = [cafkafk]; + }; + + nodes = { + devpi = {...}: { + services.devpi-server = { + enable = true; + host = "0.0.0.0"; + port = server-port; + openFirewall = true; + secretFile = pkgs.writeText "devpi-secret" "v263P+V3YGDYUyfYL/RBURw+tCPMDw94R/iCuBNJrDhaYrZYjpA6XPFVDDH8ViN20j77y2PHoMM/U0opNkVQ2g=="; + }; + }; + + client1 = {...}: { + environment.systemPackages = with pkgs; [ + devpi-client + jq + ]; + }; + }; + + testScript = '' + start_all() + devpi.wait_for_unit("devpi-server.service") + devpi.wait_for_open_port(${builtins.toString server-port}) + + client1.succeed("devpi getjson http://devpi:${builtins.toString server-port}") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/elk.nix b/third_party/nixpkgs/nixos/tests/elk.nix index b5a8cb532a..87c82877fe 100644 --- a/third_party/nixpkgs/nixos/tests/elk.nix +++ b/third_party/nixpkgs/nixos/tests/elk.nix @@ -16,7 +16,7 @@ let import ./make-test-python.nix ({ inherit name; meta = with pkgs.lib.maintainers; { - maintainers = [ eelco offline basvandijk ]; + maintainers = [ offline basvandijk ]; }; nodes = { one = diff --git a/third_party/nixpkgs/nixos/tests/fcitx5/default.nix b/third_party/nixpkgs/nixos/tests/fcitx5/default.nix index c113f2e2c0..feea621f6b 100644 --- a/third_party/nixpkgs/nixos/tests/fcitx5/default.nix +++ b/third_party/nixpkgs/nixos/tests/fcitx5/default.nix @@ -89,10 +89,13 @@ rec { machine.succeed("xauth merge ${xauth}") machine.sleep(5) + machine.wait_until_succeeds("pgrep fcitx5") machine.succeed("su - ${user.name} -c 'kill $(pgrep fcitx5)'") machine.sleep(1) machine.succeed("su - ${user.name} -c 'alacritty >&2 &'") + machine.wait_for_window("alice@machine") + machine.succeed("su - ${user.name} -c 'fcitx5 >&2 &'") machine.sleep(10) diff --git a/third_party/nixpkgs/nixos/tests/firefox.nix b/third_party/nixpkgs/nixos/tests/firefox.nix index fbea95dc75..6418e029f8 100644 --- a/third_party/nixpkgs/nixos/tests/firefox.nix +++ b/third_party/nixpkgs/nixos/tests/firefox.nix @@ -1,9 +1,9 @@ -import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: +import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }: { name = firefoxPackage.pname; meta = with pkgs.lib.maintainers; { - maintainers = [ eelco shlevy ]; + maintainers = [ shlevy ]; }; nodes.machine = @@ -55,7 +55,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: }; testScript = let - exe = firefoxPackage.unwrapped.binaryName; + exe = lib.getExe firefoxPackage; in '' from contextlib import contextmanager diff --git a/third_party/nixpkgs/nixos/tests/firewall.nix b/third_party/nixpkgs/nixos/tests/firewall.nix index dd7551f143..34e8bda60e 100644 --- a/third_party/nixpkgs/nixos/tests/firewall.nix +++ b/third_party/nixpkgs/nixos/tests/firewall.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ( { pkgs, nftables, ... } : { name = "firewall" + pkgs.lib.optionalString nftables "-nftables"; meta = with pkgs.lib.maintainers; { - maintainers = [ eelco ]; + maintainers = [ ]; }; nodes = diff --git a/third_party/nixpkgs/nixos/tests/fish.nix b/third_party/nixpkgs/nixos/tests/fish.nix index 3d9b13c6af..c9a1bef514 100644 --- a/third_party/nixpkgs/nixos/tests/fish.nix +++ b/third_party/nixpkgs/nixos/tests/fish.nix @@ -10,6 +10,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { coreutils procps # kill collides with coreutils' to test https://github.com/NixOS/nixpkgs/issues/56432 ]; + # TODO: remove if/when #267880 is merged and this is a default + services.logrotate.enable = false; }; testScript = diff --git a/third_party/nixpkgs/nixos/tests/forgejo.nix b/third_party/nixpkgs/nixos/tests/forgejo.nix index 8b9ee46ff5..827fae2790 100644 --- a/third_party/nixpkgs/nixos/tests/forgejo.nix +++ b/third_party/nixpkgs/nixos/tests/forgejo.nix @@ -141,9 +141,9 @@ let assert "BEGIN PGP PUBLIC KEY BLOCK" in server.succeed("curl http://localhost:3000/api/v1/signing-key.gpg") api_version = json.loads(server.succeed("curl http://localhost:3000/api/forgejo/v1/version")).get("version") - assert "development" != api_version and "-gitea-" in api_version, ( + assert "development" != api_version and "${pkgs.forgejo.version}+gitea-" in api_version, ( "/api/forgejo/v1/version should not return 'development' " - + f"but should contain a gitea compatibility version string. Got '{api_version}' instead." + + f"but should contain a forgejo+gitea compatibility version string. Got '{api_version}' instead." ) server.succeed( @@ -152,7 +152,7 @@ let ) server.succeed( "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo gitea admin user create " - + "--username test --password totallysafe --email test@localhost'" + + "--username test --password totallysafe --email test@localhost --must-change-password=false'" ) api_token = server.succeed( diff --git a/third_party/nixpkgs/nixos/tests/garage/default.nix b/third_party/nixpkgs/nixos/tests/garage/default.nix index a42236e9a5..b7f9bb4b86 100644 --- a/third_party/nixpkgs/nixos/tests/garage/default.nix +++ b/third_party/nixpkgs/nixos/tests/garage/default.nix @@ -51,4 +51,5 @@ in [ "0_8" "0_9" + "1_x" ] diff --git a/third_party/nixpkgs/nixos/tests/garage/with-3node-replication.nix b/third_party/nixpkgs/nixos/tests/garage/with-3node-replication.nix index d4387b198d..266a108289 100644 --- a/third_party/nixpkgs/nixos/tests/garage/with-3node-replication.nix +++ b/third_party/nixpkgs/nixos/tests/garage/with-3node-replication.nix @@ -7,10 +7,10 @@ args@{ mkNode, ver, ... }: }; nodes = { - node1 = mkNode { replicationMode = 3; publicV6Address = "fc00:1::1"; }; - node2 = mkNode { replicationMode = 3; publicV6Address = "fc00:1::2"; }; - node3 = mkNode { replicationMode = 3; publicV6Address = "fc00:1::3"; }; - node4 = mkNode { replicationMode = 3; publicV6Address = "fc00:1::4"; }; + node1 = mkNode { replicationMode = "3"; publicV6Address = "fc00:1::1"; }; + node2 = mkNode { replicationMode = "3"; publicV6Address = "fc00:1::2"; }; + node3 = mkNode { replicationMode = "3"; publicV6Address = "fc00:1::3"; }; + node4 = mkNode { replicationMode = "3"; publicV6Address = "fc00:1::4"; }; }; testScript = '' diff --git a/third_party/nixpkgs/nixos/tests/gvisor.nix b/third_party/nixpkgs/nixos/tests/gvisor.nix index 7f130b709f..5c9447b071 100644 --- a/third_party/nixpkgs/nixos/tests/gvisor.nix +++ b/third_party/nixpkgs/nixos/tests/gvisor.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "gvisor"; meta = with pkgs.lib.maintainers; { - maintainers = [ andrew-d ]; + maintainers = [ ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/incus/container.nix b/third_party/nixpkgs/nixos/tests/incus/container.nix index a71c535504..10262cf213 100644 --- a/third_party/nixpkgs/nixos/tests/incus/container.nix +++ b/third_party/nixpkgs/nixos/tests/incus/container.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, lib, extra ? {}, name ? "incus-container", ... } : +import ../make-test-python.nix ({ pkgs, lib, extra ? {}, name ? "incus-container", incus ? pkgs.incus-lts, ... } : let releases = import ../../release.nix { @@ -28,7 +28,10 @@ in memorySize = 1024; diskSize = 4096; - incus.enable = true; + incus = { + enable = true; + package = incus; + }; }; networking.nftables.enable = true; }; @@ -70,51 +73,60 @@ in machine.succeed("incus exec container mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'") machine.succeed("incus exec container mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'") - with subtest("Container CPU limits can be managed"): - set_container("limits.cpu 1") - cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() - assert cpuinfo == "1", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 1, got: {cpuinfo}" + with subtest("resource limits"): + with subtest("Container CPU limits can be managed"): + set_container("limits.cpu 1") + cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() + assert cpuinfo == "1", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 1, got: {cpuinfo}" - set_container("limits.cpu 2") - cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() - assert cpuinfo == "2", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 2, got: {cpuinfo}" + set_container("limits.cpu 2") + cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() + assert cpuinfo == "2", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 2, got: {cpuinfo}" - with subtest("Container memory limits can be managed"): - set_container("limits.memory 64MB") - meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() - meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) - assert meminfo_bytes == "62500 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '62500 kB', got: '{meminfo_bytes}'" + with subtest("Container memory limits can be managed"): + set_container("limits.memory 64MB") + meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() + meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) + assert meminfo_bytes == "62500 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '62500 kB', got: '{meminfo_bytes}'" - set_container("limits.memory 128MB") - meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() - meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) - assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '125000 kB', got: '{meminfo_bytes}'" + set_container("limits.memory 128MB") + meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() + meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) + assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '125000 kB', got: '{meminfo_bytes}'" - with subtest("lxc-container generator configures plain container"): - # reuse the existing container to save some time - machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - check_sysctl("container") + with subtest("lxc-generator"): + with subtest("lxc-container generator configures plain container"): + # reuse the existing container to save some time + machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + check_sysctl("container") - with subtest("lxc-container generator configures nested container"): - machine.execute("incus delete --force container") - machine.succeed("incus launch nixos container --config security.nesting=true") - with machine.nested("Waiting for instance to start and be usable"): - retry(instance_is_up) + with subtest("lxc-container generator configures nested container"): + machine.execute("incus delete --force container") + machine.succeed("incus launch nixos container --config security.nesting=true") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) - machine.fail("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - target = machine.succeed("incus exec container readlink -- -f /run/systemd/system/systemd-binfmt.service").strip() - assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service" + machine.fail("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + target = machine.succeed("incus exec container readlink -- -f /run/systemd/system/systemd-binfmt.service").strip() + assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service" - check_sysctl("container") + check_sysctl("container") - with subtest("lxc-container generator configures privileged container"): - machine.execute("incus delete --force container") - machine.succeed("incus launch nixos container --config security.privileged=true") - with machine.nested("Waiting for instance to start and be usable"): - retry(instance_is_up) + with subtest("lxc-container generator configures privileged container"): + machine.execute("incus delete --force container") + machine.succeed("incus launch nixos container --config security.privileged=true") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) - machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - check_sysctl("container") + check_sysctl("container") + + with subtest("softDaemonRestart"): + with subtest("Instance remains running when softDaemonRestart is enabled and services is stopped"): + pid = machine.succeed("incus info container | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus") + machine.succeed(f"ps {pid}") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/incus/default.nix b/third_party/nixpkgs/nixos/tests/incus/default.nix index b850c4fba0..c33bf1600f 100644 --- a/third_party/nixpkgs/nixos/tests/incus/default.nix +++ b/third_party/nixpkgs/nixos/tests/incus/default.nix @@ -3,24 +3,27 @@ config ? { }, pkgs ? import ../../.. { inherit system config; }, handleTestOn, + incus ? pkgs.incus-lts, }: { container-legacy-init = import ./container.nix { name = "container-legacy-init"; - inherit system pkgs; + inherit incus system pkgs; }; container-systemd-init = import ./container.nix { name = "container-systemd-init"; - inherit system pkgs; + inherit incus system pkgs; extra = { boot.initrd.systemd.enable = true; }; }; - lxd-to-incus = import ./lxd-to-incus.nix { inherit system pkgs; }; - openvswitch = import ./openvswitch.nix { inherit system pkgs; }; - preseed = import ./preseed.nix { inherit system pkgs; }; - socket-activated = import ./socket-activated.nix { inherit system pkgs; }; - storage = import ./storage.nix { inherit system pkgs; }; - ui = import ./ui.nix { inherit system pkgs; }; - virtual-machine = handleTestOn [ "x86_64-linux" ] ./virtual-machine.nix { inherit system pkgs; }; + incusd-options = import ./incusd-options.nix { inherit incus system pkgs; }; + lxd-to-incus = import ./lxd-to-incus.nix { inherit incus system pkgs; }; + openvswitch = import ./openvswitch.nix { inherit incus system pkgs; }; + socket-activated = import ./socket-activated.nix { inherit incus system pkgs; }; + storage = import ./storage.nix { inherit incus system pkgs; }; + ui = import ./ui.nix { inherit incus system pkgs; }; + virtual-machine = handleTestOn [ "x86_64-linux" ] ./virtual-machine.nix { + inherit incus system pkgs; + }; } diff --git a/third_party/nixpkgs/nixos/tests/incus/incusd-options.nix b/third_party/nixpkgs/nixos/tests/incus/incusd-options.nix new file mode 100644 index 0000000000..7b3a4d726e --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/incus/incusd-options.nix @@ -0,0 +1,110 @@ +# this is a set of tests for non-default options. typically the default options +# will be handled by the other tests +import ../make-test-python.nix ( + { + pkgs, + lib, + incus ? pkgs.incus-lts, + ... + }: + + let + releases = import ../../release.nix { + configuration = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; + }; + }; + + container-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; + container-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system}; + in + { + name = "incusd-options"; + + meta = { + maintainers = lib.teams.lxc.members; + }; + + nodes.machine = { + virtualisation = { + cores = 2; + memorySize = 1024; + diskSize = 4096; + + incus = { + enable = true; + package = incus; + softDaemonRestart = false; + + preseed = { + networks = [ + { + name = "nixostestbr0"; + type = "bridge"; + config = { + "ipv4.address" = "10.0.100.1/24"; + "ipv4.nat" = "true"; + }; + } + ]; + profiles = [ + { + name = "default"; + devices = { + eth0 = { + name = "eth0"; + network = "nixostestbr0"; + type = "nic"; + }; + root = { + path = "/"; + pool = "nixostest_pool"; + size = "35GiB"; + type = "disk"; + }; + }; + } + ]; + storage_pools = [ + { + name = "nixostest_pool"; + driver = "dir"; + } + ]; + }; + }; + }; + networking.nftables.enable = true; + }; + + testScript = '' + def instance_is_up(_) -> bool: + status, _ = machine.execute("incus exec container --disable-stdin --force-interactive /run/current-system/sw/bin/systemctl -- is-system-running") + return status == 0 + + machine.wait_for_unit("incus.service") + machine.wait_for_unit("incus-preseed.service") + + with subtest("Container image can be imported"): + machine.succeed("incus image import ${container-image-metadata}/*/*.tar.xz ${container-image-rootfs}/*/*.tar.xz --alias nixos") + + with subtest("Container can be launched and managed"): + machine.succeed("incus launch nixos container") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) + machine.succeed("echo true | incus exec container /run/current-system/sw/bin/bash -") + + with subtest("Verify preseed resources created"): + machine.succeed("incus profile show default") + machine.succeed("incus network info nixostestbr0") + machine.succeed("incus storage show nixostest_pool") + + with subtest("Instance is stopped when softDaemonRestart is disabled and services is stopped"): + pid = machine.succeed("incus info container | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus") + machine.fail(f"ps {pid}") + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/incus/lxd-to-incus.nix b/third_party/nixpkgs/nixos/tests/incus/lxd-to-incus.nix index e93b76591e..66f78cbd33 100644 --- a/third_party/nixpkgs/nixos/tests/incus/lxd-to-incus.nix +++ b/third_party/nixpkgs/nixos/tests/incus/lxd-to-incus.nix @@ -1,6 +1,11 @@ import ../make-test-python.nix ( - { pkgs, lib, ... }: + { + pkgs, + lib, + incus ? pkgs.incus-lts, + ... + }: let releases = import ../../release.nix { configuration.documentation.enable = lib.mkForce false; }; @@ -65,7 +70,10 @@ import ../make-test-python.nix ( ]; }; - incus.enable = true; + incus = { + enable = true; + package = incus; + }; }; networking.nftables.enable = true; }; diff --git a/third_party/nixpkgs/nixos/tests/incus/openvswitch.nix b/third_party/nixpkgs/nixos/tests/incus/openvswitch.nix index 5d4aef031a..1cead99080 100644 --- a/third_party/nixpkgs/nixos/tests/incus/openvswitch.nix +++ b/third_party/nixpkgs/nixos/tests/incus/openvswitch.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, lib, ... } : +import ../make-test-python.nix ({ pkgs, lib, incus ? pkgs.incus-lts, ... } : { name = "incus-openvswitch"; @@ -9,7 +9,11 @@ import ../make-test-python.nix ({ pkgs, lib, ... } : nodes.machine = { lib, ... }: { virtualisation = { - incus.enable = true; + incus = { + enable = true; + package = incus; + }; + vswitch.enable = true; incus.preseed = { networks = [ diff --git a/third_party/nixpkgs/nixos/tests/incus/preseed.nix b/third_party/nixpkgs/nixos/tests/incus/preseed.nix deleted file mode 100644 index f2d928115f..0000000000 --- a/third_party/nixpkgs/nixos/tests/incus/preseed.nix +++ /dev/null @@ -1,63 +0,0 @@ -import ../make-test-python.nix ({ pkgs, lib, ... } : - -{ - name = "incus-preseed"; - - meta = { - maintainers = lib.teams.lxc.members; - }; - - nodes.machine = { lib, ... }: { - virtualisation = { - incus.enable = true; - - incus.preseed = { - networks = [ - { - name = "nixostestbr0"; - type = "bridge"; - config = { - "ipv4.address" = "10.0.100.1/24"; - "ipv4.nat" = "true"; - }; - } - ]; - profiles = [ - { - name = "nixostest_default"; - devices = { - eth0 = { - name = "eth0"; - network = "nixostestbr0"; - type = "nic"; - }; - root = { - path = "/"; - pool = "default"; - size = "35GiB"; - type = "disk"; - }; - }; - } - ]; - storage_pools = [ - { - name = "nixostest_pool"; - driver = "dir"; - } - ]; - }; - }; - networking.nftables.enable = true; - }; - - testScript = '' - machine.wait_for_unit("incus.service") - machine.wait_for_unit("incus-preseed.service") - - with subtest("Verify preseed resources created"): - machine.succeed("incus profile show nixostest_default") - machine.succeed("incus network info nixostestbr0") - machine.succeed("incus storage show nixostest_pool") - ''; -}) diff --git a/third_party/nixpkgs/nixos/tests/incus/socket-activated.nix b/third_party/nixpkgs/nixos/tests/incus/socket-activated.nix index 59caf1090f..55c5496396 100644 --- a/third_party/nixpkgs/nixos/tests/incus/socket-activated.nix +++ b/third_party/nixpkgs/nixos/tests/incus/socket-activated.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, lib, ... } : +import ../make-test-python.nix ({ pkgs, lib, incus ? pkgs.incus-lts, ... } : { name = "incus-socket-activated"; @@ -9,8 +9,11 @@ import ../make-test-python.nix ({ pkgs, lib, ... } : nodes.machine = { lib, ... }: { virtualisation = { - incus.enable = true; - incus.socketActivation = true; + incus = { + enable = true; + package = incus; + socketActivation = true; + }; }; networking.nftables.enable = true; }; diff --git a/third_party/nixpkgs/nixos/tests/incus/storage.nix b/third_party/nixpkgs/nixos/tests/incus/storage.nix index 190f4f7451..05ea6ba996 100644 --- a/third_party/nixpkgs/nixos/tests/incus/storage.nix +++ b/third_party/nixpkgs/nixos/tests/incus/storage.nix @@ -1,5 +1,10 @@ import ../make-test-python.nix ( - { pkgs, lib, ... }: + { + pkgs, + lib, + incus ? pkgs.incus-lts, + ... + }: { name = "incus-storage"; @@ -19,7 +24,10 @@ import ../make-test-python.nix ( virtualisation = { emptyDiskImages = [ 2048 ]; - incus.enable = true; + incus = { + enable = true; + package = incus; + }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/incus/ui.nix b/third_party/nixpkgs/nixos/tests/incus/ui.nix index 837eb14844..a255d6fabe 100644 --- a/third_party/nixpkgs/nixos/tests/incus/ui.nix +++ b/third_party/nixpkgs/nixos/tests/incus/ui.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, lib, ... }: { +import ../make-test-python.nix ({ pkgs, lib, incus ? pkgs.incus-lts, ... }: { name = "incus-ui"; meta = { @@ -7,7 +7,10 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: { nodes.machine = { lib, ... }: { virtualisation = { - incus.enable = true; + incus = { + enable = true; + package = incus; + }; incus.ui.enable = true; }; networking.nftables.enable = true; diff --git a/third_party/nixpkgs/nixos/tests/incus/virtual-machine.nix b/third_party/nixpkgs/nixos/tests/incus/virtual-machine.nix index 48178aaed3..70e54191d3 100644 --- a/third_party/nixpkgs/nixos/tests/incus/virtual-machine.nix +++ b/third_party/nixpkgs/nixos/tests/incus/virtual-machine.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, lib, ... }: +import ../make-test-python.nix ({ pkgs, lib, incus ? pkgs.incus-lts, ... }: let releases = import ../../release.nix { @@ -30,7 +30,13 @@ in memorySize = 1024; diskSize = 4096; - incus.enable = true; + # Provide a TPM to test vTPM support for guests + tpm.enable = true; + + incus = { + enable = true; + package = incus; + }; }; networking.nftables.enable = true; }; @@ -47,8 +53,14 @@ in with subtest("virtual-machine image can be imported"): machine.succeed("incus image import ${vm-image-metadata}/*/*.tar.xz ${vm-image-disk}/nixos.qcow2 --alias nixos") + with subtest("virtual-machine can be created"): + machine.succeed("incus create nixos ${instance-name} --vm --config limits.memory=512MB --config security.secureboot=false") + + with subtest("virtual tpm can be configured"): + machine.succeed("incus config device add ${instance-name} vtpm tpm path=/dev/tpm0") + with subtest("virtual-machine can be launched and become available"): - machine.succeed("incus launch nixos ${instance-name} --vm --config limits.memory=512MB --config security.secureboot=false") + machine.succeed("incus start ${instance-name}") with machine.nested("Waiting for instance to start and be usable"): retry(instance_is_up) @@ -66,5 +78,11 @@ in machine.succeed("incus config set ${instance-name} limits.cpu=2") count = int(machine.succeed("incus exec ${instance-name} -- nproc").strip()) assert count == 2, f"Wrong number of CPUs reported, want: 2, got: {count}" + + with subtest("Instance remains running when softDaemonRestart is enabled and services is stopped"): + pid = machine.succeed("incus info ${instance-name} | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus") + machine.succeed(f"ps {pid}") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/initrd-network.nix b/third_party/nixpkgs/nixos/tests/initrd-network.nix index f2483b7393..abbc3d0fce 100644 --- a/third_party/nixpkgs/nixos/tests/initrd-network.nix +++ b/third_party/nixpkgs/nixos/tests/initrd-network.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "initrd-network"; - meta.maintainers = [ pkgs.lib.maintainers.eelco ]; + meta.maintainers = [ ]; nodes.machine = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/default.nix b/third_party/nixpkgs/nixos/tests/installed-tests/default.nix index e87edb2007..b1ddfe3dcb 100644 --- a/third_party/nixpkgs/nixos/tests/installed-tests/default.nix +++ b/third_party/nixpkgs/nixos/tests/installed-tests/default.nix @@ -1,5 +1,5 @@ # NixOS tests for gnome-desktop-testing-runner using software -# See https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests +# See https://github.com/NixOS/nixpkgs/issues/34987 { system ? builtins.currentSystem, config ? {}, diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/gnome-photos.nix b/third_party/nixpkgs/nixos/tests/installed-tests/gnome-photos.nix index bcb6479ee8..010ad97024 100644 --- a/third_party/nixpkgs/nixos/tests/installed-tests/gnome-photos.nix +++ b/third_party/nixpkgs/nixos/tests/installed-tests/gnome-photos.nix @@ -13,7 +13,7 @@ makeInstalledTest { (stdenv.mkDerivation { name = "desktop-gsettings"; dontUnpack = true; - nativeBuildInputs = [ glib wrapGAppsHook ]; + nativeBuildInputs = [ glib wrapGAppsHook3 ]; buildInputs = [ gsettings-desktop-schemas ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/nixos/tests/ipv6.nix b/third_party/nixpkgs/nixos/tests/ipv6.nix index 75faa6f602..7f91457fa5 100644 --- a/third_party/nixpkgs/nixos/tests/ipv6.nix +++ b/third_party/nixpkgs/nixos/tests/ipv6.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "ipv6"; meta = with pkgs.lib.maintainers; { - maintainers = [ eelco ]; + maintainers = [ ]; }; nodes = diff --git a/third_party/nixpkgs/nixos/tests/isolate.nix b/third_party/nixpkgs/nixos/tests/isolate.nix new file mode 100644 index 0000000000..327231be1c --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/isolate.nix @@ -0,0 +1,38 @@ +import ./make-test-python.nix ({ lib, ... }: +{ + name = "isolate"; + meta.maintainers = with lib.maintainers; [ virchau13 ]; + + nodes.machine = + { ... }: + { + security.isolate = { + enable = true; + }; + }; + + testScript = '' + bash_path = machine.succeed('realpath $(which bash)').strip() + sleep_path = machine.succeed('realpath $(which sleep)').strip() + def sleep_test(walltime, sleeptime): + return f'isolate --no-default-dirs --wall-time {walltime} ' + \ + f'--dir=/box={box_path} --dir=/nix=/nix --run -- ' + \ + f"{bash_path} -c 'exec -a sleep {sleep_path} {sleeptime}'" + + def sleep_test_cg(walltime, sleeptime): + return f'isolate --cg --no-default-dirs --wall-time {walltime} ' + \ + f'--dir=/box={box_path} --dir=/nix=/nix --processes=2 --run -- ' + \ + f"{bash_path} -c '( exec -a sleep {sleep_path} {sleeptime} )'" + + with subtest("without cgroups"): + box_path = machine.succeed('isolate --init').strip() + machine.succeed(sleep_test(1, 0.5)) + machine.fail(sleep_test(0.5, 1)) + machine.succeed('isolate --cleanup') + with subtest("with cgroups"): + box_path = machine.succeed('isolate --cg --init').strip() + machine.succeed(sleep_test_cg(1, 0.5)) + machine.fail(sleep_test_cg(0.5, 1)) + machine.succeed('isolate --cg --cleanup') + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/jenkins.nix b/third_party/nixpkgs/nixos/tests/jenkins.nix index a8f6210006..d7394c866c 100644 --- a/third_party/nixpkgs/nixos/tests/jenkins.nix +++ b/third_party/nixpkgs/nixos/tests/jenkins.nix @@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "jenkins"; meta = with pkgs.lib.maintainers; { - maintainers = [ bjornfor coconnor domenkozar eelco ]; + maintainers = [ bjornfor coconnor domenkozar ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/jotta-cli.nix b/third_party/nixpkgs/nixos/tests/jotta-cli.nix new file mode 100644 index 0000000000..0df23ee2cb --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/jotta-cli.nix @@ -0,0 +1,25 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + + name = "jotta-cli"; + meta.maintainers = with pkgs.lib.maintainers; [ evenbrenden ]; + + nodes.machine = { pkgs, ... }: { + services.jotta-cli.enable = true; + imports = [ ./common/user-account.nix ]; + }; + + testScript = { nodes, ... }: + let uid = toString nodes.machine.users.users.alice.uid; + in '' + machine.start() + + machine.succeed("loginctl enable-linger alice") + machine.wait_for_unit("user@${uid}.service") + + machine.wait_for_unit("jottad.service", "alice") + machine.wait_for_open_unix_socket("/run/user/${uid}/jottad/jottad.socket") + + # "jotta-cli version" should fail if jotta-cli cannot connect to jottad + machine.succeed('XDG_RUNTIME_DIR=/run/user/${uid} su alice -c "jotta-cli version"') + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/k3s/default.nix b/third_party/nixpkgs/nixos/tests/k3s/default.nix index 512dc06ee7..297b05a4e4 100644 --- a/third_party/nixpkgs/nixos/tests/k3s/default.nix +++ b/third_party/nixpkgs/nixos/tests/k3s/default.nix @@ -1,16 +1,20 @@ -{ system ? builtins.currentSystem -, pkgs ? import ../../.. { inherit system; } -, lib ? pkgs.lib +{ + system ? builtins.currentSystem, + pkgs ? import ../../.. { inherit system; }, + lib ? pkgs.lib, }: let allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs; in { # Testing K3s with Etcd backend - etcd = lib.mapAttrs (_: k3s: import ./etcd.nix { - inherit system pkgs k3s; - inherit (pkgs) etcd; - }) allK3s; + etcd = lib.mapAttrs ( + _: k3s: + import ./etcd.nix { + inherit system pkgs k3s; + inherit (pkgs) etcd; + } + ) allK3s; # Run a single node k3s cluster and verify a pod can run single-node = lib.mapAttrs (_: k3s: import ./single-node.nix { inherit system pkgs k3s; }) allK3s; # Run a multi-node k3s cluster and verify pod networking works across nodes diff --git a/third_party/nixpkgs/nixos/tests/k3s/etcd.nix b/third_party/nixpkgs/nixos/tests/k3s/etcd.nix index d6e9a294ad..ac0aa90472 100644 --- a/third_party/nixpkgs/nixos/tests/k3s/etcd.nix +++ b/third_party/nixpkgs/nixos/tests/k3s/etcd.nix @@ -1,100 +1,130 @@ -import ../make-test-python.nix ({ pkgs, lib, k3s, etcd, ... }: +import ../make-test-python.nix ( + { + pkgs, + lib, + k3s, + etcd, + ... + }: -{ - name = "${k3s.name}-etcd"; + { + name = "${k3s.name}-etcd"; - nodes = { + nodes = { - etcd = { ... }: { - services.etcd = { - enable = true; - openFirewall = true; - listenClientUrls = [ "http://192.168.1.1:2379" "http://127.0.0.1:2379" ]; - listenPeerUrls = [ "http://192.168.1.1:2380" ]; - initialAdvertisePeerUrls = [ "http://192.168.1.1:2380" ]; - initialCluster = [ "etcd=http://192.168.1.1:2380" ]; - }; - networking = { - useDHCP = false; - defaultGateway = "192.168.1.1"; - interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [ - { address = "192.168.1.1"; prefixLength = 24; } - ]; - }; - }; - - k3s = { pkgs, ... }: { - environment.systemPackages = with pkgs; [ jq ]; - # k3s uses enough resources the default vm fails. - virtualisation.memorySize = 1536; - virtualisation.diskSize = 4096; - - services.k3s = { - enable = true; - role = "server"; - extraFlags = builtins.toString [ - "--datastore-endpoint=\"http://192.168.1.1:2379\"" - "--disable" "coredns" - "--disable" "local-storage" - "--disable" "metrics-server" - "--disable" "servicelb" - "--disable" "traefik" - "--node-ip" "192.168.1.2" - ]; - }; - - networking = { - firewall = { - allowedTCPPorts = [ 2379 2380 6443 ]; - allowedUDPPorts = [ 8472 ]; + etcd = + { ... }: + { + services.etcd = { + enable = true; + openFirewall = true; + listenClientUrls = [ + "http://192.168.1.1:2379" + "http://127.0.0.1:2379" + ]; + listenPeerUrls = [ "http://192.168.1.1:2380" ]; + initialAdvertisePeerUrls = [ "http://192.168.1.1:2380" ]; + initialCluster = [ "etcd=http://192.168.1.1:2380" ]; + }; + networking = { + useDHCP = false; + defaultGateway = "192.168.1.1"; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [ + { + address = "192.168.1.1"; + prefixLength = 24; + } + ]; + }; + }; + + k3s = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ jq ]; + # k3s uses enough resources the default vm fails. + virtualisation.memorySize = 1536; + virtualisation.diskSize = 4096; + + services.k3s = { + enable = true; + role = "server"; + extraFlags = builtins.toString [ + "--datastore-endpoint=\"http://192.168.1.1:2379\"" + "--disable" + "coredns" + "--disable" + "local-storage" + "--disable" + "metrics-server" + "--disable" + "servicelb" + "--disable" + "traefik" + "--node-ip" + "192.168.1.2" + ]; + }; + + networking = { + firewall = { + allowedTCPPorts = [ + 2379 + 2380 + 6443 + ]; + allowedUDPPorts = [ 8472 ]; + }; + useDHCP = false; + defaultGateway = "192.168.1.2"; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [ + { + address = "192.168.1.2"; + prefixLength = 24; + } + ]; + }; }; - useDHCP = false; - defaultGateway = "192.168.1.2"; - interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [ - { address = "192.168.1.2"; prefixLength = 24; } - ]; - }; }; - }; + testScript = '' + with subtest("should start etcd"): + etcd.start() + etcd.wait_for_unit("etcd.service") - testScript = '' - with subtest("should start etcd"): - etcd.start() - etcd.wait_for_unit("etcd.service") + with subtest("should wait for etcdctl endpoint status to succeed"): + etcd.wait_until_succeeds("etcdctl endpoint status") - with subtest("should wait for etcdctl endpoint status to succeed"): - etcd.wait_until_succeeds("etcdctl endpoint status") + with subtest("should start k3s"): + k3s.start() + k3s.wait_for_unit("k3s") - with subtest("should start k3s"): - k3s.start() - k3s.wait_for_unit("k3s") + with subtest("should test if kubectl works"): + k3s.wait_until_succeeds("k3s kubectl get node") - with subtest("should test if kubectl works"): - k3s.wait_until_succeeds("k3s kubectl get node") + with subtest("should wait for service account to show up; takes a sec"): + k3s.wait_until_succeeds("k3s kubectl get serviceaccount default") - with subtest("should wait for service account to show up; takes a sec"): - k3s.wait_until_succeeds("k3s kubectl get serviceaccount default") + with subtest("should create a sample secret object"): + k3s.succeed("k3s kubectl create secret generic nixossecret --from-literal thesecret=abacadabra") - with subtest("should create a sample secret object"): - k3s.succeed("k3s kubectl create secret generic nixossecret --from-literal thesecret=abacadabra") + with subtest("should check if secret is correct"): + k3s.wait_until_succeeds("[[ $(kubectl get secrets nixossecret -o json | jq -r .data.thesecret | base64 -d) == abacadabra ]]") - with subtest("should check if secret is correct"): - k3s.wait_until_succeeds("[[ $(kubectl get secrets nixossecret -o json | jq -r .data.thesecret | base64 -d) == abacadabra ]]") + with subtest("should have a secret in database"): + etcd.wait_until_succeeds("[[ $(etcdctl get /registry/secrets/default/nixossecret | head -c1 | wc -c) -ne 0 ]]") - with subtest("should have a secret in database"): - etcd.wait_until_succeeds("[[ $(etcdctl get /registry/secrets/default/nixossecret | head -c1 | wc -c) -ne 0 ]]") + with subtest("should delete the secret"): + k3s.succeed("k3s kubectl delete secret nixossecret") - with subtest("should delete the secret"): - k3s.succeed("k3s kubectl delete secret nixossecret") + with subtest("should not have a secret in database"): + etcd.wait_until_fails("[[ $(etcdctl get /registry/secrets/default/nixossecret | head -c1 | wc -c) -ne 0 ]]") - with subtest("should not have a secret in database"): - etcd.wait_until_fails("[[ $(etcdctl get /registry/secrets/default/nixossecret | head -c1 | wc -c) -ne 0 ]]") + with subtest("should shutdown k3s and etcd"): + k3s.shutdown() + etcd.shutdown() + ''; - with subtest("should shutdown k3s and etcd"): - k3s.shutdown() - etcd.shutdown() - ''; - - meta.maintainers = etcd.meta.maintainers ++ k3s.meta.maintainers; -}) + meta.maintainers = etcd.meta.maintainers ++ k3s.meta.maintainers; + } +) diff --git a/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix b/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix index 20279f3ca4..b618d2aff3 100644 --- a/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix +++ b/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix @@ -1,14 +1,30 @@ -import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: +import ../make-test-python.nix ( + { + pkgs, + lib, + k3s, + ... + }: let imageEnv = pkgs.buildEnv { name = "k3s-pause-image-env"; - paths = with pkgs; [ tini bashInteractive coreutils socat ]; + paths = with pkgs; [ + tini + bashInteractive + coreutils + socat + ]; }; pauseImage = pkgs.dockerTools.streamLayeredImage { name = "test.local/pause"; tag = "local"; contents = imageEnv; - config.Entrypoint = [ "/bin/tini" "--" "/bin/sleep" "inf" ]; + config.Entrypoint = [ + "/bin/tini" + "--" + "/bin/sleep" + "inf" + ]; }; # A daemonset that responds 'server' on port 8000 networkTestDaemonset = pkgs.writeText "test.yml" '' @@ -42,90 +58,135 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: name = "${k3s.name}-multi-node"; nodes = { - server = { pkgs, ... }: { - environment.systemPackages = with pkgs; [ gzip jq ]; - # k3s uses enough resources the default vm fails. - virtualisation.memorySize = 1536; - virtualisation.diskSize = 4096; + server = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ + gzip + jq + ]; + # k3s uses enough resources the default vm fails. + virtualisation.memorySize = 1536; + virtualisation.diskSize = 4096; - services.k3s = { - inherit tokenFile; - enable = true; - role = "server"; - package = k3s; - clusterInit = true; - extraFlags = builtins.toString [ - "--disable" "coredns" - "--disable" "local-storage" - "--disable" "metrics-server" - "--disable" "servicelb" - "--disable" "traefik" - "--node-ip" "192.168.1.1" - "--pause-image" "test.local/pause:local" + services.k3s = { + inherit tokenFile; + enable = true; + role = "server"; + package = k3s; + clusterInit = true; + extraFlags = builtins.toString [ + "--disable" + "coredns" + "--disable" + "local-storage" + "--disable" + "metrics-server" + "--disable" + "servicelb" + "--disable" + "traefik" + "--node-ip" + "192.168.1.1" + "--pause-image" + "test.local/pause:local" + ]; + }; + networking.firewall.allowedTCPPorts = [ + 2379 + 2380 + 6443 + ]; + networking.firewall.allowedUDPPorts = [ 8472 ]; + networking.firewall.trustedInterfaces = [ "flannel.1" ]; + networking.useDHCP = false; + networking.defaultGateway = "192.168.1.1"; + networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [ + { + address = "192.168.1.1"; + prefixLength = 24; + } ]; }; - networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ]; - networking.firewall.allowedUDPPorts = [ 8472 ]; - networking.firewall.trustedInterfaces = [ "flannel.1" ]; - networking.useDHCP = false; - networking.defaultGateway = "192.168.1.1"; - networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [ - { address = "192.168.1.1"; prefixLength = 24; } - ]; - }; - server2 = { pkgs, ... }: { - environment.systemPackages = with pkgs; [ gzip jq ]; - virtualisation.memorySize = 1536; - virtualisation.diskSize = 4096; + server2 = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ + gzip + jq + ]; + virtualisation.memorySize = 1536; + virtualisation.diskSize = 4096; - services.k3s = { - inherit tokenFile; - enable = true; - serverAddr = "https://192.168.1.1:6443"; - clusterInit = false; - extraFlags = builtins.toString [ - "--disable" "coredns" - "--disable" "local-storage" - "--disable" "metrics-server" - "--disable" "servicelb" - "--disable" "traefik" - "--node-ip" "192.168.1.3" - "--pause-image" "test.local/pause:local" + services.k3s = { + inherit tokenFile; + enable = true; + serverAddr = "https://192.168.1.1:6443"; + clusterInit = false; + extraFlags = builtins.toString [ + "--disable" + "coredns" + "--disable" + "local-storage" + "--disable" + "metrics-server" + "--disable" + "servicelb" + "--disable" + "traefik" + "--node-ip" + "192.168.1.3" + "--pause-image" + "test.local/pause:local" + ]; + }; + networking.firewall.allowedTCPPorts = [ + 2379 + 2380 + 6443 + ]; + networking.firewall.allowedUDPPorts = [ 8472 ]; + networking.firewall.trustedInterfaces = [ "flannel.1" ]; + networking.useDHCP = false; + networking.defaultGateway = "192.168.1.3"; + networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [ + { + address = "192.168.1.3"; + prefixLength = 24; + } ]; }; - networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ]; - networking.firewall.allowedUDPPorts = [ 8472 ]; - networking.firewall.trustedInterfaces = [ "flannel.1" ]; - networking.useDHCP = false; - networking.defaultGateway = "192.168.1.3"; - networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [ - { address = "192.168.1.3"; prefixLength = 24; } - ]; - }; - agent = { pkgs, ... }: { - virtualisation.memorySize = 1024; - virtualisation.diskSize = 2048; - services.k3s = { - inherit tokenFile; - enable = true; - role = "agent"; - serverAddr = "https://192.168.1.3:6443"; - extraFlags = lib.concatStringsSep " " [ - "--pause-image" "test.local/pause:local" - "--node-ip" "192.168.1.2" + agent = + { pkgs, ... }: + { + virtualisation.memorySize = 1024; + virtualisation.diskSize = 2048; + services.k3s = { + inherit tokenFile; + enable = true; + role = "agent"; + serverAddr = "https://192.168.1.3:6443"; + extraFlags = lib.concatStringsSep " " [ + "--pause-image" + "test.local/pause:local" + "--node-ip" + "192.168.1.2" + ]; + }; + networking.firewall.allowedTCPPorts = [ 6443 ]; + networking.firewall.allowedUDPPorts = [ 8472 ]; + networking.firewall.trustedInterfaces = [ "flannel.1" ]; + networking.useDHCP = false; + networking.defaultGateway = "192.168.1.2"; + networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [ + { + address = "192.168.1.2"; + prefixLength = 24; + } ]; }; - networking.firewall.allowedTCPPorts = [ 6443 ]; - networking.firewall.allowedUDPPorts = [ 8472 ]; - networking.firewall.trustedInterfaces = [ "flannel.1" ]; - networking.useDHCP = false; - networking.defaultGateway = "192.168.1.2"; - networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [ - { address = "192.168.1.2"; prefixLength = 24; } - ]; - }; }; meta.maintainers = k3s.meta.maintainers; @@ -178,4 +239,5 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: for m in machines: m.shutdown() ''; - }) + } +) diff --git a/third_party/nixpkgs/nixos/tests/k3s/single-node.nix b/third_party/nixpkgs/nixos/tests/k3s/single-node.nix index fd64a050e6..80d80a55dd 100644 --- a/third_party/nixpkgs/nixos/tests/k3s/single-node.nix +++ b/third_party/nixpkgs/nixos/tests/k3s/single-node.nix @@ -1,14 +1,29 @@ -import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: +import ../make-test-python.nix ( + { + pkgs, + lib, + k3s, + ... + }: let imageEnv = pkgs.buildEnv { name = "k3s-pause-image-env"; - paths = with pkgs; [ tini (hiPrio coreutils) busybox ]; + paths = with pkgs; [ + tini + (hiPrio coreutils) + busybox + ]; }; pauseImage = pkgs.dockerTools.streamLayeredImage { name = "test.local/pause"; tag = "local"; contents = imageEnv; - config.Entrypoint = [ "/bin/tini" "--" "/bin/sleep" "inf" ]; + config.Entrypoint = [ + "/bin/tini" + "--" + "/bin/sleep" + "inf" + ]; }; testPodYaml = pkgs.writeText "test.yml" '' apiVersion: v1 @@ -27,57 +42,83 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: name = "${k3s.name}-single-node"; meta.maintainers = k3s.meta.maintainers; - nodes.machine = { pkgs, ... }: { - environment.systemPackages = with pkgs; [ k3s gzip ]; + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ + k3s + gzip + ]; - # k3s uses enough resources the default vm fails. - virtualisation.memorySize = 1536; - virtualisation.diskSize = 4096; + # k3s uses enough resources the default vm fails. + virtualisation.memorySize = 1536; + virtualisation.diskSize = 4096; - services.k3s.enable = true; - services.k3s.role = "server"; - services.k3s.package = k3s; - # Slightly reduce resource usage - services.k3s.extraFlags = builtins.toString [ - "--disable" "coredns" - "--disable" "local-storage" - "--disable" "metrics-server" - "--disable" "servicelb" - "--disable" "traefik" - "--pause-image" "test.local/pause:local" - ]; + services.k3s.enable = true; + services.k3s.role = "server"; + services.k3s.package = k3s; + # Slightly reduce resource usage + services.k3s.extraFlags = builtins.toString [ + "--disable" + "coredns" + "--disable" + "local-storage" + "--disable" + "metrics-server" + "--disable" + "servicelb" + "--disable" + "traefik" + "--pause-image" + "test.local/pause:local" + ]; - users.users = { - noprivs = { - isNormalUser = true; - description = "Can't access k3s by default"; - password = "*"; + users.users = { + noprivs = { + isNormalUser = true; + description = "Can't access k3s by default"; + password = "*"; + }; }; }; - }; - testScript = '' - start_all() + testScript = + '' + start_all() - machine.wait_for_unit("k3s") - machine.succeed("kubectl cluster-info") - machine.fail("sudo -u noprivs kubectl cluster-info") + machine.wait_for_unit("k3s") + machine.succeed("kubectl cluster-info") + machine.fail("sudo -u noprivs kubectl cluster-info") '' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)" - + lib.optionalString (!pkgs.stdenv.isAarch64) ''machine.succeed("k3s check-config")'' + '' + + lib.optionalString (!pkgs.stdenv.isAarch64) ''machine.succeed("k3s check-config")'' + + '' - machine.succeed( - "${pauseImage} | ctr image import -" - ) + machine.succeed( + "${pauseImage} | ctr image import -" + ) - # Also wait for our service account to show up; it takes a sec - machine.wait_until_succeeds("kubectl get serviceaccount default") - machine.succeed("kubectl apply -f ${testPodYaml}") - machine.succeed("kubectl wait --for 'condition=Ready' pod/test") - machine.succeed("kubectl delete -f ${testPodYaml}") + # Also wait for our service account to show up; it takes a sec + machine.wait_until_succeeds("kubectl get serviceaccount default") + machine.succeed("kubectl apply -f ${testPodYaml}") + machine.succeed("kubectl wait --for 'condition=Ready' pod/test") + machine.succeed("kubectl delete -f ${testPodYaml}") - # regression test for #176445 - machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'") + # regression test for #176445 + machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'") - machine.shutdown() - ''; - }) + with subtest("Run k3s-killall"): + # Call the killall script with a clean path to assert that + # all required commands are wrapped + output = machine.succeed("PATH= ${k3s}/bin/k3s-killall.sh 2>&1 | tee /dev/stderr") + assert "command not found" not in output, "killall script contains unknown command" + + # Check that killall cleaned up properly + machine.fail("systemctl is-active k3s.service") + machine.fail("systemctl list-units | grep containerd") + machine.fail("ip link show | awk -F': ' '{print $2}' | grep -e flannel -e cni0") + machine.fail("ip netns show | grep cni-") + + machine.shutdown() + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/kanidm.nix b/third_party/nixpkgs/nixos/tests/kanidm.nix index fa24d4a8a5..8ed9af63f1 100644 --- a/third_party/nixpkgs/nixos/tests/kanidm.nix +++ b/third_party/nixpkgs/nixos/tests/kanidm.nix @@ -76,14 +76,17 @@ import ./make-test-python.nix ({ pkgs, ... }: with subtest("Test LDAP interface"): server.succeed("ldapsearch -H ldaps://${serverDomain}:636 -b '${ldapBaseDN}' -x '(name=test)'") - with subtest("Test CLI login"): - client.succeed("kanidm login -D anonymous") - client.succeed("kanidm self whoami | grep anonymous@${serverDomain}") - client.succeed("kanidm logout") - with subtest("Recover idm_admin account"): idm_admin_password = server.succeed("su - kanidm -c 'kanidmd recover-account -c ${serverConfigFile} idm_admin 2>&1 | rg -o \'[A-Za-z0-9]{48}\' '").strip().removeprefix("'").removesuffix("'") + with subtest("Test CLI login"): + client.wait_until_tty_matches("1", "login: ") + client.send_chars("root\n") + client.send_chars("kanidm login -D idm_admin\n") + client.wait_until_tty_matches("1", "Enter password: ") + client.send_chars(f"{idm_admin_password}\n") + client.wait_until_tty_matches("1", "Login Success for idm_admin") + with subtest("Test unixd connection"): client.wait_for_unit("kanidm-unixd.service") client.wait_for_file("/run/kanidm-unixd/sock") @@ -92,12 +95,6 @@ import ./make-test-python.nix ({ pkgs, ... }: with subtest("Test user creation"): client.wait_for_unit("getty@tty1.service") client.wait_until_succeeds("pgrep -f 'agetty.*tty1'") - client.wait_until_tty_matches("1", "login: ") - client.send_chars("root\n") - client.send_chars("kanidm login -D idm_admin\n") - client.wait_until_tty_matches("1", "Enter password: ") - client.send_chars(f"{idm_admin_password}\n") - client.wait_until_tty_matches("1", "Login Success for idm_admin") client.succeed("kanidm person create testuser TestUser") client.succeed("kanidm person posix set --shell \"$SHELL\" testuser") client.send_chars("kanidm person posix set-password testuser\n") diff --git a/third_party/nixpkgs/nixos/tests/knot.nix b/third_party/nixpkgs/nixos/tests/knot.nix index eec94a22f2..4441fed6ef 100644 --- a/third_party/nixpkgs/nixos/tests/knot.nix +++ b/third_party/nixpkgs/nixos/tests/knot.nix @@ -190,6 +190,10 @@ in { primary.wait_for_unit("knot.service") secondary.wait_for_unit("knot.service") + for zone in ("example.com.", "sub.example.com."): + secondary.wait_until_succeeds( + f"knotc zone-status {zone} | grep -q 'serial: 2019031302'" + ) def test(host, query_type, query, pattern): out = client.succeed(f"khost -t {query_type} {query} {host}").strip() diff --git a/third_party/nixpkgs/nixos/tests/libinput.nix b/third_party/nixpkgs/nixos/tests/libinput.nix index 9b6fa159b9..b002492b16 100644 --- a/third_party/nixpkgs/nixos/tests/libinput.nix +++ b/third_party/nixpkgs/nixos/tests/libinput.nix @@ -12,7 +12,7 @@ import ./make-test-python.nix ({ ... }: test-support.displayManager.auto.user = "alice"; - services.xserver.libinput = { + services.libinput = { enable = true; mouse = { naturalScrolling = true; diff --git a/third_party/nixpkgs/nixos/tests/libreswan.nix b/third_party/nixpkgs/nixos/tests/libreswan.nix index aadba941fa..c798a04645 100644 --- a/third_party/nixpkgs/nixos/tests/libreswan.nix +++ b/third_party/nixpkgs/nixos/tests/libreswan.nix @@ -119,11 +119,11 @@ in with subtest("Libreswan is ready"): alice.wait_for_unit("ipsec") bob.wait_for_unit("ipsec") - alice.succeed("ipsec verify 1>&2") + alice.succeed("ipsec checkconfig") with subtest("Alice and Bob can start the tunnel"): - alice.execute("ipsec auto --start tunnel >&2 &") - bob.succeed("ipsec auto --start tunnel") + alice.execute("ipsec start tunnel >&2 &") + bob.succeed("ipsec start tunnel") # apparently this is needed to "wake" the tunnel bob.execute("ping -c1 alice") diff --git a/third_party/nixpkgs/nixos/tests/login.nix b/third_party/nixpkgs/nixos/tests/login.nix index 67f5764a0a..bcaee03175 100644 --- a/third_party/nixpkgs/nixos/tests/login.nix +++ b/third_party/nixpkgs/nixos/tests/login.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }: { name = "login"; meta = with pkgs.lib.maintainers; { - maintainers = [ eelco ]; + maintainers = [ ]; }; nodes.machine = diff --git a/third_party/nixpkgs/nixos/tests/logrotate.nix b/third_party/nixpkgs/nixos/tests/logrotate.nix index bcbe89c259..f9c5e90609 100644 --- a/third_party/nixpkgs/nixos/tests/logrotate.nix +++ b/third_party/nixpkgs/nixos/tests/logrotate.nix @@ -16,52 +16,60 @@ import ./make-test-python.nix ({ pkgs, ... }: rec { }; nodes = { - defaultMachine = { ... }: { }; + defaultMachine = { ... }: { + services.logrotate.enable = true; + }; failingMachine = { ... }: { - services.logrotate.configFile = pkgs.writeText "logrotate.conf" '' - # self-written config file - su notarealuser notagroupeither - ''; + services.logrotate = { + enable = true; + configFile = pkgs.writeText "logrotate.conf" '' + # self-written config file + su notarealuser notagroupeither + ''; + }; }; machine = { config, ... }: { imports = [ importTest ]; - services.logrotate.settings = { - # remove default frequency header and add another - header = { - frequency = null; - delaycompress = true; - }; - # extra global setting... affecting nothing - last_line = { - global = true; - priority = 2000; - shred = true; - }; - # using mail somewhere should add --mail to logrotate invocation - sendmail = { - mail = "user@domain.tld"; - }; - # postrotate should be suffixed by 'endscript' - postrotate = { - postrotate = "touch /dev/null"; - }; - # check checkConfig works as expected: there is nothing to check here - # except that the file build passes - checkConf = { - su = "root utmp"; - createolddir = "0750 root utmp"; - create = "root utmp"; - "create " = "0750 root utmp"; - }; - # multiple paths should be aggregated - multipath = { - files = [ "file1" "file2" ]; - }; - # overriding imported path should keep existing attributes - # (e.g. olddir is still set) - import = { - notifempty = true; + services.logrotate = { + enable = true; + settings = { + # remove default frequency header and add another + header = { + frequency = null; + delaycompress = true; + }; + # extra global setting... affecting nothing + last_line = { + global = true; + priority = 2000; + shred = true; + }; + # using mail somewhere should add --mail to logrotate invocation + sendmail = { + mail = "user@domain.tld"; + }; + # postrotate should be suffixed by 'endscript' + postrotate = { + postrotate = "touch /dev/null"; + }; + # check checkConfig works as expected: there is nothing to check here + # except that the file build passes + checkConf = { + su = "root utmp"; + createolddir = "0750 root utmp"; + create = "root utmp"; + "create " = "0750 root utmp"; + }; + # multiple paths should be aggregated + multipath = { + files = [ "file1" "file2" ]; + }; + # overriding imported path should keep existing attributes + # (e.g. olddir is still set) + import = { + notifempty = true; + }; }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/misc.nix b/third_party/nixpkgs/nixos/tests/misc.nix index e7842debba..83e0f46be3 100644 --- a/third_party/nixpkgs/nixos/tests/misc.nix +++ b/third_party/nixpkgs/nixos/tests/misc.nix @@ -1,164 +1,185 @@ # Miscellaneous small tests that don't warrant their own VM run. +{ pkgs, ... }: -import ./make-test-python.nix ({ lib, pkgs, ...} : let - foo = pkgs.writeText "foo" "Hello World"; -in { - name = "misc"; - meta.maintainers = with lib.maintainers; [ eelco ]; +let + inherit (pkgs) lib; + tests = { + default = testsForPackage { nixPackage = pkgs.nix; }; + lix = testsForPackage { nixPackage = pkgs.lix; }; + }; - nodes.machine = - { lib, ... }: - { swapDevices = lib.mkOverride 0 - [ { device = "/root/swapfile"; size = 128; } ]; - environment.variables.EDITOR = lib.mkOverride 0 "emacs"; - documentation.nixos.enable = lib.mkOverride 0 true; - systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ]; - systemd.tmpfiles.settings."10-test"."/tmp/somefile".d = {}; - virtualisation.fileSystems = { "/tmp2" = - { fsType = "tmpfs"; - options = [ "mode=1777" "noauto" ]; - }; - # Tests https://discourse.nixos.org/t/how-to-make-a-derivations-executables-have-the-s-permission/8555 - "/user-mount/point" = { - device = "/user-mount/source"; - fsType = "none"; - options = [ "bind" "rw" "user" "noauto" ]; - }; - "/user-mount/denied-point" = { - device = "/user-mount/denied-source"; - fsType = "none"; - options = [ "bind" "rw" "noauto" ]; + testsForPackage = args: lib.recurseIntoAttrs { + # If the attribute is not named 'test' + # You will break all the universe on the release-*.nix side of things. + # `discoverTests` relies on `test` existence to perform a `callTest`. + test = testMiscFeatures args; + passthru.override = args': testsForPackage (args // args'); + }; + + testMiscFeatures = { nixPackage, ... }: pkgs.testers.nixosTest ( + let + foo = pkgs.writeText "foo" "Hello World"; + in { + name = "misc"; + meta.maintainers = with lib.maintainers; [ raitobezarius ]; + + nodes.machine = + { lib, ... }: + { swapDevices = lib.mkOverride 0 + [ { device = "/root/swapfile"; size = 128; } ]; + environment.variables.EDITOR = lib.mkOverride 0 "emacs"; + documentation.nixos.enable = lib.mkOverride 0 true; + systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ]; + systemd.tmpfiles.settings."10-test"."/tmp/somefile".d = {}; + virtualisation.fileSystems = { "/tmp2" = + { fsType = "tmpfs"; + options = [ "mode=1777" "noauto" ]; + }; + # Tests https://discourse.nixos.org/t/how-to-make-a-derivations-executables-have-the-s-permission/8555 + "/user-mount/point" = { + device = "/user-mount/source"; + fsType = "none"; + options = [ "bind" "rw" "user" "noauto" ]; + }; + "/user-mount/denied-point" = { + device = "/user-mount/denied-source"; + fsType = "none"; + options = [ "bind" "rw" "noauto" ]; + }; }; + systemd.automounts = lib.singleton + { wantedBy = [ "multi-user.target" ]; + where = "/tmp2"; + }; + users.users.sybil = { isNormalUser = true; group = "wheel"; }; + users.users.alice = { isNormalUser = true; }; + security.sudo = { enable = true; wheelNeedsPassword = false; }; + boot.kernel.sysctl."vm.swappiness" = 1; + boot.kernelParams = [ "vsyscall=emulate" ]; + system.extraDependencies = [ foo ]; + + nix.package = nixPackage; }; - systemd.automounts = lib.singleton - { wantedBy = [ "multi-user.target" ]; - where = "/tmp2"; - }; - users.users.sybil = { isNormalUser = true; group = "wheel"; }; - users.users.alice = { isNormalUser = true; }; - security.sudo = { enable = true; wheelNeedsPassword = false; }; - boot.kernel.sysctl."vm.swappiness" = 1; - boot.kernelParams = [ "vsyscall=emulate" ]; - system.extraDependencies = [ foo ]; - }; - testScript = - '' - import json + testScript = + '' + import json - def get_path_info(path): - result = machine.succeed(f"nix --option experimental-features nix-command path-info --json {path}") - parsed = json.loads(result) - return parsed + def get_path_info(path): + result = machine.succeed(f"nix --option experimental-features nix-command path-info --json {path}") + parsed = json.loads(result) + return parsed - with subtest("nix-db"): - info = get_path_info("${foo}") - print(info) + with subtest("nix-db"): + info = get_path_info("${foo}") + print(info) - if ( - info[0]["narHash"] - != "sha256-BdMdnb/0eWy3EddjE83rdgzWWpQjfWPAj3zDIFMD3Ck=" - ): - raise Exception("narHash not set") + if ( + info[0]["narHash"] + != "sha256-BdMdnb/0eWy3EddjE83rdgzWWpQjfWPAj3zDIFMD3Ck=" + ): + raise Exception("narHash not set") - if info[0]["narSize"] != 128: - raise Exception("narSize not set") + if info[0]["narSize"] != 128: + raise Exception("narSize not set") - with subtest("nixos-version"): - machine.succeed("[ `nixos-version | wc -w` = 2 ]") + with subtest("nixos-version"): + machine.succeed("[ `nixos-version | wc -w` = 2 ]") - with subtest("nixos-rebuild"): - assert "NixOS module" in machine.succeed("nixos-rebuild --help") + with subtest("nixos-rebuild"): + assert "NixOS module" in machine.succeed("nixos-rebuild --help") - with subtest("Sanity check for uid/gid assignment"): - assert "4" == machine.succeed("id -u messagebus").strip() - assert "4" == machine.succeed("id -g messagebus").strip() - assert "users:x:100:" == machine.succeed("getent group users").strip() + with subtest("Sanity check for uid/gid assignment"): + assert "4" == machine.succeed("id -u messagebus").strip() + assert "4" == machine.succeed("id -g messagebus").strip() + assert "users:x:100:" == machine.succeed("getent group users").strip() - with subtest("Regression test for GMP aborts on QEMU."): - machine.succeed("expr 1 + 2") + with subtest("Regression test for GMP aborts on QEMU."): + machine.succeed("expr 1 + 2") - with subtest("the swap file got created"): - machine.wait_for_unit("root-swapfile.swap") - machine.succeed("ls -l /root/swapfile | grep 134217728") + with subtest("the swap file got created"): + machine.wait_for_unit("root-swapfile.swap") + machine.succeed("ls -l /root/swapfile | grep 134217728") - with subtest("whether kernel.poweroff_cmd is set"): - machine.succeed('[ -x "$(cat /proc/sys/kernel/poweroff_cmd)" ]') + with subtest("whether kernel.poweroff_cmd is set"): + machine.succeed('[ -x "$(cat /proc/sys/kernel/poweroff_cmd)" ]') - with subtest("whether the io cgroupv2 controller is properly enabled"): - machine.succeed("grep -q '\\bio\\b' /sys/fs/cgroup/cgroup.controllers") + with subtest("whether the io cgroupv2 controller is properly enabled"): + machine.succeed("grep -q '\\bio\\b' /sys/fs/cgroup/cgroup.controllers") - with subtest("whether we have a reboot record in wtmp"): - machine.shutdown - machine.wait_for_unit("multi-user.target") - machine.succeed("last | grep reboot >&2") + with subtest("whether we have a reboot record in wtmp"): + machine.shutdown + machine.wait_for_unit("multi-user.target") + machine.succeed("last | grep reboot >&2") - with subtest("whether we can override environment variables"): - machine.succeed('[ "$EDITOR" = emacs ]') + with subtest("whether we can override environment variables"): + machine.succeed('[ "$EDITOR" = emacs ]') - with subtest("whether hostname (and by extension nss_myhostname) works"): - assert "machine" == machine.succeed("hostname").strip() - assert "machine" == machine.succeed("hostname -s").strip() + with subtest("whether hostname (and by extension nss_myhostname) works"): + assert "machine" == machine.succeed("hostname").strip() + assert "machine" == machine.succeed("hostname -s").strip() - with subtest("whether systemd-udevd automatically loads modules for our hardware"): - machine.succeed("systemctl start systemd-udev-settle.service") - machine.wait_for_unit("systemd-udev-settle.service") - assert "mousedev" in machine.succeed("lsmod") + with subtest("whether systemd-udevd automatically loads modules for our hardware"): + machine.succeed("systemctl start systemd-udev-settle.service") + machine.wait_for_unit("systemd-udev-settle.service") + assert "mousedev" in machine.succeed("lsmod") - with subtest("whether systemd-tmpfiles-clean works"): - machine.succeed( - "touch /tmp/foo", "systemctl start systemd-tmpfiles-clean", "[ -e /tmp/foo ]" - ) - # move into the future - machine.succeed( - 'date -s "@$(($(date +%s) + 1000000))"', - "systemctl start systemd-tmpfiles-clean", - ) - machine.fail("[ -e /tmp/foo ]") + with subtest("whether systemd-tmpfiles-clean works"): + machine.succeed( + "touch /tmp/foo", "systemctl start systemd-tmpfiles-clean", "[ -e /tmp/foo ]" + ) + # move into the future + machine.succeed( + 'date -s "@$(($(date +%s) + 1000000))"', + "systemctl start systemd-tmpfiles-clean", + ) + machine.fail("[ -e /tmp/foo ]") - with subtest("whether systemd-tmpfiles settings works"): - machine.succeed("[ -e /tmp/somefile ]") + with subtest("whether systemd-tmpfiles settings works"): + machine.succeed("[ -e /tmp/somefile ]") - with subtest("whether automounting works"): - machine.fail("grep '/tmp2 tmpfs' /proc/mounts") - machine.succeed("touch /tmp2/x") - machine.succeed("grep '/tmp2 tmpfs' /proc/mounts") + with subtest("whether automounting works"): + machine.fail("grep '/tmp2 tmpfs' /proc/mounts") + machine.succeed("touch /tmp2/x") + machine.succeed("grep '/tmp2 tmpfs' /proc/mounts") - with subtest( - "Whether mounting by a user is possible with the `user` option in fstab (#95444)" - ): - machine.succeed("mkdir -p /user-mount/source") - machine.succeed("touch /user-mount/source/file") - machine.succeed("chmod -R a+Xr /user-mount/source") - machine.succeed("mkdir /user-mount/point") - machine.succeed("chown alice:users /user-mount/point") - machine.succeed("su - alice -c 'mount /user-mount/point'") - machine.succeed("su - alice -c 'ls /user-mount/point/file'") - with subtest( - "Whether mounting by a user is denied without the `user` option in fstab" - ): - machine.succeed("mkdir -p /user-mount/denied-source") - machine.succeed("touch /user-mount/denied-source/file") - machine.succeed("chmod -R a+Xr /user-mount/denied-source") - machine.succeed("mkdir /user-mount/denied-point") - machine.succeed("chown alice:users /user-mount/denied-point") - machine.fail("su - alice -c 'mount /user-mount/denied-point'") + with subtest( + "Whether mounting by a user is possible with the `user` option in fstab (#95444)" + ): + machine.succeed("mkdir -p /user-mount/source") + machine.succeed("touch /user-mount/source/file") + machine.succeed("chmod -R a+Xr /user-mount/source") + machine.succeed("mkdir /user-mount/point") + machine.succeed("chown alice:users /user-mount/point") + machine.succeed("su - alice -c 'mount /user-mount/point'") + machine.succeed("su - alice -c 'ls /user-mount/point/file'") + with subtest( + "Whether mounting by a user is denied without the `user` option in fstab" + ): + machine.succeed("mkdir -p /user-mount/denied-source") + machine.succeed("touch /user-mount/denied-source/file") + machine.succeed("chmod -R a+Xr /user-mount/denied-source") + machine.succeed("mkdir /user-mount/denied-point") + machine.succeed("chown alice:users /user-mount/denied-point") + machine.fail("su - alice -c 'mount /user-mount/denied-point'") - with subtest("shell-vars"): - machine.succeed('[ -n "$NIX_PATH" ]') + with subtest("shell-vars"): + machine.succeed('[ -n "$NIX_PATH" ]') - with subtest("nix-db"): - machine.succeed("nix-store -qR /run/current-system | grep nixos-") + with subtest("nix-db"): + machine.succeed("nix-store -qR /run/current-system | grep nixos-") - with subtest("Test sysctl"): - machine.wait_for_unit("systemd-sysctl.service") - assert "1" == machine.succeed("sysctl -ne vm.swappiness").strip() - machine.execute("sysctl vm.swappiness=60") - assert "60" == machine.succeed("sysctl -ne vm.swappiness").strip() + with subtest("Test sysctl"): + machine.wait_for_unit("systemd-sysctl.service") + assert "1" == machine.succeed("sysctl -ne vm.swappiness").strip() + machine.execute("sysctl vm.swappiness=60") + assert "60" == machine.succeed("sysctl -ne vm.swappiness").strip() - with subtest("Test boot parameters"): - assert "vsyscall=emulate" in machine.succeed("cat /proc/cmdline") - ''; -}) + with subtest("Test boot parameters"): + assert "vsyscall=emulate" in machine.succeed("cat /proc/cmdline") + ''; + }); + in + tests diff --git a/third_party/nixpkgs/nixos/tests/mumble.nix b/third_party/nixpkgs/nixos/tests/mumble.nix index 8eee454721..12fa00b79b 100644 --- a/third_party/nixpkgs/nixos/tests/mumble.nix +++ b/third_party/nixpkgs/nixos/tests/mumble.nix @@ -15,7 +15,7 @@ in { name = "mumble"; meta = with pkgs.lib.maintainers; { - maintainers = [ thoughtpolice eelco ]; + maintainers = [ thoughtpolice ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/munin.nix b/third_party/nixpkgs/nixos/tests/munin.nix index e371b2dffa..7b7bf6f41c 100644 --- a/third_party/nixpkgs/nixos/tests/munin.nix +++ b/third_party/nixpkgs/nixos/tests/munin.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "munin"; meta = with pkgs.lib.maintainers; { - maintainers = [ domenkozar eelco ]; + maintainers = [ domenkozar ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/nat.nix b/third_party/nixpkgs/nixos/tests/nat.nix index 0b617cea77..8b682a8b3a 100644 --- a/third_party/nixpkgs/nixos/tests/nat.nix +++ b/third_party/nixpkgs/nixos/tests/nat.nix @@ -22,7 +22,7 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, nftables ? false, ... name = "nat" + (lib.optionalString nftables "Nftables") + (if withFirewall then "WithFirewall" else "Standalone"); meta = with pkgs.lib.maintainers; { - maintainers = [ eelco rob ]; + maintainers = [ rob ]; }; nodes = diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix index 84ac371537..d024adffd9 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix @@ -22,4 +22,4 @@ foldl }; }) { } - [ 26 27 28 ] + [ 27 28 29 ] diff --git a/third_party/nixpkgs/nixos/tests/nfs/simple.nix b/third_party/nixpkgs/nixos/tests/nfs/simple.nix index 026da9563b..077c1d4109 100644 --- a/third_party/nixpkgs/nixos/tests/nfs/simple.nix +++ b/third_party/nixpkgs/nixos/tests/nfs/simple.nix @@ -20,7 +20,7 @@ in { name = "nfs"; meta = with pkgs.lib.maintainers; { - maintainers = [ eelco ]; + maintainers = [ ]; }; nodes = diff --git a/third_party/nixpkgs/nixos/tests/nginx-sso.nix b/third_party/nixpkgs/nixos/tests/nginx-sso.nix index 221c5f4ed9..2bb9c7a1c3 100644 --- a/third_party/nixpkgs/nixos/tests/nginx-sso.nix +++ b/third_party/nixpkgs/nixos/tests/nginx-sso.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "nginx-sso"; meta = { - maintainers = with pkgs.lib.maintainers; [ delroth ]; + maintainers = with pkgs.lib.maintainers; [ ambroisie ]; }; nodes.machine = { diff --git a/third_party/nixpkgs/nixos/tests/openssh.nix b/third_party/nixpkgs/nixos/tests/openssh.nix index 8074fd2ed4..140723a2df 100644 --- a/third_party/nixpkgs/nixos/tests/openssh.nix +++ b/third_party/nixpkgs/nixos/tests/openssh.nix @@ -1,11 +1,11 @@ import ./make-test-python.nix ({ pkgs, ... }: let inherit (import ./ssh-keys.nix pkgs) - snakeOilPrivateKey snakeOilPublicKey; + snakeOilPrivateKey snakeOilPublicKey snakeOilEd25519PrivateKey snakeOilEd25519PublicKey; in { name = "openssh"; meta = with pkgs.lib.maintainers; { - maintainers = [ aszlig eelco ]; + maintainers = [ aszlig ]; }; nodes = { @@ -22,6 +22,19 @@ in { ]; }; + server-allowed-users = + { ... }: + + { + services.openssh = { enable = true; settings.AllowUsers = [ "alice" "bob" ]; }; + users.groups = { alice = { }; bob = { }; carol = { }; }; + users.users = { + alice = { isNormalUser = true; group = "alice"; openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; + bob = { isNormalUser = true; group = "bob"; openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; + carol = { isNormalUser = true; group = "carol"; openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; + }; + }; + server-lazy = { ... }: @@ -95,17 +108,46 @@ in { }; }; - server_allowedusers = + server-no-openssl = { ... }: - { - services.openssh = { enable = true; settings.AllowUsers = [ "alice" "bob" ]; }; - users.groups = { alice = { }; bob = { }; carol = { }; }; - users.users = { - alice = { isNormalUser = true; group = "alice"; openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; - bob = { isNormalUser = true; group = "bob"; openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; - carol = { isNormalUser = true; group = "carol"; openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; + programs.ssh.package = pkgs.opensshPackages.openssh.override { + linkOpenssl = false; }; + services.openssh = { + enable = true; + hostKeys = [ + { type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; } + ]; + settings = { + # Must not specify the OpenSSL provided algorithms. + Ciphers = [ "chacha20-poly1305@openssh.com" ]; + KexAlgorithms = [ + "curve25519-sha256" + "curve25519-sha256@libssh.org" + ]; + }; + }; + users.users.root.openssh.authorizedKeys.keys = [ + snakeOilEd25519PublicKey + ]; + }; + + server-no-pam = + { pkgs, ... }: + { + programs.ssh.package = pkgs.opensshPackages.openssh.override { + withPAM = false; + }; + services.openssh = { + enable = true; + settings = { + UsePAM = false; + }; + }; + users.users.root.openssh.authorizedKeys.keys = [ + snakeOilPublicKey + ]; }; client = @@ -119,8 +161,11 @@ in { start_all() server.wait_for_unit("sshd", timeout=30) + server_allowed_users.wait_for_unit("sshd", timeout=30) server_localhost_only.wait_for_unit("sshd", timeout=30) server_match_rule.wait_for_unit("sshd", timeout=30) + server_no_openssl.wait_for_unit("sshd", timeout=30) + server_no_pam.wait_for_unit("sshd", timeout=30) server_lazy.wait_for_unit("sshd.socket", timeout=30) server_localhost_only_lazy.wait_for_unit("sshd.socket", timeout=30) @@ -166,8 +211,9 @@ in { "cat ${snakeOilPrivateKey} > privkey.snakeoil" ) client.succeed("chmod 600 privkey.snakeoil") + # The final segment in this IP is allocated according to the alphabetical order of machines in this test. client.succeed( - "ssh -p 2222 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil root@192.168.2.4 true", + "ssh -p 2222 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil root@192.168.2.5 true", timeout=30 ) @@ -198,15 +244,35 @@ in { ) client.succeed("chmod 600 privkey.snakeoil") client.succeed( - "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil alice@server_allowedusers true", + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil alice@server-allowed-users true", timeout=30 ) client.succeed( - "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil bob@server_allowedusers true", + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil bob@server-allowed-users true", timeout=30 ) client.fail( - "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil carol@server_allowedusers true", + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil carol@server-allowed-users true", + timeout=30 + ) + + with subtest("no-openssl"): + client.succeed( + "cat ${snakeOilEd25519PrivateKey} > privkey.snakeoil" + ) + client.succeed("chmod 600 privkey.snakeoil") + client.succeed( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-no-openssl true", + timeout=30 + ) + + with subtest("no-pam"): + client.succeed( + "cat ${snakeOilPrivateKey} > privkey.snakeoil" + ) + client.succeed("chmod 600 privkey.snakeoil") + client.succeed( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-no-pam true", timeout=30 ) ''; diff --git a/third_party/nixpkgs/nixos/tests/patroni.nix b/third_party/nixpkgs/nixos/tests/patroni.nix index 1f15cd5967..68fce40515 100644 --- a/third_party/nixpkgs/nixos/tests/patroni.nix +++ b/third_party/nixpkgs/nixos/tests/patroni.nix @@ -155,7 +155,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: print(node.succeed("patronictl list cluster1")) node.wait_until_succeeds(f"[ $(patronictl list -f json cluster1 | jq 'length') == {expected_replicas + 1} ]") node.wait_until_succeeds("[ $(patronictl list -f json cluster1 | jq 'map(select(.Role | test(\"^Leader$\"))) | map(select(.State | test(\"^running$\"))) | length') == 1 ]") - node.wait_until_succeeds(f"[ $(patronictl list -f json cluster1 | jq 'map(select(.Role | test(\"^Replica$\"))) | map(select(.State | test(\"^running$\"))) | length') == {expected_replicas} ]") + node.wait_until_succeeds(f"[ $(patronictl list -f json cluster1 | jq 'map(select(.Role | test(\"^Replica$\"))) | map(select(.State | test(\"^streaming$\"))) | length') == {expected_replicas} ]") print(node.succeed("patronictl list cluster1")) client.wait_until_succeeds("psql -h 127.0.0.1 -U postgres --command='select 1;'") diff --git a/third_party/nixpkgs/nixos/tests/pgvecto-rs.nix b/third_party/nixpkgs/nixos/tests/pgvecto-rs.nix index cd871dab6a..8d9d6c0b88 100644 --- a/third_party/nixpkgs/nixos/tests/pgvecto-rs.nix +++ b/third_party/nixpkgs/nixos/tests/pgvecto-rs.nix @@ -66,7 +66,7 @@ let ''; }; - applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "12") postgresql-versions; + applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "14") postgresql-versions; in mapAttrs' (name: package: { diff --git a/third_party/nixpkgs/nixos/tests/postgresql-jit.nix b/third_party/nixpkgs/nixos/tests/postgresql-jit.nix index baf26b8da2..f4b1d07a7f 100644 --- a/third_party/nixpkgs/nixos/tests/postgresql-jit.nix +++ b/third_party/nixpkgs/nixos/tests/postgresql-jit.nix @@ -1,6 +1,7 @@ { system ? builtins.currentSystem , config ? {} , pkgs ? import ../.. { inherit system config; } +, package ? null }: with import ../lib/testing-python.nix { inherit system pkgs; }; @@ -9,14 +10,17 @@ let inherit (pkgs) lib; packages = builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs); - mkJitTest = packageName: makeTest { - name = "${packageName}"; + mkJitTestFromName = name: + mkJitTest pkgs.${name}; + + mkJitTest = package: makeTest { + name = package.name; meta.maintainers = with lib.maintainers; [ ma27 ]; nodes.machine = { pkgs, lib, ... }: { services.postgresql = { + inherit package; enable = true; enableJIT = true; - package = pkgs.${packageName}; initialScript = pkgs.writeText "init.sql" '' create table demo (id int); insert into demo (id) select generate_series(1, 5); @@ -45,4 +49,7 @@ let ''; }; in -lib.genAttrs packages mkJitTest +if package == null then + lib.genAttrs packages mkJitTestFromName +else + mkJitTest package diff --git a/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix b/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix index b0bd7711db..ab2ab4ad0d 100644 --- a/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix +++ b/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix @@ -1,6 +1,7 @@ { system ? builtins.currentSystem, config ? {}, - pkgs ? import ../.. { inherit system config; } + pkgs ? import ../.. { inherit system config; }, + package ? null }: with import ../lib/testing-python.nix { inherit system pkgs; }; @@ -9,111 +10,110 @@ let lib = pkgs.lib; # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`. - makePostgresqlWalReceiverTest = postgresqlPackage: + makeTestAttribute = name: { - name = postgresqlPackage; - value = - let - pkg = pkgs."${postgresqlPackage}"; - postgresqlDataDir = "/var/lib/postgresql/${pkg.psqlSchema}"; - replicationUser = "wal_receiver_user"; - replicationSlot = "wal_receiver_slot"; - replicationConn = "postgresql://${replicationUser}@localhost"; - baseBackupDir = "/tmp/pg_basebackup"; - walBackupDir = "/tmp/pg_wal"; - atLeast12 = lib.versionAtLeast pkg.version "12.0"; + inherit name; + value = makePostgresqlWalReceiverTest pkgs."${name}"; + }; - recoveryFile = if atLeast12 - then pkgs.writeTextDir "recovery.signal" "" - else pkgs.writeTextDir "recovery.conf" "restore_command = 'cp ${walBackupDir}/%f %p'"; + makePostgresqlWalReceiverTest = pkg: + let + postgresqlDataDir = "/var/lib/postgresql/${pkg.psqlSchema}"; + replicationUser = "wal_receiver_user"; + replicationSlot = "wal_receiver_slot"; + replicationConn = "postgresql://${replicationUser}@localhost"; + baseBackupDir = "/tmp/pg_basebackup"; + walBackupDir = "/tmp/pg_wal"; - in makeTest { - name = "postgresql-wal-receiver-${postgresqlPackage}"; - meta.maintainers = with lib.maintainers; [ pacien ]; + recoveryFile = pkgs.writeTextDir "recovery.signal" ""; - nodes.machine = { ... }: { - services.postgresql = { - package = pkg; - enable = true; - settings = lib.mkMerge [ - { - wal_level = "archive"; # alias for replica on pg >= 9.6 - max_wal_senders = 10; - max_replication_slots = 10; - } - (lib.mkIf atLeast12 { - restore_command = "cp ${walBackupDir}/%f %p"; - recovery_end_command = "touch recovery.done"; - }) - ]; - authentication = '' - host replication ${replicationUser} all trust - ''; - initialScript = pkgs.writeText "init.sql" '' - create user ${replicationUser} replication; - select * from pg_create_physical_replication_slot('${replicationSlot}'); - ''; + in makeTest { + name = "postgresql-wal-receiver-${pkg.name}"; + meta.maintainers = with lib.maintainers; [ pacien ]; + + nodes.machine = { ... }: { + services.postgresql = { + package = pkg; + enable = true; + settings = { + max_replication_slots = 10; + max_wal_senders = 10; + recovery_end_command = "touch recovery.done"; + restore_command = "cp ${walBackupDir}/%f %p"; + wal_level = "archive"; # alias for replica on pg >= 9.6 }; - - services.postgresqlWalReceiver.receivers.main = { - postgresqlPackage = pkg; - connection = replicationConn; - slot = replicationSlot; - directory = walBackupDir; - }; - # This is only to speedup test, it isn't time racing. Service is set to autorestart always, - # default 60sec is fine for real system, but is too much for a test - systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5; + authentication = '' + host replication ${replicationUser} all trust + ''; + initialScript = pkgs.writeText "init.sql" '' + create user ${replicationUser} replication; + select * from pg_create_physical_replication_slot('${replicationSlot}'); + ''; }; - testScript = '' - # make an initial base backup - machine.wait_for_unit("postgresql") - machine.wait_for_unit("postgresql-wal-receiver-main") - # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other - # required only for 9.4 - machine.sleep(5) - machine.succeed( - "${pkg}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}" - ) - - # create a dummy table with 100 records - machine.succeed( - "sudo -u postgres psql --command='create table dummy as select * from generate_series(1, 100) as val;'" - ) - - # stop postgres and destroy data - machine.systemctl("stop postgresql") - machine.systemctl("stop postgresql-wal-receiver-main") - machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}") - - # restore the base backup - machine.succeed( - "cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}" - ) - - # prepare WAL and recovery - machine.succeed("chmod a+rX -R ${walBackupDir}") - machine.execute( - "for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done" - ) # make use of partial segments too - machine.succeed( - "cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*" - ) - - # replay WAL - machine.systemctl("start postgresql") - machine.wait_for_file("${postgresqlDataDir}/recovery.done") - machine.systemctl("restart postgresql") - machine.wait_for_unit("postgresql") - - # check that our records have been restored - machine.succeed( - "test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100" - ) - ''; + services.postgresqlWalReceiver.receivers.main = { + postgresqlPackage = pkg; + connection = replicationConn; + slot = replicationSlot; + directory = walBackupDir; + }; + # This is only to speedup test, it isn't time racing. Service is set to autorestart always, + # default 60sec is fine for real system, but is too much for a test + systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5; }; + + testScript = '' + # make an initial base backup + machine.wait_for_unit("postgresql") + machine.wait_for_unit("postgresql-wal-receiver-main") + # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other + # required only for 9.4 + machine.sleep(5) + machine.succeed( + "${pkg}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}" + ) + + # create a dummy table with 100 records + machine.succeed( + "sudo -u postgres psql --command='create table dummy as select * from generate_series(1, 100) as val;'" + ) + + # stop postgres and destroy data + machine.systemctl("stop postgresql") + machine.systemctl("stop postgresql-wal-receiver-main") + machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}") + + # restore the base backup + machine.succeed( + "cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}" + ) + + # prepare WAL and recovery + machine.succeed("chmod a+rX -R ${walBackupDir}") + machine.execute( + "for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done" + ) # make use of partial segments too + machine.succeed( + "cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*" + ) + + # replay WAL + machine.systemctl("start postgresql") + machine.wait_for_file("${postgresqlDataDir}/recovery.done") + machine.systemctl("restart postgresql") + machine.wait_for_unit("postgresql") + + # check that our records have been restored + machine.succeed( + "test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100" + ) + ''; }; -# Maps the generic function over all attributes of PostgreSQL packages -in builtins.listToAttrs (map makePostgresqlWalReceiverTest (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs))) +in +if package == null then + # all-tests.nix: Maps the generic function over all attributes of PostgreSQL packages + builtins.listToAttrs (map makeTestAttribute (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs))) +else + # Called directly from .tests + makePostgresqlWalReceiverTest package diff --git a/third_party/nixpkgs/nixos/tests/printing.nix b/third_party/nixpkgs/nixos/tests/printing.nix index 29c5d810f2..b413996c67 100644 --- a/third_party/nixpkgs/nixos/tests/printing.nix +++ b/third_party/nixpkgs/nixos/tests/printing.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ( { name = "printing"; meta = with pkgs.lib.maintainers; { - maintainers = [ domenkozar eelco matthewbauer ]; + maintainers = [ domenkozar matthewbauer ]; }; nodes.server = { ... }: { diff --git a/third_party/nixpkgs/nixos/tests/private-gpt.nix b/third_party/nixpkgs/nixos/tests/private-gpt.nix new file mode 100644 index 0000000000..d19e167cc3 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/private-gpt.nix @@ -0,0 +1,27 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +let + mainPort = "8001"; +in +{ + name = "private-gpt"; + meta = with lib.maintainers; { + maintainers = [ drupol ]; + }; + + nodes = { + machine = { ... }: { + services.private-gpt = { + enable = true; + }; + }; + }; + + testScript = '' + machine.start() + + machine.wait_for_unit("private-gpt.service") + machine.wait_for_open_port(${mainPort}) + + machine.succeed("curl http://127.0.0.1:${mainPort}") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index 5762534508..56569c4de2 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -907,7 +907,7 @@ let attrs = { objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ]; olcDatabase = "{1}mdb"; - olcDbDirectory = "/var/db/openldap"; + olcDbDirectory = "/var/lib/openldap/db"; olcSuffix = "dc=example"; olcRootDN = { # cn=root,dc=example diff --git a/third_party/nixpkgs/nixos/tests/promscale.nix b/third_party/nixpkgs/nixos/tests/promscale.nix deleted file mode 100644 index da18628f24..0000000000 --- a/third_party/nixpkgs/nixos/tests/promscale.nix +++ /dev/null @@ -1,60 +0,0 @@ -# mostly copied from ./timescaledb.nix which was copied from ./postgresql.nix -# as it seemed unapproriate to test additional extensions for postgresql there. - -{ system ? builtins.currentSystem -, config ? { } -, pkgs ? import ../.. { inherit system config; } -}: - -with import ../lib/testing-python.nix { inherit system pkgs; }; -with pkgs.lib; - -let - postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs; - test-sql = pkgs.writeText "postgresql-test" '' - CREATE USER promscale SUPERUSER PASSWORD 'promscale'; - CREATE DATABASE promscale OWNER promscale; - ''; - - make-postgresql-test = postgresql-name: postgresql-package: makeTest { - name = postgresql-name; - meta = with pkgs.lib.maintainers; { - maintainers = [ anpin ]; - }; - - nodes.machine = { config, pkgs, ... }: - { - services.postgresql = { - enable = true; - package = postgresql-package; - extraPlugins = ps: with ps; [ - timescaledb - promscale_extension - ]; - settings = { shared_preload_libraries = "timescaledb, promscale"; }; - }; - environment.systemPackages = with pkgs; [ promscale ]; - }; - - testScript = '' - machine.start() - machine.wait_for_unit("postgresql") - with subtest("Postgresql with extensions timescaledb and promscale is available just after unit start"): - print(machine.succeed("sudo -u postgres psql -f ${test-sql}")) - machine.succeed("sudo -u postgres psql promscale -c 'SHOW shared_preload_libraries;' | grep promscale") - machine.succeed( - "promscale --db.name promscale --db.password promscale --db.user promscale --db.ssl-mode allow --startup.install-extensions --startup.only" - ) - machine.succeed("sudo -u postgres psql promscale -c 'SELECT ps_trace.get_trace_retention_period();' | grep '(1 row)'") - machine.shutdown() - ''; - }; - #version 15 is not supported yet - applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "12" && !(versionAtLeast value.version "15")) postgresql-versions; -in -mapAttrs' - (name: package: { - inherit name; - value = make-postgresql-test name package; - }) - applicablePostgresqlVersions diff --git a/third_party/nixpkgs/nixos/tests/proxy.nix b/third_party/nixpkgs/nixos/tests/proxy.nix index f8a3d57690..ce7131b09a 100644 --- a/third_party/nixpkgs/nixos/tests/proxy.nix +++ b/third_party/nixpkgs/nixos/tests/proxy.nix @@ -12,7 +12,7 @@ let in { name = "proxy"; meta = with pkgs.lib.maintainers; { - maintainers = [ eelco ]; + maintainers = [ ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/qtile.nix b/third_party/nixpkgs/nixos/tests/qtile.nix new file mode 100644 index 0000000000..b4d8f9d421 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/qtile.nix @@ -0,0 +1,34 @@ +import ./make-test-python.nix ({ lib, ...} : { + name = "qtile"; + + meta = { + maintainers = with lib.maintainers; [ sigmanificient ]; + }; + + nodes.machine = { pkgs, lib, ... }: { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + test-support.displayManager.auto.user = "alice"; + + services.xserver.windowManager.qtile.enable = true; + services.displayManager.defaultSession = lib.mkForce "none+qtile"; + + environment.systemPackages = [ pkgs.kitty ]; + }; + + testScript = '' + with subtest("ensure x starts"): + machine.wait_for_x() + machine.wait_for_file("/home/alice/.Xauthority") + machine.succeed("xauth merge ~alice/.Xauthority") + + with subtest("ensure client is available"): + machine.succeed("qtile --version") + + with subtest("ensure we can open a new terminal"): + machine.sleep(2) + machine.send_key("meta_l-ret") + machine.wait_for_window(r"alice.*?machine") + machine.sleep(2) + machine.screenshot("terminal") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/quake3.nix b/third_party/nixpkgs/nixos/tests/quake3.nix index 2d8c520700..4b7ca03b36 100644 --- a/third_party/nixpkgs/nixos/tests/quake3.nix +++ b/third_party/nixpkgs/nixos/tests/quake3.nix @@ -32,7 +32,7 @@ in rec { name = "quake3"; meta = with lib.maintainers; { - maintainers = [ domenkozar eelco ]; + maintainers = [ domenkozar ]; }; # TODO: lcov doesn't work atm diff --git a/third_party/nixpkgs/nixos/tests/rabbitmq.nix b/third_party/nixpkgs/nixos/tests/rabbitmq.nix index 040679e68d..4b8921662b 100644 --- a/third_party/nixpkgs/nixos/tests/rabbitmq.nix +++ b/third_party/nixpkgs/nixos/tests/rabbitmq.nix @@ -9,7 +9,7 @@ in { name = "rabbitmq"; meta = with pkgs.lib.maintainers; { - maintainers = [ eelco offline ]; + maintainers = [ offline ]; }; nodes.machine = { diff --git a/third_party/nixpkgs/nixos/tests/radicale.nix b/third_party/nixpkgs/nixos/tests/radicale.nix index 66650dce4a..868b28085a 100644 --- a/third_party/nixpkgs/nixos/tests/radicale.nix +++ b/third_party/nixpkgs/nixos/tests/radicale.nix @@ -6,7 +6,7 @@ let port = "5232"; filesystem_folder = "/data/radicale"; - cli = "${pkgs.calendar-cli}/bin/calendar-cli --caldav-user ${user} --caldav-pass ${password}"; + cli = "${lib.getExe pkgs.calendar-cli} --caldav-user ${user} --caldav-pass ${password}"; in { name = "radicale3"; meta.maintainers = with lib.maintainers; [ dotlambda ]; diff --git a/third_party/nixpkgs/nixos/tests/samba.nix b/third_party/nixpkgs/nixos/tests/samba.nix index 252c3dd9c7..53cdbbe1c4 100644 --- a/third_party/nixpkgs/nixos/tests/samba.nix +++ b/third_party/nixpkgs/nixos/tests/samba.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "samba"; - meta.maintainers = [ pkgs.lib.maintainers.eelco ]; + meta.maintainers = [ ]; nodes = { client = diff --git a/third_party/nixpkgs/nixos/tests/simple.nix b/third_party/nixpkgs/nixos/tests/simple.nix index c36287b4e8..afd49d481a 100644 --- a/third_party/nixpkgs/nixos/tests/simple.nix +++ b/third_party/nixpkgs/nixos/tests/simple.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "simple"; meta = with pkgs.lib.maintainers; { - maintainers = [ eelco ]; + maintainers = [ ]; }; nodes.machine = { ... }: { diff --git a/third_party/nixpkgs/nixos/tests/smokeping.nix b/third_party/nixpkgs/nixos/tests/smokeping.nix index 04f8139642..fe1ecad996 100644 --- a/third_party/nixpkgs/nixos/tests/smokeping.nix +++ b/third_party/nixpkgs/nixos/tests/smokeping.nix @@ -11,7 +11,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { networking.domain = "example.com"; # FQDN: sm.example.com services.smokeping = { enable = true; - port = 8081; mailHost = "127.0.0.2"; probeConfig = '' + FPing @@ -25,12 +24,19 @@ import ./make-test-python.nix ({ pkgs, ...} : { testScript = '' start_all() sm.wait_for_unit("smokeping") - sm.wait_for_unit("thttpd") + sm.wait_for_unit("nginx") sm.wait_for_file("/var/lib/smokeping/data/Local/LocalMachine.rrd") - sm.succeed("curl -s -f localhost:8081/smokeping.fcgi?target=Local") + sm.succeed("curl -s -f localhost/smokeping.fcgi?target=Local") # Check that there's a helpful page without explicit path as well. - sm.succeed("curl -s -f localhost:8081") + sm.succeed("curl -s -f localhost") sm.succeed("ls /var/lib/smokeping/cache/Local/LocalMachine_mini.png") sm.succeed("ls /var/lib/smokeping/cache/index.html") + + # stop and start the service like nixos-rebuild would do + # see https://github.com/NixOS/nixpkgs/issues/265953) + sm.succeed("systemctl stop smokeping") + sm.succeed("systemctl start smokeping") + # ensure all services restarted properly + sm.succeed("systemctl --failed | grep -q '0 loaded units listed'") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/ssh-keys.nix b/third_party/nixpkgs/nixos/tests/ssh-keys.nix index df9ff38a3b..675f3a0b43 100644 --- a/third_party/nixpkgs/nixos/tests/ssh-keys.nix +++ b/third_party/nixpkgs/nixos/tests/ssh-keys.nix @@ -12,4 +12,16 @@ pkgs: "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa" "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil" ]; + + snakeOilEd25519PrivateKey = pkgs.writeText "privkey.snakeoil" '' + -----BEGIN OPENSSH PRIVATE KEY----- + b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW + QyNTUxOQAAACAYBTIWo1J4PkY4/7AhVyPT8xvAUI67tp+yYFFRdSm7+QAAAJC89yCivPcg + ogAAAAtzc2gtZWQyNTUxOQAAACAYBTIWo1J4PkY4/7AhVyPT8xvAUI67tp+yYFFRdSm7+Q + AAAEDJmKp3lX6Pz0unTc0QZwrHb8Eyr9fJUopE9d2/+q+eCxgFMhajUng+Rjj/sCFXI9Pz + G8BQjru2n7JgUVF1Kbv5AAAACnRvbUBvemRlc2sBAgM= + -----END OPENSSH PRIVATE KEY----- + ''; + + snakeOilEd25519PublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgFMhajUng+Rjj/sCFXI9PzG8BQjru2n7JgUVF1Kbv5 snakeoil"; } diff --git a/third_party/nixpkgs/nixos/tests/stalwart-mail.nix b/third_party/nixpkgs/nixos/tests/stalwart-mail.nix index 634c0e2e39..581090cd70 100644 --- a/third_party/nixpkgs/nixos/tests/stalwart-mail.nix +++ b/third_party/nixpkgs/nixos/tests/stalwart-mail.nix @@ -40,12 +40,14 @@ in import ./make-test-python.nix ({ lib, ... }: { }; }; - session.auth.mechanisms = [ "PLAIN" ]; - session.auth.directory = "in-memory"; - storage.directory = "in-memory"; # shared with imap + resolver.public-suffix = [ ]; # do not fetch from web in sandbox - session.rcpt.directory = "in-memory"; - queue.outbound.next-hop = [ "local" ]; + session.auth.mechanisms = "[plain]"; + session.auth.directory = "'in-memory'"; + storage.directory = "in-memory"; + + session.rcpt.directory = "'in-memory'"; + queue.outbound.next-hop = "'local'"; directory."in-memory" = { type = "memory"; diff --git a/third_party/nixpkgs/nixos/tests/swayfx.nix b/third_party/nixpkgs/nixos/tests/swayfx.nix new file mode 100644 index 0000000000..77844ec80a --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/swayfx.nix @@ -0,0 +1,207 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + { + name = "swayfx"; + meta = { + maintainers = with lib.maintainers; [ eclairevoyant ]; + }; + + # testScriptWithTypes:49: error: Cannot call function of unknown type + # (machine.succeed if succeed else machine.execute)( + # ^ + # Found 1 error in 1 file (checked 1 source file) + skipTypeCheck = true; + + nodes.machine = + { config, ... }: + { + # Automatically login on tty1 as a normal user: + imports = [ ./common/user-account.nix ]; + services.getty.autologinUser = "alice"; + + environment = { + # For glinfo and wayland-info: + systemPackages = with pkgs; [ + mesa-demos + wayland-utils + alacritty + ]; + # Use a fixed SWAYSOCK path (for swaymsg): + variables = { + "SWAYSOCK" = "/tmp/sway-ipc.sock"; + # TODO: Investigate if we can get hardware acceleration to work (via + # virtio-gpu and Virgil). We currently have to use the Pixman software + # renderer since the GLES2 renderer doesn't work inside the VM (even + # with WLR_RENDERER_ALLOW_SOFTWARE): + # "WLR_RENDERER_ALLOW_SOFTWARE" = "1"; + "WLR_RENDERER" = "pixman"; + }; + # For convenience: + shellAliases = { + test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok"; + test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok"; + }; + + # To help with OCR: + etc."xdg/foot/foot.ini".text = lib.generators.toINI { } { + main = { + font = "inconsolata:size=14"; + }; + colors = rec { + foreground = "000000"; + background = "ffffff"; + regular2 = foreground; + }; + }; + + etc."gpg-agent.conf".text = '' + pinentry-timeout 86400 + ''; + }; + + fonts.packages = [ pkgs.inconsolata ]; + + # Automatically configure and start Sway when logging in on tty1: + programs.bash.loginShellInit = '' + if [ "$(tty)" = "/dev/tty1" ]; then + set -e + + mkdir -p ~/.config/sway + sed s/Mod4/Mod1/ /etc/sway/config > ~/.config/sway/config + + sway --validate + sway && touch /tmp/sway-exit-ok + fi + ''; + + programs.sway = { + enable = true; + package = pkgs.swayfx.override { isNixOS = true; }; + }; + + # To test pinentry via gpg-agent: + programs.gnupg.agent.enable = true; + + # Need to switch to a different GPU driver than the default one (-vga std) so that Sway can launch: + virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; + }; + + testScript = + { nodes, ... }: + '' + import shlex + import json + + q = shlex.quote + NODE_GROUPS = ["nodes", "floating_nodes"] + + + def swaymsg(command: str = "", succeed=True, type="command"): + assert command != "" or type != "command", "Must specify command or type" + shell = q(f"swaymsg -t {q(type)} -- {q(command)}") + with machine.nested( + f"sending swaymsg {shell!r}" + " (allowed to fail)" * (not succeed) + ): + ret = (machine.succeed if succeed else machine.execute)( + f"su - alice -c {shell}" + ) + + # execute also returns a status code, but disregard. + if not succeed: + _, ret = ret + + if not succeed and not ret: + return None + + parsed = json.loads(ret) + return parsed + + + def walk(tree): + yield tree + for group in NODE_GROUPS: + for node in tree.get(group, []): + yield from walk(node) + + + def wait_for_window(pattern): + def func(last_chance): + nodes = (node["name"] for node in walk(swaymsg(type="get_tree"))) + + if last_chance: + nodes = list(nodes) + machine.log(f"Last call! Current list of windows: {nodes}") + + return any(pattern in name for name in nodes) + + retry(func) + + start_all() + machine.wait_for_unit("multi-user.target") + + # To check the version: + print(machine.succeed("sway --version")) + + # Wait for Sway to complete startup: + machine.wait_for_file("/run/user/1000/wayland-1") + machine.wait_for_file("/tmp/sway-ipc.sock") + + # Test XWayland (foot does not support X): + swaymsg("exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY= alacritty") + wait_for_window("alice@machine") + machine.send_chars("test-x11\n") + machine.wait_for_file("/tmp/test-x11-exit-ok") + print(machine.succeed("cat /tmp/test-x11.out")) + machine.copy_from_vm("/tmp/test-x11.out") + machine.screenshot("alacritty_glinfo") + machine.succeed("pkill alacritty") + + # Start a terminal (foot) on workspace 3: + machine.send_key("alt-3") + machine.sleep(3) + machine.send_key("alt-ret") + wait_for_window("alice@machine") + machine.send_chars("test-wayland\n") + machine.wait_for_file("/tmp/test-wayland-exit-ok") + print(machine.succeed("cat /tmp/test-wayland.out")) + machine.copy_from_vm("/tmp/test-wayland.out") + machine.screenshot("foot_wayland_info") + machine.send_key("alt-shift-q") + machine.wait_until_fails("pgrep foot") + + # Test gpg-agent starting pinentry-gnome3 via D-Bus (tests if + # $WAYLAND_DISPLAY is correctly imported into the D-Bus user env): + swaymsg("exec mkdir -p ~/.gnupg") + swaymsg("exec cp /etc/gpg-agent.conf ~/.gnupg") + + swaymsg("exec DISPLAY=INVALID gpg --no-tty --yes --quick-generate-key test", succeed=False) + machine.wait_until_succeeds("pgrep --exact gpg") + wait_for_window("gpg") + machine.succeed("pgrep --exact gpg") + machine.screenshot("gpg_pinentry") + machine.send_key("alt-shift-q") + machine.wait_until_fails("pgrep --exact gpg") + + # Test swaynag: + def get_height(): + return [node['rect']['height'] for node in walk(swaymsg(type="get_tree")) if node['focused']][0] + + before = get_height() + machine.send_key("alt-shift-e") + retry(lambda _: get_height() < before) + machine.screenshot("sway_exit") + + swaymsg("exec swaylock") + machine.wait_until_succeeds("pgrep -x swaylock") + machine.sleep(3) + machine.send_chars("${nodes.machine.config.users.users.alice.password}") + machine.send_key("ret") + machine.wait_until_fails("pgrep -x swaylock") + + # Exit Sway and verify process exit status 0: + swaymsg("exit", succeed=False) + machine.wait_until_fails("pgrep -x sway") + machine.wait_for_file("/tmp/sway-exit-ok") + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/switch-test.nix b/third_party/nixpkgs/nixos/tests/switch-test.nix index a57d66f82e..d90e5bb088 100644 --- a/third_party/nixpkgs/nixos/tests/switch-test.nix +++ b/third_party/nixpkgs/nixos/tests/switch-test.nix @@ -1,6 +1,6 @@ # Test configuration switching. -import ./make-test-python.nix ({ lib, pkgs, ...} : let +import ./make-test-python.nix ({ lib, pkgs, ng, ...} : let # Simple service that can either be socket-activated or that will # listen on port 1234 if not socket-activated. @@ -48,6 +48,11 @@ in { nodes = { machine = { pkgs, lib, ... }: { + system.switch = { + enable = !ng; + enableNg = ng; + }; + environment.systemPackages = [ pkgs.socat ]; # for the socket activation stuff users.mutableUsers = false; @@ -610,6 +615,11 @@ in { # Returns a comma separated representation of the given list in sorted # order, that matches the output format of switch-to-configuration.pl sortedUnits = xs: lib.concatStringsSep ", " (builtins.sort builtins.lessThan xs); + + dbusService = { + "dbus" = "dbus.service"; + "broker" = "dbus-broker.service"; + }.${nodes.machine.services.dbus.implementation}; in /* python */ '' def switch_to_specialisation(system, name, action="test", fail=False): if name == "": @@ -691,9 +701,9 @@ in { with subtest("continuing from an aborted switch"): # An aborted switch will write into a file what it tried to start # and a second switch should continue from this - machine.succeed("echo dbus-broker.service > /run/nixos/start-list") + machine.succeed("echo ${dbusService} > /run/nixos/start-list") out = switch_to_specialisation("${machine}", "modifiedSystemConf") - assert_contains(out, "starting the following units: dbus-broker.service\n") + assert_contains(out, "starting the following units: ${dbusService}\n") with subtest("fstab mounts"): switch_to_specialisation("${machine}", "") @@ -732,7 +742,7 @@ in { out = switch_to_specialisation("${machine}", "") assert_contains(out, "stopping the following units: test.mount\n") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: dbus-broker.service\n") + assert_contains(out, "reloading the following units: ${dbusService}\n") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") @@ -740,7 +750,7 @@ in { out = switch_to_specialisation("${machine}", "storeMountModified") assert_lacks(out, "stopping the following units:") assert_contains(out, "NOT restarting the following changed units: -.mount") - assert_contains(out, "reloading the following units: dbus-broker.service\n") + assert_contains(out, "reloading the following units: ${dbusService}\n") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") @@ -751,7 +761,7 @@ in { out = switch_to_specialisation("${machine}", "swap") assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: dbus-broker.service\n") + assert_contains(out, "reloading the following units: ${dbusService}\n") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: swapfile.swap") @@ -760,7 +770,7 @@ in { assert_contains(out, "stopping swap device: /swapfile") assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: dbus-broker.service\n") + assert_contains(out, "reloading the following units: ${dbusService}\n") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") @@ -781,7 +791,7 @@ in { assert_lacks(out, "installing dummy bootloader") # test does not install a bootloader assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: dbus-broker.service\n") # huh + assert_contains(out, "reloading the following units: ${dbusService}\n") # huh assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: test.service\n") @@ -858,7 +868,7 @@ in { assert_lacks(out, "installing dummy bootloader") # test does not install a bootloader assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: dbus-broker.service\n") # huh + assert_contains(out, "reloading the following units: ${dbusService}\n") # huh assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: test.service\n") diff --git a/third_party/nixpkgs/nixos/tests/syncthing-relay.nix b/third_party/nixpkgs/nixos/tests/syncthing-relay.nix index 3d70b1eda7..cab9bcafe9 100644 --- a/third_party/nixpkgs/nixos/tests/syncthing-relay.nix +++ b/third_party/nixpkgs/nixos/tests/syncthing-relay.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "syncthing-relay"; - meta.maintainers = with pkgs.lib.maintainers; [ delroth ]; + meta.maintainers = with pkgs.lib.maintainers; [ ]; nodes.machine = { environment.systemPackages = [ pkgs.jq ]; diff --git a/third_party/nixpkgs/nixos/tests/systemd-confinement.nix b/third_party/nixpkgs/nixos/tests/systemd-confinement.nix deleted file mode 100644 index bde5b770ea..0000000000 --- a/third_party/nixpkgs/nixos/tests/systemd-confinement.nix +++ /dev/null @@ -1,184 +0,0 @@ -import ./make-test-python.nix { - name = "systemd-confinement"; - - nodes.machine = { pkgs, lib, ... }: let - testServer = pkgs.writeScript "testserver.sh" '' - #!${pkgs.runtimeShell} - export PATH=${lib.escapeShellArg "${pkgs.coreutils}/bin"} - ${lib.escapeShellArg pkgs.runtimeShell} 2>&1 - echo "exit-status:$?" - ''; - - testClient = pkgs.writeScriptBin "chroot-exec" '' - #!${pkgs.runtimeShell} -e - output="$(echo "$@" | nc -NU "/run/test$(< /teststep).sock")" - ret="$(echo "$output" | sed -nre '$s/^exit-status:([0-9]+)$/\1/p')" - echo "$output" | head -n -1 - exit "''${ret:-1}" - ''; - - mkTestStep = num: { - testScript, - config ? {}, - serviceName ? "test${toString num}", - }: { - systemd.sockets.${serviceName} = { - description = "Socket for Test Service ${toString num}"; - wantedBy = [ "sockets.target" ]; - socketConfig.ListenStream = "/run/test${toString num}.sock"; - socketConfig.Accept = true; - }; - - systemd.services."${serviceName}@" = { - description = "Confined Test Service ${toString num}"; - confinement = (config.confinement or {}) // { enable = true; }; - serviceConfig = (config.serviceConfig or {}) // { - ExecStart = testServer; - StandardInput = "socket"; - }; - } // removeAttrs config [ "confinement" "serviceConfig" ]; - - __testSteps = lib.mkOrder num ('' - machine.succeed("echo ${toString num} > /teststep") - '' + testScript); - }; - - in { - imports = lib.imap1 mkTestStep [ - { config.confinement.mode = "chroot-only"; - testScript = '' - with subtest("chroot-only confinement"): - paths = machine.succeed('chroot-exec ls -1 / | paste -sd,').strip() - assert_eq(paths, "bin,nix,run") - uid = machine.succeed('chroot-exec id -u').strip() - assert_eq(uid, "0") - machine.succeed("chroot-exec chown 65534 /bin") - ''; - } - { testScript = '' - with subtest("full confinement with APIVFS"): - machine.fail("chroot-exec ls -l /etc") - machine.fail("chroot-exec chown 65534 /bin") - assert_eq(machine.succeed('chroot-exec id -u').strip(), "0") - machine.succeed("chroot-exec chown 0 /bin") - ''; - } - { config.serviceConfig.BindReadOnlyPaths = [ "/etc" ]; - testScript = '' - with subtest("check existence of bind-mounted /etc"): - passwd = machine.succeed('chroot-exec cat /etc/passwd').strip() - assert len(passwd) > 0, "/etc/passwd must not be empty" - ''; - } - { config.serviceConfig.User = "chroot-testuser"; - config.serviceConfig.Group = "chroot-testgroup"; - testScript = '' - with subtest("check if User/Group really runs as non-root"): - machine.succeed("chroot-exec ls -l /dev") - uid = machine.succeed('chroot-exec id -u').strip() - assert uid != "0", "UID of chroot-testuser shouldn't be 0" - machine.fail("chroot-exec touch /bin/test") - ''; - } - (let - symlink = pkgs.runCommand "symlink" { - target = pkgs.writeText "symlink-target" "got me\n"; - } "ln -s \"$target\" \"$out\""; - in { - config.confinement.packages = lib.singleton symlink; - testScript = '' - with subtest("check if symlinks are properly bind-mounted"): - machine.fail("chroot-exec test -e /etc") - text = machine.succeed('chroot-exec cat ${symlink}').strip() - assert_eq(text, "got me") - ''; - }) - { config.serviceConfig.User = "chroot-testuser"; - config.serviceConfig.Group = "chroot-testgroup"; - config.serviceConfig.StateDirectory = "testme"; - testScript = '' - with subtest("check if StateDirectory works"): - machine.succeed("chroot-exec touch /tmp/canary") - machine.succeed('chroot-exec "echo works > /var/lib/testme/foo"') - machine.succeed('test "$(< /var/lib/testme/foo)" = works') - machine.succeed("test ! -e /tmp/canary") - ''; - } - { testScript = '' - with subtest("check if /bin/sh works"): - machine.succeed( - "chroot-exec test -e /bin/sh", - 'test "$(chroot-exec \'/bin/sh -c "echo bar"\')" = bar', - ) - ''; - } - { config.confinement.binSh = null; - testScript = '' - with subtest("check if suppressing /bin/sh works"): - machine.succeed("chroot-exec test ! -e /bin/sh") - machine.succeed('test "$(chroot-exec \'/bin/sh -c "echo foo"\')" != foo') - ''; - } - { config.confinement.binSh = "${pkgs.hello}/bin/hello"; - testScript = '' - with subtest("check if we can set /bin/sh to something different"): - machine.succeed("chroot-exec test -e /bin/sh") - machine.succeed('test "$(chroot-exec /bin/sh -g foo)" = foo') - ''; - } - { config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n"; - testScript = '' - with subtest("check if only Exec* dependencies are included"): - machine.succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" != eek') - ''; - } - { config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n"; - config.confinement.fullUnit = true; - testScript = '' - with subtest("check if all unit dependencies are included"): - machine.succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" = eek') - ''; - } - { serviceName = "shipped-unitfile"; - config.confinement.mode = "chroot-only"; - testScript = '' - with subtest("check if shipped unit file still works"): - machine.succeed( - 'chroot-exec \'kill -9 $$ 2>&1 || :\' | ' - 'grep -q "Too many levels of symbolic links"' - ) - ''; - } - ]; - - options.__testSteps = lib.mkOption { - type = lib.types.lines; - description = "All of the test steps combined as a single script."; - }; - - config.environment.systemPackages = lib.singleton testClient; - config.systemd.packages = lib.singleton (pkgs.writeTextFile { - name = "shipped-unitfile"; - destination = "/etc/systemd/system/shipped-unitfile@.service"; - text = '' - [Service] - SystemCallFilter=~kill - SystemCallErrorNumber=ELOOP - ''; - }); - - config.users.groups.chroot-testgroup = {}; - config.users.users.chroot-testuser = { - isSystemUser = true; - description = "Chroot Test User"; - group = "chroot-testgroup"; - }; - }; - - testScript = { nodes, ... }: '' - def assert_eq(a, b): - assert a == b, f"{a} != {b}" - - machine.wait_for_unit("multi-user.target") - '' + nodes.machine.config.__testSteps; -} diff --git a/third_party/nixpkgs/nixos/tests/systemd-confinement/checkperms.py b/third_party/nixpkgs/nixos/tests/systemd-confinement/checkperms.py new file mode 100644 index 0000000000..3c7ba279a3 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/systemd-confinement/checkperms.py @@ -0,0 +1,187 @@ +import errno +import os + +from enum import IntEnum +from pathlib import Path + + +class Accessibility(IntEnum): + """ + The level of accessibility we have on a file or directory. + + This is needed to assess the attack surface on the file system namespace we + have within a confined service. Higher levels mean more permissions for the + user and thus a bigger attack surface. + """ + NONE = 0 + + # Directories can be listed or files can be read. + READABLE = 1 + + # This is for special file systems such as procfs and for stuff such as + # FIFOs or character special files. The reason why this has a lower value + # than WRITABLE is because those files are more restricted on what and how + # they can be written to. + SPECIAL = 2 + + # Another special case are sticky directories, which do allow write access + # but restrict deletion. This does *not* apply to sticky directories that + # are read-only. + STICKY = 3 + + # Essentially full permissions, the kind of accessibility we want to avoid + # in most cases. + WRITABLE = 4 + + def assert_on(self, path: Path) -> None: + """ + Raise an AssertionError if the given 'path' allows for more + accessibility than 'self'. + """ + actual = self.NONE + + if path.is_symlink(): + actual = self.READABLE + elif path.is_dir(): + writable = True + + dummy_file = path / 'can_i_write' + try: + dummy_file.touch() + except OSError as e: + if e.errno in [errno.EROFS, errno.EACCES]: + writable = False + else: + raise + else: + dummy_file.unlink() + + if writable: + # The reason why we test this *after* we made sure it's + # writable is because we could have a sticky directory where + # the current user doesn't have write access. + if path.stat().st_mode & 0o1000 == 0o1000: + actual = self.STICKY + else: + actual = self.WRITABLE + else: + actual = self.READABLE + elif path.is_file(): + try: + with path.open('rb') as fp: + fp.read(1) + actual = self.READABLE + except PermissionError: + pass + + writable = True + try: + with path.open('ab') as fp: + fp.write('x') + size = fp.tell() + fp.truncate(size) + except PermissionError: + writable = False + except OSError as e: + if e.errno == errno.ETXTBSY: + writable = os.access(path, os.W_OK) + elif e.errno == errno.EROFS: + writable = False + else: + raise + + # Let's always try to fail towards being writable, so if *either* + # access(2) or a real write is successful it's writable. This is to + # make sure we don't accidentally introduce no-ops if we have bugs + # in the more complicated real write code above. + if writable or os.access(path, os.W_OK): + actual = self.WRITABLE + else: + # We need to be very careful when writing to or reading from + # special files (eg. FIFOs), since they can possibly block. So if + # it's not a file, just trust that access(2) won't lie. + if os.access(path, os.R_OK): + actual = self.READABLE + + if os.access(path, os.W_OK): + actual = self.SPECIAL + + if actual > self: + stat = path.stat() + details = ', '.join([ + f'permissions: {stat.st_mode & 0o7777:o}', + f'uid: {stat.st_uid}', + f'group: {stat.st_gid}', + ]) + + raise AssertionError( + f'Expected at most {self!r} but got {actual!r} for path' + f' {path} ({details}).' + ) + + +def is_special_fs(path: Path) -> bool: + """ + Check whether the given path truly is a special file system such as procfs + or sysfs. + """ + try: + if path == Path('/proc'): + return (path / 'version').read_text().startswith('Linux') + elif path == Path('/sys'): + return b'Linux' in (path / 'kernel' / 'notes').read_bytes() + except FileNotFoundError: + pass + return False + + +def is_empty_dir(path: Path) -> bool: + try: + next(path.iterdir()) + return False + except (StopIteration, PermissionError): + return True + + +def _assert_permissions_in_directory( + directory: Path, + accessibility: Accessibility, + subdirs: dict[Path, Accessibility], +) -> None: + accessibility.assert_on(directory) + + for file in directory.iterdir(): + if is_special_fs(file): + msg = f'Got unexpected special filesystem at {file}.' + assert subdirs.pop(file) == Accessibility.SPECIAL, msg + elif not file.is_symlink() and file.is_dir(): + subdir_access = subdirs.pop(file, accessibility) + if is_empty_dir(file): + # Whenever we got an empty directory, we check the permission + # constraints on the current directory (except if specified + # explicitly in subdirs) because for example if we're non-root + # (the constraints of the current directory are thus + # Accessibility.READABLE), we really have to make sure that + # empty directories are *never* writable. + subdir_access.assert_on(file) + else: + _assert_permissions_in_directory(file, subdir_access, subdirs) + else: + subdirs.pop(file, accessibility).assert_on(file) + + +def assert_permissions(subdirs: dict[str, Accessibility]) -> None: + """ + Recursively check whether the file system conforms to the accessibility + specification we specified via 'subdirs'. + """ + root = Path('/') + absolute_subdirs = {root / p: a for p, a in subdirs.items()} + _assert_permissions_in_directory( + root, + Accessibility.WRITABLE if os.getuid() == 0 else Accessibility.READABLE, + absolute_subdirs, + ) + for file in absolute_subdirs.keys(): + msg = f'Expected {file} to exist, but it was nowwhere to be found.' + raise AssertionError(msg) diff --git a/third_party/nixpkgs/nixos/tests/systemd-confinement/default.nix b/third_party/nixpkgs/nixos/tests/systemd-confinement/default.nix new file mode 100644 index 0000000000..15d442d476 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/systemd-confinement/default.nix @@ -0,0 +1,274 @@ +import ../make-test-python.nix { + name = "systemd-confinement"; + + nodes.machine = { pkgs, lib, ... }: let + testLib = pkgs.python3Packages.buildPythonPackage { + name = "confinement-testlib"; + unpackPhase = '' + cat > setup.py <", the actual values are + # printed rather than getting a generic AssertionError or the need to + # pass an explicit assertion error message. + import ast + from pathlib import Path + from _pytest.assertion.rewrite import rewrite_asserts + + script = Path('${pkgs.writeText "${name}-main.py" '' + import errno, os, pytest, signal + from subprocess import run + from checkperms import Accessibility, assert_permissions + + ${testScript} + ''}') # noqa + filename = str(script) + source = script.read_bytes() + + tree = ast.parse(source, filename=filename) + rewrite_asserts(tree, source, filename) + exec(compile(tree, filename, 'exec', dont_inherit=True)) + ''; + + mkTestStep = num: { + description, + testScript, + config ? {}, + serviceName ? "test${toString num}", + rawUnit ? null, + }: { + systemd.packages = lib.optional (rawUnit != null) (pkgs.writeTextFile { + name = serviceName; + destination = "/etc/systemd/system/${serviceName}.service"; + text = rawUnit; + }); + + systemd.services.${serviceName} = { + inherit description; + requiredBy = [ "multi-user.target" ]; + confinement = (config.confinement or {}) // { enable = true; }; + serviceConfig = (config.serviceConfig or {}) // { + ExecStart = mkTest serviceName testScript; + Type = "oneshot"; + }; + } // removeAttrs config [ "confinement" "serviceConfig" ]; + }; + + parametrisedTests = lib.concatMap ({ user, privateTmp }: let + withTmp = if privateTmp then "with PrivateTmp" else "without PrivateTmp"; + + serviceConfig = if user == "static-user" then { + User = "chroot-testuser"; + Group = "chroot-testgroup"; + } else if user == "dynamic-user" then { + DynamicUser = true; + } else {}; + + in [ + { description = "${user}, chroot-only confinement ${withTmp}"; + config = { + confinement.mode = "chroot-only"; + # Only set if privateTmp is true to ensure that the default is false. + serviceConfig = serviceConfig // lib.optionalAttrs privateTmp { + PrivateTmp = true; + }; + }; + testScript = if user == "root" then '' + assert os.getuid() == 0 + assert os.getgid() == 0 + + assert_permissions({ + 'bin': Accessibility.READABLE, + 'nix': Accessibility.READABLE, + 'run': Accessibility.READABLE, + ${lib.optionalString privateTmp "'tmp': Accessibility.STICKY,"} + ${lib.optionalString privateTmp "'var': Accessibility.READABLE,"} + ${lib.optionalString privateTmp "'var/tmp': Accessibility.STICKY,"} + }) + '' else '' + assert os.getuid() != 0 + assert os.getgid() != 0 + + assert_permissions({ + 'bin': Accessibility.READABLE, + 'nix': Accessibility.READABLE, + 'run': Accessibility.READABLE, + ${lib.optionalString privateTmp "'tmp': Accessibility.STICKY,"} + ${lib.optionalString privateTmp "'var': Accessibility.READABLE,"} + ${lib.optionalString privateTmp "'var/tmp': Accessibility.STICKY,"} + }) + ''; + } + { description = "${user}, full APIVFS confinement ${withTmp}"; + config = { + # Only set if privateTmp is false to ensure that the default is true. + serviceConfig = serviceConfig // lib.optionalAttrs (!privateTmp) { + PrivateTmp = false; + }; + }; + testScript = if user == "root" then '' + assert os.getuid() == 0 + assert os.getgid() == 0 + + assert_permissions({ + 'bin': Accessibility.READABLE, + 'nix': Accessibility.READABLE, + ${lib.optionalString privateTmp "'tmp': Accessibility.STICKY,"} + 'run': Accessibility.WRITABLE, + + 'proc': Accessibility.SPECIAL, + 'sys': Accessibility.SPECIAL, + 'dev': Accessibility.WRITABLE, + + ${lib.optionalString privateTmp "'var': Accessibility.READABLE,"} + ${lib.optionalString privateTmp "'var/tmp': Accessibility.STICKY,"} + }) + '' else '' + assert os.getuid() != 0 + assert os.getgid() != 0 + + assert_permissions({ + 'bin': Accessibility.READABLE, + 'nix': Accessibility.READABLE, + ${lib.optionalString privateTmp "'tmp': Accessibility.STICKY,"} + 'run': Accessibility.STICKY, + + 'proc': Accessibility.SPECIAL, + 'sys': Accessibility.SPECIAL, + 'dev': Accessibility.SPECIAL, + 'dev/shm': Accessibility.STICKY, + 'dev/mqueue': Accessibility.STICKY, + + ${lib.optionalString privateTmp "'var': Accessibility.READABLE,"} + ${lib.optionalString privateTmp "'var/tmp': Accessibility.STICKY,"} + }) + ''; + } + ]) (lib.cartesianProductOfSets { + user = [ "root" "dynamic-user" "static-user" ]; + privateTmp = [ true false ]; + }); + + in { + imports = lib.imap1 mkTestStep (parametrisedTests ++ [ + { description = "existence of bind-mounted /etc"; + config.serviceConfig.BindReadOnlyPaths = [ "/etc" ]; + testScript = '' + assert Path('/etc/passwd').read_text() + ''; + } + (let + symlink = pkgs.runCommand "symlink" { + target = pkgs.writeText "symlink-target" "got me"; + } "ln -s \"$target\" \"$out\""; + in { + description = "check if symlinks are properly bind-mounted"; + config.confinement.packages = lib.singleton symlink; + testScript = '' + assert Path('${symlink}').read_text() == 'got me' + ''; + }) + { description = "check if StateDirectory works"; + config.serviceConfig.User = "chroot-testuser"; + config.serviceConfig.Group = "chroot-testgroup"; + config.serviceConfig.StateDirectory = "testme"; + + # We restart on purpose here since we want to check whether the state + # directory actually persists. + config.serviceConfig.Restart = "on-failure"; + config.serviceConfig.RestartMode = "direct"; + + testScript = '' + assert not Path('/tmp/canary').exists() + Path('/tmp/canary').touch() + + if (foo := Path('/var/lib/testme/foo')).exists(): + assert Path('/var/lib/testme/foo').read_text() == 'works' + else: + Path('/var/lib/testme/foo').write_text('works') + print('<4>Exiting with failure to check persistence on restart.') + raise SystemExit(1) + ''; + } + { description = "check if /bin/sh works"; + testScript = '' + assert Path('/bin/sh').exists() + + result = run( + ['/bin/sh', '-c', 'echo -n bar'], + capture_output=True, + check=True, + ) + assert result.stdout == b'bar' + ''; + } + { description = "check if suppressing /bin/sh works"; + config.confinement.binSh = null; + testScript = '' + assert not Path('/bin/sh').exists() + with pytest.raises(FileNotFoundError): + run(['/bin/sh', '-c', 'echo foo']) + ''; + } + { description = "check if we can set /bin/sh to something different"; + config.confinement.binSh = "${pkgs.hello}/bin/hello"; + testScript = '' + assert Path('/bin/sh').exists() + result = run( + ['/bin/sh', '-g', 'foo'], + capture_output=True, + check=True, + ) + assert result.stdout == b'foo\n' + ''; + } + { description = "check if only Exec* dependencies are included"; + config.environment.FOOBAR = pkgs.writeText "foobar" "eek"; + testScript = '' + with pytest.raises(FileNotFoundError): + Path(os.environ['FOOBAR']).read_text() + ''; + } + { description = "check if fullUnit includes all dependencies"; + config.environment.FOOBAR = pkgs.writeText "foobar" "eek"; + config.confinement.fullUnit = true; + testScript = '' + assert Path(os.environ['FOOBAR']).read_text() == 'eek' + ''; + } + { description = "check if shipped unit file still works"; + config.confinement.mode = "chroot-only"; + rawUnit = '' + [Service] + SystemCallFilter=~kill + SystemCallErrorNumber=ELOOP + ''; + testScript = '' + with pytest.raises(OSError) as excinfo: + os.kill(os.getpid(), signal.SIGKILL) + assert excinfo.value.errno == errno.ELOOP + ''; + } + ]); + + config.users.groups.chroot-testgroup = {}; + config.users.users.chroot-testuser = { + isSystemUser = true; + description = "Chroot Test User"; + group = "chroot-testgroup"; + }; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-modprobe.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-modprobe.nix index 0f93492176..e563552a64 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-initrd-modprobe.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-modprobe.nix @@ -4,21 +4,21 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { nodes.machine = { pkgs, ... }: { testing.initrdBackdoor = true; boot.initrd.systemd.enable = true; - boot.initrd.kernelModules = [ "loop" ]; # Load module in initrd. + boot.initrd.kernelModules = [ "tcp_hybla" ]; # Load module in initrd. boot.extraModprobeConfig = '' - options loop max_loop=42 + options tcp_hybla rtt0=42 ''; }; testScript = '' machine.wait_for_unit("initrd.target") - max_loop = machine.succeed("cat /sys/module/loop/parameters/max_loop") - assert int(max_loop) == 42, "Parameter should be respected for initrd kernel modules" + rtt = machine.succeed("cat /sys/module/tcp_hybla/parameters/rtt0") + assert int(rtt) == 42, "Parameter should be respected for initrd kernel modules" # Make sure it sticks in stage 2 machine.switch_root() machine.wait_for_unit("multi-user.target") - max_loop = machine.succeed("cat /sys/module/loop/parameters/max_loop") - assert int(max_loop) == 42, "Parameter should be respected for initrd kernel modules" + rtt = machine.succeed("cat /sys/module/tcp_hybla/parameters/rtt0") + assert int(rtt) == 42, "Parameter should be respected for initrd kernel modules" ''; }) diff --git a/third_party/nixpkgs/nixos/tests/systemd.nix b/third_party/nixpkgs/nixos/tests/systemd.nix index 1a39cc73c8..4b087d403f 100644 --- a/third_party/nixpkgs/nixos/tests/systemd.nix +++ b/third_party/nixpkgs/nixos/tests/systemd.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "systemd"; - nodes.machine = { lib, ... }: { + nodes.machine = { config, lib, ... }: { imports = [ common/user-account.nix common/x11.nix ]; virtualisation.emptyDiskImages = [ 512 512 ]; @@ -38,9 +38,18 @@ import ./make-test-python.nix ({ pkgs, ... }: { script = "true"; }; + systemd.services.testDependency1 = { + description = "Test Dependency 1"; + wantedBy = [ config.systemd.services."testservice1".name ]; + serviceConfig.Type = "oneshot"; + script = '' + true + ''; + }; + systemd.services.testservice1 = { description = "Test Service 1"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ config.systemd.targets.multi-user.name ]; serviceConfig.Type = "oneshot"; script = '' if [ "$XXX_SYSTEM" = foo ]; then diff --git a/third_party/nixpkgs/nixos/tests/tayga.nix b/third_party/nixpkgs/nixos/tests/tayga.nix index 4aade67d74..204391d131 100644 --- a/third_party/nixpkgs/nixos/tests/tayga.nix +++ b/third_party/nixpkgs/nixos/tests/tayga.nix @@ -59,6 +59,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: ]; }; }; + programs.mtr.enable = true; }; # The router is configured with static IPv4 addresses towards the server @@ -120,6 +121,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: prefixLength = 96; }; }; + mappings = { + "192.0.2.42" = "2001:db8::2"; + }; }; }; @@ -171,6 +175,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: prefixLength = 96; }; }; + mappings = { + "192.0.2.42" = "2001:db8::2"; + }; }; }; @@ -199,7 +206,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: ]; }; }; - environment.systemPackages = [ pkgs.mtr ]; + programs.mtr.enable = true; }; }; @@ -225,10 +232,16 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: with subtest("Wait for tayga"): router.wait_for_unit("tayga.service") - with subtest("Test ICMP"): + with subtest("Test ICMP server -> client"): + server.wait_until_succeeds("ping -c 3 192.0.2.42 >&2") + + with subtest("Test ICMP and show a traceroute server -> client"): + server.wait_until_succeeds("mtr --show-ips --report-wide 192.0.2.42 >&2") + + with subtest("Test ICMP client -> server"): client.wait_until_succeeds("ping -c 3 64:ff9b::100.64.0.2 >&2") - with subtest("Test ICMP and show a traceroute"): + with subtest("Test ICMP and show a traceroute client -> server"): client.wait_until_succeeds("mtr --show-ips --report-wide 64:ff9b::100.64.0.2 >&2") router.log(router.execute("systemd-analyze security tayga.service")[1]) diff --git a/third_party/nixpkgs/nixos/tests/udisks2.nix b/third_party/nixpkgs/nixos/tests/udisks2.nix index 8cc148750c..b934f0b951 100644 --- a/third_party/nixpkgs/nixos/tests/udisks2.nix +++ b/third_party/nixpkgs/nixos/tests/udisks2.nix @@ -2,6 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: let + # FIXME: 404s stick = pkgs.fetchurl { url = "https://nixos.org/~eelco/nix/udisks-test.img.xz"; sha256 = "0was1xgjkjad91nipzclaz5biv3m4b2nk029ga6nk7iklwi19l8b"; @@ -12,7 +13,7 @@ in { name = "udisks2"; meta = with pkgs.lib.maintainers; { - maintainers = [ eelco ]; + maintainers = [ ]; }; nodes.machine = diff --git a/third_party/nixpkgs/nixos/tests/virtualbox.nix b/third_party/nixpkgs/nixos/tests/virtualbox.nix index 3c2a391233..5fce3ba548 100644 --- a/third_party/nixpkgs/nixos/tests/virtualbox.nix +++ b/third_party/nixpkgs/nixos/tests/virtualbox.nix @@ -98,7 +98,6 @@ let cfg = (import ../lib/eval-config.nix { system = if use64bitGuest then "x86_64-linux" else "i686-linux"; modules = [ - ../modules/profiles/minimal.nix (testVMConfig vmName vmScript) ]; }).config; diff --git a/third_party/nixpkgs/nixos/tests/web-apps/gotosocial.nix b/third_party/nixpkgs/nixos/tests/web-apps/gotosocial.nix index 8c4e76b14e..f9d28c2b8b 100644 --- a/third_party/nixpkgs/nixos/tests/web-apps/gotosocial.nix +++ b/third_party/nixpkgs/nixos/tests/web-apps/gotosocial.nix @@ -1,7 +1,7 @@ { lib, ... }: { name = "gotosocial"; - meta.maintainers = with lib.maintainers; [ misuzu blakesmith ]; + meta.maintainers = with lib.maintainers; [ blakesmith ]; nodes.machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; diff --git a/third_party/nixpkgs/nixos/tests/web-apps/pretalx.nix b/third_party/nixpkgs/nixos/tests/web-apps/pretalx.nix index a226639b07..76e261b220 100644 --- a/third_party/nixpkgs/nixos/tests/web-apps/pretalx.nix +++ b/third_party/nixpkgs/nixos/tests/web-apps/pretalx.nix @@ -27,5 +27,9 @@ pretalx.wait_for_unit("pretalx-worker.service") pretalx.wait_until_succeeds("curl -q --fail http://talks.local/orga/") + + pretalx.succeed("pretalx-manage --help") + + pretalx.log(pretalx.succeed("systemd-analyze security pretalx-web.service")) ''; } diff --git a/third_party/nixpkgs/nixos/tests/ydotool.nix b/third_party/nixpkgs/nixos/tests/ydotool.nix new file mode 100644 index 0000000000..818ac6f2d5 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/ydotool.nix @@ -0,0 +1,115 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + let + textInput = "This works."; + inputBoxText = "Enter input"; + inputBox = pkgs.writeShellScript "zenity-input" '' + ${lib.getExe pkgs.gnome.zenity} --entry --text '${inputBoxText}:' > /tmp/output & + ''; + in + { + name = "ydotool"; + + meta = { + maintainers = with lib.maintainers; [ + OPNA2608 + quantenzitrone + ]; + }; + + nodes = { + headless = + { config, ... }: + { + imports = [ ./common/user-account.nix ]; + + users.users.alice.extraGroups = [ "ydotool" ]; + + programs.ydotool.enable = true; + + services.getty.autologinUser = "alice"; + }; + + x11 = + { config, ... }: + { + imports = [ + ./common/user-account.nix + ./common/auto.nix + ./common/x11.nix + ]; + + users.users.alice.extraGroups = [ "ydotool" ]; + + programs.ydotool.enable = true; + + test-support.displayManager.auto = { + enable = true; + user = "alice"; + }; + + services.xserver.windowManager.dwm.enable = true; + services.displayManager.defaultSession = lib.mkForce "none+dwm"; + }; + + wayland = + { config, ... }: + { + imports = [ ./common/user-account.nix ]; + + services.cage = { + enable = true; + user = "alice"; + }; + + programs.ydotool.enable = true; + + services.cage.program = inputBox; + }; + }; + + enableOCR = true; + + testScript = + { nodes, ... }: + '' + def as_user(cmd: str): + """ + Return a shell command for running a shell command as a specific user. + """ + return f"sudo -u alice -i {cmd}" + + start_all() + + # Headless + headless.wait_for_unit("multi-user.target") + headless.wait_for_text("alice") + headless.succeed(as_user("ydotool type 'echo ${textInput} > /tmp/output'")) # text input + headless.succeed(as_user("ydotool key 28:1 28:0")) # text input + headless.screenshot("headless_input") + headless.wait_for_file("/tmp/output") + headless.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input + + # X11 + x11.wait_for_x() + x11.execute(as_user("${inputBox}")) + x11.wait_for_text("${inputBoxText}") + x11.succeed(as_user("ydotool type '${textInput}'")) # text input + x11.screenshot("x11_input") + x11.succeed(as_user("ydotool mousemove -a 400 110")) # mouse input + x11.succeed(as_user("ydotool click 0xC0")) # mouse input + x11.wait_for_file("/tmp/output") + x11.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input + + # Wayland + wayland.wait_for_unit("graphical.target") + wayland.wait_for_text("${inputBoxText}") + wayland.succeed("ydotool type '${textInput}'") # text input + wayland.screenshot("wayland_input") + wayland.succeed("ydotool mousemove -a 100 100") # mouse input + wayland.succeed("ydotool click 0xC0") # mouse input + wayland.wait_for_file("/tmp/output") + wayland.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/your_spotify.nix b/third_party/nixpkgs/nixos/tests/your_spotify.nix new file mode 100644 index 0000000000..a1fa0e459a --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/your_spotify.nix @@ -0,0 +1,33 @@ +import ./make-test-python.nix ({pkgs, ...}: { + name = "your_spotify"; + meta = with pkgs.lib.maintainers; { + maintainers = [patrickdag]; + }; + + nodes.machine = { + services.your_spotify = { + enable = true; + spotifySecretFile = pkgs.writeText "spotifySecretFile" "deadbeef"; + settings = { + CLIENT_ENDPOINT = "http://localhost"; + API_ENDPOINT = "http://localhost:3000"; + SPOTIFY_PUBLIC = "beefdead"; + }; + enableLocalDB = true; + nginxVirtualHost = "localhost"; + }; + }; + + testScript = '' + machine.wait_for_unit("your_spotify.service") + + machine.wait_for_open_port(3000) + machine.wait_for_open_port(80) + + out = machine.succeed("curl --fail -X GET 'http://localhost:3000/'") + assert "Hello !" in out + + out = machine.succeed("curl --fail -X GET 'http://localhost:80/'") + assert "Your Spotify" in out + ''; +}) diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix index 0de562c533..6e602dc35c 100644 --- a/third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix @@ -3,7 +3,7 @@ , fetchFromGitLab , autoreconfHook , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtk3 , expat @@ -39,7 +39,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook - wrapGAppsHook + wrapGAppsHook3 pkg-config # doc generation gnome-doc-utils diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix index 847002c6d7..c05c1dd8bf 100644 --- a/third_party/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/accessibility/mousetweaks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config -, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook +, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook3 , xorg }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "005fhmvb45sa9mq17dpa23n1xnspiissx5rnpiy7hiqmy3g5rg8f"; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ glib gtk3 gsettings-desktop-schemas @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { The features can be activated and configured through the Universal Access panel of the GNOME Control Center. ''; - homepage = "https://wiki.gnome.org/Projects/Mousetweaks"; + homepage = "https://gitlab.gnome.org/Archive/mousetweaks"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.johnazoidberg ]; diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix index 2b8e0a5e76..119217ddfd 100644 --- a/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix @@ -17,14 +17,14 @@ , rustPlatform , rustc , feedbackd -, wrapGAppsHook +, wrapGAppsHook3 , fetchpatch , nixosTests }: stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.22.0"; + version = "1.38.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -32,30 +32,22 @@ stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - hash = "sha256-Rk6LOCZ5bhoo5ORAIIYWENrKUIVypd8bnKjyyBSbUYg="; + hash = "sha256-ZVSnLH2wLPcOHkU2pO0BgIdGmULMNiacIYMRmhN+bZ8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - cargoUpdateHook = '' - cat Cargo.toml.in Cargo.deps.newer > Cargo.toml - cp Cargo.lock.newer Cargo.lock - ''; name = "${pname}-${version}"; - hash = "sha256-DygWra4R/w8KzkFzIVm4+ePpUpjiYGaDx2NQm6o+tWQ="; + hash = "sha256-tcn1tRuRlHVTYvc8T/ePfCEPNjih6B9lo/hdX+WwitQ="; }; - mesonFlags = [ - "-Dnewer=true" - ]; - nativeBuildInputs = [ meson ninja pkg-config glib wayland - wrapGAppsHook + wrapGAppsHook3 rustPlatform.cargoSetupHook cargo rustc diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix index d74790c2f1..a918797e2d 100644 --- a/third_party/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.14.4"; + version = "0.15"; src = fetchFromGitHub { owner = "jjsullivan5196"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1ySKsWgSCqsWV0RnR+wZt7+hWVWUqXrQLd1H6FqYzc8="; + sha256 = "sha256-9gDxMH1hghqjcXlbda7CHjDdjcjApjjie7caihKIg9M="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix index 226aa832f8..9aaff55392 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix @@ -64,14 +64,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "8.4"; + version = "8.6"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-6qx/elkj4Kb4YK1JZG/S036WdUO7wEE6/yf4pZQP8J0="; + hash = "sha256-sMp24tjtX8fZJWc7dvb+9e6pEflT4ugoOZjDis6/3nM="; }; bundledContent = fetchzip { diff --git a/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix index b9e14f486b..f34ff19ea0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix @@ -13,7 +13,7 @@ , libsoup , libxml2 , taglib -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pkg-config gettext intltool - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacious/plugins.nix b/third_party/nixpkgs/pkgs/applications/audio/audacious/plugins.nix index 6f5d171e2e..2d048bc358 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audacious/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audacious/plugins.nix @@ -41,6 +41,7 @@ , qtmultimedia , qtx11extras , soxr +, vgmstream , wavpack }: @@ -109,6 +110,10 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + postInstall = '' + ln -s ${vgmstream.override { buildAudaciousPlugin = true; }}/lib/audacious/Input/* $out/lib/audacious/Input + ''; + meta = audacious.meta // { description = "Plugins for Audacious music player"; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix index 74af177d0e..365ea7d9c9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , python3 , gettext @@ -62,13 +62,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.4.2"; + version = "3.5.1"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-YlRWCu6kQYdzast7Mf29p4FvpXJHQLG7vqqo/5SNQCQ="; + hash = "sha256-wQ+K31TvDTVwDyVQ5nWgcneZ1cFxztmsbSXrDs33Uoc="; }; postPatch = '' @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { pkg-config python3 makeWrapper - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals stdenv.isLinux [ linuxHeaders ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/audio-recorder/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audio-recorder/default.nix index 72d31e2966..ebf9eafcb0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audio-recorder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audio-recorder/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl , pkg-config, intltool , glib, dbus, gtk3, libappindicator-gtk3, gst_all_1 -, librsvg, wrapGAppsHook +, librsvg, wrapGAppsHook3 , pulseaudioSupport ? true, libpulseaudio }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # https://bugs.launchpad.net/audio-recorder/+bug/1784622 env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; buildInputs = [ glib dbus gtk3 librsvg libappindicator-gtk3 diff --git a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index 5ebc2caf0f..5f955334fe 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -8,7 +8,7 @@ , qtbase , qttools , qtwayland -, rtaudio +, rtaudio_6 , rtmidi , wrapQtAppsHook }: @@ -43,16 +43,16 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qtbase + rtaudio_6 rtmidi ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [ qt5compat - ] ++ rtaudio.buildInputs; + ]; qmakeFlags = [ - # we don't have RtAudio 6 yet: https://github.com/NixOS/nixpkgs/pull/245075 - # "CONFIG+=system_rtaudio" + "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/beast/patch.patch b/third_party/nixpkgs/pkgs/applications/audio/beast/patch.patch deleted file mode 100644 index 9d9f82cf4b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/beast/patch.patch +++ /dev/null @@ -1,187 +0,0 @@ -Index: beast-0.7.1/shell/Makefile.in -=================================================================== ---- beast-0.7.1.orig/shell/Makefile.in -+++ beast-0.7.1/shell/Makefile.in -@@ -859,10 +859,7 @@ check-before: check-installation - check-installation: - @for p in $(bin_PROGRAMS) ; do \ - pp="$(DESTDIR)$(bindir)/$$p" ; \ -- echo "TEST: test -x \"$$pp\"" ; \ -- test -x "$$pp" || \ -- { echo "Failed to verify installation of executable: $$pp"; \ -- exit 1 ; } \ -+ echo "TEST: test -x \"$$pp\" Test disabled" ; \ - done - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: beast-0.7.1/shell/Makefile.am -=================================================================== ---- beast-0.7.1.orig/shell/Makefile.am -+++ beast-0.7.1/shell/Makefile.am -@@ -859,10 +859,7 @@ check-before: check-installation - check-installation: - @for p in $(bin_PROGRAMS) ; do \ - pp="$(DESTDIR)$(bindir)/$$p" ; \ -- echo "TEST: test -x \"$$pp\"" ; \ -- test -x "$$pp" || \ -- { echo "Failed to verify installation of executable: $$pp"; \ -- exit 1 ; } \ -+ echo "TEST: test -x \"$$pp\" Test disabled" ; \ - done - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: beast-0.7.1/birnet/birnettests.h -=================================================================== ---- beast-0.7.1.orig/birnet/birnettests.h -+++ beast-0.7.1/birnet/birnettests.h -@@ -27,6 +27,7 @@ - - #include - #include -+#include - - BIRNET_EXTERN_C_BEGIN(); - -Index: beast-0.7.1/tools/bseloopfuncs.c -=================================================================== ---- beast-0.7.1.orig/tools/bseloopfuncs.c -+++ beast-0.7.1/tools/bseloopfuncs.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - typedef struct { - gdouble score; ---- beast-0.7.1.orig/bse/Makefile.am 2008-06-01 13:12:28.116708321 +0200 -+++ beast-0.7.1/bse/Makefile.am 2008-06-01 13:12:40.000000000 +0200 -@@ -10,7 +10,7 @@ - # need -I$(top_builddir) for - # need -I$(srcdir) for "bseserver.h" in .genprc.c - # need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc --INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS -+INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS - DEFS += $(strip \ - $(patsubst %, -DG_LOG_DOMAIN=\"BSE\" -DBSE_COMPILATION, \ - $(filter $( $__src || exit 1 - shift - __cmd="$CC -c $CFLAGS $@ $__src -o $__obj" -- $CC -c $CFLAGS "$@" $__src -o $__obj 2>/dev/null -+ $CC -c $CFLAGS "$@" $__src -o $__obj - ;; - cxx) - __src=`tmp_file prog.cc` -@@ -433,7 +433,7 @@ try_compile() - echo "$1" > $__src || exit 1 - shift - __cmd="$CXX -c $CXXFLAGS $@ $__src -o $__obj" -- $CXX -c $CXXFLAGS "$@" $__src -o $__obj 2>/dev/null -+ $CXX -c $CXXFLAGS "$@" $__src -o $__obj - ;; - esac - return $? -@@ -451,7 +451,7 @@ try_compile_link() - echo "$1" > $__src || exit 1 - shift - __cmd="$CC $__src -o $__exe $CFLAGS $LDFLAGS $@" -- $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" 2>/dev/null -+ $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" - ;; - cxx) - __src=`tmp_file prog.cc` -@@ -459,7 +459,7 @@ try_compile_link() - echo "$1" > $__src || exit 1 - shift - __cmd="$CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS $@" -- $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" 2>/dev/null -+ $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" - ;; - esac - return $? diff --git a/third_party/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix b/third_party/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix index e48b45aec3..c2c9432eae 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, csound, desktop-file-utils, - fetchFromGitHub, python, python-qt, qmake, + fetchFromGitHub, python3, python-qt, qmake, qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { "CSOUND_INCLUDE_DIR=${csound}/include/csound" "CSOUND_LIBRARY_DIR=${csound}/lib" "RTMIDI_DIR=${rtmidi.src}" - "PYTHONQT_SRC_DIR=${python-qt}/include/PythonQt" + "PYTHONQT_SRC_DIR=${python-qt.src}" "PYTHONQT_LIB_DIR=${python-qt}/lib" "LIBS+=-L${python-qt}/lib" - "INCLUDEPATH+=${python-qt}/include/PythonQt" - "INCLUDEPATH+=${python}/include/python${python.pythonVersion}" "INSTALL_DIR=${placeholder "out"}" "SHARE_DIR=${placeholder "out"}/share" + "PYTHON_DIR=${python3}" + "PYTHON_VERSION=3.${python3.sourceVersion.minor}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix index f26fd49037..d141a61963 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix @@ -8,7 +8,7 @@ , swift-corelibs-libdispatch # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 -, gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook +, gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook3 # input plugins , vorbisSupport ? true, libvorbis , mp123Support ? true, libmad @@ -112,7 +112,7 @@ in clangStdenv.mkDerivation { libtool pkg-config ] ++ optionals gtk3Support [ - wrapGAppsHook + wrapGAppsHook3 ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix b/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix index ed4460a283..1a5ce4c77e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix @@ -3,7 +3,7 @@ , glib, libxml2, librsvg, libsndfile, aubio , gtk3, gtksourceview, evince, fluidsynth, rubberband , autoreconfHook, gtk-doc -, portaudio, portmidi, fftw, wrapGAppsHook }: +, portaudio, portmidi, fftw, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "denemo"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gtk-doc - wrapGAppsHook + wrapGAppsHook3 intltool gettext pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/audio/easyabc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/easyabc/default.nix index 9fb792626a..bdc753d0f4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/easyabc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/easyabc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchPypi, substituteAll, python39, fluidsynth, soundfont-fluid, wrapGAppsHook, abcmidi, abcm2ps, ghostscript }: +{ lib, fetchFromGitHub, fetchPypi, substituteAll, python39, fluidsynth, soundfont-fluid, wrapGAppsHook3, abcmidi, abcm2ps, ghostscript }: let # requires python39 due to https://stackoverflow.com/a/71902541 https://github.com/jwdj/EasyABC/issues/52 @@ -28,7 +28,7 @@ in python.pkgs.buildPythonApplication { hash = "sha256-leC3A4HQMeJNeZXArb3YAYr2mddGPcws618NrRh2Q1Y="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; propagatedBuildInputs = with python.pkgs; [ cx-freeze diff --git a/third_party/nixpkgs/pkgs/applications/audio/easytag/default.nix b/third_party/nixpkgs/pkgs/applications/audio/easytag/default.nix index 6d3fd8f1d1..34a4ddc64b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/easytag/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/easytag/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas -, gnome, wrapGAppsHook +, gnome, wrapGAppsHook3 }: let @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = "-lid3tag -lz"; - nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook3 ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac gsettings-desktop-schemas gnome.adwaita-icon-theme @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "View and edit tags for various audio files"; mainProgram = "easytag"; - homepage = "https://wiki.gnome.org/Apps/EasyTAG"; + homepage = "https://gitlab.gnome.org/GNOME/easytag"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ensemble-chorus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ensemble-chorus/default.nix index 7fcf412dd5..a83719a5e4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ensemble-chorus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ensemble-chorus/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # fix compile error regarding packed attribute in 3rd party juice library + ./juice-cxx-packing-fix.diff + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/ensemble-chorus/juice-cxx-packing-fix.diff b/third_party/nixpkgs/pkgs/applications/audio/ensemble-chorus/juice-cxx-packing-fix.diff new file mode 100644 index 0000000000..041f252a81 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/ensemble-chorus/juice-cxx-packing-fix.diff @@ -0,0 +1,55 @@ +diff --git a/thirdparty/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h b/thirdparty/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h +index 69a66e4..3e50635 100644 +--- a/thirdparty/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h ++++ b/thirdparty/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h +@@ -111,18 +111,10 @@ public: + forcedinline uint8 getGreen() const noexcept { return components.g; } + forcedinline uint8 getBlue() const noexcept { return components.b; } + +- #if JUCE_GCC +- // NB these are here as a workaround because GCC refuses to bind to packed values. +- forcedinline uint8& getAlpha() noexcept { return comps [indexA]; } +- forcedinline uint8& getRed() noexcept { return comps [indexR]; } +- forcedinline uint8& getGreen() noexcept { return comps [indexG]; } +- forcedinline uint8& getBlue() noexcept { return comps [indexB]; } +- #else + forcedinline uint8& getAlpha() noexcept { return components.a; } + forcedinline uint8& getRed() noexcept { return components.r; } + forcedinline uint8& getGreen() noexcept { return components.g; } + forcedinline uint8& getBlue() noexcept { return components.b; } +- #endif + + //============================================================================== + /** Copies another pixel colour over this one. +@@ -336,21 +328,22 @@ private: + uint8 b, g, r, a; + #endif + #endif +- } JUCE_PACKED; ++ }; ++ ++ // structure must be packed but using the packed attribute causes compile ++ // failures with newer c++ compilers. Verify default packing produces same layout ++ static_assert(sizeof(Components) == 4, "Components struct is not packed"); + + union + { + uint32 internal; + Components components; +- #if JUCE_GCC +- uint8 comps[4]; // helper struct needed because gcc does not allow references to packed union members +- #endif + }; +-} +-#ifndef DOXYGEN +- JUCE_PACKED +-#endif +-; ++}; ++ ++// class must be packed but using the packed attribute causes compile ++// failures with newer c++ compilers. Verify default packing produces same layout ++static_assert(sizeof(PixelARGB) == 4, "PixelARGB class is not packed"); + + + //============================================================================== diff --git a/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix b/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix index a2f75fd85a..624f145581 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gobject-introspection, makeWrapper, wrapGAppsHook +, gobject-introspection, makeWrapper, wrapGAppsHook3 , gtk3, gst_all_1, python3 , gettext, gnome, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk , iconTheme ? gnome.adwaita-icon-theme @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection makeWrapper - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals documentationSupport [ help2man python3.pkgs.sphinx diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix index dc5dc477b0..7df2dbf651 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix @@ -23,13 +23,13 @@ with lib.strings; let - version = "2.70.3"; + version = "2.72.14"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-z6fW/T7wJZxugmvABlpvyMXvR4WkmC16INOKyyfKx8k="; + sha256 = "sha256-RdSXiOYwKsfyrfHEughCeSwa9VFM6/3pMg54yCMpzLU="; fetchSubmodules = true; }; @@ -63,14 +63,6 @@ let ncurses_static ]; - patches = [ - (fetchpatch { - name = "fix-CsigFFun-API-declaration.patch"; - url = "https://github.com/grame-cncm/faust/commit/10ce960e91a6237c7bff14a338e770757076ce9e.patch"; - hash = "sha256-WMFLpLGTZpG7ni3lhI5VJHsmJViWZf4pAFuhYmFVRCE="; - }) - ]; - passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix b/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix index 5168d084af..90561314fe 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix @@ -1,48 +1,57 @@ { lib, + stdenv, buildNpmPackage, fetchFromGitHub, electron_27, + darwin, copyDesktopItems, makeDesktopItem, ... }: let pname = "feishin"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "jeffvli"; repo = pname; rev = "v${version}"; - hash = "sha256-Nj8GwrH49ph14xvJldj5GQR4mlt9unCPEcgLrsH/sx8="; + hash = "sha256-eNGHrSF/MgRHh0CVc0l8denZIbAnPXwFCZJZcvF+Xtc="; }; electron = electron_27; in buildNpmPackage { - pname = "feishin"; - inherit version; + inherit pname version; inherit src; - npmDepsHash = "sha256-+pr9fWg/9kxkYMmthtqhjgF6MOomSQxVCO5V8tHHRdE="; + npmDepsHash = "sha256-7oh5bl5APAvzb/TxHMUP/saRWLwuP9xqGvn7/RDhFk8="; npmFlags = [ "--legacy-peer-deps" ]; makeCacheWritable = true; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - nativeBuildInputs = [ copyDesktopItems ]; + nativeBuildInputs = + lib.optionals (stdenv.isLinux) [ copyDesktopItems ] + ++ lib.optionals stdenv.isDarwin [ darwin.autoSignDarwinBinariesHook ]; - postPatch = '' - # release/app dependencies are installed on preConfigure - substituteInPlace package.json \ - --replace-fail "electron-builder install-app-deps &&" "" + postPatch = + '' + # release/app dependencies are installed on preConfigure + substituteInPlace package.json \ + --replace-fail "electron-builder install-app-deps &&" "" - # https://github.com/electron/electron/issues/31121 - substituteInPlace src/main/main.ts \ - --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'" - ''; + # Don't check for updates. + substituteInPlace src/main/main.ts \ + --replace-fail "autoUpdater.checkForUpdatesAndNotify();" "" + '' + + lib.optionalString stdenv.isLinux '' + # https://github.com/electron/electron/issues/31121 + substituteInPlace src/main/main.ts \ + --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'" + ''; preConfigure = let @@ -51,7 +60,7 @@ buildNpmPackage { inherit version; src = "${src}/release/app"; - npmDepsHash = "sha256-MRwKxe1hoFs5bPXT6K/UspSDs9XBdcRJGvxGlTKExp4="; + npmDepsHash = "sha256-NgWPr3mctn7f6X2JFsbdNNHkN84RRlLAywqfbyahCQw="; npmFlags = [ "--ignore-scripts" ]; dontNpmBuild = true; @@ -67,40 +76,59 @@ buildNpmPackage { done ''; - postBuild = '' - npm exec electron-builder -- \ - --dir \ - -c.electronDist=${electron}/libexec/electron \ - -c.electronVersion=${electron.version} \ - -c.npmRebuild=false - ''; + postBuild = + lib.optionalString stdenv.isDarwin '' + # electron-builder appears to build directly on top of Electron.app, by overwriting the files in the bundle. + cp -r ${electron}/Applications/Electron.app ./ + find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw - installPhase = '' - runHook preInstall + # Disable code signing during build on macOS. + # https://github.com/electron-userland/electron-builder/blob/fa6fc16/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos + export CSC_IDENTITY_AUTO_DISCOVERY=false + sed -i "/afterSign/d" package.json + '' + + '' + npm exec electron-builder -- \ + --dir \ + -c.electronDist=${if stdenv.isDarwin then "./" else "${electron}/libexec/electron"} \ + -c.electronVersion=${electron.version} \ + -c.npmRebuild=false + ''; - mkdir -p $out/share/feishin - pushd release/build/*/ - cp -r locales resources{,.pak} $out/share/feishin - popd + installPhase = + '' + runHook preInstall + '' + + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + cp -r release/build/**/Feishin.app $out/Applications/ + makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin + '' + + lib.optionalString stdenv.isLinux '' + mkdir -p $out/share/feishin + pushd release/build/*/ + cp -r locales resources{,.pak} $out/share/feishin + popd - # Code relies on checking app.isPackaged, which returns false if the executable is electron. - # Set ELECTRON_FORCE_IS_PACKAGED=1. - # https://github.com/electron/electron/issues/35153#issuecomment-1202718531 - makeWrapper ${lib.getExe electron} $out/bin/feishin \ - --add-flags $out/share/feishin/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --set ELECTRON_FORCE_IS_PACKAGED=1 \ - --inherit-argv0 + # Code relies on checking app.isPackaged, which returns false if the executable is electron. + # Set ELECTRON_FORCE_IS_PACKAGED=1. + # https://github.com/electron/electron/issues/35153#issuecomment-1202718531 + makeWrapper ${lib.getExe electron} $out/bin/feishin \ + --add-flags $out/share/feishin/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set ELECTRON_FORCE_IS_PACKAGED=1 \ + --inherit-argv0 - for size in 32 64 128 256 512 1024; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - ln -s \ - $out/share/feishin/resources/assets/icons/"$size"x"$size".png \ - $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png - done - - runHook postInstall - ''; + for size in 32 64 128 256 512 1024; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + ln -s \ + $out/share/feishin/resources/assets/icons/"$size"x"$size".png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png + done + '' + + '' + runHook postInstall + ''; desktopItems = [ (makeDesktopItem { @@ -125,6 +153,9 @@ buildNpmPackage { license = licenses.gpl3Plus; platforms = platforms.unix; mainProgram = "feishin"; - maintainers = with maintainers; [ onny ]; + maintainers = with maintainers; [ + onny + jlbribeiro + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/flac123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/flac123/default.nix deleted file mode 100644 index 646e361524..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/flac123/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }: - -stdenv.mkDerivation rec { - pname = "flac123"; - version = "0.0.12"; - - src = fetchurl { - url = "mirror://sourceforge/flac-tools/${pname}-${version}-release.tar.gz"; - sha256 = "0zg4ahkg7v81za518x32wldf42g0rrvlrcqhrg9sv3li9bayyxhr"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ flac libao libogg popt ]; - - meta = with lib; { - homepage = "https://flac-tools.sourceforge.net/"; - description = "A command-line program for playing FLAC audio files"; - license = licenses.gpl2Plus; - platforms = platforms.all; - mainProgram = "flac123"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix b/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix index a06efc1c78..811e1d806c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "11.3.0"; + version = "11.4.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "sha256-jzpD8+zhIbOYgSNsoE1Pay+FiPXtRCd6Zz6HHkzWAkY="; + sha256 = "sha256-guIGSKmpinDDfTDSCmcJKWysUPdG/gw5oaKmXqgf53o="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index 1f05808536..1af7a8a00d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.82"; + version = "1.83"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-qEwPKrgmWYMIwIdgKozG9kghCYp4aoYTX28GqKbuDu4="; + hash = "sha256-JMHLB/a86rfxTxl3GXU+lhYtliR8WOAzWilbWei0K2A="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/g4music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/g4music/default.nix index bbb31c1146..0cc1987c35 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/g4music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/g4music/default.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "g4music"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-4UM1CspevlDHpuyvSekMM73XyxVqpdUDtJ7im7hnxHY="; + hash = "sha256-ljSXTEp+f4HMXhGWDGHdX6whm90Vo5KWOQunU2hHwo8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix b/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix index 15125358e4..6dd2256d7c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix @@ -2,7 +2,6 @@ , stdenv , buildDotnetModule , fetchFromGitHub -, autoPatchelfHook , fontconfig , xorg , libglvnd @@ -27,7 +26,6 @@ buildDotnetModule rec { dotnetFlags = [ "-p:Runtimeidentifier=linux-x64" ]; nativeBuildInputs = [ - autoPatchelfHook copyDesktopItems graphicsmagick ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/gbsplay/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gbsplay/default.nix deleted file mode 100644 index 5c7d302346..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/gbsplay/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, libpulseaudio, nas }: - -stdenv.mkDerivation rec { - pname = "gbsplay"; - version = "0.0.97"; - - src = fetchFromGitHub { - owner = "mmitch"; - repo = "gbsplay"; - rev = version; - sha256 = "sha256-O4t5OzXcrGoxzSXr0nzc01bItjcp1LvFeWnbdSUDwFU="; - }; - - configureFlags = [ - "--without-test" # See mmitch/gbsplay#62 - "--without-contrib" - ]; - - nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ libpulseaudio nas ]; - - postInstall = '' - installShellCompletion --bash --name gbsplay contrib/gbsplay.bashcompletion - ''; - - meta = with lib; { - description = "Gameboy sound player"; - license = licenses.gpl1Plus; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/gmpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gmpc/default.nix index 33930dfb7d..071e900b59 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gmpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gmpc/default.nix @@ -16,7 +16,7 @@ , libICE , sqlite , hicolor-icon-theme -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; }; - nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook3 ]; buildInputs = [ glib gtk2 diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix index bba5579132..55ffb370d6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Listen to your favorite podcasts"; mainProgram = "gnome-podcasts"; - homepage = "https://wiki.gnome.org/Apps/Podcasts"; + homepage = "https://apps.gnome.org/Podcasts/"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix index 944b2aa1ae..4a51ab0503 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "go-musicfox"; - version = "4.3.3"; + version = "4.4.0"; src = fetchFromGitHub { owner = "go-musicfox"; repo = "go-musicfox"; rev = "v${version}"; - hash = "sha256-J6R3T92cHFUkKwc+GKm612tVjglP2Tc/kDUmzUMhvio="; + hash = "sha256-11N3dykuEDKAryieNVaPfb3G7E/a4A7Znx9rBvFTHC4="; }; deleteVendor = true; - vendorHash = "sha256-KSIdBEEvYaYcDIDmzfRO857I8FSN4Ajw6phAPQLYEqg="; + vendorHash = "sha256-ey78zeCSEuRgteG5ZRb4uO88E6lwEgqSxKfjJg3NGT4="; subPackages = [ "cmd/musicfox.go" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix b/third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix index 111cad65a0..d2eb394e59 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix @@ -10,7 +10,7 @@ , libsoup , keybinder3 , gst_all_1 -, wrapGAppsHook +, wrapGAppsHook3 , appstream-glib , desktop-file-utils }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 appstream-glib desktop-file-utils ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix index 80f12aa2d0..cde01e65bd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix @@ -8,7 +8,7 @@ , intltool , python3 , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils }: @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ intltool - wrapGAppsHook + wrapGAppsHook3 glibcLocales gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/grandorgue/default.nix b/third_party/nixpkgs/pkgs/applications/audio/grandorgue/default.nix index 54bd0cad35..9e519510eb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/grandorgue/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/grandorgue/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.14.1-1"; + version = "3.14.2-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - hash = "sha256-EyMTWsaqJX7H7aCbu5ww9tQBMwJ7BzobWMWg5Y/ZgJE="; + hash = "sha256-FHM8fFUga9poGhojKBTF4gsJ6L4XEksueVxfMbngvks="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix index f2216ed7d2..86a93c7896 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gspeech/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , python3 , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , glibcLocales , gobject-introspection , gettext @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection pango gdk-pixbuf diff --git a/third_party/nixpkgs/pkgs/applications/audio/gst123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gst123/default.nix index 37b343f540..65d925342b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gst123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gst123/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , gtk3 , ncurses @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix b/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix index c1d1cf5571..50c00101dc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix @@ -31,7 +31,7 @@ , sord , sratom , wafHook -, wrapGAppsHook +, wrapGAppsHook3 , zita-convolver , zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config python3 wafHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/hivelytracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/hivelytracker/default.nix index 324d0ca362..8ad62eb81a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/hivelytracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/hivelytracker/default.nix @@ -6,7 +6,7 @@ , SDL_image , SDL_ttf , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/hushboard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/hushboard/default.nix index 3248ab35b2..dbc0a46702 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/hushboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/hushboard/default.nix @@ -9,7 +9,7 @@ , pycairo , pygobject3 , six -, wrapGAppsHook +, wrapGAppsHook3 , xlib }: @@ -25,7 +25,7 @@ buildPythonApplication { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/indicator-sound-switcher/default.nix b/third_party/nixpkgs/pkgs/applications/audio/indicator-sound-switcher/default.nix index c47aff47ff..1a99287348 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/indicator-sound-switcher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/indicator-sound-switcher/default.nix @@ -5,7 +5,7 @@ , gettext , gtk3 , gobject-introspection -, intltool, wrapGAppsHook, glib +, intltool, wrapGAppsHook3, glib , librsvg , libayatana-appindicator , libpulseaudio @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext intltool - wrapGAppsHook + wrapGAppsHook3 glib gdk-pixbuf ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix index 5caf1a472d..3bf4d63eec 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "JMusicBot"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar"; - sha256 = "sha256-JSVrzyCqAp3V5OZ+KJczhWGolPkdaHsPmiqfmhapQMs="; + sha256 = "sha256-+0814w4zKNr2TxZ9CS8FxeuTLa71jM+DhrfFvLMFlw0="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix index 3d7339f571..4cc31ae421 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix @@ -3,7 +3,7 @@ , fetchurl , pkg-config , intltool -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , alsa-lib , libpulseaudio @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix index 5a7ef44178..9f633fc8d0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "listenbrainz-mpd"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitea { domain = "codeberg.org"; owner = "elomatreb"; repo = "listenbrainz-mpd"; rev = "v${version}"; - hash = "sha256-QHhSrmBNvUTffPzjns670Tn3Z3UDcDvarq605Qx9k4w="; + hash = "sha256-z3SVpPCWZqCVXPKbPxZAKGtk8Z/Tf5PULn0dWsKlVrE="; }; - cargoHash = "sha256-vtU439Pd3zWx+qakh1xTENQhun7S+WsJMndXqPWrPWU="; + cargoHash = "sha256-eCdUrxt9edJm6K3f8V8bjgYWMq3mgj/ZfUZYWE3ZBqw="; nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix index d3cb9fcfab..b575f717be 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { pname = "littlegptracker"; - version = "unstable-2020-11-26"; + version = "0-unstable-2020-11-26"; src = fetchFromGitHub { owner = "Mdashdotdashn"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix index 34dbf0318a..1b83342561 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix @@ -18,14 +18,15 @@ , gdk-pixbuf , glib , pango -, wrapGAppsHook +, wrapGAppsHook3 , lastFMSupport ? true , youtubeSupport ? true +, kid3Support ? true }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.37"; + version = "1.4.39"; format = "other"; @@ -35,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-3GPmGNbbSxvLq0t3F9q1x64BwNQCEvFQWLb0bSO9KUY="; + sha256 = "sha256-VPHQwy2+XR9R7toIN5sNFB91ddROlL7Scr8AKLgUzuo="; }; nativeBuildInputs = [ @@ -45,35 +46,32 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; - buildInputs = with gst_all_1; [ - gdk-pixbuf - glib - glib-networking - gst-libav - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gstreamer - gtk3 - libhandy - libsoup_3 - pango - totem-pl-parser - ] ++ lib.optional lastFMSupport libsecret; + buildInputs = with gst_all_1; + [ + gdk-pixbuf + glib + glib-networking + gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + gtk3 + libhandy + libsoup_3 + pango + totem-pl-parser + ] ++ lib.optional lastFMSupport libsecret; - propagatedBuildInputs = with python3.pkgs; [ - beautifulsoup4 - pillow - pycairo - pygobject3 - ] - ++ lib.optional lastFMSupport pylast - ++ lib.optional youtubeSupport youtube-dl - ; + propagatedBuildInputs = with python3.pkgs; + [ beautifulsoup4 pillow pycairo pygobject3 ] + ++ lib.optional lastFMSupport pylast + ++ lib.optional youtubeSupport youtube-dl + ++ lib.optional kid3Support pkgs.kid3; postPatch = '' chmod +x meson_post_install.py @@ -95,14 +93,12 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - passthru = { - updateScript = nix-update-script { }; - }; + passthru = { updateScript = nix-update-script { }; }; meta = with lib; { changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; description = "A modern music player for GNOME"; - homepage = "https://wiki.gnome.org/Apps/Lollypop"; + homepage = "https://gitlab.gnome.org/World/lollypop"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix index 5eb2d745cd..be12c55596 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lyrebird/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , gobject-introspection , sox @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ toml pygobject3 ]; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ gtk3 sox ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix index 4abc6d4956..0ebc6c604b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix @@ -52,6 +52,7 @@ , upower , vamp-plugin-sdk , wavpack +, wrapGAppsHook3 }: mkDerivation rec { @@ -65,7 +66,9 @@ mkDerivation rec { hash = "sha256-JSWUzerm7D6AKq6g/9eRrt3EE2movRdM+VLUg07sLHo="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; + + dontWrapGApps = true; buildInputs = [ chromaprint @@ -118,9 +121,9 @@ mkDerivation rec { wavpack ]; - qtWrapperArgs = [ - "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" - ]; + preFixup='' + qtWrapperArgs+=(--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive ''${gappsWrapperArgs[@]}) + ''; # mixxx installs udev rules to DATADIR instead of SYSCONFDIR # let's disable this and install udev rules manually via postInstall diff --git a/third_party/nixpkgs/pkgs/applications/audio/mmlgui/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mmlgui/default.nix index aab0acb250..d9197abd04 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mmlgui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mmlgui/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "mmlgui"; - version = "unstable-2023-11-16"; + version = "210420-preview-unstable-2024-04-15"; src = fetchFromGitHub { owner = "superctr"; repo = "mmlgui"; - rev = "627bfc7b67d4d87253517ba71df2d699a8acdd10"; + rev = "e49f225ac2b2d46056b2c45a5d31c544227c4968"; fetchSubmodules = true; - hash = "sha256-d/QLRlSfCrrcvzIhwEBKB5chK+XqO/R8xJ5VfagDi4U="; + hash = "sha256-hj2k1BrE8AA2HTBEO03RammlZV2U4KW0gLJmFNiaSvI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix index c68d14b28f..3fdcda98d1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.60"; + version = "10.72"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-llOo9G65UDDCzaSahq5qssw6SmOJ5C9qS2bdXB/pKF0="; + hash = "sha256-vtpQhCV1hkme69liTO13vz+kxpA3zJ+U1In/4z6qLbQ="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix index 58b5f852a4..4b6fe17e82 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "unstable-2024-02-27"; + version = "4.1.1-unstable-2024-02-27"; src = fetchFromGitHub { owner = "mopidy"; @@ -22,7 +22,9 @@ pythonPackages.buildPythonApplication rec { pythonImportsCheck = [ "mopidy_spotify" ]; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { homepage = "https://github.com/mopidy/mopidy-spotify"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix index 20958429c3..a4aea017ea 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , python3 , mopidy +, extraPkgs ? pkgs: [] }: python3.pkgs.buildPythonApplication rec { @@ -25,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { ytmusicapi ] ++ [ mopidy - ]; + ] ++ extraPkgs pkgs; nativeCheckInputs = with python3.pkgs; [ vcrpy diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix index 9dff169594..3ca2a0e661 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix @@ -3,7 +3,7 @@ , python3Packages , gdk-pixbuf, glib, gobject-introspection, gtk3 , libnotify -, wrapGAppsHook }: +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { pname = "mpdevil"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { format = "other"; nativeBuildInputs = [ - glib.dev gobject-introspection gtk3 pkg-config meson ninja wrapGAppsHook + glib.dev gobject-introspection gtk3 pkg-config meson ninja wrapGAppsHook3 ]; buildInputs = [ @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { # Prevent double wrapping. dontWrapGApps = true; - # Otherwise wrapGAppsHook do not pick up the dependencies correctly. + # Otherwise wrapGAppsHook3 do not pick up the dependencies correctly. strictDeps = false; # There aren't any checks. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpg321/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpg321/default.nix deleted file mode 100644 index e00b6722f3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/mpg321/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{lib, stdenv, fetchurl, fetchpatch, libao, libmad, libid3tag, zlib, alsa-lib -# Specify default libao output plugin to use (e.g. "alsa", "pulse" …). -# If null, it will use the libao system default. -, defaultAudio ? null -}: - -stdenv.mkDerivation rec { - pname = "mpg321"; - version = "0.3.2"; - - src = fetchurl { - url = "mirror://sourceforge/mpg321/${version}/mpg321_${version}.orig.tar.gz"; - sha256 = "0ki8mh76bbmdh77qsiw682dvi8y468yhbdabqwg05igmwc1wqvq5"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2018-7263.patch"; - url = "https://sources.debian.org/data/main/m/mpg321/0.3.2-3/debian/patches/handle_illegal_bitrate_value.patch"; - sha256 = "15simp5fjvm9b024ryfh441rkh2d5bcrizqkzlrh07n9sm7fkw6x"; - }) - # Apple defines semun already. Skip redefining it to fix build errors. - (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/mpg321/0.3.2.patch"; - sha256 = "sha256-qFYpKpE9PZSzOJrnsQINZi6FvUVX0anRyOvlF5eOYqE="; - }) - ]; - - hardeningDisable = [ "format" ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: volume.o:/build/mpg321-0.3.2-orig/mpg321.h:119: multiple definition of - # `loop_remaining'; mpg321.o:/build/mpg321-0.3.2-orig/mpg321.h:119: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - configureFlags = - [ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ] - ++ (lib.optional (defaultAudio != null) - "--with-default-audio=${defaultAudio}"); - - buildInputs = [libao libid3tag libmad zlib] - ++ lib.optional stdenv.isLinux alsa-lib; - - installTargets = [ "install" "install-man" ]; - - meta = with lib; { - description = "Command-line MP3 player"; - homepage = "https://mpg321.sourceforge.net/"; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix b/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix index 642d1057b4..d5f3209725 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { it is published under the GNU General Public License. ''; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ eclairevoyant orivej ]; + maintainers = with lib.maintainers; [ orivej ]; platforms = lib.platforms.linux; mainProgram = "muse4"; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/museeks/default.nix b/third_party/nixpkgs/pkgs/applications/audio/museeks/default.nix index 206fee9de7..5db7f5bd40 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/museeks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/museeks/default.nix @@ -17,8 +17,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - mkdir -p $out/share/${pname} cp -a ${appimageContents}/{locales,resources} $out/share/${pname} cp -a ${appimageContents}/usr/share/icons $out/share/ diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix index 707ec5c8eb..a5058f9b78 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -47,13 +47,13 @@ let } else portaudio; in stdenv'.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-YCeO/ijxA+tZxNviqmlIBkAdjPTrKoOoo1QyMIOqhWU="; + sha256 = "sha256-X3zvrIf5DOC5PWcnuw0aClm++IWUED1ZzAyjnp7Mo+g="; }; cmakeFlags = [ @@ -84,11 +84,6 @@ in stdenv'.mkDerivation (finalAttrs: { "--set-default QT_QPA_PLATFORM xcb" ]; - # HACK `propagatedSandboxProfile` does not appear to actually propagate the - # sandbox profile from `qtbase`, see: - # https://github.com/NixOS/nixpkgs/issues/237458 - sandboxProfile = toString qtbase.__propagatedSandboxProfile or null; - nativeBuildInputs = [ wrapQtAppsHook cmake diff --git a/third_party/nixpkgs/pkgs/applications/audio/music-player/default.nix b/third_party/nixpkgs/pkgs/applications/audio/music-player/default.nix index b28785d936..0a93443df4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/music-player/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/music-player/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/tsirysndr/music-player"; changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "music-player"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix b/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix index 30b26e7e59..217ff8afef 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/muso/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform -, pkg-config, wrapGAppsHook, CoreServices +, pkg-config, wrapGAppsHook3, CoreServices }: rustPlatform.buildRustPackage rec { @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-09DWUER0ZWQuwfE3sjov2GjJNI7coE3D3E5iUy9mlSE="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = lib.optional stdenv.isDarwin CoreServices; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix index cae2a3b7f1..5d60783e01 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "14.1.2"; + version = "15.0.2"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-CMqH9iy9U85bKj7YLcYsKFs5CDePGBEfUWL+sb7WzBw="; + sha256 = "sha256-Yz6gL87Vc8iFTRgKhyUgLL1ool+oinvwq2W9OjFl/OQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix index 597f87337c..d5abb66d23 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - hash = "sha256-RgA3jV/vD6qgIVQCZ0Sm+9CST4SlqN4MUurVM3nIdh0="; + hash = "sha256-Sl4i9HFl+Dth9jmW6hPZzgh0Y35pRo1Xi9LRxCuSIP4="; }; - cargoHash = "sha256-8ZUgm1O4NmZpxgNRKnh1MNhiFNoBWQHo22kyP3hWJwI="; + cargoHash = "sha256-INgDavtBI75h+qVlxTncYu3su+SH/D7HTlThRHJzwkY="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/hrkfdn/ncspot"; changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}"; license = licenses.bsd2; - maintainers = with maintainers; [ marsam liff ]; + maintainers = with maintainers; [ liff ]; mainProgram = "ncspot"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/nuclear/default.nix b/third_party/nixpkgs/pkgs/applications/audio/nuclear/default.nix index 605596563e..2d6a4384e7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/nuclear/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/nuclear/default.nix @@ -21,10 +21,6 @@ appimageTools.wrapType2 { substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share - - # unless linked, the binary is placed in $out/bin/nuclear-someVersion - # link it to $out/bin/nuclear - ln -s $out/bin/${pname}-${version} $out/bin/${pname} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix index 314d475a04..7978e4864a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "opustags"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "fmang"; repo = "opustags"; rev = version; - sha256 = "sha256-cRDyE6/nv8g0OWxZ/AqfwVrk3cSIycvbjvQm9CyQK7g="; + sha256 = "sha256-2t6fhA1s1sKpHTmaMtK+DZ8xLpS6ntq33b4ycuMc8x8="; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/paprefs/default.nix b/third_party/nixpkgs/pkgs/applications/audio/paprefs/default.nix index 212d866059..fa28433fe9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/paprefs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/paprefs/default.nix @@ -8,7 +8,7 @@ , pulseaudioFull , glibmm , gtkmm3 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ninja gettext pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix index 00aed30366..019c777cd0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix @@ -9,7 +9,7 @@ , libcanberra-gtk3 , json-glib , gnome -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { gnome.adwaita-icon-theme ]; - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; configureFlags = [ "--disable-lynx" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pithos/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pithos/default.nix index 1ff4aedb6b..dbb3a63fce 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pithos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pithos/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib -, wrapGAppsHook, pythonPackages, gtk3, gnome, gobject-introspection +, wrapGAppsHook3, pythonPackages, gtk3, gnome, gobject-introspection , libnotify, libsecret, gst_all_1 }: pythonPackages.buildPythonApplication rec { @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { patchShebangs meson_post_install.py ''; - nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook3 ]; propagatedNativeBuildInputs = [ gobject-introspection diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix index c3d36d3b38..29f8dd929b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, pkgs }: +{ lib, fetchurl, appimageTools }: let pname = "plexamp"; @@ -16,11 +16,7 @@ let in appimageTools.wrapType2 { inherit pname version src; - multiArch = false; # no 32bit needed - extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; - extraInstallCommands = '' - ln -s $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop install -m 444 -D ${appimageContents}/plexamp.png \ $out/share/icons/hicolor/512x512/apps/plexamp.png diff --git a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix index 6ea7b2f885..39d258c806 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix @@ -6,23 +6,23 @@ , libpulseaudio , pkg-config , stdenv -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.4.07"; + version = "6.4.12"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-r36znpkyI6/UPtOm1ZjedOadRG1BiIscRV9qRLf/A5Q="; + hash = "sha256-nriw/nP73m27QWdhC5ooTuVMul+GdOUsnVroM/CZiiY="; }; nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index c4213c06f8..975b44866e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; - version = "1.67"; + version = "1.69.2"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-fTUTXwS6A72zhKkANlSljQVvPeN5rOTyuyb8vLxYfdk="; + sha256 = "sha256-Vy8b9rbYM/bK/mCUW4V4rPeAmoBN/wn7iVBANSboL2Q="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix index c243b99f09..1fb71e05d2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix @@ -7,7 +7,7 @@ , python3 , libxml2 , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , pulseaudio , gtk3 @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { itstool python3 desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/pyradio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pyradio/default.nix index e3bf3acf98..45cec01bd6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pyradio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.3.2"; + version = "0.9.3.6"; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; rev = "refs/tags/${version}"; - hash = "sha256-aIWU68bdPUsIh8QRNnF0NcK7FemmYyUHbJg9KcUALBk="; + hash = "sha256-As4xjwJtEKlnFuBigC7nN0kAPe0+99rE9KZ0F6i7qIQ="; }; nativeBuildInputs = [ @@ -28,6 +28,12 @@ python3Packages.buildPythonApplication rec { rich ]; + postPatch = '' + # Disable update check + substituteInPlace pyradio/config \ + --replace-fail "distro = None" "distro = NixOS" + ''; + checkPhase = '' $out/bin/pyradio --help ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix index 427d9f48c1..943c5ab0b9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "qmmp"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; - hash = "sha256-knqo5yCkcO/bFmM++z+SdiWzpDKK9ooV0wqlcIKj7so="; + hash = "sha256-5qdnvGFgFEk+00tjnVhqW29AyyjCfiFQOyYyVmAjHnM="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix index 0867919ab4..97427b99e5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.6.3"; + version = "0.7.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-mTWmXHC9KkXgUIO5CIcGOoYYLx+5si/LETSmHFhmrRE="; + sha256 = "sha256-aXZsAOsdp0x7J0T9B9C1Qm2qDkhRNHRWUmPafdHRrOQ="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix index 714a66f6e2..88ec50acc6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "qsynth"; - version = "0.9.13"; + version = "0.9.90"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - hash = "sha256-SvgZrdS6BwWhNgbovcfhpQKVcu0iwr4dDqeIckuo1fk="; + hash = "sha256-5lqmoUku4/8oKxlQio1nJtMu1kn42iK8mi0K3s9y70M="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix index f7baad9c53..66d74efdcf 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix @@ -5,7 +5,7 @@ # build time , gettext , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 # runtime , adwaita-icon-theme @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gettext gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ] ++ (with python3.pkgs; [ sphinx-rtd-theme sphinxHook diff --git a/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix b/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix index 56c316dadc..c67f3f4c56 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix @@ -26,7 +26,7 @@ # Testing , gtest # Fixup -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper }: @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-/0GlQdSsIPKGrDT9CgxvaH8TpAbqxFduwL2A2+BSrEI="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 makeWrapper ]; buildInputs = [ curl diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix index d2a2170609..7adba1d0c1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.14"; + version = "7.15"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-cPxHriUNIG1EUmvOoW00V2Y0j+7BuxSIEbPy+qy5ZEM=" else { - x86_64-linux = "sha256-RgKteq157r4r088mr9wvPPa/rhmX88/lmVJ7mS17px4="; - aarch64-linux = "sha256-Qnb6ZoDIkfRct6dvqXKeYHgXyyEFLSj9R0hwa2bUiXo="; + hash = if stdenv.isDarwin then "sha256-7tWgbHIkARgsPi0buvbQb4qTqndyPwRRqut1Gj4WNZE=" else { + x86_64-linux = "sha256-O1xh+DKwPKTcQrNhWMX5ErKa1hXq0yeyt/XJMQav11c="; + aarch64-linux = "sha256-rQE8Aa+iFWpA18udCXm4JW8BPTEDeEQAupy353Sbcl8="; }.${stdenv.hostPlatform.system}; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix index 9929a32aab..0ef2bd5a6c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix @@ -27,7 +27,7 @@ , tdb , json-glib , itstool -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , gst_all_1 , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { vala glib itstool - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils gobject-introspection ]; @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Rhythmbox"; + homepage = "https://gitlab.gnome.org/GNOME/rhythmbox"; description = "A music playing application for GNOME"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix index c54726d058..042666d2e1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "roomeqwizard"; - version = "5.30.9"; + version = "5.31.1"; src = fetchurl { url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh"; - sha256 = "sha256-gyitOq/HTDruP4nY6B7y1E+pL43yRhldyiiXEjKyogU="; + sha256 = "sha256-n1Ohja6Hpg/TNoxQKF1VCDkVj0UDCefr1x5ArIsgs2A="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sfxr/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sfxr/default.nix index 552bc8ea52..6f148fae25 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sfxr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sfxr/default.nix @@ -6,7 +6,7 @@ , SDL , gtk3 , gsettings-desktop-schemas -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { SDL gtk3 gsettings-desktop-schemas - wrapGAppsHook + wrapGAppsHook3 ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix index 782a558649..d3add0f604 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/snapcast/default.nix @@ -1,32 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , alsa-lib, asio, avahi, boost179, flac, libogg, libvorbis, libopus, soxr , IOKit, AudioToolbox , aixlog, popl , pulseaudioSupport ? false, libpulseaudio , nixosTests }: -assert pulseaudioSupport -> libpulseaudio != null; - stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "sha256-dlK1xQQqst4VQjioC7MZzqXwMC+JfqtvnD5lrOqGhYI="; + sha256 = "sha256-XxpiLojs1TI3qM7yXS+OPcHKo6pLcfJ+Eop7GjQ4HQw="; }; - patches = [ - # Can be removed with next release after 0.27.0 - (fetchpatch { - name = "include-cstdint.patch"; - url = "https://github.com/badaix/snapcast/commit/481f08199ca31c60c9a3475f1064e6b06a503d12.patch"; - hash = "sha256-klpvmBpBAlBMtcgnNfW6X6vDbJFnOuOsPUDXcNf5tGc="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; # snapcast also supports building against tremor but as we have libogg, that's # not needed diff --git a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix index 6958a38f25..4cb879850b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "24.2"; + version = "24.3"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-1ngnhOpPaRGH3xmiA7cUfVDqlJM1ZC+XfeSiV8vcdls="; + sha256 = "sha256-riy8WrL6jbD4aYnFf9x5DVeYabmty0OCb53jP3iVD9I="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix index 97397da96f..b0093a8093 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonata/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, wrapGAppsHook, gettext +{ lib, fetchFromGitHub, wrapGAppsHook3, gettext , python3Packages, gnome, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let @@ -19,7 +19,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ gettext gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix index 6635cb4784..bc1c72cf74 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix @@ -26,6 +26,7 @@ , aubio , jack2 , jack-example-tools +, pipewire , supercollider-with-sc3-plugins , parallel @@ -40,13 +41,13 @@ stdenv.mkDerivation rec { pname = "sonic-pi"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "sonic-pi-net"; repo = pname; rev = "v${version}"; - hash = "sha256-s9B3OBwiUdCJyxbeQXeidv38pzmvC442Byl+llabqp0="; + hash = "sha256-JMextQY0jLShWmqRQoVAbqIzDhA1mOzI7vfsG7+jjX0="; }; mixFodDeps = beamPackages.fetchMixDeps { @@ -188,14 +189,14 @@ stdenv.mkDerivation rec { preFixup = '' # Wrap Qt GUI (distributed binary) wrapQtApp $out/bin/sonic-pi \ - --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools ]} + --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools pipewire.jack ]} # If ImGui was built if [ -e $out/app/build/gui/imgui/sonic-pi-imgui ]; then # Wrap ImGui into bin makeWrapper $out/app/build/gui/imgui/sonic-pi-imgui $out/bin/sonic-pi-imgui \ --inherit-argv0 \ - --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools ]} + --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools pipewire.jack ]} fi # Remove runtime Erlang references diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonixd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonixd/default.nix index 87ceb7b25e..e535a574ab 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonixd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonixd/default.nix @@ -16,8 +16,6 @@ appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' @@ -33,4 +31,3 @@ appimageTools.wrapType2 rec { mainProgram = "sonixd"; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix index 261de6e484..88e7a314c8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sound-juicer/default.nix @@ -16,7 +16,7 @@ , libdiscid , isocodes , gsettings-desktop-schemas -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { pkg-config itstool libxml2 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Gnome CD Ripper"; mainProgram = "sound-juicer"; - homepage = "https://wiki.gnome.org/Apps/SoundJuicer"; + homepage = "https://gitlab.gnome.org/GNOME/sound-juicer"; maintainers = [ maintainers.bdimcheff ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix index b07ed63f22..27238e36d0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl # Optional due to unfree license. , faacSupport ? false -, glib, python3Packages, gtk3, wrapGAppsHook +, glib, python3Packages, gtk3, wrapGAppsHook3 , gsettings-desktop-schemas, intltool, xvfb-run , gobject-introspection, gst_all_1, fdk-aac-encoder }: @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ intltool - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundsource/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundsource/default.nix index e211a57366..8f2d743e03 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/soundsource/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/soundsource/default.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "soundsource"; - version = "5.6.0"; + version = "5.6.3"; src = fetchurl { - url = "https://web.archive.org/web/20230707140658/https://rogueamoeba.com/soundsource/download/SoundSource.zip"; - sha256 = "1avm1jr75mjbps0fad3glshrwl42vnhc0f9sak038ny85f3apyi0"; + url = "https://web.archive.org/web/20240505002011/https://rogueamoeba.com/soundsource/download/SoundSource.zip"; + sha256 = "sha256-uXQw4MEV4hkrd7tjNCxtuXpbfmdW8bilI5ZmXwn9BLM="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spek/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spek/default.nix index bd206709c2..6bc15adf60 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "spek"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-VYt2so2k3Rk3sLSV1Tf1G2pESYiXygrKr9Koop8ChCg="; }; - nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook3 ]; buildInputs = [ ffmpeg wxGTK32 gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix index 7cf683beb9..183aae58d1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix @@ -5,7 +5,6 @@ , meson , ninja , gettext -, python3 , desktop-file-utils , cargo , rustPlatform @@ -19,23 +18,25 @@ , alsa-lib , libpulseaudio , wrapGAppsHook4 +, blueprint-compiler +, gst_all_1 }: stdenv.mkDerivation rec { pname = "spot"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "xou816"; repo = "spot"; rev = version; - hash = "sha256-K6wGWhAUUGsbE4O+z0TmJcJyGarvHgZteY527jfAa90="; + hash = "sha256-F875e/VZyN8mTfe9lgjtILNxMqn+66XoPCdaEUagHyU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-eM2XLumn4dr2YtyUzBZJADlqdexc1iOaNJUudMlfSUc="; + hash = "sha256-45Rqs2/tSWoyZVjFuygR5SxldjoqpprtOKEnMqJK+p8="; }; nativeBuildInputs = [ @@ -43,7 +44,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 # for meson postinstall script gtk4 # for gtk-update-icon-cache glib # for glib-compile-schemas desktop-file-utils @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustc wrapGAppsHook4 + blueprint-compiler ]; buildInputs = [ @@ -61,18 +62,13 @@ stdenv.mkDerivation rec { openssl alsa-lib libpulseaudio + gst_all_1.gst-plugins-base + gst_all_1.gstreamer ]; # https://github.com/xou816/spot/issues/313 mesonBuildType = "release"; - postPatch = '' - chmod +x build-aux/cargo.sh - patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py - substituteInPlace build-aux/meson/postinstall.py \ - --replace gtk-update-icon-cache gtk4-update-icon-cache - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix index e4e02f0389..e0bc35858b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix @@ -33,16 +33,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.17.2"; + version = "0.18.1"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TwMQtyg8ygFTI5DgT5rBVkZE31U4puaANIo5S8W0TXU="; + hash = "sha256-3nPESnBWaxWjWMvRG7gbXt8FzuPlx2soOonCKom+tzA="; }; - cargoHash = "sha256-RTvMywRWdZiBgNMjlUGa4jlD0HYOL3ESkVppGlsl4So="; + cargoHash = "sha256-9HroNMHvmNjGPnEO4kTDalHBXe5MH7btEwk6maLh05E="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix index 202f8b4cee..88e4e8658a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook, openssl, freetype +{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook3, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon @@ -90,7 +90,7 @@ stdenv.mkDerivation { hash = "sha512-o4iLcbNqbsxo9YJMy0SXO7Udv4CMhhBcsf53UuqWKFFWY/jKVN+Lb+dB7Jf9+UowpmbrP44w97Oi+dnbfFXYjQ=="; }; - nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ]; + nativeBuildInputs = [ wrapGAppsHook3 makeShellWrapper squashfsTools ]; dontStrip = true; dontPatchELF = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotifyd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotifyd/default.nix index 6de9493ab8..c808438964 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotifyd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotifyd/default.nix @@ -42,7 +42,7 @@ rustPackages.rustPlatform.buildRustPackage rec { homepage = "https://spotifyd.rs/"; changelog = "https://github.com/Spotifyd/spotifyd/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ anderslundstedt Br1ght0ne marsam ]; + maintainers = with maintainers; [ anderslundstedt Br1ght0ne ]; platforms = platforms.unix; mainProgram = "spotifyd"; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix index deaec9e16d..92f6932fb3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "2.0.0.1486"; + version = "2.0.0.1488"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "fd4a82e7d0e53124d9618320f3c115d90654509d"; - hash = "sha256-nR2Px7VYjAktUsueEyBAV2392+/dX6JYIy7YSMh05c0="; + rev = "0e85ddfd79337cdc30b7d29922b1d790600bb6b4"; + hash = "sha256-FGqo/c74JN000w/iRnvYUejqnYGDzHNZu9pEmR7yR3s="; }; buildInputs = [ flac libmad libvorbis mpg123 ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix index 2ce12df23d..edb572ad1b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix @@ -4,7 +4,7 @@ , gobject-introspection , gtk3 , pango -, wrapGAppsHook +, wrapGAppsHook3 , xvfb-run , chromecastSupport ? false , serverSupport ? false @@ -57,7 +57,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ python.pkgs.flit-core gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/surge-XT/default.nix b/third_party/nixpkgs/pkgs/applications/audio/surge-XT/default.nix index 63cf1110d7..08dd794275 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/surge-XT/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/surge-XT/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "surge-XT"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = "surge"; rev = "release_xt_${version}"; fetchSubmodules = true; - sha256 = "sha256-xcbZ5TC2W2PVzAkpoKPFIgW1oRGaC+ynQYot3cb5NAQ="; + sha256 = "sha256-r8CZxjmH9lfCizc95jRB4je+R/74zMqRMlGIZxxxriw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix index d9d14b9670..1daefa5e72 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.10.0"; + version = "5.11.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-+sRXpRAtbLpQlyJUhbc1Cuzh6aV8HRvYH/ja9sfvKoA="; + sha256 = "sha256-vuvL6yYF43++De5RLsMgoSpmIjfLzvq5QpRfdJTESuw="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix index bcd078eeb9..23d254efc0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.3.0.202"; + version = "1.3.1.204"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-qsjZ/oo2V6mknrMktuTP188hp57oiPxO/iwp3G57JXU="; - armv7l-linux = "sha256-33SnAYumfnZlxKms3fANt9wRJghaQHUstZbKqTxBF3Q="; - x86_64-linux = "sha256-4SE2iw45sLyapYLCd31xT/aZMTmetsjmgfWFf0FrluI="; + aarch64-linux = "sha256-uSXCgwJUEQZDKPAHDT4kKcvkBg9c+T0nrpvYW8jG8Kg="; + armv7l-linux = "sha256-dG5BF8n66YCYCZzc1pLf2qpMLmbv6lfVZYfgry25jQ0="; + x86_64-linux = "sha256-R07kTuwsfe6WhGpHeyZS/HydDUSH6AByx0pJu/i40xE="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix b/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix index 0d311adf87..785550a0a0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchzip , lib -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils , which , alsa-lib @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which xdg-utils - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = with gst_all_1; [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/tuner/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tuner/default.nix index 0f4db5af20..8262fa152b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tuner/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tuner/default.nix @@ -7,7 +7,7 @@ , vala , glib , itstool -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , libsoup , json-glib @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { vala glib itstool - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix index c086436de0..7a1ded3e2f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix @@ -24,7 +24,7 @@ , rtmidi , speexdsp , stdenv -, wrapGAppsHook +, wrapGAppsHook3 , zstd }: @@ -183,7 +183,7 @@ stdenv.mkDerivation rec { libicns makeWrapper pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ alsa-lib @@ -250,6 +250,7 @@ stdenv.mkDerivation rec { # no-derivatives clause license = with licenses; [ gpl3Plus cc-by-nc-40 unfreeRedistributable ]; maintainers = with maintainers; [ nathyong jpotier ddelabru ]; + mainProgram = "Rack"; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix index 75701682e1..ebf227d210 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { pname = "vgmplay-libvgm"; - version = "unstable-2024-01-03"; + version = "0.51.1-unstable-2024-01-03"; src = fetchFromGitHub { owner = "ValleyBell"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/vgmstream/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vgmstream/default.nix index ed8cb27b50..99802872ef 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/vgmstream/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/vgmstream/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config -, mpg123, ffmpeg, libvorbis, libao, jansson, speex +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, gtk3 +, audacious, mpg123, ffmpeg, libvorbis, libao, jansson, speex , nix-update-script +, buildAudaciousPlugin ? false # only build cli by default, pkgs.audacious-plugins sets this to enable plugin support }: stdenv.mkDerivation rec { @@ -19,16 +20,29 @@ stdenv.mkDerivation rec { extraArgs = [ "--version-regex" "r(.*)" ]; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optional buildAudaciousPlugin gtk3; - buildInputs = [ mpg123 ffmpeg libvorbis libao jansson speex ]; + buildInputs = [ + mpg123 + ffmpeg + libvorbis + libao + jansson + speex + ] ++ lib.optional buildAudaciousPlugin (audacious.override { audacious-plugins = null; }); + + preConfigure = '' + substituteInPlace cmake/dependencies/audacious.cmake \ + --replace "pkg_get_variable(AUDACIOUS_PLUGIN_DIR audacious plugin_dir)" "set(AUDACIOUS_PLUGIN_DIR \"$out/lib/audacious\")" + ''; cmakeFlags = [ - # There's no nice way to build the audacious plugin without a circular dependency - "-DBUILD_AUDACIOUS=OFF" # It always tries to download it, no option to use the system one "-DUSE_CELT=OFF" - ]; + ] ++ lib.optional (! buildAudaciousPlugin) "-DBUILD_AUDACIOUS=OFF"; meta = with lib; { description = "A library for playback of various streamed audio formats used in video games"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix b/third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix index a14d5c5a37..4bec1952e0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/virtual-ans/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "virtual-ans"; - version = "3.0.2c"; + version = "3.0.3"; src = fetchzip { url = "https://warmplace.ru/soft/ans/virtual_ans-${version}.zip"; - sha256 = "03r1v3l7rd59dakr7ndvgsqchv00ppkvi6sslgf1ng07r3rsvb1n"; + sha256 = "sha256-tqR7icgURUFOyLJ8+mS17JRf2gK53I2FW/2m8IJPtJE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix index 00f4ac9172..eeea9a73f1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/vocal/default.nix @@ -21,7 +21,7 @@ , gst_all_1 , json-glib , libgee -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ninja vala pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = with gst_all_1; [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/waylyrics/default.nix b/third_party/nixpkgs/pkgs/applications/audio/waylyrics/default.nix index fa01a22eb8..a7be3babf5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/waylyrics/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/waylyrics/default.nix @@ -9,26 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "0.2.19"; + version = "0.3.8"; src = fetchFromGitHub { - owner = "poly000"; + owner = "waylyrics"; repo = "waylyrics"; rev = "v${version}"; - hash = "sha256-y8FBZ/BvCj7CBfQlNE1Ay2nuP41WC14dfTeOJhTbHYs="; + hash = "sha256-ZOz8LkMznSX/7nSu7IpZ8kVemo2AuRLOgrS3WWg+BXU="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "ncmapi-0.1.13" = "sha256-gwFMmMzQywlsQC2GljgLwXoP2Cca0r24iEDmV0k/xG0="; - "qqmusic-rs-0.1.0" = "sha256-woLsO0n+m3EBUI+PRLio7iLp0UPQSliWK0djCSZEaZc="; - }; - }; - - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; + cargoHash = "sha256-mURcz3i98qlsn/rzZjeJncyVX5xsuqWY2/PcNA6WAWQ="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ openssl dbus ]; @@ -44,10 +34,12 @@ rustPlatform.buildRustPackage rec { install -d $WAYLYRICS_THEME_PRESETS_DIR cp -vr themes/* $WAYLYRICS_THEME_PRESETS_DIR # Install desktop entry - install -Dm644 io.poly000.waylyrics.desktop -t $out/share/applications + install -Dm644 metainfo/io.github.waylyrics.Waylyrics.desktop -t $out/share/applications # Install schema - install -Dm644 io.poly000.waylyrics.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas + install -Dm644 metainfo/io.github.waylyrics.Waylyrics.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/ + # Install metainfo + install -Dm644 metainfo/io.github.waylyrics.Waylyrics.metainfo.xml -t $out/share/metainfo # Install icons install -d $out/share/icons cp -vr res/icons/hicolor $out/share/icons/hicolor @@ -64,7 +56,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Desktop lyrics with QQ and NetEase Music source"; mainProgram = "waylyrics"; - homepage = "https://github.com/poly000/waylyrics"; + homepage = "https://github.com/waylyrics/waylyrics"; license = with licenses; [ mit cc-by-40 ]; maintainers = with maintainers; [ shadowrz aleksana ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ymuse/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ymuse/default.nix index 2c8da2f3af..19859a1d81 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ymuse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ymuse/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildGoModule -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , glib , gobject-introspection @@ -26,7 +26,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 glib gobject-introspection gdk-pixbuf diff --git a/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix index c56e2ba4c4..642ba8e3fc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "youtube-music"; - version = "3.3.5"; + version = "3.3.6"; src = fetchFromGitHub { owner = "th-ch"; repo = "youtube-music"; rev = "v${finalAttrs.version}"; - hash = "sha256-JOmcfe7xrKRaxJwj2No3e99HBYbX+ROTjHl5Frc2P9Q="; + hash = "sha256-nxpctEG4XoxW6jOAxGdgTEYr6YnhFRR8+5HUQLxRJB0="; }; pnpmDeps = stdenvNoCC.mkDerivation { @@ -47,10 +47,10 @@ stdenv.mkDerivation (finalAttrs: { dontFixup = true; outputHashMode = "recursive"; outputHash = { - x86_64-linux = "sha256-K2yJdoi+bJpz0Xf2MHlFzQXbP+H3uVE2hYfkzoB7vBE="; - aarch64-linux = "sha256-ZiA6XKPnkoAl9m2vEJth2wyDxj61Efye4cUk+76znnM="; - x86_64-darwin = "sha256-wh5Y47c5qD2PctROP9AWqLDs7H5S2/8X0zxkSMkr1xQ="; - aarch64-darwin = "sha256-e2h4bLVnSEtZcHERsfkNmawgxQHQXxgXrNlFKB+IRTw="; + x86_64-linux = "sha256-bujlQxP6Lr3qPUDxYXKyb702ZJY/xbuCsu3wVDhcb+8="; + aarch64-linux = "sha256-0kyjjttpXpFVhdza5NAjGrRn++qc/N5/u2dQl7VufLE="; + x86_64-darwin = "sha256-Q37QJt/mhfpSguOlkJGKFTCrIOrpbG3OBwaD/Bg09Us="; + aarch64-darwin = "sha256-wbfjzoGa/6vIlOOVX3bKNQ2uxzph3WSofo3MGXqA6yQ="; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/zrythm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/zrythm/default.nix index 663c159d5d..8ec6ba1a04 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/zrythm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/zrythm/default.nix @@ -1,12 +1,9 @@ { stdenv , lib , fetchFromGitHub -, fetchFromSourcehut -, fetchpatch -, SDL2 +, fetchzip , alsa-lib , appstream -, appstream-glib , bash-completion , boost , breeze-icons @@ -16,7 +13,6 @@ , curl , dbus , dconf -, faust2lv2 , fftw , fftwFloat , flex @@ -27,159 +23,140 @@ , guile , help2man , jq -, json-glib , kissfft , libadwaita -, libaudec , libbacktrace , libcyaml , libepoxy -, libgtop , libjack2 , libpanel , libpulseaudio , libsamplerate -, libsass , libsndfile -, libsoundio , libxml2 , libyaml , lilv , lv2 , meson , ninja -, pandoc -, pcre , pcre2 , pkg-config , python3 -, reproc -, rtaudio +, rtaudio_6 , rtmidi , rubberband , sassc , serd , sord , sox +, soxr , sratom , texi2html , vamp-plugin-sdk , wrapGAppsHook4 +, writeScript , xdg-utils , xxHash +, yyjson , zix , zstd }: let - # As of zrythm-1.0.0-beta.4.5.62, Zrythm needs clap - # https://github.com/falktx/carla/tree/main/source/includes/clap, which is - # only available on Carla unstable as of 2023-02-24. - carla-unstable = carla.overrideAttrs (oldAttrs: rec { + # Error: Dependency carla-host-plugin found: NO found 2.5.6 but need: '>=2.6.0' + # So we need Carla unstable + carla-unstable = carla.overrideAttrs (oldAttrs: { pname = "carla"; - version = "unstable-2023-05-12"; + version = "unstable-2024-04-26"; src = fetchFromGitHub { owner = "falkTX"; - repo = pname; - rev = "0175570f1d41285f39efe0ee32234458e0ed941c"; - hash = "sha256-yfVzZV8G4AUDM8+yS9finzobpOb1PUEPgBWFhEY4nFQ="; + repo = "carla"; + rev = "948991d7b5104280c03960925908e589c77b169a"; + hash = "sha256-uGAuKheoMfP9hZXsw29ec+58dJM8wMuowe95QutzKBY="; }; }); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zrythm"; - version = "1.0.0-beta.4.9.1"; + version = "1.0.0-rc.1"; - src = fetchFromSourcehut { - owner = "~alextee"; - repo = pname; - rev = "v${version}"; - hash = "sha256-U3IUqNbHu20uyWfkTsLOOlUZjcUL4QdHilB3srSsebw="; + src = fetchzip { + url = "https://www.zrythm.org/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-Ljbw7bjGI6js4OP9KEXCkhC9AMbInSz0nn+pROm4vXw="; }; + passthru.updateScript = writeScript "update-zrythm" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + + version="$(curl -s https://www.zrythm.org/releases/ | grep -o -m 1 'href="zrythm-[^"]*\.tar\.xz"' | head -1 | sed 's/href="zrythm-\(.*\)\.tar\.xz"/\1/')" + update-source-version zrythm "$version" + ''; + nativeBuildInputs = [ + chromaprint cmake + flex + guile help2man jq - libaudec libxml2 + lilv meson ninja - pandoc pkg-config python3 python3.pkgs.sphinx sassc + serd + sord + sratom texi2html wrapGAppsHook4 ]; buildInputs = [ - SDL2 alsa-lib appstream - appstream-glib bash-completion boost - breeze-icons carla-unstable - chromaprint curl dbus dconf - faust2lv2 fftw fftwFloat - flex glib graphviz gtk4 gtksourceview5 - guile - json-glib kissfft libadwaita libbacktrace libcyaml libepoxy - libgtop libjack2 libpanel libpulseaudio libsamplerate - libsass libsndfile - libsoundio libyaml - lilv lv2 - pcre pcre2 - reproc - rtaudio + rtaudio_6 rtmidi rubberband - serd - sord sox - sratom + soxr vamp-plugin-sdk xdg-utils xxHash + yyjson zix zstd ]; - patches = [ - # Fix gcc-13 build failure - (fetchpatch { - name = "gcc-13.patch"; - url = "https://gitlab.zrythm.org/zrythm/zrythm/-/commit/cbc2b3715b939718479631841f2d9703fb28e6da.diff"; - hash = "sha256-2ZTSaCtSO3yynJVFe5B1AEjWhjRa5YyA26ergAfdL5Y="; - }) - ]; - # Zrythm uses meson to build, but requires cmake for dependency detection. dontUseCmakeConfigure = true; @@ -197,7 +174,6 @@ stdenv.mkDerivation rec { "-Dmanpage=true" "-Drtaudio=enabled" "-Drtmidi=enabled" - "-Dsdl=enabled" # "-Duser_manual=true" # needs sphinx-intl ]; @@ -220,7 +196,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/" + --prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${finalAttrs.pname}-${finalAttrs.version}/glib-2.0/schemas/" --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${breeze-icons}/share" ) ''; @@ -228,8 +204,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zrythm.org"; description = "Automated and intuitive digital audio workstation"; - maintainers = with maintainers; [ tshaynik magnetophon yuu ]; - platforms = platforms.linux; + maintainers = with maintainers; [ tshaynik magnetophon yuu astavie PowerUser64 ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; license = licenses.agpl3Plus; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/backup/areca/fix-javah-bug.diff b/third_party/nixpkgs/pkgs/applications/backup/areca/fix-javah-bug.diff deleted file mode 100644 index 5d5feaf9b9..0000000000 --- a/third_party/nixpkgs/pkgs/applications/backup/areca/fix-javah-bug.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/build.xml b/build.xml -index 1ba08e0..9248b76 100644 ---- a/build.xml -+++ b/build.xml -@@ -56,10 +56,16 @@ - - - JNI compilation task (builds libarecafs.so ... for unix-like operating systems only) -+ - -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix index 49c5cadc89..bb5c3c0c98 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/deja-dup/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { of backing up the Right Way (encrypted, off-site, and regular) \ and uses duplicity as the backend. ''; - homepage = "https://wiki.gnome.org/Apps/DejaDup"; + homepage = "https://apps.gnome.org/DejaDup/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix b/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix index cba677e6e1..29e0950775 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix @@ -12,23 +12,25 @@ , libXcursor , libXrandr , libXi +, libxkbcommon , vulkan-loader +, wayland , gnome , libsForQt5 }: rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "mtkennerly"; - repo = pname; + repo = "ludusavi"; rev = "v${version}"; - hash = "sha256-FVM/HJpBd9G161JTaVTeWQhz4p5uDgQtohaIw1iNOJo="; + hash = "sha256-3Z/v3+3mrmPV2Rb/5tM+h6UN+MEIF/aK07B93Zn38AA="; }; - cargoHash = "sha256-5RhFyC4e4OOdnhwk4sgG6mmRVa1gLaBUA8DW5XW6E14="; + cargoHash = "sha256-bAap8eSXAPLrs5MEX1Pp6gKdp0iLxci4aX+2+ve6Wk0="; nativeBuildInputs = [ cmake @@ -49,12 +51,12 @@ rustPlatform.buildRustPackage rec { install -Dm644 assets/com.github.mtkennerly.ludusavi.metainfo.xml -t \ "$out/share/metainfo/" install -Dm644 assets/icon.png \ - "$out/share/icons/hicolor/64x64/apps/${pname}.png" + "$out/share/icons/hicolor/64x64/apps/ludusavi.png" install -Dm644 assets/icon.svg \ - "$out/share/icons/hicolor/scalable/apps/${pname}.svg" - install -Dm644 "assets/${pname}.desktop" -t "$out/share/applications/" + "$out/share/icons/hicolor/scalable/apps/ludusavi.svg" + install -Dm644 "assets/ludusavi.desktop" -t "$out/share/applications/" install -Dm644 assets/MaterialIcons-Regular.ttf -t "$out/share/fonts/TTF/" - install -Dm644 LICENSE -t "$out/share/licenses/${pname}/" + install -Dm644 LICENSE -t "$out/share/licenses/ludusavi/" ''; postFixup = @@ -68,12 +70,14 @@ rustPlatform.buildRustPackage rec { libXcursor libXrandr libXi + libxkbcommon vulkan-loader + wayland ]; in '' - patchelf --set-rpath "${libPath}" "$out/bin/$pname" - wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]} + patchelf --set-rpath "${libPath}" "$out/bin/ludusavi" + wrapProgram $out/bin/ludusavi --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]} ''; diff --git a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix index 8c225b43cc..3d919449be 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-WeFc/4TEIxw6uzLroJX1D/rEA419sghkjBt1nsPv2Ho="; + hash = "sha256-Z9vRuz5PwOhJ3DQD9zvCilgTMww7bRL4aR6fRoHIayI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-fgPgUZxye9YUyX9/+hTye3cUypgRAegZMUTKfPxVH4s="; + hash = "sha256-hcfkwxwLOUBMj6rvhI5F4OO9UaSP7CAE0JNOGlh2lVY="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/Cargo.lock b/third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/Cargo.lock index 18d7726b3c..2412f6a78d 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/Cargo.lock @@ -18,31 +18,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "aho-corasick" -version = "1.1.2" +name = "ahash" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] -name = "anyhow" -version = "1.0.75" +name = "allocator-api2" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "anyhow" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -60,23 +78,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] -name = "bindgen" -version = "0.68.1" +name = "base64" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools", "lazy_static", "lazycell", - "peeking_take_while", - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2 1.0.81", + "quote 1.0.36", "regex", "rustc-hash", "shlex", - "syn 2.0.39", + "syn 2.0.60", "which", ] @@ -88,30 +112,40 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -130,10 +164,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "clang-sys" -version = "1.6.1" +name = "chumsky" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" +dependencies = [ + "hashbrown", + "stacker", +] + +[[package]] +name = "clang-sys" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -152,14 +196,79 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.3.2" +name = "const_format" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +dependencies = [ + "proc-macro2 1.0.81", + "quote 1.0.36", + "unicode-xid 0.2.4", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + [[package]] name = "dirs-next" version = "2.0.0" @@ -183,9 +292,25 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + +[[package]] +name = "email-encoding" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f" +dependencies = [ + "base64 0.22.1", + "memchr", +] + +[[package]] +name = "email_address" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112" [[package]] name = "endian-type" @@ -214,9 +339,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -251,6 +376,12 @@ dependencies = [ "str-buf", ] +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + [[package]] name = "fd-lock" version = "3.0.13" @@ -264,21 +395,21 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -316,9 +447,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -331,9 +462,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -341,15 +472,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -358,38 +489,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -404,10 +535,20 @@ dependencies = [ ] [[package]] -name = "getrandom" -version = "0.2.11" +name = "generic-array" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", @@ -428,9 +569,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.22" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -446,16 +587,34 @@ dependencies = [ ] [[package]] -name = "hashbrown" -version = "0.14.3" +name = "handlebars" +version = "3.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3" +dependencies = [ + "log", + "pest", + "pest_derive", + "quick-error", + "serde", + "serde_json", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -468,18 +627,29 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "hostname" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if", + "libc", + "windows", ] [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -488,9 +658,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -517,9 +687,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -532,7 +702,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -551,9 +721,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -561,35 +731,44 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", - "windows-sys 0.48.0", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -607,30 +786,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "libc" -version = "0.2.150" +name = "lettre" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "1a62049a808f1c4e2356a2a380bd5f2aca3b011b0b482cf3b914ba1731426969" +dependencies = [ + "base64 0.22.1", + "chumsky", + "email-encoding", + "email_address", + "fastrand", + "futures-util", + "hostname", + "httpdate", + "idna", + "mime", + "native-tls", + "nom", + "percent-encoding", + "quoted_printable", + "socket2", + "tokio", + "url", +] + +[[package]] +name = "libc" +version = "0.2.154" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.5", ] [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", - "redox_syscall 0.4.1", ] [[package]] @@ -645,21 +848,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" @@ -679,6 +882,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -687,24 +896,42 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", "windows-sys 0.48.0", ] +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "nibble_vec" version = "0.1.0" @@ -762,26 +989,26 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -796,16 +1023,22 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] -name = "openssl-sys" -version = "0.9.96" +name = "openssl-probe" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -826,6 +1059,7 @@ name = "pbs-api-types" version = "0.1.0" dependencies = [ "anyhow", + "const_format", "hex", "lazy_static", "percent-encoding", @@ -843,7 +1077,7 @@ dependencies = [ [[package]] name = "pbs-buildcfg" -version = "3.1.2" +version = "3.2.2" [[package]] name = "pbs-client" @@ -897,7 +1131,7 @@ name = "pbs-config" version = "0.1.0" dependencies = [ "anyhow", - "hex", + "const_format", "lazy_static", "libc", "nix 0.26.4", @@ -905,6 +1139,7 @@ dependencies = [ "openssl", "pbs-api-types", "pbs-buildcfg", + "proxmox-notify", "proxmox-router", "proxmox-schema", "proxmox-section-config", @@ -921,7 +1156,7 @@ name = "pbs-datastore" version = "0.1.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "crc32fast", "endian_trait", "futures", @@ -1016,6 +1251,7 @@ dependencies = [ "libc", "log", "nix 0.26.4", + "openssl", "pbs-api-types", "pbs-config", "proxmox-io", @@ -1037,7 +1273,7 @@ name = "pbs-tools" version = "0.1.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "bytes", "crc32fast", "endian_trait", @@ -1067,12 +1303,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "percent-encoding" version = "2.3.1" @@ -1080,10 +1310,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] -name = "pin-project-lite" -version = "0.2.13" +name = "pest" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", +] + +[[package]] +name = "pest_meta" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1093,9 +1368,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "proc-macro2" @@ -1103,26 +1378,26 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd07deb3c6d1d9ff827999c7f9b04cdfd66b1b17ae508e14fe47b620f2282ae0" dependencies = [ - "unicode-xid", + "unicode-xid 0.1.0", ] [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] [[package]] name = "proxmox-api-macro" -version = "1.0.6" +version = "1.0.8" dependencies = [ "anyhow", - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -1140,9 +1415,10 @@ dependencies = [ [[package]] name = "proxmox-auth-api" -version = "0.3.2" +version = "0.3.5" dependencies = [ "anyhow", + "const_format", "lazy_static", "proxmox-schema", "regex", @@ -1152,7 +1428,7 @@ dependencies = [ [[package]] name = "proxmox-backup" -version = "3.1.2" +version = "3.2.2" [[package]] name = "proxmox-backup-banner" @@ -1228,9 +1504,10 @@ dependencies = [ [[package]] name = "proxmox-fuse" -version = "0.1.4" +version = "0.1.7" dependencies = [ "anyhow", + "cc", "futures", "libc", "tokio", @@ -1239,10 +1516,10 @@ dependencies = [ [[package]] name = "proxmox-http" -version = "0.9.0" +version = "0.9.1" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "futures", "http", "hyper", @@ -1253,6 +1530,7 @@ dependencies = [ "serde_json", "tokio", "tokio-openssl", + "ureq", "url", ] @@ -1267,7 +1545,7 @@ dependencies = [ [[package]] name = "proxmox-human-byte" -version = "0.1.2" +version = "0.1.3" dependencies = [ "anyhow", "proxmox-schema", @@ -1287,9 +1565,33 @@ dependencies = [ name = "proxmox-lang" version = "1.1.0" +[[package]] +name = "proxmox-notify" +version = "0.4.0" +dependencies = [ + "anyhow", + "const_format", + "handlebars", + "lettre", + "log", + "openssl", + "proxmox-http", + "proxmox-http-error", + "proxmox-human-byte", + "proxmox-schema", + "proxmox-section-config", + "proxmox-serde", + "proxmox-sys", + "proxmox-time", + "proxmox-uuid", + "regex", + "serde", + "serde_json", +] + [[package]] name = "proxmox-router" -version = "2.1.1" +version = "2.1.3" dependencies = [ "anyhow", "env_logger", @@ -1311,9 +1613,10 @@ dependencies = [ [[package]] name = "proxmox-schema" -version = "2.0.2" +version = "3.1.0" dependencies = [ "anyhow", + "const_format", "lazy_static", "proxmox-api-macro", "regex", @@ -1324,7 +1627,7 @@ dependencies = [ [[package]] name = "proxmox-section-config" -version = "2.0.0" +version = "2.0.1" dependencies = [ "anyhow", "hex", @@ -1339,7 +1642,7 @@ name = "proxmox-serde" version = "0.1.1" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "proxmox-time", "serde", "serde_json", @@ -1359,17 +1662,17 @@ dependencies = [ name = "proxmox-sortable-macro" version = "0.1.3" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] name = "proxmox-sys" -version = "0.5.2" +version = "0.5.3" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "lazy_static", "libc", "log", @@ -1384,7 +1687,7 @@ dependencies = [ [[package]] name = "proxmox-time" -version = "1.1.5" +version = "1.1.6" dependencies = [ "anyhow", "bitflags 1.3.2", @@ -1403,6 +1706,15 @@ dependencies = [ "serde", ] +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + [[package]] name = "pxar" version = "0.10.2" @@ -1435,6 +1747,12 @@ dependencies = [ "tokio", ] +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quote" version = "0.4.2" @@ -1446,13 +1764,19 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.81", ] +[[package]] +name = "quoted_printable" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" + [[package]] name = "radix_trie" version = "0.2.1" @@ -1463,15 +1787,6 @@ dependencies = [ "nibble_vec", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -1483,9 +1798,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -1494,9 +1809,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -1506,9 +1821,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -1517,9 +1832,24 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] [[package]] name = "rustc-demangle" @@ -1535,17 +1865,71 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.26" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", "windows-sys 0.52.0", ] +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" + +[[package]] +name = "rustls-webpki" +version = "0.102.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustyline" version = "9.1.2" @@ -1572,9 +1956,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -1585,6 +1969,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -1592,30 +1985,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "serde" -version = "1.0.193" +name = "security-framework" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.200" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -1632,16 +2048,27 @@ dependencies = [ ] [[package]] -name = "shlex" -version = "1.2.0" +name = "sha2" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -1663,9 +2090,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smawk" @@ -1675,22 +2102,31 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] -name = "socket2" -version = "0.5.5" +name = "spin" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" dependencies = [ + "cc", + "cfg-if", "libc", - "windows-sys 0.48.0", + "psm", + "winapi", ] [[package]] @@ -1699,6 +2135,12 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + [[package]] name = "syn" version = "0.12.15" @@ -1707,17 +2149,17 @@ checksum = "c97c05b8ebc34ddd6b967994d5c6e9852fa92f8b82b3858c39451f97346dcce5" dependencies = [ "proc-macro2 0.2.3", "quote 0.4.2", - "unicode-xid", + "unicode-xid 0.1.0", ] [[package]] name = "syn" -version = "2.0.39" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", + "proc-macro2 1.0.81", + "quote 1.0.36", "unicode-ident", ] @@ -1733,19 +2175,31 @@ dependencies = [ ] [[package]] -name = "termcolor" -version = "1.4.0" +name = "tempfile" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "smawk", "unicode-linebreak", @@ -1754,22 +2208,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -1789,9 +2243,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -1800,7 +2254,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -1811,16 +2265,16 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] name = "tokio-openssl" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" +checksum = "6ffab79df67727f6acf57f1ff743091873c24c579b1e2ce4d8f53e47ded4d63d" dependencies = [ "futures-util", "openssl", @@ -1830,9 +2284,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -1880,9 +2334,21 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "udev" @@ -1896,9 +2362,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -1914,24 +2380,24 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode-xid" @@ -1939,6 +2405,36 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-pki-types", + "rustls-webpki", + "url", + "webpki-roots", +] + [[package]] name = "url" version = "2.5.0" @@ -1963,10 +2459,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] -name = "walkdir" -version = "2.4.0" +name = "version_check" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -1989,9 +2491,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1999,47 +2501,56 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.33", + "quote 1.0.36", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "which" @@ -2071,11 +2582,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -2084,6 +2595,25 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -2099,7 +2629,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -2119,17 +2649,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -2140,9 +2671,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2152,9 +2683,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -2164,9 +2695,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -2176,9 +2713,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -2188,9 +2725,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -2200,9 +2737,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -2212,17 +2749,19 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] @@ -2231,6 +2770,32 @@ version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + [[package]] name = "zstd" version = "0.12.4" @@ -2252,9 +2817,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "bindgen", "cc", @@ -2262,21 +2827,17 @@ dependencies = [ ] [[patch.unused]] -name = "proxmox-ldap" -version = "0.2.1" - -[[patch.unused]] -name = "proxmox-metrics" -version = "0.3.0" +name = "proxmox-apt" +version = "0.10.9" [[patch.unused]] name = "proxmox-rest-server" -version = "0.5.1" +version = "0.5.2" [[patch.unused]] name = "proxmox-subscription" -version = "0.4.2" +version = "0.4.3" [[patch.unused]] name = "proxmox-tfa" -version = "4.1.0" +version = "4.1.2" diff --git a/third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/default.nix b/third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/default.nix index e074c131e3..41060b7251 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/proxmox-backup-client/default.nix @@ -2,6 +2,7 @@ , fetchgit , rustPlatform , pkg-config +, pkgconf , openssl , fuse3 , libuuid @@ -18,36 +19,36 @@ let pname = "proxmox-backup-client"; - version = "3.1.2"; + version = "3.2.2"; proxmox-backup_src = fetchgit { url = "git://git.proxmox.com/git/proxmox-backup.git"; rev = "v${version}"; name = "proxmox-backup"; - hash = "sha256-G4wadZelQHlveVhuOpu0FjLvfegoimoxlw3Fe8DhsQA="; + hash = "sha256-9rzUGaUoc87VkB4XJUwI0BjuvxdemE6fjTIR7VRp55Y="; }; # Same revision as used in # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=proxmox-backup-client proxmox_src = fetchgit { url = "git://git.proxmox.com/git/proxmox.git"; - rev = "50b79198f83659e77b810fe0eedaa79b140744db"; + rev = "863d7603403405ccbf8e841b875bf3c9a7a76116"; name = "proxmox"; - hash = "sha256-ffkOXGqe0xjvvhouzemcQ8qNdmJx70x10ny2uhYAYaI="; + hash = "sha256-aSBT0TGhmM7QDux4gDY1k4HQhAMNWvxX+IVIsq6KeuM="; }; proxmox-fuse_src = fetchgit { url = "git://git.proxmox.com/git/proxmox-fuse.git"; - rev = "93099f76b6bbbc8a0bbaca9b459a1ce4dc5e0a79"; + rev = "6faec3a52fcdb0df3ca13fee2977683824d62d01"; # 0.1.7-1 name = "proxmox-fuse"; - hash = "sha256-3l0lAZVFQC0MYaqZvB+S+ihb1fTkEgs5i9q463+cbvQ="; + hash = "sha256-FwkZ5L7gJr9xZTQkdVHmOP8vnzf+To5Wz2SbIEzGUOY="; }; proxmox-pxar_src = fetchgit { url = "git://git.proxmox.com/git/pxar.git"; - rev = "fab647085426dc39c25c137575a3b8fc575c4b78"; + rev = "675ecff32fbeff0973eaea016c4b8f3877015adb"; name = "pxar"; - hash = "sha256-tedQDQUFSGUZCChGcRRJsh7lIozfispLCLeX1OuUc4k="; + hash = "sha256-P5fblRCFq7NI1UkP/jkg38bamM1yuJYX+YhCKPgS15Y="; }; proxmox-pathpatterns_src = fetchgit { @@ -57,6 +58,7 @@ let hash = "sha256-717XSlvQdvP0Q516fEx04rsrLCk3QI8frTD5NMmkSr4="; }; + aurPatchCommit = "12c04aa14ee09cb3dafcbe193da9d36a6809695d"; in rustPlatform.buildRustPackage { @@ -80,15 +82,15 @@ rustPlatform.buildRustPackage { # works in combination with the other three repos being checked out. (fetchpatch { name = "0001-re-route-dependencies-not-available-on-crates.io-to-.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-re-route-dependencies-not-available-on-crates.io-to-.patch?h=proxmox-backup-client&id=33ef762d3b3a8a0300117efada8d957f6d0cfa07"; - hash = "sha256-hBct1NVFum7WG0sgdE7DdvjfnC6KPlLG9r4syxgYKWA="; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-re-route-dependencies-not-available-on-crates.io-to-.patch?h=proxmox-backup-client&id=${aurPatchCommit}"; + hash = "sha256-YOlC8A1FKIbNY9+q6n/gDV0efHx2i3kwsmIdZcYhf80="; }) # This patch prevents the generation of the man-pages for other components inside the repo, # which would require them too be built too. Thus avoid wasting resources and just skip them. (fetchpatch { name = "0002-docs-drop-all-but-client-man-pages.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-docs-drop-all-but-client-man-pages.patch?h=proxmox-backup-client&id=33ef762d3b3a8a0300117efada8d957f6d0cfa07"; - hash = "sha256-DvWm18udvOpcma0V3JY06Lhn+h0BDPhNqrNOyrgpvWk="; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-docs-drop-all-but-client-man-pages.patch?h=proxmox-backup-client&id=${aurPatchCommit}"; + hash = "sha256-vUGDBx+g05ipL+boY9DaWDAMmstY1IDZs5nILbCIBLY="; }) # `make docs` assumes that the binaries are located under `target/{debug,release}`, but due # to how `buildRustPackage` works, they get put under `target/$RUSTC_TARGET/{debug,release}`. @@ -135,7 +137,7 @@ rustPlatform.buildRustPackage { doCheck = false; - nativeBuildInputs = [ git pkg-config rustPlatform.bindgenHook installShellFiles sphinx ]; + nativeBuildInputs = [ git pkg-config pkgconf rustPlatform.bindgenHook installShellFiles sphinx ]; buildInputs = [ openssl fuse3 libuuid acl libxcrypt ]; passthru.tests.version = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/applications/backup/timeshift/wrapper.nix b/third_party/nixpkgs/pkgs/applications/backup/timeshift/wrapper.nix index e72052fda1..84b3f14ac2 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/timeshift/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/timeshift/wrapper.nix @@ -1,6 +1,6 @@ { stdenvNoCC , lib -, wrapGAppsHook +, wrapGAppsHook3 , gdk-pixbuf , librsvg , xorg @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ xorg.lndir - wrapGAppsHook + wrapGAppsHook3 ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix index 427576b688..948645d600 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -25,13 +25,13 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.29.1"; + version = "0.29.3"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - hash = "sha256-QEuOMl1sbVdB2nRwBO/2adqj/NIQGbwrBqML39fymM0="; + hash = "sha256-hYA0O7nDT8J1EnpW4i1+eBzkNw77JC6M7GwO3BdBh3U="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-knots/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-knots/default.nix index ace8329bb8..181c14ecd7 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = if withGui then "bitcoin-knots" else "bitcoind-knots"; - version = "25.1.knots20231115"; + version = "26.1.knots20240325"; src = fetchurl { - url = "https://bitcoinknots.org/files/25.x/${version}/bitcoin-${version}.tar.gz"; - sha256 = "b6251beee95cf6701c6ebc443b47fb0e99884880f2661397f964a8828add4002"; + url = "https://bitcoinknots.org/files/26.x/${version}/bitcoin-${version}.tar.gz"; + hash = "sha256-PqpePDna2gpCzF2K43N4h6cV5Y9w/e5ZcUvaNEaFaIk="; }; nativeBuildInputs = @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withWallet [ sqlite ] + ++ lib.optionals (withWallet && !stdenv.isDarwin) [ db48 ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix index 0a2ea1937a..7385d4bd9c 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix @@ -51,7 +51,9 @@ stdenv.mkDerivation rec { ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withWallet [ sqlite ] + # building with db48 (for legacy descriptor wallet support) is broken on Darwin + ++ lib.optionals (withWallet && !stdenv.isDarwin) [ db48 ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcdeb/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcdeb/default.nix index 7c5f803a96..9e7c0f26c6 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcdeb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcdeb/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "btcdeb"; - version = "0.3.20-unstable-2024-03-26"; + version = "0.3.20-unstable-2024-04-09"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "btcdeb"; - rev = "675b7820f0eec8a76f68ade7ea35974a561d49dd"; - hash = "sha256-J9E0edRbFONMut1/ZFaUqgWAtEUifc+pmGypeUQ0m4c="; + rev = "e2c2e7b9fe2ecc0884129b53813a733f93a6e2c7"; + hash = "sha256-heV5VByNZ/2doGVtYhGEei4fV4847UPVgOyU0PDDHc8="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clboss/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/clboss/default.nix index 0cad0ed2ae..da6e5b41aa 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/clboss/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/clboss/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "clboss"; - version = "0.13"; + version = "0.13.1"; src = fetchFromGitHub { owner = "ZmnSCPxj"; repo = "clboss"; rev = "v${version}"; - hash = "sha256-NP9blymdqDXo/OtGLQg/MXK24PpPvCrzqXRdtfCvpfI="; + hash = "sha256-DQvcf+y73QQYQanEvbOCOgwQzvNOXS1ZY+hVvS6N+G0="; }; nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config libev curlWithGnuTls sqlite ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/crypto-org-wallet/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/crypto-org-wallet/default.nix index 1460d87d93..6132fd9af3 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/crypto-org-wallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/crypto-org-wallet/default.nix @@ -3,19 +3,17 @@ let pname = "chain-desktop-wallet"; version = "0.1.1"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/crypto-com/${pname}/releases/download/v${version}/${name}-x86_64.AppImage"; + url = "https://github.com/crypto-com/${pname}/releases/download/v${version}/${pname}-${version}-x86_64.AppImage"; sha256 = "12076hf8dlz0hg1pb2ixwlslrh8gi6s1iawnvhnn6vz4jmjvq356"; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop ${imagemagick}/bin/convert ${appimageContents}/${pname}.png -resize 512x512 ${pname}_512.png install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix index d1e389dc61..b4e737fa78 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix @@ -25,15 +25,15 @@ , mesa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "exodus"; - version = "24.13.3"; + version = "24.19.3"; src = fetchurl { - name = "exodus-linux-x64-${version}.zip"; - url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; + name = "exodus-linux-x64-${finalAttrs.version}.zip"; + url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip"; curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; - sha256 = "sha256-hhPHWo+nQXgluB6qn57wndX1eslLv3lLpdxm+COGMO8="; + hash = "sha256-zqi1En22H3b2pD95C747gF9TtyMCX4TzXC10mP7iUoM="; }; nativeBuildInputs = [ unzip ]; @@ -104,4 +104,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ mmahut rople380 Crafter ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix index f866ff3ea9..6c39d9d212 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix @@ -16,7 +16,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - ln -s $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/frame.desktop $out/share/applications/frame.desktop install -m 444 -D ${appimageContents}/frame.png \ $out/share/icons/hicolor/512x512/apps/frame.png diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix index 78389b28c9..4e6e685316 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix @@ -14,7 +14,6 @@ , miniupnpc , zeromq , zlib -, db53 , sqlite , qrencode , qtbase ? null @@ -33,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = if withGui then "groestlcoin" else "groestlcoind"; - version = "26.0"; + version = "27.0"; src = fetchFromGitHub { owner = "Groestlcoin"; repo = "groestlcoin"; rev = "v${version}"; - sha256 = "00qvaf53jszsk1rr029zmq60v8w0r92192ab65k2krkmh7ybla9l"; + sha256 = "0f6vi2k5xvjrhiazfjcd4aj246dfcg51xsnqb9wdjl41cg0ckwmf"; }; nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] @@ -49,7 +48,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ lib.optionals withWallet [ db53 sqlite ] + ++ lib.optionals withWallet [ sqlite ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d2e9094afa..e995804fad 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -1,12 +1,12 @@ -{ lib, fetchurl, appimageTools, imagemagick }: +{ lib, fetchurl, appimageTools, makeWrapper, imagemagick }: let pname = "ledger-live-desktop"; - version = "2.77.2"; + version = "2.79.1"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-orIyfRs6TJgqGGLpl2tvoUtejsB0ni8xRK0SboP2LHw="; + hash = "sha256-zgs4uIK73CBp4hTbuO8LdcgvmUN3hYsnv61E+WGlpjg="; }; appimageContents = appimageTools.extractType2 { @@ -17,12 +17,15 @@ appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram "$out/bin/${pname}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + substituteInPlace $out/share/applications/ledger-live-desktop.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix index 73bd7f3afc..d4eef345eb 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix @@ -1,35 +1,26 @@ { buildGoModule , fetchFromGitHub , lib +, go , tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" "kvdb_postgres" "kvdb_etcd" ] }: buildGoModule rec { pname = "lnd"; - version = "0.17.4-beta"; + version = "0.17.5-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - hash = "sha256-O6cGK4UMKrZpYqtghjjqqLBStLG5GEi/Q5liR557I8s="; + hash = "sha256-q/mzF6LPW/ThgqfGgjtax8GvoC3JEpg0IetfSTo1XYk="; }; - vendorHash = "sha256-eaQmM5bfsUmzTiUALX543VBQRJK+TqW2i28npwSrn3Q="; + vendorHash = "sha256-unT0zJrOEmKHpoUsrBHKfn5IziGlaqEtMfkeo/74Rfc="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; - preBuild = let - buildVars = { - RawTags = lib.concatStringsSep "," tags; - GoVersion = "$(go version | egrep -o 'go[0-9]+[.][^ ]*')"; - }; - buildVarsFlags = lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "-X github.com/lightningnetwork/lnd/build.${k}=${v}") buildVars); - in - lib.optionalString (tags != []) '' - buildFlagsArray+=("-tags=${lib.concatStringsSep " " tags}") - buildFlagsArray+=("-ldflags=${buildVarsFlags}") - ''; + inherit tags; meta = with lib; { description = "Lightning Network Daemon"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix index acdcd108c6..84b1b55f66 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix @@ -1,16 +1,31 @@ -{ stdenv, lib, fetchFromGitHub }: +{ + stdenv, + lib, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "miniscript"; - version = "unstable-2022-07-19"; + version = "unstable-2023-03-16"; src = fetchFromGitHub { owner = "sipa"; repo = pname; - rev = "ca675488c4aa9605f6ae70c0e68a148a6fb277b4"; - sha256 = "sha256-kzLIJ0os6UnC0RPEybfw6wGrZpgmRCgj3zifmZjieoU="; + rev = "6806dfb15a1fafabf7dd28aae3c9d2bc49db01f1"; + sha256 = "sha256-qkYDzsl2Y4WEDDXs9cE/jIXm01jclkYUQbDGe1S0wYs="; }; + postPatch = lib.optionalString stdenv.isDarwin '' + # Replace hardcoded g++ with c++ so clang can be used + # on darwin + # + # lto must be disabled on darwin as well due to + # https://github.com/NixOS/nixpkgs/issues/19098 + substituteInPlace Makefile \ + --replace-fail 'g++' 'c++' \ + --replace-fail '-flto' "" + ''; + installPhase = '' runHook preInstall mkdir -p $out/bin @@ -19,12 +34,14 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Compiler and inspector for the miniscript Bitcoin policy language"; + description = "Compiler and inspector for the miniscript Bitcoin policy language"; longDescription = "Miniscript is a language for writing (a subset of) Bitcoin Scripts in a structured way, enabling analysis, composition, generic signing and more."; - homepage = "https://bitcoin.sipa.be/miniscript/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ RaghavSood jb55 ]; + homepage = "https://bitcoin.sipa.be/miniscript/"; + license = licenses.mit; + maintainers = with maintainers; [ + RaghavSood + jb55 + ]; mainProgram = "miniscript"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix index fada1835bf..0e4de3af6b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix @@ -1,11 +1,9 @@ -{ lib, appimageTools, fetchurl, makeDesktopItem -}: +{ lib, appimageTools, fetchurl, makeDesktopItem }: let pname = "MyCrypto"; version = "1.7.17"; sha256 = "20eb48989b5ae5e60e438eff6830ac79a0d89ac26dff058097260e747e866444"; # Taken from release's checksums.txt.gpg - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/mycryptohq/mycrypto/releases/download/${version}/linux-x86-64_${version}_MyCrypto.AppImage"; @@ -13,7 +11,7 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; desktopItem = makeDesktopItem { @@ -25,15 +23,10 @@ let categories = [ "Finance" ]; }; -in appimageTools.wrapType2 rec { - inherit name src; - - multiArch = false; # no p32bit needed - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; +in appimageTools.wrapType2 { + inherit pname version src; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} - mkdir -p $out/share cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons chmod -R +w $out/share diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/Cargo.lock b/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/Cargo.lock deleted file mode 100644 index 5f88af6338..0000000000 --- a/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/Cargo.lock +++ /dev/null @@ -1,5476 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "aes" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54eb1d8fe354e5fc611daf4f2ea97dd45a765f4f1e4512306ec183ae2e8f20c9" -dependencies = [ - "aes-soft", - "aesni", - "block-cipher-trait", -] - -[[package]] -name = "aes-ctr" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee" -dependencies = [ - "aes-soft", - "aesni", - "ctr", - "stream-cipher", -] - -[[package]] -name = "aes-soft" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" -dependencies = [ - "block-cipher-trait", - "byteorder", - "opaque-debug", -] - -[[package]] -name = "aesni" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" -dependencies = [ - "block-cipher-trait", - "opaque-debug", - "stream-cipher", -] - -[[package]] -name = "ahash" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29661b60bec623f0586702976ff4d0c9942dcb6723161c2df0eea78455cfedfb" -dependencies = [ - "const-random", -] - -[[package]] -name = "ahash" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" - -[[package]] -name = "aho-corasick" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455" - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.8", -] - -[[package]] -name = "app_dirs" -version = "1.2.1" -source = "git+https://github.com/openethereum/app-dirs-rs#0b37f9481ce29e9d5174ad185bca695b206368eb" -dependencies = [ - "ole32-sys", - "shell32-sys", - "winapi 0.2.8", - "xdg", -] - -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] - -[[package]] -name = "arrayvec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" - -[[package]] -name = "assert_matches" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5" - -[[package]] -name = "atty" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" -dependencies = [ - "libc", - "winapi 0.3.8", -] - -[[package]] -name = "autocfg" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" - -[[package]] -name = "autocfg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" - -[[package]] -name = "backtrace" -version = "0.3.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" -dependencies = [ - "addr2line", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -dependencies = [ - "byteorder", - "safemem", -] - -[[package]] -name = "base64" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -dependencies = [ - "byteorder", -] - -[[package]] -name = "beef" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed554bd50246729a1ec158d08aa3235d1b69d94ad120ebe187e28894787e736" - -[[package]] -name = "bit-set" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bf6104718e80d7b26a68fdbacff3481cfc05df670821affc7e9cbc1884400c" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f" - -[[package]] -name = "bitflags" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "bitvec" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" -dependencies = [ - "either", - "radium", -] - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array", -] - -[[package]] -name = "block-cipher-trait" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-modes" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31aa8410095e39fdb732909fb5730a48d5bd7c2e3cd76bd1b07b3dbea130c529" -dependencies = [ - "block-cipher-trait", - "block-padding", -] - -[[package]] -name = "block-padding" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "blooms-db" -version = "0.1.0" -dependencies = [ - "byteorder", - "criterion 0.3.0", - "ethbloom 0.9.2", - "parking_lot 0.11.1", - "tempdir", - "tiny-keccak 1.5.0", -] - -[[package]] -name = "bn" -version = "0.4.4" -source = "git+https://github.com/paritytech/bn#6079255e65793038b9a6e5292203eab482737cc2" -dependencies = [ - "byteorder", - "crunchy 0.2.2", - "lazy_static", - "rand 0.5.6", - "rustc-hex 2.1.0", -] - -[[package]] -name = "bstr" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "build_const" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" - -[[package]] -name = "byte-slice-cast" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" - -[[package]] -name = "bytes" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "either", - "iovec", -] - -[[package]] -name = "c2-chacha" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -dependencies = [ - "ppv-lite86", -] - -[[package]] -name = "cast" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" - -[[package]] -name = "cc" -version = "1.0.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chainspec" -version = "0.1.0" -dependencies = [ - "ethjson", - "serde_json", -] - -[[package]] -name = "chrono" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" -dependencies = [ - "libc", - "num-integer", - "num-traits 0.2.8", - "time", -] - -[[package]] -name = "clap" -version = "2.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -dependencies = [ - "ansi_term 0.11.0", - "atty", - "bitflags 1.2.1", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] -name = "cli-signer" -version = "1.4.0" -dependencies = [ - "ethereum-types 0.9.2", - "futures", - "parity-rpc", - "parity-rpc-client", - "rpassword", -] - -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags 1.2.1", -] - -[[package]] -name = "cmake" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fb25b677f8bf1eb325017cb6bb8452f87969db0fedb4f757b297bee78a7c62" -dependencies = [ - "cc", -] - -[[package]] -name = "common-types" -version = "0.1.0" -dependencies = [ - "ethereum-types 0.9.2", - "ethkey", - "hex", - "inflate", - "keccak-hash", - "parity-bytes", - "parity-crypto", - "parity-util-mem", - "rlp", - "rlp_derive", - "rustc-hex 1.0.0", - "serde", - "serde_json", - "serde_repr", - "unexpected", -] - -[[package]] -name = "const-random" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" -dependencies = [ - "getrandom 0.2.2", - "lazy_static", - "proc-macro-hack", - "tiny-keccak 2.0.2", -] - -[[package]] -name = "crc" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" -dependencies = [ - "build_const", -] - -[[package]] -name = "criterion" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0363053954f3e679645fc443321ca128b7b950a6fe288cf5f9335cc22ee58394" -dependencies = [ - "atty", - "cast", - "clap", - "criterion-plot 0.3.1", - "csv", - "itertools 0.8.1", - "lazy_static", - "libc", - "num-traits 0.2.8", - "rand_core 0.3.1", - "rand_os 0.1.3", - "rand_xoshiro 0.1.0", - "rayon", - "rayon-core", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938703e165481c8d612ea3479ac8342e5615185db37765162e762ec3523e2fc6" -dependencies = [ - "atty", - "cast", - "clap", - "criterion-plot 0.4.0", - "csv", - "itertools 0.8.1", - "lazy_static", - "num-traits 0.2.8", - "rand_core 0.5.1", - "rand_os 0.2.2", - "rand_xoshiro 0.3.1", - "rayon", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f9212ddf2f4a9eb2d401635190600656a1f88a932ef53d06e7fa4c7e02fb8e" -dependencies = [ - "byteorder", - "cast", - "itertools 0.8.1", -] - -[[package]] -name = "criterion-plot" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eccdc6ce8bbe352ca89025bee672aa6d24f4eb8c53e3a8b5d1bc58011da072a2" -dependencies = [ - "cast", - "itertools 0.8.1", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.6", -] - -[[package]] -name = "crossbeam-deque" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils 0.6.6", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils 0.6.6", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" -dependencies = [ - "arrayvec 0.4.12", - "cfg-if 0.1.10", - "crossbeam-utils 0.6.6", - "lazy_static", - "memoffset", - "scopeguard 1.1.0", -] - -[[package]] -name = "crossbeam-queue" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" -dependencies = [ - "crossbeam-utils 0.6.6", -] - -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-utils" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" -dependencies = [ - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg 1.0.0", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" -dependencies = [ - "cfg-if 1.0.0", - "lazy_static", -] - -[[package]] -name = "crunchy" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f4a431c5c9f662e1200b7c7f02c34e91361150e382089a8f2dec3ba680cbda" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-mac" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" -dependencies = [ - "generic-array", - "subtle 1.0.0", -] - -[[package]] -name = "csv" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d" -dependencies = [ - "bstr", - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c" -dependencies = [ - "memchr", -] - -[[package]] -name = "ct-logs" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b4660f8b07a560a88c02d76286edb9f0d5d64e495d2b0f233186155aa51be1f" -dependencies = [ - "sct", -] - -[[package]] -name = "ctr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736" -dependencies = [ - "block-cipher-trait", - "stream-cipher", -] - -[[package]] -name = "ctrlc" -version = "1.1.1" -source = "git+https://github.com/paritytech/rust-ctrlc.git#b523017108bb2d571a7a69bd97bc406e63bc7a9d" -dependencies = [ - "kernel32-sys", - "libc", - "winapi 0.2.8", -] - -[[package]] -name = "derive_more" -version = "0.99.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298998b1cf6b5b2c8a7b023dfd45821825ce3ba8a8af55c921a0e734e4653f76" -dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.7", - "syn 1.0.86", -] - -[[package]] -name = "difference" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8" - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "dir" -version = "0.1.2" -dependencies = [ - "app_dirs", - "ethereum-types 0.9.2", - "home 0.3.4", - "journaldb", -] - -[[package]] -name = "docopt" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" -dependencies = [ - "lazy_static", - "regex 1.3.9", - "serde", - "strsim 0.9.2", -] - -[[package]] -name = "edit-distance" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbaaaf38131deb9ca518a274a45bfdb8771f139517b073b16c2d3d32ae5037b" - -[[package]] -name = "eip-152" -version = "0.1.0" -dependencies = [ - "rustc-hex 2.1.0", -] - -[[package]] -name = "eip-712" -version = "0.1.0" -dependencies = [ - "ethabi 12.0.0", - "ethereum-types 0.9.2", - "failure", - "indexmap", - "itertools 0.7.11", - "keccak-hash", - "lazy_static", - "logos", - "regex 1.3.9", - "rustc-hex 2.1.0", - "serde", - "serde_derive", - "serde_json", - "validator", - "validator_derive", -] - -[[package]] -name = "either" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" - -[[package]] -name = "elastic-array" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "073be79b6538296faf81c631872676600616073817dd9a440c477ad09b408983" -dependencies = [ - "heapsize", -] - -[[package]] -name = "enum_primitive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" -dependencies = [ - "num-traits 0.1.43", -] - -[[package]] -name = "env_logger" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" -dependencies = [ - "atty", - "humantime", - "log", - "regex 1.3.9", - "termcolor", -] - -[[package]] -name = "error-chain" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9" -dependencies = [ - "backtrace", - "version_check", -] - -[[package]] -name = "eth-secp256k1" -version = "0.5.7" -source = "git+https://github.com/paritytech/rust-secp256k1?rev=9791e79f21a5309dcb6e0bd254b1ef88fca2f1f4#9791e79f21a5309dcb6e0bd254b1ef88fca2f1f4" -dependencies = [ - "arrayvec 0.4.12", - "cc", - "cfg-if 0.1.10", - "rand 0.6.5", -] - -[[package]] -name = "eth_pairings" -version = "0.6.0" -source = "git+https://github.com/matter-labs/eip1962.git?rev=ece6cbabc41948db4200e41f0bfdab7ab94c7af8#ece6cbabc41948db4200e41f0bfdab7ab94c7af8" -dependencies = [ - "byteorder", - "eth_pairings_repr_derive", - "fixed_width_field", - "fixed_width_group_and_loop", - "num-bigint 0.2.3", - "num-traits 0.2.8", - "once_cell", - "static_assertions 1.1.0", -] - -[[package]] -name = "eth_pairings_repr_derive" -version = "0.2.0" -source = "git+https://github.com/matter-labs/eip1962.git?rev=ece6cbabc41948db4200e41f0bfdab7ab94c7af8#ece6cbabc41948db4200e41f0bfdab7ab94c7af8" -dependencies = [ - "byteorder", - "proc-macro2 1.0.36", - "quote 1.0.7", - "syn 1.0.86", -] - -[[package]] -name = "ethabi" -version = "11.0.0" -source = "git+https://github.com/rimrakhimov/ethabi?branch=rimrakhimov/remove-syn-export-span#222e6482ac45d9c01f9e895ade8e439f86dbfc2f" -dependencies = [ - "ethereum-types 0.9.2", - "rustc-hex 2.1.0", - "serde", - "serde_json", - "tiny-keccak 1.5.0", - "uint", -] - -[[package]] -name = "ethabi" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052a565e3de82944527d6d10a465697e6bb92476b772ca7141080c901f6a63c6" -dependencies = [ - "ethereum-types 0.9.2", - "rustc-hex 2.1.0", - "serde", - "serde_json", - "tiny-keccak 1.5.0", - "uint", -] - -[[package]] -name = "ethabi-contract" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d4002f1f77d8233685dafd8589efe1c9dfa63e21ca6c11134372acc7f68032" - -[[package]] -name = "ethabi-derive" -version = "11.0.0" -source = "git+https://github.com/rimrakhimov/ethabi?branch=rimrakhimov/remove-syn-export-span#222e6482ac45d9c01f9e895ade8e439f86dbfc2f" -dependencies = [ - "ethabi 11.0.0", - "heck", - "proc-macro2 1.0.36", - "quote 1.0.7", - "syn 1.0.86", -] - -[[package]] -name = "ethash" -version = "1.12.0" -dependencies = [ - "criterion 0.2.11", - "crunchy 0.1.6", - "either", - "ethereum-types 0.9.2", - "keccak-hash", - "log", - "memmap", - "parking_lot 0.11.1", - "primal", - "rustc-hex 1.0.0", - "serde_json", - "tempdir", - "tiny-keccak 2.0.2", -] - -[[package]] -name = "ethbloom" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0584482a6433370908dee84ea13992c2cf39c569600e4dbfafe520bb3b90d1" -dependencies = [ - "crunchy 0.2.2", - "fixed-hash 0.4.0", - "impl-rlp", - "impl-serde 0.2.3", - "tiny-keccak 1.5.0", -] - -[[package]] -name = "ethbloom" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71a6567e6fd35589fea0c63b94b4cf2e55573e413901bdbe60ab15cf0e25e5df" -dependencies = [ - "crunchy 0.2.2", - "fixed-hash 0.6.1", - "impl-rlp", - "impl-serde 0.3.1", - "tiny-keccak 2.0.2", -] - -[[package]] -name = "ethcore" -version = "1.12.0" -dependencies = [ - "ansi_term 0.10.2", - "blooms-db", - "common-types", - "criterion 0.2.11", - "crossbeam-channel", - "crossbeam-utils 0.6.6", - "derive_more", - "eip-152", - "env_logger", - "error-chain", - "ethabi 12.0.0", - "ethabi-contract", - "ethabi-derive", - "ethash", - "ethcore-accounts", - "ethcore-blockchain", - "ethcore-bloom-journal", - "ethcore-builtin", - "ethcore-call-contract", - "ethcore-db", - "ethcore-io", - "ethcore-miner", - "ethcore-stratum", - "ethereum-types 0.9.2", - "ethjson", - "ethkey", - "evm", - "fetch", - "globset", - "hash-db 0.11.0", - "hex-literal", - "itertools 0.5.10", - "journaldb", - "keccak-hash", - "keccak-hasher 0.1.1", - "kvdb", - "kvdb-memorydb", - "kvdb-rocksdb", - "lazy_static", - "len-caching-lock", - "log", - "lru-cache", - "macros", - "maplit", - "memory-cache", - "memory-db 0.11.0", - "num_cpus", - "parity-bytes", - "parity-crypto", - "parity-runtime", - "parity-snappy", - "parity-util-mem", - "parking_lot 0.11.1", - "patricia-trie-ethereum", - "rand 0.7.3", - "rand_xorshift 0.2.0", - "rayon", - "regex 1.3.9", - "reth-util", - "rlp", - "rlp_compress", - "rlp_derive", - "rustc-hex 1.0.0", - "scopeguard 1.1.0", - "serde", - "serde_derive", - "serde_json", - "stats", - "tempdir", - "tempfile", - "time-utils", - "trace-time", - "trie-db", - "trie-standardmap", - "triehash-ethereum", - "unexpected", - "using_queue", - "vm", - "walkdir", - "wasm", -] - -[[package]] -name = "ethcore-accounts" -version = "0.1.0" -dependencies = [ - "common-types", - "ethereum-types 0.9.2", - "ethkey", - "ethstore", - "log", - "parity-crypto", - "parking_lot 0.11.1", - "serde", - "serde_derive", - "serde_json", - "tempdir", -] - -[[package]] -name = "ethcore-blockchain" -version = "0.1.0" -dependencies = [ - "ansi_term 0.11.0", - "blooms-db", - "common-types", - "env_logger", - "ethcore-db", - "ethereum-types 0.9.2", - "ethkey", - "itertools 0.5.10", - "keccak-hash", - "kvdb", - "kvdb-memorydb", - "log", - "parity-bytes", - "parity-crypto", - "parity-util-mem", - "parking_lot 0.11.1", - "rand 0.7.3", - "rayon", - "rlp", - "rlp_compress", - "rlp_derive", - "rustc-hex 1.0.0", - "stats", - "tempdir", - "triehash-ethereum", -] - -[[package]] -name = "ethcore-bloom-journal" -version = "0.1.0" -dependencies = [ - "siphasher", -] - -[[package]] -name = "ethcore-builtin" -version = "0.1.0" -dependencies = [ - "bn", - "byteorder", - "eip-152", - "eth_pairings", - "ethereum-types 0.9.2", - "ethjson", - "ethkey", - "hex-literal", - "keccak-hash", - "log", - "macros", - "maplit", - "num", - "parity-bytes", - "parity-crypto", - "rustc-hex 1.0.0", -] - -[[package]] -name = "ethcore-call-contract" -version = "0.1.0" -dependencies = [ - "common-types", - "ethereum-types 0.9.2", - "parity-bytes", -] - -[[package]] -name = "ethcore-db" -version = "0.1.0" -dependencies = [ - "common-types", - "ethereum-types 0.9.2", - "kvdb", - "kvdb-memorydb", - "kvdb-rocksdb", - "parity-util-mem", - "parking_lot 0.11.1", - "rlp", - "rlp_derive", - "stats", -] - -[[package]] -name = "ethcore-io" -version = "1.12.0" -dependencies = [ - "crossbeam-deque 0.6.3", - "fnv", - "futures", - "log", - "mio", - "num_cpus", - "parking_lot 0.11.1", - "slab 0.4.2", - "time", - "timer", - "tokio", -] - -[[package]] -name = "ethcore-logger" -version = "1.12.0" -dependencies = [ - "ansi_term 0.10.2", - "arrayvec 0.4.12", - "atty", - "env_logger", - "lazy_static", - "log", - "parking_lot 0.11.1", - "regex 1.3.9", - "time", -] - -[[package]] -name = "ethcore-miner" -version = "1.12.0" -dependencies = [ - "ansi_term 0.10.2", - "common-types", - "env_logger", - "error-chain", - "ethabi 12.0.0", - "ethabi-contract", - "ethabi-derive", - "ethash", - "ethcore-call-contract", - "ethereum-types 0.9.2", - "ethkey", - "fetch", - "futures", - "hyper 0.12.35", - "keccak-hash", - "linked-hash-map", - "log", - "parity-crypto", - "parity-runtime", - "parity-util-mem", - "parking_lot 0.11.1", - "price-info", - "rlp", - "rustc-hex 1.0.0", - "serde", - "serde_derive", - "serde_json", - "trace-time", - "txpool", - "url 2.1.0", -] - -[[package]] -name = "ethcore-network" -version = "1.12.0" -dependencies = [ - "assert_matches", - "error-chain", - "ethcore-io", - "ethereum-types 0.9.2", - "ethkey", - "ipnetwork", - "lazy_static", - "libc", - "parity-crypto", - "parity-snappy", - "rlp", - "semver", - "serde", - "serde_derive", -] - -[[package]] -name = "ethcore-network-devp2p" -version = "1.12.0" -dependencies = [ - "ansi_term 0.10.2", - "assert_matches", - "bytes", - "env_logger", - "error-chain", - "ethcore-io", - "ethcore-network", - "ethereum-types 0.9.2", - "ethkey", - "igd", - "ipnetwork", - "keccak-hash", - "libc", - "log", - "lru-cache", - "mio", - "parity-bytes", - "parity-crypto", - "parity-path", - "parity-snappy", - "parking_lot 0.11.1", - "rand 0.7.3", - "rlp", - "rust-crypto", - "rustc-hex 1.0.0", - "serde", - "serde_derive", - "serde_json", - "slab 0.2.0", - "tempdir", - "tiny-keccak 1.5.0", -] - -[[package]] -name = "ethcore-service" -version = "0.1.0" -dependencies = [ - "ansi_term 0.10.2", - "error-chain", - "ethcore", - "ethcore-blockchain", - "ethcore-db", - "ethcore-io", - "ethcore-sync", - "ethereum-types 0.9.2", - "kvdb", - "kvdb-rocksdb", - "log", - "tempdir", - "trace-time", -] - -[[package]] -name = "ethcore-stratum" -version = "1.12.0" -dependencies = [ - "env_logger", - "ethereum-types 0.9.2", - "jsonrpc-core", - "jsonrpc-tcp-server", - "keccak-hash", - "log", - "parking_lot 0.11.1", - "tokio", - "tokio-io", -] - -[[package]] -name = "ethcore-sync" -version = "1.12.0" -dependencies = [ - "common-types", - "crossbeam-channel", - "derive_more", - "enum_primitive", - "env_logger", - "ethcore", - "ethcore-io", - "ethcore-miner", - "ethcore-network", - "ethcore-network-devp2p", - "ethereum-forkid", - "ethereum-types 0.9.2", - "ethkey", - "ethstore", - "fastmap", - "hash-db 0.11.0", - "keccak-hash", - "keccak-hasher 0.1.1", - "kvdb", - "kvdb-memorydb", - "log", - "macros", - "parity-bytes", - "parity-crypto", - "parity-util-mem", - "parking_lot 0.11.1", - "primitive-types 0.7.2", - "rand 0.7.3", - "rand_xorshift 0.2.0", - "rlp", - "rustc-hex 1.0.0", - "stats", - "trace-time", - "triehash-ethereum", -] - -[[package]] -name = "ethereum-forkid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3010d8372e3a76d4e2c44de0a080257ab62b6d108857ee7bd70fe8dfb2815f13" -dependencies = [ - "crc", - "ethereum-types 0.9.2", - "maplit", - "parity-util-mem", - "rlp", - "rlp-derive", -] - -[[package]] -name = "ethereum-types" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5a7777cb75d9ee2b8d3752634b15e4e4e70d2ef81a227e9d157acfa18592b1" -dependencies = [ - "ethbloom 0.7.0", - "fixed-hash 0.4.0", - "impl-rlp", - "impl-serde 0.2.3", - "primitive-types 0.5.1", - "uint", -] - -[[package]] -name = "ethereum-types" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473aecff686bd8e7b9db0165cbbb53562376b39bf35b427f0c60446a9e1634b0" -dependencies = [ - "ethbloom 0.9.2", - "fixed-hash 0.6.1", - "impl-rlp", - "impl-serde 0.3.1", - "primitive-types 0.7.2", - "uint", -] - -[[package]] -name = "ethjson" -version = "0.1.0" -dependencies = [ - "common-types", - "ethereum-types 0.9.2", - "macros", - "maplit", - "parity-crypto", - "rustc-hex 1.0.0", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "ethkey" -version = "0.3.0" -dependencies = [ - "edit-distance", - "eth-secp256k1", - "ethereum-types 0.9.2", - "lazy_static", - "log", - "memzero", - "parity-crypto", - "parity-wordlist", - "quick-error", - "rand 0.7.3", - "rustc-hex 1.0.0", - "serde", - "serde_derive", - "tiny-keccak 1.5.0", -] - -[[package]] -name = "ethkey-cli" -version = "0.1.0" -dependencies = [ - "docopt", - "env_logger", - "ethkey", - "panic_hook", - "parity-crypto", - "parity-wordlist", - "rustc-hex 1.0.0", - "serde", - "serde_derive", - "threadpool", -] - -[[package]] -name = "ethstore" -version = "0.2.1" -dependencies = [ - "ethereum-types 0.9.2", - "ethkey", - "itertools 0.5.10", - "lazy_static", - "libc", - "log", - "matches", - "parity-crypto", - "parity-wordlist", - "parking_lot 0.11.1", - "rand 0.7.3", - "rustc-hex 1.0.0", - "serde", - "serde_derive", - "serde_json", - "smallvec 0.6.13", - "tempdir", - "time", -] - -[[package]] -name = "ethstore-cli" -version = "0.1.1" -dependencies = [ - "dir", - "docopt", - "env_logger", - "ethstore", - "num_cpus", - "panic_hook", - "parking_lot 0.11.1", - "rustc-hex 1.0.0", - "serde", - "serde_derive", - "tempdir", -] - -[[package]] -name = "evm" -version = "0.1.0" -dependencies = [ - "bit-set", - "criterion 0.2.11", - "ethcore-builtin", - "ethereum-types 0.9.2", - "hex-literal", - "keccak-hash", - "lazy_static", - "log", - "memory-cache", - "num-bigint 0.2.3", - "parity-bytes", - "parity-util-mem", - "parking_lot 0.11.1", - "rustc-hex 1.0.0", - "vm", -] - -[[package]] -name = "evmbin" -version = "0.1.0" -dependencies = [ - "common-types", - "criterion 0.3.0", - "docopt", - "env_logger", - "ethcore", - "ethereum-types 0.9.2", - "ethjson", - "evm", - "panic_hook", - "parity-bytes", - "pretty_assertions", - "rustc-hex 1.0.0", - "serde", - "serde_derive", - "serde_json", - "tempdir", - "vm", -] - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.7", - "syn 1.0.86", - "synstructure", -] - -[[package]] -name = "fake-fetch" -version = "0.0.1" -dependencies = [ - "fetch", - "futures", - "hyper 0.12.35", -] - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fastmap" -version = "0.1.0" -dependencies = [ - "ethereum-types 0.9.2", - "plain_hasher", -] - -[[package]] -name = "fdlimit" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1ee15a7050e5580b3712877157068ea713b245b080ff302ae2ca973cfcd9baa" -dependencies = [ - "libc", -] - -[[package]] -name = "fetch" -version = "0.1.0" -dependencies = [ - "bytes", - "futures", - "http", - "hyper 0.12.35", - "hyper-rustls", - "log", - "tokio", - "url 2.1.0", -] - -[[package]] -name = "fixed-hash" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516877b7b9a1cc2d0293cbce23cd6203f0edbfd4090e6ca4489fecb5aa73050e" -dependencies = [ - "byteorder", - "rand 0.5.6", - "rustc-hex 2.1.0", - "static_assertions 0.2.5", -] - -[[package]] -name = "fixed-hash" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11498d382790b7a8f2fd211780bec78619bba81cdad3a283997c0c41f836759c" -dependencies = [ - "byteorder", - "rand 0.7.3", - "rustc-hex 2.1.0", - "static_assertions 1.1.0", -] - -[[package]] -name = "fixed_width_field" -version = "0.1.0" -source = "git+https://github.com/matter-labs/eip1962.git?rev=ece6cbabc41948db4200e41f0bfdab7ab94c7af8#ece6cbabc41948db4200e41f0bfdab7ab94c7af8" -dependencies = [ - "simple_uint", -] - -[[package]] -name = "fixed_width_group_and_loop" -version = "0.1.0" -source = "git+https://github.com/matter-labs/eip1962.git?rev=ece6cbabc41948db4200e41f0bfdab7ab94c7af8#ece6cbabc41948db4200e41f0bfdab7ab94c7af8" -dependencies = [ - "simple_uint", -] - -[[package]] -name = "fixedbitset" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" - -[[package]] -name = "fnv" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" - -[[package]] -name = "fs-swap" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921d332c89b3b61a826de38c61ee5b6e02c56806cade1b0e5d81bd71f57a71bb" -dependencies = [ - "lazy_static", - "libc", - "libloading", - "winapi 0.3.8", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags 1.2.1", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "futures" -version = "0.1.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" - -[[package]] -name = "futures-cpupool" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" -dependencies = [ - "futures", - "num_cpus", -] - -[[package]] -name = "gcc" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" - -[[package]] -name = "generic-array" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -dependencies = [ - "typenum", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "wasi 0.7.0", -] - -[[package]] -name = "getrandom" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.10.2+wasi-snapshot-preview1", -] - -[[package]] -name = "gimli" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" - -[[package]] -name = "globset" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120" -dependencies = [ - "aho-corasick 0.7.6", - "bstr", - "fnv", - "log", - "regex 1.3.9", -] - -[[package]] -name = "h2" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" -dependencies = [ - "byteorder", - "bytes", - "fnv", - "futures", - "http", - "indexmap", - "log", - "slab 0.4.2", - "string", - "tokio-io", -] - -[[package]] -name = "hamming" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65043da274378d68241eb9a8f8f8aa54e349136f7b8e12f63e3ef44043cc30e1" - -[[package]] -name = "hash-db" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03501f6e1a2a97f1618879aba3156f14ca2847faa530c4e28859638bd11483" - -[[package]] -name = "hash-db" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" - -[[package]] -name = "hash256-std-hasher" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5c13dbac3cc50684760f54af18545c9e80fb75e93a3e586d71ebdc13138f6a4" -dependencies = [ - "crunchy 0.2.2", -] - -[[package]] -name = "hash256-std-hasher" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c171d55b98633f4ed3860808f004099b36c1cc29c42cfc53aa8591b21efcf2" -dependencies = [ - "crunchy 0.2.2", -] - -[[package]] -name = "hashbrown" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" -dependencies = [ - "ahash 0.2.19", - "autocfg 0.1.7", -] - -[[package]] -name = "hashbrown" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" -dependencies = [ - "ahash 0.3.8", - "autocfg 1.0.0", -] - -[[package]] -name = "heapsize" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461" -dependencies = [ - "winapi 0.3.8", -] - -[[package]] -name = "heck" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" -dependencies = [ - "libc", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hex-literal" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961de220ec9a91af2e1e5bd80d02109155695e516771762381ef8581317066e0" -dependencies = [ - "hex-literal-impl", - "proc-macro-hack", -] - -[[package]] -name = "hex-literal-impl" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d4c5c844e2fee0bf673d54c2c177f1713b3d2af2ff6e666b49cb7572e6cf42d" -dependencies = [ - "proc-macro-hack", -] - -[[package]] -name = "hmac" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" -dependencies = [ - "crypto-mac", - "digest", -] - -[[package]] -name = "home" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29302b90cfa76231a757a887d1e3153331a63c7f80b6c75f86366334cbe70708" -dependencies = [ - "scopeguard 0.3.3", - "winapi 0.3.8", -] - -[[package]] -name = "home" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3753954f7bd71f0e671afb8b5a992d1724cf43b7f95a563cd4a0bde94659ca8" -dependencies = [ - "scopeguard 1.1.0", - "winapi 0.3.8", -] - -[[package]] -name = "http" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" -dependencies = [ - "bytes", - "futures", - "http", - "tokio-buf", -] - -[[package]] -name = "httparse" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" - -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - -[[package]] -name = "hyper" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34a590ca09d341e94cddf8e5af0bbccde205d5fbc2fa3c09dd67c7f85cea59d7" -dependencies = [ - "base64 0.9.3", - "bytes", - "futures", - "futures-cpupool", - "httparse", - "iovec", - "language-tags", - "log", - "mime", - "net2", - "percent-encoding 1.0.1", - "relay", - "time", - "tokio-core", - "tokio-io", - "tokio-service", - "unicase", - "want 0.0.4", -] - -[[package]] -name = "hyper" -version = "0.12.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" -dependencies = [ - "bytes", - "futures", - "futures-cpupool", - "h2", - "http", - "http-body", - "httparse", - "iovec", - "itoa", - "log", - "net2", - "rustc_version", - "time", - "tokio", - "tokio-buf", - "tokio-executor", - "tokio-io", - "tokio-reactor", - "tokio-tcp", - "tokio-threadpool", - "tokio-timer 0.2.13", - "want 0.2.0", -] - -[[package]] -name = "hyper-rustls" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b66d1bd4864ef036adf2363409caa3acd63ebb4725957b66e621c8a36631a3" -dependencies = [ - "bytes", - "ct-logs", - "futures", - "hyper 0.12.35", - "rustls", - "tokio-io", - "tokio-rustls", - "webpki", - "webpki-roots", -] - -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "if_chain" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bac95d9aa0624e7b78187d6fb8ab012b41d9f6f54b1bcb61e61c4845f8357ec" - -[[package]] -name = "igd" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8aef7814a769f156ef3a86169a8b04c066e3aebc324f522c159978466e32a1c" -dependencies = [ - "futures", - "hyper 0.11.27", - "rand 0.4.6", - "regex 0.2.11", - "tokio-core", - "tokio-retry", - "tokio-timer 0.1.2", - "xml-rs", - "xmltree", -] - -[[package]] -name = "impl-codec" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" -dependencies = [ - "parity-scale-codec", -] - -[[package]] -name = "impl-rlp" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f7a72f11830b52333f36e3b09a288333888bf54380fd0ac0790a3c31ab0f3c5" -dependencies = [ - "rlp", -] - -[[package]] -name = "impl-serde" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8" -dependencies = [ - "serde", -] - -[[package]] -name = "impl-serde" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f" -dependencies = [ - "serde", -] - -[[package]] -name = "impl-trait-for-tuples" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" -dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.7", - "syn 1.0.86", -] - -[[package]] -name = "indexmap" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" -dependencies = [ - "autocfg 0.1.7", -] - -[[package]] -name = "inflate" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" -dependencies = [ - "adler32", -] - -[[package]] -name = "instant" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "interleaved-ordered" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141340095b15ed7491bd3d4ced9d20cebfb826174b6bb03386381f62b01e3d77" - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "ipnetwork" -version = "0.12.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70783119ac90828aaba91eae39db32c6c1b8838deea3637e5238efa0130801ab" - -[[package]] -name = "itertools" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4833d6978da405305126af4ac88569b5d71ff758581ce5a987dbfa3755f694fc" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d47946d458e94a1b7bcabbf6521ea7c037062c81f534615abcad76e84d4970d" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fa75c9dea7b07be3138c49abbb83fd4bea199b5cdc76f9804458edc5da0d6e" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" - -[[package]] -name = "journaldb" -version = "0.2.0" -dependencies = [ - "env_logger", - "ethcore-db", - "ethereum-types 0.9.2", - "fastmap", - "hash-db 0.11.0", - "keccak-hash", - "keccak-hasher 0.1.1", - "kvdb", - "kvdb-memorydb", - "log", - "memory-db 0.11.0", - "parity-bytes", - "parity-util-mem", - "parking_lot 0.11.1", - "rlp", -] - -[[package]] -name = "jsonrpc-core" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b12567a31d48588a65b6cf870081e6ba1d7b2ae353977cb9820d512e69c70" -dependencies = [ - "futures", - "log", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "jsonrpc-derive" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2cc6ea7f785232d9ca8786a44e9fa698f92149dcdc1acc4aa1fc69c4993d79e" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.36", - "quote 1.0.7", - "syn 1.0.86", -] - -[[package]] -name = "jsonrpc-http-server" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9996b26c0c7a59626d0ed6c5ec8bf06218e62ce1474bd2849f9b9fd38a0158c0" -dependencies = [ - "hyper 0.12.35", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "net2", - "parking_lot 0.10.2", - "unicase", -] - -[[package]] -name = "jsonrpc-ipc-server" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e8f2278fb2b277175b6e21b23e7ecf30e78daff5ee301d0a2a411d9a821a0a" -dependencies = [ - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "parity-tokio-ipc", - "parking_lot 0.10.2", - "tokio-service", -] - -[[package]] -name = "jsonrpc-pubsub" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f389c5cd1f3db258a99296892c21047e21ae73ff4c0e2d39650ea86fe994b4c7" -dependencies = [ - "jsonrpc-core", - "log", - "parking_lot 0.10.2", - "rand 0.7.3", - "serde", -] - -[[package]] -name = "jsonrpc-server-utils" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c623e1895d0d9110cb0ea7736cfff13191ff52335ad33b21bd5c775ea98b27af" -dependencies = [ - "bytes", - "globset", - "jsonrpc-core", - "lazy_static", - "log", - "tokio", - "tokio-codec", - "unicase", -] - -[[package]] -name = "jsonrpc-tcp-server" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b7d4a377ea231ca0d14fe1fb515ca89d6a46a33169efa6bdd5d0e56b9f359fc" -dependencies = [ - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "parking_lot 0.10.2", - "tokio-service", -] - -[[package]] -name = "jsonrpc-ws-server" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436a92034d0137ab3e3c64a7a6350b428f31cb4d7d1a89f284bcdbcd98a7bc56" -dependencies = [ - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "parity-ws", - "parking_lot 0.10.2", - "slab 0.4.2", -] - -[[package]] -name = "keccak-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f58a51ef3df9398cf2434bea8d4eb61fb748d0feb1571f87388579a120a4c8f" -dependencies = [ - "primitive-types 0.7.2", - "tiny-keccak 2.0.2", -] - -[[package]] -name = "keccak-hasher" -version = "0.1.1" -dependencies = [ - "ethereum-types 0.9.2", - "hash-db 0.11.0", - "plain_hasher", - "tiny-keccak 1.5.0", -] - -[[package]] -name = "keccak-hasher" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9d3670023f4c04153d90b8a557a822d1b27ed702bb015a87cf7bffead5b611" -dependencies = [ - "hash-db 0.11.0", - "hash256-std-hasher 0.11.0", - "tiny-keccak 1.5.0", -] - -[[package]] -name = "keccak-hasher" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711adba9940a039f4374fc5724c0a5eaca84a2d558cce62256bfe26f0dbef05e" -dependencies = [ - "hash-db 0.15.2", - "hash256-std-hasher 0.15.2", - "tiny-keccak 2.0.2", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "kvdb" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b2f251f01a7224426abdb2563707d856f7de995d821744fd8fa8e2874f69e3" -dependencies = [ - "elastic-array", - "parity-bytes", -] - -[[package]] -name = "kvdb-memorydb" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bcdf5eb083602cff61a6f8438dce2a7900d714e893fc48781c39fb119d37aa" -dependencies = [ - "kvdb", - "parking_lot 0.6.4", -] - -[[package]] -name = "kvdb-rocksdb" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5c5f57ad492ecfb9e2a91614ff0204bda82e41f832bebd64cd03ffecb74e02b" -dependencies = [ - "elastic-array", - "fs-swap", - "interleaved-ordered", - "kvdb", - "log", - "num_cpus", - "parity-rocksdb", - "parking_lot 0.9.0", - "regex 1.3.9", -] - -[[package]] -name = "language-tags" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" - -[[package]] -name = "len-caching-lock" -version = "0.1.1" -dependencies = [ - "parking_lot 0.11.1", -] - -[[package]] -name = "libc" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "538c092e5586f4cdd7dd8078c4a79220e3e168880218124dcbce860f0ea938c6" - -[[package]] -name = "libloading" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" -dependencies = [ - "cc", - "winapi 0.3.8", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" - -[[package]] -name = "local-encoding" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ceb20f39ff7ae42f3ff9795f3986b1daad821caaa1e1732a0944103a5a1a66" -dependencies = [ - "kernel32-sys", - "skeptic", - "winapi 0.2.8", -] - -[[package]] -name = "lock_api" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" -dependencies = [ - "owning_ref", - "scopeguard 0.3.3", -] - -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard 1.1.0", -] - -[[package]] -name = "lock_api" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176" -dependencies = [ - "scopeguard 1.1.0", -] - -[[package]] -name = "log" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -dependencies = [ - "cfg-if 0.1.10", -] - -[[package]] -name = "logos" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427e2abca5be13136da9afdbf874e6b34ad9001dd70f2b103b083a85daa7b345" -dependencies = [ - "logos-derive", -] - -[[package]] -name = "logos-derive" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a7d287fd2ac3f75b11f19a1c8a874a7d55744bd91f7a1b3e7cf87d4343c36d" -dependencies = [ - "beef", - "fnv", - "proc-macro2 1.0.36", - "quote 1.0.7", - "regex-syntax 0.6.18", - "syn 1.0.86", - "utf8-ranges", -] - -[[package]] -name = "lru" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c456c123957de3a220cd03786e0d86aa542a88b46029973b542f426da6ef34" -dependencies = [ - "hashbrown 0.6.3", -] - -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "macros" -version = "0.1.0" - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff" -dependencies = [ - "libc", - "winapi 0.3.8", -] - -[[package]] -name = "memoffset" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a85c1a8c329f11437034d7313dca647c79096523533a1c79e86f1d0f657c7cc" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "memory-cache" -version = "0.1.0" -dependencies = [ - "lru-cache", - "parity-util-mem", -] - -[[package]] -name = "memory-db" -version = "0.11.0" -dependencies = [ - "criterion 0.2.11", - "hash-db 0.11.0", - "keccak-hasher 0.11.0", - "parity-util-mem", -] - -[[package]] -name = "memory-db" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94da53143d45f6bad3753f532e56ad57a6a26c0ca6881794583310c7cb4c885f" -dependencies = [ - "hash-db 0.11.0", - "heapsize", -] - -[[package]] -name = "memory_units" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" - -[[package]] -name = "memzero" -version = "0.1.0" - -[[package]] -name = "migration-rocksdb" -version = "0.1.0" -dependencies = [ - "kvdb", - "kvdb-rocksdb", - "log", - "macros", - "tempdir", -] - -[[package]] -name = "mime" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1d63acd1b78403cc0c325605908475dd9b9a3acbf65ed8bcab97e27014afcf" - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg 1.0.0", -] - -[[package]] -name = "mio" -version = "0.6.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow 0.2.1", - "net2", - "slab 0.4.2", - "winapi 0.2.8", -] - -[[package]] -name = "mio-extras" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40" -dependencies = [ - "lazycell", - "log", - "mio", - "slab 0.4.2", -] - -[[package]] -name = "mio-named-pipes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e374eff525ce1c5b7687c4cef63943e7686524a387933ad27ca7ec43779cb3" -dependencies = [ - "log", - "mio", - "miow 0.3.7", - "winapi 0.3.8", -] - -[[package]] -name = "mio-uds" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" -dependencies = [ - "iovec", - "libc", - "mio", -] - -[[package]] -name = "miow" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.8", -] - -[[package]] -name = "nan-preserving-float" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d4f00fcc2f4c9efa8cc971db0da9e28290e28e97af47585e48691ef10ff31f" - -[[package]] -name = "net2" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.8", -] - -[[package]] -name = "node-filter" -version = "1.12.0" -dependencies = [ - "ethabi 12.0.0", - "ethabi-contract", - "ethabi-derive", - "ethcore", - "ethcore-io", - "ethcore-network", - "ethcore-network-devp2p", - "ethereum-types 0.9.2", - "kvdb-memorydb", - "log", - "lru-cache", - "parking_lot 0.11.1", - "tempdir", -] - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-bigint 0.1.44", - "num-integer", - "num-iter", - "num-traits 0.2.8", -] - -[[package]] -name = "num-bigint" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" -dependencies = [ - "num-integer", - "num-traits 0.2.8", - "rand 0.4.6", - "rustc-serialize", -] - -[[package]] -name = "num-bigint" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c3f34cdd24f334cb265d9bf8bfa8a241920d026916785747a92f0e55541a1a" -dependencies = [ - "autocfg 0.1.7", - "num-integer", - "num-traits 0.2.8", -] - -[[package]] -name = "num-integer" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" -dependencies = [ - "autocfg 0.1.7", - "num-traits 0.2.8", -] - -[[package]] -name = "num-iter" -version = "0.1.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" -dependencies = [ - "autocfg 0.1.7", - "num-integer", - "num-traits 0.2.8", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.8", -] - -[[package]] -name = "num-traits" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" -dependencies = [ - "autocfg 0.1.7", -] - -[[package]] -name = "num_cpus" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "155394f924cdddf08149da25bfb932d226b4a593ca7468b08191ff6335941af5" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf9993e59c894e3c08aa1c2712914e9e6bf1fcbfc6bef283e2183df345a4fee" -dependencies = [ - "num-traits 0.2.8", -] - -[[package]] -name = "object" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" - -[[package]] -name = "oe-rpc-common" -version = "0.0.0" -dependencies = [ - "rustc-hex 1.0.0", - "serde", - "serde_json", -] - -[[package]] -name = "oe-rpc-servers" -version = "0.0.0" -dependencies = [ - "jsonrpc-core", - "jsonrpc-http-server", - "jsonrpc-ipc-server", - "jsonrpc-ws-server", -] - -[[package]] -name = "ole32-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "once_cell" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "openethereum" -version = "3.3.5" -dependencies = [ - "ansi_term 0.10.2", - "atty", - "blooms-db", - "clap", - "cli-signer", - "common-types", - "crossbeam-channel", - "ctrlc", - "dir", - "docopt", - "ethcore", - "ethcore-accounts", - "ethcore-blockchain", - "ethcore-call-contract", - "ethcore-db", - "ethcore-io", - "ethcore-logger", - "ethcore-miner", - "ethcore-network", - "ethcore-service", - "ethcore-sync", - "ethereum-types 0.9.2", - "ethkey", - "ethstore", - "fake-fetch", - "fdlimit", - "fetch", - "futures", - "hyper 0.12.35", - "ipnetwork", - "journaldb", - "jsonrpc-core", - "keccak-hash", - "kvdb", - "kvdb-rocksdb", - "lazy_static", - "log", - "migration-rocksdb", - "node-filter", - "num_cpus", - "number_prefix", - "oe-rpc-common", - "oe-rpc-servers", - "panic_hook", - "parity-bytes", - "parity-crypto", - "parity-daemonize", - "parity-local-store", - "parity-path", - "parity-rpc", - "parity-runtime", - "parity-version", - "parking_lot 0.11.1", - "pretty_assertions", - "prometheus", - "regex 1.3.9", - "rlp", - "rpassword", - "rustc-hex 1.0.0", - "rustc_version", - "semver", - "serde", - "serde_derive", - "serde_json", - "stats", - "tempdir", - "term_size", - "textwrap 0.9.0", - "toml 0.4.10", - "winapi 0.3.8", -] - -[[package]] -name = "order-stat" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa535d5117d3661134dbf1719b6f0ffe06f2375843b13935db186cd094105eb" - -[[package]] -name = "owning_ref" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "panic_hook" -version = "0.1.0" -dependencies = [ - "backtrace", -] - -[[package]] -name = "parity-bytes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c276d76c5333b8c2579e02d49a06733a55b8282d2d9b13e8d53b6406bd7e30a" - -[[package]] -name = "parity-crypto" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e15b5e11d7a4829490630a797c537a68c9e864a139f56fe7a1e6a51f0da25d" -dependencies = [ - "aes", - "aes-ctr", - "block-modes", - "digest", - "ethereum-types 0.9.2", - "hmac", - "lazy_static", - "pbkdf2", - "rand 0.7.3", - "ripemd160", - "rustc-hex 2.1.0", - "scrypt", - "secp256k1", - "sha2", - "subtle 2.3.0", - "tiny-keccak 2.0.2", - "zeroize", -] - -[[package]] -name = "parity-daemonize" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b1910b2793ff52713fca0a4ee92544ebec59ccd218ea74560be6f947b4ca77" -dependencies = [ - "ansi_term 0.11.0", - "failure", - "libc", - "log", - "mio", -] - -[[package]] -name = "parity-local-store" -version = "0.1.0" -dependencies = [ - "common-types", - "ethcore-db", - "ethcore-io", - "ethkey", - "kvdb", - "kvdb-memorydb", - "log", - "parity-crypto", - "rlp", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "parity-path" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b027aab22527061b7005cecf7805e8f42eed94ce89e76bac3a6035394b56627" -dependencies = [ - "home 0.5.1", -] - -[[package]] -name = "parity-rocksdb" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d17caf6640e24b70242f3f48615e3f0764f98871e8c7aea25584e29833eb5a8" -dependencies = [ - "libc", - "local-encoding", - "parity-rocksdb-sys", -] - -[[package]] -name = "parity-rocksdb-sys" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9581e6b8c63f3808500638372ee56faaaffb57c4d349974bff591606b94d5f57" -dependencies = [ - "cmake", - "libc", - "local-encoding", - "parity-snappy-sys", -] - -[[package]] -name = "parity-rpc" -version = "1.12.0" -dependencies = [ - "ansi_term 0.10.2", - "common-types", - "eip-712", - "ethash", - "ethcore", - "ethcore-accounts", - "ethcore-io", - "ethcore-logger", - "ethcore-miner", - "ethcore-network", - "ethcore-sync", - "ethereum-types 0.9.2", - "ethjson", - "ethkey", - "ethstore", - "fake-fetch", - "fetch", - "futures", - "itertools 0.5.10", - "jsonrpc-core", - "jsonrpc-derive", - "jsonrpc-http-server", - "jsonrpc-ipc-server", - "jsonrpc-pubsub", - "jsonrpc-ws-server", - "keccak-hash", - "log", - "macros", - "oe-rpc-common", - "oe-rpc-servers", - "order-stat", - "parity-bytes", - "parity-crypto", - "parity-runtime", - "parity-version", - "parking_lot 0.11.1", - "pretty_assertions", - "rand 0.7.3", - "rand_xorshift 0.2.0", - "rlp", - "rustc-hex 1.0.0", - "serde", - "serde_derive", - "serde_json", - "stats", - "tempdir", - "tiny-keccak 1.5.0", - "tokio-timer 0.1.2", - "transient-hashmap", - "txpool", - "vm", -] - -[[package]] -name = "parity-rpc-client" -version = "1.4.0" -dependencies = [ - "ethereum-types 0.9.2", - "futures", - "jsonrpc-core", - "jsonrpc-ws-server", - "keccak-hash", - "log", - "matches", - "parity-rpc", - "parking_lot 0.9.0", - "serde", - "serde_json", - "url 2.1.0", -] - -[[package]] -name = "parity-runtime" -version = "0.1.0" -dependencies = [ - "futures", - "tokio", -] - -[[package]] -name = "parity-scale-codec" -version = "1.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c740e5fbcb6847058b40ac7e5574766c6388f585e184d769910fe0d3a2ca861" -dependencies = [ - "arrayvec 0.5.1", - "bitvec", - "byte-slice-cast", - "serde", -] - -[[package]] -name = "parity-snappy" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2c5f9d149b13134b8b354d93a92830efcbee6fe5b73a2e6e540fe70d4dd8a63" -dependencies = [ - "libc", - "parity-snappy-sys", -] - -[[package]] -name = "parity-snappy-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a413d51e5e1927320c9de992998e4a279dffb8c8a7363570198bd8383e66f1b" -dependencies = [ - "cmake", - "libc", -] - -[[package]] -name = "parity-tokio-ipc" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e57fea504fea33f9fbb5f49f378359030e7e026a6ab849bb9e8f0787376f1bf" -dependencies = [ - "bytes", - "futures", - "libc", - "log", - "mio-named-pipes", - "miow 0.3.7", - "rand 0.7.3", - "tokio", - "tokio-named-pipes", - "tokio-uds", - "winapi 0.3.8", -] - -[[package]] -name = "parity-util-mem" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297ff91fa36aec49ce183484b102f6b75b46776822bd81525bfc4cc9b0dd0f5c" -dependencies = [ - "cfg-if 0.1.10", - "ethereum-types 0.9.2", - "hashbrown 0.8.2", - "impl-trait-for-tuples", - "lru", - "parity-util-mem-derive", - "parking_lot 0.10.2", - "primitive-types 0.7.2", - "smallvec 1.6.1", - "winapi 0.3.8", -] - -[[package]] -name = "parity-util-mem-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" -dependencies = [ - "proc-macro2 1.0.36", - "syn 1.0.86", - "synstructure", -] - -[[package]] -name = "parity-version" -version = "3.3.5" -dependencies = [ - "parity-bytes", - "rlp", - "rustc_version", - "target_info", - "toml 0.4.10", - "vergen", -] - -[[package]] -name = "parity-wasm" -version = "0.31.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511379a8194230c2395d2f5fa627a5a7e108a9f976656ce723ae68fca4097bfc" -dependencies = [ - "byteorder", -] - -[[package]] -name = "parity-wordlist" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573d08f0d3bc8a6ffcdac1de2725b5daeed8db26345a9c12d91648e2d6457f3e" -dependencies = [ - "lazy_static", - "rand 0.6.5", -] - -[[package]] -name = "parity-ws" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e02a625dd75084c2a7024f07c575b61b782f729d18702dabb3cdbf31911dc61" -dependencies = [ - "byteorder", - "bytes", - "httparse", - "log", - "mio", - "mio-extras", - "rand 0.7.3", - "sha-1", - "slab 0.4.2", - "url 2.1.0", -] - -[[package]] -name = "parking_lot" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5" -dependencies = [ - "lock_api 0.1.5", - "parking_lot_core 0.3.1", -] - -[[package]] -name = "parking_lot" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.6.2", - "rustc_version", -] - -[[package]] -name = "parking_lot" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.2", -] - -[[package]] -name = "parking_lot" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" -dependencies = [ - "instant", - "lock_api 0.4.3", - "parking_lot_core 0.8.3", -] - -[[package]] -name = "parking_lot_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c" -dependencies = [ - "libc", - "rand 0.5.6", - "rustc_version", - "smallvec 0.6.13", - "winapi 0.3.8", -] - -[[package]] -name = "parking_lot_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.56", - "rustc_version", - "smallvec 0.6.13", - "winapi 0.3.8", -] - -[[package]] -name = "parking_lot_core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.56", - "smallvec 1.6.1", - "winapi 0.3.8", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" -dependencies = [ - "backtrace", - "cfg-if 1.0.0", - "instant", - "libc", - "petgraph", - "redox_syscall 0.2.5", - "smallvec 1.6.1", - "thread-id", - "winapi 0.3.8", -] - -[[package]] -name = "patricia-trie-ethereum" -version = "0.1.0" -dependencies = [ - "elastic-array", - "ethereum-types 0.9.2", - "hash-db 0.11.0", - "journaldb", - "keccak-hash", - "keccak-hasher 0.1.1", - "memory-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-bytes", - "rlp", - "trie-db", -] - -[[package]] -name = "pbkdf2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" -dependencies = [ - "base64 0.9.3", - "byteorder", - "crypto-mac", - "hmac", - "rand 0.5.6", - "sha2", - "subtle 1.0.0", -] - -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "petgraph" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "plain_hasher" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1c24f5061a6a53aaa21b0aaaa2e1beb5271a9ecc8c5bd7ae9ac92969070a2a" -dependencies = [ - "crunchy 0.2.2", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" - -[[package]] -name = "pretty_assertions" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2412f3332a07c7a2a50168988dcc184f32180a9758ad470390e5f55e089f6b6e" -dependencies = [ - "difference", -] - -[[package]] -name = "price-info" -version = "1.12.0" -dependencies = [ - "fake-fetch", - "fetch", - "futures", - "log", - "parity-runtime", - "parking_lot 0.11.1", - "serde_json", -] - -[[package]] -name = "primal" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e31b86efadeaeb1235452171a66689682783149a6249ff334a2c5d8218d00a4" -dependencies = [ - "primal-check", - "primal-estimate", - "primal-sieve", -] - -[[package]] -name = "primal-bit" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686a64e2f50194c64942992af5799e6b6e8775b8f88c607d72ed0a2fd58b9b21" -dependencies = [ - "hamming", -] - -[[package]] -name = "primal-check" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e65f96c0a171f887198c274392c99a116ef65aa7f53f3b6d4902f493965c2d1" -dependencies = [ - "num-integer", -] - -[[package]] -name = "primal-estimate" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea4531dde757b56906493c8604641da14607bf9cdaa80fb9c9cabd2429f8d5" - -[[package]] -name = "primal-sieve" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2d6ed369bb4b0273aeeb43f07c105c0117717cbae827b20719438eb2eb798c" -dependencies = [ - "hamming", - "primal-bit", - "primal-estimate", - "smallvec 0.6.13", -] - -[[package]] -name = "primitive-types" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83ef7b3b965c0eadcb6838f34f827e1dfb2939bdd5ebd43f9647e009b12b0371" -dependencies = [ - "fixed-hash 0.4.0", - "impl-codec", - "impl-rlp", - "impl-serde 0.2.3", - "uint", -] - -[[package]] -name = "primitive-types" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55c21c64d0eaa4d7ed885d959ef2d62d9e488c27c0e02d9aa5ce6c877b7d5f8" -dependencies = [ - "fixed-hash 0.6.1", - "impl-codec", - "impl-rlp", - "impl-serde 0.3.1", - "uint", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e" -dependencies = [ - "toml 0.5.5", -] - -[[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 = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" -dependencies = [ - "unicode-xid 0.2.0", -] - -[[package]] -name = "prometheus" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0ced56dee39a6e960c15c74dc48849d614586db2eaada6497477af7c7811cd" -dependencies = [ - "cfg-if 0.1.10", - "fnv", - "lazy_static", - "protobuf", - "spin", - "thiserror", -] - -[[package]] -name = "protobuf" -version = "2.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d883f78645c21b7281d21305181aa1f4dd9e9363e7cf2566c93121552cff003e" - -[[package]] -name = "pulldown-cmark" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8361e81576d2e02643b04950e487ec172b687180da65c731c03cf336784e6c07" -dependencies = [ - "getopts", -] - -[[package]] -name = "pwasm-utils" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb0dcbddbb600f47a7098d33762a00552c671992171637f5bb310b37fe1f0e4" -dependencies = [ - "byteorder", - "log", - "parity-wasm", -] - -[[package]] -name = "quick-error" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -dependencies = [ - "proc-macro2 1.0.36", -] - -[[package]] -name = "radium" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" - -[[package]] -name = "rand" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" -dependencies = [ - "libc", - "rand 0.4.6", -] - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi 0.3.8", -] - -[[package]] -name = "rand" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "winapi 0.3.8", -] - -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.7", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os 0.1.3", - "rand_pcg", - "rand_xorshift 0.1.1", - "winapi 0.3.8", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.13", - "libc", - "rand_chacha 0.2.1", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.3.1", -] - -[[package]] -name = "rand_chacha" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -dependencies = [ - "c2-chacha", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.13", -] - -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi 0.3.8", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi 0.3.8", -] - -[[package]] -name = "rand_os" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a788ae3edb696cfcba1c19bfd388cc4b8c21f8a408432b199c072825084da58a" -dependencies = [ - "getrandom 0.1.13", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_xorshift" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_xoshiro" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b418169fb9c46533f326efd6eed2576699c44ca92d3052a066214a8d828929" -dependencies = [ - "byteorder", - "rand_core 0.3.1", -] - -[[package]] -name = "rand_xoshiro" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e18c91676f670f6f0312764c759405f13afb98d5d73819840cf72a518487bff" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rayon" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123" -dependencies = [ - "crossbeam-deque 0.7.1", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b" -dependencies = [ - "crossbeam-deque 0.7.1", - "crossbeam-queue 0.1.2", - "crossbeam-utils 0.6.6", - "lazy_static", - "num_cpus", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" - -[[package]] -name = "redox_syscall" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" -dependencies = [ - "bitflags 1.2.1", -] - -[[package]] -name = "regex" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" -dependencies = [ - "aho-corasick 0.6.10", - "memchr", - "regex-syntax 0.5.6", - "thread_local 0.3.6", - "utf8-ranges", -] - -[[package]] -name = "regex" -version = "1.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" -dependencies = [ - "aho-corasick 0.7.6", - "memchr", - "regex-syntax 0.6.18", - "thread_local 1.0.1", -] - -[[package]] -name = "regex-automata" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9" -dependencies = [ - "byteorder", -] - -[[package]] -name = "regex-syntax" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -dependencies = [ - "ucd-util", -] - -[[package]] -name = "regex-syntax" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" - -[[package]] -name = "relay" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a" -dependencies = [ - "futures", -] - -[[package]] -name = "remove_dir_all" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -dependencies = [ - "winapi 0.3.8", -] - -[[package]] -name = "reth-util" -version = "0.1.0" -source = "git+https://github.com/gnosis/reth.git?rev=573e128#573e128487d5651f301e21faa97fc8e80f91dee8" - -[[package]] -name = "ring" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426bc186e3e95cac1e4a4be125a4aca7e84c2d616ffc02244eef36e2a60a093c" -dependencies = [ - "cc", - "lazy_static", - "libc", - "spin", - "untrusted", - "winapi 0.3.8", -] - -[[package]] -name = "ripemd160" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a" -dependencies = [ - "block-buffer", - "digest", - "opaque-debug", -] - -[[package]] -name = "rlp" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1190dcc8c3a512f1eef5d09bb8c84c7f39e1054e174d1795482e18f5272f2e73" -dependencies = [ - "rustc-hex 2.1.0", -] - -[[package]] -name = "rlp-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" -dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.7", - "syn 1.0.86", -] - -[[package]] -name = "rlp_compress" -version = "0.1.0" -dependencies = [ - "elastic-array", - "lazy_static", - "rlp", -] - -[[package]] -name = "rlp_derive" -version = "0.1.0" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "rlp", - "syn 0.15.26", -] - -[[package]] -name = "rpassword" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b273c91bd242ca03ad6d71c143b6f17a48790e61f21a6c78568fa2b6774a24a4" -dependencies = [ - "kernel32-sys", - "libc", - "rprompt", - "winapi 0.2.8", -] - -[[package]] -name = "rprompt" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1601f32bc5858aae3cbfa1c645c96c4d820cc5c16be0194f089560c00b6eb625" - -[[package]] -name = "rust-crypto" -version = "0.2.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" -dependencies = [ - "gcc", - "libc", - "rand 0.3.23", - "rustc-serialize", - "time", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" - -[[package]] -name = "rustc-hex" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ceb8ce7a5e520de349e1fa172baeba4a9e8d5ef06c47471863530bc4972ee1e" - -[[package]] -name = "rustc-hex" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" - -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[package]] -name = "rustls" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f271e3552cd835fa28c541c34a7e8fdd8cdff09d77fe4eb8f6c42e87a11b096e" -dependencies = [ - "base64 0.10.1", - "log", - "ring", - "sct", - "untrusted", - "webpki", -] - -[[package]] -name = "ryu" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "same-file" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scoped-tls" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" - -[[package]] -name = "scopeguard" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scrypt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "656c79d0e90d0ab28ac86bf3c3d10bfbbac91450d3f190113b4e76d9fec3cfdd" -dependencies = [ - "byte-tools", - "byteorder", - "hmac", - "pbkdf2", - "sha2", -] - -[[package]] -name = "sct" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5adf8fbd58e1b1b52699dc8bed2630faecb6d8c7bee77d009d6bbe4af569b9" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "secp256k1" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2932dc07acd2066ff2e3921a4419606b220ba6cd03a9935123856cc534877056" -dependencies = [ - "rand 0.6.5", - "secp256k1-sys", -] - -[[package]] -name = "secp256k1-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab2c26f0d3552a0f12e639ae8a64afc2e3db9c52fe32f5fc6c289d38519f220" -dependencies = [ - "cc", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", - "serde", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8" -dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.7", - "syn 1.0.86", -] - -[[package]] -name = "serde_json" -version = "1.0.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76" -dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.7", - "syn 1.0.86", -] - -[[package]] -name = "sha-1" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" -dependencies = [ - "block-buffer", - "digest", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" -dependencies = [ - "block-buffer", - "digest", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "shell32-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "simple_uint" -version = "0.1.0" -source = "git+https://github.com/matter-labs/eip1962.git?rev=ece6cbabc41948db4200e41f0bfdab7ab94c7af8#ece6cbabc41948db4200e41f0bfdab7ab94c7af8" -dependencies = [ - "byteorder", - "crunchy 0.2.2", - "rustc-hex 2.1.0", - "static_assertions 1.1.0", -] - -[[package]] -name = "siphasher" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833011ca526bd88f16778d32c699d325a9ad302fa06381cd66f7be63351d3f6d" - -[[package]] -name = "skeptic" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ebf8a06f5f8bae61ae5bbc7af7aac4ef6907ae975130faba1199e5fe82256a" -dependencies = [ - "pulldown-cmark", - "tempdir", -] - -[[package]] -name = "slab" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbdd334bd28d328dad1c41b0ea662517883d8880d8533895ef96c8003dec9c4" - -[[package]] -name = "slab" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" - -[[package]] -name = "slab" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" - -[[package]] -name = "smallvec" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" -dependencies = [ - "maybe-uninit", -] - -[[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "stable_deref_trait" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" - -[[package]] -name = "static_assertions" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stats" -version = "0.1.0" -dependencies = [ - "log", - "prometheus", -] - -[[package]] -name = "stream-cipher" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c" -dependencies = [ - "generic-array", -] - -[[package]] -name = "string" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" -dependencies = [ - "bytes", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" - -[[package]] -name = "subtle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - -[[package]] -name = "subtle" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd" - -[[package]] -name = "syn" -version = "0.15.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" -dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.7", - "unicode-xid 0.2.0", -] - -[[package]] -name = "synstructure" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575be94ccb86e8da37efb894a87e2b660be299b41d8ef347f9d6d79fbe61b1ba" -dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.7", - "syn 1.0.86", - "unicode-xid 0.2.0", -] - -[[package]] -name = "target_info" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" - -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] - -[[package]] -name = "tempfile" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "rand 0.7.3", - "redox_syscall 0.1.56", - "remove_dir_all", - "winapi 0.3.8", -] - -[[package]] -name = "term_size" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327" -dependencies = [ - "kernel32-sys", - "libc", - "winapi 0.2.8", -] - -[[package]] -name = "termcolor" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" -dependencies = [ - "wincolor", -] - -[[package]] -name = "textwrap" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" -dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.7", - "syn 1.0.86", -] - -[[package]] -name = "thread-id" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" -dependencies = [ - "libc", - "redox_syscall 0.1.56", - "winapi 0.3.8", -] - -[[package]] -name = "thread_local" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "threadpool" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "time" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" -dependencies = [ - "libc", - "redox_syscall 0.1.56", - "winapi 0.3.8", -] - -[[package]] -name = "time-utils" -version = "0.1.0" - -[[package]] -name = "timer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d42176308937165701f50638db1c31586f183f1aab416268216577aec7306b" -dependencies = [ - "chrono", -] - -[[package]] -name = "tiny-keccak" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2" -dependencies = [ - "crunchy 0.2.2", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy 0.2.2", -] - -[[package]] -name = "tinytemplate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tokio" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" -dependencies = [ - "bytes", - "futures", - "mio", - "num_cpus", - "tokio-codec", - "tokio-current-thread", - "tokio-executor", - "tokio-fs", - "tokio-io", - "tokio-reactor", - "tokio-sync", - "tokio-tcp", - "tokio-threadpool", - "tokio-timer 0.2.13", - "tokio-udp", - "tokio-uds", -] - -[[package]] -name = "tokio-buf" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" -dependencies = [ - "bytes", - "either", - "futures", -] - -[[package]] -name = "tokio-codec" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f" -dependencies = [ - "bytes", - "futures", - "tokio-io", -] - -[[package]] -name = "tokio-core" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeeffbbb94209023feaef3c196a41cbcdafa06b4a6f893f68779bb5e53796f71" -dependencies = [ - "bytes", - "futures", - "iovec", - "log", - "mio", - "scoped-tls", - "tokio", - "tokio-executor", - "tokio-io", - "tokio-reactor", - "tokio-timer 0.2.13", -] - -[[package]] -name = "tokio-current-thread" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" -dependencies = [ - "futures", - "tokio-executor", -] - -[[package]] -name = "tokio-executor" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures", -] - -[[package]] -name = "tokio-fs" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af" -dependencies = [ - "futures", - "tokio-io", - "tokio-threadpool", -] - -[[package]] -name = "tokio-io" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" -dependencies = [ - "bytes", - "futures", - "log", -] - -[[package]] -name = "tokio-named-pipes" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae" -dependencies = [ - "bytes", - "futures", - "mio", - "mio-named-pipes", - "tokio", -] - -[[package]] -name = "tokio-reactor" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures", - "lazy_static", - "log", - "mio", - "num_cpus", - "parking_lot 0.9.0", - "slab 0.4.2", - "tokio-executor", - "tokio-io", - "tokio-sync", -] - -[[package]] -name = "tokio-retry" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05746ae87dca83a2016b4f5dba5b237b897dd12fd324f60afe282112f16969a" -dependencies = [ - "futures", - "rand 0.3.23", - "tokio-core", - "tokio-service", -] - -[[package]] -name = "tokio-rustls" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a199832a67452c60bed18ed951d28d5755ff57b02b3d2d535d9f13a81ea6c9" -dependencies = [ - "futures", - "rustls", - "tokio-io", - "webpki", -] - -[[package]] -name = "tokio-service" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" -dependencies = [ - "futures", -] - -[[package]] -name = "tokio-sync" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76" -dependencies = [ - "fnv", - "futures", -] - -[[package]] -name = "tokio-tcp" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" -dependencies = [ - "bytes", - "futures", - "iovec", - "mio", - "tokio-io", - "tokio-reactor", -] - -[[package]] -name = "tokio-threadpool" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" -dependencies = [ - "crossbeam-deque 0.7.1", - "crossbeam-queue 0.2.3", - "crossbeam-utils 0.7.2", - "futures", - "lazy_static", - "log", - "num_cpus", - "slab 0.4.2", - "tokio-executor", -] - -[[package]] -name = "tokio-timer" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6131e780037787ff1b3f8aad9da83bca02438b72277850dd6ad0d455e0e20efc" -dependencies = [ - "futures", - "slab 0.3.0", -] - -[[package]] -name = "tokio-timer" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures", - "slab 0.4.2", - "tokio-executor", -] - -[[package]] -name = "tokio-udp" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02298505547f73e60f568359ef0d016d5acd6e830ab9bc7c4a5b3403440121b" -dependencies = [ - "bytes", - "futures", - "log", - "mio", - "tokio-codec", - "tokio-io", - "tokio-reactor", -] - -[[package]] -name = "tokio-uds" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445" -dependencies = [ - "bytes", - "futures", - "iovec", - "libc", - "log", - "mio", - "mio-uds", - "tokio-codec", - "tokio-io", - "tokio-reactor", -] - -[[package]] -name = "toml" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" -dependencies = [ - "serde", -] - -[[package]] -name = "trace-time" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9adf04084eeb9a1ea91be6c3f8ef3df392391c91fc7d8f696d4875f6754e715" -dependencies = [ - "log", -] - -[[package]] -name = "transient-hashmap" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb4b191d033a35edfce392a38cdcf9790b6cebcb30fa690c312c29da4dc433e" - -[[package]] -name = "trie-db" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7319e28ca295f27359d944a682f7f65b419158bf1590c92cadc0000258d788" -dependencies = [ - "elastic-array", - "hash-db 0.11.0", - "log", - "rand 0.6.5", -] - -[[package]] -name = "trie-standardmap" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3161ba520ab28cd8e6b68e1126f1009f6e335339d1a73b978139011703264c8" -dependencies = [ - "hash-db 0.15.2", - "keccak-hasher 0.15.3", -] - -[[package]] -name = "triehash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92148b4d8d55eff71bc8c9e3c5f714e266c2a05e724dce5405a10deabbf449a8" -dependencies = [ - "hash-db 0.11.0", - "rlp", -] - -[[package]] -name = "triehash-ethereum" -version = "0.2.0" -dependencies = [ - "ethereum-types 0.9.2", - "keccak-hasher 0.1.1", - "triehash", -] - -[[package]] -name = "try-lock" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2aa4715743892880f70885373966c83d73ef1b0838a664ef0c76fffd35e7c2" - -[[package]] -name = "try-lock" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" - -[[package]] -name = "txpool" -version = "1.0.0-alpha" -dependencies = [ - "ethereum-types 0.7.0", - "log", - "smallvec 0.6.13", - "trace-time", -] - -[[package]] -name = "typenum" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" - -[[package]] -name = "ucd-util" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85f514e095d348c279b1e5cd76795082cf15bd59b93207832abe0b1d8fed236" - -[[package]] -name = "uint" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177" -dependencies = [ - "byteorder", - "crunchy 0.2.2", - "rustc-hex 2.1.0", - "static_assertions 1.1.0", -] - -[[package]] -name = "unexpected" -version = "0.1.0" - -[[package]] -name = "unicase" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" -dependencies = [ - "smallvec 0.6.13", -] - -[[package]] -name = "unicode-segmentation" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f5526225fd8b77342d5986ab5f6055552e9c0776193b5b63fd53b46debfad7" - -[[package]] -name = "unicode-width" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" - -[[package]] -name = "untrusted" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f" - -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - -[[package]] -name = "url" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" -dependencies = [ - "idna 0.2.0", - "matches", - "percent-encoding 2.1.0", -] - -[[package]] -name = "using_queue" -version = "0.1.0" - -[[package]] -name = "utf8-ranges" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" - -[[package]] -name = "validator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236a5eda3df2c877872e98dbc55d497d943792e6405d8fc65bd4f8a5e3b53c99" -dependencies = [ - "idna 0.1.5", - "lazy_static", - "regex 1.3.9", - "serde", - "serde_derive", - "serde_json", - "url 1.7.2", -] - -[[package]] -name = "validator_derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d360d6f5754972c0c1da14fb3d5580daa31aee566e1e45e2f8d3bf5950ecd3e9" -dependencies = [ - "if_chain", - "lazy_static", - "proc-macro2 0.4.30", - "quote 0.6.13", - "regex 1.3.9", - "syn 0.15.26", - "validator", -] - -[[package]] -name = "vec_map" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" - -[[package]] -name = "vergen" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3365f36c57e5df714a34be40902b27a992eeddb9996eca52d0584611cf885d" -dependencies = [ - "bitflags 0.7.0", - "time", -] - -[[package]] -name = "version_check" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" - -[[package]] -name = "vm" -version = "0.1.0" -dependencies = [ - "ethereum-types 0.9.2", - "ethjson", - "keccak-hash", - "parity-bytes", - "patricia-trie-ethereum", - "rlp", -] - -[[package]] -name = "walkdir" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -dependencies = [ - "same-file", - "winapi 0.3.8", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05d9d966753fa4b5c8db73fcab5eed4549cfe0e1e4e66911e5564a0085c35d1" -dependencies = [ - "futures", - "log", - "try-lock 0.1.0", -] - -[[package]] -name = "want" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" -dependencies = [ - "futures", - "log", - "try-lock 0.2.2", -] - -[[package]] -name = "wasi" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "wasm" -version = "0.1.0" -dependencies = [ - "byteorder", - "env_logger", - "ethereum-types 0.9.2", - "libc", - "log", - "parity-wasm", - "pwasm-utils", - "vm", - "wasmi", -] - -[[package]] -name = "wasmi" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4a6d379e9332b1b1f52c5a87f2481c85c7c931d8ec411963dfb8f26b1ec1e3" -dependencies = [ - "byteorder", - "memory_units", - "nan-preserving-float", - "parity-wasm", -] - -[[package]] -name = "webpki" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7e1cd7900a3a6b65a3e8780c51a3e6b59c0e2c55c6dc69578c288d69f7d082" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c10fa4212003ba19a564f25cd8ab572c6791f99a03cc219c13ed35ccab00de0e" -dependencies = [ - "untrusted", - "webpki", -] - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" -dependencies = [ - "winapi 0.3.8", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "wincolor" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" -dependencies = [ - "winapi 0.3.8", - "winapi-util", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "xdg" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" - -[[package]] -name = "xml-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1cb601d29fe2c2ac60a2b2e5e293994d87a1f6fa9687a31a15270f909be9c2" -dependencies = [ - "bitflags 1.2.1", -] - -[[package]] -name = "xmltree" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9cfb54ca6b8f17d2377219ce485b134d53561b77e1393c7ea416f543a527431" -dependencies = [ - "xml-rs", -] - -[[package]] -name = "zeroize" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36" diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix deleted file mode 100644 index a41b9df837..0000000000 --- a/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, cmake -, openssl -, pkg-config -, stdenv -, systemd -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "openethereum"; - version = "3.3.5"; - - src = fetchFromGitHub { - owner = "openethereum"; - repo = "openethereum"; - rev = "v${version}"; - sha256 = "sha256-PpRRoufuZ9fXbLonMAo6qaA/jtJZXW98uM0BEXdJ2oU="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "app_dirs-1.2.1" = "sha256-zn9/b6VUuQ4U7KpN95hWumaKUg+xUdyEBRBngWhHuqA="; - "bn-0.4.4" = "sha256-SdlIZwN2AVrq8Ezz0AeLRc+4G/YpqwCpFPS8QqLQ0yU="; - "ctrlc-1.1.1" = "sha256-AqJR2B4PnR/fc7N+t2L0zZQ1fYy1GouGKkzupQw8uRQ="; - "eth-secp256k1-0.5.7" = "sha256-2ZwY2cODE7AVJ2WBTuHZ01dZXegeNmZHKRUXVemLs1A="; - "eth_pairings-0.6.0" = "sha256-2qLyuOArJOH029JKXuyB67p9gggsTRpavW1AO4O93L4="; - "ethabi-11.0.0" = "sha256-QVlwdv5iHOhp98rwSZC6b+YFLTdlq3va6YzAZzm8q8Y="; - "reth-util-0.1.0" = "sha256-3W8ESWCqEtDuoY2YhB1YVlQXs91XWfuAN2feuv0u6yU="; - }; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isLinux [ systemd ] - ++ lib.optionals stdenv.isDarwin [ darwin.Security ]; - - buildFeatures = [ "final" ]; - - # Fix tests by preventing them from writing to /homeless-shelter. - preCheck = '' - export HOME=$(mktemp -d) - ''; - - # Exclude some tests that don't work in the sandbox - # - Nat test requires network access - checkFlags = [ "--skip" "configuration::tests::should_resolve_external_nat_hosts" ]; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Fast, light, robust Ethereum implementation"; - homepage = "http://parity.io/ethereum"; - license = licenses.gpl3; - maintainers = with maintainers; [ akru ]; - platforms = lib.platforms.unix; - mainProgram = "openethereum"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/optimism/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/optimism/default.nix index 7e368b3e68..fcd5245d09 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/optimism/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/optimism/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "optimism"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "optimism"; rev = "op-node/v${version}"; - hash = "sha256-KKCVjGBQeO5K6wq3GV3f7qaGY1uXNPI27w4DEC31pzU="; + hash = "sha256-220fnMJDgvdGJtN0XkKtqNP94KfbmN5qhghfjHJaAxQ="; fetchSubmodules = true; }; subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ]; - vendorHash = "sha256-pQhNXOYohBoV5QsBnNpNjFg+Vvk5jK1zvSKkolp4yiQ="; + vendorHash = "sha256-yG910xpk2MHCD2LHh7aD09KMCux1X252fOHCsyUc/ks="; buildInputs = [ libpcap diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock index ad5d007915..68af7cb7ff 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -165,7 +165,7 @@ dependencies = [ "hex-literal", "itoa", "proptest", - "rand", + "rand 0.8.5", "ruint", "serde", "tiny-keccak", @@ -177,23 +177,11 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc0fac0fc16baf1f63f78b47c3d24718f3619b0714076f6a02957d808d52cbef" dependencies = [ - "alloy-rlp-derive", "arrayvec 0.7.4", "bytes", "smol_str", ] -[[package]] -name = "alloy-rlp-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0391754c09fab4eae3404d19d0d297aa1c670c1775ab51d8a5312afeca23157" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.53", -] - [[package]] name = "alloy-sol-macro" version = "0.4.2" @@ -204,8 +192,8 @@ dependencies = [ "dunce", "heck 0.4.1", "proc-macro-error", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", "syn-solidity", "tiny-keccak", @@ -331,8 +319,8 @@ dependencies = [ "include_dir", "itertools 0.10.5", "proc-macro-error", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -345,8 +333,8 @@ dependencies = [ "include_dir", "itertools 0.10.5", "proc-macro-error", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -542,7 +530,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" dependencies = [ - "quote", + "quote 1.0.35", "syn 1.0.109", ] @@ -552,7 +540,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" dependencies = [ - "quote", + "quote 1.0.35", "syn 1.0.109", ] @@ -564,7 +552,7 @@ checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ "num-bigint", "num-traits", - "quote", + "quote 1.0.35", "syn 1.0.109", ] @@ -576,8 +564,8 @@ checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ "num-bigint", "num-traits", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -678,8 +666,8 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -690,7 +678,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ "num-traits", - "rand", + "rand 0.8.5", ] [[package]] @@ -700,7 +688,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand", + "rand 0.8.5", "rayon", ] @@ -772,8 +760,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", "synstructure", ] @@ -784,8 +772,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -821,6 +809,7 @@ dependencies = [ "parachains-common", "rococo-emulated-chain", "sp-core", + "staging-xcm", "testnet-parachains-constants", ] @@ -838,16 +827,19 @@ dependencies = [ "pallet-assets", "pallet-balances", "pallet-message-queue", + "pallet-treasury", + "pallet-utility", "pallet-xcm", "parachains-common", "parity-scale-codec", "penpal-runtime", + "polkadot-runtime-common", "rococo-runtime", + "rococo-runtime-constants", "rococo-system-emulated-network", "sp-runtime", "staging-xcm", "staging-xcm-executor", - "testnet-parachains-constants", ] [[package]] @@ -879,6 +871,7 @@ dependencies = [ "hex-literal", "log", "pallet-asset-conversion", + "pallet-asset-conversion-ops", "pallet-asset-conversion-tx-payment", "pallet-assets", "pallet-aura", @@ -941,6 +934,7 @@ dependencies = [ "frame-support", "parachains-common", "sp-core", + "staging-xcm", "testnet-parachains-constants", "westend-emulated-chain", ] @@ -969,7 +963,6 @@ dependencies = [ "sp-runtime", "staging-xcm", "staging-xcm-executor", - "testnet-parachains-constants", "westend-runtime", "westend-system-emulated-network", ] @@ -1003,6 +996,7 @@ dependencies = [ "hex-literal", "log", "pallet-asset-conversion", + "pallet-asset-conversion-ops", "pallet-asset-conversion-tx-payment", "pallet-assets", "pallet-aura", @@ -1104,6 +1098,16 @@ dependencies = [ "substrate-wasm-builder", ] +[[package]] +name = "async-attributes" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +dependencies = [ + "quote 1.0.35", + "syn 1.0.109", +] + [[package]] name = "async-channel" version = "1.9.0" @@ -1141,6 +1145,21 @@ dependencies = [ "futures-lite", ] +[[package]] +name = "async-global-executor" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-lock 2.8.0", + "blocking", + "futures-lite", + "once_cell", +] + [[package]] name = "async-io" version = "1.13.0" @@ -1211,6 +1230,33 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-attributes", + "async-channel", + "async-global-executor", + "async-io", + "async-lock 2.8.0", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite 0.2.12", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + [[package]] name = "async-stream" version = "0.3.5" @@ -1228,8 +1274,8 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -1245,8 +1291,8 @@ version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -1293,8 +1339,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" dependencies = [ "proc-macro-error", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -1304,6 +1350,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "getrandom 0.2.10", + "instant", + "rand 0.8.5", +] + [[package]] name = "backtrace" version = "0.3.69" @@ -1424,8 +1481,8 @@ dependencies = [ "lazycell", "peeking_take_while", "prettyplease 0.2.12", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "regex", "rustc-hash", "shlex", @@ -1646,6 +1703,23 @@ dependencies = [ "scale-info", ] +[[package]] +name = "bp-beefy" +version = "0.1.0" +dependencies = [ + "binary-merkle-tree", + "bp-runtime", + "frame-support", + "pallet-beefy-mmr", + "pallet-mmr", + "parity-scale-codec", + "scale-info", + "serde", + "sp-consensus-beefy", + "sp-runtime", + "sp-std 14.0.0", +] + [[package]] name = "bp-bridge-hub-cumulus" version = "0.7.0" @@ -1880,7 +1954,7 @@ dependencies = [ "bp-parachains", "bp-polkadot-core", "bp-runtime", - "ed25519-dalek", + "ed25519-dalek 2.1.0", "finality-grandpa", "parity-scale-codec", "sp-application-crypto", @@ -1922,7 +1996,7 @@ dependencies = [ [[package]] name = "bridge-hub-common" -version = "0.0.0" +version = "0.1.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1954,7 +2028,6 @@ name = "bridge-hub-rococo-integration-tests" version = "1.0.0" dependencies = [ "asset-hub-rococo-runtime", - "bp-messages", "bridge-hub-rococo-runtime", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", @@ -1972,7 +2045,6 @@ dependencies = [ "rococo-westend-system-emulated-network", "scale-info", "snowbridge-core", - "snowbridge-pallet-inbound-queue", "snowbridge-pallet-inbound-queue-fixtures", "snowbridge-pallet-outbound-queue", "snowbridge-pallet-system", @@ -2139,7 +2211,6 @@ dependencies = [ name = "bridge-hub-westend-integration-tests" version = "1.0.0" dependencies = [ - "bp-messages", "bridge-hub-westend-runtime", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", @@ -2151,7 +2222,6 @@ dependencies = [ "pallet-message-queue", "pallet-xcm", "parachains-common", - "parity-scale-codec", "rococo-westend-system-emulated-network", "sp-runtime", "staging-xcm", @@ -2411,6 +2481,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +[[package]] +name = "castaway" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" + [[package]] name = "cc" version = "1.0.83" @@ -2551,6 +2627,19 @@ dependencies = [ "unsigned-varint", ] +[[package]] +name = "cid" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" +dependencies = [ + "core2", + "multibase", + "multihash 0.18.1", + "serde", + "unsigned-varint", +] + [[package]] name = "cipher" version = "0.2.5" @@ -2599,6 +2688,21 @@ dependencies = [ "libloading", ] +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim 0.8.0", + "textwrap 0.11.0", + "unicode-width", + "vec_map", +] + [[package]] name = "clap" version = "3.2.25" @@ -2613,7 +2717,7 @@ dependencies = [ "once_cell", "strsim 0.10.0", "termcolor", - "textwrap", + "textwrap 0.16.0", ] [[package]] @@ -2665,8 +2769,8 @@ checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck 0.4.1", "proc-macro-error", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -2677,8 +2781,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" dependencies = [ "heck 0.5.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -2732,6 +2836,36 @@ dependencies = [ "testnet-parachains-constants", ] +[[package]] +name = "collectives-westend-integration-tests" +version = "1.0.0" +dependencies = [ + "assert_matches", + "asset-hub-westend-runtime", + "collectives-westend-runtime", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "emulated-integration-tests-common", + "frame-support", + "pallet-asset-rate", + "pallet-assets", + "pallet-balances", + "pallet-message-queue", + "pallet-treasury", + "pallet-utility", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "polkadot-runtime-common", + "sp-runtime", + "staging-xcm", + "staging-xcm-executor", + "testnet-parachains-constants", + "westend-runtime", + "westend-runtime-constants", + "westend-system-emulated-network", +] + [[package]] name = "collectives-westend-runtime" version = "3.0.0" @@ -2836,8 +2970,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d51beaa537d73d2d1ff34ee70bc095f170420ab2ec5d687ecd3ec2b0d092514b" dependencies = [ "nom", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -2858,6 +2992,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "comfy-table" version = "7.1.0" @@ -3347,6 +3491,21 @@ dependencies = [ "wasmtime-types", ] +[[package]] +name = "crc" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2b432c56615136f8dba245fed7ec3d5518c500a31108661067e61e72fe7e6bc" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.3.2" @@ -3422,16 +3581,6 @@ dependencies = [ "itertools 0.10.5", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -3769,7 +3918,7 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "portpicker", - "rand", + "rand 0.8.5", "sc-cli", "sc-client-api", "sc-consensus", @@ -3865,6 +4014,7 @@ dependencies = [ "cumulus-primitives-proof-size-hostfunction", "cumulus-test-client", "cumulus-test-relay-sproof-builder", + "cumulus-test-runtime", "environmental", "frame-benchmarking", "frame-support", @@ -3879,9 +4029,10 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", - "rand", + "rand 0.8.5", "sc-client-api", "scale-info", + "sp-consensus-slots", "sp-core", "sp-crypto-hashing", "sp-externalities 0.25.0", @@ -3904,8 +4055,8 @@ name = "cumulus-pallet-parachain-system-proc-macro" version = "0.6.0" dependencies = [ "proc-macro-crate 3.0.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -4201,7 +4352,7 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-overseer", - "rand", + "rand 0.8.5", "sc-client-api", "sc-rpc-api", "sc-service", @@ -4244,15 +4395,19 @@ dependencies = [ "polkadot-primitives", "sc-block-builder", "sc-consensus", + "sc-consensus-aura", "sc-executor", "sc-executor-common", "sc-service", "sp-api", + "sp-application-crypto", "sp-blockchain", + "sp-consensus-aura", "sp-core", "sp-inherents", "sp-io", "sp-keyring", + "sp-keystore", "sp-runtime", "sp-timestamp", "substrate-test-client", @@ -4275,16 +4430,22 @@ dependencies = [ name = "cumulus-test-runtime" version = "0.1.0" dependencies = [ + "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", + "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-storage-weight-reclaim", "frame-executive", "frame-support", "frame-system", "frame-system-rpc-runtime-api", + "pallet-aura", + "pallet-authorship", "pallet-balances", + "pallet-collator-selection", "pallet-glutton", "pallet-message-queue", + "pallet-session", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", @@ -4292,6 +4453,7 @@ dependencies = [ "scale-info", "sp-api", "sp-block-builder", + "sp-consensus-aura", "sp-core", "sp-genesis-builder", "sp-inherents", @@ -4313,7 +4475,10 @@ dependencies = [ "clap 4.5.3", "criterion 0.5.1", "cumulus-client-cli", + "cumulus-client-collator", + "cumulus-client-consensus-aura", "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", "cumulus-client-consensus-relay-chain", "cumulus-client-parachain-inherent", "cumulus-client-pov-recovery", @@ -4342,7 +4507,7 @@ dependencies = [ "polkadot-service", "polkadot-test-service", "portpicker", - "rand", + "rand 0.8.5", "rococo-parachain-runtime", "sc-basic-authorship", "sc-block-builder", @@ -4350,6 +4515,7 @@ dependencies = [ "sc-cli", "sc-client-api", "sc-consensus", + "sc-consensus-aura", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", @@ -4366,6 +4532,7 @@ dependencies = [ "sp-authority-discovery", "sp-blockchain", "sp-consensus", + "sp-consensus-aura", "sp-consensus-grandpa", "sp-core", "sp-io", @@ -4382,6 +4549,37 @@ dependencies = [ "url", ] +[[package]] +name = "curl" +version = "0.4.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" +dependencies = [ + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", + "socket2 0.5.6", + "windows-sys 0.52.0", +] + +[[package]] +name = "curl-sys" +version = "0.4.72+curl-8.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea" +dependencies = [ + "cc", + "libc", + "libnghttp2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "windows-sys 0.52.0", +] + [[package]] name = "curve25519-dalek" version = "3.2.0" @@ -4418,8 +4616,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -4457,8 +4655,8 @@ dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "scratch", "syn 2.0.53", ] @@ -4475,8 +4673,8 @@ version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -4564,8 +4762,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -4575,8 +4773,8 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -4586,8 +4784,8 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -4598,8 +4796,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "rustc_version 0.4.0", "syn 1.0.109", ] @@ -4694,8 +4892,8 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -4754,8 +4952,8 @@ dependencies = [ "common-path", "derive-syn-parse 0.2.0", "once_cell", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "regex", "syn 2.0.53", "termcolor", @@ -4803,8 +5001,8 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -4825,10 +5023,19 @@ dependencies = [ "elliptic-curve", "rfc6979", "serdect", - "signature", + "signature 2.1.0", "spki", ] +[[package]] +name = "ed25519" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +dependencies = [ + "signature 1.6.4", +] + [[package]] name = "ed25519" version = "2.2.2" @@ -4836,7 +5043,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" dependencies = [ "pkcs8", - "signature", + "signature 2.1.0", +] + +[[package]] +name = "ed25519-dalek" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +dependencies = [ + "curve25519-dalek 3.2.0", + "ed25519 1.5.3", + "rand 0.7.3", + "serde", + "sha2 0.9.9", + "zeroize", ] [[package]] @@ -4846,7 +5067,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek 4.1.2", - "ed25519", + "ed25519 2.2.2", "rand_core 0.6.4", "serde", "sha2 0.10.7", @@ -4875,7 +5096,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" dependencies = [ "curve25519-dalek 4.1.2", - "ed25519", + "ed25519 2.2.2", "hashbrown 0.14.3", "hex", "rand_core 0.6.4", @@ -4963,11 +5184,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck 0.4.1", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2 1.0.75", + "quote 1.0.35", + "syn 2.0.53", +] + [[package]] name = "enumflags2" version = "0.7.7" @@ -4983,8 +5216,8 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -4994,8 +5227,8 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -5057,6 +5290,21 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "equivocation-detector" +version = "0.1.0" +dependencies = [ + "async-std", + "async-trait", + "bp-header-chain", + "finality-relay", + "frame-support", + "futures", + "log", + "num-traits", + "relay-utils", +] + [[package]] name = "erased-serde" version = "0.4.4" @@ -5182,8 +5430,8 @@ checksum = "a718c0675c555c5f976fff4ea9e2c150fa06cefa201cadef87cfbf9324075881" dependencies = [ "blake3", "fs-err", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", ] [[package]] @@ -5194,8 +5442,8 @@ checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7" dependencies = [ "blake2 0.10.6", "fs-err", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -5266,8 +5514,8 @@ dependencies = [ "expander 0.0.4", "indexmap 1.9.3", "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", "thiserror", ] @@ -5362,10 +5610,25 @@ dependencies = [ "num-traits", "parity-scale-codec", "parking_lot 0.12.1", - "rand", + "rand 0.8.5", "scale-info", ] +[[package]] +name = "finality-relay" +version = "0.1.0" +dependencies = [ + "async-std", + "async-trait", + "backoff", + "bp-header-chain", + "futures", + "log", + "num-traits", + "parking_lot 0.12.1", + "relay-utils", +] + [[package]] name = "findshlibs" version = "0.10.2" @@ -5385,7 +5648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -5422,6 +5685,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "fork-tree" version = "12.0.0" @@ -5454,35 +5732,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" -[[package]] -name = "frame" -version = "0.0.1-dev" -dependencies = [ - "docify", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", - "log", - "pallet-examples", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-arithmetic", - "sp-block-builder", - "sp-consensus-aura", - "sp-consensus-grandpa", - "sp-core", - "sp-inherents", - "sp-io", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 14.0.0", - "sp-transaction-pool", - "sp-version", -] - [[package]] name = "frame-benchmarking" version = "28.0.0" @@ -5529,9 +5778,10 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "rand", + "rand 0.8.5", "rand_pcg", "sc-block-builder", + "sc-chain-spec", "sc-cli", "sc-client-api", "sc-client-db", @@ -5545,6 +5795,7 @@ dependencies = [ "sp-core", "sp-database", "sp-externalities 0.25.0", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keystore", @@ -5579,8 +5830,8 @@ dependencies = [ "frame-support", "parity-scale-codec", "proc-macro-crate 3.0.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "scale-info", "sp-arithmetic", "syn 2.0.53", @@ -5595,7 +5846,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "sp-arithmetic", "sp-core", @@ -5615,7 +5866,7 @@ dependencies = [ "frame-support", "honggfuzz", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "sp-arithmetic", "sp-npos-elections", @@ -5657,6 +5908,20 @@ dependencies = [ "serde", ] +[[package]] +name = "frame-omni-bencher" +version = "0.1.0" +dependencies = [ + "clap 4.5.3", + "cumulus-primitives-proof-size-hostfunction", + "env_logger 0.11.3", + "frame-benchmarking-cli", + "log", + "sc-cli", + "sp-runtime", + "sp-statement-store", +] + [[package]] name = "frame-remote-externalities" version = "0.35.0" @@ -5736,8 +6001,8 @@ dependencies = [ "itertools 0.10.5", "macro_magic", "proc-macro-warning", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "regex", "sp-crypto-hashing", "syn 2.0.53", @@ -5749,8 +6014,8 @@ version = "10.0.0" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 3.0.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -5758,8 +6023,8 @@ dependencies = [ name = "frame-support-procedural-tools-derive" version = "11.0.0" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -5820,8 +6085,8 @@ dependencies = [ name = "frame-support-test-stg-frame-crate" version = "0.1.0" dependencies = [ - "frame", "parity-scale-codec", + "polkadot-sdk-frame", "scale-info", ] @@ -5991,8 +6256,8 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -6123,7 +6388,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" dependencies = [ - "rand", + "rand 0.8.5", "rand_core 0.6.4", ] @@ -6174,6 +6439,18 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "glutton-westend-runtime" version = "3.0.0" @@ -6234,7 +6511,7 @@ dependencies = [ "nonzero_ext", "parking_lot 0.12.1", "quanta", - "rand", + "rand 0.8.5", "smallvec", ] @@ -6251,9 +6528,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -6341,6 +6618,15 @@ dependencies = [ "hashbrown 0.14.3", ] +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "heck" version = "0.4.1" @@ -6651,8 +6937,8 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -6671,8 +6957,8 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", ] [[package]] @@ -6809,6 +7095,33 @@ dependencies = [ "winapi", ] +[[package]] +name = "isahc" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" +dependencies = [ + "async-channel", + "castaway", + "crossbeam-utils", + "curl", + "curl-sys", + "encoding_rs", + "event-listener 2.5.3", + "futures-lite", + "http", + "log", + "mime", + "once_cell", + "polling", + "slab", + "sluice", + "tracing", + "tracing-futures", + "url", + "waker-fn", +] + [[package]] name = "itertools" version = "0.10.5" @@ -6857,6 +7170,17 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" +[[package]] +name = "jsonpath_lib" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaa63191d68230cccb81c5aa23abd53ed64d83337cacbb25a7b8c7979523774f" +dependencies = [ + "log", + "serde", + "serde_json", +] + [[package]] name = "jsonrpsee" version = "0.22.2" @@ -6910,7 +7234,7 @@ dependencies = [ "jsonrpsee-types", "parking_lot 0.12.1", "pin-project", - "rand", + "rand 0.8.5", "rustc-hash", "serde", "serde_json", @@ -6948,8 +7272,8 @@ checksum = "30ca066e73dd70294aebc5c2675d8ffae43be944af027c857ce0d4c51785f014" dependencies = [ "heck 0.4.1", "proc-macro-crate 3.0.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -7060,6 +7384,7 @@ dependencies = [ "node-primitives", "pallet-alliance", "pallet-asset-conversion", + "pallet-asset-conversion-ops", "pallet-asset-conversion-tx-payment", "pallet-asset-rate", "pallet-asset-tx-payment", @@ -7082,6 +7407,7 @@ dependencies = [ "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", + "pallet-example-mbm", "pallet-example-tasks", "pallet-fast-unstake", "pallet-glutton", @@ -7166,6 +7492,15 @@ dependencies = [ "substrate-wasm-builder", ] +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + [[package]] name = "kvdb" version = "0.13.0" @@ -7239,9 +7574,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libflate" @@ -7290,6 +7625,16 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +[[package]] +name = "libnghttp2-sys" +version = "0.1.9+1.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b57e858af2798e167e709b9d969325b6d8e9d50232fcbc494d7d54f976854a64" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "libp2p" version = "0.51.4" @@ -7367,7 +7712,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project", "quick-protobuf", - "rand", + "rand 0.8.5", "rw-stream-sink", "smallvec", "thiserror", @@ -7386,7 +7731,7 @@ dependencies = [ "log", "parking_lot 0.12.1", "smallvec", - "trust-dns-resolver", + "trust-dns-resolver 0.22.0", ] [[package]] @@ -7418,12 +7763,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58 0.4.0", - "ed25519-dalek", + "ed25519-dalek 2.1.0", "log", "multiaddr", "multihash 0.17.0", "quick-protobuf", - "rand", + "rand 0.8.5", "sha2 0.10.7", "thiserror", "zeroize", @@ -7448,7 +7793,7 @@ dependencies = [ "libp2p-swarm", "log", "quick-protobuf", - "rand", + "rand 0.8.5", "sha2 0.10.7", "smallvec", "thiserror", @@ -7470,11 +7815,11 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "rand", + "rand 0.8.5", "smallvec", "socket2 0.4.9", "tokio", - "trust-dns-proto", + "trust-dns-proto 0.22.0", "void", ] @@ -7506,7 +7851,7 @@ dependencies = [ "log", "once_cell", "quick-protobuf", - "rand", + "rand 0.8.5", "sha2 0.10.7", "snow", "static_assertions", @@ -7528,7 +7873,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "rand", + "rand 0.8.5", "void", ] @@ -7548,7 +7893,7 @@ dependencies = [ "log", "parking_lot 0.12.1", "quinn-proto", - "rand", + "rand 0.8.5", "rustls 0.20.8", "thiserror", "tokio", @@ -7566,7 +7911,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-swarm", - "rand", + "rand 0.8.5", "smallvec", ] @@ -7585,7 +7930,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm-derive", "log", - "rand", + "rand 0.8.5", "smallvec", "tokio", "void", @@ -7598,7 +7943,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fba456131824ab6acd4c7bf61e9c0f0a3014b5fc9868ccb8e10d344594cdc4f" dependencies = [ "heck 0.4.1", - "quote", + "quote 1.0.35", "syn 1.0.109", ] @@ -7633,7 +7978,7 @@ dependencies = [ "rustls 0.20.8", "thiserror", "webpki", - "x509-parser", + "x509-parser 0.14.0", "yasna", ] @@ -7711,7 +8056,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand", + "rand 0.8.5", "serde", "sha2 0.9.9", "typenum", @@ -7753,6 +8098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", + "libc", "pkg-config", "vcpkg", ] @@ -7838,6 +8184,60 @@ dependencies = [ "paste", ] +[[package]] +name = "litep2p" +version = "0.3.0" +source = "git+https://github.com/paritytech/litep2p?branch=master#b142c9eb611fb2fe78d2830266a3675b37299ceb" +dependencies = [ + "async-trait", + "bs58 0.4.0", + "bytes", + "cid 0.10.1", + "ed25519-dalek 1.0.1", + "futures", + "futures-timer", + "hex-literal", + "indexmap 2.2.3", + "libc", + "mockall", + "multiaddr", + "multihash 0.17.0", + "network-interface", + "nohash-hasher", + "parking_lot 0.12.1", + "pin-project", + "prost 0.11.9", + "prost-build", + "quinn", + "rand 0.8.5", + "rcgen", + "ring 0.16.20", + "rustls 0.20.8", + "serde", + "sha2 0.10.7", + "simple-dns", + "smallvec", + "snow", + "socket2 0.5.6", + "static_assertions", + "str0m", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tungstenite 0.20.1", + "tokio-util", + "tracing", + "trust-dns-resolver 0.23.2", + "uint", + "unsigned-varint", + "url", + "webpki", + "x25519-dalek 2.0.0", + "x509-parser 0.15.1", + "yasna", + "zeroize", +] + [[package]] name = "lock_api" version = "0.4.10" @@ -7937,7 +8337,7 @@ checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" dependencies = [ "macro_magic_core", "macro_magic_macros", - "quote", + "quote 1.0.35", "syn 2.0.53", ] @@ -7950,8 +8350,8 @@ dependencies = [ "const-random", "derive-syn-parse 0.1.5", "macro_magic_core_macros", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -7961,8 +8361,8 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -7973,7 +8373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" dependencies = [ "macro_magic_core", - "quote", + "quote 1.0.35", "syn 2.0.53", ] @@ -8104,6 +8504,24 @@ dependencies = [ "zeroize", ] +[[package]] +name = "messages-relay" +version = "0.1.0" +dependencies = [ + "async-std", + "async-trait", + "bp-messages", + "env_logger 0.11.3", + "finality-relay", + "futures", + "hex", + "log", + "num-traits", + "parking_lot 0.12.1", + "relay-utils", + "sp-arithmetic", +] + [[package]] name = "mick-jaeger" version = "0.1.8" @@ -8111,7 +8529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532" dependencies = [ "futures", - "rand", + "rand 0.8.5", "thrift", ] @@ -8132,11 +8550,11 @@ name = "minimal-template-node" version = "0.0.0" dependencies = [ "clap 4.5.3", - "frame", "futures", "futures-timer", "jsonrpsee", "minimal-template-runtime", + "polkadot-sdk-frame", "sc-basic-authorship", "sc-cli", "sc-client-api", @@ -8166,7 +8584,6 @@ dependencies = [ name = "minimal-template-runtime" version = "0.0.0" dependencies = [ - "frame", "pallet-balances", "pallet-minimal-template", "pallet-sudo", @@ -8174,8 +8591,10 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", + "polkadot-sdk-frame", "scale-info", "sp-genesis-builder", + "sp-runtime", "substrate-wasm-builder", ] @@ -8216,7 +8635,7 @@ dependencies = [ "lioness", "log", "parking_lot 0.12.1", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_distr", "subtle 2.5.0", @@ -8284,8 +8703,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" dependencies = [ "cfg-if", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -8342,10 +8761,14 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" dependencies = [ + "blake2b_simd", + "blake2s_simd", + "blake3", "core2", "digest 0.10.7", "multihash-derive 0.8.0", "sha2 0.10.7", + "sha3", "unsigned-varint", ] @@ -8387,8 +8810,8 @@ checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro-error", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", "synstructure", ] @@ -8412,8 +8835,8 @@ checksum = "d38685e08adb338659871ecfc6ee47ba9b22dcc8abcf6975d379cc49145c3040" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro-error", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", "synstructure", ] @@ -8460,8 +8883,8 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -8472,7 +8895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" dependencies = [ "clap 3.2.25", - "rand", + "rand 0.8.5", ] [[package]] @@ -8547,6 +8970,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "network-interface" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae72fd9dbd7f55dda80c00d66acc3b2130436fcba9ea89118fc508eaae48dfb0" +dependencies = [ + "cc", + "libc", + "thiserror", + "winapi", +] + [[package]] name = "nix" version = "0.24.3" @@ -8613,7 +9048,7 @@ dependencies = [ "node-primitives", "node-testing", "parity-db", - "rand", + "rand 0.8.5", "sc-basic-authorship", "sc-client-api", "sc-transaction-pool", @@ -8768,6 +9203,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -8875,6 +9319,15 @@ dependencies = [ "libc", ] +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -8935,12 +9388,60 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.4.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2 1.0.75", + "quote 1.0.35", + "syn 2.0.53", +] + [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.2.3+3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + [[package]] name = "option-ext" version = "0.2.0" @@ -8975,8 +9476,8 @@ dependencies = [ "itertools 0.11.0", "petgraph", "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -9035,6 +9536,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "pallet-assets", "pallet-balances", "parity-scale-codec", @@ -9048,6 +9550,27 @@ dependencies = [ "sp-std 14.0.0", ] +[[package]] +name = "pallet-asset-conversion-ops" +version = "0.1.0" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-asset-conversion", + "pallet-assets", + "pallet-balances", + "parity-scale-codec", + "primitive-types", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 14.0.0", +] + [[package]] name = "pallet-asset-conversion-tx-payment" version = "10.0.0" @@ -9107,7 +9630,7 @@ dependencies = [ [[package]] name = "pallet-assets" -version = "29.0.0" +version = "29.1.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9243,7 +9766,7 @@ dependencies = [ "frame-election-provider-support", "honggfuzz", "pallet-bags-list", - "rand", + "rand 0.8.5", ] [[package]] @@ -9354,6 +9877,30 @@ dependencies = [ "sp-std 14.0.0", ] +[[package]] +name = "pallet-bridge-beefy" +version = "0.1.0" +dependencies = [ + "bp-beefy", + "bp-runtime", + "bp-test-utils", + "ckb-merkle-mountain-range", + "frame-support", + "frame-system", + "log", + "pallet-beefy-mmr", + "pallet-mmr", + "parity-scale-codec", + "rand 0.8.5", + "scale-info", + "serde", + "sp-consensus-beefy", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 14.0.0", +] + [[package]] name = "pallet-bridge-grandpa" version = "0.7.0" @@ -9448,8 +9995,11 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", + "pretty_assertions", "scale-info", + "sp-api", "sp-arithmetic", "sp-core", "sp-io", @@ -9490,7 +10040,7 @@ dependencies = [ "pallet-session", "pallet-timestamp", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "sp-consensus-aura", "sp-core", @@ -9559,7 +10109,7 @@ dependencies = [ "parity-scale-codec", "paste", "pretty_assertions", - "rand", + "rand 0.8.5", "rand_pcg", "scale-info", "serde", @@ -9634,8 +10184,8 @@ dependencies = [ name = "pallet-contracts-proc-macro" version = "18.0.0" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -9777,7 +10327,7 @@ dependencies = [ "pallet-election-provider-support-benchmarking", "parity-scale-codec", "parking_lot 0.12.1", - "rand", + "rand 0.8.5", "scale-info", "sp-arithmetic", "sp-core", @@ -9844,8 +10394,8 @@ dependencies = [ name = "pallet-example-frame-crate" version = "0.0.1" dependencies = [ - "frame", "parity-scale-codec", + "polkadot-sdk-frame", "scale-info", ] @@ -9866,6 +10416,20 @@ dependencies = [ "sp-std 14.0.0", ] +[[package]] +name = "pallet-example-mbm" +version = "0.1.0" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-migrations", + "parity-scale-codec", + "scale-info", + "sp-io", +] + [[package]] name = "pallet-example-offchain-worker" version = "28.0.0" @@ -10136,7 +10700,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec", - "rand", + "rand 0.8.5", "rand_distr", "scale-info", "serde", @@ -10178,8 +10742,8 @@ dependencies = [ name = "pallet-minimal-template" version = "0.0.0" dependencies = [ - "frame", "parity-scale-codec", + "polkadot-sdk-frame", "scale-info", ] @@ -10369,7 +10933,7 @@ dependencies = [ "honggfuzz", "log", "pallet-nomination-pools", - "rand", + "rand 0.8.5", "sp-io", "sp-runtime", "sp-tracing 16.0.0", @@ -10498,7 +11062,7 @@ dependencies = [ [[package]] name = "pallet-parameters" -version = "0.0.1" +version = "0.1.0" dependencies = [ "docify", "frame-benchmarking", @@ -10784,7 +11348,7 @@ dependencies = [ "pallet-staking-reward-curve", "pallet-timestamp", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "sp-core", "sp-io", @@ -10861,8 +11425,8 @@ name = "pallet-staking-reward-curve" version = "11.0.0" dependencies = [ "proc-macro-crate 3.0.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "sp-runtime", "syn 2.0.53", ] @@ -11212,7 +11776,6 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-common", "scale-info", - "sp-core", "sp-io", "sp-runtime", "sp-std 14.0.0", @@ -11412,6 +11975,21 @@ dependencies = [ "substrate-wasm-builder", ] +[[package]] +name = "parachains-relay" +version = "0.1.0" +dependencies = [ + "async-std", + "async-trait", + "bp-polkadot-core", + "futures", + "log", + "parity-scale-codec", + "relay-substrate-client", + "relay-utils", + "sp-core", +] + [[package]] name = "parachains-runtimes-test-utils" version = "7.0.0" @@ -11450,7 +12028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9" dependencies = [ "bitcoin_hashes 0.13.0", - "rand", + "rand 0.8.5", "rand_core 0.6.4", "serde", "unicode-normalization", @@ -11477,7 +12055,7 @@ dependencies = [ "lz4", "memmap2 0.5.10", "parking_lot 0.12.1", - "rand", + "rand 0.8.5", "siphasher", "snap", ] @@ -11504,8 +12082,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -11539,7 +12117,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ - "proc-macro2", + "proc-macro2 1.0.75", "syn 1.0.109", "synstructure", ] @@ -11960,8 +12538,8 @@ checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" dependencies = [ "pest", "pest_meta", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -12001,8 +12579,8 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -12115,7 +12693,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.6.4", "schnorrkel 0.11.4", @@ -12141,7 +12719,7 @@ dependencies = [ "polkadot-node-subsystem-test-helpers", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "sp-application-crypto", "sp-authority-discovery", @@ -12170,7 +12748,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", - "rand", + "rand 0.8.5", "sc-network", "schnellru", "sp-core", @@ -12202,7 +12780,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", - "rand", + "rand 0.8.5", "sc-network", "schnellru", "sp-application-crypto", @@ -12240,7 +12818,6 @@ dependencies = [ "sp-runtime", "substrate-build-script-utils", "thiserror", - "try-runtime-cli", ] [[package]] @@ -12347,7 +12924,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "quickcheck", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", "sc-network-common", @@ -12439,7 +13016,8 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "polkadot-primitives-test-helpers", - "rand", + "polkadot-subsystem-bench", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.6.4", "sc-keystore", @@ -12717,14 +13295,13 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "procfs", - "rand", + "rand 0.8.5", "rococo-runtime", "rusty-fork", "sc-sysinfo", "slotmap", "sp-core", "sp-maybe-compressed-blob", - "sp-wasm-interface 20.0.0", "tempfile", "test-parachain-adder", "test-parachain-halt", @@ -12761,7 +13338,6 @@ name = "polkadot-node-core-pvf-common" version = "7.0.0" dependencies = [ "assert_matches", - "cfg-if", "cpu-time", "futures", "landlock", @@ -12855,6 +13431,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-primitives", "sc-network", + "sc-network-types", "sp-core", "thiserror", "tokio", @@ -12901,10 +13478,12 @@ dependencies = [ "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "sc-authority-discovery", "sc-network", + "sc-network-types", + "sp-runtime", "strum 0.26.2", "thiserror", "tracing-gum", @@ -12979,6 +13558,7 @@ dependencies = [ "polkadot-statement-table", "sc-client-api", "sc-network", + "sc-network-types", "sc-transaction-pool-api", "smallvec", "sp-api", @@ -13022,7 +13602,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "prioritized-metered-channel", - "rand", + "rand 0.8.5", "sc-client-api", "schnellru", "sp-application-crypto", @@ -13061,7 +13641,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "1.10.0" +version = "1.11.0" dependencies = [ "assert_cmd", "asset-hub-rococo-runtime", @@ -13203,7 +13783,7 @@ name = "polkadot-primitives-test-helpers" version = "1.0.0" dependencies = [ "polkadot-primitives", - "rand", + "rand 0.8.5", "sp-application-crypto", "sp-core", "sp-keyring", @@ -13342,7 +13922,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-runtime-metrics", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "rstest", "rustc-hex", @@ -13377,7 +13957,6 @@ dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", "docify", - "frame", "frame-executive", "frame-support", "frame-system", @@ -13405,6 +13984,7 @@ dependencies = [ "pallet-uniques", "pallet-utility", "parity-scale-codec", + "polkadot-sdk-frame", "sc-cli", "sc-client-db", "sc-consensus-aura", @@ -13434,6 +14014,35 @@ dependencies = [ "substrate-wasm-builder", ] +[[package]] +name = "polkadot-sdk-frame" +version = "0.1.0" +dependencies = [ + "docify", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", + "log", + "pallet-examples", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-arithmetic", + "sp-block-builder", + "sp-consensus-aura", + "sp-consensus-grandpa", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std 14.0.0", + "sp-transaction-pool", + "sp-version", +] + [[package]] name = "polkadot-service" version = "7.0.0" @@ -13648,12 +14257,13 @@ dependencies = [ "prometheus", "pyroscope", "pyroscope_pprofrs", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.6.4", "rand_distr", "sc-keystore", "sc-network", + "sc-network-types", "sc-service", "schnorrkel 0.11.4", "serde", @@ -13726,7 +14336,7 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand", + "rand 0.8.5", "sp-core", "sp-keystore", "substrate-build-script-utils", @@ -13737,7 +14347,6 @@ dependencies = [ name = "polkadot-test-runtime" version = "1.0.0" dependencies = [ - "bitvec", "frame-election-provider-support", "frame-executive", "frame-support", @@ -13762,16 +14371,12 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "parity-scale-codec", - "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", - "rustc-hex", "scale-info", "serde", - "serde_derive", "serde_json", - "smallvec", "sp-api", "sp-authority-discovery", "sp-block-builder", @@ -13819,7 +14424,7 @@ dependencies = [ "polkadot-runtime-parachains", "polkadot-service", "polkadot-test-runtime", - "rand", + "rand 0.8.5", "sc-authority-discovery", "sc-chain-spec", "sc-cli", @@ -13908,8 +14513,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c" dependencies = [ "polkavm-common", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -14018,7 +14623,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" dependencies = [ - "rand", + "rand 0.8.5", ] [[package]] @@ -14105,7 +14710,7 @@ version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "proc-macro2", + "proc-macro2 1.0.75", "syn 1.0.109", ] @@ -14115,7 +14720,7 @@ version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ - "proc-macro2", + "proc-macro2 1.0.75", "syn 2.0.53", ] @@ -14176,8 +14781,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", "version_check", ] @@ -14188,8 +14793,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "version_check", ] @@ -14205,11 +14810,20 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] +[[package]] +name = "proc-macro2" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +dependencies = [ + "unicode-xid 0.1.0", +] + [[package]] name = "proc-macro2" version = "1.0.75" @@ -14277,8 +14891,8 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -14305,7 +14919,7 @@ dependencies = [ "bitflags 2.4.0", "lazy_static", "num-traits", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", "regex-syntax 0.8.2", @@ -14364,8 +14978,8 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -14377,8 +14991,8 @@ checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", "itertools 0.11.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -14482,7 +15096,7 @@ checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ "env_logger 0.8.4", "log", - "rand", + "rand 0.8.5", ] [[package]] @@ -14496,6 +15110,24 @@ dependencies = [ "pin-project-lite 0.1.12", ] +[[package]] +name = "quinn" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" +dependencies = [ + "bytes", + "pin-project-lite 0.2.12", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls 0.20.8", + "thiserror", + "tokio", + "tracing", + "webpki", +] + [[package]] name = "quinn-proto" version = "0.9.5" @@ -14503,7 +15135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989" dependencies = [ "bytes", - "rand", + "rand 0.8.5", "ring 0.16.20", "rustc-hash", "rustls 0.20.8", @@ -14514,13 +15146,35 @@ dependencies = [ "webpki", ] +[[package]] +name = "quinn-udp" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" +dependencies = [ + "libc", + "quinn-proto", + "socket2 0.4.9", + "tracing", + "windows-sys 0.42.0", +] + +[[package]] +name = "quote" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +dependencies = [ + "proc-macro2 0.4.30", +] + [[package]] name = "quote" version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ - "proc-macro2", + "proc-macro2 1.0.75", ] [[package]] @@ -14529,6 +15183,19 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + [[package]] name = "rand" version = "0.8.5" @@ -14585,7 +15252,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", - "rand", + "rand 0.8.5", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", ] [[package]] @@ -14623,9 +15299,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -14633,14 +15309,32 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", +] + +[[package]] +name = "rbtag" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72c64936fcc0b811890a9d90020f3df5cec9c604efde88af7db6a35d365132a3" +dependencies = [ + "rbtag_derive", +] + +[[package]] +name = "rbtag_derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b75511b710ccca8adbb211e04763bd8c78fed585b0ec188a20ed9b0dd95567c4" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", ] [[package]] @@ -14720,8 +15414,8 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -14806,6 +15500,72 @@ version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" +[[package]] +name = "relay-substrate-client" +version = "0.1.0" +dependencies = [ + "async-std", + "async-trait", + "bp-header-chain", + "bp-messages", + "bp-polkadot-core", + "bp-runtime", + "finality-relay", + "frame-support", + "frame-system", + "futures", + "jsonrpsee", + "log", + "num-traits", + "pallet-balances", + "pallet-bridge-messages", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "parity-scale-codec", + "rand 0.8.5", + "relay-utils", + "sc-chain-spec", + "sc-rpc-api", + "sc-transaction-pool-api", + "scale-info", + "sp-consensus-grandpa", + "sp-core", + "sp-rpc", + "sp-runtime", + "sp-std 14.0.0", + "sp-trie", + "sp-version", + "staging-xcm", + "thiserror", + "tokio", +] + +[[package]] +name = "relay-utils" +version = "0.1.0" +dependencies = [ + "ansi_term", + "anyhow", + "async-std", + "async-trait", + "backoff", + "bp-runtime", + "env_logger 0.11.3", + "futures", + "isahc", + "jsonpath_lib", + "log", + "num-traits", + "serde_json", + "sp-runtime", + "substrate-prometheus-endpoint", + "sysinfo", + "thiserror", + "time", + "tokio", +] + [[package]] name = "remote-ext-tests-bags-list" version = "1.0.0" @@ -15033,6 +15793,7 @@ name = "rococo-runtime" version = "7.0.0" dependencies = [ "binary-merkle-tree", + "bitvec", "frame-benchmarking", "frame-executive", "frame-remote-externalities", @@ -15065,6 +15826,7 @@ dependencies = [ "pallet-multisig", "pallet-nis", "pallet-offences", + "pallet-parameters", "pallet-preimage", "pallet-proxy", "pallet-ranked-collective", @@ -15105,6 +15867,7 @@ dependencies = [ "sp-block-builder", "sp-consensus-babe", "sp-consensus-beefy", + "sp-consensus-grandpa", "sp-core", "sp-genesis-builder", "sp-inherents", @@ -15209,8 +15972,8 @@ checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" dependencies = [ "cfg-if", "glob", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "regex", "relative-path", "rustc_version 0.4.0", @@ -15259,7 +16022,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "proptest", - "rand", + "rand 0.8.5", "rlp", "ruint-macro", "serde", @@ -15571,15 +16334,16 @@ dependencies = [ "libp2p", "linked_hash_set", "log", - "multihash 0.18.1", + "multihash 0.17.0", "multihash-codetable", "parity-scale-codec", "prost 0.12.3", "prost-build", "quickcheck", - "rand", + "rand 0.8.5", "sc-client-api", "sc-network", + "sc-network-types", "sp-api", "sp-authority-discovery", "sp-blockchain", @@ -15635,7 +16399,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "27.0.0" +version = "28.0.0" dependencies = [ "array-bytes 6.1.0", "docify", @@ -15659,6 +16423,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-state-machine", + "sp-tracing 16.0.0", "substrate-test-runtime", ] @@ -15667,8 +16432,8 @@ name = "sc-chain-spec-derive" version = "11.0.0" dependencies = [ "proc-macro-crate 3.0.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -15688,7 +16453,7 @@ dependencies = [ "names", "parity-bip39", "parity-scale-codec", - "rand", + "rand 0.8.5", "regex", "rpassword", "sc-client-api", @@ -15761,7 +16526,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "quickcheck", - "rand", + "rand 0.8.5", "sc-client-api", "sc-state-db", "schnellru", @@ -15784,11 +16549,11 @@ dependencies = [ "async-trait", "futures", "futures-timer", - "libp2p-identity", "log", "mockall", "parking_lot 0.12.1", "sc-client-api", + "sc-network-types", "sc-utils", "serde", "sp-api", @@ -15929,6 +16694,7 @@ dependencies = [ "sc-network-gossip", "sc-network-sync", "sc-network-test", + "sc-network-types", "sc-utils", "serde", "sp-api", @@ -16002,7 +16768,7 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.1", - "rand", + "rand 0.8.5", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -16012,6 +16778,7 @@ dependencies = [ "sc-network-gossip", "sc-network-sync", "sc-network-test", + "sc-network-types", "sc-telemetry", "sc-transaction-pool-api", "sc-utils", @@ -16180,7 +16947,7 @@ dependencies = [ "substrate-test-runtime", "tempfile", "tracing", - "tracing-subscriber 0.2.25", + "tracing-subscriber 0.3.18", "wat", ] @@ -16270,7 +17037,6 @@ dependencies = [ "bytes", "futures", "futures-timer", - "libp2p-identity", "log", "mixnet", "multiaddr", @@ -16278,6 +17044,7 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-network", + "sc-network-types", "sc-transaction-pool-api", "sp-api", "sp-consensus", @@ -16298,6 +17065,7 @@ dependencies = [ "async-trait", "asynchronous-codec", "bytes", + "cid 0.9.0", "either", "fnv", "futures", @@ -16305,25 +17073,34 @@ dependencies = [ "ip_network", "libp2p", "linked_hash_set", + "litep2p", "log", "mockall", "multistream-select", + "once_cell", "parity-scale-codec", "parking_lot 0.12.1", "partial_sort", "pin-project", - "rand", + "prost 0.11.9", + "prost-build", + "rand 0.8.5", + "sc-block-builder", "sc-client-api", "sc-network-common", "sc-network-light", "sc-network-sync", + "sc-network-types", "sc-utils", + "schnellru", "serde", "serde_json", "smallvec", "sp-arithmetic", "sp-blockchain", + "sp-consensus", "sp-core", + "sp-crypto-hashing", "sp-runtime", "sp-test-primitives", "sp-tracing 16.0.0", @@ -16337,36 +17114,11 @@ dependencies = [ "tokio-test", "tokio-util", "unsigned-varint", + "void", "wasm-timer", "zeroize", ] -[[package]] -name = "sc-network-bitswap" -version = "0.33.0" -dependencies = [ - "async-channel", - "cid", - "futures", - "libp2p-identity", - "log", - "prost 0.12.3", - "prost-build", - "sc-block-builder", - "sc-client-api", - "sc-consensus", - "sc-network", - "sp-blockchain", - "sp-consensus", - "sp-crypto-hashing", - "sp-runtime", - "substrate-test-runtime", - "substrate-test-runtime-client", - "thiserror", - "tokio", - "unsigned-varint", -] - [[package]] name = "sc-network-common" version = "0.33.0" @@ -16378,6 +17130,7 @@ dependencies = [ "parity-scale-codec", "prost-build", "sc-consensus", + "sc-network-types", "sp-consensus", "sp-consensus-grandpa", "sp-runtime", @@ -16399,6 +17152,7 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-sync", + "sc-network-types", "schnellru", "sp-runtime", "substrate-prometheus-endpoint", @@ -16414,13 +17168,13 @@ dependencies = [ "array-bytes 6.1.0", "async-channel", "futures", - "libp2p-identity", "log", "parity-scale-codec", "prost 0.12.3", "prost-build", "sc-client-api", "sc-network", + "sc-network-types", "sp-blockchain", "sp-core", "sp-runtime", @@ -16440,7 +17194,9 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-sync", + "sc-network-types", "sp-consensus", + "sp-runtime", "sp-statement-store", "substrate-prometheus-endpoint", ] @@ -16467,6 +17223,7 @@ dependencies = [ "sc-consensus", "sc-network", "sc-network-common", + "sc-network-types", "sc-utils", "schnellru", "smallvec", @@ -16495,7 +17252,7 @@ dependencies = [ "libp2p", "log", "parking_lot 0.12.1", - "rand", + "rand 0.8.5", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -16503,6 +17260,7 @@ dependencies = [ "sc-network-common", "sc-network-light", "sc-network-sync", + "sc-network-types", "sc-service", "sc-utils", "sp-blockchain", @@ -16527,17 +17285,32 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-sync", + "sc-network-types", "sc-utils", "sp-consensus", "sp-runtime", "substrate-prometheus-endpoint", ] +[[package]] +name = "sc-network-types" +version = "0.10.0-dev" +dependencies = [ + "bs58 0.4.0", + "libp2p-identity", + "litep2p", + "multiaddr", + "multihash 0.17.0", + "rand 0.8.5", + "thiserror", +] + [[package]] name = "sc-offchain" version = "29.0.0" dependencies = [ "array-bytes 6.1.0", + "async-trait", "bytes", "fnv", "futures", @@ -16551,12 +17324,13 @@ dependencies = [ "once_cell", "parity-scale-codec", "parking_lot 0.12.1", - "rand", + "rand 0.8.5", "sc-block-builder", "sc-client-api", "sc-client-db", "sc-network", "sc-network-common", + "sc-network-types", "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", @@ -16674,7 +17448,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "pretty_assertions", - "rand", + "rand 0.8.5", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -16683,6 +17457,7 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", + "schnellru", "serde", "serde_json", "sp-api", @@ -16728,7 +17503,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "pin-project", - "rand", + "rand 0.8.5", "sc-chain-spec", "sc-client-api", "sc-client-db", @@ -16737,11 +17512,11 @@ dependencies = [ "sc-informant", "sc-keystore", "sc-network", - "sc-network-bitswap", "sc-network-common", "sc-network-light", "sc-network-sync", "sc-network-transactions", + "sc-network-types", "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", @@ -16883,7 +17658,7 @@ dependencies = [ "futures", "libc", "log", - "rand", + "rand 0.8.5", "rand_pcg", "regex", "sc-telemetry", @@ -16906,7 +17681,8 @@ dependencies = [ "log", "parking_lot 0.12.1", "pin-project", - "rand", + "rand 0.8.5", + "sc-network", "sc-utils", "serde", "serde_json", @@ -16941,7 +17717,7 @@ dependencies = [ "thiserror", "tracing", "tracing-log 0.1.3", - "tracing-subscriber 0.2.25", + "tracing-subscriber 0.3.18", ] [[package]] @@ -16949,8 +17725,8 @@ name = "sc-tracing-proc-macro" version = "11.0.0" dependencies = [ "proc-macro-crate 3.0.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -17040,8 +17816,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dc2f4e8bc344b9fc3d5f74f72c2e55bfc38d28dc2ebc69c194a3df424e4d9ac" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -17072,8 +17848,8 @@ version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "serde_derive_internals", "syn 1.0.109", ] @@ -17152,6 +17928,21 @@ dependencies = [ "untrusted 0.7.1", ] +[[package]] +name = "sctp-proto" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f64cef148d3295c730c3cb340b0b252a4d570b1c7d4bf0808f88540b0a888bc" +dependencies = [ + "bytes", + "crc", + "fxhash", + "log", + "rand 0.8.5", + "slab", + "thiserror", +] + [[package]] name = "sec1" version = "0.7.3" @@ -17351,8 +18142,8 @@ version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -17362,8 +18153,8 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -17382,6 +18173,7 @@ version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ + "indexmap 2.2.3", "itoa", "ryu", "serde", @@ -17451,8 +18243,8 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -17478,6 +18270,7 @@ dependencies = [ "cfg-if", "cpufeatures", "digest 0.10.7", + "sha1-asm", ] [[package]] @@ -17491,6 +18284,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha1-asm" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ba6947745e7f86be3b8af00b7355857085dbdf8901393c89514510eb61f4e21" +dependencies = [ + "cc", +] + [[package]] name = "sha2" version = "0.9.9" @@ -17596,6 +18398,12 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + [[package]] name = "signature" version = "2.1.0" @@ -17619,6 +18427,15 @@ dependencies = [ "wide", ] +[[package]] +name = "simple-dns" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cae9a3fcdadafb6d97f4c0e007e4247b114ee0f119f650c3cbf3a8b3a1479694" +dependencies = [ + "bitflags 2.4.0", +] + [[package]] name = "simple-mermaid" version = "0.1.1" @@ -17666,6 +18483,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "sluice" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" +dependencies = [ + "async-channel", + "futures-core", + "futures-io", +] + [[package]] name = "smallvec" version = "1.11.2" @@ -17734,7 +18562,7 @@ dependencies = [ "pbkdf2", "pin-project", "poly1305 0.8.0", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "ruzstd", "schnorrkel 0.10.2", @@ -17777,7 +18605,7 @@ dependencies = [ "no-std-net", "parking_lot 0.12.1", "pin-project", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "serde", "serde_json", @@ -17827,7 +18655,6 @@ version = "0.2.0" dependencies = [ "byte-slice-cast", "frame-support", - "frame-system", "hex", "hex-literal", "parity-scale-codec", @@ -17842,7 +18669,6 @@ dependencies = [ "sp-std 14.0.0", "ssz_rs", "ssz_rs_derive", - "static_assertions", ] [[package]] @@ -17878,14 +18704,12 @@ dependencies = [ "hex-literal", "parity-bytes", "parity-scale-codec", - "rand", + "rand 0.8.5", "rlp", - "rustc-hex", "scale-info", "serde", "serde-big-array", "serde_json", - "sp-core", "sp-io", "sp-runtime", "sp-std 14.0.0", @@ -17901,7 +18725,7 @@ dependencies = [ "hex", "lazy_static", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "snowbridge-amcl", "zeroize", @@ -17931,17 +18755,13 @@ dependencies = [ "snowbridge-core", "snowbridge-outbound-queue-merkle-tree", "sp-api", - "sp-core", "sp-std 14.0.0", - "staging-xcm", ] [[package]] name = "snowbridge-pallet-ethereum-client" version = "0.2.0" dependencies = [ - "bp-runtime", - "byte-slice-cast", "frame-benchmarking", "frame-support", "frame-system", @@ -17949,8 +18769,7 @@ dependencies = [ "log", "pallet-timestamp", "parity-scale-codec", - "rand", - "rlp", + "rand 0.8.5", "scale-info", "serde", "serde_json", @@ -17963,8 +18782,6 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-std 14.0.0", - "ssz_rs", - "ssz_rs_derive", "static_assertions", ] @@ -17972,9 +18789,6 @@ dependencies = [ name = "snowbridge-pallet-ethereum-client-fixtures" version = "0.9.0" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", "hex-literal", "snowbridge-beacon-primitives", "snowbridge-core", @@ -17987,21 +18801,18 @@ name = "snowbridge-pallet-inbound-queue" version = "0.2.0" dependencies = [ "alloy-primitives", - "alloy-rlp", "alloy-sol-types", "frame-benchmarking", "frame-support", "frame-system", "hex-literal", "log", - "num-traits", "pallet-balances", "parity-scale-codec", "scale-info", "serde", "snowbridge-beacon-primitives", "snowbridge-core", - "snowbridge-ethereum", "snowbridge-pallet-ethereum-client", "snowbridge-pallet-inbound-queue-fixtures", "snowbridge-router-primitives", @@ -18011,7 +18822,6 @@ dependencies = [ "sp-runtime", "sp-std 14.0.0", "staging-xcm", - "staging-xcm-builder", "staging-xcm-executor", ] @@ -18019,9 +18829,6 @@ dependencies = [ name = "snowbridge-pallet-inbound-queue-fixtures" version = "0.10.0" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", "hex-literal", "snowbridge-beacon-primitives", "snowbridge-core", @@ -18038,7 +18845,6 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "hex-literal", "pallet-message-queue", "parity-scale-codec", "scale-info", @@ -18051,14 +18857,12 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-std 14.0.0", - "staging-xcm", ] [[package]] name = "snowbridge-pallet-system" version = "0.2.0" dependencies = [ - "ethabi-decode", "frame-benchmarking", "frame-support", "frame-system", @@ -18078,7 +18882,6 @@ dependencies = [ "sp-runtime", "sp-std 14.0.0", "staging-xcm", - "staging-xcm-builder", "staging-xcm-executor", ] @@ -18086,22 +18889,18 @@ dependencies = [ name = "snowbridge-router-primitives" version = "0.9.0" dependencies = [ - "ethabi-decode", "frame-support", - "frame-system", "hex-literal", "log", "parity-scale-codec", "rustc-hex", "scale-info", - "serde", "snowbridge-core", "sp-core", "sp-io", "sp-runtime", "sp-std 14.0.0", "staging-xcm", - "staging-xcm-builder", "staging-xcm-executor", ] @@ -18110,7 +18909,6 @@ name = "snowbridge-runtime-common" version = "0.2.0" dependencies = [ "frame-support", - "frame-system", "log", "parity-scale-codec", "snowbridge-core", @@ -18125,77 +18923,30 @@ dependencies = [ name = "snowbridge-runtime-test-common" version = "0.2.0" dependencies = [ - "assets-common", - "bridge-hub-test-utils", - "bridge-runtime-common", - "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", - "cumulus-pallet-session-benchmarking", - "cumulus-pallet-xcm", - "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", - "cumulus-primitives-utility", - "frame-benchmarking", - "frame-executive", "frame-support", "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal", - "log", - "pallet-aura", - "pallet-authorship", "pallet-balances", "pallet-collator-selection", "pallet-message-queue", - "pallet-multisig", "pallet-session", "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-xcm", - "pallet-xcm-benchmarks", - "parachains-common", "parachains-runtimes-test-utils", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-runtime-common", - "scale-info", - "serde", - "smallvec", - "snowbridge-beacon-primitives", "snowbridge-core", - "snowbridge-outbound-queue-runtime-api", "snowbridge-pallet-ethereum-client", "snowbridge-pallet-ethereum-client-fixtures", - "snowbridge-pallet-inbound-queue", "snowbridge-pallet-outbound-queue", "snowbridge-pallet-system", - "snowbridge-router-primitives", - "snowbridge-system-runtime-api", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", "sp-core", - "sp-genesis-builder", - "sp-inherents", "sp-io", "sp-keyring", - "sp-offchain", "sp-runtime", - "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-transaction-pool", - "sp-version", "staging-parachain-info", "staging-xcm", - "staging-xcm-builder", "staging-xcm-executor", - "static_assertions", ] [[package]] @@ -18205,7 +18956,6 @@ dependencies = [ "parity-scale-codec", "snowbridge-core", "sp-api", - "sp-core", "sp-std 14.0.0", "staging-xcm", ] @@ -18243,7 +18993,7 @@ dependencies = [ "http", "httparse", "log", - "rand", + "rand 0.8.5", "sha-1 0.9.8", ] @@ -18287,7 +19037,6 @@ dependencies = [ "sp-timestamp", "substrate-build-script-utils", "substrate-frame-rpc-system", - "try-runtime-cli", ] [[package]] @@ -18359,8 +19108,8 @@ dependencies = [ "blake2 0.10.6", "expander 2.0.0", "proc-macro-crate 3.0.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -18420,7 +19169,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "primitive-types", - "rand", + "rand 0.8.5", "scale-info", "serde", "sp-crypto-hashing", @@ -18640,7 +19389,7 @@ dependencies = [ "parking_lot 0.12.1", "paste", "primitive-types", - "rand", + "rand 0.8.5", "regex", "scale-info", "schnorrkel 0.11.4", @@ -18728,7 +19477,7 @@ dependencies = [ [[package]] name = "sp-crypto-hashing" -version = "0.0.0" +version = "0.1.0" dependencies = [ "blake2b_simd", "byteorder", @@ -18742,9 +19491,9 @@ dependencies = [ [[package]] name = "sp-crypto-hashing-proc-macro" -version = "0.0.0" +version = "0.1.0" dependencies = [ - "quote", + "quote 1.0.35", "sp-crypto-hashing", "syn 2.0.53", ] @@ -18762,8 +19511,8 @@ name = "sp-debug-derive" version = "8.0.0" source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -18771,8 +19520,8 @@ dependencies = [ name = "sp-debug-derive" version = "14.0.0" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -18798,8 +19547,10 @@ dependencies = [ [[package]] name = "sp-genesis-builder" -version = "0.7.0" +version = "0.8.0" dependencies = [ + "parity-scale-codec", + "scale-info", "serde_json", "sp-api", "sp-runtime", @@ -18823,7 +19574,7 @@ name = "sp-io" version = "30.0.0" dependencies = [ "bytes", - "ed25519-dalek", + "ed25519-dalek 2.1.0", "libsecp256k1", "log", "parity-scale-codec", @@ -18858,7 +19609,7 @@ version = "0.34.0" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", - "rand", + "rand 0.8.5", "rand_chacha 0.2.2", "sp-core", "sp-externalities 0.25.0", @@ -18913,7 +19664,7 @@ name = "sp-npos-elections" version = "26.0.0" dependencies = [ "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "serde", "sp-arithmetic", @@ -18928,7 +19679,7 @@ version = "2.0.0-alpha.5" dependencies = [ "clap 4.5.3", "honggfuzz", - "rand", + "rand 0.8.5", "sp-npos-elections", "sp-runtime", ] @@ -18972,7 +19723,7 @@ dependencies = [ "log", "parity-scale-codec", "paste", - "rand", + "rand 0.8.5", "scale-info", "serde", "serde_json", @@ -19039,8 +19790,8 @@ source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf5 dependencies = [ "Inflector", "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -19051,8 +19802,8 @@ dependencies = [ "Inflector", "expander 2.0.0", "proc-macro-crate 3.0.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -19130,7 +19881,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "pretty_assertions", - "rand", + "rand 0.8.5", "smallvec", "sp-core", "sp-externalities 0.25.0", @@ -19148,10 +19899,10 @@ version = "10.0.0" dependencies = [ "aes-gcm 0.10.3", "curve25519-dalek 4.1.2", - "ed25519-dalek", + "ed25519-dalek 2.1.0", "hkdf", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "sha2 0.10.7", "sp-api", @@ -19240,7 +19991,7 @@ dependencies = [ "parity-scale-codec", "tracing", "tracing-core", - "tracing-subscriber 0.2.25", + "tracing-subscriber 0.3.18", ] [[package]] @@ -19270,14 +20021,14 @@ version = "29.0.0" dependencies = [ "ahash 0.8.8", "array-bytes 6.1.0", - "criterion 0.4.0", + "criterion 0.5.1", "hash-db", "lazy_static", "memory-db", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", - "rand", + "rand 0.8.5", "scale-info", "schnellru", "sp-core", @@ -19312,8 +20063,8 @@ name = "sp-version-proc-macro" version = "13.0.0" dependencies = [ "parity-scale-codec", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "sp-version", "syn 2.0.53", ] @@ -19397,11 +20148,11 @@ checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439" dependencies = [ "Inflector", "num-format", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "serde", "serde_json", - "unicode-xid", + "unicode-xid 0.2.4", ] [[package]] @@ -19422,8 +20173,8 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f07d54c4d01a1713eb363b55ba51595da15f6f1211435b71466460da022aa140" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -19435,7 +20186,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "staging-chain-spec-builder" -version = "2.0.0" +version = "3.0.0" dependencies = [ "clap 4.5.3", "log", @@ -19482,7 +20233,7 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "platforms", - "rand", + "rand 0.8.5", "regex", "sc-authority-discovery", "sc-basic-authorship", @@ -19530,6 +20281,7 @@ dependencies = [ "sp-core", "sp-crypto-hashing", "sp-externalities 0.25.0", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keyring", @@ -19551,7 +20303,6 @@ dependencies = [ "tempfile", "tokio", "tokio-util", - "try-runtime-cli", "wait-timeout", "wat", ] @@ -19690,11 +20441,31 @@ checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf" dependencies = [ "cfg_aliases", "memchr", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] +[[package]] +name = "str0m" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee48572247f422dcbe68630c973f8296fbd5157119cd36a3223e48bf83d47727" +dependencies = [ + "combine", + "crc", + "hmac 0.12.1", + "once_cell", + "openssl", + "openssl-sys", + "rand 0.8.5", + "sctp-proto", + "serde", + "sha-1 0.10.1", + "thiserror", + "tracing", +] + [[package]] name = "strobe-rs" version = "0.8.1" @@ -19708,6 +20479,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + [[package]] name = "strsim" version = "0.10.0" @@ -19720,6 +20497,30 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +[[package]] +name = "structopt" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +dependencies = [ + "clap 2.34.0", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck 0.3.3", + "proc-macro-error", + "proc-macro2 1.0.75", + "quote 1.0.35", + "syn 1.0.109", +] + [[package]] name = "strum" version = "0.24.1" @@ -19751,8 +20552,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.1", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "rustversion", "syn 1.0.109", ] @@ -19764,8 +20565,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "rustversion", "syn 2.0.53", ] @@ -19777,8 +20578,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck 0.4.1", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "rustversion", "syn 2.0.53", ] @@ -19888,6 +20689,49 @@ dependencies = [ "tokio", ] +[[package]] +name = "substrate-relay-helper" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-std", + "async-trait", + "bp-header-chain", + "bp-messages", + "bp-parachains", + "bp-polkadot-core", + "bp-relayers", + "bp-runtime", + "bridge-runtime-common", + "equivocation-detector", + "finality-grandpa", + "finality-relay", + "frame-support", + "frame-system", + "futures", + "hex", + "log", + "messages-relay", + "num-traits", + "pallet-balances", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-grandpa", + "pallet-transaction-payment", + "parachains-relay", + "parity-scale-codec", + "rbtag", + "relay-substrate-client", + "relay-utils", + "sp-consensus-grandpa", + "sp-core", + "sp-runtime", + "structopt", + "strum 0.26.2", + "thiserror", +] + [[package]] name = "substrate-rpc-client" version = "0.33.0" @@ -19955,6 +20799,7 @@ dependencies = [ "frame-system", "frame-system-rpc-runtime-api", "futures", + "hex-literal", "log", "pallet-babe", "pallet-balances", @@ -20164,14 +21009,25 @@ dependencies = [ "symbolic-common", ] +[[package]] +name = "syn" +version = "0.15.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "unicode-xid 0.1.0", +] + [[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "unicode-ident", ] @@ -20181,8 +21037,8 @@ version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "unicode-ident", ] @@ -20193,8 +21049,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b837ef12ab88835251726eb12237655e61ec8dc8a280085d1961cdc3dfd047" dependencies = [ "paste", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -20204,10 +21060,25 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", - "unicode-xid", + "unicode-xid 0.2.4", +] + +[[package]] +name = "sysinfo" +version = "0.30.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "windows 0.52.0", ] [[package]] @@ -20396,11 +21267,8 @@ version = "1.0.0" dependencies = [ "frame-support", "polkadot-primitives", - "polkadot-runtime-common", "smallvec", - "sp-core", "sp-runtime", - "sp-weights", ] [[package]] @@ -20417,6 +21285,15 @@ dependencies = [ "westend-runtime-constants", ] +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + [[package]] name = "textwrap" version = "0.16.0" @@ -20447,8 +21324,8 @@ version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 1.0.109", ] @@ -20458,8 +21335,8 @@ version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -20540,6 +21417,8 @@ checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" dependencies = [ "deranged", "itoa", + "libc", + "num_threads", "serde", "time-core", "time-macros", @@ -20619,8 +21498,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -20631,7 +21510,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ "pin-project", - "rand", + "rand 0.8.5", "tokio", ] @@ -20690,7 +21569,22 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.17.3", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +dependencies = [ + "futures-util", + "log", + "rustls 0.21.6", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", + "tungstenite 0.20.1", ] [[package]] @@ -20809,11 +21703,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite 0.2.12", "tracing-attributes", @@ -20822,12 +21715,12 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -20868,8 +21761,8 @@ dependencies = [ "assert_matches", "expander 2.0.0", "proc-macro-crate 3.0.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -20915,7 +21808,6 @@ dependencies = [ "chrono", "lazy_static", "matchers 0.0.1", - "parking_lot 0.11.2", "regex", "serde", "serde_json", @@ -20934,9 +21826,11 @@ version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ + "chrono", "matchers 0.1.0", "nu-ansi-term", "once_cell", + "parking_lot 0.12.1", "regex", "sharded-slab", "smallvec", @@ -20948,11 +21842,11 @@ dependencies = [ [[package]] name = "trie-bench" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4680cb226e31d2a096592d0edecdda91cc371743002f80c0f8cf80219819b3b" +checksum = "3092f400e9f7e3ce8c1756016a8b6287163ab7a11dd47d82169260cb4cc2d680" dependencies = [ - "criterion 0.4.0", + "criterion 0.5.1", "hash-db", "keccak-hasher", "memory-db", @@ -20964,12 +21858,11 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" +checksum = "65ed83be775d85ebb0e272914fff6462c39b3ddd6dc67b5c1c41271aad280c69" dependencies = [ "hash-db", - "hashbrown 0.13.2", "log", "rustc-hex", "smallvec", @@ -21003,14 +21896,14 @@ dependencies = [ "async-trait", "cfg-if", "data-encoding", - "enum-as-inner", + "enum-as-inner 0.5.1", "futures-channel", "futures-io", "futures-util", "idna 0.2.3", "ipnet", "lazy_static", - "rand", + "rand 0.8.5", "smallvec", "socket2 0.4.9", "thiserror", @@ -21020,6 +21913,31 @@ dependencies = [ "url", ] +[[package]] +name = "trust-dns-proto" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner 0.6.0", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + [[package]] name = "trust-dns-resolver" version = "0.22.0" @@ -21037,7 +21955,28 @@ dependencies = [ "thiserror", "tokio", "tracing", - "trust-dns-proto", + "trust-dns-proto 0.22.0", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot 0.12.1", + "rand 0.8.5", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto 0.23.2", ] [[package]] @@ -21046,47 +21985,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" -[[package]] -name = "try-runtime-cli" -version = "0.38.0" -dependencies = [ - "assert_cmd", - "async-trait", - "clap 4.5.3", - "frame-remote-externalities", - "frame-try-runtime", - "hex", - "log", - "node-primitives", - "parity-scale-codec", - "regex", - "sc-cli", - "sc-executor", - "serde", - "serde_json", - "sp-api", - "sp-consensus-aura", - "sp-consensus-babe", - "sp-core", - "sp-debug-derive 14.0.0", - "sp-externalities 0.25.0", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-rpc", - "sp-runtime", - "sp-state-machine", - "sp-timestamp", - "sp-transaction-storage-proof", - "sp-version", - "sp-weights", - "substrate-cli-test-utils", - "substrate-rpc-client", - "tempfile", - "tokio", - "zstd 0.12.4", -] - [[package]] name = "trybuild" version = "1.0.89" @@ -21121,13 +22019,33 @@ dependencies = [ "http", "httparse", "log", - "rand", + "rand 0.8.5", "sha-1 0.10.1", "thiserror", "url", "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand 0.8.5", + "rustls 0.21.6", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "twox-hash" version = "1.6.3" @@ -21136,7 +22054,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand", + "rand 0.8.5", "static_assertions", ] @@ -21191,12 +22109,24 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + [[package]] name = "unicode-width" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +[[package]] +name = "unicode-xid" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + [[package]] name = "unicode-xid" version = "0.2.4" @@ -21231,14 +22161,15 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "unsigned-varint" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" +checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" dependencies = [ "asynchronous-codec", "bytes", "futures-io", "futures-util", + "tokio-util", ] [[package]] @@ -21330,6 +22261,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + [[package]] name = "version_check" version = "0.9.4" @@ -21357,7 +22294,7 @@ dependencies = [ "arrayref", "constcat", "digest 0.10.7", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.6.4", "sha2 0.10.7", @@ -21433,8 +22370,8 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", "wasm-bindgen-shared", ] @@ -21457,7 +22394,7 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ - "quote", + "quote 1.0.35", "wasm-bindgen-macro-support", ] @@ -21467,8 +22404,8 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -21500,8 +22437,8 @@ version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", ] [[package]] @@ -21802,7 +22739,7 @@ dependencies = [ "memfd", "memoffset 0.8.0", "paste", - "rand", + "rand 0.8.5", "rustix 0.36.15", "wasmtime-asm-macros", "wasmtime-environ", @@ -22115,6 +23052,40 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -22412,6 +23383,23 @@ dependencies = [ "time", ] +[[package]] +name = "x509-parser" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" +dependencies = [ + "asn1-rs", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "rusticata-macros", + "thiserror", + "time", +] + [[package]] name = "xattr" version = "1.0.1" @@ -22497,8 +23485,8 @@ name = "xcm-procedural" version = "7.0.0" dependencies = [ "Inflector", - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "staging-xcm", "syn 2.0.53", "trybuild", @@ -22586,7 +23574,7 @@ dependencies = [ "log", "nohash-hasher", "parking_lot 0.12.1", - "rand", + "rand 0.8.5", "static_assertions", ] @@ -22620,8 +23608,8 @@ version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -22640,8 +23628,8 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.75", + "quote 1.0.35", "syn 2.0.53", ] @@ -22657,7 +23645,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.17.2", "tracing-gum", "url", ] diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 770b4a2954..9aa8a66c9e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -1,7 +1,9 @@ { fetchFromGitHub , lib +, openssl +, pkg-config , protobuf -, rocksdb +, rocksdb_8_3 , rust-jemalloc-sys-unprefixed , rustPlatform , rustc @@ -9,15 +11,19 @@ , Security , SystemConfiguration }: + +let + rocksdb = rocksdb_8_3; +in rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-v${version}"; - hash = "sha256-xRuV/1+OZeoth/lb5OXwVzHl2IWK1G0GgIN0E8EZlYg="; + hash = "sha256-q8u2L7CUDUPZrU/i8K5jsqG4Ib0Wh5e/LIUc6Z4SFfY="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -44,6 +50,7 @@ rustPlatform.buildRustPackage rec { "ark-secret-scalar-0.0.2" = "sha256-91sODxaj0psMw0WqigMCGO5a7+NenAsRj5ZmW6C7lvc="; "common-0.1.0" = "sha256-LHz2dK1p8GwyMimlR7AxHLz1tjTYolPwdjP7pxork1o="; "fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo="; + "litep2p-0.3.0" = "sha256-IiJmmSb1+8+HbT/LP/zvhioVBeeGAncf4zo7Czuq6qY="; "sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8="; "sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI="; }; @@ -59,13 +66,15 @@ rustPlatform.buildRustPackage rec { doCheck = false; nativeBuildInputs = [ + pkg-config rustPlatform.bindgenHook rustc rustc.llvmPackages.lld ]; # NOTE: jemalloc is used by default on Linux with unprefixed enabled - buildInputs = lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ] ++ + buildInputs = [ openssl ] ++ + lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; # NOTE: disable building `core`/`std` in wasm environment since rust-src isn't @@ -74,6 +83,7 @@ rustPlatform.buildRustPackage rec { # NOTE: we need to force lld otherwise rust-lld is not found for wasm32 target CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld"; + OPENSSL_NO_VENDOR = 1; PROTOC = "${protobuf}/bin/protoc"; ROCKSDB_LIB_DIR = "${rocksdb}/lib"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix index 56f38c49b1..caaae11fd8 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix @@ -13,7 +13,7 @@ , openssl , libclang , libcxx -, rocksdb +, rocksdb_8_3 , rustfmt , perl , hidapi @@ -46,6 +46,7 @@ let pinData = lib.importJSON ./pin.json; version = pinData.version; hash = pinData.hash; + rocksdb = rocksdb_8_3; inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security; in diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/default.nix index 8552d12bc9..ab58899889 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/default.nix @@ -1,4 +1,5 @@ { stdenv +, stdenvNoCC , lib , makeWrapper , fetchurl @@ -17,17 +18,54 @@ , hwi , imagemagick , gzip +, gnupg }: let pname = "sparrow"; - version = "1.8.4"; + version = "1.9.1"; src = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; - sha256 = "0w6z84w9spwfpqrf5m9bcq30xqp94c27jw3qzxfdyisp8n22xvd8"; + sha256 = "sha256-b1OIizSMTOtLM3/RFiBJPSbkj/C0d0s5ggcUwjCdBBo="; + + # nativeBuildInputs, downloadToTemp, and postFetch are used to verify the signed upstream package. + # The signature is not a self-contained file. Instead the SHA256 of the package is added to a manifest file. + # The manifest file is signed by the owner of the public key, Craig Raw. + # Thus to verify the signed package, the manifest is verified with the public key, + # and then the package is verified against the manifest. + # The public key is obtained from https://keybase.io/craigraw/pgp_keys.asc + # and is included in this repo to provide reproducibility. + nativeBuildInputs = [ gnupg ]; + downloadToTemp = true; + + postFetch = '' + pushd $(mktemp -d) + export GNUPGHOME=$PWD/gnupg + mkdir -m 700 -p $GNUPGHOME + ln -s ${manifest} ./manifest.txt + ln -s ${manifestSignature} ./manifest.txt.asc + ln -s $downloadedFile ./${pname}-${version}-x86_64.tar.gz + gpg --import ${publicKey} + gpg --verify manifest.txt.asc manifest.txt + sha256sum -c --ignore-missing manifest.txt + popd + mv $downloadedFile $out + ''; }; + manifest = fetchurl { + url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-manifest.txt"; + sha256 = "sha256-2IGhP9Xsli9d0zTzPliJH/tE5TXei1vjVngtjL9vA48="; + }; + + manifestSignature = fetchurl { + url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-manifest.txt.asc"; + sha256 = "sha256-FSR9Z+27J/u1MYIR+LrL+pqCP6q4GfVYtRZ0WA9AaKM="; + }; + + publicKey = ./publickey.asc; + launcher = writeScript "sparrow" '' #! ${bash}/bin/bash params=( @@ -74,7 +112,7 @@ let exec ${tor}/bin/tor "$@" ''; - jdk-modules = stdenv.mkDerivation { + jdk-modules = stdenvNoCC.mkDerivation { name = "jdk-modules"; nativeBuildInputs = [ openjdk ]; dontUnpack = true; @@ -95,7 +133,7 @@ let ''; }; - sparrow-modules = stdenv.mkDerivation { + sparrow-modules = stdenvNoCC.mkDerivation { pname = "sparrow-modules"; inherit version src; nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ]; @@ -150,7 +188,6 @@ let # with one from Nixpkgs. gzip -c ${torWrapper} > tor.gz cp tor.gz modules/kmp.tor.binary.linuxx64/kmptor/linux/x64/tor.gz - find modules ''; installPhase = '' @@ -162,7 +199,7 @@ let ''; }; in -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { inherit version src; pname = "sparrow-unwrapped"; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; @@ -180,7 +217,7 @@ stdenv.mkDerivation rec { }) ]; - sparrow-icons = stdenv.mkDerivation { + sparrow-icons = stdenvNoCC.mkDerivation { inherit version src; pname = "sparrow-icons"; nativeBuildInputs = [ imagemagick ]; @@ -212,8 +249,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = ./update.sh; - meta = with lib; { description = "A modern desktop Bitcoin wallet application supporting most hardware wallets and built on common standards such as PSBT, with an emphasis on transparency and usability."; homepage = "https://sparrowwallet.com"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/publickey.asc b/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/publickey.asc new file mode 100644 index 0000000000..c053995b68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/publickey.asc @@ -0,0 +1,90 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: GPGTools - http://gpgtools.org + +mQINBF2V8eEBEADmjYzGOpxEI0J7jQ1qFzlsrjF6NaBSq+UqKwPOL917pvI/8b/d +bI1gLV1kgIMAnwf3/JWkF4Ind0pk3g3Vj/jzTYg/ePSwjAhvhowoDo4va+AtV066 +tRf3FjQYFCWR6ccN4zxmQxZ9QPOp4XIcXwu7Ce+ORRRiU9gkWXfiU64pmpzH89gz +LF35r+98+d9Ov6nAPhRSUlj+vk85mu6Lk8J26srHKWB7iXat1rl4lEAPpFtyvU6L +oO5XZoRPvXce3mByyuh8SDYTr6GVYjfPHWPaxcGrS/qTe2RCn3ec3xWSGT/U4xH0 +TwagphjxlSnpeHDxZXG6wpgyVEcjpQ1M9hIK7z1G+SHuW4EoyaZf2llTsNbKvbV8 +UOao6g5uAYeLQyBJPKExocNj7+DvbNrpRXYy1levrWtnkNS/oPx3wJgxeXL55uXC +MCcc5X5T6GNNAtBubAxtYRt65Q6Lvga7v6dWTDtvwufxfjtXZGFO/Hut4wS6IyTt +77i4GB/WeAQGGhPHGssVECd80u7/DEZ1EMcfTexsDJ9T1ZeM6orvAQ3i2DGdoiYt +/pJPd2g0LE1Q0HhSVC74JP0pUPJ7V/nzBVPXbYQTQWxESce+NUpnONs2uW+XNSxb +i0PoUwyDZsRQ7SZJZuOStBWqUXC8TUoGtkaRQHtBgumW0zHasgShVpkU+wARAQAB +tCNDcmFpZyBSYXcgPGNyYWlnQHNwYXJyb3d3YWxsZXQuY29tPokCVAQTAQoAPgIb +AwULCQgHAwUVCgkICwUWAgMBAAIeBQIXgBYhBNTQ0yAvwGhJolezjelGGDNMZ0tA +BQJlCacEBQkO+IMiAAoJEOlGGDNMZ0tAMZ0QAJtLTl8n/H2nn3nnuHMV18lLya+F +92/7Q5cSls+EPDzmhZnOY13aVlzL0y9++snRA6QrajyF5pxk5/t6OUcztg9PSSzz +dJ4SrjqF7nxSWXAybQLSWK0NmAZGC4cCkHuFwOOpTYTsGjUH0lMnvGF7PllQK0L7 +8zKrNUpHHLWpkPBHfJEnGbv3XVG4DVWfdTAmpgSP/Lma3qRs5TRlr4pWbCQxUjd3 +8QCw25PGT4xQ9g/yCWY1rBq2x7MzHsiuNmd/qCuwcXiSCChrlGUUVYWwp7FXkVFq +9wIJB7lYxOKbrwL8KcA2jQL0ZH9421+xfThCruMEnb3fPiW7y5VAbJKNLvk+WHa6 +Vfj12+R3a3ZM2P8iExS6+d04xM0AXK4J5bIcpFW0D8GdjJyED6I7cAPF723xSws1 +t9RD1rVslOlCvOJtoqATuWqGoTVAR4cdpdpnTywKZpjQowLdIcUPbW58zJQxmONh +vXoTzqvhQV2b9wRlrT+8gwlYmGh+P+xpR8nlHD7GQWoUC/mfWm4w6rMfX6xHBylC +SHB+teH+9lqUaefbbxKQlAbLL+3q7M4O4Dx224OZBvRN7MFnvBWJimhj8n7lJwfY +Pl7l/ZENqigiosH5XPLIXE8WhbT2SLh9a2Lp+qH8xrEcsUlUST+F0gE9qawTTl9X +RGfvr16YhNpScpBptB5DcmFpZyBSYXcgPGNyYWlncmF3QGdtYWlsLmNvbT6JAjYE +MAEKACAWIQTU0NMgL8BoSaJXs43pRhgzTGdLQAUCZQmpwgIdIAAKCRDpRhgzTGdL +QNX9D/4kl6JOsL4/P88m8i3SYW1N+FzCrr486Ak8zmfoPjtoSytk0+QIsjb5Esn4 +ltU2UD7MPoPplky3TykNUbVqPr1LtSoabbxOOpz3kpHgkYN2KvH6Bv2H81kBF0k9 +a8XYY92/73q7n7QiMmm6SNm0LO0QvHRu5KoCVQ+FyeLu4h4UqpK0RWtjIUUo6whO +hXO1ZkkAcV38gewbU92bQBnhLxQNm/EHs9g3Dx+dmhmym4yn0sfNxX+4MsLNMa6E +jcQ0YF+EgrQk9r8MF3NtPPFfzxswOThXNlEzie5ETAqcouT6mnlfTnB8UL4wjBoP +GueatUqvtO99RUZbM2otZdz1bBAmOQ/R92wcqsC46zY+PdIXX3YuiGVEfZHjuAU7 +3FlajlZeWvp2NgZzLHFAjjWt67IeYkvfsv4bvq9EANXebI0Srq/g0o2Ego+kfBsZ +Ca+2jMgxo9+6X69+WJEe46G9bHatpl2dStylgWRhroEbkV83bIFwwE8Q9QOX4uJW +FB16kl/qTuBiG/rDgVT8eZuCYJXFKQtgPoslEramQuURyUfKFrOAyL7mQHHGSZab +mgI8kKI//DvTD3t/BspikmdgZLQL4zoXKIFFPuES+TQO+BHoB+TikjZC81mcyZOX +Sh+Eg21pO3B+HMOXkpv0aj3ZCUt55hslWUom8huQxY7sUdg4KIkCNgQwAQoAIBYh +BNTQ0yAvwGhJolezjelGGDNMZ0tABQJlCaa2Ah0gAAoJEOlGGDNMZ0tA4uYQAJuP +GEiE6/XO10lG8feXk5EIpTgFT8XiF7/CEFrGdPOgb/2HQ2G0QXGfrYI5VTJPdgsG +Mj2JgTcFX12fyKvGpb0HXMdvqNEtNUV4z5wrhUkItPFF4wJ2YAeFuJpdgsTU3RYL +mct30Dcr79M0JSsOO3erjAqsMj+GlTWbHMEzM86regfe0KTU9f4G8DIYRoM+Zu3E +P3BgpKm2miyEW++vuK+/Q+cWPSi7ztRPQ9CoswPb/xEFuxnzRCbdmwGqRUJzFfQJ +3uMTSt5JACn1mn/Bojn8IcAhCKJsBNL3MHAqkJVPdzzQhsr2z0bevVBhhbBabaub +zbFOIHluSge5/IGr7bFjldql/UflYavrV1+aH2CzI/YEgBxZZoIgYl9N5n+vO1GI +Xn39axQ4Lhf7mJc5Y89ojZkhT7sHgpCceyzsFWrBrcLXhhFCafTBcVQd+U1xk5Xf +SV+3TTbWz1woIzVJ6ef5wUYI0qZBuXDef6kIEBnFUwbn5Iu834NtthSkam9LeDcJ +NDISaoCOd+cRgKSTrGkLEIF7hzlF901S/jTDDaKGs9JnruhokxjmyxJvFcowP4Lo +O8J+782+e1QiL49M97tvnYwzLU/iGieG6kWgQcJHVy5ZJdDNMfkZMNR6Ek4dzBVQ +c5pgVp882o9l61xdCQq6o/oSBSCbOGe8Ujr1tGpXiQJUBBMBCgA+AhsDBQsJCAcD +BRUKCQgLBRYCAwEAAh4BAheAFiEE1NDTIC/AaEmiV7ON6UYYM0xnS0AFAmUJpwMF +CQ74gyIACgkQ6UYYM0xnS0Dnww//fMTpZ66XJK15CqbqqFHOlkneoV/X2Oo1CN/t +qIiG6s1TMA/ZwF1dmHSZh46tAd2TK0qTxR4kxXlVq5oO5HbzIA9n/hvJJA8ZXk3g +QieX4L5uITdHmAzChhf0N0jAQT8Oe72SocRMgPCI8c3ZKhBHYqI1PCTUSQKD6+dS +D0zHGZhtPJctDBJGVDCT8jaS4JeDVBU0UijzxLo6qkZvSIXoTxjQHQILFZq4biCs +2gLQ6aJ870TtQz/PiZkL+o5XImY+nPoAyEIC+mDSgO4kb5ELJ5U66vDMpR75FFpW +t/wU0/0q7W9wIzifdRuctVDyh88/5ycg4zrVyX0PmNrx27EGIhL1sEPfLnzMU7am +FqffWVtjvWrPtOiJE6vYRZA1IhallNY1eVI2NcEAj3+gSUsQx5rl7loP+axB7eSM +BKNUBlTptKrCMCWiYVrIFHDG7rHpNc/8G7mpjQCZtUyTNfRG87991JI9nAXHqntr +Slvr2t1TBaNkJQn06/Vx4StR8dNHvN09OzmriPibjxVXfW1fbiPD8mNPM1q1ll37 +15IaZJLJfxA0tz5hhK1J9/asM80GMRfJmbGprZqkbDEFoi4QlLGJfYM5YeHi/TKB +j0IBS7Kh0rZ0y2YpwYRGJjeL+RMwRdbFV0vIayyZ8AS6mXbYVFfpgDnQQ2mJUkm2 +XNpucCm5Ag0EXZXx4QEQAMkaRHXCSMDjBJ+7hQp5+OW7vhRb3jJ5RvveGJpMaV9z +/6UTo+VhI1AzkKKFZ/gwk7fJWm5cuE9fA6rc+h5eHbTtDkcPxAQk58YJyNdKj1t+ +XncvU3Nhb8C/+cChQrnxAlQeFeSk2VUnxh7eTU4jwZo89N+cLJCzz0gIBbmOtTS6 +zcdVaAhi0ePmD496kFxOz0ccGtukeXE38VdUM5PfSSEE8Cy+pokgFjyUSXBefW9u +XsETpw12KvF6xBizFYBTsMmGQQqxtk5bO/bQly61798gcFsxnrMPxBDyENJPkNEJ +s7tdCWEQB2dA8BZw7tN7sItVQabTmz4gUlmRSfsZfZbNZy7nL3zIBXRBZ6I9OPOp +m7BCUlOEQgJQru3RJdfnFVaNUURTd0Up+t+lACuUXXuMlrDbjAFlIGN0YR86JN6b +yAv2s9V5U/3R6QV50BRkj1qQehwUKRQYNMMeSs0I63zHgWOLjXwqr1O0U2/x+8o+ ++UOUVCvsicQcl2CDLbC4C+xntZSKUwYmWtAWjkiDp5Fk2Fxyj9vK5TSym+ur3AAH +gZVugkoM5yMhiOIJVPKGB1aAnQNmQVYREEpJBTtFqbURraqObqiHKPF6MKAL+AW4 +jv2Lms0gJ2S5rSmP/Zi0CiABYg1pppojYlrHp1vXb251o7WlPgwf6nKKLTi8byTN +ABEBAAGJAjwEGAEKACYCGwwWIQTU0NMgL8BoSaJXs43pRhgzTGdLQAUCZQmnLAUJ +DviDSwAKCRDpRhgzTGdLQNAwD/0ThrnXqwZ+dyFK4M73nqSXwWjED/xHAQYmrEAr +kVoox3GZYlTFlQlCQZTi+yOsrFdiP7EfWM8jbc6BqEh4fhn1f+wUIiZQELl+6M/U +rHrPz5h4c9rD/+M62awPa6HdauaHkUrF3nAax9EOTVQJvxKLpuaE9Ki9p2ZMEQOK +HakTDtLL2BeXiJG1I/SH1thBPuGL4hReY8qrj0ryYMrlYdu7l+RJrQUemLVD/eQI +S8MqH8E5HjZKS7QNSCEEeHgFw1Yu28C+AnjHQHS5gDugw8ire/NetFxI8Wx5nOOU +oCRR3P1U5IFWqj+Yukc3rB0z9+kSK3cic1jdCRy26JYxz9xuBbAqcnKoGtrB3HVI +Y2pdQKN4kTpifGDriSEe6epuEvvObBovYJE3lc4AWr8VNFJd4UYphJ/9Px+5xajo +ZBicNI9pGq0gTDuBb+tBwTt2dw8tFSCLyJ+C1dFRZX8NM3FlnpjeJQb7SCcLT4PZ +h4+CyElfF/HkcVZHjjanpXZdP91clgmRidnlDBQ07BmaTgvxdlkwHJFGqGcuZn1A +y1p23CECTYiFxFxgMvVjNHSPSyrEnNC0ash+BIGuxvYfm/7CioThFXw9TbwQXn6C +IsgINPAvnKVmW6Ui0jLvtlIWV/TW2yDFjPoC2ilVexwt9QdvtBf5baT8GCilb5Yo +EmR2yA== +=t5JY +-----END PGP PUBLIC KEY BLOCK----- diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/update.sh b/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/update.sh deleted file mode 100755 index 7a520b351a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl jq gnused gnupg common-updater-scripts - -set -eu -o pipefail - -version="$(curl -s https://api.github.com/repos/sparrowwallet/sparrow/releases| jq '.[] | {name} | limit(1;.[])' | sed 's/[\"v]//g' | head -n 1)" -depname="sparrow-$version-x86_64.tar.gz" -src_root="https://github.com/sparrowwallet/sparrow/releases/download/$version"; -src="$src_root/$depname"; -manifest="$src_root/sparrow-$version-manifest.txt" -signature="$src_root/sparrow-$version-manifest.txt.asc" -key="D4D0 D320 2FC0 6849 A257 B38D E946 1833 4C67 4B40" - -pushd $(mktemp -d --suffix=-sparrow-updater) -export GNUPGHOME=$PWD/gnupg -mkdir -m 700 -p "$GNUPGHOME" -curl -L -o "$depname" -- "$src" -curl -L -o manifest.txt -- "$manifest" -curl -L -o signature.asc -- "$signature" -gpg --batch --recv-keys "$key" -gpg --batch --verify signature.asc manifest.txt -sha256sum -c --ignore-missing manifest.txt -sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$depname") -popd - -update-source-version sparrow-unwrapped "$version" "$sha256" diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/terra-station/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/terra-station/default.nix index 5c4a7cc8b3..54ecd28550 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/terra-station/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/terra-station/default.nix @@ -5,6 +5,7 @@ , bash , makeWrapper , electron +, asar }: let @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper asar ]; dontConfigure = true; dontBuild = true; @@ -48,6 +49,13 @@ stdenv.mkDerivation rec { cp -a usr/share/* $out/share cp -a "opt/Terra Station/"{locales,resources} $out/share/${pname} + # patch pre-built node modules + asar e $out/share/${pname}/resources/app.asar asar-unpacked + find asar-unpacked -name '*.node' -exec patchelf \ + --add-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ + {} \; + asar p asar-unpacked $out/share/${pname}/resources/app.asar + substituteInPlace $out/share/applications/station-electron.desktop \ --replace "/opt/Terra Station/station-electron" ${pname} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix index 888b6f8d2b..c602a88dc7 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix @@ -7,6 +7,7 @@ , gperf , libmicrohttpd , libsodium +, lz4 , openssl , readline , secp256k1 @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { pname = "ton"; - version = "2024.03"; + version = "2024.04"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - hash = "sha256-AVg33aZAyedmNIFqQJm4Nn6luLxK4mKgnIRmNU7j2C0="; + hash = "sha256-hh8D4IZX6RS/RXdhVONhgetqp89kpTC2IwDQ2KHdKsE="; fetchSubmodules = true; }; @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { gperf libmicrohttpd libsodium + lz4 openssl readline secp256k1 diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix index 328e423535..76968bda67 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "24.3.2"; + version = "24.4.3"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-oj/UrUFTH0QZD2eTHdR/Lu6Tz6AIhbIBgPJD3jH1YJKgOZIzX21H0KSddMgu+iKPw2WmoKf0UP+qqf+yFs/mVQ=="; - x86_64-linux = "sha512-RakNuSDKR0neO0IZwTVaARX9tWNDfJwOBFL3teUsNlcrur862I1c6NaaA/RxriujolDRI+wgG0twaUGEXXar5g=="; + aarch64-linux = "sha512-EPpnEgE9euHGSo7CFMJg7hF3p5LqPc3zPxDQsNzyOI2lNv90vydtEmOm1fORj0MXbQsGLLS1nSzMH3vI6O9WmA=="; + x86_64-linux = "sha512-FjHaomHjMSVwxO63NEEC5UjotzDlrX8yTGaz20RyoadClAUKIeVfeEt/5jDueFr2ZXfeLraRIQ0ywKm+wkC2EQ=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix index 79355f3979..1371be1a97 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wasabibackend/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, buildDotnetModule, dotnetCorePackages, - autoPatchelfHook, zlib, openssl, }: @@ -25,7 +24,6 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; - nativeBuildInputs = [autoPatchelfHook]; buildInputs = [stdenv.cc.cc.lib zlib]; runtimeDeps = [openssl zlib]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix index fd2b0d2453..2d8b7b7c73 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.6"; + version = "2.0.7.2"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-VxtQZFsiUEeCMEWkdnmE9xXFoa7fWfOWC2UxnZZAia0="; + sha256 = "sha256-s/rzjlPsOylbuQx7gDnctvl1tms95RqErk0vVlzhouw="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/zecwallet-lite/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/zecwallet-lite/default.nix index 27004722c3..2b51f76ffc 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/zecwallet-lite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/zecwallet-lite/default.nix @@ -12,8 +12,6 @@ appimageTools.wrapType2 rec { extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${contents}/zecwallet-lite.desktop -t $out/share/applications substituteInPlace $out/share/applications/zecwallet-lite.desktop \ --replace 'Exec=AppRun' "Exec=$out/bin/zecwallet-lite" diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/gtkgreet.nix b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/gtkgreet.nix index 674257e852..10389c2627 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/gtkgreet.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/gtkgreet.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromSourcehut -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , cmake , meson @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meson ninja cmake - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix index 2a6a4c6ef7..d0aebc5921 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "tuigreet"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "apognu"; repo = pname; rev = version; - sha256 = "sha256-8/2I6bk29/GqZ1ACuN9RgBiGAy7yt0iw2fagHfu4/BI="; + sha256 = "sha256-o1NPwZ2gvFxq988RhLz/6ucL4qb2dGtMdhNvAbQzIvg="; }; - cargoSha256 = "sha256-fOs9a0/1c8Kh4JA5up3XSQ+km/FwSYzl0w4UDL4yU4M="; + cargoSha256 = "sha256-dfzNRs3NOtHoWBq6tx3DjL2knNwsdxBmjqJbPzQJifQ="; meta = with lib; { description = "Graphical console greeter for greetd"; diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/wlgreet.nix b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/wlgreet.nix index 803b61caa8..1026f3a61e 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/wlgreet.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/wlgreet.nix @@ -1,6 +1,10 @@ { lib , rustPlatform , fetchFromSourcehut +, autoPatchelfHook +, gcc-unwrapped +, wayland +, libxkbcommon }: rustPlatform.buildRustPackage rec { @@ -16,6 +20,15 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1ugExUtrzqyd9dTlBHcc44UrtEfYrfUryuG79IkTv2Y="; + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ gcc-unwrapped ]; + + runtimeDependencies = map lib.getLib [ + gcc-unwrapped + wayland + libxkbcommon + ]; + meta = with lib; { description = "Raw wayland greeter for greetd, to be run under sway or similar"; mainProgram = "wlgreet"; diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index a35b52bf8c..b8082c4510 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter , dbus, pcre, libepoxy, xorg, at-spi2-core, libxklavier, libxkbcommon -, gtk3, vala, cmake, libgee, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: +, gtk3, vala, cmake, libgee, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook3, librsvg }: stdenv.mkDerivation { pname = "lightdm-enso-os-greeter"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { cmake pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index 353e515035..16fa1cfe4d 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkg-config, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: +{ lib, stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkg-config, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook3, librsvg }: stdenv.mkDerivation rec { pname = "lightdm-mini-greeter"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Pm7ExfusFIPktX2C4UE07qgOVhcWhVxnaD3QARpmu7Y="; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 ]; buildInputs = [ lightdm gtk3 glib gdk-pixbuf librsvg ]; configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix index 67bbf37545..b7aded6026 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix @@ -6,7 +6,7 @@ , vala , intltool , autoreconfHook -, wrapGAppsHook +, wrapGAppsHook3 , cinnamon , lightdm , gtk3 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { vala intltool autoreconfHook - wrapGAppsHook + wrapGAppsHook3 python3 python3.pkgs.wrapPython ]; diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index c6c479505d..1090be3c93 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub -, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, config, conf ? config.lightdm-tiny-greeter.conf or "" }: +, pkg-config, lightdm, gtk3, glib, wrapGAppsHook3, config, conf ? config.lightdm-tiny-greeter.conf or "" }: stdenv.mkDerivation rec { pname = "lightdm-tiny-greeter"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "08azpj7b5qgac9bgi1xvd6qy6x2nb7iapa0v40ggr3d1fabyhrg6"; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ lightdm gtk3 glib ]; postUnpack = lib.optionalString (conf != "") '' diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 6d29d90d4b..e3ef95bdcd 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -6,7 +6,7 @@ , pkg-config , intltool , linkFarm -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , xfce4-dev-tools , at-spi2-core @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pkg-config intltool xfce4-dev-tools - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--disable-indicator-services-command" - "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically + "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook3 to wrap automatically ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix index 72814c5edd..291a280bdf 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -245,9 +245,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ alapshin msfjarvis ]; - beta = [ alapshin msfjarvis ]; - canary = [ alapshin msfjarvis ]; + stable = [ alapshin ]; + beta = [ alapshin ]; + canary = [ alapshin ]; dev = canary; }."${channel}"; mainProgram = pname; diff --git a/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix b/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix deleted file mode 100644 index 501f820664..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, meson, ninja -, wrapGAppsHook, pkg-config, desktop-file-utils -, appstream-glib, pythonPackages, glib, gobject-introspection -, gtk3, webkitgtk, glib-networking, gnome, gspell, texliveMedium -, shared-mime-info, libhandy, fira, sassc -}: - -let - pythonEnv = pythonPackages.python.withPackages(p: with p; [ - regex setuptools levenshtein pyenchant - pygobject3 pycairo pypandoc chardet - ]); - -in stdenv.mkDerivation rec { - pname = "apostrophe"; - version = "2.6.3"; - - src = fetchFromGitLab { - owner = "World"; - repo = pname; - domain = "gitlab.gnome.org"; - rev = "v${version}"; - sha256 = "sha256-RBrrG1TO810LidIelYGNaK7PjDq84D0cA8VcMojAW3M="; - }; - - nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils - appstream-glib wrapGAppsHook sassc gobject-introspection ]; - - buildInputs = [ glib pythonEnv gtk3 - gnome.adwaita-icon-theme webkitgtk gspell texliveMedium - glib-networking libhandy ]; - - postPatch = '' - substituteInPlace data/media/css/web/base.css \ - --replace 'url("/app/share/fonts/FiraSans-Regular.ttf") format("ttf")' \ - 'url("${fira}/share/fonts/opentype/FiraSans-Regular.otf") format("otf")' \ - --replace 'url("/app/share/fonts/FiraMono-Regular.ttf") format("ttf")' \ - 'url("${fira}/share/fonts/opentype/FiraMono-Regular.otf") format("otf")' - - patchShebangs --build build-aux/meson_post_install.py - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/" - --prefix PATH : "${texliveMedium}/bin" - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/World/apostrophe"; - description = "A distraction free Markdown editor for GNU/Linux"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.sternenseemann ]; - mainProgram = "apostrophe"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix index afcc62a289..41b107f0dc 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , gtk , libxml2 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-YUPlHGtVedWW86moXg8NhYDJ9Y+ChXWxGYgODKHZQbw="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ gnome.adwaita-icon-theme gtk diff --git a/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix index 32dc84f33a..0e8629a069 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook }: +{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "bluej"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-sOT86opMa9ytxJlfURIsD06HiP+j+oz3lQ0DqmLV1wE="; }; - nativeBuildInputs = [ dpkg wrapGAppsHook ]; + nativeBuildInputs = [ dpkg wrapGAppsHook3 ]; buildInputs = [ glib ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix b/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix index 60edd1871b..4c53fbb2a4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK32, gtk3 -, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook +, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1idaksw1vacmm83krxh5zlb12kad3dkz9ixh70glw1gaibib7vhm"; }; - nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config file zip wrapGAppsHook3 ]; buildInputs = [ wxGTK32 gtk3 ] ++ lib.optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix index 732dc7695c..6219ab2b7b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix @@ -13,11 +13,11 @@ let platform_major = "4"; - platform_minor = "30"; - year = "2023"; - month = "12"; #release month - buildmonth = "12"; #sometimes differs from release month - timestamp = "${year}${buildmonth}010110"; + platform_minor = "31"; + year = "2024"; + month = "03"; #release month + buildmonth = "02"; #sometimes differs from release month + timestamp = "${year}${buildmonth}290520"; gtk = gtk3; arch = if stdenv.hostPlatform.isx86_64 then "x86_64" @@ -43,8 +43,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-a5GqbghNlyvU/S36NcFSel1GRf/vZp01aaCxAswqyng="; - aarch64 = "sha256-w2bzolYBA4bf4kfcPza0LDLViKqXQkbZR07STN94nrY="; + x86_64 = "sha256-lZtU/IUNx2tc6TwCFQ5WS7cO/Gui2JpeknnL+Z/mBow="; + aarch64 = "sha256-iIUOiFp0uLOzwdqBV1txRhliaE2l1kbhGv1F6h0WO+w="; }.${arch}; }; }; @@ -58,8 +58,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-dsl-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-U9CMwcDZP1ptnc+C7gTfTOcyppe7r6RtgPp65b3A7Qk="; - aarch64 = "sha256-wuh6IZtRPDNJAVcfukFjZfuOVJgfj2zI616YNDnRgWM="; + x86_64 = "sha256-gdtDI9A+sUDAFsyqEmXuIkqgd/v1WF+Euj0TSWwjeL4="; + aarch64 = "sha256-kYa+8E5KLqHdumBQiIom3eG5rM/9TFZlJyyc7HpySes="; }.${arch}; }; }; @@ -73,8 +73,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-embedcpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-c/dd/3PzTSnrtaa2gNw+crdNu/xA428hYr8YNeBSEyw="; - aarch64 = "sha256-tF6o3NpFNxXALf2UA8tLzFhqYe46cI2swvym8vDSxNI="; + x86_64 = "sha256-5g4CAX2mu1i6aMqmbgy4R3Npk1IC/W73FrIZAQwgGCc="; + aarch64 = "sha256-KcfybNDyGglULKF3HF5v50mBs69FFryCMZ+oBtjBFiw="; }.${arch}; }; }; @@ -88,8 +88,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-h1d0LTBKBKcYxeLr0QEK7VG3q8cKeHQPaKzoPU6qlkI="; - aarch64 = "sha256-nCkNNmL924I8Q6wjAmik7d3K4T4j0/Biyr4d9Y0KfSg="; + x86_64 = "sha256-yRJWSEg0TVWpgQBSS+y8/YrjdU3PSvJoruEUwjZcrLc="; + aarch64 = "sha256-Czm8nYAkVqS8gaowDp1LrJ31iE32d6klT6JvHekL52c="; }.${arch}; }; }; @@ -103,8 +103,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-FbcSbDFyjx2uG0T844cBwAdaBZc2k/c4aogsCVYI7+E="; - aarch64 = "sha256-COQipICwcM7+gbpiD/G31bsW+9NDz8wt+HyY6FFkKos="; + x86_64 = "sha256-PIvJeITqftd9eHhfbF+R+SQ+MXp4OmM5xi8ZDdUvXaI="; + aarch64 = "sha256-C04AICPcb9foEai3Nk4S4zxQ3oUv+i2tckwqDscpx7I="; }.${arch}; }; }; @@ -135,8 +135,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-3UfaIwUpgD+VWB7Ar5by78zldqmrlg9csINkre+m8i0="; - aarch64 = "sha256-5wIlnTItwEstUHitlVPIxY7ayvxV4yI/8ID8WQ3mnDI="; + x86_64 = "sha256-omsAZSlCvggTjoAPQt0oGqRUZwyt5H2LswGpFt88L+I="; + aarch64 = "sha256-wcrYVlL5x+Wve2MAgnEFQ4H3a/gc2y8Fr5TmwHU9p6A="; }.${arch}; }; }; @@ -150,8 +150,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-Cf2jrNjakRteGO/W18oneE9EDM3VLyi/lIafgffprUc="; - aarch64 = "sha256-j0i1k3fHQ/+P5y6aRKUZM8uBQJOLweDtkjneqlx/kuQ="; + x86_64 = "sha256-8WqHFLywYQXtzUGxBVstxGqVU55WHoApZnyZ6ur4XgU="; + aarch64 = "sha256-GlD0ykJbwdbzh1K3XQQ79yBhCJQUlmt2v8c2OMYNWp4="; }.${arch}; }; }; @@ -165,8 +165,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-pN+x63J8+GhGmfsdzLknJXWCnvhS8VeLizmyqWM8XUA="; - aarch64 = "sha256-QVW2nx5P6mkj4oJ1qHs5D2TZBuBuxayhiJHh0VgAghU="; + x86_64 = "sha256-K2uo2VVL6rP9kxicJRLzsJiOFKloLD0vInSon8JsUWg="; + aarch64 = "sha256-qeEQTlFeWBag6SLXoatDeviR/NG8EcTi6VyUo9P6STM="; }.${arch}; }; }; @@ -180,8 +180,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-Qj9Omc3+HP3twF0evhkRKE8PH/i4+eGtnkfjUu9+lY4="; - aarch64 = "sha256-DqkwHyEbttFBA9HM3GdqxxZNjCiKf6gS7KNQYIUBAGE="; + x86_64 = "sha256-Ko4NCU9jbkjAWY7Ky5tPlhXOnzkpY4GjPi6Z0CBmzzc="; + aarch64 = "sha256-RBT+xwdQcJh+YgsuCPTWy9MM2y45bhIF9DttPm6Qz+Q="; }.${arch}; }; }; @@ -195,8 +195,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-zhQU7hSF3KWJ0Q2TRzvGhL76Mxhhh/HS/wT/ahkFHXk="; - aarch64 = "sha256-XSqWx1V0XjtuYbZlRcJf7Xu1yL1VazT5Z/BcGkkXzb8="; + x86_64 = "sha256-dWwDv8cfUxnU/24ASYLvSTbS3xV5ugG98jYMhAXTfS8="; + aarch64 = "sha256-+bAKFZ4u5PvCdC4Ifj5inppWb6C8wh0tar66qryx76o="; }.${arch}; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/ed/sources.nix b/third_party/nixpkgs/pkgs/applications/editors/ed/sources.nix index 77e13da9eb..de20aa1bf8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/ed/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/ed/sources.nix @@ -23,10 +23,10 @@ in { ed = let pname = "ed"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "mirror://gnu/ed/ed-${version}.tar.lz"; - hash = "sha256-saRjspehQfmHbEsfzQFHf2Rc3tkhaAkOmjXbKvS6u8o="; + hash = "sha256-Zf7HMY9IwsoX8zSsD0cD3v5iA3uxPMI5IN4He1+iRSM="; }; in import ./generic.nix { inherit pname version src meta; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 797ecd493d..fd0ec451ec 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -10,7 +10,7 @@ version = "0.10.0.0.20220911.35841"; src = fetchurl { url = "https://elpa.gnu.org/devel/ace-window-0.10.0.0.20220911.35841.tar"; - sha256 = "1q506qdi55rg2c9z3555klsqy5sxqpii11mx69l8x76a33a0j1f4"; + sha256 = "0xfc1pw7m4vg0xvj40djm7rxqr0405pby3rgl5vyd8ci5kpmmvhs"; }; packageRequires = [ avy ]; meta = { @@ -25,7 +25,7 @@ version = "1.11.0.20220924.84123"; src = fetchurl { url = "https://elpa.gnu.org/devel/ack-1.11.0.20220924.84123.tar"; - sha256 = "1npl618r6g25mzkibj0x4l31kqws73w9aid6ichm0ql9mi6pry5m"; + sha256 = "0vic2izviakj6qh2l15jd8qm8yr0h0qhy4r8sx7zdngpi9i14r5v"; }; packageRequires = []; meta = { @@ -41,10 +41,10 @@ elpaBuild { pname = "activities"; ename = "activities"; - version = "0.8pre0.20240313.183743"; + version = "0.8pre0.20240328.110921"; src = fetchurl { - url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240313.183743.tar"; - sha256 = "1ba85ik0knxrlhw2prwsawin5r86n75qm240qkgkd05xhm7znqnw"; + url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240328.110921.tar"; + sha256 = "0b8g9zb0x0hx0fgkrvn0lr7sxakrm931m1mrdzxrg779h8h24025"; }; packageRequires = [ emacs persist ]; meta = { @@ -65,7 +65,7 @@ version = "8.1.0.0.20231018.91522"; src = fetchurl { url = "https://elpa.gnu.org/devel/ada-mode-8.1.0.0.20231018.91522.tar"; - sha256 = "00ywqyvqvynrskyg0wh2acl6a68f0s2r83w3cmsgxd569phlsrqp"; + sha256 = "07kd6dj1dbds68qmi4dh4w3fc8l18jyxrfbz4lxb5v9c59hk8c46"; }; packageRequires = [ emacs gnat-compiler uniquify-files wisi ]; meta = { @@ -82,7 +82,7 @@ version = "2020.1.0.20201129.190419"; src = fetchurl { url = "https://elpa.gnu.org/devel/ada-ref-man-2020.1.0.20201129.190419.tar"; - sha256 = "0pvlfgq4b2a4d7452b3y0ns3saq8497fq9m62pi4ylqnqwjkfy61"; + sha256 = "0a201fn9xs3vg52vri8aw2p56rsw428hk745m6hja6q5gn6rl0zw"; }; packageRequires = []; meta = { @@ -100,7 +100,7 @@ version = "0.8.0.20240113.95028"; src = fetchurl { url = "https://elpa.gnu.org/devel/adaptive-wrap-0.8.0.20240113.95028.tar"; - sha256 = "1s31ql23mrcarwcp1z4068qsyqcddss8ybr23jpplp3y0faaqmc8"; + sha256 = "0dj20mmipnik62480cm11rnvsvbc3js2ql5r321kj20g87rz9l2a"; }; packageRequires = [ emacs ]; meta = { @@ -118,7 +118,7 @@ version = "3.2.0.20240113.95404"; src = fetchurl { url = "https://elpa.gnu.org/devel/adjust-parens-3.2.0.20240113.95404.tar"; - sha256 = "1lnwpir9rnk7c8hhd8w88lk5bx01v757szi9p02hv0i5l3w494r1"; + sha256 = "0l7s63dfpar2ddiydl43m6ipzc7qghv9k5hfcnj56aj6hs7ibcd2"; }; packageRequires = [ emacs ]; meta = { @@ -136,7 +136,7 @@ version = "0.1.0.20201220.233221"; src = fetchurl { url = "https://elpa.gnu.org/devel/advice-patch-0.1.0.20201220.233221.tar"; - sha256 = "09ivqir4b5rr1h7mc5g9czr5d9iig10zxvwjnnx12qzqaqwz2yvr"; + sha256 = "1bca9s6cxpsyvyl0fxqa59x68rpdj44kxcaxmaa0lsy10vgib542"; }; packageRequires = [ emacs ]; meta = { @@ -154,7 +154,7 @@ version = "1.7.0.20220417.71805"; src = fetchurl { url = "https://elpa.gnu.org/devel/aggressive-completion-1.7.0.20220417.71805.tar"; - sha256 = "0kizmb64l0dbrgyj0wzbpdxpyr060myval62y5i88an74fvjli60"; + sha256 = "1nmh9as4m0xjvda1f0hda8s1wk1z973wlfxcfci768y45ffnjn0g"; }; packageRequires = [ emacs ]; meta = { @@ -172,7 +172,7 @@ version = "1.10.0.0.20230112.100030"; src = fetchurl { url = "https://elpa.gnu.org/devel/aggressive-indent-1.10.0.0.20230112.100030.tar"; - sha256 = "0jjai48mf0j8b9dcxi9rlrpcpbz2cm2y6iqbi2f7q8012166hvgs"; + sha256 = "0vp49nz5n82pcds2hxqz0fy5zcmvcrpfd1zgsm1cwyph7vvx7djj"; }; packageRequires = [ emacs ]; meta = { @@ -187,7 +187,7 @@ version = "0.0.20240117.23316"; src = fetchurl { url = "https://elpa.gnu.org/devel/agitate-0.0.20240117.23316.tar"; - sha256 = "0fa6yjakcws7rj83yyj5d8adq4jdmzp1l5ydz81yw5jyiw5zwrgi"; + sha256 = "0md795hvmz15bb3vsji4p12g9lm8j34mj9wqq338dhn6zw91n5hi"; }; packageRequires = [ emacs ]; meta = { @@ -205,7 +205,7 @@ version = "1.10.0.0.20211231.115425"; src = fetchurl { url = "https://elpa.gnu.org/devel/ahungry-theme-1.10.0.0.20211231.115425.tar"; - sha256 = "0irq26pxgv31ak0wrwy1smhfazsc3nvn99ki3zq21h1d31i2xhcr"; + sha256 = "0iddqqkv9i3d9yajhysl54av91i0gdngxqyn7vvapf1nz3pxzrvz"; }; packageRequires = [ emacs ]; meta = { @@ -223,7 +223,7 @@ version = "0.0.6.0.20240307.233340"; src = fetchurl { url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20240307.233340.tar"; - sha256 = "1jw2w80sjglh1fq4psr5nflm20h37ldd5xjlqbmfd46ghmlanb1d"; + sha256 = "0wlnk169zkb3l7aw8536p6dvlf7qzqdcf0jbmn92w75hy8k7jwjk"; }; packageRequires = [ emacs ]; meta = { @@ -235,10 +235,10 @@ elpaBuild { pname = "all"; ename = "all"; - version = "1.0.0.20240113.95556"; + version = "1.1.0.20240405.133638"; src = fetchurl { - url = "https://elpa.gnu.org/devel/all-1.0.0.20240113.95556.tar"; - sha256 = "193hiqxh3hzrm928arcbzbrmja9qn0rs3ka8zb7fra9k2rd214dn"; + url = "https://elpa.gnu.org/devel/all-1.1.0.20240405.133638.tar"; + sha256 = "0cybsyr7ksgslwdfnrz8cpymk34f9gz75ahz368rhg926qlxy95j"; }; packageRequires = [ emacs ]; meta = { @@ -253,7 +253,7 @@ version = "1.2.0.0.20240117.23410"; src = fetchurl { url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20240117.23410.tar"; - sha256 = "1jgl15jyz1xz8541yi3dfwc1k6rb6w469nsnpwmdvl36vnk9f0hq"; + sha256 = "0ylsxw86h2d8b407rmai174yw4hq4jjcpviz7hq2aj0amvk7p5ml"; }; packageRequires = [ emacs ]; meta = { @@ -268,7 +268,7 @@ version = "0.2.0.20240220.181558"; src = fetchurl { url = "https://elpa.gnu.org/devel/ampc-0.2.0.20240220.181558.tar"; - sha256 = "0mlf9lggf41rlx6zxjj2kjdy4k11s0kjmxg6qga45r38ynd3am5d"; + sha256 = "139gqhijy92qnprk25av550zd7165ilsnnmdx4v0v0fnwgxnya7h"; }; packageRequires = [ emacs ]; meta = { @@ -286,7 +286,7 @@ version = "0.977.0.20221212.221354"; src = fetchurl { url = "https://elpa.gnu.org/devel/arbitools-0.977.0.20221212.221354.tar"; - sha256 = "1fxm44g6ymvzcz784v48c4114kf23h8qylc5fnirla9bk0lhwqpj"; + sha256 = "0s9w9hfki33bnfgm7yyhhcl0kbpn1ahd5li7nfy409zcb5spz17h"; }; packageRequires = [ cl-lib ]; meta = { @@ -303,7 +303,7 @@ version = "1.13.0.20230911.4520"; src = fetchurl { url = "https://elpa.gnu.org/devel/ascii-art-to-unicode-1.13.0.20230911.4520.tar"; - sha256 = "119pwcfrr0x2nyd9w4gpaka408rdivs1l0zw2kk80hq9fccrgm47"; + sha256 = "10x2svbc9qkrcckwjfsd1rlcqbvapvrb80x8m0p2awffwisr165j"; }; packageRequires = []; meta = { @@ -318,7 +318,7 @@ version = "0.7.0.20240303.95456"; src = fetchurl { url = "https://elpa.gnu.org/devel/assess-0.7.0.20240303.95456.tar"; - sha256 = "0k9n0j5q5l2bwbb7yql8jg9fnqvmk7mgx6dv612hpv9hdsls65h1"; + sha256 = "0yqiqlgnhqvqc4w9s05csk2h2iwyv1m32wb121v6famfqaicgl12"; }; packageRequires = [ emacs m-buffer ]; meta = { @@ -333,7 +333,7 @@ version = "1.9.8.0.20240323.191212"; src = fetchurl { url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240323.191212.tar"; - sha256 = "0w0nqdam98ahvbbbzr3i4z7zx2xfl6h1b3aq53qn8cxwnl1mfnqx"; + sha256 = "0ji1ai2zx8wly0b0f670v0wij57hrclr4yr6kwiq0ljaqnbm59h3"; }; packageRequires = [ emacs ]; meta = { @@ -341,17 +341,14 @@ license = lib.licenses.free; }; }) {}; - auctex = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + auctex = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.4.0.20240317.113904"; + version = "14.0.4.0.20240427.91120"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-14.0.4.0.20240317.113904.tar"; - sha256 = "1iwzym6ygq0wzb96qgbv7530fv3cxykjilbxzxb3la3xhqb93qhs"; + url = "https://elpa.gnu.org/devel/auctex-14.0.4.0.20240427.91120.tar"; + sha256 = "1qp2vgmna7fi66qdi4flgvl0l4cpz516klkx2rcd6wixvhyc53rx"; }; packageRequires = [ emacs ]; meta = { @@ -366,7 +363,7 @@ version = "7.0.20221221.74552"; src = fetchurl { url = "https://elpa.gnu.org/devel/aumix-mode-7.0.20221221.74552.tar"; - sha256 = "0ksihp1qa9n1290qpf7ahxxpbp4q9pwbpvk6ybgjcjdb4pjgfyms"; + sha256 = "0c3yhk8ir4adv3wy80iywbvl1sm86xssg0j0q4rym50pr4vqx60n"; }; packageRequires = []; meta = { @@ -383,7 +380,7 @@ version = "1.1.4.0.20221221.74656"; src = fetchurl { url = "https://elpa.gnu.org/devel/auto-correct-1.1.4.0.20221221.74656.tar"; - sha256 = "0w9q0ibghmafbwla8wxnfki1fidb476cvsx37v3bs4pvq2kkcphk"; + sha256 = "10h6b5px4krcwjwhc475al9kcizijsz773zkcijrfi83283l35nc"; }; packageRequires = []; meta = { @@ -400,7 +397,7 @@ version = "0.1.2.0.20230407.82136"; src = fetchurl { url = "https://elpa.gnu.org/devel/auto-header-0.1.2.0.20230407.82136.tar"; - sha256 = "1h455ikypf1sd082r7i59yldm4p794a3w1ya7qfzcwvfhygdzdgz"; + sha256 = "1dm5nqcvbya9fyj45q6k8ni507prs3ij2q5rhdl9m8vwkq6gf72w"; }; packageRequires = []; meta = { @@ -418,7 +415,7 @@ version = "0.10.10.0.20201215.220815"; src = fetchurl { url = "https://elpa.gnu.org/devel/auto-overlays-0.10.10.0.20201215.220815.tar"; - sha256 = "18lq41am7psh7kbf7yxk5qqhiddjzjqkb1pv0zn0vbps7pka68qh"; + sha256 = "1gmsli1bil210867x642x4zvhqradl3d4pk4n5ky5g6xp1h36c7w"; }; packageRequires = [ cl-lib ]; meta = { @@ -433,10 +430,10 @@ elpaBuild { pname = "autocrypt"; ename = "autocrypt"; - version = "0.4.1.0.20230505.70117"; + version = "0.4.2.0.20240410.70023"; src = fetchurl { - url = "https://elpa.gnu.org/devel/autocrypt-0.4.1.0.20230505.70117.tar"; - sha256 = "1g83wm21a56w056bj97ciqalw464ra3bfhp1m66jiw7v06ppgi56"; + url = "https://elpa.gnu.org/devel/autocrypt-0.4.2.0.20240410.70023.tar"; + sha256 = "13g6422lcv8bjwcfrkxmw7fi5by1liz2ni6zxf10pr3qcpv6046n"; }; packageRequires = [ emacs ]; meta = { @@ -451,7 +448,7 @@ version = "0.5.0.0.20230424.65712"; src = fetchurl { url = "https://elpa.gnu.org/devel/avy-0.5.0.0.20230424.65712.tar"; - sha256 = "08kbfjwjbkbgbkkc51nmcbs9qq1hw8gv1z8h1knry8clvh23k735"; + sha256 = "1z7d59fif97j12jx9vmk2p91sr01d53gp57gjvqdcdr2lqvdsaz8"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -466,7 +463,7 @@ version = "3.2.2.4.0.20231023.5901"; src = fetchurl { url = "https://elpa.gnu.org/devel/bbdb-3.2.2.4.0.20231023.5901.tar"; - sha256 = "1hvhrbnnhc5hy4szkhsl5fvqlm13kzn5cx4l5sm5pr75xnmcvm08"; + sha256 = "16m5irp1y9crv13l2qncafys4fscwq2d28ig8hnx4g5bag9bi7j4"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -481,7 +478,7 @@ version = "1.3.4.0.20220729.220057"; src = fetchurl { url = "https://elpa.gnu.org/devel/beacon-1.3.4.0.20220729.220057.tar"; - sha256 = "0wcc9hw6h1b3p1s506mc7zgjhhcb1bc4wq1bplax62lg2jyxiaks"; + sha256 = "1dpd3j2aip3zi3ivbszsgrifw43bryx01df868hmrxm1s0vvjhh6"; }; packageRequires = [ emacs ]; meta = { @@ -496,7 +493,7 @@ version = "1.0.1.0.20240224.51508"; src = fetchurl { url = "https://elpa.gnu.org/devel/beframe-1.0.1.0.20240224.51508.tar"; - sha256 = "1i22lbwck2q80byxd6bd6cba9jj3iqzsj129rb81a221wp91sarj"; + sha256 = "105axrl2m6x5gc523ai9lna89jf44n2na337brxqn1jflnnpdh43"; }; packageRequires = [ emacs ]; meta = { @@ -513,7 +510,7 @@ version = "0.1.3.0.20240218.140135"; src = fetchurl { url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.3.0.20240218.140135.tar"; - sha256 = "0c6xg1dpz60akcr847x6ydl7riwy9bchww31l14wr1s54zrf76sg"; + sha256 = "1qa1ws7hvn7ni8qnrzhmwnf8hq2wb3dc36i49vdiv0rf68kci210"; }; packageRequires = []; meta = { @@ -531,7 +528,7 @@ version = "2.4.1.0.20240321.194020"; src = fetchurl { url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20240321.194020.tar"; - sha256 = "0fjx32brckrmbvcyps45akzhimw93rzi7hy7f8nx0j72nkncavpp"; + sha256 = "02v2pc830b9vp0rmdxwcxjj36y5x2p8sy381h3c8hsi61pwyqy93"; }; packageRequires = [ emacs ]; meta = { @@ -546,7 +543,7 @@ version = "0.3.0.20231213.61103"; src = fetchurl { url = "https://elpa.gnu.org/devel/blist-0.3.0.20231213.61103.tar"; - sha256 = "06h1k2i43pxpa2c394aqznrhf2pj8c7pgjcgs56iz2faar6zri38"; + sha256 = "01pqf794syngh6v4bym3qzg2rh2gp3z9h6hvpw74nadimfg5pz61"; }; packageRequires = [ emacs ilist ]; meta = { @@ -565,7 +562,7 @@ version = "0.3.1.0.20230119.122638"; src = fetchurl { url = "https://elpa.gnu.org/devel/bluetooth-0.3.1.0.20230119.122638.tar"; - sha256 = "1wzv7wlpimqiagli02s87i75lj2xb33jld5w9xqnfnks2xvh7srl"; + sha256 = "1s5vfprs06xf400p01qiwxbcy0y05pbgmp731c8z3zyk5ai4s88g"; }; packageRequires = [ dash emacs ]; meta = { @@ -584,7 +581,7 @@ version = "0.4.5.0.20221205.150230"; src = fetchurl { url = "https://elpa.gnu.org/devel/bnf-mode-0.4.5.0.20221205.150230.tar"; - sha256 = "0rlg12z0dxy190c15p09inpnms374xxr5zv3h4gn9ilbb5g5r7d4"; + sha256 = "0ljzk39ck12hyshm32vbwjx1a87dw7v9v3wmf01cyc7k2i5d8rip"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -596,10 +593,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "1.1.3.0.20231024.113314"; + version = "1.1.4.0.20240326.215209"; src = fetchurl { - url = "https://elpa.gnu.org/devel/boxy-1.1.3.0.20231024.113314.tar"; - sha256 = "1b5dkjic7spzbkj78m03z00gh8a9f8yv1kkyhnr4gks81jdr1gsn"; + url = "https://elpa.gnu.org/devel/boxy-1.1.4.0.20240326.215209.tar"; + sha256 = "077q9xxrsd98r4h9xj4djgiwfw34bjx3w0mhnbip2p57xknjjr46"; }; packageRequires = [ emacs ]; meta = { @@ -616,10 +613,10 @@ elpaBuild { pname = "boxy-headings"; ename = "boxy-headings"; - version = "2.1.4.0.20231024.114002"; + version = "2.1.5.0.20240326.215829"; src = fetchurl { - url = "https://elpa.gnu.org/devel/boxy-headings-2.1.4.0.20231024.114002.tar"; - sha256 = "1fan3pdslmwxkdc8lj7svcjllzjqhnhsma1yjpfhi99dv4b8fyns"; + url = "https://elpa.gnu.org/devel/boxy-headings-2.1.5.0.20240326.215829.tar"; + sha256 = "0zh5g1k2nql8jyg9ws0spsbhzwfa28f6qxs9krihp5qgz8kihn2p"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -638,7 +635,7 @@ version = "1.0.1.0.20231126.221621"; src = fetchurl { url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20231126.221621.tar"; - sha256 = "0z111vmwdc3lvbnbim8233ck3vm6haq2zx9pjaiimipv36jxkzf3"; + sha256 = "11qx345ggpm78dcvlrnji50b50wh3cv3i0ihxwxsw55n86kv9x0k"; }; packageRequires = [ emacs project ]; meta = { @@ -650,10 +647,10 @@ elpaBuild { pname = "brief"; ename = "brief"; - version = "5.90.0.20240321.65101"; + version = "5.91.0.20240401.34715"; src = fetchurl { - url = "https://elpa.gnu.org/devel/brief-5.90.0.20240321.65101.tar"; - sha256 = "1z4nww74gaxjjjfg4i9qdk6lwfjnbsc41jq95k0pcj12ilwilg54"; + url = "https://elpa.gnu.org/devel/brief-5.91.0.20240401.34715.tar"; + sha256 = "1knpamvbpz92b9zql6p0l7g1p5595l6kns0gw1vfhm7cl37dngyr"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -672,7 +669,7 @@ version = "0.6.0.20240323.72724"; src = fetchurl { url = "https://elpa.gnu.org/devel/buffer-env-0.6.0.20240323.72724.tar"; - sha256 = "1bdch2ah5c0ikzl2zyfv7hkpbhvkvcdd4ljkzd5zmnwj11fk7ml2"; + sha256 = "061cbq2pb5wg3jap3l9lbm1axb700aqar9s8vx2zys0hl65klw51"; }; packageRequires = [ compat emacs ]; meta = { @@ -691,7 +688,7 @@ version = "0.4.3.0.20190429.135558"; src = fetchurl { url = "https://elpa.gnu.org/devel/buffer-expose-0.4.3.0.20190429.135558.tar"; - sha256 = "0s11p8dlycv14j94599d33bkp3hhpvjq5a3jrmx9rynamhzvfig9"; + sha256 = "0f3a064i4a1ylb1ibqmz302h24kymir3zj1d225b7v6r89nam216"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -706,7 +703,7 @@ version = "0.6.0.20240105.200601"; src = fetchurl { url = "https://elpa.gnu.org/devel/bufferlo-0.6.0.20240105.200601.tar"; - sha256 = "1m0740ljllwyyfmjl1jlxrfgj4ndq7zh9lbyi4j2c40xliikgs09"; + sha256 = "02iqarvq8b2siivbv878f2yzkm5law15idnbi5wv72v5pc2hxrjk"; }; packageRequires = [ emacs ]; meta = { @@ -725,7 +722,7 @@ version = "1.3.1.0.20201128.92354"; src = fetchurl { url = "https://elpa.gnu.org/devel/bug-hunter-1.3.1.0.20201128.92354.tar"; - sha256 = "0gis7vrjrh0khjl71mb5vsbfhcwph0yv5c11wmwa3jc4n1wgxiq9"; + sha256 = "1bskf9csg49n4cisl57wv0sa74s6v3wffdxw80m3r2yr0kx01cfs"; }; packageRequires = [ cl-lib seq ]; meta = { @@ -743,7 +740,7 @@ version = "0.0.1.0.20230726.134747"; src = fetchurl { url = "https://elpa.gnu.org/devel/buildbot-0.0.1.0.20230726.134747.tar"; - sha256 = "1knkx80fcmxhi8y3ns3vb4zrg8s6la81gr3rbs1v3fss4h1snka1"; + sha256 = "1z27pfx3h1fad9wiazrkqgfdc1h06g2rlb3cq1zk83hilg64nnjd"; }; packageRequires = [ emacs ]; meta = { @@ -758,7 +755,7 @@ version = "1.4.1.0.20240208.85735"; src = fetchurl { url = "https://elpa.gnu.org/devel/calibre-1.4.1.0.20240208.85735.tar"; - sha256 = "0b69ymkcahx6bh9ss8zygwfwiffsql370i9pwriv9ypy17nbjxlc"; + sha256 = "1rbmck8bc28c2rf321606w748nqc5klly6yrm3r8zyviggwd1v2c"; }; packageRequires = [ compat emacs ]; meta = { @@ -770,10 +767,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "1.4.0.20240315.54216"; + version = "1.5.0.20240411.220758"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-1.4.0.20240315.54216.tar"; - sha256 = "0pqr36i8ijq32kf0qxb0hdm0gffakya12jjj4dy0hwan13scq77d"; + url = "https://elpa.gnu.org/devel/cape-1.5.0.20240411.220758.tar"; + sha256 = "0mbw0azs2a33ywq1iqqvm2r5pyhpl1qfjkzmqv473n7qm658gkfg"; }; packageRequires = [ compat emacs ]; meta = { @@ -791,7 +788,7 @@ version = "0.3.0.20211123.104430"; src = fetchurl { url = "https://elpa.gnu.org/devel/capf-autosuggest-0.3.0.20211123.104430.tar"; - sha256 = "17ih1lbsiydazwdn8caqnw8fm31yfyq8aqmcyv85y1w8zlnb6x4j"; + sha256 = "0f16csl2ky8kys3wcv41zqh1l9976gc009pjy21kp6ck0pm0m3kg"; }; packageRequires = [ emacs ]; meta = { @@ -806,7 +803,7 @@ version = "1.0.0.20221221.74713"; src = fetchurl { url = "https://elpa.gnu.org/devel/caps-lock-1.0.0.20221221.74713.tar"; - sha256 = "1wylgdwfm9pf0fpj53fprn7dknv3ldkf74xibgndh5i8xn11d036"; + sha256 = "0f8n79yw9zs1cpa8nhqmvw95kj762lv8rzrkj30ybvj1612vl1z9"; }; packageRequires = []; meta = { @@ -821,7 +818,7 @@ version = "1.0.3.0.20221221.74732"; src = fetchurl { url = "https://elpa.gnu.org/devel/captain-1.0.3.0.20221221.74732.tar"; - sha256 = "03zgffj8lbh4y6gg8dr40kxcm8pnllzfy3jbsapmw98ps9qnahi7"; + sha256 = "0ay26xzbhrxgvslrwcc504k5s0kxk0c8rnps656xz1wl38fbvm5b"; }; packageRequires = []; meta = { @@ -836,7 +833,7 @@ version = "2.0.5.0.20220926.150547"; src = fetchurl { url = "https://elpa.gnu.org/devel/chess-2.0.5.0.20220926.150547.tar"; - sha256 = "0wdyq7a142r57f9qa77gcvdld9mlh3nqjm0jyz8z7xwjz1km395b"; + sha256 = "16md052m600mmy43fgpcpwl4jz5q67v9w2h3y234ild6sp1qanlj"; }; packageRequires = [ cl-lib ]; meta = { @@ -853,7 +850,7 @@ version = "0.3.0.20221221.74800"; src = fetchurl { url = "https://elpa.gnu.org/devel/cl-generic-0.3.0.20221221.74800.tar"; - sha256 = "12yqi7fc59rblh4asf94a4fj8qj873qs20bgjydp2djkrh4xas62"; + sha256 = "1yhjgcc3rnhi0kf2mgm7yii1pa9hzz0dnfkg393p456rl07q7vqq"; }; packageRequires = []; meta = { @@ -868,7 +865,7 @@ version = "0.7.1.0.20221221.74809"; src = fetchurl { url = "https://elpa.gnu.org/devel/cl-lib-0.7.1.0.20221221.74809.tar"; - sha256 = "18wfqbdibz62bisphcw91rpd3jacs7i24lib7l3wg9pf2563p98i"; + sha256 = "1xig9cma7p5bplnqnxmwh1axxlf813ar69bzyvks09yhg04jikm1"; }; packageRequires = []; meta = { @@ -886,7 +883,7 @@ version = "0.3.0.20190215.154741"; src = fetchurl { url = "https://elpa.gnu.org/devel/clipboard-collector-0.3.0.20190215.154741.tar"; - sha256 = "1hjvwqi089r3wrs5771i1sjgmk63gk9m9a88gxnk99vzvh6r31dq"; + sha256 = "03y1wivagbsl4f2qgmxcy43pbpvpxhd1d57ihpdvsl2illb6bwlq"; }; packageRequires = [ emacs ]; meta = { @@ -904,7 +901,7 @@ version = "1.1.0.20221221.74904"; src = fetchurl { url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20221221.74904.tar"; - sha256 = "1c3axx65bycr44hjy1cw4c9z89l3sqq16d2yk2animms3iwajvl0"; + sha256 = "0268d848pj3vszspmbcz9923945pzz4kzcd0jcrl7k3dasg3mpka"; }; packageRequires = [ cl-lib ]; meta = { @@ -922,7 +919,7 @@ version = "0.4.0.20231119.213845"; src = fetchurl { url = "https://elpa.gnu.org/devel/code-cells-0.4.0.20231119.213845.tar"; - sha256 = "0wrsp2xrvfp8f20gjw4r6434i4f822hz794mhnz44sn2ggs2mrn2"; + sha256 = "1i66d234fb9g4aqnpzjz9dn6hs37bq5l1vrk076hib1rb1vm36ir"; }; packageRequires = [ emacs ]; meta = { @@ -937,10 +934,10 @@ elpaBuild { pname = "comint-mime"; ename = "comint-mime"; - version = "0.4.0.20240302.74422"; + version = "0.4.0.20240426.193136"; src = fetchurl { - url = "https://elpa.gnu.org/devel/comint-mime-0.4.0.20240302.74422.tar"; - sha256 = "0zgna6h5v2mgmlkxyxla0faf3xrs13mv62xayyf3ddrhjgk82ggb"; + url = "https://elpa.gnu.org/devel/comint-mime-0.4.0.20240426.193136.tar"; + sha256 = "1znk6anr6yxb9jfh3z7702msl011k54z37vbixbdk2bvd7hihcx3"; }; packageRequires = [ emacs ]; meta = { @@ -957,7 +954,7 @@ version = "0.2.0.20220305.183958"; src = fetchurl { url = "https://elpa.gnu.org/devel/compact-docstrings-0.2.0.20220305.183958.tar"; - sha256 = "0xmhvfrla7la127hkj0jpam0laq495q4gfa3kbw4p3p3m070jxks"; + sha256 = "024l45bxxkh6x7rd8qcmykxdhdj0yckcf7vzacl7ynzwm9ah7sry"; }; packageRequires = []; meta = { @@ -975,7 +972,7 @@ version = "0.10.2.0.20240311.194338"; src = fetchurl { url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240311.194338.tar"; - sha256 = "159g5aii6bw006hkb49f653zc3lnnxnimg2xmyvwl0rgyk7imfl1"; + sha256 = "1bmf7xa7pwfmwqrdz3sjnbbaqr472n6f2n8mz5qrzc4y09xl8i0r"; }; packageRequires = [ emacs ]; meta = { @@ -994,7 +991,7 @@ version = "1.1.0.20221221.74915"; src = fetchurl { url = "https://elpa.gnu.org/devel/company-ebdb-1.1.0.20221221.74915.tar"; - sha256 = "1nh7jwlwd8wji5s3ywzlwj7vyqjn6jllrywi6mjk9bwyg5yhyd8a"; + sha256 = "1qidrgcm2hdkrbh75rjfzxbmbyvxvyfy4m2kd6lgcx0v494lzvqw"; }; packageRequires = [ company ebdb ]; meta = { @@ -1013,7 +1010,7 @@ version = "1.5.1.0.20221227.132907"; src = fetchurl { url = "https://elpa.gnu.org/devel/company-math-1.5.1.0.20221227.132907.tar"; - sha256 = "10jm0vb9z3pkh681vdd2ggi6pvhykghmalgib20pgcnm383kwpcn"; + sha256 = "070kfw13aw1hfvkdxb83zic44301nawnl57saqwrg6lh0psxpyxv"; }; packageRequires = [ company math-symbol-lists ]; meta = { @@ -1032,7 +1029,7 @@ version = "0.2.3.0.20170210.193350"; src = fetchurl { url = "https://elpa.gnu.org/devel/company-statistics-0.2.3.0.20170210.193350.tar"; - sha256 = "140281sy7w5pj3dkidlgi130axrzwh0y8z3ivkpk55bypdaardlw"; + sha256 = "0fwvaadfr5jlx3021kfjbij9692c2v3l600v2rwqijc563phdfg3"; }; packageRequires = [ company emacs ]; meta = { @@ -1048,10 +1045,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.5.0.20240316.105418"; + version = "29.1.4.5.0.20240401.110429"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-29.1.4.5.0.20240316.105418.tar"; - sha256 = "1f0rhf0p2szvqq1ixv7fxn726h3mnc0iqlyal1qzrf46vdsjkf87"; + url = "https://elpa.gnu.org/devel/compat-29.1.4.5.0.20240401.110429.tar"; + sha256 = "1mbkvl2fcdcnc8jriwn61z0aim0llg7rgb9rh12rq8djrinw1r5d"; }; packageRequires = [ emacs seq ]; meta = { @@ -1063,10 +1060,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "1.4.0.20240324.100717"; + version = "1.5.0.20240420.92954"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-1.4.0.20240324.100717.tar"; - sha256 = "1dngyxxviml9a4gqr85ah38pb4028wx2cvm8g9h4jp02g4cr7rkc"; + url = "https://elpa.gnu.org/devel/consult-1.5.0.20240420.92954.tar"; + sha256 = "1cg72m5aqvh7apdv3j4fhm232168vi0iddx3n9w42jwmhsxxq7fr"; }; packageRequires = [ compat emacs ]; meta = { @@ -1082,10 +1079,10 @@ elpaBuild { pname = "consult-hoogle"; ename = "consult-hoogle"; - version = "0.2.0.0.20240309.142502"; + version = "0.2.1.0.20240427.131842"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-hoogle-0.2.0.0.20240309.142502.tar"; - sha256 = "0igkhv7hg4bd6h27j16w2in6d542818ich94fhif4g36xh0jhdw7"; + url = "https://elpa.gnu.org/devel/consult-hoogle-0.2.1.0.20240427.131842.tar"; + sha256 = "05rx4kw9w51cbgx8nm1jbi2yv7p70w1yv9np8gmpj7z65gbw7v0m"; }; packageRequires = [ emacs haskell-mode ]; meta = { @@ -1104,7 +1101,7 @@ version = "0.8.1.0.20231211.122134"; src = fetchurl { url = "https://elpa.gnu.org/devel/consult-recoll-0.8.1.0.20231211.122134.tar"; - sha256 = "1agx2pv6zp61wr0hbywlr1mqhgrrlkxr48pnbia3iah82s81hqxp"; + sha256 = "1hpgcqbnvqcd6vzhxqi4axihjyp764hvbggk1skviys2apywk4s1"; }; packageRequires = [ consult emacs ]; meta = { @@ -1119,10 +1116,10 @@ elpaBuild { pname = "context-coloring"; ename = "context-coloring"; - version = "8.1.0.0.20201127.182211"; + version = "8.1.0.0.20240331.133753"; src = fetchurl { - url = "https://elpa.gnu.org/devel/context-coloring-8.1.0.0.20201127.182211.tar"; - sha256 = "0mbj7awrnifn3jb0i9s25535h41pk45fz6n0m5p5nq3jjyhj6z62"; + url = "https://elpa.gnu.org/devel/context-coloring-8.1.0.0.20240331.133753.tar"; + sha256 = "1m8c7vccdb868n777rqi8mhjwfbm25q7hbx7x6y145mxmnqr1vgn"; }; packageRequires = [ emacs ]; meta = { @@ -1134,10 +1131,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "1.2.0.20240320.91948"; + version = "1.3.0.20240413.92757"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-1.2.0.20240320.91948.tar"; - sha256 = "1gpqqh7f0ywn3mg31psdl7nanl3zqf3bddxz0hs018yp9dhr4d9v"; + url = "https://elpa.gnu.org/devel/corfu-1.3.0.20240413.92757.tar"; + sha256 = "0qf5nvg70sb313mv1m1mycipf182lz8c0y2rsacniqzykvqhbv74"; }; packageRequires = [ compat emacs ]; meta = { @@ -1152,7 +1149,7 @@ version = "1.6.0.20221015.160420"; src = fetchurl { url = "https://elpa.gnu.org/devel/coterm-1.6.0.20221015.160420.tar"; - sha256 = "0n5694klkdki9q363mknr4qwvr6q28lb6ss27v3pw0mzh91gavzp"; + sha256 = "1633q3vrqhjfv4ipirirgkpmal5j1rfh6jxkq3sm3qwlg8lgak4s"; }; packageRequires = [ compat emacs ]; meta = { @@ -1169,10 +1166,10 @@ elpaBuild { pname = "counsel"; ename = "counsel"; - version = "0.14.2.0.20240229.151718"; + version = "0.14.2.0.20240413.191055"; src = fetchurl { - url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240229.151718.tar"; - sha256 = "0wq8by3bc15cry533ybawzpb6qypnzvq79kpd9h0wrkd1yfbdazz"; + url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240413.191055.tar"; + sha256 = "14iphwfpmbmg44f1gx54y3ks920z3p86mfvg99h86yy817wb73pl"; }; packageRequires = [ emacs ivy swiper ]; meta = { @@ -1190,7 +1187,7 @@ version = "0.17.0.20211211.193556"; src = fetchurl { url = "https://elpa.gnu.org/devel/cpio-mode-0.17.0.20211211.193556.tar"; - sha256 = "064yc4hs6ci80a231mlv3688ys9p8z5aabfg2s2ya1kkmpwra4f2"; + sha256 = "0z9dkdz1s1b7gfd0fgfxjdvbjlwwqwa6q4jjf8kkvvkgwwvqv3yq"; }; packageRequires = [ emacs ]; meta = { @@ -1207,7 +1204,7 @@ version = "1.0.5.0.20230704.131557"; src = fetchurl { url = "https://elpa.gnu.org/devel/cpupower-1.0.5.0.20230704.131557.tar"; - sha256 = "03c5lbm9vmgx5m5pmi4a12npmf1v6g7kiryfxx6j2zy1ix9nk4jl"; + sha256 = "1xls5wjxrx2a193piav0yp0sv1m7jv5zqk46hbxxhfakl3jg5zlq"; }; packageRequires = []; meta = { @@ -1222,7 +1219,7 @@ version = "0.3.5.0.20230213.22302"; src = fetchurl { url = "https://elpa.gnu.org/devel/crdt-0.3.5.0.20230213.22302.tar"; - sha256 = "1hpkxpr88g4lpq7kxb15xhm3gpks5rz4vfdkkrkflh1wm3bpf4ah"; + sha256 = "0cl97di7s5a1v6widil63pwzywxpcxmhvhp34kqn256czsliv4pw"; }; packageRequires = []; meta = { @@ -1237,7 +1234,7 @@ version = "1.3.6.0.20221221.74923"; src = fetchurl { url = "https://elpa.gnu.org/devel/crisp-1.3.6.0.20221221.74923.tar"; - sha256 = "1jjl6hv0qib5519p5xigbiydz2f2h0fy773abnga7lvzx57rgppi"; + sha256 = "0kpw81h9n8qwrvmqan9bwj32d4vgsrmma4f0rig04bdx0mxmdzir"; }; packageRequires = []; meta = { @@ -1255,7 +1252,7 @@ version = "2.0.0.0.20221205.181941"; src = fetchurl { url = "https://elpa.gnu.org/devel/csharp-mode-2.0.0.0.20221205.181941.tar"; - sha256 = "0fl1v45apz448pqnz0psi6w4inakdxv54wydc99sjq8l3lm8ldrm"; + sha256 = "1cmc6b7pwjalzipc2clis2si7d03r0glpgxj7qpvfdp26y1cjabv"; }; packageRequires = [ emacs ]; meta = { @@ -1274,7 +1271,7 @@ version = "1.23.0.20240114.203711"; src = fetchurl { url = "https://elpa.gnu.org/devel/csv-mode-1.23.0.20240114.203711.tar"; - sha256 = "0y6zbqdh5gxhfbh2hfxx9k73h5aaknc041jr84s9ims67iavb17b"; + sha256 = "0r36dycnc76a5l94ad6p7lkx0f9ma6qmjvnivimgq6man5lw6lxh"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1286,10 +1283,10 @@ elpaBuild { pname = "cursory"; ename = "cursory"; - version = "1.0.1.0.20240117.23936"; + version = "1.0.1.0.20240425.35714"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cursory-1.0.1.0.20240117.23936.tar"; - sha256 = "0izi2gz5pgxjgw7jcpgcy9q0gf0pvcvsszhjq9mg157w8sbkfx06"; + url = "https://elpa.gnu.org/devel/cursory-1.0.1.0.20240425.35714.tar"; + sha256 = "0bm381nbrnh4j0pq1a53whsbs0mjvznr9mp0ymhxw8w935cvbl72"; }; packageRequires = [ emacs ]; meta = { @@ -1306,7 +1303,7 @@ version = "0.1.0.20221221.75021"; src = fetchurl { url = "https://elpa.gnu.org/devel/cycle-quotes-0.1.0.20221221.75021.tar"; - sha256 = "07gp0bbwajm44n24wywj7la1jdy9hrid6j9cj0cxhv3gdg3681z2"; + sha256 = "0igwwbhf1b6c67znik3zphdngddkgai146qcjlkgg1ihr4ajc3pc"; }; packageRequires = []; meta = { @@ -1318,10 +1315,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.9.0.0.20240318.94928"; + version = "0.10.0.0.20240427.142238"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dape-0.9.0.0.20240318.94928.tar"; - sha256 = "0f190gkicqqj02irhgcwcjjalh4srbcd9y80src888wp775vwy1x"; + url = "https://elpa.gnu.org/devel/dape-0.10.0.0.20240427.142238.tar"; + sha256 = "0d2mn565l5ag023z1yqg5nj0fj0iraf5yifh54pyl6cnz7ipmcj3"; }; packageRequires = [ emacs jsonrpc ]; meta = { @@ -1336,7 +1333,7 @@ version = "0.3.0.20200507.173652"; src = fetchurl { url = "https://elpa.gnu.org/devel/darkroom-0.3.0.20200507.173652.tar"; - sha256 = "1njijhakvxqh6ik3krrz3zz97asfxmaxs7dz3wsnkmmcy9x0bbjb"; + sha256 = "1j57wa2jhpjs6ynda73s0vv4dzyr9jg0lifv7nc8bv79lr4sjab2"; }; packageRequires = [ cl-lib ]; meta = { @@ -1348,10 +1345,10 @@ elpaBuild { pname = "dash"; ename = "dash"; - version = "2.19.1.0.20240216.133446"; + version = "2.19.1.0.20240405.94636"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20240216.133446.tar"; - sha256 = "0wjx6lxj5svvhifnqffmxqf1li57606v0hv1ixs90275r56294gh"; + url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20240405.94636.tar"; + sha256 = "0s1wqxjv1xdhd251zpk52wlglcc5apbhdhld30vmb7c9bq9288xw"; }; packageRequires = [ emacs ]; meta = { @@ -1369,7 +1366,7 @@ version = "0.1.0.20220306.62546"; src = fetchurl { url = "https://elpa.gnu.org/devel/dbus-codegen-0.1.0.20220306.62546.tar"; - sha256 = "0s2ax0vqbh69dan5vdgy2dc2qfsfbxk4cqnxwysbhhpc7qqd7ljq"; + sha256 = "1jg8ibxy79g93b3hl97bpgz90ny5q936k8bjcmxix7hn82wg7a9l"; }; packageRequires = [ cl-lib ]; meta = { @@ -1384,7 +1381,7 @@ version = "0.40.0.20240318.175047"; src = fetchurl { url = "https://elpa.gnu.org/devel/debbugs-0.40.0.20240318.175047.tar"; - sha256 = "1vkap2h2041hib1rw3n91z9hs6vfphkgi84257x7b8yj1f0dr2xn"; + sha256 = "02kb6klsixyxn4a65mgr9m8n1cx68n7zqyym8m14381k0mi8pq0h"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1399,7 +1396,7 @@ version = "1.7.0.20200711.42851"; src = fetchurl { url = "https://elpa.gnu.org/devel/delight-1.7.0.20200711.42851.tar"; - sha256 = "1s22gr05yqirb4dddafw96kq4ifccncypvr09rxmhdf7iv4096dm"; + sha256 = "1v8yhii0s1rs1c2i7gs2rd98224qhpkybvrks8w5ghq4p3nxrrvw"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -1411,10 +1408,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.3.0.0.20240324.175148"; + version = "2.3.5.0.20240427.91057"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-2.3.0.0.20240324.175148.tar"; - sha256 = "00bd7470a01dd92nzcw9g7zpff3sy3vzxy13ig6a7gk9i5a8c7zg"; + url = "https://elpa.gnu.org/devel/denote-2.3.5.0.20240427.91057.tar"; + sha256 = "0xa0jxd6fbd2ayhaaxn1rnimi35pipgidx9l6v19swal0yk08kf4"; }; packageRequires = [ emacs ]; meta = { @@ -1433,7 +1430,7 @@ version = "1.2.0.0.20230927.131718"; src = fetchurl { url = "https://elpa.gnu.org/devel/denote-menu-1.2.0.0.20230927.131718.tar"; - sha256 = "1hm13sg6sif4620c78vma9qdgkpak0v1k3hfc35c946vzv8399x8"; + sha256 = "0pq8k2aif60y22sjxs6d4vlf43fqlizs1zlk3wrd1k52sn2dkgxp"; }; packageRequires = [ denote emacs ]; meta = { @@ -1451,7 +1448,7 @@ version = "0.10.1.0.20221129.143049"; src = fetchurl { url = "https://elpa.gnu.org/devel/detached-0.10.1.0.20221129.143049.tar"; - sha256 = "0b6b3q5z983744s5k9k771d0hnnbnrx249cqw4nkgplb2zay9zii"; + sha256 = "0fidhqf1m599v939hv3xsqbkckgk2fm550i7lkh0p961a3v542i8"; }; packageRequires = [ emacs ]; meta = { @@ -1463,10 +1460,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.6.0.20240323.82337"; + version = "0.6.1.0.20240329.73808"; src = fetchurl { - url = "https://elpa.gnu.org/devel/devdocs-0.6.0.20240323.82337.tar"; - sha256 = "1pdjf4j6wcpz98i50fx11sndqycpalwxips45lgsnjglyc8sa1lr"; + url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20240329.73808.tar"; + sha256 = "1q4n5r5ki8f7qksr18w273l7qw8c38snn6d842kxwp9zg2417i8x"; }; packageRequires = [ emacs ]; meta = { @@ -1484,7 +1481,7 @@ version = "0.3.0.20240117.132538"; src = fetchurl { url = "https://elpa.gnu.org/devel/devicetree-ts-mode-0.3.0.20240117.132538.tar"; - sha256 = "0zn2fb2lbfizfas5silkahbmrcf508x10746amw79a7mfwap2x90"; + sha256 = "12jfiv7j0k5sqjbz28nd5x34hpxp76lyl41fl7bvsgiyb06i0gnf"; }; packageRequires = [ emacs ]; meta = { @@ -1505,7 +1502,7 @@ version = "0.17.0.20231015.24654"; src = fetchurl { url = "https://elpa.gnu.org/devel/dict-tree-0.17.0.20231015.24654.tar"; - sha256 = "0snnya38i4pl583578rqykr7rj63qlfj6hygxivfpjaw187nqw27"; + sha256 = "0nij9pkscr6mdjmrq9dlqnks91sd21pn01bsgn4zk918zygnkggj"; }; packageRequires = [ emacs heap tNFA trie ]; meta = { @@ -1513,14 +1510,18 @@ license = lib.licenses.free; }; }) {}; - diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + diff-hl = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.9.2.0.20240225.11635"; + version = "1.9.2.0.20240401.235744"; src = fetchurl { - url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240225.11635.tar"; - sha256 = "0g32092z52xmmch8aya1wz9xds93agv4509nvf4zzygg9pr40x0w"; + url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240401.235744.tar"; + sha256 = "1ilmi9a5g2h3xw49kiavr6pwp091i6j3qd7yxyixvw15ygvc6mi8"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1535,7 +1536,7 @@ version = "1.0.0.20230224.111651"; src = fetchurl { url = "https://elpa.gnu.org/devel/diffview-1.0.0.20230224.111651.tar"; - sha256 = "030lkz0y188frlr8525ka4q26pbrj1rd1i5mn3152wnac3xmzj3q"; + sha256 = "1shw58jk2dzr8sc9hhfjqjrmwqarvq989ic96zjmhajxvcqcz3ql"; }; packageRequires = []; meta = { @@ -1550,7 +1551,7 @@ version = "0.46.0.20220909.84745"; src = fetchurl { url = "https://elpa.gnu.org/devel/diminish-0.46.0.20220909.84745.tar"; - sha256 = "05yv0gvqcha0404spd200rgfw08zww9r5h2rbmykhq7c7chml542"; + sha256 = "1d31bk42p1qjhpbr6lin87y18nya1qk9dm37vhhiq5sxajfr5ab9"; }; packageRequires = [ emacs ]; meta = { @@ -1569,7 +1570,7 @@ version = "0.5.2.0.20221221.75108"; src = fetchurl { url = "https://elpa.gnu.org/devel/dired-du-0.5.2.0.20221221.75108.tar"; - sha256 = "0hbb6f2ycnn8s5b5wk3zqfwmz56ijgiyggr2rjj3pqvg3hhrdkcx"; + sha256 = "0h31k45sx47vmk20sn77fzz86gbwiqxrryr091p5s05smrlsfxc2"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1584,10 +1585,10 @@ elpaBuild { pname = "dired-duplicates"; ename = "dired-duplicates"; - version = "0.3.0.20231114.215046"; + version = "0.4.0.20240328.201645"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-duplicates-0.3.0.20231114.215046.tar"; - sha256 = "0rla938sj1zig7qcdxybl7qm4x1b0ndpf9xf9ikj0vfdghyg7z2s"; + url = "https://elpa.gnu.org/devel/dired-duplicates-0.4.0.20240328.201645.tar"; + sha256 = "0122wxl2sql31s4h7rf7mxz6kv15m77q9bqmixxsgzhfghbia7k7"; }; packageRequires = [ emacs ]; meta = { @@ -1605,7 +1606,7 @@ version = "0.3.1.0.20191229.192948"; src = fetchurl { url = "https://elpa.gnu.org/devel/dired-git-info-0.3.1.0.20191229.192948.tar"; - sha256 = "1gkvn9g3nn113qa0fdq3h88fbmjy9498y9zcd5jfyz4kx0iid016"; + sha256 = "0zq74nynra4cbyb81l3v9w0qrzz057z9abg6c6zjshlrq8kxv5kx"; }; packageRequires = [ emacs ]; meta = { @@ -1620,10 +1621,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.1.1.0.20240312.193205"; + version = "0.1.1.0.20240425.180328"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.1.1.0.20240312.193205.tar"; - sha256 = "02yi5rxcv8v10zsypsn19i16rakik2ii650drk337h0iqkdwx8ax"; + url = "https://elpa.gnu.org/devel/dired-preview-0.1.1.0.20240425.180328.tar"; + sha256 = "1wn8k1wr126nw22sczjrhkxwsjnbhr08ym01sy8d4422wif0l4as"; }; packageRequires = [ emacs ]; meta = { @@ -1641,7 +1642,7 @@ version = "1.3.3.0.20230920.164444"; src = fetchurl { url = "https://elpa.gnu.org/devel/disk-usage-1.3.3.0.20230920.164444.tar"; - sha256 = "0x0rlvls7csj81cgmmdminq806f4l9rlcz3g45z6rnr1x6d236sh"; + sha256 = "06vd56yaaz9a6b46g4r6ccasc74pyqls9krj3bcrdayhj34w3mxy"; }; packageRequires = [ emacs ]; meta = { @@ -1656,7 +1657,7 @@ version = "1.5.2.0.20221221.75154"; src = fetchurl { url = "https://elpa.gnu.org/devel/dismal-1.5.2.0.20221221.75154.tar"; - sha256 = "011lvc7sxy8waqyirgsbf7p0y1n16zc5srlx0yk22x7q7i28svrp"; + sha256 = "0nyy9dkafkzxvx60d1bzrn2a1m3n53al3x17r3kf7d2b24gcljbd"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1671,7 +1672,7 @@ version = "1.1.2.0.20221221.75224"; src = fetchurl { url = "https://elpa.gnu.org/devel/djvu-1.1.2.0.20221221.75224.tar"; - sha256 = "08q6sryvpgl0nx17r3rr2sramgzxgwx9qlwripy1iqcydyz844d1"; + sha256 = "0iirmzaah0nix14jaj0hnszrdkdsh4wli8hb951l7iw7szkc5fsp"; }; packageRequires = []; meta = { @@ -1689,7 +1690,7 @@ version = "0.1.1.0.20231027.63811"; src = fetchurl { url = "https://elpa.gnu.org/devel/do-at-point-0.1.1.0.20231027.63811.tar"; - sha256 = "0k490g70lv89l87bn79m4bphnkv6vk578qgv1vk64z403wdgvxbv"; + sha256 = "1cf4inz5805vd9hcrqsmwxjzc8wy7qwwxg9731d03czjxxcvyp0d"; }; packageRequires = [ emacs ]; meta = { @@ -1704,7 +1705,7 @@ version = "1.2.0.20230409.212954"; src = fetchurl { url = "https://elpa.gnu.org/devel/doc-toc-1.2.0.20230409.212954.tar"; - sha256 = "1y5i6669416llpkpnqnhkckvbwy493gfbcjlq1hh1mwy508bq2va"; + sha256 = "1gcdkcb1ydgl24jmrnkg1a7kndl7kkvckwf12y5pj2l2idf9ifx8"; }; packageRequires = [ emacs ]; meta = { @@ -1719,7 +1720,7 @@ version = "0.1.0.20221221.75233"; src = fetchurl { url = "https://elpa.gnu.org/devel/docbook-0.1.0.20221221.75233.tar"; - sha256 = "0zp2hhgxi4ab6ijxfinjay34jjbwn36iy1laaxp65cb7dy6k2aas"; + sha256 = "0r7sjnbj4wgqa2vw57ac28gixw762km0cwas0qhclxizb95nsnz2"; }; packageRequires = []; meta = { @@ -1731,10 +1732,10 @@ elpaBuild { pname = "drepl"; ename = "drepl"; - version = "0.1.0.20231123.162851"; + version = "0.2.0.20240421.84519"; src = fetchurl { - url = "https://elpa.gnu.org/devel/drepl-0.1.0.20231123.162851.tar"; - sha256 = "10b5xk30vm5d7n3vzv0rafvbqwx4y5l9fhjrrgxh3j57z4v8lw0k"; + url = "https://elpa.gnu.org/devel/drepl-0.2.0.20240421.84519.tar"; + sha256 = "1kxxj0dd9yj168gaq89hm1sqajv8p8y7mgpqrxsqbz2hg6p568af"; }; packageRequires = [ comint-mime emacs ]; meta = { @@ -1749,7 +1750,7 @@ version = "1.0.0.20221221.75311"; src = fetchurl { url = "https://elpa.gnu.org/devel/dts-mode-1.0.0.20221221.75311.tar"; - sha256 = "0jmvg2gi43iaqq82s1ahzymday7i9gihhv9affjxcs97ydzwzaj2"; + sha256 = "1bpd6npx70rzh3mb5235g1ydh839bnjag70qp17r0wd2wkj6w0gj"; }; packageRequires = [ emacs ]; meta = { @@ -1766,7 +1767,7 @@ version = "0.2.1.0.20210917.85414"; src = fetchurl { url = "https://elpa.gnu.org/devel/easy-escape-0.2.1.0.20210917.85414.tar"; - sha256 = "08npj12pd9jjmwvzadxxs6ldkyqm40355by1q9xq0wdmnh60lcpg"; + sha256 = "0hk9244g7hgnan7xd4451qjklfqh5hbkxjl60l32nr19ynw0ygif"; }; packageRequires = []; meta = { @@ -1785,7 +1786,7 @@ version = "0.9.5.0.20220511.55730"; src = fetchurl { url = "https://elpa.gnu.org/devel/easy-kill-0.9.5.0.20220511.55730.tar"; - sha256 = "0lwj2x09a8rmanymk25cgx4wlqlnq9zxwzymc9bsv9pxg0svcira"; + sha256 = "0il8lhi2j80sz63lnjkayryikcya03zn3z40bnfjbsydpyqj4kzd"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1800,7 +1801,7 @@ version = "0.8.22.0.20240305.123820"; src = fetchurl { url = "https://elpa.gnu.org/devel/ebdb-0.8.22.0.20240305.123820.tar"; - sha256 = "1y680dfqvmbpq75ylgw16jx0p7hyggi12bb1f0c7z0w0y473gdj0"; + sha256 = "0j6wflmslapq3wr5bg6ql7qamh9k9zzp1xzadkxq3i3124syanfs"; }; packageRequires = [ emacs seq ]; meta = { @@ -1819,7 +1820,7 @@ version = "1.0.2.0.20221221.75324"; src = fetchurl { url = "https://elpa.gnu.org/devel/ebdb-gnorb-1.0.2.0.20221221.75324.tar"; - sha256 = "1g71ycs0z0ac2011wazfm2caqh5gly82dxj88kcwh4pbcx4p6ywn"; + sha256 = "0lzsarv0pkdgkj19il0syk7yz6gcfkp0rl3i49rsqb3lpf5b6s5q"; }; packageRequires = [ ebdb gnorb ]; meta = { @@ -1838,7 +1839,7 @@ version = "1.3.2.0.20221221.75334"; src = fetchurl { url = "https://elpa.gnu.org/devel/ebdb-i18n-chn-1.3.2.0.20221221.75334.tar"; - sha256 = "087fc78fczrmv73nigvxy25x8k69l57v67big5p8kaddp2z756l8"; + sha256 = "16hna0z08903pkq957cgxk26ihq6j3fab775ickb24zfssjm3l61"; }; packageRequires = [ ebdb pyim ]; meta = { @@ -1853,7 +1854,7 @@ version = "2.2.0.20221026.91800"; src = fetchurl { url = "https://elpa.gnu.org/devel/ediprolog-2.2.0.20221026.91800.tar"; - sha256 = "0hgqwscykw0030w9vlkrxvid2li93v5z6js829nfmssmqvzibic2"; + sha256 = "0y2xa0k7sv21yabxkfzxnl0fdnppgcwx5jdnm1zw2j2sbaf9k6ca"; }; packageRequires = []; meta = { @@ -1865,10 +1866,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20240309.0.20240309.40750"; + version = "20240309.0.20240325.4057"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eev-20240309.0.20240309.40750.tar"; - sha256 = "03vmfj9ialviza0j1xdrfxrm948qfqsvj95k6xsgx6kr4fh0gy8i"; + url = "https://elpa.gnu.org/devel/eev-20240309.0.20240325.4057.tar"; + sha256 = "0h6b69ykrdkzhqkv8b0qjanpfkcw4408kcxlv672h3i660w9jj0j"; }; packageRequires = [ emacs ]; meta = { @@ -1883,10 +1884,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.6.1.0.20240322.140619"; + version = "1.6.1.0.20240427.83621"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.6.1.0.20240322.140619.tar"; - sha256 = "0zmwx7l3dgjrqwg4nlsjkaiqx95pswpznzzrbzzlkc4aajk9l047"; + url = "https://elpa.gnu.org/devel/ef-themes-1.6.1.0.20240427.83621.tar"; + sha256 = "1pjq8yblcmk4mp83bqcnb154rq8dbn8qn6q394wzzwnn6kv08ay2"; }; packageRequires = [ emacs ]; meta = { @@ -1908,10 +1909,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.17.0.20240323.73745"; + version = "1.17.0.20240423.182809"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240323.73745.tar"; - sha256 = "0g2a6hj6k1z74ymsl568117bql1xalf0pqlckscj8dj1glcn6jq5"; + url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240423.182809.tar"; + sha256 = "129ibvdqcv7jablim041x55vm4awyvcjk295nrrffryzbb75fgi9"; }; packageRequires = [ eldoc @@ -1940,7 +1941,7 @@ version = "1.12.6.1.0.20221221.75346"; src = fetchurl { url = "https://elpa.gnu.org/devel/el-search-1.12.6.1.0.20221221.75346.tar"; - sha256 = "08r2hw47ijwb7y1amhn49r9l9kh2kv0y631rg4f8xjqfd38msh45"; + sha256 = "12500xc7aln09kzf3kn6xq7xnphbqzmyz20h0sgpf8f1rvlh2h33"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -1955,7 +1956,7 @@ version = "1.15.0.0.20240223.120227"; src = fetchurl { url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20240223.120227.tar"; - sha256 = "0v9y8qbcxs9dkb9sfgqsnqiz4b1w75hwq3hc24j9jkjkpny7fd4m"; + sha256 = "1jlvlzd2bvz0xgc8gdlzw655v5qiaihc4wz5k3yqqck6dbmhd8fy"; }; packageRequires = [ emacs ]; meta = { @@ -1972,7 +1973,7 @@ version = "5.0.0.20201201.154407"; src = fetchurl { url = "https://elpa.gnu.org/devel/electric-spacing-5.0.0.20201201.154407.tar"; - sha256 = "1iaw30bxjzxkvnqvcw10vxyjfbxabr0cb04kmwy0ibzh8dim25i0"; + sha256 = "0ywa68zwci0v6g9nc8czlhvf9872vl262nrxffahc5r7lp1hay8k"; }; packageRequires = []; meta = { @@ -1986,10 +1987,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.14.0.20230928.180802"; + version = "1.14.0.20240404.94558"; src = fetchurl { - url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.14.0.20230928.180802.tar"; - sha256 = "0izajmxmbanlwkflp4fr2b8inka8i9p68bh93fvnp062cpk44pfj"; + url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.14.0.20240404.94558.tar"; + sha256 = "1lfpwwm9114x7431pc12kppb0mgia1zd4b5pnfpvqyk3159xx40v"; }; packageRequires = []; meta = { @@ -1997,19 +1998,14 @@ license = lib.licenses.free; }; }) {}; - ellama = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , llm - , spinner }: + ellama = callPackage ({ elpaBuild, emacs, fetchurl, lib, llm, spinner }: elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.8.13.0.20240316.161027"; + version = "0.9.1.0.20240415.73018"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ellama-0.8.13.0.20240316.161027.tar"; - sha256 = "00pf48z90sirwyrk40p8fy9vi2cckrxismcp1yr8sirifs0wi574"; + url = "https://elpa.gnu.org/devel/ellama-0.9.1.0.20240415.73018.tar"; + sha256 = "1fcw0ll24bj32mjjb952in5shnyxz63gdkg80njy89s2bknw1ra1"; }; packageRequires = [ emacs llm spinner ]; meta = { @@ -2027,7 +2023,7 @@ version = "1.4.2.0.20231206.152254"; src = fetchurl { url = "https://elpa.gnu.org/devel/emacs-gc-stats-1.4.2.0.20231206.152254.tar"; - sha256 = "047bvpm3sbikr31z3kv3z5fb02vpmrd98qv2zypxdx9rk5yid3pb"; + sha256 = "08ivfm6m9y4i1w0xmjkbs6b2h7i5q1v2991rjs2w5s9d864yqg2l"; }; packageRequires = [ emacs ]; meta = { @@ -2039,10 +2035,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "1.0.0.20240323.170519"; + version = "1.1.0.20240418.225241"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-1.0.0.20240323.170519.tar"; - sha256 = "0mj762p6pbqciw1jjbn03qmcw7z4nc823ssd42jbx3a5mzvyi3qr"; + url = "https://elpa.gnu.org/devel/embark-1.1.0.20240418.225241.tar"; + sha256 = "120wh0r76wnsk5kczdnr5b7029x78fyd8p0h9rl2sbss4ac8wa48"; }; packageRequires = [ compat emacs ]; meta = { @@ -2060,10 +2056,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "1.0.0.20240323.170519"; + version = "1.1.0.20240418.225241"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-1.0.0.20240323.170519.tar"; - sha256 = "0ys3v2519vw02c04vyl5jggk9n6nf2hzhb3xr8y635lg2f8chbh9"; + url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20240418.225241.tar"; + sha256 = "09qqwd5p7gasazg0plz1ijq5lgxh26358sia4727rs75pxwlz0zv"; }; packageRequires = [ compat consult emacs embark ]; meta = { @@ -2085,10 +2081,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.15pre0.20240319.190705"; + version = "0.15.0.20240416.101741"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.15pre0.20240319.190705.tar"; - sha256 = "1g5bjg9z4k33pfvskv1nkxpzrp197rfwq4mpki74kmr9z7cmspaa"; + url = "https://elpa.gnu.org/devel/ement-0.15.0.20240416.101741.tar"; + sha256 = "1fjns4li3cvi3p2jkwxagzs6aj8x9s4zjc1lwpj013d54mflkndp"; }; packageRequires = [ emacs @@ -2114,10 +2110,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "19.0.20240318.161230"; + version = "19.0.20240414.193332"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-19.0.20240318.161230.tar"; - sha256 = "0yk3v3vglv8hl4x9piyis7q783gmbb49sw15zdgjys56plcg2k17"; + url = "https://elpa.gnu.org/devel/emms-19.0.20240414.193332.tar"; + sha256 = "03jxpxgrlr1amxix4skfyag5pl6xvls011rcjjx1ka5sjdvnygvp"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2132,10 +2128,10 @@ elpaBuild { pname = "engrave-faces"; ename = "engrave-faces"; - version = "0.3.1.0.20230115.70118"; + version = "0.3.1.0.20240421.82802"; src = fetchurl { - url = "https://elpa.gnu.org/devel/engrave-faces-0.3.1.0.20230115.70118.tar"; - sha256 = "19cg0ksh1v3yhvknpf18q21y0wbhf55ll8p67vvlqaaikwlmbpxz"; + url = "https://elpa.gnu.org/devel/engrave-faces-0.3.1.0.20240421.82802.tar"; + sha256 = "0dxj9m9jyvrqhv67m2kkh0akjc7l6h40fvsy20k721zq9xvc6zkl"; }; packageRequires = [ emacs ]; meta = { @@ -2150,7 +2146,7 @@ version = "2.0.0.20171007.121321"; src = fetchurl { url = "https://elpa.gnu.org/devel/enwc-2.0.0.20171007.121321.tar"; - sha256 = "13lj4br2r845zwg491y9f2m5zxi2gj4qkihwcsrnc1ybf3zdlpfy"; + sha256 = "0c308kd1pinhb1lh2vi40bcnmvzydf1j7sqka9kajhxr0l4kjazb"; }; packageRequires = [ emacs ]; meta = { @@ -2167,7 +2163,7 @@ version = "0.0.1.0.20221221.75416"; src = fetchurl { url = "https://elpa.gnu.org/devel/epoch-view-0.0.1.0.20221221.75416.tar"; - sha256 = "0lhs1i02rl8mb7m56bsmv942pq7dgdp5qjp1zs7flv0zgyi8ip5c"; + sha256 = "0hd51d441c2w05rx10wpa0rbc94pjwwaqy5mxlgfwnx52jabz15h"; }; packageRequires = []; meta = { @@ -2183,10 +2179,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6snapshot0.20240323.151032"; + version = "5.6snapshot0.20240419.135452"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240323.151032.tar"; - sha256 = "1vydh0v3rw44r6y1lfbr4nlxhmbx224idj5s5g4kas6r2pgi0b74"; + url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240419.135452.tar"; + sha256 = "1yx1k6r6fg77r6h7bvi1v205mnxmw8qjqr96k4dh73a7ik972vmh"; }; packageRequires = [ compat emacs ]; meta = { @@ -2206,7 +2202,7 @@ version = "5.16.10.12.0.20240129.80712"; src = fetchurl { url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20240129.80712.tar"; - sha256 = "14ydcz8mhq9cy1ivxdyjslh83lxigqcqw8nb1f22g9ksxxxsz9fr"; + sha256 = "0jsl7yyhbcg1y20lp50r3i3rcxmxq035mks1kwbsnyqmdikby9s3"; }; packageRequires = [ cl-lib emacs nadvice ]; meta = { @@ -2218,10 +2214,10 @@ elpaBuild { pname = "ess"; ename = "ess"; - version = "24.1.1.0.20240311.150545"; + version = "24.1.1.0.20240426.115232"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240311.150545.tar"; - sha256 = "0dyyyl7akn50j15asr6msrx704vr4wjfz3a1h7nsxjjaczz0n8kz"; + url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240426.115232.tar"; + sha256 = "1rskraim68fibf568f07r62h14ni45wvzifn21qyfcvv8slb63jd"; }; packageRequires = [ emacs ]; meta = { @@ -2245,7 +2241,7 @@ version = "1.1.2.0.20240219.90343"; src = fetchurl { url = "https://elpa.gnu.org/devel/excorporate-1.1.2.0.20240219.90343.tar"; - sha256 = "1cfpg7i4jvzfi4iak5g9cj7bsvb0zkqh64jkbfrchhk4wxpj0s01"; + sha256 = "0wm1qx1y9az3fdh81hjccpsw4xxx0p9acz9pfvsyjlywclcycd4i"; }; packageRequires = [ cl-lib @@ -2271,7 +2267,7 @@ version = "1.0.0.0.20240119.103925"; src = fetchurl { url = "https://elpa.gnu.org/devel/expand-region-1.0.0.0.20240119.103925.tar"; - sha256 = "147zh74zjzq8qwmrsdjikkiaky7lagjf4jim2mj1rf35lw5z1m5z"; + sha256 = "16npbi0nryvnrz61ycpdp4s4nb067brkv83ih7fymc0dlmvp1x50"; }; packageRequires = [ emacs ]; meta = { @@ -2286,7 +2282,7 @@ version = "1.3.1.0.20230915.150818"; src = fetchurl { url = "https://elpa.gnu.org/devel/expreg-1.3.1.0.20230915.150818.tar"; - sha256 = "1wxayvfqc41c2qfqjmf8drzb0q7r5kyfygdl5l4c3idcm8agsim4"; + sha256 = "11r4vwavax904dxmcpbr2nbycr7096aalblh6pfvjbhb23a0vx7m"; }; packageRequires = [ emacs ]; meta = { @@ -2303,7 +2299,7 @@ version = "0.1.0.20240102.22814"; src = fetchurl { url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20240102.22814.tar"; - sha256 = "0azy67n2lb9lcmrcz1k0z8gpx32w8g5xcz9ly73yh5kdfb83227p"; + sha256 = "0y2lh89zmyrfkdzwxhc7npbbyp97xi1mnr7qdlsnlnw8gllknf27"; }; packageRequires = []; meta = { @@ -2315,10 +2311,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.28.0.20240316.164011"; + version = "0.28.0.20240403.140839"; src = fetchurl { - url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240316.164011.tar"; - sha256 = "0kqg4rfwrrd9z714a6k4ldmpq4iqihkx1c2q4fnf82p9616pd88w"; + url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240403.140839.tar"; + sha256 = "1hyf2m1inifvxzv6y2wmrfylp9vrb130nj1pvpy169miw2n50vzm"; }; packageRequires = [ emacs xelb ]; meta = { @@ -2336,7 +2332,7 @@ version = "1.1.0.20221221.75553"; src = fetchurl { url = "https://elpa.gnu.org/devel/f90-interface-browser-1.1.0.20221221.75553.tar"; - sha256 = "1xbrm524dadmww961m4n2dqi1gplbflfldxwc6cs0cas2cf4ydal"; + sha256 = "0qv3v3ya8qdgwq0plcc3qbba4n66fqww3sawmqhzssksry39l1yj"; }; packageRequires = [ cl-lib ]; meta = { @@ -2354,7 +2350,7 @@ version = "0.2.1.0.20230426.73945"; src = fetchurl { url = "https://elpa.gnu.org/devel/face-shift-0.2.1.0.20230426.73945.tar"; - sha256 = "0h33w6n1sj0g4ji8ckdd9pgxq3gj4kn0mqlazrs82sf32hsjfi5w"; + sha256 = "0gl9k7g3wsc045dx9mp9ypk084r4j3mhf2a4xn08lzz8z8i9k2rz"; }; packageRequires = [ emacs ]; meta = { @@ -2373,7 +2369,7 @@ version = "0.2.0.0.20240310.203607"; src = fetchurl { url = "https://elpa.gnu.org/devel/filechooser-0.2.0.0.20240310.203607.tar"; - sha256 = "0ra072qdg38y92f73cimwlgcclvfpz4wvrr8wr7i808jv1rdagv7"; + sha256 = "1hcjnhb3bhk6im5k1mqrlb599jrdg9hxadjhvw31f5l5rjg2636l"; }; packageRequires = [ compat emacs ]; meta = { @@ -2391,7 +2387,7 @@ version = "2.12.2.0.20221221.75607"; src = fetchurl { url = "https://elpa.gnu.org/devel/filladapt-2.12.2.0.20221221.75607.tar"; - sha256 = "0izqqh2dlp9p6kbkmn5qp9lbqdf8ps3f38lclc9fm2652mssvddv"; + sha256 = "11s9n8d4psjs4dbsx2w8hyir5hapz952da5nz3xihli8a0q93mhv"; }; packageRequires = [ emacs ]; meta = { @@ -2409,7 +2405,7 @@ version = "0.9.5.0.20230605.161924"; src = fetchurl { url = "https://elpa.gnu.org/devel/firefox-javascript-repl-0.9.5.0.20230605.161924.tar"; - sha256 = "1fwi01mqyz0mvy27rxz4k97mww02gv6njhb4p7wxj1wrx1xsmm1z"; + sha256 = "1nfkzx07j3hddai213lia9pixfrrdajrvg7fvlx5js8zxfpvcjx6"; }; packageRequires = [ emacs ]; meta = { @@ -2424,7 +2420,7 @@ version = "0.2.0.20221221.75619"; src = fetchurl { url = "https://elpa.gnu.org/devel/flylisp-0.2.0.20221221.75619.tar"; - sha256 = "0b48wd2isf5nqfgscpd311hwisp9gs77lsinpdrs40swvwnflyfb"; + sha256 = "110hfk979c664y27qf5af54phm8i4iq5qqk5vygjwd7252nd7i4a"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2432,19 +2428,14 @@ license = lib.licenses.free; }; }) {}; - flymake = callPackage ({ eldoc - , elpaBuild - , emacs - , fetchurl - , lib - , project }: + flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib, project }: elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.3.7.0.20240223.154540"; + version = "1.3.7.0.20240422.65418"; src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240223.154540.tar"; - sha256 = "1z9j0mrka8qznz3d81h1pzns2bn1sswqj2rd8m2drwjzzgaq4j0w"; + url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240422.65418.tar"; + sha256 = "0gq3x3ssvsccwjajd3w835dd1zvlakj7gxdn6b1fqj46rkyi60vw"; }; packageRequires = [ eldoc emacs project ]; meta = { @@ -2463,7 +2454,7 @@ version = "0.1.0.20231030.222337"; src = fetchurl { url = "https://elpa.gnu.org/devel/flymake-codespell-0.1.0.20231030.222337.tar"; - sha256 = "1i4gk9z9yfs9gb9x64n8wzxqy8lb81j422173xxg1lwsirc9a040"; + sha256 = "1v3a2gg4myav4cs1vj4d5isxhbw9qvryk5r2dx3x19qqmmmm6djz"; }; packageRequires = [ compat emacs ]; meta = { @@ -2481,7 +2472,7 @@ version = "0.3.0.0.20230325.160756"; src = fetchurl { url = "https://elpa.gnu.org/devel/flymake-proselint-0.3.0.0.20230325.160756.tar"; - sha256 = "09r9karqm7f8s8wmbfai8nrawpxcn5f7lwpfp5vz1j7w068zn3mi"; + sha256 = "1p3jpsv6w4hask7bk07dmafwgymbw3xl6i0vx0sjd0i5aa0xs9vz"; }; packageRequires = [ emacs ]; meta = { @@ -2496,10 +2487,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "1.0.0.0.20240222.132833"; + version = "2.0.0.0.20240426.105847"; src = fetchurl { - url = "https://elpa.gnu.org/devel/fontaine-1.0.0.0.20240222.132833.tar"; - sha256 = "19smmj7fk5584fwh0yhf0h2h01xv5148rvwc4bcypdsm744rcvfj"; + url = "https://elpa.gnu.org/devel/fontaine-2.0.0.0.20240426.105847.tar"; + sha256 = "0h7l5agnzpq8k14c3lr6dkpsh2id9akiqa9z3x88xn440rjbld51"; }; packageRequires = [ emacs ]; meta = { @@ -2516,7 +2507,7 @@ version = "1.1.0.20221221.75627"; src = fetchurl { url = "https://elpa.gnu.org/devel/frame-tabs-1.1.0.20221221.75627.tar"; - sha256 = "0c9sbfqnl2vmrw9ziaybd7dmzw23a9p5b8nl1g5w4kkwwh7kwl35"; + sha256 = "08ql56h8h425ngs40m9zpy4ysxlxi74vanlkga42bskzax0ns2cm"; }; packageRequires = []; meta = { @@ -2536,7 +2527,7 @@ version = "0.2.11.0.20201115.95734"; src = fetchurl { url = "https://elpa.gnu.org/devel/frog-menu-0.2.11.0.20201115.95734.tar"; - sha256 = "1rvvkzd639x8rddkbcxwqi6f29y4zybiryvp1is9f68jj6dn3y98"; + sha256 = "00ihlqq4bxgrp6hdf1b6xhnvp87ilys1ykp0l38cs5lv6a10wvqs"; }; packageRequires = [ avy emacs posframe ]; meta = { @@ -2551,7 +2542,7 @@ version = "0.2.1.0.20221212.223608"; src = fetchurl { url = "https://elpa.gnu.org/devel/fsm-0.2.1.0.20221212.223608.tar"; - sha256 = "1q7i32b3kx1cp1yag2mijab36b289hpv1vx7fby8n35agbnqabh8"; + sha256 = "1zwl1b9sn4imxynada0vf8nxwm49lh8fahxfc35czlbn0w0jqm1k"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2566,7 +2557,7 @@ version = "1.1.0.20230102.145125"; src = fetchurl { url = "https://elpa.gnu.org/devel/ftable-1.1.0.20230102.145125.tar"; - sha256 = "0bhzxrhl87fyv9ynlxp0c3nschpbamkkxzh5gzakdigbm79602ir"; + sha256 = "0231qjah5s76g8dmnc5zpn6i6lysypf6jvvzmnyyv92lr8arzmfz"; }; packageRequires = [ emacs ]; meta = { @@ -2581,7 +2572,7 @@ version = "0.2.1.0.20201116.225142"; src = fetchurl { url = "https://elpa.gnu.org/devel/gcmh-0.2.1.0.20201116.225142.tar"; - sha256 = "1xfpms62svxmvhpdprhb68bsa27m8m8z8wmq3sn42rjf8fi9hrqf"; + sha256 = "0yb47avdy5f3a2g9cg2028h5agsqpddsbfsc6ncavnxnnyiccj8h"; }; packageRequires = [ emacs ]; meta = { @@ -2596,7 +2587,7 @@ version = "0.9.0.0.20230602.13355"; src = fetchurl { url = "https://elpa.gnu.org/devel/ggtags-0.9.0.0.20230602.13355.tar"; - sha256 = "1d8d4shaf3rkan48vpqjc32qms6n90f912wdxsy7nz9fqadv31cz"; + sha256 = "1krykf1hknczhdhh8rfj4vzcba87q5sjbv0p2y41mcvmmfnhharw"; }; packageRequires = [ emacs ]; meta = { @@ -2611,7 +2602,7 @@ version = "0.6.0.0.20221221.75709"; src = fetchurl { url = "https://elpa.gnu.org/devel/gited-0.6.0.0.20221221.75709.tar"; - sha256 = "1pl8chdmnpfby8ap3lirjc837nns5bdgsqms4v86g3acgyz1zd8d"; + sha256 = "095679pq1lam42zran5qjk3zd4gf908vd5fkq9jppqlilcsqf7zb"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2626,7 +2617,7 @@ version = "1.1.0.20221221.75729"; src = fetchurl { url = "https://elpa.gnu.org/devel/gle-mode-1.1.0.20221221.75729.tar"; - sha256 = "1icjvfrh7j1jp31fhgazai9xdm1s2wk0b3zs3n44km9v2gfy4gcc"; + sha256 = "1bakvlx4bzz62hibwwm0hmhyzqqzy31xvsg6pw3lh2i028qd1ykx"; }; packageRequires = [ cl-lib ]; meta = { @@ -2645,7 +2636,7 @@ version = "1.0.3.0.20230915.165808"; src = fetchurl { url = "https://elpa.gnu.org/devel/gnat-compiler-1.0.3.0.20230915.165808.tar"; - sha256 = "1za3ihjbramms85r35kz1d3gyyr3kyimd5m7xsmqnrpj3wsrjika"; + sha256 = "0rm0s33nl9dzghlfsprycr2na412z4vnfc69q2pc6nlazsliz6w0"; }; packageRequires = [ emacs wisi ]; meta = { @@ -2662,7 +2653,7 @@ version = "0.1.0.20230924.235858"; src = fetchurl { url = "https://elpa.gnu.org/devel/gnome-c-style-0.1.0.20230924.235858.tar"; - sha256 = "0zp4dyqm04vk0168s7s972bzxajl0h4d3ywxqw7a6lj3ykjg1ir5"; + sha256 = "0gij2d1k40yhifr7ad3p465f5lg77cb441pl41mdc0g6v5gipnqf"; }; packageRequires = []; meta = { @@ -2677,7 +2668,7 @@ version = "1.6.11.0.20230108.110132"; src = fetchurl { url = "https://elpa.gnu.org/devel/gnorb-1.6.11.0.20230108.110132.tar"; - sha256 = "0w14v19idq2njgb80ry0qa7dv9hhj5lg488acxx0pz5cxk606rgh"; + sha256 = "0jha80xr8pbribp0ki40cydvi35as7v2c2xsy0anh65j9ciym5ag"; }; packageRequires = [ cl-lib ]; meta = { @@ -2692,7 +2683,7 @@ version = "1.1.0.20221212.224322"; src = fetchurl { url = "https://elpa.gnu.org/devel/gnu-elpa-1.1.0.20221212.224322.tar"; - sha256 = "1aglbzgvprqws45xybs7cfajgkgbcl8pk61nqdja7qhgr7a68ymx"; + sha256 = "0hk9ha7f0721wnsnjazpr970lfa4q03dhpxxffw9qcn1mlvh8qb8"; }; packageRequires = [ emacs ]; meta = { @@ -2709,7 +2700,7 @@ version = "2022.12.0.20221228.123117"; src = fetchurl { url = "https://elpa.gnu.org/devel/gnu-elpa-keyring-update-2022.12.0.20221228.123117.tar"; - sha256 = "1aa9lwjd4cll6qm5909dg2dgx34sai3w3jg76xjlax3afg4vak2v"; + sha256 = "18dqjkg9gva5a9967k4gkyjvzhjvh55z2jds7xwgbwczppg8mdz2"; }; packageRequires = []; meta = { @@ -2729,7 +2720,7 @@ version = "3.1.2.0.20230911.4426"; src = fetchurl { url = "https://elpa.gnu.org/devel/gnugo-3.1.2.0.20230911.4426.tar"; - sha256 = "1fl4zvi5h84qccpym6kaasmv37zbjfj4lc8nq2bqq4ris689y7vj"; + sha256 = "0pxw1z6inw0ikagcfvi14i83sg6affii277mbyzh5liv655hn9rj"; }; packageRequires = [ ascii-art-to-unicode cl-lib xpm ]; meta = { @@ -2746,7 +2737,7 @@ version = "0.5.0.20210503.105756"; src = fetchurl { url = "https://elpa.gnu.org/devel/gnus-mock-0.5.0.20210503.105756.tar"; - sha256 = "1p4znd3hzzlxwzxja764vfdy4vb6lf39m6hhvm8knqikq823y26d"; + sha256 = "1gpjbx9iabrx2b4qinw0chv44g2v1z2ivaiywjzr3vy3h3pp6fga"; }; packageRequires = []; meta = { @@ -2761,7 +2752,7 @@ version = "0.5.0.0.20231030.71342"; src = fetchurl { url = "https://elpa.gnu.org/devel/gpastel-0.5.0.0.20231030.71342.tar"; - sha256 = "1vd49mn7xgys0apc7z6s6cs3yygznlyyf4l1hhfrgg5vwfb3c7ry"; + sha256 = "1d5pj1rk0xv2fww827yplpcll5hy8w9fkcm9c8wf4yi3l6igkmgz"; }; packageRequires = [ emacs ]; meta = { @@ -2781,7 +2772,7 @@ version = "1.0.5.0.20231115.90848"; src = fetchurl { url = "https://elpa.gnu.org/devel/gpr-mode-1.0.5.0.20231115.90848.tar"; - sha256 = "1z7v8kwamh217k0lfwcdycj4wnq4dj9lrryppqhjdqb7cj02bmdz"; + sha256 = "1m768s196027zl402vmfvdzvdl3whbjg5lyfiwjx25d9gfx32351"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -2801,7 +2792,7 @@ version = "1.0.4.0.20231018.92052"; src = fetchurl { url = "https://elpa.gnu.org/devel/gpr-query-1.0.4.0.20231018.92052.tar"; - sha256 = "1pk14d88vy0ylgcdymp9pclygpn06n25yhy0hsjs0lrd8zr56a49"; + sha256 = "0j0p685v1v0byma8x5lpihvfj6hyg30dx8jqa6q0xmm2c6i8cqai"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -2816,7 +2807,7 @@ version = "0.1.2.0.20221202.2453"; src = fetchurl { url = "https://elpa.gnu.org/devel/graphql-0.1.2.0.20221202.2453.tar"; - sha256 = "175ss2ln21j0s83fy5yydb05rgsawgc7f8qbahc6ahc1sclppk26"; + sha256 = "0wh1lnn85nj026iln02b7p5hgrwd3dmqjkv48gc33ypyd4afh31z"; }; packageRequires = [ emacs ]; meta = { @@ -2831,10 +2822,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.9.19.0.20240315.175225"; + version = "0.9.20.0.20240427.100340"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.9.19.0.20240315.175225.tar"; - sha256 = "1z58dr4zpb2pk10ppjrqr7bxzbji6bgajhv71s6i6802k8il7r32"; + url = "https://elpa.gnu.org/devel/greader-0.9.20.0.20240427.100340.tar"; + sha256 = "0g07dvn21g35vx0g7c5dhhwv1pci3jxlpacd9f0iyj42f52yxxhy"; }; packageRequires = [ emacs ]; meta = { @@ -2849,7 +2840,7 @@ version = "1.1.0.20221221.80217"; src = fetchurl { url = "https://elpa.gnu.org/devel/greenbar-1.1.0.20221221.80217.tar"; - sha256 = "1cm2fj2arhgxc5dl6yw03xjyipgk2skaamyy8gybbb4zdglhpd0m"; + sha256 = "00kch8c0sz5z3cx0likx0pyqp9jxvjd6lkmdcli4zzpc6j1f1a0k"; }; packageRequires = []; meta = { @@ -2857,14 +2848,17 @@ license = lib.licenses.free; }; }) {}; - gtags-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + gtags-mode = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "gtags-mode"; ename = "gtags-mode"; - version = "1.1.0.20240313.5421"; + version = "1.5.0.20240425.21931"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gtags-mode-1.1.0.20240313.5421.tar"; - sha256 = "134h3w1gcvncm12yq6ls8xp8587r06vl7qr359rnkvc78sh07c9q"; + url = "https://elpa.gnu.org/devel/gtags-mode-1.5.0.20240425.21931.tar"; + sha256 = "13gdalm2n75yifpfy2wsbf47l6q4rklvd4akszn423nmcl9bnb8x"; }; packageRequires = [ emacs ]; meta = { @@ -2884,7 +2878,7 @@ version = "0.0.1.0.20190417.81229"; src = fetchurl { url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20190417.81229.tar"; - sha256 = "0xzaq5wm20jkbimg60na2if7zpxlbddqbr9hadg3qqswkg4zp1v7"; + sha256 = "167cz86pfxxszr57v312m9gb0l9318mvgg2lld6m5ppgzfmxlmnm"; }; packageRequires = [ cl-lib emacs nadvice ]; meta = { @@ -2899,7 +2893,7 @@ version = "1.0.0.0.20221012.11633"; src = fetchurl { url = "https://elpa.gnu.org/devel/hcel-1.0.0.0.20221012.11633.tar"; - sha256 = "0hmrb914pilsqvqlw28iy93mkw0h3isyxd0dmw5k3sf9x8zlifh9"; + sha256 = "03k08w10bvl6fz7nkmv2d7kksphxigw6cwfhfq0kkgxn4l8h37an"; }; packageRequires = [ emacs ]; meta = { @@ -2914,7 +2908,7 @@ version = "0.5.0.20201214.121301"; src = fetchurl { url = "https://elpa.gnu.org/devel/heap-0.5.0.20201214.121301.tar"; - sha256 = "0i16nc0rc5q2hrqamdqfrf8rzw9msi1a9sad2jq68dlbyv113l6n"; + sha256 = "0917bfrdiwwmdqmnpy2cg1dn7v5gyl7damwp6ld7sky6v3d113ya"; }; packageRequires = []; meta = { @@ -2932,7 +2926,7 @@ version = "1.2.0.20231107.184113"; src = fetchurl { url = "https://elpa.gnu.org/devel/hiddenquote-1.2.0.20231107.184113.tar"; - sha256 = "0zgnxfcfd78c755rykmbnkvxx5lfpk7z3n8qky0lf3kj2hwas27v"; + sha256 = "0iy7mxqhph4kmp4a96r141f4dpk5vwiydx9i9gx5c13zzwvy2y7r"; }; packageRequires = [ emacs ]; meta = { @@ -2949,7 +2943,7 @@ version = "0.4.0.20201214.173014"; src = fetchurl { url = "https://elpa.gnu.org/devel/highlight-escape-sequences-0.4.0.20201214.173014.tar"; - sha256 = "1av3fzavy83xjbd52dnql6i95993gyxfhkd1san6c3hi0lcnh3vw"; + sha256 = "13x8750r3zn9sqbsxliiipk6kfnpg7clmd49niyrh80x9nj4pf72"; }; packageRequires = []; meta = { @@ -2967,7 +2961,7 @@ version = "1.1.1.0.20201201.93957"; src = fetchurl { url = "https://elpa.gnu.org/devel/hook-helpers-1.1.1.0.20201201.93957.tar"; - sha256 = "01iimwwy274kpc0vpy9barfq1rakfrj0d4v3akrzwscnfkxzm1ms"; + sha256 = "0x3358k5lglnb4yf27c2ybzlsw9jp4n4jh5sizczl9n8g1vxbgkb"; }; packageRequires = [ emacs ]; meta = { @@ -2984,7 +2978,7 @@ version = "0.1.0.20221221.80245"; src = fetchurl { url = "https://elpa.gnu.org/devel/html5-schema-0.1.0.20221221.80245.tar"; - sha256 = "1k3a653n3whprkhc1pc7q1dsc00g2w6923p74ap64ymdv6sx6pw2"; + sha256 = "15f1nhsgpp0mv8mdrvv0jnscq0j23ggriw2d2dw26sr6lv93w2r4"; }; packageRequires = []; meta = { @@ -2999,7 +2993,7 @@ version = "0.15.0.0.20221030.224757"; src = fetchurl { url = "https://elpa.gnu.org/devel/hydra-0.15.0.0.20221030.224757.tar"; - sha256 = "1ici53s3h7syvzrvz4l5q8790fgfl9wfhdrx2mc0wdhc9jwgxif0"; + sha256 = "1d8xdxv9j3vb0jkq6bx3f6kbjc990lbmdr78yqchai861hhllmdn"; }; packageRequires = [ emacs lv ]; meta = { @@ -3014,10 +3008,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "9.0.2pre0.20240322.162839"; + version = "9.0.2pre0.20240420.120926"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240322.162839.tar"; - sha256 = "14m1gnkbr9sg8i5bxwar71qs23i3wnqlfwf8cac76ihpminfzz1f"; + url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240420.120926.tar"; + sha256 = "1mr05p3lhz1xnivl8mqhzdw9qrh0klasjisl75gn14n7l233nir7"; }; packageRequires = [ emacs ]; meta = { @@ -3032,7 +3026,7 @@ version = "0.3.0.20240219.40214"; src = fetchurl { url = "https://elpa.gnu.org/devel/ilist-0.3.0.20240219.40214.tar"; - sha256 = "0y8qziqq70qwxffx7fy8b6grbsxh22dmbrgxpx9a8q4zq9257j90"; + sha256 = "0nxwvnpnyccx384f8ik0z8a74fksvwrmpdzk4wia1x6wdwwvblvs"; }; packageRequires = []; meta = { @@ -3050,7 +3044,7 @@ version = "0.36.0.20230925.194622"; src = fetchurl { url = "https://elpa.gnu.org/devel/inspector-0.36.0.20230925.194622.tar"; - sha256 = "1pn6p9hiar9fsjxxs7wmz2kcfaf31pyhar2wmb3bkm1md98zhirx"; + sha256 = "1g989zgbhila0f4yca70iwgnqr0zcainji9mps0ywrmlmn270gdv"; }; packageRequires = [ emacs ]; meta = { @@ -3065,7 +3059,7 @@ version = "2.6.0.20211231.163129"; src = fetchurl { url = "https://elpa.gnu.org/devel/ioccur-2.6.0.20211231.163129.tar"; - sha256 = "0vgb0p6gb2djrqviq2ifvkkd7zyp094z2jsly52i14j153cvi9pd"; + sha256 = "0v048d1p95km3jwgs6x805fjg6qfv5pjwdwia1wzl9liqai21v1c"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3083,7 +3077,7 @@ version = "0.8.0.20240310.84654"; src = fetchurl { url = "https://elpa.gnu.org/devel/isearch-mb-0.8.0.20240310.84654.tar"; - sha256 = "1n1lb1gcifd1m2pk4zgij3gd8500m4jhd6kgzrjy15cci34xlhsf"; + sha256 = "1rb97ir8nbv7ici8isjcm4bfaxakd6a05yxv9as2wv9xl8fzfhwq"; }; packageRequires = [ emacs ]; meta = { @@ -3101,7 +3095,7 @@ version = "0.1.1.0.20221221.80300"; src = fetchurl { url = "https://elpa.gnu.org/devel/iterators-0.1.1.0.20221221.80300.tar"; - sha256 = "14psdlyar90zhq091w39z2zkfi99x4dq2zrnhnbzwll0sr5q7j7z"; + sha256 = "10cx933rk7f92jk8q87b69ls3w823fwxnr7i6j0bxpzjx66q15yk"; }; packageRequires = [ emacs ]; meta = { @@ -3113,10 +3107,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.14.2.0.20240214.214034"; + version = "0.14.2.0.20240405.203954"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240214.214034.tar"; - sha256 = "0y7fakcrzwghgg1pvlgbsp1ziidh7vyy22nm0ph4bsq4il16fm9m"; + url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240405.203954.tar"; + sha256 = "02mkfciafhdc9b41s0kv07l9z77zyq7a2j1ljdiwbmcbkdis028p"; }; packageRequires = [ emacs ]; meta = { @@ -3136,7 +3130,7 @@ version = "0.14.2.0.20240214.214218"; src = fetchurl { url = "https://elpa.gnu.org/devel/ivy-avy-0.14.2.0.20240214.214218.tar"; - sha256 = "0qrrvkb6kl83lxikr3ags4mbxi015qy9l34dnjb5580zgcsjvqc8"; + sha256 = "1i3hrc5pb30qkzzpiza0mff97132b04sglg39mg0ad05hl3sq5dc"; }; packageRequires = [ avy emacs ivy ]; meta = { @@ -3155,7 +3149,7 @@ version = "0.3.2.0.20190909.192125"; src = fetchurl { url = "https://elpa.gnu.org/devel/ivy-explorer-0.3.2.0.20190909.192125.tar"; - sha256 = "1h4yp4xp5kqirlxhbg425v7fh9zphwkqflvf4qf0xf275w4i8g88"; + sha256 = "1jvahaswknvaia62cq8bz5lx55fb1c07zr63n7awcp0sajk3ph3z"; }; packageRequires = [ emacs ivy ]; meta = { @@ -3175,7 +3169,7 @@ version = "0.14.2.0.20240214.214337"; src = fetchurl { url = "https://elpa.gnu.org/devel/ivy-hydra-0.14.2.0.20240214.214337.tar"; - sha256 = "1k719hy80hs0019qza0vcpvgxpfsmkkz6j8hs3bfbpmzg0pj54ph"; + sha256 = "1paqprwizhavr1kfijfbr0my3ncmw94821d3c9qj1fnjkp3nfj4x"; }; packageRequires = [ emacs hydra ivy ]; meta = { @@ -3195,7 +3189,7 @@ version = "0.6.3.0.20211217.23411"; src = fetchurl { url = "https://elpa.gnu.org/devel/ivy-posframe-0.6.3.0.20211217.23411.tar"; - sha256 = "1d1yhydqcbdsya7rnkxd2c05p7vd6iixkx814cl9j1k14amvl46w"; + sha256 = "03v4k7hx2bdxhjghanpmy9r50q9ksmz2xcwypxxhyywlglfk0d69"; }; packageRequires = [ emacs ivy posframe ]; meta = { @@ -3213,7 +3207,7 @@ version = "0.0.4.0.20240204.184721"; src = fetchurl { url = "https://elpa.gnu.org/devel/jami-bot-0.0.4.0.20240204.184721.tar"; - sha256 = "0klkzj83cqc1pp2q46067wq3gpxkmgcsb24s9mcccrwsrvqbgm9s"; + sha256 = "04zdnrah3jypkyx8dl0ns7cjcws5yv4d56ixaa94vjjjvyw9d8mv"; }; packageRequires = [ emacs ]; meta = { @@ -3231,7 +3225,7 @@ version = "0.11.0.0.20231010.221311"; src = fetchurl { url = "https://elpa.gnu.org/devel/jarchive-0.11.0.0.20231010.221311.tar"; - sha256 = "0px6ki34v029i9wif1pzs500gqj1ppaj0zdn96535zk22b137dfn"; + sha256 = "122qffkbl5in1y1zpphn38kmg49xpvddxzf8im9hcvigf7dik6f5"; }; packageRequires = [ emacs ]; meta = { @@ -3246,7 +3240,7 @@ version = "0.9.1.0.20221221.80314"; src = fetchurl { url = "https://elpa.gnu.org/devel/javaimp-0.9.1.0.20221221.80314.tar"; - sha256 = "07qmxqsp9gbdr7pxv4f8826l50gbwcxs2f5zw3v88h64rgrkll5c"; + sha256 = "0dj7mzdfj1gvd18mdnf19pv5zljhhada6a5s3bm5drpw12vx5334"; }; packageRequires = []; meta = { @@ -3264,7 +3258,7 @@ version = "1.1.0.20221221.80333"; src = fetchurl { url = "https://elpa.gnu.org/devel/jgraph-mode-1.1.0.20221221.80333.tar"; - sha256 = "1dljzr1f0vdhsrw8wksz4gq1q0vwl0136diwzrxh4hwya97mvsrn"; + sha256 = "1ddmyxanfnqfmwx3ld25awm4qhwbzavla8xan261nyh4wwnm8hfq"; }; packageRequires = [ cl-lib ]; meta = { @@ -3276,10 +3270,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.4.0.20240311.82108"; + version = "1.6.0.20240415.42305"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-1.4.0.20240311.82108.tar"; - sha256 = "086231zh82hb2lz66m16hcvc7ncirn4zjx5hc5kmgzdp9aci8k8w"; + url = "https://elpa.gnu.org/devel/jinx-1.6.0.20240415.42305.tar"; + sha256 = "12jvkb9nis5kin7ii7aan7b2d8cd5q1f9qpp6g506m18gdi12f48"; }; packageRequires = [ compat emacs ]; meta = { @@ -3294,7 +3288,7 @@ version = "0.4.0.20240323.72834"; src = fetchurl { url = "https://elpa.gnu.org/devel/jit-spell-0.4.0.20240323.72834.tar"; - sha256 = "14lqji9qyki7yq1kr1hc1ikcphvk18js3mp1rwx239mh3v079f0n"; + sha256 = "1as5s3y1hgjzaz2325rayg0xm80wq2frswcxcarywn85gyfbpskn"; }; packageRequires = [ compat emacs ]; meta = { @@ -3310,10 +3304,10 @@ elpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20231224.0.20240310.175505"; + version = "20231224.0.20240418.608"; src = fetchurl { - url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240310.175505.tar"; - sha256 = "1q99zwhk0cdlr161zi38sz412y69k7nh8wa6scz5mi4v07vjrr9g"; + url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240418.608.tar"; + sha256 = "0l0pcq8v2mnig6jb2qamnm3ih37bl0vlknzqkp3vsznlasjm5srj"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3328,7 +3322,7 @@ version = "0.2.0.20221221.80401"; src = fetchurl { url = "https://elpa.gnu.org/devel/json-mode-0.2.0.20221221.80401.tar"; - sha256 = "10rgam19spjrqfmpvxnhp4akgz1ya6l4kvzdyhavgi03bd8c8gxn"; + sha256 = "0hr0dqnz3c9bc78k3nnwrhwqhgyjq1qpnjfa7wd9bsla3gfp88hk"; }; packageRequires = [ emacs ]; meta = { @@ -3343,10 +3337,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.25.0.20240312.132224"; + version = "1.0.25.0.20240427.91928"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240312.132224.tar"; - sha256 = "12x9i0m655nck41cv6kap814bzdw867wirnqbqyx8q80vmhxar9p"; + url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240427.91928.tar"; + sha256 = "18x620ayb9bwp2crxn2mibl7arqc4dzhaykmp5lfqibjkx6qmm9i"; }; packageRequires = [ emacs ]; meta = { @@ -3361,7 +3355,7 @@ version = "3.1.0.20231015.14814"; src = fetchurl { url = "https://elpa.gnu.org/devel/jumpc-3.1.0.20231015.14814.tar"; - sha256 = "04qd2n7lsfcxw0j3h27dfp6gkjzlgp6562gwydmqbwfrd87a7qdd"; + sha256 = "1v8jxyvs0540w6rdsy96a49lb8nhrq4r66mmvc42j8lh7k4nggdw"; }; packageRequires = []; meta = { @@ -3380,7 +3374,7 @@ version = "0.2.2.0.20240321.120430"; src = fetchurl { url = "https://elpa.gnu.org/devel/kind-icon-0.2.2.0.20240321.120430.tar"; - sha256 = "11f82zrdf5fmpbfv076pg55d0pybjv13wyl62pymcgw1i1jjsach"; + sha256 = "1cwp2cc2qy36s4zz6arfr760a9x77h0cj42q6a0s32l56sddh7ws"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -3395,7 +3389,7 @@ version = "1.1.5.0.20220316.84759"; src = fetchurl { url = "https://elpa.gnu.org/devel/kiwix-1.1.5.0.20220316.84759.tar"; - sha256 = "1w0701chsjxnc19g7qd8aipb9vsncfmccgpkw9w65fcmcr7v0ipf"; + sha256 = "0pi543y1gzkhi9chzwfmp9is8jnp31wx69m9355afrvxdncq6gna"; }; packageRequires = [ emacs request ]; meta = { @@ -3410,7 +3404,7 @@ version = "0.1.0.20221221.80420"; src = fetchurl { url = "https://elpa.gnu.org/devel/kmb-0.1.0.20221221.80420.tar"; - sha256 = "03jgn57h4i3rdfk4qankz3fivrglbxd1y86bm2k7ansdq8a5f7kn"; + sha256 = "00zqrfh1nqn01azmkd2gy3il48h1sddp6addj9yfq4kwd7ylhym5"; }; packageRequires = [ emacs ]; meta = { @@ -3425,7 +3419,7 @@ version = "1.0.0.20221221.80428"; src = fetchurl { url = "https://elpa.gnu.org/devel/landmark-1.0.0.20221221.80428.tar"; - sha256 = "1jab8b832x4zf6kxfk7n80rc6jhzxsdnmck9jx3asxw9013cc6c8"; + sha256 = "1rwiysmynp2z4bfynhf9k1zd3y5s6dyp2312vq1rhyifgdd8mivq"; }; packageRequires = []; meta = { @@ -3445,7 +3439,7 @@ version = "1.5.4.0.20230903.170436"; src = fetchurl { url = "https://elpa.gnu.org/devel/latex-table-wizard-1.5.4.0.20230903.170436.tar"; - sha256 = "1k6jcmj26p3xg73044yprj554bihr9gk5j6ip3cphdkm1c6b3663"; + sha256 = "1y1crsd29fvqabzwzki7jqziarycix6bib0cmxlrfsqs95y7dr5w"; }; packageRequires = [ auctex emacs transient ]; meta = { @@ -3460,7 +3454,7 @@ version = "4.5.5.0.20230803.74443"; src = fetchurl { url = "https://elpa.gnu.org/devel/leaf-4.5.5.0.20230803.74443.tar"; - sha256 = "1ixyiy2zq3v0vz1jbazba41x3m3azb6zvpjm0721dakkqv8k7idj"; + sha256 = "1xkqwkkk3k5k3lg10amh2lvric2xcqd35ad30c0jyvzn9fsxkbn0"; }; packageRequires = [ emacs ]; meta = { @@ -3475,7 +3469,7 @@ version = "0.12.0.20240303.95600"; src = fetchurl { url = "https://elpa.gnu.org/devel/lentic-0.12.0.20240303.95600.tar"; - sha256 = "08q7rkf2dxmwllpvm01v9bk7n0zynrqjmrsy3mrg4fnmdm9sw257"; + sha256 = "0w6fl0yzmh0gd3d5d5049zrx341x0jrj48g265jy4jywdvk621kv"; }; packageRequires = [ dash emacs m-buffer ]; meta = { @@ -3494,7 +3488,7 @@ version = "0.2.0.20240314.214448"; src = fetchurl { url = "https://elpa.gnu.org/devel/lentic-server-0.2.0.20240314.214448.tar"; - sha256 = "0nv50f4qa98cmj7r8azxbms6wbm1ij3bfld0fk1cqhn5b054ly0b"; + sha256 = "1mg12bkwsqm4nwwwmpfx3dav583i96dsk5ap5hjiz2ggwwrmrq8h"; }; packageRequires = [ lentic web-server ]; meta = { @@ -3512,7 +3506,7 @@ version = "1.0.6.0.20240102.14710"; src = fetchurl { url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20240102.14710.tar"; - sha256 = "14iz361gkd307g6zv4syxmy5kfaimrha7a1jhd6cjbf1gzfrnff6"; + sha256 = "1iyw8kaqgd5kmfzyzcmrnaa40bn6azvhlmsppnvfnwxgslcjgp1p"; }; packageRequires = [ emacs ]; meta = { @@ -3527,7 +3521,7 @@ version = "1.2.0.20240216.82808"; src = fetchurl { url = "https://elpa.gnu.org/devel/lex-1.2.0.20240216.82808.tar"; - sha256 = "109sprgslx2gh6frqyhcsczi59bb6298lvrfbn0qjggxsrmc486z"; + sha256 = "0mh2jk838216mwv6bab28mq9nb5617c5y7s0yqynkz3vkarnnxx1"; }; packageRequires = []; meta = { @@ -3542,7 +3536,7 @@ version = "1.0.0.0.20240117.24849"; src = fetchurl { url = "https://elpa.gnu.org/devel/lin-1.0.0.0.20240117.24849.tar"; - sha256 = "06ibnd4r5f6xw0qk8kk2a67dalb8a6yiy2fkvhi4pb59sw9gwrk0"; + sha256 = "1yjqq1zzv0a7ydhjjh7ycgwd8fzlkvza3m8dm9wa45lqljf5ysim"; }; packageRequires = [ emacs ]; meta = { @@ -3561,10 +3555,10 @@ elpaBuild { pname = "listen"; ename = "listen"; - version = "0.9pre0.20240322.72611"; + version = "0.10pre0.20240419.165028"; src = fetchurl { - url = "https://elpa.gnu.org/devel/listen-0.9pre0.20240322.72611.tar"; - sha256 = "0k50isjazhx0hbmxw3s2p2ny56il5ywbsq1bda6av86ifzr1620c"; + url = "https://elpa.gnu.org/devel/listen-0.10pre0.20240419.165028.tar"; + sha256 = "1bmjnigb4ly14i3n7wgd0jx4k0g06cf2n3dapfdwlv80bi57x20a"; }; packageRequires = [ emacs persist taxy taxy-magit-section transient ]; meta = { @@ -3576,10 +3570,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.12.1.0.20240323.232518"; + version = "0.12.3.0.20240331.11827"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.12.1.0.20240323.232518.tar"; - sha256 = "16y64vc84f14rcsbgg6cl0c9dc0xi0m2jks30m4l5khya7bkkj0x"; + url = "https://elpa.gnu.org/devel/llm-0.12.3.0.20240331.11827.tar"; + sha256 = "0nc9p0cjxzmfrxrir45lj6yyqwpaw30rdgbhw5dl83shnps4fi58"; }; packageRequires = [ emacs ]; meta = { @@ -3594,7 +3588,7 @@ version = "1.4.0.20230105.113402"; src = fetchurl { url = "https://elpa.gnu.org/devel/lmc-1.4.0.20230105.113402.tar"; - sha256 = "0pw31akqdf59y9cxk25y8z5643szd4ybhbcmj91i1k9gkhdqhh1x"; + sha256 = "0ldwr9gw0bkcj43w5x84qwq2gvv2nr53711wlh42zawh0dyhm8h7"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3612,7 +3606,7 @@ version = "0.0.5.0.20221221.80456"; src = fetchurl { url = "https://elpa.gnu.org/devel/load-dir-0.0.5.0.20221221.80456.tar"; - sha256 = "1hdyy212iz057q2znp8pb6ns8gyi6f5xbr6kvs02rybsd9wjv40s"; + sha256 = "00ynwml6xf7341z1w0wz1afh9jc4v8ggc8izy8qcvdiawxc418iq"; }; packageRequires = [ cl-lib ]; meta = { @@ -3629,7 +3623,7 @@ version = "1.3.2.0.20230214.53224"; src = fetchurl { url = "https://elpa.gnu.org/devel/load-relative-1.3.2.0.20230214.53224.tar"; - sha256 = "027mlcg38x2yb3j9lnjzfg84fj8hah7sd9nnndf6fkpabi7bbysq"; + sha256 = "19pkb7xqyllll2pgyqs7bv0qfbv6n9i5qlx9rjzm4ws0c9j464zd"; }; packageRequires = []; meta = { @@ -3661,7 +3655,7 @@ version = "1.2.4.0.20201130.183958"; src = fetchurl { url = "https://elpa.gnu.org/devel/loccur-1.2.4.0.20201130.183958.tar"; - sha256 = "1skpv5pmbkhn5vx2c4dqqx4ds3pj4z2lg6ka0pas9xkijdbfy7v0"; + sha256 = "1ghig684f2r6dl5czym3d5hqhf72y1hilnhbk95lg890cc0yacir"; }; packageRequires = [ emacs ]; meta = { @@ -3676,7 +3670,7 @@ version = "1.1.1.0.20240224.55443"; src = fetchurl { url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20240224.55443.tar"; - sha256 = "10z609m2ak37yfbmlgv258j2rsvkq40h5rzmdwk8ibldz3n6ywgd"; + sha256 = "1zr2g2bj2xkjwj509vijqdqhx1dgmbr73i605677hjw01d2skch3"; }; packageRequires = [ emacs ]; meta = { @@ -3691,7 +3685,7 @@ version = "1.0.0.0.20221125.50733"; src = fetchurl { url = "https://elpa.gnu.org/devel/luwak-1.0.0.0.20221125.50733.tar"; - sha256 = "06kl3c6b7z9wzw44c6l49vnj4k25g4az8lps8q7kd7w7f0cjn3yx"; + sha256 = "0b4kxq5im8gvg1zg12b8ii62w0vsf3gacimwd603srfc5l1rbvcw"; }; packageRequires = [ emacs ]; meta = { @@ -3706,7 +3700,7 @@ version = "0.15.0.0.20221030.224757"; src = fetchurl { url = "https://elpa.gnu.org/devel/lv-0.15.0.0.20221030.224757.tar"; - sha256 = "0xjizznzwsydwqs2hvcbi8nqcyzvca0w3m48dpi2xwvnm22a7v48"; + sha256 = "07m1m2rgwnb7916hzdjccnq4is0z7m5mwmvc0f7mpc4h61sa6cdn"; }; packageRequires = []; meta = { @@ -3724,7 +3718,7 @@ version = "0.16.0.20240302.175529"; src = fetchurl { url = "https://elpa.gnu.org/devel/m-buffer-0.16.0.20240302.175529.tar"; - sha256 = "1scjp8f89a7mn7wlw0sgix8hk4dw6lpz0gakvfr7c5mcmm0bzhlr"; + sha256 = "18lj0gb56xhwrbihijy4p5lyxqvdfcwyabcd30qy1dn4k715v614"; }; packageRequires = [ seq ]; meta = { @@ -3739,7 +3733,7 @@ version = "3.3.1.0.20240221.84915"; src = fetchurl { url = "https://elpa.gnu.org/devel/map-3.3.1.0.20240221.84915.tar"; - sha256 = "04zywlimai9v6131ksh3vkp6zlrnx9wr36hr0cg0yh2vhsj09kkm"; + sha256 = "0cmxxgxi7nsgbx4a94pxhn4y6qddp14crfl2250nk6a1h17zvsnn"; }; packageRequires = [ emacs ]; meta = { @@ -3755,10 +3749,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.5.0.20240323.201536"; + version = "1.6.0.20240404.45149"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.5.0.20240323.201536.tar"; - sha256 = "11sjdmif14bcl3cn2sn9a20lvyw8qrjqjscwcq0aid0lqwswmvi4"; + url = "https://elpa.gnu.org/devel/marginalia-1.6.0.20240404.45149.tar"; + sha256 = "1bqynrmb99691k0cmdn30g780356gff30bd7lirlriraabj19y7h"; }; packageRequires = [ compat emacs ]; meta = { @@ -3775,7 +3769,7 @@ version = "0.2.2.0.20221221.80510"; src = fetchurl { url = "https://elpa.gnu.org/devel/markchars-0.2.2.0.20221221.80510.tar"; - sha256 = "0snw8hc65mkmmlaj1x87gwkyrz43qdm5ahnnjh09dad5pfd1s0v0"; + sha256 = "0f1n1jzhksl5cl5c4n2arqhj2zkwzs8i4yzdz39y2b51x2gi2yav"; }; packageRequires = []; meta = { @@ -3792,7 +3786,7 @@ version = "1.3.0.20220828.204754"; src = fetchurl { url = "https://elpa.gnu.org/devel/math-symbol-lists-1.3.0.20220828.204754.tar"; - sha256 = "11n6lmh9q6j0aamd4wbij0ymdfpdmqm0iqysqvk2vnnq6ly4hw3f"; + sha256 = "0q038qwcq7lg3a7n451gw80xlwv4hczz3432xcx00hxgvlh744yc"; }; packageRequires = []; meta = { @@ -3807,7 +3801,7 @@ version = "1.0.0.0.20240320.41315"; src = fetchurl { url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240320.41315.tar"; - sha256 = "062mk5kqivhgvfk81rsa21bqkzk2h3wgfq1prjppndfw8y4cajpb"; + sha256 = "02rifid9g3q6a92xp1xpkmmm00awhxfk573lbapcl473sjy5dwfp"; }; packageRequires = [ emacs ]; meta = { @@ -3824,7 +3818,7 @@ version = "0.2.0.20201201.223908"; src = fetchurl { url = "https://elpa.gnu.org/devel/memory-usage-0.2.0.20201201.223908.tar"; - sha256 = "1klpmxgkmc9rb8daldllfwvwagg9sc01kq2jp1vq2wsbrvgpai6d"; + sha256 = "1jybms0756sswwdq8gqc6kpp5m7y971v4yzcmhraykhf32rwf4rq"; }; packageRequires = []; meta = { @@ -3839,7 +3833,7 @@ version = "0.3.0.20221221.80722"; src = fetchurl { url = "https://elpa.gnu.org/devel/metar-0.3.0.20221221.80722.tar"; - sha256 = "18hzsasajy00m4lvb8pqmpipb3a4m3g9mn151vqndd5hnk08wafn"; + sha256 = "08xcxx9wbjkqf6s1rbsp54f648r8n122k66nfd8ibv9qbd8qvmxq"; }; packageRequires = [ cl-lib ]; meta = { @@ -3854,7 +3848,7 @@ version = "0.2.0.20221221.80736"; src = fetchurl { url = "https://elpa.gnu.org/devel/midi-kbd-0.2.0.20221221.80736.tar"; - sha256 = "1ssr8srsdd3f0ijyrx7mcyshb4jdcdi9klm9akablnwzx9z2scm8"; + sha256 = "0fz9r0y3qdnaq9wi00151xzqh3ygwcfw6yl32cs1vaaxv2czkjai"; }; packageRequires = [ emacs ]; meta = { @@ -3869,7 +3863,7 @@ version = "1.6.0.20201130.184335"; src = fetchurl { url = "https://elpa.gnu.org/devel/mines-1.6.0.20201130.184335.tar"; - sha256 = "0xcb0faxsqzrjqxj5z3r8b3hyd8czb5vadzy6shfzkp5xk6w0bny"; + sha256 = "0vl93im89fg72wpcqdhg1x2l4iybznh6gjvpkr1i29y05fsx2aad"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3887,7 +3881,7 @@ version = "0.5.0.20220921.71345"; src = fetchurl { url = "https://elpa.gnu.org/devel/minibuffer-header-0.5.0.20220921.71345.tar"; - sha256 = "0d3mj2j6bkvci78yx9gidgkig6qvg99zhh3g4z5fqsymyndi1l1w"; + sha256 = "1s77h5s2abpm75k57zcp1s525qs74sdm6vpzlkvqjz8lpn8zkkp0"; }; packageRequires = [ emacs ]; meta = { @@ -3904,7 +3898,7 @@ version = "0.1.0.20221221.80745"; src = fetchurl { url = "https://elpa.gnu.org/devel/minibuffer-line-0.1.0.20221221.80745.tar"; - sha256 = "1zq1y69wwci8r840ns3izq59hr95b8ncyha0q06gqrv989jamrjw"; + sha256 = "10gl1lnihawv9dw2rzaydyh8cdgpqgj7y8jsr6hjgqv82hxqyccn"; }; packageRequires = []; meta = { @@ -3919,7 +3913,7 @@ version = "1.4.0.20201201.162630"; src = fetchurl { url = "https://elpa.gnu.org/devel/minimap-1.4.0.20201201.162630.tar"; - sha256 = "1r062v8a4r4d78biz9d3jk5y8w3ahhamr05cnhfwh2aib4byplf1"; + sha256 = "0h0ydmfinr82j0ifkgwjhc8blg6z2f5k0711fwrcbx8wrgrvfh5v"; }; packageRequires = []; meta = { @@ -3938,7 +3932,7 @@ version = "0.5.11.0.20240222.42825"; src = fetchurl { url = "https://elpa.gnu.org/devel/mmm-mode-0.5.11.0.20240222.42825.tar"; - sha256 = "1bsccf8i48r4zjzg7pqi47n2r09dj8baylw83ksdrzc57n1s90x7"; + sha256 = "037g19hdya14q7wivdcw8h7wyx8lb8pw5waya3ak435cyfmpg1a7"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3953,10 +3947,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.4.0.0.20240322.51913"; + version = "4.4.0.0.20240427.84336"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240322.51913.tar"; - sha256 = "1ilblm5hgynihfm60q44fw9njhir1nndz7mhxbbsyhlm42bg30vc"; + url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240427.84336.tar"; + sha256 = "003kzj9s22qyzvavzh9q0x5dh6jg3n8ykvbihkx5hw16ar7cxmgg"; }; packageRequires = [ emacs ]; meta = { @@ -3968,10 +3962,10 @@ elpaBuild { pname = "mpdired"; ename = "mpdired"; - version = "2pre0.20240319.164728"; + version = "2pre0.20240414.172616"; src = fetchurl { - url = "https://elpa.gnu.org/devel/mpdired-2pre0.20240319.164728.tar"; - sha256 = "18xhxlxzl5kapjzhaqw0zsi5avp2wb0vrxj9rsigsjcr0p09asrd"; + url = "https://elpa.gnu.org/devel/mpdired-2pre0.20240414.172616.tar"; + sha256 = "0c7rjws601wh7bxg549hbbfanh5lxwrhrm03ay2ziriswqdrq5ng"; }; packageRequires = [ emacs ]; meta = { @@ -3988,7 +3982,7 @@ version = "1.14.0.20221221.80812"; src = fetchurl { url = "https://elpa.gnu.org/devel/multi-mode-1.14.0.20221221.80812.tar"; - sha256 = "0054sb4jp1xp6bf0zh42k6blhvlpw5yr38fg5pm5gv8a6iw3gc9x"; + sha256 = "1r41alsvaab8h5cngy0hjs78shv60qp1g68jppl5qlhd6a7h95ih"; }; packageRequires = []; meta = { @@ -4006,7 +4000,7 @@ version = "1.1.10.0.20220605.120254"; src = fetchurl { url = "https://elpa.gnu.org/devel/multishell-1.1.10.0.20220605.120254.tar"; - sha256 = "1vs9w1v8hqwfhypk0nz7l2n7q1rf7nx2nwlljqn8clx817glqlfm"; + sha256 = "0pl45mwwgdf505sviyzacalq6kisq0pnh99i1cnclrmjkjy6yxz9"; }; packageRequires = [ cl-lib ]; meta = { @@ -4021,7 +4015,7 @@ version = "3.20.2.0.20240209.184001"; src = fetchurl { url = "https://elpa.gnu.org/devel/muse-3.20.2.0.20240209.184001.tar"; - sha256 = "0jp0qmak49gnx121nkay70dbld26z6jvgc7d1ycgyfl49flqhjb4"; + sha256 = "1sn5siingpzg4y5wjc3ff2ln98gb7hhvwmhnvhmmqbnb8r459vs0"; }; packageRequires = []; meta = { @@ -4036,7 +4030,7 @@ version = "0.1.0.20221221.80834"; src = fetchurl { url = "https://elpa.gnu.org/devel/myers-0.1.0.20221221.80834.tar"; - sha256 = "1hk1587bni5sn9q91yv43s1i5dvbirbh2md46cx7c9y69bshyaqh"; + sha256 = "11nwn1nysr09r1701cd3wvkzn01s19l6lla0f33vqm66ahj9yldh"; }; packageRequires = [ emacs ]; meta = { @@ -4051,7 +4045,7 @@ version = "0.4.0.20230111.104526"; src = fetchurl { url = "https://elpa.gnu.org/devel/nadvice-0.4.0.20230111.104526.tar"; - sha256 = "0kcgdrcsjf4rqcb9k95amcvx3qx8qx7msnwjy21a87vc0w8gpv3r"; + sha256 = "0855x3vgp0i6kmi5kf8365xqnj92k9lwqyfn40i59fp4jj3c00kr"; }; packageRequires = []; meta = { @@ -4069,7 +4063,7 @@ version = "1.0.2.0.20230112.95905"; src = fetchurl { url = "https://elpa.gnu.org/devel/nameless-1.0.2.0.20230112.95905.tar"; - sha256 = "0a8zjsm75k02ixynd5jxxniyj5yn4gbcvidi03jkk9z3vxr19vi7"; + sha256 = "1b44w8jkqqsi995a2daw05ks64njlgpkab6m3iy3lx3v8fggjahp"; }; packageRequires = [ emacs ]; meta = { @@ -4089,7 +4083,7 @@ version = "20151201.0.0.20220425.173515"; src = fetchurl { url = "https://elpa.gnu.org/devel/names-20151201.0.0.20220425.173515.tar"; - sha256 = "1rd7v5yvb2d5zxcqmdjg7hmhgd12lhcrg03wm6sd1lq3jw0hbxhr"; + sha256 = "1s91v83jkwxjl1iqrmjy60rnnqcgzly0z8chp87f7i22fj5gjz4h"; }; packageRequires = [ cl-lib emacs nadvice ]; meta = { @@ -4107,7 +4101,7 @@ version = "0.3.0.20230417.100538"; src = fetchurl { url = "https://elpa.gnu.org/devel/nano-agenda-0.3.0.20230417.100538.tar"; - sha256 = "1v7dx53zl0mw8ap91kvzwqb4kiikg14dsw3r49n0j5766nc320fv"; + sha256 = "1fhpic6zimk81a7w6m9hl6iw0vniz3pl775sxyg167ysn5sqsl2y"; }; packageRequires = [ emacs ]; meta = { @@ -4125,7 +4119,7 @@ version = "1.0.1.0.20240318.92455"; src = fetchurl { url = "https://elpa.gnu.org/devel/nano-modeline-1.0.1.0.20240318.92455.tar"; - sha256 = "1ncbyq2753s46aca2kklf5rrgccc1wddbp0qbhcn6v2j1y37c8k5"; + sha256 = "14n5gmbpnbcrj2h2c12s35pdb93r1hflklpnv0bh5gpla154f6ln"; }; packageRequires = [ emacs ]; meta = { @@ -4143,7 +4137,7 @@ version = "0.3.4.0.20240319.93238"; src = fetchurl { url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20240319.93238.tar"; - sha256 = "0i7zxx2y052bn4ry3pr24zmm846zilcvv2pvkzcd450zp84p39hn"; + sha256 = "0xh3m9c4wq7zvc634nvfvxyyi0snlb67286znmnfkpgb3j84vshk"; }; packageRequires = [ emacs ]; meta = { @@ -4161,7 +4155,7 @@ version = "1.1.0.20221221.80909"; src = fetchurl { url = "https://elpa.gnu.org/devel/nftables-mode-1.1.0.20221221.80909.tar"; - sha256 = "11a38dgnnvzsh6k7l8n1fzkn8ma4mj3sv17r2614g4jjkmwkaz0i"; + sha256 = "149qz88wlapln0b8d9mcmj630vyh2ha65hqb46yrf08fch992cpx"; }; packageRequires = [ emacs ]; meta = { @@ -4179,7 +4173,7 @@ version = "1.5.0.20221215.152407"; src = fetchurl { url = "https://elpa.gnu.org/devel/nhexl-mode-1.5.0.20221215.152407.tar"; - sha256 = "10jxk0n8x8lr7chfnr562gmyfmcsh25xc1vsqw802c0y3l8z3jw1"; + sha256 = "0bdw6lycm1hclz3qzckcpnssrd4i52051dzbs87f9sv6f6v31373"; }; packageRequires = [ emacs ]; meta = { @@ -4194,7 +4188,7 @@ version = "1.9.0.20221221.80940"; src = fetchurl { url = "https://elpa.gnu.org/devel/nlinum-1.9.0.20221221.80940.tar"; - sha256 = "1vifq3rlh9zwrqq0zkhdqv1g2pzgndyxjdr21xis6kxdc50s59l1"; + sha256 = "15kw7r8lz9nb5s0rzgdlj1s1kl1l6nxzr7kmwv5i7b1xhpnyn7xn"; }; packageRequires = []; meta = { @@ -4208,10 +4202,10 @@ elpaBuild { pname = "notes-mode"; ename = "notes-mode"; - version = "1.30.0.20201201.121157"; + version = "1.31.0.20240402.80928"; src = fetchurl { - url = "https://elpa.gnu.org/devel/notes-mode-1.30.0.20201201.121157.tar"; - sha256 = "0jliwzbmn89qfjfd096sa5gia52mqvivg8kif41mrmczbhzgqp6a"; + url = "https://elpa.gnu.org/devel/notes-mode-1.31.0.20240402.80928.tar"; + sha256 = "1kiki1b6bx3nn1xgbnh0xnwnhx5wkn0zzlk6jfsks5npj2a4h88g"; }; packageRequires = []; meta = { @@ -4229,7 +4223,7 @@ version = "1.1.0.0.20240117.25556"; src = fetchurl { url = "https://elpa.gnu.org/devel/notmuch-indicator-1.1.0.0.20240117.25556.tar"; - sha256 = "0vcpak68jggjwlwx9qjfp72hidh95lvrivlws1l5mmdcnynqjxyp"; + sha256 = "003pq429x6yjqv4hw7ryigqmpzrk5frwmlk1ar35z9n83xsnl128"; }; packageRequires = [ emacs ]; meta = { @@ -4244,7 +4238,7 @@ version = "2.1.0.0.20240102.22814"; src = fetchurl { url = "https://elpa.gnu.org/devel/ntlm-2.1.0.0.20240102.22814.tar"; - sha256 = "0fxv4s5adajf9v8jg5i6w47xbm0v2qlvab8fa8jsnyi8ilxh1afc"; + sha256 = "0wr9bhxxdkpfvwla97xrd77dv3321apq1gmcpqadyjvxl44c0km7"; }; packageRequires = []; meta = { @@ -4259,7 +4253,7 @@ version = "1.5.0.20221221.81242"; src = fetchurl { url = "https://elpa.gnu.org/devel/num3-mode-1.5.0.20221221.81242.tar"; - sha256 = "0pwlklfmz0brsq2l4zkvmg18hryc9cszsbyn0ky9n8nz0m9nfxsw"; + sha256 = "076m1lh9ma1wzavirmy7dq7nsl410n03yf7vq4ljxvbkw801sig7"; }; packageRequires = []; meta = { @@ -4274,7 +4268,7 @@ version = "0.16.0.20221221.81302"; src = fetchurl { url = "https://elpa.gnu.org/devel/oauth2-0.16.0.20221221.81302.tar"; - sha256 = "1hxmwsb56m73qr4nqfh32bhbd8b0bl5yfccsk754sjywpn1wnlpq"; + sha256 = "1imdggvj98db8cs0s2qx72ifavi6h3flym70zm2g1w8v2fmcq8dj"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -4291,7 +4285,7 @@ version = "1.0.0.20230908.121002"; src = fetchurl { url = "https://elpa.gnu.org/devel/ob-asymptote-1.0.0.20230908.121002.tar"; - sha256 = "0gldqmldbwa1rsfyzv9h1sl8za6i0k9j3lkar5capl5qs1c0lib1"; + sha256 = "1lpv4rf7qf1yvpm4j3wiajdk72lgl4gk8qgwflzyq9yvmksakdvp"; }; packageRequires = []; meta = { @@ -4306,7 +4300,7 @@ version = "1.0.0.20210211.73431"; src = fetchurl { url = "https://elpa.gnu.org/devel/ob-haxe-1.0.0.20210211.73431.tar"; - sha256 = "18i9wmchnaz0hnh1bb3sydawxrcxqy1gfp150i69p0miwsfmz7ip"; + sha256 = "148bly2nf0r64q2cfm0hd6i26bxaans7aj52nv4gb5qxsiqng0ly"; }; packageRequires = []; meta = { @@ -4321,7 +4315,7 @@ version = "0.8.3.0.20201002.84752"; src = fetchurl { url = "https://elpa.gnu.org/devel/objed-0.8.3.0.20201002.84752.tar"; - sha256 = "1ar3i58cb55958dnj88bxa5wnmlz4dnfh76m7nf0kf5sld71l0vf"; + sha256 = "1fjcl2gm4675l430rdr2lihsj13n24pi9zwjfqvsm4bnqbx9ywiz"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -4333,10 +4327,10 @@ elpaBuild { pname = "omn-mode"; ename = "omn-mode"; - version = "1.2.0.20221221.81322"; + version = "1.3.0.20240326.173146"; src = fetchurl { - url = "https://elpa.gnu.org/devel/omn-mode-1.2.0.20221221.81322.tar"; - sha256 = "0bpp3aj93srdmqbh33k36q9762dzzagymh1rxca2axdfb7q7xsa2"; + url = "https://elpa.gnu.org/devel/omn-mode-1.3.0.20240326.173146.tar"; + sha256 = "1iyh0xqm9aag92vj44l4ymrjc0gnn41gckk1l96605cfkwr5m6qa"; }; packageRequires = []; meta = { @@ -4354,7 +4348,7 @@ version = "1.3.3.0.20201127.191411"; src = fetchurl { url = "https://elpa.gnu.org/devel/on-screen-1.3.3.0.20201127.191411.tar"; - sha256 = "123kq277vcm4backwdpmnmkkqiplnnbpf62ppn5cg8zl09r87cl6"; + sha256 = "1dak8rb89mkdpv3xc2h0kpn09i4l42iavslvkhy2vxj0qq6c1r9p"; }; packageRequires = [ cl-lib ]; meta = { @@ -4372,7 +4366,7 @@ version = "1.0.1.0.20230325.141904"; src = fetchurl { url = "https://elpa.gnu.org/devel/openpgp-1.0.1.0.20230325.141904.tar"; - sha256 = "1zpdxm8s7kd936klrsyf72g7my4ffci74cc9gwasgff4r383f000"; + sha256 = "012svyzmr4rwi2a1v99klyjnwrrfqz8jd053f9xjfm44payfafkg"; }; packageRequires = [ emacs ]; meta = { @@ -4380,17 +4374,14 @@ license = lib.licenses.free; }; }) {}; - orderless = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + orderless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.1.0.20240320.163827"; + version = "1.1.0.20240401.95916"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240320.163827.tar"; - sha256 = "1iffr6y533z310c47jig8fbg6vyv9a6vlrwn5v4rg0vb3m0i1ah7"; + url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240401.95916.tar"; + sha256 = "0w2n1b65hj642a36i6022kmzwgwlb72aicfc6hj3b7rk5zsjg0hc"; }; packageRequires = [ emacs ]; meta = { @@ -4402,10 +4393,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20240324.161811"; + version = "9.7pre0.20240426.150943"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20240324.161811.tar"; - sha256 = "02c2zy96ipzyl6abn375zkvsybfbs3067mnv70xrgjhfrd02yfbr"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20240426.150943.tar"; + sha256 = "0n7d6zrwvrism7blfdri19mvrhcc71cga7qwbvpnq0a9mamv1ypy"; }; packageRequires = [ emacs ]; meta = { @@ -4421,10 +4412,10 @@ elpaBuild { pname = "org-contacts"; ename = "org-contacts"; - version = "1.1.0.20230227.141730"; + version = "1.1.0.20240410.112834"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20230227.141730.tar"; - sha256 = "0y78hwcranqdlm9lip623v5qaj15gv335lnxaakxra9dfri703fm"; + url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240410.112834.tar"; + sha256 = "0mns2fkzn1yc968k2nc4y5gys1m7dbcj67mdb8vfj54iwdkw316z"; }; packageRequires = [ emacs org ]; meta = { @@ -4444,7 +4435,7 @@ version = "1.1.2.0.20200902.94459"; src = fetchurl { url = "https://elpa.gnu.org/devel/org-edna-1.1.2.0.20200902.94459.tar"; - sha256 = "0s7485x4dblrz2gnnd9qxaq3jph16z5ylp1na3b0mi60v0ibnwa4"; + sha256 = "043pb34ai8rj515zgbw5nq5x3mkiyqcnk25787qc3mbddi9n9hwq"; }; packageRequires = [ emacs org seq ]; meta = { @@ -4463,7 +4454,7 @@ version = "0.0.5.0.20240204.184749"; src = fetchurl { url = "https://elpa.gnu.org/devel/org-jami-bot-0.0.5.0.20240204.184749.tar"; - sha256 = "0gs0f9xdgfylgrdgcxm13m4dw526ps47kqwggdz8y2x94p54p1ny"; + sha256 = "1zl9xblhppqwddizf7s7l9d4qzcr8d6vgvjwmiw4wvb4lpyba9r4"; }; packageRequires = [ emacs jami-bot ]; meta = { @@ -4479,10 +4470,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "1.2.0.20240316.110902"; + version = "1.2.0.20240327.153104"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-1.2.0.20240316.110902.tar"; - sha256 = "1jxq281qpr8if9np3qsg8gccg08yzi7szq0vz5v8yy7q4lc27wz2"; + url = "https://elpa.gnu.org/devel/org-modern-1.2.0.20240327.153104.tar"; + sha256 = "0gkkcvjbjyr5h8idafc0lppjwdr84y860800ns7z894i89iy01li"; }; packageRequires = [ compat emacs ]; meta = { @@ -4500,7 +4491,7 @@ version = "0.1.1.0.20231016.93952"; src = fetchurl { url = "https://elpa.gnu.org/devel/org-notify-0.1.1.0.20231016.93952.tar"; - sha256 = "1bf7q55c63rxwsbbiyqb1z33jbhx04qi6qxx6jnfva6fz0v63ag2"; + sha256 = "0pxm5pbmsf965daf3y7v5x6ca8ddi2a9d4lm04ky3113zz5ay95d"; }; packageRequires = [ emacs ]; meta = { @@ -4517,10 +4508,10 @@ elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.7.0.20231024.111108"; + version = "1.0.8.0.20240328.105118"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-real-1.0.7.0.20231024.111108.tar"; - sha256 = "199900lvg5jxfspp1papx0aj88vm6addlyv7zhp8bc2f5a9igg21"; + url = "https://elpa.gnu.org/devel/org-real-1.0.8.0.20240328.105118.tar"; + sha256 = "018bhg886mhv5wzvahvi36bpmh6lpgfahs2dxcrhlb5jqaf8kj50"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -4536,10 +4527,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.2.1.0.20240323.220226"; + version = "1.2.2.0.20240325.201734"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-remark-1.2.1.0.20240323.220226.tar"; - sha256 = "0vw0arm7jhzrxwfjyqj65xicbr6020k106vb7zaw1iyvwq64fid7"; + url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20240325.201734.tar"; + sha256 = "1m5fwry6854w1iv6pahvqgyakws31d82l8f14k585rdxx2n8fwzb"; }; packageRequires = [ emacs org ]; meta = { @@ -4555,10 +4546,10 @@ elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.3.2.0.20240222.204851"; + version = "1.3.2.0.20240420.151651"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-transclusion-1.3.2.0.20240222.204851.tar"; - sha256 = "0gbdhgz0bg6a4zy60wn39f2x4xyag32yxrkcaixsgpcrc3358c0y"; + url = "https://elpa.gnu.org/devel/org-transclusion-1.3.2.0.20240420.151651.tar"; + sha256 = "0izvaxis7yc2zfxff3dzsc27r8s4kl65x97rjxhz0cp3iqfsb91x"; }; packageRequires = [ emacs org ]; meta = { @@ -4577,7 +4568,7 @@ version = "0.1.4.0.20220312.90634"; src = fetchurl { url = "https://elpa.gnu.org/devel/org-translate-0.1.4.0.20220312.90634.tar"; - sha256 = "1lgnr4swyh1irq7q8x6di1kmglr1h4ph864mz3491pxks9y0hxjx"; + sha256 = "1fq0h0q5nh92dc9vgp7nmqyz2nl0byd2v6vl5k2lk3rlmbx7jnkz"; }; packageRequires = [ emacs org ]; meta = { @@ -4595,7 +4586,7 @@ version = "1.14.0.20240111.181530"; src = fetchurl { url = "https://elpa.gnu.org/devel/orgalist-1.14.0.20240111.181530.tar"; - sha256 = "10cn1p5cwgkivbydpgfrnna5f2qy8vs7j1wl0hky3iyfya1wi24g"; + sha256 = "05nbkphk3ii3ibfap9y9ss3w0g3qzl6qiynflib1dhbk2v222z3x"; }; packageRequires = [ emacs ]; meta = { @@ -4610,7 +4601,7 @@ version = "0.4.0.20221221.81343"; src = fetchurl { url = "https://elpa.gnu.org/devel/osc-0.4.0.20221221.81343.tar"; - sha256 = "1q4sd2pf492gyqhdrkj7qn4zh1x3jhwb1mxgs811k28fl16hanqh"; + sha256 = "0mlyszhc2nbf5p4jnc6wlq8iipzmy9ymvbszq13myza410nd9xqh"; }; packageRequires = []; meta = { @@ -4625,7 +4616,7 @@ version = "1.3.0.20240122.225511"; src = fetchurl { url = "https://elpa.gnu.org/devel/osm-1.3.0.20240122.225511.tar"; - sha256 = "0b0sdf7n9i4a7jl9xy51g50s04rvjqwvl02adc0cfalang9mk2la"; + sha256 = "0xddnwrnypqz5l4swwbi5k9qdlv260fyq766vpg31r86z92q7r24"; }; packageRequires = [ compat emacs ]; meta = { @@ -4643,7 +4634,7 @@ version = "1.0.6.0.20221221.81352"; src = fetchurl { url = "https://elpa.gnu.org/devel/other-frame-window-1.0.6.0.20221221.81352.tar"; - sha256 = "1w0lqbrgjkf5l7n1zrqlbldznhzb1xshhdg68mxydq97rhbl1msg"; + sha256 = "11fdg3nl1w4vm46477kwk6d6vz769q726iz5cwknbvjzj8an994s"; }; packageRequires = [ emacs ]; meta = { @@ -4658,7 +4649,7 @@ version = "4.3.0.0.20240216.43949"; src = fetchurl { url = "https://elpa.gnu.org/devel/pabbrev-4.3.0.0.20240216.43949.tar"; - sha256 = "08sbsr0dgw1yrfbsfcj9zslwiwvzafmdpflmj5g2bcmlx2jvck9h"; + sha256 = "0lkqg6qv06ayianrxs9mivy8pny7hzr0743mlaa20adgk681v1s4"; }; packageRequires = [ emacs ]; meta = { @@ -4673,7 +4664,7 @@ version = "1.1.3.0.20190227.204125"; src = fetchurl { url = "https://elpa.gnu.org/devel/paced-1.1.3.0.20190227.204125.tar"; - sha256 = "09ain2dq42j6bvvchddr077z9dbsmx09qg88yklqi3pc4rc7f3rv"; + sha256 = "1ykjmv45kkfa569m8hpvya8a7wvkqrg9nbz28sbxmx79abm1bmmi"; }; packageRequires = [ async emacs ]; meta = { @@ -4688,7 +4679,7 @@ version = "0.1.3.0.20180729.171626"; src = fetchurl { url = "https://elpa.gnu.org/devel/parsec-0.1.3.0.20180729.171626.tar"; - sha256 = "1icrhga35n6nvwa8dy939cc2cc1phvqh27xr1blqdxgcyyzm9ava"; + sha256 = "0lhcj6cjgkq9ha85n0hqcm0ik7avfzw9f8zcklyivwn2bx80r7r7"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -4706,7 +4697,7 @@ version = "0.2.1.0.20240220.204114"; src = fetchurl { url = "https://elpa.gnu.org/devel/parser-generator-0.2.1.0.20240220.204114.tar"; - sha256 = "08apzsgqxld3z2cpxhhygh2wj3mvs4pqxib6gfw4jliipkkrk1k6"; + sha256 = "1yb3wv183xii4rvj7asccg9cgkv061vprakcpdq99fgc9zdx0maq"; }; packageRequires = [ emacs ]; meta = { @@ -4724,7 +4715,7 @@ version = "1.0.0.20221221.81414"; src = fetchurl { url = "https://elpa.gnu.org/devel/path-iterator-1.0.0.20221221.81414.tar"; - sha256 = "12ap8ij593dkba4kahqwzvpd9d62894z4hlplwz0c59qpy90lyxb"; + sha256 = "1ln9l9x6bj1sp7shc2iafn11yji6lsgm4fm1ji1kfp3my1zhqc40"; }; packageRequires = [ emacs ]; meta = { @@ -4739,7 +4730,7 @@ version = "1.0.1.0.20221221.81502"; src = fetchurl { url = "https://elpa.gnu.org/devel/peg-1.0.1.0.20221221.81502.tar"; - sha256 = "1m5wl30zdq6fxllxkqblil6r1dqqsprdnqvlxivka6f0khbc6wdk"; + sha256 = "0gc41pf2gy01bmjgx09c1kifi6pkhcm8jrbdx1ncblhix76ia4q4"; }; packageRequires = [ emacs ]; meta = { @@ -4757,7 +4748,7 @@ version = "0.81.0.20230805.210315"; src = fetchurl { url = "https://elpa.gnu.org/devel/perl-doc-0.81.0.20230805.210315.tar"; - sha256 = "0p4vryw3by2g9kqmmdn6vi01cqgj5pwgfjcimivcxvq7vzvdafz0"; + sha256 = "0n129rcmn827payv0aqg8iz7dc7wg4rm27hvvw1wwj2k5x5vnd6r"; }; packageRequires = [ emacs ]; meta = { @@ -4772,7 +4763,7 @@ version = "0.6.0.20240114.52348"; src = fetchurl { url = "https://elpa.gnu.org/devel/persist-0.6.0.20240114.52348.tar"; - sha256 = "0jml2w7l44l9dkr0bxvfw90a57p3iyya24n0ic6083c10mgnjs89"; + sha256 = "1k4m2zmcb4l3q39qnx3kfl2wsm4380ih3mf0lc54g9l77fw4rfxr"; }; packageRequires = [ emacs ]; meta = { @@ -4787,7 +4778,7 @@ version = "0.0.20240322.152749"; src = fetchurl { url = "https://elpa.gnu.org/devel/phpinspect-0.0.20240322.152749.tar"; - sha256 = "1cm8m3zvqd000zv88md4qnrjlq29x8kl1zsivb1k4q6b0rxpva4g"; + sha256 = "0060s1p60cqq0llx5m41iwqj1bxl98c444kyhfvdvx3c7z5dapmp"; }; packageRequires = [ compat ]; meta = { @@ -4802,10 +4793,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.48.0.20240215.72135"; + version = "0.4.49.0.20240424.65247"; src = fetchurl { - url = "https://elpa.gnu.org/devel/phps-mode-0.4.48.0.20240215.72135.tar"; - sha256 = "1rizb13l60d6mjg5fdpqgks2q2lihxhbhbhlcdvnc3l6gdgvzq0r"; + url = "https://elpa.gnu.org/devel/phps-mode-0.4.49.0.20240424.65247.tar"; + sha256 = "03xz1ig3zsbwixa4hkh7g9ihjxlw2jmzydqldkvjsyv1yhyyf2j4"; }; packageRequires = [ emacs ]; meta = { @@ -4820,7 +4811,7 @@ version = "0.1.0.20231126.141402"; src = fetchurl { url = "https://elpa.gnu.org/devel/pinentry-0.1.0.20231126.141402.tar"; - sha256 = "1dc6sd80jrwv2sl679fycd4b3ss7n5c252vy61mv8alpn4vr4jdd"; + sha256 = "056h9zfbk4mfpvfpli2kr48i5cdcrf73v15id0dk762iy7iz38af"; }; packageRequires = []; meta = { @@ -4832,10 +4823,10 @@ elpaBuild { pname = "plz"; ename = "plz"; - version = "0.8pre0.20240114.34705"; + version = "0.8.0.20240425.201348"; src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-0.8pre0.20240114.34705.tar"; - sha256 = "06wb543xci5h26cpazdwxgb6haf03yrmx7iwb5d2ja4rv50cirl3"; + url = "https://elpa.gnu.org/devel/plz-0.8.0.20240425.201348.tar"; + sha256 = "00kprdnnz584fa2r8mkn4wzyk4fyxgn5d22z6s5c6lag0il1bjvc"; }; packageRequires = [ emacs ]; meta = { @@ -4850,7 +4841,7 @@ version = "0.1.0.20231101.73512"; src = fetchurl { url = "https://elpa.gnu.org/devel/plz-see-0.1.0.20231101.73512.tar"; - sha256 = "1nqlv1ww8ba2a40bg3riv5w1sgj8cmhx6bldyzcgs88cpjjkia79"; + sha256 = "09ibjvd9wvndrygnfq0jic7m9bk6v490rk1k3b4qjvv5xfvsvvhq"; }; packageRequires = [ emacs plz ]; meta = { @@ -4865,7 +4856,7 @@ version = "3.2.0.20230517.100500"; src = fetchurl { url = "https://elpa.gnu.org/devel/poke-3.2.0.20230517.100500.tar"; - sha256 = "0y5qrnqlhvvynvd1fknl0xp9d8bq55bnn2ms6lpbr0sd7ixh24qq"; + sha256 = "0p12szh563vynl7h9j55v7373g43fhmsy03iibvnywaira4arw5l"; }; packageRequires = [ emacs ]; meta = { @@ -4882,7 +4873,7 @@ version = "3.1.0.20231014.222558"; src = fetchurl { url = "https://elpa.gnu.org/devel/poke-mode-3.1.0.20231014.222558.tar"; - sha256 = "0n73viyn9wia6qpbjilipf69lrmv11avznpbl6cmry3rryzdyn38"; + sha256 = "1aqw9rn17n7ywnys6dlwykrf63l4kgapqsk1fay5qjj0y1nkq167"; }; packageRequires = []; meta = { @@ -4897,7 +4888,7 @@ version = "0.2.0.20221221.81510"; src = fetchurl { url = "https://elpa.gnu.org/devel/poker-0.2.0.20221221.81510.tar"; - sha256 = "048i3l2z7pkxaphmb731cks0bw3w07arnpls2smm4dv51js14g5j"; + sha256 = "14xc4jpkpy88drijp19znfhlyv61p2fx2l3zqsqbl3br2xwxy219"; }; packageRequires = []; meta = { @@ -4915,7 +4906,7 @@ version = "0.2.2.0.20230317.121821"; src = fetchurl { url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20230317.121821.tar"; - sha256 = "129k592y80jixsff2h0bjvn1z1mcl9lwl4gc2sk1fg3vdq6984ng"; + sha256 = "17dl20fzn15km0d2ypsrzij247yjr3nx5lk1sn5hwr3dvsapvagz"; }; packageRequires = [ emacs ]; meta = { @@ -4930,7 +4921,7 @@ version = "0.4.6.0.20240323.172152"; src = fetchurl { url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20240323.172152.tar"; - sha256 = "14k8shc3w1kc8yz3i1rm02qdyjkxbyyypl2phm9650dvwhwxibxg"; + sha256 = "1avpaza4w7hav5x7wz6jvk0gacxas11cdlpggx9chjlp0klns0v2"; }; packageRequires = [ emacs ]; meta = { @@ -4945,10 +4936,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.4.2.0.20230714.22752"; + version = "1.4.3.0.20240426.60433"; src = fetchurl { - url = "https://elpa.gnu.org/devel/posframe-1.4.2.0.20230714.22752.tar"; - sha256 = "0v3g4z36gm87z4ar7r4q86alscl6r64wd7y3wf55ngbhb84fh02r"; + url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240426.60433.tar"; + sha256 = "1j5l16z765wz5qs1x49vpkmj1cbxbsa69wlrf19r4qc7b6gijzm5"; }; packageRequires = [ emacs ]; meta = { @@ -4963,7 +4954,7 @@ version = "0.2.0.20240317.135839"; src = fetchurl { url = "https://elpa.gnu.org/devel/pq-0.2.0.20240317.135839.tar"; - sha256 = "0hfngsg0hqqrkm55q0ds09bprbpf7km7ry0s4y2lmvyybfaszkla"; + sha256 = "0hva6d8iqqdvnllm7cssxrmn21alcb2aa4d6874bqdfqjij2hw1z"; }; packageRequires = [ emacs ]; meta = { @@ -4980,7 +4971,7 @@ version = "0.0.20221212.225529"; src = fetchurl { url = "https://elpa.gnu.org/devel/prefixed-core-0.0.20221212.225529.tar"; - sha256 = "10a58xidv1b9yz8bps4ihhx5fl4w337695jmm66dpmphjvmr0hi4"; + sha256 = "1b9bikccig8l96fal97lv6gajjip6qmbkx21y0pndfbw2kaamic4"; }; packageRequires = []; meta = { @@ -4996,10 +4987,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.10.0.0.20240315.22845"; + version = "0.10.0.0.20240415.22959"; src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240315.22845.tar"; - sha256 = "0l0aqa5xyj1wj3wxvbvyjx32cjq405dkp10fmy9ydb80a44l8jyw"; + url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240415.22959.tar"; + sha256 = "0clz75455r6pzjcj9jbpqgi201plmm4094nz7s19xmq1ifll9pzy"; }; packageRequires = [ emacs xref ]; meta = { @@ -5014,7 +5005,7 @@ version = "1.3.5.0.20221229.184738"; src = fetchurl { url = "https://elpa.gnu.org/devel/psgml-1.3.5.0.20221229.184738.tar"; - sha256 = "055dpaylampjl53vby2b2lvmyfgjqjy64mpda6inmbc93jd3rq90"; + sha256 = "1zdfdzbadrbj6g4k2q7w5yvxvblpwn4mkihmnmag7jym66r4wmnb"; }; packageRequires = []; meta = { @@ -5029,7 +5020,7 @@ version = "1.1.0.20221221.81719"; src = fetchurl { url = "https://elpa.gnu.org/devel/pspp-mode-1.1.0.20221221.81719.tar"; - sha256 = "0awha64p3dyqpahsyr7dbhkprq3mizv239g6q4jiws6laqk54gqz"; + sha256 = "010qckmc85wc4i7k1rmhffcdbpxpvs6p5qxdvr6g3ws00c1a3j4l"; }; packageRequires = []; meta = { @@ -5044,7 +5035,7 @@ version = "1.0.1.0.20240117.25720"; src = fetchurl { url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20240117.25720.tar"; - sha256 = "1cqm3ap285gfpbvlk6lckc09ypw2vzv0z1r157pqbaffqqca9vi5"; + sha256 = "09qq4cribybn86s6dz77rbmazzl3c88305brkiza2pn2cg10g8xw"; }; packageRequires = [ emacs ]; meta = { @@ -5056,10 +5047,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "5.3.3.0.20230908.3908"; + version = "5.3.3.0.20240407.80210"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pyim-5.3.3.0.20230908.3908.tar"; - sha256 = "1x9bm67h6314zwd25kjrh5c59icf6v6y7vr0n5k05zvcr7mhw98z"; + url = "https://elpa.gnu.org/devel/pyim-5.3.3.0.20240407.80210.tar"; + sha256 = "1vk0q0wczr9yiwm89kljdlsil7plr2z0cr5sw48fxy4dzgjdjkfb"; }; packageRequires = [ async emacs xr ]; meta = { @@ -5076,7 +5067,7 @@ version = "0.5.4.0.20220614.110824"; src = fetchurl { url = "https://elpa.gnu.org/devel/pyim-basedict-0.5.4.0.20220614.110824.tar"; - sha256 = "0bf6fwjid16xhdyxaj229xra94qv5zaqwajqccd0y32bpw3ldf9f"; + sha256 = "0md12ysqcmz737vcs8wh561zl8s98w04cgzs69pbdnzzxas7iy2j"; }; packageRequires = []; meta = { @@ -5088,10 +5079,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.28.0.20240314.140956"; + version = "0.28.0.20240427.62346"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20240314.140956.tar"; - sha256 = "1ikh9qj1dd7002wxfgppngja32yw81i799ymsxwgrypy3xidxxpa"; + url = "https://elpa.gnu.org/devel/python-0.28.0.20240427.62346.tar"; + sha256 = "1knzsgi2g40b9ba5s81653h913mlsh71y83b8qc71v9l16lgy1fg"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -5108,7 +5099,7 @@ version = "0.1.0.20221221.81727"; src = fetchurl { url = "https://elpa.gnu.org/devel/quarter-plane-0.1.0.20221221.81727.tar"; - sha256 = "17ahmyi0jih6jxplw5lpw50yq2rji8y7irgpxsd65xxj3fzydjrr"; + sha256 = "1s0fl9sxjhv0sl5ikvkhdnddjg1n2hzw0a64xcvm8859dk77fmy8"; }; packageRequires = []; meta = { @@ -5123,7 +5114,7 @@ version = "0.2.0.20210306.173709"; src = fetchurl { url = "https://elpa.gnu.org/devel/queue-0.2.0.20210306.173709.tar"; - sha256 = "0sp42hjqdhyc3jayjrn2zrcz4rqn3ww9yqhq9nl8rwxh9b9xk4x4"; + sha256 = "09iicl5fdpli6jnvdj0h8cwj7wqqmxnfzdd57vfjdq09v3sjkljs"; }; packageRequires = [ cl-lib ]; meta = { @@ -5140,7 +5131,7 @@ version = "1.0.6.0.20231215.171141"; src = fetchurl { url = "https://elpa.gnu.org/devel/rainbow-mode-1.0.6.0.20231215.171141.tar"; - sha256 = "0j74lyl90wddqn2hg2pgji48gvgh1kg56jksrhfr29ykdp6rfzf0"; + sha256 = "0qr0yl8fszrrdnl8x3d8lnndr5s9g3bf708qilb3f6i5ahkqhq7l"; }; packageRequires = []; meta = { @@ -5155,7 +5146,7 @@ version = "0.1.0.20201128.182847"; src = fetchurl { url = "https://elpa.gnu.org/devel/rbit-0.1.0.20201128.182847.tar"; - sha256 = "0n16yy2qbgiv1ykzhga62j8w8dwawb1b8z7qq7mkpxwbyd44c1i3"; + sha256 = "1ajjfkih0dji2mdsvcpdzmb32nv20niryl8x17ki1016302qfvdj"; }; packageRequires = []; meta = { @@ -5173,7 +5164,7 @@ version = "0.4.5.0.20230414.195045"; src = fetchurl { url = "https://elpa.gnu.org/devel/rcirc-color-0.4.5.0.20230414.195045.tar"; - sha256 = "0d0q5nvndpzxl0f8q6ahbia2j4mk4k9h1krw09n44i7jg45277v4"; + sha256 = "1amlzg7njbmk1kbb569ygx2az7vd7py89z9aq9cmf5rm15hjsm59"; }; packageRequires = [ emacs ]; meta = { @@ -5190,7 +5181,7 @@ version = "1.1.0.20221221.81818"; src = fetchurl { url = "https://elpa.gnu.org/devel/rcirc-menu-1.1.0.20221221.81818.tar"; - sha256 = "08cqb3p76qanii46vvpn31ngz4zjqwfplnrfwdlg12pnhz75fx0m"; + sha256 = "0gd19rzqgqb9w5cfpr1rz719k5z1rfkn8480b0h1zkvgpgmdrzbx"; }; packageRequires = []; meta = { @@ -5205,10 +5196,10 @@ elpaBuild { pname = "rcirc-sqlite"; ename = "rcirc-sqlite"; - version = "0.1.4.0.20240226.165830"; + version = "1.0.1.0.20240422.191938"; src = fetchurl { - url = "https://elpa.gnu.org/devel/rcirc-sqlite-0.1.4.0.20240226.165830.tar"; - sha256 = "1j16p0i9yyv229f4jcq10vwld01yda6gdv7n5a0ap0xk5qhaj67k"; + url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.1.0.20240422.191938.tar"; + sha256 = "1nspv7qgwzjpy9jsgh3m75iimy8piicimv9r82ahm5vrpaxkwg3p"; }; packageRequires = [ emacs ]; meta = { @@ -5229,7 +5220,7 @@ version = "1.5.1.0.20231113.141045"; src = fetchurl { url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20231113.141045.tar"; - sha256 = "1lidmlrsg0jax0mmsxgpjk70x4i4vhiv5ira744rj7m3w0mwgmrw"; + sha256 = "1nvmpbnx31fdi2ps243xx6cnvhmyv9n1kvb98ydnxydmalxs4iva"; }; packageRequires = [ emacs load-relative loc-changes test-simple ]; meta = { @@ -5249,7 +5240,7 @@ version = "1.0.0.0.20231216.160636"; src = fetchurl { url = "https://elpa.gnu.org/devel/realgud-ipdb-1.0.0.0.20231216.160636.tar"; - sha256 = "1ih8dg1fm9bwg33zg353zzsnb84qc5p16flnj1rx9wyvblzx0v0q"; + sha256 = "1s08gngzq18bgxdc6qpsg7j9wjqq842wj5bki2l8jgyqpin6g3h5"; }; packageRequires = [ emacs load-relative realgud ]; meta = { @@ -5269,7 +5260,7 @@ version = "1.0.0.0.20200722.72030"; src = fetchurl { url = "https://elpa.gnu.org/devel/realgud-jdb-1.0.0.0.20200722.72030.tar"; - sha256 = "1dmgw2bdwh20wr4yi66aamj48pkzmaz3ilhdx68qsirw5n48qg83"; + sha256 = "1vh4x50gcy5i9v9pisn0swmv0ighksn8ni68pdwxkns5ka99qqi6"; }; packageRequires = [ emacs load-relative realgud ]; meta = { @@ -5289,7 +5280,7 @@ version = "1.0.2.0.20230319.171320"; src = fetchurl { url = "https://elpa.gnu.org/devel/realgud-lldb-1.0.2.0.20230319.171320.tar"; - sha256 = "15azvxwq861i6j61sj0240mxdq725wbln1wpim5pn45wzqh56zmv"; + sha256 = "0isnyflg507qngv8xjw8zwzwh4qy0d3c123d5rirwbissjcfxmrs"; }; packageRequires = [ emacs load-relative realgud ]; meta = { @@ -5310,7 +5301,7 @@ version = "1.0.0.0.20190525.123417"; src = fetchurl { url = "https://elpa.gnu.org/devel/realgud-node-debug-1.0.0.0.20190525.123417.tar"; - sha256 = "1w4n28pv65yzkz8lzn3sicz4il7gx4gxwgzwc6sp21yhb05kfz09"; + sha256 = "1s5zav3d0xdj0jggw3znfzb43d9jrnzaafk51wiachh7j673gjjv"; }; packageRequires = [ cl-lib emacs load-relative realgud ]; meta = { @@ -5331,7 +5322,7 @@ version = "1.0.0.0.20190526.154549"; src = fetchurl { url = "https://elpa.gnu.org/devel/realgud-node-inspect-1.0.0.0.20190526.154549.tar"; - sha256 = "1ds40vq756b8vkc7yqacrgm72jj09kq92dprqlmr215r7s8fdglk"; + sha256 = "0hss16d3avyisdxp1xhzjqn2kd9xc3vkqg4ynsgvxampzli78fw9"; }; packageRequires = [ cl-lib emacs load-relative realgud ]; meta = { @@ -5351,7 +5342,7 @@ version = "1.0.1.0.20210513.183733"; src = fetchurl { url = "https://elpa.gnu.org/devel/realgud-trepan-ni-1.0.1.0.20210513.183733.tar"; - sha256 = "1gly5hvndc0hg1dfn9b12hbxa0wnlbz8zw9jzjzz5kj2d0fzjswx"; + sha256 = "0p7sc7g1nwg1hyvgx5mzs2qpjnrayp7brw720kzxfxnxdfj7p0gj"; }; packageRequires = [ emacs load-relative realgud ]; meta = { @@ -5371,7 +5362,7 @@ version = "1.0.1.0.20230322.184556"; src = fetchurl { url = "https://elpa.gnu.org/devel/realgud-trepan-xpy-1.0.1.0.20230322.184556.tar"; - sha256 = "01h2v8jy0dl1xf7k938iinwkfb4zxrfr73z9s6jc59rrbybsqvha"; + sha256 = "0m9pwqbkhwkm9fys7rs2lapydkinh4v7q3q3j8b0qb0nl8qcni7i"; }; packageRequires = [ emacs load-relative realgud ]; meta = { @@ -5389,7 +5380,7 @@ version = "1.9.3.0.20231120.221944"; src = fetchurl { url = "https://elpa.gnu.org/devel/rec-mode-1.9.3.0.20231120.221944.tar"; - sha256 = "1k5ncn93vffa4yf84c1ri57lb1sfc9b5czvwvsiijlgci2795j91"; + sha256 = "1vi5fkxfjfq7z0dc3vhdknzw8id5a1fm0zaxr3y09np7z6n3iv7z"; }; packageRequires = [ emacs ]; meta = { @@ -5406,7 +5397,7 @@ version = "0.1.0.20221212.230034"; src = fetchurl { url = "https://elpa.gnu.org/devel/register-list-0.1.0.20221212.230034.tar"; - sha256 = "1b0099yhvjd69xvcdvn65nx49xay06n2qzafw6fnn7qi22nbvah7"; + sha256 = "02qc5ll26br1smx5d0ci3wm0s4hdj8sw72xdapn5bql5509n75dx"; }; packageRequires = []; meta = { @@ -5418,10 +5409,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.24.0.20240123.121000"; + version = "1.24.0.20240401.74454"; src = fetchurl { - url = "https://elpa.gnu.org/devel/relint-1.24.0.20240123.121000.tar"; - sha256 = "11482r6h8b0n2ga74mi57nhf9zym2ignii6gfdivrlw8bgmnl1jx"; + url = "https://elpa.gnu.org/devel/relint-1.24.0.20240401.74454.tar"; + sha256 = "07q0571ks81al09xl1ms52rznp6y7scvlnh2ax1nj67f3jmikzcd"; }; packageRequires = [ emacs xr ]; meta = { @@ -5439,7 +5430,7 @@ version = "1.2.4.0.20240108.130348"; src = fetchurl { url = "https://elpa.gnu.org/devel/repology-1.2.4.0.20240108.130348.tar"; - sha256 = "1w1aisspx5zvj1a2hmnnd93wra1kjizid7sr8kqkwsyva5c03wvd"; + sha256 = "1ybr0zn647sb6gfqrm6ahdkx3q30j2b0gaab335nkc7jqx1ba565"; }; packageRequires = [ emacs ]; meta = { @@ -5457,7 +5448,7 @@ version = "1.0.3.0.20190419.83620"; src = fetchurl { url = "https://elpa.gnu.org/devel/rich-minority-1.0.3.0.20190419.83620.tar"; - sha256 = "08xdd9gmay0xi2dzk08n30asfzqkhxqfrlvs099pxdd0klgsz60m"; + sha256 = "0kx516s0kv8ni3w408hb9bpnig83bv4m1l7b5lhdigmp8zvqm8jm"; }; packageRequires = [ cl-lib ]; meta = { @@ -5472,7 +5463,7 @@ version = "0.3.0.20221221.81910"; src = fetchurl { url = "https://elpa.gnu.org/devel/rnc-mode-0.3.0.20221221.81910.tar"; - sha256 = "1jyi7z0y31c994x9l6pv2j4bkc7m1lrhzk92xdvar003zvll32q9"; + sha256 = "1rdz1g440sjzxcqc4p2s0vv525ala4k470ddn4h9ghljnncqbady"; }; packageRequires = []; meta = { @@ -5489,7 +5480,7 @@ version = "7.0.20240306.83828"; src = fetchurl { url = "https://elpa.gnu.org/devel/rt-liberation-7.0.20240306.83828.tar"; - sha256 = "1bykgygci149vn2s722xg5bn0kp6srjb8mf5rygvy5h32lfdc4r9"; + sha256 = "1gz0hiwl8qqf1adxwgr8ly98pymqjrl3jjfly5r182l3rwp82gsh"; }; packageRequires = []; meta = { @@ -5506,7 +5497,7 @@ version = "0.4.3.0.20230205.12506"; src = fetchurl { url = "https://elpa.gnu.org/devel/ruby-end-0.4.3.0.20230205.12506.tar"; - sha256 = "0l2dbpmhimqb8q5zjjmrf0lriwff4vwwrsba61fiyd3lzk0v0hl2"; + sha256 = "0cr18s311c986gwx12f6fmnqwyqb4fh7j6h8m2cgp767vn4aqwxl"; }; packageRequires = []; meta = { @@ -5527,7 +5518,7 @@ version = "0.3.2.0.20221212.230154"; src = fetchurl { url = "https://elpa.gnu.org/devel/rudel-0.3.2.0.20221212.230154.tar"; - sha256 = "1q3a4j14ww5wjyxr8b7ksqcckvm8cx44jy9sl117s7g9if48yn03"; + sha256 = "0lcdc0gdqkl4disr9rwn1dmziwaiwnsyhfwvf02vrgpabd7dq95w"; }; packageRequires = [ cl-generic cl-lib cl-print emacs ]; meta = { @@ -5542,7 +5533,7 @@ version = "0.2.0.20220223.202624"; src = fetchurl { url = "https://elpa.gnu.org/devel/satchel-0.2.0.20220223.202624.tar"; - sha256 = "0akcfjfw69r504qkcwr81vrxjhvkpmf19vy9d0dzlgc9v5m3p1h1"; + sha256 = "1x558csdfahlp459m4bb827yayrzgisaijzbpxbl1pjhq595585d"; }; packageRequires = [ emacs project ]; meta = { @@ -5557,7 +5548,7 @@ version = "0.2.0.20210104.105054"; src = fetchurl { url = "https://elpa.gnu.org/devel/scanner-0.2.0.20210104.105054.tar"; - sha256 = "1az7rg4n744ya0ba9fcggqhm3mjhpzwzhygyracsx7n5gry5slgv"; + sha256 = "1ah74y9ragw3kycqwgxkmnxrzl7s2n43cjpw6r25hmbyzjnhdppm"; }; packageRequires = [ dash emacs ]; meta = { @@ -5574,7 +5565,7 @@ version = "1.0.0.20221221.81959"; src = fetchurl { url = "https://elpa.gnu.org/devel/scroll-restore-1.0.0.20221221.81959.tar"; - sha256 = "08x45fk4m4pg33rdy911hhmnp5kvx2l1dq94s108nk5wznbzx578"; + sha256 = "04xhshjm5fr5q85srmjhvm20l0zljgbdsy1f3g3lczgzqrwvyg9f"; }; packageRequires = []; meta = { @@ -5589,7 +5580,7 @@ version = "1.1.0.20230721.154631"; src = fetchurl { url = "https://elpa.gnu.org/devel/sed-mode-1.1.0.20230721.154631.tar"; - sha256 = "1mp4xyca7g29vn5c7dl3dw3ng9n5kiryvdgrmqrha13ppyqqzd5x"; + sha256 = "1gb7m8w5v0ay8mcm7alyixsnmndivd24467v58rkj0bpf7bmfa5v"; }; packageRequires = []; meta = { @@ -5604,7 +5595,7 @@ version = "2.24.0.20240201.135317"; src = fetchurl { url = "https://elpa.gnu.org/devel/seq-2.24.0.20240201.135317.tar"; - sha256 = "15lmvz72pq94bf10rk7m327lrvk9680wjfx07289w7qcqq98k1y9"; + sha256 = "0plr9pbvzd5cfivj90n0jm920hp2x1giy9889pr8x5bqqnba6j66"; }; packageRequires = []; meta = { @@ -5616,10 +5607,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "1.3.2.0.20240201.73543"; + version = "1.4.0.0.20240413.75454"; src = fetchurl { - url = "https://elpa.gnu.org/devel/setup-1.3.2.0.20240201.73543.tar"; - sha256 = "1rrms6x9jrd4zbm2km7db86j0ak1cmdblrja1dcc089p9pff7l90"; + url = "https://elpa.gnu.org/devel/setup-1.4.0.0.20240413.75454.tar"; + sha256 = "1ryxa0991mzvx2ai4bkmjxnikpnalmr4gdggakfg8i8ag65149rn"; }; packageRequires = [ emacs ]; meta = { @@ -5636,7 +5627,7 @@ version = "1.0.0.0.20221212.230255"; src = fetchurl { url = "https://elpa.gnu.org/devel/shelisp-1.0.0.0.20221212.230255.tar"; - sha256 = "0n673afq17fp3h3chs0acszv72dkqj9yd5x2ll6jgkyk74dka0fm"; + sha256 = "0kk24mkmm4imf7gsr7xihj3xf2y9mgy61gpyql0wms1vlmkl0mwk"; }; packageRequires = []; meta = { @@ -5654,7 +5645,7 @@ version = "2.4.2.0.20240313.182825"; src = fetchurl { url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240313.182825.tar"; - sha256 = "06yffzhfjgbqr4nsk1f098qmr72818n8466i2g75j03vmzacbzgd"; + sha256 = "17rqdk23w41dl44imrk6b7p3r4g0ldppj84hp7s6w7amx6fia7ah"; }; packageRequires = [ emacs ]; meta = { @@ -5671,7 +5662,7 @@ version = "0.0.20221221.82030"; src = fetchurl { url = "https://elpa.gnu.org/devel/shell-quasiquote-0.0.20221221.82030.tar"; - sha256 = "1mvz4y9jkkp96cf0ppmpzdzh86q1xrhx6yb9l93941qm33j0z4p8"; + sha256 = "0g2yq64yyim35lvxify65kq3y49qrvgri7jyl9rgz8999gb3h8dj"; }; packageRequires = []; meta = { @@ -5686,7 +5677,7 @@ version = "0.1.0.20221221.82050"; src = fetchurl { url = "https://elpa.gnu.org/devel/shen-mode-0.1.0.20221221.82050.tar"; - sha256 = "1r0kgk46hk2dk0923az6g44bmikrb2dxn9p5v4a9r1680yfgf0bn"; + sha256 = "17ygb1c0x52n3cnmvaacrcf7m6qdjxdqaw1pn7lg3899kl45dh3r"; }; packageRequires = []; meta = { @@ -5703,7 +5694,7 @@ version = "7.1.8.0.20221221.82114"; src = fetchurl { url = "https://elpa.gnu.org/devel/sisu-mode-7.1.8.0.20221221.82114.tar"; - sha256 = "18l11bvwp57gjh4v5w6pdslqbdc250hidrj5nlm4p5rfll5647ri"; + sha256 = "1cyynn3sk8wxfhiz5q0lqwq07kqy67s2rvjql62880in5m5r2jpa"; }; packageRequires = []; meta = { @@ -5721,7 +5712,7 @@ version = "0.1.2.0.20240308.82403"; src = fetchurl { url = "https://elpa.gnu.org/devel/site-lisp-0.1.2.0.20240308.82403.tar"; - sha256 = "0hc811pinqr9swg9764aibyfar33n8nk733pzfgn70rdyxszl9h5"; + sha256 = "0c9r5pp2lr4wmpcfa8qz0xvq1vhzyhvnn14kawjarhx9p5mvgdq1"; }; packageRequires = [ emacs ]; meta = { @@ -5738,7 +5729,7 @@ version = "1.0.4.0.20230420.122954"; src = fetchurl { url = "https://elpa.gnu.org/devel/sketch-mode-1.0.4.0.20230420.122954.tar"; - sha256 = "1vyzwrph9ifqbwlqprglk1fnlx9hnxm0caq9bxk9az8h021zzzha"; + sha256 = "0ssh1v49h94gvchpynvjcsw80swpcdw541zxxhxm5zi6gsnyhnjd"; }; packageRequires = []; meta = { @@ -5756,7 +5747,7 @@ version = "1.2.0.0.20221221.82156"; src = fetchurl { url = "https://elpa.gnu.org/devel/slime-volleyball-1.2.0.0.20221221.82156.tar"; - sha256 = "0ys6r0vg43x0hdfc9kl2s8djk8zd4253x93prhbcakpsa7p4jb5v"; + sha256 = "015qpac86km7czpqr2f7xpjlkwbq9s4z9jl0dnr8b2bzh0iwqiik"; }; packageRequires = [ cl-lib ]; meta = { @@ -5764,16 +5755,14 @@ license = lib.licenses.free; }; }) {}; - sm-c-mode = callPackage ({ elpaBuild - , fetchurl - , lib }: + sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "sm-c-mode"; ename = "sm-c-mode"; - version = "1.1.0.20240101.165603"; + version = "1.2.0.20240404.93144"; src = fetchurl { - url = "https://elpa.gnu.org/devel/sm-c-mode-1.1.0.20240101.165603.tar"; - sha256 = "00nh3fr57la0zj36c47rwjdkc7a3imvpc5jqh4pg98zn12mi1jdz"; + url = "https://elpa.gnu.org/devel/sm-c-mode-1.2.0.20240404.93144.tar"; + sha256 = "1xbkdvhxaffk6csav2ivbrqv85rkb4arnsslp2ji13alkm5hx1zx"; }; packageRequires = []; meta = { @@ -5790,7 +5779,7 @@ version = "4.0.0.20221221.82225"; src = fetchurl { url = "https://elpa.gnu.org/devel/smalltalk-mode-4.0.0.20221221.82225.tar"; - sha256 = "0na04h27bxy6mqdx7mp5ys4bjvpmxfp19nh40jh6j584dchb8y3k"; + sha256 = "1qk0z1gddw7fidvj429ivjwnxb4f5g074r531nmpvmy2l7srchd9"; }; packageRequires = []; meta = { @@ -5808,7 +5797,7 @@ version = "0.1.1.0.20221221.82231"; src = fetchurl { url = "https://elpa.gnu.org/devel/smart-yank-0.1.1.0.20221221.82231.tar"; - sha256 = "1dhnzvw3igrzp12lcbqp9dpmzidawhyc9a5ryyp29qxqh539c2qm"; + sha256 = "17w9ybfvdsnsy1vf1mg7a4428rna49i2yfifrp20srj8c0dapwzd"; }; packageRequires = [ emacs ]; meta = { @@ -5823,7 +5812,7 @@ version = "6.12.0.20230411.5343"; src = fetchurl { url = "https://elpa.gnu.org/devel/sml-mode-6.12.0.20230411.5343.tar"; - sha256 = "0qq1naxx7hhfi5q78vnw0s9vw6aign8kb08vlcj45xz4sp2w4nlj"; + sha256 = "1a7n0lvrjq4xnn0cr6qwgh7l54m95mf2nxwv1rplair4r8si8y0d"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -5838,7 +5827,7 @@ version = "1.1.2.0.20240102.22814"; src = fetchurl { url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20240102.22814.tar"; - sha256 = "0865xyx76pq2i0fgqm31vh79alrqqbp6pqzcmadlaxd8jhfck6yq"; + sha256 = "0fq1c34jlp9jc3zz4rrf9zz6mww0ydm3lh0zrfy3qgssj248ghmy"; }; packageRequires = [ emacs ]; meta = { @@ -5857,7 +5846,7 @@ version = "3.2.3.0.20240102.22814"; src = fetchurl { url = "https://elpa.gnu.org/devel/soap-client-3.2.3.0.20240102.22814.tar"; - sha256 = "1mjrb4nsphab8mf5cjjph4dy12v1mzr0x6kxkddp5dwdlpyprn7s"; + sha256 = "084svzsb2rrqxvb76qxnwdj64kn364dqgbgdpymqngihngyr88fb"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -5876,7 +5865,7 @@ version = "1.4.9.0.20220928.185052"; src = fetchurl { url = "https://elpa.gnu.org/devel/sokoban-1.4.9.0.20220928.185052.tar"; - sha256 = "19df4wdhrpn1rb927jg131hjwackaldra1rvxaq31zfd3rlj4dp8"; + sha256 = "1d3s1v81mvfjcq5bbf0338ldxgl2rymqb3vqqw7drbics4jq5fc0"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -5891,7 +5880,7 @@ version = "1.6.2.0.20220909.50328"; src = fetchurl { url = "https://elpa.gnu.org/devel/sotlisp-1.6.2.0.20220909.50328.tar"; - sha256 = "14jlvdhncm7fp5ajnzp931gbpnqg97ysiis0ajwkmwan3mmxlv89"; + sha256 = "1g48ahiwdipk4ckynqipsfradd1qafg59s10jkbpkp3wvfmxi5sf"; }; packageRequires = [ emacs ]; meta = { @@ -5909,7 +5898,7 @@ version = "0.4.1.0.20240311.74539"; src = fetchurl { url = "https://elpa.gnu.org/devel/spacious-padding-0.4.1.0.20240311.74539.tar"; - sha256 = "1alvy1am8fjlj0wlmzbpvjjgjcln25v0dc19rbwfgwm8pzbq2apn"; + sha256 = "1xgnplcvp73fpyi9rx5wbn0hjbcv65vlrb7dqkgjc0chaivp4dgm"; }; packageRequires = [ emacs ]; meta = { @@ -5924,7 +5913,7 @@ version = "1.7.4.0.20220915.94959"; src = fetchurl { url = "https://elpa.gnu.org/devel/spinner-1.7.4.0.20220915.94959.tar"; - sha256 = "0n5xmq7iay11pxlj5av4wnx477jz48ac87838pppks9mmsaj24a7"; + sha256 = "1110bxj7vgai0wgsqbd9917k72xmalyfy0rlwqp46azg02ljam6j"; }; packageRequires = [ emacs ]; meta = { @@ -5941,7 +5930,7 @@ version = "0.2.0.20221221.82329"; src = fetchurl { url = "https://elpa.gnu.org/devel/sql-beeline-0.2.0.20221221.82329.tar"; - sha256 = "0lfn5nvv2xns1l71as5vvsiyspn1d50rh9ki2sihhjs6rx8mprnw"; + sha256 = "0qfw9q5isyjywlm2fyaazci24jza6h4s50i0zmjk35j6spyxwffs"; }; packageRequires = []; meta = { @@ -5959,7 +5948,7 @@ version = "0.2.2.0.20221221.82336"; src = fetchurl { url = "https://elpa.gnu.org/devel/sql-cassandra-0.2.2.0.20221221.82336.tar"; - sha256 = "1daljwlbs6ng64rcmpgzf5ac8diaapraqwc7j2f3v6z6rw261f97"; + sha256 = "1rl2bdjyglzssm00zdfqidd9j7jzizxaq60bclqa5dsz80zsd6aq"; }; packageRequires = [ emacs ]; meta = { @@ -5977,7 +5966,7 @@ version = "1.7.0.20240323.40057"; src = fetchurl { url = "https://elpa.gnu.org/devel/sql-indent-1.7.0.20240323.40057.tar"; - sha256 = "1gvb4inym802zjx721l7qwwmvahaqaw0v1qkm3kl36nqcx7ykp52"; + sha256 = "0zrsglgw2zjxn9810r022kanvfj0zrhvr696yxlnvd05f9hv9bpp"; }; packageRequires = [ cl-lib ]; meta = { @@ -5992,7 +5981,7 @@ version = "0.0.20221221.82351"; src = fetchurl { url = "https://elpa.gnu.org/devel/sql-smie-0.0.20221221.82351.tar"; - sha256 = "0pl47qr62gxjnwhf5ryc9xkbf75pr8fvqzi050c1g17jxjmbjfqa"; + sha256 = "05jv2k9gswwwyi19da8d5f176lb81qmnf94dvghyzh272v9iwvkr"; }; packageRequires = []; meta = { @@ -6007,7 +5996,7 @@ version = "0.4.0.20231117.115741"; src = fetchurl { url = "https://elpa.gnu.org/devel/srht-0.4.0.20231117.115741.tar"; - sha256 = "0az2gkxqhg8dlvjmcqjgz3p82mzc2j881j72pwzc79dyv3akd2aq"; + sha256 = "03wyfx0zhgfpbhwyxrbd6mj0465m82910l77r12gsg1vbk78l4l0"; }; packageRequires = [ emacs plz transient ]; meta = { @@ -6025,7 +6014,7 @@ version = "3.1.16.0.20230702.92809"; src = fetchurl { url = "https://elpa.gnu.org/devel/ssh-deploy-3.1.16.0.20230702.92809.tar"; - sha256 = "1kbwvfkz74q8qfk6735hhi1mwdijvgrhqvwjfnfv8x8sr73yldkp"; + sha256 = "0zjkc1gb3hpknx8012crcbdy3w1w597qk8qajhpaijhjhispm507"; }; packageRequires = [ emacs ]; meta = { @@ -6040,10 +6029,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "2.0.1.0.20240226.81513"; + version = "2.0.1.0.20240427.84421"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240226.81513.tar"; - sha256 = "1c4rqg59823syxd9izz8spi54yf0p2984vnpkk7r1kklzfszglmf"; + url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240427.84421.tar"; + sha256 = "09vmyjm148r1ajxlsrdqrgi988a2px5dn5z9k0l3lg88a38rxgz6"; }; packageRequires = [ emacs ]; meta = { @@ -6058,7 +6047,7 @@ version = "2.3.0.0.20230908.74447"; src = fetchurl { url = "https://elpa.gnu.org/devel/stream-2.3.0.0.20230908.74447.tar"; - sha256 = "1qpnns7miz4yj2qhjifm6xpbxwd4v0p360jdqdrvvbxl08cs49va"; + sha256 = "1zfw7plnlsijs8aw5726adjwd65g1x3xs4vcs3rcc2ybv8cz886s"; }; packageRequires = [ emacs ]; meta = { @@ -6076,7 +6065,7 @@ version = "0.2.1.0.20240117.30048"; src = fetchurl { url = "https://elpa.gnu.org/devel/substitute-0.2.1.0.20240117.30048.tar"; - sha256 = "1sprpnbbar0nwx3nx5rh7pfaxs7x105370zwbiz1xp7gm8w11lwy"; + sha256 = "1vkjg3w12r7j3dl5jx5wha412lknns37535vjd4x6xgk2rs3yvh0"; }; packageRequires = [ emacs ]; meta = { @@ -6091,7 +6080,7 @@ version = "1.1.0.20240102.22814"; src = fetchurl { url = "https://elpa.gnu.org/devel/svg-1.1.0.20240102.22814.tar"; - sha256 = "0yrh958hw3g0yc5gbqpnzqa37wkv0z6s824vg4mmbq5qqmzj4sqq"; + sha256 = "1ddz3zadwmm4am2ywwmrqj2a56kr73i45q7svjmgnljgvvs267b3"; }; packageRequires = [ emacs ]; meta = { @@ -6106,7 +6095,7 @@ version = "1.2.0.20221221.82408"; src = fetchurl { url = "https://elpa.gnu.org/devel/svg-clock-1.2.0.20221221.82408.tar"; - sha256 = "1ymg49fkacpay624dr0b5ggha68j83qlcca7jnidmm1v6cxq753j"; + sha256 = "15fshgjqv3995f2339rwvjw9vyiqz2lfs9h80gkmssha7fdfw3qx"; }; packageRequires = [ emacs svg ]; meta = { @@ -6121,7 +6110,7 @@ version = "0.3.0.20240219.161327"; src = fetchurl { url = "https://elpa.gnu.org/devel/svg-lib-0.3.0.20240219.161327.tar"; - sha256 = "1nc5ld90pklqwai4waimv41466ph2n5pr2myx1s2s5afq3m2fc0y"; + sha256 = "1qycnhjinmn1smajsniz34kv7jkl4gycjhsl6mxxjhq0432cw2fc"; }; packageRequires = [ emacs ]; meta = { @@ -6140,7 +6129,7 @@ version = "0.3.2.0.20240122.120925"; src = fetchurl { url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240122.120925.tar"; - sha256 = "0p4vfrq3p32j4w4qksqll9wmcc4mgi42qdxwg9gny7jjbvpnvk62"; + sha256 = "17qixxhy889l2v17pw3b2qrk2g6x4a7yfh0bzxfhlizq10sy24hz"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -6156,10 +6145,10 @@ elpaBuild { pname = "swiper"; ename = "swiper"; - version = "0.14.2.0.20240214.214428"; + version = "0.14.2.0.20240405.204232"; src = fetchurl { - url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20240214.214428.tar"; - sha256 = "15hncb6g90k3zc2scvammfc8hnw2p38xcn6c0d3vzfiqg12jlp6x"; + url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20240405.204232.tar"; + sha256 = "1b5dn8v6rm6m7b2agdxf50jkmrfx6ac8fnwyqabr3zzcshpl6ixm"; }; packageRequires = [ emacs ivy ]; meta = { @@ -6178,7 +6167,7 @@ version = "1.3.0.20230411.180529"; src = fetchurl { url = "https://elpa.gnu.org/devel/switchy-window-1.3.0.20230411.180529.tar"; - sha256 = "1x2y6rgbkj11c53kxybz3xslbaszm3pr6xzsx4s17sq1w4vv6dc4"; + sha256 = "1h3jib0qr8wj3xk3qha5yrw2vqhidnqhj4jhw2smrfk61vyfs83b"; }; packageRequires = [ compat emacs ]; meta = { @@ -6196,7 +6185,7 @@ version = "1.0.0.0.20240117.30132"; src = fetchurl { url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.0.0.0.20240117.30132.tar"; - sha256 = "0ys8nchp6ic6wivsgkd97z6v17mdszpldbz4n2bzl3aphhvfy5nf"; + sha256 = "0sbp6n6j7m0q4gj2x02q2f7ncwsji5jgy6d113n6qfain5ffj0fs"; }; packageRequires = [ emacs ]; meta = { @@ -6214,7 +6203,7 @@ version = "1.0.13.0.20230908.453"; src = fetchurl { url = "https://elpa.gnu.org/devel/system-packages-1.0.13.0.20230908.453.tar"; - sha256 = "1b7k3z9pnjzfzm903w4llyjda1j74fg5r10xh2n02hjfnlv0yh64"; + sha256 = "0qh4z6sik94hkms5nfharx2y8np2a1a2r9yrf8lw6xihdnd7bfcv"; }; packageRequires = [ emacs ]; meta = { @@ -6229,7 +6218,7 @@ version = "0.0.20221221.82418"; src = fetchurl { url = "https://elpa.gnu.org/devel/systemd-0.0.20221221.82418.tar"; - sha256 = "0df7y6ymx7gwlksa79h36ds6ap0c6mdnvw4nlj5qr54r2ri2rv1z"; + sha256 = "1ir3y4w2x1cl24zy66yym5rlpffgrcs10x4sxhb2sgg5k4d88scn"; }; packageRequires = [ cl-lib ]; meta = { @@ -6237,16 +6226,16 @@ license = lib.licenses.free; }; }) {}; - tNFA = callPackage ({ elpaBuild, fetchurl, lib, queue }: + tNFA = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, queue }: elpaBuild { pname = "tNFA"; ename = "tNFA"; - version = "0.1.1.0.20170804.211606"; + version = "0.1.1.0.20240405.140856"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tNFA-0.1.1.0.20170804.211606.tar"; - sha256 = "0h282s6lkpsxvjgajfraj9dbj3ac1amg3s0q3d6knr1xfwhi29zz"; + url = "https://elpa.gnu.org/devel/tNFA-0.1.1.0.20240405.140856.tar"; + sha256 = "0m2lh50bz56j5gdpjvan0sksgnlb3cszb28q69xni88hajacn4aw"; }; - packageRequires = [ queue ]; + packageRequires = [ cl-lib queue ]; meta = { homepage = "https://elpa.gnu.org/packages/tNFA.html"; license = lib.licenses.free; @@ -6259,7 +6248,7 @@ version = "0.1.0.20230920.103516"; src = fetchurl { url = "https://elpa.gnu.org/devel/tam-0.1.0.20230920.103516.tar"; - sha256 = "1asfy9kflslpmci639pjcb8pr9ndb4as1075lvy9xfk74lif4zx6"; + sha256 = "01w1vwb1ajmbk90c79wc0dc367sy5b5qdf471zr0xinajfv47709"; }; packageRequires = [ emacs ]; meta = { @@ -6274,7 +6263,7 @@ version = "0.10.1.0.20220919.160646"; src = fetchurl { url = "https://elpa.gnu.org/devel/taxy-0.10.1.0.20220919.160646.tar"; - sha256 = "03f3rwj01jqfz9pyr2wnd1qkg8165276l1pqlcdyaw7idvd4fc2i"; + sha256 = "0bld0sjni4ipbllrjnlwk5419454ac5s3mf6imw91z4ddk46vp18"; }; packageRequires = [ emacs ]; meta = { @@ -6294,7 +6283,7 @@ version = "0.13.0.20240124.3519"; src = fetchurl { url = "https://elpa.gnu.org/devel/taxy-magit-section-0.13.0.20240124.3519.tar"; - sha256 = "1zr1rbmfmhqq94rahas4gqk31ma0ym9p5p8f3i0h7z6ghby8y6xp"; + sha256 = "1z1cypw7g5vs8vrm1mjvfzxaasr8nz89w1br9dhk8wshyy4kmgf3"; }; packageRequires = [ emacs magit-section taxy ]; meta = { @@ -6312,7 +6301,7 @@ version = "1.5.0.20160804.124501"; src = fetchurl { url = "https://elpa.gnu.org/devel/temp-buffer-browse-1.5.0.20160804.124501.tar"; - sha256 = "060pbrrb33n5ghmyhblkl0paqj4m3g4028nwz65zxbd7irrj0fxz"; + sha256 = "0jw3fjbnbbrsz54hmg4rhcwrl0ag7h6873n2kdph3gjds29d8jxp"; }; packageRequires = [ emacs ]; meta = { @@ -6327,7 +6316,7 @@ version = "1.1.0.20240216.154335"; src = fetchurl { url = "https://elpa.gnu.org/devel/tempel-1.1.0.20240216.154335.tar"; - sha256 = "1zr32jc41shq73n9sl7hx8z3z49pwhvhwmnp6x4rjchvdn7xanyl"; + sha256 = "14zraddmfxnz7bzr9m2qk38hqy3bmd8ypq5x7ni8xapc6lyqd0pm"; }; packageRequires = [ compat emacs ]; meta = { @@ -6345,7 +6334,7 @@ version = "1.3.0.0.20230916.123447"; src = fetchurl { url = "https://elpa.gnu.org/devel/test-simple-1.3.0.0.20230916.123447.tar"; - sha256 = "0wd0br7bc2lis9iy3ilnwjiav971rp0n8iad60b2n2jdhcdwbk6s"; + sha256 = "1xbf63qg17va0qwq2mkg12jg1fk6wwrs43jjzxxccx28h6d205il"; }; packageRequires = [ cl-lib ]; meta = { @@ -6363,7 +6352,7 @@ version = "0.1.2.0.20240105.165329"; src = fetchurl { url = "https://elpa.gnu.org/devel/theme-buffet-0.1.2.0.20240105.165329.tar"; - sha256 = "1wd5nxypm2fy10lm8xy2ch9rmsrfmn1ang0br7yj5rjws2q833r6"; + sha256 = "1p1vmyl2cdm6vk45884jhrxjgd53mdch4wfkd1hx269v76zl58pa"; }; packageRequires = [ emacs ]; meta = { @@ -6382,7 +6371,7 @@ version = "1.4.2.0.20221221.82440"; src = fetchurl { url = "https://elpa.gnu.org/devel/timerfunctions-1.4.2.0.20221221.82440.tar"; - sha256 = "1bsqyf7v7ngk1pwxk4cgf35r019bnbvx6wrs3l1fvgmw1zgkqkqv"; + sha256 = "08spli0dfi882wrjcxjgk3zl4g4b5rlrvpyjmkgkzq6ix5z7w80j"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -6397,7 +6386,7 @@ version = "0.2.1.0.20220910.192941"; src = fetchurl { url = "https://elpa.gnu.org/devel/tiny-0.2.1.0.20220910.192941.tar"; - sha256 = "17wp68apkd57g4sm7lvr6iv527rkb8x3smz2lqns6yggrg64c1j2"; + sha256 = "04ybgq2ppzjpindwgypsp4sb0hmzq5k7sg9niyp18dxkj0nv1l7n"; }; packageRequires = []; meta = { @@ -6412,7 +6401,7 @@ version = "0.4.0.0.20240117.30342"; src = fetchurl { url = "https://elpa.gnu.org/devel/tmr-0.4.0.0.20240117.30342.tar"; - sha256 = "11n8xqah46j83b1bdghns6dm1wr9bfgi4hqab6as54rf6xiqlaiq"; + sha256 = "0sxxc9q97b64rl4kcp0zimlvsvxmdr447vmf8a9f74pddg1djvbw"; }; packageRequires = [ compat emacs ]; meta = { @@ -6427,7 +6416,7 @@ version = "0.4.3.0.20220511.213722"; src = fetchurl { url = "https://elpa.gnu.org/devel/tomelr-0.4.3.0.20220511.213722.tar"; - sha256 = "15rx89phls3hk0f2rfwpzb7igzyjvaiqasn9yvhwrmpq92dpd6hn"; + sha256 = "0vjhbz8lfhk84kgm8vd9lfn9qx60g40j7n3kx7iadk0p4842fpaa"; }; packageRequires = [ emacs map seq ]; meta = { @@ -6445,7 +6434,7 @@ version = "0.3.1.0.20230106.94110"; src = fetchurl { url = "https://elpa.gnu.org/devel/topspace-0.3.1.0.20230106.94110.tar"; - sha256 = "188q0jw3frbk6y37qxrq17dx3lfrwcac501z90cq8px6d0j3aq4k"; + sha256 = "179k6d4v4lw66gpb2lmf1zcz6ww1fr3ys0x992wd1r7mvlc070s8"; }; packageRequires = [ emacs ]; meta = { @@ -6453,17 +6442,32 @@ license = lib.licenses.free; }; }) {}; - tramp = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + track-changes = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "track-changes"; + ename = "track-changes"; + version = "1.1.0.20240419.221900"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/track-changes-1.1.0.20240419.221900.tar"; + sha256 = "16xvkp3fq89jbf87phk6yl9cbfmmgb8r376hh08kwrsmbpaz6bd2"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/track-changes.html"; + license = lib.licenses.free; + }; + }) {}; + tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.2.2.0.20240228.151226"; + version = "2.6.3.0.20240331.120258"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.6.2.2.0.20240228.151226.tar"; - sha256 = "0cv1mwksfcggsyv38kmldcxb702mv7kl4f5l20ilkypsl8ryjfyy"; + url = "https://elpa.gnu.org/devel/tramp-2.6.3.0.20240331.120258.tar"; + sha256 = "07358iw3skm59qjry7qggj2rggbdbghmw0yrbdpyabrqmdfv3li8"; }; packageRequires = [ emacs ]; meta = { @@ -6481,7 +6485,7 @@ version = "1.0.1.0.20220923.120957"; src = fetchurl { url = "https://elpa.gnu.org/devel/tramp-nspawn-1.0.1.0.20220923.120957.tar"; - sha256 = "11pjgxxyx5gx8xqj8nd8blg0998m57n3s7ydg17z4flfpizbycck"; + sha256 = "0mpr7d5vgfwsafbmj8lqc1k563b7qnjz1zq73rl8rb2km5jxczhn"; }; packageRequires = [ emacs ]; meta = { @@ -6499,7 +6503,7 @@ version = "0.2.0.20221221.82451"; src = fetchurl { url = "https://elpa.gnu.org/devel/tramp-theme-0.2.0.20221221.82451.tar"; - sha256 = "1bjfxs20gicn71q8lznmxj4665hv8vc5spj19jkvvhm16r7nh7mp"; + sha256 = "0x7wa17f2pnhd6nv7p2m5pafqqgpfp9n773qcmyxkawi4l5bp5d3"; }; packageRequires = [ emacs ]; meta = { @@ -6516,7 +6520,7 @@ version = "1.5.2.0.20221221.82457"; src = fetchurl { url = "https://elpa.gnu.org/devel/transcribe-1.5.2.0.20221221.82457.tar"; - sha256 = "0a5ld8ylsp4ahw4blxchbsynhr8ph651a1lhs0nrx6j2fh85jxqh"; + sha256 = "12xw9vxzqfr3pis49apdzc5bg0n30wfx0xa9kycdbcpda88f3z6h"; }; packageRequires = []; meta = { @@ -6533,10 +6537,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.6.0.0.20240321.220938"; + version = "0.6.0.0.20240414.135949"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.6.0.0.20240321.220938.tar"; - sha256 = "0ircfdybzzjxalcfcmd889b41c647fqdwybylri52hz3wh13iix4"; + url = "https://elpa.gnu.org/devel/transient-0.6.0.0.20240414.135949.tar"; + sha256 = "1rf1zszrfd02n4ky8n72sqzwb3zk16j92plflfc2wdrzaw9k2mmr"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -6554,7 +6558,7 @@ version = "1.0.0.20220410.130412"; src = fetchurl { url = "https://elpa.gnu.org/devel/transient-cycles-1.0.0.20220410.130412.tar"; - sha256 = "19pxd5s4ms9izj22v5abar7g12pn72vh870pmgh80d6kd8l9ifam"; + sha256 = "1rmgmlbjig866gr5jr89mv8ikvpf0p0pcgpa236nmiw3j6jsywa8"; }; packageRequires = [ emacs ]; meta = { @@ -6573,7 +6577,7 @@ version = "0.4.0.20240322.113138"; src = fetchurl { url = "https://elpa.gnu.org/devel/tree-inspector-0.4.0.20240322.113138.tar"; - sha256 = "0ic17jzzj5mqzdpg6hvwyas9s70jpqgfc96azmmb3mhpvs6xwak2"; + sha256 = "15k30zdbr8cr88z00dn2jfnybrhkmp769pc361v9n4mdgapwmiap"; }; packageRequires = [ emacs treeview ]; meta = { @@ -6588,7 +6592,7 @@ version = "0.6.0.20231015.13107"; src = fetchurl { url = "https://elpa.gnu.org/devel/trie-0.6.0.20231015.13107.tar"; - sha256 = "00qghzzm9584vigfijkgghbnn9yqnlqddqv8khbn5k13zbrslbcv"; + sha256 = "0kwz7b7y90yq676r09h4w0wbrm61030sw6mqhrcq9130s107lbkx"; }; packageRequires = [ heap tNFA ]; meta = { @@ -6607,7 +6611,7 @@ version = "0.3.5.0.20240201.233852"; src = fetchurl { url = "https://elpa.gnu.org/devel/triples-0.3.5.0.20240201.233852.tar"; - sha256 = "0fbm6f5xxixmmi1fywada5k1kgbh8ab0vsick8l0d1g5pm33c4x7"; + sha256 = "1hw0pgd87cack1ya76bckwjbxxyr4fd8gkp5ngkvjl8l8yhvvrpi"; }; packageRequires = [ emacs seq ]; meta = { @@ -6622,7 +6626,7 @@ version = "1.0.1.0.20230730.150555"; src = fetchurl { url = "https://elpa.gnu.org/devel/typo-1.0.1.0.20230730.150555.tar"; - sha256 = "1fsv4jka06bgp6b39g9y28npbrb1i1rxvyamy95qw10nlsnw1130"; + sha256 = "0cjn2lh0949kc6c9fxknzg2fyb4p3iwic2a9md5yxpdl42j24fvw"; }; packageRequires = [ emacs ]; meta = { @@ -6640,7 +6644,7 @@ version = "1.0.3.0.20230604.111559"; src = fetchurl { url = "https://elpa.gnu.org/devel/ulisp-repl-1.0.3.0.20230604.111559.tar"; - sha256 = "1lay2sqi2ncwvrzs39wjd9fl66vsnxis9q6g7cyjqi4y667jg62s"; + sha256 = "0b6yvlwikgkkfqklrhbcs0p6y349b6700x78n77xf0kkgv7mca1i"; }; packageRequires = [ emacs ]; meta = { @@ -6659,7 +6663,7 @@ version = "0.8.2.0.20220312.180415"; src = fetchurl { url = "https://elpa.gnu.org/devel/undo-tree-0.8.2.0.20220312.180415.tar"; - sha256 = "0ldvyaim7n8gs8775fv9a0q6lp67ynkapj82pnqywniqy2p2vr1m"; + sha256 = "1gm5108p4qv7v4dqpxkd3zb2h5w8nsz0xjbxzxpkvykqp982g030"; }; packageRequires = [ emacs queue ]; meta = { @@ -6676,7 +6680,7 @@ version = "0.3.0.20221212.230830"; src = fetchurl { url = "https://elpa.gnu.org/devel/uni-confusables-0.3.0.20221212.230830.tar"; - sha256 = "0xa7byw8b371wm35g0250mz7xvcgbdms1x32grwqp4zhm9dh7jg8"; + sha256 = "15kc12zih2d6lazcqgiaq9jc5zgznnhaywh7ibflwc6siqvwxzvg"; }; packageRequires = []; meta = { @@ -6694,7 +6698,7 @@ version = "1.0.4.0.20221221.82507"; src = fetchurl { url = "https://elpa.gnu.org/devel/uniquify-files-1.0.4.0.20221221.82507.tar"; - sha256 = "1hhf0zb85y1p1a54y8jq6jzlmdgd23rja2pp461lwf0i1wkfjibq"; + sha256 = "0zn7z3y7f7hw4144ssa398455091qrg238wp9fr53l2rxpdkdkwf"; }; packageRequires = [ emacs ]; meta = { @@ -6714,7 +6718,7 @@ version = "0.4.2snapshot0.20240310.204507"; src = fetchurl { url = "https://elpa.gnu.org/devel/urgrep-0.4.2snapshot0.20240310.204507.tar"; - sha256 = "0pzicsyp8p2cbyy77l0fj7kzi7amc5xqyj6a6in1jvgc52wzg532"; + sha256 = "173ql2ng8blfw4y7nbfgjmzpgvw0xabb1sk2c1mis6k36ali851w"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6734,7 +6738,7 @@ version = "2.0.5.0.20231024.31412"; src = fetchurl { url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.5.0.20231024.31412.tar"; - sha256 = "0vr04yr4ywxvh7c6s447bsa5v148ny3lvx54bpd60qf5cp92z1zw"; + sha256 = "1crjiq72fcpzw4nlrm8nh3q2llvxc7bgjqq6vr6ma055d0m6xrsd"; }; packageRequires = [ cl-lib nadvice ntlm ]; meta = { @@ -6751,7 +6755,7 @@ version = "0.8.3.0.20230510.175959"; src = fetchurl { url = "https://elpa.gnu.org/devel/url-http-oauth-0.8.3.0.20230510.175959.tar"; - sha256 = "02ml5wsqzzwxaf779hkgbbdjp7hvf6x43cr1j2aciw2hn29ikbcg"; + sha256 = "00shj8zvjvdy7gh29sx08m3cn9lyivjlzmzll0i2zy9389i1l360"; }; packageRequires = []; meta = { @@ -6766,7 +6770,7 @@ version = "0.9.0.20231222.161107"; src = fetchurl { url = "https://elpa.gnu.org/devel/url-scgi-0.9.0.20231222.161107.tar"; - sha256 = "101z2rmfbl5g88lwbf3p3r5wrnfxl6vqw836rjnybfxpl0m89862"; + sha256 = "1dgi0r0igwsk3mx6b7mvd6xz7dmb545g2394s0wh9kkjhlkyd5b3"; }; packageRequires = [ emacs ]; meta = { @@ -6782,10 +6786,10 @@ elpaBuild { pname = "use-package"; ename = "use-package"; - version = "2.4.5.0.20240113.53615"; + version = "2.4.5.0.20240330.124921"; src = fetchurl { - url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240113.53615.tar"; - sha256 = "17c7q2y8lf37gvzxzqhbpr2szkkfnam5yagsqmrv8h0b5cnmnrlq"; + url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240330.124921.tar"; + sha256 = "0jc1389g63bsy2w2fkw332vpwqrm5xci8skqf7mkg39y8nj2j0fw"; }; packageRequires = [ bind-key emacs ]; meta = { @@ -6805,7 +6809,7 @@ version = "1.0.4.0.20180215.204244"; src = fetchurl { url = "https://elpa.gnu.org/devel/validate-1.0.4.0.20180215.204244.tar"; - sha256 = "0mmfwv5g4661r300d8lj907ynkdhjddvm5nca3s5zq7zv4ii0sd0"; + sha256 = "1hayzx6x2xqfzg84ik5n5x84ixmwc0kc8h7f0796d4rfiljl4y3c"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -6820,7 +6824,7 @@ version = "3.1.1.0.20210501.211155"; src = fetchurl { url = "https://elpa.gnu.org/devel/valign-3.1.1.0.20210501.211155.tar"; - sha256 = "1k9kqfbcc3glwn3n9l4hfflzqwl144r4zrxgprha3ya04y9ka91x"; + sha256 = "1w5by0y4552c2qlm708b3523fp9sgizd0zxrwk2k1v6qwh04pa67"; }; packageRequires = [ emacs ]; meta = { @@ -6839,7 +6843,7 @@ version = "1.1.0.0.20220825.144758"; src = fetchurl { url = "https://elpa.gnu.org/devel/vc-backup-1.1.0.0.20220825.144758.tar"; - sha256 = "1mrk1f9ajdpdkqmwwha4qw4d8dxxbx3k7la31z118j04g8x5lqh4"; + sha256 = "1jd3mv5467vy3ddrrhsv6nwsmyksqls5zhnb8hjb6imrhsylprbv"; }; packageRequires = [ compat emacs ]; meta = { @@ -6854,7 +6858,7 @@ version = "1.2.0.20230129.104658"; src = fetchurl { url = "https://elpa.gnu.org/devel/vc-got-1.2.0.20230129.104658.tar"; - sha256 = "0r3jny1yhl9swrpbif46mjx6c2c84pwnh4byffasmgdamic9w5w8"; + sha256 = "0dwigmr1rm8a80ngx25jrqlgnbdj51db6avmyg3v7avhkyg5x455"; }; packageRequires = [ emacs ]; meta = { @@ -6872,7 +6876,7 @@ version = "1.14.1.0.20230605.161947"; src = fetchurl { url = "https://elpa.gnu.org/devel/vc-hgcmd-1.14.1.0.20230605.161947.tar"; - sha256 = "0mv2n5xhilq5vc0k4iahk3fs0skdcshvmdyynqyy6ii764zmmg87"; + sha256 = "1qrrbr7qgbsc00mrbslaa0k6n3dnighw5dq3mx1hlgz0flm623gi"; }; packageRequires = [ emacs ]; meta = { @@ -6887,7 +6891,7 @@ version = "0.2.2.0.20230718.145809"; src = fetchurl { url = "https://elpa.gnu.org/devel/vcard-0.2.2.0.20230718.145809.tar"; - sha256 = "0b3pxl03kjdyi70hnnf5sb2jvrkhnk0srsn2gr555y9kfbgzwwj1"; + sha256 = "14rc6glk0wyfjymiv2h5db0cxpl7j8i7h3xlm5bhvgiab00vhk6x"; }; packageRequires = [ emacs ]; meta = { @@ -6902,7 +6906,7 @@ version = "1.1.0.20201127.191542"; src = fetchurl { url = "https://elpa.gnu.org/devel/vcl-mode-1.1.0.20201127.191542.tar"; - sha256 = "0ps87hxxm99wilc3ylv9i4b0035lg5i5df0i491m10z3x02i503p"; + sha256 = "1fjf37s5yfivjbagw7m83y7z5i3dfzqnhcaga7r092v9jvkabw51"; }; packageRequires = []; meta = { @@ -6917,7 +6921,7 @@ version = "0.2.4.0.20230620.220116"; src = fetchurl { url = "https://elpa.gnu.org/devel/vdiff-0.2.4.0.20230620.220116.tar"; - sha256 = "17767yyim333xwgzn3kb2l58z1w4wh55s45a5y1jv12ilfi08cnq"; + sha256 = "1974s441i7hvz6jly2xzndrfpp94nidhkb6gjgfk9f5lml1z17n1"; }; packageRequires = [ emacs hydra ]; meta = { @@ -6934,7 +6938,7 @@ version = "2024.3.1.121933719.0.20240314.104026"; src = fetchurl { url = "https://elpa.gnu.org/devel/verilog-mode-2024.3.1.121933719.0.20240314.104026.tar"; - sha256 = "14v14yn6lcpjxldmzl9wymikxzli4mpvy9xsa0pvq0dlj0d30xgw"; + sha256 = "1fk5jl9897jbzg4dqf1mhdk7dmjmcqxpb1v2sv9ni06bh25rn6z8"; }; packageRequires = []; meta = { @@ -6946,10 +6950,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.7.0.20240322.111445"; + version = "1.8.0.20240424.195903"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.7.0.20240322.111445.tar"; - sha256 = "1v4c3h9qv1mr4dwirzh5r6vvkbxhxqw4cq245vla0ljgl9bhsm86"; + url = "https://elpa.gnu.org/devel/vertico-1.8.0.20240424.195903.tar"; + sha256 = "0yhk9cp3qlan2vci31an1d3c4mqz2ckbs7xhs12qk6vich66yshk"; }; packageRequires = [ compat emacs ]; meta = { @@ -6969,7 +6973,7 @@ version = "0.7.7.0.20240202.84736"; src = fetchurl { url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.7.0.20240202.84736.tar"; - sha256 = "0nx5lqkss2ya06c95apbmdii2rnidbhnywzyqs2mr2fyvlv1azwp"; + sha256 = "02kwhyhvcjpnq5wskhydjf0v2qbk4dfp8x4nvsxfh31jfvxqvn8k"; }; packageRequires = [ emacs posframe vertico ]; meta = { @@ -6984,7 +6988,7 @@ version = "1.0.0.20221221.82600"; src = fetchurl { url = "https://elpa.gnu.org/devel/vigenere-1.0.0.20221221.82600.tar"; - sha256 = "1snis37kp1zabydrwsvb7fh15ps4cs2vhn80xhxj4dcyp597q44v"; + sha256 = "03zkmvx6cs5s0plbafb40pxs0rqx1vz12ql03zlx21h0zwgynqwf"; }; packageRequires = [ emacs ]; meta = { @@ -7002,7 +7006,7 @@ version = "1.2.0.20221221.82606"; src = fetchurl { url = "https://elpa.gnu.org/devel/visual-filename-abbrev-1.2.0.20221221.82606.tar"; - sha256 = "1jq6c1fzm6r73j6g2m7in6cly3pm9zyqldc67paqldalhg9kfda5"; + sha256 = "1lb02jpljj2l1qkmn2pmbvw910nrpg9bsz6yfqfccyppvnmrv788"; }; packageRequires = [ emacs ]; meta = { @@ -7016,10 +7020,10 @@ elpaBuild { pname = "visual-fill"; ename = "visual-fill"; - version = "0.1.0.20201201.173845"; + version = "0.2.0.20240424.95324"; src = fetchurl { - url = "https://elpa.gnu.org/devel/visual-fill-0.1.0.20201201.173845.tar"; - sha256 = "10wf6w2mjmhj7blxh76j0k0czjv4ww307pa99vp9xgcg63pcbbp6"; + url = "https://elpa.gnu.org/devel/visual-fill-0.2.0.20240424.95324.tar"; + sha256 = "1vgfa29gl4rh6gx08r1imlabznrlmx21p41ns62w9lxi6y8hzf8y"; }; packageRequires = []; meta = { @@ -7034,7 +7038,7 @@ version = "1.7.2.0.20231016.224412"; src = fetchurl { url = "https://elpa.gnu.org/devel/vlf-1.7.2.0.20231016.224412.tar"; - sha256 = "01r9li0pqypm37j0qh0aj29xvljvbcngsws0cc8bi1f8s9zlrnmw"; + sha256 = "1smcw9x38cl7pnxdzy8ycx6g80yb5k0qd7x1520wzbp1g31dsar1"; }; packageRequires = [ emacs ]; meta = { @@ -7046,10 +7050,10 @@ elpaBuild { pname = "vundo"; ename = "vundo"; - version = "2.2.0.0.20240219.110913"; + version = "2.3.0.0.20240425.211317"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vundo-2.2.0.0.20240219.110913.tar"; - sha256 = "0y9b8029f9apx0nii968smr4dsiqr3ms3vs929par7h0ab6fcbb8"; + url = "https://elpa.gnu.org/devel/vundo-2.3.0.0.20240425.211317.tar"; + sha256 = "0dif9f3s3igpfi0r4dgzy14g8m6xf1g6lqyc0gfzf40n301iw4kz"; }; packageRequires = [ emacs ]; meta = { @@ -7066,7 +7070,7 @@ version = "2021.0.20220101.81620"; src = fetchurl { url = "https://elpa.gnu.org/devel/wcheck-mode-2021.0.20220101.81620.tar"; - sha256 = "0bk9w274k0rfmlxv5m9mxqy7ab8zdzk0sw4baqh73hvn8z3li8sp"; + sha256 = "15785pi3fgfdi3adsa4lhsbdqw6bnfcm44apxpfixqfx56d3xh8m"; }; packageRequires = []; meta = { @@ -7081,7 +7085,7 @@ version = "0.2.1.0.20201202.220257"; src = fetchurl { url = "https://elpa.gnu.org/devel/wconf-0.2.1.0.20201202.220257.tar"; - sha256 = "06ghn72l2fwn0ys2iakgw1xqalip31yi0449c26rad8gaz6y7vxl"; + sha256 = "0nnf2jak4hjzj2m2v44ymnyvsgiyzz49nnz48j3cpiw7vpb79ibh"; }; packageRequires = [ emacs ]; meta = { @@ -7100,7 +7104,7 @@ version = "0.1.2.0.20210811.22503"; src = fetchurl { url = "https://elpa.gnu.org/devel/web-server-0.1.2.0.20210811.22503.tar"; - sha256 = "0pvmlv74hy7ybnl0014ml7c314an2vc2z6fkizw06zr27x22jpvl"; + sha256 = "1d2ij23gswvg41xgdg51m2prqn1f9lcwb2rb9rh3s9p6skj14y9b"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -7118,7 +7122,7 @@ version = "1.1.2.0.20210605.74155"; src = fetchurl { url = "https://elpa.gnu.org/devel/webfeeder-1.1.2.0.20210605.74155.tar"; - sha256 = "0716x9a83wv41p3hz4qllrrv2w5jrw4xvb2fhi8kxaxrjhq989d9"; + sha256 = "1xcaycimshijmyq071i5qch3idjfl3g4sws9ig97a9hx3m5wfi53"; }; packageRequires = [ emacs ]; meta = { @@ -7136,7 +7140,7 @@ version = "1.15.0.20230808.230535"; src = fetchurl { url = "https://elpa.gnu.org/devel/websocket-1.15.0.20230808.230535.tar"; - sha256 = "1li62x00jirf3z0llx262j6galpsvbcrq4daybnfkskmj4br5lhp"; + sha256 = "15xry8bv9vcc470j3an5ks9z2hg7ia4nl7x4xvqb77rpbkq53rb9"; }; packageRequires = [ cl-lib ]; meta = { @@ -7151,10 +7155,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.6.0.0.20240312.163350"; + version = "3.6.0.0.20240423.92028"; src = fetchurl { - url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240312.163350.tar"; - sha256 = "09mjn8ms7yhy93b3klqhvwvk2ipk4fx6l9s7446m7fxjdylgbj6a"; + url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240423.92028.tar"; + sha256 = "0bx47186nrsfbjcfci7qfx3s874q4wvys6imkr4k0i9mmfnchvaa"; }; packageRequires = [ emacs ]; meta = { @@ -7172,7 +7176,7 @@ version = "3.0.2.0.20240314.125442"; src = fetchurl { url = "https://elpa.gnu.org/devel/window-commander-3.0.2.0.20240314.125442.tar"; - sha256 = "1bjamqhn8nkqxmak1xfxriwqjhb0bdj7ldcg6r24rral0f0crwhm"; + sha256 = "082fwi8basfddwvi5yjgvdbf0f7xh58kmbvshnpim143pyxzgi9q"; }; packageRequires = [ emacs ]; meta = { @@ -7190,7 +7194,7 @@ version = "0.0.1.0.20200212.91532"; src = fetchurl { url = "https://elpa.gnu.org/devel/windower-0.0.1.0.20200212.91532.tar"; - sha256 = "0005r5xgi7h7i0lbdxbsfs7hvdx4isan6df283xflxs0qv3hwpql"; + sha256 = "1s9kq9256x8chayqfcczxfcdb67pk6752xg7v6ixb9f3ad590ls2"; }; packageRequires = [ emacs ]; meta = { @@ -7207,7 +7211,7 @@ version = "0.1.0.20221221.82616"; src = fetchurl { url = "https://elpa.gnu.org/devel/windresize-0.1.0.20221221.82616.tar"; - sha256 = "16s4vxzjcjl5ahpfwzrr4z59mq0w0vb56ip3r5ky13xs3p5q2xl8"; + sha256 = "0hgfyhz3jx4yhxspvh8zb4s852j8iwijrg7d4madr1p9rm2g3pjq"; }; packageRequires = []; meta = { @@ -7222,7 +7226,7 @@ version = "4.3.2.0.20240313.173240"; src = fetchurl { url = "https://elpa.gnu.org/devel/wisi-4.3.2.0.20240313.173240.tar"; - sha256 = "0cd7y0wg52yz8bp74m9p9wnw4zhsgks61znxxm8y0mjxxac4g188"; + sha256 = "01i5r77ndxy76gby6v4j25w4pf6kmqaxagya29b9gnrnw07m8n5b"; }; packageRequires = [ emacs seq ]; meta = { @@ -7242,7 +7246,7 @@ version = "1.3.0.0.20231023.83923"; src = fetchurl { url = "https://elpa.gnu.org/devel/wisitoken-grammar-mode-1.3.0.0.20231023.83923.tar"; - sha256 = "17kgrwm1jr1dxaprgay60jmgg5bfhmyrngzy0qfia6zs7w43bscx"; + sha256 = "0ai5s1sgy0wk8hc84w7da65p30ldk514n2h6hqa71f9ia5jbd0j8"; }; packageRequires = [ emacs mmm-mode wisi ]; meta = { @@ -7257,7 +7261,7 @@ version = "1.1.0.20221221.82918"; src = fetchurl { url = "https://elpa.gnu.org/devel/wpuzzle-1.1.0.20221221.82918.tar"; - sha256 = "16mdd7cyzbhipr934cps8qjpgsr9wwnrd81yaca356wq0cwafhvb"; + sha256 = "0ky8n0xjxsw4a684g3l8imbrfsvbc9nq1i8gi1y384qjvvjqxaxv"; }; packageRequires = []; meta = { @@ -7271,10 +7275,10 @@ elpaBuild { pname = "wrap-search"; ename = "wrap-search"; - version = "4.12.10.0.20231002.184917"; + version = "4.14.11.0.20240427.191832"; src = fetchurl { - url = "https://elpa.gnu.org/devel/wrap-search-4.12.10.0.20231002.184917.tar"; - sha256 = "0svxaqjalqny3q3xbkn60zni30m2r9wyfqhjlxx9zxyf05d1dypg"; + url = "https://elpa.gnu.org/devel/wrap-search-4.14.11.0.20240427.191832.tar"; + sha256 = "0286jkxhzn6x2jbvwlrknni3fdf9h2a2mi96kkasy91bph3snx2a"; }; packageRequires = []; meta = { @@ -7289,7 +7293,7 @@ version = "1.11.0.20221221.82941"; src = fetchurl { url = "https://elpa.gnu.org/devel/xclip-1.11.0.20221221.82941.tar"; - sha256 = "09dkxgd3bcn8pfw441jq73k49l6m467w89l2xwzb2zb24qpd78ic"; + sha256 = "18l69h1vg98fd35hsbbzdlhgmilyj192g9vr34kkwzj0r6bak4l2"; }; packageRequires = []; meta = { @@ -7304,7 +7308,7 @@ version = "3.3.0.20230913.220528"; src = fetchurl { url = "https://elpa.gnu.org/devel/xeft-3.3.0.20230913.220528.tar"; - sha256 = "14kc375vxz6hi6i6fyamkhhjggzsx8bh57cpsqanihg45x3vcwdk"; + sha256 = "1zpm678nmnfs7vwirjil35nfwjkhr83f6pmn43lcdzrcz6y7nxn1"; }; packageRequires = [ emacs ]; meta = { @@ -7316,10 +7320,10 @@ elpaBuild { pname = "xelb"; ename = "xelb"; - version = "0.18.0.20240212.225455"; + version = "0.18.0.20240415.160551"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xelb-0.18.0.20240212.225455.tar"; - sha256 = "0mr6rrg7jbxrb60qzmngvs5nkx7kxk8cpw0sm9i4yrwypfihffgz"; + url = "https://elpa.gnu.org/devel/xelb-0.18.0.20240415.160551.tar"; + sha256 = "13bvf0k39bdwh8xr2m096idx371xqdxh2x0g9kh6y65hc80l1k1x"; }; packageRequires = [ emacs ]; meta = { @@ -7334,7 +7338,7 @@ version = "1.0.5.0.20230911.4618"; src = fetchurl { url = "https://elpa.gnu.org/devel/xpm-1.0.5.0.20230911.4618.tar"; - sha256 = "0895r691nffqf728s4f124yjl97wwrfi9n7wlpxv9yrmry5c7256"; + sha256 = "0ymby7wqz6bmn4kcl0if0ybhafba139pgmzifvk00bh7r0s5gsz9"; }; packageRequires = [ cl-lib queue ]; meta = { @@ -7346,10 +7350,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.25.0.20240123.121048"; + version = "1.25.0.20240401.74532"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xr-1.25.0.20240123.121048.tar"; - sha256 = "0ishimhmmkkdzrx9pqq9y9j9n1h1vms49kfksg42mq6fahbc1hyn"; + url = "https://elpa.gnu.org/devel/xr-1.25.0.20240401.74532.tar"; + sha256 = "0q9s706dz52mfnjhc9b5km7756zsx9ws4nlc607i1v71hhz2k3lg"; }; packageRequires = [ emacs ]; meta = { @@ -7361,10 +7365,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.6.3.0.20240102.22814"; + version = "1.6.3.0.20240328.32323"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20240102.22814.tar"; - sha256 = "1rnns4xhkcim2xa8fchf3bzydj7b4pksglivwikhmdwxkrsx0acx"; + url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20240328.32323.tar"; + sha256 = "04rxbfzvz4z3q04r3817vrkx7w6kspdmpyl30h9v37vmwyxw722j"; }; packageRequires = [ emacs ]; meta = { @@ -7382,7 +7386,7 @@ version = "0.2.0.0.20231225.162837"; src = fetchurl { url = "https://elpa.gnu.org/devel/xref-union-0.2.0.0.20231225.162837.tar"; - sha256 = "1gfvd23d0ysrvricvcpqgbji705ibwpz3jcnk8lxiz890y4rs2vw"; + sha256 = "0is4r12r30drq1msa5143bgnwam1kgbf2iia30fbqv0l0rhvqd9x"; }; packageRequires = [ emacs ]; meta = { @@ -7398,10 +7402,10 @@ elpaBuild { pname = "yasnippet"; ename = "yasnippet"; - version = "0.14.1.0.20240308.31533"; + version = "0.14.1.0.20240406.91451"; src = fetchurl { - url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20240308.31533.tar"; - sha256 = "0n67qgrnjxv5vb1brc545b4jyan7adx4r8478mw3686ia014l1kh"; + url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20240406.91451.tar"; + sha256 = "02nkjbn2kgq2x1kbbmqygwqzrdy48nhizsy734n3gm8fnp4p5kxp"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -7419,7 +7423,7 @@ version = "1.0.2.0.20221221.83103"; src = fetchurl { url = "https://elpa.gnu.org/devel/yasnippet-classic-snippets-1.0.2.0.20221221.83103.tar"; - sha256 = "1gy67f796pvaqckhbb9p05pn7f7d70ps7z0f1bg35156m3dfj7ff"; + sha256 = "01066fmg42031naaqpy1ls8xw8k2hq02sib43smx20wdbqak6gx7"; }; packageRequires = [ yasnippet ]; meta = { @@ -7436,7 +7440,7 @@ version = "2023.6.11.0.20231018.110342"; src = fetchurl { url = "https://elpa.gnu.org/devel/zones-2023.6.11.0.20231018.110342.tar"; - sha256 = "1hd4jlmy50050d1pr1r7civwv908ildpywr2525znhhh9nd29b9p"; + sha256 = "0gyla7n7znzhxfdwb9jmxkijvidpxvqs9p68dbaiyk86daq2pxzm"; }; packageRequires = []; meta = { @@ -7451,7 +7455,7 @@ version = "1.0.6.0.20230617.194317"; src = fetchurl { url = "https://elpa.gnu.org/devel/ztree-1.0.6.0.20230617.194317.tar"; - sha256 = "1sgii6lf06dqhld67vhac1319nbjrrd9npm2z8aysxg6hs26hfab"; + sha256 = "1zh6qdzalvikb48dc0pk3rnk7jvknx07dkrggc259q61jdp3pj1m"; }; packageRequires = [ cl-lib ]; meta = { @@ -7466,7 +7470,7 @@ version = "0.4.0.0.20230524.131806"; src = fetchurl { url = "https://elpa.gnu.org/devel/zuul-0.4.0.0.20230524.131806.tar"; - sha256 = "0yand8b9givmwr8b3y8da4qwxq2j0kjyfzigwydf0lmc96nix777"; + sha256 = "1pvfi8dp5i6h7z35h91408pz8bsval35sd7dk02v0hr6znln0pvb"; }; packageRequires = [ emacs project ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index ec8e192397..88d511c6a3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -7,7 +7,7 @@ version = "0.10.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/ace-window-0.10.0.tar"; - sha256 = "1kfyf7za4zc41gf0k3rq8byvwkw7q5pxnyynh5i0gv686zrzak1i"; + sha256 = "1sdzk1hgi3axqqbxf6aq1v5j3d8bybkz40dk8zqn49xxxfmzbdv4"; }; packageRequires = [ avy ]; meta = { @@ -22,7 +22,7 @@ version = "1.11"; src = fetchurl { url = "https://elpa.gnu.org/packages/ack-1.11.tar"; - sha256 = "0fsi3lgfkyv9gxwcs0q5c9fawksz6x0pqarjagcndnd7jlbxjw7z"; + sha256 = "1ji02v3qis5sx7hpaaxksgh2jqxzzilagz6z33kjb1lds1sq4z2c"; }; packageRequires = []; meta = { @@ -37,7 +37,7 @@ version = "0.7"; src = fetchurl { url = "https://elpa.gnu.org/packages/activities-0.7.tar"; - sha256 = "17vwbblcwayf1lqfvc64s606cyv1pyh094i3d8fz0k5ivgfp6ybi"; + sha256 = "1775cdk9hv257m6l7icg247fc36g7lwgjg8iivj52m6qg7p7cz9g"; }; packageRequires = [ emacs persist ]; meta = { @@ -58,7 +58,7 @@ version = "8.1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/ada-mode-8.1.0.tar"; - sha256 = "1nfqm173gbk6483xgdkmxp5nb8biihq1623058gbl0dfwn0p9njh"; + sha256 = "10k514al716qjx3qg1m4k1rnf70fa73vrmmx3pp75zrw1d0db9y6"; }; packageRequires = [ emacs gnat-compiler uniquify-files wisi ]; meta = { @@ -73,7 +73,7 @@ version = "2020.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/ada-ref-man-2020.1.tar"; - sha256 = "1g4brb9g2spd55issyqldfc4azwilbrz8kh8sl0lka2kn42l3qqc"; + sha256 = "0ijgl9lnmn8n3pllgh3apl2shbl38f3fxn8z5yy4q6pqqx0vr3fn"; }; packageRequires = []; meta = { @@ -88,7 +88,7 @@ version = "0.8"; src = fetchurl { url = "https://elpa.gnu.org/packages/adaptive-wrap-0.8.tar"; - sha256 = "1gs1pqzywvvw4prj63vpj8abh8h14pjky11xfl23pgpk9l3ldrb0"; + sha256 = "1dz5mi21v2wqh969m3xggxbzq3qf78hps418rzl73bb57l837qp8"; }; packageRequires = []; meta = { @@ -103,7 +103,7 @@ version = "3.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/adjust-parens-3.2.tar"; - sha256 = "01l8bgfqgbkh5p9r8mc5pqizg0sgr7bl6x7x657gm0qjnwmfwai5"; + sha256 = "1gdlykg7ix3833s40152p1ji4r1ycp18niqjr1f994y4ydqxq8yl"; }; packageRequires = [ emacs ]; meta = { @@ -117,8 +117,8 @@ ename = "advice-patch"; version = "0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/advice-patch-0.1.el"; - sha256 = "0mb7linzsnf72vzkn9h6w2i2b0h92h6qzkapyrv61vh5a67k1m0s"; + url = "https://elpa.gnu.org/packages/advice-patch-0.1.tar"; + sha256 = "0km891648k257k4d6hbrv6jyz9663kww8gfarvzf9lv8i4qa5scp"; }; packageRequires = [ emacs ]; meta = { @@ -133,7 +133,7 @@ version = "1.7"; src = fetchurl { url = "https://elpa.gnu.org/packages/aggressive-completion-1.7.tar"; - sha256 = "1rpy53kh19ljjr2xgna716jynajjpgkkjgcl3gzryxsmky8mwbfl"; + sha256 = "0d388w0yjpjzhqlar9fjrxsjxma09j8as6758sswv01r084gpdbk"; }; packageRequires = [ emacs ]; meta = { @@ -148,7 +148,7 @@ version = "1.10.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/aggressive-indent-1.10.0.tar"; - sha256 = "166jk1z0vw481lfi3gbg7f9vsgwfv8fiyxpkfphgvgcmf5phv4q1"; + sha256 = "1c27g9qhqc4bh96bkxdcjbrhiwi7kzki1l4yhxvyvwwarisl6c7b"; }; packageRequires = [ emacs ]; meta = { @@ -163,7 +163,7 @@ version = "1.10.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/ahungry-theme-1.10.0.tar"; - sha256 = "14q5yw56n82qph09bk7wmj5b1snhh9w0nk5s1l7yn9ldg71xq6pm"; + sha256 = "16k6wm1qss5bk45askhq5vswrqsjic5dijpkgnmwgvm8xsdlvni6"; }; packageRequires = [ emacs ]; meta = { @@ -178,7 +178,7 @@ version = "0.0.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/aircon-theme-0.0.6.tar"; - sha256 = "09yjjx9gy1x2i8xk7jlblzk6gkx7cgglb0pwxbl8n6aj19ba40nd"; + sha256 = "0dcnlk3q95bcghlwj8ii40xxhspnfbqcr9mvj1v3adl1s623fyp0"; }; packageRequires = [ emacs ]; meta = { @@ -186,16 +186,16 @@ license = lib.licenses.free; }; }) {}; - all = callPackage ({ elpaBuild, fetchurl, lib }: + all = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "all"; ename = "all"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/all-1.0.el"; - sha256 = "17h4cp0xnh08szh3snbmn1mqq2smgqkn45bq7v0cpsxq1i301hi3"; + url = "https://elpa.gnu.org/packages/all-1.1.tar"; + sha256 = "067c5ynklw1inbjwd1l6dkbpx3vw487qv39y7mdl55a6nqx7hgk4"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/all.html"; license = lib.licenses.free; @@ -208,7 +208,7 @@ version = "1.2.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/altcaps-1.2.0.tar"; - sha256 = "0pfd3j8x2ayqnvg418qcm4rkxjvm5qm2ks9xsw4irv04452zhahc"; + sha256 = "1smqvq21jparnph03kyyzm47rv5kia6bna1m1pf8ibpkph64rykw"; }; packageRequires = [ emacs ]; meta = { @@ -222,8 +222,8 @@ ename = "ampc"; version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ampc-0.2.el"; - sha256 = "1pdy5mvi6h8m7qjnxiy217fgcp9w91375hq29bacfgh7bix56jlr"; + url = "https://elpa.gnu.org/packages/ampc-0.2.tar"; + sha256 = "17l2c5hr7cq0vf4qc8s2adwlhqp74glc4v909h0jcavrnbn8yn80"; }; packageRequires = []; meta = { @@ -237,8 +237,8 @@ ename = "arbitools"; version = "0.977"; src = fetchurl { - url = "https://elpa.gnu.org/packages/arbitools-0.977.el"; - sha256 = "0nvdy14lqvy2ca4vw2qlr2kg2vv4y4sr8sa7kqrpf8cg7k9q3mbv"; + url = "https://elpa.gnu.org/packages/arbitools-0.977.tar"; + sha256 = "0s5dpprx24fxm0qk8nzm39c16ydiq97wzz3l7zi69r3l9wf31rb3"; }; packageRequires = [ cl-lib ]; meta = { @@ -252,8 +252,8 @@ ename = "ascii-art-to-unicode"; version = "1.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.13.el"; - sha256 = "1c0jva3amhl9c5xc5yzdpi58c8m1djym4ccj31z6wmakq7npy07p"; + url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.13.tar"; + sha256 = "0qlh8zi691gz7s1ayp1x5ga3sj3rfy79y21r6hqf696mrkgpz1d8"; }; packageRequires = []; meta = { @@ -268,7 +268,7 @@ version = "0.7"; src = fetchurl { url = "https://elpa.gnu.org/packages/assess-0.7.tar"; - sha256 = "0ixs6ab5j12q69bn9h423a6c7mpc7r5spf6m039x3rl14yc04cy4"; + sha256 = "1wka2idr63bn8fgh0cz4lf21jvlhkr895y0xnh3syp9vrss5hzsp"; }; packageRequires = [ emacs m-buffer ]; meta = { @@ -283,7 +283,7 @@ version = "1.9.8"; src = fetchurl { url = "https://elpa.gnu.org/packages/async-1.9.8.tar"; - sha256 = "00x22dh96vhyvgailxm3mv2jqhwlb6lisrjv10m8vpkmlk5mhnwb"; + sha256 = "0m9w7f8rgpcljsv2p6a9gwqx12whf66mbjranwwzacn98rwchh4v"; }; packageRequires = [ emacs ]; meta = { @@ -298,7 +298,7 @@ version = "14.0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/auctex-14.0.4.tar"; - sha256 = "03w6qs4f0ksb8f54zsx189775w3wdyfaqg3dwn20a77y5cvisk52"; + sha256 = "14rfv7xlwdqp42dilmpg11d58q8pzw15fv01hq80iv9kyzsfvxd7"; }; packageRequires = [ emacs ]; meta = { @@ -312,8 +312,8 @@ ename = "aumix-mode"; version = "7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/aumix-mode-7.el"; - sha256 = "0qyjw2g3pzcxqdg1cpp889nmb524jxqq32dz7b7cg2m903lv5gmv"; + url = "https://elpa.gnu.org/packages/aumix-mode-7.tar"; + sha256 = "08baz31hm0nhikqg5h294kg5m4qkiayjhirhb57v57g5722jfk3m"; }; packageRequires = []; meta = { @@ -327,8 +327,8 @@ ename = "auto-correct"; version = "1.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auto-correct-1.1.4.el"; - sha256 = "1ml35l6lk4sf51sh6cal1ylsn61iddz0s01wwly199i3nim0qnw8"; + url = "https://elpa.gnu.org/packages/auto-correct-1.1.4.tar"; + sha256 = "05ky3qxbvxrkywpqj6syl7ll6za74fhjzrcia6wdmxsnjya5qbf1"; }; packageRequires = []; meta = { @@ -343,7 +343,7 @@ version = "0.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/auto-header-0.1.2.tar"; - sha256 = "0rk7xq7bzgaxdyw7j3vjnishf2pyzs84xamq4blgbb93n0f4nlfj"; + sha256 = "0p22bpdy29i7ff8rzjh1qzvj4d8igl36gs1981kmds4qz23qn447"; }; packageRequires = []; meta = { @@ -358,7 +358,7 @@ version = "0.10.10"; src = fetchurl { url = "https://elpa.gnu.org/packages/auto-overlays-0.10.10.tar"; - sha256 = "0wln6b4j3pd3mhx6sx0bnz74c4n6fidmkg77cqfpxs4j5l1zjp2z"; + sha256 = "0jn7lk8vzdrf0flxwwx295z0mrghd3lyspfadwz35c6kygvy8078"; }; packageRequires = [ cl-lib ]; meta = { @@ -370,10 +370,10 @@ elpaBuild { pname = "autocrypt"; ename = "autocrypt"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/autocrypt-0.4.1.tar"; - sha256 = "1r2b1nyw2ai58br3kh4r5rpy450njz7rcccbmcwxsyfgiz4wbqy8"; + url = "https://elpa.gnu.org/packages/autocrypt-0.4.2.tar"; + sha256 = "0mc4vb6x7qzn29dg9m05zgli6mwh9cj4vc5n6hvarzkn9lxl6mr3"; }; packageRequires = [ emacs ]; meta = { @@ -403,7 +403,7 @@ version = "3.2.2.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/bbdb-3.2.2.4.tar"; - sha256 = "13i8ggknc29sny16rq126q0ssz26m3fam0zpdhlsm05pa8dydd7p"; + sha256 = "1ymjydf54z3rbkxk4irvan5s8lc8wdhk01691741vfznx0nsc4a2"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -418,7 +418,7 @@ version = "1.3.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/beacon-1.3.4.tar"; - sha256 = "1fy76c2x0xpnx7wfpsxfawdlrspan4dbj2157k9sa62i6a1c8f21"; + sha256 = "1hxb6vyvpppj7yzphknmh8m4a1h89lg6jr98g4d62k0laxazvdza"; }; packageRequires = [ emacs ]; meta = { @@ -433,7 +433,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/beframe-1.0.1.tar"; - sha256 = "0j4ks5i67ck1cid6whvwq564s94xb0q5fchb006wzbniy1inwcna"; + sha256 = "1p8zglpdcss0p307i4h2zpqbsiipmgmk0a2fx6j9w3lx0zgaf2xj"; }; packageRequires = [ emacs ]; meta = { @@ -448,7 +448,7 @@ version = "0.1.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/bicep-ts-mode-0.1.3.tar"; - sha256 = "1di4pkk682kl46acdq44d1xykzqnvayhd84rwf71rj3q252di5a6"; + sha256 = "02377gsdnfvvydjw014p2y6y74nd5zfh1ghq5l9ayq0ilvv8fmx7"; }; packageRequires = []; meta = { @@ -478,7 +478,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/blist-0.3.tar"; - sha256 = "1cqvj6jjkch4xivdn2vyxz38amm6w403hnrfx0hhknbwxq5k8swp"; + sha256 = "1p10d9q14px19m3vajqmm71lmnbxxsc7qczgq11vhg485c20y3va"; }; packageRequires = [ emacs ilist ]; meta = { @@ -493,7 +493,7 @@ version = "0.3.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/bluetooth-0.3.1.tar"; - sha256 = "1p10kcim5wqnbj2kiqv6hgjkzznaa48qysnnf8ym90mylsczr70z"; + sha256 = "1yjqjm6cis6bq18li63hbhc4qzki3486xvdjkzs2gj4chc1yw1x4"; }; packageRequires = [ dash emacs ]; meta = { @@ -508,7 +508,7 @@ version = "0.4.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/bnf-mode-0.4.5.tar"; - sha256 = "0bj5ffqi54cdrraj5bp4v2cpbxjzly1p467dx1hzrlwv2b1svy2y"; + sha256 = "1x6km8rhhb5bkas3yfmjfpyxlhyxkqnzviw1pqlq88c95j88h3d4"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -520,10 +520,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-1.1.3.tar"; - sha256 = "1z153lccj6rgix9kj5xk8xzdc44ixq8flia7ppjxpj7c0slr3sm2"; + url = "https://elpa.gnu.org/packages/boxy-1.1.4.tar"; + sha256 = "0mwj1qc626f1iaq5iaqm1f4iwyz91hzqhzfk5f53gsqka7yz2fnf"; }; packageRequires = [ emacs ]; meta = { @@ -535,10 +535,10 @@ elpaBuild { pname = "boxy-headings"; ename = "boxy-headings"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-headings-2.1.4.tar"; - sha256 = "101kiw10p0sd8j8px16zsw57my7h2f1anhnwj678z22hxhs8vla7"; + url = "https://elpa.gnu.org/packages/boxy-headings-2.1.5.tar"; + sha256 = "0w3cy2r8iqsb79r33lllj08v719hq0xniq5pbr9sl8kn2raxcjhr"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -553,7 +553,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/breadcrumb-1.0.1.tar"; - sha256 = "0yqsyk8j0r1na2gybil64fb928dq7liwnk5xj18j9z8vgkdm0z0y"; + sha256 = "1s69a2z183mla4d4b5pcsswbwa3hjvsg1xj7r3hdw6j841b0l9dw"; }; packageRequires = [ emacs project ]; meta = { @@ -565,10 +565,10 @@ elpaBuild { pname = "brief"; ename = "brief"; - version = "5.90"; + version = "5.91"; src = fetchurl { - url = "https://elpa.gnu.org/packages/brief-5.90.tar"; - sha256 = "18v0qf3aj14sh6njrrjdahzaghsqy50hdjrwl3k1m7x2jqvzxd1z"; + url = "https://elpa.gnu.org/packages/brief-5.91.tar"; + sha256 = "106xm23045l3ds5q04s7c6wa00ffv7rw495cjqp99nzqvvbmivcb"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -583,7 +583,7 @@ version = "0.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/buffer-env-0.6.tar"; - sha256 = "08li070s2s64lifgzns0z6xjk1qyaik56d6sbdp3gsyghc1sx7rn"; + sha256 = "08qaw4y1sszhh97ih13vfrm0r1nn1k410f2wwvffvncxhqgxz5lv"; }; packageRequires = [ compat emacs ]; meta = { @@ -601,8 +601,8 @@ ename = "buffer-expose"; version = "0.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/buffer-expose-0.4.3.el"; - sha256 = "1blpvan31mvqhzal16sdn564jnfnn7xsfn8zb65ijndh23drljwd"; + url = "https://elpa.gnu.org/packages/buffer-expose-0.4.3.tar"; + sha256 = "1ymjjjrbknp3hdfwd8zyzfrsn5n267245ffmplm7yk2s34kgxr0n"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -617,7 +617,7 @@ version = "0.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/bufferlo-0.6.tar"; - sha256 = "0q942zsxv27gvkx3b391yzshh58l2xd75y04rqyqk269q0cdhqff"; + sha256 = "0gvg1mag8ngjmjl4d6zr99k7mq368l1m6dxy9mk6icgxm3sqr1yk"; }; packageRequires = [ emacs ]; meta = { @@ -647,7 +647,7 @@ version = "0.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/buildbot-0.0.1.tar"; - sha256 = "0glvybvjgwbx3dnr09w9y65v2ic080a4zhs88893amvfw29ig4lx"; + sha256 = "056jakpyslizsp8sik5f7m90dpcga8y38hb5rh1yfa7k1xwcrrk2"; }; packageRequires = [ emacs ]; meta = { @@ -662,7 +662,7 @@ version = "1.4.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/calibre-1.4.1.tar"; - sha256 = "1wjz4d2hrhwcd9ljngygacxm28ddgwndp9krz5cxhjz2dkhs1pgb"; + sha256 = "1ak05y3cmmwpg8bijkwl97kvfxhxh9xxc74askyafc50n0jvaq87"; }; packageRequires = [ compat emacs ]; meta = { @@ -674,10 +674,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-1.4.tar"; - sha256 = "1y0b0lx6qb27x3d0yn3gxykfir07cw4w5jkkw3ff8x1ak6wrf4zv"; + url = "https://elpa.gnu.org/packages/cape-1.5.tar"; + sha256 = "1kg5a2x23gmdcv8kwzmz8qjfr05r9rfzwb7cj38ambpqpppxl7ij"; }; packageRequires = [ compat emacs ]; meta = { @@ -692,7 +692,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/capf-autosuggest-0.3.tar"; - sha256 = "05abnvg84248pbqr2hdkyxr1q1qlgsf4nji23nw41bfly795ikpm"; + sha256 = "18cwiv227m8y1xqvsnjrzgd6f6kvvih742h8y38pphljssl109fk"; }; packageRequires = [ emacs ]; meta = { @@ -706,8 +706,8 @@ ename = "caps-lock"; version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/caps-lock-1.0.el"; - sha256 = "1i4hwam81p4dr0bk8257fkiz4xmv6knkjxj7a00fa35kgx5blpva"; + url = "https://elpa.gnu.org/packages/caps-lock-1.0.tar"; + sha256 = "1yy4kjc1zlpzkam0jj8h3v5h23wyv1yfvwj2drknn59d8amc1h4y"; }; packageRequires = []; meta = { @@ -721,8 +721,8 @@ ename = "captain"; version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/captain-1.0.3.el"; - sha256 = "02b4s4pfnwfwc3xgh4g96wrqll37m35dc2x09pjwkdjxglki7045"; + url = "https://elpa.gnu.org/packages/captain-1.0.3.tar"; + sha256 = "0l8z8bqk705jdl7gvd2x7nhs0z6gn3swk5yzp3mnhjcfda6whz8l"; }; packageRequires = []; meta = { @@ -737,7 +737,7 @@ version = "2.0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/chess-2.0.5.tar"; - sha256 = "1a4iwjdh6k348df6qywjws9z9f862d62m0b2sz57z4xhywiyxpr7"; + sha256 = "0dgmp7ymjyb5pa93n05s0d4ql7wk98r9s4f9w35yahgqk9xvqclj"; }; packageRequires = [ cl-lib ]; meta = { @@ -751,8 +751,8 @@ ename = "cl-generic"; version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cl-generic-0.3.el"; - sha256 = "0vb338bhjpsnrf60qgxny4z5rjrnifahnrv9axd4shay89d894zq"; + url = "https://elpa.gnu.org/packages/cl-generic-0.3.tar"; + sha256 = "0dqn484xb25ifiqd9hqdrs954c74akrf95llx23b2kzf051pqh1k"; }; packageRequires = []; meta = { @@ -767,7 +767,7 @@ version = "0.7.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/cl-lib-0.7.1.tar"; - sha256 = "1pnsm335wi1lkg7vi0lnqxajm12rvyakzd5iccxhipbk3gz3r6my"; + sha256 = "1wpdg2zwhzxv4bkx9ldiwd16l6244wakv8yphrws4mnymkxvf2q1"; }; packageRequires = []; meta = { @@ -782,7 +782,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/clipboard-collector-0.3.tar"; - sha256 = "09zxbivmc1zhcj8ksac2a0qpqh74rrx2slnj6cwz1n1nixn19743"; + sha256 = "0v70f9pljq3jar3d1vpaj48nhrg90jzsvqcbzgv54989w8rvvcd6"; }; packageRequires = [ emacs ]; meta = { @@ -797,7 +797,7 @@ version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/cobol-mode-1.1.tar"; - sha256 = "1ivp0pghrkflhr2md34a6a86gwns867bnl30nqzwq8m4qc5xqjra"; + sha256 = "0aicx6vvhgn0fvikbq74vnvvwh228pxdqf52sbiffhzgb7pkbvcj"; }; packageRequires = [ cl-lib ]; meta = { @@ -812,7 +812,7 @@ version = "0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/code-cells-0.4.tar"; - sha256 = "0a7m6d5slz2zarbk54900cihs5071i63qdz4yj8n7j3zfz28x5kg"; + sha256 = "0kxpnydxlj8pqh54c4c80jlyc6jcplf89bkh3jmm509fmyr7sf20"; }; packageRequires = [ emacs ]; meta = { @@ -827,7 +827,7 @@ version = "0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/comint-mime-0.4.tar"; - sha256 = "1wgr1dq3qdnsvziylcqaiwhjafdqph4jrnq4cp0lcr1j796vp1dz"; + sha256 = "13vi973p0ahpvssv5m1pb63f2wkca0lz0nw3nsj6p4s3jzp46npa"; }; packageRequires = [ emacs ]; meta = { @@ -841,8 +841,8 @@ ename = "compact-docstrings"; version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compact-docstrings-0.2.el"; - sha256 = "0qcxvcwpl263fs1zd6gmbqliwlpkw012p5ba6y05fpm9p10v600h"; + url = "https://elpa.gnu.org/packages/compact-docstrings-0.2.tar"; + sha256 = "00fjhfysjyqigkg0icxlqw6imzhjk5xhlxmxxs1jiafhn55dbcpj"; }; packageRequires = []; meta = { @@ -857,7 +857,7 @@ version = "0.10.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/company-0.10.2.tar"; - sha256 = "0j2qrnx2w2al4f2n37b89q0pkabh5ccv00gsknvgaylhy0za5gq9"; + sha256 = "1708cqrcw26y8z7inm4nzbn2y8gkan5nv5bjzc4ry8zhqz94sxkz"; }; packageRequires = [ emacs ]; meta = { @@ -871,8 +871,8 @@ ename = "company-ebdb"; version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-ebdb-1.1.el"; - sha256 = "146qpiigz12zp1823ggxfrx090g0mxs7gz1ba7sa0iq6ibgzwwm9"; + url = "https://elpa.gnu.org/packages/company-ebdb-1.1.tar"; + sha256 = "1ym0r7y90n4d6grd4l02rxk096gsjmw9j81slig0pq1ky33rb6ks"; }; packageRequires = [ company ebdb ]; meta = { @@ -891,7 +891,7 @@ version = "1.5.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/company-math-1.5.1.tar"; - sha256 = "1inib2ywb4ycr9hxgrzyffqi0jnrpjsn52bkwlsqyzgfxr5n4qsw"; + sha256 = "16ya3yscxxmz9agi0nc5pi43wkfv45lh1zd89yqfc7zcw02nsnld"; }; packageRequires = [ company math-symbol-lists ]; meta = { @@ -910,7 +910,7 @@ version = "0.2.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/company-statistics-0.2.3.tar"; - sha256 = "0780xp09f739jys469x4fqpgj1lysi8gnhiaz0735jib07lmh4ww"; + sha256 = "1gfwhgv7q9d3xjgaim25diyd6jfl9w3j07qrssphcrdxv0q24d14"; }; packageRequires = [ company emacs ]; meta = { @@ -925,7 +925,7 @@ version = "29.1.4.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/compat-29.1.4.5.tar"; - sha256 = "191cjzrw9xm5bvcf8s1yr9hdcn9i02789xfd8pz33lk65s0rq413"; + sha256 = "0i57hs3ak5y0fsfdwg87ib64ny0ar1nk67f5dy2qrm8x3i0h086s"; }; packageRequires = [ emacs seq ]; meta = { @@ -937,10 +937,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-1.4.tar"; - sha256 = "1vxc9i4jwnq4q8svgqjzn6nqqjzh3b6gp81iyfcr5n2122y0aq1y"; + url = "https://elpa.gnu.org/packages/consult-1.5.tar"; + sha256 = "1gx4cjrcaq5dn3rrd2dm30jz07zrnddf0y33qi0dmiqlsyg7l9qw"; }; packageRequires = [ compat emacs ]; meta = { @@ -956,10 +956,10 @@ elpaBuild { pname = "consult-hoogle"; ename = "consult-hoogle"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.0.tar"; - sha256 = "1wzd7i7sfd1l8fkfgfaj5vyc9nx9aycfr4yp5yxg1mr6fz8m2rmz"; + url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.1.tar"; + sha256 = "15am29sn0qx6yn8xcmdafzh1ijph10yd65cphcax02yx782hv6pr"; }; packageRequires = [ emacs haskell-mode ]; meta = { @@ -974,7 +974,7 @@ version = "0.8.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/consult-recoll-0.8.1.tar"; - sha256 = "0z2vlnv0q6hzvj6hk2a5flhp1gmm71c65j8nrpk4a18aq5gir213"; + sha256 = "1zdmkq9cjb6kb0hf3ngm07r3mhrjal27x34i1bm7ri3089wbsp8v"; }; packageRequires = [ consult emacs ]; meta = { @@ -989,7 +989,7 @@ version = "8.1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/context-coloring-8.1.0.tar"; - sha256 = "01wm36qgxsg7lgdxkn7avzfmxcpilsmvfwz3s7y04i0sdrsjvzp4"; + sha256 = "0mqdl34g493pps85ckin5i3iz8kwlqkcwjvsf2sj4nldjvvfk1ng"; }; packageRequires = [ emacs ]; meta = { @@ -1001,10 +1001,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-1.2.tar"; - sha256 = "1yy4lqbkj8hkvbzaw5wrjqxwp2afhgwjyvmqncils37hvyih4rwl"; + url = "https://elpa.gnu.org/packages/corfu-1.3.tar"; + sha256 = "13y0dws1k4682v039ab6b0xxqlg7anknscqs20bmj8lfm2z48znx"; }; packageRequires = [ compat emacs ]; meta = { @@ -1019,7 +1019,7 @@ version = "1.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/coterm-1.6.tar"; - sha256 = "0ikfm1acdsckflv1hcy9lmssyac2099x2yybhvb6vkghcgy99p00"; + sha256 = "0kgsg99dggirz6asyppwx1ydc0jh62xd1bfhnm2hyby5qkqz1yvk"; }; packageRequires = [ compat emacs ]; meta = { @@ -1034,7 +1034,7 @@ version = "0.14.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/counsel-0.14.2.tar"; - sha256 = "13119alyzr2xipk3jra3iawplqkqgvv0gdcm4yd527z592b0s7f0"; + sha256 = "10jajfl2vhqj2awy991kqrf1hcsj8nkvn760cbxjsm2lhzvqqhj3"; }; packageRequires = [ emacs ivy swiper ]; meta = { @@ -1042,16 +1042,16 @@ license = lib.licenses.free; }; }) {}; - cpio-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + cpio-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "cpio-mode"; ename = "cpio-mode"; version = "0.17"; src = fetchurl { url = "https://elpa.gnu.org/packages/cpio-mode-0.17.tar"; - sha256 = "144ajbxmz6amb2234a278c9sl4zg69ndswb8vk0mcq8y9s2abm1x"; + sha256 = "13jay5c36svq2r78gwp7d1slpkkzrx749q28554mxd855fr6pvaj"; }; - packageRequires = [ emacs ]; + packageRequires = []; meta = { homepage = "https://elpa.gnu.org/packages/cpio-mode.html"; license = lib.licenses.free; @@ -1064,7 +1064,7 @@ version = "1.0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/cpupower-1.0.5.tar"; - sha256 = "1hg5jwdkxl6mx145wwdmnhc8k3z3srvpm757kppj1ybmvjbpxx0y"; + sha256 = "155fhf38p95a5ws6jzpczw0z03zwbsqzdwj50v3grjivyp74pddz"; }; packageRequires = []; meta = { @@ -1079,7 +1079,7 @@ version = "0.3.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/crdt-0.3.5.tar"; - sha256 = "0pir9ap8lryrw12slgg4v30bzjphc37r6p0fw36larlh9wp8jj5z"; + sha256 = "038qivbw02h1i98ym0fwx72x05gm0j4h93a54v1l7g25drm5zm83"; }; packageRequires = []; meta = { @@ -1093,8 +1093,8 @@ ename = "crisp"; version = "1.3.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/crisp-1.3.6.el"; - sha256 = "0jf4668h0mzh8han2vbvpzz8m02b8rsbdrj0ddar30w5i6v2f8kz"; + url = "https://elpa.gnu.org/packages/crisp-1.3.6.tar"; + sha256 = "0am7gwadjp0nwlvf7y4sp9brbm0234k55bnxfv44lkwdf502mq8y"; }; packageRequires = []; meta = { @@ -1109,7 +1109,7 @@ version = "2.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/csharp-mode-2.0.0.tar"; - sha256 = "16b9zp6psf32ds9kk7vwf57xppz2jvbk4wpr7mqbn75bx3qvl44m"; + sha256 = "1jjxq5vkqq2v8rkcm2ygggpg355aqmrl2hdhh1xma3jlnj5carnf"; }; packageRequires = [ emacs ]; meta = { @@ -1124,7 +1124,7 @@ version = "1.23"; src = fetchurl { url = "https://elpa.gnu.org/packages/csv-mode-1.23.tar"; - sha256 = "0bdx56bn5aw0xjqgqhx2ccrrns3si04zy9ya755jz7n1djqn3mcz"; + sha256 = "0b5qcxdp7y78mfgcvh9plfc0l5qbwsvrj1bswyimrzg210zhk4zm"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1139,7 +1139,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/cursory-1.0.1.tar"; - sha256 = "0m6q7x5144l2q582gdaqgirvgy30ljd1qyjf82l3v1jkc5qf9wfr"; + sha256 = "09ddn7rlmznq833nsm6s6zhzrq94lrbmm1vln43hax9yf784pqbr"; }; packageRequires = [ emacs ]; meta = { @@ -1154,7 +1154,7 @@ version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/cycle-quotes-0.1.tar"; - sha256 = "0aa6ykblgb6anqmi4qxakbvyrq9v02skgayhfb2qddffiww404ka"; + sha256 = "1glf8sd3gqp9qbd238vxd3aprdz93f887893xji3ybqli36i2xs1"; }; packageRequires = []; meta = { @@ -1166,10 +1166,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dape-0.9.0.tar"; - sha256 = "13xvl24l8lr64ndc8rk1dxdgsbvwxhn90844xkdzl7qs8i3hyw1l"; + url = "https://elpa.gnu.org/packages/dape-0.10.0.tar"; + sha256 = "1x6mbis4vmghp3vf4pxyzdp68nnrraw9ayx3gzbp1bvcmr62qdig"; }; packageRequires = [ emacs jsonrpc ]; meta = { @@ -1183,8 +1183,8 @@ ename = "darkroom"; version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/darkroom-0.3.el"; - sha256 = "0l1xg5kqmjw22k78qnsln0ifx2dx74xxqj0qp8xxcpqvzzx0xh86"; + url = "https://elpa.gnu.org/packages/darkroom-0.3.tar"; + sha256 = "0gxixkai8awc77vzckwljmyapdnxw5j9ajxmlr8rq42994gjr4fm"; }; packageRequires = [ cl-lib ]; meta = { @@ -1199,7 +1199,7 @@ version = "2.19.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/dash-2.19.1.tar"; - sha256 = "0c11lm7wpgmqk8zbdcpmyas12ylml5yhp99mj9h1wqqw0p33xaiw"; + sha256 = "1c7yibfikkwlip8zh4kiamh3kljil3hyl250g8fkxpdyhljjdk6m"; }; packageRequires = [ emacs ]; meta = { @@ -1213,8 +1213,8 @@ ename = "dbus-codegen"; version = "0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dbus-codegen-0.1.el"; - sha256 = "1gi7jc6rn6hlgh01zfwb7cczb5hi3c05wlnzw6akj1h9kai1lmzw"; + url = "https://elpa.gnu.org/packages/dbus-codegen-0.1.tar"; + sha256 = "0d3sbqs5r8578629inx8nhqvx0kshf41d00c8dpc75v4b2vx0h6w"; }; packageRequires = [ cl-lib ]; meta = { @@ -1229,7 +1229,7 @@ version = "0.40"; src = fetchurl { url = "https://elpa.gnu.org/packages/debbugs-0.40.tar"; - sha256 = "0yfl9gd23xnfk3iwiq26brd7fg9ikhd201lw4awng0rdh0fddxwd"; + sha256 = "1agms2il38lgz02g4fswil9x5j1xwpl8kvhbd48jcx57nq18a7bl"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1243,8 +1243,8 @@ ename = "delight"; version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/delight-1.7.el"; - sha256 = "0pihsghrf9xnd1kqlq48qmjcmp5ra95wwwgrb3l8m1wagmmc0bi1"; + url = "https://elpa.gnu.org/packages/delight-1.7.tar"; + sha256 = "1j7srr0i7s9hcny45m8zmj33nl9g6zi55cbkdzzlbx6si2rqwwlj"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -1256,10 +1256,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.3.0"; + version = "2.3.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-2.3.0.tar"; - sha256 = "0h6pdn9w1ggyrmfniqvy307wnlf49n05asa2z5wqxvj6mnvjza1y"; + url = "https://elpa.gnu.org/packages/denote-2.3.5.tar"; + sha256 = "1l8nlr8q7c51j2f528a0568pa3ywfv8pr47fzpd6pk2scc0y372b"; }; packageRequires = [ emacs ]; meta = { @@ -1274,7 +1274,7 @@ version = "1.2.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/denote-menu-1.2.0.tar"; - sha256 = "1zm68bz6hya360g5zvs4r5naznykamgzqxhvfhpfyxb70hsnmx5w"; + sha256 = "042avabc97wgkz85x40dq7rmv4h9n5kmq935lrg9s20klbs9axs1"; }; packageRequires = [ denote emacs ]; meta = { @@ -1289,7 +1289,7 @@ version = "0.10.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/detached-0.10.1.tar"; - sha256 = "1qfcxhzd3gc66kq58k77cvxy18cr371c40z3n4w4m4ngxmpk96hi"; + sha256 = "0w6xgidi0g1pc13xfm8hcgmc7i2h5brj443cykwgvr5wkqnpmp9m"; }; packageRequires = [ emacs ]; meta = { @@ -1301,10 +1301,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.6"; + version = "0.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/devdocs-0.6.tar"; - sha256 = "17av2l61mr4y8la4cqiq1dnaznni4xirr5k3wdix1jzl3q1apypy"; + url = "https://elpa.gnu.org/packages/devdocs-0.6.1.tar"; + sha256 = "04m3jd3wymrsdlb1i7z6dz9pf1q8q38ihkbn3jisdca6xkk9jd6p"; }; packageRequires = [ emacs ]; meta = { @@ -1319,7 +1319,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/devicetree-ts-mode-0.3.tar"; - sha256 = "1vhk9b0aa9w6yalv0d712dc9d7pmcgbg5b4baggc7dyaa5n6ilkn"; + sha256 = "06j385pvlhd7hp9isqp5gcf378m8p6578q6nz81r8dx93ymaak79"; }; packageRequires = [ emacs ]; meta = { @@ -1340,7 +1340,7 @@ version = "0.17"; src = fetchurl { url = "https://elpa.gnu.org/packages/dict-tree-0.17.tar"; - sha256 = "0f9vj6kr8q9mfd522svwy3wmzsl5lc4y2p8ggwmckn88dpz79w02"; + sha256 = "0p4j0m3b9i38l4rcgzdps95wqk27zz156d4q73vq054kpcphrfpp"; }; packageRequires = [ emacs heap tNFA trie ]; meta = { @@ -1355,7 +1355,7 @@ version = "1.9.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/diff-hl-1.9.2.tar"; - sha256 = "1avpqwrxhbx8zxwghc8714rcdfhc15b5chq2ixb366ml8xdmvhck"; + sha256 = "0skla012qw55qhzykgrk3zk5x76dfsj11kq8q2msyrq3jxcbyq6p"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1385,7 +1385,7 @@ version = "0.46"; src = fetchurl { url = "https://elpa.gnu.org/packages/diminish-0.46.tar"; - sha256 = "17lsm5khp7cqrva13kn252ab57lw28sibf14615wdjvfqwlwwha4"; + sha256 = "1xqd6ldxl93l281ncddik1lfxjngi2drq61mv7v18r756c7bqr5r"; }; packageRequires = [ emacs ]; meta = { @@ -1400,7 +1400,7 @@ version = "0.5.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/dired-du-0.5.2.tar"; - sha256 = "0vhph7vcicsiq28b10h3b4dvnhckcy4gccpdgsad5j7pwa5k26m1"; + sha256 = "066yjy9vdbf20adcqdcknk5b0ml18fy2bm9gkgcp0qfg37yy1yjg"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1412,10 +1412,10 @@ elpaBuild { pname = "dired-duplicates"; ename = "dired-duplicates"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-duplicates-0.3.tar"; - sha256 = "1b9drjkbs9anqil274jrn031agpkir9mhs96l2ylm13n8imx9msl"; + url = "https://elpa.gnu.org/packages/dired-duplicates-0.4.tar"; + sha256 = "1srih47bq7szg6n3qlz4yzzcijg79p8xpwmi5c4v9xscl94nnc4z"; }; packageRequires = [ emacs ]; meta = { @@ -1429,8 +1429,8 @@ ename = "dired-git-info"; version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.el"; - sha256 = "1kd0rpw7l32wvwi7q8s0inx4bc66xrl7hkllnlicyczsnzw2z52z"; + url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.tar"; + sha256 = "0rryvlbqx1j48wafja15yc39jd0fzgz9i6bzmq9jpql3w9445772"; }; packageRequires = [ emacs ]; meta = { @@ -1445,7 +1445,7 @@ version = "0.1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/dired-preview-0.1.1.tar"; - sha256 = "1qmrh0sd9s908xkxz5vfhq956ynrx6k2bx8lddmdp8ci8xkw6wmh"; + sha256 = "08c9bvsdb7w9ggav9yrpz12nf9zlq4h1zq8ssdf9pwrx2nzy06p7"; }; packageRequires = [ emacs ]; meta = { @@ -1459,8 +1459,8 @@ ename = "disk-usage"; version = "1.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/disk-usage-1.3.3.el"; - sha256 = "0h1jwznd41gi0vg830ilfgm01q05zknikzahwasm9cizwm2wyizj"; + url = "https://elpa.gnu.org/packages/disk-usage-1.3.3.tar"; + sha256 = "02i7i7mrn6ky3lzhcadvq7wlznd0b2ay107h2b3yh4wwwxjxymyg"; }; packageRequires = [ emacs ]; meta = { @@ -1468,16 +1468,16 @@ license = lib.licenses.free; }; }) {}; - dismal = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "dismal"; ename = "dismal"; version = "1.5.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/dismal-1.5.2.tar"; - sha256 = "0pl5cnziilm4ps1xzh1fa8irazn7vcp9nsxnxcvjqbkflpcpq5c7"; + sha256 = "1706m5ya6q0jf8mzfkqn47aqd7ygm88fm7pvzbd4cry30mjs5vki"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib ]; meta = { homepage = "https://elpa.gnu.org/packages/dismal.html"; license = lib.licenses.free; @@ -1490,7 +1490,7 @@ version = "1.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/djvu-1.1.2.tar"; - sha256 = "0i7xwgg2fxndy81lnng6fh9iknals8xvx4f1nmxq7c099bzwb57c"; + sha256 = "0z74aicvy680m1d6v5zk5pcpkd310jqqdxadpjcbnjcybzp1zisq"; }; packageRequires = []; meta = { @@ -1505,7 +1505,7 @@ version = "0.1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/do-at-point-0.1.1.tar"; - sha256 = "0y58a0x0pfk52h1cz930sbwr9y6nzy9g8f3935pk34dj2jf92rsj"; + sha256 = "1lqnarb9jiig85j3dv37jsqkmmfbcwb52i2akimzf9r57pypiylk"; }; packageRequires = [ emacs ]; meta = { @@ -1520,7 +1520,7 @@ version = "1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/doc-toc-1.2.tar"; - sha256 = "0vz2jyqgx0sf3mhxnnm0fl395a9mcd9fg661pp3mz0pywpl3ymax"; + sha256 = "09xwa0xgnzlaff0j5zy3kam6spcnw0npppc3gf6ka5bizbk4dq99"; }; packageRequires = [ emacs ]; meta = { @@ -1534,8 +1534,8 @@ ename = "docbook"; version = "0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/docbook-0.1.el"; - sha256 = "01x0g8dhw65mzp9mk6qhx9p2bsvkw96hz1awrrf2ji17sp8hd1v6"; + url = "https://elpa.gnu.org/packages/docbook-0.1.tar"; + sha256 = "1kn71kpyb1maww414zgpc1ccgb02mmaiaix06jyqhf75hfxms2lv"; }; packageRequires = []; meta = { @@ -1547,10 +1547,10 @@ elpaBuild { pname = "drepl"; ename = "drepl"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/drepl-0.1.tar"; - sha256 = "0lx94kcxgp8s13w7hz9857r9baqfswvj7vc9frjq4crc4ps7fi7r"; + url = "https://elpa.gnu.org/packages/drepl-0.2.tar"; + sha256 = "1vf61d6iihpnr3h4cyxksd64qj8rw2a9ihjm3krvjmigxr2r6awx"; }; packageRequires = [ comint-mime emacs ]; meta = { @@ -1565,7 +1565,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/dts-mode-1.0.tar"; - sha256 = "0ihwqkv1ddysjgxh01vpayv3ia0vx55ny8ym0mi5b4iz95idj60s"; + sha256 = "16ads9xjbqgmgwzj63anhc6yb1j79qpcnxjafqrzdih1p5j7hrr9"; }; packageRequires = [ emacs ]; meta = { @@ -1580,7 +1580,7 @@ version = "0.2.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/easy-escape-0.2.1.tar"; - sha256 = "19blpwka440y6r08hzzaz61gb24jr6a046pai2j1a3jg6x9fr3j5"; + sha256 = "0mwam1a7sl90aqgz6mj3zm0w1dq15b5jpxmwxv21xs1imyv696ci"; }; packageRequires = []; meta = { @@ -1595,7 +1595,7 @@ version = "0.9.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/easy-kill-0.9.5.tar"; - sha256 = "0h8rzd23sgkj3vxnyhis9iyq8n3xqp9x1mvxlm61s6wwj9j398j6"; + sha256 = "1nwhqidy5zq6j867b21zng5ppb7n56drnhn3wjs7hjmkf23r63qy"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1610,7 +1610,7 @@ version = "0.8.22"; src = fetchurl { url = "https://elpa.gnu.org/packages/ebdb-0.8.22.tar"; - sha256 = "12sydb2lm571096gpb8r0jpg19wiqpl52rcnrhkvzlhzxgg18pg5"; + sha256 = "0nmrhjk2ddml115ibsy8j4crw5hzq9fa94v8y41iyj9h3gf8irzc"; }; packageRequires = [ emacs seq ]; meta = { @@ -1624,8 +1624,8 @@ ename = "ebdb-gnorb"; version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.el"; - sha256 = "0bma7mqilp3lfgv0z2mk6nnqzh1nn1prkz2aiwrs4hxwydmda13i"; + url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.tar"; + sha256 = "1kwcrg268vmskls9p4ccs6ybdip30cb4fw3xzq11gqjch1nssh18"; }; packageRequires = [ ebdb gnorb ]; meta = { @@ -1640,7 +1640,7 @@ version = "1.3.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.2.tar"; - sha256 = "06ii9xi2y157vfbhx75mn80ash22d1xgcyp9kzz1s0lkxwlv74zj"; + sha256 = "1qyia40z6ssvnlpra116avakyf81vqn42860ny21g0zsl99a58j2"; }; packageRequires = [ ebdb pyim ]; meta = { @@ -1655,7 +1655,7 @@ version = "2.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/ediprolog-2.2.tar"; - sha256 = "021jm5zdxrjg7xcja18vgc2v52rk17xi1k7xxw8q802nmixhy0js"; + sha256 = "13g8y51lvdphi1v6rdca36c0r9v35lldx5979yrccsf07h0hw5gm"; }; packageRequires = []; meta = { @@ -1670,7 +1670,7 @@ version = "20240309"; src = fetchurl { url = "https://elpa.gnu.org/packages/eev-20240309.tar"; - sha256 = "0j9hz5raxrk3d2ashbsp9yvi04d5ap0chb4lpljr4pbh2lnyjr4h"; + sha256 = "0nn6jdc37n2nx3i97ljl5a37dwxv5qx12ar15yr702hbsgaxyfa5"; }; packageRequires = [ emacs ]; meta = { @@ -1685,7 +1685,7 @@ version = "1.6.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/ef-themes-1.6.1.tar"; - sha256 = "1ms0rqivxdsbx7jv6d5h1khvm4ghml152ab831chg4z77apmq1ga"; + sha256 = "0wkiqjnqnxwzskpxam44qxxz13fbpgnf17c1qrin8ad8i9b49bvq"; }; packageRequires = [ emacs ]; meta = { @@ -1710,7 +1710,7 @@ version = "1.17"; src = fetchurl { url = "https://elpa.gnu.org/packages/eglot-1.17.tar"; - sha256 = "1can988d7qdn0dj4wg8adjz1s9j5yin8bcp7ylhq1pr327d5flky"; + sha256 = "1cnx522wb49f1dkm80sigz3kvzrblmq5b1lnfyq9wdnh6zdm4l00"; }; packageRequires = [ eldoc @@ -1739,7 +1739,7 @@ version = "1.12.6.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/el-search-1.12.6.1.tar"; - sha256 = "150f4rirg107hmzpv8ifa32k2mgf07smbf9z44ln5rh8n17xwqah"; + sha256 = "1vq8cp2icpl8vkc9r8brzbn0mpaj03mnvdz1bdqn8nqrzc3w0h24"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -1754,7 +1754,7 @@ version = "1.15.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/eldoc-1.15.0.tar"; - sha256 = "1wn7q2f19lfdc3b639ffhbmsglnm3zc6rvgyc6amqwnpc2n2gkdl"; + sha256 = "05fgk3y2rp0xrm3x0xmf9fm72l442y7ydxxg3xk006d9cq06h8kz"; }; packageRequires = [ emacs ]; meta = { @@ -1768,8 +1768,8 @@ ename = "electric-spacing"; version = "5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/electric-spacing-5.0.el"; - sha256 = "1jk6v84z0n8jljzsz4wk7rgzh7drpfvxf4bp6xis8gapnd3ycfyv"; + url = "https://elpa.gnu.org/packages/electric-spacing-5.0.tar"; + sha256 = "1gr35nri25ycxr0wwkypky8zv43nnfrilx4jaj66mb9jsyix6smi"; }; packageRequires = []; meta = { @@ -1784,7 +1784,7 @@ version = "1.14"; src = fetchurl { url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.14.tar"; - sha256 = "1n9p4kl4d5rcbjgl8yifv0nqnrzxsx937fm0d2j589gg28rzlqpb"; + sha256 = "050wja4axngnxggfxhg4b4lcbf1q674zr933r9qkc3ww731f42qa"; }; packageRequires = []; meta = { @@ -1796,10 +1796,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.8.13"; + version = "0.9.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ellama-0.8.13.tar"; - sha256 = "012j3rnvwj8ajyjdlgdx6nrs773i71dyl5brs0jgx010jibzmafi"; + url = "https://elpa.gnu.org/packages/ellama-0.9.1.tar"; + sha256 = "1kyylhavqa2wsgjgqybg25aiz0fyw4njpady2k2xhry5jw9i78vs"; }; packageRequires = [ emacs llm spinner ]; meta = { @@ -1814,7 +1814,7 @@ version = "1.4.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/emacs-gc-stats-1.4.2.tar"; - sha256 = "19wb4s7bm9fhkbjw28fi5pkxzqnkc7wrx338vgrrzyaficblkcps"; + sha256 = "055ma32r92ksjnqy8xbzv0a79r7aap12h61dj860781fapfnifa3"; }; packageRequires = [ emacs ]; meta = { @@ -1826,10 +1826,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-1.0.tar"; - sha256 = "01kgln4hvy0hfga7syjvrdvwwalx93pq0s2na0qyvy44rsszlwwh"; + url = "https://elpa.gnu.org/packages/embark-1.1.tar"; + sha256 = "074ggh7dkr5jdkwcndl6znhkq48jmc62rp7mc6vjidr6yxf8d1rn"; }; packageRequires = [ compat emacs ]; meta = { @@ -1847,10 +1847,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-consult-1.0.tar"; - sha256 = "18zbaanza8vvrmk3gbj0glijyxgb4qd7yzc46lv9fr7xr4l58jqc"; + url = "https://elpa.gnu.org/packages/embark-consult-1.1.tar"; + sha256 = "06yh6w4zgvvkfllmcr0szsgjrfhh9rpjwgmcrf6h2gai2ps9xdqr"; }; packageRequires = [ compat consult emacs embark ]; meta = { @@ -1872,10 +1872,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.14"; + version = "0.15"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ement-0.14.tar"; - sha256 = "02ay594byrlwkcl85drxn82fgvlzf11l9rl4hbk9phz9axy2mgyw"; + url = "https://elpa.gnu.org/packages/ement-0.15.tar"; + sha256 = "0mphkvmsmrfyr3prr5a2x6ijr27z96ixpaxs9871kn7f1x0brn5r"; }; packageRequires = [ emacs @@ -1904,7 +1904,7 @@ version = "19"; src = fetchurl { url = "https://elpa.gnu.org/packages/emms-19.tar"; - sha256 = "13c884s92ddn52psgkaz3zvb94g23gq41dbidpx7x4gzdhd9qqxm"; + sha256 = "1k0hybw826f2hlw8m0aihkydlkdzjsgvrfibpsqrxxcn9d7zxwjd"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1919,7 +1919,7 @@ version = "0.3.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/engrave-faces-0.3.1.tar"; - sha256 = "1q4sjl2rvcfwcirm32nmi53258ln71yhh1dgszlxwknm38a14v3i"; + sha256 = "0nl5wx61192dqd0191dvaszgjc7b2adrxsyc75f529fcyrfwgqfa"; }; packageRequires = [ emacs ]; meta = { @@ -1934,7 +1934,7 @@ version = "2.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/enwc-2.0.tar"; - sha256 = "17w35b06am5n19nlq00ni5w3jvys9i7swyw4glb7081d2jbij2mn"; + sha256 = "0y8154ykrashgg0bina5ambdrxw2qpimycvjldrk9d67hrccfh3m"; }; packageRequires = [ emacs ]; meta = { @@ -1984,7 +1984,7 @@ version = "5.16.10.12"; src = fetchurl { url = "https://elpa.gnu.org/packages/ergoemacs-mode-5.16.10.12.tar"; - sha256 = "1zfzjmi30lllrbyzicmp11c9lpa82g57wi134q9bajvzn9ryx4jr"; + sha256 = "0s4lwb76c67npbcnvbxdawnj02zkc85sbm392lym1qccjmj9d02f"; }; packageRequires = [ cl-lib emacs undo-tree ]; meta = { @@ -1999,7 +1999,7 @@ version = "24.1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/ess-24.1.1.tar"; - sha256 = "1gy1yp6svr8agv38rikmfcji570n80c8jqssrcrrgrq3a2k9j34h"; + sha256 = "11hn571q8vpjy1kx8d1hn8mm2sna0ar1q2z4vmb6rwqi9wsda6a0"; }; packageRequires = [ emacs ]; meta = { @@ -2023,7 +2023,7 @@ version = "1.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/excorporate-1.1.2.tar"; - sha256 = "11w53idm7m20jhmwnj9wiqiv6fzydjrgy2s3mp36barlj3xq0l0z"; + sha256 = "111wvkn0ks7syfgf1cydq5s0kymha0j280xvnp09zcfbj706yhbw"; }; packageRequires = [ cl-lib @@ -2046,7 +2046,7 @@ version = "1.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/expand-region-1.0.0.tar"; - sha256 = "04xwdcxahymppcyvkfh2bn2f4fs4f8z27kycva67i6qldhashq7y"; + sha256 = "1rjx7w4gss8sbsjaljraa6cjpb57kdpx9zxmr30kbifb5lp511rd"; }; packageRequires = [ emacs ]; meta = { @@ -2061,7 +2061,7 @@ version = "1.3.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/expreg-1.3.1.tar"; - sha256 = "13s3hq6nfnv4md2z704ad1axqnir0drz9vvhvisrlp2lis16xzik"; + sha256 = "12msng4ypmw6s3pja66kkjxkbadla0fxmak1r3drxiihpwmh5zm6"; }; packageRequires = [ emacs ]; meta = { @@ -2076,7 +2076,7 @@ version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/external-completion-0.1.tar"; - sha256 = "12pddwp5jby2icshj77w4kwxv75zi00jdxw18f721d7zx3l7q668"; + sha256 = "1bw2kvz7zf1s60d37j31krakryc1kpyial2idjy6ac6w7n1h0jzc"; }; packageRequires = []; meta = { @@ -2091,7 +2091,7 @@ version = "0.28"; src = fetchurl { url = "https://elpa.gnu.org/packages/exwm-0.28.tar"; - sha256 = "00h5awqazk807zxvb02a9dp8gd5ifi3y1kcwmr1czk6kdmkjx32l"; + sha256 = "11j1ciyrnzkbcb7ffgs670mxqd1xbxf41c6jwnwwqjfzmqhsm0m4"; }; packageRequires = [ xelb ]; meta = { @@ -2121,7 +2121,7 @@ version = "0.2.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/face-shift-0.2.1.tar"; - sha256 = "115959sgy7jivb5534rkm5mbqpjayfci9wpzx75p7cjsn02hfi0p"; + sha256 = "14sbafkxr7kmv6sd5rw7d7hcsh0hhx92wkh6arfbchxad8jzimr6"; }; packageRequires = [ emacs ]; meta = { @@ -2136,7 +2136,7 @@ version = "0.2.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/filechooser-0.2.0.tar"; - sha256 = "1pl6n6d6gymdm0gx0nz96hwps8v1s2zpqph41d0h5hdvsvxacx6w"; + sha256 = "1fjf8bmdrrrgbv4sgx4nry5pl8plg9kyzyfd038985v3dsqasi9q"; }; packageRequires = [ compat emacs ]; meta = { @@ -2150,8 +2150,8 @@ ename = "filladapt"; version = "2.12.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/filladapt-2.12.2.el"; - sha256 = "1cxyxfdjg1dsmn1jrl6b7xy03xr42fb6vyggh27s4dk417ils6yg"; + url = "https://elpa.gnu.org/packages/filladapt-2.12.2.tar"; + sha256 = "0nmgw6v2krxn5palddqj1jzqxrajhpyq9v2x9lw12cdcldm9ab4k"; }; packageRequires = [ emacs ]; meta = { @@ -2169,7 +2169,7 @@ version = "0.9.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/firefox-javascript-repl-0.9.5.tar"; - sha256 = "0ml59kiigqnss84az1c8hp87bmcs9dngz01ly63x47wfym2af8mi"; + sha256 = "07qmp6hfzgljrl9gkwy673xk67b3bgxq4kkw2kzr8ma4a7lx7a8l"; }; packageRequires = [ emacs ]; meta = { @@ -2177,16 +2177,16 @@ license = lib.licenses.free; }; }) {}; - flylisp = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + flylisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "flylisp"; ename = "flylisp"; version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flylisp-0.2.el"; - sha256 = "0hh09qy1xwlv52lsh49nr11h4lk8qlmk06b669q494d79hxyv4v6"; + url = "https://elpa.gnu.org/packages/flylisp-0.2.tar"; + sha256 = "1agny4hc75xc8a9f339bynsazmxw8ccvyb03qx1d6nvwh9d7v1b9"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = []; meta = { homepage = "https://elpa.gnu.org/packages/flylisp.html"; license = lib.licenses.free; @@ -2199,7 +2199,7 @@ version = "1.3.7"; src = fetchurl { url = "https://elpa.gnu.org/packages/flymake-1.3.7.tar"; - sha256 = "07n72y77q1vqvz1rv36jq1cxdp1brp572plvsi2g6mizif5y531z"; + sha256 = "15ikzdqyh77cgx94jaigfrrzfvwvpca8s2120gi82i9aaiypr7jl"; }; packageRequires = [ eldoc emacs project ]; meta = { @@ -2218,7 +2218,7 @@ version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/flymake-codespell-0.1.tar"; - sha256 = "0r1g0imh9azy1yf0naxif80vmzrjvn5dx3lcrlpj70xb86wzliym"; + sha256 = "1x1bmdjmdaciknd702z54002bi1a5n51vvn9g7j6rnzjc1dxw97f"; }; packageRequires = [ compat emacs ]; meta = { @@ -2233,7 +2233,7 @@ version = "0.3.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/flymake-proselint-0.3.0.tar"; - sha256 = "1x1hp06hggywmpbimyw4cg0cyg7g9v39r552ypivq9pvz94kmkp0"; + sha256 = "0bq7nc1qiqwxi848xy7wg1ig8k38nmq1w13xws10scjvndlbcjpl"; }; packageRequires = [ emacs ]; meta = { @@ -2245,10 +2245,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fontaine-1.0.0.tar"; - sha256 = "1p34d84z87s2zsfxdc18bjpif21fdixfzv2k4b9g4i0pcr94nc4v"; + url = "https://elpa.gnu.org/packages/fontaine-2.0.0.tar"; + sha256 = "1h3hsqfx16ff0s776xvnafrlmj0m0r66hjra1mq2j55ahvh0aavk"; }; packageRequires = [ emacs ]; meta = { @@ -2262,8 +2262,8 @@ ename = "frame-tabs"; version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/frame-tabs-1.1.el"; - sha256 = "0fx9zc7mvyl703k7sjjcvffm2qw42ncr7r3d4fm0h45p9pi83svz"; + url = "https://elpa.gnu.org/packages/frame-tabs-1.1.tar"; + sha256 = "1a7hklir19inai68azgyfiw1bzq5z57kkp33lj6qbxxvfcqvw62w"; }; packageRequires = []; meta = { @@ -2277,8 +2277,8 @@ ename = "frog-menu"; version = "0.2.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/frog-menu-0.2.11.el"; - sha256 = "06iw11z61fd0g4w3562k3smcmzaq3nivvvc6gzm8y8k5pcrqzdff"; + url = "https://elpa.gnu.org/packages/frog-menu-0.2.11.tar"; + sha256 = "1iwyg9z8i03p9kkz6vhv00bzsqrsgl4xqqh08icial29c80q939l"; }; packageRequires = [ avy emacs posframe ]; meta = { @@ -2292,8 +2292,8 @@ ename = "fsm"; version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fsm-0.2.1.el"; - sha256 = "1jyxyqdbfl8nv7c50q0sg3w5p7whp1sqgi7w921k5hfar4d11qqp"; + url = "https://elpa.gnu.org/packages/fsm-0.2.1.tar"; + sha256 = "0kvm16077bn6bpbyw3k5935fhiq86ry2j1zcx9sj7dvb9w737qz4"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2308,7 +2308,7 @@ version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/ftable-1.1.tar"; - sha256 = "0ww2kl5gb2dkkz0dxinjjnd3qafr31qjcqp1x10r3vcfbp9cfy4b"; + sha256 = "052vqw8892wv8lh5slm90gcvfk7ws5sgl1mzbdi4d3sy4kc4q48h"; }; packageRequires = [ emacs ]; meta = { @@ -2322,8 +2322,8 @@ ename = "gcmh"; version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gcmh-0.2.1.el"; - sha256 = "0a51bkkfdj3x26yalvk7v35rxbl3m1wk6n0f33zhrhl6i5fsrfin"; + url = "https://elpa.gnu.org/packages/gcmh-0.2.1.tar"; + sha256 = "030w493ilmc7w13jizwqsc33a424qjgicy1yxvlmy08yipnw3587"; }; packageRequires = [ emacs ]; meta = { @@ -2338,7 +2338,7 @@ version = "0.9.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/ggtags-0.9.0.tar"; - sha256 = "0p79x9g94jynl83ndvqp9349vhgkzxzhnc517r8hn44iqxqf6ghg"; + sha256 = "02gj8ghkk35clyscbvp1p1nlhmgm5h9g2cy4mavnfmx7jikmr4m3"; }; packageRequires = [ emacs ]; meta = { @@ -2353,7 +2353,7 @@ version = "0.6.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/gited-0.6.0.tar"; - sha256 = "187asqrxfpxv53hhnrcid1sy46vcy07qx5yqgnrczi54jpcc57j5"; + sha256 = "1s2h6y1adh28pvm3h5bivfja2nqnzm8w9sfza894pxf96kwk3pg2"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2367,8 +2367,8 @@ ename = "gle-mode"; version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gle-mode-1.1.el"; - sha256 = "0p9glalhkf8i4486pjwvrb9z4lqxl6jcqfk6jrjl6b1xi72xmdi0"; + url = "https://elpa.gnu.org/packages/gle-mode-1.1.tar"; + sha256 = "12vbif4b4j87z7fg18dlcmzmbs2fp1g8bgsk5rch9h6dblg72prq"; }; packageRequires = [ cl-lib ]; meta = { @@ -2383,7 +2383,7 @@ version = "1.0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/gnat-compiler-1.0.3.tar"; - sha256 = "1l5j3br5yrhp3ic0va666ar636hywfd8vssxma3gc858zb9qbzw2"; + sha256 = "1chydgswab2m81m3kbd31b1akyw4v1c9468wlfxpg2yydy8fc7vs"; }; packageRequires = [ emacs wisi ]; meta = { @@ -2413,7 +2413,7 @@ version = "1.6.11"; src = fetchurl { url = "https://elpa.gnu.org/packages/gnorb-1.6.11.tar"; - sha256 = "0724i8p1hywgbfk0czxvrcwlwigj8r7x6ww0ap3k2sg90531ymws"; + sha256 = "1y0xpbifb8dm8hd5i9g8jph4jm76wviphszl5x3zi6w053jpss9b"; }; packageRequires = [ cl-lib ]; meta = { @@ -2428,7 +2428,7 @@ version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/gnu-elpa-1.1.tar"; - sha256 = "0b0law1xwwqa42wb09b3w73psq2kx16lkiwxjxl0sshjcmarhv8r"; + sha256 = "01cw1r5y86q1aardpvcwvwq161invrzxd0kv4qqi5agaff2nbp26"; }; packageRequires = []; meta = { @@ -2445,7 +2445,7 @@ version = "2022.12"; src = fetchurl { url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2022.12.tar"; - sha256 = "1kij50xw5km14x44zjsfc1cdkz4xq79nv7hgfjsz3pgypq672z5z"; + sha256 = "0pabqsfw0d9knfigpcsrwfw7qrf2vlg9h0i582212gsqd7snlnxb"; }; packageRequires = []; meta = { @@ -2465,7 +2465,7 @@ version = "3.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/gnugo-3.1.2.tar"; - sha256 = "138gzdyi8scqimvs49da66j8f5a43bhgpasn1bxzdj2zffwlwp6g"; + sha256 = "0wingn5v4wa1xgsgmqqls28cifnff8mvm098kn8clw42mxr40257"; }; packageRequires = [ ascii-art-to-unicode cl-lib xpm ]; meta = { @@ -2480,7 +2480,7 @@ version = "0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/gnus-mock-0.5.tar"; - sha256 = "1lyh1brb68zaasnw2brymsspcyl3jxmnvbvpvrqfxhhl3fq9nbv1"; + sha256 = "1yl624wzs4kw45zpnxh04dxn1kkpb6c2jl3i0sm1bijyhm303l4h"; }; packageRequires = []; meta = { @@ -2494,8 +2494,8 @@ ename = "gpastel"; version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gpastel-0.5.0.el"; - sha256 = "1wky6047071vgyyw2m929nbwg4d9qqp1mjqwk7a5rs8hfr4xqxfw"; + url = "https://elpa.gnu.org/packages/gpastel-0.5.0.tar"; + sha256 = "12y1ysgnqjvsdp5gal90mp2wplif7rq1cj61393l6gf3pgv6jkzc"; }; packageRequires = [ emacs ]; meta = { @@ -2515,7 +2515,7 @@ version = "1.0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/gpr-mode-1.0.5.tar"; - sha256 = "1ksafa4nfd4n1kdxpjk6i59l5rxfdmcqjkkpmmc8w402xka0vwn4"; + sha256 = "1qdk2pkdxggfhj8gm39jb2b29g0gbw50vgil6rv3z0q7nlhpm2fp"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -2535,7 +2535,7 @@ version = "1.0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/gpr-query-1.0.4.tar"; - sha256 = "0a6wrkjqszqq4d0a1amrp7yx4w2hwjbyy7qxd40k9n1vdp7jbzri"; + sha256 = "1y283x549w544x37lmh25n19agyah2iz0b052hx8br4rnjdd9ii3"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -2550,7 +2550,7 @@ version = "0.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/graphql-0.1.2.tar"; - sha256 = "1mzgz4piszm0v18gdn63xb46zqd1r17fkh24rw863i0p1achl21m"; + sha256 = "1blpsj6sav3z9gj733cccdhpdnyvnvxp48z1hnjh0f0fl5avvkix"; }; packageRequires = [ emacs ]; meta = { @@ -2562,10 +2562,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.9.19"; + version = "0.9.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/greader-0.9.19.tar"; - sha256 = "1d04d1shzb505qs2mf7387dvl56pwlwh4b349s5fq2prwqrq71l7"; + url = "https://elpa.gnu.org/packages/greader-0.9.20.tar"; + sha256 = "11n88xmr2qa5as5kpy4yy616nlh08nw5rkcbgmf9skgka3g1hmip"; }; packageRequires = [ emacs ]; meta = { @@ -2579,8 +2579,8 @@ ename = "greenbar"; version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/greenbar-1.1.el"; - sha256 = "01ixv3489zdx2b67zqad6h7g8cpnzpzrvvkqyx7csqyrfx0qy27n"; + url = "https://elpa.gnu.org/packages/greenbar-1.1.tar"; + sha256 = "14azd170xq602fy4mcc770x5063rvpms8ilbzzn8kwyfvmijlbbx"; }; packageRequires = []; meta = { @@ -2592,10 +2592,10 @@ elpaBuild { pname = "gtags-mode"; ename = "gtags-mode"; - version = "1.1"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gtags-mode-1.1.tar"; - sha256 = "0fgs6iqrivmyxfkjl6hxxs3zfjkkdas61z34q08qfjgw0ixz188h"; + url = "https://elpa.gnu.org/packages/gtags-mode-1.5.tar"; + sha256 = "15jmynzm2xrvb410vka3jzzdcxbsm3vkihz27yzym708jb0bd8ji"; }; packageRequires = [ emacs ]; meta = { @@ -2630,7 +2630,7 @@ version = "1.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/hcel-1.0.0.tar"; - sha256 = "1j6snbyi710qnxr68mbmj1v2i6gqf6znd872fkjkyj85pg3iibia"; + sha256 = "1pm3d0nz2mpf667jkjlmlidh203i4d4gk0n8xd3r66bzwc4l042b"; }; packageRequires = [ emacs ]; meta = { @@ -2644,8 +2644,8 @@ ename = "heap"; version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/heap-0.5.el"; - sha256 = "13qv0w3fi87c85jcy7lv359r6rpsgnp5zzs2f2zq4dl3540wzrxg"; + url = "https://elpa.gnu.org/packages/heap-0.5.tar"; + sha256 = "1q42v9mzmlhl4pr3wr94nsis7a9977f35w0qsyx2r982kwgmbndw"; }; packageRequires = []; meta = { @@ -2660,7 +2660,7 @@ version = "1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/hiddenquote-1.2.tar"; - sha256 = "1ssfy1ha5a1pakihmkifry200k7z1mxcgl4w9pwvp7wmzbkv2zql"; + sha256 = "051aqiq77n487lnsxxwa8q0vyzk6m2fwi3l7xwvrl49p5xpia6zr"; }; packageRequires = [ emacs ]; meta = { @@ -2676,8 +2676,8 @@ ename = "highlight-escape-sequences"; version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.4.el"; - sha256 = "1z8r9rnppn7iy7xv4kprfsqxday16h7c471i7rkyi3rv3l0pfxd0"; + url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.4.tar"; + sha256 = "1gs662vvvzrqdlb1z73jf6wykjzs1jskcdksk8akqmply4sjvbpr"; }; packageRequires = []; meta = { @@ -2707,7 +2707,7 @@ version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/html5-schema-0.1.tar"; - sha256 = "19k1jal6j64zq78w8h0lw7cljivmp2jzs5sa1ppc0mqkpn2hyq1i"; + sha256 = "018zvdjhdrkcy8yrsqqqikhl6drmqm1fs0y50m8q8vx42p0cyi1p"; }; packageRequires = []; meta = { @@ -2722,7 +2722,7 @@ version = "0.15.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/hydra-0.15.0.tar"; - sha256 = "1mppx20920kfq97wd7mkrn4bcmm46k5m8wqm49asd54w701iq3n1"; + sha256 = "082wdr2nsfz8jhh7ic4nq4labz0pq8lcdwnxdmw79ppm20p2jipk"; }; packageRequires = [ cl-lib lv ]; meta = { @@ -2737,7 +2737,7 @@ version = "9.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/hyperbole-9.0.1.tar"; - sha256 = "0a7py2dvszh0rf2smbmm8msjrc8vbbvlqnsqw0m2l12v8vllmxnb"; + sha256 = "0gjscqa0zagbymm6wfilvc8g68f8myv90ryd8kqfcpy81fh4dhiz"; }; packageRequires = [ emacs ]; meta = { @@ -2752,7 +2752,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/ilist-0.3.tar"; - sha256 = "1gg77fnk2ky5z5153axszs43a9npb1xg56ik23rz45xl9hg7v8as"; + sha256 = "01a522sqx7j5m6b1k8xn71963igm93cd7ms1aawh1v2wmb09vbhm"; }; packageRequires = []; meta = { @@ -2767,7 +2767,7 @@ version = "0.36"; src = fetchurl { url = "https://elpa.gnu.org/packages/inspector-0.36.tar"; - sha256 = "139w0qc99grd6yzxkpfblgddnbza02mh4hhcpbjgsm4bwdxq8az0"; + sha256 = "0hbh4a71w4yxicn7v7v492i7iv0ncv5sxwwsbwknbl9ixm482h2z"; }; packageRequires = [ emacs ]; meta = { @@ -2782,7 +2782,7 @@ version = "2.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/ioccur-2.6.tar"; - sha256 = "0k7nr73gmd0z5zqkwdacvfsmyflri3f15a15zpr7va28pnxqzsdk"; + sha256 = "0xyx5xd46n5x078k7pv022h84xmxv7fkh31ddib872bmnirhk6ln"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2797,7 +2797,7 @@ version = "0.8"; src = fetchurl { url = "https://elpa.gnu.org/packages/isearch-mb-0.8.tar"; - sha256 = "06241rwz01z4ysgmizczq12zl0cc6xvfyds48glzk1jp82zp4adp"; + sha256 = "1b4929vr5gib406p51zcvq1ysmzvnz6bs1lqwjp517kzp6r4gc5y"; }; packageRequires = [ emacs ]; meta = { @@ -2811,8 +2811,8 @@ ename = "iterators"; version = "0.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/iterators-0.1.1.el"; - sha256 = "1r2cz2n6cr6wal5pqiqi5pn28pams639czgrvd60xcqmlr3li3g5"; + url = "https://elpa.gnu.org/packages/iterators-0.1.1.tar"; + sha256 = "1xcqvj9dail1irvj2nbfx9x106mcav104pp89jz2diamrky6ja49"; }; packageRequires = [ emacs ]; meta = { @@ -2827,7 +2827,7 @@ version = "0.14.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/ivy-0.14.2.tar"; - sha256 = "1zjksh0jvxyqhzgwmh9i26gaip6c04q400xckh730r2gjs287pjj"; + sha256 = "1h9gfkkcw9nfw85m0mh08qfmi2y0jkvdk54qx0iy5p04ysmhs6k1"; }; packageRequires = [ emacs ]; meta = { @@ -2842,7 +2842,7 @@ version = "0.14.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/ivy-avy-0.14.2.tar"; - sha256 = "0vdrfn2i078567lklhxfhzq2cjplfpawyq2rzpdpww0fzz6fi426"; + sha256 = "12s5z3h8bpa6vdk7f54i2dy18hd3p782pq3x6mkclkvlxijv7d11"; }; packageRequires = [ avy emacs ivy ]; meta = { @@ -2856,8 +2856,8 @@ ename = "ivy-explorer"; version = "0.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-explorer-0.3.2.el"; - sha256 = "0q9gy9w22hnq30bfmnpqknk0qc1rcbjcybpjgb8hnlldvcci95l7"; + url = "https://elpa.gnu.org/packages/ivy-explorer-0.3.2.tar"; + sha256 = "0wv7gp2kznc6f6g9ky1gvq72i78ihp582kyks82h13w25rvh6f0a"; }; packageRequires = [ emacs ivy ]; meta = { @@ -2872,7 +2872,7 @@ version = "0.14.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/ivy-hydra-0.14.2.tar"; - sha256 = "10qav0rvgc5bnlazjiwnv9dlk6hivl4acif0zq2f0qqgld9nh528"; + sha256 = "1p08rpj3ac2rwjcqbzkq9r5pmc1d9ci7s9bl0qv5cj5r8wpl69mx"; }; packageRequires = [ emacs hydra ivy ]; meta = { @@ -2892,7 +2892,7 @@ version = "0.6.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.3.tar"; - sha256 = "0b498qzaydjrhplx4d7zcrs883dlrhfiz812sv4m3pmhfwifcchh"; + sha256 = "027lbddg4rc44jpvxsqyw9n9pi1bnsssfislg2il3hbr86v88va9"; }; packageRequires = [ emacs ivy posframe ]; meta = { @@ -2907,7 +2907,7 @@ version = "0.0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/jami-bot-0.0.4.tar"; - sha256 = "1gspzqxznqskc008bcix2fyg1brr3xzxzbqx18q4cy4mz0vm8h1b"; + sha256 = "1dp4k5y7qy793m3fyxvkk57bfy42kac2w5wvy7zqzd4lckm0a93z"; }; packageRequires = [ emacs ]; meta = { @@ -2922,7 +2922,7 @@ version = "0.11.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/jarchive-0.11.0.tar"; - sha256 = "1hn0lyszm667a54j95v2ppddz4g89cp8byj9pd3k1gha2rplm9d8"; + sha256 = "17klpdrv74hgpwnhknbihg90j6sbikf4j62lq0vbfv3s7r0a0gb8"; }; packageRequires = [ emacs ]; meta = { @@ -2937,7 +2937,7 @@ version = "0.9.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/javaimp-0.9.1.tar"; - sha256 = "106wn53z39fcna3sv4p0idmjg9lg5lijm5hyb4lbibp4s5yh2y3b"; + sha256 = "1gy7qys9mzpgbqm5798fncmblmi32b350q51ccsyydq67yh69s3z"; }; packageRequires = []; meta = { @@ -2951,8 +2951,8 @@ ename = "jgraph-mode"; version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jgraph-mode-1.1.el"; - sha256 = "0479irjz5r79x6ngl3lfkl1gqsmvcw8kn6285sm6nkn66m1dfs8l"; + url = "https://elpa.gnu.org/packages/jgraph-mode-1.1.tar"; + sha256 = "1ryxbszp15dy2chch2irqy7rmcspfjw717w4rd0vxjpwvgkjgiql"; }; packageRequires = [ cl-lib ]; meta = { @@ -2964,10 +2964,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.4"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jinx-1.4.tar"; - sha256 = "1vv85pbhcpwjvd3iwnr8ksjpbydrsk7m3zm34hcbybg703yk2nl7"; + url = "https://elpa.gnu.org/packages/jinx-1.6.tar"; + sha256 = "0jy2g587930d4jqi4asrci3411bby9j6wrxczyskacvjs41vqyip"; }; packageRequires = [ compat emacs ]; meta = { @@ -2982,7 +2982,7 @@ version = "0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/jit-spell-0.4.tar"; - sha256 = "1p83spcq52l7k63p56y3w5r3kl49wbrs4abynwn25ikhkd4wl8x3"; + sha256 = "0p9nf2n0x6c6xl32aczghzipx8n5aq7a1x6r2s78xvpwr299k998"; }; packageRequires = [ compat emacs ]; meta = { @@ -2997,7 +2997,7 @@ version = "20231224"; src = fetchurl { url = "https://elpa.gnu.org/packages/js2-mode-20231224.tar"; - sha256 = "1yc7rs748dwpbxy2bqxfspinfiay28qh8l0fly1k76fhk159rwj4"; + sha256 = "023z76zxh5q6g26x7qlgf9476lj95sj84d5s3aqhy6xyskkyyg6c"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3011,8 +3011,8 @@ ename = "json-mode"; version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/json-mode-0.2.el"; - sha256 = "16ph6v9snvlmclg9shnyck86dqvlj4lf8205dhqx4l8vmhfy3d14"; + url = "https://elpa.gnu.org/packages/json-mode-0.2.tar"; + sha256 = "1ix8nq9rjfgbq8vzzjp179j2wa11il0ys8fjjy9gnlqwk6lnk86h"; }; packageRequires = [ emacs ]; meta = { @@ -3027,7 +3027,7 @@ version = "1.0.25"; src = fetchurl { url = "https://elpa.gnu.org/packages/jsonrpc-1.0.25.tar"; - sha256 = "0hlc70xlm3a53il7k24s6s25dhnd09l2454r5qkpfnjdz9p5ih6f"; + sha256 = "18f0g8j1rd2fpa707w6fll6ryj7mg6hbcy2pc3xff2a4ps8zv12b"; }; packageRequires = [ emacs ]; meta = { @@ -3042,7 +3042,7 @@ version = "3.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/jumpc-3.1.tar"; - sha256 = "04wqajw4i7sslsw8cwqbw30kbwwf9qlqxjm17v0bsxh5sp27y1jc"; + sha256 = "1c6wzwrr1ydpn5ah5xnk159xcn4v1gv5rjm4iyfj83dss2ygirzp"; }; packageRequires = []; meta = { @@ -3057,7 +3057,7 @@ version = "0.2.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/kind-icon-0.2.2.tar"; - sha256 = "1jpc4izbi5ajqqrvvfp5yqfmljaw2mq06ym36d4p2cxkz95vcmi7"; + sha256 = "1zafx7rvfyahb7zzl2n9gpb2lc8x3k0bkcap2fl0n54aw4j98i69"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -3072,7 +3072,7 @@ version = "1.1.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/kiwix-1.1.5.tar"; - sha256 = "17k4aa8s9m24c572qvl5a481iw9ny6wmd5yrg47iv4d2lb2i13h2"; + sha256 = "1krmlyfjs8b7ibixbmv41vhg1gm7prck6lpp61v17fgig92a9k2s"; }; packageRequires = [ emacs request ]; meta = { @@ -3086,8 +3086,8 @@ ename = "kmb"; version = "0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kmb-0.1.el"; - sha256 = "1wjfk28illfd5bkka3rlhhq59r0pad9zik1njlxym0ha8kbhzsj8"; + url = "https://elpa.gnu.org/packages/kmb-0.1.tar"; + sha256 = "12klfmdjjlyjvrzz3rx8dmamnag1fwljhs05jqwd0dv4a2q11gg5"; }; packageRequires = [ emacs ]; meta = { @@ -3101,8 +3101,8 @@ ename = "landmark"; version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/landmark-1.0.el"; - sha256 = "0mz1l9zc1nvggjhg4jcly8ncw38xkprlrha8l8vfl9k9rg7s1dv4"; + url = "https://elpa.gnu.org/packages/landmark-1.0.tar"; + sha256 = "1nnmnvyfjmkk5ddw4q24py1bqzykr29klip61n16bqpr39v56gpg"; }; packageRequires = []; meta = { @@ -3122,7 +3122,7 @@ version = "1.5.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/latex-table-wizard-1.5.4.tar"; - sha256 = "1vmwx7g79chcr6hrzdjh1ndpnqy8qn52n03789dhmxxr1ji7nk0i"; + sha256 = "1999kh5yi0cg1k0al3np3zi2qhrmcpzxqsfvwg0mgrg3mww4gqlw"; }; packageRequires = [ auctex emacs transient ]; meta = { @@ -3137,7 +3137,7 @@ version = "4.5.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/leaf-4.5.5.tar"; - sha256 = "1rdbrf84ijapiqhq72gy8r5xgk54sf0jy31pgd3w4rl1wywh5cas"; + sha256 = "1nvpl9ffma0ybbr7vlpcj7q33ja17zrswvl91bqljlmb4lb5121m"; }; packageRequires = [ emacs ]; meta = { @@ -3152,7 +3152,7 @@ version = "0.12"; src = fetchurl { url = "https://elpa.gnu.org/packages/lentic-0.12.tar"; - sha256 = "15sb126sq5aw3n09vqydmsl1l5svfar70iz42hnqi783cpw1lh0m"; + sha256 = "0pszjhgy9dlk3h5gc8wnlklgl30ha3ig9bpmw2j1ps713vklfms7"; }; packageRequires = [ dash emacs m-buffer ]; meta = { @@ -3171,7 +3171,7 @@ version = "0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/lentic-server-0.2.tar"; - sha256 = "1vifs91r4rm57rka8by50f8zg5pr2hjqwbdz28mbbxhkj3war6s5"; + sha256 = "1r0jcfylvhlihwm6pm4f8pzvsmnlspfkph1hgi5qjkv311045244"; }; packageRequires = [ lentic web-server ]; meta = { @@ -3185,8 +3185,8 @@ ename = "let-alist"; version = "1.0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/let-alist-1.0.6.el"; - sha256 = "0szj7vnjzz4zci5fvz7xqgcpi4pzdyyf4qi2s8xar2hi7v3yaawr"; + url = "https://elpa.gnu.org/packages/let-alist-1.0.6.tar"; + sha256 = "1fk1yl2cg4gxcn02n2gki289dgi3lv56n0akkm2h7dhhbgfr6gqm"; }; packageRequires = [ emacs ]; meta = { @@ -3201,7 +3201,7 @@ version = "1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/lex-1.2.tar"; - sha256 = "03g5lm6gyh4k8l4iccdl9z0qinr46fkpqlwdw0gdfj9d0b782mbs"; + sha256 = "1pqjrlw558l4z4k40jmli8lmcqlzddhkr0mfm38rbycp7ghdr4zx"; }; packageRequires = []; meta = { @@ -3216,7 +3216,7 @@ version = "1.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/lin-1.0.0.tar"; - sha256 = "0b090g2l8mvm3b6k7s31v9lw48qjcvcif2p201wlqgipddm6s180"; + sha256 = "1yxvpgh3sbw0d0zkjfgbhjc2bziqvkyj7fgwcl3814q7hh8m4146"; }; packageRequires = [ emacs ]; meta = { @@ -3235,10 +3235,10 @@ elpaBuild { pname = "listen"; ename = "listen"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/listen-0.8.tar"; - sha256 = "1vj9fsyp5v1qh87asj23k625080x6c8mgkas4933lrz7l2g7h1y2"; + url = "https://elpa.gnu.org/packages/listen-0.9.tar"; + sha256 = "1g1sv8fs8vl93fah7liaqzgwvc4b1chasx5151ayizz4q2qgwwbp"; }; packageRequires = [ emacs persist taxy taxy-magit-section transient ]; meta = { @@ -3250,10 +3250,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.12.1"; + version = "0.12.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.12.1.tar"; - sha256 = "11z56fqp0y13jmvm2611xyqsz41k01rsqdjvrzvbf33n56vsw713"; + url = "https://elpa.gnu.org/packages/llm-0.12.3.tar"; + sha256 = "19c3i8jfhvc0zqha2mlynk16ws4wgc1hdjrp7gp290bacvr560vg"; }; packageRequires = [ emacs ]; meta = { @@ -3261,31 +3261,31 @@ license = lib.licenses.free; }; }) {}; - lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + lmc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "lmc"; ename = "lmc"; version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/lmc-1.4.el"; - sha256 = "0fm4sclx9gg0d0615smz105x320sk45y4ivpjk3nbc67c5l0sh2h"; + url = "https://elpa.gnu.org/packages/lmc-1.4.tar"; + sha256 = "0c8sd741a7imn1im4j17m99bs6zmppndsxpn23k33lmcqj1rfhsk"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = []; meta = { homepage = "https://elpa.gnu.org/packages/lmc.html"; license = lib.licenses.free; }; }) {}; - load-dir = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + load-dir = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "load-dir"; ename = "load-dir"; version = "0.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/load-dir-0.0.5.el"; - sha256 = "1575ipn155nzzb5yghblxc7v1vpq4i16w1ff7y56qw2498ligpc5"; + url = "https://elpa.gnu.org/packages/load-dir-0.0.5.tar"; + sha256 = "1yxnckd7s4alkaddfs672g0jnsxir7c70crnm6rsc5vhmw6310nx"; }; - packageRequires = [ cl-lib ]; + packageRequires = []; meta = { homepage = "https://elpa.gnu.org/packages/load-dir.html"; license = lib.licenses.free; @@ -3298,7 +3298,7 @@ version = "1.3.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/load-relative-1.3.2.tar"; - sha256 = "1fwa51jp0sq5l69y98l2zyj0iq9s6rj1rnqrmvncif61smma8fd7"; + sha256 = "04ppqfzlqz7156aqm56yccizv0n71qir7yyp7xfiqq6vgj322rqv"; }; packageRequires = []; meta = { @@ -3327,8 +3327,8 @@ ename = "loccur"; version = "1.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/loccur-1.2.4.el"; - sha256 = "00f1ifa4z5ay90bd2002fmj83d7xqzrcr9018q8crlypmpxkyh7j"; + url = "https://elpa.gnu.org/packages/loccur-1.2.4.tar"; + sha256 = "1b8rmbl03k8fdy217ngbxsc0a3jxxmqnwshf72f4iay8ln4hasgk"; }; packageRequires = [ emacs ]; meta = { @@ -3343,7 +3343,7 @@ version = "1.1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/logos-1.1.1.tar"; - sha256 = "1lg4disxfzw9nf438j32q1cna447mlxy3sg523cqzhimh1mk5s9f"; + sha256 = "0dyy1y6225kbmsl5zy4hp0bdnnp06l05m8zqxc22alsivy2qvkjb"; }; packageRequires = [ emacs ]; meta = { @@ -3358,7 +3358,7 @@ version = "1.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/luwak-1.0.0.tar"; - sha256 = "10jcblm0q5948l3ar911dfj6y9p5bggwz9nmq9d3prlgz5zczv34"; + sha256 = "0z6h1cg7nshv87zl4fia6l5gwf9ax6f4wgxijf2smi8cpwmv6j79"; }; packageRequires = [ emacs ]; meta = { @@ -3373,7 +3373,7 @@ version = "0.15.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/lv-0.15.0.tar"; - sha256 = "1xnyk8bvr0bdz68qc1sga3w9lwdga5qpp3m7290z1vyv0mznh4gm"; + sha256 = "1wb8whyj8zpsd7nm7r0yjvkfkr2ml80di7alcafpadzli808j2l4"; }; packageRequires = []; meta = { @@ -3388,7 +3388,7 @@ version = "0.16"; src = fetchurl { url = "https://elpa.gnu.org/packages/m-buffer-0.16.tar"; - sha256 = "1mb03hrszxxsk61yvh70rnkn7iiwx1vx6n1br02clkpn2q2c0mq5"; + sha256 = "16drbgamp7yd1ndw2qrycrgmnknv5k7h4d7svcdhv9az6fg1vzn4"; }; packageRequires = [ seq ]; meta = { @@ -3403,7 +3403,7 @@ version = "3.3.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/map-3.3.1.tar"; - sha256 = "1gvywhdfg27nx6pyq7yfwq9x6j96jama59i5s9rp41pvg2dlmvm0"; + sha256 = "1za8wjdvyxsxvmzla823f7z0s4wbl22l8k08v8b4h4m6i7w356lp"; }; packageRequires = [ emacs ]; meta = { @@ -3415,10 +3415,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-1.5.tar"; - sha256 = "1hc4jjvrwfkqmhb1kvmjzzkmnqfx188ywy1cmxpns1wivnjic79h"; + url = "https://elpa.gnu.org/packages/marginalia-1.6.tar"; + sha256 = "0an3ayka1f7n511bjfwz42h9g5b1vhb6x47jy0k9psscr7pbhszg"; }; packageRequires = [ compat emacs ]; meta = { @@ -3432,8 +3432,8 @@ ename = "markchars"; version = "0.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/markchars-0.2.2.el"; - sha256 = "09a471c2mcjm6ia37xqz0573sy8f68d5ljgnmhrj0v455g1g44lj"; + url = "https://elpa.gnu.org/packages/markchars-0.2.2.tar"; + sha256 = "0jagp5s2kk8ijwxbg5ccq31bjlcxkqpqhsg7a1hbyp3p5z3j73m0"; }; packageRequires = []; meta = { @@ -3448,7 +3448,7 @@ version = "1.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/math-symbol-lists-1.3.tar"; - sha256 = "0h330j7vxmb56z66xgynqlxkr5bnp5id25j0w4ikyms407sdyrbs"; + sha256 = "1r2acaf79kwwvndqn9xbvq9dc12vr3lryc25yp0w0gksp86p8cfa"; }; packageRequires = []; meta = { @@ -3463,7 +3463,7 @@ version = "1.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/mct-1.0.0.tar"; - sha256 = "1gzk0bjvry8wzi35yvghz003rbkz7ky4zd9vafg328b809n9ggff"; + sha256 = "0f8znz4basrdh56pcldsazxv3mwqir807lsaza2g5bfqws0c7h8k"; }; packageRequires = [ emacs ]; meta = { @@ -3477,8 +3477,8 @@ ename = "memory-usage"; version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/memory-usage-0.2.el"; - sha256 = "03qwb7sprdh1avxv3g7hhnhl41pwvnpxcpnqrikl7picy78h1gwj"; + url = "https://elpa.gnu.org/packages/memory-usage-0.2.tar"; + sha256 = "04bylvy86x8w96g7zil3jzyac0fijvb5lz4830ja5yabpvsnk3vq"; }; packageRequires = []; meta = { @@ -3492,8 +3492,8 @@ ename = "metar"; version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/metar-0.3.el"; - sha256 = "07gv0v0xwb5yzynwagmvf0n5c9wljy1jg4ympnxpa2d9r1zqc02g"; + url = "https://elpa.gnu.org/packages/metar-0.3.tar"; + sha256 = "07nf14zm5y6ma6wqnyw5bf7cvk3ybw7hvlrwcnri10s8vh3rqd0r"; }; packageRequires = [ cl-lib ]; meta = { @@ -3507,8 +3507,8 @@ ename = "midi-kbd"; version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/midi-kbd-0.2.el"; - sha256 = "1783k07gyiaq784wqv8qqc89cw5d6q1bdqz68b7n1lx4vmvfrhmh"; + url = "https://elpa.gnu.org/packages/midi-kbd-0.2.tar"; + sha256 = "0jd92rainjd1nx72z7mrvsxs3az6axxiw1v9sbpsj03x8qq0129q"; }; packageRequires = [ emacs ]; meta = { @@ -3523,7 +3523,7 @@ version = "1.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/mines-1.6.tar"; - sha256 = "1199s1v4my0qpvc5aaxzbqayjn59vilxbqnywvyhvm7hz088aps2"; + sha256 = "0j52n43mv963hpgdh5kk1k9wi821r6w3diwdp47rfwsijdd0wnhs"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3538,7 +3538,7 @@ version = "0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/minibuffer-header-0.5.tar"; - sha256 = "1nw53h34izm0z8njsf6jacc40fhg4x5l8r403ysmw2ps89i80p36"; + sha256 = "1qic33wsdba5xw3qxigq18nibwhj45ggk0ragy4zj9cfy1l2ni44"; }; packageRequires = [ emacs ]; meta = { @@ -3552,8 +3552,8 @@ ename = "minibuffer-line"; version = "0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/minibuffer-line-0.1.el"; - sha256 = "1ny4iirp26na5118wfgxlv6fxlrdclzdbd9m0lkrv51w0qw7spil"; + url = "https://elpa.gnu.org/packages/minibuffer-line-0.1.tar"; + sha256 = "0sg9vhv7bi82a90ziiwsabnfvw8zp544v0l93hbl42cj432bpwfx"; }; packageRequires = []; meta = { @@ -3567,8 +3567,8 @@ ename = "minimap"; version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/minimap-1.4.el"; - sha256 = "09fm0ziy8cdzzw08l7l6p63dxz2a27p3laia2v51mvbva8177ls1"; + url = "https://elpa.gnu.org/packages/minimap-1.4.tar"; + sha256 = "0n27wp65x5n21qy6x5dhzms8inf0248kzninp56kfx1bbf9w4x66"; }; packageRequires = []; meta = { @@ -3583,7 +3583,7 @@ version = "0.5.11"; src = fetchurl { url = "https://elpa.gnu.org/packages/mmm-mode-0.5.11.tar"; - sha256 = "07pda4bvvcmdwkwh8dnfqgvhkdni2wjgps1094kn1j5c9j254741"; + sha256 = "0dh76lk0am07j2zi7hhbmr6cnnss7l0b9rhi9is0w0n5i7j4i0p2"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3598,7 +3598,7 @@ version = "4.4.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/modus-themes-4.4.0.tar"; - sha256 = "1n6fmgj2kpdy2mmwg5hh6dic30zy0gd3ap6hlipl9qn08lawbbgq"; + sha256 = "1bqvyf8xq55dligwqhw4d6z9bv529rhnijxv5y5gdlzap973bf71"; }; packageRequires = [ emacs ]; meta = { @@ -3613,7 +3613,7 @@ version = "1"; src = fetchurl { url = "https://elpa.gnu.org/packages/mpdired-1.tar"; - sha256 = "1b7xsdgsrwy7qkshkk83bizz9r78g4pdfnavwl6riyb947gk6zkx"; + sha256 = "08lc0j25kxisykd2l9v4iamalmm5hzsnsm026v808krny28wwbp3"; }; packageRequires = [ emacs ]; meta = { @@ -3628,7 +3628,7 @@ version = "1.14"; src = fetchurl { url = "https://elpa.gnu.org/packages/multi-mode-1.14.tar"; - sha256 = "0aslndqr0277ai0iwywbmj07vmz88vpmc0mgydcy4li8fkn8h066"; + sha256 = "0i2l50lcsj3mm9k38kfmh2hnb437pjbk2yxv26p6na1g1n44lkil"; }; packageRequires = []; meta = { @@ -3643,7 +3643,7 @@ version = "1.1.10"; src = fetchurl { url = "https://elpa.gnu.org/packages/multishell-1.1.10.tar"; - sha256 = "1ipn9rlh9jg55i04adjy32n8dkjhhw1bcd72w97mlsdk66g8j6l3"; + sha256 = "1khqc7a04ynl63lpv898361sv37jgpd1fzvl0ryphprv9shnhw10"; }; packageRequires = [ cl-lib ]; meta = { @@ -3672,8 +3672,8 @@ ename = "myers"; version = "0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/myers-0.1.el"; - sha256 = "0yrxklkksj16cfbvwmdxjj43vngjd6q0fivib1xim3c9g3c9b670"; + url = "https://elpa.gnu.org/packages/myers-0.1.tar"; + sha256 = "0a053w7nj0qfryvsh1ss854wxwbk5mhkl8a5nprcfgsh4qh2m487"; }; packageRequires = [ emacs ]; meta = { @@ -3688,7 +3688,7 @@ version = "0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/nadvice-0.4.tar"; - sha256 = "0ac7zxi04gzcd5hz81lib1db3c6a7xmwkb381ljxvaha1mlzp1k0"; + sha256 = "19dx07v4z2lyyp18v45c5hgp65akw58bdqg5lcrzyb9mrlji8js6"; }; packageRequires = []; meta = { @@ -3702,8 +3702,8 @@ ename = "nameless"; version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nameless-1.0.2.el"; - sha256 = "13c1payc46ry5bf8ia8cwqpshm2ya74fi5r4sxq5n410z5f0pgqx"; + url = "https://elpa.gnu.org/packages/nameless-1.0.2.tar"; + sha256 = "0m3z701j2i13zmr4g0wjd3ms6ajr6w371n5kx95n9ssxyjwjppcm"; }; packageRequires = [ emacs ]; meta = { @@ -3711,21 +3711,16 @@ license = lib.licenses.free; }; }) {}; - names = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , nadvice }: + names = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "names"; ename = "names"; version = "20151201.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/names-20151201.0.tar"; - sha256 = "13smsf039x4yd7pzvllgn1vz8lhkwghnhip9y2bka38vk37w912d"; + sha256 = "0nf6n8hk58a7r56d899s5dsva3jjvh3qx9g2d1hra403fwlds74k"; }; - packageRequires = [ cl-lib emacs nadvice ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/names.html"; license = lib.licenses.free; @@ -3738,7 +3733,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/nano-agenda-0.3.tar"; - sha256 = "1ip21vjapcrla6j0qbjkcrdhs6xq773cswmwbhnsxb3xpzsa1z7x"; + sha256 = "12sh6wqqd13sv966wj4k4djidn238fdb6l4wg3z9ib0dx36nygcr"; }; packageRequires = [ emacs ]; meta = { @@ -3753,7 +3748,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/nano-modeline-1.0.1.tar"; - sha256 = "1bjxsqbi540cx2zxzrps2bdwj3hkaxw1s9wha1lrldhvckq7dm91"; + sha256 = "0frvg9zy9i8qqb6il0csxmgxsd373n696kwz1xqq28jikvhzkwyy"; }; packageRequires = [ emacs ]; meta = { @@ -3768,7 +3763,7 @@ version = "0.3.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/nano-theme-0.3.4.tar"; - sha256 = "1hfw6zxnzm4x55iqk1pg6nlp79c86np856bbdac4nv65ff4dkiqq"; + sha256 = "0x49lk0kx8mz72a81li6gwg3kivn7bn4ld0mml28smzqqfr3873a"; }; packageRequires = [ emacs ]; meta = { @@ -3783,7 +3778,7 @@ version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/nftables-mode-1.1.tar"; - sha256 = "0wcd31frnvxzkns4jdfxraai0bfi1184wcn64r8lg73h933p47iz"; + sha256 = "1wjw6n60kj84j8gj62mr6s97xd0aqvr4v7npyxwmhckw9z13xcqv"; }; packageRequires = [ emacs ]; meta = { @@ -3801,8 +3796,8 @@ ename = "nhexl-mode"; version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nhexl-mode-1.5.el"; - sha256 = "0qvxfg7sv4iqyjxzaim6b4v9k5hav36qd4vkf9jwzw6p5fri8w8d"; + url = "https://elpa.gnu.org/packages/nhexl-mode-1.5.tar"; + sha256 = "1i1by5bp5dby2r2jhzr0jvnchrybgnzmc5ln84w66180shk2s3yk"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3816,8 +3811,8 @@ ename = "nlinum"; version = "1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nlinum-1.9.el"; - sha256 = "03zqlz58fvh4cpfl43h7py2fpnc7m37f1ys8zhrc511ccq9cwkdn"; + url = "https://elpa.gnu.org/packages/nlinum-1.9.tar"; + sha256 = "1cpyg6cxaaaaq6hc066l759dlas5mhn1fi398myfglnwrglia3lm"; }; packageRequires = []; meta = { @@ -3829,10 +3824,10 @@ elpaBuild { pname = "notes-mode"; ename = "notes-mode"; - version = "1.30"; + version = "1.31"; src = fetchurl { - url = "https://elpa.gnu.org/packages/notes-mode-1.30.tar"; - sha256 = "1aqivlfa0nk0y27gdv68k5rg3m5wschh8cw196a13qb7kaghk9r6"; + url = "https://elpa.gnu.org/packages/notes-mode-1.31.tar"; + sha256 = "0lwja53cknd1w432mcbfrcshmxmk23dqrbr9k2101pqfzbw8nri2"; }; packageRequires = []; meta = { @@ -3847,7 +3842,7 @@ version = "1.1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/notmuch-indicator-1.1.0.tar"; - sha256 = "0k5csfrs8y1r6g7hs2y0961jpx0ih090kb6rkijljny2qhfj0573"; + sha256 = "1g30hzb238w9cnxqw8w7gw5l8sl4rx122napmm9rx974hdk3zk9k"; }; packageRequires = [ emacs ]; meta = { @@ -3861,8 +3856,8 @@ ename = "ntlm"; version = "2.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ntlm-2.1.0.el"; - sha256 = "01d0bcmh8a36qf871w6bc05kjk9bmnh843m9869xw06zyvqwg9mv"; + url = "https://elpa.gnu.org/packages/ntlm-2.1.0.tar"; + sha256 = "0kivmb6b57qjrwd41zwlfdq7l9nisbh4mgd96rplrkxpzw6dq0j7"; }; packageRequires = []; meta = { @@ -3877,7 +3872,7 @@ version = "1.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/num3-mode-1.5.tar"; - sha256 = "0i01v0sl0wi98xvc3wkk2lwc3nxmnhhpyrhr9gn88x5ygc0p4rdw"; + sha256 = "1a7w2qd210zp199c1js639xbv2kmqmgvcqi5dn1vsazasp2dwlj2"; }; packageRequires = []; meta = { @@ -3892,7 +3887,7 @@ version = "0.16"; src = fetchurl { url = "https://elpa.gnu.org/packages/oauth2-0.16.tar"; - sha256 = "1rzly2nwjywrfgcmp8zidbmjl2ahyd8l8507lb1mxm4xqryvf316"; + sha256 = "0bz4gqg5bhv6zk875q7sb0y56yvylnv0chj77ivjjpkha6rdp311"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -3907,7 +3902,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/ob-asymptote-1.0.tar"; - sha256 = "0m9i21zailg7drglm19v9ysyigzvz3p2r3q069a3n04di56d4629"; + sha256 = "1hmqbkrqg18w454xg37rg5cg0q3vd0b0fm14n5chihqrwwnwrf4l"; }; packageRequires = []; meta = { @@ -3922,7 +3917,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/ob-haxe-1.0.tar"; - sha256 = "1x19b3aappv4d3mvpf01r505l1sfndbzbpr5sbid411g9g9k3rwr"; + sha256 = "095qcvxpanw6fh96dfkdydn10xikbrjwih7i05iiyvazpk4x6nbz"; }; packageRequires = []; meta = { @@ -3937,7 +3932,7 @@ version = "0.8.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/objed-0.8.3.tar"; - sha256 = "1s38d6bvggdk5p45ww1jb4gxifzgjwgw1m6ar920nlg0j4fgbcvr"; + sha256 = "1shgpha6f1pql95v86whsw6w6j7v35cas98fyygwrpkcrxx9a56r"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3949,10 +3944,10 @@ elpaBuild { pname = "omn-mode"; ename = "omn-mode"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/omn-mode-1.2.el"; - sha256 = "0p7lmqabdcn625q9z7libn7q1b6mjc74bkic2kjhhckzvlfjk742"; + url = "https://elpa.gnu.org/packages/omn-mode-1.3.tar"; + sha256 = "01yg4ifbz7jfhvq6r6naf50vx00wpjsr44mmlj580bylfrmdc839"; }; packageRequires = []; meta = { @@ -3966,8 +3961,8 @@ ename = "on-screen"; version = "1.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/on-screen-1.3.3.el"; - sha256 = "0ga4hw23ki583li2z2hr7l6hk1nc2kdg4afndg06cm9jn158wza7"; + url = "https://elpa.gnu.org/packages/on-screen-1.3.3.tar"; + sha256 = "0w5cv3bhb6cyjhvglp5y6cy51ppsh2xd1x53i4w0gm44g5n8l6bd"; }; packageRequires = [ cl-lib ]; meta = { @@ -3982,7 +3977,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/openpgp-1.0.1.tar"; - sha256 = "1cm6c8394869dw2a5ykb92crz7c4pdav82a8nslbi533knxn7wn6"; + sha256 = "052wh38q6r09avxa0bgc5gn4769763zmgijza76mb0b3lzj66syv"; }; packageRequires = [ emacs ]; meta = { @@ -3997,7 +3992,7 @@ version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/orderless-1.1.tar"; - sha256 = "19iy0ps8h1qjh16mdybayd9i25bn27sa2slqsa6nslh251pxc0rk"; + sha256 = "1qjxln21ydc86kabk5kwa6ky40qjqcrk5nmc92w42x3ypxs711f3"; }; packageRequires = [ emacs ]; meta = { @@ -4009,10 +4004,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.6.23"; + version = "9.6.28"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.6.23.tar"; - sha256 = "0yqn3kag4anzm8ahfgjxrxjndzq6rbs6kayfq93gx4rn0qxa334q"; + url = "https://elpa.gnu.org/packages/org-9.6.28.tar"; + sha256 = "1slh28vjwhb65q0630p1syv6ampdsqgrdmisyj4f328g3j2brpkw"; }; packageRequires = [ emacs ]; meta = { @@ -4027,7 +4022,7 @@ version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/org-contacts-1.1.tar"; - sha256 = "1kzdw9kbnpryxdb9ywh2va4nnjcxw6asszf5n7a95rw2gl6m3l10"; + sha256 = "0gqanhnrxajx5cf7g9waks23sclbmvmwjqrs0q4frcih3gs2nhix"; }; packageRequires = [ emacs org ]; meta = { @@ -4042,7 +4037,7 @@ version = "1.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/org-edna-1.1.2.tar"; - sha256 = "1a022ssqpxbkp03n2bij78srwjx7kacpsgj9a6wbm0yn946hgjpz"; + sha256 = "1pifs5mbcjab21ylclck4kjdcds1xkvym27ncn9wwr8fl3fff2yl"; }; packageRequires = [ emacs org seq ]; meta = { @@ -4057,7 +4052,7 @@ version = "0.0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/org-jami-bot-0.0.5.tar"; - sha256 = "0nh0sp1l8hn568n6j11nkl42rm6b3gbjwi3lsf6vanr0lzvrl58r"; + sha256 = "1fiv0a7k6alvfvb7c6av0kbkwbw58plw05hhcf1vnkr9gda3s13y"; }; packageRequires = [ emacs jami-bot ]; meta = { @@ -4072,7 +4067,7 @@ version = "1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/org-modern-1.2.tar"; - sha256 = "1kgvrsmbgadbr7wk48sgx1prlgpbp31nih9bl9div35d496njcnw"; + sha256 = "1bm8kkcrn0glsb69sapj1zmb2ygd4sxksb3gag4hw1v5w3g51jjh"; }; packageRequires = [ compat emacs ]; meta = { @@ -4087,7 +4082,7 @@ version = "0.1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/org-notify-0.1.1.tar"; - sha256 = "0y0zj7sri7m0q3nibwv0m1snkwhma403hbxpcd346xk3s3ljiz2k"; + sha256 = "1vg0h32x5lc3p5n71m23q8mfdd1fq9ffmy9rsm5rcdphfk8s9x5l"; }; packageRequires = [ emacs ]; meta = { @@ -4099,10 +4094,10 @@ elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-real-1.0.7.tar"; - sha256 = "16isfsaxmgxiqfqx4lcsqlxazxjgxakr0k9pgpam13bqqqkq3cmp"; + url = "https://elpa.gnu.org/packages/org-real-1.0.8.tar"; + sha256 = "03g12czy833yzj7idkharsbl2zd1ajnsf7ay8qxqljwqrz8m91gw"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -4114,10 +4109,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-remark-1.2.1.tar"; - sha256 = "0xf10kgb0g4y9i4s1d3a1i5a119a1pijzhp5xxj2b2wyvjs2g3yk"; + url = "https://elpa.gnu.org/packages/org-remark-1.2.2.tar"; + sha256 = "01iprzgbyvbfpxp6fls4lfx2lxx7xkff80m35s9kc0ih5jlxc5qs"; }; packageRequires = [ emacs org ]; meta = { @@ -4132,7 +4127,7 @@ version = "1.3.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/org-transclusion-1.3.2.tar"; - sha256 = "02r48jzr5zivk11c3c3a9vj1cixfgf1wlmv1kjr5bxldayhg7aqb"; + sha256 = "14w9n10s6nh3nylkx3xzbqjb9pp4dja85agh0h2bzlbkaq4j7vij"; }; packageRequires = [ emacs org ]; meta = { @@ -4147,7 +4142,7 @@ version = "0.1.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/org-translate-0.1.4.tar"; - sha256 = "0dvg3h8mmzlqfg60rwxjgy17sqv84p6nj2ngjdafkp9a4halv0g7"; + sha256 = "0s0vqpncb6rvhpxdir5ghanjyhpw7bplqfh3bpgri5ay2b46kj4f"; }; packageRequires = [ emacs org ]; meta = { @@ -4162,7 +4157,7 @@ version = "1.14"; src = fetchurl { url = "https://elpa.gnu.org/packages/orgalist-1.14.tar"; - sha256 = "08gx8aqi7ph75vhhss2xl1lfypzy8a3zmj7w8flcrvz1nk0z738s"; + sha256 = "02diwanqldzr42aaa5kqcj1xgxmf1k6rqhk9zv40psqpzgd1yms5"; }; packageRequires = [ emacs ]; meta = { @@ -4177,7 +4172,7 @@ version = "0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/osc-0.4.tar"; - sha256 = "0zfrzxalvvf9wwwhwsqgl3v2ca6m2rfl5hd7sz662s6gmbwawqqa"; + sha256 = "1ls6v0mkh7z90amrlczrvv6mgpv6hzzjw0zlxjlzsj2vr1gz3vca"; }; packageRequires = []; meta = { @@ -4192,7 +4187,7 @@ version = "1.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/osm-1.3.tar"; - sha256 = "09c6wgq470hi2kgk7s8pbcqaggw13hg3f2zz5qwi68hfh7nq7z7k"; + sha256 = "0s5k6akdvbm9gsgzjlz795vgfy3pkl4qdk45p16p40f59dr49g4r"; }; packageRequires = [ compat emacs ]; meta = { @@ -4206,8 +4201,8 @@ ename = "other-frame-window"; version = "1.0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/other-frame-window-1.0.6.el"; - sha256 = "04h0jr73xv8inm52h8b8zbc9lsnlzkn40qy99x4x0lkkdqqxw1ny"; + url = "https://elpa.gnu.org/packages/other-frame-window-1.0.6.tar"; + sha256 = "1x8i6hbl48vmp5h43drr35lwaiwhcyr3vnk7rcyim5jl2ijw8yc0"; }; packageRequires = [ emacs ]; meta = { @@ -4222,7 +4217,7 @@ version = "4.3.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/pabbrev-4.3.0.tar"; - sha256 = "0a54ld80s0r9zrc2kd861p4ii3jzqhxykzcnvi64fhxxg3x2aggx"; + sha256 = "1fplbmzqz066gsmvmf2indg4n348vdgs2m34dm32gnrjghfrxxhs"; }; packageRequires = [ emacs ]; meta = { @@ -4237,7 +4232,7 @@ version = "1.1.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/paced-1.1.3.tar"; - sha256 = "1gaszf68h0nnv6p6yzv48m24csw6v479nsq0f02y6slixxaflnwl"; + sha256 = "0j2362zq22j6qma6bb6jh6qpd12zrc161pgl9cfhnq5m3s9i1sz4"; }; packageRequires = [ async emacs ]; meta = { @@ -4267,7 +4262,7 @@ version = "0.2.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/parser-generator-0.2.1.tar"; - sha256 = "17kqkqz3d29pmn8ydw5kxs2fdgwqh0q31f13hdf1bnw009j24rl9"; + sha256 = "1vrgkvcj16550frq2jivw31cmq6rhwrifmdk4rf0266br3jdarpf"; }; packageRequires = [ emacs ]; meta = { @@ -4282,7 +4277,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/path-iterator-1.0.tar"; - sha256 = "0kgl7rhv9x23jyr6ahfy6ql447zpz9fnmfwldkpn69g7jdx6a3cc"; + sha256 = "0v9gasc0wlqd7pks6k3695md7mdfnaknh6xinmp4pkvvalfh7shv"; }; packageRequires = [ emacs ]; meta = { @@ -4297,7 +4292,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/peg-1.0.1.tar"; - sha256 = "0yxfwwwc6fck1p9smcm1dwnva42868xvavhy7j749vlxrgb3v94x"; + sha256 = "14ll56fn9n11nydydslp7xyn79122dprm89i181ks170v0qcsps3"; }; packageRequires = [ emacs ]; meta = { @@ -4312,7 +4307,7 @@ version = "0.81"; src = fetchurl { url = "https://elpa.gnu.org/packages/perl-doc-0.81.tar"; - sha256 = "1hbf36zrpjx0xx257370axxfs1yb3iz6g9kc4wg83gcag09j3lci"; + sha256 = "1828jfl5dwk1751jsrpr2gr8hs1x315xlb9vhiis8frzvqmsribw"; }; packageRequires = [ emacs ]; meta = { @@ -4327,7 +4322,7 @@ version = "0.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/persist-0.6.tar"; - sha256 = "0n68dshbbyrs713989bllmm1vypch8766hc8b4y989nmyclixjwp"; + sha256 = "1p6h211xk0lrk4zqlm51rsms5lza9ymx6ayh9ij0afqrjqgffw77"; }; packageRequires = []; meta = { @@ -4339,10 +4334,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.48"; + version = "0.4.49"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.48.tar"; - sha256 = "1nm1j0f77afmwhb5cavk60nn4ifnx5qaycdy0c7qj8w3vdhyn3da"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.49.tar"; + sha256 = "1zxzv6h2075s0ldwr9izfy3sxrrg3x5y5vilnlgnwd7prcq8qa8y"; }; packageRequires = [ emacs ]; meta = { @@ -4356,8 +4351,8 @@ ename = "pinentry"; version = "0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pinentry-0.1.el"; - sha256 = "0iiw11prk4w32czk69mvc3x6ja9xbhbvpg9b0nidrsg5njjjh76d"; + url = "https://elpa.gnu.org/packages/pinentry-0.1.tar"; + sha256 = "0i5g4yj2qva3rp8ay2fl9gcmp7q42caqryjyni8r5h4f3misviwq"; }; packageRequires = []; meta = { @@ -4369,10 +4364,10 @@ elpaBuild { pname = "plz"; ename = "plz"; - version = "0.7.2"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/plz-0.7.2.tar"; - sha256 = "1qpr4j5rqpvr17arxrrix1z9fzbqy1mddakyylqbvm9lg5yg2wnk"; + url = "https://elpa.gnu.org/packages/plz-0.8.tar"; + sha256 = "0kg275kq5hi83ry0n83w8pi0qn2lmlv9gnxcbwf1dcqk7n9i2v64"; }; packageRequires = [ emacs ]; meta = { @@ -4387,7 +4382,7 @@ version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/plz-see-0.1.tar"; - sha256 = "0dmckrny21rlm5spiwx7j6q0xikzwlsrhg8yz890w47zpdxpl3bb"; + sha256 = "1mi35d9b26d425v1kkmmbh477klcxf76fnyg154ddjm0nkgqq90d"; }; packageRequires = [ emacs plz ]; meta = { @@ -4402,7 +4397,7 @@ version = "3.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/poke-3.2.tar"; - sha256 = "0rhcz7kg20j72hf9rhq5zacdak8ayhn4cnwhgq9qwr18z00bxxm7"; + sha256 = "15j4g5y427d9mja2irv3ak6x60ik4kpnscnwl9pqym7qly7sa3v9"; }; packageRequires = [ emacs ]; meta = { @@ -4417,7 +4412,7 @@ version = "3.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/poke-mode-3.1.tar"; - sha256 = "1lirhws5d8l16qs5ddrvvz0f9xfl004q9yp333pdgsmcpk3ww7sr"; + sha256 = "0g4vd26ahkmjxlcvqwd0mbk60qaf6c9zba9x7bb9pqabka9438y1"; }; packageRequires = []; meta = { @@ -4431,8 +4426,8 @@ ename = "poker"; version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/poker-0.2.el"; - sha256 = "0sikspimvnzvwhyivi1gvr0630zz2pr3q2fwagl57iv06jas9f00"; + url = "https://elpa.gnu.org/packages/poker-0.2.tar"; + sha256 = "10lfc6i4f08ydxanidwiq9404h4nxfa0vh4av5rrj6snqzqvd1bw"; }; packageRequires = []; meta = { @@ -4447,7 +4442,7 @@ version = "0.4.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/popper-0.4.6.tar"; - sha256 = "0zkrhpplgs6h4xz0ma5nc4pvlkdgdzqwlqlw57xspqbc2f1bds5s"; + sha256 = "0xwy4p9g0lfd4ybamsl5gsppmx79yv16s4lh095x5y5qfmgcvq2c"; }; packageRequires = [ emacs ]; meta = { @@ -4459,10 +4454,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.4.2.tar"; - sha256 = "0ca43wgbr0n5ri7cyxjmn7blq59xq43rx9z9q02a2j4yn05w8nss"; + url = "https://elpa.gnu.org/packages/posframe-1.4.3.tar"; + sha256 = "1kw37dhyd6qxj0h2qpzi539jrgc0pj90psf2k58z4jc9199bgsax"; }; packageRequires = [ emacs ]; meta = { @@ -4477,7 +4472,7 @@ version = "0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/pq-0.2.tar"; - sha256 = "0gy3i2l1fxwpav6l57yf3mml15lhwh9xp8sm40hlpgyn15nyz4c6"; + sha256 = "0d8ylsbmypaj29w674a4k445zr6hnggic8rsv7wx7jml6p2zph2n"; }; packageRequires = [ emacs ]; meta = { @@ -4492,7 +4487,7 @@ version = "0.10.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/project-0.10.0.tar"; - sha256 = "060iw06c60vjy1bp771zz0n24x4s7kpyvdjs51147v2kz35n08pb"; + sha256 = "07lv41asdah2v3k6nrc73z3pjhsm7viygr12ly9p96g2yw11irg6"; }; packageRequires = [ emacs xref ]; meta = { @@ -4507,7 +4502,7 @@ version = "1.3.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/psgml-1.3.5.tar"; - sha256 = "12ndv9xj4zg0k2vas4bmpf2iwy71hy203zxfd7sfwskdd96kzjjv"; + sha256 = "1lfk95kr43az6ykfyhj7ygccw3ms2ifyyp43w9lwm5fcawgc8952"; }; packageRequires = []; meta = { @@ -4537,7 +4532,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/pulsar-1.0.1.tar"; - sha256 = "0qknyd6ihqg4n940yll5v2hz3w07fsp4mbdfh7drbws13c1ivnly"; + sha256 = "0xljxkls6lckfg5whx2kb44dp67q2jfs7cbk6ih5b3zm6h599d4k"; }; packageRequires = [ emacs ]; meta = { @@ -4552,7 +4547,7 @@ version = "5.3.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/pyim-5.3.3.tar"; - sha256 = "04dz3gdqq6pcxycpzkzzmhbg6lk629v41y64jlh6si21jwfr6wnx"; + sha256 = "03khpd3skv7ijmnn721dvila8x6pvg9pl4p7djyz8m59xgvv55dp"; }; packageRequires = [ async emacs xr ]; meta = { @@ -4567,7 +4562,7 @@ version = "0.5.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.4.tar"; - sha256 = "1zppp12217aakawgndy6daxpw1098lh7lsjar2wwd4qv4xs0d4p6"; + sha256 = "0i42i9jr0p940w17fjjrzd258winjl7sv4g423ihd6057xmdpyd8"; }; packageRequires = []; meta = { @@ -4582,7 +4577,7 @@ version = "0.28"; src = fetchurl { url = "https://elpa.gnu.org/packages/python-0.28.tar"; - sha256 = "1kc596b8bbcp8y87kqyxsv3bblz8l0vyc0d645ayb1cmwwvk35d5"; + sha256 = "042jhg87bnc750wwjwvp32ici3pyswx1pza2qz014ykdqqnsx0aq"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -4596,8 +4591,8 @@ ename = "quarter-plane"; version = "0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/quarter-plane-0.1.el"; - sha256 = "0hj3asdzf05h8j1fsxx9y71arnprg2xwk2dcb81zj04hzggzpwmm"; + url = "https://elpa.gnu.org/packages/quarter-plane-0.1.tar"; + sha256 = "06syayqdmh4nb7ys52g1mw01wnz5hjv710dari106fk8fm9cy18c"; }; packageRequires = []; meta = { @@ -4611,8 +4606,8 @@ ename = "queue"; version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/queue-0.2.el"; - sha256 = "0cx2848sqnnkkr4zisvqadzxngjyhmb36mh0q3if7q19yjjhmrkb"; + url = "https://elpa.gnu.org/packages/queue-0.2.tar"; + sha256 = "117g6sl5dh7ssp6m18npvrqik5rs2mnr16129cfpnbi3crsw23c8"; }; packageRequires = []; meta = { @@ -4627,7 +4622,7 @@ version = "1.0.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.6.tar"; - sha256 = "04v73cm1cap19vwc8lqsw0rmfr9v7r3swc4wgxnk9dnzxi9j2527"; + sha256 = "0xv39jix1gbwq6f8laj93sqkf2j5hwda3l7mjqc7vsqjw1lkhmjv"; }; packageRequires = []; meta = { @@ -4641,8 +4636,8 @@ ename = "rbit"; version = "0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rbit-0.1.el"; - sha256 = "0h0f9jx4xmkbyxk39wibrvnj65b1ylkz4sk4np7qcavfjs6dz3lm"; + url = "https://elpa.gnu.org/packages/rbit-0.1.tar"; + sha256 = "1xfl3m53bdi25h8mp7s0zp1yy7436cfydxrgkfc31fsxkh009l9h"; }; packageRequires = []; meta = { @@ -4657,7 +4652,7 @@ version = "0.4.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/rcirc-color-0.4.5.tar"; - sha256 = "0j2bcx2dplcy5zgh9zdhla8i12rq916ilbnw4ns83xdg7k0dwncf"; + sha256 = "0sfwmi0sspj7sx1psij4fzq1knwva8706w0204mbjxsq2nh5s9f3"; }; packageRequires = [ emacs ]; meta = { @@ -4684,10 +4679,10 @@ elpaBuild { pname = "rcirc-sqlite"; ename = "rcirc-sqlite"; - version = "0.1.4"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rcirc-sqlite-0.1.4.tar"; - sha256 = "0hz0nm35jq6fg9pr4j725r2awxbf1q23bzn85nhcbpafzb8mmajl"; + url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.1.tar"; + sha256 = "0n0492s500gplmv7l8n8l7s3rpm1nli3n706n9f91qc15z6p6mcv"; }; packageRequires = [ emacs ]; meta = { @@ -4708,7 +4703,7 @@ version = "1.5.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/realgud-1.5.1.tar"; - sha256 = "01155sydricdvxy3djk64w2zc6x0q4j669bvz8m8rd766wsmida8"; + sha256 = "1iisvzxvdsifxkz7b2wacw85dkjagrmbcdhcfsnswnfbp3r3kg35"; }; packageRequires = [ emacs load-relative loc-changes test-simple ]; meta = { @@ -4716,21 +4711,16 @@ license = lib.licenses.free; }; }) {}; - realgud-ipdb = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: + realgud-ipdb = callPackage ({ elpaBuild, emacs, fetchurl, lib, realgud }: elpaBuild { pname = "realgud-ipdb"; ename = "realgud-ipdb"; version = "1.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/realgud-ipdb-1.0.0.tar"; - sha256 = "1ljh2igm6na92jdvnn4f51019v3klc6k03nayxf6qxzaxwq2w254"; + sha256 = "0zmgsrb15rmgszidx4arjazb6fz523q5w516z5k5cn92wfzfyncr"; }; - packageRequires = [ emacs load-relative realgud ]; + packageRequires = [ emacs realgud ]; meta = { homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html"; license = lib.licenses.free; @@ -4769,7 +4759,7 @@ version = "1.0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/realgud-lldb-1.0.2.tar"; - sha256 = "0nqbvknhvw5lwf4i44q8wvh4y4s9mvs5kn7lskg3xicl464ag1d0"; + sha256 = "1g4spjrldyi9rrh5dwrcqpz5qm37fq2qpvmirxvdqgfbwl6gapzj"; }; packageRequires = [ emacs load-relative realgud ]; meta = { @@ -4832,7 +4822,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/realgud-trepan-ni-1.0.1.tar"; - sha256 = "0vakfzlk4pgqi66mdvwqhzgdsnks6clgnj7cjjbi80v3ipkfdnak"; + sha256 = "09vllklpfc0q28ankp2s1v10kwnxab4g6hb9zn63d1rfa92qy44k"; }; packageRequires = [ cl-lib emacs load-relative realgud ]; meta = { @@ -4852,7 +4842,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/realgud-trepan-xpy-1.0.1.tar"; - sha256 = "0qd9hcq7a9vn453rs4pf3p8wwh7fynxhim9j6sf97lm8pilif9yd"; + sha256 = "13fll0c6p2idg56q0czgv6s00vvb585b40dn3b14hdpy0givrc0x"; }; packageRequires = [ emacs load-relative realgud ]; meta = { @@ -4867,7 +4857,7 @@ version = "1.9.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/rec-mode-1.9.3.tar"; - sha256 = "15m0h84fcrcxpx67mc9any4ap2dcqysfjm1d2a7sx4clx8h3mgk0"; + sha256 = "00hps4pi7r20qqqlfl8g5dqwipgyqqrhxc4hi5igl0rg563jc1wx"; }; packageRequires = [ emacs ]; meta = { @@ -4881,8 +4871,8 @@ ename = "register-list"; version = "0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/register-list-0.1.el"; - sha256 = "1azgfm4yvhp2bqqplmfbz1fij8gda527lks82bslnpnabd8m6sjh"; + url = "https://elpa.gnu.org/packages/register-list-0.1.tar"; + sha256 = "01w2yyvbmnkjrmx5f0dk0327c0k7fvmgi928j6hbvlrp5wk6s394"; }; packageRequires = []; meta = { @@ -4897,7 +4887,7 @@ version = "1.24"; src = fetchurl { url = "https://elpa.gnu.org/packages/relint-1.24.tar"; - sha256 = "0wc7jzapzc4s7v7yqwp315ymbs6xighy2clx1ylvf60zs49y2bwm"; + sha256 = "0pnv2pkx5jq30049zplrmspkm1cc7p6vy9xfv215d27v8nas0374"; }; packageRequires = [ emacs xr ]; meta = { @@ -4912,7 +4902,7 @@ version = "1.2.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/repology-1.2.4.tar"; - sha256 = "0l53wl0bk8rnqwsjdh1hwvkvbay080l10bslcj3scn42bgbi59j1"; + sha256 = "0nj4dih9mv8crqq8rd4k8dzgq7l0195syfxsf2gyikmqz9sjbr85"; }; packageRequires = [ emacs ]; meta = { @@ -4927,7 +4917,7 @@ version = "1.0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/rich-minority-1.0.3.tar"; - sha256 = "1w61qvx2rw6a6gmrm61080zghil95nzdv4w06c0pvyb62m4rwab0"; + sha256 = "0npk6gnr2m4mfv40y2m265lxk1dyn8fd6d90vs3j2xrhpybgbln2"; }; packageRequires = [ cl-lib ]; meta = { @@ -4942,7 +4932,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/rnc-mode-0.3.tar"; - sha256 = "1bd4pxaijcs0w8v9r7x9aiqyqf1rl46153dxl0ilhm3fc90iyf2r"; + sha256 = "1p03g451888v86k9z6g8gj375p1pcdvikgk1phxkhipwi5hbf5g8"; }; packageRequires = []; meta = { @@ -4957,7 +4947,7 @@ version = "7"; src = fetchurl { url = "https://elpa.gnu.org/packages/rt-liberation-7.tar"; - sha256 = "0gb1an3a68ib27jrc8x8grq5z3xya4b1gl8ii82a1clzf87n7k63"; + sha256 = "0bi1qyc4n4ar0rblnddmlrlrkdvdrvv54wg4ii39hhxij4p6niif"; }; packageRequires = []; meta = { @@ -4972,7 +4962,7 @@ version = "0.4.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/ruby-end-0.4.3.tar"; - sha256 = "0b6hh31vpyv6j86v97migw4if2i9m95075p0bf5ai61cqb42crg4"; + sha256 = "07175v9fy96lmkfa0007lhx7v3fkk77iwca3rjl94dgdp4b8lbk5"; }; packageRequires = []; meta = { @@ -4993,7 +4983,7 @@ version = "0.3.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/rudel-0.3.2.tar"; - sha256 = "03hcvpp6ykavidwn5x48gs986w1i5icvh7ks6p74pdaagpgw4jmk"; + sha256 = "00rs2fy64ybam26szpc93miwajq42acyh0dkg0ixr95mg49sc46j"; }; packageRequires = [ cl-generic cl-lib cl-print emacs ]; meta = { @@ -5008,7 +4998,7 @@ version = "0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/satchel-0.2.tar"; - sha256 = "1ajsfrr988nglw2l4kqjbbdq9x8gidv0ymsrg3jm2b9nisfhnixv"; + sha256 = "115rkq2ygawsg8ph44zfqwsd9ykm4370v0whgjwhc1wx2iyn5ir9"; }; packageRequires = [ emacs project ]; meta = { @@ -5023,7 +5013,7 @@ version = "0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/scanner-0.2.tar"; - sha256 = "1nbfpgndjkv7mr81bxy58k4y13lc4cidyz9mbwh7433r8rfhymb5"; + sha256 = "1c42mg7m6fa7xw3svv741sgrc9zjl1zcq0vg45k61iqmnx8d44vp"; }; packageRequires = [ dash emacs ]; meta = { @@ -5037,8 +5027,8 @@ ename = "scroll-restore"; version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/scroll-restore-1.0.el"; - sha256 = "0h55szlmkmzmcvd6gvv8l74n7y64i0l78nwwmq7xsbzprlmj6khn"; + url = "https://elpa.gnu.org/packages/scroll-restore-1.0.tar"; + sha256 = "1i9ld1l5h2cpzf8bzk7nlk2bcln48gya8zrq79v6rawbrwdlz2z4"; }; packageRequires = []; meta = { @@ -5053,7 +5043,7 @@ version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/sed-mode-1.1.tar"; - sha256 = "1vpfzr95xfvjiq7x1pkhjm96936yzsy9bzm1v8p3hyr486bar0mp"; + sha256 = "0zhga0xsffdcinh10di046n6wbx35gi1zknnqzgm9wvnm2iqxlyn"; }; packageRequires = []; meta = { @@ -5068,7 +5058,7 @@ version = "2.24"; src = fetchurl { url = "https://elpa.gnu.org/packages/seq-2.24.tar"; - sha256 = "1w2cysad3qwnzdabhq9xipbslsjm528fcxkwnslhlkh8v07karml"; + sha256 = "13x8l1m5if6jpc8sbrbx9r64fyhh450ml6vfm92p6i5wv6gl74w6"; }; packageRequires = []; meta = { @@ -5080,10 +5070,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/setup-1.3.2.tar"; - sha256 = "1sr514w4mn0fbdawjb5p0fd6i6q2zi9737rbwcgakb1l9cqvb5qy"; + url = "https://elpa.gnu.org/packages/setup-1.4.0.tar"; + sha256 = "0id7j8xvbkbpfiv7m55dl64y27dpiczljagldf4p9q6qwlhf42f7"; }; packageRequires = [ emacs ]; meta = { @@ -5098,7 +5088,7 @@ version = "1.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/shelisp-1.0.0.tar"; - sha256 = "05r26gy1ajl47ir0yz5gn62xw2f31vdq04n3r8ywlzxbqyvzlc0d"; + sha256 = "0zhkk04nj25lmpdlqblfhx3rb415w2f58f7wb19k1s2ry4k7m15g"; }; packageRequires = []; meta = { @@ -5113,7 +5103,7 @@ version = "2.4.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar"; - sha256 = "1ldvil6hjs8c7wpdwx0jwaar867dil5qh6vy2k27i1alffr9nnqm"; + sha256 = "1kjj8n3nws7dl7k3ksnfx0s0kwvqb9wzy9k42xs5s51k7xrp1l18"; }; packageRequires = [ emacs ]; meta = { @@ -5128,7 +5118,7 @@ version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/shen-mode-0.1.tar"; - sha256 = "1dr24kkah4hr6vrfxwhl9vzjnwn4n773bw23c3j9bkmlgnbvn0kz"; + sha256 = "0xskyd0d3krwgrpca10m7l7c0l60qq7jjn2q207n61yw5yx71pqn"; }; packageRequires = []; meta = { @@ -5142,8 +5132,8 @@ ename = "sisu-mode"; version = "7.1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sisu-mode-7.1.8.el"; - sha256 = "12zs6y4rzng1d7djl9wh3wc0f9fj0bqb7h754rvixvndlr5c10nj"; + url = "https://elpa.gnu.org/packages/sisu-mode-7.1.8.tar"; + sha256 = "02cfyrjynwvf2rlnkfy8285ga9kzbg1b614sch0xnxqw81mp7drp"; }; packageRequires = []; meta = { @@ -5158,7 +5148,7 @@ version = "0.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/site-lisp-0.1.2.tar"; - sha256 = "07704nz5rrzixmvw65h79rf4fpnf58jrrgbp1brvknidp6j95r0n"; + sha256 = "1w27nd061y7a5qhdmij2056751wx9nwv89qx3hxcl473iz03b09l"; }; packageRequires = [ emacs ]; meta = { @@ -5173,7 +5163,7 @@ version = "1.0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/sketch-mode-1.0.4.tar"; - sha256 = "1gv03ykr40laf52hm8p0glfsy895jghkp5a8q599zwg5wpz3zdc9"; + sha256 = "1vrbmyhf9bffy2fkz91apzxla6v8nbv2wb25vxcr9x3smbag9kal"; }; packageRequires = []; meta = { @@ -5188,7 +5178,7 @@ version = "1.2.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/slime-volleyball-1.2.0.tar"; - sha256 = "07xavg6xq5ckrfy5sk5k5ldb46m5w8nw1r1k006ck8f23ajaw5z2"; + sha256 = "1qlmsxnhja8p873rvb1qj4xsf938bs3hl8qqqsmrm0csvlb9737p"; }; packageRequires = [ cl-lib ]; meta = { @@ -5200,10 +5190,10 @@ elpaBuild { pname = "sm-c-mode"; ename = "sm-c-mode"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sm-c-mode-1.1.el"; - sha256 = "1k46628dkmg4bvd5f68lv5kjcjbgm2pd8jc0zhq9n70jwf5z2ip8"; + url = "https://elpa.gnu.org/packages/sm-c-mode-1.2.tar"; + sha256 = "0xykl8wkbw5y7ah79zlfzz1k0di9ghfsv2xjxwx7rrb37wny5184"; }; packageRequires = []; meta = { @@ -5218,7 +5208,7 @@ version = "4.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/smalltalk-mode-4.0.tar"; - sha256 = "1i1w2fk241z10mph92lry8ly55rxr24n1v4840cddpiw81nrqpcn"; + sha256 = "0ly2qmsbmzd5nd7iaighws10y0yj7p2356fw32pkp0cmzzvc3d54"; }; packageRequires = []; meta = { @@ -5232,8 +5222,8 @@ ename = "smart-yank"; version = "0.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/smart-yank-0.1.1.el"; - sha256 = "1v7hbn8pl4bzal31m132dn04rgsgjjcc7k2knd1jqzk1wq6azpdn"; + url = "https://elpa.gnu.org/packages/smart-yank-0.1.1.tar"; + sha256 = "08dc4c60jcjyiixyzckxk5qk6s2pl1jmrp4h1bj53ssd1kn4208m"; }; packageRequires = [ emacs ]; meta = { @@ -5248,7 +5238,7 @@ version = "6.12"; src = fetchurl { url = "https://elpa.gnu.org/packages/sml-mode-6.12.tar"; - sha256 = "19wyxsnw60lmjbb7ijislpv9vzk9996rh1b0iw7wyrqszfxy2p20"; + sha256 = "10zp0gi5rbjjxjzn9k6klvdms9k3yxx0qry0wa75a68sj5x2rdzh"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -5263,7 +5253,7 @@ version = "1.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/so-long-1.1.2.tar"; - sha256 = "0gb5ypl9phhv8sx7akw9xn7njfq86yqngixhxf8qj1fxp57gfpdb"; + sha256 = "01qdxlsllpj5ajixkqf7v9p95zn9qnvjdnp30v54ymj2pd0d9a32"; }; packageRequires = [ emacs ]; meta = { @@ -5282,7 +5272,7 @@ version = "3.2.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/soap-client-3.2.3.tar"; - sha256 = "0z6af253iwimam03jnpai2h989i6vyv05wdz7dadna6amdryfznc"; + sha256 = "1yhs661g0vqxpxqcxgsxvljmrpcqzl0y52lz6jvfilmshw7r6k2s"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -5297,7 +5287,7 @@ version = "1.4.9"; src = fetchurl { url = "https://elpa.gnu.org/packages/sokoban-1.4.9.tar"; - sha256 = "1zri4czw2d5impkgn8d4hliyw31vndadg7wj31gairk8kyakjpgm"; + sha256 = "1l3d4al96252kdhyn4dr88ir67kay57n985w0qy8p930ncrs846v"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -5311,8 +5301,8 @@ ename = "sotlisp"; version = "1.6.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sotlisp-1.6.2.el"; - sha256 = "05cr4dmhg4wbmw7jbcfh0yrnbq6dhzp2wrbzvhwrfznz51j03nhi"; + url = "https://elpa.gnu.org/packages/sotlisp-1.6.2.tar"; + sha256 = "0q65iwr89cwwqnc1kndf2agq5wp48a7k02qsksgaj0n6zv7i4dfn"; }; packageRequires = [ emacs ]; meta = { @@ -5327,7 +5317,7 @@ version = "0.4.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/spacious-padding-0.4.1.tar"; - sha256 = "02bc0r20b4mgnlzryq26q0jq45wfgpvv7y3zhvnaaqj11rw7779f"; + sha256 = "0w9f19sxpbaagwxfnsg3qmk95v8vnkfcyd3l6i9ns9ww26sb2fgl"; }; packageRequires = [ emacs ]; meta = { @@ -5342,7 +5332,7 @@ version = "1.7.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/spinner-1.7.4.tar"; - sha256 = "140kss25ijbwf8hzflbjz67ry76w2cyrh02axk95n6qcxv7jr7pv"; + sha256 = "0lq8q62q5an8199p8pyafg5l6hdnnqi6i6sybnk60sdcqy62pa6r"; }; packageRequires = [ emacs ]; meta = { @@ -5357,7 +5347,7 @@ version = "0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/sql-beeline-0.2.tar"; - sha256 = "1bqzs53x506bzgchvjfr1ljqxbb9y041n7aj9n7ajb2634i7lllr"; + sha256 = "0ngvvfhs1fj3ca5g563bssaz9ac5fiqkqzv09s4ramalp2q6axq9"; }; packageRequires = []; meta = { @@ -5372,7 +5362,7 @@ version = "0.2.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/sql-cassandra-0.2.2.tar"; - sha256 = "06h301fpqax24x295x06bz08ipjjnxs9smisyz82z08kgszq92c6"; + sha256 = "154rymq0k6869cw7sc7nhx3di5qv1ffgf8shkxc22gvkrj2s7p9b"; }; packageRequires = [ emacs ]; meta = { @@ -5387,7 +5377,7 @@ version = "1.7"; src = fetchurl { url = "https://elpa.gnu.org/packages/sql-indent-1.7.tar"; - sha256 = "043qcy97a5hx68w0ac7xsk380l2i7bphgrdz6aby2zfpp90vrjpn"; + sha256 = "1yfb01wh5drgvrwbn0hgzyi0rc4zlr1w23d065x4qrld31jbka8i"; }; packageRequires = [ cl-lib ]; meta = { @@ -5402,7 +5392,7 @@ version = "0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/srht-0.4.tar"; - sha256 = "1g3znmpi0lbl0f4rp1v8v5jl7gngclwmcngkzwdk2w4prsh6skb1"; + sha256 = "0ps49syzlaf4lxvji61y6y7r383r65v96d57hj75xkn6hvyrz74n"; }; packageRequires = [ emacs plz transient ]; meta = { @@ -5417,7 +5407,7 @@ version = "3.1.16"; src = fetchurl { url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.16.tar"; - sha256 = "0ajmsg4r9yba2m9wn08dsdzl8pr3pjixyqqp263mpwsh02h8im2g"; + sha256 = "0fb88l3270d7l808q8x16zcvjgsjbyhgifgv17syfsj0ja63x28p"; }; packageRequires = [ emacs ]; meta = { @@ -5432,7 +5422,7 @@ version = "2.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/standard-themes-2.0.1.tar"; - sha256 = "0vdl90xjqq20mw6cgmn6zd42ppr5y471g03a9ljzcpwmbd1wnr60"; + sha256 = "0cyr3n9w359sa8ylcgzsvhxrk9f1rl1scb5339ci2la7zpg5vxwr"; }; packageRequires = [ emacs ]; meta = { @@ -5447,7 +5437,7 @@ version = "2.3.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/stream-2.3.0.tar"; - sha256 = "1jvk5j0wn2f4dxnyqji85f8cgbpyrxk02mz5dzyw4xlqr0d9zc9n"; + sha256 = "0224hjcxvy3cxv1c3pz9j2laxld2cxqbs5sigr02fcdcb9qn7hay"; }; packageRequires = [ emacs ]; meta = { @@ -5462,7 +5452,7 @@ version = "0.2.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/substitute-0.2.1.tar"; - sha256 = "1p9lhgi4y224aghwnnjxm14da461pj0ym4a7asla02hf33y61i5j"; + sha256 = "09cqxfp9az6cckh0bq1155g6xh9rjn0ppjyc6879ihx6ba61li53"; }; packageRequires = [ emacs ]; meta = { @@ -5476,8 +5466,8 @@ ename = "svg"; version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-1.1.el"; - sha256 = "0j69xsaj0d1pnxjfb5m0yf2vxbrcmr8i3g75km4dzbha46v4xxvg"; + url = "https://elpa.gnu.org/packages/svg-1.1.tar"; + sha256 = "10x2rry349ibzd9awy4rg18cd376yvkzqsyq0fm4i05kq4dzqp4a"; }; packageRequires = [ emacs ]; meta = { @@ -5491,8 +5481,8 @@ ename = "svg-clock"; version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-clock-1.2.el"; - sha256 = "15pmj07wnlcpv78av9qpnbfwdjlkf237vib8smpa7nvyikdfszfr"; + url = "https://elpa.gnu.org/packages/svg-clock-1.2.tar"; + sha256 = "0r0wayb1q0dd2yi1nqa0m4jfy36lydxxa6xvvd6amgh9sy499qs8"; }; packageRequires = [ emacs svg ]; meta = { @@ -5507,7 +5497,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/svg-lib-0.3.tar"; - sha256 = "0d0xkfmk351h8lx28dxgync47r780nyk4fk12sb4j0byfr0lsh8d"; + sha256 = "1s7n3j1yzprs9frb554c66pcrv3zss1y26y6qgndii4bbzpa7jh8"; }; packageRequires = [ emacs ]; meta = { @@ -5522,7 +5512,7 @@ version = "0.3.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/svg-tag-mode-0.3.2.tar"; - sha256 = "1sg05dg0d9ai21l8rgpqywmwgw29sl21x2zkvlv04rl3hdvdq75y"; + sha256 = "0wzcq00kbjpbwz7acn4d7jd98v5kicq3iwgf6dnmz2kflvkfwkvr"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -5537,7 +5527,7 @@ version = "0.14.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/swiper-0.14.2.tar"; - sha256 = "1x6jnc0nrk68kww12gq6w8nss6ny76xz0fgxf57550bbipx9pa8m"; + sha256 = "1rzp78ix19ddm7fx7p4i5iybd5lw244kqvf3nrafz3r7q6hi8yds"; }; packageRequires = [ emacs ivy ]; meta = { @@ -5552,7 +5542,7 @@ version = "1.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/switchy-window-1.3.tar"; - sha256 = "1ax63fksjmjsgai7xxzm1mj5bhbc7dzk7c389abd280g637z2cy7"; + sha256 = "0ym5cy6czsrd15f8rgh3dad8fwn8pb2xrvhlmdikc59cc29zamrv"; }; packageRequires = [ compat emacs ]; meta = { @@ -5567,7 +5557,7 @@ version = "1.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/sxhkdrc-mode-1.0.0.tar"; - sha256 = "1vzb7ijx61rq31xj0d13yidlirp038841fwdvlqlv88hi6hb2faq"; + sha256 = "0gfv5l71md2ica9jfa8ynwfag3zvayc435pl91lzcz92qy5n0hlj"; }; packageRequires = [ emacs ]; meta = { @@ -5582,7 +5572,7 @@ version = "1.0.13"; src = fetchurl { url = "https://elpa.gnu.org/packages/system-packages-1.0.13.tar"; - sha256 = "0m34ifs7c27g7avc173z501rs2g6ag7f4bc3rgfp9zdaix53c0i9"; + sha256 = "0xlbq44c7f2assp36g5z9hn5gldq76wzpcinp782whqzpgz2k4sy"; }; packageRequires = [ emacs ]; meta = { @@ -5612,7 +5602,7 @@ version = "0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/tam-0.1.tar"; - sha256 = "1f66la9mmw1frpy2k9vr9k1q2x3b1y9018z43rdhrp50zx1b2vsg"; + sha256 = "16ms55cwm2cwixl03a3bbsqs159c3r3dv5kaazvsghby6c511bx8"; }; packageRequires = [ emacs queue ]; meta = { @@ -5627,7 +5617,7 @@ version = "0.10.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/taxy-0.10.1.tar"; - sha256 = "05czw8fkifb25rwl99dmncr1g0rjfx1bqijl7igqs9j6h9ia2xvg"; + sha256 = "0r4kv0lqjk720p8kfah256370miqg68598jp5466sc6v9qax4wd9"; }; packageRequires = [ emacs ]; meta = { @@ -5647,7 +5637,7 @@ version = "0.13"; src = fetchurl { url = "https://elpa.gnu.org/packages/taxy-magit-section-0.13.tar"; - sha256 = "1712hbcna0ph9chaq28a6fanv4sccdiphd5z0hg34ig3g6pslgn9"; + sha256 = "06sivl4rc06qr67qw2gqpw7lsaqf3j78llkrljwby7a77yzlhbrj"; }; packageRequires = [ emacs magit-section taxy ]; meta = { @@ -5661,8 +5651,8 @@ ename = "temp-buffer-browse"; version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.5.el"; - sha256 = "1drfvqxc6g4vfijmx787b1ygq7x2s5wq26l45qnz4wdrqqmcqx3c"; + url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.5.tar"; + sha256 = "00hbh25fj5fm9dsp8fpdk8lap3gi5jlva6f0m6kvjqnmvc06q36r"; }; packageRequires = [ emacs ]; meta = { @@ -5677,7 +5667,7 @@ version = "1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/tempel-1.1.tar"; - sha256 = "1780dgyfj569vxzzg8gqky9953fzw8x5kzy2l05vl7my06nyk46i"; + sha256 = "01zrp3wi4nvp67wda1b5fyjfxd0akhk7aqc2nqh1sk4mjp5zpnsq"; }; packageRequires = [ compat emacs ]; meta = { @@ -5691,8 +5681,8 @@ ename = "test-simple"; version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/test-simple-1.3.0.el"; - sha256 = "1yd61jc9ds95a5n09052kwc5gasy57g4lxr0jsff040brlyi9czz"; + url = "https://elpa.gnu.org/packages/test-simple-1.3.0.tar"; + sha256 = "065jfps5ixpy5d4l2xgwhkpafdwiziqh4msbjcascwpac3j5c5yp"; }; packageRequires = [ cl-lib ]; meta = { @@ -5707,7 +5697,7 @@ version = "0.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/theme-buffet-0.1.2.tar"; - sha256 = "1cb9kn07naz2dkl4cznnwi2hy5ccq9igl5jnm7qhaliaszpg2rf9"; + sha256 = "1cfrrl41rlxdbybvxs8glkgmgkznwgpq70h58rkvwm6b5jfs8wv0"; }; packageRequires = [ emacs ]; meta = { @@ -5756,7 +5746,7 @@ version = "0.4.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/tmr-0.4.0.tar"; - sha256 = "1s4q7gbqjhqsvwzcfqr9ykm2pdrjybsi2fanxm01vvmzwg2bi6d8"; + sha256 = "0vvsanjs6b9m3gxm84qr0ywwdj0378y5jkv1nzqdn980rfgfimsv"; }; packageRequires = [ emacs ]; meta = { @@ -5771,7 +5761,7 @@ version = "0.4.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/tomelr-0.4.3.tar"; - sha256 = "03dj7mhqyfdpxr32nyvfgkqr6wr55cd7yk9a0izjs4468zx8vl0d"; + sha256 = "0r2f4dl10fl75ygvbmb4vkqixy24k0z2wpr431ljzp5m29bn74kh"; }; packageRequires = [ emacs map seq ]; meta = { @@ -5786,7 +5776,7 @@ version = "0.3.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/topspace-0.3.1.tar"; - sha256 = "1c2raqmbyv5bd48gimh6dazfb6dmipjmf1j0w53vyrs48dx6kskq"; + sha256 = "0m8z2q1gdi0zfh1df5xb2v0sg1v5fysrl00fv2qqgnd61c2n0hhz"; }; packageRequires = [ emacs ]; meta = { @@ -5794,14 +5784,29 @@ license = lib.licenses.free; }; }) {}; + track-changes = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "track-changes"; + ename = "track-changes"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/track-changes-1.1.tar"; + sha256 = "04srqkpyc6l3s95jyf2p5pqqf1z67i7k89334r6ybqj1l91h2prn"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/track-changes.html"; + license = lib.licenses.free; + }; + }) {}; tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.2.2"; + version = "2.6.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.6.2.2.tar"; - sha256 = "0bbsff2qr71f70nxhdi19b3jzpv6bgfb7x7qkrccsygvsvgyrb2h"; + url = "https://elpa.gnu.org/packages/tramp-2.6.3.tar"; + sha256 = "0z44mfpvn4qy2xc2fsiahw3xir140ljna8aq45dcb7qnmr044xjb"; }; packageRequires = [ emacs ]; meta = { @@ -5816,7 +5821,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/tramp-nspawn-1.0.1.tar"; - sha256 = "1w8h563pcdksqqy5v5vi7vrx76r6pi4bzhqywk1v67rhnr33qsvq"; + sha256 = "0cy8l389s6pi135gxcygv1vna6k3gizqd33avf3wsdbnqdf2pjnc"; }; packageRequires = [ emacs ]; meta = { @@ -5830,8 +5835,8 @@ ename = "tramp-theme"; version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-theme-0.2.el"; - sha256 = "1q1j0vcdyv5gnfbnfl08rnwd5j4ayc1gi1vpinr99ny70wsv7gbf"; + url = "https://elpa.gnu.org/packages/tramp-theme-0.2.tar"; + sha256 = "0dz8ndnmwc38g1gy30f3jcjqg5nzdi6721x921r4s5a8i1mx2kpm"; }; packageRequires = [ emacs ]; meta = { @@ -5845,8 +5850,8 @@ ename = "transcribe"; version = "1.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transcribe-1.5.2.el"; - sha256 = "08m1n6adab46bfywm47gygswf10vnxcfh16yjxglvcsg4prkn2vh"; + url = "https://elpa.gnu.org/packages/transcribe-1.5.2.tar"; + sha256 = "1v1bvcv3zqrj073l3vw7gz20rpa9p86rf1yv219n47kmh27c80hq"; }; packageRequires = []; meta = { @@ -5861,7 +5866,7 @@ version = "0.6.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/transient-0.6.0.tar"; - sha256 = "1lsh8cvg1kspa8gl9fml0x7r61fbhjajmjqjf4r2s7qz102z66xb"; + sha256 = "0rk4gafx3yylzawiny86ml4jzrs8x6cf2bvmnv36p8l13wgp0w9p"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -5876,7 +5881,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/transient-cycles-1.0.tar"; - sha256 = "1gad71kqdw6rm9dy5rxm85l4a5qibs20ijl8bpaxbbq37j44lvjb"; + sha256 = "0s6cxagqxj4i3qf4kx8mdrihciz3v6ga7zw19jcv896rdhx75bx5"; }; packageRequires = [ emacs ]; meta = { @@ -5891,7 +5896,7 @@ version = "0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/tree-inspector-0.4.tar"; - sha256 = "0jsd32qk9rap8mhmm6qkyafvb6c2gyaa0adzdsh3bh03byi3sj6c"; + sha256 = "0v59kp1didml9k245m1v0s0ahh2r79cc0hp5ika93iamrdxkxaiz"; }; packageRequires = [ emacs treeview ]; meta = { @@ -5906,7 +5911,7 @@ version = "0.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/trie-0.6.tar"; - sha256 = "0vh0cizpbdiaq0y018rkrzjyv6lq0jwv9pwlvggbjfsz34kd10a4"; + sha256 = "1jvhvvxkxbbpy93x9kpznvp2hqkkbdbbjaj27fd0wkbijg0k03ln"; }; packageRequires = [ heap tNFA ]; meta = { @@ -5921,7 +5926,7 @@ version = "0.3.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/triples-0.3.5.tar"; - sha256 = "086w3izri2fvg2w9lq4srjcq9gc6amz5vj2iihhysd10ypj3zxwy"; + sha256 = "1wvmfw8yc7nh42f1skmpxqz5f57vkhg7x2cdngpq11lqbgvypj7m"; }; packageRequires = [ emacs seq ]; meta = { @@ -5936,7 +5941,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/typo-1.0.1.tar"; - sha256 = "11k1dca7kw1yviiw310slfj02a7x1w6m3qg7v71d2gcmdbp112ib"; + sha256 = "1w4m2admlgmx7d661l70rryyxbaahfvrvhxc1b9sq41nx88bmgn1"; }; packageRequires = [ emacs ]; meta = { @@ -5951,7 +5956,7 @@ version = "1.0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/ulisp-repl-1.0.3.tar"; - sha256 = "09n0wp0dfg9xyxw0hwwb5p6namninvsw1fs710hmnh224q6wffgy"; + sha256 = "1c23d66vydfp29px2dlvgl5xg91a0rh4w4b79q8ach533nfag3ia"; }; packageRequires = [ emacs ]; meta = { @@ -5959,16 +5964,16 @@ license = lib.licenses.free; }; }) {}; - undo-tree = callPackage ({ elpaBuild, emacs, fetchurl, lib, queue }: + undo-tree = callPackage ({ elpaBuild, fetchurl, lib, queue }: elpaBuild { pname = "undo-tree"; ename = "undo-tree"; version = "0.8.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/undo-tree-0.8.2.tar"; - sha256 = "0fgir9pls9439zwyl3j2yvrwx9wigisj1jil4ijma27dfrpgm288"; + sha256 = "0ad1zhkjdf73j3b2i8nd7f10jlqqvcaa852yycms4jr636xw6ms6"; }; - packageRequires = [ emacs queue ]; + packageRequires = [ queue ]; meta = { homepage = "https://elpa.gnu.org/packages/undo-tree.html"; license = lib.licenses.free; @@ -5981,7 +5986,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/uni-confusables-0.3.tar"; - sha256 = "1grmppbyzvjjz0yiv5vvgpykhalisj9jnh6p9ip9vbnnll63iz4w"; + sha256 = "08150kgqsbcpykvf8m2b25y386h2b4pj08vffm6wh4f000wr72k3"; }; packageRequires = []; meta = { @@ -5996,7 +6001,7 @@ version = "1.0.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/uniquify-files-1.0.4.tar"; - sha256 = "0ry52l9p2sz8nsfh15ffa25s46vqhna466ahmjmnmlihgjhdm85q"; + sha256 = "0xw2l49xhdy5qgwja8bkiq2ibdppl45xzqlr17z92l1vfq4akpzp"; }; packageRequires = [ emacs ]; meta = { @@ -6011,7 +6016,7 @@ version = "0.4.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/urgrep-0.4.1.tar"; - sha256 = "1kwcb7xxk9lcby5s8gpd5dchya7qq063j217rxsjyn8vv9z91lfc"; + sha256 = "046096vk8d5xy33icv4s0s101lrx3xan9ppvh77rqxd95gglhgap"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6031,7 +6036,7 @@ version = "2.0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.5.tar"; - sha256 = "0bpjif0c4yzz75v59wsv7hilkpj2gv4kyc0rdk8h3d9hvmlq7791"; + sha256 = "02b65z70kw37mzj2hh8q6z0zhhacf9sc4hlczpfxdfsy05b8yri9"; }; packageRequires = [ cl-lib nadvice ntlm ]; meta = { @@ -6046,7 +6051,7 @@ version = "0.8.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/url-http-oauth-0.8.3.tar"; - sha256 = "1vcbx8rpzvx4v4g7iyja6kpsqidaiy2xzj7glrwwzhppkbp0xkvy"; + sha256 = "06lpzh8kpxn8cr92blxrjw44h2cfc6fw0pr024sign4acczx10ws"; }; packageRequires = []; meta = { @@ -6061,7 +6066,7 @@ version = "0.9"; src = fetchurl { url = "https://elpa.gnu.org/packages/url-scgi-0.9.tar"; - sha256 = "0mfbqr03302gk38aamlg1lgdznd6y3blcc3zizfb72ppb87j78mc"; + sha256 = "19lvr4d2y9rd5gibaavp7ghkxmdh5zad9ynarbi2w4rjgmz5y981"; }; packageRequires = [ emacs ]; meta = { @@ -6076,7 +6081,7 @@ version = "2.4.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/use-package-2.4.5.tar"; - sha256 = "09aimbmkcpyffrq1qnavzx6c4ccfawz7ndz2ac8md7qxilxx58yc"; + sha256 = "060bbrbmx3psv4jkn95zjyhbyfidip86sfi8975fhqcc0aagnwhp"; }; packageRequires = [ bind-key emacs ]; meta = { @@ -6095,8 +6100,8 @@ ename = "validate"; version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/validate-1.0.4.el"; - sha256 = "0vksssk98hcnz804g62k8kika13argf6p7bx8rf9hwidvzdsv6mi"; + url = "https://elpa.gnu.org/packages/validate-1.0.4.tar"; + sha256 = "1bn25l62zcabg2ppxwr4049m1qd0yj095cflqrak0n50acgjs6w5"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -6111,7 +6116,7 @@ version = "3.1.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/valign-3.1.1.tar"; - sha256 = "1nla0zfj0rxwhdjgnsy2c34wzrxfxiwl89cjb6aicyvfxninz7j0"; + sha256 = "16v2mmrih0ykk4z6qmy29gajjb3v83q978gzn3y6pg8y48b2wxpb"; }; packageRequires = [ emacs ]; meta = { @@ -6126,7 +6131,7 @@ version = "1.1.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/vc-backup-1.1.0.tar"; - sha256 = "1ipkymndxymbayrgr3jz27p64bkjf1nq9h4w3afpzkpqzw237ak5"; + sha256 = "0a45bbrvk4s9cj3ih3hb6vqjv4hkwnz7m9a4mr45m6cb0sl9b8a3"; }; packageRequires = []; meta = { @@ -6141,7 +6146,7 @@ version = "1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/vc-got-1.2.tar"; - sha256 = "074di4bchhnpfixkjdis8dwxx6r32j1qypxk647q1z7lvd92j39s"; + sha256 = "04m1frrnla4zc8db728280r9fbk50bgjkk4k7dizb0hawghk4r3p"; }; packageRequires = [ emacs ]; meta = { @@ -6156,7 +6161,7 @@ version = "1.14.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/vc-hgcmd-1.14.1.tar"; - sha256 = "12izw5ln22xdgwh6mqm6axzdfpcnqq7qcj72nmykrbsgpagp5fy6"; + sha256 = "0a8a4d9difrp2r6ac8micxn8ij96inba390324w087yxwqzkgk1g"; }; packageRequires = [ emacs ]; meta = { @@ -6171,7 +6176,7 @@ version = "0.2.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/vcard-0.2.2.tar"; - sha256 = "0f06qzmj91kdpdlhlykh7v7jx0xvwxg8072ys145g1mvh5l23yig"; + sha256 = "0r56y3q2gigm8rxifly50m5h1k948y987541cqd8w207wf1b56bh"; }; packageRequires = [ emacs ]; meta = { @@ -6185,8 +6190,8 @@ ename = "vcl-mode"; version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vcl-mode-1.1.el"; - sha256 = "1r70pmvr95k5f2xphvhliqvyh7al0qabm7wvkamximcssvs38q1h"; + url = "https://elpa.gnu.org/packages/vcl-mode-1.1.tar"; + sha256 = "0zz664c263x24xzs7hk2mqchzplmx2dlba98d5fpy8ybdnziqfkj"; }; packageRequires = []; meta = { @@ -6201,7 +6206,7 @@ version = "0.2.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/vdiff-0.2.4.tar"; - sha256 = "1mgzfrzp6nbb4xv2zjqk4za2dv3r5645jasiwf45wzqq5wbrgq2c"; + sha256 = "0crgb32dk0yzcgvjai0b67wcbcfppc3h0ppfqgdrim1nincbwc1m"; }; packageRequires = [ emacs hydra ]; meta = { @@ -6218,7 +6223,7 @@ version = "2024.3.1.121933719"; src = fetchurl { url = "https://elpa.gnu.org/packages/verilog-mode-2024.3.1.121933719.tar"; - sha256 = "047kna2j1mbsibw1psxdp8qmg91dnjrdrskdzhys9pmaqggfl5ry"; + sha256 = "1z0mbd5sbbq2prhc0vfpqd4h4a6jwl5fqyrnl39yp05zm66va34w"; }; packageRequires = []; meta = { @@ -6230,10 +6235,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.7"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-1.7.tar"; - sha256 = "1dglwscp29c5281spmrxv5k1pbvswcz5rcap6w5s97fqk5ziinsm"; + url = "https://elpa.gnu.org/packages/vertico-1.8.tar"; + sha256 = "0k6sfla0183vyjf2yd9sycck9nxz0x659kygxgiaip3zq7f9zkg8"; }; packageRequires = [ compat emacs ]; meta = { @@ -6253,7 +6258,7 @@ version = "0.7.7"; src = fetchurl { url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.7.tar"; - sha256 = "0xqbbqkzd2v7kqgmiwlx9pmpck2mpfwxmvy66i7dpzysvargi70q"; + sha256 = "0ahn0b5v9xw6f1zvgv27c82kxdh4rx7n9dbp17rkkkg3dvvkdzxy"; }; packageRequires = [ emacs posframe vertico ]; meta = { @@ -6267,8 +6272,8 @@ ename = "vigenere"; version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vigenere-1.0.el"; - sha256 = "1i5s6h1nngcp74gf53dw9pvj5y0ywk9j8pyvkfr7gqq49bz22hmm"; + url = "https://elpa.gnu.org/packages/vigenere-1.0.tar"; + sha256 = "1zlni6amznzi9w96kj7lnhfrr049crva2l8kwl5jsvyaj5fc6nq5"; }; packageRequires = [ emacs ]; meta = { @@ -6286,7 +6291,7 @@ version = "1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.2.tar"; - sha256 = "0sipyqrgf723ii2zd6r8hvihn5kax5qd0dwwrrxqy6f58wnhyq1r"; + sha256 = "0vy4ar10wbdykzl47xnrfcwszjxyq2f1vhdbynfcmkcyrr40v4wm"; }; packageRequires = [ emacs ]; meta = { @@ -6298,10 +6303,10 @@ elpaBuild { pname = "visual-fill"; ename = "visual-fill"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/visual-fill-0.1.el"; - sha256 = "1y4xqcr1am74y9jy7kdkjigvx7h3208si5lm4p6a0kzxa3xizhvx"; + url = "https://elpa.gnu.org/packages/visual-fill-0.2.tar"; + sha256 = "00r3cclhrdx5y0h1p1rrx5psvc8d95dayzpjdsy9xj44i8pcnvja"; }; packageRequires = []; meta = { @@ -6316,7 +6321,7 @@ version = "1.7.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/vlf-1.7.2.tar"; - sha256 = "0hpri19z6b7dqmrj5ckp8sf0m0l72lkgahqzvfmwhgpgv2p81bny"; + sha256 = "1napxdavsrwb5dq2i4ka06rhmmfk6qixc8mm2a6ab68iavprrqkv"; }; packageRequires = []; meta = { @@ -6328,10 +6333,10 @@ elpaBuild { pname = "vundo"; ename = "vundo"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vundo-2.2.0.tar"; - sha256 = "1vb5mq51krpcaw741dai3b9s12yicn73l1bqql41gylpanca83py"; + url = "https://elpa.gnu.org/packages/vundo-2.3.0.tar"; + sha256 = "165y277fi0vp9301hy3pqgfnf160k29n8vri0zyq8a3vz3f8lqrl"; }; packageRequires = [ emacs ]; meta = { @@ -6346,7 +6351,7 @@ version = "2021"; src = fetchurl { url = "https://elpa.gnu.org/packages/wcheck-mode-2021.tar"; - sha256 = "0qcj0af0570cssy9b7f74v9pv0pssm6ysnl1lyh8wwvl4yf0zx61"; + sha256 = "0igsdsfw80nnrbw1ba3rgwp16ncy195kwv78ll9zbbf3y23n7kr0"; }; packageRequires = []; meta = { @@ -6360,8 +6365,8 @@ ename = "wconf"; version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wconf-0.2.1.el"; - sha256 = "13p1xycp3mcrg8jv65mcyqvln4h7awhjz35dzr5bi86zb824ryxf"; + url = "https://elpa.gnu.org/packages/wconf-0.2.1.tar"; + sha256 = "1ci5ysn2w9hjzcsv698b6mh14qbrmvlzn4spaq4wzwl9p8672n08"; }; packageRequires = [ emacs ]; meta = { @@ -6376,7 +6381,7 @@ version = "0.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/web-server-0.1.2.tar"; - sha256 = "10lcsl4dg2yr9zjd99gq9jz150wvvh6r5y9pd88l8y9vz16f2lim"; + sha256 = "0wikajm4pbffcy8clwwb5bnz67isqmcsbf9kca8rzx4svzi5j2gc"; }; packageRequires = [ emacs ]; meta = { @@ -6391,7 +6396,7 @@ version = "1.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/webfeeder-1.1.2.tar"; - sha256 = "1l128q424qsq9jv2wk8cv4zli71rk34q5kgwa9axdz0d27p9l6v4"; + sha256 = "0418fpw2ra12n77560gh9j9ymv28d895bdhpr7x9xakvijjh705m"; }; packageRequires = [ emacs ]; meta = { @@ -6406,7 +6411,7 @@ version = "1.15"; src = fetchurl { url = "https://elpa.gnu.org/packages/websocket-1.15.tar"; - sha256 = "0mvvq9gsx856ip2gkrvjw4k8a85vrrkp27dcpkvamxq93lfd7hin"; + sha256 = "0cm3x6qzr4zqj46w0qfpn7n9g5z80figcv824869snvc74465h1g"; }; packageRequires = [ cl-lib ]; meta = { @@ -6421,7 +6426,7 @@ version = "3.6.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/which-key-3.6.0.tar"; - sha256 = "05wy147734mlpzwwxdhidnsplrz2vzs1whczzs4jw1i7kp7jvy3v"; + sha256 = "1lf8q6sq0hnrspj6qy49i48az3js24ab4y0gksw4giiifiqlc5ba"; }; packageRequires = [ emacs ]; meta = { @@ -6436,7 +6441,7 @@ version = "3.0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/window-commander-3.0.2.tar"; - sha256 = "1v85g89rz8r2ypw6651lrb9mvrimdwhxan7kxzhpgam2i2g7kcr7"; + sha256 = "15345sgdmgz0vv9bk2cmffjp66i0msqj0xn2cxl7wny3bkfx8amv"; }; packageRequires = [ emacs ]; meta = { @@ -6465,8 +6470,8 @@ ename = "windresize"; version = "0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/windresize-0.1.el"; - sha256 = "0b5bfs686nkp7s05zgfqvr1mpagmkd74j1grq8kp2w9arj0qfi3x"; + url = "https://elpa.gnu.org/packages/windresize-0.1.tar"; + sha256 = "1wjqrwrfql5c67yv59hc95ga0mkvrqz74gy46aawhn8r3xr65qai"; }; packageRequires = []; meta = { @@ -6481,7 +6486,7 @@ version = "4.3.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/wisi-4.3.2.tar"; - sha256 = "0y3wh0wvxqw7ig2bfrha4zs03993aqcpdp9pald20nady6sqri37"; + sha256 = "0qa6nig33igv4sqk3fxzrmx889pswq10smj9c9l3phz2acqx8q92"; }; packageRequires = [ emacs seq ]; meta = { @@ -6501,7 +6506,7 @@ version = "1.3.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.3.0.tar"; - sha256 = "05g2zn3p9r7rha20wv8jy1dwvllfyjjpzr6agkcm523rj639jh2b"; + sha256 = "0i0vy751ycbfp8l8ynzj6iqgvc3scllwysdchpjv4lyj0m7m3s20"; }; packageRequires = [ emacs mmm-mode wisi ]; meta = { @@ -6515,8 +6520,8 @@ ename = "wpuzzle"; version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wpuzzle-1.1.el"; - sha256 = "1wjg411dc0fvj2n8ak73igfrzc31nizzvvr2qa87fhq99bgh62kj"; + url = "https://elpa.gnu.org/packages/wpuzzle-1.1.tar"; + sha256 = "05dgvr1miqp870nl7c8dw7j1kv4mgwm8scynjfwbs9wjz4xmzc6c"; }; packageRequires = []; meta = { @@ -6528,10 +6533,10 @@ elpaBuild { pname = "wrap-search"; ename = "wrap-search"; - version = "4.12.10"; + version = "4.14.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wrap-search-4.12.10.tar"; - sha256 = "0r1ggggpm7x201r5yp0nhnc9146nrqzb5df1bjg7z2am2150r1i9"; + url = "https://elpa.gnu.org/packages/wrap-search-4.14.11.tar"; + sha256 = "07x6fcig69d3hmcmvpj75h605j8sfjwmd4z1yd4rb6np60dh42ff"; }; packageRequires = []; meta = { @@ -6546,7 +6551,7 @@ version = "1.11"; src = fetchurl { url = "https://elpa.gnu.org/packages/xclip-1.11.tar"; - sha256 = "0hgblj8ng7vfsdb7g1mm9m2qhzfprycdd77836l59prpak5kp55q"; + sha256 = "081k9azz9jnmjmqlcc1yw9s4nziac772lw75xcm78fgsfrx42hmr"; }; packageRequires = []; meta = { @@ -6561,7 +6566,7 @@ version = "3.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/xeft-3.3.tar"; - sha256 = "1jzas6qy0s686s0ghdrgcz2bfyp32s70qvkqw00sm3mm3jypiplm"; + sha256 = "00zkhqajkkf979ccbnz076dpav2v52q44li2m4m4c6p3z0c3y255"; }; packageRequires = [ emacs ]; meta = { @@ -6576,7 +6581,7 @@ version = "0.18"; src = fetchurl { url = "https://elpa.gnu.org/packages/xelb-0.18.tar"; - sha256 = "1fp5mzl63sh0h3ws4l5p4qgvi7ny8a3fj6k4dhqa98xgw2bx03v7"; + sha256 = "1qixb236z01azjbc1xycji99rjkq747hip4gcf0gli1is8ink0bs"; }; packageRequires = [ cl-generic emacs ]; meta = { @@ -6591,7 +6596,7 @@ version = "1.0.5"; src = fetchurl { url = "https://elpa.gnu.org/packages/xpm-1.0.5.tar"; - sha256 = "13p6s6b2v7h4bnwdkkrd1qz84jd7g2s18w0czhpxv6hvj9sqf5hx"; + sha256 = "12a12rmbc1c0j60nv1s8fgg3r2lcjw8hs7qpyscm7ggwanylxn6q"; }; packageRequires = [ cl-lib queue ]; meta = { @@ -6606,7 +6611,7 @@ version = "1.25"; src = fetchurl { url = "https://elpa.gnu.org/packages/xr-1.25.tar"; - sha256 = "0w4gaxypl76d1jw9vcq0zhj7ksj44wyfb148l1fb0vl7h6wpv0pg"; + sha256 = "0jmhcrz6mj3fwm9acwv1jj6nlnqikprjgvglr3cgxysinqh6y3xi"; }; packageRequires = [ emacs ]; meta = { @@ -6621,7 +6626,7 @@ version = "1.6.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/xref-1.6.3.tar"; - sha256 = "0ccfp47y769zrb5sza8skzy4nj4793lzd0jn5c83s3g916gp304l"; + sha256 = "0mir1nhic0rnz12d8i1n6m2ihfynhkkg8yccy4v9j4kd31w6f1gs"; }; packageRequires = [ emacs ]; meta = { @@ -6636,7 +6641,7 @@ version = "0.2.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/xref-union-0.2.0.tar"; - sha256 = "0kcmg9fm9gcpdxfwx7c6zz29krf69j5nh6knv2x3df65sbzwdj0b"; + sha256 = "0ghhasqs0xq2i576fp97qx6x3h940kgyp76a49gj5cdmig8kyfi8"; }; packageRequires = [ emacs ]; meta = { @@ -6651,7 +6656,7 @@ version = "0.14.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/yasnippet-0.14.1.tar"; - sha256 = "05nc76wzc9b1a34998xx6l1wc5ss682afllf6dnl6rdj8hza65wy"; + sha256 = "0xsq0i9xv9hib5a52rv5vywq1v6gr44gjsyfmqxwffmw1a25x25g"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -6669,7 +6674,7 @@ version = "1.0.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/yasnippet-classic-snippets-1.0.2.tar"; - sha256 = "1kk1sf9kgj6qp3z2d9nbswigl444sqq11pdrhx0gny2jsgi3283l"; + sha256 = "1qiw5592mj8gmq1lhdcpxfza7iqn4cmhn36vdskfa7zpd1lq26y1"; }; packageRequires = [ yasnippet ]; meta = { @@ -6684,7 +6689,7 @@ version = "2023.6.11"; src = fetchurl { url = "https://elpa.gnu.org/packages/zones-2023.6.11.tar"; - sha256 = "1znz720s9pchc7r9g1mpz9jcnz122bppimmh09g1rn94fh3m6vm3"; + sha256 = "1z3kq0lfc4fbr9dnk9kj2hqcv60bnjp0x4kbxaxy77vv02a62rzc"; }; packageRequires = []; meta = { @@ -6699,7 +6704,7 @@ version = "1.0.6"; src = fetchurl { url = "https://elpa.gnu.org/packages/ztree-1.0.6.tar"; - sha256 = "1cyd31az566dmh3lyp7czw7kkkih7drr4c88b7da1xzbfkvibm2j"; + sha256 = "1yyh09jff31j5w6mqsnibig3wizv7acsw39pjjfv1rmngni2b8zi"; }; packageRequires = [ cl-lib ]; meta = { @@ -6714,7 +6719,7 @@ version = "0.4.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/zuul-0.4.0.tar"; - sha256 = "1bm91g001q3n5m9ihxc719siiiy23pkpfkhplwi9p1i4i9zrpx5g"; + sha256 = "1mj54hm4cqidrmbxyqdjfsc3qcmjhbl0wii79bydx637dvpfvqgf"; }; packageRequires = [ emacs project ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix index bac7de0fea..970174f20c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix @@ -4,21 +4,21 @@ , acm , popon , writeText -, unstableGitUpdater +, writeScript }: let - rev = "0dbbd7f401da1bedd1a9146df6127233d601435b"; + rev = "1851d8fa2a27d3fd8deeeb29cd21c3002b8351ba"; in melpaBuild { pname = "acm-terminal"; - version = "20230601.1326"; # 13:26 UTC + version = "20231206.1141"; src = fetchFromGitHub { owner = "twlz0ne"; repo = "acm-terminal"; inherit rev; - sha256 = "sha256-Opouy9A6z0YUT1zxZq1yHx+r/hwNE93JDwfa1fMWNgc="; + sha256 = "sha256-EYhFrOo0j0JSNTdcZCbyM0iLxaymUXi1u6jZy8lTOaY="; }; commit = rev; @@ -32,7 +32,19 @@ melpaBuild { (acm-terminal :repo "twlz0ne/acm-terminal" :fetcher github) ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts coreutils git gnused + set -eu -o pipefail + tmpdir="$(mktemp -d)" + git clone --depth=1 https://github.com/twlz0ne/acm-terminal.git "$tmpdir" + pushd "$tmpdir" + commit=$(git show -s --pretty='format:%H') + # Based on: https://github.com/melpa/melpa/blob/2d8716906a0c9e18d6c979d8450bf1d15dd785eb/package-build/package-build.el#L523-L533 + version=$(TZ=UTC git show -s --pretty='format:%cd' --date='format-local:%Y%m%d.%H%M' | sed 's|\.0*|.|') + popd + update-source-version emacsPackages.acm-terminal $version --rev="$commit" + ''; meta = with lib; { description = "Patch for LSP bridge acm on Terminal"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix index 1286c9fc64..e714a20cb3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix @@ -1,21 +1,26 @@ -{ lib, melpaBuild, fetchurl, writeText }: +{ + lib, + melpaBuild, + fetchzip, + writeText, +}: melpaBuild rec { pname = "ebuild-mode"; - version = "1.67"; + version = "1.70"; - src = fetchurl { - url = "https://dev.gentoo.org/~ulm/emacs/ebuild-mode-${version}.tar.xz"; - hash = "sha256-5qxHpu1BLtI8LFnL/sAoqmo80zeyElxIdFtAsfMefUE="; + src = fetchzip { + url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2"; + hash = "sha256-dOm3xJMFLelwcImIwckeQHx1GqV9PB+I45QA9UT1nCM="; }; # not used but needs to be set; why? - commit = "e7b45096283ac8836f208babddfd1ea1c1d1d1d"; + commit = "a643f177b58aa8869f2f24814e990320aa4f0f96"; recipe = writeText "recipe" '' (ebuild-mode - :url "https://anongit.gentoo.org/git/proj/ebuild-mode.git" - :fetcher git) + :url "https://gitweb.gentoo.org/proj/ebuild-mode.git" + :fetcher git) ''; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 2ddd3e0bda..cca22bda67 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -11,12 +11,12 @@ , pyright , ruff , tempel +, writeScript , writeText -, unstableGitUpdater }: let - rev = "0b30d95c6de95b150d93ecee325b95e04ff09e46"; + rev = "b8768c4a76525d82360d124c829774acd26634c3"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20231021.309"; # 3:09 UTC + version = "20240510.1618"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-hR7bZh0ElJ8F9ToJ4dkazF19T8PE01MTcxKrjeaEp4o="; + hash = "sha256-f+JnzW4XrDC3QP9iuhKAmy+T2adoFx+0q03GI7VO0/s="; }; commit = rev; @@ -88,7 +88,22 @@ melpaBuild { runHook postCheck ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts coreutils git gnused + set -eu -o pipefail + + tmpdir="$(mktemp -d)" + git clone --depth=1 https://github.com/manateelazycat/lsp-bridge.git "$tmpdir" + + pushd "$tmpdir" + commit=$(git show -s --pretty='format:%H') + # Based on: https://github.com/melpa/melpa/blob/2d8716906a0c9e18d6c979d8450bf1d15dd785eb/package-build/package-build.el#L523-L533 + version=$(TZ=UTC git show -s --pretty='format:%cd' --date='format-local:%Y%m%d.%H%M' | sed 's|\.0*|.|') + popd + + update-source-version emacsPackages.lsp-bridge $version --rev="$commit" + ''; meta = with lib; { description = "A blazingly fast LSP client for Emacs"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix index 34c077da77..398f366f52 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix @@ -22,7 +22,7 @@ let homepage = "https://github.com/zbelial/lspce"; description = "LSP Client for Emacs implemented as a module using rust"; license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.marsam ]; + maintainers = [ ]; inherit (emacs.meta) platforms; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix index cb4cec172b..f8a0ec28a3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix @@ -16,9 +16,8 @@ let inherit (melpaStablePackages) tree-sitter-langs; - libSuffix = if stdenv.isDarwin then "dylib" else "so"; langName = g: lib.removeSuffix "-grammar" (lib.removePrefix "tree-sitter-" g.pname); - soName = g: langName g + "." + libSuffix; + soName = g: langName g + stdenv.hostPlatform.extensions.sharedLibrary; grammarDir = runCommand "emacs-tree-sitter-grammars" { # Fake same version number as upstream language bundle to prevent triggering runtime downloads diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix index 67b5a96ee9..0f9da81362 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://git.sr.ht/~casouri/xapian-lite"; description = "A minimal Emacs dynamic module for Xapian"; - maintainers = [ lib.maintainers.marsam ]; + maintainers = [ lib.maintainers.kotatsuyaki ]; license = lib.licenses.gpl3Plus; inherit (emacs.meta) platforms; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index c9a699f5a0..d9cb7b0aa5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -7,7 +7,7 @@ version = "0.7.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/adoc-mode-0.7.0.tar"; - sha256 = "055wljs3y8z9m9rvnqv8w0mvcpz5qd3v9sjhr5v0fv72p1vvf9rc"; + sha256 = "1gdjgybpbw3qj9mfmq9ljx4xaam1f6rwyrav2y2f5fpv6z7w0i61"; }; packageRequires = [ emacs ]; meta = { @@ -22,7 +22,7 @@ version = "0.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/afternoon-theme-0.1.tar"; - sha256 = "0aalwn1hf0p756qmiybmxphh4dx8gd5r4jhbl43l6y68fdijr6qg"; + sha256 = "0xxvr3njpbdlm8iyyklwijjaysyknwpw51hq2443wq37bsxciils"; }; packageRequires = [ emacs ]; meta = { @@ -37,7 +37,7 @@ version = "0.10"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/alect-themes-0.10.tar"; - sha256 = "0j5zwmxq1f9hlarr1f0j010kd3n2k8hbhr8pw789j3zlc2kmx5bb"; + sha256 = "0pagkf0bb85sr3mvg8z6h6akb9hjmvfqmpiaiz121ys0r92m6nb7"; }; packageRequires = [ emacs ]; meta = { @@ -52,7 +52,7 @@ version = "0.3.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/ample-theme-0.3.0.tar"; - sha256 = "0b5a9pqvmfc3h1l0rsmw57vj5j740ysnlpiig6jx9rkgn7awm5p1"; + sha256 = "12z8z6da1xfc642w2wc82sjlfj3ymlz3jwrg3ydc2fapis2d3ibi"; }; packageRequires = []; meta = { @@ -64,10 +64,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-2.2.0.tar"; - sha256 = "1h1whavdrwfsc79kcvh2vbvjzqd7n01xzjb1acgyiy9wkyl79p7b"; + url = "https://elpa.nongnu.org/nongnu/annotate-2.2.1.tar"; + sha256 = "04k42bc3jbna3jipcpsj31lhcj1cqabak4pmllz9c0jf1z74hx94"; }; packageRequires = []; meta = { @@ -82,7 +82,7 @@ version = "2.5.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/anti-zenburn-theme-2.5.1.tar"; - sha256 = "06d7nm4l6llv7wjbwnhfaamrcihichljkpwnllny960pi56a8gmr"; + sha256 = "121038d6mjdfis1c5v9277bd6kz656n0c25daxq85mfswvjlar0i"; }; packageRequires = []; meta = { @@ -97,7 +97,7 @@ version = "0.64"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/anzu-0.64.tar"; - sha256 = "1znw7wlpjb3d8wsijqziiq21j966x95q9g5j16wx48xyrrzr1mcs"; + sha256 = "0mv4xiy3481d5r4rypmw7nn1hjmsvlfz5dhgmpn6cqbpzkgb6zjb"; }; packageRequires = [ emacs ]; meta = { @@ -112,7 +112,7 @@ version = "2.2.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/apache-mode-2.2.0.tar"; - sha256 = "022s7rw7ary1cx3riszzvb7wi0y078vixkcyggjdg5j2ckjpc8gb"; + sha256 = "10fgbgww7j60dik7b7mvnm1zwgv9y8p5wzggkrdk50dv3gjfxg8f"; }; packageRequires = []; meta = { @@ -127,7 +127,7 @@ version = "0.2.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/apropospriate-theme-0.2.0.tar"; - sha256 = "1s4cvh24zj3wpdqc3lklvi1dkba3jf87nxrzq0s3l1rzhg21pfpj"; + sha256 = "1hsv26iqr0g6c3gy1df2qkd3ilwq6xaa89ch7pqh64737qrlw9db"; }; packageRequires = []; meta = { @@ -142,7 +142,7 @@ version = "1.3.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.0.tar"; - sha256 = "1270mbjgj0kmmjqqblwaipmd2667yp31mgspib3c5d7d6acs1bfx"; + sha256 = "167b35s34x51qnlx59sawaz4wzlnk2kf9130ylz2b1bj7jy5n27a"; }; packageRequires = [ emacs spinner ]; meta = { @@ -159,7 +159,7 @@ version = "2.1.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.1.1.tar"; - sha256 = "0a7xdp25bny5ykf7808jwmziad8myf8yp01p07f20bsrl4m0bzz6"; + sha256 = "0rgf0q66kdw9ind5bi01ydk84rclcd3kmlfzm9rfb429xnhqfzw8"; }; packageRequires = []; meta = { @@ -174,7 +174,7 @@ version = "0.2.18"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.18.tar"; - sha256 = "1gn7n8xd07sks49xirwah1y039s2hn02p0y1j4lmqh7m47l0fvl2"; + sha256 = "1v6si9fh3rbka72r5jfd35bbvfbfaxr2kfi7jmsgj07fhx4bgl2d"; }; packageRequires = [ dash emacs ]; meta = { @@ -189,7 +189,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/base32-1.0.tar"; - sha256 = "02n227xwg621zh4na5lx8xh5q6zldq0hwwfzc4wkgfg2jb83n4g8"; + sha256 = "1k1n0zlks9dammpmr0875xh5vw5prmc7rr5kwd262xidscj19k6w"; }; packageRequires = [ emacs ]; meta = { @@ -204,7 +204,7 @@ version = "3.1.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/bash-completion-3.1.1.tar"; - sha256 = "19vs0rflqm1z4r17pv1qx6v60g03x4n2b7503rjr2d0ljrwkbpcp"; + sha256 = "1yc1a5cvmnp8dranrglpd7qjg35r6x4ndniinbmzinqr7dmydh62"; }; packageRequires = [ emacs ]; meta = { @@ -219,7 +219,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/better-jumper-1.0.1.tar"; - sha256 = "0jykcz4g0q29k7rawsp2n5zmx88kdh3kbh0497vvpks74vvk2c9f"; + sha256 = "1jdmbp1jjip8vmmc66z2wgx95lzp1b92m66p160mdm4g3skl64c2"; }; packageRequires = [ emacs ]; meta = { @@ -234,7 +234,7 @@ version = "1.1.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/bind-map-1.1.2.tar"; - sha256 = "1x98pgalnpl45h63yw6zz6q16x00phijyx2pf4jrf93s18lx33z5"; + sha256 = "037xk912hx00ia62h6kdfa56g44dhd0628va22znxg251izvnqxq"; }; packageRequires = [ emacs ]; meta = { @@ -249,7 +249,7 @@ version = "0.4"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/bison-mode-0.4.tar"; - sha256 = "19n9kz1ycjpxngd3clzr8lzrnnw19l8sfvlx1yqn35hk7017z7ab"; + sha256 = "0k0h96bpcndi3m9fdk74j0ynm50n6by508mv3ds9ala26dpdr7qa"; }; packageRequires = []; meta = { @@ -264,7 +264,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/blow-1.0.tar"; - sha256 = "0z2y3vq8m4x9ihn84x7p2vgkxprrrvhavcgwll897gsc9khp1xda"; + sha256 = "009x0y86692ccj2v0cizr40ly6xdp72bnwj5pjayg3y0ph4iz0cj"; }; packageRequires = [ emacs ]; meta = { @@ -279,7 +279,7 @@ version = "0.0.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode-0.0.3.tar"; - sha256 = "1ii46kmiaxywymhjlj85c3ypdnkkhgyaqgzhnkzzfz6946dchj3v"; + sha256 = "0v1sk80dka2gdkwcbria12ih3jrna3866ngdswcskyqcnkxm7b7n"; }; packageRequires = [ emacs ]; meta = { @@ -294,7 +294,7 @@ version = "2.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/boxquote-2.3.tar"; - sha256 = "1d072qls4ywl71wi29khlq4w6yw9idp55vf811nvbmiihn6lwmiv"; + sha256 = "0fsvfy5b4k0h6fxmvvdngxap5pfypm8iik0m1jq70za7n7g8qvmy"; }; packageRequires = [ cl-lib ]; meta = { @@ -306,10 +306,10 @@ elpaBuild { pname = "buttercup"; ename = "buttercup"; - version = "1.34"; + version = "1.35"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/buttercup-1.34.tar"; - sha256 = "0bdlky9d5fzc9x9wpjxyvrclz1rmzsnvc89lf0m5fhyp4r8jvxy4"; + url = "https://elpa.nongnu.org/nongnu/buttercup-1.35.tar"; + sha256 = "0b9dxbn7pni2203xdg289ymkmhf458898i2lh7aplppmh68bms2c"; }; packageRequires = [ emacs ]; meta = { @@ -324,7 +324,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/camera-0.3.tar"; - sha256 = "0faqdsgi3kwkk0yqp1676d8x4mi11yj856fj7spf3j02y83r1lmj"; + sha256 = "0r9b20li82qcc141p4blyaj0xng5f4xrghhl09wc15ffi0cmbq7d"; }; packageRequires = [ emacs ]; meta = { @@ -339,7 +339,7 @@ version = "4.9"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/caml-4.9.tar"; - sha256 = "00ldvz6r10vwwmk6f3az534p0340ywn7knsg2bmvbvh3q51vyl9i"; + sha256 = "1xzk83bds4d23rk170n975mijlmin5dh7crfc5swwvzh8w88qxmk"; }; packageRequires = [ emacs ]; meta = { @@ -354,7 +354,7 @@ version = "4.18.4"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.4.tar"; - sha256 = "0qa4wp76jykykh244an84kmlvwnsqjnc8ii38mdnd5jjnhacg11v"; + sha256 = "174i72z3pyxsbagqk7g8d84282fh3y3ipv0bcghrgqjznxdjx427"; }; packageRequires = []; meta = { @@ -379,7 +379,7 @@ version = "1.13.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/cider-1.13.1.tar"; - sha256 = "0ipmhm8ggh437m72b0vf9vfmwkcfwj3yy37wldz0yyiv59y2g50p"; + sha256 = "0df5z57schfszlp1vkb6fiiadx12qlpk5qzfw61g664a2i654fsg"; }; packageRequires = [ clojure-mode @@ -403,7 +403,7 @@ version = "5.18.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.18.1.tar"; - sha256 = "1wnl10r79cc1p9a1zwyzhj9ddvc166xkmc7f04pibwxw9j4l3ppg"; + sha256 = "1p9nh4p3skjxbsnyj2in3m8jdyrrj8iw0malfcz0ppc4d7zm6klx"; }; packageRequires = [ emacs ]; meta = { @@ -418,7 +418,7 @@ version = "0.2.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.2.2.tar"; - sha256 = "19dskc53dx183kcb7p5qx41qsjsy1mqi46zrdfc1znl7rdknhvl7"; + sha256 = "14s3gawx2lazzd5ziz2plhl6k1qik8gfjka7fijgxb55ls9bvgrp"; }; packageRequires = [ emacs ]; meta = { @@ -426,16 +426,20 @@ license = lib.licenses.free; }; }) {}; - coffee-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + coffee-mode = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "coffee-mode"; ename = "coffee-mode"; version = "0.6.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/coffee-mode-0.6.3.tar"; - sha256 = "1yv1b5rzlj7cpz7gsv2j07mr8z6lkwxp1cldkrc6xlhcbqh8795a"; + sha256 = "1anywqp2b99dmilfnajxgf4msc0viw6ndl0lxpgaa7d2b3mzx9nq"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/coffee-mode.html"; license = lib.licenses.free; @@ -471,7 +475,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/consult-flycheck-1.0.tar"; - sha256 = "0901wliqdzj5dmam1kkbq0nxhywqf11182q7yxjxh98czy5w3xh8"; + sha256 = "17kc7v50zq69l4803nh8sjnqwi59p09wjzqkwka6g4dapya3h2xy"; }; packageRequires = [ consult emacs flycheck ]; meta = { @@ -491,7 +495,7 @@ version = "0.7"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.7.tar"; - sha256 = "1vva3wwmczdph8dlhvwy1vlan8nmzlz6370zia6hz3adwc496a4s"; + sha256 = "0a41hfma4iiinq2cgvwqqwxhrwjn5c7igl5sgvgx0mbjki2n6sll"; }; packageRequires = [ corfu emacs popon ]; meta = { @@ -506,7 +510,7 @@ version = "0.5.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/crux-0.5.0.tar"; - sha256 = "0zdzfglzvhkzyvnkk2d217c6f8gnbcxlp8adimwrxgqh7c6gwihp"; + sha256 = "0cykjwwhl6r02fsyam4vnmlxiyq8b8qsgncb1hjnz4gj7mxc9gg4"; }; packageRequires = [ emacs ]; meta = { @@ -521,7 +525,7 @@ version = "1.22"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/cyberpunk-theme-1.22.tar"; - sha256 = "1kva129l8vwfvafw329znrsqhm1j645xsyz55il1jhc28fbijp51"; + sha256 = "1kgkgpb07d4kh2rf88pfgyji42qv80443i67nzha2fx01zbd5swb"; }; packageRequires = []; meta = { @@ -537,10 +541,10 @@ elpaBuild { pname = "cycle-at-point"; ename = "cycle-at-point"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cycle-at-point-0.1.tar"; - sha256 = "0097w7nw8d1q7ad4b4qjk0svwxqg80jr2p27540vkir7289w59j3"; + url = "https://elpa.nongnu.org/nongnu/cycle-at-point-0.2.tar"; + sha256 = "1q3gylksr754s0pl8x1hdk0q4p0vz6lnasswgsqpx44nmnbsrw6z"; }; packageRequires = [ emacs recomplete ]; meta = { @@ -555,7 +559,7 @@ version = "202003130913"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/d-mode-202003130913.tar"; - sha256 = "1pad0ib8l1zkjmh97n1pkwph1xdbcqidnicm3nwmcbmbi61lddsx"; + sha256 = "0sdyk8q1pfk5gbj5hdyc1djmyb02vvhs4s2fbbxk52nlkx95p46s"; }; packageRequires = [ emacs ]; meta = { @@ -570,7 +574,7 @@ version = "1.0.7"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/dart-mode-1.0.7.tar"; - sha256 = "13n0fmnxgnq8vjw0n5vwgdgfm5lznvrm3xkak4snkdw7w3rd3a20"; + sha256 = "1k9pn7nqskz39m3zwi9jhd1a2q440jgrla1a37qip73mwrdril1i"; }; packageRequires = [ emacs ]; meta = { @@ -585,7 +589,7 @@ version = "0.1.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/denote-refs-0.1.2.tar"; - sha256 = "1s2q9j2xg2g293ip7w2bq2kjk6pasaf6cmvzcbh0k00yx8aa2alp"; + sha256 = "0jq14adxpx9bxddkj3a4bahyr3yarjn85iplhhy9yk7k9wy7wis0"; }; packageRequires = [ denote emacs ]; meta = { @@ -600,7 +604,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/devhelp-1.0.tar"; - sha256 = "16zx748n24diqqk3jhgyz74s71kqzl7h7l6j9nkz40cpcn18ddiz"; + sha256 = "14x1990yr3qqzv9dqn7xg69hqgpmgjsi68f2fg07v670lk7hs8xb"; }; packageRequires = [ emacs ]; meta = { @@ -630,7 +634,7 @@ version = "0.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/diff-ansi-0.2.tar"; - sha256 = "1fcy89m6wkhc5hy4lqcd60ckrf9qwimilydjx083nackppdz1xlw"; + sha256 = "0i1216mw0zgy3jdhhxsn5wpjqgxv5als1lljb1ddqjl21y6z74nw"; }; packageRequires = [ emacs ]; meta = { @@ -645,7 +649,7 @@ version = "0.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/doc-show-inline-0.1.tar"; - sha256 = "11khy906vmhz445ryrdb63v0hjq0x59dn152j96vv9jlg5gqdi3b"; + sha256 = "13y7k4zp8x8fcyidw0jy6zf92af660zwb7qpps91l2dh7zwjsl2v"; }; packageRequires = [ emacs ]; meta = { @@ -660,7 +664,7 @@ version = "1.7"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.7.tar"; - sha256 = "1kb768kv48ypw7fm5xcvkw4pq9mfkvv0bg1inlhfifkb4i9kmz3l"; + sha256 = "1rpgjhbb2vzz6fqcqksvx27a1mj8p3bgmjh00433qd8g7hghc9v7"; }; packageRequires = [ emacs ]; meta = { @@ -675,7 +679,7 @@ version = "1.8.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/dracula-theme-1.8.2.tar"; - sha256 = "17szqyl63nn66sxdz403kcd2diif5afvgv6abgqkw6x01bsr11i0"; + sha256 = "04r7cn4n8n4fiwblmfsa23d1qh11mqfz0cghq6ss72flp5awj46g"; }; packageRequires = [ emacs ]; meta = { @@ -690,7 +694,7 @@ version = "0.7.4"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/drupal-mode-0.7.4.tar"; - sha256 = "1cglipmwx5v8vaqkkc7f5ka3dpxlrmmqrqhi885mm625kh2r27j1"; + sha256 = "1wr05pi5sm994cdzj329gr1lwxvq4w9wmc806izxq3fjifx0m609"; }; packageRequires = [ php-mode ]; meta = { @@ -705,7 +709,7 @@ version = "0.9.4"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/eat-0.9.4.tar"; - sha256 = "0683rni1vgq1jmmp1kjvi0fx9m5k7hh5r9b432whwnkp9gcfrb80"; + sha256 = "0jn5rzyg1abjsb18brr1ha4vmhvxpkp8pxvaxfa0g0phcb2iz5ql"; }; packageRequires = [ compat emacs ]; meta = { @@ -720,7 +724,7 @@ version = "0.1.13"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/edit-indirect-0.1.13.tar"; - sha256 = "06x51lajykz6ny8q1762vhjxzvlqm2il47099hbb9wpj4vjx14q6"; + sha256 = "10zshywbp0f00k2d4f5bc44ynvw3f0626vl35lbah1kwmgzrrjdd"; }; packageRequires = [ emacs ]; meta = { @@ -735,7 +739,7 @@ version = "0.10.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/editorconfig-0.10.1.tar"; - sha256 = "0x6qij98rwq2yra7c0qa01rjb10pg23nwnnsb2fb76d5yhk1dcqw"; + sha256 = "1xv2yfs8v2bcf9nvbchdw8lxryfnhy3zh0n6vnxyxnbx2590qa9s"; }; packageRequires = [ emacs nadvice ]; meta = { @@ -750,7 +754,7 @@ version = "2.5.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.5.0.tar"; - sha256 = "0j4rkwmzb3grs7c56m1f6h3mcxvf4cskxf2qw9jw4fc88j5135ym"; + sha256 = "1x6aral441mv9443h21lnaymbpazwii22wcqvk2jfqjmyl1xj1yz"; }; packageRequires = [ emacs ]; meta = { @@ -765,7 +769,7 @@ version = "3.6.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/elpher-3.6.0.tar"; - sha256 = "0pa8y3zc768wdgp43546qvwr6ly2q9gznfrl6qmm90gkv5wrc5ln"; + sha256 = "1xf3kl09inswx4w03fxj35n1ypvlin39z493fw4ksnpf79ccfk4x"; }; packageRequires = [ emacs ]; meta = { @@ -780,7 +784,7 @@ version = "2.2.4"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/engine-mode-2.2.4.tar"; - sha256 = "0azc1l9dbalbsd5mcfg1adbkyyy1n4195grzr96w9d7cs7ds23ya"; + sha256 = "0gp1mnf0yaq4w91pj989dzlxpbpcqqj0yls23wf2ly53kbaarzv9"; }; packageRequires = [ cl-lib ]; meta = { @@ -795,7 +799,7 @@ version = "1.15.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-1.15.0.tar"; - sha256 = "0xp31w5mr6sprimd2rwy7mpa3kca5ivwf57jmaqyzpd96gh66pg1"; + sha256 = "0ciglddlq0z91jyggp86d9g3gwfzjp55xhldqpxpq39a2xkwqh0q"; }; packageRequires = []; meta = { @@ -810,7 +814,7 @@ version = "0.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-anzu-0.2.tar"; - sha256 = "0fv7kan67g24imhbgggrg8r4pjhpmicpq3g8g1wnq8p9zkwxbm7s"; + sha256 = "1vn61aj0bnvkj2l3cd8m8q3n7kn09hdp6d13wc58w9pw8nrg0vq5"; }; packageRequires = [ anzu evil ]; meta = { @@ -825,7 +829,7 @@ version = "1.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-args-1.1.tar"; - sha256 = "0lgwrhjsy098h2lhsiasm39kzkdfqcjnapc2q6f2gyf7zll37761"; + sha256 = "0fv30wny2f4mg8l9jrjgxisz6nbmn84980yszbrcbkqi81dzzlyi"; }; packageRequires = [ evil ]; meta = { @@ -845,7 +849,7 @@ version = "3.16"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-escape-3.16.tar"; - sha256 = "14289axdn3splza66wdyyvfj1hqslmqxfr63zk480cqvrn0dkpvz"; + sha256 = "0vv6k3zaaw4ckk6qjiw1n41815w1g4qgy2hfgsj1vm7xc9i9zjzp"; }; packageRequires = [ cl-lib emacs evil ]; meta = { @@ -864,7 +868,7 @@ version = "0.41"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-exchange-0.41.tar"; - sha256 = "1i07c0zc75mbgb6hzj6py248gxzy0mk3xyaskvwlc371fyyn6v6c"; + sha256 = "1yk7zdxl7c8c2ic37l0rsaynnpcrhdbblk2frl5m8phf54g82d8i"; }; packageRequires = [ cl-lib evil ]; meta = { @@ -879,7 +883,7 @@ version = "0.0.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-goggles-0.0.2.tar"; - sha256 = "0cpxbl2vls52dydaa1x4jkizhnd3vmvs30ivihdl964vmpb1s7yl"; + sha256 = "0nipk8r7l5c50n9zry5264cfilx730l68ssldw3hyj14ybdf6dch"; }; packageRequires = [ emacs evil ]; meta = { @@ -894,7 +898,7 @@ version = "1.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-iedit-state-1.3.tar"; - sha256 = "1dsdlhi58xsdsgkdhpnlkx1gkwc4m5sks99ph8lbj179vd1gszn6"; + sha256 = "1955bci018rpbdvixlw0gxay10g0vgg2xwsfmfyxcblk5glrv5cp"; }; packageRequires = [ evil iedit ]; meta = { @@ -913,7 +917,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-indent-plus-1.0.1.tar"; - sha256 = "0wnn5xjdbc70cxwllz1gf6xf91ijlfhlps7gkb9c3v1kwpsfp3s3"; + sha256 = "1kzlvi8xgfxy26w1m31nyh6vrq787vchkmk4r1xaphk9wn9bw1pq"; }; packageRequires = [ cl-lib evil ]; meta = { @@ -933,7 +937,7 @@ version = "8.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-lisp-state-8.2.tar"; - sha256 = "0hwv39rkwadm3jri84nf9mw48ybd5a0y02yzjp5cayy7alpf6zcn"; + sha256 = "14v1nv797b4rxxxnvzwy6pp10g3mmvifb919iv7nx96sbn919w0p"; }; packageRequires = [ bind-map evil smartparens ]; meta = { @@ -948,7 +952,7 @@ version = "3.0.4"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.4.tar"; - sha256 = "1bc14r8cl0sd4ygj5didhzh74alzafc6rjk9fm4zgylkbcxal8nl"; + sha256 = "1ib2xlz7ciaszw2j5184mf6560jmap93vh515sk8dmkkahdwsjgz"; }; packageRequires = [ emacs ]; meta = { @@ -963,7 +967,7 @@ version = "3.6.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.1.tar"; - sha256 = "0ixyn669fk7gcnl3nhjma67zvnavikn75yzsa4sx850s5i4i1b2a"; + sha256 = "1nzqwqp2gq3wka2x782yqz5d8bw3wglra42907kylkqwqbxryh0w"; }; packageRequires = [ emacs ]; meta = { @@ -978,7 +982,7 @@ version = "0.7"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-numbers-0.7.tar"; - sha256 = "1kd60kc8762i9vyig179dnbmrjyw30bm06g26abndw2kjxaqjhr8"; + sha256 = "1k5vrh8bj9kldqq8kxn1qi3k82i7k4v4h6nkk9hng8p90zhac02i"; }; packageRequires = [ emacs evil ]; meta = { @@ -993,7 +997,7 @@ version = "1.0.4"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-surround-1.0.4.tar"; - sha256 = "1cc6n05j7a3q3n8hzxrhgjwk2a79h0llidh0sqhq5bc9d8ygrl2s"; + sha256 = "1fzhqg2zrfl1yvhf96s5m0b9793cysciqbxiihxzrnnf2rnrlls2"; }; packageRequires = [ evil ]; meta = { @@ -1012,7 +1016,7 @@ version = "0.0.5"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-visual-mark-mode-0.0.5.tar"; - sha256 = "1k7slwf6m1brwy40j7j4j6qw4jna4sh0llbywsimdj63zral3fki"; + sha256 = "0hjg9jmyhhc6a6zzjicwy62m9bh7wlw6hc4cf2g6g416c0ri2d18"; }; packageRequires = [ dash evil ]; meta = { @@ -1027,7 +1031,7 @@ version = "0.2.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/evil-visualstar-0.2.0.tar"; - sha256 = "0vjhwdp2ms7k008mm68vzlkxrq0zyrsf4r10w57w77qg5a96151c"; + sha256 = "03liavxxpawvlgwdsihzz3z08yv227zjjqyll1cbmbk0678kbl7m"; }; packageRequires = [ evil ]; meta = { @@ -1035,20 +1039,16 @@ license = lib.licenses.free; }; }) {}; - exec-path-from-shell = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: + exec-path-from-shell = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "exec-path-from-shell"; ename = "exec-path-from-shell"; - version = "2.1"; + version = "2.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/exec-path-from-shell-2.1.tar"; - sha256 = "0vqjd44fiaqc2ppmb2yk7m75dndndrlrml4lfmar5213vlmds1cl"; + url = "https://elpa.nongnu.org/nongnu/exec-path-from-shell-2.2.tar"; + sha256 = "14nzk04aypqminpqs181nh3di23nnw64z0ir940ajs9bx5pv9s1w"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/exec-path-from-shell.html"; license = lib.licenses.free; @@ -1061,7 +1061,7 @@ version = "0.6.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/flx-0.6.2.tar"; - sha256 = "0xmxin1k758nskrxhmvi4m5vbcfi2ncfp5n9q18mlc1j45vwawpx"; + sha256 = "00d3q238grxcvnx6pshb7ajbz559gfp00pqaq56r2n5xqrvrxfnc"; }; packageRequires = [ cl-lib ]; meta = { @@ -1076,7 +1076,7 @@ version = "0.6.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/flx-ido-0.6.2.tar"; - sha256 = "1jdk87v605m4brvf0pxfd6bz0j2r217cw9pmrpl38nrszbngh67l"; + sha256 = "1933d3dcwynzs5qnv3pl4xdybj5gg0sa8zb58j0ld9hyiacm6zn5"; }; packageRequires = [ cl-lib flx ]; meta = { @@ -1091,7 +1091,7 @@ version = "34.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/flycheck-34.1.tar"; - sha256 = "1yyvlhv45gvjmv1rja16j12gv2afiaf4r852mcw3l97h6f40h4x9"; + sha256 = "1jj1c4gq39ik8fihsz13wp4c26fm2m6kyr7ir22ql0d007zm3173"; }; packageRequires = [ emacs ]; meta = { @@ -1110,7 +1110,7 @@ version = "0.5"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/flymake-guile-0.5.tar"; - sha256 = "1na5jxjwl2jy857ipvgy01m1wlsy0s7ingaxdzsldppjfvgwb7yd"; + sha256 = "0gfblb49l52j7iq3y6fxx1jpr72z61pwxsxfknvfi4y05znxnf0k"; }; packageRequires = [ emacs flymake ]; meta = { @@ -1125,7 +1125,7 @@ version = "0.1.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.3.tar"; - sha256 = "07k8b3wayp1h4hir98zs5srjjsnh6w0h9pzn4vnq9s2jr355509n"; + sha256 = "0y5qnlk3q0fjch12d4vwni7v6rk0h5056s5lzjgns71x36xd1i21"; }; packageRequires = [ emacs ]; meta = { @@ -1146,7 +1146,7 @@ version = "0.5.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.5.1.tar"; - sha256 = "0vk20affwb7qcg7nm6n2ssrrgljisqn45a8jagrf947l2kgaccvd"; + sha256 = "0a9p0mnp1n4znb9xgi5ldjv8x1khhdr5idb8vcd444nd03q0lj6s"; }; packageRequires = [ emacs flymake popon posframe ]; meta = { @@ -1161,7 +1161,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/focus-1.0.1.tar"; - sha256 = "1kiyvbdbjhjfkl5cq6q78lfgbir7iayswwm2qnj4df95nbm8shsz"; + sha256 = "164xlxc5x2i955rfjdhlxp5ch55bh79gr7mzfychkjx0x088hcaa"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1176,7 +1176,7 @@ version = "0.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/forth-mode-0.2.tar"; - sha256 = "0qk6kg8d38fcvbxa4gfsdyllzrrp9712w74sj29b90fppa11b530"; + sha256 = "04xcvjzvl4pgx48l2pzil7s2iqqbf86z57wv76ahp4sd1xigpfqc"; }; packageRequires = []; meta = { @@ -1191,7 +1191,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/free-keys-1.0.tar"; - sha256 = "1w0dslygz098bddap1shwa8pn55ggavz2jn131rmdnbfjy6plglv"; + sha256 = "04x4hmia5rx6bd8pkp5b9g4mn081r14vyk1jbdygdzr5w5rhifx3"; }; packageRequires = [ cl-lib ]; meta = { @@ -1206,7 +1206,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/gc-buffers-1.0.tar"; - sha256 = "15zpg4j25bk7y2wgqsd57c4c6h3xvigf39hjnzh3g1hlrqk2lv0g"; + sha256 = "00204vanfabyf6cgbn64xgqhqz8mlppizsgi31xg6id1qgrj37p3"; }; packageRequires = [ emacs ]; meta = { @@ -1221,7 +1221,7 @@ version = "0.30"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/geiser-0.30.tar"; - sha256 = "0bxrxgz49xqxzbipkpnilz9lxm1wmjzhf6imkz3hq49wfp3zdaw6"; + sha256 = "0h63skslmc23rjlsrqmcnqf2s431ml0wmkbza38j44kzxnsz0x5g"; }; packageRequires = [ emacs project ]; meta = { @@ -1236,7 +1236,7 @@ version = "0.18"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.18.tar"; - sha256 = "01pkcf0lpzmazah3ddd16yf2la4zd5x4mmi5lwpbsyvyfqhxhsca"; + sha256 = "14l2a7njx3bzxj1qpc1m5mx4prm3ixgsiii3k484brbn4vim4j58"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1251,7 +1251,7 @@ version = "0.17"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/geiser-chibi-0.17.tar"; - sha256 = "1mpbkv48y1ij762f61hp1zjg3lx8k5b9bbsm5lfb7xzvmk5k3zf0"; + sha256 = "17kkgs0z2xwbbwn7s49lnha6pmri1h7jnnhh5qvxif5xyvyy8bih"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1266,7 +1266,7 @@ version = "0.17"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/geiser-chicken-0.17.tar"; - sha256 = "13jhh0083fjx4xq0k31vw5v3ffbmn3jkb2608bimm9xlw6acgn4s"; + sha256 = "1l0x0b5gcmc6v2gd2jhrz4zz2630rggq8w7ffzhsf8b8hr4d1ixy"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1281,7 +1281,7 @@ version = "0.18.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.18.1.tar"; - sha256 = "03cv51war65yrg5qswwlx755byn2nlm1qvbzqqminnidz64kfd3v"; + sha256 = "1pqify8vqxzpm202zz9q92hp65yhs624z6qc2hgp9c1zms56jkqs"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1296,7 +1296,7 @@ version = "0.0.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/geiser-gauche-0.0.2.tar"; - sha256 = "0wd0yddasryy36ms5ghf0gs8wf80sgdxci2hd8k0fvnyi7c3wnj5"; + sha256 = "189addy5xvx62j91ihi23i8dh5msm0wlwxyi8n07f4m2garrn14l"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1316,7 +1316,7 @@ version = "0.28.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.1.tar"; - sha256 = "0imh2vdc757vimwxi7pjdv09f83js76nbk7dg861qg0bcqf21g3i"; + sha256 = "148bvwcppv0qk7yh38c0m36hldw58cqhbyniyzwffagmlg0yqzsb"; }; packageRequires = [ emacs geiser transient ]; meta = { @@ -1346,7 +1346,7 @@ version = "0.15"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/geiser-mit-0.15.tar"; - sha256 = "11agp5k79g0w5596x98kbwijvqnb1hwrbqx680mh1svd1l8374q0"; + sha256 = "12wimv5x2k64ww9x147dlx2gfygmgz96hqcdhkbidi1smhfz11gk"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1361,7 +1361,7 @@ version = "0.16"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/geiser-racket-0.16.tar"; - sha256 = "0lf2lbgpl8pvx7yhiydb7j5hk3kdx34zvhva4zqnzya6zf30w257"; + sha256 = "08sn32ams88ism6k24kq7s54vrdblkn15x9lldyqg4zapbllr1ny"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1376,7 +1376,7 @@ version = "1.8"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.8.tar"; - sha256 = "1bz7ggq5pl08pr68nmn82sdpb2vqi7zvsjnai8zvr93dai7p3isa"; + sha256 = "1525n49igcnwr2wsjv4a74yk1gbjvv1l9rmkcpafyxyykvi94j6s"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1412,7 +1412,7 @@ version = "1.4.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.2.tar"; - sha256 = "15lvya85710wyyynmgq7a92lc5mrrv2nfh19nxh92mkdd3r0c3fg"; + sha256 = "0hdy4wpnyrn3a8i9yxk5gvsggnpgpg6r0wip0zmhcl9nxi4h6kb3"; }; packageRequires = [ compat emacs ]; meta = { @@ -1427,7 +1427,7 @@ version = "1.5.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/gnu-apl-mode-1.5.1.tar"; - sha256 = "0almjbh35d0myyjaavmqi7yzk3jpqdcqrhsb2x6vcp6pb199g7z8"; + sha256 = "0hzdmrhrcnq49cklpmbx1sq7d9qd2q6pprgshhhjx45mnn1q24v0"; }; packageRequires = []; meta = { @@ -1442,7 +1442,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/gnu-indent-1.0.tar"; - sha256 = "0h2kj19k3b9sw1bp0fk37kmc4xwvd3ajlgfa8s13jnvggx77nn8a"; + sha256 = "1aj8si93ig1qbdqgq3f4jwnsws63drkfwfzxlq0i3qqfhsni0a15"; }; packageRequires = [ emacs ]; meta = { @@ -1457,7 +1457,7 @@ version = "0.8.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.1.tar"; - sha256 = "015b8ly4wmz03bcysbwy4d63r42sicwqa0j2j4aiis1kpy4lj3xw"; + sha256 = "1y364j5gr8cnkndxd088kaxd2ah0nd7176gfjligm3ngpgg6ndyx"; }; packageRequires = [ emacs ]; meta = { @@ -1472,7 +1472,7 @@ version = "1.6.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/go-mode-1.6.0.tar"; - sha256 = "1j83i56ldkf79l7dyjbv9rvy3ki2xlvgj2y7jnap92hbd2q50jsy"; + sha256 = "0ilvkl7iv47v0xyha07gfyv1a4c50ifw57bp7rx8ai77v30f3a2a"; }; packageRequires = [ emacs ]; meta = { @@ -1487,7 +1487,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/golden-ratio-1.0.1.tar"; - sha256 = "03vjn4b9s4xhcc009mcxc2w6ymnhss3hci7drkkdd2nlv58lcvs0"; + sha256 = "169jl82906k03vifks0zs4sk5gcxax5jii6nysh6y6ns2h656cqx"; }; packageRequires = []; meta = { @@ -1502,7 +1502,7 @@ version = "1.1.9"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/gotham-theme-1.1.9.tar"; - sha256 = "0ikczh9crs02hlvnpdknxfbpqmpiicdbshjhi5pz3v7ynizj64vm"; + sha256 = "195r8idq2ak6wpmgifpgvx52hljb8i7p9wx6ii1kh0baaqk31qq2"; }; packageRequires = [ emacs ]; meta = { @@ -1517,7 +1517,7 @@ version = "1.7.5"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/goto-chg-1.7.5.tar"; - sha256 = "08wdrwmgy5hanir6py6wiq0pq4lbv9jiyz1m3h947kb35kxalmks"; + sha256 = "1j5vk8vc1v865fc8gdy0p5lpp2kkl0yn9f75npiva3ay6mwvnvay"; }; packageRequires = [ emacs ]; meta = { @@ -1532,7 +1532,7 @@ version = "1.0.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/graphql-mode-1.0.0.tar"; - sha256 = "11vn02vwiqbkzl9gxsm3gvybkbac13xnzzv2y227j3y8aq5kbwss"; + sha256 = "0pfyznfndc8g2g3a3pxzcjsh3cah3amhz5124flrja5fqdgdmpjz"; }; packageRequires = [ emacs ]; meta = { @@ -1547,7 +1547,7 @@ version = "0.7"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/gruber-darker-theme-0.7.tar"; - sha256 = "0k2njsg7bwy4i7ll5d9dpqawylgkfvp74bany8g487xvspjscrji"; + sha256 = "1ib9ad120g39fbkj41am6khglv1p6g3a9hk2jj2kl0c6czr1il2r"; }; packageRequires = []; meta = { @@ -1562,7 +1562,7 @@ version = "1.30.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.30.1.tar"; - sha256 = "19r3ffkyq779jjz0jvyxdf2zhm1yd1lax9sh0qsj1r5xrcmb15l7"; + sha256 = "1y30aahdxzdfmj021vbrz4zmdq6lr9k08hna9i1a8g4cywgbz8ri"; }; packageRequires = [ autothemer ]; meta = { @@ -1577,7 +1577,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/guru-mode-1.0.tar"; - sha256 = "18vz80yc7nv6dgyyxmlxslwim7qpb1dx2y5382c2wbdqp0icg41g"; + sha256 = "0kmbllzvp8qzj8ck2azq2wfw66ywc80zicncja62bi6zsh2l622z"; }; packageRequires = []; meta = { @@ -1592,7 +1592,7 @@ version = "3.2.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/haml-mode-3.2.1.tar"; - sha256 = "10pnpx4x5wjk4yq4kgynkhfv4xg8nzwmfwf1bappivrdii47hbiq"; + sha256 = "0hhra7bryk3n649s3byzq6vv5ywd4bqkfppya7bswqkj3bakiyil"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1607,7 +1607,7 @@ version = "17.5"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.5.tar"; - sha256 = "0ld9wjak3fzwi9w2552fzq1562h7g19q69pigp16rj30smp5gkj7"; + sha256 = "1yjy0cvgs5cnq5d9sv24p1p66z83r9rhbgn0nsccc12rn2gm3hyn"; }; packageRequires = [ emacs ]; meta = { @@ -1615,16 +1615,16 @@ license = lib.licenses.free; }; }) {}; - haskell-tng-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, popup }: + haskell-tng-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "haskell-tng-mode"; ename = "haskell-tng-mode"; version = "0.0.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/haskell-tng-mode-0.0.1.tar"; - sha256 = "1dndnxb9bdjnixyl09025065wdrk0h8q721rbwvransq308fijwy"; + sha256 = "0l6rs93322la2fn8wyvxshl6f967ngamw2m1hnm2j6hvmqph5cpj"; }; - packageRequires = [ emacs popup ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/haskell-tng-mode.html"; license = lib.licenses.free; @@ -1634,10 +1634,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "3.9.7"; + version = "3.9.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-3.9.7.tar"; - sha256 = "1xlaxxwv34a8lxijni4yi60g5g7mlpjq4d71p9hdcpqja7xq4igz"; + url = "https://elpa.nongnu.org/nongnu/helm-3.9.8.tar"; + sha256 = "1vcz3vj6drp5v66s3nsrai39rcwp1q3l2qdd1qxw7n58m4fgrkm6"; }; packageRequires = [ helm-core popup wfnames ]; meta = { @@ -1649,10 +1649,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.9.7"; + version = "3.9.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.7.tar"; - sha256 = "125fqnj2g61lsagiwwd8fpnrp2s7mxsdppj8cfp3m6c3984fmsx0"; + url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.8.tar"; + sha256 = "03l5sva3qhfmjdpys1k2pbcja58fsdxljvmffjx70j7wyclb3v03"; }; packageRequires = [ async emacs ]; meta = { @@ -1667,10 +1667,10 @@ elpaBuild { pname = "highlight-parentheses"; ename = "highlight-parentheses"; - version = "2.1.1"; + version = "2.2.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/highlight-parentheses-2.1.1.tar"; - sha256 = "1r0sk4da3apgbik8d84vknwna45k1ks3n0s1fspj5c88b4r7xnsx"; + url = "https://elpa.nongnu.org/nongnu/highlight-parentheses-2.2.2.tar"; + sha256 = "13686dkgpn30di3kkc60l3dhrrjdknqkmvgjnl97mrbikxfma7w2"; }; packageRequires = [ emacs ]; meta = { @@ -1685,7 +1685,7 @@ version = "0.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.2.tar"; - sha256 = "1qrq238arblk8v8nf98kcdckfhwzi27w5zbl31yvf36xz69l9y8n"; + sha256 = "0anv7bvrwylp504l3g42jcbcfmibv9jzs2kbkny46xd9vfb3kyrl"; }; packageRequires = [ emacs ]; meta = { @@ -1700,7 +1700,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/hl-column-1.0.tar"; - sha256 = "00y4g912s341p30xnb0qgj0gmzsqm696v06kjgy9yva5qgw51f03"; + sha256 = "11d7xplpjx0b6ppcjv4giazrla1qcaaf2i6s5g0j5zxb1m60kkfz"; }; packageRequires = [ emacs ]; meta = { @@ -1715,7 +1715,7 @@ version = "1.56"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/htmlize-1.56.tar"; - sha256 = "1xdy6lbqm75qlywbr08sbjfa20mphylswbjihk1iiblyj8gbp0p6"; + sha256 = "0s4k5q8b4grx3zyrryxcqahixkpzcni2qqnmm07axfxpgcqcnk9c"; }; packageRequires = []; meta = { @@ -1739,7 +1739,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.3.tar"; - sha256 = "1q23xrq80wmh4l87rpzfp6gc671gkalvhidfichlapk507sll1y6"; + sha256 = "03r5qx3a0w1ll4ql7nrjgp19cnk7rrf7ibvj8gd57gqqihkdmqqw"; }; packageRequires = [ compat @@ -1762,7 +1762,7 @@ version = "1.1.4"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.4.tar"; - sha256 = "1j7y03b90gf3pl0xbfirm973k31l7nx90is69m3jrfai2f9qnflr"; + sha256 = "0vp45ww8bxacrwzv0jqzs782symxysmpvawd29pa1yci1qp2pvm5"; }; packageRequires = [ emacs ]; meta = { @@ -1782,7 +1782,7 @@ version = "1.1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/idris-mode-1.1.0.tar"; - sha256 = "00xbb63kidkygs2zp334nw38gn5mrbky3ii0g8c9k9si4k1dn5gq"; + sha256 = "1vlm7gshrkwp9lfm5jcp1rnsjxwzqknrjhl3q5ifwmicyvqkqwsv"; }; packageRequires = [ cl-lib emacs prop-menu ]; meta = { @@ -1797,7 +1797,7 @@ version = "0.9.9.9.9"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/iedit-0.9.9.9.9.tar"; - sha256 = "1ic780gd7n2qrpbqr0vy62p7wsrskyvyr571m8m3j25fii8v8cxg"; + sha256 = "12s71yj8ycrls2fl97qs3igk5y06ksbmfq2idz0a2zrdggndg0b6"; }; packageRequires = []; meta = { @@ -1816,7 +1816,7 @@ version = "3.2.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.1.tar"; - sha256 = "0p1q51wn67abwhn6qa01f190czaq33nmy4ir1jrcxsny4vnbxvx4"; + sha256 = "1pvngj87hqr0qzc62cgq294rllxbmn7803pnqqr8ah1qxy65a1wb"; }; packageRequires = [ clojure-mode emacs ]; meta = { @@ -1831,7 +1831,7 @@ version = "2.8.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.8.1.tar"; - sha256 = "0ghf6gaxyslkxfy8cyyglf8ldzyv9jqsyl6nz7iahfk930aiynpj"; + sha256 = "1iisxgrw7lkrcl86mj3s3578qxnx1cn615swsmnch2ilwjqdrdza"; }; packageRequires = [ emacs ]; meta = { @@ -1861,7 +1861,7 @@ version = "1.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/iwindow-1.1.tar"; - sha256 = "1sx0dqm7wwq05qaxqyrsg8v57i5ghzaq2hcdrywjq5x3cl5rmw17"; + sha256 = "04d5dxqazxfx8ap9vmhj643x7lmpa0wmzcm9w9mlvsk2kaz0j19i"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -1876,7 +1876,7 @@ version = "1.1.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/j-mode-1.1.1.tar"; - sha256 = "0l0l71z5i725dnw4l9w2cfjhrijwx9z8mgyf2dfcbly1cl2nvnx2"; + sha256 = "056af7l7rn116nygln41rsq2val5s3y0pz1pj2736mqsx3lcyiy2"; }; packageRequires = []; meta = { @@ -1891,7 +1891,7 @@ version = "1.0.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/jade-mode-1.0.1.tar"; - sha256 = "1kkf5ayqzs1rs7b3jqwb21r2mikds3lillfrs3pkcca7lj76313n"; + sha256 = "0pv0n9vharda92avggd91q8i98yjim9ccnz5m5c5xw12hxcsfj17"; }; packageRequires = []; meta = { @@ -1906,7 +1906,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/jinja2-mode-0.3.tar"; - sha256 = "1zkyac4akwnz8a136xyn6915j6jgpf0xilbf4krw7q6k8nkks2m4"; + sha256 = "0dg1zn7mghclnxsmcl5nq5jqibm18sja23058q9lk6nph4fvz5dq"; }; packageRequires = []; meta = { @@ -1914,16 +1914,16 @@ license = lib.licenses.free; }; }) {}; - julia-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + julia-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "julia-mode"; ename = "julia-mode"; version = "0.4"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/julia-mode-0.4.tar"; - sha256 = "1qi6z6007q2jgcb96iy34m87jsg9ss3jhzlnl2cl8dn26yqmdky4"; + sha256 = "15x63nwq6rh1yxwwd8hf0a8nznws8gzxqiw45n6pv8vp8h2v3fsi"; }; - packageRequires = [ emacs ]; + packageRequires = []; meta = { homepage = "https://elpa.gnu.org/packages/julia-mode.html"; license = lib.licenses.free; @@ -1936,7 +1936,7 @@ version = "1.3.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/keycast-1.3.3.tar"; - sha256 = "0cvya8vbbmzly1hjf5jm3n9phml4wmwy2hn4igxp8f2pg1x46049"; + sha256 = "048j5q4hpr8y89lrcqwbcqjazj52rak8jv8nl6fs4sqjik10zcji"; }; packageRequires = [ compat emacs ]; meta = { @@ -1951,7 +1951,7 @@ version = "2.0.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/kotlin-mode-2.0.0.tar"; - sha256 = "0q1pfjcsk6c17hs5xg7wb6f4i29hn3zxgznjcr3v11dm4xmrj9iv"; + sha256 = "0d247kxbrhkbmgldmalywmx6fqiz35ifvjbv20lyrmnbyhx1zr97"; }; packageRequires = [ emacs ]; meta = { @@ -1966,7 +1966,7 @@ version = "0.4"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/lorem-ipsum-0.4.tar"; - sha256 = "05zk11g0w3bnabxf5937hrkc3k58vlrh1bk61dar9gfbfdq3ijyg"; + sha256 = "0d1c6zalnqhyn88dbbi8wqzvp0ppswhqv656hbj129jwp4iida4x"; }; packageRequires = []; meta = { @@ -1981,7 +1981,7 @@ version = "20221027"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/lua-mode-20221027.tar"; - sha256 = "1irdlw77ny0a28msrbn4lm66ixrlf2grsj4izhpdm1n0yv66xvfc"; + sha256 = "0mg4fjprrcwqfrzxh6wpl92r3ywpj3586444c6yvq1rs56z5wvj5"; }; packageRequires = [ emacs ]; meta = { @@ -1996,7 +1996,7 @@ version = "0.9.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.2.tar"; - sha256 = "1257vz50k69wka756c9sjq86apvw876myl3wml55x5m8q328wbcf"; + sha256 = "0ij216575987fi4l4305h5xnvic21lizybkyq5mx67zvhcq75yfs"; }; packageRequires = [ cl-lib ]; meta = { @@ -2056,7 +2056,7 @@ version = "2.6"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.6.tar"; - sha256 = "1z1rzx1sc8hzvyqgnfdj64syr4pabv9grl57n4jis9arcqmx41zr"; + sha256 = "15s8snzfvzzfk7wfizz5r8aksywq7s9h6xbb2y5dqjkpqg951va2"; }; packageRequires = [ emacs ]; meta = { @@ -2076,7 +2076,7 @@ version = "1.0.12"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.12.tar"; - sha256 = "1raq11350y5cpfzq7c8xmrsnl728fw0796bn1prbrrlly20rqxc2"; + sha256 = "1kmzlz9sb7vkyw84kmpg39zj2hhyrvpb0g6h54ikrxccbn8g22s2"; }; packageRequires = [ emacs persist request ]; meta = { @@ -2091,7 +2091,7 @@ version = "2015"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/material-theme-2015.tar"; - sha256 = "027plf401y3lb5y9hzj8gpy9sm0p1k8hv94pywnagq4kr9hivnb9"; + sha256 = "117ismd3p577cr59b6995byyq90zn4nd81dlf4pm8p0iiziryyji"; }; packageRequires = [ emacs ]; meta = { @@ -2113,7 +2113,7 @@ version = "0.5"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/mentor-0.5.tar"; - sha256 = "1kkzm881fxhc5hb83x0j12lv22b72nzw45qrypbl1jf2siispz9l"; + sha256 = "1sqdwdbanrdvrr8qqn23ylcyc98jcjc7yq1g1d963v8d9wfbailv"; }; packageRequires = [ async emacs seq url-scgi xml-rpc ]; meta = { @@ -2128,7 +2128,7 @@ version = "1.4.5"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/meow-1.4.5.tar"; - sha256 = "0r1rmhmwgxl7q2rvjf8byc0ass00k3m87sn6sw9chip5cgd5g6gm"; + sha256 = "1d63mw88vq97rq3a7qhkxid2xaag5dp21ijisw9s3fk972kcks3s"; }; packageRequires = [ emacs ]; meta = { @@ -2143,7 +2143,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/minibar-0.3.tar"; - sha256 = "1mgkkjaav9hkg1c0lvn887armxv18hn99zd3dy1dx2lnjv2kfdcp"; + sha256 = "0vxjw485bja8h3gmqmvg9541f21ricwcw6ydlhv9174as5cmwx5j"; }; packageRequires = [ emacs ]; meta = { @@ -2158,7 +2158,7 @@ version = "1.0.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/moe-theme-1.0.2.tar"; - sha256 = "1hdbm6hw94yyw5cdgfmc5fgnfc2glf0ba8a9ch2y33nzjawklb8x"; + sha256 = "13c4rj0c9fi4nipzsrmvgb8ddvk3dckijga07yxp71x5ba6mrp2n"; }; packageRequires = []; meta = { @@ -2173,7 +2173,7 @@ version = "3.5.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/monokai-theme-3.5.3.tar"; - sha256 = "15b5ijkb0wrixlw13rj02x7m0r3ldqfs3bb6g48hhbqfapd6rcx0"; + sha256 = "14ylizbhfj2hlc52gi2fs70avz39s46wnr96dbbq4l8vmhxs7il5"; }; packageRequires = []; meta = { @@ -2194,7 +2194,7 @@ version = "0.2.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/mpv-0.2.0.tar"; - sha256 = "14d5376y9b3jxxhzjcscx03ss61yd129dkb0ki9gmp2sk7cns3n5"; + sha256 = "183alhd5fvmlhhfm0wl7b50axs01pgiwv735c43bfzdi2ny4szcm"; }; packageRequires = [ cl-lib emacs json org ]; meta = { @@ -2209,7 +2209,7 @@ version = "1.4.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/multiple-cursors-1.4.0.tar"; - sha256 = "0f7rk8vw42bgdf5yb4qpnrc3bxvbaafmdqd7kiiqnj5m029yr14f"; + sha256 = "0452wrbwg8hyvsri99h71g04dll5w65na265pp9whphq6l06ikrx"; }; packageRequires = []; meta = { @@ -2224,7 +2224,7 @@ version = "1.1.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/nasm-mode-1.1.1.tar"; - sha256 = "1smndl3mbiaaphy173zc405zg4wv0mv041vzy11fr74r5w4p232j"; + sha256 = "19k0gwwx2fz779yli6pcl0a7grhsbhwyisq76lmnnclw0gkf686l"; }; packageRequires = [ emacs ]; meta = { @@ -2236,10 +2236,10 @@ elpaBuild { pname = "nginx-mode"; ename = "nginx-mode"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/nginx-mode-1.1.9.tar"; - sha256 = "04jy0zx058hj37ab2n6wwbbwyycsbsb2fj8s4a5f1is2in35nqy0"; + url = "https://elpa.nongnu.org/nongnu/nginx-mode-1.1.10.tar"; + sha256 = "0c6biqxbwpkrbqi639ifgv8jkfadssyznjkq6hxvqgjh3nnyrlx3"; }; packageRequires = []; meta = { @@ -2259,7 +2259,7 @@ version = "1.5.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/nix-mode-1.5.0.tar"; - sha256 = "0zi7xmh777pqzgcv18jqwywvidpa984p0m705p6a9fns7dvv53j7"; + sha256 = "0hansrsyzx8j31rk45y8zs9hbfjgbv9sf3r37s2a2adz48n9k86g"; }; packageRequires = [ emacs magit-section transient ]; meta = { @@ -2274,7 +2274,7 @@ version = "0.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/oblivion-theme-0.1.tar"; - sha256 = "0095sc82nl5qxz5nlf2bxbynkxa3plcqr8dq187r70p0775jw46m"; + sha256 = "0njm7znh84drqwkp4jjsr8by6q9xd65r8l7xaqahzhk78167q6s4"; }; packageRequires = [ emacs ]; meta = { @@ -2289,7 +2289,7 @@ version = "1.7"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/opam-switch-mode-1.7.tar"; - sha256 = "19mg0k6ish0grhh4d9d9m634jkgbx80bgfwf4xh0q42piypyrmrj"; + sha256 = "1gpc1syb51am2gkb3cgfb28rhh6ik41c1gx9gjf1h8m6zxb75433"; }; packageRequires = [ emacs ]; meta = { @@ -2304,7 +2304,7 @@ version = "0.6.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.6.0.tar"; - sha256 = "07g1cwsr8j1sd8whshi9y2b69qx10g9vd77pmwki9ba4sy0m7b0p"; + sha256 = "1vh3k283h90v3qilyx1n30k4ny5rkry6x9s6778s0sm6f6hwdggd"; }; packageRequires = [ async emacs ]; meta = { @@ -2319,7 +2319,7 @@ version = "0.4.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.2.tar"; - sha256 = "058400h1c6ybkxjyxfkb43zwn90449zfhvbfvw70isf1l28l1rdz"; + sha256 = "1v1g359dqyq8h4y5rjhllc93dq1vysnfk23lqn3smdvdi3ba9zlr"; }; packageRequires = [ emacs org ]; meta = { @@ -2340,7 +2340,7 @@ version = "2.7.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/org-drill-2.7.0.tar"; - sha256 = "0f61cfw7qy8w5835hh0rh33ai5i50dzliymdpkvmvffgkx7mikx5"; + sha256 = "0118vdd0gv2ipgfljkda4388gdly45c5vg0yfn3z4p0p8mjd15lg"; }; packageRequires = [ emacs org persist seq ]; meta = { @@ -2355,7 +2355,7 @@ version = "2.2.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/org-journal-2.2.0.tar"; - sha256 = "1pikz9aqdch11zsya8j3gx44wfl2y5r0kym093pl7w6bjx9bgija"; + sha256 = "12mvi8x8rsm93s55z8ns1an00l2p545swc0gzmx38ff57m7jb1mj"; }; packageRequires = [ emacs org ]; meta = { @@ -2370,7 +2370,7 @@ version = "0.3.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.2.tar"; - sha256 = "12crmbrjxac1ml2x1jh3wbpgh0fddhnl3gdmb5r9dlpkay1c5dxs"; + sha256 = "1r24inqadhlsqc896vlm10bhr76aj6hnm6q5snhzpz4kk9j0gybd"; }; packageRequires = [ emacs ]; meta = { @@ -2385,7 +2385,7 @@ version = "0.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/org-present-0.1.tar"; - sha256 = "1b32faz4nv5s4fv0rxkr70dkjlmpiwzds513wpkwr6fvqmcz4kdy"; + sha256 = "18zrvrd9aih57gj14qmxv9rf5j859vkvxcni3fkdbj84y5pq2fpy"; }; packageRequires = [ org ]; meta = { @@ -2400,7 +2400,7 @@ version = "1.5.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/org-superstar-1.5.1.tar"; - sha256 = "0qwnjd6i3mzkvwdwpm3hn8hp3jwza43x1xq1hfi8d6fa9mwzw9nl"; + sha256 = "1v6v7a0frgxlywfq6g4mdl6sz448k2ql7j4j4f1wrll33mr7gx8g"; }; packageRequires = [ emacs org ]; meta = { @@ -2415,7 +2415,7 @@ version = "2.8.22"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/org-tree-slide-2.8.22.tar"; - sha256 = "19y9lznk69k8s195z4s2h6s6y8vr7lzmr7x9pi5n67a7bapshs02"; + sha256 = "1wqc5d2nxs4s6p2ap6sdalxnyigpxini8ck6jikaarmfqcghnx2m"; }; packageRequires = [ emacs ]; meta = { @@ -2436,7 +2436,7 @@ version = "1.9.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/orgit-1.9.0.tar"; - sha256 = "1lwvmd0mri1vxqp5d8fqam1qhznfjq0bn5i5jjv15nqzcklsw7bm"; + sha256 = "0g0nr284lgmd6jmk0w412gcildl6fzxv9kskgzr7ksk09qk9qfll"; }; packageRequires = [ compat emacs magit org ]; meta = { @@ -2451,7 +2451,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/p4-16-mode-0.3.tar"; - sha256 = "1jl8mcwpzry7lmfm486wjvvx76053pjp68p1abcrjvg4ppsmbj93"; + sha256 = "1kwfqs7ikfjkkpv3m440ak40mjyf493gqygmc4hac8phlf9ns6dv"; }; packageRequires = []; meta = { @@ -2459,22 +2459,16 @@ license = lib.licenses.free; }; }) {}; - package-lint = callPackage ({ cl-lib ? null - , compat - , elpaBuild - , emacs - , fetchurl - , let-alist - , lib }: + package-lint = callPackage ({ elpaBuild, emacs, fetchurl, let-alist, lib }: elpaBuild { pname = "package-lint"; ename = "package-lint"; - version = "0.21"; + version = "0.23"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/package-lint-0.21.tar"; - sha256 = "01yli62vcnh763pf1bp0f649hhrbl8y7ad89q7b98xgcciqgzm93"; + url = "https://elpa.nongnu.org/nongnu/package-lint-0.23.tar"; + sha256 = "116kc7j0g2r8fzyb07b7xb767wzjqnigi504r0rb7cc93b44c4gg"; }; - packageRequires = [ cl-lib compat emacs let-alist ]; + packageRequires = [ emacs let-alist ]; meta = { homepage = "https://elpa.gnu.org/packages/package-lint.html"; license = lib.licenses.free; @@ -2487,7 +2481,7 @@ version = "0.1.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/pacmacs-0.1.1.tar"; - sha256 = "0ni4jmvkdqiiw2xync6raxvq4gr2hc7b65cbil66z7g7vlw5y56y"; + sha256 = "02ahl0608xmmlkb014gqvv6f45l5lrkm3s4l6m5p5r98rwmlj3q9"; }; packageRequires = [ dash emacs ]; meta = { @@ -2502,7 +2496,7 @@ version = "0.15"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/page-break-lines-0.15.tar"; - sha256 = "1i66254x49fwbzqrxmvp3v30aqas129kmy817rxbnqid7m5n1n7z"; + sha256 = "018mn6h6nmkkgv1hsk0k8fjyg38wpg2f0cvqlv9p392sapca59ay"; }; packageRequires = [ emacs ]; meta = { @@ -2517,7 +2511,7 @@ version = "26"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/paredit-26.tar"; - sha256 = "08f8nm3qyk0b4x7mkgra0zjpn9mmfnpr5g7yrvdzvms38y919qlh"; + sha256 = "1sk8nhsysa3y8fvds67cbwwzivzxlyw8d81y7f7pqc5lflidjrpc"; }; packageRequires = []; meta = { @@ -2532,7 +2526,7 @@ version = "1.1.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/parseclj-1.1.1.tar"; - sha256 = "14xczcd7vknsqkfwlk430kd6jz8fi51jwbjpzjqkymnixma32qd6"; + sha256 = "0kkg5fdjbf2dm8jmirm86sjbqnzyhy72iml4qwwnshxjfhz1f0yi"; }; packageRequires = [ emacs ]; meta = { @@ -2547,7 +2541,7 @@ version = "1.2.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/parseedn-1.2.1.tar"; - sha256 = "039mmsmqbvvzqafhjx1grbg2620mjf6jvrj6g6mwxhy2ckll6bfg"; + sha256 = "0q6wkcjxwqf81pvrcjbga91lr4ml6adbhmc7j71f53awrpc980ak"; }; packageRequires = [ emacs map parseclj ]; meta = { @@ -2562,7 +2556,7 @@ version = "0.1.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/pcmpl-args-0.1.3.tar"; - sha256 = "1p9y80k2rb9vlkqbmwdmzw279wlk8yk8ii5kqgkyr1yg224qpaw7"; + sha256 = "1lycckmwhp9l0pcrzx6c11iqwaw94h00334pzagkcfay7lz3hcgd"; }; packageRequires = [ emacs ]; meta = { @@ -2577,7 +2571,7 @@ version = "1.12"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/pcre2el-1.12.tar"; - sha256 = "0w2c9y4qrx8lm14jdjnax6wpwi5sw284brm4k1dwkrx8244krv8x"; + sha256 = "1p0fgqm5342698gadnvziwbvv2kxj953975sp92cx7ddcyv2xr3c"; }; packageRequires = [ emacs ]; meta = { @@ -2597,7 +2591,7 @@ version = "1.1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/pdf-tools-1.1.0.tar"; - sha256 = "0gb8c7y55mmz69agg0rkdjrxg0abznl2mj2x8vw12x4x1ggmykkf"; + sha256 = "0shlpdy07pk9qj5a7d7yivpvgp5bh65psm0g9wkrvyhpkc93aylc"; }; packageRequires = [ emacs let-alist tablist ]; meta = { @@ -2612,7 +2606,7 @@ version = "1.25.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/php-mode-1.25.1.tar"; - sha256 = "0b8svrjzc7lrbmwib1y1nbmn6pw3w289zqbfinjak9kvma2k7njv"; + sha256 = "1cfk7nq5x2p4adcf6q9igsh2jm0sdmsaf5l2sqx4idda28vp3gwc"; }; packageRequires = [ emacs ]; meta = { @@ -2627,7 +2621,7 @@ version = "0.13"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/popon-0.13.tar"; - sha256 = "1ifwkiq8viic4ymph0xrpyrmr946brp2cx48yqf4jrhknafqv5qf"; + sha256 = "0z0m7j30pdfw58cxxkmw5pkfpy8y1ax00wm4820rkqxz1f5sbkdb"; }; packageRequires = [ emacs ]; meta = { @@ -2642,7 +2636,7 @@ version = "0.5.9"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/popup-0.5.9.tar"; - sha256 = "0zyn6q3fwj20y7zdk49jbid2h3yf8l5x8y1kv9mj717kjbxiw063"; + sha256 = "06q31bv6nsdkdgyg6x0zzjnlq007zhqw2ssjmj44izl6h6fkr26m"; }; packageRequires = [ emacs ]; meta = { @@ -2657,7 +2651,7 @@ version = "2.8.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/projectile-2.8.0.tar"; - sha256 = "0j3zd1i6c0vinizg6ini0wqgkczqm48g7m5ihp1njq34c6pgpx7y"; + sha256 = "05llvm3xw3dbjdnfhy2kk6z3pysrsc9f6i7dm4glw5j1k7vig306"; }; packageRequires = [ emacs ]; meta = { @@ -2672,7 +2666,7 @@ version = "4.5"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/proof-general-4.5.tar"; - sha256 = "13zy339yz6ijgkcnqxzcyg909z77w3capb3gim1riy3sqikvv04x"; + sha256 = "0mlmh7z93f7ypjlh6mxrxgcn47ysvi8qg8869qfxjgmskbfdvx2w"; }; packageRequires = [ emacs ]; meta = { @@ -2687,7 +2681,7 @@ version = "0.1.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/prop-menu-0.1.2.tar"; - sha256 = "1csx5aycl478v4hia6lyrdb32hs1haf9n39ngfrbx9ysp7gkj0va"; + sha256 = "1cbps617k2nfi5jcv7y1zip4v64mi17r3rhw9w3n4r5hbl4sjwmw"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2702,10 +2696,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20240319.160226"; + version = "1.0.20240419.71343"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240319.160226.tar"; - sha256 = "1alqiagpkbxqi8nyrn1qzfx23fagpn1ml9hqpyj897jwf5f03zsh"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240419.71343.tar"; + sha256 = "152cm66y4pk5ggr7rbj9pzf2w0c6adkh1dd3cjwmq96mpxydx2na"; }; packageRequires = [ emacs ]; meta = { @@ -2720,7 +2714,7 @@ version = "2.1.5"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/rainbow-delimiters-2.1.5.tar"; - sha256 = "0bb7sqjgpm3041srr44l23p3mcjhvnpxl594ma25pbs11qqipz5w"; + sha256 = "0f4zhz92z5qk3p9ips2d76qi64xv6y8jrxh5nvbq46ivj5c0hnw2"; }; packageRequires = []; meta = { @@ -2735,7 +2729,7 @@ version = "0.2.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/raku-mode-0.2.1.tar"; - sha256 = "01ygn20pbq18rciczbb0mkszr33pifs6i74rajxz03bcgx2j3q6f"; + sha256 = "00iwkp4hwjdiymzbwm41m27avrn3n63hnwd9amyx0nsa0kdhrfyx"; }; packageRequires = [ emacs ]; meta = { @@ -2750,7 +2744,7 @@ version = "0.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/recomplete-0.2.tar"; - sha256 = "09n21mx90wr53xlhy5mlca675ah9ynnnc2afzjjml98ll81f4k23"; + sha256 = "1jhyqgww8wawrxxd2zjb7scpamkbcp98hak9qmbn6ckgzdadks64"; }; packageRequires = [ emacs ]; meta = { @@ -2765,7 +2759,7 @@ version = "0.8"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/reformatter-0.8.tar"; - sha256 = "0yr0h8f53gaxnfz0dvvs9b4jqwp6p0j8xvv01g76j0map0fxkcam"; + sha256 = "0bv0fbw3ach6jgnv67xjzxdzaghqa1rhgkmfsmkkbyz8ncbybj87"; }; packageRequires = [ emacs ]; meta = { @@ -2780,7 +2774,7 @@ version = "0.3.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/request-0.3.3.tar"; - sha256 = "168yy902bcjfdaahsbzhzb4wgqbw1mq1lfwdjh66fpzqs75c5q00"; + sha256 = "02j24v8jdjsvi3v3asydb1zfiarzaxrpsshvgf62nhgk6x08845z"; }; packageRequires = [ emacs ]; meta = { @@ -2795,7 +2789,7 @@ version = "1.4.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.2.tar"; - sha256 = "1b2n52qn7s0zc2xxi45xp9zvlws963l3b45v9q0r1yr8mpbvcb9l"; + sha256 = "0lhs8wa4sr387xyibqqskkqgyhhhy48qp5wbjs8r5p68j1s1q86m"; }; packageRequires = [ emacs ]; meta = { @@ -2810,7 +2804,7 @@ version = "0.6.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/rubocop-0.6.0.tar"; - sha256 = "1gw30ya6xyi359k9fihjx75h7ahs067i9bvkyla0rbhmc5xdz6ww"; + sha256 = "026cna402hg9lsrf88kmb2as667fgaianj2qd3ik9y89ps4xyzxf"; }; packageRequires = [ emacs ]; meta = { @@ -2825,7 +2819,7 @@ version = "1.0.5"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.5.tar"; - sha256 = "16dw4mfgfazslsf8n9fir2xc3v3jpw9i7bbgcfbhgclm0g2w9j83"; + sha256 = "1cilbf4yw4723bn1vh9ww79875fxh0r1j2c7wxjqfjk5xnx4s6q4"; }; packageRequires = [ emacs ]; meta = { @@ -2833,20 +2827,16 @@ license = lib.licenses.free; }; }) {}; - sass-mode = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , haml-mode - , lib }: + sass-mode = callPackage ({ elpaBuild, fetchurl, haml-mode, lib }: elpaBuild { pname = "sass-mode"; ename = "sass-mode"; version = "3.0.16"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/sass-mode-3.0.16.tar"; - sha256 = "1nkp7cvsc2dbxkfv346hwsly34nhv1hhc8lgcs470xzdxi908p61"; + sha256 = "0ag7qi9dq4j23ywbwni7pblp6l1ik95vjhclxm82s1911a8m7pj2"; }; - packageRequires = [ cl-lib haml-mode ]; + packageRequires = [ haml-mode ]; meta = { homepage = "https://elpa.gnu.org/packages/sass-mode.html"; license = lib.licenses.free; @@ -2859,7 +2849,7 @@ version = "93.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/scad-mode-93.3.tar"; - sha256 = "0gh2s0hv8i100xsq656vfxy3586162dv1bz9gcj4aha3kk4ar3vk"; + sha256 = "1d3mv50n3d0qg1sxvp11a4i15vc75j9gpzlqcxnc0l1lqhn64rwh"; }; packageRequires = [ compat emacs ]; meta = { @@ -2874,7 +2864,7 @@ version = "0.23"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/scala-mode-0.23.tar"; - sha256 = "0dmyh5x519f5b9h034a1yjgmr1ai8pd22a032x31zgdkwl2xyrfd"; + sha256 = "1zwd9cajw90v25rwdlylhdrc1xwvnf74c2rckz3cs096xsxc1qx2"; }; packageRequires = []; meta = { @@ -2889,7 +2879,7 @@ version = "0.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/scroll-on-drag-0.1.tar"; - sha256 = "06bpxfhdhsf6awhjcj21x8kb3g9n6j14s43cd03fp5gb0m5bs478"; + sha256 = "0ga8w9px2x9a2ams0lm7ganbixylgpx8g2m3jrwfih0ib3z26kqc"; }; packageRequires = [ emacs ]; meta = { @@ -2904,7 +2894,7 @@ version = "0.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.2.tar"; - sha256 = "09yndis96ps18i252h66ins1hi3zn27410s5hahkj2989q4cqi1s"; + sha256 = "1gg5lpr21v9bjzjy33j8ziyhh5a1sad509c7rjkdlqda2z3xfrhr"; }; packageRequires = [ emacs ]; meta = { @@ -2919,7 +2909,7 @@ version = "0.3.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/sesman-0.3.2.tar"; - sha256 = "1nv0xh6dklpw1jq8b9biv70gzqa7par5jbqacx2lx0xhkyf0c7c1"; + sha256 = "1mrv32cp87dhzpcv55v4zv4nq37lrsprsdhhjb2q0msqab3b0r31"; }; packageRequires = [ emacs ]; meta = { @@ -2934,7 +2924,7 @@ version = "0.1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/shellcop-0.1.0.tar"; - sha256 = "0z0aml86y1m11lz8a8wdjfad5dzynjsqw69qin0a4vv2b8gy8mhr"; + sha256 = "1gj178fm0jj8dbfy0crwcjidih4r6g9dl9lprzpxzgswvma32g0w"; }; packageRequires = [ emacs ]; meta = { @@ -2946,10 +2936,10 @@ elpaBuild { pname = "slime"; ename = "slime"; - version = "2.29.1"; + version = "2.30"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/slime-2.29.1.tar"; - sha256 = "1ad9m0a9rbn0gmpwdvnr1l7km833hqy43wp6q3cwv7azmj2sc1r2"; + url = "https://elpa.nongnu.org/nongnu/slime-2.30.tar"; + sha256 = "0gzgwrx6llj35kga21m3m4vp0g7f7dypim7pdnhy9sxrvl0k8v5f"; }; packageRequires = [ emacs macrostep ]; meta = { @@ -2964,7 +2954,7 @@ version = "1.0.43"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/sly-1.0.43.tar"; - sha256 = "0qgji539qwk7lv9g1k11w0i2nn7n7nk456gwa0bh556mcqz2ndr8"; + sha256 = "1c7kzbpcrij4z09bxfa1rq5w23jw9h8v4s6fa6ihr13x67gsif84"; }; packageRequires = [ emacs ]; meta = { @@ -2979,7 +2969,7 @@ version = "1.11.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/smartparens-1.11.0.tar"; - sha256 = "1179wicy5nrjk2iq73rxkx6c44k9ybs1vz6llw0qbwc5l10diyvr"; + sha256 = "0kvlyx2bhw4q6k79wf5cm4srlmfncsbii4spdgafwmv8j7vw6ya3"; }; packageRequires = []; meta = { @@ -2994,7 +2984,7 @@ version = "2.0.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/solarized-theme-2.0.1.tar"; - sha256 = "1kz34a7133l2dl09mvb8v79k693ypxk01bmqwm8cfa7icqq2ka98"; + sha256 = "1lk1g8v2chjrbbxplw3pd7yn3syjgywxkbdc7dbd76x168qz54qx"; }; packageRequires = [ emacs ]; meta = { @@ -3024,7 +3014,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/spell-fu-0.3.tar"; - sha256 = "0yr7m0i89ymp93p4qx8a0y1ghg7ydg1479xgvsz71n35x4sbiwba"; + sha256 = "11a5361xjap02s0mm2sylhxqqrv64v72d70cg1vzch7iwfi18l9c"; }; packageRequires = [ emacs ]; meta = { @@ -3039,7 +3029,7 @@ version = "0.17"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/sqlite3-0.17.tar"; - sha256 = "04m53vn5cvcycv580q6zn5vw54ml7xmhs7bc88cwqj1z5vi3a85x"; + sha256 = "17fx2bnzajqjzd9jgwvn6pjwshgirign975rrsc1m47cwniz0bnq"; }; packageRequires = [ emacs ]; meta = { @@ -3069,7 +3059,7 @@ version = "1.8.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.2.tar"; - sha256 = "0h2ln37ir6w4q44vznlkw4kzaisfpvkgs02dnb2x9b1wdg5qfqw4"; + sha256 = "0vpaswm5mdyb8cir160mb8ffgzaz7kbq3gvc2zrnh531zb994mqg"; }; packageRequires = []; meta = { @@ -3084,7 +3074,7 @@ version = "1.2.11"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/subed-1.2.11.tar"; - sha256 = "1dlh7vd8kc16wr9sqd3v7kkxfvqadi56pa52h35b86krndh4vazp"; + sha256 = "0grzlxibv57qds3dml6yjpw9hag86hbkrb1f66k7qn5hxaadmvpw"; }; packageRequires = [ emacs ]; meta = { @@ -3096,10 +3086,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.27.4"; + version = "0.27.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.4.tar"; - sha256 = "05hky1103xays0jflyls4zxj3mbmq7ipkdhaasd868gjbky4kryf"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.5.tar"; + sha256 = "0mw8fddzcbn9h5l55v12n4nmickqdxc3y7y0xfzm6m42cvqkzdzf"; }; packageRequires = [ compat emacs ]; meta = { @@ -3114,7 +3104,7 @@ version = "9.1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/swift-mode-9.1.0.tar"; - sha256 = "1zx25g2jdkc78pjhl36gwrc3kj5wxayfl8vgkl3k5gqsa7bjjbjm"; + sha256 = "1h7fbrgp2jsn0nk6c84vzvipm86macxf2975l0av8gxv0kpzcaiv"; }; packageRequires = [ emacs seq ]; meta = { @@ -3137,16 +3127,16 @@ license = lib.licenses.free; }; }) {}; - symbol-overlay = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: + symbol-overlay = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "symbol-overlay"; ename = "symbol-overlay"; version = "4.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/symbol-overlay-4.1.tar"; - sha256 = "07gcg45y712dblidak2kxp7w0h0gf39hwzwbkpna66k4c4xjpig8"; + sha256 = "0l877zm8fbf6qqcg7zx26w32x885axcj01l4y1m98jzryjhszfgn"; }; - packageRequires = [ emacs seq ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/symbol-overlay.html"; license = lib.licenses.free; @@ -3159,7 +3149,7 @@ version = "1.6.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/systemd-1.6.1.tar"; - sha256 = "0h6iwdi3j2ypgcwnyjs8rdlz5f8j25cya6z4v3n2phnkqbncmgx6"; + sha256 = "0b0l70271kalicaix4p1ipr5vrj401cj8zvsi3243q1hp04k1m2g"; }; packageRequires = [ emacs ]; meta = { @@ -3174,7 +3164,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/tablist-1.0.tar"; - sha256 = "1r37vk31ddiahhd11ric00py9ay9flgmsv368j47pl9653g9i6d9"; + sha256 = "0z05va5fq054xysvhnpblxk5x0v6k4ian0hby6vryfxg9828gy57"; }; packageRequires = [ emacs ]; meta = { @@ -3189,7 +3179,7 @@ version = "0.0.7"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/tangotango-theme-0.0.7.tar"; - sha256 = "0xl90c7hzzd2wanz41mb5ikjgrfga28qb893yvdcy0pa6mgdmpmx"; + sha256 = "1w287p8lpmkm80qy1di2xmd71k051qmg89cn7s21kgi4br3hbbph"; }; packageRequires = []; meta = { @@ -3210,7 +3200,7 @@ version = "0.5"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/telephone-line-0.5.tar"; - sha256 = "09glq2ljd10mqx54i3vflk7yjb1abhykzm9kng4wrw5156ssn6zs"; + sha256 = "0pmn1r2g639c8g3rw5q2d5cgdz79d4ipr3r4dzwx2mgff3ri1ylm"; }; packageRequires = [ cl-generic cl-lib emacs seq ]; meta = { @@ -3225,7 +3215,7 @@ version = "0.3"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/testcover-mark-line-0.3.tar"; - sha256 = "18nlkm7p6fmaziqqbb4jmhpypn0b6233qd0c19xp16kjbxpg7ifh"; + sha256 = "1p1dmxqdyk82qbcmggmzn15nz4jm98j5bjivy56vimgncqfbaf4h"; }; packageRequires = [ emacs ]; meta = { @@ -3240,7 +3230,7 @@ version = "1.0.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/textile-mode-1.0.0.tar"; - sha256 = "14ssqiw8x1pvjlw76h12vrk2w5qmhvp11v4h3cddqi96fddr95sq"; + sha256 = "02nc3wijsb626631m09f2ygpmimkbl46x5hi8yk0wl18y66yq972"; }; packageRequires = []; meta = { @@ -3255,7 +3245,7 @@ version = "1.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/toc-org-1.1.tar"; - sha256 = "1wy48z4x756r7k6v9znn3f6bfxh867vy58wal7wmhxxig6sn9bk3"; + sha256 = "0qhkn1a4j1q5gflqlyha2534sms8xsx03i7dizrckhl368yznwan"; }; packageRequires = []; meta = { @@ -3270,7 +3260,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/totp-auth-1.0.tar"; - sha256 = "0j5rr026n57crizrw4q4yi7q6psdw5qzfcby4slkrlz4yg58mpk3"; + sha256 = "0hzj0p1r18q8vkhkbxbfakvmgld9y8n5hzza5zir0cpalv5590r5"; }; packageRequires = [ base32 emacs ]; meta = { @@ -3285,7 +3275,7 @@ version = "1.2.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/treeview-1.2.0.tar"; - sha256 = "1vwkqnjj380w13xxj670da4kyqsxmjcsivaqd8k6w7bs59yrljkr"; + sha256 = "1dmix7hn5yl69r987f0g2m00p866ln8412dm7fj399pmn1kdfsvy"; }; packageRequires = [ emacs ]; meta = { @@ -3300,7 +3290,7 @@ version = "3.0.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/tuareg-3.0.1.tar"; - sha256 = "0y98gwnbrcj3csd9yilk1izgzmp1ds5dh3y1bxgb2fzrjir3i13f"; + sha256 = "04lb71cafg4bqicx3q3rb9jpxbq6hmdrzw88f52sjqxq5c4cqdkj"; }; packageRequires = [ caml emacs ]; meta = { @@ -3315,7 +3305,7 @@ version = "0.4"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/typescript-mode-0.4.tar"; - sha256 = "1102c35w2b66q5acvhsk6yigzhp6n3rl0s28xnvb74ansk4rz35k"; + sha256 = "1fs369h8ysrx1d8qzvz75izmlx4gzl619g7yjp9ck2wjv50wx95q"; }; packageRequires = [ emacs ]; meta = { @@ -3330,7 +3320,7 @@ version = "1.2.9"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/ujelly-theme-1.2.9.tar"; - sha256 = "04h86s0a44cmxizqi4p5h9gl1aiqwrvkh3xmawvn7z836i3hvxn9"; + sha256 = "1yyjsdcwprynwk86phpqfifv6xkmn49yrj6fkh5s57w5sbby4fp0"; }; packageRequires = []; meta = { @@ -3345,7 +3335,7 @@ version = "0.5"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/undo-fu-0.5.tar"; - sha256 = "0akn8gw3wavsfhxa9m426jkjacsw3k8vaxymhqrzy18lpvg5hysw"; + sha256 = "00pgvmks1nvdimsac534qny5vpq8sgcfgybiz3ck3mgfklj4kshj"; }; packageRequires = [ emacs ]; meta = { @@ -3360,7 +3350,7 @@ version = "0.6"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.6.tar"; - sha256 = "0l54zqr481xlldfjllhsq4z6ccyzx0k3h7gm59pz32m7bd7zxggl"; + sha256 = "057izvr86har50z1sfk4s6r88w2ga57afwm2w9p5v14lq31vj7cp"; }; packageRequires = [ emacs ]; meta = { @@ -3375,7 +3365,7 @@ version = "20230504"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/vc-fossil-20230504.tar"; - sha256 = "0s7mxi9qq5axv1prqgfi1d7yyrn0abal8y25d4l7n38qszixjlcd"; + sha256 = "1q78xcfzpvvrlr9b9yh57asrlks2n0nhxhxl8dyfwad6gm0yr948"; }; packageRequires = []; meta = { @@ -3390,7 +3380,7 @@ version = "2.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/vcomplete-2.0.tar"; - sha256 = "0fh5rfvhjmpfdhp4k4b1y57zlsixiabhzca9329id48p8jm4rqyp"; + sha256 = "03f60ncrf994pc4q15m0p2admmy4gpg5c51nbr3xycqp16pq8dz1"; }; packageRequires = [ emacs ]; meta = { @@ -3402,10 +3392,10 @@ elpaBuild { pname = "visual-fill-column"; ename = "visual-fill-column"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.2.tar"; - sha256 = "13z87xyzldllvga8iygb33qaqvrrc2qnc315zalvbmydw174cq1i"; + url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.3.tar"; + sha256 = "0agxixxlv3lnsng8jk7y6x1kzzvx3sw5m3mhl8gr4i1didgxc37n"; }; packageRequires = [ emacs ]; meta = { @@ -3420,7 +3410,7 @@ version = "17.3.19"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.19.tar"; - sha256 = "1z33y7p1dilwpwydb9q14n55q48n80mynm7fjr7ih91wvk8zz5di"; + sha256 = "0gmi0p118kd2xvlbp6y5mz2f0sgdm8qwna76lrmbnsxw4c9g5c6p"; }; packageRequires = [ emacs ]; meta = { @@ -3440,7 +3430,7 @@ version = "3.2.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/webpaste-3.2.2.tar"; - sha256 = "0vviv062v46mlssz8627623g1b2nq4n4x3yiv8c882gvgvfvi2bi"; + sha256 = "04156iwgbc49l3b6s5vzbffw1xrkansvczi6q29d5waxwi6a2nfc"; }; packageRequires = [ cl-lib emacs request ]; meta = { @@ -3452,10 +3442,10 @@ elpaBuild { pname = "wfnames"; ename = "wfnames"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/wfnames-1.1.tar"; - sha256 = "04plvqn4srv1v7d7zx6qb0xm62c1hwkiqpq34w17daw9si2pvpan"; + url = "https://elpa.nongnu.org/nongnu/wfnames-1.2.tar"; + sha256 = "1yy034fx86wn6yv4671fybc4zn5g619zcnnfvryq6zpwibj6fikz"; }; packageRequires = [ emacs ]; meta = { @@ -3470,7 +3460,7 @@ version = "3.0.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/wgrep-3.0.0.tar"; - sha256 = "0vg23ydwkqrmhlll45gf2fjdxj9chx9bl9m0pgwrlkjw0ncxj3qp"; + sha256 = "18j94y6xrjdmy5sk83mh5zaz4vqpi97pcjila387c0d84j1v2wzz"; }; packageRequires = [ emacs ]; meta = { @@ -3485,7 +3475,7 @@ version = "2.0.4"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/why-this-2.0.4.tar"; - sha256 = "0hqvqix9hqaki23vw3xilkcr84ak2vz4lwczr54s87x13idrg4px"; + sha256 = "1swidi6z6rhhy2zvas84vmkj41zaqpdxfssg6x6lvzzq34cgq0ph"; }; packageRequires = [ emacs ]; meta = { @@ -3500,7 +3490,7 @@ version = "3.3.2"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.2.tar"; - sha256 = "1jxkl9y6k81hyswd7yqrigwqsrgi3d0k5iaab1pjqyaixm5hk0d2"; + sha256 = "1yjx1w54qdjpmq5f7l3y19d4bayyk01rgd82c56swsaxsf4j5fpv"; }; packageRequires = [ compat emacs ]; meta = { @@ -3515,7 +3505,7 @@ version = "3.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/with-simulated-input-3.0.tar"; - sha256 = "0ws8z82kb0bh6z4yvw2kz3ib0j7v47c5l5dxlrn3kr1qk99z65l6"; + sha256 = "0a2kqrv3q399n1y21v7m4c9ivm56j28kasb466rq704jccvzblfr"; }; packageRequires = [ emacs ]; meta = { @@ -3535,7 +3525,7 @@ version = "2.3.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/workroom-2.3.1.tar"; - sha256 = "1rwixacz8dwws54dvm9dbrwnjh8xpqp1j594hwd4xfq9z1kfzz4f"; + sha256 = "0k0npmcs3cdkfds0r8p0gm8xa42bzdjiciilh65jka15fqknx486"; }; packageRequires = [ compat emacs project ]; meta = { @@ -3550,7 +3540,7 @@ version = "2.2.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/writegood-mode-2.2.0.tar"; - sha256 = "08b1650v6qsb3x1s5k4n5m2aqx1n26gc4wj822fm9s49k8vcpzl8"; + sha256 = "00phrzbd03gzc5y2ybizyp9smd6ybmmx2j7jf6hg5cmfyjmq8ahw"; }; packageRequires = []; meta = { @@ -3565,7 +3555,7 @@ version = "0.6"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/ws-butler-0.6.tar"; - sha256 = "1mm1c2awq2vs5fz773f1pa6ham29ws1agispxfjvj5nx15a0kqzl"; + sha256 = "1jzlwj2pqan3bj0mipvh8vzvmgynrxf1dqphix7g86ppjv1ivmfy"; }; packageRequires = []; meta = { @@ -3580,10 +3570,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "24.24.20240324101507"; + version = "25.1.20240423172921"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.24.20240324101507.tar"; - sha256 = "1lqrrs5j523q33vvs85j3dlnd56bmnzglfkc8jilv6yq44dmv7v7"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.1.20240423172921.tar"; + sha256 = "00h6bmfl4mpx44j1phvijffzlqm1xs2gfprmpwbghc29p5lbd2pj"; }; packageRequires = [ emacs ]; meta = { @@ -3598,7 +3588,7 @@ version = "1.1"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/xkcd-1.1.tar"; - sha256 = "1yszrba4cvisiy7m16rzpj7plbnafj4c7bdgxvqwxwhsasfmh6ag"; + sha256 = "1qs4jv6h2i8g7s214xr4s6jgykdbac4lfc5hd0gmylkwlvs3pzcp"; }; packageRequires = [ json ]; meta = { @@ -3613,7 +3603,7 @@ version = "1.6.17"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.17.tar"; - sha256 = "0k029lsyz1gpx88pprx5nj2qzkgk6dfc9kvna6a94r6m14brrgyc"; + sha256 = "1r8j87xddv80dx6lxzr2kq6czwk2l22bfxmplnma9fc2bsf1k2wy"; }; packageRequires = [ emacs ]; meta = { @@ -3628,7 +3618,7 @@ version = "0.0.16"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.16.tar"; - sha256 = "19j90sss45gvs76nl1fxi0xahbygy2v639ziwcj93d9vs2p9axs0"; + sha256 = "0bhflv50z379p6ysdq89bdszkxp8zdmlb8plj1bm2nqsgc39hdm7"; }; packageRequires = [ emacs ]; meta = { @@ -3643,7 +3633,7 @@ version = "1.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/yasnippet-snippets-1.0.tar"; - sha256 = "0p2a10wfh1dvmxbjlbj6p241xaldjim2h8vrv9aghvm3ryfixcpb"; + sha256 = "0si61d0niabh18vbgdz6w5zirpxpp7c4mrcn5x1n3r5vnhv3n7m2"; }; packageRequires = [ yasnippet ]; meta = { @@ -3658,7 +3648,7 @@ version = "2.8.0"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/zenburn-theme-2.8.0.tar"; - sha256 = "1jbkh09r6sxb0iv9cdxi6k33kz3hldc6hcvyqljf733rdxykpskv"; + sha256 = "0z733svsjsads655jgmc0b33icmygwaahxa27qi32s1pq84zqb4z"; }; packageRequires = []; meta = { @@ -3666,16 +3656,16 @@ license = lib.licenses.free; }; }) {}; - zig-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + zig-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, reformatter }: elpaBuild { pname = "zig-mode"; ename = "zig-mode"; version = "0.0.8"; src = fetchurl { url = "https://elpa.nongnu.org/nongnu/zig-mode-0.0.8.tar"; - sha256 = "1v9qpc86n9zg765cy93365hj942z0gndkz6grjl2pk31087n3axy"; + sha256 = "1085lxm6k7b91c0q8jmmir59hzaqi8jgspbs89bvia2vq5x9xd87"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs reformatter ]; meta = { homepage = "https://elpa.gnu.org/packages/zig-mode.html"; license = lib.licenses.free; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 659d82c088..b215382811 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -260,7 +260,7 @@ "s" ], "commit": "966bfcfdd3b2e288576ffe363d676ad282902090", - "sha256": "0apcbfaa70kgrpjjsfbr0lg9lcfiijpx5bms4sbzc606vlnxxn0d" + "sha256": "0zmzn8rdn1q0dfql3awivhrxd1nrvqr6mb8gv2ynaldyidgsb487" } }, { @@ -271,11 +271,20 @@ "repo": "afroisalreadyinu/abl-mode", "unstable": { "version": [ - 20210923, - 950 + 20240423, + 1214 ], - "commit": "7f692cf9bb263b26fda51bb56a58f6ac61febe3b", - "sha256": "0al120nvyk0wgnb0isxqshcvg2vki3babsb2sgjkhb7617608akp" + "commit": "e918290b279112c367787ac704398d66759e5298", + "sha256": "0xb3jl03i462k9n87yzik816p94p13w08g1vpq80v9hb40sr9vml" + }, + "stable": { + "version": [ + 0, + 9, + 4 + ], + "commit": "e918290b279112c367787ac704398d66759e5298", + "sha256": "0xb3jl03i462k9n87yzik816p94p13w08g1vpq80v9hb40sr9vml" } }, { @@ -1030,21 +1039,21 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20240222, - 320 + 20240328, + 1036 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", - "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" + "commit": "a69ae4a12e40900619b4e5a1613fd449aef649c3", + "sha256": "1yn5cc6cmj3hwqgmjj44dz847xn5k99kirj36qwc04q7vhl8z8k7" }, "stable": { "version": [ 2, - 6, + 7, 0 ], "deps": [ @@ -1052,8 +1061,8 @@ "auto-complete", "yasnippet" ], - "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", - "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" + "commit": "a69ae4a12e40900619b4e5a1613fd449aef649c3", + "sha256": "1yn5cc6cmj3hwqgmjj44dz847xn5k99kirj36qwc04q7vhl8z8k7" } }, { @@ -1064,8 +1073,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20240325, - 700 + 20240426, + 653 ], "deps": [ "dash", @@ -1075,13 +1084,13 @@ "s", "xcscope" ], - "commit": "f9a6ad0f3715d7f491bbe2ae7e762a02ed12a2e0", - "sha256": "0qhzh2giaqdz6rqvhzgdv85x6ivcxwzhkx0lw5rfx0glvp48svcx" + "commit": "810ea813840b980b4f9b43c954e998032fe23f8a", + "sha256": "02dv077kn41kd5nr8v1g5cwar8q43s005q5x338ahknbgscys718" }, "stable": { "version": [ 2, - 6, + 7, 0 ], "deps": [ @@ -1092,8 +1101,8 @@ "s", "xcscope" ], - "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", - "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" + "commit": "a69ae4a12e40900619b4e5a1613fd449aef649c3", + "sha256": "1yn5cc6cmj3hwqgmjj44dz847xn5k99kirj36qwc04q7vhl8z8k7" } }, { @@ -1601,7 +1610,7 @@ "keyfreq" ], "commit": "5c3c430b21bcf685c412cf5ceb3769f630082e4f", - "sha256": "14p9lmnrpsnx94ycvsqmfxnk5kws0cman4a6fbnikl35ma8zc01x" + "sha256": "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3" } }, { @@ -1712,11 +1721,11 @@ "repo": "brownts/ada-ts-mode", "unstable": { "version": [ - 20240324, - 2139 + 20240426, + 256 ], - "commit": "fe84f62ea68c919bf321ba7b57b059d8d4b2bcd3", - "sha256": "12ckhv25an2f5k8w1fsfad7vqlwfi9mzdg30s48dwz4bdll5d065" + "commit": "a0c001fd768b062089127b09c838ca51b8214360", + "sha256": "1j2hid05fnzd3q5z89xib70n4w530ifpqqlhv0jhg70npwj7pny7" } }, { @@ -1811,11 +1820,11 @@ "repo": "thierryvolpiatto/addressbook-bookmark", "unstable": { "version": [ - 20240304, - 602 + 20240422, + 1801 ], - "commit": "2e76708a3dc73953c1e0f66e26918690b79424d0", - "sha256": "14lvbhaqzg7jhranrpin3xzsxs1w4i6bv2bmkf9pmwyfsw5187lw" + "commit": "a990a6d45a11c0e0dee57410d103fe20a4b00a6e", + "sha256": "1cjxpx15xgf68n9gb8j2w036nbb41g4k50ib31frgc7drlb89aw3" }, "stable": { "version": [ @@ -1886,7 +1895,7 @@ 1033 ], "commit": "04fed0ef795bfe2482998c5b6f87c37c13fe8c50", - "sha256": "0klzdgicxfsfwg66a5lnlsfv4mpli6fikplk3qldpwz21652xsz9" + "sha256": "0kk571d7ww6j8y6krfsr9v5yvssz8gvfjq4xc3vsgvpzl6bdh8rl" }, "stable": { "version": [ @@ -1895,7 +1904,7 @@ 0 ], "commit": "0907961986a582ded514d54a8bfdf691f7bfaf86", - "sha256": "0klzdgicxfsfwg66a5lnlsfv4mpli6fikplk3qldpwz21652xsz9" + "sha256": "10hm8anw78n37pl9rz3dnjphrnsxf3fy00d008gayn70jfjl1433" } }, { @@ -2050,20 +2059,20 @@ "repo": "anticomputer/age.el", "unstable": { "version": [ - 20230115, - 1155 + 20240410, + 433 ], - "commit": "9e82487234c53e0fab2314aeab6479e62c68f0c7", - "sha256": "1x1f224xbwaan4rc1589gipl5a7llr3rxxf85i4y8zz2vfl478dp" + "commit": "890c467ebc27538507c54a03afd2f7260630d7f5", + "sha256": "0777nvrvswv81g0rkclm7r2ai1xfjf380lhg8lidd060dkp71ic1" }, "stable": { "version": [ 0, 1, - 4 + 5 ], - "commit": "0c94618fc10105da751007f90b44075f6e5d61ba", - "sha256": "1dvpa4p1rbpnxh4bcg2zz5y3df40k7r16m9lj4grv926cf1i4hl9" + "commit": "890c467ebc27538507c54a03afd2f7260630d7f5", + "sha256": "0777nvrvswv81g0rkclm7r2ai1xfjf380lhg8lidd060dkp71ic1" } }, { @@ -2433,7 +2442,7 @@ 0 ], "commit": "97c20b1fd9ad3f138e1100e3a837d05108c4c564", - "sha256": "1x4apig2hrvvy6pjciklmz5afpq5l4rmfjahc2wvyzs79abh0icx" + "sha256": "1wsvs756cbwbxlaxij352kman7196m39684m6sqnfb685cfrwzdj" } }, { @@ -2972,11 +2981,11 @@ "repo": "jordonbiondo/ample-theme", "unstable": { "version": [ - 20180207, - 1745 + 20240426, + 1545 ], - "commit": "366698400c555211c2082962a5d74f3dd79a78c8", - "sha256": "1kzb15aqy7n2wxibmnihya7n6ajs34jxp9iin96n758nza92m59c" + "commit": "39ac29cf9a1229bb076964335fbd71cfb52e498b", + "sha256": "1s2k1r3wwvwa3rkfsyg5y9386fl0v4qzlqriwldblpq5glyg40qq" } }, { @@ -3309,7 +3318,7 @@ 806 ], "commit": "6ad8c6be4f44de0c33eab012e507320b732d4800", - "sha256": "0cq960q11lpic6zcw71z2ap80jzrzgcwwy2vwhgc1zwi8k8l9i4q" + "sha256": "1pg0xqzixw3nq68hsy263q7j76fggy6wqgmcl5yd0wfhbzd23qqz" } }, { @@ -3405,11 +3414,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20240320, - 1350 + 20240326, + 1828 ], - "commit": "9d88cc7ffed6f79f81a83a914554e264e35a575c", - "sha256": "116gcg09nrxpbvgv3h1hmgy2y12xl57rgy6ki0ayw6li7zn7df4j" + "commit": "3a27be3aa024d314da84c89cb86af58dbf3a2cb9", + "sha256": "02rv530xhcxlgqlj0cywcg3r2yhgv055fr9d3fa82g6nq364qf03" }, "stable": { "version": [ @@ -3619,7 +3628,7 @@ 0 ], "commit": "785f0bad0c73069e6c41ca543c29675785b614a8", - "sha256": "05q548dyb620kg12mgkmw6jpwbr2y2aqs5p7314y2c37khvw5irg" + "sha256": "1ja0q2z9kqkz3ycclgaw1ib83cjh6kym9lrikni0if3spbb0df3w" } }, { @@ -3824,11 +3833,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20240323, - 216 + 20240413, + 2257 ], - "commit": "3e89e62922d610a3429707710d6636244a3c3f76", - "sha256": "1g711i4xims1mdh59cr0plfif17c9j9crgd7vv777xh19qff5imd" + "commit": "66bf5195b4e922f23a9d573f2823daeb63e7ed5b", + "sha256": "0yqks35q9vv7qymwx96b9smmg7dpb12lacclq63ypfhkwakd2wgg" }, "stable": { "version": [ @@ -3899,11 +3908,11 @@ "repo": "Greybeard-Entertainment/app-monochrome", "unstable": { "version": [ - 20240303, - 1628 + 20240406, + 36 ], - "commit": "84de8c0424cd51feaf758cc636d9864e7311864c", - "sha256": "0m7ka3zwfka5d484j5v6f96jr5n8rs4qbb8vvw5r2nhky9ji4cna" + "commit": "9324ec430a5154853c1da711e1c9738d61f1135a", + "sha256": "09jxb4b4lb19z2dfvpa0rjba89gcsphkx5d45p56rbb1b0i3h5iz" } }, { @@ -4598,11 +4607,11 @@ "repo": "meedstrom/asyncloop", "unstable": { "version": [ - 20240324, - 2057 + 20240407, + 1153 ], - "commit": "22d299cd0ba0c8d407acba6cb22ed8f7be4161a6", - "sha256": "15nil21m02h864vqpmnwpdd2p5zsihx86lrkvqil1zvziwykxx2x" + "commit": "46e38388870b238221a4d96017874309aada7660", + "sha256": "188633b7fxy94xpdafksxxh3hd9cahcrg1f62d6p2j0qvw9a9ly7" }, "stable": { "version": [ @@ -5126,11 +5135,11 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20240321, - 2014 + 20240415, + 1533 ], - "commit": "4ba644f3e3e33afb2b263e9d184b6e2b70d5fadd", - "sha256": "1h0rq69flrjj65wa1x7x0ispm041qr2xrzs5qxciabhav2hs3hqh" + "commit": "01844064e3f2bb9f109a8a064998baf89a864fbc", + "sha256": "1syrwi1rb9w4y4fi8kckvd27i879w35y0sbmlhqpp2li0yx51wwa" }, "stable": { "version": [ @@ -6355,26 +6364,26 @@ "repo": "licht1stein/babashka.el", "unstable": { "version": [ - 20230808, - 2140 + 20240417, + 1347 ], "deps": [ "parseedn" ], - "commit": "1721f68ea8e34e8a6ab2759a04c1a01cedfdd319", - "sha256": "0yjqwshwhcfylajfsks1xvkgqarcnlhwfdy3i587jdw799434vb0" + "commit": "117138c0b7361e70282ee53825e2f4de1a782609", + "sha256": "1k3zy6y682g3sab0by6lp9bbx8w4m9npjpjkxhhxgcqhglhpqcm4" }, "stable": { "version": [ 1, 0, - 6 + 7 ], "deps": [ "parseedn" ], - "commit": "1721f68ea8e34e8a6ab2759a04c1a01cedfdd319", - "sha256": "0yjqwshwhcfylajfsks1xvkgqarcnlhwfdy3i587jdw799434vb0" + "commit": "117138c0b7361e70282ee53825e2f4de1a782609", + "sha256": "1k3zy6y682g3sab0by6lp9bbx8w4m9npjpjkxhhxgcqhglhpqcm4" } }, { @@ -6476,15 +6485,15 @@ "repo": "tarsius/backline", "unstable": { "version": [ - 20240306, - 1822 + 20240415, + 1533 ], "deps": [ "compat", "outline-minor-faces" ], - "commit": "1bbfc53a92fbae5a2b4afa34584a008dc9337c3e", - "sha256": "0hlkj2478s2j49bkmr4fg8za6frchqw8f3f5496gsy4kzdv3n9qk" + "commit": "f070ebb33eb44087e07ff647d8d87d1b27ce40d4", + "sha256": "0d0dh67acqzqsys5rn0lfd8xwg4mhcyk32093s0qwybvsx42x7ng" }, "stable": { "version": [ @@ -6710,11 +6719,11 @@ "repo": "tinted-theming/base16-emacs", "unstable": { "version": [ - 20240218, - 58 + 20240421, + 101 ], - "commit": "c24d84b6c4794d1fc92429b6c70009434a137fe4", - "sha256": "17am6rx8xmkkfx6dlbchym3xaj341z1aaam6zk3nkjxyz8srbm1c" + "commit": "c7ea8116d331fd9ce913267489e7846c34795b38", + "sha256": "07vziyp5nn1rxgx0z467yjahvm90w5f62h5ysggrp924ywwzblp5" }, "stable": { "version": [ @@ -6737,7 +6746,7 @@ 1821 ], "commit": "927257e97a602b6979a75028e8417bf1499582d4", - "sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr" + "sha256": "1jbpf28918pjiqhw8rackv9r8iq9ydd3jw1zwwifznglmpyca7jk" }, "stable": { "version": [ @@ -6745,7 +6754,7 @@ 1 ], "commit": "927257e97a602b6979a75028e8417bf1499582d4", - "sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr" + "sha256": "1jbpf28918pjiqhw8rackv9r8iq9ydd3jw1zwwifznglmpyca7jk" } }, { @@ -6826,7 +6835,7 @@ "flycheck" ], "commit": "5bfd5f91b9f91e46158e0419c6bb5c350e7684a1", - "sha256": "0mb85g7bydd0nv3hjzvqb3d01cs4hg5846ibcznaqhsqk93pgm2h" + "sha256": "0nb6dbk8aclkq7jki52y4lwgbxg61xh1598l08yfv2l1ykhgg0n0" } }, { @@ -7808,14 +7817,14 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20240101, - 2211 + 20240415, + 1533 ], "deps": [ "compat" ], - "commit": "998e39095481ced3844efaa8f8f0c5343641df9e", - "sha256": "0rh8rhmhc373h1zggs9xlfa4yidqq8b3ms45xfi4zax0dk38003j" + "commit": "0ac08d9946f0da7066a6c2242025b42983c0c2e8", + "sha256": "1pp8m5ai7353jzm54laxg3l1c3xfsk32dlrg8wnpz6cgqkd47ajs" }, "stable": { "version": [ @@ -8049,11 +8058,11 @@ "repo": "liuyinz/binky.el", "unstable": { "version": [ - 20240107, - 2156 + 20240428, + 352 ], - "commit": "9c0d99b345dc310a31a187c52d092965a26de70a", - "sha256": "0dagrwmh364yaxbm4sxhscych77j8dksqw5034d27vc0q23nwh5w" + "commit": "d5717053910f1d66f16c22a3d8834b43a507575e", + "sha256": "1z8yv4xvg2rvc9djkcp72r8b8x0bd26sp2zrfd780wcw4rar6ada" }, "stable": { "version": [ @@ -8073,8 +8082,8 @@ "repo": "SqrtMinusOne/biome", "unstable": { "version": [ - 20240311, - 2154 + 20240426, + 1407 ], "deps": [ "compat", @@ -8082,8 +8091,32 @@ "request", "transient" ], - "commit": "d393ddbb70f1f27632c7ec63fe96e0179b708714", - "sha256": "10r85yjiqd656alhi41n7ykyswj51g2sanacnkfsmdaj97rv9zy4" + "commit": "804a0576f5c87c167c61f00d037581688ab806be", + "sha256": "0izip46biwsmyc862jz4k9dlc27ilmcxdw7nb3wjsc98hsd72512" + } + }, + { + "ename": "biomejs-format", + "commit": "ecb7ca09d7ecd60c665ac4b5fceefd1a005274fa", + "sha256": "0zvhv27pglmnjqnnk4sgm02dzcgkz00lya187xpcxl1gkczr6igl", + "fetcher": "github", + "repo": "yadex205/emacs-biomejs-format", + "unstable": { + "version": [ + 20240401, + 458 + ], + "commit": "cbfb8aac8bfab6fd893f1ccb4eb9efa29b1b3214", + "sha256": "04v4qms7yz85hicpxp3a99kv6mx8dnds0f6l0fddvm1l0bmylib8" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "cbfb8aac8bfab6fd893f1ccb4eb9efa29b1b3214", + "sha256": "04v4qms7yz85hicpxp3a99kv6mx8dnds0f6l0fddvm1l0bmylib8" } }, { @@ -8813,11 +8846,11 @@ "repo": "ideasman42/emacs-bookmark-in-project", "unstable": { "version": [ - 20230604, - 757 + 20240421, + 322 ], - "commit": "b3255afd8bddd0e6705fa2556205bf1c1192fc37", - "sha256": "1c5pnvv1mh2xkzxps5x9d12javzxb8rzmix1x9hm12q7y9anl9jp" + "commit": "369161f257921747c3b540eac7bc8eb4aa8186b9", + "sha256": "0346ljcb6b31y4wh5gikb7lpjpn4sqisk7frbdxqcp5yy15i1pmf" } }, { @@ -8908,15 +8941,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20240320, - 2244 + 20240415, + 1553 ], "deps": [ "epkg", "magit" ], - "commit": "96ea859c8da74f415b76ccc8dd63b27ce0b6b267", - "sha256": "0gpjc7cz6hrpnq4va3klgy313s26hhibl7rfpwy4iscmslzhgdw1" + "commit": "dfc5d58b439042a6e323cb342ab7531692d118a0", + "sha256": "02rq0ps327v8xlhs69r0cxicg4kljcza8ha7gks7z728hprwvhdl" }, "stable": { "version": [ @@ -9042,15 +9075,15 @@ 2201 ], "commit": "587b39ea7a1d786df5c04796d51bf2a5a4eda0d7", - "sha256": "14nxqlrza35l955zgc4yi9yaymd9slyyyjmbnbd831v8jlddngm9" + "sha256": "0bvg2vpak2bv3s7wc0zzrqb3pys5s7vi6rs7k7l4fmaj5amaq9vb" } }, { "ename": "bpr", - "commit": "05eed39bae37cc8359d2cc678052cbbcc946e379", - "sha256": "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2", + "commit": "422e51d5467b6a417147e07865392f17dcc6de21", + "sha256": "1jpwx0z5wb20jv1mnl0d8azzpak39swbsjvym7aqvhjiy4zagcfq", "fetcher": "github", - "repo": "ilya-babanov/emacs-bpr", + "repo": "iliabv/emacs-bpr", "unstable": { "version": [ 20180220, @@ -9140,11 +9173,11 @@ "repo": "Michael-Allan/Breccia.Emacs", "unstable": { "version": [ - 20240324, - 900 + 20240425, + 2224 ], - "commit": "1cc2ed75572d0dad693914e33ec5c440f7bff536", - "sha256": "0jfhnib7yziy1qqiyyjd17vcp8rbf5ha21wvcqayknhkrhxc4b97" + "commit": "fd8c536bb24cc58447213f8cada94f96ccf036dc", + "sha256": "0rlgxkv8grsyxl9k8jmlnmaakzzw4jnmm48y29sg50mjaj219gf7" } }, { @@ -9318,6 +9351,21 @@ "sha256": "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y" } }, + { + "ename": "browser-hist", + "commit": "bc155dcf3df95ab12a305d0f2cf67a04bf4bc82a", + "sha256": "0x6582c5sdqy63i0yn9p3d2v0n42l3a4gpr2bbs31vxl7hw4dasl", + "fetcher": "github", + "repo": "agzam/browser-hist.el", + "unstable": { + "version": [ + 20240402, + 2345 + ], + "commit": "0b7e93274173e82c05e5d9c9d3055e4b9017612a", + "sha256": "0jsq1sk4vbs3r7lhz28a550w88qq0mj6y2ra5ry351dnxsypsmsn" + } + }, { "ename": "brutalist-theme", "commit": "ec889956a5685c3a60003ad2bfa04b03b57aa8e8", @@ -9575,11 +9623,11 @@ "repo": "ideasman42/emacs-buffer-name-relative", "unstable": { "version": [ - 20240204, - 1219 + 20240421, + 324 ], - "commit": "b1e878e97df0cd02348e1aed95738c0c3a32f148", - "sha256": "002xrfx0rkq3lwribpxgimxw813nwflvwl7g7ywc5xi9v41jv56j" + "commit": "2e681c7277f599a319d99182284eebe13cd654e3", + "sha256": "1flkps9v7dgggbd7pbz0pgj8p3gwyjlzzpbgv9xbpdmyfqxbb1m3" } }, { @@ -10126,19 +10174,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20240320, - 2109 + 20240328, + 2016 ], - "commit": "be25a149fcec1a33d1dfbdf42b265a9f0a958ef5", - "sha256": "160ijybvs2msilbh2yfm13hm3gxzkr9if9h7qqw62jsnk2nfb7h2" + "commit": "a1a86b027ffe030e1c78a9f43c50cd20a6fed19a", + "sha256": "0s5c7ia7b873dr6rqljkb1z4bf84zb3p3wjvcvpjhdcnf67m5x10" }, "stable": { "version": [ 1, - 34 + 35 ], - "commit": "c0764a764cf088dcb5132c44d5864b22d7723765", - "sha256": "07bsbzqxsb6sbayriymy54bqcy7is7c61fpnm83mg9527w0w4g19" + "commit": "a1a86b027ffe030e1c78a9f43c50cd20a6fed19a", + "sha256": "0s5c7ia7b873dr6rqljkb1z4bf84zb3p3wjvcvpjhdcnf67m5x10" } }, { @@ -10149,26 +10197,26 @@ "url": "https://bitbucket.org/olanilsson/buttercup-junit", "unstable": { "version": [ - 20190802, - 2258 + 20240423, + 2158 ], "deps": [ "buttercup" ], - "commit": "6bc28b6b0f36fb71b0915c9e45963c840c64a8df", - "sha256": "1rayxq1va7jpikfr37p8nq2pv339mhq7zqy082kzwvj5q6qfw88s" + "commit": "877daa33fc3fc23f2a3d633e28650c04534458b5", + "sha256": "058spm1bm3gyzfm3vvpp8m96xsyaj3wh5nynbjv23kbkrdyr7s6v" }, "stable": { "version": [ 1, 1, - 1 + 2 ], "deps": [ "buttercup" ], - "commit": "6bc28b6b0f36fb71b0915c9e45963c840c64a8df", - "sha256": "1rayxq1va7jpikfr37p8nq2pv339mhq7zqy082kzwvj5q6qfw88s" + "commit": "877daa33fc3fc23f2a3d633e28650c04534458b5", + "sha256": "058spm1bm3gyzfm3vvpp8m96xsyaj3wh5nynbjv23kbkrdyr7s6v" } }, { @@ -10656,8 +10704,8 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20231107, - 302 + 20240331, + 409 ], "deps": [ "dash", @@ -10667,8 +10715,8 @@ "s", "transient" ], - "commit": "124c916f203511c64d03fac28d303dfb102a6ead", - "sha256": "0qmqk7a9ci3zwq6sv642898axnq9bw9nrb920s2yza43nj1pc860" + "commit": "b526095e4b1c7866958fe53518eb897a8c87a19b", + "sha256": "0092v35yv63ijqaqwjp368kw295f07p1vc2hlqx4fgarsz6kc71n" }, "stable": { "version": [ @@ -10835,25 +10883,25 @@ "repo": "minad/cape", "unstable": { "version": [ - 20240315, - 542 + 20240411, + 2207 ], "deps": [ "compat" ], - "commit": "a397a0c92de38277b7f835fa999fac400a764908", - "sha256": "1mixvpmb2njxziv8mbg6hrczzlvdzrn9zz01cswjywb8bl35l87h" + "commit": "bf22aa6ce0ffca1a1a77b693dddcd05eddc386f0", + "sha256": "1ah0nwib2k46467j0fhq9kckx7cqnjgwpdb7zk9jw8rbrjlndcpw" }, "stable": { "version": [ 1, - 4 + 5 ], "deps": [ "compat" ], - "commit": "af61a4e670818f100beb6ef582449931b3965b10", - "sha256": "1ml3w9xvcxbcbsi01rdsclsxra5h7jrm9lsrkbj1hin2wl5gr9np" + "commit": "bf22aa6ce0ffca1a1a77b693dddcd05eddc386f0", + "sha256": "1ah0nwib2k46467j0fhq9kckx7cqnjgwpdb7zk9jw8rbrjlndcpw" } }, { @@ -11197,26 +11245,26 @@ }, { "ename": "casual", - "commit": "dcc5db335679fde21244f2c4f102acdc425e6258", - "sha256": "0q7s11ynk6bxzj5lljrc5z3v4jf7n10fi5b1jx7bc3qdg7173z3p", + "commit": "8eeb0f07cd1b2fff661cf6523390e81adfc060ba", + "sha256": "0d33xs732pnc4z29w13amslpx9qqbaxms7apqdwxcsyr8jsvybw0", "fetcher": "github", - "repo": "kickingvegas/casual", + "repo": "kickingvegas/Casual", "unstable": { "version": [ - 20240317, - 2027 + 20240416, + 2237 ], - "commit": "643af803258fd9524582fc1d56472ea44c70100f", - "sha256": "1jw82q82qzr41v7clwjcfvlhvyd02pacikga1sjfiq9bw9dj3alg" + "commit": "a22cf128c3baa3e11f6aaff7dc44ef91cf0fe9ce", + "sha256": "0sx3hqpp8ikp3avzcj4d601zh80rs7qi2azl0vmgc4ymrd7g1af8" }, "stable": { "version": [ 1, - 2, - 1 + 5, + 0 ], - "commit": "643af803258fd9524582fc1d56472ea44c70100f", - "sha256": "1jw82q82qzr41v7clwjcfvlhvyd02pacikga1sjfiq9bw9dj3alg" + "commit": "a22cf128c3baa3e11f6aaff7dc44ef91cf0fe9ce", + "sha256": "0sx3hqpp8ikp3avzcj4d601zh80rs7qi2azl0vmgc4ymrd7g1af8" } }, { @@ -11251,11 +11299,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20231213, - 1318 + 20240326, + 900 ], - "commit": "1e9bdb0c19bf13c27a32b1adeabcace45fcbfd15", - "sha256": "1cv46rqdd159plnqdkl74zwcgmbndq81d02g41a327hdwbpahp6v" + "commit": "3d93abaa33e95f19b4a8b0e1e9bef1e3e68dd994", + "sha256": "1j6nsy9is067288x2riabb7kc3grghb2g7bkvwndn2jyglbbxgi0" }, "stable": { "version": [ @@ -11349,20 +11397,20 @@ "repo": "kickingvegas/cc-isearch-menu", "unstable": { "version": [ - 20240320, - 532 + 20240401, + 48 ], - "commit": "4ffb8c42b84a2b3c1773d285980b46110920928e", - "sha256": "0v1pxs3cfb9n5gmcrhni425wxwian4vwzhzpnq6bvks8h03ch18r" + "commit": "6eecc77a89ea63cab69fc8eb6dd1c32ad582b05b", + "sha256": "057bsx330da9vpn0292gxzn9gary5piqinmrw8hk072iwgk6kdwi" }, "stable": { "version": [ 1, - 3, + 4, 1 ], - "commit": "4ffb8c42b84a2b3c1773d285980b46110920928e", - "sha256": "0v1pxs3cfb9n5gmcrhni425wxwian4vwzhzpnq6bvks8h03ch18r" + "commit": "6eecc77a89ea63cab69fc8eb6dd1c32ad582b05b", + "sha256": "057bsx330da9vpn0292gxzn9gary5piqinmrw8hk072iwgk6kdwi" } }, { @@ -11388,15 +11436,15 @@ "repo": "emacs-lsp/emacs-ccls", "unstable": { "version": [ - 20240124, - 1050 + 20240331, + 2132 ], "deps": [ "dash", "lsp-mode" ], - "commit": "9b4a47e0418de8cc2fc93317e27cbdde75286df1", - "sha256": "0kj0naml21l5y5pyy1z9x1yqj76wm13ck1kkki9vp4g60w0ac0v7" + "commit": "9c91aad768d5c401295c79f341c5296b69b29490", + "sha256": "0m4q3zs6sr12avh9wr800wxr8lps7k0nzbgf4nckmzsavqb6csrh" } }, { @@ -11560,15 +11608,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20230607, - 1501 + 20240411, + 2153 ], "deps": [ "cl-lib", "powerline" ], - "commit": "0bb1aa18d475319df85f192dce3327802866c3c3", - "sha256": "1115a5gp73brpam69wryxzci5rl844r2hxw91n4fa15sma9hz5dx" + "commit": "24d90efc72754cd1197a0c2f14d18e7c90dd2b4f", + "sha256": "03j73jhda6pbw203w21zk7w97fv5isr6fdbip40h9id7f112vhaw" }, "stable": { "version": [ @@ -11693,20 +11741,20 @@ "repo": "jaypmorgan/cern-root-mode", "unstable": { "version": [ - 20220905, - 2016 + 20240411, + 1355 ], - "commit": "a54241681012b00b514fd20ff894e3c4c83b45c7", - "sha256": "0kxwpzkxbwc02d70aykqs2y35rl923iy8h5l8vm8jy60s6ns8qb5" + "commit": "d769530ddfbe57cc3c319b430c8a37c72c8ce52c", + "sha256": "0amrxs05s1wiwjpw7hkrgai3p41rvgnar3myyg52rq8l6p9kych5" }, "stable": { "version": [ 0, 1, - 4 + 5 ], - "commit": "2df8781df1d807bf522eb19ac7b03b4bfaeb89c0", - "sha256": "159q50m8sr4adw7czkq0mq6hq43svkk2psx0wnmmb1aa8ivhwyip" + "commit": "2c9c6ea100d9be31733f2f2c4ea8bcda85600254", + "sha256": "17yk9d14kca8j92pi85w5cvdzw1dvw7w5gh9n7a3z79rgg4i4497" } }, { @@ -11788,16 +11836,16 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20240324, - 904 + 20240421, + 805 ], "deps": [ "f", "s", "yaml-mode" ], - "commit": "9431e2261b74a5e5a4bc3d243b0e3433aec45e74", - "sha256": "0ziwx73zwshazkp63lzyhfsdfdsavmzas4ngsrd4rv4mpj41w68c" + "commit": "3aa78685b9158022f49da43821c0888f377fa213", + "sha256": "0jarry76dzhn9zh41bfzyinibifzcxbzs8vmkdlpd0d97npcdxjh" }, "stable": { "version": [ @@ -11887,11 +11935,11 @@ "repo": "GrammarSoft/cg3", "unstable": { "version": [ - 20230920, - 1245 + 20240419, + 1148 ], - "commit": "14367436c123220a0bb84987db51b6c774ac813a", - "sha256": "0k8v4zxr0ijpzz7g0la18mb6imjlz3957incm01xzbivn5dkzlr5" + "commit": "913974345a9fce9e6ac76934ed535df7e44d47d6", + "sha256": "183agf7njdg1zcrclfpa84izwwy230730anz3cz1rr0r77cqvmgv" }, "stable": { "version": [ @@ -12058,14 +12106,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240306, - 857 + 20240402, + 2216 ], "deps": [ "shell-maker" ], - "commit": "bf2d12ed2ed60c498d95215fa1cf81c2b23191a7", - "sha256": "0jv0zxmfv59h2cljk55syvl7rgpfy6zfydzm9bms2wyj68rv24pr" + "commit": "42cf53ba7d43e0622e8c4c57ef8f635e1248182b", + "sha256": "1lg3ymw6vsxkk8vpkbyia5l3xl2bgsk2xsw5n5nrhax9qs3axh1b" } }, { @@ -12076,15 +12124,15 @@ "repo": "kimim/chatu", "unstable": { "version": [ - 20240308, - 1129 + 20240425, + 1349 ], "deps": [ "org", "plantuml-mode" ], - "commit": "63a42219b28b2011e86ae5e8abb1366b65a25347", - "sha256": "0r0r3899yqy946sa2d3xfi565jh85yh9wcz9wylvrkar4rb70b6b" + "commit": "3175ac95de1a1dc75ff5be1bf3a2e80e0abd5229", + "sha256": "0wf63z7ang91gzqqh0d2a5h41zdvm9xkblkkz0ldp4ppk8wpggkg" } }, { @@ -12716,8 +12764,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20240310, - 1926 + 20240424, + 1919 ], "deps": [ "clojure-mode", @@ -12728,8 +12776,8 @@ "spinner", "transient" ], - "commit": "c4fa1a84a3b3d03ef5f61cc5d33ff4e91b9a1dce", - "sha256": "1mm4i7fjpdhqpjknziccpwm0kndb9c4dkmj52ff69dffm4zqps17" + "commit": "1cd6ab7b7cb4a7e079a273600c4d28307c3aba40", + "sha256": "1hcj1fwp2433j3vfmzyv8sh4icg6rsk70av6prrg4adqwzgvhh7m" }, "stable": { "version": [ @@ -12926,20 +12974,20 @@ "repo": "guidoschmidt/circadian.el", "unstable": { "version": [ - 20231027, - 744 + 20221223, + 1419 ], - "commit": "b3bb94040080ac18aab04b010752d4984feee37b", - "sha256": "062mci931fwaf12cyw0kidavasdkfcd415iiwizdvlb2dmr3qmsk" + "commit": "f20cdbf164be10ef0c55d26eba4d270c7c826f42", + "sha256": "03wh3zb1pwvjn990bvd461397v8fh5y6asy0g5wb7x86sg6za1hg" }, "stable": { "version": [ 0, - 3, - 3 + 4, + 0 ], - "commit": "9959e4b9d2ed9920b668fc229aab1f5fa5bd8584", - "sha256": "1hydxhmcchaprfmp08xr6nlksz6y97jbf4mswj69bgdfjfbf22km" + "commit": "323039363588028c629604fae17b73a3d3c821cc", + "sha256": "108qsmzdbk4jw445chl6zhbd0mb95w3lc30c6jaijn4y7ys3dmls" } }, { @@ -12950,14 +12998,14 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20240227, - 2116 + 20240407, + 1101 ], "deps": [ "cl-lib" ], - "commit": "7044e07ab235ae09498c430558449750ec1e6a9f", - "sha256": "103ljkymlkr50w937mc2yjj0xdq8i2p7xl25xv4r74fignd29m55" + "commit": "9d703f481a2c65f2b17edcc2b05412f9865d24af", + "sha256": "1k8hydd45zqhbfd4lmcdr46wxj9m788wwjmr9ss0vyrqc0w6z6zw" }, "stable": { "version": [ @@ -13028,16 +13076,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20231226, - 1453 + 20240419, + 2232 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "885b86f6733fd70f42c32dd7791d3447f93db990", - "sha256": "1kzwllhcn77z6gsdxl6r1csv9nj64qbgznpy8r8kvnri3fl55w4h" + "commit": "07d2a63c99fe35cbd468f8e6a322de05f1a29469", + "sha256": "0806av5mbxnhgmdam47lz6bswi8fr9xq4hff8had7l7g27adldgy" }, "stable": { "version": [ @@ -13062,16 +13110,16 @@ "repo": "pprevos/citar-denote", "unstable": { "version": [ - 20240228, - 807 + 20240424, + 2023 ], "deps": [ "citar", "dash", "denote" ], - "commit": "43ecacd818f0b569b949d160bd86bff5bbe4b0f7", - "sha256": "143inb9i1xccnzj83qg2rczfizhqwshkhsa0rh3wi99hvxjigkif" + "commit": "6e236e9100d1401cd7c628c5f799badded77967d", + "sha256": "0yqjigf4qj296q15dkq0qpwab9a80fn5rafb192ykh5qg8sbhc2v" }, "stable": { "version": [ @@ -13241,20 +13289,19 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20240203, - 457 + 20240425, + 1635 ], - "commit": "155251127bbb51588445ed8fa49368cff1fff2c2", - "sha256": "1r12haizv0bl69dl0myfng9sivblsq4njz1wc9r0i6nsfknravxr" + "commit": "a78cf13d5c3c1c0275b332da5888cd0973de70fe", + "sha256": "0fjv9s8x533dmy4vnz2k56ydwydjiak8hp4mk9yvcnam5j1vi51v" }, "stable": { "version": [ 0, - 3, - 1 + 4 ], - "commit": "050bb7cafc2a89379406f363f7120ac56177ede7", - "sha256": "168z6yidh2nxkmdlx9cqdzzb7achxdipnbk5pj9787m9bp1sdpkd" + "commit": "ac01a5c5852fa3a170e5f00dafeb633012e25fd8", + "sha256": "0fq1f03v706gj6p2fjz51kvmj1pwc9p64chqap2ajr0a9cxpwln6" } }, { @@ -13364,6 +13411,24 @@ "sha256": "0y97f86qnpcscwj41icb4i6j40qhvpkyhg529hwibpf6f53j7ckl" } }, + { + "ename": "claude-shell", + "commit": "a40f86ecc9a185f065a720318ff69afc10d92535", + "sha256": "0lqw9qra8zdafwnyfm164h2nzh6ys5ndbf75s4dnwjpg5lxv135y", + "fetcher": "github", + "repo": "arminfriedl/claude-shell", + "unstable": { + "version": [ + 20240420, + 1917 + ], + "deps": [ + "shell-maker" + ], + "commit": "2574f5d1fe58c44dc0e16d3a7be36a9e4e0927ca", + "sha256": "1my1n0bsx7xghaxa3qyrsqkdn3nxxym00acncp24b1hsm63k12yx" + } + }, { "ename": "clause", "commit": "668db1dd1695ce8a864a4fc5f5e9daca2770da0f", @@ -13390,14 +13455,14 @@ "repo": "scicloj/clay.el", "unstable": { "version": [ - 20240115, - 2125 + 20240409, + 1321 ], "deps": [ "cider" ], - "commit": "26b65a107cf55e4955401d3dbc63d58479f29773", - "sha256": "0i3zf2q0jf0f18kqg287xmiywf44cgg90ym8y8c67fmvpz5c13sv" + "commit": "5d5512e67e7dd4b7b7ffae070517948cb1ad82e4", + "sha256": "0a1yi14wfalmqi6mpbc1cnipjlcmqdzkk8h9czggyav3m7dh9cmj" } }, { @@ -14193,15 +14258,15 @@ "repo": "magit/closql", "unstable": { "version": [ - 20240216, - 1729 + 20240415, + 1534 ], "deps": [ "compat", "emacsql" ], - "commit": "81f04f60aab27c0d9161746384d4eeb0633202e2", - "sha256": "0a658y097jwk7cn2ra840qspkj7r71jq7yl75vycf93gx5763ywi" + "commit": "2bff36edd28c9a0d0c25b545b3837fa874376cc5", + "sha256": "1951r5p5p6jr9xahjw7sr0s01d6mhcp721b35gxa9d9kw3p52xx6" }, "stable": { "version": [ @@ -14293,25 +14358,25 @@ "repo": "joostkremers/criticmarkup-emacs", "unstable": { "version": [ - 20170203, - 2107 + 20240422, + 725 ], "deps": [ "cl-lib" ], - "commit": "276d49c859822265070ae5dfbb403fd7d8d06436", - "sha256": "0mqbjw9wiaq735v307hd7g0g6i3a4k7h71bi4g9rr2jbgiljmql4" + "commit": "a9381f57f3005a9b26f81085ecb2accf680c6f6b", + "sha256": "0c3hry0rvjrqi67caxqjdmsx2pzd3ybgsyzi6jfnlwzsw5iwyjqi" }, "stable": { "version": [ 1, - 6 + 9 ], "deps": [ "cl-lib" ], - "commit": "276d49c859822265070ae5dfbb403fd7d8d06436", - "sha256": "0mqbjw9wiaq735v307hd7g0g6i3a4k7h71bi4g9rr2jbgiljmql4" + "commit": "5c2decacdd1a48c9e4ed2ce2289622aa5915ea24", + "sha256": "1lblkdp0xim22xc71xxgiwlvqrs500rirqz1in546d10ij445ygq" } }, { @@ -14386,20 +14451,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20240321, - 1332 + 20240412, + 1329 ], - "commit": "25d2850c190ba915a7527a29dda6efe61be901f0", - "sha256": "0q49x6z053gw257lamimm9nr1xpajwwqdfjxzrs596kmysrkjrcz" + "commit": "3bb04b05a527b2443298cb7bc9520f58e56c4e9e", + "sha256": "0cn206miz1z0b92rg95z7qr240awh92vfby62gjh9pv0mazhac3q" }, "stable": { "version": [ 3, 29, - 0 + 2 ], - "commit": "25d2850c190ba915a7527a29dda6efe61be901f0", - "sha256": "0q49x6z053gw257lamimm9nr1xpajwwqdfjxzrs596kmysrkjrcz" + "commit": "d3190d6a730207a56ef2144566468975167a811e", + "sha256": "0yjk4kqrln8smz457dxansfl69zyikr5015xm23xa4g7x1rihkgg" } }, { @@ -14467,11 +14532,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20240320, - 254 + 20240426, + 601 ], - "commit": "323bfd2f66ac0d9cc831cc1ff785c1ed603f5ef2", - "sha256": "0g73an139fvv4nqgky56d211781dj5hfilgmd3zvm97gnw7xv0nd" + "commit": "d81b1d5932fbbed509f4b011eb14d2e0e1e73971", + "sha256": "0whkwxi6720rgv22w2xnb4ji092x4hrh4fabbnlm6dvf85g16mqn" }, "stable": { "version": [ @@ -15011,11 +15076,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20240226, - 1133 + 20240406, + 1456 ], - "commit": "e74bb5bbf714c8ec9649d161a90708f0b9b093d6", - "sha256": "04k6sm533db7av83j08a6kz1q1i8shhxza29fz7aql4rkazyd2kb" + "commit": "42b24a3fa3fbdcb36cd2936a38abe142cda65294", + "sha256": "103l62ma6vgq5p15jn125fz4f42s3aghg3l48vh5ngcb9y6w5ip0" }, "stable": { "version": [ @@ -15840,15 +15905,15 @@ "repo": "emacs-eask/company-eask", "unstable": { "version": [ - 20240101, - 819 + 20240329, + 1742 ], "deps": [ "company", "eask" ], - "commit": "c1dd9411bed01cc79f8b34d900396e53198b918e", - "sha256": "0bm85524kb0dkjprs4y1lnxcpbslwrc2xq3fvajnl0rmy4d8iv5h" + "commit": "3d8973a70f01121cad052b352ec0a3d76d8110d2", + "sha256": "0vl5isff47c4z0za49zhy7qzskysxcbyhlgvkk35nbiyrcdfazdw" }, "stable": { "version": [ @@ -15899,34 +15964,34 @@ }, { "ename": "company-emoji", - "commit": "5733dccdffe97911a30352fbcda2900c33d79810", - "sha256": "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3", - "fetcher": "github", - "repo": "dunn/company-emoji", + "commit": "57d010adb43ea1a6adc89bff9741dab6830f199b", + "sha256": "0lyp65z19h9ccihrnav6k8iq04rhhy4jd96yk09i43i7fp8nfrwm", + "fetcher": "codeberg", + "repo": "egirl/company-emoji", "unstable": { "version": [ - 20230903, - 1854 + 20240331, + 2127 ], "deps": [ "cl-lib", "company" ], - "commit": "9c372be9406fba61d71aa0ed2d41adafae5a866e", - "sha256": "0j35z7hjcg3dkwgd7mdx1yaxcmxkn00h91y9kl8qdci7m4lja460" + "commit": "0b4371d8668712e71236e0f174bdd6d03c04aede", + "sha256": "1afy2f1ymzr518npbhy5296kaqshax5hs2ij7wgl28h0hsa2mnk1" }, "stable": { "version": [ - 2, - 8, + 3, + 0, 0 ], "deps": [ "cl-lib", "company" ], - "commit": "9c372be9406fba61d71aa0ed2d41adafae5a866e", - "sha256": "0j35z7hjcg3dkwgd7mdx1yaxcmxkn00h91y9kl8qdci7m4lja460" + "commit": "0b4371d8668712e71236e0f174bdd6d03c04aede", + "sha256": "1afy2f1ymzr518npbhy5296kaqshax5hs2ij7wgl28h0hsa2mnk1" } }, { @@ -16404,7 +16469,7 @@ "seq" ], "commit": "b2bcf2e6997a5ab3502baba9143af44ac2cc2eb3", - "sha256": "1gjdmdg496lkgm7xkgvfl4b4xir91kzn7sizyrgwdj845i9lfjmp" + "sha256": "0mfs261nzi5svxliy2yaxwhzgfb8my5f4580jizll1vkxi33c358" }, "stable": { "version": [ @@ -16418,7 +16483,7 @@ "seq" ], "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", - "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" + "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" } }, { @@ -16572,21 +16637,21 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20240222, - 320 + 20240328, + 1036 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", - "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" + "commit": "a69ae4a12e40900619b4e5a1613fd449aef649c3", + "sha256": "1yn5cc6cmj3hwqgmjj44dz847xn5k99kirj36qwc04q7vhl8z8k7" }, "stable": { "version": [ 2, - 6, + 7, 0 ], "deps": [ @@ -16594,8 +16659,8 @@ "cl-lib", "company" ], - "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", - "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" + "commit": "a69ae4a12e40900619b4e5a1613fd449aef649c3", + "sha256": "1yn5cc6cmj3hwqgmjj44dz847xn5k99kirj36qwc04q7vhl8z8k7" } }, { @@ -16606,15 +16671,15 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20221023, - 608 + 20240407, + 1015 ], "deps": [ "company", "phpactor" ], - "commit": "c652439afd052910d322a8fb9249e09d278a3f37", - "sha256": "06wl6g2nv4k6x912wjbnph2f5c5b1qbn1hjaylqzqj5rjd857cm3" + "commit": "e488ed4c46489861c15d83a43e70eb7c352adc09", + "sha256": "0k1fvwq4kn25yvvmkrag7wp7qjz13d63q9s9l9k4d5n9zw08khw3" }, "stable": { "version": [ @@ -16648,7 +16713,7 @@ "s" ], "commit": "0e6941e1832faafb2176238339667edd482acd95", - "sha256": "0xw475spfwq32nn5qz3gk22cggj1f5y245da9030vzi2jfb9vvid" + "sha256": "1ri022shrwiw10gdydm66c2xya1qxl449r5f8qadals7m4crczp2" }, "stable": { "version": [ @@ -16663,7 +16728,7 @@ "s" ], "commit": "0e6941e1832faafb2176238339667edd482acd95", - "sha256": "0xw475spfwq32nn5qz3gk22cggj1f5y245da9030vzi2jfb9vvid" + "sha256": "1ri022shrwiw10gdydm66c2xya1qxl449r5f8qadals7m4crczp2" } }, { @@ -17407,11 +17472,11 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20240315, - 2126 + 20240421, + 1100 ], - "commit": "7124939e77da2bf3847aeeba2ba0387e47e11ce7", - "sha256": "1b1dygxgd1snm6faf61vpa6kdq67ag5xc805bn8ksbvljn0d4x0i" + "commit": "fab41595a704260a295544aecbecb16896824e88", + "sha256": "14zswpaymzsrc1xcd4xamnydy4hi7fk0inryh6gyqwkgzkzkshf2" }, "stable": { "version": [ @@ -17430,14 +17495,14 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20231226, - 2123 + 20240421, + 1100 ], "deps": [ "all-the-icons-completion" ], - "commit": "3d5b72478fc5fe0c0fd7431daec516a8ccf3ec76", - "sha256": "1hmby8a5sy3d2xvwh5mz65iykbnb2fci6dnwp8rangn8zh517yff" + "commit": "fab41595a704260a295544aecbecb16896824e88", + "sha256": "14zswpaymzsrc1xcd4xamnydy4hi7fk0inryh6gyqwkgzkzkshf2" }, "stable": { "version": [ @@ -17490,26 +17555,30 @@ "repo": "mkcms/compiler-explorer.el", "unstable": { "version": [ - 20230922, - 753 + 20240425, + 2138 ], "deps": [ - "request" + "eldoc", + "map", + "request", + "seq" ], - "commit": "73a353c229aea84e6f24412b82f6f842fe01c55f", - "sha256": "08p55xyavvkjj816djxghwyzz0bwny6agcakg2brhic058dny909" + "commit": "fcf17db156877e35be589dbc82dd6d5736038961", + "sha256": "1bqcxr33jrd5jk2z77asn64sscb034pki2vs9c57vlqas4dwyb8r" }, "stable": { "version": [ 0, - 2, + 4, 0 ], "deps": [ + "eldoc", "request" ], - "commit": "36a2cbf0863d4563096546c38ff26db3d7a3e18c", - "sha256": "0529mwqp5p0lca010dxvjs1ka9fjbywpl0yii71wqc6rbc1kblvi" + "commit": "4980ed8f91a94b7a1cace9d199f1a0b35bed3a07", + "sha256": "1d181wm69r00j3wrvcb7i44v9c85ahk7b3hcqb91wlky25lsbjrz" } }, { @@ -17809,25 +17878,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20240323, - 2016 + 20240420, + 929 ], "deps": [ "compat" ], - "commit": "ec232fa60497e7a3abcf6e385181afcc0cf6017f", - "sha256": "0z33j3jg4kspyqcm95yrvdw9y90a8ikjz8n5ycfyrjydpa838c3r" + "commit": "8989c7a5c5035f9e3429f85f1006d0c6cb5d5e8d", + "sha256": "0zrxs4134csg7ygrlq800mpa7xs3z6z547l28jv3c5v2s2ls1k97" }, "stable": { "version": [ 1, - 4 + 5 ], "deps": [ "compat" ], - "commit": "0eab65fe3273c97a422c99ee426eef7f2d2dffa4", - "sha256": "0kp1xrivs111d8ksjyf3m1ldzb8qknwrh2k2lzbrq6yiwc4bigy7" + "commit": "d8888bb67f881a3c4855c9ce7224de18a7dc3901", + "sha256": "0wgc30vinc62vppakwyxzfqpxqm0nl3srz4d42xs873i5bsczkab" } }, { @@ -18398,26 +18467,26 @@ "repo": "titus.pinta/consult-tex", "unstable": { "version": [ - 20240307, - 1019 + 20240417, + 1149 ], "deps": [ "consult" ], - "commit": "29ab438792cb0a258dc7158526919ffcf0b5f134", - "sha256": "0pi200gphywgqyn9acn5a4hda9dq4gkdqhzb6m9z0xwxwj7jsd3p" + "commit": "675755e106f9e64e2c1fd3cf05a43275c09497da", + "sha256": "18kz99lmfqr7hm3n3xkp51hi6fibyj2ry6abpl897rl4ky9rabr9" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ "consult" ], - "commit": "29ab438792cb0a258dc7158526919ffcf0b5f134", - "sha256": "0pi200gphywgqyn9acn5a4hda9dq4gkdqhzb6m9z0xwxwj7jsd3p" + "commit": "675755e106f9e64e2c1fd3cf05a43275c09497da", + "sha256": "18kz99lmfqr7hm3n3xkp51hi6fibyj2ry6abpl897rl4ky9rabr9" } }, { @@ -18755,25 +18824,25 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20240122, - 2327 + 20240413, + 927 ], "deps": [ "compat" ], - "commit": "b48d3017a47706198e04440cc1b3483bdf646771", - "sha256": "0l6hpsw2srmad0mhp6x46d5dsg678lvgz5l3glp1845hkg8a0pgi" + "commit": "b779552341354d59365a981fd208ae07b7a2950a", + "sha256": "0yhdp1bf96m0llfc8v19swnrd4zl2dn5gxyppvjyidjvic3n0djv" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "compat" ], - "commit": "b48d3017a47706198e04440cc1b3483bdf646771", - "sha256": "0l6hpsw2srmad0mhp6x46d5dsg678lvgz5l3glp1845hkg8a0pgi" + "commit": "6088f0550dc8f10f5bcf6f24d35ce24159b01b43", + "sha256": "1nrwh00dy2ffzd3np8yk4n0vn0r5iqqhgcr40wbnv5qzgbdw9kas" } }, { @@ -18913,15 +18982,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240229, - 1509 + 20240413, + 1905 ], "deps": [ "ivy", "swiper" ], - "commit": "14c696aa2d6cd905795ba543374457a04a13ccae", - "sha256": "1j2x1jqyhkldkm1fcm6ycad92dc3jkxbr44hqw3kiq6ghbz746da" + "commit": "28ac6c7e32ec0b90803fd35f8d1f04ed0fe2e6a5", + "sha256": "1zyxm69ld137k9qnjmn87a2qh9qls1phycfcr3h5p3a0d0ackgd6" }, "stable": { "version": [ @@ -18964,14 +19033,14 @@ "repo": "ideasman42/emacs-counsel-at-point", "unstable": { "version": [ - 20230808, - 1344 + 20240422, + 116 ], "deps": [ "counsel" ], - "commit": "08f45559597ffbff2e9ecda35bacaaa4dae26fc2", - "sha256": "1dhq1c4m3zz2wl6wkvdc0acv9b5j1iasm2kjb3s66ci7sqlif06g" + "commit": "5aa7a483c5188d71c04c3302cfd900e7be91ffd6", + "sha256": "147v6nz5vhai38wxmfzsziwn50110viq575j33k0cm2iimv4gkpb" } }, { @@ -20034,11 +20103,11 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20240229, - 957 + 20240401, + 1136 ], - "commit": "7980df10e47eef41d4d1c57cfb690ec406381ed3", - "sha256": "00n4k09x3slchs81xw1q0rcb78ncb5k2lvsigb9j7s3kxbj6bvvy" + "commit": "6ed75a69f542fb7feab6b8f182caf0924b3fb510", + "sha256": "09lybi0bld14bdfvbji5cxrwrwflcvfnkdk618yybv1zphxmj2nx" }, "stable": { "version": [ @@ -20844,14 +20913,14 @@ "repo": "ideasman42/emacs-cycle-at-point", "unstable": { "version": [ - 20230805, - 925 + 20240422, + 300 ], "deps": [ "recomplete" ], - "commit": "cbbd8721af0cbc84ba737d42bdf702d9a80fa3fb", - "sha256": "14iqia8802wjkvs9rx7jmchzzf4i63r31aanyzyzx8r7dv9nd6x1" + "commit": "317dd682924f1ddcb61cbcd0008072abe3c5264b", + "sha256": "1m29a15ilhf33as76pmpm28qnymsj28syv5qgjqrih9ncd5khwjr" } }, { @@ -21222,8 +21291,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20240113, - 926 + 20240424, + 1359 ], "deps": [ "bui", @@ -21236,26 +21305,27 @@ "posframe", "s" ], - "commit": "03bcfe90b6acb6811bfa877882ba72949503234d", - "sha256": "0yahj7i1h1j824d2ginzvdik4llckjvnhlxfj24dgsh6rl7qnr7g" + "commit": "22af181d627577968f03213ba59d02458d3e734a", + "sha256": "1q360xhnmfnjgrkmzq69p2wc0rphz7fsbjzgn3hjw0a8kv3jsq0y" }, "stable": { "version": [ 0, - 7 + 8 ], "deps": [ "bui", "dash", "f", "ht", + "lsp-docker", "lsp-mode", "lsp-treemacs", "posframe", "s" ], - "commit": "3c4bb901bbcd4f8f58178075dc2422550a7f2834", - "sha256": "1zczmcv8562lachkvcwy6njn7zkgny08iznpmrx821wr8mh52wnn" + "commit": "71c2e5a3734debe265c0de11531bf1d1351f7483", + "sha256": "177ira42l1p7zjb24c0vp4biip9sczlvbgzfahp4mhgfd9h8a6bx" } }, { @@ -21293,7 +21363,7 @@ 0 ], "commit": "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976", - "sha256": "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1" + "sha256": "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky" } }, { @@ -21493,11 +21563,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20240103, - 1301 + 20240405, + 946 ], - "commit": "e32a70ca636bad42232b6c79f1491dc86802a721", - "sha256": "0jkwjkm64ciz60b4bhm50f4c6vc51wi2a12kdd1ijvdnxscnlxx7" + "commit": "885332bbc4582b08d4f24526250876f3a7569067", + "sha256": "1v700mlwwas57kqnp1hqv0ln0cqv44nlcp7lv9c4rha7q5gzmikz" }, "stable": { "version": [ @@ -21596,11 +21666,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20240322, - 340 + 20240407, + 12 ], - "commit": "05b4b1a7bc5ec5d0fca5ee6cd6a2099107c47b15", - "sha256": "0hscfmm0rz6rz3npb0kgdwv836s9xlp0j61nahjqgwq9lqkmjl0a" + "commit": "89b42bff4d60fb00ef3d679e2d2289541e5009f6", + "sha256": "1cl9p8a9dxjbl8kn7fqkx1abr90frk4g7n09lqriyf8hn5bizy5c" }, "stable": { "version": [ @@ -21773,26 +21843,26 @@ "repo": "doublep/datetime", "unstable": { "version": [ - 20231025, - 1805 + 20240418, + 1601 ], "deps": [ "extmap" ], - "commit": "0ec8ecf25e857638ead944eeb3e7d68c6f16f2de", - "sha256": "1n10qyhhyxh4g5pizrj2hlffqd0zx5ym8wsbvwk3z3s6949rjniy" + "commit": "38f0e180ae36257d77ce9612dfca8404f39ddcfc", + "sha256": "114x0ldzczafil5f33g8m1clibakmy2kwmmwbs49ryn35hh60fg7" }, "stable": { "version": [ 0, - 9, + 10, 1 ], "deps": [ "extmap" ], - "commit": "9d512244d32870c113785278d8db3c51206c98af", - "sha256": "0d918312gpdiyx7zq8kdy19bdww6jqg94hs4j5l0n63bwrxsqdx2" + "commit": "41d0221ee2fc7b9f9c57cf930f0011edf977a2a8", + "sha256": "13fvpp9aashmlv9pc12fvf540f9s36wrcfskcx2hcm6r3kv91d54" } }, { @@ -21915,7 +21985,7 @@ "ht" ], "commit": "5123477396a562fae350a89fbed79464cc498bc9", - "sha256": "1bkiwg1wp3l904159gycdr83xkb3i0h2k0da7akzkwc957abvp8w" + "sha256": "0xd94cpqpv0yw70ajrvs69ygds62m40fk0m4s59zvdn5qs7ivj4k" } }, { @@ -21991,16 +22061,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20231130, - 1628 + 20240408, + 1537 ], "deps": [ "dash", "s", "spinner" ], - "commit": "38abe362997d2f18633a75d04c09da751bf8085e", - "sha256": "14brz73fz9zfd95libxajxwc3b4vvljj76fp3xdskxi34z4bs1f3" + "commit": "eafc642c551e6d5df7eb1fee9aa7596e59811178", + "sha256": "029szbwssvdxrsrzv0ppgik30hl9apr0dp5hcp666zgpm415frc4" }, "stable": { "version": [ @@ -22024,11 +22094,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20231207, - 2347 + 20240404, + 541 ], - "commit": "67dbe593b650b7748e8cbe93fdb8f0cf883563ad", - "sha256": "130k9fv057dlb5gkhr6ws0k8fdf6jnd5gxaxq0p2h9h6p9l6djzm" + "commit": "7bbbf575f0ce11cb4b6acd89e56000ae388b1413", + "sha256": "1s2jqqmmnwcf8bx6vn1754ji5kgdwzcm5hi5j0s4rj1yl9s9jnd4" }, "stable": { "version": [ @@ -22222,11 +22292,11 @@ "repo": "ideasman42/emacs-default-font-presets", "unstable": { "version": [ - 20230708, - 1012 + 20240421, + 637 ], - "commit": "21b0ab8e5363ad5b83df1458cca2380a8ebe318d", - "sha256": "1alfcx6dbbmshrm24yr17knr2gv0ais0f9qwkm02ja9rzcjkgrkl" + "commit": "0087cbcbf78f107c0f908e4930f886a2d920eb90", + "sha256": "0vwj4b8ycb0im93k8nkbfwqi63wp0mywn5bigxhnd15d1339l04m" } }, { @@ -22416,11 +22486,11 @@ "repo": "jrblevin/deft", "unstable": { "version": [ - 20240309, - 2117 + 20240407, + 149 ], - "commit": "bb1a16b87c3e0fe70fade6227e47dd7712b89bf6", - "sha256": "0mmhqk7bh34l1zb4hskd914qs28vi688jvhlcdrgdl62s3184m8l" + "commit": "7f352747a2c4dfe40ba060ab42f47ae8a9ddab41", + "sha256": "048kzgqxild8ywclp659wyvpjiqi16kpbc91zh1r459gzmawcll3" }, "stable": { "version": [ @@ -22570,15 +22640,15 @@ "repo": "pprevos/denote-explore", "unstable": { "version": [ - 20240317, - 919 + 20240426, + 450 ], "deps": [ "dash", "denote" ], - "commit": "53dcead5eea35ec0545aa85e8f0c8384b6f4eb57", - "sha256": "1wdsfyc2qzvhaj3dyfxg045sr9naqrg3yip4fwj71rfzzkpva3j0" + "commit": "9e1a5162dbec751fe62ce4b99bcb0e5024f39f94", + "sha256": "06yhh543piflgx8ql70wmsz56g8a7nja66n7s48rwq7d7pxb6znq" } }, { @@ -22799,11 +22869,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20240323, - 823 + 20240428, + 711 ], - "commit": "01ce2c06e997cb821be6123395fb6d224bf958ab", - "sha256": "14rp8f182bfip3p00khinp9rnr7nr2l86r6ppqyd37idk1mf158w" + "commit": "c14d1306648d3ae09ee3a3b3f45592334943cfeb", + "sha256": "0d9v5596k2cwb7zcc29v4gli1yydw3jcqcsz8d2dc18wl5dfks9z" } }, { @@ -22814,11 +22884,11 @@ "repo": "blahgeek/emacs-devdocs-browser", "unstable": { "version": [ - 20231231, - 1455 + 20240414, + 1251 ], - "commit": "afc460e687bec4eb947ab85d207778fc3b9b3bbc", - "sha256": "1qghhswalj7x09hmcxhf9i27apyni2j8jy2pq6aj0499ib3fq89q" + "commit": "d4ebae6b12ba13393270278a75b053d53af3ac54", + "sha256": "08rrhi7d29h8mzvi7wd4ikj5k7g1kscys709l8aaiq1mxf0nhxj8" } }, { @@ -23028,7 +23098,7 @@ 0 ], "commit": "6d0c4203eb192d73d89261b3a9bad52951e394af", - "sha256": "0a89bp9vz8lzg5klhmzpfmc0mhqmx667ivr86ckkjhiwr2mmzq0s" + "sha256": "1rdmhsrlqn19a140i3099fp7f9wnlglp760rnrjp5p840wzfm74q" } }, { @@ -23039,11 +23109,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20231221, - 57 + 20240421, + 810 ], - "commit": "cdae72a4713704692aa4edf3433d6b6df1d84746", - "sha256": "1fkdc0ilvpgp2p5c654123r7rvjkg8v2a5q182npjw6rry1x652f" + "commit": "9e5b61a82e04ffd0e81f88fcf159575618886d72", + "sha256": "1jwgw5ypl9iw6hy1yk4y34l8n5mxaw3zhk4bly7wxpyq4di0n9ik" } }, { @@ -23054,11 +23124,11 @@ "repo": "ideasman42/emacs-diff-at-point", "unstable": { "version": [ - 20230320, - 2355 + 20240421, + 858 ], - "commit": "0a4815a364b636eadf2f9ca6f468fb5996ff8d6f", - "sha256": "0f6wf405x9s9vr1ddwz00sp5y52hpjjk7c1rbqm2h94nvgwcwbmr" + "commit": "bdd507b940e57a110e0e7d31834987924abc05b2", + "sha256": "0iilqa0638h2dawq95wxmmrn738c0h6swv84k8z7nbywgi5jdi81" } }, { @@ -23069,14 +23139,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20240225, - 116 + 20240401, + 2357 ], "deps": [ "cl-lib" ], - "commit": "96620839430c1205cbb8c92dd54973397f70f9d2", - "sha256": "09i735cd8pyfdk5llk47liywc0l3irh4ipwqky9vpp3mh3xg1f4x" + "commit": "09a0f8fcc7e6ce3f49dca64cdfab898d6762f2a4", + "sha256": "1kszgnp6nrsx8sphk5lnnkvymb5p17djvgpc3433dwjic6rz97ml" }, "stable": { "version": [ @@ -23192,15 +23262,15 @@ "repo": "pkryger/difftastic.el", "unstable": { "version": [ - 20240308, - 1548 + 20240423, + 1553 ], "deps": [ "compat", "magit" ], - "commit": "763e5f25925a8a625a943953a5f13d21b9a3bc51", - "sha256": "0v9w6iswshr8mj1g5bp9i13ck0wd1jcy4czancgwhc8hn2k5dnnl" + "commit": "56ec9ba861b132a96220837d711f6e79c26c268d", + "sha256": "1qdiph2wkx7anrpfilxpk9cdzjx6ig0pwzswh9prppdk3flyw5qb" } }, { @@ -23367,14 +23437,14 @@ "repo": "tarsius/dim-autoload", "unstable": { "version": [ - 20240101, - 2213 + 20240415, + 1534 ], "deps": [ "compat" ], - "commit": "ace955cd85b3775a028cfda71f2665f33d85bf5d", - "sha256": "06wpvr763rsjfgi403n83jsbj7z2jfl1r0l7bb0rdfambhnn9wdh" + "commit": "54bd356cdac7bdae2bdff994b048f847374cec6c", + "sha256": "0hjs9nxw6hy7kvaw389n1k1rwqq22pvc3q5cbndnybpkbfpmrhjq" }, "stable": { "version": [ @@ -23450,11 +23520,11 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20240101, - 934 + 20240327, + 210 ], - "commit": "e26c299e1f538573d3badae701947005b4a01df7", - "sha256": "0y0japf94dw6qwgxlxnjv5vwi472f8gc3lvwfm1h4h0d40dhkd1s" + "commit": "c577a8ed289d1a2cf56845fb6b8c7b9c638d4bc8", + "sha256": "11858nlkvpwyzkn7za8c45amv185pklg3x9z0s4a25zkxjrswi7m" }, "stable": { "version": [ @@ -23665,16 +23735,16 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20240322, - 2135 + 20240328, + 1154 ], "deps": [ "dash", "dired-hacks-utils", "f" ], - "commit": "c3bf65aeacfc5ae04508ebcff7b0c9fb37ca4beb", - "sha256": "0slv5v4d5iqx02ilcrp30i6jhismvw5n123m7p0fbmqpb7pv2070" + "commit": "e596b0bac3de8e7730dfb43ca10b0331b6f94469", + "sha256": "0sny6wqvckwp7h9dwsdvn55irnw94axqfa7jcbbwyxqs9ird8pg2" } }, { @@ -23685,11 +23755,11 @@ "repo": "hjudt/dired-duplicates", "unstable": { "version": [ - 20231114, - 2150 + 20240328, + 2016 ], - "commit": "e07552323b26ce68956f8b03aa66af145bae4d86", - "sha256": "1psa217zsl91qkvlrkysw7ycv9rc6vk8462rf6lfjmvb9bf5hpqm" + "commit": "5c5f24bea92159987f65f01ef32b261e905997bd", + "sha256": "0cfbllnr8l67g61d6mbb0c8hq3c0jn2qx3k1i91dk0ns5s6208v7" } }, { @@ -23914,19 +23984,19 @@ "repo": "Anoncheg1/dired-hist", "unstable": { "version": [ - 20240324, - 509 + 20240405, + 2347 ], - "commit": "1755b7bbb81e83563feac8e395e0d9fd85217ad6", - "sha256": "1h60m4w0dyhacymx2m9yrci742wk28wkb36pmq5sxvpck8jbd110" + "commit": "bcbfa60e2de0d86a38740d72bea7e4f25ccc35c8", + "sha256": "06vjlijvicgszpfb09gpwhb2cczajn5hjp9a5vzf5yn9h76rhjkk" }, "stable": { "version": [ 0, - 13 + 14 ], - "commit": "1178b678c249cafd9b320d8305798c30ff367939", - "sha256": "1xpw3h6iwy3wd34hafpzhq37bmphi0qrmcwsa9p6y7s64q3fpb1i" + "commit": "bcbfa60e2de0d86a38740d72bea7e4f25ccc35c8", + "sha256": "06vjlijvicgszpfb09gpwhb2cczajn5hjp9a5vzf5yn9h76rhjkk" } }, { @@ -23949,7 +24019,7 @@ 5 ], "commit": "dbace8d2250f84487d31b39050fcdc260fcde804", - "sha256": "0r9qmr2l5kjwh1frp0k87nyaf13f7f9fjjf9yf9z92djqapfm9dd" + "sha256": "1d9105ibaw858gqp19rx2m6xm3hl57vzsmdqir883cy46qpvwhki" } }, { @@ -24007,11 +24077,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20240317, - 2344 + 20240417, + 1903 ], - "commit": "0a7dbe002306cbeeedcf5b9fbbc72adc83f0d331", - "sha256": "06p19kwh6xr5krs4j54qx342ncnlhiszkml13b51k0h2kqvchlkm" + "commit": "933aa6b921010c9d33ddf18f48c8ce780443f963", + "sha256": "0al5pglxj12l13j849m4khgyq43nzrnsahn5n7d9a3pkrqhjwqkq" } }, { @@ -24084,15 +24154,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20230512, - 1107 + 20240330, + 1831 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f", - "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf" + "commit": "a01c126c3b1068655509487c76971895f5459d09", + "sha256": "128wy7i7qrs7yzw82hzsr7lxiifdgbvmxb1w18kspd82ijlj4j5q" } }, { @@ -24133,14 +24203,14 @@ "repo": "xuhdev/dired-quick-sort", "unstable": { "version": [ - 20201221, - 403 + 20240411, + 229 ], "deps": [ "hydra" ], - "commit": "69b06f306a5fc2b38e707bae3ff1e35db2b39b6b", - "sha256": "01zdha3p7wsf98yayvwgpd4arcs7yhz62yk1nyq9n13hvmqg7dvk" + "commit": "d50b910baa716dfcf4830f1c08226c92bcaee7f6", + "sha256": "143rgmf4bn4mcfx3g4pa5qcd6ij4zqrn86qnhm0bffmd2x6pljsb" }, "stable": { "version": [ @@ -24151,7 +24221,7 @@ "hydra" ], "commit": "79e422be55c72bfe36d2ec8a838f19d1cc8d101a", - "sha256": "01zdha3p7wsf98yayvwgpd4arcs7yhz62yk1nyq9n13hvmqg7dvk" + "sha256": "14hb3d76y4n8qvfl74v9hzgl6774bqdcmsa0npv3gs144fbx9prk" } }, { @@ -24434,15 +24504,15 @@ "repo": "ShuguangSun/dired-view-data", "unstable": { "version": [ - 20220129, - 339 + 20240328, + 328 ], "deps": [ "ess", "ess-view-data" ], - "commit": "96d4cb6569fd2be90a516dedd98263374bbc6ead", - "sha256": "1i1prpzp10irshv42lwv08lzwvm0r9amapbbki07qhmqd5q0av06" + "commit": "2dadb995c3f32c572f5483adab21bdff3ac64186", + "sha256": "0yvg0i2cc6y1nk4mzmn9imnhh3y9yzvb5c3z80jnm76mz4xmnm4h" }, "stable": { "version": [ @@ -24465,25 +24535,25 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20240314, - 753 + 20240421, + 428 ], "deps": [ "key-assist" ], - "commit": "b638face71558cc1444c352fe6bab2d9b28bf281", - "sha256": "0askrlywbkj1x92l8hqdwb6xbcyj16gymmcima8spvjxjdbhm3y2" + "commit": "dadcb326be31fd03c1891473b1bcd1983b155c28", + "sha256": "01fnv2j3hsal4waapkf6s1s57sda1hvx7jsrpfk2js1a21dmmwa4" }, "stable": { "version": [ 1, - 2 + 4 ], "deps": [ "key-assist" ], - "commit": "a56e26a288f977a46c567c3cfb8c2d2461727c08", - "sha256": "1qs3j2mnnd8qnphxdd2ljgc0i05hlycqwp5wwv7pk0px07pxdvfm" + "commit": "0ff2424aa226228c72e47a635f3b5379c424c891", + "sha256": "01pxm6n7pcp11zbqrhv8hcr44wb1s08zw1gwpfqd3grdkmyqql8j" } }, { @@ -25353,11 +25423,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20230808, - 1344 + 20240421, + 943 ], - "commit": "dc914d79b99fc76694d356ea786eb39aab74649a", - "sha256": "028z0qlnbysi3zyfh7mwgy23dzgfpl1anh8pni8zmwy7ld78idgb" + "commit": "d2bfa37f2f027c5da0abca319882daa3740ca57b", + "sha256": "0j70sg2gnf2qi367pskwbm24qvy8bl2qims04rjaw7knd9yiyh43" } }, { @@ -25673,11 +25743,11 @@ "repo": "ag91/doctest", "unstable": { "version": [ - 20240321, - 2345 + 20240421, + 1517 ], - "commit": "a1fc9f2fcb45ea980ca25c524d54a7b0bd40e3c9", - "sha256": "0im29nv6gz3gpkh9c3m03pkmj034rxsarw0qw0b1gfpl5c91nsxx" + "commit": "0620ab6283a4e4302761ac415354b0b2b889dcda", + "sha256": "1g759f1ypw00vqbbcxa8yxf51bdmlrfdxybgjf4fmzzhvfbcpc4d" } }, { @@ -25688,14 +25758,14 @@ "repo": "alphapapa/dogears.el", "unstable": { "version": [ - 20231016, - 2356 + 20240412, + 850 ], "deps": [ "map" ], - "commit": "1136f28ceaed522351369fb97cc098763293a7a6", - "sha256": "0sp513bigq0ckkq9hb8fd4znmv8k99awryaa72zddwibi2adb42f" + "commit": "162671e66cac601f1cfd5d22f7da2671af2e9866", + "sha256": "1n0yhs4vcl9h10slqck1zd5h2p34lim3xrra9zcj1pa6qp5a2i56" }, "stable": { "version": [ @@ -25806,16 +25876,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20240324, - 1457 + 20240425, + 609 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "2e420e64ffadc7489e281ea69e572cd0e415fbcb", - "sha256": "00jgs4d2si2c6m7bghzlczl8vj48snyr7z68igh0lgq5afg0s81y" + "commit": "150b5bf8da8050e5db1193f827c33b16a5d8dd3f", + "sha256": "13zfwww73x5ax7vql7fhgyzwwx0xhkh1fs9b6x746nbyl3p5vnnl" }, "stable": { "version": [ @@ -25859,14 +25929,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20240320, - 121 + 20240404, + 2042 ], "deps": [ "cl-lib" ], - "commit": "37d2182f5078d29fb22bbace346e523bb84b2c4e", - "sha256": "0zhncai46b3rv205v8cmdvlg746gy2q4c6mq3vn3p5a3mqv7jn1r" + "commit": "3b2422b208d28e8734b300cd3cc6a7f4af5eba55", + "sha256": "1ksv964vlzszbd2372kl80l60mmmiqxgyxypysrylrw831kkxfi9" }, "stable": { "version": [ @@ -26086,11 +26156,11 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20240303, - 1522 + 20240421, + 628 ], - "commit": "69b294694c57d8e7571fada6a6651c40d266285e", - "sha256": "05zyjc0wcx70b1fzxhh8pwnhvmza03afqxvvbmip7hcxnyf2wajy" + "commit": "acfc3bd42271286d22d7cbadd48a5b9d5675f85c", + "sha256": "1mhh6kmlkbzaliyx8fwdnbmkhaaing4jkjc9ai76l5nyisjimqrc" }, "stable": { "version": [ @@ -26560,20 +26630,20 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20230402, - 1815 + 20240427, + 1346 ], - "commit": "e53368337be3c353fd654bdbead322605fc875c5", - "sha256": "1x3z9wr1zfncd39ya3bqlfbq54hsv6a1kik8x1snsr6qbsy1an79" + "commit": "5554158af27ead066fbb3c009e780c930958613c", + "sha256": "1wilcgji9nw2lwvb4zkhikb0wkpyzj3070czhvvlclxx5ispxh9g" }, "stable": { "version": [ 3, - 14, + 15, 2 ], - "commit": "b19f6df8954995899e30275055d9582b6c83687c", - "sha256": "17h91vvqdmwkl7l4b7z6mzxsq9g2czzi9h3d68csz3h0jhwwn130" + "commit": "c28817c416ac0b381f6a6938236419ab5d86d6e1", + "sha256": "0rgrfpw588mgw78p87xlrlidc9xhkppf6b7dqa3vqlhjxs5q6kqg" } }, { @@ -26706,11 +26776,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20240324, - 1906 + 20240414, + 1607 ], - "commit": "5049375dcba5b58c35b558c9a5975c3424855ee6", - "sha256": "01m3w9cv4ckj78x111rfxcj44by3kngvlisz9gzsabi3hz2rn42d" + "commit": "3dc879fa4c473d1f7c0929ebb0cebcbe729553cc", + "sha256": "0axj93kfimhn7kywpnv7394gaw9rz402lixmwqyka85f1rcw3dzc" } }, { @@ -27174,11 +27244,11 @@ "repo": "emacs-eask/eask", "unstable": { "version": [ - 20240323, - 2214 + 20240420, + 44 ], - "commit": "9a98b6c21c289dec110b434899fd050778eedab9", - "sha256": "070fc2p3wcb63x3364k815yxm1f7ks5vdjdaw5p7grzn9664crn5" + "commit": "ecee5a60b9e13796400e9dec84ce55f89767b6fa", + "sha256": "09g53ijbxlk48i1s7fj7iyhh4j230xpv673lia19k3364pzy361g" }, "stable": { "version": [ @@ -27225,8 +27295,8 @@ "repo": "emacs-eask/easky", "unstable": { "version": [ - 20240316, - 327 + 20240420, + 113 ], "deps": [ "ansi", @@ -27235,8 +27305,8 @@ "lv", "marquee-header" ], - "commit": "85fcdf4db86f8d6773ce7d309cf752c9f972e564", - "sha256": "0pczdrjlf0w7f3zdcd45cgirk6hbzm14hx0gjip7l0ypwgfmhixv" + "commit": "bde4a0af084f356b993b5fd5b727c05c54e1d132", + "sha256": "17cg70n50h1jpi2j705wpy4g3xgca8hqhraqinbk1lac9z2s3sil" }, "stable": { "version": [ @@ -27505,28 +27575,28 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20240305, - 752 + 20240426, + 642 ], "deps": [ "compat", "parsebib" ], - "commit": "3d7b09606a04cd4c8236e290e709b56872148bc8", - "sha256": "1ga8zzzqs6vrjzm6jily37jyzpq4vsgh49vxy8a68399bdl90s77" + "commit": "4055e30872e642f746633bab96c3383836d61e68", + "sha256": "072dbc7wm9mwcbfw0a9957izamk2amcqag53p4n32r3cdn9v94zk" }, "stable": { "version": [ 2, - 40, - 5 + 41, + 1 ], "deps": [ "compat", "parsebib" ], - "commit": "3d7b09606a04cd4c8236e290e709b56872148bc8", - "sha256": "1ga8zzzqs6vrjzm6jily37jyzpq4vsgh49vxy8a68399bdl90s77" + "commit": "3458aa7777e0acf883b17008da78788c62d9a337", + "sha256": "1ylq4l044rals7xbf8rcx97gz84kypksl2fs5xwin2rc6rvpli8d" } }, { @@ -28587,6 +28657,30 @@ "sha256": "144q4fj3am165vf1vx2ljlsmpn8vvvs1b95qi3rxlwqskkx0lig3" } }, + { + "ename": "eglot-luau", + "commit": "8d881d261d9cff964116ec91aacfd6878a6d2778", + "sha256": "046jfj4p4ff7vhs9zhaz6lva0xq4lzz8861z2zdi1dacpva5vdql", + "fetcher": "github", + "repo": "kennethloeffler/eglot-luau", + "unstable": { + "version": [ + 20240401, + 2209 + ], + "commit": "3926860036402cce4a55faec534b88c0bf6006fd", + "sha256": "03zva7sykc1ja5kz8x21z5r10d49iwa67i4wafi8vnymmw3rfcai" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "commit": "3926860036402cce4a55faec534b88c0bf6006fd", + "sha256": "03zva7sykc1ja5kz8x21z5r10d49iwa67i4wafi8vnymmw3rfcai" + } + }, { "ename": "eglot-signature-eldoc-talkative", "commit": "1639318f0f1730ab5b0e575256d93882d2fd063f", @@ -28595,30 +28689,30 @@ "repo": "mekeor/emacs-eglot-signature-eldoc-talkative", "unstable": { "version": [ - 20240209, - 2034 + 20240424, + 801 ], "deps": [ "eglot", "eldoc", "jsonrpc" ], - "commit": "b6604648a2ea5d260fa315ffbaebebbf3872343a", - "sha256": "1fs868ddrb0fbgrk4wqk9jc1fyg3jcr6mfzrp65ypi5vdcx9y0kl" + "commit": "859aa6f2c0acf060a8e7549b79daf46c8d63ea8d", + "sha256": "1s44kz9b2b61f5gy922rvzv1kpmx62chvdsnb1g785skdhfdzb6v" }, "stable": { "version": [ 0, 0, - 6 + 7 ], "deps": [ "eglot", "eldoc", "jsonrpc" ], - "commit": "b6604648a2ea5d260fa315ffbaebebbf3872343a", - "sha256": "1fs868ddrb0fbgrk4wqk9jc1fyg3jcr6mfzrp65ypi5vdcx9y0kl" + "commit": "859aa6f2c0acf060a8e7549b79daf46c8d63ea8d", + "sha256": "1s44kz9b2b61f5gy922rvzv1kpmx62chvdsnb1g785skdhfdzb6v" } }, { @@ -28766,7 +28860,7 @@ "spinner" ], "commit": "b80b773238719fa7160e598219f300dfbc4db06d", - "sha256": "1w2xh207rm4a242iykhzsp3r3s8gv1cw8qr3cvwfbkxqrzmki7z4" + "sha256": "1whgbwdv3zrhxq2casxj784bx95j0vzlpnvi51i4xdxpdf77g521" }, "stable": { "version": [ @@ -28901,11 +28995,11 @@ "repo": "dimitri/el-get", "unstable": { "version": [ - 20230618, - 1453 + 20240408, + 837 ], - "commit": "cd998078949db70b736c0c3ac77ec23d97686f9a", - "sha256": "0d4kd1hpb4pqz6hxw6kc02gxv3cqpbnn0afqf5ajik4hlspwzd2y" + "commit": "1c5b0eb7fa162523183a96e409e4e3ae6b5cc3a0", + "sha256": "1dw13jpls9rm4xli52ry3g966hji92s8kysyn7p1rcxbygvqwyw2" }, "stable": { "version": [ @@ -29349,11 +29443,11 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20240317, - 1521 + 20240427, + 1730 ], - "commit": "76b08f798c94e2c6f107cd1fec9fb8aa02b5aa5b", - "sha256": "0gdgf2pkys4jxy7zknpixvygyhjv1xk9949frks3xlpiknvmkxdq" + "commit": "089fc7f172bea0d1aae63f5595ced02c6486b2dd", + "sha256": "0n9l74vcwydwpc7ignqppskppnnhlgqf2cfcsr3a1bsw6x0rcw26" }, "stable": { "version": [ @@ -29373,11 +29467,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20231115, - 519 + 20240426, + 408 ], - "commit": "c36f31074b09930e8425963f39d5508da6d2c32d", - "sha256": "0vglh3sp9x6z537jngh5jh9j3szbfadryzlwhmrlq7asiinnjq01" + "commit": "4392128d4caaa21f7810ba0955514c395e9f3cae", + "sha256": "0nf28jh02al8vqyj0awij2hbqa03jkggdysc0v8kjlsrd673scgp" }, "stable": { "version": [ @@ -29724,11 +29818,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20221108, - 755 + 20240331, + 1348 ], - "commit": "55fb162fa27e71b88effa59a83c57842e262b00f", - "sha256": "02cqgrhfaxc73j250jz70q83l50ynhfxszg6kyb4g7fv9kjdagh7" + "commit": "5c05a1eab37bc113ecb158a4d57fe05352fa2c6a", + "sha256": "1ir9vp2629dg3gxhlrf043gwbbf093p08q4igvx2r9hh6kraca5c" }, "stable": { "version": [ @@ -30142,30 +30236,30 @@ "repo": "s-kostyaev/elisa", "unstable": { "version": [ - 20240322, - 1808 + 20240401, + 1528 ], "deps": [ "async", "ellama", "llm" ], - "commit": "8794e14d75998fd20ab6d9c52ff4c44251428559", - "sha256": "14syfx8pibvw37zbi3gip5anhwby5l2sn5fjc9fhwp668g6b56yj" + "commit": "c03baded1e6b1bb6b37f8df83a0d1af4cdbaf860", + "sha256": "0xl6yz6536mbnba2g1ghv3c8zqqbag3kr8nqa87p0hpcqa6daz0m" }, "stable": { "version": [ 0, 1, - 3 + 4 ], "deps": [ "async", "ellama", "llm" ], - "commit": "8794e14d75998fd20ab6d9c52ff4c44251428559", - "sha256": "14syfx8pibvw37zbi3gip5anhwby5l2sn5fjc9fhwp668g6b56yj" + "commit": "c03baded1e6b1bb6b37f8df83a0d1af4cdbaf860", + "sha256": "0xl6yz6536mbnba2g1ghv3c8zqqbag3kr8nqa87p0hpcqa6daz0m" } }, { @@ -30176,11 +30270,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20231207, - 1018 + 20240421, + 854 ], - "commit": "6b280c854f964c303de2f9316f8f955e52893b8d", - "sha256": "0dnvyhfw906x234nzdprxlg9jx1wpj4wbfd65ack10zcvl6lwjxq" + "commit": "0560fe21d1173b2221fd8c600fab818f7eecbad4", + "sha256": "00vsgjqb3qfm2lr2vqf10yr84b07l63pgkqvi0s1a0js7mvv6s65" } }, { @@ -30490,28 +30584,28 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20240316, - 1610 + 20240415, + 730 ], "deps": [ "llm", "spinner" ], - "commit": "b94d5952d4e36e1caeef5ac0b3ecd6d89009082b", - "sha256": "0pwhr9xqakhhlvv7aab33lba3dpx4byh1clg6wfiyyl6xr2a48js" + "commit": "6e6ec8e28b8ce32ff207b1b026aaaeddc1bd8239", + "sha256": "1nwwqvl91c65r45yxa2dcl4a41r3ahw6294h79riya48nrp8kn54" }, "stable": { "version": [ 0, - 8, - 13 + 9, + 1 ], "deps": [ "llm", "spinner" ], - "commit": "b94d5952d4e36e1caeef5ac0b3ecd6d89009082b", - "sha256": "0pwhr9xqakhhlvv7aab33lba3dpx4byh1clg6wfiyyl6xr2a48js" + "commit": "6e6ec8e28b8ce32ff207b1b026aaaeddc1bd8239", + "sha256": "1nwwqvl91c65r45yxa2dcl4a41r3ahw6294h79riya48nrp8kn54" } }, { @@ -30847,20 +30941,20 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20230208, - 1148 + 20240413, + 1426 ], - "commit": "9d7cfbf72ef8c7cd014c91e5bb3d8fbebda56140", - "sha256": "0lw018bn5a6z8pxzqscs196l8k18m1m9p0p6amr3n27qmf6fp3vw" + "commit": "d51a5b81af909727fac45f3c9d3653b1170e01f0", + "sha256": "0n5yfyzzj044q2q1iar17wm4y4ix2jzx1arphsiy1yxx94n1g1z2" }, "stable": { "version": [ 2, - 2, - 2 + 3, + 0 ], - "commit": "9d7cfbf72ef8c7cd014c91e5bb3d8fbebda56140", - "sha256": "0lw018bn5a6z8pxzqscs196l8k18m1m9p0p6amr3n27qmf6fp3vw" + "commit": "d51a5b81af909727fac45f3c9d3653b1170e01f0", + "sha256": "0n5yfyzzj044q2q1iar17wm4y4ix2jzx1arphsiy1yxx94n1g1z2" } }, { @@ -31253,15 +31347,15 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20240101, - 2213 + 20240415, + 1535 ], "deps": [ "compat", "llama" ], - "commit": "2936dee72b2ef085c1c0a40817e67e868d44612c", - "sha256": "1md0kn4cwclv0i6fkrrinf2wjmr08cagxgv1sh6yja0hcvm37ygh" + "commit": "4b3b0af5b8d1e530a1a8fc44af650886b23918b1", + "sha256": "17c4lq6flzx0nsjcmdpaq8isdz73d337d9nv8fqb1719shniq2cm" }, "stable": { "version": [ @@ -31285,11 +31379,11 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20240128, - 921 + 20240416, + 749 ], - "commit": "fbeff19825336777dccaefedf3f376dd622cd294", - "sha256": "1lf1nzjr2vpnpb0aix4dq0wn1ixxwill8ii3p7i2aa14mh1p8bw1" + "commit": "8868b9e371d3d09add67022e46b3e4db0a0c22a0", + "sha256": "0viss80p4sls6qqi9hcdzzx5gibf4s27rqv1nfcdxibw2j1ici95" } }, { @@ -31339,11 +31433,11 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240124, - 1601 + 20240415, + 1535 ], - "commit": "5aba772e562f0b22e36e34c9b4c256ffe439654c", - "sha256": "124x32dlpxfg1qb9ssvlnakakkzaz4wx9k5cv65fnhr9spl8d7j3" + "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", + "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" }, "stable": { "version": [ @@ -31363,14 +31457,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240119, - 2314 + 20240415, + 1535 ], "deps": [ "emacsql" ], - "commit": "1b8297b671a6e9df9554df5f62d7e0748a2200dd", - "sha256": "13mp0iqbr0sn8z119jmlhdgwl19s9rp0xlgsmdjfq3ssz04g8kyg" + "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", + "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" }, "stable": { "version": [ @@ -31393,15 +31487,15 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230224, - 1201 + 20240415, + 1535 ], "deps": [ "emacsql", "pg" ], - "commit": "7c533fb6c27c3a10b6ab05bddf663e37c109e459", - "sha256": "1jmcxj8hx7900pfg7hlpdfln3higvfl7as931ry5zb2wla5wc76l" + "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", + "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" }, "stable": { "version": [ @@ -31425,14 +31519,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240119, - 2314 + 20240415, + 1535 ], "deps": [ "emacsql" ], - "commit": "ffd501a588e4ca884f949119e7c79d214dfd2ffa", - "sha256": "090ark8r2z5iw3gdk8xjh83nq4vwkbfyjm267l4q05ywlfb92dbl" + "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", + "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" }, "stable": { "version": [ @@ -31455,14 +31549,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240119, - 2314 + 20240415, + 1535 ], "deps": [ "emacsql" ], - "commit": "777abb9e9ed47245636cdc7ea814ce12ad11e2ac", - "sha256": "0x1cv4m36nsgyks3r5lyap521cayv302d568myw3s6h0licbdr6f" + "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", + "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" }, "stable": { "version": [ @@ -31485,14 +31579,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240119, - 2314 + 20240415, + 1535 ], "deps": [ "emacsql" ], - "commit": "777abb9e9ed47245636cdc7ea814ce12ad11e2ac", - "sha256": "0x1cv4m36nsgyks3r5lyap521cayv302d568myw3s6h0licbdr6f" + "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", + "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" } }, { @@ -31503,15 +31597,15 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240119, - 2314 + 20240415, + 1535 ], "deps": [ "emacsql", "sqlite3" ], - "commit": "777abb9e9ed47245636cdc7ea814ce12ad11e2ac", - "sha256": "0x1cv4m36nsgyks3r5lyap521cayv302d568myw3s6h0licbdr6f" + "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", + "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" } }, { @@ -31535,7 +31629,7 @@ 0 ], "commit": "f0add6820d250875f7d7c21aa5d813dc73dbcf96", - "sha256": "0zg52b3hl0rp9hjz04546kngssxs0l64dm01bwp9hapy7pichbci" + "sha256": "18bnw6yb41ki1xvkhi07v7fqx3var928majgd6613ra9nirnyqnj" } }, { @@ -31618,14 +31712,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20240323, - 2205 + 20240419, + 452 ], "deps": [ "compat" ], - "commit": "15c95aee0ec6f42ee3b7a0bc6cf1e2c1ad91dfcd", - "sha256": "1lv8r1xpilcpx061s16m9s44i79lqcw6cxggx39phj8855zp3cag" + "commit": "195add1f1ccd1059472c9df7334c97c4d155425e", + "sha256": "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg" }, "stable": { "version": [ @@ -31647,16 +31741,16 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20240205, - 2122 + 20240419, + 452 ], "deps": [ "compat", "consult", "embark" ], - "commit": "60139db8794f7e4a08076d9f7597d08f6c8083d1", - "sha256": "0ndf59zxi002jqlzfx64in5179xhygd86fhwrhygn8b2mdx7nq2d" + "commit": "195add1f1ccd1059472c9df7334c97c4d155425e", + "sha256": "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg" }, "stable": { "version": [ @@ -31856,16 +31950,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20240318, - 2011 + 20240414, + 1933 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "38417250833e14914d3cff65ebf8b51a1b9c1da5", - "sha256": "1qwpjrn8jm35ylbh7n2f3xk7z30czzx5w2nzi3qwmwrlb4wvp0df" + "commit": "01110352afecd160165041bee55a63e959f66835", + "sha256": "0hz0yf49l6lq897lvfrv8pzkm7k6frnkqxr28800yhb7d6hcd3ix" }, "stable": { "version": [ @@ -32267,27 +32361,28 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20240310, - 28 + 20240423, + 2355 ], "deps": [ "compat", "s" ], - "commit": "cb284929a6a1364d1200677de38a75d90edc6fb2", - "sha256": "0yc147iln4hpfv74jzaq6z53m52cannllwn5ffafya6qih5rl4hm" + "commit": "d9ab5d355c2e92c2c4e709d6945e6fab25069ccb", + "sha256": "0khj0xz3g5f0xa6qac7xyi2rjbm48l3wlk01q3x6fznccn5ch6wx" }, "stable": { "version": [ 4, - 0, + 1, 0 ], "deps": [ + "compat", "s" ], - "commit": "449b6e3e00b2a2e28580bb7608817f203380b53a", - "sha256": "02vrvwgd1fba8986qc9idi6b6iinn44aid8jawvrz21visfzfmmg" + "commit": "c48cd223b145806a6a36167c299e9a0384a5f2e6", + "sha256": "0p62wfsxk0sh8lpjm52md8kaixkfagfsl9gpmps76448iznn04m7" } }, { @@ -32570,27 +32665,25 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20240324, - 2246 + 20240415, + 1016 ], "deps": [ - "inheritenv", - "seq" + "inheritenv" ], - "commit": "94785b4bd385432ccd1bbabc73842cadb3357ca6", - "sha256": "02pfqsl9m1spwqzrb5x5f4rpys4laa0mjny5252qm2vc0rlp26xk" + "commit": "8571bf94b6a63ffd9a84100106602f88ba186854", + "sha256": "03mjws4fp00g5smivs1iz0r78mmd5sgj1g4xyi8aq21mpv5rd2m0" }, "stable": { "version": [ 0, - 6 + 11 ], "deps": [ - "inheritenv", - "seq" + "inheritenv" ], - "commit": "d8fe5d293253a0d431034cd7294e6fb561c4950f", - "sha256": "1a4ixhvs53ymcm0fjlvnh47rd0sp23w4ngns4m0ydcs5vq8hwq5m" + "commit": "8571bf94b6a63ffd9a84100106602f88ba186854", + "sha256": "03mjws4fp00g5smivs1iz0r78mmd5sgj1g4xyi8aq21mpv5rd2m0" } }, { @@ -32715,8 +32808,8 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20240212, - 1731 + 20240415, + 1554 ], "deps": [ "closql", @@ -32724,8 +32817,8 @@ "emacsql", "llama" ], - "commit": "4a245349047f48507fc28f7077061bca3dfcedea", - "sha256": "1sk0vnb1prlqb6qpg8w59liqnj9hn2mpcw1mb58jvfc5xb2f19vw" + "commit": "91c3e441eaa9f85b13d5957ee82f7c440addd147", + "sha256": "0n6psk9k2aglfsbxpnqfsmah4c9060sgf13wix0mmakba2iq11wc" }, "stable": { "version": [ @@ -32748,8 +32841,8 @@ "repo": "emacscollective/epkg-marginalia", "unstable": { "version": [ - 20240101, - 2215 + 20240415, + 1536 ], "deps": [ "compat", @@ -32757,8 +32850,8 @@ "llama", "marginalia" ], - "commit": "b8c9fb165ec832b2e930092ce8abe039d415a117", - "sha256": "12bf6ly08lhjssl8p257v9dz5w9inv8wq1fb4phprnpcggswxlhc" + "commit": "41bb627934e0a389e24573d2c9d088f6f6afdbcc", + "sha256": "1m0g1h81if11v0mw8l3kd6i2mxs1r1s1dh9c84niig0gw0dgligw" }, "stable": { "version": [ @@ -32886,7 +32979,7 @@ "dash" ], "commit": "7aa2e1715e6ea286b08bb446d2d9915afa0fdf03", - "sha256": "0b2a9qvqxhm2z4zb4qg6d5h0pp82hdmjl8qnk03zr1awi5angiyv" + "sha256": "11wag6sgfr62yj4zjr9n71kxd3kfa105l0rpbag47qmac2wsg7h5" } }, { @@ -33032,7 +33125,7 @@ "switch-buffer-functions" ], "commit": "feb0fbf1fd4bdf220ae2d31ea7c066d8e62089f9", - "sha256": "0pfnp7gw75hfhsy7jizp622s6yv61h3k2s0l2g33i801ar6abwm5" + "sha256": "1wb3xm45g77daw2ncs8a8w0m8d2hi591jmzwy5xli1zgrr5mm8h3" }, "stable": { "version": [ @@ -33044,7 +33137,7 @@ "switch-buffer-functions" ], "commit": "7539654e4a72edcc5bba07a101961e5bf0a9d449", - "sha256": "0pfnp7gw75hfhsy7jizp622s6yv61h3k2s0l2g33i801ar6abwm5" + "sha256": "11zpqwh1mlfifbgnvhc63bvnhg340jgxssm3m43hr1sxsyb52lh6" } }, { @@ -33431,21 +33524,21 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20240321, - 722 + 20240418, + 631 ], - "commit": "e651174c569694c92b1794ddd0a1a4a199610091", - "sha256": "1g9icvg07x78kkp1w9ljgbm6zyyzwz4p17mq844vr1vbr50amsx3" + "commit": "5df3992d695da4d7e8777cf7605279ce9d131f1c", + "sha256": "1zn34znba898b4kyrr2v88rbxlh709biff7z99llrvaxl0id6q3k" }, "stable": { "version": [ 27, 0, -1, - 2 + 3 ], - "commit": "e651174c569694c92b1794ddd0a1a4a199610091", - "sha256": "1g9icvg07x78kkp1w9ljgbm6zyyzwz4p17mq844vr1vbr50amsx3" + "commit": "5df3992d695da4d7e8777cf7605279ce9d131f1c", + "sha256": "1zn34znba898b4kyrr2v88rbxlh709biff7z99llrvaxl0id6q3k" } }, { @@ -33584,8 +33677,8 @@ }, { "ename": "ert-results", - "commit": "f9efdf1e970398a0a686a587e4678a650534b171", - "sha256": "1wm43jyxxyjq83cicidf4xs5rgxsp3954hjsm6q6vx4wbn2x40qv", + "commit": "2d8716906a0c9e18d6c979d8450bf1d15dd785eb", + "sha256": "18v8c7f63m5mzl13v89fz75vcwym5hhigbifqmyi2r8mddfql5rh", "fetcher": "github", "repo": "rswgnu/ert-results", "unstable": { @@ -33845,6 +33938,24 @@ "sha256": "02fybhmqm2qmy5qdig7xvwxazqi499pw32kh5mrsbdr14srg9fhs" } }, + { + "ename": "eshell-atuin", + "commit": "636d43dad51e4d57beacefeeaff4b5ca1c8b83e7", + "sha256": "0ic7k4a76fsjwz1irdljg46bms88hycayjyjrirm7sys9i01qc0c", + "fetcher": "github", + "repo": "SqrtMinusOne/eshell-atuin", + "unstable": { + "version": [ + 20240409, + 932 + ], + "deps": [ + "compat" + ], + "commit": "1b71d4c18039bc3b46095adb557f6987caab4a43", + "sha256": "0mkv3460prgjx8pcfvfnavcd6h93f4cd4lqv0k7mynjiq57qy8np" + } + }, { "ename": "eshell-autojump", "commit": "68bd1a8ec9d17eff2d23e15b3686f7c0b8723126", @@ -34071,11 +34182,11 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20240325, - 146 + 20240416, + 102 ], - "commit": "1d25386bf7d1a97e083d33750a98fbd1c6598138", - "sha256": "1mvhp5arzhmkgpyq6kg0vlvaan8h67z3jjszazmjvgi5gma6jz1n" + "commit": "070b33c20a907d973f41c0be1dcfd1335b8aa1e0", + "sha256": "0r4n6v9rlfmibrld1axbvxdll2j4c8vrp4glfpziglak1j764ifc" }, "stable": { "version": [ @@ -34094,14 +34205,14 @@ "repo": "4DA/eshell-toggle", "unstable": { "version": [ - 20220718, - 729 + 20240417, + 1536 ], "deps": [ "dash" ], - "commit": "d4e884624f02e68b267b0044322ad17baa6780f8", - "sha256": "13bb0dyhncph6rxihlf4fy7p92nyxz0ylld8vx1sj4551sv5ifn9" + "commit": "222e05870c0b3f4a4d96f9bdb7065c53eb43a917", + "sha256": "13j2jgpiqa0y24hv4dw26m6dmfy0apyjbizxrgm63qy4b24lj1i3" } }, { @@ -34429,11 +34540,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20240229, - 2054 + 20240410, + 1836 ], - "commit": "cf237253049583a547bafc16edb9eb9a52e1ebf6", - "sha256": "02zps4a404ijmngy2yx6sxj0c9hgs9383cm4byds2nw1jzhjc7wf" + "commit": "8030e29de88c1f234184278e9839d7a78d3ddc6c", + "sha256": "1xx4srd4qmc0plh3lr1ar0qpamwh41wabrxrjg2205d1dxrqv0wp" }, "stable": { "version": [ @@ -34617,6 +34728,25 @@ "sha256": "1zhlinkfzybkk0gbr1pskvx69wk566r6a5dxgpjjry247hq76ci2" } }, + { + "ename": "essgd", + "commit": "e054a2fdc34f358e82aeeae6fc1f79f364189561", + "sha256": "1dfss8h67whiya9155hns780bqvchqaackqb8al0cnjd634xm5w1", + "fetcher": "github", + "repo": "sje30/essgd", + "unstable": { + "version": [ + 20240418, + 752 + ], + "deps": [ + "ess", + "websocket" + ], + "commit": "2a88e9cc0e47b2bb3ec39db0399b279e2276280e", + "sha256": "1c1pwn4c25kqaq3vnn16jzhsjkb8ingxb8q9k086w7a5q26h2jpn" + } + }, { "ename": "esup", "commit": "b9d2948a42da5d4864404d2d11a924a4f235fc3b", @@ -34699,25 +34829,6 @@ "sha256": "16sl79ygwng4wwm7c15z4ga89wirp60mb6gndfvh3d3iifxm87q2" } }, - { - "ename": "etable", - "commit": "afee0fed80f4fa444116b12653c034d760f5f1fb", - "sha256": "0m4h24mmhp680wfhb90im228mrcyxapzyi4kla8xdmss83gc0c32", - "fetcher": "github", - "repo": "Fuco1/ETable", - "unstable": { - "version": [ - 20161028, - 2009 - ], - "deps": [ - "dash", - "interval-list" - ], - "commit": "d502141f0c69bf95256ba5cb9cd15350c7e942d2", - "sha256": "0k0g58qzkkzall715k0864v3b7p5jnfwxqgmkj087x34frcf388k" - } - }, { "ename": "etc-sudoers-mode", "commit": "e665f3b7fd75544c174ac3da9e0a498ceb694f5a", @@ -34726,28 +34837,28 @@ "repo": "mavit/etc-sudoers-mode", "unstable": { "version": [ - 20201102, - 1707 + 20240417, + 2126 ], "deps": [ "sudo-edit", "with-editor" ], - "commit": "74c66c58c9578a0d841206d5dec04d81e7b3d741", - "sha256": "0f4glimf9xf87nv23vq5cjhr92f0avzvimnr9v829d69fjmjghni" + "commit": "133f342e7a249ed4b3e3983e6d8bf541bae05c4b", + "sha256": "0lgw6x7p9rq334g97npbdq5zf7ws8a0gxx608dhai3g7lw47w84w" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "sudo-edit", "with-editor" ], - "commit": "74c66c58c9578a0d841206d5dec04d81e7b3d741", - "sha256": "0f4glimf9xf87nv23vq5cjhr92f0avzvimnr9v829d69fjmjghni" + "commit": "133f342e7a249ed4b3e3983e6d8bf541bae05c4b", + "sha256": "0lgw6x7p9rq334g97npbdq5zf7ws8a0gxx608dhai3g7lw47w84w" } }, { @@ -35068,15 +35179,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20240324, - 1731 + 20240421, + 1915 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "64a07c7aca2933ed1feec80704db49dc2c3476b3", - "sha256": "0m77bqnaqmqbd2w6710hplisbc9wwqhiymx63m7g2ddldzcmxyd0" + "commit": "fe44a565e6806dba4c298a76eb8800063016ec2d", + "sha256": "0xx73x82q26zgj33agmdzf4z4wk2m88f91wry071k8ja0qd9n5hc" }, "stable": { "version": [ @@ -35269,15 +35380,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20240321, - 13 + 20240417, + 1647 ], "deps": [ "annalist", "evil" ], - "commit": "89aea406334bc251adb70b1d6070b24fa94552ba", - "sha256": "1w47hr75a1r0zdzp6f14ac33sk2kqvmrlh52nd1pxll0wkaxd2xf" + "commit": "5886bab852dc9e31959e70384d535473e44504ad", + "sha256": "0dz9dkmxm4j2r2nilgxwgvsgbm531rrsiszzx480zrmqybdsziq6" }, "stable": { "version": [ @@ -35817,11 +35928,11 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20240216, - 1304 + 20240418, + 731 ], - "commit": "1c4fefa9bb11cc4b1d7f10614d2021c12ed12e89", - "sha256": "1m5y5n38w0ijzx2kl9d0nnw70ykx2prmnvv4ip9siad71k7wpwjg" + "commit": "c75b2c6c3123824ff7ae35deef22a3a5d9b619b2", + "sha256": "050r48nv2w13jj1d4n4y442p4vmwwqnnqb691nvlz48vfymdx6mm" }, "stable": { "version": [ @@ -35985,14 +36096,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20230117, - 53 + 20240416, + 140 ], "deps": [ "evil" ], - "commit": "8724645c84dc310f6155eec452913bb79c0c44b3", - "sha256": "0dxw2d85zxnh7rgfq1vn9b71nrn48j5c7fwbzb02m74qddcjnjg0" + "commit": "c7899894515d6be40dfcd589fb27c1801c5b199c", + "sha256": "0nr07k1c99xdiiz5bpn0rlr2f8qvca21smpcyyxk70cxfpwksd0s" }, "stable": { "version": [ @@ -36289,14 +36400,14 @@ "repo": "porras/evil-ruby-text-objects", "unstable": { "version": [ - 20221130, - 1832 + 20240411, + 1139 ], "deps": [ "evil" ], - "commit": "41c8b3eddb610206626a8a03e69857f903209e86", - "sha256": "1gakixp64ds35vfykp0niy9gdxymr1rlx2hphlbic1952dinvx9c" + "commit": "de138b3279817484d1d34ca5b293af09e00a4e1a", + "sha256": "1a2r9rha9lscx6g43xy2liwk88j2fak0c3sdwpgyyn3hz3f4g0zc" }, "stable": { "version": [ @@ -36474,14 +36585,14 @@ "repo": "emacs-evil/evil-surround", "unstable": { "version": [ - 20230917, - 1541 + 20240325, + 852 ], "deps": [ "evil" ], - "commit": "bd98f7f5492446885dc4c6b0a7579c75c22ac829", - "sha256": "1lj97qnzzi2dwgcak8vaaq5vhrkh84cxzzcsxs6jl93ghjyfmykr" + "commit": "14dc693ed971053feb9596d4bc1b1de0b0006584", + "sha256": "0v1jmzjlk1219s9c1x5vfrz97xip6ll64fw7n0hz3by6w0k7y1yk" }, "stable": { "version": [ @@ -36873,15 +36984,15 @@ "repo": "clsty/evil-tutor-sc", "unstable": { "version": [ - 20240319, - 233 + 20240326, + 1239 ], "deps": [ "evil", "evil-tutor" ], - "commit": "fcf8a588068c8fe591320d9e7161bf2d09b2e337", - "sha256": "1wf7bhhayj6x5657zy9ap014jlkkkvbkrg2v27h4y12cz5mc9i1z" + "commit": "9520aae3e10480a942c35ae83f7215086fee9412", + "sha256": "1v4gbyzz8bbii8vsbxrcwaxq32v1bjsgfspsgq15xkab4pziim4c" }, "stable": { "version": [ @@ -37257,25 +37368,19 @@ "repo": "purcell/exec-path-from-shell", "unstable": { "version": [ - 20240216, - 1606 + 20240411, + 859 ], - "deps": [ - "cl-lib" - ], - "commit": "d95677ad608c214647b87bc20df1642763e3b400", - "sha256": "1r32id7fkqhvr6whfx71v4svf70bav5k8b6dlp77gv6p1zyckm22" + "commit": "72ede29a0e0467b3b433e8edbee3c79bab005884", + "sha256": "15cjwvfv5xdhbym4ms71zdkng4381d3hsdk3kvvx2kycxff52rih" }, "stable": { "version": [ 2, - 1 + 2 ], - "deps": [ - "cl-lib" - ], - "commit": "03fc0a38af9e396c98f5a30c392cf757b3a34feb", - "sha256": "1wmr1z603wmcv8hxzxn84qxzdwmzmdm8x6f3n0x7klviq4jw6v2x" + "commit": "72ede29a0e0467b3b433e8edbee3c79bab005884", + "sha256": "15cjwvfv5xdhbym4ms71zdkng4381d3hsdk3kvvx2kycxff52rih" } }, { @@ -37586,16 +37691,16 @@ "repo": "ananthakumaran/exunit.el", "unstable": { "version": [ - 20240303, - 1106 + 20240401, + 1344 ], "deps": [ "f", "s", "transient" ], - "commit": "5e8f6b681d4745ef23bd8f7ddafba80d6285f26e", - "sha256": "0jdkf8jfrw10rbd08k9lmknxpypkywnlm2mn2maz0bfb0cpi6lm3" + "commit": "3b63d8835398ccadbcec080c8c1e00cd638b62b0", + "sha256": "0ci0x6jzw2ah3hm362r73wj3vipv1f01pybag29znmdvqfg95flb" } }, { @@ -37606,11 +37711,11 @@ "repo": "agzam/exwm-edit", "unstable": { "version": [ - 20240221, - 124 + 20240418, + 2142 ], - "commit": "19ce910a9183aac78365d674cbeb630464ff1836", - "sha256": "06p17hbbv3dk0rsd3yw9f7bqnsar4qphppc9vm870qzmy51np47p" + "commit": "046b8c11f71bfd6c798df770c6b7708af2c187a2", + "sha256": "1byc21dvsd8hn6fg9l966zc2iqa4a24la05didswyrcs5ya13nbj" } }, { @@ -37668,7 +37773,7 @@ "xelb" ], "commit": "047c83aa6b54bfb6ca8cac4d3ea18542611cef77", - "sha256": "1bwnw6qacdrm54lx4hc36f9lnidfw1wl399n7wasa24n9wrbr8z0" + "sha256": "08g7ly2syvmjgnj8qjgw5cva3wk08jmqnd85h49f76y0clcx6dsx" } }, { @@ -37785,14 +37890,14 @@ "url": "https://depp.brause.cc/eyebrowse.git", "unstable": { "version": [ - 20201107, - 955 + 20240407, + 1342 ], "deps": [ "dash" ], - "commit": "bdc626f88ab8e3d88bf5bf2e929707606675ef92", - "sha256": "0fi0j5razgkchkmg4rf36a8d28602f0x2idjga24p93mmfziwb32" + "commit": "473381f4f9e847eb50a40ef2306c027432789754", + "sha256": "0dfyrln0xwdhy2br3f5vi7c23zidbcg8c640a50fblrcj7p2mm8l" } }, { @@ -38040,19 +38145,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20230531, - 1920 + 20240416, + 2057 ], - "commit": "cba6906f6f4f33cbf229a300d83f0e0d925e8f42", - "sha256": "1xwcgnkxmkrlj28jh0p3c0x8s84clr8dplhh8f8azx1myql62lp8" + "commit": "9b8ff139442b29a16a437c367f201f263bbb884c", + "sha256": "103npmlln3c394fkacapx17zjyw4niwqqn8c768gij0ny4k0qfg4" }, "stable": { "version": [ 3, - 3 + 4 ], - "commit": "cb0ce3ef4430eda81aa6225f7083beb8ae03a425", - "sha256": "0zq8k1ggv40fdz6a5ri5nxg7yznvlwx7j3cpl7gig1v1p97h0b8k" + "commit": "9b8ff139442b29a16a437c367f201f263bbb884c", + "sha256": "103npmlln3c394fkacapx17zjyw4niwqqn8c768gij0ny4k0qfg4" } }, { @@ -38106,11 +38211,11 @@ "repo": "ideasman42/emacs-fancy-compilation", "unstable": { "version": [ - 20231228, - 2247 + 20240422, + 111 ], - "commit": "74833d618024cee47c24aabdc6e9daa4009d0690", - "sha256": "1c8rfhab3bi8aw0kyrcb7dz6zcknv3r5dcnrq4z784pqs1gjdq2l" + "commit": "347db70ec7252245ab745c1087e8806c684e2a04", + "sha256": "191q1gr1nm7q1vh3sp4xx7gwzfpy5c2r7qrqa7dbnd640s8bpq5y" } }, { @@ -38480,11 +38585,11 @@ "repo": "michaelklishin/cucumber.el", "unstable": { "version": [ - 20220418, - 848 + 20240401, + 242 ], - "commit": "e204d9e204b767cf95d6a051ff283f05dc51e9d3", - "sha256": "0zg4nkwfwmil2a3n2gnrwsj14dkwb1hm1mbcgcrg2dgvh45idns6" + "commit": "afd49b8a8504e5874027fc0a46283adb1fea26c0", + "sha256": "1jlzmd8b03fg0d5hgfvx1czkh5wlw136g34z89cnnmbhi4p4cv3x" }, "stable": { "version": [ @@ -38577,11 +38682,11 @@ "url": "https://opensource.chee.party/chee/feline-mode", "unstable": { "version": [ - 20230315, - 1821 + 20230301, + 1350 ], - "commit": "3f9247f48058285d3e03957680e011ecf58d6feb", - "sha256": "10512svsgag8shgwhxgkdncyxdmvc67aj42jmd5yzvzhizd25nsv" + "commit": "8c46b1be9e45a38281aa9ddae79fda3c8e4cb5c5", + "sha256": "0i8m08xqj24wyij2b3ib8dl3gk6sra9jp73wz2wcknwb58hwnjl9" }, "stable": { "version": [ @@ -38600,11 +38705,20 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20240313, - 32 + 20240425, + 129 ], - "commit": "4cdf20b673ed1eb14342d7a470ef75cbe165b0c4", - "sha256": "1hvmcnagrz4zwzadsx406hw0gsn66h5rd5y4891pkc260bi8mcyc" + "commit": "dd7a320b1582b726d011f4fca24d36614b5ffba8", + "sha256": "0f19c55slndp0vdhbwx7s2cz54a26vvyy7knxd2nrhl6wnrazhma" + }, + "stable": { + "version": [ + 0, + 9, + 1 + ], + "commit": "1ce807cc664cb209afa0e0331d4d2f0cdbc09f78", + "sha256": "0dh50nkfxfiqyf19lfqnbfdpd8xf23q38axfli60d0vcix9nhxpv" } }, { @@ -38859,11 +38973,11 @@ "repo": "jcs-elpa/fill-page", "unstable": { "version": [ - 20240101, - 930 + 20240423, + 924 ], - "commit": "c2bf4d4661c7f618e3c3334dbfd9a142371806d6", - "sha256": "1rgb4jj0fz37h09f9zyn8915mfc8x6dhhqbizq6vsq66cdcb1gac" + "commit": "c04d29a83d50c9f1dfc039c05c6508f8370514fd", + "sha256": "1z0ni6llpvdh9jwmnzvpxnyy4x605qyh07pwaqck7bxl12xc3wh3" }, "stable": { "version": [ @@ -39288,20 +39402,20 @@ "repo": "Anoncheg1/firstly-search", "unstable": { "version": [ - 20240324, - 1536 + 20240408, + 556 ], - "commit": "5a5a60ba276c4362c371e44ff1cfa242b94eef62", - "sha256": "1bb4p9jaj7mn451zsx5wzsc9wrkzskg16g4cmxbvsfrlfxzfvicz" + "commit": "2045d990509074a8151c8a27db50e477d254aa31", + "sha256": "1xaddr6zgnif4gng8sdqfsxckh2k35yblpn3mirz6zw7iyd46zs3" }, "stable": { "version": [ 0, 1, - 1 + 2 ], - "commit": "93d8b048187ae1e1bac4949c070ed4a8125e74bd", - "sha256": "1qp48fnf4ji8w4xn8sngknk79hwfwlk4cyz0717f0fmvk0wp7ias" + "commit": "2045d990509074a8151c8a27db50e477d254aa31", + "sha256": "1xaddr6zgnif4gng8sdqfsxckh2k35yblpn3mirz6zw7iyd46zs3" } }, { @@ -39312,11 +39426,11 @@ "repo": "LemonBreezes/emacs-fish-completion", "unstable": { "version": [ - 20240310, - 1442 + 20240405, + 2052 ], - "commit": "5e081b3c061cfd91a98aceb035bdc80240e6ff92", - "sha256": "16a9fdjwsh89ar3paprmks89z0ydijn3lqv0r8khmhpa9ljrkrg5" + "commit": "807628cc4b0f7a07b6e512f7c7825a78ee5c73fc", + "sha256": "12rs6l3w08smp37p18365bj4as1i3jrwl54zbrxw2navjyqmp11m" }, "stable": { "version": [ @@ -39372,7 +39486,7 @@ 4 ], "commit": "ba63f0591c3be1644ee7ee972430c74b5d346579", - "sha256": "1yjfvb2vn5pmrq5fw4sfx1lfkbnkwlc160izpvkrf9ww9xsas6al" + "sha256": "014vbzxz1jmm83a5mg4zsyxm8nw96n8s2l7h3myhrn880d9xnqgg" } }, { @@ -39464,7 +39578,7 @@ 929 ], "commit": "608dd1120d35b02a02570f024c585f7569508586", - "sha256": "08yq6hncy8vqa2plpxa4gkq244wig2pd05w4ws0j8nmpwcwl6zki" + "sha256": "1gcqllsdlkkmgrwxwczxsj4zllwpprw7df479j6sj563j6qds53r" } }, { @@ -40074,11 +40188,11 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20240317, - 606 + 20240411, + 449 ], - "commit": "0c8de6de03bb1639552007f70a9c66ebdd382496", - "sha256": "0nc5fpggqckpnlxaaf0w517zr6xzamg25yj2hgrp19naqicl7133" + "commit": "900b8e79754d21853a6e5b5a2802f317a7112a1e", + "sha256": "0k9gf7aim1ns09rmicaqy93lp1915c8llr9i837gw8a86c8fjfrr" }, "stable": { "version": [ @@ -40298,7 +40412,7 @@ "flycheck" ], "commit": "0eb3dd630391e4d8a26e09c9032cfb9f4bd71e08", - "sha256": "1zk3rjabmpfl37zrnnim4h6cbnwp9vg8yjwirw8hjsayfh1pp0kk" + "sha256": "1nrhybhpkv3rvks1vqzahfjg0vva76kakd99wpdqsa60ylb5i4jw" }, "stable": { "version": [ @@ -41095,14 +41209,14 @@ "repo": "weijiangan/flycheck-golangci-lint", "unstable": { "version": [ - 20230523, - 1855 + 20240329, + 1647 ], "deps": [ "flycheck" ], - "commit": "9def093e416e9a6ddd3cae8590dbb7ff6314925a", - "sha256": "1j28zwglv0qygzzsd7rp71gswgidcq7mkaph7z915xci92r2r3ap" + "commit": "91c59b128aa6f719069cfb3e5df77588691a3e14", + "sha256": "1qw3g0vaj0nf6kf0ga0hayyv099g27s7pa472760fwx2v857vns6" } }, { @@ -41370,14 +41484,14 @@ "repo": "DamienCassou/flycheck-hledger", "unstable": { "version": [ - 20230710, - 1920 + 20240423, + 1307 ], "deps": [ "flycheck" ], - "commit": "9b7ccd3d49765dd68885d1fa0fb48823ea11fb2e", - "sha256": "0clgbliwiwllnsxf5j7p3smlf487lrgy2a1rdgmjij3qa55wbl99" + "commit": "77369d78c8a00cd55a3ff8b12dc99db136748a4e", + "sha256": "0kzfil5nyk9y1nmvz3hn5vgaycid2r34p9vx4m1j02r3y5z0amhm" }, "stable": { "version": [ @@ -41469,7 +41583,7 @@ "flycheck" ], "commit": "54744a78d06373404933fedc3ca836916e83de51", - "sha256": "1vvsswadiks9mpb49vz2q8z69wq0jalsvgalhn10k3pyz7p0abnd" + "sha256": "1zdvan6l2s97s7swnccq21z1ja8vl64l757j3hg50ipq8j5yy9dl" }, "stable": { "version": [ @@ -41480,7 +41594,7 @@ "flycheck" ], "commit": "54744a78d06373404933fedc3ca836916e83de51", - "sha256": "1vvsswadiks9mpb49vz2q8z69wq0jalsvgalhn10k3pyz7p0abnd" + "sha256": "1zdvan6l2s97s7swnccq21z1ja8vl64l757j3hg50ipq8j5yy9dl" } }, { @@ -42972,15 +43086,15 @@ "repo": "mohkale/flymake-collection", "unstable": { "version": [ - 20240316, - 2135 + 20240331, + 1808 ], "deps": [ "flymake", "let-alist" ], - "commit": "f1d889f166934a4d8ec0f0e159e179314c2e8791", - "sha256": "0ry8lmbsllsbk5gaywwym5fi1f001g3qzjzwzcz5xq1vim9jzlvj" + "commit": "46b65939c8363ec7efd594390a3c5d0becc7b8ab", + "sha256": "199rpiwwf5fji6skv2bjdbwid83lpjsqdsa2pykrb3ci2lial53w" }, "stable": { "version": [ @@ -43161,25 +43275,25 @@ "repo": "emacs-eldev/flymake-eldev", "unstable": { "version": [ - 20240115, - 1927 + 20240419, + 2023 ], "deps": [ "dash" ], - "commit": "901b2837c7d575f929f87aa83b8e725841927584", - "sha256": "0m0zkg85f65dbhrfsvfb2fircgm3wfxg8x4l9iahagamxmxxwhq8" + "commit": "d8f4d9da115002afd3785b777cd59a49d170e04a", + "sha256": "16jf51kzllrsk8576ydwys683wkdq0akckkpfbhnx3nq4nnf5c3i" }, "stable": { "version": [ - 0, - 9 + 1, + 0 ], "deps": [ "dash" ], - "commit": "64fc128293040753eb874b8ade59803cf1c23a46", - "sha256": "00giw9fc86facrhdas5ylz7hmblaaj10i3qzxjcfnwal5c5byfwj" + "commit": "947d3f43d19ddf67dffcaa3ba66c51ce1077dda7", + "sha256": "0wyfk5vd7rfqlkpbc8hmcv8rdgf27ms0dapiy6wzdc3313kpdgjq" } }, { @@ -43738,6 +43852,21 @@ "sha256": "07my1w3cdj9iq2f9jfh04m5zivig7b97kha3ajjlx9avss976baq" } }, + { + "ename": "flymake-margin", + "commit": "a0dc116fbfa4e1196cfc0453d9623426960cbc82", + "sha256": "1mqlps7niya36nj7yxc3bpy5j592p5na7w1hbgwd36kaj1wsa4d7", + "fetcher": "github", + "repo": "LionyxML/flymake-margin", + "unstable": { + "version": [ + 20240401, + 2342 + ], + "commit": "fe4da9f947c7a11aba331dd77637d471cedbd061", + "sha256": "1p3q7s5n1szggj8w8fmpz8l7g27srmsrgla5wag2320dnd6djrir" + } + }, { "ename": "flymake-markdownlint", "commit": "0cdb9c33a827d870da79a63d3c0b923fb5b02073", @@ -44101,14 +44230,14 @@ "repo": "erickgnavar/flymake-ruff", "unstable": { "version": [ - 20240113, - 1518 + 20240419, + 232 ], "deps": [ "project" ], - "commit": "165ee1fe7b9d154a316c332bf73f341177126d8c", - "sha256": "016322zv6bp97jama1lsh9rrrgv0h30h8rrslq9lmf5y85bqikh4" + "commit": "15bf4d3a4ebe899991e385b64901b5cde0daa177", + "sha256": "0g9czaf6his577g1fcgi5xiy3fhfjkf8ihilgnxjydiwgr4fg4f1" } }, { @@ -45034,8 +45163,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20240324, - 2106 + 20240423, + 2033 ], "deps": [ "closql", @@ -45050,8 +45179,8 @@ "transient", "yaml" ], - "commit": "2a3b41eb6235b3f39c017c1f86b3928a45c5a64d", - "sha256": "09nxkknp4f66v4s2hyfxyhg2qgzzcpzw7xsb8v16p9k5khnkrh8m" + "commit": "b54c8610a48c092aec8adde289cb9ba52ff7e23c", + "sha256": "1akx3qf3kfyc21bhg1pdlp92ncnx95wdhsqaj45haqjalad9a0zp" }, "stable": { "version": [ @@ -45269,26 +45398,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20240226, - 245 + 20240329, + 229 ], "deps": [ "seq" ], - "commit": "20e2fc4aa62d27a48c092761e77d65b64d55a3c5", - "sha256": "11c09a470v61cwi0662615q8l58sxd2mk6zqbvrp5g14w8470hgs" + "commit": "b25315fed996cf1d41cc2d612dacc62b3e95f928", + "sha256": "15r0pzdmimm72jx26zgdxf7fwwcppl45vvh33xx5wnhqzd140hwn" }, "stable": { "version": [ 3, 7, - 2 + 3 ], "deps": [ "seq" ], - "commit": "561982bde5fc4f53f72cebe53e0eea53051ef0e7", - "sha256": "0xy45inihqwaix49vxr5yiqyps4r2djkzdd4g7kkc0fv7kzrm1m4" + "commit": "b25315fed996cf1d41cc2d612dacc62b3e95f928", + "sha256": "15r0pzdmimm72jx26zgdxf7fwwcppl45vvh33xx5wnhqzd140hwn" } }, { @@ -45299,11 +45428,11 @@ "repo": "gmlarumbe/fpga", "unstable": { "version": [ - 20240211, - 213 + 20240329, + 1759 ], - "commit": "bbd663f29e796ab010a5569f1cdbd706ff0f564a", - "sha256": "10mxqmaq1n2691qyydyblwdzyyv5dghm9rc62awfgcjkqd02hmr8" + "commit": "34e521962ba3842321d456bd587aa93e4b627969", + "sha256": "07v8ybmljx9894q5q8qpvqdia892907ikl9q7vixhxkx5g4adjb6" }, "stable": { "version": [ @@ -45453,14 +45582,14 @@ "repo": "tarsius/frameshot", "unstable": { "version": [ - 20240101, - 2216 + 20240415, + 1537 ], "deps": [ "compat" ], - "commit": "77e4f3ad1fd495d983e62a201f6c1f708b616648", - "sha256": "08f2l190f37qfidlismy3jylwlk4r2bpgr40cglw5wbid1ln54sy" + "commit": "8bceac0988ea2e84452f87b96e0a9f669d717843", + "sha256": "1xw8cd8gaawggywpqkalzcjsvn6ns52v7bsp0jmbz113y6l8q689" }, "stable": { "version": [ @@ -46146,14 +46275,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20230511, - 1235 + 20240403, + 1143 ], "deps": [ "cl-lib" ], - "commit": "8e830a65983c5175b0116360eddefa3ae4fea897", - "sha256": "13skbn103411s06fz3vppcnlq56vp35m7slnxw3azf8zq4bb7m4k" + "commit": "98f9e7e890e082d45034f935d311a399326010ef", + "sha256": "1cbm1navpw8kh6dj5hqk3d0a1fap7bsgfw414scdmjrq3rp672sp" } }, { @@ -46259,14 +46388,14 @@ "repo": "tarsius/fwb-cmds", "unstable": { "version": [ - 20240101, - 2216 + 20240415, + 1537 ], "deps": [ "compat" ], - "commit": "88e823809067983acfaeafa57d0bb6e889429ad2", - "sha256": "1bipyxd5zfrhddspkaybfd9gsdlih17il84gkzaqk624k0k07a7p" + "commit": "2214ad1094b0b4d466825521eefe39bba65634d0", + "sha256": "0cqxin5mnmkjzswh6vk46dhxyh6parxd74w4i2cd44ijrh6rx9yn" }, "stable": { "version": [ @@ -46497,11 +46626,11 @@ "repo": "godotengine/emacs-gdscript-mode", "unstable": { "version": [ - 20231024, - 1150 + 20240424, + 2157 ], - "commit": "8a28276daaa23f10e986367b80dc751c5d26829e", - "sha256": "1hwagkbfrrd5bgwykl6hq56jmg0264hd6iz1nljl3n06k1gm3p90" + "commit": "2737f1c68cbeba38d34e5728c9fc2cd69e9a8f88", + "sha256": "0q8diqv5qcn7xxb42wl5mva8a51l0rhxsbm248walqdrrb0l9jk3" }, "stable": { "version": [ @@ -46759,7 +46888,7 @@ 14 ], "commit": "362f1d1189c090ece8b94f6a51680f74b1ff40f9", - "sha256": "1gsvl0r6r385lkv0z4gkxirz9as6k0ghmk402zsyz8gvdpl0f3jw" + "sha256": "15bmrhpg4kh6dv6bwzxs15wf4rm7a3g09z6ram762hf2kinfiihy" } }, { @@ -46820,7 +46949,7 @@ "geiser" ], "commit": "f76b53dbc1465dbd799e29bdcd2be34cc1603f50", - "sha256": "1i4ywb4ggq884p2lbpmp6y53l8ys5ajma7sk21zxi1jx28nb01nm" + "sha256": "097gyi299fyjy4v22l2l95mzs319ljr9jas4n6893vghac3rf1r6" } }, { @@ -46878,7 +47007,7 @@ "geiser" ], "commit": "42376b74ae0ad84d02c26560dfd9181493dcccd7", - "sha256": "1aqsvmk1hi7kc3j4h8xlza7c6rwm71v98fv5wpw8kmyj9vsp49wx" + "sha256": "04gwd9qa0785zfr6m9a5443ilgvyz05l06cb1waicf83sgp8xl32" } }, { @@ -46967,14 +47096,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20240218, - 1029 + 20240410, + 1650 ], "deps": [ "cl-lib" ], - "commit": "ced143c30de8e20f5a3761a465e684a1dc48471e", - "sha256": "0c13kax2h14b06zjs8wj950y7ykzmabfwdmb8imwmpgfcaasycf2" + "commit": "826bf2b97a0fb4a34c5eb96ec2b172d682fd548f", + "sha256": "1jillsr80l4wfbcqsxh3zbgbvmbfih2wcz518mgw9p9pwg4xwvy7" } }, { @@ -47101,10 +47230,10 @@ }, { "ename": "gerrit", - "commit": "3b966a2476cf10234686e49d808bcbabe0686891", - "sha256": "1ikkd2xjr1n8p43pwycfrsfy9fkib83mf8l0p4bjrjszfcb9ln4v", + "commit": "794fa2db8adf93b71a823fe73cfec1342f24d64c", + "sha256": "1b2hrb6gg11mcgzfafk2clz4yn8sfqgikv2kaxna0r525g0p6dw3", "fetcher": "github", - "repo": "thisch/gerrit.el", + "repo": "twmr/gerrit.el", "unstable": { "version": [ 20240306, @@ -47276,19 +47405,19 @@ "repo": "anticomputer/gh-notify", "unstable": { "version": [ - 20230117, - 317 + 20240411, + 2031 ], "deps": [ "forge", "magit" ], - "commit": "e1afdd49deb8ddf1a988e8d3fa699b06dfa92f5f", - "sha256": "0vx77b54hyx1f6qq1n57x7sn2080fdb67678jiw3c152jai99kx3" + "commit": "bcd30f1804d6e1bf0201a16486d094a3817636b6", + "sha256": "0spwcby1ag91wf9k3waydfav5wf37na80vayxf3kgcss2dpixz7n" }, "stable": { "version": [ - 0, + 2, 1, 0 ], @@ -47296,8 +47425,8 @@ "forge", "magit" ], - "commit": "8937f64092ea3b7e2cea2d61c12fde8e0f5e7917", - "sha256": "1amqyv0xdvl1ghy2pv2kvp2lc2q250p71mq3qdf50v87png57d9p" + "commit": "364cc30f619321b98dc6772ca50c87fa14350a50", + "sha256": "1bi1jqw3fxzc4q2vxf1pjph0f2ahdzlpfpan83hn404h6hl46ldn" } }, { @@ -47415,16 +47544,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20240311, - 1716 + 20240415, + 1555 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "132631529c2e3e75e15608658aed5adfbb6b7409", - "sha256": "11cih7igq5amv7w5k5fql0c0plfmgqnkv5p36a2dl3mzk96d8mkn" + "commit": "e0a65456098c5e0f2cf2724d071e9033f7b0bf3a", + "sha256": "0kxvd5bfwddcikm4xd82n24pm2mx7i4hqi5ikaypdav2hlp9s0x5" }, "stable": { "version": [ @@ -47492,7 +47621,7 @@ 2 ], "commit": "fa81e915c256271fa10b807a2935d5eaa4700dff", - "sha256": "1jiglrlhrph57p5kkm1qlqihwl6z7h9qh16qmmd5783ynksnbxp3" + "sha256": "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh" } }, { @@ -47750,26 +47879,26 @@ "repo": "liuyinz/git-cliff.el", "unstable": { "version": [ - 20240304, - 2323 + 20240407, + 940 ], "deps": [ "transient" ], - "commit": "be4b22a2c0d638cf1e5d52acc96933a443d0ca23", - "sha256": "0v8jibs3drq2rlmnpjw7ar4zc8fglka53rcqdcmshbq2jh96z0fi" + "commit": "b217b0576798767cc0a96343ba43adca3c04f760", + "sha256": "03bbm924i10h0chly5za991qplkp15dphgksnhni4i30k5s8znkb" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "transient" ], - "commit": "0bc7b66d78058f5d41e9adb891d6fb29085153ee", - "sha256": "1szbfxy3lc1y8ax3gbxs5spkdjshrpq537yaxd85n9mrv19s3xv0" + "commit": "6715b76f0734aa730958e87555b63b59c80585ff", + "sha256": "1795zwcic7imh7ybzjvbybyqrnnfh887y1bvn95wyywqrjrkk22m" } }, { @@ -47813,16 +47942,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240320, - 2311 + 20240415, + 1544 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "4d378d91d245f68a972626c4076a6558d1c19dce", - "sha256": "0vix49448b79sxvwzxnij2q7nsv525y5qx814k3q0s80zwd4ny2v" + "commit": "68075aff58e7ae5c852b9eabb69df454267deeaf", + "sha256": "16l6gm5kh739d3pclyqgfkc0kqf97zl03hzgx5iqadbx8gpcvzxg" }, "stable": { "version": [ @@ -47872,7 +48001,7 @@ "s" ], "commit": "8a403005ea7f7611bb1bfd829eeefe5a4f10bb40", - "sha256": "02hag6jd55mqf0n90p0hvihmqjvd0cdlpm5knsxk3cll7fp0kkkr" + "sha256": "0w5xl9r7sbhlwxzg391x50pnsjmjjakn761v3qg0lj6xhv23sdl5" } }, { @@ -47916,11 +48045,11 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20220922, - 256 + 20240425, + 647 ], - "commit": "ec28e85d237065cb3c28db4b66d129da6d309f9c", - "sha256": "1fx3jp65ibcsv8akd8g4k701cs8yq0sg1bd2qszzfh6lvc4pblmi" + "commit": "9afe45b41a82a332606d3e70ef85d323d27b9e4f", + "sha256": "04y6aj588068hr6xnyb15g38q9n3w01zh2r525ljmzvrry2lai7y" }, "stable": { "version": [ @@ -48095,7 +48224,7 @@ 0 ], "commit": "ea49e2e005af977a08331f8caa8f64d102b3b932", - "sha256": "05bkpg7xz8644np9imsj5ms821sbsb784ap5fjdnnn69kllz0d33" + "sha256": "0prx0xbnhhp46c09nnzpz07jgr3s5ngrw8zjksf48abr8acwywfv" } }, { @@ -48106,11 +48235,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20240303, - 1546 + 20240413, + 1547 ], - "commit": "14156291e0eb7156bd779a80c17e1935a7f8f5e5", - "sha256": "1dxmzk4qrz69h097lwshfg4qavdp92an5212ndhjkpmkgvk1v0xl" + "commit": "f16ced38f954f1159fda2f0ba7b60842f8d7e9f9", + "sha256": "08miy2jdn5bbmwpz5p3a196p60j8ldgb4sk77rf1cz24dp490h1i" }, "stable": { "version": [ @@ -48159,14 +48288,14 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20240101, - 2217 + 20240415, + 1538 ], "deps": [ "compat" ], - "commit": "4a61a9b86df9c824a99c522f42d55e68faf85f91", - "sha256": "0k92ivrknyn0h6vv3mq7y9g6hsymbwk45fdcy7dx8da2qsqaxiif" + "commit": "52ea2a1281ea9df9b8732fe2add0e6a0c9c2cd11", + "sha256": "1nf9ij8qab4lfcgj6h63mxlqph04z4icq5fxs5hsdxzcxrz3y6g1" }, "stable": { "version": [ @@ -48247,14 +48376,14 @@ "repo": "pidu/git-timemachine", "unstable": { "version": [ - 20240309, - 1109 + 20240427, + 924 ], "deps": [ "transient" ], - "commit": "5ed73c3831cf6da10ba941e6abba708a86853e8f", - "sha256": "1cx2rqv1c162bpf6dn01arjbyqlaxjgr1a674bsvwjin3rwcx22j" + "commit": "3780835fcd67c3703ffa768206121851e6895ece", + "sha256": "1r2cjz0x30myy9hzbv5iwmq0j9n490rnv6pxfvb00g2kcbvknyna" }, "stable": { "version": [ @@ -48785,7 +48914,7 @@ "yaml-mode" ], "commit": "2651e831aed84ee2512245952fac94901b086549", - "sha256": "0yd6s5vy5afkigm87xyh1nnwljplx1wdn5h02224ica0py48fzhd" + "sha256": "16fb4r3vq8xkzl911v7gaky95w1agfxjlpaxpjmidwx48rbcar59" } }, { @@ -48816,7 +48945,7 @@ "gitlab-ci-mode" ], "commit": "30ea0eab74b24818f187242b079845785035e967", - "sha256": "1w1simnlffg56j79gal1qf1nlav9f8fmr2zfswfrmcv6cac6fhj9" + "sha256": "0awv24znkxs0h8pkj4b5jwjajxkf1agam09m5glr8zn5g3xbj798" } }, { @@ -48865,7 +48994,7 @@ "helm" ], "commit": "5fe0a66642da6f4e7ba9e1e3a96572c7f1876e37", - "sha256": "1mxkcnjgazc1pyjbqqfnhc9phpyrgah960avm2fmi7m9n5v8cf0w" + "sha256": "1c5js19zyb1z61hapvbfcl5jhrjqij46cxldgqij6al0scw44dga" }, "stable": { "version": [ @@ -48878,7 +49007,7 @@ "helm" ], "commit": "5fe0a66642da6f4e7ba9e1e3a96572c7f1876e37", - "sha256": "1mxkcnjgazc1pyjbqqfnhc9phpyrgah960avm2fmi7m9n5v8cf0w" + "sha256": "1c5js19zyb1z61hapvbfcl5jhrjqij46cxldgqij6al0scw44dga" } }, { @@ -49274,15 +49403,15 @@ "url": "https://git.thanosapollo.org/gnosis", "unstable": { "version": [ - 20240314, - 612 + 20240417, + 1322 ], "deps": [ "compat", "emacsql" ], - "commit": "78e066b94809fb7746086a1ca6b7d7c39d353343", - "sha256": "11kj6w1daqhblrmvc2zhzd17j5kq1nzrmn3379f80y9gjp4y1blk" + "commit": "ad7b3563cb0b63afdb3ee14ada8e282c3a65b72e", + "sha256": "1mvf9wq8mwxl5vvnhgsgi6ahw45cg1sihgknb59pp38mg33yarxv" }, "stable": { "version": [ @@ -49419,7 +49548,7 @@ "gnus" ], "commit": "44ebe0241a19f4052cd427dff408206542aa3c8f", - "sha256": "0h7w5wrkrd0jw8nmgbkzq8wam7ynvy7flhjg4frphzmimlhysli2" + "sha256": "1fqkclbddwfqywvkrb7l2cpibapxrk82ikdpbxapj09iwyn3ijlz" }, "stable": { "version": [ @@ -49430,7 +49559,7 @@ "gnus" ], "commit": "210c70f0021ee78e724f1d8e00ca96e1e99928ca", - "sha256": "0h7w5wrkrd0jw8nmgbkzq8wam7ynvy7flhjg4frphzmimlhysli2" + "sha256": "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw" } }, { @@ -50726,11 +50855,11 @@ "repo": "emacs-evil/goto-chg", "unstable": { "version": [ - 20220107, - 1733 + 20240407, + 1110 ], - "commit": "278cd3e6d5107693aa2bb33189ca503f22f227d0", - "sha256": "0rgdzhan4n5bd78wvivacqkp0g7jvnwzgh0571p2m4yra09a36mv" + "commit": "72f556524b88e9d30dc7fc5b0dc32078c166fda7", + "sha256": "0dv92vhski35g7wdnr4nvjm51bsa7pn8xbq9svp30y28mq8v9gni" }, "stable": { "version": [ @@ -50828,7 +50957,7 @@ "stable": { "version": [ 0, - 36, + 37, 1 ], "deps": [ @@ -50837,8 +50966,8 @@ "magit-popup", "s" ], - "commit": "cc533e4b14c522d0cc44ee646b0a36c408c10425", - "sha256": "12vd1xzmj9140a4hfkjmxg5mdj9m03nk31yx9yq1mrgjd89xxp6k" + "commit": "bf28314d9e3287ad1674f80d8a80d2245c0159ae", + "sha256": "1v02h68s1fir6s7y3zjq0s8gmg5qkac637yf3mv68lglb9cwqjll" } }, { @@ -50888,11 +51017,11 @@ "repo": "brownts/gpr-ts-mode", "unstable": { "version": [ - 20230813, - 1727 + 20240404, + 1258 ], - "commit": "2e4f89743b115b3e09f0574d0a6e67a7422c554c", - "sha256": "0g5pxggra2ijlfyw25bp4j8i741pmn0mxy0srqdwvhjlmpy57nhr" + "commit": "a92ab100759cddb51d042adf109f1831a57dbff8", + "sha256": "0ijyn9x6i47h9rxnfj51mhkd8qh5mippnnbbh8h388wsbgkj470s" } }, { @@ -50992,28 +51121,28 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20240321, - 1740 + 20240428, + 314 ], "deps": [ "compat", "transient" ], - "commit": "12e00cbd092de95ae7f11aa207cd41dd9fabf883", - "sha256": "0ri0saa5750nay1ck46lxa6h21nxh9sgs0n1khr92wda1rinh85g" + "commit": "306fe3bd8c2933b48a871976161a7030c7e5b9f8", + "sha256": "0zdjzjv6znfzdrjdpkvnhbrb2dkqf9kgg4z2hgl2wmx4lkwnvcdx" }, "stable": { "version": [ 0, 8, - 0 + 5 ], "deps": [ "compat", "transient" ], - "commit": "5dcbf40066f5b6fba27af7bf610348dbd781751e", - "sha256": "1n3kdylv50filla692j2vcjalw6yza80xlg90cw54m9jp9br8sch" + "commit": "45aae4f721e37139a57420273b6e4252229141d0", + "sha256": "1w9sji73dixch1b5i420j44qb3jd0zknpypz46g33pbyhg9xwqln" } }, { @@ -51070,10 +51199,10 @@ }, { "ename": "gradle-mode", - "commit": "771cc597daebf9b4aa308f8b350af91a515b44c9", - "sha256": "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g", + "commit": "3539c3c724c52be88bb26fdc92a5d09a24c9cd86", + "sha256": "0lj3lf0i2491rqfxplcgf8nx9xpazygb2q0hynpq6rq5dkqdd63x", "fetcher": "github", - "repo": "jacobono/emacs-gradle-mode", + "repo": "scubacabra/emacs-gradle-mode", "unstable": { "version": [ 20150313, @@ -52309,11 +52438,11 @@ "repo": "clarete/hackernews.el", "unstable": { "version": [ - 20240214, - 1452 + 20240405, + 807 ], - "commit": "34423948fd37e9f6904e4e3f6d103e311017ed09", - "sha256": "1b1s5bkrcsr7kzzm2ck5gwr21gn7r78grhis3zdrjnnxcny7pr5z" + "commit": "7c1e9de10fd6b299d45b383302d223d7e3285da9", + "sha256": "1006qy4hccjyr056rywnvmc65hypz1fi7j48vlzj2r7c2mqkcns5" }, "stable": { "version": [ @@ -52333,11 +52462,11 @@ "repo": "idlip/haki", "unstable": { "version": [ - 20240227, - 1029 + 20240412, + 1016 ], - "commit": "0854346035d9070d347e4de710af41b293b85fb2", - "sha256": "0xb4bgb6cd92h7s0w440b25jli5ss7j910njrfmp5ifwraxjl0jm" + "commit": "a564a4feab9e1bd7f022128934ed55c83d120b69", + "sha256": "0f3mhvfmvjmkr0lncykkv95n8v5c8nygq209c4b76kwbap06lhcb" } }, { @@ -52514,15 +52643,15 @@ "repo": "alphapapa/hammy.el", "unstable": { "version": [ - 20240306, - 3 + 20240423, + 407 ], "deps": [ "svg-lib", "ts" ], - "commit": "d06064633cb142cd52bfa65400fd243eb656ada8", - "sha256": "1gk7plcykxzi148cm2z0j731ag01fn54sj1k58nqy541n21qgk9f" + "commit": "e3b2e365140abd87537edc09cd87fb04268bc439", + "sha256": "166wjgkdrp2gdw10a8bkpqbiaqhhxlwmk80ia9djnz6js50hx8xq" }, "stable": { "version": [ @@ -53150,30 +53279,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240320, - 1528 + 20240425, + 825 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "eae4f5a24a2a5d9fac0ec1a9200362bf9efa911b", - "sha256": "1szf9whxq9xd3nn45wg0y6z2xc3g8rcahh3v28aw1v7p7pj5f1y4" + "commit": "753563ee010e865f3f0fd9d491c2052eb1347fd8", + "sha256": "103pnnki9338ahgz1z2jfl5fyix19mvlsq0cvgn1pnd7h75v14r9" }, "stable": { "version": [ 3, 9, - 7 + 8 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "b04272a53e5b2db1fc7724d4ba84e51fd20e9c4f", - "sha256": "0f7vwrvxg83gril2y5qm4469nzhy51dg49zn643pni6cmhz7r9mx" + "commit": "6ae44dba0cb72a3a6950cbe36d104db9c69dfb49", + "sha256": "01lqwqjgg1m7ixm160z88cv6mbacs1vxbkvzcgns0lspxckvl1b1" } }, { @@ -54043,26 +54172,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240324, - 1909 + 20240411, + 1719 ], "deps": [ "async" ], - "commit": "8068f5301cd1a8495dee6882de99ffec6f89f55f", - "sha256": "0h8g1hjkslhbm371kpsh1gqipl4zlva2fnvgqyspqmgmdpb8g49i" + "commit": "6ae44dba0cb72a3a6950cbe36d104db9c69dfb49", + "sha256": "01lqwqjgg1m7ixm160z88cv6mbacs1vxbkvzcgns0lspxckvl1b1" }, "stable": { "version": [ 3, 9, - 7 + 8 ], "deps": [ "async" ], - "commit": "b04272a53e5b2db1fc7724d4ba84e51fd20e9c4f", - "sha256": "0f7vwrvxg83gril2y5qm4469nzhy51dg49zn643pni6cmhz7r9mx" + "commit": "6ae44dba0cb72a3a6950cbe36d104db9c69dfb49", + "sha256": "01lqwqjgg1m7ixm160z88cv6mbacs1vxbkvzcgns0lspxckvl1b1" } }, { @@ -54266,37 +54395,6 @@ "sha256": "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h" } }, - { - "ename": "helm-dired-history", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0qciafa42rbw0dxgkp5mbbwbrcziswmwdj2lszm0px1bip4x7yb8", - "fetcher": "github", - "repo": "jixiuf/helm-dired-history", - "unstable": { - "version": [ - 20170524, - 1046 - ], - "deps": [ - "cl-lib", - "helm" - ], - "commit": "281523f9fc46cf00fafd670ba5cd16552a607212", - "sha256": "1bqavj5ljr350dckyf39i9plkb0rbhyd17ka94n2g6daapgpq0x6" - }, - "stable": { - "version": [ - 1, - 3 - ], - "deps": [ - "cl-lib", - "helm" - ], - "commit": "281523f9fc46cf00fafd670ba5cd16552a607212", - "sha256": "1bqavj5ljr350dckyf39i9plkb0rbhyd17ka94n2g6daapgpq0x6" - } - }, { "ename": "helm-dired-recent-dirs", "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", @@ -54430,35 +54528,6 @@ "sha256": "1lqih8qadk1miwi8fv7syfd7i2rzbg669b96my177g0i57sah4mw" } }, - { - "ename": "helm-etags-plus", - "commit": "e5d0c347ff8cf6e0ade80853775fd6b84f387fa5", - "sha256": "0lw21yp1q6iggzlb1dks3p6qdfppnqf50f3rijjs18lisp4izp99", - "fetcher": "github", - "repo": "jixiuf/helm-etags-plus", - "unstable": { - "version": [ - 20201003, - 1424 - ], - "deps": [ - "helm" - ], - "commit": "52598fe69636add4b62cd9873041de5c6db9b7ac", - "sha256": "1mpwka62lk040693hllb5hrsf4n5vwkx6khi9i9dbyyc5xgppjm0" - }, - "stable": { - "version": [ - 1, - 1 - ], - "deps": [ - "helm" - ], - "commit": "99512856918e485862ceb21460476adb0349f525", - "sha256": "08ddxp1hm0ckx6gq9yl6dhh0jrfb6f747snchykl3z5p0ayknvlm" - } - }, { "ename": "helm-evil-markers", "commit": "71e3618dc6a9f614397d251398c6304345949d9b", @@ -55929,14 +55998,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20230408, - 2126 + 20240421, + 1656 ], "deps": [ "helm" ], - "commit": "d3c23b63281ae7d1be7bd6ac0ea66dd0739deed3", - "sha256": "08d5i50nm651ak0kng420s8abl7gx7l0dgzr2a3hakyds06c5vgv" + "commit": "36bb948e239f21478939a6848c2b0a3985b27680", + "sha256": "18vr00vvra4sb91948h761k30bi9gm2vadyvsyk7r3jxmcyy1ixb" } }, { @@ -56128,8 +56197,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20240221, - 1146 + 20240403, + 2026 ], "deps": [ "dash", @@ -56137,14 +56206,14 @@ "org-ql", "s" ], - "commit": "bfff0b5517d55d01bf12de27e10a73c9a077767b", - "sha256": "1wnvrjx9r9f1ykfdafj9pz1b0n669bqmixb5q35kmahyjis8rswq" + "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84", + "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj" }, "stable": { "version": [ 0, 8, - 5 + 6 ], "deps": [ "dash", @@ -56152,8 +56221,8 @@ "org-ql", "s" ], - "commit": "bfff0b5517d55d01bf12de27e10a73c9a077767b", - "sha256": "1wnvrjx9r9f1ykfdafj9pz1b0n669bqmixb5q35kmahyjis8rswq" + "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84", + "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj" } }, { @@ -58505,20 +58574,20 @@ "repo": "tsdh/highlight-parentheses.el", "unstable": { "version": [ - 20220408, - 845 + 20240408, + 1126 ], - "commit": "438a1cb2563e2a2496be4678cc0df8d5b22caf5d", - "sha256": "0ixjai9w9x4sm1lx9yljl58r7ydbbjlkb0a2pbv316l8qph8w44r" + "commit": "965b18dd69eff4457e17c9e84b3cbfdbfca2ddfb", + "sha256": "0wvhr5gzaxhn9lk36mrw9h4qpdax5kpbhqj44745nvd75g9awpld" }, "stable": { "version": [ 2, - 1, - 1 + 2, + 2 ], - "commit": "438a1cb2563e2a2496be4678cc0df8d5b22caf5d", - "sha256": "0ixjai9w9x4sm1lx9yljl58r7ydbbjlkb0a2pbv316l8qph8w44r" + "commit": "965b18dd69eff4457e17c9e84b3cbfdbfca2ddfb", + "sha256": "0wvhr5gzaxhn9lk36mrw9h4qpdax5kpbhqj44745nvd75g9awpld" } }, { @@ -58921,11 +58990,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20230521, - 2306 + 20240422, + 126 ], - "commit": "768d92aa93c1894afb6f79feb5eb6b070ab24e4f", - "sha256": "1s0xiib43fp53srz57xcxkn91qxq8xcigbx0cwlcxnmjm772nfvl" + "commit": "c182a54a5ad0c7757be7fd5f18223528614a119d", + "sha256": "0rmdq00cgjfvi6pfcsmm0fk5wwplhirl5gmw76v0b983irmrg96c" } }, { @@ -58954,11 +59023,11 @@ "repo": "ideasman42/emacs-hl-indent-scope", "unstable": { "version": [ - 20230801, - 344 + 20240422, + 204 ], - "commit": "7734b40be12ab2ca34038896ec6223ecc82d89b4", - "sha256": "1psg26i8nxb4755dhjvp48j2wh5gm6rj0h1kqs8m6ivm18ns8mm2" + "commit": "b7816f73c1000975835ac28f54f8ecfc6648c0dc", + "sha256": "1jl1ica2idnrzcz7m1llvg6rak8kgdvjg7m3ymhlfbai2jycnw9f" } }, { @@ -58969,11 +59038,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20240209, - 218 + 20240422, + 211 ], - "commit": "f658eff775fea05fa6deabf59a5fecf99660fa26", - "sha256": "07fm45vjm0aqa67gk4acip6k3p1n5wcjvv60s0m830awipkw4w6v" + "commit": "f32c04519f544634bd8dedf55d8bc458d9f64766", + "sha256": "1s5qvh12fnm1ryqvdf12p2czn796yxlgjcmxqhgxx8j3qplc47y9" } }, { @@ -59006,14 +59075,14 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20240101, - 2217 + 20240415, + 1538 ], "deps": [ "compat" ], - "commit": "7146bbcab5248f3fb9d09acb981b8e63f0c73413", - "sha256": "07q4piqxbwig12w4sm332v5apw2ph2frvm25jyxpfqsi59ri5vcz" + "commit": "36b66cde5777943ca0f190ad7a33fae3b2f6a404", + "sha256": "0v9mrkqxbvjpx1ynx8pja5djghwnix80vkbazrfv39j7shmx2dkh" }, "stable": { "version": [ @@ -59036,16 +59105,16 @@ "repo": "narendraj9/hledger-mode", "unstable": { "version": [ - 20231001, - 834 + 20240415, + 1812 ], "deps": [ "async", "htmlize", "popup" ], - "commit": "1b9c65298c34933d6667773d7fa1e89c9841038d", - "sha256": "1a0mdclam4s7f8cbikzcb17613x42bq0dyzbsxy1fqgil5n3qhv2" + "commit": "5492509a23047f0a1f05a112b47fa34eba7c5e1d", + "sha256": "1kwg5bi4290ak6zvnv85rhqim0jiyx49x0nzjhj09863p7fn4l1h" } }, { @@ -59203,38 +59272,6 @@ "sha256": "0czvnk74988p6gqz5jz83gkvvqdrdmzn4qz6cc8dmbyxk1zg6l8y" } }, - { - "ename": "homebrew-mode", - "commit": "1e4007f6d15574098722fb427b6a9903f77afb21", - "sha256": "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj", - "fetcher": "github", - "repo": "dunn/homebrew-mode", - "unstable": { - "version": [ - 20220907, - 1656 - ], - "deps": [ - "dash", - "inf-ruby" - ], - "commit": "e32da1397ce176766e39c286861ef4c40d64bbf5", - "sha256": "1nslh3k6nvx5cgk2zjrfh9lhwkrs089p0hf93p0k8all3pvb7jbz" - }, - "stable": { - "version": [ - 2, - 0, - 0 - ], - "deps": [ - "dash", - "inf-ruby" - ], - "commit": "8c04b040656dc99719efd7663c10f26f74df4a47", - "sha256": "0hqpj9fqq0b4nj7ya93jgkagafixqkinyr7qj8dsy2j1q458ynzf" - } - }, { "ename": "honcho", "commit": "76487b6776d148325c0200d2f788815f115feac9", @@ -59320,11 +59357,11 @@ "repo": "axelf4/hotfuzz", "unstable": { "version": [ - 20240114, - 1729 + 20240414, + 842 ], - "commit": "0d89041ca494432d79e85b0454f21a75c6e21925", - "sha256": "1dax67xvi5pd1m5xp8f77ay3rnr28dyn1is8fj5dsn9cqxbqyzpx" + "commit": "864d07cadb0ecbbf6c296db6ecfbb38358436e21", + "sha256": "0r3slrzhbzgp7a48g2mg7q5yf3cx3xiz0vwjm50yq93xw4mxig8g" } }, { @@ -59608,11 +59645,11 @@ "repo": "hniksic/emacs-htmlize", "unstable": { "version": [ - 20240212, - 1001 + 20240422, + 1351 ], - "commit": "09d43dfa44899f194095bb3500a45ec5b34d59c6", - "sha256": "062ipq90mmjflp7syx5fpy0zykmdv1cjsd2baidbrydv9jzp2qzl" + "commit": "54ac89c5edc7a83344cf51d8be08e1e701f88863", + "sha256": "0sw9jc860fhlljq9s61qz6cgg2cf43zi2l0ff6mp4np5rdiyrwjd" }, "stable": { "version": [ @@ -60053,17 +60090,17 @@ }, { "ename": "hyperbole", - "commit": "eeb6ed97ff5b0e63f5f10a4339d8f790806a6efa", - "sha256": "0v48smnd7bm65mjz2waahyi2favbsmynigya5s6xyhx0h6y3apxv", + "commit": "cc0dbece50cc4f6eb35f6f6a80af8ca2774410b5", + "sha256": "17q2rbk8k9hxawlwb8xz9l2jyjqsggl13izp3dnpm5xschbsm781", "fetcher": "git", "url": "https://git.savannah.gnu.org/git/hyperbole.git", "unstable": { "version": [ - 20240322, - 1628 + 20240420, + 1609 ], - "commit": "2a10d5edf945a2faa89e59744a3b37ede7496010", - "sha256": "0nqih5cqbcs5l2s2kz57682gmkcajd3h7vlvs7nhkril99s85c9g" + "commit": "31c60562fc3b2c23719b2c617be8a65bc5d128ff", + "sha256": "18k4n5z33275p4idh3r5i1ym148lvnv4r88pqbwh2zb9wg4z1y1c" } }, { @@ -60074,8 +60111,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20240226, - 743 + 20240424, + 1953 ], "deps": [ "compat", @@ -60085,8 +60122,8 @@ "taxy-magit-section", "transient" ], - "commit": "9895acdd1bc14e9a63e3b6ef050510a67ae59e7d", - "sha256": "04x951f267gca33vjlzq4fh1xk1py9m9v8qkbsygv19rhqicad4z" + "commit": "3d509c7a5998511c2951eedcd236e5939c8c0fc5", + "sha256": "0z3ybggny7b7n3fnl4kpg4fgzqh4pdn0v55lsbrbfibvszhbfwxs" }, "stable": { "version": [ @@ -60267,11 +60304,11 @@ "repo": "mkcms/interactive-align", "unstable": { "version": [ - 20220629, - 1241 + 20240326, + 1233 ], - "commit": "bc4d30d79f2f4b413288195ef19894ac0fd258b7", - "sha256": "18hldv1id2s3rhh6bsxnv6g0lvw912vlgidwz8540nl6j9vr64dv" + "commit": "764aea597b8c9292da2d91294bb6a70e7ad7d6d7", + "sha256": "1hdkkrcs86xmw6j5z7bqqvk4kdsf4a8ksr9bfzwkfs8sc68314zv" }, "stable": { "version": [ @@ -60662,11 +60699,11 @@ "repo": "ideasman42/emacs-idle-highlight-mode", "unstable": { "version": [ - 20240222, - 2257 + 20240421, + 647 ], - "commit": "cfb4efba3bbe1f697f6545bee98c479c3f1081b0", - "sha256": "1z14xbvmc87dxs9l8igsrd8y70rhmgw4cljmw6q8znhl2733mbj1" + "commit": "531be0c2d6dc13c525138c1c9a0f59ac42268f58", + "sha256": "1vklsfac0m6wm9mlb7pdrwr0b559qgyvndbkl6221b3dvz0jnb96" } }, { @@ -61080,15 +61117,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20230802, - 854 + 20240423, + 1320 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "37c6b819903191acd85c56ef6f7ccf579b57eea4", - "sha256": "1m01n454rsj32w4pvg5y2c9jh88agf81w4x3fmvknjqncx9f1mv8" + "commit": "aa580b61eb3d409ae9ceb141547937ad27fae24c", + "sha256": "0ylb8my9qs9agqv6i7xj4lgca2pg0cdlqagn345pydjhgd8n5cbx" }, "stable": { "version": [ @@ -61366,14 +61403,14 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20240101, - 2217 + 20240415, + 1539 ], "deps": [ "compat" ], - "commit": "769e13579ed19fba1fcb6de7036f5cc9357eb1a7", - "sha256": "0pfmrfndx1mwk21grb3kn50yxszm0yifyg3284xy4b60nk4gma6b" + "commit": "55c86a15fb253c7e351d55e762ece0a15dc816b9", + "sha256": "1svvjgp7ndn4i9rrg5idrqinhpfnmw0m5s5f4nr3c0zp44l2xn4i" }, "stable": { "version": [ @@ -62156,7 +62193,7 @@ "islisp-mode" ], "commit": "423b84fe4cc6944e36971225b3e19c888e7e4690", - "sha256": "174zjlgcikaydgx5npsbwqblzc61pxnnpw50nia8jhh8175j2sbl" + "sha256": "0m3vxm4q5kbdn3q524z50zvwdk63gixaqxw9qxa6d175iv0xfwv8" }, "stable": { "version": [ @@ -62168,7 +62205,7 @@ "islisp-mode" ], "commit": "18258f7134cfd8e0bd12538351b3cd23ae44cec1", - "sha256": "174zjlgcikaydgx5npsbwqblzc61pxnnpw50nia8jhh8175j2sbl" + "sha256": "1s6alrv1hfi1plj5lh826j0h71xvm2v092kglj3yvy34g73dgrna" } }, { @@ -62434,22 +62471,25 @@ "repo": "chaosemer/init-dir", "unstable": { "version": [ - 20240320, - 2117 + 20240326, + 2204 ], "deps": [ "benchmark-init" ], - "commit": "90abd62ab6d2db311c92671c73228d6d80849930", - "sha256": "1jd0wm6lf6jrrm5c3yd96rwmmxnnzqk89n8c1l6gsnyxb01cnnc0" + "commit": "5f351041b0f81bfbf81437ce1d39bbd37de9319d", + "sha256": "0nb8y9jyrig1217pfddbcfsdfbvqchs8fvyi0hic283c2lygycsy" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "93e8ae3a83d4b90b84076a26ad7d34de4595b686", - "sha256": "06yydk6w8sg0hbwi4l6h5hvq39vb44ya4kx820cgp5y9zk6khsa3" + "deps": [ + "benchmark-init" + ], + "commit": "5f351041b0f81bfbf81437ce1d39bbd37de9319d", + "sha256": "0nb8y9jyrig1217pfddbcfsdfbvqchs8fvyi0hic283c2lygycsy" } }, { @@ -62460,14 +62500,14 @@ "repo": "emacs-jp/init-loader", "unstable": { "version": [ - 20210703, - 902 + 20240401, + 103 ], "deps": [ "cl-lib" ], - "commit": "ecab5a66b40227c4173992adfa5cfeae09f1657e", - "sha256": "0fkxv7i7jdlj0z5n4hfm8897pfy6jxmk8znpfr9564ay90cp445h" + "commit": "4ed535f887eb7ac72aedf282b7e4f5a2f7cb7582", + "sha256": "1q3fkds0cl9q7z3w2jqqisyblq09whcf2087h0wzl64zwg8ikz07" }, "stable": { "version": [ @@ -62660,7 +62700,7 @@ 2108 ], "commit": "8f13262ebcb3f271f1d188584d04ca6d87214111", - "sha256": "0cqc23y9n63a7kl2p1zrfcsxnclfxcszfmbh2hmbrs6q05ys0kzg" + "sha256": "1aa6c9rswwgxyh8js0bnjrzcmyqc1az7vr5m68lbbmsbjb495awq" } }, { @@ -63006,6 +63046,21 @@ "sha256": "0v7qxdwp98zk6l7y4pkl7wp4pvxdahp5af76ygs2j05ff1sm1s7r" } }, + { + "ename": "ipe", + "commit": "335a26c767f410d28cab56ec8212fca423a39fec", + "sha256": "08dv1kxsmfs123glg0nbcqmadj2x221l4lszb2mza8wxwm9ylz00", + "fetcher": "github", + "repo": "BriansEmacs/insert-pair-edit.el", + "unstable": { + "version": [ + 20240428, + 218 + ], + "commit": "f1a7c5d464a937ec87c23a4a0bb41207eab07adf", + "sha256": "0ia0d3qw34l04phl75injihgi3i6m0299d1kj0wvdvm6b8ah5cnz" + } + }, { "ename": "iplayer", "commit": "6e9a97667365f1c30f53a6aeeb7b909a78888eb1", @@ -63339,7 +63394,7 @@ 1 ], "commit": "18258f7134cfd8e0bd12538351b3cd23ae44cec1", - "sha256": "174zjlgcikaydgx5npsbwqblzc61pxnnpw50nia8jhh8175j2sbl" + "sha256": "1s6alrv1hfi1plj5lh826j0h71xvm2v092kglj3yvy34g73dgrna" } }, { @@ -63536,11 +63591,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240214, - 2118 + 20240405, + 2019 ], - "commit": "749ac1235a7948011cb0caddd4c31037e3314614", - "sha256": "0d598jxdrxjlszaikh27v7j2zdndisfqzb384d94siw4rwzfj4zr" + "commit": "a38bc60eb78e38304d1183d98d4fc76671263ee1", + "sha256": "0vi26fpm6pyhi7475pgs73prrb0yw4k6nss02b7536p2pjnaxckq" }, "stable": { "version": [ @@ -63662,39 +63717,6 @@ "sha256": "1jlax3qymv8j516g319cqs8q6vq34pdrlg7mwwb2vsklynd291c5" } }, - { - "ename": "ivy-dired-history", - "commit": "ad37f6b04ff45fbffeadefc94db16baa27bcc2ac", - "sha256": "1vj073k5m0l8rx9iiisikzl053ad9mlhvbk30f5zmw9sw7b9blyl", - "fetcher": "github", - "repo": "jixiuf/ivy-dired-history", - "unstable": { - "version": [ - 20210715, - 48 - ], - "deps": [ - "cl-lib", - "counsel", - "ivy" - ], - "commit": "dba848929cb063a5536cb442c70be1099e2f5baa", - "sha256": "1fkw82am49j49s0s3ql22hl9i2imypb0xkrmsgc7sr2hfsim56sd" - }, - "stable": { - "version": [ - 1, - 0 - ], - "deps": [ - "cl-lib", - "counsel", - "ivy" - ], - "commit": "3604840f85e4ff2d7ecab6233e820cb2ec5c8733", - "sha256": "0slisbnfcdx8jv0p67ag6s4l0m0jmrwcpm5a2jm6sai9x67ayn4l" - } - }, { "ename": "ivy-emms", "commit": "12b434e4c78b3428ee144559cb57ea41df8fb4c5", @@ -64609,7 +64631,7 @@ 1017 ], "commit": "c2ad37e2ada14b5551a83211cc4692b39be4e5fb", - "sha256": "18ibnf995yymgxv7xz7xql6lnix3sxn6pn659b1vp00g5d5yl2jf" + "sha256": "05izmyp875pfbpygy54ybwkxnjv3fmam024pkjd70i5m6xmg4wi6" }, "stable": { "version": [ @@ -65306,25 +65328,25 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20240311, - 821 + 20240415, + 423 ], "deps": [ "compat" ], - "commit": "b09efcb85b1a8db8054a3d5a298e8d9516836f16", - "sha256": "0dyfj85h54v3q8fb5sni3xvan78np1xrx4w2mnbsf95z4kac91mh" + "commit": "77cac7f240f45d6c4836e844bd68151c7f863298", + "sha256": "0paid82g8q7spbi4qb10vbg8izjw7347psybfpww4q0fsjjn6hhj" }, "stable": { "version": [ 1, - 4 + 6 ], "deps": [ "compat" ], - "commit": "b2ef3af2857896e20cff0488c46a4bfcfee39ecc", - "sha256": "14zamk2s20f6dnv23v9snya0mi1bs2nq6xpp5bj06kiymzwhcqjw" + "commit": "f4abad42cd0bdcff62ac325a644cb8faad186a4b", + "sha256": "0kl9jpd6a68q1s3lc74jkx0nsk66lpwg7zx61a5h0w0m410l1g1q" } }, { @@ -65415,11 +65437,11 @@ "repo": "ideasman42/emacs-jit-lock-stealth-progress", "unstable": { "version": [ - 20230808, - 1342 + 20240422, + 105 ], - "commit": "46d7a8a02a01c81125e35c81fdec5295bb4cbcd2", - "sha256": "0gzp5ml553kz5abh6fby11h4f3fqrbl8p5vr21c9yifc7wwjhc37" + "commit": "8f517230266faf1decb8e948110baef7539c9df3", + "sha256": "0n78ijl1z1rlyx8y83c71rhwf63lzicc39d05myj25r31may5k2l" } }, { @@ -65460,11 +65482,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20240213, - 1405 + 20240425, + 1650 ], - "commit": "a307c5c1ddc2f32199b52f8183b72a0648d4a4e1", - "sha256": "15x9brm62zg9k1y69xp3hana27xrzrw099rnfzkvi2palgi7s6w5" + "commit": "7c88ff37c2a957a5d07be7a1c878b3325b55f719", + "sha256": "1fkf605g0g2vp9ls3g7n4fkwy9p24iyr4k02rfwfqj2m04gzzhws" } }, { @@ -65845,14 +65867,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20240310, - 1755 + 20240418, + 6 ], "deps": [ "cl-lib" ], - "commit": "e92829da3d6387252a0a5737c0c5344cb3de1578", - "sha256": "163s57j12fcigr096m3rgw07nnhs099dij6x4k9vs3005jy43a8p" + "commit": "9b90d31ed968e5c51bd3e279d4003248ea896807", + "sha256": "0rn4kwisv6mxhia8a2w2z9iqkp5h64i83sqvmlpnayswh7s88pcy" }, "stable": { "version": [ @@ -66026,26 +66048,26 @@ "repo": "json-emacs/json-mode", "unstable": { "version": [ - 20240228, - 1443 + 20240427, + 1245 ], "deps": [ "json-snatcher" ], - "commit": "72f340d3fb4b796589e75cb5985797a7f177f34a", - "sha256": "1yy440aaf17y6nrlcq0phz0x5j3wcymcrdm8pm0rmwdxfmar0csx" + "commit": "77125b01c0ddce537085201098bea9b4b8ba6be3", + "sha256": "16jf8nrbxgwr7a5sgx088j9ymyvh4r6hnc65nqr0vgdjb6w1h598" }, "stable": { "version": [ 1, 9, - 1 + 2 ], "deps": [ "json-snatcher" ], - "commit": "72f340d3fb4b796589e75cb5985797a7f177f34a", - "sha256": "1yy440aaf17y6nrlcq0phz0x5j3wcymcrdm8pm0rmwdxfmar0csx" + "commit": "77125b01c0ddce537085201098bea9b4b8ba6be3", + "sha256": "16jf8nrbxgwr7a5sgx088j9ymyvh4r6hnc65nqr0vgdjb6w1h598" } }, { @@ -66366,20 +66388,20 @@ "repo": "llemaitre19/jtsx", "unstable": { "version": [ - 20240315, - 1515 + 20240418, + 2018 ], - "commit": "e2fb775b30c2eadd33413d6b1dbdc41ba155c1fe", - "sha256": "1215g39mryl36ag5l1pbza7ll1wxd5q37kf8m90dddv9kkzag1a2" + "commit": "32dec6d5d5725a7fe2d50537e46c224349008896", + "sha256": "1g82cfkkv7vjsk29bfjjwjhwark1h371pzrfqnrm5sfpyn1h3nxv" }, "stable": { "version": [ 0, 4, - 1 + 2 ], - "commit": "cd84f2d021d8fd1b06dc594bea2f7d8ce753ad2d", - "sha256": "1k3rqi3kg84b420m91ycw7r2j42r17jks9a6v0b57lcdcvjbyccz" + "commit": "32dec6d5d5725a7fe2d50537e46c224349008896", + "sha256": "1g82cfkkv7vjsk29bfjjwjhwark1h371pzrfqnrm5sfpyn1h3nxv" } }, { @@ -66408,11 +66430,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20240315, - 1726 + 20240409, + 1316 ], - "commit": "2dfc869ff6b3878407fe7226669dfaae8d38d541", - "sha256": "0hqriyh857rvsdhp3pvv3diikaccf7lrjszpmkaaxjyr0d93p2z7" + "commit": "60f23fea669add4a1624573eb6383f4180f5a6c9", + "sha256": "0lsypckp0ghdbqbrw4m9dgq3w8bmyn15mv6iiya9f84bm6r60dn2" }, "stable": { "version": [ @@ -66431,14 +66453,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20231026, - 1005 + 20240408, + 850 ], "deps": [ "s" ], - "commit": "4947319bc948b3f80d61b0d65a719737275949b8", - "sha256": "0vfpc4glkbl4ccz34i6fx9ny6zl9h69lw0sbv2rr526y7rr1cr7a" + "commit": "801d0fc3d8f6f08f66a11515e6517739a0b312a1", + "sha256": "074m8hzg66j9xk44l5qh3fdzwbs5sn97nlwnr5b097431hxwk119" }, "stable": { "version": [ @@ -66479,8 +66501,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20240310, - 1510 + 20240428, + 522 ], "deps": [ "dash", @@ -66489,8 +66511,8 @@ "s", "spinner" ], - "commit": "a25ce847480a0c2bed24fad3f1ee62904c9c93a5", - "sha256": "07pcdfccsjf51389nivrxiqldvrb2gywqin7s7qy8ci684c6cpzi" + "commit": "a63ee2a61efd6af2d6a597bfa40cc98630406a8e", + "sha256": "15qqhpbak60bskws5hc6k02089vyzrhivj91jykzi38jzz3vy808" }, "stable": { "version": [ @@ -66511,10 +66533,10 @@ }, { "ename": "julia-ts-mode", - "commit": "fd6521584f31c6d349aead6647b58fddbc1529c9", - "sha256": "1m6hm69pc1m47bk09cwlv544bkqy552nqg95w3shch18kslgli8n", + "commit": "eb0042c1f424c8fd6c051a4e6d537eed839742f1", + "sha256": "0ga7mwsf1qmwzkrjcj5fc7xa5qyzbh2xr8lphk3i7j6jazp1ff9c", "fetcher": "github", - "repo": "ronisbr/julia-ts-mode", + "repo": "JuliaEditorSupport/julia-ts-mode", "unstable": { "version": [ 20230921, @@ -66700,8 +66722,8 @@ "repo": "emacs-jupyter/jupyter", "unstable": { "version": [ - 20231204, - 529 + 20240418, + 1642 ], "deps": [ "cl-lib", @@ -66710,23 +66732,23 @@ "websocket", "zmq" ], - "commit": "da306a6dbda6f1e285281765a311938a1d9db022", - "sha256": "10inpbqnaqv1f8w2k9cv9dnczb547p3yw9dlndx3d8fwrryql40q" + "commit": "f1394d303be76a1fa44d4135b4f3ceab9387a16b", + "sha256": "0346ws7ym873dc3xbmpzlg371v0rgclz93hbfzcld7gv4g1dncfb" }, "stable": { "version": [ - 0, - 8, - 3 + 1, + 0 ], "deps": [ "cl-lib", + "org", "simple-httpd", "websocket", "zmq" ], - "commit": "455166712e606c9c6a8de763ea0a77548cadcef2", - "sha256": "0acn964xlpn265vry35lrkkpf9z5y4ml96xg8ifadkxwxymm1sh2" + "commit": "2059d79b2fecf6d25a6c796b69ab954645ec37d1", + "sha256": "0rf8d83bzc05v0w7zpqwcd89cdvrxwzpyf55vmmzj5j755bgxvhs" } }, { @@ -66737,10 +66759,10 @@ "repo": "leon-barrett/just-mode.el", "unstable": { "version": [ - 20240312, - 1626 + 20240424, + 1809 ], - "commit": "57d854c26033c2f629b63fa4be90236fd3015278", + "commit": "4c0df4cc4b8798f1a7e99fb78b79c4bf7eec12c1", "sha256": "0lxx22hp1j7q6cjr5ryiymkf7d70pcn5blihrd45h0h5swjx85fl" }, "stable": { @@ -66970,25 +66992,25 @@ "repo": "bram85/kagi.el", "unstable": { "version": [ - 20240323, - 905 + 20240424, + 2021 ], "deps": [ "shell-maker" ], - "commit": "407781fe4e24e7c57a4751c43b16ae6a69d297f8", - "sha256": "0nfsnx4ll3m8h4pj69kgcc8jn3sbldq3xgj0wkrr4x672fg6nyil" + "commit": "b3d45264fb25aa95130352c65bc87ec4659e6e71", + "sha256": "0jm4h2sbj7wn6s520zi62l9iqggp2q5whpncc1mb3ckfvwn0vhfk" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "shell-maker" ], - "commit": "0570505cff30bf03afc44c4095791c99add9d11c", - "sha256": "013w68r9205m8q5vhzihawqvaliilspkzcs1n7ky9kpfvysqfnbw" + "commit": "a0e06cb928c2def572b4be0a19686e6997c83d92", + "sha256": "1x5nrdb2qvy66cbdvk0fc9bq8if3jqzlfnnqfc9y2ifgvh8hg1z5" } }, { @@ -67104,11 +67126,11 @@ "repo": "meritamen/emacs-kanagawa-theme", "unstable": { "version": [ - 20240325, - 305 + 20240424, + 308 ], - "commit": "fcc2960a911c74e041bc04a4c4b7fecf97f3d176", - "sha256": "0npqpbpqy5x4f6zj4gjlg6pv8ip935hv2wffid13rgb6pnd5w27s" + "commit": "dca0ee1e2978eb82b37c777d894dc447faa70619", + "sha256": "0ac5as108lsc89pggda52jskf110jx1mvdir5rmdpzrl9fdkacix" } }, { @@ -67149,16 +67171,16 @@ "repo": "magnars/kaocha-runner.el", "unstable": { "version": [ - 20230511, - 934 + 20240410, + 1348 ], "deps": [ "cider", "parseedn", "s" ], - "commit": "9ba7b47d3a3834964f7fcad389081b3b282f692c", - "sha256": "0slspzc3zppavmdnw8xpih1iiqyqbyx4mm286lz0naw7g4yrpb12" + "commit": "ab5b4f32c733e238bdf08e10cab9a0606675faa4", + "sha256": "0qjbaahx04nrasz75ni3s3snhpbrcrv0a6g3gqqjs6f7kw327laj" }, "stable": { "version": [ @@ -67382,26 +67404,27 @@ "repo": "jinnovation/kele.el", "unstable": { "version": [ - 20230326, - 33 + 20240415, + 2325 ], "deps": [ "async", "dash", "f", "ht", + "memoize", "plz", "s", "yaml" ], - "commit": "15e841fb7bbc08545534e466ce831d6e80fd8901", - "sha256": "1pb552y0fp8fhipsjc1k5h3mm76j2dn6q7pznbv9wb48hw4x7z3n" + "commit": "8f3c4515ae55376f49d2be338d876686a34d121d", + "sha256": "16c7787aspgki933h6393142hxlxz97wcnvg8l4w9c763i5fkqxr" }, "stable": { "version": [ 0, - 4, - 1 + 5, + 0 ], "deps": [ "async", @@ -67412,8 +67435,8 @@ "s", "yaml" ], - "commit": "4cf5a16980c81d0d0fab044b72ac6ecb0d9a7814", - "sha256": "1wb58g56p99yzdhxcm1iflfvh51al95kpq923qq0pqlz1vqc7b6d" + "commit": "642c415a833a7a2aa1fb577261b1e2ae0c4bbb72", + "sha256": "07yb4sdgzqwr7snpvmc72zvpc5aq37gmwbjq4b05rwcrhcv88kc6" } }, { @@ -67583,14 +67606,14 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20240304, - 1916 + 20240415, + 1539 ], "deps": [ "compat" ], - "commit": "ec90b16baa0e9e7eb43d8c38e6cf6dccf75a95de", - "sha256": "19sjfydyagcr3vh989c8v0payd36qj3al4j00jwaj49qb3ck8g25" + "commit": "04fa2c65f0ae901ed3015f691ea70f7658ea24b8", + "sha256": "088grlq97g5csb1w84mjj7ffc3hjg55aa2i2km63xqx112l7h3m1" }, "stable": { "version": [ @@ -67686,14 +67709,14 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20240101, - 2218 + 20240415, + 1539 ], "deps": [ "compat" ], - "commit": "868c2b37abebc78c7dff72e1cb2ca85b93d07537", - "sha256": "0xrfmi4fcliag59cbrsxwdy9fblswn9iyjdfrp973jbkb5dkzwr6" + "commit": "06572084a7965b86262d7f1b52c32ed2dde86a9e", + "sha256": "1mlf3g1ywbh4xk5fv0nq9fw6c39xh9r87csr8c09dkrjlgp0fagn" }, "stable": { "version": [ @@ -67878,20 +67901,20 @@ "repo": "hperrey/khalel", "unstable": { "version": [ - 20230606, - 1909 + 20240314, + 1347 ], - "commit": "85df973fe2785caee08d4ef5b23bdaae424a8d98", - "sha256": "1k88v8cg1b2dkb9v1jxmbl2sx22gz7xqqppbrnmlafyf3m3bg2hv" + "commit": "9dea9e45ebb2364f9fe873ca773b9324b34b720f", + "sha256": "0gqwqhbg4hjlgln5gvkppq3rx2iwrqpdp9ivwspnpfqxrn1b8ihd" }, "stable": { "version": [ 0, 1, - 10 + 11 ], - "commit": "85df973fe2785caee08d4ef5b23bdaae424a8d98", - "sha256": "1k88v8cg1b2dkb9v1jxmbl2sx22gz7xqqppbrnmlafyf3m3bg2hv" + "commit": "9dea9e45ebb2364f9fe873ca773b9324b34b720f", + "sha256": "0gqwqhbg4hjlgln5gvkppq3rx2iwrqpdp9ivwspnpfqxrn1b8ihd" } }, { @@ -67932,28 +67955,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20240314, - 1838 + 20240427, + 1312 ], "deps": [ "dash", "transient" ], - "commit": "fba0338787b3197e22d6b4ea7dc94be153be7396", - "sha256": "1h686dk9ghkx99bcbs1zf4z0pw69h85lr9a85pdm3am8k3rbxg4i" + "commit": "12258f02d7c526bc1c91afddbce165f78c3e8a7a", + "sha256": "1g863m2h3xss2aq3xqvh271rjrgzdld7p3qhglc6xz1qn6pvv41g" }, "stable": { "version": [ 1, - 7, - 0 + 11, + 1 ], "deps": [ "dash", "transient" ], - "commit": "fba0338787b3197e22d6b4ea7dc94be153be7396", - "sha256": "1h686dk9ghkx99bcbs1zf4z0pw69h85lr9a85pdm3am8k3rbxg4i" + "commit": "12258f02d7c526bc1c91afddbce165f78c3e8a7a", + "sha256": "1g863m2h3xss2aq3xqvh271rjrgzdld7p3qhglc6xz1qn6pvv41g" } }, { @@ -68389,11 +68412,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20240318, - 1601 + 20240417, + 838 ], - "commit": "5cf2ab3a50ccae4eb23482f5d0a615fa2d22504b", - "sha256": "17qdsfb5vbfk1dfj5314xq3i0k5gk1l9893pqbp8ijad0hs5lvl5" + "commit": "a8747af6465b384941ce8f199bdfecb3d0c09812", + "sha256": "044i01kvpilvj6f8h4xn9a0kkpbmq724adphj51pvibv736w4k4s" } }, { @@ -68526,8 +68549,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20240201, - 2021 + 20240419, + 1521 ], "deps": [ "dash", @@ -68535,8 +68558,8 @@ "transient", "yaml-mode" ], - "commit": "7affc4269e2a2925f68f073863af0929854002f2", - "sha256": "1956rr9wpdq9zfqks76r21j6hpq5fyvnxia1dqi4hfngyqkfkn2p" + "commit": "eb41a6420d20142e5cd33cd34e17654294c99c86", + "sha256": "1zqm65vng1fiwfra21hz0xqnbiqh97av8jr981rczxin0byic66a" }, "stable": { "version": [ @@ -68817,8 +68840,8 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20240317, - 1949 + 20240404, + 736 ], "deps": [ "async-await", @@ -68829,8 +68852,8 @@ "request", "s" ], - "commit": "bd88c08c02203a66048412672b894c0d7dab3da3", - "sha256": "0zxxa99n3wh77fm03mpnz2kxhgs6x2gqhznxh2gy5lx1yd8kg7jp" + "commit": "ca6a02c567adb562305d0887140d631e2d6f01f6", + "sha256": "02q2w84rpq0cl7crl6k875wj5g1gq5w1kqlr2whq3jwv1ajfcyg1" }, "stable": { "version": [ @@ -68937,16 +68960,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20240130, - 1533 + 20240425, + 941 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "bc447c9ab7f9a6ff6b30cabab467f445e30ae86c", - "sha256": "13qnkhb68v62q6v4ydzn15qrdkz7whxpa7birnh0rqha39shxb6d" + "commit": "a4bc3a492ff542be2989b545362cd98ed38412e1", + "sha256": "1968s3bmwhjrvp2lrwbjkjij0xl3s6isxy1fhdkhrpin0iyfizy9" }, "stable": { "version": [ @@ -69110,11 +69133,11 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20240205, - 2150 + 20240325, + 1223 ], - "commit": "1ad782d7e448c1e8d8652861f01f4a58315826c3", - "sha256": "153810jq4rbgpzvbhz2i1dyrj8bmdf4zxsrhfg0b70iq4bh78bz6" + "commit": "c05a566ab5c938b31873b24d698c3d9ff0948ea9", + "sha256": "01rhxsbsn4ilkc9z2556lmpzvnx2d2a2xzmxq3932sd55al98whg" }, "stable": { "version": [ @@ -69446,6 +69469,15 @@ ], "commit": "e7c3b573fc05fe4d3d322389079909311542e799", "sha256": "0ciycsqzyj6ld60c7sfqjq59ln3jvk3w9vy606kqzpcvj01ihmv1" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "e7c3b573fc05fe4d3d322389079909311542e799", + "sha256": "0ciycsqzyj6ld60c7sfqjq59ln3jvk3w9vy606kqzpcvj01ihmv1" } }, { @@ -69522,6 +69554,36 @@ "sha256": "1p16vxai8dj1vy4ahflwij1ldx00jzrjcinpgpc7wgh6ka748v11" } }, + { + "ename": "lazy-ruff", + "commit": "fa727e3b6572b6c5c6469e06b4b6083b87047823", + "sha256": "07bp5ris4wr8dhbn55nj6zynd7dw5476dnjj1slz9z3yq15frmkh", + "fetcher": "github", + "repo": "christophermadsen/emacs-lazy-ruff", + "unstable": { + "version": [ + 20240402, + 2200 + ], + "deps": [ + "org" + ], + "commit": "c180bb6b0a1d9a65f8963d1b67f09086412bd95f", + "sha256": "1g22lqhp1zvikw5i9r3njsfyy4mn0n9xhiq514k9hgvn6y4rglvz" + }, + "stable": { + "version": [ + 0, + 2, + 4 + ], + "deps": [ + "org" + ], + "commit": "114fb5a892a89b5736df5bbf59eede0bede0f800", + "sha256": "1a2sn0jjcdya9d2z2r4banybkynwcrg96khnlqixkm0q7zbdasw2" + } + }, { "ename": "lcb-mode", "commit": "fd1380a9ba363f62f297e3ab2995341258b51fd1", @@ -69873,11 +69935,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20240324, - 1619 + 20240423, + 445 ], - "commit": "34a74306ec9e0f542fd421fd4b7edd2e99d8e94d", - "sha256": "1fpgzkjszyd4nrxp0qxn8r7475rzplvz7clm4j4agv7nzjkp8m0m" + "commit": "c66e3e9adfb5d91f83a401387fad345f12004c8a", + "sha256": "1i0rar36xzv2gqkn8cn29m5xz0pwmd5y5in8iac2h2fcxvd48vc5" }, "stable": { "version": [ @@ -70723,14 +70785,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20231225, - 1354 + 20240409, + 1250 ], "deps": [ "avy" ], - "commit": "9153eafc776549376bb85d9ff555fef83aca8285", - "sha256": "0bdmd8df8qhk48imk22sgwccyiw1xg9x6hmiwh4d8xiazj0fhaym" + "commit": "9ead085e9e6798ec4ea4791d9906d6655ea2b402", + "sha256": "055p9p6qnzhnlm97gnbjwk1dls796zsbsvcphlivkx4zlval099w" } }, { @@ -70848,6 +70910,21 @@ "sha256": "1czyiy26wxkxc2lbrrblz8hzpf8p71fyp4hh63vsdf2fyimyl1cw" } }, + { + "ename": "lirve", + "commit": "67708cb34ff0000d571b732792e7d7d82bd4084a", + "sha256": "160k3kpc0ldxzbqhnvd71jmslwjnbh8cmy474d07ccqjcsn8mkb0", + "fetcher": "github", + "repo": "tanrax/lirve.el", + "unstable": { + "version": [ + 20240419, + 1918 + ], + "commit": "ff3031fa82d854411da40a32c6191d201b4abf09", + "sha256": "1m4bg931w83vyhrpgsmdyl6hkknnd99mmvj34g0drhb9170sx0kb" + } + }, { "ename": "liso-theme", "commit": "27b849f3a41a5ae3d497cef02a95c92fd479b93b", @@ -70875,7 +70952,7 @@ 2206 ], "commit": "2b719baf0ccba79e28fcb3c2633c4849d976ac23", - "sha256": "1hlqairbjlrcbzb4r5fjm80znr9hdgny3vgm27dwwxxa340m0r6i" + "sha256": "0rxqam6cgi404m8n45mw73j3jdd2gb3iwpmyyixbv3cxfb7y1b0l" }, "stable": { "version": [ @@ -70884,7 +70961,7 @@ 4 ], "commit": "2b719baf0ccba79e28fcb3c2633c4849d976ac23", - "sha256": "1hlqairbjlrcbzb4r5fjm80znr9hdgny3vgm27dwwxxa340m0r6i" + "sha256": "0rxqam6cgi404m8n45mw73j3jdd2gb3iwpmyyixbv3cxfb7y1b0l" } }, { @@ -71270,15 +71347,15 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20231125, - 29 + 20240402, + 808 ], "deps": [ "dash", "s" ], - "commit": "a1a78f26dea70aac1c4df7f5767c8f5c1643d7d1", - "sha256": "1asy8g4jsivgqjjlbp8h3q0ksjjwdfvd0sp09ha8cm0n9f991201" + "commit": "ceddadc4f130626d3430fc8c5cfff71628221a60", + "sha256": "1chs7kpfwjl65p0m4zlgx3lhsixlis9bg3lilmlhw65436y7nl8s" } }, { @@ -71430,20 +71507,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20240304, - 1642 + 20240419, + 404 ], - "commit": "eafd9848fe6eeea14373c6969c3bd9e5e0838fe2", - "sha256": "0qzrv3m7drigvfzg7f5w26aksqy5nk47s8mzhrs3dlg9597xdkn0" + "commit": "bea9903bca0ece7546df9a00883f17e4eb49b4c7", + "sha256": "0mv9fsmjvixdk3db8j1cw7i2bgi2phwbdwwr0fq96azxzzgqh5jx" }, "stable": { "version": [ 4, 11, - 2 + 4 ], - "commit": "ae29b9dfca83a83037d780424a85d617cddd2e47", - "sha256": "0pj4hxi3cl1nhvbmqsh2vh654b20zvqychxr2i70nwhjax8yq6kd" + "commit": "bea9903bca0ece7546df9a00883f17e4eb49b4c7", + "sha256": "0mv9fsmjvixdk3db8j1cw7i2bgi2phwbdwwr0fq96azxzzgqh5jx" } }, { @@ -71544,11 +71621,11 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20240312, - 1636 + 20240415, + 1539 ], - "commit": "e73736d3bd3a8284a2d48266a0cfdb0c9b9217e4", - "sha256": "0f3ysf9rpy1pkg9czl8lblp97l1prv7qb6jsgs206mwbyg1lar15" + "commit": "40d671b35e51afbc0d690f33c965d322375c4b27", + "sha256": "1khnl8z1hf7qrwmxikkdmxhb9fp1ngbr6x3lh2n4nrr5kinmqf3c" }, "stable": { "version": [ @@ -71964,28 +72041,28 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20231014, - 1840 + 20240421, + 705 ], "deps": [ "datetime", "extmap" ], - "commit": "9140067afdc2f0d1eb493dc4dfdb53645289dd2b", - "sha256": "1sjyxm1a1h971ak5l1js4inx921pf3wx15h220j2pvj4d7arj6f8" + "commit": "090fd9a5817ccce733d5aa496b6ebb462560a717", + "sha256": "00kwka83kr4826393wjl0skhnzay8b4bfnn7dafv6zzqc84s3bi9" }, "stable": { "version": [ 0, 17, - 1 + 4 ], "deps": [ "datetime", "extmap" ], - "commit": "daaa89e969c6a6bb6d93526449a697b4e64bccf2", - "sha256": "12vahr4nln20yflxbav9q7y0clhni28h2cajji8q11jyrd4w84jx" + "commit": "56591f85ea145a46fa532f4a6ec5b724922d32db", + "sha256": "1jd2179wm44f1gxh8qsrnv6nldaz4xzgp4kpamjd53n928s16q10" } }, { @@ -72262,8 +72339,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20240215, - 14 + 20240401, + 1646 ], "deps": [ "dap-mode", @@ -72275,8 +72352,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "f51c80f5458d8ba4db9dd3781d190c6c32213250", - "sha256": "0spc9wmqllb4kcn4cvyj2f7k6lzaz2gd86msf49raqddf023665f" + "commit": "ee476aa9bb891873943bb4f9dc4b729921c2de37", + "sha256": "1k5h8x4fk6n71hhi8sc5wqasfkf0887hh787n8xdfmkhxc9gids3" }, "stable": { "version": [ @@ -72306,8 +72383,8 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20240318, - 2039 + 20240419, + 1428 ], "deps": [ "dash", @@ -72317,8 +72394,8 @@ "s", "yaml" ], - "commit": "5554349883af05fd25d6bbd56d7116d7f965d493", - "sha256": "1ybcnha6kbqcx7jrm666jbrnw5hkbws7n541zl2d4jl1gpv09g5y" + "commit": "16a0cfbe06813a1191b19e412445f9d34cd7493f", + "sha256": "1ry8yxrb0172n1lnqi4av4wmqvhaqyh55ih2xs0hnd8b6ziywafq" } }, { @@ -72626,14 +72703,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20240318, - 224 + 20240425, + 2049 ], "deps": [ "lsp-mode" ], - "commit": "c4bc1515be815b58d76bed2dbc5e7c400c37d6be", - "sha256": "0n2vgwag68wsszmjid0zz0jip7nb03chs3v1vh0zm15y0ri0rjl3" + "commit": "c473ed37aa0f2769bb0b4c344cc28f95975dbc17", + "sha256": "1bqvrhmvp0bxk10fqmra38aczgs6r6gwac2ppmn0fxz85g7ryvfp" }, "stable": { "version": [ @@ -72658,8 +72735,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20231017, - 911 + 20240413, + 851 ], "deps": [ "dap-mode", @@ -72672,8 +72749,8 @@ "scala-mode", "treemacs" ], - "commit": "da7e54ed65f4e153c94b9c54689908dce142ef37", - "sha256": "17zs7s6dmaprdc000b9779flk4iw61gi1xgn2wxwq9bxn1l2p9ny" + "commit": "01060e9df33bb077ba6bb56ccfebc140aef8f8f3", + "sha256": "0whjz5vh9xf35nvr5an52d7qsf2ayr2pfwvr37qhz1rjg0rv2kzd" }, "stable": { "version": [ @@ -72703,8 +72780,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20240324, - 1820 + 20240427, + 2141 ], "deps": [ "dash", @@ -72715,25 +72792,26 @@ "markdown-mode", "spinner" ], - "commit": "17e583c253e0cba71ee8a0c25743933c478d5c62", - "sha256": "168dpcmjvv590awqzlv5hfc2lpwx1nwn830cqy55nnds4gvmp23s" + "commit": "32bf5aa458f2bafb318a34bed64cb3f681aa0b51", + "sha256": "1a1g0b4yrwqqj8kpvmpqsjdrshk1kyhy54d9yhpfj4f4gghmay2f" }, "stable": { "version": [ - 8, + 9, 0, 0 ], "deps": [ "dash", + "eldoc", "f", "ht", "lv", "markdown-mode", "spinner" ], - "commit": "5e0524cc9a4e21c4fe5b35153ad33e7b8a4f9117", - "sha256": "1a6jc9sxf9b8fj9h8xlv5k546bkzsy8j5nj19cfama389z0bzcsl" + "commit": "a478e03cd1a5dc84ad496234fd57241ff9dca57a", + "sha256": "1p4979qbmllmmszmnyml0msxkza4pm14rdacmqczbfs3cs9n6bd3" } }, { @@ -72863,16 +72941,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20231006, - 1212 + 20240416, + 610 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "2f2631ae242d5770dbe6cb924e44c1ee5671789d", - "sha256": "1gk23a56jf1v4f4ag07hzji5pw3mq1rq622ggbvqcbc2i2bnvdn1" + "commit": "b891a5071fcb4371d7d817069cbb04f5bd160468", + "sha256": "1qiqbjvp315m7mjsyj1ab53fpk6m6qn6pjzkxls1m0rmmjmszzg4" }, "stable": { "version": [ @@ -73060,15 +73138,15 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20230407, - 951 + 20240420, + 1411 ], "deps": [ "f", "lsp-mode" ], - "commit": "6ade9cacd1db89da0e9c0941a86408a42091d479", - "sha256": "0mlr3f3j5vhzmaqd4g3nxvh9slh78bcgml8372cszn0h4f9xvm4v" + "commit": "3e3cc80a448e9dd24663eaa41742cda686dac5ab", + "sha256": "1llnign4yb4v6c8r7q25b4s63swxlgfxr5acf51s8h4x8rrb11w2" }, "stable": { "version": [ @@ -73090,8 +73168,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20230811, - 611 + 20240406, + 2141 ], "deps": [ "dash", @@ -73100,13 +73178,13 @@ "lsp-mode", "treemacs" ], - "commit": "e66ae2196503d4e84334519e56b4388feffa5060", - "sha256": "1x3qylhhk862l88s80r6paagyjh8bw8kamx4hpwh429r88mb9l6v" + "commit": "e223fbb6c09ebcd1366d631c191fab485f0678b8", + "sha256": "181rlny54gn2621jrihgq6dwdmpdhmb63awlw6jdzvv4v62fs2r1" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "dash", @@ -73115,8 +73193,8 @@ "lsp-mode", "treemacs" ], - "commit": "d82df44d632f331a46eaf1f7a37eb6b1ada0c69b", - "sha256": "05ivqa5900139jzjhwc3nggwznhm8564dz4ydcxym2ddd63571k0" + "commit": "b90c95e3d1e709ab1e1f8332977ba49384571566", + "sha256": "0clifff6xhi1irmx08wjdl13vlh05a7c108hmzzqmmklg76zyr04" } }, { @@ -73127,30 +73205,30 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20230811, - 552 + 20240424, + 412 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "0dd39900c8ed8145d207985cb2f65cedd1ffb410", - "sha256": "1p6lrxvbrq3lv7a1xmbbrsjmgw75p2ay7bpbgdvimrv56fcdys96" + "commit": "a59fb5d02eaa97908a06cfc07156de73458c8ae8", + "sha256": "1fy172s224ddpdilqflbd3dhs3s6xb2gash6a5svw3lp92mwdnl9" }, "stable": { "version": [ - 8, + 9, 0, - 1 + 0 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "9a8983d95d823ae62e5f842a4bd433c860131398", - "sha256": "1pd5lvjlmd6zq64py21yi5zxhcza9g5q48ngfivv7fi7pf3vsv00" + "commit": "8aa8b175fc4cdf2d16f6f3fdb2904e8874610c8a", + "sha256": "162bxyhiqz4saxvh6n3sdb9hx7px5wpy45wbfg5aiqzlqwgqyg42" } }, { @@ -73527,14 +73605,14 @@ "repo": "emacsorphanage/macrostep", "unstable": { "version": [ - 20240320, - 2226 + 20240328, + 2134 ], "deps": [ "cl-lib" ], - "commit": "b56965e66c82b529ac752fa2abe6ffa3a1dbef58", - "sha256": "1d3xnbmg6vz42y9327kapd14f4khnm1ii4bbskcwpimirnr9bnk0" + "commit": "e28d0a028f702d2dbf9a33ab691c3459268ed35e", + "sha256": "0gw2429mgivvjjpx149m26i6yiayhs9s9g8lx5r64kccdci1xrl1" }, "stable": { "version": [ @@ -73657,14 +73735,14 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20240216, - 921 + 20240409, + 1410 ], "deps": [ "compat" ], - "commit": "6ac83927a6c294619bb99cb1ceb2ecf352498599", - "sha256": "0x70dd12w0p44c7b5273fwi51sr2giqcl230170v8vk9rn73p12i" + "commit": "7540f14d3d62856313b5cbebefcfd813784ee77b", + "sha256": "1rbidw6scix7wcx09wfjhnln1ar5b9f1bdj9k7mfjcvb46mmaczq" }, "stable": { "version": [ @@ -73687,8 +73765,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240320, - 2336 + 20240426, + 2118 ], "deps": [ "compat", @@ -73699,8 +73777,8 @@ "transient", "with-editor" ], - "commit": "0e8f25a8d8011328f2bf082232c720b24c2a12c2", - "sha256": "0x8qqfpxl1mr8s3q8z38bfng4raxkhnr7djymyagisbblnbxr9zj" + "commit": "49ba535f526266b69fcaf7442acfa59ad8473caf", + "sha256": "0mcy3sndpajhg95ivr8cl5jsk7pnfc4zhjwyjxsj6yqqc77rw92h" }, "stable": { "version": [ @@ -73759,14 +73837,14 @@ "repo": "ideasman42/emacs-magit-commit-mark", "unstable": { "version": [ - 20240220, - 2101 + 20240421, + 931 ], "deps": [ "magit" ], - "commit": "e5aa6a69af963fd25779f5211a7c3d91a65c6b0f", - "sha256": "01drp4rlmafzmcqw67nca845ya6532arzddngf6fa4i4q04n8142" + "commit": "d09d0df6f8a697446e9fac77428b32997b94c59e", + "sha256": "1cd1z9vrmavxdwzxnwbimzcq51c3g8rzd7va01z5k8alh6n98gim" } }, { @@ -73976,16 +74054,16 @@ "repo": "douo/magit-gptcommit", "unstable": { "version": [ - 20240303, - 1649 + 20240406, + 807 ], "deps": [ "dash", "gptel", "magit" ], - "commit": "28485542a14966141208daf6baedb3833ad2357d", - "sha256": "0wl1hccwalrm585kv5jin8975jmymff9xl8jw6rnw1bdrn59a4wl" + "commit": "3584b1036574c704e5bae04274b8849590a097b0", + "sha256": "1rfiaqdpkf9xh57gf4vsz65f2mnhzxyadddwxyk1yfzan1il7j01" } }, { @@ -74210,15 +74288,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240311, - 1407 + 20240426, + 1325 ], "deps": [ "compat", "dash" ], - "commit": "8a3c1ccdda8185255ce76adc2ba41b9a43f18b8c", - "sha256": "11srw91xq20cv0zd41cvb4pi5x4hdxphsq5y7p8cpxfkvxzvh0nq" + "commit": "fef45b274ecb4dc0448bd34dac26f7eaff621e59", + "sha256": "1mh6lj5w52id5v7bl0j5789cbg5kirz1r76g5xrby6grk3zln942" }, "stable": { "version": [ @@ -74350,8 +74428,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20240321, - 759 + 20240421, + 1131 ], "deps": [ "async", @@ -74363,8 +74441,8 @@ "s", "transient" ], - "commit": "332ce763f7336ea356964b92723678aa1ed4640f", - "sha256": "0npqns8fy0brxp8mcxbzf7n0ssrz0gb0h8ggqdfc0csal1bjs283" + "commit": "f73921e484dbae056e84080c743dffd241cb6bf3", + "sha256": "0axy2pnvs7n091cfvsr54a4px5vxj5pbi0lzqak3n4zpzw0vdf0r" }, "stable": { "version": [ @@ -75038,25 +75116,25 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20240323, - 2015 + 20240404, + 451 ], "deps": [ "compat" ], - "commit": "3275d1f85cb020280979a050054b843f7563aea2", - "sha256": "0lljik22flx6khc26xyk8qr91p883mgh29fl8rnyyvdlljlsj33a" + "commit": "58eb5fd6e5cc21b12c5455ae69e7ae93579647bc", + "sha256": "196gjpmzra9azhrnvlhx50dlc59390hq4wxn0f9m4n86ig4i5dr0" }, "stable": { "version": [ 1, - 5 + 6 ], "deps": [ "compat" ], - "commit": "98f6e58c12d57283bd7c1cb241664c966dc38ac3", - "sha256": "12ncif2lv6d7r2g87lyjr7idbqa283ijb3qgd5a61i3760czs7d6" + "commit": "58eb5fd6e5cc21b12c5455ae69e7ae93579647bc", + "sha256": "196gjpmzra9azhrnvlhx50dlc59390hq4wxn0f9m4n86ig4i5dr0" } }, { @@ -75314,6 +75392,21 @@ "sha256": "1l49hi4nwralx5kg4aqjj2b592y71ba4i91vmlzk5rrcjmdnc6b0" } }, + { + "ename": "markdown-ts-mode", + "commit": "71f9f3d92d8c442092953b1ca16ec1f6ffa4aa57", + "sha256": "02kd9cn962aln4k4bxm7gasiy92qal05rdkyl5b6jq9zkl7qjr6m", + "fetcher": "github", + "repo": "LionyxML/markdown-ts-mode", + "unstable": { + "version": [ + 20240422, + 2329 + ], + "commit": "2f1ee8b94cdf53cebc31ae08ecfbba846193d5e1", + "sha256": "1fhvsfa4q46xa092dkpgki8qhfs71x414yrqlxnf2vfs9bd6w7pn" + } + }, { "ename": "markdownfmt", "commit": "16cee5fe003e3afc7daf6858ed83843b52e44901", @@ -75510,28 +75603,28 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20240309, - 1753 + 20240327, + 1353 ], "deps": [ "persist", "request" ], - "commit": "90aeac60805ed49da29781b979b6ab3edab671aa", - "sha256": "1l4arid01m5475wq4sy8j598ww13847sbpg9grl71r72rs83071w" + "commit": "d54aa9aa3e4276b9519ff9123e9dc0c123d9dd3b", + "sha256": "096zsjlqx2cv4zq607f9n7mr60d5avhfczf3nxsa8wkjsj97qrlh" }, "stable": { "version": [ 1, 0, - 18 + 19 ], "deps": [ "persist", "request" ], - "commit": "90aeac60805ed49da29781b979b6ab3edab671aa", - "sha256": "1l4arid01m5475wq4sy8j598ww13847sbpg9grl71r72rs83071w" + "commit": "d54aa9aa3e4276b9519ff9123e9dc0c123d9dd3b", + "sha256": "096zsjlqx2cv4zq607f9n7mr60d5avhfczf3nxsa8wkjsj97qrlh" } }, { @@ -75669,11 +75762,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20230712, - 1655 + 20240418, + 1949 ], - "commit": "9c03ebf876eb8af911d7ce6edda581efa1346f41", - "sha256": "095krmn2h6ckfmhwi14nywn278k2ivay50kjssn7sn267i0gbkyp" + "commit": "005954382db3df9c41585701467cedffe48b2ff4", + "sha256": "018m24csl0d3p8987m7dhb2d3wjkb4r9agxfww31gaszc4bdaar5" } }, { @@ -75773,7 +75866,7 @@ "test-simple" ], "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", - "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" + "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" } }, { @@ -76094,11 +76187,11 @@ "repo": "baaash/melancholy-theme", "unstable": { "version": [ - 20230330, - 835 + 20240417, + 136 ], - "commit": "a5c4360f57793401b63b0df382e845b4845c8f97", - "sha256": "0351m7py16kxfri5z2d4k89ld1x9kvgj82xd0dv9pyp7pkxrfxwz" + "commit": "7ba2bb3f062e798236bfb589381691c5bd9a22be", + "sha256": "071a2d9yvfz1cv4fnd1djdbcnqc73v6vb6jgg0nlp1f5dvy9r89x" } }, { @@ -76154,11 +76247,20 @@ "repo": "gvol/emacs-memento-mori", "unstable": { "version": [ - 20231220, - 155 + 20240407, + 1417 ], - "commit": "880df15f3b8ab49deb77586549a2afdec95778b5", - "sha256": "153iyz0pxsah1sn2c3x01m2ssclz9jzp2q9ynybr9ly0xl11qnzf" + "commit": "7cc2e89511c1c131789737b4c9daeee0147916f0", + "sha256": "1chf40k3gf1gzqlcivl8ry6nwaps7b9cbkmy10pviaslwijifyzh" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "commit": "5dce0fcd3a2c2becf72e8691d0f66e851b8597a1", + "sha256": "1zhwvx9ljsvjr1dv46m98d11645w2sid69jcqp674aif2gm84fw0" } }, { @@ -76246,11 +76348,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20240321, - 931 + 20240407, + 1642 ], - "commit": "59c058c3ccf55badda65d55a56aa30cd025441c7", - "sha256": "1wx6p4a7p8rl8hp3ylcw7z9cjrvyxi66lkn4wb4khvlz45c75f0n" + "commit": "99e08c92bb5d8a695062ce53e2cffeffd3a058a6", + "sha256": "12fp6bj38a4rcxrra4w50wb4qrl5jbw1wyp5hhx26ayh99ajaigi" }, "stable": { "version": [ @@ -76463,11 +76565,11 @@ "repo": "wentasah/meson-mode", "unstable": { "version": [ - 20240211, - 823 + 20240218, + 1834 ], - "commit": "ed7d3071059429d816a878f879cb5cfabfa34485", - "sha256": "1lx52n6i057s6nin7bmv0sg0craiw2rjmb464cp893hdhb3a576c" + "commit": "c8f4fbf075bb5db2bc0872afe02af2edac075e4e", + "sha256": "135glcrnbr7wmrygrngsxpma8bxajpxlanbkvk08v92p7ar6a21j" }, "stable": { "version": [ @@ -76728,11 +76830,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20240305, - 27 + 20240427, + 946 ], - "commit": "d41dc93785d231f1e391ba61893aacd1331d5726", - "sha256": "1amz0d27xik7zx3mkfr08v5izjvqiabw08x6yzlw60hjx9pafzzl" + "commit": "82c531e328ca1073e4d4115ca844ba9f0859c4a1", + "sha256": "0xbbdz6yac4qkz1w0ljip9g7knlpp8mhsi6y9pczww1hg05kqlcb" }, "stable": { "version": [ @@ -76798,20 +76900,20 @@ "repo": "purpleidea/mgmt", "unstable": { "version": [ - 20240305, - 605 + 20240330, + 2205 ], - "commit": "90f6d4e5630ab69d737fdf7f17c81843a9c6a081", - "sha256": "0a9w5mg5jfbjvkljmqrn1jicfffc888g1ngdipqqvq85hfpcdz44" + "commit": "1b00af6926d8699d9d04062f28fddd43c6340bac", + "sha256": "0mwbym8j4d4jhba0a1kqmgmdjw7rix91cly45pwjd0g47szm96pl" }, "stable": { "version": [ 0, 0, - 24 + 26 ], - "commit": "53f9f352335857736f625a019fe14c6750f78434", - "sha256": "13jx2ndbjqa5rgslaplx551nnm240pdzcw7bx63wihk85c617lyg" + "commit": "1b00af6926d8699d9d04062f28fddd43c6340bac", + "sha256": "0mwbym8j4d4jhba0a1kqmgmdjw7rix91cly45pwjd0g47szm96pl" } }, { @@ -76822,26 +76924,26 @@ "repo": "yoshinari-nomura/mhc", "unstable": { "version": [ - 20240311, - 1117 + 20240419, + 10 ], "deps": [ "calfw" ], - "commit": "79ab5687cd4e979d2613f5515c8016058ca9b3c2", - "sha256": "16b4a82j8qbcmqx4a21fhj47q7p2cq1vjqmbsw6wxg1bxlcc6z2g" + "commit": "b527a88748651d06222ad24f7417941088515275", + "sha256": "00wgf4jia9cxjpykzndsgn1jbnm6yqc7l3svfk2hj5j2ga1fax7g" }, "stable": { "version": [ 1, 2, - 6 + 7 ], "deps": [ "calfw" ], - "commit": "79ab5687cd4e979d2613f5515c8016058ca9b3c2", - "sha256": "16b4a82j8qbcmqx4a21fhj47q7p2cq1vjqmbsw6wxg1bxlcc6z2g" + "commit": "b527a88748651d06222ad24f7417941088515275", + "sha256": "00wgf4jia9cxjpykzndsgn1jbnm6yqc7l3svfk2hj5j2ga1fax7g" } }, { @@ -77043,14 +77145,14 @@ "repo": "liuyinz/mini-echo.el", "unstable": { "version": [ - 20240311, - 2001 + 20240418, + 1047 ], "deps": [ "hide-mode-line" ], - "commit": "9b3fd955e04ec168fa769a79cb9f480e84f90ffd", - "sha256": "1dw1l3w9y9p0128ywazlglbbxmsmzhngj1q1x640k174vlwx48hg" + "commit": "adeb402f5e508424960b6165d596b25fd6a6d756", + "sha256": "0jcac2p3ml17q6fsf8jaxc0nx17jjj3z1zvcsqv0k2r53ya8k41x" }, "stable": { "version": [ @@ -77272,14 +77374,14 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20240101, - 2220 + 20240415, + 1544 ], "deps": [ "compat" ], - "commit": "07caa8c30b12c35f3fe563a036f9823c4a6a5f01", - "sha256": "07419zfsi871i6lg5g0f99d8ai2znifcfidywly3mb1hrizzylb1" + "commit": "ef234da0625397b994c0a17d1038037732c3c457", + "sha256": "1zd1gjg16yggmccpvv7fv32pfmh2a6227p21q2vdh8f1p0bwm10p" }, "stable": { "version": [ @@ -77491,7 +77593,7 @@ 1 ], "commit": "beb22e85f6073a930f7338a78bd186e3090abdd7", - "sha256": "1yf21gm4ziplmgx8yn7jqq45mwfiindbrman7fc5b9ifq78x9ryn" + "sha256": "1dhljrh44dsnixd8hbb11k6dgap8r8n7jknhfy2afdzq889fih74" } }, { @@ -77520,20 +77622,20 @@ "repo": "jdtsmith/mlscroll", "unstable": { "version": [ - 20240119, - 2149 + 20240420, + 1515 ], - "commit": "47182e0afb966994e4ea26842652fb4da9735103", - "sha256": "0h52m1gc0ynajfkxl1xhi4p7hz0kfs1fp6i1wy0qpp7x53w4aig8" + "commit": "cb9d7a256b8998565795d4be469d5a8dea96eb16", + "sha256": "1mvgb8fi7w0rpksfz4aalmn7f5a67zbq6a64cx9cmmqnn6r3llss" }, "stable": { "version": [ 0, 1, - 8 + 10 ], - "commit": "d4661c2bfd20da79185b904d8a28357e3c4d9c7d", - "sha256": "160lwh0sqragpm10i6yp1pvqjz0y16zqfg0fgkwzks10s8lcq6aq" + "commit": "cb9d7a256b8998565795d4be469d5a8dea96eb16", + "sha256": "1mvgb8fi7w0rpksfz4aalmn7f5a67zbq6a64cx9cmmqnn6r3llss" } }, { @@ -77762,20 +77864,20 @@ "repo": "DCsunset/modaled", "unstable": { "version": [ - 20240302, - 12 + 20240330, + 1956 ], - "commit": "0d8f8941f3e31a19641db4b21dd7d963c514ec92", - "sha256": "0vylps3x6jqfy8la1hq3969qms2pcmrcg8dnsbbydinngvh46szn" + "commit": "01ef8befac15f77f1b9129bade37e78b6bf7d612", + "sha256": "1nza8pff0adj6sp20wr3yb8a7jdlklwk49qwamb09pal3lidq7pf" }, "stable": { "version": [ 0, 8, - 2 + 3 ], - "commit": "f372a5759e40b79bb4868d12209a5eb7dc661a54", - "sha256": "0kiksf8kax0l33aqag9igmwkm0yccmijzji4ff2bcil2dmxcj47r" + "commit": "01ef8befac15f77f1b9129bade37e78b6bf7d612", + "sha256": "1nza8pff0adj6sp20wr3yb8a7jdlklwk49qwamb09pal3lidq7pf" } }, { @@ -77863,14 +77965,14 @@ "repo": "tarsius/mode-line-debug", "unstable": { "version": [ - 20240101, - 2221 + 20240415, + 1545 ], "deps": [ "compat" ], - "commit": "b5fbea38d6d92b50be14be99065b44b0ef832983", - "sha256": "02d9q9bfak5dpv2v4q2qicrwf82gn8fj0srhalcnlzkrgfv9z0jz" + "commit": "0ff591110c9db0bbc1372234902e28486c168a86", + "sha256": "0whjiadyygq8i3mf325zha8jl6hxm1q44rwvmlzvxzmjm42ag2gg" }, "stable": { "version": [ @@ -77893,11 +77995,11 @@ "repo": "ideasman42/emacs-mode-line-idle", "unstable": { "version": [ - 20230704, - 12 + 20240421, + 623 ], - "commit": "1dc0115bd4864b8b8cc9cbaac75c03d764070873", - "sha256": "006ynxzakfc11lz9s915agdiiisnbfxiv9a7mj9g0890qh7isjvy" + "commit": "3bc67905ea3349ec20d4c537a0c5f2e833b9e905", + "sha256": "03z1940h3p5hlmgl0n82im4hn04rcmw4xwq3ygmqg999l10dcr2c" } }, { @@ -78037,11 +78139,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20240322, - 519 + 20240427, + 843 ], - "commit": "bea2f68833e1f46ef60eba25f67a8ab162e7bccb", - "sha256": "1h4wzarzgk06v14xxsya0fym4bd17vgmkw3skd8sc81bak2fb74d" + "commit": "56bd9c8f32b4179e4207f553f8656934c0076a85", + "sha256": "0id7b9gl1cl2w2q921fx1gvmh9dsvll9r93k0yszn6v3hf98sjpm" }, "stable": { "version": [ @@ -78061,11 +78163,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20240308, - 921 + 20240417, + 1111 ], - "commit": "56286c6b869520807596e3e8af1b37c50e5a1349", - "sha256": "122zn5hvpc56cg6c8h6j9v2cqimzrqlrr49glqfw9wix648xapzm" + "commit": "0fb1274cb29863597e627757230feedf7d90482c", + "sha256": "015wi8nx18705yqrkgrvk52rsb2nyv91c04wyx6imwfvfp2vh52d" }, "stable": { "version": [ @@ -78228,11 +78330,11 @@ "repo": "ideasman42/emacs-mono-complete", "unstable": { "version": [ - 20230808, - 1345 + 20240421, + 1234 ], - "commit": "d22df33d3523f1c0adf62bc0546da22792a2852d", - "sha256": "0g0xlxn33yi8v0smncwjz46mxnc742zryssmf1w4k00856ydd6bm" + "commit": "3cb92a75cf20e1a5394e77e0e44a6b1c14cf315b", + "sha256": "1jzjy4pwwlyphj0warfywfqm2025wfkb8hvnn0478j26hs7141xs" } }, { @@ -78355,7 +78457,7 @@ 1309 ], "commit": "d1c024fdf9543fbc0101cd2c6e8b248378f591cd", - "sha256": "1xvx26xbd0ylih6xyvwylzjl7z5dbw9sv828p5zykr6fg2kz9nb3" + "sha256": "11r54zj0q14f88wl6bp46gz4j2wv6cb37d42b2hfvhkgh88a71c5" }, "stable": { "version": [ @@ -78364,7 +78466,7 @@ 1 ], "commit": "d5b6b5b3552a5b84f4f887e2f805d9e72747fab2", - "sha256": "1xvx26xbd0ylih6xyvwylzjl7z5dbw9sv828p5zykr6fg2kz9nb3" + "sha256": "19yh93kkyailczv1yyg7jhmzwl768sg0rk4as5kgqays87h9bnfn" } }, { @@ -78399,14 +78501,14 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20240311, - 1617 + 20240415, + 1545 ], "deps": [ "compat" ], - "commit": "65116ee9a8d8ca5a9e1e579b5957e0e7673c1dfe", - "sha256": "196r6nwfjj0gj1b356gb0snqq4iqkv0k35nd17mmg48qdl517n4v" + "commit": "28abaf874b87b6d6c09ef1ab63856de4ed743974", + "sha256": "033wg9qfw2rklinvii6dqpqcdg0agxsn2njq3ywq0xwwldhmms6p" }, "stable": { "version": [ @@ -78526,14 +78628,14 @@ "repo": "tarsius/morlock", "unstable": { "version": [ - 20240125, - 1741 + 20240415, + 1545 ], "deps": [ "compat" ], - "commit": "2a62e20a7648747e74313ebcf3932fa8a858739b", - "sha256": "0pg5pz6k51kvipdyq80w4sishfns53kfqjqz4qhnbiwjb6h1c3pb" + "commit": "ea728ba7dbae47d8516a6026038c305092d38078", + "sha256": "0qa4i6hx9xljrmhds7xfnyq391p7hkzdmkfa16yhfs75479dw805" }, "stable": { "version": [ @@ -78699,20 +78801,20 @@ "repo": "amnn/move-mode", "unstable": { "version": [ - 20240309, - 2223 + 20240409, + 2159 ], - "commit": "b07983c8df12fa428117cea8e09067ae952871d9", - "sha256": "09dnxmx0rc3v26fhi5s9f7ri05fx9p02m284qhkgr82ipdn0whnb" + "commit": "f974cc69f279c45026f7386e0194be74779334a8", + "sha256": "1wz3dw39bv351gxqwis7lbsynr04fniprymjdb0xdcfhdfxnpy3x" }, "stable": { "version": [ 1, - 0, - 1 + 1, + 0 ], - "commit": "b07983c8df12fa428117cea8e09067ae952871d9", - "sha256": "09dnxmx0rc3v26fhi5s9f7ri05fx9p02m284qhkgr82ipdn0whnb" + "commit": "f974cc69f279c45026f7386e0194be74779334a8", + "sha256": "1wz3dw39bv351gxqwis7lbsynr04fniprymjdb0xdcfhdfxnpy3x" } }, { @@ -79284,22 +79386,7 @@ 812 ], "commit": "98110bb9c300fc9866dee8e0023355f9f79c9b96", - "sha256": "1ysj9x9m1lxg1gy0z7y07qsi3g26qfqdwwa8kjkf40pchb2wxg0s" - } - }, - { - "ename": "mu4e-crypto", - "commit": "64a39c1ab11c4bfee737bda22b39eea47e07ed74", - "sha256": "0zcyrm9027h7vm6fnldb331yvxwnjsm5bw3a21ynxvirh7dw9lf5", - "fetcher": "github", - "repo": "meritamen/mu4e-crypto", - "unstable": { - "version": [ - 20240120, - 646 - ], - "commit": "8eb4ce811044aa93f3527adf35984aa502ac0d4b", - "sha256": "0231q37vj960f6czr2l5fqsgsdiyndlls35dvqzlmzrqpzjcj81m" + "sha256": "080s96jkcw2p288sp1vgds91rgl693iz6hi2dv56p2ih0nnivwlg" } }, { @@ -79346,20 +79433,20 @@ "repo": "mkcms/mu4e-overview", "unstable": { "version": [ - 20240219, - 2302 + 20240330, + 1441 ], - "commit": "7843cb64c861729bfd57ec3e8ad7faf6edb2e543", - "sha256": "1sq5lfhs00dr3mc25wjm2y18ac78rh7dkj4f67kndhrrr99z6zcg" + "commit": "758ea4b3945fa377ae33e45f8213280d38e0551d", + "sha256": "0qdxsfsambbrb3dbch4pyjm9k59cbjlzkx9075aipdi8nl0nvygf" }, "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "0e711f47f9bab8bea9fe4f8e857920b879e70dcd", - "sha256": "0zh4pi4d74cs9p8ll7fzq8chxk84safvb7svxcss692jjsqvj89y" + "commit": "758ea4b3945fa377ae33e45f8213280d38e0551d", + "sha256": "0qdxsfsambbrb3dbch4pyjm9k59cbjlzkx9075aipdi8nl0nvygf" } }, { @@ -79370,11 +79457,11 @@ "repo": "wavexx/mu4e-query-fragments.el", "unstable": { "version": [ - 20211030, - 2307 + 20240415, + 1421 ], - "commit": "8d93ede3772353e2dbc307de03e06e37ea6a0b6c", - "sha256": "0pl9hiwl5snpw9cfga0v9ypw83mz4nw6754whd4f37fs9xc6df31" + "commit": "14b38e4a7b7aae47f3c1bdccb6680f8c38c645bf", + "sha256": "037lg0h9mgp0393gxqdxqkgl0kb77rh72bf8frswjjg0df5pdwbn" } }, { @@ -79385,28 +79472,29 @@ "repo": "lordpretzel/mu4e-views", "unstable": { "version": [ - 20230105, - 1443 + 20240401, + 1150 ], "deps": [ "esxml", "ht", "xwidgets-reuse" ], - "commit": "ba223d69fa9edf7b039bd728f4630c64b08c39ff", - "sha256": "0ss7ipp80wflrhxa1x974bb9gvc8fnrrcdzf8gzxzlabgw1qsjwl" + "commit": "e0f60e314d034e02fbc3696c3cb9e3598eed9070", + "sha256": "0n6s4qab595rda1xfyad9qvry1ipfih4jzkaxabhw3a60jk3h3vy" }, "stable": { "version": [ 0, - 5 + 7 ], "deps": [ + "esxml", "ht", "xwidgets-reuse" ], - "commit": "33fa9f584034978006108a4498566e933493f852", - "sha256": "01636rhmgnjz9z81xppqlrlwwg0jcy48k9p3hh865wncp1q2jsb5" + "commit": "e0f60e314d034e02fbc3696c3cb9e3598eed9070", + "sha256": "0n6s4qab595rda1xfyad9qvry1ipfih4jzkaxabhw3a60jk3h3vy" } }, { @@ -80247,11 +80335,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20240324, - 1932 + 20240327, + 819 ], - "commit": "7cef2b6097bb73a6a293a81a0f1fca1e9893321c", - "sha256": "13xrpd13rxv5zp4w1hgyayyjxa0ap7g505yrhdq8sfirlsfic57g" + "commit": "a044e5eb5bf9bbefe34982ae9cc80ac9739a3e58", + "sha256": "13m17vwwrcs44xhzkh80nssgsn9p84f5vl50zk4y1712d087pc0d" } }, { @@ -80848,20 +80936,20 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20231214, - 736 + 20240402, + 1032 ], - "commit": "abfe86474986a36c6c0daa56f8c4b6e1fb883743", - "sha256": "06bh762as20mlbydixbnfmn4i03gh4sz3iwv38chb5ma26w59m13" + "commit": "9a795828e4c201a47c5851157868c06f2ca37448", + "sha256": "0fxla1s6sn9gzqrkmlm00klhbfa7h0ki80j8jp68zlqc984ah5a2" }, "stable": { "version": [ 0, - 2, - 63 + 3, + 65 ], - "commit": "076fb8339e4ea935c1a530a740b6eb6257c55962", - "sha256": "1vz50fkf1nw1md8p239pisvpba9q1y3ygvs6yfb37jvrxh6a1k4r" + "commit": "9a795828e4c201a47c5851157868c06f2ca37448", + "sha256": "0fxla1s6sn9gzqrkmlm00klhbfa7h0ki80j8jp68zlqc984ah5a2" } }, { @@ -80949,11 +81037,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20240319, - 833 + 20240412, + 1831 ], - "commit": "8095215a503d8048739de8b4ea4066598edb8cbb", - "sha256": "1zwhslj2r63dmwgbv031b63rhhghf2nv8wb9zx31rdqh96g53s28" + "commit": "fb395120e9de33b276d16caaccaefd98d4340b92", + "sha256": "0iyjd18b3v730ixz5ayr72m4z8p6vv5m0nplpndl0s7a7ypdm9l9" }, "stable": { "version": [ @@ -81248,6 +81336,21 @@ "sha256": "0xsljyirv7iwfclxzlj8h274pps02ni3bdwwlpjcmffz8v1fh3l5" } }, + { + "ename": "neut-mode", + "commit": "aeb247528ba4d426ae558152318649bc164e8ea0", + "sha256": "112z4wyl9n8g8nqwwdf94cfjd3fg79klagzjw0cwp20iv59ljijs", + "fetcher": "github", + "repo": "vekatze/neut-mode", + "unstable": { + "version": [ + 20240414, + 2254 + ], + "commit": "e75f5f6bbcab4c042f331fcb2d0a628516cfec5f", + "sha256": "16iv3vn3inwjh29zk00w1l1cm8jqp96n2hrkgpmhcj0kbliy298h" + } + }, { "ename": "never-comment", "commit": "ef3f8e712c10d63fea009951d7916fe376267cbe", @@ -81361,20 +81464,20 @@ "repo": "ajc/nginx-mode", "unstable": { "version": [ - 20170612, - 437 + 20240412, + 402 ], - "commit": "a2bab83c2eb233d57d76b236e7c141c2ccc97005", - "sha256": "17dh5pr3gh6adrbqx588gimxbb2fr7iv2qrxv6r48w2727l344xs" + "commit": "c4ac5de975d65c84893a130a470af32a48b0b66c", + "sha256": "1zal05l3lnb41pvfxwkzrcf39g7amqbaaffxn3wz7qa45gvvc6fw" }, "stable": { "version": [ 1, 1, - 9 + 10 ], - "commit": "a2bab83c2eb233d57d76b236e7c141c2ccc97005", - "sha256": "17dh5pr3gh6adrbqx588gimxbb2fr7iv2qrxv6r48w2727l344xs" + "commit": "c4ac5de975d65c84893a130a470af32a48b0b66c", + "sha256": "1zal05l3lnb41pvfxwkzrcf39g7amqbaaffxn3wz7qa45gvvc6fw" } }, { @@ -81578,11 +81681,11 @@ "stable": { "version": [ 1, - 11, - 1 + 12, + 0 ], - "commit": "a524bf3f6bacd1b4ad85d719eed2737d8562f27a", - "sha256": "14kshkxdn833nkz2qkzb3w531dcqj6haad90gxj70ic05lb7zx9f" + "commit": "65d0dfcbbea6b8ca7d8a3a0f673ecb522379e43c", + "sha256": "0jlqqbhmzhlwfhf1axdi3qm6gd1l66s66dw9cn83h9akgvpjf0vv" } }, { @@ -81731,10 +81834,10 @@ }, { "ename": "nix-ts-mode", - "commit": "568c5226265ec062c71818f74197b5620589b46a", - "sha256": "1aa4grbk9rqfw37zivakv5a4fs8rrlrfdqg4ajnbafd320d0jfm2", + "commit": "5722db7ce30ad773fceaafeece7e9b7d56dcdf71", + "sha256": "19sps8vaq49cx3lykqnfkc9xki5czawd69d6sbg0lsd15hpjnqqk", "fetcher": "github", - "repo": "remi-gelinas/nix-ts-mode", + "repo": "nix-community/nix-ts-mode", "unstable": { "version": [ 20231107, @@ -82014,14 +82117,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20240321, - 710 + 20240415, + 1545 ], "deps": [ "compat" ], - "commit": "dcc7af41cc6b48d446c0a76bae029898f82cc2e3", - "sha256": "103cmw2cxbq9n4csh0n3rrq57caa1fdby7ry0izcdnaaph7rwhqc" + "commit": "554d890c5d5b59ebcf83c67256d0012e23cd07f0", + "sha256": "0x0dk7yvrzcw1pjn86gqck5ksg48dnipvwir6va20i7cgi060qfy" }, "stable": { "version": [ @@ -82226,7 +82329,7 @@ 0 ], "commit": "7825f88cb881a84eaa5cd1689772819a18eb2943", - "sha256": "0f8s7mhcs1ym4an8d4dabfvhin30xs2d0c5gv875hsgz8p3asgxs" + "sha256": "009did3i3i8yi0virq606l02w1mw0gdyiqablqg7m368gx0gfvh5" } }, { @@ -82267,11 +82370,11 @@ "repo": "hhamud/noir-ts-mode", "unstable": { "version": [ - 20230827, - 2052 + 20240331, + 137 ], - "commit": "bb47c9b770b7401c0ecdac0bb54466df6ca62d29", - "sha256": "1bbxj2nglnbyj7v4n50mj3icwhdbp37jj0p4wkwizgqvgxy6cgjl" + "commit": "eb399cc69a3229f4141e193f98efead51d9b3cc8", + "sha256": "1nv2ccbsww7vkpxx0i5ds655ihkqxa1mvc6wq2lnla845j3mrpd8" }, "stable": { "version": [ @@ -82304,7 +82407,7 @@ 0 ], "commit": "dfe065acdd06be176fce3ab150fae699b2ad1a13", - "sha256": "1nqxw9s41ln91gjrglrbyhqasakgk0542ymhbwivw9l19yyizmaz" + "sha256": "0m5rfwp2y8iz7lrshdy09nk6dhrd7bgwb0761cmz1ky8w6f3di7v" } }, { @@ -82460,11 +82563,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20231006, - 2337 + 20240406, + 1803 ], - "commit": "e4ead7656c72092bf30c43283057c2d4c4107962", - "sha256": "0wab9n0rn9k76js1sl4wwiivvifqnjf58n8iwyscqsmkrkhcdc47" + "commit": "cd89065dc36e36b22a2a53832d2cac9b06fba41c", + "sha256": "179x3kz1504zlilh5y5h50sk5d0d9rhl6r6ccfgp4am2nn0d1qp7" }, "stable": { "version": [ @@ -82484,15 +82587,15 @@ "repo": "tarsius/notmuch-addr", "unstable": { "version": [ - 20240101, - 2221 + 20240422, + 15 ], "deps": [ "compat", "notmuch" ], - "commit": "1253c6ff1359acef42f04c021c6204b8e726b071", - "sha256": "1wvap0vg0b1daccw1523f5baf9sp7qivrrpk2bg0sdaq37pzkbm7" + "commit": "e5755c5a752d2026b1c847bc5944bdd5f015c1a6", + "sha256": "0ysb99rda0ix6lcb8z8p72wb6z35agyn9jd1z0jxhqpp5xyajjsl" }, "stable": { "version": [ @@ -82576,15 +82679,15 @@ "repo": "tarsius/notmuch-maildir", "unstable": { "version": [ - 20240101, - 2221 + 20240415, + 1545 ], "deps": [ "compat", "notmuch" ], - "commit": "2b6a49c8b1f35338bb231f39155b6da0a0b639d5", - "sha256": "0r3fjq0b1zssjbhq9075cihqn0a255lrqkl9vcb3ypy0gwr7hy9r" + "commit": "3a7240e6728731b427a763228c60104602f0fe4b", + "sha256": "13cajk4pb0x5r9azxilibc4v9xg3pxqiy0cx14b6kh6l9b0f26pq" }, "stable": { "version": [ @@ -82608,16 +82711,16 @@ "repo": "tarsius/notmuch-transient", "unstable": { "version": [ - 20240302, - 2332 + 20240421, + 2351 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "f08ef922b88d90a7cad348743c8470f443b1fa8e", - "sha256": "1v20cz1kkd0p82hrdkq7wy30wgi37idrzcxk3n23ypmhmylig82a" + "commit": "ef7a977a16e2c6a0ed3e139bdd6cc00a42b8c758", + "sha256": "1njy6cq7b9n2shvcgzrl8b3iclcyhx24bq1li1p292ipj3x3rkg4" }, "stable": { "version": [ @@ -82642,14 +82745,14 @@ "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20230715, - 1434 + 20240407, + 1219 ], "deps": [ "esxml" ], - "commit": "cc31ce0356226c3a2128119b08de6107e38fdd17", - "sha256": "0k09dd0j8m8607dv61qm4q1jk9hvn39sxzk5ckcalafjanp7l0r6" + "commit": "9b7bef950d68c2518710c480729d6bb6026e9489", + "sha256": "10lxy18zs8bkld0ql75kdxdmbmr8h68lsk8a960iy3j1jg1rz1sn" }, "stable": { "version": [ @@ -83065,7 +83168,7 @@ 1249 ], "commit": "44d506105989873dc1725e0cfc675925b35c9c98", - "sha256": "1g030806d2l238sr173ypdkkq0g8kf8qdp7a1ls5d3rw0bng4ds1" + "sha256": "0lgz0sknnrxmc7iy4lniday1nwpz4q841c3w2hm72aiwn5z21h22" } }, { @@ -83172,6 +83275,26 @@ "sha256": "05xfpgk4swss89n3wrk0cg87ngsv06szpam7svncf4c2gjs9gkxa" } }, + { + "ename": "oauth2-auto", + "commit": "06aefc0887f50215e69260a6e4f883a3d34e83e5", + "sha256": "165f6rpgi3fwx4qby1wq5h19362xn2shwkymibv64yscx9r0mpiq", + "fetcher": "github", + "repo": "telotortium/emacs-oauth2-auto", + "unstable": { + "version": [ + 20240326, + 2225 + ], + "deps": [ + "aio", + "alert", + "dash" + ], + "commit": "ff9a45e27621aad5b1a2e12a09b01f3e4eaecf96", + "sha256": "00vwxdxgcnx86i56093vp5j75zgg7iilpzxrhl4s9ccg00vp220n" + } + }, { "ename": "oauth2-request", "commit": "d8fd29717d69408c845d44077b5223902051dbd9", @@ -83470,18 +83593,18 @@ "unstable": { "version": [ 20240324, - 315 + 320 ], - "commit": "2b614d108445b8462b491af09092b0f65c237e42", - "sha256": "1246ji8kx5hznwbb55fvi446gsjbd0znwd2zjv6ygxsp4lcbrsib" + "commit": "d9c3e446467badad571eef8832232ae5a6f9f05b", + "sha256": "1l3hifa88jvzr75rz4cc5q0w8y60qnw7jin6x3fcam8915a1nd2f" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "ee94c0d432b98d4b003b179e2109c3114ea54d9b", - "sha256": "06zkjnv324bwj1bd2kdvxar0is992qngl5n94d4z2cpx3zcn2c5q" + "commit": "d9c3e446467badad571eef8832232ae5a6f9f05b", + "sha256": "1l3hifa88jvzr75rz4cc5q0w8y60qnw7jin6x3fcam8915a1nd2f" } }, { @@ -84142,20 +84265,19 @@ "repo": "pinetr2e/ob-napkin", "unstable": { "version": [ - 20200817, - 1259 + 20240405, + 1223 ], - "commit": "7af5e8af08da8455c489909afbd9528a61f570e7", - "sha256": "1rmfxbnl2y6yx1869sm5203k7hch481wh5dq6lik5bj00cf3knc6" + "commit": "497bde38772e6fd2a393dd292435ae3787580db4", + "sha256": "16qpmabp57231mpjvx7wbcxxbhp3i7ir1yhp792yxfibjz1gi299" }, "stable": { "version": [ 0, - 9, - 1 + 10 ], - "commit": "7af5e8af08da8455c489909afbd9528a61f570e7", - "sha256": "1rmfxbnl2y6yx1869sm5203k7hch481wh5dq6lik5bj00cf3knc6" + "commit": "497bde38772e6fd2a393dd292435ae3787580db4", + "sha256": "16qpmabp57231mpjvx7wbcxxbhp3i7ir1yhp792yxfibjz1gi299" } }, { @@ -84846,19 +84968,19 @@ "unstable": { "version": [ 20230915, - 941 + 934 ], - "commit": "6734dfc1992eb782f0a936ce3cd7c78b7c1d39d3", - "sha256": "0ry8lvp0cfw304y79gq28b2vx5a75lkybrkddm3qldgqxwgakdsw" + "commit": "d57fd7cfa878a6862f4dbcf80f98a30d63872ab3", + "sha256": "04hfcyi9nl5ghchv1r3bshq968xxhlkvv1jd6j35mk2jca1wdkmz" }, "stable": { "version": [ 0, 26, - 1 + 2 ], - "commit": "6734dfc1992eb782f0a936ce3cd7c78b7c1d39d3", - "sha256": "0ry8lvp0cfw304y79gq28b2vx5a75lkybrkddm3qldgqxwgakdsw" + "commit": "f5727b32127730a2722f86c7119eb6d8f884e26d", + "sha256": "0qkralffnq141ksl5y6564lmryqhks72kvf3rblg8pnzjbcsad5v" } }, { @@ -85060,26 +85182,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20240319, - 1005 + 20240414, + 1312 ], "deps": [ "org-re-reveal" ], - "commit": "0a44a385a565b8e39908c36dd32d5b231ffee9bd", - "sha256": "1gjmnxplpm7p4ylsypds809jqxw942anddq09v8frnrrbhi5q0sh" + "commit": "4a8000a196e663be9fec61d0e6fed27814945086", + "sha256": "1rcydba1si626bqdh6j8537lnivyvr201dw7dmrxvkqpk9q6v1xy" }, "stable": { "version": [ 4, - 22, - 0 + 24, + 3 ], "deps": [ "org-re-reveal" ], - "commit": "0a44a385a565b8e39908c36dd32d5b231ffee9bd", - "sha256": "1gjmnxplpm7p4ylsypds809jqxw942anddq09v8frnrrbhi5q0sh" + "commit": "4a8000a196e663be9fec61d0e6fed27814945086", + "sha256": "1rcydba1si626bqdh6j8537lnivyvr201dw7dmrxvkqpk9q6v1xy" } }, { @@ -85130,16 +85252,16 @@ "repo": "tarsius/ol-notmuch", "unstable": { "version": [ - 20240101, - 2222 + 20240415, + 1546 ], "deps": [ "compat", "notmuch", "org" ], - "commit": "881991d94a1ad750633fcf1f2d8a9e0616979be3", - "sha256": "1hc4bkkg42pj1i3vy6jm0rqvviiizn61nph74nvms5v08fb0yn09" + "commit": "05f3fc9ea77d32892726c94cd7a876733890da91", + "sha256": "1jbwi4vpvcl7zzbx5rjmpmxp1mh1lxbprgxryqmj5mync0gx3a0k" }, "stable": { "version": [ @@ -85848,20 +85970,20 @@ "repo": "danielfleischer/opensub", "unstable": { "version": [ - 20230716, - 1018 + 20240405, + 750 ], - "commit": "216f60baf8cfd527fd84676b7389f463a04ae80c", - "sha256": "1hgkpkcgy342wyzdvnb0lb9vpr6fsym42ahgmmnq63ijw5r5kiq5" + "commit": "2e3d55fd1ebc909caa81b06f3323d123ec557d03", + "sha256": "1bw3sp5i9zanrkgkwd69rc11ay3pmk5x42ifgyvg08ql7zlghxx2" }, "stable": { "version": [ 0, - 1, + 2, 0 ], - "commit": "216f60baf8cfd527fd84676b7389f463a04ae80c", - "sha256": "1hgkpkcgy342wyzdvnb0lb9vpr6fsym42ahgmmnq63ijw5r5kiq5" + "commit": "2e3d55fd1ebc909caa81b06f3323d123ec557d03", + "sha256": "1bw3sp5i9zanrkgkwd69rc11ay3pmk5x42ifgyvg08ql7zlghxx2" } }, { @@ -85959,11 +86081,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20240320, - 1638 + 20240401, + 959 ], - "commit": "3847f311077efa17951a786d2759f2639c5f43c8", - "sha256": "1gc3ysa1yhi6pz8bafbdpj0avdhms0rfd1r3k5mrhnm8mgh6zq8q" + "commit": "ac4aeb66f331f4c4a430d5556071e33177304c37", + "sha256": "1nphxjsxd6bi7lbhx5r1nzay6gkkwhm1q995k90gg9zcnyxz9k0c" }, "stable": { "version": [ @@ -86201,30 +86323,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20240311, - 2016 + 20240427, + 1628 ], "deps": [ "dash", "promise", "request" ], - "commit": "f4737a04a82f8592ef623da40e65881ee5aed718", - "sha256": "1rqzjppaf2h7y5lvqzjll9dg71gwkm81wgczqswxgd880r3v29a4" + "commit": "75c2cd6ababf3e2808107af32efc754bfd06a88b", + "sha256": "1plh177491bbfaybpaphd407iaadlm9imsdpkd8nws0qa9sflaw5" }, "stable": { "version": [ 3, - 2, - 5 + 3, + 0 ], "deps": [ "dash", "promise", "request" ], - "commit": "f4737a04a82f8592ef623da40e65881ee5aed718", - "sha256": "1rqzjppaf2h7y5lvqzjll9dg71gwkm81wgczqswxgd880r3v29a4" + "commit": "75c2cd6ababf3e2808107af32efc754bfd06a88b", + "sha256": "1plh177491bbfaybpaphd407iaadlm9imsdpkd8nws0qa9sflaw5" } }, { @@ -86634,14 +86756,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20240302, - 2226 + 20240415, + 1535 ], "deps": [ "org" ], - "commit": "21da50c95b279b5fa528b353181275f935de1e1d", - "sha256": "1rmd2d0w6f28cgdp4vibs4h2nz69i25s0s4x7vwhfjx8393bmyc0" + "commit": "086a8f385138ef71f7e29f78f19fb3a65f8ee27c", + "sha256": "09j9sbjpj9bgxx2rrrmsyz9vk0xmhsljy6qrdjjzm230k80817xw" }, "stable": { "version": [ @@ -86813,14 +86935,14 @@ "repo": "ArneBab/emacs-org-clock-daytime", "unstable": { "version": [ - 20240303, - 846 + 20240403, + 1115 ], "deps": [ "org" ], - "commit": "82e2cd5a523f5fda75176a08eb120a0872700add", - "sha256": "1xbhigbb7r1cfp0f63bg3k6x9kqbxffjvykfvj84llgjzqjns6rg" + "commit": "f10c7b92a5b2a25f2300b885c2c70526ada50d9c", + "sha256": "1a1scmv3m8r4mm2nr4iw7nihv5ms8h16r2pvmghkb7w5lqd0p8cv" } }, { @@ -86957,14 +87079,14 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20240311, - 850 + 20240410, + 1128 ], "deps": [ "org" ], - "commit": "6660db078f7687af3bc31f702e3e957d4d7654bd", - "sha256": "0i0jkdn2wd7q9nzacaldhwx0i027951j0dp24pgkq34radqldjmb" + "commit": "0ff9a6dae6c1b67f0da0c63bc75b8c1063eac85d", + "sha256": "00ds6zyraf2nzj73mr3ncq2p9dn1b39cddqwj0fsglk3hlwg7d87" } }, { @@ -87005,14 +87127,14 @@ "repo": "gsingh93/org-custom-cookies", "unstable": { "version": [ - 20220928, - 114 + 20240414, + 44 ], "deps": [ "org" ], - "commit": "e57e0de5b8200224bf5d44b62481c542986f2f13", - "sha256": "1r3m7nvx10yzxsasld3h59psml4r7kmz2wn79n5xkppkpb0dbymn" + "commit": "5650c73d20e53310dab62f6a65754a55aea9b40b", + "sha256": "0sjjjmcalkvxw1v09av20bmsf4av60x2nkq0y792pwm80mgxcc0m" } }, { @@ -87193,7 +87315,7 @@ "seq" ], "commit": "e55415221eedba2f2bd37a30cb71c842e344b5ee", - "sha256": "079x6rcz50rpw0vdq5q2kjpixz95k9f3j9dwk91r5111vvr428w3" + "sha256": "0gjkl8j8jrimg45z9bsfkkbvmxsplh3nyqgr8g8d5mqm0w9b4pn3" }, "stable": { "version": [ @@ -87207,7 +87329,7 @@ "seq" ], "commit": "4c114489e682e514e79701045d541ab6f3dc3fb4", - "sha256": "079x6rcz50rpw0vdq5q2kjpixz95k9f3j9dwk91r5111vvr428w3" + "sha256": "13y302lyscdqrba1sfx60yf5ji2xi7fbsvjsjbw7hiz63kg6rccy" } }, { @@ -87526,8 +87648,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20221212, - 1817 + 20240426, + 2253 ], "deps": [ "aio", @@ -87538,8 +87660,8 @@ "request", "request-deferred" ], - "commit": "9bb3720525ad1c45823abab8ce910dd1225e7dcd", - "sha256": "0b7i1xc21vsjcvbkakkgzhidnypc5anmb9mdkh9mab09d7kxkbc7" + "commit": "9f9d93e4f0d5863b1318e9e702e1ee6e841c2649", + "sha256": "1v0mq8fh3d0az6w9bgn599l8rmns741j92iw0fskarfyfyn63z57" }, "stable": { "version": [ @@ -87969,7 +88091,7 @@ "jami-bot" ], "commit": "020b03f299dad438f65d7bcbf93553b273fd7c33", - "sha256": "0fj166qawhnjbc14237fj8ph4f4xdjka7p8r2gxkfq6h0z101nr2" + "sha256": "18nhkmmrzs6i6px23c88wlml0gn43b38zfvpwq8bnabq3ak6q7j2" }, "stable": { "version": [ @@ -88171,6 +88293,25 @@ "sha256": "1hr4xk89zphahaa8n1fjwf6y7bfvnn30ck8pysjlfwa5510fpw0w" } }, + { + "ename": "org-linenote", + "commit": "8c973d58fba117d4c09fd09849251891a0904c7e", + "sha256": "11kv2xy8lzzs21mn5xp0cg1r3npajbwakrhi5j05z0x3p9i2v4am", + "fetcher": "github", + "repo": "seokbeomKim/org-linenote", + "unstable": { + "version": [ + 20240325, + 320 + ], + "deps": [ + "projectile", + "vertico" + ], + "commit": "4c081f4bbe13c48df7cb17f2f006465b8b95196b", + "sha256": "0a8pcds5vv5px47gzvmv94ymvhki7kjqah8i4w43f0lpx9dhwqzx" + } + }, { "ename": "org-link-beautify", "commit": "2cbc9e1af903ffc900be7ec0ed1050ae9ad81011", @@ -88303,7 +88444,7 @@ 9 ], "commit": "edf9f6f7254f72be939daf92942f76f44b72d32d", - "sha256": "0ijlmfq6dbdmk3jpl87g4knk4l76yxf63nmk3n2nll3v3swbk22g" + "sha256": "0jmavx9cd49y7lqb0zjpfyslqfd21a1anhpb6n6ksrxn65q6pf9q" } }, { @@ -88443,14 +88584,14 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20240316, - 1109 + 20240428, + 741 ], "deps": [ "compat" ], - "commit": "a2ff4c8e9cac412e8cb9c7faf618ac18146107ea", - "sha256": "19mn29f294wng6pgm1vwncx50963wnh7zj33ipynx8qxndbi6hsm" + "commit": "a06443c1d0251decada41a3bdca30f712cf9a96e", + "sha256": "18q7xab693ql68vlpxbn066pn7yshrmmqi6m0r2v4193mhlffflr" }, "stable": { "version": [ @@ -88806,7 +88947,7 @@ "ov" ], "commit": "b95b6a7ed9289637cb512232470633b330ca9713", - "sha256": "0gjvd7xd9kl06cgdyya2qbl7r4a9y4zfq1ci0109w5axs3zjin1m" + "sha256": "03x3n2ywgk2x7slpzy26bw3l9l000pd964z0yifvf9fqhpbk5d0r" } }, { @@ -89038,7 +89179,7 @@ 2 ], "commit": "549fa6969660dcf0cf9bca5b7341d0cb48ec3b77", - "sha256": "0ksj6hssyr44qnvb32qj9lrq825ivvndhck9gzx4h7gbxmvq12a4" + "sha256": "12s74if74vw8q5awgrk0d1244ysfgb9kw3dxhypsccsbf413jmii" } }, { @@ -89195,8 +89336,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20240222, - 200 + 20240403, + 2027 ], "deps": [ "compat", @@ -89211,14 +89352,14 @@ "transient", "ts" ], - "commit": "e41fe9018a4699532ec875bedddc9746f8e362aa", - "sha256": "1rvnxlnpb6yk06frdfs1szz98823hqjmi646kwb00b39qhyynzfg" + "commit": "c9370982bfd4df04b590762bd795a7da3012c4dd", + "sha256": "1df7qd9f74gvpixpqchn1j47g4iwq6r9cvpc2g9cnb9mb16r2mjk" }, "stable": { "version": [ 0, 8, - 5 + 6 ], "deps": [ "compat", @@ -89233,8 +89374,8 @@ "transient", "ts" ], - "commit": "bfff0b5517d55d01bf12de27e10a73c9a077767b", - "sha256": "1wnvrjx9r9f1ykfdafj9pz1b0n669bqmixb5q35kmahyjis8rswq" + "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84", + "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj" } }, { @@ -89328,28 +89469,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20240318, - 645 + 20240421, + 716 ], "deps": [ "htmlize", "org" ], - "commit": "827961d69d56a2c9a777dc6280d8cd832ede125b", - "sha256": "11if1c1a0i6i2wagjwqmvp2hfkv3slpq7r6dfbpkhlmils2hxr9p" + "commit": "81cf9dfd3be4480bbaa6d0b6452ea38e8d4e45c0", + "sha256": "1qbp198xg8pkd9zdvapq8bdsxilgqqync8m3r1csg8nz8lbpkk1b" }, "stable": { "version": [ 3, - 26, - 0 + 28, + 2 ], "deps": [ "htmlize", "org" ], - "commit": "827961d69d56a2c9a777dc6280d8cd832ede125b", - "sha256": "11if1c1a0i6i2wagjwqmvp2hfkv3slpq7r6dfbpkhlmils2hxr9p" + "commit": "81cf9dfd3be4480bbaa6d0b6452ea38e8d4e45c0", + "sha256": "1qbp198xg8pkd9zdvapq8bdsxilgqqync8m3r1csg8nz8lbpkk1b" } }, { @@ -89415,7 +89556,7 @@ "org-ref" ], "commit": "abcd622e4edaa5e4480bcd1e7e4953f67c90e036", - "sha256": "1467vskijg2n8k7fa2jj2hz8xr2s04r8a89521wmz54cza21g5j4" + "sha256": "08ia6gn0x0yydl28dhghifyxz0mrn0asllqg4s449gaz729cxqkd" } }, { @@ -89507,8 +89648,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20240307, - 1757 + 20240426, + 1644 ], "deps": [ "avy", @@ -89524,8 +89665,8 @@ "request", "s" ], - "commit": "190248311f90cfc4f0cceef20c7bd52a5d5aa66f", - "sha256": "079lmfl2zm8pb0xlkansw9rbxrpn3dnmzwjajp2gma03b4gnw4v8" + "commit": "feaf7ea25cefaa347e6d593bf3a56064b92f16d6", + "sha256": "0ksyrc3wcbw965mpg6avd2qawksbz745lyqh15hlsmx70q0rvs02" }, "stable": { "version": [ @@ -90024,14 +90165,14 @@ "repo": "jcfk/org-sliced-images", "unstable": { "version": [ - 20240324, - 2009 + 20240325, + 710 ], "deps": [ "org" ], - "commit": "3a3d1704f82e909056294b3ac1da350dfea1ce30", - "sha256": "084anl78vq77i3j5jw0rq0cj383si0yp87d8z2amck6dg11gmn33" + "commit": "f3964d4ba421953fe9f109a99811b6d884ca56ab", + "sha256": "0lf275dqvgjfsh6kfmrb05gxcv78ng6pdijj2b1c2arw4pwsjb0r" } }, { @@ -90443,14 +90584,14 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20240216, - 939 + 20240422, + 607 ], "deps": [ "nerd-icons" ], - "commit": "6ec9f65e98df1e7f8a55c98bd2a3c0433fbfc5db", - "sha256": "15glg771jh3xp1fyyyvrqbxfv7vxy91vg54cg204h04gl3z1bwdd" + "commit": "2f8b66e7aa2227411665f36d96bfc8a1b184bfbb", + "sha256": "0qz3f8phczmpyj8n6m9851cscwb7z0nkn4b5w79k21pgfhcmp6zf" } }, { @@ -90534,36 +90675,6 @@ "sha256": "1rwdibiq0w4nzccmvdkpwnmfga70y35lfg2xlkqxd02x7bfl7j3m" } }, - { - "ename": "org-themis", - "commit": "60e0efe4f201ed96e90c437e3e7205e0344d4676", - "sha256": "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln", - "fetcher": "github", - "repo": "zellio/org-themis", - "unstable": { - "version": [ - 20160122, - 404 - ], - "deps": [ - "cl-lib" - ], - "commit": "78aadbbe22b1993be5c4accd0d3f91a4e85c9a3c", - "sha256": "1apd5yyr12skagma7xpzrh22rhplmhhv0pma4zf5b0i6nkxy06j2" - }, - "stable": { - "version": [ - 0, - 4, - 1 - ], - "deps": [ - "cl-lib" - ], - "commit": "4b4bf1fa1e853664bf006dda8afe2db00e522aaa", - "sha256": "12fksqi9flf84h1lbmbcjnqxa7dairp50wvlwfhbp1hbb8l9z63a" - } - }, { "ename": "org-tidy", "commit": "47c3731d47cd408457a677230d525e7ba6baf7c0", @@ -90838,7 +90949,7 @@ "org-ql" ], "commit": "a7c386ff134c71fd4f1f042e320751f077d57ddb", - "sha256": "11xbm6161rd5kv2bffqw678a7bymclvhpmm1qjxsvmi8bhfk1ls0" + "sha256": "1xc9g82pmd6fl48bbibwp5rb044cj2j0gw9d6qvn73pqdg8mj9jy" } }, { @@ -91101,16 +91212,16 @@ "repo": "akhramov/org-wild-notifier.el", "unstable": { "version": [ - 20240223, - 1211 + 20240325, + 744 ], "deps": [ "alert", "async", "dash" ], - "commit": "1b04c4104ad72bbb3ced161ba99e1055ff766138", - "sha256": "0d3rmli39sxdjp2rv0xlwjilgf9xsys20j66cb44a58mb5x61y2w" + "commit": "4c1679c12ebe0e4a97494d0673a5484f9e4d0ba6", + "sha256": "0d7zrawh4im8iyp2z32p4g8fbyznfq4liaxhavq89z8pliiv9zny" }, "stable": { "version": [ @@ -91487,16 +91598,16 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20240101, - 2222 + 20240415, + 1546 ], "deps": [ "compat", "magit", "org" ], - "commit": "84bcb5c318f01b9ffc8d5aa18a7c393fe9c714b2", - "sha256": "0apwwjdndhkghax5dnp4v9xh4018i4gngz5bannzvkhp26izaf3y" + "commit": "ca3bf7aa20074e25fee37b71cfef127b93a3dde7", + "sha256": "1ml64ddahk6szbynzrjm4zglkxhv9lgmaipm6fysalx48nxqvshh" }, "stable": { "version": [ @@ -91521,8 +91632,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20240101, - 2222 + 20240415, + 1546 ], "deps": [ "compat", @@ -91531,8 +91642,8 @@ "org", "orgit" ], - "commit": "f2ff9e5ad68b3e860379a1d368ad6d8a9696b719", - "sha256": "1pm03d65jw6jvfypl6syl5z2jl1vn0gp67xwjx7934q1fq4gm0nx" + "commit": "7b010465ab96bea6d380ae1cfbd7999d528f1de9", + "sha256": "0xqwzb7jmh7mlq4b6wk7kkhgwjwb399bv215bx2n3iq9bi2x6mv8" }, "stable": { "version": [ @@ -91559,16 +91670,16 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20240101, - 2222 + 20240415, + 1547 ], "deps": [ "compat", "org", "seq" ], - "commit": "f62d2804026c10a1da0b7c4a4cb0d647bb2e4829", - "sha256": "0id5ms2zjjanih2isdq0043ry1ygj22cci3cpjc6h3si6m4jrj89" + "commit": "e513f25024b2db082dbdbd8bd713d57a2b7456eb", + "sha256": "0dmh9j9dz3j7h881126zj9bpbzh5sr444qw5029wfmsq4x5ls0yg" }, "stable": { "version": [ @@ -91992,14 +92103,14 @@ "repo": "xuchunyang/osx-dictionary.el", "unstable": { "version": [ - 20240226, - 511 + 20240330, + 942 ], "deps": [ "cl-lib" ], - "commit": "8f16ffb465b64c9dd566c8b7316b34896ce4c52b", - "sha256": "047y7zrih5d5x7m9i116yq951iyscb7ika1z4y864mqhd0ljhwvb" + "commit": "6abfd6908b0dc773020466225c908000870b383b", + "sha256": "16mvkrs82g6zhaa10r28v8br0cshv1bsbywyb1qkc8hdkj1hh37j" }, "stable": { "version": [ @@ -92213,14 +92324,14 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20240101, - 2223 + 20240415, + 1547 ], "deps": [ "compat" ], - "commit": "77dd2a24f3db3641980cca515fbc4cfafdf03630", - "sha256": "1w4n9zwd2ipc8pw6vvxx0xah9zxv0avv075j77k0is5j51iwn635" + "commit": "9f5c75e996388ead3472cd0dce8e9fc00407e210", + "sha256": "11jn4y2pa5v6bkijaf0d6ahg9zbz4mn11v9g1j46ldjwg3c7mbsf" }, "stable": { "version": [ @@ -92910,7 +93021,7 @@ "s" ], "commit": "e8cd440632fd46812d7311360f565828a12380b7", - "sha256": "0v2lrmak1lhaccwm2a68z4w554ng38wpk0sbw2qaj8qn03gv9dn4" + "sha256": "118km0hgxf1nss765cnykqyymjhg30pim9qjyxl31v07khr1d373" } }, { @@ -92921,11 +93032,11 @@ "repo": "DamienCassou/ox-linuxmag-fr", "unstable": { "version": [ - 20240319, - 2034 + 20240326, + 722 ], - "commit": "eab473296b8319a052ca30d27e07508e876ca8d9", - "sha256": "007f3r38xnsg1b0srzx2qvcjbkdnkfh0mkhpa8fcph9wdnc4aj6z" + "commit": "893a401db7d3b93e977b3c2608169dbb6e3fbdce", + "sha256": "1fh36w8iyrh5pqrfrcrh0f6clrmin5vg7r7hcg70z8s6w08ylzfy" }, "stable": { "version": [ @@ -93630,14 +93741,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20240306, - 2234 + 20240415, + 1547 ], "deps": [ "compat" ], - "commit": "236ef4e4d615699d4ba8b7ad28bd40b87d269411", - "sha256": "1s5ik92l3nz4k19l4a73p8y2pp4zx22w4iinj892kx5xakdh1s10" + "commit": "d9ce37b82529827ce720ad3ccf4af887d19fcfb0", + "sha256": "1hnv0yjc0yyjcp369z9nlvyxiqmzs0zqz5g6ly9cc3g43bjfavbj" }, "stable": { "version": [ @@ -93672,25 +93783,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20240311, - 1058 + 20240330, + 1458 ], "deps": [ "let-alist" ], - "commit": "fce93b7edf4e971b2cbe3425c1d773ffe0aa8a62", - "sha256": "1myhdhb3kwq03f3p7qgb9bk8srs1wlag4ch4kl26yb9213mzx8gv" + "commit": "17e4ab20dd3e36fa540007b4f4047170c23bdb10", + "sha256": "1xr7sq7pvvdw9prf2vds048s5s7fq1s0cxs21sxdc54sszy17nsg" }, "stable": { "version": [ 0, - 22 + 23 ], "deps": [ "let-alist" ], - "commit": "fce93b7edf4e971b2cbe3425c1d773ffe0aa8a62", - "sha256": "1myhdhb3kwq03f3p7qgb9bk8srs1wlag4ch4kl26yb9213mzx8gv" + "commit": "17e4ab20dd3e36fa540007b4f4047170c23bdb10", + "sha256": "1xr7sq7pvvdw9prf2vds048s5s7fq1s0cxs21sxdc54sszy17nsg" } }, { @@ -93701,25 +93812,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20240311, - 1058 + 20240330, + 1458 ], "deps": [ "package-lint" ], - "commit": "fce93b7edf4e971b2cbe3425c1d773ffe0aa8a62", - "sha256": "1myhdhb3kwq03f3p7qgb9bk8srs1wlag4ch4kl26yb9213mzx8gv" + "commit": "17e4ab20dd3e36fa540007b4f4047170c23bdb10", + "sha256": "1xr7sq7pvvdw9prf2vds048s5s7fq1s0cxs21sxdc54sszy17nsg" }, "stable": { "version": [ 0, - 22 + 23 ], "deps": [ "package-lint" ], - "commit": "fce93b7edf4e971b2cbe3425c1d773ffe0aa8a62", - "sha256": "1myhdhb3kwq03f3p7qgb9bk8srs1wlag4ch4kl26yb9213mzx8gv" + "commit": "17e4ab20dd3e36fa540007b4f4047170c23bdb10", + "sha256": "1xr7sq7pvvdw9prf2vds048s5s7fq1s0cxs21sxdc54sszy17nsg" } }, { @@ -94330,14 +94441,14 @@ "repo": "tarsius/paren-face", "unstable": { "version": [ - 20240101, - 2224 + 20240415, + 1547 ], "deps": [ "compat" ], - "commit": "d36fab3529aa3e046493ec373f2c080874cc184f", - "sha256": "1kliaybdcgfs6wadxggb8r82vdnhfa39aar3f8i9vq6w21ljdr4r" + "commit": "0cad6a4657ebfcdd2902746b99f01fea7cc05bd7", + "sha256": "17r70dwlg23kpv2dx4j7bs3pshisgz1j8k70vv3izyq0qg0n6vlp" }, "stable": { "version": [ @@ -94384,20 +94495,20 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20240319, - 1546 + 20240419, + 415 ], - "commit": "3e95b19cd1e0ec5a8f92ea0a4a1f74ce6a8997ba", - "sha256": "0rkrn8imvi9vk6vi3wgv0a6zgxvw5jjvj58h5n79maw13rzdnwzf" + "commit": "823188f3d8d1f00693c3d1d754e58ad95ad0a8dd", + "sha256": "0cfn4na6xrapc096yyqs0kw8ni7ls49fds9k92ahlr67919m437v" }, "stable": { "version": [ 0, 8, - 5 + 6 ], - "commit": "3e95b19cd1e0ec5a8f92ea0a4a1f74ce6a8997ba", - "sha256": "0rkrn8imvi9vk6vi3wgv0a6zgxvw5jjvj58h5n79maw13rzdnwzf" + "commit": "39f588e3f58ef1a8a301c031f831b8f74fbb3ec1", + "sha256": "1pr4dqzawgqid2aws31zxnlf3363bgnj7djav324b5q2xic5qfy7" } }, { @@ -94671,6 +94782,30 @@ "sha256": "0nwfdf5ik7d11l2h2fg4pszifv3fncpxjzs933gj91mvjy2wrw98" } }, + { + "ename": "password-menu", + "commit": "4881eb8662e068c32776e63306c26c982c170e0e", + "sha256": "0qk6c1j5sj4b5xkpl4xx5g3g4l7cavbjfc177mc5s5b31lmr3kwj", + "fetcher": "github", + "repo": "rnadler/password-menu", + "unstable": { + "version": [ + 20240407, + 2241 + ], + "commit": "46fb7241f7ee8ff646b9a3ea1b3138031de1c0d6", + "sha256": "07ksbdzb17pmdgyrk77wf3nr5pn9y95jf8c1hmdi4bifvhqyr4c6" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "46fb7241f7ee8ff646b9a3ea1b3138031de1c0d6", + "sha256": "07ksbdzb17pmdgyrk77wf3nr5pn9y95jf8c1hmdi4bifvhqyr4c6" + } + }, { "ename": "password-mode", "commit": "28dafa392a378e7de2c6992fe17b33f6379dc6b8", @@ -95260,15 +95395,15 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20240317, - 848 + 20240411, + 1703 ], "deps": [ "let-alist", "tablist" ], - "commit": "93e74924517d39483b432d6c3c9b8f8b8f0eb50c", - "sha256": "1js123pg2qbq5ql1hc7lwzrs4wqcdghsypvvwsm1qm9mi017g1h6" + "commit": "94e9f20a78f64a83daf641891923681a52d03919", + "sha256": "0gz20v97aaf7mny029xwypnagy6cm20hh4slcsfhcd0s9dvdqfsl" }, "stable": { "version": [ @@ -95759,14 +95894,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20240218, - 437 + 20240414, + 359 ], "deps": [ "cl-lib" ], - "commit": "460311b6e76f33de947908da74b6cbf66118d487", - "sha256": "13h83c4xn1xq29w24bgpkycacxswn34mdyx2lav5czwkmyi16ri8" + "commit": "ec48cb3bdda8c5ea12da89a12aa925ed1905a0b7", + "sha256": "1hg059nnyarnkx0wh1vl7qkdaqb2p7ifk9ciz35s6ffnc242jas5" }, "stable": { "version": [ @@ -95948,19 +96083,19 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20240314, - 1247 + 20240414, + 1912 ], - "commit": "686dbe8cc7a94c65faf933695093645e53aa3318", - "sha256": "18v03ix5vg8a8w2ic5gik052p15d2mgnb112dvnxba69dyz6vsm3" + "commit": "4b71a337fedf16678e546fa8d1df0ea496762f40", + "sha256": "0m1pcabz5mxxxsk0ixw8388q9fkbydkj64mnzn371a9jxdl16b0v" }, "stable": { "version": [ 0, - 30 + 32 ], - "commit": "bca35bd60fde1f561e21080768017f6727469d88", - "sha256": "1g04izsnvxinbwvzx0sj643ix5jlwdd7dkl61nvaqkkkm3g35jp6" + "commit": "4b71a337fedf16678e546fa8d1df0ea496762f40", + "sha256": "0m1pcabz5mxxxsk0ixw8388q9fkbydkj64mnzn371a9jxdl16b0v" } }, { @@ -96426,8 +96561,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20221023, - 608 + 20240407, + 1500 ], "deps": [ "async", @@ -96435,8 +96570,8 @@ "f", "php-runtime" ], - "commit": "dde09addf36017527441a855054406f8ffc4e534", - "sha256": "11jah2d520qqyfil2qbhblph233a9wjwzbhpc7yzhbqdm29pr9vr" + "commit": "1916e35e08d746a6ff8a2cd88ae43bdb6842feab", + "sha256": "0c9diqgy8v0bcx5011z2sd0q7s2xn2f4y7mpgv0x5fi0qh2a1mw1" }, "stable": { "version": [ @@ -97619,17 +97754,17 @@ "repo": "alphapapa/pocket-lib.el", "unstable": { "version": [ - 20190720, - 1957 + 20240407, + 2247 ], "deps": [ "dash", "kv", - "request", + "plz", "s" ], - "commit": "f794e3e619e1f6cad25bbfd5fe019a7e62820bf4", - "sha256": "0iv03wjwmz0di8n5bndmq5r18r1pq999v1scyay0jm1cxlksqafg" + "commit": "b13c899223a15481738c3105f07ee2205dcc937c", + "sha256": "0b5451fwsjqb603mmgw6kpd8w4gvndg3fxbdb44ib2245ynr5mms" }, "stable": { "version": [ @@ -97672,8 +97807,8 @@ "repo": "alphapapa/pocket-reader.el", "unstable": { "version": [ - 20230904, - 539 + 20240407, + 2303 ], "deps": [ "dash", @@ -97683,11 +97818,10 @@ "ov", "peg", "pocket-lib", - "rainbow-identifiers", "s" ], - "commit": "ef6b6892ef13eff3479d79c7f6bc918dd0444e88", - "sha256": "10zlalqmdrdp46i2hxk1gf0wdqv74x99qq91a8acqjx30jnld9j6" + "commit": "cb9f6b108ebd3a67f77fb75d85351ffb3b0bb3d4", + "sha256": "0d0mfagx43sqrfyshnwm4acvh6h06jl6l11nvppqhb2hdrrdx0ia" }, "stable": { "version": [ @@ -97774,29 +97908,28 @@ "repo": "cybniv/poetry.el", "unstable": { "version": [ - 20240103, - 947 + 20240329, + 1103 ], "deps": [ "pyvenv", "transient" ], - "commit": "ca2cffb0b174e9d814ad95178af84b525dd2b64d", - "sha256": "18vl4fzgf97grz8r6sj1m3brr2cd6jcf5y60v4jhnllwkjfnx52i" + "commit": "1dff0d4a51ea8aff5f6ce97b154ea799902639ad", + "sha256": "0n5v6c75pal2xd8p453jrd046zkv0y1pzgn5w2n2ws1009pw6crs" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ - "cl", - "transient", - "xterm-color" + "pyvenv", + "transient" ], - "commit": "6fb34742a66421c6104e02d65e8d391fc4494ab5", - "sha256": "0hdicdskf928s7qdlzxq25ibfmwi8llmyhy1bj2py56wr2qv3cfy" + "commit": "2cbc690c8c1153e578ecb376367d355a7669f9ec", + "sha256": "1b473vpj5ac9pgkcgqgjqska5g6gr81djvixphb9r58334wyr9d2" } }, { @@ -97912,34 +98045,32 @@ "repo": "mavit/poly-ansible", "unstable": { "version": [ - 20220113, - 1656 + 20240418, + 1123 ], "deps": [ "ansible", "ansible-doc", "jinja2-mode", - "polymode", - "yaml-mode" + "polymode" ], - "commit": "6d74fe80b7e61a35aa0fa36a520eaf5c9c027c51", - "sha256": "0idzq8fyspzfq3nwcn58k01rlqrqyywx2732ld994slmiwgyggas" + "commit": "5c4423671c051db26a48de72773abdf2395bb6aa", + "sha256": "0fmbxhn8cbfdad37m1jssm1jblia0b4fzdv89lrz0k5wqyzlkz4g" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "ansible", "ansible-doc", "jinja2-mode", - "polymode", - "yaml-mode" + "polymode" ], - "commit": "d76f6ec2374ec46ad78f2d0c3e1d1d91ee44c2bf", - "sha256": "0f0yq6gmkp194nxk90ipprglf1xkmxrgz1rkgrhfslvxq4q2l81h" + "commit": "5c4423671c051db26a48de72773abdf2395bb6aa", + "sha256": "0fmbxhn8cbfdad37m1jssm1jblia0b4fzdv89lrz0k5wqyzlkz4g" } }, { @@ -98695,11 +98826,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20230714, - 227 + 20240426, + 604 ], - "commit": "017deece88360c7297265680d78a0bb316470716", - "sha256": "1gv46z6dyy04ivd2sbsifmr140gxv16dbwfzmxj1q9gvhlxxnxc8" + "commit": "468ac1ab50d7e0feae2c06f12596bbc169f2abe4", + "sha256": "10q76iggl3hpdhwzm48kadn129i2567fjnpxid8kxmqffk712k8y" }, "stable": { "version": [ @@ -98962,8 +99093,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20240206, - 414 + 20240426, + 1202 ], "deps": [ "ghub", @@ -98971,8 +99102,8 @@ "magit-section", "markdown-mode" ], - "commit": "5294434883aa61f24ca6d2768a83ca924645a186", - "sha256": "1jbq0z5vz8isc41144iy7i72hk6njnxz068cmpb7gxcs9jdxvg6n" + "commit": "0a15e3616de643abd18c51da601f72ea4d88256b", + "sha256": "0dljczzvhirmwbnrpza982anfb5bsxw2g1jwi1pgxmjawvn8z7n7" } }, { @@ -99847,14 +99978,14 @@ "repo": "TxGVNN/project-tasks", "unstable": { "version": [ - 20240321, - 340 + 20240408, + 611 ], "deps": [ "project" ], - "commit": "2db15b1dd88a92d51890ed1b6ab1007ec09c30a4", - "sha256": "1zapqprbfw99jv0kii1ajwlz9ix9d7w66lf8l67h7nzqls5pqi3j" + "commit": "87852d5290154e21cbb07b2685fa46edc4963977", + "sha256": "0f50panks1j9yzfwwizk85al00lp46lpc1r0s18j3gx7bda588xg" }, "stable": { "version": [ @@ -100160,8 +100291,8 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20240317, - 1257 + 20240421, + 1410 ], "deps": [ "compat", @@ -100169,8 +100300,27 @@ "project", "s" ], - "commit": "20548689eead0a86fcc921491047f392fd6b120f", - "sha256": "02ncfcbkwj933crrhca5wmfv55qpsc7szjvbdapkazzg5j4gqmlr" + "commit": "d0aa74fbe08d7e28b95a0d2006399565f51655ef", + "sha256": "1j02vy7s10c8ddhfclj66xfnk34rb5paf2hzjm9lnpn4krif64wm" + } + }, + { + "ename": "projection-dape", + "commit": "9b114dafe3799c768dbae169df34397c88fee651", + "sha256": "0ggq1jr46am1qlf934vc431bjwpyvw8pasg6n9p9b16hc77r1i1x", + "fetcher": "github", + "repo": "mohkale/projection", + "unstable": { + "version": [ + 20240325, + 1931 + ], + "deps": [ + "dape", + "projection" + ], + "commit": "68abb9dfab5e85daa31961be10362ca02effeeeb", + "sha256": "1zksskn924v4la718326gyafwgmlbrrj6k78wrv422a1n9wrq0s2" } }, { @@ -100375,11 +100525,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20240306, - 2002 + 20240425, + 939 ], - "commit": "a6f8243ed2860cc7c9cb051496f1543d981e9f7e", - "sha256": "0fdzak693zb5lndxkdgb8af5hpichgkhhpxnl6pcnd1r6v01ahnr" + "commit": "6cace58d0d632c4eafa18959319a484fb5c07238", + "sha256": "128ixkmfjs4g83r00fvj7wp0azgmmabkhhhv8mqqm7zbj9rii611" }, "stable": { "version": [ @@ -100488,10 +100638,10 @@ "stable": { "version": [ 26, - 0 + 1 ], - "commit": "d6511091a0cab1ad13f676a02676ad2a0e5eb9ae", - "sha256": "0qi72mfwck0a3iwzvacl497bmz872pyzrdgya0w47r29y65z0m3g" + "commit": "2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5", + "sha256": "1n7w40wypayplykxhknm6sljzbfbm64mg1zysrjidac3hwqkxh7n" } }, { @@ -100929,7 +101079,7 @@ 2031 ], "commit": "d76c5d5589a4f8a94cc5537686d9a3b46ea7cc59", - "sha256": "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q" + "sha256": "03872n1v5qqqblviq9sf2ml6ibs50mcjrh0i35sb0m7l202nh52b" }, "stable": { "version": [ @@ -100937,7 +101087,7 @@ 8 ], "commit": "708cae8e67dbae293c7c4be0ca5e49d76fac6714", - "sha256": "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q" + "sha256": "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py" } }, { @@ -101172,11 +101322,11 @@ "repo": "ideasman42/emacs-py-autopep8", "unstable": { "version": [ - 20231025, - 2256 + 20240421, + 840 ], - "commit": "3e3f6c182455bf85284cda7f4ffe639444b84940", - "sha256": "05xqdja61p3c3sx836z3c1jjbm0ih2mrw13qnkp2hhh3ahyz2qql" + "commit": "3b103f2a99a71c4b4733689d074f895b2606fbe4", + "sha256": "0zmpbg1zi66mx9r1nbzkx0nkimzhfzvhfcl8cjfffbpqpikpw50w" }, "stable": { "version": [ @@ -101841,10 +101991,10 @@ }, { "ename": "python-cell", - "commit": "0549866c5e96f673ec9dec298e7ff9d5779d443b", - "sha256": "07i3vyci52jvslq28djwkgx1r157wvxd99rvqlxnmmsl5yj4k1jf", + "commit": "3c7664b33aad6a03e3482bbed57bf5b9878361a8", + "sha256": "13sm5nq14ds1cbv144vrbrj2crghkrsy6vywxg8m3av833n4ijmv", "fetcher": "github", - "repo": "thisch/python-cell.el", + "repo": "twmr/python-cell.el", "unstable": { "version": [ 20240126, @@ -102038,7 +102188,7 @@ 0 ], "commit": "906b0a107f7bcfe6e32bcfedb977e6f0f99fda59", - "sha256": "17clkgs94dgq5nsjlwkr52m5s446ibfss3qc8a8m0zaz6j4f8l1m" + "sha256": "0d7hc2llr9dkjyfgyyjb2k72rny0j395a29pqgqgqyrwcn8b1py1" } }, { @@ -102049,8 +102199,8 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20240314, - 1038 + 20240416, + 1128 ], "deps": [ "dash", @@ -102058,8 +102208,8 @@ "s", "transient" ], - "commit": "46fd006462258a3366723fafacdf2db6a6ae689d", - "sha256": "1ahpzay6gbxrcin4ldcp1sm17fcvg94n729haj3zgcalsmhjlx90" + "commit": "9f850e22df93812a5b109968c549f9b3dd828ed1", + "sha256": "1f5b7ffcpmry2xiphclc4vv1zqva9rrhn08fgjq8qhdq3x0i5jah" }, "stable": { "version": [ @@ -102155,7 +102305,7 @@ "python" ], "commit": "e606469aafec2e6beda8c589540b88a5a6f6f33f", - "sha256": "0vyipfsppissa87pdnbksamdby0yl2q8nzawqivv6smn33jp6vsn" + "sha256": "00i7cc4r7275l22k3708xi4hqw2j44yivdb1madzrpf314v3kabr" } }, { @@ -102752,11 +102902,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20240319, - 2002 + 20240418, + 1446 ], - "commit": "fd3e3ddf12aef6d7661b5a2c0f70afc7107b7fd9", - "sha256": "15ciqhns9q6gqv8wxjd71mijacpsi3lg4f1hqy8z58r7gzjr8av7" + "commit": "d5f4007fd2c2604673125035f4852dce1b639b33", + "sha256": "0di1xb89i6r9lxc86ny53f7w7pqqd0r21qrf663jkjxlakhbwjzk" } }, { @@ -103365,19 +103515,19 @@ "repo": "simenheg/rdf-prefix", "unstable": { "version": [ - 20230321, - 1949 + 20240403, + 1710 ], - "commit": "70d1ef453fc55f0bfbb4bd3127112332e5b0f623", - "sha256": "1jbbaq9h9k2gacrd0kwsav0s5w682wdxgs6pkj9d3c0zg5c3m8mk" + "commit": "c591608d12278b293a14c27ab2df72a269eb535d", + "sha256": "144syl2rcvnnys6agzac962skiwl1xkm1xfkqsgb01ivflb2bx3c" }, "stable": { "version": [ 1, - 13 + 14 ], - "commit": "70d1ef453fc55f0bfbb4bd3127112332e5b0f623", - "sha256": "1jbbaq9h9k2gacrd0kwsav0s5w682wdxgs6pkj9d3c0zg5c3m8mk" + "commit": "c591608d12278b293a14c27ab2df72a269eb535d", + "sha256": "144syl2rcvnnys6agzac962skiwl1xkm1xfkqsgb01ivflb2bx3c" } }, { @@ -103976,11 +104126,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20230910, - 1154 + 20240422, + 15 ], - "commit": "4c9002938fa0480c68e22b86c20d20cea6396ce6", - "sha256": "09ipia5rp787xxmz5chv9d86g2jjbkz92v1aqz3nkf2avrl8f8il" + "commit": "9b4ab842e37eed9b8314ba81b4eac49beeea8c1c", + "sha256": "1m9cz4g672wzsf2np7lzksgxl75bc790nq51gy97qrsjbwn6gj99" } }, { @@ -104428,11 +104578,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20231122, - 1110 + 20240417, + 2146 ], - "commit": "f9ad995553be1e6dd70540d7ab1ca0be3077438e", - "sha256": "0nqg4mr9218avv6yfpgzcr8ah2y9sq9bfpkdavsiaj3ispa0fhhd" + "commit": "a1ade7985656faf00f8a6afda885e8bdf959d133", + "sha256": "01j8i1z6mf7c2g59yzx6hrd799pxk6rdq2dvsl1r0bppgi5kv8dy" } }, { @@ -104825,26 +104975,26 @@ }, { "ename": "repo", - "commit": "1729d4ea9498549fff3594b971fcde5f81592f84", - "sha256": "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb", + "commit": "8438830e9048bc93cb30e1bc01368f44e978714e", + "sha256": "003brbwi5l9wsap74f75v2x0ngdkpks43xq5lhvix0795kcsf83s", "fetcher": "github", - "repo": "canatella/repo-el", + "repo": "snogge/repo-el", "unstable": { "version": [ - 20240119, - 859 + 20240425, + 1307 ], - "commit": "a257b3f8f47fbb4fc7d5dea967dc543e01c58fee", - "sha256": "084d968fgf79vas4jjmm0rmvaf2d4zqxd6c63s2xzcxql1byybzn" + "commit": "1572f3ee82eaadc06e741f03e1889281308c79fa", + "sha256": "0y8j3hf5r69fxj2vsbaxwr9qdchddn53w25xzmxv1kfh6hbagzv3" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "7b3ce731f1209d74113cb65a2d6aa6f54ce8ed27", - "sha256": "0jgiawdnzjlrpx2j1y6djwbqncdpmyfd31q1qf1890049y8ppxnb" + "commit": "1572f3ee82eaadc06e741f03e1889281308c79fa", + "sha256": "0y8j3hf5r69fxj2vsbaxwr9qdchddn53w25xzmxv1kfh6hbagzv3" } }, { @@ -105139,6 +105289,68 @@ "sha256": "06ml74xks6kv694qfmiw3wckm75xjrpy32r2lby7hbbpf7f3ds6p" } }, + { + "ename": "retraction-viewer", + "commit": "5d4b3aba837a2d8470f0ffbb7289b06519329d8d", + "sha256": "1xvhqapkykka6x697zzjb2x9664fa70f3g6imd5aqmliwb2j956x", + "fetcher": "sourcehut", + "repo": "swflint/retraction-viewer", + "unstable": { + "version": [ + 20240419, + 1316 + ], + "deps": [ + "plz" + ], + "commit": "280fbb60c44a184e0060640966ad9ddc80602e21", + "sha256": "0a9zrlhb943ni4bqc9ma8f2wx0y7vp51jmmf8b0kgy82yx8m6blq" + }, + "stable": { + "version": [ + 1, + 0, + 4 + ], + "deps": [ + "plz" + ], + "commit": "87efb813a0dd3b320299d771779e68efe4344cf0", + "sha256": "0kmhmak47c9ffi0wc21k1qrq8gxgdzv064s38vzfw67781d6mi8a" + } + }, + { + "ename": "retraction-viewer-section", + "commit": "5d4b3aba837a2d8470f0ffbb7289b06519329d8d", + "sha256": "114ngh654q0mdxavmpqrkmwr98ivw0cxdn07a1mgvfb0mcfrr2za", + "fetcher": "sourcehut", + "repo": "swflint/retraction-viewer", + "unstable": { + "version": [ + 20240419, + 837 + ], + "deps": [ + "retraction-viewer", + "universal-sidecar" + ], + "commit": "87efb813a0dd3b320299d771779e68efe4344cf0", + "sha256": "0kmhmak47c9ffi0wc21k1qrq8gxgdzv064s38vzfw67781d6mi8a" + }, + "stable": { + "version": [ + 1, + 0, + 4 + ], + "deps": [ + "retraction-viewer", + "universal-sidecar" + ], + "commit": "87efb813a0dd3b320299d771779e68efe4344cf0", + "sha256": "0kmhmak47c9ffi0wc21k1qrq8gxgdzv064s38vzfw67781d6mi8a" + } + }, { "ename": "retrie", "commit": "12ed1c6d8e2aa4f73b793f9e16e8e13985fae944", @@ -105313,11 +105525,11 @@ "repo": "ideasman42/emacs-revert-buffer-all", "unstable": { "version": [ - 20230109, - 536 + 20240421, + 836 ], - "commit": "08e90d2d75f5d5900ca2a0d2670592bcf2b2d68f", - "sha256": "0yiki0vlxa7xkw19c4gwf5cxl32bhd2nm6ibpfamsh145gq4i8g7" + "commit": "d49462047ebb442d7872f12007380797ee49473c", + "sha256": "0qhkvrbhsvw3vwawj47xb23i11i1pkcypcmn4r4fy65qcpzjm12g" } }, { @@ -105433,7 +105645,7 @@ 1940 ], "commit": "4aab5a5be16b69b47ef5e67d02782df5e41dbd7b", - "sha256": "1zq4nnp3yqv46129kazm76bvdqvjjhlrfg95bkdxvkd7qrdjc9a3" + "sha256": "1pancvhm4g4010814jy1cdhdrjh5hlig2j31fcsa5jn331d7rj6g" }, "stable": { "version": [ @@ -105442,7 +105654,7 @@ 0 ], "commit": "4aab5a5be16b69b47ef5e67d02782df5e41dbd7b", - "sha256": "1zq4nnp3yqv46129kazm76bvdqvjjhlrfg95bkdxvkd7qrdjc9a3" + "sha256": "1pancvhm4g4010814jy1cdhdrjh5hlig2j31fcsa5jn331d7rj6g" } }, { @@ -105590,7 +105802,7 @@ 0 ], "commit": "c7c6b726806df7e8cb25a41b213a207850c91cb7", - "sha256": "18rba101m9vmjl4mf3x0k7wvbgn6qmay9la745vzpr3lx1f4nn98" + "sha256": "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5" } }, { @@ -105787,7 +105999,7 @@ "web-mode" ], "commit": "6cf58cf04fee933113857af07414b3f27c24b505", - "sha256": "0b3gqs1lsk80shirsc41zajzjbg1sgzksmnfazffx88h612p7ygd" + "sha256": "0s3hs0w6hz8vx4172mfraiqfjhd1a9h1w61ra6fklc5fjf3y8pn8" }, "stable": { "version": [ @@ -105799,7 +106011,7 @@ "web-mode" ], "commit": "6cf58cf04fee933113857af07414b3f27c24b505", - "sha256": "0b3gqs1lsk80shirsc41zajzjbg1sgzksmnfazffx88h612p7ygd" + "sha256": "0s3hs0w6hz8vx4172mfraiqfjhd1a9h1w61ra6fklc5fjf3y8pn8" } }, { @@ -105855,26 +106067,26 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20240319, - 254 + 20240327, + 308 ], "deps": [ "inf-ruby" ], - "commit": "863dcfc41e15200e476995586c2aa7bc9cabc5c8", - "sha256": "02s2kp7nh924i2iwys1q3yx4zgwj9hxnfl0x3ny5lzz8j2ijb3vn" + "commit": "e8c86ee553589ff03418102426420b5049d4a044", + "sha256": "070r79mdydhv6l7mia7xshzmp0jgvkfjvnpgg361m5xs92mprxfr" }, "stable": { "version": [ 0, 8, - 4 + 6 ], "deps": [ "inf-ruby" ], - "commit": "34ce25eb9b1956389276adeca93b679bf0a84451", - "sha256": "0kvyfyr4b0z0l964a8z9shy8nlnxzxc2ljcc02gj2pn1rn1wz0gq" + "commit": "43a85c2eb6e52f4e684919210dd84d67289938c1", + "sha256": "14apmvbs89si3v5hsiz11dckp8fdfidm14lc090lswq7mgk7h79s" } }, { @@ -106057,7 +106269,7 @@ 4 ], "commit": "71e475ab35555e0a1eca26d73acf1ced911e422e", - "sha256": "0y18i4ly61jyvxymvgjr99arhxfn5y5s659jnqf4gvyp3d671dkf" + "sha256": "0x3mmf4gq4d0cqfqbkrrpwhayvmplacck0zc9nlzcn35y17jzpcz" } }, { @@ -106086,8 +106298,8 @@ "repo": "mbeutelspacher/ros.el", "unstable": { "version": [ - 20231212, - 729 + 20240328, + 855 ], "deps": [ "cl-lib", @@ -106100,8 +106312,8 @@ "transient", "with-shell-interpreter" ], - "commit": "66e0cc154dc7d8ae105f2c95ed9f6a16445945d0", - "sha256": "1c5c8678vclr7z9jgfyr67cz77ny810vybimx3bgxflanh9w102a" + "commit": "7ddba9077b3bc48074c8fac72159368bb612c42b", + "sha256": "0hbqnn5hwq6ssn57c248bkv1mxpx6lchfv5r4hk2xdl9v7d2aav0" } }, { @@ -106728,11 +106940,11 @@ "repo": "ideasman42/emacs-run-stuff", "unstable": { "version": [ - 20230601, - 19 + 20240421, + 807 ], - "commit": "65afd896896a68e6262187745f5e3ac5145ba1ed", - "sha256": "0dk24izzkg01rm2cyrq1iwmrdcsfpzzyrplz1njhmwhpq9ys65iz" + "commit": "518ffa247bc71e31514d9e90257107da32f94939", + "sha256": "0rcdsia5kvmw1fxrydg18yg976axm1ki7vsg80binafb1p47s6rm" } }, { @@ -106843,11 +107055,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20240313, - 157 + 20240415, + 936 ], - "commit": "87bf4ea711456c858445ec4c22b3552fd796708d", - "sha256": "16sc646nc54fnr52y5zrgpcr4rb7isbmc9gf8fd164k2x64h8gv0" + "commit": "e54bbae8c4c2af580b5721ad5ac151f2ad19293e", + "sha256": "1vzgyizvn3p7f1p8awnlm4n2fh7b6j3cs636zyqpqck32x4pdqda" }, "stable": { "version": [ @@ -107448,11 +107660,11 @@ "repo": "hvesalai/emacs-sbt-mode", "unstable": { "version": [ - 20240208, - 626 + 20240404, + 1105 ], - "commit": "bcf8d6040021013430b39d6f6766ce1aab0b691a", - "sha256": "0mfa8qlv4hgqsfxci7ikmfjy9kns67v21k9laa9kbphzxm82qp21" + "commit": "cc68728a6ef0600aad369157b3a2d0ce56afba9b", + "sha256": "0378c40mx6yfv9cz14sbhck8c1xm4wbj2l7jr0xbq1zj7sp1frc8" }, "stable": { "version": [ @@ -107543,11 +107755,11 @@ "repo": "KaranAhlawat/scala-ts-mode", "unstable": { "version": [ - 20240309, - 1136 + 20240420, + 1150 ], - "commit": "0a34b23b3b71be1e0ce307df873434c08408fc57", - "sha256": "0dzzygq4cfckmwr7a5lhr140kyy45z15q02r4c9kaxz9cjg4zdvf" + "commit": "d9424fa74acf930664c43d4c9f9625d8bfdd4d21", + "sha256": "0sc2sx3pgifcnd2zw7nvk3f8z3v1zh2q94d9rnlayvwr6y4cnlq4" } }, { @@ -107890,11 +108102,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20230313, - 546 + 20240421, + 803 ], - "commit": "179c2acecc48d3ceca4b449b2a225d684002bb32", - "sha256": "0v7d4mrsvckbb66kvskfb9rfrhg8p0zbkr6jqdspfl1p3x8zs2nk" + "commit": "f1a39a34f6ba350bcb6fe5927584d6e1cbaf72e5", + "sha256": "1igr324vhzl19z7crw5v8g0zc5wznqjdnx1fq3jxqjmq3185a9d6" } }, { @@ -107905,11 +108117,11 @@ "repo": "ideasman42/emacs-scroll-on-jump", "unstable": { "version": [ - 20240204, - 1217 + 20240421, + 905 ], - "commit": "c079d9321646bf4fd65b684fcd130cc4833c2e43", - "sha256": "0isisg0pkl8hl0xd310jbmflyga1sy1a5sdd673py9jmz5nbiz00" + "commit": "b89127aa03a1add43017493c51f1f09b775bc92c", + "sha256": "1i3hq9lhb0rsq3ccwkaw151bk4gb68d0vwzwklxwaz4yx2np9rn8" } }, { @@ -108006,20 +108218,20 @@ "repo": "precompute/sculpture-themes", "unstable": { "version": [ - 20230905, - 439 + 20240424, + 1715 ], - "commit": "7165c7655873ca3c3dc9ff878ddf8a9bdabcf4d4", - "sha256": "0w1jx2033nrki4r9yw2hwg4rvsqq3jj1als0im6ia1rk1x8fxqq8" + "commit": "723a3b348e9970e3f85910bdf319925c4f241a7d", + "sha256": "1nr1zd651mjgqaqfbmmn8l06iylszcn5qcrfswq9l5p3znm0d1x9" }, "stable": { "version": [ 1, - 4, - 3 + 5, + 1 ], - "commit": "a21871b75cc7cb575ceb43640d039307fbb412e1", - "sha256": "0ki45bvc93p76mxpsm5pyknqgf67xz6c122yssps1hcxhdazij5v" + "commit": "723a3b348e9970e3f85910bdf319925c4f241a7d", + "sha256": "1nr1zd651mjgqaqfbmmn8l06iylszcn5qcrfswq9l5p3znm0d1x9" } }, { @@ -108160,7 +108372,7 @@ "s" ], "commit": "91c56311b48a26aa6ef5a113b0a828e174059b0a", - "sha256": "10ikd6ksz5adpldyx9h8s3qnwc488rqixzwnd0rjjwqigmllj9lb" + "sha256": "1iyq8m75gzyx2ww919i4zl63gajsaczgwax214a1jgf8x91j590k" } }, { @@ -108318,14 +108530,14 @@ "repo": "captainflasmr/selected-window-accent-mode", "unstable": { "version": [ - 20240209, - 1230 + 20240427, + 833 ], "deps": [ "visual-fill-column" ], - "commit": "e83efa67c4a9d1935c657a15b4487102cb6655de", - "sha256": "14i8h50n49mw9960vlsahzf1rbn1mj9400gapil9id9q2xysdpmd" + "commit": "79397e634a89c5e16de1d317f735aafe75c78aea", + "sha256": "0dwb4j62n13dg8kl2maci1668v0nsnc55xfjfva3wm5singb72zl" }, "stable": { "version": [ @@ -108426,14 +108638,14 @@ "repo": "jerryxgh/semantic-thrift", "unstable": { "version": [ - 20230711, - 958 + 20240415, + 1206 ], "deps": [ "thrift" ], - "commit": "87029282bd59cbba6ae815c0b1a207f02813f5dc", - "sha256": "0bvwj401ixc9zclsm0xzkrw62jrsa24dsrgpb6fyra91rvnmwm27" + "commit": "a2ff23acc72f7955a485e08e2819d4892d5e6dca", + "sha256": "0d5qb2s6hcsn6937p3fj4kayyyfn5i9fms117gh5x1iirkis9cg8" } }, { @@ -108851,11 +109063,11 @@ "repo": "vspinu/sesman", "unstable": { "version": [ - 20240115, - 2143 + 20240417, + 1723 ], - "commit": "ec7390c0d0fb8b278aa06848634f922bc893de31", - "sha256": "1is8ny27xzlx2shhps75xi0hdipkj7jphbsl1bgzwvmln9jqfd9v" + "commit": "7bca68dbbab0af26a6a23be1ff5fa97f9a18e022", + "sha256": "1gl2dv7smyxkga4b5dflahqhasw9k15ppc4s0py29454p5k861yi" }, "stable": { "version": [ @@ -109000,14 +109212,14 @@ "url": "https://depp.brause.cc/shackle.git", "unstable": { "version": [ - 20211118, - 1129 + 20240402, + 1315 ], "deps": [ "cl-lib" ], - "commit": "f1467db75a8fa5d51c676181fb308ccbf7b05e6f", - "sha256": "00dsk1v7rqj6rbm3lbvgv7dib8wqding5122ln1rrgddqyrrb2fs" + "commit": "ae25e7e0e593520c8590440fe5e3c0ea8053dc26", + "sha256": "0qh7fwcs1ach4y1vd7nfa8m3afv64vm95ix3q9dzi6k6wa86i12f" }, "stable": { "version": [ @@ -109582,11 +109794,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20240208, - 217 + 20240423, + 31 ], - "commit": "dc5136d20a546cbf741e0e5835a441859fdab384", - "sha256": "1iwzdgkx2711kcbzrkizifff071wnqgpm22s6pq8l1i0p8dn3rbz" + "commit": "1da8d4f11cc5f79bce124d0a32be59be18359373", + "sha256": "063klgl664n8qw82g7c31vsbw1npw7l2jc5n2g9bndhhq8hg5g2g" } }, { @@ -109772,27 +109984,28 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20230805, - 500 + 20240401, + 957 ], "deps": [ "language-detection", "org" ], - "commit": "946154a05b14a270f80351d5b2a98b19aa6c5745", - "sha256": "0qqvw7az7cr20kss7szvwqmbznqb160jg13akdxkiiksgzng0f90" + "commit": "b82a174ee33f19ed96c7e8c85ec362eab147d4aa", + "sha256": "0qspg55r397p6p16c4cps547x2w7gdplshy3scr810iwphrzsvfy" }, "stable": { "version": [ 2, 6, - 3 + 4 ], "deps": [ + "language-detection", "org" ], - "commit": "3dc6b980a4235b084abeae500a377e60026c28ef", - "sha256": "1gg0z15a4rygi0dxabnlpjh56sa7kwxw3fji6ibk70l1jwgd7ydc" + "commit": "41e7cfcb42f97d652835e0b702f29aae5955f1f4", + "sha256": "144w7fvfrk3659d5ig8rbl3qwmcb5ssgnqgs798vfwanni7r1ggg" } }, { @@ -109826,7 +110039,7 @@ "s" ], "commit": "9b8cfb59a2dcee8b39b680ab9adad5ecb1f53c0b", - "sha256": "1xnby24gpxij1z03wvx89s459jw0f8bwhgi80xvdq8gxhbbz2w7a" + "sha256": "0kx0c4syd7k6ff9j463bib32pz4wq0rzjlg6b0yqnymlzfr1mbki" } }, { @@ -110035,11 +110248,11 @@ "repo": "ideasman42/emacs-sidecar-locals", "unstable": { "version": [ - 20240227, - 151 + 20240421, + 655 ], - "commit": "2b2b765387f2cbae9935c3ee6e2a32aa8d68f1b8", - "sha256": "1nbdip04zdk583s0glbfa5g657vvhsia3h19nr6gwakvlkgv33wb" + "commit": "3daf8c07fac7c4ada7a02a1edad2f64894463614", + "sha256": "1jzsc1vxkxyvh66s6xz064s252jh2s6jrh157gi3rzkfkc7gcdwz" } }, { @@ -110050,14 +110263,14 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20240319, - 315 + 20240404, + 900 ], "deps": [ "ht" ], - "commit": "04a525f624e1a42c47a2755fbc63be32104f44cb", - "sha256": "1imbb2026vrlrqwjay05442q42w8a1vhb5chl6rdhs504vxaxdp3" + "commit": "c1729b2b9d2ca6b37bf605ca2271e570f30316f0", + "sha256": "0ck92g14fhhi1xg76na8ck8ivv5wx5igh898wzr5p6qx92mv5hf7" }, "stable": { "version": [ @@ -110109,16 +110322,16 @@ "repo": "emacs-sideline/sideline-flycheck", "unstable": { "version": [ - 20240313, - 2304 + 20240402, + 2255 ], "deps": [ "flycheck", "ht", "sideline" ], - "commit": "1b3fc4d41b93ab3fa3754d188545d9e8cc0150f1", - "sha256": "0qh2v4jx0bvpcgac3h7kbd87bvgqdrvr7fw2m2syjspfbk7jqb65" + "commit": "212b8193becc012d39ccb1e68abf0e19f68764f4", + "sha256": "0g6i9ql35w9p3k941g2n9rj0md7j1snr6dpm9y4sid8fbyxvs1f2" }, "stable": { "version": [ @@ -110172,8 +110385,8 @@ "repo": "emacs-sideline/sideline-lsp", "unstable": { "version": [ - 20240101, - 918 + 20240403, + 2210 ], "deps": [ "dash", @@ -110182,8 +110395,8 @@ "s", "sideline" ], - "commit": "0a085a29b943eede42824981b5d0cd9fb951e9d8", - "sha256": "0xpqxdfqy8wv2wcqwzwhhmvlg15d120sicp2965qsp762slafqhc" + "commit": "69aca6403509abb4f5c5ba8499e98f80f81ebc88", + "sha256": "0jh81bc7dl309v6bxfh2d39f9lbp61bsdanflym33lsvdyl59zrk" }, "stable": { "version": [ @@ -110453,7 +110666,7 @@ "rtm" ], "commit": "37c5feffea7c9b571279b6f549d06cf9c0720273", - "sha256": "1kkhnsxr8zrb21k4ckyg69nsndwy4zdkvfw2drk4v1vnbgx8144f" + "sha256": "0rwvlhwg66ny0rm972wjfz41ck9kqmbax49wkagrkimm1cdrjfia" } }, { @@ -110641,8 +110854,8 @@ "repo": "magit/sisyphus", "unstable": { "version": [ - 20240106, - 1315 + 20240415, + 1548 ], "deps": [ "compat", @@ -110650,8 +110863,8 @@ "llama", "magit" ], - "commit": "85f73d86b9a058461e77ed4db372aafcf6666a13", - "sha256": "0z4ipba6zjck49wlm47b5f0c1mwi8dqylh2aq6xxlrcw4f3nn1lr" + "commit": "38285f880302b9a2363085d816d6cd660ff7d17d", + "sha256": "0vkyfc9rbc22x7a7qy8i3w97a8p65qvjz5jxiqbh2vldp57hx5f7" }, "stable": { "version": [ @@ -110965,27 +111178,25 @@ "repo": "slime/slime", "unstable": { "version": [ - 20240324, - 2347 + 20240427, + 406 ], "deps": [ "macrostep" ], - "commit": "7e8e754f0eec45beeb7294b1c2d28257fa24ad29", - "sha256": "0q51rghv7baz2ni983cvzhmnxhskshwzcc6ab6x75rmayfwpipir" + "commit": "c2e45e7004743fdd8620e2fea67f30a17b6a558a", + "sha256": "1f8i31b2b21v5r0awahhjqn499agalqnzy8lyp3wj91r0pbsqn1f" }, "stable": { "version": [ 2, - 29, - 1 + 30 ], "deps": [ - "cl-lib", "macrostep" ], - "commit": "d85dd9899f7524513c8ad1bd47b0dd248b1915cb", - "sha256": "10as5qz1f838rqf0jkd28zlz0sahls5rzpbx3mw48k2vgkjl24z6" + "commit": "ef2af895a9e79306f0789e72b101aa39e960c900", + "sha256": "0qb7m65gq0mbxfrdppkh3k4jn13i14i07ziga4r8b3rmrxhrmlv0" } }, { @@ -111222,11 +111433,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20231213, - 1030 + 20240413, + 2145 ], - "commit": "ed17d2c2bd7aead0fbb09c3d22861c80a522a097", - "sha256": "1hgxv0mj89n3ll4cisxmkqb9xfqrxwahyzr0a4jijh4z94j71l8w" + "commit": "0ebe705c08af7126e0b2ce66a33fc7d23864b193", + "sha256": "1a7xi627dqm9zvhj5ky50h7z4nkcr54xal05mgq8hf9r0c8xba9g" }, "stable": { "version": [ @@ -111764,15 +111975,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20240324, - 946 + 20240416, + 2253 ], "deps": [ "cl-lib", "dash" ], - "commit": "ddc6233ea6fc2da7a3a8e44face465c15631b02b", - "sha256": "1hv4v9451qjbakpw1ivz4yas8f9xbmxj48f1jn37y31x6j2d1bnn" + "commit": "d3b616843167f04b8a9f53dd25e84818c9f6fbce", + "sha256": "04vv9swkn3l2lcdb4ncmc6vr3967mglfgiabn1978gyhv4xp9nwm" }, "stable": { "version": [ @@ -111796,11 +112007,11 @@ "repo": "myuhe/smartrep.el", "unstable": { "version": [ - 20150509, - 230 + 20240416, + 2148 ], - "commit": "f0ff5a6d7b8603603598ae3045c98b011e58d86e", - "sha256": "1sjwqi8w83qxihqmcm7z0vwmrz1az0y266qgj2nwfv39bri6y4i6" + "commit": "fdf135e3781b286174b5de4d613f12c318d2023c", + "sha256": "11r3j2p420y5y3r0ffz91498cda2l4b2kkyhngri5i4dcncmngwy" }, "stable": { "version": [ @@ -112197,16 +112408,16 @@ "repo": "danielfm/smudge", "unstable": { "version": [ - 20231217, - 1531 + 20240413, + 2104 ], "deps": [ "oauth2", "request", "simple-httpd" ], - "commit": "a847e344887863e9c8aa37c909c64350defd1b73", - "sha256": "112844fr8pw6g6b95iiyhmbhmy0hqml0lgc59d16llgd463dbc32" + "commit": "4a9c5b34e9bc0a694d0faf8c2f83dc244b8b6a2f", + "sha256": "1xiqxw87sdk9mgy7fdbmzqaf58dc1grhkigirg1bd0b2q5kbnbwx" } }, { @@ -112352,15 +112563,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20240228, - 1320 + 20240423, + 858 ], "deps": [ "dash", "s" ], - "commit": "50ead3321c448261d974ca05cd811fcd2232aeda", - "sha256": "1lx3mqmr8b3hccn6m6gzl12y3z8h6va7479daib1qy489inlk6wz" + "commit": "1791011310fe8d48fc8c5b79b32cb5cf586fb081", + "sha256": "0jdsyfj83y1i9dfc7d8d840brgz5q02cyxp4iqkq3a065gsajrwr" } }, { @@ -112566,26 +112777,26 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20211213, - 102 + 20240407, + 1751 ], "deps": [ "cl-lib" ], - "commit": "8af65fbdc50b25ed3214da949b8a484527c7cc14", - "sha256": "1lkm09wznal0grpz61ikc77mjrri1x1bi79qwyf1cah9s0wv3isq" + "commit": "8ccdceeb9298b3c4e35f630914f467bf164f39ad", + "sha256": "164qqzmj1321rkvpiwpr5xnm1nbniibjkymfw5az32m2acdwk52j" }, "stable": { "version": [ 2, 0, - 4 + 5 ], "deps": [ "cl-lib" ], - "commit": "8af65fbdc50b25ed3214da949b8a484527c7cc14", - "sha256": "1lkm09wznal0grpz61ikc77mjrri1x1bi79qwyf1cah9s0wv3isq" + "commit": "8ccdceeb9298b3c4e35f630914f467bf164f39ad", + "sha256": "164qqzmj1321rkvpiwpr5xnm1nbniibjkymfw5az32m2acdwk52j" } }, { @@ -112766,14 +112977,14 @@ "repo": "emacsfodder/emacs-soothe-theme", "unstable": { "version": [ - 20220922, - 349 + 20240415, + 837 ], "deps": [ "autothemer" ], - "commit": "d8aee0fca549d535ebb7b5fd1a8017f12925d16b", - "sha256": "1bcwm07j0w8876vlzfpyh789n00w5dafx42zdbl612dpf6awika4" + "commit": "a8d3d964cfe9fc2157f45d2d26647a450ed9161a", + "sha256": "1c58b6rq890mklm5cv3hnnhwvjn4vb0ipvka0vdzmhpbbr4hkhf1" }, "stable": { "version": [ @@ -113373,11 +113584,11 @@ "repo": "ideasman42/emacs-spatial-navigate", "unstable": { "version": [ - 20230115, - 633 + 20240421, + 908 ], - "commit": "11f281ae16b541ede9b4fadf96200e1728eb6ed0", - "sha256": "1wl8fvm9v3gsbdn0y9xzwnfh4ak5cdn0xdp0g816q5y3r5dyiywp" + "commit": "4f85fe3ae4d240a35d3d7edd8b865612024f9dda", + "sha256": "0vdqjw2ih7fngqy34wmxszq9bil49l3gnhh2ig6x3ah2wf47g401" } }, { @@ -113388,11 +113599,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20240316, - 58 + 20240425, + 103 ], - "commit": "d1b325c8e7e2ac079de1314f91b980b354117248", - "sha256": "0870vlygdkyd8b6z9kykiqw48b64s0rrr68ir3ig30wmzs2r2441" + "commit": "28801aa911d43bb0b2545f83781a3c629266fd72", + "sha256": "15a26n645snjr92vp46pyv1pbkskb8arvvfb6hi8sy8m4vxc1bm3" } }, { @@ -113430,11 +113641,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20220608, - 1422 + 20240427, + 2112 ], - "commit": "7e30c439729d5635ddd341ad5ab16f832a4619ea", - "sha256": "18xgqp8r1bgj63g2n08jbx4jwdcjn3p2lpdndyvfm394y2nzkcxr" + "commit": "64218c59f1636af6a0cb3690bf0bedae1dd17442", + "sha256": "1m7bfbk1iwdqa9dnf1b0isbl7pj3msxx4j6grr4d4pzb4hqphbfl" } }, { @@ -113516,11 +113727,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20230808, - 1342 + 20240421, + 2351 ], - "commit": "540141a5764ceb403e78e22f6714e2dab3597bc7", - "sha256": "0m4ml9x4mc3h3ychjgnqcg4nwdxxr5qq6hrlwam7yb3ggndh19vq" + "commit": "7f9332a299b41e1fa4da9a82669f5981f6ffd3cc", + "sha256": "19155y36mxdqrrnqw62hmysprvw1dajap1y4rcx1nr7j9xkwjs6h" } }, { @@ -113964,14 +114175,14 @@ "repo": "purcell/sqlformat", "unstable": { "version": [ - 20230808, - 543 + 20240325, + 1006 ], "deps": [ "reformatter" ], - "commit": "c28c5f85828b25f7f36320b585056ea4b7181a9f", - "sha256": "0shspminb6j5fjp34qqvglcn2i22fhs8if3f36sws3rzwhfml7jc" + "commit": "f1c8f864f11f4af65551de445dcf65543be0583b", + "sha256": "0amkd2ic80y9dvmgbiv5a2agrs56ajmz3x3ibg1vi5crn8gxad8h" }, "stable": { "version": [ @@ -114154,11 +114365,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20240113, - 2244 + 20240425, + 1823 ], - "commit": "78a31cc9714c80d41f19e33ce5b4cf09a14bfca9", - "sha256": "1xml90yrbswcq22lazrl5nwqamfflwry607zj88xk60xnxk2r55l" + "commit": "75b5b3e9b49bb450c1245ba7d7627ecb27baa53d", + "sha256": "0xaa2wa8p3606gclw2myj57sglii150dq9w26qisvhxym3i97r4k" }, "stable": { "version": [ @@ -114626,20 +114837,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20240218, - 2150 + 20240407, + 2229 ], - "commit": "38ff3c3b2adc6d2c0f2e8fe5cb59f67d701741b3", - "sha256": "1g526gpcfjfkkh55by798hlgqph15vl0a1iw9332825wkqjawi6c" + "commit": "9afe502c74f51ed7d4e794da11c01e25718b0f64", + "sha256": "1sa9pndfjsja0gk7jc8vlfpzmahpvbqpb8b1dx6cl0568w13s1b5" }, "stable": { "version": [ 2, 4, - 5 + 6 ], - "commit": "38ff3c3b2adc6d2c0f2e8fe5cb59f67d701741b3", - "sha256": "1g526gpcfjfkkh55by798hlgqph15vl0a1iw9332825wkqjawi6c" + "commit": "9afe502c74f51ed7d4e794da11c01e25718b0f64", + "sha256": "1sa9pndfjsja0gk7jc8vlfpzmahpvbqpb8b1dx6cl0568w13s1b5" } }, { @@ -115615,8 +115826,8 @@ "repo": "isamert/swagg.el", "unstable": { "version": [ - 20240324, - 2014 + 20240326, + 737 ], "deps": [ "compat", @@ -115625,8 +115836,8 @@ "s", "yaml" ], - "commit": "747102ae3448e8dcd5209308447375fd0fee4f89", - "sha256": "1azagz784g73zrcd092qmc5abk2rc9zq225chp2db2mm0v1bf1c0" + "commit": "27d5e7d06c2296cd356ac4a5b97ec84f2dabbb53", + "sha256": "0c7j62rd9yd9ckk28gxbh0lffamm479v1zcl7rsdircfnkixkks3" }, "stable": { "version": [ @@ -115875,6 +116086,21 @@ "sha256": "17gcg55jajq3am3nrzlsibkdwskq1rbg3lhgxynkpky0ihci35nr" } }, + { + "ename": "swift-ts-mode", + "commit": "8d5397099835d6aa85e99cf5a54e240e7515e405", + "sha256": "00vz0j00hfhzs6j9rqgah2h8zxnsnrl1v2dymjvyrgi3i7wdfny5", + "fetcher": "github", + "repo": "rechsteiner/swift-ts-mode", + "unstable": { + "version": [ + 20240414, + 949 + ], + "commit": "a62f4d84b836fe208d912c26fb561c93a0c8e296", + "sha256": "0zzx8fg17vzh0r8ln884zg2kd7qj1bn9mnnvcr4fiv0x4dc16sgg" + } + }, { "ename": "swift3-mode", "commit": "0ca9071199230d3c4c1b2e3a501736df87095fd3", @@ -115907,14 +116133,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240214, - 2118 + 20240405, + 1642 ], "deps": [ "ivy" ], - "commit": "749ac1235a7948011cb0caddd4c31037e3314614", - "sha256": "0d598jxdrxjlszaikh27v7j2zdndisfqzb384d94siw4rwzfj4zr" + "commit": "e0b1a6c224afb652d11b315913b8ad0c3ca8ecbc", + "sha256": "06370wzd058lx1k9dl76zzs0r9nycnlggfxxdw2691q8ypjqbd7q" }, "stable": { "version": [ @@ -116259,8 +116485,8 @@ "repo": "drym-org/symex.el", "unstable": { "version": [ - 20230322, - 2003 + 20240418, + 806 ], "deps": [ "evil", @@ -116273,8 +116499,8 @@ "tree-sitter", "tsc" ], - "commit": "0b65804d08c9ff61ec6785b48ce9b3c3d4779cfe", - "sha256": "1cg5w8k99sd94wyjpbg73azghh59hbalp7vs8z62is4bfzm514hb" + "commit": "db8ac5b3039b91e28d4c403c98fcb799ec94369e", + "sha256": "065njm2610vhvsg1f0pm7ri51fp93f8234in1p791iqmmykdk7jx" }, "stable": { "version": [ @@ -116451,14 +116677,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20240322, - 857 + 20240328, + 1753 ], "deps": [ "cl-lib" ], - "commit": "6cf74c73c9ef946819e3cb6faa8e482fb11ccd53", - "sha256": "0q959gaighs7qcyjyf0a1jqhc39b5zbivk5gvx4n54x65vy0lc2r" + "commit": "271c3aeaa9523c8fec41d9127513c09262bad990", + "sha256": "0b47xsdh4wcdrcp6yrif5bqwhsp6bsgmjnp7wdghzqsimmqck5jr" } }, { @@ -116932,19 +117158,18 @@ "repo": "shuxiao9058/tabnine", "unstable": { "version": [ - 20240227, - 1429 + 20240426, + 516 ], "deps": [ "dash", "editorconfig", "language-id", "s", - "transient", - "vterm" + "transient" ], - "commit": "a46629994b485472a442517e4c287e7a493deb9e", - "sha256": "162bid314jsgjf98i2xpxklwdhmnq0115ha6xr5qd8j6sch0f7xv" + "commit": "06804c5fea50d79de458a99699a16adaf3c52498", + "sha256": "1k9qv7w9065j4k601yy5jk0ypx5vk4ji6viv61ss9z1b1fq37yiq" } }, { @@ -116955,14 +117180,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20240306, - 1454 + 20240415, + 1838 ], "deps": [ "project" ], - "commit": "73d9cecaeb671e14409c80b10a17be64acebc43c", - "sha256": "09h5lndv8sxv9v3s5jlg3yj949vfq3jf78h1zj59vpzgvgi5cf62" + "commit": "c21f28b96b63926a530babe50d2c4de81ebaaa18", + "sha256": "0pxmhh0pga7cq8pkbyj0hjmpbabhb3322gy33z9nahy3m616m6hy" } }, { @@ -117122,11 +117347,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20231117, - 1840 + 20240426, + 439 ], - "commit": "593494030bc7651efff0c79c62d5e21d3fd54f4f", - "sha256": "0741y62m8acpqk87s2bf2iw14m1nppgisdvarvrgz55x6zvn1mk9" + "commit": "af5926c53aebc591f1c77eb8ca8ff1ea9a73eaa5", + "sha256": "1jb2klplyngmv6pl6v39y0072hqgpgs22i7yk3097kbxv8llmk5c" }, "stable": { "version": [ @@ -117352,16 +117577,16 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20240322, - 901 + 20240410, + 928 ], "deps": [ "rainbow-identifiers", "transient", "visual-fill-column" ], - "commit": "7df0fead1683154dee24b3b61b4b575a89fab039", - "sha256": "09ppf5pgnan285hyfipa930wyi5qc8wf7b70wb9yh8xam7j1insf" + "commit": "d73e02dfe41580ff2d93a6c6feb2af254087bbf6", + "sha256": "1jg9l1dkiji5mqhbbfmgi0p4gdzw0m8hf7k4imnn61046llar8q0" }, "stable": { "version": [ @@ -117521,14 +117746,14 @@ "repo": "Crandel/tempel-collection", "unstable": { "version": [ - 20240216, - 1105 + 20240404, + 1026 ], "deps": [ "tempel" ], - "commit": "6248e22b52fd7fb98bba977221eb8440c82e6c00", - "sha256": "1z1vawc62c2a72mkkyz8apczv6g2xbc3zj5zmj7jscc3p5b0h3lf" + "commit": "e87b1fee9554f9bc7415df053c8d8c9f03c13955", + "sha256": "1j762811nlnimzvsmv6h1l3mpsd8wxa2ay48n73wxj3cv8qxz82r" } }, { @@ -118067,11 +118292,16 @@ "repo": "TxGVNN/terraform-doc", "unstable": { "version": [ - 20240119, - 1413 + 20240328, + 802 ], - "commit": "1e6963662d50196efb78f906a4d3d8669454dbbb", - "sha256": "1w892ak6bl8armlqbhc6d690y8dm1fnf9sz7sz5zh6y3i92dnj6v" + "deps": [ + "org", + "promise", + "request" + ], + "commit": "32e65a46d1c31d1524002cc50b33082a84045173", + "sha256": "0bvd1drvgfkz8as134f0xdwvsa56l0hl59i66d77yryix3mmlg1f" }, "stable": { "version": [ @@ -118269,14 +118499,14 @@ "repo": "TobiasZawada/texfrag", "unstable": { "version": [ - 20230117, - 1746 + 20240415, + 1043 ], "deps": [ "auctex" ], - "commit": "6df9044c3d6bbb2a104f2c9b78ad10aa3cdf9506", - "sha256": "1qwp9nb0dswjr7alsrcwbjym0k56ncd0k5plhcsz8liz5886qfdy" + "commit": "d4d78e9ba4ae14cc554c31bb641dea38ab38babb", + "sha256": "1hkg2lrf6zf9cj95iys41xh0cwy0callpljyj6jj14qmq2s5kl5l" }, "stable": { "version": [ @@ -118454,11 +118684,11 @@ "repo": "monkeyjunglejuice/matrix-emacs-theme", "unstable": { "version": [ - 20240214, - 747 + 20240422, + 919 ], - "commit": "1cfaa2b20d1dd9253b0654284eaff41e5a73d444", - "sha256": "1vslqg58yr7qa2431yl7z8zlziy71fl653js4xcljx8xfwqlynqh" + "commit": "2e373d5de799ef2546d6905949aa9ef21da5eea4", + "sha256": "15bf21y0sfsy1wpyazfcwr9cqs2vvmhwr2j2p37a2fiadrv27da4" } }, { @@ -118678,21 +118908,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20240318, - 1244 + 20240421, + 1632 ], - "commit": "9a64b4682510c27eab73440c56fca1eda9e05abd", - "sha256": "0m5nb9mq434wcfggdrpxyznbbp9psdkqqqdkps9jfs305qcld5zd" + "commit": "a1067af97a4a6070f4247657faf66ff25c1caffd", + "sha256": "0kjxyhr0kbw8dzd79gdj32srn5avnp4650ws1iy8q9rrppya9rr5" }, "stable": { "version": [ 2024, - 3, - 18, + 4, + 22, 0 ], - "commit": "9a64b4682510c27eab73440c56fca1eda9e05abd", - "sha256": "0m5nb9mq434wcfggdrpxyznbbp9psdkqqqdkps9jfs305qcld5zd" + "commit": "a1067af97a4a6070f4247657faf66ff25c1caffd", + "sha256": "0kjxyhr0kbw8dzd79gdj32srn5avnp4650ws1iy8q9rrppya9rr5" } }, { @@ -118742,26 +118972,26 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20230312, - 1245 + 20240407, + 1952 ], "deps": [ "haskell-mode" ], - "commit": "3ac320020d809ea626fc283839fecb10c9da4ce2", - "sha256": "1imqmg4naffiplpc3m74jvf26xwpy6026s61sg4si290qz3cvfq4" + "commit": "88f09edf6bef2228d5f530dea872b08a9d803066", + "sha256": "1r1d5hl49vdbwg5fcbfd0r0kwnc36knbfbr8fii4j73icm1g3frd" }, "stable": { "version": [ 1, 9, - 4 + 5 ], "deps": [ "haskell-mode" ], - "commit": "3ac320020d809ea626fc283839fecb10c9da4ce2", - "sha256": "1imqmg4naffiplpc3m74jvf26xwpy6026s61sg4si290qz3cvfq4" + "commit": "88f09edf6bef2228d5f530dea872b08a9d803066", + "sha256": "1r1d5hl49vdbwg5fcbfd0r0kwnc36knbfbr8fii4j73icm1g3frd" } }, { @@ -119090,25 +119320,19 @@ "repo": "aimebertrand/timu-line", "unstable": { "version": [ - 20231002, - 1016 + 20240405, + 2022 ], - "deps": [ - "f" - ], - "commit": "836cb92063076981f93e44f72dccd46a37e96785", - "sha256": "0ndhqsv11ai16y2pqcglqyhpzids4b7bzksmx5fs762vmmvm3r5z" + "commit": "3957234a4a7618376dc9ef40272f6aeabdf48843", + "sha256": "0msa4c6h6y1kl1q5rqjbf7i1hkpgp7k9qif7ssjq7dj6dlhakmb1" }, "stable": { "version": [ 0, - 8 + 9 ], - "deps": [ - "f" - ], - "commit": "676389f0f1609833e72701edc0a5fc80912167db", - "sha256": "0jxj3dyjppk8xiqjbq62z60hqrbzsa14x3yx5bjgzsghn27sq80f" + "commit": "3957234a4a7618376dc9ef40272f6aeabdf48843", + "sha256": "0msa4c6h6y1kl1q5rqjbf7i1hkpgp7k9qif7ssjq7dj6dlhakmb1" } }, { @@ -119119,19 +119343,19 @@ "repo": "aimebertrand/timu-macos-theme", "unstable": { "version": [ - 20240317, - 2007 + 20240401, + 1346 ], - "commit": "6079fa1bf9859955d30d6c51e7d8105588a9b588", - "sha256": "0f8jawiszqw2xwac2c3ipr8jdx7vfi5wr6xyd491m3faif4rmzz6" + "commit": "7734bd7287fa18cad8c146beabd52b52444e9da3", + "sha256": "0zm7wyjjwz9hlx23v1nvxnxgizb8q31bcg1fqh5gsgijka9fdzqx" }, "stable": { "version": [ 1, - 3 + 4 ], - "commit": "43c2ebc4364c227e9e8943478c21250c594b3c50", - "sha256": "0lb7nlvmjmhq5dpqd2mdhn1h4hyy09bkpqmvz9dh8jwmgp8gfr04" + "commit": "7734bd7287fa18cad8c146beabd52b52444e9da3", + "sha256": "0zm7wyjjwz9hlx23v1nvxnxgizb8q31bcg1fqh5gsgijka9fdzqx" } }, { @@ -119177,7 +119401,7 @@ 9 ], "commit": "0505a7c0d306632972f29e584e83e0cd58eba2ce", - "sha256": "04b6lyrn9hj754ykb07ks60c602h5gla11scyisnzga662li16ib" + "sha256": "0k4jpfc9m6834gng6w4zab8jh0d4i3dh5yvn89mlznsb9r9d6148" } }, { @@ -119338,11 +119562,11 @@ "repo": "vifon/tmsu.el", "unstable": { "version": [ - 20240117, - 1813 + 20240421, + 1056 ], - "commit": "c7dc44c97bf420ff0da5d552abfc9782bed70602", - "sha256": "1qn9y3nyx7796yx7qs8j368dskdfnpxhw1vvhlm9xd4dv8sxqjka" + "commit": "46e0c960629c82c090f42c196876aaf4d6edff1a", + "sha256": "0bmshvrw66rhszqqgfvnpvgvjzqvwi5mlylzz4v3dhvpr32bpb3b" } }, { @@ -119788,7 +120012,7 @@ "s" ], "commit": "a715f7f2df416b8a6c827a9493ce7004180a3a4f", - "sha256": "188cdgic25wrb4jdgdcj070a0pxsh3m0rd9d2r6i1s1n1nalrs6g" + "sha256": "08awv1vbqg0x0h7f036sh07vypm8lq6b5g36gq9dmyfaqci9ccw6" } }, { @@ -119832,7 +120056,7 @@ "base32" ], "commit": "927257e97a602b6979a75028e8417bf1499582d4", - "sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr" + "sha256": "1jbpf28918pjiqhw8rackv9r8iq9ydd3jw1zwwifznglmpyca7jk" } }, { @@ -120109,15 +120333,15 @@ "repo": "magit/transient", "unstable": { "version": [ - 20240321, - 2209 + 20240421, + 1737 ], "deps": [ "compat", "seq" ], - "commit": "55d5d41b48d7f7bc1ecf1f90c012d7821dff5724", - "sha256": "1mdcph2g0nbava3npa7bz463jqrz8rp9zmjgx8rqk7bdz2gd2yai" + "commit": "2dd0102ec3df901d421fc338e5c768467cc54ecf", + "sha256": "02qhhm37pmqpm51hn7sz7wn34x1vwixxka2fvlllq1vbmvzxinp6" }, "stable": { "version": [ @@ -120406,15 +120630,15 @@ "repo": "tarsius/tray", "unstable": { "version": [ - 20240101, - 2226 + 20240415, + 1549 ], "deps": [ "compat", "transient" ], - "commit": "15c08ec2b57ce0535f54242088d6051d2cf9a049", - "sha256": "0p9hg76a3ah8910r11da0c8ig4c6jpyinqnkgn15y0w3kb1zsh23" + "commit": "1ce8c7c74dec199e1045fec3c79cb9ff433b1735", + "sha256": "1b1i5hb9r8z6r1npbip8swgfizdkhwl1x5b6b9k9552i6gxm1qbz" }, "stable": { "version": [ @@ -120585,26 +120809,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20240324, - 1936 + 20240425, + 231 ], "deps": [ "tree-sitter" ], - "commit": "c56cb511045d50e30f78508c54494e025d6af2cb", - "sha256": "0xxksxa8i37d33izkkfjmq0igyir98szxywkjg9rs28hj55m7zfj" + "commit": "ace4624f78ddb6c29e4efa904c6dd8636fad53fe", + "sha256": "1kaklazmr26gh6ff8p7r2xs1pc40ajwlhhinsbnl52prz3bc7702" }, "stable": { "version": [ 0, 12, - 163 + 182 ], "deps": [ "tree-sitter" ], - "commit": "c56cb511045d50e30f78508c54494e025d6af2cb", - "sha256": "0xxksxa8i37d33izkkfjmq0igyir98szxywkjg9rs28hj55m7zfj" + "commit": "f75e8c1b4aa6c13d4b9a48545993d66a1d7e2eb1", + "sha256": "0zvz1kmx145g73wh2zjvrswcl9iiqlq59dlwf88p93n7wzk2ivbg" } }, { @@ -121019,20 +121243,20 @@ "repo": "renzmann/treesit-auto", "unstable": { "version": [ - 20240223, - 1450 + 20240420, + 1457 ], - "commit": "299dd88c9e5f1ff91a8f1989ad1e97e86c220020", - "sha256": "0c29ldai6fq413y14b4n3sh3s46vffdpg9xgspjklkq9ja1l0lw7" + "commit": "ecd898c4879614bf36d84a77c08a10aca25c3841", + "sha256": "190sv2ig3lisp2yiwy38ng8k9ckhpgjga5njnf88qnyp3r44bvcc" }, "stable": { "version": [ 1, 0, - 4 + 5 ], - "commit": "299dd88c9e5f1ff91a8f1989ad1e97e86c220020", - "sha256": "0c29ldai6fq413y14b4n3sh3s46vffdpg9xgspjklkq9ja1l0lw7" + "commit": "09d1c8c4b5bd981c6d613c95cf0ad859ad1fbc53", + "sha256": "1a2d49chymhfbd9w0msksyyqgsywn17mkzqglaw0k794sb1gzx2q" } }, { @@ -121274,14 +121498,14 @@ "repo": "echawk/tsort.el", "unstable": { "version": [ - 20231027, - 334 + 20240417, + 120 ], "deps": [ "compat" ], - "commit": "3f9cffdbd4ac83a6a69dd4ccbb135e95950494ad", - "sha256": "0zssgrkzsn3q2g8ayhs31c408yhsggmyrzfscklvvdhmgg5qcabj" + "commit": "32e4f5b7b6de6f012a51f3d7ec151579d7b3e4a7", + "sha256": "0ib900rldqni4aiwd19a8r9v3wwnfkki4p45mrxj9rv152fwiywx" } }, { @@ -121808,20 +122032,20 @@ "repo": "md-arif-shaikh/tzc", "unstable": { "version": [ - 20230504, - 445 + 20240403, + 332 ], - "commit": "e815b43790d9a517f89a2bb592c665bd911a4477", - "sha256": "03bl4mfvmf5zkybl38j73zmq523ykafj81md83fimjnd57zlbml3" + "commit": "8f425cd6f020b5082445be9547e9308be73c6adf", + "sha256": "0wbgw4hvjqdflwjkyk9iscjh7243m9blbh9rzwinggkilgw44j2i" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "6b11c8b2b6f207750d77542ff8e6ea1665be81c4", - "sha256": "0hb0m3f2na8xg3hnxwqk99hh04vgjkncssg07chx9bkrl20bvvv0" + "commit": "8f425cd6f020b5082445be9547e9308be73c6adf", + "sha256": "0wbgw4hvjqdflwjkyk9iscjh7243m9blbh9rzwinggkilgw44j2i" } }, { @@ -122118,7 +122342,7 @@ 0 ], "commit": "c2f4870aff70efe70a8d1b089e56d3a2d6d048b9", - "sha256": "14ybav1f82m2gsxkciwlc0pm01ihqqaqq6arnjqvgxdnw0z6qniq" + "sha256": "0i6jfr4l7mr8gpavmfblr5d41ck8aqzaf4iv1qk5fyzsb6yi0nla" } }, { @@ -122176,11 +122400,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20230808, - 1340 + 20240422, + 6 ], - "commit": "0e74116fd5c7797811a91ba4eadef50d67523eb6", - "sha256": "0m5kj393jvg7r7mxjkg1riahxk20fc323agwdb86026z2cv2xl2x" + "commit": "d935af2c57ecfa14248a70b3fe8a84fb78fef209", + "sha256": "1zy4sxllmh0qa876qnc4h89f5fda3vcrgs4xpy7y1bgbfcpwks0q" } }, { @@ -122191,11 +122415,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20240204, - 1215 + 20240421, + 834 ], - "commit": "2b355c9d39b2688f859a762f2289f23fd16fadc4", - "sha256": "1r81m5zpckqkqxb4mfz9k2m17n8n790l69zhcx9i0711wxhcszqk" + "commit": "75d78310c86901f01b35d47f3ac1a5c8368abba4", + "sha256": "0ywyjg8zpa8dzz6sw5zvzfck44iapr0iymmpbxh4ymli663fmw9p" } }, { @@ -123281,11 +123505,11 @@ "repo": "jcs-elpa/use-ttf", "unstable": { "version": [ - 20240101, - 928 + 20240401, + 611 ], - "commit": "e0f61ad6c0b6ecf89ff0b43c430b15c94ec8c8b3", - "sha256": "11mp10s7pdkr5zrx793767n4y5afm8n9c8gxhs1scvqz3hpw46b5" + "commit": "694282b9ba7669fcbceb7088808147f68e3ac066", + "sha256": "1760x85gisl5s2wh7b4y7h334b2vv7cz2a158w0w2kjgshbjdwdi" }, "stable": { "version": [ @@ -123324,11 +123548,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20230601, - 25 + 20240421, + 702 ], - "commit": "484d426a2ecc1ac7b922fd93c7d03da23510fb63", - "sha256": "00r4mbn5wc5h1c1xrmx1dhic4zvjmgihrnm863nn2823f33n2hdr" + "commit": "c4df85ac38b270628c4dacd9f6fb1da197f5aedd", + "sha256": "0fjws4y6njbcbz36kv5d85fn71026vw7ywd5vv1b4s39qzlyjqzi" } }, { @@ -123422,19 +123646,19 @@ "repo": "non/uxntal-mode", "unstable": { "version": [ - 20231010, - 438 + 20240327, + 153 ], - "commit": "9cc325992309e7b6f6ea75d64e12fde2a85320ed", - "sha256": "024nwljjl9bkdl815j1l4qp1zkd2nmv6xl94aym393k6dnlvplwi" + "commit": "1b114d97069a8c004f0ca58e0c69d61d897cef75", + "sha256": "1nbfqhb00cly3z897gc06j8kg8apya209wprjya7ak8iiq7cr012" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "a6e15c3ff1cfb05598db20ab494f783ba96f52ab", - "sha256": "0jxsn07w5iplc4xcdlljq8cpr0vf68p7wdqi9msv5hbcjrwk6as3" + "commit": "1b114d97069a8c004f0ca58e0c69d61d897cef75", + "sha256": "1nbfqhb00cly3z897gc06j8kg8apya209wprjya7ak8iiq7cr012" } }, { @@ -124111,11 +124335,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20240317, - 1608 + 20240426, + 2014 ], - "commit": "a430847beb925ae82007d70f32f3bab38f0054e9", - "sha256": "0amcnyslr4inpms48ricln6nm1yp1rkbrpv1qgabml3f70x1faz9" + "commit": "24784e7a81a937b4b294a2a57238999c53d6e5d1", + "sha256": "1z47qjhb427hrdmpxmjq4h5q20lzppy35im46dl5m3yzvx3k5aha" }, "stable": { "version": [ @@ -124166,14 +124390,14 @@ }, { "ename": "verilog-ext", - "commit": "f7452f1040c770f9eee8d9bb490d249561449057", - "sha256": "0hxvfw36ywn1sv1hfrshzwhb1fv8d28q8pk7vlwdsp4266n42i9r", + "commit": "a9f8ea0aa05b70aaf8aca910dda0d43a67b17a8f", + "sha256": "00wm1j0lhnp0fm18ibm04r7hzyvbzi79zbamp4dy36njv1ibh9dl", "fetcher": "github", "repo": "gmlarumbe/verilog-ext", "unstable": { "version": [ - 20240212, - 57 + 20240407, + 1352 ], "deps": [ "ag", @@ -124188,14 +124412,14 @@ "verilog-ts-mode", "yasnippet" ], - "commit": "9da79ac0c79e8819381002c205ae6817bbc9b642", - "sha256": "1jnnppvmp090c8mbkkq7daf2f497c3kzriph1d8pm4ph067d5ymz" + "commit": "1454457a85c9fb10145f45f80e1d3baa065017e5", + "sha256": "1rngn0w88a18hy1cba8qlc71zh3k5611rx4zgvnx8n0b8n6j1758" }, "stable": { "version": [ 0, - 4, - 1 + 5, + 0 ], "deps": [ "ag", @@ -124210,8 +124434,8 @@ "verilog-ts-mode", "yasnippet" ], - "commit": "0976770f9fc2722357672e532e7a86bc304de171", - "sha256": "196d531zd48sjdmjaqa828z5m3izc4x4wdk2rxx56nn2dahl7fz8" + "commit": "2488a25267d1e3b612f1da617d5a9506d6db8275", + "sha256": "02qgvb6rxg114picmr9v82rhk4nx848xgxddlq3hlcdvmr15szq2" } }, { @@ -124222,20 +124446,20 @@ "repo": "gmlarumbe/verilog-ts-mode", "unstable": { "version": [ - 20240211, - 210 + 20240406, + 2147 ], - "commit": "b055f7b4a7abdc1e1eb9eb5a99ddc288369982d0", - "sha256": "0khjhikw3ksk6lb2f7nwppp9l9vrfgq5jlwyfyrx0s9w6jyf64yc" + "commit": "f2dda1b25a06661569e393b04902be6a8e992b90", + "sha256": "18bmp1al4wsz7pcal39qbgb0q2zmib1xvjxz78ylwimpd8x81i7l" }, "stable": { "version": [ 0, 1, - 2 + 3 ], - "commit": "572508e9dc562a1718ddc857682c4f37dfbf5654", - "sha256": "06f989qkms4gnj0jrr1a2rkjwsgn0g8fqaz8sky4nwvvs3wmmm99" + "commit": "f2dda1b25a06661569e393b04902be6a8e992b90", + "sha256": "18bmp1al4wsz7pcal39qbgb0q2zmib1xvjxz78ylwimpd8x81i7l" } }, { @@ -124306,14 +124530,14 @@ "repo": "baron42bba/vertica-snippets", "unstable": { "version": [ - 20240221, - 1629 + 20240327, + 1013 ], "deps": [ "yasnippet" ], - "commit": "efaf893698358a305b1c52fd22a6842b59940855", - "sha256": "13ikkmarxcv19938p3za3crpbh8003xmlg8afyfyrm4z7pann1qj" + "commit": "11dd101eb431b7fc7695e5ad3b2a6444ac49e7a4", + "sha256": "03zba07d7d1c96ygkw1779v9ybnaap2668ss5w92zfzc8b45yvdr" } }, { @@ -124324,25 +124548,25 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20240128, - 1526 + 20240424, + 1959 ], "deps": [ "compat" ], - "commit": "4a7da56b02c6aefff8f6b4574a530a7cb54bc21a", - "sha256": "0p84pnp14jcmxlmxpl6wpq2f3rfy4lr92gial1a35aigcins4657" + "commit": "1def56a1e678ff9a8eeafafda9c474a5fbb097c4", + "sha256": "0cxaqlg0mllrnf7zx7j6rdmx3x42s9b2marisi7zwfiymsnbgarr" }, "stable": { "version": [ 1, - 7 + 8 ], "deps": [ "compat" ], - "commit": "cf8b2abf5207696c054c33214c86e3969d415054", - "sha256": "03m5v4r6n10ydmr1lks0d91dlirxlsh82l0qlac8qqfz09g0p76a" + "commit": "1def56a1e678ff9a8eeafafda9c474a5fbb097c4", + "sha256": "0cxaqlg0mllrnf7zx7j6rdmx3x42s9b2marisi7zwfiymsnbgarr" } }, { @@ -124424,14 +124648,14 @@ }, { "ename": "vhdl-ext", - "commit": "de655c347e9c4c91ac415cf8b77c2bcd10ff98fe", - "sha256": "0wyh2dy8dv23ll5g9yjaw1azl8gnxwxbysb4ynyfzf1r13f2y74i", + "commit": "6ce292a56ee703a58d88306bc12a4cd20a8483af", + "sha256": "1gk71s61gwha230r0ddvmzyw1qx68vz1nqnj61fkm5nclf72cf0s", "fetcher": "github", "repo": "gmlarumbe/vhdl-ext", "unstable": { "version": [ - 20240212, - 153 + 20240407, + 1353 ], "deps": [ "ag", @@ -124443,14 +124667,14 @@ "ripgrep", "vhdl-ts-mode" ], - "commit": "64111386bd793ceb6a8f78ab5f5caf5655fb3aa0", - "sha256": "08pal1ba55bdbnjb7lqrl7v2z3rys2a8ng8gsxidfx1400lmxg1c" + "commit": "bd5f97d811f4444ab523a5faace8e599a90d972d", + "sha256": "1x72kmwzyhwkxrqx4ijajz8wsxm389mj48ba2y9z1vpsiijvp7i6" }, "stable": { "version": [ 0, - 4, - 1 + 5, + 0 ], "deps": [ "ag", @@ -124462,8 +124686,8 @@ "ripgrep", "vhdl-ts-mode" ], - "commit": "978224be71c1b5ee237cb6d7f729599cfba99ce3", - "sha256": "1g1sw3w9ns9wvn22nbdc8pxmm55y565r6hfbid1vibv5mgwqi5xy" + "commit": "08fc11c16c1e4425fe1dcc352e005c193112c1d7", + "sha256": "1q474h728zf6fv7zkh6fhfb81icqmyn48g6df79106z28vvfqdz7" } }, { @@ -124483,7 +124707,7 @@ "outshine" ], "commit": "9cb2354874608d971be407ad9299ed918a6c061a", - "sha256": "1qfjwsxi3w2gdl258jbk5d3z645gs6zccxx2iah54zbgql17pgj9" + "sha256": "0gak3gvqw1pvall2rx82npil283z83aq79w5pw2a5rhi8a3imha4" }, "stable": { "version": [ @@ -124496,7 +124720,7 @@ "outshine" ], "commit": "5202db4c6a511a90a950a723293d11d55ec05264", - "sha256": "1qfjwsxi3w2gdl258jbk5d3z645gs6zccxx2iah54zbgql17pgj9" + "sha256": "1ygx8g9cxyyhhpcqan1ca4g741s3dd141bcmp6jjqbjfn2gqraz6" } }, { @@ -124507,20 +124731,20 @@ "repo": "gmlarumbe/vhdl-ts-mode", "unstable": { "version": [ - 20240211, - 213 + 20240406, + 2155 ], - "commit": "1d17c43993bf9eab97b0658a46fa17e64fc8eb4b", - "sha256": "1q2q538f6l9kvnlnnf1i39p21wblcy77lr24fcg1xl5ykrj3pjdc" + "commit": "eaeefce408085159cacf1ee9424fee20f20b6c39", + "sha256": "0p7qw4b8p1rgxd6zh9gpgxvhx7cr0xb9sjykmz74mscl4nfg7wck" }, "stable": { "version": [ 0, 1, - 1 + 2 ], - "commit": "768fc7afed0e3928bf74fca93ec68329ded89003", - "sha256": "0h33fbdji2ghqb0ppsna0x1h5qc6fcj0qyky1igxgdl3xxq38crp" + "commit": "eaeefce408085159cacf1ee9424fee20f20b6c39", + "sha256": "0p7qw4b8p1rgxd6zh9gpgxvhx7cr0xb9sjykmz74mscl4nfg7wck" } }, { @@ -124692,11 +124916,11 @@ "repo": "nverno/vimscript-ts-mode", "unstable": { "version": [ - 20231022, - 1758 + 20240426, + 818 ], - "commit": "20aea980ef94d643100638f2528aafc4b136e20c", - "sha256": "141mhzqv0fchcp6r6r3w8nismxa6a455d4z0ap6hcla2mxvszrwh" + "commit": "e806f59f870e268bfe879bdc7b5134e641c42c0f", + "sha256": "0n5k0rl7panzbzjfaj6y3qcirr9c809fh0p9156v33ah3jl71a2l" } }, { @@ -124818,20 +125042,20 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20240223, - 2340 + 20240411, + 656 ], - "commit": "5b9f9309bdf040b72bb2c3d99d1d8a0f0d98c308", - "sha256": "1imliz6fb5bxwcflkiqgk82xa34qkxaxzmy3rmj1cy2va148afx9" + "commit": "e04d3521b6dc2435de4c4a4b9cac5feb194f0d5b", + "sha256": "1bsymwzpvp4rqljidrixp3kc7kxjwsy5mkap6jw9rvpm6apy3b0n" }, "stable": { "version": [ 2, 6, - 2 + 3 ], - "commit": "5b9f9309bdf040b72bb2c3d99d1d8a0f0d98c308", - "sha256": "1imliz6fb5bxwcflkiqgk82xa34qkxaxzmy3rmj1cy2va148afx9" + "commit": "e04d3521b6dc2435de4c4a4b9cac5feb194f0d5b", + "sha256": "1bsymwzpvp4rqljidrixp3kc7kxjwsy5mkap6jw9rvpm6apy3b0n" } }, { @@ -125047,11 +125271,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20240223, - 1002 + 20240410, + 216 ], - "commit": "52006b40c7293f524ecb99d3899db7d95c77b317", - "sha256": "1njcy6hpvg7505agv619r924gs8ymjfyizxm8s70h3skwpg79yfm" + "commit": "26fb8e1dee98fd8d423abc35655859e1098325ee", + "sha256": "0ixa8kk4m0bg03qcahli8pp6srcavggkrfncyqg5igf8wg7d1wy5" }, "stable": { "version": [ @@ -125070,11 +125294,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20240223, - 1002 + 20240410, + 216 ], - "commit": "36f583c6b36cab827394548a8c9647c3fd066bb1", - "sha256": "0wd80m6796y0j0pzbw3qk4v8973x3cjimj7rh9ss7y22sqky5mmc" + "commit": "0ede987bac1c8dbeb07990a75e70b63cf9baf7e2", + "sha256": "0y5p2jbcjby0hrnhh2z99j27wsvkk8lrwdq2krd5188ssj66ca17" }, "stable": { "version": [ @@ -125147,11 +125371,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20240318, - 1617 + 20240325, + 1551 ], - "commit": "303decd923ef83a184b861d34081fd8635484a03", - "sha256": "15srbva8s19valai3ji794k0fha2xz3jhw81rg75mpnwcd5cxynb" + "commit": "ae4ae1aef2fcae98a37aad83f2a6aeeaeacedd4f", + "sha256": "180fa3ihcgp9f6gnp9z34cpc1k8ai75kmdagb4rc9qqb4z8lp9i2" } }, { @@ -125671,16 +125895,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20240229, - 1209 + 20240426, + 1520 ], "deps": [ "apel", "flim", "semi" ], - "commit": "e525f27d29e122bb8baefa1837816f9001fa5085", - "sha256": "0gphh1qh55jkg2a8gvwjf5f60jhjk3c3y40iikgvgw6hnx3aw8ga" + "commit": "8a0ea2146ee919a5344bb25f198d45016bc716d9", + "sha256": "1w57d6zcqxm6q7rsc6kz84idcpz15rr67jzmfbc2mfiprfvrip1j" } }, { @@ -125751,11 +125975,11 @@ "repo": "gmlarumbe/wavedrom-mode", "unstable": { "version": [ - 20230913, - 2246 + 20240329, + 1800 ], - "commit": "b360aa39c87e033b65676d3ac542bc26fd5abd34", - "sha256": "1fml8yv4l8f83vrqj725vx60ld81hcgjdhg2v7d0gip30w0b1v3h" + "commit": "758a29e975e76ad616bbe18b657a5ce78fd32d32", + "sha256": "091aagn1mi1in4kn94b2cvcw0hfm7zfypgsc7gg5bq8hklg000vq" }, "stable": { "version": [ @@ -125971,11 +126195,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20240315, - 1838 + 20240413, + 1455 ], - "commit": "a9d21841224da3295f2dd0a90022f5e435e48046", - "sha256": "19v4mwa1arnxrznqq8x7zsqlgvgznmw4yn8yd77jyr5lcvw43nax" + "commit": "005aa62d6f41fbf9bc045cac3b3b772716ee8ba7", + "sha256": "15bd89dwpvsfgc2m0jnnmmwqfqzrd2z9nv2qjdac339ddivm2lp8" }, "stable": { "version": [ @@ -126390,11 +126614,19 @@ "repo": "thierryvolpiatto/wfnames", "unstable": { "version": [ - 20230924, - 1538 + 20240418, + 1005 ], - "commit": "19b452fb698a5ba3b0f1d6e7d69a5e19af2c83e7", - "sha256": "0iihs4iam27m2ggmhy9x0np0awirxhzy78q677ng734zdig6bccz" + "commit": "2f014c48fde0979da4ce3c0dbda81389c61a26bc", + "sha256": "15ly5cnq8bkh035mf9mvrbddqc2ajgv3fn7k3gdkivd68nk0wjb8" + }, + "stable": { + "version": [ + 1, + 2 + ], + "commit": "2f014c48fde0979da4ce3c0dbda81389c61a26bc", + "sha256": "15ly5cnq8bkh035mf9mvrbddqc2ajgv3fn7k3gdkivd68nk0wjb8" } }, { @@ -126609,11 +126841,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20240312, - 2033 + 20240423, + 1320 ], - "commit": "96911a1d3faf8426a33241f4821319e98421f380", - "sha256": "0icplq3rnvaixx83phmwzspcw4wy1wzfcxhkf16fna2ik2i35829" + "commit": "ba323d6712d54806aa82847d017e94eafcf99d6f", + "sha256": "1ainrah6qnn9qvjcfgx133v4rvvyq15iy7kvi2rmbxxlfj5x6y1i" }, "stable": { "version": [ @@ -127436,14 +127668,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20240101, - 2226 + 20240415, + 1558 ], "deps": [ "compat" ], - "commit": "d43db3c58c34d4dbc3ce6f68ec24fecf3452b20e", - "sha256": "00rykgc0ffs6qih60w1qlh73jlm5dlrshvbinl1fglm4agm7h5yf" + "commit": "1b4526453ef6bdee30635f469aa26085c02b1ac1", + "sha256": "1qv84lg4g4kihv53vrklm0rmh9hqiwk23bynldiwvmiq39fqasyw" }, "stable": { "version": [ @@ -127685,6 +127917,25 @@ "sha256": "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc" } }, + { + "ename": "wordcount-section", + "commit": "6f3b48f594a00659debafc09bdc129d40feb89b4", + "sha256": "1likzbgvazlkjb9vq873lr4j60ldqkfiq8z29x4rvcybzaabf89f", + "fetcher": "sourcehut", + "repo": "swflint/emacs-universal-sidecar", + "unstable": { + "version": [ + 20240323, + 1901 + ], + "deps": [ + "compat", + "universal-sidecar" + ], + "commit": "b67153c880284db0ed9864370b16287fd855fb54", + "sha256": "0irbpsfndggi1fmwsnqdr6nky4b9xbiila5rxkbrr28y2r6bxsck" + } + }, { "ename": "wordel", "commit": "a0186cd951d0d4a6eb5b1f872d7114e24ce479a2", @@ -128080,32 +128331,32 @@ }, { "ename": "wttrin", - "commit": "1b2b6876562f1fadd4af1ea9b279ac4dc1b21660", - "sha256": "0msp8lja9nz6khz3dkasv8hnhkaayqxd7m58kma03hpkcjxnaxil", + "commit": "510ba3b42e9e1330fd26940d9c2f427112180485", + "sha256": "1b1xqqqif379sgna193qpl9i1s7ihm5mml8w4s8c39bnn56fpaxg", "fetcher": "github", - "repo": "bcbcarl/emacs-wttrin", + "repo": "cjennings/emacs-wttrin", "unstable": { "version": [ - 20170614, - 1206 + 20240422, + 1633 ], "deps": [ "xterm-color" ], - "commit": "df5427ce2a5ad4dab652dbb1c4a1834d7ddc2abc", - "sha256": "1ai655f10iayb4vw0ass2j3x83f4vsv90326mnywkzfl3sxd432z" + "commit": "9b98fedc44b1ddcebaa48df2975493b37797c2fb", + "sha256": "180amp1n0qdn6m6vlzg0ddfxfqf37fjaswfxdxn03298j0jgzw14" }, "stable": { "version": [ 0, - 1, - 0 + 2, + 4 ], "deps": [ "xterm-color" ], - "commit": "d595240d92788791da2218d12efd6a77eee06217", - "sha256": "0mbc3ndggv2rbmfcfhw8bsx3qw6jy684hxz5dqa88lfb6vs5knzc" + "commit": "9b98fedc44b1ddcebaa48df2975493b37797c2fb", + "sha256": "180amp1n0qdn6m6vlzg0ddfxfqf37fjaswfxdxn03298j0jgzw14" } }, { @@ -128631,14 +128882,14 @@ "repo": "js-emacs/xref-js2", "unstable": { "version": [ - 20210310, - 1238 + 20240417, + 1454 ], "deps": [ "js2-mode" ], - "commit": "fd6b723e7f1f9793d189a815e1904364dc026b03", - "sha256": "0iny4qswyicrax36d4sgyfrw3giwjd1440bmlksd36y8zjkqqym0" + "commit": "db816e926302293c134d1260322b0553953a43e2", + "sha256": "0wsi4ix44h0vzjbw25iga4ghk5l06398l7fpv75iayyspmnl6gxq" }, "stable": { "version": [ @@ -128660,11 +128911,11 @@ "repo": "ideasman42/emacs-xref-rst", "unstable": { "version": [ - 20230601, - 21 + 20240421, + 814 ], - "commit": "0811365a6ac240463aac9ddfcefb9ed8630e3da8", - "sha256": "1lgjp63ma3rb6rikn0bsyn4q1a1xf6gbnynpy6blsn0442ik2blk" + "commit": "c6dd6cc6df1d9dd311cb0f421b86beadfa3156ce", + "sha256": "0cb7ijk4x65r9wxwgrvwjqh1s8mg9vj3d41208rgn9q3849krg48" } }, { @@ -128786,19 +129037,19 @@ "repo": "lordpretzel/xwidgets-reuse", "unstable": { "version": [ - 20231205, - 1315 + 20240331, + 1644 ], - "commit": "4d5cfd24bc470def508e1301951d4057831d852f", - "sha256": "1p0zgd3x83la4w7bhy1f1daamnyfv7sk93bba25w39jgyjw3bd75" + "commit": "5653c8a3ac13615d171599b3ada87512bd1a6fb9", + "sha256": "0pbk5dqhj9ccxvpfzpbfg6c709j209r1idkljb32ssfcdfyld49h" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "3f95d81bfce1b3c52f9dcf2890cd2559a5287a33", - "sha256": "1i6g4n2pnp3r0pyn4p6xryh0x44lyvazy8kc1bfrzwzf6py9wmq0" + "commit": "5653c8a3ac13615d171599b3ada87512bd1a6fb9", + "sha256": "0pbk5dqhj9ccxvpfzpbfg6c709j209r1idkljb32ssfcdfyld49h" } }, { @@ -129295,14 +129546,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20240308, - 815 + 20240406, + 1314 ], "deps": [ "cl-lib" ], - "commit": "33587a8551b8f6991b607d3532062a384c010ce1", - "sha256": "1412iz2k8fvkgb0kdnmv7g3mw8fqa8smbxzs2w8c2ahbm4bprrfq" + "commit": "eb5ba2664c3a68ae4a53bb38b85418dd131b208f", + "sha256": "1n4vrl504hiiiz44h30zr5azkzm160zrxbcxim5f6nc55lgpkvqk" }, "stable": { "version": [ @@ -129325,14 +129576,14 @@ "repo": "elken/yasnippet-capf", "unstable": { "version": [ - 20240309, - 1316 + 20240420, + 1531 ], "deps": [ "yasnippet" ], - "commit": "9043f8275176a8f198ce8e81fadab1870fa165bb", - "sha256": "19czzfjcd9m34ga51m5s10rlxp3v4q7fbq0cb5mc99ahbl763z9n" + "commit": "ea2bbf4f1c5c133ca7105a5cda2bc01c8e378ef5", + "sha256": "07aqjni44hick55mphz4xq6rap7m3p5nbbc7x63984r0aa25ckac" } }, { @@ -129554,14 +129805,14 @@ "url": "https://git.thanosapollo.org/yeetube", "unstable": { "version": [ - 20240320, - 1033 + 20240411, + 1328 ], "deps": [ "compat" ], - "commit": "f9c28a527a60811c4b60bdd3730ca25c9522739a", - "sha256": "0idnvy7jgry8q3vf3532xdfxz62hc9qdn5ssb6mp32kmya9c3v3j" + "commit": "dfcbb8498b30b83d6f97d5777603d5f2dce39298", + "sha256": "013j8nm736lpkp2ygmgwdfbrylmwvlsgbf6qmscpfvn01n6w9s37" }, "stable": { "version": [ @@ -129829,10 +130080,10 @@ }, { "ename": "ytel", - "commit": "447dac94507a1fd6791d08e0f8225c261d1fae2b", - "sha256": "0adxiw83rah9hln3k8gm6s7ks3xpqfknypjb9j51lxcabc7c1677", + "commit": "f01e793028a76e9033dd2e1e55e1ad475685fb69", + "sha256": "0sg5bjv6zknwvdbklmai9ilisja97lv30dq8n9h3fp47kw19fhyf", "fetcher": "github", - "repo": "grastello/ytel", + "repo": "manabiseijin/ytel", "unstable": { "version": [ 20200725, @@ -129952,11 +130203,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20231120, - 2002 + 20240331, + 1350 ], - "commit": "373a07f99ee595dee83b6cee8b6841b5d1c01e38", - "sha256": "03n87wcjbbpfgbx487676fzbrzzqj0cmiwcpikbws74fnr9ayplg" + "commit": "14dda0596a7cd0750fc6566eacc203a126f136c2", + "sha256": "1cyspxwjjhflafkyb2mkcfc1227i8kzmxgz3yvrj3ykdsim9pjwy" }, "stable": { "version": [ @@ -130386,14 +130637,14 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20240301, - 1618 + 20240416, + 1636 ], "deps": [ "reformatter" ], - "commit": "b6f5375efeb97026410190f352f1044214fa0289", - "sha256": "0nll0ib9yvmjvysvvvmfdq5gl2zrwymzrifmmvifns8ddc2iv9ql" + "commit": "b4170b747ae4c45d145ff8bcb7fafe095e17b4c6", + "sha256": "1zzi7xlhhrzaxrwy20ida561n3rdjn25k3pkjvvjl073cr35hmyw" } }, { @@ -130929,7 +131180,7 @@ "request" ], "commit": "98323098c37a444de49cfef44f1506e9386e8c5f", - "sha256": "18hi6m2ngl9yz599q5bhifafi4vz1adc06bjl0bhb3rs62vbkwk2" + "sha256": "1zr67h0w49rsi84mgf6jdili28h8782q6vjl8za0iq1hcx9zqxyf" } }, { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix index a525335646..59cced7ec4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix @@ -45,6 +45,7 @@ , libxml2 , llvmPackages_14 , m17n_lib +, mailutils , makeWrapper , motif , ncurses @@ -58,7 +59,7 @@ , tree-sitter , texinfo , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 # Boolean flags , withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform @@ -75,6 +76,7 @@ , withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets) , withGpm ? stdenv.isLinux , withImageMagick ? lib.versionOlder version "27" && (withX || withNS) +, withMailutils ? true , withMotif ? false , withNS ? stdenv.isDarwin && !(variant == "macport" || noGui) , withPgtk ? false @@ -212,7 +214,7 @@ mkDerivation (finalAttrs: { ] ++ lib.optionals srcRepo [ autoreconfHook texinfo - ] ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook; + ] ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook3; buildInputs = [ gettext @@ -304,39 +306,47 @@ mkDerivation (finalAttrs: { ImageIO ]; + # Emacs needs to find movemail at run time, see info (emacs) Movemail + propagatedUserEnvPkgs = lib.optionals withMailutils [ + mailutils + ]; + hardeningDisable = [ "format" ]; configureFlags = [ - "--disable-build-details" # for a (more) reproducible build - "--with-modules" + (lib.enableFeature false "build-details") # for a (more) reproducible build + (lib.withFeature true "modules") ] ++ (if withNS then [ - "--disable-ns-self-contained" + (lib.enableFeature false "ns-self-contained") ] else if withX then [ - "--with-x-toolkit=${toolkit}" - "--with-xft" - "--with-cairo" + (lib.withFeatureAs true "x-toolkit" toolkit) + (lib.withFeature true "cairo") + (lib.withFeature true "xft") ] else if withPgtk then [ - "--with-pgtk" + (lib.withFeature true "pgtk") ] else [ - "--with-gif=no" - "--with-jpeg=no" - "--with-png=no" - "--with-tiff=no" - "--with-x=no" - "--with-xpm=no" + (lib.withFeature false "gif") + (lib.withFeature false "jpeg") + (lib.withFeature false "png") + (lib.withFeature false "tiff") + (lib.withFeature false "x") + (lib.withFeature false "xpm") ]) ++ lib.optionals (variant == "macport") [ - "--enable-mac-app=$$out/Applications" - "--with-gnutls=yes" - "--with-mac" - "--with-xml2=yes" + (lib.enableFeatureAs true "mac-app" "$$out/Applications") + (lib.withFeature true "gnutls") + (lib.withFeature true "mac") + (lib.withFeature true "xml2") + ] + ++ lib.optionals stdenv.isDarwin [ + (lib.withFeature withNS "ns") ] - ++ (lib.optional stdenv.isDarwin (lib.withFeature withNS "ns")) ++ [ (lib.withFeature withCompressInstall "compress-install") (lib.withFeature withToolkitScrollBars "toolkit-scroll-bars") (lib.withFeature withNativeCompilation "native-compilation") (lib.withFeature withImageMagick "imagemagick") + (lib.withFeature withMailutils "mailutils") (lib.withFeature withSmallJaDic "small-ja-dic") (lib.withFeature withTreeSitter "tree-sitter") (lib.withFeature withXinput2 "xinput2") diff --git a/third_party/nixpkgs/pkgs/applications/editors/focuswriter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/focuswriter/default.nix index 179cbb0fdb..618ea2f471 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/focuswriter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/focuswriter/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "focuswriter"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "gottcode"; repo = "focuswriter"; rev = "v${version}"; - hash = "sha256-z3DQaMgaTjzj2Oh1QI7A5v9G7GxjlGj/7jInxH/tDaY="; + hash = "sha256-op76oHVo6yCpXzRFYAYXMCEslCgDA6jXPcgWdTeGJ+E="; }; nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/formiko/default.nix b/third_party/nixpkgs/pkgs/applications/editors/formiko/default.nix index 53fee165f5..40c7fba0be 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/formiko/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/formiko/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , gtk3 , docutils @@ -24,7 +24,7 @@ buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/fte/default.nix b/third_party/nixpkgs/pkgs/applications/editors/fte/default.nix deleted file mode 100644 index 1c5d1f15ec..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/fte/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, perl, libX11, libXpm, gpm, ncurses, slang }: - -stdenv.mkDerivation rec { - pname = "fte"; - version = "0.50.02"; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ perl libX11 libXpm gpm ncurses slang ]; - - ftesrc = fetchurl { - url = "mirror://sourceforge/fte/fte-20110708-src.zip"; - sha256 = "17j9akr19w19myglw5mljjw2g3i2cwxiqrjaln82h3rz5ma1qcfn"; - }; - ftecommon = fetchurl { - url = "mirror://sourceforge/fte/fte-20110708-common.zip"; - sha256 = "1xva4kh0674sj2b9rhf2amlr37yxmsvjkgyj89gpcn0rndw1ahaq"; - }; - src = [ ftesrc ftecommon ]; - - env.NIX_CFLAGS_COMPILE = "-DHAVE_STRLCAT -DHAVE_STRLCPY"; - - buildFlags = [ "PREFIX=$(out)" ]; - - installFlags = [ "PREFIX=$(out)" "INSTALL_NONROOT=1" ]; - - meta = with lib; { - description = "A free text editor for developers"; - homepage = "https://fte.sourceforge.net/"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix b/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix index 517b2ca4fe..f6755905c7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix @@ -8,7 +8,7 @@ , libintl , hicolor-icon-theme , python3 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { file hicolor-icon-theme python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix index eb985016b1..c3fc6fae2d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix @@ -9,13 +9,13 @@ , gtk3 , gtk-mac-integration , glib -, tepl , libgedit-amtk , libgedit-gtksourceview +, libgedit-tepl , libpeas , libxml2 , gsettings-desktop-schemas -, wrapGAppsHook +, wrapGAppsHook3 , gtk-doc , gobject-introspection , docbook-xsl-nons @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "46.2"; + version = "47.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - sha256 = "wIZkErrRR+us4tKC/8u1oOmjBLIP1VZAvuIcgebVAe8="; + sha256 = "+kpZfjTHbUrJFDG1rm4ZHJbGsK8XAuCJmrNRme36G/o="; }; patches = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { python3 python3Packages.wrapPython vala - wrapGAppsHook + wrapGAppsHook3 gtk-doc gobject-introspection docbook-xsl-nons @@ -65,13 +65,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - tepl glib gsettings-desktop-schemas gspell gtk3 libgedit-amtk libgedit-gtksourceview + libgedit-tepl libpeas ] ++ lib.optionals stdenv.isDarwin [ gtk-mac-integration diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix index b1360f2a14..f0e7b272f8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix @@ -5,7 +5,6 @@ , desktop-file-utils , editorconfig-core-c , fetchurl -, fetchpatch , flatpak , gnome , libgit2-glib @@ -43,13 +42,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "45.0"; + version = "46.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JC2gJZMpPUVuokEIpFk0cwoeMW2NxbGNnfDoZNt7pZY="; + hash = "sha256-lhaWbVIqLIUCizPAm605cudp6fkK91VNXnGDfb3HiHE="; }; patches = [ @@ -64,12 +63,6 @@ stdenv.mkDerivation rec { # # Typelib file for namespace 'Pango', version '1.0' not found (g-irepository-error-quark, 0) ./fix-finding-test-typelibs.patch - - (fetchpatch { - name = "redefinition-of-glib_autoptr_clear_GtkStackPage.patch"; - url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/7aaaecefc2ea8a37eaeae8b4d726d119d4eb8fa3.patch"; - hash = "sha256-sYLqhwCd9GOkUMUZAO2trAGKC3013jgivHrNC4atdn0="; - }) ]; nativeBuildInputs = [ @@ -176,7 +169,7 @@ stdenv.mkDerivation rec { currently recommend running gnome-builder inside a nix-shell with appropriate dependencies loaded. ''; - homepage = "https://wiki.gnome.org/Apps/Builder"; + homepage = "https://apps.gnome.org/Builder/"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix index cab490cd76..df1baa997a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-inform7/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, perl, bison -, texinfo, desktop-file-utils, wrapGAppsHook, docbook2x, docbook-xsl-nons +, texinfo, desktop-file-utils, wrapGAppsHook3, docbook2x, docbook-xsl-nons , inform7, gettext, libossp_uuid, gtk3, gobject-introspection, vala, gtk-doc , webkitgtk, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib , gst_all_1 }: @@ -22,7 +22,7 @@ let pkg-config docbook2x docbook-xsl-nons - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; buildInputs = [ @@ -49,7 +49,7 @@ let texinfo python3 glib - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; buildInputs = [ @@ -84,7 +84,7 @@ in stdenv.mkDerivation { inform7 python3 desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gettext diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix index 8962629c8b..505bddde4f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix @@ -1,17 +1,17 @@ { stdenv , lib , fetchurl +, fetchpatch , autoreconfHook , gtk-doc , vala , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , gsettings-desktop-schemas , gspell -, libgedit-amtk , libgedit-gtksourceview +, libgedit-tepl , libgee -, tepl , gnome , glib , pkg-config @@ -29,13 +29,21 @@ stdenv.mkDerivation rec { sha256 = "1nVVY5sqFaiuvVTzNTVORP40MxQ648s8ynqOJvgRKto="; }; + patches = [ + # Adapt for Tepl -> libgedit-tepl rename + (fetchpatch { + url = "https://gitlab.gnome.org/swilmet/gnome-latex/-/commit/41e532c427f43a5eed9081766963d6e29a9975a1.patch"; + hash = "sha256-gu8o/er4mP92dE5gWg9lGx5JwTHB8ytk3EMNlwlIpq4="; + }) + ]; + nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc vala gobject-introspection - wrapGAppsHook + wrapGAppsHook3 itstool gettext ]; @@ -45,11 +53,10 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas gspell - libgedit-amtk libgedit-gtksourceview + libgedit-tepl libgee libxml2 - tepl ]; configureFlags = [ @@ -66,7 +73,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX"; + homepage = "https://gitlab.gnome.org/swilmet/gnome-latex"; description = "A LaTeX editor for the GNOME desktop"; maintainers = with maintainers; [ manveru bobby285271 ]; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/applications/editors/gobby/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gobby/default.nix index d36f89e3c1..8801afa34e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gobby/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gobby/default.nix @@ -1,5 +1,5 @@ { avahiSupport ? false # build support for Avahi in libinfinity -, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools +, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook3, yelp-tools , gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { sha256 = "06cbc2y4xkw89jaa0ayhgh7fxr5p2nv3jjs8h2xcbbbgwaw08lk0"; }; - nativeBuildInputs = [ autoconf automake pkg-config intltool itstool yelp-tools wrapGAppsHook ]; + nativeBuildInputs = [ autoconf automake pkg-config intltool itstool yelp-tools wrapGAppsHook3 ]; buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ]; preConfigure = "./autogen.sh"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix b/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix index 4a3ae555f2..e4734355fd 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook }: +{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "greenfoot"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { hash = "sha256-wpmgWtx2jTDjt+7p6HcjU/uy1PRmnAHpJ1rOYb+hV+U="; }; - nativeBuildInputs = [ dpkg wrapGAppsHook ]; + nativeBuildInputs = [ dpkg wrapGAppsHook3 ]; buildInputs = [ glib ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/hexedit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/hexedit/default.nix deleted file mode 100644 index 7f32835fdc..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/hexedit/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses }: - -stdenv.mkDerivation rec { - pname = "hexedit"; - version = "1.6"; - - src = fetchFromGitHub { - owner = "pixel"; - repo = "hexedit"; - rev = version; - sha256 = "sha256-fIgPbr7qmxyEga2YaAD0+NBM8LeDm/tVAq99ub7aiAI="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ncurses ]; - - meta = with lib; { - description = "View and edit files in hexadecimal or in ASCII"; - homepage = "http://rigaux.org/hexedit.html"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ delroth ]; - mainProgram = "hexedit"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/jedit/build.xml.patch b/third_party/nixpkgs/pkgs/applications/editors/jedit/build.xml.patch deleted file mode 100644 index 2f630f18ab..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/jedit/build.xml.patch +++ /dev/null @@ -1,257 +0,0 @@ ---- a/build.xml 2015-02-04 08:47:37.000000000 +0100 -+++ b/build.xml 2015-02-17 14:06:42.455283148 +0100 -@@ -43,16 +43,6 @@ - - -- -- -- -- -- -- - - -@@ -90,51 +80,8 @@ - value="true"/> - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -+ depends="init"> - - -@@ -239,37 +186,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - - - -- - - - - - -@@ -622,7 +512,7 @@ - - - -+ depends="init"> - - -@@ -668,7 +558,7 @@ - - - -+ depends="init,setup,unpack-docbook-xsl"> - - - -@@ -692,7 +582,7 @@ - - - -+ depends="init,setup,unpack-docbook-xsl"> - - - -@@ -716,7 +606,7 @@ - - - -+ depends="init,setup,unpack-docbook-xsl"> - - - -@@ -851,7 +741,7 @@ - - - -+ depends="init,setup,unpack-docbook-xsl"> - - -@@ -1154,7 +1044,7 @@ - - - -+ depends="init"> - - - - - - -@@ -1295,7 +1185,7 @@ - - - - - - - -+ depends="init,setup"> - - -@@ -1592,7 +1482,7 @@ - - - - - - - - - diff --git a/third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix index fe92848735..8fdf8e7c8d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix @@ -1,63 +1,118 @@ -{ lib, stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging, bsh }: +{ + lib, + stdenv, + fetchsvn, + ant, + jdk, + jre, + xmlstarlet, + makeWrapper, + stripJavaArchivesHook, +}: -let - version = "5.2.0"; - bcpg = fetchurl { - url = "mirror://maven/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar"; - sha256 = "16xhmwks4l65m5x150nd23y5lyppha9sa5fj65rzhxw66gbli82d"; - }; - jsr305 = fetchurl { - url = "mirror://maven/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar"; - sha256 = "0s74pv8qjc42c7q8nbc0c3b1hgx0bmk3b8vbk1z80p4bbgx56zqy"; - }; -in - -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "jedit"; - inherit version; - src = fetchurl { - url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2"; - sha256 = "03wmbh90rl5lsc35d7jwcp9j5qyyzq1nccxf4fal8bmnx8n4si0x"; + version = "5.6.0-unstable-2023-11-19"; + + src = fetchsvn { + url = "https://svn.code.sf.net/p/jedit/svn/jEdit/trunk"; + rev = "25703"; + hash = "sha256-z1KTZqKl6Dlqayw/3h/JvHQK3kSfio02R8V6aCb4g4Q="; }; - buildInputs = [ ant jdk commonsBsf commonsLogging ]; + ivyDeps = stdenv.mkDerivation { + name = "${finalAttrs.pname}-${finalAttrs.version}-ivy-deps"; + inherit (finalAttrs) src; - # This patch removes from the build process: - # - the automatic download of dependencies (see configurePhase); - # - the tests - patches = [ ./build.xml.patch ]; + nativeBuildInputs = [ + ant + jdk + xmlstarlet + ]; - configurePhase = '' - mkdir -p lib/ant-contrib/ lib/scripting lib/compile lib/default-plugins - cp ${ant}/lib/ant/lib/ant-contrib-*.jar lib/ant-contrib/ - cp ${bsh} ${bcpg} lib/scripting/ - cp ${jsr305} lib/compile/ + # set defaultCacheDir to something that can exist + # this directory won't get copied, but needs to be set properly + configurePhase = '' + runHook preConfigure + + xmlstarlet ed --subnode /ivysettings -t elem -n caches ivysettings.xml \ + | xmlstarlet ed --insert /ivysettings/caches -t attr -n defaultCacheDir -v "$(pwd)/ivy-cache" \ + > ivysettings.xml.tmp + mv ivysettings.xml.tmp ivysettings.xml + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + ant retrieve + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib + cp -r lib/* $out/lib + runHook postInstall + ''; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "sha256-J5i5IhXlXw84y/4K6Vt84au4eVXVLupmtfscO+y1Fi0="; + }; + + # ignore a test failing because of the build environment + postPatch = '' + substituteInPlace test/org/gjt/sp/jedit/MiscUtilitiesTest.java \ + --replace-fail "public class MiscUtilitiesTest" "@org.junit.Ignore public class MiscUtilitiesTest" ''; - buildPhase = "ant build"; + nativeBuildInputs = [ + ant + jdk + makeWrapper + stripJavaArchivesHook + ]; + + buildPhase = '' + runHook preBuild + ln -s ${finalAttrs.ivyDeps}/lib ./lib + ant build -Divy.done=true + runHook postBuild + ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/jEdit - cp -r build/jedit.jar doc icons keymaps macros modes startup $out/share/jEdit + cp -r build/jedit.jar doc keymaps macros modes startup $out/share/jEdit - sed -i "s|Icon=.*|Icon=$out/share/jEdit/icons/jedit-icon48.png|g" package-files/linux/deb/jedit.desktop - mkdir -p $out/share/applications - mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop + install -Dm644 icons/jedit-icon48.png $out/share/icons/hicolor/48x48/apps/jedit.png + install -Dm644 package-files/linux/deb/jedit.desktop -t $out/share/applications - # specify the correct JAVA_HOME - sed -i '1a JAVA_HOME=${jdk}' package-files/linux/jedit - sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit - mkdir -p $out/bin - cp package-files/linux/jedit $out/bin/jedit - chmod +x $out/bin/jedit + sed -i $out/share/applications/jedit.desktop \ + -e "s|Icon=.*|Icon=jedit|g" \ + -e "s|Exec=.*|Exec=jedit|g" + + install -Dm755 package-files/linux/jedit -t $out/bin + substituteInPlace $out/bin/jedit \ + --replace-fail "/usr/share/jEdit/@jar.filename@" "$out/share/jEdit/jedit.jar" + + wrapProgram $out/bin/jedit --set JAVA_HOME ${jre} + + runHook postInstall ''; - meta = with lib; { - description = "Mature programmer's text editor (Java based)"; + meta = { + description = "A programmer's text editor written in Java"; homepage = "http://www.jedit.org"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = [ ]; + license = lib.licenses.gpl2Only; + mainProgram = "jedit"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.unix; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # ivyDeps contains .jar dependencies + ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json index c7f7009465..8fc5468aa5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json @@ -3,58 +3,58 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2024.1", - "sha256": "a753369d74832d15fcf082587291921e8a90be04529c05b8e9d64a3afb24120c", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.tar.gz", - "build_number": "241.14494.288" + "version": "2024.1.1", + "sha256": "299ff2eb9c91282df074c58c0ecf73ecf59c7d077bc309f085229eaa32fbd46d", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.1.tar.gz", + "build_number": "241.15989.121" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2024.1.1", - "sha256": "05c1f910126b8499d26ab52d333307d3b6df6a3fa06b5e0b1a79ff15caf40e0a", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.1.tar.gz", - "build_number": "241.14494.283" + "version": "2024.1.2", + "sha256": "449ca450179bda3a342f92ff0fe44e52b51c11adcda4d2836a215282ffc0fc95", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.2.tar.gz", + "build_number": "241.15989.49" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2024.1", - "sha256": "4f73d514dcbf5dce769e7ee4e0a81a1d8dc970f6553c246e3016963b9f077dca", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.tar.gz", - "build_number": "241.14494.247" + "version": "2024.1.1", + "sha256": "0913a4938c7df68796b4d29cf0cf8d836da270aa34239fc7d756138f21e1a895", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.1.tar.gz", + "build_number": "241.15989.62" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2024.1", - "sha256": "d777e88a3098790e19a93cb14fe4a21c740553958514e2b55fa2ba588f5c2c78", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.tar.gz", - "build_number": "241.14494.255" + "version": "2024.1.1", + "sha256": "d83df71dacb8d71cd7af6ca06267b7006b9172d121b316a8a3ad41db7c870193", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.1.tar.gz", + "build_number": "241.15989.158" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.1", - "sha256": "783539f254e4d62f4fae153a9e737f1d69db1e44676c4d1513775571a68950e4", - "url": "https://download.jetbrains.com/go/goland-2024.1.tar.gz", - "build_number": "241.14494.238" + "version": "2024.1.1", + "sha256": "d952641bb05a38c771ae64b381f7d3735e20695df89180cc7f5ba9b31c0e437d", + "url": "https://download.jetbrains.com/go/goland-2024.1.1.tar.gz", + "build_number": "241.15989.157" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.1", - "sha256": "01d1b224c5e88592f954b17796a76fa8391cdcafef27264e703c7ffe47bb4065", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.tar.gz", - "build_number": "241.14494.240" + "version": "2024.1.1", + "sha256": "4d4221630c4d1dcb9f198370f82d9364014a4a624684ad8b3958be9f01eb656a", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.1.tar.gz", + "build_number": "241.15989.150" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.1", - "sha256": "b9083da939eacbcdf24b84cb9c45a1291bb33715f05fc7e10f2cff065d7c3fea", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.tar.gz", - "build_number": "241.14494.240" + "version": "2024.1.1", + "sha256": "d78b5ad0cf8325ca0659aae36b9979a581dab6cf8c7cd127cfb7f86440f282c9", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.1.tar.gz", + "build_number": "241.15989.150" }, "mps": { "update-channel": "MPS RELEASE", @@ -67,125 +67,125 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2024.1", - "sha256": "11c6862954f87b89d081cc0382e54b105d8b0c933dae78fd952cd2a3604889b2", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.tar.gz", - "build_number": "241.14494.237", + "version": "2024.1.1", + "sha256": "bb3d10d5ce7419f5123937bcd40f1584fca4b844a2f83b6850fec57cd1f44282", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.1.tar.gz", + "build_number": "241.15989.102", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2024.1", - "sha256": "96048ea55ef45f1af0ebe12ad0e38e2763c9e5d654b9e174b33aaa12665d836b", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.tar.gz", - "build_number": "241.14494.241" + "version": "2024.1.1", + "sha256": "715f30966c5597adc6ef544051a796de8a6cc5a5182938b8e14a1e6ad5e5edfd", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.1.tar.gz", + "build_number": "241.15989.155" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2024.1", - "sha256": "2451d3ef7642151306354418c5237b326271e2653a09b869e5883a262a2916ad", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.tar.gz", - "build_number": "241.14494.241" + "version": "2024.1.1", + "sha256": "b7e12b8d16164137f4cb0677fcac18af78aa117d33c511cce3fcf3972b4e3b17", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.1.tar.gz", + "build_number": "241.15989.155" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2024.1", - "sha256": "194096b0b550e1e320fc72aaf0510faeebf8737d05f6e02eecd72efe6f7cd757", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.tar.gz", - "build_number": "241.14494.307" + "version": "2024.1.1", + "sha256": "390967705d8e13f39754cbf39a9bec2bb33c6d0f8eeffcdb3d68a5c9ced696ea", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.1.tar.gz", + "build_number": "241.14494.325" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2024.1", - "sha256": "4fd9dcf83a1d1f6b7513c18383938bd65b2479fdb39c0421e2237a1e340c3912", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.tar.gz", - "build_number": "241.14494.234" + "version": "2024.1.1", + "sha256": "32e324e976c63e6f5897b392469240382baf5ab94c700b7f75c4a575a1f5d1dc", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.1.tar.gz", + "build_number": "241.15989.113" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2023.3 EAP", - "sha256": "a7176fb06c18ce50f8f901ecde9fa75e968ddf27e3366e70bffd7ad1208fdde9", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.15026.24.tar.gz", - "build_number": "233.15026.24" + "version": "2024.1 EAP", + "sha256": "10a904c833990c4621f919a36d31744dd1700dce42ff3addbc909937b6f6329d", + "url": "https://download.jetbrains.com/rustrover/RustRover-241.15989.101.tar.gz", + "build_number": "241.15989.101" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2024.1", - "sha256": "d4c7cb7f1462c2b2bd9042b4714ab9de66c455ab9752c87698dc3902f0d49a2a", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.tar.gz", - "build_number": "241.14494.235" + "version": "2024.1.2", + "sha256": "10110ac54ab7db1ca4560f83fdb921ca6217437dba1ad4ceb1c6cf0887ec5f29", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.2.tar.gz", + "build_number": "241.15989.105" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.tar.gz", - "version": "2023.3 EAP", - "sha256": "8eae1c965c1b5dae17c580cd3ed9b2a6182a3b54a54f8e6152472815118ae2c2", - "url": "https://download.jetbrains.com/writerside/writerside-233.14938.tar.gz", - "build_number": "233.14938" + "version": "2024.1 EAP", + "sha256": "24da41b0eb4ca23652d05ecbccc5d2c792c3d49a964d8b6eb765ccd9cbcc7c3d", + "url": "https://download.jetbrains.com/writerside/writerside-241.15989.11.tar.gz", + "build_number": "241.15989.11" } }, "aarch64-linux": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2024.1", - "sha256": "f937b263bd697595427e3e1d04513f9b6a786d56214ce34fe7a038efa2e949cf", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1-aarch64.tar.gz", - "build_number": "241.14494.288" + "version": "2024.1.1", + "sha256": "2323f3b64f690b0b099cdcb14ef6b80440abafda1c0113a6b96df9656167e638", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.1-aarch64.tar.gz", + "build_number": "241.15989.121" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "version": "2024.1.1", - "sha256": "d269bfe10fb97572e785dce6e387d09f429396db002e12ecb9a44cced915c032", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.1-aarch64.tar.gz", - "build_number": "241.14494.283" + "version": "2024.1.2", + "sha256": "98b9a89ba49fa16376dbdec01412893635465a67ee482c80f9c48e10dcf0bead", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.2-aarch64.tar.gz", + "build_number": "241.15989.49" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2024.1", - "sha256": "f1adfe94bd6482a4f15db02611afc7487d59c47f8ee120e925feeb23c980cd9f", - "url": "https://download.jetbrains.com/python/dataspell-2024.1-aarch64.tar.gz", - "build_number": "241.14494.247" + "version": "2024.1.1", + "sha256": "3ee14b5d19d15ef652c6ca7ff8026d438980de5c28ce0375e8418a32fe8fed62", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.1-aarch64.tar.gz", + "build_number": "241.15989.62" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "version": "2024.1", - "sha256": "3b6ffb21148d3327e9a5558c5657c22f7076c6208e8a10836f155d8f0200fb36", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1-aarch64.tar.gz", - "build_number": "241.14494.255" + "version": "2024.1.1", + "sha256": "6ea42d3605f5dc25b67b5254947bb3cd1a3cce7e81520ae5f486224bbbbc5de3", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.1-aarch64.tar.gz", + "build_number": "241.15989.158" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.1", - "sha256": "f3cae5c83ca99d3b0e0ef20282f2434879ef89a59ca2c770c31b855e45b8f6f3", - "url": "https://download.jetbrains.com/go/goland-2024.1-aarch64.tar.gz", - "build_number": "241.14494.238" + "version": "2024.1.1", + "sha256": "d5577561744d4cedf7c092acde9faafbcd57527678693a964517383cdf831eeb", + "url": "https://download.jetbrains.com/go/goland-2024.1.1-aarch64.tar.gz", + "build_number": "241.15989.157" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.1", - "sha256": "a13e7a53b5c8a512fbcb72957f24e5515618a5533f17d72914da5445b736dac1", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1-aarch64.tar.gz", - "build_number": "241.14494.240" + "version": "2024.1.1", + "sha256": "ae95111e01ce8f2f6dc0083306f121d8eb229dc001f1a5f0d69e4d20b2bc1d3c", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.1-aarch64.tar.gz", + "build_number": "241.15989.150" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.1", - "sha256": "e73756a96a2e958441facb2b9be7ba30b463a63235f37a757866800162f293bd", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1-aarch64.tar.gz", - "build_number": "241.14494.240" + "version": "2024.1.1", + "sha256": "4cec9ac0fbc1468708a9ae226a94d0ad1ef73829d49537d4363abd2ecda4bc62", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.1-aarch64.tar.gz", + "build_number": "241.15989.150" }, "mps": { "update-channel": "MPS RELEASE", @@ -198,125 +198,125 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2024.1", - "sha256": "0c5debd888359b37c9c95176c09a16e94f2412fb88f98b928e64ed2466f88ec1", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1-aarch64.tar.gz", - "build_number": "241.14494.237", + "version": "2024.1.1", + "sha256": "c1ff0b85679cee8c17ee3ea4b19ccb3278540821c7162354bee900d95cbc52a4", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.1-aarch64.tar.gz", + "build_number": "241.15989.102", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2024.1", - "sha256": "de8259a4cea264a2263bf771d74949ca25a2b9a8ffc5bbbc7c42d2faace6bd09", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1-aarch64.tar.gz", - "build_number": "241.14494.241" + "version": "2024.1.1", + "sha256": "525c18749d9e2abd3ae2abea68c6be202348a9a026077f5782042baf12acf100", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.1-aarch64.tar.gz", + "build_number": "241.15989.155" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2024.1", - "sha256": "a1f43b2392b7fc6b0c062524593c19fb0721b4ec1a1a59a06e39a61da2dce258", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1-aarch64.tar.gz", - "build_number": "241.14494.241" + "version": "2024.1.1", + "sha256": "141fbfb473e78270ec161f938963c77cdaad16cfc32985b9ec7a70fdb5e3e0bc", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.1-aarch64.tar.gz", + "build_number": "241.15989.155" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2024.1", - "sha256": "e196c8e70d7eb6f56a08df809f5de430bf5e61509abb13de8b301c036c4f446e", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1-aarch64.tar.gz", - "build_number": "241.14494.307" + "version": "2024.1.1", + "sha256": "9f079193067cf1e4595a5142bb2341187e8730f3551b4583c940f2822d9c5be2", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.1-aarch64.tar.gz", + "build_number": "241.14494.325" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2024.1", - "sha256": "690f90bd8a974585414e499aa2cb46d68dbc8145906e98d7f3b4ad1f3bf49040", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1-aarch64.tar.gz", - "build_number": "241.14494.234" + "version": "2024.1.1", + "sha256": "87c7c6f86cc0337311eea595ee0754bcce3f4e88579c1f022abca19037ba7c51", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.1-aarch64.tar.gz", + "build_number": "241.15989.113" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2023.3 EAP", - "sha256": "4e03720aae12b32f91d4ddf4e01cfb454311b8a0b901dcee733d62579aa4cc0c", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.15026.24-aarch64.tar.gz", - "build_number": "233.15026.24" + "version": "2024.1 EAP", + "sha256": "6ee90aee367cd9ecc8db99020133e17299113c1e016b3344a4762eb8b954317a", + "url": "https://download.jetbrains.com/rustrover/RustRover-241.15989.101-aarch64.tar.gz", + "build_number": "241.15989.101" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2024.1", - "sha256": "6691e4855fd4ecf3da9b63b78a11afc3441fb2139cdc7e7aaa5d78aa92a88c12", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1-aarch64.tar.gz", - "build_number": "241.14494.235" + "version": "2024.1.2", + "sha256": "de1443570d2769e5dae11da2c3a8049c438f6f16b598a214ab000a300c148476", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.2-aarch64.tar.gz", + "build_number": "241.15989.105" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.tar.gz", - "version": "2023.3 EAP", - "sha256": "b09dac04217d5d523501bdb1e9026fd17fb6370dff2610502472bbf6a48323d8", - "url": "https://download.jetbrains.com/writerside/writerside-233.14938-aarch64.tar.gz", - "build_number": "233.14938" + "version": "2024.1 EAP", + "sha256": "9b72a2422f2cb1f2bb2034ef4eaf130ee7a9062cf99ba53b8df62cc4e1c76c42", + "url": "https://download.jetbrains.com/writerside/writerside-241.15989.11-aarch64.tar.gz", + "build_number": "241.15989.11" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2024.1", - "sha256": "373c78ff045a17fdcae44cc9b76b41862d4bee9c8476813e518c7cc1de88b6a1", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.dmg", - "build_number": "241.14494.288" + "version": "2024.1.1", + "sha256": "43a765102080acd6dc1fa5a26e0c5efcc3d2e7a22a0bf054a3b9ba4714a9c43e", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.1.dmg", + "build_number": "241.15989.121" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2024.1.1", - "sha256": "232582204a6f810bcbd2387ba2cef824f0f81c3a7e022f7f2bebf643d32f866d", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.1.dmg", - "build_number": "241.14494.283" + "version": "2024.1.2", + "sha256": "41a4dabdd2ad97387d806742c41b34e5a1544860c159f5d71c09b00a1e605356", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.2.dmg", + "build_number": "241.15989.49" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2024.1", - "sha256": "a48036f55ef8301d6f77f726c68d7415c0056ddb4143ca3eed2698306f2c021f", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.dmg", - "build_number": "241.14494.247" + "version": "2024.1.1", + "sha256": "dfbe160a8a1676dad81b5d5ca35d8d02258a5684c3a140bbb415edae575a058b", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.1.dmg", + "build_number": "241.15989.62" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2024.1", - "sha256": "fb37fe7ba94f151f9613134b232b79f44524c126152f70eeb31421cee89b514d", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.dmg", - "build_number": "241.14494.255" + "version": "2024.1.1", + "sha256": "0e230192d3532e4740a354bf7f58ae2efd4036607cb9ef4eaf4cca1ca0354df0", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.1.dmg", + "build_number": "241.15989.158" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.1", - "sha256": "4684665fa5d33e3b97a445ffdb29238b995408537be0f706ce05ef1505ffb632", - "url": "https://download.jetbrains.com/go/goland-2024.1.dmg", - "build_number": "241.14494.238" + "version": "2024.1.1", + "sha256": "189d8582a0474e1f6eac858f3528af85d6ca36918d659f66edf2fd26d70b07af", + "url": "https://download.jetbrains.com/go/goland-2024.1.1.dmg", + "build_number": "241.15989.157" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.1", - "sha256": "a0ed1fbb4f7c69a046869b3e1cd61faee193518374ac5d4dde4256f846c3b4e2", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.dmg", - "build_number": "241.14494.240" + "version": "2024.1.1", + "sha256": "b38881e1db85082fe167b24e7022aef958a9129bf07b56aff47ec43ac894c427", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.1.dmg", + "build_number": "241.15989.150" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.1", - "sha256": "aaecd61f3258d555cb5b2993d04a56955f6dd4cb7a393b58928e4548817750e1", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.dmg", - "build_number": "241.14494.240" + "version": "2024.1.1", + "sha256": "2a32561669c4f21ed134006d4fe9c948881dc3b8e12c00f11c1616952f6975cc", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.1.dmg", + "build_number": "241.15989.150" }, "mps": { "update-channel": "MPS RELEASE", @@ -329,125 +329,125 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2024.1", - "sha256": "75699ce909f07de35a6e89745c652f08afba5096b7930fdc51683989967fcc62", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.dmg", - "build_number": "241.14494.237", + "version": "2024.1.1", + "sha256": "0232f3e562698bbacf8c72446fc868d50d2b308ce17b6a0655fe351b46370fa4", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.1.dmg", + "build_number": "241.15989.102", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2024.1", - "sha256": "86162e01cba91d7fac7f06442ba4f2b969191cef3bba7c11fced30ac4aa87b34", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.dmg", - "build_number": "241.14494.241" + "version": "2024.1.1", + "sha256": "73485ede957df2dc5c4a2936aa6d380fefccf1f5523407a1ad22ef6d757901d5", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.1.dmg", + "build_number": "241.15989.155" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2024.1", - "sha256": "32882869eb3dbe44ed74ff5c916222cf7f60af23775c58430e2967b0cbe90846", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.dmg", - "build_number": "241.14494.241" + "version": "2024.1.1", + "sha256": "3acd4e5f9d78229cc70664f25068732f7e0b7afa7f8895280e9698870e5cdccb", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.1.dmg", + "build_number": "241.15989.155" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2024.1", - "sha256": "12155c779c7f11dd71b3573af266c0221960eaea8a442fda4faaec8ca6eefa95", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.dmg", - "build_number": "241.14494.307" + "version": "2024.1.1", + "sha256": "1c6f52b9629f77ca6a2f903fbadaae9dc80237b061dfeb94638d029a43bdf0c5", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.1.dmg", + "build_number": "241.14494.325" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2024.1", - "sha256": "47ff2d04362beb2acb3421780f9c5f3dd5ef02aa2cdd9cef2c64a10c6ce2c062", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.dmg", - "build_number": "241.14494.234" + "version": "2024.1.1", + "sha256": "839fe79e93a293a514e8abdaec60ca9a79cddb889fe4fe1287e2b74540a9ec57", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.1.dmg", + "build_number": "241.15989.113" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2023.3 EAP", - "sha256": "b59ff55e4ba22df41acc9870f88b7f957f31af179e482ccaa4320b1f1ffff346", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.15026.24.dmg", - "build_number": "233.15026.24" + "version": "2024.1 EAP", + "sha256": "c0b5885e7d85cc89d79110b4a56c3a08784c43b03e42686ec91cd4679bf9f469", + "url": "https://download.jetbrains.com/rustrover/RustRover-241.15989.101.dmg", + "build_number": "241.15989.101" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2024.1", - "sha256": "b3b41e5e8559e36e0bd4121dee61d39a8ba5b5ce8193e7b026c5bc261e973df5", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.dmg", - "build_number": "241.14494.235" + "version": "2024.1.2", + "sha256": "a5b79c530596bcef503847ea38a11263c871a9f8267d2e4fe4ef025c166d144f", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.2.dmg", + "build_number": "241.15989.105" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.dmg", - "version": "2023.3 EAP", - "sha256": "53c7ad5a8808776b60eb82b3155c6f3a2a0dfad43ba8d9238a0db1752d503b09", - "url": "https://download.jetbrains.com/writerside/writerside-233.14938.dmg", - "build_number": "233.14938" + "version": "2024.1 EAP", + "sha256": "36ec40a47989be9ab263f4b9f182fcc5b155f3fd068174e7539adc55f892b230", + "url": "https://download.jetbrains.com/writerside/writerside-241.15989.11.dmg", + "build_number": "241.15989.11" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2024.1", - "sha256": "b1044fdbf9e3f93aaf8ca8ad2b7bc2eae165f86bc5cae6910f2ad0ee92c198a5", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1-aarch64.dmg", - "build_number": "241.14494.288" + "version": "2024.1.1", + "sha256": "08dab457cf1cb07e4489653f22a12e2997dea2b788ab0a5494de40a86b39f104", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.1-aarch64.dmg", + "build_number": "241.15989.121" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2024.1.1", - "sha256": "c2545df9784fa1f8f9234dd93d1c513ed691c797f26471cb545188ce7f495864", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.1-aarch64.dmg", - "build_number": "241.14494.283" + "version": "2024.1.2", + "sha256": "583c32f39918681673028a20cb911a41fc4495cf44c151c0790594042ec9e160", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.2-aarch64.dmg", + "build_number": "241.15989.49" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2024.1", - "sha256": "4a8abf8cf816f98502cf58cd3de07c28d496d4fe20d338cee0ac714196b8a612", - "url": "https://download.jetbrains.com/python/dataspell-2024.1-aarch64.dmg", - "build_number": "241.14494.247" + "version": "2024.1.1", + "sha256": "eb345888f6e926439a1142614e10b36123b40fbd876d31060856c7e532b53f64", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.1-aarch64.dmg", + "build_number": "241.15989.62" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2024.1", - "sha256": "c82392faec283b2a6ab25dd0cbd8c3733ea046799d9d95ba4b5d6086767f7715", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1-aarch64.dmg", - "build_number": "241.14494.255" + "version": "2024.1.1", + "sha256": "c82e70fd6688c218da7a541ac0a0d06652389112f73a667964ee7a8e0a5bfc44", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.1-aarch64.dmg", + "build_number": "241.15989.158" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.1", - "sha256": "92b8567751ceb8aaa95535cbe76d495035be9602fa84cccb18e6e25bbd2bcff5", - "url": "https://download.jetbrains.com/go/goland-2024.1-aarch64.dmg", - "build_number": "241.14494.238" + "version": "2024.1.1", + "sha256": "c04972578b92b2e8a9c0dfa52c01f09d9ed8640f12cf17e454d37ae6bea24a4a", + "url": "https://download.jetbrains.com/go/goland-2024.1.1-aarch64.dmg", + "build_number": "241.15989.157" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.1", - "sha256": "e49f9a3dc01bd28aa4065642352f358d8b17680ff7207145c918d1f52b046447", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1-aarch64.dmg", - "build_number": "241.14494.240" + "version": "2024.1.1", + "sha256": "fc5bdc7c325708d0754d9bd4868db02c1c3b9a14e910dd641b76478e5b805441", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.1-aarch64.dmg", + "build_number": "241.15989.150" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.1", - "sha256": "fd09f791834713e02c7cd28e4bf35b89e6f55e09970db3a720a4c59044874973", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1-aarch64.dmg", - "build_number": "241.14494.240" + "version": "2024.1.1", + "sha256": "bc1d350f18c493cd24c479f6c4f5b167b2cc62b8ff6e43e831b8ab90d4e079d2", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.1-aarch64.dmg", + "build_number": "241.15989.150" }, "mps": { "update-channel": "MPS RELEASE", @@ -460,67 +460,67 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2024.1", - "sha256": "02bcb551de99cf070e90b2131b41f0b3e93aa776615bcfba1508e4c4d1bb9378", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1-aarch64.dmg", - "build_number": "241.14494.237", + "version": "2024.1.1", + "sha256": "b6b2b6181c724c320a491cea013c620f662e3fbc3a2f62718354d9e88c9d210d", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.1-aarch64.dmg", + "build_number": "241.15989.102", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2024.1", - "sha256": "0cd62c5640d455e576a502fb23d5e6f3b71a2507e838bdec1a1be6a3fd6804e8", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1-aarch64.dmg", - "build_number": "241.14494.241" + "version": "2024.1.1", + "sha256": "68e55873a82457fcb8eb1033dbb4e0be817f5b5423b067d8b632fbe5f1d6a4bb", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.1-aarch64.dmg", + "build_number": "241.15989.155" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2024.1", - "sha256": "9c1d71668eb5de90f1f498477630a5d474a10ec90ee6ca61a8039f42505f5ca7", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1-aarch64.dmg", - "build_number": "241.14494.241" + "version": "2024.1.1", + "sha256": "091a2531325c1df23619ee50998d5d7d7348dc9d25fd7416ccb07aa7d6100c39", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.1-aarch64.dmg", + "build_number": "241.15989.155" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2024.1", - "sha256": "c2e0dadc6c7f924e849e87d1c04aeaa02d6a14d5868294dd36481a70cbd508cb", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1-aarch64.dmg", - "build_number": "241.14494.307" + "version": "2024.1.1", + "sha256": "d197249cc5cb8fb3ec30f3ed5468dd6d7782e97adb1e48a0509d2415b48f7a1b", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.1-aarch64.dmg", + "build_number": "241.14494.325" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2024.1", - "sha256": "7e085580ebc8aadb9342e7362e3078b988e38fe8b5bfe8c4825a1744ad53c33f", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1-aarch64.dmg", - "build_number": "241.14494.234" + "version": "2024.1.1", + "sha256": "5e6bd929f2b74145aa763ca277ade3c3512342b38a5a21a605c0b319f487b49e", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.1-aarch64.dmg", + "build_number": "241.15989.113" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2023.3 EAP", - "sha256": "03e7c1e3c029cd72ddc9422cc1dc54ed581356b278127dc8d2b2f9e53d357054", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.15026.24-aarch64.dmg", - "build_number": "233.15026.24" + "version": "2024.1 EAP", + "sha256": "1d63faf3d687508b976989768ee44ac3632017d55fce0557591dff2eae37d6a2", + "url": "https://download.jetbrains.com/rustrover/RustRover-241.15989.101-aarch64.dmg", + "build_number": "241.15989.101" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2024.1", - "sha256": "95dd3a397fe063583c5e3ba4fefafdfcad740c18447c1a70c0f03cb004436496", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1-aarch64.dmg", - "build_number": "241.14494.235" + "version": "2024.1.2", + "sha256": "b3ce2aabba5bc3afef95d768aa721bb245d2fce0ec8d69d61d011c2b23087d97", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.2-aarch64.dmg", + "build_number": "241.15989.105" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.dmg", - "version": "2023.3 EAP", - "sha256": "2a78fbcabcdd5b7c906d933dd91ac927bde22ae3bba988dad7450184fd90457a", - "url": "https://download.jetbrains.com/writerside/writerside-233.14938-aarch64.dmg", - "build_number": "233.14938" + "version": "2024.1 EAP", + "sha256": "624f9f2fb0ed7c7d42484e42c16b9b0ec0c542ad8187d81b11ef1d38576c589d", + "url": "https://download.jetbrains.com/writerside/writerside-241.15989.11-aarch64.dmg", + "build_number": "241.15989.11" } } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index a88785e708..fb57331cc3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -113,6 +113,17 @@ rec { xz ]; }).overrideAttrs (attrs: { + postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.isLinux) '' + ( + cd $out/clion + + for dir in plugins/clion-radler/DotFiles/linux-*; do + rm -rf $dir/dotnet + ln -s ${dotnet-sdk_7} $dir/dotnet + done + ) + ''; + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' ( cd $out/clion diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json index 02b902bfbc..cbc1207aab 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -18,16 +18,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "233.15026.24": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.14494.234": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.14494.235": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.14494.237": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.14494.238": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.14494.241": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.14494.283": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.14494.288": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", - "241.14494.307": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip" + "241.14494.325": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.15989.101": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.15989.102": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.15989.105": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.15989.113": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.15989.121": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.15989.155": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.15989.157": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.15989.49": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip" }, "name": "ideavim" }, @@ -36,7 +36,7 @@ "idea-ultimate" ], "builds": { - "241.14494.240": "https://plugins.jetbrains.com/files/631/513581/python-241.14494.240.zip" + "241.15989.150": "https://plugins.jetbrains.com/files/631/530669/python-241.15989.166.zip" }, "name": "python" }, @@ -58,16 +58,16 @@ ], "builds": { "233.13135.979": null, - "233.15026.24": null, - "241.14494.234": null, - "241.14494.235": null, - "241.14494.237": null, - "241.14494.238": null, - "241.14494.240": null, - "241.14494.241": null, - "241.14494.283": null, - "241.14494.288": null, - "241.14494.307": null + "241.14494.325": null, + "241.15989.101": null, + "241.15989.102": null, + "241.15989.105": null, + "241.15989.113": null, + "241.15989.121": null, + "241.15989.150": null, + "241.15989.155": null, + "241.15989.157": null, + "241.15989.49": null }, "name": "kotlin" }, @@ -89,16 +89,16 @@ ], "builds": { "233.13135.979": null, - "233.15026.24": "https://plugins.jetbrains.com/files/6981/509027/ini-233.15026.15.zip", - "241.14494.234": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", - "241.14494.235": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", - "241.14494.237": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", - "241.14494.238": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", - "241.14494.241": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", - "241.14494.283": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", - "241.14494.288": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", - "241.14494.307": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip" + "241.14494.325": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.15989.101": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", + "241.15989.102": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", + "241.15989.105": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", + "241.15989.113": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", + "241.15989.121": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", + "241.15989.155": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", + "241.15989.157": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip", + "241.15989.49": "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip" }, "name": "ini" }, @@ -108,8 +108,8 @@ "phpstorm" ], "builds": { - "241.14494.237": "https://plugins.jetbrains.com/files/7219/518876/Symfony_Plugin-2023.1.268.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/7219/518876/Symfony_Plugin-2023.1.268.zip" + "241.15989.102": "https://plugins.jetbrains.com/files/7219/529388/Symfony_Plugin-2023.1.271.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/7219/529388/Symfony_Plugin-2023.1.271.zip" }, "name": "symfony-support" }, @@ -119,8 +119,8 @@ "phpstorm" ], "builds": { - "241.14494.237": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip" + "241.15989.102": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip" }, "name": "php-annotations" }, @@ -133,11 +133,11 @@ "rust-rover" ], "builds": { - "233.15026.24": "https://plugins.jetbrains.com/files/7322/502153/python-ce-233.14808.12.zip", - "241.14494.238": "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip", - "241.14494.283": "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip", - "241.14494.307": "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip" + "241.14494.325": "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip", + "241.15989.101": "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip", + "241.15989.157": "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip", + "241.15989.49": "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip" }, "name": "python-community-edition" }, @@ -158,15 +158,15 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "241.14494.234": null, - "241.14494.235": null, - "241.14494.237": null, - "241.14494.238": null, - "241.14494.240": null, - "241.14494.241": null, - "241.14494.283": null, - "241.14494.288": null, - "241.14494.307": null + "241.14494.325": null, + "241.15989.102": null, + "241.15989.105": null, + "241.15989.113": null, + "241.15989.121": null, + "241.15989.150": null, + "241.15989.155": null, + "241.15989.157": null, + "241.15989.49": null }, "name": "-deprecated-rust" }, @@ -187,15 +187,15 @@ ], "builds": { "233.13135.979": null, - "241.14494.234": null, - "241.14494.235": null, - "241.14494.237": null, - "241.14494.238": null, - "241.14494.240": null, - "241.14494.241": null, - "241.14494.283": null, - "241.14494.288": null, - "241.14494.307": null + "241.14494.325": null, + "241.15989.102": null, + "241.15989.105": null, + "241.15989.113": null, + "241.15989.121": null, + "241.15989.150": null, + "241.15989.155": null, + "241.15989.157": null, + "241.15989.49": null }, "name": "-deprecated-rust-beta" }, @@ -209,10 +209,10 @@ "ruby-mine" ], "builds": { - "241.14494.234": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", - "241.14494.238": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", - "241.14494.241": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip" + "241.15989.113": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", + "241.15989.155": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", + "241.15989.157": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip" }, "name": "ide-features-trainer" }, @@ -233,17 +233,17 @@ "webstorm" ], "builds": { - "233.13135.979": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", - "233.15026.24": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", - "241.14494.234": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", - "241.14494.235": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", - "241.14494.237": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", - "241.14494.238": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", - "241.14494.241": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", - "241.14494.283": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", - "241.14494.288": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", - "241.14494.307": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip" + "233.13135.979": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.14494.325": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.15989.101": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.15989.102": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.15989.105": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.15989.113": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.15989.121": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.15989.155": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.15989.157": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip", + "241.15989.49": "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip" }, "name": "nixidea" }, @@ -253,8 +253,8 @@ "idea-ultimate" ], "builds": { - "241.14494.238": "https://plugins.jetbrains.com/files/9568/513582/go-plugin-241.14494.240.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/9568/513582/go-plugin-241.14494.240.zip" + "241.15989.150": "https://plugins.jetbrains.com/files/9568/521002/go-plugin-241.15989.21.zip", + "241.15989.157": "https://plugins.jetbrains.com/files/9568/521002/go-plugin-241.15989.21.zip" }, "name": "go" }, @@ -276,16 +276,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "233.15026.24": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "241.14494.234": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.14494.235": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.14494.237": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.14494.238": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.14494.241": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.14494.283": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.14494.288": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.14494.307": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip" + "241.14494.325": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.15989.101": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.15989.102": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.15989.105": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.15989.113": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.15989.121": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.15989.155": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.15989.157": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.15989.49": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip" }, "name": "csv-editor" }, @@ -307,16 +307,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.15026.24": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "241.14494.234": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.14494.235": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.14494.237": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.14494.238": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.14494.241": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.14494.283": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.14494.288": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.14494.307": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip" + "241.14494.325": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.15989.101": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.15989.102": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.15989.105": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.15989.113": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.15989.121": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.15989.155": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.15989.157": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.15989.49": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip" }, "name": "vscode-keymap" }, @@ -338,16 +338,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.15026.24": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "241.14494.234": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.14494.235": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.14494.237": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.14494.238": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.14494.241": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.14494.283": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.14494.288": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.14494.307": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip" + "241.14494.325": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.15989.101": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.15989.102": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.15989.105": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.15989.113": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.15989.121": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.15989.155": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.15989.157": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.15989.49": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip" }, "name": "eclipse-keymap" }, @@ -369,16 +369,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.15026.24": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "241.14494.234": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.14494.235": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.14494.237": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.14494.238": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.14494.241": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.14494.283": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.14494.288": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.14494.307": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip" + "241.14494.325": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.15989.101": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.15989.102": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.15989.105": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.15989.113": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.15989.121": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.15989.155": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.15989.157": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.15989.49": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip" }, "name": "visual-studio-keymap" }, @@ -400,16 +400,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.15026.24": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.14494.234": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.14494.235": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.14494.237": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.14494.238": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.14494.240": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.14494.241": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.14494.283": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.14494.288": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.14494.307": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "241.14494.325": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.15989.101": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.15989.102": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.15989.105": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.15989.113": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.15989.121": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.15989.150": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.15989.155": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.15989.157": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.15989.49": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -431,16 +431,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "233.15026.24": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.14494.234": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.14494.235": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.14494.237": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.14494.238": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.14494.241": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.14494.283": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.14494.288": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", - "241.14494.307": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip" + "241.14494.325": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.15989.101": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.15989.102": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.15989.105": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.15989.113": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.15989.121": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.15989.155": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.15989.157": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.15989.49": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip" }, "name": "github-copilot" }, @@ -462,16 +462,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.15026.24": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.14494.234": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.14494.235": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.14494.237": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.14494.238": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.14494.241": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.14494.283": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.14494.288": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.14494.307": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "241.14494.325": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.15989.101": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.15989.102": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.15989.105": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.15989.113": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.15989.121": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.15989.155": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.15989.157": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.15989.49": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -482,9 +482,9 @@ "rust-rover" ], "builds": { - "233.15026.24": "https://plugins.jetbrains.com/files/22407/515371/intellij-rust-233.25026.24.zip", - "241.14494.240": "https://plugins.jetbrains.com/files/22407/515370/intellij-rust-241.25026.24.zip", - "241.14494.288": "https://plugins.jetbrains.com/files/22407/515370/intellij-rust-241.25026.24.zip" + "241.15989.101": "https://plugins.jetbrains.com/files/22407/526873/intellij-rust-241.25989.101.zip", + "241.15989.121": "https://plugins.jetbrains.com/files/22407/526873/intellij-rust-241.25989.101.zip", + "241.15989.150": "https://plugins.jetbrains.com/files/22407/526873/intellij-rust-241.25989.101.zip" }, "name": "rust" } @@ -502,18 +502,17 @@ "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip": "sha256-FP6th8J3ymfTrwvJ3Ms7fsNPh3f9ab5ZVg5yPpKV/rY=", "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip": "sha256-BaBYXN8eulaJtJSKrz9bZ2Yn8029goSAUvjYU+BaiIU=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", - "https://plugins.jetbrains.com/files/22407/515370/intellij-rust-241.25026.24.zip": "sha256-tBPoO2EkPaWFZ/Gu3UAkZPy4opssWJQEVlz9GZUkNtQ=", - "https://plugins.jetbrains.com/files/22407/515371/intellij-rust-233.25026.24.zip": "sha256-j4b4To8jY4orP87GpphHPtLKeAPDNXcLNSUlIXDDy2Q=", - "https://plugins.jetbrains.com/files/631/513581/python-241.14494.240.zip": "sha256-pQP1LF/6uImQpBOpxUGE8KmmFh26kiC4YaYLAHnEc3o=", - "https://plugins.jetbrains.com/files/6981/509027/ini-233.15026.15.zip": "sha256-6sTD+OFO/yA7m5o0XqoJKLcQ4zAFro7Iy7WNPfA49xM=", + "https://plugins.jetbrains.com/files/22407/526873/intellij-rust-241.25989.101.zip": "sha256-v1r14zx591Vr8JmQxfysQ/aO8HDYCorwnnOEKDIfx+Y=", + "https://plugins.jetbrains.com/files/631/530669/python-241.15989.166.zip": "sha256-1mdv8xJfaa8Ln4/jsnyQyd6C19C8++XYpOBDU67SDGc=", "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip": "sha256-QC42nC7mEE3X1cmKj8jkwzpDJzX7ZoOPEd9y6i8IuvM=", - "https://plugins.jetbrains.com/files/7219/518876/Symfony_Plugin-2023.1.268.zip": "sha256-mYEuFdSaxw9Lc8yNgPB0ty6mfxjKaAa/jY6v4E2Qo0Q=", + "https://plugins.jetbrains.com/files/6981/527916/ini-241.15989.113.zip": "sha256-JgFoDqeMxdg3E9ZWHVsJGSygKAifFCEa9S+RdLFkLBI=", + "https://plugins.jetbrains.com/files/7219/529388/Symfony_Plugin-2023.1.271.zip": "sha256-vboCsF7e4Kx56hkKEXkFO9A/ElxNAITi4cIFwLcXxCU=", "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip": "sha256-JIZ6Iq3sOcAm8fBXnjRrG9dqCZuD/WajyVmn1JjYMBA=", - "https://plugins.jetbrains.com/files/7322/502153/python-ce-233.14808.12.zip": "sha256-PUBR9krJ26QrL2jTus0b+uhzkEkT+lGnBKy1f4i/U+w=", "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip": "sha256-6YC/aoiTRLAh87C2v3k24BLBH/tsdTWuDK/CBv8y1QI=", + "https://plugins.jetbrains.com/files/7322/530366/python-ce-241.15989.150.zip": "sha256-VJWFzUk/lloFCfHbXX7lQRV6bGseCqEPA8XOLlkqNho=", "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip": "sha256-+Lc/avYBLpyIV63DlbhAJtieHDv4HdggqdGFDw9iqN0=", "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip": "sha256-D2gF9bLAEFd1+6vZskiM2Eyl5e8hmyh/VHrmW2NociE=", - "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip": "sha256-D2HFG2tQy719+baHjUyizoq67tv6lDZrX3s6HDlBRA0=", - "https://plugins.jetbrains.com/files/9568/513582/go-plugin-241.14494.240.zip": "sha256-66Gx4XFn5DEZ/wCkN7IFQKtp+P0R9PoEAXmwOB97Q3A=" + "https://plugins.jetbrains.com/files/8607/530004/NixIDEA-0.4.0.13.zip": "sha256-6MI3mRCzSWmdMfjlkE4SMZmKnvWLjMGmYvcPw0PoBNY=", + "https://plugins.jetbrains.com/files/9568/521002/go-plugin-241.15989.21.zip": "sha256-4wM2FFZMTJlWEmxoSrZgkJXdSxUUtDoGZGrobnrMH78=" } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix index fa0e485d71..9a3522c5a5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix @@ -1,30 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kakoune-unwrapped"; - version = "2023.08.05"; + version = "2024.05.09"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "v${version}"; - sha256 = "sha256-RR3kw39vEjsg+6cIY6cK2i3ecGHlr1yzuBKaDtGlOGo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-Dfp33zk9ZUMrCZRfPNfoSX6rgQKItvOQx+CuRNQgtTA="; }; - patches = [ - # Use explicit target types for gather calls to bypass clang regression - # - # Since clang-16 there has been a regression in the P0522R0 support. - # (Bug report at https://github.com/llvm/llvm-project/issue/63281) - # - # Closes mawww/kakoune#4892 - (fetchpatch { - url = "https://github.com/mawww/kakoune/commit/7577fa1b668ea81eb9b7b9af690a4161187129dd.patch"; - hash = "sha256-M0jKaEDhkpvX+n7k8Jf2lWaRNy8bqZ1kRHR4eG4npss="; - }) - ]; makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; - preConfigure = '' - export version="v${version}" + postPatch = '' + echo "v${finalAttrs.version}" >.version ''; enableParallelBuilding = true; @@ -51,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ vrthra ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/editors/kile/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kile/default.nix index 0e1326f50c..b6c5345deb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kile/default.nix @@ -1,68 +1,47 @@ -{ mkDerivation -, lib +{ lib +, stdenv , fetchurl -, extra-cmake-modules -, kdoctools -, wrapGAppsHook -, qtscript -, kconfig -, kcrash -, kdbusaddons -, kdelibs4support -, kguiaddons -, kiconthemes -, kinit -, khtml -, konsole -, kparts -, ktexteditor -, kwindowsystem -, okular -, poppler +, cmake +, kdePackages +, qt6 }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kile"; - version = "2.9.93"; + version = "2.9.94"; src = fetchurl { url = "mirror://sourceforge/kile/kile-${version}.tar.bz2"; - sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA="; + sha256 = "U8Z0K9g/sJXL3ImLA/344Vq2gKgWk8yvnFB2uTrRo8o="; }; nativeBuildInputs = [ - extra-cmake-modules - wrapGAppsHook - kdoctools + cmake + kdePackages.extra-cmake-modules + qt6.wrapQtAppsHook + kdePackages.kdoctools ]; buildInputs = [ - kconfig - kcrash - kdbusaddons - kdelibs4support - kguiaddons - kiconthemes - kinit - khtml - kparts - ktexteditor - kwindowsystem - okular - poppler - qtscript + qt6.qtbase + qt6.qtdeclarative + qt6.qt5compat + kdePackages.kconfig + kdePackages.kcrash + kdePackages.kdbusaddons + kdePackages.kguiaddons + kdePackages.kiconthemes + kdePackages.konsole + kdePackages.kparts + kdePackages.ktexteditor + kdePackages.kwindowsystem + kdePackages.okular + kdePackages.poppler ]; - dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - propagatedUserEnvPkgs = [ konsole ]; meta = { description = "User-friendly TeX/LaTeX authoring tool for the KDE desktop environment"; homepage = "https://www.kde.org/applications/office/kile/"; - maintainers = with lib.maintainers; [ fridh ]; license = lib.licenses.gpl2Plus; mainProgram = "kile"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/l3afpad/default.nix b/third_party/nixpkgs/pkgs/applications/editors/l3afpad/default.nix index 2caf4ee781..f9632def17 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/l3afpad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/l3afpad/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, intltool, pkg-config, gtk3, fetchFromGitHub -, autoreconfHook, wrapGAppsHook }: +, autoreconfHook, wrapGAppsHook3 }: stdenv.mkDerivation rec { version = "unstable-2022-02-14"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA="; }; - nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 intltool ]; buildInputs = [ gtk3 ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/lapce/Cargo.lock b/third_party/nixpkgs/pkgs/applications/editors/lapce/Cargo.lock index 206fef049c..4937cc7d64 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/lapce/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/editors/lapce/Cargo.lock @@ -45,25 +45,15 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -84,48 +74,25 @@ dependencies = [ "memchr", ] -[[package]] -name = "alacritty_config" -version = "0.1.2-dev" -source = "git+https://github.com/alacritty/alacritty?rev=6071a7bf35cfd99be8ba70f479f188b7370cda6f#6071a7bf35cfd99be8ba70f479f188b7370cda6f" -dependencies = [ - "log", - "serde", - "toml 0.8.2", -] - -[[package]] -name = "alacritty_config_derive" -version = "0.2.2-dev" -source = "git+https://github.com/alacritty/alacritty?rev=6071a7bf35cfd99be8ba70f479f188b7370cda6f#6071a7bf35cfd99be8ba70f479f188b7370cda6f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - [[package]] name = "alacritty_terminal" -version = "0.20.0-dev" -source = "git+https://github.com/alacritty/alacritty?rev=6071a7bf35cfd99be8ba70f479f188b7370cda6f#6071a7bf35cfd99be8ba70f479f188b7370cda6f" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d1ea4484c8676f295307a4892d478c70ac8da1dbd8c7c10830a504b7f1022f" dependencies = [ - "alacritty_config", - "alacritty_config_derive", - "base64", - "bitflags 2.4.0", + "base64 0.22.0", + "bitflags 2.5.0", "home", "libc", "log", "miow", - "parking_lot 0.12.1", + "parking_lot", "piper", - "polling 3.2.0", - "regex-automata 0.3.9", + "polling", + "regex-automata", "rustix-openpty", "serde", - "serde_yaml", "signal-hook", - "toml 0.8.2", "unicode-width", "vte", "windows-sys 0.48.0", @@ -137,6 +104,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "ambient-authority" version = "0.0.2" @@ -150,7 +123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "052ad56e336bcc615a214bffbeca6c181ee9550acec193f0327e0b103b033a4d" dependencies = [ "android-properties", - "bitflags 2.4.0", + "bitflags 2.5.0", "cc", "cesu8", "jni", @@ -170,6 +143,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -179,6 +158,18 @@ dependencies = [ "libc", ] +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + [[package]] name = "anyhow" version = "1.0.69" @@ -221,20 +212,20 @@ version = "0.37.3+1.3.251" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" dependencies = [ - "libloading 0.7.3", + "libloading 0.7.4", ] [[package]] name = "ashpd" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31688b40eb5d739049f721d8405c33d3796b3f51f2bea84421a542dafe397e41" +checksum = "1b22517ee647547c01a687cf9b76074e1c91334032a4324f7243c6ee0f949390" dependencies = [ - "async-std", + "async-fs", + "async-net", "enumflags2", "futures-channel", "futures-util", - "once_cell", "rand", "serde", "serde_repr", @@ -244,73 +235,71 @@ dependencies = [ [[package]] name = "async-broadcast" -version = "0.4.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d26004fe83b2d1cd3a97609b21e39f9a31535822210fe83205d2ce48866ea61" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" dependencies = [ - "event-listener", + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", "futures-core", - "parking_lot 0.12.1", + "pin-project-lite", ] [[package]] name = "async-channel" -version = "1.7.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ - "concurrent-queue 1.2.4", - "event-listener", + "concurrent-queue", + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", "futures-core", + "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock", + "async-lock 3.3.0", "async-task", - "concurrent-queue 2.2.0", - "fastrand 1.8.0", + "concurrent-queue", + "fastrand 2.0.1", "futures-lite", "slab", ] [[package]] -name = "async-global-executor" -version = "2.3.1" +name = "async-fs" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", + "async-lock 3.3.0", "blocking", "futures-lite", - "once_cell", ] [[package]] name = "async-io" -version = "1.13.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" dependencies = [ - "async-lock", - "autocfg", + "async-lock 3.3.0", "cfg-if", - "concurrent-queue 2.2.0", + "concurrent-queue", + "futures-io", "futures-lite", - "log", "parking", - "polling 2.8.0", - "rustix 0.37.23", + "polling", + "rustix", "slab", - "socket2 0.4.7", - "waker-fn", + "tracing 0.1.37", + "windows-sys 0.52.0", ] [[package]] @@ -319,51 +308,83 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-process" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" +dependencies = [ + "async-channel", + "async-io", + "async-lock 3.3.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 5.2.0", + "futures-lite", + "rustix", + "windows-sys 0.52.0", ] [[package]] name = "async-recursion" -version = "0.3.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 1.0.101", + "syn 2.0.57", ] [[package]] -name = "async-std" -version = "1.12.0" +name = "async-signal" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-channel", - "async-global-executor", "async-io", - "async-lock", - "crossbeam-utils", - "futures-channel", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", "futures-core", "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", + "rustix", + "signal-hook-registry", "slab", - "wasm-bindgen-futures", + "windows-sys 0.48.0", ] [[package]] name = "async-task" -version = "4.3.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" @@ -373,7 +394,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", ] [[package]] @@ -388,17 +409,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -407,24 +417,30 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.7.1", + "miniz_oxide", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "bincode" @@ -450,12 +466,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - [[package]] name = "bitflags" version = "1.3.2" @@ -464,9 +474,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -516,34 +526,36 @@ dependencies = [ [[package]] name = "blocking" -version = "1.2.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", + "async-lock 3.3.0", "async-task", - "atomic-waker", - "fastrand 1.8.0", + "fastrand 2.0.1", + "futures-io", "futures-lite", - "once_cell", + "piper", + "tracing 0.1.37", ] [[package]] name = "bstr" -version = "0.2.17" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ - "lazy_static", "memchr", - "regex-automata 0.1.10", + "regex-automata", + "serde", ] [[package]] name = "bumpalo" -version = "3.11.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecount" @@ -553,9 +565,9 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" dependencies = [ "bytemuck_derive", ] @@ -568,7 +580,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", ] [[package]] @@ -583,22 +595,16 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - [[package]] name = "calloop" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "log", - "polling 3.2.0", - "rustix 0.38.20", + "polling", + "rustix", "slab", "thiserror", ] @@ -610,9 +616,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop", - "rustix 0.38.20", - "wayland-backend 0.3.2", - "wayland-client 0.31.1", + "rustix", + "wayland-backend", + "wayland-client", ] [[package]] @@ -623,7 +629,7 @@ checksum = "b779b2d0a001c125b4584ad586268fb4b92d957bff8d26d7fe0dd78283faa814" dependencies = [ "cap-primitives", "cap-std", - "io-lifetimes 2.0.2", + "io-lifetimes", "windows-sys 0.48.0", ] @@ -635,7 +641,7 @@ checksum = "6ffc30dee200c20b4dcb80572226f42658e1d9c4b668656d7cc59c33d50e396e" dependencies = [ "cap-primitives", "cap-std", - "rustix 0.38.20", + "rustix", "smallvec", ] @@ -648,10 +654,10 @@ dependencies = [ "ambient-authority", "fs-set-times", "io-extras", - "io-lifetimes 2.0.2", + "io-lifetimes", "ipnet", "maybe-owned", - "rustix 0.38.20", + "rustix", "windows-sys 0.48.0", "winx", ] @@ -674,8 +680,8 @@ checksum = "84bade423fa6403efeebeafe568fdb230e8c590a275fba2ba978dd112efcf6e9" dependencies = [ "cap-primitives", "io-extras", - "io-lifetimes 2.0.2", - "rustix 0.38.20", + "io-lifetimes", + "rustix", ] [[package]] @@ -686,15 +692,21 @@ checksum = "f8f52b3c8f4abfe3252fd0a071f3004aaa3b18936ec97bdbd8763ce03aff6247" dependencies = [ "cap-primitives", "once_cell", - "rustix 0.38.20", + "rustix", "winx", ] [[package]] -name = "cc" -version = "1.0.83" +name = "cast" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ "jobserver", "libc", @@ -719,58 +731,89 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] -name = "chrono" -version = "0.4.22" +name = "cfg_aliases" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" + +[[package]] +name = "chrono" +version = "0.4.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", - "time 0.1.44", "wasm-bindgen", - "winapi", + "windows-targets 0.52.0", +] + +[[package]] +name = "ciborium" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" + +[[package]] +name = "ciborium-ll" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +dependencies = [ + "ciborium-io", + "half", ] [[package]] name = "clap" -version = "3.2.25" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" dependencies = [ - "atty", - "bitflags 1.3.2", + "clap_builder", "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +dependencies = [ + "anstyle", "clap_lex", - "indexmap 1.9.3", - "once_cell", - "strsim", - "termcolor", - "textwrap", ] [[package]] name = "clap_derive" -version = "3.2.25" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ - "heck 0.4.0", - "proc-macro-error", + "heck", "proc-macro2", "quote", - "syn 1.0.101", + "syn 2.0.57", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clipboard-win" @@ -830,10 +873,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "com-rs" -version = "0.2.1" +name = "com" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "combine" @@ -845,15 +913,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "concurrent-queue" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] - [[package]] name = "concurrent-queue" version = "2.2.0" @@ -865,23 +924,23 @@ dependencies = [ [[package]] name = "config" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7" +checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca" dependencies = [ "async-trait", "lazy_static", "nom", "pathdiff", "serde", - "toml 0.5.9", + "toml", ] [[package]] name = "copypasta" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d35364349bf9e9e1c3a035ddcb00d188d23a3c40c50244c03c27a99fc6a65ae" +checksum = "deb85422867ca93da58b7f95fb5c0c10f6183ed6e1ef8841568968a896d3a858" dependencies = [ "clipboard-win", "objc", @@ -932,36 +991,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cosmic-text" -version = "0.7.0" -source = "git+https://github.com/lapce/cosmic-text?rev=f7a20704d6ebbe8fb82d0bb579c37c53e7ae9747#f7a20704d6ebbe8fb82d0bb579c37c53e7ae9747" -dependencies = [ - "fontdb 0.16.0", - "libm", - "log", - "once_cell", - "ouroboros", - "parking_lot 0.12.1", - "peniko", - "rangemap", - "rustybuzz 0.8.0", - "stretto", - "swash", - "sys-locale", - "ttf-parser 0.18.1", - "unicode-bidi", - "unicode-linebreak", - "unicode-script", - "unicode-segmentation", -] - -[[package]] -name = "cov-mark" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffa3d3e0138386cd4361f63537765cac7ee40698028844635a54495a92f67f3" - [[package]] name = "cpp_demangle" version = "0.3.5" @@ -982,18 +1011,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.101.2" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f773437307980ac0f424bf9b9a5d0cd21a0f17248c6860c9a65bec8b5975f3fe" +checksum = "2b5bb9245ec7dcc04d03110e538d31f0969d301c9d673145f4b4d5c3478539a3" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.101.2" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443c2ac50e97fb7de1a0f862753fce3f27215558811a6fcee508eb0c3747fa79" +checksum = "ebb18d10e5ddac43ba4ca8fd4e310938569c3e484cc01b6372b27dc5bb4dfd28" dependencies = [ "bumpalo", "cranelift-bforest", @@ -1003,7 +1032,7 @@ dependencies = [ "cranelift-entity", "cranelift-isle", "gimli", - "hashbrown 0.14.2", + "hashbrown", "log", "regalloc2", "smallvec", @@ -1012,33 +1041,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.101.2" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b174c411480c79ce0793c55042fa51bec27e486381d103a53cab3b480cb2db" +checksum = "7a3ce6d22982c1b9b6b012654258bab1a13947bb12703518bef06b1a4867c3d6" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.101.2" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fa0151a528066a369de6debeea4d4b23a32aba68b5add8c46d3dc8091ff434" +checksum = "47220fd4f9a0ce23541652b6f16f83868d282602c600d14934b2a4c166b4bd80" [[package]] name = "cranelift-control" -version = "0.101.2" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8adf1e6398493c9bea1190e37d28a0eb0eca5fddbc80e01e506cda34db92b1f" +checksum = "ed5a4c42672aea9b6e820046b52e47a1c05d3394a6cdf4cb3c3c4b702f954bd2" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.101.2" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4917e2ed3bb5fe87d0ed88395ca6d644018d119a034faedd1f3e1f2c33cd52b2" +checksum = "0b4e9a3296fc827f9d35135dc2c0c8dd8d8359eb1ef904bae2d55d5bcb0c9f94" dependencies = [ "serde", "serde_derive", @@ -1058,9 +1087,9 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.101.2" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67fda31b9d69eaa1c49a2081939454c45857596a9d45af6744680541c628b4c" +checksum = "45bab6d69919d210a50331d35cc6ce111567bc040aebac63a8ae130d0400a075" [[package]] name = "cranelift-native" @@ -1082,7 +1111,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools", + "itertools 0.10.5", "log", "smallvec", "wasmparser", @@ -1099,12 +1128,47 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.8" +name = "criterion" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] @@ -1135,19 +1199,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-common" @@ -1159,16 +1213,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.101", -] - [[package]] name = "ctor" version = "0.2.5" @@ -1176,7 +1220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" dependencies = [ "quote", - "syn 2.0.38", + "syn 2.0.57", ] [[package]] @@ -1184,23 +1228,26 @@ name = "cursor-icon" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" +dependencies = [ + "serde", +] [[package]] name = "d3d12" -version = "0.7.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "libloading 0.8.1", "winapi", ] [[package]] name = "darling" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ "darling_core", "darling_macro", @@ -1208,34 +1255,34 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.101", + "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", "quote", - "syn 1.0.101", + "syn 1.0.109", ] [[package]] name = "data-url" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "debugid" @@ -1246,6 +1293,15 @@ dependencies = [ "uuid", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + [[package]] name = "derivative" version = "2.2.0" @@ -1254,7 +1310,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.101", + "syn 1.0.109", ] [[package]] @@ -1350,25 +1406,25 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "drm" -version = "0.9.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf9159ef4bcecd0c5e4cbeb573b8d0037493403d542780dba5d840bbf9df56f" +checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "bytemuck", "drm-ffi", "drm-fourcc", - "nix 0.26.4", + "rustix", ] [[package]] name = "drm-ffi" -version = "0.5.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1352481b7b90e27a8a1bf8ef6b33cf18b98dba7c410e75c24bb3eef2f0d8d525" +checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "nix 0.26.4", + "rustix", ] [[package]] @@ -1379,29 +1435,30 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" [[package]] name = "drm-sys" -version = "0.4.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1369f1679d6b706d234c4c1e0613c415c2c74b598a09ad28080ba2474b72e42d" +checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" dependencies = [ "libc", + "linux-raw-sys 0.6.4", ] [[package]] name = "dyn-clone" -version = "1.0.10" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "educe" -version = "0.4.22" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae" +checksum = "e4bd92664bf78c4d3dba9b7cdafce6fa15b13ed3ed16175218196942e99168a8" dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 1.0.101", + "syn 2.0.57", ] [[package]] @@ -1429,16 +1486,29 @@ dependencies = [ ] [[package]] -name = "enum-ordinalize" -version = "3.1.13" +name = "endi" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enum-ordinalize" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" +dependencies = [ + "enum-ordinalize-derive", +] + +[[package]] +name = "enum-ordinalize-derive" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ - "num-bigint", - "num-traits", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", ] [[package]] @@ -1459,7 +1529,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", ] [[package]] @@ -1470,23 +1540,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1505,19 +1564,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] -name = "exr" -version = "1.71.0" +name = "event-listener" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide 0.7.1", - "rayon-core", - "smallvec", - "zune-inflate", + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.2.0", + "pin-project-lite", ] [[package]] @@ -1548,7 +1633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b0377f1edc77dbd1118507bc7a66e4ab64d2b90c66f90726dc801e73a8c68f9" dependencies = [ "cfg-if", - "rustix 0.38.20", + "rustix", "windows-sys 0.48.0", ] @@ -1573,20 +1658,14 @@ dependencies = [ "windows-sys 0.36.1", ] -[[package]] -name = "fixedbitset" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" - [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", - "miniz_oxide 0.5.4", + "miniz_oxide", ] [[package]] @@ -1597,99 +1676,208 @@ checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" [[package]] name = "floem" -version = "0.1.0" -source = "git+https://github.com/lapce/floem?rev=0694f9672a10a49290af223cac3dc2ab53b1b1dd#0694f9672a10a49290af223cac3dc2ab53b1b1dd" +version = "0.1.1" +source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "copypasta", "crossbeam-channel", + "downcast-rs", "educe", + "floem-editor-core", + "floem-peniko", + "floem-winit", "floem_reactive", "floem_renderer", - "floem_tiny_skia", - "floem_vger", + "floem_tiny_skia_renderer", + "floem_vger_renderer", "im", + "im-rc", "image", - "indexmap 2.0.2", - "kurbo", + "indexmap", + "kurbo 0.9.5", + "lapce-xi-rope", "once_cell", - "parking_lot 0.12.1", - "peniko", - "raw-window-handle 0.5.2", + "parking_lot", + "raw-window-handle 0.6.0", "rfd", "rustc-hash", + "serde", "sha2", "smallvec", + "strum", + "strum_macros", "taffy", "unicode-segmentation", - "winit", + "wgpu", +] + +[[package]] +name = "floem-cosmic-text" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d74a7975acd84233e843c26da850aa43b39f1e64503fd46d6af9be4ea498dd" +dependencies = [ + "floem-peniko", + "fontdb", + "libm", + "log", + "once_cell", + "ouroboros", + "parking_lot", + "rangemap", + "rustybuzz", + "stretto", + "swash", + "sys-locale", + "ttf-parser 0.20.0", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "floem-editor-core" +version = "0.1.1" +source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" +dependencies = [ + "bitflags 2.5.0", + "itertools 0.12.1", + "lapce-xi-rope", + "memchr", + "once_cell", + "serde", + "strum", + "strum_macros", +] + +[[package]] +name = "floem-peniko" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f505394c816e710e2b664647a7a1a4ffdf45e3b3493ad6560d9489f23100430" +dependencies = [ + "kurbo 0.9.5", + "smallvec", +] + +[[package]] +name = "floem-vger" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef11c9c2f1668ec58b1712f85afec989caaae19273b653aaad1964575f8871c" +dependencies = [ + "euclid", + "floem-cosmic-text", + "fontdue", + "rect_packer", + "wgpu", +] + +[[package]] +name = "floem-winit" +version = "0.29.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc88e6b23b93c7ba38e9cd465d2d0cbd3cd4999f05f685349e2b3cdfe88813a" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.5.0", + "bytemuck", + "calloop", + "cfg_aliases 0.1.1", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "memmap2 0.9.0", + "ndk", + "ndk-sys", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", + "redox_syscall 0.3.5", + "rustix", + "sctk-adwaita", + "serde", + "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", ] [[package]] name = "floem_reactive" -version = "0.1.0" -source = "git+https://github.com/lapce/floem?rev=0694f9672a10a49290af223cac3dc2ab53b1b1dd#0694f9672a10a49290af223cac3dc2ab53b1b1dd" +version = "0.1.1" +source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" dependencies = [ "smallvec", ] [[package]] name = "floem_renderer" -version = "0.1.0" -source = "git+https://github.com/lapce/floem?rev=0694f9672a10a49290af223cac3dc2ab53b1b1dd#0694f9672a10a49290af223cac3dc2ab53b1b1dd" +version = "0.1.1" +source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" dependencies = [ - "cosmic-text", + "floem-cosmic-text", + "floem-peniko", "image", - "peniko", "resvg", ] [[package]] -name = "floem_tiny_skia" -version = "0.1.0" -source = "git+https://github.com/lapce/floem?rev=0694f9672a10a49290af223cac3dc2ab53b1b1dd#0694f9672a10a49290af223cac3dc2ab53b1b1dd" +name = "floem_tiny_skia_renderer" +version = "0.1.1" +source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" dependencies = [ "anyhow", "bytemuck", + "floem-peniko", "floem_renderer", "futures", "image", - "peniko", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "resvg", "softbuffer", "swash", ] [[package]] -name = "floem_vger" -version = "0.1.0" -source = "git+https://github.com/lapce/floem?rev=0694f9672a10a49290af223cac3dc2ab53b1b1dd#0694f9672a10a49290af223cac3dc2ab53b1b1dd" +name = "floem_vger_renderer" +version = "0.1.1" +source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" dependencies = [ "anyhow", + "floem-peniko", + "floem-vger", "floem_renderer", "futures", "image", - "peniko", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "resvg", "swash", - "vger", "wgpu", ] -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1702,28 +1890,14 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" dependencies = [ - "roxmltree", + "roxmltree 0.18.0", ] [[package]] name = "fontdb" -version = "0.14.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2 0.6.2", - "slotmap", - "tinyvec", - "ttf-parser 0.19.1", -] - -[[package]] -name = "fontdb" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b88c54a38407f7352dd2c4238830115a6377741098ffd1f997c813d0e088a6" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", @@ -1735,12 +1909,12 @@ dependencies = [ [[package]] name = "fontdue" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0793f5137567643cf65ea42043a538804ff0fbf288649e2141442b602d81f9bc" +checksum = "9099a2f86b8e674b75d03ff154b3fe4c5208ed249ced8d69cc313a9fa40bb488" dependencies = [ - "hashbrown 0.13.2", - "ttf-parser 0.15.2", + "hashbrown", + "ttf-parser 0.20.0", ] [[package]] @@ -1770,7 +1944,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", ] [[package]] @@ -1787,9 +1961,9 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1800,21 +1974,11 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd738b84894214045e8414eaded76359b4a5773f0a0a56b16575110739cdcf39" dependencies = [ - "io-lifetimes 2.0.2", - "rustix 0.38.20", + "io-lifetimes", + "rustix", "windows-sys 0.48.0", ] -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "fs_extra" version = "1.3.0" @@ -1832,9 +1996,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1847,9 +2011,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1857,15 +2021,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1874,53 +2038,51 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.12.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ - "fastrand 1.8.0", + "fastrand 2.0.1", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", - "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1949,7 +2111,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "debugid", "fxhash", "serde", @@ -1968,12 +2130,12 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.3.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -1992,10 +2154,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if", - "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", + "wasi", ] [[package]] @@ -2015,17 +2175,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" dependencies = [ "fallible-iterator", - "indexmap 2.0.2", + "indexmap", "stable_deref_trait", ] [[package]] name = "git2" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" +checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "libc", "libgit2-sys", "log", @@ -2053,34 +2213,22 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "globset" -version = "0.4.9" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ - "aho-corasick 0.7.19", + "aho-corasick 1.1.2", "bstr", - "fnv", "log", - "regex", -] - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", + "regex-automata", + "regex-syntax 0.8.2", ] [[package]] name = "glow" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" dependencies = [ "js-sys", "slotmap", @@ -2103,7 +2251,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "gpu-alloc-types", ] @@ -2113,16 +2261,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", ] [[package]] name = "gpu-allocator" -version = "0.23.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" dependencies = [ - "backtrace", "log", "presser", "thiserror", @@ -2132,13 +2279,13 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "gpu-descriptor-types", - "hashbrown 0.12.3", + "hashbrown", ] [[package]] @@ -2161,9 +2308,9 @@ dependencies = [ [[package]] name = "grep-regex" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1345f8d33c89f2d5b081f2f2a41175adef9fd0bed2fea6a26c96c2deb027e58e" +checksum = "997598b41d53a37a2e3fc5300d5c11d825368c054420a9c65125b8fe1078463f" dependencies = [ "aho-corasick 0.7.19", "bstr", @@ -2176,9 +2323,9 @@ dependencies = [ [[package]] name = "grep-searcher" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48852bd08f9b4eb3040ecb6d2f4ade224afe880a9a0909c5563cc59fa67932cc" +checksum = "5601c4b9f480f0c9ebb40b1f6cbf447b8a50c5369223937a6c5214368c58779f" dependencies = [ "bstr", "bytecount", @@ -2191,15 +2338,15 @@ dependencies = [ [[package]] name = "grid" -version = "0.10.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eec1c01eb1de97451ee0d60de7d81cf1e72aabefb021616027f3d1c3ec1c723c" +checksum = "d196ffc1627db18a531359249b2bf8416178d84b729f3cebeb278f285fb9b58c" [[package]] name = "h2" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2207,7 +2354,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap", "slab", "tokio", "tokio-util", @@ -2216,50 +2363,30 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" -dependencies = [ - "crunchy", -] +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.7.6", -] - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.3", -] - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" -dependencies = [ - "ahash 0.8.3", + "ahash", + "allocator-api2", ] [[package]] name = "hassle-rs" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 1.3.2", - "com-rs", + "bitflags 2.5.0", + "com", "libc", - "libloading 0.7.3", + "libloading 0.8.1", "thiserror", "widestring", "winapi", @@ -2267,18 +2394,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -2291,9 +2409,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2430,9 +2548,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2440,11 +2558,10 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.18" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" dependencies = [ - "crossbeam-utils", "globset", "lazy_static", "log", @@ -2472,22 +2589,42 @@ dependencies = [ ] [[package]] -name = "image" -version = "0.24.7" +name = "im-rc" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe" +dependencies = [ + "bitmaps", + "rand_core", + "rand_xoshiro", + "sized-chunks", + "typenum", + "version_check", +] + +[[package]] +name = "image" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-rational", + "image-webp", "num-traits", "png", - "qoi", - "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +dependencies = [ + "byteorder", + "thiserror", ] [[package]] @@ -2517,27 +2654,17 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", - "syn 1.0.101", + "syn 1.0.109", ] [[package]] name = "indexmap" -version = "1.9.3" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown", "serde", ] @@ -2602,18 +2729,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d3c230ee517ee76b1cc593b52939ff68deda3fae9e41eca426c6b4993df51c4" dependencies = [ - "io-lifetimes 2.0.2", - "windows-sys 0.48.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", + "io-lifetimes", "windows-sys 0.48.0", ] @@ -2638,6 +2754,17 @@ dependencies = [ "once_cell", ] +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "is-wsl" version = "0.4.0" @@ -2657,6 +2784,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.3" @@ -2719,15 +2855,12 @@ name = "jpeg-decoder" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2791,17 +2924,18 @@ dependencies = [ ] [[package]] -name = "kv-log-macro" -version = "1.0.7" +name = "kurbo" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" dependencies = [ - "log", + "arrayvec", + "smallvec", ] [[package]] name = "lapce" -version = "0.3.1" +version = "0.4.0" dependencies = [ "lapce-app", "lapce-proxy", @@ -2809,28 +2943,30 @@ dependencies = [ [[package]] name = "lapce-app" -version = "0.3.1" +version = "0.4.0" dependencies = [ "Inflector", "alacritty_terminal", "anyhow", - "base64", + "backtrace", + "base64 0.21.7", "bytemuck", "chrono", "clap", "config", + "criterion", "crossbeam-channel", "directories", "dmg", "flate2", "floem", "fs_extra", - "futures", + "globset", "im", "include_dir", - "indexmap 2.0.2", + "indexmap", "interprocess", - "itertools", + "itertools 0.12.1", "lapce-core", "lapce-proxy", "lapce-rpc", @@ -2840,7 +2976,7 @@ dependencies = [ "nucleo", "once_cell", "open", - "parking_lot 0.11.2", + "parking_lot", "pulldown-cmark", "rayon", "regex", @@ -2848,40 +2984,39 @@ dependencies = [ "serde", "serde_json", "sha2", - "sled", "smallvec", "structdesc", "strum", "strum_macros", "tar", "thiserror", - "tokio", - "toml 0.5.9", - "toml_edit 0.19.14", + "toml", + "toml_edit 0.20.2", "tracing 0.2.0", "tracing-appender", + "tracing-log", "tracing-subscriber", "unicode-width", "url", + "windows-sys 0.36.1", "zip", ] [[package]] name = "lapce-core" -version = "0.3.1" +version = "0.4.0" dependencies = [ "anyhow", "arc-swap", - "bitflags 1.3.2", "directories", + "floem-editor-core", "include_dir", - "itertools", + "itertools 0.12.1", "lapce-rpc", "lapce-xi-rope", - "libloading 0.7.3", + "libloading 0.8.1", "lsp-types", "once_cell", - "serde", "slotmap", "strum", "strum_macros", @@ -2902,7 +3037,7 @@ dependencies = [ [[package]] name = "lapce-proxy" -version = "0.3.1" +version = "0.4.0" dependencies = [ "alacritty_terminal", "anyhow", @@ -2912,13 +3047,14 @@ dependencies = [ "directories", "dyn-clone", "flate2", + "floem-editor-core", "git2", "globset", "grep-matcher", "grep-regex", "grep-searcher", "ignore", - "indexmap 2.0.2", + "indexmap", "interprocess", "jsonrpc-lite", "lapce-core", @@ -2930,8 +3066,8 @@ dependencies = [ "notify", "objc", "once_cell", - "parking_lot 0.11.2", - "polling 3.2.0", + "parking_lot", + "polling", "psp-types", "regex", "reqwest", @@ -2940,9 +3076,10 @@ dependencies = [ "strum", "strum_macros", "tar", - "toml 0.5.9", - "toml_edit 0.19.14", + "toml", + "toml_edit 0.20.2", "tracing 0.2.0", + "tracing-log", "trash", "url", "walkdir", @@ -2955,15 +3092,15 @@ dependencies = [ [[package]] name = "lapce-rpc" -version = "0.3.1" +version = "0.4.0" dependencies = [ "anyhow", "crossbeam-channel", "human-sort", - "indexmap 2.0.2", + "indexmap", "lapce-xi-rope", "lsp-types", - "parking_lot 0.11.2", + "parking_lot", "serde", "serde_json", "tracing 0.2.0", @@ -3001,23 +3138,17 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - [[package]] name = "libc" -version = "0.2.149" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libgit2-sys" -version = "0.16.1+1.7.1" +version = "0.16.2+1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" +checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" dependencies = [ "cc", "libc", @@ -3029,9 +3160,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", "winapi", @@ -3081,24 +3212,21 @@ dependencies = [ [[package]] name = "line-wrap" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" [[package]] name = "locale_config" @@ -3125,20 +3253,14 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", - "serde", - "value-bag", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lsp-types" -version = "0.93.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3bcfee315dde785ba887edb540b08765fd7df75a7d948844be6bf5712246734" +version = "0.95.1" +source = "git+https://github.com/lapce/lsp-types?rev=feaa1e2ec80975c9dadd400a238ceacf071058e6#feaa1e2ec80975c9dadd400a238ceacf071058e6" dependencies = [ "bitflags 1.3.2", "serde", @@ -3173,9 +3295,9 @@ checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memfd" @@ -3183,7 +3305,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.20", + "rustix", ] [[package]] @@ -3195,24 +3317,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memmap2" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" -dependencies = [ - "libc", -] - [[package]] name = "memmap2" version = "0.9.0" @@ -3255,7 +3359,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -3276,15 +3380,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -3297,13 +3392,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -3318,15 +3413,15 @@ dependencies = [ [[package]] name = "naga" -version = "0.14.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61d829abac9f5230a85d8cc83ec0879b4c09790208ae25b5ea031ef84562e071" +checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" dependencies = [ "bit-set", - "bitflags 2.4.0", + "bitflags 2.5.0", "codespan-reporting", "hexf-parse", - "indexmap 2.0.2", + "indexmap", "log", "num-traits", "rustc-hash", @@ -3336,15 +3431,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - [[package]] name = "native-tls" version = "0.2.10" @@ -3369,7 +3455,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "jni-sys", "log", "ndk-sys", @@ -3394,18 +3480,6 @@ dependencies = [ "jni-sys", ] -[[package]] -name = "nix" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - [[package]] name = "nix" version = "0.26.4" @@ -3416,7 +3490,18 @@ dependencies = [ "cfg-if", "libc", "memoffset 0.7.1", - "pin-utils", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "libc", + "memoffset 0.9.0", ] [[package]] @@ -3431,9 +3516,9 @@ dependencies = [ [[package]] name = "notify" -version = "5.0.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2c66da08abae1c024c01d635253e402341b4060a12e99b31c7594063bf490a" +checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" dependencies = [ "bitflags 1.3.2", "crossbeam-channel", @@ -3445,7 +3530,7 @@ dependencies = [ "mio", "serde", "walkdir", - "winapi", + "windows-sys 0.45.0", ] [[package]] @@ -3460,57 +3545,30 @@ dependencies = [ [[package]] name = "nucleo" -version = "0.2.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccab936f2c8ad271bb31430944d98d358f74153566ea323265497f5639b11b6" +checksum = "5262af4c94921c2646c5ac6ff7900c2af9cbb08dc26a797e18130a7019c039d4" dependencies = [ "nucleo-matcher", - "parking_lot 0.12.1", + "parking_lot", "rayon", ] [[package]] name = "nucleo-matcher" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b702b402fe286162d1f00b552a046ce74365d2ac473a2607ff36ba650f9bd57" +checksum = "bf33f538733d1a5a3494b836ba913207f14d9d4a1d3cd67030c5061bdd2cac85" dependencies = [ - "cov-mark", "memchr", "unicode-segmentation", ] [[package]] -name = "num-bigint" -version = "0.4.3" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -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", -] +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-traits" @@ -3549,16 +3607,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.38", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", + "syn 2.0.57", ] [[package]] @@ -3629,22 +3678,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "crc32fast", - "hashbrown 0.14.2", - "indexmap 2.0.2", + "hashbrown", + "indexmap", "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "open" -version = "5.0.0" +version = "5.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" +checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" dependencies = [ "is-wsl", "libc", @@ -3653,11 +3708,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.42" +version = "0.10.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -3674,7 +3729,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.101", + "syn 1.0.109", ] [[package]] @@ -3685,20 +3740,19 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.22.0+1.1.1q" +version = "300.2.3+3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.76" +version = "0.9.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" +checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" dependencies = [ - "autocfg", "cc", "libc", "openssl-src", @@ -3717,41 +3771,37 @@ dependencies = [ [[package]] name = "ordered-stream" -version = "0.0.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44630c059eacfd6e08bdaa51b1db2ce33119caa4ddc1235e923109aa5f25ccb1" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" dependencies = [ "futures-core", "pin-project-lite", ] -[[package]] -name = "os_str_bytes" -version = "6.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" - [[package]] name = "ouroboros" -version = "0.15.6" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" +checksum = "97b7be5a8a3462b752f4be3ff2b2bf2f7f1d00834902e46be2a4d68b87b0573c" dependencies = [ "aliasable", "ouroboros_macro", + "static_assertions", ] [[package]] name = "ouroboros_macro" -version = "0.15.6" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" +checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33" dependencies = [ - "Inflector", - "proc-macro-error", + "heck", + "itertools 0.12.1", "proc-macro2", + "proc-macro2-diagnostics", "quote", - "syn 1.0.101", + "syn 2.0.57", ] [[package]] @@ -3771,20 +3821,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.5", -] +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -3793,24 +3832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.3", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "backtrace", - "cfg-if", - "instant", - "libc", - "petgraph", - "redox_syscall 0.2.16", - "smallvec", - "thread-id", - "winapi", + "parking_lot_core", ] [[package]] @@ -3838,30 +3860,11 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" -[[package]] -name = "peniko" -version = "0.1.0" -source = "git+https://github.com/linebender/peniko?rev=cafdac9a211a0fb2fec5656bd663d1ac770bcc81#cafdac9a211a0fb2fec5656bd663d1ac770bcc81" -dependencies = [ - "kurbo", - "smallvec", -] - [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "petgraph" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" -dependencies = [ - "fixedbitset", - "indexmap 1.9.3", -] +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pico-args" @@ -3900,15 +3903,43 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "plist" -version = "1.4.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" dependencies = [ - "base64", - "indexmap 1.9.3", + "base64 0.21.7", + "indexmap", "line-wrap", - "quick-xml 0.28.2", - "time 0.3.14", + "quick-xml", + "time", +] + +[[package]] +name = "plotters" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-svg" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +dependencies = [ + "plotters-backend", ] [[package]] @@ -3921,37 +3952,22 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] name = "polling" -version = "2.8.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue 2.2.0", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62a79e457c9898100b4298d57d69ec53d06f9a6ed352431ce5f377e082d2e846" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" dependencies = [ "cfg-if", - "concurrent-queue 2.2.0", + "concurrent-queue", + "hermit-abi 0.3.9", "pin-project-lite", - "rustix 0.38.20", + "rustix", "tracing 0.1.37", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3960,6 +3976,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.16" @@ -3979,31 +4001,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit 0.19.14", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.101", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "toml_edit 0.19.15", ] [[package]] @@ -4014,13 +4012,26 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.57", + "version_check", + "yansi", +] + [[package]] name = "profiling" version = "1.0.10" @@ -4048,48 +4059,37 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.9.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +checksum = "5f0530d13d87d1f549b66a3e8d0c688952abe5994e204ed62615baaf25dc029c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "getopts", "memchr", + "pulldown-cmark-escape", "unicase", ] [[package]] -name = "qoi" -version = "0.4.1" +name = "pulldown-cmark-escape" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] +checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" [[package]] name = "quick-xml" -version = "0.28.2" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -4159,9 +4159,9 @@ checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -4169,20 +4169,14 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", ] -[[package]] -name = "rctree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" - [[package]] name = "rect_packer" version = "0.2.1" @@ -4207,6 +4201,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -4221,10 +4224,9 @@ dependencies = [ [[package]] name = "regalloc2" version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" +source = "git+https://github.com/bytecodealliance/regalloc2?rev=5d79e12d0a93b10fc181f4da409b4671dd365228#5d79e12d0a93b10fc181f4da409b4671dd365228" dependencies = [ - "hashbrown 0.13.2", + "hashbrown", "log", "rustc-hash", "slice-group-by", @@ -4233,38 +4235,21 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick 1.1.2", "memchr", - "regex-automata 0.4.3", + "regex-automata", "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[package]] -name = "regex-automata" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" -dependencies = [ - "aho-corasick 1.1.2", - "memchr", - "regex-syntax 0.7.5", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick 1.1.2", "memchr", @@ -4277,12 +4262,6 @@ version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - [[package]] name = "regex-syntax" version = "0.8.2" @@ -4306,11 +4285,11 @@ checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -4328,9 +4307,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -4345,9 +4326,9 @@ dependencies = [ [[package]] name = "resvg" -version = "0.33.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df5f3de3bb51d8a4766a1ef5d85851f2737716dea899516248d25e313a51b0d" +checksum = "024e40e1ba7313fc315b1720298988c0cd6f8bfe3754b52838aafecebd11355a" dependencies = [ "gif", "jpeg-decoder", @@ -4355,35 +4336,32 @@ dependencies = [ "pico-args", "png", "rgb", - "svgfilters", "svgtypes", - "tiny-skia 0.9.1", + "tiny-skia", "usvg", ] [[package]] name = "rfd" -version = "0.11.4" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe664af397d2b6a13a8ba1d172a2b5c87c6c5149039edbf8fa122b98c9ed96f" +checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" dependencies = [ "ashpd", - "async-io", "block", "dispatch", - "futures-util", "js-sys", "log", "objc", "objc-foundation", "objc_id", "pollster", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "urlencoding", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.44.0", + "windows-sys 0.48.0", ] [[package]] @@ -4395,19 +4373,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "rosvgtree" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad747e7384940e7bf33b15ba433b7bad9f44c0c6d5287a67c2cb22cd1743d497" -dependencies = [ - "log", - "roxmltree", - "simplecss", - "siphasher", - "svgtypes", -] - [[package]] name = "roxmltree" version = "0.18.0" @@ -4417,6 +4382,12 @@ dependencies = [ "xmlparser", ] +[[package]] +name = "roxmltree" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" + [[package]] name = "rustc-demangle" version = "0.1.21" @@ -4440,31 +4411,17 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes 1.0.11", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" -dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "errno", "itoa", "libc", - "linux-raw-sys 0.4.10", + "linux-raw-sys 0.4.13", "once_cell", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4475,39 +4432,38 @@ checksum = "a25c3aad9fc1424eb82c88087789a7d938e1829724f3e4043163baf0d13cfc12" dependencies = [ "errno", "libc", - "rustix 0.38.20", + "rustix", ] [[package]] -name = "rustybuzz" -version = "0.7.0" +name = "rustls-pemfile" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "smallvec", - "ttf-parser 0.18.1", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-general-category", - "unicode-script", + "base64 0.21.7", ] [[package]] -name = "rustybuzz" -version = "0.8.0" +name = "rustversion" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rustybuzz" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "bytemuck", "libm", "smallvec", - "ttf-parser 0.19.1", + "ttf-parser 0.20.0", "unicode-bidi-mirroring", "unicode-ccc", - "unicode-general-category", + "unicode-properties", "unicode-script", ] @@ -4517,12 +4473,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - [[package]] name = "same-file" version = "1.0.6" @@ -4564,7 +4514,7 @@ dependencies = [ "log", "memmap2 0.9.0", "smithay-client-toolkit", - "tiny-skia 0.11.1", + "tiny-skia", ] [[package]] @@ -4604,22 +4554,22 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", ] [[package]] @@ -4641,7 +4591,7 @@ checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ "proc-macro2", "quote", - "syn 1.0.101", + "syn 1.0.109", ] [[package]] @@ -4665,39 +4615,22 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_yaml" -version = "0.9.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" -dependencies = [ - "indexmap 2.0.2", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - [[package]] name = "sha1" -version = "0.6.1" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "sha1_smol", + "cfg-if", + "cpufeatures", + "digest", ] -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -4781,22 +4714,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "sled" -version = "0.34.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935" -dependencies = [ - "crc32fast", - "crossbeam-epoch", - "crossbeam-utils", - "fs2", - "fxhash", - "libc", - "log", - "parking_lot 0.11.2", -] - [[package]] name = "slice-group-by" version = "0.3.0" @@ -4805,18 +4722,18 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "slotmap" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ "version_check", ] [[package]] name = "smallvec" -version = "1.11.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" @@ -4824,22 +4741,22 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "calloop", "calloop-wayland-source", "cursor-icon", "libc", "log", "memmap2 0.9.0", - "rustix 0.38.20", + "rustix", "thiserror", - "wayland-backend 0.3.2", - "wayland-client 0.31.1", + "wayland-backend", + "wayland-client", "wayland-csd-frame", "wayland-cursor", "wayland-protocols", "wayland-protocols-wlr", - "wayland-scanner 0.31.0", + "wayland-scanner", "xkeysym", ] @@ -4851,7 +4768,7 @@ checksum = "0bb62b280ce5a5cba847669933a0948d00904cf83845c944eae96a4738cea1a6" dependencies = [ "libc", "smithay-client-toolkit", - "wayland-backend 0.3.2", + "wayland-backend", ] [[package]] @@ -4885,45 +4802,35 @@ dependencies = [ [[package]] name = "softbuffer" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd56fe5e6c6f1881aad2bd37acaef4ac4a3689c970dfcbd87a36a6e60210ec8" +checksum = "071916a85d1db274b4ed57af3a14afb66bd836ae7f82ebb6f1fd3455107830d9" dependencies = [ "as-raw-xcb-connection", "bytemuck", - "cfg_aliases", + "cfg_aliases 0.2.0", "cocoa", "core-graphics", "drm", - "drm-sys", "fastrand 2.0.1", "foreign-types 0.5.0", "js-sys", "log", - "memmap2 0.7.1", - "nix 0.26.4", + "memmap2 0.9.0", "objc", - "raw-window-handle 0.5.2", - "redox_syscall 0.3.5", + "raw-window-handle 0.6.0", + "redox_syscall 0.4.1", + "rustix", "tiny-xlib", "wasm-bindgen", - "wayland-backend 0.1.2", - "wayland-client 0.30.2", - "wayland-sys 0.30.1", + "wayland-backend", + "wayland-client", + "wayland-sys", "web-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11rb", ] -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - [[package]] name = "spinning" version = "0.1.0" @@ -4935,12 +4842,11 @@ dependencies = [ [[package]] name = "spirv" -version = "0.2.0+1.5.4" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 1.3.2", - "num-traits", + "bitflags 2.5.0", ] [[package]] @@ -4969,7 +4875,7 @@ checksum = "63eada6d62b660f5c1d4862c180ae70193de86df12386eee74da694ae2177583" dependencies = [ "atomic", "crossbeam-channel", - "parking_lot 0.12.1", + "parking_lot", "rand", "seahash", "thiserror", @@ -4996,49 +4902,40 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structdesc" version = "0.1.0" -source = "git+https://github.com/lapce/structdesc#a6a2b8ab65d43475238f889736c4aa5dfff4500a" +source = "git+https://github.com/lapce/structdesc#47d8201fb13240166f4d842c718d63c1e24f0236" dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.101", + "syn 1.0.109", ] [[package]] name = "strum" -version = "0.21.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" [[package]] name = "strum_macros" -version = "0.21.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ - "heck 0.3.3", + "heck", "proc-macro2", "quote", - "syn 1.0.101", -] - -[[package]] -name = "svgfilters" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639abcebc15fdc2df179f37d6f5463d660c1c79cd552c12343a4600827a04bce" -dependencies = [ - "float-cmp", - "rgb", + "rustversion", + "syn 2.0.57", ] [[package]] name = "svgtypes" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +checksum = "59d7618f12b51be8171a7cfdda1e7a93f79cbc57c4e7adf89a749cf671125241" dependencies = [ - "kurbo", + "kurbo 0.10.4", "siphasher", ] @@ -5054,9 +4951,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.101" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -5065,15 +4962,21 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "sys-locale" version = "0.2.4" @@ -5114,33 +5017,34 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27ce32341b2c0b70c144bbf35627fdc1ef18c76ced5e5e7b3ee8b5ba6b2ab6a0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "cap-fs-ext", "cap-std", "fd-lock", - "io-lifetimes 2.0.2", - "rustix 0.38.20", + "io-lifetimes", + "rustix", "windows-sys 0.48.0", "winx", ] [[package]] name = "taffy" -version = "0.3.18" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2287b6d7f721ada4cddf61ade5e760b2c6207df041cac9bfaa192897362fd3" +checksum = "7b2e140b328c6cb5e744bb2c65910b47df86b239afc793ee2c52262569cf9225" dependencies = [ "arrayvec", "grid", "num-traits", + "serde", "slotmap", ] [[package]] name = "tar" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -5169,48 +5073,31 @@ 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", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", -] - -[[package]] -name = "thread-id" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f" -dependencies = [ - "libc", - "redox_syscall 0.2.16", - "winapi", + "syn 2.0.57", ] [[package]] @@ -5222,44 +5109,42 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tiff" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - [[package]] name = "time" -version = "0.1.44" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ + "deranged", "itoa", - "libc", - "num_threads", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +dependencies = [ + "num-conv", + "time-core", ] [[package]] name = "tiny-skia" -version = "0.9.1" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2986c82f77818c7b9144c70818fdde98db15308e329ae2f7204d767808fd3c" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", "arrayvec", @@ -5267,39 +5152,14 @@ dependencies = [ "cfg-if", "log", "png", - "tiny-skia-path 0.9.0", -] - -[[package]] -name = "tiny-skia" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e37fdc219ee3d551882d24dc5e4df5f72fd9723cbca1ffaa57f7348bf7a47d" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "tiny-skia-path 0.11.1", + "tiny-skia-path", ] [[package]] name = "tiny-skia-path" -version = "0.9.0" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7acb0ccda1ac91084353a56d0b69b0e29c311fd809d2088b1ed2f9ae1841c47" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93a323d1de20dad9bc8b32daf57702c585ce76e80792d8151de1fc9dfc8d1ca7" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" dependencies = [ "arrayref", "bytemuck", @@ -5313,11 +5173,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" dependencies = [ "as-raw-xcb-connection", - "ctor 0.2.5", + "ctor", "libloading 0.8.1", "tracing 0.1.37", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -5341,16 +5211,16 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" [[package]] name = "tokio" -version = "1.33.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.5.5", @@ -5360,13 +5230,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", ] [[package]] @@ -5414,18 +5284,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.20.2", -] - [[package]] name = "toml_datetime" version = "0.6.3" @@ -5437,13 +5295,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", - "serde", - "serde_spanned", + "indexmap", "toml_datetime", "winnow", ] @@ -5454,7 +5310,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap 2.0.2", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -5483,7 +5339,7 @@ dependencies = [ [[package]] name = "tracing" version = "0.2.0" -source = "git+https://github.com/tokio-rs/tracing?rev=c14525e1610db88986f849d46bd3e9795878b012#c14525e1610db88986f849d46bd3e9795878b012" +source = "git+https://github.com/tokio-rs/tracing?rev=908cc432a5994f6e17c8f36e13c217dc40085704#908cc432a5994f6e17c8f36e13c217dc40085704" dependencies = [ "pin-project-lite", "tracing-attributes 0.2.0", @@ -5493,11 +5349,11 @@ dependencies = [ [[package]] name = "tracing-appender" version = "0.2.0" -source = "git+https://github.com/tokio-rs/tracing?rev=c14525e1610db88986f849d46bd3e9795878b012#c14525e1610db88986f849d46bd3e9795878b012" +source = "git+https://github.com/tokio-rs/tracing?rev=908cc432a5994f6e17c8f36e13c217dc40085704#908cc432a5994f6e17c8f36e13c217dc40085704" dependencies = [ "crossbeam-channel", "thiserror", - "time 0.3.14", + "time", "tracing-subscriber", ] @@ -5509,17 +5365,17 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn 1.0.101", + "syn 1.0.109", ] [[package]] name = "tracing-attributes" version = "0.2.0" -source = "git+https://github.com/tokio-rs/tracing?rev=c14525e1610db88986f849d46bd3e9795878b012#c14525e1610db88986f849d46bd3e9795878b012" +source = "git+https://github.com/tokio-rs/tracing?rev=908cc432a5994f6e17c8f36e13c217dc40085704#908cc432a5994f6e17c8f36e13c217dc40085704" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", ] [[package]] @@ -5534,7 +5390,7 @@ dependencies = [ [[package]] name = "tracing-core" version = "0.2.0" -source = "git+https://github.com/tokio-rs/tracing?rev=c14525e1610db88986f849d46bd3e9795878b012#c14525e1610db88986f849d46bd3e9795878b012" +source = "git+https://github.com/tokio-rs/tracing?rev=908cc432a5994f6e17c8f36e13c217dc40085704#908cc432a5994f6e17c8f36e13c217dc40085704" dependencies = [ "once_cell", ] @@ -5542,7 +5398,7 @@ dependencies = [ [[package]] name = "tracing-log" version = "0.2.0" -source = "git+https://github.com/tokio-rs/tracing?rev=c14525e1610db88986f849d46bd3e9795878b012#c14525e1610db88986f849d46bd3e9795878b012" +source = "git+https://github.com/tokio-rs/tracing?rev=908cc432a5994f6e17c8f36e13c217dc40085704#908cc432a5994f6e17c8f36e13c217dc40085704" dependencies = [ "log", "once_cell", @@ -5552,7 +5408,7 @@ dependencies = [ [[package]] name = "tracing-subscriber" version = "0.3.0" -source = "git+https://github.com/tokio-rs/tracing?rev=c14525e1610db88986f849d46bd3e9795878b012#c14525e1610db88986f849d46bd3e9795878b012" +source = "git+https://github.com/tokio-rs/tracing?rev=908cc432a5994f6e17c8f36e13c217dc40085704#908cc432a5994f6e17c8f36e13c217dc40085704" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -5599,9 +5455,9 @@ dependencies = [ [[package]] name = "tree-sitter-c" -version = "0.20.6" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b03bdf218020057abee831581a74bff8c298323d6c6cd1a70556430ded9f4b" +checksum = "4bbd5f3d8658c08581f8f2adac6c391c2e9fa00fe9246bf6c5f52213b9cc6b72" dependencies = [ "cc", "tree-sitter", @@ -5609,9 +5465,9 @@ dependencies = [ [[package]] name = "tree-sitter-cpp" -version = "0.20.0" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a869e3c5cef4e5db4e9ab16a8dc84d73010e60ada14cdc60d2f6d8aed17779d" +checksum = "46b04a5ada71059afb9895966a6cc1094acc8d2ea1971006db26573e7dfebb74" dependencies = [ "cc", "tree-sitter", @@ -5619,9 +5475,9 @@ dependencies = [ [[package]] name = "tree-sitter-javascript" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbc663376bdd294bd1f0a6daf859aedb9aa5bdb72217d7ad8ba2d5314102cf7" +checksum = "d015c02ea98b62c806f7329ff71c383286dfc3a7a7da0cc484f6e42922f73c2c" dependencies = [ "cc", "tree-sitter", @@ -5629,8 +5485,9 @@ dependencies = [ [[package]] name = "tree-sitter-json" -version = "0.20.0" -source = "git+https://github.com/tree-sitter/tree-sitter-json.git?rev=11e2cc12d9b267766fb11a06e52952792fd8e3f0#11e2cc12d9b267766fb11a06e52952792fd8e3f0" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a9a38a9c679b55cc8d17350381ec08d69fa1a17a53fcf197f344516e485ed4d" dependencies = [ "cc", "tree-sitter", @@ -5700,18 +5557,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -[[package]] -name = "ttf-parser" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" - -[[package]] -name = "ttf-parser" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" - [[package]] name = "ttf-parser" version = "0.19.1" @@ -5732,10 +5577,11 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.0", "tempfile", "winapi", ] @@ -5751,9 +5597,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bidi-mirroring" @@ -5767,12 +5613,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" -[[package]] -name = "unicode-general-category" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" - [[package]] name = "unicode-ident" version = "1.0.4" @@ -5794,6 +5634,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + [[package]] name = "unicode-script" version = "0.5.5" @@ -5824,17 +5670,11 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "unsafe-libyaml" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" - [[package]] name = "url" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -5850,69 +5690,36 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "usvg" -version = "0.33.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae32eb823aab35fc343b19c4d354f70e713b442ce34cdfa8497bf6c39af8a342" +checksum = "c04150a94f0bfc3b2c15d4e151524d14cd06765fc6641d8b1c59a248360d4474" dependencies = [ - "base64", + "base64 0.21.7", + "data-url", + "flate2", + "fontdb", + "imagesize", + "kurbo 0.9.5", "log", "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", + "roxmltree 0.19.0", + "rustybuzz", + "simplecss", + "siphasher", + "strict-num", + "svgtypes", + "tiny-skia-path", + "unicode-bidi", + "unicode-script", + "unicode-vo", "xmlwriter", ] -[[package]] -name = "usvg-parser" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7529174e721c8078d62b08399258469b1d68b4e5f2983b347d6a9d39779366c" -dependencies = [ - "data-url", - "flate2", - "imagesize", - "kurbo", - "log", - "rosvgtree", - "strict-num", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e672fbc19261c6553113cc04ff2ff38ae52fadbd90f2d814040857795fb5c50" -dependencies = [ - "fontdb 0.14.1", - "kurbo", - "log", - "rustybuzz 0.7.0", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a56e9cd3be5eb6d6744477e95b82d52d393fc1dba4b5b090912c33af337c20b" -dependencies = [ - "kurbo", - "rctree", - "strict-num", - "svgtypes", -] - [[package]] name = "utf8parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" @@ -5920,16 +5727,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" -[[package]] -name = "value-bag" -version = "1.0.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor 0.1.26", - "version_check", -] - [[package]] name = "vcpkg" version = "0.2.15" @@ -5942,25 +5739,13 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "vger" -version = "0.2.7" -source = "git+https://github.com/lapce/vger-rs?rev=ed10537c72a732a03f782225a39da80e6f9acbbe#ed10537c72a732a03f782225a39da80e6f9acbbe" -dependencies = [ - "cosmic-text", - "euclid", - "fontdue", - "rect_packer", - "wgpu", -] - [[package]] name = "vte" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "401dc1020e10f74d38616c1f1ab92ccd85dc902705a29d0730e0fbea8534f91a" +checksum = "40eb22ae96f050e0c0d6f7ce43feeae26c348fc4dea56928ca81537cfaa6188b" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "cursor-icon", "log", "serde", @@ -5978,20 +5763,13 @@ dependencies = [ "quote", ] -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - [[package]] name = "walkdir" -version = "2.3.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -6005,12 +5783,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -6031,9 +5803,9 @@ dependencies = [ "cap-time-ext", "fs-set-times", "io-extras", - "io-lifetimes 2.0.2", + "io-lifetimes", "once_cell", - "rustix 0.38.20", + "rustix", "system-interface", "tracing 0.1.37", "wasi-common", @@ -6047,12 +5819,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6efb2e9d72c6a070d62cf7b698acebab6faca9aacf26412bdecb9fabab79fd09" dependencies = [ "anyhow", - "bitflags 2.4.0", + "bitflags 2.5.0", "cap-rand", "cap-std", "io-extras", "log", - "rustix 0.38.20", + "rustix", "thiserror", "tracing 0.1.37", "wasmtime", @@ -6081,9 +5853,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6091,24 +5863,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -6118,9 +5890,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6128,22 +5900,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-encoder" @@ -6160,7 +5932,7 @@ version = "0.115.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e06c0641a4add879ba71ccb3a1e4278fd546f76f1eafb21d8f7b07733b547cd5" dependencies = [ - "indexmap 2.0.2", + "indexmap", "semver", ] @@ -6187,7 +5959,7 @@ dependencies = [ "cfg-if", "encoding_rs", "fxprof-processed-profile", - "indexmap 2.0.2", + "indexmap", "libc", "log", "object", @@ -6230,15 +6002,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c16f85353656b301a4472ad649e9b17cc47400cee50a94bd9b24e7886a8130f" dependencies = [ "anyhow", - "base64", + "base64 0.21.7", "bincode", "directories-next", "log", - "rustix 0.38.20", + "rustix", "serde", "serde_derive", "sha2", - "toml 0.5.9", + "toml", "windows-sys 0.48.0", "zstd", ] @@ -6252,7 +6024,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -6314,7 +6086,7 @@ dependencies = [ "anyhow", "cranelift-entity", "gimli", - "indexmap 2.0.2", + "indexmap", "log", "object", "serde", @@ -6336,7 +6108,7 @@ checksum = "8702d1efdf73df040a586e239fffc6883d88edf60ac6f593b41392cc1f97c754" dependencies = [ "cc", "cfg-if", - "rustix 0.38.20", + "rustix", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", "windows-sys 0.48.0", @@ -6358,7 +6130,7 @@ dependencies = [ "log", "object", "rustc-demangle", - "rustix 0.38.20", + "rustix", "serde", "serde_derive", "target-lexicon", @@ -6377,7 +6149,7 @@ checksum = "0fa128cdc680b5982087ea64eb73b63e96570b338fd6438b704b313eb854fd94" dependencies = [ "object", "once_cell", - "rustix 0.38.20", + "rustix", "wasmtime-versioned-export-macros", ] @@ -6402,7 +6174,7 @@ dependencies = [ "cc", "cfg-if", "encoding_rs", - "indexmap 2.0.2", + "indexmap", "libc", "log", "mach", @@ -6410,7 +6182,7 @@ dependencies = [ "memoffset 0.9.0", "paste", "rand", - "rustix 0.38.20", + "rustix", "sptr", "wasm-encoder", "wasmtime-asm-macros", @@ -6443,7 +6215,7 @@ checksum = "73190422af3b408daa3c791f97f50c62509746c09de934d69dae602c65809663" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", ] [[package]] @@ -6454,7 +6226,7 @@ checksum = "1022616613f6279243392b00990ac81135f0c46018eba620538392342fc93df9" dependencies = [ "anyhow", "async-trait", - "bitflags 2.4.0", + "bitflags 2.5.0", "bytes", "cap-fs-ext", "cap-net-ext", @@ -6464,11 +6236,11 @@ dependencies = [ "fs-set-times", "futures", "io-extras", - "io-lifetimes 2.0.2", + "io-lifetimes", "libc", "log", "once_cell", - "rustix 0.38.20", + "rustix", "system-interface", "thiserror", "tokio", @@ -6505,8 +6277,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f672060c021afd9a3ab72f4e319d1f7bb1f4e973d5e24130bb0bb11eba356f5e" dependencies = [ "anyhow", - "heck 0.4.0", - "indexmap 2.0.2", + "heck", + "indexmap", "wit-parser", ] @@ -6546,21 +6318,6 @@ dependencies = [ "wast 66.0.2", ] -[[package]] -name = "wayland-backend" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" -dependencies = [ - "cc", - "downcast-rs", - "io-lifetimes 1.0.11", - "nix 0.26.4", - "scoped-tls", - "smallvec", - "wayland-sys 0.30.1", -] - [[package]] name = "wayland-backend" version = "0.3.2" @@ -6572,19 +6329,7 @@ dependencies = [ "nix 0.26.4", "scoped-tls", "smallvec", - "wayland-sys 0.31.1", -] - -[[package]] -name = "wayland-client" -version = "0.30.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" -dependencies = [ - "bitflags 1.3.2", - "nix 0.26.4", - "wayland-backend 0.1.2", - "wayland-scanner 0.30.1", + "wayland-sys", ] [[package]] @@ -6593,10 +6338,10 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "nix 0.26.4", - "wayland-backend 0.3.2", - "wayland-scanner 0.31.0", + "wayland-backend", + "wayland-scanner", ] [[package]] @@ -6605,9 +6350,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "cursor-icon", - "wayland-backend 0.3.2", + "wayland-backend", ] [[package]] @@ -6617,7 +6362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" dependencies = [ "nix 0.26.4", - "wayland-client 0.31.1", + "wayland-client", "xcursor", ] @@ -6627,10 +6372,10 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" dependencies = [ - "bitflags 2.4.0", - "wayland-backend 0.3.2", - "wayland-client 0.31.1", - "wayland-scanner 0.31.0", + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", ] [[package]] @@ -6639,11 +6384,11 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.4.0", - "wayland-backend 0.3.2", - "wayland-client 0.31.1", + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", "wayland-protocols", - "wayland-scanner 0.31.0", + "wayland-scanner", ] [[package]] @@ -6652,47 +6397,24 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.4.0", - "wayland-backend 0.3.2", - "wayland-client 0.31.1", + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", "wayland-protocols", - "wayland-scanner 0.31.0", + "wayland-scanner", ] [[package]] name = "wayland-scanner" -version = "0.30.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" dependencies = [ "proc-macro2", - "quick-xml 0.28.2", + "quick-xml", "quote", ] -[[package]] -name = "wayland-scanner" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" -dependencies = [ - "proc-macro2", - "quick-xml 0.30.0", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" -dependencies = [ - "dlib", - "lazy_static", - "log", - "pkg-config", -] - [[package]] name = "wayland-sys" version = "0.31.1" @@ -6707,9 +6429,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -6739,25 +6461,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f390449c16e0679435fc97a6b49d24e67f09dd05fea1de54db1b60902896d273" dependencies = [ "atomic-waker", - "parking_lot 0.12.1", + "parking_lot", "triomphe", ] [[package]] name = "wgpu" -version = "0.18.0" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24" +checksum = "a4b1213b52478a7631d6e387543ed8f642bc02c578ef4e3b49aca2a29a7df0cb" dependencies = [ "arrayvec", "cfg-if", - "flume", + "cfg_aliases 0.1.1", "js-sys", "log", "naga", - "parking_lot 0.12.1", + "parking_lot", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "smallvec", "static_assertions", "wasm-bindgen", @@ -6770,19 +6492,22 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.18.0" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "837e02ddcdc6d4a9b56ba4598f7fd4202a7699ab03f6ef4dcdebfad2c966aea6" +checksum = "f9f6b033c2f00ae0bc8ea872c5989777c60bc241aac4e58b24774faa8b391f78" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.4.0", + "bitflags 2.5.0", + "cfg_aliases 0.1.1", "codespan-reporting", + "indexmap", "log", "naga", - "parking_lot 0.12.1", + "once_cell", + "parking_lot", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "rustc-hash", "smallvec", "thiserror", @@ -6793,16 +6518,17 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.18.0" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e30b9a8155c83868e82a8c5d3ce899de6c3961d2ef595de8fc168a1677fc2d8" +checksum = "49f972c280505ab52ffe17e94a7413d9d54b58af0114ab226b9fc4999a47082e" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.4.0", + "bitflags 2.5.0", "block", + "cfg_aliases 0.1.1", "core-graphics-types", "d3d12", "glow", @@ -6818,12 +6544,13 @@ dependencies = [ "log", "metal", "naga", + "ndk-sys", "objc", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "renderdoc-sys", "rustc-hash", "smallvec", @@ -6836,11 +6563,11 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.18.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" +checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "js-sys", "web-sys", ] @@ -6859,7 +6586,7 @@ checksum = "334709283558d9ebb0206cd1842c4fa619ff467d68c71eff982376d9c999d636" dependencies = [ "anyhow", "async-trait", - "bitflags 2.4.0", + "bitflags 2.5.0", "thiserror", "tracing 0.1.37", "wasmtime", @@ -6873,11 +6600,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4143cb3a8c65efceba6fc3bf49769b7b5d60090f1226e708365044c1136584ee" dependencies = [ "anyhow", - "heck 0.4.0", + "heck", "proc-macro2", "quote", "shellexpand", - "syn 2.0.38", + "syn 2.0.57", "witx", ] @@ -6889,7 +6616,7 @@ checksum = "56981968f26952a527f78cf3aeb5ac436db82d3be1682a217a1835754fa50f51" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.57", "wiggle-generate", ] @@ -6918,15 +6645,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -7008,6 +6726,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -7038,6 +6765,21 @@ dependencies = [ "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -7050,6 +6792,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" @@ -7068,6 +6816,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.36.1" @@ -7086,6 +6840,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.36.1" @@ -7104,6 +6864,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" @@ -7122,6 +6888,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -7134,6 +6906,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" @@ -7153,52 +6931,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "winit" -version = "0.29.4" -source = "git+https://github.com/lapce/winit?rev=e8c26d691a20a96c4e9d841d31fc315dabd5a5a1#e8c26d691a20a96c4e9d841d31fc315dabd5a5a1" -dependencies = [ - "ahash 0.8.3", - "android-activity", - "atomic-waker", - "bitflags 2.4.0", - "bytemuck", - "calloop", - "cfg_aliases", - "core-foundation", - "core-graphics", - "cursor-icon", - "icrate", - "js-sys", - "libc", - "log", - "memmap2 0.9.0", - "ndk", - "ndk-sys", - "objc2", - "once_cell", - "orbclient", - "percent-encoding", - "raw-window-handle 0.5.2", - "raw-window-handle 0.6.0", - "redox_syscall 0.3.5", - "rustix 0.38.20", - "sctk-adwaita", - "smithay-client-toolkit", - "smol_str", - "unicode-segmentation", - "wasm-bindgen", - "wasm-bindgen-futures", - "wayland-backend 0.3.2", - "wayland-client 0.31.1", - "wayland-protocols", - "wayland-protocols-plasma", - "web-sys", - "web-time", - "windows-sys 0.48.0", - "x11-dl", - "x11rb", - "xkbcommon-dl", -] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" @@ -7225,7 +6961,7 @@ version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357bb8e2932df531f83b052264b050b81ba0df90ee5a59b2d1d3949f344f81e5" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "windows-sys 0.48.0", ] @@ -7237,7 +6973,7 @@ checksum = "f6ace9943d89bbf3dbbc71b966da0e7302057b311f36a4ac3d65ddfef17b52cf" dependencies = [ "anyhow", "id-arena", - "indexmap 2.0.2", + "indexmap", "log", "semver", "serde", @@ -7260,10 +6996,11 @@ dependencies = [ [[package]] name = "x11-clipboard" -version = "0.8.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41aca1115b1f195f21c541c5efb423470848d48143127d0f07f8b90c27440df" +checksum = "b98785a09322d7446e28a13203d2cae1059a0dd3dfb32cb06d0a225f023d8286" dependencies = [ + "libc", "x11rb", ] @@ -7280,37 +7017,34 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.7.3", - "nix 0.26.4", + "libloading 0.8.1", "once_cell", - "winapi", - "winapi-wsapoll", + "rustix", "x11rb-protocol", ] [[package]] name = "x11rb-protocol" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" -dependencies = [ - "nix 0.26.4", -] +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" [[package]] name = "xattr" -version = "0.2.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys 0.4.13", + "rustix", ] [[package]] @@ -7322,13 +7056,23 @@ dependencies = [ "nom", ] +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "xkbcommon-dl" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "dlib", "log", "once_cell", @@ -7365,6 +7109,12 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + [[package]] name = "yazi" version = "0.1.6" @@ -7373,29 +7123,28 @@ checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" [[package]] name = "zbus" -version = "3.3.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ce2de393c874ba871292e881bf3c13a0d5eb38170ebab2e50b4c410eaa222b" +checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030" dependencies = [ "async-broadcast", - "async-channel", "async-executor", + "async-fs", "async-io", - "async-lock", + "async-lock 3.3.0", + "async-process", "async-recursion", "async-task", "async-trait", - "byteorder", + "blocking", "derivative", - "dirs", "enumflags2", - "event-listener", + "event-listener 5.2.0", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.24.2", - "once_cell", + "nix 0.27.1", "ordered-stream", "rand", "serde", @@ -7404,7 +7153,8 @@ dependencies = [ "static_assertions", "tracing 0.1.37", "uds_windows", - "winapi", + "windows-sys 0.52.0", + "xdg-home", "zbus_macros", "zbus_names", "zvariant", @@ -7412,22 +7162,23 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.3.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13d08f5dc6cf725b693cb6ceacd43cd430ec0664a879188f29e7d7dcd98f96d" +checksum = "b7a3e850ff1e7217a3b7a07eba90d37fe9bb9e89a310f718afcde5885ca9b6d7" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", "regex", - "syn 1.0.101", + "syn 1.0.109", + "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.2.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a408fd8a352695690f53906dc7fd036be924ec51ea5e05666ff42685ed0af5" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -7440,6 +7191,26 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c110ba09c9b3a43edd4803d570df0da2414fed6e822e22b976a4e3ef50860701" +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.57", +] + [[package]] name = "zip" version = "0.6.6" @@ -7482,23 +7253,28 @@ dependencies = [ ] [[package]] -name = "zune-inflate" -version = "0.2.54" +name = "zune-core" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" dependencies = [ - "simd-adler32", + "zune-core", ] [[package]] name = "zvariant" -version = "3.7.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794fb7f59af4105697b0449ba31731ee5dbb3e773a17dbdf3d36206ea1b1644" +checksum = "4e09e8be97d44eeab994d752f341e67b3b0d80512a8b315a0671d47232ef1b65" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "url", @@ -7507,12 +7283,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.7.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd58d4b6c8e26d3dd2149c8c40c6613ef6451b9885ff1296d1ac86c388351a54" +checksum = "72a5857e2856435331636a9fbb415b09243df4521a267c5bedcd5289b4d5799e" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.101", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] diff --git a/third_party/nixpkgs/pkgs/applications/editors/lapce/default.nix b/third_party/nixpkgs/pkgs/applications/editors/lapce/default.nix index 299c5e06cb..ad29e72fad 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/lapce/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/lapce/default.nix @@ -19,7 +19,7 @@ , ApplicationServices , Carbon , AppKit -, wrapGAppsHook +, wrapGAppsHook3 , wayland , gobject-introspection , xorg @@ -39,33 +39,29 @@ let in rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lapce"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-R7z3E6Moyc6yMFGzfggiYgglLs/A+iOx8ZJKMPhbAz0="; + repo = "lapce"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-x/EObvrMZ3bkdHk5SbfQEarXA7jcQ9rEFZINQrHjcl4="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "alacritty_config-0.1.2-dev" = "sha256-6FSi5RU7YOzNIB2kd/O1OKswn54ak6qrLvN/FbJD3g0="; - "cosmic-text-0.7.0" = "sha256-ATBeQeSlRCuBZIV4Fdam3p+eW5YH8uJadJearZuONrQ="; - "floem-0.1.0" = "sha256-UVmqF2vkX71o4JBrhIIhd2SkLNBaqibwl51FKLJUo4c="; + "floem-0.1.1" = "sha256-/RUsi0LUJ/LjDj8xjoiF+f4MeUjFASL0TDS0eDUEHio="; "human-sort-0.2.2" = "sha256-tebgIJGXOY7pwWRukboKAzXY47l4Cn//0xMKQTaGu8w="; - "peniko-0.1.0" = "sha256-FZu56HLN5rwSWOwIC00FvKShSv4QPCR44l9MURgC+iI="; + "lsp-types-0.95.1" = "sha256-+tWqDBM5x/gvQOG7V3m2tFBZB7smgnnZHikf9ja2FfE="; "psp-types-0.1.0" = "sha256-/oFt/AXxCqBp21hTSYrokWsbFYTIDCrHMUBuA2Nj5UU="; - "structdesc-0.1.0" = "sha256-4j6mJ1H5hxJXr7Sz0UsZxweyAm9sYuxjq8yg3ZlpksI="; - "tracing-0.2.0" = "sha256-Tc44Mg2Ue4HyB1z+9UBqpjdecJa60ekGXs+npqv22uA="; + "regalloc2-0.9.3" = "sha256-tzXFXs47LDoNBL1tSkLCqaiHDP5vZjvh250hz0pbEJs="; + "structdesc-0.1.0" = "sha256-gMTnRudc3Tp9JRa+Cob5Ke23aqajP8lSun5CnT13+eQ="; + "tracing-0.2.0" = "sha256-31jmSvspNstOAh6VaWie+aozmGu4RpY9Gx2kbBVD+CI="; "tree-sitter-bash-0.19.0" = "sha256-gTsA874qpCI/N5tmBI5eT8KDaM25gXM4VbcCbUU2EeI="; - "tree-sitter-json-0.20.0" = "sha256-pXa6WFJ4wliXHBiuHuqtAFWz+OscTOxbna5iymS547w="; "tree-sitter-md-0.1.2" = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; "tree-sitter-yaml-0.0.1" = "sha256-bQ/APnFpes4hQLv37lpoADyjXDBY7J4Zg+rLyUtbra4="; - "vger-0.2.7" = "sha256-evri/64mA0TQY7mFn+9bCl3c247V2QEYlwyMPpOcv5Y="; "wasi-experimental-http-wasmtime-0.10.0" = "sha256-FuF3Ms1bT9bBasbLK+yQ2xggObm/lFDRyOvH21AZnQI="; - "winit-0.29.4" = "sha256-Y71QsRiHo0ldUAoAhid3yRDtHyIdd3HJ3AA6YJG04as="; }; }; @@ -86,7 +82,7 @@ rustPlatform.buildRustPackage rec { pkg-config perl python3 - wrapGAppsHook # FIX: No GSettings schemas are installed on the system + wrapGAppsHook3 # FIX: No GSettings schemas are installed on the system gobject-introspection ]; @@ -125,8 +121,11 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Lightning-fast and Powerful Code Editor written in Rust"; homepage = "https://github.com/lapce/lapce"; + changelog = "https://github.com/lapce/lapce/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ elliot ]; mainProgram = "lapce"; + # Undefined symbols for architecture x86_64: "_NSPasteboardTypeFileURL" + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix b/third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix index 2a9557dce6..52e12beb31 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, pkg-config, meson, ninja, wrapGAppsHook +{ stdenv, lib, fetchgit, pkg-config, meson, ninja, wrapGAppsHook3 , enchant, gtkmm3, libchamplain, libgcrypt, shared-mime-info }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ninja pkg-config shared-mime-info # for update-mime-database - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/marker/default.nix b/third_party/nixpkgs/pkgs/applications/editors/marker/default.nix index f24f83c70f..7e1d61a3b1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/marker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/marker/default.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , gtksourceview , gtkspell3 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/mindforger/default.nix b/third_party/nixpkgs/pkgs/applications/editors/mindforger/default.nix index de304cd620..bd8a4b0c64 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/mindforger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/mindforger/default.nix @@ -6,7 +6,7 @@ , qmake , qtbase , qtwebengine -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1pghsw8kwvjhg3jpmjs0n892h2l0pm0cs6ymi8b23fwk0kfj67rd"; }; - nativeBuildInputs = [ qmake wrapGAppsHook wrapQtAppsHook ]; + nativeBuildInputs = [ qmake wrapGAppsHook3 wrapQtAppsHook ]; buildInputs = [ qtbase qtwebengine cmark-gfm ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix index 7221e0a6c5..ff68ffb600 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript -, common-updater-scripts, git, nix, nixfmt-classic, coreutils, gnused, callPackage -, file ? null, gettext ? null, enableNls ? true, enableTiny ? false }: +, common-updater-scripts, git, nix, nixfmt-classic, coreutils, gnused +, callPackage, file ? null, gettext ? null, enableNls ? true, enableTiny ? false +}: assert enableNls -> (gettext != null); @@ -14,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "7.2"; + version = "8.0"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "hvNEJ2i9KHPOxpP4PN+AtLRErTzBR2C3Q2FHT8h6RSY="; + sha256 = "wX9D/A43M2sz7lCiCccB1b64CK3C2fCJyoMbQFOcmsQ="; }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; @@ -32,7 +33,9 @@ in stdenv.mkDerivation rec { (lib.enableFeature enableTiny "tiny") ]; - postInstall = if enableTiny then null else '' + postInstall = if enableTiny then + null + else '' cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix index 865c521932..8f9a5b8800 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix @@ -218,7 +218,7 @@ let ]; in - toVimPlugin (runCommand "vimplugin-treesitter-grammar-${name}" + toVimPlugin (runCommand "treesitter-grammar-${name}" { meta = { platforms = lib.platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix index 3ff760b218..391bf102f7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix @@ -83,8 +83,12 @@ let ; perlEnv = perl.withPackages (p: [ p.NeovimExt p.Appcpanminus ]); + + pname = "neovim"; + version = lib.getVersion neovim-unwrapped; in { - name = "neovim-${lib.getVersion neovim-unwrapped}${extraName}"; + name = "${pname}-${version}${extraName}"; + inherit pname version; __structuredAttrs = true; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix b/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix index cf5d35c1c2..2e3de9ae8a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix @@ -8,7 +8,7 @@ , autoPatchelfHook , gsettings-desktop-schemas , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , pinegrowVersion ? "7" }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { unzip autoPatchelfHook makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix index 4d715d8c7c..36d35bc44d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix @@ -1,37 +1,35 @@ { lib , stdenv , fetchurl -, gettext , help2man , pkg-config , texinfo , boehmgc , readline -, guiSupport ? false, makeWrapper, tcl, tcllib, tk -, miSupport ? true, json_c , nbdSupport ? !stdenv.isDarwin, libnbd -, textStylingSupport ? true +, textStylingSupport ? true, gettext , dejagnu -# update script only + # update script only , writeScript }: let isCross = stdenv.hostPlatform != stdenv.buildPlatform; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation (finalAttrs: { pname = "poke"; - version = "3.2"; + version = "4.0"; src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-dY5VHdU6bM5U7JTY/CH6TWtSon0cJmcgbVmezcdPDZc="; + url = "mirror://gnu/poke/poke-${finalAttrs.version}.tar.gz"; + hash = "sha256-ArqyLLH6YVOhtqknyLs81Y1QhUPBRIQqbX7nTxmXOnc="; }; outputs = [ "out" "dev" "info" "lib" ] - # help2man can't cross compile because it runs `poke --help` to - # generate the man page - ++ lib.optional (!isCross) "man"; + # help2man can't cross compile because it runs `poke --help` to + # generate the man page + ++ lib.optional (!isCross) "man"; postPatch = '' patchShebangs . @@ -40,53 +38,33 @@ in stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ - gettext pkg-config texinfo ] ++ lib.optionals (!isCross) [ help2man - ] ++ lib.optionals guiSupport [ - makeWrapper - tcl.tclPackageHook ]; buildInputs = [ boehmgc readline ] - ++ lib.optionals guiSupport [ tcl tcllib tk ] - ++ lib.optional miSupport json_c - ++ lib.optional nbdSupport libnbd - ++ lib.optional textStylingSupport gettext - ++ lib.optional (!isCross) dejagnu; + ++ lib.optional nbdSupport libnbd + ++ lib.optional textStylingSupport gettext + ++ lib.optional finalAttrs.finalPackage.doCheck dejagnu; configureFlags = [ # libpoke depends on $datadir/poke, so we specify the datadir in # $lib, and later move anything else it doesn't depend on to $out "--datadir=${placeholder "lib"}/share" - ] ++ lib.optionals guiSupport [ - "--enable-gui" - "--with-tcl=${tcl}/lib" - "--with-tk=${tk}/lib" - "--with-tkinclude=${tk.dev}/include" ]; enableParallelBuilding = true; - doCheck = !isCross; - nativeCheckInputs = lib.optionals (!isCross) [ dejagnu ]; + doCheck = true; + nativeCheckInputs = [ dejagnu ]; postInstall = '' moveToOutput share/emacs "$out" moveToOutput share/vim "$out" ''; - # Prevent tclPackageHook from auto-wrapping all binaries, we only - # need to wrap poke-gui - dontWrapTclBinaries = true; - - postFixup = lib.optionalString guiSupport '' - wrapProgram "$out/bin/poke-gui" \ - --prefix TCLLIBPATH ' ' "$TCLLIBPATH" - ''; - passthru = { updateScript = writeScript "update-poke" '' #!/usr/bin/env nix-shell @@ -97,18 +75,17 @@ in stdenv.mkDerivation rec { # Expect the text in format of 'poke 2.0' new_version="$(curl -s https://www.jemarch.net/poke | pcregrep -o1 '>poke ([0-9.]+)')" - update-source-version ${pname} "$new_version" + update-source-version poke "$new_version" ''; }; - meta = with lib; { + meta = { description = "Interactive, extensible editor for binary data"; homepage = "http://www.jemarch.net/poke"; - changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres kira-bruneau ]; - platforms = platforms.unix; + changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres kira-bruneau ]; + platforms = lib.platforms.unix; + broken = stdenv.isDarwin && stdenv.isAarch64; }; -} - -# TODO: Enable guiSupport by default once it's more than just a stub +}) diff --git a/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix b/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix index b1af335ec1..6cd8e423ad 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix @@ -1,8 +1,9 @@ { lib , stdenv , git +, git-lfs , fetchurl -, wrapGAppsHook +, wrapGAppsHook3 , alsa-lib , at-spi2-atk , cairo @@ -90,7 +91,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems asar ]; @@ -139,14 +140,34 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $opt/resources/app.asar.unpacked/node_modules/symbol-provider-ctags/vendor/ctags-linux - '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' # Replace the bundled git with the one from nixpkgs dugite=$opt/resources/app.asar.unpacked/node_modules/dugite rm -f $dugite/git/bin/git ln -s ${git}/bin/git $dugite/git/bin/git - rm -f $dugite/git/libexec/git-core/git - ln -s ${git}/bin/git $dugite/git/libexec/git-core/git + # Not only do we need to replace the git binary itself, we also need to replace + # all the symlinks in dugite/git/libexec/git-core. + for file in "$dugite/git/libexec/git-core"/*; do + if [ -x "$file" ] && file "$file" | grep -q "ELF"; then + # Remove ELF executable + rm "$file" + + # Get the corresponding filename in nixpkgs's git + filename=$(basename "$file") + git_executable="${git}/libexec/git-core/$filename" + + # Create symlink to $git_executable + ln -s "$git_executable" "$file" + + echo "Replaced $file with symlink to $git_executable" + fi + done + + # Was symlinked in previous loop, but actually, nixpkgs has a separate package for git-lfs + # Unlink to avoid a "File exists" error and relink correctly + unlink $dugite/git/libexec/git-core/git-lfs + ln -s ${git-lfs}/bin/git-lfs $dugite/git/libexec/git-core/git-lfs + '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' # We have to patch a prebuilt binary in the asar archive # But asar complains because the node_gyp unpacked dependency uses a prebuilt Python3 itself @@ -208,7 +229,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ colamaroro bryango ]; + maintainers = with maintainers; [ bryango ]; knownVulnerabilities = [ "CVE-2023-5217" "CVE-2022-21718" diff --git a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix b/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix index 51a1a2925e..dfe9778762 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix @@ -3,6 +3,7 @@ , withQuesta ? true , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] , unwrapped ? callPackage ./quartus.nix { inherit unstick supportedDevices withQuesta; } +, extraProfile ? "" }: let @@ -16,7 +17,8 @@ let }; # I think questa_fse/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` in buildFHSEnv rec { - name = "quartus-prime-lite"; # wrapped + pname = "quartus-prime-lite"; # wrapped + inherit (unwrapped) version; targetPkgs = pkgs: with pkgs; [ (runCommand "ld-lsb-compat" {} ('' @@ -79,7 +81,7 @@ in buildFHSEnv rec { "${unwrapped}"/questa_fse/linux_x86_64/lmutil ) - wrapper=$out/bin/${name} + wrapper=$out/bin/${pname} progs_wrapped=() for prog in ''${progs_to_wrap[@]}; do relname="''${prog#"${unwrapped}/"}" @@ -92,7 +94,7 @@ in buildFHSEnv rec { echo "export NIXPKGS_IS_QUESTA_WRAPPER=1" >> "$wrapped" ;; esac - echo "$wrapper $prog \"\$@\"" >> "$wrapped" + echo "exec $wrapper $prog \"\$@\"" >> "$wrapped" done cd $out @@ -114,7 +116,7 @@ in buildFHSEnv rec { if [ "$NIXPKGS_IS_QUESTA_WRAPPER" != 1 ]; then export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0 fi - ''; + '' + extraProfile; # Run the wrappers directly, instead of going via bash. runScript = ""; @@ -159,4 +161,6 @@ in buildFHSEnv rec { ''; }; }; + + inherit (unwrapped) meta; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix index e61f57c764..bc44c8e9f6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/default.nix @@ -4,6 +4,9 @@ , dpkg , makeWrapper , electron +, libsecret +, asar +, glib , desktop-file-utils , callPackage }: @@ -28,16 +31,28 @@ stdenv.mkDerivation rec { dontBuild = true; - nativeBuildInputs = [ makeWrapper dpkg desktop-file-utils ]; + nativeBuildInputs = [ makeWrapper dpkg desktop-file-utils asar ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; - installPhase = '' + installPhase = let + libPath = lib.makeLibraryPath [ + libsecret + glib + stdenv.cc.cc.lib + ]; + in + '' runHook preInstall mkdir -p $out/bin $out/share/standardnotes cp -R usr/share/{applications,icons} $out/share cp -R opt/Standard\ Notes/resources/app.asar $out/share/standardnotes/ + asar e $out/share/standardnotes/app.asar asar-unpacked + find asar-unpacked -name '*.node' -exec patchelf \ + --add-rpath "${libPath}" \ + {} \; + asar p asar-unpacked $out/share/standardnotes/app.asar makeWrapper ${electron}/bin/electron $out/bin/standardnotes \ --add-flags $out/share/standardnotes/app.asar diff --git a/third_party/nixpkgs/pkgs/applications/editors/sublime/3/common.nix b/third_party/nixpkgs/pkgs/applications/editors/sublime/3/common.nix index bbb7e6f1e9..65bbd65163 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/sublime/3/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/sublime/3/common.nix @@ -1,6 +1,6 @@ { buildVersion, x32sha256, x64sha256, dev ? false }: -{ fetchurl, lib, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook +{ fetchurl, lib, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook3 , pkexecPath ? "/run/wrappers/bin/pkexec" , openssl, bzip2, bash, unzip, zip }: @@ -40,7 +40,7 @@ in let dontStrip = true; dontPatchELF = true; buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH - nativeBuildInputs = [ zip unzip makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ zip unzip makeWrapper wrapGAppsHook3 ]; # make exec.py in Default.sublime-package use own bash with an LD_PRELOAD instead of "/bin/bash" patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/sublime/4/common.nix b/third_party/nixpkgs/pkgs/applications/editors/sublime/4/common.nix index a7425863d8..f8083902fd 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/sublime/4/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/sublime/4/common.nix @@ -17,7 +17,7 @@ cairo, pango, makeWrapper, - wrapGAppsHook, + wrapGAppsHook3, writeShellScript, common-updater-scripts, curl, @@ -80,7 +80,7 @@ let nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix index 4684831416..427948822f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler, wrapGAppsHook }: +{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler, wrapGAppsHook3 }: mkDerivation rec { pname = "texmaker"; @@ -10,7 +10,7 @@ mkDerivation rec { }; buildInputs = [ qtbase qtscript poppler zlib qtwebengine ]; - nativeBuildInputs = [ pkg-config poppler qmake wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config poppler qmake wrapGAppsHook3 ]; env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; qmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix index 536f2cd110..075c3ecd5b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix @@ -3,7 +3,7 @@ , withCurses ? false, ncurses }: stdenv.mkDerivation rec { - version = "12.1"; + version = "12.4"; pname = "textadept"; src = fetchFromGitHub { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "orbitalquark"; repo = "textadept"; rev = "textadept_${version}"; - sha256 = "sha256-ce7U/GR/4zkjnRN3fx3FLecc9vuvFqCONy275SWnpNc="; + sha256 = "sha256-nPgpQeBq5Stv2o0Ke4W2Ltnx6qLe5TIC5a8HSYVkmfI="; }; nativeBuildInputs = [ cmake ] diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix index 4f352bf19b..f2322fd8a0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix @@ -1,8 +1,8 @@ { # scintilla - "scintilla536.tgz" = { - url = "https://www.scintilla.org/scintilla536.tgz"; - sha256 = "sha256-ib6CeKg+eBOSWq/il32quH0r1r69F7AXn+cq/dVIyyQ="; + "scintilla550.tgz" = { + url = "https://www.scintilla.org/scintilla550.tgz"; + sha256 = "sha256-5VPpVQnwH5KqFX+gLQanEmQuE9aaEewaAqfd8ixAYjE="; }; # lexilla "lexilla510.tgz" = { @@ -15,9 +15,9 @@ sha256 = "sha256-l1qeLMCrhyoZA/GfmXFR20rY5EsUoO5e+1vZJtYdb24="; }; # scintillua - "e88bbcfecae46b48b79d8156ea7129411b5c847d.zip" = { - url = "https://github.com/orbitalquark/scintillua/archive/e88bbcfecae46b48b79d8156ea7129411b5c847d.zip"; - sha256 = "sha256-sWqpVtcAwysGn86XFwaEkKSPemk2247SydOQi6klFrQ="; + "scintillua_6.3.zip" = { + url = "https://github.com/orbitalquark/scintillua/archive/scintillua_6.3.zip"; + sha256 = "sha256-SAFmu3q8T1UtVjdUcFy9NPu0DOLqewvU/Vb9b7XjgQM="; }; # lua "lua-5.4.6.tar.gz" = { @@ -49,6 +49,11 @@ url = "https://github.com/orbitalquark/lua-std-regex/archive/1.0.zip"; sha256 = "sha256-W2hKHOfqYyo3qk+YvPJlzZfZ1wxZmMVphSlcaql+dOE="; }; + # singleapp + "v3.4.0.zip" = { + url = "https://github.com/itay-grudev/SingleApplication/archive/refs/tags/v3.4.0.zip"; + sha256 = "sha256-FwyzM+R9ALpGH9u2RXab4Sqi4Q+p3Qs+8EdfhjPGcXY="; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/thiefmd/default.nix b/third_party/nixpkgs/pkgs/applications/editors/thiefmd/default.nix index 1b7b4a668b..d603981302 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/thiefmd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/thiefmd/default.nix @@ -5,7 +5,7 @@ , ninja , vala , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , discount , glib @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ninja vala pkg-config - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix index c3605691ad..2b76d49292 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix @@ -6,7 +6,7 @@ , libgit2 , editorconfig-core-c , gtksourceview4 -, wrapGAppsHook +, wrapGAppsHook3 , desktopToDarwinBundle }: crystal.buildCrystalPackage rec { @@ -20,7 +20,7 @@ crystal.buildCrystalPackage rec { hash = "sha256-3TfXvRVP3lu43qF3RWCHnZ3czTaSl5EzrhuTlpnMfKo="; }; - nativeBuildInputs = [ wrapGAppsHook ] + nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ vte libgit2 gtksourceview4 editorconfig-core-c ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix index d33891c37d..8b38e1c6e6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0200"; + version = "9.1.0377"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-MAMd+k4GpFUwEZzQTWtzSpYY6AEez+FMiqexozYK3Y4="; + hash = "sha256-cfN/QbnpWIQmLtpXWPc1JnaaX+J10ietObN/B9lE1F0="; }; enableParallelBuilding = true; @@ -36,7 +36,7 @@ rec { description = "The most popular clone of the VI editor"; homepage = "http://www.vim.org"; license = licenses.vim; - maintainers = with maintainers; [ das_j equirosa ]; + maintainers = with maintainers; [ das_j equirosa philiptaron ]; platforms = platforms.unix; mainProgram = "vim"; outputsToInstall = [ "out" "xxd" ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/full.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/full.nix index 263f8d2984..0f3652a8a7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/full.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/full.nix @@ -4,7 +4,7 @@ , libICE , vimPlugins , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , runtimeShell # apple frameworks @@ -135,7 +135,7 @@ in stdenv.mkDerivation { ++ lib.optional wrapPythonDrv makeWrapper ++ lib.optional nlsSupport gettext ++ lib.optional perlSupport perl - ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook + ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook3 ; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix index ce83128e98..64aa5b639a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix @@ -11,6 +11,7 @@ , perl , luajit , darwin +, libiconv , python3 }: @@ -127,7 +128,7 @@ stdenv.mkDerivation { --replace " -L${stdenv.cc.libc}/lib" "" \ --replace " -L${darwin.libobjc}/lib" "" \ --replace " -L${darwin.libunwind}/lib" "" \ - --replace " -L${darwin.libiconv}/lib" "" + --replace " -L${libiconv}/lib" "" # All the libraries we stripped have -osx- in their name as of this time. # Assert now that this pattern no longer appears in config.mk. diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index 1611adc97e..db712305c9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix @@ -13,7 +13,6 @@ rec { buildVimPlugin = { name ? "${attrs.pname}-${attrs.version}" - , namePrefix ? "vimplugin-" , src , unpackPhase ? "" , configurePhase ? ":" @@ -27,7 +26,7 @@ rec { }@attrs: let drv = stdenv.mkDerivation (attrs // { - name = namePrefix + name; + name = lib.warnIf (attrs ? vimprefix) "The 'vimprefix' is now hardcoded in toVimPlugin" name; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json index e73899e66f..3fb71c316c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json @@ -7,6 +7,14 @@ "date": "2021-12-21", "new": "cmp-tmux" }, + "fern-vim": { + "date": "2024-05-12", + "new": "vim-fern" + }, + "gina-vim": { + "date": "2024-05-12", + "new": "vim-gina" + }, "gist-vim": { "date": "2020-03-27", "new": "vim-gist" @@ -47,8 +55,12 @@ "date": "2021-09-03", "new": "sqlite-lua" }, + "suda-vim": { + "date": "2024-05-12", + "new": "vim-suda" + }, "vim-fsharp": { - "date": "2024-04-21", + "date": "2024-05-12", "new": "zarchive-vim-fsharp" }, "vim-jade": { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index c51621873e..1f59cc3e35 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2024-04-19"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "c74271e68dfc9e125e6ae197879eb50c7b34512d"; - sha256 = "1x2yhdmmm5sbfpqbkrivwa05hx8vk5xa3468db3554clawkp2mnj"; + rev = "60d5fef9e8f272ca9dd40d68dd692fb448a5f606"; + sha256 = "0acwav5f9hrjcwg3lw2l8dhh9y5yqcd0af8wkimzryfa1k7vqxiq"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-04-11"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "bb36f71b77d8e15788a5b62c82a1c9ec7b209e49"; - sha256 = "1vjckraf062d7dybf1iphp7i7lwphzgc1bns0jzfardbd1q9gw3f"; + rev = "a0afe8fef9dc76b469a78435cdd3f2c5ee01f282"; + sha256 = "0xibikcqxw35dggh2hzqaxa4lcn07y4fn6inn91slcll0zihn0xx"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-04-20"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "d4eded0ab36ba60aa7e13893a2064a74d2cdb6bd"; - sha256 = "0xzdm4ggh5bggnxjgcaxkzdiwfxs11yblgmpwvzqjhpzv8qnzkx1"; + rev = "de37c621a099a72d21e1731d4932d5b62cdc37bd"; + sha256 = "1bb6xz9hdgl8gzhmkshgc0s5cmy68k8vwqx898a0v7gd3jg8p755"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -257,12 +257,12 @@ final: prev: QFEnter = buildVimPlugin { pname = "QFEnter"; - version = "2023-10-20"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "yssl"; repo = "QFEnter"; - rev = "426c04312ae67ac28dce38ccc5fafdd1ed4a3d9f"; - sha256 = "02s3mq0hxszi7fbm256xgh4nz5mc5frg8rz6dnll7sk26as8fgrd"; + rev = "1e4bf00b264e0f1541401c28c4b63ace5bb3d2be"; + sha256 = "1aksyxm89jmrrdw77979jdxp83z0lj1n1qhyipjmjz0vdljr6w50"; }; meta.homepage = "https://github.com/yssl/QFEnter/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-04-18"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "f7cae6f1b38cb296f48ce1a9c5ed1a419d912a42"; - sha256 = "0mdriqqna37a9fjbilaq2qkkn4ik4jn2dz1x6ra51pgh42r86qhl"; + rev = "35a0998728380a17b8590447e8207391411c667a"; + sha256 = "1rb3fnw5pdsg22f8nsvxf37b5hmkq5gl9qyv3xis1ydm2l4vi7k8"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -498,36 +498,36 @@ final: prev: actions-preview-nvim = buildVimPlugin { pname = "actions-preview.nvim"; - version = "2024-03-09"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "aznhe21"; repo = "actions-preview.nvim"; - rev = "5072b1b1065a6b22bdd46b5c21780a91d6a08071"; - sha256 = "195ns7dw3g4sq3pmh3h3xas4kfmwwhidlg4q7nnffkd6x9cdg31w"; + rev = "e8d41b608e24319548637685c7cfa66fadaff2b2"; + sha256 = "1nvly9hhf02dfcqp0saf7inh502mdyivha2ksqyq0f07bp1qkzcd"; }; meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; }; adwaita-nvim = buildVimPlugin { pname = "adwaita.nvim"; - version = "2023-12-15"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "adwaita.nvim"; - rev = "981bce791959d79cd1316e59e23906e3c05efb44"; - sha256 = "1lrxns172mad4936x1njagn5j30nyxwrw82dmhzf4yfkz8pra251"; + rev = "c9379097755701ab597140bafd097fbaff3dd517"; + sha256 = "18qswcjppgcxcf5p8vlr0nwb6p6s3j68a7ng05bpx49i5nwrd0vy"; }; meta.homepage = "https://github.com/Mofiqul/adwaita.nvim/"; }; aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-04-19"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "7045e7cb0017d222122a1f6e5795e69754d8b9db"; - sha256 = "04mclw1drrkr4x4gnb26p6szg6glbkkff7cbrxy4g7fyx6lhl9fy"; + rev = "228fad11393322537d9662c0347f75549a3d6c0a"; + sha256 = "1498ys4z2pzkk6x59ygnq18j53zypin2zxmlc4vvc74v640v3iml"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -583,12 +583,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-04-20"; + version = "2024-05-09"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "adee52fba040428264aee956d99033572fc405a3"; - sha256 = "125hcnl146bh8bpsp3v62dbdqpzwma5n69f8y6gpk5anh4yc1sai"; + rev = "c88bddfa83dbb96c2f57426794ed98a0e181ea7e"; + sha256 = "06mbkp68wwl1pnpzl1plfv3g7089ljlkp3bw5rgj0xjq5yd4bkfi"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -689,14 +689,26 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; + arrow-nvim = buildVimPlugin { + pname = "arrow.nvim"; + version = "2024-05-07"; + src = fetchFromGitHub { + owner = "otavioschwanck"; + repo = "arrow.nvim"; + rev = "33f3ce4c710c1717c491119016808c8d529d76a2"; + sha256 = "0qagjxl3c8gp19q6ghj9cv5yv7naqm2d6p83bfrbkw92ba2i8nli"; + }; + meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/"; + }; + astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-04-10"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "8b316aa3ecd8c4206430379c0b1da0b4e7969ab9"; - sha256 = "120fz8z6bmsp7dqjhg8dygbgv1q4bzwk0k8ji55xa2w6bc8ji3ii"; + rev = "7e47b7900229365bc0dca2a2eee2acc62dfc9dc3"; + sha256 = "14gjl0w921c3bgl4hcvv1px42j1z7i2bsqh91lps33r18sj3x833"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -883,14 +895,14 @@ final: prev: auto-save-nvim = buildVimPlugin { pname = "auto-save.nvim"; - version = "2022-11-01"; + version = "2024-04-25"; src = fetchFromGitHub { - owner = "pocco81"; + owner = "okuuva"; repo = "auto-save.nvim"; - rev = "979b6c82f60cfa80f4cf437d77446d0ded0addf0"; - sha256 = "13kv2p0gj20fg79ch27a9vp10ki11vjj4fx626cj526qpnbs4qbd"; + rev = "5fe9ab0c42f0457f2a973e814a6352b8eeb04730"; + sha256 = "1c4xmp1cy3h7z68yh09bcazdqj8kimyrddgl0wc068sb6pmnpbbi"; }; - meta.homepage = "https://github.com/pocco81/auto-save.nvim/"; + meta.homepage = "https://github.com/okuuva/auto-save.nvim/"; }; auto-session = buildVimPlugin { @@ -1015,12 +1027,12 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-04-18"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "aaeda8100e3a7ebcc65b5897c9027eca2bd9cbf2"; - sha256 = "1734skv1z9qd8p6dspda1hhq79rd4y4bkyggf0iphz8qw7g0qm8m"; + rev = "f624433d750dbf69ce93ee057fbc1c595aa13e31"; + sha256 = "06mxl2cfdfv8d0jwrsm69221v9hlx1c4gbz1zfgzwcm464pyqaqg"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; @@ -1075,12 +1087,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-03-25"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "adb64a6ae70f8c61c5ab8892f07d29dafd4d47ad"; - sha256 = "12c3xiv3dxjng86dahz0aw93v62ygqy7pkb3485yjs7a2v6jg5d9"; + rev = "bcc9ed2e88ef55b7e9d50b2f80f6a2d4b8080b1d"; + sha256 = "15f4lqcm6qbfwf2djs72hni9ibwbqjkdniniizh7fsz91k1afq8r"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1279,36 +1291,36 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-04-19"; + version = "2024-04-22"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "f6f00d9ac1a51483ac78418f9e63126119a70709"; - sha256 = "1681xqpvxb7zhfig69d0qf287qzxfwcwb6vipnhykiisd8vn9inv"; + rev = "73540cb95f8d95aa1af3ed57713c6720c78af915"; + sha256 = "0z3fg5zff1gng6wzsbj56sbbvmq9f30y6bzzkd9kjrfzsml6cybc"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; bufjump-nvim = buildVimPlugin { pname = "bufjump.nvim"; - version = "2021-12-05"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "kwkarlwang"; repo = "bufjump.nvim"; - rev = "a020f81bb82f758da51594a07bfcb9635a6b0f73"; - sha256 = "1a8n466drd9rz2q0h0cpc6xs1djgwshyh8gndx9kqw1n56vsa777"; + rev = "ae2728a77defbd27e9e5ef64c854fb0813ffba01"; + sha256 = "0d8rhgx9vyw58f5ryjwz5ibiwpvjdhrmd27nw4sh7z4bq1n9gxib"; }; meta.homepage = "https://github.com/kwkarlwang/bufjump.nvim/"; }; bullets-vim = buildVimPlugin { pname = "bullets.vim"; - version = "2024-04-18"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "bullets-vim"; repo = "bullets.vim"; - rev = "4ed0785a5a812d9dc96164f2ceab10f5dce68270"; - sha256 = "0dpbh9l4a3009k0qi016zm03wjc12jbf31lhj78mmqnpazfn7gfh"; + rev = "448ad2a159c5f2540f6c9738f3bb9e6f15a41734"; + sha256 = "19anlq6kjlbmhzr2sqqykxfksflkfij10kj82cxlj47r7nqzjgpf"; }; meta.homepage = "https://github.com/bullets-vim/bullets.vim/"; }; @@ -1351,24 +1363,24 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2024-04-08"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "1283eef5494c092a047baa34ed3e667f3cb2715e"; - sha256 = "1wipfpypa2zjdc2n4cjkiaxcfh0mraiwiripg3vmd4mf37wbxphv"; + rev = "f388f1981d222967c741fe9927edf9ba5fa3bcbe"; + sha256 = "1d0v96vxghm5dzjm03hhrds0qafvhbjnq1il9z7bkg3r062vs6j1"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-04-18"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "a8271021ec4f5cae4b9a276ab8662e9a7d6074f9"; - sha256 = "0cpzpz17smp3dc4lwid3gkkjwangndy1d6fbijrl1l2jpa8dzrgq"; + rev = "28ec469ed46c6366dbda7f3a4f57b204d7bf8e49"; + sha256 = "1f9bmaj0lhiwzig0g36gbsy3mkq2lmcqx762h4z3kn1acci3dlk1"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1423,12 +1435,12 @@ final: prev: citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "2024-04-20"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "ea9cb04feadc1f7fbd2902fc65f0308354583f5d"; - sha256 = "0mqnh1155pg0dw07hzn7jd5x42gwvffkpn7w1pk4jnmaas3yxpkh"; + rev = "44c7ef5568f5377f3d9b5a8b7b267c015ea3205c"; + sha256 = "10d5ia00q5wfycnvyxfn5hffy2n5jk4igjm5859i56i11pl0qmsa"; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; }; @@ -1447,12 +1459,12 @@ final: prev: clangd_extensions-nvim = buildVimPlugin { pname = "clangd_extensions.nvim"; - version = "2024-03-25"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "2992ba8c13c2de41f91a7c7488bf1c48bcec31fe"; - sha256 = "1qms0pkm1a7mri3bhn3aqy5lis6b1a9x6hwa383z2dp8iqqkcran"; + rev = "430a8f56605cb1d0ed9876301d6e9bf675195e16"; + sha256 = "1gqbl3s963dmz0bldxl99sg7zvqgmcfz3x1g8i5whaqqx3ig82m3"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1519,12 +1531,12 @@ final: prev: cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2024-04-14"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "8506c426d5b361dbaa7c61c0490a2589a9c555ce"; - sha256 = "1kmrfbxwzi60mf88qfcwjcwn0js9wci0yz89d99zgrm0vxl5jpkh"; + rev = "b221c5973ca520b0f079e16cd9919a8d944f7890"; + sha256 = "0whqznv233hn8241h0nv5r30qcnlzf6ziqxpjcdsxp97s1vcg1pi"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -1963,12 +1975,12 @@ final: prev: cmp-spell = buildVimPlugin { pname = "cmp-spell"; - version = "2023-09-20"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "f3fora"; repo = "cmp-spell"; - rev = "32a0867efa59b43edbb2db67b0871cfad90c9b66"; - sha256 = "1yr2cq1b6di4k93pjlshkkf4phhd3lzmkm0s679j35crzgwhxnbd"; + rev = "694a4e50809d6d645c1ea29015dad0c293f019d6"; + sha256 = "0qh86jbm1a843lc9p5z4gqarzpwq4vbb8cjlg7jn87ighx5cgzhr"; }; meta.homepage = "https://github.com/f3fora/cmp-spell/"; }; @@ -2143,12 +2155,12 @@ final: prev: coc-fzf = buildVimPlugin { pname = "coc-fzf"; - version = "2024-01-04"; + version = "2024-04-24"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "96490e570daf1c10679ac0b183ebf2ca1024b079"; - sha256 = "0iyjrax9sqimx7vrkk98qy3zag4vbw3g3kw4p6mmyjryi20kw66m"; + rev = "6f19832e9e80ceacb98faac2688364b4f7a5b8e4"; + sha256 = "1hjp5f1mrsrch83yi0f74a2pxsp7qmmrgp7ibd1v2wqvb4cnwsfp"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -2203,12 +2215,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-04-19"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "a8823eed914f89cdd3940ed9f5f62786e6d585c1"; - sha256 = "1s3hcbhx5kn3b6m1793m02kl94g8hb53jc5lhjhgkg4qhx27hsq9"; + rev = "ad6b31032f4eb4c407dfc30c3de94e67571ecc07"; + sha256 = "0jyymnlj3qs4f6ilmq2wxj3ghxq0iand4am0d70i81s7izw26wcg"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2227,24 +2239,24 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2024-04-16"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "dfcac077fa023b7194c6403ac9a8f931b9c24f28"; - sha256 = "03lykrm0d5xm8i5f002xfy7l8wmzji5bqy4ygl3vals12ni5ymph"; + rev = "d3b88eb3aa1de6da33d325c196b8a41da2bcc825"; + sha256 = "0zssbn655hqxihmswbhih5w9k75gkhyqn9bm8n9vdqihygh5g9js"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-04-02"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "31dd2962c81759be007895db6ce089feec397c86"; - sha256 = "07ihw108z3lz86f29jqkm9skc4rywqw84mv8gwviaplndpd2z893"; + rev = "9406f13cf3eaa08318b76746bd105a04506cab27"; + sha256 = "083qfmiskr0xahi5c8h46qkrsy4bahcy63rf74g315wwfcv491vz"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2275,12 +2287,12 @@ final: prev: colorbuddy-nvim = buildVimPlugin { pname = "colorbuddy.nvim"; - version = "2024-03-20"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "tjdevries"; repo = "colorbuddy.nvim"; - rev = "9e96ccd88f4510d0a54ce1d5c11119eac9fb217e"; - sha256 = "1xakrmhsjr5xy82g9vfjmsz2wy93gchsqg7lndvjjm175hsqd27a"; + rev = "8b968581e5c19d22a861d5f3fe5dbd83394fa681"; + sha256 = "184hvgv6cb25hfgkh07yx0mddygcj0qk19slwpj6z5i3xvywxab1"; }; meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/"; }; @@ -2491,12 +2503,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-04-17"; + version = "2024-05-11"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "a6965ac128eba75537ec2bc5ddd5d5e357062bdc"; - sha256 = "00knvdl5msvn178skxqxb0ip722cnqrpp8xr1id4z6j5vbysmhiy"; + rev = "dc950e5717f1da65b1fcd986b1bbff0d6bd0e2ee"; + sha256 = "08x0nl7gxmadv9as0i7yqcjb5npq8fa258vz6b4n1qx85dj99skr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2564,12 +2576,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-04-13"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "1e135c5303bc60598f6314a2276f31dc91aa34dd"; - sha256 = "06b5c0xgs3xiajdw7ag3qbv4i0qwn4s084r4pj5v8d9iyc834kiz"; + rev = "dfa657c80c915a6a3eb6d9010046a0576ad25a37"; + sha256 = "0jf0hljpg5yl26qazz3xpg7hcdv3ywjw81s4g2b42wsrwsmafzsf"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2612,12 +2624,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-04-18"; + version = "2024-04-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "98e389717df1a29f557f7a5d8f1d8a7e5c0560dd"; - sha256 = "16ngidw3lg1virbd731pp9z1s20j8mva6569blkj7cnk08kprh7l"; + rev = "23ab6c20039a43bb21ce1c586ef0eece026c68bd"; + sha256 = "0ng4z0600fsbg7ln72305vyvhn7fd4rj0xzi1n7f57avhqvc4lpr"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2648,12 +2660,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-04-13"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "786d12a70c9b91fa2d0d102bb07df02be0db31a1"; - sha256 = "1krd7srvzjrikpirfypw09cv2flcy22jv8amrbxfxykrgg2vn6dd"; + rev = "7d8541ec0e3b30ac2c43864d3ee13a632e1231ed"; + sha256 = "1zyzv2bq01c6mfmjf05sjxya6vq9yjdsdyc8gqxvlcyjilzff602"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2744,12 +2756,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-04-19"; + version = "2024-05-11"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "9a7f07ad318a96f19845683014d27be00495ea98"; - sha256 = "1w8ic8ngfk1x99yl7bx7kfqmwi0py6xj198yczvxwzmgfxby5sjc"; + rev = "c3eff4c5df805bb9451129151509d5624295f416"; + sha256 = "0c6ypwik0w9p9ch2089dn8gxisx22fb7gzdzivbnn2i239fwc12n"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -2780,24 +2792,24 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2024-04-18"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "6d06924b562de6f0bb136edf1bf549afbf6b7d00"; - sha256 = "1c5xhwsj84rs00zds9279wfvxc2xjmdfix36mvxdklrq6f083ifd"; + rev = "a0a78099658c7d4be3714f657b18ca8285d5d106"; + sha256 = "1vfzh9dsfggchxsyypkl8njdapmy5vhd0kwihvv32997x2sh1qks"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-04-17"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "4ac809ff035eb246392ce4593c49705e894dbbea"; - sha256 = "1zjycn3qj6mpa7c5aknka2dfq8d05ac8rc6sfh81sal2hwdnq1d1"; + rev = "94d7d988c1d7dcb2f4c55d01d54bdb95c597639c"; + sha256 = "0nvyb0d8c7klyng700wpard9jyhl0n3363v4czxqs3fisx4ppq9x"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -2900,12 +2912,12 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-04-17"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "c727a3f05a804d1f04b11735f8241518465de9a7"; - sha256 = "1h08jrxa07b59ipxqlk2ni78bn1h2w4qdg0m46bwgn7pb24479f6"; + rev = "52bff98267685291fd083523d8446e8c233fe96d"; + sha256 = "175xp085c0vycfr5pxwbz590y5lksia97xh6xd4nd06pq5ps91zv"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -3154,12 +3166,12 @@ final: prev: dhall-vim = buildVimPlugin { pname = "dhall-vim"; - version = "2021-06-05"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "68500ef46ff3706f46c99db3be7a0c8abcf6a3ae"; - sha256 = "0lwna4kcq7davfvh3535n8wl9jxkjm7cg6jgpisd17kvagihh8qw"; + rev = "c1790ded928a57abba9ebc8f46cf57a52733af04"; + sha256 = "05jd65bxclgmb97hyg9akcz4zw7n81wh53a1dp7rxvannbxzd6db"; }; meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; @@ -3286,24 +3298,24 @@ final: prev: dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2024-03-13"; + version = "2024-04-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "18e5beb3845f085b6a33c24112b37988f3f93c06"; - sha256 = "0pvkm9s0lg0vlk7qbn1sjf6sis3i3xba1824xml631bg6hahw37l"; + rev = "5162edb1442a729a885c45455a07e9a89058be2f"; + sha256 = "04h3q6ls7r9kx17l1kmcb82s4220sd98rxfm0w9cif4dq1gzpap3"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-04-20"; + version = "2024-04-27"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "e3c7de9f733587373959b220d5a1970c476a3d9f"; - sha256 = "02ipdrrian2s0ddbjaga681sgflcw6nqcq707g7v1f094fc2rvj5"; + rev = "3dd8edba9f9eeb129db269dd57ef6c0427b7ad9d"; + sha256 = "1m7ld10gr4cqhm8hw4qqlcvgdk32yb5p7n2rgr5x8339xnv2xwha"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3383,24 +3395,24 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2024-04-19"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "2bd059ef683c232f9d6fa898bfe93173f0d4253e"; - sha256 = "1phyrapplsn5iivl1vfnvg4nfilxdp8digcfy6d9khsbpggjhcmq"; + rev = "f477186ecc12ac025a9948d17edc69242e1ee96b"; + sha256 = "0mgljq23h4phk5r6dnkyijyv54j71h2cgvxjg4c8lgnqvas0cksl"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2024-04-20"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "3c4f8344a341818417b3d75c04eb96d894cb4640"; - sha256 = "1jwqflzdr9qk27gqsd0h4nfi2scq274l2rgbmyccybj5kmdjv654"; + rev = "51eddb03a7a8c9f00d6415b356a4d3b75d8e75b6"; + sha256 = "1fckakkqgagn7n6wr92333acxy7wi3c7ny6y1pxr88nigzb5p9sk"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3480,24 +3492,24 @@ final: prev: everforest = buildVimPlugin { pname = "everforest"; - version = "2024-03-27"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "4d67edd8d4701b00cee37073d53053a650264541"; - sha256 = "1jlr4wjbmzjgr823csai7ii3yq2gppl8kchhqngp76gpf4i81795"; + rev = "c6b3315ed7e890128ff1e274969d4aca2eeb8185"; + sha256 = "0sp8ykmc5006rshviyv955l3z85wanii822x5bdii9yrmlfmhgcj"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; executor-nvim = buildVimPlugin { pname = "executor.nvim"; - version = "2024-03-12"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "google"; repo = "executor.nvim"; - rev = "f6c3109f714d89641fb939b42044b2136f8520b7"; - sha256 = "17j4x4wx50mhhafmp1c5rn644vsnx2473g9i32gg9hmzf27phcdn"; + rev = "cb60faf7486cd6edae884a58fb9c2793bc4e75ea"; + sha256 = "0ifzy31m11spjkdi3xc42r1zp9si38zgmp43a0bdxznbm6ka5hm5"; }; meta.homepage = "https://github.com/google/executor.nvim/"; }; @@ -3552,24 +3564,24 @@ final: prev: fcitx-vim = buildVimPlugin { pname = "fcitx.vim"; - version = "2023-08-03"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "fcitx.vim"; - rev = "451d277bbd003d57da939fa129541dba5c63c154"; - sha256 = "0hpx6n0fwi27xgd2qc7a73v897n7al6psza8m1pnacf9wb6lxsdw"; + rev = "28d5bcc86d01a75911cf9c165d16840b7f0d4f98"; + sha256 = "0f5k4v063ik43vzxgbzs38nzbyhjqfs2014v0b6xvdwkmp0cm3x6"; }; meta.homepage = "https://github.com/lilydjwg/fcitx.vim/"; }; feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2024-04-19"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "2aa8b757313cc01f7779865bef7c7cc391753bd8"; - sha256 = "1xbaa553l7hc2jfgdj9q44xxgv8bkia51w54297p548w90by3kfl"; + rev = "b43be71ebc3ff0e451a627b47751fd7747dc15fb"; + sha256 = "0j5a6nsjv4nsrhvwlbnrm7cys94k62kx4450famb07b8q7miwi72"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -3588,14 +3600,14 @@ final: prev: fern-vim = buildVimPlugin { pname = "fern.vim"; - version = "2024-03-21"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "lambdalisue"; - repo = "fern.vim"; - rev = "928d355e4c06e08eb3c9062485a661f1d37b01d1"; - sha256 = "1siyqx08cb36dh61gy7hgmv0csdjbxnyam07is52w1x2pik0167h"; + repo = "vim-fern"; + rev = "a675dff495a0a0fd15663ebbae585c19825a64c5"; + sha256 = "1bxd4x5iac6c1ca5vxw2y1bxxlzjhn6gkxfnw91q68cj7lik5575"; }; - meta.homepage = "https://github.com/lambdalisue/fern.vim/"; + meta.homepage = "https://github.com/lambdalisue/vim-fern/"; }; ferret = buildVimPlugin { @@ -3648,12 +3660,12 @@ final: prev: firenvim = buildVimPlugin { pname = "firenvim"; - version = "2024-03-05"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "3363c140dca2ef0b89e2be0317917f077d752cd7"; - sha256 = "1c9k848y320fkn4mbsxb3x7i5dfwms1waq12yig1fn9mspw83vqy"; + rev = "fc72687977e1c34259c42f0e408655cf2638760d"; + sha256 = "18q5lby9hlhbd1z2bpnm9s2vrfz88g19rq78hx10d1vp3f576jla"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3673,12 +3685,12 @@ final: prev: flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2023-10-17"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "48817af25f51c0590653bbc290866e4890fe1cbe"; - sha256 = "0cf1ll91mhqw73p3y366fxylrq0y222jl2kb8sxf2s4gisxpppcg"; + rev = "7bb4a9c75d1e20cd24185afedeaa11681829ba23"; + sha256 = "10f52qma6gh03pml1434w6lr7i8qh1jccl6yx4bmni9dscbv10hx"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; @@ -3817,12 +3829,12 @@ final: prev: friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2024-03-31"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "ea068f1becd91bcd4591fceb6420d4335e2e14d3"; - sha256 = "172lhjssr4yh14vjxbkwx02hsnyykhqmvzzr1bx4aaawd22x0bz6"; + rev = "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a"; + sha256 = "03z76x6a444fxys8qnsjbafy3ij8hf3y15wn6gc22glxfqyfvjsn"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3923,26 +3935,26 @@ final: prev: meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; - fzf-lua = buildVimPlugin { + fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-04-01"; + version = "2024-05-11"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "5a44f0ace88de57743af661c9507ef5075aa6e2e"; - sha256 = "1r9bi2a56gg827s9a0yk6skm85jl0x4ky1qk2ram4aaxpjfc2c6y"; + rev = "9c953dfa7650191d892800333d187f3439e01afd"; + sha256 = "1dzznjj2q2xsj9dvx0agsqi0c5y68d23mr9l6cpnz2rc2yfrisgi"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2024-03-22"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "45d96c9cb1213204479593236dfabf911ff15443"; - sha256 = "12jr0svh80q6wchg59c4gwqgrbf1w9p1v3xdx4djs5vbshcdpxyc"; + rev = "99093bd103b847dd3ed149b0c9e7146c8ed46643"; + sha256 = "08nsxc52zs9k98q9yxq8kzddzs78fg0v185wympq6k8ks15lk4qr"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -4012,21 +4024,21 @@ final: prev: version = "2022-03-30"; src = fetchFromGitHub { owner = "lambdalisue"; - repo = "gina.vim"; + repo = "vim-gina"; rev = "ff6c2ddeca98f886b57fb42283c12e167d6ab575"; sha256 = "09jlnpix2dy6kggiz96mrm5l1f9x1gl5afpdmfrxgkighn2rwpzq"; }; - meta.homepage = "https://github.com/lambdalisue/gina.vim/"; + meta.homepage = "https://github.com/lambdalisue/vim-gina/"; }; git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2024-04-13"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "ad1d1365c9189d89797fe8d559677d5f55dc2830"; - sha256 = "1saw496nx8pimq1sn0ws2k10cvwg4r5q5dizfclm1rpxfp13485j"; + rev = "fb84fad97cd4b51caee3c865e8a33a0d413b77a8"; + sha256 = "0yn410ld7xrclpd24smf088xaig9zhv01612yv2qjbz9w16q689d"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -4105,12 +4117,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-04-20"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "035da036e68e509ed158414416c827d022d914bd"; - sha256 = "1k5qd4k7izirgvc8yvg1hjgfx00f9fml7k0ayzk45lnhzb5c7bah"; + rev = "805610a9393fa231f2c2b49cb521bfa413fadb3d"; + sha256 = "0cxcq40i84l1jblvvn913hiz9qik62g0iij097prxgz2jx66lvdz"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4165,12 +4177,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-04-19"; + version = "2024-05-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "cbc6aca611cdc664f9bfc3c0a9aa9f9912fa9720"; - sha256 = "1a1a7ddg70l74ngwwrygg5r39h1yzwws0myzy5jk837lmr909sb1"; + rev = "4348ba67c29338af648ed9a0455bebb44fdb3ef3"; + sha256 = "0rmry1zlm3b9i4kkxjx42kvhfgpjva55g4z2hifdjczrqasgv4sb"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4261,12 +4273,12 @@ final: prev: grapple-nvim = buildVimPlugin { pname = "grapple.nvim"; - version = "2024-04-11"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "cbochs"; repo = "grapple.nvim"; - rev = "12172536620464f8cc124e07c6e3ccd306ea3c5c"; - sha256 = "0rpiq47zb0ms6bbbd3c1ywmq5vc88132xcqwfnbfn3d2hrvbz8d1"; + rev = "493f174a1ace3f2d55ba2191129e43b3875b9124"; + sha256 = "0b55kkvjsw176510gic7jm2ym6nvllaz4wi91fihmmhdp7k9s988"; }; meta.homepage = "https://github.com/cbochs/grapple.nvim/"; }; @@ -4333,36 +4345,36 @@ final: prev: gruvbox-material-nvim = buildVimPlugin { pname = "gruvbox-material.nvim"; - version = "2024-04-19"; + version = "2024-05-11"; src = fetchFromGitHub { owner = "f4z3r"; repo = "gruvbox-material.nvim"; - rev = "9143e172617e708d6588f424772ef20340877dd9"; - sha256 = "0ad1s2l7vd9h2ycva5wwxisadsiqlr55pfjas23cra8gw5ngn9cj"; + rev = "186bfd9fc87ada2e408158bc0f72799b46370add"; + sha256 = "0a19dsjhx50fpl2apwwllpvc9bznigc4f41lhyb0ydldi6x0rg13"; }; meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/"; }; gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2024-01-29"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "6e4027ae957cddf7b193adfaec4a8f9e03b4555f"; - sha256 = "1kk38xpwqlzvm3rgdii25nyxd8bcsgjjzin3a7sb0kyg5x3ynscd"; + rev = "c442515506caa166118e157980f62a9ac24fa8c3"; + sha256 = "07yp690ybjknlczbdglhrb9mdalf13s9pf190kv20a2yx8ipj1yq"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; guard-collection = buildVimPlugin { pname = "guard-collection"; - version = "2023-11-13"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard-collection"; - rev = "13e00d19f418d68977c6bc803f0d23d09dce580d"; - sha256 = "1zhq99hf722m5m842ghadj9akmb0y1sqkpmbhhk15jynnvv16ab6"; + rev = "78df199510b9c8e2a1da0cdf71a01c4f6009a47d"; + sha256 = "01y36ra8xrlr2s7lbxz5zw923rdhrnqwg0aa2hbpza7adwx8q0s0"; }; meta.homepage = "https://github.com/nvimdev/guard-collection/"; }; @@ -4417,12 +4429,12 @@ final: prev: hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; - version = "2024-04-03"; + version = "2024-04-27"; src = fetchFromGitHub { owner = "TheSnakeWitcher"; repo = "hardhat.nvim"; - rev = "ad39b73b07aab7d1f48a624ba6f3ae35ad0a2e56"; - sha256 = "0fpn0sif0y7xrp8f01fkz0qq0c29l6r5shc6q9bvl32dzp7n2ryp"; + rev = "8b9d36f51e2a6eccc651b92bb20187df4e2eaa3f"; + sha256 = "10dh8xd048sra73fw54p7f8mr7fzqifl67m9fk2rcwwmp5i601k5"; }; meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; }; @@ -4441,11 +4453,11 @@ final: prev: hare-vim = buildVimPlugin { pname = "hare.vim"; - version = "2024-04-21"; + version = "2024-05-12"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "960c7a342609f373414c1e7fe4be0dcc369716ff"; - sha256 = "1dzpp050gl1a39vdmn57941qzxmyws0x1fqykq82babppn23hzpb"; + rev = "188309129ac77590113f13d6f0da28c3f6f4d494"; + sha256 = "0rz1hx3zljs3g5namlyzafvl12vi164vq3mqj02zd04hmm1rsr0b"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; @@ -4488,12 +4500,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2024-04-21"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "4fdb49333093c0a8aae35cfac68e71cf595666ef"; - sha256 = "0qgrkxmqzlp1z5zxkdzy37lwfc7y3bpqgiy17hxszdrjy6n44vih"; + rev = "f30928e90b68f4df82771ea4354cd913f005b829"; + sha256 = "13h764dn7i9cy3cs5yvgh01yi3b2428wwsdq1mzdr88677ai5p3v"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4548,12 +4560,12 @@ final: prev: heirline-nvim = buildVimPlugin { pname = "heirline.nvim"; - version = "2024-02-14"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "03cff30d7e7d3ba6fdc00925f015822f79cef908"; - sha256 = "1bw4077h3cv01wnz0gv5qkdyxi8naszkgl11zi9mqb54asl69c41"; + rev = "c52391dc4428d503f65e6bcb1533e6334f22a136"; + sha256 = "0hplfmqy9gx21ifqyj23ydq7zsm9v0kfhhqb4s9bjb1djx9209j4"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -4584,12 +4596,12 @@ final: prev: highlight-undo-nvim = buildVimPlugin { pname = "highlight-undo.nvim"; - version = "2023-09-20"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "tzachar"; repo = "highlight-undo.nvim"; - rev = "50a6884a8476be04ecce8f1c4ed692c5000ef0a1"; - sha256 = "09fmds9ibl6n4fgxmmypifnxpyc0slpinc2h5cvx0959i9ak0l13"; + rev = "1ea1c79372d7d93c88fd97543880927b7635e3d2"; + sha256 = "1lzml5yj3ak0rc4r2fmb1zpb9a01i5j6yk58m0qn960l2x5kav68"; }; meta.homepage = "https://github.com/tzachar/highlight-undo.nvim/"; }; @@ -4619,12 +4631,12 @@ final: prev: hmts-nvim = buildVimPlugin { pname = "hmts.nvim"; - version = "2024-03-14"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "calops"; repo = "hmts.nvim"; - rev = "473d74cf54da8f51aaa9993ec3e6bfae278eb47b"; - sha256 = "14a6k53b002zvz336s6q5yznvyjfdn9y2qdnickhz2cwkrgr1hvf"; + rev = "19a91816c123173a4551a6a04f2882338f20db1d"; + sha256 = "1qw3b7zsp467bg8npingba5jsiiywyr0mgjhk8khvjnb1hjyld5w"; }; meta.homepage = "https://github.com/calops/hmts.nvim/"; }; @@ -4655,12 +4667,12 @@ final: prev: hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2024-04-21"; + version = "2024-04-25"; src = fetchFromGitHub { owner = "smoka7"; repo = "hop.nvim"; - rev = "059e88e9dcaad3280ea1fd5c757f6904f274aed5"; - sha256 = "1m5li7gy18d4z2fzzm6ipghn67m2i9a5fq7v1l6qy3vxgh9vzrq7"; + rev = "6ff23501a1fd1c75c91dfd99ff5befcfdb02c11d"; + sha256 = "0a621aljh16apa8vc6nf4l4h2h7amxdwx5hqw3fmiipxc9g9cczr"; }; meta.homepage = "https://github.com/smoka7/hop.nvim/"; }; @@ -4679,12 +4691,12 @@ final: prev: hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2024-03-07"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "1084aa544477cf878d466cacaec0d8d4692c7360"; - sha256 = "0f80nhm6lfa6nph6a4w7748ggvmwg2wh29nwv1sniakjvnk0vr6b"; + rev = "82684ebd5f2a812d6d05a629b14109618b54cbfc"; + sha256 = "1d7f9sfl6455799ra9fvyvmwcrs8803xgmsp0qb9rgw2n37ky22i"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -4703,14 +4715,14 @@ final: prev: hydra-nvim = buildVimPlugin { pname = "hydra.nvim"; - version = "2023-02-06"; + version = "2024-03-14"; src = fetchFromGitHub { - owner = "anuvyklack"; + owner = "nvimtools"; repo = "hydra.nvim"; - rev = "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0"; - sha256 = "1dwhi2543drbncrqx80nsi5hw48d6my4wbsp71gx6m0clkp4469h"; + rev = "8578056a2226ed49fc608167edc143a87f75d809"; + sha256 = "sha256-Qxp2FigXlupAw/ZwZRVJ+hRKzVRtupV6L4a6jOslwI0="; }; - meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; + meta.homepage = "https://github.com/nvimtools/hydra.nvim/"; }; i3config-vim = buildVimPlugin { @@ -4775,12 +4787,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-04-18"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "301de7919b2c0378cb7a782663f67abbcb198b17"; - sha256 = "0cxqffdync3hfg7xfahwnsd5rwz1gd2mqcgsgm615qbx364as8d9"; + rev = "66af29f7244256eea82b2583ab65c2fab0567d0d"; + sha256 = "17h7myyqcwqqn4wn6ci22maj2c7c4qbrjlqghxyf06k9icvwbjbb"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4811,12 +4823,12 @@ final: prev: inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; - version = "2024-04-02"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "5e03e986625961d1fac296d1bf332a6510c3add6"; - sha256 = "0zcii0ypqv66xmy4w964kry4zij87fx9mckxifck0xy1y79ncp7r"; + rev = "1d7d3f647d0928614c00ca9ef4ce695c45147c05"; + sha256 = "0j15b6ii3pcsdwm6vxi9fw3yim7hphzlnbmarwhla5bw3ci6h7z5"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; @@ -4979,12 +4991,12 @@ final: prev: iron-nvim = buildVimPlugin { pname = "iron.nvim"; - version = "2024-04-02"; + version = "2024-05-09"; src = fetchFromGitHub { owner = "Vigemus"; repo = "iron.nvim"; - rev = "f6f199e3d353fc5761e2feda63b569a98897c66b"; - sha256 = "1bwqval3lr12cqivfmmvxdi6da07000xbsn2ygiz4ym1a0a9jg5v"; + rev = "7fc24223ed2a6292cd1d913761b08b6c18a30bd4"; + sha256 = "0z08c8ygy9haaclnsrbdjvnpypfbfm7yvrwk9grvvfp7qsblzvhv"; }; meta.homepage = "https://github.com/Vigemus/iron.nvim/"; }; @@ -5064,12 +5076,12 @@ final: prev: jq-vim = buildVimPlugin { pname = "jq.vim"; - version = "2023-10-17"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "vito-c"; repo = "jq.vim"; - rev = "6f10c6977d46cbb3b3d0f2170e726f36af588bc2"; - sha256 = "0fzzqixnzhv2k8dhznn9yzx6h4ivc960dbj7qlbp3czs9fvs8x76"; + rev = "39df435b321e8e741ed150fbab4a27e63e0604d1"; + sha256 = "0f0xb2pgk7sd7kn0c4az8zwxmb8m61nrnb17wjf557yixavc6nh6"; }; meta.homepage = "https://github.com/vito-c/jq.vim/"; }; @@ -5088,24 +5100,25 @@ final: prev: jsonfly-nvim = buildVimPlugin { pname = "jsonfly.nvim"; - version = "2024-04-19"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "Myzel394"; repo = "jsonfly.nvim"; - rev = "e47fd7713b083120af6cdb1548de8af513a0ec6f"; - sha256 = "0wnjzqx68kqwza2pnaazmp1l986pys86ncj8hrdfcp4nvmz2i3xv"; + rev = "acd899ce82d902cb91869c932092ffdbf3de9de4"; + sha256 = "02qrjbj4x86494fk5jm24qhi73qzj23h43g55y07bijv5ypxzrky"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/Myzel394/jsonfly.nvim/"; }; julia-vim = buildVimPlugin { pname = "julia-vim"; - version = "2023-12-15"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "20542b50610e075e5f4199187800ede2425f6cb8"; - sha256 = "02yy03w15s4f779qphg2smcsa6dka8vspsyixqajc4w9g7y1si7k"; + rev = "16b0cc336eb1b74205396a7677940d88976e2365"; + sha256 = "0r34z1c760h86axrihxg5fhz945710p29j8xc0xdr2lyv2d17kdn"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -5124,12 +5137,12 @@ final: prev: kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2024-02-28"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "bfa818c7bf6259152f1d89cf9fbfba3554c93695"; - sha256 = "0kjrk5j2jy19q9q684spc0xfgjs8xavjr9zd98idz13yz21yfakr"; + rev = "860e4f80df71221d18bf2cd9ef1deb4d364274d2"; + sha256 = "1cmlv5r9ckihk0y496lr5zy2baks2qxkvfnd0l49bv3rp9zfbym1"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -5232,24 +5245,24 @@ final: prev: lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2024-04-16"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "19d2a4de3a57deed4aab304704c1f5e77454f4f3"; - sha256 = "089drz8djyhsksi19ixcpfnci7ag121gsj17cq2a91l8m430j0y4"; + rev = "17deb64279389056b6edd4b0619d8dc391798b6a"; + sha256 = "0lzihyajpjmj8g0jqbm5mgdkafbpc061bwjrsryswvgan1j5y5bv"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-03-29"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "31ddbea7c10b6920c9077b66c97951ca8682d5c8"; - sha256 = "0yb46njab5jid29fx6cl6and583pmnhysz637b18xcil5x0my8ik"; + rev = "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86"; + sha256 = "0sc0590qgwpr9zxmks6k9bfh916zz8n4pv8j4idcxch9vv39inm4"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -5304,24 +5317,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-04-12"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "626be4c4ec040aeaf6466c9aae17ee0ab09f1a5b"; - sha256 = "1glf2xf4frr1in0yyar3aybmhrymrn5lzc261jdflpi749yfhadi"; + rev = "be68eec21e37415d15cffaabc959b8d3f9466665"; + sha256 = "06h1lg2844p9m6618z71k9d4byajczvf02jc9cccw0inar33b8ac"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-04-19"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "02a7799750a56865c58e3ea58e13b19ae1d2dc31"; - sha256 = "1y7v6xa9n620vlzcvvcf7xc1pfbzidz7ybr7yf1k30gyv3sxpp4j"; + rev = "33108b19edadee8c2758f6bc574cc8335fdf89fb"; + sha256 = "1w9zchqpbf3nvdxdx7xv5wy4my8xknnxwgcf3hvlycvxsg001xxd"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5472,12 +5485,12 @@ final: prev: limelight-vim = buildVimPlugin { pname = "limelight.vim"; - version = "2022-08-03"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "junegunn"; repo = "limelight.vim"; - rev = "86aaec1700b27618d33d6182f44691d84d2cb6e5"; - sha256 = "1a07gsrzbwsdbwm56rmh7k83kxp16awclgf51i0a15zpgwl2kv01"; + rev = "785c1e17fe90c587ebca88920baa3146cd6e30fa"; + sha256 = "0r97jh94r09a1c2vap7ybdn5kqpm24xwfsl9fxhvfhj6mlf1n2hm"; }; meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; @@ -5578,6 +5591,18 @@ final: prev: meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; + llm-nvim = buildVimPlugin { + pname = "llm.nvim"; + version = "2024-02-22"; + src = fetchFromGitHub { + owner = "huggingface"; + repo = "llm.nvim"; + rev = "51b76dac9c33c0122adfe28daf52ceaa31c4aa02"; + sha256 = "07i1ixbiby4c81lkydwvygz6vxs1xhqnwzcsad3xzcaz7zdl00kx"; + }; + meta.homepage = "https://github.com/huggingface/llm.nvim/"; + }; + lsp-colors-nvim = buildVimPlugin { pname = "lsp-colors.nvim"; version = "2023-02-27"; @@ -5652,12 +5677,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2024-04-19"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "b93f040edd57888cd6a1e7d9dee47dddc4463f8f"; - sha256 = "02nhnm7lfdrx6yfwm754khndkq4732qnv99j91d46q68xi305p0n"; + rev = "f12d50716e8e59ea9f5cf484eac6968c33a95917"; + sha256 = "07dsgbgqmdlv2lv498lwzb8vq7fl4hdlr4psym6ilssmqjc6xkx2"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5687,12 +5712,12 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2024-03-17"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8"; - sha256 = "11njh62m56az4mmvzsqh2pm852bv1c1zp1m92ma4q5xgq2jvpg1v"; + rev = "aed5d1162b0f07bb3af34bedcc5f70a2b6466ed8"; + sha256 = "11x1mv3bzg7d9k2s69766p7abrzbdnv4knj6yx06b6vngdk2x03z"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5723,12 +5748,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-03-31"; + version = "2024-05-11"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "a4d442896a9ff1f83ee3db965d81b659ebc977d5"; - sha256 = "0567ckm6aq985md5mccy1zz6q409fk6r682h7vpfslz3iic6q6l6"; + rev = "9a06eaf5622f4ac102b9c45faeea3a39a33ec5ba"; + sha256 = "07kyz8mh373ddqzbydcm9f7nbsfassk9699bwbm879hipwjqm0ld"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5771,12 +5796,12 @@ final: prev: luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-04-16"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "03c8e67eb7293c404845b3982db895d59c0d1538"; - sha256 = "1abfssd3352kp7r54rnbl85cjz1cbxl4w48vr437k1dr6b3zcgcq"; + rev = "b152822e1a4bafb6bdf11a16cc26525cbd95ee00"; + sha256 = "0z3qk24fwbrx4waf18lkjn1vp3zqxwsccfybqv8jwviygqyl32iy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5880,36 +5905,36 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-04-06"; + version = "2024-05-11"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "44509689b9bf3984d729cc264aacb31cb7f41668"; - sha256 = "1z65m3hfx1avi4wfzsf8ypin5d37j3mcipay9rnriwhc8q8vwbb1"; + rev = "9ae570e206360e47d30b4c35a4550c165f4ea7b7"; + sha256 = "147dhkrqz8fiwpafayk0ww685ncijjzxxd21nf93lagra9rx2l75"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; mason-tool-installer-nvim = buildVimPlugin { pname = "mason-tool-installer.nvim"; - version = "2024-04-11"; + version = "2024-05-11"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "b129892f783740e6cf741f2ea09fa5dd512aa584"; - sha256 = "08152z7smaxv82v7ivp92n58lvr3ys7976795k0pxi8a99qj9kw7"; + rev = "c1fbdcb0d8d1295314f1612c4a247253e70299d9"; + sha256 = "1pxfnflbklpi7y71h7yq4ac20nimxc1fqh4kpxl8hifqnqgbllrs"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2024-03-21"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10"; - sha256 = "1aaf19a4iqh8ayh4fghgs7inyg01fd7pdk3qr2pgz12mbawm62d9"; + rev = "1b3d60405d1d720b2c4927f19672e9479703b00f"; + sha256 = "00vlxxzxslf5g6irbz12bscxxksc3mwr4gz4gwxy7wjsx6f9iqnn"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -6024,12 +6049,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-04-18"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "e623d29561746637b49d30d6434338f88f44e856"; - sha256 = "1if6r4w7qpi3d0z1zdwfwz211n5rfiizxvjjsywdb4659ap5b0mw"; + rev = "c333187fcc76d7e772dac32c2a440a949fe34be4"; + sha256 = "1mdqavyq7aar03c1za5z4ca7zgpb2knyy8zz0xlcxjz67q093zcr"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6060,12 +6085,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-04-18"; + version = "2024-04-25"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "3486f98dfed4cfbfa83922f73c7189cc88e9e2f2"; - sha256 = "055kcpcjbr011rmccns63k21sg8x24yn9f2r45n30pl92irpvmqa"; + rev = "4c8890890426d57f20fc6d459c7631e0bbb50975"; + sha256 = "1vwqg20d83gcfjwmay6yz96n4qnjlampkw58i9r03s0k3kwyik28"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -6096,12 +6121,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2024-04-16"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "08b7268c59f6d4b4030107d9b9fa934f4063d9e7"; - sha256 = "10f9m8jji4yq7pxbrk46wi2s4awvshm8hi6wq50ckwsabfn1wjb5"; + rev = "85180b063e2ba89517d6a407529560733c8447fe"; + sha256 = "193wja69vdsnqfzg4asbrv73qrwrvy481in28qkllwpamzw128d5"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; }; @@ -6120,12 +6145,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-04-19"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "f3a40c744d177862682f0787eef7e5ab0f4e0118"; - sha256 = "1p9x9zqb3lsi6gzp9n0yh62w69im265yg2xp1dfhvzg3nn2s7pkw"; + rev = "ab9351baff839c2ea4b0c1b5d1ad8d4968c7f1c1"; + sha256 = "16764rcq4y520i6y002vk3gq2vlrr62mbw0wvpr0nnv7z6gqrbis"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -6456,24 +6481,24 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-04-20"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "19cd99ec623de29a9d0e649b606a13d1775058af"; - sha256 = "16dj2b3vw9zv7p01qiyf6wnnn3lwrh271kx3b4gismg1zbbrhzwi"; + rev = "bdd6c7dac2038d6495890dd84f451cf9f7425c50"; + sha256 = "194yzgar18idsxrcwqnbs7bp8jib9ypr7kjv3kvz9lm4n49bgvcl"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; neocord = buildVimPlugin { pname = "neocord"; - version = "2024-04-20"; + version = "2024-04-24"; src = fetchFromGitHub { owner = "IogaMaster"; repo = "neocord"; - rev = "014e78cff9f1fc7b3b46ec67fdca68a91a9b7c65"; - sha256 = "1dyw315fhh6fll1gxq764yqlrd7xb153y4g7dvc7rih9rnqi3h4m"; + rev = "aa7a58023166533da83ca7b11c0d2569e45d7381"; + sha256 = "1x4mddm4ax3chmk996w5dw8rzxa7yap356rc68rq6p3016frsmd1"; }; meta.homepage = "https://github.com/IogaMaster/neocord/"; }; @@ -6528,12 +6553,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-04-16"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "0cae7abc30cb91d661f28257c331fcb5b5198e31"; - sha256 = "0alyscd5qhh30p6bsd3qr2h7qsc57yb4g8c0g7abc5z0jsw58cg9"; + rev = "a32f99a83d636ea7cd62cda6e24d76d14e5579ba"; + sha256 = "13skbi6q45rgxngy0gqgzjq18i6n9y98wd9nk4rp5v8x786f3s0c"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6588,24 +6613,24 @@ final: prev: neorepl-nvim = buildVimPlugin { pname = "neorepl.nvim"; - version = "2024-01-03"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "ii14"; repo = "neorepl.nvim"; - rev = "e60b114217248907a3a1d27bab9988a092865ee0"; - sha256 = "11h6r6929g15mg1sdclim1fmnw68sv90z3qjpxl46s0yvffhl3zd"; + rev = "b927ffdbe67fb25ef9e8fd9324234e3d54cfb7f7"; + sha256 = "1yd3kh5ddhldk8y4fc8gn55wh4a53g8c9x7x8313d98162383b2n"; }; meta.homepage = "https://github.com/ii14/neorepl.nvim/"; }; neorg = buildVimPlugin { pname = "neorg"; - version = "2024-04-20"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "e03e82bdf6a2c3173f6e417a63087c7255533b81"; - sha256 = "1n83wjzxd7y8cmbxgmszxlh3anb32cbrzk9zrlfdpawyn2dyby48"; + rev = "9b51b67aa92a77ca3e62f07cc0dc9de2e420166f"; + sha256 = "07lld8g64aznk1hl2iajdp2fbk0bv8f3r5vavhxmqb1ifmwwqkzs"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6624,12 +6649,12 @@ final: prev: neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; - version = "2024-04-19"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "c513218d864d4ccfdaaea991c6de67bdb84bc116"; - sha256 = "0i6xy9xqplv9aii148g1nnwv3shnjqiq9m0gab6gav9l6144mzz9"; + rev = "e78657719485c5663b88e5d96ffcfb6a2fe3eec0"; + sha256 = "19f7q9d0gx1g08c4cyd66c4ldznzgrzi632kv7z0cbk58hisac3d"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6672,24 +6697,24 @@ final: prev: neotest = buildNeovimPlugin { pname = "neotest"; - version = "2024-04-08"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "f03a78cef74db5638e4312e18b767294a90de8da"; - sha256 = "1lvwmgicnqm5r7wg0325ijjfkyl5wyawx7hbzmlmr87g3z1cp62j"; + rev = "5caac5cc235d495a2382bc2980630ef36ac87032"; + sha256 = "1i1d6m17wf3p76nm75jk4ayd4zyhslmqi2pc7j8qx87391mnz2c4"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-bash = buildVimPlugin { pname = "neotest-bash"; - version = "2024-04-15"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-bash"; - rev = "a3480f53300842922ecb79693e64bf51d4f22337"; - sha256 = "1dbjv5zyw5nqqwgqagq0q2255byzgc9ckrzsbm2dc7svqp04hki9"; + rev = "57eab5b80a5296dc3fc5b22112b3ed78da3a5732"; + sha256 = "0sax4fbqykf2rbvhgmnhkz37ma7ck20dnpc78gns2hilg9ng5hrf"; fetchSubmodules = true; }; meta.homepage = "https://github.com/rcasia/neotest-bash/"; @@ -6758,12 +6783,12 @@ final: prev: neotest-go = buildVimPlugin { pname = "neotest-go"; - version = "2024-02-24"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-go"; - rev = "6a2f996d89fe4631942e035b1c114544ee045043"; - sha256 = "1jnsgkmsm2jmjd5zhkf3dhrbc04ysz3n0n28frsbvh839n3cdm7f"; + rev = "27c80deab9cf5cb30b20ee407b3a6c7285518128"; + sha256 = "11d8x7kqb4bxjwc4wdhxv5672i6svyj3k52p44711vlbcfal44j5"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; }; @@ -6782,12 +6807,12 @@ final: prev: neotest-gtest = buildVimPlugin { pname = "neotest-gtest"; - version = "2023-12-10"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "alfaix"; repo = "neotest-gtest"; - rev = "6e794ac91f4c347e2ea5ddeb23d594f8fc64f2a8"; - sha256 = "0syyi8y064pm06nj0fczqqy5dnmmps3ykc4k06jl05pk3jfilhaa"; + rev = "5ebf583aa5d119b6acfd8077578d05638d6a35f5"; + sha256 = "1hk7n0mqhr28flb522922rmjhfb08qphlvzyhf47pjbp25199yxc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/alfaix/neotest-gtest/"; @@ -6795,24 +6820,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-04-21"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "0367f44e49aa64d8b66fc9f736a61e9a60ce9526"; - sha256 = "1yb9l9gac08sqx6maxhfhb1dj796l48gflx1l59l4fxm9sw7djkj"; + rev = "1998a37753e5e364d7d2f8e7889ef8348234266c"; + sha256 = "12kzw16b56262d7iffv286ipyhqmwwgk1klcjrgpsz640s7qyyqz"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-04-20"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "68dd64e296c6da73aacd7ad795ac789e15087ee6"; - sha256 = "03iap2dsawqj1c8jac6lm1knc16ikiwzgp7hnpv2k43vny52l492"; + rev = "d0058e2f389cdcd7b0682aea76300a2fc1b9f0b7"; + sha256 = "05q5flyls4pgk8rzvjdqw0igw45wz23ny61kyjh0ag2b3zky1y34"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -6831,12 +6856,12 @@ final: prev: neotest-minitest = buildVimPlugin { pname = "neotest-minitest"; - version = "2024-04-19"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "zidhuss"; repo = "neotest-minitest"; - rev = "f56e5a84fc89aafb6e0be368a58ad1a6f8723444"; - sha256 = "18xi436a164ly3d1wb0a8pzsa1fb8rshqm4r9rp0da85ms2nl14c"; + rev = "0543bf4e997b2c970707cb297e2f74c438eb0653"; + sha256 = "053j4xm84i5z2a2qpka7vgq462928mg81gwkwvr2jbxjm4h4sk2r"; }; meta.homepage = "https://github.com/zidhuss/neotest-minitest/"; }; @@ -6855,12 +6880,12 @@ final: prev: neotest-phpunit = buildVimPlugin { pname = "neotest-phpunit"; - version = "2024-03-21"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-phpunit"; - rev = "5799a4ea84450af14461d24edbde43913f9b3008"; - sha256 = "00dwkqikfsnbvnmjpv8n7m45g1pcvg20mhj04nfj2lv9pyylmwqh"; + rev = "baae8dfa0a3aaacd9f0bb6845d6348f5bcdc48bb"; + sha256 = "1szdxgydihik1pm0p7p9qa4mib5hv8gmk566fx6xmvzihyi72p3v"; }; meta.homepage = "https://github.com/olimorris/neotest-phpunit/"; }; @@ -6903,12 +6928,12 @@ final: prev: neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2024-04-05"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "c1c3f36e1b1a23698534e6326e90876f87b773a4"; - sha256 = "0yfd23mkvpzddgxxsfnzcix0qr4l1cjfk0i8crw8kzb01n6dh5v3"; + rev = "201f4891b5a0edc2e5f12196f35726f4d4eca410"; + sha256 = "1y8k8zrxc6dnz83n2wlk6h3hsm3jy248a36qc99z2mdijm6n83lg"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; @@ -6963,12 +6988,12 @@ final: prev: neotest-zig = buildVimPlugin { pname = "neotest-zig"; - version = "2023-12-10"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "lawrence-laz"; repo = "neotest-zig"; - rev = "742f97f971a39d44b4832b432083608834a0e59c"; - sha256 = "06sxdbxqfv2wzrw1v0hzsvy4cnynrym3irzi0c43gqiq7k1fksq4"; + rev = "3b94c749e26e2c02e5f07aaea6149a7e417db1e7"; + sha256 = "0irklycyjqjwns5w9jb92x3r012gkhrsjinggxvbwhlj2bkhq6b0"; }; meta.homepage = "https://github.com/lawrence-laz/neotest-zig/"; }; @@ -7059,12 +7084,12 @@ final: prev: netman-nvim = buildVimPlugin { pname = "netman.nvim"; - version = "2024-02-19"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "miversen33"; repo = "netman.nvim"; - rev = "d0ec9d4ca195b2c87bf46ab050130a2c806310c4"; - sha256 = "0043r66vr10qwdd305q4ckizk8lkm0xy4wazm0yfhq37jwrbhh7d"; + rev = "68eecb29d913d4f35efa9bd0e8636046f70f998f"; + sha256 = "1102gyjcj2hb7lfsqgpp2aflhf61qk61l45zka8zcyg7xwlbbhav"; }; meta.homepage = "https://github.com/miversen33/netman.nvim/"; }; @@ -7119,24 +7144,24 @@ final: prev: night-owl-nvim = buildVimPlugin { pname = "night-owl.nvim"; - version = "2024-04-19"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "oxfist"; repo = "night-owl.nvim"; - rev = "94aead739b6223feb19650077c9694e6c1c63fbf"; - sha256 = "0baw75s3r09pf747rm3mni07pszkba5ykk1vky2lqq2ga7xplalf"; + rev = "42b85926978c8cba6ed4a57c84a530449e59904b"; + sha256 = "03fzkrs4qigrbc0rmj6zgfniyng6779hr0811x7i3r747b8p7ksz"; }; meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; }; nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2024-04-12"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "ce0cdf8538c8c0b9c8fb2884d3d1090c8faf515d"; - sha256 = "09hij99myk1ry8sik71sd2cdicaqrhidpkay6yzs0j67wr0705yv"; + rev = "df75a6a94910ae47854341d6b5a6fd483192c0eb"; + sha256 = "0x58pn7lg2l1nm24ry3a42l6vpi6inf1srbanwya01x0yrm74bwp"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -7179,12 +7204,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-04-19"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "78064fe0dbb67d2f449854bd2fe7fc2b1af0a8c0"; - sha256 = "0yh9xalsj4y2yh7avabvnw2jj7b1nl1amsxmcxm9jiz0xw50nkbf"; + rev = "0a8bcbbbcbed43ff86f1c3a19260a7918cc1bf2e"; + sha256 = "0nnbqf4idhgffm125nfblgwlp3wkjdw4krz63cayrs8v13bvix8w"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7215,12 +7240,12 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2024-03-29"; + version = "2024-05-09"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "34625be12649666b7ccb08761087cc97bb788552"; - sha256 = "0g3vbsvxaf5ywaifffkhp0q0kmbw83xbmi7h7q1afdf10gi1xj24"; + rev = "0b3299675e0100cceebfbee06a519bc688ec9df3"; + sha256 = "1gr528pkwd70d97rdly0adv1smgnwskyzrng13i8qdz2nyhix20z"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -7239,24 +7264,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-03-26"; + version = "2024-05-09"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12"; - sha256 = "1plky0f7nmh6g62sgil366m54di9jd86xk7y0nq8pc4m8lv0ga6b"; + rev = "09102ca2e9a3e9302119fdaf7a059a034e4a626d"; + sha256 = "1gzdwgizbl60fqiiiwrzfqbbds182qqlr3gyyzvgxbxijs3ajsk1"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-04-20"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "88821b67e6007041f43b802f58e3d9fa9bfce684"; - sha256 = "09mv5ndk0xnij3nv2p1qcm6k59xh0j2nl949960d24aln4h354dl"; + rev = "f5632db2491fbe02b54f1a321a98548a8ba2bd15"; + sha256 = "0v97f5ip7slgcijg2ydma6g9ihmx65v4z30ibw68rxwjxfcnjif5"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7311,12 +7336,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2024-03-18"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "cbd2668414331c10039278f558630ed19b93e69b"; - sha256 = "1429x2c6j6nap3nzsmsnxflgbs7wbj0g3mi5d2kww8413qvl5gk6"; + rev = "a3597dc88b53489d3fddbddbbd13787355253bb0"; + sha256 = "1sg0b1vq6cggxw9vif7slp2362rw5xz2a0snhhmzz1frd2ckr72v"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -7347,12 +7372,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-04-19"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "f8e6c59985f1d5f820f051395e88064a8d16ef2a"; - sha256 = "1ss67kpn8lkgcdj90yjg69dfdy3w2v32znqc2nbl6hblgmxfakd4"; + rev = "156eeef8ecae812acd79d5eb58070d734a6202c6"; + sha256 = "1jpsiqkgml1x81vc0x2d94k3a3xwbmp7s5wnh9rfdnrrwc6zv5pq"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7395,24 +7420,24 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-04-06"; + version = "2024-05-05"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "4f41e5940bc0443fdbe5f995e2a596847215cd2a"; - sha256 = "0cfi0wmqy8vrrf17s71jyg6c5s8ghb7xjapzhj9l9l6g1s7v9bxm"; + rev = "14e97371b2aab6ee70054c1070a123dfaa3e217e"; + sha256 = "0vbvy8fp32rd3463mhi6qnh21gj2mi227qspdrvp0y18f7anvi1c"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-bacon = buildVimPlugin { pname = "nvim-bacon"; - version = "2024-04-10"; + version = "2024-05-09"; src = fetchFromGitHub { owner = "Canop"; repo = "nvim-bacon"; - rev = "94f684baacf22c65e5ef889cfa943cfc90ee1cf4"; - sha256 = "0b4xpmk6cv6k9h2vqk9773hszwy90d7y3fpjz1yqg9nxfvbdjp2b"; + rev = "ad7b522ae85b7aab4981bcd34e9b513ce5849eda"; + sha256 = "1baki6dfiahilkcgfdspbfj2mv3pf06nj7yamvranzpj04jadlx3"; }; meta.homepage = "https://github.com/Canop/nvim-bacon/"; }; @@ -7431,12 +7456,12 @@ final: prev: nvim-bqf = buildVimPlugin { pname = "nvim-bqf"; - version = "2024-03-29"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "52703d7adc3be3f7c09eea9a80c5b8caa615fb25"; - sha256 = "030mqvi66rr05icqy2lix1v8sf3745a5v06288h6pq4vz4xj5a13"; + rev = "7751b6ef9fbc3907478eaf23e866c4316a2ed1b4"; + sha256 = "088s8n9xwkpcc5jyqa8hmrghbazzcqq44hxrlxp9zclqxpp29z16"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -7467,12 +7492,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2024-04-02"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "ce16de5665c766f39c271705b17fff06f7bcb84f"; - sha256 = "10i720fidv41421as9i2xp4d4kr69zfyvkxjhgv6h41fdi75070c"; + rev = "24122371810089d390847d8ba66325c1f1aa64c0"; + sha256 = "0s4va3b06agy070fkqghx460q20jddvni14gbvjdvgkaf56xn8f3"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -7587,24 +7612,24 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2024-04-18"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb"; - sha256 = "0a75lxhzbwm66c1fa5b7zpsz3i7raljsbq4d3n5h8cfdv8hgcjch"; + rev = "615a1b2046e1eaf7995e0ba8e8a65f344201349d"; + sha256 = "1dmkacc78nkv9lp9h4jb79kisb72zxv3vk5nvq7157cn4zjc6x3c"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; - version = "2024-03-25"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "36abe1d320cb61bfdf094d4e0fe815ef58f2302a"; - sha256 = "1xvf1rag0jnhdr7bd29sdj49f7bbshn5gl10rg8axsb71kqir0a1"; + rev = "5faf165f5062187320eaf9d177c3c1f647adc22e"; + sha256 = "1ml1ln2psdb14bgrpa2zpalgqhimj0qzd28cnkzhhsdg49a19hyk"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; @@ -7623,12 +7648,12 @@ final: prev: nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "2024-03-19"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "edfa93f60b189e5952c016eee262d0685d838450"; - sha256 = "00q07mb401gn1gw666xsc1sp1gvmxj9ilgblrlgjv51pq6vh4318"; + rev = "5934302d63d1ede12c0b22b6f23518bb183fc972"; + sha256 = "0qzbny9dlra0dyfhg4ljywrsnrq373xa9mzawj8nck3kbiv3ia6v"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -7645,6 +7670,18 @@ final: prev: meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; + nvim-dbee = buildVimPlugin { + pname = "nvim-dbee"; + version = "2024-04-24"; + src = fetchFromGitHub { + owner = "kndndrj"; + repo = "nvim-dbee"; + rev = "85622c8d95b53f62329627fd461c52fca7cb612b"; + sha256 = "1nhbs8lniblx4cn9x232qlg6gj0vgmyzqqw49d0994ap9fx90dc2"; + }; + meta.homepage = "https://github.com/kndndrj/nvim-dbee/"; + }; + nvim-docs-view = buildVimPlugin { pname = "nvim-docs-view"; version = "2024-01-20"; @@ -7671,12 +7708,12 @@ final: prev: nvim-fzf = buildVimPlugin { pname = "nvim-fzf"; - version = "2023-09-05"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "vijaymarupudi"; repo = "nvim-fzf"; - rev = "bd095495146a2a827774ad3ad1ef0cc843b5e257"; - sha256 = "0z7da3sfv5dng5aw259aj2r9ghi9hg8h58n9vrmw3jvf683jgzka"; + rev = "c89b15aee136eeb4649901552da37a404415c356"; + sha256 = "1w20gavhjj62alh51ssix8a88crr9xq63zhw5w5j32plpd0gnczp"; }; meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf/"; }; @@ -7695,12 +7732,12 @@ final: prev: nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "2023-10-14"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "c0328e23b815bbe55935945332c5e5dc88092792"; - sha256 = "154vry38gq0kv2ya23pgnbby9hizivyamnv0vcag3g27nj7xk2a4"; + rev = "9b149e6d215870e31a3712de93152c5b4febe23f"; + sha256 = "0rnihq0dz8n60cii5hpd00xam51k5m5jj7lx5s6y4sa7v7dl7amc"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -7731,12 +7768,12 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-04-13"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "e1f68ff238802fdee67c3f8ac547c1832ae2b8ee"; - sha256 = "1n1iqhn67q3fzff4kvqz2ikp5scjbb2wls267aamdqg8apq5dpq1"; + rev = "2d35a04be004e11a1e90a9de98fd2e51847f8f53"; + sha256 = "0szzbmwvhxzy818mv1cnw0ivaalshkifp40yzxgmlr0jkfby3g42"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -7850,12 +7887,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-04-16"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "f098232d70cebe90e27404928c9bc19ca7a5a7b5"; - sha256 = "1xnirwlnby8fr99qkcicwd1npmkx7i557jzvgxfv4m8f4b2vw923"; + rev = "83ee4952a968d89329e5a49b4648831d98124783"; + sha256 = "1v6mwif781gib1knc3qrbxn2alijmabq6aizysjhmqwrvmpklkns"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7886,12 +7923,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-04-19"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "ed8b8a15acc441aec669f97d75f2c1f2ac8c8aa5"; - sha256 = "0rqjcksb0dcvvxnc0r4n499xlkviwp2sbn29r8b1bnf68d7qnapx"; + rev = "94513a5b246cf32a8f87ca714af50911df63351c"; + sha256 = "00rk7203h6w5sq1p4d3bba2q7xa20hp1nzw65qi7rkw9phjfxv58"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7946,12 +7983,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2024-03-02"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "4f9bf0c821092f20dd34c1a4ea5b07b0500ff089"; - sha256 = "05d2v6yfs60n4xli5c682nlczqnib9pg6hxp79fiidhdidrf9zfj"; + rev = "c6268555d0b471262af78818f11a086ddf30688b"; + sha256 = "1bzq2ybqhpsi0f7z14d2kvgn84xfj7zv7n2jpgk1ki0jsdw396xg"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -8006,12 +8043,12 @@ final: prev: nvim-nio = buildNeovimPlugin { pname = "nvim-nio"; - version = "2024-04-04"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "nvim-nio"; - rev = "5800f585def265d52f1d8848133217c800bcb25d"; - sha256 = "0y3afl42z41ymksk29al5knasmm9wmqzby860x8zj0i0mfb1q5k5"; + rev = "8765cbc4d0c629c8158a5341e1b4305fd93c3a90"; + sha256 = "0drzp2fyancyz57k8nkwc1bd7bksy1f8bpy92njiccpdflwhkyjm"; }; meta.homepage = "https://github.com/nvim-neotest/nvim-nio/"; }; @@ -8042,12 +8079,12 @@ final: prev: nvim-nu = buildVimPlugin { pname = "nvim-nu"; - version = "2023-03-07"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "LhKipp"; repo = "nvim-nu"; - rev = "f45f36a97fb0ea6e39f08cc2fac7a2fb3dc3999b"; - sha256 = "0sck8ac7f2b46yqv0v114jakf934z4z2x6pix0fiipgyfza2vfax"; + rev = "64e1677db3319ec5900afa666a2c85c31adc0705"; + sha256 = "0cgdky2zai7mfshac2szfq346i0ql9c4miax10hz76kb2nq8v7wx"; }; meta.homepage = "https://github.com/LhKipp/nvim-nu/"; }; @@ -8150,12 +8187,12 @@ final: prev: nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2024-02-24"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "6295b6cb30725c343a8986096c9f04b0e7646c52"; - sha256 = "1rplgghm6xr803xhgshrnbs4qvda4331znywsfwycxqyl7zvynsf"; + rev = "1184a8734e998649f3bb9a5db9efd4543282050b"; + sha256 = "0lgqiwnsm4ahgkv7qnxyi48m2i7wybxkxv29869v71bidnbkm6yb"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -8172,38 +8209,50 @@ final: prev: meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; + nvim-sops = buildVimPlugin { + pname = "nvim-sops"; + version = "2023-07-31"; + src = fetchFromGitHub { + owner = "lucidph3nx"; + repo = "nvim-sops"; + rev = "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef"; + sha256 = "0fvxnx5ji3d4kgsxl2ssqs7s567ibk4h38mz70m3nhs3sxk696lj"; + }; + meta.homepage = "https://github.com/lucidph3nx/nvim-sops/"; + }; + nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2024-04-17"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "9653847cf2f225648967f6e9363643e327387579"; - sha256 = "15866wdyck6snm0iz9iqd036wqkbfwnliwd5f220r9g5v3cwg5lg"; + rev = "4651801ba37a9407b7257287aec45b6653ffc5e9"; + sha256 = "0xna3g63ypagl4jxv9m0kfjzlqnhnlhzjm1gapgmmrzbcb9m3ml3"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2024-03-31"; + version = "2024-04-27"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "828444de406bc7df3b30c8e000ce6f54f0754499"; - sha256 = "0jar0wqkq4hc9vpw0z1jk69a1jk22bbqn01g1pg7pf7n9m5363zb"; + rev = "76819082ef964db1f67f92454e18ad28ae34b37b"; + sha256 = "1g0c3lids9kww2awsz0ykgvwm7945a9nvxg96iads735hfwc7p49"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2024-04-11"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "a4e30d33add8a9743b4f518b3a788b3c8e5def71"; - sha256 = "09m95jd84y3b2wrair263f0csqqdx8h45fjq9jrr4f3108494xc1"; + rev = "6d0dc3dbb557bcc6a024969da461df4ba803fc48"; + sha256 = "0ig2izp7jhahri926avzwpzz9qklbnvpma6n9m7mfipf7jcn95rw"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -8246,48 +8295,48 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-04-21"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "ae8e46e8fabb32fa3ae5319383ea2c8763f14caa"; - sha256 = "0cb4p6bndid12h2bjdj5ybksqjmwv1876jx5a2wlj6h0q50wfjs0"; + rev = "78c4c083ed5d47e7fab7627d78ce33d3bcfb88f0"; + sha256 = "1jchdyck8031ldgaracq4zc00026jyvhfcpp8p48z0ka8ypvkp9d"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-04-20"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "ea4f6d5175812a3f48302d638a766bc18fcbb04a"; - sha256 = "0smghl0nv4w1rpn7gqsq6lbarh5nzbhvi8pfysh5f7am0p42y86m"; + rev = "0d2c80b4d00c8f793e17d2d1d24d4aa5aaa88bc2"; + sha256 = "0xs16s5g6i9g78xciq0ija5ak7jfdbz7b7dfgg5gca284xgl2ccq"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-04-19"; + version = "2024-05-11"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "ba4289ad345ececd335a9cdd7b9616fd0bb6be92"; - sha256 = "0cfklfz2anc8021qi0q8dbrdmnndnd073azgsiwaagbh75s3sgh1"; + rev = "1e52a2c4223c1e7b0def9c76a1f3757d372196c3"; + sha256 = "02gn7fqmyj8ly8799vjdw1kxklpr710arvlb9gipd9rjmq7vjw0f"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; nvim-treesitter-endwise = buildVimPlugin { pname = "nvim-treesitter-endwise"; - version = "2024-02-15"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-endwise"; - rev = "60e8c288e011403f248b5f6478dde12bed8a6c55"; - sha256 = "0dly21jk1wm80s7ypwpwfm4mx1srbmaww0441854dwvh2s7j634v"; + rev = "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6"; + sha256 = "0rx5dyhli5hwzh94lwjj71gs0k7vk28zlq01pvk9y3b1n50r6qkf"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; }; @@ -8318,12 +8367,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2024-04-15"; + version = "2024-05-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c"; - sha256 = "1jvx9nbz5sh09jnlcqm5qfyjvryibc3fpnfxim7adk5gb4160xws"; + rev = "dfa4178c0cadb44f687603d72ad0908474c28dd9"; + sha256 = "0y0sv6dhhghhxihmyvpwrvvbgi2m90m8vdmi3x09ap0yzfn2nmq2"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -8354,12 +8403,12 @@ final: prev: nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2024-04-17"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "a6382f744f584bbf71d0a563af789af7190aabda"; - sha256 = "12b12ndva3ck5y18mkmhzkbmaz65kjkqsjxvq5gfniz1br7n2y9j"; + rev = "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f"; + sha256 = "0b4cx7k53w3cjfnp6nyvvpi1dnnpdp4j67sszsra61fk8pyqp4w2"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -8390,12 +8439,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-04-21"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "beb6367ab8496c9e43f22e0252735fdadae1872d"; - sha256 = "1qqwfzfk5w2sfaavfa2nn01caj753j272hpnhmvgwknfgvl9cv81"; + rev = "5b9067899ee6a2538891573500e8fd6ff008440f"; + sha256 = "0d7gzk06f6z9wq496frbaavx90mcxvdhrswqd3pcayj2872i698d"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -8474,12 +8523,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-04-19"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "ec0f44e1921d2701bd99a542031d280f1e3930b5"; - sha256 = "1b9b72yrp1xfkag41hxjk903payfrcnjdi7lr5880183mm0im04w"; + rev = "2e1f03416583232899dc1b6e27673da5e705abef"; + sha256 = "1c3zxz60g7jgm3cd9xhzp73qa218b1z6rfiaf9n4wcbzb88c8scl"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8522,12 +8571,12 @@ final: prev: oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-04-19"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "1f05774e1c2dbc1940104b5c950d5c7b65ec6e0b"; - sha256 = "0l6y9xnz8l7flq0jlh9xxnsp9inny9mbbqg2j2sg0rivq630bbnh"; + rev = "010b44a79d497c697686e2727049d3dd215bbbd6"; + sha256 = "01hkrb8ddy2ivmfycxbx1lx756vjgkza0izc86gr5aa2l6dgvh18"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8583,12 +8632,12 @@ final: prev: onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2024-01-29"; + version = "2024-05-11"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429"; - sha256 = "1npc9x2r0aass9swxmhryia90ar7f4nx8j456jzlf66lzbr8xrnp"; + rev = "8e4b79b0e6495ddf29552178eceba1e147e6cecf"; + sha256 = "1xxa0q9val9hl5jby2zqn7wlh0vkibj3s8mbmj8vfba4afqlqi0q"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -8643,12 +8692,12 @@ final: prev: onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2024-03-08"; + version = "2024-05-09"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "ce4aacbaa50b6b44a3e69eee6a3f380e96ccdbd0"; - sha256 = "1i1n746bf0gfmq22ajj2p4f7819sql4f051gwjmcypd1hrn651lh"; + rev = "f1e25fd839442d4b3c6bd36cfc7fa56edc629671"; + sha256 = "0a24km5pd7r2zj0bwzi6wmnkf0lxr9gd82k6x4ybm5777z4bp66r"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -8703,12 +8752,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-04-19"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "389e91f6f935aa845bc0cd13dd80f75431c34751"; - sha256 = "1fzckfi00bb4mi5l9wadhgv98z7fmlgryx24zipcr7k98pdaw36h"; + rev = "cda615fa7c8607bfb7aaf7d2c9424dd5969f2625"; + sha256 = "0wrayb63hd68kjjpkpmhjschw609cs4pb7lsjxnvhz3qifwiysja"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8727,36 +8776,36 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-04-09"; + version = "2024-05-11"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "e67aa5082c65eeffd8a57b672e1353e8cf2ca7a9"; - sha256 = "0223cmm4hg9c9ywifr0c7zk091ny5sndarkq7sa9vk5vmar5sz15"; + rev = "5cd161f28835fada50d99c89dc05041565a27bdb"; + sha256 = "18vl93j93s9i22ybw3vl129kvhz8382yg8b1r1m0xnfyiklpkzg5"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; outline-nvim = buildVimPlugin { pname = "outline.nvim"; - version = "2024-03-16"; + version = "2024-05-02"; src = fetchFromGitHub { owner = "hedyhli"; repo = "outline.nvim"; - rev = "bdfd2da90e9a7686d00e55afa9f772c4b6809413"; - sha256 = "0dc3yndh7fy8fvhh0pr97850bq0563jlqrxi9bb9sm6hzdkvnp92"; + rev = "dbd836893fb99cfc33119d7c4abbdb700210f54b"; + sha256 = "1sy82vh9629wwyvc1j3q0vqfj7vichw90kl4vsa087v8sfn8r35z"; }; meta.homepage = "https://github.com/hedyhli/outline.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-04-13"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "dd701ed0639ef1e10d0ca8dec039719e916c4a7b"; - sha256 = "1xr0xzf5h1r8ax6djvq1vq936yqmvwa4l0hbjqq090mgnj60arh5"; + rev = "7ae60fcf9b1d9ad661e8936d50c6e3853b7c3cc0"; + sha256 = "1wdrbz31n6f09ppvc129zadizabnaxy88gvcnwr9zn2xlbh1ndfi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -8872,12 +8921,12 @@ final: prev: persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "2024-04-04"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - rev = "ca9900c31ee6e254a0ba7011ba49f48ebf4c8db2"; - sha256 = "0s9g1jmq1qzkxi1gcvmyf0nmwgqrh11r0swy9pl32916k37zvqzl"; + rev = "1e9fd63e25bdbb5dbb6b8b10f817b2446977146c"; + sha256 = "1y61izajz6p2b1vfa20f3j5rl1fjbfmbzny3ywkfai4dsnrks8yi"; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; }; @@ -8908,12 +8957,12 @@ final: prev: pest-vim = buildVimPlugin { pname = "pest.vim"; - version = "2023-06-16"; + version = "2024-04-25"; src = fetchFromGitHub { owner = "pest-parser"; repo = "pest.vim"; - rev = "78a65344a89804ec86a0d025a3799f47c2331389"; - sha256 = "01bc7c3hddz6lnmpzrlah8i0llr976a1lyazslw194r5ig1hb0id"; + rev = "7cfcb43f824e74d13dfe631359fff2ec23836a77"; + sha256 = "1vpfh4nyxwbndqv4hmymrqskjc5l2dyiwfp4s7mhpdcnq950q1qi"; }; meta.homepage = "https://github.com/pest-parser/pest.vim/"; }; @@ -8956,12 +9005,12 @@ final: prev: plantuml-syntax = buildVimPlugin { pname = "plantuml-syntax"; - version = "2024-02-22"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "309c15c77794433f276fb09eb4e3b8f381003cfd"; - sha256 = "0g7yprik607gy01lamql1kpk25sdl54ckfrc9p11rrimal7rms38"; + rev = "44054d6d2cbcf01a064858faa3364cd30d38057d"; + sha256 = "0kwk96y6cn7l7w151438sdjflfc6c6irysg00b1q4h1f4x3fcfvq"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -8980,12 +9029,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2024-03-25"; + version = "2024-04-25"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "8aad4396840be7fc42896e3011751b7609ca4119"; - sha256 = "06ahw1mxjp5g1kbsdza29hyawr4blqzw3vb9d4rg2d5qmnwcbky0"; + rev = "08e301982b9a057110ede7a735dd1b5285eb341f"; + sha256 = "03x9mxxqscahs3plml9pw0q6yacyiz6nvw4pcbpqlcqj99f0qbdz"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -9270,11 +9319,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-04-18"; + version = "2024-05-11"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "7ef0766b5cd2f5cdf4fcb08886f0a2ebf65981fa"; - sha256 = "0pw3dk0rnaa2llvgkqar1j5wqrh3lah2ygvxaqiy7760pyanh38c"; + rev = "dd1156723eb8483e4403eb8765bbdff456b6981d"; + sha256 = "1cj3hylb73wqgllr5wnqjlzlwqr9s4f5yb4g4s2lra4g7a08grxj"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -9413,12 +9462,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-04-17"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "20c5b5259afa7f4867474cc463211d64c93ba371"; - sha256 = "0ysmzf2lfry8abaajjanp3b3358nbgd2d2zs9qfjyrbk0fmqw0gc"; + rev = "f96edb54a2940322bc7ed81a1031be04db7d3a99"; + sha256 = "0yfmpkwx38ynwyn9prkkqqaqgi55dam9zswjj3nls30rxahqvg1p"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -9533,12 +9582,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2024-04-21"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "dd4d5d8d1313f0bb343af90e2432ad2f2a9fedaf"; - sha256 = "1zph7b9vdd96xai19g6di48r5p5px0pz8kkq5hfkriq2apygpb99"; + rev = "1c3d3a75bebcb16df2a093b147ba498185e4ab17"; + sha256 = "1azz03ypygh1fk2gva9fyg294v8i3qig7yz4hncf05jm94wq137s"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9581,12 +9630,12 @@ final: prev: scnvim = buildVimPlugin { pname = "scnvim"; - version = "2024-04-19"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "davidgranstrom"; repo = "scnvim"; - rev = "94e49fa6c596813247549cd594f5ab6246c79973"; - sha256 = "1axbrakr3xpmvbdslh803xam72fg6ar428bgz04h0j2ygg75bqmy"; + rev = "4777c0d661ea3776049b76d1328afc9879146420"; + sha256 = "0y1qgfbza4v97ap0awpqh3f0zi94wwsc0jd391jvhjr18crankdl"; }; meta.homepage = "https://github.com/davidgranstrom/scnvim/"; }; @@ -9629,12 +9678,12 @@ final: prev: searchbox-nvim = buildVimPlugin { pname = "searchbox.nvim"; - version = "2022-10-31"; + version = "2024-04-26"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "searchbox.nvim"; - rev = "110949af8963185b4e732b45ae57beb731bfcede"; - sha256 = "1dahiggnc8hqfgd9akxlsyck7gxz05w0phrvahc5g1kskyr0q7h7"; + rev = "6cf79dc53794b06a95791a034341f1332e04dd58"; + sha256 = "138wazdwncgknh4jmaa22i7q8fa8qgc18085xykfvbcf9ljvi0ya"; }; meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/"; }; @@ -9774,12 +9823,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-04-19"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "95d11bfc83263236431ead7dc017f5ab0ff992ca"; - sha256 = "0x9s5801si869gh7jazlfd9asiwk5fkr1gv67qf7bs55pc0z9rbf"; + rev = "159d4479a402d7f40cac1c097fa565fc2ba02cfb"; + sha256 = "1hkx6c3krw0hsrz9jvja5c0cwk3vy3gm6z0imw1m4h3gddmijh8y"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -10183,14 +10232,14 @@ final: prev: suda-vim = buildVimPlugin { pname = "suda.vim"; - version = "2024-04-18"; + version = "2024-04-25"; src = fetchFromGitHub { owner = "lambdalisue"; - repo = "suda.vim"; - rev = "04469d855e36fffcda6be036eb7ff005f64fa0d6"; - sha256 = "18igbn0ldh3mwf8qlnfbbidk88l1wfjx1v95dmdwd1xif642bppn"; + repo = "vim-suda"; + rev = "b97fab52f9cdeabe2bbb5eb98d82356899f30829"; + sha256 = "12chb6hv6ynl54dzwb7qz6rf9vwjglxfnzcmmhc2q2wm0y264gbi"; }; - meta.homepage = "https://github.com/lambdalisue/suda.vim/"; + meta.homepage = "https://github.com/lambdalisue/vim-suda/"; }; supertab = buildVimPlugin { @@ -10353,12 +10402,12 @@ final: prev: tabout-nvim = buildVimPlugin { pname = "tabout.nvim"; - version = "2024-04-20"; + version = "2024-04-27"; src = fetchFromGitHub { owner = "abecodes"; repo = "tabout.nvim"; - rev = "c442ae7788c30dbd41d259c51df4046cb8269a96"; - sha256 = "0rd451fz9i6wbyzjrdkjz4phwlq8fz1lcgmbdjrjxvax3hkpbbqx"; + rev = "26cf934f872e2fbfab55d572c5eb7dad0e82238e"; + sha256 = "157zglv8l9qdkralyddnfi6zavr3km6wcxk2x4hs5vg1pi60v8qa"; }; meta.homepage = "https://github.com/abecodes/tabout.nvim/"; }; @@ -10473,15 +10522,15 @@ final: prev: telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2024-04-17"; + version = "2024-04-22"; src = fetchFromGitHub { - owner = "renerocksai"; + owner = "nvim-telekasten"; repo = "telekasten.nvim"; - rev = "24fd8c1e7eb989dba9efa5d174e42870f08da8fb"; - sha256 = "1ky0035jar8i06k8w4mkizbcyiib393zk3cwr14fnsvq94jp23bs"; + rev = "319276a7853ff996b7bb1ed4250d8047c84ad29d"; + sha256 = "05b8a9h8ni5pmj0x9r3pc8j4h77nbj2s6wmlx20w4h2vmwwp7k26"; fetchSubmodules = true; }; - meta.homepage = "https://github.com/renerocksai/telekasten.nvim/"; + meta.homepage = "https://github.com/nvim-telekasten/telekasten.nvim/"; }; telescope-asynctasks-nvim = buildVimPlugin { @@ -10534,24 +10583,24 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2024-03-24"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "5ee5002373655fd684a4ad0d47a3de876ceacf9a"; - sha256 = "1ar218ymgx6432183xvd0rinnv0gwiqic9czv4z9hiwxgw9cwcfd"; + rev = "4d5fd21bae12ee6e9a79232e1c377f43c419d0c5"; + sha256 = "01dpbmcjnd2iwwiw0zawhh7d1vh4x3wvqf55w7kh4b111bl9399z"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-04-06"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "94a532cb9c4713db83acf5432f5aadfd096e2af9"; - sha256 = "17243ls89kdalb0vlx84blwxan9g8xdin9fvzyk5xkb8b1wbpz5p"; + rev = "6b6565e6584c86ca501bdac485cbdc2ca64556e4"; + sha256 = "0rmj6sk7yz5qmn6mdpcww2lgsq9q4x7r166a8lhwlm8ch3lddcf6"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -10631,12 +10680,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-04-21"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "bd6b110a08cc5b7c098020325ff55218a5b249da"; - sha256 = "1dj6bdx98596l2lnjcdd2c5zm5j00cid0kdb0zd6vhv1jfw8zqsx"; + rev = "bfffb3a8cf1c0a4e615622c400fe13de973fe96b"; + sha256 = "0ghrnb76ls1wnmjw525n9d203fc4y17azs8d6mcms4wf7kx7k4ag"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -10667,12 +10716,12 @@ final: prev: telescope-sg = buildVimPlugin { pname = "telescope-sg"; - version = "2023-12-16"; + version = "2024-04-22"; src = fetchFromGitHub { owner = "Marskey"; repo = "telescope-sg"; - rev = "68289496f5612a756953756f8d1e8cc0ecee9e5d"; - sha256 = "07fnrqrf59krvql35zayggl42icgjv23k5sqwyv5vz1wmsp4j1pg"; + rev = "caceaa670f26a581fb20ce99576ed8155c3ae96d"; + sha256 = "0aii4vy97zyh2fpdkawwdanwd7sd0751ih5yznjcwn8cvrv74wl5"; }; meta.homepage = "https://github.com/Marskey/telescope-sg/"; }; @@ -10715,12 +10764,12 @@ final: prev: telescope-undo-nvim = buildVimPlugin { pname = "telescope-undo.nvim"; - version = "2024-03-26"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "debugloop"; repo = "telescope-undo.nvim"; - rev = "d19e2edc8b18d03283bd91f67310ac300ad003ce"; - sha256 = "0pp98xgdgcpykbsm56bj6w9j178xricds7hsqzwgcckf4zwknn01"; + rev = "95b61c01ea3a4c9e8747731148e905bbcf0ccaee"; + sha256 = "17imd6f1qykxv4wk67ihj7ir07yvcmrr0cqvidv1as3k77riclxb"; }; meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; @@ -10751,12 +10800,12 @@ final: prev: telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; - version = "2024-02-11"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "natecraddock"; repo = "telescope-zf-native.nvim"; - rev = "c8ac635fb51065bb3a77f51bcec585a8dddf8652"; - sha256 = "19a3p666wdjbnar1ifk73yf02i6gr24818svawsh8h1hsva0zyn8"; + rev = "242ee15047e3400351982ef162301a898ec5cdda"; + sha256 = "1kdjqi046nr052q9m50814k2df0nnmylgk8lcragc2z8sdnj5f73"; fetchSubmodules = true; }; meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; @@ -10776,12 +10825,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-04-21"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "7d1698f3d88b448e0639974248cc17f49b7b8acf"; - sha256 = "1k3fhgpakr1b8x9fk7sq699h3479k8x9yc3jbq7xq2jk7p0n4m62"; + rev = "fac83a556e7b710dc31433dec727361ca062dbe9"; + sha256 = "0caam3dm86z9g3qw1c418pzsqhzq8yvzpf26j4sbczrvy6s1x0aa"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10812,12 +10861,12 @@ final: prev: tender-vim = buildVimPlugin { pname = "tender.vim"; - version = "2024-03-21"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "1cc8cef28ef10575bf72806959e72d35fec5dc5a"; - sha256 = "0i1ffzz88w2n3ja2kip5fhy7s8klb0r7av62fn5pmhiy0pkn09vp"; + rev = "f361e9d907d2e5df703ee995f9032021ef674f2f"; + sha256 = "0fx7cc3xh5bpd1c6jlgp4qxlh6bfzgja7mf9mp84lhd6gj9mfqy6"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; @@ -10884,12 +10933,12 @@ final: prev: texpresso-vim = buildVimPlugin { pname = "texpresso.vim"; - version = "2024-04-18"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "let-def"; repo = "texpresso.vim"; - rev = "30f9b8277b18326e0aa6882fb96d51bc1b40a222"; - sha256 = "1iagc7kld327mkkravk30dz2a0dq4i8718w0k1jrlj0z54981gbn"; + rev = "1cc949fde8ed3220968039b6b1b6ccdd9f475087"; + sha256 = "15il903x1li60ys6ni77qs4xfsqkwrkwkxijda5j166xb2gq89wr"; }; meta.homepage = "https://github.com/let-def/texpresso.vim/"; }; @@ -10944,12 +10993,12 @@ final: prev: tint-nvim = buildVimPlugin { pname = "tint.nvim"; - version = "2023-08-28"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "levouh"; repo = "tint.nvim"; - rev = "862835626941d263466754b9c8e2ce2cb004f5ac"; - sha256 = "0m00zy9ihmwh1f28sk92rbrfd3h4azc41zzpy4jbh82gbnq8k4ks"; + rev = "02bd0527a315a80e4e25bb2dd7b6994fb0daae01"; + sha256 = "08bhm1p78xh692vjvg870k73kiaz523gffcs8dpzr2zqqa086jkg"; }; meta.homepage = "https://github.com/levouh/tint.nvim/"; }; @@ -10980,12 +11029,12 @@ final: prev: tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; - version = "2024-03-05"; + version = "2024-04-25"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "63e9c5e054099dd30af306bd8ceaa2f1086e1b07"; - sha256 = "0ynzljwq6hv7415p7pr0aqx8kycp84p3p3dy4jcx61dxfgdpgc4c"; + rev = "53ea7eab504730e7e8397fd2ae0133053d56afc8"; + sha256 = "13cbfjiq3d6vvzbbp31ssy6x0lbd6d1y67b8x3jq6cf5jfi0as1z"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; @@ -11029,24 +11078,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-04-19"; + version = "2024-04-22"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "dca1c80fb8ec41c97e7c3ef308719d8143fbbb05"; - sha256 = "11rmk7hpmf75n0lgchj7hvsw9915m493hlgqsmjkkyhs9w0bwb4n"; + rev = "066cccf48a43553a80a210eb3be89a15d789d6e6"; + sha256 = "1z058jxwcynwyw6fnkjsqdpnmbl9pa956fnm1x4w96hy00d5pklq"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-03-28"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5"; - sha256 = "10fngz9assyp6rby36v0qdg5brsrxs921pp984ifyk8c8d4sdl12"; + rev = "67afeaf7fd6ebba000633e89f63c31694057edde"; + sha256 = "0mn7hq0ldg7g4gcmnb7lajilwa4wl1h7an92ffdpp7yy01p0yhdx"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -11089,12 +11138,12 @@ final: prev: treesj = buildVimPlugin { pname = "treesj"; - version = "2024-02-09"; + version = "2024-04-22"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "60e27280030f9cd8dfb6ceb335922c6ff76682cc"; - sha256 = "1rrcnldpl9d4fifk48w6sgrar0zhi6pbd6iqildzp3bmhf83smd1"; + rev = "e1e82ab4237619d342c7102c9f13d4b9833bfd39"; + sha256 = "1sfrcafs9i69rsy1m3ng2qfibs5bncsfbggz3apsdyv6vxnzw28m"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -11123,6 +11172,19 @@ final: prev: meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; }; + triptych-nvim = buildVimPlugin { + pname = "triptych.nvim"; + version = "2024-05-06"; + src = fetchFromGitHub { + owner = "simonmclean"; + repo = "triptych.nvim"; + rev = "41dada0eb0f7c2b9d504df952be8535afab33115"; + sha256 = "1h4hg5fxhvswcldh6lfn5sx8xbqn6kfzwk206c7xdqid1c4rcvw8"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/simonmclean/triptych.nvim/"; + }; + trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; version = "2024-03-29"; @@ -11209,12 +11271,12 @@ final: prev: typescript-vim = buildVimPlugin { pname = "typescript-vim"; - version = "2024-02-04"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "e83ccab88c7a045ce795583adb66956afd464a31"; - sha256 = "0zjdwjvp9wk7gb1h569c2h5fsmr41p51wz7k0kiig4xfz1i9s7yg"; + rev = "eb4d90d3e449b4a3c1a17f56e4429ff4e0a6b3a6"; + sha256 = "0nczd6x91i1p56ndkw3m5lhcq3madqcyffzb3avr9zqwlmw36aas"; }; meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; @@ -11245,12 +11307,12 @@ final: prev: ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2024-02-22"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "6ecf7461d44513af89f8257f057fcc99e9297612"; - sha256 = "01dj9fdzaliwpxh358dql0ndvnykqn8v9w20b7pkn09p1airq937"; + rev = "042587c63b2b2776a83337748d53dba8b67ec545"; + sha256 = "1636jwzim6v3sf2jfrbvc1p5x38ddhjfsssq2v31a3rzkyv74qg3"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; }; @@ -11293,12 +11355,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-04-17"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "ac4d817f5e18a0b462b23dcd124f849633d650fe"; - sha256 = "00dsvdqp02bf8zvnk8ljn0f38wb38h8iabsrarycl2a3v6jr8lgr"; + rev = "daa7dc3c20bb837ef3aacbee0f0158c79ae14d96"; + sha256 = "0baq40wn0nlni61jsxg141zm77qkrry1vmjphfr99gbr3iyc1fi0"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11353,24 +11415,24 @@ final: prev: vader-vim = buildVimPlugin { pname = "vader.vim"; - version = "2020-02-13"; + version = "2024-04-30"; src = fetchFromGitHub { owner = "junegunn"; repo = "vader.vim"; - rev = "6fff477431ac3191c69a3a5e5f187925466e275a"; - sha256 = "153cr1mrf5w5lyr8374brwx1z5yl9h0cnijxnd3xikh3yi3pbmwk"; + rev = "429b669e6158be3a9fc110799607c232e6ed8e29"; + sha256 = "14j4a55hhi7jbk9aafzl67w2w0dn0jyspddal430cm7rhvvv7k5d"; }; meta.homepage = "https://github.com/junegunn/vader.vim/"; }; venn-nvim = buildVimPlugin { pname = "venn.nvim"; - version = "2024-04-18"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "jbyuki"; repo = "venn.nvim"; - rev = "a5430d75875acbe93e9685cdeb78c6eb2a329ed5"; - sha256 = "1dwl75chqbp888yp2ykyqszz0glli2vx2cbw3lsgnrzlhql53alm"; + rev = "b09c2f36ddf70b498281845109bedcf08a7e0de0"; + sha256 = "0mhkmccr3l9ggqlr0gzc5fcdmx7ap66gqbihdnkc4mbn9jipcp0h"; }; meta.homepage = "https://github.com/jbyuki/venn.nvim/"; }; @@ -11389,24 +11451,24 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-03-30"; + version = "2024-05-04"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "9cd59bb0cabd34fc093f561f97041be71fdade33"; - sha256 = "1aa2rr4z2f5nps2g3nzjs1kshszk8vbx4pwsr4x1a1llyi9i8gqr"; + rev = "41b6887ff6589228c7d4f213259d8e274b0f9ced"; + sha256 = "01whpq420w2ki00wpiz1dwbddxwzyq485rrw8mxbbsxsgq8plzfw"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; vim-CtrlXA = buildVimPlugin { pname = "vim-CtrlXA"; - version = "2024-04-07"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-CtrlXA"; - rev = "cb520cd3f9248b9ede236ff3da8ca3e0b68b6459"; - sha256 = "1csbmjrdrlqsagz5b6hryrcglfdplwc7d26q4r20w37zx3f9qzw3"; + rev = "d5c463d7a9b1249b3ecc03f796639fadf391c05f"; + sha256 = "18jj5vqwz3xa3c9hyc1l0dcjnnxyb9a1wj4r5zg01ida5gsv3dkf"; }; meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/"; }; @@ -11737,12 +11799,12 @@ final: prev: vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2024-02-17"; + version = "2024-04-24"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "d9f42cb46710e31962a9609939ddfeb0685dd779"; - sha256 = "1a4pcyzvqsmsvz7fxf2h5b4v3xlsqv15qyr35xniji44196aaajc"; + rev = "ff0f9a45a5d81d2c8aa67601c264b18c4fe26b15"; + sha256 = "1bw6xfc4l41g3rmvyvyxvvq3iyjb0adn5yfamaxi3jkamgc09ik3"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -12401,8 +12463,8 @@ final: prev: src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "faa65935660a4596414fe21d57e2110faeb9e869"; - sha256 = "0q6nzkvlv7igkg7k3p52rsqnxcd7l70lnlmlh9mjqhfaphpw2j8w"; + rev = "950e80352b325ff26d3b0faf95b29e301c200f7d"; + sha256 = "1f0q7ziqjsgbki0r3hyb0wd2cqmbap4dv7dbx0ydf7fxf6881bwx"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; @@ -12445,12 +12507,12 @@ final: prev: vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2024-03-07"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "960bbb7de11b7282a68d579a64e838b487934493"; - sha256 = "0x7ax3d6srqa8b7hhnyxh8rp2f9aiv5z5vlv5n6mjgjgcpbqydg6"; + rev = "37523ffe0849b51db07fa7f48430c2aca5420a0e"; + sha256 = "0lcdpmppy4h0q700z9jkn3k5w0kpfv4kg87mvr4wmzh4pcxac5gh"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -12469,12 +12531,12 @@ final: prev: vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-03-27"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "066922699bdf1c6e14d517b844454b12b93ce25a"; - sha256 = "0zqzn7lqgaf9iw49iik0g115nx7ny9z43db9cmxkk8lp5p660v6b"; + rev = "b1675d1f56c12b0abac2ef74b94670fe27adcf93"; + sha256 = "096rg4ydxyz6md2qla01wsgv9j00ysf6chxz9nyvp37w4av3illq"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -13009,12 +13071,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-04-08"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "dac8e5c2d85926df92672bf2afb4fc48656d96c7"; - sha256 = "1m33vpkfw1dx3kxxgw8r278a5rch4sd3ngc9mbnap97f0q8karm6"; + rev = "ce882460cf3db12e99f8bf579cbf99e331f6dd4f"; + sha256 = "1sc586alzbfhznqkkg8ck2xmkvchmvaa2w21iqk33sxnkmwfxs6j"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13117,12 +13179,12 @@ final: prev: vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; - version = "2024-01-05"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "67ef116100b40f9ca128196504a2e0bc0a2753b0"; - sha256 = "1haxh6m22f03lz30q8389hnfn78v4zpx3r6bibvb96v7swpbxqdi"; + rev = "e801371917e52805a4ceb1e93f55ed1fba712f82"; + sha256 = "0aa3fphgl0c0y3lmivvfmvrqrs5iqn5dkvdv2jhl1q73y6pnhxiz"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -13767,12 +13829,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-04-09"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "a2777b4b113dafc639f541ad4f0f7da0adc640f4"; - sha256 = "07dwja75dlwjmn687jbk56yz3srijjagppqn7xyl4bzd0svi4s97"; + rev = "a621ede3bcf551144358c112ba1f4e6c2e84e092"; + sha256 = "1ih2jd14faq80jdxrz42pdmcnz3k5pl4h5hn90x03w1m14bkpmxz"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -13803,12 +13865,12 @@ final: prev: vim-lastplace = buildVimPlugin { pname = "vim-lastplace"; - version = "2024-01-05"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "a715d602745cdb1c35cfe73c50d3dd266eb5a349"; - sha256 = "08rqvaqxvm7h6xh5fqbqf8s32nrs2h817j2aw2mj40jiwgsvmkfc"; + rev = "cf0abc5f89c88f0c5219abe89334a8a3ef91fefd"; + sha256 = "1c8wgq1w8dg32l8hga695wdisb7m42nl3nzpwx5ywfr1vjwl6ah3"; }; meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; @@ -13863,12 +13925,12 @@ final: prev: vim-ledger = buildVimPlugin { pname = "vim-ledger"; - version = "2023-11-06"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "281346a221434574dd7f8767a352b2bf0b218b74"; - sha256 = "0fa5b41qlall8z2pziwgc43sj24kpavrhdz9amwwsiv2g9wl5cli"; + rev = "7b97c8765bf920e92fd950a7a5bc37cb2b13a494"; + sha256 = "0g66k9rrvdw0pkh7sqsdcms9viybqsibp1wpscync29ign7y12fa"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -13947,12 +14009,12 @@ final: prev: vim-localvimrc = buildVimPlugin { pname = "vim-localvimrc"; - version = "2024-03-18"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "841a0645272a485564b8739df91c81bcc03da899"; - sha256 = "0v5yqw5qv3xjl6rhzj18mmdgj8wh12gqvql4yyz1fddf39nkdg69"; + rev = "ee9df429b91d3e6ea33e173ef864b02c377036d0"; + sha256 = "1f5ld9fm4fysgz9xixqkv3a87gvisc0w9q31alb6ypk3ib697c57"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -14031,12 +14093,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-04-20"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "4b3732c31b408953a1bb0fca6f003400abb5bfaa"; - sha256 = "1p02j2k68csvcp5wshhzk29byavsc76gpj7a935smirj9d8nhcmr"; + rev = "54ade15279bc11eea0780bf06d191e6e97c3ea5d"; + sha256 = "0hcfr8bvxp442sls8iyw43gc9k7kwh3y47v777smz3als89pi76f"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -14103,12 +14165,12 @@ final: prev: vim-markbar = buildVimPlugin { pname = "vim-markbar"; - version = "2024-04-01"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "94ac768d97b447c6c2a57fac3e555d4348a2919d"; - sha256 = "1287mslww730536xa5fl9czi70hs42zdfaq84jd0azjf7vw6q04i"; + rev = "9f5a948d44652074bf2b90d3da6a400d8a369ba5"; + sha256 = "1r341ick9zdkmk7s0b7v6jqc4bzi7p9grh6bg08b7q72yv90wqvl"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; @@ -15112,12 +15174,12 @@ final: prev: vim-rooter = buildVimPlugin { pname = "vim-rooter"; - version = "2023-09-14"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "1353fa47ee3a81083c284e28ff4f7d92655d7c9e"; - sha256 = "1ybhld3nmdr08icj8fkmi3pn3wz38afp5974cx5hkkshydz2cx1s"; + rev = "45e53f01e4e1c4a3ee20814de232162713aff578"; + sha256 = "12dqwhks52ng0hh98a1sbn5qjmwn77ch25h6n7kp1ffql6gjsadi"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -15314,6 +15376,18 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-signify/"; }; + vim-sile = buildVimPlugin { + pname = "vim-sile"; + version = "2022-09-03"; + src = fetchFromGitHub { + owner = "sile-typesetter"; + repo = "vim-sile"; + rev = "7856f66d5e552eb18596f0162b81d8d14a4cbc16"; + sha256 = "0xik91854jqmv3sa8af988w8xirm1vqql1ifjqxi61v00z0z00j7"; + }; + meta.homepage = "https://github.com/sile-typesetter/vim-sile/"; + }; + vim-simpledb = buildVimPlugin { pname = "vim-simpledb"; version = "2020-10-02"; @@ -15352,12 +15426,12 @@ final: prev: vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2024-03-21"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "87988b173b7642e6a5124f9e5559148c4159d076"; - sha256 = "0922p2nbaj8vf2wl697v8yjmfccyvn793mn7n0axlw3xr162qdkv"; + rev = "4a898d57f41bc35e99173c5a0a8720f1796459b5"; + sha256 = "0pdxlrl7l4d0jvkm806dl8zq9gj7qncvyfncvffgvjvwgmkwdn31"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -15520,12 +15594,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2023-09-16"; + version = "2024-05-12"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "3645b5ceb1898fe5a5cf968a5f078479cb8068f0"; - sha256 = "1z31942gbwywayl8gq0ky9f73q6zpg6c7r828h753xly5dq7s7b8"; + rev = "1f8ef77f2ae1990abcb99cee1a599280375e4349"; + sha256 = "0mmkjpm82ibx8f22392mad4l8y6xssqbr2cf8cdrxbk22p3yzf86"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -15724,12 +15798,12 @@ final: prev: vim-terraform = buildVimPlugin { pname = "vim-terraform"; - version = "2024-02-13"; + version = "2024-05-07"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "21f756b933cd11ac5990a6046fdc7c4e2a6c0aee"; - sha256 = "1bp6nqsdn9h3ihy5y2na7n40nmjr1vqsjj845ks4kfrzfcsvmxms"; + rev = "24de93afb05078bac6a2e966402cc1f672277708"; + sha256 = "1d8r0qd3ncnh3rbax9vjd3rckjwikxydgy9zjklmgnhn51ynggzi"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -16073,12 +16147,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2024-04-03"; + version = "2024-04-26"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "e2ff111f123da6cf97f95b96b10eb95854f953c9"; - sha256 = "0kg3wwgxv1gclyvdws52chyz1jfgmi4hc2pdg9fmkqpkk0g17r68"; + rev = "b84a6d42c1c10678928b0bf8327f378c8bc8af5a"; + sha256 = "1sj8nfn2yd1bsfqqf9kqpivxhfjcq1zq111ls9m6xh98ccxwcj7d"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -16169,12 +16243,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-04-11"; + version = "2024-04-29"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "5d11a253dd1ecabd4612a885175216032d814300"; - sha256 = "1kx5xid8sybwc7fmmcn6j36r8n0m3g0529q5p0mywfn337m8q3np"; + rev = "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23"; + sha256 = "0cikyb55z31jnh3zvm3xf8skfqdvdg3ihhb1z8xc1cxhx9gyc4hz"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -16313,12 +16387,12 @@ final: prev: vim-zettel = buildVimPlugin { pname = "vim-zettel"; - version = "2024-01-31"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "c0230fb9f3d0f4aa10c6598549a733e20eeaa92f"; - sha256 = "0pdl26s4n3wnjh2mf0vwwxwvjc8hg4i5cfsj8fip7k8zsgwg14vx"; + rev = "96d3400598a95957062e42820cdeaa6ab22cba72"; + sha256 = "1q6wy7mzi4lqjy37l4rbnjbvy7a0cmm2cccd07ywfd2cx31m26w0"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; @@ -16481,12 +16555,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2024-02-17"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "def092693ea33eb2055fb2cfbcabb8e56ea77963"; - sha256 = "0b4md13a4mdf2knmb0p3c83k3v04hl5y4z2sa2kci3shq41v694x"; + rev = "c664d723ffe5d5179b906d8ef370b59e70b84f5a"; + sha256 = "1953bdv2x0xs0cc6vjv3lsy9ipgv16la981wf83x64kxb1mkds0b"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -16494,12 +16568,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-04-20"; + version = "2024-05-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "268dd8d311adebb121fa0a4b31cdabcb98072403"; - sha256 = "1nd6yafqvdx0h7mad3pwfp3fxs8kssjyd758q3f99612fhl63c61"; + rev = "8ca74380935beb4ed5d213bb55b2380cc1a83bd6"; + sha256 = "1rmw0zqp1gwla5yml3i4smqpmqy8am0skgg786mrwkbs47harjfk"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -16590,12 +16664,12 @@ final: prev: vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-04-20"; + version = "2024-05-09"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "d47aab1fbe423bf14275745684205dca08366277"; - sha256 = "0g4dh47rasd5973mjv8cpsd1c6bf5c1bv7pc05sbjkb8vck2lsl5"; + rev = "1a2cb491a962acf3bbf53c6d0a61b4ec76012570"; + sha256 = "1mjsy9g2hkrzhy6bhrphpiz3nr8wr4l7jxacbz224jm7x1i2zn1l"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -16662,24 +16736,24 @@ final: prev: wiki-ft-vim = buildVimPlugin { pname = "wiki-ft.vim"; - version = "2023-05-14"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki-ft.vim"; - rev = "d547e58dc7e6cf144e1d490a243b0788dd37104f"; - sha256 = "1v6ra526m720njw1qbvmmw63mv58mjr0fkzq5gdiivrhk8kfg4zw"; + rev = "10e3aa7ee58ae5351fc9ba0d692877a34cc99f08"; + sha256 = "1cnqczi4pkfvd3q85qjmg6jd0kjn6l5lna2mlwfj15h528mkxjaw"; }; meta.homepage = "https://github.com/lervag/wiki-ft.vim/"; }; wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-04-18"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "0035cd000cb2a5c60ea67c176ce795852ea04448"; - sha256 = "0xzxscvaflappikhi7l0v6i92cls6jp1y8fq2pfai9rnsyizvh7p"; + rev = "afb7b9aa3b1058ae6f48e3bea7d5eae92bf00e99"; + sha256 = "1qwcvbk0jf3x83q60bdp0j29xwkm49scwgrzfswpqf6xw1kyd7rk"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -16903,12 +16977,12 @@ final: prev: zellij-nvim = buildVimPlugin { pname = "zellij.nvim"; - version = "2023-12-03"; + version = "2024-05-03"; src = fetchFromGitHub { owner = "Lilja"; repo = "zellij.nvim"; - rev = "483c855ab7a3aba60e522971991481807ea3a47b"; - sha256 = "17lapf7lznlw557k00dpvx04j5pkgdqk95aw5js3aamydnhi976g"; + rev = "99659823e2ee81e4ba5a2579093776ee39a93b15"; + sha256 = "18i6gbzi3ijhix09wjv5z297hwpnfifb3x6vn37l8352icfx3wyq"; }; meta.homepage = "https://github.com/Lilja/zellij.nvim/"; }; @@ -17011,12 +17085,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-04-14"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "a1439ad7c584efb3d0ce14ccb835967f030450fe"; - sha256 = "1ngjll0khnx1nighazw64kvfdl139z8xhv0hh2r4bb40ynxnhdf9"; + rev = "d97387aea8264f484bb5d5e74f2182a06c83e0d8"; + sha256 = "1wybci6cjadjd5z0wkx2jmwb9ir72s4g4qrd9qsjl2qjfiaf26k9"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -17131,12 +17205,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-04-19"; + version = "2024-05-08"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "6512f7d1faa4fd86c53e9c5c8492b4bdda692613"; - sha256 = "165yndfj0m3wib17wa15fswsfwixm1bxalprpbdwvyzd2f9p1fd0"; + rev = "4f507775f3935a39d994e7a1d3688e30f7fb8713"; + sha256 = "0lrxhbcdmy2xpwwdxg9dyh954y7xxb8zc75b2lxf5z8lmpxi3ccp"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -17179,12 +17253,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-04-18"; + version = "2024-05-10"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "17b466e79479758b332a3cac12544a3ad2be6241"; - sha256 = "1fwwp7szzz2yp4z5hngqn8ll8765xv0nlhgcb75yj257kz7x5lq1"; + rev = "b24b48d35b4f96bbc9a717d3220e959dbf89f6b1"; + sha256 = "1bamxqqpq882klv5i7wdcm2pywwcjj3d85jvpw8w9wc15qkanqgm"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 42c846ee5e..6e629842aa 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,57 +27,57 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=b7a7167"; + version = "0.0.0+rev=10f21f3"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "b7a7167762e3863b3d6247c708b7f9bca1ca7bea"; - hash = "sha256-GXjjRcB0ml9MMYuJUWAlORWrOUsRxrwZ6kmg0fp3kNQ="; + rev = "10f21f3f1b10584e62ecc113ab3cda1196d0ceb8"; + hash = "sha256-hBvDFLIN4n0dbpH8FKe0sY8t4Jwa0GtrLt2GG04Qgn8="; }; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=857077f"; + version = "0.0.0+rev=c99ad4b"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "857077f9e6bb04df0f769c18d32bfe036911adc8"; - hash = "sha256-b7rw0AWqqvFisS0qlDppJFxSnjNZaTTeph6gKfQwFNA="; + rev = "c99ad4b16d112fea91745e3f1b769754239fdaba"; + hash = "sha256-tl/MajAsdu7YxQcdFZmupZldhCl6QB//4FwiBR44nm4="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=4ddf79e"; + version = "0.0.0+rev=babb6d4"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "4ddf79edaa87170ec12bd6a8d03a8ac528fe0ae7"; - hash = "sha256-DbxzbbmKq0GxbKIKtoygEhbdYeEwp23Nkk15WI2AQW4="; + rev = "babb6d4da69b359bbb80adbf1fe39c0da9175210"; + hash = "sha256-nA/4SRlXfm8hMZw/GOQFAxzoPNAzVP0cCnHLc1ZawXU="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; asm = buildGrammar { language = "asm"; - version = "0.0.0+rev=afdc3d5"; + version = "0.0.0+rev=b0306e9"; src = fetchFromGitHub { owner = "RubixDev"; repo = "tree-sitter-asm"; - rev = "afdc3d5da18d42cbb471c0f40527dbed9cace7ad"; - hash = "sha256-YYzJMGmizeqZxBF2YXYPLjAo54Y60z7RFhLcmOJbeGY="; + rev = "b0306e9bb2ebe01c6562f1aef265cc42ccc53070"; + hash = "sha256-xmuusYIDpttr97ZJrouW0VB02pZG8usQ9kMsARRHeJI="; }; meta.homepage = "https://github.com/RubixDev/tree-sitter-asm"; }; astro = buildGrammar { language = "astro"; - version = "0.0.0+rev=b422ccd"; + version = "0.0.0+rev=4be1807"; src = fetchFromGitHub { owner = "virchau13"; repo = "tree-sitter-astro"; - rev = "b422ccd41f0b433260a3d28df7e39fa2ff63ef9c"; - hash = "sha256-FrXd4dR28GP1CAP+SaGSRO8TImok9MjVw2vWyZgUijQ="; + rev = "4be180759ec13651f72bacee65fa477c64222a1a"; + hash = "sha256-qc9InFEQgeFfFReJuQd8WjTNK4fFMEaWcqQUcGxxuBI="; }; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; @@ -105,23 +105,23 @@ }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=f8fb327"; + version = "0.0.0+rev=2fbd860"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "f8fb3274f72a30896075585b32b0c54cad65c086"; - hash = "sha256-sj1qYb42k0hXXcNCKg1hINYD11wDcVpnoPhZNtlYT6k="; + rev = "2fbd860f802802ca76a6661ce025b3a3bca2d3ed"; + hash = "sha256-rCuQbnQAOnQWKYreNH80nlL+0A1qbWbjMvtczcoWPrY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; bass = buildGrammar { language = "bass"; - version = "0.0.0+rev=c9ba456"; + version = "0.0.0+rev=28dc705"; src = fetchFromGitHub { owner = "vito"; repo = "tree-sitter-bass"; - rev = "c9ba4568af24cd3403029730687c0a43d1350a43"; - hash = "sha256-F131TkIt2mW2n8Da3zI1/B0yoT9Ezo2hWoptpsdMrb4="; + rev = "28dc7059722be090d04cd751aed915b2fee2f89a"; + hash = "sha256-NKu60BbTKLsYQRtfEoqGQUKERJFnmZNVJE6HBz/BRIM="; }; meta.homepage = "https://github.com/vito/tree-sitter-bass"; }; @@ -160,56 +160,56 @@ }; bitbake = buildGrammar { language = "bitbake"; - version = "0.0.0+rev=7e0e2ac"; + version = "0.0.0+rev=a5d04fd"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bitbake"; - rev = "7e0e2ac6f1d0da1a91ab84f35edddfdfece54f1a"; - hash = "sha256-7He69Nk1b0gUCnLcfALQk46E2JPDhVpIIqS6qtJIx4k="; + rev = "a5d04fdb5a69a02b8fa8eb5525a60dfb5309b73b"; + hash = "sha256-SzHFNIeR6ukWXKkLd2Trg9zuKLMwNAolXGPIDBDaFRg="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake"; }; blueprint = buildGrammar { language = "blueprint"; - version = "0.0.0+rev=863cea9"; + version = "0.0.0+rev=60ba737"; src = fetchFromGitLab { owner = "gabmus"; repo = "tree-sitter-blueprint"; - rev = "863cea9f83ad5637300478e0559262f1e791684b"; - hash = "sha256-QbkwdqH4Q+bqsp7XawUNXR45ROxfpMf+goCBFTw07I4="; + rev = "60ba73739c6083c693d86a1a7cf039c07eb4ed59"; + hash = "sha256-ojm6OKgriKUqUcRBf8WgHv+BvPjUuYOaabC8VXE+Kwk="; }; meta.homepage = "https://gitlab.com/gabmus/tree-sitter-blueprint.git"; }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=1aafaff"; + version = "0.0.0+rev=82fb86a"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "1aafaff4d26dac5a36dd3495be33e1c20161d761"; - hash = "sha256-eix/BqsZzrJc+h1sHiG/IDtdyZvIsEdox71sPMNXs58="; + rev = "82fb86aa544843bd17a9f0f3dc16edf645a34349"; + hash = "sha256-wiCgRSrJodNq7WVQTIDsQ6K/ZrgnSFdGG9kDegu6zGs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=9de5652"; + version = "0.0.0+rev=82fa8f0"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "9de565257ada70ac441c640e3b5d6850e2df5ab8"; - hash = "sha256-QNI2V1CG1DdkMIzR+NUcM/IjtQHnJcYn9Nk3sUmkINE="; + rev = "82fa8f05f41a33e9bc830f85d74a9548f0291738"; + hash = "sha256-5GkU3/yVMCnNvNssad3vEIN8PlbLeQsRBlwgH2KUrBo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; cairo = buildGrammar { language = "cairo"; - version = "0.0.0+rev=6216c6e"; + version = "0.0.0+rev=6238f60"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-cairo"; - rev = "6216c6ee5e9fc0649c4bd7b1aedd884a55bdd9ef"; - hash = "sha256-D8yAkxaokkdNFLnBDWTa6Xu21ibpVw1A4sd/llh8BKs="; + rev = "6238f609bea233040fe927858156dee5515a0745"; + hash = "sha256-QjCt3sRINrNbaxtNwj43+g7D3xYmuh0BIAo6wWQ/54g="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-cairo"; }; @@ -226,12 +226,12 @@ }; chatito = buildGrammar { language = "chatito"; - version = "0.0.0+rev=fe7a2a7"; + version = "0.0.0+rev=a461f20"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-chatito"; - rev = "fe7a2a75d3d74c1215141b7a7ebebb57ae17a370"; - hash = "sha256-4ianrWSctAIufc/8I1pxWvoij1nG7mcRemQs0fj1Qt8="; + rev = "a461f20dedb43905febb12c1635bc7d2e43e96f0"; + hash = "sha256-nAdyG068usqGr9OI/bZXiNfSkIg/+L6KTcylZVNNc+o="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito"; }; @@ -259,34 +259,34 @@ }; comment = buildGrammar { language = "comment"; - version = "0.0.0+rev=aefcc28"; + version = "0.0.0+rev=5d8b29f"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-comment"; - rev = "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"; - hash = "sha256-ihkBqdYVulTlysb9J8yg4c5XVktJw8jIwzhqybBw8Ug="; + rev = "5d8b29f6ef3bf64d59430dcfe76b31cc44b5abfd"; + hash = "sha256-19jxH6YK3Rn0fOGSiWen5/eNKPKUSXVsIYB/QAPEA1I="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-comment"; }; commonlisp = buildGrammar { language = "commonlisp"; - version = "0.0.0+rev=83ae738"; + version = "0.0.0+rev=bf2a65b"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; - rev = "83ae738bed7e914cee9090c3fe4c80a32ab45905"; - hash = "sha256-0qWcrn65vtOYz54NVi/sj+GqnGMztEpZJsl9sjbF5sw="; + rev = "bf2a65b1c119898a1a17389e07f2a399c05cdc0c"; + hash = "sha256-dCrHrNfJoHfOt3sS2fUqbrw4snHMu+MoPumLYTGfoho="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp"; }; cooklang = buildGrammar { language = "cooklang"; - version = "0.0.0+rev=81c2a86"; + version = "0.0.0+rev=4ebe237"; src = fetchFromGitHub { owner = "addcninblue"; repo = "tree-sitter-cooklang"; - rev = "81c2a8667846b1e60db68b5601d864fe00fd1d3a"; - hash = "sha256-zlffOW/ZJxpn3T2CMkrznkLLtuqxp7gIxVHEItvMepY="; + rev = "4ebe237c1cf64cf3826fc249e9ec0988fe07e58e"; + hash = "sha256-VB3BxSrhIbD8TytfOJx7IhTwl/aWasB8t3xnrO34rQE="; }; meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang"; }; @@ -314,46 +314,46 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=72fd001"; + version = "0.0.0+rev=2369fa9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "72fd00128f1c38319670cbf4bcedbba0dc849d96"; - hash = "sha256-COlDbMi3kKb1YAjJthBO5TmLOWs1dH4VAGNYgh8iSmE="; + rev = "2369fa991eba294e9238e28280ffcd58132f94bc"; + hash = "sha256-reDeaGf7jDaNzPW7ivvq3n9Tl/SuZYs/O/d93whHa7U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; css = buildGrammar { language = "css"; - version = "0.0.0+rev=02b4ee7"; + version = "0.0.0+rev=f6be52c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; - rev = "02b4ee757654b7d54fe35352fd8e53a8a4385d42"; - hash = "sha256-IniaiBBx2pDD5nwJKfr5i9qvfvG+z8H21v14qk14M0g="; + rev = "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af"; + hash = "sha256-V1KrNM5C03RcRYcRIPxxfyWlnQkbyAevTHuZINn3Bdc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-css"; }; csv = buildGrammar { language = "csv"; - version = "0.0.0+rev=cda48a5"; + version = "0.0.0+rev=7eb7297"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"; - hash = "sha256-K4tOYdI68fXnWbvSat50FL/jDSb8f6gtZOhE6qKPLyg="; + rev = "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"; + hash = "sha256-5VL7uREH0lloAWo9rdJXsjDsWxgL6fngWJSmi4fM7UQ="; }; location = "csv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=50a28f4"; + version = "0.0.0+rev=e7878a9"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "50a28f4600c559e3d19a1825e854dfe6dcac1d49"; - hash = "sha256-xVf9sD5CbXDn1Kw9vkgKd+hWmerQgHf7ntUtynRXpBo="; + rev = "e7878a9cf4157e9d6c8013ff5605c9f26d62894d"; + hash = "sha256-1UCYWY6DvanLdFeS0ALHG3eJT/Rk/muZTkFm3YwF5II="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -381,12 +381,12 @@ }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=6da4647"; + version = "0.0.0+rev=ac0bb84"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "6da46473ab8accb13da48113f4634e729a71d335"; - hash = "sha256-AT7DuOq4mZZxizB2a5UsPGSIP11Jn88O7bJeJIEmv8s="; + rev = "ac0bb849ccd1a923963af47573b5e396736ff582"; + hash = "sha256-yEI0a+YlEdjlmSTWZFdVUr7lwuK4wNsE9WycOkXzoG4="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; @@ -436,23 +436,23 @@ }; djot = buildGrammar { language = "djot"; - version = "0.0.0+rev=63f176e"; + version = "0.0.0+rev=0e9a836"; src = fetchFromGitHub { owner = "treeman"; repo = "tree-sitter-djot"; - rev = "63f176e7db5fca073b55b98b7e5e95afd1587fcb"; - hash = "sha256-8ksZvW0Gb3fZXUDA/uv3AzxDaD3s9B2ZyAIIp261jQg="; + rev = "0e9a836ec47612ade15645fb1680adb549894a6c"; + hash = "sha256-PdToOLDgEYKVCYT7jmCBNWtuQ0XLgOYF1/PycSxP3XU="; }; meta.homepage = "https://github.com/treeman/tree-sitter-djot"; }; dockerfile = buildGrammar { language = "dockerfile"; - version = "0.0.0+rev=439c3e7"; + version = "0.0.0+rev=087daa2"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "439c3e7b8a9bfdbf1f7d7c2beaae4173dc484cbf"; - hash = "sha256-sW3fCCAXNak4JszEPgspZFfOHtUlqnW3eRxzHNfzInk="; + rev = "087daa20438a6cc01fa5e6fe6906d77c869d19fe"; + hash = "sha256-uDRDq6MYYV8nh6FDsQN3tdyZywEg8A224bfWrgFGvFs="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -469,35 +469,35 @@ }; doxygen = buildGrammar { language = "doxygen"; - version = "0.0.0+rev=a750758"; + version = "0.0.0+rev=4a30eba"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-doxygen"; - rev = "a750758da90955c86fcc22fcbb6fa44a7d009865"; - hash = "sha256-/4yBu5S9bQhxGO9JcNZukn+xpfzfaQQRLqVuDHgMYd0="; + rev = "4a30eba5d047d6a8c5b005202b4848c0b33d76ca"; + hash = "sha256-yR2JtWYdy84z38Idx84qIuUPoBMiSj/7TVw0J1+g/U8="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-doxygen"; }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=96beba9"; + version = "0.0.0+rev=648183d"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "96beba9f3e4156aaae64bb86997503b1ceb1283d"; - hash = "sha256-XmSU9Om1bj/PtBxr22Sf81Mx68QINtK8Gls1fRldt6Q="; + rev = "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"; + hash = "sha256-O40z5VYmFeE8pkJ85Vu5DWV31YslIrwD80+4qnpoRNY="; }; location = "dtd"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; earthfile = buildGrammar { language = "earthfile"; - version = "0.0.0+rev=7d5cc9e"; + version = "0.0.0+rev=3ded1cb"; src = fetchFromGitHub { owner = "glehmann"; repo = "tree-sitter-earthfile"; - rev = "7d5cc9e27e3e340c8b521d11c8da84047494fe30"; - hash = "sha256-0rjD8SJGot/KAsLVW98e7X2tbNPntScRk/oEsS1wmAg="; + rev = "3ded1cba9eab14b07377b700b1132d259480abae"; + hash = "sha256-lT+qHnHqBDJs042Yz10PNyxUbTa7nt+cnxDvAZJRryA="; }; meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile"; }; @@ -581,12 +581,12 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "0.0.0+rev=6d791b8"; + version = "0.0.0+rev=38d5004"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - rev = "6d791b897ecda59baa0689a85a9906348a2a6414"; - hash = "sha256-I4L3mxkAnmKs+BiNRDAs58QFD2r8jN1B2yv0dZdgkzQ="; + rev = "38d5004a797298dc42c85e7706c5ceac46a3f29f"; + hash = "sha256-IPPCexaq42Em5A+kmrj5e/SFrXoKdWCTYAL/TWvbDJ0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; @@ -625,12 +625,12 @@ }; fennel = buildGrammar { language = "fennel"; - version = "0.0.0+rev=215e391"; + version = "0.0.0+rev=8ad1770"; src = fetchFromGitHub { owner = "alexmozaidze"; repo = "tree-sitter-fennel"; - rev = "215e3913524abc119daa9db7cf6ad2f2f5620189"; - hash = "sha256-myh0+ZNDzdUZFAdsw8uVGyo0VYh0wKNZ11vlJKTSZnA="; + rev = "8ad17704b3c2469155947d4e8fcb618cf1328459"; + hash = "sha256-7a2spHMApW+yc/wrpVwWl9ykPAdC4QTOeMIs1jxajsU="; }; meta.homepage = "https://github.com/alexmozaidze/tree-sitter-fennel"; }; @@ -702,23 +702,23 @@ }; fsh = buildGrammar { language = "fsh"; - version = "0.0.0+rev=fa33477"; + version = "0.0.0+rev=fad2e17"; src = fetchFromGitHub { owner = "mgramigna"; repo = "tree-sitter-fsh"; - rev = "fa3347712f7a59ed02ccf508284554689c6cde28"; - hash = "sha256-6TLG2edQeo+jRVAnO6mq3pC8RYNFi2UVVT3mQGZqk5U="; + rev = "fad2e175099a45efbc98f000cc196d3674cc45e0"; + hash = "sha256-91r1FCQTocDkhS5Tx0vnFliitMStVzNTpf6BwPyaqVM="; }; meta.homepage = "https://github.com/mgramigna/tree-sitter-fsh"; }; func = buildGrammar { language = "func"; - version = "0.0.0+rev=0834e35"; + version = "0.0.0+rev=f780ca5"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-func"; - rev = "0834e35ecf8b23fbf9ad15b088af6a897e19d4a8"; - hash = "sha256-2+YOp7MnwZR2qg95h/ywjJwDSLUnodtkwwpv9zuy8p8="; + rev = "f780ca55e65e7d7360d0229331763e16c452fc98"; + hash = "sha256-jM0VJZlfhenAZbhabpgsoRIGny3WSDoimZtwogcvaSI="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-func"; }; @@ -812,12 +812,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=bcf9c45"; + version = "0.0.0+rev=8432ffe"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "bcf9c45b56cbe46e9dac5eee0aee75df270000ac"; - hash = "sha256-XdgPPX5gKvr4yIpMy6M7AKxaMrilt5Pzp6gUa8o+EwE="; + rev = "8432ffe32ccd360534837256747beb5b1c82fca1"; + hash = "sha256-PO01z8vyzDT4ZGPxgZl9PPsp/gktT2TaCwutMy87i8E="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -834,12 +834,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=e7817c9"; + version = "0.0.0+rev=8c9fb41"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "e7817c982e0e921c5ee89a1e0283121bb5cc5e01"; - hash = "sha256-pkbvD+VQUtR6GiY4RP6J6tB2Cl2UyqjB7t/HE0dLr78="; + rev = "8c9fb41836dc202bbbcf0e2369f256055786dedb"; + hash = "sha256-aUM0gisdoV3A9lWSjn21wXIBI8ZrKI/5IffAaf917e4="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -867,12 +867,12 @@ }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=eb68645"; + version = "0.0.0+rev=7ee8d92"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "eb68645662a3f7bf7fdd4bcb9531585f54c8570e"; - hash = "sha256-RZx8M3QGX/+kfjbEB0+f2jeDZhGF+XGXwtb5oltxHrI="; + rev = "7ee8d928db5202f6831a78f8112fd693bf69f98b"; + hash = "sha256-ARfpfMSXy+DpvUMJvUgjgReoyvGbrVwYutZD91JA4qc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; @@ -999,12 +999,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=95a4f00"; + version = "0.0.0+rev=a50070d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "95a4f0023741b3bee0cc500f3dab9c5bab2dc2be"; - hash = "sha256-bqcBjH4ar5OcxkhtFcYmBxDwHK0TYxkXEcg4NLudi08="; + rev = "a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19"; + hash = "sha256-huO0Ly9JYQbT64o/AjdZrE9vghQ5vT+/iQl50o4TJ0I="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -1066,23 +1066,23 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=d200375"; + version = "0.0.0+rev=feea0ff"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "d200375a29b24764b78d7051df0024ed7c2f1ab0"; - hash = "sha256-HCbH8Lyi2ziaUTxhgVPQ4hyOZhRxNFW66gAkoFT/Ubg="; + rev = "feea0ff6eccda8be958c133985dca8977db3d887"; + hash = "sha256-VIrNt9pjNtwVbQKZGPota5blxbPGGEhdiRYtPNU/XtA="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; hlsplaylist = buildGrammar { language = "hlsplaylist"; - version = "0.0.0+rev=3e65f65"; + version = "0.0.0+rev=64f1902"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-hlsplaylist"; - rev = "3e65f652b9dea8d38f9a44b5b0898a51c9247eb8"; - hash = "sha256-IGfKnEG1b9TSPBjxb+NjgweyKp7HUyZCe2gR/xnV5CY="; + rev = "64f19029339e75d6762feae39e7878595860c980"; + hash = "sha256-rJZo17tAbDbnnx6PTOlzgJYClnGrRNfQ6fLJqIVMMCw="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist"; }; @@ -1110,12 +1110,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=bfa075d"; + version = "0.0.0+rev=e4d834e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "bfa075d83c6b97cd48440b3829ab8d24a2319809"; - hash = "sha256-zUbcez+kWKJb7ZV8rC17NJ61P85hgA3HXtQCFevFwvs="; + rev = "e4d834eb4918df01dcad5c27d1b15d56e3bd94cd"; + hash = "sha256-sHy3fVWemJod18HCQ8zBC/LpeCCPH0nzhI1wrkCg8nw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1163,6 +1163,17 @@ }; meta.homepage = "https://github.com/luckasRanarison/tree-sitter-hyprlang"; }; + idl = buildGrammar { + language = "idl"; + version = "0.0.0+rev=e885d7f"; + src = fetchFromGitHub { + owner = "cathaysia"; + repo = "tree-sitter-idl"; + rev = "e885d7fd66c2549b7a28172400d645d27656f5cb"; + hash = "sha256-japZBj8H+NTTw/Ne7prSjhZD6idcLjPCKEB3OjSSoxc="; + }; + meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; + }; ini = buildGrammar { language = "ini"; version = "0.0.0+rev=bcb84a2"; @@ -1174,6 +1185,17 @@ }; meta.homepage = "https://github.com/justinmk/tree-sitter-ini"; }; + inko = buildGrammar { + language = "inko"; + version = "0.0.0+rev=4cef9aa"; + src = fetchFromGitHub { + owner = "inko-lang"; + repo = "tree-sitter-inko"; + rev = "4cef9aa4980606311b906b2f2b8c6cf791c60396"; + hash = "sha256-NnZ5sSNwVVsx1I8eacvTl+1Vn/PL3NsrlFNPHQMUP6I="; + }; + meta.homepage = "https://github.com/inko-lang/tree-sitter-inko"; + }; ispc = buildGrammar { language = "ispc"; version = "0.0.0+rev=9b2f9ae"; @@ -1209,12 +1231,12 @@ }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=fff4560"; + version = "0.0.0+rev=e88537c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "fff4560044bdc51d9f6995f1edc797b7cd72b9dc"; - hash = "sha256-erxZ5nYvUwrzdRnkni8WEsxB04ghI7H3DLASfCoHXYs="; + rev = "e88537c2703546f3f0887dd3f16898e1749cdba5"; + hash = "sha256-/poR9qMfjWKJW6aw0s6VjNh7fkf/HvUJNZIeZ1YEwVM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1231,34 +1253,34 @@ }; jsdoc = buildGrammar { language = "jsdoc"; - version = "0.0.0+rev=6a6cf9e"; + version = "0.0.0+rev=49fde20"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; - rev = "6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55"; - hash = "sha256-fKscFhgZ/BQnYnE5EwurFZgiE//O0WagRIHVtDyes/Y="; + rev = "49fde205b59a1d9792efc21ee0b6d50bbd35ff14"; + hash = "sha256-Mfau8071UiotdSS+/W9kQWhKF7BCRI8WtRxss/U0GQw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc"; }; json = buildGrammar { language = "json"; - version = "0.0.0+rev=80e623c"; + version = "0.0.0+rev=94f5c52"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - rev = "80e623c2165887f9829357acfa9c0a0bab34a3cd"; - hash = "sha256-waejAbS7MjrE7w03MPqvBRpEpqTcKc6RgKCVSYaDV1Y="; + rev = "94f5c527b2965465956c2000ed6134dd24daf2a7"; + hash = "sha256-16/ZRjRolUC/iN7ASrNnXNSkfohBlSqyyYAz4nka6pM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; json5 = buildGrammar { language = "json5"; - version = "0.0.0+rev=c23f7a9"; + version = "0.0.0+rev=ab0ba82"; src = fetchFromGitHub { owner = "Joakker"; repo = "tree-sitter-json5"; - rev = "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d"; - hash = "sha256-16gDgbPUyhSo3PJD9+zz6QLVd6G/W1afjyuCJbDUSIY="; + rev = "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"; + hash = "sha256-LaCCjvYnmofOVQ2Nqlzfh3KP3fNG0HBxkOng0gjYY1g="; }; meta.homepage = "https://github.com/Joakker/tree-sitter-json5"; }; @@ -1297,12 +1319,12 @@ }; just = buildGrammar { language = "just"; - version = "0.0.0+rev=6c2f018"; + version = "0.0.0+rev=fd814fc"; src = fetchFromGitHub { owner = "IndianBoy42"; repo = "tree-sitter-just"; - rev = "6c2f018ab1d90946c0ce029bb2f7d57f56895dff"; - hash = "sha256-EnU0IpBr9i3+RFLzg7g6XuDSiuMBLGQ0eCJNPKeDohw="; + rev = "fd814fc6c579f68c2a642f5e0268cf69daae92d7"; + hash = "sha256-yuTcgNfF4oRNZkwwFpt5WLpWtTvgJJRDYo3CWnCNyiU="; }; meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just"; }; @@ -1330,15 +1352,26 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=260afd9"; + version = "0.0.0+rev=c9cb850"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "260afd9a92bac51b3a4546303103c3d40a430639"; - hash = "sha256-cmtUGmytAgiqBi31CNxEX+vE3YXmH1hphsIHvGRd7SY="; + rev = "c9cb8504b81684375e7beb8907517dbd6947a1be"; + hash = "sha256-fuEKCtCzaWOp0gKrsPMOW9oGOXnM2Qb652Nhn1lc1eA="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; + koto = buildGrammar { + language = "koto"; + version = "0.0.0+rev=919440e"; + src = fetchFromGitHub { + owner = "koto-lang"; + repo = "tree-sitter-koto"; + rev = "919440e1376109bab4edac52594c17c02ae0be5a"; + hash = "sha256-R3p0X741yOBAC6NTB46PTkh41NLmaVUvQPLBG1+PG+Y="; + }; + meta.homepage = "https://github.com/koto-lang/tree-sitter-koto"; + }; kusto = buildGrammar { language = "kusto"; version = "0.0.0+rev=8353a12"; @@ -1352,23 +1385,23 @@ }; lalrpop = buildGrammar { language = "lalrpop"; - version = "0.0.0+rev=123d8b4"; + version = "0.0.0+rev=854a40e"; src = fetchFromGitHub { owner = "traxys"; repo = "tree-sitter-lalrpop"; - rev = "123d8b472e949b59f348c32e245107a34a3d8945"; - hash = "sha256-+06eppRj7TynVYOMs30/7kUM69RqdmryIoBuiZJ7DvY="; + rev = "854a40e99f7c70258e522bdb8ab584ede6196e2e"; + hash = "sha256-rVWmYF26DbPHoNRBv9FKEeacSbgw93PHy/wrQDGzlWk="; }; meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop"; }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=ae2134a"; + version = "0.0.0+rev=cd82eb4"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "ae2134af67f6c5e45587ace9ec748dd6e7b356a2"; - hash = "sha256-hQaQBQYK0o5qRH5Mjv3pIAUHJe6BWHGzg2I4KCVG2KE="; + rev = "cd82eb40d31bdfe65f846f4e06292d6c804b5e0e"; + hash = "sha256-ptUIi8cMQ4CrnqZgnzJ0rnByd78y8l607+CSPKNrLEk="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; @@ -1419,12 +1452,12 @@ }; liquidsoap = buildGrammar { language = "liquidsoap"; - version = "0.0.0+rev=09a9e31"; + version = "0.0.0+rev=a9b8012"; src = fetchFromGitHub { owner = "savonet"; repo = "tree-sitter-liquidsoap"; - rev = "09a9e31e2af734a8974dad6ed349648f601eee8c"; - hash = "sha256-GQIi1PFYFlOBkUOGYWQG6M0A+ve3IBl/G0rCcAVyRKM="; + rev = "a9b8012366eab7d0c28bbda5f75a847be931008f"; + hash = "sha256-n8kT4bxRSp3EOJwsm0S4kKYq6Iln1vvvho/di4N0lRs="; }; meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; }; @@ -1553,12 +1586,12 @@ }; mermaid = buildGrammar { language = "mermaid"; - version = "0.0.0+rev=49442bd"; + version = "0.0.0+rev=90ae195"; src = fetchFromGitHub { owner = "monaqa"; repo = "tree-sitter-mermaid"; - rev = "49442bd087901c60f019b4e34dcb6ecdc8849067"; - hash = "sha256-KoAoEuADv6Xj/bpZV5XGW7nXugSCfk6St2xzx7x2oPA="; + rev = "90ae195b31933ceb9d079abfa8a3ad0a36fee4cc"; + hash = "sha256-Tt1bPqpL59FQzuI8CPljBmQoAfJPUkVC9Xe1GcfXzfE="; }; meta.homepage = "https://github.com/monaqa/tree-sitter-mermaid"; }; @@ -1575,35 +1608,35 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=c2845c1"; + version = "0.0.0+rev=a708e9b"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "c2845c1c0b23e2faf6febfa72a042e5346374ebf"; - hash = "sha256-SQR/1lAWdvNDwa40wNI3uGSF9OBgtyjxVM5lsP4CgIU="; + rev = "a708e9b3f3d7f2fc85ac3fd1d4317c51b101eab0"; + hash = "sha256-ITimvcYGqPUrqg3Z9EyfhEznzME2TKBOJpr0Fbc3OoE="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; }; muttrc = buildGrammar { language = "muttrc"; - version = "0.0.0+rev=1a3d3c9"; + version = "0.0.0+rev=90ef608"; src = fetchFromGitHub { owner = "neomutt"; repo = "tree-sitter-muttrc"; - rev = "1a3d3c98de86689f2bb1e59c8db8067c6784aaed"; - hash = "sha256-9RFz8qaAapJSNxy8YH/6FZG2j1tcrhNWRhxx+fNo7z8="; + rev = "90ef60852c410bd964cd3b954366e4c403c17314"; + hash = "sha256-GiM9jXtaL/GEUmBuiMB7pZP0VnHVzRETwwCHQsHyaTM="; }; meta.homepage = "https://github.com/neomutt/tree-sitter-muttrc"; }; nasm = buildGrammar { language = "nasm"; - version = "0.0.0+rev=3bc691d"; + version = "0.0.0+rev=570f3d7"; src = fetchFromGitHub { owner = "naclsn"; repo = "tree-sitter-nasm"; - rev = "3bc691d2cfba44bea339a775ad496c8bc552c60d"; - hash = "sha256-o4aXvPhXSYMc1oaagIbnFhpqcbWdN8dhMa3QRE/iRMM="; + rev = "570f3d7be01fffc751237f4cfcf52d04e20532d1"; + hash = "sha256-205joaeq4ZSyfgxagPQTsx0zpZwSEpq1VCQoHJ77OL8="; }; meta.homepage = "https://github.com/naclsn/tree-sitter-nasm"; }; @@ -1744,12 +1777,12 @@ }; odin = buildGrammar { language = "odin"; - version = "0.0.0+rev=b5f668e"; + version = "0.0.0+rev=f25b8c5"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-odin"; - rev = "b5f668ef8918aab13812ce73acd89fe191fb8c5e"; - hash = "sha256-D/+ls8a5efAy3sBaH1eGEifEwBRmz+6bYIMGNji949Q="; + rev = "f25b8c5201c1480dc0c8c4155a059a79a5a40719"; + hash = "sha256-720CY0OKlq1P+9g0VHQ6l0lTBjGy/tYiolL8e2ahd8o="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-odin"; }; @@ -1799,47 +1832,47 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=96a17c4"; + version = "0.0.0+rev=d4ebabd"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "96a17c4c2dd345dc61f330d040684538d634bbc2"; - hash = "sha256-I/76AfSPU5WOwch8inBWojIraJGVffnGvOpQepq6qYU="; + rev = "d4ebabd45bcb053fcc7f6688b5c8ed80c7ae7a32"; + hash = "sha256-0WnI0L6Tuy3FD4XxCZR1HcQyo5uv0VXhK8eqopCAS+A="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=29838ad"; + version = "0.0.0+rev=d5aea05"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "29838ad107f50b1f5f51a0beefa9c9d834fce2b3"; - hash = "sha256-5bFM2Hr6vgpLyv3phgBWFl5wk+mlCPJTqrkXJvjSvvM="; + rev = "d5aea05a70c5d021fa746516391f156d35658875"; + hash = "sha256-Wk8JBHqAPIHDGQ6+cw/ATFdeFGZZZ3XgkPCuAOFUROs="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=29838ad"; + version = "0.0.0+rev=d5aea05"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "29838ad107f50b1f5f51a0beefa9c9d834fce2b3"; - hash = "sha256-5bFM2Hr6vgpLyv3phgBWFl5wk+mlCPJTqrkXJvjSvvM="; + rev = "d5aea05a70c5d021fa746516391f156d35658875"; + hash = "sha256-Wk8JBHqAPIHDGQ6+cw/ATFdeFGZZZ3XgkPCuAOFUROs="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; phpdoc = buildGrammar { language = "phpdoc"; - version = "0.0.0+rev=f285e33"; + version = "0.0.0+rev=1d0e255"; src = fetchFromGitHub { owner = "claytonrcarter"; repo = "tree-sitter-phpdoc"; - rev = "f285e338d328a03920a9bfd8dda78585c7ddcca3"; - hash = "sha256-kvAZ1+tbw6bAtLhPeNGi1rmnyNhBSL/nynQADX+4tMw="; + rev = "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"; + hash = "sha256-EWj/Av8+Ri7KiC9LzH73ytufjkp3MxBPwfm6mF3IGD8="; }; meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc"; }; @@ -1966,12 +1999,12 @@ }; psv = buildGrammar { language = "psv"; - version = "0.0.0+rev=cda48a5"; + version = "0.0.0+rev=7eb7297"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"; - hash = "sha256-K4tOYdI68fXnWbvSat50FL/jDSb8f6gtZOhE6qKPLyg="; + rev = "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"; + hash = "sha256-5VL7uREH0lloAWo9rdJXsjDsWxgL6fngWJSmi4fM7UQ="; }; location = "psv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; @@ -2022,23 +2055,23 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=a227610"; + version = "0.0.0+rev=71778c2"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "a22761025cdac6c314b7e3aa48fb44fa9e594d6a"; - hash = "sha256-L6iEej6bPqfaZdH5GNoJyNxZWdnIyn7+Cut+zYnMI88="; + rev = "71778c2a472ed00a64abf4219544edbf8e4b86d7"; + hash = "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; ql = buildGrammar { language = "ql"; - version = "0.0.0+rev=ff04ba6"; + version = "0.0.0+rev=42becd6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ql"; - rev = "ff04ba61857ba05b80221e71b423b2728dbebe1e"; - hash = "sha256-/ayyqSF/SBVvqMYm27NOlCYR3JN0xR3oy0OggwTysvE="; + rev = "42becd6f8f7bae82c818fa3abb1b6ff34b552310"; + hash = "sha256-OFqBI9u5Ik6AoG88v7qTVnol5H9O/n1vaZhoxQ7Sj70="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql"; }; @@ -2055,34 +2088,34 @@ }; qmljs = buildGrammar { language = "qmljs"; - version = "0.0.0+rev=9fa49ff"; + version = "0.0.0+rev=2c57cac"; src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "9fa49ff3315987f715ce5666ff979a7742fa8a98"; - hash = "sha256-q20gLVLs0LpqRpgo/qNRDfExbWXhICWZjM1ux4+AT6M="; + rev = "2c57cac27e207425f8df15327884434cb12365a3"; + hash = "sha256-LFOujMN9HMtDqjq2ZOP0oxydQHFS0wvL6ORBqruGXeM="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; query = buildGrammar { language = "query"; - version = "0.0.0+rev=2e31ca2"; + version = "0.0.0+rev=d25e8d1"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; - rev = "2e31ca2771f6042b0e4e0c41a6290014a9e1face"; - hash = "sha256-kQChOmQCWGtNOqEQjkZ6iShZ+t3tsBwYlrdFFj0ZAj0="; + rev = "d25e8d183f319497b8b22a2a1585975b020da722"; + hash = "sha256-c4ttg5UXtRlUdtljQwczoBSR/oX+rnj5gUqR8EIYMKQ="; }; meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; r = buildGrammar { language = "r"; - version = "0.0.0+rev=c55f8b4"; + version = "0.0.0+rev=3914005"; src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; - rev = "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"; - hash = "sha256-NWnEk0FixC7pBdNLwJUGvKifwZj8nzX7VWv8AhgaI2o="; + rev = "391400572538ff9854341a175ed8ab4b1e45f44b"; + hash = "sha256-KM80Kud7fJzc0qIhd1y3sbdN0mH6b7L16VqOtbGxQBc="; }; meta.homepage = "https://github.com/r-lib/tree-sitter-r"; }; @@ -2110,12 +2143,12 @@ }; rbs = buildGrammar { language = "rbs"; - version = "0.0.0+rev=519a611"; + version = "0.0.0+rev=e5e807a"; src = fetchFromGitHub { owner = "joker1007"; repo = "tree-sitter-rbs"; - rev = "519a61132a51222e3ce73d3b7ef07465f587f346"; - hash = "sha256-MLsbOdH4R3nZxqTFtPstTsbr+yjAz7UvKB/lsD8aWxM="; + rev = "e5e807a50fcd104a2d740d354632fc671700a0bf"; + hash = "sha256-xEh1oHrLPjLT5LSJfOBFgi0nholVr8EFVGlEMPNIxSI="; }; meta.homepage = "https://github.com/joker1007/tree-sitter-rbs"; }; @@ -2132,23 +2165,23 @@ }; readline = buildGrammar { language = "readline"; - version = "0.0.0+rev=e436eae"; + version = "0.0.0+rev=3d4768b"; src = fetchFromGitHub { owner = "ribru17"; repo = "tree-sitter-readline"; - rev = "e436eaef452266a3d00c195f0eb757d6502c767a"; - hash = "sha256-y38TDQ+7wBzEKol/UQ5Xk6f15wUW7hJxByDuhx9d0hQ="; + rev = "3d4768b04d7cfaf40533e12b28672603428b8f31"; + hash = "sha256-kky3u5+NGOlxx8RxeMNszG+XJ6D36+z2us9c0nK/Jds="; }; meta.homepage = "https://github.com/ribru17/tree-sitter-readline"; }; regex = buildGrammar { language = "regex"; - version = "0.0.0+rev=ba22e4e"; + version = "0.0.0+rev=47007f1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; - rev = "ba22e4e0cb42b2ef066948d0ea030ac509cef733"; - hash = "sha256-mb8y3lsbN5zEpVCeBQxGXSRqC3FKsvNg1Rb1XTSh3Qo="; + rev = "47007f195752d8e57bda80b0b6cdb2d173a9f7d7"; + hash = "sha256-X1CEk4nLxXY1a3PHG+4uSDKAXmsJIhd0nVYieTaHOkk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex"; }; @@ -2209,12 +2242,12 @@ }; ron = buildGrammar { language = "ron"; - version = "0.0.0+rev=f0ddc95"; + version = "0.0.0+rev=7893855"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-ron"; - rev = "f0ddc95a4b7bb21a7308642255a80f5496e69c5b"; - hash = "sha256-Wi81LYFfQXjZzj2OuxB64sNDEim/eZKViMeQ0h/w88k="; + rev = "78938553b93075e638035f624973083451b29055"; + hash = "sha256-Sp0g6AWKHNjyUmL5k3RIU+5KtfICfg3o/DH77XRRyI0="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-ron"; }; @@ -2231,23 +2264,23 @@ }; ruby = buildGrammar { language = "ruby"; - version = "0.0.0+rev=9d86f37"; + version = "0.0.0+rev=788a63c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "9d86f3761bb30e8dcc81e754b81d3ce91848477e"; - hash = "sha256-Ibfu+5NWCkw7jriy1tiMLplpXNZfZf8WP30lDU1//GM="; + rev = "788a63ca1b7619288980aaafd37d890ee2469421"; + hash = "sha256-FvLSj0lTNNabneXrDH7/HQq4mcTLvBwhkPW/Pf48JWc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=b77c0d8"; + version = "0.0.0+rev=9c84af0"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "b77c0d8ac28a7c143224e6ed9b4f9e4bd044ff5b"; - hash = "sha256-7SQ/gOKVIE5bmj3vscY363LTwkYX+VHn7JflSU+zKsQ="; + rev = "9c84af007b0f144954adb26b3f336495cbb320a7"; + hash = "sha256-mwnikq3s7Ien68DYT3p9oVGy7xjBgtiJMHAwMj5HXHI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -2298,45 +2331,45 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=b950ddf"; + version = "0.0.0+rev=6858753"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "b950ddf54c564fec0efead602268b6e0d3e5f26e"; - hash = "sha256-AYZ7MlAh9AEvyHsGw6stiJFSEb4/FDLfuqFPhpAorAA="; + rev = "68587530d86aaeb1f1cb17fdada795281cdd0556"; + hash = "sha256-hWMfiwQEd39WKifIM6NhbXnoKI5zPIGxU2GBvfdjQ9s="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=d5fbeaf"; + version = "0.0.0+rev=0701312"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "d5fbeaf0c26683f1417d00b6a5ab1cca445031f2"; - hash = "sha256-ECzYJue7tKx9Eg043fl5x18ySvPlkWPU21Ga2Zqunv0="; + rev = "0701312b74b87fe20e61aa662ba41c5815b5d428"; + hash = "sha256-GwJptJ3AP3i4rVdXi2JmhngbSHCz3fqy+ymwSlx6h94="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; smali = buildGrammar { language = "smali"; - version = "0.0.0+rev=3f65178"; + version = "0.0.0+rev=fdfa6a1"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-smali"; - rev = "3f6517855898ef23023e5d64a8b175d4ee8d646e"; - hash = "sha256-K1cRK4D0BE9FNq1tpa0L3Crc+8woXIwhRPg86+73snk="; + rev = "fdfa6a1febc43c7467aa7e937b87b607956f2346"; + hash = "sha256-S0U6Xuntz16DrpYwSqMQu8Cu7UuD/JufHUxIHv826yw="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-smali"; }; smithy = buildGrammar { language = "smithy"; - version = "0.0.0+rev=8327eb8"; + version = "0.0.0+rev=fa898ac"; src = fetchFromGitHub { owner = "indoorvivants"; repo = "tree-sitter-smithy"; - rev = "8327eb84d55639ffbe08c9dc82da7fff72a1ad07"; - hash = "sha256-6z2Psw+cjC11CXoGOJ/lkBPJXKqECCSrhchOiAPmd14="; + rev = "fa898ac0885d1da9a253695c3e0e91f5efc587cd"; + hash = "sha256-tB+q4RNru4Zi3jU9fBLKdzsXT0uP1PECLfeCCNTyaIo="; }; meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy"; }; @@ -2353,47 +2386,47 @@ }; solidity = buildGrammar { language = "solidity"; - version = "0.0.0+rev=1653da0"; + version = "0.0.0+rev=b5a23ea"; src = fetchFromGitHub { owner = "JoranHonig"; repo = "tree-sitter-solidity"; - rev = "1653da09ccd183f4312fba819056a13af22a65f6"; - hash = "sha256-1IW04F6CxTIdGHxRocM1QmfgXHHf5Jn/eaZ6M8o2EU8="; + rev = "b5a23ead0f69d38b5c9a630f52f5c129132c16ed"; + hash = "sha256-xOW5C/Bcx2xg/6MPYulQkolWGwyQ+htRKvTnkFnqzOE="; }; meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=857077f"; + version = "0.0.0+rev=c99ad4b"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "857077f9e6bb04df0f769c18d32bfe036911adc8"; - hash = "sha256-b7rw0AWqqvFisS0qlDppJFxSnjNZaTTeph6gKfQwFNA="; + rev = "c99ad4b16d112fea91745e3f1b769754239fdaba"; + hash = "sha256-tl/MajAsdu7YxQcdFZmupZldhCl6QB//4FwiBR44nm4="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=857077f"; + version = "0.0.0+rev=c99ad4b"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "857077f9e6bb04df0f769c18d32bfe036911adc8"; - hash = "sha256-b7rw0AWqqvFisS0qlDppJFxSnjNZaTTeph6gKfQwFNA="; + rev = "c99ad4b16d112fea91745e3f1b769754239fdaba"; + hash = "sha256-tl/MajAsdu7YxQcdFZmupZldhCl6QB//4FwiBR44nm4="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sourcepawn = buildGrammar { language = "sourcepawn"; - version = "0.0.0+rev=3ca89fd"; + version = "0.0.0+rev=6a67772"; src = fetchFromGitHub { owner = "nilshelmig"; repo = "tree-sitter-sourcepawn"; - rev = "3ca89fdf998340a7973e276b39516d8902950f86"; - hash = "sha256-AF7PiM0Tt6wqGdNsfMGSkgWXgZRDZGdKc7DQpUHuGUA="; + rev = "6a67772eed866cd6d247cc478a28c6a9272fc0ef"; + hash = "sha256-sroMixo0FvPpC01F/hx5VV3h9ugdLhVbGeVnIlabyk0="; }; meta.homepage = "https://github.com/nilshelmig/tree-sitter-sourcepawn"; }; @@ -2421,12 +2454,12 @@ }; squirrel = buildGrammar { language = "squirrel"; - version = "0.0.0+rev=f93fd28"; + version = "0.0.0+rev=0a50d31"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-squirrel"; - rev = "f93fd2864dd05cc39b0490145fd86a1a93bfa3a3"; - hash = "sha256-06cmaCyBkdwSmIHSEE0xr9V4M6pp+ApIZNopbnW3pok="; + rev = "0a50d31098e83c668d34d1160a0f6c7d23b571cc"; + hash = "sha256-cLMAeDfZiHInA9+Td8FedRVSNv1vFE/bpCftRqV72d0="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-squirrel"; }; @@ -2476,12 +2509,12 @@ }; supercollider = buildGrammar { language = "supercollider"; - version = "0.0.0+rev=3b35bd0"; + version = "0.0.0+rev=affa438"; src = fetchFromGitHub { owner = "madskjeldgaard"; repo = "tree-sitter-supercollider"; - rev = "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"; - hash = "sha256-mWTOZ3u9VGjEhjDeYJGd8aVxjVG9kJgKX/wHMZSsaEU="; + rev = "affa4389186b6939d89673e1e9d2b28364f5ca6f"; + hash = "sha256-j4CTKkSdKnSGdgC3zGglmZ6uQvbC2ObQ+WWlY0afSwo="; }; meta.homepage = "https://github.com/madskjeldgaard/tree-sitter-supercollider"; }; @@ -2509,12 +2542,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=e2f0b7c"; + version = "0.0.0+rev=c9c669b"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "e2f0b7cf8136b801e4743790b7a956ab29a4d6b0"; - hash = "sha256-DFoNyZmpzSDI37Gto2DxeoRZuDgLtx9NJxyYGIG6lrY="; + rev = "c9c669b4513479e07a0ff44cf14f72351959ac21"; + hash = "sha256-OyT7jkGTuNG7eQrQvZRI49ipu+MMXTOz/1O7r42MaOk="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2554,15 +2587,26 @@ }; tablegen = buildGrammar { language = "tablegen"; - version = "0.0.0+rev=6b7eb09"; + version = "0.0.0+rev=b117088"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-tablegen"; - rev = "6b7eb096621443627cc5e29c8c34ff1fde482cf3"; - hash = "sha256-kdOqHAyKAI4IgI2/GbEx13DWLB8JklURd3ndaicxUno="; + rev = "b1170880c61355aaf38fc06f4af7d3c55abdabc4"; + hash = "sha256-uJCn2RdTnOf/guBUhfodgQ8pMshNh+xUJZunoLwNgrM="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-tablegen"; }; + tact = buildGrammar { + language = "tact"; + version = "0.0.0+rev=034df21"; + src = fetchFromGitHub { + owner = "tact-lang"; + repo = "tree-sitter-tact"; + rev = "034df2162ed7b654efd999942e266be713c7cde0"; + hash = "sha256-2+MVrDPuhrM0HE9uRG5LpmyXYy73Pv3MY20UXwBXalM="; + }; + meta.homepage = "https://github.com/tact-lang/tree-sitter-tact"; + }; tcl = buildGrammar { language = "tcl"; version = "0.0.0+rev=8784024"; @@ -2588,12 +2632,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=e2218a2"; + version = "0.0.0+rev=d631f60"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "e2218a2376e3ff18c9963b21aa567770baab0462"; - hash = "sha256-lyxXb71FVfpWw4IbU5P6uDVETNSDO+r7+YgZDvaIEbc="; + rev = "d631f60287c0904770bc41aa865e249594b52422"; + hash = "sha256-rANNbNlybga+IGNfclMGX0On48sQ3WTWvw3bnhxKsZk="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -2644,23 +2688,23 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=410122a"; + version = "0.0.0+rev=08d9156"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "410122a012abb06fbacc8c0b8f288b684f8113e1"; - hash = "sha256-vWxMaka5h8L+tJctiflEWT1/nofPYHIgpf1/3jfsgVU="; + rev = "08d915655d360bb0b7592d38a533dcc17dcb8dfb"; + hash = "sha256-zE48mJUoCiyF4YDQyZtxMIqUq+99BWT4XGxeTzcWLYY="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; tmux = buildGrammar { language = "tmux"; - version = "0.0.0+rev=1415bd8"; + version = "0.0.0+rev=9138ea5"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-tmux"; - rev = "1415bd8b5bb69c230947663deceb62c2a0ae4155"; - hash = "sha256-3kF6H3tP20FUfNoIRxQCnVzvyd4MFLd9oN6rhB/ePvo="; + rev = "9138ea508410e0f34da2666609f600f65e944f22"; + hash = "sha256-aoKrrDvOM4yOgE7rulGBoN1GeBBHN+dPfyNytC4oMC4="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux"; }; @@ -2677,35 +2721,35 @@ }; toml = buildGrammar { language = "toml"; - version = "0.0.0+rev=8bd2056"; + version = "0.0.0+rev=16a30c8"; src = fetchFromGitHub { - owner = "ikatyang"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-toml"; - rev = "8bd2056818b21860e3d756b5a58c4f6e05fb744e"; - hash = "sha256-z9MWNOBxLHBd/pVs5/QiSSGtaW+DUd7y3wZXcl3hWnk="; + rev = "16a30c83ce427385b8d14939c45c137fcfca6c42"; + hash = "sha256-VYsPM0NVxegfanVaaKkSkEzJ502xkKSjZWrsJpDmack="; }; - meta.homepage = "https://github.com/ikatyang/tree-sitter-toml"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-toml"; }; tsv = buildGrammar { language = "tsv"; - version = "0.0.0+rev=cda48a5"; + version = "0.0.0+rev=7eb7297"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"; - hash = "sha256-K4tOYdI68fXnWbvSat50FL/jDSb8f6gtZOhE6qKPLyg="; + rev = "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"; + hash = "sha256-5VL7uREH0lloAWo9rdJXsjDsWxgL6fngWJSmi4fM7UQ="; }; location = "tsv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=b00b8eb"; + version = "0.0.0+rev=7b4275d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "b00b8eb44f0b9f02556da0b1a4e2f71faed7e61b"; - hash = "sha256-uGuwE1eTVEkuosMfTeY2akHB+bJ5npWEwUv+23nhY9M="; + rev = "7b4275d077ae196fc0ce42ab3ad091574e3ec519"; + hash = "sha256-oRvAU+g2wOZrUexWAsDTY+g9iSXVs5FvGlGIAdcfIfA="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2734,12 +2778,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=b00b8eb"; + version = "0.0.0+rev=7b4275d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "b00b8eb44f0b9f02556da0b1a4e2f71faed7e61b"; - hash = "sha256-uGuwE1eTVEkuosMfTeY2akHB+bJ5npWEwUv+23nhY9M="; + rev = "7b4275d077ae196fc0ce42ab3ad091574e3ec519"; + hash = "sha256-oRvAU+g2wOZrUexWAsDTY+g9iSXVs5FvGlGIAdcfIfA="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2757,12 +2801,12 @@ }; typst = buildGrammar { language = "typst"; - version = "0.0.0+rev=13863dd"; + version = "0.0.0+rev=3924cb9"; src = fetchFromGitHub { owner = "uben0"; repo = "tree-sitter-typst"; - rev = "13863ddcbaa7b68ee6221cea2e3143415e64aea4"; - hash = "sha256-n6RTRMJS3h+g+Wawjb7I9NJbz+w/SGi+DQVj1jiyGaU="; + rev = "3924cb9ed9e0e62ce7df9c4fe0faa4c234795999"; + hash = "sha256-W8mNIASM85btE3XychvagVJofIb+CkNT4XeIhdQt8FU="; }; meta.homepage = "https://github.com/uben0/tree-sitter-typst"; }; @@ -2790,35 +2834,35 @@ }; unison = buildGrammar { language = "unison"; - version = "0.0.0+rev=a1eba0f"; + version = "0.0.0+rev=59d36a0"; src = fetchFromGitHub { owner = "kylegoetz"; repo = "tree-sitter-unison"; - rev = "a1eba0fef887800de97126e2c9ae4109c1c6a2ea"; - hash = "sha256-p0LArEOspQvpgNponLpMakEHrwHM+UzA9SU5PdwQCTU="; + rev = "59d36a09282be7e4d3374854126590f3dcebee6e"; + hash = "sha256-89vFguMlPfKzQ4nmMNdTNFcEiCYH0eSws87Llm88e+I="; }; generate = true; meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison"; }; usd = buildGrammar { language = "usd"; - version = "0.0.0+rev=ab8c30b"; + version = "0.0.0+rev=4e0875f"; src = fetchFromGitHub { owner = "ColinKennedy"; repo = "tree-sitter-usd"; - rev = "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"; - hash = "sha256-Y7AYRpiblBd8xun73UohIf8FFkbNIqSXv44bM3L5uDc="; + rev = "4e0875f724d94d0c2ff36f9b8cb0b12f8b20d216"; + hash = "sha256-r6Sm8FiTgxdYc5cAG5JXVtA5/2jID5H/xmKbjSYn/zI="; }; meta.homepage = "https://github.com/ColinKennedy/tree-sitter-usd"; }; uxntal = buildGrammar { language = "uxntal"; - version = "0.0.0+rev=4c5ecd6"; + version = "0.0.0+rev=ad9b638"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-uxntal"; - rev = "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"; - hash = "sha256-vgeTsRJ3mlR02jXuucmXpszVOmusZwuV0xj/7sSs+WQ="; + rev = "ad9b638b914095320de85d59c49ab271603af048"; + hash = "sha256-hR0EaYv1++MJ0pdBl3ZtyEljitnp5hgFWQa9F6b1KE4="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-uxntal"; }; @@ -2858,45 +2902,45 @@ }; verilog = buildGrammar { language = "verilog"; - version = "0.0.0+rev=2dfddfc"; + version = "0.0.0+rev=075ebfc"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-verilog"; - rev = "2dfddfcb891f74a1cdb9d8ce480a997d11846e17"; - hash = "sha256-ekR9rDaGbDmtzZr0zXubq0brZI4hDsJUzZJTbgxIE2M="; + rev = "075ebfc84543675f12e79a955f79d717772dcef3"; + hash = "sha256-k0Q+MOcZWtXZ99+I+ZyFJ0PZQp2oat2O/7u2UjHzsUg="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog"; }; vhs = buildGrammar { language = "vhs"; - version = "0.0.0+rev=9534865"; + version = "0.0.0+rev=90028bb"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; - rev = "9534865e614c95eb9418e5e73f061c32fa4d9540"; - hash = "sha256-Qf4Y1I/X5xGVZ4u2ud+XdC2dL+0sjR+0pJRJ8SUraiQ="; + rev = "90028bbadb267ead5b87830380f6a825147f0c0f"; + hash = "sha256-yxUVca44z4wtYsxQKaJQjMm0fFeKAOWFnIX+5k6+SJk="; }; meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs"; }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=052279c"; + version = "0.0.0+rev=b448ca6"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vim"; - rev = "052279cd5e1d73b075640c64cef97e7bdcd32611"; - hash = "sha256-EoiMqMcBl5bC1Irs2flA2F5nHN6VTZdv6hdCrqoTAcY="; + rev = "b448ca63f972ade12c373c808acdd2bf972937db"; + hash = "sha256-wQQSeDzcSY9qNVgeDhrELS1x1UoilRa7iHML9qSgchY="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vim"; }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=0b36856"; + version = "0.0.0+rev=b711df7"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "0b36856db88680f662cc67545c82af4ce83bf158"; - hash = "sha256-8kq1Y+WXL6qu8CyS5zmE7pe/a0K5rmiGgZMxj5O/VHY="; + rev = "b711df784dd43d0a8ed8ddbfca0ddcc3239d94b4"; + hash = "sha256-+QbLL5EC3oNiwd7h7MW/mutHhGPUHhbYTQcu6x6atcI="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -2924,12 +2968,12 @@ }; wgsl_bevy = buildGrammar { language = "wgsl_bevy"; - version = "0.0.0+rev=f5980f5"; + version = "0.0.0+rev=59d5fbd"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; - rev = "f5980f534ee64256b1e64b0a42e2864d91154a5d"; - hash = "sha256-LbysBXujWWDVtgyHte9RLOPu/LMk1TN/9DC0t0WWdcQ="; + rev = "59d5fbd562c0e17c45312f49485098cce467f5ac"; + hash = "sha256-4Df7UEHjoIQv4pSdxLlw9c1k0BwnVNRbZ8x/Ky0Q4DE="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; }; @@ -2946,12 +2990,12 @@ }; wit = buildGrammar { language = "wit"; - version = "0.0.0+rev=6f511f9"; + version = "0.0.0+rev=3d6124c"; src = fetchFromGitHub { owner = "liamwh"; repo = "tree-sitter-wit"; - rev = "6f511f9c6676e597c2f0930e4d2629595319882d"; - hash = "sha256-xvMIcbeYdr/KIz0fqnARAwEKWmm4dlWhFAS/NZFU16s="; + rev = "3d6124cfe88555ecee1ba97d6d76c70d13af927a"; + hash = "sha256-a+kMWBwVDDXIcUbTqcCp3RllllScuqrJEMjFTu9SiPc="; }; meta.homepage = "https://github.com/liamwh/tree-sitter-wit"; }; @@ -2968,24 +3012,24 @@ }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=96beba9"; + version = "0.0.0+rev=648183d"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "96beba9f3e4156aaae64bb86997503b1ceb1283d"; - hash = "sha256-XmSU9Om1bj/PtBxr22Sf81Mx68QINtK8Gls1fRldt6Q="; + rev = "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"; + hash = "sha256-O40z5VYmFeE8pkJ85Vu5DWV31YslIrwD80+4qnpoRNY="; }; location = "xml"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; yaml = buildGrammar { language = "yaml"; - version = "0.0.0+rev=ee09311"; + version = "0.0.0+rev=7b03fee"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-yaml"; - rev = "ee093118211be521742b9866a8ed8ce6d87c7a94"; - hash = "sha256-tE39KP86JYYmj8WW1l3HAIiBZr/E4IyOgdsUm6d6pQ8="; + rev = "7b03feefd36b5f155465ca736c6304aca983b267"; + hash = "sha256-hjZQv8kMpjJ29Rl6CEBwb090rFNWP1HPkSECbmTr0zQ="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml"; }; @@ -3002,23 +3046,23 @@ }; yuck = buildGrammar { language = "yuck"; - version = "0.0.0+rev=a513732"; + version = "0.0.0+rev=e877f6a"; src = fetchFromGitHub { owner = "Philipp-M"; repo = "tree-sitter-yuck"; - rev = "a513732feb813426b51d1ead8397a9c285c411be"; - hash = "sha256-XfenP9bXkskCfiq2sE8qLog0NmSecP50Ur+8HDtU4pQ="; + rev = "e877f6ade4b77d5ef8787075141053631ba12318"; + hash = "sha256-l8c1/7q8S78jGyl+VAVVgs8wq58PrrjycyJfWXsCgAI="; }; meta.homepage = "https://github.com/Philipp-M/tree-sitter-yuck"; }; zathurarc = buildGrammar { language = "zathurarc"; - version = "0.0.0+rev=09b837d"; + version = "0.0.0+rev=e9e8de0"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-zathurarc"; - rev = "09b837dc8f7445fd86e1245c23b1a7804229edd4"; - hash = "sha256-t7eBWDfn0nq1nGqSyCZmoSGVGgeTcGFfPrZl62OkD1I="; + rev = "e9e8de071ab79ed1f6e3365f05fcf890b6d85a2f"; + hash = "sha256-yQyoqRGLVSs3bcfUrQNJllWcufROgo1M+jS/ba7OIgo="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index 58524a92d1..c3711bd412 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -19,6 +19,7 @@ , dasht , deno , direnv +, duckdb , fish , fzf , gawk @@ -77,7 +78,7 @@ , # sved dependencies glib , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , # sniprun dependencies bashInteractive , coreutils @@ -245,7 +246,7 @@ }; cmp-git = super.cmp-git.overrideAttrs { - dependencies = with self; [ nvim-cmp ]; + dependencies = with self; [ nvim-cmp plenary-nvim ]; }; cmp-greek = super.cmp-greek.overrideAttrs { @@ -838,6 +839,10 @@ dependencies = with self; [ plenary-nvim ]; }; + luasnip = super.luasnip.overrideAttrs { + dependencies = with self; [ luaPackages.jsregexp ]; + }; + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-03-13"; @@ -1027,8 +1032,32 @@ passthru.python3Dependencies = [ python3.pkgs.mwclient ]; }; + nvim-dbee = super.nvim-dbee.overrideAttrs (oa: let + dbee-go = buildGoModule { + name = "nvim-dbee"; + src = "${oa.src}/dbee"; + vendorHash = "sha256-AItvgOehVskGLARJWDnJLtWM5YHKN/zn/FnZQ0evAtI="; + buildInputs = [ duckdb ]; + }; + in { + dependencies = [ self.nui-nvim ]; + + # nvim-dbee looks for the go binary in paths returned bu M.dir() and M.bin() defined in lua/dbee/install/init.lua + postPatch = '' + substituteInPlace lua/dbee/install/init.lua \ + --replace-fail 'return vim.fn.stdpath("data") .. "/dbee/bin"' 'return "${dbee-go}/bin"' + ''; + + preFixup = '' + mkdir $target/bin + ln -s ${dbee-go}/bin/dbee $target/bin/dbee + ''; + + meta.platforms = lib.platforms.linux; + }); + nvim-navic = super.nvim-navic.overrideAttrs { - dependencies = with self; [ nvim-lspconfig ]; + dependencies = [ self.nvim-lspconfig ]; }; nvim-spectre = super.nvim-spectre.overrideAttrs (old: @@ -1038,7 +1067,7 @@ inherit (old) version src; sourceRoot = "${old.src.name}/spectre_oxi"; - cargoHash = "sha256-UxOAIyVlJWlp5RUFVU3Ib539D5pm6Z+3edjHLerkIRU="; + cargoHash = "sha256-seBq1zJNzNVfCQckIHq7rHI/Y8MyxP88cee3NO7NYgo="; preCheck = '' @@ -1217,12 +1246,12 @@ sniprun = let - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "refs/tags/v${version}"; - hash = "sha256-siM0MBugee2OVaD1alr2hKn9ngoaV3Iy9No/F3wryJs="; + hash = "sha256-PQ3nAZ+bMbHHJWD7cV6h1b3g3TzrakA/N8vVumIooMg="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; @@ -1232,7 +1261,7 @@ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-Gnpv0vAU3kTtCKsV2XGlSbzYuHEqR7iDFeKj9Vhq1UQ="; + cargoHash = "sha256-I8R2V9zoLqiM4lu0D7URoVof68wtKHI+8T8fVrUg7i4="; nativeBuildInputs = [ makeWrapper ]; @@ -1312,11 +1341,11 @@ sved = let - # we put the script in its own derivation to benefit the magic of wrapGAppsHook + # we put the script in its own derivation to benefit the magic of wrapGAppsHook3 svedbackend = stdenv.mkDerivation { name = "svedbackend-${super.sved.name}"; inherit (super.sved) src; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ glib (python3.withPackages (ps: with ps; [ pygobject3 pynvim dbus-python ])) diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock index 0340204a82..a03a20d495 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock @@ -49,9 +49,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -63,53 +63,53 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] @@ -118,6 +118,87 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core", + "base64 0.21.7", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "sync_wrapper 1.0.0", + "tokio", + "tokio-tungstenite", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-extra" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" +dependencies = [ + "axum", + "axum-core", + "bytes", + "futures-util", + "headers", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "serde", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "backtrace" version = "0.3.69" @@ -141,9 +222,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bincode" @@ -162,9 +243,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block" @@ -173,13 +254,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] -name = "bstr" -version = "1.7.0" +name = "block-buffer" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.6", "serde", ] @@ -195,9 +285,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytecount" @@ -205,6 +295,12 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "bytes" version = "1.5.0" @@ -234,9 +330,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" dependencies = [ "serde", ] @@ -263,9 +359,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ "jobserver", "libc", @@ -285,9 +381,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", @@ -295,7 +391,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[package]] @@ -336,9 +432,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" dependencies = [ "clap_builder", "clap_derive", @@ -346,37 +442,37 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.0", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cli" -version = "0.1.52" +version = "0.1.53" dependencies = [ "anyhow", "clap", @@ -413,7 +509,7 @@ dependencies = [ [[package]] name = "code_tools" -version = "0.1.52" +version = "0.1.53" dependencies = [ "cargo_metadata", "maple_config", @@ -453,21 +549,21 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] name = "copypasta" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d35364349bf9e9e1c3a035ddcb00d188d23a3c40c50244c03c27a99fc6a65ae" +checksum = "deb85422867ca93da58b7f95fb5c0c10f6183ed6e1ef8841568968a896d3a858" dependencies = [ "clipboard-win", "objc", @@ -478,9 +574,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -488,15 +584,24 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -539,46 +644,37 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -587,10 +683,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "darling" -version = "0.20.3" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "darling" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -598,38 +704,54 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.38", + "strsim 0.10.0", + "syn 2.0.52", ] [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] -name = "deranged" -version = "0.3.9" +name = "data-encoding" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + [[package]] name = "directories" version = "4.0.1" @@ -641,7 +763,7 @@ dependencies = [ [[package]] name = "dirs" -version = "0.1.52" +version = "0.1.53" dependencies = [ "directories", ] @@ -699,9 +821,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "encode_unicode" @@ -745,11 +867,11 @@ dependencies = [ [[package]] name = "extracted_fzy" -version = "0.1.52" +version = "0.1.53" [[package]] name = "filter" -version = "0.1.52" +version = "0.1.53" dependencies = [ "icon", "matcher", @@ -781,18 +903,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -805,9 +927,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -815,15 +937,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -832,38 +954,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -887,20 +1009,39 @@ dependencies = [ ] [[package]] -name = "gethostname" -version = "0.3.0" +name = "generic-array" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "winapi", + "windows-targets 0.48.5", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", ] [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -909,9 +1050,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "git2" @@ -943,15 +1084,15 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata 0.4.6", + "regex-syntax 0.8.2", ] [[package]] @@ -972,7 +1113,7 @@ dependencies = [ "bstr", "grep-matcher", "log", - "regex-automata 0.4.3", + "regex-automata 0.4.6", "regex-syntax 0.8.2", ] @@ -993,17 +1134,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 1.9.3", + "http 0.2.12", + "indexmap", "slab", "tokio", "tokio-util", @@ -1012,9 +1153,9 @@ dependencies = [ [[package]] name = "half" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ "cfg-if", "crunchy", @@ -1022,15 +1163,33 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] -name = "hashbrown" -version = "0.14.2" +name = "headers" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" +dependencies = [ + "base64 0.21.7", + "bytes", + "headers-core", + "http 1.1.0", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" +dependencies = [ + "http 1.1.0", +] [[package]] name = "heck" @@ -1040,24 +1199,35 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1066,12 +1236,35 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -1089,28 +1282,47 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", "want", ] +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1118,18 +1330,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.28", "rustls", "tokio", "tokio-rustls", ] [[package]] -name = "iana-time-zone" -version = "0.1.58" +name = "hyper-util" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2", + "tokio", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1150,7 +1378,7 @@ dependencies = [ [[package]] name = "icon" -version = "0.1.52" +version = "0.1.53" dependencies = [ "itertools 0.10.5", "pattern", @@ -1165,9 +1393,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1175,39 +1403,28 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" dependencies = [ + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata 0.4.6", "same-file", - "thread_local", "walkdir", "winapi-util", ] [[package]] name = "indexmap" -version = "1.9.3" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown", ] [[package]] @@ -1265,9 +1482,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jni" @@ -1293,18 +1510,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1323,9 +1540,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libgit2-sys" @@ -1341,6 +1558,17 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall 0.4.1", +] + [[package]] name = "libssh2-sys" version = "0.2.23" @@ -1357,9 +1585,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" dependencies = [ "cc", "libc", @@ -1384,9 +1612,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -1400,9 +1628,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lsp-types" @@ -1434,15 +1662,16 @@ dependencies = [ "chrono", "clap", "cli", + "tikv-jemallocator", "tokio", "upgrade", ] [[package]] name = "maple_config" -version = "0.1.52" +version = "0.1.53" dependencies = [ - "dirs 0.1.52", + "dirs 0.1.53", "once_cell", "paths", "serde", @@ -1453,7 +1682,7 @@ dependencies = [ [[package]] name = "maple_core" -version = "0.1.52" +version = "0.1.53" dependencies = [ "async-trait", "base64 0.13.1", @@ -1463,7 +1692,7 @@ dependencies = [ "code_tools", "colors-transform", "copypasta", - "dirs 0.1.52", + "dirs 0.1.53", "filter", "futures", "git2 0.15.0", @@ -1475,12 +1704,12 @@ dependencies = [ "maple_config", "maple_derive", "maple_lsp", + "maple_markdown", "matcher", "once_cell", "parking_lot", "paths", "pattern", - "percent-encoding", "printer", "rayon", "regex", @@ -1488,7 +1717,7 @@ dependencies = [ "rpc", "serde", "serde_json", - "strsim", + "strsim 0.10.0", "sublime_syntax", "subprocess", "thiserror", @@ -1503,7 +1732,7 @@ dependencies = [ [[package]] name = "maple_derive" -version = "0.1.52" +version = "0.1.53" dependencies = [ "async-trait", "darling", @@ -1511,14 +1740,15 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", "types", ] [[package]] name = "maple_lsp" -version = "0.1.52" +version = "0.1.53" dependencies = [ + "dirs 0.1.53", "futures-util", "lsp-types", "parking_lot", @@ -1533,15 +1763,34 @@ dependencies = [ "which", ] +[[package]] +name = "maple_markdown" +version = "0.1.53" +dependencies = [ + "axum", + "axum-extra", + "once_cell", + "percent-encoding", + "pulldown-cmark", + "regex", + "serde_json", + "tokio", + "tracing", + "utils", + "webbrowser", +] + [[package]] name = "matcher" -version = "0.1.52" +version = "0.1.53" dependencies = [ "code_tools", "extracted_fzy", "fuzzy-matcher", "grep-matcher", "grep-regex", + "norm", + "nucleo-matcher", "pattern", "types", ] @@ -1556,38 +1805,26 @@ dependencies = [ ] [[package]] -name = "memchr" -version = "2.6.4" +name = "matchit" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" -version = "0.9.0" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "mime" version = "0.3.17" @@ -1596,18 +1833,18 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -1621,15 +1858,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] -name = "nix" -version = "0.26.4" +name = "norm" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "ed5725a3379c44dc0adf3437af87cf21c10df473ed858d654b12603dea102508" dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", + "memchr", ] [[package]] @@ -1643,10 +1877,26 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.17" +name = "nucleo-matcher" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "bf33f538733d1a5a3494b836ba913207f14d9d4a1d3cd67030c5061bdd2cac85" +dependencies = [ + "memchr", + "unicode-segmentation", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -1704,18 +1954,18 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "onig" @@ -1753,9 +2003,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.100" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae94056a791d0e1217d18b6cbdccb02c61e3054fc69893607f4067e3bb0b1fd1" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ "cc", "libc", @@ -1800,9 +2050,9 @@ dependencies = [ [[package]] name = "paths" -version = "0.1.52" +version = "0.1.53" dependencies = [ - "dirs 0.1.52", + "dirs 0.1.53", "dunce", "itertools 0.10.5", "serde", @@ -1811,7 +2061,7 @@ dependencies = [ [[package]] name = "pattern" -version = "0.1.52" +version = "0.1.53" dependencies = [ "once_cell", "regex", @@ -1819,9 +2069,29 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] [[package]] name = "pin-project-lite" @@ -1837,18 +2107,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ - "base64 0.21.5", - "indexmap 1.9.3", + "base64 0.21.7", + "indexmap", "line-wrap", "quick-xml", "serde", @@ -1897,7 +2167,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "printer" -version = "0.1.52" +version = "0.1.53" dependencies = [ "filter", "icon", @@ -1913,27 +2183,46 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] -name = "quick-xml" -version = "0.30.0" +name = "pulldown-cmark" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "5f0530d13d87d1f549b66a3e8d0c688952abe5994e204ed62615baaf25dc029c" +dependencies = [ + "bitflags 2.4.2", + "getopts", + "memchr", + "pulldown-cmark-escape", + "unicase", +] + +[[package]] +name = "pulldown-cmark-escape" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1976,9 +2265,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -1986,9 +2275,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -2020,24 +2309,24 @@ checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.6", "regex-syntax 0.8.2", ] @@ -2052,9 +2341,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -2067,12 +2356,6 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - [[package]] name = "regex-syntax" version = "0.8.2" @@ -2081,19 +2364,19 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", "h2", - "http", - "http-body", - "hyper", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls", "ipnet", "js-sys", @@ -2107,6 +2390,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-rustls", @@ -2127,21 +2411,22 @@ checksum = "1ebca96b1c05912d531790498048bab5b7b97a756a7bb9df71fa4ef7ef9814e1" [[package]] name = "ring" -version = "0.17.5" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rpc" -version = "0.1.52" +version = "0.1.53" dependencies = [ "serde", "serde_json", @@ -2158,22 +2443,22 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.8" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", @@ -2183,11 +2468,11 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] @@ -2201,10 +2486,16 @@ dependencies = [ ] [[package]] -name = "ryu" -version = "1.0.15" +name = "rustversion" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "safemem" @@ -2239,38 +2530,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.190" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -2278,14 +2569,24 @@ dependencies = [ ] [[package]] -name = "serde_repr" -version = "0.1.17" +name = "serde_path_to_error" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] @@ -2300,6 +2601,17 @@ dependencies = [ "serde", ] +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -2344,28 +2656,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2380,9 +2682,15 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + [[package]] name = "sublime_syntax" -version = "0.1.52" +version = "0.1.53" dependencies = [ "colors-transform", "rgb2ansi256", @@ -2413,9 +2721,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -2423,10 +2731,22 @@ dependencies = [ ] [[package]] -name = "syntect" -version = "5.1.0" +name = "sync_wrapper" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c" + +[[package]] +name = "syntect" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" dependencies = [ "bincode", "bitflags 1.3.2", @@ -2435,8 +2755,9 @@ dependencies = [ "once_cell", "onig", "plist", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", "serde", + "serde_derive", "serde_json", "thiserror", "walkdir", @@ -2478,42 +2799,63 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", ] [[package]] -name = "time" -version = "0.3.30" +name = "tikv-jemalloc-sys" +version = "0.5.4+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "time" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -2528,10 +2870,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -2571,9 +2914,10 @@ dependencies = [ "libc", "mio", "num_cpus", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -2586,7 +2930,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] @@ -2599,6 +2943,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + [[package]] name = "tokio-util" version = "0.7.10" @@ -2634,11 +2990,33 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.1.0", + "indexmap", "toml_datetime", "winnow", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -2651,6 +3029,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2658,11 +3037,12 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", + "thiserror", "time", "tracing-subscriber", ] @@ -2675,7 +3055,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", ] [[package]] @@ -2690,9 +3070,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", @@ -2701,9 +3081,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -2729,9 +3109,9 @@ dependencies = [ [[package]] name = "tree-sitter-bash" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "096f57b3b44c04bfc7b21a4da44bfa16adf1f88aba18993b8478a091076d0968" +checksum = "57da2032c37eb2ce29fd18df7d3b94355fec8d6d854d8f80934955df542b5906" dependencies = [ "cc", "tree-sitter", @@ -2739,9 +3119,9 @@ dependencies = [ [[package]] name = "tree-sitter-c" -version = "0.20.6" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b03bdf218020057abee831581a74bff8c298323d6c6cd1a70556430ded9f4b" +checksum = "4bbd5f3d8658c08581f8f2adac6c391c2e9fa00fe9246bf6c5f52213b9cc6b72" dependencies = [ "cc", "tree-sitter", @@ -2749,9 +3129,9 @@ dependencies = [ [[package]] name = "tree-sitter-cpp" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b4b625f46a7370544b9cf0545532c26712ae49bfc02eb09825db358b9f79e1" +checksum = "46b04a5ada71059afb9895966a6cc1094acc8d2ea1971006db26573e7dfebb74" dependencies = [ "cc", "tree-sitter", @@ -2789,9 +3169,9 @@ dependencies = [ [[package]] name = "tree-sitter-javascript" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbc663376bdd294bd1f0a6daf859aedb9aa5bdb72217d7ad8ba2d5314102cf7" +checksum = "d015c02ea98b62c806f7329ff71c383286dfc3a7a7da0cc484f6e42922f73c2c" dependencies = [ "cc", "tree-sitter", @@ -2799,9 +3179,9 @@ dependencies = [ [[package]] name = "tree-sitter-json" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d82d2e33ee675dc71289e2ace4f8f9cf96d36d81400e9dae5ea61edaf5dea6" +checksum = "5a9a38a9c679b55cc8d17350381ec08d69fa1a17a53fcf197f344516e485ed4d" dependencies = [ "cc", "tree-sitter", @@ -2870,7 +3250,7 @@ dependencies = [ [[package]] name = "tree_sitter" -version = "0.1.52" +version = "0.1.53" dependencies = [ "cc", "criterion", @@ -2898,23 +3278,57 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "types" -version = "0.1.52" +version = "0.1.53" dependencies = [ "icon", "pattern", ] [[package]] -name = "unicode-bidi" -version = "0.3.13" +name = "unicase" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -2924,13 +3338,19 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + [[package]] name = "unicode-width" version = "0.1.11" @@ -2945,7 +3365,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "upgrade" -version = "0.1.52" +version = "0.1.53" dependencies = [ "indicatif", "reqwest", @@ -2955,9 +3375,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -2965,6 +3385,12 @@ dependencies = [ "serde", ] +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "utf8parse" version = "0.2.1" @@ -2973,7 +3399,7 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utils" -version = "0.1.52" +version = "0.1.53" dependencies = [ "bytecount", "memchr", @@ -2993,10 +3419,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] -name = "walkdir" -version = "2.4.0" +name = "version_check" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -3019,9 +3451,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3029,24 +3461,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -3056,9 +3488,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3066,28 +3498,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -3095,9 +3527,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" +checksum = "d1b04c569c83a9bb971dd47ec6fd48753315f4bf989b9b04a2e7ca4d7f0dc950" dependencies = [ "core-foundation", "home", @@ -3112,9 +3544,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "which" @@ -3154,15 +3586,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -3171,11 +3594,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[package]] @@ -3202,7 +3625,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -3237,17 +3660,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "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_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -3264,9 +3687,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -3282,9 +3705,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -3300,9 +3723,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -3318,9 +3741,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -3336,9 +3759,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -3354,9 +3777,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -3372,15 +3795,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.18" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] @@ -3403,34 +3826,30 @@ checksum = "23f6174b2566cc4a74f95e1367ec343e7fa80c93cc8087f5c4a3d6a1088b2118" [[package]] name = "x11-clipboard" -version = "0.8.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41aca1115b1f195f21c541c5efb423470848d48143127d0f07f8b90c27440df" +checksum = "b98785a09322d7446e28a13203d2cae1059a0dd3dfb32cb06d0a225f023d8286" dependencies = [ + "libc", "x11rb", ] [[package]] name = "x11rb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" dependencies = [ "gethostname", - "nix", - "winapi", - "winapi-wsapoll", + "rustix", "x11rb-protocol", ] [[package]] name = "x11rb-protocol" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" -dependencies = [ - "nix", -] +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" [[package]] name = "xshell" @@ -3449,7 +3868,7 @@ checksum = "7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e" [[package]] name = "xtask" -version = "0.1.52" +version = "0.1.53" dependencies = [ "anyhow", "chrono", diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index dade53492f..ba23886437 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix @@ -11,13 +11,13 @@ }: let - version = "0.52"; + version = "0.53"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; rev = "v${version}"; - hash = "sha256-byG4DHa0rTzvlLW+d3eF8xCX8uft4b7HYJDqbVmTdNI="; + hash = "sha256-0D9HMFh0G9Dq78v/Aau7VXN9jBad6ZevqTCjx7FT9Yw="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index 07fff8a3a6..acdd809e54 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -56,6 +56,7 @@ https://github.com/pearofducks/ansible-vim/,, https://github.com/ckarnell/antonys-macro-repeater/,, https://github.com/solarnz/arcanist.vim/,, https://github.com/vim-scripts/argtextobj.vim/,, +https://github.com/otavioschwanck/arrow.nvim/,, https://github.com/AstroNvim/astrotheme/,, https://github.com/prabirshrestha/async.vim/,, https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD, @@ -72,7 +73,7 @@ https://github.com/ray-x/aurora/,, https://github.com/hotwatermorning/auto-git-diff/,, https://github.com/asiryk/auto-hlsearch.nvim/,HEAD, https://github.com/jiangmiao/auto-pairs/,, -https://github.com/pocco81/auto-save.nvim/,HEAD, +https://github.com/okuuva/auto-save.nvim/,HEAD, https://github.com/rmagatti/auto-session/,, https://github.com/m4xshen/autoclose.nvim/,HEAD, https://github.com/gaoDean/autolist.nvim/,, @@ -393,7 +394,7 @@ https://github.com/smoka7/hop.nvim/,, https://github.com/rktjmp/hotpot.nvim/,, https://github.com/lewis6991/hover.nvim/,HEAD, https://github.com/othree/html5.vim/,HEAD, -https://github.com/anuvyklack/hydra.nvim/,HEAD, +https://github.com/nvimtools/hydra.nvim/,HEAD, https://github.com/mboughaba/i3config.vim/,, https://github.com/cocopon/iceberg.vim/,, https://github.com/idris-hackers/idris-vim/,, @@ -467,6 +468,7 @@ https://github.com/ldelossa/litee-filetree.nvim/,, https://github.com/ldelossa/litee-symboltree.nvim/,, https://github.com/ldelossa/litee.nvim/,, https://github.com/smjonas/live-command.nvim/,HEAD, +https://github.com/huggingface/llm.nvim/,HEAD, https://github.com/folke/lsp-colors.nvim/,, https://github.com/lukas-reineke/lsp-format.nvim/,HEAD, https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD, @@ -643,6 +645,7 @@ https://github.com/leoluz/nvim-dap-go/,HEAD, https://github.com/mfussenegger/nvim-dap-python/,HEAD, https://github.com/rcarriga/nvim-dap-ui/,, https://github.com/theHamsta/nvim-dap-virtual-text/,, +https://github.com/kndndrj/nvim-dbee/,HEAD, https://github.com/amrbashir/nvim-docs-view/,HEAD, https://github.com/allendang/nvim-expand-expr/,, https://github.com/vijaymarupudi/nvim-fzf/,, @@ -687,6 +690,7 @@ https://github.com/dstein64/nvim-scrollview/,, https://github.com/s1n7ax/nvim-search-and-replace/,HEAD, https://github.com/dcampos/nvim-snippy/,HEAD, https://github.com/ishan9299/nvim-solarized-lua/,, +https://github.com/lucidph3nx/nvim-sops/,HEAD, https://github.com/nvim-pack/nvim-spectre/,, https://github.com/chrisgrieser/nvim-spider/,HEAD, https://github.com/kylechui/nvim-surround/,main, @@ -934,6 +938,7 @@ https://github.com/xiyaowong/transparent.nvim/,HEAD, https://github.com/Wansmer/treesj/,main, https://github.com/tremor-rs/tremor-vim/,, https://github.com/cappyzawa/trim.nvim/,, +https://github.com/simonmclean/triptych.nvim/,HEAD, https://github.com/folke/trouble.nvim/,, https://github.com/Pocco81/true-zen.nvim/,, https://github.com/tesaguri/trust.vim/,HEAD, @@ -1290,6 +1295,7 @@ https://github.com/tpope/vim-sexp-mappings-for-regular-people/,, https://github.com/itspriddle/vim-shellcheck/,, https://github.com/kshenoy/vim-signature/,, https://github.com/mhinz/vim-signify/,, +https://github.com/sile-typesetter/vim-sile/,HEAD, https://github.com/ivalkeen/vim-simpledb/,, https://github.com/junegunn/vim-slash/,, https://github.com/tpope/vim-sleuth/,, diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix index 7b023118f0..d5536ee3b6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -415,6 +415,7 @@ rec { toVimPlugin = drv: drv.overrideAttrs(oldAttrs: { + name = "vimplugin-${oldAttrs.name}"; # dont move the "doc" folder since vim expects it forceShare = [ "man" "info" ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index 4ab87219a7..983ae07bb1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -1,22 +1,21 @@ -{ lib -, vscode-utils }: +{ lib, vscode-utils }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; in - buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-wakatime"; - publisher = "WakaTime"; - version = "18.0.5"; - hash = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs="; - }; +buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-wakatime"; + publisher = "WakaTime"; + version = "18.0.5"; + hash = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs="; + }; - meta = { - description = '' - Visual Studio Code plugin for automatic time tracking and metrics generated - from your programming activity - ''; - license = lib.licenses.bsd3; - }; - } + meta = { + description = '' + Visual Studio Code plugin for automatic time tracking and metrics generated + from your programming activity + ''; + license = lib.licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index 5717ac0c12..fadcfe758a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -1,11 +1,19 @@ -{ lib, stdenv, vscode-utils, callPackage }: +{ + lib, + stdenv, + vscode-utils, + callPackage, +}: let version = "1.50.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "darwin" - else throw "Unsupported system: ${stdenv.system}"; + if stdenv.isLinux then + "linux" + else if stdenv.isDarwin then + "darwin" + else + throw "Unsupported system: ${stdenv.system}"; analysisDir = "server/analysis_binaries/${arch}"; in vscode-utils.buildVscodeMarketplaceExtension rec { @@ -23,7 +31,10 @@ vscode-utils.buildVscodeMarketplaceExtension rec { meta = { description = "The official VSCode plugin for ReScript"; homepage = "https://github.com/rescript-lang/rescript-vscode"; - maintainers = [ lib.maintainers.dlip lib.maintainers.jayesh-bhoot ]; + maintainers = [ + lib.maintainers.dlip + lib.maintainers.jayesh-bhoot + ]; license = lib.licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix index 9ab9e4f165..9a00fb31cd 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, bash, ocaml, ocamlPackages, dune_3, version }: +{ + lib, + stdenv, + fetchFromGitHub, + bash, + ocaml, + ocamlPackages, + dune_3, + version, +}: stdenv.mkDerivation { pname = "rescript-editor-analysis"; @@ -11,7 +20,11 @@ stdenv.mkDerivation { hash = "sha256-+Ht8qWwxtFWHFMiV/aoZIs2S3SxkOWgdwSKN+akp/LU="; }; - nativeBuildInputs = [ ocaml dune_3 ocamlPackages.cppo ]; + nativeBuildInputs = [ + ocaml + dune_3 + ocamlPackages.cppo + ]; # Skip testing phases because they need to download and install node modules postPatch = '' @@ -28,7 +41,10 @@ stdenv.mkDerivation { meta = { description = "Analysis binary for the ReScript VSCode plugin"; homepage = "https://github.com/rescript-lang/rescript-vscode"; - maintainers = [ lib.maintainers.dlip lib.maintainers.jayesh-bhoot ]; + maintainers = [ + lib.maintainers.dlip + lib.maintainers.jayesh-bhoot + ]; license = lib.licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix index 5ba82c59fe..9202ddb72b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix @@ -1,8 +1,9 @@ -{ graphviz -, jre -, lib -, makeWrapper -, vscode-utils +{ + graphviz, + jre, + lib, + makeWrapper, + vscode-utils, }: vscode-utils.buildVscodeMarketplaceExtension rec { @@ -13,13 +14,9 @@ vscode-utils.buildVscodeMarketplaceExtension rec { hash = "sha256-TvApcBBI+Egu7t4tJuEYTs6mhvABOY2eXVb57O4gWfs="; }; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - graphviz - ]; + buildInputs = [ graphviz ]; postInstall = '' wrapProgram $out/share/vscode/extensions/contextmapper.context-mapper-vscode-extension/lsp/bin/context-mapper-lsp \ diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index 24d0a32ef9..c0ab7f2f87 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -90,8 +90,8 @@ let mktplcRef = { publisher = "42Crunch"; name = "vscode-openapi"; - version = "4.25.1"; - sha256 = "+hKQUJp9c0oyhePFmQEXAqtqKL3fkQ1nhopUPnhRZc4="; + version = "4.25.3"; + hash = "sha256-1kz/M2od2gLSFgqW6LsPHgtm+BwXA+0+7z3HyqNmsOg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog"; @@ -948,35 +948,30 @@ let sources = { "x86_64-linux" = { arch = "linux-x64"; - sha256 = "1y5g8ay9sfz7r21fhwb2wr28yng7w3f2l265ljnfkz8yv8qzqpgk"; + hash = "sha256-GQH+KKteWbCz18AlTWjLWrVpPRxumi+iDPS5n+5xy/0="; }; "x86_64-darwin" = { arch = "darwin-x64"; - sha256 = "14v9p5k9c9s9hfb1ymmkp66kmm9pvnvvljzrrs9wmajss5mlglf5"; + hash = "sha256-xBwuAtvRdOgYkfxP0JaxhAQZx5AJWymDVQ50piTx608="; }; "aarch64-linux" = { arch = "linux-arm64"; - sha256 = "1mngfy42crp8xs14s06rkyzv16ci12bq8y39miyy7wa3a343b0ii"; + hash = "sha256-oLLKnNZ+E06PbUrhj5Y0HOdHhUs/fXd+3lZXX/P2C10="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - sha256 = "1gd1kr91s52kc8ldzy78cbn6gix1b8cvd6jh4sfrhq7k8yyn7g1l"; + hash = "sha256-nWuyqOIELp8MrjzCFH3yu4pWm5KsNxmx3eacgStWKG0="; }; }; in { name = "continue"; publisher = "Continue"; - version = "0.8.22"; + version = "0.8.25"; } // sources.${stdenv.system}; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; - postInstall = '' - cd "$out/$installPrefix" - substituteInPlace "out/extension.js" \ - --replace-fail 'await showTutorial();' '//await showTutorial();' - ''; meta = { description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Continue.continue"; @@ -1268,6 +1263,23 @@ let }; }; + discloud.discloud = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "discloud"; + name = "discloud"; + version = "2.21.2"; + hash = "sha256-es1WjKchxC2hIWOkIRuf5MqMjTYu6qcBgo8abCqTjFc="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog"; + description = "A Visual Studio Code extension for hosting and managing applications on Discloud"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=discloud.discloud"; + homepage = "https://github.com/discloud/vscode-discloud"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.astindev ]; + }; + }; + disneystreaming.smithy = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "disneystreaming"; @@ -1465,8 +1477,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.20.0"; - hash = "sha256-p+YNBRzzA/EezBMxI5Rmdb8SdJgFV7QwuLVi1mcJV+E="; + version = "0.21.1"; + hash = "sha256-z/GhynjkoEcaRp59tYr1lnM5vfV0OaDCcCpC02OdVLE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -1793,8 +1805,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.172.758"; - hash = "sha256-sK3IiA4mQ6Hse+UpZ81Zb5iBSREzTrs7ypsfGbJiXm4="; + version = "1.180.827"; + hash = "sha256-HA1na9FoExIiAay+tEjxWKqpG2+wq4Oww77Gl2Bhciw="; }; meta = { @@ -1810,8 +1822,8 @@ let mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.13.2024022301"; # compatible with vscode >= 1.87 - hash = "sha256-WdojLEdrg6iqTH/cNPEWb6VEfk+gIHh2M5GHrAURjy8="; + version = "0.14.2024032901"; # compatible with vscode 1.88.1 + hash = "sha256-+6N7IGO5j0wP5Zg8CwapHeKGWiZzc43VM4jCtqJDJIQ="; }; meta = { description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; @@ -1899,7 +1911,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=Gleam.gleam"; homepage = "https://github.com/gleam-lang/vscode-gleam#readme"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.msfjarvis ]; + maintainers = [ ]; }; }; @@ -2073,6 +2085,22 @@ let }; }; + hiukky.flate = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "flate"; + publisher = "hiukky"; + version = "0.7.0"; + hash = "sha256-6ouYQk7mHCJdGrcutM1EXolJAT7/Sp1hi+Bu0983GKw="; + }; + meta = { + description = "Colorful dark themes for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=hiukky.flate"; + homepage = "https://github.com/hiukky/flate"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.stunkymonkey ]; + }; + }; + hookyqr.beautify = buildVscodeMarketplaceExtension { mktplcRef = { name = "beautify"; @@ -2177,8 +2205,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "7.18.2"; - hash = "sha256-CEeTLiZktp5YzCRxDXa+s8W9N971iQla/FyCr8Co0SQ="; + version = "7.19.1"; + hash = "sha256-QyGt3q00IEXw6YNvx7pFhLS1s44aeiB/U0m3Ow1UdlM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; @@ -2206,6 +2234,27 @@ let }; }; + jackmacwindows.vscode-computercraft = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-computercraft"; + publisher = "jackmacwindows"; + version = "1.1.1"; + hash = "sha256-ec1I3oQ06iMdSUcqf8yA3GjE7Aqa0PiLzRQLwFcL0KU="; + }; + postInstall = '' + # Remove superflouous images to reduce closure size + rm $out/$installPrefix/images/*.gif + ''; + meta = { + changelog = "https://marketplace.visualstudio.com/items/jackmacwindows.vscode-computercraft/changelog"; + description = "A Visual Studio Code extension for ComputerCraft and CC: Tweaked auto-completion"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jackmacwindows.vscode-computercraft"; + homepage = "https://github.com/MCJack123/vscode-computercraft"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomodachi94 ]; + }; + }; + jackmacwindows.craftos-pc = callPackage ./jackmacwindows.craftos-pc { }; james-yu.latex-workshop = buildVscodeMarketplaceExtension { @@ -2825,6 +2874,22 @@ let ms-python.python = callPackage ./ms-python.python { }; + ms-python.debugpy = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "debugpy"; + publisher = "ms-python"; + version = "2023.3.13121011"; + hash = "sha256-owYUEyQl2FQytApfuI97N4y9p7/dL0lu6EBk/AzSMjw="; + }; + meta = { + description = "Python debugger (debugpy) extension for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.debugpy"; + homepage = "https://github.com/Microsoft/vscode-python-debugger"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.carlthome ]; + }; + }; + ms-python.vscode-pylance = callPackage ./ms-python.vscode-pylance { }; ms-toolsai.datawrangler = buildVscodeMarketplaceExtension { @@ -3402,6 +3467,8 @@ let }; }; + reditorsupport.r = callPackage ./reditorsupport.r { }; + reloadedextensions.reloaded-cpp = buildVscodeMarketplaceExtension { mktplcRef = { name = "reloaded-cpp"; @@ -3470,8 +3537,8 @@ let mktplcRef = { name = "wikitext"; publisher = "RoweWilsonFrederiskHolme"; - version = "3.8.0"; - sha256 = "30540a85163e797028eec9bc3db1866bbf473e98615bf6ade6d1d672017ebe52"; + version = "3.8.1"; + hash = "sha256-piwS3SPjx10nsjN5axC+EN0MEDf0r2lVFllqQzciOfc="; }; meta = { description = "Extension that helps users view and write MediaWiki's Wikitext files"; @@ -4048,6 +4115,8 @@ let }; }; + tekumara.typos-vscode = callPackage ./tekumara.typos-vscode { }; + theangryepicbanana.language-pascal = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-pascal"; @@ -4527,6 +4596,22 @@ let }; }; + vue.volar = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "volar"; + publisher = "Vue"; + version = "2.0.16"; + hash = "sha256-RTBbF7qahYP4L7SZ/5aCM/e5crZAyyPRcgL48FVL1jk="; + }; + meta = { + changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md"; + description = "The official Vue VSCode extension"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Vue.volar"; + homepage = "https://github.com/vuejs/language-tools"; + license = lib.licenses.mit; + }; + }; + vspacecode.whichkey = buildVscodeMarketplaceExtension { mktplcRef = { name = "whichkey"; @@ -4539,6 +4624,22 @@ let }; }; + vue.vscode-typescript-vue-plugin = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-typescript-vue-plugin"; + publisher = "Vue"; + version = "1.8.27"; + hash = "sha256-ym1+WPKBcn4h9lqSFVehfiDoGUEviOSEVXVLhHcYvfc="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/Vue.vscode-typescript-vue-plugin/changelog"; + description = "Vue VSCode extension for TypeScript"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin"; + homepage = "https://github.com/vuejs/language-tools"; + license = lib.licenses.mit; + }; + }; + waderyan.gitblame = buildVscodeMarketplaceExtension { mktplcRef = { name = "gitblame"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix index f84f625779..ba20cb5b3b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix @@ -1,6 +1,4 @@ -{ lib -, vscode-utils -}: +{ lib, vscode-utils }: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix index a73da88643..dca2a081d9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix @@ -1,4 +1,8 @@ -{ lib, vscode-utils, terraform-ls }: +{ + lib, + vscode-utils, + terraform-ls, +}: vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix index 005f78f4f4..27f091d511 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "craftos-pc"; publisher = "jackmacwindows"; - version = "1.2.2"; - hash = "sha256-A+MNroXv0t9Mw/gr0Fyov3cXyF/GGzwRLKrIxQ2tKCE="; + version = "1.2.3"; + hash = "sha256-QoLMefSmownw9AEem0jx1+BF1bcolHYpiqyPKQNkdiQ="; }; nativeBuildInputs = [ jq diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix index 0f11ddc5ed..afe4cd7bdb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix @@ -1,4 +1,10 @@ -{ lib, vscode-utils, plantuml, jq, moreutils }: +{ + lib, + vscode-utils, + plantuml, + jq, + moreutils, +}: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { @@ -7,7 +13,10 @@ vscode-utils.buildVscodeMarketplaceExtension { version = "2.17.4"; hash = "sha256-fnz6ubB73i7rJcv+paYyNV1r4cReuyFPjgPM0HO40ug="; }; - nativeBuildInputs = [ jq moreutils ]; + nativeBuildInputs = [ + jq + moreutils + ]; postInstall = '' cd "$out/$installPrefix" jq '.contributes.configuration.properties."plantuml.java".default = "${plantuml}/bin/plantuml"' package.json | sponge package.json @@ -15,13 +24,10 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = { description = "A Visual Studio Code extension for supporting Rich PlantUML"; - downloadPage = - "https://marketplace.visualstudio.com/items?itemName=jebbs.plantuml"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jebbs.plantuml"; homepage = "https://github.com/qjebbs/vscode-plantuml"; - changelog = - "https://marketplace.visualstudio.com/items/jebbs.plantuml/changelog"; + changelog = "https://marketplace.visualstudio.com/items/jebbs.plantuml/changelog"; license = lib.licenses.mit; maintainers = [ lib.maintainers.victormignot ]; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/language-packs.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/language-packs.nix index 3c3253e2c3..6c522acaa1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/language-packs.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/language-packs.nix @@ -4,7 +4,12 @@ with vscode-utils; let - buildVscodeLanguagePack = { language, version ? "1.76.2023030809", sha256 }: + buildVscodeLanguagePack = + { + language, + version ? "1.76.2023030809", + sha256, + }: buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-language-pack-${language}"; @@ -15,7 +20,6 @@ let license = lib.licenses.mit; }; }; - in # See list of core language packs at https://github.com/Microsoft/vscode-loc diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix index 6c7ba096f6..4f947a4935 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix @@ -1,4 +1,11 @@ -{ publisher, name, version, arch ? "", sha256 ? "", hash ? "" }: +{ + publisher, + name, + version, + arch ? "", + sha256 ? "", + hash ? "", +}: let archurl = (if arch == "" then "" else "?targetPlatform=${arch}"); in diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index e8f5f60ee9..50480e3460 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -1,56 +1,59 @@ -{ lib -, icu -, openssl -, patchelf -, stdenv -, vscode-utils +{ + lib, + icu, + openssl, + patchelf, + stdenv, + vscode-utils, }: let inherit (stdenv.hostPlatform) system; inherit (vscode-utils) buildVscodeMarketplaceExtension; - extInfo = { - x86_64-linux = { - arch = "linux-x64"; - hash = "sha256-7m85Zl9oV40le3nkNPzoKu/AAf8XhQpI8sBMsQXmBg8="; - binaries = [ - "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller" - "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost" - "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-x64/Microsoft.VisualStudio.Reliability.Monitor" - "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-server.linux-x64/Microsoft.VisualStudio.Code.Server" - ]; - }; - aarch64-linux = { - arch = "linux-arm64"; - hash = "sha256-39D55EdwE4baDYbHc9GD/1XoxGbQkUkS1H2uysJHlxw="; - binaries = [ - "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller" - "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost" - "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-arm64/Microsoft.VisualStudio.Reliability.Monitor" - "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-server.linux-arm64/Microsoft.VisualStudio.Code.Server" - ]; - }; - x86_64-darwin = { - arch = "darwin-x64"; - hash = "sha256-gfhJX07R+DIw9FbzaEE0JZwEmDeifiq4vHyMHZZ1udM="; - binaries = [ - "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller" - "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost" - "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-x64/Microsoft.VisualStudio.Reliability.Monitor" - "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-server.darwin-x64/Microsoft.VisualStudio.Code.Server" - ]; - }; - aarch64-darwin = { - arch = "darwin-arm64"; - hash = "sha256-vogstgCWvI9csNF9JfJ41XPR1POy842g2yhWqIDoHLw="; - binaries = [ - "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller" - "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost" - "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-arm64/Microsoft.VisualStudio.Reliability.Monitor" - "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-server.darwin-arm64/Microsoft.VisualStudio.Code.Server" - ]; - }; - }.${system} or (throw "Unsupported system: ${system}"); + extInfo = + { + x86_64-linux = { + arch = "linux-x64"; + hash = "sha256-7m85Zl9oV40le3nkNPzoKu/AAf8XhQpI8sBMsQXmBg8="; + binaries = [ + "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller" + "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost" + "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-x64/Microsoft.VisualStudio.Reliability.Monitor" + "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-server.linux-x64/Microsoft.VisualStudio.Code.Server" + ]; + }; + aarch64-linux = { + arch = "linux-arm64"; + hash = "sha256-39D55EdwE4baDYbHc9GD/1XoxGbQkUkS1H2uysJHlxw="; + binaries = [ + "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller" + "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost" + "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-arm64/Microsoft.VisualStudio.Reliability.Monitor" + "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-server.linux-arm64/Microsoft.VisualStudio.Code.Server" + ]; + }; + x86_64-darwin = { + arch = "darwin-x64"; + hash = "sha256-gfhJX07R+DIw9FbzaEE0JZwEmDeifiq4vHyMHZZ1udM="; + binaries = [ + "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller" + "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost" + "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-x64/Microsoft.VisualStudio.Reliability.Monitor" + "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-server.darwin-x64/Microsoft.VisualStudio.Code.Server" + ]; + }; + aarch64-darwin = { + arch = "darwin-arm64"; + hash = "sha256-vogstgCWvI9csNF9JfJ41XPR1POy842g2yhWqIDoHLw="; + binaries = [ + "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller" + "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost" + "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-arm64/Microsoft.VisualStudio.Reliability.Monitor" + "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-server.darwin-arm64/Microsoft.VisualStudio.Code.Server" + ]; + }; + } + .${system} or (throw "Unsupported system: ${system}"); in buildVscodeMarketplaceExtension { mktplcRef = { @@ -61,50 +64,55 @@ buildVscodeMarketplaceExtension { }; sourceRoot = "extension"; # This has more than one folder. - nativeBuildInputs = [ - patchelf - ]; + nativeBuildInputs = [ patchelf ]; - postPatch = '' - declare ext_unique_id - ext_unique_id="$(basename "$out" | head -c 32)" + postPatch = + '' + declare ext_unique_id + ext_unique_id="$(basename "$out" | head -c 32)" - patchelf_add_icu_as_needed() { - declare elf="''${1?}" - declare icu_major_v="${ - lib.head (lib.splitVersion (lib.getVersion icu.name)) - }" + patchelf_add_icu_as_needed() { + declare elf="''${1?}" + declare icu_major_v="${lib.head (lib.splitVersion (lib.getVersion icu.name))}" - for icu_lib in icui18n icuuc icudata; do - patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf" - done - } + for icu_lib in icui18n icuuc icudata; do + patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf" + done + } - patchelf_common() { - declare elf="''${1?}" + patchelf_common() { + declare elf="''${1?}" - patchelf_add_icu_as_needed "$elf" - patchelf --add-needed "libssl.so" "$elf" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${lib.makeLibraryPath [stdenv.cc.cc openssl icu.out]}:\$ORIGIN" \ - "$elf" - } + patchelf_add_icu_as_needed "$elf" + patchelf --add-needed "libssl.so" "$elf" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${ + lib.makeLibraryPath [ + stdenv.cc.cc + openssl + icu.out + ] + }:\$ORIGIN" \ + "$elf" + } - substituteInPlace dist/extension.js \ - --replace 'e.extensionPath,"cache"' 'require("os").tmpdir(),"'"$ext_unique_id"'"' \ - --replace 't.setExecuteBit=async function(e){if("win32"!==process.platform){const t=i.join(e[a.SERVICEHUB_CONTROLLER_COMPONENT_NAME],"Microsoft.ServiceHub.Controller"),n=i.join(e[a.SERVICEHUB_HOST_COMPONENT_NAME],(0,a.getServiceHubHostEntrypointName)()),r=[(0,a.getServerPath)(e),t,n,(0,c.getReliabilityMonitorPath)(e)];await Promise.all(r.map((e=>(0,o.chmod)(e,"0755"))))}}' 't.setExecuteBit=async function(e){}' + substituteInPlace dist/extension.js \ + --replace 'e.extensionPath,"cache"' 'require("os").tmpdir(),"'"$ext_unique_id"'"' \ + --replace 't.setExecuteBit=async function(e){if("win32"!==process.platform){const t=i.join(e[a.SERVICEHUB_CONTROLLER_COMPONENT_NAME],"Microsoft.ServiceHub.Controller"),n=i.join(e[a.SERVICEHUB_HOST_COMPONENT_NAME],(0,a.getServiceHubHostEntrypointName)()),r=[(0,a.getServerPath)(e),t,n,(0,c.getReliabilityMonitorPath)(e)];await Promise.all(r.map((e=>(0,o.chmod)(e,"0755"))))}}' 't.setExecuteBit=async function(e){}' - '' - + (lib.concatStringsSep "\n" (map - (bin: '' - chmod +x "${bin}" - '') - extInfo.binaries)) - + lib.optionalString stdenv.isLinux (lib.concatStringsSep "\n" (map - (bin: '' - patchelf_common "${bin}" - '') - extInfo.binaries)); + '' + + (lib.concatStringsSep "\n" ( + map (bin: '' + chmod +x "${bin}" + '') extInfo.binaries + )) + + lib.optionalString stdenv.isLinux ( + lib.concatStringsSep "\n" ( + map (bin: '' + patchelf_common "${bin}" + '') extInfo.binaries + ) + ); meta = { changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.csdevkit/changelog"; @@ -112,6 +120,11 @@ buildVscodeMarketplaceExtension { downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit"; license = lib.licenses.unfree; maintainers = [ lib.maintainers.ggg ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index 213ce3550f..189804e981 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -1,11 +1,11 @@ -{ lib -, vscode-utils -, patchelf -, icu -, stdenv -, openssl -, coreutils -, +{ + lib, + vscode-utils, + patchelf, + icu, + stdenv, + openssl, + coreutils, }: let inherit (stdenv.hostPlatform) system; @@ -26,31 +26,32 @@ let ".debugger/x86_64/vsdbg" ]; in - { - x86_64-linux = { - arch = "linux-x64"; - hash = "sha256-si4HKGVIHu44QNlNI2WEnMff9+QZOMWiBfWQaaFGyQE="; - binaries = linuxBins; - }; - aarch64-linux = { - arch = "linux-arm64"; - hash = "sha256-1IXkSRgCHOLD4VeCdqyy54MXCBUX5RDDb3pf7GQH5jA="; - binaries = linuxBins; - }; - x86_64-darwin = { - arch = "darwin-x64"; - hash = "sha256-AAbYjZ+YYyGEXSLkiFfluLf7P4OzPhmHzK44N5XT9UI="; - binaries = darwinBins; - }; - aarch64-darwin = { - arch = "darwin-arm64"; - hash = "sha256-1m47kX0Jo+UvthNfgdoPdBBOcDyCA8DfP+zRk3SicR0="; - binaries = darwinBins ++ [ - ".debugger/arm64/vsdbg-ui" - ".debugger/arm64/vsdbg" - ]; - }; - }.${system} or (throw "Unsupported system: ${system}"); + { + x86_64-linux = { + arch = "linux-x64"; + hash = "sha256-si4HKGVIHu44QNlNI2WEnMff9+QZOMWiBfWQaaFGyQE="; + binaries = linuxBins; + }; + aarch64-linux = { + arch = "linux-arm64"; + hash = "sha256-1IXkSRgCHOLD4VeCdqyy54MXCBUX5RDDb3pf7GQH5jA="; + binaries = linuxBins; + }; + x86_64-darwin = { + arch = "darwin-x64"; + hash = "sha256-AAbYjZ+YYyGEXSLkiFfluLf7P4OzPhmHzK44N5XT9UI="; + binaries = darwinBins; + }; + aarch64-darwin = { + arch = "darwin-arm64"; + hash = "sha256-1m47kX0Jo+UvthNfgdoPdBBOcDyCA8DfP+zRk3SicR0="; + binaries = darwinBins ++ [ + ".debugger/arm64/vsdbg-ui" + ".debugger/arm64/vsdbg" + ]; + }; + } + .${system} or (throw "Unsupported system: ${system}"); in buildVscodeMarketplaceExtension { mktplcRef = { @@ -60,16 +61,13 @@ buildVscodeMarketplaceExtension { inherit (extInfo) hash arch; }; - nativeBuildInputs = [ - patchelf - ]; + nativeBuildInputs = [ patchelf ]; - postPatch = '' + postPatch = + '' patchelf_add_icu_as_needed() { declare elf="''${1?}" - declare icu_major_v="${ - lib.head (lib.splitVersion (lib.getVersion icu.name)) - }" + declare icu_major_v="${lib.head (lib.splitVersion (lib.getVersion icu.name))}" for icu_lib in icui18n icuuc icudata; do patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf" @@ -82,7 +80,13 @@ buildVscodeMarketplaceExtension { patchelf_add_icu_as_needed "$elf" patchelf --add-needed "libssl.so" "$elf" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${lib.makeLibraryPath [stdenv.cc.cc openssl icu.out]}:\$ORIGIN" \ + --set-rpath "${ + lib.makeLibraryPath [ + stdenv.cc.cc + openssl + icu.out + ] + }:\$ORIGIN" \ "$elf" } @@ -90,22 +94,29 @@ buildVscodeMarketplaceExtension { --replace 'uname -m' '${lib.getExe' coreutils "uname"} -m' '' - + (lib.concatStringsSep "\n" (map - (bin: '' + + (lib.concatStringsSep "\n" ( + map (bin: '' chmod +x "${bin}" - '') - extInfo.binaries)) - + lib.optionalString stdenv.isLinux (lib.concatStringsSep "\n" (map - (bin: '' - patchelf_common "${bin}" - '') - extInfo.binaries)); + '') extInfo.binaries + )) + + lib.optionalString stdenv.isLinux ( + lib.concatStringsSep "\n" ( + map (bin: '' + patchelf_common "${bin}" + '') extInfo.binaries + ) + ); meta = { description = "Official C# support for Visual Studio Code"; homepage = "https://github.com/dotnet/vscode-csharp"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ggg ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index 25091b95ef..35bc6cdcef 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -1,27 +1,28 @@ -{ lib -, vscode-utils -, icu -, python3 +{ + lib, + vscode-utils, + icu, + python3, # When `true`, the python default setting will be fixed to specified. # Use version from `PATH` for default setting otherwise. # Defaults to `false` as we expect it to be project specific most of the time. -, pythonUseFixed ? false + pythonUseFixed ? false, # For updateScript -, writeScript -, bash -, curl -, coreutils -, gnused -, jq -, nix + writeScript, + bash, + curl, + coreutils, + gnused, + jq, + nix, }: vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2023.1.10091012"; - hash = "sha256-JosFv6ngJmw1XRILwTZMVxlGIdWFLFQjj4olfnVwAIM="; + version = "2024.5.11021008"; + hash = "sha256-UnI0leRKqCtFLBdGS/UvLuCcxQhibyY0ChmzQ9uytoY="; }; buildInputs = [ icu ]; @@ -33,33 +34,37 @@ vscode-utils.buildVscodeMarketplaceExtension rec { jedi-language-server ]; - postPatch = '' - # remove bundled python deps and use libs from nixpkgs - rm -r pythonFiles/lib - mkdir -p pythonFiles/lib/python/ - ln -s ${python3.pkgs.debugpy}/lib/*/site-packages/debugpy pythonFiles/lib/python/ - buildPythonPath "$propagatedBuildInputs" - for i in pythonFiles/*.py; do - patchPythonScript "$i" - done - '' + lib.optionalString pythonUseFixed '' - # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`. - substituteInPlace "./package.json" \ - --replace "\"default\": \"python\"" "\"default\": \"${python3.interpreter}\"" - ''; + postPatch = + '' + # remove bundled python deps and use libs from nixpkgs + rm -r python_files/lib + mkdir -p python_files/lib/python/ + ln -s ${python3.pkgs.debugpy}/lib/*/site-packages/debugpy python_files/lib/python/ + buildPythonPath "$propagatedBuildInputs" + for i in python_files/*.py; do + patchPythonScript "$i" + done + '' + + lib.optionalString pythonUseFixed '' + # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`. + substituteInPlace "./package.json" \ + --replace "\"default\": \"python\"" "\"default\": \"${python3.interpreter}\"" + ''; passthru.updateScript = writeScript "update" '' #! ${bash}/bin/bash set -eu -o pipefail - export PATH=${lib.makeBinPath [ - curl - coreutils - gnused - jq - nix - ]} + export PATH=${ + lib.makeBinPath [ + curl + coreutils + gnused + jq + nix + ] + } api=$(curl -s 'https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery' \ -H 'accept: application/json;api-version=3.0-preview.1' \ @@ -82,7 +87,14 @@ vscode-utils.buildVscodeMarketplaceExtension rec { homepage = "https://github.com/Microsoft/vscode-python"; changelog = "https://github.com/microsoft/vscode-python/releases"; license = lib.licenses.mit; - platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; - maintainers = [ lib.maintainers.jraygauthier lib.maintainers.jfchevrette ]; + platforms = [ + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + maintainers = [ + lib.maintainers.jraygauthier + lib.maintainers.jfchevrette + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index c5ae57e0f6..ad8c6a9eac 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2023.8.50"; - hash = "sha256-xJU/j5r/Idp/0VorEfciT4SFKRBpMCv9Z0LKO/++1Gk="; + version = "2024.5.1"; + hash = "sha256-w+T4dySTt2RpdBYd1Nnxh8RR9wqEu9pkS4R1Ay7Fn+8="; }; buildInputs = [ pyright ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix index 99de6b59b1..41803cadb3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix @@ -1,4 +1,9 @@ -{ lib, vscode-utils, jq, moreutils }: +{ + lib, + vscode-utils, + jq, + moreutils, +}: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix index 63e351f69b..3872aad7ea 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix @@ -1,7 +1,8 @@ -{ lib -, nixosTests -, vscode-utils -, useLocalExtensions ? false +{ + lib, + nixosTests, + vscode-utils, + useLocalExtensions ? false, }: # Note that useLocalExtensions requires that vscode-server is not running # on host. If it is, you'll need to remove $HOME/.vscode-server, @@ -92,7 +93,9 @@ buildVscodeMarketplaceExtension { --replace '# Start the server\n' '${patch}' ''; - passthru.tests = { inherit (nixosTests) vscode-remote-ssh; }; + passthru.tests = { + inherit (nixosTests) vscode-remote-ssh; + }; meta = { description = "Use any remote machine with a SSH server as your development environment."; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index bd1d6bf66e..731bddc355 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -1,8 +1,19 @@ -{ lib, vscode-utils -, fetchurl, writeScript, runtimeShell -, jq, clang-tools -, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. -, autoPatchelfHook, makeWrapper, stdenv, lttng-ust, libkrb5, zlib +{ + lib, + vscode-utils, + fetchurl, + writeScript, + runtimeShell, + jq, + clang-tools, + gdbUseFixed ? true, + gdb, # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. + autoPatchelfHook, + makeWrapper, + stdenv, + lttng-ust, + libkrb5, + zlib, }: /* @@ -32,11 +43,11 @@ let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; supported = { x86_64-linux = { - hash = "sha256-4mKCBqUCOndKEfsJqTIsfwEt+0CZI8QAhBj3Y4+wKlg="; + hash = "sha256-p8WFmkQKdzXF0FTWHabyeFMkwXa2RkDRM9SvvkBIOLY="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-Kjl8mEpayA1xMHEAMJ5k3Ctk3l48KlUBU5w3dL4pGWM="; + hash = "sha256-HISE8/M9IpeI8iX0mmw9owExnpgiwpesE7YG/+QFYgc="; arch = "linux-arm64"; }; }; @@ -47,7 +58,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "cpptools"; publisher = "ms-vscode"; - version = "1.17.3"; + version = "1.20.2"; }; nativeBuildInputs = [ @@ -94,7 +105,13 @@ vscode-utils.buildVscodeMarketplaceExtension { description = "The C/C++ extension adds language support for C/C++ to Visual Studio Code, including features such as IntelliSense and debugging."; homepage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools"; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.jraygauthier lib.maintainers.stargate01 ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = [ + lib.maintainers.jraygauthier + lib.maintainers.stargate01 + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix index 0f70451c46..180490e60a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix @@ -1,4 +1,8 @@ -{ lib, vscode-utils, xsel }: +{ + lib, + vscode-utils, + xsel, +}: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 9dbf71b8b1..b8281e83c5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { publisher = "myriad-dreamin"; # Please update the corresponding binary (tinymist) when updating # this extension. - version = "0.11.5"; - hash = "sha256-p97RREGKhTeXO5s4jP8qUsLtYxOj91ddQhsk6Q+50jc="; + version = "0.11.8"; + hash = "sha256-ELqk94xhPJwHlxQ0ie9DMBNOiqszpi3mYF+wHxoY2xw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix index ec05452124..22344e3b2b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { publisher = "nvarner"; # Please update the corresponding binary (typst-lsp) when updating # this extension. - version = "0.12.1"; - hash = "sha256-JcfFaR1wU5XwapH8vnfVy7Cb7DfUWVeoLfBV3wEtCpE="; + version = "0.13.0"; + hash = "sha256-xiFUJymZOTEqlGvCHvLiI0pVg7NLgIXhZ7x8yx+a5mY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix new file mode 100644 index 0000000000..cc7a8d9ab4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix @@ -0,0 +1,42 @@ +{ + lib, + vscode-utils, + jq, + moreutils, + python311Packages, + R, + rPackages, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "r"; + publisher = "reditorsupport"; + version = "2.8.3"; + hash = "sha256-3HVBBXMdRhnKLnhrbEQFIlIbB/rbj+AAb4/z3/Ch7eg="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + buildInputs = [ + python311Packages.radian + R + rPackages.languageserver + ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."r.rpath.mac".default = "${lib.getExe' R "R"}"' package.json | sponge package.json + jq '.contributes.configuration.properties."r.rpath.linux".default = "${lib.getExe' R "R"}"' package.json | sponge package.json + jq '.contributes.configuration.properties."r.rterm.mac".default = "${lib.getExe python311Packages.radian}"' package.json | sponge package.json + jq '.contributes.configuration.properties."r.rterm.linux".default = "${lib.getExe python311Packages.radian}"' package.json | sponge package.json + ''; + meta = { + changelog = "https://marketplace.visualstudio.com/items/REditorSupport.r/changelog"; + description = "A Visual Studio Code extension for the R programming language"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=REditorSupport.r"; + homepage = "https://github.com/REditorSupport/vscode-R"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index 056904390c..6fd65c9ae9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -1,16 +1,17 @@ -{ lib -, fetchFromGitHub -, vscode-utils -, jq -, rust-analyzer -, nodePackages -, moreutils -, esbuild -, pkg-config -, libsecret -, stdenv -, darwin -, setDefaultServerPath ? true +{ + lib, + fetchFromGitHub, + vscode-utils, + jq, + rust-analyzer, + nodePackages, + moreutils, + esbuild, + pkg-config, + libsecret, + stdenv, + darwin, + setDefaultServerPath ? true, }: let @@ -29,26 +30,32 @@ let hash = "sha256-Oj/RPMridKpYt3eRqUIPg9YNrj6npG8THIGuWjsamnE="; }; - build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"; + build-deps = + nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"; # FIXME: Making a new derivation to link `node_modules` and run `npm run package` # will cause a build failure. vsix = build-deps.override { src = "${src}/editors/code"; - outputs = [ "vsix" "out" ]; + outputs = [ + "vsix" + "out" + ]; inherit releaseTag; - nativeBuildInputs = [ - jq - moreutils - esbuild - # Required by `keytar`, which is a dependency of `vsce`. - pkg-config - libsecret - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + nativeBuildInputs = + [ + jq + moreutils + esbuild + # Required by `keytar`, which is a dependency of `vsce`. + pkg-config + libsecret + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Security + ]; # Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65 postRebuild = '' @@ -65,7 +72,6 @@ let echo y | npx vsce package -o $vsix/${pname}.zip ''; }; - in vscode-utils.buildVscodeExtension { inherit version vsix; @@ -75,7 +81,10 @@ vscode-utils.buildVscodeExtension { vscodeExtPublisher = publisher; vscodeExtName = pname; - nativeBuildInputs = lib.optionals setDefaultServerPath [ jq moreutils ]; + nativeBuildInputs = lib.optionals setDefaultServerPath [ + jq + moreutils + ]; preInstall = lib.optionalString setDefaultServerPath '' jq '.contributes.configuration.properties."rust-analyzer.server.path".default = $s' \ @@ -86,9 +95,11 @@ vscode-utils.buildVscodeExtension { meta = { description = "An alternative rust language server to the RLS"; homepage = "https://github.com/rust-lang/rust-analyzer"; - license = [ lib.licenses.mit lib.licenses.asl20 ]; + license = [ + lib.licenses.mit + lib.licenses.asl20 + ]; maintainers = [ ]; platforms = lib.platforms.all; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix index a6a33854d3..4a8db2db4b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix @@ -1,6 +1,7 @@ -{ lib -, vscode-utils -, lua-language-server +{ + lib, + vscode-utils, + lua-language-server, }: vscode-utils.buildVscodeMarketplaceExtension { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix new file mode 100644 index 0000000000..140a371efd --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -0,0 +1,64 @@ +{ + stdenv, + jq, + lib, + moreutils, + typos-lsp, + vscode-utils, +}: +let + inherit (stdenv.hostPlatform) system; + + extInfo = + { + x86_64-linux = { + arch = "linux-x64"; + hash = "sha256-CPUlJ1QzGiZKd4r46Iioc5svw0oLsMsYnc0KxT1p0zM="; + }; + aarch64-linux = { + arch = "linux-arm64"; + hash = "sha256-qSTCZHL7nfB300qwuqgl/4u+SYNMA2BFCrD+yQEgN/c="; + }; + x86_64-darwin = { + arch = "darwin-x64"; + hash = "sha256-FcZH2bB5B3wnu6F76kGp9FBdD3yZtr57TQ5xaUfRcmY="; + }; + aarch64-darwin = { + arch = "darwin-arm64"; + hash = "sha256-3HdK4x2WNdb9Zxqjtn9lmbgrMOzz14rH0ZF0x9B0BHY="; + }; + } + .${system} or (throw "Unsupported system: ${system}"); +in +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "typos-vscode"; + publisher = "tekumara"; + # Please update the corresponding binary (typos-lsp) + # when updating this extension. + # See pkgs/by-name/ty/typos-lsp/package.nix + version = "0.1.18"; + inherit (extInfo) hash arch; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ typos-lsp ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."typos.path".default = "${lib.getExe typos-lsp}"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/tekumara.typos-vscode/changelog"; + description = "A VSCode extension for providing a low false-positive source code spell checker"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=tekumara.typos-vscode"; + homepage = "https://github.com/tekumara/typos-lsp"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.drupol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/updateSettings.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/updateSettings.nix index 443b409302..fe23e099b5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/updateSettings.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/updateSettings.nix @@ -1,39 +1,43 @@ # Updates the vscode setting file base on a nix expression # should run from the workspace root. -{ writeShellScriptBin -, lib -, jq +{ + writeShellScriptBin, + lib, + jq, }: ##User Input -{ settings ? {} -# if marked as true will create an empty json file if does not exist -, createIfDoesNotExists ? true -, vscodeSettingsFile ? ".vscode/settings.json" -, userSettingsFolder ? "" -, symlinkFromUserSetting ? false +{ + settings ? { }, + # if marked as true will create an empty json file if does not exist + createIfDoesNotExists ? true, + vscodeSettingsFile ? ".vscode/settings.json", + userSettingsFolder ? "", + symlinkFromUserSetting ? false, }: let updateVSCodeSettingsCmd = '' - ( - echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' - oldSettings=$(cat ${vscodeSettingsFile}) - echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFile} - )''; + ( + echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' + oldSettings=$(cat ${vscodeSettingsFile}) + echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFile} + )''; createEmptySettingsCmd = ''mkdir -p .vscode && echo "{}" > ${vscodeSettingsFile}''; fileName = builtins.baseNameOf vscodeSettingsFile; - symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting - '' && mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" ''; + symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting ''&& mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" ''; in - writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (fileName)}'' - (lib.optionalString (settings != {}) - (if createIfDoesNotExists then '' - [ ! -f "${vscodeSettingsFile}" ] && ${createEmptySettingsCmd} - ${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd} - '' - else ''[ -f "${vscodeSettingsFile}" ] && ${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd} - '' - ) +writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (fileName)}'' ( + lib.optionalString (settings != { }) ( + if createIfDoesNotExists then + '' + [ ! -f "${vscodeSettingsFile}" ] && ${createEmptySettingsCmd} + ${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd} + '' + else + '' + [ -f "${vscodeSettingsFile}" ] && ${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd} + '' ) +) diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix index 097b9cad16..f123500775 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix @@ -1,5 +1,5 @@ -with import {}; -callPackage (import ./updateSettings.nix) {} { +with import { }; +callPackage (import ./updateSettings.nix) { } { settings = { a = "fdsdf"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index b6e47094d5..8ed7c0b946 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -1,5 +1,20 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, runCommand, rustPlatform, makeWrapper, llvmPackages -, buildNpmPackage, cmake, nodejs, unzip, python3, pkg-config, libsecret, darwin +{ + pkgs, + lib, + stdenv, + fetchFromGitHub, + runCommand, + rustPlatform, + makeWrapper, + llvmPackages, + buildNpmPackage, + cmake, + nodejs, + unzip, + python3, + pkg-config, + libsecret, + darwin, }: assert lib.versionAtLeast python3.version "3.5"; let @@ -31,9 +46,7 @@ let nativeBuildInputs = [ makeWrapper ]; - env = lib.optionalAttrs stdenv.isDarwin { - NIX_LDFLAGS = "-llldb -lc++abi"; - }; + env = lib.optionalAttrs stdenv.isDarwin { NIX_LDFLAGS = "-llldb -lc++abi"; }; buildAndTestSubdir = "adapter"; @@ -54,7 +67,7 @@ let cp $out/lib/* $out/share/adapter cp -r adapter/scripts $out/share/adapter cp -t $out/share/formatters formatters/*.py - ln -s ${lldb.lib} $out/share/lldb + ln -s ${lib.getLib lldb} $out/share/lldb makeWrapper $out/share/adapter/codelldb $out/bin/codelldb \ --set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server" ''; @@ -76,12 +89,15 @@ let pkg-config ]; - buildInputs = [ - libsecret - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - Security - AppKit - ]); + buildInputs = + [ libsecret ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Security + AppKit + ] + ); dontNpmBuild = true; @@ -103,14 +119,25 @@ let "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver" else "${lldb.out}/bin/lldb-server"; - -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "vscode-extension-${publisher}-${pname}"; - inherit src version vscodeExtUniqueId vscodeExtPublisher vscodeExtName; + inherit + src + version + vscodeExtUniqueId + vscodeExtPublisher + vscodeExtName + ; installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; - nativeBuildInputs = [ cmake nodejs unzip makeWrapper ]; + nativeBuildInputs = [ + cmake + nodejs + unzip + makeWrapper + ]; patches = [ ./cmake-build-extension-only.patch ]; @@ -120,12 +147,14 @@ in stdenv.mkDerivation { --replace "1.9.2" ${version} ''; - postConfigure = '' - cp -r ${nodeDeps}/lib/node_modules . - '' + lib.optionalString stdenv.isDarwin '' - export HOME="$TMPDIR/home" - mkdir $HOME - ''; + postConfigure = + '' + cp -r ${nodeDeps}/lib/node_modules . + '' + + lib.optionalString stdenv.isDarwin '' + export HOME="$TMPDIR/home" + mkdir $HOME + ''; cmakeFlags = [ # Do not append timestamp to version. diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix index 9c5ce50fa2..7708c52c80 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix @@ -1,5 +1,9 @@ # Patched lldb for Rust language support. -{ fetchFromGitHub, runCommand, llvmPackages }: +{ + fetchFromGitHub, + runCommand, + llvmPackages, +}: let llvmSrc = fetchFromGitHub { owner = "vadimcn"; @@ -8,8 +12,9 @@ let rev = "4c267c83cbb55fedf2e0b89644dc1db320fdfde7"; hash = "sha256-jM//ej6AxnRYj+8BAn4QrxHPT6HiDzK5RqHPSg3dCcw="; }; -in (llvmPackages.lldb.overrideAttrs (oldAttrs: rec { - passthru = (oldAttrs.passthru or {}) // { +in +(llvmPackages.lldb.overrideAttrs (oldAttrs: rec { + passthru = (oldAttrs.passthru or { }) // { inherit llvmSrc; }; @@ -23,7 +28,8 @@ in (llvmPackages.lldb.overrideAttrs (oldAttrs: rec { echo "'lldb --version' returns: $versionOutput" echo "$versionOutput" | grep -q 'rust-enabled' ''; -})).override({ - monorepoSrc = llvmSrc; - libllvm = llvmPackages.libllvm.override({ monorepoSrc = llvmSrc; }); -}) +})).override + ({ + monorepoSrc = llvmSrc; + libllvm = llvmPackages.libllvm.override ({ monorepoSrc = llvmSrc; }); + }) diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 940a39a217..d457b156aa 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -1,77 +1,101 @@ -{ stdenv, lib, buildEnv, writeShellScriptBin, fetchurl, vscode, unzip, jq }: +{ + stdenv, + lib, + buildEnv, + writeShellScriptBin, + fetchurl, + vscode, + unzip, + jq, +}: let - buildVscodeExtension = a@{ - name, - src, - # Same as "Unique Identifier" on the extension's web page. - # For the moment, only serve as unique extension dir. - vscodeExtPublisher, - vscodeExtName, - vscodeExtUniqueId, - configurePhase ? '' - runHook preConfigure - runHook postConfigure - '', - buildPhase ?'' - runHook preBuild - runHook postBuild - '', - dontPatchELF ? true, - dontStrip ? true, - nativeBuildInputs ? [], - passthru ? { }, - ... - }: - stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { + buildVscodeExtension = + a@{ + name, + src, + # Same as "Unique Identifier" on the extension's web page. + # For the moment, only serve as unique extension dir. + vscodeExtPublisher, + vscodeExtName, + vscodeExtUniqueId, + configurePhase ? '' + runHook preConfigure + runHook postConfigure + '', + buildPhase ? '' + runHook preBuild + runHook postBuild + '', + dontPatchELF ? true, + dontStrip ? true, + nativeBuildInputs ? [ ], + passthru ? { }, + ... + }: + stdenv.mkDerivation ( + (removeAttrs a [ "vscodeExtUniqueId" ]) + // { - name = "vscode-extension-${name}"; + name = "vscode-extension-${name}"; - passthru = passthru // { - inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId; - }; + passthru = passthru // { + inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId; + }; - inherit configurePhase buildPhase dontPatchELF dontStrip; + inherit + configurePhase + buildPhase + dontPatchELF + dontStrip + ; - # Some .vsix files contain other directories (e.g., `package`) that we don't use. - # If other directories are present but `sourceRoot` is unset, the unpacker phase fails. - sourceRoot = "extension"; + # Some .vsix files contain other directories (e.g., `package`) that we don't use. + # If other directories are present but `sourceRoot` is unset, the unpacker phase fails. + sourceRoot = "extension"; - installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; + installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; - nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; + nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; - installPhase = '' + installPhase = '' - runHook preInstall + runHook preInstall - mkdir -p "$out/$installPrefix" - find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/$installPrefix/" + mkdir -p "$out/$installPrefix" + find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/$installPrefix/" - runHook postInstall - ''; + runHook postInstall + ''; + } + ); - }); + fetchVsixFromVscodeMarketplace = + mktplcExtRef: fetchurl (import ./mktplcExtRefToFetchArgs.nix mktplcExtRef); - fetchVsixFromVscodeMarketplace = mktplcExtRef: - fetchurl (import ./mktplcExtRefToFetchArgs.nix mktplcExtRef); - - buildVscodeMarketplaceExtension = a@{ - name ? "", - src ? null, - vsix ? null, - mktplcRef, - ... - }: assert "" == name; assert null == src; - buildVscodeExtension ((removeAttrs a [ "mktplcRef" "vsix" ]) // { - name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}"; - version = mktplcRef.version; - src = if (vsix != null) - then vsix - else fetchVsixFromVscodeMarketplace mktplcRef; - vscodeExtPublisher = mktplcRef.publisher; - vscodeExtName = mktplcRef.name; - vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}"; - }); + buildVscodeMarketplaceExtension = + a@{ + name ? "", + src ? null, + vsix ? null, + mktplcRef, + ... + }: + assert "" == name; + assert null == src; + buildVscodeExtension ( + (removeAttrs a [ + "mktplcRef" + "vsix" + ]) + // { + name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}"; + version = mktplcRef.version; + src = if (vsix != null) then vsix else fetchVsixFromVscodeMarketplace mktplcRef; + vscodeExtPublisher = mktplcRef.publisher; + vscodeExtName = mktplcRef.name; + vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}"; + } + ); mktplcRefAttrList = [ "name" @@ -82,14 +106,18 @@ let "arch" ]; - mktplcExtRefToExtDrv = ext: - buildVscodeMarketplaceExtension (removeAttrs ext mktplcRefAttrList // { - mktplcRef = builtins.intersectAttrs (lib.genAttrs mktplcRefAttrList (_: null)) ext; - }); + mktplcExtRefToExtDrv = + ext: + buildVscodeMarketplaceExtension ( + removeAttrs ext mktplcRefAttrList + // { + mktplcRef = builtins.intersectAttrs (lib.genAttrs mktplcRefAttrList (_: null)) ext; + } + ); extensionFromVscodeMarketplace = mktplcExtRefToExtDrv; - extensionsFromVscodeMarketplace = mktplcExtRefList: - builtins.map extensionFromVscodeMarketplace mktplcExtRefList; + extensionsFromVscodeMarketplace = + mktplcExtRefList: builtins.map extensionFromVscodeMarketplace mktplcExtRefList; vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { inherit lib extensionsFromVscodeMarketplace writeShellScriptBin; @@ -102,7 +130,13 @@ let }; vscodeEnv = import ./vscodeEnv.nix { - inherit lib buildEnv writeShellScriptBin extensionsFromVscodeMarketplace jq; + inherit + lib + buildEnv + writeShellScriptBin + extensionsFromVscodeMarketplace + jq + ; vscodeDefault = vscode; }; @@ -139,9 +173,16 @@ let toExtensionJson = extensions: builtins.toJSON (map toExtensionJsonEntry extensions); in { - inherit fetchVsixFromVscodeMarketplace buildVscodeExtension - buildVscodeMarketplaceExtension extensionFromVscodeMarketplace - extensionsFromVscodeMarketplace - vscodeWithConfiguration vscodeExts2nix vscodeEnv - toExtensionJsonEntry toExtensionJson; + inherit + fetchVsixFromVscodeMarketplace + buildVscodeExtension + buildVscodeMarketplaceExtension + extensionFromVscodeMarketplace + extensionsFromVscodeMarketplace + vscodeWithConfiguration + vscodeExts2nix + vscodeEnv + toExtensionJsonEntry + toExtensionJson + ; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix index db00ba13e3..37b82075e7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix @@ -1,47 +1,58 @@ #Use vscodeWithConfiguration and vscodeExts2nix to create a vscode executable. When the executable exits, it updates the mutable extension file, which is imported when evaluated by Nix later. -{ lib -, buildEnv -, writeShellScriptBin -, extensionsFromVscodeMarketplace -, vscodeDefault -, jq +{ + lib, + buildEnv, + writeShellScriptBin, + extensionsFromVscodeMarketplace, + vscodeDefault, + jq, }: ##User input -{ vscode ? vscodeDefault -, nixExtensions ? [] -, vscodeExtsFolderName ? ".vscode-exts" -# will add to the command updateSettings (which will run on executing vscode) settings to override in settings.json file -, settings ? {} -, createSettingsIfDoesNotExists ? true -, launch ? {} -, createLaunchIfDoesNotExists ? true -# will add to the command updateKeybindings(which will run on executing vscode) keybindings to override in keybinding.json file -, keybindings ? {} -, createKeybindingsIfDoesNotExists ? true -, user-data-dir ? ''"''${TMP}''${name}"/vscode-data-dir'' -# if file exists will use it and import the extensions in it into this derivation else will use empty extensions list -# this file will be created/updated by vscodeExts2nix when vscode exists -, mutableExtensionsFile +{ + vscode ? vscodeDefault, + nixExtensions ? [ ], + vscodeExtsFolderName ? ".vscode-exts", + # will add to the command updateSettings (which will run on executing vscode) settings to override in settings.json file + settings ? { }, + createSettingsIfDoesNotExists ? true, + launch ? { }, + createLaunchIfDoesNotExists ? true, + # will add to the command updateKeybindings(which will run on executing vscode) keybindings to override in keybinding.json file + keybindings ? { }, + createKeybindingsIfDoesNotExists ? true, + user-data-dir ? ''"''${TMP}''${name}"/vscode-data-dir'', + # if file exists will use it and import the extensions in it into this derivation else will use empty extensions list + # this file will be created/updated by vscodeExts2nix when vscode exists + mutableExtensionsFile, }: let mutableExtensionsFilePath = toString mutableExtensionsFile; - mutableExtensions = lib.optionals (builtins.pathExists mutableExtensionsFile) (import mutableExtensionsFilePath); - vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { - inherit lib writeShellScriptBin extensionsFromVscodeMarketplace; - vscodeDefault = vscode; - } - { - inherit nixExtensions mutableExtensions vscodeExtsFolderName user-data-dir; - }; + mutableExtensions = lib.optionals (builtins.pathExists mutableExtensionsFile) ( + import mutableExtensionsFilePath + ); + vscodeWithConfiguration = + import ./vscodeWithConfiguration.nix + { + inherit lib writeShellScriptBin extensionsFromVscodeMarketplace; + vscodeDefault = vscode; + } + { + inherit + nixExtensions + mutableExtensions + vscodeExtsFolderName + user-data-dir + ; + }; updateSettings = import ./updateSettings.nix { inherit lib writeShellScriptBin jq; }; - userSettingsFolder = "${ user-data-dir }/User"; + userSettingsFolder = "${user-data-dir}/User"; updateSettingsCmd = updateSettings { settings = { - "extensions.autoCheckUpdates" = false; - "extensions.autoUpdate" = false; - "update.mode" = "none"; + "extensions.autoCheckUpdates" = false; + "extensions.autoUpdate" = false; + "update.mode" = "none"; } // settings; inherit userSettingsFolder; createIfDoesNotExists = createSettingsIfDoesNotExists; @@ -62,14 +73,16 @@ let symlinkFromUserSetting = (user-data-dir != ""); }; - vscodeExts2nix = import ./vscodeExts2nix.nix { - inherit lib writeShellScriptBin; - vscodeDefault = vscodeWithConfiguration; - } - { - extensionsToIgnore = nixExtensions; - extensions = mutableExtensions; - }; + vscodeExts2nix = + import ./vscodeExts2nix.nix + { + inherit lib writeShellScriptBin; + vscodeDefault = vscodeWithConfiguration; + } + { + extensionsToIgnore = nixExtensions; + extensions = mutableExtensions; + }; code = writeShellScriptBin "code" '' ${updateSettingsCmd}/bin/vscodeNixUpdate-settings ${updateLaunchCmd}/bin/vscodeNixUpdate-launch @@ -81,5 +94,11 @@ let in buildEnv { name = "vscodeEnv"; - paths = [ code vscodeExts2nix updateSettingsCmd updateLaunchCmd updateKeybindingsCmd ]; + paths = [ + code + vscodeExts2nix + updateSettingsCmd + updateLaunchCmd + updateKeybindingsCmd + ]; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix index 19a9edbf1a..2bca1608d2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix @@ -1,11 +1,13 @@ -with import {}; -callPackage (import ./vscodeEnv.nix) { - extensionsFromVscodeMarketplace = vscode-utils.extensionsFromVscodeMarketplace; - vscodeDefault = vscode; -} { - mutableExtensionsFile = ./extensions.nix; - settings = { - a = "fdsdf"; - t = "test"; - }; -} +with import { }; +callPackage (import ./vscodeEnv.nix) + { + extensionsFromVscodeMarketplace = vscode-utils.extensionsFromVscodeMarketplace; + vscodeDefault = vscode; + } + { + mutableExtensionsFile = ./extensions.nix; + settings = { + a = "fdsdf"; + t = "test"; + }; + } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix index 58cbe663c9..96b892911b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix @@ -1,14 +1,16 @@ # based on the passed vscode will stdout a nix expression with the installed vscode extensions -{ lib -, vscodeDefault -, writeShellScriptBin +{ + lib, + vscodeDefault, + writeShellScriptBin, }: ##User input -{ vscode ? vscodeDefault -, extensionsToIgnore ? [] -# will use those extensions to get sha256 if still exists when executed. -, extensions ? [] +{ + vscode ? vscodeDefault, + extensionsToIgnore ? [ ], + # will use those extensions to get sha256 if still exists when executed. + extensions ? [ ], }: let mktplcExtRefToFetchArgs = import ./mktplcExtRefToFetchArgs.nix; @@ -17,22 +19,32 @@ writeShellScriptBin "vscodeExts2nix" '' echo '[' for line in $(${vscode}/bin/code --list-extensions --show-versions \ - ${lib.optionalString (extensionsToIgnore != []) '' - | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : "${e.publisher}.${e.name}") extensionsToIgnore}\)' - ''} + ${ + lib.optionalString (extensionsToIgnore != [ ]) '' + | grep -v -i '^\(${ + lib.concatMapStringsSep "\\|" (e: "${e.publisher}.${e.name}") extensionsToIgnore + }\)' + '' + } ) ; do [[ $line =~ ([^.]*)\.([^@]*)@(.*) ]] name=''${BASH_REMATCH[2]} publisher=''${BASH_REMATCH[1]} version=''${BASH_REMATCH[3]} - extensions="${lib.concatMapStringsSep "." (e : "${e.publisher}${e.name}@${e.sha256}") extensions}" + extensions="${lib.concatMapStringsSep "." (e: "${e.publisher}${e.name}@${e.sha256}") extensions}" reCurrentExt=$publisher$name"@([^.]*)" if [[ $extensions =~ $reCurrentExt ]]; then sha256=''${BASH_REMATCH[1]} else sha256=$( - nix-prefetch-url "${(mktplcExtRefToFetchArgs {publisher = ''"$publisher"''; name = ''"$name"''; version = ''"$version"'';}).url}" 2> /dev/null + nix-prefetch-url "${ + (mktplcExtRefToFetchArgs { + publisher = ''"$publisher"''; + name = ''"$name"''; + version = ''"$version"''; + }).url + }" 2> /dev/null ) fi diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix index 39479d7c2f..6e2fd767a7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix @@ -1,54 +1,61 @@ # wrapper over vscode to control extensions per project (extensions folder will be created in execution path) -{ lib -, writeShellScriptBin -, extensionsFromVscodeMarketplace -, vscodeDefault +{ + lib, + writeShellScriptBin, + extensionsFromVscodeMarketplace, + vscodeDefault, }: ## User input -{ vscode ? vscodeDefault -# extensions to be symlinked into the project's extensions folder -, nixExtensions ? [] -# extensions to be copied into the project's extensions folder -, mutableExtensions ? [] -, vscodeExtsFolderName ? ".vscode-exts" -, user-data-dir ? ''"''${TMP}vscodeWithConfiguration/vscode-data-dir"'' +{ + vscode ? vscodeDefault, + # extensions to be symlinked into the project's extensions folder + nixExtensions ? [ ], + # extensions to be copied into the project's extensions folder + mutableExtensions ? [ ], + vscodeExtsFolderName ? ".vscode-exts", + user-data-dir ? ''"''${TMP}vscodeWithConfiguration/vscode-data-dir"'', }: let nixExtsDrvs = extensionsFromVscodeMarketplace nixExtensions; mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions; - mutableExtsPaths = lib.forEach mutExtsDrvs ( e: - { + mutableExtsPaths = lib.forEach mutExtsDrvs (e: { origin = "${e}/share/vscode/extensions/${e.vscodeExtUniqueId}"; - target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: "${ext.publisher}.${ext.name}" == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}''; - } - ); + target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${ + (lib.findSingle ( + ext: "${ext.publisher}.${ext.name}" == e.vscodeExtUniqueId + ) "" "m" mutableExtensions).version + }''; + }); #removed not defined extensions - rmExtensions = lib.optionalString (nixExtensions++mutableExtensions != []) '' + rmExtensions = lib.optionalString (nixExtensions ++ mutableExtensions != [ ]) '' find ${vscodeExtsFolderName} -mindepth 1 -maxdepth 1 ${ - lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name} ") nixExtensions - + - lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name}-${e.version} ") mutableExtensions - } -exec rm -rf {} \; + lib.concatMapStringsSep " " (e: "! -iname ${e.publisher}.${e.name} ") nixExtensions + + lib.concatMapStringsSep " " ( + e: "! -iname ${e.publisher}.${e.name}-${e.version} " + ) mutableExtensions + } -exec rm -rf {} \; ''; #copy mutable extension out of the nix store cpExtensions = '' - ${lib.concatMapStringsSep "\n" (e : "ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/") nixExtsDrvs} - ${lib.concatMapStringsSep "\n" (ePath : '' + ${lib.concatMapStringsSep "\n" ( + e: "ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/" + ) nixExtsDrvs} + ${lib.concatMapStringsSep "\n" (ePath: '' if [ ! -d ${ePath.target} ]; then cp -a ${ePath.origin} ${ePath.target} chmod -R u+rwx ${ePath.target} fi - '') mutableExtsPaths} + '') mutableExtsPaths} ''; in - writeShellScriptBin "code" '' - if ! [[ "$@" =~ "--list-extension" ]]; then - mkdir -p "${vscodeExtsFolderName}" - ${rmExtensions} - ${cpExtensions} - fi - ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ - lib.optionalString (user-data-dir != "") "--user-data-dir ${user-data-dir}" - } "$@" - '' +writeShellScriptBin "code" '' + if ! [[ "$@" =~ "--list-extension" ]]; then + mkdir -p "${vscodeExtsFolderName}" + ${rmExtensions} + ${cpExtensions} + fi + ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ + lib.optionalString (user-data-dir != "") "--user-data-dir ${user-data-dir}" + } "$@" +'' diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix index b7fe7d2712..5ed75a0ce3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -165,7 +165,7 @@ in autoPatchelfHook asar # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 - (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) + (buildPackages.wrapGAppsHook3.override { inherit (buildPackages) makeWrapper; }) ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 3cd3faa790..e8ff066642 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "14m9w7wkg1704apd4d46yi6zwdlbrx2rp3fry9ffk2nn6kkahwk2"; - x86_64-darwin = "1cp74wdkva1zib04wxjby0h8r1c56g893kq5ksdj38404i2c5hdk"; - aarch64-linux = "00yrdmi4c5m8r11gm7vw18qb5ddcwwg5mdk8s9ykzhmxhdrkcarm"; - aarch64-darwin = "1jjhw60jcvj5brayarg8k6avxwaa00mwdn4lrkcdzbzzh1q4knvv"; - armv7l-linux = "1jddc3fsv65mp95ybpprx8sz3mpnp6j2ghp4nflky8iawmzz183v"; + x86_64-linux = "1zfh48g6prjhjcyrz5impsnm6khw7s75k8k54bp0cszl81ddsysx"; + x86_64-darwin = "1w5fzq8dmzrs2ggxvcbcs03psxxi1dbzx5l0jn52szi1g5y3daxi"; + aarch64-linux = "0rs4zzddfpwbf86cjl4r65cxccs4ypz1s7lw98vq0j8pfx8vkgqi"; + aarch64-darwin = "0gha1b6q3k57yrbp7qrrknlbbbbhcjd6slbyrzlwjcz1ddvs7c8s"; + armv7l-linux = "01s1vxbmg3zp47kwlsjr781v6c51l5bcpf9pc91id0qcrhax703k"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.88.1"; + version = "1.89.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "e170252f762678dec6ca2cc69aba1570769a5d39"; + rev = "dc96b837cf6bb4af9cd736aa3af08cf8279f7685"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "100nhm231gzav24lz84vxwxnqkn777kfn0fkkjmdcd30kc7g7ig9"; + sha256 = "05gvq96vw69lb8ip8pfd9g43j8kvfwlrdmm11b41fpdafhi45f89"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/xed-editor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/xed-editor/default.nix index 8ce15bdce0..cb147cf099 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/xed-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/xed-editor/default.nix @@ -12,7 +12,7 @@ , python3 , meson , ninja -, wrapGAppsHook +, wrapGAppsHook3 , intltool , itstool }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { itstool ninja python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix index 0a5993557a..ade90d3885 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix @@ -16,7 +16,7 @@ , pkg-config , udev , which -, wrapGAppsHook +, wrapGAppsHook3 , darwin }: @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config which - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ libicns ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix index 5ac2100425..4b8e94dac1 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , libX11, libXv , udev , SDL2 @@ -47,7 +47,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals stdenv.isLinux [ wrapGAppsHook ] + ++ lib.optionals stdenv.isLinux [ wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ libicns makeWrapper ]; buildInputs = [ SDL2 libao ] diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/analyzer.nix b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/analyzer.nix index 5b111b8028..9db86e56d0 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/analyzer.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/analyzer.nix @@ -1,20 +1,21 @@ -{ callPackage, makeWrapper, gobject-introspection, cmake +{ stdenv, cmake, pkg-config, callPackage, makeWrapper, gobject-introspection, wrapGAppsHook3 , python3Packages, gtk3, glib, libxml2, gnuplot, gnome, gdk-pixbuf, librsvg, intltool, libmirage }: -let pkg = import ./base.nix { - version = "3.2.5"; - pname = "image-analyzer"; - pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc"; -}; -in callPackage pkg { - buildInputs = [ glib gtk3 libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf librsvg - python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; - drvParams = { - nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ]; - postFixup = '' - wrapProgram $out/bin/image-analyzer \ - --set PYTHONPATH "$PYTHONPATH" \ - --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - }; +stdenv.mkDerivation { + + inherit (callPackage ./common-drv-attrs.nix { + version = "3.2.6"; + pname = "image-analyzer"; + hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc="; + }) pname version src meta; + + buildInputs = [ libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf librsvg + python3Packages.pygobject3 python3Packages.matplotlib ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool ]; + + dontWrapGApps = true; + postFixup = '' + wrapProgram $out/bin/image-analyzer \ + ''${gappsWrapperArgs[@]} \ + --set PYTHONPATH "$PYTHONPATH" + ''; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/client.nix b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/client.nix index 2e301a115c..1c0e662f5a 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/client.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/client.nix @@ -1,16 +1,20 @@ -{ callPackage, python3Packages, intltool, makeWrapper }: -let pkg = import ./base.nix { - version = "3.2.5"; - pname = "cdemu-client"; - pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7"; -}; -in callPackage pkg { - nativeBuildInputs = [ makeWrapper intltool ]; - buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 ]; - drvParams = { - postFixup = '' - wrapProgram $out/bin/cdemu \ - --set PYTHONPATH "$PYTHONPATH" - ''; - }; +{ stdenv, callPackage, python3Packages, cmake, pkg-config, intltool, wrapGAppsNoGuiHook }: +stdenv.mkDerivation { + + inherit (callPackage ./common-drv-attrs.nix { + version = "3.2.5"; + pname = "cdemu-client"; + hash = "sha256-py2F61v8vO0BCM18GCflAiD48deZjbMM6wqoCDZsOd8="; + }) pname version src meta; + + nativeBuildInputs = [ cmake pkg-config intltool wrapGAppsNoGuiHook ]; + buildInputs = with python3Packages; [ dbus-python pygobject3 ]; + + dontWrapGApps = true; + postFixup = '' + wrapProgram $out/bin/cdemu \ + ''${gappsWrapperArgs[@]} \ + --set PYTHONPATH "$PYTHONPATH" + ''; + } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/base.nix b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/common-drv-attrs.nix similarity index 62% rename from third_party/nixpkgs/pkgs/applications/emulators/cdemu/base.nix rename to third_party/nixpkgs/pkgs/applications/emulators/cdemu/common-drv-attrs.nix index 994a0f0e03..9c43e35898 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/base.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/common-drv-attrs.nix @@ -1,20 +1,13 @@ -{ pname, version, pkgSha256 }: -attrs@{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {}, ... }: -stdenv.mkDerivation ( rec { - inherit pname version buildInputs; +{ lib, fetchurl +, pname, version, hash +}: + +{ + inherit pname version; src = fetchurl { url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz"; - sha256 = pkgSha256; + inherit hash; }; - nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ pkg-config cmake ]; - setSourceRoot = '' - mkdir build - cd build - sourceRoot="`pwd`" - ''; - configurePhase = '' - cmake ../${pname}-${version} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON - ''; meta = with lib; { description = "A suite of tools for emulating optical drives and discs"; longDescription = '' @@ -33,4 +26,4 @@ stdenv.mkDerivation ( rec { platforms = platforms.linux; maintainers = with lib.maintainers; [ bendlas ]; }; -} // drvParams) +} diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/daemon.nix b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/daemon.nix index 359b2f26a5..5382efbff2 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/daemon.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/daemon.nix @@ -1,15 +1,17 @@ -{ callPackage, glib, libao, intltool, libmirage, coreutils }: -let pkg = import ./base.nix { - version = "3.2.5"; - pname = "cdemu-daemon"; - pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d"; -}; -in callPackage pkg { - nativeBuildInputs = [ intltool ]; +{ stdenv, callPackage, cmake, pkg-config, glib, libao, intltool, libmirage, coreutils }: +stdenv.mkDerivation { + + inherit (callPackage ./common-drv-attrs.nix { + version = "3.2.6"; + pname = "cdemu-daemon"; + hash = "sha256-puQE4+91xhRuNjVPZYgN/WO0uO8fVAOdxQWOGQ+FfY8="; + }) pname version src meta; + + nativeBuildInputs = [ cmake pkg-config intltool ]; buildInputs = [ glib libao libmirage ]; - drvParams.postInstall = '' + postInstall = '' mkdir -p $out/share/dbus-1/services - cp -R ../$pname-$version/service-example $out/share/cdemu + cp -R ../service-example $out/share/cdemu substitute \ $out/share/cdemu/net.sf.cdemu.CDEmuDaemon.service \ $out/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service \ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/gui.nix b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/gui.nix index 3083e1960b..b4a886471b 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/gui.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/gui.nix @@ -1,22 +1,21 @@ -{ callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libnotify, intltool, gnome, gdk-pixbuf, librsvg }: -let - pkg = import ./base.nix { - version = "3.2.5"; +{ stdenv, callPackage, cmake, pkg-config, wrapGAppsHook3 +, python3Packages, libnotify, intltool, gnome, gdk-pixbuf, librsvg }: +stdenv.mkDerivation { + + inherit (callPackage ./common-drv-attrs.nix { + version = "3.2.6"; pname = "gcdemu"; - pkgSha256 = "1nvpbq4mz8caw91q5ny9gf206g9bypavxws9nxyfcanfkc4zfkl4"; - }; - inherit (python3Packages) python pygobject3; -in callPackage pkg { - buildInputs = [ python pygobject3 gtk3 glib libnotify gnome.adwaita-icon-theme gdk-pixbuf librsvg ]; - drvParams = { - nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ]; - postFixup = '' - wrapProgram $out/bin/gcdemu \ - --set PYTHONPATH "$PYTHONPATH" \ - --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - # TODO AppIndicator - }; + hash = "sha256-w4vzKoSotL5Cjfr4Cu4YhNSWXJqS+n/vySrwvbhR1zA="; + }) pname version src meta; + + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool ]; + buildInputs = [ python3Packages.pygobject3 libnotify gnome.adwaita-icon-theme gdk-pixbuf librsvg ]; + + dontWrapGApps = true; + postFixup = '' + wrapProgram $out/bin/gcdemu \ + ''${gappsWrapperArgs[@]} \ + --set PYTHONPATH "$PYTHONPATH" + ''; + } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/libmirage.nix b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/libmirage.nix index b631d3669d..0bbd9e1dfb 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/libmirage.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/libmirage.nix @@ -1,18 +1,18 @@ -{ callPackage, gobject-introspection, cmake, pkg-config +{ stdenv, callPackage, cmake, pkg-config , glib, libsndfile, zlib, bzip2, xz, libsamplerate, intltool , pcre, util-linux, libselinux, libsepol }: -let pkg = import ./base.nix { - version = "3.2.5"; - pname = "libmirage"; - pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm"; -}; -in callPackage pkg { +stdenv.mkDerivation { + + inherit (callPackage ./common-drv-attrs.nix { + version = "3.2.7"; + pname = "libmirage"; + hash = "sha256-+okkgNeVS8yoKSrQDy4It7PiPlTSiOsUoFxQ1FS9s9M="; + }) pname version src meta; + + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate ]; - drvParams = { - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; - nativeBuildInputs = [ cmake gobject-introspection pkg-config intltool ]; - propagatedBuildInputs = [ pcre util-linux libselinux libsepol ]; - }; + nativeBuildInputs = [ cmake pkg-config intltool ]; + propagatedBuildInputs = [ pcre util-linux libselinux libsepol ]; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/vhba.nix b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/vhba.nix index 103e4b4b5b..15b69500f3 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/vhba.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/vhba.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.xz"; - sha256 = "sha256-v1hQ1Lj1AiHKh9c0OpKe2oexkfb1roxhQXRUO1ut3oM="; + hash = "sha256-v1hQ1Lj1AiHKh9c0OpKe2oexkfb1roxhQXRUO1ut3oM="; }; makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix index 26230f8d72..483bd8d4d5 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , addOpenGLRunpath -, wrapGAppsHook +, wrapGAppsHook3 , cmake , glslang , nasm @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-78"; + version = "2.0-82"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-ivdqO44+8sDgOshUDFc+4eTgzcEDSiPPIawyktYpob4="; + hash = "sha256-rmlkit7ZNUM0ErqoclivfBHolV0tRWyToLmsvoTslbI="; }; patches = [ @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ addOpenGLRunpath - wrapGAppsHook + wrapGAppsHook3 cmake glslang nasm diff --git a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix index 12c86c3680..0d077d7669 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , callPackage , patchelf , unzip @@ -16,18 +15,18 @@ }: let - version = "2.8.1"; + version = "2.8.2"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; rev = "v${version}"; - hash = "sha256-8bl83AOIWtUQ06F2unYEF08VT13o9EGo9YDZpdNxd8w="; + hash = "sha256-Kv0supnYKWLaVqOeZAzQNd3tQRP2KJugZqytyoj8QtY="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; rev = "v${version}"; - hash = "sha256-aCRJ3idSrRM8ydt8hP8nA1RR0etPnWpQKphXcOGgTfk="; + hash = "sha256-5ZsLsqrkO02NLJCzsgf0k/ifsqNybTi4DcB9GLmWDHw="; }; in @@ -39,10 +38,12 @@ stdenv.mkDerivation rec { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - hash = "sha256-iQCv4EDdqmnU0fYxMwpCZ2Z5p43P0MGBNIG/dZrWndg="; + hash = "sha256-ozebHgUgwdqYtWAyL+EdwpjEvZC+PkWcLYCPWz2FjSw="; }; - buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; + nativeBuildInputs = [ patchelf unzip ]; + buildInputs = [ poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; + strictDeps = true; preBuild = '' cp -R ${craftos2-lua}/* ./craftos2-lua/ @@ -65,6 +66,17 @@ stdenv.mkDerivation rec { patchelf --replace-needed craftos2-lua/src/liblua.so liblua.so $out/bin/craftos cp -R api $out/include/CraftOS-PC cp -R ${craftos2-rom}/* $out/share/craftos + + mkdir -p resources/linux-icons + unzip resources/linux-icons.zip -d resources/linux-icons + for dim in 16 24 32 48 64 96 128 256 1024; do + dir="$out/share/icons/hicolor/$dimx$dim/apps" + mkdir -p "$dir" + cp "resources/linux-icons/$dim.png" "$dir/craftos.png" + done + + mkdir -p $out/share/applications + cp resources/linux-icons/CraftOS-PC.desktop $out/share/applications/CraftOS-PC.desktop ''; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/applications/emulators/desmume/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/desmume/default.nix index 63ebe07202..89078bc641 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/desmume/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/desmume/default.nix @@ -6,7 +6,7 @@ , agg , alsa-lib , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , intltool , libGLU @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils intltool libtool diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix index b2a9bbb7bb..568f43d356 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix @@ -202,9 +202,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ - MP2E ashkitten - xfix ivar ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix index 7c409692d9..b4698480a9 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/shiiion/dolphin"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ashkitten Madouura ]; + maintainers = with maintainers; [ ashkitten Madouura ]; broken = stdenv.isDarwin; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix index efe0910879..6c598c5f51 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "flycast"; - version = "2.3"; + version = "2.3.2"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; rev = "v${version}"; - sha256 = "sha256-o1Xnyts2+A3ZkzVN0o8E5nGPo2c2vYltMlHF4LZMppU="; + sha256 = "sha256-YFLSUaEikwLPglHh3t8sHiKHRn5cchKzzkJlZDdgVsU="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/fuse-emulator/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/fuse-emulator/default.nix index 378437ca30..3ed4ffc9c0 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/fuse-emulator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/fuse-emulator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchurl, perl, pkg-config, wrapGAppsHook3 , SDL, bzip2, glib, gtk3, libgcrypt, libpng, libspectrum, libxml2, zlib }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Oo/t8v/pR8VxVhusVaWa2tTFkzj3TkSbfnpn2coEcJY="; }; - nativeBuildInputs = [ perl pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ perl pkg-config wrapGAppsHook3 ]; buildInputs = [ SDL bzip2 glib gtk3 libgcrypt libpng libspectrum libxml2 zlib ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/lambda-delta/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/lambda-delta/default.nix index a17a0eadfd..cf2001caff 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/lambda-delta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/lambda-delta/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ SDL2 ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-std=c89"; + }; + configureFlags = [ "--without-SDL1" ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix index c61b1662a6..4ba40b417c 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.264"; + version = "0.265"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-0UWMBKM//XWm8PFl60JvTLGaDBMVZFnVrbX4omy2F4I="; + hash = "sha256-jXGmABFeoT8g2UtVV159gUpdWcBvb9aX3uiFi2neVQI="; }; outputs = [ "out" "tools" ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/pcem/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/pcem/default.nix index e680dd450d..9ffa24a66e 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/pcem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/pcem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, wxGTK32, coreutils, SDL2, openal, alsa-lib, pkg-config, gtk3, wrapGAppsHook +{ stdenv, lib, fetchzip, wxGTK32, coreutils, SDL2, openal, alsa-lib, pkg-config, gtk3, wrapGAppsHook3 , autoreconfHook, withNetworking ? true, withALSA ? true }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "067pbnc15h6a4pnnym82klr1w8qwfm6p0pkx93gx06wvwqsxvbdv"; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 ]; buildInputs = [ wxGTK32 coreutils SDL2 openal gtk3 ] ++ lib.optional withALSA alsa-lib; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/pcsxr/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/pcsxr/default.nix index b80c32bd9e..06559af0e7 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/pcsxr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/pcsxr/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, intltool, pkg-config, gtk3, SDL2, xorg -, wrapGAppsHook, libcdio, nasm, ffmpeg_4, file +, wrapGAppsHook3, libcdio, nasm, ffmpeg_4, file , fetchpatch }: stdenv.mkDerivation rec { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ./0001-libpcsxcore-fix-build-with-ffmpeg-4.patch ]; - nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg_4 file xorg.libXxf86vm diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix index b42966f5a1..d4fb8a4c3a 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix @@ -9,7 +9,6 @@ , fetchFromGitHub , fetchpatch , ffmpeg -, ffmpeg_4 , fluidsynth , fmt , freetype @@ -890,11 +889,13 @@ in ppsspp = mkLibretroCore { core = "ppsspp"; extraNativeBuildInputs = [ cmake pkg-config python3 ]; - extraBuildInputs = [ libGLU libGL libzip ffmpeg_4 snappy xorg.libX11 ]; + extraBuildInputs = [ libGLU libGL libzip snappy xorg.libX11 ]; makefile = "Makefile"; cmakeFlags = [ "-DLIBRETRO=ON" - "-DUSE_SYSTEM_FFMPEG=ON" + # USE_SYSTEM_FFMPEG=ON causes several glitches during video playback + # See: https://github.com/NixOS/nixpkgs/issues/304616 + "-DUSE_SYSTEM_FFMPEG=OFF" "-DUSE_SYSTEM_SNAPPY=ON" "-DUSE_SYSTEM_LIBZIP=ON" "-DOpenGL_GL_PREFERENCE=GLVND" diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json index 3f07ec28fb..d1ea92493c 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json @@ -55,20 +55,20 @@ "src": { "owner": "libretro", "repo": "beetle-pce-libretro", - "rev": "20b86372b5f490394099ee0ad06e0eb3a4fd5c2e", - "hash": "sha256-jYV2eiBSLj9H2RIau8NwYLGV2SY7GqygEYTJ3YVoMNc=" + "rev": "b5dd6466f18714ab4c9702e5bdb51cc9dfea061b", + "hash": "sha256-PBirwijCwaOcjRdyIyx/UsnYMQuojQuogK7X7Hte7r8=" }, - "version": "unstable-2024-03-22" + "version": "unstable-2024-05-03" }, "beetle-pce-fast": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "6210d0f8c262dcdaa5b76c28057cca6077f488fe", - "hash": "sha256-5qONcwTrawd6vMa7157lexFmuj9jdzSDVqt+KUvEm0I=" + "rev": "e2c0259a6941285f853bdc81dfd33756e107c2c2", + "hash": "sha256-S5p38rC5JqLL7ydeEtYR29rWFx1Pok3s7SNPr9zKwb8=" }, - "version": "unstable-2024-03-22" + "version": "unstable-2024-05-03" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "9c9b44a7b9b373f2d8f9a3f16bc8373d6469cf98", - "hash": "sha256-XQ7EVPj0Eprs94yjqaUGCphHteRdbcv2nqp3gojYjzc=" + "rev": "0c8abf7f9dda23874b5b9cecfcec519a9dfb032b", + "hash": "sha256-psGXpYzKI1QicoHxGhHwR92kymZ+9EaJUpGMcM2OMUY=" }, - "version": "unstable-2024-04-12" + "version": "unstable-2024-05-10" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -115,10 +115,10 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "e41f864c0abb36aef20f8e37cd9d9a92c00a9221", - "hash": "sha256-LkkW5mQmwv89ZECssVh43ezwe4xMagUOiSz82OupISQ=" + "rev": "77a965d3433b1585638b54aa6a15d0c33a64ea0c", + "hash": "sha256-KuXvzse/EnzCcRoWVtZP1f/SKOp6qGrLbzbQEuFQGqA=" }, - "version": "unstable-2024-03-22" + "version": "unstable-2024-05-03" }, "beetle-vb": { "fetcher": "fetchFromGitHub", @@ -165,10 +165,10 @@ "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "51b378454e34f7535f8b627de5b81d33b0fa4cb0", - "hash": "sha256-oriFvt0RCt9Bd5DjjLSxMuswfazd31isvt5OxwwNuks=" + "rev": "b2f3ca10ee48546ad267719fb21bcf6b503d91e6", + "hash": "sha256-qClpkmkERAxdVL3DZvkUsmmGmFj6TArEBdS0AcIyXuA=" }, - "version": "unstable-2024-03-22" + "version": "unstable-2024-05-03" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", @@ -226,10 +226,10 @@ "src": { "owner": "libretro", "repo": "dolphin", - "rev": "2f4b0f7902257d40a054f60b2c670d6e314f2a04", - "hash": "sha256-9WYWbLehExYbPmGJpguhVFXqFJ9aR6VxzFVChd4QOEg=" + "rev": "89a4df725d4eb24537728f7d655cddb1add25c18", + "hash": "sha256-f9O3//EuoCSPQC7GWmf0EzAEpjoKof30kIDBCDw0dbs=" }, - "version": "unstable-2022-12-17" + "version": "unstable-2024-04-19" }, "dosbox": { "fetcher": "fetchFromGitHub", @@ -287,10 +287,10 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "97f01ed6075b6034aeb16829a2a259bbe8a254f9", - "hash": "sha256-qXym7CzAXfOSK+hmq6JfCIrq9w11uA2UQ2Ps+lFHrfI=" + "rev": "573c9b99e3cc0b11a652b2f21a22dcb15a2c4dda", + "hash": "sha256-MTRv/F68GiEwt5iN4xilTWGgTw2mf2aAvqDExgeN/g0=" }, - "version": "unstable-2024-04-15" + "version": "unstable-2024-05-07" }, "fceumm": { "fetcher": "fetchFromGitHub", @@ -307,11 +307,11 @@ "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "7438094d7cdf191e6eb2a39e73cb0f512ea2a714", - "hash": "sha256-T19GJbN/MKC03Q/yS1C6qL5Rv++OlaBol4UYf9//l3s=", + "rev": "f13d7ad2dcf141f59a999090dbc0f78be196e665", + "hash": "sha256-YFLSUaEikwLPglHh3t8sHiKHRn5cchKzzkJlZDdgVsU=", "fetchSubmodules": true }, - "version": "unstable-2024-04-12" + "version": "unstable-2024-05-11" }, "fmsx": { "fetcher": "fetchFromGitHub", @@ -348,20 +348,20 @@ "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "cbda5ea9fd81d1be0220dfc690d05240655602e4", - "hash": "sha256-uLUIFDiPJ5ZSJPezZ24bDfd10AKDCHz4ATm2BBBGs9I=" + "rev": "a7e645196f5e54904a056e390ac7ceb033037de0", + "hash": "sha256-pz/IQpjySByHnRu64Ysd1LJPrcImMQ0CfTRV4ONUsA0=" }, - "version": "unstable-2024-03-22" + "version": "unstable-2024-05-10" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "b063aa81b90682ca89ae6fd1e958bc589b4ce34d", - "hash": "sha256-Tz6if6NfbwvZVDb5Ggr/tXuLNymOjcMkghKwZq6tl6I=" + "rev": "ba9fc37cfa4930311a9c77b1d8a23df0cae95e9a", + "hash": "sha256-Smw0MoUfewlz0zYQmtFLB0n8l0KyyoInohXZ7d9Xrwk=" }, - "version": "unstable-2024-04-05" + "version": "unstable-2024-05-10" }, "gpsp": { "fetcher": "fetchFromGitHub", @@ -408,20 +408,21 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "170929e08e13fef6f5284efb0a5ec781a2af08ed", - "hash": "sha256-92p6fKN1/kl101qrNMzjOCQJJznTdbteqXpbas36S2c=" + "rev": "1c6d288bf15705ab93c66a11af40eaf9d2a515a2", + "hash": "sha256-h5hMfCwoECTyH/VU7IheQg5Jx9skpYrZlA9Xh+4lotQ=", + "fetchSubmodules": true }, - "version": "unstable-2024-04-10" + "version": "unstable-2024-05-09" }, "mame2000": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mame2000-libretro", - "rev": "1472da3a39ab14fff8325b1f51a1dfdb8eabb5c8", - "hash": "sha256-Nd5OqkoMJZ8TzEZGqDT0YX6lHK/H3I5EqJ841PteLi8=" + "rev": "905808fbcc3adf8c610c1c60f0e41ce4b35db1c5", + "hash": "sha256-2J3QGlSb4YhDZND4T0wmt9zzDjOuNiscsMxn9zA1TtI=" }, - "version": "unstable-2023-10-31" + "version": "unstable-2024-05-07" }, "mame2003": { "fetcher": "fetchFromGitHub", @@ -438,10 +439,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "7ca870c4168e69819923f73ae0289c38d57b01dc", - "hash": "sha256-eoLzRNsZtIo6Pc9SovQGh9sHxdXhBSQj71RDcQqjji0=" + "rev": "11fad92faea0acfd3eb4fd15beced9088caab1fc", + "hash": "sha256-ck+zdwiuVw4bhPSdQxEz8a0nj8J6GP7ccvYRZ1WJy8s=" }, - "version": "unstable-2024-04-13" + "version": "unstable-2024-05-03" }, "mame2010": { "fetcher": "fetchFromGitHub", @@ -600,10 +601,10 @@ "src": { "owner": "libretro", "repo": "opera-libretro", - "rev": "35e16483be900ea8aa20e87d2710b677437f73ce", - "hash": "sha256-ZNHSxI8l0KGJ6uAvOsEhNpB0IkBxtb9Imj3tA/LiOto=" + "rev": "5121aa6d36eff884bd56ccbadb6c112f1e951fee", + "hash": "sha256-mD/BEUwbWmRtB9llsqhz+/DhrzH9HiuXyJkX0pBks5M=" }, - "version": "unstable-2024-01-13" + "version": "unstable-2024-05-06" }, "parallel-n64": { "fetcher": "fetchFromGitHub", @@ -630,10 +631,10 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "2f326fa15ff26df057ef10da232ebc07a410803a", - "hash": "sha256-mnJJ1NzxZoA3kwfPOyvpP65SKI0I/9FCPNW8TR8NY8k=" + "rev": "87a0a6318564fc171d0b576da8ea7e629aa229e7", + "hash": "sha256-quIvyfigl/4itSldj73HpZezeHQwVGlz/jQvwmmsDik=" }, - "version": "unstable-2024-04-14" + "version": "unstable-2024-04-22" }, "picodrive": { "fetcher": "fetchFromGitHub", @@ -651,32 +652,32 @@ "src": { "owner": "jpd002", "repo": "Play-", - "rev": "5c8f4a818be5c1e4df568abfec169c2b08df6674", - "hash": "sha256-IyxqH0ZAAiJ8V9kaVSwhf1zJnVlxhJWghr51AXcvQvs=", + "rev": "700a44a1548d099705c901203414724518c90d43", + "hash": "sha256-OZO8vVA2B/SdckC2Rm/v35cdJDzkpdU9lJhFYEyyl1U=", "fetchSubmodules": true }, - "version": "unstable-2024-04-10" + "version": "unstable-2024-05-05" }, "ppsspp": { "fetcher": "fetchFromGitHub", "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "efe2302548fcbd2dc68c9b5b1fb39dc7976532fd", - "hash": "sha256-zwC3HniJO11/6ApBo0UNn6WMu4Jmj099XaUY4QuKaZI=", + "rev": "60ffd07116d0a2e07db141db8414524138b6f035", + "hash": "sha256-tkIbsYjQRoV9A8NIDMJCRnHd+NCPycqrPu6JRjF6dHs=", "fetchSubmodules": true }, - "version": "unstable-2024-04-14" + "version": "unstable-2024-05-03" }, "prboom": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-prboom", - "rev": "6ec854969fd9dec33bb2cab350f05675d1158969", - "hash": "sha256-y0qZwYNwcO4ofWDZ7UXN9ZVMPFxjCnLDDZKBMdZLxEY=" + "rev": "ab05295d81fed2bb9db9f68a7ceeec7a544191d8", + "hash": "sha256-ekVVxYg+Uet3pfir6P7PwI87p5XF2ATbFbux1t38ETs=" }, - "version": "unstable-2023-05-28" + "version": "unstable-2024-05-07" }, "prosystem": { "fetcher": "fetchFromGitHub", @@ -693,10 +694,10 @@ "src": { "owner": "libretro", "repo": "libretro-uae", - "rev": "3c4f02622bd9ab4bbfc5e90cea9c7e60cf410073", - "hash": "sha256-UMbD1RcgQmilBwwzvakUIWWWwg78sl1YT9EOE3Rhyao=" + "rev": "106b98d50dab4b5648067096f0ba54acbf713fd3", + "hash": "sha256-UtZETlFrK59P6IK2i9Kt8qxRV8aEDMqxH7Oigm5sc1g=" }, - "version": "unstable-2024-04-12" + "version": "unstable-2024-05-04" }, "quicknes": { "fetcher": "fetchFromGitHub", @@ -753,10 +754,10 @@ "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "9d22dbb8d866f10042fe564db7dc7b41078a580b", - "hash": "sha256-y2kPj1BugXVZGzyxs0Ph/qM5SMe82kjxnQA25DIpzac=" + "rev": "771b0ffc3792ffeca10baa88d6a62e3889060236", + "hash": "sha256-U8O4u6gD8jopqzwcnWy9xLSuuBjMSq5nhncSQmrIePs=" }, - "version": "unstable-2024-04-13" + "version": "unstable-2024-05-01" }, "snes9x2002": { "fetcher": "fetchFromGitHub", @@ -793,10 +794,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "09be43c5060b7f23eeb413aa3d7a7021e9a6566c", - "hash": "sha256-jxvX9YAgUVe/92AbwXwgOqJmfoH7t8QxnrrGoXzjFZs=" + "rev": "68e671169f11373e00c88b24d7b319a42b69a715", + "hash": "sha256-WpkUbnYaohP6rDKYi3pPdDxGfW9f7d1QjhJVSBzqLjc=" }, - "version": "unstable-2024-04-04" + "version": "unstable-2024-05-03" }, "stella2014": { "fetcher": "fetchFromGitHub", @@ -813,10 +814,10 @@ "src": { "owner": "libretro", "repo": "swanstation", - "rev": "77aeeea58a45cccae7a8be37645f8f5a27ff101b", - "hash": "sha256-z+9Y9hoQ832caip5U+siQXh9GFxLMnX0HcmLa93B/lc=" + "rev": "929958a1acaa075e32e108118b550e0449540cb6", + "hash": "sha256-UofVxdi+e1Y9d0ML/8lGahJCx5xnW5j9oDssRKrxYLU=" }, - "version": "unstable-2024-01-26" + "version": "unstable-2024-05-06" }, "tgbdual": { "fetcher": "fetchFromGitHub", diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-assets.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-assets.nix index fe96698366..b97d551a6c 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-assets.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-assets.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "retroarch-assets"; - version = "unstable-2024-01-02"; + version = "1.17.0-unstable-2024-04-24"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-assets"; - rev = "923b711dc6772a168d83dc8915e9260730fcf3a1"; - hash = "sha256-Hwgga2hCJEdf/j2mU+hLGAsWdYcfuzjCycxSF37I4qk="; + rev = "9c0bd0d1015889592ad4362b800ac90ff4d019e1"; + hash = "sha256-DB4i4iKx174822OJwJ5QIuMBLywufcR4+4Y+R01W+KQ="; }; makeFlags = [ @@ -24,7 +24,9 @@ stdenvNoCC.mkDerivation { dontBuild = true; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "Assets needed for RetroArch"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py index 3b4ee5f776..4e15315ce7 100755 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ ])" -p git -p nix-prefetch-github -p nix-prefetch-scripts +#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ ])" -p git -p nix-prefetch-github -p nix-prefetch-git -p nix-prefetch-scripts import json import os @@ -69,7 +69,11 @@ CORES = { "gw": {"repo": "gw-libretro"}, "handy": {"repo": "libretro-handy"}, "hatari": {"repo": "hatari"}, - "mame": {"repo": "mame"}, + # Setting fetch_submodules=True since libretro/mame constantly gives + # different hashes for its tarballs, see: + # - https://github.com/NixOS/nixpkgs/issues/259488#issuecomment-1751768379 + # - https://github.com/NixOS/nixpkgs/pull/303494 + "mame": {"repo": "mame", "fetch_submodules": True}, "mame2000": {"repo": "mame2000-libretro"}, "mame2003": {"repo": "mame2003-libretro"}, "mame2003-plus": {"repo": "mame2003-plus-libretro"}, diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ripes/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ripes/default.nix index e6451f89c5..d1ebaf34be 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ripes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ripes/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "ripes"; # Pulling unstable version as latest stable does not build against gcc-13. - version = "2.2.6-unstable-2024-04-02"; + version = "2.2.6-unstable-2024-04-04"; src = fetchFromGitHub { owner = "mortbopet"; repo = "Ripes"; - rev = "027e678a44b7b9f3e81e5b6863b0d68af05fd69c"; + rev = "878087332afa3558dc8ca657f80a16ecdcf82818"; fetchSubmodules = true; - hash = "sha256-u6JxXCX1BMdbHTF7EBGEnXOV+eF6rgoZZcHqB/1nVjE="; + hash = "sha256-aNJTM/s4GNhWVXQxK1R/rIN/NmeKglibQZMh8ENjIzo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix index 0f5501508a..d0ba464858 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix @@ -13,7 +13,7 @@ , jre_minimal , cairo , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , gsettings-desktop-schemas , glib , libxkbcommon @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { makeWrapper pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/sameboy/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/sameboy/default.nix index 09d0136c6d..643092b0a0 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/sameboy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/sameboy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }: +{ lib, stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook3, glib }: stdenv.mkDerivation rec { pname = "sameboy"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - # glib and wrapGAppsHook are needed to make the Open ROM menu work. - nativeBuildInputs = [ rgbds glib wrapGAppsHook ]; + # glib and wrapGAppsHook3 are needed to make the Open ROM menu work. + nativeBuildInputs = [ rgbds glib wrapGAppsHook3 ]; buildInputs = [ SDL2 ]; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix index 80fd7636aa..3e7a7e2f47 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix @@ -14,6 +14,8 @@ , sfml , zip , zlib +, wrapGAppsHook3 +, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-t5/CM5KXDG0OCByu7mUyuC5NkYmB3BFmEHHgnMY05nE="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; buildInputs = [ cairo @@ -41,6 +43,7 @@ stdenv.mkDerivation rec { zlib wxGTK32 gtk3 + gsettings-desktop-schemas ]; cmakeFlags = [ @@ -56,5 +59,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lassulus netali ]; homepage = "https://vba-m.com/"; platforms = lib.platforms.linux; + mainProgram = "visualboyadvance-m"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix index 7b3a12a413..cea0f48d01 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix @@ -20,7 +20,7 @@ , runtimeShell , xa , file -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { file flex pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix index b290a324f9..1c62a9aad9 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix @@ -12,10 +12,9 @@ with import ./util.nix { inherit lib; }; let - patches' = patches; prevName = pname; - prevPlatforms = platforms; prevConfigFlags = configureFlags; + setupHookDarwin = makeSetupHook { name = "darwin-mingw-hook"; substitutions = { @@ -23,30 +22,37 @@ let mingwGccsSuffixSalts = map (gcc: gcc.suffixSalt) mingwGccs; }; } ./setup-hook-darwin.sh; - darwinUnsupportedFlags = [ "alsaSupport" "cairoSupport" "dbusSupport" "fontconfigSupport" "gtkSupport" "netapiSupport" "pulseaudioSupport" "udevSupport" "v4lSupport" "vaSupport" "waylandSupport" "x11Support" "xineramaSupport" ]; - darwinUnsupported = builtins.any (name: builtins.getAttr name supportFlags) darwinUnsupportedFlags; + + darwinFrameworks = lib.optionals stdenv.isDarwin ( + toBuildInputs pkgArches (pkgs: with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ + CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security + ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon + ]) + ); + # Building Wine with these flags isn’t supported on Darwin. Using any of them will result in an evaluation failures + # because they will put Darwin in `meta.badPlatforms`. + darwinUnsupportedFlags = [ + "alsaSupport" "cairoSupport" "dbusSupport" "fontconfigSupport" "gtkSupport" "netapiSupport" "pulseaudioSupport" + "udevSupport" "v4lSupport" "vaSupport" "waylandSupport" "x11Support" "xineramaSupport" + ]; + + badPlatforms = lib.optional (!supportFlags.mingwSupport || lib.any (flag: supportFlags.${flag}) darwinUnsupportedFlags) "x86_64-darwin"; in -stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { - builder = buildScript; -}) // (lib.optionalAttrs stdenv.isDarwin { - postConfigure = '' - # dynamic fallback, so this shouldn’t cause problems for older versions of macOS and will - # provide additional functionality on newer ones. This can be removed once the x86_64-darwin - # SDK is updated. - sed 's|/\* #undef HAVE_MTLDEVICE_REGISTRYID \*/|#define HAVE_MTLDEVICE_REGISTRYID 1|' \ - -i include/config.h - ''; - postBuild = '' - # The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link - # to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and - # rebuild it with empty NIX_LDFLAGS. - for preloader in wine-preloader wine64-preloader; do - rm loader/$preloader &> /dev/null \ - && ( echo "Relinking loader/$preloader"; make loader/$preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" ) \ - || echo "loader/$preloader not built, skipping relink." - done - ''; -}) // rec { +stdenv.mkDerivation (finalAttrs: +lib.optionalAttrs (buildScript != null) { builder = buildScript; } +// lib.optionalAttrs stdenv.isDarwin { + postBuild = '' + # The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link + # to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and + # rebuild it with empty NIX_LDFLAGS. + for preloader in wine-preloader wine64-preloader; do + rm loader/$preloader &> /dev/null \ + && ( echo "Relinking loader/$preloader"; make loader/$preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" ) \ + || echo "loader/$preloader not built, skipping relink." + done + ''; +} +// { inherit version src; pname = prevName + lib.optionalString (wineRelease != "stable" && wineRelease != "unstable") "-${wineRelease}"; @@ -95,10 +101,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] ++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] - ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ - CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security - ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon - ]) + ++ lib.optionals stdenv.isDarwin darwinFrameworks ++ lib.optionals (x11Support) (with pkgs.xorg; [ libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm ]) @@ -107,29 +110,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { mesa # for libgbm ]))); - patches = [ ] - ++ lib.optionals stdenv.isDarwin [ - # Wine uses `MTLDevice.registryID` in `winemac.drv`, but that property is not available in - # the 10.12 SDK (current SDK on x86_64-darwin). That can be worked around by using selector - # syntax. As of Wine 8.12, the logic has changed and uses selector syntax, but it still - # uses property syntax in one place. The first patch is necessary only with older - # versions of Wine. The second is needed on all versions of Wine. - (lib.optional (lib.versionOlder version "8.12") ./darwin-metal-compat-pre8.12.patch) - (lib.optional (lib.versionOlder version "8.18") ./darwin-metal-compat-pre8.18.patch) - (lib.optional (lib.versionAtLeast version "8.18") ./darwin-metal-compat.patch) - # Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs. - ./darwin-qos.patch - ] - ++ patches'; - - # Because the 10.12 SDK doesn’t define `registryID`, clang assumes the undefined selector returns - # `id`, which is a pointer. This causes implicit pointer to integer errors in clang 15+. - # The following post-processing step adds a cast to `uint64_t` before the selector invocation to - # silence these errors. - postPatch = lib.optionalString stdenv.isDarwin '' - sed -e 's|\(\[[A-Za-z_][][A-Za-z_0-9]* registryID\]\)|(uint64_t)\1|' \ - -i dlls/winemac.drv/cocoa_display.m - ''; + inherit patches; configureFlags = prevConfigFlags ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ] @@ -140,7 +121,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = toString (map (path: "-rpath " + path) ( - map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs) + map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] + # Avoid adding rpath references to non-existent framework `lib` paths. + ++ lib.subtractLists darwinFrameworks finalAttrs.buildInputs) # libpulsecommon.so is linked but not found otherwise ++ lib.optionals supportFlags.pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) @@ -210,9 +193,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { fromSource binaryNativeCode # mono, gecko ]; - broken = stdenv.isDarwin && !supportFlags.mingwSupport; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - platforms = if darwinUnsupported then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms; + inherit badPlatforms platforms; maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira reckenrode ]; inherit mainProgram; }; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.12.patch b/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.12.patch deleted file mode 100644 index aaf8a1b89b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.12.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m ---- a/dlls/winemac.drv/cocoa_display.m -+++ b/dlls/winemac.drv/cocoa_display.m -@@ -289,7 +289,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) - * the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps - * using the integrated GPU. This is the behavior of Windows on a Mac. */ - primary_device = [MTLCreateSystemDefaultDevice() autorelease]; -- if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID)) -+ if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, [primary_device registryID])) - goto done; - - /* Hide the integrated GPU if the system default device is a dedicated GPU */ -@@ -301,7 +301,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) - - for (i = 0; i < devices.count; i++) - { -- if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID)) -+ if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], [devices[i] registryID])) - goto done; - - if (hide_integrated && devices[i].isLowPower) - diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.18.patch b/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.18.patch deleted file mode 100644 index 181b2a0d1a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.18.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m ---- a/dlls/winemac.drv/cocoa_display.m -+++ b/dlls/winemac.drv/cocoa_display.m -@@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp - - device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; - if (device && [device respondsToSelector:@selector(registryID)]) -- ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); -+ ret = macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]); - - done: - [pool release]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch b/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch deleted file mode 100644 index 8176be8ef3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m -index fbbe16efcbf..2db375ff3d5 100644 ---- a/dlls/winemac.drv/cocoa_display.m -+++ b/dlls/winemac.drv/cocoa_display.m -@@ -387,7 +387,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp - - device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; - if (device && [device respondsToSelector:@selector(registryID)]) -- return macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); -+ return macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]); - else - return -1; - } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-qos.patch b/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-qos.patch deleted file mode 100644 index e9bd813fea..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-qos.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c -index cde37c48b0d..be237bc0ad3 100644 ---- a/dlls/ntdll/unix/loader.c -+++ b/dlls/ntdll/unix/loader.c -@@ -65,6 +65,7 @@ - # undef LoadResource - # undef GetCurrentThread - # include -+# include - # include - # include - # include diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix index 8efe9c7ab8..62fc12dd4e 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.6"; + version = "9.8"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-Dglg7YK2AX6ILtozOLrRJwoRd7bPBfA6wfqxVavoIEg="; + hash = "sha256-hpQ8g47aj62aeUDUCZcDOUvx0b6aEBQ0L+2HnH3DuZM="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -88,9 +88,9 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "9.0.0"; + version = "9.1.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-efbEMQBnVWbBEvQZm56nuUTTOBZLNL2R+hGwsKQU4cQ="; + hash = "sha256-igoeaDe0lN9Jkn5ddZscaQjom4ovjjrQJeHCiBiCR24="; }; updateScript = writeShellScript "update-wine-unstable" '' @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-6AKN/KpmsTw9qxErhTTzqWuglgFdOAhtaoBlVRcs71Q="; + hash = "sha256-c69E+jr5DKdD8JJxQhM3ILJgvmGvOe54FqMghcVPkpg="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix index 0a99e6d42a..56525d4fa0 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, autoconf, hexdump, perl, python3, wineUnstable }: +{ lib, stdenv, callPackage, autoconf, hexdump, perl, python3, wineUnstable }: with callPackage ./util.nix {}; @@ -7,8 +7,8 @@ let patch = (callPackage ./sources.nix {}).staging; (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra; in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version; -(lib.overrideDerivation (wineUnstable.override { wineRelease = "staging"; }) (self: { - buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs; +(wineUnstable.override { wineRelease = "staging"; }).overrideAttrs (self: { + buildInputs = build-inputs ([ "perl" "autoconf" "gitMinimal" ] ++ lib.optional stdenv.isLinux "util-linux") self.buildInputs; nativeBuildInputs = [ autoconf hexdump perl python3 ] ++ self.nativeBuildInputs; prePatch = self.prePatch or "" + '' @@ -18,7 +18,7 @@ in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMino patchShebangs ./patches/gitapply.sh python3 ./staging/patchinstall.py DESTDIR="$PWD" --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets} ''; -})) // { +}) // { meta = wineUnstable.meta // { description = wineUnstable.meta.description + " (with staging patches)"; }; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/krusader/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/krusader/default.nix index fe0d596f41..0df5ed386c 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/krusader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/krusader/default.nix @@ -3,7 +3,7 @@ , fetchurl , extra-cmake-modules , kdoctools -, wrapGAppsHook +, wrapGAppsHook3 , karchive , kconfig , kcrash @@ -30,7 +30,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules kdoctools - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix index 4e08dc0543..5972139b25 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Small ncurses-based file browser forked from noice"; homepage = "https://github.com/jarun/nnn"; - changelog = "https://github.com/jarun/nnn/blob/v${version}/CHANGELOG"; + changelog = "https://github.com/jarun/nnn/blob/v${finalAttrs.version}/CHANGELOG"; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ Br1ght0ne ]; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix index bfbe68d885..5c614fdede 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix @@ -7,7 +7,7 @@ , libX11 , pango , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gnome , withGtk3 ? true , gtk2 @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib gtk libfm' libX11 pango gnome.adwaita-icon-theme ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix index 4906a06123..ee2df2a60f 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix @@ -1,5 +1,6 @@ -{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, ranger, testers +{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, ranger, imagemagick, testers , imagePreviewSupport ? true +, sixelPreviewSupport ? true , neoVimSupport ? true , improvedEncodingDetection ? true , rightToLeftTextSupport ? false @@ -7,22 +8,23 @@ python3Packages.buildPythonApplication rec { pname = "ranger"; - version = "1.9.3"; + version = "1.9.3-unstable-2023-08-23"; src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; - rev = "v${version}"; - sha256= "1rygfryczanvqxn43lmlkgs04sbqznbvbb9hlbm3h5qgdcl0xlw8"; + rev = "38bb8901004b75a407ffee4b9e176bc0a436cb15"; + hash = "sha256-NpsrABk95xHNvhlRjKFh326IW83mYj1cmK3aE9JQSRo="; }; LC_ALL = "en_US.UTF-8"; - nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook astroid pylint ]; propagatedBuildInputs = [ less file ] ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ] + ++ lib.optionals sixelPreviewSupport [ imagemagick ] ++ lib.optionals neoVimSupport [ python3Packages.pynvim ] ++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ] ++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ]; @@ -49,10 +51,6 @@ python3Packages.buildPythonApplication rec { --replace "set preview_images false" "set preview_images true" ''; - passthru.tests.version = testers.testVersion { - package = ranger; - }; - meta = with lib; { description = "File manager with minimalistic curses interface"; homepage = "https://ranger.github.io/"; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/spacefm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/spacefm/default.nix index 1cab33edb9..4de3580c1d 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/spacefm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/spacefm/default.nix @@ -1,5 +1,5 @@ { pkgs, fetchFromGitHub, lib, stdenv, gtk3, udev, desktop-file-utils -, shared-mime-info, intltool, pkg-config, wrapGAppsHook, ffmpegthumbnailer +, shared-mime-info, intltool, pkg-config, wrapGAppsHook3, ffmpegthumbnailer , jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ gtk3 udev desktop-file-utils shared-mime-info - wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 + wrapGAppsHook3 ffmpegthumbnailer jmtpfs lsof udisks2 ] ++ (lib.optionals ifuseSupport [ ifuse ]); # Introduced because ifuse doesn't build due to CVEs in libplist # Revert when libplist builds again… diff --git a/third_party/nixpkgs/pkgs/applications/finance/irpf/default.nix b/third_party/nixpkgs/pkgs/applications/finance/irpf/default.nix index b693aee613..9bf9c1f2d0 100644 --- a/third_party/nixpkgs/pkgs/applications/finance/irpf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/finance/irpf/default.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { pname = "irpf"; - version = "2024-1.0"; + version = "2024-1.1"; # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf # Para outros sistemas operacionais -> Multi @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { year = lib.head (lib.splitVersion version); in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip"; - hash = "sha256-x47Ud/aSfPuZYMZSGhJLnNFtNE62I+WjaFFatJPMPYg="; + hash = "sha256-7Eh5XhZKs2DAQC33ICUG+mgjEU7H3jdYZSeiHNJ6I6Q="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; @@ -71,7 +71,7 @@ stdenvNoCC.mkDerivation rec { license = licenses.unfree; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = with maintainers; [ atila ]; + maintainers = with maintainers; [ atila bryanasdev000 ]; mainProgram = "irpf"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix index 9dc83fdf23..4eb10a34d2 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix @@ -3,7 +3,7 @@ , callPackage , fetchFromGitHub , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , bison , blas @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 bison flex diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 3476816b1c..bc0033746b 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -3,7 +3,7 @@ , makeWrapper , mkDerivation , substituteAll -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , withGrass ? true @@ -94,7 +94,7 @@ in mkDerivation rec { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook bison diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index d112ed50a0..0cea5f9980 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -3,7 +3,7 @@ , makeWrapper , mkDerivation , substituteAll -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , withGrass ? true @@ -95,7 +95,7 @@ in mkDerivation rec { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook bison diff --git a/third_party/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix b/third_party/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix index 47a4329ae1..4acedbac2a 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix @@ -1,67 +1,61 @@ -{ mkDerivation -, lib -, fetchFromGitLab -, qmake -, qtcharts -, qtsvg -, marble -, qtwebengine -, ldutils +{ + mkDerivation, + lib, + fetchFromGitLab, + gitUpdater, + wrapQtAppsHook, + cmake, + marble, + libsForQt5, }: - mkDerivation rec { pname = "zombietrackergps"; - version = "1.10"; + version = "1.15"; src = fetchFromGitLab { owner = "ldutils-projects"; repo = pname; - rev = "v_${version}"; - sha256 = "sha256-qRhCAOVWyDLD3WDptPRQVq+VwyFu83XQNaL5TMsGs4Y="; + # latest revision is not tagged upstream, use commit sha in the meantime + #rev = "v_${version}"; + rev = "cc75d5744965cc6973323f5bb77f00b0b0153dce"; + sha256 = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM="; }; - buildInputs = [ - ldutils - qtcharts - qtsvg - marble.dev - qtwebengine - ]; + buildInputs = + [ + marble.dev + ] + ++ (with libsForQt5; [ + qtbase + qtcharts + qtsvg + qtwebengine + ldutils + ]); nativeBuildInputs = [ - qmake + cmake + wrapQtAppsHook ]; - prePatch = '' - substituteInPlace ztgps.pro --replace "../libldutils" "libldutils" - substituteInPlace tests.pro --replace "../libldutils" "libldutils" - - ln -s ${ldutils} libldutils - ''; - preConfigure = '' export LANG=en_US.UTF-8 - export INSTALL_ROOT=$out ''; - preInstall = '' - substituteInPlace Makefile.ztgps --replace '$(INSTALL_ROOT)' "" - substituteInPlace Makefile.art --replace '$(INSTALL_ROOT)' "" - ''; + cmakeFlags = [ + "-DLDUTILS_ROOT=${libsForQt5.ldutils}" + ]; - postInstall = '' - install -Dm644 build/rcc/*.rcc -t $out/share/zombietrackergps - ''; - - qmakeFlags = [ "ZombieTrackerGPS.pro" ]; + passthru.updateScript = gitUpdater { + rev-prefix = "v_"; + }; meta = with lib; { description = "GPS track manager for Qt using KDE Marble maps"; homepage = "https://www.zombietrackergps.net/ztgps/"; changelog = "https://www.zombietrackergps.net/ztgps/history.html"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ sohalt ]; + maintainers = with maintainers; [sohalt]; platforms = platforms.linux; - broken = true; # doesn't build with latest Marble }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index 568a8a0ac0..c15af9d94f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -50,13 +50,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-29"; + version = "7.1.1-32"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-W9WbHzmTa0dA9+mOxXu88qmN1mO9ORaH0Nj6r2s1Q+E="; + hash = "sha256-9pDxnUNMmrwnP4rrR41OSZOJZjQnlVvedpLvMZJJnJo="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix index 3903a3acd8..03278888c8 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix @@ -9,7 +9,7 @@ , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook3 , cairo , glib , goocanvas3 @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix index a6a3563743..c10f85a99d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, makeDesktopItem, fetchurl, unzip , gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, gnome -, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon +, xorg, mozjpeg, makeWrapper, wrapGAppsHook3, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: stdenv.mkDerivation rec { @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { comment = "The bridge between designers and developers"; }; - nativeBuildInputs = [makeWrapper wrapGAppsHook unzip]; + nativeBuildInputs = [makeWrapper wrapGAppsHook3 unzip]; buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; # src is producing multiple folder on unzip so we must diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ciano/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ciano/default.nix index 7b96dc1f79..454a1d28c4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ciano/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ciano/default.nix @@ -11,7 +11,7 @@ , pkg-config , python , vala -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pkg-config python vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix index e78b95c363..f66189e0c7 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix @@ -20,7 +20,7 @@ , qttools , tbb , xercesc -, wrapGAppsHook +, wrapGAppsHook3 }: mkDerivation rec { @@ -38,7 +38,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake eigen # header-only - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix deleted file mode 100644 index 13a8ef1a02..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, mkDerivationWith -, python3Packages -, fetchFromGitHub -, wrapQtAppsHook -}: - -mkDerivationWith python3Packages.buildPythonApplication rec { - pname = "cq-editor"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "CadQuery"; - repo = "CQ-editor"; - rev = version; - sha256 = "1970izjaa60r5cg9i35rzz9lk5c5d8q1vw1rh2skvfbf63z1hnzv"; - }; - - patches = [ - ./spyder4.patch - ]; - - propagatedBuildInputs = with python3Packages; [ - cadquery - logbook - pyqt5 - pyparsing - pyqtgraph - spyder - path - qtconsole - requests - ]; - - nativeBuildInputs = [ wrapQtAppsHook ]; - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - - nativeCheckInputs = with python3Packages; [ - pytest - pytest-xvfb - pytest-mock - pytest-cov - pytest-repeat - pytest-qt - ]; - - checkPhase = '' - pytest --no-xvfb - ''; - - # requires X server - doCheck = false; - - meta = with lib; { - description = "CadQuery GUI editor based on PyQT"; - homepage = "https://github.com/CadQuery/CQ-editor"; - license = licenses.asl20; - maintainers = with maintainers; [ costrouc marcus7070 ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix index d12c3e6f22..0ef67bdcc8 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/curtail/default.nix @@ -20,14 +20,14 @@ python3.pkgs.buildPythonApplication rec { pname = "curtail"; - version = "1.8.0"; + version = "1.9.1"; format = "other"; src = fetchFromGitHub { owner = "Huluti"; repo = "Curtail"; rev = "refs/tags/${version}"; - sha256 = "sha256-LLz4nZ9WFQMogQR2gCKn80gvHUG5hlpQpcNjpr4fs2s="; + sha256 = "sha256-9xTdT2mS3aWyimkxrNwCuWIzZ0dPE7w4xUwO53kKr30="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix index fdc3770676..c2b8ade1f2 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -4,7 +4,7 @@ , libsoup , graphicsmagick , json-glib -, wrapGAppsHook +, wrapGAppsHook3 , cairo , cmake , ninja @@ -64,7 +64,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-Fu3AoHApPi082k6hDkm9qb3pMuI/nmLi+i56x0rPev0="; }; - nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; + patches = [ + ./fix_darwin_x86_compile.patch + ]; + + + nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook3 ]; buildInputs = [ cairo diff --git a/third_party/nixpkgs/pkgs/applications/graphics/darktable/fix_darwin_x86_compile.patch b/third_party/nixpkgs/pkgs/applications/graphics/darktable/fix_darwin_x86_compile.patch new file mode 100644 index 0000000000..617b4b1bf0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/darktable/fix_darwin_x86_compile.patch @@ -0,0 +1,22 @@ +From 1620befa933fbe525d8851a8f465db9926b7a588 Mon Sep 17 00:00:00 2001 +From: Mario Zimmermann +Date: Wed, 14 Feb 2024 22:18:42 +0100 +Subject: [PATCH] fix xcode compiler segfault + +--- + src/common/darktable.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/common/darktable.h b/src/common/darktable.h +index e5bd1a28902c..2c43b4878bcf 100644 +--- a/src/common/darktable.h ++++ b/src/common/darktable.h +@@ -140,7 +140,7 @@ extern "C" { + /* Create cloned functions for various CPU SSE generations */ + /* See for instructions https://hannes.hauswedell.net/post/2017/12/09/fmv/ */ + /* TL;DR : use only on SIMD functions containing low-level paralellized/vectorized loops */ +-#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) ++#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && !defined(__APPLE__) + # if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) + #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default", "sse2", "sse3", "sse4.1", "sse4.2", "popcnt", "avx", "avx2", "avx512f", "fma4"))) + # elif defined(__PPC64__) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix index c79f50e86d..534d1f5884 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix @@ -15,7 +15,7 @@ , pkg-config , poppler , python3 -, wrapGAppsHook +, wrapGAppsHook3 # Building with docs are still failing in unstable-2023-09-28 , withDocs ? false }: @@ -60,7 +60,7 @@ stdenv.mkDerivation { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals withDocs [ dblatex diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix index 90caf78d63..cf4b650219 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix @@ -8,7 +8,7 @@ , appstream-glib , desktop-file-utils , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , glib , gdk-pixbuf , pango @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 glib gettext itstool diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index b53879974d..330e88c50e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "24.1.0"; + version = "24.2.5"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-vwytqlPv8LfOceuBs/MNPxzO1ZYv1hwjIRyBh/wuVEU="; + hash = "sha256-8Cs+uME6uXWIWeuS9cgKnlYJG/m13l2BIVNDG0bqEmc="; }; # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-mRnGsfxrdfzk6+z07174zZ7pcS68Zut6inuBPZkLtWQ="; + hash = "sha256-tQFcdZc+4N6TYY6MDAwUgpaIvqYkU681DbuYCQhvJ1c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/emulsion/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/emulsion/default.nix index 323920ff4d..67342c57c8 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/emulsion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/emulsion/default.nix @@ -37,16 +37,16 @@ let in rustPlatform.buildRustPackage rec { pname = "emulsion"; - version = "10.5"; + version = "11.0"; src = fetchFromGitHub { owner = "ArturKovacs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wrb5jHr2rXDpXF/uHpNLKSc//Xdj0/VsXQcytit0hKY="; + sha256 = "sha256-0t+MUZu1cvkJSL9Ly9kblH8fMr05KuRpOo+JDn/VUc8="; }; - cargoHash = "sha256-zfR4sp/AmK3+UcFdqMMZE9O9+oGathqmuqFw11SmUWI="; + cargoHash = "sha256-detJZRnxT3FubaF/A4w2pFdhW03BH0gsaeuNFYu+cBw="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix index fd136a5b40..6c794c9706 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix @@ -4,7 +4,7 @@ , fetchurl , autoPatchelfHook , dpkg -, wrapGAppsHook +, wrapGAppsHook3 , ... }: with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9UfyCqgsg9XAFyZ7V7TogkQou4x+ixFUfjXZ1/qlDmA="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; + nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook3 ]; buildInputs = with pkgs;[ alsa-lib diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix index f3854b4c69..46c2c72d91 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix @@ -17,7 +17,7 @@ , json-glib , glib-networking , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix index ae36266f29..a5b89a605d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix @@ -7,7 +7,7 @@ , libxml2 , gtk3 , libportal-gtk3 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { gettext pkg-config libxml2 # xml-stripblanks preprocessing of GResource - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix index c88e068615..4eeb330f6d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix @@ -3,7 +3,7 @@ , libarchive, djvulibre, libheif, openjpeg, libjxl, libraw, lua5_3, poppler , gspell, libtiff, libwebp , gphoto2, imagemagick, yad, exiftool, gnome, libnotify -, wrapGAppsHook, fetchpatch, doxygen +, wrapGAppsHook3, fetchpatch, doxygen , nix-update-script }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext intltool - wrapGAppsHook doxygen + wrapGAppsHook3 doxygen meson ninja xxd ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix index f3587cf2ea..33ddbd9159 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix @@ -56,13 +56,13 @@ let python = python2.withPackages (pp: [ pp.pygtk ]); in stdenv.mkDerivation (finalAttrs: { pname = "gimp"; - version = "2.10.36"; + version = "2.10.38"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-PTvDxppL2zrqm6LVOF7ZjqA5U/OFeq/R1pdgEe1827I="; + sha256 = "sha256-UKhF7sEciDH+hmFweVD1uERuNfMO37ms+Y+FwRM/hW4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix index fbcc5ebcf4..045a42d0e2 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix @@ -30,7 +30,7 @@ , python3 , tracker , tracker-miners -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { pygobject3 pyatspi ])) - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Access, organize and share your photos"; mainProgram = "gnome-photos"; - homepage = "https://wiki.gnome.org/Apps/Photos"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-photos"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/goxel/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/goxel/default.nix index 000fd37192..2ffa57280e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/goxel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/goxel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, scons, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, scons, pkg-config, wrapGAppsHook3 , glfw3, gtk3, libpng }: stdenv.mkDerivation (finalAttrs: { @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ueA0YW2n/DXd9AytDzfPtvtXbvuUm4VDwcdvHWObKxc="; }; - nativeBuildInputs = [ scons pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ scons pkg-config wrapGAppsHook3 ]; buildInputs = [ glfw3 gtk3 libpng ]; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix index bbf52e105a..0989c07d8a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchurl, perlPackages, wrapGAppsHook, fetchpatch, +{ lib, fetchurl, perlPackages, wrapGAppsHook3, fetchpatch, # libs librsvg, sane-backends, sane-frontends, # runtime dependencies - imagemagick, libtiff_4_5, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, + imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, # test dependencies xvfb-run, liberation_ttf, file, tesseract }: @@ -28,7 +28,7 @@ perlPackages.buildPerlPackage rec { ./image-utf8-fix.patch ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ librsvg sane-backends sane-frontends ] ++ @@ -82,7 +82,7 @@ perlPackages.buildPerlPackage rec { wrapProgram "$out/bin/gscan2pdf" \ --prefix PATH : "${sane-backends}/bin" \ --prefix PATH : "${imagemagick}/bin" \ - --prefix PATH : "${libtiff_4_5}/bin" \ + --prefix PATH : "${libtiff}/bin" \ --prefix PATH : "${djvulibre}/bin" \ --prefix PATH : "${poppler_utils}/bin" \ --prefix PATH : "${ghostscript}/bin" \ @@ -98,10 +98,7 @@ perlPackages.buildPerlPackage rec { nativeCheckInputs = [ imagemagick - # Needs older libtiff version, because it stopped packageing tools like - # tiff2pdf and others in version 4.6. These tools are necessary for gscan2pdf. - # See commit f57a4b0ac1b954eec0c8def2a99e2a464ac6ff7a for in-depth explanation. - libtiff_4_5 + libtiff djvulibre poppler_utils ghostscript diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix index b3b9deedff..a09b39bdad 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix @@ -4,7 +4,7 @@ , gettext , gobject-introspection , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils , scrot , slop @@ -27,12 +27,12 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-BA118PwMslqvnlRES2fEgTjzfNvKNVae7GzWSyuaqYM="; }; - # needed for wrapGAppsHook to function + # needed for wrapGAppsHook3 to function strictDeps = false; # tests require a display and fail doCheck = false; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; propagatedBuildInputs = [ gettext gobject-introspection diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix index 79793c6887..fc59139694 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix @@ -26,7 +26,7 @@ , bison , flex , clutter-gtk -, wrapGAppsHook +, wrapGAppsHook3 , shared-mime-info , python3 , desktop-file-utils @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Gthumb"; + homepage = "https://gitlab.gnome.org/GNOME/gthumb"; description = "Image browser and viewer for GNOME"; mainProgram = "gthumb"; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/halftone/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/halftone/default.nix index 81e70e401f..c29bcb8ccd 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/halftone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/halftone/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "halftone"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "tfuxu"; repo = pname; - rev = version; - hash = "sha256-7fa6afrGt8SXli2KHzzRIqTBBaN3Hk0coYwxe66jLsg="; + rev = "refs/tags/${version}"; + hash = "sha256-o55eimlDy86mbwveARxVXauMQEneAchVi2RNaj6FYxs="; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hugin/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hugin/default.nix index 6a0408f98f..e7c3d7f897 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hugin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hugin/default.nix @@ -30,7 +30,7 @@ , perlPackages , sqlite , vigra -, wrapGAppsHook +, wrapGAppsHook3 , wxGTK , zlib }: @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { zlib ]; - nativeBuildInputs = [ cmake makeWrapper pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config wrapGAppsHook3 ]; # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index d546baa984..e2a0d62aca 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -8,23 +8,26 @@ , python3Packages , qtbase , qtcharts +, makeDesktopItem +, copyDesktopItems }: python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "566"; + version = "572"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-0vz2UnfU7yZIy1S+KOXLFrlQDuPCbpSw1GYEK8YZ/Qc="; + hash = "sha256-mLb4rUsoMDxl7lPrrRJq/bWSqZlgg94efHJzgykZJ/g="; }; nativeBuildInputs = [ wrapQtAppsHook python3Packages.mkdocs-material + copyDesktopItems ]; buildInputs = [ @@ -32,6 +35,20 @@ python3Packages.buildPythonPackage rec { qtcharts ]; + desktopItems = [ + (makeDesktopItem { + name = "hydrus-client"; + exec = "hydrus-client"; + desktopName = "Hydrus Client"; + icon = "hydrus-client"; + comment = meta.description; + terminal = false; + type = "Application"; + categories = [ "FileTools" "Utility" ]; + }) + ]; + + propagatedBuildInputs = with python3Packages; [ beautifulsoup4 cbor2 @@ -104,6 +121,8 @@ python3Packages.buildPythonPackage rec { outputs = [ "out" "doc" ]; installPhase = '' + runHook preInstall + # Move the hydrus module and related directories mkdir -p $out/${python3Packages.python.sitePackages} mv {hydrus,static,db} $out/${python3Packages.python.sitePackages} @@ -118,12 +137,18 @@ python3Packages.buildPythonPackage rec { mkdir -p $out/bin install -m0755 hydrus_server.py $out/bin/hydrus-server install -m0755 hydrus_client.py $out/bin/hydrus-client + + # desktop item + mkdir -p "$out/share/icons/hicolor/scalable/apps" + ln -s "$doc/share/doc/hydrus/assets/hydrus-white.svg" "$out/share/icons/hicolor/scalable/apps/hydrus-client.svg" '' + lib.optionalString enableSwftools '' mkdir -p $out/${python3Packages.python.sitePackages}/bin # swfrender seems to have to be called sfwrender_linux # not sure if it can be loaded through PATH, but this is simpler # $out/python3Packages.python.sitePackages/bin is correct NOT .../hydrus/bin ln -s ${swftools}/bin/swfrender $out/${python3Packages.python.sitePackages}/bin/swfrender_linux + '' + '' + runHook postInstall ''; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/icon-library/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/icon-library/default.nix index 25cc1ebebf..3dae4b0e1b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/icon-library/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/icon-library/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "icon-library"; - version = "0.0.18"; + version = "0.0.19"; src = fetchurl { - url = "https://gitlab.gnome.org/World/design/icon-library/uploads/874b27fcf34662d9686f670d406142c2/icon-library-${version}.tar.xz"; - hash = "sha256-qCGwTePA817mulFjyRZKw+Fw1S77+QTtA7WH+KocL48="; + url = "https://gitlab.gnome.org/World/design/icon-library/uploads/7725604ce39be278abe7c47288085919/icon-library-${version}.tar.xz"; + hash = "sha256-nWGTYoSa0/fxnD0Mb2132LkeB1oa/gj/oIXBbI+FDw8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ideogram/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ideogram/default.nix index 12706d6d36..721bc1c7f9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ideogram/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ideogram/default.nix @@ -12,7 +12,7 @@ , pantheon , desktop-file-utils , xorg -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix index b6396c231b..2398a61f21 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/imagej/default.nix @@ -7,7 +7,7 @@ , makeWrapper , makeDesktopItem , copyDesktopItems -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { url = "https://wsr.imagej.net/distros/cross-platform/ij${version}.zip"; sha256 = "sha256-MGuUdUDuW3s/yGC68rHr6xxzmYScUjdXRawDpc1UQqw="; }; - nativeBuildInputs = [ copyDesktopItems makeWrapper unzip wrapGAppsHook ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper unzip wrapGAppsHook3 ]; buildInputs = [ glib ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index 35000a06de..358931534a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -40,7 +40,7 @@ , potrace , python3 , substituteAll -, wrapGAppsHook +, wrapGAppsHook3 , libepoxy , zlib }: @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { python3Env glib # for setup hook gdk-pixbuf # for setup hook - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ] ++ (with perlPackages; [ perl diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions/textext/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions/textext/default.nix index c3ad003cc1..cb4be37759 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions/textext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions/textext/default.nix @@ -6,7 +6,7 @@ , pdflatex , lualatex , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , gtk3 , gtksourceview3 @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix index 65ec4eb71d..20098eabef 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook +{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkg-config, wrapGAppsHook3 , kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons , qtbase, qtsvg , boost, graphviz @@ -19,7 +19,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - cmake extra-cmake-modules pkg-config wrapGAppsHook + cmake extra-cmake-modules pkg-config wrapGAppsHook3 kdoctools ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix index 22bce94e11..bdc81a532f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.39.0"; + version = "1.46.0"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-bAk+F81q0sPSgU8LkpniVJyKaQt6cxUaUzNSZ3f5v0Q="; + hash = "sha256-0yobGclfZzv0S0HtqeTr4vzK5d6PTQNWMszP0B4k770="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { natsort piexif pillow - pure-protobuf + curl-cffi pygobject3 python-magic rarfile diff --git a/third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix index 2d099b5eb7..261f451d07 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/komorebi/default.nix @@ -11,7 +11,7 @@ , clutter-gtk , clutter-gst , ninja -, wrapGAppsHook +, wrapGAppsHook3 , testers , komorebi }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { vala pkg-config ninja - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/kphotoalbum/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/kphotoalbum/default.nix index 6ff2f43399..aa4bd7fd7e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/kphotoalbum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/kphotoalbum/default.nix @@ -4,7 +4,7 @@ , lib , extra-cmake-modules , kdoctools -, wrapGAppsHook +, wrapGAppsHook3 , exiv2 , ffmpeg , libkdcraw @@ -38,7 +38,7 @@ mkDerivation rec { # be on the system anyway, so there is no real harm including it buildInputs = [ exiv2 phonon libvlc ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 ]; propagatedBuildInputs = [ kconfig kiconthemes kio kinit kpurpose libkdcraw ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix index e9ca6b52a0..19455d89c9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "1.5.06"; + version = "1.6.00"; nativeBuildInputs = [ p7zip @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-VJMfvZHqdgUQXLyBBZLEV3nyP0qzibuXLnZyBhBBg9E="; + sha256 = "sha256-R9DBlmqvV23QXzC45Z4GN0t+ysv4WM63POJGU5N7jbw="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix index 6381c39931..0d261b5e60 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix @@ -15,7 +15,7 @@ , pkg-config , python3 , swig -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -46,13 +46,36 @@ in buildPythonApplication rec { url = "https://github.com/mypaint/mypaint/commit/032a155b72f2b021f66a994050d83f07342d04af.patch"; hash = "sha256-EI4WJbpZrCtFMKd6QdXlWpRpIHi37gJffDjclzTLaLc="; }) + # Fix drag-n-drop file opening + (fetchpatch { + url = "https://github.com/mypaint/mypaint/commit/66b2ba98bd953afa73d0d6ac71040b14a4ea266b.patch"; + hash = "sha256-4AWXD/JMpNA5otl2ad1ZLVPW49pycuOXGcgfzvj0XEE="; + }) + # Fix crash with locked layer + (fetchpatch { + url = "https://github.com/mypaint/mypaint/commit/0b720f8867f18acccc8e6ec770a9cc494aa81dcf.patch"; + hash = "sha256-ahYeERiMLA8yKIXQota6/ApAbOW0XwsHO2JkEEMm1Ow="; + }) + # Refactoring for the following patch to apply. + (fetchpatch { + url = "https://github.com/mypaint/mypaint/commit/d7d2496401a112a178d5fa2e491f0cc7537d24cd.patch"; + hash = "sha256-dIW6qWqY96+bsUDQQtGtjENvypnh//Ep3xW+wooCJ14="; + includes = [ + "gui/colors/hcywheel.py" + ]; + }) + # Fix crash with hcy wheel masking + (fetchpatch { + url = "https://github.com/mypaint/mypaint/commit/5496b1cd1113fcd46230d87760b7e6b51cc747bc.patch"; + hash = "sha256-h+sE1LW04xDU2rofH5KqXsY1M0jacfBNBC+Zb0i6y1w="; + }) ]; nativeBuildInputs = [ gettext pkg-config swig - wrapGAppsHook + wrapGAppsHook3 gobject-introspection # for setup hook hicolor-icon-theme # fór setup hook python3.pkgs.setuptools diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix index 25df4c69c6..7c30e81ab3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , intltool , itstool , libxml2 @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 intltool itstool libxml2 @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/OCRFeeder"; + homepage = "https://gitlab.gnome.org/GNOME/ocrfeeder"; description = "Complete Optical Character Recognition and Document Analysis and Recognition program"; maintainers = with maintainers; [ doronbehar ]; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix index d7e322f395..c2f2840a5d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix @@ -17,28 +17,28 @@ , gtk3 , darwin , perl -, wrapGAppsHook +, wrapGAppsHook3 }: rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.8.18"; + version = "0.8.21"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; rev = version; - hash = "sha256-TLY6ydYeRuT93jjUeE7EaFNNllwla4h563UhXAxSyko="; + hash = "sha256-2QX7cD9SjhLb82O8T90BTQGsy3/gDaNwoX4Mbe2H6s4="; }; - cargoHash = "sha256-RKJE09Z4XxRLWQ95Om3tru4rI2TD7XmxoHhPHFirREo="; + cargoHash = "sha256-VAWLs15xsjoT0VSJjS/j0wd5P7OjQGrvyUSHp4B8hHI="; nativeBuildInputs = [ cmake pkg-config nasm perl - wrapGAppsHook + wrapGAppsHook3 ]; checkFlagsArray = [ "--skip=tests::net" ]; # requires network access diff --git a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix index e0ea00e5c2..d72994e008 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix @@ -29,7 +29,7 @@ , spacenavSupport ? stdenv.isLinux, libspnav , wayland , wayland-protocols -, wrapGAppsHook +, wrapGAppsHook3 , qtwayland , cairo }: @@ -58,7 +58,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ bison flex pkg-config gettext qmake wrapGAppsHook]; + nativeBuildInputs = [ bison flex pkg-config gettext qmake wrapGAppsHook3]; buildInputs = [ eigen boost glew opencsg cgal_4 mpfr gmp glib diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index 2613304b17..77458c3cc5 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - hash = "sha256-FzlukSQSKeQY6H53UfWXwL8bXkOXRhaA92/Kgxh4oms="; + hash = "sha256-E1D2DvwwrtlY06kvCZkoAO5VcdtkBJYLcxuqGsulFUA="; # Apparently upstream requires that the compiled executable will know the # commit hash and the date of the commit. This information is also presented # in the output of `pdfcpu version` which we use as a sanity check in the @@ -31,7 +31,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-jVX/CFf9dd9qD3gyGVDjbfINtPLCsgdjWFix4BCpDZ0="; + vendorHash = "sha256-4k4aZnQ9SjcGr/ziCacfcVfVk7w4Qhli2rOeYE76Qs0="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pencil/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pencil/default.nix index 9924e0b58c..4b7b6f9b6a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pencil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pencil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, makeWrapper, wrapGAppsHook, +{ stdenv, fetchurl, lib, makeWrapper, wrapGAppsHook3, # build dependencies alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gtk3, libuuid, nspr, nss, pango, @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { dontBuild = true; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook3 ]; buildInputs = deps; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoqt/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/photoqt/default.nix index 5be47fb1b8..e3c8ce53bb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/photoqt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/photoqt/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "photoqt"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-dCaNF5UoH6SkKBrZGtwg2qZcDtlptdBxEGZL2oKyjhI="; + hash = "sha256-QFziMNRhiM4LaNJ8RkJ0iCq/8J82wn0F594qJeSN3Lw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix index bd9ab649d6..fd736c3ec7 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -6,7 +6,7 @@ , glib , gtk3 , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , python }: @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; pythonPath = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix index 2f523813a2..7f9c815eff 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pinta/default.nix @@ -5,7 +5,7 @@ , glibcLocales , gtk3 , intltool -, wrapGAppsHook +, wrapGAppsHook3 }: buildDotnetModule rec { @@ -14,7 +14,7 @@ buildDotnetModule rec { nativeBuildInputs = [ intltool - wrapGAppsHook + wrapGAppsHook3 ]; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pizarra/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pizarra/default.nix index b53368439d..6fd94f57e1 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pizarra/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pizarra/default.nix @@ -9,7 +9,7 @@ , glib , librsvg , gdk-pixbuf -, wrapGAppsHook +, wrapGAppsHook3 }: rustPlatform.buildRustPackage rec { @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-btvMUKADGHlXLmeKF1K9Js44SljZ0MejGId8aDwPhVU="; - nativeBuildInputs = [ wrapGAppsHook pkg-config gdk-pixbuf ]; + nativeBuildInputs = [ wrapGAppsHook3 pkg-config gdk-pixbuf ]; buildInputs = [ gtk3-x11 atk glib librsvg ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix index 3df5013cc0..d71ded259e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, wrapGAppsHook, libGL }: +{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, stripJavaArchivesHook, wrapGAppsHook3, libGL }: let buildNumber = "1293"; vaqua = fetchurl { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0="; }; - nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ ant unzip makeWrapper stripJavaArchivesHook wrapGAppsHook3 ]; buildInputs = [ jdk jogl ant rsync ffmpeg batik ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pureref/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pureref/default.nix index 825ea4c51e..552f56a6b5 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pureref/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pureref/default.nix @@ -12,10 +12,6 @@ appimageTools.wrapType1 rec { curl "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out ''; - extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - ''; - meta = with lib; { description = "Reference Image Viewer"; homepage = "https://www.pureref.com"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix index 2038b09dd8..bf84ac1df1 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , pixman , libpthreadstubs @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix index e6d6eb41b9..844878a349 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix @@ -27,7 +27,7 @@ , desktop-file-utils , gdk-pixbuf , librsvg -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , itstool , libsecret @@ -35,8 +35,6 @@ , gsettings-desktop-schemas }: -# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling - stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; version = "0.32.6"; @@ -54,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { itstool gettext desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; @@ -97,9 +95,9 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Popular photo organizer for the GNOME desktop"; mainProgram = "shotwell"; - homepage = "https://wiki.gnome.org/Apps/Shotwell"; + homepage = "https://gitlab.gnome.org/GNOME/shotwell"; license = licenses.lgpl21Plus; - maintainers = with maintainers; []; + maintainers = with maintainers; [ bobby285271 ]; platforms = platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shutter/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/shutter/default.nix index d10e848779..9f18033fca 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/shutter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/shutter/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , perlPackages -, wrapGAppsHook +, wrapGAppsHook3 , imagemagick , gdk-pixbuf , librsvg @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-o95skSr6rszh0wsHQTpu1GjqCDmde7aygIP+i4XQW9A="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ perlPackages.perl procps diff --git a/third_party/nixpkgs/pkgs/applications/graphics/snapshot/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/snapshot/default.nix index 88fc83f93c..d05bfe3e34 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/snapshot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/snapshot/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "snapshot"; - version = "45.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; - hash = "sha256-iQd4F/xzXMjonbUWKPUuqKxmwZTfxqekLgA8TCnE3T4="; + hash = "sha256-RZV6BBX0VNY1MUkaoEeVzuDO1O3d1dj6DQAPXvBzW2c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix index e0605ad81e..610ef336a9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/solvespace/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , at-spi2-core , cairo , dbus @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/structorizer/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/structorizer/default.nix index e639efa4e2..46332a1290 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/structorizer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/structorizer/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "structorizer"; - version = "3.32-20"; + version = "3.32-21"; desktopItems = [ (makeDesktopItem { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "fesch"; repo = "Structorizer.Desktop"; rev = version; - hash = "sha256-kFgypwSmXRkIyb0ZMcoTSgQdODfn9F81ABlFWATvh3M="; + hash = "sha256-pwakwIMmG7A0Rw8XYH/f2PkzzX9bIADL0+52Ucawn3Q="; }; patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix index 6f3103ecb8..5d8ef439f0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "symbolic-preview"; - version = "0.0.3"; + version = "0.0.9"; src = fetchurl { - url = "https://gitlab.gnome.org/World/design/symbolic-preview/uploads/df71a2eee9ea0c90b3d146e7286fec42/symbolic-preview-${version}.tar.xz"; - sha256 = "08g2sbdb1x5z26mi68nmciq6xwv0chvxw6anj1qdfh7npsg0dm4c"; + url = "https://gitlab.gnome.org/World/design/symbolic-preview/uploads/e2fed158fc0d267f2051302bcf14848b/symbolic-preview-${version}.tar.xz"; + hash = "sha256-kx+70LCQzzWAw2Xd3fKGq941540IM3Y1+r4Em4MNWbw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix index 34f9baad68..858fef718a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix @@ -4,7 +4,7 @@ , fetchpatch , pkg-config , autoreconfHook -, wrapGAppsHook +, wrapGAppsHook3 , boost , cairo @@ -116,7 +116,7 @@ stdenv.mkDerivation { autoreconfHook gettext intltool - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ ETL diff --git a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix index ca70027eb2..7447e54946 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix @@ -1,21 +1,21 @@ { lib, stdenv, fetchFromGitHub -, cmake, wrapGAppsHook +, cmake, wrapGAppsHook3 , libX11, libzip, glfw, libpng, xorg, gnome }: stdenv.mkDerivation rec { pname = "tev"; - version = "1.26"; + version = "1.27"; src = fetchFromGitHub { owner = "Tom94"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-6acFt0fyL0yStUwreGggJ+7Zi+0Fqburj/ytmf+Oi4w="; + sha256 = "sha256-+qCRHP0AbYOQBAE4zK2cmWPHZGWjjxC3DZPNm8sgBzs="; }; - nativeBuildInputs = [ cmake wrapGAppsHook ]; + nativeBuildInputs = [ cmake wrapGAppsHook3 ]; buildInputs = [ libX11 libzip glfw libpng ] ++ (with xorg; [ libXrandr libXinerama libXcursor libXi libXxf86vm libXext ]); diff --git a/third_party/nixpkgs/pkgs/applications/graphics/texturepacker/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/texturepacker/default.nix index ccae60f143..37f07e9657 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/texturepacker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/texturepacker/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "texturepacker"; - version = "7.2.0"; + version = "7.4.0"; src = fetchurl { url = "https://www.codeandweb.com/download/texturepacker/${finalAttrs.version}/TexturePacker-${finalAttrs.version}.deb"; - hash = "sha256-64aAg8V61MwJjFLYcf/nv5Bp7W0+cQBZac2e1HzkJBw="; + hash = "sha256-v+azjIIscmp72WB3gki0CKb+z+FYsuJxIx9jvdfs+qM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/upscayl/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/upscayl/default.nix index 9675f4cf17..12518b6f40 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/upscayl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-nRYNYNHIkbvvQZd1zRDCCsCadgRgV/yn9WfaKjt44O8="; + hash = "sha256-XhvOzARP8Ytlf23vNMYZ5x1UKvKOlM/69yhysasW3dA="; }; appimageContents = appimageTools.extractType2 { @@ -18,7 +18,7 @@ in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: with pkgs; [vulkan-headers vulkan-loader]; + extraPkgs = pkgs: [ pkgs.vulkan-headers pkgs.vulkan-loader ]; extraInstallCommands = '' mkdir -p $out/share/{applications,pixmaps} @@ -26,8 +26,6 @@ in cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png - mv $out/bin/${pname}-${version} $out/bin/${pname} - substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' ''; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix index 5e584696d4..402d820843 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vengi-tools"; - version = "0.0.30"; + version = "0.0.31"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${finalAttrs.version}"; - hash = "sha256-Qdjwop92udrPiczMInhvRUMn9uZu6iBMAWzqDWySy94="; + hash = "sha256-0ta7rBWc4qUqsKDU/KSzx2x+fF2GVw77lQvRgt4bkpI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix index 7ff575acab..2c61584dae 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix @@ -3,7 +3,7 @@ , cmake , gettext -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , alsa-lib @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { --replace-fail "addr2line" "${binutils}/bin/addr2line" ''; - nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook3 ]; buildInputs = lib.optionals stdenv.isLinux [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { homepage = "https://xournalpp.github.io/"; changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ andrew-d sikmir ]; + maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; mainProgram = "xournalpp"; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix index 9842aca43d..c4b43c5963 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix @@ -10,7 +10,7 @@ , catch2_3 , spdlog , exiv2 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmake ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix index 4e70c9d37a..7c6029312c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, makeWrapper, unzip, jre, wrapGAppsHook }: +{ lib, stdenv, fetchzip, makeWrapper, unzip, jre, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "yEd"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-u83OmIzq9VygKbfa886mj6BIa/9ET1btry2nR/wxeyI="; }; - nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ]; - # For wrapGAppsHook setup hook + nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook3 ]; + # For wrapGAppsHook3 setup hook buildInputs = [ (jre.gtk3 or null) ]; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/kde/audiotube.nix b/third_party/nixpkgs/pkgs/applications/kde/audiotube.nix index bf1ec30990..c5a5da8550 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/audiotube.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/audiotube.nix @@ -2,7 +2,7 @@ , mkDerivation , extra-cmake-modules -, wrapGAppsHook +, wrapGAppsHook3 , futuresql , gst_all_1 @@ -24,7 +24,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules - wrapGAppsHook + wrapGAppsHook3 python3Packages.wrapPython python3Packages.pybind11 ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/filelight.nix b/third_party/nixpkgs/pkgs/applications/kde/filelight.nix index 017a5eb2f5..4793da1562 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/filelight.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/filelight.nix @@ -20,7 +20,7 @@ mkDerivation { mainProgram = "filelight"; homepage = "https://apps.kde.org/filelight/"; license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ fridh vcunat ]; + maintainers = with lib.maintainers; [ vcunat ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/kde/kasts.nix b/third_party/nixpkgs/pkgs/applications/kde/kasts.nix index e0f00a1db2..65e4d09409 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kasts.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kasts.nix @@ -3,7 +3,7 @@ , cmake , extra-cmake-modules -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , kconfig @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/kde/kcalc.nix b/third_party/nixpkgs/pkgs/applications/kde/kcalc.nix index fdd8bb89f9..b17bda85fb 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kcalc.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kcalc.nix @@ -12,7 +12,6 @@ mkDerivation { description = "Scientific calculator"; mainProgram = "kcalc"; license = with lib.licenses; [ gpl2 ]; - maintainers = [ lib.maintainers.fridh ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix b/third_party/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix index eec6615967..56ccd7f103 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix @@ -77,7 +77,6 @@ mkDerivation { description = "KDE Connect provides several features to integrate your phone and your computer"; homepage = "https://community.kde.org/KDEConnect"; license = with licenses; [ gpl2 ]; - maintainers = with maintainers; [ fridh ]; mainProgram = "kdeconnect-app"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix index 00330b76b3..85ccfb0f74 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix @@ -33,7 +33,7 @@ , rttr , kpurpose , kdeclarative -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -79,7 +79,7 @@ mkDerivation { rttr kpurpose kdeclarative - wrapGAppsHook + wrapGAppsHook3 ]; # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it # doesn't find them. See: diff --git a/third_party/nixpkgs/pkgs/applications/kde/kolourpaint.nix b/third_party/nixpkgs/pkgs/applications/kde/kolourpaint.nix index 4af7cd12b8..0844cbe0a2 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kolourpaint.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kolourpaint.nix @@ -20,7 +20,6 @@ mkDerivation { homepage = "https://apps.kde.org/kolourpaint/"; description = "Paint program"; mainProgram = "kolourpaint"; - maintainers = [ lib.maintainers.fridh ]; license = with lib.licenses; [ gpl2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kwalletmanager.nix b/third_party/nixpkgs/pkgs/applications/kde/kwalletmanager.nix index 63534d584d..64d4d36806 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kwalletmanager.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kwalletmanager.nix @@ -19,7 +19,6 @@ mkDerivation { description = "KDE wallet management tool"; mainProgram = "kwalletmanager5"; license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ fridh ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/kde/partitionmanager/default.nix b/third_party/nixpkgs/pkgs/applications/kde/partitionmanager/default.nix index 90adde782c..f65eb6d02b 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/partitionmanager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/partitionmanager/default.nix @@ -2,7 +2,7 @@ , lib , extra-cmake-modules , kdoctools -, wrapGAppsHook +, wrapGAppsHook3 , kconfig , kcrash , kinit @@ -67,7 +67,7 @@ in mkDerivation { pname = "partitionmanager"; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 ]; propagatedBuildInputs = [ kconfig kcrash kinit kpmcore polkit-qt ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/plasmatube/default.nix b/third_party/nixpkgs/pkgs/applications/kde/plasmatube/default.nix index cc83254cb2..fbb577e6c8 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/plasmatube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/plasmatube/default.nix @@ -1,7 +1,7 @@ { lib , mkDerivation , extra-cmake-modules -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , kcoreaddons , kdeclarative @@ -18,7 +18,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/kde/skanlite.nix b/third_party/nixpkgs/pkgs/applications/kde/skanlite.nix index 2d2ca212d0..0c518cc8ca 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/skanlite.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/skanlite.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, - wrapGAppsHook, + wrapGAppsHook3, extra-cmake-modules, kdoctools, kio, libksane }: @@ -15,6 +15,6 @@ mkDerivation { maintainers = with maintainers; [ polendri ]; }; - nativeBuildInputs = [ wrapGAppsHook extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ wrapGAppsHook3 extra-cmake-modules kdoctools ]; buildInputs = [ kio libksane ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix index f5471e2d10..e628a49b81 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix @@ -5,13 +5,13 @@ , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator , qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire -, wrapGAppsHook +, wrapGAppsHook3 }: mkDerivation { pname = "spectacle"; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor diff --git a/third_party/nixpkgs/pkgs/applications/kde/yakuake.nix b/third_party/nixpkgs/pkgs/applications/kde/yakuake.nix index ce1cf3d161..cf88cd280c 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/yakuake.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/yakuake.nix @@ -29,7 +29,6 @@ mkDerivation { homepage = "https://yakuake.kde.org"; description = "Quad-style terminal emulator for KDE"; mainProgram = "yakuake"; - maintainers = with lib.maintainers; [ fridh ]; license = lib.licenses.gpl2; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index e977dffc44..c151bedd29 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -59,7 +59,7 @@ let homepage = "https://1password.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ timstott savannidgerinel amaxine sebtm ]; + maintainers = with maintainers; [ timstott savannidgerinel sebtm ]; platforms = builtins.attrNames sources.${channel}; mainProgram = "1password"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/linux.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/linux.nix index 140adde918..bfd9df01db 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/linux.nix @@ -5,7 +5,7 @@ , src , meta , makeShellWrapper -, wrapGAppsHook +, wrapGAppsHook3 , alsa-lib , at-spi2-atk , at-spi2-core @@ -49,7 +49,7 @@ let in stdenv.mkDerivation { inherit pname version src meta; - nativeBuildInputs = [ makeShellWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeShellWrapper wrapGAppsHook3 ]; buildInputs = [ glib ]; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index a213c7ef89..71f93ae40e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.27.0"; + version = "2.28.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-yutS8xSTRABt12+mEyU99R4eCHvuAwWdO40SZlUrtdc=" "zip"; - i686-linux = fetch "linux_386" "sha256-juP//g9quhd7GRq5TNm3qAq+rOegGJ9u9F+fmGbfmbw=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-cFQ3lsHBV9fDoNK5ujTummIXA4591meP43KbiyWcbQk=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-fUwiEJxn4JdsViBQU2Odrw+Focp0ngH/RmfmW2Uu0Bo=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-rF0HWKLdLDmT5nXqZyn+nwd3DZxkP76Jm+xofvA1dpU=" "zip"; + i686-linux = fetch "linux_386" "sha256-b9OPsZJTGoAeedj/dv88lkX2Q4p9HG585mWyl7ZfDz4=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-5ZiMQaQLYUR9BZroyG0o+M79cR4GQb6rDyVmIcTZh3o=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-5VmogWqCYMdrg9dyRt4lurPmSRdUUHt4LT3lkOEKdEI=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; @@ -63,6 +63,8 @@ stdenv.mkDerivation { $out/bin/${mainProgram} --version ''; + passthru.updateScript = ./update.sh; + passthru.tests.version = testers.testVersion { package = _1password; }; @@ -71,7 +73,7 @@ stdenv.mkDerivation { description = "1Password command-line tool"; homepage = "https://developer.1password.com/docs/cli/"; downloadPage = "https://app-updates.agilebits.com/product_history/CLI2"; - maintainers = with maintainers; [ joelburget marsam ]; + maintainers = with maintainers; [ joelburget ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; inherit mainProgram platforms; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/update.sh b/third_party/nixpkgs/pkgs/applications/misc/1password/update.sh new file mode 100755 index 0000000000..562c1af31a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nurl xq-xml + +set -eu + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/default.nix" +if [ ! -f "$NIX_DRV" ]; then + echo "ERROR: cannot find default.nix in $ROOT" + exit 1 +fi + +fetch_linux() { + VER="$1" + ARCH="$2" + URL="https://cache.agilebits.com/dist/1P/op2/pkg/v${VER}/op_${ARCH}_v${VER}.zip" + nurl --hash --expr "(import { }).fetchzip { url = \"$URL\"; stripRoot = false; }" +} + +fetch_darwin() { + VER="$1" + URL="https://cache.agilebits.com/dist/1P/op2/pkg/v${VER}/op_apple_universal_v${VER}.pkg" + nurl --hash --expr "(import { }).fetchurl { url = \"$URL\"; }" +} + +replace_sha() { + sed -i "s|\"$1\" \"sha256-.\{44\}\"|\"$1\" \"$2\"|" "$NIX_DRV" +} + +CLI_VERSION="$(curl -Ls https://app-updates.agilebits.com/product_history/CLI2 | xq -q 'h3' | head -n1)" + +CLI_LINUX_AARCH64_SHA256=$(fetch_linux "$CLI_VERSION" "linux_arm64") +CLI_LINUX_I686_SHA256=$(fetch_linux "$CLI_VERSION" "linux_386") +CLI_LINUX_X64_SHA256=$(fetch_linux "$CLI_VERSION" "linux_amd64") +CLI_DARWIN_UNIVERSAL_SHA256=$(fetch_darwin "$CLI_VERSION") + +sed -i "s/version = \".*\"/version = \"$CLI_VERSION\"/" "$NIX_DRV" + +replace_sha "linux_arm64" "$CLI_LINUX_AARCH64_SHA256" +replace_sha "linux_386" "$CLI_LINUX_I686_SHA256" +replace_sha "linux_amd64" "$CLI_LINUX_X64_SHA256" +replace_sha "apple_universal" "$CLI_DARWIN_UNIVERSAL_SHA256" diff --git a/third_party/nixpkgs/pkgs/applications/misc/HentaiAtHome/default.nix b/third_party/nixpkgs/pkgs/applications/misc/HentaiAtHome/default.nix index e34c2434a4..bca7697f75 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/HentaiAtHome/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "HentaiAtHome"; - version = "1.6.2"; + version = "1.6.3"; src = fetchzip { url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}_src.zip"; - hash = "sha256-ioL/GcnbYjt1IETH8521d1TcLGtENdFzceJui1ywXTY="; + hash = "sha512-kBB5mn9MwpkZ0z+Fl5ABs4YWBkXkMRcADYSAPkeifyhbYQQPOnijXKYZCkzE4UB3uQ1j6Kj6WnpO/4jquYEiOQ=="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ablog/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ablog/default.nix index 932db21317..67b21e5199 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ablog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ablog/default.nix @@ -5,12 +5,12 @@ python3.pkgs.buildPythonApplication rec { pname = "ablog"; - version = "0.11.6"; + version = "0.11.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-fV4W4AaiqyruIz3OQ7/lGkMPMKmyiFa+fdU2QeeQCvs="; + hash = "sha256-PpNBfa4g14l8gm9+PxOFc2NDey031D7Ohutx2OGUeak="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix b/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix index 35677f56cc..f98a569fe6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix @@ -22,7 +22,7 @@ , pkg-config , python3 , sqlite -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small GTK application to allow to keep a diary of your life"; mainProgram = "almanah"; - homepage = "https://wiki.gnome.org/Apps/Almanah_Diary"; + homepage = "https://gitlab.gnome.org/GNOME/almanah"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/applications/misc/appeditor/default.nix b/third_party/nixpkgs/pkgs/applications/misc/appeditor/default.nix index 508c59bab7..46adf42093 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/appeditor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/appeditor/default.nix @@ -11,7 +11,7 @@ , glib , gtk3 , libgee -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix b/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix index bb751ae01c..44e1f0992a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix @@ -31,7 +31,7 @@ , enableAMR ? false , amrnb , amrwb -, enableLibpulseaudio ? stdenv.isLinux +, enableLibpulseaudio ? stdenv.isLinux && lib.meta.availableOn stdenv.hostPlatform libpulseaudio , libpulseaudio }: diff --git a/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix deleted file mode 100644 index 95a439b675..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ autoPatchelfHook -, electron -, fetchurl -, lib -, makeWrapper -, squashfsTools -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "authy"; - # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version' - version = "2.4.1"; - rev = "21"; - - src = fetchurl { - url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - hash = "sha256-a5z6Lwdgody88f7has/f2AMg9m9fGWsJSexZM6KUGOY="; - }; - - nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; - - unpackPhase = '' - runHook preUnpack - unsquashfs "$src" - cd squashfs-root - if ! grep -q '${version}' meta/snap.yaml; then - echo "Package version differs from version found in snap metadata:" - grep 'version: ' meta/snap.yaml - echo "While the nix package specifies: ${version}." - echo "You probably chose the wrong revision or forgot to update the nix version." - exit 1 - fi - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/applications $out/share/pixmaps/apps - - # Copy only what is needed - cp -r resources* $out/ - cp -r locales* $out/ - cp meta/gui/authy.desktop $out/share/applications/ - cp meta/gui/icon.png $out/share/pixmaps/authy.png - - # Replace icon name in Desktop file - sed -i 's|''${SNAP}/meta/gui/icon.png|authy|g' "$out/share/applications/authy.desktop" - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/resources/app.asar - ''; - - meta = with lib; { - homepage = "https://www.authy.com"; - description = "Twilio Authy two factor authentication desktop application"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ iammrinal0 ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "authy"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix b/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix index bdd1e6fbb8..c39430091e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -3,7 +3,7 @@ , fetchurl , perlPackages , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , cairo , dblatex , gnumake @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: rec { nativeBuildInputs = [ pkg-config makeWrapper - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/avalonia-ilspy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/avalonia-ilspy/default.nix index 797a8ffe5c..d8ae98e66a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/avalonia-ilspy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/avalonia-ilspy/default.nix @@ -15,7 +15,6 @@ , makeDesktopItem , copyDesktopItems , icoutils -, autoPatchelfHook , bintools , fixDarwinDylibNames , autoSignDarwinBinariesHook @@ -40,8 +39,7 @@ buildDotnetModule rec { nativeBuildInputs = [ copyDesktopItems icoutils - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/avizo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/avizo/default.nix index 59021e92b0..77d942797a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/avizo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/avizo/default.nix @@ -13,7 +13,7 @@ , librsvg , gobject-introspection , gdk-pixbuf -, wrapGAppsHook +, wrapGAppsHook3 , pamixer , brightnessctl }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Vj8OrNlAstl0AXTeVAPdEf5JgnAmJwl9s3Jdc0ZiYQc="; }; - nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook3 ]; buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 librsvg ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/default.nix index 64fa760ef9..388b10f135 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/default.nix @@ -1,49 +1,50 @@ -{ stdenv -, lib -, openexr -, jemalloc -, c-blosc -, binutils -, fetchFromGitHub -, cmake -, pkg-config -, wrapGAppsHook -, boost179 -, cereal -, cgal_5 -, curl -, dbus -, eigen -, expat -, gcc-unwrapped -, glew -, glfw -, glib -, glib-networking -, gmp -, gstreamer -, gst-plugins-base -, gst-plugins-bad -, gst-plugins-good -, gtest -, gtk3 -, hicolor-icon-theme -, ilmbase -, libpng -, mesa -, mpfr -, nlopt -, opencascade-occt -, openvdb -, pcre -, qhull -, systemd -, tbb_2021_11 -, webkitgtk -, wxGTK31 -, xorg -, fetchpatch -, withSystemd ? stdenv.isLinux +{ + stdenv, + lib, + openexr, + jemalloc, + c-blosc, + binutils, + fetchFromGitHub, + cmake, + pkg-config, + wrapGAppsHook3, + boost179, + cereal, + cgal_5, + curl, + dbus, + eigen, + expat, + gcc-unwrapped, + glew, + glfw, + glib, + glib-networking, + gmp, + gstreamer, + gst-plugins-base, + gst-plugins-bad, + gst-plugins-good, + gtest, + gtk3, + hicolor-icon-theme, + ilmbase, + libpng, + mesa, + mpfr, + nlopt, + opencascade-occt, + openvdb, + pcre, + qhull, + systemd, + tbb_2021_11, + webkitgtk, + wxGTK31, + xorg, + fetchpatch, + withSystemd ? stdenv.isLinux, }: let wxGTK31' = wxGTK31.overrideAttrs (old: { @@ -53,7 +54,14 @@ let ]; }); openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { - buildInputs = [ openexr boost179 tbb_2021_11 jemalloc c-blosc ilmbase ]; + buildInputs = [ + openexr + boost179 + tbb_2021_11 + jemalloc + c-blosc + ilmbase + ]; }); in stdenv.mkDerivation rec { @@ -70,7 +78,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -106,9 +114,7 @@ stdenv.mkDerivation rec { webkitgtk wxGTK31' xorg.libX11 - ] ++ lib.optionals withSystemd [ - systemd - ] ++ checkInputs; + ] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs; patches = [ # Fix for webkitgtk linking @@ -169,11 +175,8 @@ stdenv.mkDerivation rec { # needed to prevent collisions between the LICENSE.txt files of # bambu-studio and orca-slicer. postInstall = '' - mkdir -p $out/share/doc - mv $out/LICENSE.txt $out/share/doc/LICENSE.txt - if [ -f $out/README.md ]; then - mv $out/README.md $out/share/doc/README.md - fi + mv $out/LICENSE.txt $out/share/BambuStudio/LICENSE.txt + mv $out/README.md $out/share/BambuStudio/README.md ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/orca-slicer.nix index 5e10050078..af89be6524 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -1,27 +1,41 @@ -{ lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: +{ + lib, + fetchFromGitHub, + bambu-studio, +}: -bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { - version = "2.0.0"; - pname = "orca-slicer"; +bambu-studio.overrideAttrs ( + finalAttrs: previousAttrs: { + version = "2.0.0"; + pname = "orca-slicer"; - # Don't inherit patches from bambu-studio - patches = [ - ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch - ]; + # Don't inherit patches from bambu-studio + patches = [ ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch ]; - src = fetchFromGitHub { - owner = "SoftFever"; - repo = "OrcaSlicer"; - rev = "v${finalAttrs.version}"; - hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; - }; + src = fetchFromGitHub { + owner = "SoftFever"; + repo = "OrcaSlicer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; + }; - meta = with lib; { - description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; - homepage = "https://github.com/SoftFever/OrcaSlicer"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ zhaofengli ovlach pinpox ]; - mainProgram = "orca-slicer"; - platforms = platforms.linux; - }; -}) + # needed to prevent collisions between the LICENSE.txt files of + # bambu-studio and orca-slicer. + postInstall = '' + mv $out/LICENSE.txt $out/share/OrcaSlicer/LICENSE.txt + ''; + + meta = with lib; { + description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; + homepage = "https://github.com/SoftFever/OrcaSlicer"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ + zhaofengli + ovlach + pinpox + ]; + mainProgram = "orca-slicer"; + platforms = platforms.linux; + }; + } +) diff --git a/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix b/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix index d02712848b..ee988b79f8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, - openssl, wrapGAppsHook, + openssl, wrapGAppsHook3, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }, fetchpatch }: @@ -32,7 +32,7 @@ mkDerivation rec { ]; buildInputs = [ curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; - nativeBuildInputs = [ cmake wrapGAppsHook ]; + nativeBuildInputs = [ cmake wrapGAppsHook3 ]; postFixup = '' substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" diff --git a/third_party/nixpkgs/pkgs/applications/misc/bazecor/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bazecor/default.nix index 128c668eb0..ed1900836f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bazecor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bazecor/default.nix @@ -28,17 +28,13 @@ appimageTools.wrapAppImage rec { # taken from # https://github.com/Dygmalab/Bazecor/blob/v1.3.11/src/main/utils/udev.ts#L6 - extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ - p.glib - ]; + extraPkgs = pkgs: [ pkgs.glib ]; # Also expose the udev rules here, so it can be used as: # services.udev.packages = [ pkgs.bazecor ]; # to allow non-root modifications to the keyboards. extraInstallCommands = '' - mv $out/bin/bazecor-* $out/bin/bazecor - install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications substituteInPlace $out/share/applications/Bazecor.desktop \ --replace 'Exec=Bazecor' 'Exec=bazecor' diff --git a/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix index c6e4adf8a5..bb0e777186 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix @@ -3,7 +3,7 @@ , fetchurl , gettext , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtk3 , libnotify @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/darwin.patch b/third_party/nixpkgs/pkgs/applications/misc/blender/darwin.patch index c86aa24446..192516758c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/darwin.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/darwin.patch @@ -1,27 +1,25 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1894,7 +1894,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO) - ADD_CHECK_CXX_COMPILER_FLAG(CXX_PREFIX_MAP_FLAGS CXX_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar) +--- a/CMakeLists.txt 2024-03-01 08:08:05 ++++ b/CMakeLists.txt 2024-04-24 15:45:30 +@@ -2134,7 +2134,7 @@ + ) if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP) if(APPLE) - if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0) + if(FALSE) # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag) # with Xcode-11 (the Clang of which doesn't support the flag). - message(WARNING -diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake ---- a/build_files/cmake/platform/platform_apple.cmake -+++ b/build_files/cmake/platform/platform_apple.cmake -@@ -60,7 +60,6 @@ else() - message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") + message( +--- a/build_files/cmake/platform/platform_apple.cmake 2024-02-22 15:31:36 ++++ b/build_files/cmake/platform/platform_apple.cmake 2024-04-24 16:06:13 +@@ -55,7 +55,6 @@ + endif() endif() - if(NOT EXISTS "${LIBDIR}/") + if(NOT EXISTS "${LIBDIR}/.git") - message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'") endif() - - # Prefer lib directory paths -@@ -98,10 +97,6 @@ if(WITH_CODEC_SNDFILE) + if(FIRST_RUN) + message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") +@@ -115,10 +114,6 @@ find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib) find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib) list(APPEND LIBSNDFILE_LIBRARIES @@ -32,44 +30,26 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake ) print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}") -@@ -118,7 +113,7 @@ if(WITH_PYTHON) - # Normally cached but not since we include them with blender. - set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") - set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}") -- set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.a) -+ set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.dylib) - set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}") - else() - # Module must be compiled against Python framework. -@@ -147,7 +142,7 @@ endif() - - # FreeType compiled with Brotli compression for woff2. - find_package(Freetype REQUIRED) --list(APPEND FREETYPE_LIBRARIES -+message(TRACE APPEND FREETYPE_LIBRARIES - ${LIBDIR}/brotli/lib/libbrotlicommon-static.a - ${LIBDIR}/brotli/lib/libbrotlidec-static.a) - -@@ -159,9 +154,7 @@ if(WITH_CODEC_FFMPEG) +@@ -162,9 +157,7 @@ set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg) set(FFMPEG_FIND_COMPONENTS avcodec avdevice avformat avutil - mp3lame ogg opus swresample swscale - theora theoradec theoraenc vorbis vorbisenc -- vorbisfile vpx x264 xvidcore) -+ swresample swscale) +- vorbisfile vpx x264) ++ swresample swscale) if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a) list(APPEND FFMPEG_FIND_COMPONENTS aom) endif() -@@ -273,7 +266,6 @@ if(WITH_BOOST) - endif() +@@ -275,7 +268,6 @@ + add_bundled_libraries(boost/lib) if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) - string(APPEND PLATFORM_LINKFLAGS " -liconv") # boost_locale and ffmpeg needs it ! endif() if(WITH_PUGIXML) -@@ -402,7 +394,7 @@ endif() +@@ -350,7 +342,7 @@ # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags. if(WITH_OPENMP) @@ -78,3 +58,12 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake # Use OpenMP from our precompiled libraries. message(STATUS "Using ${LIBDIR}/openmp for OpenMP") set(OPENMP_CUSTOM ON) +@@ -427,7 +419,7 @@ + " -Wl,-unexported_symbols_list,'${PLATFORM_SYMBOLS_MAP}'" + ) + +-if(${XCODE_VERSION} VERSION_GREATER_EQUAL 15.0) ++if(FALSE) + if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64") + # Silence "no platform load command found in , assuming: macOS". + string(APPEND PLATFORM_LINKFLAGS " -Wl,-ld_classic") diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 8cc7d4dd01..e54cae9e56 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -8,12 +8,14 @@ addOpenGLRunpath, alembic, boost, + brotli, callPackage, cmake, colladaSupport ? true, config, cudaPackages, cudaSupport ? config.cudaSupport, + darwin, dbus, embree, fetchurl, @@ -51,6 +53,7 @@ libxkbcommon, llvmPackages, makeWrapper, + materialx, mesa, ocl-icd, openal, @@ -71,6 +74,7 @@ rocmPackages, # comes with a significantly larger closure size runCommand, spaceNavSupport ? stdenv.isLinux, + sse2neon, stdenv, tbb, wayland, @@ -114,15 +118,14 @@ stdenv.mkDerivation (finalAttrs: { '' : > build_files/cmake/platform/platform_apple_xcode.cmake substituteInPlace source/creator/CMakeLists.txt \ - --replace '${"$"}{LIBDIR}/python' \ - '${python3}' - substituteInPlace build_files/cmake/platform/platform_apple.cmake \ - --replace '${"$"}{LIBDIR}/python' \ + --replace-fail '${"$"}{LIBDIR}/python' \ '${python3}' \ - --replace '${"$"}{LIBDIR}/opencollada' \ - '${opencollada}' \ - --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ - '${python3Packages.numpy}/${python3.sitePackages}/numpy' + --replace-fail '${"$"}{LIBDIR}/materialx/' '${materialx}/' + substituteInPlace build_files/cmake/platform/platform_apple.cmake \ + --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \ + '${lib.getLib brotli}/lib/libbrotlicommon.dylib' \ + --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \ + '${lib.getLib brotli}/lib/libbrotlidec.dylib' '' else '' @@ -150,6 +153,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_FFTW3=ON" "-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_INSTALL_PORTABLE=OFF" + "-DMaterialX_DIR=${materialx}/lib/cmake/MaterialX" "-DWITH_MOD_OCEANSIM=ON" "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" "-DWITH_OPENCOLORIO=ON" @@ -164,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: { # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include" - "-DALEMBIC_LIBRARY=${lib.getLib alembic}/lib/libAlembic.so" + "-DALEMBIC_LIBRARY=${lib.getLib alembic}/lib/libAlembic${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ lib.optionals waylandSupport [ "-DWITH_GHOST_WAYLAND=ON" @@ -172,11 +176,12 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF" "-DWITH_GHOST_WAYLAND_LIBDECOR=ON" ] - ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-DWITH_CYCLES_EMBREE=OFF" ] + ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ "-DWITH_CYCLES_EMBREE=OFF" ] ++ lib.optionals stdenv.isDarwin [ "-DLIBDIR=/does-not-exist" - "-DWITH_CYCLES_OSL=OFF" # requires LLVM - "-DWITH_OPENVDB=OFF" # OpenVDB currently doesn't build on darwin + "-DWITH_CYCLES_OSL=OFF" # causes segfault on aarch64-darwin + "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib" + "-DWITH_USD=OFF" # currently fails on darwin ] ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic" ++ lib.optional jackaudioSupport "-DWITH_JACK=ON" @@ -219,21 +224,22 @@ stdenv.mkDerivation (finalAttrs: { libsndfile libtiff libwebp + materialx opencolorio openexr openimageio openjpeg openpgl (opensubdiv.override { inherit cudaSupport; }) + openvdb potrace pugixml - pyPkgsOpenusd python3 tbb zlib zstd ] - ++ lib.optionals (!stdenv.isAarch64) [ + ++ lib.optionals (!stdenv.isAarch64 && stdenv.isLinux) [ embree (openimagedenoise.override { inherit cudaSupport; }) ] @@ -248,8 +254,8 @@ stdenv.mkDerivation (finalAttrs: { libXrender libXxf86vm openal - openvdb # OpenVDB currently doesn't build on darwin openxr-loader + pyPkgsOpenusd ] else [ @@ -259,7 +265,11 @@ stdenv.mkDerivation (finalAttrs: { OpenAL OpenGL SDL + brotli + embree llvmPackages.openmp + (openimagedenoise.override { inherit cudaSupport; }) + sse2neon ] ) ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] @@ -280,11 +290,12 @@ stdenv.mkDerivation (finalAttrs: { ps = python3Packages; in [ + materialx ps.numpy ps.requests ps.zstandard - pyPkgsOpenusd - ]; + ] + ++ lib.optionals (!stdenv.isDarwin) [ pyPkgsOpenusd ]; blenderExecutable = placeholder "out" @@ -295,8 +306,10 @@ stdenv.mkDerivation (finalAttrs: { mkdir $out/Applications mv $out/Blender.app $out/Applications '' - + '' + + lib.optionalString stdenv.isLinux '' mv $out/share/blender/${lib.versions.majorMinor finalAttrs.version}/python{,-ext} + '' + + '' buildPythonPath "$pythonPath" wrapProgram $blenderExecutable \ --prefix PATH : $program_PATH \ @@ -311,6 +324,9 @@ stdenv.mkDerivation (finalAttrs: { isELF "$program" || continue addOpenGLRunpath "$program" done + '' + + lib.optionalString stdenv.isDarwin '' + makeWrapper $out/Applications/Blender.app/Contents/MacOS/Blender $out/bin/blender ''; passthru = { @@ -327,15 +343,13 @@ stdenv.mkDerivation (finalAttrs: { tests = { render = runCommand "${finalAttrs.pname}-test" { } '' set -euo pipefail - export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib/dri export __EGL_VENDOR_LIBRARY_FILENAMES=${mesa.drivers}/share/glvnd/egl_vendor.d/50_mesa.json - cat <<'PYTHON' > scene-config.py import bpy bpy.context.scene.eevee.taa_render_samples = 32 bpy.context.scene.cycles.samples = 32 - if ${if stdenv.isAarch64 then "True" else "False"}: + if ${if (stdenv.isAarch64 && stdenv.isLinux) then "True" else "False"}: bpy.context.scene.cycles.use_denoising = False bpy.context.scene.render.resolution_x = 100 bpy.context.scene.render.resolution_y = 100 @@ -347,7 +361,7 @@ stdenv.mkDerivation (finalAttrs: { for engine in BLENDER_EEVEE CYCLES; do echo "Rendering with $engine..." # Beware that argument order matters - ${finalAttrs.finalPackage}/bin/blender \ + ${lib.getExe finalAttrs.finalPackage} \ --background \ -noaudio \ --factory-startup \ @@ -372,8 +386,10 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" "x86_64-darwin" "x86_64-linux" + "aarch64-darwin" ]; - broken = stdenv.isDarwin; + # the current apple sdk is too old (currently 11_0) and fails to build "metal" on x86_64-darwin + broken = stdenv.hostPlatform.system == "x86_64-darwin"; maintainers = with lib.maintainers; [ goibhniu veprbl diff --git a/third_party/nixpkgs/pkgs/applications/misc/break-time/default.nix b/third_party/nixpkgs/pkgs/applications/misc/break-time/default.nix index a4bbf4d4c1..2b6263e322 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/break-time/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/break-time/default.nix @@ -6,7 +6,7 @@ , python3 , rustPlatform , lib -, wrapGAppsHook +, wrapGAppsHook3 }: rustPlatform.buildRustPackage rec { @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config python3 # needed for Rust xcb package - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/caerbannog/default.nix b/third_party/nixpkgs/pkgs/applications/misc/caerbannog/default.nix index 0d21c7e165..0ca33877d1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/caerbannog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/caerbannog/default.nix @@ -6,7 +6,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , atk , libhandy @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix index 3f57531e09..013f41d352 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -26,17 +26,17 @@ , sqlite , wrapQtAppsHook , xdg-utils -, wrapGAppsHook +, wrapGAppsHook3 , unrarSupport ? false }: stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.8.0"; + version = "7.10.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-FxYuQzzuaWZihSsmeJc6ssG3VBr2YNEi3TkXyyymLUQ="; + hash = "sha256-GvvvoqLBzapveKFSqlED471pUyRjLoYqU5YjN/L/nEs="; }; patches = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "0001-only-plugin-update.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/0001-only-plugin-update.patch"; - hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ="; + hash = "sha256-mHZkUoVcoVi9XBOSvM5jyvpOTCcM91g9+Pa/lY6L5p8="; }) (fetchpatch { name = "0007-Hardening-Qt-code.patch"; @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config qmake removeReferencesTo - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix index 008004aa3c..6481805cc9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cartridges"; - version = "2.7.4"; + version = "2.8.4"; src = fetchFromGitHub { owner = "kra-mo"; repo = "cartridges"; rev = "v${finalAttrs.version}"; - hash = "sha256-AfO+vLJSWdaMqqbzRZWrY94nu/9BM7mqdad9rkiq1pg="; + hash = "sha256-x6utIvU4LxM/CJogy5JrFrDTLFmXbgItgqtT+lM7FGA="; }; pythonPath = with python3Packages; [ @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { and more with no login necessary. You can sort and hide games or download cover art from SteamGridDB. ''; - homepage = "https://apps.gnome.org/app/hu.kramo.Cartridges/"; + homepage = "https://apps.gnome.org/Cartridges/"; license = licenses.gpl3Plus; maintainers = [ maintainers.getchoo ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cbatticon/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cbatticon/default.nix index 665957ca0e..1221703006 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cbatticon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cbatticon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, glib, gtk3, libnotify, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, glib, gtk3, libnotify, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "cbatticon"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-VQjJujF9lnVvQxV+0YqodLgnI9F90JKDAGBu5nM/Q/c="; }; - nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; buildInputs = [ glib gtk3 libnotify ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix index ffa44c63f9..48d382e284 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix @@ -4,7 +4,7 @@ , cmake , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gtkmm3 , gtksourceview , gtksourceviewmm @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cmake pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cipher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cipher/default.nix index 8486db6f7f..a51279c73a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cipher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cipher/default.nix @@ -11,7 +11,7 @@ , glib , gtk3 , libgee -, wrapGAppsHook }: +, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "cipher"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/clight/clight-gui.nix b/third_party/nixpkgs/pkgs/applications/misc/clight/clight-gui.nix new file mode 100644 index 0000000000..da7dd77dee --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/clight/clight-gui.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtbase +, qtcharts +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "clight-gui"; + version = "unstable-2023-02-21"; + + src = fetchFromGitHub { + owner = "nullobsi"; + repo = "clight-gui"; + rev = "29e7216bfcc68135350a695ce446134bcb0463a6"; + hash = "sha256-U4vaMwnVDZnYLc+K3/yD81Q1vyBL8uSrrhOHbjbox5U="; + }; + + buildInputs = [ qtbase qtcharts ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + sourceRoot = "${src.name}/src"; + + meta = with lib; { + description = "Qt GUI for clight"; + homepage = "https://github.com/nullobsi/clight-gui"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nickhu ]; + mainProgram = "clight-gui"; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix b/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix index b40bc4fec9..0bd48d2adf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, stdenv , autoreconfHook, intltool, pkg-config -, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }: +, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "clipit"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { intltoolize --copy --force --automake ''; - nativeBuildInputs = [ pkg-config wrapGAppsHook autoreconfHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 autoreconfHook intltool ]; configureFlags = [ "--with-gtk3" "--enable-appindicator=yes" ]; buildInputs = [ gtk3 libayatana-appindicator ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cobalt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cobalt/default.nix index e35939536a..1fda517675 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cobalt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cobalt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cobalt"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; rev = "v${version}"; - sha256 = "sha256-W0XbNZDSeSK6oxOD1JeLNF+c6/6cy/WQrrmQbSKeqk4="; + sha256 = "sha256-aAhceExz5SENL+FhPHyx8HmaNOWjNsynv81Rj2cS5M8="; }; - cargoHash = "sha256-IM2SKovb8FYwA/c4R3N7M+oVuGfuc5sK+r6FP9YMk+I="; + cargoHash = "sha256-vw7fGsTSEVO8s1LzilKJN5lGzOfQcms1h7rnTOyE4Kw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix index e36ece60d7..999bc4e0cc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix @@ -19,19 +19,19 @@ , setuptools , python , pytestCheckHook -, wrapGAppsHook +, wrapGAppsHook3 }: buildPythonApplication rec { pname = "cobang"; - version = "0.10.5"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; rev = "refs/tags/v${version}"; - hash = "sha256-CfT/farNOJiWIioFBPx2q7bAFAE4khcojdZ7AsYaU6o="; + hash = "sha256-4INScFnYSwVnGjaohgDL3Sv/NeIwiiyLux8c9/Y/Wq4="; }; postPatch = '' @@ -43,7 +43,7 @@ buildPythonApplication rec { nativeBuildInputs = [ # Needed to recognize gobject namespaces gobject-introspection - wrapGAppsHook + wrapGAppsHook3 setuptools ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix index 16a59b2fdb..ca96bd3d2e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { The interface is inspired by htop and shortcut keys are inspired by vim. ''; homepage = "https://cointop.sh"; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ sarcasticadmin ]; license = licenses.asl20; mainProgram = "cointop"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/confclerk/default.nix b/third_party/nixpkgs/pkgs/applications/misc/confclerk/default.nix index 7646cb9ae8..0ace0e1e49 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/confclerk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/confclerk/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "confclerk"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; - sha256 = "0l5i4d6lymh0k6gzihs41x4i8v1dz0mrwpga096af0vchpvlcarg"; + sha256 = "sha256-GgWvPHcQnQrK9SOC8U9F2P8kuPCn8I2EhoWEEMtKBww="; }; buildInputs = [ qtbase ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix index 10ec807247..9466d28dce 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-Zs/RUpyu8GG4koprC+8aSzpPUSLc19p/XinY5fR5Z4A="; + hash = "sha256-QWx42uSjN6Dev5JTa8vPTXOxr8qw5kerLepTWhJTb1I="; }; - cargoHash = "sha256-jYKu1sAzPUfv8gQj3V4zxarRj3XUhyD/5n1WqMuLF/g="; + cargoHash = "sha256-5PUVg08D8cZdUIt1A9wjpi9bc/XsB9P7S6L8M054MCg="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix index 55fe2b9e2c..c6307cb3fa 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/devdocs-desktop/default.nix @@ -3,7 +3,6 @@ let version = "0.7.2"; pname = "devdocs-desktop"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/egoist/devdocs-desktop/releases/download/v${version}/DevDocs-${version}.AppImage"; @@ -11,14 +10,13 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/devdocs.desktop $out/share/applications/devdocs.desktop install -m 444 -D ${appimageContents}/devdocs.png $out/share/icons/hicolor/0x0/apps/devdocs.png substituteInPlace $out/share/applications/devdocs.desktop \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix index 61414a9b30..9eb7db6212 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { pname = "dialect"; - version = "2.2.0"; + version = "2.3.0"; format = "other"; @@ -29,19 +29,10 @@ python3.pkgs.buildPythonApplication rec { repo = "dialect"; rev = version; fetchSubmodules = true; - hash = "sha256-+0qA+jFYrK3K3mJNvxTvnT/3q4c51H0KgEMjzvV34Zs="; + hash = "sha256-A6jZHcSzHSmHLvyegyzxjQ6+jL6rLb7oefhryXoSrH4="; }; - # FIXME: remove in next release - postPatch = '' - substituteInPlace dialect/providers/lingva.py \ - --replace-fail 'lingva.ml' 'lingva.dialectapp.org' - substituteInPlace dialect/providers/libretrans.py \ - --replace-fail 'libretranslate.de' 'lt.dialectapp.org' - ''; - nativeBuildInputs = [ - appstream-glib blueprint-compiler desktop-file-utils gobject-introspection diff --git a/third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix index 52a004a830..eb45e2c4eb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { pname = "diebahn"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "railway"; rev = version; - hash = "sha256-2iLxErEP0OG+BcG7fvJBzNjh95EkNoC3NC7rKxPLhYk="; + hash = "sha256-Oj+y3BFAVzWUt+S0iOtKzFBiJGOGHuTj41FHHuOrWh8="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${src}"; inherit src; - hash = "sha256-TyafdFWCaZgLEW2yVfm9+9kXRKoiyCAbRndcb7XCVdI="; + hash = "sha256-//tr1CLn5Qoc+XMFzwNIvmsQD4SrjNRTX3hUPqlhwNs="; }; nativeBuildInputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = { changelog = "https://gitlab.com/schmiddi-on-mobile/railway/-/blob/${src.rev}/CHANGELOG.md"; - description = "Travel with all your train information in one place"; + description = "Travel with all your train information in one place. Also known as Railway."; homepage = "https://gitlab.com/schmiddi-on-mobile/railway"; license = lib.licenses.gpl3Plus; mainProgram = "diebahn"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix b/third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix index 0f5cf3c0ad..a4a9e73db8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix @@ -3,7 +3,7 @@ , meson , ninja , gettext -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , pango , gdk-pixbuf @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 meson ninja gettext diff --git a/third_party/nixpkgs/pkgs/applications/misc/dockbarx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dockbarx/default.nix index 3b147bdcc3..815a482a21 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dockbarx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dockbarx/default.nix @@ -6,7 +6,7 @@ , keybinder3 , libwnck , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { glib.dev gobject-introspection python3Packages.polib - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index eb24885ca1..8250ebfe28 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchFromGitHub +, fetchpatch , wrapQtAppsHook , python3 , zbar @@ -109,7 +110,30 @@ python.pkgs.buildPythonApplication { pyqt6 ]; + patches = [ + # aiorpcx 0.23.1 compatibility + # Note: this patches `/run_electrum`. + # In the source repo, `/electrum/electrum` + # is a symlink to `../run_electrum`, + # so that path would also be affected by the patch. + # However, in the distribution tarball used here, + # `/electrum/electrum` is simply an exact copy of + # `/run_electrum` and is thereby *not* affected. + # So we have to manually copy the patched `/run_electrum` + # over `/electrum/electrum` after the patching (see below). + # XXX remove the copy command in `postPatch` + # as soon as the patch itself is removed! + (fetchpatch { + url = "https://github.com/spesmilo/electrum/commit/5f95d919dfa9868eaf82889903b94faa8c6443e0.patch"; + hash = "sha256-cEkduLsL6A8qPhXS2KPQWzVtkQPYQhHSbuwQ2SnanHw="; + }) + ]; + postPatch = '' + # copy the patched `/run_electrum` over `/electrum/electrum` + # so the aiorpcx compatibility patch is used + cp run_electrum electrum/electrum + # make compatible with protobuf4 by easing dependencies ... substituteInPlace ./contrib/requirements/requirements.txt \ --replace "protobuf>=3.20,<4" "protobuf>=3.20" diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc-aiorpcX-version-bump.patch b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc-aiorpcX-version-bump.patch new file mode 100644 index 0000000000..8c7af75a54 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc-aiorpcX-version-bump.patch @@ -0,0 +1,44 @@ +diff --git a/contrib/deterministic-build/requirements.txt b/contrib/deterministic-build/requirements.txt +index 7441e3389..2a4718f96 100644 +--- a/contrib/deterministic-build/requirements.txt ++++ b/contrib/deterministic-build/requirements.txt +@@ -74,9 +74,8 @@ aiohttp==3.8.1 \ + aiohttp-socks==0.7.1 \ + --hash=sha256:2215cac4891ef3fa14b7d600ed343ed0f0a670c23b10e4142aa862b3db20341a \ + --hash=sha256:94bcff5ef73611c6c6231c2ffc1be4af1599abec90dbd2fdbbd63233ec2fb0ff +-aiorpcX==0.22.1 \ +- --hash=sha256:6026f7bed3432e206589c94dcf599be8cd85b5736b118c7275845c1bd922a553 \ +- --hash=sha256:e74f9fbed3fd21598e71fe05066618fc2c06feec504fe29490ddda05fdbdde62 ++aiorpcX==0.23.1 \ ++ --hash=sha256:5b23002f1a4d5d3085e31555a07519c5ef8d4c40071eb499556ffda8114860a2 + aiosignal==1.2.0 \ + --hash=sha256:26e62109036cd181df6e6ad646f91f0dcfd05fe16d0cb924138ff2ab75d64e3a \ + --hash=sha256:78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2 +diff --git a/contrib/requirements/requirements.txt b/contrib/requirements/requirements.txt +index 04b0a77f3..2330ea921 100644 +--- a/contrib/requirements/requirements.txt ++++ b/contrib/requirements/requirements.txt +@@ -1,7 +1,7 @@ + qrcode + protobuf>=3.12 + qdarkstyle>=2.7 +-aiorpcx>=0.22.0,<0.23 ++aiorpcx>=0.22.0,<0.24 + aiohttp>=3.3.0,<4.0.0 + aiohttp_socks>=0.3 + certifi +diff --git a/run_electrum b/run_electrum +index a1b30f29e..cb22f8724 100755 +--- a/run_electrum ++++ b/run_electrum +@@ -67,8 +67,8 @@ def check_imports(): + import aiorpcx + except ImportError as e: + sys.exit(f"Error: {str(e)}. Try 'sudo python3 -m pip install '") +- if not ((0, 22, 0) <= aiorpcx._version < (0, 23)): +- raise RuntimeError(f'aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.23') ++ if not ((0, 22, 0) <= aiorpcx._version < (0, 24)): ++ raise RuntimeError(f'aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.24') + # the following imports are for pyinstaller + from google.protobuf import descriptor + from google.protobuf import message diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix index a85252027e..ef52f6211f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix @@ -82,6 +82,26 @@ python3.pkgs.buildPythonApplication { qdarkstyle ]; + patches = [ + # electrum-ltc attempts to pin to aiorpcX < 0.23, but nixpkgs + # has moved to newer versions. + # + # electrum-ltc hasn't been updated in some time, so we replicate + # the patch from electrum (BTC) and alter it to be usable with + # electrum-ltc. + # + # Similar to the BTC patch, we need to overwrite the symlink + # at electrum_ltc/electrum-ltc with the patched run_electrum + # in postPatch. + ./ltc-aiorpcX-version-bump.patch + ]; + + postPatch = '' + # copy the patched `/run_electrum` over `/electrum/electrum` + # so the aiorpcx compatibility patch is used + cp run_electrum electrum_ltc/electrum-ltc + ''; + preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py substituteInPlace ./electrum_ltc/ecc_fast.py \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix index 56f8be698f..a8b71f34ed 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix @@ -12,7 +12,7 @@ , udev , eudev , libxslt -, python3 +, python3Packages , docbook5 , docbook_xsl , docbook_xsl_ns @@ -47,11 +47,13 @@ stdenv.mkDerivation rec { gettext libxslt.bin # xsltproc docbook5 docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 docbook_xml_dtd_45 # needed for docbook without Internet - (python3.withPackages (p: with p; [ lxml ])) # fixes: man/meson.build:111:0: ERROR: Could not execute command "/build/source/tools/xml_helper.py". + + # fixes: man/meson.build:111:0: ERROR: Could not execute command "/build/source/tools/xml_helper.py". + python3Packages.python + python3Packages.lxml ]; - buildInputs = - if enableSystemd then [ udev ] else [ eudev ]; + buildInputs = [ libcap ] ++ (if enableSystemd then [ udev ] else [ eudev ]); # Inspired by the systemd `preConfigure`. # Conceptually we should patch all files required during the build, but not scripts diff --git a/third_party/nixpkgs/pkgs/applications/misc/exercism/default.nix b/third_party/nixpkgs/pkgs/applications/misc/exercism/default.nix index d91f359804..b3ea4b96b9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/exercism/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/exercism/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "exercism"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "exercism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Mtb5c1/k8kp7bETOSE0X969BV176jpoprr1/mQ3E4Vg="; + hash = "sha256-+Tg9b7JZtriF5b+mnLgOeTTLiswH/dSGg3Mj1TBt4Wk="; }; - vendorHash = "sha256-fnsSvbuVGRAndU88su2Ck7mV8QBDhxozdmwI3XGtxcA="; + vendorHash = "sha256-xY3C3emqtPIKyxIN9aEkrLXhTxWNmo0EJXNZVtbtIvs="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix index 90d3f3b014..56a3ce5f28 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix @@ -6,7 +6,7 @@ , perlPackages , substituteAll , xorg -, wrapGAppsHook +, wrapGAppsHook3 , gitUpdater }: @@ -33,7 +33,7 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/fead/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fead/default.nix index 73907a1758..d18ff21801 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fead/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fead/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchFromSourcehut, python3, help2man }: +{ lib, stdenv, fetchzip, python3, help2man }: stdenv.mkDerivation rec { pname = "fead"; - version = "0.1.3"; + version = "1.0.0"; - src = fetchFromSourcehut { - owner = "~cnx"; - repo = pname; - rev = version; - sha256 = "sha256-cW0GxyvC9url2QAAWD0M2pR4gBiPA3eeAaw77TwMV/0="; + src = fetchzip { + url = "https://trong.loang.net/~cnx/fead/snapshot/fead-${version}.tar.gz"; + hash = "sha256-cbU379Zz+mwRqEHiDUlGvWheLkkr0YidHeVs/1Leg38="; }; nativeBuildInputs = [ help2man ]; @@ -29,9 +27,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Advert generator from web feeds"; - homepage = "https://git.sr.ht/~cnx/fead"; + homepage = "https://trong.loang.net/~cnx/fead"; license = licenses.agpl3Plus; - changelog = "https://git.sr.ht/~cnx/fead/refs/${version}"; + changelog = "https://trong.loang.net/~cnx/fead/tag?h=${version}"; maintainers = with maintainers; [ McSinyx ]; mainProgram = "fead"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix index 45da9c1afa..f0d90a495c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix @@ -12,7 +12,7 @@ , ninja , pkg-config , vala -, wrapGAppsHook +, wrapGAppsHook3 , glib , gsound , json-glib @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/findex/default.nix b/third_party/nixpkgs/pkgs/applications/misc/findex/default.nix index 29ddc3d461..8af4fc35d7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/findex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/findex/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , keybinder3 }: @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { --replace-fail '/opt/findex/style.css' "$out/share/findex/style.css" ''; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ keybinder3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix index 9df2118b02..0db1a801c5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix @@ -12,11 +12,10 @@ let in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' mkdir -p $out/share/applications $out/share/pixmaps - mv $out/bin/${pname}-${version} $out/bin/firefly-desktop cp ${appimageContents}/desktop.desktop $out/share/applications/firefly-desktop.desktop substituteInPlace $out/share/applications/firefly-desktop.desktop \ --replace 'Exec=AppRun' 'Exec=firefly-desktop' \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix index 150bbd5700..3694f8e232 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.29.1"; + version = "1.30.0"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-Zh/H1XAUcFl20yPLt9uIqBLDvUH8ATL9g6oFwvyhkzw="; + sha256 = "sha256-+nPVnKuZtYGFtqC48XNISSjay3lDAYR3l50kq026H3Q="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluxboxlauncher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fluxboxlauncher/default.nix index 19e70ad7c5..7172ce5350 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fluxboxlauncher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fluxboxlauncher/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , python3 , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , glibcLocales , gobject-introspection , gettext @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection pango gdk-pixbuf diff --git a/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix index 309d8fa2fa..95594cb030 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -16,7 +16,8 @@ , gtk3 , gnome , desktop-file-utils -, wrapGAppsHook +, fetchpatch2 +, wrapGAppsHook3 , gobject-introspection # withWebkit enables the "webkit" feature, also known as Google Fonts , withWebkit ? true, glib-networking, libsoup, webkitgtk @@ -33,6 +34,16 @@ stdenv.mkDerivation rec { hash = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo="; }; + patches = [ + # see https://github.com/FontManager/font-manager/issues/355 + # should be removed on next release + (fetchpatch2 { + name = "fix-build-with-newer-vala.patch"; + url = "https://github.com/FontManager/font-manager/commit/600f498946c3904064b4e4fdf96e5841f6a827e4.patch"; + hash = "sha256-DC9+pvG88t+PPdGQ2oemeEYK9PaD0C2yWBYYCh4Wn9g="; + }) + ]; + nativeBuildInputs = [ pkg-config meson @@ -43,7 +54,7 @@ stdenv.mkDerivation rec { desktop-file-utils vala yelp-tools - wrapGAppsHook + wrapGAppsHook3 # For https://github.com/FontManager/master/blob/master/lib/unicode/meson.build gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fontfinder/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fontfinder/default.nix index f0fc3dfd3a..db55b02065 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fontfinder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fontfinder/default.nix @@ -5,7 +5,7 @@ , pkg-config , rustPlatform , rustc -, wrapGAppsHook +, wrapGAppsHook3 , gdk-pixbuf , gtk3 , libsoup_3 @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { pkg-config rustPlatform.cargoSetupHook rustc - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/formatter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/formatter/default.nix index f53ea0f030..8f5c4c9c6b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/formatter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/formatter/default.nix @@ -16,7 +16,7 @@ , hfsprogs , ntfs3g , libgee -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix index 745a2357e2..bb9049dde7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchbzr, autoreconfHook, texinfo, help2man, imagemagick, pkg-config -, curl, gnome2, gpsd, gtk2, wrapGAppsHook +, curl, gnome2, gpsd, gtk2, wrapGAppsHook3 , intltool, libexif, python3Packages, sqlite }: let @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook texinfo help2man - imagemagick wrapGAppsHook intltool + imagemagick wrapGAppsHook3 intltool ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/freemind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/freemind/default.nix index 0bdf8df306..5e5d205c8a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/freemind/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/freemind/default.nix @@ -1,43 +1,76 @@ -{ lib, stdenv, fetchurl, jdk, jre, ant }: +{ + lib, + stdenv, + fetchurl, + ant, + jdk, + jre, + makeWrapper, + stripJavaArchivesHook, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freemind"; version = "1.0.1"; src = fetchurl { - url = "mirror://sourceforge/freemind/freemind-src-${version}.tar.gz"; - sha256 = "06c6pm7hpwh9hbmyah3lj2wp1g957x8znfwc5cwygsi7dc98b0h1"; + url = "mirror://sourceforge/freemind/freemind-src-${finalAttrs.version}.tar.gz"; + hash = "sha256-AYKFEmsn6uc5K4w7+1E/Jb1wuZB0QOXrggnyC0+9hhk="; }; - buildInputs = [ jdk ant ]; + nativeBuildInputs = [ + ant + jdk + makeWrapper + stripJavaArchivesHook + ]; + + postPatch = '' + # disable the task because it would edit version.properties + # and add a "last edited" header to it, which is non-deterministic + sed -i '/$out/bin/freemind < 4.1) gollum-lib (>= 5.2.3, < 6.0) i18n (~> 1.8) @@ -48,7 +48,7 @@ GEM htmlentities (4.3.4) i18n (1.14.4) concurrent-ruby (~> 1.0) - json (2.7.1) + json (2.7.2) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -59,14 +59,14 @@ GEM mime-types (3.5.2) mime-types-data (~> 3.2015) mime-types-data (3.2024.0305) - mini_portile2 (2.8.5) + mini_portile2 (2.8.6) multi_json (1.15.0) mustache (1.1.1) mustache-sinatra (2.0.0) mustache (~> 1.0) mustermann (2.0.2) ruby2_keywords (~> 0.0.1) - nokogiri (1.16.3) + nokogiri (1.16.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) octicons (12.1.0) @@ -146,4 +146,4 @@ DEPENDENCIES wikicloth BUNDLED WITH - 2.5.6 + 2.5.7 diff --git a/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix index 95533bffd1..9a613ab689 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix @@ -116,10 +116,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07lv4idxxghmq18k2r42l7kxz204l2fgri5xjapl79yy9dk53s5x"; + sha256 = "0k94yba33ccvx3h7vl3d4jkx8j8y45a7qy3angf8094b0hy2p1fi"; type = "gem"; }; - version = "5.3.2"; + version = "5.3.3"; }; gollum-lib = { dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"]; @@ -169,10 +169,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; + sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.2"; }; kramdown = { dependencies = ["rexml"]; @@ -233,10 +233,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; + sha256 = "149r94xi6b3jbp6bv72f8383b95ndn0p5sxnq11gs1j9jadv0ajf"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.6"; }; multi_json = { groups = ["default"]; @@ -286,10 +286,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j72sg8n8834vbw2x8glcp46y5r2dls2pj64ll7rmf6mri9s52j9"; + sha256 = "0i8g0i370jhn2sclml0bg9qlrgf4csi6sy7czbhx8kjbl71idhb2"; type = "gem"; }; - version = "1.16.3"; + version = "1.16.4"; }; octicons = { dependencies = ["nokogiri"]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix index 293c3c5691..44e96cb908 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "23.2"; + version = "24"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-r2iw1vINWgqxoW0Zc8Sloa+wN/GUbUQfJ0e2BSP9vxM="; + sha256 = "sha256-gMwTdwYjYJt1j5MpHw6UD1wqmF7q3ikzjVSOGakIP30="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpu-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpu-viewer/default.nix index 18a8f53966..329babc36c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpu-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpu-viewer/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gpu-viewer"; - version = "3.02"; + version = "3.04"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "arunsivaramanneo"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/m8kXCICvWDqKIC6DbhUAXsjT+RNLMTsvlVTx85AJhE="; + hash = "sha256-+FDBHSVBTUHnhu2n7i9W1zIZe2wjY+OuFwQOJZojuzs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix index 9a18c9d5c9..daaf92fc72 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix @@ -10,7 +10,7 @@ , gnome , libchamplain , gdl -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + wrapGAppsHook3 # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index b4e2acc645..947c18050e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.18"; + version = "13.19"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-FetXV1D1aW7eanhPQkNzcGwKMMwzXLhBZjrzg1LD980="; + hash = "sha256-Q/Na+uc6a+OSLvJK75MEIxgdJhg/At830SBrix38Qj8="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gradience/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gradience/default.nix index fcb7d10c01..3ddbe86cd7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gradience/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gradience/default.nix @@ -67,6 +67,7 @@ python3Packages.buildPythonApplication rec { pygobject3 svglib yapsy + packaging ]; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/gramps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gramps/default.nix index fdfcfe4ce3..7feab95b00 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gramps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gramps/default.nix @@ -7,7 +7,7 @@ , gexiv2 , pango , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , gettext # Optional packages: , enableOSM ? true @@ -44,7 +44,7 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 intltool gettext gobject-introspection diff --git a/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix index ee7d7d3a95..eccb7df291 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.7.1"; + version = "3.7.2"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-uiJy4kfcTFUymyE0DxP6GlMX7ONogLFrx6K9IcgwTSE="; + sha256 = "sha256-lIrqMvI/sYGu36X3jNptoIz7mPVomk8YCIR/6y8mpEc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/grsync/default.nix b/third_party/nixpkgs/pkgs/applications/misc/grsync/default.nix index da41a71d95..0e0a6cb87e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/grsync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/grsync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync, wrapGAppsHook }: +{ lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync, wrapGAppsHook3 }: stdenv.mkDerivation rec { version = "1.3.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix index b85e00d095..258079f61c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-NgMEgSfHVLCEKZ3MmNV571ySMUD8wj+kq5EccGrxtZc="; + hash = "sha256-TpLaZ/935S57K60NdgJXVY+YQEedralZMoQHWRgkH+A="; }; - vendorHash = "sha256-fmc6nbS/Xmn/YRwToRH7EhP4SFRMf8hjZ/rLtaP/USo="; + vendorHash = "sha256-UgpOHZ/CEnGsmUTyNrhh+qDmKEplr18b/OrO2qcIhF4="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix index 7131c5cd12..857db4fd95 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, pkgs , glib, gtk3, gtksourceview3, gtkspell3, poppler, texlive -, pkg-config, intltool, autoreconfHook, wrapGAppsHook +, pkg-config, intltool, autoreconfHook, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkg-config intltool autoreconfHook wrapGAppsHook + pkg-config intltool autoreconfHook wrapGAppsHook3 ]; buildInputs = [ glib gtksourceview3 gtk3 gtkspell3 poppler diff --git a/third_party/nixpkgs/pkgs/applications/misc/gxkb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gxkb/default.nix index 201cbdb0a1..f64982ed71 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gxkb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gxkb/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck, libxklavier +{ lib, stdenv, fetchFromGitHub, fetchurl, git, autoreconfHook, pkg-config, gtk3, libwnck, libxklavier , appindicatorSupport ? true, libayatana-appindicator }: stdenv.mkDerivation rec { pname = "gxkb"; - version = "0.9.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "zen-tools"; repo = "gxkb"; rev = "v${version}"; - sha256 = "sha256-9r1eZl7PgIt2ZpK+QQHaa460imIHT3Lh5mpzcFglyWc="; + sha256 = "sha256-oBIBIkj4p6HlF0PRQtI/K5dhLs7pbPxN7Cgr/YZaI1s="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; @@ -19,6 +19,18 @@ stdenv.mkDerivation rec { configureFlags = lib.optional appindicatorSupport "--enable-appindicator=yes"; outputs = [ "out" "man" ]; + # This patch restore data which was wiped by upstream without any technical reasons + # https://github.com/omgbebebe/gxkb/commit/727ec8b595a91dbb540e6087750f43b85d0dfbc0 + # NOTE: the `patch` hook cannot be used here due to lack of support for git binary patches + p1 = fetchurl { + url = "https://github.com/omgbebebe/gxkb/commit/727ec8b595a91dbb540e6087750f43b85d0dfbc0.patch"; + hash = "sha256-x7x3MHHrOnPivvlzOFqgFAA5BDB2LOXMlalPYbwM/1Q="; + }; + + postPatch = '' + ${git}/bin/git apply ${p1} + ''; + meta = with lib; { description = "X11 keyboard indicator and switcher"; homepage = "https://zen-tools.github.io/gxkb/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix index c425014e24..bdab5d71e9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hamster/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3Packages, intltool, glib, itstool, gtk3 -, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: +, wrapGAppsHook3, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: python3Packages.buildPythonApplication rec { pname = "hamster"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.setuptools - wrapGAppsHook + wrapGAppsHook3 intltool itstool wafHook diff --git a/third_party/nixpkgs/pkgs/applications/misc/has/default.nix b/third_party/nixpkgs/pkgs/applications/misc/has/default.nix index a18a996f92..6fa84195a2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/has/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/has/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation (finalAttrs: rec { pname = "has"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "kdabir"; repo = "has"; rev = "v${finalAttrs.version}"; - hash = "sha256-3XsNSl4lQfJjEPNGoFj6ABXGkwOUsg9AFDAz8euZApE="; + hash = "sha256-TL8VwFx2tf+GkBwz0ILQg0pwcLJSTky57Wx9OW5+lS4="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix index 40bfede855..39073ee81b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "hcl2json"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "tmccombs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lnmWIyS1byXvShR1/ej8PAuo+WJBEBykQwJ79439Fus="; + sha256 = "sha256-RBzx6TxkR6GwMGHIpkJeswZ3zV4hRf38rTGUO6u2OI4="; }; - vendorHash = "sha256-HbdectUQgyQZ9qcfBarwRTF3VjzSqaM2vhVekThv2+k="; + vendorHash = "sha256-G/2bSFCXbph0bVjmWmcFgv4i/pCOQHhYxsVRVkpHPo4="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hmm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hmm/default.nix index a78b953875..4f45c09ef6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hmm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hmm/default.nix @@ -14,11 +14,14 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WPePzqZ2iGeJ7kzTj8eg7q1JEjw91WY7gViJJ46SLRY="; }; - cargoHash = "sha256-9Z49aPfcIdMfYCFAXsxFxcfhaLjtPod+nMFHDmvgDY0="; + cargoHash = "sha256-CQnM7pFnk4LcstKllhbeohbrggKV6MBQy03oq7DEkP4="; nativeCheckInputs = [ perl ]; + # FIXME: remove patch when upstream version of rustc-serialize is updated + # https://github.com/NixOS/nixpkgs/pull/310673 + cargoPatches = [ ./rustc-serialize-fix.patch ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/applications/misc/hmm/rustc-serialize-fix.patch b/third_party/nixpkgs/pkgs/applications/misc/hmm/rustc-serialize-fix.patch new file mode 100644 index 0000000000..8d0327e8a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/hmm/rustc-serialize-fix.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index b1cc23695b30..ffdeb1c90618 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -996,9 +996,9 @@ dependencies = [ + + [[package]] + name = "rustc-serialize" +-version = "0.3.24" ++version = "0.3.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" ++checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" + + [[package]] + name = "rustix" diff --git a/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix index 111a36e3ee..3d7c6b6c20 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix @@ -7,7 +7,7 @@ , openssl , webkitgtk , libappindicator -, wrapGAppsHook +, wrapGAppsHook3 , shared-mime-info , glib-networking }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg - wrapGAppsHook # required for FileChooser + wrapGAppsHook3 # required for FileChooser ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix index 7e3db80aad..1bec06a38c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-autoname-workspaces"; - version = "1.1.13"; + version = "1.1.14"; src = fetchFromGitHub { owner = "hyprland-community"; repo = "hyprland-autoname-workspaces"; rev = version; - hash = "sha256-JEzsbJcDX/qx1CMy+3UwcHOwFLPqyAG58MpGMtdSyYY="; + hash = "sha256-RTx4fmamjydrQzC1CpgbuvV6kg0S6Jyj/0Q9FrfrMlU="; }; - cargoHash = "sha256-Rpivw4VCVHjZywDwr4pajfGv/mkOdVrXVT/9Oe2Hw44="; + cargoHash = "sha256-Te3nBgr3uq8km8lX3AkCAS28leolZLXEF68phIEpg5k="; meta = with lib; { description = "Automatically rename workspaces with icons of started applications"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/input-leap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/input-leap/default.nix index 567bb08fb9..9f40735771 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/input-leap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/input-leap/default.nix @@ -21,7 +21,7 @@ , pkg-config , qtbase , qttools -, wrapGAppsHook +, wrapGAppsHook3 }: mkDerivation rec { @@ -36,7 +36,7 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config cmake wrapGAppsHook qttools ]; + nativeBuildInputs = [ pkg-config cmake wrapGAppsHook3 qttools ]; buildInputs = [ curl qtbase avahi libX11 libXext libXtst libXinerama libXrandr libXdmcp libICE libSM diff --git a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index a8245a2234..7127d83c65 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -49,10 +49,7 @@ let export LC_ALL=C.UTF-8 ''; - multiArch = false; # no 32bit needed - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" diff --git a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix index 4283d9d92a..92fe2ea2ac 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "19039"; + version = "19067"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-iH6g18lJrvfAvtkAaVPSK7vhgdU6oI7X10GkFcwpsBs="; + hash = "sha256-+mHX80ltIFkVWIeex519b84BYzhp+h459/C2wlDR7jQ="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; - hash = "sha256-yA+Qf76MbouiLdH9o1Ri8ptbG70YZoI13pBA9Ki61/0="; + hash = "sha256-lMESSSXl6hBC2MpLYnYOThy463ft2bONNppBv3OEvAQ="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix index 23da5323e2..b2239298d1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.15.98319"; + version = "0.15.107955"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-0gc3uXBByBR2shKhtUElEiz2saCwmH9vxWFf/WZm6hw="; + sha256 = "sha256-qCG3yi0ACmqOnn+gaCN8GedciUobpOww50Kz5AdknqU="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix index 1e8113765f..787a8c4637 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ pytest-bdd pytest-xdist - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) toml ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix index a6059ae44f..5893ceb920 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix @@ -23,12 +23,12 @@ let in stdenv.mkDerivation rec { pname = "k40-whisperer"; - version = "0.67"; + version = "0.68"; src = fetchzip { url = "https://www.scorchworks.com/K40whisperer/K40_Whisperer-${version}_src.zip"; stripRoot = true; - sha256 = "sha256-jyny5uNZ5eL4AV47uAgOhBe4Zqg8GK3e86Z9gZbC68s="; + sha256 = "sha256-Pc6iqBQUoI0dsrf+2dA1ZbxX+4Eks/lVgMGC4SR+oFI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/kdbplus/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kdbplus/default.nix deleted file mode 100644 index 05d1c98e56..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/kdbplus/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, stdenv, requireFile, unzip, rlwrap, bash, zlib }: - -assert (stdenv.hostPlatform.system == "i686-linux"); - -let - libPath = lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc zlib ]; -in -stdenv.mkDerivation rec { - pname = "kdbplus"; - version = "3.6"; - - src = requireFile rec { - message = '' - Nix can't download kdb+ for you automatically. Go to - http://kx.com and download the free, 32-bit version for - Linux. Then run "nix-prefetch-url file://\$PWD/${name}" in - the directory where you saved it. Note you need version ${version}. - ''; - name = "linuxx86.zip"; - sha256 = "0w6znd9warcqx28vf648n0vgmxyyy9kvsfpsfw37d1kp5finap4p"; - }; - - dontStrip = true; - nativeBuildInputs = [ unzip ]; - - phases = "unpackPhase installPhase"; - unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}"; - installPhase = '' - mkdir -p $out/bin $out/libexec - - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath} \ - ./q/l32/q - mv ./q/l32/q $out/libexec/q - - # Shell script wrappers to make things more convenient... - - cat > $out/bin/q-install <<- EOF - #!${bash}/bin/bash - if [ -f \$HOME/q/q.k ]; then - echo "kdb has already been unpacked in \$HOME. Skipping..." - exit 0 - fi - echo -n "Unzipping ${src} into \$HOME... " - cd \$HOME && ${unzip}/bin/unzip -qq ${src} - echo "Done" - EOF - - cat > $out/bin/q <<- EOF - #!${bash}/bin/bash - if [ ! -f \$HOME/q/q.k ]; then - echo "ERROR: You need to unzip the Q sources into \$HOME before running q." - echo - echo "Try:" - echo " cd \$HOME && unzip ${src}" - echo "(or run q-install)" - exit 1 - fi - - exec ${rlwrap}/bin/rlwrap $out/libexec/q \$@ - EOF - - chmod +x $out/bin/q $out/bin/q-install - ''; - - meta = { - description = "Analytics and time-series database"; - homepage = "http://www.kx.com/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - platforms = [ "i686-linux" ]; - maintainers = [ lib.maintainers.thoughtpolice ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix index e74a45c02f..e8804f6009 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix @@ -20,7 +20,7 @@ , qtsvg , qtx11extras , readline -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , zlib @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { qttools pkg-config ] - ++ lib.optional (!stdenv.isDarwin) wrapGAppsHook; + ++ lib.optional (!stdenv.isDarwin) wrapGAppsHook3; dontWrapGApps = true; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/keeweb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keeweb/default.nix index 22f3ad668c..a7260dc509 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keeweb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keeweb/default.nix @@ -4,7 +4,7 @@ , undmg , dpkg , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , alsa-lib , at-spi2-atk @@ -92,7 +92,7 @@ else stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/keymapp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keymapp/default.nix index 55cc3f3f98..59dae9589f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keymapp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keymapp/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , libusb1 , webkitgtk , gtk3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ copyDesktopItems autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix index fb5990f5dc..d5576ccb72 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix @@ -1,4 +1,4 @@ -{ fetchzip, lib, stdenv, jdk, runtimeShell, glib, wrapGAppsHook }: +{ fetchzip, lib, stdenv, jdk, runtimeShell, glib, wrapGAppsHook3 }: stdenv.mkDerivation rec { version = "5.5.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # glib is necessary so file dialogs don't hang. buildInputs = [ glib ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix index 842499f845..c33ca9bd2a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "kile-wl"; - version = "unstable-2023-07-23"; + version = "2.1-unstable-2023-07-23"; src = fetchFromGitLab { owner = "snakedye"; @@ -13,6 +13,7 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = unstableGitUpdater { url = "https://gitlab.com/snakedye/kile.git"; + tagPrefix = "v"; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/applications/misc/klipper-estimator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klipper-estimator/default.nix index 243a485c4a..136ad6115d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/klipper-estimator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/klipper-estimator/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "klipper-estimator"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "Annex-Engineering"; repo = "klipper_estimator"; rev = "v${version}"; - hash = "sha256-OvDdANowsz3qU2KV4WbUWyDrh3sG02+lBKNtcq6ecZ8="; + hash = "sha256-EjfW2qeq0ehGhjE2Psz5g/suYMZPvtQi2gaYb+NCa2U="; }; - cargoHash = "sha256-1O3kXeGPALSa/kNWRArk6ULG0+3UgTxVBzrsqDHHpDU="; + cargoHash = "sha256-bboXG2nBrK2hVzB43um6EUgLPlSa8huyPH7VOJ48Nkk="; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/applications/misc/klipperscreen/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klipperscreen/default.nix index 789ab7c688..5364d090f7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/klipperscreen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/klipperscreen/default.nix @@ -1,7 +1,7 @@ { lib , python3 , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , gitUpdater }: python3.pkgs.buildPythonApplication rec { @@ -18,7 +18,7 @@ nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; pythonPath = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix index d5d12eb446..6bf06be9be 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix @@ -1,8 +1,15 @@ -{ fetchFromGitHub, buildGoModule, lib, stdenv }: - -buildGoModule rec { +{ + fetchFromGitHub, + buildGoModule, + lib, + stdenv +}: +let pname = "kratos"; version = "1.1.0"; +in +buildGoModule { + inherit pname version; src = fetchFromGitHub { owner = "ory"; @@ -17,6 +24,11 @@ buildGoModule rec { tags = [ "sqlite" ]; + # Pass versioning information via ldflags + ldflags = [ + "-X github.com/ory/kratos/driver/config.Version=${version}" + ]; + doCheck = false; preBuild = '' @@ -30,14 +42,14 @@ buildGoModule rec { patchShebangs "''${files[@]}" # patchShebangs doesn't work for this Makefile, do it manually - substituteInPlace Makefile --replace '/bin/bash' '${stdenv.shell}' + substituteInPlace Makefile --replace-fail '/usr/bin/env bash' '${stdenv.shell}' ''; - meta = with lib; { - maintainers = with maintainers; [ mrmebelman ]; - homepage = "https://www.ory.sh/kratos/"; - license = licenses.asl20; - description = "An API-first Identity and User Management system that is built according to cloud architecture best practices"; + meta = { mainProgram = "kratos"; + description = "An API-first Identity and User Management system that is built according to cloud architecture best practices"; + homepage = "https://www.ory.sh/kratos/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mrmebelman ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/krename/default.nix b/third_party/nixpkgs/pkgs/applications/misc/krename/default.nix index 98ba8836ef..6cc5df92ae 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/krename/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/krename/default.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchurl, fetchpatch, lib, - extra-cmake-modules, kdoctools, wrapGAppsHook, + extra-cmake-modules, kdoctools, wrapGAppsHook3, kconfig, kinit, kjsembed, taglib, exiv2, podofo, kcrash }: @@ -27,7 +27,7 @@ in mkDerivation rec { buildInputs = [ taglib exiv2 podofo ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 ]; propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix index fbb33c7e09..8c22612ad4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix @@ -9,7 +9,7 @@ , keybinder3 , desktop-file-utils , shared-mime-info -, wrapGAppsHook +, wrapGAppsHook3 , wafHook , bash , dbus @@ -29,7 +29,7 @@ buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook intltool + wrapGAppsHook3 intltool # For setup hook gobject-introspection wafHook itstool # for help pages diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix index eacd64b06b..5fe74bbe20 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix @@ -5,6 +5,7 @@ , makeWrapper # graphs will not sync without matching upstream's major electron version , electron_27 +, autoPatchelfHook , git , nix-update-script }: @@ -14,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "logseq"; - version = "0.10.8"; + version = "0.10.9"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-kVnQ33gozrL6BOWQxUfiMypiIZOffeT2cMVMHIfsaWg="; + hash = "sha256-XROuY2RlKnGvK1VNvzauHuLJiveXVKrIYPppoz8fCmc="; name = "${pname}-${version}.AppImage"; }; @@ -30,7 +31,8 @@ in { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix index 017eb17a40..84ad583c63 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix @@ -1,12 +1,12 @@ { lib, appimageTools, fetchurl }: let - version = "1.7.8"; + version = "2.0.0"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-DhTWD9uL7zKWiRfeLYKxPtmAy1yR20wjlVA+N33YgpQ="; + sha256 = "sha256-rRE7VE6Fugqbbv/fTIZGuWDQmTP1tRDiKrb6VcpsBjk="; }; appimageContents = appimageTools.extractType2 { @@ -18,8 +18,6 @@ appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix index 3ee6148ef1..b16acc4787 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -15,7 +15,7 @@ , libnotify , pango , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 # check inputs , xvfb-run @@ -85,7 +85,7 @@ buildPythonApplication rec { hash = "sha256-Ed1bhugBe97XmY050A5jCPcnLj0Fd7qPX2p/Ab+YbOE="; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ atk gdk-pixbuf diff --git a/third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix index 4f4c915050..1f85cd9e72 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "mainsail"; - version = "2.10.0"; + version = "2.11.2"; src = fetchzip { url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip"; - hash = "sha256-5bRmM/BXI0Afe7UK6avh5aWFXkYF4MsUG71uYUc5JlA="; + hash = "sha256-RdBgGE/EUzb1/6PjQ34UjXjxt686s9May7npFtRocXE="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/maliit-keyboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/maliit-keyboard/default.nix index 3669dfe5a5..c67ac7a402 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/maliit-keyboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/maliit-keyboard/default.nix @@ -17,7 +17,7 @@ , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: mkDerivation rec { @@ -58,7 +58,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/markets/default.nix b/third_party/nixpkgs/pkgs/applications/misc/markets/default.nix index 436891482f..e24e902abc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/markets/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/markets/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , desktop-file-utils, glib, gtk3, meson, ninja, pkg-config, python3, vala -, wrapGAppsHook +, wrapGAppsHook3 , glib-networking, gobject-introspection, json-glib, libgee, libhandy, libsoup }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils glib gtk3 meson ninja pkg-config python3 vala - wrapGAppsHook gobject-introspection + wrapGAppsHook3 gobject-introspection ]; buildInputs = [ glib glib-networking gtk3 json-glib libgee libhandy diff --git a/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix b/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix index bc9418d578..1c6dc9657f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix @@ -20,16 +20,9 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - multiArch = false; # no 32bit needed - extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ - p.libsecret - p.xorg.libxkbfile - ]; + extraPkgs = pkgs: [ pkgs.libsecret pkgs.xorg.libxkbfile ]; extraInstallCommands = '' - # Strip version from binary name. - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop substituteInPlace $out/share/applications/marktext.desktop \ --replace "Exec=AppRun" "Exec=${pname} --" diff --git a/third_party/nixpkgs/pkgs/applications/misc/meerk40t/default.nix b/third_party/nixpkgs/pkgs/applications/misc/meerk40t/default.nix index c1a0b41a58..e0a3921824 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/meerk40t/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/meerk40t/default.nix @@ -3,7 +3,7 @@ , meerk40t-camera , python3Packages , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 ] ++ (with python3Packages; [ setuptools ]); diff --git a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix index a02647f4a9..e4e58d9bf6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix @@ -8,7 +8,7 @@ , python3 , shared-mime-info , vala -, wrapGAppsHook +, wrapGAppsHook3 , cairo , discount , glib @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { python3 shared-mime-info vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix index ad694c01cd..aa31ffa5cc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix @@ -11,7 +11,7 @@ , steam-run , unzip , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock index f7517597b0..922916ab13 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock @@ -2,25 +2,13 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - [[package]] name = "ahash" -version = "0.3.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" - -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", "version_check", "zerocopy", @@ -43,53 +31,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-task" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "autocfg" @@ -99,15 +43,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block" @@ -115,74 +53,24 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "fastrand", - "futures-io", - "futures-lite", - "piper", - "tracing", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "byte-slice-cast" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" - -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - [[package]] name = "cairo-rs" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1" +checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" dependencies = [ - "bitflags 2.4.1", + "bitflags", "cairo-sys-rs", "glib", "libc", - "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.18.2" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" dependencies = [ "glib-sys", "libc", @@ -191,55 +79,31 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", "target-lexicon", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "concurrent-queue" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" -dependencies = [ - "crossbeam-utils 0.8.16", -] - [[package]] name = "const-random" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" dependencies = [ "const-random-macro", ] @@ -255,100 +119,12 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpufeatures" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils 0.8.16", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils 0.8.16", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if 1.0.0", -] - [[package]] name = "crunchy" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - [[package]] name = "dbus" version = "0.9.7" @@ -360,26 +136,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - [[package]] name = "dlv-list" version = "0.5.2" @@ -389,12 +145,6 @@ dependencies = [ "const-random", ] -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - [[package]] name = "equivalent" version = "1.0.1" @@ -411,12 +161,6 @@ dependencies = [ "libc", ] -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - [[package]] name = "fallible-iterator" version = "0.3.0" @@ -429,12 +173,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - [[package]] name = "field-offset" version = "0.3.6" @@ -447,24 +185,24 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -473,42 +211,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "futures-core", - "pin-project-lite", -] +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-macro", @@ -518,33 +246,23 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "gdk-pixbuf" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c" +checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" dependencies = [ "gdk-pixbuf-sys", "gio", "glib", "libc", - "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" dependencies = [ "gio-sys", "glib-sys", @@ -555,9 +273,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" +checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -570,9 +288,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" +checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -585,23 +303,13 @@ dependencies = [ "system-deps", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi", ] @@ -628,9 +336,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d809baf02bdf1b5ef4ad3bf60dd9d4977149db4612b7bbb58e56aef168193b" +checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02" dependencies = [ "futures-channel", "futures-core", @@ -639,7 +347,6 @@ dependencies = [ "gio-sys", "glib", "libc", - "once_cell", "pin-project-lite", "smallvec", "thiserror", @@ -647,54 +354,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "winapi", -] - -[[package]] -name = "gl" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94edab108827d67608095e269cf862e60d920f144a5026d3dbcfd8b877fb404" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - -[[package]] -name = "gl_loader" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32d96dd5f881490e537041d5532320812ba096097f07fccb4626578da0b99d3" -dependencies = [ - "cc", - "libc", + "windows-sys", ] [[package]] name = "glib" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cf801b6f7829fa76db37449ab67c9c98a2b1bf21076d9113225621e61a0fa6" +checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" dependencies = [ - "bitflags 2.4.1", + "bitflags", "futures-channel", "futures-core", "futures-executor", @@ -706,30 +383,28 @@ dependencies = [ "gobject-sys", "libc", "memchr", - "once_cell", "smallvec", "thiserror", ] [[package]] name = "glib-macros" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" +checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" dependencies = [ "heck", - "proc-macro-crate 2.0.0", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "glib-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" dependencies = [ "libc", "system-deps", @@ -737,9 +412,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" dependencies = [ "glib-sys", "libc", @@ -748,9 +423,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" +checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" dependencies = [ "glib", "graphene-sys", @@ -759,9 +434,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" +checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" dependencies = [ "glib-sys", "libc", @@ -771,9 +446,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" +checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" dependencies = [ "cairo-rs", "gdk4", @@ -786,9 +461,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" +checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -802,9 +477,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" +checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" dependencies = [ "cairo-rs", "field-offset", @@ -823,12 +498,12 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" +checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" dependencies = [ "anyhow", - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -837,9 +512,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" +checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -854,40 +529,23 @@ dependencies = [ "system-deps", ] -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - [[package]] name = "hashbrown" -version = "0.7.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.3.8", - "autocfg", - "serde", -] - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" -dependencies = [ - "ahash 0.8.6", + "ahash", "allocator-api2", ] [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "692eaaf7f7607518dd3cef090f1474b61edc5301d8012f09579920df68b725ee" dependencies = [ - "hashbrown 0.14.2", + "hashbrown", ] [[package]] @@ -896,89 +554,21 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "image" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-iter", - "num-rational", - "num-traits", - "png", -] - [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "interprocess" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb" -dependencies = [ - "blocking", - "cfg-if 1.0.0", - "futures-core", - "futures-io", - "intmap", - "libc", - "once_cell", - "rustc_version", - "spinning", - "thiserror", - "to_method", - "winapi", -] - -[[package]] -name = "intmap" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" - [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "lazy_static" @@ -988,9 +578,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libadwaita" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" +checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" dependencies = [ "gdk-pixbuf", "gdk4", @@ -1004,9 +594,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" +checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" dependencies = [ "gdk4-sys", "gio-sys", @@ -1020,9 +610,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libdbus-sys" @@ -1035,9 +625,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", "pkg-config", @@ -1067,22 +657,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - [[package]] name = "malloc_buf" version = "0.0.6" @@ -1092,17 +666,11 @@ dependencies = [ "libc", ] -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -1113,111 +681,24 @@ dependencies = [ "autocfg", ] -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - [[package]] name = "missioncenter" -version = "0.4.4" +version = "0.4.5" dependencies = [ - "arrayvec 0.7.4", "dbus", "errno-sys", "gettext-rs", - "gl", - "gl_loader", "gtk4", - "interprocess", "lazy_static", "libadwaita", "libc", "libudev-sys", - "pathfinder_canvas", - "pathfinder_color", - "pathfinder_content", - "pathfinder_geometry", - "pathfinder_gl", - "pathfinder_gpu", - "pathfinder_renderer", - "pathfinder_resources", - "raw-cpuid", "regex", "rusqlite", "rust-ini", "serde", "serde_json", - "sha2", - "shared_memory_extended", - "sysinfo", "textdistance", - "thiserror", -] - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", ] [[package]] @@ -1251,9 +732,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "ordered-multimap" @@ -1262,27 +743,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f" dependencies = [ "dlv-list", - "hashbrown 0.14.2", + "hashbrown", ] [[package]] name = "pango" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d" dependencies = [ "gio", "glib", "libc", - "once_cell", "pango-sys", ] [[package]] name = "pango-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" dependencies = [ "glib-sys", "gobject-sys", @@ -1290,137 +770,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "pathfinder_canvas" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "pathfinder_color", - "pathfinder_content", - "pathfinder_geometry", - "pathfinder_renderer", -] - -[[package]] -name = "pathfinder_color" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "pathfinder_simd", -] - -[[package]] -name = "pathfinder_content" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "arrayvec 0.5.2", - "bitflags 1.3.2", - "image", - "log", - "pathfinder_color", - "pathfinder_geometry", - "pathfinder_simd", - "smallvec", -] - -[[package]] -name = "pathfinder_geometry" -version = "0.5.1" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "log", - "pathfinder_simd", -] - -[[package]] -name = "pathfinder_gl" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "gl", - "half", - "log", - "pathfinder_geometry", - "pathfinder_gpu", - "pathfinder_resources", - "pathfinder_simd", -] - -[[package]] -name = "pathfinder_gpu" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "bitflags 1.3.2", - "fxhash", - "half", - "image", - "instant", - "log", - "pathfinder_color", - "pathfinder_geometry", - "pathfinder_resources", - "pathfinder_simd", -] - -[[package]] -name = "pathfinder_renderer" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "bitflags 1.3.2", - "byte-slice-cast", - "byteorder", - "crossbeam-channel", - "fxhash", - "half", - "hashbrown 0.7.2", - "instant", - "log", - "pathfinder_color", - "pathfinder_content", - "pathfinder_geometry", - "pathfinder_gpu", - "pathfinder_resources", - "pathfinder_simd", - "pathfinder_ui", - "rayon", - "serde", - "serde_json", - "smallvec", - "vec_map", -] - -[[package]] -name = "pathfinder_resources" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" - -[[package]] -name = "pathfinder_simd" -version = "0.5.2" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "pathfinder_ui" -version = "0.5.0" -source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" -dependencies = [ - "hashbrown 0.7.2", - "pathfinder_color", - "pathfinder_geometry", - "pathfinder_gpu", - "pathfinder_resources", - "pathfinder_simd", - "serde", - "serde_derive", - "serde_json", -] - [[package]] name = "pin-project-lite" version = "0.2.13" @@ -1433,58 +782,19 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "piper" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "png" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "deflate", - "miniz_oxide", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", + "toml_edit 0.21.1", ] [[package]] @@ -1513,86 +823,27 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "raw-cpuid" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" -dependencies = [ - "bitflags 2.4.1", -] - -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils 0.8.16", -] - [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -1602,9 +853,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -1619,11 +870,11 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rusqlite" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" dependencies = [ - "bitflags 2.4.1", + "bitflags", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -1633,12 +884,13 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ordered-multimap", + "trim-in-place", ] [[package]] @@ -1652,47 +904,41 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -1701,37 +947,13 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[package]] -name = "shared_memory_extended" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004d7ece9a3be64f85471d50967710b0a146144225bed5f0abd0514a3bed086f" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "nix", - "rand", - "win-sys", -] - [[package]] name = "slab" version = "0.4.9" @@ -1743,18 +965,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "spinning" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b" -dependencies = [ - "lock_api", -] +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" @@ -1769,29 +982,15 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "sysinfo" -version = "0.29.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" -dependencies = [ - "cfg-if 1.0.0", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "winapi", -] - [[package]] name = "system-deps" version = "6.2.0" @@ -1807,15 +1006,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" [[package]] name = "textdistance" @@ -1825,22 +1024,22 @@ checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -1852,22 +1051,16 @@ dependencies = [ "crunchy", ] -[[package]] -name = "to_method" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" - [[package]] name = "toml" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.22.6", ] [[package]] @@ -1881,60 +1074,33 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.5", ] [[package]] -name = "tracing" -version = "0.1.40" +name = "trim-in-place" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" [[package]] name = "unicode-ident" @@ -1948,12 +1114,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version-compare" version = "0.1.1" @@ -1972,79 +1132,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasm-bindgen" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" - -[[package]] -name = "web-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "win-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5" -dependencies = [ - "windows", -] - [[package]] name = "winapi" version = "0.3.9" @@ -2068,79 +1155,105 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.34.0" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", "windows_i686_msvc", "windows_x86_64_gnu", + "windows_x86_64_gnullvm", "windows_x86_64_msvc", ] [[package]] -name = "windows_aarch64_msvc" -version = "0.34.0" +name = "windows_aarch64_gnullvm" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" -version = "0.34.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" -version = "0.34.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" -version = "0.34.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" -version = "0.34.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] -name = "xml-rs" -version = "0.8.19" +name = "winnow" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] [[package]] name = "zerocopy" -version = "0.7.25" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.25" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] diff --git a/third_party/nixpkgs/pkgs/applications/misc/mission-center/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mission-center/default.nix index 8bfbb4298a..6f8fb90bc2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mission-center/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mission-center/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-J0wSu/jWpUJ7Ga6RecY4yLT7i5Ry1HiI+t30SAHOkMw="; + hash = "sha256-e5+uB2vzwRqjUiR+gxpSARHPqG+1iX3yifsfwv5LnZI="; }; cargoDeps = symlinkJoin { @@ -59,9 +59,6 @@ stdenv.mkDerivation rec { paths = [ (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; - outputHashes = { - "pathfinder_canvas-0.5.0" = "sha256-qEp16TVggPtvFvDuUyWsS6rH6MeO6FW0K6BnACghaCg="; - }; }) (rustPlatform.importCargoLock { lockFile = ./gatherer-Cargo.lock; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock index c3487fe479..792a68f66f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -9,10 +9,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "anyhow" -version = "1.0.75" +name = "aho-corasick" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "arrayvec" @@ -31,9 +40,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bincode" @@ -52,9 +61,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block-buffer" @@ -66,10 +75,20 @@ dependencies = [ ] [[package]] -name = "bytemuck" -version = "1.14.0" +name = "bstr" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bytemuck" +version = "1.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" dependencies = [ "bytemuck_derive", ] @@ -87,16 +106,17 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77042b5b585f701f1cfb4b6b12ebc02b9b0cefbc8dcce235906b6bf376d4245d" +checksum = "74862c3c6e53a1c1f8f0178f9d38ab41e49746cd3a7cafc239b3d0248fd4e342" dependencies = [ "anyhow", "core-foundation", "filetime", "hex", + "ignore", "jobserver", - "libc 0.2.150", + "libc 0.2.153", "miow", "same-file", "sha2", @@ -104,17 +124,14 @@ dependencies = [ "tempfile", "tracing", "walkdir", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc 0.2.150", -] +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cfg-if" @@ -123,10 +140,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "const-random" -version = "0.1.17" +name = "cfg_aliases" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" dependencies = [ "const-random-macro", ] @@ -144,38 +167,63 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", - "libc 0.2.150", + "libc 0.2.153", ] [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ - "libc 0.2.150", + "libc 0.2.153", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + [[package]] name = "crunchy" version = "0.2.2" @@ -198,7 +246,7 @@ version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" dependencies = [ - "libc 0.2.150", + "libc 0.2.153", "libdbus-sys", "winapi", ] @@ -233,11 +281,11 @@ dependencies = [ [[package]] name = "drm" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58eefd79f5173683872c0c82d0f05c2dc3c583d631259f60bb7a323756b7ff2" +checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "bytemuck", "drm-ffi", "drm-fourcc", @@ -246,9 +294,9 @@ dependencies = [ [[package]] name = "drm-ffi" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "220dd8c12ebf2b0cbaffa19e00de02f5f090d363fb900f16ea012c077eea1174" +checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", "rustix", @@ -262,12 +310,12 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" [[package]] name = "drm-sys" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5115283ec60c99da8a9e5dc3c55f27680211e974c948cb6f3b51f0373190503b" +checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" dependencies = [ - "libc 0.2.150", - "linux-raw-sys 0.6.1", + "libc 0.2.153", + "linux-raw-sys 0.6.4", ] [[package]] @@ -277,17 +325,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a373bc9844200b1ff15bd1b245931d1c20d09d06e4ec09f361171f29a4b0752d" dependencies = [ "khronos", - "libc 0.2.150", + "libc 0.2.153", ] [[package]] name = "errno" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "libc 0.2.150", - "windows-sys", + "libc 0.2.153", + "windows-sys 0.52.0", ] [[package]] @@ -298,14 +346,14 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", - "libc 0.2.150", - "redox_syscall 0.3.5", - "windows-sys", + "libc 0.2.153", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] @@ -320,16 +368,16 @@ dependencies = [ [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "gatherer" -version = "0.4.4" +version = "0.4.5" dependencies = [ "anyhow", "arrayvec", @@ -344,7 +392,7 @@ dependencies = [ "flate2", "gbm", "lazy_static", - "libc 0.2.150", + "libc 0.2.153", "nix", "pkg-config", "rust-ini", @@ -357,15 +405,15 @@ dependencies = [ [[package]] name = "gbm" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65dffaf38d96aa22cb748ccd9b1ffe624931e899f54c0225815ef7ac757a409f" +checksum = "313702b30cdeb83ddc72bc14dcee67803cd0ae2d12282ea06e368c25a900c844" dependencies = [ "bitflags 1.3.2", "drm", "drm-fourcc", "gbm-sys", - "libc 0.2.150", + "libc 0.2.153", ] [[package]] @@ -374,7 +422,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58" dependencies = [ - "libc 0.2.150", + "libc 0.2.153", ] [[package]] @@ -389,15 +437,28 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", - "libc 0.2.150", + "libc 0.2.153", "wasi", ] +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata", + "regex-syntax", +] + [[package]] name = "hashbrown" version = "0.14.3" @@ -412,27 +473,43 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", ] [[package]] -name = "itoa" -version = "1.0.9" +name = "ignore" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ - "libc 0.2.150", + "libc 0.2.153", ] [[package]] @@ -458,9 +535,9 @@ checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libdbus-sys" @@ -483,27 +560,33 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "linux-raw-sys" -version = "0.6.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4a7ec558fa3b65e4c69b6af8df01fb9ad51ac69262335e1505276bc091935d" +checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -514,25 +597,26 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "nix" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cfg-if", - "libc 0.2.150", + "cfg_aliases", + "libc 0.2.153", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "ordered-multimap" @@ -546,9 +630,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" @@ -558,37 +642,28 @@ checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -599,69 +674,97 @@ dependencies = [ ] [[package]] -name = "ring" -version = "0.17.5" +name = "regex-automata" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", - "libc 0.2.150", + "libc 0.2.153", "spin", "untrusted", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rust-ini" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" dependencies = [ "cfg-if", "ordered-multimap", + "trim-in-place", ] [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", - "libc 0.2.150", - "linux-raw-sys 0.4.11", - "windows-sys", + "libc 0.2.153", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.8" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" dependencies = [ "log", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] -name = "rustls-webpki" -version = "0.101.7" +name = "rustls-pki-types" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" + +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -672,30 +775,20 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "serde" -version = "1.0.192" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", @@ -704,9 +797,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -737,10 +830,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] -name = "syn" -version = "2.0.39" +name = "subtle" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "2.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -754,21 +853,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", - "libc 0.2.150", + "libc 0.2.153", "xattr", ] [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -826,6 +924,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "trim-in-place" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" + [[package]] name = "typenum" version = "1.17.0" @@ -834,9 +938,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -846,9 +950,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -861,15 +965,16 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.8.0" +version = "2.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" dependencies = [ "base64", "flate2", "log", "once_cell", "rustls", + "rustls-pki-types", "rustls-webpki", "url", "webpki-roots", @@ -877,9 +982,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -894,9 +999,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -910,9 +1015,12 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "winapi" @@ -951,7 +1059,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", ] [[package]] @@ -960,13 +1077,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "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_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -975,36 +1107,72 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -1012,10 +1180,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "xattr" -version = "1.0.1" +name = "windows_x86_64_msvc" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ - "libc 0.2.150", + "libc 0.2.153", + "linux-raw-sys 0.4.13", + "rustix", ] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix index 1bde970c1e..2b891abc64 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mobilecoin-wallet/default.nix @@ -13,7 +13,7 @@ let in appimageTools.wrapType2 { inherit name src; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} diff --git a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix index 92574896bb..caecc46d54 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix @@ -35,7 +35,7 @@ , cairo , libxkbcommon , libepoxy -, wrapGAppsHook +, wrapGAppsHook3 , at-spi2-core , dbus , bash @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config jre swig - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix index 42cd8067fe..6c1ac1ede9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix @@ -2,21 +2,19 @@ let pname = "neo4j-desktop"; version = "1.5.8"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage"; + url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${pname}-${version}-x86_64.AppImage"; hash = "sha256-RqzR4TuvDasbkj/wKvOOS7r46sXDxvw3B5ydFGZeHX8="; }; - appimageContents = appimageTools.extract { inherit name src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; - extraPkgs = pkgs: with pkgs; [ libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix index 4606ee9432..c8958950db 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix @@ -5,18 +5,14 @@ let version = "1.8.4"; sha256 = "0rvz8zwsi62kiq89pv8n2wh9h5yb030kvdr1vf65xwqkhqcrzrby"; - name = "${pname}-${version}"; - src = fetchurl { url = "https://github.com/notable/notable/releases/download/v${version}/Notable-${version}.AppImage"; inherit sha256; }; appimageContents = appimageTools.extract { - inherit name src; + inherit pname version src; }; - - nativeBuildInputs = [ makeWrapper ]; in appimageTools.wrapType2 rec { @@ -26,10 +22,9 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - multiArch = false; # no 32bit needed - extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ]; + extraPkgs = pkgs: [ pkgs.at-spi2-atk pkgs.at-spi2-core ]; + extraInstallCommands = '' - mv $out/bin/{${name},${pname}} install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \ $out/share/icons/hicolor/1024x1024/apps/notable.png diff --git a/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix index 62788b5a7f..7742a54c6c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix @@ -48,10 +48,7 @@ let export LC_ALL=C.UTF-8 ''; - multiPkgs = null; # no 32bit needed - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps substituteInPlace $out/share/applications/notesnook.desktop \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/notifymuch/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notifymuch/default.nix index 6ba819133e..72a0485b0a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/notifymuch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/notifymuch/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gobject-introspection , libnotify -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , python3 }: @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix index 2a08b24435..8ab52711a6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix @@ -4,7 +4,7 @@ , copyDesktopItems , makeDesktopItem , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , gvfs , maven , jre @@ -42,7 +42,7 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ copyDesktopItems makeWrapper - wrapGAppsHook + wrapGAppsHook3 gvfs ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix b/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix index 7a1393637d..651e442028 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix @@ -10,7 +10,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix index 356b1edb15..d80986db6e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix @@ -5,7 +5,7 @@ , pkg-config , gtk3 , gtk-layer-shell -, wrapGAppsHook }: +, wrapGAppsHook3 }: buildGoModule rec { pname = "nwg-bar"; @@ -26,7 +26,7 @@ buildGoModule rec { vendorHash = "sha256-/kqhZcIuoN/XA0i1ua3lzVGn4ghkekFYScL1o3kgBX4="; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk3 gtk-layer-shell librsvg ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix index 22d4e20d5e..bedc06bd33 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix @@ -7,25 +7,25 @@ , gtk3 , pango , python310Packages -, wrapGAppsHook +, wrapGAppsHook3 , hyprlandSupport ? true , wlr-randr }: python310Packages.buildPythonApplication rec { pname = "nwg-displays"; - version = "0.3.16"; + version = "0.3.18"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-displays"; rev = "refs/tags/v${version}"; - hash = "sha256-rnaBYDGEsc8oGw4yZ60NQFbNf+L0tmHYDYf+UDoDmSI="; + hash = "sha256-wf72x3lXNAJ6Y4zJmYgwJrL1gWJBvTYUcXasT5zlXCM="; }; nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-dock-hyprland/default.nix index 607dd7c22f..ff0a57b075 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-dock-hyprland/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-dock-hyprland/default.nix @@ -2,26 +2,26 @@ , buildGoModule , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk-layer-shell }: buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Lekvk3tQfeOR+Ltbc5b7TMiUZpktZ2nvCtUncrFb+Kc="; + sha256 = "sha256-cdNxaOnm98RcPG2o0GaBETpd+Zo2nlgrFv+2PiHOwUI="; }; - vendorHash = "sha256-5fN/6HASfTMb80YYAIoWRqnRGMvvX4d8C2UvOc0jQU0="; + vendorHash = "sha256-JEzc950c4EGOYMLgpL8PXENkGlWSX8Z4A4jCx1B99X8="; ldflags = [ "-s" "-w" ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk-layer-shell ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix index 6733a5dac3..27be9aa08f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub -, buildGoModule, pkg-config, wrapGAppsHook, gobject-introspection +, buildGoModule, pkg-config, wrapGAppsHook3, gobject-introspection , gtk-layer-shell, gtk3, pango, gdk-pixbuf, atk }: @@ -19,7 +19,7 @@ buildGoModule rec { doCheck = false; buildInputs = [ atk gtk3 gdk-pixbuf gtk-layer-shell pango ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 gobject-introspection ]; prePatch = '' for file in main.go tools.go; do diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix index 840b048d2d..3ee4832871 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub -, python3Packages, wrapGAppsHook, gobject-introspection +, python3Packages, wrapGAppsHook3, gobject-introspection , gtk-layer-shell, pango, gdk-pixbuf, atk # Extra packages called by various internal nwg-panel modules , hyprland # hyprctl @@ -16,24 +16,24 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.27"; + version = "0.9.31"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "refs/tags/v${version}"; - hash = "sha256-GCaqFqoZ7lfyE3VD3Dgz8jVt9TtUq3XVzVeI6g3SO5E="; + hash = "sha256-g3O+jWLwMBNfk0vAi/wq/YnGTAIscDJH2QV7bequyNU="; }; # No tests doCheck = false; - # Because of wrapGAppsHook + # Because of wrapGAppsHook3 strictDeps = false; dontWrapGApps = true; buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango playerctl ]; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; propagatedBuildInputs = (with python3Packages; [ i3ipc netifaces psutil pybluez pygobject3 requests dasbus setuptools ]) # Run-time GTK dependency required by the Tray module diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-wrapper/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-wrapper/default.nix index 5b28628318..f5b524c890 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-wrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, gtk-layer-shell, gtk3, gobject-introspection, wrapGAppsHook, wlr-randr }: +{ lib, python3Packages, fetchFromGitHub, gtk-layer-shell, gtk3, gobject-introspection, wrapGAppsHook3, wlr-randr }: python3Packages.buildPythonPackage rec { pname = "nwg-wrapper"; @@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec { sha256 = "sha256-GKDAdjO67aedCEFHKDukQ+oPMomTPwFE/CvJu112fus="; }; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; buildInputs = [ gtk3 gtk-layer-shell ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix index 0a13013e5d..ef0a2b9b4b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -28,6 +28,7 @@ let inherit version; hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; }; + doCheck = false; }); flask = super.flask.overridePythonAttrs (oldAttrs: rec { version = "2.2.5"; @@ -115,13 +116,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.9.3"; + version = "1.10.0"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - hash = "sha256-71uE8JvcS++xH8WSVWj5x0+9s3XIwf3A64c6YtxpSRc="; + hash = "sha256-gM989Wh4HYU5/afCcZ6iRJWb4bkFZfnnxBmyklSZep4="; }; propagatedBuildInputs = with self; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/onagre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/onagre/default.nix deleted file mode 100644 index b6375e6b59..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/onagre/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, cmake -, pkgconf -, freetype -, expat -}: - -rustPlatform.buildRustPackage rec { - pname = "onagre"; - version = "1.0.0-alpha.0"; - - src = fetchFromGitHub { - owner = "oknozor"; - repo = pname; - rev = version; - hash = "sha256-hP+slfCWgsTgR2ZUjAmqx9f7+DBu3MpSLvaiZhqNK1Q="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "pop-launcher-1.2.1" = "sha256-LeKaJIvooD2aUlY113P0mzxOcj63sGkrA0SIccNqCLY="; - }; - }; - - cargoSha256 = "sha256-IOhAGrAiT2mnScNP7k7XK9CETUr6BjGdQVdEUvTYQT4="; - - nativeBuildInputs = [ cmake pkgconf ]; - buildInputs = [ freetype expat ]; - - meta = with lib; { - description = "A general purpose application launcher for X and wayland inspired by rofi/wofi and alfred"; - homepage = "https://github.com/oknozor/onagre"; - license = licenses.mit; - maintainers = [ maintainers.jfvillablanca ]; - platforms = platforms.linux; - mainProgram = "onagre"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix index cdcdb2b1e5..6f210791ce 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix @@ -23,7 +23,7 @@ , pkg-config , procps , python3 -, wrapGAppsHook +, wrapGAppsHook3 , xorg , yelp }: @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/openlp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openlp/default.nix index a075a9bec6..c77b494f08 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openlp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openlp/default.nix @@ -1,6 +1,6 @@ # This file contains all runtime glue: Bindings to optional runtime dependencies # for pdfSupport, presentationSupport, and media playback. -{ lib, mkDerivation, wrapGAppsHook, python3Packages +{ lib, mkDerivation, wrapGAppsHook3, python3Packages # qt deps , qtbase, qtmultimedia @@ -40,7 +40,7 @@ in mkDerivation { pname = baseLib.pname + lib.optionalString (pdfSupport && presentationSupport && vlcSupport && gstreamerSupport) "-full"; inherit (baseLib) version src; - nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ]; + nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook3 ]; buildInputs = [ qtbase ] ++ optionals gstreamerSupport ([ qtmultimedia.bin gst_all_1.gstreamer ] ++ gstPlugins gst_all_1); propagatedBuildInputs = optional pdfSupport mupdf diff --git a/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix index 832f6f8048..db3103ea42 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "oranda"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "axodotdev"; repo = "oranda"; rev = "v${version}"; - hash = "sha256-BOMAkmJ2i/zqp6v49xeIF+EfZob8yXohPh86ERwp5OU="; + hash = "sha256-PECM0HLomMzNWnERgvYSfSh+XQAjGLxybZAJcaAzEBo="; }; - cargoHash = "sha256-SjXPfrO/YiOb1gOw75nAstKFipeIvLV6yl/sy+BZqE4="; + cargoHash = "sha256-qO48oR3RtyCbhdGn+VZPceZX/RMqS+5LacSASYRboMo="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch b/third_party/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch deleted file mode 100644 index 45ae4b827b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/orca/fix-paths.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/src/orca/debug.py b/src/orca/debug.py -index b7e11ea60..9ab996765 100644 ---- a/src/orca/debug.py -+++ b/src/orca/debug.py -@@ -447,7 +447,7 @@ def traceit(frame, event, arg): - return traceit - - def getOpenFDCount(pid): -- procs = subprocess.check_output([ 'lsof', '-w', '-Ff', '-p', str(pid)]) -+ procs = subprocess.check_output([ '@lsof@', '-w', '-Ff', '-p', str(pid)]) - procs = procs.decode('UTF-8').split('\n') - files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs)) - -@@ -465,7 +465,7 @@ def getCmdline(pid): - return cmdline - - def pidOf(procName): -- openFile = subprocess.Popen(f'pgrep {procName}', -+ openFile = subprocess.Popen(f'@pgrep@ {procName}', - shell=True, - stdout=subprocess.PIPE).stdout - pids = openFile.read() -diff --git a/src/orca/orca.py b/src/orca/orca.py -index d4e89f918..bb3e6cc1d 100644 ---- a/src/orca/orca.py -+++ b/src/orca/orca.py -@@ -312,7 +312,7 @@ def updateKeyMap(keyboardEvent): - - def _setXmodmap(xkbmap): - """Set the keyboard map using xkbcomp.""" -- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], -+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], - stdin=subprocess.PIPE, stdout=None, stderr=None) - p.communicate(xkbmap) - -@@ -389,7 +389,7 @@ def _storeXmodmap(keyList): - """ - - global _originalXmodmap -- _originalXmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-']) -+ _originalXmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-']) - - def _restoreXmodmap(keyList=[]): - """Restore the original xmodmap values for the keys in keyList. -@@ -404,7 +404,7 @@ def _restoreXmodmap(keyList=[]): - - global _capsLockCleared - _capsLockCleared = False -- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], -+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], - stdin=subprocess.PIPE, stdout=None, stderr=None) - p.communicate(_originalXmodmap) - -diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in -index 9d64af948..ca9c9e083 100644 ---- a/src/orca/orca_bin.py.in -+++ b/src/orca/orca_bin.py.in -@@ -65,7 +65,7 @@ class ListApps(argparse.Action): - name = "[DEAD]" - - try: -- cmdline = subprocess.getoutput('cat /proc/%s/cmdline' % pid) -+ cmdline = subprocess.getoutput('@cat@ /proc/%s/cmdline' % pid) - except Exception: - cmdline = '(exception encountered)' - else: -@@ -198,7 +198,7 @@ def inGraphicalDesktop(): - def otherOrcas(): - """Returns the pid of any other instances of Orca owned by this user.""" - -- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(), -+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(), - shell=True, - stdout=subprocess.PIPE).stdout - pids = openFile.read() -diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py -index ed8b155e4..0436cca42 100644 ---- a/src/orca/script_utilities.py -+++ b/src/orca/script_utilities.py -@@ -144,7 +144,7 @@ class Utilities: - return "" - - try: -- cmdline = subprocess.getoutput(f"cat /proc/{pid}/cmdline") -+ cmdline = subprocess.getoutput(f"@cat@ /proc/{pid}/cmdline") - except Exception: - return "" - diff --git a/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix b/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix index e53cc20874..0ab84ea083 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix @@ -4,7 +4,7 @@ , cmake , pkg-config , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , jansson , libgcrypt , libzip @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/oversteer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oversteer/default.nix index eb47b4225d..6618d154cd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/oversteer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/oversteer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, gettext, python3, python3Packages , meson, ninja, udev, appstream, appstream-glib, desktop-file-utils, gtk3 -, wrapGAppsHook, gobject-introspection, bash, }: +, wrapGAppsHook3, gobject-introspection, bash, }: let python = python3.withPackages (p: with p; [ @@ -33,7 +33,7 @@ in stdenv.mkDerivation { pkg-config gettext python - wrapGAppsHook + wrapGAppsHook3 gobject-introspection meson udev diff --git a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix index 6e97bad8f9..9e7c983d48 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.6.2"; + version = "0.6.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-pHyIL5Jmldsa0ZNMiYpBD+9zxPv8Blg23nnWD2YmHMI="; + sha256 = "sha256-L03r4PHCu+jsUC5vVSG77SR2ak/AsuVAhTd7P1WibAk="; }; - cargoHash = "sha256-N1Cv89njL9QCIs3HclcjsqgSUSMEckis8zyVqepeW70="; + cargoHash = "sha256-5UxbZZdVioy1OZCbE6qESGKVnVT6TS4VHzsKlQ8XP2c="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pattypan/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pattypan/default.nix index c1f5aa84b0..344540e848 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pattypan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pattypan/default.nix @@ -4,7 +4,7 @@ , ant , jdk , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , makeDesktopItem , copyDesktopItems , stripJavaArchivesHook @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ant jdk makeWrapper - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems stripJavaArchivesHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix index 7815106170..bfb240e2b9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook, gobject-introspection }: +{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook3, gobject-introspection }: python3.pkgs.buildPythonApplication { pname = "pdf-quench"; @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication { sha256 = "1rp9rlwr6rarcsxygv5x2c5psgwl6r69k0lsgribgyyla9cf2m7n"; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = with pkgs; [ gtk3 goocanvas2 diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix index 2973a4b9a3..7e0dc4c2fd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , lib -, wrapGAppsHook +, wrapGAppsHook3 , python3Packages , gtk3 , poppler_gi @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 ] ++ (with python3Packages; [ setuptools ]); @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { python-dateutil ]; - # incompatible with wrapGAppsHook + # incompatible with wrapGAppsHook3 strictDeps = false; dontWrapGApps = true; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix index 7d46836b79..5b77a264ed 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfpc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook3 , qrencode, webkitgtk, discount, json-glib, fetchpatch }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmake pkg-config vala # For setup hook gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix index 0d1e5e5f73..ce3ce1a740 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, makeDesktopItem, fetchurl, jdk21, wrapGAppsHook, glib }: +{ lib, stdenv, makeDesktopItem, fetchurl, jdk21, wrapGAppsHook3, glib }: stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - hash = "sha256-+Hc3f8rf0ymddIu52vLtdqNZO4ODW9JnPlyneSZt/OQ="; + hash = "sha256-ai1UHMeLvCba6WV6f6dGc53CxPP7bJaPgo8Tm7ddkOM="; }; unpackPhase = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { tar xvf data.tar.gz ''; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ glib ]; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfslicer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfslicer/default.nix index ed20f460a1..d856dfaca8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfslicer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfslicer/default.nix @@ -5,7 +5,7 @@ , gettext , intltool , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtkmm3 , libuuid , poppler @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gettext intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix b/third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix index da67c39ab5..11bee79962 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix @@ -55,6 +55,6 @@ buildGoModule rec { description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; homepage = "https://perkeep.org"; license = licenses.asl20; - maintainers = with maintainers; [ danderson kalbasit ]; + maintainers = with maintainers; [ kalbasit ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix index 05c641731c..9293a73232 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-urKAsuYmK8dsXhP+I7p27PXXYRapPtkI8FqARfLwnEw="; + sha256 = "sha256-LDgRv7Todyy2pnE21Z0O5JQ6mE4ZO3THv6rfEWU66Cc="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix index deccbabe3f..534556e231 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix @@ -6,8 +6,9 @@ , ninja , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook3 , libinput +, gobject-introspection , gnome , gnome-desktop , glib @@ -24,20 +25,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "phoc"; - version = "0.37.0"; + version = "0.38.0"; src = fetchurl { # This tarball includes the meson wrapped subproject 'gmobile'. url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-SQLoOjqDBL1G3SDO4mfVRV2U0i+M1EwiqUR52ytFJmM="; + hash = "sha256-OcRUnw1Fck9bMSgfMMcWqqR6a6yzyKjY8P3nqcwVULc="; }; nativeBuildInputs = [ + gobject-introspection meson ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/plank/default.nix b/third_party/nixpkgs/pkgs/applications/misc/plank/default.nix index fb3226e6d8..69be975be0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/plank/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/plank/default.nix @@ -21,7 +21,7 @@ , file , gnome-menus , libgee -, wrapGAppsHook +, wrapGAppsHook3 , autoreconfHook }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libxml2 # xmllint pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix b/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix index 0b4f445c00..4f12fb4706 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/playonlinux/default.nix @@ -26,7 +26,7 @@ # needed for avoiding crash on file selector , gsettings-desktop-schemas , glib -, wrapGAppsHook +, wrapGAppsHook3 , hicolor-icon-theme }: @@ -79,7 +79,7 @@ in stdenv.mkDerivation { ./0001-fix-locale.patch ]; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook3 ]; preBuild = '' makeFlagsArray+=(PYTHON="python -m py_compile") diff --git a/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix index 983dc81d17..1e29c225f9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix @@ -3,7 +3,7 @@ , makeWrapper , fetchurl , dpkg -, wrapGAppsHook +, wrapGAppsHook3 , autoPatchelfHook , gtk3 , cairo @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 autoPatchelfHook makeWrapper dpkg diff --git a/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf1/default.nix b/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf1/default.nix index a4ff885a71..572a981b4c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf1/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf1/default.nix @@ -36,7 +36,7 @@ , nss , openssl , pango -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { autoPatchelfHook dpkg makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl libnghttp2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/polychromatic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/polychromatic/default.nix index f940f5a4af..9ed291c79c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/polychromatic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/polychromatic/default.nix @@ -10,7 +10,7 @@ , sassc , python3Packages , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , libappindicator-gtk3 , libxcb , qt5 @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { meson ninja sassc - wrapGAppsHook + wrapGAppsHook3 qt5.wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/premid/default.nix b/third_party/nixpkgs/pkgs/applications/misc/premid/default.nix index f621d510e4..876c4c33de 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/premid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/premid/default.nix @@ -1,4 +1,4 @@ -{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook, fetchurl, copyDesktopItems +{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook3, fetchurl, copyDesktopItems , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/printrun/default.nix b/third_party/nixpkgs/pkgs/applications/misc/printrun/default.nix index 61acdd3285..884ce49dd8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/printrun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/printrun/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, glib, wrapGAppsHook }: +{ lib, python3Packages, fetchFromGitHub, glib, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { pname = "printrun"; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py ''; - nativeBuildInputs = [ glib wrapGAppsHook ]; + nativeBuildInputs = [ glib wrapGAppsHook3 ]; propagatedBuildInputs = with python3Packages; [ appdirs cython dbus-python numpy six wxpython psutil pyglet pyopengl pyserial cffi cairosvg lxml diff --git a/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix b/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix index 86258fa980..78a1225287 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "1.2.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-juFcVtHhqT6tw9YaKCDTUvX6NqqxEjqVK3Zom673IkQ="; + hash = "sha256-OxEo5fkRSdEZLyvK4Pt3EOWLO0ph6RkSD2OOeAWg72M="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-9G8GPTJRuPahNcEhAddZsUKc1fexp6IrCZlCGKW0T64="; + vendorHash = "sha256-X4pMes9hLMF8bZ6MX5cZdm4HfjnHYshGlA/lXlHr1Ow="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/projectlibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/projectlibre/default.nix index 52e56ed062..fbb25f30d4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/projectlibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/projectlibre/default.nix @@ -1,46 +1,79 @@ -{ lib, stdenv, fetchgit, ant, jdk, makeWrapper, jre, coreutils, which }: +{ + lib, + stdenv, + fetchgit, + ant, + jdk, + stripJavaArchivesHook, + makeWrapper, + jre, + coreutils, + which, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "projectlibre"; - version = "1.7.0"; + version = "1.9.3"; src = fetchgit { url = "https://git.code.sf.net/p/projectlibre/code"; - rev = "0c939507cc63e9eaeb855437189cdec79e9386c2"; # version 1.7.0 was not tagged - sha256 = "0vy5vgbp45ai957gaby2dj1hvmbxfdlfnwcanwqm9f8q16qipdbq"; + rev = "20814e88dc83694f9fc6780c2550ca5c8a87aa16"; # version 1.9.3 was not tagged + hash = "sha256-yXgYyy3jWxYMXKsNCRWdO78gYRmjKpO9U5WWU6PtwMU="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ant jdk ]; - buildPhase = '' - export ANT_OPTS=-Dbuild.sysclasspath=ignore - ${ant}/bin/ant -f openproj_build/build.xml - ''; + nativeBuildInputs = [ + ant + jdk + stripJavaArchivesHook + makeWrapper + ]; - resourcesPath = "openproj_build/resources"; - desktopItem = "${resourcesPath}/projectlibre.desktop"; + runtimeDeps = [ + jre + coreutils + which + ]; + + env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8"; + + buildPhase = '' + runHook preBuild + ant -f projectlibre_build/build.xml + runHook postBuild + ''; installPhase = '' - mkdir -p $out/share/{applications,projectlibre/samples,pixmaps,doc/projectlibre} $out/bin + runHook preInstall + + mkdir -p $out/share/{projectlibre/samples,doc/projectlibre} + + pushd projectlibre_build + cp -R dist/* $out/share/projectlibre + cp -R license $out/share/doc/projectlibre + cp -R resources/samples/* $out/share/projectlibre/samples + install -Dm644 resources/projectlibre.desktop -t $out/share/applications + install -Dm644 resources/projectlibre.png -t $out/share/pixmaps + install -Dm755 resources/projectlibre -t $out/bin + popd + + substituteInPlace $out/bin/projectlibre \ + --replace-fail "/usr/share/projectlibre" "$out/share/projectlibre" - substitute $resourcesPath/projectlibre $out/bin/projectlibre \ - --replace "\"/usr/share/projectlibre\"" "\"$out/share/projectlibre\"" - chmod +x $out/bin/projectlibre wrapProgram $out/bin/projectlibre \ - --prefix PATH : "${jre}/bin:${coreutils}/bin:${which}/bin" + --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} - cp -R openproj_build/dist/* $out/share/projectlibre - cp -R openproj_build/license $out/share/doc/projectlibre - cp $desktopItem $out/share/applications - cp $resourcesPath/projectlibre.png $out/share/pixmaps - cp -R $resourcesPath/samples/* $out/share/projectlibre/samples + runHook postInstall ''; - meta = with lib; { - homepage = "https://www.projectlibre.com/"; + meta = { description = "Project-Management Software similar to MS-Project"; + homepage = "https://www.projectlibre.com/"; + license = lib.licenses.cpal10; mainProgram = "projectlibre"; - maintainers = [ maintainers.Mogria ]; - license = licenses.cpal10; + maintainers = with lib.maintainers; [ + Mogria + tomasajt + ]; + platforms = jre.meta.platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/protonup-qt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/protonup-qt/default.nix index 24cc1f5438..8823744bf3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/protonup-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/protonup-qt/default.nix @@ -1,10 +1,10 @@ { appimageTools, fetchurl, lib }: let pname = "protonup-qt"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; - hash = "sha256-rT+vRYGE62SMBYhCsxYc9gnvKpOkqz0Qkr9QtKQx/Uc="; + hash = "sha256-d1UjyhU7BezOoQZBnmrk96gD0MbYST0XR+PWVYmvGFQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in @@ -12,7 +12,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} mkdir -p $out/share/{applications,pixmaps} cp ${appimageContents}/net.davidotek.pupgui2.desktop $out/share/applications/${pname}.desktop cp ${appimageContents}/net.davidotek.pupgui2.png $out/share/pixmaps/${pname}.png @@ -21,6 +20,8 @@ appimageTools.wrapType2 { --replace 'Icon=net.davidotek.pupgui2' 'Icon=${pname}' ''; + extraPkgs = pkgs: with pkgs; [ zstd ]; + meta = with lib; { homepage = "https://davidotek.github.io/protonup-qt/"; description = "Install and manage Proton-GE and Luxtorpeda for Steam and Wine-GE for Lutris with this graphical user interface."; diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix index 7952eadea6..b1e2a80617 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , boost , cereal , cgal @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix index 69483be06d..6a9c6e0e5f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -62,6 +62,6 @@ rustPlatform.buildRustPackage rec { ''; changelog = "https://github.com/Nukesor/pueue/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ sarcasticadmin ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix index 6d907fab0d..49be94cc2b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix @@ -13,7 +13,7 @@ , sqlite , tzdata , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , xvfb-run }: @@ -48,7 +48,7 @@ in python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix index e67a96fe7c..e8d216d391 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.29.4.1"; + version = "3.29.6.4"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-00lPgiE3hsP3SL96ygBP91CaAWi1IGOYUO7zC/ORG1U="; + hash = "sha256-/Tz3brcny9wp8DnCvO7GpPczglJpJD0kWzBR6exRlPA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/qtpass/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qtpass/default.nix index ae26de760e..d401a57dda 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qtpass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qtpass/default.nix @@ -23,9 +23,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; - # HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qt5.qtbase` - sandboxProfile = toString qtbase.__propagatedSandboxProfile; - qmakeFlags = [ # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too: "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" diff --git a/third_party/nixpkgs/pkgs/applications/misc/raider/default.nix b/third_party/nixpkgs/pkgs/applications/misc/raider/default.nix index 2152a7e6f2..6b15176a68 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/raider/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/raider/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "raider"; - version = "2.1.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "ADBeveridge"; repo = "raider"; rev = "v${version}"; - hash = "sha256-ZR40sbEKvZxGxRaV5H9D6kBP9ZgUdc425XgIhqidWLI="; + hash = "sha256-zqM2B1M7E4CRupd09rvFYG7H7wBd2hTWnjN3xadS36w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix b/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix index ff0ba6c0ed..f0c46f8c20 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchFromGitLab , autoconf, automake, gettext, intltool -, libtool, pkg-config, wrapGAppsHook, wrapPython, gobject-introspection +, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection , gtk3, python, pygobject3, pyxdg , withQuartz ? stdenv.isDarwin, ApplicationServices @@ -33,7 +33,7 @@ let intltool libtool pkg-config - wrapGAppsHook + wrapGAppsHook3 wrapPython gobject-introspection python diff --git a/third_party/nixpkgs/pkgs/applications/misc/regextester/default.nix b/third_party/nixpkgs/pkgs/applications/misc/regextester/default.nix index 05daa180d0..902ae57492 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/regextester/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/regextester/default.nix @@ -13,7 +13,7 @@ , gsettings-desktop-schemas , desktop-file-utils , pantheon -, wrapGAppsHook }: +, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "regextester"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmview/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmview/default.nix index 52ad1dce26..40ffc4df8b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmview/default.nix @@ -3,6 +3,7 @@ python3Packages.buildPythonApplication rec { pname = "rmview"; version = "3.1.3"; + pyproject = true; src = fetchFromGitHub { owner = "bordaigorl"; @@ -11,7 +12,7 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-V26zmu8cQkLs0IMR7eFO8x34McnT3xYyzlZfntApYkk="; }; - nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ]; + nativeBuildInputs = with python3Packages; [ pyqt5 setuptools wrapQtAppsHook ]; propagatedBuildInputs = with python3Packages; [ pyqt5 paramiko twisted pyjwt pyopenssl service-identity sshtunnel ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix index 585f7443ec..198922f187 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "remnote"; - version = "1.15.4"; + version = "1.16.4"; src = fetchurl { url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - hash = "sha256-6WBdTOj/seinx1wJGb/4if3PzCPmtzHyNAFmQwmsrvE="; + hash = "sha256-dgbQ0cbPq7BSQ9VwwH6+GoAxb85HDxRixfjeDJBtOrg="; }; appexec = appimageTools.wrapType2 { @@ -40,7 +40,7 @@ in installPhase = '' runHook preInstall - install -Dm755 ${appexec}/bin/remnote-${version} $out/bin/remnote + install -Dm755 ${appexec}/bin/remnote $out/bin/remnote install -Dm444 "${desktopItem}/share/applications/"* -t $out/share/applications/ install -Dm444 ${icon} $out/share/pixmaps/remnote.png diff --git a/third_party/nixpkgs/pkgs/applications/misc/remontoire/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remontoire/default.nix index 0aabaababf..754d32617e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/remontoire/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/remontoire/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , glib , gtk3 @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/resp-app/default.nix b/third_party/nixpkgs/pkgs/applications/misc/resp-app/default.nix index 9748ca63c2..efd2791893 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/resp-app/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/resp-app/default.nix @@ -77,6 +77,7 @@ mkDerivation rec { --replace '/opt/resp_app' "${placeholder "out"}" \ --replace 'target.path = $$LINUX_INSTALL_PATH' 'target.path = $$LINUX_INSTALL_PATH/bin' \ --replace '/usr/' "$out/" + rm -r 3rdparty/snappy ''; qmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix index ede6912a27..f4cbf40e3d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix @@ -17,14 +17,14 @@ buildPythonApplication rec { pname = "rofi-rbw"; - version = "1.3.0"; + version = "1.4.2"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofi-rbw"; rev = "refs/tags/${version}"; - hash = "sha256-aTMKwb4BLupY0UmvPC86RnElZ9DFep8sApaMrlGbJ0M="; + hash = "sha256-wUb89GkNB2lEfb42hMvcxpbjc1O+wx8AkFjq7aJwAko="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-top/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-top/default.nix index 328eca9da8..877cbd6a28 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi-top/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-top/default.nix @@ -8,7 +8,7 @@ , libgtop , pkg-config , rofi-unwrapped -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { autoreconfHook gobject-introspection pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix index 2f98fe1641..f8da5074b5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix @@ -1,4 +1,4 @@ -{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [], symlink-dmenu ? false }: +{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook3, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [], symlink-dmenu ? false }: symlinkJoin { name = "rofi-${rofi-unwrapped.version}"; @@ -7,7 +7,7 @@ symlinkJoin { rofi-unwrapped.out ] ++ (lib.forEach plugins (p: p.out)); - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook3 ]; buildInputs = [ gdk-pixbuf ]; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/rootbar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rootbar/default.nix index 41582e1b41..2ef92f1c9a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rootbar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rootbar/default.nix @@ -7,7 +7,7 @@ , json_c , libpulseaudio , wayland -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkg-config wrapGAppsHook + meson ninja pkg-config wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix b/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix index 39bb82aaae..87925d732e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix @@ -11,7 +11,7 @@ , testers , xprintidle , xprop -, wrapGAppsHook +, wrapGAppsHook3 }: with python3.pkgs; @@ -30,7 +30,7 @@ buildPythonApplication rec { ''; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix index 49fa61270b..aa76a65a17 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, nix-update-script -, vala, meson, ninja, pkg-config, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils +, vala, meson, ninja, pkg-config, pantheon, gettext, wrapGAppsHook3, python3, desktop-file-utils , gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-MsHHTYERe0v+u3KnVtx+jmJTKORJTJ7bNfJMZHV9Ly4="; }; - nativeBuildInputs = [ meson ninja pkg-config vala gettext wrapGAppsHook python3 desktop-file-utils ]; + nativeBuildInputs = [ meson ninja pkg-config vala gettext wrapGAppsHook3 python3 desktop-file-utils ]; buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libssh2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix b/third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix index 792f997c5f..1bcb2e4e10 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix @@ -9,7 +9,7 @@ , pkg-config , python3 , stdenv -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix index 1231d2fd47..2aeedcc25b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix @@ -4,7 +4,7 @@ , glib , meson , ninja -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , gobject-introspection , gtk3 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { glib meson ninja - wrapGAppsHook + wrapGAppsHook3 python3.pkgs.wrapPython python3 desktop-file-utils diff --git a/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix b/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix index 98e41bf73e..4442e79944 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix @@ -4,7 +4,7 @@ , gtk3 , gtksourceview4 , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , python3Packages }: @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = with python3Packages; [ @@ -67,6 +67,6 @@ python3Packages.buildPythonApplication rec { description = "ROM hacking tool for Pokémon Mystery Dungeon Explorers of Sky"; mainProgram = "skytemple"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix marius851000 ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/slic3r/default.nix b/third_party/nixpkgs/pkgs/applications/misc/slic3r/default.nix index 6695f53e99..102dc8f4b3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slic3r/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slic3r/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, perl, makeWrapper -, makeDesktopItem, which, perlPackages, boost, wrapGAppsHook +, makeDesktopItem, which, perlPackages, boost, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0="; }; - nativeBuildInputs = [ makeWrapper which wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper which wrapGAppsHook3 ]; buildInputs = [boost] ++ (with perlPackages; [ perl diff --git a/third_party/nixpkgs/pkgs/applications/misc/smpq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/smpq/default.nix deleted file mode 100644 index a1879241bd..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/smpq/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, stormlib }: - -stdenv.mkDerivation rec { - pname = "smpq"; - version = "1.6"; - - src = fetchurl { - url = "https://launchpad.net/smpq/trunk/${version}/+download/${pname}_${version}.orig.tar.gz"; - sha256 = "1jqq5x3b17jy66x3kkf5hs5l322dx2v14djxxrqrnqp8bn5drlmm"; - }; - - cmakeFlags = [ - "-DWITH_KDE=OFF" - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ stormlib ]; - - meta = with lib; { - description = "StormLib MPQ archiving utility"; - homepage = "https://launchpad.net/smpq"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = with maintainers; [ aanderse karolchmist ]; - mainProgram = "smpq"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix b/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix index 351a17c5fc..dc5fe5993f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook, fetchurl +{ lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook3, fetchurl , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups , gtk3, nss, glib, dbus, nspr, gdk-pixbuf, libdrm, mesa , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix index c82b0813f7..8029eee15f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/snapper-gui/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages -, gnome, gtk3, wrapGAppsHook, gtksourceview3, snapper +, gnome, gtk3, wrapGAppsHook3, gtksourceview3, snapper , gobject-introspection }: @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { sha256 = "13j4spbi9pxg69zifzai8ifk4207sn0vwh6vjqryi0snd5sylh7h"; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ python3 diff --git a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix index f3cd458510..4c2e59b2ab 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix @@ -3,7 +3,7 @@ , gobject-introspection , gtk3 , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , gdk-pixbuf , libappindicator , librsvg @@ -14,13 +14,13 @@ # instead of adding this to `services.udev.packages` on NixOS, python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.11"; + version = "1.1.13"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = "refs/tags/${version}"; - hash = "sha256-fVWfV7rEu/knysWUrPeokBBlSGnvNlpiptAd1M7ZVd8="; + hash = "sha256-sYJrVAeZi0a7yD0i/zIIxcu9X/c5HvgoI/n50eXD47s="; }; outputs = [ "out" "udev" ]; @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gdk-pixbuf gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/sqls/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sqls/default.nix index 5851ea4928..fe5735d0e5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sqls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sqls/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { description = "SQL language server written in Go"; mainProgram = "sqls"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ vinnymeller ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix index 062f106369..e94c84209f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ssw"; - version = "0.8"; + version = "0.10"; src = fetchurl { url = "https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-${version}.tar.gz"; - sha256 = "sha256-hYnYKY/PO1hQ0JaLBIAaT0D68FVVRPbMnZVLAWLplUs="; + sha256 = "sha256-gGkuw1AnGZXhR9x1mSnN1507ZF5rXvqmtX9NLQXoR+U="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix index 9e9df71ddf..423944cafb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix @@ -5,7 +5,7 @@ , meson , ninja , python3 -, wrapGAppsHook +, wrapGAppsHook3 , cinnamon , glib , gspell @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meson ninja python3.pkgs.wrapPython - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix index f46be1a243..f8ecf3694e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix @@ -4,7 +4,7 @@ , copyDesktopItems , writeText , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 , xvfb-run , qt6 }: @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication rec { python3Packages.poetry-core copyDesktopItems qt6.wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix b/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix index 6f2098ea47..2bb4184b43 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/survex/default.nix @@ -14,7 +14,7 @@ , pkg-config , proj , python3 -, wrapGAppsHook +, wrapGAppsHook3 , wxGTK32 }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { perl pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/swappy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/swappy/default.nix index b0cfc24aab..cb56e4281d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/swappy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/swappy/default.nix @@ -11,7 +11,7 @@ , scdoc , libnotify , glib -, wrapGAppsHook +, wrapGAppsHook3 , hicolor-icon-theme }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { hash = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo="; }; - nativeBuildInputs = [ glib meson ninja pkg-config scdoc wrapGAppsHook ]; + nativeBuildInputs = [ glib meson ninja pkg-config scdoc wrapGAppsHook3 ]; buildInputs = [ cairo pango gtk libnotify wayland glib hicolor-icon-theme diff --git a/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix index f377e493df..cd81fee9f1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.thehedgeh0g ]; + maintainers = [ maintainers.pyrox0 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix index b22c483f61..b2ea718d87 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , testers -, wrapGAppsHook +, wrapGAppsHook3 , bash-completion , dbus , dbus-glib @@ -12,9 +12,11 @@ , gobject-introspection , gtk-layer-shell , gtk3 +, gvfs , json-glib , libgee , libhandy +, libnotify , libpulseaudio , librsvg , meson @@ -55,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: rec { sassc scdoc vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -65,9 +67,11 @@ stdenv.mkDerivation (finalAttrs: rec { glib gtk-layer-shell gtk3 + gvfs json-glib libgee libhandy + libnotify libpulseaudio librsvg pantheon.granite diff --git a/third_party/nixpkgs/pkgs/applications/misc/swaysettings/default.nix b/third_party/nixpkgs/pkgs/applications/misc/swaysettings/default.nix index babd312d3e..490f004808 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/swaysettings/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/swaysettings/default.nix @@ -22,7 +22,7 @@ , python3 , stdenv , vala -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix index bc429817d5..4745a94230 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix @@ -6,6 +6,7 @@ , makeDesktopItem , jdk , ant +, stripJavaArchivesHook , gtk3 , gsettings-desktop-schemas , p7zip @@ -51,7 +52,7 @@ let find . -name '*.so' | xargs strings | { grep '/nix/store' || :; } >> ./.jar-paths ''; - nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook stripJavaArchivesHook ]; buildInputs = [ ant jdk p7zip gtk3 gsettings-desktop-schemas libXxf86vm ]; # upstream targets Java 7 by default diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix index f4fe14fb67..a426494b61 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix @@ -5,6 +5,7 @@ , makeDesktopItem , jdk , ant +, stripJavaArchivesHook , gtk3 , gsettings-desktop-schemas , sweethome3dApp @@ -33,7 +34,7 @@ let categories = [ "Graphics" "2DGraphics" "3DGraphics" ]; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper stripJavaArchivesHook ]; buildInputs = [ ant jdk gtk3 gsettings-desktop-schemas ]; # upstream targets Java 7 by default diff --git a/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 94dc95a466..096f0589ba 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, gtk3, glib, wrapGAppsHook, libusb1, hidapi, udev, pkg-config }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, gtk3, glib, wrapGAppsHook3, libusb1, hidapi, udev, pkg-config }: # system76-keyboard-configurator tries to spawn a daemon as root via pkexec, so # your system needs a PolicyKit authentication agent running for the @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config glib # for glib-compile-resources - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix index 44b6ccf760..922a7d19d4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.25.4"; + version = "0.26.0"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-M8tiEUPfP5EWfPp7i6r0lpHC5ZUsEYeEKVz5gUpe4+A="; + sha256 = "sha256-/OIBWUDMPMbCFLnoCJORgzlhUAqlFIItXQSzLTWZ7Jo="; }; - cargoHash = "sha256-B5peoyT/+miHXyoRGFLUv9qFzZZFsExrI46Zy0K7NL4="; + cargoHash = "sha256-JR6KX5x8BLfX8keofoYqS2eftCDoMLg25OMfTf0k53Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/terminal-stocks/default.nix b/third_party/nixpkgs/pkgs/applications/misc/terminal-stocks/default.nix index 9d1ee035d8..275e962737 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/terminal-stocks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/terminal-stocks/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "terminal-stocks"; - version = "1.0.16"; + version = "1.0.17"; src = fetchFromGitHub { owner = "shweshi"; repo = pname; rev = "v${version}"; - hash = "sha256-tu6SKeTVEqIqDJXimoSkMK9+l0uGqWSrlIO0KHoROSQ="; + hash = "sha256-hCKUUISn/TIr2o3ZtG2kSTgmUCut4NVzIzfIrg84PYI="; }; - npmDepsHash = "sha256-13RiEBLhmKW04Tesg1s7c9rCYtRGOd/prnVARb6jpGQ="; + npmDepsHash = "sha256-t71SfoPYVFLWcrjv2ErWazDeaVTO4W46g4lFler86Sc="; dontNpmBuild = true; passthru.updateScript = nix-update-script {}; diff --git a/third_party/nixpkgs/pkgs/applications/misc/themechanger/default.nix b/third_party/nixpkgs/pkgs/applications/misc/themechanger/default.nix index 652fe26785..e1c26828c9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/themechanger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/themechanger/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , glib , gtk3 @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix index ac50a46fde..18aa389ac1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix @@ -20,7 +20,7 @@ , libpthreadstubs , libXdmcp , libstartup_notification -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { pkg-config cmake gettext - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix index d61e0deabb..090d192b52 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { mainProgram = "tipp10"; homepage = "https://gitlab.com/tipp10/tipp10"; license = licenses.gpl2Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sigmanificient ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix b/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix index 351df8c558..16e266619f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix @@ -22,13 +22,10 @@ in appimageTools.wrapAppImage { inherit pname version; src = appimageContents; - extraPkgs = { pkgs, ... }@args: [ - pkgs.hidapi - ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; + extraPkgs = pkgs: [ pkgs.hidapi ]; extraInstallCommands = '' # Add desktop convencience stuff - mv $out/bin/{${pname}-*,${pname}} install -Dm444 ${appimageContents}/todoist.desktop -t $out/share/applications install -Dm444 ${appimageContents}/todoist.png -t $out/share/pixmaps substituteInPlace $out/share/applications/todoist.desktop \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix index f03ea6eaed..50c838ed9b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "transifex-cli"; - version = "1.6.10"; + version = "1.6.12"; src = fetchFromGitHub { owner = "transifex"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-76nmlZFLon9EquM7tQ/PReM1rxkzh7x1rNdaP3n4KKg="; + sha256 = "sha256-k26z/eFXjNijoth/hWXPfCv4/z6row9DRc9SEtnnX1o="; }; vendorHash = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix index d4a74e6bdb..a67742aa63 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-fspqUzF3QqFpd16J1dbcNMdqjcR3PIiRu/s+VB4KgwQ="; + sha256 = "sha256-5v3Eu85x3xNvTRgfxhlDz4hiJ4UO010pZPY7UPHk7mQ="; }; - cargoHash = "sha256-dvzm9lbVGGM4t6KZcHSlqwo55jssxi8HyFREMaj5I0Q="; + cargoHash = "sha256-+jYl/oUeJaABgDX/OBTyeo/B7RYc2MUTreU1ySLG0XQ="; meta = with lib; { description = "A CLI tool to manage todo lists in todo.txt format"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix index 9c70ab85ae..b99b76511b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix @@ -21,18 +21,19 @@ , libsecret , libwebp , libspelling +, icu , gst_all_1 , nix-update-script }: stdenv.mkDerivation rec { pname = "tuba"; - version = "0.6.3"; + version = "0.7.2"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-AdUXKiTMC/0R4RI9I9Y/x0mNwhtUEIBke4Mm9lu9CX8="; + hash = "sha256-PRbepitFSvdw/7y5VlnSdsQwnlTQg4ktM4t1/x6SmAY="; }; nativeBuildInputs = [ @@ -59,6 +60,7 @@ stdenv.mkDerivation rec { libsecret libwebp libspelling + icu ] ++ (with gst_all_1; [ gstreamer gst-libav diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix index b3334c59c4..759ad401ed 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix @@ -8,7 +8,7 @@ , glib , gtk3 , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , fetchFromGitHub }: @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ pkg-config meson ninja appstream-glib desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix index 639c46b9bd..102b9ad354 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-qHNB+jRLQoiHPuTblpCHg2+6e5j8W6YPsuygRlTidtE="; + hash = "sha256-SgpIR7gLfmX6mCtuqRonqzX07Eblp9Mq80y71b05FZY="; }; - cargoHash = "sha256-T+fXSca1u9+c305yuKOF+soxnSZ1YbBs57wco5TLpQw="; + cargoHash = "sha256-SetNhIengAiLRMHoYBRxHR1LgzYywRC7L6hmRF9COik="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/misc/twitch-chat-downloader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/twitch-chat-downloader/default.nix index a602c31008..459a47bfca 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/twitch-chat-downloader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/twitch-chat-downloader/default.nix @@ -34,6 +34,6 @@ buildPythonApplication rec { mainProgram = "tcd"; homepage = "https://github.com/TheDrHax/Twitch-Chat-Downloader"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/tzupdate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tzupdate/default.nix index 7ca8c9f973..1bd2eece18 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tzupdate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tzupdate/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { description = "Update timezone information based on geoip"; mainProgram = "tzupdate"; homepage = "https://github.com/cdown/tzupdate"; - maintainers = [ maintainers.michaelpj ]; + maintainers = [ ]; license = licenses.unlicense; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix b/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix index 94ea64d379..7df3f1d23b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix @@ -9,7 +9,7 @@ , librsvg , python3 , udisks2 -, wrapGAppsHook +, wrapGAppsHook3 , testers , udiskie }: @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection installShellFiles python3.pkgs.setuptools - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index 080e96359e..9c455fa6ba 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix @@ -7,7 +7,7 @@ , gnome , gobject-introspection , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , webkitgtk , libnotify , keybinder3 @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { distutils-extra gobject-introspection intltool - wrapGAppsHook + wrapGAppsHook3 gdk-pixbuf ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/unipicker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/unipicker/default.nix deleted file mode 100644 index e13d27ce44..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/unipicker/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchFromGitHub, lib, fzf, xclip }: - -stdenv.mkDerivation rec { - pname = "unipicker"; - version = "2.0.1"; - - src = fetchFromGitHub { - owner = "jeremija"; - repo = pname; - rev = "v${version}"; - sha256 = "1k4v53pm3xivwg9vq2kndpcmah0yn4679r5jzxvg38bbkfdk86c1"; - }; - - buildInputs = [ - fzf - xclip - ]; - - preInstall = '' - substituteInPlace unipicker \ - --replace "/etc/unipickerrc" "$out/etc/unipickerrc" \ - --replace "fzf" "${fzf}/bin/fzf" - substituteInPlace unipickerrc \ - --replace "/usr/local" "$out" \ - --replace "fzf" "${fzf}/bin/fzf" - ''; - - makeFlags = [ - "PREFIX=$(out)" - "DESTDIR=$(out)" - ]; - - meta = with lib; { - description = "A CLI utility for searching unicode characters by description and optionally copying them to clipboard"; - homepage = "https://github.com/jeremija/unipicker"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - mainProgram = "unipicker"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix b/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix index e1cf49f61a..6375b25372 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, dpkg, wrapGAppsHook, autoPatchelfHook +{ lib, stdenv, requireFile, dpkg, wrapGAppsHook3, autoPatchelfHook , alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11, libxcb , libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg - wrapGAppsHook + wrapGAppsHook3 autoPatchelfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix index 3715ef2752..2247344ba7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "urlscan"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OzcoOIgEiadWrsUPIxBJTuZQYjScJBYKyqCu1or6fz8="; + hash = "sha256-nyq4BrpfbZwK/nOnB8ZEN1wlM8CssYVRvV7ytpX7k40="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix b/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix index 4e07cf6282..b65d2b36e3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { homepage = "https://valent.andyholmes.ca"; changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md"; license = with lib.licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; - maintainers = with lib.maintainers; [ aleksana federicoschonborn ]; + maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix b/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix index e26496718f..e90a8e9a1e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix @@ -10,7 +10,7 @@ , librsvg , python3 , runtimeShell -, wrapGAppsHook +, wrapGAppsHook3 , fehSupport ? false , feh , imagemagickSupport ? true @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ intltool - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/veracrypt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/veracrypt/default.nix index 66aca8645a..a7b0eed903 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/veracrypt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/veracrypt/default.nix @@ -13,7 +13,7 @@ , ntfs3g , btrfs-progs , pcsclite -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { sourceRoot = "src"; - nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook ]; + nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook3 ]; buildInputs = [ fuse lvm2 wxGTK pcsclite ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/viking/default.nix b/third_party/nixpkgs/pkgs/applications/misc/viking/default.nix index 8a987ed246..1335d95040 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/viking/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/viking/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch , desktopToDarwinBundle -, docbook_xml_dtd_45, docbook_xsl, intltool, itstool, libxslt, pkg-config, wrapGAppsHook, yelp-tools +, docbook_xml_dtd_45, docbook_xsl, intltool, itstool, libxslt, pkg-config, wrapGAppsHook3, yelp-tools , curl, gdk-pixbuf, gtk3, json-glib, libxml2 , gpsbabel , withGeoClue ? true, geoclue2 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook yelp-tools ] + nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook3 yelp-tools ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ curl gdk-pixbuf gtk3 json-glib libxml2 ] diff --git a/third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix b/third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix index b54df7e951..f03de6d9e6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , pkg-config, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg -, dbus-glib, autoreconfHook, wrapGAppsHook }: +, dbus-glib, autoreconfHook, wrapGAppsHook3 }: stdenv.mkDerivation { pname = "volnoti-unstable"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 ]; buildInputs = [ dbus gdk-pixbuf glib libX11 gtk2 dbus-glib librsvg @@ -33,6 +33,6 @@ stdenv.mkDerivation { homepage = "https://github.com/davidbrazdil/volnoti"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.gilligan ]; + maintainers = []; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix deleted file mode 100644 index d4122e6571..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ /dev/null @@ -1,211 +0,0 @@ -{ lib -, stdenv -, bash -, fetchFromGitHub -, fetchFromGitLab -, SDL2 -, alsa-lib -, catch2_3 -, fftw -, glib -, gobject-introspection -, gtk-layer-shell -, gtkmm3 -, howard-hinnant-date -, hyprland -, iniparser -, jsoncpp -, libdbusmenu-gtk3 -, libevdev -, libinotify-kqueue -, libinput -, libjack2 -, libmpdclient -, libnl -, libpulseaudio -, libsigcxx -, libxkbcommon -, meson -, ncurses -, ninja -, pipewire -, pkg-config -, playerctl -, portaudio -, python3 -, scdoc -, sndio -, spdlog -, sway -, udev -, upower -, wayland -, wireplumber -, wrapGAppsHook - -, cavaSupport ? true -, evdevSupport ? true -, experimentalPatches ? true -, hyprlandSupport ? true -, inputSupport ? true -, jackSupport ? true -, mpdSupport ? true -, mprisSupport ? stdenv.isLinux -, nlSupport ? true -, pipewireSupport ? true -, pulseSupport ? true -, rfkillSupport ? true -, runTests ? true -, sndioSupport ? true -, swaySupport ? true -, traySupport ? true -, udevSupport ? true -, upowerSupport ? true -, wireplumberSupport ? true -, withMediaPlayer ? mprisSupport && false -, nix-update-script -}: - -let - # Derived from subprojects/cava.wrap - libcava.src = fetchFromGitHub { - owner = "LukashonakV"; - repo = "cava"; - rev = "0.10.1"; - hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw="; - }; - - wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec { - version = "0.4.17"; - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pipewire"; - repo = "wireplumber"; - rev = version; - hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI="; - }; - }); -in -stdenv.mkDerivation (finalAttrs: { - pname = "waybar"; - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "Alexays"; - repo = "Waybar"; - rev = finalAttrs.version; - hash = "sha256-p1VRrKT2kTDy48gDXPMHlLbfcokAOFeTZXGzTeO1SAE="; - }; - - postUnpack = lib.optional cavaSupport '' - pushd "$sourceRoot" - cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.1 - patchShebangs . - popd - ''; - - nativeBuildInputs = [ - meson - ninja - pkg-config - scdoc - wrapGAppsHook - ] ++ lib.optional withMediaPlayer gobject-introspection; - - propagatedBuildInputs = lib.optionals withMediaPlayer [ - glib - playerctl - python3.pkgs.pygobject3 - ]; - - strictDeps = false; - - buildInputs = [ - gtk-layer-shell - gtkmm3 - howard-hinnant-date - jsoncpp - libsigcxx - libxkbcommon - spdlog - wayland - ] - ++ lib.optionals cavaSupport [ - SDL2 - alsa-lib - fftw - iniparser - ncurses - portaudio - ] - ++ lib.optional evdevSupport libevdev - ++ lib.optional hyprlandSupport hyprland - ++ lib.optional inputSupport libinput - ++ lib.optional jackSupport libjack2 - ++ lib.optional mpdSupport libmpdclient - ++ lib.optional mprisSupport playerctl - ++ lib.optional nlSupport libnl - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional sndioSupport sndio - ++ lib.optional swaySupport sway - ++ lib.optional traySupport libdbusmenu-gtk3 - ++ lib.optional udevSupport udev - ++ lib.optional upowerSupport upower - ++ lib.optional wireplumberSupport wireplumber_0_4 - ++ lib.optional (cavaSupport || pipewireSupport) pipewire - ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; - - nativeCheckInputs = [ catch2_3 ]; - doCheck = runTests; - - mesonFlags = (lib.mapAttrsToList lib.mesonEnable { - "cava" = cavaSupport; - "dbusmenu-gtk" = traySupport; - "jack" = jackSupport; - "libinput" = inputSupport; - "libnl" = nlSupport; - "libudev" = udevSupport; - "man-pages" = true; - "mpd" = mpdSupport; - "mpris" = mprisSupport; - "pipewire" = pipewireSupport; - "pulseaudio" = pulseSupport; - "rfkill" = rfkillSupport; - "sndio" = sndioSupport; - "systemd" = false; - "tests" = runTests; - "upower_glib" = upowerSupport; - "wireplumber" = wireplumberSupport; - }) ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); - - postPatch = '' - substituteInPlace include/util/command.hpp \ - --replace-fail /bin/sh ${lib.getExe' bash "sh"} - ''; - - preFixup = lib.optionalString withMediaPlayer '' - cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py - - wrapProgram $out/bin/waybar-mediaplayer.py \ - --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" - ''; - - passthru.updateScript = nix-update-script { }; - - meta = { - homepage = "https://github.com/alexays/waybar"; - description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; - changelog = "https://github.com/alexays/waybar/releases/tag/${finalAttrs.version}"; - license = lib.licenses.mit; - mainProgram = "waybar"; - maintainers = with lib.maintainers; [ - FlorianFranzen - lovesegfault - minijackson - rodrgz - synthetica - khaneliman - ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/waypaper/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waypaper/default.nix index 36f79865d3..a8dae96642 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waypaper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/waypaper/default.nix @@ -2,24 +2,24 @@ , python3 , fetchFromGitHub , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , killall }: python3.pkgs.buildPythonApplication rec { pname = "waypaper"; - version = "2.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "anufrievroman"; repo = "waypaper"; rev = "refs/tags/${version}"; - hash = "sha256-AIOrn5I0WX8S4iaK6mVEbdn1tQiED0JYA0GXDXJ6eNE="; + hash = "sha256-GB+H2kZr1+UhhGFpfXc3V4DPXjvHBdg6EKNEFhjKEHk="; }; nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/wmenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wmenu/default.nix index 748c2d3b84..72d437f74c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wmenu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wmenu/default.nix @@ -9,13 +9,14 @@ , pango , wayland , wayland-protocols +, wayland-scanner , libxkbcommon , scdoc }: stdenv.mkDerivation rec { pname = "wmenu"; - version = "0.1.7"; + version = "0.1.8"; strictDeps = true; @@ -23,18 +24,10 @@ stdenv.mkDerivation rec { owner = "~adnano"; repo = "wmenu"; rev = version; - hash = "sha256-9do7zL7yaZuqVjastySwjsByo5ja+KUP3590VjIyVnI="; + hash = "sha256-gVoqRHQ5bcY58LTgKxpPM1PnZJrLRoSOJUiYYqc/vRI="; }; - # Upstream patch needed to fix NULL deref - patches = [ - (fetchpatch { - url = "https://git.sr.ht/~adnano/wmenu/commit/2856dddcac861ddf248143e66ba164d7aa05a0bb.patch"; - hash = "sha256-P7SEjMssA8unNAlrgrTHm0uW5pefjpupPb4s/u2fTAM="; - }) - ]; - - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ]; buildInputs = [ cairo pango wayland libxkbcommon wayland-protocols scdoc ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/wofi-emoji/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wofi-emoji/default.nix index 38f0f83181..81ba584cc2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wofi-emoji/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wofi-emoji/default.nix @@ -1,22 +1,37 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, jq, wofi, wtype, wl-clipboard }: +{ + stdenv, + lib, + fetchurl, + fetchFromGitHub, + jq, + wofi, + wtype, + wl-clipboard, +}: -let emojiJSON = fetchurl { - url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.10/dist/emoji-en-US.json"; - hash = "sha256-UhAB5hVp5vV2d1FjIb2TBd2FJ6OPBbiP31HGAEDQFnA=";}; +let + emojiJSON = fetchurl { + url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.11/dist/emoji-en-US.json"; + hash = "sha256-WHqCSNgDzc6ZASdVrwPvsU4MtBcYLKDp2D2Hykrq1sI="; + }; in stdenv.mkDerivation rec { pname = "wofi-emoji"; - version = "unstable-2023-12-22"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Zeioth"; - repo = pname; - rev = "2cc95880848134a3bbe0675bcb62a0dae1d0f572"; - hash = "sha256-t9M8z8JxuvBDzNs98L7YTNUfTK23W1DYGdHDiXNQOgk="; + repo = "wofi-emoji"; + rev = "v${version}"; + hash = "sha256-wLZK7RcDxxlYuu27WNj+SoRoBiCqk9whp4Fyg0SOoPA="; }; nativeBuildInputs = [ jq ]; - buildInputs = [ wofi wtype wl-clipboard ]; + buildInputs = [ + wofi + wtype + wl-clipboard + ]; postPatch = '' substituteInPlace build.sh \ @@ -44,12 +59,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Simple emoji selector for Wayland using wofi and wl-clipboard"; homepage = "https://github.com/Zeioth/wofi-emoji"; - license = licenses.mit; - maintainers = [ maintainers.ymarkus ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ johnrtitor ymarkus ]; + platforms = lib.platforms.all; mainProgram = "wofi-emoji"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix index 30e7072644..fc124c56eb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix @@ -6,7 +6,7 @@ , ninja , wayland , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , installShellFiles }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { vc = "hg"; }; - nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; + nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook3 installShellFiles ]; buildInputs = [ wayland gtk3 ]; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/workrave/default.nix b/third_party/nixpkgs/pkgs/applications/misc/workrave/default.nix index c4a5e692cf..ebe09f8b86 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/workrave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/workrave/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , autoconf , autoconf-archive , automake @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { intltool libtool pkg-config - wrapGAppsHook + wrapGAppsHook3 jinja2 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xautoclick/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xautoclick/default.nix index 3429e80f05..68daf189fc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xautoclick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xautoclick/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, xorg, pkg-config , cmake, libevdev -, gtkSupport ? true, gtk3, pcre, glib, wrapGAppsHook +, gtkSupport ? true, gtk3, pcre, glib, wrapGAppsHook3 , fltkSupport ? true, fltk , qtSupport ? true, qt5 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libevdev xorg.libXtst ] - ++ lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook ] + ++ lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook3 ] ++ lib.optionals fltkSupport [ fltk ] ++ lib.optionals qtSupport [ qt5.qtbase qt5.wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix index 130b97189a..f2953805ff 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix @@ -6,7 +6,7 @@ , pango , python3Packages , txt2tags -, wrapGAppsHook +, wrapGAppsHook3 , gitUpdater }: @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection txt2tags - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/xiphos/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xiphos/default.nix index 994127baca..83690f129b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xiphos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xiphos/default.nix @@ -23,7 +23,7 @@ , pkg-config , sword , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , yelp-tools , zip }: @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { itstool libxslt pkg-config - wrapGAppsHook + wrapGAppsHook3 yelp-tools # for yelp-build zip # for building help epubs ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix index db7bdd4fc7..ff9965c340 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.21.2"; + version = "6.21.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-0ej2+g+B9K50JIs0wi1SfLBsaYTsk+0/cImLLZLNtmc="; + hash = "sha256-1lIrxJ1Y5YRoXbZn77Msah5lSVW71gDczYUlXQjf01s="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/xneur/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xneur/default.nix index e282d84f9c..6f99290c51 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xneur/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xneur/default.nix @@ -5,7 +5,7 @@ , autoreconfHook , intltool , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , enchant , gdk-pixbuf , glib @@ -29,7 +29,7 @@ stdenv.mkDerivation { autoreconfHook intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/xpad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xpad/default.nix index 13b29491bf..d945ae7ff0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xpad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xpad/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, autoreconfHook, pkg-config, wrapGAppsHook +, autoreconfHook, pkg-config, wrapGAppsHook3 , glib, intltool, gtk3, gtksourceview }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook intltool ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 intltool ]; buildInputs = [ glib gtk3 gtksourceview ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix index ee679a630b..378db968c9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix @@ -32,14 +32,14 @@ assert (x11Support || waylandSupport); stdenv.mkDerivation (finalAttrs: { pname = "yambar"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "yambar"; rev = finalAttrs.version; - hash = "sha256-+bNTEPGV5xaVXhsejyK+FCcJ9J06KS6x7/qo6P2DnZI="; + hash = "sha256-QCwwMpBYuMWYqxE2ugPFpG/QtZDW7VsSBYs5EqKYejA="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix index 3b529c18f5..8b452c7f1a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, meson, ninja, wrapGAppsHook, pkg-config, gitUpdater +{ lib, stdenv, fetchFromGitLab, meson, ninja, wrapGAppsHook3, pkg-config, gitUpdater , appstream-glib, json-glib, desktop-file-utils, python3 , gtk, girara, gettext, libxml2, check , sqlite, glib, texlive, libintl, libseccomp @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils python3.pythonOnBuildForHost.pkgs.sphinx - gettext wrapGAppsHook libxml2 appstream-glib + gettext wrapGAppsHook3 libxml2 appstream-glib ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix index 75e310cdff..593ca13f9f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix @@ -1,6 +1,6 @@ -{ callPackage, texliveMedium }: +{ callPackage }: -builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texliveMedium; })) { +builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { zettlr = { version = "3.0.2"; hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix index 0b26d57e7c..847d11c4f2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix @@ -4,28 +4,24 @@ , appimageTools , lib , fetchurl -, texliveMedium -, pandoc }: # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; inherit hash; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; + + extraPkgs = pkgs: [ pkgs.texliveMedium pkgs.pandoc ]; - multiArch = false; # no 32bit needed - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ]; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png substituteInPlace $out/share/applications/Zettlr.desktop \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix index b7eca10fc7..a83742cf93 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix @@ -6,7 +6,7 @@ let in appimageTools.wrapType2 rec { - name = "${pname}-${version}"; + inherit pname version; src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; @@ -17,10 +17,6 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - multiArch = false; # no 32bit needed - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; - extraInstallCommands = "mv $out/bin/{${name},${pname}}"; - meta = with lib; { description = "Sylk WebRTC client"; homepage = "https://sylkserver.com/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix index a6e0f5d588..63d45b86fa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.11.4"; + version = "1.11.5"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-0YS+q1gy7YmTx/DwxaElBG1tzosXReXqPu6RpR3hTjw="; + hash = "sha256-IZ4Q67b+VsmBN/NEBPDzN2PYO8cVfLpHBU0tCo+v3Xc="; }; - vendorHash = "sha256-et1PVLJQ/vBsg5438s6d9MA2oV40zahp9YKQOE0RX58="; + vendorHash = "sha256-z6MF/Kb///BSirdRycNs+7SMThv+yS7WmcrIcgiwBNg="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/badwolf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/badwolf/default.nix index 5772586d8d..dabbdf8981 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/badwolf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/badwolf/default.nix @@ -4,7 +4,7 @@ , ninja , pkg-config , ed -, wrapGAppsHook +, wrapGAppsHook3 , webkitgtk , libxml2 , glib-networking @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ninja pkg-config ed - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index daed65d0c2..2f105dbcd7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) if stdenv.isAarch64 then { pname = "brave"; - version = "1.64.122"; - url = "https://github.com/brave/brave-browser/releases/download/v1.64.122/brave-browser_1.64.122_arm64.deb"; - hash = "sha256-PBYiCTy/QaPfxvWAzUnXLEzBELISNSKX0kG/mYTDDEA="; + version = "1.65.126"; + url = "https://github.com/brave/brave-browser/releases/download/v1.65.126/brave-browser_1.65.126_arm64.deb"; + hash = "sha256-v2PbixM9g+AhvR6tJ9QDbaXF7ERlBBrNMIsLofFbAfU="; platform = "aarch64-linux"; } else if stdenv.isx86_64 then { pname = "brave"; - version = "1.64.122"; - url = "https://github.com/brave/brave-browser/releases/download/v1.64.122/brave-browser_1.64.122_amd64.deb"; - hash = "sha256-9tSoOn9XGbX/b8n9vD9Hmpi26jzmUVJomoCFdSJoaoU="; + version = "1.65.126"; + url = "https://github.com/brave/brave-browser/releases/download/v1.65.126/brave-browser_1.65.126_amd64.deb"; + hash = "sha256-DbdwCu9LwCeoH46egVY4AsOxcJDWilD2MdpyNdyJizw="; platform = "x86_64-linux"; } else diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix index 8fde41e60a..f0b9fb6cf0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook, makeWrapper +{ lib, stdenv, fetchurl, wrapGAppsHook3, makeWrapper , alsa-lib , at-spi2-atk , at-spi2-core @@ -112,7 +112,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ dpkg - (wrapGAppsHook.override { inherit makeWrapper; }) + (wrapGAppsHook3.override { inherit makeWrapper; }) ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix index 6d35a7091e..f02ae0f6e0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix @@ -2,7 +2,7 @@ , fetchFromSourcehut , rustPlatform , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , openssl , gtk3 , gdk-pixbuf @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index df33a2bbe7..259309757b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch , recompressTarball , buildPackages +, buildPlatform , pkgsBuildBuild , pkgsBuildTarget # Channel data: @@ -114,9 +115,6 @@ let # "opus" ]; - opusWithCustomModes = libopus.override { - withCustomModes = true; - }; # build paths and release info packageName = extraAttrs.packageName or extraAttrs.name; @@ -175,7 +173,6 @@ let buildPlatformLlvmStdenv.cc pkg-config libuuid - (libpng.override { apngSupport = false; }) # needed for "host/generate_colors_info" ] # When cross-compiling, chromium builds a huge proportion of its # components for both the `buildPlatform` (which it calls @@ -183,12 +180,39 @@ let # half of the dependencies are needed here. To avoid having to # maintain a separate list of buildPlatform-dependencies, we # simply throw in the kitchen sink. - ++ buildInputs - ; + # ** Because of overrides, we have to copy the list as it otherwise mess with splicing ** + ++ [ + (buildPackages.libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 + (buildPackages.libopus.override { withCustomModes = true; }) + bzip2 flac speex + libevent expat libjpeg snappy + libcap + minizip libwebp + libusb1 re2 + ffmpeg libxslt libxml2 + nasm + nspr nss + util-linux alsa-lib + libkrb5 + glib gtk3 dbus-glib + libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL + mesa # required for libgbm + pciutils protobuf speechd libXdamage at-spi2-core + pipewire + libva + libdrm wayland mesa.drivers libxkbcommon + curl + libepoxy + libffi + libevdev + ] ++ lib.optional systemdSupport systemd + ++ lib.optionals cupsSupport [ libgcrypt cups ] + ++ lib.optional pulseSupport libpulseaudio; buildInputs = [ - (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 - bzip2 flac speex opusWithCustomModes + (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 + (libopus.override { withCustomModes = true; }) + bzip2 flac speex libevent expat libjpeg snappy libcap minizip libwebp @@ -217,8 +241,26 @@ let ./patches/cross-compile.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): ./patches/no-build-timestamps.patch - # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: - ./patches/widevine-79.patch + ] ++ lib.optionals (packageName == "chromium") [ + # This patch is limited to chromium and ungoogled-chromium because electron-source sets + # enable_widevine to false. + # + # The patch disables the automatic Widevine download (component) that happens at runtime + # completely (~/.config/chromium/WidevineCdm/). This would happen if chromium encounters DRM + # protected content or when manually opening chrome://components. + # + # It also prevents previously downloaded Widevine blobs in that location from being loaded and + # used at all, while still allowing the use of our -wv wrapper. This is because those old + # versions are out of out our control and may be vulnerable, given we literally disable their + # auto updater. + # + # bundle_widevine_cdm is available as gn flag, but we cannot use it, as it expects a bunch of + # files Widevine files at configure/compile phase that we don't have. Changing the value of the + # BUNDLE_WIDEVINE_CDM build flag does work in the way we want though. + # We also need enable_widevine_cdm_component to be false. Unfortunately it isn't exposed as gn + # flag (declare_args) so we simply hardcode it to false. + ./patches/widevine-disable-auto-download-allow-bundle.patch + ] ++ [ # Required to fix the build with a more recent wayland-protocols version # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21): # Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1 @@ -248,15 +290,6 @@ let # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61 # allowing us to use our rustc and our clang. ./patches/chromium-121-rust.patch - ] ++ lib.optionals (chromiumVersionAtLeast "124" && !chromiumVersionAtLeast "125") [ - # M124 shipped with broken --ozone-platform-hint flag handling, which we rely on - # for our NIXOS_OZONE_WL (wayland) environment variable. - # See . - # This is the commit for the fix that landed in M125, which applies clean on M124. - (githubPatch { - commit = "c7f4c58f896a651eba80ad805ebdb49d19ebdbd4"; - hash = "sha256-6nYWT2zN+j73xAIXLdGYT2eC71vGnGfiLCB0OwT0CAI="; - }) ]; postPatch = '' @@ -403,10 +436,11 @@ let # Feature overrides: # Native Client support was deprecated in 2020 and support will end in June 2021: enable_nacl = false; - # Enabling the Widevine component here doesn't affect whether we can - # redistribute the chromium package; the Widevine component is either - # added later in the wrapped -wv build or downloaded from Google: + } // lib.optionalAttrs (packageName == "chromium") { + # Enabling the Widevine here doesn't affect whether we can redistribute the chromium package. + # Widevine in this drv is a bit more complex than just that. See Widevine patch somewhere above. enable_widevine = true; + } // { # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture: rtc_use_pipewire = true; # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index 9da0f725ed..afd25b972d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -5,6 +5,7 @@ , libva, pipewire, wayland , gcc, nspr, nss, runCommand , lib, libkrb5 +, widevine-cdm , electron-source # for warnObsoleteVersionConditional # package customization @@ -74,78 +75,6 @@ let ungoogled-chromium = pkgsBuildBuild.callPackage ./ungoogled.nix {}; }; - pkgSuffix = if channel == "dev" then "unstable" else - (if channel == "ungoogled-chromium" then "stable" else channel); - pkgName = "google-chrome-${pkgSuffix}"; - chromeSrc = - let - # Use the latest stable Chrome version if necessary: - version = if chromium.upstream-info.hash_deb_amd64 != null - then chromium.upstream-info.version - else (import ./upstream-info.nix).stable.version; - hash = if chromium.upstream-info.hash_deb_amd64 != null - then chromium.upstream-info.hash_deb_amd64 - else (import ./upstream-info.nix).stable.hash_deb_amd64; - in fetchurl { - urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ - "https://dl.google.com/linux/chrome/deb/pool/main/g" - "http://95.31.35.30/chrome/pool/main/g" - "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" - "http://repo.fdzh.org/chrome/deb/pool/main/g" - ]; - inherit hash; - }; - - mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; - widevineCdm = stdenv.mkDerivation { - name = "chrome-widevine-cdm"; - - src = chromeSrc; - - unpackCmd = let - widevineCdmPath = - if (channel == "stable" || channel == "ungoogled-chromium") then - "./opt/google/chrome/WidevineCdm" - else if channel == "beta" then - "./opt/google/chrome-beta/WidevineCdm" - else if channel == "dev" then - "./opt/google/chrome-unstable/WidevineCdm" - else - throw "Unknown chromium channel."; - in '' - # Extract just WidevineCdm from upstream's .deb file - ar p "$src" data.tar.xz | tar xJ "${widevineCdmPath}" - - # Move things around so that we don't have to reference a particular - # chrome-* directory later. - mv "${widevineCdmPath}" ./ - - # unpackCmd wants a single output directory; let it take WidevineCdm/ - rm -rf opt - ''; - - doCheck = true; - checkPhase = '' - ! find -iname '*.so' -exec ldd {} + | grep 'not found' - ''; - - PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ]; - - patchPhase = '' - patchelf --set-rpath "$PATCH_RPATH" _platform_specific/linux_x64/libwidevinecdm.so - ''; - - installPhase = '' - mkdir -p $out/WidevineCdm - cp -a * $out/WidevineCdm/ - ''; - - meta = { - platforms = [ "x86_64-linux" ]; - license = lib.licenses.unfree; - }; - }; - suffix = lib.optionalString (channel != "stable" && channel != "ungoogled-chromium") ("-" + channel); sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; @@ -159,7 +88,7 @@ let mkdir -p $out cp -a ${browser}/* $out/ chmod u+w $out/libexec/chromium - cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/ + cp -a ${widevine-cdm}/share/google/chrome/WidevineCdm $out/libexec/chromium/ '' else browser; @@ -244,7 +173,7 @@ in stdenv.mkDerivation { passthru = { inherit (chromium) upstream-info browser; mkDerivation = chromium.mkChromiumDerivation; - inherit chromeSrc sandboxExecutableName; + inherit sandboxExecutableName; }; } # the following is a complicated and long-winded variant of diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch deleted file mode 100644 index 32f0ae2fb5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn -index ed0e2f5208b..5b431a030d5 100644 ---- a/third_party/widevine/cdm/BUILD.gn -+++ b/third_party/widevine/cdm/BUILD.gn -@@ -14,7 +14,7 @@ buildflag_header("buildflags") { - - flags = [ - "ENABLE_WIDEVINE=$enable_widevine", -- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm", -+ "BUNDLE_WIDEVINE_CDM=true", - "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", - ] - } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch new file mode 100644 index 0000000000..d4f16d26b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch @@ -0,0 +1,27 @@ +diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn +index 525693b6c10ab..245491e137d39 100644 +--- a/third_party/widevine/cdm/BUILD.gn ++++ b/third_party/widevine/cdm/BUILD.gn +@@ -22,7 +22,7 @@ buildflag_header("buildflags") { + + flags = [ + "ENABLE_WIDEVINE=$enable_widevine", +- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm", ++ "BUNDLE_WIDEVINE_CDM=true", + "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", + "ENABLE_MEDIA_FOUNDATION_WIDEVINE_CDM=$enable_media_foundation_widevine_cdm", + ] +diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni +index 58f073ca562ca..4b242c2618dfb 100644 +--- a/third_party/widevine/cdm/widevine.gni ++++ b/third_party/widevine/cdm/widevine.gni +@@ -41,8 +41,7 @@ enable_library_widevine_cdm = + # Widevine CDM can be deployed as a component. Currently only supported on + # desktop platforms. The CDM can be bundled regardless whether + # it's a component. See below. +-enable_widevine_cdm_component = +- enable_library_widevine_cdm && (is_win || is_mac || is_linux || is_chromeos) ++enable_widevine_cdm_component = false + + # Enable (Windows) Media Foundation Widevine CDM component. + declare_args() { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py index 29a46cd688..d92a9dae8a 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py @@ -20,7 +20,6 @@ from os.path import abspath, dirname from urllib.request import urlopen RELEASES_URL = 'https://versionhistory.googleapis.com/v1/chrome/platforms/linux/channels/all/versions/all/releases' -DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' PIN_PATH = dirname(abspath(__file__)) + '/upstream-info.nix' UNGOOGLED_FLAGS_PATH = dirname(abspath(__file__)) + '/ungoogled-flags.toml' @@ -259,10 +258,6 @@ with urlopen(RELEASES_URL) as resp: version ) src_hash_cache[version] = channel["hash"] - - channel['hash_deb_amd64'] = nix_prefetch_url( - f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' + - f'google-chrome-{google_chrome_suffix}_{version}-1_amd64.deb') except subprocess.CalledProcessError: # This release isn't actually available yet. Continue to # the next one. diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index d75b5df530..1c0daf2372 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-PmLV++FK6aCvdhNNhb2ZAmRLumr+VRFvN+7IByieEZk="; + hash_darwin = "sha256-00582jnlAkVkqFsylZnTWfHh5TJkz+m9W8QCXYKerfo="; hash_darwin_aarch64 = - "sha256-6Ys1EMSLmJNNaWdPeQiCT+bC0H7ABInVNzwXorGavn4="; - hash_linux = "sha256-iimq37dcEcY2suW73a6lhgHuNaoqtzbAZCHkQP9ro/Y="; - version = "123.0.6312.122"; + "sha256-EV45I6lav93uMzgZkjypq1RazqtP1W8w8/c4dVZ5hjI="; + hash_linux = "sha256-xCizRpHgcent3D/tMBK+CtXiwtTdH61fja1u8QyECCA="; + version = "124.0.6367.207"; }; deps = { gn = { @@ -15,25 +15,23 @@ version = "2024-03-14"; }; }; - hash = "sha256-apEniFKhIxPo4nhp9gCU+WpiV/EB40qif4RfE7Uniog="; - hash_deb_amd64 = "sha256-rSbigG5/xbL32d1ntOn6gnZyxSpgrg1h7lb/RD4YROI="; - version = "124.0.6367.60"; + hash = "sha256-IeIWk4y1dufEnhxqvZbQlFVD8dsoceysiEHqJ2G4Oz8="; + version = "124.0.6367.207"; }; ungoogled-chromium = { deps = { gn = { - hash = "sha256-JvilCnnb4laqwq69fay+IdAujYC1EHD7uWpkF/C8tBw="; - rev = "d4f94f9a6c25497b2ce0356bb99a8d202c8c1d32"; + hash = "sha256-aEL1kIhgPAFqdb174dG093HoLhCJ07O1Kpqfu7r14wQ="; + rev = "22581fb46c0c0c9530caa67149ee4dd8811063cf"; url = "https://gn.googlesource.com/gn"; - version = "2024-02-19"; + version = "2024-03-14"; }; ungoogled-patches = { - hash = "sha256-ojKIAkJB/gfg6scCxUYNAGx4lsquAaCySBDcUCFLqSU="; - rev = "d5773b0fb696ef107cc6df6a94cbe732c9e905f9"; + hash = "sha256-7Z9j+meVRZYLmreCzHlJe71E9kj5YJ4rrfpQ/deNTpM="; + rev = "124.0.6367.207-1"; }; }; - hash = "sha256-7H7h621AHPyhFYbaVFO892TtS+SP3Qu7cYUVk3ICL14="; - hash_deb_amd64 = "sha256-tNkO1mPZg1xltBfoWeNhLekITtZV/WNgu//i2DJb17c="; - version = "123.0.6312.122"; + hash = "sha256-IeIWk4y1dufEnhxqvZbQlFVD8dsoceysiEHqJ2G4Oz8="; + version = "124.0.6367.207"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/dillo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/dillo/default.nix deleted file mode 100644 index ab79c1bd8f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/dillo/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchhg -, autoreconfHook -, fltk -, libXcursor -, libXi -, libXinerama -, libjpeg -, libpng -, mbedtls_2 -, openssl -, perl -, pkg-config -, which -}: - -stdenv.mkDerivation { - pname = "dillo"; - version = "unstable-2021-02-09"; - - src = fetchhg { - url = "https://hg.sr.ht/~seirdy/dillo-mirror"; - rev = "67b70f024568b505633524be61fcfbde5337849f"; - sha256 = "sha256-lbn5u9oEL0zt9yBhznBS9Dz9/6kSwRDJeNXKEojty1g="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - which - ]; - - buildInputs = [ - fltk - libXcursor - libXi - libXinerama - libjpeg - libpng - mbedtls_2 - openssl - perl - ]; - - # Workaround build failure on -fno-common toolchains: - # ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set'; - # dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - configureFlags = [ "--enable-ssl=yes" ]; - - meta = with lib; { - homepage = "https://hg.sr.ht/~seirdy/dillo-mirror"; - description = "A fast graphical web browser with a small footprint"; - longDescription = '' - Dillo is a small, fast web browser, tailored for older machines. - ''; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - license = licenses.gpl3Plus; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix index 4b9270b7d5..8649969d8c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,7 +1,7 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook, gnome }: +, gobject-introspection, wrapGAppsHook3, gnome }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = with gst_all_1; [ @@ -72,7 +72,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A new GNOME web browser"; mainProgram = "eolie"; - homepage = "https://wiki.gnome.org/Apps/Eolie"; + homepage = "https://gitlab.gnome.org/World/eolie"; license = licenses.gpl3Plus; maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix index 4002d52715..41ae308ff0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -14,7 +14,7 @@ , pkg-config , python3 , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , glib-networking }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index af824112de..b96632f6df 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1025 +1,1025 @@ { - version = "125.0b9"; + version = "126.0b5"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ach/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ach/firefox-126.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "c344c4b54b62ac7f1f5d41f1aee666402b61999114a1d2c33d1f18d319836ae8"; + sha256 = "7b882806b6cf50f3d1ca03600d75a99be305a029dbf23c98f4e78a9ae37971d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/af/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/af/firefox-126.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "e69a6bbe83c8f1c2b9412d438de8daaa84b247ede40bf274bfce16c8d91d8e7e"; + sha256 = "caa21874c4bf34a8130902f9fb3515cdadb5aba45d1de703c243e941759fd791"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/an/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/an/firefox-126.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "3f79e6acbb0f6500bdcc79cf35d94851afc89a58294c5f48e4fa6295389a4fc4"; + sha256 = "627a705df2572943d4a0d79aa8c107a215d9f55c99d76ce395ed4e03d244deba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ar/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ar/firefox-126.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "dd3832a6cb08bcae90f6cc5bf2196d3fee1ba62ba618e3a872782a60de32185d"; + sha256 = "f1f62fe5f81cea3aca86b58436ece8f3074fd71a3198686b8449200867511c97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ast/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ast/firefox-126.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2e411ae04db3baa2b10c8fe4004f0023cd46dc50c3e28f1e3e73ba6be5a1e6be"; + sha256 = "df6cfc21cc15f619c019c48108d228b37531c6e5eb6e21b2ded2d56fbab277e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/az/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/az/firefox-126.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "d3b472f51de3c31db73c19e8d76f3b376c53f5f6122b4d6640ee9249dc1e22b8"; + sha256 = "1a4addc76c8f5d4df74f4731571d680d3ce024530a94d91d9ce49abd899a7d26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/be/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/be/firefox-126.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b658e6e89cc8e82735f66c941fde9abdffed882fa530734ef200cb0e28bc8c48"; + sha256 = "62c41d913c7cb3102baa8ad27df221cb889ea80240e038e0573bbb48ed5d69d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/bg/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/bg/firefox-126.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f0604e9440e4d78d34bce1ff06e125bb4411c8081345e5f74afcba5e337f2ed0"; + sha256 = "a45e0c8dc7e3ea1a57a3f7e0dca7c2ab908d75ad81a312434e7b021defa5bd34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/bn/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/bn/firefox-126.0b5.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "30c25ba6c3a496a12c7990a83348201b2dcd459b820ab814ecd97979c3034fff"; + sha256 = "810908bbcb86f7af0f79ffcde6e8f7026143390c1b73fa8a81a94b3a1478b107"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/br/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/br/firefox-126.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "3544f5d274c05a2df5bc8e51b2e0ab886f166cc64720cce2ea1b1748c452c236"; + sha256 = "e3031ab47d44f798f64399ad24ba58b49bf5bdc1a6fb6243d7c25f7064a751fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/bs/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/bs/firefox-126.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "a12f08d89f0b2077040a3f8917dda9a09193a613984297a7395b926b9fcce347"; + sha256 = "af2ad1f920ea9aaf36b6c53a0988bb64d118ee4188e6d4eab19b3c850d469101"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ca-valencia/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ca-valencia/firefox-126.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "37608aaaf55fe2f93dabc29ac711b4a1e1d7be521e99ad5c20347a43cd1e88ef"; + sha256 = "1147f887f5a55686120e576178bac7c1d1f942972ca71278b2f7f8f68ec82902"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ca/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ca/firefox-126.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6bd24aee5a121bbe27e0a8649b9742e0c0c1512479586fb3059c2391d0bd3865"; + sha256 = "70fbde5bd2c164c8dfc59d60ad2fe1cebd0bc004b77f6907fb85524dd43cc5f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/cak/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/cak/firefox-126.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e4aa2bb9a6e5e02327b31b150a549fb695e1f49f60a85f4b1bef5c5019fb1b8d"; + sha256 = "7154ac05107c2a533835c41fdd2caa2725c794a1572269bb191d8c2bc0b70738"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/cs/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/cs/firefox-126.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "2e4730cc98751d9aa45f82605240953c9dad307e10846e1065c5adeeb2a54d0c"; + sha256 = "6b78f1f546a2c98523fb0dd7215fad87ccd1a4e9dfa3e5695c46afcb74e003f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/cy/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/cy/firefox-126.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "60179b3635afae11e0bb4f0523135183627b16d974d8aa93fb594723e386a887"; + sha256 = "9b08898afb1134a2de2c1236774a02354795cd8bb8f7d41130b137cb4d14b1a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/da/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/da/firefox-126.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "08b6d9ec3af57f9fc298baa2dde23ca3cd6ec1031c448735cc580d354cecbc63"; + sha256 = "31571ea197dc8cd61b79c061ca32dfdc60d3b74f2dee43f2641d534ca83dca2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/de/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/de/firefox-126.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "163e1daeca14555be4d01193fc6eae95d6e25062c8ebba4e0b8118ff377dcf62"; + sha256 = "f89bee1b43c832b710776280a25119846bf2a5f7c5cfb179bd6b5008c39bfe20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/dsb/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/dsb/firefox-126.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "f173c4c3d5b98efe37850ce66fcf91709211a0a2c1a401cdd96d5caa86684b0b"; + sha256 = "881cc3a38e34d8083082de26b53d2e129273841dc6ab07f7cbb9af0222e0ca87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/el/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/el/firefox-126.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "5af84ecc3f9f3a412c961d8686a81d7b23925cacb407e9c7c0684b078b1116a6"; + sha256 = "797b56a42f2034ef81aca234ac19374069dac7ff911e2077f65a9e8c05f17820"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/en-CA/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/en-CA/firefox-126.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "670bbeb9d23086c025b2fdff3ff43d261e55120d2783ad43c3362ee0de84d27f"; + sha256 = "592abdec04a68e1d9d33eeeae10b7abddbdd0f7e92bf4bc9db92e8aedbc6dda2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/en-GB/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/en-GB/firefox-126.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c0ae89d0500bdb13df19920f8488516e83920b42d2b5b8b115afed86ade33c92"; + sha256 = "8979a85a9f1b41ab5cb3f1ef3ea8252a4aca21930772f058964ad96ae685f92f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/en-US/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/en-US/firefox-126.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "ed5c38fdba8bcbc9cf1b1a87a5fbdefee45e9d2be5018a00b5b597cb33ff2c17"; + sha256 = "8f96bbe7c30b3a8c43d05ec33e20f51353ad5ed207af93aa9eb886119f371b81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/eo/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/eo/firefox-126.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "3ccfced1562a2a23144e851c4d115f1e1c97f197d10329fadc1064b749fa7a1b"; + sha256 = "a42ffd0c0a474f33b3aa5a7619526cbafbd94c5e217dc3472edafee268ea01ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/es-AR/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/es-AR/firefox-126.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "84db5118492d597ab68438702252ccd45b1e569b347839dfef9be02b90ff9e6b"; + sha256 = "6939b66072807cad29b5a56ea64c58f1ddc42e1dad730a045b21940f8c896879"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/es-CL/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/es-CL/firefox-126.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "8e45adc81628d26b6c117fd7b2e5a5a4621bef7fe64065d7c0cef2fd2e989605"; + sha256 = "fd6c3249039600fe1a740015adbbd8c84658771291e2d9a4a6b6df1f710c5d5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/es-ES/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/es-ES/firefox-126.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "615d10f77d0432a1b2bdbce98cb1df96e17735dbbf6aeb328e2ad0f332ae55d3"; + sha256 = "23b69a886876a95eaee696132818e5cc3a7a104412b1ce3b53d844c239856d40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/es-MX/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/es-MX/firefox-126.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "7b485bb17efe9b3ed1ffdd32f88be45905f6197b181d8b4ab4e5ab335284c456"; + sha256 = "accf92b324c8bbc8cd5205a33bd837b3dce351f7fa431ebd434881cb597a665f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/et/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/et/firefox-126.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d561379114bb49e08f3bacbeb67fbd07079aff5877055a49af53aa7507b8aadc"; + sha256 = "0d244490fa6cde3d8299cf42328a062efaebd33aff5f4ab07b3d3e96401f5477"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/eu/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/eu/firefox-126.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0b6874785fc39076a9d5a4da1aa0dcf1ce8586a1fb197d09610c1d8b6a595593"; + sha256 = "48022a4dde833a1ae4572b08e6d863dccd18c8e775c361c71de7a4a4d89688b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/fa/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/fa/firefox-126.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "c5d3dcf22df0d39bf7d14992dcff180f9d1b8b5121d473dd384b7e735665ef92"; + sha256 = "f0791730cb92dc1945ea45ee5aaae6e736bd5817cb98b66d6fc60ff828ba1e57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ff/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ff/firefox-126.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "7dfe6d710dd5c77754f4b18cd507ca6ed81a10c714d2e113fa10003e74d6e809"; + sha256 = "4b824de7cb4d997e74a4f51c109d6a68d01478ea68c4b03a58a68d20b9ff97e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/fi/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/fi/firefox-126.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b90d9c99bed3ce22f1fada29aabf141b030c2f8a4ec29eaae566aa17482474c1"; + sha256 = "fbd79f64bed89e6817dee05a0bb783518389947577f247e83b41021a4cfa4fe0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/fr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/fr/firefox-126.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "06026a38b497501eedb0c7aed1f110a3b8bc958d7b002472070c60266afbb5f0"; + sha256 = "de4d18a481b2d30f204884d3b1cb7d6a427f23cb4b97a8618e0eb77cfb829903"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/fur/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/fur/firefox-126.0b5.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "e957395ce9b6153dfbd00537797a73cca0714e4d14df98f7be225ba5c4842804"; + sha256 = "4d98682733fb1cd5825a30a6a2cd2808eaa7539612130e83f480bf17a1f862bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/fy-NL/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/fy-NL/firefox-126.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "5e18f6d538c0829a2911e2c8620ec851f1cf4afd6274009012e2e98901572e88"; + sha256 = "67b89c68dbfead6a537e18a61281a2b12c411952279757de375380f3f38fb7c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ga-IE/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ga-IE/firefox-126.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "64695bf6614a9f9932f851ef76a2696ebcec1f0f0c34bffe9c4bb0cb42b48da4"; + sha256 = "909cddd2346ea631708c586f45dd58b60843e1a30511a6882239a88797a5e335"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/gd/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/gd/firefox-126.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a24e0bd5314d6d63f9ef85b11be8f474db48e535d1e17c6eac45d51073724fc7"; + sha256 = "e5ac8f176af8dde4d32d12e09a29676d47715cdf1a75890aeed560f3f6bfc0af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/gl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/gl/firefox-126.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "30ad8e7474dafc303d22f8390533c1e847a8ce14ccaeca097be185253357780e"; + sha256 = "5767e287441bcf2ae9955c5cacb5ce4ee222c7fece242c192d117c9cb30cbaa1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/gn/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/gn/firefox-126.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "f7320d7c4a7735007f3e011a0491b8c6379b0f5cb222db5097ca35c950f490e1"; + sha256 = "fa3b43ba4186f5707904eddfc968665e1865686a365e56d267271decea5d5bf7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/gu-IN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/gu-IN/firefox-126.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "e195b45447e89d8809e3b944f0899d5a3ae06ccc1f5b3f884cc66ce8b05a10aa"; + sha256 = "4c4b63c08739d8527346a2ab4b3f8c8fff696b66389bfd7073d093502744e3e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/he/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/he/firefox-126.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5f0d61c3ea28c1bffc241f7626fbd9cd14b2354bc8729cfeea32ddc0aa4e326f"; + sha256 = "97e24f445558ee478b491761b6d374dece22899914e6196eaf24d17d4b06e675"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/hi-IN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/hi-IN/firefox-126.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "d214c41e231a8fb716bbce931d96442b3abb4d713edca75eda7f4242495f720b"; + sha256 = "e7bfc3309faa60007a20ca89d737ff6201a2af87f7190cef0de3df75dfe5a356"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/hr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/hr/firefox-126.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5372a8e58fb691e586066559640a44dc6c4ece391de3ead63b477554aac4fe5e"; + sha256 = "d196b1f8239b471fbe1e22a9000e90879df086f19efad662df850e933089447e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/hsb/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/hsb/firefox-126.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "bcd62563ce8e66b1f5363b79afef151b3584576c0e064d0ed274b831cc205302"; + sha256 = "0e5f22c52a587add26909e3a98797e05413e7af6c9cc6f55c724e3c7c2b945a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/hu/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/hu/firefox-126.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0d75b991b41ba370db28aeb35491b42ba41385cc3a17a1d8cef3b6e5c681a5ee"; + sha256 = "b4b8d4e2f5016775a78b4e2607f65f3f44051a79d8a43d9299cb4bcabb5b43b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/hy-AM/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/hy-AM/firefox-126.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e25f813793f3ae14bf7d8152b034d9fd858ccc20bf7d04bd589122c7dfa6e55c"; + sha256 = "dbd0a975300046bcbcd93349454984c72a99f45e0eb974bd1f82d88216ea6939"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ia/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ia/firefox-126.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "f9d1ea389b150b10c6f8875c3897af7a03e0ae9604851d392230d6714f43cf21"; + sha256 = "61c295524f18e44e23ef905df305f047fd2b3b31c2c9aa08e69ebb19ea695a96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/id/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/id/firefox-126.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "fa851b2e29890feddd9fc77856e263b2f009a37e34fb873d7c88287329ceeffd"; + sha256 = "9dc418697f4fed0e16a4c2d88b4aaf5e62369a438f104980db44a21598330dda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/is/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/is/firefox-126.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "58e95e71ff9e72a6dff5cc58b9dd90d34ad46fd3791e8c2475baeba98aa222eb"; + sha256 = "84ce271d9b6a9af3b16e1adb5e71acba1483ec794cb25bf0197f5a521de98a4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/it/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/it/firefox-126.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "1343be59b8aa78912587d3a53437b8c1ff54bd804d006e9d97beffb790525bfe"; + sha256 = "caacae564d5cf9662a559cc0b11078c33882b70607e4298f41db18d790106863"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ja/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ja/firefox-126.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "3e2e8d99282a414a137ed5060b5d32389f66056e348e31170313ec38e7050ad9"; + sha256 = "873e6213fbdb9e437d5e7abec993c0464db0692797be79f4249aae4a9eae6b93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ka/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ka/firefox-126.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "ae5ab1acef2688a2528f729a52485d9bcbfc503d206d21b9348c3731388af5db"; + sha256 = "f515d3859e404430d40728d6af708d95c0f73e4bd2fd23e4da5cc59a4a184f8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/kab/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/kab/firefox-126.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "da9bd1b96dbcda3d71d167623a0b3c489efb7d96a6499283448f24f71ba0b16c"; + sha256 = "de4334799536e6c191dc07f463f96f69773473f8bb1096011d0efce6facf6199"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/kk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/kk/firefox-126.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f0f2ab2fb418e1d1849c49b98f4cd3ff7aa454974aca32c089162eef31091839"; + sha256 = "0887ed3d14a160fd908762468f485a9ad10d49db871a434d3adc48065d395003"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/km/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/km/firefox-126.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "401002d169a47d90dfbec657d87bc2885a668bb787dd2d3ac0db5e6a47645d23"; + sha256 = "789081a881369cb3a775c702e57637ce06a895ef85e191764ce712783f32d4c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/kn/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/kn/firefox-126.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "ed9a227b8e9cc65d8b12856626e57013bc00afc4fbae0458a5286e41a01b499b"; + sha256 = "58c6c22c636cc3b6a25ef72d22f5dda2bba19d08c6988b7be671fe502de1ecd3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ko/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ko/firefox-126.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "1cb2dda0fb445e44e097c9c176f1410f2d01dbd6f87983d2aaf734d9bebf5802"; + sha256 = "47cf06195afb1010674e4e0cb196ba621d5832c6f24dbb4147a7fd7fe3d7a5c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/lij/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/lij/firefox-126.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "9d64f74749268fe6287e48225d2dbf62b7add07035f17d3d649bbda77b5ba562"; + sha256 = "e3310f86e5bb92de78fda8be73d61eed3e7195fc1f3195a4e0891dfa244ea308"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/lt/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/lt/firefox-126.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "d170d89b3576f047d95accf8d6a09941f4dede8216529d54ff87183092e7a69c"; + sha256 = "51dae70743bd22abc588fc868307ad80b8b12254a17d42a9a71b6dbd7c87dcaf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/lv/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/lv/firefox-126.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "eb82b0c7d9bddaed90faab23cb89be202199a354d089ee46ae6e756cb9c44216"; + sha256 = "814d16867bba81fa2a4694ba23e56d2fd7b6e303855b715ef386235b587612d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/mk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/mk/firefox-126.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "aeb01c14cdc4c14a23411979b01fc5f11cb1b11cd66b75031cc9bf2391b27e30"; + sha256 = "02971f2e9e48dbdb6f30ce99100d9212bd49caa26d97b02f6cae80c4ab288923"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/mr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/mr/firefox-126.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "02e86be51a8e6769bec058ce2254f2da3bfcff8061f44035871b9efd53b4d511"; + sha256 = "73414133309979d604cd0b05fd21aae2bd4cfbdded58035606901b10e28c7d3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ms/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ms/firefox-126.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "b0952b0a240e42828ab093517aba3f9212465c586ed1e524e0a80cedf04bcac2"; + sha256 = "bcfe246fd61ba41e23d9860b88abbbd61e4da5ed9755d2d39c1d24785cb6ffc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/my/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/my/firefox-126.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "104a9df768080d091bb4c5d5a389e7f2a761dcf82f1b755bf8a4c152f6ef462c"; + sha256 = "4170ad2c245f34d0cddd54e7bcaccfe505b417fc1d453b82b79ec052bb887e89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/nb-NO/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/nb-NO/firefox-126.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "72844860b05b99edaf933933747dab23c8d717a64d2990b8f0af5c3d27455610"; + sha256 = "881a2a3f2304618ec949050808290f324860e25d80dd3172b443fc27ba938384"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ne-NP/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ne-NP/firefox-126.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "a85df3885d24109c1d156ae9449167ce70e91a06bf3f02820e65f3e381d6963b"; + sha256 = "3c293cafc653bd77971bf8344e7b93c5df2699f02b76e8bd2671eb7853f418a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/nl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/nl/firefox-126.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "7f9c0a118663c5e32f6820384cda369461c4a59cef78957595c5f49af37b2cf8"; + sha256 = "409eedae4cf7340a9111213e6c88fd91340ca1d85b5aedd74605f70cf20cad1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/nn-NO/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/nn-NO/firefox-126.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "aba9eab27dd617622091acd9f4637d25f8c1b74f8b4ddbbc7cb64ee97e423be4"; + sha256 = "d59cd6b50c11672670bccfc315d36c0496967dee986f03214185718c44189729"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/oc/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/oc/firefox-126.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "ac1560c5cf7680c535c0d3ba783083b4fe28516ba3a4f1eed9344ab25bb64aba"; + sha256 = "c4e3d1eb11eac47343c8c9080e1e73b72185bb09bb52b25eed31d69fa21529c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/pa-IN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/pa-IN/firefox-126.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "894292de9a5bec6303e9865ff21d5f4d601fe5093bf816f079404d23bef63e7f"; + sha256 = "39fcdf41135ec80db479cb38cb4b825620dde6563463886080a41b606890cec8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/pl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/pl/firefox-126.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4db19e52c3521457a97f5b90f134bf540cdf142c262f27997502c1c9b2a77440"; + sha256 = "1bfe057079a573385fe74e2fd28314242568e0701f3380830cc9dd4bfee0d753"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/pt-BR/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/pt-BR/firefox-126.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ed34def0ed1d8ce308c5fb5aaa31bc86c5b96aa09587696bed09f2f4e2517f21"; + sha256 = "fef1097e86873f5f440cb8c2287ba1fb759a8a6cdfcdcb463a52bd422d683f28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/pt-PT/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/pt-PT/firefox-126.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "aa5729deb776cb1d6ece711e1a29d852f6600fd81e6bcfcf73efec918f934aeb"; + sha256 = "2c3d49059792fe94a58d617211bd0425e26ae826cd14acc9337b0bc10142d006"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/rm/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/rm/firefox-126.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7d830af829163a49bc91b8c3bcd21f96f5aa877c16b6e19488d1b006214db744"; + sha256 = "2d55c3f9b253d636d971c0ed075b8e05b5afceb419ebd5a04a73f8ff4a70550d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ro/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ro/firefox-126.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "86abeb933c8f4b5ee8bf065f1b17dc8a62cb9f0f995de2718b5a36965beff40f"; + sha256 = "1fd413429bb9643903e01edce0954fb8e58aa381d4d5443c1f625599dc4e9072"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ru/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ru/firefox-126.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6b3a15971b7b8086ae252ed7fd3a01fba45f373326f1b98253b526445383b436"; + sha256 = "6d775551e9afd71352e3b9680d6b73a94763b650ff887577f387c8182d44a982"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sat/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/sat/firefox-126.0b5.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "27981b77a30d8492c5f219790dbbd15205cdede25d3320fedd11b06d27789293"; + sha256 = "276e336274bc16684842d0f16960071d9c967372e9b2db6a9d922b93a974877f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sc/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/sc/firefox-126.0b5.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "4a9375aa8a13ea042a4980823d3c53338adec15dfed9a107856f0b791cd11ce5"; + sha256 = "98fd54a97fded3e2529da8f38027579b0138d672f600c172cf480d99ba83a0e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sco/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/sco/firefox-126.0b5.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "79c507e3fb3f76a4386f2564021e58392e678a496875ad836b3141abfc5c0978"; + sha256 = "547a86fece1ce1194d4125ed0a692e6b58de3d91f987cdbd986b51545944e4a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/si/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/si/firefox-126.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "652a062f663b0f9f9b88fa11beaee5bdd43c0ce0efbef09d3a4f7f8640febb2e"; + sha256 = "b51da37e167c6c8007364f7dae2dab54b3bb8be7be77172fca509da47a44496a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/sk/firefox-126.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "0097047998a727ba637ca3815baa3c9225d541530dc1f61dac3b5c3f47f07553"; + sha256 = "d7cb0bb885280bf8d127c353c75eca0ff7d29c664a581777feb7ef8e2cdad224"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/sl/firefox-126.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "dae503138aa312d14d4f9166edf6f7727dc32fa8aab89f038f28514d558c107f"; + sha256 = "a3aed1ac28bc1cab53f102d9babf78f9ef911ca4bbc82df112849aef5b44a340"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/son/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/son/firefox-126.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "d222c4b8932d40ca3e369efc6640fc451eadf85774a5988cb9596cea2eb3b938"; + sha256 = "76aab06c52a21bcd47e2b011d615c0a24d7948a4bc41795523acdc970f169edd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sq/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/sq/firefox-126.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b4af76eae0bd8fc99b93cc2b84bf82b711a56aaf939bfbfa9b91dd12c64a6813"; + sha256 = "a9e607be04fb14a780ae3f691460e251ef040bc5d63a161c4cb57eaea1d03e06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/sr/firefox-126.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "cf7fdd51186046d4361a29f04473cd963c8ed7ea0b6e5c87435013664f75f593"; + sha256 = "7577abfc5615d03e905a8b3a6e6907f9ac3fc9f852ac4b74ea420aafa4027974"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sv-SE/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/sv-SE/firefox-126.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "4ca01747d4d58e4068e30a0910adb30b7417e9f0099fda0643c2d6cb6a674dd5"; + sha256 = "2a290055cb7452176a8cb36879611a8608b08439ea2c56c07d0f38ad7ed1d78d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/szl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/szl/firefox-126.0b5.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "093f2e5bebc9b56c263046adcbec0c70c388949c6303726d1c7145f082e56584"; + sha256 = "9c9717adb2694e4c4a2d2e8743709be2fdafe1a39756527bca41e08bcbdae5ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ta/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ta/firefox-126.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ab841373a4506f5fc75b432a27891451174a314159683d60588dc686706a18d0"; + sha256 = "e15a375ed866faf40fc3721bfba4a7db657e06cbf4b95b7e98446d47be2944f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/te/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/te/firefox-126.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "fb6f570fa87efc7c7b806a00b7d415382dec3b56033898d49308cca56a21a2f5"; + sha256 = "73744888ccb61dfa0d7e00578a3562b7a52c3cb959c9fd42dc865d94cd2e0853"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/tg/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/tg/firefox-126.0b5.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "740c51b2b8d923947c8172f3ca682a50a3ba4608d9986aa0276d9c74eff88159"; + sha256 = "6bb78afe160c7f2aa81b6fefb8019fe15b43f6b3ae1520dd2f2e3a2cf095f684"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/th/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/th/firefox-126.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "e68545dc159e09bc6e5b9b71f2adff5fb3b1e04d9b3215655df90ed93096ce31"; + sha256 = "68594ec62ac6f9e5d625b98808500da43894c6e620ce84294b19d69baf507057"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/tl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/tl/firefox-126.0b5.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "ad9e56e649d1abe0b121422cfde5bbea64eab4cd7a6abb958653ec14343a41bd"; + sha256 = "e84ae356c9c5ade2c74c5efd31f8d0763ce08f2bfab47c9fd78803565ddbb8eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/tr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/tr/firefox-126.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "4751fbfdab41dc742489bb37cc3c306a8afa727447124c3c605abcda75c4394f"; + sha256 = "3f69c024458eb206a833063aacecd4a70cf6992226b77a9ab95badab12ec9e2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/trs/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/trs/firefox-126.0b5.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "03e0ed538ea78cf0e794cf8e3b630c23fd9c9fb6f84e80903a55a72927cd5f0c"; + sha256 = "466c44c5db785b3727a3240b955cbc9a70da512c94230663957f7d7207065149"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/uk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/uk/firefox-126.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "fe1e2704f50e9ee187602d5ab2c48a6a9bed36f0484f58b35c089c26b1056c2b"; + sha256 = "142d8c32e7670b0ede164d9b0d90f60990cd98794f94af00d4710f7669371129"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ur/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/ur/firefox-126.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "213f70f78079921d26c1fff7aa67c429889cf78d4525df184e74050460c95dc3"; + sha256 = "de606cffb9b8d5441bbcea0db6718a3c5ef5352385b966790c01b8e2703141b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/uz/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/uz/firefox-126.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "a994f6bc2472957bee8cbd04e61d44ffccabde6cd6e1e6190810b8b8f617f749"; + sha256 = "862a18e1be26effe08af12a805f4a9b33a43249c63fa22ecee7d0129d5321a6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/vi/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/vi/firefox-126.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "53c7af3af45c0b48f29bc251403c6790a36ee8b18d2d411aa00fe17a21f8c005"; + sha256 = "90567dd577f106ea84f87211ba0a1657c91f6b09063cad90ec99d26c2ec49f02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/xh/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/xh/firefox-126.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "23d8e28070e02b6a57c3b73af9a963f644576acff5d596c6adb5c9a4fa916fc1"; + sha256 = "65d18f15887e7b83e5d1026599bab3eb49b34c79cdc2c59db20d1ac94fa92312"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/zh-CN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/zh-CN/firefox-126.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "20734b69aa6528d67c895b0c31299b11e832939870417a3060c0e91c63514259"; + sha256 = "cbe68dab2ce96b73bc397bb0b925df0e2c10df9b3bafcb4b74c667aeb8950a03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/zh-TW/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-x86_64/zh-TW/firefox-126.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "775a1d2ae1bf13a1c071cdbe7f112adcaf4acd3f487a16109eff2f163669147b"; + sha256 = "f8e8a1ec3d71f59d5ed74ad43c8988ea8ae535cc8a256c1b4c43470891fd920a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ach/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ach/firefox-126.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "56d52f45f887ab8ea2c453c451ce06ffa50207074ea13c88cb91f64a933766c3"; + sha256 = "ceca411e0d96ff89b59b8073abbd228ac246e7c09c3465825f8ffa22c8534a25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/af/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/af/firefox-126.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "c54935b5256e20534233f48e76f6db85a876086e0f0638482e2e2e334f36b55e"; + sha256 = "6a68baed628ddcb9e271745dbcdffacd59ba071e3cd40602bfa17ad37d41e219"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/an/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/an/firefox-126.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "7d18571a839b581fc7a0d726387865799908b7effdf48de674de5a7324b5ec35"; + sha256 = "6d399f5c9b0a5e3d2ba183956625276549c1bdffaca198d17a6b7e41d3504df2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ar/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ar/firefox-126.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8d1c53c88118fe051c3a879bf8c2c4ef8753a2bdfe798f4589484b6c2e10d5a5"; + sha256 = "36c8d6c2fb1a53effd23093de381b206199c49af71c457b584d77a54875cc85e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ast/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ast/firefox-126.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "2855d453a4c09affb10d1df1fa28509fdb83c2a661ddb52d7dcc47fc441582ba"; + sha256 = "f082b51e0a8f001241b01dd68710185e30dc486bdbe72e88ebd4a5d8f81ad2f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/az/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/az/firefox-126.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "37604b46b07eab4e8548d62dc46456f4316a6a6b6d90ad2e3225736bfb465d52"; + sha256 = "414f65c8da90cac9dd9263b1676d87b6d45f6d70684b471c48ecc1c77ef3fc94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/be/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/be/firefox-126.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d5eb6679664e991c25103f9bd373d61d22f8e7a84d6e14372c6d809265253ad7"; + sha256 = "c8422e7b05de0b06bbee7ccb00662950aba2fc39c4de3a3ccaab678b1eab67ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/bg/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/bg/firefox-126.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "8c552b4d5e99a65a585eff6b097aff7ece9a04e9a59c2e243406e9da752c9ccc"; + sha256 = "af6eda65e459df5ba22750ed561299a0d3098321969f0d6c838e7c259872457a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/bn/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/bn/firefox-126.0b5.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "28fdd013daca582517d6db0198e52c3b23b4b88cd1a63acdd5b1c7301aad56b6"; + sha256 = "46724ab53c981519d9992b87ada36b97953785a64ff73867ecb180decaefb0c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/br/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/br/firefox-126.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3cd74cc500442edd471b4e74683e852a818da10078afc9a2c7fae2116d083c21"; + sha256 = "84eca14fec1998e46f13b4005f7342b7e7ef983e74c4f92429a67765d6772873"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/bs/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/bs/firefox-126.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "d74f1df7dfbfd915265e198f32d6335ca143b7920e7fb2b8a73d13d8d640a8ff"; + sha256 = "690b5119417934a49bf7bab42f616f5cd02e066868914eef14dec467c26caf7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ca-valencia/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ca-valencia/firefox-126.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "99f2bdd3c4f97cf497fc76936c93d4ec3e58683ecb2840989c3b308406045688"; + sha256 = "0235b4daedb450be2d520cbdc2761668bc534fcef98bcab46cff4b5a1fc5a993"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ca/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ca/firefox-126.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "2aef3753c8656cc41d8d29e8a667596578ca72f88fb72f14e481513425e44098"; + sha256 = "7004c1c5e76103084bfc33078cce427eb12e5165cb025c9b98437a2552e97ebd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/cak/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/cak/firefox-126.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "6410e5de36e97b26b5f93b2b04ac97dcb97f8bc30738e4a96875ae4d373d0f1f"; + sha256 = "12e2a6fc96f7cf7dc02d0d0cc62c07c22afa794b11a0c0a9ff78f7a58dfb82eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/cs/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/cs/firefox-126.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1f9669945955a2abce5c3c38803bd4c127ae9adf8949ebdf53cb3afd205b4fda"; + sha256 = "9dc39fef30ce900c2590aa83e4d835497d0c8f0c92b12ced53b7fb69b575ff46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/cy/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/cy/firefox-126.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3d18ac42eb8a2224f1f267d4f398ec71def89e57568fcb66559cb7f5ab93f3a6"; + sha256 = "b2717e2b66f40ab699d6b6ad7bde1dfbb9f05b25a9991338a2ce870309d50d33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/da/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/da/firefox-126.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ec72a711a47e1e7c5ff0942a908f35db1ccd73f652a988333ba43bc322e38a88"; + sha256 = "5e65737aa2c58e85e2a5da501fb074774edbaf3c90ba35adbda5e228e989367c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/de/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/de/firefox-126.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "3f53ca69ee578d01cfe30fa5932f84eb51157abc28a6d9c96c0fffa235b4abab"; + sha256 = "13ec999725bd3e29a75564abd8382b18d7a93fad5190f90f566896de1d4e4391"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/dsb/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/dsb/firefox-126.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "151ea9ef796fc707ca55cb4b682bbaae8363f5cc8572d4e439ce917c38930946"; + sha256 = "735c6d3989a8477771eb90c0d3e002ecb1fd6ad86df2330c1e6934ee9306ecde"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/el/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/el/firefox-126.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8f5c2be305f8ff83d5a05415747fcf751cb70e8d49da51f554ce628f3c7b94e9"; + sha256 = "340384791251a7b150fa7b0971b8e0be096b810a739374af0e5196b94c486227"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/en-CA/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/en-CA/firefox-126.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d9813f6c7f09b90f3eef95a53634ed7fb292bd4e4dd0d1d9eb03085c3cc864ce"; + sha256 = "c9160a9b6d84a47d772a86839bd571e32e5e709cba968904d529d1e6037424f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/en-GB/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/en-GB/firefox-126.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "eaa7a84d1c3895f5afa8d81194b936d0b2bcfd701bf94da5d06a95afcf548bf3"; + sha256 = "009bc08956d4e277e7f755dc5d646af918c897bfc1c19e53b3798d5fc6c27552"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/en-US/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/en-US/firefox-126.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "1af2d8d41483939e7e8a611644983be405bf42afe386d5e794e96d18c5c40de2"; + sha256 = "2ba786e17d399865c2804e2f482486c88b96147fda2940f91ebc5d6fb8c8c7cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/eo/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/eo/firefox-126.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "89ae418ce031b101206438b4064754c2d71fd59edbda1eb61d80c4612d1fe5d0"; + sha256 = "671d2040f839b2b04365cdb39a9843cc5b44d865cabc21c990a3c8bab8352298"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/es-AR/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/es-AR/firefox-126.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "279ba454c1ad9b7f62e94eee415ca2bcaa1cd4452307d2160c61d625247ce7a2"; + sha256 = "6794493fba480b3edf6fdbbff5fddbe512df75d67a1e5776e0191adcac31bbf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/es-CL/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/es-CL/firefox-126.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "ddf225b2c97201e375913004e3329cd278abffae0aec3e33963dbad2d581080e"; + sha256 = "5bd489e8169dd4fd8b1e1176ad55eaef9db0f80608ff6b76aa87905f7e31947f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/es-ES/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/es-ES/firefox-126.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "0b26dd7323c3b533a0d76984d2a7e40302579d8db0f3907bb801d1ee1e5764a8"; + sha256 = "ed36b3d79a6c104c8dc6c28c5f90cd874313facde07b8d8a147207e14d262f4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/es-MX/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/es-MX/firefox-126.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "39ebd0d768bc4971a3d0bb14159e4df3fb2da29bc82b7e086542d8ff6431830f"; + sha256 = "c63912d626371e8608a10e2fde4ab08dccd683b843266fe5a9751bd6f181cd18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/et/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/et/firefox-126.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "3139b8fe4dd94e3d2e662069ede9cc7c2f3435e7d774891a485f2b28c8e2e33b"; + sha256 = "aab284558624951a0b456b0aeec3dbe24f7db2b6d9200af844a4feecbcf2e5f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/eu/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/eu/firefox-126.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "8aaf4ffa5d9c315f5e0b183decec2e67989e9febfbb32dbe1935e2f403c3e482"; + sha256 = "12f2c0ff6b6aa9ee57123658a3c4780eb1715b348340832db593c00597f70ae7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/fa/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/fa/firefox-126.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1312c8b7af60aa772d966dd668a0081db4a70229de05c362ae63e0d18e619f1f"; + sha256 = "9152133624785ee9d890885daef561b8d40afe20dbbe8a322a607e68f53fa930"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ff/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ff/firefox-126.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "944fdbfa79b94e4fca811adf74d0ee4a3e48069a334e8d596c819363025e33ad"; + sha256 = "54d96ce8f7aa91fc003d84aac88e4b64541d8dd637e73b28bcaeeab7174bc5bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/fi/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/fi/firefox-126.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "7d82840552072b9ab100b17222d0f4ef0ff21136c3920e9a9e75bd5c7ab651bc"; + sha256 = "0027ef0b7bcb74c71207b719fa11d4037f8fa094ec1ada6f2eb4a122546227e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/fr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/fr/firefox-126.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "83b74222a01946da395f32d464136600afa662d67b9f4f29ec0cb25af2a8df6b"; + sha256 = "19d1b85044fb62490459f73a2950c7f838cafca1ad6faea453b1a0d863f9773a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/fur/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/fur/firefox-126.0b5.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "4444ea9359f4b5cf6d27a623eb067044bd3e65b334017761ea42a4cd59651f93"; + sha256 = "e828482839a6ab4ad5b07129f68aa20df4e87f5ad00549b6a935d78c104be608"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/fy-NL/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/fy-NL/firefox-126.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "156649d35ecceb71f2cdd0963035a408047660e938119183e7b4cae6f8378621"; + sha256 = "ceed7138a03e781d886c4501237c0debe4ccc1c93bdb13a2a66c123e533ff984"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ga-IE/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ga-IE/firefox-126.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "097d64c713311f2fdae7abf39a1a0e9aefe1f15c3d1590212c856982893a2bd9"; + sha256 = "07a926e35884398db3128a54f90699c61abb289f4fb56f5f1c538b27f7c990b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/gd/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/gd/firefox-126.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "f973d001c697c3eaba250ace22bab505061cbede236e29886f7da0702d395da0"; + sha256 = "a69ed32870bf43b616d09007c09697e4e7929cbfaf4c986a9f434c829a46451e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/gl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/gl/firefox-126.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "7e79913ad4665d4cb092e1a2df60c973d5f1411a68e860e54b49365718f712b7"; + sha256 = "39eca241d736369e09e327daaae521a01c2ee126baebee0559471e5377e559b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/gn/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/gn/firefox-126.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "9a432f51acc845932474f8e34759c10c7846e14c2938e03ba439d75f8f2410f3"; + sha256 = "17810d1a89e594d3513650bafcc631d500fa984e6790cf852e6e9d71365321c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/gu-IN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/gu-IN/firefox-126.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "5c93832a32b01be515ae199a09ccd2f3d3aa2a93541a90c639a444f4e91effdb"; + sha256 = "357987ac6755e622fb3c744b5cfe530240f3192075c5f3f826a9daf7da420712"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/he/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/he/firefox-126.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "541f41dbc1aedb460a75f5f20f7020c803a30a2db500a737b7248c16ebd520f8"; + sha256 = "a14429a035e34d2993dabc4492dc6ee57c5cee6173b453e19a07d268a89f01eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/hi-IN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/hi-IN/firefox-126.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "a6bacfd4871c8576e4bb9173d896af8d77bb6c7476df3eb602dc78a176401f47"; + sha256 = "ac426d39cb3e064127a769c8a2bb45d165c7a72b9ad2cb8ebf05da192f0ce348"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/hr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/hr/firefox-126.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4f80ab934f8930dfa0bdb7937e61103cfb79d337d170ed6cd3bd308cab7f28b4"; + sha256 = "ddf235e1f3f9228d7e8c88a8b0cea6c1d63f1cf63e46223e5e73b07b0d593245"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/hsb/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/hsb/firefox-126.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "bdd0b4a3d723e2c165f65d585848c2036f022236be4b108b3449144d64f085b5"; + sha256 = "2620c4edcc178bd4827e46ee6bee9a51c06d95d0e4412fcd906fcab47a2f481e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/hu/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/hu/firefox-126.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5fedc53cc3fd9587d725fbe40c13f63ca3b3b5818d560ec610945d0b35a87c2f"; + sha256 = "9aded5f3993dc498c37f9f91fcf5b778a02f664f3ee25ec880691d2480fb8f03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/hy-AM/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/hy-AM/firefox-126.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "6672a11e3eb3bf05070928abf9d9505fcb9cb54481c338d8f9bd81a8970a3de0"; + sha256 = "fc35e1abdfc19be9424dde459c02114e1e8263d1a7526e1bdadeef3cba571903"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ia/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ia/firefox-126.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "215fc720b28cfed1030866e3a9e668587a5848414042ce5af290de472627e6a1"; + sha256 = "8ec912f951202389d97105df641d4f30fdab1131acb9d426f7038e65fa0d494f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/id/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/id/firefox-126.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "73705440c0afc58584d6045d22a8a4ae3ba50d278b214eb86d3f3fa21400a201"; + sha256 = "7b64a8997419df4f5474a80538ab970510598bce5a13cd57d45db67b95559609"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/is/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/is/firefox-126.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "689fc69fdbb6377dacf07c1905233747a8dde9588ede378d6e24e55ab2d0f956"; + sha256 = "71613574a4b1e4a33d29b282d4e50b77865733a744eae17e15a62aa747855d66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/it/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/it/firefox-126.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "4c02e1a4b814353c43bc9df9c817205ac95329eff0925b629c4aba54d4b1bbcf"; + sha256 = "939fbabba1f341d1296df1140a94dcbc0180887df70134021a94f8d9b370f42e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ja/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ja/firefox-126.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a67e094199ca42002b76f5f2657b6579ddc28dea22c85b6cd6734666f2507d74"; + sha256 = "62f9ba084329183ed68295bc2f1dfc374ee665fd842ee0bf21b1e25a1b5416bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ka/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ka/firefox-126.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "4090c415bd52544aba3bc03112d75c85d60f6648a621aef2b1fc98fd55d402ca"; + sha256 = "d9af3d20399e9aa786cfec4c86a3c833a01bbd3a8987473668937557ee44e186"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/kab/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/kab/firefox-126.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "512f9e1c9e78e888d06682c0be5d92ed04c4205ffcb7e129f8ac186fdcdb922c"; + sha256 = "2cd13c1e82bab687d17b1a517cefa10729b951dbbd021e4d98a1c26e791314e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/kk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/kk/firefox-126.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "9f047e003a30f6fbe69b025b6ec0eddcaf9f2ebe89920d81e2d9ec6ccac9db2b"; + sha256 = "cb41f01e7d62c82da4c0d73868acf9580f9847e0c8ea9d9d255ba7e517d657a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/km/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/km/firefox-126.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "528ef891ff6364b94f4a34d269cb9065b80911a779910180ae26a3ae3c55a4d0"; + sha256 = "b6b18a47c9544880f2996092d11aaf61e9db093e55d75f5781bcb1ecb72b1008"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/kn/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/kn/firefox-126.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "44f7648828c93e5190401270fb2b40813376d4b63e09d60bd88d34002acd63ad"; + sha256 = "91c94c7b774b01bdbd9bc779beed08a84f63461aa8026da13e77cc5732d04609"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ko/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ko/firefox-126.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "8bb3b5d2d47fb8fe4e1640ff7f190dbb3e8c2e5df3ce954d09242935d6142fd4"; + sha256 = "ef58ac71e216ae522860a4aece4901120e53592ffa13c6a59cd06f78a8272dba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/lij/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/lij/firefox-126.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "168ba4b30162d99d6627d72cd1be0c3ee52a68518c3133834676f7dfa8ca4b9c"; + sha256 = "751281d726765270d445575a09bcf021269a0d0205a03b49fafa95b6a109ae85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/lt/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/lt/firefox-126.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ab5bb9302ec3335343d252195675396712e04174ce922642e88d61ae9e91aadf"; + sha256 = "d70751a805a1b09cb7dd113c64b3ee2ae49c26c5c576e8be05f20a4074cafc1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/lv/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/lv/firefox-126.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "d0448e7e053614e8fcafb29e8c374fdb733992770506e0a8fa97e5e93166b128"; + sha256 = "d117fcc82eeeeaaa468ef3191a682c0605930c6dc9321ae31546d4a0805f6a1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/mk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/mk/firefox-126.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "8baa80bdb4a33e2fc22224b179b4b5e383c6106b82a3d7761aa47a8e50989dda"; + sha256 = "ab07439555307e5174608c44ec3083051ebc98e712041cdd6a55c18854a5516f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/mr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/mr/firefox-126.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "029725d79e5b070e53196036605c805030f52c7a9c9b11b39666da8950066df4"; + sha256 = "e9f7cad42a6b23557ce6393228763eacf617d39c22d3a25e672b05303648a149"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ms/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ms/firefox-126.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "4c502415b50a299f93b3c3a4ff5f740b6cfcabe5dbfaa67db2025d025a03dc52"; + sha256 = "8081bb08a4cd0df2cfb2af38233ce90d5ff279250de8b00fab1c6ea7a1070c74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/my/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/my/firefox-126.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "25e9f31f91e7e3ee83b85d3b01e7793941a1cdf3e35f200f14d1dbdbe67b64a9"; + sha256 = "fdde8f4f13f4ec204d6dd1f0cc538f26c7fc10d4820a3c300a68c89a4708ea43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/nb-NO/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/nb-NO/firefox-126.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d34db6f7582793fac80928b41008d3e55fad22605910ccadfbc9a5c429d0656b"; + sha256 = "f03070ab64b573765e8afe8cfa1d1bd361e26ebb61c43665a1fe5ea5423ca6d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ne-NP/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ne-NP/firefox-126.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "d697188584025b85f5af51d0f6bcde48f08b53946cd5c3480e634309b4361479"; + sha256 = "841139b185d724fb24163c4e940257d73a1d10255d8cf85c0130320a92486fda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/nl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/nl/firefox-126.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "01386e3bafab95109939a485131083800c801914af4a86b197c4c4b79416d600"; + sha256 = "5d399980953adf1612522ff9e1e24f556b7ae0889b66acd3b2e8a0755308cab6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/nn-NO/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/nn-NO/firefox-126.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e8e0421331d93df112ecbe9a769bfb6466b772c7cfea616f9e7aabaf7a9db0d0"; + sha256 = "eb37103d8f4ef619f6809f6dfb1d87b235f9bd357acb93a1c97c929bdf18c6a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/oc/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/oc/firefox-126.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "5e461f5fc46895d3e962f08124085610434b9b980ba61c44ddd78b703362904a"; + sha256 = "8a10238c0e8cc48234ff6acd073dc0cab6dc494b20b701b8f3b426242d64b08b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/pa-IN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/pa-IN/firefox-126.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "57fd046620762ab4e114dde80d34d7e5954df44e76733ac705cb26020e65447f"; + sha256 = "845ea79e53f8bd03a12d443d51122a769c0d3aa95cfdce9ac82fcff2fecf1882"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/pl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/pl/firefox-126.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "8f9a90346f5e4908f090f965c6e579b0a85cdfa895a304874671349c302e4d2e"; + sha256 = "e6787b2d190da966d48ce17189c442bfd7376f55d271b02afbc6555e50052060"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/pt-BR/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/pt-BR/firefox-126.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "80fac4d4cdd0d501dcbd72a710c499b656b6f80a12b1246d3c31ea3f8d601fa7"; + sha256 = "61526013ebbbc38d753423acba412e6df40e8872a1a8890b2bcb010d0749f773"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/pt-PT/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/pt-PT/firefox-126.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "9fcee0a4e8a84bf307a94b91892741a3b5f1a7e1d8a0e230869aa6a5284fa624"; + sha256 = "c6ac02f336e13313693cd50bd744a15ae9948d7f21bb65cd2b71ddf05bd84f68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/rm/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/rm/firefox-126.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "f7e39bdb3d4ca6b69366a983a17fdc76049ee55878cc7561b813dda33b578c0d"; + sha256 = "6b68fd8bfc7d7c923b9e85a5876789be4d2e293a06e2ce94f63b89314297d723"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ro/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ro/firefox-126.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "3363738bb741a890aef513571244389beca8fa46be1a89019e33ca4c7e0219ba"; + sha256 = "96dcf7577671ab41572b84fa33c91b1f847a819a20f62b23fdf86f9047ed9ff6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ru/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ru/firefox-126.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "75377fa4fe3ab20d6f85a9bee69674419d119706dc62e8f9a43f1c7b8f92f303"; + sha256 = "13838f4841acd30745acc6d8ac4e4fe9317408ff0334d24b857c44a589960076"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sat/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/sat/firefox-126.0b5.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "711caf4da6b05f767493923f6f5d9fa6cfc10ecdd8bc6f0b634a0b1e4ef0ee3e"; + sha256 = "4e1aa1e417289c790f67061fdc7ca753ba5f0a6ac0cf2c7b319ff56e96059ea1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sc/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/sc/firefox-126.0b5.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "5ea83a4f67b5c5eb58d765998b9bfe9392886668effa1ef91d7a59be30f63a6e"; + sha256 = "5370018102b2d99eb1095f579a2eb913f814fd6119f981b9091e3d2ab31ae6f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sco/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/sco/firefox-126.0b5.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "ebcdc5d3bd4ae75a9b75b1f6e2a5c385becf317fc65d6e90af7648c7723cd1f9"; + sha256 = "6b630539247d6a3bf04bd49bf88e017d6124cb122236ea78bd1411d4aaabf722"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/si/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/si/firefox-126.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "1180b1a4b66c33c6b4a4686832d7301ad38c51c91fe733989cd4512d9a363846"; + sha256 = "24b6d7657d85e9fc6c4c2040d9265294e625523e74f41654b3d2cb3ab7f7cdce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/sk/firefox-126.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "d40196fb37852a6f7271f957b10fe7efee0399e16c15156165a75e6eb897e99c"; + sha256 = "454c0fa1d2d0192fc3c292a65f343b626209858874af70b61ef23ab553960fd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/sl/firefox-126.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "3e453a5f1f2cd162c322e1783c821f3d0c6c1a3029fad9cb4137460ebb416180"; + sha256 = "06404ae7588f88cca7298a8be3d642824fa4f36a81fcc2153986b008aa92d55a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/son/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/son/firefox-126.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "66f8d948dbfe9c4e9e3bb98f4158651749e79c30383d659962aca9637ae13a01"; + sha256 = "b4314086740ecff614b996820b8510f21a945a0d6ffa47d335ed29f2905b0b68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sq/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/sq/firefox-126.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "685c3f88030bc4082d13fe3b496219a591554d7470301b52a3b650366e4965a7"; + sha256 = "2d765c05e3760fb409f3b1150485f601a053d86ea04af1a2e50b9561811b22aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/sr/firefox-126.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "47cb9c59f071dda48794ef0e5a121d711862ccb1f4c7fceb49b8a07df6a279e8"; + sha256 = "8ff306adbd480e9cd2d970a53fef27d3c395e34fdec447f7336610647bd699d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sv-SE/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/sv-SE/firefox-126.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "5d513a96e613959689aef88b805d7ca72eeb02ba909122271381c9332f856647"; + sha256 = "ba9c313ba259620e99e9a6081e441a09dc93f79c684986ff8f4d5cbc31d5a8c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/szl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/szl/firefox-126.0b5.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "bb9c37c214cf988dafa50c100528168004783004e9c944c488fa69685fe53af3"; + sha256 = "cddeccf3445bc9f109b828ec6c19ff4afc16977a92e44490db269851e502830c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ta/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ta/firefox-126.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "1a1911144b8877ef8d6c12bab468f29aec88a999ce8abca715a310fe2afaa175"; + sha256 = "a658ad77c57548a19187b504c5684e6e94f41013dd2778579419e909bc709058"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/te/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/te/firefox-126.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "7189b85c076a2bed2414f8e2378ae23411e112d6d2ca4018e2c1e0e8dfa73b1c"; + sha256 = "1cbb9543785690ff78e2cee8b02305b32ca7b5a5df190cbf9f00237357c05f41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/tg/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/tg/firefox-126.0b5.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "5ef586cf4d00f4c06510a2870e15971db40cb39bf28a7488979056f4ba67cb31"; + sha256 = "bb93d2995e8d39bace1a7cc4641b56ac79631669a993a1f296e7fe016617df1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/th/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/th/firefox-126.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "eb5c44af129c8f5610d3cd8f609775baaa99917f62276c589044fbb4706b9d6c"; + sha256 = "955e20194a32a7c08ad96fab1ba6afd6850b0cb012c0e4de395c1c5cbfbd8dc4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/tl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/tl/firefox-126.0b5.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "6c4282f4a591dfb9fe6640bd54ddd9a226e0c81398e0fae3a870f183eb3bd1a2"; + sha256 = "fa982788ef58d98081b9670932549e9d8220dddcf643069d1ac944253dc0e610"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/tr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/tr/firefox-126.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "7dbc7bec063f87f3f819be6bd6fb86ea391ec1ffdb5e37a851da12ecee04ceb8"; + sha256 = "3f12c1b742d4945b8fc7019a470b682ad409d89ca679900d6f0185b313640dde"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/trs/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/trs/firefox-126.0b5.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "f07ac8d5971d46bbbbcb000e5171a90326dd43ddedfd380e5c16c445bd75a1e5"; + sha256 = "b059aa4c12343e7940fdf7de08da40fcf9a5f230c5470ccd8ef3bd491c8ce2db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/uk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/uk/firefox-126.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "545bfc1e7747017e7f7455aa1cd0b49768f50b38c8d688e502970d153638d3f6"; + sha256 = "f6349cd8a79e36f81d53b597b1068a5b853f34378dac2aaa59db213081764b76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ur/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/ur/firefox-126.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "06854c5ecee95ac99b5cfa60cd1613d46bd682e943faacdc73bc37ba6f525d2a"; + sha256 = "94ec0fc0bc2d3d53d7acce4300cf09571a0cfbace00ba41a69ef75ef742c709e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/uz/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/uz/firefox-126.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b90820febdf7ad047c20a7fe30e451e28db57a4e37801a897769d3327e5fa1c5"; + sha256 = "e77772aabe8473943b5c062a1d7e6b887cd2e8205d5c0d87ac69819832c493f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/vi/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/vi/firefox-126.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "0fc392639fab1c4355d81483901da48cc330f32c73219307459943369fbfcc4f"; + sha256 = "c73802774f2f9dd73a62b9d07fa77d2e8da62f2ab519d4a1454b71d6a67cf9fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/xh/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/xh/firefox-126.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "c9a28f90105395816316f1e3dd530db01fa2816d28df72cdaf72ea948e6d09a6"; + sha256 = "cea6198851ea912ac1d0e2e060fcec056054230dd532ba64996cb1e148fef6cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/zh-CN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/zh-CN/firefox-126.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "30b8b1356f61011d7d55d30517f64fbe000830ad488d9e7e3aec3f691483b035"; + sha256 = "0ece0aef6ee9112e92e72c570be6eca108b5331694de4247a2aaab2003a95770"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/zh-TW/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0b5/linux-i686/zh-TW/firefox-126.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "d52898626df662970547ab0e9e407966dbed09e3c078f80d3a0a4552f4905b04"; + sha256 = "b2cd12df0910ce19de2a1a4f09415ed318b25e9059b526c79cea473e72c60727"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 44b63cab7d..81abbb2683 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, config, wrapGAppsHook, autoPatchelfHook +{ lib, stdenv, fetchurl, config, wrapGAppsHook3, autoPatchelfHook , alsa-lib , curl , dbus-glib @@ -64,7 +64,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (source) url sha256; }; - nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook patchelfUnstable ]; + nativeBuildInputs = [ wrapGAppsHook3 autoPatchelfHook patchelfUnstable ]; buildInputs = [ gtk3 adwaita-icon-theme diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix index 7a02d4c870..fe964b9570 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -1,1025 +1,1025 @@ { - version = "125.0b9"; + version = "126.0b5"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ach/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ach/firefox-126.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "5763a1d8083ed8eb427559dae674d2d28de8d89bbbd34b7019ac560b08dcccee"; + sha256 = "aadea702b7fd435c9a6a90673c1b055e78e6c31bf5ea8b22b362c394b429cfc0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/af/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/af/firefox-126.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "35843e4753345b554047212b8fbaa964c9f551bc17bc74b675630ed7ce975743"; + sha256 = "9d0443133506dfbd6f20038aa8fc5449baffc2ec39290332145c2069f8bc9a14"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/an/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/an/firefox-126.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "0b41f5d40954495cb185e9f30784d6ce35202d1b28639c5a6dbcd63ef9d1e034"; + sha256 = "687d8a868302fac2a46168d1e0c3b9b6d40eadd906a17cc67732c7c1d9abeaed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ar/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ar/firefox-126.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9dd02b44542ad9c672038b2c810cd4aa4650a0463ef3e4be803e64e44a78bb3f"; + sha256 = "f69161d5163d3d36686a3ccb6a8d60a86846c2858e9c9bd1c471677f3bb9e6e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ast/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ast/firefox-126.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "bcbc69b092d2b82a8ab1ec31e7514789f5b86eecb164a1893855b206547c7a11"; + sha256 = "652bbb9d51ace74d186ae3de36aeebbd7e71a5e72a354c604106da44e632931e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/az/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/az/firefox-126.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "a106c810bfe2225aef6b264e76d80938b4202c9bac411f50d8f1d0dfea8e8d35"; + sha256 = "30e40363485d7bd0893c08f05dc97741e08cfceb04a7d2eb7d5ccf17c72bf944"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/be/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/be/firefox-126.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "3126353bb4bb59d248e7f48ddfabfa22c4cc28d855c76dc221989be1a91e8048"; + sha256 = "fac31c7f86d82dd015f1227d4b39924e1e08cbc9d0b6a9dde5207f2e3529c76d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/bg/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/bg/firefox-126.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "62091a371df3c8c592608dbc6ce888ed543cdecf481e20a69063442cf11a23e2"; + sha256 = "9a6fa24f51767f3b303d61d7dfc760ca55defa1296bfc9d037ecd1ed6afd9c09"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/bn/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/bn/firefox-126.0b5.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "4c16ce4aaa860641e99b91a67b41d0e0acc249fc079a0e086c483fef14d81fa9"; + sha256 = "65b6bc95679547df0a6986fbd7156be0fb1e6848bcdba02b645c5779e54054a7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/br/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/br/firefox-126.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "48245fcc1eea99682635271c2eaa9557772c90e4a64b0b05258919bc06d0adfb"; + sha256 = "d555b830bbdc48e0b5a59d4a4f2f73a2294c099b5a91bdbbd32531f4a89b84ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/bs/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/bs/firefox-126.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "b42fe380f2e758695f2eca9743482d0d2218943a2318df6ec026588513507f07"; + sha256 = "3cba8d16d5edc777353a8654b91e7cd1176cdc2acb8c7df5d2713951dc21bb2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ca-valencia/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ca-valencia/firefox-126.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "d1e45ea220681430c3f797828c5dbfa49f6f13a5ad67d51494fee6ac2da42277"; + sha256 = "040147cd8ecd354485d3df4691ca99036d8ec2ff0f25add7729e4a2751d9d178"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ca/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ca/firefox-126.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "b9fd921b7ba24bd7cf4fb39e79bbd2410d515742477303e602d2c9b7c851ac50"; + sha256 = "0614be9b81fb8ec1156a6b226d82e02346a2c229b148ff170583a0f14a7b66f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/cak/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/cak/firefox-126.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b963950aad364cc55e313bc0137ab64306e00d257a2aa04a9a005e28dad4fda5"; + sha256 = "7ab6099b339aa64775562c0e388b604a571ba610ed2d22835b6ba3fea3f685ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/cs/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/cs/firefox-126.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "5a1bbf1995be530f85af2007bd78637e070220e49f4639f5591a6ee784b1accd"; + sha256 = "b367e93b63e0eab7a7e1176b2cc877cc31e1b8bfbe23c64c4db2492f915ebd64"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/cy/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/cy/firefox-126.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e60170253b00740f68dbb2bf89fef3ff4ae54728dc5663b4ff1ec2902861f977"; + sha256 = "fc659db104968d92aebdbf60b0341132891ed6d14c0b444547a10a2a2d4be262"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/da/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/da/firefox-126.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e9917414d63b04cd67b36ecf5e042107cdddeacfae82cc5df812478e073c8db7"; + sha256 = "4ba74c927d83e8e84f4db5b8e20b9a593c2866640187deb15c9308242cd20994"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/de/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/de/firefox-126.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b74db687258caf7ea7cf5a0a25a456dbb7ce06de7ec08cf7e84b641bf468fcaa"; + sha256 = "e7bd1092bc9bef535a642ad0abc90bc855f83350f22bd2345f23f0924917b194"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/dsb/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/dsb/firefox-126.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "a63af3feb1795d1384754f739ed9c8264578cbd1245aa1df276b2bb1fccf0f8b"; + sha256 = "8a27aec7aa633671f6e5ec385f2787216257b3a667f79246db496b239f6216d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/el/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/el/firefox-126.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "476d56afd9907e10b390ec24b9a32cffef32361ff2f53e82ca3dcb06d804e37a"; + sha256 = "4a773f33acfe4f2f6e27d8b59dc5df448262f972985c1cfeeb86debd167eb536"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/en-CA/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/en-CA/firefox-126.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f83776d4acede5b43b66a64361c5a0adc88118db0094d9f2e846baf93c17b180"; + sha256 = "bb878750660b575da5519c88cf06200e5006ba8072b580c4aea1dd9b701ad4ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/en-GB/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/en-GB/firefox-126.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "f38a1f63adb9a83611741d070fb383a358ceb281d1531e7df1756ac45e685d6a"; + sha256 = "ac6fbb711d9de6c3a307b0bffcfcf7e5a3d50b9b62a280b026bfd7695280c223"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/en-US/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/en-US/firefox-126.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "044ecea7ba76658458a4993bdde9f3ee11f728ee80f30814549a0650479918d5"; + sha256 = "8698e5366a2f746208a52ac38ccf4087fb1c1ae4b2cc5596ab6ad289339a88cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/eo/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/eo/firefox-126.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "bd2c479b2713f6bf6a97a29a97af4c746c223cf8383b0b141562c641625b2aab"; + sha256 = "e7f31b325611365b62223d816ce6f6a0d5b5d1b13d7683d37f6dbf1fe134cccd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/es-AR/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/es-AR/firefox-126.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ff04b00f2fbb4b141a457144c7004fb3603da8de4e91dbae8f8213b12c2bf62e"; + sha256 = "e2e6cec00240ff005879786c3b2ac9eaa32bf52f1c9bb56119161f16121f7476"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/es-CL/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/es-CL/firefox-126.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "f9c123392943f120fc4da1db741ac37546c5f11f131acdc0ca3a78356cfd063a"; + sha256 = "d31e59b6ab3bb8ff78c334edf03e4151e56449b5d4de5a1463e3e5e720488cbb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/es-ES/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/es-ES/firefox-126.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "613ddac4090a69282b6dd71a4406d5b6a8bd0c80213727f405a907a03a959a06"; + sha256 = "bac16e3d7bf01339fac50077514f0e8444290a6c0349839bb155a8539324679d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/es-MX/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/es-MX/firefox-126.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e29803b3625237c89eae9fc822a9d0e1c4df787b05403c7608f50dd09b214e36"; + sha256 = "e41b8afba817a5eb84117a1526cfe26ebf3f8467d6dc5abac057ffe0d2e0ea94"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/et/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/et/firefox-126.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "8ce5eb6067e6ebe543edc7300483168b37e8517d510f1043fc3268eb6a974dc7"; + sha256 = "20ad510b43d37a58fd80c590340a947c1b6df95590b97bfff7cd4c62d07723b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/eu/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/eu/firefox-126.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "17cda4971616dd4b94e2fda1f14b04a6732d7d696c70220a85df84d60fbf4e70"; + sha256 = "d1806f999e5b91deb3fa5e4c7858e35c8e141f347efc990fa461069bcc5f8175"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/fa/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/fa/firefox-126.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "137bbfcc720f9b816b12cdf8411bd2b2eea9f64ab55a097d4cbd183d3d4b30a2"; + sha256 = "db81f9f32f2ffa07d99ffec55c19ab610a71ce33acdad63aed6a51482f73b3ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ff/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ff/firefox-126.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "c83bb94bb16d6bc70279c51c1e2b437747548013d019434629b526d371ed7301"; + sha256 = "590d831346b3e052dc07ad2682ede64289c7d34698eaa5e367403553429f6b6f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/fi/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/fi/firefox-126.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c4a6597b6c859a6aa8d34c7bf7223245efab431dd4d11bfc7211336b78a135d9"; + sha256 = "a97ad5462016ca9bb909ed62989257a2a84f6474541fd4d110f85d5363e86323"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/fr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/fr/firefox-126.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "a36791d4bb76ff3ab44f4ef255904e354657fe9293fcb94d276063d430dde71c"; + sha256 = "f376c6778bc22ccc6fb08164e246d86a1410a767c76530c0e995bba633805c49"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/fur/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/fur/firefox-126.0b5.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "a4380bfafbfe0e752d67f5797e592f3be615ca054b78cdd1afabab227d23bfcb"; + sha256 = "bc5b436e9b1ef0a835ca79d522a802b105792bac55fc94c21f5e1cc8c2ae650c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/fy-NL/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/fy-NL/firefox-126.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0071da3213e18c38cfda739d00a546772f1726461ce0c9d1ca268137af1db628"; + sha256 = "e6e84437be056e031149e13ae3ad67327c1aa737cb1c4f4d2aadb20be453c057"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ga-IE/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ga-IE/firefox-126.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "e55e26f3f9c3a1326d299345177e4f44a088f4342b264bb039882495f2e66fb6"; + sha256 = "147bfbeff3cef160c82f978c88f6fc2f2aaf1225213a96704343d5baffde7a24"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/gd/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/gd/firefox-126.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "92cfd3ae367a1dcd42cc8b6a206bc7429d3eabc26c4f98662894ffa904c27fe2"; + sha256 = "e00839b12a3bf928ed25804ed34607bb2d5904a9aa16a1cb701d45105cc36301"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/gl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/gl/firefox-126.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "99032185cb6591ea1330c3e83d5e5fd5acc6bfc735eb1d50758224301e96f745"; + sha256 = "0689aa03acab6daec08748be34ce4dbb59419706dbb92e1ec5796ea574160d3e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/gn/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/gn/firefox-126.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "2dd02e5fe5e49e7ec5fa6d29c88ba1e33ff5181f086620ecf0782936a43f0c95"; + sha256 = "4a4177a177e6fd1c9c2d284c968ddd1eabf95cc68a1521f6727787235b0f8cfb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/gu-IN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/gu-IN/firefox-126.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "5392cb825509e6398de432d3146e3a6739cef31db9455aec3ad9c80fdbf8f48c"; + sha256 = "4df4c1632484eb1de64dff8cc3e564b85a1f0d3f3fd984caaea9cfa7ec330a67"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/he/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/he/firefox-126.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "43b5397f82010d596bd8d9601b2302b06b31d7e4fe458595ae28cbefdf6e47f0"; + sha256 = "50f51a218cb85bfb291b35f19d320886c31c86f3bc62dadb4b8a67e61f09dbe2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/hi-IN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/hi-IN/firefox-126.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6d5cd029f6ea5324121c8ac5625b7fae0dca18a40175372f826ec6c4734e8043"; + sha256 = "78628f9f924247648ca6bfa5f9879d9d971e5cfd20c38d490d545f37544a5631"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/hr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/hr/firefox-126.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "e654f0e7c19eb8aa7ef774f83106a2ea0c2f0fe5574299b1a3245424de68d213"; + sha256 = "e423d5f514b7a81a6b0587e507ddf3ec34dea9c2355b3637fe928dc19a94680f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/hsb/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/hsb/firefox-126.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3fdd5e833d0a781007d78ea4bb0c0f80cc51a36afbb22021e55f3136405a3ec7"; + sha256 = "aa12cd9f3f5e40e4cb34835bde908d19fa49cd56fd5644ea7d10e7b246181e06"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/hu/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/hu/firefox-126.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2619bb98fdd5a1fdb66ba05124abf2d74ffd70bcd46e20381cbcf27ca34b1d11"; + sha256 = "84b3e5042cef460bc83703274f77dd0eeb8b4b0afca499b5ce9521beb994ca9e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/hy-AM/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/hy-AM/firefox-126.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "521687b599c57f3e689096fecf3366351f4eb4416324d72cebc2da7667c0b2be"; + sha256 = "8871dce1aa612830bce519312efcbcfda4f117397cc5e87b2dc0456e6d71fbff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ia/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ia/firefox-126.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "61c341f8a29984f504bc0b6a236d7aa3871d5c7b85d136526eb91c7e8c89abfa"; + sha256 = "6b5464a8913c7a6cca023c5e19466e2ea217a71366d833b50dad61fb27f9a4ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/id/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/id/firefox-126.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5c8b39401c0307fcc863fc9ac6df19347754bc0cbc95a1337fd6ffec8a0c6cb8"; + sha256 = "bebdc7251b629e9aef7456180cc8ec38f624d50239d92ab4290e0ced3013c14b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/is/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/is/firefox-126.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "f3db46c7e8dd670fcfb3b4e03fff7c058c391366e1271aa0bce22dd92544dcb5"; + sha256 = "489c56e584acade82eecc7873c3c4e68c8ba23c6441311cf1c166e633f233618"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/it/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/it/firefox-126.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "6d8648f7f86947640436b7f690860437b9aa23968f238c0de788943b50c18347"; + sha256 = "7f0724aafaeb78001de81008e165bd8c7e76db4633b8f452d577a5f50a1eaa7d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ja/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ja/firefox-126.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "0b0e74e3a132883deca562684e5ad6002779e4103a8a222c9d73744a5198e230"; + sha256 = "d6fbcb972566b90e4858b14ae864eaed088e4ef04e4a642b43656765e15be008"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ka/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ka/firefox-126.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "8113f606240b54623e6995d73c38375008b8510d586a86127a73d88f15c9d29c"; + sha256 = "b5454dacd7c3b2af91f880980d6948fb864c99a92f5a6b7d1cf775a70bb1df22"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/kab/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/kab/firefox-126.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c1364acc20e9930eba1571408c5554d7668b3ebef7d481d437eec5ecb4d34d6e"; + sha256 = "326a5e1c452b869ecf119a3874330ccb341baf10f68a17716350e39dcc6621dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/kk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/kk/firefox-126.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a3d4d4cb5dc5374ea732fc69a350f1263e12529e09358329e926bcb4db13493f"; + sha256 = "bdecf37f2f73eba68e3690dbf8c3a8c6174e4e54d6255f1e435bf106212f30ae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/km/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/km/firefox-126.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "7c44d1566004a5bb60239842c344db63d458d58ddad6bd1aba1dcbc1c2d50b49"; + sha256 = "f9f37b2e1b81d104295ae5c926ae201b2bf1e6620eda3c1d0a82e17153c3efb8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/kn/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/kn/firefox-126.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "ebc55e0ec99fdbe237d159f8ca7dc2e8f12aefd6777f56e667d18684a77a0040"; + sha256 = "9d3cba10d8ddaa85e7e1ade5484f3638f88c4b6d009cef4225ce53f2b5870096"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ko/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ko/firefox-126.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "0f01a3973f7c56de695bb59ae2d5086a8c968afb832a2064ee66db91400f80ee"; + sha256 = "10884ab9adc0203b5352ac38e1a496b5accca5dbc364c2b383de351f16d6a420"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/lij/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/lij/firefox-126.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "9d87ba2f9481706aa171987b997db8d6f46bf06d4b169f69e5176b2f46361300"; + sha256 = "954f466f7a1803b63aef624e02e3a8bb1bb449e5941695e61596962d56679821"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/lt/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/lt/firefox-126.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "0c591ab551bad318e76cde71442b31e131e9c1384aa857e88a8e091b16b7fdfb"; + sha256 = "0995741098c46398493bc153ee797d540d63d77bec642143326d066e9a4349ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/lv/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/lv/firefox-126.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "83c4cb164524bdb06fec6663b47ec6ef8c4c875fe77234c3378e5a893617106b"; + sha256 = "20063e09da70ce19d9abb0bc6c6f657c6d5661f4a20c281fa56c06354034dc10"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/mk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/mk/firefox-126.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "a16ad06e6cfa4f3423398017da2b790da75a7fbc07c0ea69b8608368636229a6"; + sha256 = "b27ce3d8dc0fa083afaab8844350cba8d0b356cc0dd8cc591458c993396f637a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/mr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/mr/firefox-126.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "8b2bd7a5eb289c8bdd3d39cdd9191bcc52373e0d82948337b185176057350dac"; + sha256 = "6fa92ad541934296b50c34105908feaf2124125350cf913bb1656bf7fac5784b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ms/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ms/firefox-126.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "5d417aedb9c82d764cb282b545af3a0861b450aa6c3b5a52eb1122b6eac5d0d3"; + sha256 = "d0623362a8a8830f117870464de0c0e648e32cb66b960efdf49c43a3c6dd3530"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/my/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/my/firefox-126.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "036be95f31d2c807c314f8037f7eb4d29636d51e624d2e4f7bd969504debe089"; + sha256 = "4a96f707867cc48b34c558da67b4b3ab2c561d4f9221635bb559a622d5ac5481"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/nb-NO/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/nb-NO/firefox-126.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "3d508277cbd1c7f0144f4ed84c55856debdf46ecd12850fed41863666e6e9335"; + sha256 = "155a097e982c47636f7f9f9816669ad201dd11f2e4d034a4b5f27757234ac73d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ne-NP/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ne-NP/firefox-126.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "0b4a561c4a27e08686af8739a5156f4ee18f04844ba25797c1c04fdbfdf1570e"; + sha256 = "7e9dd8d3cfd969b25c2e01d813f997df86e9c05016e98a8e991dbc72482c545f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/nl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/nl/firefox-126.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1ce7061b04a54c7c889bb5d01f6c142f14380859be09c98bff65ac5997ea9b27"; + sha256 = "25fc631ec62ba8b488c923c06dc7d1846102069f6b9fec259017809bb964ace0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/nn-NO/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/nn-NO/firefox-126.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "f9599b1bff9bde775ec288191f5bdfa3a1d9e0b2f8bd537d205f1678108156d1"; + sha256 = "3d76232fe1126d94f64c7dfec0975acb6b8db9668275cc43fad5a62a2b9f9a04"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/oc/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/oc/firefox-126.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "63f2d7377795fa765465327e56fd40d2208d4d1248ce57ac148c2e9b394171a1"; + sha256 = "0dfda755cc4f2b4db90bb1715fce8ea630f8458cb42aa32a6008ecb8f2d7535c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/pa-IN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/pa-IN/firefox-126.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "fc3a2cfc86ab632f37a6b52f68c6b3f8fd88b27c7d396a62e926589e187a14f2"; + sha256 = "10b14b2f8d54dda727c1ecd6dba83a5e9cad880f4228cc398e6ca7fc1b43227b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/pl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/pl/firefox-126.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "5fce867b9c70330c0c73f24020adb2a822baf0781fde828e387b82c23edd31e2"; + sha256 = "50ee99d11d384f079480bbb9c824519e7b4756b3d4c7fd908353b3d95d538b6c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/pt-BR/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/pt-BR/firefox-126.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "7854d304aef9c0b91e2c116580a622cb2e3b4c856e2bdd953243631c4ff098b0"; + sha256 = "2e09ea51ac746045fd40fa6a7925e0683d7fc13eab785de294d7b1ed540d04b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/pt-PT/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/pt-PT/firefox-126.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "81ccd6d70fb796183871f57544de81b54a20a809a82376c24924c82b6e775242"; + sha256 = "ab9bd6fa3dac37103ceaeee7665ed803c4934d4d8412b22fc6ce175c1b537b1f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/rm/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/rm/firefox-126.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c4f015e71bc3e16f5a6d24c6e29b7338dd34ecf9ee2d40ccdb699fd688b4f7ef"; + sha256 = "1b86c15f6bc1036dfd583ead5ffb1495850c1d6f513af0cb9ee6c7e0703d51c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ro/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ro/firefox-126.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "ea6f517ac3c7c30a0d07aa9bc6f43aa64d48165bcb5ff4a59ba460305c317666"; + sha256 = "6611b9c1af4dab80244af1d6f90354d5ff55e7fc3a29ca7ac07a408c62aa527f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ru/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ru/firefox-126.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "75d7d6d46808d100e83490ce251297e813d182479a8160f9283f7dac22d9df3e"; + sha256 = "8991c38c843101718b10b0d1e1380711593284cc270a7e0897201f3d667a39fc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sat/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/sat/firefox-126.0b5.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "73172b38d03c036b5c96e7d4ae2cfd3d1e1ca27e6e9970c434722083065e3c37"; + sha256 = "d61c74fca1b02ce76d2565219fdd29becb88ec31fa1d66395c9d31fad04cdeee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sc/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/sc/firefox-126.0b5.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "1757e66e8287439ee4e792a332008c923accbca70aa091800d0107ed33b49fe2"; + sha256 = "64c02479980bf2971bdcf570529375e934c809ecd476fc9b51d892b1a50ea662"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sco/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/sco/firefox-126.0b5.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "014438de65995412947e4e7f36a4c03632ea16666d3ce810d663534b307f3c82"; + sha256 = "665a262095be81ba608fe959c31a1f90a6f46c20dc73b974fa82892a66559304"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/si/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/si/firefox-126.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "5f53868cf700ff746501302b820700542b5bfc2ad40f9db3baef08e0c4c1f0c4"; + sha256 = "6f32d4c36a30e855f467095935fc2b9417046868602506d3b7b575ad8e3f373a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/sk/firefox-126.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "c0aea479860022b95edde68a58bdc7e720a8274a53019d0ae926025cd0ec3fed"; + sha256 = "d603440e7ee9b65e12327024ffbd240a63493feab83fd09d2b6ff5ee5c6565c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/sl/firefox-126.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "74ea3e505f41a8fe1c527bdd7642aef0cfc39d7718a6eb277380dd3a952c9b24"; + sha256 = "19fe649c94f9f5d6f583c2fc437d63c4998fd8954f14674e691d8c55329a865c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/son/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/son/firefox-126.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "feb11969767e697bec405c77e80c9267cca92c8d3d486e176730a68e3b34699f"; + sha256 = "33ffee14974d1723f91fb456d2a2f7a61f4b9d8f8c205744b455b143cb22f32d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sq/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/sq/firefox-126.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "f471f651aaea6db472408295c86b9d07c8d554a42e68662ee42fedd0d97465db"; + sha256 = "b6a69416597c5b62863d5bcc9ee4ac63de03e13808b7875bbf75d531578e1db7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/sr/firefox-126.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "35d161eb1933458b1c0dff11e4cec387a1e190c2da6efe80441c7819a0eb005e"; + sha256 = "7a354737335048a21a95c581a7db7b4186779f97e4900304a5bb93566af4952f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sv-SE/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/sv-SE/firefox-126.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "725c451b118b76f4faa4bca2be8ccf2085bac6e1022421d5f7f8701b1a96addf"; + sha256 = "58e676c649f9d6135cc347349660a7b364429fdf8f025570f8b0791868f5d0ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/szl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/szl/firefox-126.0b5.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "e7c62582be07fff7b98142564e248d05cf5b9c4e38ca6bb4910bcb3504ca95c1"; + sha256 = "4dedbb590cc4ef2330aea3d99a6f782b3c8ac2bb3cdbf21ae4f96527ea75d1bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ta/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ta/firefox-126.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "3a4b492c5c9805d2fd39f7efce9a926200347c857a5c4b556fe9146a783af14e"; + sha256 = "91d142a2c2a0d85cb468889d84ecd6411309083b7a7802e0ecaf0767a697e574"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/te/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/te/firefox-126.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "ab334857e420a93f95fb1273a1d54252992b185dcfdc339b0b4215f768520d7d"; + sha256 = "a803b84500d8d456f27e48bec8e28b6dfe1b3a2138928edbba8a493f49752e84"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/tg/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/tg/firefox-126.0b5.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "a12e6605636f8c70db0e14213a68087ac089c94fb1bb68829c029b59aed076a0"; + sha256 = "3deececb0f338d687eb691efac5a4cb653ebbeff9e5cb8532c7c7f8a7566429b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/th/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/th/firefox-126.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "602669936f1bd0f9dd8d0dddb303bbe5910df5e7b43bf9de09daa06163fc3e65"; + sha256 = "ef83982d27cff044938d0648bd4eaeae5ffa99e3d64f5abeee0b5008fa2ed93d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/tl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/tl/firefox-126.0b5.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "75008dda2d18caa901a50596b4551fb3ea667714c1ef1d3201a39c3f3a539804"; + sha256 = "2b52f3b404d8f7d289300116f7069a19bfdcef4d28cbc31951137ee91b771f01"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/tr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/tr/firefox-126.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "fb2010550552ab278008b45a59e78096b84fdf06efc739ce6f0a8b20ad3168c0"; + sha256 = "abdd243d3de3fe4410da0d5c332538fd106a3bf7007d7bc410700bc83277b1a2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/trs/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/trs/firefox-126.0b5.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "69498b0e7f74dcb47ee0d7bf96cd94bbc647d2428ce9a328e2bbe7c3c33a7cb2"; + sha256 = "bbfe1fba6424c743ff7e6e8ba692e7cf9a46491e29af4d9efba330d44d4625e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/uk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/uk/firefox-126.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "6d176a9adc95a6bc825fb9efe393f22910814e1680549f8b75435e637626bb66"; + sha256 = "85d2599c2161979f181df50a17c1b77cb74e71f1be94d2b753b8987ec9349eb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ur/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/ur/firefox-126.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "6e21ac2eaa71cf1994f21ec9f7054db139503344b4702260a83e83471003734a"; + sha256 = "9eba764802ef50860b4a1c85b3202a6464c3e1ef2bb5df70d6d052735cfac21b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/uz/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/uz/firefox-126.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "c0eff534fbc1ff7d1b09880498df980abddfd9540ad386b7b62d89552bd3a831"; + sha256 = "82f8614c230a75f41e5c5639c60b658d4fac8fa9056615c64cf4a928ae1eb418"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/vi/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/vi/firefox-126.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "825f7eeb10a192cfd69481d1534de17814240d133f3ca90fc53f5719d4e87b00"; + sha256 = "f595caa6bd9f77b151c9a5d74020870df9a8c7827360a491fa6174d85265a026"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/xh/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/xh/firefox-126.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "874a64ec14de047f2fe9b81b8742b6be39db1895b166bd2584cae6328ac45790"; + sha256 = "27ff854d32c01c3a2bb9e7133b7a2ced467e47ef99f5144b8d24a3b7ca313ad6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/zh-CN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/zh-CN/firefox-126.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "21a8ac3fce56809cae9b8da6a98691561e1c929a44ca65025c4769c9944c811c"; + sha256 = "67636bffcfb4e156be1fcb3f4d686ae892a78385f77d8d735f79b2c849740a6e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/zh-TW/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-x86_64/zh-TW/firefox-126.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "71722eabea75d8200c881549f0e04c00592b8c995c62047c34b9a30e8061fea9"; + sha256 = "62229e20c259a5d9f070477bce5c5082053b68f10017014eaef714a627056ec1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ach/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ach/firefox-126.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "9d086981de24e8ae62b5e07c7bd49c9c64f86f388ad6fa5f53a8274400bc47e2"; + sha256 = "e745ec55aee55bb8f68fbe076d0177eeffd730390633b31817575a0e644dcb03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/af/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/af/firefox-126.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "1cd8db9ae142d8f043f9b4978dbbaa671b16b7e3a5d3e47d4cbdad60fbcbab7b"; + sha256 = "e70f999ee5b532d1602e7cb43db58219ea09ba123ef571ce39374fb6afa15c07"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/an/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/an/firefox-126.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "1d85f09937844989db25c498c3c7c9937c5e7d69fe0ccaeb0b46503ee9909bfd"; + sha256 = "4f50f835ceeed6552c71faa076b8d4828ca555224c21d57044fe895ee28175b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ar/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ar/firefox-126.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "165ae5280ec473aecea02ce552fd9feb38ef365a7b381f3b9f7909884ab54e0b"; + sha256 = "ba0d02b76cfdb14da5be452c51c19825ae41a866248e7cb5f2b997f75a25c505"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ast/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ast/firefox-126.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "d2fff1131f320cf0a4f5dc279d1ffc2ece3ac239accec36a69f8c49b9a01593b"; + sha256 = "83031e923adbcb3e2e97fd2e76e8babac19de9cd74e9645524181dc10a3b3e9f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/az/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/az/firefox-126.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "df109da3ce91ad390546228eae1a758e9c2b25319f56e07ecc00a79bdccc8a5b"; + sha256 = "6a508a257fd60549dd860478cbeca325d253339ce6fab4689c06088b13ecb704"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/be/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/be/firefox-126.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "33fe571a5720680a10e36cc1ea6b82d988688ef585e836eb980686cf46260804"; + sha256 = "21d59f6ad32aa479152d66f8175076635b1c73b4e207f1aa35e07157ea777316"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/bg/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/bg/firefox-126.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "4c44a6f19d68e8310c878e5b61ed65a55bb98f5301edb3f37bed5537d156cda1"; + sha256 = "40024c75ff970c4aeac578bce18132da65f3cfd350ddf3ac40db3d77b89bdb1b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/bn/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/bn/firefox-126.0b5.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "439f37184480bb5ceb10683f5ec09a2c14c08415a5fcc900881358a8d857eebe"; + sha256 = "63fdf24099be89b42f8de2f1cf6be1b88fbab53549db2f2aac32f6f104d2fb21"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/br/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/br/firefox-126.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "5387bbaba61a75f27cc2018b2b99c786e9b8b987db46e2d2258aa2763a7ba052"; + sha256 = "76a417479be76f62776386d9f4d47b1cd82b14ff2822dbf291e157a947323178"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/bs/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/bs/firefox-126.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "ce92070eecc7beaeaddf33c9913ad4fb53c265bce57da65bb2425d4f0708f8bb"; + sha256 = "fa82ff92eca43fa651f180dfcae0e138398f4960c2802b7b8023b50a17e0cff9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ca-valencia/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ca-valencia/firefox-126.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "f96fb19cdf6480d2e2b76012035590fe19870e609e37af9a878e6f092be6bc84"; + sha256 = "73ee09b6b91f8e38387084affb6d3533e7583056e4add60cf2d986223f870932"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ca/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ca/firefox-126.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f27b3a855d13cb0b5804885bef0e4a4846b28bc894082411a2a1c8b7bdcb7f5a"; + sha256 = "3de33a1ff17e433d4670d0f5824634014e3954aa3cf04707d117bb30c14c8325"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/cak/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/cak/firefox-126.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ae73c70e989f72051315bc9d806fa123423670b961e865147ffaa1659b7b874d"; + sha256 = "3380c26b6a7ef5e172000972b5f0c6552f42777f442893752fbf9eef90934f5b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/cs/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/cs/firefox-126.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "0f9b4cba23df58881a081f8d8744a851494c789100f999c2b3e5b033d9119d13"; + sha256 = "f2b6c9af691b6801ca43658e4a84f29de5564826df6b28c46f16bd98b6cb098a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/cy/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/cy/firefox-126.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "0179610fea890c7ceed80a8574386ec13b68b1963f072dea2126a292e563ce02"; + sha256 = "48352b9c604ab522a5fa0053b2c0bf3a0bff1efb1b084bbfd76fdbf84c08114a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/da/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/da/firefox-126.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "9368c56a199166d1f55fc49fdd9e4986bf7b73244e28cc106f73b89c1daf5b37"; + sha256 = "3eaae894a7aa15604b70fe046209f1b59213c789160e6cab1d647f3541f339b1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/de/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/de/firefox-126.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "5363cd0bac5d737d139efa90af240b6bf012479e3d03c74971da0f7022fb32e3"; + sha256 = "bbbfe83e4dbc5b32d8cc619a662cefb79d41dd918be3def4af8f65f665e63486"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/dsb/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/dsb/firefox-126.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "ecbb204430887dc69fa251ed83d4a99a87e29b29ccc165d28eba3b76a55150ec"; + sha256 = "d3cc51b4db1e54768515e40a2389c8103e683538a04bb74141379fa49e171875"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/el/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/el/firefox-126.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "0920af89c43bff2c2d942d2ac0fdc0344638ca4428a0c07a069644c8bbdc6960"; + sha256 = "828f22975e4887cc159aeb5a9d3bbc52c9e7c725b67d360726416df200a419f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/en-CA/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/en-CA/firefox-126.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9474400588876157f7a6011cf72fb6ed3bd55f1bbc1a005cb032c4d70874bcc2"; + sha256 = "3884e77d81703ef9d6acbff25af5927865bdde7d4981e18655abb3166bbddb65"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/en-GB/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/en-GB/firefox-126.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "3518d026bf2650dc9b9cc72422c7d311c0185a7a0fcb816bc0a9a862d491da17"; + sha256 = "7b9adb908e1c7d1c179029ff25aaa00a758e04bb8a5a607fb90b1b245b337022"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/en-US/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/en-US/firefox-126.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "1f668f71ff86c4df65594711c3953b187b41bffbb851a8b13893190e370f3363"; + sha256 = "9942b9508e98fc122bba6c0e7d38fa8557095e70f42152ea3c4b20b889dd0fd1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/eo/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/eo/firefox-126.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "79e0dce38ca7189af441f8458eea13526497a4d2faac25009d9a6cc63123b808"; + sha256 = "1cc4a48d5a3ae5297d1ad31ea0ca57d92a3b2921886cfc589da5d09c696e13e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/es-AR/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/es-AR/firefox-126.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "18092882072d6e7624055647e31a5e8e4fedb6f0ed85d6e75053e3f27605e71d"; + sha256 = "9111c3381205b7172dccc16fe7196dfa355c492d3dd00b3bb15c8e5facb36c3d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/es-CL/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/es-CL/firefox-126.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "7c8048460ea10d281e9bfd10398d00fb977fb49438731c82eaa0dfa66316dd7f"; + sha256 = "2f77fc72d82b996ea5e0cc6334f1a90bc0c719a5db46cb04f83702725e578ad2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/es-ES/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/es-ES/firefox-126.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1d463765bd15758ba17f5e2e5aee5a9d9fd2e596e7a8503a9f33ed6ea5275446"; + sha256 = "b4e354ef02a92683efb1b37641b70289b7f9125fc8bacd2eb56db73cb716411e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/es-MX/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/es-MX/firefox-126.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "3f86063846fc376145ff81e679a668e8fc982fb46f3fc79b96c36a90222dde3a"; + sha256 = "52186331c8196014eb6cff4df3b5f8a05c5128d3adcf3e1753fe98052a5a12e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/et/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/et/firefox-126.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "ef540b8f5a4a30b69d5cf5045d7d6de6ed1bd99c4351099883c2983f0ee027c9"; + sha256 = "6770e974febfa296032c0b0cfa502ed5e49d4f5abd6e5c955faff8521149750e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/eu/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/eu/firefox-126.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "99994d762d77b2c99b8a9b4f19a4f033f3d923abd65954859474c2d6ced2b12b"; + sha256 = "b85b03cfaf1e267221870983c0758f0bb55cb56dafc8b2fa5bf2abd5ed21c995"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/fa/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/fa/firefox-126.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "a5a729c2df188fdd6255c84b3a31ced1409a691f3983d12a1eb4c344bed6761a"; + sha256 = "bf5f61add2c256e3bbfa5c88226281a2db10ed03d00b402f86704b4da8b0afa4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ff/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ff/firefox-126.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "21e197166a2794b01aace690c94b2f5769d952bfb406abffabffa8eed21fb1e9"; + sha256 = "7f84fd845da18d148c5c63466a1750d0f424f644e7732b8d9e13d4deeabc0a2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/fi/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/fi/firefox-126.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "da2b89ea1c67d810cf87ab8b6ce541a7f109f68f6fff326af1d7900fb925dc7f"; + sha256 = "7dc05fc7c6c79576ef97efe8b09456686e04a2b5a4d315de26aa4a7de6c445d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/fr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/fr/firefox-126.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "6d0ab61a0d2cae6fa8c62d9ec20a60d70167fe5d01bc3d32e80f957d1f4e0c6c"; + sha256 = "e25887b699127aa34bd89a1e95a8a66ee3c755fe88425ef14f8b5ec74ca24f74"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/fur/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/fur/firefox-126.0b5.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "f95e0b1cdb13ff8a31c255c767469b58a6696866a7061e7e96165e58625658c1"; + sha256 = "6f42f68553ed54a7933fe22d35e72a0251bc4bf115a05005ad0e5136afacb8f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/fy-NL/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/fy-NL/firefox-126.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6014c17f7e1c17cb457e45ce1d61838b472e7102f7b6e9abacb8ac690acc485b"; + sha256 = "32552aad5837fd035f1b6c8609327b0fdecd21ed068bf1c087c37d5fa289ff2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ga-IE/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ga-IE/firefox-126.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "f3e3e2e026fbc4fd161ed1239b1c41ca81f6b136ea70dea30811de4ccf679187"; + sha256 = "ef3a8cc08ea7efaa89571f101502f41eb420ff93eee126bd135b58a34a2eb507"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/gd/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/gd/firefox-126.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "dbfb29292881a31ed56567d91d02f1d2bf784bd04abad86be40228e4079a3b94"; + sha256 = "200ceeb1cc4ce76c7eeb138474d0e92a673dcaa7ce9c422144ffea12192258d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/gl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/gl/firefox-126.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "9606813bb2e91aa38b525f21f6712f610a0373a81d98faadfdf6d29dd7c4263d"; + sha256 = "23faa528dfa7650fd08eb563d1f35161b64df07f0e6c39fb973e731b259d2f6f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/gn/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/gn/firefox-126.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "cf0f0e715843ecfd2bfcdb0f191956bbe0db78bf670ca1de69db65f7d274bb5c"; + sha256 = "298baa1de50fae2edc5de0f7dbc574a2234ae829875dba8fe23462f1dc34bcd9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/gu-IN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/gu-IN/firefox-126.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "66a54bb543e22cad798c60a8e77eb2886e0f43b6a921acbf4fe2fb25d7314d97"; + sha256 = "0ef24de04d3e31ce6b6484c83e3daa5ccb2e756039ff5a60cfe27107ad6c5ad9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/he/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/he/firefox-126.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "ecd31aedd802c02094fbb448d83bf2d1741d8b1621b01abd0622a5457631778f"; + sha256 = "80da93cde19b28f04130f8fb0c2b53ecf13e0894ddd4568a5326e24ae688b30b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/hi-IN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/hi-IN/firefox-126.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "dced5aaac70f3b8ec75352b3b9c3447cb83e807f10a362b20d710ba9df94476d"; + sha256 = "b3cf03edf9b7ce6be6300f7f0d5da539bfaec1ee76258958c4eb2656296950cc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/hr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/hr/firefox-126.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "586f6b96dae0a673ed23361acc175b6e558594a17640fde90edf4c6bcdf7ad64"; + sha256 = "3aabe5e9a05e995882ed37093450967f573b752c20fffec199e6fbc26dfbb963"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/hsb/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/hsb/firefox-126.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "19a20c3a835c74a41542bb4abb6349999e139d8416a39b4afb997ba4c9531cc0"; + sha256 = "19591b3d2ab98eefa993e71558c00320a5bafde9dfef83ea62aa5d466150ca0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/hu/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/hu/firefox-126.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "10664ffcc63716c480db7e7bc8d3be9a8c132bc991bddaa6b730d521705ca55c"; + sha256 = "8a54355ee1ec9d0670b0d5a785ed5a19667159928687cac8769926adcf48fb68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/hy-AM/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/hy-AM/firefox-126.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "21bda999dd6e60292b91768c49903a038b35f235b2f629e9172a2e54386d62be"; + sha256 = "db30cafc71ccc29f1bd338ea78ad0ac046e2a29a7f20a5b58092398f5b0d11be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ia/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ia/firefox-126.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "4b3fae49b34f75d24e577ec54dd2f674dc702926549cd4cb07b8ba5db96760e5"; + sha256 = "49ba196e9942db242d421976456fa5178df9b41d270f5c1961d1b5d69b7515c0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/id/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/id/firefox-126.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "768fc814f02b22ace4738c65b8a636e820b730e5fb25cc7b9d78247c1cd7625c"; + sha256 = "bd2c2b87753d57172229943e8129523e37057a7118b7fc7597f9898df7e0b9f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/is/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/is/firefox-126.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "ffbe571ee03705e1a1308caf968b49f8d025060154024b569bee0eb30524331e"; + sha256 = "cb185e548abfd9169e8db7367df3079779badb29b842a87492030e8402a690aa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/it/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/it/firefox-126.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "258f7d9cd4db147f029accf0682d1240672dbe7d4793d2e6a4dc5309a46c478e"; + sha256 = "6c06b0f3ab4ad2e5d81bfd3332f7554f3be85fb5a8ff55649d569d90a8cc89be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ja/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ja/firefox-126.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "29ea07588bc6bd07945d404960c52847fec95a4f235f7464241055a057188277"; + sha256 = "99549b3ae26f1c816c76a75909e1f80dc86d233a1b7fa508ee85eff681a635f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ka/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ka/firefox-126.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "64f421bf8cb23882a69fa18a80cd9015f2958ee71a9f0f824f6f82999afe1b27"; + sha256 = "6d897e6c4e1f6c3ba73ecfa74f0892f24f8c75d09ac6ed81466b8a5775c4ea6d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/kab/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/kab/firefox-126.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "0f2d2d6479422f077d01421cdccf0a66dee75574c7b2997dbf592edf77e1670d"; + sha256 = "6e0b66d33d9d589a1ff7999cf88f261b0a8fc6c1ec59c07df05c2fe102f358ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/kk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/kk/firefox-126.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "4696c0f2d27836d29a6f7db319c17514d0a46ee45b0939ff0ca6dfe51077ce41"; + sha256 = "45b86094d4491f8c60ccd8a0bf29f89859f6ffa5ed2c083fe73279dc05fecdc1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/km/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/km/firefox-126.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "dbbf9a8b889a985f1be73dfdb51bd9e629e4c965329365b621dd4d1e831f69b8"; + sha256 = "6ba5101ba76f482f98f1eee501e3541ca2aca9becbdb8e1c4643e90006eaa0da"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/kn/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/kn/firefox-126.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "640815528fdf13c0153dbb7cd848c02fbf87559569d230832d7d122c2f36be2f"; + sha256 = "c07f3148396eee897f020ce04558fadcea9b3b6f138c6c39ed4b3aa57a79a5ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ko/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ko/firefox-126.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "1be5eb7b33f8768b92b4ac2cb6b7cee41b0dd3eb3c5678f2c2ea7f066fdfa4fc"; + sha256 = "281f31ac39e10c6be379b6bcd4a857959aee8db44b0511c8ca9325d4fab7539c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/lij/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/lij/firefox-126.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "993bcdc81177071962797bd40737d459fca462b7e314e4a42fba67b6ad313fa2"; + sha256 = "3c2af4d878658d1a323bef0abb12ae0a8425cd462198d08262718b20325528cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/lt/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/lt/firefox-126.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f3da0e98af7ce7c8ad913734875f12d393b4f81797c7d35347f47f046b5492b2"; + sha256 = "868423a70743ca1d2631d064a08061178dc3ce6443beb3a3707fb4112e0e43b1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/lv/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/lv/firefox-126.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "731fdd044398ed0dc8998399b48c3c0b1d9aad775d6a9614000e317a1794e729"; + sha256 = "625022c66c3d7a266b91098da78094c3185fd3b1143ea530df71a1c05e3b842f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/mk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/mk/firefox-126.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "4d29864459d53b1050354cc94e8d327d36d904bd13ed88d5a416d70099e9476f"; + sha256 = "6ec70a56d648fa616a3c6a8a284e9bced88e7ce2f50218718db5f04f58a09ec0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/mr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/mr/firefox-126.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "baf9f8c8fb85701c6261231713aa03bfb16e1454bb8d511315a05445ff94ea89"; + sha256 = "ef4651dea53de6e7870289f1003f4d2f719c5fb5b360d6674355e2ce04cf95e6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ms/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ms/firefox-126.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "b6701cfa68387b1841a6fc05361f96a323de8dafabe351f03bad449fe4ec443f"; + sha256 = "5b24c603ead07e26421844f07d9809f6c19b89582cd09f6473cf6abc5db5aa73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/my/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/my/firefox-126.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "b29837b49c9311944ee42e0b0ea599146dca9bf0c64b2ad1ef4e323e63ba1468"; + sha256 = "3439db4e7ebde599e2a6baa262acd29a6c2b2087d9e6e1439d7644c49da645fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/nb-NO/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/nb-NO/firefox-126.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "98038cf55a21d97a1603a6a4ccbdc52051a7e6722434528e8b5c67df24d7bc67"; + sha256 = "4033990ccaaf2937f05280962b7cc72f2b78ee39783bf279affde551a6c998f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ne-NP/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ne-NP/firefox-126.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "88a2ad4828f94b7cfc2e856748ee6f12fe476be1547342c6b8368ec51fa4dc37"; + sha256 = "d4ea47c773d8ac97701f13705c0a1fc13d0f1de8f861584adbabbe00d6480ae3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/nl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/nl/firefox-126.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "e811b5e21885d2b9ca03e799330767dbef8545bcfd4da8f9ecaec3a96d050579"; + sha256 = "e7b2ba4a793462905777a897fbd16377296151c4a11757abf678ad58632ffde0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/nn-NO/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/nn-NO/firefox-126.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b88b939f59b831a3029a04f4723f8f6cf533cba5d56595330aaa150630c873ce"; + sha256 = "eafec75a25348745aa88acb24d6caaddf5e7bdbcb4f538e1e3e4c1167784768c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/oc/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/oc/firefox-126.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "2aa29118d9b689008b00f77b212ebb7f6bbb7b565d39d0b0385785c6c4400c54"; + sha256 = "2c0b590f5506a46431a3270e6b12ce4824f7ae9e04e6c145a071ca524b309eec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/pa-IN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/pa-IN/firefox-126.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d91de9a34cdf1cce105b29b441609d10478132d9969914b0dbea70781b166d40"; + sha256 = "2af8102efcdd489a5cff669f4b37f1b98156a118260ab60d3d626d7c61ce9b86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/pl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/pl/firefox-126.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "6e079131a4608d605c5340456fc33b414772583adf13569cb278950ff13d2467"; + sha256 = "aa55f3d1d6c1206717f0190607598bd8a878cf439e4cad104751e57cdeb85f90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/pt-BR/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/pt-BR/firefox-126.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "c108aae8ca4199c63e690db1072b906ad2e0c9c89811d1770c2c56a855811274"; + sha256 = "09284e4c296dad6cef7964d26ee32e8bdcc4fe92060dc555d8a532e491f81cf2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/pt-PT/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/pt-PT/firefox-126.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "802236cb4fcbf54848f2a5ff4f0e2db6b7c9c63bb48b96ced27b9edec8d59943"; + sha256 = "df14751d2697dd65d48eb9db603a3571c8b3190b6c55f489cefa6d3a3a8a157a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/rm/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/rm/firefox-126.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "0184e4cba031481939fd64afd8568c7b35046e512e3076a7e23f5644c72c3f0f"; + sha256 = "d87f9d823aa7d558acf224ac38f593e3e5209e4266ed407ad2264947b7b6dfab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ro/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ro/firefox-126.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "38e67909d80dd0d04b937aeb64ff3b736acf083e5c4993d5d5bc30608f1539ae"; + sha256 = "7d3eb55686c8cd3f80adb635ffb7f8a2056839df92324014bc2efecf05332fc9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ru/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ru/firefox-126.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "327d465354b3447939e17eb7df52ceef2fb35dbfa11cae26f23ce81ed9c9d762"; + sha256 = "498150f664b618217a6860c44b0ea40a873fb54a99dbb8287e156bb18ad7493c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sat/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/sat/firefox-126.0b5.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "4f52884427d43586a9fe8892da694b6aaf05e507779dbe08dad625f7b3bd6077"; + sha256 = "6e2b704f0a6d47bf49ee8bbc4704093792f16dd3e44b78fad658ee92ee680d38"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sc/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/sc/firefox-126.0b5.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "dff2e97188d7c5d3637c0923e09bc9cd3fc4a08bebdab78e4eac64d1d04f836a"; + sha256 = "2e38cbd7c6304ab68cbf310d6e155a3923b5fdd0eab9e4501e191aaa1c792a75"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sco/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/sco/firefox-126.0b5.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "9221f215930e32fff0f37a9853e394eea6ee1175e8502a0959afe250f66cde02"; + sha256 = "e1f7336f6fcee8d067c9e8ea3310c98e268b0c1325ca9ab3e2e3b985c0f13871"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/si/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/si/firefox-126.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "db518900cdcca6d4d682fb8a576b615cdd994a7814dba9fa1da408d25c2c6bc4"; + sha256 = "2dbcd443b0a604ad8606910da3f3461e426277cf95889d356c46a3ef91b7c92a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/sk/firefox-126.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "bab2bfd2c8c2c1c39061f3858c2f8ba73a0a6c77c719bcaf208c7b25badfb03d"; + sha256 = "a749249d1ffde0dfa6e887dda6dec28cd331e68d1b9c536f8656cf4fc549ad63"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/sl/firefox-126.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "2b2b9e20a735e14e0f71bbd7c3247abf3fe1a727cb15ed422ecc35dc9385c7ff"; + sha256 = "0fba214a2ec166ed2d198ee67cbb70823fc2ab719501fa8721e347e5890033aa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/son/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/son/firefox-126.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "eebd08c8e68bf3f14059c697b95db1f4848c981663bb5fda925a3ccc9b53c419"; + sha256 = "b5c1b4da06025a762c3a7e0d825c8d217b99b9997d84cb63fa1b3331d04c3d5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sq/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/sq/firefox-126.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "b1d1fdd47ab17c3e3033baf2037f4bfbc3bcd79efaf05aa4ec2fc9ff354f97c5"; + sha256 = "2e7cfb921900b72557b620b7cfde39d05a7632726db38c656a1625a589941583"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/sr/firefox-126.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c84e48d1e38d1a81c1489ea8bb005a73fb1414e4bbbf5a3d752e941c49c6ff08"; + sha256 = "9e7d7fdddf0c05299448db0e6271ffb8bb297367400cf010af92d38a667c85f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sv-SE/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/sv-SE/firefox-126.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "7d19cfa86db1491a60f0130e168e50a88ec58ab7f81a6cacc14bebbf6feb47ea"; + sha256 = "37c2f75952cf9c5c138e890f4b5c4d18c5d6b166b9f361c0532fb2955363f61a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/szl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/szl/firefox-126.0b5.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "4852141d9e59065e75cb536aabf1ca90dc5f47651ce6e444170de107a5601a25"; + sha256 = "b42a7bdd7cdef45d354f43eb3d8640dfd7f4213870d9a5ad5eb62ae497f1ea58"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ta/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ta/firefox-126.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "ecbfc5195d4f2244d70ce90bd24fdb655488a57fbde154011dd2fbf92025f226"; + sha256 = "96e64f57a2390f994cc906b4035573b44bddf80578317ea73cf1c9a95c2662ca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/te/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/te/firefox-126.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "5a9db29123d5942fa41bb8eb1e2f9b953398387b0ca81e8a3fe80ec127e0c53e"; + sha256 = "bc8240e066017f3715ca683d77829cc4ed2ab12ea384d79afa759e87fd86aaa2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/tg/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/tg/firefox-126.0b5.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "f25ab1b7a77bc2a778bfb03236b5783e291d3183aa6cc4a8ab3b18dadd1ac69d"; + sha256 = "ab31902edd38fcffb6fa025ee37861ed6b57ca8d08800d6e4f3349bfb7a2a0e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/th/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/th/firefox-126.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "a43149d3caafeaae374cb92f4afbe4092ccd25f2a3257d4a071544c466533efd"; + sha256 = "6bde3a57c5a1f50686d6264327ff3d1b0884f94067b459b4b397e564674e3470"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/tl/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/tl/firefox-126.0b5.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "04cbf4173f5db095edbf3684e94fdd4b8dd944fc2ce15996747a8598c8e17203"; + sha256 = "f89803ec0fc5c5c41c057fb123895a433198abb2c92c3b86ea60edd10d436816"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/tr/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/tr/firefox-126.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "566aaa2c06453123da73849f48fcbf9c278758e575f0e4ce3bf176e0d0be1251"; + sha256 = "edd57c9e0a205bcc2696d9fd7dec8ebd06966fa532cfe38dd947045ff14c9c12"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/trs/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/trs/firefox-126.0b5.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b4921ff0a777e7c429a3948a0ca68e8a18ed97654e12d4f1c0cde6f4c83b8ae0"; + sha256 = "0290566d5979ed70e64eb69601bb63404b9f5877f510e86be14dbe7e51d352d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/uk/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/uk/firefox-126.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "882ddc7f09c6fb20f26d8cfe67e8b67a81ab27a880b91538fcd50971fb8982db"; + sha256 = "d3268a194f9b0bf66afdcb3a412d0eab6cdac32b4dcff6330a701fe92614a2b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ur/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/ur/firefox-126.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e0f4aca4913c2e9a501b5e0df399cfd472b32844d14a942ab4642d44d75d78e2"; + sha256 = "4ea0d1695d25ddb08c73ecba4458a7ade7794c0868de1cffc902ea8ed165f5e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/uz/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/uz/firefox-126.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "41b95fc670ad2e9045a46bc842f0c87e3964a2b69a8868ce058414eeda20888a"; + sha256 = "d0d1529593d8f7a5b234fa298ec83f04611814aab584da2b390e8e7937fd40e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/vi/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/vi/firefox-126.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "09d7e0b83079b68450a742af29bdf3f6b83abb0ee0b6a4e59d1a0ddb3ca33d88"; + sha256 = "afde0e30cf0235c1d104188066b8671b9495441fc03b46d4ca895848b1028e4c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/xh/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/xh/firefox-126.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "68d1d333bb9edea2e16486383c331d8b8bd82361881d70e4bcc8c0fb429577f4"; + sha256 = "636989a36a31c8a3a81e41bbc03ec7461f05e942eda17d6c65c8876614d5169f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/zh-CN/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/zh-CN/firefox-126.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "3c3fa07aa61787b6ae5e4efdf07705c583c3054e8e6e9b395b7fc2f3e8b76c5a"; + sha256 = "ae0ee3d69d5c14e36f643c8a7aa50d45e2033d21e657c8c5693acc0a8059c2a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/zh-TW/firefox-125.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/126.0b5/linux-i686/zh-TW/firefox-126.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "bf4b9336c83fe1e9e86d657f807e20af12f13ed91e223c79a88c521db74bc118"; + sha256 = "1bdb0ca6b4cc73080c6baa43e8b70668068f722abfeb437a3daee71fe58d6771"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index af1fe9694b..c07a93fb16 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1025 +1,1025 @@ { - version = "125.0.1"; + version = "126.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ach/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ach/firefox-126.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "3eff17d5692dd680eee87770b2213b9172f9db352632e8a5239548f56b90cfd8"; + sha256 = "dda46876fc45b17419fb3c06d09c3b36d0f7fc3ef8cb9dcdff7870ddc72a57e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/af/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/af/firefox-126.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "6dffbfa2dc131ddda51c0c1f3f611590af6e4dc74463c749878f637994cb5ce3"; + sha256 = "b1821ce2bb2ce8cde7b688069a174e1fc857e79db03066301d39ee42d6791fe8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/an/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/an/firefox-126.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "e4f047571a7efdfe0e63d7b3eb56b2dd1b5b2aa15869043510eead9c2ef1b1a2"; + sha256 = "7600270871a1d5bcf5a255998a8c785dad2ca62cfcce2e2c808059b687825b4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ar/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ar/firefox-126.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "761426bf5e97a8d9bced76ef3adb29a084a02b0018f84d3bc48427ddf5016cf2"; + sha256 = "b1d3afe019fbe6a29a199a52cbfd727aa6d89a824a050d268d475e7357da65cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ast/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ast/firefox-126.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5e7c584dec51fae02722386653822d5e023fd1e82069965d40b6781c4989889b"; + sha256 = "78495567e03154559d4d92cd655a5214d84cf5f3621c825fe54d83379d3f68b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/az/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/az/firefox-126.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "daada2f24cfd93113dd755931306a34002bce7bfba4a1b7e4bf60172049601af"; + sha256 = "085e8f9cad96ffcad9a2c1e25bbbf7f2388ed4a7e0210f3057ea240b99a4d7bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/be/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/be/firefox-126.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "463b1912034a0d682d18be5d60f543d0ee9e05e133af712959232a8ba6bfb288"; + sha256 = "e58272a5f5b0afa919780d32061e593e22d7be9c7cf9e42b7361569d1ed60b3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/bg/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/bg/firefox-126.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "ba3248f9c02f0d989ee69664c779f590a488c94b8713282b7fa7d658c0039704"; + sha256 = "1bec5b56518f07abf5f2b56b50e70bfa210a1a34075d65bfc089e37fd9f0023a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/bn/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/bn/firefox-126.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "7624b5985028574d55957156b485873a0d5458716c6ee3f2c80b53945d299f7e"; + sha256 = "09533d6cc055b802c3612b3a1c975e5f968f512b3d64e3dd13fbcf4b0ea2e1da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/br/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/br/firefox-126.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "e02aa070554301849a9b8ce21ace8d02afa92f4525b33c8d8e6fc54cd1e8e754"; + sha256 = "bfbd169cf9bd0f5ae7a070f8341beef5a03216a71e1bd75179057f2090ce1124"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/bs/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/bs/firefox-126.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "568caa5b4731fb55d6e460f999f003d75ae92b417aeb5b82f4d2b5365bc3d06a"; + sha256 = "1bab87a8f437cb4e3aafe1b7c6ed9e18d01bedf6f4004faa6c40689c0280fd9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ca-valencia/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ca-valencia/firefox-126.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "8dc814a81c260f245b2233f1910feb015064ba8c1876d2528c984a8f021b8976"; + sha256 = "cfe1a015695e451b423b1d2897a4a31780ae5e8ad9cef8f6f5c1d90fe1094447"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ca/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ca/firefox-126.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "f92b82c81132772848d53e0827561b218704ba5a47a12c61635a16a54c41f2fb"; + sha256 = "b2aa6766fc820cb43e4c885885c4f246aaa40db5b6b290801f318381e1a82f10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/cak/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/cak/firefox-126.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "affbaf0c513b34d34b4cdeca35de1af1e337d2dfc2fb360e043586815094295b"; + sha256 = "26ab9b3720ad0f84a19619768a17637e9297731f3824a3f5c2662cdf0c8a62ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/cs/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/cs/firefox-126.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "c1baacdd60987568b720f95bff2fc87080be11f03be24b65aa70ea6f77eabc5b"; + sha256 = "bf7d2029945d76e96aa173e2b3768cb7f744e003299858459f95df2b033f780d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/cy/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/cy/firefox-126.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "1ddb7725eb94d31cbc2b1b5b636b5cdd37bd96d2ad7864be17b14b8b78043816"; + sha256 = "b93d29f9bf112d4f9fd5522724aad6b9a2cd30c41da77d4a2eb3a0559f003a34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/da/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/da/firefox-126.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c5b9cd2ee09bcda66225fd80acb13525c94ab1d9e10ffe87d02f54e9c6099dad"; + sha256 = "9f17d40911a779f6e5285d7afba95fe7072e5372929430e728aaf2714ff7004a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/de/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/de/firefox-126.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "f776f031ac76a06f99588e10cd4189eb6797a5fbc758842899578537bc74733c"; + sha256 = "b15f91694b64048ee631d95ee90514cee174fb31cd1d3b3ac769294de933c250"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/dsb/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/dsb/firefox-126.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "d01e0599410c98e85ccb8063c377ca711b8a90adbb05f6dc2fd41b3353de74e9"; + sha256 = "5a1b033bd3166d61433af4026942e435a43c0443abb2b400a0a2f7e1b13063b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/el/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/el/firefox-126.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "58bfefce3489820dd5a25e835eb5e58e47f60cac15bc8826d5a84a9815431a20"; + sha256 = "18b897662c121c14fef38a5922cd8046a07b5755ccd6001d7ebe6c28a4383515"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/en-CA/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/en-CA/firefox-126.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "edf44edb67dd84118abc6faee78fbb10cb207c6107b8f5636ec9bc86b58a2798"; + sha256 = "20194008264b80bb71ccb30e983f3fd128a59f7653540414074e79e14e29d72a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/en-GB/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/en-GB/firefox-126.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "f717bc337bc5bd778976c7bb2362f59b965ab1014b36b236c1f0024575960e09"; + sha256 = "16abfc46286ec9d376dba40551e48816aad8617fd8fd70a618cfe023b23f50fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/en-US/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/en-US/firefox-126.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "0f702f7690b02953e336fac27874276d9d471c9d264dc0feb7fcc6693d63bd4b"; + sha256 = "f029b9dd18e1955fa1391cfaac2fdbe338343ddff59eeb1f4b2f509cc01b4584"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/eo/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/eo/firefox-126.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "bcee9457010f934ac6f2de8f695ec1ee968704b2fe7f3b98f132ae79774d19c4"; + sha256 = "3f5f0e4af585b255749f991d6189d8b0f9b8a6c96df914966ed5b0ad9cce499e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/es-AR/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/es-AR/firefox-126.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "39df6c4a78468016fdead6a62fa0ad91a5ba504885470c39c9f82748df156984"; + sha256 = "37ce7d900ba92d66f0ea78e4cda3e43c577b6d2269eeaaafc91c458554455be2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/es-CL/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/es-CL/firefox-126.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "2f5882afb43007833b3991b115c9d8fa58235a9fbf2f830f3c9679277cb4c519"; + sha256 = "8308744a0150013cb040a45b1de18199b9cb03eb3e69c81d85578ecd6a2d61fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/es-ES/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/es-ES/firefox-126.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "bfdc7194d20804b5b9345212d38bdc08703560b5808518ec93cd81a64e0b6fec"; + sha256 = "fc7045b3b5ad6a15164b6e9dba56ec89099d41faab870a9d6d40ccbb08ca1be8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/es-MX/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/es-MX/firefox-126.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "493f3072aa9aeeedfcd2b09b3bd0487565878e3d15f463851730462a90b12426"; + sha256 = "ddf2c17e4da881c8ed4e128911f0b02ac5bb95e8cc2d43ec02bb3c3a4451432f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/et/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/et/firefox-126.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "534253a06a8d7100c7891bd4d647e4a66715f80303f2b72875e973aa755a99c9"; + sha256 = "92d94afe650e4d39c1a02f51b8bb9b2f0c796ab4bc75af7292f2605fd83f638b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/eu/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/eu/firefox-126.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "1bed9db2d2890bc951fecdd3e774cb496fbe7928d6766b8f5a65719e6e0a97d6"; + sha256 = "e7d6fd2e7eddb60691a3bf51986e9349f55d38aecc4470fefa3c9d98daa63c77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/fa/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/fa/firefox-126.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "790b694d3471b61a53b0362e4dd9d2b0378004b417c3a2374c6a059fad24c7a7"; + sha256 = "75a2a7736c10999ef86d7a42281aececd484291914cc7b1d41bdd1715514cc32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ff/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ff/firefox-126.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "cb31483e98b05888845bcab9bb9243cf9670783b41371d76c6df10d71fa32f01"; + sha256 = "dbdf9ee4fd80778751bb8218ffcecc02dc2a38d0286e6f48e2435973f06b1bf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/fi/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/fi/firefox-126.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d2e85a2719d62a69e01bdc54720b4c1847d8eb39931b78252c6468ead96d80f9"; + sha256 = "538454759802c6ee105235234544b87a6380c846e96069f9d593b9cb8190afed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/fr/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/fr/firefox-126.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "824326a2d42caa9571597e6750f307d0fb164c14a50aea4f7517c765bb7c912b"; + sha256 = "64d840787bd70d8bedae1c61a12ea0b577d4ae9f00d2e6e9ae1ee23e23433856"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/fur/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/fur/firefox-126.0.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "6d815d210ff533a8cdd35bf66ac780bb756cb9934145abe2f2f8ddc1cdc6d6c8"; + sha256 = "624cc6275197390b6d8f8ce95b4db83a7ead03c03e41148492adf83079458af3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/fy-NL/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/fy-NL/firefox-126.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "eac5be3269ae26ee8057fa93fc586432e531dcfedb7ab2202c5d5911f82b8a71"; + sha256 = "22d4598ce65a777243cade386ba9507b34968b115cb308635392b08f6ac88330"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ga-IE/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ga-IE/firefox-126.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "5ccb6e5fdeb2001fe15ad7ffe3f9e3d77ca1c35b15839b502aa03659a37bb645"; + sha256 = "4c97fef0b3d97e663d6c55f81152c781616bf8e5842ae894800f8a1a0aab2147"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/gd/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/gd/firefox-126.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "7f879a849f1fb13bf7a45f40a55ea1b06827070b21f34f4cb0cebe216af4072a"; + sha256 = "49635b4d34bbb79980a63a47872006be8bc9d1f7e9b96e2bd8423b9b1e70752c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/gl/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/gl/firefox-126.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "e41f9b2b24133a57d90b4fd390076083a1f04bb1faee6b6dfd551c506f455996"; + sha256 = "539323f69d7f5a54948553e532a749e4b1d2802dff8dbbc52dfa51d4a314ba27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/gn/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/gn/firefox-126.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "06acdbc7257e68bf4dd0d84b126ad78688bbfd967506a267d77cf1bc3803bca3"; + sha256 = "123a34d0bc07276b2aabdc5a91dafdd422bfdc3f839a2b5d225e52f484a11193"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/gu-IN/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/gu-IN/firefox-126.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "a08cf0ff8c58dc58801180c20f030a7d88dbe940e638ff58d82923328853417d"; + sha256 = "50b578df5cc60410f2bda81ac95f67b4f507e03336a4c324e84d63ab68034326"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/he/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/he/firefox-126.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8b2d5d1ca76fa3bb538f72af15a4af7180145e0c2f3f03b845965a2a6144b35d"; + sha256 = "5d6e95ba7c93d723c8db7590ee14f8e0f6a97af151ee60264a9358bac980857d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/hi-IN/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/hi-IN/firefox-126.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "478dee761374f2f156b6ec0f33e3f9d8b7e09113186b8a0945555bd919582007"; + sha256 = "b8a6c4fe3e2b853cceabaae133194b807a55feb5c8dcb01b54d82691ae4af18e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/hr/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/hr/firefox-126.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a7601810c17465b7d730b9c8bede5f0cb69f00e2c5f30dc645a1a97fe636759d"; + sha256 = "e98d20183bbd3a361f7b182fdf823b4cd7b87a43ad0c4781aad4dd7bd47dc021"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/hsb/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/hsb/firefox-126.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "aad2350a6848585062c2cc5ff5947821898f8e783dc81b3ac2a87283d24e8389"; + sha256 = "e0f62a403877da98f6731f19024810285bcd11066f52b38db0d7150b8bd127e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/hu/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/hu/firefox-126.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b4dce9a17840c641de84005892e60e1271a5a59570f85cc9f5179622d81a7c84"; + sha256 = "3d3adecc44d456dfee04a5bad74c84493267c91ae7526f8852c80b8db541b249"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/hy-AM/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/hy-AM/firefox-126.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c1f60aa1dfb9966fd9e21f25bc54169b1866f0550c5fbacdea633c1cf6a4a31b"; + sha256 = "47aace044667c4c5341a871f2729192a0ebc1af50d84395e3363d235c53f0cf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ia/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ia/firefox-126.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "bf8f8dfe6f8a27bbad18683f07c499212560c19399bf42a6f7833a97a86005fd"; + sha256 = "dfe76f863d8d73eccefb29159796652314a1ede465b56e52f0da2cc5079effe4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/id/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/id/firefox-126.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "118153305412549d6152caa1a4d9d34ffd371d460ae03d35021e8bb65cbde136"; + sha256 = "6b875b88e075db1f354365ff3523db837b0f25bc079bbae6aff4831dd694fd1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/is/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/is/firefox-126.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "bc85c4fd022ea6907603ef3654b5bed73875b0603ac0ab4ff49a6e0c8b5980bd"; + sha256 = "05ac5378b326dad5a2e37c52835a08061b83f204e0030e9ed00149d0fbf6b52f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/it/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/it/firefox-126.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ff43d05336aeb2a77a9c1f5bddf1e5bf02570c18f21b5f91a97a8ebf69e54e72"; + sha256 = "c840cedbbfb49b54aae0e446a723e69a886adc36f6c6c251dc4039ace345af2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ja/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ja/firefox-126.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1f610ca7a4433d7d8cbd2fe250bece840340e4e4cc87df84e3e8b9014d32c579"; + sha256 = "b8672862d851e4dac374a89d98a6e259786e4c6e00a292401b94e8d44891f6d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ka/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ka/firefox-126.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "4092cb63ec87a1bac05228db400a3f121224228bfa3e70e9401b3f6c8b2747d4"; + sha256 = "1898dc72d9361c7d93cc86919d4b3c882853539535523f226d906b4a9268470d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/kab/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/kab/firefox-126.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "56eaf3565e87db99738630bf2d08afb4f70abde00ef8bc0b1db0b6a531e9cded"; + sha256 = "07a1f0630c4c1ecae65133523157cf1e38f5ea7db2cee73e11c846c21ac907d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/kk/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/kk/firefox-126.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1de385e239c692e91eb6611958b59141bf11be9ec89131419c650c8c82f5ec6c"; + sha256 = "94f2b8c0ed553b85625dafd01b65b08eb0f306b7da07951ec008dea623ed55b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/km/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/km/firefox-126.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "16eb03b53450aace3eec14b96ca6b3e5a814cb5b6988643d2cea6f202f906af9"; + sha256 = "300b63d65dfadb49e4b4e5323a60156ea0da30fd09ad868ed8bab76b7ec66e9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/kn/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/kn/firefox-126.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "3b93bd087ed6a0f81e8e8670f3b578552a9d17aa34622da67780b3e1970c5aec"; + sha256 = "663669b5480878205fbd7770734a25bc8370776238be318043731ee925c55da3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ko/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ko/firefox-126.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a32868e5dfe44ec42cd9e317a60e744c82dad7bf3547330a06ddf317a337b601"; + sha256 = "2d3c1fb5925e719db9879c97017ba950c9d81f3131e2cbed468b092de51d23ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/lij/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/lij/firefox-126.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "6f99eab1a99d24554eb1ee8c6194ecee9973d087ae181fc062650d3c444ae221"; + sha256 = "0f63a277d9eb4a29113944e63cd666504b03f798b6bf9c41dc93e0a9d7450ec9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/lt/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/lt/firefox-126.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "542aa0fe483ad89ef920b1285241678fbed1b9e9f47c8392a1fbc7c2bb8996ad"; + sha256 = "582d209cbc97a77c913dffe48ab927f5a1f743505ca68d0821db70ab64178ac2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/lv/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/lv/firefox-126.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "eb231d0acf68ff4ace85aec28a5554b562a30b6b51886323eeb0d6eed1580f6d"; + sha256 = "94d7da74b9f2c8e236e312e97edc34a86ae77d83aa1f9eae311aba17c7af5156"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/mk/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/mk/firefox-126.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "f8d58941da72efb58b3d9429a048ab90d51ad08d27ecb7add4b30c2d3bace096"; + sha256 = "ff7ace9f394694e83a76cb722fb75e210249ecdafc2ee237d86ccc7a99331c03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/mr/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/mr/firefox-126.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "9d5010f7bef77c1f01d06eb5c9ddda74aaf38060c1efbd96670d02324cb0608d"; + sha256 = "ff9d005ae4ac745b0affe51cadd040213579a1561970605e14b7e97c713b7a1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ms/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ms/firefox-126.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "39647010c62be696785a8c17fd9b32c91bb6c698d3117560da02a0c5ee5c4835"; + sha256 = "a64e318bffab978f41d99320184edc406214a64d0ce3e43ab5ca79a9a803b8e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/my/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/my/firefox-126.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "4339fc0c35ab6ce4f118defa3d5f4acee5965331a825d6b1c6aa2e5c0a778858"; + sha256 = "3be1543f24f4a23a163524ff30b757741a6387bb807955f943d1b8cccddeb6ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/nb-NO/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/nb-NO/firefox-126.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "540f57e75798b9dacb26578824e5ba92dad5f56ab30289e88a1af607b6a0d469"; + sha256 = "d1af51acaf3c8f0b7328ff3e62c31bbbd0951d1a3a82f74f2f81da4c30cb173f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ne-NP/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ne-NP/firefox-126.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "cd2494580e1d76f813b90a2c056c6aa57ebd904b0adc76cd822f47559cd397a0"; + sha256 = "1f1c957660b705293fbbfa824156710c8f90347ea042885053ec9a2060834f7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/nl/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/nl/firefox-126.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "faecf7f18fd7c564c4108ca96395cf72032fb2321bf60527211c5251ced5d5d2"; + sha256 = "2b6f54aeca9a689b7f405f66e267f21bbe195f7ed13185201020d529aae97fcc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/nn-NO/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/nn-NO/firefox-126.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "f53b5e8b126e6f972d81902d5cbbddd1dc028971720904993e1f62df3468d15c"; + sha256 = "1a3535a184ddadc86863848f9f603216c0401fafb939921acb865eb00631af19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/oc/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/oc/firefox-126.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "ca9fbeb0a9f2960f8024dd5e5bc5f86b08b05df321582180619e2a240ae7e64b"; + sha256 = "5845b3b682a780aeca38b03cad6c02a353de6b032baba5af3da7e514c41cefef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/pa-IN/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/pa-IN/firefox-126.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "b824cb8e8f3d30d921abb892a1b93ca7dd2279437cd4aadd0f2bae8e65fc3fea"; + sha256 = "2568a37dc1cfe1e42d5c9dfae2dbe74cae1185abd35f9ee3977390eb80661bb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/pl/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/pl/firefox-126.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "768193553fe105602522b0ce9f6d63d4f726a939612595ac9ef64be9c8a5e785"; + sha256 = "c69112cdedc150908a0cac8a7f003bfc44dab14a8d32a31ace22748c391b7a84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/pt-BR/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/pt-BR/firefox-126.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "d3895aedffa937e5cc1ad745bd52fafe2269a5b49cd3af618e4dbb314a29b2a5"; + sha256 = "b7369e99da8a96aed5018f5f4bd1acaa252d50629179b79a2b61929d71c1750d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/pt-PT/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/pt-PT/firefox-126.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "86e4a9ff8ef82e76fc5a5aa3b76f3587897a7b1b9132de9585c41f5bae11f8e1"; + sha256 = "a2ddd2dc66e8dd6e8d7a628e090ec987a2060ccfe14015c91be2988244990b6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/rm/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/rm/firefox-126.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "68433ba1c01075484f14ab905f2737a7c05cc466073ed8cbd8903b5b3ac5feee"; + sha256 = "1edab3ce5b47dc44e2c83a7a2b0b0cee771e36018c98be540e20bd7cd5123b1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ro/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ro/firefox-126.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c34aefea9bfba08bc3657597138eb3d4b3dbae1138527b59981750b8811e8958"; + sha256 = "36abb93c19c2e629e37b73e807d1b6858a42877a035bb526eb2329bc6784fb39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ru/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ru/firefox-126.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "3766761278a43e13570542d57ede9a66a26388faca72368dc889a4ae1ad637ea"; + sha256 = "3aa49a597b80fff5fa963ac16f881aab2290ae938f721412dd42202947ad77f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/sat/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sat/firefox-126.0.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "566eb5ed634157490e3adb57b04d0f93a6662e2afe98055c4686bdabf93d8497"; + sha256 = "828efcc83d23bcf9c31225155eaa65a6248448c21e57c9b2a71f54d75fd4a037"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/sc/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sc/firefox-126.0.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "ea73e0afa3f5cf896618486542911731230265788be3d4cc9a94ccce16be2453"; + sha256 = "255c7b998f797605daf9fb4bd4f6d29ac64ef40f270c7d615c695452d0d5f20b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/sco/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sco/firefox-126.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "07bbe26242497c5cef48916438b9755b754a79e377be368565c5b240ebcaeb2c"; + sha256 = "4892e68434fb5494d8f4e7eaa95f10ffd39f75e05bf4015ffb7c0ed0e895c8b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/si/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/si/firefox-126.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "26555216a11d4e1d1ec93ea5b7d1aceb2b63fc0548139be980667061465e5d43"; + sha256 = "28440c8658377ab98cb93de1db073d264fba046e390c433148abe11459a91652"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/sk/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sk/firefox-126.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "82a4aab4cd824eedb2e0812358ae8145e1a8e9de181527355702021d9c93334b"; + sha256 = "9029db81a8258fb7e352a29de9bd20ed793b579a569e8ed5fd06d0f25b122297"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/sl/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sl/firefox-126.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "32ca73ae69c1b6745084afe178bba8f73513ccd1452bc257cbec843e7e3f5ca0"; + sha256 = "9f6f60a27ea5c478ce0c1af7de426d0d55178c506c4abf9301b50534396e453d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/son/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/son/firefox-126.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "05c1c7a426dd0e51c64023fdb42024cb963637028a7f1accea0c91b4cea224a4"; + sha256 = "1e255b7fc86c5ef4d5b7b9871cc70cea6f93fe4ad74575e48786c57256f6dde8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/sq/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sq/firefox-126.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "7b14364475e55a995577e111570d2a83aadf1c1f1351e41cf192dfa4b9f99ff3"; + sha256 = "dd918a5d4c1404b159698c8c0128ba6155a26addf52ab72372a523ec05d55354"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/sr/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sr/firefox-126.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "43c6ba007493881fa4719578b801bd0ffef4efffee5b4633ca123bbc9961bd7c"; + sha256 = "fc58ba9e476b69db4a7500e599b4933379f0ae7ef2b494e4b2df8327a6fb39d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/sv-SE/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sv-SE/firefox-126.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3c16cda4f7b56773d81ffcc36480d3c8793fe74a91d6ce59d34b1474c7579f48"; + sha256 = "3c6d7d83a3d45eff199221157e0f91c2ad483ea281ce51e738603bea4d050713"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/szl/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/szl/firefox-126.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "2ff545d757937629cd317eb453c6e7c8d5ba52c50697f81d608b2274501bc192"; + sha256 = "42d650ee5043556620c34a4aafabd1075e4ccedcf044e059d382fa4e21708718"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ta/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ta/firefox-126.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "d49331a87e9b94eb1ca3232207b5af867a9001ef71f6a2735224e7583fc860f0"; + sha256 = "b095636c31b9d760713e04969abc45223ef79b255bbd1a27cdfdd20b5d2fd9ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/te/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/te/firefox-126.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "2ca9b4c38220bbdffab7f92bb696eaa31882d5c14078ba2e27216fa1fc87b07d"; + sha256 = "55b14dcb7db3f3604d197de83cb87895c8a58d12db0f23e2023bae7a9f596a74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/tg/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/tg/firefox-126.0.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "ea3b284000e62e13620a010749e9b60534ecd2eeec31f2df3cf85df6bcb12f96"; + sha256 = "b35e457267437963018eae1ed56f4c20af928c0a24053cd7c66e6e155c8f5e2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/th/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/th/firefox-126.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "b9e46851dc8c9518ace17b1313fa61af5fe7beb696bf5bfe07875e7661fc736f"; + sha256 = "02d72cae8815ea2f9f0a01358ec131e28fb1cfb6568370f2151e64e8d919b4b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/tl/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/tl/firefox-126.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "a686195e0ed3677c77b043bc4488c985c075373156cad6f05086dae31994e02c"; + sha256 = "2004e3a1b985f73151e00f81d3d2700d7d8f6c6a8a25ef47f842a386309b9c20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/tr/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/tr/firefox-126.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "92b4600fb6d2cf244abd8941d383806da8cf27397c1f04dae892b9d224ff04f9"; + sha256 = "d2fe1ea72bb321dc3e0bd3d5b6f2a44592f5286cb420d1707293f1210a3bb7c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/trs/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/trs/firefox-126.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a655b722886e276fd8ed444eb3d359f7a1398486e697e1a7c60607857c97ac94"; + sha256 = "37cb52d3abaab1c1e6d285553c4a7dbd0c99c08713f88b6b693c5d0ddd63205a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/uk/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/uk/firefox-126.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4446466118ff2dbd8d2cf9fd115b30128e626df25fa8efb799fbf58ec86be3c3"; + sha256 = "9ba4b7ca7c3f545abde9ae835def611aaaf644257f7036d97c7945e6d1294bf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/ur/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ur/firefox-126.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8954d1812cdc7e7fd6671a0368d1eb9f12af04ae654427310a1b1031fe65a0b4"; + sha256 = "963abf5bc134585d9df57085da5d0b32b5e7e3437ddd31581d5ba86c9ae5d077"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/uz/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/uz/firefox-126.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1e481c989b7ca17770ad1e3fecf948a32125989a8d8460609b22be87d89fa95f"; + sha256 = "b52aac7d993ef57c055a48fb7658e86a120cd2f4edbc734f4c3d89e24a5beb4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/vi/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/vi/firefox-126.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "261d944075b7df8f306b0d32a19e640e896d6b37b7911aed66affa88dfdaeeea"; + sha256 = "337cecc697dc0fdadede5a41a0c3c0fd259281ffdda6bd1903f1061f96e58a93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/xh/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/xh/firefox-126.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "7cb327501663e7fe772a40723275b3d8c34391687dcce8165ca3aaef9122bbc5"; + sha256 = "a41f854be36ef9d9cf0d8a229e1b088bf855b3d5ef417cb20cd9801631505403"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/zh-CN/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/zh-CN/firefox-126.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "7d0cbdadbf0e7d772d70cc228597fdd6cb71943e757eeead166c14630d0436a9"; + sha256 = "0e1e754315f0919d78b0ad29e4374287ea3d397dc3ccee6bf835a027776fcdca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-x86_64/zh-TW/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/zh-TW/firefox-126.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "11dcac1e5a53885fcb07d370ad68e74244fd379927c9330ffff1827972cbc172"; + sha256 = "90d723ea118e1dbcf2dc6345131843df48059e90ca7e99061b91095a2e21b727"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ach/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ach/firefox-126.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "b82f69643300bac35f5c25f14f95e2ddf237aadb5ef0430520a543f0a0ecc6f1"; + sha256 = "24da13a3aed6ffc2dc8c75e4e3d349cb419a2dadd6c689349a136d9ebda37a04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/af/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/af/firefox-126.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "4adfee36050e96d7a148656415df9cef4958331e31707f4372ddf43eceb5ef46"; + sha256 = "348bf05b0613ee0741318a27b2810c666a6525757846755f5296e1f69dc06131"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/an/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/an/firefox-126.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ed3f933caaade24d236c93f4fda10f4d0ed302af1c058698d7b1b36380356b13"; + sha256 = "64d8665b8b2c2e9d9f475e546520c3a735fd647cdbf69fe605284f77e2e93b9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ar/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ar/firefox-126.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "dff115619f895d491d47b0f2d2c028c77f7c5764098a218974ba861d1124f352"; + sha256 = "0e94cd589ae11ccfd2e575d420bbef5e451959beeee2118c2a205920d74b890a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ast/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ast/firefox-126.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5ee98c5325bfae6d27e27c1c7d5a5dd8d52c5892efca98d8559ed76bbc431628"; + sha256 = "d325eebe6c40cf958e5a4f40ae55b429536e4ecf4e00e7df2c16674b125067a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/az/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/az/firefox-126.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3df15bec53ad5b5cfb265321bde6bad22c37886a2b526b2ba3d8ef00e7619d62"; + sha256 = "b8645cadd3b2b8dd790634ec8f16cc1ac478081dac234fa96eb83a7030ece589"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/be/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/be/firefox-126.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "24a5d62a81d00761c0cb14bc6c1264000cc8a1ad26b63c68f79505946021e3ac"; + sha256 = "e36e2243c833441b614ce90fff63762572e98aeedb10b8bfad1dc5268c7c0448"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/bg/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/bg/firefox-126.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "049eb23c4c9790fed8588da0896fc14ddf54f9a6ba30095aa18d34d1a3f33a31"; + sha256 = "66c0ce40beb176ae4b167411708ed3a381408e04cf34b88010b7bd0b13950e95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/bn/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/bn/firefox-126.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "be00b429dfc0555e2a10edbcd25fd4617bde75779f135656452940e687783191"; + sha256 = "1f6702ca2d492708a89450404a162a5b8131087552b539ee19e275336a556510"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/br/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/br/firefox-126.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "0b9d68cf7da38352718b70d6c14ff2fb8acec2fe22b4d7bd4d74269f1b90c518"; + sha256 = "b0599dae8e8b9fcffea5afc113c954d46a78a81b2f6f9076256922a57b840df1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/bs/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/bs/firefox-126.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "0c1337cb4c9af4a6196c8fefd273174ab28ec99a25a2c64fe920d2f692b16575"; + sha256 = "b893fd06193a43799959037b257d0079a58c7d823384d6f73668571655e7c5a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ca-valencia/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ca-valencia/firefox-126.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "60a2fa1d387dc21aa1d923347e2b51f76d63a263015009d8cd6960a7bc1efeb4"; + sha256 = "3f8d3a6566b616ef7766bfe7a342b0a138bb4b5cffedaa65e0da03ae113c1bc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ca/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ca/firefox-126.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "dfd409f0a4d17329080b58061be53b57d3c95a8a11579e47f17bcac90cd476da"; + sha256 = "4e4ab9b73d5f939f8bd824453e197e2e668518c99f41309970c5c7e4f582cb9e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/cak/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/cak/firefox-126.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a4177252b2ada2676eaf8d119c89f1abc8afddbe1d9d4241b7643d8e9699f34f"; + sha256 = "ef1b8a1f318fe3a49ec99f050d4417c5ecb2018788309d2bafe0582e9f0f67b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/cs/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/cs/firefox-126.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "664bcdec576573e44d5c6970290f1cf376da95ee3c04c6d239a35c8836709f2f"; + sha256 = "a87b9f9b3b028c15c1e1b37a15e6909f01e52f53f880c874d98ff762d8ff6dcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/cy/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/cy/firefox-126.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "661c4626fcea77bfcbb5efe188e40a2da2a42f8ac534ab8a9e75b201d8ae11a3"; + sha256 = "ff30ceff65bbca5abbbba22d7ec9723a368b3db62f7dac08f4ac9dd2c6505ce2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/da/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/da/firefox-126.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ef8b706eea86538b4cc0f987244fabc05ff96f70a0a41155f6f8e73d15c35500"; + sha256 = "426a00ba520924c5ed011b0f046f5e21a9abeb8db1f1015d5efecc47708c39d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/de/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/de/firefox-126.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "010fdd5d96a8575a3547bcb5b6cd1f8f38fb152a3ae014f0bb4e375b48f63f72"; + sha256 = "c7db7cad161da5c28ed40f4aeb37f786712516cc2697dd8cb505cb2be14ebbcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/dsb/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/dsb/firefox-126.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "1325a8fcadf3484a0ef9364fb6ff7187507a74780e35abf18fe93334d75c6928"; + sha256 = "ab530f570d5cb46ea1cd451365fa60b4a1872e14754363bd22f95daf85a479c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/el/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/el/firefox-126.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "cee3565afa0d1bea1eecacba264552fe1cd1485ad442d0f9335ffdc6a830c54b"; + sha256 = "89f0429e7a8985e65ba320094e1b2e9b1ed5cb38df609aa23cca7c900a0b671c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/en-CA/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/en-CA/firefox-126.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "f5133ff41df3c00efba7d9bd645b293a35b2b1b167a49fae715f2d5db14f6322"; + sha256 = "d0c8d0cfe91f897bba6502bc7fbe385880db6e0af6fc93db8702aeb0eb09660a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/en-GB/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/en-GB/firefox-126.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "3d27e3074c55cf0932dbee424ba3769b8aea0e718604162657443b91edddd53c"; + sha256 = "7a560bc7591e436bac570a287c4a18b8e8978eb48b022c2e21e74957e85ecc6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/en-US/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/en-US/firefox-126.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "2c60d84d168c48ff571dd0313101f8ff772d34c4c4a6afdde570109002a5ce70"; + sha256 = "3d49a8a3655d8502f7538f67973a6d7099bf4f2579f4519a48177ced50795ccc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/eo/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/eo/firefox-126.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "42cd56d238a0697f469fb7948ab93905a4ded7d6e54203c9ddf8cc10f5399636"; + sha256 = "67c107f8a0d98a932e25de900f934c2e377dd3edbf1b8cc5554f13271d89a8aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/es-AR/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/es-AR/firefox-126.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "6820f8831f155706ef16381e56671267504e86cf6edd8c6713ac29b2973a9441"; + sha256 = "6c8e6be51abf98ea214983232077947a7ae80dce47c92aa651664c43fc2b6e71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/es-CL/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/es-CL/firefox-126.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "8fde139c51d2f78e603f6efb54add63a5d81ef307a1ab934ca20ffa77853a773"; + sha256 = "2296eb97d6990dbb9ac1a4a2a66e8398ad2f36d54cc7bcb5b686f72cf7ebcf83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/es-ES/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/es-ES/firefox-126.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "76a1df6e67653ac056e822ab6a682aa57dfe8aac991b8fcb91d4388fef19f247"; + sha256 = "7122c71207f430b0a4a4f802220ce569f820f0461e2f92dd14b9b868cfa4bf56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/es-MX/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/es-MX/firefox-126.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "265a1f1799e1ede04bcf460dbe676398d36a15d7c81f4a9bcd67ce3cf6355654"; + sha256 = "ee3bf12d3230c287f934db6e5368d90651c976a4c8177dc1e8dd134f587e42a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/et/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/et/firefox-126.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b88bc9d688eb6eb232cac3599de3d56a7e0da65166da863592a353561e0e7b92"; + sha256 = "4297a9954af8145e8f938dd236dd8ebec126edda142a6dd73e94f70a0375de3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/eu/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/eu/firefox-126.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3fe098b6ab3d811edcda82019b200859f51e3ad0e2ae8193b163005b98d0386a"; + sha256 = "41a02f5f530e9e625524a1f370856621c9cc0e04324ef301f889454c251824c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/fa/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/fa/firefox-126.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "e51723ab10c6833e75c1fac5f435a544590237e2bc2ce826ec8083c035cc2c2d"; + sha256 = "36d5a5d3d616e184b29227403e333d0f3dcf6ff226bdc1c022ccdcb432fcac2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ff/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ff/firefox-126.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "82f3a145131b6c6b1f29a094815e60df081d3521d726704f098a3278326cdc1a"; + sha256 = "4dc033065adaa117a44366f9ea31c657d2f236e553fa925e0b4fb9622e092b0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/fi/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/fi/firefox-126.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "fc8be841682da29fd98f336fcaec222c3c8bb911f8effe490301da0340879ea9"; + sha256 = "03adea0ca2fe7e8408d81fa9105226d113bd66bb75be5b18c3eb640f71807c82"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/fr/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/fr/firefox-126.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "6ec50a746151d57eaa56dfd4aa7ca0b8ee75e6fa31681da416e8a57301d4049d"; + sha256 = "bea2e88d69f51ade377594ae02ad9751db7d1d886bce28b218715299e210dc5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/fur/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/fur/firefox-126.0.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "1beae941315a6d00826433fc59949f62df76b09ae713211a5c0f455dcf77e545"; + sha256 = "7eaff23205978990eea395299d1fc9609b8bd6ac15c87a13df83abd14d76f88a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/fy-NL/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/fy-NL/firefox-126.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "43dbc9af218c1a33c5bc7d27f7a3389aa3f89aa1dd3a91e2f5552e4457f937c9"; + sha256 = "baf7d3fe44f6d0b3e334365b44327b2c8225d94010f2238477ce2db66a31dceb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ga-IE/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ga-IE/firefox-126.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "173325d041c4044c3055f787bd7372dc600ac6e847cc1d2294c5ea43aec0de5b"; + sha256 = "bdf605c386888ea39e244501e885ac5f51513093e33c3038c5d87ec2f742c49d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/gd/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/gd/firefox-126.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "49560b641ba9375780d346eaf64e79228192bd3deec171858227a7889e060765"; + sha256 = "662eae8fb0d725472d3de3b00a95b26210a0b66de584184bbf2475f85d54332c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/gl/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/gl/firefox-126.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6119b6f4befef9537ccf32a82bd968358cc7e41d975b387b350c7b04417a262d"; + sha256 = "2e33e5f0e6d6e7224b85dfa1d55cb648ee35d85b5a12bb06a8a442a4e71fac8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/gn/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/gn/firefox-126.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "adbbccc3b675c9dec331f9e3ac3682f78e71ed081a70d2141e28a6f4f997982c"; + sha256 = "e306c867a303068a203df7f157426f376db22e40bdef19913e460c5ddfb6016a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/gu-IN/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/gu-IN/firefox-126.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f74fd4955f1a53229f75a03a910a46b03ac23856de5e5dcbc24bb75941d4464d"; + sha256 = "22fac69fc82f18b5927460c8fd438c9d964329a39538cce9c3cc944022873808"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/he/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/he/firefox-126.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "21ea8a68afb63d58c976fa7a272fd39eaefadb20e1b15b291eca49de9b8f77b0"; + sha256 = "d448d9d47536b765193aa9e0132a0a2dd6cda3a5812cce11a7538abd4fdfdd07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/hi-IN/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/hi-IN/firefox-126.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "22a538fbf6445f4a02f4705098b0293ef92898d45a6bc414c4734a44d8a0fe48"; + sha256 = "c668f9bf4e3901d7d6eafbb29d6971d8f28dca0b327d7ae6d31eb337446edb15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/hr/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/hr/firefox-126.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ff5b46a0097a8ee17c3eda0168264b5fefdf50307d6247d36b6f141cba7a8261"; + sha256 = "d7834cb0075cef6545dc8e4894e734e83e4c258ae34ecdec570959a11d121b95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/hsb/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/hsb/firefox-126.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "5b7f41a5b8e1d8d6b04a14a37b7fd5cf217ba5a76cb049290a140d1f0db687c4"; + sha256 = "edc6ab5329bf6242ed178d4a8cf908f83c34036b7a44d223a2389ce1b94f75b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/hu/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/hu/firefox-126.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "3e59352bc5ec6465d1427fd0df2e72600f690ca00674f0c9f9985f6f3f15c669"; + sha256 = "3552897a8e67dbca66ad8fab1da93111b74e97d2e073b901f89e040458b6a1e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/hy-AM/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/hy-AM/firefox-126.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "223920f8993e7cf9f4c297669b7f5e953f71901ffb36b0834050b993758690a4"; + sha256 = "e9280a2dbafea3ffd999d06640800c8be1d4d49bb417c4c22c98df62efaaaa27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ia/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ia/firefox-126.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "d6287fff698044a26cef07521208894980fa59e3a9bb11090efd44071c5ad029"; + sha256 = "ae4f4754f9a839359cd9ddd1103e5f6c13b836b8d605f87c7c9ec50195397958"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/id/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/id/firefox-126.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c826bf9fae736c0237faa33bf07182706e0cfa9d6b0857451b0b413fd5bc921d"; + sha256 = "6b620340c38277530507c3c163bcd194d3984fc42bce73a20118acf9e1d24104"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/is/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/is/firefox-126.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f512956810704495d3d5c9633f1e44e22c472d5d6bcbbae23498d00bafe96151"; + sha256 = "72e4a73a842f03d8487907a8af71e4f40c6655dd78c38600e80b90857aa1c01c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/it/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/it/firefox-126.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "1db9991a709984d9e6305dd8e5e479c3b3ff2b2a272d2e4bf30b3674fd558511"; + sha256 = "316f3475bec0daee2646af4bbc73b7bb1122644a3165b7f0a332af16369b6c6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ja/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ja/firefox-126.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "45eea70af05d2db4b7e5671bbb3ee8aa04d4121b13758848c05f810de02114e6"; + sha256 = "ce4db4762e09619353bcb80f1281fe75faa216a6995f8d0ecc369c2e988340ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ka/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ka/firefox-126.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "6ca7b33f9c45431f5954e165afbeafb53aebb806f867a5be0598f01985187de7"; + sha256 = "47e20bd8415b81a47788aa224e2eaf7086a96d6d586eef9b21c0c1a8e59dc172"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/kab/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/kab/firefox-126.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "284be383240c84325812f4c5342559093af20d0f77f4e833381b285f6af71860"; + sha256 = "81036648ee991ddc851a70a9242b567159324b13809d04735f11c81e1dc8f3ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/kk/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/kk/firefox-126.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b1347910af157cb22a5227cd3d32cce6bf658b8a540c220e66b6b2cf77853907"; + sha256 = "86d928d9e42569fbc2862d6e14150da4ef35243016753b3d982fbba5bb6baa2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/km/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/km/firefox-126.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "1c5c7b371eec2d2f5cf40278bbbd259b3d0577c9c159b56bd5a7dc62f6c9fa4e"; + sha256 = "16b24d02899cd2bd1a7958b8b0f56bdd231ceb4c3c0c987e19d219d93af29435"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/kn/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/kn/firefox-126.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "d7c74aa01bf368cae66f0751dc2efd2572ced0fef672a54e0ec509640084a7fb"; + sha256 = "4cc091be288f7704f4c270bf982ac9f2f309979c92c435afe36fac6af1951d03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ko/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ko/firefox-126.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6e479b43e1c7f77084ed8f34f934a5a551ffba7156f2898186acd8d78bfe8b51"; + sha256 = "bc81fbde00f8f47e58bd1ca871ec9dee8bc6763df67f5f32b70af31007369a79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/lij/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/lij/firefox-126.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "2fa2fcf25b2e309e46f1f5c14ba2aa311151d8b4c69570a7fd1b60b21728d249"; + sha256 = "9d3aa0c4fc3e14b0fe5180d372b374a83fb375d859ffd55d1be369ed0b5bffdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/lt/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/lt/firefox-126.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "cc1cc039ea23c4a43443436941e077d621a428f532f81be4983517993ebd37b4"; + sha256 = "07318635215f2c399e5cc9178f181b36a0884e6e96e2059e4a5b88bf0b6c2051"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/lv/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/lv/firefox-126.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "ebb199a86117fefe8541411e7696adb7bb49c4b3a26d20d2a2977f6ba8b2cc57"; + sha256 = "a2467dce574e6bb646d0531c59fe22f49178994b3b204f11c607c6ce709c6cf4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/mk/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/mk/firefox-126.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "e22008d118358c56aabbe8ef2ac9843a38a7ed8088bbd042045271b9a065881a"; + sha256 = "3f13386ac308a6f2572931501cf6322592ead6705ee8a420249f0030e284404d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/mr/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/mr/firefox-126.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "aaf53f2983d192b7985daa596b6e99ddc7b382bdcb30149eb66c56c7c7f02188"; + sha256 = "b57bd92eabd3820d5be7d660eb774c210781a89f20d9e48a5739ad16af723cca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ms/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ms/firefox-126.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "426441bda00b7079cc8a0c1373e3eeb487b686888a4b61c1752db8b6dc472af0"; + sha256 = "704232123025b3ad2cedb0eadb8edaace22c01d3c62fbd3b27e5c9d2495c9530"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/my/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/my/firefox-126.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "77b809bf0a100312882793e4308a5edfe82944b934574b136119af6e8333b111"; + sha256 = "c07bbe85128366dd95ecae97ab00821b5be4c39442428e483c3cb434e536e790"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/nb-NO/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/nb-NO/firefox-126.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "129a28f32f3b9b9b01d24e62fb08629f1dc44e98b98741074d11eb6dfa4f8d0a"; + sha256 = "c079d995c6bc2e5be20ebb4ed1ca76179bce17c4eaa4e47c39ba67ec50db0268"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ne-NP/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ne-NP/firefox-126.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "c56002de914665040ec4c737bc6432ca8537b369a00125fd6496511a2cad6bd8"; + sha256 = "a8f3ae15f481e2a2faa41330571a30464e38e070ef27ee18bffd27628f5c05a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/nl/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/nl/firefox-126.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "c3061e5cfd0ceb7b4080ad9feb8ce7abb24511a1e0acfc658bcc89f06b2115b5"; + sha256 = "d0a70bd54c185f6edc93a6dd1c93b28fceb6c9a1af3e91cb78b131fb69d05023"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/nn-NO/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/nn-NO/firefox-126.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e9885e43e143208f22f43d21aeb562860765565e6d30709d75b9e207d7cf82ae"; + sha256 = "05eeb23cc7154dc3dfbf99493bab95739f36eb52e2129b70a0cc32b4c2d67f7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/oc/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/oc/firefox-126.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "6595d4b9adbbc97c4a712d22aa86260fa186fcf32b86c6f8e1b90d2e26181dbc"; + sha256 = "80e59358349d1aea78f12b67674faf8f5fb6d23bba27cf9eb49ed55bf57e331b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/pa-IN/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/pa-IN/firefox-126.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "4d75bcf2e127ed624df0a3eef9430210d5206f9029f7265038e2560a5e1a855e"; + sha256 = "f3e2b5c2c044f74910b14e2a6594c5c0a91b1b0e19b8d18e557ba9b1643c906b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/pl/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/pl/firefox-126.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "29f243936df126b1be089827e03354eab81a70d1d1d324bcf01d68a2406f514f"; + sha256 = "8730e394f6362c9f2118f90c8f32a490e4c2b7fc4da55db0c5901e4e31a17a9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/pt-BR/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/pt-BR/firefox-126.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "bd3795069fbcf3d945dcb9c2c9c2ab2dc6a263367e9fcc8261af2a77d6eb5da2"; + sha256 = "82aae4a9eecba2ac0c2860019f80b44a70b53290476113ce66a595f4d58f767c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/pt-PT/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/pt-PT/firefox-126.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "005b2667bbc30560d63f8c832651063016b8b166b8f40f777d459a3b255887de"; + sha256 = "92eefc83ed6c748bdec86441423bd33061278a98b764d5ef28c4eaf7a9256efb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/rm/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/rm/firefox-126.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "78e5cff6bd1a34082413f6e716220ecae38f6eb06f2bbf61e653504bc3e91034"; + sha256 = "71cda80240bd2ba45b7d66ac7a31a06e5a2132285cd3148aeaed39953feb2721"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ro/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ro/firefox-126.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "1f545495f57236c10358755ee7a51accbb9e2a9b8e5d5c1d1801db8d040194d2"; + sha256 = "8e9268fa43b051519eab3212d90feabe74f50b4f3536fba436f4fc0824df6be5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ru/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ru/firefox-126.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "0edddacf79110ebeac3b1894b049deb6b7b0d2e3705c09d181b1a43a5362c3ef"; + sha256 = "10e846b452a32a9e14568dbd9f0d00471a09045eee5b0fc265752ac52ee52681"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/sat/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sat/firefox-126.0.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "e0523ca21774ffb3a9e5f2bc39b42f1b8c76370f55ff9220365ad825bc360481"; + sha256 = "fa83bd09a708f8a2aee2e22260fb79606a1d045d8330af3eecc69cb33475f17d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/sc/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sc/firefox-126.0.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "e2aadb90aec3e60caedf38513437ab6cb66a91ecdf7da3a90f3849f9949f22f2"; + sha256 = "59d1738d837c612f9738dae172197052817890d9640dddbcacb732cff837f88c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/sco/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sco/firefox-126.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "2bbca54be46a4ac85a8d0622b6a8acd74df8812ed089320797ed3a7aa43c9ac3"; + sha256 = "615cb45683769a02a78cc5158b423e5449977aa325ae0553ae3c1b91097643b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/si/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/si/firefox-126.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "dcd127679d6104a58f91602034b4d963fe78344ec2183ac06f384b106c3dc8ec"; + sha256 = "978b8a33535d159848db81e8d67ea96bcc804917be437c123cd7d72eef644436"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/sk/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sk/firefox-126.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "05dbc0c1f3a93f06441ba662d0a926ea5bff4571bb2f5609f226de1fbd83b8b4"; + sha256 = "09c76c363fed0b85c603cb6a038863aecc6ec8bd9b6536c5fe46178e94148c82"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/sl/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sl/firefox-126.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "c6f8414ed1945d7c5be50d8129b9218ad9ca64b0d614861f222603ee1be55331"; + sha256 = "9c7e786634ae4de0d1745f302dc8b1bb7f02d25cbdbe0aefd07cd4e387042b03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/son/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/son/firefox-126.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "fc81b41ded7bd0fe499f8027cdd4326f6d92e273e438ac4ba903f3aa92a137ef"; + sha256 = "9049588a9910c85767e4c501d0361be434f678b7390395dd7ed89b3d6127da04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/sq/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sq/firefox-126.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d57fc39e623000134c8aa00b393825c3ff4453df1ea07d5f8d7bb644dafc60cb"; + sha256 = "73637bf2473d33658fb2650129cfd321e07912ab4396e4fe3b2b96f1c5a2f7d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/sr/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sr/firefox-126.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "3935f39340fdda61fd0626479ff176aad5921edca685d199e2ce2a5342784b39"; + sha256 = "6ef94639d56fe3542c0df18b0fcd54284b102aaf769949f252f09471c7c5b9cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/sv-SE/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sv-SE/firefox-126.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "38e52f809689661c454fc70ae65a9ea354f73131b6ac1eb7ab9e94cc44b96ff0"; + sha256 = "cb6e649a40b53ecaf7460ab1527f37ea69250c7cbae4441aa839b857a858608d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/szl/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/szl/firefox-126.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "1ab9988991e8553db48df8bba87646ca3ae9254914207758899143e772729bc5"; + sha256 = "2fccc546c7fdaa965902618eed57a2a18cea2091130950c483f1b982f972d438"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ta/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ta/firefox-126.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "120428f8e2827d3283dcb0b2886e05a0ef84797656075ed160386c4aae5d9e53"; + sha256 = "52bc70dd238c6b099549b5e704ef12e7655cee23ac577671d27685c479c4045f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/te/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/te/firefox-126.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "9f8272b1dbc34d7861130e76f5e72398e8038009eb3937e332a7b7b739a2892c"; + sha256 = "f819512f4f0428f732115c1587aa876a7374564b606e9581c3d405c9273a8d16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/tg/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/tg/firefox-126.0.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "1a13f73a74d2c42d602ca0b88275c6b49b7b98cc56f363bc460a108e7cc9a33f"; + sha256 = "278142e32bd078092e69dac8ce8b1d5d88d1d7adc13abf681d6d53c5d97a8784"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/th/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/th/firefox-126.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "e07e9bd213ec0357c90c400e336b040987814c4105afd111235464695fed1101"; + sha256 = "8443f0793f817568b002aeb436423793108594e2cc43da929ec48079e0fcfd5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/tl/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/tl/firefox-126.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "a14daf411cde7285c8f488f8c185171bf3b2efc3cc8adbba801c09a3b3765320"; + sha256 = "d03a4714b86f5f0dfffb1b4780b09862653266eb3736a7b0630784bd3a6c739f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/tr/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/tr/firefox-126.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "2163257dd10892967378152ba2c6fe8165d09a219a897bd04a30bca7711bd030"; + sha256 = "1f87ae9443c4fa9a8d4616e2de1fb799c0fa1b95b37070e669db475f5de9be28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/trs/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/trs/firefox-126.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "a16e68ce428af8d6f87923ce2ce6b5c71b3d82e8b78faf2fdb00fec57b77798d"; + sha256 = "b9f8c5a2ecd83b4bdd6f5e26037f8aff0d9b2ba7abcae08b7868c15ddcc38def"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/uk/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/uk/firefox-126.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ea8fea7dbc06fbaecb6ec9a195c5b7f77a8f724bd66affcaea62ff41a9c390e9"; + sha256 = "566d6daca65e49cb8280dd64716e7ba3b9f00baa995ddfe31f847166ef70eb2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/ur/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ur/firefox-126.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "a12d6f1533431c63acc0e5cdd18d0d3a220f43be15d821acb1fa846d1103031b"; + sha256 = "530b7cd6338c09f1c92cf7eb8f0e5fa150d4477913f14257a18567e325d8c64e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/uz/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/uz/firefox-126.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b456de99139122e04e1f0c08978517353fbdc984cf4b9fdd733a02f6011a060f"; + sha256 = "b525c6a6ec58ded4b637299832b3f1542d1f17958bc2f9074e05d1e96303d4cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/vi/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/vi/firefox-126.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "11b6b4ae3b754ba5b11156f61fa60380edb6ce921359007c1fd51f20f7713415"; + sha256 = "dbeebc029258ffc4678ae05aeca5cf43e634413862deb2b10d21fcd96039ca7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/xh/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/xh/firefox-126.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "f3e63830176c6525145a609429c352ec385a3a9a3d9822d6f12fe72ac43ea04c"; + sha256 = "05029e34aa21b1b1ee1a02ca13afdc2764cb0757fdaa533a8fdbc633d6bd11ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/zh-CN/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/zh-CN/firefox-126.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "3e8e26fb66b7907717dc4fcc38200dc3816b2b7fad72dd9d3d56fc768eb76f32"; + sha256 = "c528f20f5ff5ac5353997f474ff88fb17834e6c913b1e2bf2af9fdaf837bc031"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.1/linux-i686/zh-TW/firefox-125.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/zh-TW/firefox-126.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "d35306938344fec0b926b9bb732534e9afa72798fe4d63da2e878bd50f0900c0"; + sha256 = "03edbb562a60417320469ae06a632ec6c302d420a6565f2a25acb3e3b4e7e61d"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 5166fdf851..56dda27e54 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -50,7 +50,7 @@ in , rustPlatform , unzip , which -, wrapGAppsHook +, wrapGAppsHook3 # runtime , bzip2 @@ -289,7 +289,7 @@ buildStdenv.mkDerivation { rustc unzip which - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals crashreporterSupport [ dump_syms patchelf ] ++ lib.optionals pgoSupport [ xvfb-run ] @@ -298,9 +298,6 @@ buildStdenv.mkDerivation { setOutputFlags = false; # `./mach configure` doesn't understand `--*dir=` flags. preConfigure = '' - # remove distributed configuration files - rm -f configure js/src/configure .mozconfig* - # Runs autoconf through ./mach configure in configurePhase configureScript="$(realpath ./mach) configure" @@ -308,8 +305,8 @@ buildStdenv.mkDerivation { export MOZ_BUILD_DATE=$(head -n1 sourcestamp.txt) # Set predictable directories for build and state - export MOZ_OBJDIR=$(pwd)/mozobj - export MOZBUILD_STATE_PATH=$(pwd)/mozbuild + export MOZ_OBJDIR=$(pwd)/objdir + export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild # Don't try to send libnotify notifications during build export MOZ_NOSPAM=1 @@ -353,7 +350,7 @@ buildStdenv.mkDerivation { # since the profiling build has not been installed to $out '' OLD_LDFLAGS="$LDFLAGS" - LDFLAGS="-Wl,-rpath,$(pwd)/mozobj/dist/${binaryName}" + LDFLAGS="-Wl,-rpath,$(pwd)/objdir/dist/${binaryName}" ''} fi '' + lib.optionalString googleAPISupport '' @@ -510,7 +507,7 @@ buildStdenv.mkDerivation { ''; preBuild = '' - cd mozobj + cd objdir ''; postBuild = '' @@ -535,9 +532,9 @@ buildStdenv.mkDerivation { preInstall = lib.optionalString crashreporterSupport '' ./mach buildsymbols mkdir -p $symbols/ - cp mozobj/dist/*.crashreporter-symbols.zip $symbols/ + cp objdir/dist/*.crashreporter-symbols.zip $symbols/ '' + '' - cd mozobj + cd objdir ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index bcf14cd15a..cce98c4a68 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "125.0.1"; + version = "126.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "6f2f336de8b0ec9cb19ba20c909407b7b88c0319ee3b2f1f3429133516b0c45b4c7846f287985a0cdb9f34acc7d5378ed14fb48e26bef113c8ac360501a30c4d"; + sha512 = "56025b051d544ca294911a1d6a66f09945f71012131881b64313dafb579730810a4b091950c90a21d4fd3f393ba23670d8409086e1677d80d0bbbe347c303527"; }; extraPatches = [ @@ -33,11 +33,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "125.0b9"; + version = "126.0b5"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "66d1b27355c105714b926b5424badc01582e5ad7e979104d05fa50748ea961c7f1e081b88978fb94aee54ed281931b8d0f0bb0e16670cf89e7f10703711e7f4e"; + sha512 = "5a079e4f01c95baf5b26a5d61521eea493fa4c3cdf91985fbbee313ddc50af1d941915abd6d0ffa97927d80f2016cbdcd3c80c11cfc3068cf83a62f3b45026ad"; }; meta = { @@ -62,13 +62,13 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "125.0b9"; + version = "126.0b5"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "a000d1ad29a6a83af6bb424d9b5099667b93907041ebcf8f18b22a2045f4d0f0292db3b331c33b30d142ee6feb58386cedcae356c79d2c5e31fc7a571af2b63c"; + sha512 = "cb36cdf70035ed96cb877d41e499d7df03fc6a939f4a5395fef110a44f7d810ad4e8fa393c784f3e7d286ffde0c4f3ad0fd38e81236a301a24d4e74eece702b1"; }; meta = { @@ -94,11 +94,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.10.0esr"; + version = "115.11.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "0626e2c68ce43f24dfc2b9216e2565537ad8781daf4195d53420e1b78d57d0f6360fbe56b0ddbedae3818546c72472c85c1ff2b208c123d32a0543e666f42b65"; + sha512 = "0f3a87c99fb008088afd509d9259f893fdd44ea6bf6a5e69806fefb8d355415e81b9e8832a392acb9d0c1c50e4add7f1362a4aaadc35e1d9c2e55baf7136aed8"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix index 0bf2fd36c0..aa67b61cf7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,7 +7,7 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.12.0"; + packageVersion = "11.12.2"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -22,7 +22,7 @@ repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-9mJW8VFYClQ3D8/nPtlCVaVULvEICS+RQhz1dLujn6Q="; + hash = "sha256-KWUoR/0XOz4mCWBkTgDfvvrWukZMa3tQzQ+k5+BfzzY="; }; extraConfigureFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix index fc81be7124..3be88d2900 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix @@ -11,6 +11,7 @@ , cmake , ninja , libxcrypt +, python3 , qt6Packages , nixosTests , AppKit @@ -103,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = with qt6Packages; [ cmake ninja + python3 wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json index 81beb04408..737f10a4f6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "124.0.2-1", + "packageVersion": "125.0.3-1", "source": { - "rev": "124.0.2-1", - "sha256": "0qh40l1pif0b6n1amiw18pr13gvmi7rjd89q6n1qz8y14yf9w5xp" + "rev": "125.0.3-1", + "sha256": "0ny4bh1kn9j8wqfbdi78fl2sh0sv14klznhsg47hvckgwf8iii6d" }, "settings": { - "rev": "8a499ecdab8a5136faee50aae1fdd48997711de6", - "sha256": "1c12y7b09rrz8zlpar8nnd9k2nvldjqq3cicbc57g6s1npnf8rz6" + "rev": "6b2b6a89fc15a705388955e4d1375f453d8cdc89", + "sha256": "0yginhc8pn00k1gh8h7bzvrl4vi2wimbmrrgnmvvblv28bxhwnh0" }, "firefox": { - "version": "124.0.2", - "sha512": "8cf340de6e34812f8ae3363265859a263330af770d981c3dd1ca1e7e0cfe513604d3e68184d4aa1446569aefbdf359d561fbc200faf19a5ed020a1709d9ef10e" + "version": "125.0.3", + "sha512": "18e705a3093290311ccb5f27f01e43fe243ece94c1769a9ccc4fa53d370e32a1ec6a107cdeb531e9468b9aca1a1fe668161adb7acc1ec65fd383837882c7d484" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix index a861f2f44b..6011755e38 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/luakit/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , help2man , glib-networking , gst_all_1 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config help2man - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gtk3 diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix index b898cd823b..8b9574916c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "124.0.2478.39"; + version = "125.0.2535.37"; revision = "1"; - hash = "sha256-0KQU/JS6hlv2SLMB8RKyITUiodByBUstrhcwIefn3Yw="; + hash = "sha256-/fZcFIVj4stIxim2UYsxA5rNkyGf/i3eDf25npsdDi4="; }; dev = import ./browser.nix { channel = "dev"; - version = "125.0.2518.0"; + version = "126.0.2566.1"; revision = "1"; - hash = "sha256-q4TVpO0SxSSLMv/NtmJIOzClT2WqUss2qfE5vgj4O7E="; + hash = "sha256-PePosWGdkLm5OK82YP9LQbvVz5de8KL06I6rv0TKP3A="; }; stable = import ./browser.nix { channel = "stable"; - version = "123.0.2420.97"; + version = "124.0.2478.97"; revision = "1"; - hash = "sha256-q7Pcbi0JQr/wvKIrgueD9f2Z6v1DMoD2bcRJKGqDYjs="; + hash = "sha256-hdCtHWOEez3VTw8hTRiitURiu0MpFTbnc60biym795k="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix index 3bf46be683..f937f690b5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/midori/default.nix @@ -5,7 +5,7 @@ , pkg-config , intltool , vala -, wrapGAppsHook +, wrapGAppsHook3 , gcr , libpeas , gtk3 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 9edb3d882a..c641a4cc37 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -5,7 +5,7 @@ , copyDesktopItems , makeWrapper , writeText -, wrapGAppsHook +, wrapGAppsHook3 , autoPatchelfHook , callPackage @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.14"; + version = "13.0.15"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-z7fZtq+jnoAi6G8RNahGtP1LXeOXU/2wYz5ha2ddAeM="; + hash = "sha256-TypPevAkp1G7GPzBTRUv3N4UJydAqfllNekTsYfiisQ="; }; }; @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook autoPatchelfHook ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook3 autoPatchelfHook ]; buildInputs = [ gtk3 alsa-lib @@ -208,8 +208,8 @@ stdenv.mkDerivation rec { # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 # indicates the system fonts.conf being used instead. FONTCONFIG_FILE=$MB_IN_STORE/fontconfig/fonts.conf - sed -i "$FONTCONFIG_FILE" \ - -e "s,fonts,$MB_IN_STORE/fonts," + substituteInPlace "$FONTCONFIG_FILE" \ + --replace-fail 'fonts' "$MB_IN_STORE/fonts" mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix index 6feb02faa9..36f669439d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -20,7 +20,7 @@ , openssl , perlPackages , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , xxd # Netsurf-specific dependencies @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config xxd ] - ++ lib.optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook; + ++ lib.optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook3; buildInputs = [ check diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix index 6a990201c7..d0a040748d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, sbclPackages -, makeWrapper, wrapGAppsHook, gst_all_1 +, makeWrapper, wrapGAppsHook3, gst_all_1 , glib, gdk-pixbuf, cairo , mailcap, pango, gtk3 , glib-networking, gsettings-desktop-schemas @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = sbclPackages.nyxt; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook3 ]; gstBuildInputs = with gst_all_1; [ gstreamer gst-libav gst-plugins-base diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix index 94f2a46629..fc80fd76c1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix @@ -40,7 +40,7 @@ , at-spi2-atk , at-spi2-core , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , qt6 , proprietaryCodecs ? false , vivaldi-ffmpeg-codecs @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "109.0.5097.38"; + version = "109.0.5097.80"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-eljVXaHN7gPqpoL3z+Fz/BH6b+1qxSHtFln6NCxl9tc="; + hash = "sha256-3NSinITYisulR5rNhSnwQC3D9pKWj4SdBtFt/9OgCvo="; }; unpackPhase = "dpkg-deb -x $src ."; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 qt6.wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix index 5143b1746c..3a449623a0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -13,14 +13,14 @@ , libXt , libpulseaudio , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 , writeScript , testers }: stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.0.2"; + version = "33.1.0"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoPatchelfHook copyDesktopItems - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-Kahnwlj9PIWB24lvH6h9cZK459NW2Vo2g6ckuv0Ax48="; + hash = "sha256-qjztSvNL7KNFG3sszgk5qH77do0HFQ8YTrgjFi2ZM00="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-XOiLGmU8O96clUpnp/OkzXmWR1PJ2AdzbVFj6adbcvY="; + hash = "sha256-q4zAmnCN9SHGb8PthjAx7d5FKq/oAQ8c0R+U1SWqjAA="; }; }; @@ -206,7 +206,7 @@ stdenv.mkDerivation (finalAttrs: { experience, while offering full customization and a growing collection of extensions and themes to make the browser truly your own. ''; - changelog = "https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/${version}_Release"; + changelog = "https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/${finalAttrs.version}_Release"; license = [ licenses.mpl20 { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix index d0a1e359f9..47d1cfe83b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix @@ -16,11 +16,9 @@ let in appimageTools.wrapType2 { inherit pname src version; - multiArch = false; - extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; + extraPkgs = pkgs: [ pkgs.bash ]; extraInstallCommands = '' - ln -s $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png \ $out/share/icons/hicolor/512x512/apps/${pname}.png diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix index 012a86aadb..ad1b9a51a4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit -, pkg-config, wrapGAppsHook +, pkg-config, wrapGAppsHook3 , glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk , xorg, dmenu, findutils, gnused, coreutils, gst_all_1 , patches ? null @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1v926hiayddylq79n8l7dy51bm0dsa9n18nx9bkhg666cx973x4z"; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ glib gcr diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix index 851f2c49f2..2aa01bfe1b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -6,7 +6,7 @@ , makeWrapper , writeText , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , callPackage , atk @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.14"; + version = "13.0.15"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-UWR2zMVXa6QMz1EIWJf43Vmj14ZIaug105esxeSd0KU="; + hash = "sha256-e2YFrPzle9s/j3+uxFjoK538pLV1u1a4kD6V8RaqpOU="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-n+qj3IY4z+erOg4iUkQ4CP3rtJASTeKPg7beZRdesw4="; + hash = "sha256-20C4UuSN2PZ2L3AZv7klNClD4RoThpmnKrpoK9An24w="; }; }; @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ autoPatchelfHook copyDesktopItems makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ autoPatchelfHook copyDesktopItems makeWrapper wrapGAppsHook3 ]; buildInputs = [ gtk3 alsa-lib @@ -199,8 +199,8 @@ stdenv.mkDerivation rec { ''} # Fixup paths to pluggable transports. - sed -i TorBrowser/Data/Tor/torrc-defaults \ - -e "s,./TorBrowser,$TBB_IN_STORE/TorBrowser,g" + substituteInPlace TorBrowser/Data/Tor/torrc-defaults \ + --replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser" # Fixup obfs transport. Work around patchelf failing to set # interpreter for pre-compiled Go binaries by invoking the interpreter @@ -263,8 +263,8 @@ stdenv.mkDerivation rec { # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 # indicates the system fonts.conf being used instead. FONTCONFIG_FILE=$TBB_IN_STORE/fontconfig/fonts.conf - sed -i "$FONTCONFIG_FILE" \ - -e "s,fonts,$TBB_IN_STORE/fonts," + substituteInPlace "$FONTCONFIG_FILE" \ + --replace-fail 'fonts' "$TBB_IN_STORE/fonts" # Hard-code paths to geoip data files. TBB resolves the geoip files # relative to torrc-defaults_path but if we do not hard-code them diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix index 8df37ed5e0..a78fcf36f3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk, gtk3, glib-networking -, gsettings-desktop-schemas, wrapGAppsHook +, gsettings-desktop-schemas, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Eq4riJSznKpkW9JJDnTCLxZ9oMJTmWkIoGphOiCcSAg="; }; - nativeBuildInputs = [ wrapGAppsHook pkg-config ]; + nativeBuildInputs = [ wrapGAppsHook3 pkg-config ]; buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 442f899920..d1ade0a85b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.6.3271.61"; + version = "6.7.3329.27"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-Rcc/pufINOQJlkQI6KkWVZtnh3KvKLS6jRWQNTxPFmU="; - x86_64-linux = "sha256-Xt4pLB23VZ/j9g/QCOQTrrhQduxs1nB4wyYkBefFPIQ="; + aarch64-linux = "sha256-o+ociqdALNti/7VgcBOb7cQBlZLWmYnTQ68SW8NMDIs="; + x86_64-linux = "sha256-1ppDdLIpQMBX+W2dL6CumqUM6PsEZJpQrA3huj3V+Eg="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix index 9c1e5a0d22..51b662f0ef 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , flac , gnome2 , harfbuzzFull @@ -54,15 +54,15 @@ let version = { - corporate = "23.11.1.822-1"; - beta = "24.1.1.939-1"; - stable = "24.1.1.940-1"; + corporate = "24.1.3.843-1"; + beta = "24.4.1.918-1"; + stable = "24.4.1.915-1"; }.${edition}; hash = { - corporate = "sha256-OOcz2dQeVea0vBjF1FyrCsnRR+WrCzfLTd+YXpLJCsI="; - beta = "sha256-Meswp1aeNTBr79l7XGWqJT9qqUdOfSzIpdL1L29UfJw="; - stable = "sha256-FZHoCRedpHHVwibSXts2DncUN83PZ9UlVOSXPjgAaNs="; + corporate = "sha256-rI19YmsC2p2Dsi6Grd8IyNdpjMHWwET3wcVw5r7545M="; + beta = "sha256-EQjjaTMPQKaULITEF+MQuY1lRVXuOjyiGWuGQtIpIz0="; + stable = "sha256-2IIIADFG9kCtzB0X4AfrFI+btqoUzKwd6NlZt7qtL/M="; }.${edition}; app = { @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook qt6.wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix index 77a80df87e..92c9978b4a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -21,7 +21,7 @@ , libgdata , dbus , vala -, wrapGAppsHook +, wrapGAppsHook3 , xvfb-run , gtk-doc , docbook-xsl-nons @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { desktop-file-utils appstream-glib vala - wrapGAppsHook + wrapGAppsHook3 gtk-doc docbook-xsl-nons docbook_xml_dtd_43 diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 26760429df..59e0f84364 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2024.3.0"; + version = "2024.4.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-Fzi5g8bHBC5xao0iZ4I/SXLpEVaoUB+7UuQZhbfHw60="; + hash = "sha256-rDw25kFiD16xma/LozGjlc/Tm6hoRYzHs8spTk6HU6Y="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/acorn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/acorn/default.nix deleted file mode 100644 index f26ebfc4c0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/acorn/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "acorn"; - version = "0.10.1"; - - src = fetchFromGitHub { - owner = "acorn-io"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Zw/OqN4d5iukh9oUXjczMvNKYkcGSUoDEwfti7uzZXQ="; - }; - - vendorHash = "sha256-d/1Rqh00THUwcMBWloevfKbScaWhVG5r/32Q4zYUaJg="; - - ldflags = [ - "-s" - "-w" - "-X github.com/acorn-io/acorn/pkg/version.Tag=v${version}" - ]; - - # integration tests require network and kubernetes master - doCheck = false; - - meta = with lib; { - homepage = "https://docs.acorn.io"; - changelog = "https://github.com/acorn-io/${pname}/releases/tag/v${version}"; - description = "A simple application deployment framework for Kubernetes"; - license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index 8a6e3ac65f..52012a3617 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -34,16 +34,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.5.5"; + version = "3.5.6"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-SONi7GmFgBEA+5l8ftjFP3+hk55eZmhkLLuu5FfyVFo="; + hash = "sha256-CcPY9eEpvDTIxilxHI+VBVVRxZy/82fi6uayBrGR/Dc="; }; - vendorHash = "sha256-XjwtgJdBk9YIro1WlunYmKkuZSrSJTN/BLXn7i3+9xY="; + vendorHash = "sha256-ttpDGeANQyrTfRyNGFkmJFpE+nnjz8PZN+0HScBJ1yg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index 7f3265cbd8..64cd0aaa24 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.10.7"; + version = "2.11.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-0C8lVQrFxrk9ym4aCz0PhUS2iByx9rj5Id0xFIq4Efc="; + hash = "sha256-HVkR5sG3CfTW56pTB15S+w4kwbv7he9Be6RKmpu+E4E="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-dgj8IXrLNZ6ZEIFAY/gXAklVKfLXosRuR1SyZWkwrwA="; + vendorHash = "sha256-c0fTUU5zXI0QDo/bAL4v6zjEp0rNvCpQFAGwpgDWDFY="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix index 39c14e95c6..c4e155a051 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.9"; + version = "0.11.11"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-TJja4FL440ZG5VsCfJsKUYeM2YPlMSl2+ejjlgyP5IY="; + hash = "sha256-Pevsq/u6sI00k874PiAVwzgTqzzja1D2zsfebIFJv/0="; }; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix index 3eee88fa2a..7996337121 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "atlantis"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - hash = "sha256-OAIxBCfSDNauThC4/W//DmkzwwsNGZxdj3gDjSWmoNU="; + hash = "sha256-BC4WSyKnDM9RhM+2iU9dBZLbtxDM/UoMmIDTP6DB3no="; }; ldflags = [ "-X=main.version=${version}" "-X=main.date=1970-01-01T00:00:00Z" ]; - vendorHash = "sha256-ppg8AFS16Wg/J9vkqhiokUNOY601kI+oFSDI8IDJTI4="; + vendorHash = "sha256-6Di8XLX1rOjVnIA+5kQB59aZ3qRmkjciWD0+GD9Lpzw="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix index 0c371bfac2..2163adf6d5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.69.0"; + version = "1.72.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H2RyxUeOgIiGpR50sDP6bjZ6BKRB47oLUpdtawSRnmo="; + sha256 = "sha256-d4TgVSXTqrzgTdpGl1uXIdEvwb0EIgzqiEjOaWYAZgk="; }; - vendorHash = "sha256-dJJPq2HcGZ+MqtJ848gsrvzD1rMVrwJQKwq+UpZsFB0="; + vendorHash = "sha256-T3FvJfyGseW5vwN/mMCFEjpcpW90MG8QPkmaXJafD4s="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix index 5502c5c582..5353078e1d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.16.4"; + version = "0.16.7"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-fhTjYhRCtJu18AGYF6hiTdRMEdlNO+DmDwh2hZBXzPk="; + hash = "sha256-+Uxn9yR3D38CuvFeBA62aWLtY4rPrBJoF3tUmgKvKpw="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix index 44f87f0e1c..372a09e93a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.81"; + version = "1.0.82"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-YdrJbT9Ozp1vlvQBYQNjJX6n3vIXYj3dmKhAsBPrvi8="; + sha256 = "sha256-pwi0Z0dO2z8Ovlt9gKyVNrh0ZZ2M9xnahBmbTNK2Bnw="; }; - vendorHash = "sha256-YNbxV79XQBmd7oTanwLOMdmt2ds4ttX1ttr8vUycVzg="; + vendorHash = "sha256-NYNp4KGcVma4ltkq2SJZJOaeKS0j/X2TlUrOnptxiYE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix index 34add12a81..2bfa0662db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.6.3"; + version = "1.7.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-gyZxEzktbYtQSm1gm4wWJriMo/MjDdgaAxjA7J3jeQ0="; + hash = "sha256-e+Ut6xoNUY9cJjjJ43P0siEa+G1igllcb8veirk1UX0="; }; - vendorHash = "sha256-bMM4d1ji03bICsd6uBqu+0n4rB/SiKjtevQzV0DYHiE="; + vendorHash = "sha256-ALRnccGjPGuAITtuz79Cao95NhvSczAzspSMXytlw+A="; subPackages = [ "cmd/clusterctl" ]; @@ -29,6 +29,7 @@ buildGoModule rec { installShellCompletion --cmd clusterctl \ --bash <($out/bin/clusterctl completion bash) \ + --fish <($out/bin/clusterctl completion fish) \ --zsh <($out/bin/clusterctl completion zsh) ''; @@ -38,12 +39,12 @@ buildGoModule rec { version = "v${version}"; }; - meta = with lib; { + meta = { changelog = "https://github.com/kubernetes-sigs/cluster-api/releases/tag/${src.rev}"; description = "Kubernetes cluster API tool"; mainProgram = "clusterctl"; homepage = "https://cluster-api.sigs.k8s.io/"; - license = licenses.asl20; - maintainers = with maintainers; [ qjoly ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ qjoly ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix index feb1b03d26..14c92f1b77 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "cmctl"; - version = "1.14.4"; + version = "1.14.5"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - hash = "sha256-iUXN+8ueCxGsFnwhC2WjrQQSXV7TGUR80xaKqjxcC6o="; + hash = "sha256-WitYq3/veaARZQHoseJnT5h0AGmXVlLzRe8KCOJuY0w="; }; sourceRoot = "${src.name}/cmd/ctl"; - vendorHash = "sha256-ViKsqqM6l/tQSGgj8Yt2L57x+eE1Pd3xCVPuWpIjWOQ="; + vendorHash = "sha256-27XvT33S/vgGo5MQDpHzTN+K1nNPR6OOFggzLhatygI="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix index c6b1c0edb2..a54c38caa8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.31"; + version = "0.6.33"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - hash = "sha256-tL5mygomRdxHdWUAp6umMOhyKq/ZFcjn+5wZcqD2mVA="; + hash = "sha256-f8EYiTXS9ByELWWV2EF4jrDamoKRGejKhYVyNscHZvo="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix index 5558a48d9f..5ddb8409d3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.15.1"; + version = "3.16.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - hash = "sha256-KPRcY14IeP4WU/cnUG7JWwJcp/LN6O74u417I+qAqXE="; + hash = "sha256-IIqucBPuEHymfg7nLmxXMrq1aaB6SFPrczPj4BH8Zyw="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix index 67a7f12f2d..4a62d35773 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.16.10"; + version = "1.16.11"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-GC0/HGPO/sbkyf2bLY0A+pQrPYqMv6BP0zNUHENpQjg="; + hash = "sha256-3GTSIZRELj8Pdm02SUKSCk6/Q7Hkuggvq+XjJAH9qU0="; }; vendorHash = "sha256-UyzqKpF2WBj25Bm4MtkF6yjl87A61vGsteBNCjJV178="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index 97d5ef2d02..3da904ac5f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "chart-testing"; - version = "3.10.1"; + version = "3.11.0"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - hash = "sha256-btrnfL9U8k7jwo6ltVfbiSJFCX52zjfgf4E+IsWTYi4="; + hash = "sha256-eiU8omDEGDJVmumHwZkNix7qMVkoR6Irg0x9dTBzadA="; }; - vendorHash = "sha256-E+7ndvXWzsU896/eWyupbvqkLed2ly91osptZKT79fk="; + vendorHash = "sha256-o9oZnQPztrK6HvclPt33Y05GQFWDsnUYti5x8R7aWS8="; postPatch = '' substituteInPlace pkg/config/config.go \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix index 1a6aa12a91..8ac059e98a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix @@ -1,17 +1,17 @@ { callPackage }: { + helm-cm-push = callPackage ./helm-cm-push.nix { }; helm-diff = callPackage ./helm-diff.nix { }; helm-git = callPackage ./helm-git.nix { }; - helm-cm-push = callPackage ./helm-cm-push.nix { }; + helm-mapkubeapis = callPackage ./helm-mapkubeapis.nix { }; helm-s3 = callPackage ./helm-s3.nix { }; helm-secrets = callPackage ./helm-secrets.nix { }; helm-unittest = callPackage ./helm-unittest.nix { }; - } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index 196be4a152..032ccfe8f9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , coreutils , findutils -, git +, gitMinimal , gnugrep , gnused , makeWrapper @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "helm-git"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "aslafy-z"; repo = pname; rev = "v${version}"; - sha256 = "sha256-k8kPuB5GIBjOISL4AM/I4PPrYbrdgYIwVgosMpunZpQ="; + sha256 = "sha256-/kUKi2BI6LMMUiy6AaYhpPIXU428Or352xYoDYdym8A="; }; nativeBuildInputs = [ makeWrapper ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patchShebangs $out/helm-git/helm-git{,-plugin.sh} wrapProgram $out/helm-git/helm-git \ - --prefix PATH : ${lib.makeBinPath [ coreutils findutils git gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils findutils gitMinimal gnugrep gnused ]} runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix new file mode 100644 index 0000000000..21cb8b065e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix @@ -0,0 +1,34 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "helm-mapkubeapis"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "helm"; + repo = "helm-mapkubeapis"; + rev = "v${version}"; + hash = "sha256-6NeePXTdp5vlBLfIlWeXQZMZ0Uz/e1ZCgZmJvBJfaFw="; + }; + + vendorHash = "sha256-rVrQqeakPQl3rjzmqzHw74ffreLEVzP153wWJ8TEOIM="; + + # NOTE: Remove the install and upgrade hooks. + postPatch = '' + sed -i '/^hooks:/,+2 d' plugin.yaml + ''; + + postInstall = '' + install -dm755 $out/helm-mapkubeapis + mv $out/bin $out/helm-mapkubeapis/ + install -m644 -Dt $out/helm-mapkubeapis/config/ config/Map.yaml + install -m644 -Dt $out/helm-mapkubeapis plugin.yaml + ''; + + meta = { + description = "A Helm plugin which maps deprecated or removed Kubernetes APIs in a release to supported APIs"; + homepage = "https://github.com/helm/helm-mapkubeapis"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ aos ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix index 78ff59860b..bd93089ee3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-unittest"; - version = "0.4.4"; + version = "0.5.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-C1aHnKNXgzlPT1qMngRcPZ6hYUOenU1xpeYLnhrvtnc="; + hash = "sha256-YWzjv1/I+LX3AMeQenI36AsNJkZ6IzbMhM/f5/Kxs2M="; }; - vendorHash = "sha256-nm1LFy2yqfQs+HmrAR1EsBjpm9w0u4einLbVFW1UitI="; + vendorHash = "sha256-A2izHBh58yPd2XPm4GKVosPtahUtQ35GbyBdr/L13CQ="; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix index 49d1b10bf3..10c10ec12d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hubble"; - version = "0.13.2"; + version = "0.13.4"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0SCuQzRwluowF48lzyLxY+0rvTOyDbpkMI7Iwb6GHJo="; + sha256 = "sha256-YordxRIZtlYQprAYnH9Qn5ha6y7D52sjEOaRTcd0Z8g="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index 6c05705e56..8c80896d62 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.21.1"; + version = "1.22.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-zWg0UK9RHq/25GWpsvb/U5YJPkgd7aUC/Dva8jGFwfo="; + hash = "sha256-xiIuCwzERvy7HFx9CZHen1tz1nwsTMryq5hB0om2dyo="; }; - vendorHash = "sha256-23t1xJPRip0ojXmUl1qlk6QJsYHT+9EAS080m6c0d6U="; + vendorHash = "sha256-de9cPm2MuflsOhFZfZmvZpLYiwt3UBgW+MO1Z2QB4F4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix index 674adcf585..ff8957db2b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -2,20 +2,22 @@ , buildGoModule , fetchFromGitHub , installShellFiles +, testers +, k0sctl }: buildGoModule rec { pname = "k0sctl"; - version = "0.17.5"; + version = "0.17.8"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - hash = "sha256-NHfS1iJtpt0t2iIqXBETiD4rpA2XzA8eOg5mP4N8El4="; + hash = "sha256-QHTVNrPglNDT9CUQWwc6oD7ttwEUBq8WIX49DiAXf8s="; }; - vendorHash = "sha256-MPTdOcNoveBnHMJ2YHqHuvOHHe6IdisZLc05qViA1YQ="; + vendorHash = "sha256-6Kj1kHKXbbPMr9thkDTmGYbZvCSW7CvSzASpk6agEpI="; ldflags = [ "-s" @@ -34,6 +36,13 @@ buildGoModule rec { done ''; + passthru.tests.version = testers.testVersion { + package = k0sctl; + command = "k0sctl version"; + # See https://github.com/carlmjohnson/versioninfo/discussions/12 + version = "version: (devel)\ncommit: v${version}\n"; + }; + meta = with lib; { description = "A bootstrapping and management tool for k0s clusters."; homepage = "https://k0sproject.io/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix index 1acca4d0e1..a0341b7cbd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix @@ -1,10 +1,10 @@ { - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz"; - sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz"; - sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89"; - }; + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz"; + sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz"; + sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89"; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix index 1acca4d0e1..aaaa3d4c29 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix @@ -1,10 +1,10 @@ { - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz"; - sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz"; - sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89"; - }; + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz"; + sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz"; + sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if"; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix index 9283375539..508ef6c413 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix @@ -1,14 +1,14 @@ { - k3sVersion = "1.27.12+k3s1"; - k3sCommit = "78ad57567c9eb1fd1831986f5fd7b4024add1767"; - k3sRepoSha256 = "1j6xb3af4ypqq5m6a8x2yc2515zvlgqzfsfindjm9cbmq5iisphq"; - k3sVendorHash = "sha256-65cmpRwD9C+fcbBSv1YpeukO7bfGngsLv/rk6sM59gU="; + k3sVersion = "1.27.13+k3s1"; + k3sCommit = "b23f142da8589854cc7ee45da08d96b5ad1ee1ff"; + k3sRepoSha256 = "052998644il0qra7cdpvmy007gw16k2rvyg418m1j02pm9a3zn10"; + k3sVendorHash = "sha256-rQZZnleRekkU1+I38LmFnnatZPuS+K1jbBwA+Dmc0jo="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.11-k3s2.27"; - containerdSha256 = "0xjxc5dgh3drk2glvcabd885damjffp9r4cs0cm1zgnrrbhlipra"; + containerdVersion = "1.7.15-k3s1.27"; + containerdSha256 = "0bjxw174prhq8izmgrmpyljfxzrj0lh5d0w04g3lyn0rp3kwxqsl"; criCtlVersion = "1.26.0-rc.0-k3s1"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix index 1acca4d0e1..aaaa3d4c29 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix @@ -1,10 +1,10 @@ { - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz"; - sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz"; - sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89"; - }; + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz"; + sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz"; + sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if"; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/versions.nix index b8e68bb877..67991dfd6f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_28/versions.nix @@ -1,14 +1,14 @@ { - k3sVersion = "1.28.8+k3s1"; - k3sCommit = "653dd61aaa2d0ef8bd83ac4dbc6d150dde792efc"; - k3sRepoSha256 = "0pf8xw1m56m2s8i99vxj4i2l7fz7388kiynwzfrck43jb7v7kbbw"; - k3sVendorHash = "sha256-wglwRW2RO9QJI6CRLgkVg5Upt6R0M3gX76zy0kT02ec="; + k3sVersion = "1.28.9+k3s1"; + k3sCommit = "289a1a3edbc0f6ee5a7f91bf96aa1ed1b743bd1f"; + k3sRepoSha256 = "0kms6r10k6v037r5lxxrp90bnynrgyrn61kqnzy2f5avny4blikh"; + k3sVendorHash = "sha256-iUp2Maua3BnrC4Jq2ij0uOW5gYYZfz6e+TEdDtN0PT8="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.11-k3s2"; - containerdSha256 = "0279sil02wz7310xhrgmdbc0r2qibj9lafy0i9k24jdrh74icmib"; + containerdVersion = "1.7.15-k3s1"; + containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f"; criCtlVersion = "1.26.0-rc.0-k3s1"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix index 1acca4d0e1..aaaa3d4c29 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix @@ -1,10 +1,10 @@ { - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz"; - sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz"; - sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89"; - }; + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz"; + sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz"; + sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if"; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index cf1f57e0fe..31dd51fa9c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,14 +1,14 @@ { - k3sVersion = "1.29.3+k3s1"; - k3sCommit = "8aecc26b0f167d5e9e4e9fbcfd5a471488bf5957"; - k3sRepoSha256 = "12285mhwi6cifsw3gjxxmd1g2i5f7vkdgzdc6a78rkvnx7z1j3p3"; - k3sVendorHash = "sha256-pID2h/rvvKyfHWoglYPbbliAby+9R2zoh7Ajd36qjVQ="; + k3sVersion = "1.29.4+k3s1"; + k3sCommit = "94e29e2ef5d79904f730e2024c8d1682b901b2d5"; + k3sRepoSha256 = "0kkhd2fnlmjanzvwgdclmbg6azw3r1a2lj5207716pavxmb9ld7y"; + k3sVendorHash = "sha256-wOX+ktGPFYUKLZBK/bQhWWG+SnRCkNYnk3Tz8wpMo5A="; chartVersions = import ./chart-versions.nix; - k3sRootVersion = "0.12.2"; - k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; + k3sRootVersion = "0.13.0"; + k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.11-k3s2"; - containerdSha256 = "0279sil02wz7310xhrgmdbc0r2qibj9lafy0i9k24jdrh74icmib"; + containerdVersion = "1.7.15-k3s1"; + containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f"; criCtlVersion = "1.29.0-k3s1"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix new file mode 100644 index 0000000000..aaaa3d4c29 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz"; + sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz"; + sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_30/versions.nix new file mode 100644 index 0000000000..bc7c2d99c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_30/versions.nix @@ -0,0 +1,14 @@ +{ + k3sVersion = "1.30.0+k3s1"; + k3sCommit = "14549535f13c63fc239ba055d36d590e68b01503"; + k3sRepoSha256 = "1dph6clzzanlx7dbdzpamnw7gpw98j850my28lcb3zdzhvhsc74b"; + k3sVendorHash = "sha256-YBWiIf8F71ibR7sCiYtmsAcY1MsvkhTD/K45tOHQC5w="; + chartVersions = import ./chart-versions.nix; + k3sRootVersion = "0.13.0"; + k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; + k3sCNIVersion = "1.4.0-k3s2"; + k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; + containerdVersion = "1.7.15-k3s1"; + containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f"; + criCtlVersion = "1.29.0-k3s1"; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix index b5f017b85b..247ab0f339 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix @@ -29,33 +29,42 @@ lib: # currently. # It is likely we will have to split out additional builders for additional # versions in the future, or customize this one further. -{ lib -, fetchpatch -, makeWrapper -, socat -, iptables -, iproute2 -, ipset -, bridge-utils -, btrfs-progs -, conntrack-tools -, buildGoModule -, runc -, rsync -, kmod -, libseccomp -, pkg-config -, ethtool -, util-linux -, fetchFromGitHub -, fetchurl -, fetchzip -, fetchgit -, zstd -, yq-go -, sqlite -, nixosTests -, pkgsBuildBuild +{ + lib, + makeWrapper, + socat, + iptables, + iproute2, + ipset, + bridge-utils, + btrfs-progs, + conntrack-tools, + buildGoModule, + runc, + rsync, + kmod, + libseccomp, + pkg-config, + ethtool, + util-linux, + fetchFromGitHub, + fetchurl, + fetchzip, + fetchgit, + zstd, + yq-go, + sqlite, + nixosTests, + pkgsBuildBuild, + go, + runCommand, + bash, + procps, + coreutils, + gnugrep, + findutils, + gnused, + systemd, }: # k3s is a kinda weird derivation. One of the main points of k3s is the @@ -83,7 +92,13 @@ let description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank mic92 superherointj yajo ]; + maintainers = with maintainers; [ + euank + mic92 + superherointj + wrmilling + yajo + ]; platforms = platforms.linux; # resolves collisions with other installations of kubectl, crictl, ctr @@ -93,8 +108,9 @@ let # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 versionldflags = [ - "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}" - "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" + "-X github.com/k3s-io/k3s/pkg/version.Version=v${k3sVersion}" + "-X github.com/k3s-io/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" + "-X github.com/k3s-io/k3s/pkg/version.UpstreamGolang=go${go.version}" "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}" "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}" "-X k8s.io/client-go/pkg/version.gitTreeState=clean" @@ -156,6 +172,42 @@ let rev = "v${k3sVersion}"; sha256 = k3sRepoSha256; }; + + # Modify the k3s installer script so that we can let it install only + # killall.sh + k3sKillallSh = runCommand "k3s-killall.sh" { } '' + # Copy the upstream k3s install script except for the last lines that + # actually run the install process + sed --quiet '/# --- run the install process --/q;p' ${k3sRepo}/install.sh > install.sh + + # Let killall expect "containerd-shim" in the Nix store + to_replace="k3s/data/\[\^/\]\*/bin/containerd-shim" + replacement="/nix/store/.*k3s-containerd.*/bin/containerd-shim" + changes=$(sed -i "s|$to_replace|$replacement| w /dev/stdout" install.sh) + if [ -z "$changes" ]; then + echo "failed to replace \"$to_replace\" in k3s installer script (install.sh)" + exit 1 + fi + + remove_matching_line() { + line_to_delete=$(grep -n "$1" install.sh | cut -d : -f 1 || true) + if [ -z $line_to_delete ]; then + echo "failed to find expression \"$1\" in k3s installer script (install.sh)" + exit 1 + fi + sed -i "''${line_to_delete}d" install.sh + } + + # Don't change mode and owner of killall + remove_matching_line "chmod.*KILLALL_K3S_SH" + remove_matching_line "chown.*KILLALL_K3S_SH" + + # Execute only the "create_killall" function of the installer script + sed -i '$acreate_killall' install.sh + + KILLALL_K3S_SH=$out bash install.sh + ''; + # Stage 1 of the k3s build: # Let's talk about how k3s is structured. # One of the ideas of k3s is that there's the single "k3s" binary which can @@ -185,22 +237,20 @@ let src = k3sRepo; vendorHash = k3sVendorHash; - patches = - # Disable: Add runtime checking of golang version - (fetchpatch { - # https://github.com/k3s-io/k3s/pull/9054 - url = "https://github.com/k3s-io/k3s/commit/b297996b9252b02e56e9425f55f6becbf6bb7832.patch"; - hash = "sha256-xBOY2jnLhT9dtVKtq26V9QUnuX1q6E/9UcO9IaU719U="; - revert = true; - }); - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libseccomp sqlite.dev ]; + buildInputs = [ + libseccomp + sqlite.dev + ]; subPackages = [ "cmd/server" ]; ldflags = versionldflags; - tags = [ "ctrd" "libsqlite3" "linux" ]; + tags = [ + "ctrd" + "libsqlite3" + "linux" + ]; # create the multicall symlinks for k3s postInstall = '' @@ -246,7 +296,11 @@ buildGoModule rec { pname = "k3s"; version = k3sVersion; - tags = [ "libsqlite3" "linux" "ctrd" ]; + tags = [ + "libsqlite3" + "linux" + "ctrd" + ]; src = k3sRepo; vendorHash = k3sVendorHash; @@ -286,6 +340,16 @@ buildGoModule rec { runc ]; + k3sKillallDeps = [ + bash + systemd + procps + coreutils + gnugrep + findutils + gnused + ]; + buildInputs = k3sRuntimeDeps; nativeBuildInputs = [ @@ -342,6 +406,9 @@ buildGoModule rec { ln -s $out/bin/k3s $out/bin/kubectl ln -s $out/bin/k3s $out/bin/crictl ln -s $out/bin/k3s $out/bin/ctr + install -m 0755 ${k3sKillallSh} -D $out/bin/k3s-killall.sh + wrapProgram $out/bin/k3s-killall.sh \ + --prefix PATH : ${lib.makeBinPath (k3sRuntimeDeps ++ k3sKillallDeps)} ''; doInstallCheck = true; @@ -351,15 +418,17 @@ buildGoModule rec { passthru.updateScript = updateScript; - passthru.mkTests = version: - let k3s_version = "k3s_" + lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version); - in { + passthru.mkTests = + version: + let + k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version); + in + { etcd = nixosTests.k3s.etcd.${k3s_version}; single-node = nixosTests.k3s.single-node.${k3s_version}; multi-node = nixosTests.k3s.multi-node.${k3s_version}; }; passthru.tests = passthru.mkTests k3sVersion; - meta = baseMeta; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index 934f5a3691..58984502d9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -12,22 +12,57 @@ let extraArgs = builtins.removeAttrs args [ "callPackage" ]; in { - k3s_1_26 = common ((import ./1_26/versions.nix) // { - updateScript = [ ./update-script.sh "26" ]; - }) extraArgs; + k3s_1_26 = common ( + (import ./1_26/versions.nix) + // { + updateScript = [ + ./update-script.sh + "26" + ]; + } + ) extraArgs; # 1_27 can be built with the same builder as 1_26 - k3s_1_27 = common ((import ./1_27/versions.nix) // { - updateScript = [ ./update-script.sh "27" ]; - }) extraArgs; + k3s_1_27 = common ( + (import ./1_27/versions.nix) + // { + updateScript = [ + ./update-script.sh + "27" + ]; + } + ) extraArgs; # 1_28 can be built with the same builder as 1_26 - k3s_1_28 = common ((import ./1_28/versions.nix) // { - updateScript = [ ./update-script.sh "28" ]; - }) extraArgs; + k3s_1_28 = common ( + (import ./1_28/versions.nix) + // { + updateScript = [ + ./update-script.sh + "28" + ]; + } + ) extraArgs; # 1_29 can be built with the same builder as 1_26 - k3s_1_29 = common ((import ./1_29/versions.nix) // { - updateScript = [ ./update-script.sh "29" ]; - }) extraArgs; + k3s_1_29 = common ( + (import ./1_29/versions.nix) + // { + updateScript = [ + ./update-script.sh + "29" + ]; + } + ) extraArgs; + + # 1_30 can be built with the same builder as 1_26 + k3s_1_30 = common ( + (import ./1_30/versions.nix) + // { + updateScript = [ + ./update-script.sh + "30" + ]; + } + ) extraArgs; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update-script.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update-script.sh index 19b0a6d930..ca7d21bff4 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -19,7 +19,9 @@ LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ https://api.github.com/repos/k3s-io/k3s/releases > ${LATEST_TAG_RAWFILE} -LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | \ +LATEST_TAG_NAME=$(cat ${LATEST_TAG_RAWFILE} | \ + jq -r 'map(select(.prerelease == false))' | \ + jq 'map(.tag_name)' | \ grep -v -e rc -e engine | tail -n +2 | head -n -1 | sed 's|[", ]||g' | sort -rV | grep -E "^v1\.${MINOR_VERSION}\." | head -n1) K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') @@ -55,14 +57,14 @@ CHARTS_URL=https://k3s.io/k3s-charts/assets rm -f chart-versions.nix.update cat > chart-versions.nix.update <= 2.0.2, < 6.0) base64 (0.2.0) - bigdecimal (3.1.7) + bigdecimal (3.1.8) colorize (0.8.1) concurrent-ruby (1.2.3) connection_pool (2.4.1) @@ -48,13 +48,13 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) jsonpath (1.1.5) multi_json jwt (2.8.1) base64 - krane (3.5.1) + krane (3.5.3) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -75,7 +75,7 @@ GEM rake (~> 13.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0507) minitest (5.22.3) multi_json (1.15.0) mutex_m (0.2.0) @@ -84,7 +84,7 @@ GEM netrc (0.11.0) os (1.1.4) public_suffix (5.0.5) - rake (13.2.0) + rake (13.2.1) recursive-open-struct (1.1.3) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -109,4 +109,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.5.6 + 2.5.9 diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix index 501c449dd5..5b296b320c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.8"; }; colorize = { groups = ["default"]; @@ -214,10 +214,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.4"; + version = "1.14.5"; }; jsonpath = { dependencies = ["multi_json"]; @@ -247,10 +247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wnx86ars7csb2sxn69rb654p5xpz6xlygkx4mbyw1abgzyr2ap0"; + sha256 = "11jj5fpfsb1sfwgc356xv1vxl8yq65wbbshmawpagk555y0pzbpb"; type = "gem"; }; - version = "3.5.1"; + version = "3.5.3"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -290,10 +290,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455"; + sha256 = "0kybw1a6f7d1ipyawnpi5cwiy05rkz9qwglgfvhmd1z0l2gcigmm"; type = "gem"; }; - version = "3.2024.0305"; + version = "3.2024.0507"; }; minitest = { groups = ["default"]; @@ -371,10 +371,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lwv4rniry7k9dvz1n462d7j0dq9mrl6a95y6cvs6139h0ksxhgn"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.2.0"; + version = "13.2.1"; }; recursive-open-struct = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix index 4b75b292fd..551240dfcc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-router"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - hash = "sha256-5aOAQ5kRnNsCn5EH9RKoeEfcFB3g59eqYIdSNjQxdjM="; + hash = "sha256-BjL91c+yfpscb0q62eWfiqg1aLkXztXowTj4k8jdTQs="; }; - vendorHash = "sha256-5aGcDO+dV9XinH0vw6uNB0mnWuFQcyLhRB7zYr+sRfg="; + vendorHash = "sha256-BrpjG9DhDQSsbeJ+1MRAwXyKVULK3KHjvLydduTb024="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix index b50320d7c1..9bbdb64e95 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.14.1"; + version = "3.14.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-TMKixwZonYGPXIqOtgnuilbH7BaIRyqJU6uKtp9ANKM="; + hash = "sha256-bs/16MEZZOv+5cfr35HDqhnJxza9mQfjd8ALjJifRf8="; }; - vendorHash = "sha256-Hl01dFSffYv59zensKTjXWLXxwfkQYAO5xadlc5iBJY="; + vendorHash = "sha256-eLLWzVQ9ANIWSdqjmggrboCwcUKVGdrJD2coCLmzAK4="; subPackages = ["cmd"]; @@ -58,12 +58,12 @@ buildGoModule rec { version = "v${version}"; }; - meta = with lib; { + meta = { description = "SDK for building Kubernetes APIs using CRDs"; mainProgram = "kubebuilder"; homepage = "https://github.com/kubernetes-sigs/kubebuilder"; changelog = "https://github.com/kubernetes-sigs/kubebuilder/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ cmars ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ cmars ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecolor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecolor/default.nix index 794b184e24..589b93cd2f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecolor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecolor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecolor"; - version = "0.2.2"; + version = "0.3.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-zXglsfPsJi9DVxlRPniSBsdF1xEMYqqGr46ThpQj3gQ="; + sha256 = "sha256-9fL1zuhQ1B8QpJXcGVxg8mqIQoM5ZhwuE000rDcrrw0="; }; - vendorHash = "sha256-uf7nBnS1wmbz4xcVA5qF82QMPsLdSucje1NNaPyheCw="; + vendorHash = "sha256-Gzz+mCEMQCcLwTiGMB8/nXk7HDAEGkEapC/VOyXrn/Q="; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix index b129e0c65b..ec9d9c56f4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PUZ3zwgOQ362ikoX1D7SLThiaFpXJh9TKOdjZqZDtSg="; + sha256 = "sha256-4rHEkzoO0AuuFB6G/z1WjGqfYMaHF3Z1YDAhIbBVCts="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix index db05ee6b36..a5fc3b5a42 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubectl-cnpg"; - version = "1.22.2"; + version = "1.23.1"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-xR61PYUqiVtPTghEEeSWXs/Apx7VVWDgi6Pgx/EBQzQ="; + hash = "sha256-sh9ogECNEZ6AYhdJD87ELnr8E0iWPLhDu3Qkdpb2194="; }; - vendorHash = "sha256-u5ou9rY/JBrV0EF/nJX8u/Fqde/WZe21EcsNLwvtqB0="; + vendorHash = "sha256-3yh6b0dB2JC0t2EwykWiLk6glyKUhTpqmqvfFZ4RekE="; subPackages = [ "cmd/kubectl-cnpg" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-explore/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-explore/default.nix index 0ff402b39f..66f45ad898 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-explore/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-explore/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-explore"; - version = "0.7.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "keisku"; repo = "kubectl-explore"; rev = "v${version}"; - hash = "sha256-OVPct3EvtchH9pmMulIddsiR9VFoCegx9+O7lkecoJc="; + hash = "sha256-jPif9SjHVKB346XkPCiIYpTc/xWRda9jjXefK/Nbyz0="; }; - vendorHash = "sha256-l6SANWkDQSuLbyixbO/Xr2oRG8HR/qquTT9b/IM+JVg="; + vendorHash = "sha256-8kq6ODLf/y23zHsemNtjpM+R8OMKE4DDnK2TGHvunUE="; doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index 98a656f238..e902bc3597 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-u5lzCIbSIOrhI2OE2PprvNZv7KetYGntyADVftSJrkY="; + hash = "sha256-iQ+9CN6De2jz3+dZ26jgqbXAx9Fef8ROgVX8kKYMAG0="; }; - vendorHash = "sha256-ZsSzLIVVoKZZEZOIYJTNl0DGere3sKfXsjXbRVmeYC4="; + vendorHash = "sha256-0XByai7fEnkmEEkH1koVM1+z3UNFLbsUCK3sP4KBe+A="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix index 044e12837c..06ede90ffb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kubectl-klock"; - version = "0.5.1"; + version = "0.6.1"; nativeBuildInputs = [ makeWrapper ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "applejag"; repo = pname; rev = "v${version}"; - hash = "sha256-q7Wq1mTjOB7tT66+LWIwwqltQcQSHD/VHLO7nCTZTQ0="; + hash = "sha256-QzleoHRQ/A5ImMl43kze5ppUdiLa4n/VT02lMnaXVkg="; }; - vendorHash = "sha256-3CJ/tmFFkmq6wHxbqk8u+GxxbSrUpB/JD5s/S7hegB8="; + vendorHash = "sha256-smE8mdyZ8xJOevgHs4+ozS6VOlko+Whhs/37B+hIbxo="; postInstall = '' makeWrapper $out/bin/kubectl-klock $out/bin/kubectl_complete-klock --add-flags __complete diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix index ce2e92356d..14c1a25b13 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.44.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ppsGSzgJvAHRGs6PGPNgE7nDbK8SPYBPNbAlGwocAZs="; + sha256 = "sha256-4kmXz8dTxCaGbuAo3zK27BhUrecInwJCu9XOuiQY48A="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix index e4d704d6ff..5e76464523 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.4.5"; + version = "2.4.8"; src = fetchFromGitHub { owner = "kubefirst"; repo = "kubefirst"; rev = "refs/tags/v${version}"; - hash = "sha256-CkssgMr/4VGNQHyvaPnXBOf6HdExnhB7MjpJ3yQ9kfI="; + hash = "sha256-r5y1eWjcw0HP/E9AQodEdCgWgKikGrwV6TvZ2mVcuoE="; }; vendorHash = "sha256-ZcZl4knlyKAwTsiyZvlkN5e2ox30B5aNzutI/2UEE9U="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix index b52a488782..43fd319201 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mQSQrcLzEZqNpXNuZFCVk3FRcfkrtvN19VhwqyrmwIU="; + sha256 = "sha256-5Y+xu84iNVFkrBc1qoTg8vMswvlflF9SobMy/Aw4mCA="; }; - vendorHash = "sha256-Xh4htBknBW59xdJVYw7A7BT2GB5WW8SnV05is7dWAS8="; + vendorHash = "sha256-sVySHSj8vJEarQlhAR3vLdgysJNbmA2IAZ3ET2zRyAM="; ldflags = [ "-X main.version=${version}" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix index 84ff7632cf..abff9a0299 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-m2RxSKXiKmx1p5g+C8I/l+OtV7wy2KtrFRIK+h9L5lo="; + hash = "sha256-GK5SEQjQb553MypcRpTfmewVhucP1fRldpXhfLERkMo="; }; - vendorHash = "sha256-vUy60CBrdhB9OFMZ4+q05WtrtN4/5ssozYGBV7r4BsM="; + vendorHash = "sha256-pt3EWohdXOBgE3SfEEODUi1uX/X+jJ2JrBbLFIXDbwY="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index 8f158f1cd5..3faa5ff0cc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.29.4"; + version = "1.30.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-7Rxbcsl77iFiHkU/ovyn74aXs/i5G/m5h5Ii0y1CRho="; + hash = "sha256-7xRRpchjwtV3dGbZ2hN9qj6soAuiF/K7vTY0LzE6Z5w="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix index 66ecc4274f..a5fd286984 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.2.1"; + version = "52.3.0"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-MmKkM4nc9FkZkQIURPz63ryl0yhvxBwOvxkjrsaa67U="; + hash = "sha256-7tTXhILWnYRFyKBw1Im9Q9/oqlKJAP478qiBEoTUGMc="; }; vendorHash = "sha256-SmvO9DYOXxnmN2dmHPPOguVwEbWSH/xNLBB+idpzopo="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevela/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevela/default.nix index 18a8f0b1fd..4e6f0a53f2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevela/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevela/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "kubevela"; - version = "1.9.10"; + version = "1.9.11"; src = fetchFromGitHub { owner = "kubevela"; repo = "kubevela"; rev = "v${version}"; - hash = "sha256-DWmkPzMg6AbyOKoO2vev48f/cKO9XQpyR85Jg0T20aI="; + hash = "sha256-u9UGV1UwZoj4eSqqMLf8BvsfTFIYagoslN5pflDKm8c="; }; - vendorHash = "sha256-vRSlSEnqD/a6KBvCWnNTzIBKE9BYzMtFWUhAF+m3R54="; + vendorHash = "sha256-NnUZnlvVb2VmNx4HM8lkbTNcQA3/pctkg1UVpOY8Acs="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix index 14df6fa5c4..c8f755bf3d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.2.6"; + version = "2.2.8"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-Z+IXSmN1V0xRnhE/PpWv9dQIwfTztJRYaftY9KCIucc="; + hash = "sha256-/5x1ovvO4Pfnux3GpfeOUy9PIrHPmZzYvOCH09EjxKE="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix index 2ae43e1efd..cde60aa4f9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,17 +15,17 @@ buildGoModule rec { inherit pname; - version = "2.6.5"; + version = "2.7.2"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-gZxlbapEYrp02YSvEYBtlbRT/F0ijoF76CfZFzBbsAI="; + hash = "sha256-Y9JejIKENIyn2EyRHXLm6CZqlP4MwvPSMRlciYl+a30="; }; - vendorHash = "sha256-kqC6CUezPt3Uj9zuHnQYbbEP564Ki4UYmqfZedUBO38="; + vendorHash = "sha256-ne62twZXac5GfQ8JcWElIMqc+Vpvn0Y9XSNgAtF62q0="; # no test files doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix index cae6540e39..0171ed2c0b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.15.0"; + version = "0.16.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-u+j1ulM6B238qXvLMJZwLqglr9CGk81MsnBYiNiZVJQ="; + sha256 = "sha256-Kz8+RsLpKwXk4f3k/kBqSFGB9AvA/D6kYBtPEl6aSH8="; }; - vendorHash = "sha256-taJAQPa0EA0Ph9OpCs7jzLqBV61kVstZrWyNEYc/GBk="; + vendorHash = "sha256-IgfPXT4BhfZZVOa7eO1wKUKiDVMcN8vmH11qdWfvFww="; subPackages = [ "cmd/kubectl-kuttl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix index 208867bec2..b80e2726bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.11.4"; + version = "1.12.1"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-6Qrd7/h9G8KvzUxPNXUV/RnWImFrxm1FILeik8bWLnA="; + hash = "sha256-2x5xLh+v1/RXG3h93Ff49pT9NwHWNx4tubnmCf0SAdY="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorHash = "sha256-Vw8f2+b5UNc7DqCmu2cN2De1mrONe0M6F68H9SPrD3w="; + vendorHash = "sha256-5tBHmHfBHTsAVDk3i0z2R2amTfOvWHJutTNW2ofGZuQ="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix index b54285fdaf..c76a160776 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/linux.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pname, version, src, meta, appimageTools, makeWrapper, nss_latest }: +{ pname, version, src, meta, appimageTools, makeWrapper }: let name = "${pname}-${version}"; @@ -25,5 +25,5 @@ appimageTools.wrapType2 { --replace 'Exec=AppRun' 'Exec=${pname}' ''; - extraPkgs = _: [ nss_latest ]; + extraPkgs = pkgs: [ pkgs.nss_latest ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix index f40dc62474..a2c84cc4ae 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.4.4"; - sha256 = "07p4cgl4myv7kv9pxvxrvsqnl3vkd9ay5hngx5g6xds2sc8va306"; - vendorHash = "sha256-bLTummNoDfGMYvtfSLxICgCFZEymPJcRWkQyWOSzKR8="; + version = "24.5.1"; + sha256 = "1l358gmivhpjyibcar8z4c3jlz6rwmlyzki71ar5j2k9irdjzqa3"; + vendorHash = "sha256-sLLgTZN7Zvxkf9J1omh/YGMBUgAtvQD+nbhSuR7/PZg="; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 69e73e6d47..9f13b3799b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.32.0"; + version = "1.33.1"; - vendorHash = "sha256-MzB+my1NwvZx9qfojuOlTHmuY6CyLFlrgr4UEuC5FBk="; + vendorHash = "sha256-VHl6CKPWqahX70GHbZE6SVa8XPfiC912DvsOteH2B0w="; doCheck = false; @@ -25,7 +25,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-2EWaMpcr4F1wRzIP1rPg1a/Sjd1x+oo2ee90k4Ie8cU="; + sha256 = "sha256-z0wNngEzddxpeeLyQVA2yRC5SfYvU5G66V95sVmW6bA="; }; postPatch = ( diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index 8f7a59c70e..0ef96ddf69 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-eGDshnJ26rrRuM9lWwcdRg8udA4uE5ee6c+SYES7qt4="; + hash = "sha256-z83c8Ji0zSM1QDwjB4FwhHW6XCqG0Hb5crM3jjK46jk="; }; - vendorHash = "sha256-GsI695T7nkwwAt78l7mc5JCD9wXAUcTxwsiLLFcANBI="; + vendorHash = "sha256-KqWmwwQRrWoyRehuSJBnlyPQgwk5hUGk2/d0Ue/reVc="; nativeBuildInputs = [ makeWrapper installShellFiles ]; @@ -48,13 +48,13 @@ buildGoModule rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { homepage = "https://github.com/containerd/nerdctl/"; changelog = "https://github.com/containerd/nerdctl/releases/tag/v${version}"; description = "A Docker-compatible CLI for containerd"; mainProgram = "nerdctl"; - license = licenses.asl20; - maintainers = with maintainers; [ jk developer-guy ]; - platforms = platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ developer-guy jk ]; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix index 92c98c44fd..a7a0ddf713 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix @@ -5,17 +5,16 @@ buildGoModule rec { pname = "nomad-pack"; - version = "0.0.1-techpreview.3"; - rev = "3b4163b3b826c8408ae824238daaa45307d03380"; + version = "0.1.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; - inherit rev; - sha256 = "sha256-Br+BJRAo9qSJQjg2awQTnsYz76WReVWsTUw6XoUb1YY="; + rev = "v${version}"; + sha256 = "sha256-b7M2I+R39txtTdk/FOYvKfZxXbGEtDrzgpB64594Gqc="; }; - vendorHash = "sha256-dUPDwKdkBXBfyfbFxrpgHwZ0Q5jB7aamClNmv+tLCGA="; + vendorHash = "sha256-bhWySn5p1aPbYSCY7GqFteYmm22Jeq/Rf/a2ZTjyZQ4="; # skip running go tests as they require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix index 89891fd040..679ec253bd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix @@ -41,7 +41,7 @@ let description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; mainProgram = "nomad"; inherit license; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes amaxine techknowlogick cottand ]; + maintainers = with maintainers; [ rushmorem pradeepchhetri techknowlogick cottand ]; }; } // attrs'); in diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix index 0506749070..1e8ab2402d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nova"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = pname; rev = "v${version}"; - hash = "sha256-3bSxMb/JFIy3b6N/94cXfGlUbPIm046O9m2KPan8YIs="; + hash = "sha256-9ccWH0bh67LCwzKmyaE32j+qeKfNauclSMjpRwdblH8="; }; - vendorHash = "sha256-c30B8Wjvwp4NnB1P8h4/raGiGAX/cbTZ/KQqh/qeNhA="; + vendorHash = "sha256-Vt2yUYm2i1NHzW7GxDRqBpaFS4dLfODNEMPO+CTwrLY="; ldflags = [ "-X main.version=${version}" "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/openlens/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/openlens/default.nix index cc6bc6dc0a..ef6dfea2d6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/openlens/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/openlens/default.nix @@ -19,8 +19,6 @@ appimageTools.wrapType2 { unshareIpc = false; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/open-lens.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/open-lens.png \ $out/share/icons/hicolor/512x512/apps/${pname}.png diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix index a378a7486b..1c8521d127 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,22 +14,22 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.6.2"; + version = "1.7.1"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-CYiwn2NDIAx30J8tmbrV45dbCIGoA3U+yBdMj4RX5Ho="; + hash = "sha256-201zceUedEl93nyglWJo0f9SDfFX31toP0MzzHQeJds="; }; - vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk="; + vendorHash = "sha256-cML742FfWFNIwGyIdRd3JWcfDlOXnJVgUXz4j5fa74Q="; ldflags = [ "-s" "-w" "-X" "github.com/opentofu/opentofu/version.dev=no" ]; postConfigure = '' # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ - --replace "/bin/stty" "${coreutils}/bin/stty" + --replace-fail "/bin/stty" "${coreutils}/bin/stty" ''; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix index 4d5736724a..1694359a02 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.9.3"; + version = "2.9.5"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-4ER0kjp3H5B2TrR4pI3XMvmtGrUv5ZuSM8dbDeufm2s="; + hash = "sha256-9ykJMK51fm36sbICyuHJR7dSRnwIHhaQV2foKOuFmz0="; }; - vendorHash = "sha256-+0Df3pelty9mE1E8V+4L99/SrGK5msWn68LeB0nmAIA="; + vendorHash = "sha256-bAB2vMPHIcJaMobPukQyKiCq0Af0n4b5mjImTswGFTo="; subPackages = [ "src/server/cmd/pachctl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix index 628084f6f3..9936580f3c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.19.1"; + version = "5.19.4"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-6TOHDjR5sFaIeR6Zuf4azQAIgUyev7vdlAKB7YNk8R0="; + hash = "sha256-PhP3ILOYv+7gmxOJLCgIYp+1FIJirZo7TZJoZv8A1WM="; }; - vendorHash = "sha256-8ZOYp/vM16PugmE+3QK7ZRDwIwRCMEwD0NRyiOBlh14="; + vendorHash = "sha256-EVlYhlEXwgUfRaxAJ3dBTz6MJ2QITZtnHVcQQN1cHbk="; ldflags = [ "-w" "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix index b55510e7e4..c2d38e2a7c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "pv-migrate"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "utkuozdemir"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xbg32ckxAUQkkN/yumHz4v1U4FvUcmx5ftd3+4zc3/c="; + sha256 = "sha256-HeK8/IZTqkrJxfmNIYOm8/jY3Fbof8t7/emdHONvMZo="; }; subPackages = [ "cmd/pv-migrate" ]; - vendorHash = "sha256-AqR9Gy8sAX4wrKGPnQUj33juBOfhUn0BR8OyJPiDrO0="; + vendorHash = "sha256-q8/Rb26ZY/Rn3FnESnAvPr+LrIvFFlSJnN6c0k8+sHg="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix index 6c9cd4d9b0..ebf37e05e5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rke"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-f1Ilf2HSsp0Ygp0fItJVd8iJq12Z1jw2WKmLR4NgUKA="; + hash = "sha256-JLP2fZALPJmfj8fCsEPT0S2xsZ1HNQlhORNNrGxxgVg="; }; - vendorHash = "sha256-/HsZAMPGCaM5Em6doC8qffoSEveX/yDNwAGog3I0+c4="; + vendorHash = "sha256-5SxRh9y8I0v3+lU4V9xGtbwWv6JmrvLmPX8TFKjvvD4="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index 5585b373df..fd4b70de5a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stern"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-Lx5f2dqjdhgMXky1Pv2ik9i56ugsQmZK/ag4veC9Dac="; + sha256 = "sha256-8Tvhul7GwVbRJqJenbYID8OY5zGzFhIormUwEtLE0Lw="; }; - vendorHash = "sha256-6jI/I7Nw/vJwKNvgH/35uHYu51SBX+WFH5s0WKfCqBo="; + vendorHash = "sha256-RLcF7KfKtkwB+nWzaQb8Va9pau+TS2uE9AmJ0aFNsik="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix index 3651d4652f..25e4c7ab97 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.6.5"; + version = "1.7.1"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-TEQnbQux+rN2WdlIbxh836Lx/ipqTDkoUsjQP8Ubl6s="; + hash = "sha256-1UDPpavDjWoM5kSfyaT4H5y5ax/vVlfqpzN9U2sTVuk="; }; - vendorHash = "sha256-xdcHd/LvIm4rawwXtsGMF8Es9pMGMaJJaZ6UQwc24ZU="; + vendorHash = "sha256-52RaQOJ2KTuc8wdk7vv5XsynKdMOwZ1LaqiPdB+jXPw="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix index 491ceba096..2aa978dfb0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -17,16 +17,16 @@ let tctl-next = buildGoModule rec { pname = "tctl-next"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-sOmXLqc1O96/50A08b9Rlk5xlmqg2S+5nWachC74IV8="; + hash = "sha256-rqwDubKNBvtJ4rTQheCoSIcbfQZQN3iD99PcZewmx5c="; }; - vendorHash = "sha256-tZvzCQzYIIqoSefm4ty+RI7fFKWWw2OopYGGX8zS6JM="; + vendorHash = "sha256-bnmlh11gtNdgcrI20gjNqxWB+OQTv0b9lgETucoBaXc="; inherit overrideModAttrs; @@ -50,6 +50,7 @@ let postInstall = '' installShellCompletion --cmd temporal \ --bash <($out/bin/temporal completion bash) \ + --fish <($out/bin/temporal completion fish) \ --zsh <($out/bin/temporal completion zsh) ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix index f9cfb3b3cb..49094fa960 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-4e8z4k7loL9vVYe5jut1X/5qDboChQxZtPO1ZBHNb7o="; + hash = "sha256-yu5EfW5ThTJx6ouCBoEEq9wU4MtlFGqqRaHMgIPaRqY="; }; - vendorHash = "sha256-4xwdVFE0CGcOA8Efj4ECionPP9rbzT02zyr2HR143AM="; + vendorHash = "sha256-INmc/qbayjI+umkoGL8ih/iC7xqUkO1kfIZN5cQn/bw="; excludedPackages = [ "./build" ]; @@ -45,7 +45,7 @@ buildGoModule rec { homepage = "https://temporal.io"; changelog = "https://github.com/temporalio/temporal/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ titanous ]; + maintainers = with maintainers; [ ]; mainProgram = "temporal-server"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index f9e1dff0a8..6abdcb2bb3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -58,7 +58,6 @@ let Chili-Man babariviere kalbasit - amaxine timstott zimbatm zowoq @@ -167,9 +166,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.8.1"; - hash = "sha256-q/r1KK0svdK/5Za4bqU6bGgTcWmG+YZFJUFRKqPAWSw="; - vendorHash = "sha256-xpgGceAA+kvwUp4T0m9rnbPoZ3uJHU2KIRsrcGr8dRo="; + version = "1.8.3"; + hash = "sha256-4W1Cs3PAGn43eGDK15qSvN+gLdkkoFIwhejcJsCqcYA="; + vendorHash = "sha256-2+ctm1lJjCHITWV7BqoqgBlXKjNT4lueAt4F3UtoL9Q="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix index a756212d3d..40511cc74e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix @@ -6,16 +6,16 @@ buildGo122Module rec { pname = "timoni"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-zQawfzwQNQvtta7lIOtePGI67Y4iXzEBGqd5YiOKAVY="; + hash = "sha256-LN2VxXKjEaUgLSVc0G+OlhmaZ4anBmyXbOBOrGIeYG0="; }; - vendorHash = "sha256-xQgSABaWY5FWHh2kcBB36fm3povFNpU18PjD4J6M4QM="; + vendorHash = "sha256-Vj7P0o0UM35WTv9s1BAcW6MuzjIinADOFsuCK1bpKP0="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix index 4cb8bc0ad4..8a39c31f11 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-Fz3FqNj2NbqU9CvtdjM8cjkZh5xLCA+AAIF/QgLJ7UA="; + sha256 = "sha256-Dqz8UFoGb5uG5f8mrIUIRWJUYH/ZuFavhRy2wie75/Q="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorHash = "sha256-Fu4T2VEW5s/KCdgJLk3bf0wIUhKULK6QuNEmL99MUCI="; + vendorHash = "sha256-L1QTqw0L/aE4bFlLWg4/mmdHL7Sb5EsT3eL0jZIpBsA="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix deleted file mode 100644 index 7e16417fe2..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, go-bindata, installShellFiles }: - -buildGoModule rec { - pname = "waypoint"; - version = "0.11.4"; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Zn11mVQV8lN62BVYfhXauKets7/mIqA0r+mG2TkRyPk="; - }; - - vendorHash = "sha256-z0qe8zSQ9PopGeyvMDhRpU+3jUgHoh+8jTsYGLPk3i4="; - - nativeBuildInputs = [ go-bindata installShellFiles ]; - - # GIT_{COMMIT,DIRTY} filled in blank to prevent trying to run git and ending up blank anyway - buildPhase = '' - runHook preBuild - make bin GIT_DESCRIBE="v${version}" GIT_COMMIT="" GIT_DIRTY="" - runHook postBuild - ''; - - doCheck = false; - - installPhase = '' - runHook preInstall - - local INSTALL="$out/bin/waypoint" - install -D waypoint $out/bin/waypoint - - # waypoint's completion install command alters your rc files - # below is the equivalent of what it injects - - # Write to a file as it doesn't like EOF within <() - cat > waypoint.fish <= 1.7.0 diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index f2d0e55e18..e1ffaf1df8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,52 +2,52 @@ let versions = if stdenv.isLinux then { - stable = "0.0.49"; - ptb = "0.0.78"; - canary = "0.0.346"; - development = "0.0.17"; + stable = "0.0.53"; + ptb = "0.0.84"; + canary = "0.0.382"; + development = "0.0.18"; } else { - stable = "0.0.300"; - ptb = "0.0.107"; - canary = "0.0.468"; - development = "0.0.39"; + stable = "0.0.303"; + ptb = "0.0.113"; + canary = "0.0.492"; + development = "0.0.40"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-rVSYAkTZTlurnbUeYJFCgsPcsCqjJ1bJneQQiyhmvwQ="; + hash = "sha256-HD8bDFUV3YGk/t3Rbm26nXWDvUjjIf4ykdO6YGDtvTU="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-Fp94BsR6Fzy4tV+c5ToP9GKg6GC/TryGvHWLupew4Z8="; + hash = "sha256-0bOsmy2ldZT7S4tVOkihE5eLiujXC/ugF8CKXfBXHNU="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-/FBVo3ptZk2YQPoq+VpyxMlSWYlVb8ChpKW5YH/BM7U="; + hash = "sha256-MXMq4V+21KPHoCUs5x1rNRbkfw6+3cF7xSSNguiqOfc="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-AmbaMVi/or+9QLuQO5u5btgKeKdrfo7bzZgGLILwgqo="; + hash = "sha256-SoJ4/jXl0axQyeqv8CPSzM+lBsYq/QelHctRAeoscdA="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-f9YIlzRESzzxtD9/us1DY5acu2HYo+UrwS7GWk9RwCk="; + hash = "sha256-B4r0W//d3761ufQr4PAt4ZuPMrOC7Zfo8Q3lHqKxkJ0="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-etxXrO9Ksacbdes3DT1Tm4kKD/t40jGUeSAegdexRqc="; + hash = "sha256-hdT33jK0nHvY3rIh9i1eDq5j46xS9xInRxzGCUP/hi8="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-UOoXDwAa5pFukqTCmUfM89QVK5jB13id8ek/gwWajMM="; + hash = "sha256-74XQu4PGW3eW4wPICGsAVlR4SQkDXJWZ1p/G7Bwq950="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-nZV9LK3eGpXK/2wQKJBn3K2Ud6uBk8aammkeE00rWx0="; + hash = "sha256-uPz3uWPAqp3JeL9E+coMrb2Hc+Zn0YGF9Jw3BTKYRlw="; }; }; aarch64-darwin = x86_64-darwin; @@ -60,7 +60,7 @@ let downloadPage = "https://discordapp.com/download"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ MP2E Scrumplex artturin infinidoge jopejoe1 ]; + maintainers = with maintainers; [ Scrumplex artturin infinidoge jopejoe1 ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "discord"; }; @@ -69,14 +69,12 @@ let then ./linux.nix else ./darwin.nix; - openasar = callPackage ./openasar.nix { }; - packages = ( builtins.mapAttrs (_: value: callPackage package (value // { - inherit src version openasar branch; + inherit src version branch; meta = meta // { mainProgram = value.binaryName; }; })) { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix index 1d7a64b892..eb3f29cf2a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,5 +1,5 @@ { pname, version, src, meta, binaryName, desktopName, autoPatchelfHook -, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk +, makeDesktopItem, lib, stdenv, wrapGAppsHook3, makeShellWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf , glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libxshmfence mesa nss - wrapGAppsHook + wrapGAppsHook3 makeShellWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix index b7c9de0cc7..6c30f9a19b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.64"; + "version" = "1.11.66"; "hashes" = { - "desktopSrcHash" = "sha256-U6vVuc7claPZI4idZmTXpm1GHm+VrmoaJNVgJU0GHMU="; - "desktopYarnHash" = "079jg178cq2m91fhzrdab8x33wrm5a97ga19g0268q118vbnv98l"; - "webSrcHash" = "sha256-jphxYlSxHjck6XA3JXofC6AbVb+aVOjsbxLUqo1hRhY="; - "webYarnHash" = "0q91llgx8cy6zxinfqbnrcfkmclqx7czlp08f1ls43x0w2vd8447"; + "desktopSrcHash" = "sha256-QrFk6NIHvWgQuJz33CEU6rwmgtGZ9w3L9vqj/rdCkE8="; + "desktopYarnHash" = "1kin5z6cjgsljdhh5f4fq2782ld86pza6hz58rq1zwbd187nzbwz"; + "webSrcHash" = "sha256-xWaK2tHsuZmiwp7HExX83zKL8Z0ScRCEOnfxePWk2KI="; + "webYarnHash" = "1ykjpsg4d4kykd6w7c0yjyg8ljpc9czzwjx7ab27i84ys6pknx3q"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix index 8900f26d90..6d89bca9e4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -55,7 +55,7 @@ , stdenv , systemd , wayland -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils # for custom command line arguments, e.g. "--use-gl=desktop" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix index 294564dc95..7d1d6b825e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -6,14 +6,14 @@ let aarch64-linux = "arm64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - amd64-linux_hash = "sha256-RH8iHqJ0Nd3wkXmv/ZGX5JeWtxyJtVLVb0tz6tnkjrw="; - arm64-linux_hash = "sha256-0gvkabuxRqkMeyZiOSyT6C7v767+uCrsXE8qk0y0mYM="; + amd64-linux_hash = "sha256-Q5fUMQQTQKgUkakmsiBFH2UwJdk/XV8wpQi6uRHi90U="; + arm64-linux_hash = "sha256-axFIwz1AtzxO1+XkmCflHqi/CdsmeqD6QAxepATMqm4="; }."${arch}-linux_hash"; in mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "6.7.2"; + version = "6.7.3"; src = fetchurl { url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb"; inherit hash; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock index f345596ff1..2c3c6fd52e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock @@ -17,12 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - [[package]] name = "aead" version = "0.5.2" @@ -76,9 +70,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -100,9 +94,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.12" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -148,9 +142,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "arrayref" @@ -166,17 +160,17 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ashpd" -version = "0.6.8" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac22eda5891cc086690cb6fa10121c0390de0e3b04eb269f2d766b00d3f2d81" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ "enumflags2", "futures-channel", "futures-util", "gdk4-wayland", "gdk4-x11", + "glib", "gtk4", - "once_cell", "rand", "serde", "serde_repr", @@ -187,12 +181,14 @@ dependencies = [ [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" dependencies = [ - "event-listener 2.5.3", + "event-listener 5.2.0", + "event-listener-strategy 0.5.1", "futures-core", + "pin-project-lite", ] [[package]] @@ -202,46 +198,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 5.1.0", - "event-listener-strategy 0.5.0", + "event-listener 5.2.0", + "event-listener-strategy 0.5.1", "futures-core", "pin-project-lite", ] [[package]] name = "async-io" -version = "1.13.0" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite", "parking", - "polling 3.5.0", - "rustix 0.38.31", + "polling", + "rustix", "slab", "tracing", "windows-sys 0.52.0", @@ -269,30 +245,33 @@ dependencies = [ [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock 3.3.0", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.31", - "windows-sys 0.48.0", + "event-listener 5.2.0", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] @@ -301,13 +280,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.3.1", + "async-io", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.31", + "rustix", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -321,13 +300,13 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] @@ -355,21 +334,21 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.7.2", + "miniz_oxide", "object", "rustc-demangle", ] @@ -403,15 +382,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", @@ -453,34 +432,34 @@ dependencies = [ "async-channel", "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", + "fastrand", "futures-io", - "futures-lite 2.2.0", + "futures-lite", "piper", "tracing", ] [[package]] name = "blurhash" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa5ddff25bcae3e2ac5a93506cc050c730163fd92d319556861375b225164dde" +checksum = "565b78e03039f24994c5bc87ff793987be98a9ff59fa4851b72bc2e630001c9d" dependencies = [ "gdk-pixbuf", - "image 0.23.14", + "image", ] [[package]] name = "bumpalo" -version = "3.15.1" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c764d619ca78fccbf3069b37bd7af92577f044bb15236036662d79b6559f25b7" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -490,29 +469,28 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cairo-rs" -version = "0.18.5" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" +checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cairo-sys-rs", "glib", "libc", - "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.18.2" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" dependencies = [ "glib-sys", "libc", @@ -530,10 +508,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.86" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9fa1897e4325be0d68d48df6aa1a71ac2ed4d27723887e7754192705350730" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ + "jobserver", "libc", ] @@ -553,6 +532,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chacha20" version = "0.9.1" @@ -579,15 +564,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -715,8 +700,8 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0" -source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.0.0#463e5c7cba32561ffee8a281c4455ff3c25660d4" +version = "4.1.1" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.1#a12ab4e58455bb3dc7cd73a0f9f3443507b2854b" dependencies = [ "cfg-if", "cpufeatures", @@ -733,11 +718,11 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" version = "0.1.0" -source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.0.0#463e5c7cba32561ffee8a281c4455ff3c25660d4" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.1#a12ab4e58455bb3dc7cd73a0f9f3443507b2854b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] @@ -746,16 +731,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" -[[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - [[package]] name = "derivative" version = "2.2.0" @@ -767,6 +742,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive-where" +version = "1.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.57", +] + [[package]] name = "digest" version = "0.10.7" @@ -786,7 +772,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] @@ -801,6 +787,12 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + [[package]] name = "enumflags2" version = "0.7.9" @@ -819,7 +811,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] @@ -834,9 +826,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ "anstream", "anstyle", @@ -881,17 +873,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - [[package]] name = "event-listener" version = "4.0.3" @@ -905,9 +886,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.1.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" dependencies = [ "concurrent-queue", "parking", @@ -926,11 +907,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" dependencies = [ - "event-listener 5.1.0", + "event-listener 5.2.0", "pin-project-lite", ] @@ -944,7 +925,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide 0.7.2", + "miniz_oxide", "rayon-core", "smallvec", "zune-inflate", @@ -952,18 +933,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fdeflate" @@ -976,9 +948,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" [[package]] name = "field-offset" @@ -986,7 +958,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset", "rustc_version", ] @@ -998,18 +970,16 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flare" -version = "0.13.0" +version = "0.14.3" dependencies = [ "ashpd", - "async-trait", "blurhash", "env_logger", "err-derive", "futures", - "gdk4", "gettext-rs", "gtk4", - "image 0.24.8", + "image", "lazy_static", "libadwaita", "libsignal-service", @@ -1017,12 +987,12 @@ dependencies = [ "log", "once_cell", "oo7", + "phonenumber", "presage", "presage-store-sled", "qrcode-generator", "rand", "regex", - "sled", "sourceview5", "tokio", "tracing", @@ -1037,7 +1007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", - "miniz_oxide 0.7.2", + "miniz_oxide", ] [[package]] @@ -1130,27 +1100,15 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 1.9.0", + "fastrand", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" -dependencies = [ - "futures-core", - "pin-project-lite", ] [[package]] @@ -1161,7 +1119,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] @@ -1205,22 +1163,21 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.18.5" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" +checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" dependencies = [ "gdk-pixbuf-sys", "gio", "glib", "libc", - "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" dependencies = [ "gio-sys", "glib-sys", @@ -1231,9 +1188,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" +checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1246,9 +1203,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" +checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1263,9 +1220,9 @@ dependencies = [ [[package]] name = "gdk4-wayland" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db9102ff11e55bd65e153c1192abc21ddfa45ede90622e423d4e4a0e5d5f313" +checksum = "13fc91be838be766ff038221e068e05e4083f3b6cf48ef1f5251ba28f98f80bf" dependencies = [ "gdk4", "gdk4-wayland-sys", @@ -1276,9 +1233,9 @@ dependencies = [ [[package]] name = "gdk4-wayland-sys" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48159be256ae0212d5a2b9884627197d08082c7168b28775b53a0f9885d5624" +checksum = "c5cdc6c5cb3f64ba9b810782077939a0fc8d82e809f0147054bbe41910ac2b51" dependencies = [ "glib-sys", "libc", @@ -1287,9 +1244,9 @@ dependencies = [ [[package]] name = "gdk4-x11" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c9bbf8ea1ea8469e74c3fdfafc142c9e14810a27f89ddb01b5e9076a60a450" +checksum = "bff98d3e61807ecc1ddd15cf746b9de14fb6499fc259ca9e8d87d92e8901c7db" dependencies = [ "gdk4", "gdk4-x11-sys", @@ -1300,9 +1257,9 @@ dependencies = [ [[package]] name = "gdk4-x11-sys" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3de1709370758192369f5329aa593847797f1c693c95e8a261e9b2e06a5f125" +checksum = "30406b31a7c355c73c504c9b31d35806397944165730eca7db46f0409abf8f8f" dependencies = [ "gdk4-sys", "glib-sys", @@ -1353,9 +1310,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ "opaque-debug", "polyval", @@ -1364,19 +1321,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.11.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -1390,9 +1337,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.18.4" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" +checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f" dependencies = [ "futures-channel", "futures-core", @@ -1401,7 +1348,6 @@ dependencies = [ "gio-sys", "glib", "libc", - "once_cell", "pin-project-lite", "smallvec", "thiserror", @@ -1409,24 +1355,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.18.5" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" +checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", @@ -1438,30 +1384,28 @@ dependencies = [ "gobject-sys", "libc", "memchr", - "once_cell", "smallvec", "thiserror", ] [[package]] name = "glib-macros" -version = "0.18.5" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" +checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d" dependencies = [ - "heck 0.4.1", - "proc-macro-crate 2.0.2", - "proc-macro-error", + "heck 0.5.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] name = "glib-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" dependencies = [ "libc", "system-deps", @@ -1475,9 +1419,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" dependencies = [ "glib-sys", "libc", @@ -1486,9 +1430,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" +checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" dependencies = [ "glib", "graphene-sys", @@ -1497,9 +1441,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" +checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" dependencies = [ "glib-sys", "libc", @@ -1509,9 +1453,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" +checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" dependencies = [ "cairo-rs", "gdk4", @@ -1524,9 +1468,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" +checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1540,9 +1484,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" +checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" dependencies = [ "cairo-rs", "field-offset", @@ -1561,12 +1505,12 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" +checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" dependencies = [ "anyhow", - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro-error", "proc-macro2", "quote", @@ -1575,9 +1519,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" +checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1594,16 +1538,16 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.11", + "http 0.2.12", "indexmap", "slab", "tokio", @@ -1613,9 +1557,9 @@ dependencies = [ [[package]] name = "half" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ "cfg-if", "crunchy", @@ -1636,7 +1580,7 @@ dependencies = [ "base64", "bytes", "headers-core", - "http 0.2.11", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -1648,16 +1592,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http 0.2.11", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", + "http 0.2.12", ] [[package]] @@ -1667,10 +1602,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.6" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1678,6 +1619,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hex-literal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" + [[package]] name = "hkdf" version = "0.12.4" @@ -1716,9 +1663,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1727,9 +1674,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1743,7 +1690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] @@ -1776,13 +1723,13 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.11", + "http 0.2.12", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.5", + "socket2", "tokio", "tower-service", "tracing", @@ -1796,7 +1743,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "399c78f9338483cb7e630c8474b07268983c6bd5acee012e4211f9f7bb21b070" dependencies = [ "futures-util", - "http 0.2.11", + "http 0.2.12", "hyper", "log", "rustls", @@ -1853,46 +1800,27 @@ dependencies = [ [[package]] name = "image" -version = "0.23.14" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif 0.11.4", - "jpeg-decoder 0.1.22", - "num-iter", - "num-rational 0.3.2", - "num-traits", - "png 0.16.8", - "scoped_threadpool", - "tiff 0.6.1", -] - -[[package]] -name = "image" -version = "0.24.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", "color_quant", "exr", - "gif 0.12.0", - "jpeg-decoder 0.3.1", + "gif", + "jpeg-decoder", "num-traits", - "png 0.17.13", + "png", "qoi", - "tiff 0.9.1", + "tiff", ] [[package]] name = "indexmap" -version = "2.2.3" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -1917,26 +1845,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.11.0" @@ -1947,18 +1855,27 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.10" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] [[package]] -name = "jpeg-decoder" -version = "0.1.22" +name = "itoa" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ - "rayon", + "libc", ] [[package]] @@ -1972,9 +1889,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1996,9 +1913,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" +checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" dependencies = [ "gdk-pixbuf", "gdk4", @@ -2012,9 +1929,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" +checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" dependencies = [ "gdk4-sys", "gio-sys", @@ -2038,10 +1955,19 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +[[package]] +name = "libsignal-core" +version = "0.1.0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +dependencies = [ + "num_enum", + "uuid", +] + [[package]] name = "libsignal-protocol" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" +source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" dependencies = [ "aes", "aes-gcm-siv", @@ -2049,18 +1975,22 @@ dependencies = [ "async-trait", "ctr", "curve25519-dalek", + "derive-where", "displaydoc", "hex", "hkdf", "hmac", - "itertools 0.10.5", + "indexmap", + "itertools 0.12.1", + "libsignal-core", "log", "num_enum", "pqcrypto-kyber", "pqcrypto-traits", - "prost 0.9.0", - "prost-build 0.9.0", + "prost", + "prost-build", "rand", + "rayon", "sha2", "signal-crypto", "static_assertions", @@ -2073,7 +2003,7 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=1a8cdf81#1a8cdf81e66477077bd130cdd0313762e3d5e3c8" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c072491aa3e2b604b45b9f2b764552b7d382898c#c072491aa3e2b604b45b9f2b764552b7d382898c" dependencies = [ "aes", "aes-gcm", @@ -2091,8 +2021,8 @@ dependencies = [ "hmac", "libsignal-protocol", "phonenumber", - "prost 0.12.3", - "prost-build 0.12.3", + "prost", + "prost-build", "rand", "serde", "serde_json", @@ -2108,7 +2038,7 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=1a8cdf81#1a8cdf81e66477077bd130cdd0313762e3d5e3c8" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c072491aa3e2b604b45b9f2b764552b7d382898c#c072491aa3e2b604b45b9f2b764552b7d382898c" dependencies = [ "async-trait", "async-tungstenite", @@ -2133,9 +2063,9 @@ dependencies = [ [[package]] name = "libspelling" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850363056ea48497686407e7e583c50c793896c151bbe7139ad4ea02fbf15e76" +checksum = "38d899332fb50d87851a5599a38e244062f92878d51a3f0dd038fd414760b52d" dependencies = [ "gio", "glib", @@ -2147,9 +2077,9 @@ dependencies = [ [[package]] name = "libspelling-sys" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377675d9465da676ebc05742743d5e5bc53a49be1138f463583181aea97da3c6" +checksum = "76d4ed284e63577d6d61ef30a4f26255d9a460d5a493b3425656a84a00521ba4" dependencies = [ "gio-sys", "glib-sys", @@ -2166,12 +2096,6 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.13" @@ -2203,9 +2127,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lru-cache" @@ -2227,24 +2151,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" -version = "0.7.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -2271,25 +2186,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - [[package]] name = "miniz_oxide" version = "0.7.2" @@ -2302,9 +2198,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -2320,7 +2216,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http 0.2.11", + "http 0.2.12", "httparse", "log", "memchr", @@ -2341,14 +2237,15 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "nix" -version = "0.26.4" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg-if", + "cfg_aliases", "libc", - "memoffset 0.7.1", + "memoffset", ] [[package]] @@ -2371,7 +2268,7 @@ dependencies = [ "num-complex", "num-integer", "num-iter", - "num-rational 0.4.1", + "num-rational", "num-traits", ] @@ -2433,17 +2330,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.1" @@ -2493,7 +2379,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] @@ -2548,12 +2434,11 @@ checksum = "44d11de466f4a3006fe8a5e7ec84e93b79c70cb992ae0aa0eb631ad2df8abfe2" [[package]] name = "oo7" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aceca83a983f36dd8ee90230636fbf92897cb2dc2701d2ae66f885e20e56978d" +checksum = "37558cac1af63a81fd2ff7f3469c02a4da06b163c5671791553b8dac10f07c82" dependencies = [ "aes", - "byteorder", "cbc", "cipher", "digest", @@ -2562,7 +2447,6 @@ dependencies = [ "hmac", "num", "num-bigint-dig", - "once_cell", "pbkdf2", "rand", "serde", @@ -2570,13 +2454,14 @@ dependencies = [ "tokio", "zbus", "zeroize", + "zvariant", ] [[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" @@ -2596,22 +2481,21 @@ dependencies = [ [[package]] name = "pango" -version = "0.18.3" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" dependencies = [ "gio", "glib", "libc", - "once_cell", "pango-sys", ] [[package]] name = "pango-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" dependencies = [ "glib-sys", "gobject-sys", @@ -2650,6 +2534,26 @@ dependencies = [ "winapi", ] +[[package]] +name = "partial-default" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "124dc3c21ffb6fb3a0562d129929a8a54998766ef7adc1ba09ddc467d092c14b" +dependencies = [ + "partial-default-derive", +] + +[[package]] +name = "partial-default-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7459127d7a18cb202d418e4b7df1103ffd6d82a106e9b2091c250624c2ace70d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.57", +] + [[package]] name = "pbkdf2" version = "0.12.2" @@ -2699,29 +2603,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2736,7 +2640,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] @@ -2748,21 +2652,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" - -[[package]] -name = "png" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "deflate", - "miniz_oxide 0.3.7", -] +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "png" @@ -2774,13 +2666,13 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.2", + "miniz_oxide", ] [[package]] name = "poksho" version = "0.7.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" +source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" dependencies = [ "curve25519-dalek", "hmac", @@ -2790,30 +2682,15 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi", "pin-project-lite", - "rustix 0.38.31", + "rustix", "tracing", "windows-sys 0.52.0", ] @@ -2831,9 +2708,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -2880,11 +2757,12 @@ checksum = "94e851c7654eed9e68d7d27164c454961a616cf8c203d500607ef22c737b51bb" [[package]] name = "presage" -version = "0.6.0-dev" -source = "git+https://github.com/Schmiddiii/presage?rev=03ffb349a125518fdc6087ebfb6a5d82a1600da6#03ffb349a125518fdc6087ebfb6a5d82a1600da6" +version = "0.6.1" +source = "git+https://github.com/Schmiddiii/presage?rev=de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e#de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e" dependencies = [ "base64", "futures", + "hex", "libsignal-service", "libsignal-service-hyper", "log", @@ -2900,7 +2778,7 @@ dependencies = [ [[package]] name = "presage-store-cipher" version = "0.1.0" -source = "git+https://github.com/Schmiddiii/presage?rev=03ffb349a125518fdc6087ebfb6a5d82a1600da6#03ffb349a125518fdc6087ebfb6a5d82a1600da6" +source = "git+https://github.com/Schmiddiii/presage?rev=de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e#de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e" dependencies = [ "blake3", "chacha20poly1305", @@ -2917,7 +2795,7 @@ dependencies = [ [[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/Schmiddiii/presage?rev=03ffb349a125518fdc6087ebfb6a5d82a1600da6#03ffb349a125518fdc6087ebfb6a5d82a1600da6" +source = "git+https://github.com/Schmiddiii/presage?rev=de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e#de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e" dependencies = [ "async-trait", "base64", @@ -2925,8 +2803,8 @@ dependencies = [ "log", "presage", "presage-store-cipher", - "prost 0.12.3", - "prost-build 0.12.3", + "prost", + "prost-build", "quickcheck_macros", "serde", "serde_json", @@ -2937,12 +2815,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" dependencies = [ "proc-macro2", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] @@ -2957,12 +2835,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.2" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.21.1", ] [[package]] @@ -2991,23 +2868,13 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes", - "prost-derive 0.9.0", -] - [[package]] name = "prost" version = "0.12.3" @@ -3015,27 +2882,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", - "prost-derive 0.12.3", -] - -[[package]] -name = "prost-build" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" -dependencies = [ - "bytes", - "heck 0.3.3", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap", - "petgraph", - "prost 0.9.0", - "prost-types 0.9.0", - "regex", - "tempfile", - "which", + "prost-derive", ] [[package]] @@ -3052,27 +2899,14 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.12.3", - "prost-types 0.12.3", + "prost", + "prost-types", "regex", - "syn 2.0.50", + "syn 2.0.57", "tempfile", "which", ] -[[package]] -name = "prost-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "prost-derive" version = "0.12.3" @@ -3083,17 +2917,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.50", -] - -[[package]] -name = "prost-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -dependencies = [ - "bytes", - "prost 0.9.0", + "syn 2.0.57", ] [[package]] @@ -3102,7 +2926,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ - "prost 0.12.3", + "prost", ] [[package]] @@ -3121,7 +2945,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d06cb9646c7a14096231a2474d7f21e5e8c13de090c68d13bde6157cfe7f159" dependencies = [ "html-escape", - "image 0.24.8", + "image", "qrcodegen", ] @@ -3192,9 +3016,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3221,25 +3045,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -3262,9 +3086,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "ring" @@ -3298,36 +3122,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" -dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", @@ -3352,9 +3162,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b" +checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" dependencies = [ "base64", "rustls-pki-types", @@ -3362,9 +3172,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048a63e5b3ac996d78d402940b5fa47973d2d080c6c6fffa1d0f19c4445310b7" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" [[package]] name = "rustls-webpki" @@ -3398,12 +3208,6 @@ dependencies = [ "windows-sys 0.52.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.2.0" @@ -3412,9 +3216,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -3425,9 +3229,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -3456,14 +3260,14 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -3478,7 +3282,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] @@ -3515,7 +3319,7 @@ dependencies = [ [[package]] name = "signal-crypto" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" +source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" dependencies = [ "aes", "cbc", @@ -3571,35 +3375,25 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "sourceview5" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88c5f976a113e947bc5ec67758b2960c0db4ca76f80fb410d7cd86cd456d9ee5" +checksum = "9f0bf70f2f1ac4624af22056f9c4cf58dccff73dafc7207b46fbd3df7b57410f" dependencies = [ "futures-channel", "futures-core", @@ -3615,9 +3409,9 @@ dependencies = [ [[package]] name = "sourceview5-sys" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29637cccd56075a37ba72c0cc8b8d599dbc1d857e30dadea97eaacbc29b7fd46" +checksum = "eac236ad7ce6dad2b819ced8b68b5a1cf4d968aa301cb9a7692470eb21f657be" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -3692,9 +3486,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.50" +version = "2.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" +checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" dependencies = [ "proc-macro2", "quote", @@ -3715,12 +3509,12 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck 0.4.1", + "heck 0.5.0", "pkg-config", "toml", "version-compare", @@ -3728,57 +3522,46 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.13" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.10.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "rustix 0.38.31", + "fastrand", + "rustix", "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", -] - -[[package]] -name = "tiff" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" -dependencies = [ - "jpeg-decoder 0.1.22", - "miniz_oxide 0.4.4", - "weezl", + "syn 2.0.57", ] [[package]] @@ -3788,7 +3571,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", - "jpeg-decoder 0.3.1", + "jpeg-decoder", "weezl", ] @@ -3809,9 +3592,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -3820,7 +3603,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "tracing", "windows-sys 0.48.0", @@ -3844,7 +3627,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] @@ -3888,21 +3671,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.2" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.22.9", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -3915,20 +3698,31 @@ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.5", ] [[package]] @@ -3957,7 +3751,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] @@ -3994,7 +3788,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.0.0", + "http 1.1.0", "httparse", "log", "rand", @@ -4018,7 +3812,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset", "tempfile", "winapi", ] @@ -4053,12 +3847,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - [[package]] name = "unicode-xid" version = "0.2.4" @@ -4113,18 +3901,18 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "serde", ] [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -4132,12 +3920,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - [[package]] name = "want" version = "0.3.1" @@ -4155,9 +3937,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4165,24 +3947,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4190,22 +3972,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "weezl" @@ -4222,7 +4004,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.31", + "rustix", ] [[package]] @@ -4253,7 +4035,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -4271,7 +4053,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -4291,17 +4073,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "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_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -4312,9 +4094,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -4324,9 +4106,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -4336,9 +4118,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -4348,9 +4130,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -4360,9 +4142,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -4372,9 +4154,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -4384,9 +4166,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" @@ -4397,6 +4179,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + [[package]] name = "x25519-dalek" version = "2.0.1" @@ -4421,24 +4212,22 @@ dependencies = [ [[package]] name = "zbus" -version = "3.15.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c45d06ae3b0f9ba1fb2671268b975557d8f5a84bb5ec6e43964f87e763d8bca8" +checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" dependencies = [ "async-broadcast", "async-process", "async-recursion", "async-trait", - "byteorder", "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener 5.2.0", "futures-core", "futures-sink", "futures-util", "hex", "nix", - "once_cell", "ordered-stream", "rand", "serde", @@ -4448,7 +4237,7 @@ dependencies = [ "tokio", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -4457,11 +4246,11 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.15.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a1ba45ed0ad344b85a2bb5a1fe9830aed23d67812ea39a586e7d0136439c7d" +checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "regex", @@ -4471,9 +4260,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.6.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -4497,33 +4286,40 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.57", ] [[package]] name = "zkcredential" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" +source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" dependencies = [ "curve25519-dalek", + "derive-where", "displaydoc", "lazy_static", + "partial-default", "poksho", "serde", + "subtle", ] [[package]] name = "zkgroup" version = "0.9.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" +source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" dependencies = [ "aes-gcm-siv", "bincode", "curve25519-dalek", + "derive-where", "displaydoc", "hex", + "hex-literal", + "hkdf", "lazy_static", - "libsignal-protocol", + "libsignal-core", + "partial-default", "poksho", "serde", "sha2", @@ -4544,13 +4340,12 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "url", @@ -4559,11 +4354,11 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -4572,9 +4367,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" dependencies = [ "proc-macro2", "quote", diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix index f21241e10b..ea6fb5d4e3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -21,23 +21,23 @@ stdenv.mkDerivation rec { pname = "flare"; - version = "0.13.0"; + version = "0.14.3"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = "flare"; rev = version; - hash = "sha256-WfW2xUlF1vCaYFVP6ds06+niULKZgMMxgAOm66LK2xQ="; + hash = "sha256-e/XkY5xULYnx5zBB3pxjBSocufK85xzb2t+kVXxhFNg="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "curve25519-dalek-4.0.0" = "sha256-KUXvYXeVvJEQ/+dydKzXWCZmA2bFa2IosDzaBL6/Si0="; - "libsignal-protocol-0.1.0" = "sha256-FCrJO7porlY5FrwZ2c67UPd4tgN7cH2/3DTwfPjihwM="; - "libsignal-service-0.1.0" = "sha256-XkCb83IvlnmvhHD8Vi9D5fNuBOoR9yX0/Vlb+YhrDz8="; - "presage-0.6.0-dev" = "sha256-zot92dlGtB7B423BU74oqpPzQKvLm2Dw9P8lCWkbsoE="; + "curve25519-dalek-4.1.1" = "sha256-p9Vx0lAaYILypsI4/RVsHZLOqZKaa4Wvf7DanLA38pc="; + "libsignal-core-0.1.0" = "sha256-p4YzrtJaQhuMBTtquvS1m9llszfyTeDfl7+IXzRUFSE="; + "libsignal-service-0.1.0" = "sha256-rXa/7AmCt03WvMPqrOxPkQlNrMvJQuodEkBuqYo9sFQ="; + "presage-0.6.1" = "sha256-4rH/Yt//0EpF8KQQXkurX5m9tMrFRI2MaJ+IzddVUUU="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 99562f4054..d2a43e989b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -18,13 +18,13 @@ let in flutter.buildFlutterApplication (rec { pname = "fluffychat-${targetFlutterPlatform}"; - version = "1.18.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "krille-chan"; repo = "fluffychat"; rev = "refs/tags/v${version}"; - hash = "sha256-xm3+zBqg/mW2XxqFDXxeC+gIc+TgeciJmQf8w1kcW5Y="; + hash = "sha256-eHwzvWKWJ9Q2OgCvgZTt+Bcph2w2pTqyOtwXFbZ4LEg="; }; inherit pubspecLock; @@ -32,7 +32,6 @@ flutter.buildFlutterApplication (rec { gitHashes = { flutter_shortcuts = "sha256-4nptZ7/tM2W/zylk3rfQzxXgQ6AipFH36gcIb/0RbHo="; keyboard_shortcuts = "sha256-U74kRujftHPvpMOIqVT0Ph+wi1ocnxNxIFA1krft4Os="; - wakelock_windows = "sha256-Dfwe3dSScD/6kvkP67notcbb+EgTQ3kEYcH7wpra2dI="; }; inherit targetFlutterPlatform; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json index b6df5968cd..2c11ebced2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json @@ -1,24 +1,44 @@ { "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "67.0.0" + }, "adaptive_dialog": { "dependency": "direct main", "description": { "name": "adaptive_dialog", - "sha256": "30dc6deee139cde31e5d10a1d05e1a2a1bb6d592cf0eea27b978884b1ff03405", + "sha256": "817ff9b4bb441434d1fcb39a8d4492e50be456cd3507e4f19c5c7455c9e279e0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.1" }, "animations": { "dependency": "direct main", "description": { "name": "animations", - "sha256": "ef57563eed3620bd5d75ad96189846aca1e033c0c45fc9a7d26e80ab02b88a70", + "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.8" + "version": "2.0.11" }, "ansicolor": { "dependency": "transitive", @@ -44,21 +64,21 @@ "dependency": "direct main", "description": { "name": "archive", - "sha256": "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b", + "sha256": "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.9" + "version": "3.4.10" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.5.0" }, "async": { "dependency": "direct main", @@ -74,11 +94,11 @@ "dependency": "transitive", "description": { "name": "audio_session", - "sha256": "6fdf255ed3af86535c96452c33ecff1245990bb25a605bfb1958661ccc3d467f", + "sha256": "a49af9981eec5d7cd73b37bacb6ee73f8143a6a9f9bd5b6021e6c346b9b6cf4e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.18" + "version": "0.1.19" }, "badges": { "dependency": "direct main", @@ -90,6 +110,16 @@ "source": "hosted", "version": "3.1.2" }, + "barbecue": { + "dependency": "transitive", + "description": { + "name": "barbecue", + "sha256": "e3a0afaf9005e466887d6c87411a2ddd8d72fc46db3caabf278ee600f1e2f92c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, "base58check": { "dependency": "transitive", "description": { @@ -184,21 +214,21 @@ "dependency": "direct main", "description": { "name": "chewie", - "sha256": "ccfce3350ae9fd419cd336cdf3380f77a08e45171e1e3cb3d499d204de5e7ea8", + "sha256": "e53da939709efb9aad0f3d72a69a8d05f889168b7a138af60ce78bab5c94b135", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.7.1" + "version": "1.8.1" }, "cli_util": { "dependency": "transitive", "description": { "name": "cli_util", - "sha256": "b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.0" + "version": "0.4.1" }, "clock": { "dependency": "transitive", @@ -220,6 +250,16 @@ "source": "hosted", "version": "1.18.0" }, + "colorize": { + "dependency": "transitive", + "description": { + "name": "colorize", + "sha256": "584746cd6ba1cba0633b6720f494fe6f9601c4170f0666c1579d2aa2a61071ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, "console": { "dependency": "transitive", "description": { @@ -240,15 +280,25 @@ "source": "hosted", "version": "3.1.1" }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.7.2" + }, "cross_file": { "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5", + "sha256": "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.3+7" + "version": "0.3.4+1" }, "crypto": { "dependency": "transitive", @@ -274,21 +324,21 @@ "dependency": "direct main", "description": { "name": "cupertino_icons", - "sha256": "d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.6" + "version": "1.0.8" }, "dart_webrtc": { "dependency": "transitive", "description": { "name": "dart_webrtc", - "sha256": "5897a3bdd6c7fded07e80e250260ca4c9cd61f9080911aa308b516e1206745a9", + "sha256": "b3a4f109c551a10170ece8fc79b5ca1b98223f24bcebc0f971d7fe35daad7a3b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.4.4" }, "dbus": { "dependency": "transitive", @@ -334,11 +384,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "0042cb3b2a76413ea5f8a2b40cec2a33e01d0c937e91f0f7c211fde4f7739ba6", + "sha256": "eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.1.1" + "version": "10.1.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -354,21 +404,21 @@ "dependency": "direct main", "description": { "name": "dynamic_color", - "sha256": "8b8bd1d798bd393e11eddeaa8ae95b12ff028bf7d5998fc5d003488cd5f4ce2f", + "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.6.8" + "version": "1.7.0" }, "emoji_picker_flutter": { "dependency": "direct main", "description": { "name": "emoji_picker_flutter", - "sha256": "8506341d62efd116d6fb1481450bffdbac659d3d90d46d9cc610bfae5f33cc54", + "sha256": "839200a2bd1af9a65d71133a5a246dbf5b24f7e4f6f4c5390130c2e0ed5f85af", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.6.4" + "version": "2.2.0" }, "emoji_proposal": { "dependency": "direct main", @@ -424,11 +474,11 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878", + "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.2" }, "file": { "dependency": "transitive", @@ -444,11 +494,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "4e42aacde3b993c5947467ab640882c56947d9d27342a5b6f2895b23956954a6", + "sha256": "45c70b43df893027e441a6fa0aacc8f484fb9f9c60c746dc8f1dc4f774cf55cd", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.1" + "version": "8.0.2" }, "file_selector_linux": { "dependency": "transitive", @@ -474,11 +524,11 @@ "dependency": "transitive", "description": { "name": "file_selector_platform_interface", - "sha256": "0aa47a725c346825a2bd396343ce63ac00bda6eff2fbc43eabe99737dede8262", + "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.6.2" }, "file_selector_windows": { "dependency": "transitive", @@ -490,6 +540,16 @@ "source": "hosted", "version": "0.9.3+1" }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, "flutter": { "dependency": "direct main", "description": "flutter", @@ -506,25 +566,15 @@ "source": "hosted", "version": "1.5.0" }, - "flutter_blurhash": { - "dependency": "direct main", - "description": { - "name": "flutter_blurhash", - "sha256": "5e67678e479ac639069d7af1e133f4a4702311491188ff3e0227486430db0c06", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.8.2" - }, "flutter_cache_manager": { "dependency": "direct main", "description": { "name": "flutter_cache_manager", - "sha256": "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba", + "sha256": "395d6b7831f21f3b989ebedbb785545932adb9afe2622c1ffacf7f4b53a7e544", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.1" + "version": "3.3.2" }, "flutter_driver": { "dependency": "transitive", @@ -532,25 +582,15 @@ "source": "sdk", "version": "0.0.0" }, - "flutter_file_dialog": { - "dependency": "direct main", - "description": { - "name": "flutter_file_dialog", - "sha256": "9344b8f07be6a1b6f9854b723fb0cf84a8094ba94761af1d213589d3cb087488", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, "flutter_foreground_task": { "dependency": "direct main", "description": { "name": "flutter_foreground_task", - "sha256": "e48d2d810a2d643362e64de41146ed8e95d4dd282bae6abbb32309d9f0bf5d67", + "sha256": "d40a1ddd5f275450d2e32055e7f884796c028a02ac26c751c20916576f79e132", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.2.0" }, "flutter_highlighter": { "dependency": "direct main", @@ -586,11 +626,11 @@ "dependency": "transitive", "description": { "name": "flutter_keyboard_visibility", - "sha256": "4983655c26ab5b959252ee204c2fffa4afeb4413cd030455194ec0caa3b8e7cb", + "sha256": "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.4.1" + "version": "6.0.0" }, "flutter_keyboard_visibility_linux": { "dependency": "transitive", @@ -646,11 +686,11 @@ "dependency": "transitive", "description": { "name": "flutter_layout_grid", - "sha256": "3529b7aa7ed2cb9861a0bbaa5c14d4be2beaf5a070ce0176077159f80c5de094", + "sha256": "962a7ec8c7ea46c3b10606dac9c964f9143d10daa5ca28e40f4ce14eeef85b2a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.5" + "version": "2.0.6" }, "flutter_linkify": { "dependency": "direct main", @@ -666,21 +706,21 @@ "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7", + "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "flutter_local_notifications": { "dependency": "direct main", "description": { "name": "flutter_local_notifications", - "sha256": "c18f1de98fe0bb9dd5ba91e1330d4febc8b6a7de6aae3ffe475ef423723e72f3", + "sha256": "8cdc719114ab1c86c64bb7a86d3a679674c3637edd229e3a994797d4a1504ce4", "url": "https://pub.dev" }, "source": "hosted", - "version": "16.3.2" + "version": "17.1.0" }, "flutter_local_notifications_linux": { "dependency": "transitive", @@ -696,11 +736,11 @@ "dependency": "transitive", "description": { "name": "flutter_local_notifications_platform_interface", - "sha256": "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef", + "sha256": "340abf67df238f7f0ef58f4a26d2a83e1ab74c77ab03cd2b2d5018ac64db30b7", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0+1" + "version": "7.1.0" }, "flutter_localizations": { "dependency": "direct main", @@ -712,11 +752,11 @@ "dependency": "direct main", "description": { "name": "flutter_map", - "sha256": "52c65a977daae42f9aae6748418dd1535eaf27186e9bac9bf431843082bc75a3", + "sha256": "cda8d72135b697f519287258b5294a57ce2f2a5ebf234f0e406aad4dc14c9399", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "6.1.0" }, "flutter_math_fork": { "dependency": "direct main", @@ -732,11 +772,11 @@ "dependency": "direct dev", "description": { "name": "flutter_native_splash", - "sha256": "c4d899312b36e7454bedfd0a4740275837b99e532d81c8477579d8183db1de6c", + "sha256": "edf39bcf4d74aca1eb2c1e43c3e445fd9f494013df7f0da752fefe72020eedc0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.6" + "version": "2.4.0" }, "flutter_olm": { "dependency": "direct main", @@ -762,11 +802,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da", + "sha256": "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.17" + "version": "2.0.19" }, "flutter_ringtone_player": { "dependency": "direct main", @@ -853,11 +893,11 @@ "dependency": "transitive", "description": { "name": "flutter_svg", - "sha256": "d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c", + "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.9" + "version": "2.0.10+1" }, "flutter_test": { "dependency": "direct dev", @@ -869,31 +909,31 @@ "dependency": "direct main", "description": { "name": "flutter_typeahead", - "sha256": "b9942bd5b7611a6ec3f0730c477146cffa4cd4b051077983ba67ddfc9e7ee818", + "sha256": "d64712c65db240b1057559b952398ebb6e498077baeebf9b0731dade62438a6d", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.8.0" + "version": "5.2.0" }, "flutter_web_auth_2": { "dependency": "direct main", "description": { "name": "flutter_web_auth_2", - "sha256": "ea57000909d0002824179f1e4907c074f39538e86a9e4d93a74b7c37dbaee242", + "sha256": "3ea3a0cc539ca74319f4f2f7484f62742fe5b2ff9a0fca37575426d6e6f07901", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.4" + "version": "3.1.1" }, "flutter_web_auth_2_platform_interface": { "dependency": "transitive", "description": { "name": "flutter_web_auth_2_platform_interface", - "sha256": "9124824cbd21e12680bf58190e27b77f251c897e80ec81cd557ec1fde9aecabf", + "sha256": "e8669e262005a8354389ba2971f0fc1c36188481234ff50d013aaf993f30f739", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "3.1.0" }, "flutter_web_plugins": { "dependency": "transitive", @@ -905,11 +945,21 @@ "dependency": "direct main", "description": { "name": "flutter_webrtc", - "sha256": "8522e9f347aed9f03ec591d05fc286a698c1b11a1a6d3e994e92727d24c6f352", + "sha256": "20eac28848a2dffb26cc2b2870a5164613904511a0b7e8f4825e31a2768175d2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.46" + "version": "0.10.3" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" }, "fuchsia_remote_debug_protocol": { "dependency": "transitive", @@ -981,11 +1031,11 @@ "dependency": "transitive", "description": { "name": "get_it", - "sha256": "f79870884de16d689cf9a7d15eedf31ed61d750e813c538a6efb92660fea83c3", + "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.6.4" + "version": "7.7.0" }, "glob": { "dependency": "transitive", @@ -1001,11 +1051,11 @@ "dependency": "direct main", "description": { "name": "go_router", - "sha256": "07ee2436909f749d606f53521dc1725dd738dc5196e5ff815bc254253c594075", + "sha256": "466425a64508ca00983882f523400d9169365cb9b464e2e2419f3b6545ff9c51", "url": "https://pub.dev" }, "source": "hosted", - "version": "13.1.0" + "version": "14.0.1" }, "gradient_borders": { "dependency": "transitive", @@ -1071,11 +1121,21 @@ "dependency": "direct main", "description": { "name": "http", - "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2", + "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.13.6" + "version": "1.2.1" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" }, "http_parser": { "dependency": "transitive", @@ -1088,54 +1148,54 @@ "version": "4.0.2" }, "image": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "image", - "sha256": "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271", + "sha256": "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.3" + "version": "4.1.7" }, "image_picker": { "dependency": "direct main", "description": { "name": "image_picker", - "sha256": "7d7f2768df2a8b0a3cefa5ef4f84636121987d403130e70b17ef7e2cf650ba84", + "sha256": "fe9ee64ccb8d599a5dfb0e21cc6652232c610bcf667af4e79b9eb175cc30a7a5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.1.0" }, "image_picker_android": { "dependency": "transitive", "description": { "name": "image_picker_android", - "sha256": "d6a6e78821086b0b737009b09363018309bbc6de3fd88cc5c26bc2bb44a4957f", + "sha256": "8e75431a62b7feb4fd55cb4a5c6f0ac4564460ec5dc09f9c4a0d50a5ce7c4cb9", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.8+2" + "version": "0.8.10" }, "image_picker_for_web": { "dependency": "transitive", "description": { "name": "image_picker_for_web", - "sha256": "50bc9ae6a77eea3a8b11af5eb6c661eeb858fdd2f734c2a4fd17086922347ef7", + "sha256": "5d6eb13048cd47b60dbf1a5495424dea226c5faf3950e20bf8120a58efb5b5f3", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.4" }, "image_picker_ios": { "dependency": "transitive", "description": { "name": "image_picker_ios", - "sha256": "76ec722aeea419d03aa915c2c96bf5b47214b053899088c9abb4086ceecf97a7", + "sha256": "f74064bc548b5164a033ec05638e23c91be1a249c255e0f56319dddffd759794", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.8+4" + "version": "0.8.10+1" }, "image_picker_linux": { "dependency": "transitive", @@ -1161,11 +1221,11 @@ "dependency": "transitive", "description": { "name": "image_picker_platform_interface", - "sha256": "ed9b00e63977c93b0d2d2b343685bed9c324534ba5abafbb3dfbd6a780b1b514", + "sha256": "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.1" + "version": "2.10.0" }, "image_picker_windows": { "dependency": "transitive", @@ -1237,21 +1297,21 @@ "dependency": "transitive", "description": { "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.8.1" + "version": "4.9.0" }, "just_audio": { "dependency": "direct main", "description": { "name": "just_audio", - "sha256": "b607cd1a43bac03d85c3aaee00448ff4a589ef2a77104e3d409889ff079bf823", + "sha256": "b7cb6bbf3750caa924d03f432ba401ec300fd90936b3f73a9b33d58b1e96286b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.36" + "version": "0.9.37" }, "just_audio_platform_interface": { "dependency": "transitive", @@ -1288,11 +1348,11 @@ "dependency": "direct main", "description": { "name": "latlong2", - "sha256": "08ef7282ba9f76e8495e49e2dc4d653015ac929dce5f92b375a415d30b407ea0", + "sha256": "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.2" + "version": "0.9.1" }, "leak_tracker": { "dependency": "transitive", @@ -1324,6 +1384,16 @@ "source": "hosted", "version": "2.0.1" }, + "license_checker": { + "dependency": "direct dev", + "description": { + "name": "license_checker", + "sha256": "eea27638e42bc98fd91a6a8187eb57e5617e2c3c8b313a5d51b14bec7a8685e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, "linkify": { "dependency": "direct main", "description": { @@ -1364,6 +1434,16 @@ "source": "hosted", "version": "1.0.1" }, + "logger": { + "dependency": "transitive", + "description": { + "name": "logger", + "sha256": "8c94b8c219e7e50194efc8771cd0e9f10807d8d3e219af473d89b06cc2ee4e04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, "logging": { "dependency": "transitive", "description": { @@ -1378,31 +1458,31 @@ "dependency": "transitive", "description": { "name": "macos_ui", - "sha256": "cc499122655c61728185561e9006af4b239f9526f98d7b2cbf42124e9044a0ff", + "sha256": "d351f0bada7e5b0cee8cf394299878a6c04e5cfcd784fa1d40e44299501124d8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.2" + "version": "2.0.5" }, "macos_window_utils": { "dependency": "transitive", "description": { "name": "macos_window_utils", - "sha256": "b3dfd47bbc605f0e315af684b50370a8f84932267aaa542098063fa384d593bd", + "sha256": "230be594d26f6dee92c5a1544f4242d25138a5bfb9f185b27f14de3949ef0be8", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.5.0" }, "markdown": { "dependency": "transitive", "description": { "name": "markdown", - "sha256": "acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd", + "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.1.1" + "version": "7.2.2" }, "matcher": { "dependency": "transitive", @@ -1428,21 +1508,11 @@ "dependency": "direct main", "description": { "name": "matrix", - "sha256": "84e5745dd41468a2870d119e597529e6471f3ce2f400e4b35d5bd6a036a98692", + "sha256": "36c7e13d5d7420898f2597d6f5f0611a9da8114a0fde11f41b9e54cd1140b05f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.25.7" - }, - "matrix_api_lite": { - "dependency": "transitive", - "description": { - "name": "matrix_api_lite", - "sha256": "62bdd1dffb956e956863ba21e52109157502342b749e4728f4105f0c6d73a254", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.7.2" + "version": "0.27.0" }, "meta": { "dependency": "transitive", @@ -1468,21 +1538,21 @@ "dependency": "transitive", "description": { "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "msix": { "dependency": "direct dev", "description": { "name": "msix", - "sha256": "957d04eee260e4bd15bec1fdb988dfc73718285e201cf89d97ef01ef38e66d4c", + "sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.16.6" + "version": "3.16.7" }, "native_imaging": { "dependency": "direct main", @@ -1504,6 +1574,16 @@ "source": "hosted", "version": "1.0.0" }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, "olm": { "dependency": "transitive", "description": { @@ -1528,11 +1608,11 @@ "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79", + "sha256": "cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.1" + "version": "6.0.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", @@ -1544,6 +1624,16 @@ "source": "hosted", "version": "2.0.1" }, + "pana": { + "dependency": "transitive", + "description": { + "name": "pana", + "sha256": "3fc3fe8e7a9fd4827fa4d625a423eec95d305b2bc3538a3adf7fd6c49217af97", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.21.45" + }, "pasteboard": { "dependency": "direct main", "description": { @@ -1555,7 +1645,7 @@ "version": "0.2.0" }, "path": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "path", "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", @@ -1578,31 +1668,31 @@ "dependency": "direct main", "description": { "name": "path_provider", - "sha256": "a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa", + "sha256": "c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.3" }, "path_provider_android": { "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72", + "sha256": "a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.2.4" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d", + "sha256": "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.2" }, "path_provider_linux": { "dependency": "transitive", @@ -1618,11 +1708,11 @@ "dependency": "transitive", "description": { "name": "path_provider_platform_interface", - "sha256": "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "path_provider_windows": { "dependency": "transitive", @@ -1638,71 +1728,71 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78", + "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.1.0" + "version": "11.3.1" }, "permission_handler_android": { "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6", + "sha256": "1acac6bae58144b442f11e66621c062aead9c99841093c38f5bcdcc24c1c3474", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.1" + "version": "12.0.5" }, "permission_handler_apple": { "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306", + "sha256": "e9ad66020b89ff1b63908f247c2c6f931c6e62699b756ef8b3c4569350cd8662", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.2.0" + "version": "9.4.4" }, "permission_handler_html": { "dependency": "transitive", "description": { "name": "permission_handler_html", - "sha256": "d96ff56a757b7f04fa825c469d296c5aebc55f743e87bd639fef91a466a24da8", + "sha256": "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.0+1" + "version": "0.1.1" }, "permission_handler_platform_interface": { "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1", + "sha256": "48d4fcf201a1dad93ee869ab0d4101d084f49136ec82a8a06ed9cfeacab9fd20", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.2.1" }, "permission_handler_windows": { "dependency": "transitive", "description": { "name": "permission_handler_windows", - "sha256": "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004", + "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.1" }, "petitparser": { "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.1" + "version": "6.0.2" }, "platform": { "dependency": "transitive", @@ -1728,31 +1818,61 @@ "dependency": "transitive", "description": { "name": "plugin_platform_interface", - "sha256": "f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.7" + "version": "2.1.8" }, "pointer_interceptor": { "dependency": "transitive", "description": { "name": "pointer_interceptor", - "sha256": "adf7a637f97c077041d36801b43be08559fd4322d2127b3f20bb7be1b9eebc22", + "sha256": "bd18321519718678d5fa98ad3a3359cbc7a31f018554eab80b73d08a7f0c165a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+7" + "version": "0.10.1" + }, + "pointer_interceptor_ios": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_ios", + "sha256": "2e73c39452830adc4695757130676a39412a3b7f3c34e3f752791b5384770877", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.0+2" + }, + "pointer_interceptor_platform_interface": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_platform_interface", + "sha256": "0597b0560e14354baeb23f8375cd612e8bd4841bf8306ecb71fcd0bb78552506", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.0+1" + }, + "pointer_interceptor_web": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_web", + "sha256": "a6237528b46c411d8d55cdfad8fcb3269fc4cbb26060b14bff94879165887d1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.2" }, "pointycastle": { "dependency": "transitive", "description": { "name": "pointycastle", - "sha256": "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c", + "sha256": "79fbafed02cfdbe85ef3fd06c7f4bc2cbcba0177e61b765264853d4253b21744", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.7.3" + "version": "3.9.0" }, "polylabel": { "dependency": "transitive", @@ -1764,6 +1884,26 @@ "source": "hosted", "version": "1.0.1" }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pretty_qr_code": { + "dependency": "direct main", + "description": { + "name": "pretty_qr_code", + "sha256": "cbdb4af29da1c1fa21dd76f809646c591320ab9e435d3b0eab867492d43607d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.0" + }, "process": { "dependency": "transitive", "description": { @@ -1788,11 +1928,11 @@ "dependency": "direct main", "description": { "name": "provider", - "sha256": "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096", + "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.1" + "version": "6.1.2" }, "pub_semver": { "dependency": "transitive", @@ -1844,16 +1984,6 @@ "source": "hosted", "version": "1.0.1" }, - "qr_flutter": { - "dependency": "direct main", - "description": { - "name": "qr_flutter", - "sha256": "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.0" - }, "quiver": { "dependency": "transitive", "description": { @@ -1954,6 +2084,16 @@ "source": "hosted", "version": "0.0.10" }, + "retry": { + "dependency": "transitive", + "description": { + "name": "retry", + "sha256": "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, "rxdart": { "dependency": "transitive", "description": { @@ -1964,6 +2104,16 @@ "source": "hosted", "version": "0.27.7" }, + "safe_url_check": { + "dependency": "transitive", + "description": { + "name": "safe_url_check", + "sha256": "49a3e060a7869cbafc8f4845ca1ecbbaaa53179980a32f4fdfeab1607e90f41d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, "scroll_to_index": { "dependency": "direct main", "description": { @@ -1998,51 +2148,51 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "f74fc3f1cbd99f39760182e176802f693fa0ec9625c045561cfad54681ea93dd", + "sha256": "ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.1" + "version": "9.0.0" }, "share_plus_platform_interface": { "dependency": "transitive", "description": { "name": "share_plus_platform_interface", - "sha256": "df08bc3a07d01f5ea47b45d03ffcba1fa9cd5370fb44b3f38c70e42cced0f956", + "sha256": "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.1" + "version": "4.0.0" }, "shared_preferences": { "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02", + "sha256": "d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.2.3" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06", + "sha256": "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.2.2" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7", + "sha256": "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.4" + "version": "2.3.5" }, "shared_preferences_linux": { "dependency": "transitive", @@ -2058,21 +2208,21 @@ "dependency": "transitive", "description": { "name": "shared_preferences_platform_interface", - "sha256": "d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a", + "sha256": "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.2" }, "shared_preferences_web": { "dependency": "transitive", "description": { "name": "shared_preferences_web", - "sha256": "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21", + "sha256": "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.3.0" }, "shared_preferences_windows": { "dependency": "transitive", @@ -2084,6 +2234,46 @@ "source": "hosted", "version": "2.3.2" }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, "sky_engine": { "dependency": "transitive", "description": "flutter", @@ -2100,6 +2290,26 @@ "source": "hosted", "version": "2.0.0" }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.12" + }, "source_span": { "dependency": "transitive", "description": { @@ -2110,55 +2320,65 @@ "source": "hosted", "version": "1.10.0" }, - "sqflite": { - "dependency": "direct main", + "sprintf": { + "dependency": "transitive", "description": { - "name": "sqflite", - "sha256": "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a", + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.0" + "version": "7.0.0" + }, + "sqflite": { + "dependency": "transitive", + "description": { + "name": "sqflite", + "sha256": "5ce2e1a15e822c3b4bfb5400455775e421da7098eed8adc8f26298ada7c9308c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "bb4738f15b23352822f4c42a531677e5c6f522e079461fd240ead29d8d8a54a6", + "sha256": "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0+2" + "version": "2.5.4" }, "sqflite_common_ffi": { "dependency": "direct main", "description": { "name": "sqflite_common_ffi", - "sha256": "35d2fce1e971707c227cc4775cc017d5eafe06c2654c3435ebd5c3ad6c170f5f", + "sha256": "4d6137c29e930d6e4a8ff373989dd9de7bac12e3bc87bce950f6e844e8ad3bb5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.0+4" + "version": "2.3.3" }, - "sqflite_sqlcipher": { + "sqlcipher_flutter_libs": { "dependency": "direct main", "description": { - "name": "sqflite_sqlcipher", - "sha256": "e1dfb55bf21ee5a18c43f28faa4291272a801da4ab34a6ba9973b6c0e1ed77da", + "name": "sqlcipher_flutter_libs", + "sha256": "60fe3444ff5b1b298a9ca3003c6c7f1f7ee4c90aa6035a8647f3aeaf05a073e2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "0.6.1" }, "sqlite3": { "dependency": "transitive", "description": { "name": "sqlite3", - "sha256": "db65233e6b99e99b2548932f55a987961bc06d82a31a0665451fa0b4fff4c3fb", + "sha256": "1abbeb84bf2b1a10e5e1138c913123c8aa9d83cd64e5f9a0dd847b3c83063202", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.4.2" }, "stack_trace": { "dependency": "transitive", @@ -2190,6 +2410,16 @@ "source": "hosted", "version": "1.2.0" }, + "string_validator": { + "dependency": "transitive", + "description": { + "name": "string_validator", + "sha256": "50dd8ecf91db6a732f4a851eeae81ee12406eedc62d0da72f2d91a04a2d10dd8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.0" + }, "swipe_to_action": { "dependency": "direct main", "description": { @@ -2214,11 +2444,21 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60", + "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.0+1" + }, + "tar": { + "dependency": "transitive", + "description": { + "name": "tar", + "sha256": "aca91e93ff9ff2dba4462c6eea6bc260b72f0d7010e748e3397c32190529bd6e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" }, "term_glyph": { "dependency": "transitive", @@ -2230,6 +2470,16 @@ "source": "hosted", "version": "1.2.1" }, + "test": { + "dependency": "transitive", + "description": { + "name": "test", + "sha256": "a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.24.9" + }, "test_api": { "dependency": "transitive", "description": { @@ -2240,15 +2490,25 @@ "source": "hosted", "version": "0.6.1" }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.9" + }, "timezone": { "dependency": "transitive", "description": { "name": "timezone", - "sha256": "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0", + "sha256": "a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.2" + "version": "0.9.3" }, "tint": { "dependency": "transitive", @@ -2354,11 +2614,11 @@ "dependency": "transitive", "description": { "name": "unifiedpush_android", - "sha256": "19fcdd2671c46bd074efbb80c43cedd0bcddd1fc0cfd3e2f74aec03fb0659d58", + "sha256": "610ad746294541f56d632adf9afba5d1c164c44e23ec0dd2162a41a6ff00a00e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.2.3" }, "unifiedpush_platform_interface": { "dependency": "transitive", @@ -2404,41 +2664,41 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba", + "sha256": "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.1" + "version": "6.2.6" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def", + "sha256": "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.0" + "version": "6.3.1" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3", + "sha256": "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.1" + "version": "6.2.5" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd", + "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "url_launcher_macos": { "dependency": "transitive", @@ -2454,71 +2714,71 @@ "dependency": "transitive", "description": { "name": "url_launcher_platform_interface", - "sha256": "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.3.2" }, "url_launcher_web": { "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "138bd45b3a456dcfafc46d1a146787424f8d2edfbf2809c9324361e58f851cf7", + "sha256": "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.3.1" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc", + "sha256": "ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "uuid": { "dependency": "transitive", "description": { "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "sha256": "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.7" + "version": "4.4.0" }, "vector_graphics": { "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "0f0c746dd2d6254a0057218ff980fc7f5670fd0fcf5e4db38a490d31eed4ad43", + "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.9+1" + "version": "1.1.11+1" }, "vector_graphics_codec": { "dependency": "transitive", "description": { "name": "vector_graphics_codec", - "sha256": "0edf6d630d1bfd5589114138ed8fada3234deacc37966bec033d3047c29248b7", + "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.9+1" + "version": "1.1.11+1" }, "vector_graphics_compiler": { "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "d24333727332d9bd20990f1483af4e09abdb9b1fc7c3db940b56ab5c42790c26", + "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.9+1" + "version": "1.1.11+1" }, "vector_math": { "dependency": "transitive", @@ -2530,16 +2790,6 @@ "source": "hosted", "version": "2.1.4" }, - "vibration": { - "dependency": "direct main", - "description": { - "name": "vibration", - "sha256": "63d4f6b03e38d106599da18e786d5edcd02354433a4ed478fccbbcfc347193ab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.8.3" - }, "video_compress": { "dependency": "direct main", "description": { @@ -2554,51 +2804,51 @@ "dependency": "direct main", "description": { "name": "video_player", - "sha256": "e16f0a83601a78d165dabc17e4dac50997604eb9e4cc76e10fa219046b70cef3", + "sha256": "db6a72d8f4fd155d0189845678f55ad2fd54b02c10dcafd11c068dbb631286c0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.8.1" + "version": "2.8.6" }, "video_player_android": { "dependency": "transitive", "description": { "name": "video_player_android", - "sha256": "3fe89ab07fdbce786e7eb25b58532d6eaf189ceddc091cb66cba712f8d9e8e55", + "sha256": "134e1ad410d67e18a19486ed9512c72dfc6d8ffb284d0e8f2e99e903d1ba8fa3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.10" + "version": "2.4.14" }, "video_player_avfoundation": { "dependency": "transitive", "description": { "name": "video_player_avfoundation", - "sha256": "bc923884640d6dc403050586eb40713cdb8d1d84e6886d8aca50ab04c59124c2", + "sha256": "00c49b1d68071341397cf760b982c1e26ed9232464c8506ee08378a5cca5070d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.2" + "version": "2.5.7" }, "video_player_platform_interface": { "dependency": "transitive", "description": { "name": "video_player_platform_interface", - "sha256": "be72301bf2c0150ab35a8c34d66e5a99de525f6de1e8d27c0672b836fe48f73a", + "sha256": "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.1" + "version": "6.2.2" }, "video_player_web": { "dependency": "transitive", "description": { "name": "video_player_web", - "sha256": "ab7a462b07d9ca80bed579e30fb3bce372468f1b78642e0911b10600f2c5cb5b", + "sha256": "41245cef5ef29c4585dbabcbcbe9b209e34376642c7576cabf11b4ad9289d6e4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.3.0" }, "visibility_detector": { "dependency": "transitive", @@ -2620,56 +2870,55 @@ "source": "hosted", "version": "13.0.0" }, - "wakelock_platform_interface": { - "dependency": "transitive", - "description": { - "name": "wakelock_platform_interface", - "sha256": "1f4aeb81fb592b863da83d2d0f7b8196067451e4df91046c26b54a403f9de621", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.0" - }, "wakelock_plus": { "dependency": "direct main", "description": { "name": "wakelock_plus", - "sha256": "f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d", + "sha256": "c8b7cc80f045533b40a0e6c9109905494e3cf32c0fbd5c62616998e0de44003f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.4" + "version": "1.2.4" }, "wakelock_plus_platform_interface": { "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "40fabed5da06caff0796dc638e1f07ee395fb18801fbff3255a2372db2d80385", + "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", "url": "https://pub.dev" }, "source": "hosted", "version": "1.1.0" }, - "wakelock_windows": { - "dependency": "direct overridden", - "description": { - "path": "wakelock_windows", - "ref": "main", - "resolved-ref": "f3610d6c246098fee74463de09434ed81fc2a7c8", - "url": "https://github.com/chandrabezzo/wakelock.git" - }, - "source": "git", - "version": "0.2.2" - }, "web": { "dependency": "transitive", "description": { "name": "web", - "sha256": "edc8a9573dd8c5a83a183dae1af2b6fd4131377404706ca4e5420474784906fa", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.0" + "version": "0.5.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.5" }, "webdriver": { "dependency": "transitive", @@ -2681,35 +2930,45 @@ "source": "hosted", "version": "3.0.3" }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, "webrtc_interface": { "dependency": "direct main", "description": { "name": "webrtc_interface", - "sha256": "2efbd3e4e5ebeb2914253bcc51dafd3053c4b87b43f3076c74835a9deecbae3a", + "sha256": "abec3ab7956bd5ac539cf34a42fa0c82ea26675847c0966bb85160400eea9388", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.2.0" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f", + "sha256": "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.1.0" + "version": "5.5.0" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a", + "sha256": "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.3" }, "window_to_front": { "dependency": "transitive", @@ -2735,21 +2994,21 @@ "dependency": "transitive", "description": { "name": "xdg_directories", - "sha256": "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.3" + "version": "1.0.4" }, "xml": { "dependency": "transitive", "description": { "name": "xml", - "sha256": "af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.2" + "version": "6.5.0" }, "yaml": { "dependency": "transitive", @@ -2763,7 +3022,7 @@ } }, "sdks": { - "dart": ">=3.2.0 <4.0.0", - "flutter": ">=3.16.0" + "dart": ">=3.3.0 <4.0.0", + "flutter": ">=3.19.3" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock index 8d77d6a44c..336cfeb7c0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock @@ -11,7 +11,7 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -41,21 +41,20 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "zeroize", ] [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", @@ -65,13 +64,19 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + [[package]] name = "allocator-api2" version = "0.2.16" @@ -107,10 +112,20 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.75" +name = "annotate-snippets" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" +dependencies = [ + "unicode-width", + "yansi-term", +] + +[[package]] +name = "anyhow" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "anymap2" @@ -120,16 +135,33 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" [[package]] name = "aquamarine" -version = "0.3.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" +checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" dependencies = [ "include_dir", "itertools 0.10.5", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", +] + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -155,15 +187,13 @@ checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" [[package]] name = "ashpd" -version = "0.6.7" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c018490e423efb6f032ef575f873ea57b61d44bec763cfe027b8e8852a027cf" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ "enumflags2", "futures-channel", "futures-util", - "libc", - "once_cell", "pipewire", "rand", "serde", @@ -182,32 +212,34 @@ checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" dependencies = [ - "event-listener 2.5.3", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", "futures-core", + "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", "futures-core", "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" +checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" dependencies = [ "flate2", "futures-core", @@ -218,38 +250,18 @@ dependencies = [ [[package]] name = "async-io" -version = "1.13.0" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" -dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "parking", - "polling 3.3.1", - "rustix 0.38.28", + "polling", + "rustix", "slab", "tracing", "windows-sys 0.52.0", @@ -266,12 +278,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", "pin-project-lite", ] @@ -283,30 +295,33 @@ checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock 3.3.0", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.28", - "windows-sys 0.48.0", + "event-listener 5.3.0", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -325,13 +340,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.2.2", + "async-io", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -356,24 +371,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -396,9 +411,32 @@ checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] [[package]] name = "backoff" @@ -416,9 +454,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -437,9 +475,15 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "base64ct" @@ -449,22 +493,23 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bindgen" -version = "0.66.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "annotate-snippets", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -481,21 +526,30 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde", +] [[package]] name = "bitmaps" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403" +checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" + +[[package]] +name = "bitstream-io" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", @@ -535,35 +589,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", + "fastrand", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "piper", "tracing", ] [[package]] name = "bs58" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ "tinyvec", ] [[package]] -name = "bumpalo" -version = "3.14.0" +name = "built" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -573,9 +633,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytesize" @@ -585,23 +645,22 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cairo-rs" -version = "0.18.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1" +checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cairo-sys-rs", "glib", "libc", - "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.18.2" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" dependencies = [ "glib-sys", "libc", @@ -619,10 +678,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" dependencies = [ + "jobserver", "libc", ] @@ -637,9 +697,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -663,6 +723,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chacha20" version = "0.9.1" @@ -687,17 +753,11 @@ dependencies = [ "zeroize", ] -[[package]] -name = "checked_int_cast" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" - [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -705,7 +765,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[package]] @@ -721,9 +781,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -774,9 +834,12 @@ dependencies = [ [[package]] name = "cookie-factory" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" +checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" +dependencies = [ + "futures", +] [[package]] name = "core-foundation" @@ -796,63 +859,55 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.9" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c3242926edf34aec4ac3a77108ad4854bffaa2e4ddc1824124ce59231302d5" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.16" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", ] [[package]] name = "crossbeam-utils" -version = "0.8.17" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -894,9 +949,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", @@ -918,77 +973,42 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "darling" -version = "0.14.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", -] - -[[package]] -name = "darling" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" -dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core", + "darling_macro", ] [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ - "darling_core 0.14.4", + "darling_core", "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" -dependencies = [ - "darling_core 0.20.3", - "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -1047,14 +1067,14 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "der_derive", @@ -1071,14 +1091,14 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", @@ -1097,33 +1117,33 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "darling 0.14.4", + "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] name = "derive_builder_macro" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] @@ -1146,7 +1166,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -1157,9 +1177,9 @@ checksum = "e8cf7d61e627a3b49af8f24f47e57f3788cdd7a0e4f17cd79fda5ada87f08578" [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" @@ -1188,9 +1208,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", @@ -1203,9 +1223,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "elliptic-curve" @@ -1230,18 +1250,24 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] [[package]] -name = "enumflags2" -version = "0.7.8" +name = "endi" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", "serde", @@ -1249,13 +1275,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -1282,9 +1308,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.1.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ "concurrent-queue", "parking", @@ -1293,9 +1319,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -1308,15 +1334,25 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +dependencies = [ + "event-listener 5.3.0", "pin-project-lite", ] [[package]] name = "exr" -version = "1.71.0" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", @@ -1354,14 +1390,16 @@ dependencies = [ [[package]] name = "eyeball-im-util" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191adac85d269e80f4e44c2b3e8fc2b193b2e3574a997962066b5980cab1fcc1" +checksum = "c0fea22ab33f31f2fac1a3a81b9024b461e28518f3262fecb6156943221e9960" dependencies = [ + "arrayvec", "eyeball-im", "futures-core", "imbl", "pin-project-lite", + "smallvec", ] [[package]] @@ -1385,29 +1423,20 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -1424,9 +1453,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" [[package]] name = "field-offset" @@ -1434,15 +1463,15 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset", "rustc_version", ] [[package]] name = "flagset" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779" +checksum = "cdeb3aa5e95cf9aabc17f060cfa0ced7b83f042390760ca53bf09df9968acaa1" [[package]] name = "flate2" @@ -1495,7 +1524,7 @@ dependencies = [ [[package]] name = "fractal" -version = "6.0.0" +version = "7.0.0" dependencies = [ "ashpd", "djb_hash", @@ -1514,8 +1543,8 @@ dependencies = [ "html-escape", "html2pango", "html5gum", - "image 0.24.7", - "indexmap 2.1.0", + "image", + "indexmap 2.2.6", "libadwaita", "libshumate", "matrix-sdk", @@ -1524,7 +1553,7 @@ dependencies = [ "mime_guess", "once_cell", "oo7", - "pulldown-cmark", + "pulldown-cmark 0.10.2", "qrcode", "rand", "regex", @@ -1554,25 +1583,41 @@ dependencies = [ ] [[package]] -name = "futures-channel" -version = "0.3.29" +name = "futures" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", + "futures-sink", ] [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1581,63 +1626,51 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 1.9.0", + "fastrand", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" -dependencies = [ - "futures-core", - "pin-project-lite", ] [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1690,22 +1723,21 @@ checksum = "af6a86e750338603ea2c14b1c0bfe58cd61f87ca67a0021d9334996024608e12" [[package]] name = "gdk-pixbuf" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c" +checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" dependencies = [ "gdk-pixbuf-sys", "gio", "glib", "libc", - "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" dependencies = [ "gio-sys", "glib-sys", @@ -1716,9 +1748,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" +checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1731,9 +1763,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" +checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1748,25 +1780,23 @@ dependencies = [ [[package]] name = "gdk4-win32" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe66650c41f64e41ada9f85c4bdb96e5549c669e594892240dfb147a63256057" +checksum = "ab6181b6e5c91ee292dca0032b00d48dee8e61358253742c9752537a88486b3f" dependencies = [ "gdk4", "gdk4-win32-sys", "gio", "glib", "libc", - "system-deps", ] [[package]] name = "gdk4-win32-sys" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b5c187546cd3ad9f1787b46c66272d8fcdf8197bfe4f6e2647fe910c39e396d" +checksum = "efa8530d6619cf43f007f3efd993a356e1ca4e643c4d0bd2a99832a08af2e402" dependencies = [ - "gdk-pixbuf-sys", "gdk4-sys", "glib-sys", "libc", @@ -1786,9 +1816,9 @@ dependencies = [ [[package]] name = "geo-uri" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6b8812a079cb4a3b5b366c2d05db8e231e2f231c443acb3532daad996d89f71" +checksum = "ba35eb77ce72d7eefe4058c11cc816c6f9eb4f62ecc11c154b1d77d4d75399ce" dependencies = [ "derive_builder", "thiserror", @@ -1805,9 +1835,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", @@ -1838,9 +1868,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -1854,9 +1884,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.18.4" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" +checksum = "3f91a0518c2ec539f099d3f945ab2d6a83ec372a9ef40a21906343b191182845" dependencies = [ "futures-channel", "futures-core", @@ -1865,7 +1895,6 @@ dependencies = [ "gio-sys", "glib", "libc", - "once_cell", "pin-project-lite", "smallvec", "thiserror", @@ -1873,24 +1902,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.18.4" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951bbd7fdc5c044ede9f05170f05a3ae9479239c3afdfe2d22d537a3add15c4e" +checksum = "ae1407b2ce171e654720be10d57d4054d3ff2f10a13d5b37e6819b41439832f7" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", @@ -1902,30 +1931,28 @@ dependencies = [ "gobject-sys", "libc", "memchr", - "once_cell", "smallvec", "thiserror", ] [[package]] name = "glib-macros" -version = "0.18.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" +checksum = "d8bba315e8ce8aa59631545358450f4962557e89b5f7db7442e7153b47037f71" dependencies = [ - "heck", - "proc-macro-crate 2.0.1", - "proc-macro-error", + "heck 0.5.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "glib-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" dependencies = [ "libc", "system-deps", @@ -1964,9 +1991,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" dependencies = [ "glib-sys", "libc", @@ -1975,9 +2002,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" +checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" dependencies = [ "glib", "graphene-sys", @@ -1986,9 +2013,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" +checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" dependencies = [ "glib-sys", "libc", @@ -2009,9 +2036,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" +checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" dependencies = [ "cairo-rs", "gdk4", @@ -2024,9 +2051,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" +checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -2040,10 +2067,11 @@ dependencies = [ [[package]] name = "gst-plugin-gtk4" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33970273495544e54d5f486d761b09d402f0cf8760990e1ea508bd5141f8ebeb" +checksum = "83c12132d3619f85db54f6034b4e3872577886657b07e055c521baeb2d5f6733" dependencies = [ + "async-channel", "gdk4-win32", "gst-plugin-version-helper", "gstreamer", @@ -2051,24 +2079,25 @@ dependencies = [ "gstreamer-gl", "gstreamer-video", "gtk4", - "windows-sys 0.48.0", + "once_cell", + "windows-sys 0.52.0", ] [[package]] name = "gst-plugin-version-helper" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334c37a15ca23861ad8159c8ff6e20f011aa2000defc5c9159096a28842f811b" +checksum = "4e5e874f1660252fd2ec81c602066df3633b3a6fcbe2b196f7f93c27cf069b2a" dependencies = [ "chrono", - "toml_edit 0.20.2", + "toml_edit 0.22.9", ] [[package]] name = "gstreamer" -version = "0.21.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed97f98d186e63e49079b26af1a1b73e70ab7a2f450eb46a136f2bffc2bf12d5" +checksum = "fc6f2d7dcde4b42b5297d25e9f51914cacfa148c99ba6ddabebf006fb2b18c20" dependencies = [ "cfg-if", "futures-channel", @@ -2076,24 +2105,24 @@ dependencies = [ "futures-util", "glib", "gstreamer-sys", - "itertools 0.11.0", + "itertools 0.12.1", "libc", "muldiv", "num-integer", - "num-rational 0.4.1", + "num-rational", + "once_cell", "option-operations", "paste", "pin-project-lite", - "pretty-hex", "smallvec", "thiserror", ] [[package]] name = "gstreamer-audio" -version = "0.21.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d1678eacb7677c1ffdcf220ada416b5fb68e87c33b77319f14bba169fbe3fc" +checksum = "73a5de9ced05f9650168a74c7a4afeddbf3e63af595a7d56a700765be3b4869c" dependencies = [ "cfg-if", "glib", @@ -2101,13 +2130,15 @@ dependencies = [ "gstreamer-audio-sys", "gstreamer-base", "libc", + "once_cell", + "smallvec", ] [[package]] name = "gstreamer-audio-sys" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bd94ae8b177377855b38c3d809c686526786cdb771e6d68510509634b955d1" +checksum = "34d92a1e2a915874f70f0a33c3ea4589bc6b66a138b6ec8bb6acedf49bdec2c3" dependencies = [ "glib-sys", "gobject-sys", @@ -2119,9 +2150,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb150b6904a49052237fede7cc2e6479df6ced5043d95e6af8134bc141a3167f" +checksum = "514c71195b53c7eced4842b66ca9149833e41cf6a1d949e45e2ca4a4fa929850" dependencies = [ "atomic_refcell", "cfg-if", @@ -2133,9 +2164,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ca701f9078fe115b29b24c80910b577f9cb5b039182f050dbadf5933594b64" +checksum = "286591e0f85bbda1adf9bab6f21d015acd9ca0a4d4acb61da65e3d0487e23c4e" dependencies = [ "glib-sys", "gobject-sys", @@ -2146,9 +2177,9 @@ dependencies = [ [[package]] name = "gstreamer-gl" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ecfb91128263c160448a915a15e430cfdc69317b1b087316222e0693bb51b90" +checksum = "7d21c0c5fbf74018a0254b3ab77bca0a5b2c0f002bcfd910c09113ae90a95d98" dependencies = [ "glib", "gstreamer", @@ -2156,13 +2187,14 @@ dependencies = [ "gstreamer-gl-sys", "gstreamer-video", "libc", + "once_cell", ] [[package]] name = "gstreamer-gl-sys" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580971b3c99a667c9739812d499e6c5cadbb92873f984cd0d1d0b4e7346f1cd" +checksum = "61d1e3b9b02abc23835e9d770f2bd705b67a50406ea37e963b4526a77c6a7cd8" dependencies = [ "glib-sys", "gobject-sys", @@ -2175,9 +2207,9 @@ dependencies = [ [[package]] name = "gstreamer-pbutils" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953055f80677b68b2f46f23859d9241df6b3dcf3ca8240db5f9ab50716255237" +checksum = "f173b14cdf3d10bc57d136797946fe2091c322015d879919765c317a0ea5edb3" dependencies = [ "glib", "gstreamer", @@ -2190,9 +2222,9 @@ dependencies = [ [[package]] name = "gstreamer-pbutils-sys" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6faae6e3454bc8ca5986d7ef6477fc44b809bfc952a8680eaedb4f2e001f9d69" +checksum = "6b3afcb1df3d217b2a6b00aa7a391a779764b5be6ccb7dcf35b5690279c61c5c" dependencies = [ "glib-sys", "gobject-sys", @@ -2205,9 +2237,9 @@ dependencies = [ [[package]] name = "gstreamer-play" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2efa4c3f92fa5d5e51e95c83f3b847c9ad16e3498a65beaf721d324187f04a" +checksum = "04cd4315d97f8f38a6a6fdaad27d51cc67fd132785816091ad9985e197d2c052" dependencies = [ "glib", "gstreamer", @@ -2218,9 +2250,9 @@ dependencies = [ [[package]] name = "gstreamer-play-sys" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cc41f9524b98e49da474696abd8fc026b0accfea7fd754e5be09107cb96038f" +checksum = "19def7b12d3a53c520ad661b8f4501ae04158627e4a9fc49cc30c4ea04522cbf" dependencies = [ "glib-sys", "gobject-sys", @@ -2232,9 +2264,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "564cda782b3e6eed1b81cb4798a06794db56440fb05b422505be689f34ce3bc4" +checksum = "d5ddf526b3bf90ea627224c804f00b8bcb0452e3b447978b4d5092f8e8ff5918" dependencies = [ "glib-sys", "gobject-sys", @@ -2244,9 +2276,9 @@ dependencies = [ [[package]] name = "gstreamer-video" -version = "0.21.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85b2a4d1d3b7a98ae03806c3ed5c2db89d6b37a5f138780b48de015d68715e5" +checksum = "5fc0a96481ecfcdd120d5057bb7ab5a6f6cd392cc34ba1e8b86cac3ba082f788" dependencies = [ "cfg-if", "futures-channel", @@ -2255,14 +2287,15 @@ dependencies = [ "gstreamer-base", "gstreamer-video-sys", "libc", + "once_cell", "thiserror", ] [[package]] name = "gstreamer-video-sys" -version = "0.21.2" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302318d98e6b054501e485b6bb4ee20225823218f4a8660c182f115a33b16ee" +checksum = "c1ea7996ba44fbbf563aeeda96e24259efc9f06b407854d837ee58e260d7ba78" dependencies = [ "glib-sys", "gobject-sys", @@ -2274,9 +2307,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" +checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" dependencies = [ "cairo-rs", "field-offset", @@ -2295,12 +2328,12 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" +checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" dependencies = [ "anyhow", - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro-error", "proc-macro2", "quote", @@ -2309,9 +2342,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" +checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -2328,9 +2361,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2338,7 +2371,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -2347,10 +2380,11 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ + "cfg-if", "crunchy", ] @@ -2360,15 +2394,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.14.3" @@ -2388,23 +2413,13 @@ dependencies = [ "hashbrown 0.14.3", ] -[[package]] -name = "hdrhistogram" -version = "7.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" -dependencies = [ - "byteorder", - "num-traits", -] - [[package]] name = "headers" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "headers-core", "http", @@ -2429,10 +2444,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.3" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2508,9 +2529,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -2548,9 +2569,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -2563,28 +2584,13 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http", - "hyper", - "rustls", - "rustls-native-certs", - "tokio", - "tokio-rustls", -] - [[package]] name = "hyper-tls" version = "0.5.0" @@ -2600,9 +2606,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2639,35 +2645,35 @@ dependencies = [ [[package]] name = "image" -version = "0.23.14" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-iter", - "num-rational 0.3.2", - "num-traits", -] - -[[package]] -name = "image" -version = "0.24.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", "color_quant", "exr", "gif", - "jpeg-decoder", - "num-rational 0.4.1", + "image-webp", "num-traits", "png", "qoi", + "ravif", + "rayon", + "rgb", "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +dependencies = [ + "byteorder", + "thiserror", ] [[package]] @@ -2686,13 +2692,19 @@ dependencies = [ [[package]] name = "imbl-sized-chunks" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6957ea0b2541c5ca561d3ef4538044af79f8a05a1eb3a3b148936aaceaa1076" +checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63" dependencies = [ "bitmaps", ] +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + [[package]] name = "include_dir" version = "0.7.3" @@ -2742,9 +2754,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -2774,14 +2786,14 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "interpolate_name" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -2790,16 +2802,6 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" -[[package]] -name = "iri-string" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21859b667d66a4c1dacd9df0863b3efb65785474255face87f5bca39dd8407c0" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "itertools" version = "0.10.5" @@ -2811,27 +2813,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jetscii" @@ -2840,19 +2833,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" [[package]] -name = "jpeg-decoder" -version = "0.3.0" +name = "jobserver" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ - "rayon", + "libc", ] [[package]] -name = "js-sys" -version = "0.3.66" +name = "jpeg-decoder" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2877,9 +2876,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", @@ -2941,9 +2940,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" +checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" dependencies = [ "gdk-pixbuf", "gdk4", @@ -2957,9 +2956,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" +checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" dependencies = [ "gdk4-sys", "gio-sys", @@ -2973,18 +2972,29 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.4", ] [[package]] @@ -2995,9 +3005,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libshumate" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b743d27ff75bbd10e97729e771fa706f0e2e80503f8b737c7ebd39abd6ed1b2d" +checksum = "bd77c1202aaccef5460f4ca95b3b3c117f85986c942127e4e518c47058a6eaf6" dependencies = [ "gdk-pixbuf", "gdk4", @@ -3010,9 +3020,9 @@ dependencies = [ [[package]] name = "libshumate-sys" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d267a8d525823ad53986bde3b56ed6ef8c319227b33fc71028daed41ea5103" +checksum = "ef5765221e416ebe7b5e9c5bd7e8dd09ca9e920b012474ca8f3da18f8e13c4a5" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -3026,26 +3036,26 @@ dependencies = [ [[package]] name = "libspa" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434617020ddca18b86067912970c55410ca654cdafd775480322f50b857a8c4" +checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cc", "convert_case", "cookie-factory", "libc", "libspa-sys", - "nix", + "nix 0.27.1", "nom", "system-deps", ] [[package]] name = "libspa-sys" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e70ca3f3e70f858ef363046d06178c427b4e0b63d210c95fd87d752679d345" +checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" dependencies = [ "bindgen", "cc", @@ -3073,15 +3083,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "locale_config" @@ -3108,17 +3112,26 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] [[package]] name = "lru" -version = "0.9.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.3", ] [[package]] @@ -3147,7 +3160,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -3158,7 +3171,7 @@ checksum = "13198c120864097a565ccb3ff947672d969932b7975ebd4085732c9f09435e55" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -3171,7 +3184,7 @@ dependencies = [ "macroific_core", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -3217,9 +3230,8 @@ dependencies = [ [[package]] name = "mas-http" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6948721a2bc05e73f8029515e05b0c7deabb6fcec51ee7f033ecbfe60b7818" +version = "0.8.0" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" dependencies = [ "bytes", "futures-util", @@ -3227,8 +3239,6 @@ dependencies = [ "http", "http-body", "hyper", - "mas-tower", - "once_cell", "opentelemetry", "serde", "serde_json", @@ -3242,9 +3252,8 @@ dependencies = [ [[package]] name = "mas-iana" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c48820df73240471efb9fe90f90461b0029e4f0b7915e2df23633523635dfa3" +version = "0.8.0" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" dependencies = [ "schemars", "serde", @@ -3252,9 +3261,8 @@ dependencies = [ [[package]] name = "mas-jose" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39a251dfb34fb81d7259e91b368ee3551013406149333484ae30bd7da8c2c74" +version = "0.8.0" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" dependencies = [ "base64ct", "chrono", @@ -3281,40 +3289,10 @@ dependencies = [ "url", ] -[[package]] -name = "mas-keystore" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75c2a138f5805d21cf62c3947e23743349cb1303e8e3374aad14a5d571d7912" -dependencies = [ - "aead", - "base64ct", - "chacha20poly1305", - "const-oid", - "der", - "ecdsa", - "elliptic-curve", - "generic-array", - "k256", - "mas-iana", - "mas-jose", - "p256", - "p384", - "pem-rfc7468", - "pkcs1", - "pkcs8", - "rand", - "rsa", - "sec1", - "spki", - "thiserror", -] - [[package]] name = "mas-oidc-client" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3138f9b4240f515c740ec61e27b436f1fd5a24aabb66b51d93346c7d46e2e571" +version = "0.8.0" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" dependencies = [ "base64ct", "bytes", @@ -3323,48 +3301,23 @@ dependencies = [ "futures-util", "headers", "http", - "http-body", - "hyper", - "hyper-rustls", "language-tags", "mas-http", "mas-iana", "mas-jose", - "mas-keystore", "mime", "oauth2-types", - "once_cell", "rand", - "rustls", "serde", "serde_json", "serde_urlencoded", "serde_with", "thiserror", - "tokio", "tower", - "tower-http", "tracing", "url", ] -[[package]] -name = "mas-tower" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6beeba7843e755539b582e6240293db1e6bd428e22bc1a6ef4220b1fd2fc53d" -dependencies = [ - "http", - "opentelemetry", - "opentelemetry-http", - "opentelemetry-semantic-conventions", - "pin-project-lite", - "tokio", - "tower", - "tracing", - "tracing-opentelemetry", -] - [[package]] name = "matchers" version = "0.1.0" @@ -3390,17 +3343,17 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93779aa78d39c2fe34746287b10a866192cf8af1b81767fff76bd64099acc0f5" dependencies = [ - "proc-macro-crate 2.0.1", + "proc-macro-crate 2.0.0", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "matrix-sdk" -version = "0.6.2" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.1" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "anymap2", "aquamarine", @@ -3413,7 +3366,7 @@ dependencies = [ "bytesize", "cfg-vis", "chrono", - "event-listener 4.0.0", + "event-listener 4.0.3", "eyeball", "eyeball-im", "eyeball-im-util", @@ -3422,9 +3375,10 @@ dependencies = [ "gloo-timers", "http", "hyper", - "image 0.24.7", + "image", "imbl", - "indexmap 2.1.0", + "indexmap 2.2.6", + "js_int", "language-tags", "mas-oidc-client", "matrix-sdk-base", @@ -3454,13 +3408,14 @@ dependencies = [ [[package]] name = "matrix-sdk-base" -version = "0.6.1" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "as_variant", "async-trait", - "bitflags 2.4.1", + "bitflags 2.5.0", "eyeball", + "eyeball-im", "futures-util", "matrix-sdk-common", "matrix-sdk-crypto", @@ -3476,8 +3431,8 @@ dependencies = [ [[package]] name = "matrix-sdk-common" -version = "0.6.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "async-trait", "futures-core", @@ -3498,8 +3453,8 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" -version = "0.6.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "aes", "as_variant", @@ -3514,7 +3469,8 @@ dependencies = [ "futures-util", "hkdf", "hmac", - "itertools 0.12.0", + "itertools 0.12.1", + "js_option", "matrix-sdk-common", "matrix-sdk-qrcode", "pbkdf2", @@ -3526,6 +3482,7 @@ dependencies = [ "sha2", "subtle", "thiserror", + "time", "tokio", "tokio-stream", "tracing", @@ -3536,17 +3493,16 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" -version = "0.2.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "anyhow", "async-trait", - "base64", + "base64 0.21.7", "getrandom", "gloo-utils", "indexed_db_futures", "js-sys", - "matrix-sdk-base", "matrix-sdk-crypto", "matrix-sdk-store-encryption", "ruma", @@ -3562,8 +3518,8 @@ dependencies = [ [[package]] name = "matrix-sdk-qrcode" -version = "0.4.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "byteorder", "qrcode", @@ -3574,12 +3530,12 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" -version = "0.1.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "async-trait", "deadpool-sqlite", - "itertools 0.12.0", + "itertools 0.12.1", "matrix-sdk-base", "matrix-sdk-crypto", "matrix-sdk-store-encryption", @@ -3596,13 +3552,13 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" -version = "0.2.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ + "base64 0.21.7", "blake3", "chacha20poly1305", "displaydoc", - "getrandom", "hmac", "pbkdf2", "rand", @@ -3616,8 +3572,8 @@ dependencies = [ [[package]] name = "matrix-sdk-ui" -version = "0.6.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19526cea6bce133fc48904838956846aeb966dc6#19526cea6bce133fc48904838956846aeb966dc6" +version = "0.7.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" dependencies = [ "as_variant", "async-once-cell", @@ -3633,8 +3589,8 @@ dependencies = [ "futures-util", "fuzzy-matcher", "imbl", - "indexmap 2.1.0", - "itertools 0.12.0", + "indexmap 2.2.6", + "itertools 0.12.1", "matrix-sdk", "matrix-sdk-base", "mime", @@ -3651,25 +3607,26 @@ dependencies = [ ] [[package]] -name = "memchr" -version = "2.6.4" +name = "maybe-rayon" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ - "autocfg", + "cfg-if", + "rayon", ] [[package]] -name = "memoffset" -version = "0.9.0" +name = "memchr" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -3704,9 +3661,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", @@ -3714,9 +3671,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -3749,21 +3706,32 @@ dependencies = [ [[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 = "nix" -version = "0.26.4" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg-if", "libc", - "memoffset 0.7.1", - "pin-utils", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset", ] [[package]] @@ -3776,6 +3744,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -3796,7 +3770,7 @@ dependencies = [ "num-complex", "num-integer", "num-iter", - "num-rational 0.4.1", + "num-rational", "num-traits", ] @@ -3831,39 +3805,44 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -3884,9 +3863,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -3904,9 +3883,8 @@ dependencies = [ [[package]] name = "oauth2-types" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0c3fa3366856696f31b0686570dc4a511b499e648a03e433ad8b940ed2f122" +version = "0.8.0" +source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" dependencies = [ "chrono", "data-encoding", @@ -3954,9 +3932,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -3969,44 +3947,36 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oo7" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "220729ba847d98e1a9902c05e41dae79ce4a0b913dad68bc540dd3120a8c2b6b" +checksum = "37558cac1af63a81fd2ff7f3469c02a4da06b163c5671791553b8dac10f07c82" dependencies = [ - "aes", - "byteorder", - "cbc", - "cipher", - "digest", "futures-util", - "hkdf", - "hmac", "num", "num-bigint-dig", - "once_cell", - "pbkdf2", + "openssl", "rand", "serde", - "sha2", "tokio", "tracing", "zbus", "zeroize", + "zvariant", ] [[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" -version = "0.10.61" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -4023,7 +3993,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -4034,9 +4004,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.97" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -4046,13 +4016,12 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" +checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" dependencies = [ "futures-core", "futures-sink", - "indexmap 2.1.0", "js-sys", "once_cell", "pin-project-lite", @@ -4060,32 +4029,11 @@ dependencies = [ "urlencoding", ] -[[package]] -name = "opentelemetry-http" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" -dependencies = [ - "async-trait", - "bytes", - "http", - "opentelemetry", -] - -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" -dependencies = [ - "opentelemetry", -] - [[package]] name = "opentelemetry_sdk" -version = "0.21.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968ba3f2ca03e90e5187f5e4f46c791ef7f2c163ae87789c8ce5f5ca3b7b7de5" +checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" dependencies = [ "async-trait", "crossbeam-channel", @@ -4160,22 +4108,21 @@ dependencies = [ [[package]] name = "pango" -version = "0.18.3" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" dependencies = [ "gio", "glib", "libc", - "once_cell", "pango-sys", ] [[package]] name = "pango-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" dependencies = [ "glib-sys", "gobject-sys", @@ -4214,28 +4161,27 @@ dependencies = [ [[package]] name = "parse-display" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6509d08722b53e8dafe97f2027b22ccbe3a5db83cb352931e9716b0aa44bc5c" +checksum = "06af5f9333eb47bd9ba8462d612e37a8328a5cb80b13f0af4de4c3b89f52dee5" dependencies = [ - "once_cell", "parse-display-derive", "regex", + "regex-syntax 0.8.3", ] [[package]] name = "parse-display-derive" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68517892c8daf78da08c0db777fcc17e07f2f63ef70041718f8a7630ad84f341" +checksum = "dc9252f259500ee570c75adcc4e317fa6f57a1e47747d622e0bf838002a7b790" dependencies = [ - "once_cell", "proc-macro2", "quote", "regex", - "regex-syntax 0.7.5", + "regex-syntax 0.8.3", "structmeta", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -4254,12 +4200,6 @@ dependencies = [ "hmac", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -4334,7 +4274,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -4357,29 +4297,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4394,22 +4334,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] [[package]] name = "pipewire" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d009c8dd65e890b515a71950f7e4c801523b8894ff33863a40830bf762e9e9" +checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" dependencies = [ "anyhow", - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", "libspa", "libspa-sys", - "nix", + "nix 0.27.1", "once_cell", "pipewire-sys", "thiserror", @@ -4417,9 +4357,9 @@ dependencies = [ [[package]] name = "pipewire-sys" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "890c084e7b737246cb4799c86b71a0e4da536031ff7473dd639eba9f95039f64" +checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" dependencies = [ "bindgen", "libspa-sys", @@ -4437,21 +4377,6 @@ dependencies = [ "spki", ] -[[package]] -name = "pkcs5" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6" -dependencies = [ - "aes", - "cbc", - "der", - "pbkdf2", - "scrypt", - "sha2", - "spki", -] - [[package]] name = "pkcs7" version = "0.4.1" @@ -4470,28 +4395,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der", - "pkcs5", - "rand_core", "spki", ] [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "png" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -4502,30 +4425,15 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi", "pin-project-lite", - "rustix 0.38.28", + "rustix", "tracing", "windows-sys 0.52.0", ] @@ -4559,12 +4467,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "pretty-hex" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" - [[package]] name = "primeorder" version = "0.13.6" @@ -4586,12 +4488,20 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.20.7", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", ] [[package]] @@ -4620,18 +4530,37 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] -name = "prost" -version = "0.12.3" +name = "profiling" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.58", +] + +[[package]] +name = "prost" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" dependencies = [ "bytes", "prost-derive", @@ -4639,29 +4568,47 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "pulldown-cmark" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 1.3.2", - "getopts", + "bitflags 2.5.0", "memchr", "unicase", ] +[[package]] +name = "pulldown-cmark" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0530d13d87d1f549b66a3e8d0c688952abe5994e204ed62615baaf25dc029c" +dependencies = [ + "bitflags 2.5.0", + "getopts", + "memchr", + "pulldown-cmark-escape", + "unicase", +] + +[[package]] +name = "pulldown-cmark-escape" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" + [[package]] name = "qoi" version = "0.4.1" @@ -4673,19 +4620,24 @@ dependencies = [ [[package]] name = "qrcode" -version = "0.12.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" +checksum = "23e719ca51966ff9f5a8436edb00d6115b3c606a0bb27c8f8ca74a38ff2b036d" dependencies = [ - "checked_int_cast", - "image 0.23.14", + "image", ] [[package]] -name = "quote" -version = "1.0.33" +name = "quick-error" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -4730,10 +4682,60 @@ dependencies = [ ] [[package]] -name = "rayon" -version = "1.8.0" +name = "rav1e" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools 0.12.1", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -4741,9 +4743,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -4766,14 +4768,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -4787,13 +4789,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -4804,24 +4806,18 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "async-compression", - "base64", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -4839,9 +4835,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -4867,17 +4865,12 @@ dependencies = [ ] [[package]] -name = "ring" -version = "0.17.7" +name = "rgb" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" dependencies = [ - "cc", - "getrandom", - "libc", - "spin 0.9.8", - "untrusted", - "windows-sys 0.48.0", + "bytemuck", ] [[package]] @@ -4904,12 +4897,12 @@ dependencies = [ [[package]] name = "rqrr" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a8b87d1f9f69bb1a6c77e20fd303f9617b2b68dcff87cd9bcbfff2ced4b8a0b" +checksum = "ad0cd0432e6beb2f86aa4c8af1bb5edcf3c9bcb9d4836facc048664205458575" dependencies = [ "g2p", - "image 0.24.7", + "image", "lru", ] @@ -4936,8 +4929,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2779c38df072964c63476259d9300efb07d0d1a7178c6469893636ce0c547a36" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "assign", "js_int", @@ -4953,9 +4945,9 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641837258fa214a70823477514954ef0f5d3bc6ae8e1d5d85081856a33103386" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ + "as_variant", "assign", "bytes", "http", @@ -4972,16 +4964,15 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bca4c33c50e47b4cdceeac71bdef0c04153b0e29aa992d9030ec14a62323e85" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "as_variant", - "base64", + "base64 0.21.7", "bytes", "form_urlencoded", "getrandom", "http", - "indexmap 2.1.0", + "indexmap 2.2.6", "js-sys", "js_int", "konst", @@ -4994,24 +4985,25 @@ dependencies = [ "serde_html_form", "serde_json", "thiserror", + "time", "tracing", "url", "uuid", + "web-time", "wildmatch", ] [[package]] name = "ruma-events" version = "0.27.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20a52770e5a9fb30b7a1c14ba8b3dcf76dadc01674e58e40094f78e6bd5e3f1" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "as_variant", - "indexmap 2.1.0", + "indexmap 2.2.6", "js_int", "js_option", "percent-encoding", - "pulldown-cmark", + "pulldown-cmark 0.9.6", "regex", "ruma-common", "ruma-html", @@ -5028,8 +5020,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1901c1f27bc327652d58af2a130c73acef3198abeccd24cee97f7267fdf3fe7" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "js_int", "ruma-common", @@ -5041,8 +5032,7 @@ dependencies = [ [[package]] name = "ruma-html" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9674a149b1a6965fe2174ba528c89ee201258abd9209bbe74953df7073a83a5b" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "as_variant", "html5ever", @@ -5054,8 +5044,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8ad1259274f2f57c20901bd1cc5e4a8f23169d1c1d887b6338b02f058e9b41" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "js_int", "thiserror", @@ -5064,24 +5053,22 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0280534a4b3e34416f883285fac4f9c408cd0b737890ae66f3e7a7056d14be80" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "once_cell", - "proc-macro-crate 2.0.1", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "ruma-identifiers-validation", "serde", - "syn 2.0.41", + "syn 2.0.58", "toml", ] [[package]] name = "ruma-push-gateway-api" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f343045c4d4a5943f93b5014160af3c7413e6ee32ea47b147e1e91f2a977486b" +source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" dependencies = [ "js_int", "ruma-common", @@ -5096,7 +5083,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -5127,102 +5114,45 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" -dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys", "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - [[package]] name = "rustls-pemfile" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", + "base64 0.21.7", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "salsa20" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" -dependencies = [ - "cipher", -] +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5231,10 +5161,13 @@ version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ + "chrono", "dyn-clone", + "indexmap 1.9.3", "schemars_derive", "serde", "serde_json", + "url", ] [[package]] @@ -5255,27 +5188,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "scrypt" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" -dependencies = [ - "pbkdf2", - "salsa20", - "sha2", -] - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sec1" version = "0.7.3" @@ -5301,9 +5213,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -5314,9 +5226,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -5324,24 +5236,24 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde-wasm-bindgen" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b713f70513ae1f8d92665bbbbda5c295c2cf1da5542881ae5eefe20c9af132" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" dependencies = [ "js-sys", "serde", @@ -5350,22 +5262,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -5381,12 +5293,12 @@ dependencies = [ [[package]] name = "serde_html_form" -version = "0.2.3" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224e6a14f315852940f3ec103125aa6482f0e224732ed91ed3330ed633077c34" +checksum = "8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5" dependencies = [ "form_urlencoded", - "indexmap 2.1.0", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -5394,10 +5306,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -5405,20 +5318,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -5437,16 +5350,17 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ - "base64", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", + "serde_derive", "serde_json", "serde_with_macros", "time", @@ -5454,14 +5368,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ - "darling 0.20.3", + "darling", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -5497,9 +5411,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" @@ -5526,6 +5440,15 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + [[package]] name = "siphasher" version = "0.3.11" @@ -5543,35 +5466,25 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "sourceview5" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88c5f976a113e947bc5ec67758b2960c0db4ca76f80fb410d7cd86cd456d9ee5" +checksum = "9f0bf70f2f1ac4624af22056f9c4cf58dccff73dafc7207b46fbd3df7b57410f" dependencies = [ "futures-channel", "futures-core", @@ -5587,9 +5500,9 @@ dependencies = [ [[package]] name = "sourceview5-sys" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29637cccd56075a37ba72c0cc8b8d599dbc1d857e30dadea97eaacbc29b7fd46" +checksum = "eac236ad7ce6dad2b819ced8b68b5a1cf4d968aa301cb9a7692470eb21f657be" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -5667,47 +5580,47 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structmeta" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d" +checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "structmeta-derive" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" +checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "strum" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -5729,15 +5642,21 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.41" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "system-configuration" version = "0.5.1" @@ -5761,12 +5680,12 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck", + "heck 0.5.0", "pkg-config", "toml", "version-compare", @@ -5774,27 +5693,26 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.28", - "windows-sys 0.48.0", + "fastrand", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -5810,29 +5728,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.51" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.51" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -5840,9 +5758,9 @@ dependencies = [ [[package]] name = "tiff" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", "jpeg-decoder", @@ -5851,12 +5769,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -5871,10 +5790,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -5895,9 +5815,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -5906,7 +5826,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "tracing", "windows-sys 0.48.0", @@ -5920,7 +5840,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -5933,16 +5853,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - [[package]] name = "tokio-socks" version = "0.5.1" @@ -5957,9 +5867,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -5983,21 +5893,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.2" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.22.9", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -6008,22 +5918,44 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +dependencies = [ + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.5", ] [[package]] @@ -6034,14 +5966,9 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "hdrhistogram", - "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand", - "slab", "tokio", - "tokio-util", "tower-layer", "tower-service", "tracing", @@ -6053,17 +5980,14 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "bytes", "futures-core", "futures-util", "http", "http-body", "http-range-header", - "iri-string", "pin-project-lite", - "tokio", - "tower", "tower-layer", "tower-service", ] @@ -6100,7 +6024,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -6126,9 +6050,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" +checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" dependencies = [ "js-sys", "once_cell", @@ -6172,9 +6096,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typewit" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6779a69cc5f9a7388274a0a8a353eb1c9e45195f9ae74a26690b055a7cf9592a" +checksum = "c6fb9ae6a3cafaf0a5d14c2302ca525f9ae8e07a0f0e6949de88d882c37a6e24" dependencies = [ "typewit_proc_macros", ] @@ -6191,18 +6115,20 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset", "tempfile", "winapi", ] [[package]] name = "ulid" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" +checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" dependencies = [ + "getrandom", "rand", + "web-time", ] [[package]] @@ -6216,9 +6142,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -6228,18 +6154,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -6257,12 +6183,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - [[package]] name = "url" version = "2.5.0" @@ -6303,6 +6223,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + [[package]] name = "valuable" version = "0.1.0" @@ -6317,9 +6248,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -6329,13 +6260,12 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vodozemac" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c66c59f2218deeddfe34c0fee8a1908967f8566bafd91c3c6b9600d0b68cde1" +version = "0.5.1" +source = "git+https://github.com/matrix-org/vodozemac?rev=0c75746fc8a5eda4a0e490d345d1798b4c6cbd67#0c75746fc8a5eda4a0e490d345d1798b4c6cbd67" dependencies = [ "aes", "arrayvec", - "base64", + "base64 0.22.0", "cbc", "curve25519-dalek", "ed25519-dalek", @@ -6356,12 +6286,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - [[package]] name = "want" version = "0.3.1" @@ -6379,9 +6303,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6389,24 +6313,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -6416,9 +6340,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6426,28 +6350,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -6458,9 +6382,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -6468,9 +6392,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -6478,15 +6402,15 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wildmatch" -version = "2.1.1" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86" +checksum = "939e59c1bc731542357fdaad98b209ef78c8743d652bb61439d16b16a79eb025" [[package]] name = "winapi" @@ -6512,11 +6436,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[package]] @@ -6534,7 +6458,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -6554,17 +6478,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "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_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -6575,9 +6499,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -6587,9 +6511,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -6599,9 +6523,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -6611,9 +6535,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -6623,9 +6547,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -6635,9 +6559,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -6647,15 +6571,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.28" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] @@ -6672,9 +6605,9 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core", @@ -6684,9 +6617,9 @@ dependencies = [ [[package]] name = "x509-cert" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25eefca1d99701da3a57feb07e5079fc62abba059fc139e98c13bbb250f3ef29" +checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" dependencies = [ "const-oid", "der", @@ -6695,11 +6628,11 @@ dependencies = [ [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" dependencies = [ - "nix", + "libc", "winapi", ] @@ -6715,25 +6648,32 @@ dependencies = [ ] [[package]] -name = "zbus" -version = "3.14.1" +name = "yansi-term" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi", +] + +[[package]] +name = "zbus" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" dependencies = [ "async-broadcast", "async-process", "async-recursion", "async-trait", - "byteorder", "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener 5.3.0", "futures-core", "futures-sink", "futures-util", "hex", - "nix", - "once_cell", + "nix 0.28.0", "ordered-stream", "rand", "serde", @@ -6743,7 +6683,7 @@ dependencies = [ "tokio", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -6752,11 +6692,11 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "regex", @@ -6766,9 +6706,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.6.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -6777,22 +6717,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] [[package]] @@ -6812,9 +6752,15 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.58", ] +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + [[package]] name = "zune-inflate" version = "0.2.54" @@ -6825,14 +6771,22 @@ dependencies = [ ] [[package]] -name = "zvariant" -version = "3.15.0" +name = "zune-jpeg" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" dependencies = [ - "byteorder", + "zune-core", +] + +[[package]] +name = "zvariant" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" +dependencies = [ + "endi", "enumflags2", - "libc", "serde", "static_assertions", "url", @@ -6841,11 +6795,11 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -6854,9 +6808,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" dependencies = [ "proc-macro2", "quote", diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix index 0ff8eadbf5..cdbddfe995 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -25,20 +25,23 @@ stdenv.mkDerivation rec { pname = "fractal"; - version = "6"; + version = "7"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; - owner = "GNOME"; + owner = "World"; repo = "fractal"; - rev = version; - hash = "sha256-J4Jb7G5Rfou3N7mytetIdLl0dGY5dSvTjnu8aj4kWXQ="; + rev = "refs/tags/${version}"; + hash = "sha256-IfcThpsGATMD3Uj9tvw/aK7IVbiVT8sdZ088gRUqnlg="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "matrix-sdk-0.6.2" = "sha256-CY0Ylrd3NkP1IevyQa351IS/+evG2GgrjPnR/ZDFR9Q="; + "mas-http-0.8.0" = "sha256-IiYxF9qT/J/n8t/cVT/DRV3gl2MTA6/YfjshVIic/n4="; + "matrix-sdk-0.7.1" = "sha256-quwt9Dx0K6LDMwHBipc52Ek59zz5mlTAdOj+RXZBU3Q="; + "ruma-0.9.4" = "sha256-tp0EFS39UTXZJQPUDjeQixb8wzsMCzyFggVj6M8TRYg="; + "vodozemac-0.5.1" = "sha256-Hm0C696RmNX6n1Jx+hqkKMjpdbArliuzdiS4wCv3OIM="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix index a910105fde..ec9f0d3691 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,10 +3,10 @@ mkFranzDerivation rec { pname = "franz"; name = "Franz"; - version = "5.9.2"; + version = "5.10.0"; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "sha256-W/60g5CbSUZcNASjdbiS7DNv9375GiesEG60QLLAh1g="; + sha256 = "sha256-zQhZlxr7kyMWx6txDnV+ECBTzVEwnUaBsLWKJy3XYFg="; }; meta = with lib; { description = "A free messaging app that combines chat & messaging services into one application"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix index 39c892b335..dcbb29e61a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -1,7 +1,7 @@ { stdenv , lib , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , autoPatchelfHook , dpkg , xorg @@ -38,7 +38,7 @@ in stdenv.mkDerivation (rec { # Don't remove runtime deps. dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapGAppsHook dpkg ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapGAppsHook3 dpkg ]; buildInputs = extraBuildInputs ++ (with xorg; [ libXi libXcursor @@ -87,10 +87,11 @@ in stdenv.mkDerivation (rec { dontWrapGApps = true; postFixup = '' - # make xdg-open overrideable at runtime - wrapProgram $out/opt/${name}/${pname} \ + # make xdg-open overridable at runtime + wrapProgramShell $out/opt/${name}/${pname} \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \ --suffix PATH : ${xdg-utils}/bin \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ "''${gappsWrapperArgs[@]}" ''; } // cleanedArgs) diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 458577b8d0..765e03425a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitLab, gettext, wrapGAppsHook +{ lib, fetchurl, fetchFromGitLab, gettext, wrapGAppsHook3 # Native dependencies , python3, gtk3, gobject-introspection, gnome @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optional enableAppIndicator libappindicator-gtk3; nativeBuildInputs = [ - gettext wrapGAppsHook gobject-introspection + gettext wrapGAppsHook3 gobject-introspection ]; dontWrapGApps = true; @@ -77,7 +77,7 @@ python3.pkgs.buildPythonApplication rec { # test are broken in 1.7.3, 1.8.0 doCheck = false; - # necessary for wrapGAppsHook + # necessary for wrapGAppsHook3 strictDeps = false; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hamsket/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hamsket/default.nix index 225a566946..e535456ccf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hamsket/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hamsket/default.nix @@ -21,7 +21,7 @@ let categories = [ "Network" ]; }); - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; @@ -31,7 +31,6 @@ appimageTools.wrapType2 { extraInstallCommands = '' mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps - ln -sf hamsket-${version} $out/bin/${pname} install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/hamsket*.png $out/share/icons/hicolor/256x256/apps/${pname}.png install -Dm644 ${desktopItem}/share/applications/* $out/share/applications ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_common b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_common deleted file mode 100644 index 5c3f607e5c..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_common +++ /dev/null @@ -1,19 +0,0 @@ ---disable-sound ---enable-video ---enable-ext-sound ---disable-speex-aec ---disable-g711-codec ---disable-l16-codec ---disable-gsm-codec ---disable-g722-codec ---disable-g7221-codec ---disable-speex-codec ---disable-ilbc-codec ---disable-opencore-amr ---disable-silk ---disable-sdl ---disable-ffmpeg ---disable-v4l2 ---disable-openh264 ---disable-resample ---disable-libwebrtc diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_linux b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_linux deleted file mode 100644 index d1292afe3a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/pjsip_args_linux +++ /dev/null @@ -1 +0,0 @@ ---enable-epoll diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches deleted file mode 100644 index 5b9579f8f9..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches +++ /dev/null @@ -1 +0,0 @@ -0009-add-config-site.patch diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix index 98b4b69e69..6a6925d666 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -35,6 +35,7 @@ # for client , cmake +, git , networkmanager # for libnm , python3 , qttools # for translations @@ -50,7 +51,7 @@ , qtsvg , qtwebengine , qtwebchannel -, wrapGAppsHook +, wrapGAppsHook3 , withWebengine ? true # for pjsip @@ -61,57 +62,80 @@ , opendht }: -let - readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); -in stdenv.mkDerivation rec { pname = "jami"; - version = "20231201.0"; + version = "20240430.0"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-A38JwjqdQVy03d738p2tpTFA6EWRSPNiesS5wZfti7Y="; + hash = "sha256-v7558m2h3RqvLLhf3BdYO9LKCFKuMTtPIXgH6OXiiY4="; fetchSubmodules = true; }; - pjsip-jami = pjsip.overrideAttrs (old: - let - patch-src = src + "/daemon/contrib/src/pjproject/"; - in - rec { - version = "311bd018fc07aaf62d4c2d2494e08b5ee97e6846"; + pjsip-jami = pjsip.overrideAttrs (old: rec { + version = "797f1a38cc1066acc4adc9561aa1288afabe72d5"; - src = fetchFromGitHub { - owner = "savoirfairelinux"; - repo = "pjproject"; - rev = version; - hash = "sha256-pZiOSOUxAXzMY4c1/AyKcwa7nyIJC/ZVOqDg9/QO/Nk="; - }; + src = fetchFromGitHub { + owner = "savoirfairelinux"; + repo = "pjproject"; + rev = version; + hash = "sha256-lTDbJF09R2G+EIkMj1YyKa4XokH9LlcIG+RhRJhzUes="; + }; - patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); + configureFlags = [ + "--disable-sound" + "--enable-video" + "--enable-ext-sound" + "--disable-speex-aec" + "--disable-g711-codec" + "--disable-l16-codec" + "--disable-gsm-codec" + "--disable-g722-codec" + "--disable-g7221-codec" + "--disable-speex-codec" + "--disable-ilbc-codec" + "--disable-opencore-amr" + "--disable-silk" + "--disable-sdl" + "--disable-ffmpeg" + "--disable-v4l2" + "--disable-openh264" + "--disable-resample" + "--disable-libwebrtc" + "--with-gnutls=yes" + ] + ++ lib.optionals stdenv.isLinux [ + "--enable-epoll" + ]; - configureFlags = (readLinesToList ./config/pjsip_args_common) - ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); - }); + buildInputs = old.buildInputs ++ [ gnutls ]; + }); - opendht-jami = opendht.override { + opendht-jami = (opendht.overrideAttrs { + src = fetchFromGitHub { + owner = "savoirfairelinux"; + repo = "opendht"; + rev = "f2cee8e9ce24746caa7dee1847829c526d340284"; + hash = "sha256-ZnIrlybF3MCiXxxv80tRzCJ5CJ54S42prGUjq1suJNA="; + }; + }).override { enableProxyServerAndClient = true; enablePushNotifications = true; }; dhtnet = stdenv.mkDerivation { pname = "dhtnet"; - version = "unstable-2023-11-23"; + version = "unstable-2022-04-26"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "dhtnet"; - rev = "b1bcdecbac2a41de3941ef5a34faa6fbe4472535"; - hash = "sha256-EucSsUuHXbVqr7drrTLK0f+WZT2k9Tx/LV+IBldTQO8="; + rev = "d7976982d24867c6faaf8103504ec8a10d932fa0"; + hash = "sha256-vazFDMIu/3AWeOz0LZhZD9NFO8cd5AK41zBpqpQrqnc="; }; nativeBuildInputs = [ @@ -130,6 +154,7 @@ stdenv.mkDerivation rec { opendht-jami openssl pjsip-jami + python3 restinio ]; @@ -193,6 +218,20 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; }; + qwindowkit = fetchFromGitHub { + owner = "stdware"; + repo = "qwindowkit"; + rev = "79b1f3110754f9c21af2d7dacbd07b1a9dbaf6ef"; + hash = "sha256-iZfmv3ADVjHf47HPK/FdrfeAzrXbxbjH3H5MFVg/ZWE="; + fetchSubmodules = true; + }; + + postPatch = '' + sed -i -e '/GIT_REPOSITORY/,+1c SOURCE_DIR ''${CMAKE_CURRENT_SOURCE_DIR}/qwindowkit' extras/build/cmake/contrib_tools.cmake + sed -i -e 's/if(DISTRO_NEEDS_QMSETUP_PATCH)/if(TRUE)/' CMakeLists.txt + cp -R --no-preserve=mode,ownership ${qwindowkit} qwindowkit + ''; + preConfigure = '' echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h # Currently the daemon is still built seperately but jami expects it in CMAKE_INSTALL_PREFIX @@ -204,10 +243,11 @@ stdenv.mkDerivation rec { dontWrapGApps = true; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook pkg-config cmake + git python3 qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 83a3b78e1d..a0968f83dd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -43,11 +43,6 @@ buildNpmPackage rec { env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - postPatch = '' - substituteInPlace main.js \ - --replace "require('electron-is-dev')" "false" - ''; - preBuild = '' # remove some prebuilt binaries find node_modules -type d -name prebuilds -exec rm -r {} + @@ -72,6 +67,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/jitsi-meet-electron \ --add-flags $out/share/jitsi-meet-electron/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 install -Dm644 resources/icons/512x512.png $out/share/icons/hicolor/512x512/apps/jitsi-meet-electron.png diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/keet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/keet/default.nix index 557078cd8b..c49442e383 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/keet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/keet/default.nix @@ -14,8 +14,6 @@ in appimageTools.wrapType2 { inherit src pname version; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index ac9d1b1369..20dc2bfafb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -53,7 +53,9 @@ stdenv.mkDerivation { --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop makeWrapper '${lib.getExe electron_28}' $out/bin/${pname} \ - --add-flags $out/share/${pname}/app.asar + --set-default ELECTRON_IS_DEV 0 \ + --add-flags $out/share/${pname}/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix index b34ed84d04..3938d03447 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -12,7 +12,7 @@ , libnotify , makeDesktopItem , which -, wrapGAppsHook +, wrapGAppsHook3 , writeText }: @@ -78,7 +78,7 @@ with mikutterPaths; stdenv.mkDerivation rec { sha256 = "05253nz4i1lmnq6czj48qdab2ny4vx2mznj6nsn2l1m2z6zqkwk3"; }; - nativeBuildInputs = [ copyDesktopItems wrapGAppsHook gobject-introspection ] + nativeBuildInputs = [ copyDesktopItems wrapGAppsHook3 gobject-introspection ] ++ lib.optionals stdenv.isDarwin [ libicns ]; buildInputs = [ atk diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 211c5b49bf..9300a73b17 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -107,7 +107,8 @@ let ] ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ] ++ lib.optionals withGnutls [ "--enable-gnutls=yes" "--enable-nss=no" ] - ++ lib.optionals stdenv.isDarwin [ "--disable-gtkspell" "--disable-vv" ]; + ++ lib.optionals stdenv.isDarwin [ "--disable-gtkspell" "--disable-vv" ] + ++ lib.optionals stdenv.cc.isClang [ "CFLAGS=-Wno-error=int-conversion" ]; enableParallelBuilding = true; @@ -138,6 +139,7 @@ let meta = { description = "Multi-protocol instant messaging client"; + mainProgram = "pidgin"; homepage = "https://pidgin.im/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix index cca91da3ab..e38d45a001 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -20,7 +20,7 @@ , sqlite , autoAwaySupport ? true, libXScrnSaver, libX11 , notifySupport ? true, libnotify, gdk-pixbuf -, omemoSupport ? true, libsignal-protocol-c, libgcrypt +, omemoSupport ? true, libsignal-protocol-c, libgcrypt, qrencode , pgpSupport ? true, gpgme , pythonPluginSupport ? true, python3 , traySupport ? true, gtk3 @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { sqlite ] ++ lib.optionals autoAwaySupport [ libXScrnSaver libX11 ] ++ lib.optionals notifySupport [ libnotify gdk-pixbuf ] - ++ lib.optionals omemoSupport [ libsignal-protocol-c libgcrypt ] + ++ lib.optionals omemoSupport [ libsignal-protocol-c libgcrypt qrencode ] ++ lib.optionals pgpSupport [ gpgme ] ++ lib.optionals pythonPluginSupport [ python3 ] ++ lib.optionals traySupport [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 295f92b9ef..519c2a0b66 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -100,7 +100,7 @@ mkDerivation rec { homepage = "https://psi-plus.com"; description = "XMPP (Jabber) client based on Qt5"; mainProgram = "psi-plus"; - maintainers = with maintainers; [ orivej misuzu unclechu ]; + maintainers = with maintainers; [ orivej unclechu ]; license = licenses.gpl2Only; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix index d0a7bbf2a1..af5bdcc15f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -20,7 +20,7 @@ , at-spi2-core , autoPatchelfHook , makeShellWrapper -, wrapGAppsHook +, wrapGAppsHook3 , commandLineArgs ? "" }: @@ -28,11 +28,11 @@ let sources = import ./sources.nix; srcs = { x86_64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/${sources.urlhash}/linuxqq_${sources.version}_amd64.deb"; + url = sources.amd64_url; hash = sources.amd64_hash; }; aarch64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/${sources.urlhash}/linuxqq_${sources.version}_arm64.deb"; + url = sources.arm64_url; hash = sources.arm64_hash; }; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook makeShellWrapper - wrapGAppsHook + wrapGAppsHook3 dpkg ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/sources.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/sources.nix index 0353fcc19f..590dbb3605 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/sources.nix @@ -1,8 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-02-16 +# Last updated: 2024-04-27 { - version = "3.2.5-21453"; - urlhash = "852276c1"; - arm64_hash = "sha256-g0J1FWG07bkabDHp2nuS48MNut2+N7gk0k5zWcmuQVw="; - amd64_hash = "sha256-6Qe4bP3q9RLEIJn9EfqqYaVTF8FRBNcjtVPl+zY7v5c="; + version = "3.2.7"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240422_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240422_arm64_01.deb"; + arm64_hash = "sha256-MrLkPHri3ifVy3+WNNs/CKK4Myztw8ZjWFEZDr27mpM="; + amd64_hash = "sha256-eZMzMaqCF514Wij8BZ0sLoyzjKNArLSFe92tN9WAiu0="; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/update.sh index 8b9121299b..777ea2a901 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/update.sh @@ -9,8 +9,7 @@ payload=$(curl https://im.qq.com/rainbow/linuxQQDownload | grep -oP "var params= amd64_url=$(jq -r .x64DownloadUrl.deb <<< "$payload") arm64_url=$(jq -r .armDownloadUrl.deb <<< "$payload") -urlhash=$(grep -oP "(?<=QQNT/)[a-f0-9]+(?=/linuxqq)" <<< "$amd64_url") -version=$(grep -oP "(?<=/linuxqq_).*(?=_amd64.deb)" <<< "$amd64_url") +version=$(grep -oP "(?<=/QQ_).*(?=_[0-9]{6})" <<< "$amd64_url") amd64_hash=$(nix-prefetch-url $amd64_url) arm64_hash=$(nix-prefetch-url $arm64_url) @@ -24,7 +23,8 @@ cat >sources.nix <> $PLUG << EOF + let \$GEM_PATH=\$GEM_PATH . ":${finalAttrs.passthru.gemEnv}/${ruby.gemPath}" + let \$RUBYLIB=\$RUBYLIB . ":$out/${ruby.libPath}/${ruby.system}" + if has('nvim') + EOF + for gem in ${finalAttrs.passthru.gemEnv}/${ruby.gemPath}/gems/*/lib; do + echo "ruby \$LOAD_PATH.unshift('$gem')" >> $PLUG + done + echo 'endif' >> $PLUG ''; passthru = { - pythonSourceRoot = "notmuch-${version}/bindings/python"; + pythonSourceRoot = "notmuch-${finalAttrs.version}/bindings/python"; + gemEnv = buildEnv { + name = "notmuch-vim-gems"; + paths = with ruby.gems; [ mail ]; + pathsToLink = [ "/lib" "/nix-support" ]; + }; tests.version = testers.testVersion { package = notmuch; }; - inherit version; updateScript = gitUpdater { url = "https://git.notmuchmail.org/git/notmuch"; @@ -155,4 +174,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "notmuch"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 9848815089..5026afeaea 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -3,7 +3,7 @@ # To update `thunderbird-bin`'s `release_sources.nix`, run from the nixpkgs root: # # nix-shell maintainers/scripts/update.nix --argstr package pkgs.thunderbird-bin-unwrapped -{ lib, stdenv, fetchurl, config, wrapGAppsHook +{ lib, stdenv, fetchurl, config, wrapGAppsHook3 , alsa-lib , atk , cairo @@ -147,7 +147,7 @@ stdenv.mkDerivation { inherit gtk3; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ gtk3 adwaita-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index e4809db566..3bed100179 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "115.7.0"; + version = "115.10.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/af/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/af/thunderbird-115.10.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "43041825f2fe7a42b7e8be09714cfe5506660a90ab09307a21810ec9debde878"; + sha256 = "9023faca327f2ef67090cd06635030acde12caf4b028f293d06463cc6303f2c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ar/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ar/thunderbird-115.10.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f307adc4e42c4e28672874882f2f72ac15bc9049474c5ebed701e0f83b81afac"; + sha256 = "3d312b1a651a836e725ef79236ff4b0a8e73d7ebe3ee065da7d87ff329ec3596"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ast/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ast/thunderbird-115.10.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "fe9d8a9d397f8476d0c59ad4a91faa8eb4b38a9cf03b324c95a5fc806ebd4c48"; + sha256 = "8d645ce0694a5f9e464243f85e46c96e08c69aec7d4e7ef6b7028f457cf11a8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/be/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/be/thunderbird-115.10.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b194ae99c1d495452673120ce3655620bf067dc1b82962f809c923adf26ff36c"; + sha256 = "c5564e5235f990caccae034b77ea835f5b9a3741e2bdcbc5ed750e1b3161af4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/bg/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/bg/thunderbird-115.10.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c92da8ab1290f5329a12fa7012a0d1b0326bfa43b536b01f686dc97f751b3723"; + sha256 = "061d15ae7805143fd74d8b16a2c2fcbfed471297d815692c55415c92ffe8bb41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/br/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/br/thunderbird-115.10.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "8ff05ea4ebbd715cdce40c5efff1ce81694831bbe0b41d0095155e4c867adc9b"; + sha256 = "33e802d7485b46bab1626dc1290db69df39c19434af8ad8dbdaecdb05cd5b2c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ca/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ca/thunderbird-115.10.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "9b210ff3c48526bb4fe0d436d6afbe16c2d0d629670ce5ffb0bef066621f4a1e"; + sha256 = "6bdd0eb8fe98dca531796228ef3fbc51bca6d2a220111272464192ef9744fa78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/cak/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/cak/thunderbird-115.10.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9e3c55b3c49219f77b3c081875180a4b47d962912066a1c4450db5753228922f"; + sha256 = "9430aa1c2e5af6e461cfe7947c00421d32e5d91f69215981f470db14355d53c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/cs/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/cs/thunderbird-115.10.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d1bbe0569cb2f3a7562b17d150bf2dfca48805a634e57567c7e11bb750c49208"; + sha256 = "f40ccf3947b4f98306697ffb984ac93ea1777019cb778fd1dd97d5f39c8718e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/cy/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/cy/thunderbird-115.10.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b3e86253d181567ea88065a73093e59dbc6462c47d0ce103295588f801655785"; + sha256 = "694d0e4a7ca2585afb3c8fa8a41e318c5de7fbcbe91627c3acf692974c75685f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/da/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/da/thunderbird-115.10.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "9a16ab856922682f56034f155b5363a745ad48e18a01cdc4590bdb486a359575"; + sha256 = "8b8f5c9895b40ee6dc5d2ef0877325ec0af21ab638abb47c5d952334fcde29aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/de/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/de/thunderbird-115.10.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "d38742d49daa3a6d3c0a613647be48feb3a7ea51a7905fc7c81438c3fdf8b7b7"; + sha256 = "f6f498a1e0756248fa06b4b94b52be11026a28cadd1aaab81b49aca3a311f3c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/dsb/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/dsb/thunderbird-115.10.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "59e86ae65167858aafb1e9a364c6e926b26bcb48b7fc4bbe8d054db6624f2a4f"; + sha256 = "2415f1a021c2005c8646bfa8b75df2115fd6d86c5eabf6bbc23aa499d3a1d045"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/el/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/el/thunderbird-115.10.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "176fbbee70d2aca0e1d6183541e299c26fcff4d875093a5191a071c5cafa39bf"; + sha256 = "57b4f990a15d0a2a9361bf9ec241fbe7b1fa33f7d3da871bec68e32d1b89ee3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/en-CA/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/en-CA/thunderbird-115.10.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "367c79a033ee595af8fb8e50600ac5fcb9d8c364563f8b3cc167d5b1a8fa3a77"; + sha256 = "3ad955c9557f0a692d7ce8b42cd764e3f9cb9dcba2b5bbb396a9debb40b8c1a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/en-GB/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/en-GB/thunderbird-115.10.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a53c8bae8328a422e23a3ac3346ef82fb9c211ffb8ce1e41f96e6c9426a79e31"; + sha256 = "c52eff0e765472a4e6f9db49210e1aad20fcfa422749d7962c7fbc7d92ef86a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/en-US/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/en-US/thunderbird-115.10.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "2bc751e6fe6e8b63d53edb1a0596235cc06ad89d1bdd0e2de16d5d5948c3c95a"; + sha256 = "66afb5c126670e37b7a127d33c8d93da0eabbf360ee2ece42270535069f2186d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/es-AR/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/es-AR/thunderbird-115.10.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "c7ed62c544f0ca1c405cdf6fc69c5833b0d94896301c332b36c5901f1236af94"; + sha256 = "ab2ba1379c80e1e52971656dcea195d06c0c19d4ccef107a55e92dc8dfc24d0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/es-ES/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/es-ES/thunderbird-115.10.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "8d81ab2fa14116873fbad2e99e2508842abef4730b91d690f51d71737f2e3bc0"; + sha256 = "4d55e1ac9aca0f85a890e6a014407eeafcd75710157a6c869d03c5d9bb3f010e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/es-MX/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/es-MX/thunderbird-115.10.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "5eda939b29972016c6696e5e7fa43a2b5c4183ea5bd0bd1f4f2dd99119cb5c54"; + sha256 = "6ab228494d21fe9846aa9370942ef619422b3a65106ad943e5870322f011d2d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/et/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/et/thunderbird-115.10.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c58f75ddd48e14ab407f73aff0377e6212b6464494e5f31db69d4d55caee2c83"; + sha256 = "46b9ed9a8a4244b0660b04acc357b27dbd516bef5b0c82001021a46f72087305"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/eu/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/eu/thunderbird-115.10.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "22a4b27fa459545359a2d5c27d145d24906188cb7a0284105e1ad11b0f73dc00"; + sha256 = "322ef300f4a92bc5263e3fc5aef5a6ce5ff13bcda841af06546c2d580e104b89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/fi/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/fi/thunderbird-115.10.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d72131bda9fadad25a2cbb4d7b6b61b8f1dabe217b313f13f779a6d5f9bb8b71"; + sha256 = "f84c400cf83c8676b25669fe9208da4da56e3a88161fea806b39fb61b39ad79d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/fr/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/fr/thunderbird-115.10.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9d18a047151a4238fdd289b7a5bd53ff9ff0a93c630f951fc4e7003e755c0d42"; + sha256 = "ed2aeb8f849e433771f79bedc8b05ab83cc7a22a0b7c7b4fc333ded3ec0a18d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/fy-NL/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/fy-NL/thunderbird-115.10.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "fb80cd419de4629e89dcbaba9c985896136a333ad058cf191f7f44ba0c83006a"; + sha256 = "99210d27c75e591355fb641664f8e477b412b79ed545b87f9fc10b7ea7956c5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ga-IE/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ga-IE/thunderbird-115.10.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "5a7f3564eaa756bcb62d007942d24e9608d0e0141622a8c8377a5c7b445f8d73"; + sha256 = "7cb91bef278037efd512f8e5384cb8011ffee3025c0209c9d575d0693523891e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/gd/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/gd/thunderbird-115.10.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "69edffe9345a6af183eb4a74dcf9c95a4befc2b16a9742fa3fde18f8b7b9c87f"; + sha256 = "116149801edfb6166d651eed7752cae466a7998700e2d85e0fa0e89dcb8ed12b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/gl/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/gl/thunderbird-115.10.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "421043a75717e547138a2005972245797c96cf88fdaabef364ca4d9b0bf5a1e2"; + sha256 = "47789526c5de43000f58bcdbb0a88e7fdd67deb5f4fd836236347cf62194b9ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/he/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/he/thunderbird-115.10.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "2acc9bd99978163980f7e158ae2a313179fbda07835c18089963ceba35bb4781"; + sha256 = "9f3968f4919398b33bd16c645d86aac5e58d8b713204ea5ac8db06f37f3c8fbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/hr/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/hr/thunderbird-115.10.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "74754c9cc085c82dd9d37f65879ba9b88ca6af52057d0d30c98a84195b86c505"; + sha256 = "b5e436bf3c02a0a9085b0a35fac71646dec1f0e83970e7532fcf35dcda8cd1b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/hsb/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/hsb/thunderbird-115.10.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "b7ae135e68fd21af6a4d6970ab5122d5c7ce2de0688e427f6480cab203d27585"; + sha256 = "6e42557492e0db90f0a42c2c239f8bf052b9c4c43a55d615fa1ec4da5a5c678b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/hu/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/hu/thunderbird-115.10.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2d761be46744974c1a1b929a89d73b27294e2a482904b1add7a9556152c15786"; + sha256 = "e11733b4f2fd13071fb0d1e25f3f21c0c022016e634f630a98cd5053d0850889"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/hy-AM/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/hy-AM/thunderbird-115.10.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "3b0d3f0d40b917624c31d35095cd485d053f12b8312e4053fe47802e82023005"; + sha256 = "0a13c41658426d99de46f3b7e6a5d2faba81040ac71368d910d1222b9d47b8ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/id/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/id/thunderbird-115.10.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "7a4569879f566393054e16b010bae3d2f2d5b828695a5dfe6a6774bc537977ad"; + sha256 = "d9194d612852c4e7cf7ee466e95318716c83a2f7badcba280a31eef10d8296d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/is/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/is/thunderbird-115.10.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9247aec277ecf41e5cdd77ab8d736761fdd7bb949b8ee1c0fdcfccd74dc8773c"; + sha256 = "143d425cce754af88da296fd1dd3e40b0a2e125f6d45ca066940efdeeaa92d11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/it/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/it/thunderbird-115.10.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "d1652cfca8c5f080a307c34007c9c78d838cb1acfdc0fc9cd72f36453b018629"; + sha256 = "130e92f13ad92e110378eee9f2caead36a4280d6380d45390ab6e6d4b7e2bf86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ja/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ja/thunderbird-115.10.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "68064850c1e25bc73f22a3ae0fe282f57c8a9f80f40c1e92ef509ba765c65730"; + sha256 = "9561fc79e72fe60c36313f0e07b14f04cae28a47108832cb3853d5da610c6652"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ka/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ka/thunderbird-115.10.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "2ea682113f30fadb5e566aba99bfd9d46af001fe96fd0d4621bebbd7d67b963f"; + sha256 = "f37f5eb50af136c712726c3ed180e564a243ac9b0d87166ec0acf058f6be7bf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/kab/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/kab/thunderbird-115.10.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "033ff18a47270f17cc20e57cca82fecf0568fda0b27389010c3a2f205ccaf016"; + sha256 = "2923b3671f38b72890e0d8be963ecccfb682ce0e09ff2286d05fc0d86413da45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/kk/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/kk/thunderbird-115.10.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "70c28b0ceec23b1d45810a18c12b4f45f6f8678cd2b1a38909d78862449284f3"; + sha256 = "c3414484527fb499b4fa1a19010e97b452d1c6a48d0731ec3f8bb7041bc2d400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ko/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ko/thunderbird-115.10.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a5a3117e73878f651526028df9d34c559d8216b44efcf0ca3bd915e987f091d5"; + sha256 = "4caf7796c7af7e9421d1f20f8b238abd6ef369131e1beb614fcba6d8e15c397a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/lt/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/lt/thunderbird-115.10.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "7db1090e0c0927cc4f08ec521b61ad963bef88a78ddc82a02470be4eecf1843d"; + sha256 = "8c9c7de04c3537013e002dd2833ba9bd0a647e4e01f2d94e9eebef88a67dcae6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/lv/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/lv/thunderbird-115.10.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "e03d64a0b3f577f7711d67e596bb5d5d6cb068cbfbecdc7c54777d36c045e831"; + sha256 = "63fa8509fbb99621226378d79ad75b0cf7f474dd7403bb8963361c81c9d01c61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ms/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ms/thunderbird-115.10.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "abc09d8b1121a4d6ef749df9fef98c0a265b21b2dc2a049f4567b0d97febffd5"; + sha256 = "9de01e0ede9d4d6196c7b72e08f7abb438681a303b679abbc1f8294448211ab3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/nb-NO/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/nb-NO/thunderbird-115.10.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "5211b558c184d656ab0ca9eeba50537183b97c83ac73e62107e24aed2aafec8a"; + sha256 = "8eb261abc0f68e42bd048315957acc47665b275bce848372e1b0953e2ab99c26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/nl/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/nl/thunderbird-115.10.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "3f784ee5b0520455ad2aad31c51049cad0050fa6cb0e828522a7bb7d73addbf0"; + sha256 = "c4aae2a0489d919c4665285b402d113a8efec53d15279eff056d9a576888287b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/nn-NO/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/nn-NO/thunderbird-115.10.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "d27a47d442e550b060e39e1a3e91a0b1e8e11ead0f45e5c6f8395e020f4b2901"; + sha256 = "4495660e73f937a07c2745c6d48fa43a8a159b1d84d8e6859e1a42579f1157e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/pa-IN/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/pa-IN/thunderbird-115.10.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "622e2923c1c83e510101c2ee75119d7b082f57b8baa4a221c40763a7a112540a"; + sha256 = "874ae66c39b199981cc02363bed7a2a74c133a80b591785c8c862e7499b17c89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/pl/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/pl/thunderbird-115.10.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "ad244cf40a4b444e9f70d367b97aa41b25380d2b3a74e6ddbee11cd5b96e328f"; + sha256 = "ae7c458b41e7eecc2581be2801571bac54933372797d291f03acee7311ba784e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/pt-BR/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/pt-BR/thunderbird-115.10.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "3f425ff63743d4967f388c10e5f633d0422ba35bda16000198f6aeb4c4638e3f"; + sha256 = "30912ac7a19d1bbdad39e537f78d512951124a44407eddfc4382c1175cae76de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/pt-PT/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/pt-PT/thunderbird-115.10.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "af59fbcf575bc7bdf056c2c4959461dff3409fab2fa094679b9a49425f355436"; + sha256 = "2cb2225df1364a1f67911a0cbbe034d62df6fd51b567e5fa8b036273790c3fad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/rm/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/rm/thunderbird-115.10.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "cfe5722c04ca1ea80f92050149a0603399c4a2bfac4ecce636b6de9fd9efb920"; + sha256 = "09d6d3cdf00a280eb2b1149154150b1ce23e2761d379b1b4eb362422e0ce7584"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ro/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ro/thunderbird-115.10.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "735c2dc1cf68f4dea40bde5338de3f03daaac48c72d926f1222fcb38ef3a5cc3"; + sha256 = "fdffa6a81e15bc84f4cb1d48ebc1109413ec10f40ba7ab4a78e8c980fd447683"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ru/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ru/thunderbird-115.10.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "8d7e34d8c0dffede30632faab6c88df4384053b20484c887e00a70767f528a27"; + sha256 = "0cea8488bf4537d205b3fab1f98239f7cff85fff6c2f7eab247a3191e089c14e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/sk/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sk/thunderbird-115.10.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "0ad76482313a3ef3263d74031bc5f4c4d09fed95ddfdce16799f6a158db4fb24"; + sha256 = "eff9c4d36259590e8397cff0ee8ba407e5f116b541f730e5845a2bce70f7a68b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/sl/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sl/thunderbird-115.10.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "7e480b7030e6d50871cbeefcd45be12e3d3afe2035c8e8f34391e87f0632d13b"; + sha256 = "97db4b1c97a85cc65c16e72e166a1739bbfa20e07be767e5695c10fbdcb86231"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/sq/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sq/thunderbird-115.10.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "70ce1cee01b2c229cd66612316c47da202cf40f7f16724eb3bff81b50b9f64de"; + sha256 = "f6d3b3a90cc9ec5c794b803675c141c9cc6acbdc6d25093369ecd0c937206f85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/sr/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sr/thunderbird-115.10.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "6a95ccc4d59a83ac4f9fb05a09b300bd2ba7c9ff519a93230b86cda5afe5b2fa"; + sha256 = "3f6f0f5222f4481406087b11bca95b122705e60d3050040e31f901960d729aaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/sv-SE/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sv-SE/thunderbird-115.10.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "86249dba9674e5f35cc23a69bec3f4c55f9f40259c6c53c24b8d5b9c931b0828"; + sha256 = "a168edd15476aa8150718de09fdb0d94bee32b9f20dc9cfb4ef942684a96e857"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/th/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/th/thunderbird-115.10.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "aa4717d3cf5be13d38a8c9662409cdccb3f0e75e4e0b88a6e1609466b222ed3e"; + sha256 = "65992ba363ce0378a271cc0d073e64176873be8dfd5a4c6f3378b5e819aeed0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/tr/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/tr/thunderbird-115.10.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "f160d523fdc0263a596748aabf430141ad00845f76c251811ed0e1d5e4ac8804"; + sha256 = "d1a2c48e4c12977151361ab1264d26b0027fc74a256b7a2ccdd3e38050a14049"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/uk/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/uk/thunderbird-115.10.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "2b28cec1ddbb65812a2c2ed8c239f10ec28c89358587450d0a263c738033f7ad"; + sha256 = "ac72a9b613ea56178c2f5a16ec59a5f4d481b85aed1932689ea1cae328d8e81b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/uz/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/uz/thunderbird-115.10.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "391998b0aa13f56f2527ce25f91a78bd68a5740e752e624355bea1a494582db8"; + sha256 = "0db8b885543185f06d0f5ae4ee18b95046cf00172774ccbd6c79f825e94a0a67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/vi/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/vi/thunderbird-115.10.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "cff0aa2ae9e0103a8a53ab31afcc415f351a8adc2034aaadde9d7a3f0ac92f8e"; + sha256 = "ce91ae20b5feaa7f0d9a20de5661bfece4b84da32063bcd647309ad0c7a3a342"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/zh-CN/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/zh-CN/thunderbird-115.10.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "3c8ea8438c8a98e79636685061efac38ab26707087fe47cb784f4852e74fec6f"; + sha256 = "ab89a35b926209221fb672bcd9c3a83c636e3c7b95b507926ca6317e5f977b51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/zh-TW/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/zh-TW/thunderbird-115.10.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "925ab3461b2315db94466464cf91a59ec1a81bb736fb488d2270241d37492149"; + sha256 = "407062f4b5de3e40e44888713a39337b6e223487a76fff0bdb7219154700cfdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/af/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/af/thunderbird-115.10.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "4c50b55bec1742e702a888ffb02ff1f30362cc271a5175d3063fcc378d3f6633"; + sha256 = "19b5940f6fba18e0246d1173d2a5fcb8c93d7265ffe8c9028647f9ff0afbc486"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ar/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ar/thunderbird-115.10.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4d959f8020872645c2737a4fec6dfb07f542145c90d453cebd933d4742c89a68"; + sha256 = "9dc9deb45751da0d2d09d0331eaaa89c318f2457d575a2c03bef207f169e8de7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ast/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ast/thunderbird-115.10.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a9a137e284afefd0ff8620ce67853b5a51736e9af9e32ac18d5568e49539b77c"; + sha256 = "5710e364f670e388d9bf6dbc8b1fb7fcded75806a4be249b7ddacc2c24d6da06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/be/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/be/thunderbird-115.10.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "b1c99d634c1410d467e10a3b6a2bd3210327dde6c809434cee6000da7e57c4f7"; + sha256 = "f7e20df373381cc63c4d52c50c4e9305bd9378c2e2f1d21a4d2f0db36d831156"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/bg/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/bg/thunderbird-115.10.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "94c027ce4fd411d7f5c6969ce70b83a1b1713e75dd5ef79261c89ea0c5f08472"; + sha256 = "8c7332cbbcc3df7be3b6ab2d7e929031c4e349de0aa548b775c6b7af3e63cca3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/br/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/br/thunderbird-115.10.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "33c00ef61021816de04389b14fe7ab97f185d35e162824d166d8f2dea4faa957"; + sha256 = "4b5621ab96b9a937851698e18347259155803a3cc7d7ac9b7227a3fa203178a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ca/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ca/thunderbird-115.10.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "548e53b0186bb328b45fdb741a3181f1e8ba7ecfdf8ef969aeb24d8af5676020"; + sha256 = "965a5374467b248e52f9508154fecf9d6bb9cb58eb3fd6be240d74a7208650fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/cak/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/cak/thunderbird-115.10.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "145c24539255010e00a7899f980ba5f6c8cc13c6f3925c9c17bbd1f2b125883a"; + sha256 = "f17a469e28cfc5aa9b2b795c1d7517e076146f87cf534b9fd4a4ecc905858a4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/cs/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/cs/thunderbird-115.10.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a98f117f5f188f66c120699350778e8ad44c5fd989bfb38055ec1bc8501213c0"; + sha256 = "802fa9a0d857a973592ae87a94fc9ba3b18c8fc86a3352d90d152c0a7ece0db5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/cy/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/cy/thunderbird-115.10.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "b6be218c10a41afee4094f2ce4077f7fe49c51c8ba6259a81f6127b897654212"; + sha256 = "c9cba2912211963ca4acccb1bbf9c904e9a79f1c3781a69df76c003bbd1f5c1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/da/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/da/thunderbird-115.10.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "1cfaf7590ff7659e0583a7610290014db437b374d148855a049d2a06006d9020"; + sha256 = "5c54d287396d2c172f463010bb5be1520a5c7636a6f79435430420943036a364"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/de/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/de/thunderbird-115.10.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "0e7319ee0268b364602ee7eee3246b1cda62e573100e7091d5410d9d195bf9f8"; + sha256 = "c6558305d0207a706fb8f5af595dbfc2515652a732fb7e95646a334335a01a61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/dsb/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/dsb/thunderbird-115.10.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "e7b51ab3de11f681740fccc887731cc816f3efa27a3ece879020e2375d4aeb6e"; + sha256 = "9eb4d57f121df4714d91ac0a5075face494fb6efea301625ede1b4420c398ff8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/el/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/el/thunderbird-115.10.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "659251286ed9463604dbf1bb753789dadbd1e3b59c029c568bf5865384c07eb4"; + sha256 = "a96136d8392cdf21af28efe2b512efd45190e97ad420a293cba6d621ca7f2106"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/en-CA/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/en-CA/thunderbird-115.10.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0437ccb4e1d6c5b1fa8f91c3eb32176abc11d757242afab013ded4562b080b04"; + sha256 = "30d9f5125940c08c77d2c6f2aa2de794fd9abfbdf88640dd56c0ed4e87f33ead"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/en-GB/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/en-GB/thunderbird-115.10.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "08c923762d609967decba41884601a5fa7385986220f222f0061e70eba401ae1"; + sha256 = "9e78d591b35f8aad5811a5cdceaf9ab5d394fd3ad1dade692d21a3ccbec4b14e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/en-US/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/en-US/thunderbird-115.10.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8b5d6e9f13c7686a3945bae5a26f083849d610fbddfb7d9a8467f4402f0186c8"; + sha256 = "1f459cd30a477a654f91565963ba6ef077c087a8fea98ac36186c41ed78db627"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/es-AR/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/es-AR/thunderbird-115.10.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "66c8d5a311caa8dcd7ba497fe8c7dd0eddbe9405f72fe06ed134a8233f544710"; + sha256 = "17cbdbfc9df3e0f8447f73d8205ff4e126cce613ff596c64dcc99992e6c2bddc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/es-ES/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/es-ES/thunderbird-115.10.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e00d5af4ba228a9aab68a3a813dd4cc03dbe9dd28dc262b993788bd8ce0d7cb2"; + sha256 = "a5622a156340409aa1ea7af7b0531741e3024a1fdacd9bc5307a17d596dfe720"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/es-MX/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/es-MX/thunderbird-115.10.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "fefd4a6ebb4888c1d2514299c99ac0dcd910f583be6621064bb8e35bb81e927e"; + sha256 = "cb69980eafc5209b37606cdd2b6657943d2d4f827450fa0f9bbf64ae31bf8a05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/et/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/et/thunderbird-115.10.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b1260be6c4e3803b8219fd8b948be6c33db0e03ba79c0b5452ddd95749973992"; + sha256 = "b8ad3424ba8f4aa2affd9cf03133d64e0c68513983f733c4805962ca0535bd40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/eu/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/eu/thunderbird-115.10.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "831c248aeb1af3a405a280c59533967a26347be767757d494b2fb835519cddc6"; + sha256 = "800c8f9ae9486d8109bc0e62636b511662042b6115313e4be5e50cb8851b0d8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/fi/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/fi/thunderbird-115.10.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "e2867848f23e12c9e326b575bf5fc5c0f847deebfd8758ef7adaa6ddfcb5fc22"; + sha256 = "b4e47065f2f91cbd84c16f23f25682dd1928ab966c497d0584cc19eaaf5436a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/fr/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/fr/thunderbird-115.10.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "2f723caaff319c5a63e92f20c14652fb86e9b5b6b1e47f08ebbb4d5b9e5a5d39"; + sha256 = "fd47e4c10a7c1c70c34635a899aa03c139666b3b5c9752dcfd7f5d6aaea750d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/fy-NL/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/fy-NL/thunderbird-115.10.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6f6f3e9113b61da74599132cc793b12e908fdfe6dbec6e082891e39c7a2d7651"; + sha256 = "1d690a540600918e3bc8ee664b29cb9855b10c961d2d09bf434d3473ceb98933"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ga-IE/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ga-IE/thunderbird-115.10.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "802d402c45748b480de1b27d151624ed9c96a2bc93978262e654c561a939db5a"; + sha256 = "b62a866a69ef782a51e5a0e3ad314e944a0cb63968454d049c5c2112adaff143"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/gd/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/gd/thunderbird-115.10.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "8ddd2009c6849bb8ae2e5d14202f87831e2613366eaba5da1dfc65b831a46ffe"; + sha256 = "35eafe0440625d32249d7cc721f2fde9dc7331f9d4b542682f23f3c3281f584d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/gl/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/gl/thunderbird-115.10.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a726f1269893be461f42f9277d5b6c7f65e2ccfd618735048fa18265390ff633"; + sha256 = "1a6badeae7defbb158615639fd129a59e0b24db557f5106fe20b85d0b5e0b46e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/he/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/he/thunderbird-115.10.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "cb0b69268c2abd876965c70f060d7c67a4682af815500fbbc35869cb8dffd500"; + sha256 = "12cb6baa362cc0c4147cc75d80bf94d0a5be18dc895aabcc1359df1bd483e096"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/hr/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/hr/thunderbird-115.10.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "bf7930a372eb970c4cd16196eedbd471d61f1db3cc142d51a8067e2462419af3"; + sha256 = "a130fee072cc32f1203da09507e5935aa1669b018a44f7d6ca097119f835e184"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/hsb/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/hsb/thunderbird-115.10.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "e83cdd093bdd55b696f42192cd585afb996ea6aa4a58f9ae977a9cb2b2511c9d"; + sha256 = "5e564ff266867829b963e058a2cecc5da29258acb1a852329e7d57c746e5ad61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/hu/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/hu/thunderbird-115.10.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "a4b5f3b5675b54e12667ab0937a50a8d96869fcd832e9d8d87fd103e5938c6be"; + sha256 = "c050c63e38cdd80d57b1d06abad5f3810454523ce1f9c2bb4c25ed656d1f3102"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/hy-AM/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/hy-AM/thunderbird-115.10.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "9edefe8788e0497edc6e4000a16043f485ce521d5df4baede0645fb16e52311a"; + sha256 = "56536454c673a14a5166533f695d31168a6a64d14b69a5a344270b8e1a9b9754"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/id/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/id/thunderbird-115.10.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "6e30f98b85df9b828e8867b4e58db6b7fd185562fc2195c76ddbe196be23a15a"; + sha256 = "f6731b88513533b355b73293fac108f77c2a0a4c47e2e5ac4ab560a91c90cc4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/is/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/is/thunderbird-115.10.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "5a9295d0342affda3f2b1aa19ffd65414d7999cc6830e559f3daa74757a514fb"; + sha256 = "c9ba2344d981c83bf78e38f2d694db8ce34877dbd62cf4fe2657c31e4ddb8420"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/it/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/it/thunderbird-115.10.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "bba64e37a0133bb691a4a6686ce5306609a80f445fc8b56e65baa16d7d8055a2"; + sha256 = "c4e4c6956aff5ccc290a3fec4354c7cfff3bc9370917820208e270211730d3a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ja/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ja/thunderbird-115.10.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "1edd799ab0ec6277921783724c4bdcaa34b7e6ff812be387c346db4d0808a649"; + sha256 = "a998c41e9afc12fb0f79146271a88f45153ec640ccd5c62132f2081cf404f355"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ka/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ka/thunderbird-115.10.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "84aebac8730987c95f3f5b339b8e20abb107d72c61359bf9c4721c8a2a95805b"; + sha256 = "20d8145d782954c0647e416a062dff881370bbed4370d122a74f8d0854cc542f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/kab/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/kab/thunderbird-115.10.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1cfddc33c172f410ef42986f7b3cf699924b68f687d962fa72712a167cc0809b"; + sha256 = "065579cf33edb1ecceb56b5f3fa3a4b1f4f2da93dcf666aef859206fd30f515a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/kk/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/kk/thunderbird-115.10.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "729f782298fca07ca2d85546dfab3c76cb65d93ffa667ebbdb9d37ade60bdfe0"; + sha256 = "691b931acec550b087ec3950bb74f17b040bc0b8f9f9cf475603906a9fcaf5be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ko/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ko/thunderbird-115.10.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "1ff325f445014c8de6e20f3751f8e860a7d5926b49db22e6b11da30982d923dd"; + sha256 = "c91281e38d08a5c738ae3cf1be458566c998c0d65e588b0a463202a6bd19020b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/lt/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/lt/thunderbird-115.10.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f68c2036565210abaa1600edf452f56f0ee2a4ff5abe559c5a5ae91b69eb077f"; + sha256 = "6b9309f8f3c1191addb96770e4569fadb81de8f807790d9d00ad303d0d47a2e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/lv/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/lv/thunderbird-115.10.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "2aad0b4d05ae097f9868d44e14d24708b913aee3acb20ff917b31e83aa6b0580"; + sha256 = "d91fef64dde27d7b756327afa8b115e07c58906fc1bccb98ca893755e34a36bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ms/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ms/thunderbird-115.10.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "0b01eb8435a9d1a517892d510076c1ed6774820fe9194f00565b6febc3f296ed"; + sha256 = "9f2b25e37d18a39542d60257813d72a7075dca6dee2fe70e437de430cbeb2ee2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/nb-NO/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/nb-NO/thunderbird-115.10.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "19c4d4f33c13733e8ac803ac4b31c6dfdce690096a0069e3a5ce98880439089c"; + sha256 = "44fd3298de7c95033c47831484549fbd8121b463f2e904d51b43c9502e712c09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/nl/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/nl/thunderbird-115.10.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "c2c3cac2d43649bff80c1deadfa277f47436a9ca81c774513f032059a29aa634"; + sha256 = "067f544982f4174eee55d621a495e9c286f70a70d0ca072668a087e434906a2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/nn-NO/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/nn-NO/thunderbird-115.10.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "aaed36153be0f65e1af44bc25540f88e03500580390f8624a388f0667389e0f8"; + sha256 = "a60ca5cce0a272b2213312fc86930134c2d513fb8d7d8eea9c77de68f2fdbf0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/pa-IN/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/pa-IN/thunderbird-115.10.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "4035e2465ea039f20982a0e91fd216a39c7ddd0095cfd6ae60e394a48102c392"; + sha256 = "d5c43a67d0cb9146ef6d9b076ab04c37c22e26ee24e16867f2af497e752a8aab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/pl/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/pl/thunderbird-115.10.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "3e9a503f0fc39064c3d994160bbc3b52a9ab5b1c023a48dca8034407dc505250"; + sha256 = "0c9df1326d8b72f3492f690c34841fa4558452fd2a386b2724e8433470effda7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/pt-BR/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/pt-BR/thunderbird-115.10.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "642caf0a4792c2d101057cd0d7f90e9537571b9e3a8f0b396a4aa5e0564168ab"; + sha256 = "69fff4ee82f72116bcfabd82fc44fa9878e2d1b378120ab22958784e257b32d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/pt-PT/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/pt-PT/thunderbird-115.10.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "af59efb2183b11a73c019897eda156c55b95ce2d257b1a3124a984ada97120e9"; + sha256 = "ce4a6b8a0b81e7a481a08222671daf80c9ee1f0f6a41c1e10e9b060d1b64db23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/rm/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/rm/thunderbird-115.10.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "fea0f8a58ba8cd743dc625b9ec788574144cda664040936359a5b3b2c9ef480c"; + sha256 = "a45d5e83cbaf53a7c7d87e3c573719b03017f6fddfff7badce77b8a29012c404"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ro/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ro/thunderbird-115.10.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "fe82637776187b797e9472ab3a78fed34fe032b23d0a46c96dfa67da2a0a74c4"; + sha256 = "8e59f5a9da26c90e2841931c3a54f0416b425b9d084a97370d3794605fe9f815"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ru/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ru/thunderbird-115.10.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "3fab0c82c60d92bedef1a9e25d2aa9575adb946810f8f3abda7717f89e488ed2"; + sha256 = "fbdd472bc1d768fb7bc5491772326ffdda0fb48c2754e6dd6352dba20d2d221b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/sk/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sk/thunderbird-115.10.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "d505b5831f7f22a90668913e7993b2219dad771db35bceedc2643828f0c7d783"; + sha256 = "ffb92d870c91aeb8385d3a5a1aedd86198567861e8a8e9fe249671c42b9f0e8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/sl/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sl/thunderbird-115.10.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "36cb47d404234d732d103039ab1f313658188b8042eaea0e1a8f5e49d24ff8d1"; + sha256 = "e291960c5edbaf370afb39593e79e50d896942358fe1b19a0267c5cb68e09bbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/sq/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sq/thunderbird-115.10.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "3ba43c6e088e6fdca88ee78ca02cafd4b748a68c20ac0ed8cad8e8ba9b636220"; + sha256 = "613aec7a4f08bf323f75a8517deb27fe4957e7119c45e8c91628dadf51f9ec64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/sr/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sr/thunderbird-115.10.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b808b77217c2ff2b9f6e1deb9ba6255356d57885ab1eff1c315f2391b5b8ddb5"; + sha256 = "55b488eaf7dcc4fd0e1a8ca4720d82960a5a93a32e729f5b0b3b95e535971776"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/sv-SE/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sv-SE/thunderbird-115.10.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "7d6eb148002d3514c38d8f42d43263a631b1c5e47e4134e643dac542f283a6f5"; + sha256 = "e3ace007963edaa894c97701bf80acf2cdbd1609e2d0d23aeee56ec53aa4fc79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/th/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/th/thunderbird-115.10.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "14b851b5383cf3d55de003ed10d17ef36c3b30559ba88cc9132e525578e4af66"; + sha256 = "17a3032090164feaa68196709e19d8a255beed609e3b178ff08009efceb39c2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/tr/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/tr/thunderbird-115.10.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "73193cffd5587d744715d649fb6cd5ed5d030b0ba86084d21f82bb9f591d5e35"; + sha256 = "5eea9db6abfa816f30b0bfb0e6da6a5b9777edaea1fc451cce6ed3a5a44f7df4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/uk/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/uk/thunderbird-115.10.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "e52afbc0d3883e2984e5e37e911dec0e04fa583db3b0981833c3f29a2764fbba"; + sha256 = "300d12c8eb0f735996bcd443adba9252d5ec4267cf9348ecff8f4a9f22ad3afe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/uz/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/uz/thunderbird-115.10.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "160db3d3c7ea9c10337397a81fd9360c160aa0c5195d1be70d3ef3f714e85745"; + sha256 = "bc6707522482d5b01e2d908040f878322e79bee9e2121c041b340cf12634058f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/vi/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/vi/thunderbird-115.10.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "3ea81e0cb98da53b7b640d52454cf2cdebe2cffadbcad2b683a8e8da13659abf"; + sha256 = "b4cd7d36debe223a05a1539e33c951564aea27d392cd0d1f081f14b3cade6d7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/zh-CN/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/zh-CN/thunderbird-115.10.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "f54999ae86a4eea357e246abe4bfa6baa52f418c1d3ec882c48bcb7dfc4c8e11"; + sha256 = "956851f3eabd6345ebeb6719dc3e80dd30b66bf42c1078e02996dc5b0ea66e67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/zh-TW/thunderbird-115.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/zh-TW/thunderbird-115.10.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "8057a54b11112fc67661ffd3fb7f8ac4d532fee4c4c4029f10a21b7f5a9cf10e"; + sha256 = "93561ed61edb07a8a4882e0687db51238d31f7d6c04919b39b3e88156d3be132"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 5a55476d4b..bb987de732 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -1,56 +1,17 @@ -{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu, fetchpatch2 }: +{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu, fetchpatch2, config }: rec { thunderbird = thunderbird-115; - thunderbird-102 = (buildMozillaMach rec { - pname = "thunderbird"; - version = "102.14.0"; - application = "comm/mail"; - applicationName = "Mozilla Thunderbird"; - binaryName = pname; - src = fetchurl { - url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - hash = "sha512-SuPyFoM67FVCH4J9VbwbX8LwrU/v7LJ3JKW+MxjDUd8k0wpIl7kk5zPtLjmVvihLbRNQSdRgARQ/sclh/vwYMA=="; - }; - extraPatches = [ - # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. - ./no-buildconfig.patch - ]; - - meta = with lib; { - changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; - description = "A full-featured e-mail client"; - homepage = "https://thunderbird.net/"; - mainProgram = "thunderbird"; - maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; - platforms = platforms.unix; - badPlatforms = platforms.darwin; - broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". - # not in `badPlatforms` because cross-compilation on 64-bit machine might work. - license = licenses.mpl20; - knownVulnerabilities = [ "Thunderbird 102 support has ended" ]; - }; - updateScript = callPackage ./update.nix { - attrPath = "thunderbird-unwrapped"; - versionPrefix = "102"; - }; - }).override { - geolocationSupport = false; - webrtcSupport = false; - - pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" - }; - thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.10.1"; + version = "115.10.2"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "0324811d3e7e6228bb45cbf01e8a4a08b8386e22d1b52eb79f9a9a3bda940eb9d534ec1230961e9a998a0162c299a1ad49d23c5fbfa8e287896bcc0fd1c398e0"; + sha512 = "e893cba882fe3fba516758b8822fa16a6c5b1f633cd2877a91357255f956be32b55ee671ab8ebc4372f116848d4fb67a2220a673c8d5f3c95952ba266d99cd67"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. @@ -91,3 +52,7 @@ rec { }); }; } + // lib.optionalAttrs config.allowAliases { + thunderbird-102 = throw "Thunderbird 102 support ended in September 2023"; +} + diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 7e0430c1cd..44597be716 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -5,20 +5,18 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "220.240321.0"; + version = "227.240502.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-LbvldnhvKHvBEaOwkxA2acuUKMcYi16ceYPuMW73qLs="; + hash = "sha256-D7qWwIFuCJmBvfdgf4Dsd2/jvi39tbAttaHOwLND4DY="; }; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = let appimageContents = appimageTools.extract { inherit pname version src; }; in '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -Dm 444 ${appimageContents}/tutanota-desktop.desktop -t $out/share/applications install -Dm 444 ${appimageContents}/tutanota-desktop.png -t $out/share/pixmaps diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix index 20775c4ed4..7677abfb0c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix @@ -10,6 +10,7 @@ nodePackages.n8n.override { nativeBuildInputs = [ pkgs.nodePackages.node-pre-gyp pkgs.which + pkgs.xcbuild ]; buildInputs = [ @@ -30,6 +31,9 @@ nodePackages.n8n.override { # makes libmongocrypt bindings not look for static libraries in completely wrong places BUILD_TYPE = "dynamic"; + # Disable NAPI_EXPERIMENTAL to allow to build with Node.js≥18.20.0. + NIX_CFLAGS_COMPILE = "-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT"; + dontNpmInstall = true; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix b/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix index 6a3de13087..2ec3c24b69 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-M2DY+C0g8G+DjicMeT3Ojn4GzG7vaE1OHKSy7O6T1Kk="; + hash = "sha256-eY0L8dgFTZmkwSXYKCOOnNbFgxTydNoVHEoZBS3oMwM="; }; - vendorHash = "sha256-SUu0OvHCmlssH9HbAaMbiG0gF/ezxgf1n0HBiB/2PTs="; + vendorHash = "sha256-RRSkdDo6N8742YjzORGOTCzqH7WcSraJger8XOryqio="; inherit subPackages; diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix index 06ec0b3045..8b55f12732 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -3,7 +3,7 @@ , pkg-config , intltool , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , glib , libxml2 , libxslt @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 python3Packages.wrapPython intltool pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix index eb9b5ad3af..3a8418e48b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "pan"; - version = "0.157"; + version = "0.158"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = "v${version}"; - hash = "sha256-+zzAnppP6ICIhhlqXGVF4h/yIDa6oE1lxenmzcr2BQo="; + hash = "sha256-gcs3TsUzZAW8PhNPMzyOfwu+2SNynjRgfxdGIfAHrpA="; }; nativeBuildInputs = [ autoreconfHook pkg-config gettext intltool itstool libxml2 makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/raven-reader/default.nix index 46970cbef1..811a0d747f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/raven-reader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/raven-reader/default.nix @@ -14,8 +14,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - mkdir -p $out/share/${pname} cp -a ${appimageContents}/locales $out/share/${pname} cp -a ${appimageContents}/resources $out/share/${pname} diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch index 260a7dd4dd..56cc005733 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch @@ -8,12 +8,13 @@ Subject: [PATCH] Explicitly copy dbus files into the store dir 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt -index 2e7349ef7..512d4b188 100644 +index b4434d0..b57e033 100644 --- a/shell_integration/libcloudproviders/CMakeLists.txt +++ b/shell_integration/libcloudproviders/CMakeLists.txt -@@ -1,5 +1,6 @@ - macro(dbus_add_activation_service _sources) +@@ -4,6 +4,7 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28.0") + else() pkg_get_variable(_install_dir dbus-1 session_bus_services_dir) + endif() + set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service") foreach (_i ${_sources}) get_filename_component(_service_file ${_i} ABSOLUTE) diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index a6d88fc686..7e78fb5e65 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.12.3"; + version = "3.13.0"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - hash = "sha256-ScWkEOx2tHoCQbFwBvJQgk2YoYOTPi3PrVsaDNJBEUI="; + hash = "sha256-i4vQGH9NSxIrLaPdCEh+WN6i6NQilH6uO4dSk/mhLi8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix index 678e9f68ee..0661a3f9db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.42.0"; + version = "1.43.3"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-aQUz6FK04h3nzieK9fX7odVVt/zcdhXlX3T1Z1rN/ak="; + sha256 = "sha256-sltTvjEfUZsmXDEyN+Zyck7oqZ+Xu8xScNnitt/0eic="; }; - vendorHash = "sha256-DATSGSFRMrX972CWCiSIlOhDuAG3zcVyuILZ3IpVirM="; + vendorHash = "sha256-U5LJF1RX0ZS0PhjQTZKXrJo89WPfSZaVbgskWcYNlJY="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix index 3d675d04d5..49ce4fae12 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix @@ -1,20 +1,18 @@ { lib , stdenv , buildPythonApplication -, cepa , colorama , fetchFromGitHub +, fetchpatch , flask , flask-compress -, flask-httpauth , flask-socketio -, gevent-socketio , gevent-websocket , obfs4 , psutil +, packaging , pycrypto , pynacl -, pyqt5 , pyside6 , pysocks , pytestCheckHook @@ -22,10 +20,12 @@ , qt5 , requests , snowflake +, stem , substituteAll , tor , unidecode , waitress +, werkzeug }: let @@ -79,23 +79,25 @@ rec { }) ]; propagatedBuildInputs = [ - cepa colorama flask flask-compress - flask-httpauth flask-socketio - gevent-socketio gevent-websocket + packaging psutil pycrypto pynacl pyside6 + pysocks + qrcode qrcode requests + stem unidecode waitress - ]; + werkzeug + ] ++ requests.optional-dependencies.socks; buildInputs = [ obfs4 @@ -138,19 +140,25 @@ rec { inherit tor meek obfs4 snowflake; inherit (tor) geoip; }) + + # https://github.com/onionshare/onionshare/pull/1903 + (fetchpatch { + url = "https://github.com/onionshare/onionshare/pull/1903/commits/f20db8fcbd18e51b58814ae8f98f3a7502b4f456.patch"; + stripLen = 1; + hash = "sha256-wfIjdPhdUYAvbK5XyE1o2OtFOlJRj0X5mh7QQRjdyP0="; + }) ]; propagatedBuildInputs = [ onionshare - psutil - pyqt5 pyside6 - pysocks qrcode ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + buildInputs = [ qt5.qtwayland ]; + postInstall = '' mkdir -p $out/share/{appdata,applications,icons} cp $src/org.onionshare.OnionShare.desktop $out/share/applications diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix index 35db62ef8e..8c3d76d755 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix @@ -7,7 +7,7 @@ , glib , gobject-introspection , librsvg -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -54,7 +54,7 @@ let glib ] ++ optionals withGUI [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; nativeCheckInputs = with pypkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/flood/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/flood/default.nix index 8ee94f17e5..85ef8b2130 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/flood/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/flood/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "flood"; - version = "unstable-2023-06-03"; + version = "4.8.2"; src = fetchFromGitHub { owner = "jesec"; repo = pname; - rev = "2b652f8148dab7134eeeb201b9d81dd6b8bda074"; - hash = "sha256-wI6URPGUZUbydSgNaHN2C5IA2x/HHjBWIRT6H6iZU/0="; + rev = "v${version}"; + hash = "sha256-Ejr0pmWIuYByzDS+iFTECO/aymzuJrJjaaW7HikNt2w="; }; - npmDepsHash = "sha256-XmDnvq+ni5TOf3UQFc4JvGI3LiGpjbrLAocRvrW8qgk="; + npmDepsHash = "sha256-md76I7W5QQvfbOmk5ODssMtJAVOj8nvaJ2PakEZ8WUA="; meta = with lib; { description = "Modern web UI for various torrent clients with a Node.js backend and React frontend"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix index 640ffeef75..633a8da087 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -8,7 +8,7 @@ , libsodium , libxml2 , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs= [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/libutp/3.4.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/libutp/3.4.nix index 6f543789fd..35a3b0a8f6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/libutp/3.4.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/libutp/3.4.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libutp"; - version = "unstable-2023-11-14"; + version = "0-unstable-2023-11-14"; src = fetchFromGitHub { # Use transmission fork from post-3.4-transmission branch diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix index 672a0c79fb..07c4ca3392 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,7 +10,7 @@ , qtbase , qtsvg , qttools -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , guiSupport ? true @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/storrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/storrent/default.nix index 469eae7987..a4dc0b459c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/storrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/storrent/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { mainProgram = "storrent"; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix index 707ff45b34..70259e087b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "transgui"; - version = "unstable-2024-02-26"; + version = "5.18.0-unstable-2024-02-26"; src = fetchFromGitHub { owner = "transmission-remote-gui"; @@ -60,7 +60,9 @@ stdenv.mkDerivation rec { cp -r "./lang" "$out/share/transgui" ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = { description = "A cross platform front-end for the Transmission BitTorrent client"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 35c368a826..059a7371eb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -17,7 +17,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix index 75515ef414..ebd8260776 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix @@ -26,7 +26,7 @@ , enableGTK3 ? false , gtkmm3 , xorg -, wrapGAppsHook +, wrapGAppsHook3 , enableQt5 ? false , enableQt6 ? false , qt5 @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { cmake python3 ] - ++ optionals enableGTK3 [ wrapGAppsHook ] + ++ optionals enableGTK3 [ wrapGAppsHook3 ] ++ optionals enableQt5 [ qt5.wrapQtAppsHook ] ++ optionals enableQt6 [ qt6Packages.wrapQtAppsHook ] ; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix index 58de6fa975..2804f76f8e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix @@ -21,7 +21,7 @@ , enableGTK3 ? false , gtk3 , xorg -, wrapGAppsHook +, wrapGAppsHook3 , enableQt ? false , qt5 , nixosTests @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config cmake ] - ++ lib.optionals enableGTK3 [ wrapGAppsHook ] + ++ lib.optionals enableGTK3 [ wrapGAppsHook3 ] ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ] ; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix index 8283a2ec4b..b513d35f2a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "XD"; - version = "0.4.4"; + version = "0.4.6"; src = fetchFromGitHub { owner = "majestrate"; repo = "XD"; rev = "v${version}"; - sha256 = "sha256-YUstYGIED6ivt+p+aHIK76dLCj+xjytWnZrra49cCi8="; + sha256 = "sha256-k8Mm0tC7wiBmHFdCX38Rz7ccEFkdeArzGJVHTLQ7iWY="; }; - vendorHash = "sha256-wO+IICtGVHhrPa1JUwlx+PuNS32FJNKYmboLd3lFl4w="; + vendorHash = "sha256-ZD7PZJcY7qWHEQOk5I9IlMup0vbYYaRvVau5Go7ocno="; nativeCheckInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index 8b04fc7e3f..f811ce742b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-xjpySIbt7f86PRR/9F1DXMc0G+pBq3/75STW6Zw6IhE="; + hash = "sha256-V2PevO9jhtKMrFVlviKPwcApP4ZTRbCLVoPx0gGNosU="; }; - vendorHash = "sha256-cgQcI6yrnc5BUuyOkaYu24GzCaGe+BgXOC2zdt1Z1Lg="; + vendorHash = "sha256-qi6ME74pJH/wgDh0xp/Rsc9hPd3v3L/M8pBQJzNieK8="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix index e273a32427..19081bd138 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , gobject-introspection , setuptools -, wrapGAppsHook +, wrapGAppsHook3 , dbus-python , packaging , proton-core @@ -27,21 +27,21 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.1.10"; + version = "4.3.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; rev = "refs/tags/v${version}"; - hash = "sha256-D06dMMjzFE7gIGFpIH/+0xmVCckqAWLkb3lc2ZmxNZs="; + hash = "sha256-H4m4u9zksab47W5aIsQZPQTPEYiXbmrVCnT67b+A5Tc="; }; nativeBuildInputs = [ # Needed for the NM namespace gobject-introspection setuptools - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = lib.optionals withIndicator [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/legacy.nix b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/legacy.nix index 7464a279cf..32828b5590 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/legacy.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonvpn-gui/legacy.nix @@ -2,7 +2,7 @@ , buildPythonApplication , fetchFromGitHub , setuptools -, wrapGAppsHook +, wrapGAppsHook3 , gdk-pixbuf , glib-networking , gobject-introspection @@ -35,7 +35,7 @@ buildPythonApplication rec { gobject-introspection imagemagick setuptools - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix index 09304784d3..61c62fb95e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix @@ -1,13 +1,15 @@ { lib, fetchPypi, nixosTests, python3 }: python3.pkgs.buildPythonApplication rec { - version = "0.5.0b3.dev80"; + version = "0.5.0b3.dev85"; pname = "pyload-ng"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-1vIkEctoj6udowYxFwY42f/zL9Elw2Nl6ZaL2x30k/M="; + inherit version; + # The uploaded tarball uses an underscore in recent releases + pname = "pyload_ng"; + hash = "sha256-KLpfh53JKqe0kZLcQ1C4fXFFYeO5pPhia9fRxWsbIHY="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix index 08e428b18b..ef1c08ef2d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix @@ -5,16 +5,16 @@ let description = "Desktop sharing application, providing remote support and online meetings"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "anydesk"; - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { urls = [ - "https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" - "https://download.anydesk.com/linux/generic-linux/anydesk-${version}-amd64.tar.gz" + "https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz" + "https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz" ]; - hash = "sha256-qVksva6+EfAQiOexP8NlDSCR5Ab2WGsuCG4BD87rlag="; + hash = "sha256-nSY4qHRsEvQk4M3JDHalAk3C6Y21WlfDQ2Gpp6/jjMs="; }; buildInputs = [ @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { postFixup = '' patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "${lib.makeLibraryPath buildInputs}" \ + --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" \ $out/bin/anydesk # pangox is not actually necessary (it was only added as a part of gtkglext) @@ -77,12 +77,12 @@ in stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { inherit description; homepage = "https://www.anydesk.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ shyim cheriimoya ]; + maintainers = with lib.maintainers; [ shyim cheriimoya ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix index f751f3237e..96074b3fd7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more +{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more , file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { makeWrapper more which - wrapGAppsHook + wrapGAppsHook3 libfaketime ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/3.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/3.nix new file mode 100644 index 0000000000..3181e5d676 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/3.nix @@ -0,0 +1,208 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, docbook-xsl-nons +, libxslt +, pkg-config +, alsa-lib +, faac +, faad2 +, ffmpeg +, fuse3 +, glib +, openh264 +, openssl +, pcre2 +, pkcs11helper +, uriparser +, zlib +, libX11 +, libXcursor +, libXdamage +, libXdmcp +, libXext +, libXi +, libXinerama +, libXrandr +, libXrender +, libXtst +, libXv +, libxkbcommon +, libxkbfile +, wayland +, wayland-scanner +, icu +, libunwind +, orc +, cairo +, cjson +, libusb1 +, libpulseaudio +, cups +, pcsclite +, SDL2 +, SDL2_ttf +, SDL2_image +, systemd +, libjpeg_turbo +, libkrb5 +, libopus +, buildServer ? true +, nocaps ? false +, AudioToolbox +, AVFoundation +, Carbon +, Cocoa +, CoreMedia +, withUnfree ? false + + # tries to compile and run generate_argument_docbook.c +, withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform + +, buildPackages +}: + +let + cmFlag = flag: if flag then "ON" else "OFF"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "freerdp"; + version = "3.5.1"; + + src = fetchFromGitHub { + owner = "FreeRDP"; + repo = "FreeRDP"; + rev = finalAttrs.version; + hash = "sha256-8yWMnwJbvyUiEuX+2bEim1IeqPx20u9yvNIVe7MC/ZQ="; + }; + + postPatch = '' + export HOME=$TMP + + # skip NIB file generation on darwin + substituteInPlace "client/Mac/CMakeLists.txt" "client/Mac/cli/CMakeLists.txt" \ + --replace-fail "if (NOT IS_XCODE)" "if (FALSE)" + + substituteInPlace "libfreerdp/freerdp.pc.in" \ + --replace-fail "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@" + '' + lib.optionalString (pcsclite != null) '' + substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \ + --replace-fail "libpcsclite.so" "${lib.getLib pcsclite}/lib/libpcsclite.so" + '' + lib.optionalString nocaps '' + substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \ + --replace-fail "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL" + ''; + + nativeBuildInputs = [ + cmake + libxslt + docbook-xsl-nons + pkg-config + wayland-scanner + ]; + + buildInputs = [ + cairo + cjson + cups + faad2 + ffmpeg + glib + icu + libX11 + libXcursor + libXdamage + libXdmcp + libXext + libXi + libXinerama + libXrandr + libXrender + libXtst + libXv + libjpeg_turbo + libkrb5 + libopus + libpulseaudio + libunwind + libusb1 + libxkbcommon + libxkbfile + openh264 + openssl + orc + pcre2 + pcsclite + pkcs11helper + SDL2 + SDL2_ttf + SDL2_image + uriparser + zlib + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + fuse3 + systemd + wayland + ] ++ lib.optionals stdenv.isDarwin [ + AudioToolbox + AVFoundation + Carbon + Cocoa + CoreMedia + ] ++ lib.optionals withUnfree [ + faac + ]; + + # https://github.com/FreeRDP/FreeRDP/issues/8526#issuecomment-1357134746 + cmakeFlags = [ + "-Wno-dev" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook" + "-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner" + ] ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") { + BUILD_TESTING = false; # false is recommended by upstream + WITH_CAIRO = (cairo != null); + WITH_CUPS = (cups != null); + WITH_FAAC = (withUnfree && faac != null); + WITH_FAAD2 = (faad2 != null); + WITH_FUSE = (stdenv.isLinux && fuse3 != null); + WITH_JPEG = (libjpeg_turbo != null); + WITH_KRB5 = (libkrb5 != null); + WITH_OPENH264 = (openh264 != null); + WITH_OPUS = (libopus != null); + WITH_OSS = false; + WITH_MANPAGES = withManPages; + WITH_PCSC = (pcsclite != null); + WITH_PULSE = (libpulseaudio != null); + WITH_SERVER = buildServer; + WITH_WEBVIEW = false; # avoid introducing webkit2gtk-4.0 + WITH_VAAPI = false; # false is recommended by upstream + WITH_X11 = true; + }; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + "-DTARGET_OS_IPHONE=0" + "-DTARGET_OS_WATCH=0" + "-include AudioToolbox/AudioToolbox.h" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=incompatible-function-pointer-types" + ]); + + env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + "-framework AudioToolbox" + ]); + + meta = with lib; { + description = "A Remote Desktop Protocol Client"; + longDescription = '' + FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) + following the Microsoft Open Specifications. + ''; + homepage = "https://www.freerdp.com/"; + license = licenses.asl20; + maintainers = with maintainers; [ peterhoeg lheckemann ]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix index fc3cbbcd11..0366e91515 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix @@ -76,13 +76,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.11.5"; + version = "2.11.7"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - hash = "sha256-WyYBIiIQNDHydJqU3jWNItJU2/sYnRpGHCXE9Xhom5M="; + hash = "sha256-w+xyMNFmKylSheK0yAGl8J6MXly/HUjjAfR9Qq3s/kA="; }; postPatch = '' @@ -205,6 +205,7 @@ stdenv.mkDerivation rec { following the Microsoft Open Specifications. ''; homepage = "https://www.freerdp.com/"; + changelog = "https://github.com/FreeRDP/FreeRDP/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg lheckemann ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 0722561cb6..6898d0f66d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/nice-dcv-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -20,7 +20,7 @@ , python3Packages , cpio , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-iLz25SB5v7ghkAZOMGPmpNaPihd8ikzCQS//r1xBNRU="; }; - nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook python3Packages.rpm ]; + nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook3 python3Packages.rpm ]; unpackPhase = '' rpm2cpio $src | ${cpio}/bin/cpio -idm ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index 0fd2de49da..a754fcb33f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -1,7 +1,8 @@ -{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook3 +, curl, fuse3 , desktopToDarwinBundle , glib, gtk3, gettext, libxkbfile, libX11, python3 -, freerdp, libssh, libgcrypt, gnutls, vte +, freerdp3, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, libsoup_3, spice-protocol, spice-gtk, libepoxy, at-spi2-core @@ -16,22 +17,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "remmina"; - version = "1.4.33"; + version = "1.4.35"; src = fetchFromGitLab { - owner = "Remmina"; - repo = "Remmina"; - rev = "v.${finalAttrs.version}"; - sha256 = "sha256-3HyG2PBnTq/fVsvWA81fQ2gCOoAxINWeUDwzKcOuECk="; + owner = "Remmina"; + repo = "Remmina"; + rev = "v${finalAttrs.version}"; + hash = "sha256-0z2fcBnChCBYPxyFm/xpAW0jHaUGA92NQgjt+lWFUnM="; }; - nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ] + nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ + curl fuse3 gsettings-desktop-schemas glib gtk3 gettext libxkbfile libX11 - freerdp libssh libgcrypt gnutls + freerdp3 libssh libgcrypt gnutls pcre2 libvncserver libpthreadstubs libXdmcp libxkbcommon libsoup_3 spice-protocol @@ -46,15 +48,12 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withVte [ vte ]; cmakeFlags = [ + "-DWITH_FREERDP3=ON" "-DWITH_VTE=${if withVte then "ON" else "OFF"}" "-DWITH_TELEPATHY=OFF" "-DWITH_AVAHI=OFF" "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" - "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2" ] ++ lib.optionals stdenv.isDarwin [ "-DHAVE_LIBAPPINDICATOR=OFF" "-DWITH_CUPS=OFF" @@ -82,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { license = licenses.gpl2Plus; homepage = "https://gitlab.com/Remmina/Remmina"; + changelog = "https://gitlab.com/Remmina/Remmina/-/blob/master/CHANGELOG.md#${lib.replaceStrings ["."] [""] finalAttrs.src.rev}"; description = "Remote desktop client written in GTK"; mainProgram = "remmina"; maintainers = with maintainers; [ bbigras melsigl ryantm ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/default.nix index ed3027afe8..d1b0facf7f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , atk , bzip2 , cairo @@ -31,6 +31,7 @@ , darwin , alsa-lib , makeDesktopItem +, copyDesktopItems }: rustPlatform.buildRustPackage rec { @@ -83,9 +84,10 @@ rustPlatform.buildRustPackage rec { ]; nativeBuildInputs = [ + copyDesktopItems pkg-config rustPlatform.bindgenHook - wrapGAppsHook + wrapGAppsHook3 ]; buildFeatures = lib.optionals stdenv.isLinux [ "linux-pkg-config" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix index 82a98c0579..9422223ae0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix @@ -10,6 +10,7 @@ , qtwebengine , qtx11extras , qtquickcontrols2 +, qtgraphicaleffects , getconf , glibc , libXrandr @@ -51,7 +52,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ]; - buildInputs = [ qtbase qtwebengine qtx11extras qtquickcontrols2 icu63 ]; + buildInputs = [ qtbase qtwebengine qtx11extras qtquickcontrols2 qtgraphicaleffects icu63 ]; installPhase = '' mkdir -p $out/share/teamviewer $out/bin $out/share/applications diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index da92226507..6b1630594b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -148,6 +148,6 @@ stdenv.mkDerivation { homepage = "https://www.vmware.com/go/viewclients"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ buckley310 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix index 3d6d1de3d9..5c0dd23a9e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix @@ -19,22 +19,11 @@ , lame , pixman , libjpeg_turbo +, _experimental-update-script-combinators +, gitUpdater }: let - version = "0.9.25.1"; - patchedXrdpSrc = applyPatches { - patches = [ ./dynamic_config.patch ]; - name = "xrdp-patched-${version}"; - src = fetchFromGitHub { - owner = "neutrinolabs"; - repo = "xrdp"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-oAs0oWkCyj3ObdJuHLfT25ZzkTrxNAXDiFU64OOP4Ow="; - }; - }; - xorgxrdp = stdenv.mkDerivation rec { pname = "xorgxrdp"; version = "0.9.20"; @@ -62,16 +51,29 @@ let preConfigure = "./bootstrap"; - configureFlags = [ "XRDP_CFLAGS=-I${patchedXrdpSrc}/common" ]; + configureFlags = [ "XRDP_CFLAGS=-I${xrdp.src}/common" ]; enableParallelBuilding = true; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; }; - xrdp = stdenv.mkDerivation { - inherit version; + xrdp = stdenv.mkDerivation rec { pname = "xrdp"; + version = "0.9.25.1"; - src = patchedXrdpSrc; + src = applyPatches { + inherit version; + patches = [ ./dynamic_config.patch ]; + name = "xrdp-patched-${version}"; + src = fetchFromGitHub { + owner = "neutrinolabs"; + repo = "xrdp"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-oAs0oWkCyj3ObdJuHLfT25ZzkTrxNAXDiFU64OOP4Ow="; + }; + }; nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ]; @@ -150,6 +152,15 @@ let enableParallelBuilding = true; + passthru = { + inherit xorgxrdp; + updateScript = _experimental-update-script-combinators.sequence (map (item: item.command) [ + (gitUpdater { rev-prefix = "v"; attrPath = "xrdp.src"; ignoredVersions = [ "beta" ]; }) + { command = ["rm" "update-git-commits.txt"]; } + (gitUpdater { rev-prefix = "v"; attrPath = "xrdp.xorgxrdp"; }) + ]); + }; + meta = with lib; { description = "An open source RDP server"; homepage = "https://github.com/neutrinolabs/xrdp"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix index 86dc913b91..c83d08fc82 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix @@ -1,11 +1,11 @@ { stdenv , fetchFromGitHub , lib -, nix-update-script , pulseaudio , autoreconfHook , pkg-config , nixosTests +, gitUpdater }: stdenv.mkDerivation rec { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { }; + updateScript = gitUpdater { rev-prefix = "v"; }; tests = { inherit (nixosTests) xrdp-with-audio-pulseaudio; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index b41e535b05..ba144e83d6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.62"; + version = "3.66"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-z4RyrrM27krm54iVWKDbMB14MiiydLj4Z/RdjYMZxh0="; + hash = "sha256-1hK7FEBfLWh1LVtuhELAvZFyMK1bpOSnBg78aIRK8LY="; }; - vendorHash = "sha256-WAGuaL8kDtMUDkHetWagCGZS91Y3Tg2DV2StKgRpuIg="; + vendorHash = "sha256-ly1opQmYL8zRKtLTMFo5Ek9ofEtn1YwmfhVuWfACKxY="; subPackages = [ "weed" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index 66662b7f05..9a50dcb17f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.14.3"; + version = "0.15.1"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-XnkU/I41x6JqrH5D6JGw1fgdiNfiMOBy9DUUXzKwkGg="; + hash = "sha256-QwbxGym0eesCzrT//1+Hcr15B4nFck5u1VNRU8xE3Qo="; }; modRoot = "./agent"; - vendorHash = "sha256-nuFgJc1xQU4X86ojdFzs+9Gp3HDLsw3tkMcprlXCrko="; + vendorHash = "sha256-JlfQRYdmxghGrKGwrn8jK1m32EhskmhMiyxNHZma0N0="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index d91b2540f7..d7d9d68bf3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -42,7 +42,7 @@ , spandsp3 , speexdsp , SystemConfiguration -, wrapGAppsHook +, wrapGAppsHook3 , zlib , zstd @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { python3 ] ++ lib.optionals withQt [ qt6.wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/station/default.nix b/third_party/nixpkgs/pkgs/applications/networking/station/default.nix index 43392ae28e..b3235ba515 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/station/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/station/default.nix @@ -3,7 +3,6 @@ let pname = "station"; version = "1.52.2"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/getstation/desktop-app-releases/releases/download/${version}/Station-${version}-x86_64.AppImage"; @@ -11,19 +10,16 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; profile = '' export LC_ALL=C.UTF-8 ''; - multiArch = false; - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/browserx.png \ $out/share/icons/hicolor/512x512/apps/browserx.png diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/lcsync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/lcsync/default.nix index 591a95fd00..ac4731d853 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/lcsync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/lcsync/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation (finalAttrs: { name = "lcsync"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "librecast"; repo = "lcsync"; rev = "v${finalAttrs.version}"; - hash = "sha256-RVfa0EmCPPT7ndy94YwD24S9pj7L11ztISaKHGcbTS8="; + hash = "sha256-eiYbS/LYnM2ZjDHO9KhBp1rrovbhm+OVVfmLtjxAE+Y="; }; buildInputs = [ lcrq librecast libsodium ]; configureFlags = [ "SETCAP_PROGRAM=true" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index 3b9727e291..0ffd47435f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -64,6 +64,6 @@ buildGoModule rec { changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md"; license = licenses.mit; mainProgram = "rclone"; - maintainers = with maintainers; [ marsam SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 tomfitzhenry ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch deleted file mode 100644 index 3305653d02..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup rsync-3.2.7/configure.sh rsync-3.2.7-fixed/configure.sh ---- rsync-3.2.7/configure.sh 2022-10-20 17:57:22 -+++ rsync-3.2.7-fixed/configure.sh 2024-01-01 19:51:58 -@@ -7706,7 +7706,7 @@ else $as_nop - #include - #include - #include --main() -+int main() - { - if (socket(AF_INET6, SOCK_STREAM, 0) < 0) - exit(1); diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix index 8fb6079791..8846bea0a4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix @@ -20,24 +20,16 @@ stdenv.mkDerivation rec { pname = "rsync"; - version = "3.2.7"; + version = "3.3.0"; src = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; - sha256 = "sha256-Tn2dP27RCHjFjF+3JKZ9rPS2qsc0CxPkiPstxBNG8rs="; + hash = "sha256-c5nppnCMMtZ4pypjIZ6W8jvgviM25Q/RNISY0HBB35A="; }; nativeBuildInputs = [ perl ]; - patches = [ - # https://github.com/WayneD/rsync/issues/511#issuecomment-1774612577 - # original source: https://build.opensuse.org/package/view_file/network/rsync/rsync-fortified-strlcpy-fix.patch?expand=1&rev=3f8dd2f4a404c96c0f69176e60893714 - ./rsync-fortified-strlcpy-fix.patch - # https://github.com/WayneD/rsync/pull/558 - ./configure.ac-fix-failing-IPv6-check.patch - ]; - buildInputs = [ libiconv zlib popt ] ++ lib.optional enableACLs acl ++ lib.optional enableZstd zstd diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch deleted file mode 100644 index 296445b4bb..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1f83963f59960150e8c46112daa8411324c1f209 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby -Date: Fri, 18 Aug 2023 08:26:20 +0200 -Subject: [PATCH] exclude: fix crashes with fortified strlcpy() - -Fortified (-D_FORTIFY_SOURCE=2 for gcc) builds make strlcpy() crash when -its third parameter (size) is larger than the buffer: - $ rsync -FFXHav '--filter=merge global-rsync-filter' Align-37-43/ xxx - sending incremental file list - *** buffer overflow detected ***: terminated - -It's in the exclude code in setup_merge_file(): - strlcpy(y, save, MAXPATHLEN); - -Note the 'y' pointer was incremented, so it no longer points to memory -with MAXPATHLEN "owned" bytes. - -Fix it by remembering the number of copied bytes into the 'save' buffer -and use that instead of MAXPATHLEN which is clearly incorrect. - -Fixes #511. ---- - exclude.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/exclude.c b/exclude.c -index ffe55b167..1a5de3b9e 100644 ---- a/exclude.c -+++ b/exclude.c -@@ -720,7 +720,8 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, - parent_dirscan = True; - while (*y) { - char save[MAXPATHLEN]; -- strlcpy(save, y, MAXPATHLEN); -+ /* copylen is strlen(y) which is < MAXPATHLEN. +1 for \0 */ -+ size_t copylen = strlcpy(save, y, MAXPATHLEN) + 1; - *y = '\0'; - dirbuf_len = y - dirbuf; - strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf)); -@@ -734,7 +735,7 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, - lp->head = NULL; - } - lp->tail = NULL; -- strlcpy(y, save, MAXPATHLEN); -+ strlcpy(y, save, copylen); - while ((*x++ = *y++) != '/') {} - } - parent_dirscan = False; - diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix index d521080460..d2505a1a56 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.102.2"; + version = "1.104.1"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-GpHX34iHKeoT7AuEf76QTpTIrATLZyAoUxMoIouhvyA="; + hash = "sha256-wB8SK91eJp+8Jjc/bfMqDQQC3FYtSLEjpqVdxEq9P3c="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-atIb/SmOShLIhvEsTcegX7+xoDXN+SI5a7TQrXpqdUg="; + vendorHash = "sha256-Eo6JHcTcfC8zmKZh9sXrZ90RhIgdEBgTldIUnvNm8ms="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix index 521453e5ec..34eef64b9f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { pname = "wdt"; - version = "unstable-2024-02-05"; + version = "1.27.1612021-unstable-2024-02-05"; src = fetchFromGitHub { owner = "facebook"; @@ -37,7 +37,9 @@ stdenv.mkDerivation { ]; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix index 36b6b5c143..4321868a0d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , buildPythonApplication -, fetchpatch , pem , pyside6 , twisted @@ -14,7 +13,7 @@ buildPythonApplication rec { pname = "syncplay"; - version = "1.7.0"; + version = "1.7.2"; format = "other"; @@ -22,15 +21,10 @@ buildPythonApplication rec { owner = "Syncplay"; repo = "syncplay"; rev = "v${version}"; - sha256 = "sha256-Te81yOv3D6M6aMfC5XrM6/I6BlMdlY1yRk1RRJa9Mxg="; + sha256 = "sha256-PERPE6141LXmb8fmW17Vu54Unpf9vEK+ahm6q1byRTU="; }; patches = [ - (fetchpatch { - name = "fix-typeerror.patch"; - url = "https://github.com/Syncplay/syncplay/commit/b62b038cdf58c54205987dfc52ebf228505ad03b.patch"; - hash = "sha256-pSP33Qn1I+nJBW8T1E1tSJKRh5OnZMRsbU+jr5z4u7c="; - }) ./trusted_certificates.patch ]; @@ -52,6 +46,6 @@ buildPythonApplication rec { description = "Free software that synchronises media players"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ Enzime ]; + maintainers = with maintainers; [ assistant Enzime ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix index 70c3950661..2535675c64 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -13,13 +13,13 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.27.6"; + version = "1.27.7"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-BZAje6dA3wmJ6feHWIYPPYTA3sp1WGwl4MjUJS7iZCo="; + hash = "sha256-Y/gwQfb3ShOsXsNLomtqUlmYaw7FQQ6IUN1fHSYOouQ="; }; vendorHash = "sha256-xVSSFFTqU7jww8YTeXKfa3096c2FmEgkcXvuqFHb12E="; @@ -66,7 +66,7 @@ let description = "Open Source Continuous File Synchronization"; changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}"; license = licenses.mpl20; - maintainers = with maintainers; [ joko peterhoeg andrew-d ]; + maintainers = with maintainers; [ joko peterhoeg ]; mainProgram = target; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix b/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix deleted file mode 100644 index babdff54f1..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd -, qrencode, libsodium, libtool, libunistring, pkg-config, postgresql -, autoreconfHook, python3, recutils, wget, jq, gettext, texinfo -}: - -let - version = "0.10.1"; - - taler-wallet-core = fetchgit { - url = "https://git.taler.net/wallet-core.git"; - rev = "v${version}"; - hash = "sha256-sgiJd1snN9JDqS7IUeORKL60Gcm7XwL/JCX3sNRDTdY="; - }; - - taler-exchange = stdenv.mkDerivation { - pname = "taler-exchange"; - inherit version; - - src = fetchgit { - url = "https://git.taler.net/exchange.git"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-SKnMep8bMQaJt4r3u0SrzwYSuFbzv4RnflbutSqwtPg="; - - # When fetching submodules without the .git folder we get the following error: - # "Server does not allow request for unadvertised object" - leaveDotGit = true; - postFetch = '' - rm -rf $out/.git - ''; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - buildInputs = [ - libgcrypt - libmicrohttpd - jansson - libsodium - postgresql - curl - recutils - gettext - texinfo # Fix 'makeinfo' is missing on your system. - libunistring - python3.pkgs.jinja2 - # jq is necessary for some tests and is checked by configure script - jq - ]; - propagatedBuildInputs = [ gnunet ]; - - # From ./bootstrap - preAutoreconf = '' - ./contrib/gana-generate.sh - pushd contrib - find wallet-core/aml-backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext - truncate -s -2 Makefile.am.ext - cat Makefile.am.in Makefile.am.ext >> Makefile.am - popd - ''; - - enableParallelBuilding = true; - - nativeCheckInputs = [ wget curl ]; - doInstallCheck = true; - checkTarget = "check"; - - meta = with lib; { - description = '' - Taler is an electronic payment system providing the ability to pay - anonymously using digital cash. Taler consists of a network protocol - definition (using a RESTful API over HTTP), a Exchange (which creates - digital coins), a Wallet (which allows customers to manage, store and - spend digital coins), and a Merchant website which allows customers to - spend their digital coins. Naturally, each Merchant is different, but - Taler includes code examples to help Merchants integrate Taler as a - payment system. - ''; - homepage = "https://taler.net/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ astro ]; - platforms = platforms.linux; - }; - }; - - taler-merchant = stdenv.mkDerivation { - pname = "taler-merchant"; - inherit version; - - src = fetchgit { - url = "https://git.taler.net/merchant.git"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-8VpoyloLpd/HckSIRU6IclWUXQyEHqlcNdoJI9U3t0Y="; - }; - postUnpack = '' - ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/ - ''; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = taler-exchange.buildInputs ++ [ - qrencode - taler-exchange - # for ltdl.h - libtool - ]; - propagatedBuildInputs = [ gnunet ]; - - # From ./bootstrap - preAutoreconf = '' - pushd contrib - find wallet-core/backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext - truncate -s -2 Makefile.am.ext - cat Makefile.am.in Makefile.am.ext >> Makefile.am - popd - ''; - configureFlags = [ - "--with-gnunet=${gnunet}" - "--with-exchange=${taler-exchange}" - ]; - - enableParallelBuilding = true; - - nativeCheckInputs = [ jq ]; - doInstallCheck = true; - checkTarget = "check"; - - meta = with lib; { - description = '' - This is the GNU Taler merchant backend. It provides the logic that should run - at every GNU Taler merchant. The GNU Taler merchant is a RESTful backend that - can be used to setup orders and process payments. This component allows - merchants to receive payments without invading the customers' privacy. Of - course, this applies mostly for digital goods, as the merchant does not need - to know the customer's physical address. - ''; - homepage = "https://taler.net/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ astro ]; - platforms = platforms.linux; - }; - }; -in { - inherit taler-exchange taler-merchant; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix index deaa49e4f6..0f16865ac8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix @@ -9,7 +9,7 @@ , libsecret , mesa , udev -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; # TODO: migrate off autoPatchelfHook and use nixpkgs' electron - nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook3 ]; buildInputs = [ alsa-lib diff --git a/third_party/nixpkgs/pkgs/applications/networking/trayscale/default.nix b/third_party/nixpkgs/pkgs/applications/networking/trayscale/default.nix index 33c7666fcf..e6960e2987 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/trayscale/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/trayscale/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.11.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-Og/ilxWNB5TNqnViZ5TeE0P+RxG1JOP2q9jo91SBNZQ="; + hash = "sha256-2mGPbH74a9d1uhRGMSEfrzCnwjgdgbopu20K9/g6wg0="; }; - vendorHash = "sha256-eIakjEYfVp2wfXu0oqBmd5hJZTp0xgYKNNbtpRBnT2w="; + vendorHash = "sha256-Iedd8WsJPAVQexRqDSLAmv7MAWc4IFQXHk6XpnStMps="; subPackages = [ "cmd/trayscale" ]; @@ -52,5 +52,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ patka ]; mainProgram = "trayscale"; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix b/third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix index 761975a277..8991e66b7c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix @@ -6,7 +6,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gssdp_1_6 , gtk3 , gupnp_1_6 @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix index 52994f63e1..0861e72906 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix @@ -15,20 +15,22 @@ , glib , gtk4 , libadwaita +, zbar +, gst_all_1 , Security , Foundation }: stdenv.mkDerivation rec { pname = "warp"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; - repo = pname; + repo = "warp"; rev = "v${version}"; - hash = "sha256-pntHIY0cScDKhWR6kXp6YrEbBQiQjUId3MrJzy5l+K8="; + hash = "sha256-GRxZ3y1PdJpBDnGCfmOmZgN8n1aaYf9IhyszRwo3MjQ="; }; postPatch = '' @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Go/a7aVHF1Yt3yIccKJIVeFy5rckXhSKfd13hdhlLUQ="; + hash = "sha256-v/MhVcQmMYD/n/8wmPCYUy4YpXhL0v4fq8h6cllo/pw="; }; nativeBuildInputs = [ @@ -59,7 +61,12 @@ stdenv.mkDerivation rec { glib gtk4 libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + zbar + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-bad + ]) ++ lib.optionals stdenv.isDarwin [ Security Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix index 9b64e8e6c1..9914f664d0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix @@ -9,8 +9,9 @@ , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook3 , glib +, glib-networking , gtk3 , json-glib , libappindicator @@ -37,11 +38,12 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ glib + glib-networking # see #311066 gtk3 json-glib libappindicator diff --git a/third_party/nixpkgs/pkgs/applications/networking/wgnord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/wgnord/default.nix index 0e73d07616..e7a34522a1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/wgnord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/wgnord/default.nix @@ -62,5 +62,6 @@ resholve.mkDerivation rec { maintainers = with lib.maintainers; [ urandom ]; license = licenses.mit; mainProgram = "wgnord"; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/xpipe/default.nix b/third_party/nixpkgs/pkgs/applications/networking/xpipe/default.nix index 9798ca2283..00329886b2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/xpipe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/xpipe/default.nix @@ -33,14 +33,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-s/1XyEXOyvAQNf32ckKotQ4jYdlo/Y+O9PY3wIUs80A="; + x86_64-linux = "sha256-yz8D40ckr6oydlY6+kjQqXtWQ6Q+ZmGQccNVBFbW3/k="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "8.6"; + version = "9.2"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/yaup/default.nix b/third_party/nixpkgs/pkgs/applications/networking/yaup/default.nix index cc6ba09076..f3854cecd6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/yaup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/yaup/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , intltool , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , miniupnpc }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix b/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix index 0ca18f8e36..d03b60da6e 100644 --- a/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix @@ -17,7 +17,7 @@ , boost , libxslt , goffice -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/agenda/default.nix b/third_party/nixpkgs/pkgs/applications/office/agenda/default.nix index bcffa8ebf7..8957df0bad 100644 --- a/third_party/nixpkgs/pkgs/applications/office/agenda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/agenda/default.nix @@ -11,7 +11,7 @@ , glib , gtk3 , libgee -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix index ec0cd9534b..8db8b3fbb7 100644 --- a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.5.4"; + version = "0.5.7"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-gIM4CQvPkQIWvHXYPwr4yiDY1mUuOmubdqkOmHNssVo="; + hash = "sha256-SVtAx/yllHugBys506pT/5n6IDEZvPEeCHRjFHLMZ0A="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/office/autokey/default.nix b/third_party/nixpkgs/pkgs/applications/office/autokey/default.nix index af8ceeb4b7..d05c83cb19 100644 --- a/third_party/nixpkgs/pkgs/applications/office/autokey/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/autokey/default.nix @@ -1,7 +1,7 @@ { lib , python3Packages , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , gtksourceview3 , libappindicator-gtk3 @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { # Tests appear to be broken with import errors within the project structure doCheck = false; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ gtksourceview3 diff --git a/third_party/nixpkgs/pkgs/applications/office/banana-accounting/default.nix b/third_party/nixpkgs/pkgs/applications/office/banana-accounting/default.nix index e1c5f7fdeb..a0213e05f6 100644 --- a/third_party/nixpkgs/pkgs/applications/office/banana-accounting/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/banana-accounting/default.nix @@ -10,7 +10,7 @@ , lib , stdenv , libgcrypt -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation { @@ -40,7 +40,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix index c3e080ad3d..65fe907c27 100644 --- a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , gst_all_1 , qtbase @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix b/third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix index 13d3c46c94..c64c3389d9 100644 --- a/third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/bookworm/default.nix @@ -24,7 +24,7 @@ , unzip , vala , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/clockify/default.nix b/third_party/nixpkgs/pkgs/applications/office/clockify/default.nix index efd20632a2..6acb243ace 100644 --- a/third_party/nixpkgs/pkgs/applications/office/clockify/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/clockify/default.nix @@ -1,40 +1,25 @@ -{ stdenv, lib, fetchurl, dpkg, makeWrapper, electron }: +{ lib +, appimageTools +, fetchurl }: -stdenv.mkDerivation rec { +appimageTools.wrapType2 rec { pname = "clockify"; - version = "2.1.6"; + version = "2.1.17.1354"; src = fetchurl { - url = "https://web.archive.org/web/20231110130133/https://clockify.me/downloads/Clockify_Setup_x64.deb"; - hash = "sha256-jndoMk3vqk8a5jMzKVo6ThovSISmcu+hef9IJcg3reQ="; + url = "https://web.archive.org/web/20240406052908/https://clockify.me/downloads/Clockify_Setup.AppImage"; + hash = "sha256-G5VOAf6PrjHUsnk7IlXdqJ2D941cnggjuHkkgrOaVaA="; }; - nativeBuildInputs = [ - dpkg - makeWrapper - ]; + extraInstallCommands = + let appimageContents = appimageTools.extract { inherit pname version src; }; + in '' + install -Dm 444 ${appimageContents}/clockify.desktop -t $out/share/applications + install -Dm 444 ${appimageContents}/clockify.png -t $out/share/pixmaps - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase = '' - runHook preInstall - - mv usr $out - mv opt $out - - substituteInPlace $out/share/applications/clockify.desktop \ - --replace "/opt/Clockify/" "" - - makeWrapper ${electron}/bin/electron $out/bin/clockify \ - --add-flags $out/opt/Clockify/resources/app.asar - - runHook postInstall - ''; + substituteInPlace $out/share/applications/clockify.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; meta = with lib; { description = "Free time tracker and timesheet app that lets you track work hours across projects"; diff --git a/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix b/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix index 1b02f3be80..daa0114b01 100644 --- a/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/espanso/default.nix @@ -148,7 +148,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "espanso"; homepage = "https://espanso.org"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kimat thehedgeh0g ]; + maintainers = with maintainers; [ kimat pyrox0 ]; platforms = platforms.unix; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/gnote/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnote/default.nix index 29c72b24cd..a4262de993 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnote/default.nix @@ -5,6 +5,7 @@ , gettext , gtkmm4 , itstool +, libadwaita , libsecret , libuuid , libxml2 @@ -18,15 +19,16 @@ stdenv.mkDerivation rec { pname = "gnote"; - version = "45.1"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-nuwn+MsKENL9uRSkUei4QYwmDni/BzYHgaeKXkGM+UE="; + hash = "sha256-ht9YoVlbIVN0aRq0S/wWE7Sf28p3CEI6PVZY3NOgFe0="; }; buildInputs = [ gtkmm4 + libadwaita libsecret libuuid libxml2 @@ -50,7 +52,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Gnote"; + homepage = "https://gitlab.gnome.org/GNOME/gnote"; description = "A note taking application"; mainProgram = "gnote"; maintainers = with maintainers; [ jfvillablanca ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/gnucash/0005-disable-test-lots.patch b/third_party/nixpkgs/pkgs/applications/office/gnucash/0005-disable-test-lots.patch new file mode 100644 index 0000000000..c7418b7b88 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/gnucash/0005-disable-test-lots.patch @@ -0,0 +1,11 @@ +--- a/libgnucash/engine/test/CMakeLists.txt 2024-02-23 09:05:19.000000000 +0900 ++++ b/libgnucash/engine/test/CMakeLists.txt 2024-05-08 22:08:04.572060359 +0900 +@@ -57,7 +57,6 @@ + + add_engine_test(test-account-object test-account-object.cpp) + add_engine_test(test-group-vs-book test-group-vs-book.cpp) +-add_engine_test(test-lots test-lots.cpp) + add_engine_test(test-querynew test-querynew.c) + add_engine_test(test-query test-query.cpp) + add_engine_test(test-split-vs-account test-split-vs-account.cpp) + diff --git a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix index da94f9674c..8d86d771d0 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -23,7 +23,7 @@ , pkg-config , swig , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { cmake gettext makeWrapper - wrapGAppsHook + wrapGAppsHook3 pkg-config ]; @@ -76,6 +76,15 @@ stdenv.mkDerivation rec { ./0003-remove-valgrind.patch # this patch makes gnucash exec the Finance::Quote wrapper directly ./0004-exec-fq-wrapper.patch + # this patch disables a flaky test + # see https://bugs.gnucash.org/show_bug.cgi?id=799289 + ./0005-disable-test-lots.patch + # Fix importing QIF by backporting a fix. remove on next release + # https://bugs.gnucash.org/show_bug.cgi?id=799262 + (fetchpatch { + url = "https://github.com/Gnucash/gnucash/commit/b33b864c2fa0ba72d1940465e7fa962dd36833c9.patch"; + hash = "sha256-A8pYW6CcNFBGC/MDijnuFJdlNAzSDS6Tcj+haCcEI/M="; + }) ]; # this needs to be an environment variable and not a cmake flag to suppress @@ -117,11 +126,11 @@ stdenv.mkDerivation rec { ) ''; - # wrapGAppsHook would wrap all binaries including the cli utils which need + # wrapGAppsHook3 would wrap all binaries including the cli utils which need # Perl wrapping dontWrapGApps = true; - # gnucash is wrapped using the args constructed for wrapGAppsHook. + # gnucash is wrapped using the args constructed for wrapGAppsHook3. # gnc-fq-* are cli utils written in Perl hence the extra wrapping postFixup = '' wrapProgram $out/bin/gnucash "''${gappsWrapperArgs[@]}" diff --git a/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix index 7e351afadf..a3c16d5d86 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, perlPackages -, goffice, gnome, wrapGAppsHook, gtk3, bison, python3Packages +, goffice, gnome, wrapGAppsHook3, gtk3, bison, python3Packages , itstool }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--disable-component" ]; - nativeBuildInputs = [ pkg-config intltool bison itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool bison itstool wrapGAppsHook3 ]; # ToDo: optional libgda, introspection? buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix b/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix index b0242fc4ae..586777ccf4 100644 --- a/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix @@ -5,7 +5,7 @@ , libgsf , libofx , intltool -, wrapGAppsHook +, wrapGAppsHook3 , libsoup , gnome }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-vTrbq/xLTfwF7/YtKzZFiiSw8A0HzzWin2ry8gPHej8="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; buildInputs = [ gtk libgsf diff --git a/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix b/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix index d7bad1d133..39c4353cb7 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix @@ -5,7 +5,7 @@ , python3Packages , ninja , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtksourceview4 , itstool @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { ninja itstool gettext - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; @@ -77,7 +77,7 @@ python3Packages.buildPythonApplication rec { "Getting Things GNOME" (GTG) is a personal tasks and ToDo list organizer inspired by the "Getting Things Done" (GTD) methodology. GTG is intended to help you track everything you need to do and need to know, from small tasks to large projects. ''; - homepage = "https://wiki.gnome.org/Apps/GTG"; + homepage = "https://github.com/getting-things-gnome/gtg"; downloadPage = "https://github.com/getting-things-gnome/gtg/releases"; license = licenses.gpl3Plus; maintainers = with maintainers; [ oyren ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix index 023a5729ed..0e9531b61d 100644 --- a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix @@ -1,15 +1,15 @@ -{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook +{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook3 , libsoup_3, gnome }: stdenv.mkDerivation rec { pname = "homebank"; - version = "5.7.4"; + version = "5.8"; src = fetchurl { url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-Qs5xRsh16gyjyTORtqm/RxTbRiHGP0oJTcxviYW7VOQ="; + hash = "sha256-tgjcz4znnw++5lBoJDWtHKpRFENfM0xBpyhGf8nAACw="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix index 282e62584c..d49e8c8a98 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , makeDesktopItem , copyDesktopItems , unzip @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ jdk gradle - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix b/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix index 66d2a80c55..f87eaf6d9e 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , makeDesktopItem , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , stripJavaArchivesHook , ant , jdk @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { hash = "sha256-MSVSd5DyVL+dcfTDv1M99hxickPwT2Pt6QGNsu6DGZI="; }; - nativeBuildInputs = [ ant jdk wrapGAppsHook makeWrapper stripJavaArchivesHook ]; + nativeBuildInputs = [ ant jdk wrapGAppsHook3 makeWrapper stripJavaArchivesHook ]; buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib libXtst ] ++ lib.optional stdenv.isDarwin Cocoa; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix index 2f3927146f..013a2ee557 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix @@ -6,7 +6,7 @@ , xorg # for lndir , runCommand , substituteAll -# For Emulating wrapGAppsHook +# For Emulating wrapGAppsHook3 , gsettings-desktop-schemas , hicolor-icon-theme , dconf diff --git a/third_party/nixpkgs/pkgs/applications/office/mendeley/default.nix b/third_party/nixpkgs/pkgs/applications/office/mendeley/default.nix index 03eee188ac..48384eca29 100644 --- a/third_party/nixpkgs/pkgs/applications/office/mendeley/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/mendeley/default.nix @@ -7,13 +7,13 @@ let pname = "mendeley"; - version = "2.111.0"; + version = "2.114.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-tN76RKHETTMkJ239I6+a36RPTuWqYlCSs+tEP+BcB+M="; + hash = "sha256-1eLxk+nlgHoe0Gmo/DXlTOnWssrN9cAubvqpV6SqQS8="; }; appimageContents = appimageTools.extractType2 { @@ -23,7 +23,7 @@ in appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/$name $out/bin/${executableName} + mv $out/bin/$pname $out/bin/${executableName} install -m 444 -D ${appimageContents}/${executableName}.desktop $out/share/applications/${executableName}.desktop ${imagemagick}/bin/convert ${appimageContents}/${executableName}.png -resize 512x512 ${pname}_512.png install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${executableName}.png diff --git a/third_party/nixpkgs/pkgs/applications/office/mmex/default.nix b/third_party/nixpkgs/pkgs/applications/office/mmex/default.nix index e1f39e8964..c4508df84b 100644 --- a/third_party/nixpkgs/pkgs/applications/office/mmex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/mmex/default.nix @@ -7,7 +7,7 @@ , makeWrapper , lsb-release , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , curl , sqlite , wxGTK32 @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { git makeWrapper pkg-config - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals stdenv.isLinux [ lsb-release ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix index a776555884..9b80a93a70 100644 --- a/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.2.2"; + version = "3.4.1"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-+VvQM851uWoMXV3hwuVSlK9IqiNjh57uq8Wlwl/VvPg="; + hash = "sha256-GwvfnFQbeLiJHHiO0QpfPLdflUXe/q/QEsRVaF/3c4c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix b/third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix index ca1f1c1595..4bc6060cfa 100644 --- a/third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/notes-up/default.nix @@ -8,7 +8,7 @@ , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook3 , discount , glib , gtk3 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/notion-app-enhanced/default.nix b/third_party/nixpkgs/pkgs/applications/office/notion-app-enhanced/default.nix index e9206f9e51..61dd21920a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/notion-app-enhanced/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/notion-app-enhanced/default.nix @@ -2,20 +2,17 @@ let pname = "notion-app-enhanced"; version = "2.0.18-1"; - name = "${pname}-v${version}"; src = fetchurl { url = "https://github.com/notion-enhancer/notion-repackaged/releases/download/v${version}/Notion-Enhanced-${version}.AppImage"; sha256 = "sha256-SqeMnoMzxxaViJ3NPccj3kyMc1xvXWULM6hQIDZySWY="; }; - appimageContents = appimageTools.extract { inherit name src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/third_party/nixpkgs/pkgs/applications/office/osmo/default.nix b/third_party/nixpkgs/pkgs/applications/office/osmo/default.nix index 8f73d9c6b2..7dc7444379 100644 --- a/third_party/nixpkgs/pkgs/applications/office/osmo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/osmo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gtk3, libxml2, gettext, libical, libnotify -, libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }: +, libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "osmo"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "19h3dnjgqbawnvgnycyp4n5b6mjsp5zghn3b69b6f3xa3fyi32qy"; }; - nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; buildInputs = [ gtk3 libxml2 libical libnotify libarchive gspell webkitgtk libgringotts ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/p3x-onenote/default.nix b/third_party/nixpkgs/pkgs/applications/office/p3x-onenote/default.nix index c70f3aa52c..730a9d81b2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/p3x-onenote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/p3x-onenote/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, appimageTools, desktop-file-utils, fetchurl }: let + pname = "p3x-onenote"; version = "2023.4.117"; - name = "p3x-onenote-${version}"; plat = { aarch64-linux = "-arm64"; @@ -22,18 +22,17 @@ let }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; extraInstallCommands = '' mkdir -p $out/share/pixmaps $out/share/licenses/p3x-onenote cp ${appimageContents}/p3x-onenote.png $out/share/pixmaps/ cp ${appimageContents}/p3x-onenote.desktop $out cp ${appimageContents}/LICENSE.electron.txt $out/share/licenses/p3x-onenote/LICENSE - mv $out/bin/${name} $out/bin/p3x-onenote ${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \ --set-key Exec --set-value $out/bin/p3x-onenote \ diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix index 554aeb588e..808b04f3a3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix @@ -190,6 +190,8 @@ python.pkgs.buildPythonApplication rec { installPhase = let pythonPath = python.pkgs.makePythonPath propagatedBuildInputs; in '' + runHook preInstall + mkdir -p $out/lib/paperless-ngx cp -r {src,static,LICENSE,gunicorn.conf.py} $out/lib/paperless-ngx ln -s ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/ @@ -200,6 +202,8 @@ python.pkgs.buildPythonApplication rec { makeWrapper ${python.pkgs.celery}/bin/celery $out/bin/celery \ --prefix PYTHONPATH : "${pythonPath}:$out/lib/paperless-ngx/src" \ --prefix PATH : "${path}" + + runHook postInstall ''; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix index 4460e50ab6..b5620d3f40 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -1,6 +1,7 @@ { buildPythonPackage , lib , fetchFromGitLab +, fetchpatch , pyenchant , scikit-learn , pypillowfight @@ -33,6 +34,13 @@ buildPythonPackage rec { sourceRoot = "${src.name}/paperwork-backend"; patches = [ + # fixes building with recent scipy + # remove on next release + (fetchpatch { + url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/abcebfe9714644d4e259e53b10e0e9417b5b864f.patch"; + hash = "sha256-YjVpphThW5Livs+PZJZDSgJvhLSXhZ1bnlWMwfY4HTg="; + }) + # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 ./flaky_test.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix index e783e8f496..9e6beb5053 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -7,7 +7,7 @@ , xvfb-run , dbus , libnotify -, wrapGAppsHook +, wrapGAppsHook3 , fetchFromGitLab , which , gettext @@ -80,7 +80,7 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ dbus ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection python3Packages.setuptools-scm (lib.getBin gettext) diff --git a/third_party/nixpkgs/pkgs/applications/office/pinpoint/default.nix b/third_party/nixpkgs/pkgs/applications/office/pinpoint/default.nix index 99a45371b6..ca91b33eca 100644 --- a/third_party/nixpkgs/pkgs/applications/office/pinpoint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/pinpoint/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cairo clutter-gtk ]; meta = with lib; { - homepage = "https://wiki.gnome.org/action/show/Apps/Pinpoint"; + homepage = "https://gitlab.gnome.org/Archive/pinpoint"; description = "A tool for making hackers do excellent presentations"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/office/planify/default.nix b/third_party/nixpkgs/pkgs/applications/office/planify/default.nix index 1f6ccbf10f..8d4c079753 100644 --- a/third_party/nixpkgs/pkgs/applications/office/planify/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/planify/default.nix @@ -10,6 +10,7 @@ , evolution-data-server , glib , glib-networking +, gst_all_1 , gtk4 , gtksourceview5 , gxml @@ -27,13 +28,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.6"; + version = "4.7.2"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-vyw8SjI8EM9giYpAsCNppgSydPEBNz2sbFahEKmKe6w="; + hash = "sha256-G0A3U0TUGL4RT1wpIXw/cIwDDlaLCPpo5QG6bJfoIYc="; }; nativeBuildInputs = [ @@ -49,6 +50,9 @@ stdenv.mkDerivation rec { evolution-data-server glib glib-networking + # Needed for GtkMediaStream creation with success.ogg, see #311295. + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gtk4 gtksourceview5 gxml diff --git a/third_party/nixpkgs/pkgs/applications/office/planner/default.nix b/third_party/nixpkgs/pkgs/applications/office/planner/default.nix index 0beb4825dd..e27fd037df 100644 --- a/third_party/nixpkgs/pkgs/applications/office/planner/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/planner/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = { description = "Project management tool for the GNOME desktop"; mainProgram = "planner"; - homepage = "https://wiki.gnome.org/Apps/Planner"; + homepage = "https://gitlab.gnome.org/World/planner"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ amiloradovsky ]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix index 281273c218..c320729ee9 100644 --- a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -10,7 +10,7 @@ , libsecret , makeDesktopItem , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , writeScript }: let @@ -27,16 +27,16 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.68.3"; + version = "0.68.4"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-7EQ/gKFflElga5LDwAkjPcqNl6HNtnAzno1ZGPBybJY="; + hash = "sha256-E4uVI2MJ2tD2wuAxxzCZSmNRbKTTzhi44c4ip7uEhCk="; }; nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix b/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix index 353e46e067..eb28bf2dfd 100644 --- a/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix @@ -2,7 +2,7 @@ , stdenv , python3Packages , fetchPypi -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , gobject-introspection , libcanberra-gtk3 @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix index 2009c6f9a0..8e4b0c231f 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -21,14 +21,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.4.2"; + version = "24.5.1"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-HnWxIcOy7Te6Q5YfZYhvITpfsgeQw8Tt/Nr++wcpxEU="; + hash = "sha256-ktf28AKNr0FcWzJ0A2s3mpU2qgmibpT0rUN9d18mE88="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/spice-up/default.nix b/third_party/nixpkgs/pkgs/applications/office/spice-up/default.nix index 93376ed292..f8a7f3a7c2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/spice-up/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/spice-up/default.nix @@ -7,7 +7,7 @@ , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtk3 , json-glib @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/ticktick/default.nix b/third_party/nixpkgs/pkgs/applications/office/ticktick/default.nix index 3a768c702a..a7b88321a8 100644 --- a/third_party/nixpkgs/pkgs/applications/office/ticktick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/ticktick/default.nix @@ -1,7 +1,7 @@ { lib , fetchurl , stdenv -, wrapGAppsHook +, wrapGAppsHook3 , dpkg , autoPatchelfHook , glibc @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 autoPatchelfHook dpkg ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix b/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix index 9f8bb5b563..8aedc48540 100644 --- a/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix @@ -4,7 +4,7 @@ , gettext , makeDesktopItem , copyDesktopItems -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-qwH2mt3Va62QJKJGOpt5WV3QksqQaRGEif4CcPC5F2E="; }; - nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems wrapGAppsHook ]; + nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems wrapGAppsHook3 ]; pythonPath = with python3.pkgs; [ wxpython diff --git a/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix b/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix index ef6c931bcc..247b9f7cae 100644 --- a/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix @@ -1,16 +1,15 @@ { lib , fetchurl , appimageTools -, libsecret }: let - version = "6.7.5"; + version = "6.7.8"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - hash = "sha256-b/I34f8fGgPr4+fZJ+2cb+Xi/AvotxNHYg7IaLTByPk="; + hash = "sha256-nMvbr2PQBWyrhY3mv/4wsdWPhNx5hLFaAp0Ey3nvp7g="; }; appimageContents = appimageTools.extractType2 { @@ -19,12 +18,9 @@ let in appimageTools.wrapType2 rec { inherit pname version src; - extraPkgs = pkgs: with pkgs; [ - libsecret - ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png substituteInPlace $out/share/applications/timeular.desktop \ diff --git a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix index c67f53949c..91852af855 100644 --- a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , ninja -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , wxGTK , Cocoa @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2024-04-11"; + version = "0-unstable-2024-05-04"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "5e9e95a34221d4bda584d2130586177e29ee8fe7"; - sha256 = "X0aB0rJZd9G8S+QWviSAdB/YQMT4lVV3yiELzZs+P3g="; + rev = "f29512886514410fa68d2debdb9389a8f81f3aaa"; + hash = "sha256-Uq8G2lSVTj1JmiLnn5FZd/WKS+wjZxoaliOyghVZg34="; }; nativeBuildInputs = [ cmake ninja - wrapGAppsHook + wrapGAppsHook3 makeWrapper ]; @@ -45,7 +45,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; + }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix index 55b99bf71b..e2ad6d5d5f 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix @@ -1,7 +1,7 @@ { stdenv, lib, unzip, autoPatchelfHook , fetchurl, makeWrapper , alsa-lib, mesa, nss, nspr, systemd -, makeDesktopItem, copyDesktopItems, wrapGAppsHook +, makeDesktopItem, copyDesktopItems, wrapGAppsHook3 , metaCommon }: @@ -29,7 +29,7 @@ let nativeBuildInputs = [ autoPatchelfHook makeWrapper - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/tryton/default.nix b/third_party/nixpkgs/pkgs/applications/office/tryton/default.nix index e1a236e5db..ee8f067b33 100644 --- a/third_party/nixpkgs/pkgs/applications/office/tryton/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/tryton/default.nix @@ -14,26 +14,26 @@ , pango , fontconfig , freetype -, wrapGAppsHook +, wrapGAppsHook3 }: with lib; python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "7.0.8"; + version = "7.2.1"; disabled = !python3Packages.isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-e3WNDB6P7kapAfzlvbJ1/6LcyH7Fl6GKCK/hri460pQ="; + sha256 = "sha256-CK3XkHX16Ec/j1DhC29uoj/YqcLXs/KsIb7v/cfoiaM="; }; nativeBuildInputs = [ pkg-config gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/office/tusk/default.nix b/third_party/nixpkgs/pkgs/applications/office/tusk/default.nix index 98f00f2ed5..89a27a770e 100644 --- a/third_party/nixpkgs/pkgs/applications/office/tusk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/tusk/default.nix @@ -31,10 +31,7 @@ in appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - multiArch = false; # no 32bit needed - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} mkdir "$out/share" ln -s "${desktopItem}/share/applications" "$out/share/" ''; diff --git a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix index 78b559b8ff..99c58ba536 100644 --- a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ curl coreutils ]; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; } '' timestamp10=$(date '+%s') diff --git a/third_party/nixpkgs/pkgs/applications/office/zim/default.nix b/third_party/nixpkgs/pkgs/applications/office/zim/default.nix index b21f3edaa5..9680748287 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }: +{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook3, gnome }: # TODO: Declare configuration options for the following optional dependencies: # - File stores: hg, git, bzr @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix index e343790da2..b31ce7f8c2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, wrapGAppsHook +, wrapGAppsHook3 , makeDesktopItem , atk , cairo @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { hash = "sha256-HAVLmamEPuFf0548/iEXes+f4XnQ7kU1u9hyOYhVyZ0="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/zotero_7.nix b/third_party/nixpkgs/pkgs/applications/office/zotero/zotero_7.nix index 4d4ea36c5a..ae8cc9e9fa 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zotero/zotero_7.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zotero/zotero_7.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, wrapGAppsHook +, wrapGAppsHook3 , autoPatchelfHook , makeDesktopItem , atk @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 autoPatchelfHook ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix index 821944387e..b49cc1b432 100644 --- a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/michaelrsweet/pappl"; license = licenses.asl20; platforms = platforms.linux; # should also work for darwin, but requires additional work - maintainers = with maintainers; [ jonringer ChlorideCull ]; + maintainers = with maintainers; [ jonringer ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix b/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix index 066c933618..9854fa8076 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix @@ -1,28 +1,29 @@ { lib , fetchFromGitHub +, writeShellScript , glib , gsettings-desktop-schemas , python3 , unstableGitUpdater -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { pname = "chirp"; - version = "unstable-2024-02-08"; + version = "0.4.0-unstable-2024-05-10"; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "902043a937ee3611744f2a4e35cd902c7b0a8d0b"; - hash = "sha256-oDUtR1xD73rfBRKkbE1f68siO/4oxoLxw16w1qa9fEo="; + rev = "d5dc5c8e053dbcf87c8b0ccf03109c0870c22bfb"; + hash = "sha256-Tqq1dTjtzHTgaHUAio5B8V4Bo+P8EPa3s/kG181TrCc="; }; buildInputs = [ glib gsettings-desktop-schemas ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = with python3.pkgs; [ future @@ -37,7 +38,9 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; passthru.updateScript = unstableGitUpdater { - branch = "py3"; + tagConverter = writeShellScript "chirp-tag-converter.sh" '' + sed -e 's/^release_//g' -e 's/_/./g' + ''; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix index 2e9393dfed..b9d1792777 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.6.9"; + version = "2.6.11"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-DyBo56NS15s+t9Dl8xCC7MQAqMmZ91FYUYOV4vyJ/Yo="; + hash = "sha256-9JGhMCypoKOh1Gy1DdK7nrma+L4sJsYN/iuNhBPmHPA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/radio/cqrlog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/cqrlog/default.nix index af1e283249..7c973e097d 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/cqrlog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/cqrlog/default.nix @@ -16,7 +16,7 @@ , xdg-utils , xplanet , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ! grep -C src -RC0 "/usr" ''; - nativeBuildInputs = [ lazarus fpc autoPatchelfHook wrapGAppsHook ]; + nativeBuildInputs = [ lazarus fpc autoPatchelfHook wrapGAppsHook3 ]; buildInputs = [ atk cairo diff --git a/third_party/nixpkgs/pkgs/applications/radio/dsd/default.nix b/third_party/nixpkgs/pkgs/applications/radio/dsd/default.nix index 72b6f305d3..620923377a 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/dsd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/dsd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/szechyjs/dsd"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; mainProgram = "dsd"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/flamp/default.nix b/third_party/nixpkgs/pkgs/applications/radio/flamp/default.nix index 4e7326af19..fc44826258 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/flamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/flamp/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "flamp"; - version = "2.2.11"; + version = "2.2.12"; src = fetchgit { url = "https://git.code.sf.net/p/fldigi/flamp"; rev = "v${finalAttrs.version}"; - hash = "sha256-QYfTkciSbBLy49rF6xABMw8TXZ/0QyQ/yhJ2nuM7f/c="; + hash = "sha256-Rw75mz3gPQDBl1iECHZAMBxY8iDr/hqSJscJhdboaRw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix b/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix index abdf520513..2390a4f8c0 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "fldigi"; - version = "4.2.04"; + version = "4.2.05"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-crVeX9vtvn1O5ah1dc74425qUKcozKlDMVeIefMpktY="; + hash = "sha256-rBGJ+63Szhy37LQw0LpE2/lLyP5lwK7hsz/uq453iHY="; }; nativeBuildInputs = [ pkg-config ]; @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { libsamplerate ] ++ lib.optionals (stdenv.isLinux) [ libpulseaudio alsa-lib udev ]; + env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14"; + enableParallelBuilding = true; meta = with lib; { @@ -47,8 +49,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ relrod ftrvxmtrx ]; platforms = platforms.unix; - # unable to execute command: posix_spawn failed: Argument list too long - # Builds fine on aarch64-darwin - broken = stdenv.system == "x86_64-darwin"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index 5d3d1d3d18..c03a3decb6 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix @@ -45,11 +45,11 @@ # If one wishes to use a different src or name for a very custom build , overrideSrc ? {} , pname ? "gnuradio" -, version ? "3.10.9.2" +, version ? "3.10.10.0" }: let - sourceSha256 = "sha256-SMalZwIvATZ3rqAAqeSmf8/RJ1d9pp7NvoWO/YP0BMc="; + sourceSha256 = "sha256-pEVWhXDjOevrduDbZQbiDbODZY8PpsGY4O8yxrwlCcs="; featuresInfo = { # Needed always basic = { diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix index ac08d17397..9ec00058f1 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix @@ -11,7 +11,7 @@ , xorg # To define a the gnuradio.pkgs scope , newScope -# For Emulating wrapGAppsHook +# For Emulating wrapGAppsHook3 , gsettings-desktop-schemas , glib , hicolor-icon-theme @@ -58,6 +58,10 @@ let # may wish to wrap GR without python support. pythonPkgs = extraPythonPackages ++ [ (unwrapped.python.pkgs.toPythonModule unwrapped) ] + ++ unwrapped.passthru.uhd.pythonPath + ++ lib.optionals (unwrapped.passthru.uhd.pythonPath != []) [ + (unwrapped.python.pkgs.toPythonModule unwrapped.passthru.uhd) + ] # Add the extraPackages as python modules as well ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) ++ lib.flatten (lib.mapAttrsToList ( @@ -72,7 +76,7 @@ let inherit (unwrapped) version; makeWrapperArgs = builtins.concatStringsSep " " ([ ] - # Emulating wrapGAppsHook & wrapQtAppsHook working together + # Emulating wrapGAppsHook3 & wrapQtAppsHook working together ++ lib.optionals ( (unwrapped.hasFeature "gnuradio-companion") || (unwrapped.hasFeature "gr-qtgui") diff --git a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix index a574066045..14675124b0 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix @@ -11,7 +11,7 @@ , fftwFloat , alsa-lib , libjack2 -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook # drivers (optional): , rtl-sdr @@ -40,7 +40,7 @@ gnuradioMinimal.pkgs.mkDerivation rec { cmake pkg-config wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gnuradioMinimal.unwrapped.logLib diff --git a/third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix index 5769fbbdf1..645aed7fff 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, nix-update-script, nwjs, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitLab, nix-update-script, nwjs, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "gridtracker"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-p3PdYOk0yvG3QkM17grzZmf9upK1n0zo4aOrlhGTvTU="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; postPatch = '' substituteInPlace Makefile \ diff --git a/third_party/nixpkgs/pkgs/applications/radio/grig/default.nix b/third_party/nixpkgs/pkgs/applications/radio/grig/default.nix index b288317c03..84664d8972 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/grig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/grig/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk2 , hamlib_4 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OgIgHW9NMW/xSSti3naIR8AQWUtNSv5bYdOcObStBlM="; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 ]; buildInputs = [ hamlib_4 gtk2 ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/radio/qlog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/qlog/default.nix index 48116beb3e..02e6d4c162 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/qlog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/qlog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-zPIGqVfpd7Gkm3Ify+AwiCSWQ67ybv9BmuolSu9WzHM="; + hash = "sha256-f+H1NglsNhUTbH0JOWmvERrEQEwDAIRkJCD4ELC4oA8="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix b/third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix index c5034bd33e..733f908ffc 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix @@ -8,11 +8,11 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.31"; + version = "4.2.33"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WzB/KAkjJ6zPPfOe35kbT3HbbCNQjm44GL0hInk3TH8="; + sha256 = "sha256-41eyqYxRg0crtN6qp239eHWSFPt7XuJneTAndZuS3EY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/tqsl/default.nix b/third_party/nixpkgs/pkgs/applications/radio/tqsl/default.nix index 321536f71a..01059cc434 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/tqsl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/tqsl/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, cmake, expat, openssl, zlib, lmdb, curl, sqlite, wxGTK32, wrapGAppsHook }: +{ lib, stdenv, fetchurl, cmake, expat, openssl, zlib, lmdb, curl, sqlite, wxGTK32, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "tqsl"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz"; - sha256 = "sha256-T4NBCUTYHT6ugSg1gSfjQBOBndqwSwyWLr/qlDPQGKI="; + sha256 = "sha256-Ca9PsytjPvrU4u+b/x6pIbQc8CDNWI6hNM6jF60Bds8="; }; - nativeBuildInputs = [ cmake wrapGAppsHook ]; + nativeBuildInputs = [ cmake wrapGAppsHook3 ]; buildInputs = [ expat openssl diff --git a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix index c3f7b58fa1..947d7d4810 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix @@ -8,15 +8,8 @@ , boost , ncurses , enableCApi ? true -# Although we handle the Python API's dependencies in pythonEnvArg, this -# feature is currently disabled as upstream attempts to run `python setup.py -# install` by itself, and it fails because the Python's environment's prefix is -# not a writable directly. Adding support for this feature would require using -# python's pypa/build nad pypa/install hooks directly, and currently it is hard -# to do that because it all happens after a long buildPhase of the C API. -, enablePythonApi ? false +, enablePythonApi ? true , python3 -, buildPackages , enableExamples ? false , enableUtils ? true , libusb1 @@ -38,13 +31,7 @@ }: let - onOffBool = b: if b then "ON" else "OFF"; - inherit (lib) optionals; - # Later used in pythonEnv generation. Python + mako are always required for the build itself but not necessary for runtime. - pythonEnvArg = (ps: with ps; [ mako ] - ++ optionals (enablePythonApi) [ numpy setuptools ] - ++ optionals (enableUtils) [ requests six ] - ); + inherit (lib) optionals cmakeBool; in stdenv.mkDerivation (finalAttrs: { @@ -72,7 +59,30 @@ stdenv.mkDerivation (finalAttrs: { # hash. sha256 = "17g503mhndaabrdl7qai3rdbafr8xx8awsyr7h2bdzwzprzmh4m3"; }; + # This are the minimum required Python dependencies, this attribute might + # be useful if you want to build a development environment with a python + # interpreter able to import the uhd module. + pythonPath = optionals (enablePythonApi || enableUtils) [ + python3.pkgs.numpy + python3.pkgs.setuptools + ] ++ optionals (enableUtils) [ + python3.pkgs.requests + python3.pkgs.six + + /* These deps are needed for the usrp_hwd.py utility, however even if they + would have been added here, the utility wouldn't have worked because it + depends on an old python library mprpc that is not supported for Python > + 3.8. See also report upstream: + https://github.com/EttusResearch/uhd/issues/744 + + python3.pkgs.gevent + python3.pkgs.pyudev + python3.pkgs.pyroute2 + + */ + ]; passthru = { + runtimePython = python3.withPackages (ps: finalAttrs.pythonPath); updateScript = [ ./update.sh # Pass it this file name as argument @@ -83,66 +93,91 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DENABLE_LIBUHD=ON" "-DENABLE_USB=ON" - "-DENABLE_TESTS=ON" # This installs tests as well so we delete them via postPhases - "-DENABLE_EXAMPLES=${onOffBool enableExamples}" - "-DENABLE_UTILS=${onOffBool enableUtils}" - "-DENABLE_C_API=${onOffBool enableCApi}" - "-DENABLE_PYTHON_API=${onOffBool enablePythonApi}" - "-DENABLE_DPDK=${onOffBool enableDpdk}" + # Regardless of doCheck, we want to build the tests to help us gain + # confident that the package is OK. + "-DENABLE_TESTS=ON" + (cmakeBool "ENABLE_EXAMPLES" enableExamples) + (cmakeBool "ENABLE_UTILS" enableUtils) + (cmakeBool "ENABLE_C_API" enableCApi) + (cmakeBool "ENABLE_PYTHON_API" enablePythonApi) + /* + + Otherwise python tests fail. Using a dedicated pythonEnv for either or both + nativeBuildInputs and buildInputs makes upstream's cmake scripts fail to + install the Python API as reported on our end at [1] (we don't want + upstream to think we are in a virtual environment because we use + python3.withPackages...). + + Putting simply the python dependencies in the nativeBuildInputs and + buildInputs as they are now from some reason makes the `python` in the + checkPhase fail to find the python dependencies, as reported at [2]. Even + using nativeCheckInputs with the python dependencies, or using a + `python3.withPackages` wrapper in nativeCheckInputs, doesn't help, as the + `python` found in $PATH first is the one from nativeBuildInputs. + + [1]: https://github.com/NixOS/nixpkgs/pull/307435 + [2]: https://discourse.nixos.org/t/missing-python-package-in-checkphase/9168/ + + Hence we use upstream's provided cmake flag to control which python + interpreter they will use to run the the python tests. + + */ + "-DRUNTIME_PYTHON_EXECUTABLE=${lib.getExe finalAttrs.passthru.runtimePython}" + (cmakeBool "ENABLE_DPDK" enableDpdk) # Devices - "-DENABLE_OCTOCLOCK=${onOffBool enableOctoClock}" - "-DENABLE_MPMD=${onOffBool enableMpmd}" - "-DENABLE_B100=${onOffBool enableB100}" - "-DENABLE_B200=${onOffBool enableB200}" - "-DENABLE_USRP1=${onOffBool enableUsrp1}" - "-DENABLE_USRP2=${onOffBool enableUsrp2}" - "-DENABLE_X300=${onOffBool enableX300}" - "-DENABLE_N300=${onOffBool enableN300}" - "-DENABLE_N320=${onOffBool enableN320}" - "-DENABLE_E300=${onOffBool enableE300}" - "-DENABLE_E320=${onOffBool enableE320}" - ] + (cmakeBool "ENABLE_OCTOCLOCK" enableOctoClock) + (cmakeBool "ENABLE_MPMD" enableMpmd) + (cmakeBool "ENABLE_B100" enableB100) + (cmakeBool "ENABLE_B200" enableB200) + (cmakeBool "ENABLE_USRP1" enableUsrp1) + (cmakeBool "ENABLE_USRP2" enableUsrp2) + (cmakeBool "ENABLE_X300" enableX300) + (cmakeBool "ENABLE_N300" enableN300) + (cmakeBool "ENABLE_N320" enableN320) + (cmakeBool "ENABLE_E300" enableE300) + (cmakeBool "ENABLE_E320" enableE320) # TODO: Check if this still needed # ABI differences GCC 7.1 # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector::iterator {aka __gnu_cxx::__normal_iterator >}' changed in GCC 7.1 - ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] - ; - - pythonEnv = python3.withPackages pythonEnvArg; + ] ++ optionals stdenv.isAarch32 [ + "-DCMAKE_CXX_FLAGS=-Wno-psabi" + ]; nativeBuildInputs = [ cmake pkg-config # Present both here and in buildInputs for cross compilation. - (buildPackages.python3.withPackages pythonEnvArg) + python3 + python3.pkgs.mako + # We add this unconditionally, but actually run wrapPythonPrograms only if + # python utilities are enabled + python3.pkgs.wrapPython ]; - buildInputs = [ + buildInputs = finalAttrs.pythonPath ++ [ boost libusb1 - ] - # However, if enableLibuhd_Python_api *or* enableUtils is on, we need - # pythonEnv for runtime as well. The utilities' runtime dependencies are - # handled at the environment - ++ optionals (enableExamples) [ ncurses ncurses.dev ] - ++ optionals (enablePythonApi || enableUtils) [ finalAttrs.pythonEnv ] - ++ optionals (enableDpdk) [ dpdk ] - ; + ] ++ optionals (enableExamples) [ + ncurses ncurses.dev + ] ++ optionals (enableDpdk) [ + dpdk + ]; # many tests fails on darwin, according to ofborg doCheck = !stdenv.isDarwin; # Build only the host software preConfigure = "cd host"; - # TODO: Check if this still needed, perhaps relevant: - # https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm patches = [ - # Disable tests that fail in the sandbox + # Disable tests that fail in the sandbox, last checked at version 4.6.0.0 ./no-adapter-tests.patch ]; - postPhases = [ "installFirmware" "removeInstalledTests" ] - ++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [ "moveUdevRules" ] - ; + postPhases = [ + "installFirmware" + "removeInstalledTests" + ] ++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [ + "moveUdevRules" + ]; # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` installFirmware = '' @@ -162,6 +197,10 @@ stdenv.mkDerivation (finalAttrs: { mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/ ''; + # Wrap the python utilities with our pythonPath definition + postFixup = lib.optionalString (enablePythonApi && enableUtils) '' + wrapPythonPrograms + ''; disallowedReferences = optionals (!enablePythonApi && !enableUtils) [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/aarch64.patch b/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/aarch64.patch deleted file mode 100644 index 40696a03de..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/aarch64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN gildas-src-jul18a/admin/define-system.sh gildas-src-jul18a.aarch64/admin/define-system.sh ---- gildas-src-jul18a/admin/define-system.sh 2018-06-12 15:22:32.000000000 +0200 -+++ gildas-src-jul18a.aarch64/admin/define-system.sh 2018-07-21 13:05:52.000000000 +0200 -@@ -174,7 +174,7 @@ - DEFAULT_CONFIG= # Default config is empty - case `uname` in - Linux) -- if [ `uname -m | grep -c "x86_64"` -ne 0 ]; then -+ if [ `uname -m | grep -c "64"` -ne 0 ]; then - GAG_MACHINE=x86_64 - else - GAG_MACHINE=pc diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/clang.patch b/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/clang.patch index 4d6654a99a..aee0108352 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/clang.patch +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/clang.patch @@ -1,22 +1,77 @@ -diff -ruN gildas-src-jun18a/admin/define-system.sh gildas-src-jun18a.clang/admin/define-system.sh ---- gildas-src-jun18a/admin/define-system.sh 2018-03-12 11:07:57.000000000 +0100 -+++ gildas-src-jun18a.clang/admin/define-system.sh 2018-06-12 14:56:14.000000000 +0200 -@@ -218,13 +218,13 @@ +diff --git a/admin/Makefile.def b/admin/Makefile.def +index 932d18f102..309114e339 100644 +--- a/admin/Makefile.def ++++ b/admin/Makefile.def +@@ -310,7 +310,7 @@ endif + + # Apple CLANG flags (identical to GCC) + ifeq ($(GAG_COMPILER_CKIND),clang) +- GLOBAL_CFLAGS += -pipe -fPIC ++ GLOBAL_CFLAGS += -fPIC + ifeq ($(RELEASE_MODE),no) + OPTION_CFLAGS += -Wall + endif +@@ -360,7 +360,7 @@ endif + + # GFORTRAN flags + ifeq ($(GAG_COMPILER_FKIND),gfortran) +- GLOBAL_FFLAGS += -J$(moddir) -pipe -fno-backslash -fno-range-check ++ GLOBAL_FFLAGS += -J$(moddir) -fno-backslash -fno-range-check + ifeq ($(GAG_USE_SANITIZE),yes) + GLOBAL_FFLAGS += -fsanitize=address -fsanitize=null + # Can not be used with our memory(ip): +diff --git a/admin/define-system.sh b/admin/define-system.sh +index b6eda9fdfd..704050a9ac 100644 +--- a/admin/define-system.sh ++++ b/admin/define-system.sh +@@ -272,34 +272,23 @@ EOF else GAG_MACHINE=pc fi - if which gcc > /dev/null 2>&1; then - DEFAULT_CCOMPILER=gcc -+ if which clang > /dev/null 2>&1; then -+ DEFAULT_CCOMPILER=clang - fi +- fi - if which g++ > /dev/null 2>&1; then - DEFAULT_CXXCOMPILER=g++ - elif which clang++ > /dev/null 2>&1; then -+ if which clang++ > /dev/null 2>&1; then - DEFAULT_CXXCOMPILER=clang++ -+ elif which g++ > /dev/null 2>&1; then -+ DEFAULT_CXXCOMPILER=g++ - fi - if which ifort > /dev/null 2>&1; then - DEFAULT_FCOMPILER=ifort +- DEFAULT_CXXCOMPILER=clang++ +- fi +- if which ifort > /dev/null 2>&1; then +- DEFAULT_FCOMPILER=ifort +- elif which gfortran > /dev/null 2>&1; then +- DEFAULT_FCOMPILER=gfortran +- fi +- elif [ `uname -p` = "arm" ]; then ++ elif [ `uname -p` = "arm" ]; then + GAG_MACHINE=arm64 +- if which gcc > /dev/null 2>&1; then +- DEFAULT_CCOMPILER=gcc +- fi +- if which clang++ > /dev/null 2>&1; then +- DEFAULT_CXXCOMPILER=clang++ +- elif which g++ > /dev/null 2>&1; then +- DEFAULT_CXXCOMPILER=g++ +- fi +- if which ifort > /dev/null 2>&1; then +- DEFAULT_FCOMPILER=ifort +- elif which gfortran > /dev/null 2>&1; then +- DEFAULT_FCOMPILER=gfortran +- fi ++ fi ++ if which clang > /dev/null 2>&1; then ++ DEFAULT_CCOMPILER=clang ++ elif which gcc > /dev/null 2>&1; then ++ DEFAULT_CCOMPILER=gcc ++ fi ++ if which clang++ > /dev/null 2>&1; then ++ DEFAULT_CXXCOMPILER=clang++ ++ elif which g++ > /dev/null 2>&1; then ++ DEFAULT_CXXCOMPILER=g++ ++ fi ++ if which ifort > /dev/null 2>&1; then ++ DEFAULT_FCOMPILER=ifort ++ elif which gfortran > /dev/null 2>&1; then ++ DEFAULT_FCOMPILER=gfortran + fi ;; + CYGWIN*) + if [ `uname -m | grep -c "x86_64"` -ne 0 ]; then diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/cpp-darwin.patch b/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/cpp-darwin.patch new file mode 100644 index 0000000000..09085c29bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/cpp-darwin.patch @@ -0,0 +1,17 @@ +diff --git a/admin/Makefile.def b/admin/Makefile.def +index 0395d9d4f0..932d18f102 100644 +--- a/admin/Makefile.def ++++ b/admin/Makefile.def +@@ -228,7 +228,11 @@ GLOBAL_DIRTY = $(builddir) *~ TAGS ChangeLog* Makefile.bak + # Fortran preprocessing + + # Preprocessor command +-CPP = cpp ++ifdef GAG_CPP ++ CPP = $(GAG_CPP) ++else ++ CPP = cpp ++endif + + # Preprocessor generic flags + GLOBAL_CPPFLAGS += -P -traditional -C diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix index b5b92bd8fe..5767efab73 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "aug23a"; - version = "20230801_a"; + srcVersion = "apr24a"; + version = "20240401_a"; pname = "gildas"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "sha256-jlyv2K1V+510C4uLek4oofm13d40nGJ46wqjW+tjfq4="; + sha256 = "sha256-Eq6S5S8xrhkCo6O2wUaHnoMDVG9WeiSurGvOc+2JKbM="; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; @@ -24,10 +24,14 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); - patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; + patches = [ ./wrapper.patch ] + ++ lib.optionals stdenv.isDarwin ([ ./clang.patch ./cpp-darwin.patch ]); env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + # Workaround for https://github.com/NixOS/nixpkgs/issues/304528 + env.GAG_CPP = lib.optionalString stdenv.isDarwin "${gfortran.outPath}/bin/cpp"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); configurePhase='' @@ -66,7 +70,6 @@ stdenv.mkDerivation rec { license = lib.licenses.free; maintainers = [ lib.maintainers.bzizou lib.maintainers.smaret ]; platforms = lib.platforms.all; - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix index 56c5a92460..467f478da9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool , gtk3, glib, curl, goocanvas2, gpsd -, hamlib, wrapGAppsHook +, hamlib, wrapGAppsHook3 }: let @@ -24,7 +24,7 @@ in stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix index 9c66df83dd..b463a2845b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK32 -, curl, gettext, glib, indi-full, libnova, wrapGAppsHook }: +, curl, gettext, glib, indi-full, libnova, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "phd2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix index 255927d893..569d537172 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix @@ -1,43 +1,38 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, pkg-config, meson, ninja, cmake +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, cmake , git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib , fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg -, libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook +, libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook3 +, curl }: stdenv.mkDerivation rec { pname = "siril"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitLab { owner = "free-astro"; repo = "siril"; rev = version; - hash = "sha256-lCoFQ7z6cZbyNPEm5s40DNdvTwFonHK3KCd8RniqQWs="; + hash = "sha256-njvByA8nbG3qHKfv8eX20TrIhngVI0nzIHmhYIN6htE="; }; - patches = [ - (fetchpatch { - name = "siril-1.2-exiv2-0.28.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; - hash = "sha256-R1yslW6hzvJHKo0/IqBxkCuqcX6VrdRSz68gpAExxVE="; - }) - ]; - nativeBuildInputs = [ - meson ninja cmake pkg-config git criterion wrapGAppsHook + meson ninja cmake pkg-config git criterion wrapGAppsHook3 ]; buildInputs = [ gtk3 cfitsio gsl exiv2 gnuplot opencv fftwFloat librtprocess wcslib libconfig libraw libtiff libpng libjpeg libheif ffms ffmpeg json-glib + curl ]; # Necessary because project uses default build dir for flatpaks/snaps dontUseMesonConfigure = true; dontUseCmakeConfigure = true; + # Meson fails to find libcurl unless the option is specifically enabled configureScript = '' - ${meson}/bin/meson --buildtype release nixbld . + ${meson}/bin/meson setup -Denable-libcurl=yes --buildtype release nixbld . ''; postConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index 35d6bd8aba..687c0b3a2d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -4,7 +4,7 @@ , fetchpatch , cmake , perl -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , qtbase , qtcharts @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake perl - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/conglomerate/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/conglomerate/default.nix index d9092b9eeb..0d14091463 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/conglomerate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/conglomerate/default.nix @@ -1,20 +1,47 @@ -{ lib, stdenv, fetchFromGitHub, cmake, coreutils, perlPackages, bicpl, libminc, zlib, minc_tools, - makeWrapper }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + coreutils, + perlPackages, + bicpl, + libminc, + zlib, + minc_tools, + makeWrapper, +}: stdenv.mkDerivation rec { pname = "conglomerate"; - version = "unstable-2017-09-10"; + version = "unstable-2023-01-19"; src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "7343238bc6215942c7ecc885a224f24433a291b0"; - sha256 = "1mlqgmy3jc13bv7d01rjwldxq0p4ayqic85xcl222hhifi3w2prr"; + owner = "BIC-MNI"; + repo = pname; + rev = "6fb26084f2871a85044e2e4afc868982702b40ed"; + hash = "sha256-Inr4b2bxguzkcRQBURObsQQ0Rb3H/Zz6hEzNRd+IX3w="; }; - nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ libminc zlib bicpl ]; - propagatedBuildInputs = [ coreutils minc_tools ] ++ (with perlPackages; [ perl GetoptTabular MNI-Perllib ]); + nativeBuildInputs = [ + cmake + makeWrapper + ]; + buildInputs = [ + libminc + zlib + bicpl + ]; + propagatedBuildInputs = + [ + coreutils + minc_tools + ] + ++ (with perlPackages; [ + perl + GetoptTabular + MNI-Perllib + ]); cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" @@ -23,15 +50,20 @@ stdenv.mkDerivation rec { postFixup = '' for p in $out/bin/*; do - wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${lib.makeBinPath [ coreutils minc_tools ]}"; + wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${ + lib.makeBinPath [ + coreutils + minc_tools + ] + }"; done ''; - meta = with lib; { + meta = { homepage = "https://github.com/BIC-MNI/conglomerate"; description = "More command-line utilities for working with MINC files"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.hpndUc; + maintainers = with lib.maintainers; [ bcdarwin ]; + platforms = lib.platforms.unix; + license = lib.licenses.hpndUc; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix index 6c7157a917..56eb023805 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix @@ -3,39 +3,20 @@ , cmake , eigen , fetchFromGitHub -, fetchpatch , libcifpp , libmcfp , zlib }: -let - libcifpp' = libcifpp.overrideAttrs (oldAttrs: { - # dssp 4.4.3 requires specific version "5.2.0" of libcifpp - version = "5.2.0"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo rev; - hash = "sha256-Sj10j6HxUoUvQ66cd2B8CO7CVBRd7w9CTovxkwPDOvs="; - }; - patches = [ - (fetchpatch { - # https://github.com/PDB-REDO/libcifpp/issues/51 - name = "fix-build-on-darwin.patch"; - url = "https://github.com/PDB-REDO/libcifpp/commit/641f06a7e7c0dc54af242b373820f2398f59e7ac.patch"; - hash = "sha256-eWNfp9nA/+2J6xjZR6Tj+5OM3L5MxdfRi0nBzyaqvS0="; - }) - ]; - }); -in stdenv.mkDerivation (finalAttrs: { pname = "dssp"; - version = "4.4.5"; + version = "4.4.7"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "dssp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-X0aMWqoMhmQVRHWKVm2S6JAOYiBuBBMzMoivMdpNx0M="; + hash = "sha256-qePoZYkzzWuK6j1NM+q6fPuWVRDEe4OkPmXc9Nbqobo="; }; nativeBuildInputs = [ @@ -44,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ eigen - libcifpp' + libcifpp libmcfp zlib ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix index 0d8d87ac41..219792326b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchzip, jdk17, testers, wrapGAppsHook, igv }: +{ lib, stdenv, fetchzip, jdk17, testers, wrapGAppsHook3, igv }: stdenv.mkDerivation rec { pname = "igv"; - version = "2.17.3"; + version = "2.17.4"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; - sha256 = "sha256-SGqkWBv4nol0+lnGN7wBHJvndcIqZ5+Wt1wAcXA42cU="; + sha256 = "sha256-LF/rwm/XlLHAJjiAlQVTmx5l+5Np2b5rPjoCdN/qERU="; }; installPhase = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/igv chmod +x $out/bin/igvtools ''; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; passthru.tests.version = testers.testVersion { package = igv; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix index 15694ae3e6..b8c5d69482 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/jbrowse/default.nix @@ -1,12 +1,12 @@ -{ lib, fetchurl, appimageTools, wrapGAppsHook }: +{ lib, fetchurl, appimageTools, wrapGAppsHook3 }: let pname = "jbrowse"; - version = "2.5.0"; + version = "2.11.0"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-YLsyA+RVoFvjE4MfAtglJYdUgic487SxwdUhvolzBPc="; + sha256 = "sha256-MtcrkDg7OC3PTc6fdeG3O/CdyP3122+2BSzKE7rrtWI="; }; appimageContents = appimageTools.extractType2 { @@ -19,9 +19,7 @@ appimageTools.wrapType2 { unshareIpc = false; extraInstallCommands = '' - mkdir -p $out/bin - mv $out/bin/jbrowse-${version} $out/bin/jbrowse-desktop - + mv $out/bin/jbrowse $out/bin/jbrowse-desktop install -m 444 -D ${appimageContents}/jbrowse-desktop.desktop $out/share/applications/jbrowse-desktop.desktop install -m 444 -D ${appimageContents}/jbrowse-desktop.png \ $out/share/icons/hicolor/512x512/apps/jbrowse-desktop.png diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix index 3bc84e414b..85fb1ca80a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1542"; + version = "1543"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-ZzvyyecYiBscogfN9/FnDbHg/lqb8y14n9C2KLIqhFA="; + hash = "sha256-APHPv7Q64JITfHsvjCThZ6hvGHerk6wjOm32KdTv4k8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix index f2e3ead2e9..ca1f89388a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, fetchFromGitLab }: +{ + lib, + stdenv, + fetchFromGitLab, + runCommand, + mafft, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mafft"; - version = "7.525"; + version = "7.526"; src = fetchFromGitLab { owner = "sysimm"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-ckBmvFssYAmYcBHAEftjQqBV0MB0theGfemaPx3XUws="; + repo = "mafft"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VNe00r12qEkLEbpZdJCe5xZ73JA3uAmuAeG+eSeRDI0="; }; preBuild = '' @@ -16,14 +22,34 @@ stdenv.mkDerivation rec { make clean ''; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "PREFIX=$(out)" + ]; - meta = with lib; - { - description = "Multiple alignment program for amino acid or nucleotide sequences"; - homepage = "https://mafft.cbrc.jp/alignment/software/"; - license = licenses.bsd3; - maintainers = with maintainers; [ natsukium ]; - platforms = platforms.unix; - }; -} + passthru.tests = { + simple = runCommand "${finalAttrs.pname}-test" { } '' + mkdir $out + cd ${finalAttrs.src}/test + ${lib.getExe mafft} sample > $out/test.fftns2 + ${lib.getExe mafft} --maxiterate 100 sample > $out/test.fftnsi + ${lib.getExe mafft} --globalpair sample > $out/test.gins1 + ${lib.getExe mafft} --globalpair --maxiterate 100 sample > $out/test.ginsi + ${lib.getExe mafft} --localpair sample > $out/test.lins1 + ${lib.getExe mafft} --localpair --maxiterate 100 sample > $out/test.linsi + diff $out/test.fftns2 sample.fftns2 + diff $out/test.fftnsi sample.fftnsi + diff $out/test.gins1 sample.gins1 + diff $out/test.ginsi sample.ginsi + diff $out/test.lins1 sample.lins1 + ''; + }; + + meta = with lib; { + description = "Multiple alignment program for amino acid or nucleotide sequences"; + homepage = "https://mafft.cbrc.jp/alignment/software/"; + license = licenses.bsd3; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix index d463b4fe53..af3856f041 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "4.2.1"; + version = "4.2.2"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; rev = "v${version}"; - sha256 = "sha256-ba5I/bsDNAhDb1Kq0lWTC6YgpZ1PpeHPmB/vXx/JRK0="; + sha256 = "sha256-TlB7Hj4pVN4p4VanACWjQBeTxP9/DvRvdCdgelrXx60="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/migrate/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/migrate/default.nix index 31e4eb2fcb..7820f177bf 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/migrate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/migrate/default.nix @@ -1,18 +1,31 @@ -{ stdenv, lib, gccStdenv, fetchurl, zlib, mpi }: +{ + stdenv, + lib, + fetchurl, + zlib, + mpi, +}: -gccStdenv.mkDerivation rec { - version = "3.7.2"; +stdenv.mkDerivation (finalAttrs: { + version = "5.0.6"; pname = "migrate"; src = fetchurl { - url = "https://peterbeerli.com/migrate-html5/download_version3/${pname}-${version}.src.tar.gz"; - sha256 = "1p2364ffjc56i82snzvjpy6pkf6wvqwvlvlqxliscx2c303fxs8v"; + url = "https://peterbeerli.com/migrate-html5/download_version4/${finalAttrs.pname}-${finalAttrs.version}.src.tar.gz"; + hash = "sha256-twkoR9L6VPUye12OC0B5w0PxcxyKain6RkhCswLEdwg="; }; - buildInputs = [ zlib mpi ]; - setSourceRoot = "sourceRoot=$(echo */src)"; - buildFlags = [ "thread" "mpis" ]; - preInstall = "mkdir -p $out/man/man1"; + sourceRoot = "migrate-${finalAttrs.version}/src"; + + buildInputs = [ + zlib + mpi + ]; + + buildFlags = [ + "thread" + "mpis" + ]; meta = with lib; { broken = stdenv.isDarwin; @@ -21,5 +34,6 @@ gccStdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; + mainProgram = "migrate-n"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/seqtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/seqtk/default.nix index 417bec9c06..856248de91 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/seqtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/seqtk/default.nix @@ -19,14 +19,13 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libdeflate isa-l ]; - makeFlags = [ "CC=cc" ]; + makeFlags = [ + "CC:=$(CC)" + "BINDIR=$(out)/bin" + ]; - installPhase = '' - runHook preInstall - - install -Dm755 -t $out/bin seqtk - - runHook postInstall + preInstall = '' + mkdir -p "$out/bin" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix index d47aae9ce6..c195563188 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, cmake, rocksdb, rapidjson, pkg-config, fetchFromGitHub, zlib }: +{ lib +, stdenv +, cmake +, rocksdb_8_3 +, rapidjson +, pkg-config +, fetchFromGitHub +, zlib +}: +let + rocksdb = rocksdb_8_3; +in stdenv.mkDerivation rec { pname = "sortmerna"; version = "4.2.0"; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/chemtool/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/chemtool/default.nix index fe2d658b5a..82b1834671 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/chemtool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/chemtool/default.nix @@ -5,7 +5,7 @@ , libX11 , gtk2 , fig2dev -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "hhYaBGE4azNKX/sXzfCUpJGUGIRngnL0V0mBNRTdr8s="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ libX11 gtk2 diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index ee3ab5f1f3..bafbeb3529 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "16.1.63"; + version = "16.2.15"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-zUX3msosz0LNQJuEUbFgT32Hw0Wq4CgW1iHMkvReysU="; + hash = "sha256-zPHh5IFdttliPc0SCgkM/3UQmS4eT2rfi5HqpFjY5hA="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix index a3a385802a..2e87cf3db5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix @@ -30,13 +30,13 @@ assert (blas.isILP64 == arpack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; - version = "14.0"; + version = "14.1"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "sha256-wQ2I+10ZHLKamW3j6AUtq2KZVm6d29+JxYgwvBKz9DU="; + sha256 = "sha256-8wZR+bYdxJFsUPMWbIGYxRdNzjLgHm+KFLjY7fSN7io="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix index 0e4728dd65..1733ba2f23 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/pymol/default.nix @@ -38,33 +38,75 @@ let in python3Packages.buildPythonApplication rec { inherit pname; - version = "2.5.0"; + version = "3.0.0"; + pyproject = true; + src = fetchFromGitHub { owner = "schrodinger"; repo = "pymol-open-source"; rev = "v${version}"; - sha256 = "sha256-JdsgcVF1w1xFPZxVcyS+GcWg4a1Bd4SvxFOuSdlz9SM="; + hash = "sha256-GhTHxacjGN7XklZ6gileBMRZAGq4Pp4JknNL+qGqrVE="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "self.install_libbase" '"${placeholder "out"}/${python3.sitePackages}"' + ''; + + build-system = [ + python3Packages.setuptools + ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; buildInputs = [ python3Packages.numpy python3Packages.pyqt5 glew glm libpng libxml2 freetype msgpack netcdf ]; env.NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; - hardeningDisable = [ "format" ]; - - installPhase = '' - python setup.py install --home="$out" - runHook postInstall - ''; postInstall = with python3Packages; '' wrapProgram $out/bin/pymol \ --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5-sip ]} mkdir -p "$out/share/icons/" - ln -s ../../lib/python/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg" + ln -s $out/${python3.sitePackages}/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg" + '' + lib.optionalString stdenv.hostPlatform.isLinux '' cp -r "${desktopItem}/share/applications/" "$out/share/" ''; + pythonImportsCheck = [ + "pymol" + ]; + + nativeCheckInputs = with python3Packages; [ + python3Packages.msgpack + pillow + pytestCheckHook + ]; + + # some tests hang for some reason + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); + + disabledTestPaths = [ + # require biopython which is broken as of 2024-04-20 + "tests/api/seqalign.py" + ]; + + disabledTests = [ + # the output image does not exactly match + "test_commands" + # touch the network + "testFetch" + # requires collada2gltf which is not included in nixpkgs + "testglTF" + # require mmtf-cpp which does not support darwin + "testMMTF" + "testSave_symmetry__mmtf" + ]; + + preCheck = '' + cd testing + ''; + + __darwinAllowLocalNetworking = true; + preFixup = '' wrapQtApp "$out/bin/pymol" ''; @@ -74,6 +116,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "pymol"; homepage = "https://www.pymol.org/"; license = licenses.mit; - maintainers = with maintainers; [ samlich ]; + maintainers = with maintainers; [ natsukium samlich ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix index 41deecbb62..7619e43e80 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix @@ -3,17 +3,18 @@ }: let + pname = "digital"; pkgDescription = "A digital logic designer and circuit simulator."; version = "0.30"; buildDate = "2023-02-03T08:00:56+01:00"; # v0.30 commit date desktopItem = makeDesktopItem { type = "Application"; - name = "Digital"; - desktopName = pkgDescription; + name = pname; + desktopName = "Digital"; comment = "Easy-to-use digital logic designer and circuit simulator"; - exec = "digital"; - icon = "digital"; + exec = pname; + icon = pname; categories = [ "Education" "Electronics" ]; mimeTypes = [ "text/x-digital" ]; terminal = false; @@ -28,8 +29,7 @@ let mvnParameters = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}"; in maven.buildMavenPackage rec { - pname = "digital"; - inherit version jre; + inherit pname version jre; src = fetchFromGitHub { owner = "hneemann"; @@ -44,6 +44,8 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ copyDesktopItems makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin mkdir -p $out/share/java @@ -53,6 +55,13 @@ maven.buildMavenPackage rec { makeWrapper ${jre}/bin/java $out/bin/${pname} \ --add-flags "-classpath $out/share/java/${pname}-${version}.jar:''${classpath#:}" \ --add-flags "-jar $out/share/java/Digital.jar" + + install -Dm644 src/main/svg/icon.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg + for size in 16 32 48 64 128; do + install -Dm644 src/main/resources/icons/icon"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png + done + + runHook postInstall ''; desktopItems = [ desktopItem ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix index 7b7b54201b..3e0f3613ba 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix @@ -10,20 +10,20 @@ , stdenv , tcl , tk -, wrapGAppsHook +, wrapGAppsHook3 , xz }: stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.118"; + version = "3.3.119"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-D0MwwCiiqz0vTUzur222kl2wEMS2/VLRECLQ5d6gSGo="; + sha256 = "sha256-6rPgnnZBEVwHhIv7MPfdDDu+K4y+RQF+leB327pqwDg="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ] ++ lib.optional stdenv.isDarwin gtk-mac-integration; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix index 1fbc92f061..40a91937f0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -4,7 +4,7 @@ , coreutils , libspnav , python3 -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = base.nativeBuildInputs ++ [ boost.dev - wrapGAppsHook + wrapGAppsHook3 python3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index 99670eee8a..1cec011fae 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -193,14 +193,14 @@ stdenv.mkDerivation rec { "${symbols}/share/kicad/template" ]; }; - # We are emulating wrapGAppsHook, along with other variables to the wrapper + # We are emulating wrapGAppsHook3, along with other variables to the wrapper makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}" "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" - # wrapGAppsHook did these two as well, no idea if it matters... + # wrapGAppsHook3 did these two as well, no idea if it matters... "--prefix XDG_DATA_DIRS : ${cups}/share" "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules" # required to open a bug report link in firefox-wayland diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix index 36114fff73..4c55703edc 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "8.0.1"; + version = "8.0.2"; src = { - rev = "20421d65e5a7ede894345d337ab47b469f5ba154"; - sha256 = "096kvmm96ccxir1rspgzzjkp6y2j80l3w2vphg9iv3drxmjp7qjv"; + rev = "55a4d4f5e2f54be6ccf74a8919d04684c9df4c50"; + sha256 = "069ycii9zvdxwxd73afd6bp975r1555yvifi9zdb77qyvn0d9nr9"; }; }; libVersion = { - version = "8.0.1"; + version = "8.0.2"; libSources = { - symbols.rev = "d6aff3948edfca2bacf36900ff080f6b3f65fe4c"; - symbols.sha256 = "00xnvikmqd1zkg9p1f89kvryvkybl5f20baij6babqyc29nbzkwy"; - templates.rev = "0a6c4f798a68a5c639d54b4d3093460ab9267816"; - templates.sha256 = "0m9bggz3cm27kqpjjwxy19mqzk0c69bywcjkqcni7kafr21c6k4z"; - footprints.rev = "226b4f3d5c10a4126d88b895188bdab629fe60b0"; - footprints.sha256 = "1bb3mb2a7vkridgmqqm9ib3hv2m4zx1i14mglb11sribypy0ma5p"; - packages3d.rev = "49c1cd4017499b8a7f6dedbe7ede834d1713eb28"; - packages3d.sha256 = "0b5jwr5bbd0kzb75nj3028knjrv0872dk54sbsnxaz669q8zaxap"; + symbols.rev = "099ac0c8ac402a685fde00b1369e34a116e29661"; + symbols.sha256 = "0w333f89yw2m0zlpkg0k6hfwlj10snm8laihdjnsb22asyz4pbhn"; + templates.rev = "2e2da58e02707d327d59d4101c401a82dc9a26f6"; + templates.sha256 = "073a6cyvzzy0vmkj3ip4ziq7b7pcizs70nm5acw838dxghjfyv3v"; + footprints.rev = "e8c30550cde4945cbe1bf30cccf0b3c1e2bda6c6"; + footprints.sha256 = "10j8qjljc1fv8k4zp3zn0da33g57hn6pgrgmbgp18dsa539xvxcz"; + packages3d.rev = "249f7947587529026e1676cd70c8d7493a8d8162"; + packages3d.sha256 = "04gvfb54jhnww2qwrxc27wpyrvmjasdc4xhr0ridl7dglh4qcp35"; }; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix index 9bab9991ba..ae85cdf310 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-7g4Ki5lhmX/13XCv0on1PgvEthCTfe9wh8EFjMcP1+c="; + hash = "sha256-9ZbX2G4IR/SYSA4DOsTBIRrJeYublyrDUXT+V+KgaC0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix index 4eaf29133a..4aa9ab2b66 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix @@ -9,7 +9,7 @@ , SDL2 , fontconfig , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , darwin }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkg-config python3 wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config python3 wrapGAppsHook3 ]; buildInputs = [ SDL2 fontconfig gtk3 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/simulide/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/simulide/default.nix index 613ec21dbd..9053bcfe58 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/simulide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/simulide/default.nix @@ -1,36 +1,33 @@ -{ lib -, fetchbzr -, mkDerivation -, qmake -, qtserialport -, qtmultimedia -, qttools -, qtscript +{ + lib, + fetchbzr, + mkDerivation, + qmake, + qtserialport, + qtmultimedia, + qttools, + qtscript, }: let generic = - { version - , release - , branch - , rev - , sha256 - , extraPostPatch ? "" - , extraBuildInputs ? [ ] - , iconPath ? "resources/icons/simulide.png" - , installFiles ? '' + { + version, + release, + rev, + src, + extraPostPatch ? "", + extraBuildInputs ? [ ], + iconPath ? "resources/icons/simulide.png", + installFiles ? '' cp -r data examples $out/share/simulide cp simulide $out/bin/simulide - '' + '', }: mkDerivation { pname = "simulide"; version = "${version}-${release}"; - - src = fetchbzr { - url = "https://code.launchpad.net/~arcachofo/simulide/${branch}"; - inherit rev sha256; - }; + inherit src; postPatch = '' sed -i resources/simulide.desktop \ @@ -51,9 +48,7 @@ let cd build_XX ''; - nativeBuildInputs = [ - qmake - ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ qtserialport @@ -85,18 +80,25 @@ let homepage = "https://simulide.com/"; license = lib.licenses.gpl3Only; mainProgram = "simulide"; - maintainers = with lib.maintainers; [ carloscraveiro tomasajt ]; + maintainers = with lib.maintainers; [ + carloscraveiro + tomasajt + ]; platforms = [ "x86_64-linux" ]; }; }; in { - simulide_0_4_15 = generic { + simulide_0_4_15 = generic rec { version = "0.4.15"; release = "SR10"; - branch = "simulide_0.4.14"; # the branch name does not mach the version for some reason rev = "291"; - sha256 = "sha256-BBoZr/S2pif0Jft5wrem8y00dXl08jq3kFiIUtOr3LM="; + src = fetchbzr { + # the branch name does not mach the version for some reason + url = "https://code.launchpad.net/~arcachofo/simulide/simulide_0.4.14"; + sha256 = "sha256-BBoZr/S2pif0Jft5wrem8y00dXl08jq3kFiIUtOr3LM="; + inherit rev; + }; extraPostPatch = '' # GCC 13 needs the header explicitly included sed -i src/gpsim/value.h -e '1i #include ' @@ -110,20 +112,26 @@ in ''; }; - simulide_1_0_0 = generic { + simulide_1_0_0 = generic rec { version = "1.0.0"; release = "SR2"; - branch = "1.0.0"; rev = "1449"; - sha256 = "sha256-rJWZvnjVzaKXU2ktbde1w8LSNvu0jWkDIk4dq2l7t5g="; + src = fetchbzr { + url = "https://code.launchpad.net/~arcachofo/simulide/1.0.0"; + sha256 = "sha256-rJWZvnjVzaKXU2ktbde1w8LSNvu0jWkDIk4dq2l7t5g="; + inherit rev; + }; extraBuildInputs = [ qtscript ]; }; - simulide_1_1_0 = generic { + simulide_1_1_0 = generic rec { version = "1.1.0"; release = "SR0"; - branch = "1.1.0"; rev = "1917"; - sha256 = "sha256-qNBaGWl89Le9uC1VFK+xYhrLzIvOIWjkQbutnrAmZ2M="; + src = fetchbzr { + url = "https://code.launchpad.net/~arcachofo/simulide/1.1.0"; + sha256 = "sha256-qNBaGWl89Le9uC1VFK+xYhrLzIvOIWjkQbutnrAmZ2M="; + inherit rev; + }; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/engineering/brmodelo/default.nix b/third_party/nixpkgs/pkgs/applications/science/engineering/brmodelo/default.nix index c484260d25..09225fcd59 100644 --- a/third_party/nixpkgs/pkgs/applications/science/engineering/brmodelo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/engineering/brmodelo/default.nix @@ -2,27 +2,34 @@ , stdenv , fetchFromGitHub , fetchpatch -, openjdk8 , ant +, jdk8 , makeWrapper , makeDesktopItem , copyDesktopItems +, strip-nondeterminism +, stripJavaArchivesHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brmodelo"; version = "3.31"; src = fetchFromGitHub { owner = "chcandido"; - repo = pname; - rev = version; - sha256 = "09qrhqhv264x8phnf3pnb0cwq75l7xdsj9xkwlvhry81nxz0d5v0"; + repo = "brmodelo"; + rev = finalAttrs.version; + hash = "sha256-YJcGfrcB+Qw35bMnqVs/tBzMGVj2DmfhRZ0YsSGGGSc="; }; - nativeBuildInputs = [ ant makeWrapper copyDesktopItems ]; - - buildInputs = [ openjdk8 ]; + nativeBuildInputs = [ + ant + jdk8 + makeWrapper + copyDesktopItems + strip-nondeterminism + stripJavaArchivesHook + ]; patches = [ # Fixes for building with Ant. @@ -30,22 +37,22 @@ stdenv.mkDerivation rec { (fetchpatch { name = "fix-self-closing-element-not-allowed.patch"; url = "https://github.com/yuuyins/brModelo/commit/0d712b74fd5d29d67be07480ed196da28a77893b.patch"; - sha256 = "sha256-yy03arE6xetotzyvpToi9o9crg3KnMRn1J70jDUvSXE="; + hash = "sha256-yy03arE6xetotzyvpToi9o9crg3KnMRn1J70jDUvSXE="; }) (fetchpatch { name = "fix-tag-closing.patch"; url = "https://github.com/yuuyins/brModelo/commit/e8530ff75f024cf6effe0408ed69985405e9709c.patch"; - sha256 = "sha256-MNuh/ORbaAkB5qDSlA/nPrXN+tqzz4oOglVyEtSangI="; + hash = "sha256-MNuh/ORbaAkB5qDSlA/nPrXN+tqzz4oOglVyEtSangI="; }) (fetchpatch { name = "fix-bad-use-greater-than.patch"; url = "https://github.com/yuuyins/brModelo/commit/498a6ef8129daff5a472b318f93c8f7f2897fc7f.patch"; - sha256 = "sha256-MmAwYUmx38DGRsiSxCWCObtpqxk0ykUQiDSC76bCpFc="; + hash = "sha256-MmAwYUmx38DGRsiSxCWCObtpqxk0ykUQiDSC76bCpFc="; }) (fetchpatch { name = "fix-param-errors.patch"; url = "https://github.com/yuuyins/brModelo/commit/8a508aaba0bcffe13a3f95cff495230beea36bc4.patch"; - sha256 = "sha256-qME9gZChSMzu1vs9HaosD+snb+jlOrQLY97meNoA8oU="; + hash = "sha256-qME9gZChSMzu1vs9HaosD+snb+jlOrQLY97meNoA8oU="; }) # Add SVG icons. @@ -53,12 +60,14 @@ stdenv.mkDerivation rec { (fetchpatch { name = "add-brmodelo-logo-icons-svg.patch"; url = "https://github.com/yuuyins/brModelo/commit/f260b82b664fad3325bbf3ebd7a15488d496946b.patch"; - sha256 = "sha256-UhgcWxsHkNFS1GgaRnmlZohjDR8JwHof2cIb3SBetYs="; + hash = "sha256-UhgcWxsHkNFS1GgaRnmlZohjDR8JwHof2cIb3SBetYs="; }) ]; buildPhase = '' + runHook postBuild ant + runHook preBuild ''; desktopItems = [ @@ -68,15 +77,16 @@ stdenv.mkDerivation rec { genericName = "Entity-relationship diagramming tool"; exec = "brmodelo"; icon = "brmodelo"; - comment = meta.description; + comment = finalAttrs.meta.description; categories = [ "Development" "Education" "Database" "2DGraphics" "ComputerScience" "DataVisualization" "Engineering" "Java" ]; }) ]; installPhase = '' - install -d $out/bin $out/share/doc/${pname} $out/share/java + runHook preInstall - cp -rv ./dist/javadoc $out/share/doc/${pname}/ + mkdir -p $out/share/doc/brmodelo + cp -rv ./dist/javadoc $out/share/doc/brmodelo/ install -Dm755 ./dist/brModelo.jar -t $out/share/java/ # NOTE: The standard Java GUI toolkit has a @@ -85,26 +95,28 @@ stdenv.mkDerivation rec { # in WMs that are not in that list (e.g. XMonad). # Solution/Workaround: set the environment variable # _JAVA_AWT_WM_NONREPARENTING=1. - makeWrapper ${openjdk8}/bin/java $out/bin/brmodelo \ + makeWrapper ${jdk8}/bin/java $out/bin/brmodelo \ --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" \ --add-flags "-jar $out/share/java/brModelo.jar" - runHook postInstall - ''; - - postInstall = '' for size in 16 24 32 48 64 128 256; do install -Dm644 ./src/imagens/icone_"$size"x"$size".svg \ $out/share/icons/hicolor/"$size"x"$size"/apps/brmodelo.svg done + + runHook postInstall + ''; + + preFixup = '' + find $out/share/doc/brmodelo/javadoc -name "*.html" -exec strip-nondeterminism --type javadoc {} + ''; meta = with lib; { description = "Entity-relationship diagram tool for making conceptual and logical database models"; - mainProgram = "brmodelo"; homepage = "https://github.com/chcandido/brModelo"; license = licenses.gpl3; + mainProgram = "brmodelo"; maintainers = with maintainers; [ yuu ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix index 9d151b947b..03787a3a08 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,11 +2,11 @@ let pname = "alt-ergo"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz"; - hash = "sha256-tmWLZBLfdmfYlCQq+zcUneeueDAE6AJeZMy8kfNCC04="; + hash = "sha256-AsHok5i62vqJ5hK8XRiD8hM6JQaFv3dMxZAcVYEim6w="; }; in diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cedille/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cedille/default.nix index 4d026a2d9c..fe12d5995a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cedille/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cedille/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "An interactive theorem-prover and dependently typed programming language, based on extrinsic (aka Curry-style) type theory"; homepage = "https://cedille.github.io/"; license = licenses.mit; - maintainers = with maintainers; [ marsam mpickering ]; + maintainers = with maintainers; [ mpickering ]; platforms = platforms.unix; # Broken due to Agda update. See diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index 37a8aba7d8..68b424b32f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -11,7 +11,7 @@ , ocamlPackages_4_14 , ncurses , buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14 -, glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems +, glib, gnome, wrapGAppsHook3, makeDesktopItem, copyDesktopItems , csdp ? null , version, coq-version ? null }@args: @@ -147,7 +147,7 @@ self = stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ] ++ ocamlNativeBuildInputs ++ optional buildIde copyDesktopItems - ++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook + ++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook3 ++ optional (!coqAtLeast "8.6") gnumake42; buildInputs = [ ncurses ] ++ optionals buildIde diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/eprover/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/eprover/default.nix index d4a8b7a6b2..8583394015 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/eprover/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/eprover/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eprover"; - version = "3.0.03"; + version = "3.1"; src = fetchurl { url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; - hash = "sha256-cS5zUe2N9Kd9uzbNpeBtvLbgUN0c3N3tGcYczK3KsdQ="; + hash = "sha256-+E2z7JAkiNXhZrWRXFbhI5f9NmB0Q4eixab4GlAFqYY="; }; buildInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix index 479b8a2174..ac41b03643 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/leanprover/lean4/blob/${finalAttrs.src.rev}/RELEASES.md"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; mainProgram = "lean"; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix index 288ddc0680..1d5cfa5c5d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -7,7 +7,7 @@ , libXtst , glib , zlib -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeShellWrapper - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix index 1676ca4c2a..42256ae70a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/why3/default.nix @@ -1,8 +1,8 @@ { callPackage, fetchurl, lib, stdenv , ocamlPackages, coqPackages, rubber, hevea, emacs -, version ? "1.7.1" +, version ? "1.7.2" , ideSupport ? true -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; hash = { - "1.7.1" = "sha256-rG1hcxFhQ2PlE9RTz9ELliDjCuSzLnJ1togRY637cU4="; + "1.7.2" = "sha256-VaSG/FiO2MDdSSFXGJJrIylQx0LPwtT8AF7TpPVZhCQ="; "1.6.0" = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw="; }."${version}"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = lib.optional ideSupport - wrapGAppsHook + wrapGAppsHook3 ++ (with ocamlPackages; [ ocaml findlib menhir ]) ++ [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix index acfc38686e..5ceb413a24 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng +{ lib, stdenv, fetchurl, fetchpatch, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre2, perl, readline, tcl, texlive, texliveSmall, tk, xz, zlib , less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata @@ -37,6 +37,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./no-usr-local-search-paths.patch + (fetchpatch { + # https://hiddenlayer.com/research/r-bitrary-code-execution/ + name = "CVE-2024-27322.patch"; + url = "https://github.com/r-devel/r-svn/commit/f7c46500f455eb4edfc3656c3fa20af61b16abb7.patch"; + hash = "sha256-CH2mMmie9E96JeGSC7UGm7/roUNhK5xv6HO53N2ixEI="; + }) ]; # Test of the examples for package 'tcltk' fails in Darwin sandbox. See: diff --git a/third_party/nixpkgs/pkgs/applications/science/math/eigenmath/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/eigenmath/default.nix index b39d7ae260..2f51a00a9b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/eigenmath/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/eigenmath/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "unstable-2024-04-08"; + version = "0-unstable-2024-05-12"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "c0be6c47309aa40d44784a3a4c4c07bc4e8fb6fa"; - hash = "sha256-UVCazX0P03+e1exnpXrGNc/1vHxLH04Xtvgsy00UAoI="; + rev = "978b3bd582a90c8e82079f2e4e4a3a5038cbbe08"; + hash = "sha256-DoGX8nUcWcioTq8ymB+HLsCnt9V6HTKSX4Zs2CQz78Q="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' diff --git a/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix index d28f59e4be..5df35cce8e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.6.0"; src = fetchurl { url = "http://getdp.info/src/getdp-${version}-source.tgz"; - sha256 = "sha256-N1cb72W77Dr+TzeHpLgv5FuFb+SJqyGcfn+kOfEvZgA="; + hash = "sha256-nzefwCV+Z9BHDofuTfhR+vhqm3cCSiUT+7cbtn601N8="; }; inherit (petsc) mpiSupport; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix index 2c3963cece..552639de6c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gretl"; - version = "2023c"; + version = "2024a"; src = fetchurl { url = "mirror://sourceforge/gretl/gretl-${finalAttrs.version}.tar.xz"; - hash = "sha256-vTxCmHrTpYTo9CIPousUCnpcalS6cN1u8bRaOJyu6MI="; + hash = "sha256-6ha0d/n75Xf0hZM0GRHLOnM274P1h2MerB/8SHWTh+o="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix index 53091e6a84..e8f4794d41 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/gurobi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gurobi"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; - hash = "sha256-oZ7Oz22e4k6cVF3TDFxp/pE+RuU+3p/CatTWj1ci5ZY="; + hash = "sha256-9DrIo+25h7mgphRSrNnY2+nrNzaMbafONuUkfLKho2g="; }; sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64"; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/lrcalc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/lrcalc/default.nix index 90ee50c682..0d968e0161 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/lrcalc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/lrcalc/default.nix @@ -1,6 +1,9 @@ { lib, stdenv , fetchFromBitbucket , autoreconfHook + +# Reverse dependency +, sage }: stdenv.mkDerivation rec { @@ -20,6 +23,8 @@ stdenv.mkDerivation rec { autoreconfHook ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Littlewood-Richardson calculator"; homepage = "http://math.rutgers.edu/~asbuch/lrcalc/"; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix index d25f0ad344..b544d5fc6b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix @@ -15,7 +15,7 @@ , libqalculate , intltool , gnuplot -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix index 88515b92be..1389a5a77e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix @@ -10,15 +10,15 @@ , ncurses }: -stdenv.mkDerivation rec { - version = "0.7.29"; +stdenv.mkDerivation (finalAttrs: { pname = "pynac"; + version = "0.7.29"; src = fetchFromGitHub { owner = "pynac"; repo = "pynac"; - rev = "pynac-${version}"; - sha256 = "sha256-ocR7emXtKs+Xe2f6dh4xEDAacgiolY8mtlLnWnNBS8A="; + rev = "pynac-${finalAttrs.version}"; + hash = "sha256-ocR7emXtKs+Xe2f6dh4xEDAacgiolY8mtlLnWnNBS8A="; }; patches = [ @@ -27,10 +27,16 @@ stdenv.mkDerivation rec { (fetchpatch { name = "realpartloop.patch"; url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/realpartloop.patch?h=9.4.beta5"; - sha256 = "sha256-1nj0xtlFN5fZKEiRLD+tiW/ZtxMQre1ziEGA0OVUGE4="; + hash = "sha256-1nj0xtlFN5fZKEiRLD+tiW/ZtxMQre1ziEGA0OVUGE4="; }) ]; + # Python 3.11 moved this header file, but is now is imported by default + postPatch = '' + substituteInPlace ginac/numeric.cpp \ + --replace-fail "#include " "" + ''; + buildInputs = [ flint gmp @@ -57,4 +63,4 @@ stdenv.mkDerivation rec { maintainers = teams.sage.members; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix index 2a2b4617d2..ab11d833f7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, curl, wrapGAppsHook, desktopToDarwinBundle }: +{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, curl, wrapGAppsHook3, desktopToDarwinBundle }: stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - hash = "sha256-hlGNL7aMzxBxtATWJBqJTFEQqMv10oC3sRCdtRLHOww="; + hash = "sha256-yI+8TrNZJt4eJnDX5mk6RozBe2ZeP7sTyAjsgiYQPck="; }; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ] + nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ libqalculate gtk3 curl ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix index 296fc5f783..a830c7ddd0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-X7IY2yXpZiyE+T2dl0G4tWpJ5O6MVCy/sOY3v9inma0="; + hash = "sha256-gJfIC5HdA10gb/Dh/yhJbkCZfhUnN0zihqyfDjPv6ow="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix index be126e5fa3..14f8fe734b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix @@ -7,7 +7,7 @@ , glib , cairo , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch deleted file mode 100644 index 91e080aa29..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd -index 7794c9edc3..1753277b1f 100644 ---- a/src/sage/libs/linbox/conversion.pxd -+++ b/src/sage/libs/linbox/conversion.pxd -@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in - - v -- linbox vector - """ - cdef Vector_integer_dense res = P() -- cdef cppvector[Integer] * vec = &v.refRep() - cdef size_t i - for i in range( res._degree): -- mpz_set(res._entries[i], vec[0][i].get_mpz_const()) -+ mpz_set(res._entries[i], v.getEntry(i).get_mpz_const()) - - return res -diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd -index 9112d151f8..dcc482960c 100644 ---- a/src/sage/libs/linbox/linbox.pxd -+++ b/src/sage/libs/linbox/linbox.pxd -@@ -32,7 +32,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": - ctypedef Modular_double Field - ctypedef double Element - DenseMatrix_Modular_double(Field F, size_t m, size_t n) -- DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n) -+ DenseMatrix_Modular_double(Field F, size_t m, size_t n, Element*) - void setEntry(size_t i, size_t j, Element& a) - Element &getEntry(size_t i, size_t j) - -@@ -42,7 +42,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": - ctypedef Modular_float Field - ctypedef float Element - DenseMatrix_Modular_float(Field F, size_t m, size_t n) -- DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n) -+ DenseMatrix_Modular_float(Field F, size_t m, size_t n, Element*) - void setEntry(size_t i, size_t j, Element& a) - Element &getEntry(size_t i, size_t j) - -@@ -101,7 +101,6 @@ cdef extern from "linbox/vector/vector.h": - DenseVector_integer (Field &F) - DenseVector_integer (Field &F, long& m) - DenseVector_integer (Field &F, cppvector[Integer]&) -- cppvector[Element]& refRep() - size_t size() - void resize(size_t) - void resize(size_t n, const Element&) -diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi -index 010365d76f..3d60726ff9 100644 ---- a/src/sage/matrix/matrix_modn_dense_template.pxi -+++ b/src/sage/matrix/matrix_modn_dense_template.pxi -@@ -219,7 +219,7 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_ - return 0,[] - - cdef ModField *F = new ModField(modulus) -- cdef DenseMatrix *A = new DenseMatrix(F[0], entries,nrows, ncols) -+ cdef DenseMatrix *A = new DenseMatrix(F[0], nrows, ncols, entries) - cdef Py_ssize_t r = reducedRowEchelonize(A[0]) - cdef Py_ssize_t i,j - for i in range(nrows): diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index 00ef5d4283..b1c9c62a57 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -60,6 +60,13 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/commit/1c3f991b9d3c5778e409e5414c6cfcd456113f19.diff"; hash = "sha256-uCXchYx26DdxTjR1k2748KCEHPnekKS2fAM7SpyhNvM="; }) + + # https://github.com/sagemath/sage/pull/37763 + (fetchpatch { + name = "scipy-fault-tolerance.patch"; + url = "https://github.com/sagemath/sage/commit/547d502ed56f9fd44eb5d9b4ee0824746c60fef7.diff"; + hash = "sha256-PR4przrZ3ieHaW2nSY7l7VhNfrUupu9yCIrXpeyoAgg="; + }) ]; # Patches needed because of package updates. We could just pin the versions of diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix index 0a2bd8011b..1552de773d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix @@ -6,6 +6,7 @@ , perl , pkg-config , sage-setup +, pythonRelaxDepsHook , gd , iml , libpng @@ -102,6 +103,11 @@ buildPythonPackage rec { pip # needed to query installed packages pkg-config sage-setup + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "networkx" ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix index 4d2815d129..db2ff0c4a8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , cmake , gettext , maxima @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs:{ pname = "wxmaxima"; - version = "24.02.2"; + version = "24.05.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${finalAttrs.version}"; - hash = "sha256-ewyg+ZhbRbPjJkYTZFuhbOWMDNZGW7ejmSv38zxcTsw="; + hash = "sha256-pl3sO28HANL9F41aaJznxUsH2Y7W/FO82Rik2/ik2Ag="; }; buildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs:{ ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 cmake gettext ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/medicine/xmedcon/default.nix b/third_party/nixpkgs/pkgs/applications/science/medicine/xmedcon/default.nix index b09183f71b..e5c5bf68d5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/medicine/xmedcon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/medicine/xmedcon/default.nix @@ -6,7 +6,7 @@ , pkg-config , libpng , zlib -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { zlib ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; meta = with lib; { description = "An open source toolkit for medical image conversion "; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/gplates/boost-placeholders.patch b/third_party/nixpkgs/pkgs/applications/science/misc/gplates/boost-placeholders.patch deleted file mode 100644 index 7166b92f64..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/misc/gplates/boost-placeholders.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --unified --recursive a/src/gui/TopologyTools.cc b/src/gui/TopologyTools.cc ---- a/src/gui/TopologyTools.cc 2021-07-05 05:11:47.000000000 +0200 -+++ b/src/gui/TopologyTools.cc 2022-12-07 22:35:20.444054124 +0100 -@@ -3448,7 +3448,7 @@ - std::find_if( - d_visible_boundary_section_seq.begin(), - d_visible_boundary_section_seq.end(), -- boost::bind(&VisibleSection::d_section_info_index, _1) == -+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) == - boost::cref(section_index)); - - if (visible_section_iter == d_visible_boundary_section_seq.end()) -@@ -3467,7 +3467,7 @@ - std::find_if( - d_visible_interior_section_seq.begin(), - d_visible_interior_section_seq.end(), -- boost::bind(&VisibleSection::d_section_info_index, _1) == -+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) == - boost::cref(section_index)); - - if (visible_section_iter == d_visible_interior_section_seq.end()) -diff --unified --recursive a/src/presentation/ReconstructionGeometryRenderer.cc b/src/presentation/ReconstructionGeometryRenderer.cc ---- a/src/presentation/ReconstructionGeometryRenderer.cc 2021-07-05 05:11:50.000000000 +0200 -+++ b/src/presentation/ReconstructionGeometryRenderer.cc 2022-12-07 22:36:11.117884262 +0100 -@@ -274,7 +274,7 @@ - GPlatesPresentation::ReconstructionGeometryRenderer::RenderParamsPopulator::visit_reconstruct_visual_layer_params( - const ReconstructVisualLayerParams ¶ms) - { -- d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, _1, _2); -+ d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, boost::placeholders::_1, boost::placeholders::_2); - d_render_params.vgp_draw_circular_error = params.get_vgp_draw_circular_error(); - d_render_params.fill_polygons = params.get_fill_polygons(); - d_render_params.fill_polylines = params.get_fill_polylines(); -diff --unified --recursive a/src/presentation/VisualLayerRegistry.cc b/src/presentation/VisualLayerRegistry.cc ---- a/src/presentation/VisualLayerRegistry.cc 2021-07-05 05:11:50.000000000 +0200 -+++ b/src/presentation/VisualLayerRegistry.cc 2022-12-07 22:38:12.950877614 +0100 -@@ -448,7 +448,7 @@ - &GPlatesQtWidgets::ReconstructScalarCoverageLayerOptionsWidget::create, - boost::bind( - &ReconstructScalarCoverageVisualLayerParams::create, -- _1), -+ boost::placeholders::_1), - true); - - registry.register_visual_layer_type( -@@ -498,7 +498,7 @@ - // NOTE: We pass in ViewState and not the GlobeAndMapWidget, obtained from - // ViewportWindow, because ViewportWindow is not yet available (a reference to - // it not yet been initialised inside ViewState) so accessing it would crash... -- _1, boost::ref(view_state)), -+ boost::placeholders::_1, boost::ref(view_state)), - true); - - // DERIVED_DATA group. -@@ -549,7 +549,7 @@ - &GPlatesQtWidgets::VelocityFieldCalculatorLayerOptionsWidget::create, - boost::bind( - &VelocityFieldCalculatorVisualLayerParams::create, -- _1, boost::cref(view_state.get_rendered_geometry_parameters())), -+ boost::placeholders::_1, boost::cref(view_state.get_rendered_geometry_parameters())), - true); - - using namespace GPlatesUtils; -diff --unified --recursive a/src/qt-widgets/ViewportWindow.cc b/src/qt-widgets/ViewportWindow.cc ---- a/src/qt-widgets/ViewportWindow.cc 2021-08-05 05:44:01.000000000 +0200 -+++ b/src/qt-widgets/ViewportWindow.cc 2022-12-07 22:39:20.487981302 +0100 -@@ -326,7 +326,7 @@ - *d_geometry_operation_state_ptr, - *d_modify_geometry_state, - *d_measure_distance_state_ptr, -- boost::bind(&canvas_tool_status_message, boost::ref(*this), _1), -+ boost::bind(&canvas_tool_status_message, boost::ref(*this), boost::placeholders::_1), - get_view_state(), - *this); - diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix index 74dd61a222..5c2c4cabc9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/gplates/default.nix @@ -33,13 +33,13 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "gplates"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "GPlates"; repo = "GPlates"; rev = "GPlates-${finalAttrs.version}"; - hash = "sha256-BRvrqczGguE2z44ZboxeJxgWEA+t02XkzvU+yF4ki6s="; + hash = "sha256-3fEwm5EKK9RcRbnyUejgwfjdsXaujjZjoMbq/BbVMeM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch b/third_party/nixpkgs/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch deleted file mode 100644 index 6e90faf9f0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc -index ca353c4099..499be0a986 100644 ---- a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc -+++ b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc -@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { - // SIGSTKSZ may be too small to prevent the signal handlers from overrunning - // the alternative stack. Ensure that the size of the alternative stack is - // large enough. -- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -+ const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); - - // Only set an alternative stack if there isn't already one, or if the current - // one is too small. diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix index 1e88047eba..6b5917e163 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/rink/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses -, libiconv, Security }: +, curl, libiconv, Security }: rustPlatform.buildRustPackage rec { - version = "0.7.0"; + version = "0.8.0"; pname = "rink"; src = fetchFromGitHub { owner = "tiffany352"; repo = "rink-rs"; rev = "v${version}"; - sha256 = "sha256-5UrSJ/y6GxDUNaljal57JJY17NuI+2yLwVTwp+xBNxs="; + hash = "sha256-2+ZkyWhEnnO/QgCzWscbMr0u5kwdv2HqPLjtiXDfv/o="; }; - cargoHash = "sha256-G30NcP1ej01ygHzaxZ2OdgfksvXe/SCsmZFwamxlDvA="; + cargoHash = "sha256-j1pQfMjDNu57otOBTVBQEZIx80p4/beEUQdUkAJhvso="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] - ++ (if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]); + ++ (if stdenv.isDarwin then [ curl libiconv Security ] else [ openssl ]); # Some tests fail and/or attempt to use internet servers. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix index 9548db1c7c..afc048cc41 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , callPackage +, fetchgit , fetchurl , fetchpatch , makeWrapper @@ -53,12 +54,11 @@ , Cocoa , CoreSymbolication , OpenGL -, noSplash ? false }: stdenv.mkDerivation rec { pname = "root"; - version = "6.30.04"; + version = "6.30.06"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -66,7 +66,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-K0GAtpjznMZdkQhNgzqIRRWzJbxfZzyOOavoGLAl2Mw="; + hash = "sha256-MA237RtnjtL7ljXKZ1khoZRcfCED2oQAM7STCR9VcAw="; + }; + + clad_src = fetchgit { + url = "https://github.com/vgvassilev/clad"; + rev = "refs/tags/v1.4"; # Make sure that this is the same tag as in the ROOT build files! + hash = "sha256-OI9PaS7kQ/ewD5Soe3gG5FZdlR6qG6Y3mfHwi5dj1sI="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -132,6 +138,23 @@ stdenv.mkDerivation rec { substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace 'set(lcgpackages ' '#set(lcgpackages ' + # We have to bypass the connection check, because it would disable clad. + # This should probably be fixed upstream with a flag to disable the + # connectivity check! + substituteInPlace CMakeLists.txt \ + --replace 'if(NO_CONNECTION)' 'if(FALSE)' + substituteInPlace interpreter/cling/tools/plugins/CMakeLists.txt \ + --replace 'if(NOT DEFINED NO_CONNECTION OR NOT NO_CONNECTION)' 'if(TRUE)' + # Make sure that clad is not downloaded when building + substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ + --replace 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""' + # Make sure that clad is finding the right llvm version + substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ + --replace '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_13.dev}/lib/cmake/llvm' + # Fix that will also be upstream in ROOT 6.32. TODO: remove it when updating to 6.32 + substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ + --replace 'set(_CLAD_LIBRARY_PATH ''${clad_install_dir}/plugins/lib)' 'set(_CLAD_LIBRARY_PATH ''${CMAKE_CURRENT_BINARY_DIR}/clad-prefix/src/clad-build/lib''${LLVM_LIBDIR_SUFFIX})' + substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \ --replace 'add_clang_symlink(''${link} clang)' "" @@ -143,8 +166,6 @@ stdenv.mkDerivation rec { -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' patchShebangs build/unix/ - '' + lib.optionalString noSplash '' - substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" '' + lib.optionalString stdenv.isDarwin '' # Eliminate impure reference to /System/Library/PrivateFrameworks substituteInPlace core/macosx/CMakeLists.txt \ @@ -154,57 +175,22 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-Drpath=ON" "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dbuiltin_llvm=OFF" - "-Dbuiltin_freetype=OFF" - "-Dbuiltin_gtest=OFF" - "-Dbuiltin_nlohmannjson=OFF" - "-Dbuiltin_openui5=ON" - "-Dalien=OFF" - "-Dbonjour=OFF" - "-Dcastor=OFF" - "-Dchirp=OFF" - "-Dclad=OFF" - "-Ddavix=ON" - "-Ddcache=OFF" "-Dfail-on-missing=ON" - "-Dfftw3=OFF" "-Dfitsio=OFF" - "-Dfortran=OFF" "-Dgnuinstall=ON" - "-Dimt=ON" - "-Dgfal=OFF" - "-Dgviz=OFF" - "-Dhdfs=OFF" - "-Dhttp=ON" - "-Dkrb5=OFF" - "-Dldap=OFF" - "-Dmonalisa=OFF" "-Dmysql=OFF" - "-Dodbc=OFF" - "-Dopengl=ON" - "-Doracle=OFF" "-Dpgsql=OFF" - "-Dpythia6=OFF" - "-Dpythia8=OFF" - "-Drfio=OFF" - "-Droot7=ON" "-Dsqlite=OFF" - "-Dssl=ON" - "-Dtmva=ON" "-Dtmva-pymva=OFF" "-Dvdt=OFF" - "-Dwebgui=ON" - "-Dxml=ON" - "-Dxrootd=ON" ] ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" ++ lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" - "-DCMAKE_DISABLE_FIND_PACKAGE_Python2=TRUE" # fatal error: module map file '/nix/store/-Libsystem-osx-10.12.6/include/module.modulemap' not found # fatal error: could not build module '_Builtin_intrinsics' @@ -270,10 +256,10 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with lib; { - homepage = "https://root.cern.ch/"; + homepage = "https://root.cern/"; description = "A data analysis framework"; platforms = platforms.unix; - maintainers = [ maintainers.veprbl ]; + maintainers = [ maintainers.guitargeek maintainers.veprbl ]; license = licenses.lgpl21; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/setup-hook.sh b/third_party/nixpkgs/pkgs/applications/science/misc/root/setup-hook.sh index 34c9bfdceb..7affd21012 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/setup-hook.sh @@ -12,8 +12,8 @@ thisroot () { postHooks+=(thisroot) -addRootInludePath() { +addRootIncludePath() { addToSearchPath ROOT_INCLUDE_PATH $1/include } -addEnvHooks "$targetOffset" addRootInludePath +addEnvHooks "$targetOffset" addRootIncludePath diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/sw_vers.patch b/third_party/nixpkgs/pkgs/applications/science/misc/root/sw_vers.patch index 54ad109139..2a0fcd7577 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/sw_vers.patch +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/sw_vers.patch @@ -48,7 +48,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake #---Set Linker flags---------------------------------------------------------------------- - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION}") else (CMAKE_SYSTEM_NAME MATCHES Darwin) - MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know waht to do. Stop cmake at this point.") + MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know what to do. Stop cmake at this point.") endif (CMAKE_SYSTEM_NAME MATCHES Darwin) diff a/config/root-config.in b/config/root-config.in --- a/config/root-config.in diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix index d355412e54..1a171f2c7d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.10.6"; + version = "8.11.4"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-THp8sqAFZVA5V2k0ruv9qwmPNjSVi2uVx8tla0Y3awE="; + hash = "sha256-nfPA2sQCeRc12A4rrlo17UPpiB8plKYbiumZjS7Yhz8="; # https://github.com/python-versioneer/python-versioneer/issues/217 postFetch = '' sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#' diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix index 92b48ec863..e7eb69fb4e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix @@ -6,18 +6,19 @@ , fetchzip , cmake , lz4 +, gfortran , bzip2 -, m4 , hdf5 , gsl , unzip , makeWrapper +, zlib , meson -, git , ninja +, pandoc , eigen , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , flex , bison , doxygen @@ -40,7 +41,7 @@ let pname = "libccp4"; version = "8.0.0"; src = fetchurl { - url = "https://ftp.ccp4.ac.uk/opensource/${pname}-${version}.tar.gz"; + url = "https://ftp.ccp4.ac.uk/opensource/libccp4-${version}.tar.gz"; hash = "sha256-y4E66GYSoIZjKd6rfO6W6sVz2BvlskA0HUD5rVMi/y0="; }; nativeBuildInputs = [ meson ninja ]; @@ -87,7 +88,7 @@ let }; mosflmBinary = if stdenv.isDarwin then "bin/mosflm" else "mosflm-linux-64-noX11"; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "mosflm"; inherit version src; @@ -111,7 +112,7 @@ let pname = "xgandalf"; version = "c6c5003ff1086e8c0fb5313660b4f02f3a3aab7b"; src = fetchurl { - url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + url = "https://gitlab.desy.de/thomas.white/xgandalf/-/archive/${version}/xgandalf-${version}.tar.gz"; hash = "sha256-/uZlBwAINSoYqgLQFTMz8rS1Rpadu79JkO6Bu/+Nx9E="; }; @@ -121,10 +122,10 @@ let pinkIndexer = stdenv.mkDerivation rec { pname = "pinkindexer"; - version = "5d4e016941eb2a9e50a10df96ded7ff1e2464503"; + version = "15caa21191e27e989b750b29566e4379bc5cd21a"; src = fetchurl { url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-VnJOJJ247dNoBlos4Fu3GQBlAnTk9el+yZDRiicJtu0="; + hash = "sha256-v/SCJiHAV05Lc905y/dE8uBXlW+lLX9wau4XORYdbQg="; }; nativeBuildInputs = [ meson pkg-config ninja ]; @@ -169,16 +170,30 @@ let "-DENABLE_BZIP2_PLUGIN=yes" ]; }; + + millepede-ii = stdenv.mkDerivation rec { + pname = "millepede-ii"; + version = "04-13-06"; + src = fetchurl { + url = "https://gitlab.desy.de/claus.kleinwort/millepede-ii/-/archive/V${version}/millepede-ii-V${version}.tar.gz"; + hash = "sha256-aFoo8AGBsUEN2u3AmnSpTqJ6JeNV6j9vkAFTZ34I+sI="; + }; + + nativeBuildInputs = [ gfortran ]; + buildInputs = [ zlib ]; + + makeFlags = [ "PREFIX=$(out)" ]; + }; in stdenv.mkDerivation rec { pname = "crystfel"; - version = "0.10.2"; + version = "0.11.0"; src = fetchurl { - url = "https://www.desy.de/~twhite/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-nCO9ndDKS54bVN9IhFBiCVNzqk7BsCljXFrOmlx+sP4="; + url = "https://www.desy.de/~twhite/crystfel/crystfel-${version}.tar.gz"; + sha256 = "sha256-ogNHWYfbxRmB5TdK8K0JpcCnYOOyXapQGSPh8mfp+Tc="; }; nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers makeWrapper ] - ++ lib.optionals withGui [ wrapGAppsHook ]; + ++ lib.optionals withGui [ wrapGAppsHook3 ]; buildInputs = [ hdf5 gsl @@ -192,6 +207,7 @@ stdenv.mkDerivation rec { mosflm pinkIndexer xgandalf + pandoc ] ++ lib.optionals withGui [ gtk3 gdk-pixbuf ] ++ lib.optionals stdenv.isDarwin [ argp-standalone @@ -201,12 +217,12 @@ stdenv.mkDerivation rec { ++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ]; patches = [ + # on darwin at least, we need to link to a separate argp library; + # this patch adds a test for this and the necessary linker options ./link-to-argp-standalone-if-needed.patch - ./disable-fmemopen-on-aarch64-darwin.patch - (fetchpatch { - url = "https://gitlab.desy.de/thomas.white/crystfel/-/commit/3c54d59e1c13aaae716845fed2585770c3ca9d14.diff"; - hash = "sha256-oaJNBQQn0c+z4p1pnW4osRJA2KdKiz4hWu7uzoKY7wc="; - }) + # hotfix for an issue that occurs (at least) on NixOS: + # if the temporary path is too long, we get a segfault + ./gui-path-issue.patch ]; # CrystFEL calls mosflm by searching PATH for it. We could've create a wrapper script that sets the PATH, but @@ -218,7 +234,9 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString withBitshuffle '' for file in $out/bin/*; do - wrapProgram $file --set HDF5_PLUGIN_PATH ${hdf5-external-filter-plugins}/lib/plugins + wrapProgram $file \ + --set HDF5_PLUGIN_PATH ${hdf5-external-filter-plugins}/lib/plugins \ + --prefix PATH ":" ${lib.makeBinPath [ millepede-ii ]} done ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/gui-path-issue.patch b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/gui-path-issue.patch new file mode 100644 index 0000000000..28cd0280e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/gui-path-issue.patch @@ -0,0 +1,27 @@ +diff --git a/src/gui_index.c b/src/gui_index.c +index 2cc8e8db..13be77d5 100644 +--- a/src/gui_index.c ++++ b/src/gui_index.c +@@ -540,6 +540,7 @@ static void delete_gui_tempdir(char *tmpdir) + { + char *path; + int i; ++ size_t pathlen; + + /* List of files which it's safe to delete */ + char *files[] = {"gmon.out", "mosflm.lp", "SUMMARY", "XDS.INP", +@@ -552,11 +553,12 @@ static void delete_gui_tempdir(char *tmpdir) + + if ( tmpdir == NULL ) return; + +- path = calloc(strlen(tmpdir)+64, 1); ++ pathlen = strlen(tmpdir)+64; ++ path = calloc(pathlen, 1); + if ( path == NULL ) return; + + for ( i=0; i') +@@ -70,6 +70,12 @@ if cc.has_function('clock_gettime', prefix: '#include ') conf_data.set10('HAVE_CLOCK_GETTIME', true) endif @@ -12,15 +12,15 @@ index 59bbcfb7..dd75d4e2 100644 + argpdep = dependency('', required : false) +endif + - # ************************ libcrystfel (subdir) ************************ - - subdir('libcrystfel') -@@ -180,7 +186,7 @@ endif + if cc.has_function('sched_setaffinity', + prefix: '#include ', + args: '-D_GNU_SOURCE') +@@ -186,7 +192,7 @@ endif indexamajig = executable('indexamajig', indexamajig_sources, dependencies: [mdep, libcrystfeldep, gsldep, -- pthreaddep, zmqdep, asapodep], -+ pthreaddep, zmqdep, asapodep, argpdep], +- pthreaddep, zmqdep, asapodep, asapoproddep], ++ pthreaddep, zmqdep, asapodep, asapoproddep, argpdep], install: true, - install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') + install_rpath: crystfel_rpath) diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix index 26ec1518fe..ffdd4b6d0b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , autoreconfHook -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , which , gtk3 @@ -14,16 +14,16 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "xnec2c"; - version = "4.4.12"; + version = "4.4.16"; src = fetchurl { url = "https://www.xnec2c.org/releases/${pname}-v${version}.tar.gz"; - hash = "sha256-6Yrx6LkJjfnMA/kJUDWLhGzGopZeecARSrcR++UScsU="; + hash = "sha256-XiZi8pfmfHjGpePkRy/pF1TA+5RdxX4AGuKzG5Wqrmk="; }; nativeBuildInputs = [ autoreconfHook - wrapGAppsHook + wrapGAppsHook3 pkg-config which ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 252eadc1c3..84f94102da 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, unzip, makeDesktopItem, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: +{lib, stdenv, fetchurl, unzip, makeDesktopItem, nwjs, wrapGAppsHook3, gsettings-desktop-schemas, gtk3 }: let pname = "betaflight-configurator"; @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { inherit pname; - version = "10.9.0"; + version = "10.10.0"; src = fetchurl { url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64-portable.zip"; - sha256 = "sha256-9FzMyBIR2u1zXHtTWJABM6RF1+OyjYdEPlRwtig9blI="; + sha256 = "sha256-UB5Vr5wyCUZbOaQNckJQ1tAXwh8VSLNI1IgTiJzxV08="; }; # remove large unneeded files @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { find -name "lib*.so" -delete ''; - nativeBuildInputs = [ wrapGAppsHook unzip ]; + nativeBuildInputs = [ wrapGAppsHook3 unzip ]; buildInputs = [ gsettings-desktop-schemas gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/emuflight-configurator/default.nix index 2c51355eb5..62592b0cc3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/emuflight-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/emuflight-configurator/default.nix @@ -1,5 +1,5 @@ {lib, stdenv, fetchurl, unzip, makeDesktopItem, copyDesktopItems, nwjs -, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: +, wrapGAppsHook3, gsettings-desktop-schemas, gtk3 }: stdenv.mkDerivation rec { pname = "emuflight-configurator"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-e4HNg5yr9V5LyT0hYP6gzw0tZm4dLidJg5MQtH3L3JI="; }; - nativeBuildInputs = [ wrapGAppsHook unzip copyDesktopItems ]; + nativeBuildInputs = [ wrapGAppsHook3 unzip copyDesktopItems ]; buildInputs = [ gsettings-desktop-schemas gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/inav-configurator/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/inav-configurator/default.nix index f5216eaf6c..1a6f5951ed 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/inav-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/inav-configurator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, nwjs, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: +{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, nwjs, wrapGAppsHook3, gsettings-desktop-schemas, gtk3 }: stdenv.mkDerivation rec { pname = "inav-configurator"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1i844dzzc5s5cr4vfpi6k2kdn8jiqq2n6c0fjqvsp4wdidwjahzw"; }; - nativeBuildInputs = [ copyDesktopItems wrapGAppsHook ]; + nativeBuildInputs = [ copyDesktopItems wrapGAppsHook3 ]; buildInputs = [ gsettings-desktop-schemas gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix index 3013ce74a3..76c18a788c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix @@ -12,12 +12,12 @@ let pin = { - # See https://github.com/google-deepmind/mujoco/blob/3.0.0/cmake/MujocoDependencies.cmake#L17-L64 + # See https://github.com/google-deepmind/mujoco/blob//cmake/MujocoDependencies.cmake#L17-L64 abseil-cpp = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "2f9e432cce407ce0ae50676696666f33a77d42ac"; - hash = "sha256-D4E11bICKr3Z5RRah7QkfXVsXtuUg32FMmKpiOGjZDM="; + rev = "d7aaad83b488fd62bd51c81ecf16cd938532cc0a"; + hash = "sha256-eA2/dZpNOlex1O5PNa3XSZhpMB3AmaIoHzVDI9TD/cg="; }; benchmark = fetchFromGitHub { owner = "google"; @@ -70,8 +70,8 @@ let marchingcubecpp = fetchFromGitHub { owner = "aparis69"; repo = "MarchingCubeCpp"; - rev = "5b79e5d6bded086a0abe276a4b5a69fc17ae9bf1"; - hash = "sha256-L0DH1GJZ/3vatQAU/KZj/2xTKE6Fwcw9eQYzLdqX2N4="; + rev = "f03a1b3ec29b1d7d865691ca8aea4f1eb2c2873d"; + hash = "sha256-90ei0lpJA8XuVGI0rGb3md0Qtq8/bdkU7dUCHpp88Bw="; }; tmd = stdenv.mkDerivation rec { @@ -129,7 +129,7 @@ let in stdenv.mkDerivation rec { pname = "mujoco"; - version = "3.1.4"; + version = "3.1.5"; # Bumping version? Make sure to look though the MuJoCo's commit # history for bumped dependency pins! @@ -137,7 +137,7 @@ in stdenv.mkDerivation rec { owner = "google-deepmind"; repo = "mujoco"; rev = "refs/tags/${version}"; - hash = "sha256-VgD6ditMDpHki7l23Gjip2roA8Oi4MGpxl+4gSLTEFs="; + hash = "sha256-XKN489oexHf2/Gv0MVxXUzqyeJJTJXV99+fNi8shdsg="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix index 99d4b79d1c..707a29307e 100644 --- a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix +++ b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix @@ -70,11 +70,11 @@ in mkDerivation rec { pname = "recoll"; - version = "1.37.4"; + version = "1.37.5"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-MQnXamW7L4hyMbZDmU7XAcLv5roHcfhFGzni8YbDtq0="; + hash = "sha256-vv2AMt6ufrfxRX2yF28X3E500MYP9hnGfDb3I9RdMVU="; }; configureFlags = [ @@ -158,6 +158,8 @@ mkDerivation rec { done wrapProgram $out/share/recoll/filters/rclaudio.py \ --prefix PYTHONPATH : $PYTHONPATH + wrapProgram $out/share/recoll/filters/rcljoplin.py \ + --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} wrapProgram $out/share/recoll/filters/rclimg \ --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}" '' + lib.optionalString stdenv.isLinux '' diff --git a/third_party/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock b/third_party/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock index 65c286d021..b7658ab895 100644 --- a/third_party/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" +checksum = "6f90148830dac590fac7ccfe78ec4a8ea404c60f75a24e16407a71f0f40de775" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -18,75 +18,6 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" -[[package]] -name = "accesskit" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38" - -[[package]] -name = "accesskit_consumer" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba8b23cfca3944012ee2e5c71c02077a400e034c720eed6bd927cb6b4d1fd9" -dependencies = [ - "accesskit", -] - -[[package]] -name = "accesskit_macos" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58d062544d6cc36f4213323b7cb3a0d74ddff4b0d2311ab5e7596f4278bb2cc9" -dependencies = [ - "accesskit", - "accesskit_consumer", - "objc2", - "once_cell", -] - -[[package]] -name = "accesskit_unix" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8df4021f31969877b295fa80c4b07fcc7eb83f1985b0d3aa4f889c3427c3d5" -dependencies = [ - "accesskit", - "accesskit_consumer", - "async-channel 1.9.0", - "atspi", - "futures-lite 1.13.0", - "serde", - "zbus", -] - -[[package]] -name = "accesskit_windows" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf5b3c3828397ee832ba4a72fb1a4ace10f781e31885f774cbd531014059115" -dependencies = [ - "accesskit", - "accesskit_consumer", - "arrayvec", - "once_cell", - "paste", - "windows 0.44.0", -] - -[[package]] -name = "accesskit_winit" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcb615217efc79c4bed3094c4ca76c4bc554751d1da16f3ed4ba0459b1e8f31" -dependencies = [ - "accesskit", - "accesskit_macos", - "accesskit_unix", - "accesskit_windows", - "winit", -] - [[package]] name = "addr2line" version = "0.21.0" @@ -104,11 +35,12 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -116,29 +48,38 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] -name = "android-activity" -version = "0.4.3" +name = "allocator-api2" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", - "bitflags 1.3.2", + "bitflags 2.5.0", "cc", + "cesu8", + "jni", "jni-sys", "libc", "log", "ndk", "ndk-context", "ndk-sys", - "num_enum 0.6.1", + "num_enum", + "thiserror", ] [[package]] @@ -162,29 +103,6 @@ dependencies = [ "libc", ] -[[package]] -name = "anyhow" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" - -[[package]] -name = "arboard" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08" -dependencies = [ - "clipboard-win", - "log", - "objc", - "objc-foundation", - "objc_id", - "parking_lot", - "thiserror", - "winapi", - "x11rb", -] - [[package]] name = "arrayref" version = "0.3.7" @@ -199,27 +117,25 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asusctl" -version = "5.0.10" +version = "6.0.6" dependencies = [ "asusd", "cargo-husky", "dmi_id", - "gif", - "glam", "gumdrop", "rog_anime", "rog_aura", "rog_dbus", "rog_platform", "rog_profiles", - "tinybmp", - "tokio", - "toml 0.5.11", + "rog_slash", + "ron", + "zbus", ] [[package]] name = "asusd" -version = "5.0.10" +version = "6.0.6" dependencies = [ "cargo-husky", "concat-idents", @@ -230,46 +146,48 @@ dependencies = [ "inotify", "log", "logind-zbus", + "mio", "rog_anime", "rog_aura", "rog_platform", "rog_profiles", + "rog_slash", "serde", "serde_derive", - "systemd-zbus", "tokio", - "udev", + "udev 0.8.0", "zbus", ] [[package]] name = "asusd-user" -version = "5.0.10" +version = "6.0.6" dependencies = [ "cargo-husky", "config-traits", "dirs", "env_logger", - "log", "rog_anime", "rog_aura", "rog_dbus", "rog_platform", + "ron", "serde", "serde_derive", - "serde_json", "smol", "zbus", ] [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" dependencies = [ - "event-listener 2.5.3", + "event-listener 5.3.0", + "event-listener-strategy 0.5.2", "futures-core", + "pin-project-lite", ] [[package]] @@ -285,28 +203,27 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", - "event-listener 4.0.3", - "event-listener-strategy", + "event-listener 5.3.0", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.2.0", + "fastrand 2.1.0", + "futures-lite 2.3.0", "slab", ] @@ -322,6 +239,17 @@ dependencies = [ "futures-lite 1.13.0", ] +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.3.0", + "blocking", + "futures-lite 2.3.0", +] + [[package]] name = "async-io" version = "1.13.0" @@ -344,18 +272,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.0" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb41eb19024a91746eba0773aa5e16036045bbf45733766661099e182ea6a744" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "parking", - "polling 3.3.2", - "rustix 0.38.30", + "polling 3.7.0", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -377,7 +305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ "event-listener 4.0.3", - "event-listener-strategy", + "event-listener-strategy 0.4.0", "pin-project-lite", ] @@ -405,78 +333,74 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.30", + "rustix 0.38.34", "windows-sys 0.48.0", ] +[[package]] +name = "async-process" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +dependencies = [ + "async-channel 2.2.1", + "async-io 2.3.2", + "async-lock 3.3.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.0", + "futures-lite 2.3.0", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.61", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" dependencies = [ - "async-io 2.3.0", - "async-lock 2.8.0", + "async-io 2.3.2", + "async-lock 3.3.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.30", + "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", -] - -[[package]] -name = "atk" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39991bc421ddf72f70159011b323ff49b0f783cc676a7287c59453da2e2531cf" -dependencies = [ - "atk-sys", - "bitflags 1.3.2", - "glib", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", + "syn 2.0.61", ] [[package]] @@ -486,61 +410,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] -name = "atomic_refcell" -version = "0.1.13" +name = "auto_enums" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" - -[[package]] -name = "atspi" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "674e7a3376837b2e7d12d34d58ac47073c491dc3bf6f71a7adaf687d4d817faa" -dependencies = [ - "async-recursion", - "async-trait", - "atspi-macros", - "enumflags2", - "futures-lite 1.13.0", - "serde", - "tracing", - "zbus", - "zbus_names", -] - -[[package]] -name = "atspi-macros" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb4870a32c0eaa17e35bca0e6b16020635157121fb7d45593d242c295bc768" +checksum = "1899bfcfd9340ceea3533ea157360ba8fa864354eccbceab58e1006ecab35393" dependencies = [ + "derive_utils", + "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.61", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "az" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.2", "object", "rustc-demangle", ] @@ -552,25 +449,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] -name = "bindgen" -version = "0.69.2" +name = "base64" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c69fae65a523209d34240b60abe0c42d33d1045d445c0839d8a4894a736e2d" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "betrayer" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88df312fbb13c845a05ede7e91ab7b9fea442d9176d092bbdb954ae6db55ad5d" dependencies = [ - "bitflags 2.4.2", + "async-io 2.3.2", + "block2 0.4.0", + "flume", + "icrate 0.1.2", + "log", + "objc2 0.5.1", + "once_cell", + "parking_lot", + "png", + "windows 0.56.0", + "zbus", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools", "lazy_static", "lazycell", - "peeking_take_while", + "log", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.61", + "which", ] +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + [[package]] name = "bitflags" version = "1.3.2" @@ -579,9 +510,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -603,63 +534,77 @@ dependencies = [ [[package]] name = "block-sys" -version = "0.1.0-beta.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" dependencies = [ "objc-sys", ] [[package]] name = "block2" -version = "0.2.0-alpha.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" dependencies = [ "block-sys", - "objc2-encode", + "objc2 0.4.1", +] + +[[package]] +name = "block2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" +dependencies = [ + "block-sys", + "objc2 0.5.1", ] [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ - "async-channel 2.1.1", + "async-channel 2.2.1", "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "by_address" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.61", ] [[package]] @@ -670,47 +615,34 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cairo-rs" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" -dependencies = [ - "bitflags 1.3.2", - "cairo-sys-rs", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "calloop" -version = "0.10.6" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "log", - "nix 0.25.1", - "slotmap", + "polling 3.7.0", + "rustix 0.38.34", + "slab", "thiserror", - "vec_map", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix 0.38.34", + "wayland-backend", + "wayland-client", ] [[package]] @@ -721,12 +653,13 @@ checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -744,16 +677,6 @@ dependencies = [ "nom", ] -[[package]] -name = "cfg-expr" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" -dependencies = [ - "smallvec", - "target-lexicon", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -766,6 +689,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" + [[package]] name = "cgl" version = "0.3.2" @@ -777,16 +706,16 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -797,19 +726,71 @@ checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", + "libloading", ] [[package]] name = "clipboard-win" -version = "4.5.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342" dependencies = [ - "error-code", - "str-buf", + "lazy-bytes-cast", "winapi", ] +[[package]] +name = "clru" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codemap" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e769b5c8c8283982a987c6e948e540254f1058d5a74b8794914d4ef5fc2a24" + +[[package]] +name = "codemap-diagnostic" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc20770be05b566a963bf91505e60412c4a2d016d1ef95c5512823bb085a8122" +dependencies = [ + "codemap", + "termcolor", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -818,9 +799,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -833,29 +814,64 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.61", ] [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] [[package]] name = "config-traits" -version = "5.0.10" +version = "6.0.6" dependencies = [ "cargo-husky", "log", "ron", "serde", - "serde_derive", - "serde_json", - "toml 0.5.11", +] + +[[package]] +name = "const-field-offset" +version = "0.1.5" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "const-field-offset-macro", + "field-offset", +] + +[[package]] +name = "const-field-offset-macro" +version = "0.1.5" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "copypasta" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb85422867ca93da58b7f95fb5c0c10f6183ed6e1ef8841568968a896d3a858" +dependencies = [ + "clipboard-win", + "objc", + "objc-foundation", + "objc_id", + "smithay-clipboard", ] [[package]] @@ -876,9 +892,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.22.3" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -898,9 +914,27 @@ dependencies = [ "libc", ] +[[package]] +name = "core-text" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" +dependencies = [ + "core-foundation", + "core-graphics", + "foreign-types", + "libc", +] + +[[package]] +name = "countme" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" + [[package]] name = "cpuctl" -version = "5.0.10" +version = "6.0.6" [[package]] name = "cpufeatures" @@ -913,19 +947,50 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] +[[package]] +name = "critical-section" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-common" version = "0.1.6" @@ -936,6 +1001,27 @@ dependencies = [ "typenum", ] +[[package]] +name = "css-color-parser2" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf8ed1639f4b56ec6f31d007ff66ce4a13099dce5a9995d48368a30d62bf04bd" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "data-url" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" + [[package]] name = "deranged" version = "0.3.11" @@ -956,6 +1042,30 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "derive_utils" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] + [[package]] name = "digest" version = "0.10.7" @@ -1024,132 +1134,87 @@ dependencies = [ [[package]] name = "dmi_id" -version = "5.0.10" +version = "6.0.6" dependencies = [ "log", - "udev", + "udev 0.8.0", ] [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] -name = "ecolor" -version = "0.21.0" -source = "git+https://github.com/emilk/egui?rev=b8e798777de519de3a1878798097ab2ab0bd4def#b8e798777de519de3a1878798097ab2ab0bd4def" +name = "drm" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edf9159ef4bcecd0c5e4cbeb573b8d0037493403d542780dba5d840bbf9df56f" dependencies = [ + "bitflags 1.3.2", "bytemuck", + "drm-ffi", + "drm-fourcc", + "nix 0.26.4", ] [[package]] -name = "eframe" -version = "0.21.3" -source = "git+https://github.com/emilk/egui?rev=b8e798777de519de3a1878798097ab2ab0bd4def#b8e798777de519de3a1878798097ab2ab0bd4def" +name = "drm-ffi" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1352481b7b90e27a8a1bf8ef6b33cf18b98dba7c410e75c24bb3eef2f0d8d525" dependencies = [ - "bytemuck", - "egui", - "egui-winit", - "egui_glow", - "glow", - "glutin", - "glutin-winit", - "js-sys", - "log", - "percent-encoding", - "raw-window-handle", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winit", + "drm-sys", + "nix 0.26.4", ] [[package]] -name = "egui" -version = "0.21.0" -source = "git+https://github.com/emilk/egui?rev=b8e798777de519de3a1878798097ab2ab0bd4def#b8e798777de519de3a1878798097ab2ab0bd4def" +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1369f1679d6b706d234c4c1e0613c415c2c74b598a09ad28080ba2474b72e42d" dependencies = [ - "accesskit", - "ahash", - "epaint", - "log", - "nohash-hasher", + "libc", ] [[package]] -name = "egui-winit" -version = "0.21.1" -source = "git+https://github.com/emilk/egui?rev=b8e798777de519de3a1878798097ab2ab0bd4def#b8e798777de519de3a1878798097ab2ab0bd4def" +name = "dwrote" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" dependencies = [ - "accesskit_winit", - "arboard", - "egui", - "instant", - "log", - "smithay-clipboard", - "webbrowser", - "winit", -] - -[[package]] -name = "egui_glow" -version = "0.21.0" -source = "git+https://github.com/emilk/egui?rev=b8e798777de519de3a1878798097ab2ab0bd4def#b8e798777de519de3a1878798097ab2ab0bd4def" -dependencies = [ - "bytemuck", - "egui", - "glow", - "log", - "memoffset 0.6.5", - "wasm-bindgen", - "web-sys", + "lazy_static", + "libc", + "serde", + "serde_derive", + "winapi", + "wio", ] [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] -name = "emath" -version = "0.21.0" -source = "git+https://github.com/emilk/egui?rev=b8e798777de519de3a1878798097ab2ab0bd4def#b8e798777de519de3a1878798097ab2ab0bd4def" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "embedded-graphics" -version = "0.7.1" +name = "endi" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "750082c65094fbcc4baf9ba31583ce9a8bb7f52cadfb96f6164b1bc7f922f32b" -dependencies = [ - "az", - "byteorder", - "embedded-graphics-core", - "float-cmp", - "micromath", -] - -[[package]] -name = "embedded-graphics-core" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b1239db5f3eeb7e33e35bd10bd014e7b2537b17e071f726a09351431337cfa" -dependencies = [ - "az", - "byteorder", -] +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", "serde", @@ -1157,13 +1222,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.61", ] [[package]] @@ -1179,22 +1244,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "epaint" -version = "0.21.0" -source = "git+https://github.com/emilk/egui?rev=b8e798777de519de3a1878798097ab2ab0bd4def#b8e798777de519de3a1878798097ab2ab0bd4def" -dependencies = [ - "ab_glyph", - "ahash", - "atomic_refcell", - "bytemuck", - "ecolor", - "emath", - "log", - "nohash-hasher", - "parking_lot", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -1203,22 +1252,21 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", ] [[package]] -name = "error-code" -version = "2.3.1" +name = "euclid" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" dependencies = [ - "libc", - "str-buf", + "num-traits", ] [[package]] @@ -1249,6 +1297,17 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "event-listener" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + [[package]] name = "event-listener-strategy" version = "0.4.0" @@ -1259,6 +1318,32 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.0", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide 0.7.2", + "rayon-core", + "smallvec", + "zune-inflate", +] + [[package]] name = "fastrand" version = "1.9.0" @@ -1270,9 +1355,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1283,49 +1368,143 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "femtovg" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a056992c3a862ef9d4452bad8b6b455780382502b38b93540fb17773a54ca092" +dependencies = [ + "bitflags 2.5.0", + "fnv", + "glow", + "image", + "imgref", + "log", + "lru", + "rgb", + "rustybuzz", + "slotmap", + "unicode-bidi", + "unicode-segmentation", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "field-offset" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset", "rustc_version", ] [[package]] -name = "flate2" -version = "1.0.28" +name = "filetime" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.2", ] [[package]] name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontconfig-parser" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.4", + "slotmap", + "tinyvec", + "ttf-parser", +] + +[[package]] +name = "fontdue" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" +checksum = "9099a2f86b8e674b75d03ff154b3fe4c5208ed249ced8d69cc313a9fa40bb488" dependencies = [ - "num-traits", + "hashbrown", + "ttf-parser", ] [[package]] name = "foreign-types" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ + "foreign-types-macros", "foreign-types-shared", ] [[package]] -name = "foreign-types-shared" -version = "0.1.1" +name = "foreign-types-macros" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "form_urlencoded" @@ -1336,32 +1515,12 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", -] - [[package]] name = "futures-core" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - [[package]] name = "futures-io" version = "0.3.30" @@ -1385,28 +1544,17 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", "pin-project-lite", ] -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "futures-sink" version = "0.3.30" @@ -1427,7 +1575,6 @@ checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-io", - "futures-macro", "futures-sink", "futures-task", "memchr", @@ -1437,62 +1584,25 @@ dependencies = [ ] [[package]] -name = "gdk" -version = "0.16.2" +name = "gbm" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9cb33da481c6c040404a11f8212d193889e9b435db2c14fd86987f630d3ce1" +checksum = "f2ec389cda876966cf824111bf6e533fb934c711d473498279964a990853b3c6" dependencies = [ "bitflags 1.3.2", - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" -dependencies = [ - "bitflags 1.3.2", - "gdk-pixbuf-sys", - "gio", - "glib", + "drm", + "drm-fourcc", + "gbm-sys", "libc", ] [[package]] -name = "gdk-pixbuf-sys" -version = "0.16.3" +name = "gbm-sys" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" +checksum = "b63eba9b9b7a231514482deb08759301c9f9f049ac6869403f381834ebfeaf67" dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", "libc", - "system-deps", -] - -[[package]] -name = "gdk-sys" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", ] [[package]] @@ -1506,24 +1616,36 @@ dependencies = [ ] [[package]] -name = "gethostname" -version = "0.3.0" +name = "getrandom" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ + "cfg-if", + "js-sys", "libc", - "winapi", + "wasi", + "wasm-bindgen", ] [[package]] -name = "getrandom" -version = "0.2.12" +name = "gettext-rs" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" dependencies = [ - "cfg-if", - "libc", - "wasi", + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +dependencies = [ + "cc", + "temp-dir", ] [[package]] @@ -1536,45 +1658,22 @@ dependencies = [ "weezl", ] +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + [[package]] name = "gimli" version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" -[[package]] -name = "gio" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" -dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi", -] - [[package]] name = "gl_generator" version = "0.14.0" @@ -1595,53 +1694,6 @@ dependencies = [ "serde", ] -[[package]] -name = "glib" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16aa2475c9debed5a32832cb5ff2af5a3f9e1ab9e69df58eaadc1ab2004d6eba" -dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b" -dependencies = [ - "anyhow", - "heck", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "glib-sys" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" -dependencies = [ - "libc", - "system-deps", -] - [[package]] name = "glob" version = "0.3.1" @@ -1650,9 +1702,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glow" -version = "0.12.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" dependencies = [ "js-sys", "slotmap", @@ -1662,134 +1714,57 @@ dependencies = [ [[package]] name = "glutin" -version = "0.30.10" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc93b03242719b8ad39fb26ed2b01737144ce7bd4bfc7adadcef806596760fe" +checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746" dependencies = [ - "bitflags 1.3.2", - "cfg_aliases", + "bitflags 2.5.0", + "cfg_aliases 0.1.1", "cgl", "core-foundation", "dispatch", "glutin_egl_sys", - "glutin_glx_sys", "glutin_wgl_sys", + "icrate 0.0.4", "libloading", - "objc2", + "objc2 0.4.1", "once_cell", - "raw-window-handle", - "wayland-sys 0.30.1", - "windows-sys 0.45.0", - "x11-dl", + "raw-window-handle 0.5.2", + "wayland-sys", + "windows-sys 0.48.0", ] [[package]] name = "glutin-winit" -version = "0.3.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629a873fc04062830bfe8f97c03773bcd7b371e23bcc465d0a61448cd1588fa4" +checksum = "1ebcdfba24f73b8412c5181e56f092b5eff16671c514ce896b258a0a64bd7735" dependencies = [ - "cfg_aliases", + "cfg_aliases 0.1.1", "glutin", - "raw-window-handle", + "raw-window-handle 0.5.2", "winit", ] [[package]] name = "glutin_egl_sys" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af784eb26c5a68ec85391268e074f0aa618c096eadb5d6330b0911cf34fe57c5" +checksum = "77cc5623f5309ef433c3dd4ca1223195347fe62c413da8e2fdd0eb76db2d9bcd" dependencies = [ "gl_generator", - "windows-sys 0.45.0", -] - -[[package]] -name = "glutin_glx_sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b53cb5fe568964aa066a3ba91eac5ecbac869fb0842cd0dc9e412434f1a1494" -dependencies = [ - "gl_generator", - "x11-dl", + "windows-sys 0.48.0", ] [[package]] name = "glutin_wgl_sys" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef89398e90033fc6bc65e9bd42fd29bbbfd483bda5b56dc5562f455550618165" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" dependencies = [ "gl_generator", ] -[[package]] -name = "gobject-sys" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gtk" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d3507d43908c866c805f74c9dd593c0ce7ba5c38e576e41846639cdcd4bee6" -dependencies = [ - "atk", - "bitflags 1.3.2", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "once_cell", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk3-macros" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "096eb63c6fedf03bafe65e5924595785eaf1bcb7200dac0f2cbe9c9738f05ad8" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "gumdrop" version = "0.8.1" @@ -1811,10 +1786,24 @@ dependencies = [ ] [[package]] -name = "hashbrown" -version = "0.14.3" +name = "half" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] [[package]] name = "heck" @@ -1824,9 +1813,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1849,11 +1838,229 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "i-slint-backend-linuxkms" +version = "1.6.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "calloop", + "drm", + "gbm", + "gbm-sys", + "glutin", + "i-slint-common", + "i-slint-core", + "i-slint-renderer-femtovg", + "input", + "libseat", + "nix 0.27.1", + "raw-window-handle 0.5.2", + "xkbcommon", +] + +[[package]] +name = "i-slint-backend-selector" +version = "1.6.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "cfg-if", + "i-slint-backend-linuxkms", + "i-slint-backend-winit", + "i-slint-common", + "i-slint-core", +] + +[[package]] +name = "i-slint-backend-winit" +version = "1.6.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "cfg-if", + "cfg_aliases 0.2.0", + "cocoa", + "const-field-offset", + "copypasta", + "derive_more", + "glutin", + "glutin-winit", + "i-slint-common", + "i-slint-core", + "i-slint-core-macros", + "i-slint-renderer-femtovg", + "i-slint-renderer-skia", + "lyon_path", + "once_cell", + "pin-weak", + "raw-window-handle 0.5.2", + "scoped-tls-hkt", + "scopeguard", + "softbuffer", + "wasm-bindgen", + "web-sys", + "winit", +] + +[[package]] +name = "i-slint-common" +version = "1.6.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "cfg-if", + "derive_more", + "fontdb", + "libloading", +] + +[[package]] +name = "i-slint-compiler" +version = "1.6.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "by_address", + "codemap", + "codemap-diagnostic", + "css-color-parser2", + "derive_more", + "fontdue", + "i-slint-common", + "image", + "itertools", + "linked_hash_set", + "lyon_extra", + "lyon_path", + "num_enum", + "once_cell", + "proc-macro2", + "quote", + "resvg", + "rowan", + "smol_str", + "strum", + "thiserror", + "url", +] + +[[package]] +name = "i-slint-core" +version = "1.6.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "auto_enums", + "bitflags 2.5.0", + "cfg-if", + "clru", + "const-field-offset", + "derive_more", + "euclid", + "gettext-rs", + "i-slint-common", + "i-slint-core-macros", + "image", + "integer-sqrt", + "lyon_algorithms", + "lyon_extra", + "lyon_geom", + "lyon_path", + "num-traits", + "once_cell", + "pin-project", + "pin-weak", + "portable-atomic", + "raw-window-handle 0.6.1", + "resvg", + "rgb", + "scoped-tls-hkt", + "scopeguard", + "slab", + "static_assertions", + "strum", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", + "vtable", + "wasm-bindgen", + "web-sys", + "web-time 1.1.0", +] + +[[package]] +name = "i-slint-core-macros" +version = "1.6.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "quote", + "syn 2.0.61", +] + +[[package]] +name = "i-slint-renderer-femtovg" +version = "1.6.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "cfg-if", + "const-field-offset", + "core-foundation", + "core-text", + "derive_more", + "dwrote", + "femtovg", + "glow", + "i-slint-common", + "i-slint-core", + "i-slint-core-macros", + "imgref", + "lyon_path", + "once_cell", + "pin-weak", + "raw-window-handle 0.5.2", + "rgb", + "scoped-tls-hkt", + "ttf-parser", + "unicode-script", + "unicode-segmentation", + "wasm-bindgen", + "web-sys", + "winapi", +] + +[[package]] +name = "i-slint-renderer-skia" +version = "1.6.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "bytemuck", + "cfg-if", + "cfg_aliases 0.2.0", + "cocoa", + "const-field-offset", + "core-foundation", + "core-graphics-types", + "derive_more", + "foreign-types", + "glow", + "glutin", + "i-slint-common", + "i-slint-core", + "i-slint-core-macros", + "lyon_path", + "metal", + "objc", + "once_cell", + "pin-weak", + "raw-window-handle 0.5.2", + "scoped-tls-hkt", + "skia-safe", + "softbuffer", + "unicode-segmentation", + "vtable", + "windows 0.54.0", +] + [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1872,6 +2079,27 @@ dependencies = [ "cc", ] +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2 0.3.0", + "dispatch", + "objc2 0.4.1", +] + +[[package]] +name = "icrate" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" +dependencies = [ + "block2 0.4.0", + "objc2 0.5.1", +] + [[package]] name = "idna" version = "0.5.0" @@ -1883,10 +2111,40 @@ dependencies = [ ] [[package]] -name = "indexmap" -version = "2.1.0" +name = "image" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif 0.13.1", + "jpeg-decoder", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -1914,6 +2172,26 @@ dependencies = [ "libc", ] +[[package]] +name = "input" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e74cd82cedcd66db78742a8337bdc48f188c4d2c12742cbc5cd85113f0b059" +dependencies = [ + "bitflags 1.3.2", + "input-sys", + "io-lifetimes", + "libc", + "log", + "udev 0.7.0", +] + +[[package]] +name = "input-sys" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0" + [[package]] name = "instant" version = "0.1.12" @@ -1921,9 +2199,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", +] + +[[package]] +name = "integer-sqrt" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770" +dependencies = [ + "num-traits", ] [[package]] @@ -1939,29 +2223,29 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix 0.38.30", + "libc", "windows-sys 0.52.0", ] [[package]] name = "itertools" -version = "0.10.5" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -1987,18 +2271,27 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] -name = "js-sys" -version = "0.3.61" +name = "jpeg-decoder" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2009,6 +2302,22 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" +[[package]] +name = "kurbo" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5aa9f0f96a938266bdb12928a67169e8d22c6a786fda8ed984b85e6ba93c3c" +dependencies = [ + "arrayvec", + "smallvec", +] + +[[package]] +name = "lazy-bytes-cast" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b" + [[package]] name = "lazy_static" version = "1.4.0" @@ -2022,55 +2331,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "libappindicator" -version = "0.8.0" +name = "lebe" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e1edfdc9b0853358306c6dfb4b77c79c779174256fe93d80c0b5ebca451a2f" -dependencies = [ - "glib", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", -] - -[[package]] -name = "libappindicator-sys" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08fcb2bea89cee9613982501ec83eaa2d09256b24540ae463c52a28906163918" -dependencies = [ - "gtk-sys", - "libloading", - "once_cell", -] +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.5", ] [[package]] -name = "libredox" -version = "0.0.1" +name = "libm" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.2", - "libc", - "redox_syscall 0.4.1", -] +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libredox" @@ -2078,11 +2364,41 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + +[[package]] +name = "libseat" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a0adf8d8607a73a5b74cbe4132f57cb349e4bf860103cd089461bbcbc9907e" +dependencies = [ + "errno", + "libseat-sys", + "log", +] + +[[package]] +name = "libseat-sys" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3671cb5e03871f1d6bf0b3b5daa9275549e348fa6359e0f9adb910ca163d4c34" +dependencies = [ + "pkg-config", +] + [[package]] name = "libudev-sys" version = "0.1.4" @@ -2095,9 +2411,9 @@ dependencies = [ [[package]] name = "libusb1-sys" -version = "0.6.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d0e2afce4245f2c9a418511e5af8718bcaf2fa408aefb259504d1a9cb25f27" +checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f" dependencies = [ "cc", "libc", @@ -2105,6 +2421,21 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linked_hash_set" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" +dependencies = [ + "linked-hash-map", +] + [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -2118,10 +2449,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] -name = "lock_api" -version = "0.4.11" +name = "locale_config" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2129,20 +2473,67 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "logind-zbus" -version = "3.1.2" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a2542f6e91ea92780158654852190edb2ba0b232d9d00d649d0c691cb7eb3" +checksum = "15b2375aeabe771d0774a333bf20aa89ea1805f4f9d094fc45e7390bfc7da42a" dependencies = [ "serde", "zbus", ] +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" + +[[package]] +name = "lyon_algorithms" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_extra" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4a243ce61e7e5f3ae6c72a88d8fb081b6c69f13500c15e99cfd1159a833b20" +dependencies = [ + "lyon_path", + "thiserror", +] + +[[package]] +name = "lyon_geom" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + [[package]] name = "mac-notification-sys" version = "0.5.9" @@ -2167,52 +2558,52 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" -version = "0.5.10" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] [[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 = "memoffset" -version = "0.7.1" +name = "metal" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "autocfg", + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "micromath" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc4010833aea396656c2f91ee704d51a6f1329ec2ab56ffd00bfd56f7481ea94" - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2231,9 +2622,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", @@ -2241,9 +2632,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -2252,16 +2643,26 @@ dependencies = [ ] [[package]] -name = "ndk" +name = "nanorand" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "bitflags 1.3.2", + "getrandom", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.5.0", "jni-sys", + "log", "ndk-sys", - "num_enum 0.5.11", - "raw-window-handle", + "num_enum", + "raw-window-handle 0.5.2", "thiserror", ] @@ -2273,38 +2674,13 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.4.1+23.1.7779620" +version = "0.5.0+25.2.9519653" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" dependencies = [ "jni-sys", ] -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - [[package]] name = "nix" version = "0.26.4" @@ -2314,15 +2690,31 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.7.1", - "pin-utils", ] [[package]] -name = "nohash-hasher" -version = "0.2.0" +name = "nix" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases 0.1.1", + "libc", + "memoffset", +] [[package]] name = "nom" @@ -2336,8 +2728,8 @@ dependencies = [ [[package]] name = "notify-rust" -version = "4.6.0" -source = "git+https://github.com/flukejones/notify-rust.git#c83082a2549932bde52a4ec449b9981fc39e9a0d" +version = "4.7.0" +source = "git+https://github.com/flukejones/notify-rust.git?rev=54176413b81189a3e4edbdc20a0b4f7e2e35c063#54176413b81189a3e4edbdc20a0b4f7e2e35c063" dependencies = [ "mac-notification-sys", "serde", @@ -2346,12 +2738,19 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.17" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2366,44 +2765,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.5.11", -] - -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", + "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "num_enum_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.48", + "syn 2.0.61", ] [[package]] @@ -2413,6 +2791,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", + "objc_exception", ] [[package]] @@ -2428,28 +2807,49 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.2.0-beta.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" +checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" [[package]] name = "objc2" -version = "0.3.0-beta.3.patch-leaks.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" dependencies = [ - "block2", "objc-sys", - "objc2-encode", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b25e1034d0e636cd84707ccdaa9f81243d399196b8a773946dcffec0401659" +dependencies = [ + "objc-sys", + "objc2-encode 4.0.1", ] [[package]] name = "objc2-encode" -version = "2.0.0-pre.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc2-encode" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88658da63e4cc2c8adb1262902cd6af51094df0488b760d6fd27194269c0950a" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" dependencies = [ - "objc-sys", + "cc", ] [[package]] @@ -2475,6 +2875,10 @@ name = "once_cell" version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +dependencies = [ + "critical-section", + "portable-atomic", +] [[package]] name = "orbclient" @@ -2504,32 +2908,6 @@ dependencies = [ "ttf-parser", ] -[[package]] -name = "pango" -version = "0.16.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94" -dependencies = [ - "bitflags 1.3.2", - "gio", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - [[package]] name = "parking" version = "2.2.0" @@ -2538,9 +2916,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -2548,28 +2926,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -2578,10 +2950,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] -name = "pin-project-lite" -version = "0.2.13" +name = "pico-args" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2589,6 +2987,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pin-weak" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b330c9d1b92dfe68442ca20b009c717d5f0b1e3cf4965e62f704c3c6e95a1305" + [[package]] name = "piper" version = "0.2.1" @@ -2596,7 +3000,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-io", ] @@ -2608,21 +3012,21 @@ checksum = "5de5067af0cd27add969cdb4ef2eecc955f59235f3b7a75a3c6ac9562cfb6b81" [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "png" -version = "0.17.11" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.2", ] [[package]] @@ -2653,18 +3057,28 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.2" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi", "pin-project-lite", - "rustix 0.38.30", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +dependencies = [ + "critical-section", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -2677,49 +3091,43 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn 2.0.61", +] + [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "toml_edit 0.21.1", ] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + [[package]] name = "quick-xml" version = "0.30.0" @@ -2730,10 +3138,19 @@ dependencies = [ ] [[package]] -name = "quote" -version = "1.0.35" +name = "quick-xml" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2774,6 +3191,32 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" +[[package]] +name = "raw-window-handle" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "redox_syscall" version = "0.3.5" @@ -2793,21 +3236,30 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.4" +name = "redox_syscall" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", - "libredox 0.0.1", + "libredox 0.1.3", "thiserror", ] [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -2817,9 +3269,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -2828,27 +3280,49 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "resvg" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2327ced609dadeed3e9702fec3e6b2ddd208758a9268d13e06566c6101ba533" +dependencies = [ + "log", + "pico-args", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] [[package]] name = "rog-control-center" -version = "5.0.10" +version = "6.0.6" dependencies = [ "asusd", + "betrayer", "cargo-husky", + "concat-idents", + "config-traits", "dirs", - "eframe", - "egui", + "dmi_id", "env_logger", - "gtk", "gumdrop", - "libappindicator", "log", - "nix 0.26.4", + "nix 0.28.0", "notify-rust", - "png_pong", "rog_anime", "rog_aura", "rog_dbus", @@ -2856,22 +3330,22 @@ dependencies = [ "rog_profiles", "serde", "serde_derive", - "serde_json", + "slint", + "slint-build", "supergfxctl", "tempfile", "tokio", - "toml 0.5.11", "versions", "zbus", ] [[package]] name = "rog_anime" -version = "5.0.10" +version = "6.0.6" dependencies = [ "cargo-husky", "dmi_id", - "gif", + "gif 0.12.0", "glam", "log", "pix", @@ -2884,7 +3358,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "5.0.10" +version = "6.0.6" dependencies = [ "cargo-husky", "dmi_id", @@ -2898,7 +3372,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "5.0.10" +version = "6.0.6" dependencies = [ "asusd", "cargo-husky", @@ -2906,29 +3380,28 @@ dependencies = [ "rog_aura", "rog_platform", "rog_profiles", + "rog_slash", "zbus", ] [[package]] name = "rog_platform" -version = "5.0.10" +version = "6.0.6" dependencies = [ "cargo-husky", "concat-idents", "inotify", "log", - "rog_aura", "rusb", "serde", - "serde_derive", "typeshare", - "udev", + "udev 0.8.0", "zbus", ] [[package]] name = "rog_profiles" -version = "5.0.10" +version = "6.0.6" dependencies = [ "cargo-husky", "log", @@ -2936,38 +3409,68 @@ dependencies = [ "serde", "serde_derive", "typeshare", - "udev", + "udev 0.8.0", "zbus", ] [[package]] name = "rog_simulators" -version = "5.0.10" +version = "6.0.6" dependencies = [ - "glam", "log", "rog_anime", "sdl2", "uhid-virt", ] +[[package]] +name = "rog_slash" +version = "6.0.6" +dependencies = [ + "cargo-husky", + "dmi_id", + "serde", + "serde_derive", + "typeshare", + "zbus", +] + [[package]] name = "ron" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64", - "bitflags 2.4.2", + "base64 0.21.7", + "bitflags 2.5.0", "serde", "serde_derive", ] [[package]] -name = "rusb" -version = "0.9.3" +name = "rowan" +version = "0.15.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fff149b6033f25e825cbb7b2c625a11ee8e6dac09264d49beb125e39aa97bf" +checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49" +dependencies = [ + "countme", + "hashbrown", + "memoffset", + "rustc-hash", + "text-size", +] + +[[package]] +name = "roxmltree" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" + +[[package]] +name = "rusb" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4" dependencies = [ "libc", "libusb1-sys", @@ -2975,9 +3478,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3010,11 +3513,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys 0.4.13", @@ -3022,10 +3525,32 @@ dependencies = [ ] [[package]] -name = "ryu" +name = "rustversion" version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" + +[[package]] +name = "rustybuzz" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88117946aa1bfb53c2ae0643ceac6506337f44887f8c9fbfb43587b1cc52ba49" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "smallvec", + "ttf-parser", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3042,6 +3567,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" +[[package]] +name = "scoped-tls-hkt" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ddc765d3410d9f6c6ca071bf0b67f6b01e3ec4595dc3892f02677e75819dddc" + [[package]] name = "scopeguard" version = "1.2.0" @@ -3050,22 +3581,22 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.5.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09" +checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" dependencies = [ "ab_glyph", "log", - "memmap2", + "memmap2 0.9.4", "smithay-client-toolkit", "tiny-skia", ] [[package]] name = "sdl2" -version = "0.35.2" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7959277b623f1fb9e04aea73686c3ca52f01b2145f8ea16f4ff30d8b7623b1a" +checksum = "8356b2697d1ead5a34f40bcc3c5d3620205fe0c7be0a14656223bfeec0258891" dependencies = [ "bitflags 1.3.2", "lazy_static", @@ -3075,9 +3606,9 @@ dependencies = [ [[package]] name = "sdl2-sys" -version = "0.35.2" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3586be2cf6c0a8099a79a12b4084357aa9b3e0b0d7980e3b67aaf7a9d55f9f0" +checksum = "26bcacfdd45d539fb5785049feb0038a63931aa896c7763a2a12e125ec58bd29" dependencies = [ "cfg-if", "libc", @@ -3086,35 +3617,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.195" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.61", ] [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -3123,13 +3654,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.61", ] [[package]] @@ -3154,15 +3685,15 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3173,6 +3704,50 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "skia-bindings" +version = "0.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace7c5359ccb009880e65958eaf1e2fa68ee19ada6931300c2f1942f84abf2c3" +dependencies = [ + "bindgen", + "cc", + "flate2", + "heck", + "lazy_static", + "regex", + "serde_json", + "tar", + "toml", +] + +[[package]] +name = "skia-safe" +version = "0.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0a4a3df502b317456a34df181ac67a7a6443b0f2e4b883ac220dba1dcb3ce38" +dependencies = [ + "bitflags 2.5.0", + "lazy_static", + "skia-bindings", + "windows 0.54.0", +] + [[package]] name = "slab" version = "0.4.9" @@ -3182,6 +3757,44 @@ dependencies = [ "autocfg", ] +[[package]] +name = "slint" +version = "1.6.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "const-field-offset", + "i-slint-backend-selector", + "i-slint-core", + "i-slint-renderer-femtovg", + "num-traits", + "once_cell", + "pin-weak", + "slint-macros", + "vtable", +] + +[[package]] +name = "slint-build" +version = "1.6.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "i-slint-compiler", + "spin_on", + "thiserror", + "toml_edit 0.22.12", +] + +[[package]] +name = "slint-macros" +version = "1.6.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "i-slint-compiler", + "proc-macro2", + "quote", + "spin_on", +] + [[package]] name = "slotmap" version = "1.0.7" @@ -3193,37 +3806,44 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" -version = "0.16.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "calloop", - "dlib", - "lazy_static", + "calloop-wayland-source", + "cursor-icon", + "libc", "log", - "memmap2", - "nix 0.24.3", - "pkg-config", + "memmap2 0.9.4", + "rustix 0.38.34", + "thiserror", + "wayland-backend", "wayland-client", + "wayland-csd-frame", "wayland-cursor", "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", ] [[package]] name = "smithay-clipboard" -version = "0.6.6" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" +checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" dependencies = [ + "libc", "smithay-client-toolkit", - "wayland-client", + "wayland-backend", ] [[package]] @@ -3234,15 +3854,24 @@ checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" dependencies = [ "async-channel 1.9.0", "async-executor", - "async-fs", + "async-fs 1.6.0", "async-io 1.13.0", "async-lock 2.8.0", "async-net", - "async-process", + "async-process 1.8.1", "blocking", "futures-lite 1.13.0", ] +[[package]] +name = "smol_str" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +dependencies = [ + "serde", +] + [[package]] name = "socket2" version = "0.4.10" @@ -3255,36 +3884,106 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "softbuffer" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f266ce2aa23eaaaa4e758ed44495d505d00fb79f359d46f6c1900cb053123b62" +dependencies = [ + "bytemuck", + "cfg_aliases 0.1.1", + "cocoa", + "core-graphics", + "fastrand 2.1.0", + "foreign-types", + "js-sys", + "log", + "memmap2 0.9.4", + "objc", + "raw-window-handle 0.5.2", + "redox_syscall 0.4.1", + "rustix 0.38.34", + "wasm-bindgen", + "wayland-backend", + "wayland-client", + "wayland-sys", + "web-sys", "windows-sys 0.48.0", ] +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spin_on" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076e103ed41b9864aa838287efe5f4e3a7a0362dd00671ae62a212e5e4612da2" +dependencies = [ + "pin-utils", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - [[package]] name = "strict-num" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strum" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.61", +] [[package]] name = "supergfxctl" -version = "5.1.2" -source = "git+https://gitlab.com/asus-linux/supergfxctl.git#a54163c4ced0f58dbbc134392d8a2118ee6c5c64" +version = "5.2.2" +source = "git+https://gitlab.com/asus-linux/supergfxctl.git?rev=4eb6e97c22b68ae8d1e80500709b0c0580776ad3#4eb6e97c22b68ae8d1e80500709b0c0580776ad3" dependencies = [ "log", "logind-zbus", @@ -3292,10 +3991,20 @@ dependencies = [ "serde_derive", "serde_json", "tokio", - "udev", + "udev 0.8.0", "zbus", ] +[[package]] +name = "svgtypes" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fae3064df9b89391c9a76a0425a69d124aee9c5c28455204709e72c39868a43c" +dependencies = [ + "kurbo", + "siphasher", +] + [[package]] name = "syn" version = "1.0.109" @@ -3309,9 +4018,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", @@ -3319,54 +4028,41 @@ dependencies = [ ] [[package]] -name = "system-deps" -version = "6.2.0" +name = "tar" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml 0.8.8", - "version-compare", + "filetime", + "libc", + "xattr", ] -[[package]] -name = "systemd-zbus" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbb1b6ea6d96b14a7e94532711efc4106337fe8b1d6bdf8ba5318012a9fa7e3" -dependencies = [ - "serde", - "zbus", -] - -[[package]] -name = "target-lexicon" -version = "0.12.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" - [[package]] name = "tauri-winrt-notification" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" dependencies = [ - "quick-xml", + "quick-xml 0.30.0", "windows 0.51.1", ] [[package]] -name = "tempfile" -version = "3.9.0" +name = "temp-dir" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.30", + "fastrand 2.1.0", + "rustix 0.38.34", "windows-sys 0.52.0", ] @@ -3380,32 +4076,50 @@ dependencies = [ ] [[package]] -name = "thiserror" -version = "1.0.56" +name = "text-size" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" + +[[package]] +name = "thiserror" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.61", +] + +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", ] [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", + "num-conv", "powerfmt", "serde", "time-core", @@ -3419,38 +4133,30 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "tiny-skia" -version = "0.8.4" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", "arrayvec", "bytemuck", "cfg-if", + "log", "png", "tiny-skia-path", ] [[package]] name = "tiny-skia-path" -version = "0.8.4" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" dependencies = [ "arrayref", "bytemuck", "strict-num", ] -[[package]] -name = "tinybmp" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e959c507975d768a226a08227d56791f6e60bddcf714ad7ef67ae2d20bae743" -dependencies = [ - "embedded-graphics", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -3468,16 +4174,16 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -3490,28 +4196,19 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.61", ] [[package]] name = "toml" -version = "0.5.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.22.12", ] [[package]] @@ -3525,26 +4222,26 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.8", ] [[package]] @@ -3566,7 +4263,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.61", ] [[package]] @@ -3592,9 +4289,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typeshare" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44d1a2f454cb35fbe05b218c410792697e76bd868f48d3a418f2cd1a7d527d6" +checksum = "04f17399b76c2e743d58eac0635d7686e9c00f48cd4776f00695d9882a7d3187" dependencies = [ "chrono", "serde", @@ -3604,12 +4301,12 @@ dependencies = [ [[package]] name = "typeshare-annotation" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc670d0e358428857cc3b4bf504c691e572fccaec9542ff09212d3f13d74b7a9" +checksum = "a615d6c2764852a2e88a4f16e9ce1ea49bb776b5872956309e170d63a042a34f" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.61", ] [[package]] @@ -3623,22 +4320,35 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "udev" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1" +dependencies = [ + "io-lifetimes", + "libc", + "libudev-sys", + "mio", + "pkg-config", +] + [[package]] name = "uds_windows" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset", "tempfile", "winapi", ] [[package]] name = "uhid-virt" -version = "0.0.6" +version = "0.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f16e165f87ad3df8660688cb786c7ea0af76ff15037f8a0da3756bef8459499" +checksum = "4f70f1f603b96df07624cdd31be4496a983a3f7f079cf2606aa289719114249f" dependencies = [ "enumflags2", "libc", @@ -3660,6 +4370,18 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +[[package]] +name = "unicode-bidi-mirroring" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" + +[[package]] +name = "unicode-ccc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" + [[package]] name = "unicode-ident" version = "1.0.12" @@ -3667,14 +4389,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "unicode-normalization" -version = "0.1.22" +name = "unicode-linebreak" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + +[[package]] +name = "unicode-script" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + [[package]] name = "url" version = "2.5.0" @@ -3686,18 +4438,39 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "usvg" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c704361d822337cfc00387672c7b59eaa72a1f0744f62b2a68aa228a0c6927d" +dependencies = [ + "base64 0.22.1", + "data-url", + "flate2", + "fontdb", + "imagesize", + "kurbo", + "log", + "pico-args", + "roxmltree", + "rustybuzz", + "simplecss", + "siphasher", + "strict-num", + "svgtypes", + "tiny-skia-path", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "xmlwriter", +] + [[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version-compare" version = "0.1.1" @@ -3712,14 +4485,35 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "versions" -version = "4.1.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee97e1d97bd593fb513912a07691b742361b3dd64ad56f2c694ea2dbfe0665d3" +checksum = "38a8931f8d167b6448076020e70b9de46dcf5ea1731212481a092d0071c4ac5b" dependencies = [ "itertools", "nom", ] +[[package]] +name = "vtable" +version = "0.2.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "const-field-offset", + "portable-atomic", + "stable_deref_trait", + "vtable-macro", +] + +[[package]] +name = "vtable-macro" +version = "0.2.0" +source = "git+https://github.com/slint-ui/slint.git#65160638a1c36cf8ee19047554f7bb4384c69ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] + [[package]] name = "waker-fn" version = "1.1.1" @@ -3728,9 +4522,9 @@ checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -3744,9 +4538,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3754,24 +4548,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.61", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -3781,9 +4575,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3791,140 +4585,179 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.61", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] -name = "wayland-client" -version = "0.29.5" +name = "wayland-backend" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ - "bitflags 1.3.2", + "cc", "downcast-rs", - "libc", - "nix 0.24.3", + "rustix 0.38.34", "scoped-tls", - "wayland-commons", - "wayland-scanner", - "wayland-sys 0.29.5", + "smallvec", + "wayland-sys", ] [[package]] -name = "wayland-commons" -version = "0.29.5" +name = "wayland-client" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys 0.29.5", + "bitflags 2.5.0", + "rustix 0.38.34", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.5.0", + "cursor-icon", + "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.29.5" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" dependencies = [ - "nix 0.24.3", + "rustix 0.38.34", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.29.5" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", + "wayland-backend", "wayland-client", - "wayland-commons", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", "wayland-scanner", ] [[package]] name = "wayland-scanner" -version = "0.29.5" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" dependencies = [ "proc-macro2", + "quick-xml 0.31.0", "quote", - "xml-rs", ] [[package]] name = "wayland-sys" -version = "0.29.5" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" dependencies = [ "dlib", - "lazy_static", - "pkg-config", -] - -[[package]] -name = "wayland-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" -dependencies = [ - "dlib", - "lazy_static", "log", + "once_cell", "pkg-config", ] [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webbrowser" -version = "0.8.12" +name = "web-time" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" dependencies = [ - "core-foundation", - "home", - "jni", - "log", - "ndk-context", - "objc", - "raw-window-handle", - "url", - "web-sys", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", ] [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.34", +] [[package]] name = "winapi" @@ -3944,20 +4777,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3966,17 +4790,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-targets 0.42.2", -] - [[package]] name = "windows" version = "0.51.1" @@ -3987,6 +4800,26 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core 0.56.0", + "windows-targets 0.52.5", +] + [[package]] name = "windows-core" version = "0.51.1" @@ -4002,29 +4835,60 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", ] [[package]] name = "windows-implement" -version = "0.44.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce87ca8e3417b02dc2a8a22769306658670ec92d78f1bd420d6310a67c245c6" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.61", ] [[package]] name = "windows-interface" -version = "0.44.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "853f69a591ecd4f810d29f17e902d40e349fb05b0b11fff63b08b826bfe39c7f" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.61", +] + +[[package]] +name = "windows-result" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] @@ -4051,7 +4915,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -4086,17 +4950,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -4113,9 +4978,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -4131,9 +4996,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -4149,9 +5014,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -4167,9 +5038,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -4185,9 +5056,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -4203,9 +5074,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -4221,85 +5092,90 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" -version = "0.28.7" +version = "0.29.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" +checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" dependencies = [ + "ahash", "android-activity", - "bitflags 1.3.2", - "cfg_aliases", + "atomic-waker", + "bitflags 2.5.0", + "calloop", + "cfg_aliases 0.1.1", "core-foundation", "core-graphics", - "dispatch", - "instant", + "cursor-icon", + "icrate 0.0.4", + "js-sys", "libc", "log", - "mio", + "memmap2 0.9.4", "ndk", - "objc2", + "ndk-sys", + "objc2 0.4.1", "once_cell", "orbclient", - "percent-encoding", - "raw-window-handle", + "raw-window-handle 0.5.2", "redox_syscall 0.3.5", + "rustix 0.38.34", "sctk-adwaita", "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", "wayland-client", - "wayland-commons", "wayland-protocols", - "wayland-scanner", + "wayland-protocols-plasma", "web-sys", - "windows-sys 0.45.0", - "x11-dl", + "web-time 0.2.4", + "windows-sys 0.48.0", + "xkbcommon-dl", ] [[package]] name = "winnow" -version = "0.5.34" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] -name = "x11-dl" -version = "2.21.0" +name = "winnow" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +dependencies = [ + "memchr", +] + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" -dependencies = [ - "gethostname", - "nix 0.26.4", - "winapi", - "winapi-wsapoll", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" -dependencies = [ - "nix 0.26.4", + "linux-raw-sys 0.4.13", + "rustix 0.38.34", ] [[package]] @@ -4310,46 +5186,80 @@ checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" dependencies = [ - "nix 0.26.4", + "libc", "winapi", ] [[package]] -name = "xml-rs" -version = "0.8.19" +name = "xkbcommon" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.5.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + +[[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "zbus" -version = "3.14.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" dependencies = [ "async-broadcast", "async-executor", - "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-process", + "async-fs 2.1.2", + "async-io 2.3.2", + "async-lock 3.3.0", + "async-process 2.2.2", "async-recursion", "async-task", "async-trait", "blocking", - "byteorder", "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener 5.3.0", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.4", - "once_cell", + "nix 0.28.0", "ordered-stream", "rand", "serde", @@ -4358,7 +5268,7 @@ dependencies = [ "static_assertions", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -4367,9 +5277,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4381,9 +5291,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.6.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -4392,33 +5302,41 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.61", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", ] [[package]] name = "zvariant" -version = "3.15.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "zvariant_derive", @@ -4426,9 +5344,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4439,9 +5357,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" dependencies = [ "proc-macro2", "quote", diff --git a/third_party/nixpkgs/pkgs/applications/system/asusctl/default.nix b/third_party/nixpkgs/pkgs/applications/system/asusctl/default.nix index ba18d23889..53628433a0 100644 --- a/third_party/nixpkgs/pkgs/applications/system/asusctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/asusctl/default.nix @@ -3,31 +3,34 @@ , fetchFromGitLab , systemd , coreutils +, gnugrep , pkg-config -, cmake , fontconfig -, gtk3 -, libappindicator , libGL +, libinput +, libxkbcommon +, mesa +, seatd +, wayland }: rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "5.0.10"; + version = "6.0.6"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-H8x3nfOFRv9DkbDkFw+LO1tdHiVyU3SzetqED4twPSk="; + hash = "sha256-to2HJAqU3+xl6Wt90GH7RA7079v1QyP+AE0pL/9rd/M="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ecolor-0.21.0" = "sha256-m7eHX6flwO21umtx3dnIuVUnNsEs3ZCyOk5Vvp/lVfI="; - "notify-rust-4.6.0" = "sha256-jhCgisA9f6AI9e9JQUYRtEt47gQnDv5WsdRKFoKvHJs="; - "supergfxctl-5.1.2" = "sha256-WDbUgvWExk5cs2cpjo88CiROdEbc01o2DELhRi9gju4="; + "const-field-offset-0.1.5" = "sha256-53pT9ERsmF4lM9tVG09hgbM0zfbTp1qSM+NDyFQxe3c="; + "notify-rust-4.7.0" = "sha256-A7edUorty5GpGXCUQPszZuXtLdEmbmrDSU9JcoDaiaI="; + "supergfxctl-5.2.2" = "sha256-hg1QJ7DLtn5oH6IqQu7BcWIsZKAsFy6jjsjF/2o1Cos="; }; }; @@ -37,7 +40,9 @@ rustPlatform.buildRustPackage rec { asusd-user/src/daemon.rs asusd/src/ctrl_anime/config.rs rog-aura/src/aura_detection.rs + rog-control-center/src/lib.rs rog-control-center/src/main.rs + rog-control-center/src/tray.rs " for file in $files; do substituteInPlace $file --replace /usr/share $out/share @@ -50,11 +55,32 @@ rustPlatform.buildRustPackage rec { substituteInPlace data/asusd-user.service \ --replace /usr/bin/asusd-user $out/bin/asusd-user \ --replace /usr/bin/sleep ${coreutils}/bin/sleep + + substituteInPlace Makefile \ + --replace /usr/bin/grep ${lib.getExe gnugrep} ''; - nativeBuildInputs = [ pkg-config cmake rustPlatform.bindgenHook ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ systemd fontconfig gtk3 ]; + buildInputs = [ + fontconfig + libGL + libinput + libxkbcommon + mesa + seatd + systemd + wayland + ]; + + # force linking to all the dlopen()ed dependencies + RUSTFLAGS = map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-lfontconfig" + "-lwayland-client" + "-Wl,--pop-state" + ]; # upstream has minimal tests, so don't rebuild twice doCheck = false; @@ -63,10 +89,6 @@ rustPlatform.buildRustPackage rec { make prefix=$out install-data ''; - postFixup = '' - patchelf --add-rpath "${libappindicator}/lib:${libGL}/lib" "$out/bin/rog-control-center" - ''; - meta = with lib; { description = "A control daemon, CLI tools, and a collection of crates for interacting with ASUS ROG laptops"; homepage = "https://gitlab.com/asus-linux/asusctl"; diff --git a/third_party/nixpkgs/pkgs/applications/system/monitor/default.nix b/third_party/nixpkgs/pkgs/applications/system/monitor/default.nix index 2ad01f2aa2..fdf3536467 100644 --- a/third_party/nixpkgs/pkgs/applications/system/monitor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/monitor/default.nix @@ -20,7 +20,7 @@ , libhandy , sassc , udisks2 -, wrapGAppsHook +, wrapGAppsHook3 , libX11 , libXext , libXNVCtrl @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/system/thumbdrives/default.nix b/third_party/nixpkgs/pkgs/applications/system/thumbdrives/default.nix index d70ea95806..89711e9968 100644 --- a/third_party/nixpkgs/pkgs/applications/system/thumbdrives/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/thumbdrives/default.nix @@ -10,7 +10,7 @@ , gettext , glib , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { glib gtk3 desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index 5b8e0078d7..f71a9dce89 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -72,6 +72,9 @@ stdenv.mkDerivation rec { rev = "3c8f66be867aca6656e4109ce880b6ea7431b895"; hash = "sha256-vz9ircmPy2Q4fxNnjurkgJtuTSS49rBq/m61p1B43eU="; }; + postPatch = (old.postPatch or "") + '' + patchShebangs src/box_drawing_generate.sh + ''; } // lib.optionalAttrs sixelSupport { buildInputs = old.buildInputs ++ [ libsixel ]; mesonFlags = old.mesonFlags ++ [ "-Dsixel=true" ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix index 2141effcf0..5884f65c61 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "50YhKNLfIySh10gGLEBCnNBQSvCeQHBnsz86nQxZyOE="; + hash = "sha256-FhnOcBdzssDJA3GPVHaMGS6lB0UU1VoXdKkslyMdbD4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix index 667da3ec22..239d9a2fe0 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix @@ -1,34 +1,60 @@ { lib , fetchFromGitHub +, fetchpatch , python3 , glibcLocales , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , keybinder3 , libnotify , libutempter , vte , libwnck +, dconf , nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "guake"; - version = "3.9.0"; + version = "3.10"; - format = "other"; + pyproject = false; src = fetchFromGitHub { owner = "Guake"; repo = "guake"; rev = "refs/tags/${version}"; - sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU="; + hash = "sha256-e6Bf4HDftHBxFPcw9z02CqgZhSIvt6wlLF6dnIh9fEc="; }; + patches = [ + # Avoid trying to recompile schema at runtime, + # the package should be responsible for ensuring it is up to date. + # Without this, the package will try to run glib-compile-schemas + # on every update, which is pointless and will crash + # unless user has it installed. + ./no-compile-schemas.patch + + # Avoid using pip since it fails on not being able to find setuptools. + # Note: This is not a long-term solution, setup.py is deprecated. + (fetchpatch { + url = "https://github.com/Guake/guake/commit/14abaa0c69cfab64fe3467fbbea211d830042de8.patch"; + hash = "sha256-RjGRFJDTQX2meAaw3UZi/3OxAtIHbRZVpXTbcJk/scY= "; + revert = true; + }) + + # Revert switch to FHS. + (fetchpatch { + url = "https://github.com/Guake/guake/commit/8c7a23ba62ee262c033dfa5b0b18d3df71361ff4.patch"; + hash = "sha256-0asXI08XITkFc73EUenV9qxY/Eak+TzygRRK7GvhQUc="; + revert = true; + }) + ]; + nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 python3.pkgs.pip ]; @@ -57,7 +83,11 @@ python3.pkgs.buildPythonApplication rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}") + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}" + # For settings migration. + --prefix PATH : "${lib.makeBinPath [ dconf ]}" + ) ''; passthru.tests.test = nixosTests.terminal-emulators.guake; @@ -65,7 +95,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Drop-down terminal for GNOME"; homepage = "http://guake-project.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.msteen ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch b/third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch new file mode 100644 index 0000000000..e73387e1fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch @@ -0,0 +1,34 @@ +diff --git a/guake/guake_app.py b/guake/guake_app.py +index 48074db..d7d1371 100644 +--- a/guake/guake_app.py ++++ b/guake/guake_app.py +@@ -109,12 +109,7 @@ class Guake(SimpleGladeApp): + SCHEMA_DIR, Gio.SettingsSchemaSource.get_default(), False + ) + +- try: +- schema_source = load_schema() +- except GLib.Error: # pylint: disable=catching-non-exception +- log.exception("Unable to load the GLib schema, try to compile it") +- try_to_compile_glib_schemas() +- schema_source = load_schema() ++ schema_source = load_schema() + self.settings = Settings(schema_source) + self.accel_group = None + +@@ -122,13 +117,8 @@ class Guake(SimpleGladeApp): + "schema-version" not in self.settings.general.keys() + or self.settings.general.get_string("schema-version") != guake_version() + ): +- log.exception("Schema from old guake version detected, regenerating schema") +- try: +- try_to_compile_glib_schemas() +- except subprocess.CalledProcessError: +- log.exception("Schema in non user-editable location, attempting to continue") +- schema_source = load_schema() +- self.settings = Settings(schema_source) ++ log.exception("Schema from old guake version detected") ++ # Kept for compatibility with other distros. + self.settings.general.set_string("schema-version", guake_version()) + + log.info("Language previously loaded from: %s", LOCALE_DIR) diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix index 675e47e5f5..5e31ac572c 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -210,7 +210,10 @@ buildPythonApplication rec { cp -r linux-package/{bin,share,lib} "$out" cp linux-package/bin/kitten "$kitten/bin/kitten" ''} - wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}" + + # dereference the `kitty` symlink to make sure the actual executable + # is wrapped on macOS as well (and not just the symlink) + wrapProgram $(realpath "$out/bin/kitty") --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}" installShellCompletion --cmd kitty \ --bash <("$out/bin/kitty" +complete setup bash) \ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix index 1459642bc9..facfa34cf1 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix @@ -3,15 +3,15 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "kitty-themes"; - version = "unstable-2023-12-28"; + version = "unstable-2024-04-23"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty-themes"; - rev = "46d9dfe230f315a6a0c62f4687f6b3da20fd05e4"; - hash = "sha256-jlYim4YXByT6s6ce0TydZuhX0Y1ZDcAq2XKNONisSzE="; + rev = "8026ce6ec70a0a67fedd02319e6fa39d36bbc1d1"; + hash = "sha256-RN4YTcsVRg+3c+SEtKkJC8EvuNiiToduASMy/Rr+ZwA="; }; dontConfigure = true; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/kovidgoyal/kitty-themes"; description = "Themes for the kitty terminal emulator"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix index 90483efc89..76f375e43f 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook3 , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs, nixosTests , pcre2 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - automake autoconf intltool pkg-config wrapGAppsHook + automake autoconf intltool pkg-config wrapGAppsHook3 libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix index f11c456d43..28f027401b 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -14,7 +14,7 @@ , fcitx5-gtk , ibus , uim #IME -, wrapGAppsHook #color picker in mlconfig +, wrapGAppsHook3 #color picker in mlconfig , gdk-pixbuf , gtk3 , gtk ? gtk3 @@ -111,7 +111,7 @@ in stdenv.mkDerivation (finalAttrs: { pkg-config autoconf ] ++ lib.optionals enableTools.mlconfig [ - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gtk diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix index 4dee206be2..175d376659 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix @@ -7,7 +7,8 @@ , gtk3 , gobject-introspection , libnotify -, wrapGAppsHook +, makeBinaryWrapper +, wrapGAppsHook3 , vte , nixosTests }: @@ -27,7 +28,8 @@ python3.pkgs.buildPythonApplication rec { file intltool gobject-introspection - wrapGAppsHook + makeBinaryWrapper + wrapGAppsHook3 python3.pkgs.pytest-runner ]; @@ -55,8 +57,15 @@ python3.pkgs.buildPythonApplication rec { dontWrapGApps = true; + # HACK: 'wrapPythonPrograms' will add things to the $PATH in the wrapper. This bleeds into the + # terminal session produced by terminator. To avoid this, we force wrapPythonPrograms to only + # use gappsWrapperArgs by redefining wrapProgram to ignore its arguments and only apply the + # wrapper arguments we want it to use. + # TODO: Adjust wrapPythonPrograms to respect an argument that tells it to leave $PATH alone. preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + wrapProgram() { + wrapProgramBinary "$1" "''${gappsWrapperArgs[@]}" + } ''; passthru.tests.test = nixosTests.terminal-emulators.terminator; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix index ab854a2f99..a47423390b 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook, nixosTests }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook3, nixosTests }: let @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { buildInputs = [ vte-ng gtk3 ncurses pcre2 ]; - nativeBuildInputs = [ wrapGAppsHook pkg-config ]; + nativeBuildInputs = [ wrapGAppsHook3 pkg-config ]; outputs = [ "out" "terminfo" ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix index acfbbb4894..562e061761 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tym"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "endaaman"; repo = "${pname}"; rev = version; - sha256 = "sha256-aXV3TNjHxg/9Lb2o+ci5/cCAPbkWhxqOka3wv21ajSA="; + sha256 = "sha256-53XAHyDiFPUTmw/rgoEoSoh+c/t4rS12gxwH1yKHqvw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix index 8890d57b32..2e901e5af8 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix @@ -1,39 +1,76 @@ -{ lib, stdenv, fetchurl, m4, expat -, libX11, libXt, libXaw, libXmu, bdftopcf, mkfontdir -, fontadobe100dpi, fontadobeutopia100dpi, fontbh100dpi -, fontbhlucidatypewriter100dpi, fontbitstream100dpi +{ stdenv +, darwin +, lib +, libiconv +, fetchurl +, m4 +, expat +, libX11 +, libXt +, libXaw +, libXmu +, bdftopcf +, mkfontdir +, fontadobe100dpi +, fontadobeutopia100dpi +, fontbh100dpi +, fontbhlucidatypewriter100dpi +, fontbitstream100dpi , tcl -, ncurses }: - +, ncurses +, openssl +, readline +}: let majorVersion = "4"; - minorVersion = "0"; - versionSuffix = "ga9"; -in stdenv.mkDerivation rec { + minorVersion = "3"; + versionSuffix = "ga8"; +in +stdenv.mkDerivation rec { pname = "x3270"; version = "${majorVersion}.${minorVersion}${versionSuffix}"; src = fetchurl { - url = "http://x3270.bgp.nu/download/0${majorVersion}.0${minorVersion}/suite3270-${version}-src.tgz"; - sha256 = "0km24rgll0s4ji6iz8lvy5ra76ds162s95y33w5px6697cwqkp9j"; + url = + "http://x3270.bgp.nu/download/0${majorVersion}.0${minorVersion}/suite3270-${version}-src.tgz"; + sha256 = "sha256-gcC6REfZentIPEDhGznUSYu8mvVfpPeMz/Bks+N43Fk="; }; - buildFlags = [ "unix" ]; + buildFlags = lib.optional stdenv.isLinux "unix"; - postConfigure = '' - pushd c3270 ; ./configure ; popd + configureFlags = lib.optionals stdenv.isDarwin [ + "--enable-c3270" + "--enable-pr3270" + "--enable-s3270" + "--enable-tcl3270" + ]; + + postBuild = '' + make install.man ''; + pathsToLink = [ "/share/man" ]; + nativeBuildInputs = [ m4 ]; buildInputs = [ expat - libX11 libXt libXaw libXmu bdftopcf mkfontdir - fontadobe100dpi fontadobeutopia100dpi fontbh100dpi - fontbhlucidatypewriter100dpi fontbitstream100dpi + libX11 + libXt + libXaw + libXmu + bdftopcf + mkfontdir + fontadobe100dpi + fontadobeutopia100dpi + fontbh100dpi + fontbhlucidatypewriter100dpi + fontbitstream100dpi tcl ncurses expat - ]; + openssl + readline + ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "IBM 3270 terminal emulator for the X Window System"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix index 7b573717c0..dd5953f103 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { pname = "commitizen"; - version = "3.22.0"; + version = "3.25.0"; format = "pyproject"; disabled = python3.pythonOlder "3.8"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { owner = "commitizen-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wDxhhPYElNPimVa+wX6AnTZrZOhWjuMzNJ6urn0wruk="; + hash = "sha256-9vaQO0KBL4RgWS8mNSZlnpm1qH+l5TjCa5JndQ1Q36Q="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/datalad/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/datalad/default.nix index 71b5affb59..2b7d9eb032 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/datalad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/datalad/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "datalad"; - version = "0.19.6"; + version = "1.0.2"; src = fetchFromGitHub { owner = "datalad"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kCCh1NNbmDjICTjBflxExVus8llADvlRxppOfiwYhN8="; + hash = "sha256-oq+DdlWcwjJSQdnqHlYCa9I7iSOKf+hI35Lcv/GM24c="; }; nativeBuildInputs = [ installShellFiles git ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/deepgit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/deepgit/default.nix index 8a778526b4..c5744d073c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/deepgit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/deepgit/default.nix @@ -7,7 +7,7 @@ , lib , makeDesktopItem , stdenv -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ copyDesktopItems - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix index 3065d56721..c669eb0be1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix @@ -44,6 +44,11 @@ rustPlatform.buildRustPackage rec { etc/completion/completion.{bash,fish,zsh} ''; + # test_env_parsing_with_pager_set_to_bat sets environment variables, + # which can be flaky with multiple threads: + # https://github.com/dandavison/delta/issues/1660 + dontUseCargoParallelTests = true; + checkFlags = lib.optionals stdenv.isDarwin [ "--skip=test_diff_same_non_empty_file" ]; @@ -53,7 +58,7 @@ rustPlatform.buildRustPackage rec { description = "A syntax-highlighting pager for git"; changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam zowoq SuperSandro2000 figsoda ]; + maintainers = with maintainers; [ zowoq SuperSandro2000 figsoda ]; mainProgram = "delta"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gerrit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gerrit/default.nix index 7a9a01ea25..41179dfd0b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gerrit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.9.2"; + version = "3.9.4"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - hash = "sha256-KsuuwFKdpXHDVAZZ2JiX781mgqDQyyEILo4lmNn+8YE="; + hash = "sha256-pjrWXfae1momJRTfdIPalsLynAGwqp1VtX9M9uqzJwM="; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix index 1459e2f18e..b60c38fa1d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gfold/default.nix @@ -1,13 +1,12 @@ -{ fetchFromGitHub -, gitMinimal -, gfold -, lib -, libiconv -, makeWrapper -, rustPlatform -, Security -, stdenv -, testers +{ + fetchFromGitHub, + gfold, + lib, + libiconv, + rustPlatform, + Security, + stdenv, + testers, }: let @@ -26,7 +25,10 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-wDUOYK9e0i600UnJ0w0FPI2GhTa/QTq/2+ICiDWrmEU="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Security + ]; passthru.tests.version = testers.testVersion { package = gfold; @@ -35,11 +37,10 @@ rustPlatform.buildRustPackage { }; meta = with lib; { - description = - "CLI tool to help keep track of your Git repositories, written in Rust"; + description = "CLI tool to help keep track of your Git repositories, written in Rust"; homepage = "https://github.com/nickgerace/gfold"; license = licenses.asl20; - maintainers = []; + maintainers = [ maintainers.sigmanificient ]; platforms = platforms.unix; mainProgram = "gfold"; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gg/default.nix index 279e6d0075..89fd45e45f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gg/default.nix @@ -59,6 +59,5 @@ in buildGoModule { homepage = "https://gg-scm.io/"; changelog = "https://github.com/gg-scm/gg/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ zombiezen ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix index a5f0fc2cb2..721038bef2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.48.0"; + version = "2.49.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-8vQQzLGb1cHeNJC/aUZbROfRoUtuujEKoLWBgLZnhls="; + hash = "sha256-RevdHBF/7etEstUhsTO9KVK45KTiJnhAhAZAamuEUwk="; }; - vendorHash = "sha256-rQtRBXhG5fF+3cIIv9i5r8Kd9YeIq/aDLAw8Rqxn6ww="; + vendorHash = "sha256-9Rv1zPrtaxd00lbA3WrPIzIZ9IiKqZa/ppn37jqMP4M="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix index e7d075bf80..0d8b4e27e6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.9.10"; + version = "1.9.11"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-UU8iOpfM5RMwlDceDXofs3Nzyy93zcsUOuTGw/kzVe8="; + sha256 = "sha256-22/HM/DYkNh8V1v09fca6/3TLwzYudpH/VNbh+3+iyE="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-absorb/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-absorb/default.nix index a3f8c5430d..8446d4dec1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-absorb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-absorb/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/tummychow/git-absorb"; description = "git commit --fixup, but automatic"; license = [ licenses.bsd3 ]; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ tomfitzhenry ]; mainProgram = "git-absorb"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-backup/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-backup/default.nix index 7f181fa006..5f582ca64c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-backup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-backup/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/jsdw/git-backup"; description = "A tool to help you backup your git repositories from services like GitHub"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "git-backup"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix index d214f7b906..fd62132697 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix @@ -71,6 +71,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/arxanas/git-branchless"; license = licenses.gpl2Only; mainProgram = "git-branchless"; - maintainers = with maintainers; [ msfjarvis nh2 hmenke ]; + maintainers = with maintainers; [ nh2 hmenke ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix index 817394cdc5..b8b5d480e3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-FRcreSnSO65m9h9+SUg4qdFELvpVX1+HkWH3dI2RR/M="; + hash = "sha256-e7DeGcavBgjnH2QY/nqRThYHKzhmbNxYPoOmMF+0I3s="; }; - cargoHash = "sha256-RlcZvyFi7fc8eJYB5X64axAnNp8Z1h0WOV4hM1SLoRk="; + cargoHash = "sha256-MaSqQD3SRuqiOj5hTHAMyTDj2xgboA5QIZEH7BAxjF4="; # attempts to run the program on .git in src which is not deterministic doCheck = false; @@ -32,5 +32,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/orhun/git-cliff/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ siraben ]; + mainProgram = "git-cliff"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix index 2bbcc10202..a337443e87 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-aLvx9lYQJYUw2XBj+2P+yEJMboUjmHKzxP5QA3N93JA="; + hash = "sha256-fIvNaMfgwnMBUNo6kr37zhKiBgKNzT2E0dLLtqaVBvI="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix index f7182140e0..38c094ad0e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-cola/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "git-cola"; - version = "4.6.1"; + version = "4.7.1"; pyproject = true; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - hash = "sha256-qAvoBVZt2IwrWFNzGWpCZqj8gbjysGlB/VXaa1CMH4o="; + hash = "sha256-93aayGGMgkSghTpx8M5Cfbxf2szAwrSzuoWK6GCTqZ8="; }; buildInputs = lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix index c818874392..edc517b54d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.11.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-bqyoAAqli0L6Kf+W1sTh2vmmfaIj2OdpQyvQZnYOWWA="; + hash = "sha256-tJJxCtCNuPtoQYABEViS1G6aHrMTLn+r3hlTTkaJvCg="; }; nativeBuildInputs = [ installShellFiles ]; @@ -19,7 +19,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - vendorHash = "sha256-cCqbEv4kBnF6FWvfaXCOxadPVXR/AxXS3nXHf6WmsSs="; + vendorHash = "sha256-nbwrVihcH+ARLHylsjogsv3LVP+0+YtQ+7cozB7pAWo="; postInstall = '' installManPage $src/git-credential-oauth.1 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix index a193444ddc..adb3625718 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "git-extras"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "tj"; repo = "git-extras"; rev = version; - sha256 = "sha256-e1UUAHXTRNgNWrYZuLGdrQIAD8WADmA2B9bVnDNidf8="; + sha256 = "sha256-Zzk133ZJv91zbFz0U9tiv8pb0pAIBt9Y/8PYIaABMGc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-gone/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-gone/default.nix index 133bc35f64..884eeb893a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-gone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-gone/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/swsnr/git-gone"; changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "git-gone"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix index 176e271475..f450b17535 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix @@ -12,10 +12,9 @@ rustPlatform.buildRustPackage rec { }; postPatch = '' - # unknown lint: `ffi_unwind_calls` - # note: the `ffi_unwind_calls` lint is unstable - substituteInPlace src/main.rs src/{config,core,display,input,git,runtime,todo_file,testutils,view}/src/lib.rs \ - --replace "ffi_unwind_calls," "" + # error: lint `unused_tuple_struct_fields` has been renamed to `dead_code` + substituteInPlace scripts/data/lints.rs src/main.rs src/{config,core,display,git,input,runtime,testutils,todo_file,view}/src/lib.rs \ + --replace-fail "unused_tuple_struct_fields," "" ''; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix index 430d0fe1f7..f53586e757 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix @@ -54,7 +54,7 @@ buildGoModule rec { homepage = "https://git-lfs.github.com/"; changelog = "https://github.com/git-lfs/git-lfs/raw/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ twey marsam ]; + maintainers = with maintainers; [ twey ]; mainProgram = "git-lfs"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix index 3c97c1e202..a6cf657d61 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.25.0"; + version = "3.25.2"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-tLEuSwM8X0+oQDB9fmj5OQsC7iA906EQZz3yvB6rXfk="; + hash = "sha256-uTbDrSR2Aqeq73PI0dghCkOQS7QPFb/I9Yrl3wIH9ZQ="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix index ff1f8e98a7..34cda787ce 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.196"; + version = "5.12.200"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-vv60+8H6WQes+xVJRsgLppwQ/DkQbfNC6tRx2TB/4HQ="; + hash = "sha256-xrmxpbNBe+EjQsnpgQtKZlziK+jOw5johFDH2kfxf44="; }; - cargoHash = "sha256-jK2GTI+T7Ie5cdQQQHh2aj6Egb/5BxsfJkFrSo+z7Pc="; + cargoHash = "sha256-1JN3TaX37DCoYuWJskFoP5vRPqJG8JEMGRAEsU/PI48="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix index b354933eb6..e8292e84af 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-dbi48rq3ijPa45xtTi6kAly/IwkX4aK1P9hmcPNQEqM="; + sha256 = "sha256-7riA3yYw2D8+x/wzzbv0RF+zHCtqVC1ZpVANZp9x2AQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix index a85bbbc54f..cfed9952f7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/siedentop/git-quickfix"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ msfjarvis ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "git-quickfix"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-reparent/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-reparent/default.nix index df42e3b187..38a66d6db1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-reparent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-reparent/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; description = "Git command to recommit HEAD with a new set of parents"; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; license = licenses.gpl2; platforms = platforms.unix; mainProgram = "git-reparent"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix index 547adee7d6..43fb896617 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { description = "Keep the content for your git submodules all in one place: the parent repo"; homepage = "https://github.com/apenwarr/git-subtrac"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "git-subtrac"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-test/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-test/default.nix index 2f56091e2a..fb8619249b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-test/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-test/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Test your commits"; homepage = "https://github.com/spotify/git-test"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.all; mainProgram = "git-test"; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-town/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-town/default.nix index 379aa21ef3..c2d9fd54f0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-town/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-town/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-town"; - version = "14.0.0"; + version = "14.2.0"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-GF1nNb/poFDXKwpqYZvQrTZ7CkNgO39KrrDuc94o/tw="; + hash = "sha256-+OJ8aUA/VFOAzdCRcOCQKm6/RjRe13TITP1DAWqoAQI="; }; vendorHash = null; @@ -19,7 +19,8 @@ buildGoModule rec { ldflags = let - modulePath = "github.com/git-town/git-town/v${lib.versions.major version}"; in + modulePath = "github.com/git-town/git-town/v${lib.versions.major version}"; + in [ "-s" "-w" @@ -28,19 +29,22 @@ buildGoModule rec { ]; nativeCheckInputs = [ git ]; - preCheck = + + preCheck = '' + HOME=$(mktemp -d) + ''; + + checkFlags = let + # Disable tests requiring local operations skippedTests = [ "TestGodog" - "TestMockingShell_MockCommand" - "TestShellRunner_RunStringWith_Input" + "TestMockingRunner/MockCommand" + "TestMockingRunner/QueryWith" + "TestTestCommands/CreateChildFeatureBranch" ]; in - '' - HOME=$(mktemp -d) - # Disable tests requiring local operations - buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") - ''; + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; postInstall = '' installShellCompletion --cmd git-town \ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-trim/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-trim/default.nix index cbc96ed1e7..a387ec7067 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-trim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-trim/default.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { description = "Automatically trims your branches whose tracking remote refs are merged or gone"; homepage = "https://github.com/foriequal0/git-trim"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "git-trim"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix index 915ef38307..55332c6c72 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-vanity-hash/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ + lib, + fetchFromGitHub, + rustPlatform, +}: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "git-vanity-hash"; version = "1.0.0"; src = fetchFromGitHub { owner = "prasmussen"; repo = "git-vanity-hash"; - rev = "v${version}"; - hash = "sha256-jD8cSFXf9UNBZ9d8JTnuwhs6nPHY/xGd5RyqF+mQOlo="; + # v1.0.0 + build fix + rev = "a80e7725ac6d0b7e6807cd7315cfdc7eaf0584f6"; + hash = "sha256-1z4jbtzUB3SH79dDXAITf7Vup1YZdTLHBieSrhrvSXc="; }; - cargoHash = "sha256-8oW6gRtdQdmSmdwKlcU2EhHsyhk9hFhKl7RtsYwC7Ps="; + cargoHash = "sha256-+SQ0HpURBjnnwH1Ue7IUReOtI4LxVPK9AGSAihs0qsc="; postInstall = '' mkdir -p $out/share/doc/git-vanity-hash diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix index c880b9343f..7f7c6c6489 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix @@ -15,16 +15,19 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - nativeBuildInputs = [ + nativeCheckInputs = [ git # required by unit tests ]; preCheck = '' HOME=$(mktemp -d) - # Disable tests requiring network access to gitlab.com - buildFlagsArray+=("-run" "[^(Test(Run|Start|(Fetch|Pull)With(Go|)Git))]") ''; + checkFlags = [ + # Disable tests requiring network access to gitlab.com + "-skip=Test(Run|Start|(Fetch|Pull)With(Go|)Git)" + ]; + meta = with lib; { description = "Running git UI commands"; homepage = "https://github.com/isacikgoz/gitbatch"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index a3160f1ce3..7a660dedad 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -2,7 +2,7 @@ , libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus -, makeDesktopItem, openssl, wrapGAppsHook, makeShellWrapper, at-spi2-atk, at-spi2-core, libuuid +, makeDesktopItem, openssl, wrapGAppsHook3, makeShellWrapper, at-spi2-atk, at-spi2-core, libuuid , e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon, git , libGL, zlib, cacert }: @@ -106,7 +106,7 @@ let comment = "Graphical Git client from Axosoft"; }) ]; - nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook.override { makeWrapper = makeShellWrapper; }) ]; + nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) ]; buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; # avoid double-wrapping diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json index 09ef9a290d..03ad46e659 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.10.3", - "repo_hash": "sha256-JeZHnoNMk7NYBeUy25YK+f6K7WOeTQnYV/pG08bmiwA=", + "version": "16.10.5", + "repo_hash": "sha256-w2cXFIm588Q/SB1kO9dGCmxO3+Xee7BaCCipuVcnfXg=", "yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.10.3-ee", + "rev": "v16.10.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.10.3", - "GITLAB_PAGES_VERSION": "16.10.3", + "GITALY_SERVER_VERSION": "16.10.5", + "GITLAB_PAGES_VERSION": "16.10.5", "GITLAB_SHELL_VERSION": "14.34.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0", - "GITLAB_WORKHORSE_VERSION": "16.10.3" + "GITLAB_WORKHORSE_VERSION": "16.10.5" } } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index b0adadb93e..981e5cfcc5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "16.10.3"; + version = "16.10.5"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -18,10 +18,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-WdEYZL3g/aYh2Iy1ZgJhIHgQ4967FOxhiuQEokk1S2A="; + hash = "sha256-ctJfw4aU5qsv+I3rR9xZPGssYQpTnbn4MdTVOYapHqQ="; }; - vendorHash = "sha256-zaldiRg7fk/HncpfR7k+dDprsOp1ziQHgX8B4l7bwe0="; + vendorHash = "sha256-6gZr0/0ZGcFwwAY4IuW2puL/7akMZvaU0ONJGYyyJas="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch deleted file mode 100644 index 16f47fb3ae..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bc359e8f51a17ba759121339e87e90eed16e98fe Mon Sep 17 00:00:00 2001 -From: Yaya -Date: Tue, 20 Jun 2023 10:01:23 +0000 -Subject: [PATCH] Disable inmemory storage driver test - ---- - .../storage/driver/inmemory/driver_test.go | 19 ------------------- - 1 file changed, 19 deletions(-) - delete mode 100644 registry/storage/driver/inmemory/driver_test.go - -diff --git a/registry/storage/driver/inmemory/driver_test.go b/registry/storage/driver/inmemory/driver_test.go -deleted file mode 100644 -index dbc1916f..00000000 ---- a/registry/storage/driver/inmemory/driver_test.go -+++ /dev/null -@@ -1,19 +0,0 @@ --package inmemory -- --import ( -- "testing" -- -- storagedriver "github.com/docker/distribution/registry/storage/driver" -- "github.com/docker/distribution/registry/storage/driver/testsuites" -- "gopkg.in/check.v1" --) -- --// Hook up gocheck into the "go test" runner. --func Test(t *testing.T) { check.TestingT(t) } -- --func init() { -- inmemoryDriverConstructor := func() (storagedriver.StorageDriver, error) { -- return New(), nil -- } -- testsuites.RegisterSuite(inmemoryDriverConstructor, testsuites.NeverSkip) --} --- -2.40.1 - diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index c7f241aa0f..747e5ba1b8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.92.0"; + version = "4.1.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,16 +10,15 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-NHpqfqv3RCbWZilhXLGnQTN+ytzifAix6mcLk5Bw124="; + hash = "sha256-t+i9IuBH94PpfriIAaqqWYZHxKJJDOedJ3BQXGEPp0A="; }; - vendorHash = "sha256-KZWdM8Q8ipsgm7OoLyOuHo+4Vg2Nve+yZtTSUDgjOW4="; - - patches = [ - ./Disable-inmemory-storage-driver-test.patch - ]; + vendorHash = "sha256-sybppXCoTrc196xLBW1+sUg9Y5uA0GAptlJ7RjhzuGc="; postPatch = '' + # Disable flaky inmemory storage driver test + rm registry/storage/driver/inmemory/driver_test.go + substituteInPlace health/checks/checks_test.go \ --replace \ 'func TestHTTPChecker(t *testing.T) {' \ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 3d920be896..1520fd383d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.10.3"; + version = "16.10.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-mQNDnxdrM679ejjXZuqSV8SwLXFcKKKGOQt3DJWOZOo="; + hash = "sha256-wuEYcwAKYO7YZs88NvE0AI5+aZ9JeLBAeXITc2jLGVo="; }; vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M="; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index aa80f354b9..0d0afde076 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.10.3"; + version = "16.10.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitnuro/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitnuro/default.nix index e577cbaa6f..d59287db4b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitnuro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitnuro/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gitnuro"; - version = "1.1.1"; + version = "1.3.1"; src = fetchurl { - url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-${version}.jar"; - hash = "sha256-ugZBk/aQ2pjL9xY66g20MorAQ02GHIdJTv8ejadaBgY="; + url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-x86_64-${version}.jar"; + hash = "sha256-7yne9dD/7VT+H4tIBJvpOf8ksECCpoNAa8TSmFmjYMw="; }; icon = fetchurl { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "A FOSS Git multiplatform client based on Compose and JGit"; homepage = "https://gitnuro.com/"; license = licenses.gpl3Plus; - platforms = platforms.unix; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ zendo ]; mainProgram = "gitnuro"; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitprompt-rs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitprompt-rs/default.nix index 6d0013f5ad..4df5408051 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitprompt-rs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitprompt-rs/default.nix @@ -1,5 +1,9 @@ -{ lib, fetchFromGitHub, rustPlatform, git }: - +{ + lib, + fetchFromGitHub, + rustPlatform, + git, +}: rustPlatform.buildRustPackage rec { pname = "gitprompt-rs"; version = "0.3.0"; @@ -8,21 +12,21 @@ rustPlatform.buildRustPackage rec { owner = "9ary"; repo = pname; rev = version; - sha256 = "00xxz7awk01981daabp8m3kwq127y733ynijiwqgs8xvn4nkg8h6"; + hash = "sha256-BqI3LbG7I/0wjzJaP8bxRwTM56joLqVaQCmAydX5vQM="; }; - cargoSha256 = "0avs833vb6q1avjbfygm55s83iy942xgqsx6qdzksry44n35s418"; + cargoHash = "sha256-KBBdhiXEZz1/w6Zr/LogyceBdCn1ebfkVgGbtcdAeis="; postPatch = '' - substituteInPlace src/main.rs \ - --replace 'Command::new("git")' 'Command::new("${git}/bin/git")' + substituteInPlace src/main.rs \ + --replace 'Command::new("git")' 'Command::new("${git}/bin/git")' ''; meta = with lib; { description = "Simple Git prompt"; homepage = "https://github.com/9ary/gitprompt-rs"; license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ novenary ]; + maintainers = with maintainers; [ isabelroses cafkafk ]; mainProgram = "gitprompt-rs"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitsign/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitsign/default.nix index dffb905a6f..d2c7b20aef 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitsign/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitsign/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "gitsign"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-WaiGkbjqty/MsTWPvx5DmmaNwWTJAEFKwVqArt2oZZc="; + hash = "sha256-JNCz5MVqn8PeTfYUVowIVZwtpfD+Gx9yBckter6PfXA="; }; - vendorHash = "sha256-p2E010k7uozpLvl9VpfG5/JyQR4mVUBKv2p78UdFlac="; + vendorHash = "sha256-QW+ZWYEXkhSQR4HvmPLENzY/VEfjEX43mBPhmhsEBMI="; subPackages = [ "." diff --git a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix index b6c49f47dc..2d704143bf 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.37.0"; + version = "1.40.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-H1yYjI7ct/YO44czX5J0cHc/YbhxtXJQThJcARyUEq0="; + hash = "sha256-setvszKdG2EQUlVJNbo7gPKE4b7lfdGT30MC82Kk2/s="; }; - vendorHash = "sha256-4CQ4NPHAs736LQxDxvKWEH9TQvIKAouJ6zVReAoZTec="; + vendorHash = "sha256-vx4dNFM0PfapRQxz9ef1vNs4RiZlZDNhcKlo87gjGTs="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/hut/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/hut/default.nix index 0a22f17fbf..f1fc58b20d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/hut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/hut/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hut"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "hut"; rev = "v${version}"; - sha256 = "sha256-9RSJ+SRXYBjdiuHScgFm5i0/Xi81pJfURPKAGCk+l04="; + sha256 = "sha256-Gkxe9B48nwHOlqkgjMdFLBy7OiR7cwDDE3qLvWxJK+Y="; }; - vendorHash = "sha256-OxnplvBx2sFctdNSVd0S0tgiRt5Yah3ga4mORT2Kz6U="; + vendorHash = "sha256-OYXRQEP4ACkypXmrorf2ew18819DB38SsYOM0u0steg="; nativeBuildInputs = [ scdoc diff --git a/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix index 8b5580650b..54a7617f2b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.16.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - hash = "sha256-7bMyboF1JG/roFgo3cusYTi7qd2a6W+u1RJHgoBXNL0="; + hash = "sha256-3f/odQ5MgYGdPKUFqF90YGN84fXgG6BRkpN96TxJz1c="; }; - cargoHash = "sha256-nPBHIUBm4bQLuj93kE8CUfzA34uUyapVjswz9FFCiTk="; + cargoHash = "sha256-N4UUouJfhKhosMBFVM0QEUNgkh7NFryXUoPmGVXcLGQ="; cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors useNextest = false; # nextest is the upstream integration framework, but is problematic for test skipping diff --git a/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix index d75a1cba61..0a4637d533 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab"; homepage = "https://zaquestion.github.io/lab"; license = licenses.cc0; - maintainers = with maintainers; [ marsam dtzWill ]; + maintainers = with maintainers; [ dtzWill ]; mainProgram = "lab"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix index 3b2f52f007..f5e6608355 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix @@ -5,7 +5,7 @@ , python3 , meson , ninja -, wrapGAppsHook +, wrapGAppsHook3 , libxml2 , pkg-config , desktop-file-utils @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { pkg-config desktop-file-utils gobject-introspection - wrapGAppsHook + wrapGAppsHook3 gtk3 # for gtk-update-icon-cache ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/pass-git-helper/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/pass-git-helper/default.nix index 62e9a12a49..5c7379c51a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/pass-git-helper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/pass-git-helper/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pass-git-helper"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; rev = "refs/tags/v${version}"; - sha256 = "sha256-wkayj7SvT3SOM+rol17+8LQJR/YXSC6I+iKbHRUbdZc="; + sha256 = "sha256-IpMaCG6kPNrWtcl10Lh7A3PyIF4Mk0t2wLYON+zMLsE="; }; propagatedBuildInputs = [ pyxdg ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/Cargo.lock b/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/Cargo.lock deleted file mode 100644 index be6c304884..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/Cargo.lock +++ /dev/null @@ -1,6892 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array 0.14.5", -] - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if 1.0.0", - "cipher", - "cpufeatures", - "opaque-debug 0.3.0", -] - -[[package]] -name = "ahash" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.6", - "once_cell", - "serde", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "anyhow" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" - -[[package]] -name = "arc-swap" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "assay" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6400785ccafeab7f18a4d23d726f9090dd1195386f06026c6e59db36e11938" -dependencies = [ - "assay-proc-macro", - "pretty_assertions", - "rusty-fork", - "tempfile", - "tokio", -] - -[[package]] -name = "assay-proc-macro" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d94121b572ccf1d1b38a1004155e59c64f4c6ff7793070d84a8807e0550881e" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "assert_cmd" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ae1ddd39efd67689deb1979d80bad3bf7f2b09c6e6117c8d1f2443b5e2f83e" -dependencies = [ - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "async-channel" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-io" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" -dependencies = [ - "concurrent-queue", - "futures-lite", - "libc", - "log", - "once_cell", - "parking", - "polling", - "slab", - "socket2 0.4.4", - "waker-fn", - "winapi 0.3.9", -] - -[[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-process" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c" -dependencies = [ - "async-io", - "blocking", - "cfg-if 1.0.0", - "event-listener", - "futures-lite", - "libc", - "once_cell", - "signal-hook", - "winapi 0.3.9", -] - -[[package]] -name = "async-stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" -dependencies = [ - "async-stream-impl", - "futures-core", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "async-task" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" - -[[package]] -name = "async-trait" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "async_io_stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" -dependencies = [ - "futures", - "pharos", - "rustc_version", -] - -[[package]] -name = "atomic-waker" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "auto_impl" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7862e21c893d65a1650125d157eaeec691439379a1cee17ee49031b79236ada4" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "automerge" -version = "0.0.2" -source = "git+https://github.com/automerge/automerge-rs.git?rev=e72571962b51c2f0726fb534890ef3b4f7c74dfc#e72571962b51c2f0726fb534890ef3b4f7c74dfc" -dependencies = [ - "automerge-backend", - "automerge-frontend", - "automerge-protocol", - "serde", - "serde_json", - "thiserror", - "uuid", -] - -[[package]] -name = "automerge" -version = "0.1.0" -source = "git+https://github.com/automerge/automerge-rs?rev=291557a019acac283e54ea31a9fad81ed65736ab#291557a019acac283e54ea31a9fad81ed65736ab" -dependencies = [ - "flate2", - "fxhash", - "hex", - "itertools 0.10.3", - "leb128", - "nonzero_ext 0.2.0", - "rand 0.8.5", - "serde", - "sha2 0.10.2", - "smol_str", - "thiserror", - "tinyvec", - "tracing", - "uuid", -] - -[[package]] -name = "automerge-backend" -version = "0.0.1" -source = "git+https://github.com/automerge/automerge-rs.git?rev=e72571962b51c2f0726fb534890ef3b4f7c74dfc#e72571962b51c2f0726fb534890ef3b4f7c74dfc" -dependencies = [ - "automerge-protocol", - "flate2", - "fxhash", - "hex", - "itertools 0.9.0", - "js-sys", - "leb128", - "maplit", - "nonzero_ext 0.2.0", - "rand 0.8.5", - "serde", - "serde_json", - "sha2 0.9.9", - "smol_str", - "thiserror", - "tracing", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "automerge-frontend" -version = "0.1.0" -source = "git+https://github.com/automerge/automerge-rs.git?rev=e72571962b51c2f0726fb534890ef3b4f7c74dfc#e72571962b51c2f0726fb534890ef3b4f7c74dfc" -dependencies = [ - "automerge-protocol", - "getrandom 0.2.6", - "maplit", - "serde", - "serde_json", - "smol_str", - "thiserror", - "unicode-segmentation", - "uuid", -] - -[[package]] -name = "automerge-protocol" -version = "0.1.0" -source = "git+https://github.com/automerge/automerge-rs.git?rev=e72571962b51c2f0726fb534890ef3b4f7c74dfc#e72571962b51c2f0726fb534890ef3b4f7c74dfc" -dependencies = [ - "hex", - "serde", - "smol_str", - "strum", - "thiserror", - "tinyvec", - "uuid", -] - -[[package]] -name = "backoff" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fe17f59a06fe8b87a6fc8bf53bb70b3aba76d7685f432487a68cd5552853625" -dependencies = [ - "getrandom 0.2.6", - "instant", - "rand 0.8.5", -] - -[[package]] -name = "base-x" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc19a4937b4fbd3fe3379793130e42060d10627a360f2127802b10b87e7baf74" - -[[package]] -name = "base16ct" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" - -[[package]] -name = "base58" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" - -[[package]] -name = "base58check" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee2fe4c9a0c84515f136aaae2466744a721af6d63339c18689d9e995d74d99b" -dependencies = [ - "base58", - "sha2 0.8.2", -] - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "base64ct" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179" - -[[package]] -name = "bech32" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dabbe35f96fb9507f7330793dc490461b2962659ac5d427181e451a623751d1" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bit-set" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - -[[package]] -name = "bitvec" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" -dependencies = [ - "either", - "radium 0.3.0", -] - -[[package]] -name = "bitvec" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" -dependencies = [ - "funty", - "radium 0.6.2", - "tap", - "wyz", -] - -[[package]] -name = "blake2" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" -dependencies = [ - "crypto-mac 0.8.0", - "digest 0.9.0", - "opaque-debug 0.3.0", -] - -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq", -] - -[[package]] -name = "blake2s_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq", -] - -[[package]] -name = "blake3" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "cc", - "cfg-if 0.1.10", - "constant_time_eq", - "crypto-mac 0.8.0", - "digest 0.9.0", -] - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding 0.1.5", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "block-padding 0.2.1", - "generic-array 0.14.5", -] - -[[package]] -name = "block-buffer" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" -dependencies = [ - "generic-array 0.14.5", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - -[[package]] -name = "blocking" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" -dependencies = [ - "async-channel", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "once_cell", -] - -[[package]] -name = "bloom-filters" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f178e62ed3e8b7338f2cb581fc19bebcbc0814e009f305ab1d6954ff15a4b99" -dependencies = [ - "rand 0.8.5", -] - -[[package]] -name = "bs58" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", -] - -[[package]] -name = "btoi" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c0869a9faa81f8bbf8102371105d6d0a7b79167a04c340b04ab16892246a11" -dependencies = [ - "num-traits", -] - -[[package]] -name = "bumpalo" -version = "3.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" - -[[package]] -name = "byte-slice-cast" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "bytecount" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72feb31ffc86498dacdbd0fcebb56138e7177a8cc5cea4516031d15ae85a742e" - -[[package]] -name = "bytemuck" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] - -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "bytes" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" -dependencies = [ - "serde", -] - -[[package]] -name = "bytesize" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" - -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - -[[package]] -name = "camino" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3132262930b0522068049f5870a856ab8affc80c70d08b6ecb785771a6fc23" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", -] - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chacha20" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91" -dependencies = [ - "cfg-if 1.0.0", - "cipher", - "cpufeatures", - "zeroize", -] - -[[package]] -name = "chacha20poly1305" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a" -dependencies = [ - "aead", - "chacha20", - "cipher", - "poly1305", - "zeroize", -] - -[[package]] -name = "checked_int_cast" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" - -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "time 0.1.43", - "winapi 0.3.9", -] - -[[package]] -name = "chunked_transfer" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" - -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array 0.14.5", -] - -[[package]] -name = "clap" -version = "3.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535434c063ced786eb04aaf529308092c5ab60889e8fe24275d15de07b01fa97" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "clap_lex", - "indexmap", - "lazy_static", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_derive" -version = "3.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" -dependencies = [ - "heck 0.4.0", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" -dependencies = [ - "os_str_bytes 6.0.0", -] - -[[package]] -name = "clru" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "218d6bd3dde8e442a975fa1cd233c0e5fded7596bccfe39f58eca98d22421e0a" - -[[package]] -name = "cmake" -version = "0.1.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" -dependencies = [ - "cc", -] - -[[package]] -name = "cob" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "automerge 0.0.2", - "either", - "git-trailers", - "git2", - "jsonschema", - "lazy_static", - "link-crypto", - "link-identities", - "lru", - "minicbor", - "multibase", - "multihash 0.11.4", - "petgraph", - "radicle-git-ext", - "regex", - "serde", - "serde_json", - "tempfile", - "thiserror", - "toml", - "tracing", -] - -[[package]] -name = "coins-bip32" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b669993c632e5fec4a297085ec57381f53e4646c123cb77a7ca754e005c921" -dependencies = [ - "bincode", - "bs58", - "coins-core", - "digest 0.9.0", - "hmac", - "k256 0.9.6", - "lazy_static", - "serde", - "sha2 0.9.9", - "thiserror", -] - -[[package]] -name = "coins-bip32" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471b39eadc9323de375dce5eff149a5a1ebd21c67f1da34a56f87ee62191d4ea" -dependencies = [ - "bincode", - "bs58", - "coins-core", - "digest 0.9.0", - "getrandom 0.2.6", - "hmac", - "k256 0.10.4", - "lazy_static", - "serde", - "sha2 0.9.9", - "thiserror", -] - -[[package]] -name = "coins-bip39" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38426029442f91bd49973d6f59f28e3dbb14e633e3019ac4ec6bce402c44f81c" -dependencies = [ - "bitvec 0.17.4", - "coins-bip32 0.3.0", - "getrandom 0.2.6", - "hex", - "hmac", - "pbkdf2 0.8.0", - "rand 0.8.5", - "sha2 0.9.9", - "thiserror", -] - -[[package]] -name = "coins-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257d975731955ee86fa7f348000c3fea09c262e84c70c11e994a85aa4f467a7" -dependencies = [ - "base58check", - "base64 0.12.3", - "bech32", - "blake2", - "digest 0.9.0", - "generic-array 0.14.5", - "hex", - "ripemd160", - "serde", - "serde_derive", - "sha2 0.9.9", - "sha3", - "thiserror", -] - -[[package]] -name = "coins-ledger" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c8e824e53993514a62d2012e6e20cacf7c7761dea19824036f37dc0407b9bb" -dependencies = [ - "async-trait", - "blake2b_simd", - "byteorder", - "cfg-if 0.1.10", - "futures", - "hidapi-rusb", - "js-sys", - "lazy_static", - "libc", - "log", - "matches", - "nix 0.13.1", - "serde", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colored" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" -dependencies = [ - "atty", - "lazy_static", - "winapi 0.3.9", -] - -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi 0.3.9", -] - -[[package]] -name = "colored_json" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd32eb54d016e203b7c2600e3a7802c75843a92e38ccc4869aefeca21771a64" -dependencies = [ - "ansi_term", - "atty", - "libc", - "serde", - "serde_json", -] - -[[package]] -name = "concurrent-queue" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" -dependencies = [ - "cache-padded", -] - -[[package]] -name = "console" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" -dependencies = [ - "encode_unicode", - "libc", - "once_cell", - "regex", - "terminal_size", - "unicode-width", - "winapi 0.3.9", -] - -[[package]] -name = "const-oid" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b" - -[[package]] -name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "cpufeatures" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils", - "lazy_static", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" -dependencies = [ - "cfg-if 1.0.0", - "lazy_static", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-bigint" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83bd3bb4314701c568e340cd8cf78c975aa0ca79e03d3f6d1677d5b0c9c0c03" -dependencies = [ - "generic-array 0.14.5", - "rand_core 0.6.3", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-bigint" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" -dependencies = [ - "generic-array 0.14.5", - "rand_core 0.6.3", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-common" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" -dependencies = [ - "generic-array 0.14.5", - "typenum", -] - -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array 0.14.5", - "subtle", -] - -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array 0.14.5", - "subtle", -] - -[[package]] -name = "ctor" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "ctr" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a232f92a03f37dd7d7dd2adc67166c77e9cd88de5b019b9a9eecfaeaf7bfd481" -dependencies = [ - "cipher", -] - -[[package]] -name = "curve25519-dalek" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - -[[package]] -name = "dashmap" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" -dependencies = [ - "cfg-if 1.0.0", - "num_cpus", -] - -[[package]] -name = "dashmap" -version = "5.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b5a84352d6654d195b2365e38b5a7eacfdca4ad1b375196a1f76c6d7dd01ce" -dependencies = [ - "cfg-if 1.0.0", - "hashbrown 0.12.0", - "lock_api", -] - -[[package]] -name = "data-encoding" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" - -[[package]] -name = "data-encoding-macro" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca" -dependencies = [ - "data-encoding", - "data-encoding-macro-internal", -] - -[[package]] -name = "data-encoding-macro-internal" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" -dependencies = [ - "data-encoding", - "syn", -] - -[[package]] -name = "deadpool" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d126179d86aee4556e54f5f3c6bf6d9884e7cc52cef82f77ee6f90a7747616d" -dependencies = [ - "async-trait", - "crossbeam-queue", - "num_cpus", - "tokio", -] - -[[package]] -name = "der" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b71cca7d95d7681a4b3b9cdf63c8dbc3730d0584c2c74e31416d64a90493f4" -dependencies = [ - "const-oid 0.6.2", -] - -[[package]] -name = "der" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" -dependencies = [ - "const-oid 0.7.1", -] - -[[package]] -name = "dialoguer" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c8ae48e400addc32a8710c8d62d55cb84249a7d58ac4cd959daecfbaddc545" -dependencies = [ - "console", - "tempfile", - "zeroize", -] - -[[package]] -name = "diff" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array 0.14.5", -] - -[[package]] -name = "digest" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" -dependencies = [ - "block-buffer 0.10.2", - "crypto-common", -] - -[[package]] -name = "directories" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "dyn-clone" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" - -[[package]] -name = "ecdsa" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ee23aa5b4f68c7a092b5c3beb25f50c406adc75e2363634f242f28ab255372" -dependencies = [ - "der 0.4.5", - "elliptic-curve 0.10.6", - "hmac", - "signature", -] - -[[package]] -name = "ecdsa" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" -dependencies = [ - "der 0.5.1", - "elliptic-curve 0.11.12", - "rfc6979", - "signature", -] - -[[package]] -name = "ed25519-zebra" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69" -dependencies = [ - "curve25519-dalek", - "hex", - "rand_core 0.6.3", - "serde", - "sha2 0.9.9", - "thiserror", - "zeroize", -] - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -dependencies = [ - "serde", -] - -[[package]] -name = "elliptic-curve" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beca177dcb8eb540133e7680baff45e7cc4d93bf22002676cec549f82343721b" -dependencies = [ - "crypto-bigint 0.2.11", - "ff 0.10.1", - "generic-array 0.14.5", - "group 0.10.0", - "pkcs8 0.7.6", - "rand_core 0.6.3", - "subtle", - "zeroize", -] - -[[package]] -name = "elliptic-curve" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" -dependencies = [ - "base16ct", - "crypto-bigint 0.3.2", - "der 0.5.1", - "ff 0.11.0", - "generic-array 0.14.5", - "group 0.11.0", - "rand_core 0.6.3", - "sec1", - "subtle", - "zeroize", -] - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "eth-keystore" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d47d900a7dea08593d398104f8288e37858b0ad714c8d08cd03fdb86563e6402" -dependencies = [ - "aes", - "ctr", - "digest 0.9.0", - "hex", - "hmac", - "pbkdf2 0.8.0", - "rand 0.8.5", - "scrypt 0.7.0", - "serde", - "serde_json", - "sha2 0.9.9", - "sha3", - "thiserror", - "uuid", -] - -[[package]] -name = "ethabi" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76ef192b63e8a44b3d08832acebbb984c3fba154b5c26f70037c860202a0d4b" -dependencies = [ - "anyhow", - "ethereum-types", - "hex", - "serde", - "serde_json", - "sha3", - "thiserror", - "uint", -] - -[[package]] -name = "ethbloom" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8" -dependencies = [ - "crunchy", - "fixed-hash", - "impl-rlp", - "impl-serde", - "tiny-keccak", -] - -[[package]] -name = "ethereum-types" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf" -dependencies = [ - "ethbloom", - "fixed-hash", - "impl-rlp", - "impl-serde", - "primitive-types", - "uint", -] - -[[package]] -name = "ethers" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59989141d334913ea2784f923e014ff9f7da373455aa12f884ab5f71378eb465" -dependencies = [ - "ethers-contract", - "ethers-core", - "ethers-etherscan", - "ethers-middleware", - "ethers-providers", - "ethers-signers", - "ethers-solc", -] - -[[package]] -name = "ethers-contract" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c49f7c627973e1fcb46404d7846b3bc6c2a7a33616628258f61d26c6e6b89a" -dependencies = [ - "ethers-contract-abigen", - "ethers-contract-derive", - "ethers-core", - "ethers-providers", - "futures-util", - "hex", - "once_cell", - "pin-project 1.0.10", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "ethers-contract-abigen" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658ab90a1fc5f338e8bf6fa6cd614ef4c8d573da40d0c89f45d21c595bda5f3b" -dependencies = [ - "Inflector", - "anyhow", - "cfg-if 1.0.0", - "ethers-core", - "getrandom 0.2.6", - "hex", - "once_cell", - "proc-macro2", - "quote", - "reqwest", - "serde", - "serde_json", - "syn", - "url", -] - -[[package]] -name = "ethers-contract-derive" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f974650dae34a335f3e2f32166be0739d7f87c3825842ad6f8195164cb5ea433" -dependencies = [ - "ethers-contract-abigen", - "ethers-core", - "hex", - "proc-macro2", - "quote", - "serde_json", - "syn", -] - -[[package]] -name = "ethers-core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f15e1a2a54bc6bc3f8ea94afafbb374264f8322fcacdae06fefda80a206739ac" -dependencies = [ - "arrayvec 0.7.2", - "bytes 1.1.0", - "cargo_metadata", - "convert_case", - "ecdsa 0.12.4", - "elliptic-curve 0.11.12", - "ethabi", - "generic-array 0.14.5", - "hex", - "k256 0.9.6", - "once_cell", - "proc-macro2", - "quote", - "rand 0.8.5", - "rlp", - "rlp-derive", - "serde", - "serde_json", - "syn", - "thiserror", - "tiny-keccak", -] - -[[package]] -name = "ethers-etherscan" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa6bfff9fc96e83d3a25390fe7a505b6c1ae4290314251bf0825cfed90d1b750" -dependencies = [ - "ethers-core", - "reqwest", - "serde", - "serde-aux", - "serde_json", - "thiserror", -] - -[[package]] -name = "ethers-middleware" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3831e5e98736715e848ec966dd76ce216a8e4f531f7d3e09ef43eead1c63df" -dependencies = [ - "async-trait", - "ethers-contract", - "ethers-core", - "ethers-etherscan", - "ethers-providers", - "ethers-signers", - "futures-util", - "instant", - "reqwest", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "url", -] - -[[package]] -name = "ethers-providers" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68d511a99f39a26c9b32a6f62360789ba0e214d8f4c012bf1fbdc7b00da0e4f" -dependencies = [ - "async-trait", - "auto_impl", - "ethers-core", - "futures-channel", - "futures-core", - "futures-timer", - "futures-util", - "hex", - "parking_lot 0.11.2", - "pin-project 1.0.10", - "reqwest", - "serde", - "serde_json", - "thiserror", - "tracing", - "tracing-futures", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-timer", - "web-sys", - "ws_stream_wasm", -] - -[[package]] -name = "ethers-signers" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e76778f397d5185bb09d9ea4238f41880394e4fb3b6d5fdc75541c0a70df55" -dependencies = [ - "async-trait", - "coins-bip32 0.3.0", - "coins-bip39", - "coins-ledger", - "elliptic-curve 0.11.12", - "eth-keystore", - "ethers-core", - "futures-executor", - "futures-util", - "hex", - "rand 0.8.5", - "semver", - "sha2 0.9.9", - "thiserror", -] - -[[package]] -name = "ethers-solc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b73d8386c8a965c90a4fd3accea7e409d20051f613950efa9c442560bd4f03" -dependencies = [ - "colored 2.0.0", - "ethers-core", - "getrandom 0.2.6", - "glob", - "hex", - "home", - "md-5", - "once_cell", - "regex", - "semver", - "serde", - "serde_json", - "sha2 0.9.9", - "thiserror", - "tracing", - "walkdir", -] - -[[package]] -name = "event-listener" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fancy-regex" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf" -dependencies = [ - "bit-set", - "regex", -] - -[[package]] -name = "fastrand" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" -dependencies = [ - "instant", -] - -[[package]] -name = "ff" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f" -dependencies = [ - "rand_core 0.6.3", - "subtle", -] - -[[package]] -name = "ff" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2958d04124b9f27f175eaeb9a9f383d026098aa837eadd8ba22c11f13a05b9e" -dependencies = [ - "rand_core 0.6.3", - "subtle", -] - -[[package]] -name = "filebuffer" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b41bfe1d74263ea9d084be951077614b3b98b4e59a9dafab1467645a9e52305" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "filetime" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "winapi 0.3.9", -] - -[[package]] -name = "fixed-hash" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" -dependencies = [ - "byteorder", - "rand 0.8.5", - "rustc-hex", - "static_assertions", -] - -[[package]] -name = "fixedbitset" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" - -[[package]] -name = "flate2" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" -dependencies = [ - "cfg-if 1.0.0", - "crc32fast", - "libc", - "libz-sys", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "fraction" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba3510011eee8825018be07f08d9643421de007eaf62a3bde58d89b058abfa7" -dependencies = [ - "lazy_static", - "num", -] - -[[package]] -name = "fsevent" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" -dependencies = [ - "bitflags", - "fsevent-sys", -] - -[[package]] -name = "fsevent-sys" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" -dependencies = [ - "libc", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - -[[package]] -name = "futures" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" - -[[package]] -name = "futures-executor" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" - -[[package]] -name = "futures-lite" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" - -[[package]] -name = "futures-task" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" - -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - -[[package]] -name = "futures-util" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "futures_codec" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b" -dependencies = [ - "bytes 0.5.6", - "futures", - "memchr", - "pin-project 0.4.29", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - -[[package]] -name = "generic-array" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" -dependencies = [ - "serde", - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "libc", - "wasi 0.10.2+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "git-actor" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09c4ab49d848cf4221daa5f80bd9969009ce5c1fb090acfec4e1ce3267fb488b" -dependencies = [ - "bstr", - "btoi", - "itoa 0.4.8", - "nom 7.1.1", - "quick-error 2.0.1", -] - -[[package]] -name = "git-diff" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d4e019a3029f25c7c17aa5fefd113b5852f7d7796403c57a5ea54735700b2e3" -dependencies = [ - "git-hash", - "git-object", - "quick-error 2.0.1", -] - -[[package]] -name = "git-features" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39932de8e019bab9a827e408ad7f96cebb65d4cdc25849ebfe4c70545d46f81f" -dependencies = [ - "crc32fast", - "crossbeam-channel", - "crossbeam-utils", - "flate2", - "git-hash", - "jwalk", - "num_cpus", - "prodash", - "quick-error 2.0.1", - "sha1", - "walkdir", -] - -[[package]] -name = "git-hash" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99707b9c4943f76a8875b6dd8a2e7291228c9e23c68253e403059ebf8117864e" -dependencies = [ - "hex", - "quick-error 2.0.1", -] - -[[package]] -name = "git-lock" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c6c0e6c2d893be08d8e10e61d01fbbbcfb8647d0dafc9ebdc6a8ee51bcf0b2" -dependencies = [ - "fastrand", - "git-tempfile", - "quick-error 2.0.1", -] - -[[package]] -name = "git-object" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60af270db623e4af0968a07c39300c521a11fdb27d94928afbb91784d52411ec" -dependencies = [ - "bstr", - "git-actor", - "git-hash", - "git-validate", - "hex", - "nom 7.1.1", - "quick-error 2.0.1", - "smallvec", -] - -[[package]] -name = "git-odb" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452480a78d0a1befe19cd16bf4edf72bce50a3eac7d73dc10a9817b2edc2ac1a" -dependencies = [ - "btoi", - "git-features", - "git-hash", - "git-object", - "git-pack", - "tempfile", - "thiserror", -] - -[[package]] -name = "git-pack" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee1cf8862969ad70a5ffb2b62378bc193067773bd172816071458ffdac6d6487" -dependencies = [ - "btoi", - "byteorder", - "bytesize", - "clru", - "dashmap 4.0.2", - "filebuffer", - "git-diff", - "git-features", - "git-hash", - "git-object", - "git-tempfile", - "git-traverse", - "itoa 0.4.8", - "parking_lot 0.11.2", - "smallvec", - "thiserror", - "uluru", -] - -[[package]] -name = "git-packetline" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd72d1851a70ec9dbffb5e70bf59848ae0a5d86bfc3f1d764c65bbf958a881d" -dependencies = [ - "bstr", - "futures-io", - "futures-lite", - "hex", - "pin-project-lite", - "quick-error 2.0.1", -] - -[[package]] -name = "git-protocol" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48b559bd03df1bee77c16b06cdeb5592b412e4035a3492e646f3c87114c4f4e" -dependencies = [ - "async-trait", - "bstr", - "btoi", - "futures-io", - "futures-lite", - "git-features", - "git-hash", - "git-transport", - "maybe-async", - "nom 7.1.1", - "quick-error 2.0.1", -] - -[[package]] -name = "git-ref" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f86152528fbcc6f1ce78b7b4fb18dd0258183bd2de690b25ed422b56bd63117" -dependencies = [ - "filebuffer", - "git-actor", - "git-features", - "git-hash", - "git-lock", - "git-object", - "git-tempfile", - "git-validate", - "nom 7.1.1", - "os_str_bytes 3.1.0", - "quick-error 2.0.1", -] - -[[package]] -name = "git-ref-format" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "git-ref-format-core", - "git-ref-format-macro", -] - -[[package]] -name = "git-ref-format-core" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "bstr", - "minicbor", - "thiserror", -] - -[[package]] -name = "git-ref-format-macro" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "git-ref-format-core", - "proc-macro-error", - "quote", - "syn", -] - -[[package]] -name = "git-tempfile" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6d78c8a68ab3ba1cd42684dbe0233e81a28301321c4a66417285e47cd79c6b" -dependencies = [ - "dashmap 5.3.2", - "libc", - "once_cell", - "signal-hook", - "signal-hook-registry", - "tempfile", -] - -[[package]] -name = "git-trailers" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "nom 7.1.1", - "thiserror", -] - -[[package]] -name = "git-transport" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2c0d09673a172071670aa2db9a04ab459c2dbf9130ba3ad549a92520ef2473" -dependencies = [ - "async-trait", - "bstr", - "futures-io", - "futures-lite", - "git-features", - "git-packetline", - "git-url", - "pin-project-lite", - "quick-error 2.0.1", - "thiserror", -] - -[[package]] -name = "git-traverse" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aa135b6cf4525deeb70dde2420ce886780dc2ef24a871cebe25291b9f26088a" -dependencies = [ - "git-hash", - "git-object", - "quick-error 2.0.1", -] - -[[package]] -name = "git-url" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9fcc88c679f3dc55e1e4fe0324142abec612cafaafae1bf6a951c324c9d96f8" -dependencies = [ - "bstr", - "home", - "quick-error 2.0.1", - "url", -] - -[[package]] -name = "git-validate" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58bafc6cd6f455a95997c47823182dd62cdb47f03564c44c6b6d910221801dc" -dependencies = [ - "bstr", - "quick-error 2.0.1", -] - -[[package]] -name = "git2" -version = "0.13.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "url", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "globset" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "governor" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c5d2f987ee8f6dff3fa1a352058dc59b990e447e4c7846aa7d804971314f7b" -dependencies = [ - "dashmap 4.0.2", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext 0.2.0", - "parking_lot 0.11.2", - "quanta", - "rand 0.8.5", - "smallvec", -] - -[[package]] -name = "group" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" -dependencies = [ - "ff 0.10.1", - "rand_core 0.6.3", - "subtle", -] - -[[package]] -name = "group" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" -dependencies = [ - "ff 0.11.0", - "rand_core 0.6.3", - "subtle", -] - -[[package]] -name = "h2" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" -dependencies = [ - "bytes 1.1.0", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hashbrown" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" -dependencies = [ - "ahash 0.3.8", - "autocfg", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash 0.7.6", -] - -[[package]] -name = "hashbrown" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hidapi-rusb" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6664e89e7c267621ea65a3453f7883a47a9ead4638d4dc44ccc3b695cc45d3c2" -dependencies = [ - "cc", - "libc", - "pkg-config", - "rusb", -] - -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac 0.11.1", - "digest 0.9.0", -] - -[[package]] -name = "home" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "http" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" -dependencies = [ - "bytes 1.1.0", - "fnv", - "itoa 1.0.1", -] - -[[package]] -name = "http-body" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" -dependencies = [ - "bytes 1.1.0", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "human_format" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86cce260d758a9aa3d7c4b99d55c815a540f8a37514ba6046ab6be402a157cb0" - -[[package]] -name = "hyper" -version = "0.14.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" -dependencies = [ - "bytes 1.1.0", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa 1.0.1", - "pin-project-lite", - "socket2 0.4.4", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" -dependencies = [ - "http", - "hyper", - "rustls 0.20.4", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes 1.1.0", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "if-addrs" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2273e421f7c4f0fc99e1934fe4776f59d8df2972f4199d703fc0da9f2a9f73de" -dependencies = [ - "if-addrs-sys", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "if-addrs-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "if-watch" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179" -dependencies = [ - "async-io", - "futures", - "futures-lite", - "if-addrs", - "ipnet", - "libc", - "log", - "winapi 0.3.9", -] - -[[package]] -name = "im" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" -dependencies = [ - "bitmaps", - "rand_core 0.6.3", - "rand_xoshiro", - "sized-chunks", - "typenum", - "version_check", -] - -[[package]] -name = "image" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-iter", - "num-rational 0.3.2", - "num-traits", -] - -[[package]] -name = "impl-codec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" -dependencies = [ - "parity-scale-codec", -] - -[[package]] -name = "impl-rlp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -dependencies = [ - "rlp", -] - -[[package]] -name = "impl-serde" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" -dependencies = [ - "serde", -] - -[[package]] -name = "impl-trait-for-tuples" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "indexmap" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" -dependencies = [ - "autocfg", - "hashbrown 0.11.2", -] - -[[package]] -name = "indicatif" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" -dependencies = [ - "console", - "lazy_static", - "number_prefix", - "regex", -] - -[[package]] -name = "inotify" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" -dependencies = [ - "bitflags", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "ipnet" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" - -[[package]] -name = "iso8601" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a59a3f2be6271b2a844cd0dd13bf8ccc88a9540482d872c7ce58ab1c4db9fab" -dependencies = [ - "nom 7.1.1", -] - -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" - -[[package]] -name = "jobserver" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "jsonrpc-core" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" -dependencies = [ - "futures", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "jsonschema" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877e398ffb23c1c311c417ef5e72e8699c3822dbf835468f009c6ce91b6c206b" -dependencies = [ - "ahash 0.7.6", - "base64 0.13.0", - "bytecount", - "fancy-regex", - "fraction", - "iso8601", - "itoa 0.4.8", - "lazy_static", - "num-cmp", - "parking_lot 0.12.0", - "percent-encoding", - "regex", - "serde", - "serde_json", - "time 0.3.9", - "url", - "uuid", -] - -[[package]] -name = "jwalk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172752e853a067cbce46427de8470ddf308af7fd8ceaf9b682ef31a5021b6bb9" -dependencies = [ - "crossbeam", - "rayon", -] - -[[package]] -name = "k256" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903ae2481bcdfdb7b68e0a9baa4b7c9aff600b9ae2e8e5bb5833b8c91ab851ea" -dependencies = [ - "cfg-if 1.0.0", - "ecdsa 0.12.4", - "elliptic-curve 0.10.6", - "sha2 0.9.9", - "sha3", -] - -[[package]] -name = "k256" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" -dependencies = [ - "cfg-if 1.0.0", - "ecdsa 0.13.4", - "elliptic-curve 0.11.12", - "sec1", - "sha2 0.9.9", -] - -[[package]] -name = "keccak" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "leb128" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" - -[[package]] -name = "lexopt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de7513aea7d10dc0694d719ac53de3b74f1600e41b9f81ed9f395d8ec36a2a70" - -[[package]] -name = "libc" -version = "0.2.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" - -[[package]] -name = "libgit2-sys" -version = "0.12.26+1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - -[[package]] -name = "librad" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "async-lock", - "async-stream", - "async-trait", - "backoff", - "blocking", - "bloom-filters", - "bstr", - "bytes 0.5.6", - "cob", - "dashmap 4.0.2", - "deadpool", - "directories", - "either", - "futures", - "futures_codec", - "git-ref-format", - "git-trailers", - "git2", - "globset", - "governor", - "if-watch", - "indexmap", - "itertools 0.10.3", - "lazy_static", - "libc", - "libgit2-sys", - "link-async", - "link-canonical", - "link-crypto", - "link-git", - "link-identities", - "link-replication", - "link-tracking", - "minicbor", - "multibase", - "multihash 0.11.4", - "nom 7.1.1", - "nonempty", - "nonzero_ext 0.3.0", - "notify", - "num_cpus", - "once_cell", - "parking_lot 0.12.0", - "percent-encoding", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", - "quinn", - "radicle-data", - "radicle-git-ext", - "radicle-macros", - "radicle-std-ext", - "rand 0.8.5", - "rand_pcg 0.3.1", - "regex", - "rustc-hash", - "rustls 0.19.1", - "serde", - "serde_bytes", - "serde_json", - "sized-vec", - "socket2 0.4.4", - "tempfile", - "thiserror", - "time 0.3.9", - "tokio", - "toml", - "tracing", - "tracing-attributes", - "typenum", - "url", - "uuid", - "webpki 0.21.4", - "xorf", -] - -[[package]] -name = "libusb1-sys" -version = "0.6.2" -source = "git+https://github.com/a1ien/rusb.git?rev=050f5091c7b0fb69c0fc25edec0910abe8afadf1#050f5091c7b0fb69c0fc25edec0910abe8afadf1" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e7e15d7610cce1d9752e137625f14e61a28cd45929b6e12e47b50fe154ee2e" -dependencies = [ - "cc", - "cmake", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "link-async" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "blocking", - "futures", - "futures-util", - "radicle-std-ext", - "rand 0.8.5", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "link-canonical" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "link-canonical-derive", - "nom 7.1.1", - "serde", - "serde_bytes", - "serde_json", - "thiserror", - "unicode-normalization", -] - -[[package]] -name = "link-canonical-derive" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "link-crypto" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "async-trait", - "dyn-clone", - "ed25519-zebra", - "futures-lite", - "git-ref-format", - "minicbor", - "multibase", - "radicle-git-ext", - "radicle-keystore", - "rand 0.8.5", - "rustls 0.19.1", - "serde", - "thiserror", - "tracing", - "webpki 0.21.4", - "zeroize", -] - -[[package]] -name = "link-git" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "arc-swap", - "async-process", - "async-trait", - "blocking", - "bstr", - "futures-lite", - "futures-util", - "git-actor", - "git-features", - "git-hash", - "git-lock", - "git-object", - "git-odb", - "git-pack", - "git-packetline", - "git-protocol", - "git-ref", - "git-traverse", - "git2", - "im", - "lazy_static", - "once_cell", - "parking_lot 0.12.0", - "pin-project 1.0.10", - "regex", - "rustc-hash", - "tempfile", - "thiserror", - "tracing", - "versions", -] - -[[package]] -name = "link-identities" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "either", - "futures-lite", - "git-ref-format", - "git-trailers", - "git2", - "lazy_static", - "link-canonical", - "link-crypto", - "minicbor", - "multibase", - "multihash 0.11.4", - "percent-encoding", - "radicle-data", - "radicle-git-ext", - "radicle-macros", - "radicle-std-ext", - "serde", - "serde_json", - "sized-vec", - "thiserror", - "tracing", - "typenum", - "url", - "xorf", -] - -[[package]] -name = "link-replication" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "async-trait", - "blocking", - "bstr", - "either", - "futures-lite", - "git-ref-format", - "itertools 0.10.3", - "link-crypto", - "link-git", - "parking_lot 0.12.0", - "radicle-data", - "radicle-std-ext", - "rand 0.8.5", - "thiserror", - "tracing", -] - -[[package]] -name = "link-tracking" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "cob", - "either", - "git-ref-format", - "link-canonical", - "link-crypto", - "link-identities", - "multihash 0.11.4", - "radicle-git-ext", - "thiserror", - "tracing", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" - -[[package]] -name = "lnk-clib" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "async-trait", - "futures", - "itertools 0.10.3", - "librad", - "lnk-thrussh-agent", - "minicbor", - "nix 0.23.1", - "once_cell", - "serde", - "serde_json", - "socket2 0.4.4", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "lnk-cryptovec" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae312ad9efaa2ad4c57d6f63b4e5d5261486875125b7bd04d4c685dbc687ff5b" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "lnk-identities" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "anyhow", - "clap", - "either", - "git2", - "lazy_static", - "libgit2-sys", - "librad", - "lnk-clib", - "lnk-thrussh-agent", - "nonempty", - "radicle-git-ext", - "radicle-std-ext", - "serde", - "serde_json", - "similar", - "thiserror", - "tracing", - "url", -] - -[[package]] -name = "lnk-profile" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "anyhow", - "clap", - "futures-lite", - "librad", - "lnk-clib", - "lnk-thrussh-agent", - "serde", - "thiserror", -] - -[[package]] -name = "lnk-thrussh-agent" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9692c2ff209b052e9e6f658dbb56fe76eaa4761fcbcebc0a36ebd25a968d0f62" -dependencies = [ - "async-trait", - "byteorder", - "data-encoding", - "futures", - "lnk-cryptovec", - "lnk-thrussh-encoding", - "log", - "thiserror", - "tokio", -] - -[[package]] -name = "lnk-thrussh-encoding" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b3c40451361c5691987b7eeeb0428f069fb07fa70367e9aa352704982f6f1a6" -dependencies = [ - "byteorder", - "lnk-cryptovec", - "thiserror", -] - -[[package]] -name = "lock_api" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "lru" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889" -dependencies = [ - "hashbrown 0.11.2", -] - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "maybe-async" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6007f9dad048e0a224f27ca599d669fca8cfa0dac804725aab542b2eb032bce6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "md-5" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "opaque-debug 0.3.0", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "minicbor" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "124d887cb82f0b1469bdac3d1b65764a381eed1a54fdab0070e5772b13114521" -dependencies = [ - "minicbor-derive", -] - -[[package]] -name = "minicbor-derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f79d5d3fb4f93c77ef7b97065fb65efe6abe670795ad8bc5be9c0e12005290" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow 0.2.2", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "mio" -version = "0.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -dependencies = [ - "libc", - "log", - "miow 0.3.7", - "ntapi", - "winapi 0.3.9", -] - -[[package]] -name = "mio" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" -dependencies = [ - "libc", - "log", - "miow 0.3.7", - "ntapi", - "wasi 0.11.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio 0.6.23", - "slab", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "multibase" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" -dependencies = [ - "base-x", - "data-encoding", - "data-encoding-macro", -] - -[[package]] -name = "multihash" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567122ab6492f49b59def14ecc36e13e64dca4188196dd0cd41f9f3f979f3df6" -dependencies = [ - "blake2b_simd", - "blake2s_simd", - "digest 0.9.0", - "sha-1 0.9.8", - "sha2 0.9.9", - "sha3", - "unsigned-varint 0.5.1", -] - -[[package]] -name = "multihash" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8" -dependencies = [ - "blake2b_simd", - "blake2s_simd", - "blake3", - "digest 0.9.0", - "generic-array 0.14.5", - "multihash-derive", - "sha-1 0.9.8", - "sha2 0.9.9", - "sha3", - "unsigned-varint 0.7.1", -] - -[[package]] -name = "multihash-derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" -dependencies = [ - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "native-tls" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "net2" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "nix" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dbdc256eaac2e3bd236d93ad999d3479ef775c863dbda3068c4006a92eec51b" -dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", - "libc", - "void", -] - -[[package]] -name = "nix" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" -dependencies = [ - "hashbrown 0.8.2", -] - -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check", -] - -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "nonempty" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" -dependencies = [ - "serde", -] - -[[package]] -name = "nonzero_ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44a1290799eababa63ea60af0cbc3f03363e328e58f32fb0294798ed3e85f444" - -[[package]] -name = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - -[[package]] -name = "notify" -version = "4.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" -dependencies = [ - "bitflags", - "filetime", - "fsevent", - "fsevent-sys", - "inotify", - "libc", - "mio 0.6.23", - "mio-extras", - "walkdir", - "winapi 0.3.9", -] - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "num" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational 0.2.4", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-cmp" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa" - -[[package]] -name = "num-complex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -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 = "num_threads" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" -dependencies = [ - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "oid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c19903c598813dba001b53beeae59bb77ad4892c5c1b9b3500ce4293a0d06c2" -dependencies = [ - "serde", -] - -[[package]] -name = "once_cell" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-sys", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "os_str_bytes" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d" - -[[package]] -name = "os_str_bytes" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" - -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "parity-scale-codec" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" -dependencies = [ - "arrayvec 0.7.2", - "bitvec 0.20.4", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive", - "serde", -] - -[[package]] -name = "parity-scale-codec-derive" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "parking" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.5", -] - -[[package]] -name = "parking_lot" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.3", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi 0.3.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "smallvec", - "windows-sys", -] - -[[package]] -name = "password-hash" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e0b28ace46c5a396546bcf443bf422b57049617433d8854227352a4a9b24e7" -dependencies = [ - "base64ct", - "rand_core 0.6.3", - "subtle", -] - -[[package]] -name = "pbkdf2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" -dependencies = [ - "base64ct", - "crypto-mac 0.11.1", - "hmac", - "password-hash", - "sha2 0.9.9", -] - -[[package]] -name = "pbkdf2" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739" -dependencies = [ - "crypto-mac 0.11.1", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "petgraph" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "pharos" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" -dependencies = [ - "futures", - "rustc_version", -] - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared", - "rand 0.7.3", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "picky-asn1" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "889bbb26c80acf919e89980dfc8e04eb19df272d8a9893ec9b748d3a1675abde" -dependencies = [ - "oid", - "serde", - "serde_bytes", -] - -[[package]] -name = "picky-asn1-der" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbbd5390ab967396cc7473e6e0848684aec7166e657c6088604e07b54a73dbe" -dependencies = [ - "picky-asn1", - "serde", - "serde_bytes", -] - -[[package]] -name = "picky-asn1-x509" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3033675030de806aba1d5470949701b7c9f1dbf77e3bb17bd12e5f945e560ba" -dependencies = [ - "base64 0.13.0", - "oid", - "picky-asn1", - "picky-asn1-der", - "serde", -] - -[[package]] -name = "pin-project" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" -dependencies = [ - "pin-project-internal 0.4.29", -] - -[[package]] -name = "pin-project" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" -dependencies = [ - "pin-project-internal 1.0.10", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkcs8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447" -dependencies = [ - "der 0.4.5", - "spki 0.4.1", -] - -[[package]] -name = "pkcs8" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" -dependencies = [ - "der 0.5.1", - "spki 0.5.4", - "zeroize", -] - -[[package]] -name = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - -[[package]] -name = "polling" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "log", - "wepoll-ffi", - "winapi 0.3.9", -] - -[[package]] -name = "poly1305" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" -dependencies = [ - "cpufeatures", - "opaque-debug 0.3.0", - "universal-hash", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - -[[package]] -name = "predicates" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" -dependencies = [ - "difflib", - "itertools 0.10.3", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb" - -[[package]] -name = "predicates-tree" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty_assertions" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563" -dependencies = [ - "ansi_term", - "ctor", - "diff", - "output_vt100", -] - -[[package]] -name = "primitive-types" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" -dependencies = [ - "fixed-hash", - "impl-codec", - "impl-rlp", - "impl-serde", - "uint", -] - -[[package]] -name = "proc-macro-crate" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" -dependencies = [ - "thiserror", - "toml", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "prodash" -version = "16.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b828b82b039761e012573c3f4b73c16bc549205bd288ae65f1b99f2e394317" -dependencies = [ - "bytesize", - "human_format", -] - -[[package]] -name = "qrcode" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" -dependencies = [ - "checked_int_cast", - "image", -] - -[[package]] -name = "quanta" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98dc777a7a39b76b1a26ae9d3f691f4c1bc0455090aa0b64dfa8cb7fc34c135" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - -[[package]] -name = "quickcheck" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" -dependencies = [ - "env_logger", - "log", - "rand 0.8.5", -] - -[[package]] -name = "quinn" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82c0a393b300104f989f3db8b8637c0d11f7a32a9c214560b47849ba8f119aa" -dependencies = [ - "bytes 1.1.0", - "futures", - "lazy_static", - "libc", - "mio 0.7.14", - "quinn-proto", - "rustls 0.19.1", - "socket2 0.3.19", - "thiserror", - "tokio", - "tracing", - "webpki 0.21.4", -] - -[[package]] -name = "quinn-proto" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "047aa96ec7ee6acabad7a1318dff72e9aff8994316bf2166c9b94cbec78ca54c" -dependencies = [ - "bytes 1.1.0", - "rand 0.8.5", - "ring", - "rustls 0.19.1", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki 0.21.4", -] - -[[package]] -name = "quote" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rad" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "rad-help", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-account" -version = "0.1.0" -dependencies = [ - "anyhow", - "ethers", - "lexopt", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-anchor" -version = "0.1.0" -dependencies = [ - "anyhow", - "coins-bip32 0.6.0", - "colored 1.9.3", - "ethers", - "lexopt", - "link-identities", - "log", - "multihash 0.14.0", - "radicle-cli", - "radicle-common", - "rpassword 5.0.1", - "safe-transaction-client", - "serde_json", - "thiserror", -] - -[[package]] -name = "rad-auth" -version = "0.1.0" -dependencies = [ - "anyhow", - "assay", - "atty", - "lexopt", - "librad", - "lnk-profile", - "radicle-common", - "radicle-terminal", - "zeroize", -] - -[[package]] -name = "rad-checkout" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "lnk-profile", - "rad-init", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-clone" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "rad-checkout", - "rad-init", - "rad-sync", - "rad-track", - "radicle-common", - "radicle-terminal", - "url", -] - -[[package]] -name = "rad-edit" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "link-identities", - "radicle-common", - "radicle-terminal", - "serde_json", -] - -[[package]] -name = "rad-ens" -version = "0.1.0" -dependencies = [ - "anyhow", - "ethers", - "lexopt", - "librad", - "radicle-common", - "radicle-terminal", - "serde_json", - "thiserror", - "url", -] - -[[package]] -name = "rad-gov" -version = "0.1.0" -dependencies = [ - "anyhow", - "ethers", - "lexopt", - "librad", - "radicle-common", - "radicle-terminal", - "regex", - "serde_json", - "thiserror", -] - -[[package]] -name = "rad-help" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "lnk-clib", - "lnk-profile", - "rad-account", - "rad-auth", - "rad-checkout", - "rad-clone", - "rad-edit", - "rad-ens", - "rad-init", - "rad-inspect", - "rad-ls", - "rad-pull", - "rad-push", - "rad-remote", - "rad-rm", - "rad-self", - "rad-sync", - "rad-track", - "rad-untrack", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-init" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "lnk-profile", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-inspect" -version = "0.1.0" -dependencies = [ - "anyhow", - "chrono", - "colored_json", - "lexopt", - "librad", - "link-identities", - "lnk-profile", - "radicle-common", - "radicle-terminal", - "serde_json", -] - -[[package]] -name = "rad-issue" -version = "0.1.0" -dependencies = [ - "anyhow", - "automerge 0.1.0", - "lazy_static", - "lexopt", - "librad", - "radicle-common", - "radicle-terminal", - "serde", - "serde_json", - "serde_yaml", -] - -[[package]] -name = "rad-ls" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-merge" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "lnk-identities", - "lnk-profile", - "rad-sync", - "radicle-common", - "radicle-terminal", - "serde", - "serde_json", -] - -[[package]] -name = "rad-patch" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "lnk-identities", - "lnk-profile", - "rad-sync", - "radicle-common", - "radicle-terminal", - "serde", - "serde_json", -] - -[[package]] -name = "rad-path" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "lnk-profile", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-pull" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "rad-sync", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-push" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "rad-sync", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-remote" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-reward" -version = "0.1.0" -dependencies = [ - "anyhow", - "ethers", - "lexopt", - "librad", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-rm" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "rad-untrack", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-self" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "lnk-profile", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-sync" -version = "0.1.0" -dependencies = [ - "anyhow", - "fastrand", - "lexopt", - "librad", - "lnk-clib", - "lnk-profile", - "radicle-common", - "radicle-terminal", - "url", -] - -[[package]] -name = "rad-track" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "rad-untrack" -version = "0.1.0" -dependencies = [ - "anyhow", - "lexopt", - "librad", - "rad-track", - "radicle-common", - "radicle-terminal", -] - -[[package]] -name = "radicle-cli" -version = "0.6.1" -dependencies = [ - "anyhow", - "assay", - "assert_cmd", - "atty", - "colored 1.9.3", - "ethers", - "futures", - "futures-lite", - "lexopt", - "librad", - "link-identities", - "lnk-profile", - "log", - "rad", - "rad-account", - "rad-auth", - "rad-checkout", - "rad-clone", - "rad-edit", - "rad-ens", - "rad-gov", - "rad-help", - "rad-init", - "rad-inspect", - "rad-issue", - "rad-ls", - "rad-merge", - "rad-patch", - "rad-path", - "rad-pull", - "rad-push", - "rad-remote", - "rad-reward", - "rad-rm", - "rad-self", - "rad-sync", - "rad-track", - "rad-untrack", - "radicle-common", - "radicle-git-helpers", - "radicle-terminal", - "url", -] - -[[package]] -name = "radicle-common" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "automerge 0.1.0", - "base64 0.13.0", - "byteorder", - "chrono", - "coins-bip32 0.6.0", - "either", - "ethers", - "git-trailers", - "git2", - "hex", - "lazy_static", - "lexopt", - "librad", - "lnk-clib", - "lnk-identities", - "lnk-profile", - "log", - "nonempty", - "quickcheck", - "radicle-git-ext", - "serde", - "serde_json", - "sha2 0.10.2", - "thiserror", - "tokio", - "ureq", - "url", - "walletconnect", - "zeroize", -] - -[[package]] -name = "radicle-data" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "minicbor", - "nonempty", - "serde", - "thiserror", - "typenum", -] - -[[package]] -name = "radicle-git-ext" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "git-ref-format", - "git2", - "link-git", - "minicbor", - "multihash 0.11.4", - "percent-encoding", - "radicle-std-ext", - "serde", - "thiserror", -] - -[[package]] -name = "radicle-git-helpers" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "anyhow", - "git2", - "libgit2-sys", - "librad", -] - -[[package]] -name = "radicle-keystore" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128583c70269a44d3e2144585b1f41a7f43ba11a2d8580266977268004a78a7b" -dependencies = [ - "async-trait", - "byteorder", - "chacha20poly1305", - "ed25519-zebra", - "futures", - "generic-array 0.14.5", - "lazy_static", - "lnk-cryptovec", - "lnk-thrussh-agent", - "lnk-thrussh-encoding", - "rand 0.8.5", - "rpassword 4.0.5", - "scrypt 0.8.0", - "secstr", - "serde", - "serde_cbor", - "thiserror", -] - -[[package]] -name = "radicle-macros" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" -dependencies = [ - "proc-macro-error", - "quote", - "radicle-git-ext", - "syn", -] - -[[package]] -name = "radicle-std-ext" -version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-link?rev=a9485b78b5c78d252c92f61d990cf34622d1c8f1#a9485b78b5c78d252c92f61d990cf34622d1c8f1" - -[[package]] -name = "radicle-terminal" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "console", - "dialoguer", - "indicatif", - "lexopt", - "librad", - "lnk-profile", - "radicle-common", - "thiserror", - "zeroize", -] - -[[package]] -name = "radium" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" - -[[package]] -name = "radium" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg 0.2.1", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom 0.2.6", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" -dependencies = [ - "rand_core 0.6.3", -] - -[[package]] -name = "rand_xoshiro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core 0.6.3", -] - -[[package]] -name = "rayon" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.6", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[package]] -name = "regex-syntax" -version = "0.6.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "reqwest" -version = "0.11.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" -dependencies = [ - "base64 0.13.0", - "bytes 1.1.0", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "hyper-tls", - "ipnet", - "js-sys", - "lazy_static", - "log", - "mime", - "native-tls", - "percent-encoding", - "pin-project-lite", - "rustls 0.20.4", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "rfc6979" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" -dependencies = [ - "crypto-bigint 0.3.2", - "hmac", - "zeroize", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi 0.3.9", -] - -[[package]] -name = "ripemd160" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eca4ecc81b7f313189bf73ce724400a07da2a6dac19588b03c8bd76a2dcc251" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "opaque-debug 0.3.0", -] - -[[package]] -name = "rlp" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" -dependencies = [ - "bytes 1.1.0", - "rustc-hex", -] - -[[package]] -name = "rlp-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "rpassword" -version = "4.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "rpassword" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "rusb" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703aa035c21c589b34fb5136b12e68fc8dcf7ea46486861381361dd8ebf5cee0" -dependencies = [ - "libc", - "libusb1-sys", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc-hex" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.0", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - -[[package]] -name = "rustls" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" -dependencies = [ - "log", - "ring", - "sct 0.7.0", - "webpki 0.22.0", -] - -[[package]] -name = "rustls-pemfile" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" -dependencies = [ - "base64 0.13.0", -] - -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error 1.2.3", - "tempfile", - "wait-timeout", -] - -[[package]] -name = "ryu" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" - -[[package]] -name = "safe-transaction-client" -version = "0.1.0" -dependencies = [ - "ethers", - "futures-executor", - "hex", - "rand_chacha 0.3.1", - "serde", - "thiserror", - "tiny-keccak", - "ureq", -] - -[[package]] -name = "salsa20" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecbd2eb639fd7cab5804a0837fe373cc2172d15437e804c054a9fb885cb923b0" -dependencies = [ - "cipher", -] - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static", - "winapi 0.3.9", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scrypt" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879588d8f90906e73302547e20fffefdd240eb3e0e744e142321f5d49dea0518" -dependencies = [ - "base64ct", - "hmac", - "password-hash", - "pbkdf2 0.8.0", - "salsa20", - "sha2 0.9.9", -] - -[[package]] -name = "scrypt" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2cc535b6997b0c755bf9344e71ca0e1be070d07ff792f1fcd31e7b90e07d5f" -dependencies = [ - "hmac", - "pbkdf2 0.9.0", - "salsa20", - "sha2 0.9.9", -] - -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "sec1" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" -dependencies = [ - "der 0.5.1", - "generic-array 0.14.5", - "pkcs8 0.8.0", - "subtle", - "zeroize", -] - -[[package]] -name = "secstr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb003d53cef244a97516226b01155057c7fa6eb52914933c32f6c98a84182188" -dependencies = [ - "libc", -] - -[[package]] -name = "security-framework" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" -dependencies = [ - "serde", -] - -[[package]] -name = "send_wrapper" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930c0acf610d3fdb5e2ab6213019aaa04e227ebe9547b0649ba599b16d788bd7" - -[[package]] -name = "serde" -version = "1.0.137" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-aux" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93abf9799c576f004252b2a05168d58527fb7c54de12e94b4d12fe3475ffad24" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "serde_bytes" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212e73464ebcde48d723aa02eb270ba62eff38a9b732df31f33f1b4e145f3a54" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_cbor" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7081ed758ec726a6ed8ee7e92f5d3f6e6f8c3901b1f972e3a4a2f2599fad14f" -dependencies = [ - "byteorder", - "half", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.137" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f972498cf015f7c0746cac89ebe1d6ef10c293b94175a243a2d9442c163d9944" -dependencies = [ - "itoa 1.0.1", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.1", - "ryu", - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.8.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc" -dependencies = [ - "indexmap", - "ryu", - "serde", - "yaml-rust", -] - -[[package]] -name = "sha-1" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - -[[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug 0.3.0", -] - -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "sha2" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug 0.3.0", - "sha2-asm", -] - -[[package]] -name = "sha2" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.3", -] - -[[package]] -name = "sha2-asm" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf27176fb5d15398e3a479c652c20459d9dac830dedd1fa55b42a77dbcdbfcea" -dependencies = [ - "cc", -] - -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug 0.3.0", -] - -[[package]] -name = "signal-hook" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2807892cfa58e081aa1f1111391c7a0649d4fa127a4ffbe34bcbfb35a1171a4" -dependencies = [ - "digest 0.9.0", - "rand_core 0.6.3", -] - -[[package]] -name = "similar" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3" - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - -[[package]] -name = "sized-vec" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5985e3944437a472b2059be8671eae6ab8e067324fd3a7161af28c22d1f11367" -dependencies = [ - "typenum", -] - -[[package]] -name = "slab" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" - -[[package]] -name = "smallvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" - -[[package]] -name = "smol_str" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7475118a28b7e3a2e157ce0131ba8c5526ea96e90ee601d9f6bb2e286a35ab44" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "socket2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spki" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c01a0c15da1b0b0e1494112e7af814a678fec9bd157881b49beac661e9b6f32" -dependencies = [ - "der 0.4.5", -] - -[[package]] -name = "spki" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" -dependencies = [ - "base64ct", - "der 0.5.1", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "terminfo" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e" -dependencies = [ - "dirs", - "fnv", - "nom 5.1.2", - "phf", - "phf_codegen", -] - -[[package]] -name = "termtree" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" - -[[package]] -name = "textwrap" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" - -[[package]] -name = "thiserror" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" -dependencies = [ - "libc", - "num_threads", - "time-macros", -] - -[[package]] -name = "time-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f48b6d60512a392e34dbf7fd456249fd2de3c83669ab642e021903f4015185b" -dependencies = [ - "bytes 1.1.0", - "libc", - "memchr", - "mio 0.8.2", - "num_cpus", - "once_cell", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.4.4", - "tokio-macros", - "winapi 0.3.9", -] - -[[package]] -name = "tokio-macros" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e" -dependencies = [ - "rustls 0.20.4", - "tokio", - "webpki 0.22.0", -] - -[[package]] -name = "tokio-util" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" -dependencies = [ - "bytes 1.1.0", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "tower-service" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" - -[[package]] -name = "tracing" -version = "0.1.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" -dependencies = [ - "cfg-if 1.0.0", - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project 1.0.10", - "tracing", -] - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "uint" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0" -dependencies = [ - "byteorder", - "crunchy", - "hex", - "static_assertions", -] - -[[package]] -name = "uluru" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794a32261a1f5eb6a4462c81b59cec87b5c27d5deea7dd1ac8fc781c41d226db" -dependencies = [ - "arrayvec 0.7.2", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-normalization" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array 0.14.5", - "subtle", -] - -[[package]] -name = "unsigned-varint" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35" - -[[package]] -name = "unsigned-varint" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "ureq" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9399fa2f927a3d327187cbd201480cee55bee6ac5d3c77dd27f0c6814cff16d5" -dependencies = [ - "base64 0.13.0", - "chunked_transfer", - "log", - "once_cell", - "rustls 0.20.4", - "serde", - "serde_json", - "url", - "webpki 0.22.0", - "webpki-roots", -] - -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", - "serde", -] - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.6", - "serde", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "versions" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cd9a7a22c45daf5aeb6bea3dff4ecbb8eb43e492582d467b18ce2979b512cbe" -dependencies = [ - "itertools 0.10.3", - "nom 7.1.1", -] - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi 0.3.9", - "winapi-util", -] - -[[package]] -name = "walletconnect" -version = "0.1.0" -source = "git+https://github.com/xphoniex/walletconnect-rs?branch=v0.1.0#82ab29227318b03254203d9cae62ea9ab9630d06" -dependencies = [ - "atty", - "data-encoding", - "ethers-core", - "futures", - "jsonrpc-core", - "lazy_static", - "log", - "openssl", - "qrcode", - "rand 0.8.5", - "ring", - "serde", - "serde_json", - "termcolor", - "terminfo", - "thiserror", - "url", - "uuid", - "ws", - "zeroize", -] - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" -dependencies = [ - "bumpalo", - "lazy_static", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" - -[[package]] -name = "wasm-timer" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" -dependencies = [ - "futures", - "js-sys", - "parking_lot 0.11.2", - "pin-utils", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" -dependencies = [ - "webpki 0.22.0", -] - -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "ws" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25fe90c75f236a0a00247d5900226aea4f2d7b05ccc34da9e7a8880ff59b5848" -dependencies = [ - "byteorder", - "bytes 0.4.12", - "httparse", - "log", - "mio 0.6.23", - "mio-extras", - "openssl", - "rand 0.7.3", - "sha-1 0.8.2", - "slab", - "url", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "ws_stream_wasm" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47ca1ab42f5afed7fc332b22b6e932ca5414b209465412c8cdf0ad23bc0de645" -dependencies = [ - "async_io_stream", - "futures", - "js-sys", - "pharos", - "rustc_version", - "send_wrapper", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - -[[package]] -name = "xorf" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b223640dfbc22009679ce79f6777ae1db79add62a07345605777f69274a052" -dependencies = [ - "rand 0.8.5", -] - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "zeroize" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] diff --git a/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix deleted file mode 100644 index 3f40739451..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, pkg-config -, cmake -, installShellFiles -, asciidoctor -, DarwinTools -, openssl -, libusb1 -, AppKit -, git -, openssh -, testers -, radicle-cli -}: - -rustPlatform.buildRustPackage rec { - pname = "radicle-cli"; - version = "0.6.1"; - - src = fetchFromGitHub { - owner = "radicle-dev"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-LS6zYpMg0LanRL2M8ioGG8Ys07TPT/3hP7geEGehwxg="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "automerge-0.0.2" = "sha256-MZ1/rca8ZsEUhd3bhd502PHlBbvqAOtnWFEdp7XWmYE="; - "automerge-0.1.0" = "sha256-dwbmx3W13oZ1O0Uw3/D5Z0ht1BO1PmVVoWc/tLCm0/4="; - "cob-0.1.0" = "sha256-ewPJEx7OSr8X6e5QJ4dh2SbzZ2TDa8G4zBR5euBbABo="; - "libusb1-sys-0.6.2" = "sha256-577ld1xqJkHp2bqALNq5IuZivD8y+VO8vNy9Y+hfq6c="; - "walletconnect-0.1.0" = "sha256-fdgdhotTYBmWbR4r0OMplOwhYq1C7jkuOdhKASjH+Fs="; - }; - }; - - # Otherwise, there are errors due to the `abigen` macro from `ethers`. - auditable = false; - - nativeBuildInputs = [ - pkg-config - cmake - installShellFiles - asciidoctor - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - DarwinTools - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libusb1 - AppKit - ]; - - postInstall = '' - for f in $(find . -name '*.adoc'); do - mf=''${f%.*} - asciidoctor --doctype manpage --backend manpage $f -o $mf - installManPage $mf - done - ''; - - nativeCheckInputs = [ - git - openssh - ]; - preCheck = '' - eval $(ssh-agent) - ''; - - passthru.tests = { - version = testers.testVersion { package = radicle-cli; }; - }; - - meta = { - description = "Command-line tooling for Radicle, a decentralized code collaboration network"; - homepage = "https://radicle.xyz"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ amesgen ]; - platforms = lib.platforms.unix; - mainProgram = "rad"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/radicle-upstream/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/radicle-upstream/default.nix deleted file mode 100644 index 69c960ed78..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/radicle-upstream/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib, stdenv, appimageTools, autoPatchelfHook, zlib, fetchurl, undmg }: - -let - pname = "radicle-upstream"; - version = "0.3.0"; - name = "${pname}-${version}"; - - srcs = { - x86_64-linux = fetchurl { - url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "sha256-Y7V89G+nXRtknOukvBN8Q+sNx91YNPDT0p5hrFYe/Sk="; - }; - x86_64-darwin = fetchurl { - url = "https://releases.radicle.xyz/radicle-upstream-${version}.dmg"; - sha256 = "sha256-EuWGbn6qggi8/9Rci8iaXfuVKE+QXb1BHEYDvotR/q4="; - }; - }; - src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - - contents = appimageTools.extract { inherit name src; }; - - git-remote-rad = stdenv.mkDerivation rec { - pname = "git-remote-rad"; - inherit version; - src = contents; - - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ zlib ]; - - installPhase = '' - mkdir -p $out/bin/ - cp ${contents}/resources/git-remote-rad $out/bin/git-remote-rad - ''; - }; - - # FIXME: a dependency of the `proxy` component of radicle-upstream (radicle-macros - # v0.1.0) uses unstable rust features, making a from source build impossible at - # this time. See this PR for discussion: https://github.com/NixOS/nixpkgs/pull/105674 - linux = appimageTools.wrapType2 { - inherit name src meta; - - extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - - # this automatically adds the git-remote-rad binary to the users `PATH` so - # they don't need to mess around with shell profiles... - ln -s ${git-remote-rad}/bin/git-remote-rad $out/bin/git-remote-rad - - # desktop item - install -m 444 -D ${contents}/${pname}.desktop $out/share/applications/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - - # icon - install -m 444 -D ${contents}/${pname}.png \ - $out/share/icons/hicolor/512x512/apps/${pname}.png - ''; - }; - - darwin = stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ undmg ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/Applications - cp -r *.app $out/Applications - ''; - }; - - meta = with lib; { - description = "A decentralized app for code collaboration"; - homepage = "https://radicle.xyz/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ d-xo ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - broken = stdenv.isLinux; # last successful build 2023-04-11 - }; -in -if stdenv.isDarwin -then darwin -else linux diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix index 4a1311d578..c941cc7570 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix @@ -6,6 +6,7 @@ , nixosTests , config , fetchPypi +, fetchpatch }: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` @@ -64,6 +65,13 @@ let inherit version; hash = "sha256-VUslfHS763oNJUFgpPj/4YUkP1KlIDUGC3Ycpi2XfwM="; }; + # Fixes a test failure with Pytest 8 + patches = (oldAttrs.patches or []) ++ [ + (fetchpatch { + url = "https://github.com/pallets/werkzeug/commit/4e5bdca7f8227d10cae828f8064fb98190ace4aa.patch"; + hash = "sha256-83doVvfdpymlAB0EbfrHmuoKE5B2LJbFq+AY2xGpnl4="; + }) + ]; }); # sourcehut is not (yet) compatible with factory-boy 3.x diff --git a/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix index 94583ba93b..cece41286a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix @@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.4.6"; + version = "2.4.7"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-ZQU9AkemAMpMb2GhdfHaF6r6r6MbMXnmA0pq6Zq9Sek="; + hash = "sha256-TfCmVN7oHOgMyreJo58r6qaQYAXqmekpZt2WyTMGLvQ="; }; - cargoHash = "sha256-DHTo0jRZlLmw/B042uqzpMLUhBwm+sbFj9pze5l1Kpk="; + cargoHash = "sha256-kH7YrjoNkpoUdzcWtVqpWtmw+FIMrJYbo0ye30/VeVk="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix index 39157edf80..811bed7694 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix @@ -18,7 +18,7 @@ pango, libredirect, makeWrapper, - wrapGAppsHook, + wrapGAppsHook3, pkexecPath ? "/run/wrappers/bin/pkexec", writeShellScript, common-updater-scripts, @@ -77,7 +77,7 @@ let ]; nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix index 07da8f64a6..490a0c4644 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix @@ -5,15 +5,15 @@ let in { sublime-merge = common { - buildVersion = "2091"; - aarch64sha256 = "dkPKuuzQQtL3eZlaAPeL7e2p5PCxroFRSp6Rw5wHODc="; - x64sha256 = "T5g6gHgl9xGytEOsh3VuB08IrbDvMu24o/1edCGmfd4="; + buildVersion = "2096"; + aarch64sha256 = "IHPJJ/oQ3SLemRyey5syTL0sf5GEeHSylDX+EQNNQGU="; + x64sha256 = "41I6p5wNx2pF56np7gHqp396RHpXtQu5ruksUywF/Ug="; } { }; sublime-merge-dev = common { - buildVersion = "2094"; + buildVersion = "2095"; dev = true; - aarch64sha256 = "ZJgq971EPzq+BWxTQAoX6TgUmTfpf9sI4CHPcvgPTfI="; - x64sha256 = "6FLfszhP+BGHX5FrycMlznREmGDLyDyo6rgmqxhtCak="; + aarch64sha256 = "FmXz8VAWS7e0bB9NeXbihnhdhWMyNJJs6PNt+K2G0Bk="; + x64sha256 = "83Hw27RgGPgugpf4eMuWT6/MSQ2Q2VBCbaXoSGFtTPI="; } { }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix index d7bd912b44..b4a8533d46 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.9"; + version = "2.5.10"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-RASZgQUlt/5ivImowM+sNw8Oe8aVkuUNErfgddmFjic="; + sha256 = "sha256-WTrw7WaSqC2fp76fPvfogWTibev0Hg0LW2x4umc3+1Q="; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/default.nix b/third_party/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/default.nix index 818e3a8e15..b9679d1fd4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.16.2"; + version = "1.2.17"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - hash = "sha256-IgNYJSadGemjclh7rtY8dHz7uSfBHoWEyLlRoZ+st6k="; + hash = "sha256-Ij4F5UCt1YOB4MLTlUTAiTt2zN4TkJuf5v6sWb9pJ6k="; }; sourceRoot = "${src.name}/src"; diff --git a/third_party/nixpkgs/pkgs/applications/video/bombono/default.nix b/third_party/nixpkgs/pkgs/applications/video/bombono/default.nix index 8ad77a6680..87545d5bce 100644 --- a/third_party/nixpkgs/pkgs/applications/video/bombono/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/bombono/default.nix @@ -15,7 +15,7 @@ , libdvdread , libxmlxx , mjpegtools -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { --replace "lib_mbase_env['CPPDEFINES']" "list(lib_mbase_env['CPPDEFINES'])" ''; - nativeBuildInputs = [ wrapGAppsHook scons pkg-config gettext ]; + nativeBuildInputs = [ wrapGAppsHook3 scons pkg-config gettext ]; buildInputs = [ boost diff --git a/third_party/nixpkgs/pkgs/applications/video/byzanz/default.nix b/third_party/nixpkgs/pkgs/applications/video/byzanz/default.nix index e3a97197d1..bc88c24814 100644 --- a/third_party/nixpkgs/pkgs/applications/video/byzanz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/byzanz/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchgit -, wrapGAppsHook +, wrapGAppsHook3 , cairo , glib , gnome @@ -51,7 +51,7 @@ stdenv.mkDerivation { gst-plugins-good gst-plugins-ugly gst-libav - wrapGAppsHook + wrapGAppsHook3 ]); meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix b/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix index 3814f921fa..399287c93f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { # during Linking C executable ccextractor broken = stdenv.isAarch64; license = licenses.gpl2Only; - maintainers = with maintainers; [ titanous ]; + maintainers = with maintainers; [ ]; mainProgram = "ccextractor"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix b/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix index 954ea58b45..b638bc3afd 100644 --- a/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix @@ -2,54 +2,49 @@ , lib , stdenv , fetchFromGitHub -, glib , gobject-introspection -, python3 , pkg-config , ninja -, wayland -, wayland-protocols , desktop-file-utils , makeWrapper , shared-mime-info , wrapGAppsHook4 , meson -, gjs , gtk4 , gst_all_1 , libGL , libadwaita -, appstream-glib -, libsoup +, libsoup_3 +, vala +, cmake +, libmicrodns }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clapper"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Rafostar"; - repo = pname; - rev = version; - sha256 = "sha256-s+qdTq3/pHHstwr1W3Hs2Zje++iJFHM6hQTFoZD43bY="; + repo = "clapper"; + rev = finalAttrs.version; + hash = "sha256-5fD1OnVcY3ZC+QfoFqe2jV43/J36r85SpLUYF2ti7dY="; }; nativeBuildInputs = [ - appstream-glib - desktop-file-utils # for update-desktop-database - glib gobject-introspection meson + cmake ninja makeWrapper pkg-config - python3 - shared-mime-info # for update-mime-database wrapGAppsHook4 # for gsettings + desktop-file-utils # for update-desktop-database + shared-mime-info # for update-mime-database + vala ]; buildInputs = [ - gjs gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -58,29 +53,30 @@ stdenv.mkDerivation rec { gtk4 libGL libadwaita - libsoup - wayland - wayland-protocols + libsoup_3 + libmicrodns ]; postPatch = '' - patchShebangs build-aux/meson/postinstall.py + patchShebangs --build build-aux/meson/postinstall.py ''; - postInstall = '' - cp ${src}/data/icons/*.svg $out/share/icons/hicolor/scalable/apps/ - cp ${src}/data/icons/*.svg $out/share/icons/hicolor/symbolic/apps/ + # The package uses "clappersink" provided by itself + preFixup = '' + gappsWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $out/lib/gstreamer-1.0 + ) ''; meta = with lib; { - description = "A GNOME media player built using GJS with GTK4 toolkit and powered by GStreamer with OpenGL rendering. "; + description = "A GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering"; longDescription = '' - Clapper is a GNOME media player build using GJS with GTK4 toolkit. - The media player is using GStreamer as a media backend and renders everything via OpenGL. + Clapper is a GNOME media player built using the GTK4 toolkit. + The media player is using GStreamer as a media backend. ''; homepage = "https://github.com/Rafostar/clapper"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = with maintainers; [ aleksana ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix b/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix index 7caf12ee76..bca8bc1e48 100644 --- a/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix @@ -25,6 +25,9 @@ , jq , studioVariant ? false + +, common-updater-scripts +, writeShellApplication }: let @@ -181,7 +184,6 @@ let in buildFHSEnv { inherit (davinci) pname version; - name = null; targetPkgs = pkgs: with pkgs; [ alsa-lib @@ -252,7 +254,28 @@ buildFHSEnv { '' }"; - passthru = { inherit davinci; }; + passthru = { + inherit davinci; + updateScript = lib.getExe (writeShellApplication { + name = "update-davinci-resolve"; + runtimeInputs = [ curl jq common-updater-scripts ]; + text = '' + set -o errexit + drv=pkgs/applications/video/davinci-resolve/default.nix + currentVersion=${lib.escapeShellArg davinci.version} + downloadsJSON="$(curl --fail --silent https://www.blackmagicdesign.com/api/support/us/downloads.json)" + + latestLinuxVersion="$(echo "$downloadsJSON" | jq '[.downloads[] | select(.urls.Linux) | .urls.Linux[] | select(.downloadTitle | test("DaVinci Resolve")) | .downloadTitle]' | grep -oP 'DaVinci Resolve \K\d+\.\d+\.\d+' | sort | tail -n 1)" + update-source-version davinci-resolve "$latestLinuxVersion" --source-key=davinci.src + + # Since the standard and studio both use the same version we need to reset it before updating studio + sed -i -e "s/""$latestLinuxVersion""/""$currentVersion""/" "$drv" + + latestStudioLinuxVersion="$(echo "$downloadsJSON" | jq '[.downloads[] | select(.urls.Linux) | .urls.Linux[] | select(.downloadTitle | test("DaVinci Resolve")) | .downloadTitle]' | grep -oP 'DaVinci Resolve Studio \K\d+\.\d+\.\d+' | sort | tail -n 1)" + update-source-version davinci-resolve-studio "$latestStudioLinuxVersion" --source-key=davinci.src + ''; + }); + }; meta = with lib; { description = "Professional video editing, color, effects and audio post-processing"; diff --git a/third_party/nixpkgs/pkgs/applications/video/devede/default.nix b/third_party/nixpkgs/pkgs/applications/video/devede/default.nix index 22689e27d6..f17638d42e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/devede/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/devede/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitLab, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor -, gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }: +, gtk3, gettext, wrapGAppsHook3, gdk-pixbuf, gobject-introspection }: let inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3 setuptools; @@ -16,7 +16,7 @@ in buildPythonApplication rec { }; nativeBuildInputs = [ - gettext wrapGAppsHook + gettext wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/dvdstyler/default.nix b/third_party/nixpkgs/pkgs/applications/video/dvdstyler/default.nix index 18018f88d0..e25bdf877a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/dvdstyler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/dvdstyler/default.nix @@ -16,7 +16,7 @@ , libexif , libjpeg , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , wxGTK32 , wxSVG , xine-ui @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { gettext gobject-introspection pkg-config - wrapGAppsHook + wrapGAppsHook3 xmlto zip ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/electronplayer/electronplayer.nix b/third_party/nixpkgs/pkgs/applications/video/electronplayer/electronplayer.nix index 270d5543c9..cc26adc247 100644 --- a/third_party/nixpkgs/pkgs/applications/video/electronplayer/electronplayer.nix +++ b/third_party/nixpkgs/pkgs/applications/video/electronplayer/electronplayer.nix @@ -2,21 +2,18 @@ let pname = "electronplayer"; version = "2.0.8"; - name = "${pname}-${version}"; #TODO: remove the -rc4 from the tag in the url when possible src = fetchurl { - url = "https://github.com/oscartbeaumont/ElectronPlayer/releases/download/v${version}-rc4/${name}.AppImage"; + url = "https://github.com/oscartbeaumont/ElectronPlayer/releases/download/v${version}-rc4/${pname}-${version}.AppImage"; sha256 = "wAsmSFdbRPnYnDyWQSbtyj+GLJLN7ibksUE7cegfkhI="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=ElectronPlayer' diff --git a/third_party/nixpkgs/pkgs/applications/video/entangle/default.nix b/third_party/nixpkgs/pkgs/applications/video/entangle/default.nix index cfab93dbcd..c06513a0fc 100644 --- a/third_party/nixpkgs/pkgs/applications/video/entangle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/entangle/default.nix @@ -9,7 +9,7 @@ , perl , python3 , pkgconf -, wrapGAppsHook +, wrapGAppsHook3 , at-spi2-core , dbus , elfutils @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { perl # for pod2man and build scripts python3 # for build scripts pkgconf - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/flowblade/default.nix b/third_party/nixpkgs/pkgs/applications/video/flowblade/default.nix index 4e558d335e..fff387881c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/flowblade/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/flowblade/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, stdenv , ffmpeg, frei0r, sox, gtk3, python3, ladspaPlugins -, gobject-introspection, makeWrapper, wrapGAppsHook +, gobject-introspection, makeWrapper, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "flowblade"; - version = "2.14.0.1"; + version = "2.14.0.2"; src = fetchFromGitHub { owner = "jliljebl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kyW/vYKGy/tgHmev8LgJbGugfKkzKFwLZStQQfWYPuQ="; + sha256 = "sha256-M+M6qkgYD5zM8IOFwQsuQlK7qQsvmSjR+CXVpTW+O8k="; }; buildInputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { (python3.withPackages (ps: with ps; [ mlt pygobject3 dbus-python numpy pillow libusb1 ])) ]; - nativeBuildInputs = [ gobject-introspection makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection makeWrapper wrapGAppsHook3 ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix index 09ed7efaf0..436f31ac5a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,5 +1,5 @@ {lib, stdenv, substituteAll, fetchFromGitHub, pkg-config, gettext, glib, gtk3, gmtk, dbus, dbus-glib -, libnotify, libpulseaudio, mplayer, wrapGAppsHook }: +, libnotify, libpulseaudio, mplayer, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "gnome-mplayer"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr"; }; - nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix b/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix index 9d0bfa9e96..cb6e4a8051 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gnomecast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3Packages, fetchFromGitHub, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook }: +{ stdenv, lib, python3Packages, fetchFromGitHub, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook3 }: with python3Packages; buildPythonApplication rec { @@ -12,7 +12,7 @@ buildPythonApplication rec { sha256 = "sha256-CJpbBuRzEjWb8hsh3HMW4bZA7nyDAwjrERCS5uGdwn8="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; propagatedBuildInputs = [ pychromecast bottle diff --git a/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix b/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix index d554fd5684..44495386d4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { homepage = "https://github.com/vishen/go-chromecast"; description = "CLI for Google Chromecast, Home devices and Cast Groups"; license = licenses.asl20; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; mainProgram = "go-chromecast"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/go2tv/default.nix b/third_party/nixpkgs/pkgs/applications/video/go2tv/default.nix index d8fc548f10..df2300150e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/go2tv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/go2tv/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "go2tv" + lib.optionalString (!withGui) "-lite"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "alexballas"; repo = "go2tv"; rev = "v${version}"; - sha256 = "sha256-5GOhTDlUpzInMm8hVcBjbf1CXRw2GQITRtj6UaxYHtE="; + sha256 = "sha256-ZP4ZpNc5l4Acw83Q4rSvPYByvgiKpkbxxu0bseivW58="; }; - vendorHash = null; + vendorHash = "sha256-na79rF/9o+s6E4i08Ocs6u98IABc19sTGFvjI6yeJFo="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix index 86bfebad38..678881faec 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix @@ -8,7 +8,7 @@ , libdrm , gpu-screen-recorder , libglvnd -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix index da7170ca5f..f3f6dacd4a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix @@ -73,7 +73,7 @@ , desktop-file-utils , meson , ninja -, wrapGAppsHook +, wrapGAppsHook3 , intltool , glib , gtk3 @@ -220,7 +220,7 @@ let pkg-config python3 ] - ++ optionals useGtk [ desktop-file-utils intltool meson ninja wrapGAppsHook ]; + ++ optionals useGtk [ desktop-file-utils intltool meson ninja wrapGAppsHook3 ]; buildInputs = [ a52dec diff --git a/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix b/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix index 14b0ca9497..7409bb8470 100644 --- a/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix @@ -1,6 +1,6 @@ { lib +, stdenv , fetchFromGitLab -, mkKdeDerivation , breeze-icons , breeze , cmake @@ -15,7 +15,7 @@ , kirigami , kxmlgui , kdoctools -, mpv +, mpvqt , pkg-config , wrapQtAppsHook , qqc2-desktop-style @@ -23,15 +23,15 @@ , yt-dlp }: -mkKdeDerivation rec { +stdenv.mkDerivation rec { pname = "haruna"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-L/mTFPJPHl8A6FqkWUwICh+Yl4uIE5KnTkZVnC4kCZ8="; + hash = "sha256-403ZqllSSaOdTS1GSf8EIQk9gHOxMsWogbK9qh+MhpY="; domain = "invent.kde.org"; }; @@ -56,7 +56,7 @@ mkKdeDerivation rec { kirigami kxmlgui kdoctools - mpv + mpvqt qtbase ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/hypnotix/default.nix b/third_party/nixpkgs/pkgs/applications/video/hypnotix/default.nix index 5c2e481250..a3b1e25de4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/hypnotix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/hypnotix/default.nix @@ -8,7 +8,7 @@ , gobject-introspection , mpv , python3 -, wrapGAppsHook +, wrapGAppsHook3 , yt-dlp }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { gettext gobject-introspection python3.pkgs.wrapPython - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/video/imagination/default.nix b/third_party/nixpkgs/pkgs/applications/video/imagination/default.nix index 8d1d6ac305..6dd9793b8b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/imagination/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/imagination/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, docbook_xsl, ffmpeg-full, glib, gtk3 -, intltool, libxslt, pkg-config, sox, wrapGAppsHook }: +, intltool, libxslt, pkg-config, sox, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "imagination"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { intltool libxslt pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ ffmpeg-full glib gtk3 sox ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix index dad9a52402..70f28ab720 100644 --- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -13,7 +13,7 @@ , python-mpv-jsonipc , pywebview , tkinter -, wrapGAppsHook +, wrapGAppsHook3 }: buildPythonApplication rec { @@ -27,7 +27,7 @@ buildPythonApplication rec { nativeBuildInputs = [ copyDesktopItems - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kazam/default.nix b/third_party/nixpkgs/pkgs/applications/video/kazam/default.nix index 8ca3b81366..cf392a143d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kazam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kazam/default.nix @@ -3,7 +3,7 @@ , substituteAll , python3Packages , gst_all_1 -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , gtk3 , libwnck @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1jk6khwgdv3nmagdgp5ivz3156pl0ljhf7b6i4b52w1h5ywsg9ah"; }; - nativeBuildInputs = [ gobject-introspection python3Packages.distutils-extra intltool wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection python3Packages.distutils-extra intltool wrapGAppsHook3 ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 677467d343..1a82cd1c19 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, pugixml, glib, nspr, nss, gtest }: +{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, pugixml, glib, nspr, nss, gtest, rapidjson }: let bento4 = fetchFromGitHub { owner = "xbmc"; @@ -10,13 +10,13 @@ in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "21.4.4"; + version = "21.4.6"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-Nzlm1AW/nW9chQAourKF0o2FSQmsr1MNhJ4gEO0/9sM="; + sha256 = "sha256-ub4ep89datfr8aZLZAfoz7zhOizGFpzgp2PVON6Ptj8="; }; extraCMakeFlags = [ @@ -26,7 +26,7 @@ buildKodiBinaryAddon rec { extraNativeBuildInputs = [ gtest ]; - extraBuildInputs = [ pugixml ]; + extraBuildInputs = [ pugixml rapidjson ]; extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 63cac3e726..7623a3c4db 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -5,13 +5,13 @@ in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "sha256-i9lRPMHniUmKTeNSzgp6dF11uYOcjH3PgJEa+Jasx68="; + sha256 = "sha256-yCgsQnzmlmyYAjp1q0J9QxGDRg5JCd23H9xgVozHiGM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/keymap/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/keymap/default.nix index 154bbd6b3c..e98e5ca2cb 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/keymap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/keymap/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "keymap"; namespace = "script.keymap"; - version = "1.1.5"; + version = "1.2.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-wSztipTEGIqw1icsz+ziNxYuRZOFt3C66T1Ifap/ta0="; + sha256 = "sha256-AtIufZbOi3MW7aSOAlON8csJheJqAbuBtKIX0sX6zIw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix index 6308a6470a..4184126842 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "20.4.0"; + version = "21.0.1"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; rev = "${version}-${rel}"; - sha256 = "sha256-FKxoPD8t5JbouhvQtMVMFjk3O5zB9kVgrn0eC2RPDvQ="; + sha256 = "sha256-Hb8TcJxRUIKHbevAUgt5q6z26W3uX9NbVwYyvrLnf7U="; }; extraBuildInputs = [ jsoncpp libhdhomerun ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix index 7747b9e44c..9b20235e8e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "20.7.0"; + version = "21.2.3"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "sha256-Mc540n+TfZiAV2uDSGrItsoPOkEBNyyQlW2DJZLwYA4="; + sha256 = "sha256-4jHcUjGarLHsn5CjBLWB1wQNjBBw4ftMuDY5uFAHAzY="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix index 28dd626502..59f39a06fd 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "20.13.0"; + version = "21.8.4"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-W/tFM/WpWdSvLEf0iwQoH2JVDjyfr1l8CRQkOG5q4hk="; + sha256 = "sha256-uuqk1kJnioCaRWIkC5liPSVRQPpviuaE+wmE4rq6fJw="; }; extraBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix index 4b5e8c6a70..9fdbee949d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-vdr-vnsi"; namespace = "pvr.vdr.vnsi"; - version = "20.4.1"; + version = "21.1.1"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.vdr.vnsi"; rev = "${version}-${rel}"; - sha256 = "sha256-QooWK+LwlN5RAISjAQ2YiyDAjQQMzod8fFXpI0ll+hc="; + sha256 = "sha256-Bd/21y3oAhQMmvrZzrN5Z6jLHySBd2LXNbLt/Me4jSw="; }; extraBuildInputs = [ libGL ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix index 8eaecd87fc..38ab9d3087 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "visualization-projectm"; namespace = "visualization.projectm"; - version = "20.2.0"; + version = "21.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - hash = "sha256-Kcl1ep+RJlofFmxkrGT3T+XXdwiCofq1hggwU0PAd0E="; + hash = "sha256-wjSQmOtQb4KjY3iH3Xh7AdQwE6ked+cpW6/gdNYS+NA="; }; extraBuildInputs = [ pkg-config libGL projectm ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix index d98acd70ac..23c59d702e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.5"; + version = "7.0.6.3"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-oM1n0Rye2QagxXoAZ/6mXKeGqKjEdewgS79lhp+yCQI="; + hash = "sha256-MhVxaI/kZ/CCAcf6Mo4DXmXpCLpxxpBFGwmTBp3rKkI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/lbry/default.nix b/third_party/nixpkgs/pkgs/applications/video/lbry/default.nix index b7c03850c9..f978fd6226 100644 --- a/third_party/nixpkgs/pkgs/applications/video/lbry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/lbry/default.nix @@ -1,14 +1,12 @@ { lib, fetchurl, appimageTools}: -let +appimageTools.wrapAppImage rec { pname = "lbry-desktop"; version = "0.53.9"; -in appimageTools.wrapAppImage rec { - name = "${pname}-${version}"; # Fetch from GitHub Releases and extract src = appimageTools.extract { - inherit name; + inherit pname version; src = fetchurl { url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; # Gotten from latest-linux.yml @@ -17,14 +15,12 @@ in appimageTools.wrapAppImage rec { }; # At runtime, Lbry likes to have access to Ffmpeg - extraPkgs = pkgs: with pkgs; [ - ffmpeg - ]; + extraPkgs = pkgs: [ pkgs.ffmpeg ]; # General fixup extraInstallCommands = '' # Firstly, rename the executable to lbry for convinence - mv $out/bin/${name} $out/bin/lbry + mv $out/bin/${pname} $out/bin/lbry # Now, install assets such as the desktop file and icons install -m 444 -D ${src}/lbry.desktop -t $out/share/applications diff --git a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix index d75adb88f3..14e4cf215e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix +++ b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -22,17 +22,14 @@ let inherit pname version src; }; in -(appimageTools.wrapType2 { +appimageTools.wrapType2 { inherit pname version src; profile = '' export LC_ALL=C.UTF-8 ''; - extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps; - extraInstallCommands = '' - mv $out/bin/{${pname}-${version},losslesscut} ( mkdir -p $out/share cd ${extracted}/usr @@ -53,6 +50,4 @@ in platforms = [ "x86_64-linux" ]; mainProgram = "losslesscut"; }; -}) // { - inherit pname version; } diff --git a/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix b/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix index dc016fda0a..261e8008f6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix @@ -1,16 +1,17 @@ -{ lib -, mkDerivation -, fetchurl -, autoPatchelfHook -, pkg-config -, curl -, ffmpeg -, openssl -, qtbase -, zlib +{ + lib, + mkDerivation, + fetchurl, + autoPatchelfHook, + pkg-config, + curl, + ffmpeg, + openssl, + qtbase, + zlib, -, withJava ? true -, jre_headless + withJava ? true, + jre_headless, }: let @@ -30,12 +31,15 @@ let ]; sha256 = "2dtNdyv0+QYWQrfrIu5RQKSN4scSWKuLFNlJZXpxDUM="; }; - -in mkDerivation { +in +mkDerivation { pname = "makemkv"; inherit version; - srcs = [ src_bin src_oss ]; + srcs = [ + src_bin + src_oss + ]; sourceRoot = "makemkv-oss-${version}"; @@ -43,18 +47,25 @@ in mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ autoPatchelfHook pkg-config ]; + nativeBuildInputs = [ + autoPatchelfHook + pkg-config + ]; - buildInputs = [ ffmpeg openssl qtbase zlib ]; + buildInputs = [ + ffmpeg + openssl + qtbase + zlib + ]; runtimeDependencies = [ (lib.getLib curl) ]; qtWrapperArgs = let binPath = lib.makeBinPath [ jre_headless ]; - in lib.optionals withJava [ - "--prefix PATH : ${binPath}" - ]; + in + lib.optionals withJava [ "--prefix PATH : ${binPath}" ]; installPhase = '' runHook preInstall @@ -84,9 +95,12 @@ in mkDerivation { expiration date. ''; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = [ licenses.unfree licenses.lgpl21 ]; + license = [ + licenses.unfree + licenses.lgpl21 + ]; homepage = "http://makemkv.com"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ titanous ]; + maintainers = with maintainers; [ jchw ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/media-downloader/default.nix b/third_party/nixpkgs/pkgs/applications/video/media-downloader/default.nix index 761243d897..e11b1b1b5b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/media-downloader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/media-downloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-n+eQjjjdZhvXFSw5D/UQhyBMSZstfI/JixiEVhmQwXs="; + hash = "sha256-sl82ZnRqFE3z+EGM+m5rAy4MMrbgkY4PZgyc94x7XUI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 2802ed8a5b..bba0377185 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -8,6 +8,7 @@ , cmark , docbook_xsl , expat +, fetchpatch2 , file , flac , fmt @@ -49,13 +50,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "83.0"; + version = "84.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - hash = "sha256-MHi3ewxCn560vpVfOucV34CNj/95U2OFd6bxAjtMBoc="; + hash = "sha256-//I++WWnSHnkpTZ0TzS3lhH5+eDD5mazTQ1HVMQS4Ug="; }; nativeBuildInputs = [ @@ -94,6 +95,11 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ qtwayland ] ++ optionals stdenv.isDarwin [ libiconv ]; + patches = [ (fetchpatch2 { + url = "https://gitlab.com/mbunkus/mkvtoolnix/-/commit/7e1bea9527616ab6ab38425e7290579f05dd9bb1.patch"; + hash = "sha256-9UZrfwrzfKwF8XDzqYnuaDgZws7l1YAb5O1O1+nxo0g="; + }) ]; + # autoupdate is not needed but it silences a ton of pointless warnings postPatch = '' patchShebangs . > /dev/null diff --git a/third_party/nixpkgs/pkgs/applications/video/molotov/default.nix b/third_party/nixpkgs/pkgs/applications/video/molotov/default.nix index 1930f06ffd..58e66c8f77 100644 --- a/third_party/nixpkgs/pkgs/applications/video/molotov/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/molotov/default.nix @@ -12,7 +12,6 @@ in appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D \ ${appimageContents}/@molotovdesktop-wrapper.desktop \ $out/share/applications/${pname}.desktop diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/buildLua.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/buildLua.nix index e0afa7d932..2e25ee55b2 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/buildLua.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -1,80 +1,98 @@ -{ lib -, stdenvNoCC }: +{ lib, stdenvNoCC }: let - escapedList = with lib; concatMapStringsSep " " (s: "'${escape [ "'" ] s}'"); + # Escape strings for embedding in shell scripts + escaped = s: "'${lib.escape [ "'" ] s}'"; + escapedList = lib.concatMapStringsSep " " escaped; + fileName = pathStr: lib.last (lib.splitString "/" pathStr); scriptsDir = "$out/share/mpv/scripts"; # similar to `lib.extends`, but with inverted precedence and recursive update - extendedBy = args: orig: self: - let super = args self; - in lib.recursiveUpdate (orig super) super - ; + extendedBy = + args: orig: self: + let + super = args self; + in + lib.recursiveUpdate (orig super) super; in -lib.makeOverridable (args: stdenvNoCC.mkDerivation (extendedBy - (if lib.isFunction args then args else (_: args)) ( - { pname - , extraScripts ? [] - , ... }@args: - let - strippedName = with builtins; - let groups = match "mpv[-_](.*)" pname; in - if groups != null - then head groups - else pname - ; - # either passthru.scriptName, inferred from scriptPath, or from pname - scriptName = (args.passthru or {}).scriptName or ( - if args ? scriptPath - then fileName args.scriptPath - else "${strippedName}.lua" - ); - scriptPath = args.scriptPath or "./${scriptName}"; - in { - dontBuild = true; - preferLocalBuild = true; +lib.makeOverridable ( + args: + stdenvNoCC.mkDerivation ( + extendedBy (if lib.isFunction args then args else (_: args)) ( + { + pname, + extraScripts ? [ ], + ... + }@args: + let + strippedName = + with builtins; + let + groups = match "mpv[-_](.*)" pname; + in + if groups != null then head groups else pname; + # either passthru.scriptName, inferred from scriptPath, or from pname + scriptName = + (args.passthru or { }).scriptName + or (if args ? scriptPath then fileName args.scriptPath else "${strippedName}.lua"); + scriptPath = args.scriptPath or "./${scriptName}"; + in + { + dontBuild = true; + preferLocalBuild = true; - # Prevent `patch` from emitting `.orig` files (that end up in the output) - patchFlags = [ "--no-backup-if-mismatch" "-p1" ]; + # Prevent `patch` from emitting `.orig` files (that end up in the output) + patchFlags = [ + "--no-backup-if-mismatch" + "-p1" + ]; - outputHashMode = "recursive"; - installPhase = '' - runHook preInstall + outputHashMode = "recursive"; + installPhase = '' + runHook preInstall - if [ -d "${scriptPath}" ]; then - [ -f "${scriptPath}/main.lua" ] || { - echo "Script directory '${scriptPath}' does not contain 'main.lua'" >&2 - exit 1 - } - [ ${with builtins; toString (length extraScripts)} -eq 0 ] || { - echo "mpvScripts.buildLua does not support 'extraScripts'" \ - "when 'scriptPath' is a directory" - exit 1 - } - mkdir -p "${scriptsDir}" - cp -a "${scriptPath}" "${scriptsDir}/${scriptName}" - else - install -m644 -Dt "${scriptsDir}" \ - ${escapedList ([ scriptPath ] ++ extraScripts)} - fi + if [ -d "${scriptPath}" ]; then + [ -f "${scriptPath}/main.lua" ] || { + echo "Script directory '${scriptPath}' does not contain 'main.lua'" >&2 + exit 1 + } + [ ${with builtins; toString (length extraScripts)} -eq 0 ] || { + echo "mpvScripts.buildLua does not support 'extraScripts'" \ + "when 'scriptPath' is a directory" >&2 + exit 1 + } + mkdir -p "${scriptsDir}" + cp -a "${scriptPath}" "${scriptsDir}/${scriptName}" + else + install -m644 -Dt "${scriptsDir}" ${escaped scriptPath} + ${ + lib.optionalString (extraScripts != [ ]) ''cp -at "${scriptsDir}/" ${escapedList extraScripts}'' + } + fi - runHook postInstall - ''; + runHook postInstall + ''; - passthru = { inherit scriptName; }; - meta = { - platforms = lib.platforms.all; - } // ( - let pos = - if (args.meta or {}) ? description then - builtins.unsafeGetAttrPos "description" args.meta - else - builtins.unsafeGetAttrPos "pname" args; - in lib.optionalAttrs - (pos != null) - { position = "${pos.file}:${toString pos.line}"; } - ); - }) -)) + passthru = { + inherit scriptName; + }; + meta = + { + platforms = lib.platforms.all; + } + // ( + let + pos = + if (args.meta or { }) ? description then + builtins.unsafeGetAttrPos "description" args.meta + else + builtins.unsafeGetAttrPos "pname" args; + in + lib.optionalAttrs (pos != null) { position = "${pos.file}:${toString pos.line}"; } + ); + } + ) + ) +) diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/chapterskip.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/chapterskip.nix index 9d0c7dafc1..b1b993df36 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/chapterskip.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/chapterskip.nix @@ -1,28 +1,30 @@ -{ lib -, fetchFromGitHub -, unstableGitUpdater -, buildLua }: +{ + lib, + fetchFromGitHub, + unstableGitUpdater, + buildLua, +}: buildLua { pname = "chapterskip"; - version = "unstable-2022-09-08"; + version = "0-unstable-2022-09-08"; src = fetchFromGitHub { owner = "po5"; - repo = "chapterskip"; - rev = "b26825316e3329882206ae78dc903ebc4613f039"; - hash = "sha256-OTrLQE3rYvPQamEX23D6HttNjx3vafWdTMxTiWpDy90="; + repo = "chapterskip"; + rev = "b26825316e3329882206ae78dc903ebc4613f039"; + hash = "sha256-OTrLQE3rYvPQamEX23D6HttNjx3vafWdTMxTiWpDy90="; }; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { }; meta = { description = "Automatically skips chapters based on title"; longDescription = '' - MPV script that skips chapters based on their title, categorized using regexes. - The set of skipped categories can be configured globally, or by an auto-profile. + MPV script that skips chapters based on their title, categorized using regexes. + The set of skipped categories can be configured globally, or by an auto-profile. ''; homepage = "https://github.com/po5/chapterskip"; - license = lib.licenses.unfree; # https://github.com/po5/chapterskip/issues/10 + license = lib.licenses.unfree; # https://github.com/po5/chapterskip/issues/10 maintainers = with lib.maintainers; [ nicoo ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix index aaf9afcc0d..1df83df46d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix @@ -1,35 +1,36 @@ -{ lib -, fetchgit -, unstableGitUpdater +{ + lib, + fetchgit, + unstableGitUpdater, -, buildLua -, libnotify -, mkvtoolnix-cli -, yad + buildLua, + libnotify, + mkvtoolnix-cli, + yad, }: buildLua { pname = "mpv-convert-script"; - version = "unstable-2015-07-02"; + version = "0-unstable-2015-07-02"; src = fetchgit { url = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; rev = "f95cee43e390e843a47e8ec9d1711a12a8cd343d"; sha256 = "13m7l4sy2r8jv2sfrb3vvqvnim4a9ilnv28q5drlg09v298z3mck"; }; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { }; patches = [ ./convert.patch ]; postPatch = '' substituteInPlace convert_script.lua \ - --replace 'mkvpropedit_exe = "mkvpropedit"' \ - 'mkvpropedit_exe = "${mkvtoolnix-cli}/bin/mkvpropedit"' \ - --replace 'mkvmerge_exe = "mkvmerge"' \ - 'mkvmerge_exe = "${mkvtoolnix-cli}/bin/mkvmerge"' \ - --replace 'yad_exe = "yad"' \ - 'yad_exe = "${yad}/bin/yad"' \ - --replace 'notify_send_exe = "notify-send"' \ - 'notify_send_exe = "${libnotify}/bin/notify-send"' \ + --replace-fail 'mkvpropedit_exe = "mkvpropedit"' \ + 'mkvpropedit_exe = "${lib.getExe' mkvtoolnix-cli "mkvpropedit"}"' \ + --replace-fail 'mkvmerge_exe = "mkvmerge"' \ + 'mkvmerge_exe = "${lib.getExe' mkvtoolnix-cli "mkvmerge"}"' \ + --replace-fail 'yad_exe = "yad"' \ + 'yad_exe = "${lib.getExe yad}"' \ + --replace-fail 'notify_send_exe = "notify-send"' \ + 'notify_send_exe = "${lib.getExe libnotify}"' \ ''; scriptPath = "convert_script.lua"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/cutter.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/cutter.nix index 69eba782cc..b051c08a85 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/cutter.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/cutter.nix @@ -1,8 +1,14 @@ -{ lib, buildLua, fetchFromGitHub, makeWrapper, unstableGitUpdater }: +{ + lib, + buildLua, + fetchFromGitHub, + makeWrapper, + unstableGitUpdater, +}: buildLua { pname = "video-cutter"; - version = "unstable-2023-11-09"; + version = "0-unstable-2023-11-10"; src = fetchFromGitHub { owner = "rushmj"; @@ -10,26 +16,25 @@ buildLua { rev = "01a0396c075d5f8bbd1de5b571e6231f8899ab65"; sha256 = "sha256-veoRFzUCRH8TrvR7x+WWoycpDyxqrJZ/bnp61dVc0pE="; }; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { }; nativeBuildInputs = [ makeWrapper ]; postPatch = '' substituteInPlace cutter.lua \ - --replace '~/.config/mpv/scripts/c_concat.sh' '${placeholder "out"}/share/mpv/scripts/c_concat.sh' + --replace-fail '~/.config/mpv/scripts/c_concat.sh' '${placeholder "out"}/share/mpv/scripts/c_concat.sh' # needs to be ran separately so that we can replace everything, and not every single mention explicitly # original script places them in the scripts folder, just spawning unnecessary errors # i know that hardcoding .config and especially the .mpv directory isn't best practice, but I didn't want to deviate too much from upstream substituteInPlace cutter.lua \ - --replace '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter" + --replace-fail '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter" ''; passthru.scriptName = "cutter.lua"; extraScripts = [ "c_concat.sh" ]; postInstall = '' - chmod 0755 $out/share/mpv/scripts/c_concat.sh wrapProgram $out/share/mpv/scripts/c_concat.sh \ --run "mkdir -p ~/.config/mpv/cutter/" ''; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/default.nix index fac7c910d5..6d4d4c06ab 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/default.nix @@ -1,105 +1,146 @@ -{ lib -, config -, newScope -, runCommand +{ + lib, + config, + newScope, + runCommand, }: let - unionOfDisjoints = lib.fold lib.attrsets.unionOfDisjoint {}; + unionOfDisjoints = lib.fold lib.attrsets.unionOfDisjoint { }; - addTests = name: drv: - if ! lib.isDerivation drv then + addTests = + name: drv: + if !lib.isDerivation drv then drv - else let - inherit (drv) scriptName; - scriptPath = "share/mpv/scripts/${scriptName}"; - fullScriptPath = "${drv}/${scriptPath}"; - in drv.overrideAttrs (old: { passthru = (old.passthru or {}) // { tests = unionOfDisjoints [ - (old.passthru.tests or {}) + else + let + inherit (drv) scriptName; + scriptPath = "share/mpv/scripts/${scriptName}"; + fullScriptPath = "${drv}/${scriptPath}"; + in + drv.overrideAttrs (old: { + passthru = (old.passthru or { }) // { + tests = unionOfDisjoints [ + (old.passthru.tests or { }) - { - scriptName-is-valid = runCommand "mpvScripts.${name}.passthru.tests.scriptName-is-valid" { - meta.maintainers = with lib.maintainers; [ nicoo ]; - preferLocalBuild = true; - } '' - if [ -e "${fullScriptPath}" ]; then - touch $out - else - echo "mpvScripts.\"${name}\" does not contain a script named \"${scriptName}\"" >&2 - exit 1 - fi - ''; - } + { + scriptName-is-valid = + runCommand "mpvScripts.${name}.passthru.tests.scriptName-is-valid" + { + meta.maintainers = with lib.maintainers; [ nicoo ]; + preferLocalBuild = true; + } + '' + if [ -e "${fullScriptPath}" ]; then + touch $out + else + echo "mpvScripts.\"${name}\" does not contain a script named \"${scriptName}\"" >&2 + exit 1 + fi + ''; + } - # can't check whether `fullScriptPath` is a directory, in pure-evaluation mode - (with lib; optionalAttrs (! any (s: hasSuffix s drv.passthru.scriptName) [ ".js" ".lua" ".so" ]) { - single-main-in-script-dir = runCommand "mpvScripts.${name}.passthru.tests.single-main-in-script-dir" { - meta.maintainers = with lib.maintainers; [ nicoo ]; - preferLocalBuild = true; - } '' - die() { - echo "$@" >&2 - exit 1 - } + # can't check whether `fullScriptPath` is a directory, in pure-evaluation mode + ( + with lib; + optionalAttrs + ( + !any (s: hasSuffix s drv.passthru.scriptName) [ + ".js" + ".lua" + ".so" + ] + ) + { + single-main-in-script-dir = + runCommand "mpvScripts.${name}.passthru.tests.single-main-in-script-dir" + { + meta.maintainers = with lib.maintainers; [ nicoo ]; + preferLocalBuild = true; + } + '' + die() { + echo "$@" >&2 + exit 1 + } - cd "${drv}/${scriptPath}" # so the glob expands to filenames only - mains=( main.* ) - if [ "''${#mains[*]}" -eq 1 ]; then - touch $out - elif [ "''${#mains[*]}" -eq 0 ]; then - die "'${scriptPath}' contains no 'main.*' file" - else - die "'${scriptPath}' contains multiple 'main.*' files:" "''${mains[*]}" - fi - ''; - }) - ]; }; }); + cd "${drv}/${scriptPath}" # so the glob expands to filenames only + mains=( main.* ) + if [ "''${#mains[*]}" -eq 1 ]; then + touch $out + elif [ "''${#mains[*]}" -eq 0 ]; then + die "'${scriptPath}' contains no 'main.*' file" + else + die "'${scriptPath}' contains multiple 'main.*' files:" "''${mains[*]}" + fi + ''; + } + ) + ]; + }; + }); - scope = self: let - inherit (self) callPackage; - in lib.mapAttrs addTests { - inherit (callPackage ./mpv.nix { }) - acompressor autocrop autodeint autoload; - inherit (callPackage ./occivink.nix { }) - blacklistExtensions seekTo; + scope = + self: + let + inherit (self) callPackage; + in + lib.mapAttrs addTests { + inherit (callPackage ./mpv.nix { }) + acompressor + autocrop + autodeint + autoload + ; + inherit (callPackage ./occivink.nix { }) blacklistExtensions seekTo; - buildLua = callPackage ./buildLua.nix { }; - chapterskip = callPackage ./chapterskip.nix { }; - convert = callPackage ./convert.nix { }; - cutter = callPackage ./cutter.nix { }; - dynamic-crop = callPackage ./dynamic-crop.nix { }; - inhibit-gnome = callPackage ./inhibit-gnome.nix { }; - modernx = callPackage ./modernx.nix { }; - modernx-zydezu = callPackage ./modernx-zydezu.nix { }; - mpris = callPackage ./mpris.nix { }; - mpv-cheatsheet = callPackage ./mpv-cheatsheet.nix { }; - mpv-osc-modern = callPackage ./mpv-osc-modern.nix { }; - mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; - mpv-webm = callPackage ./mpv-webm.nix { }; - mpvacious = callPackage ./mpvacious.nix { }; - quack = callPackage ./quack.nix { }; - quality-menu = callPackage ./quality-menu.nix { }; - reload = callPackage ./reload.nix { }; - simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; - sponsorblock = callPackage ./sponsorblock.nix { }; - sponsorblock-minimal = callPackage ./sponsorblock-minimal.nix { }; - thumbfast = callPackage ./thumbfast.nix { }; - thumbnail = callPackage ./thumbnail.nix { }; - uosc = callPackage ./uosc.nix { }; - visualizer = callPackage ./visualizer.nix { }; - vr-reversal = callPackage ./vr-reversal.nix { }; - webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; - }; + buildLua = callPackage ./buildLua.nix { }; + chapterskip = callPackage ./chapterskip.nix { }; + convert = callPackage ./convert.nix { }; + cutter = callPackage ./cutter.nix { }; + dynamic-crop = callPackage ./dynamic-crop.nix { }; + evafast = callPackage ./evafast.nix { }; + inhibit-gnome = callPackage ./inhibit-gnome.nix { }; + memo = callPackage ./memo.nix { }; + manga-reader = callPackage ./manga-reader.nix { }; + modernx = callPackage ./modernx.nix { }; + modernx-zydezu = callPackage ./modernx-zydezu.nix { }; + mpris = callPackage ./mpris.nix { }; + mpv-cheatsheet = callPackage ./mpv-cheatsheet.nix { }; + mpv-notify-send = callPackage ./mpv-notify-send.nix { }; + mpv-osc-modern = callPackage ./mpv-osc-modern.nix { }; + mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; + mpv-slicing = callPackage ./mpv-slicing.nix { }; + mpv-webm = callPackage ./mpv-webm.nix { }; + mpvacious = callPackage ./mpvacious.nix { }; + quack = callPackage ./quack.nix { }; + quality-menu = callPackage ./quality-menu.nix { }; + reload = callPackage ./reload.nix { }; + simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; + sponsorblock = callPackage ./sponsorblock.nix { }; + sponsorblock-minimal = callPackage ./sponsorblock-minimal.nix { }; + thumbfast = callPackage ./thumbfast.nix { }; + thumbnail = callPackage ./thumbnail.nix { }; + uosc = callPackage ./uosc.nix { }; + videoclip = callPackage ./videoclip.nix { }; + visualizer = callPackage ./visualizer.nix { }; + vr-reversal = callPackage ./vr-reversal.nix { }; + webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; + youtube-upnext = callPackage ./youtube-upnext.nix { }; + }; aliases = { youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 }; in -with lib; pipe scope [ +with lib; +pipe scope [ (makeScope newScope) - (self: - assert builtins.intersectAttrs self aliases == {}; - self // optionalAttrs config.allowAliases aliases) + ( + self: + assert builtins.intersectAttrs self aliases == { }; + self // optionalAttrs config.allowAliases aliases + ) recurseIntoAttrs ] diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/dynamic-crop.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/dynamic-crop.nix index f2cd7dc070..4388e2d137 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/dynamic-crop.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/dynamic-crop.nix @@ -1,7 +1,8 @@ -{ lib -, fetchFromGitHub -, unstableGitUpdater -, buildLua +{ + lib, + fetchFromGitHub, + unstableGitUpdater, + buildLua, }: buildLua { pname = "dynamic-crop"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/evafast.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/evafast.nix new file mode 100644 index 0000000000..5260adb1a8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/evafast.nix @@ -0,0 +1,28 @@ +{ + fetchFromGitHub, + buildLua, + lib, + unstableGitUpdater, +}: + +buildLua { + pname = "evafast"; + version = "0-unstable-2024-02-09"; + + src = fetchFromGitHub { + owner = "po5"; + repo = "evafast"; + rev = "92af3e2e1c756ce83f9d0129c780caeef1131a0b"; + hash = "sha256-BGWD2XwVu8zOSiDJ+9oWi8aPN2Wkw0Y0gF58X4f+tdI="; + }; + + # Drop the `branch` parameter once upstream merges `rewrite` back into `master` + passthru.updateScript = unstableGitUpdater { branch = "rewrite"; }; + + meta = with lib; { + description = "Seeking and hybrid fastforwarding like VHS"; + homepage = "https://github.com/po5/evafast"; + license = licenses.unfree; # no license; see https://github.com/po5/evafast/issues/15 + maintainers = with lib.maintainers; [ purrpurrn ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix index 618c74adea..02a54a2cf4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, gitUpdater, pkg-config, dbus, mpv-unwrapped }: +{ + lib, + stdenv, + fetchFromGitHub, + gitUpdater, + pkg-config, + dbus, + mpv-unwrapped, +}: stdenv.mkDerivation rec { pname = "mpv-inhibit-gnome"; @@ -10,13 +18,14 @@ stdenv.mkDerivation rec { rev = "v${version}"; hash = "sha256-LSGg5gAQE2JpepBqhz6D6d3NlqYaU4bjvYf1F+oLphQ="; }; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dbus mpv-unwrapped ]; + buildInputs = [ + dbus + mpv-unwrapped + ]; passthru.scriptName = "mpv_inhibit_gnome.so"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/manga-reader.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/manga-reader.nix new file mode 100644 index 0000000000..9a9621cb34 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/manga-reader.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchFromGitHub, + unstableGitUpdater, + buildLua, +}: + +buildLua rec { + pname = "manga-reader"; + + version = "0-unstable-2024-03-17"; + src = fetchFromGitHub { + owner = "Dudemanguy"; + repo = "mpv-manga-reader"; + rev = "6b65d98be7d20c8e272a4caa6c5018ed3a8bb2b3"; + hash = "sha256-54n513lpn1KCErXJHqL+GKdDE1P52LolS6xDott/epY="; + }; + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Manga reading script for mpv"; + longDescription = '' + mpv-manga-reader is a script aimed at making mpv a usable manga reader. + ''; + homepage = "https://github.com//mpv-manga-reader"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ idlip ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/memo.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/memo.nix new file mode 100644 index 0000000000..dea7adc85e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/memo.nix @@ -0,0 +1,27 @@ +{ + fetchFromGitHub, + buildLua, + lib, + unstableGitUpdater, +}: + +buildLua { + pname = "memo"; + version = "0-unstable-2023-10-31"; + + src = fetchFromGitHub { + owner = "po5"; + repo = "memo"; + rev = "6f2b036ef860e130ea584657389e0a7ceb4d954f"; + hash = "sha256-m8ikXuw7PM4Btg8w7ufLneKA4fnYjMyfVJYueZILMw8="; + }; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A recent files menu for mpv"; + homepage = "https://github.com/po5/memo"; + license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ purrpurrn ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix index 36b20fe112..d2832e104a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix @@ -1,19 +1,20 @@ -{ lib -, buildLua -, fetchFromGitHub -, makeFontsConf -, nix-update-script +{ + lib, + buildLua, + fetchFromGitHub, + makeFontsConf, + nix-update-script, }: buildLua (finalAttrs: { pname = "modernx-zydezu"; - version = "0.2.9"; + version = "0.3.4"; scriptPath = "modernx.lua"; src = fetchFromGitHub { owner = "zydezu"; repo = "ModernX"; rev = finalAttrs.version; - hash = "sha256-Tq/v8EbojvOSSwbu8kdbLVxZWZNi1UH6zAPTcsUcgog"; + hash = "sha256-XzzdJLN2DImwo8ZmH1+Q5e2YfwCh7pKyUxjtPd2AMGs="; }; postInstall = '' @@ -34,6 +35,9 @@ buildLua (finalAttrs: { description = "A modern OSC UI replacement for MPV that retains the functionality of the default OSC"; homepage = "https://github.com/zydezu/ModernX"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ Guanran928 ]; + maintainers = with maintainers; [ + luftmensch-luftmensch + Guanran928 + ]; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/modernx.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/modernx.nix index e6e9ec6110..3e106d7415 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/modernx.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/modernx.nix @@ -1,19 +1,20 @@ -{ lib -, buildLua -, fetchFromGitHub -, makeFontsConf -, nix-update-script +{ + lib, + buildLua, + fetchFromGitHub, + makeFontsConf, + nix-update-script, }: buildLua (finalAttrs: { pname = "modernx"; - version = "0.6.0"; + version = "0.6.1"; scriptPath = "modernx.lua"; src = fetchFromGitHub { owner = "cyl0"; repo = "ModernX"; rev = finalAttrs.version; - hash = "sha256-Gpofl529VbmdN7eOThDAsNfNXNkUDDF82Rd+csXGOQg="; + hash = "sha256-q7DwyfmOIM7K1L7vvCpq1EM0RVpt9E/drhAa9rLYb1k="; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix index 338f0a8dd4..fbb1a8f685 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, gitUpdater, pkg-config, glib, mpv-unwrapped, ffmpeg }: +{ + lib, + stdenv, + fetchFromGitHub, + gitUpdater, + pkg-config, + glib, + mpv-unwrapped, + ffmpeg, +}: stdenv.mkDerivation rec { pname = "mpv-mpris"; @@ -10,14 +19,18 @@ stdenv.mkDerivation rec { rev = version; hash = "sha256-vZIO6ILatIWa9nJYOp4AMKwvaZLahqYWRLMDOizyBI0="; }; - passthru.updateScript = gitUpdater {}; + passthru.updateScript = gitUpdater { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib mpv-unwrapped ffmpeg ]; + buildInputs = [ + glib + mpv-unwrapped + ffmpeg + ]; postPatch = '' - substituteInPlace Makefile --replace 'PKG_CONFIG =' 'PKG_CONFIG ?=' + substituteInPlace Makefile --replace-fail 'PKG_CONFIG =' 'PKG_CONFIG ?=' ''; installFlags = [ "SCRIPTS_DIR=${placeholder "out"}/share/mpv/scripts" ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-cheatsheet.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-cheatsheet.nix index 56013b1fce..c0c62867c1 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-cheatsheet.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-cheatsheet.nix @@ -1,4 +1,10 @@ -{ lib, fetchFromGitHub, nodePackages, stdenvNoCC }: +{ + lib, + fetchFromGitHub, + gitUpdater, + nodePackages, + stdenvNoCC, +}: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mpv-cheatsheet"; version = "0.30.0.2"; @@ -9,10 +15,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; hash = "sha256-MWK0CYto3zgn3fivmL43tvgZn6XrjPxKLp0lgTFdplM="; }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - nativeBuildInputs = [ - nodePackages.browserify - ]; + nativeBuildInputs = [ nodePackages.browserify ]; buildPhase = '' runHook preBuild @@ -30,7 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.scriptName = "cheatsheet.js"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix new file mode 100644 index 0000000000..3e3a04499d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -0,0 +1,44 @@ +{ + lib, + buildLua, + fetchFromGitHub, + fetchpatch, + unstableGitUpdater, + libnotify, +}: + +buildLua rec { + pname = "mpv-notify-send"; + version = "0-unstable-2020-02-24"; + + src = fetchFromGitHub { + owner = "emilazy"; + repo = pname; + rev = "a2bab8b2fd8e8d14faa875b5cc3a73f1276cd88a"; + sha256 = "sha256-EwVkhyB87TJ3i9xJmmZMSTMUKvfbImI1S+y1vgRWbDk="; + }; + + patches = [ + # show title of online videos instead of url + (fetchpatch { + url = "https://github.com/emilazy/mpv-notify-send/pull/6.patch"; + hash = "sha256-7aXQ8qeqG4yX0Uyn09xCIESnwPZsb6Frd7C49XgbpFw="; + }) + ]; + + passthru.extraWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath libnotify) + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A Lua script for mpv to send notifications with notify-send"; + homepage = "https://github.com/emilazy/mpv-notify-send"; + license = licenses.wtfpl; + maintainers = with maintainers; [ r3n3gad3p3arl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-osc-modern.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-osc-modern.nix index ce32622d64..0d2c292d70 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-osc-modern.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-osc-modern.nix @@ -1,8 +1,9 @@ -{ lib -, buildLua -, fetchFromGitHub -, makeFontsConf -, nix-update-script +{ + lib, + buildLua, + fetchFromGitHub, + makeFontsConf, + nix-update-script, }: buildLua (finalAttrs: { pname = "mpv-osc-modern"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 5287c7f211..00e44d1f94 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -1,8 +1,14 @@ -{ lib, buildLua, fetchFromGitHub, unstableGitUpdater, yt-dlp }: +{ + lib, + buildLua, + fetchFromGitHub, + unstableGitUpdater, + yt-dlp, +}: buildLua rec { pname = "mpv-playlistmanager"; - version = "unstable-2024-02-26"; + version = "0-unstable-2024-02-26"; src = fetchFromGitHub { owner = "jonniek"; @@ -10,12 +16,12 @@ buildLua rec { rev = "1911dc053951169c98cfcfd9f44ef87d9122ca80"; hash = "sha256-pcdOMhkivLF5B86aNuHrqj77DuYLAFGlwFwY7jxkDkE="; }; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { }; postPatch = '' substituteInPlace playlistmanager.lua \ - --replace 'youtube_dl_executable = "youtube-dl",' \ - 'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"', + --replace-fail 'youtube_dl_executable = "yt-dlp",' \ + 'youtube_dl_executable = "${lib.getExe yt-dlp}"', ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-slicing.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-slicing.nix new file mode 100644 index 0000000000..cf66a6c78a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-slicing.nix @@ -0,0 +1,34 @@ +{ + lib, + buildLua, + fetchFromGitHub, + ffmpeg, + unstableGitUpdater, +}: + +buildLua { + pname = "mpv-slicing"; + version = "0-unstable-2017-11-25"; + + src = fetchFromGitHub { + owner = "Kagami"; + repo = "mpv_slicing"; + rev = "d09c11227704c8d5bdaa2c799ef64dce881c63a7"; + hash = "sha256-MKoM0f74/XoctiHQVOB3LzFWtJXpsREfQh5icaebCJo="; + }; + passthru.updateScript = unstableGitUpdater { }; + + postPatch = '' + substituteInPlace slicing.lua \ + --replace-fail ffmpeg ${lib.getExe ffmpeg} + ''; + + passthru.scriptName = "slicing.lua"; + + meta = { + description = "A lua script to cut fragments of the video in uncompressed RGB format"; + homepage = "https://github.com/Kagami/mpv_slicing"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-webm.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-webm.nix index 5645d6a65f..051cc76883 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-webm.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-webm.nix @@ -1,21 +1,25 @@ -{ lib -, buildLua -, fetchFromGitHub -, luaPackages -, unstableGitUpdater +{ + lib, + buildLua, + fetchFromGitHub, + luaPackages, + unstableGitUpdater, }: buildLua { pname = "mpv-webm"; - version = "unstable-2023-11-18"; + version = "0-unstable-2024-04-22"; src = fetchFromGitHub { owner = "ekisu"; repo = "mpv-webm"; - rev = "6b5863f68275b3dc91c2507284c039ec8a4cbd97"; - hash = "sha256-rJamBm6FyxWcJO7VXXOUTO9piWCkPfEVdqGKGeJ/h0c="; + rev = "225e8e53842f7da6f77034309c1e54293dc629a4"; + hash = "sha256-82xWiuOChxfzX6e0+cGFxTqyuiPefyVwpvLM5ka7nPk="; + }; + passthru.updateScript = unstableGitUpdater { + # only "latest" tag pointing at HEAD + hardcodeZeroVersion = true; }; - passthru.updateScript = unstableGitUpdater {}; dontBuild = false; nativeBuildInputs = [ luaPackages.moonscript ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv.nix index 06e9ccb4d7..ddf22e5dd0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv.nix @@ -1,24 +1,31 @@ -{ lib -, buildLua -, mpv-unwrapped +{ + lib, + buildLua, + mpv-unwrapped, }: -let mkBuiltin = name: args: - let srcPath = "TOOLS/lua/${name}.lua"; - in buildLua (lib.attrsets.recursiveUpdate rec { - inherit (mpv-unwrapped) src version; - pname = "mpv-${name}"; +let + mkBuiltin = + name: args: + let + srcPath = "TOOLS/lua/${name}.lua"; + in + buildLua ( + lib.attrsets.recursiveUpdate rec { + inherit (mpv-unwrapped) src version; + pname = "mpv-${name}"; - dontUnpack = true; - scriptPath = "${src}/${srcPath}"; + dontUnpack = true; + scriptPath = "${src}/${srcPath}"; - meta = with lib; { - inherit (mpv-unwrapped.meta) license; - homepage = "https://github.com/mpv-player/mpv/blob/v${version}/${srcPath}"; - }; - } args); - -in lib.mapAttrs (name: lib.makeOverridable (mkBuiltin name)) { + meta = with lib; { + inherit (mpv-unwrapped.meta) license; + homepage = "https://github.com/mpv-player/mpv/blob/v${version}/${srcPath}"; + }; + } args + ); +in +lib.mapAttrs (name: lib.makeOverridable (mkBuiltin name)) { acompressor.meta = { description = "Script to toggle and control ffmpeg's dynamic range compression filter."; maintainers = with lib.maintainers; [ nicoo ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix index ec4e25b88f..4269131f09 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -1,33 +1,32 @@ -{ lib -, buildLua -, fetchFromGitHub -, gitUpdater -, curl -, wl-clipboard -, xclip +{ + lib, + buildLua, + fetchFromGitHub, + gitUpdater, + curl, + wl-clipboard, + xclip, }: buildLua rec { pname = "mpvacious"; - version = "0.27"; + version = "0.33"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-pn6hNEhOzKiU+zQJKj/rF0GLXaEe+XBpHp0RlzsNIio="; - }; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; + sha256 = "sha256-VHMXW2AzgX88EDnNshxo9Gh8mpXzRoTAq+58HKasUdo="; }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; postPatch = '' substituteInPlace utils/forvo.lua \ - --replace "'curl" "'${curl}/bin/curl" + --replace-fail "'curl" "'${lib.getExe curl}" substituteInPlace platform/nix.lua \ - --replace "'curl" "'${curl}/bin/curl" \ - --replace "'wl-copy" "'${wl-clipboard}/bin/wl-copy" \ - --replace "'xclip" "'${xclip}/bin/xclip" + --replace-fail "'curl" "'${lib.getExe curl}" \ + --replace-fail "'wl-copy" "'${lib.getExe' wl-clipboard "wl-copy"}" \ + --replace-fail "'xclip" "'${lib.getExe xclip}" ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/occivink.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/occivink.nix index 1f17a27172..948a90c0d8 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/occivink.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/occivink.nix @@ -1,45 +1,49 @@ -{ lib -, fetchFromGitHub -, unstableGitUpdater -, buildLua +{ + lib, + fetchFromGitHub, + unstableGitUpdater, + buildLua, }: let - camelToKebab = let - inherit (lib.strings) match stringAsChars toLower; - isUpper = match "[A-Z]"; - in stringAsChars (c: if isUpper c != null then "-${toLower c}" else c); + camelToKebab = + let + inherit (lib.strings) match stringAsChars toLower; + isUpper = match "[A-Z]"; + in + stringAsChars (c: if isUpper c != null then "-${toLower c}" else c); - mkScript = name: args: - let self = rec { - pname = camelToKebab name; - version = "unstable-2024-01-11"; - src = fetchFromGitHub { - owner = "occivink"; - repo = "mpv-scripts"; - rev = "d0390c8e802c2e888ff4a2e1d5e4fb040f855b89"; - hash = "sha256-pc2aaO7lZaoYMEXv5M0WI7PtmqgkNbdtNiLZZwVzppM="; + mkScript = + name: args: + let + self = rec { + pname = camelToKebab name; + version = "0-unstable-2024-01-11"; + src = fetchFromGitHub { + owner = "occivink"; + repo = "mpv-scripts"; + rev = "d0390c8e802c2e888ff4a2e1d5e4fb040f855b89"; + hash = "sha256-pc2aaO7lZaoYMEXv5M0WI7PtmqgkNbdtNiLZZwVzppM="; + }; + passthru.updateScript = unstableGitUpdater { }; + + scriptPath = "scripts/${pname}.lua"; + + meta = with lib; { + homepage = "https://github.com/occivink/mpv-scripts"; + license = licenses.unlicense; + maintainers = with maintainers; [ nicoo ]; + }; + + # Sadly needed to make `common-updaters` work here + pos = builtins.unsafeGetAttrPos "version" self; }; - passthru.updateScript = unstableGitUpdater {}; - - scriptPath = "scripts/${pname}.lua"; - - meta = with lib; { - homepage = "https://github.com/occivink/mpv-scripts"; - license = licenses.unlicense; - maintainers = with maintainers; [ nicoo ]; - }; - - # Sadly needed to make `common-updaters` work here - pos = builtins.unsafeGetAttrPos "version" self; - }; - in buildLua (lib.attrsets.recursiveUpdate self args); - + in + buildLua (lib.attrsets.recursiveUpdate self args); in lib.mapAttrs (name: lib.makeOverridable (mkScript name)) { # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.seekTo ]; }` seekTo.meta.description = "Mpv script for seeking to a specific position"; - blacklistExtensions.meta.description = - "Automatically remove playlist entries based on their extension."; + blacklistExtensions.meta.description = "Automatically remove playlist entries based on their extension."; } diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/quack.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/quack.nix index e7138de928..a1b32f2911 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/quack.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/quack.nix @@ -1,19 +1,21 @@ -{ lib -, fetchFromGitHub -, unstableGitUpdater -, buildLua }: +{ + lib, + fetchFromGitHub, + unstableGitUpdater, + buildLua, +}: buildLua rec { pname = "mpv-quack"; - version = "unstable-2020-05-26"; + version = "0-unstable-2020-05-27"; src = fetchFromGitHub { owner = "CounterPillow"; - repo = pname; - rev = "1c87f36f9726d462dd112188c04be54d85692cf3"; - hash = "sha256-dEnJbS8RJoAxpKINdoMHN4l7vpEdf7+C5JVWpK0VXMw="; + repo = "mpv-quack"; + rev = "1c87f36f9726d462dd112188c04be54d85692cf3"; + hash = "sha256-dEnJbS8RJoAxpKINdoMHN4l7vpEdf7+C5JVWpK0VXMw="; }; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { }; meta = { description = "Reduce audio volume after seeking"; @@ -24,8 +26,8 @@ buildLua rec { The volume is linearly increased back up to its original level. Repeated seeks before the transition is done work as well. ''; - homepage = "https://github.com/CounterPillow/quack"; - license = lib.licenses.gpl3; + homepage = "https://github.com/CounterPillow/mpv-quack"; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ nicoo ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/quality-menu.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/quality-menu.nix index c75e810687..cbaa6c1c4d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/quality-menu.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/quality-menu.nix @@ -1,8 +1,9 @@ -{ lib -, buildLua -, fetchFromGitHub -, gitUpdater -, oscSupport ? false +{ + lib, + buildLua, + fetchFromGitHub, + gitUpdater, + oscSupport ? false, }: buildLua rec { @@ -15,9 +16,7 @@ buildLua rec { rev = "v${version}"; hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns="; }; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; extraScripts = lib.optional oscSupport "quality-menu-osc.lua"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/reload.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/reload.nix index ec9f441f7c..b9d9b4c43b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/reload.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/reload.nix @@ -1,19 +1,21 @@ -{ lib -, fetchFromGitHub -, unstableGitUpdater -, buildLua }: +{ + lib, + fetchFromGitHub, + unstableGitUpdater, + buildLua, +}: buildLua rec { pname = "mpv-reload"; - version = "unstable-2024-03-22"; + version = "0-unstable-2024-03-22"; src = fetchFromGitHub { owner = "4e6"; - repo = pname; - rev = "1a6a9383ba1774708fddbd976e7a9b72c3eec938"; - hash = "sha256-BshxCjec/UNGyiC0/g1Rai2NvG2qOIHXDDEUYwwdij0="; + repo = pname; + rev = "1a6a9383ba1774708fddbd976e7a9b72c3eec938"; + hash = "sha256-BshxCjec/UNGyiC0/g1Rai2NvG2qOIHXDDEUYwwdij0="; }; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { }; meta = { description = "Manual & automatic reloading of videos"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix index bf973c9206..b71b5d90e3 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix @@ -1,6 +1,8 @@ -{ lib, buildLua -, fetchFromGitHub -, gitUpdater +{ + lib, + buildLua, + fetchFromGitHub, + gitUpdater, }: buildLua rec { pname = "simple-mpv-ui"; @@ -11,11 +13,12 @@ buildLua rec { repo = "simple-mpv-webui"; rev = "v${version}"; hash = "sha256-I8lwpo3Hfpy3UnPMmHEJCdArVQnNL245NkxsYVmnMF0="; - sparseCheckout = [ "main.lua" "webui-page" ]; - }; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; + sparseCheckout = [ + "main.lua" + "webui-page" + ]; }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; scriptPath = "."; passthru.scriptName = "webui"; @@ -23,7 +26,10 @@ buildLua rec { meta = with lib; { description = "A web based user interface with controls for the mpv mediaplayer"; homepage = "https://github.com/open-dynaMIX/simple-mpv-webui"; - maintainers = with maintainers; [ cript0nauta zopieux ]; + maintainers = with maintainers; [ + cript0nauta + zopieux + ]; longDescription = '' You can access the webui when accessing http://127.0.0.1:8080 or http://[::1]:8080 in your webbrowser. By default it listens on diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix index 7ea503ddd6..be314ed8ca 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix @@ -1,8 +1,15 @@ -{ lib, buildLua, fetchFromGitea, unstableGitUpdater, curl, coreutils }: +{ + lib, + buildLua, + fetchFromGitea, + unstableGitUpdater, + curl, + coreutils, +}: buildLua { pname = "mpv_sponsorblock_minimal"; - version = "unstable-2023-08-20"; + version = "0-unstable-2023-08-20"; scriptPath = "sponsorblock_minimal.lua"; src = fetchFromGitea { @@ -21,8 +28,7 @@ buildLua { ''; meta = with lib; { - description = - "A minimal script to skip sponsored segments of YouTube videos"; + description = "A minimal script to skip sponsored segments of YouTube videos"; homepage = "https://codeberg.org/jouni/mpv_sponsorblock_minimal"; license = licenses.gpl3Only; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 077b8f0590..16e8841abf 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -1,4 +1,11 @@ -{ lib, buildLua, fetchFromGitHub, fetchpatch, python3, nix-update-script }: +{ + lib, + buildLua, + fetchFromGitHub, + fetchpatch, + python3, + nix-update-script, +}: # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` buildLua { @@ -28,15 +35,13 @@ buildLua { postPatch = '' substituteInPlace sponsorblock.lua \ - --replace "python3" "${python3}/bin/python3" \ - --replace 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\"" + --replace-fail "python3" "${lib.getExe python3}" \ + --replace-fail 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\"" ''; - postInstall = "cp -a sponsorblock_shared $out/share/mpv/scripts/"; + extraScripts = [ "sponsorblock_shared" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; - }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = with lib; { description = "Script for mpv to skip sponsored segments of YouTube videos"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbfast.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbfast.nix index 7336fbe35d..158e1f38b3 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -1,8 +1,14 @@ -{ lib, fetchFromGitHub, unstableGitUpdater, buildLua, mpv-unwrapped }: +{ + lib, + fetchFromGitHub, + unstableGitUpdater, + buildLua, + mpv-unwrapped, +}: buildLua { pname = "mpv-thumbfast"; - version = "unstable-2023-12-08"; + version = "0-unstable-2023-12-08"; src = fetchFromGitHub { owner = "po5"; @@ -10,10 +16,13 @@ buildLua { rev = "03e93feee5a85bf7c65db953ada41b4826e9f905"; hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c="; }; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { }; passthru.extraWrapperArgs = [ - "--prefix" "PATH" ":" "${lib.getBin mpv-unwrapped}/bin" + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ mpv-unwrapped ]) ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix index 40c4fa8776..a0fe388a5b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix @@ -1,4 +1,10 @@ -{ lib, buildLua, fetchFromGitHub, gitUpdater, python3 }: +{ + lib, + buildLua, + fetchFromGitHub, + gitUpdater, + python3, +}: buildLua rec { pname = "mpv-thumbnail-script"; @@ -10,7 +16,7 @@ buildLua rec { rev = version; sha256 = "sha256-J24Rou7BTE7zoiPlBkWuO9dtYJiuzkuwB4FROuzXzag="; }; - passthru.updateScript = gitUpdater {}; + passthru.updateScript = gitUpdater { }; nativeBuildInputs = [ python3 ]; postPatch = "patchShebangs concat_files.py"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/uosc.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/uosc.nix index 61eb65f9bf..f57bb4eb81 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/uosc.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/uosc.nix @@ -1,10 +1,11 @@ -{ lib -, fetchFromGitHub -, fetchpatch -, gitUpdater -, makeFontsConf -, buildLua -, buildGoModule +{ + lib, + fetchFromGitHub, + fetchpatch, + gitUpdater, + makeFontsConf, + buildLua, + buildGoModule, }: buildLua (finalAttrs: { @@ -18,7 +19,7 @@ buildLua (finalAttrs: { rev = finalAttrs.version; hash = "sha256-0GPDna9uOuhFDhA9A1fbkoKkgSB76qiDzJVQ9gjGcWo="; }; - passthru.updateScript = gitUpdater {}; + passthru.updateScript = gitUpdater { }; tools = buildGoModule { pname = "uosc-bin"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/videoclip.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/videoclip.nix new file mode 100644 index 0000000000..6e22e1ae68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/videoclip.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + curl, + xclip, + wl-clipboard, + stdenv, + buildLua, + unstableGitUpdater, +}: +buildLua { + pname = "videoclip"; + version = "0-unstable-2024-03-08"; + + src = fetchFromGitHub { + owner = "Ajatt-Tools"; + repo = "videoclip"; + rev = "0e3f2245b03e888c14c093a50261e0f54ecdf8e8"; + hash = "sha256-Sg6LHU9OVmVx3cTs8Y0WL8wACb5BlVyeBRccoX+7BXY="; + }; + + patchPhase = + '' + substituteInPlace platform.lua \ + --replace \'curl\' \'${lib.getExe curl}\' \ + '' + + lib.optionalString stdenv.isLinux '' + --replace xclip ${lib.getExe xclip} \ + --replace wl-copy ${lib.getExe' wl-clipboard "wl-copy"} + ''; + + scriptPath = "."; + passthru.scriptName = "videoclip"; + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "Easily create videoclips with mpv"; + homepage = "https://github.com/Ajatt-Tools/videoclip"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ BatteredBunny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/visualizer.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/visualizer.nix index d387ac7b9e..0308e6477d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/visualizer.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/visualizer.nix @@ -6,7 +6,7 @@ }: buildLua { pname = "visualizer"; - version = "unstable-2024-03-10"; + version = "0-unstable-2024-03-10"; src = fetchFromGitHub { owner = "mfcc64"; @@ -14,11 +14,11 @@ buildLua { rev = "b4246984ba6dc6820adef5c8bbf793af85c9ab8e"; sha256 = "ZNUzw4OW7z+yGTxim7CCWJdWmihDFOQAQk3bC5Ijcbs="; }; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { }; meta = with lib; { description = "various audio visualization"; homepage = "https://github.com/mfcc64/mpv-scripts"; - maintainers = with maintainers; [kmein]; + maintainers = with maintainers; [ kmein ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/vr-reversal.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/vr-reversal.nix index 9a7b335a65..1e9dadcfa0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/vr-reversal.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/vr-reversal.nix @@ -1,4 +1,10 @@ -{ lib, stdenvNoCC, fetchFromGitHub, gitUpdater, ffmpeg }: +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gitUpdater, + ffmpeg, +}: stdenvNoCC.mkDerivation rec { pname = "vr-reversal"; @@ -10,15 +16,13 @@ stdenvNoCC.mkDerivation rec { rev = "v${version}"; sha256 = "1wn2ngcvn7wcsl3kmj782x5q9130qw951lj6ilrkafp6q6zscpqr"; }; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; dontBuild = true; # reset_rot is only available in ffmpeg 5.0, see 5bcc61ce87922ecccaaa0bd303a7e195929859a8 postPatch = lib.optionalString (lib.versionOlder ffmpeg.version "5.0") '' - substituteInPlace 360plugin.lua --replace ":reset_rot=1:" ":" + substituteInPlace 360plugin.lua --replace-fail ":reset_rot=1:" ":" ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix index 10fe3d0cdc..b423281a3b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix @@ -1,4 +1,11 @@ -{ lib, buildNpmPackage, fetchFromGitHub, gitUpdater, nodejs, python3 }: +{ + lib, + buildNpmPackage, + fetchFromGitHub, + gitUpdater, + nodejs, + python3, +}: buildNpmPackage rec { pname = "webtorrent-mpv-hook"; @@ -10,14 +17,12 @@ buildNpmPackage rec { rev = "v${version}"; hash = "sha256-/dMtXcIyfAs++Zgz2CxRW0tkzn5QjS+WVGChlCyrU0U="; }; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; postPatch = '' - substituteInPlace src/webtorrent.ts --replace "node_path: 'node'" "node_path: '${nodejs}/bin/node'" + substituteInPlace src/webtorrent.ts --replace-fail "node_path: 'node'" "node_path: '${lib.getExe nodejs}'" # This executable is just for telling non-Nix users how to install - substituteInPlace package.json --replace '"bin": "build/bin.mjs",' "" + substituteInPlace package.json --replace-fail '"bin": "build/bin.mjs",' "" rm -rf src/bin.ts ''; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/youtube-upnext.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/youtube-upnext.nix new file mode 100644 index 0000000000..098dd45a5f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/youtube-upnext.nix @@ -0,0 +1,33 @@ +{ + buildLua, + fetchFromGitHub, + curl, + unstableGitUpdater, + lib, +}: + +buildLua rec { + pname = "youtube-upnext"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "cvzi"; + repo = "mpv-youtube-upnext"; + rev = "v${version}"; + hash = "sha256-x9mfyc8JIlOpbSfGEwxXoUtsH0A+K3JPwT/8MHq7ks4="; + }; + + postPatch = '' + substituteInPlace youtube-upnext.lua \ + --replace-fail '"curl"' '"${lib.getExe curl}"' + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A userscript that allows you to play 'up next'/recommended youtube videos"; + homepage = "https://github.com/cvzi/mpv-youtube-upnext"; + maintainers = with maintainers; [ bddvlpr ]; + license = licenses.unfree; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/mythtv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mythtv/default.nix index fba7eb1683..07e8be2bea 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mythtv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mythtv/default.nix @@ -42,6 +42,6 @@ mkDerivation rec { description = "Open Source DVR"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.titanous ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 3df52d0868..418d9adf82 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -24,7 +24,7 @@ , libvlc , libGL , mbedtls -, wrapGAppsHook +, wrapGAppsHook3 , scriptingSupport ? true , luajit , swig4 @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { addOpenGLRunpath cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook ] ++ optional scriptingSupport swig4; @@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ eclairevoyant jb55 MP2E materus fpletz ]; + maintainers = with maintainers; [ eclairevoyant jb55 materus fpletz ]; license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index 96209f3f94..aa284a68b2 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.25.4"; + version = "1.26.0"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-d/utejwSazepkIMzd1tRrJSrKRFhFRZsQBGiOkt5pYk="; + hash = "sha256-ba+QQWekDp/9V+kNcNowXXJrfU4DCttz0tSoC7Ko1bE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index 8926b7e176..9f13de2847 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "obs-input-overlay"; - version = "5.0.4"; + version = "5.0.5"; src = fetchFromGitHub { owner = "univrsal"; repo = "input-overlay"; rev = "v${version}"; - sha256 = "sha256-MON68yjHUOF/bggWqhw8D0+23HpKQN3jWs+5lLAacaQ="; + sha256 = "sha256-9HqEz+KnTt8MyhwqFWjalbl3H/DCzumckXMctCGhs3o="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix index 766fca414c..638d0785f4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix @@ -2,37 +2,45 @@ , stdenv , fetchFromGitHub , cmake +, ninja , obs-studio , onnxruntime , opencv +, qt6 +, curl }: stdenv.mkDerivation rec { pname = "obs-backgroundremoval"; - version = "0.5.16"; + version = "1.1.13"; src = fetchFromGitHub { - owner = "royshil"; + owner = "occ-ai"; repo = "obs-backgroundremoval"; - rev = "v${version}"; - hash = "sha256-E+pm/Ma6dZTYlX3DpB49ynTETsRS2TBqgHSCijl/Txc="; + rev = version; + hash = "sha256-QoC9/HkwOXMoFNvcOxQkGCLLAJmsja801LKCNT9O9T0="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ obs-studio onnxruntime opencv ]; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ obs-studio onnxruntime opencv qt6.qtbase curl ]; dontWrapQtApps = true; cmakeFlags = [ + "--preset linux-x86_64" + "-DCMAKE_MODULE_PATH:PATH=${src}/cmake" "-DUSE_SYSTEM_ONNXRUNTIME=ON" "-DUSE_SYSTEM_OPENCV=ON" + "-DDISABLE_ONNXRUNTIME_GPU=ON" ]; - postInstall = '' - mkdir $out/lib $out/share - mv $out/obs-plugins/64bit $out/lib/obs-plugins - rm -rf $out/obs-plugins - mv $out/data $out/share/obs + buildPhase = '' + cd .. + cmake --build build_x86_64 --parallel + ''; + + installPhase = '' + cmake --install build_x86_64 --prefix "$out" ''; meta = with lib; { @@ -40,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/royshil/obs-backgroundremoval"; maintainers = with maintainers; [ zahrun ]; license = licenses.mit; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix index f38d53a141..df4ec89316 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-command-source"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "norihiro"; repo = "obs-command-source"; rev = version; - sha256 = "sha256-rBGMQb7iGtxF54bBOK5lHI6VFYCSEyeSq2Arz0T0DPo="; + sha256 = "sha256-yrzY4pHSupkkdRlx725oSVtQTH1Ci9zFolHN3i2Vm28="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix index 0a98afde99..fd683f3a4c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-mute-filter"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "norihiro"; repo = "obs-mute-filter"; rev = version; - sha256 = "sha256-SiutSmp+DnzMU62kxtBUL0xgMXTe0k+nKwSU3wQe4+g="; + sha256 = "sha256-UVYN9R7TnwD3a+KIYTXvxOQWfNUtR8cSWUoKZuNoBJc="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix index 037eda1006..f58d81e9b7 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "obs-ndi"; - version = "4.13.0"; + version = "4.13.2"; nativeBuildInputs = [ cmake qtbase ]; buildInputs = [ obs-studio qtbase ndi ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "Palakis"; repo = "obs-ndi"; rev = version; - sha256 = "sha256-ugAMSTXbbIZ61oWvoggVJ5kZEgp/waEcWt89AISrSdE="; + sha256 = "sha256-DVUoLV2jCdD8qXSpmGvqjrQh02dCLroKsUAb5+lYTog="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix index deebf1af7b..f400fced2a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-shaderfilter"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-shaderfilter"; rev = version; - sha256 = "sha256-J7tCEIB9zQ0zZFl1eSuEARd+KqpNClHfYx3wcLawFeM="; + sha256 = "sha256-INxz8W4AMKxRcfpZkhqqsWWWQQVEc2G9iFQBit1YA2E="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index c6e9f450b9..82767da10d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-baEF8vcAmac4bwpzJnGE2WczTa6vojjRQ/oEKgYeXgk="; + sha256 = "sha256-3lFM7bOzsKex6JUdbcw8MNS4PRzaN/E/vngdukgfV0s="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix index fcf426bde6..41b33b528a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix @@ -8,7 +8,7 @@ , cmake , pkg-config , ninja -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cmake pkg-config ninja - wrapGAppsHook + wrapGAppsHook3 ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/open-in-mpv/default.nix b/third_party/nixpkgs/pkgs/applications/video/open-in-mpv/default.nix index e6f8205288..1e1e29ba2d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/open-in-mpv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/open-in-mpv/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "open-in-mpv"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "Baldomo"; repo = "open-in-mpv"; rev = "v${version}"; - hash = "sha256-+sP8/wILBkT3NnhENDYZbOwqOufkFyMJFpQxquuUBEs="; + hash = "sha256-Fa6oZMaR0ctZgYWoOXLaobc+pDRDZbDCFvRZUR+Fda4="; }; vendorHash = "sha256-G6GZO2+CfEAYcf7zBcqDa808A0eJjM8dq7+4VGZ+P4c="; diff --git a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix index 089b60a3b2..4a8208d8bb 100644 --- a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix @@ -8,7 +8,10 @@ , python3 , qtbase , qtsvg -, wrapGAppsHook +, qtwayland +, wayland +, waylandSupport ? stdenv.isLinux +, wrapGAppsHook3 }: let @@ -28,11 +31,14 @@ mkDerivationWith python3.pkgs.buildPythonApplication { nativeBuildInputs = [ doxygen - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gtk3 + ] ++ lib.optionals waylandSupport [ + qtwayland + wayland ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/video/peek/default.nix b/third_party/nixpkgs/pkgs/applications/video/peek/default.nix index 105a86fbf4..a2817d10ed 100644 --- a/third_party/nixpkgs/pkgs/applications/video/peek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/peek/default.nix @@ -11,7 +11,7 @@ , pkg-config , txt2man , vala -, wrapGAppsHook +, wrapGAppsHook3 , gsettings-desktop-schemas , gtk3 , glib @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { txt2man python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix index 5d3256931f..854e4c6ba4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix @@ -3,7 +3,7 @@ , perl , buildPerlModule , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , withGtk3 ? false , ffmpeg , mpv @@ -38,20 +38,20 @@ let in buildPerlModule rec { pname = "pipe-viewer"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "trizen"; repo = "pipe-viewer"; rev = version; - hash = "sha256-tNIAGvv3dCPd7MA27yd2AHMSgs+1D2uiJJTQgTsEVNU="; + hash = "sha256-GTmva1pDG1g2wZoS3ABYxhWdbARdlcS0rxGjkdJL7js="; }; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals withGtk3 [ wrapGAppsHook ]; + ++ lib.optionals withGtk3 [ wrapGAppsHook3 ]; buildInputs = [ perlEnv ] - # Can't be in perlEnv for wrapGAppsHook to work correctly + # Can't be in perlEnv for wrapGAppsHook3 to work correctly ++ lib.optional withGtk3 Gtk3; # Not supported by buildPerlModule diff --git a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix index eb00353b83..85ee9c0e7e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix @@ -4,7 +4,7 @@ , gettext , itstool , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , gtk3 , gobject-introspection @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { gettext itstool python3 - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix b/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix index 2e71c46683..7d862fb216 100644 --- a/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/plex-mpv-shim/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, fetchpatch, python, mpv, requests, python-mpv-jsonipc, pystray, tkinter -, wrapGAppsHook, gobject-introspection, mpv-shim-default-shaders }: +, wrapGAppsHook3, gobject-introspection, mpv-shim-default-shaders }: buildPythonApplication rec { pname = "plex-mpv-shim"; @@ -21,7 +21,7 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/recapp/default.nix b/third_party/nixpkgs/pkgs/applications/video/recapp/default.nix index c15a0680a9..b6cb8c6377 100644 --- a/third_party/nixpkgs/pkgs/applications/video/recapp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/recapp/default.nix @@ -14,7 +14,7 @@ , ninja , pkg-config , slop -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix b/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix index 1147d1ef1d..6d5270d344 100644 --- a/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix @@ -20,23 +20,23 @@ , libGL , libGLU , vtkWithQt5 -, wrapGAppsHook +, wrapGAppsHook3 , liblapack , xorg }: stdenv.mkDerivation rec { pname = "rtabmap"; - version = "0.21.4"; + version = "0.21.4.1"; src = fetchFromGitHub { owner = "introlab"; repo = "rtabmap"; rev = "refs/tags/${version}"; - hash = "sha256-HrIATYRuhFfTlO4oTRZo7CM30LFVyatZJON31Fe4HTQ="; + hash = "sha256-y/p1uFSxVQNXO383DLGCg4eWW7iu1esqpWlyPMF3huk="; }; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook3 ]; buildInputs = [ ## Required opencv diff --git a/third_party/nixpkgs/pkgs/applications/video/screenkey/default.nix b/third_party/nixpkgs/pkgs/applications/video/screenkey/default.nix index 90cf5e7dcf..301fc3e30f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/screenkey/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/screenkey/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitLab -, wrapGAppsHook +, wrapGAppsHook3 , xorg , gobject-introspection , gtk3 @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 # for setup hook gobject-introspection ]; @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { dbus-python ]; - # Prevent double wrapping because of wrapGAppsHook + # Prevent double wrapping because of wrapGAppsHook3 dontWrapGApps = true; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix index 8678c456b0..87732ad75b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "24.02.29"; + version = "24.04.28"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${finalAttrs.version}"; - hash = "sha256-PHpVquqC0MT7WNoWcdB9WTz4ZiSK4/f4oD5PH1gWBnw="; + hash = "sha256-iMg2XrTrLFZXXvnJ7lMdkxf/LTaL9bh9Nc2jsPOS0eo="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 543b2b5247..ac1490345c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -5,7 +5,7 @@ , makeDesktopItem , makeWrapper , stdenv -, wrapGAppsHook +, wrapGAppsHook3 , at-spi2-core , atk , alsa-lib @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { libXScrnSaver libXtst makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ streamlink ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix index b6522aef23..e5f0cac20b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.7.3"; + version = "6.7.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Da+J+NOXW+n55LvaPQw6XiRhJJQ4Pc4Z1p21qMym/Xw="; + hash = "sha256-kzdTerEZ/ndSSl1mWq7Ou/sG4suN8o0SYNkodkJXUc4="; }; patches = [ @@ -42,6 +42,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ certifi + exceptiongroup isodate lxml pycountry @@ -55,7 +56,7 @@ python3Packages.buildPythonApplication rec { websocket-client ]; - meta = with lib; { + meta = { changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md"; description = "CLI for extracting streams from various websites to video player of your choosing"; homepage = "https://streamlink.github.io/"; @@ -66,8 +67,8 @@ python3Packages.buildPythonApplication rec { Streamlink is a fork of the livestreamer project. ''; - license = licenses.bsd2; + license = lib.licenses.bsd2; mainProgram = "streamlink"; - maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ]; + maintainers = with lib.maintainers; [ dezgeg zraexy DeeUnderscore ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix b/third_party/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix index fd8e03963d..b440c18740 100644 --- a/third_party/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, intltool, file, desktop-file-utils, enchant, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme, - libsigcxx, libxmlxx, xdg-utils, isocodes, wrapGAppsHook + libsigcxx, libxmlxx, xdg-utils, isocodes, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pkg-config intltool file - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix b/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix index 5b62399a04..73f6946f6b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix @@ -6,7 +6,7 @@ , libnotify , pango , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , youtube-dl , glib , ffmpeg @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; strictDeps = false; diff --git a/third_party/nixpkgs/pkgs/applications/video/timelens/default.nix b/third_party/nixpkgs/pkgs/applications/video/timelens/default.nix index bd38a4c2f7..c5d2ff7c4c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/timelens/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/timelens/default.nix @@ -4,7 +4,7 @@ , pkg-config , glib , gst_all_1 -, wrapGAppsHook +, wrapGAppsHook3 }: rustPlatform.buildRustPackage rec { @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/vcs/default.nix b/third_party/nixpkgs/pkgs/applications/video/vcs/default.nix index e21e3a98f1..63a9989134 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vcs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vcs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Generates contact sheets from video files"; homepage = "http://p.outlyer.net/vcs"; - license = licenses.cc-by-nc-sa-30; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ elitak ]; platforms = with platforms; unix; mainProgram = "vcs"; diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix index c5159fdd61..5713aeb954 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.6.6"; + version = "2.6.7"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; rev = version; - hash = "sha256-3om/Q67PHtX/aIG4zMCaJTyD9bZNEcyE5LQTeb+zB+M="; + hash = "sha256-6i3EQgARwMLNejgB0NevmLmd9OrNBvjqW+qLrAdqUxE="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/markad/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/markad/default.nix index 28dad02002..efc08eaf06 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/markad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/markad/default.nix @@ -19,12 +19,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.4.13"; + version = "3.6.0"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-pDnziIWX6deBXuVIN7w6F6TdYDCcEO6MSaUIMB63uAg="; + sha256 = "sha256-O958GNQI6Z+m4sIJfGQzLaCrzyrdpn+ZY8COx7RoUZs="; rev = "V${version}"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix index 23c6433f9e..9271a9bf70 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.1.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-y6b0nOf597uxS9zDh0NQOwLN81nk4U7lHK2CalyVi8s="; + sha256 = "sha256-qyl4XDLJ99QXQY0XXYMteja0oWZ+vkFa4RwEo1Hv3bo="; rev = "v${version}"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/wf-recorder/default.nix b/third_party/nixpkgs/pkgs/applications/video/wf-recorder/default.nix index 56a85517eb..f4e2c8ee71 100644 --- a/third_party/nixpkgs/pkgs/applications/video/wf-recorder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/wf-recorder/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ yuka ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "wf-recorder"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix index baa8fcb95b..929d9d2952 100644 --- a/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix @@ -21,7 +21,7 @@ , libxplayer-plparser , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook3 , xapp , yelp-tools }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - wrapGAppsHook + wrapGAppsHook3 autoconf-archive gettext gtk-doc diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock index 533a473d03..18d10d781d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock @@ -5,16 +5,16 @@ version = 3 [[package]] name = "acpi_tables" version = "0.1.0" -source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#76e8552f57f76ca918e19c0a7b7480d2fa2c7241" +source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#925e3f8aff3551df67ec4472fc221564e30c8847" dependencies = [ "zerocopy", ] [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -27,18 +27,18 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -56,9 +56,9 @@ checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] @@ -84,9 +84,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "api_client" @@ -97,9 +97,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arch" @@ -115,8 +115,6 @@ dependencies = [ "serde", "thiserror", "uuid", - "versionize", - "versionize_derive", "vm-fdt", "vm-memory", "vm-migration", @@ -135,28 +133,27 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock 3.2.0", "async-task", "concurrent-queue", - "fastrand 2.0.0", - "futures-lite 2.1.0", + "fastrand 2.0.2", + "futures-lite 2.3.0", "slab", ] @@ -166,7 +163,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock 2.7.0", + "async-lock 2.8.0", "autocfg", "blocking", "futures-lite 1.13.0", @@ -178,14 +175,14 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock 2.7.0", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", "futures-lite 1.13.0", "log", "parking", - "polling", + "polling 2.8.0", "rustix 0.37.27", "slab", "socket2", @@ -193,67 +190,85 @@ dependencies = [ ] [[package]] -name = "async-lock" -version = "2.7.0" +name = "async-io" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.6.0", + "rustix 0.38.32", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener 2.5.3", ] [[package]] name = "async-lock" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", "pin-project-lite", ] [[package]] name = "async-process" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf012553ce51eb7aa6dc2143804cc8252bd1cb681a1c5cb7fa94ca88682dee1d" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock 2.7.0", + "async-io 1.13.0", + "async-lock 2.8.0", "async-signal", "blocking", "cfg-if", - "event-listener 3.0.0", + "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.25", + "rustix 0.38.32", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] name = "async-signal" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c99f3cb3f9ff89f7d718fbb942c9eb91bedff12e396adf09a622dfe7ffec2bc2" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io", - "async-lock 2.7.0", + "async-io 2.3.2", + "async-lock 2.8.0", "atomic-waker", "cfg-if", - "concurrent-queue", "futures-core", "futures-io", - "libc", + "rustix 0.38.32", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -261,19 +276,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.76" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531b97fb4cd3dfdce92c35dedbfdc1f0b9d8091c8ca943d6dae340ef5012d514" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -284,15 +299,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -303,15 +318,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bitfield-struct" version = "0.5.6" @@ -320,7 +326,7 @@ checksum = "a26b8cea8bb6a81b75a84603b9e096f05fa86db057904ef29be1deee900532bd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -331,9 +337,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block" @@ -345,11 +351,10 @@ dependencies = [ "libc", "log", "remain", + "serde", "smallvec", "thiserror", "uuid", - "versionize", - "versionize_derive", "virtio-bindings", "virtio-queue", "vm-memory", @@ -373,35 +378,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", - "fastrand 2.0.0", + "fastrand 2.0.2", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "piper", "tracing", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[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 = "cc" -version = "1.0.83" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" [[package]] name = "cfg-if" @@ -411,35 +413,35 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.1", "terminal_size", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cloud-hypervisor" -version = "38.0.0" +version = "39.0.0" dependencies = [ "anyhow", "api_client", @@ -485,9 +487,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -503,19 +505,13 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] -[[package]] -name = "crc64" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2707e3afba5e19b75d582d88bc79237418f2a2a2d673d01cf9b03633b46e98f3" - [[package]] name = "crossbeam-utils" version = "0.8.19" @@ -534,9 +530,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.6" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c376d08ea6aa96aafe61237c7200d1241cb177b7d3a542d791f2d118e9cbb955" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -544,27 +540,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.6" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33043dcd19068b8192064c704b3f83eb464f91f1ff527b44a4e2b08d9cdb8855" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.48", + "strsim 0.10.0", + "syn 2.0.58", ] [[package]] name = "darling_macro" -version = "0.20.6" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5a91391accf613803c2a9bf9abccdbaa07c54b4244a5b64883f9c3c137c86be" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -591,17 +587,16 @@ dependencies = [ "acpi_tables", "anyhow", "arch", - "bitflags 2.4.1", + "bitflags 2.5.0", "byteorder", "event_monitor", "hypervisor", "libc", "log", "pci", + "serde", "thiserror", "tpm", - "versionize", - "versionize_derive", "vm-allocator", "vm-device", "vm-memory", @@ -658,9 +653,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", "serde", @@ -668,26 +663,36 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", ] [[package]] name = "env_logger" -version = "0.10.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -696,7 +701,7 @@ version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74351c3392ea1ff6cd2628e0042d268ac2371cb613252ff383b6dfa50d22fa79" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", ] @@ -708,12 +713,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -724,9 +729,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" dependencies = [ "concurrent-queue", "parking", @@ -735,9 +740,20 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -750,7 +766,17 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +dependencies = [ + "event-listener 5.3.0", "pin-project-lite", ] @@ -776,9 +802,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fdt" @@ -788,14 +814,13 @@ checksum = "784a4df722dc6267a04af36895398f59d21d07dce47232adf31ec0ff2fa45e67" [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", "nanorand", - "pin-project", "spin", ] @@ -870,11 +895,11 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.0", + "fastrand 2.0.2", "futures-core", "futures-io", "parking", @@ -889,7 +914,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -928,7 +953,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6341b3480afbb34eaefc7f92713bc92f2d83e338aaa1c44192f9c2956f4a4903" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cfg-if", "log", "managed", @@ -958,9 +983,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6" dependencies = [ "cfg-if", "js-sys", @@ -971,9 +996,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -983,15 +1008,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1031,9 +1056,9 @@ dependencies = [ [[package]] name = "iced-x86" -version = "1.20.0" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd366a53278429c028367e0ba22a46cab6d565a57afb959f06e92c7a69e7828" +checksum = "7c447cff8c7f384a7d4f741cfcff32f75f3ad02b406432e8d6c878d56b1edf6b" dependencies = [ "lazy_static", ] @@ -1046,8 +1071,8 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "igvm" -version = "0.1.0" -source = "git+https://github.com/microsoft/igvm?branch=main#c1b0201d8286cb23b9f30cb16ba435484666cfa3" +version = "0.1.9" +source = "git+https://github.com/microsoft/igvm?branch=main#494aac2318df4111a2737d360ea46f74f5350223" dependencies = [ "bitfield-struct", "crc32fast", @@ -1062,8 +1087,8 @@ dependencies = [ [[package]] name = "igvm_defs" -version = "0.1.0" -source = "git+https://github.com/microsoft/igvm?branch=main#c1b0201d8286cb23b9f30cb16ba435484666cfa3" +version = "0.1.9" +source = "git+https://github.com/microsoft/igvm?branch=main#494aac2318df4111a2737d360ea46f74f5350223" dependencies = [ "bitfield-struct", "open-enum", @@ -1073,9 +1098,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -1103,9 +1128,9 @@ dependencies = [ [[package]] name = "io-uring" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460648e47a07a43110fbfa2e0b14afb2be920093c31e5dccc50e49568e099762" +checksum = "a9febecd4aebbe9c7c23c8e536e966805fdf09944c8a915e7991ee51acb67087" dependencies = [ "bitflags 1.3.2", "libc", @@ -1120,49 +1145,39 @@ dependencies = [ "serde", ] -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix 0.38.25", - "windows-sys 0.48.0", -] - [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "kvm-bindings" -version = "0.7.0" -source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.7.0#2dcf85d4f8aa55befcaa996b699ddb18ec9ed059" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82e7e8725a39a0015e511a46cc1f7d90cecc180db1610c4d0d4339a9e48bd21" dependencies = [ "serde", - "serde_derive", "vmm-sys-util", + "zerocopy", ] [[package]] name = "kvm-ioctls" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9002dff009755414f22b962ec6ae6980b07d6d8b06e5297b1062019d72bd6a8c" +checksum = "bedae2ca4a531bebe311abaf9691f5cc14eaa21475243caa2e39c43bb872947d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "kvm-bindings", "libc", "vmm-sys-util", @@ -1180,6 +1195,16 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + [[package]] name = "libssh2-sys" version = "0.3.0" @@ -1196,9 +1221,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" dependencies = [ "cc", "libc", @@ -1229,9 +1254,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1239,9 +1264,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "managed" @@ -1251,9 +1276,9 @@ checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" @@ -1264,10 +1289,19 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + [[package]] name = "micro_http" version = "0.1.0" -source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#e75dfa1eeea23b69caa7407bc2c3a76d7b7262fb" +source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#ef43cef7162a55a6790d528a5e76b4fe2da22de0" dependencies = [ "libc", "vmm-sys-util", @@ -1275,29 +1309,26 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mintex" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7c5ba1c3b5a23418d7bbf98c71c3d4946a0125002129231da8d6b723d559cb" -dependencies = [ - "once_cell", - "sys-info", -] +checksum = "9bec4598fddb13cc7b528819e697852653252b760f1228b7642679bf2ff2cd07" [[package]] name = "mshv-bindings" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#9d0c11fe9fedfbcf56a5d62fbf4bad80cdf91340" +source = "git+https://github.com/rust-vmm/mshv?branch=main#fed467ffa4e910d37fc5cd0012f6d59f4a8009d8" dependencies = [ "libc", + "num_enum", "serde", "serde_derive", "vmm-sys-util", @@ -1307,10 +1338,11 @@ dependencies = [ [[package]] name = "mshv-ioctls" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#9d0c11fe9fedfbcf56a5d62fbf4bad80cdf91340" +source = "git+https://github.com/rust-vmm/mshv?branch=main#fed467ffa4e910d37fc5cd0012f6d59f4a8009d8" dependencies = [ "libc", "mshv-bindings", + "thiserror", "vmm-sys-util", ] @@ -1346,8 +1378,6 @@ dependencies = [ "serde", "serde_json", "thiserror", - "versionize", - "versionize_derive", "virtio-bindings", "virtio-queue", "vm-memory", @@ -1364,7 +1394,7 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset", + "memoffset 0.7.1", ] [[package]] @@ -1375,18 +1405,38 @@ checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] [[package]] -name = "object" -version = "0.30.4" +name = "num_enum" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -1399,18 +1449,18 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open-enum" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9807f1199cf84ec7cc801a79e5ee9aa5178e4762c6b9c7066c30b3cabdcd911e" +checksum = "ba485b94b3e73fa752d98cfcab74647a4a537269682cc1ee5256aa020432506d" dependencies = [ "open-enum-derive", ] [[package]] name = "open-enum-derive" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "894ae443e59fecf7173ab3b963473f44193fa71b3c8953c61a5bd5f30880bb88" +checksum = "fed1c261430059cab8b2b51eec42a3c15750439ec6c013cd8fe41d4a450de776" dependencies = [ "proc-macro2", "quote", @@ -1419,18 +1469,18 @@ dependencies = [ [[package]] name = "openssl-src" -version = "300.1.5+3.1.3" +version = "300.2.3+3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -1483,7 +1533,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", + "parking_lot_core 0.9.9", ] [[package]] @@ -1502,15 +1552,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.4.1", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.5", ] [[package]] @@ -1530,8 +1580,6 @@ dependencies = [ "log", "serde", "thiserror", - "versionize", - "versionize_derive", "vfio-bindings", "vfio-ioctls", "vfio_user", @@ -1555,31 +1603,11 @@ dependencies = [ "wait-timeout", ] -[[package]] -name = "pin-project" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1594,15 +1622,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.0", + "fastrand 2.0.2", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "pnet" @@ -1649,7 +1677,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1711,6 +1739,21 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "polling" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix 0.38.32", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1729,9 +1772,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -1803,29 +1846,29 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.9.4" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -1835,9 +1878,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -1846,19 +1889,19 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "remain" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bce3a7139d2ee67d07538ee5dba997364fbc243e7e7143e96eb830c74bfaa082" +checksum = "ad9f2390298a947ee0aa6073d440e221c0726188cfbcdf9604addb6ee393eb4a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1889,22 +1932,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys 0.4.13", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "scopeguard" @@ -1923,29 +1966,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.109" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -1954,35 +1997,36 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] name = "serde_with" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ "serde", + "serde_derive", "serde_with_macros", ] [[package]] name = "serde_with_macros" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -2021,24 +2065,24 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -2077,6 +2121,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "syn" version = "1.0.109" @@ -2090,45 +2140,25 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "sys-info" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "tempfile" -version = "3.8.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall 0.3.5", - "rustix 0.38.25", - "windows-sys 0.48.0", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", + "fastrand 2.0.2", + "rustix 0.38.32", + "windows-sys 0.52.0", ] [[package]] @@ -2137,7 +2167,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.25", + "rustix 0.38.32", "windows-sys 0.48.0", ] @@ -2158,22 +2188,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.52" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.52" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -2242,7 +2272,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -2262,10 +2292,11 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.1", "tempfile", "winapi", ] @@ -2284,9 +2315,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.4" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", ] @@ -2303,37 +2334,10 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "versionize" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62929d59c7f6730b7298fcb363760550f4db6e353fbac4076d447d0e82799d6d" -dependencies = [ - "bincode", - "crc64", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn 1.0.109", - "versionize_derive", - "vmm-sys-util", -] - -[[package]] -name = "versionize_derive" -version = "0.1.6" -source = "git+https://github.com/cloud-hypervisor/versionize_derive?branch=ch-0.1.6#7906da996152e2d0ab08f5526440683bf3ca7834" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "vfio-bindings" version = "0.4.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#0daff4d4c159e842cf18b8b90457a45032b2df5a" +source = "git+https://github.com/rust-vmm/vfio?branch=main#da8c5b67095fb70f5ef237ca63d316219888f015" dependencies = [ "vmm-sys-util", ] @@ -2341,7 +2345,7 @@ dependencies = [ [[package]] name = "vfio-ioctls" version = "0.2.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#0daff4d4c159e842cf18b8b90457a45032b2df5a" +source = "git+https://github.com/rust-vmm/vfio?branch=main#da8c5b67095fb70f5ef237ca63d316219888f015" dependencies = [ "byteorder", "kvm-bindings", @@ -2379,7 +2383,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b64e816d0d49769fbfaa1494eb77cc2a3ddc526ead05c7f922cb7d64106286f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", "vm-memory", "vmm-sys-util", @@ -2462,10 +2466,9 @@ dependencies = [ "seccompiler", "serde", "serde_json", + "serde_with", "serial_buffer", "thiserror", - "versionize", - "versionize_derive", "vhost", "virtio-bindings", "virtio-queue", @@ -2513,14 +2516,14 @@ dependencies = [ [[package]] name = "vm-fdt" -version = "0.2.0" -source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#77212bd0d62913e445c89376bcbbecd595afc5b1" +version = "0.3.0" +source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#ef5bd734f5f66fb07722d766981adbc915f0d941" [[package]] name = "vm-memory" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ffc42216c32c35f858fa4bfdcd9b61017dfd691e0240268fdc85dbf59e5459" +checksum = "3c3aba5064cc5f6f7740cddc8dae34d2d9a311cac69b60d942af7f3ab8fc49f4" dependencies = [ "arc-swap", "libc", @@ -2536,8 +2539,6 @@ dependencies = [ "serde", "serde_json", "thiserror", - "versionize", - "versionize_derive", "vm-memory", ] @@ -2558,7 +2559,7 @@ dependencies = [ "anyhow", "arc-swap", "arch", - "bitflags 2.4.1", + "bitflags 2.5.0", "block", "blocking", "cfg-if", @@ -2593,8 +2594,6 @@ dependencies = [ "thiserror", "tracer", "uuid", - "versionize", - "versionize_derive", "vfio-ioctls", "vfio_user", "virtio-devices", @@ -2644,9 +2643,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2654,24 +2653,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2679,22 +2678,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "winapi" @@ -2712,37 +2711,19 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -2751,210 +2732,153 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "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_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.39" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" dependencies = [ - "nix", + "libc", "winapi", ] [[package]] name = "zbus" -version = "3.14.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io", - "async-lock 2.7.0", + "async-io 1.13.0", + "async-lock 2.8.0", "async-process", "async-recursion", "async-task", @@ -2987,9 +2911,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3001,9 +2925,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ "serde", "static_assertions", @@ -3028,14 +2952,14 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] name = "zvariant" -version = "3.15.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" dependencies = [ "byteorder", "enumflags2", @@ -3047,9 +2971,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ "proc-macro-crate", "proc-macro2", diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 44bbdcd663..f48b5436f5 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,27 +2,25 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "38.0"; + version = "39.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - hash = "sha256-Lhug7DCa+QutlvksL6EFQa04UK/sWebDIkqQmwPUpX4="; + hash = "sha256-sMnfeICo/PhpljstTIj4CiE4QBuyVKYD9oWvWf0Ouew="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "acpi_tables-0.1.0" = "sha256-syDq+db1hTne6QoP0vMGUv4tB0J9arQG2Ea2hHW1k3M="; - "igvm-0.1.0" = "sha256-l+Qyhdy3b8h8hPLHg5M0os8aSkjM55hAP5nqi0AGmjo="; - "kvm-bindings-0.7.0" = "sha256-hXv5N3TTwGQaVxdQ/DTzLt+uwLxFnstJwNhxRD2K8TM="; - "micro_http-0.1.0" = "sha256-gyeOop6AMXEIbLXhJMN/oYGGU8Un8Y0nFZc9ucCa0y4="; - "mshv-bindings-0.1.1" = "sha256-yWvkpOcW3lV47s+rWnN4Bki8tt8CkiPVZ0I36nrWMi4="; - "versionize_derive-0.1.6" = "sha256-eI9fM8WnEBZvskPhU67IWeN6QAPg2u5EBT+AOxfb/fY="; - "vfio-bindings-0.4.0" = "sha256-Dk4T2dMzPZ+Aoq1YSXX2z1Nky8zvyDl7b+A8NH57Hkc="; + "acpi_tables-0.1.0" = "sha256-a6ojB2XVeH+YzzXRle0agg+ljn0Jsgyaf6TJZAGt8sQ="; + "igvm-0.1.9" = "sha256-OztgRiv+//27MS9SqSBJPbrVlXihK2m9UkG4REZ9Vn0="; + "micro_http-0.1.0" = "sha256-yIgcoEfc7eeS1+bijzkifaBxVNHa71Y+Vn79owMaKvM="; + "mshv-bindings-0.1.1" = "sha256-US/AzS7iRUQijkGs1EG04Hk4Q7dPz65BeTMsI8rtMqw="; + "vfio-bindings-0.4.0" = "sha256-k8Hf5y8MiTnd3k2iEgnnX/o8VdVS7prKlnssyEerVRM="; "vfio_user-0.1.0" = "sha256-LJ84k9pMkSAaWkuaUd+2LnPXnNgrP5LdbPOc1Yjz5xA="; - "vm-fdt-0.2.0" = "sha256-lKW4ZUraHomSDyxgNlD5qTaBTZqM0Fwhhh/08yhrjyE="; + "vm-fdt-0.3.0" = "sha256-9PywgSnSL+8gT6lcl9t6w7X4fEINa+db+H1vWS+gDOI="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon-rs/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/conmon-rs/default.nix index 3a8c5a5593..89c6d46d2c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/conmon-rs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/conmon-rs/default.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "conmon-rs"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-+htd9RJGSFzzyEQSBJGIzurQDQgpJ+sJHLPe3aPH0cg="; + hash = "sha256-+RKjJtI01Y56+cFDdOSAL4BodI7R/rM3B3ht3p6+xzs="; }; nativeBuildInputs = [ capnproto protobuf ]; doCheck = false; - cargoHash = "sha256-CcWji/qMd7eX0O3cR9/FLID17WpSfz4kEAhDgKb3jds="; + cargoHash = "sha256-4VOse+y0EO9IORyeAO/j1t6ssQARJp7lK21TUJVuH78="; meta = with lib; { description = "An OCI container runtime monitor written in Rust"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index 124647e6ab..6b65ab58dc 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.10"; + version = "2.1.11"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-WUXyx5OWIJDamzHUahN+0/rcn2pxQgCgYAE/d0mxk2A="; + hash = "sha256-QQgpvvk7S6ARzBct/4AQP66End30EXcUPqv8a4Udoas="; }; nativeBuildInputs = [ pkg-config ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; # manpage requires building the vendored go-md2man - makeFlags = [ "bin/conmon" ]; + makeFlags = [ "bin/conmon" "VERSION=${version}" ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index c89c059653..b9d1397e7e 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.15"; + version = "1.7.16"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-qLrPLGxsUmgEscrhyl+1rJ0k7c9ibKnpMpsJPD4xDZU="; + hash = "sha256-OApJaH11iTvjW4gZaANSCVcxw/VHG7a/6OnYcUcHFME="; }; vendorHash = null; @@ -50,7 +50,7 @@ buildGoModule rec { homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; - maintainers = with maintainers; [ offline vdemeester endocrimes ]; + maintainers = with maintainers; [ offline vdemeester ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index 50e49fd192..d932daa41f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.29.2"; + version = "1.30.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-il28u2+Jv2gh6XqRV4y6u0FDZ4flmcp+bOj9aibL+ro="; + hash = "sha256-gsC6e0wQowgskUazuqQRtO7ra5Wg9RU8+k3LFqIReJk="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix index 1dbfaa298e..50c5a10b56 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix @@ -5,20 +5,18 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "123.0"; + version = "124.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - # This is actually one commit before release 123, because the final - # commit breaks the build and gets reverted in future releases. - rev = "7c75ad6185893b4cc26676b6a0eb9fbdf9ed5b72"; - hash = "sha256-1Jj8TAgYxIGLJeTtiZBcXw0n/mTbh/uC8EFM0IYD5VY="; + rev = "bc2900b9ccbdf37b780a63888ca94437fd7dd6af"; + hash = "sha256-t/47u5BlSC5vbRc7OQSbGBF+wnhcDFOMjrRQc/p2HcQ="; fetchSubmodules = true; }; separateDebugInfo = true; - cargoHash = "sha256-f3w+msG7m6valf/I1puMrpiVgk0J1bdyp+rw3KQ/7ys="; + cargoHash = "sha256-7zx0k7HXequpwcURHx+Ml3cDhdvLkXTg+V71F6TO/d0="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index a17a115c2c..03f76e0421 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.14.4"; + version = "1.15"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-f+cG9800QKZH4+9ie97TmTbQlpLXe+z+47ptP+HgIgs="; + hash = "sha256-ZLkpwNxhTssp5RZ041+/mveq7Sct8fVzsdt8X319V1Q="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/ddev/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/ddev/default.nix index fdfafda6ac..e733fe4212 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/ddev/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/ddev/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.22.7"; + version = "1.23.0"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-bFQW12VzH+/OXTRBavEdfxnGowJt5TKM3r0UD64ALVs="; + hash = "sha256-+CyihuSo/ssX8tX2rYi3c41eAwdG58aagAsYiBBjQ48="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix index 4d5317201a..567a1b4db6 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "distrobox"; - version = "1.7.1"; + version = "1.7.2.1"; src = fetchFromGitHub { owner = "89luca89"; repo = "distrobox"; rev = finalAttrs.version; - hash = "sha256-mSka8QyoLjnaVEP23TtyzbPTBHDlnrSomVZdfw4PPng="; + hash = "sha256-H2jeKs0h4ZAcP33HB5jptlubq62cwnjPK2wSlEIfFWA="; }; dontConfigure = true; @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # https://github.com/89luca89/distrobox/issues/408 substituteInPlace ./distrobox-generate-entry \ - --replace 'icon_default="''${HOME}/.local' "icon_default=\"$out" + --replace-fail 'icon_default="''${HOME}/.local' "icon_default=\"$out" ./install -P $out runHook postInstall diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix index 03a76e4f00..13c8e4f4ce 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix @@ -39,6 +39,6 @@ buildGoModule rec { homepage = "https://slimtoolkit.org/"; changelog = "https://github.com/slimtoolkit/slim/raw/${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ]; + maintainers = with maintainers; [ Br1ght0ne mbrgm ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix index de13fcf5ea..f1e91408a0 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-mesFwYgDCZ44/EJ31mzx9yLeMyV2bXpxaNSx6L3BQG0="; + hash = "sha256-pfDGKxIy9ZXueYv0u1zPWWYCAeSRBaOGDfIt1Hsubkk="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix index 3e344a6536..d2eb61bb89 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.26.1"; + version = "2.27.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-R/AFjJM4rcu2JbdfTNhxIIVhaP7LzFrDAU93hbuXSXs="; + hash = "sha256-YM/9ijwxDAjFZk/ku33b/pMYri5V1h0wPd2YS7qJgCw="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-SzySXS0s0p1EXcO5RQyATBG9gtoJ4wPxZKGU62fAOHw="; + vendorHash = "sha256-ztqWSoDsN8qdm6Jq8Wo7r16zuXENQDp2JvwSN+6Jbxw="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index e30ad02f5b..bb18a42a02 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -280,15 +280,15 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_24 = callPackage dockerGen rec { - version = "24.0.5"; + version = "24.0.9"; cliRev = "v${version}"; - cliHash = "sha256-u1quVGTx/p8BDyRn33vYyyuE5BOhWMnGQ5uVX0PZ5mg="; + cliHash = "sha256-nXIZtE0X1OoQT908IGuRhVHb0tiLbqQLP0Md3YWt0/Q="; mobyRev = "v${version}"; - mobyHash = "sha256-JQjRz1fHZlQRkNw/R8WWLV8caN3/U3mrKKQXbZt2crU="; - runcRev = "v1.1.8"; - runcHash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4="; - containerdRev = "v1.7.1"; - containerdHash = "sha256-WwedtcsrDQwMQcKFO5nnPiHyGJpl5hXZlmpbBe1/ftY="; + mobyHash = "sha256-KRS99heyMAPBnjjr7If8TOlJf6v6866S7J3YGkOhFiA="; + runcRev = "v1.1.12"; + runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0="; + containerdRev = "v1.7.13"; + containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix index 6c22a5ec12..28054be349 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/dumb-init/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { description = "A minimal init system for Linux containers"; homepage = "https://github.com/Yelp/dumb-init"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; - platforms = platforms.linux; + maintainers = [ ]; + platforms = platforms.unix; mainProgram = "dumb-init"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix index c3a28e4be4..57dde74ab0 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.82.2"; + version = "1.82.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-2a8QBdL28iHVTE+Xo1I+89pFBeWndPqT072SHB498SQ="; + hash = "sha256-dn7aAH5Huul02WHoPm9VOjAdhMmtUXwnoGa2nSOa8UI="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix index eeabb94536..fca5227177 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation { mainProgram = "firecracker"; license = licenses.asl20; platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ thoughtpolice endocrimes qjoly ]; + maintainers = with maintainers; [ thoughtpolice qjoly ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/kraft/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/kraft/default.nix index 4d52565bcd..76e6614dc3 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/kraft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/kraft/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.8.3"; + version = "0.8.6"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-or1UstxYbj3QvgnoQPT2vyQTVZDIKPMDMxRGtN0n0lk="; + hash = "sha256-lBvDKO2+MTSrmQM7szg5yulUi5OZKv7qKNQ75PIZgDo="; }; - vendorHash = "sha256-UyDaEwXTMbyAUghvHS/LcT2Yzz7CJ2xGelF19kgRNec="; + vendorHash = "sha256-JSE4k/JgWvYCfTUuf2pj4XCcdJ9+j7fY9aAiCipapIk="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix index 8e035b8753..b1ff999cd8 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-sJaiZJeT0oUAnSg9Kv8uMp1XoumumC3LB77lelmwSgw="; + hash = "sha256-t1vrUXv0ZP+vmOcUIue/yvB34DP+gduopuN0U9oixBQ="; }; vendorHash = null; @@ -20,19 +20,20 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - preCheck = + preCheck = '' + export USER=$(whoami) + export HOME="$(mktemp -d)" + ''; + + checkFlags = let skippedTests = [ + # Disable flaky tests "TestDialogs" "TestVoldialogs" ]; in - '' - export HOME="$(mktemp -d)" - - # Disable flaky tests - buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") - ''; + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; passthru.tests.version = testers.testVersion { package = podman-tui; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 92935ed129..1d5cb70e58 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -19,11 +19,10 @@ , symlinkJoin , substituteAll , extraPackages ? [ ] -, runc , crun -, gvisor -, youki +, runc , conmon +, extraRuntimes ? lib.optionals stdenv.isLinux [ runc ] # e.g.: runc, gvisor, youki , slirp4netns , fuse-overlayfs , util-linux @@ -59,28 +58,30 @@ let netavark slirp4netns passt - ]; + conmon + crun + ] ++ extraRuntimes; }; in buildGoModule rec { pname = "podman"; - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-8Swqwyzu/WI9mG21bLF81Kk4kS2Ltg0GV9G3EcG/FnU="; + hash = "sha256-PA7mKHPzPDFdwKXAHvHnDvHF+mTmm59jkoeUeiCP6vE="; }; patches = [ - # we intentionally don't build and install the helper so we shouldn't display messages to users about it - ./rm-podman-mac-helper-msg.patch - ] ++ lib.optionals stdenv.isLinux [ (substituteAll { src = ./hardcode-paths.patch; - inherit crun runc gvisor youki conmon; + bin_path = helpersBin; }) + + # we intentionally don't build and install the helper so we shouldn't display messages to users about it + ./rm-podman-mac-helper-msg.patch ]; vendorHash = null; @@ -161,7 +162,7 @@ buildGoModule rec { ''; changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md"; license = licenses.asl20; - maintainers = with maintainers; [ marsam ] ++ teams.podman.members; + maintainers = with maintainers; [ ] ++ teams.podman.members; mainProgram = "podman"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/hardcode-paths.patch b/third_party/nixpkgs/pkgs/applications/virtualization/podman/hardcode-paths.patch index 05394f6287..445a615c81 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/hardcode-paths.patch +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/hardcode-paths.patch @@ -1,8 +1,8 @@ diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go -index 19c4bb6bf..2743de4b2 100644 +index 3a6d804ad..5628e2bf6 100644 --- a/vendor/github.com/containers/common/pkg/config/default.go +++ b/vendor/github.com/containers/common/pkg/config/default.go -@@ -364,75 +364,34 @@ func defaultEngineConfig() (*EngineConfig, error) { +@@ -366,75 +366,34 @@ func defaultEngineConfig() (*EngineConfig, error) { c.Retry = 3 c.OCIRuntimes = map[string][]string{ "crun": { @@ -13,7 +13,7 @@ index 19c4bb6bf..2743de4b2 100644 - "/sbin/crun", - "/bin/crun", - "/run/current-system/sw/bin/crun", -+ "@crun@/bin/crun", ++ "@bin_path@/bin/crun", }, "crun-vm": { - "/usr/bin/crun-vm", @@ -22,7 +22,7 @@ index 19c4bb6bf..2743de4b2 100644 - "/sbin/crun-vm", - "/bin/crun-vm", - "/run/current-system/sw/bin/crun-vm", -+ // TODO: "@crun-vm@/bin/crun-vm", ++ "@bin_path@/bin/crun-vm", }, "crun-wasm": { - "/usr/bin/crun-wasm", @@ -32,7 +32,7 @@ index 19c4bb6bf..2743de4b2 100644 - "/sbin/crun-wasm", - "/bin/crun-wasm", - "/run/current-system/sw/bin/crun-wasm", -+ // TODO: "@crun-wasm@/bin/crun-wasm", ++ "@bin_path@/bin/crun-wasm", }, "runc": { - "/usr/bin/runc", @@ -43,11 +43,11 @@ index 19c4bb6bf..2743de4b2 100644 - "/bin/runc", - "/usr/lib/cri-o-runc/sbin/runc", - "/run/current-system/sw/bin/runc", -+ "@runc@/bin/runc", ++ "@bin_path@/bin/runc", }, "runj": { - "/usr/local/bin/runj", -+ // TODO: "@runj@/bin/runj", ++ "@bin_path@/bin/runj", }, "kata": { - "/usr/bin/kata-runtime", @@ -58,7 +58,7 @@ index 19c4bb6bf..2743de4b2 100644 - "/bin/kata-runtime", - "/usr/bin/kata-qemu", - "/usr/bin/kata-fc", -+ // TODO: "@kata@/bin/kata", ++ "@bin_path@/bin/kata-runtime", }, "runsc": { - "/usr/bin/runsc", @@ -68,27 +68,27 @@ index 19c4bb6bf..2743de4b2 100644 - "/bin/runsc", - "/sbin/runsc", - "/run/current-system/sw/bin/runsc", -+ "@gvisor@/bin/runsc", ++ "@bin_path@/bin/runsc", }, "youki": { - "/usr/local/bin/youki", - "/usr/bin/youki", - "/bin/youki", - "/run/current-system/sw/bin/youki", -+ "@youki@/bin/youki", ++ "@bin_path@/bin/youki", }, "krun": { - "/usr/bin/krun", - "/usr/local/bin/krun", -+ // TODO: "@krun@/bin/krun", ++ "@bin_path@/bin/krun", }, "ocijail": { - "/usr/local/bin/ocijail", -+ // TODO: "@ocijail@/bin/ocijail", ++ "@bin_path@/bin/ocijail", }, } c.PlatformToOCIRuntime = map[string]string{ -@@ -443,16 +402,9 @@ func defaultEngineConfig() (*EngineConfig, error) { +@@ -445,26 +404,12 @@ func defaultEngineConfig() (*EngineConfig, error) { // Needs to be called after populating c.OCIRuntimes. c.OCIRuntime = c.findRuntime() @@ -103,7 +103,18 @@ index 19c4bb6bf..2743de4b2 100644 - "/usr/local/bin/conmon", - "/usr/local/sbin/conmon", - "/run/current-system/sw/bin/conmon", -+ "@conmon@/bin/conmon", ++ "@bin_path@/bin/conmon", }) c.ConmonRsPath.Set([]string{ - "/usr/libexec/podman/conmonrs", +- "/usr/libexec/podman/conmonrs", +- "/usr/local/libexec/podman/conmonrs", +- "/usr/local/lib/podman/conmonrs", +- "/usr/bin/conmonrs", +- "/usr/sbin/conmonrs", +- "/usr/local/bin/conmonrs", +- "/usr/local/sbin/conmonrs", +- "/run/current-system/sw/bin/conmonrs", ++ "@bin_path@/bin/conmonrs", + }) + c.PullPolicy = DefaultPullPolicy + c.RuntimeSupportsJSON.Set([]string{ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index e7da99d561..cf8012b2a3 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -13,7 +13,7 @@ , pipewireSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, pipewire , sdlSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, SDL2, SDL2_image , jackSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, libjack2 -, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner && !toolsOnly, gtk3, gettext, vte, wrapGAppsHook +, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner && !toolsOnly, gtk3, gettext, vte, wrapGAppsHook3 , vncSupport ? !nixosTestRunner && !toolsOnly, libjpeg, libpng , smartcardSupport ? !nixosTestRunner && !toolsOnly, libcacard , spiceSupport ? true && !nixosTestRunner && !toolsOnly, spice, spice-protocol @@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils"; - version = "8.2.2"; + version = "8.2.3"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-hHNGwbgsGlSyw49u29hVSe3rF0MLfU09oSYg4pYrxPM="; + hash = "sha256-d1sRjKpjZiCnr0saFWRFoaKA9a1Ss7y7F/jilkhB21g="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme ] - ++ lib.optionals gtkSupport [ wrapGAppsHook ] + ++ lib.optionals gtkSupport [ wrapGAppsHook3 ] ++ lib.optionals hexagonSupport [ glib ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/quickgui/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/quickgui/default.nix index 9c4de021f2..f4420c6aea 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/quickgui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/quickgui/default.nix @@ -1,12 +1,14 @@ -{ stdenv +{ stdenvNoCC , lib , fetchurl , autoPatchelfHook , dpkg -, wrapGAppsHook +, wrapGAppsHook3 +, quickemu +, gnome }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "quickgui"; version = "1.2.8"; @@ -18,31 +20,48 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg + wrapGAppsHook3 ]; buildInputs = [ - wrapGAppsHook + quickemu + gnome.zenity ]; + strictDeps = true; + unpackCmd = "dpkg-deb -x $curSrc source"; installPhase = '' runHook preInstall mv usr $out - substituteInPlace $out/share/applications/quickgui.desktop \ - --replace "/usr" $out runHook postInstall ''; - meta = { + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ quickemu gnome.zenity ]} + ) + ''; + + postFixup = '' + substituteInPlace $out/share/applications/quickgui.desktop \ + --replace "/usr" $out + + # quickgui PR 88 + echo "Categories=System;" >> $out/share/applications/quickgui.desktop + ''; + + meta = with lib; { description = "A Flutter frontend for quickemu"; homepage = "https://github.com/quickemu-project/quickgui"; changelog = "https://github.com/quickemu-project/quickgui/releases/tag/v${version}"; - maintainers = [ lib.maintainers.heyimnova ]; - platforms = lib.platforms.linux; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + license = licenses.mit; + maintainers = with maintainers; [ heyimnova ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ sourceTypes.binaryNativeCode ]; mainProgram = "quickgui"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix index d16b88adec..da7c8accf8 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix @@ -1,107 +1,111 @@ # Configurations that should only be overrided by # overrideAttrs -{ pname -, version -, src -, projectName # "apptainer" or "singularity" -, vendorHash ? null -, deleteVendor ? false -, proxyVendor ? false -, extraConfigureFlags ? [ ] -, extraDescription ? "" -, extraMeta ? { } +{ + pname, + version, + src, + projectName, # "apptainer" or "singularity" + vendorHash ? null, + deleteVendor ? false, + proxyVendor ? false, + extraConfigureFlags ? [ ], + extraDescription ? "", + extraMeta ? { }, }: let # Workaround for vendor-related attributes not overridable (#86349) # should be removed when the issue is resolved _defaultGoVendorArgs = { - inherit - vendorHash - deleteVendor - proxyVendor - ; + inherit vendorHash deleteVendor proxyVendor; }; in -{ lib -, buildGoModule -, runCommandLocal +{ + lib, + buildGoModule, + runCommandLocal, + substituteAll, # Native build inputs -, addDriverRunpath -, makeWrapper -, pkg-config -, util-linux -, which + addDriverRunpath, + makeWrapper, + pkg-config, + util-linux, + which, # Build inputs -, bash -, callPackage -, conmon -, coreutils -, cryptsetup -, e2fsprogs -, fakeroot -, fuse2fs ? e2fsprogs.fuse2fs -, go -, gpgme -, libseccomp -, libuuid + bash, + callPackage, + conmon, + coreutils, + cryptsetup, + e2fsprogs, + fakeroot, + fuse2fs ? e2fsprogs.fuse2fs, + go, + gpgme, + libseccomp, + libuuid, # This is for nvidia-container-cli -, nvidia-docker -, openssl -, squashfsTools -, squashfuse + nvidia-docker, + openssl, + squashfsTools, + squashfuse, # Test dependencies -, singularity-tools -, cowsay -, hello + singularity-tools, + cowsay, + hello, # Overridable configurations -, enableNvidiaContainerCli ? true + enableNvidiaContainerCli ? true, # --nvccli currently requires extra privileges: # https://github.com/apptainer/apptainer/issues/1893#issuecomment-1881240800 -, forceNvcCli ? false + forceNvcCli ? false, # Compile with seccomp support # SingularityCE 3.10.0 and above requires explicit --without-seccomp when libseccomp is not available. -, enableSeccomp ? true + enableSeccomp ? true, # Whether the configure script treat SUID support as default # When equal to enableSuid, it supress the --with-suid / --without-suid build flag # It can be set to `null` to always pass either --with-suid or --without-suided # Type: null or boolean -, defaultToSuid ? true + defaultToSuid ? true, # Whether to compile with SUID support -, enableSuid ? false -, starterSuidPath ? null -, substituteAll + enableSuid ? false, + starterSuidPath ? null, # newuidmapPath and newgidmapPath are to support --fakeroot # where those SUID-ed executables are unavailable from the FHS system PATH. # Path to SUID-ed newuidmap executable -, newuidmapPath ? null + newuidmapPath ? null, # Path to SUID-ed newgidmap executable -, newgidmapPath ? null + newgidmapPath ? null, # External LOCALSTATEDIR -, externalLocalStateDir ? null + externalLocalStateDir ? null, # Remove the symlinks to `singularity*` when projectName != "singularity" -, removeCompat ? false + removeCompat ? false, # Workaround #86349 # should be removed when the issue is resolved -, vendorHash ? _defaultGoVendorArgs.vendorHash -, deleteVendor ? _defaultGoVendorArgs.deleteVendor -, proxyVendor ? _defaultGoVendorArgs.proxyVendor + vendorHash ? _defaultGoVendorArgs.vendorHash, + deleteVendor ? _defaultGoVendorArgs.deleteVendor, + proxyVendor ? _defaultGoVendorArgs.proxyVendor, }: let defaultPathOriginal = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"; - privileged-un-utils = if ((newuidmapPath == null) && (newgidmapPath == null)) then null else - (runCommandLocal "privileged-un-utils" { } '' - mkdir -p "$out/bin" - ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap" - ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap" - ''); + privileged-un-utils = + if ((newuidmapPath == null) && (newgidmapPath == null)) then + null + else + (runCommandLocal "privileged-un-utils" { } '' + mkdir -p "$out/bin" + ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap" + ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap" + ''); in (buildGoModule { inherit pname version src; patches = lib.optionals (projectName == "apptainer") [ - (substituteAll { src = ./apptainer/0001-ldCache-patch-for-driverLink.patch; inherit (addDriverRunpath) driverLink; }) + (substituteAll { + src = ./apptainer/0001-ldCache-patch-for-driverLink.patch; + inherit (addDriverRunpath) driverLink; + }) ]; # Override vendorHash with the output got from @@ -138,29 +142,36 @@ in # apptainer/apptainer: https://github.com/apptainer/apptainer/blob/main/dist/debian/control # sylabs/singularity: https://github.com/sylabs/singularity/blob/main/debian/control - buildInputs = [ - bash # To patch /bin/sh shebangs. - conmon - cryptsetup - gpgme - libuuid - openssl - squashfsTools # Required at build time by SingularityCE - ] - ++ lib.optional enableNvidiaContainerCli nvidia-docker - ++ lib.optional enableSeccomp libseccomp - ; + buildInputs = + [ + bash # To patch /bin/sh shebangs. + conmon + cryptsetup + gpgme + libuuid + openssl + squashfsTools # Required at build time by SingularityCE + ] + # Optional dependencies. + # Formatting: Optional dependencies are likely to increase. + # Don't squash them into the same line. + ++ lib.optional enableNvidiaContainerCli nvidia-docker + ++ lib.optional enableSeccomp libseccomp; configureScript = "./mconfig"; - configureFlags = [ - "--localstatedir=${if externalLocalStateDir != null then externalLocalStateDir else "${placeholder "out"}/var/lib"}" - "--runstatedir=/var/run" - ] - ++ lib.optional (!enableSeccomp) "--without-seccomp" - ++ lib.optional (enableSuid != defaultToSuid) (if enableSuid then "--with-suid" else "--without-suid") - ++ extraConfigureFlags - ; + configureFlags = + [ + "--localstatedir=${ + if externalLocalStateDir != null then externalLocalStateDir else "${placeholder "out"}/var/lib" + }" + "--runstatedir=/var/run" + ] + ++ lib.optional (!enableSeccomp) "--without-seccomp" + ++ lib.optional (enableSuid != defaultToSuid) ( + if enableSuid then "--with-suid" else "--without-suid" + ) + ++ extraConfigureFlags; # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; @@ -177,9 +188,7 @@ in privileged-un-utils squashfsTools # mksquashfs unsquashfs # Make / unpack squashfs image squashfuse # squashfuse_ll squashfuse # Mount (without unpacking) a squashfs image without privileges - ] - ++ lib.optional enableNvidiaContainerCli nvidia-docker - ; + ] ++ lib.optional enableNvidiaContainerCli nvidia-docker; postPatch = '' if [[ ! -e .git || ! -e VERSION ]]; then @@ -249,70 +258,86 @@ in rm "$file" done ''} - ${lib.optionalString enableSuid (lib.warnIf (starterSuidPath == null) "${projectName}: Null starterSuidPath when enableSuid produces non-SUID-ed starter-suid and run-time permission denial." '' - chmod +x $out/libexec/${projectName}/bin/starter-suid - '')} + ${lib.optionalString enableSuid ( + lib.warnIf (starterSuidPath == null) + "${projectName}: Null starterSuidPath when enableSuid produces non-SUID-ed starter-suid and run-time permission denial." + '' + chmod +x $out/libexec/${projectName}/bin/starter-suid + '' + )} ${lib.optionalString (enableSuid && (starterSuidPath != null)) '' mv "$out"/libexec/${projectName}/bin/starter-suid{,.orig} ln -s ${lib.escapeShellArg starterSuidPath} "$out/libexec/${projectName}/bin/starter-suid" ''} ''; - meta = with lib; { - description = "Application containers for linux" + extraDescription; - longDescription = '' - Singularity (the upstream) renamed themselves to Apptainer - to distinguish themselves from a fork made by Sylabs Inc.. See + meta = + with lib; + { + description = "Application containers for linux" + extraDescription; + longDescription = '' + Singularity (the upstream) renamed themselves to Apptainer + to distinguish themselves from a fork made by Sylabs Inc.. See - https://sylabs.io/2021/05/singularity-community-edition - https://apptainer.org/news/community-announcement-20211130 - ''; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ jbedo ShamrockLee ]; - mainProgram = projectName; - } // extraMeta; -}).overrideAttrs (finalAttrs: prevAttrs: { - passthru = prevAttrs.passthru or { } // { - tests = { - image-hello-cowsay = singularity-tools.buildImage { - name = "hello-cowsay"; - contents = [ hello cowsay ]; - singularity = finalAttrs.finalPackage; - }; - }; - gpuChecks = lib.optionalAttrs (projectName == "apptainer") { - # Should be in tests, but Ofborg would skip image-hello-cowsay because - # saxpy is unfree. - image-saxpy = callPackage - ({ singularity-tools, cudaPackages }: - singularity-tools.buildImage { - name = "saxpy"; - contents = [ cudaPackages.saxpy ]; - memSize = 2048; - diskSize = 2048; + https://sylabs.io/2021/05/singularity-community-edition + https://apptainer.org/news/community-announcement-20211130 + ''; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ + jbedo + ShamrockLee + ]; + mainProgram = projectName; + } + // extraMeta; +}).overrideAttrs + ( + finalAttrs: prevAttrs: { + passthru = prevAttrs.passthru or { } // { + tests = { + image-hello-cowsay = singularity-tools.buildImage { + name = "hello-cowsay"; + contents = [ + hello + cowsay + ]; singularity = finalAttrs.finalPackage; - }) - { }; - saxpy = - callPackage - ({ runCommand, writeShellScriptBin }: + }; + }; + gpuChecks = lib.optionalAttrs (projectName == "apptainer") { + # Should be in tests, but Ofborg would skip image-hello-cowsay because + # saxpy is unfree. + image-saxpy = callPackage ( + { singularity-tools, cudaPackages }: + singularity-tools.buildImage { + name = "saxpy"; + contents = [ cudaPackages.saxpy ]; + memSize = 2048; + diskSize = 2048; + singularity = finalAttrs.finalPackage; + } + ) { }; + saxpy = callPackage ( + { runCommand, writeShellScriptBin }: let - unwrapped = writeShellScriptBin "apptainer-cuda-saxpy" - '' - ${lib.getExe finalAttrs.finalPackage} exec --nv $@ ${finalAttrs.passthru.gpuChecks.image-saxpy} saxpy - ''; + unwrapped = writeShellScriptBin "apptainer-cuda-saxpy" '' + ${lib.getExe finalAttrs.finalPackage} exec --nv $@ ${finalAttrs.passthru.gpuChecks.image-saxpy} saxpy + ''; in runCommand "run-apptainer-cuda-saxpy" { requiredSystemFeatures = [ "cuda" ]; nativeBuildInputs = [ unwrapped ]; - passthru = { inherit unwrapped; }; + passthru = { + inherit unwrapped; + }; } '' apptainer-cuda-saxpy - '') - { }; - }; - }; -}) + '' + ) { }; + }; + }; + } + ) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix index efa77b4209..8711ab197f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix @@ -1,89 +1,98 @@ -{ callPackage -, fetchFromGitHub -, nixos -, conmon +{ + callPackage, + fetchFromGitHub, + nixos, + conmon, }: let - apptainer = callPackage - (import ./generic.nix rec { - pname = "apptainer"; - version = "1.3.0"; - projectName = "apptainer"; + apptainer = + callPackage + (import ./generic.nix rec { + pname = "apptainer"; + version = "1.3.1"; + projectName = "apptainer"; - src = fetchFromGitHub { - owner = "apptainer"; - repo = "apptainer"; - rev = "refs/tags/v${version}"; - hash = "sha256-YqPPTs7cIiMbOc8jOwr8KgUBVu2pTPlSL0Vvw/1n4co="; + src = fetchFromGitHub { + owner = "apptainer"; + repo = "apptainer"; + rev = "refs/tags/v${version}"; + hash = "sha256-XhJecINx8jC6pRzIoM4nC6Aunj40xL8EmYIA4UizfAY="; + }; + + # Update by running + # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).goModules" + # at the root directory of the Nixpkgs repository + vendorHash = "sha256-MXW1U13uDRAx4tqZvqsuJvoD22nEL2gcxiGaa/6zwU0="; + + extraDescription = " (previously known as Singularity)"; + extraMeta.homepage = "https://apptainer.org"; + }) + { + # Apptainer doesn't depend on conmon + conmon = null; + + # Apptainer builders require explicit --with-suid / --without-suid flag + # when building on a system with disabled unprivileged namespace. + # See https://github.com/NixOS/nixpkgs/pull/215690#issuecomment-1426954601 + defaultToSuid = null; }; - # Update by running - # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).goModules" - # at the root directory of the Nixpkgs repository - vendorHash = "sha256-lWo6ic3Tdv1UInA5MtEaAgiheCin2JSh4nmheUooENY="; + singularity = + callPackage + (import ./generic.nix rec { + pname = "singularity-ce"; + version = "4.1.3"; + projectName = "singularity"; - extraDescription = " (previously known as Singularity)"; - extraMeta.homepage = "https://apptainer.org"; - }) - { - # Apptainer doesn't depend on conmon - conmon = null; + src = fetchFromGitHub { + owner = "sylabs"; + repo = "singularity"; + rev = "refs/tags/v${version}"; + hash = "sha256-pR8zyMr23wcbDCXAysVEgGUDHkrfhLoVF3fjMLgZFYs="; + }; - # Apptainer builders require explicit --with-suid / --without-suid flag - # when building on a system with disabled unprivileged namespace. - # See https://github.com/NixOS/nixpkgs/pull/215690#issuecomment-1426954601 - defaultToSuid = null; - }; + # Update by running + # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules" + # at the root directory of the Nixpkgs repository + vendorHash = "sha256-332GFL04aE6B6vxgtJJH4TeI6YJCDBpCClJ3sc5gN3A="; - singularity = callPackage - (import ./generic.nix rec { - pname = "singularity-ce"; - version = "4.1.2"; - projectName = "singularity"; + # Do not build conmon and squashfuse from the Git submodule sources, + # Use Nixpkgs provided version + extraConfigureFlags = [ + "--without-conmon" + "--without-squashfuse" + ]; - src = fetchFromGitHub { - owner = "sylabs"; - repo = "singularity"; - rev = "refs/tags/v${version}"; - hash = "sha256-/KTDdkCMkZ5hO+VYHzw9vB8FDWxg7PS1yb2waRJQngY="; + extraDescription = " (Sylabs Inc's fork of Singularity, a.k.a. SingularityCE)"; + extraMeta.homepage = "https://sylabs.io/"; + }) + { + # Sylabs SingularityCE builders defaults to set the SUID flag + # on UNIX-like platforms, + # and only have --without-suid but not --with-suid. + defaultToSuid = true; }; - # Update by running - # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules" - # at the root directory of the Nixpkgs repository - vendorHash = "sha256-4Nxj2PzZmFdvouWKyXLFDk8iuRhFuvyPW/+VRTw75Zw="; + genOverridenNixos = + package: packageName: + (nixos { + programs.singularity = { + enable = true; + inherit package; + }; + }).config.programs.singularity.packageOverriden.overrideAttrs + (oldAttrs: { + meta = oldAttrs.meta // { + description = ""; + longDescription = '' + This package produces identical store derivations to `pkgs.${packageName}` + overriden and installed by the NixOS module `programs.singularity` + with default configuration. - # Do not build conmon and squashfuse from the Git submodule sources, - # Use Nixpkgs provided version - extraConfigureFlags = [ - "--without-conmon" - "--without-squashfuse" - ]; - - extraDescription = " (Sylabs Inc's fork of Singularity, a.k.a. SingularityCE)"; - extraMeta.homepage = "https://sylabs.io/"; - }) - { - defaultToSuid = true; - }; - - genOverridenNixos = package: packageName: (nixos { - programs.singularity = { - enable = true; - inherit package; - }; - }).config.programs.singularity.packageOverriden.overrideAttrs (oldAttrs: { - meta = oldAttrs.meta // { - description = ""; - longDescription = '' - This package produces identical store derivations to `pkgs.${packageName}` - overriden and installed by the NixOS module `programs.singularity` - with default configuration. - - This is for binary substitutes only. Use pkgs.${packageName} instead. - ''; - }; - }); + This is for binary substitutes only. Use pkgs.${packageName} instead. + ''; + }; + }); in { inherit apptainer singularity; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/tart/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/tart/default.nix index e8791404fb..921a8b7e3d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/tart/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.7.2"; + version = "2.10.0"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-Z/LZ8g1/FYT7Jh943tFxN8L5HeNf0CVz1VEJj+2fCd8="; + hash = "sha256-9spBDqNm47nUZEGCCOfISjNpGx/22OtPPheB7iJTq1A="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index 813e77db43..3cbc285076 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook, gtk-vnc +{ lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook3, gtk-vnc , vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, gst_all_1, libosinfo, gnome, gtksourceview4, docutils, cpio , e2fsprogs, findutils, gzip, cdrtools, xorriso, fetchpatch @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { intltool file gobject-introspection # for setup hook populating GI_TYPELIB_PATH docutils - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix index 1aca58af5c..b0bf423605 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix @@ -30,7 +30,7 @@ , spice-protocol , spiceSupport ? true , vte -, wrapGAppsHook +, wrapGAppsHook3 }: with lib; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { pkg-config python3 shared-mime-info - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index 314d8136b8..3a9179b89d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -5,6 +5,7 @@ , alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib, xz , yasm, glslang , linuxPackages +, nixosTests # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). , open-watcom-bin @@ -24,6 +25,9 @@ # See https://github.com/cyberus-technology/virtualbox-kvm/issues/12 assert enableKvm -> !enableHardening; +# The web services use Java infrastructure. +assert enableWebService -> javaBindings; + with lib; let @@ -118,11 +122,11 @@ in stdenv.mkDerivation { # we don't take any chances and only apply it if people actually want to use KVM support. ++ optional enableKvm (fetchpatch (let - patchVersion = "20240325"; + patchVersion = "20240502"; in { name = "virtualbox-${version}-kvm-dev-${patchVersion}.patch"; url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${patchVersion}/kvm-backend-${version}-dev-${patchVersion}.patch"; - hash = "sha256-D1ua8X5Iyw/I89PtskiGdnGr4NhdFtI93ThltiOcu8w="; + hash = "sha256-KokIrrAoJutHzPg6e5YAJgDGs+nQoVjapmyn9kG5tV0="; })) ++ [ ./qt-dependency-paths.patch @@ -251,7 +255,7 @@ in stdenv.mkDerivation { mkdir -p "$out/share/virtualbox" cp -rv src/VBox/Main/UnattendedTemplates "$out/share/virtualbox" - ln -s "${virtualboxGuestAdditionsIso}/VBoxGuestAdditions_${version}.iso" "$out/share/virtualbox/VBoxGuestAdditions.iso" + ln -s "${virtualboxGuestAdditionsIso}" "$out/share/virtualbox/VBoxGuestAdditions.iso" ''; preFixup = optionalString (!headless) '' @@ -265,6 +269,7 @@ in stdenv.mkDerivation { passthru = { inherit extensionPack; # for inclusion in profile to prevent gc + tests = nixosTests.virtualbox; updateScript = ./update.sh; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index d2f9bc62ba..cd2f58afc9 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -1,22 +1,11 @@ -{ stdenv, fetchurl, lib, virtualbox}: +{ fetchurl, lib, virtualbox}: let inherit (virtualbox) version; in -stdenv.mkDerivation rec { - pname = "VirtualBox-GuestAdditions-iso"; - inherit version; - - src = fetchurl { - url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "0efbcb9bf4722cb19292ae00eba29587432e918d3b1f70905deb70f7cf78e8ce"; - }; - - buildCommand = '' - mkdir -p $out - cp $src $out/ - ''; - +fetchurl { + url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; + sha256 = "0efbcb9bf4722cb19292ae00eba29587432e918d3b1f70905deb70f7cf78e8ce"; meta = { description = "Guest additions ISO for VirtualBox"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dk/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dk/default.nix index 25fcad2ba0..631e7b85d1 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/dk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/dk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dk"; - version = "2.1"; + version = "2.2"; src = fetchFromBitbucket { owner = "natemaia"; repo = "dk"; rev = "v${finalAttrs.version}"; - hash = "sha256-bUt4Se4Gu7CZEdv1/VpU92ncq2MBKXG7T4Wpa/2rocI="; + hash = "sha256-u1fZTcfGLwKFeRADU55MFYDvtSOaOg5qtWB90xYpVuY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/eww/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/eww/default.nix deleted file mode 100644 index b245941fc7..0000000000 --- a/third_party/nixpkgs/pkgs/applications/window-managers/eww/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, wrapGAppsHook -, gtk3 -, librsvg -, gtk-layer-shell -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "eww"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "elkowar"; - repo = "eww"; - rev = "v${version}"; - hash = "sha256-HBBz1NDtj2TnDK5ghDLRrAOwHXDZlzclvVscYnmKGck="; - }; - - cargoHash = "sha256-IirFE714NZmppLjwbWk6fxcmRXCUFzB4oxOxBvmYu5U="; - - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - - buildInputs = [ gtk3 librsvg gtk-layer-shell ]; - - cargoBuildFlags = [ "--bin" "eww" ]; - - cargoTestFlags = cargoBuildFlags; - - # requires unstable rust features - RUSTC_BOOTSTRAP = 1; - - meta = with lib; { - description = "ElKowars wacky widgets"; - homepage = "https://github.com/elkowar/eww"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda lom coffeeispower ]; - mainProgram = "eww"; - broken = stdenv.isDarwin; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hackedbox/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hackedbox/default.nix index f38d0d6beb..45f17c0c91 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hackedbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hackedbox/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; + CXXFLAGS = "-std=c++98"; + buildInputs = [ freetype fribidi diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index e8da21dba9..3a2920785f 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -4,6 +4,7 @@ , pkg-config , makeWrapper , meson +, cmake , ninja , binutils , cairo @@ -21,15 +22,19 @@ , mesa , pango , pciutils +, python3 , systemd , tomlplusplus -, udis86-hyprland , wayland , wayland-protocols , wayland-scanner -, wlroots-hyprland , xcbutilwm , xwayland +, hwdata +, seatd +, libdisplay-info +, libliftoff +, xorg , debug ? false , enableXWayland ? true , legacyRenderer ? false @@ -44,25 +49,17 @@ assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been remov assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; -let - wlr = wlroots-hyprland.override { inherit enableXWayland; }; -in stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.38.1"; - + version = "0.39.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; + fetchSubmodules = true; rev = "v${finalAttrs.version}"; - hash = "sha256-6y422rx8ScSkjR1dNYGYUxBmFewRYlCz9XZZ+XrVZng="; + hash = "sha256-7L5rqQRYH2iyyP5g3IdXJSlATfgnKhuYMf65E48MVKw="; }; - patches = [ - # make meson use the provided dependencies instead of the git submodules - "${finalAttrs.src}/nix/patches/meson-build.patch" - ]; - postPatch = '' # Fix hardcoded paths to /usr installation sed -i "s#/usr#$out#" src/render/OpenGL.cpp @@ -70,21 +67,29 @@ stdenv.mkDerivation (finalAttrs: { # Generate version.h cp src/version.h.in src/version.h substituteInPlace src/version.h \ - --replace "@HASH@" '${finalAttrs.src.rev}' \ - --replace "@BRANCH@" "" \ - --replace "@MESSAGE@" "" \ - --replace "@DATE@" "2024-04-06" \ - --replace "@TAG@" "" \ - --replace "@DIRTY@" "" + --replace-fail "@HASH@" '${finalAttrs.src.rev}' \ + --replace-fail "@BRANCH@" "" \ + --replace-fail "@MESSAGE@" "" \ + --replace-fail "@DATE@" "2024-04-16" \ + --replace-fail "@TAG@" "" \ + --replace-fail "@DIRTY@" "" ''; + depsBuildBuild = [ + # to find wayland-scanner when cross-compiling + pkg-config + ]; + nativeBuildInputs = [ + hwdata jq makeWrapper meson ninja pkg-config wayland-scanner + cmake # for subproject udis86 + python3 ]; outputs = [ @@ -93,36 +98,39 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - buildInputs = - [ - cairo - git - hyprcursor - hyprland-protocols - hyprlang - libGL - libdrm - libinput - libxkbcommon - mesa - udis86-hyprland - wayland - wayland-protocols - pango - pciutils - tomlplusplus - wlr - ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ] - ++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ] - ++ lib.optionals withSystemd [ systemd ]; + buildInputs = [ + cairo + git + hyprcursor + hyprland-protocols + hyprlang + libGL + libdrm + libinput + libxkbcommon + mesa + wayland + wayland-protocols + pango + pciutils + tomlplusplus + # for subproject wlroots-hyprland + seatd + libliftoff + libdisplay-info + xorg.xcbutilerrors + xorg.xcbutilrenderutil + ] + ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ] + ++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ] + ++ lib.optionals withSystemd [ systemd ]; mesonBuildType = if debug then "debug" else "release"; - mesonAutoFeatures = "disabled"; + mesonAutoFeatures = "enabled"; mesonFlags = [ (lib.mesonEnable "xwayland" enableXWayland) @@ -131,7 +139,6 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - ln -s ${wlr}/include/wlr $dev/include/hyprland/wlroots ${lib.optionalString wrapRuntimeDeps '' wrapProgram $out/bin/Hyprland \ --suffix PATH : ${lib.makeBinPath [binutils pciutils stdenv.cc]} @@ -146,6 +153,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ wozeparrot fufexan ]; mainProgram = "Hyprland"; - platforms = wlr.meta.platforms; + platforms = lib.platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix index 53113b3e8b..76754dd5f0 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix @@ -24,13 +24,13 @@ let hy3 = { fetchFromGitHub, cmake, hyprland }: mkHyprlandPlugin hyprland { pluginName = "hy3"; - version = "0.38.0"; + version = "0.39.1"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl0.38.0"; - hash = "sha256-ZVwX5yM97R6MLk64dQG5KqYOR4L4HxEEV+xzQi+NGrk="; + rev = "hl0.39.1"; + hash = "sha256-PqVld+oFziSt7VZTNBomPyboaMEAIkerPQFwNJL/Wjw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix deleted file mode 100644 index b72083c456..0000000000 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ udis86 -, fetchFromGitHub -}: -udis86.overrideAttrs (old: { - version = "unstable-2022-10-13"; - - src = fetchFromGitHub { - owner = "canihavesomecoffee"; - repo = "udis86"; - rev = "5336633af70f3917760a6d441ff02d93477b0c86"; - hash = "sha256-HifdUQPGsKQKQprByeIznvRLONdOXeolOsU5nkwIv3g="; - }; - - patches = [ ]; -}) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix deleted file mode 100644 index d5be9f276c..0000000000 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ fetchFromGitLab -, wlroots -, enableXWayland ? true -}: -wlroots.overrideAttrs - (old: { - inherit enableXWayland; - version = "0.18.0-dev"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "wlroots"; - repo = "wlroots"; - rev = "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b"; - hash = "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8="; - }; - - patches = [ ]; # don't inherit old.patches - - pname = "${old.pname}-hyprland"; - }) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix index f3963b43b5..a66e52bc40 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -1,54 +1,67 @@ -{ lib -, stdenv +{ coreutils , fetchFromGitHub -, coreutils -, scrot -, imagemagick -, gawk -, i3lock-color -, getopt , fontconfig +, gawk +, getopt +, i3lock-color +, imagemagick +, installShellFiles +, lib +, makeWrapper +, scrot +, stdenv + +, screenshotCommand ? "" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "i3lock-fancy"; - version = "unstable-2018-11-25"; + version = "unstable-2023-04-28"; src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; - rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a"; - sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1"; + rev = "55f5c30071403faf5ae4363a54b6d1f63876d5ce"; + hash = "sha256-ISymKlxLE4/ChDiyjnavFx4T5hEVI62cCxYLWrWiHrg="; }; + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + postPatch = '' sed -i i3lock-fancy \ - -e "s|mktemp|${coreutils}/bin/mktemp|" \ - -e "s|'rm -f |'${coreutils}/bin/rm -f |" \ - -e "s|scrot -z |${scrot}/bin/scrot -z |" \ - -e "s|convert |${imagemagick.out}/bin/convert |" \ - -e "s|awk -F|${gawk}/bin/awk -F|" \ - -e "s| awk | ${gawk}/bin/awk |" \ - -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" \ -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' \ - -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' \ - -e "s|getopt |${getopt}/bin/getopt |" \ - -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" \ - -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z -o)|" + -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' rm Makefile + '' + lib.optionalString (screenshotCommand != "") '' + sed -i i3lock-fancy \ + -e "s|shot=(import -silent -window root)|shot=(${screenshotCommand})|"; ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/i3lock-fancy/icons cp i3lock-fancy $out/bin/i3lock-fancy ln -s $out/bin/i3lock-fancy $out/bin/i3lock cp icons/lock*.png $out/share/i3lock-fancy/icons + installManPage doc/i3lock-fancy.1 + + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/i3lock-fancy \ + --prefix PATH : ${lib.makeBinPath [ coreutils fontconfig gawk getopt i3lock-color imagemagick scrot ]} ''; meta = with lib; { description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text"; homepage = "https://github.com/meskarune/i3lock-fancy"; - maintainers = with maintainers; [ ]; + maintainers = [ maintainers.reedrw ]; + mainProgram = "i3lock-fancy"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/jay/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/jay/default.nix index 6718caf1ad..97be1c5fe2 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/jay/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/jay/default.nix @@ -7,20 +7,30 @@ , mesa , pango , udev +, shaderc +, libglvnd +, vulkan-loader +, autoPatchelfHook }: rustPlatform.buildRustPackage rec { pname = "jay"; - version = "unstable-2022-11-20"; + version = "1.2.0"; src = fetchFromGitHub { owner = "mahkoh"; repo = pname; - rev = "09b4668a5363a6e93dfb8ba35b244835f4edb0f2"; - sha256 = "sha256-0IIzXY7AFTGEe0TzJVKOtTPUZee0Wz40yKgEWLeIYJw="; + rev = "v${version}"; + sha256 = "sha256-cfX9KcXbBRIaYrR7c+aIQrg+mvLJIM1sEzJ0J7wshMU="; }; - cargoSha256 = "sha256-zSq6YBlm6gJXGlF9xZ8gWSTMewdNqrJzwP58a0x8QIU="; + cargoHash = "sha256-htAXhjCBOb8qTAAKdFqTaTSefJJTFlvEBYveOokyWjs="; + + SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; + + nativeBuildInputs = [ + autoPatchelfHook + ]; buildInputs = [ libGL @@ -29,9 +39,18 @@ rustPlatform.buildRustPackage rec { pango udev libinput + shaderc ]; - RUSTC_BOOTSTRAP = 1; + runtimeDependencies = [ + libglvnd + vulkan-loader + ]; + + postInstall = '' + install -D etc/jay.portal $out/usr/share/xdg-desktop-portal/portals/jay.portal + install -D etc/jay-portals.conf $out/usr/share/xdg-desktop-portal/jay-portals.conf + ''; meta = with lib; { description = "A Wayland compositor written in Rust"; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/miriway/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/miriway/default.nix index cd43a1be47..b56127cc29 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/miriway/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "unstable-2024-04-04"; + version = "0-unstable-2024-04-30"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "add1e0cd695985020328b0d76c91f85cc88207ff"; - hash = "sha256-Vp9ZbN5lY26t3LhkflapsG84XEy0YQE4Kvxia0VlQyg="; + rev = "726ef446c89a75510311638a4892e97ad9e0fa4e"; + hash = "sha256-7OoCoZ4IHXYI73W93P9MzVGYFv/+MDcbbhPdJY9lD2M="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix index f0b9407761..6c3a04915f 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "sommelier"; - version = "123.0"; + version = "124.0"; src = fetchzip rec { url = "https://chromium.googlesource.com/chromiumos/platform2/+archive/${passthru.rev}/vm_tools/sommelier.tar.gz"; - passthru.rev = "1abc91204f35cde76db37853ff3643c5cdb607e6"; + passthru.rev = "0ced021a6b362f35592cca5a3915d0ed784615f2"; stripRoot = false; - sha256 = "Wa30MU7iK1Y7pKNeC+FPFXDwDxFLWOZPG4jkm8cnWeg="; + sha256 = "zSiGhF4FhLUavC7YEOGGq4NE2hxK4YNXF3CpLptoZbM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix index fec3b1bfc7..df1b1cfea9 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , wayfire , wf-shell , wayland-scanner @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config wayland-scanner - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix index b447242532..a4e36c1836 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "weston"; - version = "13.0.0"; + version = "13.0.1"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - hash = "sha256-Uv8dSqI5Si5BbIWjOLYnzpf6cdQ+t2L9Sq8UXTb8eVo="; + hash = "sha256-6hVmq09f/Ofp/U96H8pbMMquTVACO/RZITmUCU4Cspo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix index b59a3e2c11..0d44a5ab23 100644 --- a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix @@ -39,15 +39,12 @@ rec { wrapType1 = wrapType2; wrapAppImage = args@{ - name ? "${args.pname}-${args.version}", src, - extraPkgs, + extraPkgs ? pkgs: [ ], meta ? {}, ... }: buildFHSEnv (defaultFhsEnvArgs // { - inherit name; - targetPkgs = pkgs: [ appimage-exec ] ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; @@ -56,12 +53,12 @@ rec { meta = { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; } // meta; - } // (removeAttrs args ([ "pname" "version" ] ++ (builtins.attrNames (builtins.functionArgs wrapAppImage))))); + } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))); - wrapType2 = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage + wrapType2 = args@{ src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage (args // { - inherit name extraPkgs; - src = extract { inherit name src; }; + inherit extraPkgs; + src = extract (lib.filterAttrs (key: value: builtins.elem key [ "name" "pname" "version" "src" ]) args); # passthru src to make nix-update work # hack to keep the origin position (unsafeGetAttrPos) @@ -73,8 +70,6 @@ rec { }); defaultFhsEnvArgs = { - name = "appimage-env"; - # Most of the packages were taken from the Steam chroot targetPkgs = pkgs: with pkgs; [ gtk3 diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index 2ab7847926..1e34ad1e5e 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -8,14 +8,14 @@ , pkgsi686Linux }: -{ name ? null -, profile ? "" +{ profile ? "" , targetPkgs ? pkgs: [] , multiPkgs ? pkgs: [] , multiArch ? false # Whether to include 32bit packages , extraBuildCommands ? "" , extraBuildCommandsMulti ? "" , extraOutputsToInstall ? [] +, ... # for name, or pname+version } @ args: # HOWTO: @@ -36,6 +36,10 @@ let inherit (stdenv) is64bit; + name = if (args ? pname && args ? version) + then "${args.pname}-${args.version}" + else args.name; + # "use of glibc_multi is only supported on x86_64-linux" isMultiBuild = multiArch && stdenv.system == "x86_64-linux"; isTargetBuild = !isMultiBuild; diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index c30a4dfb7e..12f3e7d585 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -9,10 +9,7 @@ , bubblewrap }: -{ name ? null -, pname ? null -, version ? null -, runScript ? "bash" +{ runScript ? "bash" , extraInstallCommands ? "" , meta ? {} , passthru ? {} @@ -29,7 +26,7 @@ , ... } @ args: -assert (pname != null || version != null) -> (name == null && pname != null); # You must declare either a name or pname + version (preferred). +assert (!args ? pname || !args ? version) -> (args ? name); # You must provide name if pname or version (preferred) is missing. let inherit (lib) @@ -43,16 +40,16 @@ let inherit (lib.attrsets) removeAttrs; - pname = if args ? name && args.name != null then args.name else args.pname; - versionStr = optionalString (version != null) ("-" + version); - name = pname + versionStr; + name = args.name or "${args.pname}-${args.version}"; + executableName = args.pname or args.name; + # we don't know which have been supplied, and want to avoid defaulting missing attrs to null. Passed into runCommandLocal + nameAttrs = lib.filterAttrs (key: value: builtins.elem key [ "name" "pname" "version" ]) args; buildFHSEnv = callPackage ./buildFHSEnv.nix { }; - fhsenv = buildFHSEnv (removeAttrs (args // { inherit name; }) [ + fhsenv = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" "extraPreBwrapCmds" "extraBwrapArgs" "dieWithParent" "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" "privateTmp" - "pname" "version" ]); etcBindEntries = let @@ -270,8 +267,7 @@ let ''; bin = writeShellScript "${name}-bwrap" (bwrapCmd { initArgs = ''"$@"''; }); -in runCommandLocal name { - inherit pname version; +in runCommandLocal name (nameAttrs // { inherit meta; passthru = passthru // { @@ -285,9 +281,9 @@ in runCommandLocal name { ''; inherit args fhsenv; }; -} '' +}) '' mkdir -p $out/bin - ln -s ${bin} $out/bin/${pname} + ln -s ${bin} $out/bin/${executableName} ${extraInstallCommands} '' diff --git a/third_party/nixpkgs/pkgs/build-support/dlang/builddubpackage/default.nix b/third_party/nixpkgs/pkgs/build-support/dlang/builddubpackage/default.nix index 9295445b0f..31454d5cd6 100644 --- a/third_party/nixpkgs/pkgs/build-support/dlang/builddubpackage/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/dlang/builddubpackage/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchgit, linkFarm, dub, ldc, @@ -43,11 +44,27 @@ let }; }; - lockJson = if lib.isPath dubLock then lib.importJSON dubLock else dubLock; + makeGitDep = + { + pname, + version, + repository, + sha256, + }: + { + inherit pname version; + src = fetchgit { + url = repository; + rev = version; + inherit sha256; + }; + }; - lockedDeps = lib.mapAttrsToList ( - pname: { version, sha256 }: makeDubDep { inherit pname version sha256; } - ) lockJson.dependencies; + lockJson = if lib.isPath dubLock then lib.importJSON dubLock else dubLock; + depsRaw = lib.mapAttrsToList (pname: args: { inherit pname; } // args) lockJson.dependencies; + + dubDeps = map makeDubDep (lib.filter (args: !(args ? repository)) depsRaw); + gitDeps = map makeGitDep (lib.filter (args: args ? repository) depsRaw); # a directory with multiple single element registries # one big directory with all .zip files leads to version parsing errors @@ -56,7 +73,7 @@ let map (dep: { name = "${dep.pname}/${dep.pname}-${dep.version}.zip"; path = dep.src; - }) lockedDeps + }) dubDeps ); combinedFlags = "--skip-registry=all --compiler=${lib.getExe compiler} ${toString dubFlags}"; @@ -79,12 +96,18 @@ stdenv.mkDerivation ( runHook preConfigure export DUB_HOME="$NIX_BUILD_TOP/.dub" - mkdir -p $DUB_HOME + mkdir -p "$DUB_HOME" - # register dependencies + # register dub dependencies ${lib.concatMapStringsSep "\n" (dep: '' dub fetch ${dep.pname}@${dep.version} --cache=user --skip-registry=standard --registry=file://${dubRegistryBase}/${dep.pname} - '') lockedDeps} + '') dubDeps} + + # register git dependencies + ${lib.concatMapStringsSep "\n" (dep: '' + mkdir -p "$DUB_HOME/packages/${dep.pname}/${dep.version}" + cp -r --no-preserve=all ${dep.src} "$DUB_HOME/packages/${dep.pname}/${dep.version}/${dep.pname}" + '') gitDeps} runHook postConfigure ''; diff --git a/third_party/nixpkgs/pkgs/build-support/dlang/dub-to-nix/default.nix b/third_party/nixpkgs/pkgs/build-support/dlang/dub-to-nix/default.nix index 53a2e99c18..87db7eed09 100644 --- a/third_party/nixpkgs/pkgs/build-support/dlang/dub-to-nix/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/dlang/dub-to-nix/default.nix @@ -4,8 +4,15 @@ makeWrapper, python3, nix, + nix-prefetch-git, }: +let + binPath = lib.makeBinPath [ + nix + nix-prefetch-git + ]; +in runCommand "dub-to-nix" { nativeBuildInputs = [ makeWrapper ]; @@ -15,5 +22,5 @@ runCommand "dub-to-nix" install -Dm755 ${./dub-to-nix.py} "$out/bin/dub-to-nix" patchShebangs "$out/bin/dub-to-nix" wrapProgram "$out/bin/dub-to-nix" \ - --prefix PATH : ${lib.makeBinPath [ nix ]} + --prefix PATH : ${binPath} '' diff --git a/third_party/nixpkgs/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py b/third_party/nixpkgs/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py index 48a9f24134..fbb51960ad 100644 --- a/third_party/nixpkgs/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py +++ b/third_party/nixpkgs/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py @@ -4,10 +4,13 @@ import sys import json import os import subprocess +import string + def eprint(text: str): print(text, file=sys.stderr) + if not os.path.exists("dub.selections.json"): eprint("The file `dub.selections.json` does not exist in the current working directory") eprint("run `dub upgrade --annotate` to generate it") @@ -16,24 +19,53 @@ if not os.path.exists("dub.selections.json"): with open("dub.selections.json") as f: selectionsJson = json.load(f) -versionDict: dict[str, str] = selectionsJson["versions"] +depsDict: dict = selectionsJson["versions"] -for pname in versionDict: - version = versionDict[pname] +# For each dependency expand non-expanded version into a dict with a "version" key +depsDict = {pname: (versionOrDepDict if isinstance(versionOrDepDict, dict) else {"version": versionOrDepDict}) for (pname, versionOrDepDict) in depsDict.items()} + +# Don't process path-type selections +depsDict = {pname: depDict for (pname, depDict) in depsDict.items() if "path" not in depDict} + +# Pre-validate selections before trying to fetch +for pname in depsDict: + depDict = depsDict[pname] + version = depDict["version"] if version.startswith("~"): - eprint(f'Package "{pname}" has a branch-type version "{version}", which doesn\'t point to a fixed version') - eprint("You can resolve it by manually changing the required version to a fixed one inside `dub.selections.json`") - eprint("When packaging, you might need to create a patch for `dub.sdl` or `dub.json` to accept the changed version") + eprint(f'Expected version of "{pname}" to be non-branch type') + eprint(f'Found: "{version}"') + eprint("Please specify a non-branch version inside `dub.selections.json`") + eprint("When packaging, you might also need to patch the version value in the appropriate places (`dub.selections.json`, dub.sdl`, `dub.json`)") sys.exit(1) + if "repository" in depDict: + repository = depDict["repository"] + if not repository.startswith("git+"): + eprint(f'Expected repository field of "{pname}" to begin with "git+"') + eprint(f'Found: "{repository}"') + sys.exit(1) + if (len(version) < 7 or len(version) > 40 or not all(c in string.hexdigits for c in version)): + eprint(f'Expected version field of "{pname}" to begin be a valid git revision') + eprint(f'Found: "{version}"') + sys.exit(1) -lockedDependenciesDict: dict[str, dict[str, str]] = {} +lockedDepsDict: dict[str, dict[str, str]] = {} -for pname in versionDict: - version = versionDict[pname] - eprint(f"Fetching {pname}@{version}") - url = f"https://code.dlang.org/packages/{pname}/{version}.zip" - command = ["nix-prefetch-url", "--type", "sha256", url] - sha256 = subprocess.run(command, check=True, text=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL).stdout.rstrip() - lockedDependenciesDict[pname] = {"version": version, "sha256": sha256} +for pname in depsDict: + depDict = depsDict[pname] + version = depDict["version"] + if "repository" in depDict: + repository = depDict["repository"] + strippedRepo = repository[4:] + eprint(f"Fetching {pname}@{version} ({strippedRepo})") + command = ["nix-prefetch-git", strippedRepo, version] + rawRes = subprocess.run(command, check=True, text=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL).stdout + sha256 = json.loads(rawRes)["sha256"] + lockedDepsDict[pname] = {"version": version, "repository": repository, "sha256": sha256} + else: + eprint(f"Fetching {pname}@{version}") + url = f"https://code.dlang.org/packages/{pname}/{version}.zip" + command = ["nix-prefetch-url", "--type", "sha256", url] + sha256 = subprocess.run(command, check=True, text=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL).stdout.rstrip() + lockedDepsDict[pname] = {"version": version, "sha256": sha256} -print(json.dumps({"dependencies": lockedDependenciesDict}, indent=2)) +print(json.dumps({"dependencies": lockedDepsDict}, indent=2)) diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 15a753df07..4548616c7d 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -185,6 +185,10 @@ stdenvNoCC.mkDerivation (args // { inherit selfContainedBuild useAppHost useDotnetFromEnv; + # propagate the runtime sandbox profile since the contents apply to published + # executables + propagatedSandboxProfile = toString dotnet-runtime.__propagatedSandboxProfile; + passthru = { inherit nuget-source; } // lib.optionalAttrs (!lib.isDerivation nugetDeps) { @@ -316,8 +320,4 @@ stdenvNoCC.mkDerivation (args // { } // args.passthru or { }; meta = (args.meta or { }) // { inherit platforms; }; -} - # ICU tries to unconditionally load files from /usr/share/icu on Darwin, which makes builds fail - # in the sandbox, so disable ICU on Darwin. This, as far as I know, shouldn't cause any built packages - # to behave differently, just the dotnet build tool. - // lib.optionalAttrs stdenvNoCC.isDarwin { DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1; }) +}) diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git b/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git index 7ac3dec91f..0f41cbd6a2 100755 --- a/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git @@ -166,7 +166,7 @@ checkout_hash(){ clean_git fetch -t ${builder:+--progress} origin || return 1 local object_type=$(git cat-file -t "$hash") - if [[ "$object_type" == "commit" ]]; then + if [[ "$object_type" == "commit" || "$object_type" == "tag" ]]; then clean_git checkout -b "$branchName" "$hash" || return 1 elif [[ "$object_type" == "tree" ]]; then clean_git config user.email "nix-prefetch-git@localhost" diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgit/tests.nix b/third_party/nixpkgs/pkgs/build-support/fetchgit/tests.nix index 23e5fa2990..f3fcd9a578 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchgit/tests.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchgit/tests.nix @@ -72,4 +72,11 @@ leaveDotGit = true; fetchSubmodules = true; }; + + dumb-http-signed-tag = testers.invalidateFetcherByDrvHash fetchgit { + name = "dumb-http-signed-tag-source"; + url = "https://git.scottworley.com/pub/git/pinch"; + rev = "v3.0.14"; + sha256 = "sha256-bd0Lx75Gd1pcBJtwz5WGki7XoYSpqhinCT3a77wpY2c="; + }; } diff --git a/third_party/nixpkgs/pkgs/build-support/flutter/default.nix b/third_party/nixpkgs/pkgs/build-support/flutter/default.nix index 5d7cd7d984..2af03d5f98 100644 --- a/third_party/nixpkgs/pkgs/build-support/flutter/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/flutter/default.nix @@ -2,7 +2,7 @@ , callPackage , runCommand , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , buildDartApplication , cacert , glib @@ -86,7 +86,7 @@ let outputs = universal.outputs or [ ] ++ [ "debug" ]; nativeBuildInputs = (universal.nativeBuildInputs or [ ]) ++ [ - wrapGAppsHook + wrapGAppsHook3 # Flutter requires pkg-config for Linux desktop support, and many plugins # attempt to use it. diff --git a/third_party/nixpkgs/pkgs/build-support/go/module.nix b/third_party/nixpkgs/pkgs/build-support/go/module.nix index 6f568c0eb4..bc28fbf6fc 100644 --- a/third_party/nixpkgs/pkgs/build-support/go/module.nix +++ b/third_party/nixpkgs/pkgs/build-support/go/module.nix @@ -163,8 +163,10 @@ let inherit (go) GOOS GOARCH; GOFLAGS = GOFLAGS - ++ lib.optional (!proxyVendor) "-mod=vendor" - ++ lib.optional (!allowGoReference) "-trimpath"; + ++ lib.warnIf (lib.any (lib.hasPrefix "-mod=") GOFLAGS) "use `proxyVendor` to control Go module/vendor behavior instead of setting `-mod=` in GOFLAGS" + (lib.optional (!proxyVendor) "-mod=vendor") + ++ lib.warnIf (builtins.elem "-trimpath" GOFLAGS) "`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true" + (lib.optional (!allowGoReference) "-trimpath"); inherit CGO_ENABLED enableParallelBuilding GO111MODULE GOTOOLCHAIN; # If not set to an explicit value, set the buildid empty for reproducibility. @@ -196,7 +198,12 @@ let runHook postConfigure ''); - buildPhase = args.buildPhase or ('' + buildPhase = args.buildPhase or ( + lib.warnIf (buildFlags != "" || buildFlagsArray != "") + "`buildFlags`/`buildFlagsArray` are deprecated and will be removed in the 24.11 release. Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`" + lib.warnIf (builtins.elem "-buildid=" ldflags) + "`-buildid=` is set by default as ldflag by buildGoModule" + '' runHook preBuild exclude='\(/_\|examples\|Godeps\|testdata' @@ -313,9 +320,4 @@ let } // meta; }); in -lib.warnIf (buildFlags != "" || buildFlagsArray != "") - "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`" -lib.warnIf (builtins.elem "-buildid=" ldflags) "`-buildid=` is set by default as ldflag by buildGoModule" -lib.warnIf (builtins.elem "-trimpath" GOFLAGS) "`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true" -lib.warnIf (lib.any (lib.hasPrefix "-mod=") GOFLAGS) "use `proxyVendor` to control Go module/vendor behavior instead of setting `-mod=` in GOFLAGS" - package +package diff --git a/third_party/nixpkgs/pkgs/build-support/go/package.nix b/third_party/nixpkgs/pkgs/build-support/go/package.nix index 94a459c267..58a242a253 100644 --- a/third_party/nixpkgs/pkgs/build-support/go/package.nix +++ b/third_party/nixpkgs/pkgs/build-support/go/package.nix @@ -286,7 +286,7 @@ let }); in lib.warnIf (buildFlags != "" || buildFlagsArray != "") - "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`" + "`buildFlags`/`buildFlagsArray` are deprecated and will be removed in the 24.11 release. Use the `ldflags` and/or `tags` attributes instead" lib.warnIf (builtins.elem "-buildid=" ldflags) "`-buildid=` is set by default as ldflag by buildGoModule" lib.warnIf (builtins.elem "-trimpath" GOFLAGS) "`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true" package diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/compress-firmware-xz.nix b/third_party/nixpkgs/pkgs/build-support/kernel/compress-firmware-xz.nix deleted file mode 100644 index cb9ce7a713..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/kernel/compress-firmware-xz.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ runCommand, lib }: - -firmware: - -let - args = { - allowedRequisites = []; - } // lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; }; -in - -runCommand "${firmware.name}-xz" args '' - mkdir -p $out/lib - (cd ${firmware} && find lib/firmware -type d -print0) | - (cd $out && xargs -0 mkdir -v --) - (cd ${firmware} && find lib/firmware -type f -print0) | - (cd $out && xargs -0rtP "$NIX_BUILD_CORES" -n1 \ - sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --) - (cd ${firmware} && find lib/firmware -type l) | while read link; do - target="$(readlink "${firmware}/$link")" - if [ -f "${firmware}/$link" ]; then - ln -vs -- "''${target/^${firmware}/$out}.xz" "$out/$link.xz" - else - ln -vs -- "''${target/^${firmware}/$out}" "$out/$link" - fi - done - - echo "Checking for broken symlinks:" - find -L $out -type l -print -execdir false -- '{}' '+' -'' diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/compress-firmware.nix b/third_party/nixpkgs/pkgs/build-support/kernel/compress-firmware.nix new file mode 100644 index 0000000000..0949036d51 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/kernel/compress-firmware.nix @@ -0,0 +1,43 @@ +{ runCommand, lib, type ? "zstd", zstd }: + +firmware: + +let + compressor = { + xz = { + ext = "xz"; + nativeBuildInputs = [ ]; + cmd = file: target: ''xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${file}" > "${target}"''; + }; + zstd = { + ext = "zst"; + nativeBuildInputs = [ zstd ]; + cmd = file: target: ''zstd -T1 -19 --long --check -f "${file}" -o "${target}"''; + }; + }.${type} or (throw "Unsupported compressor type for firmware."); + + args = { + allowedRequisites = []; + inherit (compressor) nativeBuildInputs; + } // lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; }; +in + +runCommand "${firmware.name}-${type}" args '' + mkdir -p $out/lib + (cd ${firmware} && find lib/firmware -type d -print0) | + (cd $out && xargs -0 mkdir -v --) + (cd ${firmware} && find lib/firmware -type f -print0) | + (cd $out && xargs -0rtP "$NIX_BUILD_CORES" -n1 \ + sh -c '${compressor.cmd "${firmware}/$1" "$1.${compressor.ext}"}' --) + (cd ${firmware} && find lib/firmware -type l) | while read link; do + target="$(readlink "${firmware}/$link")" + if [ -f "${firmware}/$link" ]; then + ln -vs -- "''${target/^${firmware}/$out}.${compressor.ext}" "$out/$link.${compressor.ext}" + else + ln -vs -- "''${target/^${firmware}/$out}" "$out/$link" + fi + done + + echo "Checking for broken symlinks:" + find -L $out -type l -print -execdir false -- '{}' '+' +'' diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/modules-closure.sh b/third_party/nixpkgs/pkgs/build-support/kernel/modules-closure.sh index 5f61bac751..06eb5b0d0d 100644 --- a/third_party/nixpkgs/pkgs/build-support/kernel/modules-closure.sh +++ b/third_party/nixpkgs/pkgs/build-support/kernel/modules-closure.sh @@ -80,7 +80,7 @@ for module in $(< ~-/closure); do # of its output. modinfo -b $kernel --set-version "$version" -F firmware $module | grep -v '^name:' | while read -r i; do echo "firmware for $module: $i" - for name in "$i" "$i.xz" ""; do + for name in "$i" "$i.xz" "$i.zst" ""; do [ -z "$name" ] && echo "WARNING: missing firmware $i for module $module" if cp -v --parents --no-preserve=mode lib/firmware/$name "$out" 2>/dev/null; then break diff --git a/third_party/nixpkgs/pkgs/build-support/lib/meson.nix b/third_party/nixpkgs/pkgs/build-support/lib/meson.nix index 456c10fcb8..9ffc5b8c17 100644 --- a/third_party/nixpkgs/pkgs/build-support/lib/meson.nix +++ b/third_party/nixpkgs/pkgs/build-support/lib/meson.nix @@ -23,6 +23,10 @@ let [binaries] llvm-config = 'llvm-config-native' rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}'] + # Meson refuses to consider any CMake binary during cross compilation if it's + # not explicitly specified here, in the cross file. + # https://github.com/mesonbuild/meson/blob/0ed78cf6fa6d87c0738f67ae43525e661b50a8a2/mesonbuild/cmake/executor.py#L72 + cmake = 'cmake' ''; crossFlags = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.lock b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.lock index 8ba72a7b76..dcabca0aea 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.lock +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.lock @@ -4,18 +4,66 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] -name = "anyhow" -version = "1.0.75" +name = "anstream" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "async-channel" @@ -30,9 +78,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backoff" @@ -45,12 +93,6 @@ dependencies = [ "rand", ] -[[package]] -name = "base64" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - [[package]] name = "bitflags" version = "1.3.2" @@ -59,9 +101,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block-buffer" @@ -74,9 +116,15 @@ dependencies = [ [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "camino" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" [[package]] name = "castaway" @@ -86,12 +134,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" [[package]] name = "cfg-if" @@ -100,55 +145,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "concurrent-queue" -version = "2.3.0" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-common" @@ -162,9 +205,9 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.44" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" dependencies = [ "curl-sys", "libc", @@ -172,14 +215,14 @@ dependencies = [ "openssl-sys", "schannel", "socket2", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "curl-sys" -version = "0.4.68+curl-8.4.0" +version = "0.4.72+curl-8.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" +checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea" dependencies = [ "cc", "libc", @@ -187,9 +230,15 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "windows-sys", + "windows-sys 0.52.0", ] +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + [[package]] name = "digest" version = "0.10.7" @@ -202,31 +251,41 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] [[package]] name = "env_logger" -version = "0.10.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] name = "errno" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -246,9 +305,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fnv" @@ -258,24 +317,24 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -304,26 +363,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", "wasi", ] -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -338,9 +391,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -356,14 +409,12 @@ dependencies = [ ] [[package]] -name = "is-terminal" -version = "0.4.9" +name = "is_executable" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8" dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", + "winapi", ] [[package]] @@ -393,21 +444,21 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" dependencies = [ "cc", "libc", @@ -417,36 +468,39 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] -name = "memoffset" -version = "0.9.0" +name = "nix-nar" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "d5549158a8b179c4fcd06a19f4bcc557db60c9cbd6771add9563f46c8d0325b5" dependencies = [ - "autocfg", + "camino", + "is_executable", + "symlink", + "thiserror", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl-probe" @@ -456,9 +510,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.95" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -474,24 +528,24 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", @@ -500,15 +554,15 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "polling" @@ -523,7 +577,7 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -538,11 +592,12 @@ version = "0.1.0" dependencies = [ "anyhow", "backoff", - "base64", + "data-encoding", "digest", "env_logger", "isahc", "log", + "nix-nar", "rayon", "serde", "serde_json", @@ -555,18 +610,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -603,9 +658,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -613,28 +668,19 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -644,9 +690,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -655,28 +701,28 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -689,33 +735,27 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "serde" -version = "1.0.193" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", @@ -724,9 +764,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -777,19 +817,25 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] -name = "syn" -version = "2.0.39" +name = "symlink" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" + +[[package]] +name = "syn" +version = "2.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" dependencies = [ "proc-macro2", "quote", @@ -798,24 +844,34 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall", + "fastrand 2.0.2", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] -name = "termcolor" -version = "1.4.0" +name = "thiserror" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ - "winapi-util", + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -883,9 +939,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -895,18 +951,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -914,6 +970,12 @@ dependencies = [ "serde", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "vcpkg" version = "0.2.15" @@ -934,9 +996,9 @@ checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -985,7 +1047,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] @@ -994,13 +1065,29 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -1009,38 +1096,86 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.toml b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.toml index ea121c510c..dcb7e28a49 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.toml +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.toml @@ -6,18 +6,19 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.75" +anyhow = "1.0.82" backoff = "0.4.0" -base64 = "0.21.5" +data-encoding = "2.5.0" digest = "0.10.7" -env_logger = "0.10.1" +env_logger = "0.11.3" isahc = { version = "1.7.2", default_features = false } -log = "0.4.20" -rayon = "1.8.0" -serde = { version = "1.0.193", features = ["derive"] } -serde_json = "1.0.108" +log = "0.4.21" +nix-nar = "0.3.0" +rayon = "1.10.0" +serde = { version = "1.0.198", features = ["derive"] } +serde_json = "1.0.116" sha1 = "0.10.6" sha2 = "0.10.8" -tempfile = "3.8.1" -url = { version = "2.4.1", features = ["serde"] } -walkdir = "2.4.0" +tempfile = "3.10.1" +url = { version = "2.5.0", features = ["serde"] } +walkdir = "2.5.0" diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/default.nix b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/default.nix index 373d63cc59..d86fc90c6c 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, rustPlatform, makeWrapper, pkg-config, curl, gnutar, gzip, nix, testers, fetchurl, cacert, prefetch-npm-deps, fetchNpmDeps }: +{ lib, stdenvNoCC, rustPlatform, makeWrapper, pkg-config, curl, gnutar, gzip, testers, fetchurl, cacert, prefetch-npm-deps, fetchNpmDeps }: { prefetch-npm-deps = rustPlatform.buildRustPackage { @@ -20,7 +20,7 @@ buildInputs = [ curl ]; postInstall = '' - wrapProgram "$out/bin/prefetch-npm-deps" --prefix PATH : ${lib.makeBinPath [ gnutar gzip nix ]} + wrapProgram "$out/bin/prefetch-npm-deps" --prefix PATH : ${lib.makeBinPath [ gnutar gzip ]} ''; passthru.tests = diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs index c49c094b85..403c909dee 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs @@ -1,4 +1,4 @@ -use base64::prelude::{Engine, BASE64_STANDARD}; +use data_encoding::BASE64; use digest::{Digest, Update}; use serde::{Deserialize, Serialize}; use sha1::Sha1; @@ -11,6 +11,7 @@ use std::{ }; use url::Url; +#[allow(clippy::struct_field_names)] #[derive(Serialize, Deserialize)] pub(super) struct Key { pub(super) key: String, @@ -59,16 +60,18 @@ impl Cache { integrity: Option, ) -> anyhow::Result<()> { let (algo, hash, integrity) = if let Some(integrity) = integrity { - let (algo, hash) = integrity.split_once('-').unwrap(); + let (algo, hash) = integrity + .split_once('-') + .expect("hash should be SRI format"); - (algo.to_string(), BASE64_STANDARD.decode(hash)?, integrity) + (algo.to_string(), BASE64.decode(hash.as_bytes())?, integrity) } else { let hash = Sha512::new().chain(data).finalize(); ( String::from("sha512"), hash.to_vec(), - format!("sha512-{}", BASE64_STANDARD.encode(hash)), + format!("sha512-{}", BASE64.encode(&hash)), ) }; diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/main.rs index dc20c72970..cb06d32600 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -8,7 +8,7 @@ use std::{ collections::HashMap, env, fs, path::{Path, PathBuf}, - process::{self, Command}, + process, }; use tempfile::tempdir; use url::Url; @@ -266,10 +266,7 @@ fn main() -> anyhow::Result<()> { fs::write(out.join("package-lock.json"), lock_content)?; if print_hash { - Command::new("nix") - .args(["--experimental-features", "nix-command", "hash", "path"]) - .arg(out.as_os_str()) - .status()?; + println!("{}", util::make_sri_hash(out)?); } Ok(()) diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs index c6e77153a0..49bba8780c 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs @@ -179,7 +179,7 @@ impl fmt::Display for Hash { } } -#[allow(clippy::incorrect_partial_ord_impl_on_ord_type)] +#[allow(clippy::non_canonical_partial_ord_impl)] impl PartialOrd for Hash { fn partial_cmp(&self, other: &Hash) -> Option { let lhs = self.0.split_once('-')?.0; diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/util.rs b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/util.rs index 7dd928fdc4..023ba56793 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/util.rs +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/util.rs @@ -1,10 +1,18 @@ use backoff::{retry, ExponentialBackoff}; +use data_encoding::BASE64; +use digest::Digest; use isahc::{ config::{CaCertificate, Configurable, RedirectPolicy, SslOption}, Body, Request, RequestExt, }; +use nix_nar::{Encoder, NarError}; use serde_json::{Map, Value}; -use std::{env, io::Read, path::Path}; +use sha2::Sha256; +use std::{ + env, + io::{self, Read}, + path::Path, +}; use url::Url; pub fn get_url(url: &Url) -> Result { @@ -64,3 +72,12 @@ pub fn get_url_body_with_retry(url: &Url) -> Result, isahc::Error> { } => err, }) } + +pub fn make_sri_hash(path: &Path) -> Result { + let mut encoder = Encoder::new(path)?; + let mut hasher = Sha256::new(); + + io::copy(&mut encoder, &mut hasher)?; + + Ok(format!("sha256-{}", BASE64.encode(&hasher.finalize()))) +} diff --git a/third_party/nixpkgs/pkgs/build-support/php/build-composer-project.nix b/third_party/nixpkgs/pkgs/build-support/php/build-composer-project.nix deleted file mode 100644 index 80c63bcde7..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/php/build-composer-project.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ callPackage, stdenvNoCC, lib, writeTextDir, php, makeBinaryWrapper, fetchFromGitHub, fetchurl }: - -let - buildComposerProjectOverride = finalAttrs: previousAttrs: - - let - phpDrv = finalAttrs.php or php; - composer = finalAttrs.composer or phpDrv.packages.composer; - composer-local-repo-plugin = callPackage ./pkgs/composer-local-repo-plugin.nix { }; - in - { - composerLock = previousAttrs.composerLock or null; - composerNoDev = previousAttrs.composerNoDev or true; - composerNoPlugins = previousAttrs.composerNoPlugins or true; - composerNoScripts = previousAttrs.composerNoScripts or true; - composerStrictValidation = previousAttrs.composerStrictValidation or true; - - nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ - composer - composer-local-repo-plugin - phpDrv - phpDrv.composerHooks.composerInstallHook - ]; - - buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ - phpDrv - ]; - - patches = previousAttrs.patches or [ ]; - strictDeps = previousAttrs.strictDeps or true; - - # Should we keep these empty phases? - configurePhase = previousAttrs.configurePhase or '' - runHook preConfigure - - runHook postConfigure - ''; - - buildPhase = previousAttrs.buildPhase or '' - runHook preBuild - - runHook postBuild - ''; - - doCheck = previousAttrs.doCheck or true; - checkPhase = previousAttrs.checkPhase or '' - runHook preCheck - - runHook postCheck - ''; - - installPhase = previousAttrs.installPhase or '' - runHook preInstall - - runHook postInstall - ''; - - doInstallCheck = previousAttrs.doInstallCheck or false; - installCheckPhase = previousAttrs.installCheckPhase or '' - runHook preInstallCheck - - runHook postInstallCheck - ''; - - composerRepository = phpDrv.mkComposerRepository { - inherit composer composer-local-repo-plugin; - inherit (finalAttrs) patches pname src vendorHash version; - - composerLock = previousAttrs.composerLock or null; - composerNoDev = previousAttrs.composerNoDev or true; - composerNoPlugins = previousAttrs.composerNoPlugins or true; - composerNoScripts = previousAttrs.composerNoScripts or true; - composerStrictValidation = previousAttrs.composerStrictValidation or true; - }; - - COMPOSER_CACHE_DIR="/dev/null"; - COMPOSER_DISABLE_NETWORK="1"; - COMPOSER_MIRROR_PATH_REPOS="1"; - - meta = previousAttrs.meta or { } // { - platforms = lib.platforms.all; - }; - }; -in -args: (stdenvNoCC.mkDerivation args).overrideAttrs buildComposerProjectOverride diff --git a/third_party/nixpkgs/pkgs/build-support/php/build-pecl.nix b/third_party/nixpkgs/pkgs/build-support/php/build-pecl.nix index 6f38a668f3..16913a85c6 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/build-pecl.nix +++ b/third_party/nixpkgs/pkgs/build-support/php/build-pecl.nix @@ -1,45 +1,69 @@ -{ stdenv, lib, php, autoreconfHook, fetchurl, re2c, nix-update-script }: +{ + stdenv, + lib, + php, + autoreconfHook, + fetchurl, + re2c, + nix-update-script, +}: -{ pname -, version -, internalDeps ? [ ] -, peclDeps ? [ ] -, buildInputs ? [ ] -, nativeBuildInputs ? [ ] -, postPhpize ? "" -, makeFlags ? [ ] -, src ? fetchurl ({ - url = "https://pecl.php.net/get/${pname}-${version}.tgz"; - } // lib.filterAttrs (attrName: _: lib.elem attrName [ "sha256" "hash" ]) args) -, passthru ? { } -, ... +{ + pname, + version, + internalDeps ? [ ], + peclDeps ? [ ], + buildInputs ? [ ], + nativeBuildInputs ? [ ], + postPhpize ? "", + makeFlags ? [ ], + src ? fetchurl ( + { + url = "https://pecl.php.net/get/${pname}-${version}.tgz"; + } + // lib.filterAttrs ( + attrName: _: + lib.elem attrName [ + "sha256" + "hash" + ] + ) args + ), + passthru ? { }, + ... }@args: -stdenv.mkDerivation (args // { - name = "php-${pname}-${version}"; - extensionName = pname; +stdenv.mkDerivation ( + args + // { + name = "php-${pname}-${version}"; + extensionName = pname; - inherit src; + inherit src; - nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; - buildInputs = [ php ] ++ peclDeps ++ buildInputs; + nativeBuildInputs = [ + autoreconfHook + re2c + ] ++ nativeBuildInputs; + buildInputs = [ php ] ++ peclDeps ++ buildInputs; - makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; + makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; - autoreconfPhase = '' - phpize - ${postPhpize} - ${lib.concatMapStringsSep "\n" - (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") - internalDeps} - ''; - checkPhase = "NO_INTERACTON=yes make test"; + autoreconfPhase = '' + phpize + ${postPhpize} + ${lib.concatMapStringsSep "\n" ( + dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}" + ) internalDeps} + ''; + checkPhase = "NO_INTERACTON=yes make test"; - passthru = passthru // { - # Thes flags were introduced for `nix-update` so that it can update - # PHP extensions correctly. - # See the corresponding PR: https://github.com/Mic92/nix-update/pull/123 - isPhpExtension = true; - updateScript = nix-update-script {}; - }; -}) + passthru = passthru // { + # Thes flags were introduced for `nix-update` so that it can update + # PHP extensions correctly. + # See the corresponding PR: https://github.com/Mic92/nix-update/pull/123 + isPhpExtension = true; + updateScript = nix-update-script { }; + }; + } +) diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/default.nix b/third_party/nixpkgs/pkgs/build-support/php/builders/default.nix new file mode 100644 index 0000000000..209c834367 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/default.nix @@ -0,0 +1,8 @@ +{ callPackage, callPackages, ... }: +{ + v1 = { + buildComposerProject = callPackage ./v1/build-composer-project.nix { }; + mkComposerRepository = callPackage ./v1/build-composer-repository.nix { }; + composerHooks = callPackages ./v1/hooks { }; + }; +} diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-project.nix b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-project.nix new file mode 100644 index 0000000000..7e24812d2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-project.nix @@ -0,0 +1,111 @@ +{ + callPackage, + nix-update-script, + stdenvNoCC, + lib, + php, +}: + +let + buildComposerProjectOverride = + finalAttrs: previousAttrs: + + let + phpDrv = finalAttrs.php or php; + composer = finalAttrs.composer or phpDrv.packages.composer; + composer-local-repo-plugin = callPackage ../../pkgs/composer-local-repo-plugin.nix { }; + in + { + composerLock = previousAttrs.composerLock or null; + composerNoDev = previousAttrs.composerNoDev or true; + composerNoPlugins = previousAttrs.composerNoPlugins or true; + composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; + + nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ + composer + composer-local-repo-plugin + phpDrv + phpDrv.composerHooks.composerInstallHook + ]; + + buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ phpDrv ]; + + patches = previousAttrs.patches or [ ]; + strictDeps = previousAttrs.strictDeps or true; + + # Should we keep these empty phases? + configurePhase = + previousAttrs.configurePhase or '' + runHook preConfigure + + runHook postConfigure + ''; + + buildPhase = + previousAttrs.buildPhase or '' + runHook preBuild + + runHook postBuild + ''; + + doCheck = previousAttrs.doCheck or true; + checkPhase = + previousAttrs.checkPhase or '' + runHook preCheck + + runHook postCheck + ''; + + installPhase = + previousAttrs.installPhase or '' + runHook preInstall + + runHook postInstall + ''; + + doInstallCheck = previousAttrs.doInstallCheck or false; + installCheckPhase = + previousAttrs.installCheckPhase or '' + runHook preInstallCheck + + runHook postInstallCheck + ''; + + composerRepository = + previousAttrs.composerRepository or (phpDrv.mkComposerRepository { + inherit composer composer-local-repo-plugin; + inherit (finalAttrs) + patches + pname + src + vendorHash + version + ; + + composerLock = previousAttrs.composerLock or null; + composerNoDev = previousAttrs.composerNoDev or true; + composerNoPlugins = previousAttrs.composerNoPlugins or true; + composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; + }); + + # Projects providing a lockfile from upstream can be automatically updated. + passthru = previousAttrs.passthru or { } // { + updateScript = + previousAttrs.passthru.updateScript + or (if finalAttrs.composerRepository.composerLock == null then nix-update-script { } else null); + }; + + env = { + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_DISABLE_NETWORK = "1"; + COMPOSER_MIRROR_PATH_REPOS = "1"; + }; + + meta = previousAttrs.meta or { } // { + platforms = lib.platforms.all; + }; + }; +in +args: (stdenvNoCC.mkDerivation args).overrideAttrs buildComposerProjectOverride diff --git a/third_party/nixpkgs/pkgs/build-support/php/build-composer-repository.nix b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-repository.nix similarity index 53% rename from third_party/nixpkgs/pkgs/build-support/php/build-composer-repository.nix rename to third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-repository.nix index e359c0829a..54944b91d2 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/build-composer-repository.nix +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/build-composer-repository.nix @@ -1,4 +1,9 @@ -{ callPackage, stdenvNoCC, lib, writeTextDir, fetchFromGitHub, php }: +{ + callPackage, + stdenvNoCC, + lib, + php, +}: let mkComposerRepositoryOverride = @@ -19,15 +24,27 @@ let let phpDrv = finalAttrs.php or php; composer = finalAttrs.composer or phpDrv.packages.composer; - composer-local-repo-plugin = callPackage ./pkgs/composer-local-repo-plugin.nix { }; + composer-local-repo-plugin = callPackage ../../pkgs/composer-local-repo-plugin.nix { }; in assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument."); - assert (lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument."); + assert ( + lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument." + ); assert (lib.assertMsg (previousAttrs ? version) "mkComposerRepository expects version argument."); assert (lib.assertMsg (previousAttrs ? pname) "mkComposerRepository expects pname argument."); - assert (lib.assertMsg (previousAttrs ? composerNoDev) "mkComposerRepository expects composerNoDev argument."); - assert (lib.assertMsg (previousAttrs ? composerNoPlugins) "mkComposerRepository expects composerNoPlugins argument."); - assert (lib.assertMsg (previousAttrs ? composerNoScripts) "mkComposerRepository expects composerNoScripts argument."); + assert ( + lib.assertMsg (previousAttrs ? composerNoDev) "mkComposerRepository expects composerNoDev argument." + ); + assert ( + lib.assertMsg ( + previousAttrs ? composerNoPlugins + ) "mkComposerRepository expects composerNoPlugins argument." + ); + assert ( + lib.assertMsg ( + previousAttrs ? composerNoScripts + ) "mkComposerRepository expects composerNoScripts argument." + ); { composerNoDev = previousAttrs.composerNoDev or true; composerNoPlugins = previousAttrs.composerNoPlugins or true; @@ -51,45 +68,53 @@ let strictDeps = previousAttrs.strictDeps or true; # Should we keep these empty phases? - configurePhase = previousAttrs.configurePhase or '' - runHook preConfigure + configurePhase = + previousAttrs.configurePhase or '' + runHook preConfigure - runHook postConfigure - ''; + runHook postConfigure + ''; - buildPhase = previousAttrs.buildPhase or '' - runHook preBuild + buildPhase = + previousAttrs.buildPhase or '' + runHook preBuild - runHook postBuild - ''; + runHook postBuild + ''; doCheck = previousAttrs.doCheck or true; - checkPhase = previousAttrs.checkPhase or '' - runHook preCheck + checkPhase = + previousAttrs.checkPhase or '' + runHook preCheck - runHook postCheck - ''; + runHook postCheck + ''; - installPhase = previousAttrs.installPhase or '' - runHook preInstall + installPhase = + previousAttrs.installPhase or '' + runHook preInstall - runHook postInstall - ''; + runHook postInstall + ''; doInstallCheck = previousAttrs.doInstallCheck or false; - installCheckPhase = previousAttrs.installCheckPhase or '' - runHook preInstallCheck + installCheckPhase = + previousAttrs.installCheckPhase or '' + runHook preInstallCheck - runHook postInstallCheck - ''; + runHook postInstallCheck + ''; - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - COMPOSER_HTACCESS_PROTECT = "0"; - COMPOSER_DISABLE_NETWORK = "0"; + env = { + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_MIRROR_PATH_REPOS = "1"; + COMPOSER_HTACCESS_PROTECT = "0"; + COMPOSER_DISABLE_NETWORK = "0"; + }; outputHashMode = "recursive"; - outputHashAlgo = if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; + outputHashAlgo = + if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; outputHash = finalAttrs.vendorHash or ""; }; in diff --git a/third_party/nixpkgs/pkgs/build-support/php/hooks/composer-install-hook.sh b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh similarity index 94% rename from third_party/nixpkgs/pkgs/build-support/php/hooks/composer-install-hook.sh rename to third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh index edba0e5eec..a91263422b 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh @@ -27,9 +27,9 @@ composerInstallConfigureHook() { setComposeRootVersion composer \ - --no-ansi \ --no-install \ --no-interaction \ + --no-progress \ ${composerNoDev:+--no-dev} \ ${composerNoPlugins:+--no-plugins} \ ${composerNoScripts:+--no-scripts} \ @@ -104,8 +104,8 @@ composerInstallInstallHook() { # Finally, run `composer install` to install the dependencies and generate # the autoloader. composer \ - --no-ansi \ --no-interaction \ + --no-progress \ ${composerNoDev:+--no-dev} \ ${composerNoPlugins:+--no-plugins} \ ${composerNoScripts:+--no-scripts} \ @@ -117,8 +117,9 @@ composerInstallInstallHook() { # Create symlinks for the binaries. jq -r -c 'try (.bin[] | select(test(".bat$")? | not) )' composer.json | while read -r bin; do - mkdir -p "$out"/share/php/"${pname}" "$out"/bin - makeWrapper "$out"/share/php/"${pname}"/"$bin" "$out"/bin/"$(basename "$bin")" + echo -e "\e[32mCreating symlink ${bin}...\e[0m" + mkdir -p "$out"/bin + ln -s "$out"/share/php/"${pname}"/"$bin" "$out"/bin/"$(basename "$bin")" done echo "Finished composerInstallInstallHook" diff --git a/third_party/nixpkgs/pkgs/build-support/php/hooks/composer-repository-hook.sh b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh similarity index 98% rename from third_party/nixpkgs/pkgs/build-support/php/hooks/composer-repository-hook.sh rename to third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh index 762e762761..c4fa0d5212 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/hooks/composer-repository-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh @@ -23,9 +23,9 @@ composerRepositoryConfigureHook() { setComposeRootVersion composer \ - --no-ansi \ --no-install \ --no-interaction \ + --no-progress \ ${composerNoDev:+--no-dev} \ ${composerNoPlugins:+--no-plugins} \ ${composerNoScripts:+--no-scripts} \ diff --git a/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/default.nix b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/default.nix new file mode 100644 index 0000000000..4c0ba1b188 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/default.nix @@ -0,0 +1,45 @@ +{ + lib, + makeSetupHook, + jq, + writeShellApplication, + moreutils, + cacert, + buildPackages, +}: + +let + php-script-utils = writeShellApplication { + name = "php-script-utils"; + runtimeInputs = [ jq ]; + text = builtins.readFile ./php-script-utils.bash; + }; +in +{ + composerRepositoryHook = makeSetupHook { + name = "composer-repository-hook.sh"; + propagatedBuildInputs = [ + jq + moreutils + cacert + ]; + substitutions = { + phpScriptUtils = lib.getExe php-script-utils; + }; + } ./composer-repository-hook.sh; + + composerInstallHook = makeSetupHook { + name = "composer-install-hook.sh"; + propagatedBuildInputs = [ + jq + moreutils + cacert + ]; + substitutions = { + # Specify the stdenv's `diff` by abspath to ensure that the user's build + # inputs do not cause us to find the wrong `diff`. + cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; + phpScriptUtils = lib.getExe php-script-utils; + }; + } ./composer-install-hook.sh; +} diff --git a/third_party/nixpkgs/pkgs/build-support/php/hooks/php-script-utils.bash b/third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash similarity index 100% rename from third_party/nixpkgs/pkgs/build-support/php/hooks/php-script-utils.bash rename to third_party/nixpkgs/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash diff --git a/third_party/nixpkgs/pkgs/build-support/php/hooks/default.nix b/third_party/nixpkgs/pkgs/build-support/php/hooks/default.nix deleted file mode 100644 index 98e81c88f9..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/php/hooks/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, makeSetupHook -, diffutils -, jq -, writeShellApplication -, moreutils -, makeBinaryWrapper -, cacert -, buildPackages -}: - -let - php-script-utils = writeShellApplication { - name = "php-script-utils"; - runtimeInputs = [ jq ]; - text = builtins.readFile ./php-script-utils.bash; - }; -in -{ - composerRepositoryHook = makeSetupHook - { - name = "composer-repository-hook.sh"; - propagatedBuildInputs = [ jq moreutils cacert ]; - substitutions = { - phpScriptUtils = lib.getExe php-script-utils; - }; - } ./composer-repository-hook.sh; - - composerInstallHook = makeSetupHook - { - name = "composer-install-hook.sh"; - propagatedBuildInputs = [ jq makeBinaryWrapper moreutils cacert ]; - substitutions = { - # Specify the stdenv's `diff` by abspath to ensure that the user's build - # inputs do not cause us to find the wrong `diff`. - cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; - phpScriptUtils = lib.getExe php-script-utils; - }; - } ./composer-install-hook.sh; -} diff --git a/third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix b/third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix index bfdc3d4f98..601640b6f0 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix +++ b/third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix @@ -1,9 +1,14 @@ -{ php, callPackage, stdenvNoCC, lib, fetchFromGitHub, makeBinaryWrapper }: +{ + php, + callPackage, + stdenvNoCC, + lib, + fetchFromGitHub, + makeBinaryWrapper, +}: let - composer = callPackage ./composer-phar.nix { - inherit (php.packages.composer) version pharHash; - }; + composer = callPackage ./composer-phar.nix { inherit (php.packages.composer) version pharHash; }; composerKeys = stdenvNoCC.mkDerivation (finalComposerKeysAttrs: { pname = "composer-keys"; @@ -38,18 +43,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-edbn07r/Uc1g0qOuVBZBs6N1bMN5kIfA1b4FCufdw5M="; }; - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - COMPOSER_HTACCESS_PROTECT = "0"; - COMPOSER_DISABLE_NETWORK = "1"; + env = { + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_MIRROR_PATH_REPOS = "1"; + COMPOSER_HTACCESS_PROTECT = "0"; + COMPOSER_DISABLE_NETWORK = "1"; + }; - nativeBuildInputs = [ - makeBinaryWrapper - ]; + nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = [ - composer - ]; + buildInputs = [ composer ]; configurePhase = '' runHook preConfigure diff --git a/third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-phar.nix b/third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-phar.nix index f281334ab2..d278810091 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-phar.nix +++ b/third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-phar.nix @@ -1,17 +1,17 @@ { - _7zz - , cacert - , curl - , fetchurl - , git - , lib - , makeBinaryWrapper - , php - , stdenvNoCC - , unzip - , xz - , version - , pharHash + _7zz, + cacert, + curl, + fetchurl, + git, + lib, + makeBinaryWrapper, + php, + stdenvNoCC, + unzip, + xz, + version, + pharHash, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -32,9 +32,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir -p $out/bin install -D $src $out/libexec/composer/composer.phar - makeWrapper ${php}/bin/php $out/bin/composer \ + makeWrapper ${lib.getExe php} $out/bin/composer \ --add-flags "$out/libexec/composer/composer.phar" \ - --prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]} + --prefix PATH : ${ + lib.makeBinPath [ + _7zz + cacert + curl + git + unzip + xz + ] + } runHook postInstall ''; @@ -44,6 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Dependency Manager for PHP, shipped from the PHAR file"; homepage = "https://getcomposer.org/"; license = lib.licenses.mit; + mainProgram = "composer"; maintainers = with lib.maintainers; [ drupol ]; platforms = lib.platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix index cd90c68c79..36e0408cc1 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix @@ -156,9 +156,9 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg # Platforms without host tools from # https://doc.rust-lang.org/nightly/rustc/platform-support.html "armv7a-darwin" - "armv5tel-linux" "armv7a-linux" "m68k-linux" "mipsel-linux" - "mips64el-linux" "riscv32-linux" - "armv6l-netbsd" + "armv5tel-linux" "armv7a-linux" "m68k-linux" "mips-linux" + "mips64-linux" "mipsel-linux" "mips64el-linux" "riscv32-linux" + "armv6l-netbsd" "mipsel-netbsd" "riscv64-netbsd" "x86_64-redox" "wasm32-wasi" ]; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh index ed982c7ff3..0ac9bf51a8 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -25,7 +25,14 @@ cargoBuildHook() { fi if [ -n "${cargoBuildFeatures-}" ]; then - cargoBuildFeaturesFlag="--features=${cargoBuildFeatures// /,}" + if [ -n "$__structuredAttrs" ]; then + OLDIFS="$IFS" + IFS=','; cargoBuildFeaturesFlag="--features=${cargoBuildFeatures[*]}" + IFS="$OLDIFS" + unset OLDIFS + else + cargoBuildFeaturesFlag="--features=${cargoBuildFeatures// /,}" + fi fi ( diff --git a/third_party/nixpkgs/pkgs/build-support/rust/replace-workspace-values.py b/third_party/nixpkgs/pkgs/build-support/rust/replace-workspace-values.py index 2b88f1fa79..003023ff25 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/replace-workspace-values.py +++ b/third_party/nixpkgs/pkgs/build-support/rust/replace-workspace-values.py @@ -15,6 +15,9 @@ def load_file(path: str) -> dict[str, Any]: return tomli.load(f) +# This replicates the dependency merging logic from Cargo. +# See `inner_dependency_inherit_with`: +# https://github.com/rust-lang/cargo/blob/4de0094ac78743d2c8ff682489e35c8a7cafe8e4/src/cargo/util/toml/mod.rs#L982 def replace_key( workspace_manifest: dict[str, Any], table: dict[str, Any], section: str, key: str ) -> bool: @@ -25,28 +28,37 @@ def replace_key( ): print("replacing " + key) - replaced = table[key] - del replaced["workspace"] + local_dep = table[key] + del local_dep["workspace"] - workspace_copy = workspace_manifest[section][key] + workspace_dep = workspace_manifest[section][key] if section == "dependencies": - crate_features = replaced.get("features") + if isinstance(workspace_dep, str): + workspace_dep = {"version": workspace_dep} - if type(workspace_copy) is str: - replaced["version"] = workspace_copy - else: - replaced.update(workspace_copy) + final: dict[str, Any] = workspace_dep.copy() - merged_features = (crate_features or []) + ( - workspace_copy.get("features") or [] - ) + merged_features = local_dep.pop("features", []) + workspace_dep.get("features", []) + if merged_features: + final["features"] = merged_features - if len(merged_features) > 0: - # Dictionaries are guaranteed to be ordered (https://stackoverflow.com/a/7961425) - replaced["features"] = list(dict.fromkeys(merged_features)) + local_default_features = local_dep.pop("default-features", None) + workspace_default_features = workspace_dep.get("default-features") + + if not workspace_default_features and local_default_features: + final["default-features"] = True + + optional = local_dep.pop("optional", False) + if optional: + final["optional"] = True + + if local_dep: + raise Exception(f"Unhandled keys in inherited dependency {key}: {local_dep}") + + table[key] = final elif section == "package": - table[key] = replaced = workspace_copy + table[key] = workspace_dep return True diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/third_party/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix index 3c5199be31..69f9f3b145 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix @@ -3,12 +3,12 @@ , makeSetupHook , makeWrapper , gobject-introspection -, isGraphical ? true +, isGraphical ? false , gtk3 , librsvg , dconf , callPackage -, wrapGAppsHook +, wrapGAppsHook3 , targetPackages }: @@ -24,9 +24,9 @@ makeSetupHook { librsvg ]; - # depsTargetTargetPropagated will essentially be buildInputs when wrapGAppsHook is placed into nativeBuildInputs + # depsTargetTargetPropagated will essentially be buildInputs when wrapGAppsHook3 is placed into nativeBuildInputs # the librsvg and gtk3 above should be removed but kept to not break anything that implicitly depended on its binaries - depsTargetTargetPropagated = assert (lib.assertMsg (!targetPackages ? raw) "wrapGAppsHook must be in nativeBuildInputs"); lib.optionals isGraphical [ + depsTargetTargetPropagated = assert (lib.assertMsg (!targetPackages ? raw) "wrapGAppsHook3 must be in nativeBuildInputs"); lib.optionals isGraphical [ # librsvg provides a module for gdk-pixbuf to allow rendering # SVG icons. Most icon themes are SVG-based and so are some # graphics in GTK (e.g. cross for closing window in window title bar) @@ -59,7 +59,7 @@ makeSetupHook { src = sample-project; strictDeps = true; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; installFlags = [ "bin-foo" "libexec-bar" ]; }; @@ -103,7 +103,7 @@ makeSetupHook { strictDeps = true; nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -150,7 +150,7 @@ makeSetupHook { strictDeps = true; nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -181,7 +181,7 @@ makeSetupHook { strictDeps = true; nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; installFlags = [ "typelib-Cow" "bin-foo" "libexec-bar" ]; diff --git a/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModules/tester.nix b/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModules/tester.nix index bbcc4f0c0f..b8ae884ba7 100644 --- a/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModules/tester.nix +++ b/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModules/tester.nix @@ -5,12 +5,14 @@ { package, moduleNames ? package.meta.pkgConfigModules, testName ? "check-pkg-config-${lib.concatStringsSep "-" moduleNames}", + version ? package.version or null, + versionCheck ? false, }: runCommand testName { nativeBuildInputs = [ pkg-config ]; buildInputs = [ package ]; - inherit moduleNames; + inherit moduleNames version versionCheck; meta = { description = "Test whether ${package.name} exposes pkg-config modules ${lib.concatStringsSep ", " moduleNames}."; } @@ -31,20 +33,38 @@ runCommand testName { package.meta; } '' touch "$out" + notFound=0 + versionMismatch=0 for moduleName in $moduleNames; do echo "checking pkg-config module $moduleName in $buildInputs" set +e - version="$($PKG_CONFIG --modversion $moduleName)" + moduleVersion="$($PKG_CONFIG --modversion $moduleName)" r=$? set -e if [[ $r = 0 ]]; then - echo "✅ pkg-config module $moduleName exists and has version $version" + if [[ "$moduleVersion" == "$version" ]]; then + echo "✅ pkg-config module $moduleName exists and has version $moduleVersion" + else + echo "❌ pkg-config module $moduleName exists and has version $moduleVersion when $version was expected" + ((versionMismatch+=1)) + fi printf '%s\t%s\n' "$moduleName" "$version" >> "$out" else - echo "These modules were available in the input propagation closure:" - $PKG_CONFIG --list-all echo "❌ pkg-config module $moduleName was not found" - false + ((notFound+=1)) fi done + + if [[ $notFound -eq 0 ]] && ([[ $versionMismatch -eq 0 ]] || [[ "$versionCheck" == false ]]); then + exit 0 + fi + if [[ $notFound -ne 0 ]]; then + echo "$notFound modules not found" + echo "These modules were available in the input propagation closure:" + $PKG_CONFIG --list-all + fi + if [[ $versionMismatch -ne 0 ]]; then + echo "$versionMismatch version mismatches" + fi + exit 1 '' diff --git a/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModules/tests.nix b/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModules/tests.nix index 96569498fb..bf992d040b 100644 --- a/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModules/tests.nix +++ b/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModules/tests.nix @@ -1,9 +1,20 @@ # cd nixpkgs -# nix-build -A tests.testers.hasPkgConfigModule -{ lib, testers, zlib, openssl, runCommand }: +# nix-build -A tests.testers.hasPkgConfigModules +{ lib, testers, miniz, zlib, openssl, runCommand }: lib.recurseIntoAttrs { + miniz-versions-match = testers.hasPkgConfigModules { + package = miniz; + versionCheck = true; + }; + + miniz-versions-mismatch = testers.testBuildFailure (testers.hasPkgConfigModules { + package = miniz; + version = "1.2.3"; + versionCheck = true; + }); + zlib-has-zlib = testers.hasPkgConfigModules { package = zlib; moduleNames = [ "zlib" ]; diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix index d7438923a5..1625b0c967 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix @@ -233,6 +233,12 @@ rec { Type: [String] */ excludeShellChecks ? [ ], + /* + Extra command-line flags to pass to ShellCheck. + + Type: [String] + */ + extraShellCheckFlags ? [ ], /* Bash options to activate with `set -o` at the start of the script. @@ -282,11 +288,11 @@ rec { # but we still want to use writeShellApplication on those platforms let shellcheckSupported = lib.meta.availableOn stdenv.buildPlatform shellcheck-minimal.compiler; - excludeOption = lib.optionalString (excludeShellChecks != [ ]) "--exclude '${lib.concatStringsSep "," excludeShellChecks}'"; + excludeFlags = lib.optionals (excludeShellChecks != [ ]) [ "--exclude" (lib.concatStringsSep "," excludeShellChecks) ]; shellcheckCommand = lib.optionalString shellcheckSupported '' # use shellcheck which does not include docs # pandoc takes long to build and documentation isn't needed for just running the cli - ${lib.getExe shellcheck-minimal} ${excludeOption} "$target" + ${lib.getExe shellcheck-minimal} ${lib.escapeShellArgs (excludeFlags ++ extraShellCheckFlags)} "$target" ''; in if checkPhase == null then '' diff --git a/third_party/nixpkgs/pkgs/build-support/vm/default.nix b/third_party/nixpkgs/pkgs/build-support/vm/default.nix index 5637585178..871f81bb5d 100644 --- a/third_party/nixpkgs/pkgs/build-support/vm/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/vm/default.nix @@ -40,10 +40,14 @@ rec { ${pkgs.stdenv.cc.libc}/lib/libc.so.* \ ${pkgs.stdenv.cc.libc}/lib/libm.so.* \ ${pkgs.stdenv.cc.libc}/lib/libresolv.so.* \ + ${pkgs.stdenv.cc.libc}/lib/libpthread.so.* \ + ${pkgs.zstd.out}/lib/libzstd.so.* \ + ${pkgs.xz.out}/lib/liblzma.so.* \ $out/lib # Copy BusyBox. cp -pd ${pkgs.busybox}/bin/* $out/bin + cp -pd ${pkgs.kmod}/bin/* $out/bin # Run patchelf to make the programs refer to the copied libraries. for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs $i; fi; done @@ -54,6 +58,11 @@ rec { patchelf --set-interpreter $out/lib/ld-*.so.? --set-rpath $out/lib $i || true fi done + + find $out/lib -type f \! -name 'ld*.so.?' | while read i; do + echo "patching $i..." + patchelf --set-rpath $out/lib $i + done ''; # */ diff --git a/third_party/nixpkgs/pkgs/by-name/_0/_0xpropo/package.nix b/third_party/nixpkgs/pkgs/by-name/_0/_0xpropo/package.nix index 74bf73cf93..200e9758f7 100644 --- a/third_party/nixpkgs/pkgs/by-name/_0/_0xpropo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/_0/_0xpropo/package.nix @@ -5,14 +5,14 @@ }: stdenvNoCC.mkDerivation rec { pname = "0xpropo"; - version = "1.000"; + version = "1.100"; src = let underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in fetchzip { url = "https://github.com/0xType/0xPropo/releases/download/${version}/0xPropo_${underscoreVersion}.zip"; - hash = "sha256-yIhabwHjBipkcmsSRaokBXCbawQkUNOU8v+fbn2iiY4="; + hash = "sha256-ZlZNvn9xiOxS+dfGI1rGbh6XlXo3/puAm2vhKh63sK4="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/4d/4d-minesweeper/package.nix b/third_party/nixpkgs/pkgs/by-name/_4/_4d-minesweeper/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/by-name/4d/4d-minesweeper/package.nix rename to third_party/nixpkgs/pkgs/by-name/_4/_4d-minesweeper/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/_6/_64gram/package.nix b/third_party/nixpkgs/pkgs/by-name/_6/_64gram/package.nix index 8db36cf9ab..0cf62f11f3 100644 --- a/third_party/nixpkgs/pkgs/by-name/_6/_64gram/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/_6/_64gram/package.nix @@ -7,7 +7,7 @@ telegram-desktop.overrideAttrs (old: rec { pname = "64gram"; - version = "1.1.19"; + version = "1.1.22"; src = fetchFromGitHub { owner = "TDesktop-x64"; @@ -15,7 +15,7 @@ telegram-desktop.overrideAttrs (old: rec { rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-9QCh7/eNPWqsOF+cjO61EnqqhAdy6+4UxZhWjfJc5gQ="; + hash = "sha256-Fhix+kCqUTr9qGMzDc2undxmhjmM6fPorZebeqXNHHE="; }; passthru.updateScript = nix-update-script {}; diff --git a/third_party/nixpkgs/pkgs/by-name/ab/ab-av1/package.nix b/third_party/nixpkgs/pkgs/by-name/ab/ab-av1/package.nix index a92e021f67..51780029d1 100644 --- a/third_party/nixpkgs/pkgs/by-name/ab/ab-av1/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ab/ab-av1/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/alexheretic/ab-av1"; changelog = "https://github.com/alexheretic/ab-av1/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "ab-av1"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ad/adafruit-nrfutil/package.nix b/third_party/nixpkgs/pkgs/by-name/ad/adafruit-nrfutil/package.nix index dbf90df660..6b300331f6 100644 --- a/third_party/nixpkgs/pkgs/by-name/ad/adafruit-nrfutil/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ad/adafruit-nrfutil/package.nix @@ -19,11 +19,17 @@ python3Packages.buildPythonApplication rec { patches = [ # Pull a patch which fixes the tests, but is not yet released in a new version: # https://github.com/adafruit/Adafruit_nRF52_nrfutil/pull/38 + # https://github.com/adafruit/Adafruit_nRF52_nrfutil/pull/42 (fetchpatch { name = "fix-tests.patch"; url = "https://github.com/adafruit/Adafruit_nRF52_nrfutil/commit/e5fbcc8ee5958041db38c04139ba686bf7d1b845.patch"; sha256 = "sha256-0tbJldGtYcDdUzA3wZRv0lenXVn6dqV016U9nMpQ6/w="; }) + (fetchpatch { + name = "fix-test-test_get_vk_pem.patch"; + url = "https://github.com/adafruit/Adafruit_nRF52_nrfutil/commit/f42cee3c2d7c8d0911f27ba24d6a140083cb85cf.patch"; + sha256 = "sha256-7WoRqPKc8O5EYK7Fj1WrMJREwhueiVpkEizIfVnEPBU="; + }) ]; nativeBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/by-name/ad/adbtuifm/package.nix b/third_party/nixpkgs/pkgs/by-name/ad/adbtuifm/package.nix new file mode 100644 index 0000000000..546d600451 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ad/adbtuifm/package.nix @@ -0,0 +1,25 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, +}: +buildGoModule rec { + pname = "adbtuifm"; + version = "0.5.8"; + src = fetchFromGitHub { + owner = "darkhz"; + repo = "adbtuifm"; + rev = "v${version}"; + hash = "sha256-TK93O9XwMrsrQT3EG0969HYMtYkK0a4PzG9FSTqHxAY="; + }; + vendorHash = "sha256-voVoowjM90OGWXF4REEevO8XEzT7azRYiDay4bnGBks="; + meta = with lib; { + description = "A TUI-based file manager for the Android Debug Bridge"; + homepage = "https://github.com/darkhz/adbtuifm"; + changelog = "https://github.com/darkhz/adbtuifm/releases/tag/v${version}"; + license = with licenses; [mit]; + maintainers = with maintainers; [daru-san]; + mainProgram = "adbtuifm"; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ad/adrs/package.nix b/third_party/nixpkgs/pkgs/by-name/ad/adrs/package.nix new file mode 100644 index 0000000000..0b4d49fbea --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ad/adrs/package.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "adrs"; + version = "0.2.8"; + + src = fetchFromGitHub { + owner = "joshrotenberg"; + repo = "adrs"; + rev = "v${version}"; + hash = "sha256-5rvdW2UntseSsKFndrDj9ogH/qYN+KymuOsuqS0/C3M="; + }; + + cargoHash = "sha256-WqsZ+ICfKrackQ5dMs/WvF3inJX+k9LhxAJkXmaVAtY="; + + meta = { + description = "A command-line tool for managing Architectural Decision Records"; + homepage = "https://github.com/joshrotenberg/adrs"; + license = with lib.licenses; [ mit asl20 ]; + maintainers = with lib.maintainers; [ dannixon ]; + mainProgram = "adrs"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ad/adwsteamgtk/package.nix b/third_party/nixpkgs/pkgs/by-name/ad/adwsteamgtk/package.nix index 419541b28e..3939629615 100644 --- a/third_party/nixpkgs/pkgs/by-name/ad/adwsteamgtk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ad/adwsteamgtk/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { pname = "adwsteamgtk"; - version = "0.6.10"; + version = "0.6.11"; # built with meson, not a python format format = "other"; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { owner = "Foldex"; repo = "AdwSteamGtk"; rev = "refs/tags/v${version}"; - hash = "sha256-sh4FLXG78i20Bt8pCCbhO6Sx815stjAZRLCD+X5Zk40="; + hash = "sha256-f7+2gTpG5Ntgq+U2AkQihzSTrO+oMsLWxgxe4dVyz8A="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ae/aegisub/package.nix b/third_party/nixpkgs/pkgs/by-name/ae/aegisub/package.nix index 6c68fff2bb..cdec1259fd 100644 --- a/third_party/nixpkgs/pkgs/by-name/ae/aegisub/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ae/aegisub/package.nix @@ -33,7 +33,7 @@ portaudio, stdenv, which, - wrapGAppsHook, + wrapGAppsHook3, wxGTK, zlib, # Boolean guard flags @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config which - wrapGAppsHook + wrapGAppsHook3 wxGTK ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ae/aeron-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ae/aeron-cpp/package.nix index 14d71aafe6..630a94d9b4 100644 --- a/third_party/nixpkgs/pkgs/by-name/ae/aeron-cpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ae/aeron-cpp/package.nix @@ -17,14 +17,14 @@ let version = aeron.version; - sbeAll_1_30_0 = fetchMavenArtifact { + sbeAll_1_31_1 = fetchMavenArtifact { groupId = "uk.co.real-logic"; - version = "1.30.0"; + version = "1.31.1"; artifactId = "sbe-all"; - hash = "sha512-K/LMP6zNBHl2Wpvli/sH+ZsYwlTPJHHCKee7riOH6dR8nxTJgucnF7AsbVOpowR6xaV3wPjFh0iqWp/oerHKBg=="; + hash = "sha512-Ypsk8PbShFOxm49u1L+TTuApaW6ECTSee+hHEhmY/jNi5AymHXBWwDMBMkzC25aowiHLJS5EnzLk6hu9Lea93Q=="; }; - sbeAll = sbeAll_1_30_0; + sbeAll = sbeAll_1_31_1; in @@ -36,7 +36,7 @@ stdenv.mkDerivation { owner = "real-logic"; repo = "aeron"; rev = version; - hash = "sha256-MY7I8Cw1izVLW3/JWav9zPIBJTGInZHwAZT2e7tI9F0="; + hash = "sha256-sROEZVOfScrlqMLbfrPtw3LQCQ5TfMcrLiP6j/Z9rSM="; }; patches = [ @@ -98,7 +98,7 @@ stdenv.mkDerivation { aeron_driver_static \ aeronmd - make -j $NIX_BUILD_CORES install + make install ) runHook postBuild diff --git a/third_party/nixpkgs/pkgs/by-name/af/affine/package.nix b/third_party/nixpkgs/pkgs/by-name/af/affine/package.nix index 5b8b3e41e8..ae55ffad98 100644 --- a/third_party/nixpkgs/pkgs/by-name/af/affine/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/af/affine/package.nix @@ -18,10 +18,10 @@ stdenvNoCC.mkDerivation (finalAttrs: let }; in { pname = "affine"; - version = "0.13.1"; + version = "0.14.3"; src = fetchurl { url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; - hash = "sha256-2Du5g/I82iTr8Bwb+qkLzyfbk1OrOlXqx6FHImVoAoE="; + hash = "sha256-/dKvRr0cH9mLF1y6FGFRDlsFXaymEmb55AZ37Ti0PU4="; }; nativeBuildInputs = [ copyDesktopItems diff --git a/third_party/nixpkgs/pkgs/by-name/ag/ags/package.nix b/third_party/nixpkgs/pkgs/by-name/ag/ags/package.nix index 0076e5b0ba..85fb28aa12 100644 --- a/third_party/nixpkgs/pkgs/by-name/ag/ags/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ag/ags/package.nix @@ -1,40 +1,40 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, meson -, ninja -, pkg-config -, gobject-introspection -, gjs -, glib-networking -, gnome -, gtk-layer-shell -, libpulseaudio -, libsoup_3 -, networkmanager -, upower -, typescript -, wrapGAppsHook -, linux-pam +{ + lib, + buildNpmPackage, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + gjs, + glib-networking, + gnome, + gtk-layer-shell, + libpulseaudio, + libsoup_3, + networkmanager, + upower, + typescript, + wrapGAppsHook3, + linux-pam, + nix-update-script, }: buildNpmPackage rec { pname = "ags"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "Aylur"; repo = "ags"; rev = "v${version}"; - hash = "sha256-+0us1/lawDXp6RXn4ev95a99VgpsVPi2A4jwNS2O1Uo="; + hash = "sha256-ebnkUaee/pnfmw1KmOZj+MP1g5wA+8BT/TPKmn4Dkwc="; fetchSubmodules = true; }; npmDepsHash = "sha256-ucWdADdMqAdLXQYKGOXHNRNM9bhjKX4vkMcQ8q/GZ20="; - mesonFlags = [ - (lib.mesonBool "build_types" true) - ]; + mesonFlags = [ (lib.mesonBool "build_types" true) ]; nativeBuildInputs = [ meson @@ -43,7 +43,7 @@ buildNpmPackage rec { gjs gobject-introspection typescript - wrapGAppsHook + wrapGAppsHook3 ]; # Most of the build inputs here are basically needed for their typelibs. @@ -63,12 +63,18 @@ buildNpmPackage rec { chmod u+x ./post_install.sh && patchShebangs ./post_install.sh ''; - meta = with lib; { + passthru.updateScript = nix-update-script {}; + + meta = { homepage = "https://github.com/Aylur/ags"; description = "A EWW-inspired widget system as a GJS library"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ foo-dogsquared ]; + changelog = "https://github.com/Aylur/ags/releases/tag/v${version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + foo-dogsquared + johnrtitor + ]; mainProgram = "ags"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ai/airlift/package.nix b/third_party/nixpkgs/pkgs/by-name/ai/airlift/package.nix index 5c1027d853..a5bbbb7614 100644 --- a/third_party/nixpkgs/pkgs/by-name/ai/airlift/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ai/airlift/package.nix @@ -10,11 +10,11 @@ python3.pkgs.buildPythonApplication rec { pname = "airlift"; pyproject = true; - version = "0.3.1"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - hash = "sha256-EAt3xxr9jtMaOugAV+ySjhorO8SrhBn00PZ84ZG80oI="; + hash = "sha256-JcW2FXl+SrdveRmG5bD1ttf6F3LwvGZQF4ZCTpDpPa8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/al/alacarte/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alacarte/package.nix new file mode 100644 index 0000000000..003558c0e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/al/alacarte/package.nix @@ -0,0 +1,70 @@ +{ + lib, + fetchFromGitLab, + python3, + autoconf, + automake, + gettext, + pkg-config, + libxslt, + gobject-introspection, + wrapGAppsHook3, + gnome-menus, + glib, + gtk3, + docbook_xsl, + nix-update-script, +}: +python3.pkgs.buildPythonApplication rec { + pname = "alacarte"; + version = "3.52.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "alacarte"; + rev = version; + hash = "sha256-SkolSk6RireH3aKkRTUCib/nflqD02PR9uVtXePRHQY="; + }; + + format = "other"; + + nativeBuildInputs = [ + autoconf + automake + gettext + pkg-config + python3 + libxslt + gobject-introspection + wrapGAppsHook3 + ]; + + buildInputs = [ + gnome-menus + glib + gtk3 + ]; + + propagatedBuildInputs = with python3.pkgs; [ pygobject3 ]; + + configureScript = "./autogen.sh"; + + # Builder couldn't fetch the docbook.xsl from the internet directly, + # so we substitute it with the docbook.xsl in already in nixpkgs + preConfigure = '' + substituteInPlace man/Makefile.am \ + --replace-fail "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://gitlab.gnome.org/GNOME/alacarte"; + description = "A menu editor for GNOME using the freedesktop.org menu specification"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + mainProgram = "alacarte"; + maintainers = with lib.maintainers; [ pluiedev ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/al/alephone-durandal/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alephone-durandal/package.nix index cd7927d69a..b1bd2da8c8 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alephone-durandal/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alephone-durandal/package.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "durandal"; desktopName = "Marathon-Durandal"; - version = "20230119"; + version = "20240510"; icon = alephone.icons + "/marathon2.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon2-${version}-Data.zip"; - sha256 = "sha256-Vbfk5wLgvNEZW2BohMY5mPXaRbNlHxJdWLYTsE8CSwI="; + sha256 = "sha256-uoBl1/7XlXmMLqpk3tvme9w18q4Yh0WCrmqSzjGxNz0="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/al/alephone-infinity/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alephone-infinity/package.nix index c49f9a8d2a..d2ba3968f5 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alephone-infinity/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alephone-infinity/package.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon-infinity"; desktopName = "Marathon-Infinity"; - version = "20230119"; + version = "20240510"; icon = alephone.icons + "/marathon-infinity.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip"; - sha256 = "sha256-0+xokhzWdXM+L4DBjWnfNVXZve4n1X/Aq6rxNGAFb3Q="; + sha256 = "sha256-+FPym4Avqzyo4cZtfYPHXCS+q21+g9AIdKOImkd/UjU="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/al/alephone-marathon/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alephone-marathon/package.nix index ea295b7dcd..4710d47090 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alephone-marathon/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alephone-marathon/package.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon"; desktopName = "Marathon"; - version = "20230119"; + version = "20240510"; icon = alephone.icons + "/marathon.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; - sha256 = "sha256-uz/1ZW9epd1HP/pzTNN3d2EEbOzjj0qpdMkrVoxb8Aw="; + sha256 = "sha256-shZ82e7veaaT/petxDQ8Fd7YtJPmTgxSCStf0kGfrFs="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/al/alephone/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alephone/package.nix index 5ee1ef50a7..bbb56681e8 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alephone/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alephone/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "icons" ]; pname = "alephone"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = - let date = "20231125"; + let date = "20240510"; in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2"; - sha256 = "sha256-qRHmtkzPi6PKeAzoMPdSbboiilG+L2fCXvXXu3vIchs="; + sha256 = "sha256-3+3lTAVOxTTs13uuVsmq4CKmdNkQv+lY7YV1HkIwvDs="; }; nativeBuildInputs = [ pkg-config icoutils ]; diff --git a/third_party/nixpkgs/pkgs/by-name/al/alsa-ucm-conf/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-ucm-conf/package.nix index 76e90f6720..b2e2889ee2 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "alsa-ucm-conf"; @@ -9,6 +9,21 @@ stdenv.mkDerivation rec { hash = "sha256-OHwBzzDioWdte49ysmgc8hmrynDdHsKp4zrdW/P+roE="; }; + patches = [ + (fetchpatch { + # TODO: Remove this patch in the next package upgrade + name = "rt1318-fix-one.patch"; + url = "https://github.com/alsa-project/alsa-ucm-conf/commit/7e22b7c214d346bd156131f3e6c6a5900bbf116d.patch"; + hash = "sha256-5X0ANXTSRnC9jkvMLl7lA5TBV3d1nwWE57DP6TwliII="; + }) + (fetchpatch { + # TODO: Remove this patch in the next package upgrade + name = "rt1318-fix-two.patch"; + url = "https://github.com/alsa-project/alsa-ucm-conf/commit/4e0fcc79b7d517a957e12f02ecae5f3c69fa94dc.patch"; + hash = "sha256-cuZPEEqb8+d1Ak2tA+LVEh6gtGt1X+LiAnfFYMIDCXY="; + }) + ]; + dontBuild = true; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/al/altdns/package.nix b/third_party/nixpkgs/pkgs/by-name/al/altdns/package.nix new file mode 100644 index 0000000000..839173efa6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/al/altdns/package.nix @@ -0,0 +1,53 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication { + pname = "altdns"; + version = "1.0.2-unstable-2021-09-09"; + pyproject = true; + + src = fetchFromGitHub { + owner = "infosec-au"; + repo = "altdns"; + rev = "8c1de0fa8365153832bb58d74475caa15d2d077a"; + hash = "sha256-ElY6AZ7IBnOh7sRWNSQNmq7AYGlnjvYRn8/U+29BwWA="; + }; + + prePatch = '' + substituteInPlace requirements.txt \ + --replace-fail "argparse" "" + substituteInPlace setup.py \ + --replace-fail "argparse" "" + ''; + + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ + dnspython + termcolor + tldextract + ]; + + postInstall = '' + cp $src/words.txt $out/ + ''; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "altdns" + ]; + + meta = with lib; { + description = "Generates permutations, alterations and mutations of subdomains and then resolves them"; + homepage = "https://github.com/infosec-au/altdns"; + license = licenses.asl20; + maintainers = with maintainers; [ octodi ]; + mainProgram = "altdns"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/al/alvr/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alvr/package.nix index 803f352ae4..31a96a5d84 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alvr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alvr/package.nix @@ -16,8 +16,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/alvr-${version} $out/bin/alvr - install -Dm444 ${appimageContents}/alvr.desktop -t $out/share/applications substituteInPlace $out/share/applications/alvr.desktop \ --replace 'Exec=alvr_dashboard' 'Exec=alvr' diff --git a/third_party/nixpkgs/pkgs/by-name/am/am2rlauncher/package.nix b/third_party/nixpkgs/pkgs/by-name/am/am2rlauncher/package.nix index d0dbf90950..049725881e 100644 --- a/third_party/nixpkgs/pkgs/by-name/am/am2rlauncher/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/am/am2rlauncher/package.nix @@ -17,6 +17,8 @@ , fetchFromGitHub , buildFHSEnv , glib-networking +, wrapGAppsHook3 +, gsettings-desktop-schemas }: let am2r-run = buildFHSEnv { @@ -69,7 +71,9 @@ buildDotnetModule { openssl ]; - buildInputs = [ gtk3 ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; + + buildInputs = [ gtk3 gsettings-desktop-schemas glib-networking ]; patches = [ ./am2r-run-binary.patch ]; @@ -78,7 +82,6 @@ buildDotnetModule { postFixup = '' wrapProgram $out/bin/AM2RLauncher.Gtk \ --prefix PATH : ${lib.makeBinPath [ am2r-run xdelta file openjdk patchelf ]} \ - --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules mkdir -p $out/share/icons install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.png $out/share/icons/AM2RLauncher.png diff --git a/third_party/nixpkgs/pkgs/misc/ananicy-rules-cachyos/default.nix b/third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix similarity index 50% rename from third_party/nixpkgs/pkgs/misc/ananicy-rules-cachyos/default.nix rename to third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index b7970eff2e..2cca8544c9 100644 --- a/third_party/nixpkgs/pkgs/misc/ananicy-rules-cachyos/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -1,14 +1,19 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ + lib, + stdenvNoCC, + fetchFromGitHub, + unstableGitUpdater, +}: stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "unstable-2024-04-16"; + version = "0-unstable-2024-05-10"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "7abaddd5cac23d9fd7a0f0aeccb7a0287456802b"; - hash = "sha256-06q9dYLdg+AhT8L2OeoDsG7hHlmx/uf/RIwblODiSnE="; + rev = "1826cf45201770e20fea2e7bebfc2a5001074703"; + hash = "sha256-9Uth0OvV5NXHZxOCQDMmb0VdXpi8dSMdN9StnJa8n90="; }; dontConfigure = true; @@ -22,11 +27,19 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - meta = with lib; { + passthru.updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; + }; + + meta = { homepage = "https://github.com/CachyOS/ananicy-rules"; description = "CachyOS' ananicy-rules meant to be used with ananicy-cpp"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ artturin johnrtitor diniamo ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + artturin + diniamo + johnrtitor + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/an/anchor/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/an/anchor/Cargo.lock index 6d574e5d5d..864ca17340 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/anchor/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/an/anchor/Cargo.lock @@ -76,14 +76,15 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom 0.2.10", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -118,7 +119,7 @@ checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483" [[package]] name = "anchor-attribute-access-control" -version = "0.29.0" +version = "0.30.0" dependencies = [ "anchor-syn", "proc-macro2", @@ -128,7 +129,7 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.29.0" +version = "0.30.0" dependencies = [ "anchor-syn", "bs58 0.5.0", @@ -139,7 +140,7 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.29.0" +version = "0.30.0" dependencies = [ "anchor-syn", "quote", @@ -148,7 +149,7 @@ dependencies = [ [[package]] name = "anchor-attribute-error" -version = "0.29.0" +version = "0.30.0" dependencies = [ "anchor-syn", "quote", @@ -157,7 +158,7 @@ dependencies = [ [[package]] name = "anchor-attribute-event" -version = "0.29.0" +version = "0.30.0" dependencies = [ "anchor-syn", "proc-macro2", @@ -167,22 +168,28 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.29.0" +version = "0.30.0" dependencies = [ + "anchor-lang-idl", "anchor-syn", + "anyhow", + "bs58 0.5.0", + "heck 0.3.3", + "proc-macro2", "quote", + "serde_json", "syn 1.0.109", ] [[package]] name = "anchor-cli" -version = "0.29.0" +version = "0.30.0" dependencies = [ "anchor-client", "anchor-lang", - "anchor-syn", + "anchor-lang-idl", "anyhow", - "base64 0.13.1", + "base64 0.21.7", "bincode", "cargo_toml", "chrono", @@ -212,7 +219,7 @@ dependencies = [ [[package]] name = "anchor-client" -version = "0.29.0" +version = "0.30.0" dependencies = [ "anchor-lang", "anyhow", @@ -229,7 +236,7 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" -version = "0.29.0" +version = "0.30.0" dependencies = [ "anchor-syn", "quote", @@ -238,7 +245,7 @@ dependencies = [ [[package]] name = "anchor-derive-serde" -version = "0.29.0" +version = "0.30.0" dependencies = [ "anchor-syn", "borsh-derive-internal 0.10.3", @@ -249,7 +256,7 @@ dependencies = [ [[package]] name = "anchor-derive-space" -version = "0.29.0" +version = "0.30.0" dependencies = [ "proc-macro2", "quote", @@ -258,7 +265,7 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.29.0" +version = "0.30.0" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -269,9 +276,9 @@ dependencies = [ "anchor-derive-accounts", "anchor-derive-serde", "anchor-derive-space", - "anchor-syn", + "anchor-lang-idl", "arrayref", - "base64 0.13.1", + "base64 0.21.7", "bincode", "borsh 0.10.3", "bytemuck", @@ -280,27 +287,41 @@ dependencies = [ "thiserror", ] +[[package]] +name = "anchor-lang-idl" +version = "0.1.0" +dependencies = [ + "anchor-syn", + "anyhow", + "regex", + "serde", + "serde_json", +] + [[package]] name = "anchor-spl" -version = "0.29.0" +version = "0.30.0" dependencies = [ "anchor-lang", "borsh 0.10.3", "mpl-token-metadata", "serum_dex", - "solana-program", - "spl-associated-token-account", + "spl-associated-token-account 3.0.2", "spl-memo", + "spl-pod 0.2.2", "spl-token 4.0.0", - "spl-token-2022", + "spl-token-2022 3.0.2", + "spl-token-group-interface 0.2.3", + "spl-token-metadata-interface 0.3.3", ] [[package]] name = "anchor-syn" -version = "0.29.0" +version = "0.30.0" dependencies = [ "anyhow", "bs58 0.5.0", + "cargo_toml", "heck 0.3.3", "proc-macro2", "quote", @@ -614,13 +635,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -642,7 +663,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "avm" -version = "0.29.0" +version = "0.30.0" dependencies = [ "anyhow", "cargo_toml", @@ -685,9 +706,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -727,9 +748,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -802,6 +823,16 @@ dependencies = [ "hashbrown 0.13.2", ] +[[package]] +name = "borsh" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" +dependencies = [ + "borsh-derive 1.3.1", + "cfg_aliases", +] + [[package]] name = "borsh-derive" version = "0.9.3" @@ -828,6 +859,20 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "borsh-derive" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" +dependencies = [ + "once_cell", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.55", + "syn_derive", +] + [[package]] name = "borsh-derive-internal" version = "0.9.3" @@ -926,9 +971,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] @@ -941,14 +986,14 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[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" @@ -968,12 +1013,12 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.15.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +checksum = "a98356df42a2eb1bd8f1793ae4ee4de48e384dd974ce5eac8eee802edb7492be" dependencies = [ "serde", - "toml 0.7.8", + "toml 0.8.2", ] [[package]] @@ -992,6 +1037,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chrono" version = "0.4.31" @@ -1078,7 +1129,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -1126,15 +1177,15 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -1205,11 +1256,10 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] @@ -1239,12 +1289,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -1316,7 +1363,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -1327,17 +1374,20 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] name = "dashmap" -version = "4.0.2" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "num_cpus", + "hashbrown 0.14.1", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] @@ -1479,7 +1529,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -1502,7 +1552,7 @@ checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -1578,22 +1628,22 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" +checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" +checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -1720,18 +1770,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1744,9 +1794,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1754,15 +1804,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1771,38 +1821,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1929,7 +1979,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.11", ] [[package]] @@ -2113,9 +2163,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2149,9 +2199,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.1", @@ -2240,9 +2290,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2307,9 +2357,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libsecp256k1" @@ -2361,12 +2411,13 @@ dependencies = [ [[package]] name = "light-poseidon" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949bdd22e4ed93481d45e9a6badb34b99132bcad0c8a8d4f05c42f7dcc7b90bc" +checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee" dependencies = [ "ark-bn254", "ark-ff", + "num-bigint 0.4.4", "thiserror", ] @@ -2481,9 +2532,9 @@ dependencies = [ [[package]] name = "mpl-token-metadata" -version = "3.1.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177204bbe7486b22ac35af2c91a82630f830a6ddd3392651aefde1ef346aba3d" +checksum = "caf0f61b553e424a6234af1268456972ee66c2222e1da89079242251fa7479e5" dependencies = [ "borsh 0.10.3", "num-derive 0.3.3", @@ -2586,7 +2637,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -2661,11 +2712,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.0", + "num_enum_derive 0.7.2", ] [[package]] @@ -2689,19 +2740,19 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] name = "num_enum_derive" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -2816,9 +2867,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "percentage" @@ -2836,7 +2887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.2", + "indexmap 2.2.6", ] [[package]] @@ -2869,7 +2920,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -2980,14 +3031,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.0", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", ] [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -3009,7 +3092,7 @@ checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -3031,13 +3114,13 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls", "rustls-native-certs", @@ -3055,16 +3138,16 @@ checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ "bytes", "libc", - "socket2 0.5.4", + "socket2 0.5.6", "tracing", "windows-sys 0.48.0", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -3151,9 +3234,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3161,9 +3244,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -3176,7 +3259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", + "ring 0.16.20", "time", "yasna", ] @@ -3241,12 +3324,12 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.21" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78fdbab6a7e1d7b13cc8ff10197f47986b41c639300cc3c8158cac7847c9bbef" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "async-compression", - "base64 0.21.4", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -3269,6 +3352,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-rustls", @@ -3291,21 +3375,36 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] [[package]] -name = "rpassword" -version = "7.2.0" +name = "ring" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "rpassword" +version = "7.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" dependencies = [ "libc", "rtoolbox", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -3354,7 +3453,7 @@ version = "0.38.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -3363,12 +3462,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring", + "ring 0.17.8", "rustls-webpki", "sct", ] @@ -3391,17 +3490,17 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", ] [[package]] name = "rustls-webpki" -version = "0.101.6" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -3463,7 +3562,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -3472,8 +3571,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -3501,44 +3600,44 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.19" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -3585,16 +3684,16 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -3754,22 +3853,22 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "solana-account-decoder" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d67ecc499b9cc79c9f34c1bbae2ba3f102d9bfaa78f48ad49d11f433bc4c7b4" +checksum = "e3b359495f76e0570a3e611e8963f4703828f7516e6577d38d642644ad205c16" dependencies = [ "Inflector", - "base64 0.21.4", + "base64 0.21.7", "bincode", "bs58 0.4.0", "bv", @@ -3780,17 +3879,18 @@ dependencies = [ "solana-config-program", "solana-sdk", "spl-token 4.0.0", - "spl-token-2022", - "spl-token-metadata-interface", + "spl-token-2022 1.0.0", + "spl-token-group-interface 0.1.0", + "spl-token-metadata-interface 0.2.0", "thiserror", "zstd", ] [[package]] name = "solana-clap-utils" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26cf9322dc6cad9902a6a5ef77ad9cd9149b64c757c1ffa536c4243bd7136159" +checksum = "94d44534a77097037399d613994d521a3bb56ce63d423d77efdb1d4b06666d2d" dependencies = [ "chrono", "clap 2.34.0", @@ -3805,9 +3905,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e3476dc3b63bb2e0da304f10df299b20942ae57054eaed2cc411a5449876bd" +checksum = "7702ec83f471b3a0daffd7e7f6acbe50f9228f2bb66d1276e32b6ed253d45afb" dependencies = [ "dirs-next", "lazy_static", @@ -3821,16 +3921,16 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5d23b030f09ea0a3e0d89d22b453849e33f45a89ef0eeae152a21c58752985" +checksum = "a55322d541c2147ea979832641ca718651eb7a9284fa25b9d6c4cb21fd6f1850" dependencies = [ "async-trait", "bincode", "dashmap", "futures", "futures-util", - "indexmap 2.0.2", + "indexmap 2.2.6", "indicatif", "log", "quinn", @@ -3854,9 +3954,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "117a5204fb9e7982f2058373d3f21b7997846aed4ca562cf6e84aef4c729c75b" +checksum = "63f328bb6c0a8013218fb71ef31c6524359eae1d328f4ffef4d14e3e7141f84f" dependencies = [ "bincode", "chrono", @@ -3868,15 +3968,15 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c2f6c76632ec5d6e59aae8fe13095d27c3ae2af143f6973684856babdcd2da" +checksum = "bb39f5996aa944722975efe70adb01f91705cf42e0d302eacb868f51d5c92601" dependencies = [ "async-trait", "bincode", "crossbeam-channel", "futures-util", - "indexmap 2.0.2", + "indexmap 2.2.6", "log", "rand 0.8.5", "rayon", @@ -3890,9 +3990,9 @@ dependencies = [ [[package]] name = "solana-faucet" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cd45403c75e5104c79f6875b2326196af76572534c80cfadaed3145ed087aa" +checksum = "d7b735bf282e23763f94856aec8de91552d1b9d00eed7cb318fadda2775a94d2" dependencies = [ "bincode", "byteorder", @@ -3914,17 +4014,13 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdc9268b1abba206e1a8a234473eb5f7f7af660a86e4d468e7e79b3e5667aa9" +checksum = "033e98b727d281cc22381ff703f58b70822b8c32ddb7aca9e7eb3a9c1d465371" dependencies = [ - "ahash 0.8.3", - "blake3", "block-buffer 0.10.4", "bs58 0.4.0", "bv", - "byteorder", - "cc", "either", "generic-array", "im", @@ -3935,7 +4031,6 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "serde_json", "sha2 0.10.8", "solana-frozen-abi-macro", "subtle", @@ -3944,21 +4039,21 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86118cc8437c60d1a474501f6095df880aaac422ab04523a984015c5b7334428" +checksum = "aab7183079f7a0c0b71454fd365e12bce9a773b8099f6c2a92ba6887c42a9d0f" dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] name = "solana-logger" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060dcc6a1ee83aa2df01126e0319b17a84d13251b7660fa1e69241e110252779" +checksum = "7c5559aeadd3adc219fa7169e96a8c5dda618c7f06985f91f2a5f55b9814c7a2" dependencies = [ "env_logger", "lazy_static", @@ -3967,9 +4062,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a23bcca30fdb20efb5f2d81d61ad9cf1ec0f0141b3bbc095835140db72930f" +checksum = "041ab11f1e02d4dbe4f45e6854c312ae2518a5cbe3327b767cab2bc9a8fc0740" dependencies = [ "log", "solana-sdk", @@ -3977,9 +4072,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2d29f683e800cbfb836ceec63fdbf5f42388c21fdacb2e16160b10be3b08cd" +checksum = "4aab373e70aa970e62d16ba1e7e21c54519582c57b680fd31d80421aa3a983a1" dependencies = [ "crossbeam-channel", "gethostname", @@ -3992,9 +4087,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687c740f5b45166666e016ac43cc1001fa5bf9e8f7b9e24cb0a554c6ce35bfd6" +checksum = "736fc2f0fc5a0948d8cb74152d68733c7a682ff8b8ef8df27e75d164c2ed6969" dependencies = [ "bincode", "clap 3.2.25", @@ -4004,7 +4099,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_derive", - "socket2 0.5.4", + "socket2 0.5.6", "solana-logger", "solana-sdk", "solana-version", @@ -4014,11 +4109,11 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d0b706a083218777c52adbb6138b96c143e06031d41ec9c32cf1da9c352c7c" +checksum = "80e9a1f74df1265cc43c843367a833cff05b8a1b5467676ae540f479751aab3c" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.11", "bincode", "bv", "caps", @@ -4031,7 +4126,10 @@ dependencies = [ "nix", "rand 0.8.5", "rayon", + "rustc_version", "serde", + "solana-frozen-abi", + "solana-frozen-abi-macro", "solana-metrics", "solana-rayon-threadlimit", "solana-sdk", @@ -4040,20 +4138,21 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c940ad70659c2366331fd136d67cc968acadbc1f6ad13cff9ffe7e392aa831" +checksum = "0af84e0c085510c9d1660d1f7e50e8b94ec97f27e23e13d960db353d98b55c8a" dependencies = [ "ark-bn254", "ark-ec", "ark-ff", "ark-serialize", - "base64 0.21.4", + "base64 0.21.7", "bincode", - "bitflags 2.4.0", + "bitflags 2.5.0", "blake3", "borsh 0.10.3", "borsh 0.9.3", + "borsh 1.3.1", "bs58 0.4.0", "bv", "bytemuck", @@ -4071,7 +4170,7 @@ dependencies = [ "log", "memoffset 0.9.0", "num-bigint 0.4.4", - "num-derive 0.3.3", + "num-derive 0.4.0", "num-traits", "parking_lot", "rand 0.8.5", @@ -4094,18 +4193,18 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ffcc34819f5b9da3c5ba4045d572e97a60544b8ed49d604ab0a9cc990f875e2" +checksum = "69c13c6ac710cb7e4325de42e7f382109d0b9d6495942b38d0e4b528a8a9961a" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "bincode", "eager", "enum-iterator", "itertools 0.10.5", "libc", "log", - "num-derive 0.3.3", + "num-derive 0.4.0", "num-traits", "percentage", "rand 0.8.5", @@ -4122,9 +4221,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076dbe759e2c86aa5c8b57575d2bd593980bde82b59cb6192261b5d6111dfcd1" +checksum = "13c0575b3106c15019ad451cc81d5bf328ab07a27e0eadc4af31740b88faf586" dependencies = [ "crossbeam-channel", "futures-util", @@ -4147,9 +4246,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5bbf483ec8e440a80b02ef4aa37d0cb6dc77403dc8dfd1a72bdba90429539a" +checksum = "1a81e5186b7cf170616579921da3027b6f94f7275153d38e83b9b2be3fb07ac2" dependencies = [ "async-mutex", "async-trait", @@ -4174,9 +4273,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f23c92c4fb6a1036b7910fb86fbfbf213fabcb3f0d143e6472511d312e0091e" +checksum = "881229e01194a0fc5d6115867d2ee5ce0abfb80d53cab3822c4a6bf96210d474" dependencies = [ "lazy_static", "num_cpus", @@ -4184,14 +4283,14 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7545aa3e2201494e3a1379bb487caa1081786ddf17959ffb819eef9c9202db" +checksum = "acf5b80ef02505a7cd7e248c25f839ba5669a13595462eac212dde0895d690ad" dependencies = [ "console", "dialoguer", "log", - "num-derive 0.3.3", + "num-derive 0.4.0", "num-traits", "parking_lot", "qstring", @@ -4203,12 +4302,12 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e24f3f022731f854f97fa88190a4bdf4a6a2e11704999ef4882320d7edc4eb" +checksum = "cbb2a4cace9ef7c02062efdaa54cfefa13c91fa48cc0c827852adadf7e406963" dependencies = [ "async-trait", - "base64 0.21.4", + "base64 0.21.7", "bincode", "bs58 0.4.0", "indicatif", @@ -4229,11 +4328,11 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae82221d8d5d447cdc27355caa54f96f52af195a984f70c7e8fa0d8e4a4b0f3" +checksum = "adb658d90dca6aece251e0d4288e6e1b06c1b10315abb118032a2e230f8d872f" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "bs58 0.4.0", "jsonrpc-core", "reqwest", @@ -4245,15 +4344,15 @@ dependencies = [ "solana-sdk", "solana-transaction-status", "solana-version", - "spl-token-2022", + "spl-token-2022 1.0.0", "thiserror", ] [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0795902effc5404f43a0a54a489f9d84a5c7eb62164234288690a608582ee4a" +checksum = "bb0d2d0a1b6936a90b1d831a32605118c6f11d7c0dd3b37fb174eab5e1a0b5f3" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -4264,15 +4363,15 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db7ae7c80ba537e4b8c1b4655fda680aa1452c8c955113f985b74b235fc3102" +checksum = "68caf1d34891521523df18dc3c13ce20d54a59c3a390729450267a4c9aa96017" dependencies = [ "assert_matches", - "base64 0.21.4", + "base64 0.21.7", "bincode", - "bitflags 2.4.0", - "borsh 0.10.3", + "bitflags 2.5.0", + "borsh 1.3.1", "bs58 0.4.0", "bytemuck", "byteorder", @@ -4289,9 +4388,9 @@ dependencies = [ "libsecp256k1", "log", "memmap2", - "num-derive 0.3.3", + "num-derive 0.4.0", "num-traits", - "num_enum 0.6.1", + "num_enum 0.7.2", "pbkdf2 0.11.0", "qstring", "qualifier_attr", @@ -4306,6 +4405,7 @@ dependencies = [ "serde_with", "sha2 0.10.8", "sha3 0.10.8", + "siphasher", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", @@ -4318,29 +4418,35 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1da4a7421c09ee4dbf81df06407933d4f68f8990ae87a2feaee6e1b03c97d1d" +checksum = "5cff24eec74815028ebcffe639cf63ff50fb78dadcbf71a8b95b44e7ad1bb6b2" dependencies = [ "bs58 0.4.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] -name = "solana-streamer" -version = "1.17.0" +name = "solana-security-txt" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28b4f623d32af2793e7ebdd24bd04f704a77f6a7975cf8204275ebc918d4685" +checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" + +[[package]] +name = "solana-streamer" +version = "1.18.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af7e0e90d5b6e4aa7182b9f8221fe5a9da4106afc031ac3697a860c2da7c8ac" dependencies = [ "async-channel", "bytes", "crossbeam-channel", "futures-util", "histogram", - "indexmap 2.0.2", + "indexmap 2.2.6", "itertools 0.10.5", "libc", "log", @@ -4363,9 +4469,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ec81c9b19cc3a02e423782758305c63460b664912217e61e273e0105f7dc0b" +checksum = "5e55c9d6f7970a9e846256bbf57a571ada379fb300ba39958992fbadf5c24ca5" dependencies = [ "bincode", "log", @@ -4378,14 +4484,14 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf9e6a85761ebc7be477e95b5787f206e6f64d09d297006881edbe30c99106d0" +checksum = "fb8859de54d3fbfee458b11536af0f357977044c3b31c9a1154af5c8874ae485" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap 2.0.2", + "indexmap 2.2.6", "indicatif", "log", "rayon", @@ -4402,12 +4508,12 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2eaba311b1be47ae8a1ed8d082d2c35cd89a39c5daf73514668c735574d4ecd" +checksum = "c2be62abd39aad39d5377e3ad4f1af7fc7e12577edb0d6ac6405f533f9ce74e7" dependencies = [ "Inflector", - "base64 0.21.4", + "base64 0.21.7", "bincode", "borsh 0.10.3", "bs58 0.4.0", @@ -4418,18 +4524,18 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-sdk", - "spl-associated-token-account", + "spl-associated-token-account 2.3.0", "spl-memo", "spl-token 4.0.0", - "spl-token-2022", + "spl-token-2022 1.0.0", "thiserror", ] [[package]] name = "solana-udp-client" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f3750d7c9218e2a0e5ad73b62e293a71489c6425e64e98d5315dc64939eee6" +checksum = "2d67fd02dc01d0e7f06079625aaaa7de9ea86d757e16df3ec76cd6e162a91f23" dependencies = [ "async-trait", "solana-connection-cache", @@ -4442,9 +4548,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19dc9876647351f50ac415afcd9bc8ea3892883a077cd240f84490a0670ab021" +checksum = "26db373e381b715773164fb9ae47a89f56bbb6fb50469b1b970134d5c6f6ce4d" dependencies = [ "log", "rustc_version", @@ -4458,13 +4564,13 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480b27798516d7065b358f3ec056b2ede79e0dc8406a9697c6028f289a09398d" +checksum = "6c579e4599523cefa128db4075d0fc7b1177434b23ac4f72140a394dd4b4f648" dependencies = [ "bincode", "log", - "num-derive 0.3.3", + "num-derive 0.4.0", "num-traits", "rustc_version", "serde", @@ -4480,12 +4586,12 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.17.0" +version = "1.18.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8690fff97c3cb2acfdb49d126f8b958736884f58bd1c7fd2230984f132095f05" +checksum = "09a78337e50d3ed0b8a6e521969c0e81dfa3649f4d718e88a7e9a0d04ca0d0e0" dependencies = [ "aes-gcm-siv", - "base64 0.21.4", + "base64 0.21.7", "bincode", "bytemuck", "byteorder", @@ -4494,7 +4600,7 @@ dependencies = [ "itertools 0.10.5", "lazy_static", "merlin", - "num-derive 0.3.3", + "num-derive 0.4.0", "num-traits", "rand 0.7.3", "serde", @@ -4509,9 +4615,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103318aa365ff7caa8cf534f2246b5eb7e5b34668736d52b1266b143f7a21196" +checksum = "3d457cc2ba742c120492a64b7fa60e22c575e891f6b55039f4d736568fb112a3" dependencies = [ "byteorder", "combine", @@ -4528,9 +4634,9 @@ dependencies = [ [[package]] name = "solang-parser" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cb9fa2fa2fa6837be8a2495486ff92e3ffe68a99b6eeba288e139efdd842457" +checksum = "c425ce1c59f4b154717592f0bdf4715c3a1d55058883622d3157e1f0908a5b26" dependencies = [ "itertools 0.11.0", "lalrpop", @@ -4546,6 +4652,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "spki" version = "0.5.4" @@ -4558,9 +4670,9 @@ dependencies = [ [[package]] name = "spl-associated-token-account" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385e31c29981488f2820b2022d8e731aae3b02e6e18e2fd854e4c9a94dc44fc3" +checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f" dependencies = [ "assert_matches", "borsh 0.10.3", @@ -4568,7 +4680,23 @@ dependencies = [ "num-traits", "solana-program", "spl-token 4.0.0", - "spl-token-2022", + "spl-token-2022 1.0.0", + "thiserror", +] + +[[package]] +name = "spl-associated-token-account" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e688554bac5838217ffd1fab7845c573ff106b6336bf7d290db7c98d5a8efd" +dependencies = [ + "assert_matches", + "borsh 1.3.1", + "num-derive 0.4.0", + "num-traits", + "solana-program", + "spl-token 4.0.0", + "spl-token-2022 3.0.2", "thiserror", ] @@ -4580,7 +4708,18 @@ checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" dependencies = [ "bytemuck", "solana-program", - "spl-discriminator-derive", + "spl-discriminator-derive 0.1.1", +] + +[[package]] +name = "spl-discriminator" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34d1814406e98b08c5cd02c1126f83fd407ad084adce0b05fda5730677822eac" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator-derive 0.2.0", ] [[package]] @@ -4590,8 +4729,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b" dependencies = [ "quote", - "spl-discriminator-syn", - "syn 2.0.37", + "spl-discriminator-syn 0.1.1", + "syn 2.0.55", +] + +[[package]] +name = "spl-discriminator-derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750" +dependencies = [ + "quote", + "spl-discriminator-syn 0.2.0", + "syn 2.0.55", ] [[package]] @@ -4603,7 +4753,20 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "syn 2.0.37", + "syn 2.0.55", + "thiserror", +] + +[[package]] +name = "spl-discriminator-syn" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1f05593b7ca9eac7caca309720f2eafb96355e037e6d373b909a80fe7b69b9" +dependencies = [ + "proc-macro2", + "quote", + "sha2 0.10.8", + "syn 2.0.55", "thiserror", ] @@ -4618,15 +4781,28 @@ dependencies = [ [[package]] name = "spl-pod" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" +checksum = "85a5db7e4efb1107b0b8e52a13f035437cdcb36ef99c58f6d467f089d9b2915a" dependencies = [ "borsh 0.10.3", "bytemuck", "solana-program", "solana-zk-token-sdk", - "spl-program-error", + "spl-program-error 0.3.0", +] + +[[package]] +name = "spl-pod" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046ce669f48cf2eca1ec518916d8725596bfb655beb1c74374cf71dc6cb773c9" +dependencies = [ + "borsh 1.3.1", + "bytemuck", + "solana-program", + "solana-zk-token-sdk", + "spl-program-error 0.4.0", ] [[package]] @@ -4638,7 +4814,20 @@ dependencies = [ "num-derive 0.4.0", "num-traits", "solana-program", - "spl-program-error-derive", + "spl-program-error-derive 0.3.1", + "thiserror", +] + +[[package]] +name = "spl-program-error" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5528f4dfa2a905012007999526955c79162c09668c69ad3c3f2ddfbd0b2984a4" +dependencies = [ + "num-derive 0.4.0", + "num-traits", + "solana-program", + "spl-program-error-derive 0.4.0", "thiserror", ] @@ -4651,21 +4840,47 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "syn 2.0.37", + "syn 2.0.55", +] + +[[package]] +name = "spl-program-error-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "641aa3116b1d58481e921b5d41dafc26a67bd488cb288330dbde004641764dd4" +dependencies = [ + "proc-macro2", + "quote", + "sha2 0.10.8", + "syn 2.0.55", ] [[package]] name = "spl-tlv-account-resolution" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9" +checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683" dependencies = [ "bytemuck", "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", + "spl-discriminator 0.1.0", + "spl-pod 0.1.1", + "spl-program-error 0.3.0", + "spl-type-length-value 0.3.0", +] + +[[package]] +name = "spl-tlv-account-resolution" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cace91ba08984a41556efe49cbf2edca4db2f577b649da7827d3621161784bf8" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator 0.2.2", + "spl-pod 0.2.2", + "spl-program-error 0.4.0", + "spl-type-length-value 0.4.3", ] [[package]] @@ -4700,26 +4915,78 @@ dependencies = [ [[package]] name = "spl-token-2022" -version = "0.9.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86" +checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059" dependencies = [ "arrayref", "bytemuck", "num-derive 0.4.0", "num-traits", - "num_enum 0.7.0", + "num_enum 0.7.2", "solana-program", + "solana-security-txt", "solana-zk-token-sdk", "spl-memo", - "spl-pod", + "spl-pod 0.1.1", "spl-token 4.0.0", - "spl-token-metadata-interface", - "spl-transfer-hook-interface", - "spl-type-length-value", + "spl-token-group-interface 0.1.0", + "spl-token-metadata-interface 0.2.0", + "spl-transfer-hook-interface 0.4.1", + "spl-type-length-value 0.3.0", "thiserror", ] +[[package]] +name = "spl-token-2022" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5412f99ae7ee6e0afde00defaa354e6228e47e30c0e3adf553e2e01e6abb584" +dependencies = [ + "arrayref", + "bytemuck", + "num-derive 0.4.0", + "num-traits", + "num_enum 0.7.2", + "solana-program", + "solana-security-txt", + "solana-zk-token-sdk", + "spl-memo", + "spl-pod 0.2.2", + "spl-token 4.0.0", + "spl-token-group-interface 0.2.3", + "spl-token-metadata-interface 0.3.3", + "spl-transfer-hook-interface 0.6.3", + "spl-type-length-value 0.4.3", + "thiserror", +] + +[[package]] +name = "spl-token-group-interface" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator 0.1.0", + "spl-pod 0.1.1", + "spl-program-error 0.3.0", +] + +[[package]] +name = "spl-token-group-interface" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d419b5cfa3ee8e0f2386fd7e02a33b3ec8a7db4a9c7064a2ea24849dc4a273b6" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator 0.2.2", + "spl-pod 0.2.2", + "spl-program-error 0.4.0", +] + [[package]] name = "spl-token-metadata-interface" version = "0.2.0" @@ -4728,26 +4995,56 @@ checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" dependencies = [ "borsh 0.10.3", "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", + "spl-discriminator 0.1.0", + "spl-pod 0.1.1", + "spl-program-error 0.3.0", + "spl-type-length-value 0.3.0", +] + +[[package]] +name = "spl-token-metadata-interface" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30179c47e93625680dabb620c6e7931bd12d62af390f447bc7beb4a3a9b5feee" +dependencies = [ + "borsh 1.3.1", + "solana-program", + "spl-discriminator 0.2.2", + "spl-pod 0.2.2", + "spl-program-error 0.4.0", + "spl-type-length-value 0.4.3", ] [[package]] name = "spl-transfer-hook-interface" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b" +checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" dependencies = [ "arrayref", "bytemuck", "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-tlv-account-resolution", - "spl-type-length-value", + "spl-discriminator 0.1.0", + "spl-pod 0.1.1", + "spl-program-error 0.3.0", + "spl-tlv-account-resolution 0.5.1", + "spl-type-length-value 0.3.0", +] + +[[package]] +name = "spl-transfer-hook-interface" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66a98359769cd988f7b35c02558daa56d496a7e3bd8626e61f90a7c757eedb9b" +dependencies = [ + "arrayref", + "bytemuck", + "solana-program", + "spl-discriminator 0.2.2", + "spl-pod 0.2.2", + "spl-program-error 0.4.0", + "spl-tlv-account-resolution 0.6.3", + "spl-type-length-value 0.4.3", ] [[package]] @@ -4758,9 +5055,22 @@ checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" dependencies = [ "bytemuck", "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", + "spl-discriminator 0.1.0", + "spl-pod 0.1.1", + "spl-program-error 0.3.0", +] + +[[package]] +name = "spl-type-length-value" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "422ce13429dbd41d2cee8a73931c05fda0b0c8ca156a8b0c19445642550bb61a" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator 0.2.2", + "spl-pod 0.2.2", + "spl-program-error 0.4.0", ] [[package]] @@ -4813,15 +5123,33 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.55", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "synstructure" version = "0.12.6" @@ -4916,22 +5244,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -5019,7 +5347,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.6", "tokio-macros", "windows-sys 0.48.0", ] @@ -5032,7 +5360,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -5103,14 +5431,26 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -5121,13 +5461,37 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow", +] + [[package]] name = "tower-service" version = "0.3.2" @@ -5155,7 +5519,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] @@ -5269,9 +5633,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "unsize" @@ -5288,6 +5652,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "uriparse" version = "0.6.4" @@ -5300,9 +5670,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -5372,9 +5742,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5382,16 +5752,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", "wasm-bindgen-shared", ] @@ -5409,9 +5779,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5419,22 +5789,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" @@ -5501,15 +5871,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -5520,18 +5881,12 @@ dependencies = [ ] [[package]] -name = "windows-targets" -version = "0.42.2" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.52.4", ] [[package]] @@ -5550,10 +5905,19 @@ dependencies = [ ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" +name = "windows-targets" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "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_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", +] [[package]] name = "windows_aarch64_gnullvm" @@ -5562,10 +5926,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" +name = "windows_aarch64_gnullvm" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -5574,10 +5938,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] -name = "windows_i686_gnu" -version = "0.42.2" +name = "windows_aarch64_msvc" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -5586,10 +5950,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] -name = "windows_i686_msvc" -version = "0.42.2" +name = "windows_i686_gnu" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -5598,10 +5962,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" +name = "windows_i686_msvc" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -5610,10 +5974,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" +name = "windows_x86_64_gnu" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -5622,10 +5986,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" +name = "windows_x86_64_gnullvm" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -5633,6 +5997,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + [[package]] name = "winnow" version = "0.5.15" @@ -5698,6 +6068,26 @@ dependencies = [ "time", ] +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.55", +] + [[package]] name = "zeroize" version = "1.3.0" @@ -5715,7 +6105,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.55", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/by-name/an/anchor/package.nix b/third_party/nixpkgs/pkgs/by-name/an/anchor/package.nix index 6d577075af..e83f84db83 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/anchor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/anchor/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "anchor"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "coral-xyz"; repo = "anchor"; rev = "v${version}"; - hash = "sha256-hOpdCVO3fXMqnAihjXXD9SjqK4AMhQQhZmISqJnDVCI="; + hash = "sha256-eodmmiKLRRvAynqOeS9gMMjeTqVdZDx0TqHtZj2SJvs="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/by-name/an/annotator/package.nix b/third_party/nixpkgs/pkgs/by-name/an/annotator/package.nix index 3d2498e335..115d6db2d8 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/annotator/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/annotator/package.nix @@ -5,7 +5,7 @@ , meson , ninja , vala -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , libgee , pantheon @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meson ninja vala - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils ]; diff --git a/third_party/nixpkgs/pkgs/by-name/an/ansel/package.nix b/third_party/nixpkgs/pkgs/by-name/an/ansel/package.nix index 82cafc40bd..54fa01bf0d 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/ansel/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/ansel/package.nix @@ -54,7 +54,7 @@ , libgpg-error , libxkbcommon , osm-gps-map -, wrapGAppsHook +, wrapGAppsHook3 , rav1e , dav1d , libgcrypt @@ -77,7 +77,7 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "unstable-2024-02-23"; + version = "0-unstable-2024-02-23"; src = fetchFromGitHub { owner = "aurelienpierreeng"; @@ -98,7 +98,7 @@ stdenv.mkDerivation { pkg-config perlPackages.perl python3Packages.jsonschema - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -160,7 +160,10 @@ stdenv.mkDerivation { ) ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + # Tags inherited from Darktable, + a "nightly" 0.0.0 tag that new artefacts get attached to + hardcodeZeroVersion = true; + }; meta = { description = "A darktable fork minus the bloat plus some design vision"; diff --git a/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix b/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix index ff2dff5dc4..99725d863d 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "antares"; - version = "0.7.22"; + version = "0.7.24"; src = fetchFromGitHub { owner = "antares-sql"; repo = "antares"; rev = "v${version}"; - hash = "sha256-SYnhrwxoyVw+bwfN1PGMsoul+mTfi8UkiP0fNOvVTBc="; + hash = "sha256-jMtUDqxWwfXl9x61ycohTaacNAhWawL3Z4+OPW5nbOI="; }; - npmDepsHash = "sha256-5khFw8Igu2d5SYLh7OiCpUDMOVH5gAje+VnvoESQboo="; + npmDepsHash = "sha256-GC1hdRO8rrM97AMYCxWeNtJhyVdbKgitKLkWX7kGCwg="; buildInputs = [ nodejs ]; diff --git a/third_party/nixpkgs/pkgs/by-name/an/anyrun/package.nix b/third_party/nixpkgs/pkgs/by-name/an/anyrun/package.nix index 8d0ee80d7e..69362904f4 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/anyrun/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/anyrun/package.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , atk , cairo , gdk-pixbuf @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix b/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix index 85f9135f2c..2ec353a178 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix @@ -2,19 +2,18 @@ let pname = "anytype"; - version = "0.39.0"; + version = "0.40.8"; name = "Anytype-${version}"; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; name = "Anytype-${version}.AppImage"; - hash = "sha256-Sgrgwp8yZGMLq25tHuoQquNjHTEbRPmFqzpMHnjq7oI="; + hash = "sha256-Rvl52nKrOWQfT2qgssEpFjQCjva54zPvm6aEXmO0NTc="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in appimageTools.wrapType2 { inherit name src; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) - ++ [ pkgs.libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} diff --git a/third_party/nixpkgs/pkgs/by-name/ap/aphorme/package.nix b/third_party/nixpkgs/pkgs/by-name/ap/aphorme/package.nix new file mode 100644 index 0000000000..b46dceef65 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ap/aphorme/package.nix @@ -0,0 +1,52 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, wayland +, libxkbcommon +, libGL +, stdenv +, testers +, aphorme +, autoPatchelfHook +}: + +rustPlatform.buildRustPackage rec { + pname = "aphorme"; + version = "0.1.19"; + + src = fetchFromGitHub { + owner = "Iaphetes"; + repo = "aphorme_launcher"; + rev = "refs/tags/v${version}"; + hash = "sha256-p1ZIMMDyQWVzoeyHb3sbeV6XQwbIDoQwJU8ynI8hGUI="; + }; + + cargoHash = "sha256-aFoy5KTapx+5aIzvDwMfjxZQ6WKQtvX3h7rNX4LBeN8="; + + # No tests exist + doCheck = false; + + buildInputs = [ stdenv.cc.cc.lib ]; + nativeBuildInputs = [ autoPatchelfHook ]; + + runtimeDependencies = [ + wayland + libGL + libxkbcommon + ]; + + passthru.tests.version = testers.testVersion { + package = aphorme; + command = "aphorme --version"; + version = "aphorme ${version}"; + }; + + meta = { + description = "A program launcher for window managers, written in Rust"; + mainProgram = "aphorme"; + homepage = "https://github.com/Iaphetes/aphorme_launcher"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ anytimetraveler ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix b/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix index c350188991..ca82f07939 100644 --- a/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.65.1"; + version = "1.65.2"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-YGawN0mAJHfWkre+0tunPM/psd9aBWtSVsJoar0WVwY="; + hash = "sha256-UBGFY6MamoQyzPmjmz6TmeiF8DTXV/Lpl5HFbxMUPE8="; }; - vendorHash = "sha256-CsOnHHq3UjNWjfMy1TjXy20B0Bni6Fr3ZMJGvU7QDFA="; + vendorHash = "sha256-VPCTyJI02KL6Gn+gdTy36uEbDI71ORrSZnXuWqP0KrM="; subPackages = [ "cmd/api-linter" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ap/apostrophe/package.nix b/third_party/nixpkgs/pkgs/by-name/ap/apostrophe/package.nix new file mode 100644 index 0000000000..503e4ff2f1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ap/apostrophe/package.nix @@ -0,0 +1,118 @@ +{ + lib, + fetchFromGitLab, + gtksourceview5, + libspelling, + fetchFromGitHub, + python3Packages, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + desktop-file-utils, + gobject-introspection, + libadwaita, + webkitgtk_6_0, + texliveMedium, + shared-mime-info, +}: + +let + version = "3.0"; + + src = fetchFromGitLab { + owner = "World"; + repo = "apostrophe"; + domain = "gitlab.gnome.org"; + rev = "v${version}"; + sha256 = "sha256-wKxRCU00nSk7F8IZNWoLRtGs3m6ol3UBnArtppUOz/g="; + }; + + # Patches are required by upstream. Without the patches + # typing `- aaa`, newline, `- bbb` the program crashes + gtksourceview5-patched = gtksourceview5.overrideAttrs (prev: { + patches = (prev.patches or [ ]) ++ [ "${src}/build-aux/flatpak/sourceview_text_commits.patch" ]; + }); + + libspelling-patched = + (libspelling.override { gtksourceview5 = gtksourceview5-patched; }).overrideAttrs + (prev: { + patches = (prev.patches or [ ]) ++ [ "${src}/build-aux/flatpak/libspelling_text_commits.patch" ]; + }); + + reveal-js = fetchFromGitHub { + owner = "hakimel"; + repo = "reveal.js"; + + # keep in sync with upstream shipped version + # in build-aux/flatpak/org.gnome.gitlab.somas.Apostrophe.json + rev = "4.6.0"; + hash = "sha256-a+J+GasFmRvu5cJ1GLXscoJ+owzFXsLhCbeDbYChkyQ="; + }; +in +python3Packages.buildPythonApplication rec { + inherit version src; + pname = "apostrophe"; + pyproject = false; + + postPatch = + '' + substituteInPlace build-aux/meson_post_install.py \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' + + patchShebangs --build build-aux/meson_post_install.py + '' + # Should be done in postInstall, but meson checks this eagerly before build + + '' + install -d $out/share/apostrophe/libs + cp -r ${reveal-js} $out/share/apostrophe/libs/reveal.js + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + desktop-file-utils + gobject-introspection + ]; + + buildInputs = [ + libadwaita + gtksourceview5-patched + libspelling-patched + webkitgtk_6_0 + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pypandoc + chardet + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + ''${gappsWrapperArgs[@]} + --prefix PATH : "${texliveMedium}/bin" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + passthru = { + inherit gtksourceview5-patched libspelling-patched reveal-js; + }; + + meta = { + homepage = "https://gitlab.gnome.org/World/apostrophe"; + description = "A distraction free Markdown editor for GNU/Linux"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + sternenseemann + aleksana + ]; + mainProgram = "apostrophe"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ap/apt/package.nix b/third_party/nixpkgs/pkgs/by-name/ap/apt/package.nix index 230e82e28a..945be641d8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ap/apt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ap/apt/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.7.14"; + version = "2.9.2"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz"; - hash = "sha256-egF4PwW32Q82rqeHHMBnV0ma6K3pM0l6rrbFCCdOc1g="; + hash = "sha256-gKp0RmsTLlDtjQFZ8Q5kpEi2psZHI9YsQrg6UZnKA6c="; }; # cycle detection; lib can't be split diff --git a/third_party/nixpkgs/pkgs/by-name/ap/apvlv/package.nix b/third_party/nixpkgs/pkgs/by-name/ap/apvlv/package.nix index 5771769323..77ad5a034d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ap/apvlv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ap/apvlv/package.nix @@ -22,7 +22,7 @@ stdenv, testers, webkitgtk, - wrapGAppsHook, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { installShellFiles man pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix index 4d24e46c05..4f8a22e89b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.38.0-48670"; + version = "1.42.0-49714"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-6LJEIkr1NA8HHxbLWtd/OTlPPErh05UTjVhjuZVcmTg="; + hash = "sha256-fPb4g9rGJqeXuO2ytSo/8r0RB/h/EYa763JAFNqIPY8="; }; nativeBuildInputs = [ undmg ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arduino-ide/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arduino-ide/package.nix index 284f3de28a..29268559c0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arduino-ide/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arduino-ide/package.nix @@ -18,13 +18,12 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} - install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/ install -Dm444 ${appimageContents}/${pname}.png -t $out/share/pixmaps/ + substituteInPlace $out/share/applications/${pname}.desktop --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U' ''; - extraPkgs = pkgs: with pkgs; [ libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; meta = with lib; { description = "Open-source electronics prototyping platform"; diff --git a/third_party/nixpkgs/pkgs/by-name/ar/argc/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/argc/package.nix new file mode 100644 index 0000000000..8c286ebff9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ar/argc/package.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPackages, + pkgsCross, + rustPlatform, + stdenv, + fetchFromGitHub, + installShellFiles, +}: + +let + canExecuteHost = stdenv.buildPlatform.canExecute stdenv.hostPlatform; +in +rustPlatform.buildRustPackage rec { + pname = "argc"; + version = "1.14.0"; + + src = fetchFromGitHub { + owner = "sigoden"; + repo = "argc"; + rev = "v${version}"; + hash = "sha256-Li/K5/SLG6JuoRJDz2DQoj1Oi9LQgZWHNvtZ1HVbj88="; + }; + + cargoHash = "sha256-D1T9FWTvwKtAYoqFlR2OmLRLGWhPJ9D8J7lq/QKcBoM="; + + nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc; + + postInstall = '' + ARGC=${if canExecuteHost then ''''${!outputBin}/bin/argc'' else "argc"} + + installShellCompletion --cmd argc \ + --bash <("$ARGC" --argc-completions bash) \ + --fish <("$ARGC" --argc-completions fish) \ + --zsh <("$ARGC" --argc-completions zsh) + ''; + + disallowedReferences = lib.optional (!canExecuteHost) buildPackages.argc; + + passthru = { + tests = { + cross = + ( + if stdenv.hostPlatform.isDarwin then + if stdenv.hostPlatform.isAarch64 then pkgsCross.x86_64-darwin else pkgsCross.aarch64-darwin + else if stdenv.hostPlatform.isAarch64 then + pkgsCross.gnu64 + else + pkgsCross.aarch64-multiplatform + ).argc; + }; + }; + + meta = with lib; { + description = "Command-line options, arguments and sub-commands parser for bash"; + mainProgram = "argc"; + homepage = "https://github.com/sigoden/argc"; + changelog = "https://github.com/sigoden/argc/releases/tag/v${version}"; + license = with licenses; [ + mit + # or + asl20 + ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ar/aribb24/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/aribb24/package.nix new file mode 100644 index 0000000000..84e892cc61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ar/aribb24/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitLab, + testers, + gitUpdater, + autoconf, + automake, + libtool, + pkg-config, + libpng, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "aribb24"; + version = "1.0.4"; + + src = fetchFromGitLab { + domain = "code.videolan.org"; + owner = "jeeb"; + repo = "aribb24"; + rev = "v${finalAttrs.version}"; + hash = "sha256-hq3LnLACZfV+E76ZDEHGlN51fS6AqFnNReE3JlWcv9M="; + }; + + buildInputs = [ + libpng + ]; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + ]; + + preConfigure = "autoreconf --install"; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = with lib; { + description = "A library for ARIB STD-B24, decoding JIS 8 bit characters and parsing MPEG-TS stream"; + homepage = "https://code.videolan.org/jeeb/aribb24/"; + license = licenses.lgpl3Plus; + pkgConfigModules = [ "aribb24" ]; + platforms = platforms.unix; + maintainers = with maintainers; [ jopejoe1 ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ar/ark-pixel-font/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/ark-pixel-font/package.nix index 15d3b4dd43..578552a03f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/ark-pixel-font/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/ark-pixel-font/package.nix @@ -6,13 +6,13 @@ python312Packages.buildPythonPackage rec { pname = "ark-pixel-font"; - version = "2024.04.05"; + version = "2024.05.12"; src = fetchFromGitHub { owner = "TakWolf"; - repo = pname; - rev = version; - hash = "sha256-G34cu/mSt/p8UPJt+Q1T2qy6d9LGgT1Jslt9syRz5eo="; + repo = "ark-pixel-font"; + rev = "refs/tags/${version}"; + hash = "sha256-PGhhKWHDpvOqa3vaI40wuIsAEdWGb62cN7QJeHQqiss="; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arrow-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arrow-cpp/package.nix index 23a2432c82..723acbc253 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arrow-cpp/package.nix @@ -64,26 +64,26 @@ let name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "ad82a736c170e97b7c8c035ebd8a801c17eec170"; - hash = "sha256-wN0dam0ZXOAJ+D8bGDMhsdaV3llI9LsiCXwqW9mR3gQ="; + rev = "25d16511e8d42c2744a1d94d90169e3a36e92631"; + hash = "sha256-fXeWM/8jBfJY7KL6PVfRbzB8i4sp6PHsnMSHCX5kzfI="; }; parquet-testing = fetchFromGitHub { name = "parquet-testing"; owner = "apache"; repo = "parquet-testing"; - rev = "d69d979223e883faef9dc6fe3cf573087243c28a"; - hash = "sha256-CUckfNjfDW05crWigzMP5b9UynviXKGZUlIr754OoGU="; + rev = "74278bc4a1122d74945969e6dec405abd1533ec3"; + hash = "sha256-WbpndtAviph6+I/F2bevuMI9DkfSv4SMPgMaP98k6Qo="; }; in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; - version = "15.0.0"; + version = "16.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${finalAttrs.version}/apache-arrow-${finalAttrs.version}.tar.gz"; - hash = "sha256-Ad0/cOhdm1uTPsksDbik71BKUQX3jS2GIuhCeftFwl0="; + hash = "sha256-n0BRrpRzyXmR2a+AHi+UrjRVBncZyn+QuBN/nppwC40="; }; sourceRoot = "apache-arrow-${finalAttrs.version}/cpp"; @@ -116,8 +116,8 @@ stdenv.mkDerivation (finalAttrs: { ARROW_SUBSTRAIT_URL = fetchFromGitHub { owner = "substrait-io"; repo = "substrait"; - rev = "v0.27.0"; - hash = "sha256-wptEAXembah04pzqAz6UHeUxp+jMf6Lh/IdyuIhy/a8="; + rev = "v0.44.0"; + hash = "sha256-V739IFTGPtbGPlxcOi8sAaYSDhNUEpITvN9IqdPReug="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arrpc/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arrpc/package.nix index aefee98b0e..137cd7cde2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arrpc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arrpc/package.nix @@ -3,18 +3,18 @@ , fetchFromGitHub }: buildNpmPackage rec { pname = "arrpc"; - version = "3.3.1"; + version = "3.4.0"; src = fetchFromGitHub { owner = "OpenAsar"; repo = "arrpc"; # Release commits are not tagged - # release: 3.3.0 - rev = "b4796fffe3bf1b1361cc4781024349f7a4f9400e"; - hash = "sha256-iEfV85tRl2KyjodoaSxVHiqweBpLeiCAYWc8+afl/sA="; + # release: 3.4.0 + rev = "cca93db585dedf8acc1423f5e2db215de95c4c3b"; + hash = "sha256-SeegrCgbjfVxG/9xfOcdfbVdDssZOhjBRnDipu6L7Wg="; }; - npmDepsHash = "sha256-YlSUGncpY0MyTiCfZcPsfcNx3fR+SCtkOFWbjOPLUzk="; + npmDepsHash = "sha256-S9cIyTXqCp8++Yj3VjBbcStOjzjgd0Cq7KL7NNzZFpY="; dontNpmBuild = true; diff --git a/third_party/nixpkgs/pkgs/by-name/as/ascii-draw/fix_palette_data_dir.patch b/third_party/nixpkgs/pkgs/by-name/as/ascii-draw/fix_palette_data_dir.patch deleted file mode 100644 index 64cf5af6d9..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/as/ascii-draw/fix_palette_data_dir.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/window.py b/src/window.py -index adc6d6d..1cb6bec 100644 ---- a/src/window.py -+++ b/src/window.py -@@ -34,6 +34,15 @@ import unicodedata - import emoji - import os - -+def get_data_dir(): -+ xdg_data_home = os.environ.get('XDG_DATA_HOME') -+ if xdg_data_home and xdg_data_home.strip(): -+ data_dir = os.path.join(xdg_data_home, 'ascii-draw', 'data') -+ else: -+ home = os.path.expanduser("~") -+ data_dir = os.path.join(home, '.local', 'share', 'ascii-draw', 'data') -+ return data_dir -+ - @Gtk.Template(resource_path='/io/github/nokse22/asciidraw/ui/window.ui') - class AsciiDrawWindow(Adw.ApplicationWindow): - __gtype_name__ = 'AsciiDrawWindow' -@@ -266,7 +275,7 @@ class AsciiDrawWindow(Adw.ApplicationWindow): - - self.palettes = [] - -- directory_path = "/var/data/palettes" -+ directory_path = f"{get_data_dir()}/palettes" - os.makedirs(directory_path, exist_ok=True) - - for filename in os.listdir(directory_path): -@@ -316,7 +325,7 @@ class AsciiDrawWindow(Adw.ApplicationWindow): - self.char_carousel_go_next.set_sensitive(True) - - def save_new_palette(self, palette): -- with open(f"/var/data/palettes/{palette.name}.txt", 'w') as file: -+ with open(f"{get_data_dir()}/palettes/{palette.name}.txt", 'w') as file: - file.write(palette.chars) - - @Gtk.Template.Callback("char_pages_go_back") diff --git a/third_party/nixpkgs/pkgs/by-name/as/ascii-draw/package.nix b/third_party/nixpkgs/pkgs/by-name/as/ascii-draw/package.nix index 838eb01183..801ec0da0d 100644 --- a/third_party/nixpkgs/pkgs/by-name/as/ascii-draw/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/as/ascii-draw/package.nix @@ -12,20 +12,16 @@ python3Packages.buildPythonApplication rec { pname = "ascii-draw"; - version = "0.3.0"; + version = "0.3.2"; pyproject = false; src = fetchFromGitHub { owner = "Nokse22"; repo = "ascii-draw"; rev = "v${version}"; - hash = "sha256-vI+j8OuQ3b6La0+7wWeoUtBal24dazlN/T0Bng5TgMo="; + hash = "sha256-opjYgLfHfKSbipB1HRxfBkgp+9c4yqIL1fiUOcFmCMc="; }; - # Temporary fix for autosaving to flatpak directory - # https://github.com/Nokse22/ascii-draw/issues/31 - patches = [ ./fix_palette_data_dir.patch ]; - nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/by-name/as/asm-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/as/asm-lsp/package.nix index b68123dd42..9a44f68ca6 100644 --- a/third_party/nixpkgs/pkgs/by-name/as/asm-lsp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/as/asm-lsp/package.nix @@ -6,7 +6,7 @@ }: let pname = "asm-lsp"; - version = "0.4.2"; + version = "0.6.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage { owner = "bergercookie"; repo = "asm-lsp"; rev = "v${version}"; - hash = "sha256-EGgYOU6y23ULjnMGNjYhgF0JMPgvRuQ4UOWqwJxhBpU="; + hash = "sha256-vOkuTJFP2zme8S+u5j1TXt6BXnwtASRVH4Dre9g1dtk="; }; nativeBuildInputs = [ @@ -26,7 +26,12 @@ rustPlatform.buildRustPackage { openssl ]; - cargoHash = "sha256-x8Cj39Wki+pdoNIO8QPGK29KFJrHtDMoZJIXFEldno0="; + cargoHash = "sha256-lmOnBcLWfTCuQcPiRmPoFD/QvagfkApFP6/h1ot7atU="; + + # tests expect ~/.cache/asm-lsp to be writable + preCheck = '' + export HOME=$(mktemp -d) + ''; meta = { description = "Language server for NASM/GAS/GO Assembly"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/assemblyscript/default.nix b/third_party/nixpkgs/pkgs/by-name/as/assemblyscript/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/assemblyscript/default.nix rename to third_party/nixpkgs/pkgs/by-name/as/assemblyscript/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/as/ast-grep/package.nix b/third_party/nixpkgs/pkgs/by-name/as/ast-grep/package.nix index 51cca74862..4e001f3445 100644 --- a/third_party/nixpkgs/pkgs/by-name/as/ast-grep/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/as/ast-grep/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.20.5"; + version = "0.22.3"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-pAFxgmoyx8fOKzlf//uv39fEValtOBq66iAPjOCxqjA="; + hash = "sha256-Q2xVB9GZBtXx67rKpeTpy1llXCBpgn9vdZmYkQVHtp8="; }; - cargoHash = "sha256-dh6jFnWzIexvQY8lFbDfUeHfDe/kR9UXbZBepNUCap4="; + cargoHash = "sha256-0N98WvNLlflNCu7I2nHDSgFHDmbMVqwu4YkqA9GNSwM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/as/async-profiler/package.nix b/third_party/nixpkgs/pkgs/by-name/as/async-profiler/package.nix new file mode 100644 index 0000000000..4e7f2c1761 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/as/async-profiler/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + jdk, + makeWrapper, +}: +stdenv.mkDerivation rec { + pname = "async-profiler"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "jvm-profiling-tools"; + repo = "async-profiler"; + rev = "v${version}"; + hash = "sha256-0CCJoRjRLq4LpiRD0ibzK8So9qSQymePCTYUI60Oy2k="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ jdk ]; + + installPhase = + let + ext = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + runHook preInstall + install -D build/bin/asprof "$out/bin/async-profiler" + install -D build/lib/libasyncProfiler${ext} "$out/lib/libasyncProfiler${ext}" + runHook postInstall + ''; + + fixupPhase = '' + wrapProgram $out/bin/async-profiler --prefix PATH : ${lib.makeBinPath [ jdk ]} + ''; + + meta = with lib; { + description = "A low overhead sampling profiler for Java that does not suffer from Safepoint bias problem"; + homepage = "https://github.com/jvm-profiling-tools/async-profiler"; + license = licenses.asl20; + maintainers = with maintainers; [ mschuwalow ]; + platforms = platforms.all; + mainProgram = "async-profiler"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/at/atac/package.nix b/third_party/nixpkgs/pkgs/by-name/at/atac/package.nix index 5ea7cbf56d..abb9133521 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/atac/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/atac/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.12.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-yR+w6zrX7XHrK6XGWM7J74XPxGEmy8Gf6guOH/Du6rc="; + hash = "sha256-WDO6HDmjlXU4uelAJIWJN2sOJTioR7i2WzQpqg6dtKo="; }; - cargoHash = "sha256-Ez8d1tb0Xi91e3+U1/LDmj5u/oORQzelEQPFAC96yEI="; + cargoHash = "sha256-+dBEl1qk1/3WuSypsxV4x7DEmnMxa2z0MC03IZaON3s="; nativeBuildInputs = [ pkg-config @@ -29,7 +29,9 @@ rustPlatform.buildRustPackage rec { oniguruma ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/third_party/nixpkgs/pkgs/by-name/at/atf/package.nix b/third_party/nixpkgs/pkgs/by-name/at/atf/package.nix new file mode 100644 index 0000000000..a9810826dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/at/atf/package.nix @@ -0,0 +1,89 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + autoreconfHook, + kyua, + pkg-config, + gitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "atf"; + version = "0.21-unstable-2021-09-01"; # Match the commit used in FreeBSD’s port. + + src = fetchFromGitHub { + owner = "freebsd"; + repo = "atf"; + rev = "55c21b2c5fb189bbdfccb2b297bfa89236502542"; + hash = "sha256-u0YBPcoIBvqBVaytaO9feBaRnQygtzEPGJV0ItI1Vco="; + }; + + patches = [ + # Fixes use after free that causes failures in Kyua’s test suite. + # https://github.com/freebsd/atf/pull/57 + # https://github.com/freebsd/kyua/issues/223 + (fetchpatch { + name = "fix-use-after-free.patch"; + url = "https://github.com/freebsd/atf/commit/fb22f3837bcfdce5ce8b3c0e18af131bb6902a02.patch"; + hash = "sha256-p4L3sxSYfMSzwKrUDlEZpoJydbaK3Hcbvn90KlPHkic="; + }) + ]; + + postPatch = + lib.optionalString finalAttrs.doInstallCheck '' + # https://github.com/freebsd/atf/issues/61 + substituteInPlace atf-c/check_test.c \ + --replace-fail 'ATF_TP_ADD_TC(tp, build_cpp)' "" + substituteInPlace atf-c++/check_test.cpp \ + --replace-fail 'ATF_ADD_TEST_CASE(tcs, build_cpp);' "" + # Can’t find `c_helpers` in the work folder. + substituteInPlace test-programs/Kyuafile \ + --replace-fail 'atf_test_program{name="srcdir_test"}' "" + '' + # These tests fail on Darwin. + + lib.optionalString (finalAttrs.doInstallCheck && stdenv.isDarwin) '' + substituteInPlace atf-c/detail/process_test.c \ + --replace-fail 'ATF_TP_ADD_TC(tp, status_coredump);' "" + '' + # This test fails on Linux. + + lib.optionalString (finalAttrs.doInstallCheck && stdenv.isLinux) '' + substituteInPlace atf-c/detail/fs_test.c \ + --replace-fail 'ATF_TP_ADD_TC(tp, eaccess);' "" + ''; + + strictDeps = true; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + makeFlags = [ + # ATF isn’t compatible with C++17, which is the default on current clang and GCC. + "CXXFLAGS=-std=c++11" + ]; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ kyua ]; + + installCheckPhase = '' + runHook preInstallCheck + HOME=$TMPDIR PATH=$out/bin:$PATH kyua test + runHook postInstallCheck + ''; + + passthru.updateScript = gitUpdater { rev-prefix = "atf-"; }; + + __structuredAttrs = true; + + meta = { + description = "Libraries to write tests in C, C++, and shell"; + homepage = "https://github.com/freebsd/atf/"; + license = lib.licenses.bsd3; + mainProgram = "atf-sh"; + maintainers = with lib.maintainers; [ reckenrode ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/at/athens/package.nix b/third_party/nixpkgs/pkgs/by-name/at/athens/package.nix index 627a2f1b31..3f9e3755ef 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/athens/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/athens/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "athens"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "gomods"; repo = "athens"; rev = "v${version}"; - hash = "sha256-psO3x8xLWGSlsZT2HiAvYWP1rCvbWUx+WoJ4eves9lw="; + hash = "sha256-5E9jBV+m19AUtSTpTlkCx8JUHwlcM2pgSGfo4zPqDNk="; }; - vendorHash = "sha256-hk0hmkmhRPRbh2Yqf1lYei6iiKUurMfc1Y3VPNStcBs="; + vendorHash = "sha256-LajNPzGbWqW+9aqiquk2LvSUjKwi1gbDY4cKXmn3PWk="; CGO_ENABLED = "0"; ldflags = [ "-s" "-w" "-X github.com/gomods/athens/pkg/build.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/at/atlauncher/package.nix b/third_party/nixpkgs/pkgs/by-name/at/atlauncher/package.nix index 60345adee0..bc87f555ff 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/atlauncher/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/atlauncher/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.36.3"; + version = "3.4.36.4"; src = fetchurl { url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-qeH3W7G6xxlIrLK04A3GTKtZsvmii6acWY4clPIL8Rk="; + hash = "sha256-7l4D99rTOP+oyaa+O8GPGugr3Nv8EIt6EqK1L9ttFBA="; }; env.ICON = fetchurl { diff --git a/third_party/nixpkgs/pkgs/by-name/au/audiness/package.nix b/third_party/nixpkgs/pkgs/by-name/au/audiness/package.nix index 06d3e4c49a..40dafa7628 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/audiness/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/au/audiness/package.nix @@ -6,17 +6,20 @@ python3.pkgs.buildPythonApplication rec { pname = "audiness"; - version = "0.3.2"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "audiusGmbH"; repo = "audiness"; rev = "refs/tags/${version}"; - hash = "sha256-vc2k3oEMTgzm/C6z6BieRrT3cSP0IkY+D3RXkNGaZTE="; + hash = "sha256-UJe4ZawjAuUoSKEdIgjh8zZu/amYLZ8rpUDahSHokKA="; }; - pythonRelaxDeps = [ "validators" ]; + pythonRelaxDeps = [ + "typer" + "validators" + ]; build-system = with python3.pkgs; [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/by-name/au/audio-sharing/package.nix b/third_party/nixpkgs/pkgs/by-name/au/audio-sharing/package.nix index d773720efd..d1a4ec2b01 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/audio-sharing/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/au/audio-sharing/package.nix @@ -21,20 +21,20 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "audio-sharing"; - version = "0.2.2"; + version = "0.2.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "AudioSharing"; rev = finalAttrs.version; - hash = "sha256-ejNktgN9tfi4TzWDQJnESGcBkpvLVH34sukTFCBfo3U="; + hash = "sha256-yUMiy5DaCPfCmBIGCXpqtvSSmQl5wo6vsLdW7Tt/Wfo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-c19DxHF4HFN0qTqC2CNzwko79uVeLeyrrXAvuyxeiOQ="; + hash = "sha256-FfjSttXf6WF2w59CP6L/+BIuuXp2yKPTku7FMvdIHg0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json b/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json index 115584aa55..d3e8daf45c 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json +++ b/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "166454ef43e3cdb42c644cdccdacddd3a880cd89", - "hash": "sha256-QrGzlSGK7WDlRemS13CmHdg563HFv9QhOpCF+XRxXsg=", - "version": "2.8.1", - "depsHash": "sha256-CzlwpgSgsQZGuRWTA/IkCyaryCSurH74WR5Rhm5faEk=", - "clientDepsHash": "sha256-s7/Rlj3DrYjUkxAN82bTpWe+D4HdVOc1mrqKgqcJuI4=" + "rev": "8b27c726d51cd9706cd564ef72377b89db3194b3", + "hash": "sha256-9WqMcehlGhSMI08u6/LSNOrLhCCl8coEHAUUM5KLnx8=", + "version": "2.9.0", + "depsHash": "sha256-ll96aPw6lO7B1c5s7uIpn3poPu/JRa/weins5SNMQw4=", + "clientDepsHash": "sha256-uqHfU38BLqigGzKJC/i/bftLJbCmHaOcj04d1bu4K1I=" } diff --git a/third_party/nixpkgs/pkgs/by-name/au/autopsy/package.nix b/third_party/nixpkgs/pkgs/by-name/au/autopsy/package.nix new file mode 100644 index 0000000000..359a7affa3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/au/autopsy/package.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, makeWrapper, fetchzip, testdisk, imagemagick, jdk, findutils, sleuthkit, ... }: +let + jdkWithJfx = jdk.override (lib.optionalAttrs stdenv.isLinux { + enableJavaFX = true; + }); +in +stdenv.mkDerivation rec { + pname = "autopsy"; + version = "4.21.0"; + + src = fetchzip { + url = "https://github.com/sleuthkit/autopsy/releases/download/autopsy-${version}/autopsy-${version}.zip"; + sha256 = "32iOQA3+ykltCYW/MpqCVxyhh3mm6eYzY+t0smAsWRw="; + }; + + nativeBuildInputs = [ makeWrapper findutils ]; + buildInputs = [ testdisk imagemagick jdkWithJfx ]; + + installPhase = '' + runHook preInstall + + cp -r . $out + + # Run the provided setup script to make files executable and copy sleuthkit + TSK_JAVA_LIB_PATH="${sleuthkit}/share/java" bash $out/unix_setup.sh -j '${jdkWithJfx}' -n autopsy + + substituteInPlace $out/bin/autopsy \ + --replace-warn 'APPNAME=`basename "$PRG"`' 'APPNAME=autopsy' + wrapProgram $out/bin/autopsy \ + --run 'export SOLR_LOGS_DIR="$HOME/.autopsy/dev/var/log"' \ + --run 'export SOLR_PID_DIR="$HOME/.autopsy/dev"' \ + --prefix PATH : "${lib.makeBinPath [ testdisk imagemagick jdkWithJfx ]}" + + runHook postInstall + ''; + + meta = { + description = "Graphical interface to The Sleuth Kit and other open source digital forensics tools"; + homepage = "https://www.sleuthkit.org/autopsy"; + changelog = "https://github.com/sleuthkit/autopsy/releases/tag/autopsy-${version}"; + # Autopsy brings a lot of vendored dependencies + license = with lib.licenses; [ asl20 ipl10 lgpl3Only lgpl21Only zlib wtfpl bsd3 cc-by-30 mit gpl2Only ]; + maintainers = with lib.maintainers; [ zebreus ]; + mainProgram = "autopsy"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + # Autopsy theoretically also supports darwin + platforms = lib.platforms.x86_64; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/au/autosuspend/package.nix b/third_party/nixpkgs/pkgs/by-name/au/autosuspend/package.nix index a39d3ec782..63f4c07c28 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/autosuspend/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/au/autosuspend/package.nix @@ -7,15 +7,15 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "6.1.1"; + version = "7.0.0"; - disabled = python3.pythonOlder "3.8"; + disabled = python3.pythonOlder "3.10"; src = fetchFromGitHub { owner = "languitar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LGU/yhwuc6BuctCibm0AaRheQkuSIgEVXzcWQHCJ/8Y="; + hash = "sha256-AJ0ZWRxqhBJEics6XnIVWyf7pJI8MphQU4LRqSYYNSQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/ax/ax25ms/package.nix b/third_party/nixpkgs/pkgs/by-name/ax/ax25ms/package.nix new file mode 100644 index 0000000000..94a5ca9ce6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ax/ax25ms/package.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, protobuf +, pkg-config +, grpc +, libtool +, which +, automake +, libax25 +}: + +stdenv.mkDerivation { + pname = "ax25ms"; + version = "0-unstable-2024-04-28"; + + src = fetchFromGitHub { + owner = "ThomasHabets"; + repo = "ax25ms"; + rev = "c7d7213bb182e4b60f655c3f9f1bcb2b2440406b"; + hash = "sha256-GljGJa44topJ6T0g5wuU8GTHLKzNmQqUl8/AR+pw2+I="; + }; + + buildInputs = [ + protobuf + grpc + libax25 + ]; + + nativeBuildInputs = [ + which + pkg-config + autoconf + libtool + automake + ]; + + preConfigure = '' + patchShebangs scripts + ./bootstrap.sh + ''; + + postInstall = '' + set +e + for binary_path in "$out/bin"/*; do + filename=$(basename "$binary_path") + mv "$binary_path" "$out/bin/ax25ms-$filename" + done + set -e + ''; + + meta = with lib; { + description = "Set of AX.25 microservices, designed to be pluggable for any implementation"; + homepage = "https://github.com/ThomasHabets/ax25ms"; + license = licenses.asl20; + maintainers = with maintainers; [ + matthewcroughan + sarcasticadmin + pkharvey + ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix index 9b8419df89..06ba4efc13 100644 --- a/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , gitUpdater , nixosTests , ayatana-indicator-messages @@ -24,7 +23,7 @@ , python3 , systemd , tzdata -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -32,38 +31,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-datetime"; - version = "23.10.1"; + version = "24.2.0"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-datetime"; rev = finalAttrs.version; - hash = "sha256-cm1zhG9TODGe79n/fGuyVnWL/sjxUc3ZCu9FhqA1NLE="; + hash = "sha256-J3Yp7Dx4UvvdlM8Cp1sPe4Ftm/aAmNzpo4re/jF7pRo="; }; - patches = [ - # Fix test-menus building & running - # Remove when version > 23.10.1 - (fetchpatch { - name = "0001-ayatana-indicator-datetime-Fix-test-menus-tests.patch"; - url = "https://github.com/AyatanaIndicators/ayatana-indicator-datetime/commit/ddabb4a61a496da14603573b700c5961a3e5b834.patch"; - hash = "sha256-vf8aVXonCoTWMuAQZG6FuklWR2IaGY4hecFtoyNCGg8="; - }) - - # Fix EDS-related tests - # Remove when version > 23.10.1 - (fetchpatch { - name = "0002-ayatana-indicator-datetime-Fix-EDS-colour-tests.patch"; - url = "https://github.com/AyatanaIndicators/ayatana-indicator-datetime/commit/6d67f7b458911833e72e0b4a162b1d823609d6f8.patch"; - hash = "sha256-VUdMJuma6rmsjUOeyO0W8UNKADODiM+wDVfj6aDhqgw="; - }) - ]; - postPatch = '' - # Queries systemd user unit dir via pkg_get_variable, can't override prefix + # Override systemd prefix substituteInPlace data/CMakeLists.txt \ - --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_DIR ''${CMAKE_INSTALL_PREFIX}/lib/systemd/user)' \ - --replace-fail '/etc' "\''${CMAKE_INSTALL_FULL_SYSCONFDIR}" + --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \ + --replace-fail 'XDG_AUTOSTART_DIR "/etc' 'XDG_AUTOSTART_DIR "''${CMAKE_INSTALL_FULL_SYSCONFDIR}' # Looking for Lomiri schemas for code generation substituteInPlace src/CMakeLists.txt \ @@ -77,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { glib # for schema hook intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -136,8 +117,8 @@ stdenv.mkDerivation (finalAttrs: { ]} ''; + # schema is already added automatically by wrapper, EDS needs to be added explicitly preFixup = '' - # schema is already added automatically by wrapper, EDS needs to be added explicitly gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${edsDataDir}" ) diff --git a/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-messages/package.nix b/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-messages/package.nix index c630b1b4e4..7973291d3d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-messages/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-messages/package.nix @@ -20,7 +20,7 @@ , python3 , systemd , vala -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -50,6 +50,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace libmessaging-menu/messaging-menu.pc.in \ --replace "\''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@' \ --replace "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" '@CMAKE_INSTALL_FULL_INCLUDEDIR@' + + # Fix tests with gobject-introspection 1.80 not installing GLib introspection data + substituteInPlace tests/CMakeLists.txt \ + --replace-fail 'GI_TYPELIB_PATH=\"' 'GI_TYPELIB_PATH=\"$GI_TYPELIB_PATH$\{GI_TYPELIB_PATH\:+\:\}' '' + lib.optionalString (!withDocumentation) '' sed -i CMakeLists.txt \ '/add_subdirectory(doc)/d' @@ -63,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { intltool pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals withDocumentation [ docbook_xsl docbook_xml_dtd_45 diff --git a/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-session/package.nix index 4b3d33ea81..d2a5860098 100644 --- a/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-session/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-session/package.nix @@ -16,7 +16,7 @@ , mate , pkg-config , systemd -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { cmake intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ba/backgroundremover/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/backgroundremover/package.nix index e6303bb377..67c2f2eaa6 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/backgroundremover/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/backgroundremover/package.nix @@ -3,20 +3,21 @@ , runCommand , fetchFromGitHub , fetchurl +, gitUpdater }: let p = python3.pkgs; self = p.buildPythonApplication rec { pname = "backgroundremover"; - version = "0.2.6"; + version = "0.2.8"; pyproject = true; src = fetchFromGitHub { owner = "nadermx"; repo = "backgroundremover"; rev = "v${version}"; - hash = "sha256-dDOo7NPwvdfV+ae2oMUytCGC+2HF6xUI7dyKk2we23w="; + hash = "sha256-LjVT4j0OzfbVSQgU0z/gzRTLm7N0RQRrfxtTugWwOxs="; }; models = runCommand "background-remover-models" {} '' @@ -31,7 +32,9 @@ let --replace 'os.path.expanduser(os.path.join("~", ".u2net", model_name + ".pth"))' "os.path.join(\"$models\", model_name + \".pth\")" ''; - nativeBuildInputs = [ p.setuptools p.wheel ]; + nativeBuildInputs = [ p.setuptools p.wheel p.pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "pillow" "torchvision" ]; propagatedBuildInputs = [ p.certifi @@ -76,6 +79,7 @@ let backgroundremover -i ${demoImage} -o $out ''; }; + updateScript = gitUpdater { rev-prefix = "v"; }; }; doCheck = false; # no tests diff --git a/third_party/nixpkgs/pkgs/by-name/ba/badkeys/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/badkeys/package.nix new file mode 100644 index 0000000000..11a7aec3b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ba/badkeys/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: +python3Packages.buildPythonApplication rec { + pname = "badkeys"; + version = "0.0.10"; + pyproject = true; + + src = fetchFromGitHub { + owner = "badkeys"; + repo = "badkeys"; + rev = "v${version}"; + hash = "sha256-4vIPOKU/R+wASEx4OQHjtP6mJSKJDtPgQB968vuT24Y="; + }; + + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + dependencies = with python3Packages; [ + cryptography + gmpy2 + ]; + + optional-dependencies = with python3Packages; [ + dnspython + paramiko + ]; + + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + + pythonImportsCheck = [ "badkeys" ]; + + meta = { + description = "Tool to find common vulnerabilities in cryptographic public keys"; + homepage = "https://badkeys.info/"; + changelog = "https://github.com/badkeys/badkeys/releases/tag/${src.rev}"; + mainProgram = "badkeys"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getchoo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/absolute-ausyscall.patch b/third_party/nixpkgs/pkgs/by-name/bc/bcc/absolute-ausyscall.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/bcc/absolute-ausyscall.patch rename to third_party/nixpkgs/pkgs/by-name/bc/bcc/absolute-ausyscall.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch b/third_party/nixpkgs/pkgs/by-name/bc/bcc/fix-deadlock-detector-import.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch rename to third_party/nixpkgs/pkgs/by-name/bc/bcc/fix-deadlock-detector-import.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/libbcc-path.patch b/third_party/nixpkgs/pkgs/by-name/bc/bcc/libbcc-path.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/bcc/libbcc-path.patch rename to third_party/nixpkgs/pkgs/by-name/bc/bcc/libbcc-path.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix b/third_party/nixpkgs/pkgs/by-name/bc/bcc/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix rename to third_party/nixpkgs/pkgs/by-name/bc/bcc/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/be/bee/package.nix b/third_party/nixpkgs/pkgs/by-name/be/bee/package.nix index a1f9e469b1..1241b0c5a0 100644 --- a/third_party/nixpkgs/pkgs/by-name/be/bee/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/be/bee/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bee"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "ethersphere"; repo = "bee"; rev = "v${version}"; - sha256 = "sha256-gZDmFufk/zBftQe7Ju4rDpZqw0hm2nf9YQg1Oa8540s="; + sha256 = "sha256-4Pg8zKhXQwYK7eGH886sErzkdJRD4iCoQ+mLoS7GlZg="; }; - vendorHash = "sha256-GpazHMQ8xZ6P7mADvsG3bXxDxEWnCJRIsBwDnL/McZA="; + vendorHash = "sha256-YhlUnmJuVejzy1I4+YkNnOPM+AUURr/j3dGdT3J6bVQ="; subPackages = [ "cmd/bee" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix b/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix index ed40f58697..0a62c91c8e 100644 --- a/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix @@ -7,7 +7,7 @@ let pname = "beekeeper-studio"; - version = "4.1.13"; + version = "4.3.1"; plat = { aarch64-linux = "-arm64"; @@ -15,8 +15,8 @@ let }.${stdenv.hostPlatform.system}; hash = { - aarch64-linux = "sha256-8gcxYQ6ZvYC42V/vShFgalJtm8SGZRwtUfwUF9ZirBo="; - x86_64-linux = "sha256-Yfpm6//hhYVKX3YipzmFj3NgEsL2h3eW+9yC0yYiDgk="; + aarch64-linux = "sha256-7ZjyzWeu19zUX1u8t0hMu8F+1LN5/CtEotLNe/5rwPM="; + x86_64-linux = "sha256-vhKvOPPo/a9gwQ8FsC28dStQHI8SYzEbhdEW4elD7bU="; }.${stdenv.hostPlatform.system}; src = fetchurl { @@ -30,7 +30,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/third_party/nixpkgs/pkgs/tools/X11/bevelbar/default.nix b/third_party/nixpkgs/pkgs/by-name/be/bevelbar/package.nix similarity index 53% rename from third_party/nixpkgs/pkgs/tools/X11/bevelbar/default.nix rename to third_party/nixpkgs/pkgs/by-name/be/bevelbar/package.nix index 7eab7a65e8..60dfb62567 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/bevelbar/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/be/bevelbar/package.nix @@ -1,24 +1,24 @@ -{ lib, +{ + lib, stdenv, fetchurl, pkg-config, libX11, libXft, libXrandr, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "bevelbar"; - version = "22.06"; + version = "23.08"; src = fetchurl { url = "https://www.uninformativ.de/git/bevelbar/archives/bevelbar-v${finalAttrs.version}.tar.gz"; - hash = "sha256-8ceFwQFHhJ1qEXJtzoDXU0XRgudaAfsoWq7LYgGEqsM="; + hash = "sha256-4wMSPi9tu+z1AW2uvPefxkeT/5DYo2oJybhNnpe82QU="; }; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 @@ -28,11 +28,19 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "prefix=$(out)" ]; - meta = with lib; { + passthru.updateScript = gitUpdater { + url = "https://www.uninformativ.de/git/bevelbar.git/"; + rev-prefix = "v"; + }; + + meta = { homepage = "https://www.uninformativ.de/git/bevelbar/file/README.html"; description = "X11 status bar with beveled borders"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres neeasade ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + AndersonTorres + neeasade + ]; + platforms = lib.platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/bi/biglybt/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/biglybt/package.nix index ad365c1437..8e0b98bdc7 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/biglybt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/biglybt/package.nix @@ -3,20 +3,20 @@ stdenv, fetchurl, jre, - wrapGAppsHook, + wrapGAppsHook3, nix-update-script, }: stdenv.mkDerivation rec { pname = "biglybt"; - version = "3.5.0.0"; + version = "3.6.0.0"; src = fetchurl { url = "https://github.com/BiglySoftware/BiglyBT/releases/download/v${version}/GitHub_BiglyBT_unix.tar.gz"; - hash = "sha256-ToTCIjunj/ABi3wVSmeddLGBdQlv+CfK2jGRjixJd0w="; + hash = "sha256-a7g9sB3orO2m0X7qNwQ1dDygYPhs/b6kX0RDSG8Wq2U="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; configurePhase = '' runHook preConfigure diff --git a/third_party/nixpkgs/pkgs/applications/video/bilibili/default.nix b/third_party/nixpkgs/pkgs/by-name/bi/bilibili/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/video/bilibili/default.nix rename to third_party/nixpkgs/pkgs/by-name/bi/bilibili/package.nix diff --git a/third_party/nixpkgs/pkgs/applications/audio/waylyrics/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/bi/bite/Cargo.lock similarity index 60% rename from third_party/nixpkgs/pkgs/applications/audio/waylyrics/Cargo.lock rename to third_party/nixpkgs/pkgs/by-name/bi/bite/Cargo.lock index 011548f114..a6a1e33f62 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/waylyrics/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/bi/bite/Cargo.lock @@ -3,12 +3,29 @@ version = 3 [[package]] -name = "addr2line" -version = "0.21.0" +name = "ab_glyph" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" dependencies = [ - "gimli", + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accesskit" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b" +dependencies = [ + "enumn", + "serde", ] [[package]] @@ -17,64 +34,86 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - [[package]] name = "ahash" -version = "0.7.8" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "getrandom", "once_cell", + "serde", "version_check", "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "allocator-api2" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-activity" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39b801912a977c3fd52d80511fe1c0c8480c6f957f21ae2ce1b92ffe970cf4b9" dependencies = [ - "winapi", + "android-properties", + "bitflags 2.4.2", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc 0.2.153", + "log 0.4.20", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", ] [[package]] -name = "anyhow" -version = "1.0.82" +name = "android-properties" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc 0.2.153", +] + +[[package]] +name = "arm" +version = "0.0.0" +dependencies = [ + "bitvec", + "debugvault", + "decoder", + "tokenizing", +] + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -83,33 +122,202 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] -name = "assert_float_eq" -version = "1.1.3" +name = "as-raw-xcb-connection" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cea652ffbedecf29e9cd41bb4c066881057a42c0c119040f022802b26853e77" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] -name = "async-channel" -version = "2.2.1" +name = "ash" +version = "0.37.3+1.3.251" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" dependencies = [ - "concurrent-queue", - "event-listener", - "event-listener-strategy", + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +dependencies = [ + "async-fs", + "async-net", + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "url", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +dependencies = [ + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", "futures-core", "pin-project-lite", ] [[package]] -name = "async-trait" -version = "0.1.80" +name = "async-channel" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +dependencies = [ + "concurrent-queue", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10b3e585719c2358d2660232671ca8ca4ddb4be4ce8a1842d6c2dc8685303316" +dependencies = [ + "async-lock 3.3.0", + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" +dependencies = [ + "async-lock 3.3.0", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-process" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" +dependencies = [ + "async-channel", + "async-io", + "async-lock 3.3.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.0", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + +[[package]] +name = "async-trait" +version = "0.1.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] @@ -119,8 +327,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4" dependencies = [ "atk-sys", - "glib 0.18.5", - "libc", + "glib", + "libc 0.2.153", ] [[package]] @@ -129,55 +337,60 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" dependencies = [ - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", + "glib-sys", + "gobject-sys", + "libc 0.2.153", "system-deps", ] [[package]] -name = "atty" -version = "0.2.14" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +name = "binformat" +version = "0.0.0" dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", + "log 0.0.0", "object", - "rustc-demangle", + "processor_shared", ] [[package]] -name = "base64" -version = "0.22.0" +name = "bit-set" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] [[package]] -name = "base64ct" -version = "1.6.0" +name = "bit-vec" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bite" +version = "0.2.1" +dependencies = [ + "commands", + "debugvault", + "gui", + "log 0.0.0", + "nix 0.26.1", + "object", + "winres", +] [[package]] name = "bitflags" @@ -187,18 +400,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" dependencies = [ "serde", ] [[package]] name = "bitvec" -version = "1.0.1" +version = "0.19.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" dependencies = [ "funty", "radium", @@ -213,64 +426,73 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] -name = "block-padding" -version = "0.3.3" +name = "block-buffer" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] -name = "borsh" -version = "1.4.0" +name = "block-sys" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0901fc8eb0aca4c83be0106d6f2db17d86a08dfc2c25f0e84464bf381158add6" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" dependencies = [ - "borsh-derive", - "cfg_aliases", + "objc-sys", ] [[package]] -name = "borsh-derive" -version = "1.4.0" +name = "block2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51670c3aa053938b0ee3bd67c3817e471e626151131b934038e83c5bf8de48f5" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" dependencies = [ - "once_cell", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", - "syn_derive", + "block-sys", + "objc2", +] + +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel", + "async-lock 3.3.0", + "async-task", + "fastrand", + "futures-io", + "futures-lite", + "piper", + "tracing", ] [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" [[package]] -name = "bytecheck" -version = "0.6.12" +name = "bytemuck" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", + "bytemuck_derive", ] [[package]] -name = "bytecheck_derive" -version = "0.6.12" +name = "bytemuck_derive" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 1.0.109", + "quote", + "syn 2.0.48", ] [[package]] @@ -281,9 +503,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cairo-rs" @@ -291,63 +513,66 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 2.5.0", - "cairo-sys-rs 0.18.2", - "glib 0.18.5", - "libc", + "bitflags 2.4.2", + "cairo-sys-rs", + "glib", + "libc 0.2.153", "once_cell", "thiserror", ] -[[package]] -name = "cairo-rs" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" -dependencies = [ - "bitflags 2.5.0", - "cairo-sys-rs 0.19.2", - "glib 0.19.4", - "libc", - "thiserror", -] - [[package]] name = "cairo-sys-rs" version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ - "glib-sys 0.18.1", - "libc", + "glib-sys", + "libc 0.2.153", "system-deps", ] [[package]] -name = "cairo-sys-rs" -version = "0.19.2" +name = "calloop" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "glib-sys 0.19.0", - "libc", - "system-deps", + "bitflags 2.4.2", + "log 0.4.20", + "polling", + "rustix", + "slab", + "thiserror", ] [[package]] -name = "cbc" -version = "0.1.2" +name = "calloop-wayland-source" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ - "cipher", + "calloop", + "rustix", + "wayland-backend", + "wayland-client", ] [[package]] name = "cc" -version = "1.0.94" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc 0.2.153", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfg-expr" @@ -372,28 +597,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] -name = "cipher" -version = "0.4.4" +name = "clipboard-win" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +checksum = "9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342" dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", + "lazy-bytes-cast", + "winapi", ] [[package]] @@ -407,8 +617,8 @@ dependencies = [ "cocoa-foundation", "core-foundation", "core-graphics", - "foreign-types 0.5.0", - "libc", + "foreign-types", + "libc 0.2.153", "objc", ] @@ -422,10 +632,75 @@ dependencies = [ "block", "core-foundation", "core-graphics-types", - "libc", + "libc 0.2.153", "objc", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "com" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "commands" +version = "0.0.0" +dependencies = [ + "debugvault", + "dirs", + "egui", + "log 0.0.0", + "once_cell", + "serde", + "serde_yaml", + "triple_accel", +] + [[package]] name = "concurrent-queue" version = "2.4.0" @@ -436,47 +711,17 @@ dependencies = [ ] [[package]] -name = "const-oid" -version = "0.9.6" +name = "copypasta" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[package]] -name = "cookie" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" +checksum = "6d35364349bf9e9e1c3a035ddcb00d188d23a3c40c50244c03c27a99fc6a65ae" dependencies = [ - "percent-encoding", - "time", - "version_check", -] - -[[package]] -name = "cookie" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" -dependencies = [ - "time", - "version_check", -] - -[[package]] -name = "cookie_store" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" -dependencies = [ - "cookie 0.17.0", - "idna 0.3.0", - "log", - "publicsuffix", - "serde", - "serde_derive", - "serde_json", - "time", - "url", + "clipboard-win", + "objc", + "objc-foundation", + "objc_id", + "smithay-clipboard", + "x11-clipboard", ] [[package]] @@ -486,7 +731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", - "libc", + "libc 0.2.153", ] [[package]] @@ -497,15 +742,15 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.23.2" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types 0.5.0", - "libc", + "foreign-types", + "libc 0.2.153", ] [[package]] @@ -516,7 +761,7 @@ checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", "core-foundation", - "libc", + "libc 0.2.153", ] [[package]] @@ -525,14 +770,29 @@ version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ - "libc", + "libc 0.2.153", ] [[package]] -name = "crc32fast" -version = "1.4.0" +name = "crc" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if", ] @@ -546,6 +806,15 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.19" @@ -563,100 +832,83 @@ dependencies = [ ] [[package]] -name = "darling" -version = "0.14.4" +name = "cursor-icon" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core", - "darling_macro", -] +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] -name = "darling_core" -version = "0.14.4" +name = "d3d12" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote 1.0.36", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core", - "quote 1.0.36", - "syn 1.0.109", -] - -[[package]] -name = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "libc", - "libdbus-sys", + "bitflags 2.4.2", + "libloading 0.8.1", "winapi", ] [[package]] -name = "dbus-codegen" -version = "0.9.1" +name = "dashmap" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a49da9fdfbe872d4841d56605dc42efa5e6ca3291299b87f44e1cde91a28617c" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "clap", - "dbus", - "xml-rs", + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] -name = "dbus-tree" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f456e698ae8e54575e19ddb1f9b7bce2298568524f215496b248eb9498b4f508" +name = "debugvault" +version = "0.0.0" dependencies = [ - "dbus", + "binformat", + "bitflags 2.4.2", + "crossbeam-queue", + "dashmap", + "gimli", + "log 0.0.0", + "memmap2", + "object", + "pdb", + "processor_shared", + "radix_trie", + "rustc-hash", + "tokenizing", + "typed-arena", ] [[package]] -name = "der" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +name = "decoder" +version = "0.0.0" dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", + "debugvault", + "tokenizing", ] [[package]] -name = "deranged" -version = "0.3.11" +name = "derivative" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "powerfmt", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "derive_is_enum_variant" -version = "0.1.1" +name = "derive_more" +version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ac8859845146979953797f03cc5b282fb4396891807cdb3d04929a88418197" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "heck 0.3.3", - "quote 0.3.15", - "syn 0.11.11", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -665,72 +917,51 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "const-oid", + "block-buffer", "crypto-common", ] [[package]] -name = "directories" +name = "dirs" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ "dirs-sys", ] -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - [[package]] name = "dirs-sys" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ - "libc", + "libc 0.2.153", "option-ext", "redox_users", "windows-sys 0.48.0", ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "dispatch" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libc", - "redox_users", - "winapi", + "libloading 0.8.1", ] [[package]] -name = "documented" -version = "0.4.1" +name = "downcast-rs" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cd1d2800b9a2b71d4311a38fcda9eebc9313bbd86730880147eba1e29599e0" -dependencies = [ - "documented-derive", - "phf", - "thiserror", -] - -[[package]] -name = "documented-derive" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48583206f0a72d5fbfcb5dd8ab56ec878a6594fbcb1219d5b65b502b960c7cdb" -dependencies = [ - "quote 1.0.36", - "syn 2.0.58", -] +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dpi" @@ -739,46 +970,115 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" [[package]] -name = "ecb" +name = "ecolor" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20930a432bbd57a6d55e07976089708d4893f3d556cf42a0d79e9e321fa73b10" +dependencies = [ + "bytemuck", + "serde", +] + +[[package]] +name = "egui" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a" +dependencies = [ + "accesskit", + "ahash", + "epaint", + "nohash-hasher", + "serde", +] + +[[package]] +name = "egui_tiles" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e2c0ff99daddcbdc54b141dbb7be3b014463da48a03ebc801bf63e500b23d75" +dependencies = [ + "ahash", + "egui", + "itertools", + "log 0.4.20", + "serde", +] + +[[package]] +name = "either" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + +[[package]] +name = "emath" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c3a552cfca14630702449d35f41c84a0d15963273771c6059175a803620f3f" +dependencies = [ + "bytemuck", + "serde", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "endian-type" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8bfa975b1aec2145850fcaa1c6fe269a16578c44705a532ae3edc92b8881c7" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ - "cipher", + "enumflags2_derive", + "serde", ] [[package]] -name = "embed-resource" -version = "2.4.2" +name = "enumflags2_derive" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" -dependencies = [ - "cc", - "memchr", - "rustc_version", - "toml", - "vswhom", - "winreg", -] - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum-kinds" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 1.0.109", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "enumn" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "epaint" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b381f8b149657a4acf837095351839f32cd5c4aec1817fc4df84e18d76334176" +dependencies = [ + "ab_glyph", + "ahash", + "bytemuck", + "ecolor", + "emath", + "nohash-hasher", + "parking_lot", + "serde", ] [[package]] @@ -793,10 +1093,27 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "libc", + "libc 0.2.153", "windows-sys 0.52.0", ] +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + [[package]] name = "event-listener" version = "5.3.0" @@ -808,16 +1125,38 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + [[package]] name = "event-listener-strategy" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" dependencies = [ - "event-listener", + "event-listener 5.3.0", "pin-project-lite", ] +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "fastrand" version = "2.0.2" @@ -839,7 +1178,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset", + "memoffset 0.9.1", "rustc_version", ] @@ -853,21 +1192,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - [[package]] name = "foreign-types" version = "0.5.0" @@ -875,7 +1199,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ "foreign-types-macros", - "foreign-types-shared 0.3.1", + "foreign-types-shared", ] [[package]] @@ -885,16 +1209,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", + "quote", + "syn 2.0.48", ] -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "foreign-types-shared" version = "0.3.1" @@ -910,32 +1228,11 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "from_variants" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e859c8f2057687618905dbe99fc76e836e0a69738865ef90e46fc214a41bbf2" -dependencies = [ - "from_variants_impl", -] - -[[package]] -name = "from_variants_impl" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55a5e644a80e6d96b2b4910fa7993301d7b7926c045b475b62202b20a36ce69e" -dependencies = [ - "darling", - "proc-macro2", - "quote 1.0.36", - "syn 1.0.109", -] - [[package]] name = "funty" -version = "2.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures-channel" @@ -969,6 +1266,19 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" version = "0.3.30" @@ -976,8 +1286,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", + "quote", + "syn 2.0.48", ] [[package]] @@ -999,8 +1309,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", + "futures-io", "futures-macro", + "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", "slab", @@ -1012,13 +1325,13 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646" dependencies = [ - "cairo-rs 0.18.5", - "gdk-pixbuf 0.18.5", + "cairo-rs", + "gdk-pixbuf", "gdk-sys", - "gio 0.18.4", - "glib 0.18.5", - "libc", - "pango 0.18.3", + "gio", + "glib", + "libc 0.2.153", + "pango", ] [[package]] @@ -1027,48 +1340,23 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" dependencies = [ - "gdk-pixbuf-sys 0.18.0", - "gio 0.18.4", - "glib 0.18.5", - "libc", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc 0.2.153", "once_cell", ] -[[package]] -name = "gdk-pixbuf" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" -dependencies = [ - "gdk-pixbuf-sys 0.19.0", - "gio 0.19.4", - "glib 0.19.4", - "libc", -] - [[package]] name = "gdk-pixbuf-sys" version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ - "gio-sys 0.18.1", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "system-deps", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" -dependencies = [ - "gio-sys 0.19.0", - "glib-sys 0.19.0", - "gobject-sys 0.19.0", - "libc", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc 0.2.153", "system-deps", ] @@ -1078,74 +1366,17 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" dependencies = [ - "cairo-sys-rs 0.18.2", - "gdk-pixbuf-sys 0.18.0", - "gio-sys 0.18.1", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "pango-sys 0.18.0", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc 0.2.153", + "pango-sys", "pkg-config", "system-deps", ] -[[package]] -name = "gdk4" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" -dependencies = [ - "cairo-rs 0.19.4", - "gdk-pixbuf 0.19.2", - "gdk4-sys", - "gio 0.19.4", - "glib 0.19.4", - "libc", - "pango 0.19.3", -] - -[[package]] -name = "gdk4-sys" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" -dependencies = [ - "cairo-sys-rs 0.19.2", - "gdk-pixbuf-sys 0.19.0", - "gio-sys 0.19.0", - "glib-sys 0.19.0", - "gobject-sys 0.19.0", - "libc", - "pango-sys 0.19.0", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gdk4-win32" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab6181b6e5c91ee292dca0032b00d48dee8e61358253742c9752537a88486b3f" -dependencies = [ - "gdk4", - "gdk4-win32-sys", - "gio 0.19.4", - "glib 0.19.4", - "libc", -] - -[[package]] -name = "gdk4-win32-sys" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa8530d6619cf43f007f3efd993a356e1ca4e643c4d0bd2a99832a08af2e402" -dependencies = [ - "gdk4-sys", - "glib-sys 0.19.0", - "libc", - "system-deps", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1157,41 +1388,46 @@ dependencies = [ ] [[package]] -name = "getrandom" -version = "0.2.14" +name = "gethostname" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +dependencies = [ + "libc 0.2.153", + "winapi", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc 0.2.153", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", - "libc", + "libc 0.2.153", "wasi", ] -[[package]] -name = "gettext-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - [[package]] name = "gimli" version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +dependencies = [ + "fallible-iterator 0.3.0", + "indexmap", + "stable_deref_trait", +] [[package]] name = "gio" @@ -1203,57 +1439,37 @@ dependencies = [ "futures-core", "futures-io", "futures-util", - "gio-sys 0.18.1", - "glib 0.18.5", - "libc", + "gio-sys", + "glib", + "libc 0.2.153", "once_cell", "pin-project-lite", "smallvec", "thiserror", ] -[[package]] -name = "gio" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f91a0518c2ec539f099d3f945ab2d6a83ec372a9ef40a21906343b191182845" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys 0.19.0", - "glib 0.19.4", - "libc", - "pin-project-lite", - "smallvec", - "thiserror", -] - [[package]] name = "gio-sys" version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", + "glib-sys", + "gobject-sys", + "libc 0.2.153", "system-deps", "winapi", ] [[package]] -name = "gio-sys" -version = "0.19.0" +name = "gl_generator" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" dependencies = [ - "glib-sys 0.19.0", - "gobject-sys 0.19.0", - "libc", - "system-deps", - "windows-sys 0.52.0", + "khronos_api", + "log 0.4.20", + "xml-rs", ] [[package]] @@ -1262,45 +1478,23 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "futures-channel", "futures-core", "futures-executor", "futures-task", "futures-util", - "gio-sys 0.18.1", - "glib-macros 0.18.5", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc 0.2.153", "memchr", "once_cell", "smallvec", "thiserror", ] -[[package]] -name = "glib" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1407b2ce171e654720be10d57d4054d3ff2f10a13d5b37e6819b41439832f7" -dependencies = [ - "bitflags 2.5.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys 0.19.0", - "glib-macros 0.19.4", - "glib-sys 0.19.0", - "gobject-sys 0.19.0", - "libc", - "memchr", - "smallvec", - "thiserror", -] - [[package]] name = "glib-macros" version = "0.18.5" @@ -1311,21 +1505,8 @@ dependencies = [ "proc-macro-crate 2.0.0", "proc-macro-error", "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", -] - -[[package]] -name = "glib-macros" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bba315e8ce8aa59631545358450f4962557e89b5f7db7442e7153b47037f71" -dependencies = [ - "heck 0.5.0", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", + "quote", + "syn 2.0.48", ] [[package]] @@ -1334,18 +1515,29 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ - "libc", + "libc 0.2.153", "system-deps", ] [[package]] -name = "glib-sys" -version = "0.19.0" +name = "glow" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" dependencies = [ - "libc", - "system-deps", + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", ] [[package]] @@ -1354,74 +1546,61 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ - "glib-sys 0.18.1", - "libc", + "glib-sys", + "libc 0.2.153", "system-deps", ] [[package]] -name = "gobject-sys" -version = "0.19.0" +name = "gpu-alloc" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "glib-sys 0.19.0", - "libc", - "system-deps", + "bitflags 2.4.2", + "gpu-alloc-types", ] [[package]] -name = "graphene-rs" -version = "0.19.2" +name = "gpu-alloc-types" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "glib 0.19.4", - "graphene-sys", - "libc", + "bitflags 2.4.2", ] [[package]] -name = "graphene-sys" -version = "0.19.0" +name = "gpu-allocator" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" dependencies = [ - "glib-sys 0.19.0", - "libc", - "pkg-config", - "system-deps", + "log 0.4.20", + "presser", + "thiserror", + "winapi", + "windows", ] [[package]] -name = "gsk4" -version = "0.8.1" +name = "gpu-descriptor" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "cairo-rs 0.19.4", - "gdk4", - "glib 0.19.4", - "graphene-rs", - "gsk4-sys", - "libc", - "pango 0.19.3", + "bitflags 2.4.2", + "gpu-descriptor-types", + "hashbrown", ] [[package]] -name = "gsk4-sys" -version = "0.8.1" +name = "gpu-descriptor-types" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "cairo-sys-rs 0.19.2", - "gdk4-sys", - "glib-sys 0.19.0", - "gobject-sys 0.19.0", - "graphene-sys", - "libc", - "pango-sys 0.19.0", - "system-deps", + "bitflags 2.4.2", ] [[package]] @@ -1431,17 +1610,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c" dependencies = [ "atk", - "cairo-rs 0.18.5", + "cairo-rs", "field-offset", "futures-channel", "gdk", - "gdk-pixbuf 0.18.5", - "gio 0.18.4", - "glib 0.18.5", + "gdk-pixbuf", + "gio", + "glib", "gtk-sys", "gtk3-macros", - "libc", - "pango 0.18.3", + "libc 0.2.153", + "pango", "pkg-config", ] @@ -1452,14 +1631,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" dependencies = [ "atk-sys", - "cairo-sys-rs 0.18.2", - "gdk-pixbuf-sys 0.18.0", + "cairo-sys-rs", + "gdk-pixbuf-sys", "gdk-sys", - "gio-sys 0.18.1", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "pango-sys 0.18.0", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc 0.2.153", + "pango-sys", "system-deps", ] @@ -1472,90 +1651,40 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", + "quote", + "syn 2.0.48", ] [[package]] -name = "gtk4" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" +name = "gui" +version = "0.0.0" dependencies = [ - "cairo-rs 0.19.4", - "field-offset", - "futures-channel", - "gdk-pixbuf 0.19.2", - "gdk4", - "gio 0.19.4", - "glib 0.19.4", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "pango 0.19.3", -] - -[[package]] -name = "gtk4-macros" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" -dependencies = [ - "anyhow", - "proc-macro-crate 3.1.0", - "proc-macro-error", - "proc-macro2", - "quote 1.0.36", - "syn 1.0.109", -] - -[[package]] -name = "gtk4-sys" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" -dependencies = [ - "cairo-sys-rs 0.19.2", - "gdk-pixbuf-sys 0.19.0", - "gdk4-sys", - "gio-sys 0.19.0", - "glib-sys 0.19.0", - "gobject-sys 0.19.0", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys 0.19.0", - "system-deps", -] - -[[package]] -name = "h2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", + "bytemuck", + "cc", + "commands", + "copypasta", + "crossbeam-queue", + "debugvault", + "dirs", + "egui", + "egui_tiles", + "infinite_scroll", + "log 0.0.0", + "muda", + "once_cell", + "png", + "pollster", + "processor", + "processor_shared", + "rfd", + "tokenizing", + "tree-sitter", + "tree-sitter-c", + "tree-sitter-cpp", + "tree-sitter-highlight", + "tree-sitter-rust", + "wgpu", + "winit", ] [[package]] @@ -1563,14 +1692,24 @@ name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] [[package]] -name = "heck" -version = "0.3.3" +name = "hassle-rs" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "unicode-segmentation", + "bitflags 2.4.2", + "com", + "libc 0.2.153", + "libloading 0.8.1", + "thiserror", + "widestring", + "winapi", ] [[package]] @@ -1585,21 +1724,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - [[package]] name = "hex" version = "0.4.3" @@ -1607,115 +1731,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "http" -version = "1.1.0" +name = "hexf-parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "hyper" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", + "block2", + "dispatch", + "objc2", ] [[package]] @@ -1730,41 +1759,72 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", ] [[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +name = "infinite_scroll" +version = "0.0.0" dependencies = [ - "block-padding", - "generic-array", + "egui", ] [[package]] -name = "ipnet" -version = "2.9.0" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log 0.4.20", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc 0.2.153", +] [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -1775,55 +1835,38 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "serde", "unicode-segmentation", ] [[package]] -name = "ksni" -version = "0.2.1" +name = "khronos-egl" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b31b9cf486bcd22bcd09900b44538cf87b00f526fcd087d671a632dc0d271d0c" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ - "dbus", - "dbus-codegen", - "dbus-tree", - "thiserror", + "libc 0.2.153", + "libloading 0.8.1", + "pkg-config", ] [[package]] -name = "lazy_static" -version = "1.4.0" +name = "khronos_api" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin", -] +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] -name = "libappindicator" -version = "0.9.0" +name = "lazy-bytes-cast" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" -dependencies = [ - "glib 0.18.5", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", -] +checksum = "10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b" [[package]] -name = "libappindicator-sys" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" -dependencies = [ - "gtk-sys", - "libloading", - "once_cell", -] +name = "libc" +version = "0.2.140" +source = "git+https://github.com/rust-lang/libc?rev=60bf6d7fa9d561820ea562751ee455ccf67d3015#60bf6d7fa9d561820ea562751ee455ccf67d3015" [[package]] name = "libc" @@ -1831,16 +1874,6 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" -[[package]] -name = "libdbus-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" -dependencies = [ - "cc", - "pkg-config", -] - [[package]] name = "libloading" version = "0.7.4" @@ -1852,29 +1885,35 @@ dependencies = [ ] [[package]] -name = "libm" -version = "0.2.8" +name = "libloading" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libmimalloc-sys" -version = "0.1.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ - "cc", - "libc", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] name = "libredox" -version = "0.1.3" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.5.0", - "libc", + "bitflags 2.4.2", + "libc 0.2.153", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.4.2", + "libc 0.2.153", + "redox_syscall 0.4.1", ] [[package]] @@ -1892,7 +1931,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db23b9e7e2b7831bbd8aac0bbeeeb7b68cbebc162b227e7052e8e55829a09212" dependencies = [ - "libc", + "libc 0.2.153", "x11", ] @@ -1902,19 +1941,6 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - [[package]] name = "lock_api" version = "0.4.11" @@ -1927,21 +1953,17 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +version = "0.0.0" +dependencies = [ + "egui", + "rfd", +] [[package]] -name = "lrc-nom" -version = "0.3.0" +name = "log" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0fb729227bcfd7c7cf247c37a932ac168b94759c052f046b9aad4ba5f584f70" -dependencies = [ - "nom", - "rust_decimal", - "rust_decimal_macros", - "thiserror", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "malloc_buf" @@ -1949,29 +1971,41 @@ version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" dependencies = [ - "libc", + "libc 0.2.153", ] -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memmap2" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +dependencies = [ + "libc 0.2.153", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] [[package]] name = "memoffset" @@ -1983,58 +2017,37 @@ dependencies = [ ] [[package]] -name = "mimalloc" -version = "0.1.39" +name = "metal" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "libmimalloc-sys", + "bitflags 2.4.2", + "block", + "core-graphics-types", + "foreign-types", + "log 0.4.20", + "objc", + "paste", ] -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", "simd-adler32", ] [[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +name = "mips" +version = "0.0.0" dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "mpris" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cef955a7826b1e00e901a3652e7a895abd221fb4ab61547e7d0e4c235d7feb" -dependencies = [ - "dbus", - "derive_is_enum_variant", - "enum-kinds", - "from_variants", - "thiserror", + "debugvault", + "decoder", + "tokenizing", ] [[package]] @@ -2057,128 +2070,136 @@ dependencies = [ ] [[package]] -name = "native-tls" -version = "0.2.11" +name = "naga" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899" dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ncmapi" -version = "0.1.13" -source = "git+https://github.com/waylyrics/ncmapi-rs.git?rev=6095abf7#6095abf7e54eedbb716676d311e0741b4ac2482e" -dependencies = [ - "aes", - "base64", - "cbc", - "cookie 0.18.1", - "ecb", - "hex", - "md5", - "phf", - "rand", - "regex", - "reqwest", - "rsa", - "serde", - "serde_json", - "serde_repr", - "thiserror", - "tokio", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", + "bit-set", + "bitflags 2.4.2", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log 0.4.20", "num-traits", - "rand", - "smallvec", - "zeroize", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", ] [[package]] -name = "num-conv" +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.4.2", + "jni-sys", + "log 0.4.20", + "ndk-sys", + "num_enum", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nibble_vec" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" dependencies = [ - "num-traits", + "smallvec", ] [[package]] -name = "num-iter" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +name = "nix" +version = "0.26.1" +source = "git+https://github.com/mbyzhang/nix#ac97b9fcd53b4713d0c9da34ee4dcba16fd1c457" dependencies = [ - "autocfg", - "num-integer", - "num-traits", + "bitflags 1.3.2", + "cfg-if", + "libc 0.2.140", + "memoffset 0.8.0", + "pin-utils", + "static_assertions", ] +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc 0.2.153", + "memoffset 0.7.1", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "cfg_aliases", + "libc 0.2.153", + "memoffset 0.9.1", +] + +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", - "libm", ] [[package]] -name = "num_cpus" -version = "1.16.0" +name = "num_enum" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "hermit-abi 0.3.9", - "libc", + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] @@ -2188,6 +2209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", + "objc_exception", ] [[package]] @@ -2201,6 +2223,37 @@ dependencies = [ "objc_id", ] +[[package]] +name = "objc-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + [[package]] name = "objc_id" version = "0.1.1" @@ -2216,7 +2269,9 @@ version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ + "flate2", "memchr", + "ruzstd", ] [[package]] @@ -2225,60 +2280,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "opencc-rust" -version = "1.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93236c9c3fb3e36c0cf4467731aabf338fd4831d4fad072a47cb2d4757e47303" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "foreign-types 0.3.2", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -2286,10 +2287,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] -name = "overload" -version = "0.1.1" +name = "orbclient" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox 0.0.2", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "owned_ttf_parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +dependencies = [ + "ttf-parser", +] [[package]] name = "pango" @@ -2297,23 +2320,11 @@ version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" dependencies = [ - "gio 0.18.4", - "glib 0.18.5", - "libc", + "gio", + "glib", + "libc 0.2.153", "once_cell", - "pango-sys 0.18.0", -] - -[[package]] -name = "pango" -version = "0.19.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" -dependencies = [ - "gio 0.19.4", - "glib 0.19.4", - "libc", - "pango-sys 0.19.0", + "pango-sys", ] [[package]] @@ -2322,21 +2333,9 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "system-deps", -] - -[[package]] -name = "pango-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" -dependencies = [ - "glib-sys 0.19.0", - "gobject-sys 0.19.0", - "libc", + "glib-sys", + "gobject-sys", + "libc 0.2.153", "system-deps", ] @@ -2363,19 +2362,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", - "libc", - "redox_syscall", + "libc 0.2.153", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] [[package]] -name = "pem-rfc7468" -version = "0.7.0" +name = "paste" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pdb" +version = "0.8.0" +source = "git+https://github.com/WINSDK/pdb-rs#c51a01dc6b8d41afcbb6ed3df5ee2ec4ddec401e" dependencies = [ - "base64ct", + "fallible-iterator 0.2.0", + "scroll", + "uuid", ] [[package]] @@ -2384,73 +2390,11 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", -] - [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2459,37 +2403,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pkcs1" -version = "0.7.5" +name = "piper" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", + "atomic-waker", + "fastrand", + "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "png" -version = "0.17.13" +version = "0.17.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2499,10 +2433,24 @@ dependencies = [ ] [[package]] -name = "powerfmt" -version = "0.2.0" +name = "polling" +version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" [[package]] name = "ppv-lite86" @@ -2510,6 +2458,12 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -2535,7 +2489,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.21.0", ] [[package]] @@ -2546,7 +2500,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2", - "quote 1.0.36", + "quote", "syn 1.0.109", "version_check", ] @@ -2558,85 +2512,84 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote", "version_check", ] [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] -name = "psl-types" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +name = "processor" +version = "0.0.0" dependencies = [ - "ptr_meta_derive", + "arm", + "binformat", + "commands", + "debugvault", + "decoder", + "log 0.0.0", + "memmap2", + "mips", + "object", + "processor_shared", + "riscv", + "tokenizing", + "x86_64", ] [[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +name = "processor_shared" +version = "0.0.0" dependencies = [ - "proc-macro2", - "quote 1.0.36", - "syn 1.0.109", + "object", ] [[package]] -name = "publicsuffix" -version = "2.2.3" +name = "profiling" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" -dependencies = [ - "idna 0.3.0", - "psl-types", -] +checksum = "d135ede8821cf6376eb7a64148901e1690b788c11ae94dc297ae917dbc91dc0e" [[package]] -name = "qqmusic-rs" -version = "0.1.0" -source = "git+https://github.com/waylyrics/qqmusic-rs.git?rev=22e66ba#22e66ba62e63d97c6dffb45400655404e6f06b93" +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ - "serde", - "serde_json", - "url", + "memchr", ] [[package]] name = "quote" -version = "0.3.15" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] name = "radium" -version = "0.7.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] [[package]] name = "rand" @@ -2644,7 +2597,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc", + "libc 0.2.153", "rand_chacha", "rand_core", ] @@ -2668,6 +2621,27 @@ dependencies = [ "getrandom", ] +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_syscall" version = "0.4.1" @@ -2679,192 +2653,90 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "libredox", + "libredox 0.0.1", "thiserror", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] -name = "regex-syntax" -version = "0.8.3" +name = "renderdoc-sys" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" [[package]] -name = "rend" -version = "0.4.2" +name = "rfd" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" dependencies = [ - "bytecheck", -] - -[[package]] -name = "reqwest" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" -dependencies = [ - "base64", - "bytes", - "cookie 0.17.0", - "cookie_store", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-tls", - "hyper-util", - "ipnet", + "ashpd", + "block", + "dispatch", "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tower-service", - "url", + "log 0.4.20", + "objc", + "objc-foundation", + "objc_id", + "pollster", + "raw-window-handle", + "urlencoding", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "windows-sys 0.48.0", ] [[package]] -name = "rkyv" -version = "0.7.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +name = "riscv" +version = "0.0.0" dependencies = [ - "bitvec", - "bytecheck", - "bytes", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", + "crc", + "debugvault", + "decoder", + "object", + "once_cell", + "tokenizing", ] [[package]] -name = "rkyv_derive" -version = "0.7.44" +name = "rustc-hash" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" -dependencies = [ - "proc-macro2", - "quote 1.0.36", - "syn 1.0.109", -] - -[[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[package]] -name = "rust_decimal" -version = "1.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" -dependencies = [ - "arrayvec", - "borsh", - "bytes", - "num-traits", - "rand", - "rkyv", - "serde", - "serde_json", -] - -[[package]] -name = "rust_decimal_macros" -version = "1.34.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e418701588729bef95e7a655f2b483ad64bb97c46e8e79fde83efd92aaab6d82" -dependencies = [ - "quote 1.0.36", - "rust_decimal", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" @@ -2877,54 +2749,49 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "errno", - "libc", + "libc 0.2.153", "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] -name = "rustls-pemfile" -version = "2.1.2" +name = "ruzstd" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" dependencies = [ - "base64", - "rustls-pki-types", + "byteorder", + "derive_more", + "twox-hash", ] -[[package]] -name = "rustls-pki-types" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" - -[[package]] -name = "rustversion" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" - [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] -name = "schannel" -version = "0.1.23" +name = "same-file" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" dependencies = [ - "windows-sys 0.52.0", + "winapi-util", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.2.0" @@ -2932,32 +2799,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "seahash" -version = "4.1.0" +name = "scroll" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" [[package]] -name = "security-framework" -version = "2.10.0" +name = "sctk-adwaita" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" -dependencies = [ - "core-foundation-sys", - "libc", + "ab_glyph", + "log 0.4.20", + "memmap2", + "smithay-client-toolkit", + "tiny-skia", ] [[package]] @@ -2968,44 +2825,33 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "itoa", - "ryu", - "serde", + "quote", + "syn 2.0.48", ] [[package]] name = "serde_repr" -version = "0.1.19" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", + "quote", + "syn 2.0.48", ] [[package]] @@ -3018,24 +2864,27 @@ dependencies = [ ] [[package]] -name = "serde_urlencoded" -version = "0.7.1" +name = "serde_yaml" +version = "0.9.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38" dependencies = [ - "form_urlencoded", + "indexmap", "itoa", "ryu", "serde", + "unsafe-libyaml", ] [[package]] -name = "sharded-slab" -version = "0.1.7" +name = "sha1" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "lazy_static", + "cfg-if", + "cpufeatures", + "digest", ] [[package]] @@ -3044,17 +2893,7 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core", + "libc 0.2.153", ] [[package]] @@ -3063,18 +2902,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - [[package]] name = "slab" version = "0.4.9" @@ -3084,98 +2911,92 @@ dependencies = [ "autocfg", ] +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + [[package]] name = "smallvec" -version = "1.13.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] -name = "socket2" -version = "0.5.6" +name = "smithay-client-toolkit" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f" dependencies = [ - "libc", - "windows-sys 0.52.0", + "bitflags 2.4.2", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc 0.2.153", + "log 0.4.20", + "memmap2", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", ] [[package]] -name = "sorensen" -version = "0.2.0" +name = "smithay-clipboard" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f480a5525538a706e6cb343127173f9b2fc402dea20cfdbbe6e91df018baedb8" +checksum = "0bb62b280ce5a5cba847669933a0948d00904cf83845c944eae96a4738cea1a6" dependencies = [ - "assert_float_eq", - "hashbrown 0.12.3", + "libc 0.2.153", + "smithay-client-toolkit", + "wayland-backend", ] [[package]] -name = "spin" -version = "0.5.2" +name = "smol_str" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" dependencies = [ - "base64ct", - "der", + "serde", ] [[package]] -name = "strsim" -version = "0.8.0" +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "strum_macros", + "bitflags 2.4.2", ] [[package]] -name = "strum_macros" -version = "0.26.2" +name = "stable_deref_trait" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote 1.0.36", - "rustversion", - "syn 2.0.58", -] +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "subtle" -version = "2.5.0" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "syn" -version = "0.11.11" +name = "strict-num" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" -dependencies = [ - "quote 0.3.15", - "synom", - "unicode-xid", -] +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" [[package]] name = "syn" @@ -3184,69 +3005,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.58" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote", "unicode-ident", ] -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "synom" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "system-deps" version = "6.2.2" @@ -3256,7 +3029,7 @@ dependencies = [ "cfg-expr", "heck 0.5.0", "pkg-config", - "toml", + "toml 0.8.12", "version-compare", ] @@ -3272,92 +3045,71 @@ version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" -[[package]] -name = "temp-dir" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" - [[package]] name = "tempfile" -version = "3.10.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", + "redox_syscall 0.4.1", "rustix", "windows-sys 0.52.0", ] [[package]] -name = "textwrap" -version = "0.11.0" +name = "termcolor" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ - "unicode-width", + "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", + "quote", + "syn 2.0.48", ] [[package]] -name = "thread_local" -version = "1.1.8" +name = "tiny-skia" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "b6a067b809476893fce6a254cf285850ff69c847e6cfbade6a20b655b6c7e80d" dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", "cfg-if", - "once_cell", + "log 0.4.20", + "tiny-skia-path", ] [[package]] -name = "time" -version = "0.3.36" +name = "tiny-skia-path" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "5de35e8a90052baaaf61f171680ac2f8e925a1e43ea9d2e3a00514772250e541" dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", + "arrayref", + "bytemuck", + "strict-num", ] [[package]] @@ -3376,57 +3128,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] -name = "tokio" -version = "1.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +name = "tokenizing" +version = "0.0.0" dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", + "egui", ] [[package]] -name = "tokio-macros" -version = "2.2.0" +name = "toml" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", + "serde", ] [[package]] @@ -3458,7 +3172,7 @@ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "toml_datetime", - "winnow 0.5.40", + "winnow 0.5.34", ] [[package]] @@ -3469,18 +3183,18 @@ checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ "indexmap", "toml_datetime", - "winnow 0.5.40", + "winnow 0.5.34", ] [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap", "toml_datetime", - "winnow 0.5.40", + "winnow 0.5.34", ] [[package]] @@ -3496,41 +3210,12 @@ dependencies = [ "winnow 0.6.6", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - [[package]] name = "tracing" version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3543,8 +3228,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", + "quote", + "syn 2.0.48", ] [[package]] @@ -3554,73 +3239,83 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", - "valuable", ] [[package]] -name = "tracing-journald" -version = "0.3.0" +name = "tree-sitter" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd" +checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" dependencies = [ - "libc", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", + "cc", "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", ] [[package]] -name = "tray-icon" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97ec55956c54569e74209ae9d29a7a79193b252d17a6ac28bcffd4c11a384ad" +name = "tree-sitter-c" +version = "0.21.0" +source = "git+https://github.com/WINSDK/tree-sitter-c#32b7cab7dfbfe7c7877c6ec4bda40557e170399c" dependencies = [ - "cocoa", - "core-graphics", - "crossbeam-channel", - "dirs-next", - "libappindicator", - "muda", - "objc", - "once_cell", - "png", - "thiserror", - "windows-sys 0.52.0", + "cc", + "tree-sitter", ] [[package]] -name = "try-lock" -version = "0.2.5" +name = "tree-sitter-cpp" +version = "0.21.0" +source = "git+https://github.com/WINSDK/tree-sitter-cpp#ef9677b8aca6a5dbdf39437406add13b86ccc70e" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-highlight" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +checksum = "042342584c5a7a0b833d9fc4e2bdab3f9868ddc6c4b339a1e01451c6720868bc" +dependencies = [ + "regex", + "thiserror", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-rust" +version = "0.21.0" +source = "git+https://github.com/WINSDK/tree-sitter-rust#ce8a251e40c696a0d95784720c2cc6a85873645d" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "triple_accel" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22048bc95dfb2ffd05b1ff9a756290a009224b60b2f0e7525faeee7603851e63" + +[[package]] +name = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typenum" @@ -3628,6 +3323,17 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + [[package]] name = "unicode-bidi" version = "0.3.15" @@ -3651,9 +3357,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" @@ -3663,9 +3369,15 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" -version = "0.0.4" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" [[package]] name = "url" @@ -3674,33 +3386,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna", "percent-encoding", + "serde", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "uuid" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" [[package]] name = "version-compare" @@ -3715,32 +3416,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "vswhom" -version = "0.1.0" +name = "walkdir" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", + "same-file", + "winapi-util", ] [[package]] @@ -3751,9 +3433,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3761,24 +3443,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", - "log", + "log 0.4.20", "once_cell", "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", + "quote", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" dependencies = [ "cfg-if", "js-sys", @@ -3788,88 +3470,274 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ - "quote 1.0.36", + "quote", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", + "quote", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] -name = "waylyrics" -version = "0.2.19" +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" dependencies = [ - "ahash 0.8.11", - "anyhow", - "async-channel", - "async-trait", - "dbus", - "directories", - "documented", - "gdk4-win32", - "gettext-rs", - "glib-macros 0.19.4", - "gtk4", - "ksni", - "lrc-nom", - "md5", - "mimalloc", - "mpris", - "ncmapi", + "cc", + "downcast-rs", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.2", + "nix 0.26.4", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.2", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +dependencies = [ + "nix 0.26.4", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log 0.4.20", "once_cell", - "opencc-rust", - "qqmusic-rs", - "regex", - "reqwest", - "rust_decimal", - "rust_decimal_macros", - "serde", - "serde_json", - "sorensen", - "strum", - "thiserror", - "tokio", - "toml", - "toml_edit 0.22.9", - "tracing", - "tracing-journald", - "tracing-subscriber", - "tray-icon", - "url", - "windows", - "windows_exe_info", + "pkg-config", ] [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ "js-sys", "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "wgpu" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe9a310dcf2e6b85f00c46059aaeaf4184caa8e29a1ecd4b7a704c3482332d" +dependencies = [ + "arrayvec", + "cfg-if", + "cfg_aliases", + "js-sys", + "log 0.4.20", + "naga", + "parking_lot", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.2", + "cfg_aliases", + "codespan-reporting", + "indexmap", + "log 0.4.20", + "naga", + "once_cell", + "parking_lot", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bb47856236bfafc0bc591a925eb036ac19cd987624a447ff353e7a7e7e6f72" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.2", + "block", + "cfg_aliases", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc 0.2.153", + "libloading 0.8.1", + "log 0.4.20", + "metal", + "naga", + "objc", + "once_cell", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2" +dependencies = [ + "bitflags 2.4.2", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + [[package]] name = "winapi" version = "0.3.9" @@ -3886,6 +3754,24 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -3894,55 +3780,30 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.56.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ "windows-core", - "windows-targets 0.52.5", + "windows-targets 0.48.5", ] [[package]] name = "windows-core" -version = "0.56.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-targets 0.52.5", + "windows-targets 0.48.5", ] [[package]] -name = "windows-implement" -version = "0.56.0" +name = "windows-sys" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", -] - -[[package]] -name = "windows-interface" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" -dependencies = [ - "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", -] - -[[package]] -name = "windows-result" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" -dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.42.2", ] [[package]] @@ -3960,7 +3821,22 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -3980,20 +3856,25 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -4002,9 +3883,15 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" @@ -4014,18 +3901,15 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] -name = "windows_exe_info" -version = "0.4.2" +name = "windows_i686_gnu" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e7bfd02caf5cd98a197cec15c852685c8c42605f91d7be3083541a0b40a7ff" -dependencies = [ - "embed-resource", -] +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" @@ -4035,15 +3919,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] -name = "windows_i686_gnullvm" -version = "0.52.5" +name = "windows_i686_msvc" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" @@ -4053,9 +3937,15 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" @@ -4065,9 +3955,15 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" @@ -4077,9 +3973,15 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" @@ -4089,15 +3991,63 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winit" +version = "0.29.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c824f11941eeae66ec71111cc2674373c772f482b58939bb4066b642aa2ffcf" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.4.2", + "bytemuck", + "calloop", + "cfg_aliases", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate", + "js-sys", + "libc 0.2.153", + "log 0.4.20", + "memmap2", + "ndk", + "ndk-sys", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "rustix", + "sctk-adwaita", + "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb 0.13.0", + "xkbcommon-dl", +] [[package]] name = "winnow" -version = "0.5.40" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] @@ -4112,23 +4062,19 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.52.0" +name = "winres" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "toml 0.5.11", ] [[package]] name = "wyz" -version = "0.5.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" [[package]] name = "x11" @@ -4136,15 +4082,186 @@ version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" dependencies = [ - "libc", + "libc 0.2.153", "pkg-config", ] [[package]] -name = "xml-rs" -version = "0.8.20" +name = "x11-clipboard" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "b41aca1115b1f195f21c541c5efb423470848d48143127d0f07f8b90c27440df" +dependencies = [ + "x11rb 0.12.0", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc 0.2.153", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +dependencies = [ + "gethostname 0.3.0", + "nix 0.26.4", + "winapi", + "winapi-wsapoll", + "x11rb-protocol 0.12.0", +] + +[[package]] +name = "x11rb" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +dependencies = [ + "as-raw-xcb-connection", + "gethostname 0.4.3", + "libc 0.2.153", + "libloading 0.8.1", + "once_cell", + "rustix", + "x11rb-protocol 0.13.0", +] + +[[package]] +name = "x11rb-protocol" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" +dependencies = [ + "nix 0.26.4", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" + +[[package]] +name = "x86_64" +version = "0.0.0" +dependencies = [ + "debugvault", + "decoder", + "tokenizing", +] + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc 0.2.153", + "winapi", +] + +[[package]] +name = "xkbcommon-dl" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699" +dependencies = [ + "bitflags 2.4.2", + "dlib", + "log 0.4.20", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "zbus" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock 3.3.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "derivative", + "enumflags2", + "event-listener 5.3.0", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.28.0", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] [[package]] name = "zerocopy" @@ -4162,12 +4279,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.58", + "quote", + "syn 2.0.48", ] [[package]] -name = "zeroize" -version = "1.7.0" +name = "zvariant" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bite/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bite/package.nix new file mode 100644 index 0000000000..de072e33d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bi/bite/package.nix @@ -0,0 +1,110 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + makeBinaryWrapper, + copyDesktopItems, + makeDesktopItem, + imagemagick, + atk, + cairo, + gdk-pixbuf, + glib, + gtk3, + libxkbcommon, + pango, + vulkan-loader, + stdenv, + darwin, + wayland, +}: +rustPlatform.buildRustPackage rec { + pname = "bite"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "WINSDK"; + repo = "bite"; + rev = "V${version}"; + hash = "sha256-A5NII5pLnM4BBy2L+ylXU0anqw4DpKgXmc29fcTq2z8="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "libc-0.2.140" = "sha256-5cP25BDfkrybiZjmwmzeqd0nzdItFdNSZ4te7FdLpnk="; + "nix-0.26.1" = "sha256-AsOX8sLGHJNJhq0P9WDxWsNiRXgZJl15paTcGdPMQXA="; + "pdb-0.8.0" = "sha256-CEglHzBpS3rN7+05tS09FbBcOM0jjyvR+DWrEbvRYwE="; + "tree-sitter-c-0.21.0" = "sha256-7L3Ua6LBeX2492RTikKYeCNIG5e5XSrCu4UyXX1eQiI="; + "tree-sitter-cpp-0.21.0" = "sha256-WZy3S8+bRkpzUFpnLVp18rY5DxN70fdEPYIYx0UqJhs="; + "tree-sitter-rust-0.21.0" = "sha256-kZT4Hil7u4GFWImuQCt9nQJ+HL3B5yHD5wjalpDLlSE="; + }; + }; + + nativeBuildInputs = [ + pkg-config + makeBinaryWrapper + copyDesktopItems + imagemagick + ]; + + buildInputs = + [ + atk + cairo + gdk-pixbuf + glib + gtk3 + libxkbcommon + pango + vulkan-loader + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreGraphics + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Metal + darwin.apple_sdk.frameworks.QuartzCore + ] + ++ lib.optionals stdenv.isLinux [ + wayland + ]; + + runtimeDependencies = + [ + libxkbcommon + vulkan-loader + ] + ++ lib.optionals stdenv.isLinux [ + wayland + ]; + + postInstall = '' + wrapProgram $out/bin/bite \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" + + mkdir -p $out/share/icons/hicolor/64x64/apps + convert $src/assets/iconx64.png -background black -alpha remove -alpha off $out/share/icons/hicolor/64x64/apps/bite.png + ''; + + desktopItems = [ + (makeDesktopItem { + name = "BiTE"; + exec = meta.mainProgram; + icon = "bite"; + desktopName = "BiTE"; + comment = meta.description; + categories = ["Development" "Utility"]; + }) + ]; + + meta = with lib; { + description = "Disassembler focused on comprehensive rust support"; + homepage = "https://github.com/WINSDK/bite"; + license = licenses.mit; + maintainers = with maintainers; [vinnymeller]; + mainProgram = "bite"; + broken = stdenv.isDarwin && stdenv.isx86_64; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bitmagnet/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitmagnet/package.nix index 95a7afa1be..dcdade7632 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/bitmagnet/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bi/bitmagnet/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "bitmagnet"; - version = "0.7.14"; + version = "0.8.0"; src = fetchFromGitHub { owner = "bitmagnet-io"; repo = "bitmagnet"; rev = "v${version}"; - hash = "sha256-TaxoQdjdHw8h6w6wKBHL/CVxWFK/RG2tJ//MtUEOwfU="; + hash = "sha256-P5GfPRIrwLLMBRgoN6d092HiThMghEj1zcaf6BU+IWU="; }; - vendorHash = "sha256-y9RfaAx9AQS117J3+p/Yy8Mn5In1jmZmW4IxKjeV8T8="; + vendorHash = "sha256-exKQTsyP7LL63WHZ8/WchLh4y0Oj9LC4lxiZTOfWARU="; - ldflags = [ "-s" "-w" ]; + ldflags = [ "-s" "-w" "-X github.com/bitmagnet-io/bitmagnet/internal/version.GitTag=v${version}" ]; passthru = { updateScript = nix-update-script { }; @@ -30,7 +30,7 @@ buildGoModule rec { ''; homepage = "https://bitmagnet.io/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ eclairevoyant viraptor ]; + maintainers = with lib.maintainers; [ viraptor ]; mainProgram = "bitmagnet"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/blanket/default.nix b/third_party/nixpkgs/pkgs/by-name/bl/blanket/package.nix similarity index 55% rename from third_party/nixpkgs/pkgs/applications/audio/blanket/default.nix rename to third_party/nixpkgs/pkgs/by-name/bl/blanket/package.nix index 4b08f8cf22..6171cf0f88 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/blanket/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/bl/blanket/package.nix @@ -1,31 +1,34 @@ -{ lib -, fetchFromGitHub -, meson -, ninja -, pkg-config -, wrapGAppsHook4 -, desktop-file-utils -, appstream-glib -, python3Packages -, glib -, gtk4 -, libadwaita -, gobject-introspection -, gst_all_1 +{ + lib, + fetchFromGitHub, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + blueprint-compiler, + desktop-file-utils, + appstream-glib, + python3Packages, + glib, + gtk4, + libadwaita, + gobject-introspection, + gst_all_1, }: python3Packages.buildPythonApplication rec { pname = "blanket"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "rafaelmardojai"; repo = "blanket"; - rev = "refs/tags/${version}"; - sha256 = "sha256-4gthT1x76IfXWkLaLMPtFS4TRlRGk5Enbu/k1jAHzwE="; + rev = version; + hash = "sha256-mY7c5i0me7mMbD8c6eGJeaZpR8XI5QVL4n3M+j15Z1c="; }; nativeBuildInputs = [ + blueprint-compiler meson ninja pkg-config @@ -44,9 +47,7 @@ python3Packages.buildPythonApplication rec { gst_all_1.gst-plugins-bad ]; - propagatedBuildInputs = with python3Packages; [ - pygobject3 - ]; + propagatedBuildInputs = with python3Packages; [ pygobject3 ]; format = "other"; @@ -56,12 +57,18 @@ python3Packages.buildPythonApplication rec { --replace gtk-update-icon-cache gtk4-update-icon-cache ''; - meta = with lib; { - homepage = "https://github.com/rafaelmardojai/blanket"; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { description = "Listen to different sounds"; + homepage = "https://github.com/rafaelmardojai/blanket"; + license = lib.licenses.gpl3Plus; mainProgram = "blanket"; - maintainers = with maintainers; [ onny ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ onny ]; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/bl/blockbench/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/blockbench/package.nix index fb19793583..e7f019244e 100644 --- a/third_party/nixpkgs/pkgs/by-name/bl/blockbench/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bl/blockbench/package.nix @@ -14,13 +14,13 @@ let in buildNpmPackage rec { pname = "blockbench"; - version = "4.9.4"; + version = "4.10.0"; src = fetchFromGitHub { owner = "JannisX11"; repo = "blockbench"; rev = "v${version}"; - hash = "sha256-z4hr1pQh7Jp/DB8+pxwuHvi4gvTHHVn0yrruwnXm2iM="; + hash = "sha256-pycRC+ZpN2P5Z66/aGA4gykLF7IwdeToRadaJSA1L9w="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildNpmPackage rec { copyDesktopItems ]; - npmDepsHash = "sha256-onfz+J77jNIgdc7ALiyoXt1CdTyX/C7+bKwtpJm+H+I="; + npmDepsHash = "sha256-CHZdCiewkmToDHhTTvOqQfWrphOw1oGLgwSRRH3YFWE="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/third_party/nixpkgs/pkgs/by-name/bl/bluetuith/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/bluetuith/package.nix index 42d32dc789..43445a88d0 100644 --- a/third_party/nixpkgs/pkgs/by-name/bl/bluetuith/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bl/bluetuith/package.nix @@ -41,6 +41,6 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.linux; mainProgram = "bluetuith"; - maintainers = with maintainers; [ thehedgeh0g katexochen ]; + maintainers = with maintainers; [ pyrox0 katexochen ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/bl/bluez-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/bluez-tools/package.nix index 47d381a321..21fb5f2b14 100644 --- a/third_party/nixpkgs/pkgs/by-name/bl/bluez-tools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bl/bluez-tools/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "bluez-tools"; - version = "unstable-2020-10-25"; + version = "0-unstable-2020-10-24"; src = fetchFromGitHub { owner = "khvzak"; diff --git a/third_party/nixpkgs/pkgs/by-name/bl/bluez/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/bluez/package.nix index f23f333a79..454d677d90 100644 --- a/third_party/nixpkgs/pkgs/by-name/bl/bluez/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bl/bluez/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bluez"; - version = "5.72"; + version = "5.75"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz"; - hash = "sha256-SZ1/o0WplsG7ZQ9cZ0nh2SkRH6bs4L4OmGh/7mEkU24="; + hash = "sha256-mIyzxFUfbjpmdwilePXKn5P8iWUI+Y8IcJvk+KsDPC8="; }; patches = @@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ docutils pkg-config - python3.pkgs.pygments python3.pkgs.wrapPython ]; @@ -138,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s ../libexec/bluetooth/obexd $out/sbin/obexd # Add extra configuration - mkdir $out/etc/bluetooth + rm $out/etc/bluetooth/{main,input,network}.conf ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf # https://github.com/NixOS/nixpkgs/issues/204418 diff --git a/third_party/nixpkgs/pkgs/by-name/bn/bngblaster/package.nix b/third_party/nixpkgs/pkgs/by-name/bn/bngblaster/package.nix index 0d90da27c4..4b1647f371 100644 --- a/third_party/nixpkgs/pkgs/by-name/bn/bngblaster/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bn/bngblaster/package.nix @@ -1,29 +1,28 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, cmocka -, libdict -, ncurses -, jansson -, openssl -, libpcap +{ + lib, + stdenv, + cmake, + cmocka, + fetchFromGitHub, + jansson, + libdict, + libpcap, + ncurses, + openssl, }: stdenv.mkDerivation (finalAttrs: { pname = "bngblaster"; - version = "0.8.44"; + version = "0.8.51"; src = fetchFromGitHub { owner = "rtbrick"; repo = "bngblaster"; rev = finalAttrs.version; - hash = "sha256-kKzrXw6HQ2917RBArj2BxixXXH0mIvC4IeEU2JY4F9s="; + hash = "sha256-7AwLedYPOZAKQpWWuEasI9ytN66MZYKFO9SgXi7NjIo="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ libdict @@ -31,9 +30,7 @@ stdenv.mkDerivation (finalAttrs: { jansson openssl cmocka - ] ++ lib.optionals finalAttrs.doCheck [ - libpcap - ]; + ] ++ lib.optionals finalAttrs.doCheck [ libpcap ]; cmakeFlags = [ "-DBNGBLASTER_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" @@ -43,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; meta = with lib; { + description = "Network tester for access and routing protocols"; homepage = "https://github.com/rtbrick/bngblaster/"; changelog = "https://github.com/rtbrick/bngblaster/releases/tag/${finalAttrs.version}"; - description = "network tester for access and routing protocols"; license = licenses.bsd3; maintainers = teams.wdz.members; badPlatforms = platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/by-name/bo/boehmgc/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/boehmgc/package.nix index 4402b3af57..213d0ec9e3 100644 --- a/third_party/nixpkgs/pkgs/by-name/bo/boehmgc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bo/boehmgc/package.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , autoreconfHook -# doc: https://github.com/ivmai/bdwgc/blob/v8.2.4/doc/README.macros (LARGE_CONFIG) +# doc: https://github.com/ivmai/bdwgc/blob/v8.2.6/doc/README.macros (LARGE_CONFIG) , enableLargeConfig ? false , enableMmap ? true , enableStatic ? false @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "boehm-gc"; - version = "8.2.4"; + version = "8.2.6"; src = fetchFromGitHub { owner = "ivmai"; repo = "bdwgc"; rev = "v${finalAttrs.version}"; - hash = "sha256-KHijT4BBKfDvTpHpwognN+3ZXoC6JabBTFSYFyOUT9o="; + hash = "sha256-y6hU5qU4qO9VvQvKNH9dvReCrf3+Ih2HHbF6IS1V3WQ="; }; outputs = [ "out" "dev" "doc" ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { # not fix the problem the test failure will be a reminder to # extend the set of versions requiring the workaround). makeFlags = lib.optionals (stdenv.hostPlatform.isPower64 && - finalAttrs.version == "8.2.4") + finalAttrs.version == "8.2.6") [ # do not use /proc primitives to track dirty bits; see: # https://github.com/ivmai/bdwgc/issues/479#issuecomment-1279687537 diff --git a/third_party/nixpkgs/pkgs/by-name/bo/boogie/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/boogie/package.nix index 784a21cbd8..2961632b88 100644 --- a/third_party/nixpkgs/pkgs/by-name/bo/boogie/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bo/boogie/package.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - sha256 = "sha256-XKggNmyhY3ZwbmMvi78MPz36iulW1QPJRENW/LGgdts="; + sha256 = "sha256-/6x4NzlSJ2uswVlfFpevXaQxUxPnh3KvnbPIb8SFX9E="; }; projectFile = [ "Source/Boogie.sln" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/bo/boxbuddy/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/boxbuddy/package.nix index 9503bf85a9..9d94d80f75 100644 --- a/third_party/nixpkgs/pkgs/by-name/bo/boxbuddy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bo/boxbuddy/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-y3QfNOaeeZ4Vvby4SkyVgTCL8qIYvXpcK1c8ofzjrj0="; + hash = "sha256-b7b5IWo2REr0HBfsKbnFYcReEQG5SfuGDa9KSKIC3t0="; }; - cargoHash = "sha256-53hndNIcGtU8Uxnyh8y5v+0wURflNzlzwuyoh+HUXD4="; + cargoHash = "sha256-h+pDjS+VtvfiaWMQjpFHBBJ/8bZ0SRgayRmx4vg96Jw="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here diff --git a/third_party/nixpkgs/pkgs/by-name/bp/bpftop/package.nix b/third_party/nixpkgs/pkgs/by-name/bp/bpftop/package.nix index fed58a24f6..9dc4f4df19 100644 --- a/third_party/nixpkgs/pkgs/by-name/bp/bpftop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bp/bpftop/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "bpftop"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "Netflix"; repo = "bpftop"; rev = "v${version}"; - hash = "sha256-OLPebPzb2FKiV1Gc8HTK3sXU2UDMyhFA/XLix/lWxgU="; + hash = "sha256-zYCv3L+xDFAJ4Wo9xwfHJrqPQUv5KiFDbhCdC1Z6qNo="; }; - cargoHash = "sha256-UYCbNECsos71cwwE5avtaijPaPGhLEU7J9i84wPkObI="; + cargoHash = "sha256-6uPfMxjSrSGrAgJcvzTY/i1ckoW/wIi7D5noOafCvZE="; buildInputs = [ elfutils diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix b/third_party/nixpkgs/pkgs/by-name/bp/bpftrace/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix rename to third_party/nixpkgs/pkgs/by-name/bp/bpftrace/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/br/broom/package.nix b/third_party/nixpkgs/pkgs/by-name/br/broom/package.nix new file mode 100644 index 0000000000..69aa9ae684 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/br/broom/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "broom"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "a-camarillo"; + repo = "broom"; + rev = "v${version}"; + hash = "sha256-a2hUgYpiKm/dZWLRuCZKuGStmZ/7jDtLRAjd/B57Vxw="; + }; + + vendorHash = "sha256-zNklqGjMt89b+JOZfKjTO6c75SXO10e7YtQOqqQZpnA="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "An interactive CLI tool for managing local git branches"; + homepage = "https://github.com/a-camarillo/broom"; + license = licenses.mit; + maintainers = with maintainers; [ a-camarillo ]; + mainProgram = "broom"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix b/third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix index b968c941cf..3e9cf6b51f 100644 --- a/third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix @@ -27,20 +27,20 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.13.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-fVbwHmJ/5OtMM0lkOIo6zPXkAa8mIK+WRHCTXJ1XEIw="; + hash = "sha256-z4KL6CX1jtuC4lxqYA6Mg1zPSc9/OpRb530jPIQK3Is="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-D90y6NaiR9zpgtjfm9QgLxBVbHa09OMSi+fvgwqSjgY="; + npmDepsHash = "sha256-NIf7aMDAeE39+putw/7GTYODIdVmjJIvIwnL5O+sBmI="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/btrfs-assistant/default.nix b/third_party/nixpkgs/pkgs/by-name/bt/btrfs-assistant/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/misc/btrfs-assistant/default.nix rename to third_party/nixpkgs/pkgs/by-name/bt/btrfs-assistant/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix b/third_party/nixpkgs/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix new file mode 100644 index 0000000000..7392a0c580 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + coreutils, + getopt, + gnugrep, + gnused, + gawk, + btrfs-progs, + syslogSupport ? true, + util-linux ? null, +}: +assert syslogSupport -> util-linux != null; +stdenv.mkDerivation rec { + version = "2.0.4"; + pname = "btrfs-auto-snapshot"; + + src = fetchFromGitHub { + owner = "hunleyd"; + repo = pname; + rev = "v${version}"; + hash = "sha256-QpuwkGaYAkpu5hYyb360Mr5tHsZc2LzMlKtpS8CyyhI="; + }; + + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -Dm755 btrfs-auto-snapshot $out/bin/btrfs-auto-snapshot + ''; + + wrapperPath = + with lib; + makeBinPath ( + [ + coreutils + getopt + gnugrep + gnused + gawk + btrfs-progs + ] + ++ optional syslogSupport util-linux + ); + + postFixup = '' + wrapProgram $out/bin/btrfs-auto-snapshot \ + --prefix PATH : "${wrapperPath}" + ''; + + meta = with lib; { + description = "BTRFS Automatic Snapshot Service for Linux"; + homepage = "https://github.com/hunleyd/btrfs-auto-snapshot"; + license = licenses.gpl2; + mainProgram = "btrfs-auto-snapshot"; + maintainers = with maintainers; [ motiejus ]; + platforms = platforms.linux; + + longDescription = '' + btrfs-auto-snapshot is a Bash script designed to bring as much of the + functionality of the wonderful ZFS snapshot tool zfs-auto-snapshot to + BTRFS as possible. Designed to run from cron (using + /etc/cron.{daily,hourly,weekly}) it automatically creates a snapshot of + the specified BTRFS filesystem (or, optionally, all of them) and then + automatically purges the oldest snapshots of that type (hourly, daily, et + al) based on a user-defined retention policy. + + Snapshots are stored in a '.btrfs' directory at the root of the BTRFS + filesystem being snapped and are read-only by default. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/bu/buckle/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/buckle/package.nix index bc34858d52..85c23496ba 100644 --- a/third_party/nixpkgs/pkgs/by-name/bu/buckle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bu/buckle/package.nix @@ -1,4 +1,10 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, +}: rustPlatform.buildRustPackage rec { pname = "buckle"; @@ -12,6 +18,11 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-eWhcDzw+6I5N0dse5avwhcQ/y6YZ6b3QKyBwWBrA/xo="; }; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + checkFlags = [ # Both tests access the network. "--skip=test_buck2_latest" diff --git a/third_party/nixpkgs/pkgs/by-name/bu/bugstalker/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/bugstalker/package.nix new file mode 100644 index 0000000000..ccbf397e71 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bu/bugstalker/package.nix @@ -0,0 +1,104 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libunwind +}: + +rustPlatform.buildRustPackage rec { + pname = "bugstalker"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "godzie44"; + repo = "BugStalker"; + rev = "v${version}"; + hash = "sha256-16bmvz6/t8H8Sx/32l+fp3QqP5lwi0o1Q9KqDHqF22U="; + }; + + cargoHash = "sha256-kp0GZ0cM57BMpH/8lhxevnBuJhUSH0rtxP4B/9fXYiU="; + + buildInputs = [ libunwind ]; + + nativeBuildInputs = [ pkg-config ]; + + # Tests which require access to example source code fail in the sandbox. I + # haven't managed to figure out how to fix this. + checkFlags = [ + "--skip=breakpoints::test_breakpoint_at_fn_with_monomorphization" + "--skip=breakpoints::test_breakpoint_at_line_with_monomorphization" + "--skip=breakpoints::test_brkpt_on_function" + "--skip=breakpoints::test_brkpt_on_function_name_collision" + "--skip=breakpoints::test_brkpt_on_line" + "--skip=breakpoints::test_brkpt_on_line2" + "--skip=breakpoints::test_brkpt_on_line_collision" + "--skip=breakpoints::test_debugee_run" + "--skip=breakpoints::test_deferred_breakpoint" + "--skip=breakpoints::test_multiple_brkpt_on_addr" + "--skip=breakpoints::test_set_breakpoint_idempotence" + "--skip=io::test_backtrace" + "--skip=io::test_read_register_write" + "--skip=io::test_read_value_u64" + "--skip=multithreaded::test_multithreaded_app_running" + "--skip=multithreaded::test_multithreaded_backtrace" + "--skip=multithreaded::test_multithreaded_breakpoints" + "--skip=multithreaded::test_multithreaded_trace" + "--skip=signal::test_signal_stop_multi_thread" + "--skip=signal::test_signal_stop_multi_thread_multiple_signal" + "--skip=signal::test_signal_stop_single_thread" + "--skip=signal::test_transparent_signals" + "--skip=steps::test_step_into" + "--skip=steps::test_step_into_recursion" + "--skip=steps::test_step_out" + "--skip=steps::test_step_over" + "--skip=steps::test_step_over_inline_code" + "--skip=steps::test_step_over_on_fn_decl" + "--skip=symbol::test_symbol" + "--skip=test_debugger_disassembler" + "--skip=test_debugger_graceful_shutdown" + "--skip=test_debugger_graceful_shutdown_multithread" + "--skip=test_frame_cfa" + "--skip=test_registers" + "--skip=variables::test_arguments" + "--skip=variables::test_btree_map" + "--skip=variables::test_cast_pointers" + "--skip=variables::test_cell" + "--skip=variables::test_circular_ref_types" + "--skip=variables::test_lexical_blocks" + "--skip=variables::test_read_array" + "--skip=variables::test_read_atomic" + "--skip=variables::test_read_btree_set" + "--skip=variables::test_read_closures" + "--skip=variables::test_read_enum" + "--skip=variables::test_read_hashmap" + "--skip=variables::test_read_hashset" + "--skip=variables::test_read_only_local_variables" + "--skip=variables::test_read_pointers" + "--skip=variables::test_read_scalar_variables" + "--skip=variables::test_read_scalar_variables_at_place" + "--skip=variables::test_read_static_in_fn_variable" + "--skip=variables::test_read_static_variables" + "--skip=variables::test_read_static_variables_different_modules" + "--skip=variables::test_read_strings" + "--skip=variables::test_read_struct" + "--skip=variables::test_read_tls_variables" + "--skip=variables::test_read_type_alias" + "--skip=variables::test_read_union" + "--skip=variables::test_read_uuid" + "--skip=variables::test_read_vec_and_slice" + "--skip=variables::test_read_vec_deque" + "--skip=variables::test_shared_ptr" + "--skip=variables::test_slice_operator" + "--skip=variables::test_type_parameters" + "--skip=variables::test_zst_types" + ]; + + meta = { + description = "Rust debugger for Linux x86-64"; + homepage = "https://github.com/godzie44/BugStalker"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jacg ]; + mainProgram = "bs"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/bu/bustle/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/bustle/package.nix new file mode 100644 index 0000000000..1e57c9122f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bu/bustle/package.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitLab +, cargo +, meson +, ninja +, pkg-config +, desktop-file-utils +, rustPlatform +, rustc +, wrapGAppsHook4 +, glib +, gtk4 +, libadwaita +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bustle"; + version = "0.9.2"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "bustle"; + rev = finalAttrs.version; + hash = "sha256-/B1rY8epcP0OFv+kVgv4Jx6x/oK3XpNnZcpSGvdIPx0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + name = "bustle-${finalAttrs.version}"; + hash = "sha256-r29Z+6P+yuCpOBUE3vkESd15lcGXs5+ZTBiQ9nW6DJ4="; + }; + + nativeBuildInputs = [ + cargo + meson + ninja + pkg-config + desktop-file-utils + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + glib + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + meta = with lib; { + description = "Graphical D-Bus message analyser and profiler"; + homepage = "https://gitlab.gnome.org/World/bustle"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jtojnar ]; + mainProgram = "bustle"; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/bu/butt/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/butt/package.nix index 6f2e772979..08f4b2401f 100644 --- a/third_party/nixpkgs/pkgs/by-name/bu/butt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bu/butt/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, fltk13, portaudio, lame, libvorbis, libogg -, flac, libopus, libsamplerate, fdk_aac, dbus, openssl, curl }: +, flac, libopus, libsamplerate, fdk_aac, dbus, openssl, curl, portmidi }: stdenv.mkDerivation (finalAttrs: { pname = "butt"; - version = "0.1.40"; + version = "1.41.1"; src = fetchurl { url = "https://danielnoethen.de/butt/release/${finalAttrs.version}/butt-${finalAttrs.version}.tar.gz"; - hash = "sha256-wag177UIQ6YpBkJ5XQlxYtTdBFFNO5q+BLD/CiUkGoA="; + hash = "sha256-y/XIcFm1TWVd5SL+kDCJc21CtMwipMQgRE4gPra5+98="; }; postPatch = '' @@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { dbus openssl curl + portmidi ]; postInstall = '' @@ -45,5 +46,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ehmry ]; mainProgram = "butt"; + platforms = lib.platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/bu/buttermanager/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/buttermanager/package.nix index fe738b3712..80c3dd4e30 100644 --- a/third_party/nixpkgs/pkgs/by-name/bu/buttermanager/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bu/buttermanager/package.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , qt5 }: @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 qt5.wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/by-name/c2/c2fmzq/package.nix b/third_party/nixpkgs/pkgs/by-name/c2/c2fmzq/package.nix index f5249425f8..1ac91956bd 100644 --- a/third_party/nixpkgs/pkgs/by-name/c2/c2fmzq/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/c2/c2fmzq/package.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "c2FmZQ"; - version = "0.4.19"; + version = "0.4.20"; src = fetchFromGitHub { owner = "c2FmZQ"; repo = "c2FmZQ"; rev = "v${version}"; - hash = "sha256-9kCiV+v7RNFDrAbWRujTW9b9sbYX9fGEE37S9uDp0nY="; + hash = "sha256-ur1zZdDAGl97RDhs0ucc9UAvufI/DG49cn8HaXx3gxs="; }; ldflags = [ "-s" "-w" ]; sourceRoot = "${src.name}/c2FmZQ"; - vendorHash = "sha256-plORJl7KNsBP3tQSYX8829+sb8l0sO/TS8Bt25JXNgY="; + vendorHash = "sha256-wZ8+w1UFx55whodAXKhQ4EbtMXkbztYLjpqEVvdrAF8="; subPackages = [ "c2FmZQ-client" "c2FmZQ-server" ]; diff --git a/third_party/nixpkgs/pkgs/servers/caddy/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/caddy/package.nix similarity index 81% rename from third_party/nixpkgs/pkgs/servers/caddy/default.nix rename to third_party/nixpkgs/pkgs/by-name/ca/caddy/package.nix index 399ce426d9..73ab673664 100644 --- a/third_party/nixpkgs/pkgs/servers/caddy/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/caddy/package.nix @@ -5,6 +5,7 @@ , caddy , testers , installShellFiles +, stdenv }: let version = "2.7.6"; @@ -40,8 +41,13 @@ buildGoModule { postInstall = '' install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system - substituteInPlace $out/lib/systemd/system/caddy.service --replace "/usr/bin/caddy" "$out/bin/caddy" - substituteInPlace $out/lib/systemd/system/caddy-api.service --replace "/usr/bin/caddy" "$out/bin/caddy" + substituteInPlace $out/lib/systemd/system/caddy.service \ + --replace-fail "/usr/bin/caddy" "$out/bin/caddy" + substituteInPlace $out/lib/systemd/system/caddy-api.service \ + --replace-fail "/usr/bin/caddy" "$out/bin/caddy" + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # Generating man pages and completions fail on cross-compilation + # https://github.com/NixOS/nixpkgs/issues/308283 $out/bin/caddy manpage --directory manpages installManPage manpages/* diff --git a/third_party/nixpkgs/pkgs/by-name/ca/caido/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/caido/package.nix index 9c930f0afc..44c4571b56 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/caido/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/caido/package.nix @@ -16,10 +16,9 @@ let in appimageTools.wrapType2 { inherit pname src version; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ]; + extraPkgs = pkgs: [ pkgs.libthai ]; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications install -m 444 -D ${appimageContents}/caido.png \ $out/share/icons/hicolor/512x512/apps/caido.png diff --git a/third_party/nixpkgs/pkgs/by-name/ca/caligula/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/caligula/package.nix new file mode 100644 index 0000000000..f0f5c14664 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ca/caligula/package.nix @@ -0,0 +1,42 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "caligula"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "ifd3f"; + repo = "caligula"; + rev = "v${version}"; + hash = "sha256-9+aLpxmMP76CsLFFmr1mhKgbaT7Zz0lx4D2jQCUA9VY="; + }; + + cargoHash = "sha256-VwtmU5jTQPn3hpNuLckPQl6joEFPfuax1gRVG0/nceg="; + + buildInputs = lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; [ + Cocoa + IOKit + Foundation + DiskArbitration + ] + ); + + RUSTFLAGS = "--cfg tracing_unstable"; + + meta = with lib; { + description = "A user-friendly, lightweight TUI for disk imaging"; + homepage = "https://github.com/ifd3f/caligula/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ sodiboo ]; + platforms = platforms.linux ++ platforms.darwin; + # https://github.com/ifd3f/caligula/issues/105 + broken = stdenv.hostPlatform.isDarwin; + mainProgram = "caligula"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-autoinherit/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-autoinherit/package.nix index 71beb30ee3..0e3fc9e7c7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-autoinherit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-autoinherit/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-autoinherit"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "mainmatter"; repo = "cargo-autoinherit"; rev = "v${version}"; - hash = "sha256-BuZDCd4SwSYg5eKV61L3RpPVmq5NZDAOc9zOz5QiSNI="; + hash = "sha256-ai2BqBfZlCOA1DIlzZerH71sbUMi6C65FRv5VDU0DPU="; }; - cargoHash = "sha256-9hhrVkC1xB2E/vatkiM4PIJyXq+0GDoqlgXZXc8WehU="; + cargoHash = "sha256-bPbwUqw2IFwZTi7qFm1BQgGYBAb6OG8QSU8xTdx/1zM="; meta = with lib; { description = "Automatically DRY up your Rust dependencies"; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-bloat/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-bloat/package.nix index 59085534d0..4c77fbbb38 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-bloat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-bloat/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.11.1"; + version = "0.12.1"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-lCA7C1G2xu65jn3/wzj6prWSrjQz3EqqJyMlPR/HRFs="; + hash = "sha256-B71VX7cJe1giOLmk3cQE8Zxr7fKGyQkoXRuM+NzBcb8="; }; - cargoHash = "sha256-fOenXn5gagFss9DRDXXsGxQlDqVXZ5LZcdM4WsXAyUU="; + cargoHash = "sha256-BBFLyMx1OPT2XAM6pofs2kV/3n3FrNu0Jkyr/Y3smnI="; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-expand/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-expand/package.nix index 922fe9d939..bd1afa402f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-expand/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-expand/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.84"; + version = "1.0.87"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-b98OVx7vkA3sgxp8yPzdV7jAjsTqqTeffibCtK3hoMM="; + hash = "sha256-sBL1/5was2qN8M2s8u443mb376ySE+T58bmdfO0XqE0="; }; - cargoHash = "sha256-BH01DgwOdP9f0KFIbbF8RRhl/oivBET2ujxdzZ56lC0="; + cargoHash = "sha256-DhjZMOKfXBGSF8b7OQ7l++/RKjtww+cUJDj91JW9ROY="; meta = with lib; { description = "Cargo subcommand to show result of macro expansion"; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-geiger/allow-warnings.patch b/third_party/nixpkgs/pkgs/by-name/ca/cargo-geiger/allow-warnings.patch new file mode 100644 index 0000000000..97a9090e90 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-geiger/allow-warnings.patch @@ -0,0 +1,12 @@ +diff --git a/cargo-geiger/src/lib.rs b/cargo-geiger/src/lib.rs +index cc08146..d220ad9 100644 +--- a/cargo-geiger/src/lib.rs ++++ b/cargo-geiger/src/lib.rs +@@ -5,7 +5,6 @@ + #![deny(clippy::cargo)] + #![deny(clippy::doc_markdown)] + #![forbid(unsafe_code)] +-#![deny(warnings)] + + /// Argument parsing + pub mod args; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-geiger/package.nix similarity index 74% rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-geiger/package.nix index 3fbf1af9ad..ac3338a68a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-geiger/package.nix @@ -12,15 +12,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-geiger"; - version = "0.11.6"; + version = "0.11.7"; src = fetchFromGitHub { owner = "rust-secure-code"; repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-rGZJyCWGk2RUr52ICp4dVER3JMBrnLdOMusRm/GG2PE="; + rev = "cargo-geiger@v${version}"; + hash = "sha256-/5yuayqneZV6aVQ6YFgqNS2XY3W6yETRQ0kE5ovc7p8="; }; - cargoHash = "sha256-B6Ka35y2fJEDVd891P60TNppr5HGFnzVjLhhfoFCYUA="; + cargoHash = "sha256-lhojo3dhsM9y1SxpVMH93yv+JeNfTL7VLsbTp9ErgIQ="; + + patches = [ + ./allow-warnings.patch + ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security libiconv curl ]); @@ -30,12 +34,18 @@ rustPlatform.buildRustPackage rec { # skip tests with networking or other failures checkFlags = [ + "--skip serialize_test1_quick_report" "--skip serialize_test2_quick_report" "--skip serialize_test3_quick_report" + "--skip serialize_test4_quick_report" "--skip serialize_test6_quick_report" + "--skip serialize_test7_quick_report" + "--skip serialize_test1_report" "--skip serialize_test2_report" "--skip serialize_test3_report" + "--skip serialize_test4_report" "--skip serialize_test6_report" + "--skip serialize_test7_report" # multiple test cases that time-out or cause memory leaks "--skip test_package" "--skip test_package_update_readme::case_2" @@ -45,7 +55,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/rust-secure-code/cargo-geiger"; - changelog = "https://github.com/rust-secure-code/cargo-geiger/blob/${pname}-${version}/CHANGELOG.md"; + changelog = "https://github.com/rust-secure-code/cargo-geiger/blob/cargo-geiger-${version}/CHANGELOG.md"; description = "Detects usage of unsafe Rust in a Rust crate and its dependencies"; mainProgram = "cargo-geiger"; longDescription = '' @@ -55,6 +65,6 @@ rustPlatform.buildRustPackage rec { code is appropriate. ''; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ evanjs jk matthiasbeyer ]; + maintainers = with maintainers; [ evanjs gepbird jk matthiasbeyer ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-information/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ca/cargo-information/Cargo.lock index a292db70a6..edde6f5eaa 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-information/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-information/Cargo.lock @@ -36,10 +36,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] -name = "anstream" -version = "0.6.11" +name = "annotate-snippets" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "6d9b665789884a7e8fb06c84b295e923b03ca51edbb7d08f91a6a50322ecbfe6" +dependencies = [ + "anstyle", + "unicode-width", +] + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -55,6 +65,15 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +[[package]] +name = "anstyle-lossy" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9a0444767dbd4aea9355cb47a370eb184dbfe918875e127eff52cb9d1638181" +dependencies = [ + "anstyle", +] + [[package]] name = "anstyle-parse" version = "0.2.3" @@ -73,6 +92,19 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "anstyle-svg" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6ddad447b448d6d5db36b31cbd3ff27c7af071619501998eeceab01968287a" +dependencies = [ + "anstream", + "anstyle", + "anstyle-lossy", + "html-escape", + "unicode-width", +] + [[package]] name = "anstyle-wincon" version = "3.0.2" @@ -85,9 +117,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arc-swap" @@ -189,10 +221,11 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cargo" -version = "0.77.0" +version = "0.78.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a399e5bde59d144aa2c7ba643765e2f8c6c3c601daa2da03202caf66f2552b3" +checksum = "d6305e39d08315644d79a5ae09a0745dfb3a43b5b5e318e55dbda3f12031c5dc" dependencies = [ + "annotate-snippets", "anstream", "anstyle", "anyhow", @@ -203,10 +236,11 @@ dependencies = [ "cargo-credential-macos-keychain", "cargo-credential-wincred", "cargo-platform", - "cargo-util 0.2.9", + "cargo-util 0.2.10", + "cargo-util-schemas", "clap", "color-print", - "crates-io 0.39.2", + "crates-io 0.40.0", "curl", "curl-sys", "filetime", @@ -214,7 +248,7 @@ dependencies = [ "git2", "git2-curl", "gix", - "gix-features 0.35.0", + "gix-features", "glob", "hex", "hmac", @@ -235,7 +269,6 @@ dependencies = [ "os_info", "pasetors", "pathdiff", - "pulldown-cmark", "rand", "regex", "rusqlite", @@ -243,23 +276,20 @@ dependencies = [ "semver", "serde", "serde-untagged", - "serde-value", "serde_ignored", "serde_json", "sha1", "shell-escape", "supports-hyperlinks", - "syn 2.0.46", "tar", "tempfile", "time", "toml", - "toml_edit 0.21.0", + "toml_edit 0.21.1", "tracing", "tracing-subscriber", "unicase", "unicode-width", - "unicode-xid", "url", "walkdir", "windows-sys 0.52.0", @@ -267,9 +297,9 @@ dependencies = [ [[package]] name = "cargo-credential" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec27ad011c37339b865c765fa28096cd63d5b25fab680c04d9e410cb586c327d" +checksum = "4e5c02daf38715e60a9f59155bc3154c3e0bf55ee7bf34ddc090e8818c8f75e3" dependencies = [ "anyhow", "libc", @@ -313,7 +343,7 @@ dependencies = [ [[package]] name = "cargo-information" -version = "0.4.2" +version = "0.6.0" dependencies = [ "anstyle", "anyhow", @@ -321,10 +351,10 @@ dependencies = [ "cargo-credential", "cargo-test-macro", "cargo-test-support", - "cargo-util 0.2.9", + "cargo-util 0.2.10", "clap", "color-print", - "crates-io 0.39.2", + "crates-io 0.40.0", "pathdiff", "semver", "snapbox", @@ -375,9 +405,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74862c3c6e53a1c1f8f0178f9d38ab41e49746cd3a7cafc239b3d0248fd4e342" +checksum = "9f2d9a9a8d3e0b61b1110c49ab8f6ed7a76ce4f2b1d53ae48a83152d3d5e8f5b" dependencies = [ "anyhow", "core-foundation", @@ -418,6 +448,22 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "cargo-util-schemas" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63d2780ac94487eb9f1fea7b0d56300abc9eb488800854ca217f102f5caccca" +dependencies = [ + "semver", + "serde", + "serde-untagged", + "serde-value", + "thiserror", + "toml", + "unicode-xid", + "url", +] + [[package]] name = "cc" version = "1.0.83" @@ -436,18 +482,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.1" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -537,9 +583,9 @@ dependencies = [ [[package]] name = "crates-io" -version = "0.39.2" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6622f902c3c338eced1f000091f034846ae36aadaf35d0acd1ab0469a2d8ef1f" +checksum = "19958b4dfc8889cf78606e5e2fe64e7e0170a9ab853157192608f3a3253c8ef8" dependencies = [ "curl", "percent-encoding", @@ -811,9 +857,6 @@ name = "faster-hex" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" -dependencies = [ - "serde", -] [[package]] name = "fastrand" @@ -937,9 +980,9 @@ dependencies = [ [[package]] name = "gix" -version = "0.56.0" +version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0dcdc9c60d66535897fa40a7ea2a635e72f99456b1d9ae86b7e170e80618cb" +checksum = "6dd025382892c7b500a9ce1582cd803f9c2ebfe44aff52e9c7f86feee7ced75e" dependencies = [ "gix-actor", "gix-attributes", @@ -950,7 +993,7 @@ dependencies = [ "gix-date", "gix-diff", "gix-discover", - "gix-features 0.36.1", + "gix-features", "gix-filter", "gix-fs", "gix-glob", @@ -992,9 +1035,9 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.28.1" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eadca029ef716b4378f7afb19f7ee101fde9e58ba1f1445971315ac866db417" +checksum = "da27b5ab4ab5c75ff891dccd48409f8cc53c28a79480f1efdd33184b2dc1d958" dependencies = [ "bstr", "btoi", @@ -1006,9 +1049,9 @@ dependencies = [ [[package]] name = "gix-attributes" -version = "0.20.1" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f395469d38c76ec47cd1a6c5a53fbc3f13f737b96eaf7535f4e6b367e643381" +checksum = "bd6de7603d6bcefcf9a1d87779c4812b14665f71bc870df7ce9ca4c4b309de18" dependencies = [ "bstr", "gix-glob", @@ -1023,18 +1066,18 @@ dependencies = [ [[package]] name = "gix-bitmap" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49e1a13a30d3f88be4bceae184dd13a2d3fb9ffa7515f7ed7ae771b857f4916" +checksum = "a371db66cbd4e13f0ed9dc4c0fea712d7276805fccc877f77e96374d317e87ae" dependencies = [ "thiserror", ] [[package]] name = "gix-chunk" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d411ecd9b558b0c20b3252b7e409eec48eabc41d18324954fe526bac6e2db55f" +checksum = "45c8751169961ba7640b513c3b24af61aa962c967aaf04116734975cd5af0c52" dependencies = [ "thiserror", ] @@ -1053,13 +1096,13 @@ dependencies = [ [[package]] name = "gix-commitgraph" -version = "0.22.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a7007ba021f059803afaf6f8a48872422abc20550ac12ede6ddea2936cec36" +checksum = "7e8dcbf434951fa477063e05fea59722615af70dc2567377e58c2f7853b010fc" dependencies = [ "bstr", "gix-chunk", - "gix-features 0.36.1", + "gix-features", "gix-hash", "memmap2", "thiserror", @@ -1067,13 +1110,13 @@ dependencies = [ [[package]] name = "gix-config" -version = "0.32.1" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0341471d55d8676e98b88e121d7065dfa4c9c5acea4b6d6ecdd2846e85cce0c3" +checksum = "367304855b369cadcac4ee5fb5a3a20da9378dd7905106141070b79f85241079" dependencies = [ "bstr", "gix-config-value", - "gix-features 0.36.1", + "gix-features", "gix-glob", "gix-path", "gix-ref", @@ -1101,9 +1144,9 @@ dependencies = [ [[package]] name = "gix-credentials" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513dac42450b27946bd0a0535a3a5a88e473d6522e5e3439a129cab779c88f3d" +checksum = "380cf3a7c31763743ae6403ec473281d54bfa05628331d09518a350ad5a0971f" dependencies = [ "bstr", "gix-command", @@ -1118,9 +1161,9 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.8.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468dfbe411f335f01525a1352271727f8e7772075a93fa747260f502086b30be" +checksum = "180b130a4a41870edfbd36ce4169c7090bca70e195da783dea088dd973daa59c" dependencies = [ "bstr", "itoa", @@ -1130,9 +1173,9 @@ dependencies = [ [[package]] name = "gix-diff" -version = "0.38.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8119a985887cfe68f4bdf92e51bd64bc758a73882d82fcfc03ebcb164441c85d" +checksum = "fd6a0454f8c42d686f17e7f084057c717c082b7dbb8209729e4e8f26749eb93a" dependencies = [ "bstr", "gix-hash", @@ -1142,9 +1185,9 @@ dependencies = [ [[package]] name = "gix-discover" -version = "0.27.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fad89416ebe0b3b7df78464124e2a02417b6cd3743d48ad93df86f4d2929c07" +checksum = "b8d7b2896edc3d899d28a646ccc6df729827a6600e546570b2783466404a42d6" dependencies = [ "bstr", "dunce", @@ -1157,30 +1200,19 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.35.0" +version = "0.37.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b9ff423ae4983f762659040d13dd7a5defbd54b6a04ac3cc7347741cec828cd" -dependencies = [ - "crossbeam-channel", - "gix-hash", - "gix-trace", - "libc", - "parking_lot", -] - -[[package]] -name = "gix-features" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d46a4a5c6bb5bebec9c0d18b65ada20e6517dbd7cf855b87dd4bbdce3a771b2" +checksum = "d50270e8dcc665f30ba0735b17984b9535bdf1e646c76e638e007846164d57af" dependencies = [ "bytes", "crc32fast", + "crossbeam-channel", "flate2", "gix-hash", "gix-trace", "libc", "once_cell", + "parking_lot", "prodash", "sha1_smol", "thiserror", @@ -1189,9 +1221,9 @@ dependencies = [ [[package]] name = "gix-filter" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d6a5c9d8e55c364e7c226919c19c9a28be1392d6208b5008059fa94ff7e2bf0" +checksum = "f598c1d688bf9d57f428ed7ee70c3e786d6f0cc7ed1aeb3c982135af41f6e516" dependencies = [ "bstr", "encoding_rs", @@ -1210,30 +1242,30 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20e86eb040f5776a5ade092282e51cdcad398adb77d948b88d17583c2ae4e107" +checksum = "7555c23a005537434bbfcb8939694e18cad42602961d0de617f8477cc2adecdd" dependencies = [ - "gix-features 0.36.1", + "gix-features", ] [[package]] name = "gix-glob" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db19298c5eeea2961e5b3bf190767a2d1f09b8802aeb5f258e42276350aff19" +checksum = "ae6232f18b262770e343dcdd461c0011c9b9ae27f0c805e115012aa2b902c1b8" dependencies = [ "bitflags 2.4.1", "bstr", - "gix-features 0.36.1", + "gix-features", "gix-path", ] [[package]] name = "gix-hash" -version = "0.13.3" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8cf8c2266f63e582b7eb206799b63aa5fa68ee510ad349f637dfe2d0653de0" +checksum = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e" dependencies = [ "faster-hex", "thiserror", @@ -1241,9 +1273,9 @@ dependencies = [ [[package]] name = "gix-hashtable" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb61880816d7ec4f0b20606b498147d480860ddd9133ba542628df2f548d3ca" +checksum = "7ddf80e16f3c19ac06ce415a38b8591993d3f73aede049cb561becb5b3a8e242" dependencies = [ "gix-hash", "hashbrown", @@ -1252,9 +1284,9 @@ dependencies = [ [[package]] name = "gix-ignore" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a215cc8cf21645bca131fcf6329d3ebd46299c47dbbe27df71bb1ca9e328b879" +checksum = "f356ce440c60aedb7e72f3447f352f9c5e64352135c8cf33e838f49760fd2643" dependencies = [ "bstr", "gix-glob", @@ -1264,16 +1296,16 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.27.1" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f308f5cd2992e96a274b0d1931e9a0e44fdcba87695ead3f6df30d8a697e9c" +checksum = "9e50e63df6c8d4137f7fb882f27643b3a9756c468a1a2cdbe1ce443010ca8778" dependencies = [ "bitflags 2.4.1", "bstr", "btoi", "filetime", "gix-bitmap", - "gix-features 0.36.1", + "gix-features", "gix-fs", "gix-hash", "gix-lock", @@ -1289,9 +1321,9 @@ dependencies = [ [[package]] name = "gix-lock" -version = "11.0.1" +version = "12.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5c65e6a29830a435664891ced3f3c1af010f14900226019590ee0971a22f37" +checksum = "f40a439397f1e230b54cf85d52af87e5ea44cc1e7748379785d3f6d03d802b00" dependencies = [ "gix-tempfile", "gix-utils", @@ -1300,9 +1332,9 @@ dependencies = [ [[package]] name = "gix-macros" -version = "0.1.1" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a5bcaf6704d9354a3071cede7e77d366a5980c7352e102e2c2f9b645b1d3ae" +checksum = "1dff438f14e67e7713ab9332f5fd18c8f20eb7eb249494f6c2bf170522224032" dependencies = [ "proc-macro2", "quote", @@ -1311,9 +1343,9 @@ dependencies = [ [[package]] name = "gix-negotiate" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "979f6accd9c051b3dd018b50adf29c0a2459edddf6105cc70b767976cd6f8014" +checksum = "e6820bb5e9e259f6ad052826037452ca023d4f248c5d710dce067d89685dd582" dependencies = [ "bitflags 2.4.1", "gix-commitgraph", @@ -1327,15 +1359,15 @@ dependencies = [ [[package]] name = "gix-object" -version = "0.39.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "febf79c5825720c1c63fe974c7bbe695d0cb54aabad73f45671c60ce0e501e33" +checksum = "0c89402e8faa41b49fde348665a8f38589e461036475af43b6b70615a6a313a2" dependencies = [ "bstr", "btoi", "gix-actor", "gix-date", - "gix-features 0.36.1", + "gix-features", "gix-hash", "gix-validate", "itoa", @@ -1346,13 +1378,13 @@ dependencies = [ [[package]] name = "gix-odb" -version = "0.55.0" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fae5f971540c99c6ecc8d4368ecc9d18a9dc8b9391025c68c4399747dc93bac" +checksum = "46ae6da873de41c6c2b73570e82c571b69df5154dcd8f46dfafc6687767c33b1" dependencies = [ "arc-swap", "gix-date", - "gix-features 0.36.1", + "gix-features", "gix-hash", "gix-object", "gix-pack", @@ -1365,13 +1397,13 @@ dependencies = [ [[package]] name = "gix-pack" -version = "0.45.0" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569491c92446fddf373456ff360aff9a9effd627b40a70f2d7914dcd75a3205" +checksum = "782b4d42790a14072d5c400deda9851f5765f50fe72bca6dece0da1cd6f05a9a" dependencies = [ "clru", "gix-chunk", - "gix-features 0.36.1", + "gix-features", "gix-hash", "gix-hashtable", "gix-object", @@ -1409,9 +1441,9 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e9ad649bf5e109562d6acba657ca428661ec08e77eaf3a755d8fa55485be9c" +checksum = "69e0b521a5c345b7cd6a81e3e6f634407360a038c8b74ba14c621124304251b8" dependencies = [ "bstr", "gix-trace", @@ -1422,9 +1454,9 @@ dependencies = [ [[package]] name = "gix-pathspec" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dbbb92f75a38ef043c8bb830b339b38d0698d7f3746968b5fcbade7a880494d" +checksum = "0cdb0ee9517c04f89bcaf6366fe893a17154ecb02d88b5c8174f27f1091d1247" dependencies = [ "bitflags 2.4.1", "bstr", @@ -1450,15 +1482,15 @@ dependencies = [ [[package]] name = "gix-protocol" -version = "0.42.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95736ef407db0bd15a5bdea791fbfcf523b9f13b96c852c240cd86a9ee0ef817" +checksum = "eca52738435991105f3bbd7f3a3a42cdf84c9992a78b9b7b1de528b3c022cfdd" dependencies = [ "bstr", "btoi", "gix-credentials", "gix-date", - "gix-features 0.36.1", + "gix-features", "gix-hash", "gix-transport", "maybe-async", @@ -1468,24 +1500,24 @@ dependencies = [ [[package]] name = "gix-quote" -version = "0.4.8" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f84845efa535468bc79c5a87b9d29219f1da0313c8ecf0365a5daa7e72786f2" +checksum = "cbff4f9b9ea3fa7a25a70ee62f545143abef624ac6aa5884344e70c8b0a1d9ff" dependencies = [ "bstr", - "btoi", + "gix-utils", "thiserror", ] [[package]] name = "gix-ref" -version = "0.39.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2069adc212cf7f3317ef55f6444abd06c50f28479dbbac5a86acf3b05cbbfe" +checksum = "64d9bd1984638d8f3511a2fcbe84fcedb8a5b5d64df677353620572383f42649" dependencies = [ "gix-actor", "gix-date", - "gix-features 0.36.1", + "gix-features", "gix-fs", "gix-hash", "gix-lock", @@ -1500,9 +1532,9 @@ dependencies = [ [[package]] name = "gix-refspec" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d9d3b82e1ee78fc0dc1c37ea5ea76c2dbc73f407db155f0dfcea285e583bee" +checksum = "be219df5092c1735abb2a53eccdf775e945eea6986ee1b6e7a5896dccc0be704" dependencies = [ "bstr", "gix-hash", @@ -1514,9 +1546,9 @@ dependencies = [ [[package]] name = "gix-revision" -version = "0.24.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5dd51710ce5434bc315ea30394fab483c5377276494edd79222b321a5a9544" +checksum = "aa78e1df3633bc937d4db15f8dca2abdb1300ca971c0fabcf9fa97e38cf4cd9f" dependencies = [ "bstr", "gix-date", @@ -1530,9 +1562,9 @@ dependencies = [ [[package]] name = "gix-revwalk" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d4ed2493ca94a475fdf147138e1ef8bab3b6ebb56abf3d9bda1c05372ec1dd" +checksum = "702de5fe5c2bbdde80219f3a8b9723eb927466e7ecd187cfd1b45d986408e45f" dependencies = [ "gix-commitgraph", "gix-date", @@ -1545,21 +1577,21 @@ dependencies = [ [[package]] name = "gix-sec" -version = "0.10.1" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36ea2c5907d64a9b4b5d3cc9f430e6c30f0509646b5e38eb275ca57c5bf29e2" +checksum = "022592a0334bdf77c18c06e12a7c0eaff28845c37e73c51a3e37d56dd495fb35" dependencies = [ "bitflags 2.4.1", "gix-path", "libc", - "windows", + "windows-sys 0.52.0", ] [[package]] name = "gix-submodule" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a3d7f60a95bdcaeb8981663c99d1c9f4de42aab1169524c949e948989809f9" +checksum = "21d438409222de24dffcc9897f04a9f97903a19fe4835b598ab3bb9b6e0f5e35" dependencies = [ "bstr", "gix-config", @@ -1572,9 +1604,9 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "11.0.1" +version = "12.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388dd29114a86ec69b28d1e26d6d63a662300ecf61ab3f4cc578f7d7dc9e7e23" +checksum = "a8ef376d718b1f5f119b458e21b00fbf576bc9d4e26f8f383d29f5ffe3ba3eaa" dependencies = [ "gix-fs", "libc", @@ -1591,16 +1623,16 @@ checksum = "02b202d766a7fefc596e2cc6a89cda8ad8ad733aed82da635ac120691112a9b1" [[package]] name = "gix-transport" -version = "0.39.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f731cfefc4d62468c6dd2053f5c6707828256a6d2f5488c1811e3f42c178b144" +checksum = "be01a22053e9395a409fcaeed879d94f4fcffeb4f46de7143275fbf5e5b39770" dependencies = [ "base64", "bstr", "curl", "gix-command", "gix-credentials", - "gix-features 0.36.1", + "gix-features", "gix-packetline", "gix-quote", "gix-sec", @@ -1610,9 +1642,9 @@ dependencies = [ [[package]] name = "gix-traverse" -version = "0.35.0" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2112088122a0206592c84fbd42020db63b2ccaed66a0293779f2e5fbf80474" +checksum = "65109e445ba7a409b48f34f570a4d7db72eade1dc1bcff81990a490e86c07161" dependencies = [ "gix-commitgraph", "gix-date", @@ -1626,12 +1658,12 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.25.2" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c427a1a11ccfa53a4a2da47d9442c2241deee63a154bc15cc14b8312fbc4005" +checksum = "8f0f17cceb7552a231d1fec690bc2740c346554e3be6f5d2c41dfa809594dc44" dependencies = [ "bstr", - "gix-features 0.36.1", + "gix-features", "gix-path", "home", "thiserror", @@ -1640,18 +1672,19 @@ dependencies = [ [[package]] name = "gix-utils" -version = "0.1.6" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f82c41937f00e15a1f6cb0b55307f0ca1f77f4407ff2bf440be35aa688c6a3e" +checksum = "0066432d4c277f9877f091279a597ea5331f68ca410efc874f0bdfb1cd348f92" dependencies = [ "fastrand", + "unicode-normalization", ] [[package]] name = "gix-validate" -version = "0.8.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b7d8e4274be69f284bbc7e6bb2ccf7065dbcdeba22d8c549f2451ae426883f" +checksum = "e39fc6e06044985eac19dd34d474909e517307582e462b2eb4c8fa51b6241545" dependencies = [ "bstr", "thiserror", @@ -1659,13 +1692,13 @@ dependencies = [ [[package]] name = "gix-worktree" -version = "0.28.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f1d0ae01dee14abe8c8117d78d7518f9a507de2dc4522546fbf4c444e9860b4" +checksum = "53982f8abff0789a9599e644108a1914da61a4d0dede8e45037e744dcb008d52" dependencies = [ "bstr", "gix-attributes", - "gix-features 0.36.1", + "gix-features", "gix-fs", "gix-glob", "gix-hash", @@ -1763,6 +1796,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "html-escape" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", +] + [[package]] name = "http-auth" version = "0.1.9" @@ -2363,24 +2405,13 @@ dependencies = [ [[package]] name = "prodash" -version = "26.2.2" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf" +checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79" dependencies = [ "parking_lot", ] -[[package]] -name = "pulldown-cmark" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" -dependencies = [ - "bitflags 1.3.2", - "memchr", - "unicase", -] - [[package]] name = "quote" version = "1.0.35" @@ -2528,9 +2559,9 @@ dependencies = [ [[package]] name = "rustfix" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ec10cbeb92a2e494ef354d66126882da8c0a244ad769e2a7193efc5de625175" +checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" dependencies = [ "serde", "serde_json", @@ -2620,9 +2651,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] @@ -2785,18 +2816,20 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "snapbox" -version = "0.5.1" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d9a121ed3297bc4575fa774033a9f1084e0a0c8de8dff416df4eae834121b3" +checksum = "8ac441e1ecf678f68423d47f376d53fabce1afba92c8f68e31508eb27df8562a" dependencies = [ "anstream", "anstyle", + "anstyle-svg", "content_inspector", "dunce", "filetime", "libc", "normalize-line-endings", "os_pipe", + "serde_json", "similar", "snapbox-macros", "tempfile", @@ -3015,9 +3048,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "serde", @@ -3102,9 +3135,9 @@ dependencies = [ [[package]] name = "trycmd" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464edb3603a81a50b4c8f47b11dfade69ef48ffdc0af2f8b194ad87cbda75317" +checksum = "d14c6930faf7c6c4942ce17daa6f38d659d2ebf2b579a56b6926707038eb37b0" dependencies = [ "glob", "humantime", @@ -3181,6 +3214,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + [[package]] name = "utf8parse" version = "0.2.1" @@ -3315,15 +3354,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-sys" version = "0.48.0" diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-information/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-information/package.nix index 3801eadc86..e1ad75f3f2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-information/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-information/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-information"; - version = "0.4.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "hi-rustin"; repo = "cargo-information"; rev = "v${version}"; - hash = "sha256-k481iHQ1tVi9fF5/xYR99/1/oRv1nS3WH7W55aPSyfc="; + hash = "sha256-5F8O8M8cz7sdXtqGYuDIeTolovZjx2BLEBCZuBIb9YA="; }; cargoLock = { @@ -33,6 +33,7 @@ rustPlatform.buildRustPackage rec { "--skip=cargo_information::within_ws::case" "--skip=cargo_information::within_ws_with_alternative_registry::case" "--skip=cargo_information::within_ws_without_lockfile::case" + "--skip=cargo_information::transitive_dependency_within_ws::case" ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-make/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-make/package.nix index a0c64e2c4f..7e92ceaa43 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-make/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.37.11"; + version = "0.37.12"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-a8iNMvMB52PEFVQq4Hv3bnIrA8k5p1a5M7JBp67SUDk="; + hash = "sha256-hnjhc4ZIabHml0HMuIanwXkx+QGnal7RlvZjcZUx8pQ="; }; - cargoHash = "sha256-UrVSGxDRhD3Tm25cUYOkkf/A2mgLZAyBImu1AeNOdX4="; + cargoHash = "sha256-5Z8ywbaWVgLx6PH/w9QV0LJpeqY7zpkCqnAb4BAww0o="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-profiler/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-profiler/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-profiler/default.nix rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-profiler/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-raze/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-raze/package.nix new file mode 100644 index 0000000000..a0b4fd0ace --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-raze/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + curl, + libgit2, + openssl, + darwin, +}: +let + version = "0.16.1"; + src = fetchFromGitHub { + owner = "google"; + repo = "cargo-raze"; + rev = "v${version}"; + hash = "sha256-dn1MrF+FYBG+vD5AfXCwmzskmKK/TXArnMWW2BAfFFQ="; + }; +in +rustPlatform.buildRustPackage { + pname = "cargo-raze"; + inherit src version; + + sourceRoot = "${src.name}/impl"; + + # Make it build on Rust >1.76. Since upstream is unmaintained, + # there's no counting on them to fix this any time soon... + # See #310673 and #310125 for similar fixes + cargoPatches = [ ./rustc-serialize-fix.patch ]; + + cargoHash = "sha256-V8FkkWcXrYcDmhbdJztpbd4gBVbtbPY0NHS4pb/z8HM="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libgit2 + openssl + curl + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + preCheck = lib.optionalString stdenv.isDarwin '' + # Darwin issue: Os { code: 24, kind: Uncategorized, message: "Too many open files" } + # https://github.com/google/cargo-raze/issues/544 + ulimit -n 1024 + ''; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "Generate Bazel BUILD files from Cargo dependencies"; + homepage = "https://github.com/google/cargo-raze"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ elasticdog ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-raze/rustc-serialize-fix.patch b/third_party/nixpkgs/pkgs/by-name/ca/cargo-raze/rustc-serialize-fix.patch new file mode 100644 index 0000000000..4c34cbeecb --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-raze/rustc-serialize-fix.patch @@ -0,0 +1,29 @@ +diff --git a/impl/Cargo.lock b/impl/Cargo.lock +index 0c963206..7db3432f 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1957,9 +1957,9 @@ dependencies = [ + + [[package]] + name = "rustc-serialize" +-version = "0.3.24" ++version = "0.3.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" ++checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" + + [[package]] + name = "ryu" +diff --git a/impl/Cargo.toml b/impl/Cargo.toml +index 9dd6dd99..a559febf 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -38,7 +38,7 @@ itertools = "0.10.0" + log = "0.4.13" + pathdiff = "0.2.0" + regex = "1.5.5" +-rustc-serialize = "0.3.24" ++rustc-serialize = "0.3.25" + semver = { version = "1", features = ["serde"] } + serde = "1.0.120" + serde_derive = "1.0.120" diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-shear/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-shear/package.nix index badd2318ff..d99e1b1f06 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-shear/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-shear/package.nix @@ -1,24 +1,38 @@ -{ fetchFromGitHub, lib, rustPlatform }: - -rustPlatform.buildRustPackage rec { +{ + fetchFromGitHub, + lib, + rustPlatform, + testers, + cargo-shear, +}: +let + version = "0.0.25"; +in +rustPlatform.buildRustPackage { pname = "cargo-shear"; - version = "0.0.24"; + inherit version; src = fetchFromGitHub { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - sha256 = "sha256-7eBFDmeFOXqZhNE4RDlIq991xEoCGL6XLMmUQuLJvrE="; + hash = "sha256-4NnCUe4DrnSeveicxvvDF49hrc4NdRx/N10PH7Q0k8k="; }; - cargoSha256 = "sha256-DQjLW6NtUPERT82zIlrGRk3FffU/EfLBMgAeFfFdDxE="; + cargoHash = "sha256-gHXJz3Xw9vC04q001kd6AgEKKaRtAK3oGMn7JJh+Neo="; - meta = with lib; { + # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 + SHEAR_VERSION = version; + passthru.tests.version = testers.testVersion { + package = cargo-shear; + }; + + meta = { description = "Detect and remove unused dependencies from Cargo.toml"; mainProgram = "cargo-shear"; homepage = "https://github.com/Boshen/cargo-shear"; - changelog = "https://github.com/Boshen/cargo-shear/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ uncenter ]; + changelog = "https://github.com/Boshen/cargo-shear/blob/v${version}/CHANGELOG.md"; + license = [ lib.licenses.mit ]; + maintainers = with lib.maintainers; [ uncenter ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-wasi/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-wasi/package.nix similarity index 91% rename from third_party/nixpkgs/pkgs/development/tools/rust/cargo-wasi/default.nix rename to third_party/nixpkgs/pkgs/by-name/ca/cargo-wasi/package.nix index bead01fed4..8e688c28ca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-wasi/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-wasi/package.nix @@ -4,7 +4,7 @@ , pkg-config , stdenv , openssl -, Security +, darwin }: rustPlatform.buildRustPackage rec { @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); # Checks need to be disabled here because the current test suite makes assumptions # about the surrounding environment that aren't Nix friendly. See these lines for specifics: diff --git a/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/castxml/package.nix similarity index 59% rename from third_party/nixpkgs/pkgs/development/tools/castxml/default.nix rename to third_party/nixpkgs/pkgs/by-name/ca/castxml/package.nix index bceafd504d..2b0a255bbd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/castxml/package.nix @@ -1,14 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libffi -, libxml2 -, zlib -, withManual ? true -, withHTML ? true -, llvmPackages -, python3 +{ + cmake, + fetchFromGitHub, + lib, + libffi, + libxml2, + llvmPackages, + python3, + stdenv, + zlib, + # Boolean flags + withHTML ? true, + withManual ? true, }: let @@ -17,19 +19,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "castxml"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "CastXML"; repo = "CastXML"; rev = "v${finalAttrs.version}"; - hash = "sha256-r9Emh2KHjANrg+oWeY8Ags3Gd8k3W68J88bAud+AH6I="; + hash = "sha256-icTos9HboZXvojQPX+pRkpBYiZ5SXSMb9XtvRnXNHuo="; }; nativeBuildInputs = [ cmake - llvm.dev - ] ++ lib.optionals (withManual || withHTML) [ + (lib.getDev llvm) + ] + ++ lib.optionals (withManual || withHTML) [ sphinx ]; @@ -45,14 +48,17 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCLANG_RESOURCE_DIR=${libclang.dev}/" - "-DSPHINX_HTML=${if withHTML then "ON" else "OFF"}" - "-DSPHINX_MAN=${if withManual then "ON" else "OFF"}" + (lib.cmakeOptionType "path" "CLANG_RESOURCE_DIR" "${lib.getDev libclang}") + (lib.cmakeBool "SPHINX_HTML" withHTML) + (lib.cmakeBool "SPHINX_MAN" withManual) ]; # 97% tests passed, 97 tests failed out of 2881 # mostly because it checks command line and nix append -isystem and all doCheck = false; + + strictDeps = true; + # -E exclude 4 tests based on names # see https://github.com/CastXML/CastXML/issues/90 checkPhase = '' @@ -61,12 +67,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - meta = with lib; { + meta = { homepage = "https://github.com/CastXML/CastXML"; description = "C-family Abstract Syntax Tree XML Output"; + license = lib.licenses.asl20; mainProgram = "castxml"; - license = licenses.asl20; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/data/themes/catppuccin-sddm-corners/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix similarity index 89% rename from third_party/nixpkgs/pkgs/data/themes/catppuccin-sddm-corners/default.nix rename to third_party/nixpkgs/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix index 952399f7bf..6e4673cdc9 100644 --- a/third_party/nixpkgs/pkgs/data/themes/catppuccin-sddm-corners/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "catppuccin-sddm-corners"; - version = "unstable-2023-05-30"; + version = "0-unstable-2024-05-07"; src = fetchFromGitHub { owner = "khaneliman"; repo = "catppuccin-sddm-corners"; - rev = "ffaad5c8964b52ccd92a80dfd3a7931c8b68c446"; - hash = "sha256-CaCMrXlwt7JfSycB8WH3XCWUu+i7bPSfFv3duo7ZlZo="; + rev = "aca5af5ce0c9dff56e947938697dec40ea101e3e"; + hash = "sha256-xtcNcjNQSG7SwlNw/EkAU93wFaku+cE1/r6c8c4FrBg="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-sddm/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-sddm/package.nix new file mode 100644 index 0000000000..1daab09ae6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ca/catppuccin-sddm/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + just, + kdePackages, + flavor ? "mocha", + font ? "Noto Sans", + fontSize ? "9", + background ? null, + loginBackground ? false, +}: +stdenvNoCC.mkDerivation rec { + pname = "catppuccin-sddm"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "sddm"; + rev = "v${version}"; + hash = "sha256-SdpkuonPLgCgajW99AzJaR8uvdCPi4MdIxS5eB+Q9WQ="; + }; + + dontWrapQtApps = true; + + nativeBuildInputs = [ + just + ]; + + propagatedBuildInputs = [ + kdePackages.qtsvg + ]; + + buildPhase = '' + runHook preBuild + + just build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/sddm/themes/" + cp -r dist/catppuccin-${flavor} "$out/share/sddm/themes/catppuccin-${flavor}" + + configFile=$out/share/sddm/themes/catppuccin-${flavor}/theme.conf + + substituteInPlace $configFile \ + --replace-fail 'Font="Noto Sans"' 'Font="${font}"' \ + --replace-fail 'FontSize=9' 'FontSize=${fontSize}' + + ${lib.optionalString (background != null) '' + substituteInPlace $configFile \ + --replace-fail 'Background="backgrounds/wall.jpg"' 'Background="${background}"' \ + --replace-fail 'CustomBackground="false"' 'CustomBackground="true"' + ''} + + ${lib.optionalString loginBackground '' + substituteInPlace $configFile \ + --replace-fail 'LoginBackground="false"' 'LoginBackground="true"' + ''} + + runHook postInstall + ''; + + postFixup = '' + mkdir -p $out/nix-support + echo ${kdePackages.qtsvg} >> $out/nix-support/propagated-user-env-packages + ''; + + meta = { + description = "Soothing pastel theme for SDDM"; + homepage = "https://github.com/catppuccin/sddm"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [elysasrc]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/catppuccin/default.nix b/third_party/nixpkgs/pkgs/by-name/ca/catppuccin/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/data/themes/catppuccin/default.nix rename to third_party/nixpkgs/pkgs/by-name/ca/catppuccin/package.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch b/third_party/nixpkgs/pkgs/by-name/cd/cdecl/cdecl-2.5-lex.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch rename to third_party/nixpkgs/pkgs/by-name/cd/cdecl/cdecl-2.5-lex.patch diff --git a/third_party/nixpkgs/pkgs/by-name/cd/cdecl/package.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdecl/package.nix new file mode 100644 index 0000000000..016a15e9be --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cd/cdecl/package.nix @@ -0,0 +1,82 @@ +{ + lib, + stdenv, + fetchFromGitHub, + bison, + flex, + readline, + ncurses, +}: + +stdenv.mkDerivation { + pname = "cdecl"; + version = "2.5-unstable-2024-05-07"; + + src = fetchFromGitHub { + owner = "ridiculousfish"; + repo = "cdecl-blocks"; + rev = "1e6e1596771183d9bb90bcf152d6bc2055219a7e"; + hash = "sha256-5XuiYkFe+QvVBRIXRieKoE0zbISMvU1iLgEfkw6GnlE="; + }; + + patches = [ + ./cdecl-2.5-lex.patch + # when `USE_READLINE` is enabled, this option will not be present + ./test_remove_interactive_line.patch + ]; + + prePatch = '' + substituteInPlace cdecl.c \ + --replace 'getline' 'cdecl_getline' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + bison + flex + ]; + + buildInputs = [ + readline + ncurses + ]; + + env = { + NIX_CFLAGS_COMPILE = toString ( + [ + "-DBSD" + "-DUSE_READLINE" + ] + ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=int-conversion" + "-Wno-error=incompatible-function-pointer-types" + ] + ); + NIX_LDFLAGS = "-lreadline"; + }; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "PREFIX=${placeholder "out"}" + "BINDIR=${placeholder "out"}/bin" + "MANDIR=${placeholder "out"}/man1" + "CATDIR=${placeholder "out"}/cat1" + ]; + + doCheck = true; + checkTarget = "test"; + + preInstall = '' + mkdir -p $out/bin; + ''; + + meta = { + description = "Translator English -- C/C++ declarations"; + homepage = "https://cdecl.org"; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.unix; + mainProgram = "cdecl"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cd/cdecl/test_remove_interactive_line.patch b/third_party/nixpkgs/pkgs/by-name/cd/cdecl/test_remove_interactive_line.patch new file mode 100644 index 0000000000..5a769f2dfe --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cd/cdecl/test_remove_interactive_line.patch @@ -0,0 +1,10 @@ +--- a/test_expected_output.txt 2024-05-07 05:47:13.184419240 +0200 ++++ b/test_expected_output.txt 2024-05-07 05:48:38.980122345 +0200 +@@ -26,7 +26,6 @@ + options + create (-c), nocreate + prompt, noprompt (-q) +- interactive (-i), nointeractive + ritchie (-r), preansi (-p), ansi (-a) or cplusplus (-+) + + Current set values are: diff --git a/third_party/nixpkgs/pkgs/by-name/ce/cent/package.nix b/third_party/nixpkgs/pkgs/by-name/ce/cent/package.nix new file mode 100644 index 0000000000..8cc910d71c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ce/cent/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "cent"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "xm1k3"; + repo = "cent"; + rev = "refs/tags/v${version}"; + hash = "sha256-E3gAtrgWVucV3cD31ntgtdTDkhmqJHOiFwaUdVJj0jQ="; + }; + + vendorHash = "sha256-LvI9FJFXBnEXNsX3qp2Sl58ccIJtYDGSEtNUwNW/Pp0="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Tool to handle Nuclei community templates"; + homepage = "https://github.com/xm1k3/cent"; + changelog = "https://github.com/xm1k3/cent/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + mainProgram = "cent"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ce/centrifugo/package.nix b/third_party/nixpkgs/pkgs/by-name/ce/centrifugo/package.nix index 6069eeb4b7..83e0ce5b7f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ce/centrifugo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ce/centrifugo/package.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "centrifugo"; - version = "5.3.1"; + version = "5.3.2"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${version}"; - hash = "sha256-QKHRIH61xNpQaelrupO9fzmN6XESPU1d/aXCbqYgJXs="; + hash = "sha256-h1aI+dAVL/ToHeSdI41i74Kq2JnvGgv2fI5ffhBIfRM="; }; - vendorHash = "sha256-fceoOYrDk5puImSckTkEo3hPCpbQE5t8b81sXnLid/Q="; + vendorHash = "sha256-mtIRbW8aN1PJs/43aaAa141l2VmVdVHY8bnvfV+r0e8="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/ce/cert-viewer/package.nix b/third_party/nixpkgs/pkgs/by-name/ce/cert-viewer/package.nix index df9032dfbe..6cd594e13d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ce/cert-viewer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ce/cert-viewer/package.nix @@ -1,6 +1,9 @@ { buildGoModule +, buildPackages , fetchFromGitHub , lib +, installShellFiles +, stdenv }: buildGoModule rec { @@ -16,6 +19,22 @@ buildGoModule rec { vendorHash = "sha256-jNT04bYH5L/Zcfvel673zr2UJLayCO443tvBGZjrBZk="; + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = + let + prog = + if stdenv.buildPlatform.canExecute stdenv.hostPlatform + then "$out/bin/cert-viewer" + else lib.getExe buildPackages.cert-viewer; + in + '' + ${prog} --help-man > cert-viewer.1 + installManPage cert-viewer.1 + ''; + meta = { description = "Admin tool to view and inspect multiple x509 Certificates"; homepage = "https://github.com/mgit-at/cert-viewer"; diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chemacs2/package.nix b/third_party/nixpkgs/pkgs/by-name/ch/chemacs2/package.nix new file mode 100644 index 0000000000..4b85dbfe87 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ch/chemacs2/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + unstableGitUpdater, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "chemacs2"; + version = "0-unstable-2023-01-20"; + + src = fetchFromGitHub { + owner = "plexus"; + repo = "chemacs2"; + rev = "c2d700b784c793cc82131ef86323801b8d6e67bb"; + hash = "sha256-/WtacZPr45lurS0hv+W8UGzsXY3RujkU5oGGGqjqG0Q="; + }; + + outputs = [ "out" "doc" ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -t $out/share/site-lisp/chemacs2/ -Dm644 init.el early-init.el chemacs.el + install -t $doc/share/doc/chemacs2/ -Dm644 README.org CHANGELOG.md + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/plexus/chemacs2"; + description = "Emacs version switcher, improved"; + longDescription = '' + Chemacs 2 is an Emacs profile switcher, it makes it easy to run multiple + Emacs configurations side by side. + + Think of it as a bootloader for Emacs. + ''; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chezmoi/package.nix b/third_party/nixpkgs/pkgs/by-name/ch/chezmoi/package.nix new file mode 100644 index 0000000000..afb575230e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ch/chezmoi/package.nix @@ -0,0 +1,53 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: + +let + argset = { + pname = "chezmoi"; + version = "2.48.1"; + + src = fetchFromGitHub { + owner = "twpayne"; + repo = "chezmoi"; + rev = "v${argset.version}"; + hash = "sha256-v24gS80s7dTDlOO9ouf+Am7KyZPTBWzjG+HyBfFZynw="; + }; + + vendorHash = "sha256-8KcseMkYww+Ccaw+ovwXhakO9ira2TRI4uQ5TbCZcSE="; + + nativeBuildInputs = [ + installShellFiles + ]; + + ldflags = [ + "-s" + "-w" + "-X main.version=${argset.version}" + "-X main.builtBy=nixpkgs" + ]; + + doCheck = false; + + postInstall = '' + installShellCompletion --bash --name chezmoi.bash completions/chezmoi-completion.bash + installShellCompletion --fish completions/chezmoi.fish + installShellCompletion --zsh completions/chezmoi.zsh + ''; + + subPackages = [ "." ]; + + meta = { + homepage = "https://www.chezmoi.io/"; + description = "Manage your dotfiles across multiple machines, securely"; + changelog = "https://github.com/twpayne/chezmoi/releases/tag/${argset.src.rev}"; + license = lib.licenses.mit; + mainProgram = "chezmoi"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; + }; +in +buildGoModule argset diff --git a/third_party/nixpkgs/pkgs/by-name/ch/chrysalis/package.nix b/third_party/nixpkgs/pkgs/by-name/ch/chrysalis/package.nix index ab4b5b5f3f..e0b7a9da78 100644 --- a/third_party/nixpkgs/pkgs/by-name/ch/chrysalis/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ch/chrysalis/package.nix @@ -14,16 +14,13 @@ let in appimageTools.wrapType2 rec { inherit name pname src; - multiArch = false; - extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib ]; + extraPkgs = pkgs: [ pkgs.glib ]; # Also expose the udev rules here, so it can be used as: # services.udev.packages = [ pkgs.chrysalis ]; # to allow non-root modifications to the keyboards. extraInstallCommands = '' - mv $out/bin/{${name},${pname}} - install -m 444 \ -D ${appimageContents}/usr/lib/chrysalis/resources/static/udev/60-kaleidoscope.rules \ -t $out/lib/udev/rules.d diff --git a/third_party/nixpkgs/pkgs/by-name/ci/circom/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/circom/package.nix index f142a7fc23..895f3a6ba3 100644 --- a/third_party/nixpkgs/pkgs/by-name/ci/circom/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ci/circom/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "circom"; - version = "2.1.8"; + version = "2.1.9"; src = fetchFromGitHub { owner = "iden3"; repo = "circom"; rev = "v${version}"; - hash = "sha256-S+POXACM2XswpIaUze/wfVj2QYjRKJ2JGP1L88dfHA8="; + hash = "sha256-l8204koaKTluYEvk6j9+MokdOqFCq2oExT5P2aW3kzc="; }; - cargoHash = "sha256-gf9wWkeibj61Fh9Q+JqKVUVh2WpVBdM1Ei/Dg1/c+5E="; + cargoHash = "sha256-M4FR/dPLIq1Ps0j1B69khmSl4uRE5wxN4dh3iuO/9A4="; doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clairvoyant/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clairvoyant/package.nix index 9889e1e43c..21db94bec6 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clairvoyant/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clairvoyant/package.nix @@ -2,25 +2,24 @@ , fetchFromGitHub , gtk4 , libadwaita +, libportal , meson , ninja , pkg-config , stdenv , vala , wrapGAppsHook4 -# Clairvoyant shows a non-dismissable banner recommending the use of the Flatpak version -, hideUnsupportedVersionBanner ? false }: stdenv.mkDerivation (finalAttrs: { pname = "clairvoyant"; - version = "3.1.3"; + version = "3.1.7"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "clairvoyant"; rev = finalAttrs.version; - hash = "sha256-eAcd8JJmcsz8dm049g5xsF6gPpNQ6ZvGGIhKAoMlPTU="; + hash = "sha256-p9Lgs5z5oRuMQYRKzWp+aQDi0FnxvbQGLZpBigolHUw="; }; nativeBuildInputs = [ @@ -34,17 +33,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk4 libadwaita + libportal ]; - preFixup = lib.optionalString hideUnsupportedVersionBanner '' - gappsWrapperArgs+=( - --set container true - ) - ''; - meta = with lib; { changelog = "https://github.com/cassidyjames/clairvoyant/releases/tag/${finalAttrs.version}"; - description = "Ask questions and get psychic answers"; + description = "Ask questions, get psychic answers"; homepage = "https://github.com/cassidyjames/clairvoyant"; license = licenses.gpl3Plus; mainProgram = "com.github.cassidyjames.clairvoyant"; diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clamtk/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clamtk/package.nix index b34850c925..67c82e52a4 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clamtk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clamtk/package.nix @@ -1,7 +1,7 @@ { lib , perlPackages , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , perl , clamav @@ -18,7 +18,7 @@ perlPackages.buildPerlPackage rec { hash = "sha256-ClBsBXbGj67zgrkA9EjgK7s3OmXOJA+xV5xLGOcMsbI="; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ perl clamav ]; propagatedBuildInputs = with perlPackages; [ Glib LWP LWPProtocolHttps TextCSV JSON LocaleGettext Gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/package.nix index 95415d03cf..8fc885c11a 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -5,11 +5,11 @@ clash-verge.overrideAttrs (old: rec { pname = "clash-verge-rev"; - version = "1.5.11"; + version = "1.6.1"; src = fetchurl { url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-FoNWCH4SE7DnKoDMwdUiTnWoFwHSUCAIDQhvgZdgyeU="; + hash = "sha256-V6W7IJFa8UrbPWPS2tReecZ41oYvAqV4q0NBkkhUHbQ="; }; meta = old.meta // (with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clash-verge/package.nix index 1a8d6a9919..83318a36f3 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clash-verge/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clash-verge/package.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , dpkg -, wrapGAppsHook +, wrapGAppsHook3 , autoPatchelfHook , clash-meta , openssl @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg - wrapGAppsHook + wrapGAppsHook3 autoPatchelfHook ]; diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clatd/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clatd/package.nix index dff8ce4261..f18ab3b036 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clatd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clatd/package.nix @@ -7,6 +7,7 @@ , tayga , iproute2 , iptables +, nixosTests }: stdenv.mkDerivation rec { @@ -52,6 +53,8 @@ stdenv.mkDerivation rec { } ''; + passthru.tests.clatd = nixosTests.clatd; + meta = with lib; { description = "A 464XLAT CLAT implementation for Linux"; homepage = "https://github.com/toreanderson/clatd"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix b/third_party/nixpkgs/pkgs/by-name/cl/cli11/package.nix similarity index 65% rename from third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix rename to third_party/nixpkgs/pkgs/by-name/cl/cli11/package.nix index 8c4c58c052..d88470fa4d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/cli11/package.nix @@ -1,29 +1,34 @@ -{ lib -, stdenv -, fetchFromGitHub -, boost -, catch2 -, cmake -, gtest -, python3 +{ + lib, + stdenv, + fetchFromGitHub, + boost, + catch2, + cmake, + python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cli11"; version = "2.3.2"; src = fetchFromGitHub { owner = "CLIUtils"; repo = "CLI11"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-x3/kBlf5LdzkTO4NYOKanZBfcU4oK+fJw9L7cf88LsY="; }; + buildInputs = [ catch2 ]; nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ boost python3 catch2 ]; + nativeCheckInputs = [ + boost + python3 + ]; doCheck = true; + strictDeps = true; meta = with lib; { description = "Command line parser for C++11"; @@ -32,5 +37,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; license = licenses.bsd3; }; - -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix index fdf91c96f8..68e6744bd1 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix @@ -1,25 +1,34 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform , protobuf , installShellFiles +, darwin }: rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.16.6"; + version = "0.17.0"; src = fetchFromGitHub { owner = "xrelkd"; repo = pname; rev = "v${version}"; - hash = "sha256-FSgBTQGl8LSLdv+SOAgQWLWiqFY+PRQBFYYdbmCttcY="; + hash = "sha256-e95h8YBVLcy9vubdJpfmeystT2Qw0Y8kap9IbTJW+s8="; }; - cargoHash = "sha256-TrzHmWUDAe4gbwm+VoTOuC50CWWnFsF99zscM85ammo="; + cargoHash = "sha256-+73vnGcdCDRMrav/Pi4Z37IlbArJ/SlYishz9KhF4x0="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; nativeBuildInputs = [ protobuf + installShellFiles ]; @@ -42,7 +51,7 @@ rustPlatform.buildRustPackage rec { description = "Clipboard Manager written in Rust Programming Language"; homepage = "https://github.com/xrelkd/clipcat"; license = licenses.gpl3Only; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ xrelkd ]; mainProgram = "clipcatd"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clipse/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipse/package.nix index af4b96385d..e1cef9cfae 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clipse/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clipse/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "clipse"; - version = "0.0.6"; + version = "0.0.71"; src = fetchFromGitHub { owner = "savedra1"; repo = "clipse"; rev = "v${version}"; - hash = "sha256-DLvYTPlLkp98zCzmbeL68B7mHl7RY3ee9rL30vYm5Ow="; + hash = "sha256-88GuYGJO5AgWae6LyMO/TpGqtk2yS7pDPS0MkgmJUQ4="; }; vendorHash = "sha256-GIUEx4h3xvLySjBAQKajby2cdH8ioHkv8aPskHN0V+w="; diff --git a/third_party/nixpkgs/pkgs/by-name/cm/cmake/package.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmake/package.nix index f47265ca09..ce5ec0803a 100644 --- a/third_party/nixpkgs/pkgs/by-name/cm/cmake/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cm/cmake/package.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.29.1"; + version = "3.29.2"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-f7Auj1e2Kzmqa0z3HoIBSLoaI3JIiElHNQIeMqsO78w="; + hash = "sha256-NttLaSaqt0G6bksuotmckZMiITIwi03IJNQSPLcwNS4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/co/cockpit/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cockpit/package.nix index f9a18b8a36..aba4e7d289 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cockpit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cockpit/package.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "315"; + version = "316"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-N6MDqhYQky80r9wSiDIPusg6iOpDh4S52pf337nojyY="; + hash = "sha256-AoRdeAA+K6VhRxgAF7t2COJtovk8U9B9j8MaBwMjJgw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/codeberg-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix similarity index 56% rename from third_party/nixpkgs/pkgs/applications/version-management/codeberg-cli/default.nix rename to third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix index ae63280f7e..074d7bc2c8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/codeberg-cli/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix @@ -1,30 +1,42 @@ -{ lib -, CoreServices -, Security -, fetchFromGitea -, installShellFiles -, openssl -, pkg-config -, rustPlatform -, stdenv +{ + darwin, + fetchFromGitea, + installShellFiles, + lib, + openssl, + pkg-config, + rustPlatform, + stdenv, }: rustPlatform.buildRustPackage rec { pname = "codeberg-cli"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "RobWalt"; repo = "codeberg-cli"; rev = "v${version}"; - hash = "sha256-KjH78yqfZoN24TBYyFZuxf7z9poRov0uFYQ8+eq9p/o="; + hash = "sha256-g5V3Noqh7Y9v/t/dt7n45/NblqNtpZCKELPc9DOkb8A="; }; - cargoHash = "sha256-RE4Zwa5vUWPc42w5GaaYkS6fLIbges1fAsOUuwqR2ag="; - nativeBuildInputs = [ pkg-config installShellFiles ]; + cargoHash = "sha256-zTg/3PcFWzBmKZA7lRIpM3P03d1qpNVBczqWFbnxpic="; + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin ( + let + d = darwin.apple_sdk.frameworks; + in + [ + d.CoreServices + d.Security + ] + ); postInstall = '' installShellCompletion --cmd berg \ diff --git a/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix b/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix index 2c0dd84cbb..18cfe7b98b 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-6sIYDI6+1/p54Af+E/GmRAFlfDYJVwxhn0qF47ZH+Zg="; - aarch64-linux = "sha256-1ImcjAqCZm5KZZYHWhG1eO7ipAdrP4Qjj2eBxTst++s="; - x86_64-darwin = "sha256-yHthItxZYFejJlwJJ7BrM2csnLsZXjy/IbzF1iaCCyI="; - aarch64-darwin = "sha256-GIx0yABISj/rH/yVkkx6NBs5qF0P8nhpMyvnzXJ92mA="; + x86_64-linux = "sha256-60wg6DspTyYFVuGjNld5Wb9if51EEXNPNR1wHbomKmY="; + aarch64-linux = "sha256-F8MQEoRJ3xYq6sEQNWx9DpLbbxT3lBd/PufPt7l5Bi4="; + x86_64-darwin = "sha256-Sz4AT5yGPTIQyzNF6+Ku4pSmMkbHMtCRDRHn9Q5EQ28="; + aarch64-darwin = "sha256-4Xatp0ZvRfgCxMME9CrhkZiTwrH4OjF8+E7IV95QH70="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.8.25"; + version = "1.8.32"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/codux/default.nix b/third_party/nixpkgs/pkgs/by-name/co/codux/package.nix similarity index 86% rename from third_party/nixpkgs/pkgs/applications/editors/codux/default.nix rename to third_party/nixpkgs/pkgs/by-name/co/codux/package.nix index 6e663e1e31..9b38bf0f12 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/codux/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/codux/package.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.23.1"; + version = "15.26.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-9ZzWsLEPEG+PDrDf9lU4ODGOD6/fvMbGBSo9BEQrkn4="; + sha256 = "sha256-jja9WYfirltjBdJNCQONowVjMTg0aj265Sjq57qSjbc="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; @@ -19,7 +19,6 @@ appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications cp -r ${appimageContents}/usr/share/icons $out/share substituteInPlace $out/share/applications/${pname}.desktop --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/third_party/nixpkgs/pkgs/by-name/co/committed/package.nix b/third_party/nixpkgs/pkgs/by-name/co/committed/package.nix new file mode 100644 index 0000000000..cd42172fde --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/committed/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +, testers +, nix-update-script +, committed +}: +let + version = "1.0.20"; +in +rustPlatform.buildRustPackage { + pname = "committed"; + inherit version; + + src = fetchFromGitHub { + owner = "crate-ci"; + repo = "committed"; + rev = "refs/tags/v${version}"; + hash = "sha256-HqZYxV2YjnK7Q3A7B6yVFXME0oc3DZ4RfMkDGa2IQxA="; + }; + cargoHash = "sha256-AmAEGVWq6KxLtiHDGIFVcoP1Wck8z+P9mnDy0SSSJNM="; + + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + passthru = { + tests.version = testers.testVersion { package = committed; }; + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://github.com/crate-ci/committed"; + changelog = "https://github.com/crate-ci/committed/blob/v${version}/CHANGELOG.md"; + description = "Nitpicking commit history since beabf39"; + mainProgram = "committed"; + license = [ + lib.licenses.asl20 # or + lib.licenses.mit + ]; + maintainers = [ lib.maintainers.pigeonf ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/co/connman-gtk/package.nix b/third_party/nixpkgs/pkgs/by-name/co/connman-gtk/package.nix index 46dce2aa29..181c43bcde 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/connman-gtk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/connman-gtk/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, intltool, pkg-config, -gtk3, connman, openconnect, wrapGAppsHook }: +gtk3, connman, openconnect, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "connman-gtk"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { automake intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/co/connman-notify/package.nix b/third_party/nixpkgs/pkgs/by-name/co/connman-notify/package.nix index c8df6bc893..4b9002441a 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/connman-notify/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/connman-notify/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook3 }: python3Packages.buildPythonApplication { pname = "connman-notify"; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication { format = "other"; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; buildInputs = [ glib ]; diff --git a/third_party/nixpkgs/pkgs/by-name/co/converseen/package.nix b/third_party/nixpkgs/pkgs/by-name/co/converseen/package.nix index 59d8988903..8250d0edb5 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/converseen/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/converseen/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "converseen"; - version = "0.12.2.2"; + version = "0.12.2.3"; src = fetchFromGitHub { owner = "Faster3ck"; repo = "Converseen"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-nAX5o+rqQCwBTizqwLPewmhlYQbxlPj158U+v3Z08fQ="; + hash = "sha256-ISXEEJHE7C1gqEmhIAPuu8ibrh0Cvh7EyRKsFeDuLDE="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/coost/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coost/package.nix similarity index 55% rename from third_party/nixpkgs/pkgs/development/libraries/coost/default.nix rename to third_party/nixpkgs/pkgs/by-name/co/coost/package.nix index 3d0c15bbc2..648d0f9f4d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/coost/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/coost/package.nix @@ -1,15 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, gitUpdater -, withCurl ? true, withOpenSSL ? true }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + openssl, + gitUpdater, + withCurl ? true, + withOpenSSL ? true, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coost"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "idealvin"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-qpJh1yl0lYYszNHGo5Jkbzal2hnVzg7UUxiyg/Grva8="; + repo = "coost"; + rev = "v${finalAttrs.version}"; + hash = "sha256-HbMenAL/UWsqQ1o7cMeWfwXkLh4GxIKV7iuZQD3hDA8="; }; postPatch = '' @@ -21,17 +30,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional withCurl curl ++ lib.optional withOpenSSL openssl; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] - ++ lib.optional withCurl "-DWITH_LIBCURL=ON" - ++ lib.optional withOpenSSL "-DWITH_OPENSSL=ON"; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ] ++ lib.optional withCurl "-DWITH_LIBCURL=ON" ++ lib.optional withOpenSSL "-DWITH_OPENSSL=ON"; + outputs = [ "out" "dev" ]; passthru.updateScript = gitUpdater { }; meta = with lib; { description = "A tiny boost library in C++11"; homepage = "https://github.com/idealvin/coost"; license = licenses.mit; - maintainers = []; + maintainers = [ maintainers.sigmanificient ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/co/coppwr/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/co/coppwr/Cargo.lock index b4bcd40521..c1be56da8c 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/coppwr/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/co/coppwr/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" +checksum = "6f90148830dac590fac7ccfe78ec4a8ea404c60f75a24e16407a71f0f40de775" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" +checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b" dependencies = [ "enumn", "serde", @@ -30,59 +30,61 @@ dependencies = [ [[package]] name = "accesskit_consumer" -version = "0.15.2" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00" +checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6" dependencies = [ "accesskit", ] [[package]] name = "accesskit_macos" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56" +checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7" dependencies = [ "accesskit", "accesskit_consumer", - "objc2", + "objc2 0.3.0-beta.3.patch-leaks.3", "once_cell", ] [[package]] name = "accesskit_unix" -version = "0.5.2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e084cb5168790c0c112626175412dc5ad127083441a8248ae49ddf6725519e83" +checksum = "09f46c18d99ba61ad7123dd13eeb0c104436ab6af1df6a1cd8c11054ed394a08" dependencies = [ "accesskit", "accesskit_consumer", - "async-channel 1.9.0", + "async-channel", + "async-once-cell", "atspi", "futures-lite 1.13.0", + "once_cell", "serde", "zbus", ] [[package]] name = "accesskit_windows" -version = "0.14.3" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31" +checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b" dependencies = [ "accesskit", "accesskit_consumer", - "arrayvec", "once_cell", "paste", - "windows", + "static_assertions", + "windows 0.48.0", ] [[package]] name = "accesskit_winit" -version = "0.14.4" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0" +checksum = "5284218aca17d9e150164428a0ebc7b955f70e3a9a78b4c20894513aabf98a67" dependencies = [ "accesskit", "accesskit_macos", @@ -99,11 +101,12 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom", "once_cell", "serde", "version_check", @@ -112,29 +115,38 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] -name = "android-activity" -version = "0.4.3" +name = "allocator-api2" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", - "bitflags 1.3.2", + "bitflags 2.5.0", "cc", + "cesu8", + "jni", "jni-sys", "libc", "log", "ndk", "ndk-context", "ndk-sys", - "num_enum 0.6.1", + "num_enum", + "thiserror", ] [[package]] @@ -144,25 +156,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" [[package]] -name = "anyhow" -version = "1.0.75" +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "annotate-snippets" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" +dependencies = [ + "unicode-width", + "yansi-term", +] + +[[package]] +name = "anyhow" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arboard" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" dependencies = [ "clipboard-win", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2 0.5.1", + "objc2-app-kit", + "objc2-foundation", "parking_lot", - "thiserror", - "winapi", "x11rb", ] @@ -179,16 +208,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] -name = "ashpd" -version = "0.6.7" +name = "as-raw-xcb-connection" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c018490e423efb6f032ef575f873ea57b61d44bec763cfe027b8e8852a027cf" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" dependencies = [ - "async-std", + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01992ad7774250d5b7fe214e2676cb99bf92564436d8135ab44fe815e71769a9" +dependencies = [ + "async-fs 2.1.2", + "async-net", "enumflags2", "futures-channel", "futures-util", - "once_cell", "rand", "serde", "serde_repr", @@ -208,39 +252,27 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.9.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" -dependencies = [ - "concurrent-queue", - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 5.3.0", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock 3.2.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.1.0", + "fastrand 2.1.0", + "futures-lite 2.3.0", "slab", ] @@ -257,18 +289,14 @@ dependencies = [ ] [[package]] -name = "async-global-executor" -version = "2.4.1" +name = "async-fs" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-channel 2.1.1", - "async-executor", - "async-io 2.2.2", - "async-lock 3.2.0", + "async-lock 3.3.0", "blocking", - "futures-lite 2.1.0", - "once_cell", + "futures-lite 2.3.0", ] [[package]] @@ -293,18 +321,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.2" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "parking", - "polling 3.3.1", - "rustix 0.38.28", + "polling 3.7.0", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -321,15 +349,32 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", "pin-project-lite", ] +[[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io 2.3.2", + "blocking", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-once-cell" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" + [[package]] name = "async-process" version = "1.8.1" @@ -343,80 +388,54 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.28", + "rustix 0.38.34", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" dependencies = [ - "async-io 2.2.2", - "async-lock 2.8.0", + "async-io 2.3.2", + "async-lock 3.3.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-channel 1.9.0", - "async-global-executor", - "async-io 1.13.0", - "async-lock 2.8.0", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite 1.13.0", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", + "windows-sys 0.52.0", ] [[package]] name = "async-task" -version = "4.6.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -427,63 +446,100 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atspi" -version = "0.10.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "674e7a3376837b2e7d12d34d58ac47073c491dc3bf6f71a7adaf687d4d817faa" +checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" dependencies = [ - "async-recursion", - "async-trait", - "atspi-macros", - "enumflags2", - "futures-lite 1.13.0", - "serde", - "tracing", - "zbus", - "zbus_names", + "atspi-common", + "atspi-connection", + "atspi-proxies", ] [[package]] -name = "atspi-macros" -version = "0.2.0" +name = "atspi-common" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb4870a32c0eaa17e35bca0e6b16020635157121fb7d45593d242c295bc768" +checksum = "92af95f966d2431f962bc632c2e68eda7777330158bf640c4af4249349b2cdf5" dependencies = [ - "quote", - "syn 1.0.109", + "enumflags2", + "serde", + "static_assertions", + "zbus", + "zbus_names", + "zvariant", +] + +[[package]] +name = "atspi-connection" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" +dependencies = [ + "atspi-common", + "atspi-proxies", + "futures-lite 1.13.0", + "zbus", +] + +[[package]] +name = "atspi-proxies" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" +dependencies = [ + "atspi-common", + "serde", + "zbus", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bindgen" -version = "0.66.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "annotate-snippets", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.41", + "syn 2.0.60", ] +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.3.2" @@ -492,9 +548,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -520,7 +576,16 @@ version = "0.1.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" dependencies = [ - "objc-sys", + "objc-sys 0.2.0-beta.2", +] + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys 0.3.3", ] [[package]] @@ -529,50 +594,67 @@ version = "0.2.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" dependencies = [ - "block-sys", - "objc2-encode", + "block-sys 0.1.0-beta.1", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys 0.2.1", + "objc2 0.4.1", +] + +[[package]] +name = "block2" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43ff7d91d3c1d568065b06c899777d1e48dcf76103a672a0adbc238a7f247f1e" +dependencies = [ + "objc2 0.5.1", ] [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ - "async-channel 2.1.1", - "async-lock 3.2.0", + "async-channel", + "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -583,32 +665,45 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "calloop" -version = "0.10.6" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "log", - "nix 0.25.1", - "slotmap", + "polling 3.7.0", + "rustix 0.38.34", + "slab", "thiserror", - "vec_map", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix 0.38.34", + "wayland-backend", + "wayland-client", ] [[package]] name = "cc" -version = "1.0.83" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -628,9 +723,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -659,31 +754,29 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", - "libloading 0.7.4", + "libloading 0.8.3", ] [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" dependencies = [ "error-code", - "str-buf", - "winapi", ] [[package]] name = "cocoa" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ "bitflags 1.3.2", "block", @@ -709,6 +802,16 @@ dependencies = [ "objc", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -716,10 +819,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "combine" -version = "4.6.6" +name = "com" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -727,9 +861,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -745,16 +879,20 @@ dependencies = [ [[package]] name = "cookie-factory" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" +checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" +dependencies = [ + "futures", +] [[package]] name = "coppwr" -version = "1.5.1" +version = "1.6.0" dependencies = [ "ashpd", "eframe", + "egui", "egui_dock", "egui_node_graph", "egui_plot", @@ -781,9 +919,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.22.3" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -805,31 +943,47 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] -name = "crossbeam-utils" -version = "0.8.17" +name = "crossbeam-deque" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", ] +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + [[package]] name = "crypto-common" version = "0.1.6" @@ -840,6 +994,12 @@ dependencies = [ "typenum", ] +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + [[package]] name = "derivative" version = "2.2.0" @@ -894,14 +1054,23 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.1", + "libloading 0.8.3", +] + +[[package]] +name = "document-features" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +dependencies = [ + "litrs", ] [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "duplicate" @@ -909,15 +1078,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de78e66ac9061e030587b2a2e75cc88f22304913c907b11307bca737141230cb" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-error", ] [[package]] name = "ecolor" -version = "0.23.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af" +checksum = "20930a432bbd57a6d55e07976089708d4893f3d556cf42a0d79e9e321fa73b10" dependencies = [ "bytemuck", "serde", @@ -925,14 +1094,16 @@ dependencies = [ [[package]] name = "eframe" -version = "0.23.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d9efede6c8905d3fc51a5ec9a506d4da4011bbcae0253d0304580fe40af3f5" +checksum = "020e2ccef6bbcec71dbc542f7eed64a5846fc3076727f5746da8fd307c91bab2" dependencies = [ "bytemuck", "cocoa", "directories-next", + "document-features", "egui", + "egui-wgpu", "egui-winit", "egui_glow", "glow", @@ -944,7 +1115,8 @@ dependencies = [ "objc", "parking_lot", "percent-encoding", - "raw-window-handle", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.1", "ron", "serde", "static_assertions", @@ -952,15 +1124,16 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "web-time", "winapi", "winit", ] [[package]] name = "egui" -version = "0.23.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7" +checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a" dependencies = [ "accesskit", "ahash", @@ -972,16 +1145,34 @@ dependencies = [ ] [[package]] -name = "egui-winit" -version = "0.23.0" +name = "egui-wgpu" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15479a96d9fadccf5dac690bdc6373b97b8e1c0dd28367058f25a5298da0195" +checksum = "469ff65843f88a702b731a1532b7d03b0e8e96d283e70f3a22b0e06c46cb9b37" +dependencies = [ + "bytemuck", + "document-features", + "egui", + "epaint", + "log", + "thiserror", + "type-map", + "web-time", + "wgpu", + "winit", +] + +[[package]] +name = "egui-winit" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e3da0cbe020f341450c599b35b92de4af7b00abde85624fd16f09c885573609" dependencies = [ "accesskit_winit", "arboard", "egui", "log", - "raw-window-handle", + "raw-window-handle 0.6.1", "serde", "smithay-clipboard", "web-time", @@ -991,9 +1182,9 @@ dependencies = [ [[package]] name = "egui_dock" -version = "0.8.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a52f67bcab0eb6050cf8051c614966c1c57129fab23dbeae9c157214779053c7" +checksum = "c3b8d9a54c0ed60f2670ad387c269663b4771431f090fa586906cf5f0bc586f4" dependencies = [ "duplicate", "egui", @@ -1003,23 +1194,24 @@ dependencies = [ [[package]] name = "egui_glow" -version = "0.23.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6726c08798822280038bbad2e32f4fc3cbed800cd51c6e34e99cd2d60cc1bc" +checksum = "e0e5d975f3c86edc3d35b1db88bb27c15dde7c55d3b5af164968ab5ede3f44ca" dependencies = [ "bytemuck", "egui", "glow", "log", - "memoffset 0.6.5", + "memoffset 0.9.1", "wasm-bindgen", "web-sys", + "winit", ] [[package]] name = "egui_node_graph" version = "0.4.0" -source = "git+https://github.com/dimtpap/egui_node_graph.git?rev=b6f7f02d31fdb74b120691a6c221f10d60864d5c#b6f7f02d31fdb74b120691a6c221f10d60864d5c" +source = "git+https://github.com/dimtpap/egui_node_graph.git?rev=3e99a2af2025e72365a4ec5048011041a85002e5#3e99a2af2025e72365a4ec5048011041a85002e5" dependencies = [ "egui", "slotmap", @@ -1029,18 +1221,24 @@ dependencies = [ [[package]] name = "egui_plot" -version = "0.23.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f33a00fe8eb1ba56535b3dbacdecc7a1365a328908a97c5f3c81bb466be72b" +checksum = "a7854b86dc1c2d352c5270db3d600011daa913d6b554141a03939761323288a1" dependencies = [ "egui", ] [[package]] -name = "emath" -version = "0.23.0" +name = "either" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + +[[package]] +name = "emath" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c3a552cfca14630702449d35f41c84a0d15963273771c6059175a803620f3f" dependencies = [ "bytemuck", "serde", @@ -1048,9 +1246,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", "serde", @@ -1058,31 +1256,31 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "enumn" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" +checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "epaint" -version = "0.23.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e" +checksum = "b381f8b149657a4acf837095351839f32cd5c4aec1817fc4df84e18d76334176" dependencies = [ "ab_glyph", "ahash", @@ -1092,6 +1290,7 @@ dependencies = [ "log", "nohash-hasher", "parking_lot", + "rayon", "serde", ] @@ -1113,13 +1312,9 @@ dependencies = [ [[package]] name = "error-code" -version = "2.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "event-listener" @@ -1140,9 +1335,20 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -1155,7 +1361,17 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.0", "pin-project-lite", ] @@ -1170,24 +1386,24 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1195,18 +1411,30 @@ dependencies = [ [[package]] name = "foreign-types" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ + "foreign-types-macros", "foreign-types-shared", ] [[package]] -name = "foreign-types-shared" -version = "0.1.1" +name = "foreign-types-macros" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "form_urlencoded" @@ -1218,25 +1446,52 @@ dependencies = [ ] [[package]] -name = "futures-channel" -version = "0.3.29" +name = "futures" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", + "futures-sink", ] [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -1255,11 +1510,11 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -1268,33 +1523,34 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ + "futures-channel", "futures-core", "futures-io", "futures-macro", @@ -1318,19 +1574,19 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.3.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "winapi", + "windows-targets 0.48.5", ] [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", @@ -1354,23 +1610,11 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "glow" -version = "0.12.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" dependencies = [ "js-sys", "slotmap", @@ -1380,11 +1624,11 @@ dependencies = [ [[package]] name = "glutin" -version = "0.30.10" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc93b03242719b8ad39fb26ed2b01737144ce7bd4bfc7adadcef806596760fe" +checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg_aliases", "cgl", "core-foundation", @@ -1392,42 +1636,43 @@ dependencies = [ "glutin_egl_sys", "glutin_glx_sys", "glutin_wgl_sys", - "libloading 0.7.4", - "objc2", + "icrate", + "libloading 0.8.3", + "objc2 0.4.1", "once_cell", - "raw-window-handle", - "wayland-sys 0.30.1", - "windows-sys 0.45.0", + "raw-window-handle 0.5.2", + "wayland-sys", + "windows-sys 0.48.0", "x11-dl", ] [[package]] name = "glutin-winit" -version = "0.3.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629a873fc04062830bfe8f97c03773bcd7b371e23bcc465d0a61448cd1588fa4" +checksum = "1ebcdfba24f73b8412c5181e56f092b5eff16671c514ce896b258a0a64bd7735" dependencies = [ "cfg_aliases", "glutin", - "raw-window-handle", + "raw-window-handle 0.5.2", "winit", ] [[package]] name = "glutin_egl_sys" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af784eb26c5a68ec85391268e074f0aa618c096eadb5d6330b0911cf34fe57c5" +checksum = "77cc5623f5309ef433c3dd4ca1223195347fe62c413da8e2fdd0eb76db2d9bcd" dependencies = [ "gl_generator", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "glutin_glx_sys" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b53cb5fe568964aa066a3ba91eac5ecbac869fb0842cd0dc9e412434f1a1494" +checksum = "a165fd686c10dcc2d45380b35796e577eacfd43d4660ee741ec8ebe2201b3b4f" dependencies = [ "gl_generator", "x11-dl", @@ -1435,18 +1680,89 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef89398e90033fc6bc65e9bd42fd29bbbfd483bda5b56dc5562f455550618165" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" dependencies = [ "gl_generator", ] [[package]] -name = "hashbrown" -version = "0.14.3" +name = "gpu-alloc" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.5.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "gpu-allocator" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +dependencies = [ + "log", + "presser", + "thiserror", + "winapi", + "windows 0.52.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.5.0", + "gpu-descriptor-types", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" +dependencies = [ + "bitflags 2.5.0", + "com", + "libc", + "libloading 0.8.3", + "thiserror", + "widestring", + "winapi", +] [[package]] name = "heck" @@ -1455,10 +1771,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.3" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1466,6 +1788,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + [[package]] name = "home" version = "0.5.9" @@ -1475,6 +1803,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2 0.3.0", + "dispatch", + "objc2 0.4.1", +] + [[package]] name = "idna" version = "0.5.0" @@ -1487,23 +1826,22 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-rational", "num-traits", "png", ] [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -1516,9 +1854,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", ] [[package]] @@ -1532,6 +1867,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "jni" version = "0.21.1" @@ -1556,37 +1900,39 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.3", + "pkg-config", +] + [[package]] name = "khronos_api" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -1601,9 +1947,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" @@ -1617,23 +1963,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.1", - "libc", - "redox_syscall 0.4.1", + "windows-targets 0.52.5", ] [[package]] @@ -1642,31 +1977,41 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] [[package]] -name = "libspa" -version = "0.7.2" -source = "git+https://gitlab.freedesktop.org/dimtpap/pipewire-rs.git?rev=7bd8b2d3c5d91f56b20c345e97244fff9e58ea0f#7bd8b2d3c5d91f56b20c345e97244fff9e58ea0f" +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", + "libc", +] + +[[package]] +name = "libspa" +version = "0.8.0" +source = "git+https://gitlab.freedesktop.org/dimtpap/pipewire-rs.git?rev=605d15996f3258b3e1cc34e445dfbdf16a366c7e#605d15996f3258b3e1cc34e445dfbdf16a366c7e" +dependencies = [ + "bitflags 2.5.0", "cc", "convert_case", "cookie-factory", "libc", "libspa-sys", - "nix 0.26.4", + "nix 0.27.1", "nom", "system-deps", ] [[package]] name = "libspa-sys" -version = "0.7.2" -source = "git+https://gitlab.freedesktop.org/dimtpap/pipewire-rs.git?rev=7bd8b2d3c5d91f56b20c345e97244fff9e58ea0f#7bd8b2d3c5d91f56b20c345e97244fff9e58ea0f" +version = "0.8.0" +source = "git+https://gitlab.freedesktop.org/dimtpap/pipewire-rs.git?rev=605d15996f3258b3e1cc34e445dfbdf16a366c7e#605d15996f3258b3e1cc34e445dfbdf16a366c7e" dependencies = [ "bindgen", "cc", @@ -1681,15 +2026,21 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1697,12 +2048,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -dependencies = [ - "value-bag", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "malloc_buf" @@ -1715,28 +2063,19 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" -version = "0.5.10" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.7.1" @@ -1748,13 +2087,28 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1763,37 +2117,47 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", ] [[package]] -name = "mio" -version = "0.8.10" +name = "naga" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" dependencies = [ - "libc", + "bit-set", + "bitflags 2.5.0", + "codespan-reporting", + "hexf-parse", + "indexmap", "log", - "wasi", - "windows-sys 0.48.0", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", ] [[package]] name = "ndk" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "jni-sys", + "log", "ndk-sys", - "num_enum 0.5.11", - "raw-window-handle", + "num_enum", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.1", "thiserror", ] @@ -1805,38 +2169,13 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.4.1+23.1.7779620" +version = "0.5.0+25.2.9519653" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" dependencies = [ "jni-sys", ] -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - [[package]] name = "nix" version = "0.26.4" @@ -1847,7 +2186,17 @@ dependencies = [ "cfg-if", "libc", "memoffset 0.7.1", - "pin-utils", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "libc", ] [[package]] @@ -1866,76 +2215,34 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -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.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] [[package]] name = "num_enum" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.5.11", -] - -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", + "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "num_enum_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -1945,17 +2252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", + "objc_exception", ] [[package]] @@ -1964,15 +2261,64 @@ version = "0.2.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" +[[package]] +name = "objc-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" + [[package]] name = "objc2" version = "0.3.0-beta.3.patch-leaks.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" dependencies = [ - "block2", - "objc-sys", - "objc2-encode", + "block2 0.2.0-alpha.6", + "objc-sys 0.2.0-beta.2", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys 0.3.3", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b25e1034d0e636cd84707ccdaa9f81243d399196b8a773946dcffec0401659" +dependencies = [ + "objc-sys 0.3.3", + "objc2-encode 4.0.1", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb79768a710a9a1798848179edb186d1af7e8a8679f369e4b8d201dd2a034047" +dependencies = [ + "block2 0.5.0", + "objc2 0.5.1", + "objc2-core-data", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e092bc42eaf30a08844e6a076938c60751225ec81431ab89f5d1ccd9f958d6c" +dependencies = [ + "block2 0.5.0", + "objc2 0.5.1", + "objc2-foundation", ] [[package]] @@ -1981,16 +2327,38 @@ version = "2.0.0-pre.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" dependencies = [ - "objc-sys", + "objc-sys 0.2.0-beta.2", ] [[package]] -name = "objc_id" -version = "0.1.1" +name = "objc2-encode" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc2-encode" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88658da63e4cc2c8adb1262902cd6af51094df0488b760d6fd27194269c0950a" + +[[package]] +name = "objc2-foundation" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfaefe14254871ea16c7d88968c0ff14ba554712a20d76421eec52f0a7fb8904" dependencies = [ - "objc", + "block2 0.5.0", + "objc2 0.5.1", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", ] [[package]] @@ -2035,9 +2403,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -2045,15 +2413,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -2062,12 +2430,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "percent-encoding" version = "2.3.1" @@ -2076,9 +2438,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2093,21 +2455,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-io", ] [[package]] name = "pipewire" -version = "0.7.2" -source = "git+https://gitlab.freedesktop.org/dimtpap/pipewire-rs.git?rev=7bd8b2d3c5d91f56b20c345e97244fff9e58ea0f#7bd8b2d3c5d91f56b20c345e97244fff9e58ea0f" +version = "0.8.0" +source = "git+https://gitlab.freedesktop.org/dimtpap/pipewire-rs.git?rev=605d15996f3258b3e1cc34e445dfbdf16a366c7e#605d15996f3258b3e1cc34e445dfbdf16a366c7e" dependencies = [ "anyhow", - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", "libspa", "libspa-sys", - "nix 0.26.4", + "nix 0.27.1", "once_cell", "pipewire-sys", "thiserror", @@ -2115,8 +2477,8 @@ dependencies = [ [[package]] name = "pipewire-sys" -version = "0.7.2" -source = "git+https://gitlab.freedesktop.org/dimtpap/pipewire-rs.git?rev=7bd8b2d3c5d91f56b20c345e97244fff9e58ea0f#7bd8b2d3c5d91f56b20c345e97244fff9e58ea0f" +version = "0.8.0" +source = "git+https://gitlab.freedesktop.org/dimtpap/pipewire-rs.git?rev=605d15996f3258b3e1cc34e445dfbdf16a366c7e#605d15996f3258b3e1cc34e445dfbdf16a366c7e" dependencies = [ "bindgen", "libspa-sys", @@ -2125,15 +2487,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "png" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2160,14 +2522,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi", "pin-project-lite", - "rustix 0.38.28", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] @@ -2184,6 +2547,12 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -2194,6 +2563,15 @@ dependencies = [ "toml_edit 0.19.15", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2220,18 +2598,33 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] [[package]] -name = "quote" -version = "1.0.33" +name = "profiling" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2272,6 +2665,32 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" +[[package]] +name = "raw-window-handle" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "redox_syscall" version = "0.3.5" @@ -2291,21 +2710,30 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.4" +name = "redox_syscall" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", - "libredox 0.0.1", + "libredox 0.1.3", "thiserror", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -2315,9 +2743,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -2326,9 +2754,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "renderdoc-sys" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "ron" @@ -2337,7 +2771,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64", - "bitflags 2.4.1", + "bitflags 2.5.0", "serde", "serde_derive", ] @@ -2364,14 +2798,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.13", "windows-sys 0.52.0", ] @@ -2398,9 +2832,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.5.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09" +checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" dependencies = [ "ab_glyph", "log", @@ -2411,40 +2845,40 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.193" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -2462,15 +2896,15 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -2501,37 +2935,53 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" -version = "0.16.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "calloop", - "dlib", - "lazy_static", + "calloop-wayland-source", + "cursor-icon", + "libc", "log", "memmap2", - "nix 0.24.3", - "pkg-config", + "rustix 0.38.34", + "thiserror", + "wayland-backend", "wayland-client", + "wayland-csd-frame", "wayland-cursor", "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", ] [[package]] name = "smithay-clipboard" -version = "0.6.6" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" +checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" dependencies = [ + "libc", "smithay-client-toolkit", - "wayland-client", + "wayland-backend", +] + +[[package]] +name = "smol_str" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +dependencies = [ + "serde", ] [[package]] @@ -2544,18 +2994,21 @@ dependencies = [ "winapi", ] +[[package]] +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - [[package]] name = "strict-num" version = "0.1.1" @@ -2575,9 +3028,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.41" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -2586,12 +3039,12 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck", + "heck 0.5.0", "pkg-config", "toml", "version-compare", @@ -2599,62 +3052,70 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.28", - "windows-sys 0.48.0", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.51" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.51" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "tiny-skia" -version = "0.8.4" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", "arrayvec", "bytemuck", "cfg-if", - "png", + "log", "tiny-skia-path", ] [[package]] name = "tiny-skia-path" -version = "0.8.4" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" dependencies = [ "arrayref", "bytemuck", @@ -2678,14 +3139,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.22.12", ] [[package]] @@ -2705,20 +3166,31 @@ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.7", ] [[package]] @@ -2740,7 +3212,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] @@ -2758,6 +3230,15 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" +[[package]] +name = "type-map" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" +dependencies = [ + "rustc-hash", +] + [[package]] name = "typenum" version = "1.17.0" @@ -2770,16 +3251,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset 0.9.1", "tempfile", "winapi", ] [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -2789,18 +3270,30 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "url" @@ -2814,23 +3307,11 @@ dependencies = [ "serde", ] -[[package]] -name = "value-bag" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -2846,9 +3327,9 @@ checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -2862,9 +3343,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2872,24 +3353,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -2899,9 +3380,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2909,113 +3390,137 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] -name = "wayland-client" -version = "0.29.5" +name = "wayland-backend" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ - "bitflags 1.3.2", + "cc", "downcast-rs", - "libc", - "nix 0.24.3", + "rustix 0.38.34", "scoped-tls", - "wayland-commons", - "wayland-scanner", - "wayland-sys 0.29.5", + "smallvec", + "wayland-sys", ] [[package]] -name = "wayland-commons" -version = "0.29.5" +name = "wayland-client" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys 0.29.5", + "bitflags 2.5.0", + "rustix 0.38.34", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.5.0", + "cursor-icon", + "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.29.5" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" dependencies = [ - "nix 0.24.3", + "rustix 0.38.34", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.29.5" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", + "wayland-backend", "wayland-client", - "wayland-commons", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", "wayland-scanner", ] [[package]] name = "wayland-scanner" -version = "0.29.5" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" dependencies = [ "proc-macro2", + "quick-xml", "quote", - "xml-rs", ] [[package]] name = "wayland-sys" -version = "0.29.5" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" dependencies = [ "dlib", - "lazy_static", - "pkg-config", -] - -[[package]] -name = "wayland-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" -dependencies = [ - "dlib", - "lazy_static", "log", + "once_cell", "pkg-config", ] [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -3023,9 +3528,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" dependencies = [ "js-sys", "wasm-bindgen", @@ -3033,9 +3538,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" +checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" dependencies = [ "core-foundation", "home", @@ -3043,11 +3548,119 @@ dependencies = [ "log", "ndk-context", "objc", - "raw-window-handle", + "raw-window-handle 0.5.2", "url", "web-sys", ] +[[package]] +name = "wgpu" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01" +dependencies = [ + "arrayvec", + "cfg-if", + "cfg_aliases", + "js-sys", + "log", + "parking_lot", + "profiling", + "raw-window-handle 0.6.1", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.5.0", + "cfg_aliases", + "codespan-reporting", + "indexmap", + "log", + "naga", + "once_cell", + "parking_lot", + "profiling", + "raw-window-handle 0.6.1", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bitflags 2.5.0", + "cfg_aliases", + "core-graphics-types", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.3", + "log", + "metal", + "naga", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "profiling", + "raw-window-handle 0.6.1", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" +dependencies = [ + "bitflags 2.5.0", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + [[package]] name = "winapi" version = "0.3.9" @@ -3066,20 +3679,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3099,6 +3703,25 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + [[package]] name = "windows-implement" version = "0.48.0" @@ -3145,7 +3768,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -3180,17 +3803,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -3207,9 +3831,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -3225,9 +3849,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -3243,9 +3867,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -3261,9 +3891,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -3279,9 +3909,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -3297,9 +3927,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -3315,50 +3945,73 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" -version = "0.28.7" +version = "0.29.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" +checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" dependencies = [ + "ahash", "android-activity", - "bitflags 1.3.2", + "atomic-waker", + "bitflags 2.5.0", + "bytemuck", + "calloop", "cfg_aliases", "core-foundation", "core-graphics", - "dispatch", - "instant", + "cursor-icon", + "icrate", + "js-sys", "libc", "log", - "mio", + "memmap2", "ndk", - "objc2", + "ndk-sys", + "objc2 0.4.1", "once_cell", "orbclient", "percent-encoding", - "raw-window-handle", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.1", "redox_syscall 0.3.5", + "rustix 0.38.34", "sctk-adwaita", "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", "wayland-client", - "wayland-commons", "wayland-protocols", - "wayland-scanner", + "wayland-protocols-plasma", "web-sys", - "windows-sys 0.45.0", + "web-time", + "windows-sys 0.48.0", "x11-dl", + "x11rb", + "xkbcommon-dl", ] [[package]] name = "winnow" -version = "0.5.28" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" dependencies = [ "memchr", ] @@ -3376,25 +4029,24 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ + "as-raw-xcb-connection", "gethostname", - "nix 0.26.4", - "winapi", - "winapi-wsapoll", + "libc", + "libloading 0.8.3", + "once_cell", + "rustix 0.38.34", "x11rb-protocol", ] [[package]] name = "x11rb-protocol" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" -dependencies = [ - "nix 0.26.4", -] +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" @@ -3404,29 +4056,57 @@ checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" dependencies = [ - "nix 0.26.4", + "libc", "winapi", ] [[package]] -name = "xml-rs" -version = "0.8.19" +name = "xkbcommon-dl" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.5.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + +[[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi", +] [[package]] name = "zbus" -version = "3.14.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast", "async-executor", - "async-fs", + "async-fs 1.6.0", "async-io 1.13.0", "async-lock 2.8.0", "async-process", @@ -3461,11 +4141,11 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "regex", @@ -3475,9 +4155,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ "serde", "static_assertions", @@ -3486,29 +4166,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.60", ] [[package]] name = "zvariant" -version = "3.15.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" dependencies = [ "byteorder", "enumflags2", @@ -3521,11 +4201,11 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", diff --git a/third_party/nixpkgs/pkgs/by-name/co/coppwr/package.nix b/third_party/nixpkgs/pkgs/by-name/co/coppwr/package.nix index dc1e923233..25a0952fc7 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/coppwr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/coppwr/package.nix @@ -4,28 +4,28 @@ , pkg-config , libxkbcommon , pipewire -, stdenv , libGL , wayland , xorg +, vulkan-loader }: rustPlatform.buildRustPackage rec { pname = "coppwr"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "dimtpap"; repo = "coppwr"; rev = version; - hash = "sha256-azho/SVGEdHXt/t6VSA0NVVfhxK9bxy4Ud68faFh5zo="; + hash = "sha256-7z1b++itHoqVX5KB9gv6dMAzq1j7VDGYzuJArUDPlD4="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "egui_node_graph-0.4.0" = "sha256-VJvALtPP/vPZQ4KLWu8diFar9vuVkbeD65Em6rod8ww="; - "libspa-0.7.2" = "sha256-0TGhxHL1mkktE263ln3jnPZRkXS6+C3aPUBg86J25oM="; + "egui_node_graph-0.4.0" = "sha256-VtHgKWh+bHSFltNgYaFmYhZW9tqwiWJjiCCspeKgSXQ="; + "libspa-0.8.0" = "sha256-X8mwLtuPuMxZY71GNPAgiJGJ9JNMj7AbCliXiBxJ4vQ="; }; }; @@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libXrandr xorg.libX11 + vulkan-loader ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/Cargo.lock index 5e0658ab3e..8700f917ae 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/Cargo.lock @@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" dependencies = [ "ab_glyph_rasterizer", - "owned_ttf_parser 0.20.0", + "owned_ttf_parser", ] [[package]] @@ -84,7 +84,7 @@ dependencies = [ "accesskit_unix", "accesskit_windows", "raw-window-handle 0.6.0", - "winit 0.29.10", + "winit", ] [[package]] @@ -102,19 +102,13 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - [[package]] name = "ahash" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "getrandom", "once_cell", "version_check", @@ -148,19 +142,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" -[[package]] -name = "andrew" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf" -dependencies = [ - "bitflags 1.3.2", - "rusttype", - "walkdir", - "xdg", - "xml-rs", -] - [[package]] name = "android-activity" version = "0.5.2" @@ -175,10 +156,10 @@ dependencies = [ "jni-sys", "libc", "log", - "ndk 0.8.0", + "ndk", "ndk-context", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.2", + "ndk-sys", + "num_enum", "thiserror", ] @@ -259,9 +240,9 @@ checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "apply" @@ -280,9 +261,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" [[package]] name = "arrayref" @@ -335,6 +316,23 @@ dependencies = [ "zbus", ] +[[package]] +name = "ashpd" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01992ad7774250d5b7fe214e2676cb99bf92564436d8135ab44fe815e71769a9" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus", +] + [[package]] name = "async-broadcast" version = "0.5.1" @@ -352,7 +350,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 5.1.0", + "event-listener 5.2.0", "event-listener-strategy 0.5.0", "futures-core", "pin-project-lite", @@ -368,7 +366,7 @@ dependencies = [ "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "slab", ] @@ -392,7 +390,7 @@ checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock 2.8.0", "autocfg", - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "futures-lite 1.13.0", "log", @@ -406,15 +404,15 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ "async-lock 3.3.0", - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "parking", "polling 3.5.0", "rustix 0.38.31", @@ -453,7 +451,7 @@ dependencies = [ "async-lock 2.8.0", "async-signal", "blocking", - "cfg-if 1.0.0", + "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", "rustix 0.38.31", @@ -462,13 +460,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -477,10 +475,10 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.3.1", + "async-io 2.3.2", "async-lock 2.8.0", "atomic-waker", - "cfg-if 1.0.0", + "cfg-if", "futures-core", "futures-io", "rustix 0.38.31", @@ -497,13 +495,13 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -596,9 +594,9 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", - "miniz_oxide 0.7.2", + "miniz_oxide", "object", "rustc-demangle", ] @@ -709,7 +707,7 @@ dependencies = [ "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "piper", "tracing", ] @@ -727,9 +725,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.3" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytecount" @@ -739,22 +737,22 @@ checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -779,16 +777,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "calloop" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c" -dependencies = [ - "log", - "nix 0.18.0", -] - [[package]] name = "calloop" version = "0.12.4" @@ -809,18 +797,19 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ - "calloop 0.12.4", + "calloop", "rustix 0.38.31", "wayland-backend", - "wayland-client 0.31.2", + "wayland-client", ] [[package]] name = "cc" -version = "1.0.88" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ + "jobserver", "libc", ] @@ -840,12 +829,6 @@ dependencies = [ "target-lexicon", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -866,9 +849,9 @@ checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", @@ -876,14 +859,14 @@ dependencies = [ "num-traits", "pure-rust-locales", "wasm-bindgen", - "windows-targets 0.52.3", + "windows-targets 0.52.4", ] [[package]] name = "clipboard-win" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297" +checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" dependencies = [ "error-code", ] @@ -891,8 +874,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" dependencies = [ "objc", "objc-foundation", @@ -902,38 +884,21 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003f886bc4e2987729d10c1db3424e7f80809f3fc22dbc16c685738887cb37b8" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" dependencies = [ + "mime 0.1.0", "smithay-clipboard", ] [[package]] name = "clipboard_x11" version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4274ea815e013e0f9f04a2633423e14194e408a0576c943ce3d14ca56c50031c" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" dependencies = [ "thiserror", "x11rb", ] -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation 0.9.4", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "libc", - "objc", -] - [[package]] name = "cocoa" version = "0.25.0" @@ -943,9 +908,9 @@ dependencies = [ "bitflags 1.3.2", "block", "cocoa-foundation", - "core-foundation 0.9.4", - "core-graphics 0.23.1", - "foreign-types 0.5.0", + "core-foundation", + "core-graphics", + "foreign-types", "libc", "objc", ] @@ -958,7 +923,7 @@ checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ "bitflags 1.3.2", "block", - "core-foundation 0.9.4", + "core-foundation", "core-graphics-types", "libc", "objc", @@ -1038,9 +1003,9 @@ dependencies = [ [[package]] name = "const-random" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" dependencies = [ "const-random-macro", ] @@ -1056,63 +1021,22 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - [[package]] name = "core-foundation" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "core-foundation-sys 0.8.6", + "core-foundation-sys", "libc", ] -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - [[package]] name = "core-foundation-sys" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "core-graphics" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.7.0", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", -] - [[package]] name = "core-graphics" version = "0.23.1" @@ -1120,9 +1044,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", + "core-foundation", "core-graphics-types", - "foreign-types 0.5.0", + "foreign-types", "libc", ] @@ -1133,27 +1057,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", + "core-foundation", "libc", ] -[[package]] -name = "core-video-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" -dependencies = [ - "cfg-if 0.1.10", - "core-foundation-sys 0.7.0", - "core-graphics 0.19.2", - "libc", - "objc", -] - [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1170,7 +1081,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "quote", "syn 1.0.109", @@ -1196,11 +1107,11 @@ dependencies = [ "notify", "open", "patch", + "regex", "rust-embed", "serde", "smol_str", "syntect", - "systemicons", "tokio", "two-face", "vergen", @@ -1209,28 +1120,32 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files.git#8ab15027a521713850384fa87666bb9974f2666b" +source = "git+https://github.com/pop-os/cosmic-files.git#2bc93cc3cc1906c7884dd941ab211b6bc8eca8fd" dependencies = [ "chrono", "dirs", - "env_logger 0.11.2", + "env_logger 0.11.3", "fork", "i18n-embed", "i18n-embed-fl", - "image 0.24.9", + "image", "lexical-sort", + "libc", "libcosmic", "log", "mime_guess", "notify", "once_cell", + "open", "paste", "rust-embed", "serde", + "shlex", "smol_str", - "systemicons", "tokio", "trash", + "vergen", + "xdg-mime", ] [[package]] @@ -1240,13 +1155,13 @@ source = "git+https://github.com/pop-os/cosmic-syntax-theme.git#b1e1eb0234568911 dependencies = [ "handlebars", "serde", - "toml 0.8.10", + "toml 0.8.12", ] [[package]] name = "cosmic-text" version = "0.11.2" -source = "git+https://github.com/pop-os/cosmic-text.git#2766961af621b9235616e186046f6d14a2f5fbc0" +source = "git+https://github.com/pop-os/cosmic-text.git#ff5501d9a36e51c50d908413caf7632d8f7533b7" dependencies = [ "bitflags 2.4.2", "cosmic_undo_2", @@ -1261,7 +1176,7 @@ dependencies = [ "swash", "syntect", "sys-locale", - "ttf-parser 0.20.0", + "ttf-parser", "unicode-bidi", "unicode-linebreak", "unicode-script", @@ -1271,15 +1186,17 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "almost", "cosmic-config", "csscolorparser", + "dirs", "lazy_static", "palette", "ron", "serde", + "thiserror", ] [[package]] @@ -1308,27 +1225,14 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", + "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ "crossbeam-utils", ] @@ -1352,15 +1256,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.19" @@ -1406,15 +1301,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.51", + "syn 2.0.53", ] -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - [[package]] name = "cursor-icon" version = "1.1.0" @@ -1427,42 +1316,18 @@ version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "bitflags 2.4.2", - "libloading 0.8.1", + "libloading 0.8.3", "winapi", ] -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - [[package]] name = "darling" version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn 1.0.109", + "darling_core", + "darling_macro", ] [[package]] @@ -1475,19 +1340,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.51", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", - "syn 1.0.109", + "strsim", + "syn 2.0.53", ] [[package]] @@ -1496,9 +1350,9 @@ version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ - "darling_core 0.20.8", + "darling_core", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -1507,7 +1361,7 @@ version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "hashbrown", "lock_api", "once_cell", @@ -1520,16 +1374,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" -[[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - [[package]] name = "deranged" version = "0.3.11" @@ -1556,10 +1400,10 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" dependencies = [ - "darling 0.20.8", + "darling", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -1587,7 +1431,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -1628,16 +1472,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", -] - -[[package]] -name = "dlib" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76" -dependencies = [ - "libloading 0.6.7", + "syn 2.0.53", ] [[package]] @@ -1646,7 +1481,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.1", + "libloading 0.8.3", ] [[package]] @@ -1715,7 +1550,7 @@ version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1745,7 +1580,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -1773,9 +1608,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ "anstream", "anstyle", @@ -1855,9 +1690,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.1.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" dependencies = [ "concurrent-queue", "parking", @@ -1880,7 +1715,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" dependencies = [ - "event-listener 5.1.0", + "event-listener 5.2.0", "pin-project-lite", ] @@ -1894,7 +1729,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide 0.7.2", + "miniz_oxide", "rayon-core", "smallvec", "zune-inflate", @@ -1936,7 +1771,7 @@ version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall 0.4.1", "windows-sys 0.52.0", @@ -1958,7 +1793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", - "miniz_oxide 0.7.2", + "miniz_oxide", ] [[package]] @@ -2034,9 +1869,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd7f3ea17572640b606b35df42cfb6ecdf003704b062580e59918692190b73d" +checksum = "5b7f6040d337bd44434ab21fc6509154edf2cece88b23758d9d64654c4e7730b" [[package]] name = "fontconfig-parser" @@ -2055,19 +1890,10 @@ checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.9.4", + "memmap2", "slotmap", "tinyvec", - "ttf-parser 0.20.0", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", + "ttf-parser", ] [[package]] @@ -2077,7 +1903,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ "foreign-types-macros", - "foreign-types-shared 0.3.1", + "foreign-types-shared", ] [[package]] @@ -2088,15 +1914,9 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "foreign-types-shared" version = "0.3.1" @@ -2219,9 +2039,9 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ "fastrand 2.0.1", "futures-core", @@ -2238,7 +2058,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -2327,21 +2147,11 @@ version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi", ] -[[package]] -name = "gif" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.12.0" @@ -2598,7 +2408,7 @@ dependencies = [ "grep-matcher", "log", "memchr", - "memmap2 0.9.4", + "memmap2", ] [[package]] @@ -2641,7 +2451,7 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crunchy", ] @@ -2678,7 +2488,7 @@ dependencies = [ "bitflags 2.4.2", "com", "libc", - "libloading 0.8.1", + "libloading 0.8.3", "thiserror", "widestring", "winapi", @@ -2692,9 +2502,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379dada1584ad501b383485dd706b8afb7a70fcbc7f4da7d780638a5a6124a60" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2724,7 +2534,7 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "toml 0.8.10", + "toml 0.8.12", "unic-langid", ] @@ -2766,8 +2576,8 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.51", + "strsim", + "syn 2.0.53", "unic-langid", ] @@ -2781,7 +2591,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -2791,7 +2601,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.6", + "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", @@ -2810,7 +2620,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "iced_accessibility", "iced_core", @@ -2818,14 +2628,15 @@ dependencies = [ "iced_renderer", "iced_widget", "iced_winit", - "image 0.24.9", + "image", "thiserror", + "window_clipboard", ] [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "accesskit", "accesskit_winit", @@ -2834,7 +2645,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "bitflags 1.3.2", "log", @@ -2845,13 +2656,14 @@ dependencies = [ "smol_str", "thiserror", "web-time", + "window_clipboard", "xxhash-rust", ] [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "futures", "iced_core", @@ -2864,7 +2676,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2873,7 +2685,7 @@ dependencies = [ "half", "iced_core", "iced_futures", - "image 0.24.9", + "image", "kamadak-exif", "log", "lyon_path", @@ -2888,7 +2700,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2900,17 +2712,18 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "iced_core", "iced_futures", "thiserror", + "window_clipboard", ] [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "iced_core", "once_cell", @@ -2920,7 +2733,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "bytemuck", "cosmic-text", @@ -2937,7 +2750,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2956,7 +2769,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "iced_renderer", "iced_runtime", @@ -2970,7 +2783,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "iced_graphics", "iced_runtime", @@ -2981,7 +2794,7 @@ dependencies = [ "web-sys", "winapi", "window_clipboard", - "winit 0.29.10", + "winit", ] [[package]] @@ -3037,25 +2850,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "image" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif 0.11.4", - "jpeg-decoder 0.1.22", - "num-iter", - "num-rational 0.3.2", - "num-traits", - "png 0.16.8", - "scoped_threadpool", - "tiff 0.6.1", -] - [[package]] name = "image" version = "0.24.9" @@ -3067,11 +2861,11 @@ dependencies = [ "color_quant", "exr", "gif 0.13.1", - "jpeg-decoder 0.3.1", + "jpeg-decoder", "num-traits", - "png 0.17.13", + "png", "qoi", - "tiff 0.9.1", + "tiff", ] [[package]] @@ -3082,9 +2876,9 @@ checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] name = "indexmap" -version = "2.2.3" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", "hashbrown", @@ -3116,7 +2910,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -3192,7 +2986,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", - "cfg-if 1.0.0", + "cfg-if", "combine", "jni-sys", "log", @@ -3208,12 +3002,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] -name = "jpeg-decoder" -version = "0.1.22" +name = "jobserver" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ - "rayon", + "libc", ] [[package]] @@ -3227,9 +3021,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -3250,7 +3044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.1", + "libloading 0.8.3", "pkg-config", ] @@ -3318,7 +3112,7 @@ checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec 0.5.2", "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "ryu", "static_assertions", ] @@ -3341,10 +3135,11 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "apply", - "ashpd", + "ashpd 0.7.0", + "chrono", "cosmic-config", "cosmic-theme", "css-color", @@ -3374,34 +3169,24 @@ dependencies = [ "zbus", ] -[[package]] -name = "libloading" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" -dependencies = [ - "cfg-if 1.0.0", - "winapi", -] - [[package]] name = "libloading" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "winapi", ] [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", + "cfg-if", + "windows-targets 0.52.4", ] [[package]] @@ -3490,9 +3275,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lru" @@ -3570,15 +3355,6 @@ version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" -[[package]] -name = "memmap2" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a" -dependencies = [ - "libc", -] - [[package]] name = "memmap2" version = "0.9.4" @@ -3615,12 +3391,20 @@ dependencies = [ "bitflags 2.4.2", "block", "core-graphics-types", - "foreign-types 0.5.0", + "foreign-types", "log", "objc", "paste", ] +[[package]] +name = "mime" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" +dependencies = [ + "smithay-clipboard", +] + [[package]] name = "mime" version = "0.3.17" @@ -3633,7 +3417,7 @@ version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ - "mime", + "mime 0.3.17", "unicase", ] @@ -3643,25 +3427,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - [[package]] name = "miniz_oxide" version = "0.7.2" @@ -3674,22 +3439,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "mio" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -3697,27 +3449,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mio-misc" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47412f3a52115b936ff2a229b803498c7b4d332adeb87c2f1498c9da54c398c" -dependencies = [ - "crossbeam", - "crossbeam-queue", - "log", - "mio 0.7.14", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - [[package]] name = "modit" version = "0.1.4" @@ -3753,18 +3484,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "ndk" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab" -dependencies = [ - "jni-sys", - "ndk-sys 0.2.2", - "num_enum 0.5.11", - "thiserror", -] - [[package]] name = "ndk" version = "0.8.0" @@ -3774,8 +3493,8 @@ dependencies = [ "bitflags 2.4.2", "jni-sys", "log", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.2", + "ndk-sys", + "num_enum", "raw-window-handle 0.6.0", "thiserror", ] @@ -3786,39 +3505,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-glue" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk 0.3.0", - "ndk-macro", - "ndk-sys 0.2.2", -] - -[[package]] -name = "ndk-macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" -dependencies = [ - "darling 0.10.2", - "proc-macro-crate 0.1.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ndk-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" - [[package]] name = "ndk-sys" version = "0.5.0+25.2.9519653" @@ -3828,30 +3514,6 @@ dependencies = [ "jni-sys", ] -[[package]] -name = "nix" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if 0.1.10", - "libc", -] - -[[package]] -name = "nix" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if 1.0.0", - "libc", -] - [[package]] name = "nix" version = "0.26.4" @@ -3859,7 +3521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset 0.7.1", ] @@ -3910,20 +3572,11 @@ dependencies = [ "kqueue", "libc", "log", - "mio 0.8.10", + "mio", "walkdir", "windows-sys 0.48.0", ] -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - [[package]] name = "num" version = "0.4.1" @@ -3934,7 +3587,7 @@ dependencies = [ "num-complex", "num-integer", "num-iter", - "num-rational 0.4.1", + "num-rational", "num-traits", ] @@ -3984,17 +3637,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.1" @@ -4027,34 +3669,13 @@ dependencies = [ "libc", ] -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - [[package]] name = "num_enum" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.2", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "num_enum_derive", ] [[package]] @@ -4066,7 +3687,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -4194,9 +3815,9 @@ dependencies = [ [[package]] name = "open" -version = "5.0.2" +version = "5.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eedff767bc49d336bff300224f73307ae36963c843e38dc9312a22171b012cbc" +checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" dependencies = [ "is-wsl", "libc", @@ -4259,16 +3880,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.51", -] - -[[package]] -name = "owned_ttf_parser" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb" -dependencies = [ - "ttf-parser 0.15.2", + "syn 2.0.53", ] [[package]] @@ -4277,7 +3889,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" dependencies = [ - "ttf-parser 0.20.0", + "ttf-parser", ] [[package]] @@ -4301,7 +3913,7 @@ checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -4349,7 +3961,7 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", "redox_syscall 0.2.16", @@ -4363,7 +3975,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall 0.4.1", "smallvec", @@ -4401,9 +4013,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.7" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546" +checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" dependencies = [ "memchr", "thiserror", @@ -4412,9 +4024,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.7" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1288dbd7786462961e69bfd4df7848c1e37e8b74303dbdab82c3a9cdd2809" +checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026" dependencies = [ "pest", "pest_generator", @@ -4422,22 +4034,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.7" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e" +checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] name = "pest_meta" -version = "2.7.7" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0934d6907f148c22a3acbda520c7eed243ad7487a30f51f6ce52b58b7077a8a" +checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293" dependencies = [ "once_cell", "pest", @@ -4474,7 +4086,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -4535,18 +4147,6 @@ dependencies = [ "time", ] -[[package]] -name = "png" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "deflate", - "miniz_oxide 0.3.7", -] - [[package]] name = "png" version = "0.17.13" @@ -4557,7 +4157,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.2", + "miniz_oxide", ] [[package]] @@ -4568,7 +4168,7 @@ checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "libc", "log", @@ -4582,7 +4182,7 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "pin-project-lite", "rustix 0.38.31", @@ -4608,15 +4208,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml 0.5.11", -] - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -4662,9 +4253,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -4750,25 +4341,6 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" -[[package]] -name = "raw-window-handle" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" -dependencies = [ - "libc", - "raw-window-handle 0.4.3", -] - -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - [[package]] name = "raw-window-handle" version = "0.5.2" @@ -4783,9 +4355,9 @@ checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" [[package]] name = "rayon" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -4809,9 +4381,9 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "read-fonts" -version = "0.15.6" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ea23eedb4d938031b6d4343222444608727a6aa68ec355e13588d9947ffe92" +checksum = "81c524658d3b77930a391f559756d91dbe829ab6cf4687083f615d395df99722" dependencies = [ "font-types", ] @@ -4868,9 +4440,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -4885,9 +4457,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "renderdoc-sys" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "resvg" @@ -4896,10 +4468,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" dependencies = [ "gif 0.12.0", - "jpeg-decoder 0.3.1", + "jpeg-decoder", "log", "pico-args", - "png 0.17.13", + "png", "rgb", "svgtypes", "tiny-skia", @@ -4912,7 +4484,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0d8ab342bcc5436e04d3a4c1e09e17d74958bfaddf8d5fad6f85607df0f994f" dependencies = [ - "ashpd", + "ashpd 0.6.8", "block", "dispatch", "glib-sys", @@ -4977,7 +4549,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.51", + "syn 2.0.53", "walkdir", ] @@ -4997,7 +4569,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ordered-multimap", ] @@ -5049,16 +4621,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rusttype" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff8374aa04134254b7995b63ad3dc41c7f7236f69528b28553da7d72efaa967" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser 0.15.2", -] - [[package]] name = "rustversion" version = "1.0.14" @@ -5075,7 +4637,7 @@ dependencies = [ "bytemuck", "libm", "smallvec", - "ttf-parser 0.20.0", + "ttf-parser", "unicode-bidi-mirroring", "unicode-ccc", "unicode-properties", @@ -5109,12 +4671,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" -[[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.2.0" @@ -5129,8 +4685,8 @@ checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.4", - "smithay-client-toolkit 0.18.1", + "memmap2", + "smithay-client-toolkit", "tiny-skia", ] @@ -5181,7 +4737,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -5203,7 +4759,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -5221,7 +4777,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -5232,11 +4788,17 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -5291,25 +4853,6 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" -[[package]] -name = "smithay-client-toolkit" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80" -dependencies = [ - "andrew", - "bitflags 1.3.2", - "calloop 0.6.5", - "dlib 0.4.2", - "lazy_static", - "log", - "memmap2 0.1.0", - "nix 0.18.0", - "wayland-client 0.28.6", - "wayland-cursor 0.28.6", - "wayland-protocols 0.28.6", -] - [[package]] name = "smithay-client-toolkit" version = "0.18.1" @@ -5317,32 +4860,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ "bitflags 2.4.2", - "calloop 0.12.4", + "calloop", "calloop-wayland-source", "cursor-icon", "libc", "log", - "memmap2 0.9.4", + "memmap2", "rustix 0.38.31", "thiserror", "wayland-backend", - "wayland-client 0.31.2", + "wayland-client", "wayland-csd-frame", - "wayland-cursor 0.31.1", - "wayland-protocols 0.31.2", + "wayland-cursor", + "wayland-protocols", "wayland-protocols-wlr", - "wayland-scanner 0.31.1", + "wayland-scanner", "xkeysym", ] [[package]] name = "smithay-clipboard" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +version = "0.8.0" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-mime-types#cc0101c1f9ccc937a413bd3af3c0f6217f27e935" dependencies = [ "libc", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "wayland-backend", ] @@ -5383,14 +4925,14 @@ dependencies = [ "as-raw-xcb-connection", "bytemuck", "cfg_aliases 0.2.0", - "cocoa 0.25.0", - "core-graphics 0.23.1", + "cocoa", + "core-graphics", "drm", "fastrand 2.0.1", - "foreign-types 0.5.0", + "foreign-types", "js-sys", "log", - "memmap2 0.9.4", + "memmap2", "objc", "raw-window-handle 0.6.0", "redox_syscall 0.4.1", @@ -5398,8 +4940,8 @@ dependencies = [ "tiny-xlib", "wasm-bindgen", "wayland-backend", - "wayland-client 0.31.2", - "wayland-sys 0.31.1", + "wayland-client", + "wayland-sys", "web-sys", "windows-sys 0.52.0", "x11rb", @@ -5438,12 +4980,6 @@ dependencies = [ "float-cmp", ] -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "strsim" version = "0.10.0" @@ -5452,9 +4988,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "svg_fmt" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" +checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499" [[package]] name = "svgtypes" @@ -5468,9 +5004,9 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06ff4664af8923625604261c645f5c4cc610cc83c84bec74b50d76237089de7" +checksum = "9af636fb90d39858650cae1088a37e2862dab4e874a0bb49d6dfb5b2dacf0e24" dependencies = [ "read-fonts", "yazi", @@ -5490,9 +5026,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.51" +version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ "proc-macro2", "quote", @@ -5532,32 +5068,17 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "e8e9199467bcbc77c6a13cc6e32a6af21721ab8c96aa0261856c4fda5a4433f0" dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.8.10", + "toml 0.8.12", "version-compare", ] -[[package]] -name = "systemicons" -version = "0.7.0" -source = "git+https://github.com/jackpot51/systemicons#501887629ebf3f9b9d3384383da62d352af3fbd7" -dependencies = [ - "cocoa 0.24.1", - "freedesktop-icons", - "image 0.23.14", - "lazy_static", - "objc", - "winapi", - "winit 0.25.0", - "xdg-mime", -] - [[package]] name = "taffy" version = "0.3.11" @@ -5581,7 +5102,7 @@ version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand 2.0.1", "rustix 0.38.31", "windows-sys 0.52.0", @@ -5598,33 +5119,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", -] - -[[package]] -name = "tiff" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" -dependencies = [ - "jpeg-decoder 0.1.22", - "miniz_oxide 0.4.4", - "weezl", + "syn 2.0.53", ] [[package]] @@ -5634,7 +5144,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", - "jpeg-decoder 0.3.1", + "jpeg-decoder", "weezl", ] @@ -5689,9 +5199,9 @@ dependencies = [ "arrayref", "arrayvec 0.7.4", "bytemuck", - "cfg-if 1.0.0", + "cfg-if", "log", - "png 0.17.13", + "png", "tiny-skia-path", ] @@ -5714,7 +5224,7 @@ checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" dependencies = [ "as-raw-xcb-connection", "ctor", - "libloading 0.8.1", + "libloading 0.8.3", "tracing", ] @@ -5751,7 +5261,7 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio 0.8.10", + "mio", "num_cpus", "pin-project-lite", "signal-hook-registry", @@ -5771,14 +5281,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.8", ] [[package]] @@ -5814,15 +5324,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.2", + "winnow 0.6.5", ] [[package]] @@ -5844,7 +5354,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -5872,12 +5382,6 @@ dependencies = [ "windows 0.44.0", ] -[[package]] -name = "ttf-parser" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" - [[package]] name = "ttf-parser" version = "0.20.0" @@ -6116,7 +5620,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" dependencies = [ "anyhow", - "cfg-if 1.0.0", + "cfg-if", "rustversion", "time", ] @@ -6141,9 +5645,9 @@ checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -6157,36 +5661,36 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -6194,9 +5698,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6204,22 +5708,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-timer" @@ -6247,23 +5751,7 @@ dependencies = [ "rustix 0.38.31", "scoped-tls", "smallvec", - "wayland-sys 0.31.1", -] - -[[package]] -name = "wayland-client" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix 0.20.0", - "scoped-tls", - "wayland-commons", - "wayland-scanner 0.28.6", - "wayland-sys 0.28.6", + "wayland-sys", ] [[package]] @@ -6275,19 +5763,7 @@ dependencies = [ "bitflags 2.4.2", "rustix 0.38.31", "wayland-backend", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-commons" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda" -dependencies = [ - "nix 0.20.0", - "once_cell", - "smallvec", - "wayland-sys 0.28.6", + "wayland-scanner", ] [[package]] @@ -6301,17 +5777,6 @@ dependencies = [ "wayland-backend", ] -[[package]] -name = "wayland-cursor" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a" -dependencies = [ - "nix 0.20.0", - "wayland-client 0.28.6", - "xcursor", -] - [[package]] name = "wayland-cursor" version = "0.31.1" @@ -6319,22 +5784,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" dependencies = [ "rustix 0.38.31", - "wayland-client 0.31.2", + "wayland-client", "xcursor", ] -[[package]] -name = "wayland-protocols" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f" -dependencies = [ - "bitflags 1.3.2", - "wayland-client 0.28.6", - "wayland-commons", - "wayland-scanner 0.28.6", -] - [[package]] name = "wayland-protocols" version = "0.31.2" @@ -6343,8 +5796,8 @@ checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ "bitflags 2.4.2", "wayland-backend", - "wayland-client 0.31.2", - "wayland-scanner 0.31.1", + "wayland-client", + "wayland-scanner", ] [[package]] @@ -6355,9 +5808,9 @@ checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ "bitflags 2.4.2", "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", - "wayland-scanner 0.31.1", + "wayland-client", + "wayland-protocols", + "wayland-scanner", ] [[package]] @@ -6368,20 +5821,9 @@ checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ "bitflags 2.4.2", "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-scanner" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", + "wayland-client", + "wayland-protocols", + "wayland-scanner", ] [[package]] @@ -6395,24 +5837,13 @@ dependencies = [ "quote", ] -[[package]] -name = "wayland-sys" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8" -dependencies = [ - "dlib 0.5.2", - "lazy_static", - "pkg-config", -] - [[package]] name = "wayland-sys" version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" dependencies = [ - "dlib 0.5.2", + "dlib", "log", "once_cell", "pkg-config", @@ -6420,9 +5851,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -6450,7 +5881,7 @@ version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "arrayvec 0.7.4", - "cfg-if 1.0.0", + "cfg-if", "cfg_aliases 0.1.1", "js-sys", "log", @@ -6516,7 +5947,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.1", + "libloading 0.8.3", "log", "metal", "naga", @@ -6586,13 +6017,13 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d692d46038c433f9daee7ad8757e002a4248c20b0a3fbc991d99521d3bcb6d" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" dependencies = [ "clipboard-win", "clipboard_macos", "clipboard_wayland", "clipboard_x11", + "mime 0.1.0", "raw-window-handle 0.6.0", "thiserror", ] @@ -6624,7 +6055,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.3", + "windows-targets 0.52.4", ] [[package]] @@ -6633,7 +6064,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.3", + "windows-targets 0.52.4", ] [[package]] @@ -6682,7 +6113,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.3", + "windows-targets 0.52.4", ] [[package]] @@ -6717,17 +6148,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.3", - "windows_aarch64_msvc 0.52.3", - "windows_i686_gnu 0.52.3", - "windows_i686_msvc 0.52.3", - "windows_x86_64_gnu 0.52.3", - "windows_x86_64_gnullvm 0.52.3", - "windows_x86_64_msvc 0.52.3", + "windows_aarch64_gnullvm 0.52.4", + "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_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -6744,9 +6175,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -6762,9 +6193,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -6780,9 +6211,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -6798,9 +6229,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -6816,9 +6247,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -6834,9 +6265,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -6852,41 +6283,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" - -[[package]] -name = "winit" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79610794594d5e86be473ef7763f604f2159cbac8c94debd00df8fb41e86c2f8" -dependencies = [ - "bitflags 1.3.2", - "cocoa 0.24.1", - "core-foundation 0.9.4", - "core-graphics 0.22.3", - "core-video-sys", - "dispatch", - "instant", - "lazy_static", - "libc", - "log", - "mio 0.7.14", - "mio-misc", - "ndk 0.3.0", - "ndk-glue", - "ndk-sys 0.2.2", - "objc", - "parking_lot 0.11.2", - "percent-encoding", - "raw-window-handle 0.3.4", - "scopeguard", - "smithay-client-toolkit 0.12.3", - "wayland-client 0.28.6", - "winapi", - "x11-dl", -] +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winit" @@ -6898,18 +6297,18 @@ dependencies = [ "atomic-waker", "bitflags 2.4.2", "bytemuck", - "calloop 0.12.4", + "calloop", "cfg_aliases 0.1.1", - "core-foundation 0.9.4", - "core-graphics 0.23.1", + "core-foundation", + "core-graphics", "cursor-icon", "icrate 0.0.4", "js-sys", "libc", "log", - "memmap2 0.9.4", - "ndk 0.8.0", - "ndk-sys 0.5.0+25.2.9519653", + "memmap2", + "ndk", + "ndk-sys", "objc2 0.4.1", "once_cell", "orbclient", @@ -6918,14 +6317,14 @@ dependencies = [ "redox_syscall 0.3.5", "rustix 0.38.31", "sctk-adwaita", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "smol_str", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", + "wayland-client", + "wayland-protocols", "wayland-protocols-plasma", "web-sys", "web-time", @@ -6946,9 +6345,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a4191c47f15cc3ec71fcb4913cb83d58def65dd3787610213c649283b5ce178" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] @@ -6973,7 +6372,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.1", + "libloading 0.8.3", "once_cell", "rustix 0.38.31", "x11rb-protocol", @@ -7015,7 +6414,7 @@ checksum = "87bf7b69bb50588d70a36e467be29d3df3e8c32580276d62eded9738c1a797aa" dependencies = [ "dirs-next", "glob", - "mime", + "mime 0.3.17", "nom 5.1.3", "unicase", ] @@ -7027,7 +6426,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ "bitflags 2.4.2", - "dlib 0.5.2", + "dlib", "log", "once_cell", "xkeysym", @@ -7096,7 +6495,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.26.4", + "nix", "once_cell", "ordered-stream", "rand", @@ -7130,9 +6529,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ "serde", "static_assertions", @@ -7162,7 +6561,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix index 155b812b42..8120fcc61e 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-edit/package.nix @@ -21,13 +21,13 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-edit"; - version = "unstable-2024-02-28"; + version = "unstable-2024-03-30"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; - rev = "536a66eff9c032afd76b60be6a9067a14ed38ab1"; - hash = "sha256-UsZBxeamw8VuHtHrVtTwHhPPG+SMBrGY5taw+da/Ll0="; + rev = "cd1b32218078979aa9a944b3a32f9b96996764a1"; + hash = "sha256-54DwcI/pwN6nRnHC6GeDYVJXNgS+xBQTnRrKV2YMGUA="; }; cargoLock = { @@ -35,14 +35,15 @@ rustPlatform.buildRustPackage rec { outputHashes = { "accesskit-0.12.2" = "sha256-ksaYMGT/oug7isQY8/1WD97XDUsX2ShBdabUzxWffYw="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "cosmic-config-0.1.0" = "sha256-Zyi95zcBAohM1WBropLzJczSIfNNNBK2odB4AmW4h5I="; - "cosmic-files-0.1.0" = "sha256-64An0MPgnFgyVlWmtBGBs+IV2z+4vmEY2uRPetZM4/M="; + "clipboard_macos-0.1.0" = "sha256-PEH+aCpjDCEIj8s39nIeWxb7qu3u9IfriGqf0pYObMk="; + "cosmic-config-0.1.0" = "sha256-x/xWMR5w2oEbghTSa8iCi24DA2s99+tcnga8K6jS6HQ="; + "cosmic-files-0.1.0" = "sha256-4uwqRzkttmPQlqkX6xLjxyXRcqUhchCjAzZH9wmR+Tk="; "cosmic-syntax-theme-0.1.0" = "sha256-BNb9wrryD5FJImboD3TTdPRIfiBqPpItqwGdT1ZiNng="; - "cosmic-text-0.11.2" = "sha256-Y9i5stMYpx+iqn4y5DJm1O1+3UIGp0/fSsnNq3Zloug="; + "cosmic-text-0.11.2" = "sha256-gUIQFHPaFTmtUfgpVvsGTnw2UKIBx9gl0K67KPuynWs="; "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "smithay-clipboard-0.8.0" = "sha256-OZOGbdzkgRIeDFrAENXE7g62eQTs60Je6lYVr0WudlE="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; - "systemicons-0.7.0" = "sha256-zzAI+6mnpQOh+3mX7/sJ+w4a7uX27RduQ99PNxLNF78="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; }; @@ -50,7 +51,7 @@ rustPlatform.buildRustPackage rec { # COSMIC applications now uses vergen for the About page # Update the COMMIT_DATE to match when the commit was made - env.VERGEN_GIT_COMMIT_DATE = "2024-02-28"; + env.VERGEN_GIT_COMMIT_DATE = "2024-03-30"; env.VERGEN_GIT_SHA = src.rev; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix index b14387ee7a..c201943f94 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix @@ -8,13 +8,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "cosmic-icons"; - version = "unstable-2024-02-22"; + version = "0-unstable-2024-05-02"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; - rev = "ee87327736728a9fb5a70c8688e9000f72829343"; - sha256 = "sha256-W4t5uTkiOVGGHZEqD5tGbEPhHbNZp5qnYYHDG8N70vQ="; + rev = "f48101c38db7e725d31591ec49896a2f525886e2"; + sha256 = "sha256-M9n09uEM4ee8FZYTsaAu+8E0YRxQAGBvylKDHv1dp5M="; }; nativeBuildInputs = [ just ]; diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-store/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/co/cosmic-store/Cargo.lock index 7d7e8ef1b9..a70925035b 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-store/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-store/Cargo.lock @@ -117,9 +117,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -149,7 +149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", - "bitflags 2.4.2", + "bitflags 2.5.0", "cc", "cesu8", "jni", @@ -321,7 +321,7 @@ dependencies = [ "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "slab", ] @@ -359,18 +359,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "parking", "polling 3.5.0", - "rustix 0.38.31", + "rustix 0.38.32", "slab", "tracing", "windows-sys 0.52.0", @@ -409,19 +409,19 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.31", + "rustix 0.38.32", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -430,13 +430,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.3.1", + "async-io 2.3.2", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.31", + "rustix 0.38.32", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -450,13 +450,13 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -482,7 +482,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.31", + "rustix 0.38.32", "tempfile", "windows-sys 0.48.0", ] @@ -493,7 +493,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7b2dbe9169059af0f821e811180fddc971fc210c776c133c7819ccd6e478db" dependencies = [ - "rustix 0.38.31", + "rustix 0.38.32", "tempfile", "windows-sys 0.52.0", ] @@ -554,9 +554,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "95d8e92cac0961e91dbd517496b00f7e9b92363dbe6d42c3198268323798860c" dependencies = [ "addr2line", "cc", @@ -617,7 +617,7 @@ dependencies = [ "packagemerge", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -628,9 +628,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -690,7 +690,7 @@ dependencies = [ "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "piper", "tracing", ] @@ -703,22 +703,22 @@ checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -749,10 +749,10 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "log", "polling 3.5.0", - "rustix 0.38.31", + "rustix 0.38.32", "slab", "thiserror", ] @@ -764,7 +764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop", - "rustix 0.38.31", + "rustix 0.38.32", "wayland-backend", "wayland-client", ] @@ -830,9 +830,9 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297" +checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" dependencies = [ "error-code", ] @@ -840,8 +840,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" dependencies = [ "objc", "objc-foundation", @@ -851,17 +850,16 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003f886bc4e2987729d10c1db3424e7f80809f3fc22dbc16c685738887cb37b8" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" dependencies = [ + "mime 0.1.0", "smithay-clipboard", ] [[package]] name = "clipboard_x11" version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4274ea815e013e0f9f04a2633423e14194e408a0576c943ce3d14ca56c50031c" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" dependencies = [ "thiserror", "x11rb", @@ -1026,7 +1024,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "atomicwrites 0.4.2", "cosmic-config-derive", @@ -1043,7 +1041,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "quote", "syn 1.0.109", @@ -1085,9 +1083,9 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.11.2" -source = "git+https://github.com/pop-os/cosmic-text.git#a53a0b3a8c085143470a9d26ac2c2911cc479033" +source = "git+https://github.com/pop-os/cosmic-text.git#b08676909f882f553ab574601b35b58276a52458" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "fontdb", "libm", "log", @@ -1107,15 +1105,17 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "almost", "cosmic-config", "csscolorparser", + "dirs 5.0.1", "lazy_static", "palette", "ron", "serde", + "thiserror", ] [[package]] @@ -1209,7 +1209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1223,7 +1223,7 @@ name = "d3d12" version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libloading 0.8.3", "winapi", ] @@ -1249,7 +1249,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1260,7 +1260,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1302,7 +1302,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1370,7 +1370,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1403,11 +1403,11 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.31", + "rustix 0.38.32", ] [[package]] @@ -1417,7 +1417,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.31", + "rustix 0.38.32", ] [[package]] @@ -1469,7 +1469,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1746,9 +1746,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd7f3ea17572640b606b35df42cfb6ecdf003704b062580e59918692190b73d" +checksum = "5b7f6040d337bd44434ab21fc6509154edf2cece88b23758d9d64654c4e7730b" [[package]] name = "fontconfig-parser" @@ -1800,7 +1800,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -1836,9 +1836,9 @@ dependencies = [ [[package]] name = "freedesktop-desktop-entry" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45157175a725e81f3f594382430b6b78af5f8f72db9bd51b94f0785f80fc6d29" +checksum = "287f89b1a3d88dd04d2b65dfec39f3c381efbcded7b736456039c4ee49d54b17" dependencies = [ "dirs 3.0.2", "gettext-rs", @@ -1951,9 +1951,9 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ "fastrand 2.0.1", "futures-core", @@ -1970,7 +1970,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -2165,7 +2165,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", @@ -2188,12 +2188,12 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-crate 2.0.2", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -2255,7 +2255,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "gpu-alloc-types", ] @@ -2265,7 +2265,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", ] [[package]] @@ -2287,7 +2287,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "gpu-descriptor-types", "hashbrown", ] @@ -2298,7 +2298,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", ] [[package]] @@ -2337,9 +2337,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" dependencies = [ "bytes", "fnv", @@ -2380,7 +2380,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "com", "libc", "libloading 0.8.3", @@ -2395,6 +2395,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.9" @@ -2543,7 +2549,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.52", + "syn 2.0.53", "unic-langid", ] @@ -2557,7 +2563,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -2586,7 +2592,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "iced_accessibility", "iced_core", @@ -2596,12 +2602,13 @@ dependencies = [ "iced_winit", "image", "thiserror", + "window_clipboard", ] [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "accesskit", "accesskit_winit", @@ -2610,7 +2617,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "bitflags 1.3.2", "log", @@ -2621,13 +2628,14 @@ dependencies = [ "smol_str", "thiserror", "web-time", + "window_clipboard", "xxhash-rust", ] [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "futures", "iced_core", @@ -2640,7 +2648,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2664,7 +2672,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2676,17 +2684,18 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "iced_core", "iced_futures", "thiserror", + "window_clipboard", ] [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "iced_core", "once_cell", @@ -2696,7 +2705,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "bytemuck", "cosmic-text", @@ -2713,7 +2722,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2732,7 +2741,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "iced_renderer", "iced_runtime", @@ -2746,7 +2755,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "iced_graphics", "iced_runtime", @@ -3062,10 +3071,11 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#2b23005fbff5a3d7e218a867e1aadb491abeac55" +source = "git+https://github.com/pop-os/libcosmic.git#1575aa267cc5cd69ac65cfbe09fc7c4212d18e3a" dependencies = [ "apply", "ashpd 0.7.0", + "chrono", "cosmic-config", "cosmic-theme", "css-color", @@ -3084,7 +3094,7 @@ dependencies = [ "iced_widget", "iced_winit", "lazy_static", - "mime", + "mime 0.3.17", "nix 0.27.1", "palette", "rfd", @@ -3157,7 +3167,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] @@ -3168,7 +3178,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] @@ -3329,7 +3339,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -3338,6 +3348,14 @@ dependencies = [ "paste", ] +[[package]] +name = "mime" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" +dependencies = [ + "smithay-clipboard", +] + [[package]] name = "mime" version = "0.3.17" @@ -3385,7 +3403,7 @@ source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b802 dependencies = [ "arrayvec", "bit-set", - "bitflags 2.4.2", + "bitflags 2.5.0", "codespan-reporting", "hexf-parse", "indexmap", @@ -3422,7 +3440,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "jni-sys", "log", "ndk-sys", @@ -3464,7 +3482,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "libc", ] @@ -3485,7 +3503,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -3602,7 +3620,7 @@ dependencies = [ "proc-macro-crate 2.0.2", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3703,7 +3721,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -3720,7 +3738,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3793,11 +3811,11 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3848,7 +3866,7 @@ checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -3959,7 +3977,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -4044,7 +4062,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.31", + "rustix 0.38.32", "tracing", "windows-sys 0.52.0", ] @@ -4107,9 +4125,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -4229,9 +4247,9 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "read-fonts" -version = "0.15.6" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ea23eedb4d938031b6d4343222444608727a6aa68ec355e13588d9947ffe92" +checksum = "81c524658d3b77930a391f559756d91dbe829ab6cf4687083f615d395df99722" dependencies = [ "font-types", ] @@ -4311,9 +4329,9 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "reqwest" -version = "0.11.25" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eea5a9eb898d3783f17c6407670e3592fd174cb81a10e51d4c37f49450b9946" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64", "bytes", @@ -4328,7 +4346,7 @@ dependencies = [ "ipnet", "js-sys", "log", - "mime", + "mime 0.3.17", "native-tls", "once_cell", "percent-encoding", @@ -4412,7 +4430,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64", - "bitflags 2.4.2", + "bitflags 2.5.0", "serde", "serde_derive", ] @@ -4443,7 +4461,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.52", + "syn 2.0.53", "walkdir", ] @@ -4495,11 +4513,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys 0.4.13", @@ -4527,7 +4545,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "bytemuck", "libm", "smallvec", @@ -4642,7 +4660,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -4664,7 +4682,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -4690,9 +4708,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.32" +version = "0.9.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" +checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" dependencies = [ "indexmap", "itoa", @@ -4785,9 +4803,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" @@ -4795,14 +4813,14 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "calloop", "calloop-wayland-source", "cursor-icon", "libc", "log", "memmap2", - "rustix 0.38.31", + "rustix 0.38.32", "thiserror", "wayland-backend", "wayland-client", @@ -4816,9 +4834,8 @@ dependencies = [ [[package]] name = "smithay-clipboard" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +version = "0.8.0" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-mime-types#cc0101c1f9ccc937a413bd3af3c0f6217f27e935" dependencies = [ "libc", "smithay-client-toolkit", @@ -4873,7 +4890,7 @@ dependencies = [ "objc", "raw-window-handle 0.6.0", "redox_syscall 0.4.1", - "rustix 0.38.31", + "rustix 0.38.32", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -4899,7 +4916,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", ] [[package]] @@ -4935,7 +4952,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -4960,9 +4977,9 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06ff4664af8923625604261c645f5c4cc610cc83c84bec74b50d76237089de7" +checksum = "9af636fb90d39858650cae1088a37e2862dab4e874a0bb49d6dfb5b2dacf0e24" dependencies = [ "read-fonts", "yazi", @@ -4982,9 +4999,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ "proc-macro2", "quote", @@ -5008,20 +5025,20 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.6.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags 2.4.2", + "bitflags 1.3.2", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.6.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ "core-foundation-sys", "libc", @@ -5029,12 +5046,12 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck", + "heck 0.5.0", "pkg-config", "toml 0.8.2", "version-compare", @@ -5059,9 +5076,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" @@ -5071,7 +5088,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand 2.0.1", - "rustix 0.38.31", + "rustix 0.38.32", "windows-sys 0.52.0", ] @@ -5086,22 +5103,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -5214,7 +5231,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -5320,7 +5337,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] @@ -5466,9 +5483,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "url" @@ -5551,9 +5568,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -5613,7 +5630,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", "wasm-bindgen-shared", ] @@ -5647,7 +5664,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5681,7 +5698,7 @@ checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.31", + "rustix 0.38.32", "scoped-tls", "smallvec", "wayland-sys", @@ -5693,8 +5710,8 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ - "bitflags 2.4.2", - "rustix 0.38.31", + "bitflags 2.5.0", + "rustix 0.38.32", "wayland-backend", "wayland-scanner", ] @@ -5705,7 +5722,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cursor-icon", "wayland-backend", ] @@ -5716,7 +5733,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" dependencies = [ - "rustix 0.38.31", + "rustix 0.38.32", "wayland-client", "xcursor", ] @@ -5727,7 +5744,7 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -5739,7 +5756,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -5752,7 +5769,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -5839,7 +5856,7 @@ source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b802 dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg_aliases 0.1.1", "codespan-reporting", "indexmap", @@ -5866,7 +5883,7 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags 2.4.2", + "bitflags 2.5.0", "block", "cfg_aliases 0.1.1", "core-graphics-types", @@ -5905,7 +5922,7 @@ name = "wgpu-types" version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "js-sys", "web-sys", ] @@ -5950,13 +5967,13 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d692d46038c433f9daee7ad8757e002a4248c20b0a3fbc991d99521d3bcb6d" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" dependencies = [ "clipboard-win", "clipboard_macos", "clipboard_wayland", "clipboard_x11", + "mime 0.1.0", "raw-window-handle 0.6.0", "thiserror", ] @@ -6219,7 +6236,7 @@ dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.4.2", + "bitflags 2.5.0", "bytemuck", "calloop", "cfg_aliases 0.1.1", @@ -6239,7 +6256,7 @@ dependencies = [ "percent-encoding", "raw-window-handle 0.6.0", "redox_syscall 0.3.5", - "rustix 0.38.31", + "rustix 0.38.32", "sctk-adwaita", "smithay-client-toolkit", "smol_str", @@ -6299,7 +6316,7 @@ dependencies = [ "libc", "libloading 0.8.3", "once_cell", - "rustix 0.38.31", + "rustix 0.38.32", "x11rb-protocol", ] @@ -6337,7 +6354,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "dlib", "log", "once_cell", @@ -6473,7 +6490,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.53", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-store/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-store/package.nix index 3fcb76c178..1a89a00a23 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-store/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-store/package.nix @@ -5,12 +5,12 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-store"; - version = "unstable-2024-03-13"; + version = "unstable-2024-04-14"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; - rev = "df014ea82ae0465470f5d237bfe71d2c085d29a0"; - hash = "sha256-1Sp6/qVONK+O5FLEcsu45eEBNaVbJLptt+ByXOZYwpo="; + rev = "b1bbeaa6e6bdc85c84d329ae01b69d72716411fc"; + hash = "sha256-KHYcQnaRFoYzl/00mFkS6MJS7Th0T0fQhxYUErjzGCo="; fetchSubmodules = true; }; @@ -20,10 +20,12 @@ rustPlatform.buildRustPackage rec { "accesskit-0.12.2" = "sha256-ksaYMGT/oug7isQY8/1WD97XDUsX2ShBdabUzxWffYw="; "appstream-0.2.2" = "sha256-Qb/zzZJ2sM97nGVtp8amecTlwuaDrx1cacDcZOwhUm8="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "cosmic-config-0.1.0" = "sha256-J6c2pRCpyfCFMmzwJ4RdEghSaFDshDtZL6DteAiaq1o="; - "cosmic-text-0.11.2" = "sha256-6mvGyMCFC/tSIiDgDX+zuDUi15S9dXI6Dc6pj36hIJM="; + "clipboard_macos-0.1.0" = "sha256-PEH+aCpjDCEIj8s39nIeWxb7qu3u9IfriGqf0pYObMk="; + "cosmic-config-0.1.0" = "sha256-Ps2QIzlwgW8ENB+uD6cOjCkjlZvmWspazsXNxDFCu7g="; + "cosmic-text-0.11.2" = "sha256-K9cZeClr1zz4LanJS0WPEpxAplQrXfCjFKrSn5n4rDA="; "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "smithay-clipboard-0.8.0" = "sha256-OZOGbdzkgRIeDFrAENXE7g62eQTs60Je6lYVr0WudlE="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; diff --git a/third_party/nixpkgs/pkgs/servers/kanidm/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/co/cosmic-tasks/Cargo.lock similarity index 56% rename from third_party/nixpkgs/pkgs/servers/kanidm/Cargo.lock rename to third_party/nixpkgs/pkgs/by-name/co/cosmic-tasks/Cargo.lock index 29d869effc..c50bb5d678 100644 --- a/third_party/nixpkgs/pkgs/servers/kanidm/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-tasks/Cargo.lock @@ -2,6 +2,91 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "ab_glyph" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e08104bebc65a46f8bc7aa733d39ea6874bfa7156f41a46b805785e3af1587d" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accesskit" +version = "0.12.2" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" + +[[package]] +name = "accesskit_consumer" +version = "0.17.0" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_macos" +version = "0.11.0" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" +dependencies = [ + "accesskit", + "accesskit_consumer", + "icrate 0.1.0", + "objc2 0.5.0", + "once_cell", +] + +[[package]] +name = "accesskit_unix" +version = "0.7.1" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" +dependencies = [ + "accesskit", + "accesskit_consumer", + "async-channel", + "async-executor", + "async-task", + "atspi", + "futures-lite 1.13.0", + "futures-util", + "once_cell", + "serde", + "zbus", +] + +[[package]] +name = "accesskit_windows" +version = "0.16.0" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" +dependencies = [ + "accesskit", + "accesskit_consumer", + "once_cell", + "paste", + "static_assertions", + "windows 0.48.0", +] + +[[package]] +name = "accesskit_winit" +version = "0.18.1" +source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#5f9b61c8264000d001499c902562422e13efa7a8" +dependencies = [ + "accesskit", + "accesskit_macos", + "accesskit_unix", + "accesskit_windows", + "raw-window-handle 0.6.0", + "winit", +] + [[package]] name = "addr2line" version = "0.21.0" @@ -19,44 +104,71 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", "once_cell", - "serde", "version_check", "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + [[package]] name = "allocator-api2" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.5.0", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -72,17 +184,11 @@ dependencies = [ "libc", ] -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -128,292 +234,362 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] -name = "anymap2" -version = "0.13.0" +name = "apply" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] [[package]] name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac22eda5891cc086690cb6fa10121c0390de0e3b04eb269f2d766b00d3f2d81" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "once_cell", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus", +] + +[[package]] +name = "ashpd" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01992ad7774250d5b7fe214e2676cb99bf92564436d8135ab44fe815e71769a9" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +dependencies = [ + "concurrent-queue", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee" +dependencies = [ + "async-lock 3.3.0", + "async-task", + "concurrent-queue", + "fastrand 2.0.2", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" - -[[package]] -name = "argon2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "base64ct", - "blake2", - "cpufeatures", - "password-hash", + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", ] [[package]] -name = "asn1-rs" -version = "0.3.1" +name = "async-io" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time", + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", ] [[package]] -name = "asn1-rs-derive" -version = "0.1.0" +name = "async-io" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.6.0", + "rustix 0.38.32", + "slab", + "tracing", + "windows-sys 0.52.0", ] [[package]] -name = "asn1-rs-impl" -version = "0.1.0" +name = "async-lock" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "event-listener 2.5.3", ] [[package]] -name = "assert_cmd" -version = "2.0.13" +name = "async-lock" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ad3f3a942eee60335ab4342358c161ee296829e0d16ff42fc1d6cb07815467" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "async-compression" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" -dependencies = [ - "flate2", - "futures-core", - "memchr", + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", "pin-project-lite", - "tokio", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.32", + "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] -name = "async-stream" -version = "0.3.5" +name = "async-signal" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-stream-impl", + "async-io 2.3.2", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", "futures-core", - "pin-project-lite", + "futures-io", + "rustix 0.38.32", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", ] [[package]] -name = "async-stream-impl" -version = "0.3.5" +name = "async-task" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] -name = "authenticator-ctap2-2021" -version = "0.3.2-dev.1" +name = "atk-sys" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06c690e5e2800f70c0cf8773a9fe7680d66e719dae9b4cabedd13ef4885d056" +checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", - "cfg-if", - "core-foundation", - "devd-rs", + "glib-sys", + "gobject-sys", "libc", - "libudev", - "log", - "memoffset", - "nom", - "openssl", - "openssl-sys", - "rand", - "runloop", + "system-deps", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" +dependencies = [ + "rustix 0.38.32", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "atomicwrites" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7b2dbe9169059af0f821e811180fddc971fc210c776c133c7819ccd6e478db" +dependencies = [ + "rustix 0.38.32", + "tempfile", + "windows-sys 0.52.0", +] + +[[package]] +name = "atspi" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" +dependencies = [ + "atspi-common", + "atspi-connection", + "atspi-proxies", +] + +[[package]] +name = "atspi-common" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92af95f966d2431f962bc632c2e68eda7777330158bf640c4af4249349b2cdf5" +dependencies = [ + "enumflags2", "serde", - "serde_bytes", - "serde_cbor", - "serde_json", - "sha2 0.10.8", - "winapi", + "static_assertions", + "zbus", + "zbus_names", + "zvariant", +] + +[[package]] +name = "atspi-connection" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" +dependencies = [ + "atspi-common", + "atspi-proxies", + "futures-lite 1.13.0", + "zbus", +] + +[[package]] +name = "atspi-proxies" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" +dependencies = [ + "atspi-common", + "serde", + "zbus", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core", - "axum-macros", - "bitflags 1.3.2", - "bytes", - "futures-util", - "headers", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "multer", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-auth" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe42cdd03ddd244e9e2f5ceb7c6e1d6a123db07cdb8570250392459ef635a016" -dependencies = [ - "async-trait", - "axum-core", - "base64 0.13.1", - "http", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-csp" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4faf3873ea8d6828e5705070e10fdf4f61420d22523835a2a140ae4b2e8d2526" -dependencies = [ - "axum", - "http", - "regex", - "tokio", -] - -[[package]] -name = "axum-macros" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "axum-server" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447f28c85900215cc1bea282f32d4a2f22d55c5a300afdfbc661c8d6a632e063" -dependencies = [ - "bytes", - "futures-util", - "http", - "http-body", - "hyper", - "openssl", - "pin-project-lite", - "tokio", - "tokio-openssl", - "tower-service", -] +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -424,78 +600,12 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base32" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "base64urlsafedata" -version = "0.1.3" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=5f4db4172f8e22aedc68c282d177e98db2b1892f#5f4db4172f8e22aedc68c282d177e98db2b1892f" -dependencies = [ - "base64 0.21.7", - "paste 1.0.14", - "serde", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.4.2", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "log", - "prettyplease 0.2.16", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.48", - "which", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -512,10 +622,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] -name = "bitfield" -version = "0.14.0" +name = "bit_field" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" [[package]] name = "bitflags" @@ -525,30 +635,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" - -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ - "digest 0.10.7", + "serde", ] [[package]] -name = "block-buffer" -version = "0.7.3" +name = "block" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-buffer" @@ -556,67 +654,79 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] -name = "block-padding" -version = "0.1.5" +name = "block-sys" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" dependencies = [ - "byte-tools", + "objc-sys", ] [[package]] -name = "boolinator" -version = "2.4.0" +name = "block2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9" - -[[package]] -name = "bstr" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" dependencies = [ - "memchr", - "regex-automata 0.4.5", - "serde", + "block-sys", + "objc2 0.4.1", ] [[package]] -name = "btoi" -version = "0.4.3" +name = "block2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" +checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" dependencies = [ - "num-traits", + "block-sys", + "objc2 0.5.0", +] + +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel", + "async-lock 3.3.0", + "async-task", + "fastrand 2.0.2", + "futures-io", + "futures-lite 2.3.0", + "piper", + "tracing", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "bytecount" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.2" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea31d69bda4949c1c1562c1e6f042a1caefac98cdc8a298260a2ff41c1e2d42b" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] [[package]] name = "byteorder" @@ -626,32 +736,96 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] -name = "cast" +name = "cairo-sys-rs" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.5.0", + "log", + "polling 3.6.0", + "rustix 0.38.32", + "slab", + "thiserror", +] + +[[package]] +name = "calloop" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +dependencies = [ + "bitflags 2.5.0", + "log", + "polling 3.6.0", + "rustix 0.38.32", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop 0.12.4", + "rustix 0.38.32", + "wayland-backend", + "wayland-client 0.31.2", +] + +[[package]] +name = "calloop-wayland-source" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" +dependencies = [ + "calloop 0.13.0", + "rustix 0.38.32", + "wayland-backend", + "wayland-client 0.31.2", +] [[package]] name = "cc" -version = "1.0.83" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" dependencies = [ + "jobserver", "libc", ] [[package]] -name = "cexpr" -version = "0.6.0" +name = "cesu8" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ - "nom", + "smallvec", + "target-lexicon", ] [[package]] @@ -661,16 +835,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "checked_int_cast" -version = "1.0.0" +name = "cfg_aliases" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" [[package]] name = "chrono" -version = "0.4.33" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -678,102 +858,112 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] -name = "ciborium" -version = "0.2.2" +name = "cli-clipboard" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +checksum = "04087c1d4a2aa259784a563932aee09cbb0869d490775e051096174b070f3e3d" dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", + "clipboard-win 4.5.0", + "objc", + "objc-foundation", + "objc_id", + "wl-clipboard-rs", + "x11-clipboard", ] [[package]] -name = "ciborium-io" -version = "0.2.2" +name = "clipboard-win" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" - -[[package]] -name = "ciborium-ll" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" dependencies = [ - "ciborium-io", - "half 2.3.1", + "error-code 2.3.1", + "str-buf", + "winapi", ] [[package]] -name = "clang-sys" -version = "1.7.0" +name = "clipboard-win" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" dependencies = [ - "glob", + "error-code 3.2.0", +] + +[[package]] +name = "clipboard_macos" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +dependencies = [ + "objc", + "objc-foundation", + "objc_id", +] + +[[package]] +name = "clipboard_wayland" +version = "0.2.2" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +dependencies = [ + "dnd", + "mime", + "smithay-clipboard", +] + +[[package]] +name = "clipboard_x11" +version = "0.4.2" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +dependencies = [ + "thiserror", + "x11rb 0.13.0", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", "libc", - "libloading", + "objc", ] [[package]] -name = "clap" -version = "4.4.18" +name = "cocoa-foundation" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ - "clap_builder", - "clap_derive", + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", ] [[package]] -name = "clap_builder" -version = "4.4.18" +name = "codespan-reporting" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", + "termcolor", + "unicode-width", ] -[[package]] -name = "clap_complete" -version = "4.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb745187d7f4d76267b37485a65e0149edd0e91a4cfcdd3f27524ad86cee9f3" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "clru" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807" - [[package]] name = "color_quant" version = "1.1.0" @@ -787,117 +977,73 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] -name = "compact_jwt" -version = "0.2.10" +name = "com" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aa76ef19968577838a34d02848136bb9b6bdbfd7675fb968fe9c931bc434b33" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" dependencies = [ - "base64 0.13.1", - "base64urlsafedata", - "hex", - "openssl", - "serde", - "serde_json", - "tracing", - "url", - "uuid", + "com_macros", ] [[package]] -name = "compact_jwt" -version = "0.3.3" +name = "com_macros" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c88e50516e010f137593b9e80dab437bc82c7c7bb4c5bf5dd042e30b0807dd7" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" dependencies = [ - "base64 0.21.7", - "base64urlsafedata", - "hex", - "kanidm-hsm-crypto", - "openssl", - "serde", - "serde_json", - "tracing", - "url", - "uuid", + "com_macros_support", + "proc-macro2", + "syn 1.0.109", ] [[package]] -name = "concread" -version = "0.4.4" +name = "com_macros_support" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be4dc68bd9c37bcbd4670a644cc47494636d3e345d8d3b6db8bcd8ea65048c9" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ - "ahash 0.7.7", - "crossbeam-epoch", - "crossbeam-queue", "crossbeam-utils", - "lru 0.7.8", - "smallvec", - "sptr", - "tokio", - "tracing", ] [[package]] -name = "console" -version = "0.15.8" +name = "const-random" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.52.0", + "const-random-macro", ] [[package]] -name = "console_error_panic_hook" -version = "0.1.7" +name = "const-random-macro" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "cookie" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" -dependencies = [ - "percent-encoding", - "time", - "version_check", -] - -[[package]] -name = "cookie" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" -dependencies = [ - "percent-encoding", - "time", - "version_check", -] - -[[package]] -name = "cookie_store" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" -dependencies = [ - "cookie 0.17.0", - "idna 0.3.0", - "log", - "publicsuffix", - "serde", - "serde_derive", - "serde_json", - "time", - "url", + "getrandom", + "once_cell", + "tiny-keccak", ] [[package]] @@ -916,6 +1062,121 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "atomicwrites 0.4.2", + "cosmic-config-derive", + "dirs", + "iced_futures", + "known-folders", + "notify", + "once_cell", + "ron", + "serde", + "xdg", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-tasks" +version = "0.1.0" +dependencies = [ + "chrono", + "cli-clipboard", + "dirs", + "done_core", + "emojis", + "env_logger", + "fork", + "i18n-embed", + "i18n-embed-fl", + "libcosmic", + "log", + "once_cell", + "open", + "paste", + "rust-embed", + "serde", + "slotmap", + "smol_str", + "tokio", + "tracing", + "vergen", +] + +[[package]] +name = "cosmic-text" +version = "0.11.2" +source = "git+https://github.com/pop-os/cosmic-text.git#ff5501d9a36e51c50d908413caf7632d8f7533b7" +dependencies = [ + "bitflags 2.5.0", + "fontdb", + "libm", + "log", + "rangemap", + "rustc-hash", + "rustybuzz", + "self_cell 1.0.3", + "swash", + "sys-locale", + "ttf-parser", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "dirs", + "lazy_static", + "palette", + "ron", + "serde", + "thiserror", +] + [[package]] name = "cpufeatures" version = "0.2.12" @@ -927,78 +1188,18 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] -[[package]] -name = "criterion" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast", - "ciborium", - "clap", - "criterion-plot", - "is-terminal", - "itertools 0.10.5", - "num-traits", - "once_cell", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] - -[[package]] -name = "cron" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff76b51e4c068c52bfd2866e1567bee7c567ae8f24ada09fd4307019e25eab7" -dependencies = [ - "chrono", - "nom", - "once_cell", -] - -[[package]] -name = "crossbeam" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ "crossbeam-utils", ] @@ -1022,15 +1223,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.19" @@ -1049,148 +1241,105 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.7", + "generic-array", "typenum", ] [[package]] -name = "csv" -version = "1.3.0" +name = "css-color" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +checksum = "42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a" + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" dependencies = [ - "csv-core", - "itoa", - "ryu", + "phf", "serde", ] [[package]] -name = "csv-core" -version = "0.1.11" +name = "ctor" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ - "memchr", + "quote", + "syn 2.0.58", ] [[package]] -name = "daemon" -version = "1.1.0-rc.16" +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "d3d12" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ - "clap", - "clap_complete", - "fs2", - "futures", - "kanidm_build_profiles", - "kanidm_lib_file_permissions", - "kanidm_proto", - "kanidm_utils_users", - "kanidmd_core", - "opentelemetry", - "opentelemetry_api", - "reqwest", - "sd-notify", - "serde", - "serde_json", - "sketching", - "tikv-jemallocator", - "tokio", - "tokio-util", - "toml", - "tracing", - "whoami", + "bitflags 2.5.0", + "libloading 0.8.3", + "winapi", ] [[package]] name = "darling" -version = "0.14.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", -] - -[[package]] -name = "darling" -version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8" -dependencies = [ - "darling_core 0.20.5", - "darling_macro 0.20.5", + "darling_core", + "darling_macro", ] [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ - "darling_core 0.14.4", + "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] -name = "darling_macro" -version = "0.20.5" +name = "dashmap" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "darling_core 0.20.5", - "quote", - "syn 2.0.48", + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", ] [[package]] -name = "data-encoding" -version = "2.5.0" +name = "data-url" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "der-parser" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-bigint", - "num-traits", - "rusticata-macros", -] +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "deranged" @@ -1199,75 +1348,85 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", - "serde", ] [[package]] -name = "derive_builder" -version = "0.12.0" +name = "derivative" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling 0.14.4", "proc-macro2", "quote", "syn 1.0.109", ] [[package]] -name = "derive_builder_macro" -version = "0.12.0" +name = "derive-new" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" dependencies = [ - "derive_builder_core", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] -name = "devd-rs" -version = "0.3.6" +name = "derive_setters" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9313f104b590510b46fc01c0a324fc76505c13871454d3c48490468d04c8d395" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" dependencies = [ - "libc", - "nom", + "darling", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] -name = "dialoguer" -version = "0.10.4" +name = "diesel" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" +checksum = "03fc05c17098f21b89bc7d98fe1dd3cce2c11c2ad8e145f2a44fe08ed28eb559" dependencies = [ - "console", - "shell-words", - "tempfile", - "zeroize", + "chrono", + "diesel_derives", + "libsqlite3-sys", + "r2d2", + "time", ] [[package]] -name = "difflib" -version = "0.4.0" +name = "diesel_derives" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" +checksum = "5d02eecb814ae714ffe61ddc2db2dd03e6c49a42e269b5001355500d431cce0c" +dependencies = [ + "diesel_table_macro_syntax", + "proc-macro2", + "quote", + "syn 2.0.58", +] [[package]] -name = "digest" -version = "0.8.1" +name = "diesel_migrations" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" dependencies = [ - "generic-array 0.12.4", + "diesel", + "migrations_internals", + "migrations_macros", +] + +[[package]] +name = "diesel_table_macro_syntax" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +dependencies = [ + "syn 2.0.58", ] [[package]] @@ -1276,18 +1435,8 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "crypto-common", - "subtle", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", ] [[package]] @@ -1296,18 +1445,7 @@ version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys 0.4.1", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", + "dirs-sys", ] [[package]] @@ -1322,6 +1460,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + [[package]] name = "displaydoc" version = "0.2.4" @@ -1330,86 +1474,162 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] -name = "doc-comment" -version = "0.3.3" +name = "dlib" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.3", +] [[package]] -name = "dunce" -version = "1.0.4" +name = "dlv-list" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] [[package]] -name = "dyn-clone" -version = "1.0.16" +name = "dnd" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +dependencies = [ + "bitflags 2.5.0", + "mime", + "raw-window-handle 0.6.0", + "smithay-client-toolkit 0.18.0", + "smithay-clipboard", +] + +[[package]] +name = "done_core" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "chrono", + "diesel", + "diesel_migrations", + "emojis", + "futures", + "libset", + "serde", + "serde_json", + "strum", + "strum_macros", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "drm" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "rustix 0.38.32", +] + +[[package]] +name = "drm-ffi" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" +dependencies = [ + "drm-sys", + "rustix 0.38.32", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" +dependencies = [ + "libc", + "linux-raw-sys 0.6.4", +] [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] -name = "encode_unicode" -version = "0.3.6" +name = "emojis" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "9f619a926616ae7149a0d82610b051134a0d6c4ae2962d990c06c847a445c5d9" dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum-iterator" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", + "phf", ] [[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", + "serde", ] [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", ] [[package]] @@ -1429,111 +1649,143 @@ dependencies = [ ] [[package]] -name = "escargot" -version = "0.5.8" +name = "error-code" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "768064bd3a0e2bedcba91dc87ace90beea91acc41b6a01a3ca8e9aa8827461bf" +checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" dependencies = [ - "log", - "once_cell", - "serde", - "serde_json", + "libc", + "str-buf", ] [[package]] -name = "fake-simd" -version = "0.1.2" +name = "error-code" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] -name = "fallible-iterator" -version = "0.2.0" +name = "etagere" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fallible_collections" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" +checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e" dependencies = [ - "hashbrown 0.13.2", + "euclid", + "svg_fmt", ] [[package]] -name = "fancy-regex" -version = "0.11.0" +name = "euclid" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" dependencies = [ - "bit-set", - "regex", + "num-traits", ] [[package]] -name = "fantoccini" -version = "0.19.3" +name = "event-listener" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f0fbe245d714b596ba5802b46f937f5ce68dcae0f32f9a70b5c3b04d3c6f64" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" dependencies = [ - "base64 0.13.1", - "cookie 0.16.2", - "futures-core", - "futures-util", - "http", - "hyper", - "hyper-tls", - "mime", - "serde", - "serde_json", - "time", - "tokio", - "url", - "webdriver", + "concurrent-queue", + "parking", + "pin-project-lite", ] [[package]] -name = "faster-hex" -version = "0.9.0" +name = "event-listener" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ - "serde", + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +dependencies = [ + "event-listener 5.3.0", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", ] [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] -name = "fernet" -version = "0.2.1" +name = "fdeflate" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3364d69f691f3903b1a71605fa04f40a7c2d259f0f0512347e36d19a63debf1f" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ - "base64 0.21.7", - "byteorder", - "getrandom", - "openssl", - "zeroize", -] - -[[package]] -name = "file-id" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13be71e6ca82e91bc0cb862bebaac0b2d1924a5a1d970c822b2f98b63fda8c3" -dependencies = [ - "winapi-util", + "simd-adler32", ] [[package]] @@ -1548,6 +1800,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml 0.5.11", +] + [[package]] name = "fixedbitset" version = "0.4.2" @@ -1564,6 +1825,71 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" + +[[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] +name = "fluent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell 0.10.3", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +dependencies = [ + "thiserror", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1571,19 +1897,72 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "foreign-types" -version = "0.3.2" +name = "font-types" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +checksum = "bd6784a76a9c2b136ea3b8462391e9328252e938eb706eb44d752723b4c3a533" dependencies = [ + "bytemuck", +] + +[[package]] +name = "fontconfig-parser" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2", + "slotmap", + "tinyvec", + "ttf-parser", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", "foreign-types-shared", ] [[package]] -name = "foreign-types-shared" -version = "0.1.1" +name = "foreign-types-macros" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "fork" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e74d3423998a57e9d906e49252fb79eb4a04d5cdfe188fb1b7ff9fc076a8ed" +dependencies = [ + "libc", +] [[package]] name = "form_urlencoded" @@ -1596,22 +1975,25 @@ dependencies = [ [[package]] name = "fraction" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +checksum = "59a78dd758a47a7305478e0e054f9fde4e983b9f9eccda162bf7ca03b79e9d40" dependencies = [ "lazy_static", "num", ] [[package]] -name = "fs2" -version = "0.4.3" +name = "freedesktop-icons" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +checksum = "a8ef34245e0540c9a3ce7a28340b98d2c12b75da0d446da4e8224923fcaa0c16" dependencies = [ - "libc", - "winapi", + "dirs", + "once_cell", + "rust-ini", + "thiserror", + "xdg", ] [[package]] @@ -1648,17 +2030,6 @@ dependencies = [ "futures-sink", ] -[[package]] -name = "futures-concurrency" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "113411b30b3a4fd9aba3eb9654f436976b71bc7f709318aeae7f8e90f74a71d6" -dependencies = [ - "async-trait", - "futures-core", - "pin-project", -] - [[package]] name = "futures-core" version = "0.3.30" @@ -1674,6 +2045,7 @@ dependencies = [ "futures-core", "futures-task", "futures-util", + "num_cpus", ] [[package]] @@ -1682,6 +2054,34 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.0.2", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" version = "0.3.30" @@ -1690,7 +2090,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1724,12 +2124,33 @@ dependencies = [ ] [[package]] -name = "generic-array" -version = "0.12.4" +name = "gdk-pixbuf-sys" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ - "typenum", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", ] [[package]] @@ -1742,6 +2163,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "gethostname" version = "0.4.3" @@ -1754,15 +2185,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -1775,6 +2204,16 @@ dependencies = [ "weezl", ] +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + [[package]] name = "gimli" version = "0.28.1" @@ -1782,759 +2221,207 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] -name = "gix" -version = "0.53.1" +name = "gio-sys" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a8c9f9452078f474fecd2880de84819b8c77224ab62273275b646bf785f906" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ - "gix-actor", - "gix-commitgraph", - "gix-config", - "gix-date", - "gix-diff", - "gix-discover", - "gix-features", - "gix-fs", - "gix-glob", - "gix-hash", - "gix-hashtable", - "gix-lock", - "gix-macros", - "gix-object", - "gix-odb", - "gix-pack", - "gix-path", - "gix-ref", - "gix-refspec", - "gix-revision", - "gix-revwalk", - "gix-sec", - "gix-tempfile", - "gix-trace", - "gix-traverse", - "gix-url", - "gix-utils", - "gix-validate", - "once_cell", - "parking_lot 0.12.1", - "smallvec", - "thiserror", - "unicode-normalization", -] - -[[package]] -name = "gix-actor" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8c6778cc03bca978b2575a03e04e5ba6f430a9dd9b0f1259f0a8a9a5e5cc66" -dependencies = [ - "bstr", - "btoi", - "gix-date", - "itoa", - "thiserror", - "winnow", -] - -[[package]] -name = "gix-chunk" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003ec6deacf68076a0c157271a127e0bb2c031c1a41f7168cbe5d248d9b85c78" -dependencies = [ - "thiserror", -] - -[[package]] -name = "gix-commitgraph" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4676ede3a7d37e7028e2889830349a6aca22efc1d2f2dd9fa3351c1a8ddb0c6a" -dependencies = [ - "bstr", - "gix-chunk", - "gix-features", - "gix-hash", - "memmap2", - "thiserror", -] - -[[package]] -name = "gix-config" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1108c4ac88248dd25cc8ab0d0dae796e619fb72d92f88e30e00b29d61bb93cc4" -dependencies = [ - "bstr", - "gix-config-value", - "gix-features", - "gix-glob", - "gix-path", - "gix-ref", - "gix-sec", - "memchr", - "once_cell", - "smallvec", - "thiserror", - "unicode-bom", - "winnow", -] - -[[package]] -name = "gix-config-value" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e7bfb37a46ed0b8468db37a6d8a0a61d56bdbe4603ae492cb322e5f3958" -dependencies = [ - "bitflags 2.4.2", - "bstr", - "gix-path", + "glib-sys", + "gobject-sys", "libc", - "thiserror", + "system-deps", + "winapi", ] [[package]] -name = "gix-date" -version = "0.8.3" +name = "gl_generator" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7f3dfb72bebe3449b5e642be64e3c6ccbe9821c8b8f19f487cf5bfbbf4067e" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" dependencies = [ - "bstr", - "itoa", - "thiserror", - "time", + "khronos_api", + "log", + "xml-rs", ] [[package]] -name = "gix-diff" -version = "0.35.0" +name = "glam" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45e342d148373bd9070d557e6fb1280aeae29a3e05e32506682d027278501eb" -dependencies = [ - "gix-hash", - "gix-object", - "thiserror", -] +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" [[package]] -name = "gix-discover" -version = "0.24.0" +name = "glib-sys" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4cacda5ee9dd1b38b0e2506834e40e66c08cf050ef55c344334c76745f277b" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ - "bstr", - "dunce", - "gix-hash", - "gix-path", - "gix-ref", - "gix-sec", - "thiserror", -] - -[[package]] -name = "gix-features" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f414c99e1a7abc69b21f3225a6539d203b0513f1d1d448607c4ea81cdcf9ee59" -dependencies = [ - "crc32fast", - "flate2", - "gix-hash", - "gix-trace", "libc", - "once_cell", - "prodash", - "sha1_smol", - "thiserror", - "walkdir", + "system-deps", ] [[package]] -name = "gix-fs" +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "glyphon" +version = "0.5.0" +source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gobject-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gpu-alloc" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "404795da3d4c660c9ab6c3b2ad76d459636d1e1e4b37b0c7ff68eee898c298d4" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "gix-features", + "bitflags 2.5.0", + "gpu-alloc-types", ] [[package]] -name = "gix-glob" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ac79c444193b0660fe0c0925d338bd338bd643e32138784dccfb12c628b892" -dependencies = [ - "bitflags 2.4.2", - "bstr", - "gix-features", - "gix-path", -] - -[[package]] -name = "gix-hash" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8cf8c2266f63e582b7eb206799b63aa5fa68ee510ad349f637dfe2d0653de0" -dependencies = [ - "faster-hex", - "thiserror", -] - -[[package]] -name = "gix-hashtable" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb61880816d7ec4f0b20606b498147d480860ddd9133ba542628df2f548d3ca" -dependencies = [ - "gix-hash", - "hashbrown 0.14.3", - "parking_lot 0.12.1", -] - -[[package]] -name = "gix-lock" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1568c3d90594c60d52670f325f5db88c2d572e85c8dd45fabc23d91cadb0fd52" -dependencies = [ - "gix-tempfile", - "gix-utils", - "thiserror", -] - -[[package]] -name = "gix-macros" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75e7ab728059f595f6ddc1ad8771b8d6a231971ae493d9d5948ecad366ee8bb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "gix-object" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5528d5b2c984044d547e696e44a8c45fa122e83cd8c2ac1da69bd474336be8" -dependencies = [ - "bstr", - "btoi", - "gix-actor", - "gix-date", - "gix-features", - "gix-hash", - "gix-validate", - "itoa", - "smallvec", - "thiserror", - "winnow", -] - -[[package]] -name = "gix-odb" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0446eca295459deb3d6dd6ed7d44a631479f1b7381d8087166605c7a9f717c6" -dependencies = [ - "arc-swap", - "gix-date", - "gix-features", - "gix-hash", - "gix-object", - "gix-pack", - "gix-path", - "gix-quote", - "parking_lot 0.12.1", - "tempfile", - "thiserror", -] - -[[package]] -name = "gix-pack" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be19ee650300d7cbac5829b637685ec44a8d921a7c2eaff8a245d8f2f008870c" -dependencies = [ - "clru", - "gix-chunk", - "gix-features", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-path", - "gix-tempfile", - "memmap2", - "parking_lot 0.12.1", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-path" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e9ad649bf5e109562d6acba657ca428661ec08e77eaf3a755d8fa55485be9c" -dependencies = [ - "bstr", - "gix-trace", - "home", - "once_cell", - "thiserror", -] - -[[package]] -name = "gix-quote" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7dc10303d73a960d10fb82f81188b036ac3e6b11b5795b20b1a60b51d1321f" -dependencies = [ - "bstr", - "btoi", - "thiserror", -] - -[[package]] -name = "gix-ref" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cccbfa8d5cd9b86465f27a521e0c017de54b92d9fd37c143e49c658a2f04f3a" -dependencies = [ - "gix-actor", - "gix-date", - "gix-features", - "gix-fs", - "gix-hash", - "gix-lock", - "gix-object", - "gix-path", - "gix-tempfile", - "gix-validate", - "memmap2", - "thiserror", - "winnow", -] - -[[package]] -name = "gix-refspec" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678ba30d95baa5462df9875628ed40655d5f5b8aba7028de86ed57f36e762c6c" -dependencies = [ - "bstr", - "gix-hash", - "gix-revision", - "gix-validate", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-revision" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e80a5992ae446fe1745dd26523b86084e3f1b6b3e35377fe09b4f35ac8f151" -dependencies = [ - "bstr", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-revwalk", - "gix-trace", - "thiserror", -] - -[[package]] -name = "gix-revwalk" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b806349bc1f668e09035800e07ac8045da4e39a8925a245d93142c4802224ec1" -dependencies = [ - "gix-commitgraph", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-sec" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8d9bf462feaf05f2121cba7399dbc6c34d88a9cad58fc1e95027791d6a3c6d2" -dependencies = [ - "bitflags 2.4.2", - "gix-path", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "gix-tempfile" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2762b91ff95e27ff3ea95758c0d4efacd7435a1be3629622928b8276de0f72a8" -dependencies = [ - "gix-fs", - "libc", - "once_cell", - "parking_lot 0.12.1", - "tempfile", -] - -[[package]] -name = "gix-trace" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b202d766a7fefc596e2cc6a89cda8ad8ad733aed82da635ac120691112a9b1" - -[[package]] -name = "gix-traverse" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec6358f8373fb018af8fc96c9d2ec6a5b66999e2377dc40b7801351fec409ed" -dependencies = [ - "gix-commitgraph", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-revwalk", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-url" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c79d595b99a6c7ab274f3c991735a0c0f5a816a3da460f513c48edf1c7bf2cc" -dependencies = [ - "bstr", - "gix-features", - "gix-path", - "home", - "thiserror", - "url", -] - -[[package]] -name = "gix-utils" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e839f3d0798b296411263da6bee780a176ef8008a5dfc31287f7eda9266ab8" -dependencies = [ - "fastrand", - "unicode-normalization", -] - -[[package]] -name = "gix-validate" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac7cc36f496bd5d96cdca0f9289bb684480725d40db60f48194aa7723b883854" -dependencies = [ - "bstr", - "thiserror", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gloo" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28999cda5ef6916ffd33fb4a7b87e1de633c47c0dc6d97905fee1cdaa142b94d" -dependencies = [ - "gloo-console", - "gloo-dialogs", - "gloo-events", - "gloo-file", - "gloo-history", - "gloo-net", - "gloo-render", - "gloo-storage", - "gloo-timers 0.2.6", - "gloo-utils 0.1.7", - "gloo-worker", -] - -[[package]] -name = "gloo-console" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b7ce3c05debe147233596904981848862b068862e9ec3e34be446077190d3f" -dependencies = [ - "gloo-utils 0.1.7", - "js-sys", - "serde", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-dialogs" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-events" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b107f8abed8105e4182de63845afcc7b69c098b7852a813ea7462a320992fc" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-file" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7" -dependencies = [ - "futures-channel", - "gloo-events", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-history" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f" -dependencies = [ - "gloo-events", - "gloo-utils 0.1.7", - "serde", - "serde-wasm-bindgen 0.5.0", - "serde_urlencoded", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-net" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66b4e3c7d9ed8d315fd6b97c8b1f74a7c6ecbbc2320e65ae7ed38b7068cc620" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "gloo-utils 0.1.7", - "http", - "js-sys", - "pin-project", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "gloo-render" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-storage" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6ab60bf5dbfd6f0ed1f7843da31b41010515c745735c970e821945ca91e480" -dependencies = [ - "gloo-utils 0.1.7", - "js-sys", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "gloo-timers" +name = "gpu-alloc-types" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "js-sys", - "wasm-bindgen", + "bitflags 2.5.0", ] [[package]] -name = "gloo-utils" -version = "0.1.7" +name = "gpu-allocator" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", + "log", + "presser", + "thiserror", + "winapi", + "windows 0.52.0", ] [[package]] -name = "gloo-utils" -version = "0.2.0" +name = "gpu-descriptor" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", + "bitflags 2.5.0", + "gpu-descriptor-types", + "hashbrown", ] [[package]] -name = "gloo-worker" -version = "0.2.1" +name = "gpu-descriptor-types" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13471584da78061a28306d1359dd0178d8d6fc1c7c80e5e35d27260346e0516a" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "anymap2", - "bincode", - "gloo-console", - "gloo-utils 0.1.7", - "js-sys", - "serde", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", + "bitflags 2.5.0", ] [[package]] -name = "h2" -version = "0.3.24" +name = "grid" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.2.2", - "slab", - "tokio", - "tokio-util", - "tracing", + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", ] [[package]] name = "half" -version = "1.8.2" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "half" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.7", -] - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.7", -] - [[package]] name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.7", + "ahash", "allocator-api2", - "serde", ] [[package]] -name = "hashlink" -version = "0.8.4" +name = "hassle-rs" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "hashbrown 0.14.3", -] - -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.7", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", + "bitflags 2.5.0", + "com", + "libc", + "libloading 0.8.3", + "thiserror", + "widestring", + "winapi", ] [[package]] @@ -2544,10 +2431,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.5" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2555,6 +2448,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + [[package]] name = "home" version = "0.5.9" @@ -2565,98 +2464,79 @@ dependencies = [ ] [[package]] -name = "hostname-validator" -version = "1.1.1" +name = "humantime" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] -name = "http" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" +name = "i18n-config" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" dependencies = [ - "bytes", - "http", - "pin-project-lite", + "log", + "serde", + "serde_derive", + "thiserror", + "toml 0.8.12", + "unic-langid", ] [[package]] -name = "http-range-header" -version = "0.3.1" +name = "i18n-embed" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.1", + "rust-embed", + "thiserror", + "unic-langid", + "walkdir", ] [[package]] -name = "hyper-timeout" -version = "0.4.1" +name = "i18n-embed-fl" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "8241a781f49e923415e106fcd1f89c3fab92cc9f699a521c56e95dee273903d3" dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.58", + "unic-langid", ] [[package]] -name = "hyper-tls" -version = "0.5.0" +name = "i18n-embed-impl" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", + "find-crate", + "i18n-config", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -2682,33 +2562,221 @@ dependencies = [ "cc", ] +[[package]] +name = "iced" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "dnd", + "iced_accessibility", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_widget", + "iced_winit", + "image", + "mime", + "thiserror", + "window_clipboard", +] + +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "accesskit", + "accesskit_winit", +] + +[[package]] +name = "iced_core" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "bitflags 2.5.0", + "dnd", + "log", + "mime", + "num-traits", + "palette", + "raw-window-handle 0.6.0", + "serde", + "smol_str", + "thiserror", + "web-time", + "window_clipboard", + "xxhash-rust", +] + +[[package]] +name = "iced_futures" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "futures", + "iced_core", + "log", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "cosmic-text", + "glam", + "half", + "iced_core", + "iced_futures", + "image", + "kamadak-exif", + "log", + "lyon_path", + "once_cell", + "raw-window-handle 0.6.0", + "rustc-hash", + "thiserror", + "unicode-segmentation", + "xxhash-rust", +] + +[[package]] +name = "iced_renderer" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "dnd", + "iced_core", + "iced_futures", + "thiserror", + "window_clipboard", +] + +[[package]] +name = "iced_style" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "resvg", + "rustc-hash", + "softbuffer", + "tiny-skia", + "xxhash-rust", +] + +[[package]] +name = "iced_wgpu" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "once_cell", + "resvg", + "wgpu", +] + +[[package]] +name = "iced_widget" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "dnd", + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "thiserror", + "unicode-segmentation", + "window_clipboard", +] + +[[package]] +name = "iced_winit" +version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" +dependencies = [ + "dnd", + "iced_graphics", + "iced_runtime", + "iced_style", + "log", + "thiserror", + "tracing", + "web-sys", + "winapi", + "window_clipboard", + "winit", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2 0.3.0", + "dispatch", + "objc2 0.4.1", +] + +[[package]] +name = "icrate" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e286f4b975ac6c054971a0600a9b76438b332edace54bff79c71c9d3adfc9772" +dependencies = [ + "block2 0.4.0", + "objc2 0.5.0", +] + [[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idlset" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "340756d15be4b22d5e501bad90a9f68fcdc6b9b7d2f6d6afe350645e9839dac6" -dependencies = [ - "serde", - "serde_derive", - "smallvec", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.5.0" @@ -2721,61 +2789,36 @@ dependencies = [ [[package]] name = "image" -version = "0.23.14" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-iter", - "num-rational 0.3.2", - "num-traits", -] - -[[package]] -name = "image" -version = "0.24.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif", + "exr", + "gif 0.13.1", "jpeg-decoder", "num-traits", + "png", + "qoi", + "tiff", ] [[package]] -name = "implicit-clone" -version = "0.3.9" +name = "imagesize" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd6201e7c30ccb24773cac7efa6fec1e06189d414b7439ce756a481c8bfbf53" -dependencies = [ - "indexmap 1.9.3", -] +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] name = "indexmap" -version = "1.9.3" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", - "serde", + "hashbrown", ] [[package]] @@ -2808,563 +2851,142 @@ dependencies = [ ] [[package]] -name = "ipnet" -version = "2.9.0" +name = "intl-memoizer" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +dependencies = [ + "type-map", + "unic-langid", +] [[package]] -name = "is-terminal" -version = "0.4.10" +name = "intl_pluralrules" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi", - "rustix", - "windows-sys 0.52.0", + "libc", + "windows-sys 0.48.0", ] [[package]] -name = "iso8601" -version = "0.6.1" +name = "is-docker" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" dependencies = [ - "nom", + "once_cell", ] [[package]] -name = "itertools" -version = "0.10.5" +name = "is-wsl" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", + "is-docker", + "once_cell", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +dependencies = [ + "libc", +] [[package]] name = "jpeg-decoder" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" +dependencies = [ + "rayon", +] [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] -name = "jsonschema" -version = "0.17.1" +name = "kamadak-exif" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a071f4f7efc9a9118dfb627a0a94ef247986e1ab8606a4c806ae2b3aa3b6978" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" dependencies = [ - "ahash 0.8.7", - "anyhow", - "base64 0.21.7", - "bytecount", - "clap", - "fancy-regex", - "fraction", - "getrandom", - "iso8601", - "itoa", - "memchr", - "num-cmp", - "once_cell", - "parking_lot 0.12.1", - "percent-encoding", - "regex", - "reqwest", - "serde", - "serde_json", - "time", - "url", - "uuid", + "mutate_once", ] [[package]] -name = "kanidm-hsm-crypto" -version = "0.1.5" +name = "khronos-egl" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0605892a3d0aca88b43a2d60a381ff7307c2c741d64ff87fb7c763556305791d" -dependencies = [ - "argon2", - "hex", - "openssl", - "serde", - "tracing", - "tss-esapi", - "zeroize", -] - -[[package]] -name = "kanidm-ipa-sync" -version = "1.1.0-rc.16" -dependencies = [ - "base64urlsafedata", - "chrono", - "clap", - "clap_complete", - "cron", - "kanidm_client", - "kanidm_lib_file_permissions", - "kanidm_proto", - "kanidm_utils_users", - "kanidmd_lib", - "ldap3_client", - "serde", - "serde_json", - "tokio", - "toml", - "tracing", - "tracing-subscriber", - "url", - "uuid", -] - -[[package]] -name = "kanidm-ldap-sync" -version = "1.1.0-rc.16" -dependencies = [ - "base64urlsafedata", - "chrono", - "clap", - "clap_complete", - "cron", - "kanidm_client", - "kanidm_lib_file_permissions", - "kanidm_proto", - "kanidm_utils_users", - "kanidmd_lib", - "ldap3_client", - "serde", - "serde_json", - "sketching", - "tokio", - "toml", - "tracing", - "tracing-subscriber", - "url", - "uuid", -] - -[[package]] -name = "kanidm_build_profiles" -version = "1.1.0-rc.16" -dependencies = [ - "base64 0.21.7", - "gix", - "serde", - "toml", -] - -[[package]] -name = "kanidm_client" -version = "1.1.0-rc.16" -dependencies = [ - "hyper", - "kanidm_lib_file_permissions", - "kanidm_proto", - "reqwest", - "serde", - "serde_json", - "time", - "tokio", - "toml", - "tracing", - "url", - "uuid", - "webauthn-rs-proto", -] - -[[package]] -name = "kanidm_lib_crypto" -version = "1.1.0-rc.16" -dependencies = [ - "argon2", - "base64 0.21.7", - "base64urlsafedata", - "hex", - "kanidm-hsm-crypto", - "kanidm_proto", - "openssl", - "openssl-sys", - "rand", - "serde", - "sketching", - "tracing", - "uuid", -] - -[[package]] -name = "kanidm_lib_file_permissions" -version = "1.1.0-rc.16" -dependencies = [ - "kanidm_utils_users", - "whoami", -] - -[[package]] -name = "kanidm_proto" -version = "1.1.0-rc.16" -dependencies = [ - "base32", - "base64urlsafedata", - "num_enum", - "scim_proto", - "serde", - "serde_json", - "serde_with", - "time", - "tracing", - "url", - "urlencoding", - "utoipa", - "uuid", - "webauthn-rs-proto", -] - -[[package]] -name = "kanidm_tools" -version = "1.1.0-rc.16" -dependencies = [ - "async-recursion", - "clap", - "clap_complete", - "compact_jwt 0.3.3", - "dialoguer", - "futures-concurrency", - "kanidm_build_profiles", - "kanidm_client", - "kanidm_proto", - "lazy_static", - "libc", - "qrcode", - "regex", - "rpassword 7.3.1", - "serde", - "serde_json", - "shellexpand 2.1.2", - "sketching", - "time", - "tokio", - "tracing", - "tracing-subscriber", - "url", - "uuid", - "webauthn-authenticator-rs", - "zxcvbn", -] - -[[package]] -name = "kanidm_unix_int" -version = "1.1.0-rc.16" -dependencies = [ - "async-trait", - "base64urlsafedata", - "bytes", - "clap", - "clap_complete", - "csv", - "futures", - "hashbrown 0.14.3", - "kanidm-hsm-crypto", - "kanidm_build_profiles", - "kanidm_client", - "kanidm_lib_crypto", - "kanidm_lib_file_permissions", - "kanidm_proto", - "kanidm_utils_users", - "kanidmd_core", - "kanidmd_testkit", - "libc", - "libsqlite3-sys", - "lru 0.8.1", - "notify-debouncer-full", - "rpassword 7.3.1", - "rusqlite", - "selinux", - "serde", - "serde_json", - "sketching", - "tokio", - "tokio-util", - "toml", - "tracing", - "uuid", - "walkdir", -] - -[[package]] -name = "kanidm_utils_users" -version = "1.1.0-rc.16" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", + "libloading 0.8.3", + "pkg-config", ] [[package]] -name = "kanidmd_core" -version = "1.1.0-rc.16" -dependencies = [ - "async-trait", - "axum", - "axum-auth", - "axum-csp", - "axum-macros", - "axum-server", - "bytes", - "chrono", - "compact_jwt 0.3.3", - "cron", - "filetime", - "futures", - "futures-util", - "hashbrown 0.14.3", - "http", - "hyper", - "kanidm_build_profiles", - "kanidm_lib_crypto", - "kanidm_lib_file_permissions", - "kanidm_proto", - "kanidm_utils_users", - "kanidmd_lib", - "ldap3_proto", - "libc", - "openssl", - "rand", - "regex", - "serde", - "serde_json", - "serde_with", - "sketching", - "tempfile", - "time", - "tokio", - "tokio-openssl", - "tokio-util", - "toml", - "tower", - "tower-http", - "tracing", - "tracing-subscriber", - "url", - "urlencoding", - "utoipa", - "utoipa-swagger-ui", - "uuid", - "walkdir", -] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] -name = "kanidmd_lib" -version = "1.1.0-rc.16" +name = "known-folders" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8" dependencies = [ - "base64 0.21.7", - "base64urlsafedata", - "compact_jwt 0.3.3", - "concread", - "criterion", - "dyn-clone", - "enum-iterator", - "fernet", - "futures", - "hashbrown 0.14.3", - "hex", - "idlset", - "image 0.24.8", - "itertools 0.12.1", - "kanidm_build_profiles", - "kanidm_lib_crypto", - "kanidm_proto", - "kanidmd_lib_macros", - "lazy_static", - "ldap3_proto", - "libc", - "libsqlite3-sys", - "lodepng", - "nonempty", - "num_enum", - "openssl", - "openssl-sys", - "rand", - "regex", - "rusqlite", - "serde", - "serde_cbor_2", - "serde_json", - "serde_with", - "sketching", - "smartstring", - "smolset", - "sshkey-attest", - "svg", - "time", - "tokio", - "tokio-util", - "toml", - "tracing", - "url", - "urlencoding", - "uuid", - "webauthn-authenticator-rs", - "webauthn-rs", - "webauthn-rs-core", - "whoami", - "zxcvbn", -] - -[[package]] -name = "kanidmd_lib_macros" -version = "1.1.0-rc.16" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "kanidmd_testkit" -version = "1.1.0-rc.16" -dependencies = [ - "assert_cmd", - "compact_jwt 0.3.3", - "escargot", - "fantoccini", - "futures", - "http", - "hyper-tls", - "jsonschema", - "kanidm_build_profiles", - "kanidm_client", - "kanidm_lib_crypto", - "kanidm_proto", - "kanidmd_core", - "kanidmd_lib", - "lazy_static", - "oauth2", - "openssl", - "petgraph", - "regex", - "reqwest", - "serde", - "serde_json", - "sketching", - "tempfile", - "testkit-macros", - "time", - "tokio", - "tokio-openssl", - "tracing", - "url", - "uuid", - "webauthn-authenticator-rs", -] - -[[package]] -name = "kanidmd_web_ui_admin" -version = "1.1.0-rc.16" -dependencies = [ - "gloo", - "gloo-utils 0.2.0", - "js-sys", - "kanidm_proto", - "kanidmd_web_ui_shared", - "serde", - "serde-wasm-bindgen 0.5.0", - "time", - "uuid", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", - "web-sys", - "yew", - "yew-router", -] - -[[package]] -name = "kanidmd_web_ui_login_flows" -version = "1.1.0-rc.16" -dependencies = [ - "gloo", - "gloo-utils 0.2.0", - "js-sys", - "kanidm_proto", - "kanidmd_web_ui_shared", - "serde", - "serde-wasm-bindgen 0.5.0", - "time", - "uuid", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", - "web-sys", - "yew", - "yew-router", -] - -[[package]] -name = "kanidmd_web_ui_shared" -version = "1.1.0-rc.16" -dependencies = [ - "gloo", - "js-sys", - "kanidm_proto", - "serde", - "serde-wasm-bindgen 0.5.0", - "time", - "url", - "uuid", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", - "web-sys", - "yew", -] - -[[package]] -name = "kanidmd_web_ui_user" -version = "1.1.0-rc.16" -dependencies = [ - "gloo", - "gloo-timers 0.3.0", - "gloo-utils 0.2.0", - "js-sys", - "kanidm_proto", - "kanidmd_web_ui_shared", - "lazy_static", - "qrcode", - "regex", - "serde", - "serde-wasm-bindgen 0.5.0", - "time", - "uuid", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", - "wasm-timer", - "web-sys", - "yew", - "yew-router", + "windows-sys 0.52.0", ] [[package]] @@ -3387,6 +3009,15 @@ dependencies = [ "libc", ] +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -3394,58 +3025,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "lazycell" -version = "1.3.0" +name = "lebe" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lber" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2df7f9fd9f64cf8f59e1a4a0753fe7d575a5b38d3d7ac5758dcee9357d83ef0a" -dependencies = [ - "bytes", - "nom", -] - -[[package]] -name = "ldap3_client" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f294d8b0c3a0906caca55d2004f1192e174b895afa3f0f177ead05f314544d2" -dependencies = [ - "base64 0.21.7", - "base64urlsafedata", - "futures-util", - "ldap3_proto", - "openssl", - "serde", - "tokio", - "tokio-openssl", - "tokio-util", - "tracing", - "url", - "uuid", -] - -[[package]] -name = "ldap3_proto" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a29eca0a9fef365d6d376a1b262e269a17b1c8c6de2cee76618642cd3c923506" -dependencies = [ - "base64 0.21.7", - "bytes", - "lber", - "nom", - "peg", - "serde", - "thiserror", - "tokio-util", - "tracing", - "uuid", -] +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" @@ -3454,67 +3037,119 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] -name = "libloading" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic.git#9797df2b50d088c86f505b26b25b733bce5c142a" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "apply", + "ashpd 0.7.0", + "chrono", + "cosmic-config", + "cosmic-theme", + "css-color", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_style", + "iced_tiny_skia", + "iced_widget", + "iced_winit", + "lazy_static", + "palette", + "rfd", + "slotmap", + "taffy", + "thiserror", + "tokio", + "tracing", + "unicode-segmentation", + "url", + "zbus", ] [[package]] -name = "libnss" -version = "0.4.0" +name = "libloading" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48b67ef5ebef2a035ac8106c9b71176b6246be2a580ff4ee94bb80919e55b34c" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "lazy_static", - "libc", - "paste 0.1.18", + "cfg-if", + "winapi", ] +[[package]] +name = "libloading" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.4", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + [[package]] name = "libredox" -version = "0.0.1" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] [[package]] -name = "libsqlite3-sys" -version = "0.25.2" +name = "libredox" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + +[[package]] +name = "libset" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca4f69ca250aaaabde93b0f13d19a22a25b808fb9bc28a1f0869cf3e84cee28d" +dependencies = [ + "atomicwrites 0.4.3", + "dirs", + "known-folders", + "serde", + "serde_json", + "thiserror", + "tracing", + "xdg", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ - "cc", "pkg-config", "vcpkg", ] [[package]] -name = "libudev" -version = "0.2.0" +name = "linux-raw-sys" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea626d3bdf40a1c5aee3bcd4f40826970cae8d80a8fec934c82a63840094dcfe" -dependencies = [ - "libc", - "libudev-sys", -] - -[[package]] -name = "libudev-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" -dependencies = [ - "libc", - "pkg-config", -] +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" @@ -3522,6 +3157,25 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +[[package]] +name = "linux-raw-sys" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + [[package]] name = "lock_api" version = "0.4.11" @@ -3532,89 +3186,93 @@ dependencies = [ "scopeguard", ] -[[package]] -name = "lodepng" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a42d298694b14401847de29abd44adf278b42e989e516deac7b72018400002d8" -dependencies = [ - "crc32fast", - "fallible_collections", - "flate2", - "libc", - "rgb", -] - [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lru" -version = "0.7.8" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.12.3", + "hashbrown", ] [[package]] -name = "lru" -version = "0.8.1" +name = "lyon" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" dependencies = [ - "hashbrown 0.12.3", + "lyon_algorithms", + "lyon_tessellation", ] [[package]] -name = "matchers" -version = "0.1.0" +name = "lyon_algorithms" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623" dependencies = [ - "regex-automata 0.1.10", + "lyon_path", + "num-traits", ] [[package]] -name = "matchit" -version = "0.7.3" +name = "lyon_geom" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - -[[package]] -name = "mathru" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a42bf938e4c9a6ad581cf528d5606eb50c5458ac759ca23719291e2f6499bec" +checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" dependencies = [ - "rand", + "arrayvec", + "euclid", + "num-traits", ] [[package]] -name = "mbox" -version = "0.6.0" +name = "lyon_path" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f88d5c34d63aad11aa4321ef55ccb064af58b3ad8091079ae22bf83e5eb75d6" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c67b5bc8123b352b2e7e742b47d1f236a13fe77619433be9568fbd888e9c0" +dependencies = [ + "float_next_after", + "lyon_path", + "num-traits", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" dependencies = [ "libc", - "rustc_version", - "stable_deref_trait", ] [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" -version = "0.7.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] @@ -3629,19 +3287,65 @@ dependencies = [ ] [[package]] -name = "mime" -version = "0.3.17" +name = "memoffset" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] [[package]] -name = "mime_guess" -version = "2.0.4" +name = "memoffset" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "mime", - "unicase", + "autocfg", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", +] + +[[package]] +name = "migrations_internals" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" +dependencies = [ + "serde", + "toml 0.7.8", +] + +[[package]] +name = "migrations_macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" +dependencies = [ + "migrations_internals", + "proc-macro2", + "quote", +] + +[[package]] +name = "mime" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" +dependencies = [ + "smithay-clipboard", ] [[package]] @@ -3657,13 +3361,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", + "simd-adler32", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -3672,39 +3377,83 @@ dependencies = [ ] [[package]] -name = "multer" -version = "2.1.0" +name = "mutate_once" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http", - "httparse", + "arrayvec", + "bit-set", + "bitflags 2.5.0", + "codespan-reporting", + "hexf-parse", + "indexmap", "log", - "memchr", - "mime", - "spin", - "version_check", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", ] [[package]] -name = "native-tls" -version = "0.2.11" +name = "ndk" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "lazy_static", - "libc", + "bitflags 2.5.0", + "jni-sys", "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", + "ndk-sys", + "num_enum", + "raw-window-handle 0.6.0", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", ] [[package]] @@ -3717,22 +3466,13 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nonempty" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeaf4ad7403de93e699c191202f017118df734d3850b01e13a3a8b2e6953d3c9" -dependencies = [ - "serde", -] - [[package]] name = "notify" version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -3745,40 +3485,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "notify-debouncer-full" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4812c1eb49be776fb8df4961623bdc01ec9dfdc1abe8211ceb09150a2e64219" -dependencies = [ - "crossbeam-channel", - "file-id", - "notify", - "parking_lot 0.12.1", - "walkdir", -] - -[[package]] -name = "nss_kanidm" -version = "1.1.0-rc.16" -dependencies = [ - "kanidm_unix_int", - "lazy_static", - "libc", - "libnss", - "paste 1.0.14", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - [[package]] name = "num" version = "0.4.1" @@ -3789,7 +3495,7 @@ dependencies = [ "num-complex", "num-integer", "num-iter", - "num-rational 0.4.1", + "num-rational", "num-traits", ] @@ -3804,12 +3510,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-cmp" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa" - [[package]] name = "num-complex" version = "0.4.5" @@ -3825,54 +3525,20 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -3893,11 +3559,12 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -3912,51 +3579,109 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] [[package]] -name = "oauth2" -version = "4.4.2" +name = "objc" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ - "base64 0.13.1", - "chrono", - "getrandom", - "http", - "rand", - "serde", - "serde_json", - "serde_path_to_error", - "sha2 0.10.8", - "thiserror", - "url", + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9c7f0d511a4ce26b078183179dca908171cfc69f88986fe36c5138e1834476" +dependencies = [ + "objc-sys", + "objc2-encode 4.0.0", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc2-encode" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff06a6505cde0766484f38d8479ac8e6d31c66fbc2d5492f65ca8c091456379" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", ] [[package]] @@ -3968,24 +3693,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "oid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c19903c598813dba001b53beeae59bb77ad4892c5c1b9b3500ce4293a0d06c2" -dependencies = [ - "serde", -] - -[[package]] -name = "oid-registry" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" -dependencies = [ - "asn1-rs", -] - [[package]] name = "once_cell" version = "1.19.0" @@ -3993,162 +3700,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "oorandom" -version = "11.1.3" +name = "open" +version = "5.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "openssl" -version = "0.10.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" dependencies = [ - "bitflags 2.4.2", - "cfg-if", - "foreign-types", + "is-wsl", "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "opentelemetry" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" -dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk", -] - -[[package]] -name = "opentelemetry-http" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" -dependencies = [ - "async-trait", - "bytes", - "http", - "opentelemetry_api", -] - -[[package]] -name = "opentelemetry-otlp" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275" -dependencies = [ - "async-trait", - "futures-core", - "http", - "opentelemetry-http", - "opentelemetry-proto", - "opentelemetry-semantic-conventions", - "opentelemetry_api", - "opentelemetry_sdk", - "prost", - "serde", - "thiserror", - "tokio", - "tonic", -] - -[[package]] -name = "opentelemetry-proto" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb" -dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk", - "prost", - "tonic", -] - -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269" -dependencies = [ - "opentelemetry", -] - -[[package]] -name = "opentelemetry_api" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" -dependencies = [ - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry_api", - "ordered-float", - "percent-encoding", - "rand", - "regex", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", + "pathdiff", ] [[package]] @@ -4158,60 +3717,119 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] -name = "orca" -version = "1.1.0-rc.16" +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" dependencies = [ - "clap", - "crossbeam", - "csv", - "dialoguer", - "futures-util", - "hashbrown 0.14.3", - "kanidm_build_profiles", - "kanidm_client", - "kanidm_proto", - "ldap3_proto", - "mathru", - "openssl", - "rand", - "serde", - "serde_json", - "tikv-jemallocator", - "tokio", - "tokio-openssl", - "tokio-util", - "toml", - "tracing", - "tracing-subscriber", - "uuid", + "libredox 0.0.2", ] [[package]] -name = "ordered-float" -version = "3.9.2" +name = "ordered-multimap" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ - "num-traits", + "dlv-list", + "hashbrown", ] [[package]] -name = "overload" -version = "0.1.1" +name = "ordered-stream" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] [[package]] -name = "pam_kanidm" -version = "1.1.0-rc.16" +name = "os_pipe" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" dependencies = [ - "kanidm_unix_int", "libc", - "pkg-config", - "tracing", - "tracing-subscriber", + "windows-sys 0.52.0", ] +[[package]] +name = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "owned_ttf_parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +dependencies = [ + "ttf-parser", +] + +[[package]] +name = "palette" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "pango-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + [[package]] name = "parking_lot" version = "0.11.2" @@ -4260,27 +3878,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "password-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - [[package]] name = "paste" version = "1.0.14" @@ -4288,40 +3885,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] -name = "paste-impl" -version = "0.1.18" +name = "pathdiff" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] - -[[package]] -name = "peg" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61" -dependencies = [ - "peg-macros", - "peg-runtime", -] - -[[package]] -name = "peg-macros" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90" -dependencies = [ - "peg-runtime", - "proc-macro2", - "quote", -] - -[[package]] -name = "peg-runtime" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "percent-encoding" @@ -4329,17 +3896,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pest" -version = "2.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - [[package]] name = "petgraph" version = "0.6.4" @@ -4347,71 +3903,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.2.2", - "serde", - "serde_derive", + "indexmap", ] [[package]] -name = "picky-asn1" -version = "0.8.0" +name = "phf" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295eea0f33c16be21e2a98b908fdd4d73c04dd48c8480991b76dbcf0cb58b212" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "oid", - "serde", - "serde_bytes", + "phf_macros", + "phf_shared", ] [[package]] -name = "picky-asn1-der" -version = "0.4.1" +name = "phf_generator" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5df7873a9e36d42dadb393bea5e211fe83d793c172afad5fb4ec846ec582793f" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "picky-asn1", - "serde", - "serde_bytes", + "phf_shared", + "rand", ] [[package]] -name = "picky-asn1-x509" -version = "0.12.0" +name = "phf_macros" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c5f20f71a68499ff32310f418a6fad8816eac1a2859ed3f0c5c741389dd6208" -dependencies = [ - "base64 0.21.7", - "oid", - "picky-asn1", - "picky-asn1-der", - "serde", -] - -[[package]] -name = "pin-project" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ + "phf_generator", + "phf_shared", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4420,48 +3967,64 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pinned" -version = "0.1.0" +name = "piper" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a829027bd95e54cfe13e3e258a1ae7b645960553fb82b75ff852c29688ee595b" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ - "futures", - "rustversion", - "thiserror", + "atomic-waker", + "fastrand 2.0.2", + "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] -name = "plotters" -version = "0.3.5" +name = "png" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", ] [[package]] -name = "plotters-backend" -version = "0.3.5" +name = "polling" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] [[package]] -name = "plotters-svg" -version = "0.3.5" +name = "polling" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" dependencies = [ - "plotters-backend", + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix 0.38.32", + "tracing", + "windows-sys 0.52.0", ] [[package]] @@ -4477,51 +4040,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "predicates" -version = "3.1.0" +name = "presser" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" -dependencies = [ - "anstyle", - "difflib", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "prettyplease" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" -dependencies = [ - "proc-macro2", - "syn 2.0.48", -] +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" [[package]] name = "proc-macro-crate" @@ -4530,7 +4052,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", ] [[package]] @@ -4557,108 +4088,59 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] -name = "prodash" -version = "26.2.2" +name = "profiling" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" [[package]] -name = "prokio" -version = "0.1.0" +name = "qoi" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b55e106e5791fa5a13abd13c85d6127312e8e09098059ca2bc9b03ca4cf488" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" dependencies = [ - "futures", - "gloo", - "num_cpus", - "once_cell", - "pin-project", - "pinned", - "tokio", - "tokio-stream", - "wasm-bindgen-futures", + "bytemuck", ] [[package]] -name = "prost" -version = "0.11.9" +name = "quick-xml" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ - "bytes", - "prost-derive", + "memchr", ] -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "psl-types" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" - -[[package]] -name = "publicsuffix" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" -dependencies = [ - "idna 0.3.0", - "psl-types", -] - -[[package]] -name = "qrcode" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" -dependencies = [ - "checked_int_cast", - "image 0.23.14", -] - -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] +[[package]] +name = "r2d2" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" +dependencies = [ + "log", + "parking_lot 0.12.1", + "scheduled-thread-pool", +] + [[package]] name = "rand" version = "0.8.5" @@ -4690,10 +4172,34 @@ dependencies = [ ] [[package]] -name = "rayon" -version = "1.8.1" +name = "range-alloc" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -4709,6 +4215,22 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "read-fonts" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea75b5ec052843434d263ef7a4c31cf86db5908c729694afb1ad3c884252a1b6" +dependencies = [ + "bytemuck", + "font-types", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -4718,6 +4240,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_syscall" version = "0.4.1" @@ -4729,108 +4260,89 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", - "libredox", + "libredox 0.1.3", "thiserror", ] -[[package]] -name = "reference-counted-singleton" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ffdf83b0d36b33b2a82a8993af7e72a6a9b601e83c5c343c822fff37dbc0860" - [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", + "regex-automata", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] -name = "regex-syntax" -version = "0.8.2" +name = "renderdoc-sys" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] -name = "reqwest" -version = "0.11.24" +name = "resvg" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" dependencies = [ - "async-compression", - "base64 0.21.7", - "bytes", - "cookie 0.17.0", - "cookie_store", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", + "gif 0.12.0", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rfd" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0d8ab342bcc5436e04d3a4c1e09e17d74958bfaddf8d5fad6f85607df0f994f" +dependencies = [ + "ashpd 0.6.8", + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", "js-sys", "log", - "mime", - "mime_guess", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-util", - "tower-service", - "url", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle 0.5.2", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "windows-sys 0.48.0", ] [[package]] @@ -4843,67 +4355,28 @@ dependencies = [ ] [[package]] -name = "route-recognizer" -version = "0.3.1" +name = "ron" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" - -[[package]] -name = "rpassword" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "libc", - "winapi", + "base64", + "bitflags 2.5.0", + "serde", + "serde_derive", ] [[package]] -name = "rpassword" -version = "7.3.1" +name = "roxmltree" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" -dependencies = [ - "libc", - "rtoolbox", - "windows-sys 0.48.0", -] - -[[package]] -name = "rtoolbox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "runloop" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d79b4b604167921892e84afbbaad9d5ad74e091bf6c511d9dbfb0593f09fabd" - -[[package]] -name = "rusqlite" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" -dependencies = [ - "bitflags 1.3.2", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] name = "rust-embed" -version = "8.2.0" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82c0bbc10308ed323529fd3c1dce8badda635aa319a5ff0e6466f33b8101e3f" +checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -4912,28 +4385,37 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.2.0" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6227c01b1783cdfee1bcf844eb44594cd16ec71c35305bf1c9fb5aade2735e16" +checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "shellexpand 3.1.0", - "syn 2.0.48", + "syn 2.0.58", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.2.0" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb0a25bfbb2d4b4402179c2cf030387d9990857ce08a32592c6238db9fa8665" +checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" dependencies = [ - "sha2 0.10.8", + "sha2", "walkdir", ] +[[package]] +name = "rust-ini" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -4947,56 +4429,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustc_version" -version = "0.3.3" +name = "rustix" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "semver", -] - -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", ] [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.13", "windows-sys 0.52.0", ] [[package]] -name = "rustls-pemfile" -version = "1.0.4" +name = "rustversion" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" + +[[package]] +name = "rustybuzz" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" dependencies = [ - "base64 0.21.7", + "bitflags 2.5.0", + "bytemuck", + "libm", + "smallvec", + "ttf-parser", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-properties", + "unicode-script", ] -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -5008,29 +4494,12 @@ dependencies = [ ] [[package]] -name = "schannel" -version = "0.1.23" +name = "scheduled-thread-pool" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scim_proto" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e53f2c444b72dd7410aa1cdc3c0942349262e84364dc7968dc7402525ea2ca" -dependencies = [ - "base64urlsafedata", - "peg", - "serde", - "serde_json", - "time", - "tracing", - "tracing-subscriber", - "url", - "uuid", + "parking_lot 0.12.1", ] [[package]] @@ -5046,154 +4515,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "sd-notify" -version = "0.4.1" +name = "sctk-adwaita" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", + "ab_glyph", + "log", + "memmap2", + "smithay-client-toolkit 0.18.1", + "tiny-skia", ] [[package]] -name = "security-framework-sys" -version = "2.9.1" +name = "self_cell" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" dependencies = [ - "core-foundation-sys", - "libc", + "self_cell 1.0.3", ] [[package]] -name = "selinux" -version = "0.4.3" +name = "self_cell" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88696d7211f03e87034e8687498f3f71890633e0e3e0c051ca3a716d2bc03e4" -dependencies = [ - "bitflags 2.4.2", - "libc", - "once_cell", - "reference-counted-singleton", - "selinux-sys", - "thiserror", -] - -[[package]] -name = "selinux-sys" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d6e616814290fe172d6514bebd9b723733ba7d68e1ab74d341a90b99a36bb4" -dependencies = [ - "bindgen", - "cc", - "dunce", - "walkdir", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-wasm-bindgen" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde-wasm-bindgen" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde_bytes" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half 1.8.2", - "serde", -] - -[[package]] -name = "serde_cbor_2" -version = "0.12.0-dev" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46d75f449e01f1eddbe9b00f432d616fbbd899b809c837d0fbc380496a0dd55" -dependencies = [ - "half 1.8.2", - "serde", -] - [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -5201,54 +4574,23 @@ dependencies = [ ] [[package]] -name = "serde_path_to_error" -version = "0.1.15" +name = "serde_repr" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ - "itoa", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981" -dependencies = [ - "base64 0.21.7", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.2", - "serde", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568577ff0ef47b879f736cd66740e022f3672788cdf002a05a4e609ea5a6fb15" -dependencies = [ - "darling 0.20.5", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", ] [[package]] @@ -5259,25 +4601,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "sha2" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug", + "digest", ] [[package]] @@ -5288,48 +4612,9 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "shellexpand" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" -dependencies = [ - "dirs 4.0.0", -] - -[[package]] -name = "shellexpand" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" -dependencies = [ - "dirs 5.0.1", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -5340,23 +4625,26 @@ dependencies = [ ] [[package]] -name = "sketching" -version = "1.1.0-rc.16" +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" dependencies = [ - "gethostname", - "num_enum", - "opentelemetry", - "opentelemetry-otlp", - "opentelemetry_sdk", - "rand", - "serde", - "tracing", - "tracing-forest", - "tracing-opentelemetry", - "tracing-subscriber", - "uuid", + "log", ] +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + [[package]] name = "slab" version = "0.4.9" @@ -5367,43 +4655,137 @@ dependencies = [ ] [[package]] -name = "smallvec" -version = "1.13.1" +name = "slotmap" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ - "serde", -] - -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "serde", - "static_assertions", "version_check", ] [[package]] -name = "smolset" -version = "1.3.1" +name = "smallvec" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d372e8fe15dc5229e7d6c65f5810849385e79e24f9d9d64263e132879c7be0" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.0" +source = "git+https://github.com/smithay/client-toolkit?rev=3bed072#3bed072b966022f5f929d12f3aff089b1ace980b" dependencies = [ - "smallvec", + "bitflags 2.5.0", + "calloop 0.13.0", + "calloop-wayland-source 0.3.0", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix 0.38.32", + "thiserror", + "wayland-backend", + "wayland-client 0.31.2", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr", + "wayland-scanner 0.31.1", + "xkeysym", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.5.0", + "calloop 0.12.4", + "calloop-wayland-source 0.2.0", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix 0.38.32", + "thiserror", + "wayland-backend", + "wayland-client 0.31.2", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr", + "wayland-scanner 0.31.1", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.8.0" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-3#2f2430bec35f0adb9cb93e85e648ff8449d44dad" +dependencies = [ + "libc", + "raw-window-handle 0.6.0", + "smithay-client-toolkit 0.18.0", + "wayland-backend", +] + +[[package]] +name = "smol_str" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +dependencies = [ + "serde", ] [[package]] name = "socket2" -version = "0.5.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", - "windows-sys 0.48.0", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "softbuffer" +version = "0.4.1" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#6e75b1ad7e98397d37cb187886d05969bc480995" +dependencies = [ + "as-raw-xcb-connection", + "bytemuck", + "cfg_aliases 0.2.0", + "cocoa", + "core-graphics", + "drm", + "fastrand 2.0.2", + "foreign-types", + "js-sys", + "log", + "memmap2", + "objc", + "raw-window-handle 0.6.0", + "redox_syscall 0.4.1", + "rustix 0.38.32", + "tiny-xlib", + "wasm-bindgen", + "wayland-backend", + "wayland-client 0.31.2", + "wayland-sys 0.31.1", + "web-sys", + "windows-sys 0.52.0", + "x11rb 0.13.0", ] [[package]] @@ -5411,45 +4793,18 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "sptr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" - -[[package]] -name = "sshkey-attest" -version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=5f4db4172f8e22aedc68c282d177e98db2b1892f#5f4db4172f8e22aedc68c282d177e98db2b1892f" dependencies = [ - "base64urlsafedata", - "nom", - "openssl", - "serde", - "serde_cbor_2", - "sshkeys", - "tracing", - "uuid", - "webauthn-rs-core", + "lock_api", ] [[package]] -name = "sshkeys" -version = "0.3.2" -source = "git+https://github.com/dnaeon/rust-sshkeys.git?rev=fa5bd02dd6e90ee724fdb981253c1e7726a7f534#fa5bd02dd6e90ee724fdb981253c1e7726a7f534" -dependencies = [ - "base64 0.12.3", - "byteorder", - "serde", - "sha2 0.8.2", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.5.0", +] [[package]] name = "static_assertions" @@ -5457,6 +4812,21 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "str-buf" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + [[package]] name = "strsim" version = "0.10.0" @@ -5464,16 +4834,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "subtle" -version = "2.5.0" +name = "strum" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] -name = "svg" -version = "0.13.1" +name = "strum_macros" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d815ad337e8449d2374d4248448645edfe74e699343dd5719139d93fa87112" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.58", +] + +[[package]] +name = "svg_fmt" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499" + +[[package]] +name = "svgtypes" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ec889a8e0a6fcb91041996c8f1f6be0fe1a09e94478785e07c32ce2bca2d2b" +dependencies = [ + "read-fonts", + "yazi", + "zeno", +] [[package]] name = "syn" @@ -5488,9 +4892,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -5498,132 +4902,101 @@ dependencies = [ ] [[package]] -name = "sync_wrapper" -version = "0.1.2" +name = "sys-locale" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", "libc", ] [[package]] -name = "target-lexicon" -version = "0.12.13" +name = "system-deps" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml 0.8.12", + "version-compare", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempfile" -version = "3.10.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand", - "rustix", + "fastrand 2.0.2", + "rustix 0.38.32", "windows-sys 0.52.0", ] [[package]] -name = "termtree" -version = "0.4.1" +name = "termcolor" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "testkit-macros" -version = "0.1.0" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", + "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] -name = "thread_local" -version = "1.1.7" +name = "tiff" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tikv-jemalloc-sys" -version = "0.5.4+5.3.0-patched" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" -dependencies = [ - "libc", - "tikv-jemalloc-sys", + "flate2", + "jpeg-decoder", + "weezl", ] [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -5644,22 +5017,68 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", ] [[package]] -name = "tinytemplate" -version = "1.2.1" +name = "tiny-keccak" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" dependencies = [ - "serde", - "serde_json", + "crunchy", +] + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-xlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" +dependencies = [ + "as-raw-xcb-connection", + "ctor", + "libloading 0.8.3", + "tracing", +] + +[[package]] +name = "tinystr" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +dependencies = [ + "displaydoc", ] [[package]] @@ -5679,9 +5098,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -5690,78 +5109,9 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-openssl" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffab79df67727f6acf57f1ff743091873c24c579b1e2ce4d8f53e47ded4d63d" -dependencies = [ - "futures-util", - "openssl", - "openssl-sys", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", + "socket2 0.5.6", "tracing", + "windows-sys 0.48.0", ] [[package]] @@ -5773,11 +5123,38 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.9", +] + [[package]] name = "toml_datetime" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" @@ -5785,106 +5162,43 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.2", + "indexmap", + "serde", + "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] -name = "tonic" -version = "0.9.2" +name = "toml_edit" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "async-trait", - "axum", - "base64 0.21.7", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", + "indexmap", + "toml_datetime", + "winnow 0.5.40", ] [[package]] -name = "tower" -version = "0.4.13" +name = "toml_edit" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand", - "slab", - "tokio", - "tokio-stream", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.5", ] -[[package]] -name = "tower-http" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" -dependencies = [ - "async-compression", - "bitflags 2.4.2", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "httpdate", - "mime", - "mime_guess", - "percent-encoding", - "pin-project-lite", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", - "uuid", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - [[package]] name = "tracing" version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5898,7 +5212,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -5908,129 +5222,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", - "valuable", ] [[package]] -name = "tracing-forest" -version = "0.1.6" +name = "tree_magic_mini" +version = "3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee40835db14ddd1e3ba414292272eddde9dad04d3d4b65509656414d1c42592f" +checksum = "77ee137597cdb361b55a4746983e4ac1b35ab6024396a419944ad473bb915265" dependencies = [ - "smallvec", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", - "uuid", -] - -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", + "fnv", + "home", + "memchr", + "nom", "once_cell", - "tracing-core", + "petgraph", ] [[package]] -name = "tracing-log" -version = "0.2.0" +name = "ttf-parser" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" [[package]] -name = "tracing-opentelemetry" -version = "0.21.0" +name = "type-map" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" +checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" dependencies = [ - "once_cell", - "opentelemetry", - "opentelemetry_sdk", - "smallvec", - "tracing", - "tracing-core", - "tracing-log 0.1.4", - "tracing-subscriber", -] - -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "time", - "tracing", - "tracing-core", - "tracing-log 0.2.0", - "tracing-serde", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "tss-esapi" -version = "7.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de234df360c349f78ecd33f0816ab3842db635732212b5cfad67f2638336864e" -dependencies = [ - "bitfield", - "enumflags2", - "hostname-validator", - "log", - "mbox", - "num-derive 0.4.2", - "num-traits", - "oid", - "picky-asn1", - "picky-asn1-x509", - "regex", - "serde", - "tss-esapi-sys", - "zeroize", -] - -[[package]] -name = "tss-esapi-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535cd192581c2ec4d5f82e670b1d3fbba6a23ccce8c85de387642051d7cad5b5" -dependencies = [ - "pkg-config", - "target-lexicon", + "rustc-hash", ] [[package]] @@ -6040,18 +5260,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] -name = "ucd-trie" -version = "0.1.6" +name = "uds_windows" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] [[package]] -name = "unicase" -version = "2.7.0" +name = "unic-langid" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" dependencies = [ - "version_check", + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +dependencies = [ + "serde", + "tinystr", ] [[package]] @@ -6061,10 +5296,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] -name = "unicode-bom" -version = "2.0.3" +name = "unicode-bidi-mirroring" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" [[package]] name = "unicode-ident" @@ -6073,19 +5314,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "unicode-normalization" -version = "0.1.22" +name = "unicode-linebreak" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] -name = "unicode-segmentation" -version = "1.10.1" +name = "unicode-properties" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + +[[package]] +name = "unicode-script" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" @@ -6106,16 +5371,71 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna", "percent-encoding", "serde", ] [[package]] -name = "urlencoding" -version = "2.1.3" +name = "usvg" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" +checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" +dependencies = [ + "base64", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" +dependencies = [ + "rctree", + "strict-num", + "svgtypes", + "tiny-skia-path", +] [[package]] name = "utf8parse" @@ -6123,71 +5443,39 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" -[[package]] -name = "utoipa" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "272ebdfbc99111033031d2f10e018836056e4d2c8e2acda76450ec7974269fa7" -dependencies = [ - "indexmap 2.2.2", - "serde", - "serde_json", - "utoipa-gen", -] - -[[package]] -name = "utoipa-gen" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c9f4d08338c1bfa70dde39412a040a884c6f318b3d09aaaf3437a1e52027fc" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "regex", - "syn 2.0.48", - "url", - "uuid", -] - -[[package]] -name = "utoipa-swagger-ui" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "154517adf0d0b6e22e8e1f385628f14fcaa3db43531dc74303d3edef89d6dfe5" -dependencies = [ - "axum", - "mime_guess", - "regex", - "rust-embed", - "serde", - "serde_json", - "utoipa", - "zip", -] - [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", - "serde", ] -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - [[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vergen" +version = "8.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +dependencies = [ + "anyhow", + "cfg-if", + "rustversion", + "time", +] + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + [[package]] name = "version_check" version = "0.9.4" @@ -6195,33 +5483,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "wait-timeout" -version = "0.2.0" +name = "waker-fn" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", ] -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -6230,36 +5506,34 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", - "serde", - "serde_json", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -6269,9 +5543,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6279,47 +5553,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" - -[[package]] -name = "wasm-bindgen-test" -version = "0.3.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143ddeb4f833e2ed0d252e618986e18bfc7b0e52f2d28d77d05b2f045dd8eb61" -dependencies = [ - "console_error_panic_hook", - "js-sys", - "scoped-tls", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5211b7550606857312bba1d978a8ec75692eae187becc5e680444fffc5e6f89" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-timer" @@ -6337,128 +5586,191 @@ dependencies = [ ] [[package]] -name = "web-sys" -version = "0.3.68" +name = "wayland-backend" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ - "js-sys", - "wasm-bindgen", + "cc", + "downcast-rs", + "rustix 0.38.32", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.1", ] [[package]] -name = "webauthn-attestation-ca" -version = "0.1.0" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=5f4db4172f8e22aedc68c282d177e98db2b1892f#5f4db4172f8e22aedc68c282d177e98db2b1892f" +name = "wayland-client" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" dependencies = [ - "base64urlsafedata", - "openssl", - "serde", - "tracing", - "uuid", -] - -[[package]] -name = "webauthn-authenticator-rs" -version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=5f4db4172f8e22aedc68c282d177e98db2b1892f#5f4db4172f8e22aedc68c282d177e98db2b1892f" -dependencies = [ - "async-stream", - "async-trait", - "authenticator-ctap2-2021", - "base64urlsafedata", "bitflags 1.3.2", - "futures", - "hex", - "nom", - "num-derive 0.3.3", - "num-traits", - "openssl", - "rpassword 5.0.1", - "serde", - "serde_bytes", - "serde_cbor_2", - "serde_json", - "tokio", - "tokio-stream", - "tracing", - "unicode-normalization", - "url", - "uuid", - "webauthn-rs-core", - "webauthn-rs-proto", - "windows", + "downcast-rs", + "libc", + "nix 0.24.3", + "wayland-commons", + "wayland-scanner 0.29.5", + "wayland-sys 0.29.5", ] [[package]] -name = "webauthn-rs" -version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=5f4db4172f8e22aedc68c282d177e98db2b1892f#5f4db4172f8e22aedc68c282d177e98db2b1892f" -dependencies = [ - "base64urlsafedata", - "serde", - "tracing", - "url", - "uuid", - "webauthn-rs-core", -] - -[[package]] -name = "webauthn-rs-core" -version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=5f4db4172f8e22aedc68c282d177e98db2b1892f#5f4db4172f8e22aedc68c282d177e98db2b1892f" -dependencies = [ - "base64 0.21.7", - "base64urlsafedata", - "compact_jwt 0.2.10", - "der-parser", - "nom", - "openssl", - "rand", - "serde", - "serde_cbor_2", - "serde_json", - "thiserror", - "tracing", - "url", - "uuid", - "webauthn-attestation-ca", - "webauthn-rs-proto", - "x509-parser", -] - -[[package]] -name = "webauthn-rs-proto" -version = "0.5.0-dev" -source = "git+https://github.com/kanidm/webauthn-rs.git?rev=5f4db4172f8e22aedc68c282d177e98db2b1892f#5f4db4172f8e22aedc68c282d177e98db2b1892f" -dependencies = [ - "base64urlsafedata", - "js-sys", - "serde", - "serde-wasm-bindgen 0.4.5", - "serde_json", - "url", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "webdriver" -version = "0.46.0" +name = "wayland-client" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9973cb72c8587d5ad5efdb91e663d36177dc37725e6c90ca86c626b0cc45c93f" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ - "base64 0.13.1", - "bytes", - "cookie 0.16.2", - "http", + "bitflags 2.5.0", + "rustix 0.38.32", + "wayland-backend", + "wayland-scanner 0.31.1", +] + +[[package]] +name = "wayland-commons" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +dependencies = [ + "nix 0.24.3", + "once_cell", + "smallvec", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.5.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +dependencies = [ + "rustix 0.38.32", + "wayland-client 0.31.2", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +dependencies = [ + "bitflags 1.3.2", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-scanner 0.29.5", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client 0.31.2", + "wayland-scanner 0.31.1", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client 0.31.2", + "wayland-protocols 0.31.2", + "wayland-scanner 0.31.1", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-client 0.31.2", + "wayland-protocols 0.31.2", + "wayland-scanner 0.31.1", +] + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", "log", - "serde", - "serde_derive", - "serde_json", - "time", - "unicode-segmentation", - "url", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", ] [[package]] @@ -6468,27 +5780,113 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +name = "wgpu" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ - "either", - "home", - "once_cell", - "rustix", + "arrayvec", + "cfg-if", + "cfg_aliases 0.1.1", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle 0.6.0", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", ] [[package]] -name = "whoami" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +name = "wgpu-core" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.5.0", + "cfg_aliases 0.1.1", + "codespan-reporting", + "indexmap", + "log", + "naga", + "once_cell", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle 0.6.0", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.5.0", + "block", + "cfg_aliases 0.1.1", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.3", + "log", + "metal", + "naga", + "objc", + "once_cell", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle 0.6.0", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", "wasm-bindgen", "web-sys", + "wgpu-types", + "winapi", ] +[[package]] +name = "wgpu-types" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +dependencies = [ + "bitflags 2.5.0", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + [[package]] name = "winapi" version = "0.3.9" @@ -6514,6 +5912,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "winapi-wsapoll" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -6521,18 +5928,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3ed69de2c1f8d0524a8a3417a80a85dd316a071745fbfdf5eb028b310058ab" +name = "window_clipboard" +version = "0.4.1" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-4#6ca3cc3d4c221d34a4c385957bd3fd8be9ad48e5" dependencies = [ - "windows_aarch64_gnullvm 0.41.0", - "windows_aarch64_msvc 0.41.0", - "windows_i686_gnu 0.41.0", - "windows_i686_msvc 0.41.0", - "windows_x86_64_gnu 0.41.0", - "windows_x86_64_gnullvm 0.41.0", - "windows_x86_64_msvc 0.41.0", + "clipboard-win 5.3.0", + "clipboard_macos", + "clipboard_wayland", + "clipboard_x11", + "dnd", + "mime", + "raw-window-handle 0.6.0", + "thiserror", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.4", ] [[package]] @@ -6541,7 +5969,38 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-implement" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-interface" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", ] [[package]] @@ -6559,7 +6018,22 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -6579,24 +6053,24 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "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_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "163d2761774f2278ecb4e6719e80b2b5e92e5a2be73a7bcd3ef624dd5e3091fd" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" @@ -6606,15 +6080,15 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef005ff2bceb00d3b84166a359cc19084f9459754fd3fe5a504dee3dddcd0a0c" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" @@ -6624,15 +6098,15 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4df2d51e32f03f8b4b228e487828c03bcb36d97b216fc5463bcea5bb1440b" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" @@ -6642,15 +6116,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a966834571f2f3267f07dd72b4d8507381f25e53d056808483b2637385ef7" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" @@ -6660,15 +6134,15 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc395dac1adf444e276d096d933ae7961361c8cda3245cffef7a9b3a70a8f994" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" @@ -6678,15 +6152,15 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e8ec22b715d5b436e1d59c8adad6c744dc20cd984710121d5836b4e8dbb5e0" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" @@ -6696,15 +6170,15 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9761f0216b669019df1512f6e25e5ee779bf61c5cdc43c7293858e7efd7926" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" @@ -6714,115 +6188,293 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "winit" +version = "0.29.10" +source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#bdc66109acc85c912264c9e4b864520345bdb45f" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.5.0", + "bytemuck", + "calloop 0.12.4", + "cfg_aliases 0.1.1", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate 0.0.4", + "js-sys", + "libc", + "log", + "memmap2", + "ndk", + "ndk-sys", + "objc2 0.4.1", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle 0.6.0", + "redox_syscall 0.3.5", + "rustix 0.38.32", + "sctk-adwaita", + "smithay-client-toolkit 0.18.1", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client 0.31.2", + "wayland-protocols 0.31.2", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb 0.13.0", + "xkbcommon-dl", +] [[package]] name = "winnow" -version = "0.5.39" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] -name = "winreg" -version = "0.50.0" +name = "winnow" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "memchr", ] [[package]] -name = "x509-parser" -version = "0.13.2" +name = "wl-clipboard-rs" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" +checksum = "981a303dfbb75d659f6612d05a14b2e363c103d24f676a2d44a00d18507a1ad9" dependencies = [ - "asn1-rs", - "base64 0.13.1", - "data-encoding", - "der-parser", - "lazy_static", - "nom", - "oid-registry", - "rusticata-macros", + "derive-new", + "libc", + "log", + "nix 0.24.3", + "os_pipe", + "tempfile", "thiserror", - "time", + "tree_magic_mini", + "wayland-client 0.29.5", + "wayland-protocols 0.29.5", ] [[package]] -name = "yew" -version = "0.20.0" +name = "x11-clipboard" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dbecfe44343b70cc2932c3eb445425969ae21754a8ab3a0966981c1cf7af1cc" +checksum = "980b9aa9226c3b7de8e2adb11bf20124327c054e0e5812d2aac0b5b5a87e7464" dependencies = [ - "console_error_panic_hook", - "futures", - "gloo", - "implicit-clone", - "indexmap 1.9.3", - "js-sys", - "prokio", - "rustversion", + "x11rb 0.10.1", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" +dependencies = [ + "gethostname 0.2.3", + "nix 0.24.3", + "winapi", + "winapi-wsapoll", + "x11rb-protocol 0.10.0", +] + +[[package]] +name = "x11rb" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +dependencies = [ + "as-raw-xcb-connection", + "gethostname 0.4.3", + "libc", + "libloading 0.8.3", + "once_cell", + "rustix 0.38.32", + "x11rb-protocol 0.13.0", +] + +[[package]] +name = "x11rb-protocol" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" +dependencies = [ + "nix 0.24.3", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.5.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + +[[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "xxhash-rust" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", "serde", - "slab", - "thiserror", + "serde_repr", + "sha1", + "static_assertions", "tokio", "tracing", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "yew-macro", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", ] [[package]] -name = "yew-macro" -version = "0.20.0" +name = "zbus_macros" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64c253c1d401f1ea868ca9988db63958cfa15a69f739101f338d6f05eea8301" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ - "boolinator", - "once_cell", - "prettyplease 0.1.25", - "proc-macro-error", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", + "regex", "syn 1.0.109", + "zvariant_utils", ] [[package]] -name = "yew-router" -version = "0.17.0" +name = "zbus_names" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426ee0486d2572a6c5e39fbdbc48b58d59bb555f3326f54631025266cf04146e" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ - "gloo", - "js-sys", - "route-recognizer", "serde", - "serde_urlencoded", - "tracing", - "wasm-bindgen", - "web-sys", - "yew", - "yew-router-macro", + "static_assertions", + "zvariant", ] [[package]] -name = "yew-router-macro" -version = "0.17.0" +name = "zeno" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b249cdb39e0cddaf0644dedc781854524374664793479fdc01e6a65d6e6ae3" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" [[package]] name = "zerocopy" @@ -6841,53 +6493,53 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] -name = "zeroize" -version = "1.7.0" +name = "zune-inflate" +version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" dependencies = [ - "zeroize_derive", + "simd-adler32", ] [[package]] -name = "zeroize_derive" -version = "1.4.2" +name = "zvariant" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", -] - -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "byteorder", - "crc32fast", - "crossbeam-utils", - "flate2", -] - -[[package]] -name = "zxcvbn" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103fa851fff70ea29af380e87c25c48ff7faac5c530c70bd0e65366d4e0c94e4" -dependencies = [ - "derive_builder", - "fancy-regex", - "itertools 0.10.5", - "js-sys", - "lazy_static", - "quick-error", - "regex", - "time", + "syn 1.0.109", ] diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-tasks/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-tasks/package.nix new file mode 100644 index 0000000000..6116b37844 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-tasks/package.nix @@ -0,0 +1,101 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, wrapGAppsHook3 +, atk +, cairo +, gdk-pixbuf +, glib +, gtk3 +, libsecret +, libxkbcommon +, openssl +, pango +, sqlite +, vulkan-loader +, stdenv +, darwin +, wayland +}: + +let + commitDate = "2024-04-30"; +in rustPlatform.buildRustPackage rec { + pname = "cosmic-tasks"; + version = "0-unstable-${commitDate}"; + + src = fetchFromGitHub { + owner = "edfloreshz"; + repo = "cosmic-tasks"; + rev = "020ae8633b23091f113b19f4b6f992e36404f2e2"; + hash = "sha256-ZPEzvscLYH4vJ+5Nh5J9m8ZX2jXXDMOLswSnHaCdSdA="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.12.2" = "sha256-ksaYMGT/oug7isQY8/1WD97XDUsX2ShBdabUzxWffYw="; + "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; + "clipboard_macos-0.1.0" = "sha256-KVcKQ4DtoZCgFBnejIaQfQxJJJxd/mFzHBI+4PbGBio="; + "cosmic-config-0.1.0" = "sha256-VEE/1XQZaojz9gxTV/Zz++eVplsCfiDPgf/cAr2Rih8="; + "cosmic-text-0.11.2" = "sha256-gUIQFHPaFTmtUfgpVvsGTnw2UKIBx9gl0K67KPuynWs="; + "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; + "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "smithay-client-toolkit-0.18.0" = "sha256-/7twYMt5/LpzxLXAQKTGNnWcfspUkkZsN5hJu7KaANc="; + "smithay-clipboard-0.8.0" = "sha256-LDd56TJ175qsj2/EV/dbBRV9HMU7RzgrG5JP7H2PmhE="; + "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; + "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; + "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; + }; + }; + + # COSMIC applications now uses vergen for the About page + # Update the COMMIT_DATE to match when the commit was made + env.VERGEN_GIT_COMMIT_DATE = commitDate; + env.VERGEN_GIT_SHA = src.rev; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk3 + libsecret + libxkbcommon + openssl + pango + sqlite + vulkan-loader + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreGraphics + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Metal + darwin.apple_sdk.frameworks.QuartzCore + darwin.apple_sdk.frameworks.Security + ] ++ lib.optionals stdenv.isLinux [ + wayland + ]; + + postFixup = lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/cosmic-tasks \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libxkbcommon wayland ]}" + ''; + + meta = with lib; { + description = "A simple task management application for the COSMIC desktop"; + homepage = "https://github.com/edfloreshz/cosmic-tasks"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ GaetanLepage ]; + platforms = platforms.linux; + mainProgram = "cosmic-tasks"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/Cargo.lock index 3130abd0c0..549e586707 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/Cargo.lock @@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" dependencies = [ "ab_glyph_rasterizer", - "owned_ttf_parser 0.20.0", + "owned_ttf_parser", ] [[package]] @@ -84,7 +84,7 @@ dependencies = [ "accesskit_unix", "accesskit_windows", "raw-window-handle 0.6.0", - "winit 0.29.10", + "winit", ] [[package]] @@ -102,19 +102,13 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - [[package]] name = "ahash" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "getrandom", "once_cell", "version_check", @@ -132,16 +126,16 @@ dependencies = [ [[package]] name = "alacritty_terminal" -version = "0.20.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6121a8d385a114873632d785a99614ae1d324b3e38b9da8a92138c8799b50fdc" +checksum = "f6d1ea4484c8676f295307a4892d478c70ac8da1dbd8c7c10830a504b7f1022f" dependencies = [ - "base64", + "base64 0.22.0", "bitflags 2.4.2", "home", "libc", "log", - "miow 0.6.0", + "miow", "parking_lot 0.12.1", "piper", "polling 3.4.0", @@ -172,19 +166,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" -[[package]] -name = "andrew" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf" -dependencies = [ - "bitflags 1.3.2", - "rusttype", - "walkdir", - "xdg", - "xml-rs", -] - [[package]] name = "android-activity" version = "0.5.2" @@ -199,10 +180,10 @@ dependencies = [ "jni-sys", "libc", "log", - "ndk 0.8.0", + "ndk", "ndk-context", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.2", + "ndk-sys", + "num_enum", "thiserror", ] @@ -283,9 +264,9 @@ checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "apply" @@ -304,9 +285,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" [[package]] name = "arrayref" @@ -359,6 +340,23 @@ dependencies = [ "zbus", ] +[[package]] +name = "ashpd" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01992ad7774250d5b7fe214e2676cb99bf92564436d8135ab44fe815e71769a9" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus", +] + [[package]] name = "async-broadcast" version = "0.5.1" @@ -376,7 +374,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 5.1.0", + "event-listener 5.2.0", "event-listener-strategy 0.5.0", "futures-core", "pin-project-lite", @@ -392,7 +390,7 @@ dependencies = [ "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "slab", ] @@ -416,7 +414,7 @@ checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock 2.8.0", "autocfg", - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "futures-lite 1.13.0", "log", @@ -430,15 +428,15 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ "async-lock 3.3.0", - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "parking", "polling 3.4.0", "rustix 0.38.28", @@ -477,7 +475,7 @@ dependencies = [ "async-lock 2.8.0", "async-signal", "blocking", - "cfg-if 1.0.0", + "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", "rustix 0.38.28", @@ -486,13 +484,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -501,10 +499,10 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.3.1", + "async-io 2.3.2", "async-lock 2.8.0", "atomic-waker", - "cfg-if 1.0.0", + "cfg-if", "futures-core", "futures-io", "rustix 0.38.28", @@ -521,13 +519,13 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -620,9 +618,9 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", - "miniz_oxide 0.7.2", + "miniz_oxide", "object", "rustc-demangle", ] @@ -633,6 +631,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "bit-set" version = "0.5.3" @@ -724,35 +728,35 @@ dependencies = [ "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "piper", "tracing", ] [[package]] name = "bumpalo" -version = "3.15.3" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -777,16 +781,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "calloop" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c" -dependencies = [ - "log", - "nix 0.18.0", -] - [[package]] name = "calloop" version = "0.12.4" @@ -807,18 +801,19 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ - "calloop 0.12.4", + "calloop", "rustix 0.38.28", "wayland-backend", - "wayland-client 0.31.2", + "wayland-client", ] [[package]] name = "cc" -version = "1.0.88" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ + "jobserver", "libc", ] @@ -838,12 +833,6 @@ dependencies = [ "target-lexicon", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -864,9 +853,9 @@ checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", @@ -874,14 +863,14 @@ dependencies = [ "num-traits", "pure-rust-locales", "wasm-bindgen", - "windows-targets 0.52.3", + "windows-targets 0.52.4", ] [[package]] name = "clipboard-win" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297" +checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" dependencies = [ "error-code", ] @@ -889,8 +878,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" dependencies = [ "objc", "objc-foundation", @@ -900,38 +888,21 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003f886bc4e2987729d10c1db3424e7f80809f3fc22dbc16c685738887cb37b8" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" dependencies = [ + "mime 0.1.0", "smithay-clipboard", ] [[package]] name = "clipboard_x11" version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4274ea815e013e0f9f04a2633423e14194e408a0576c943ce3d14ca56c50031c" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" dependencies = [ "thiserror", "x11rb", ] -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation 0.9.4", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "libc", - "objc", -] - [[package]] name = "cocoa" version = "0.25.0" @@ -941,9 +912,9 @@ dependencies = [ "bitflags 1.3.2", "block", "cocoa-foundation", - "core-foundation 0.9.4", - "core-graphics 0.23.1", - "foreign-types 0.5.0", + "core-foundation", + "core-graphics", + "foreign-types", "libc", "objc", ] @@ -956,7 +927,7 @@ checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ "bitflags 1.3.2", "block", - "core-foundation 0.9.4", + "core-foundation", "core-graphics-types", "libc", "objc", @@ -1036,9 +1007,9 @@ dependencies = [ [[package]] name = "const-random" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" dependencies = [ "const-random-macro", ] @@ -1054,63 +1025,22 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - [[package]] name = "core-foundation" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "core-foundation-sys 0.8.6", + "core-foundation-sys", "libc", ] -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - [[package]] name = "core-foundation-sys" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "core-graphics" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.7.0", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", -] - [[package]] name = "core-graphics" version = "0.23.1" @@ -1118,9 +1048,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", + "core-foundation", "core-graphics-types", - "foreign-types 0.5.0", + "foreign-types", "libc", ] @@ -1131,27 +1061,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", + "core-foundation", "libc", ] -[[package]] -name = "core-video-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" -dependencies = [ - "cfg-if 0.1.10", - "core-foundation-sys 0.7.0", - "core-graphics 0.19.2", - "libc", - "objc", -] - [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1168,7 +1085,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "quote", "syn 1.0.109", @@ -1177,28 +1094,32 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files.git#8ab15027a521713850384fa87666bb9974f2666b" +source = "git+https://github.com/pop-os/cosmic-files.git#33621a68d0293379a71ae5f01c99be8136a52829" dependencies = [ "chrono", "dirs", - "env_logger 0.11.2", + "env_logger 0.11.3", "fork", "i18n-embed", "i18n-embed-fl", - "image 0.24.9", + "image", "lexical-sort", + "libc", "libcosmic", "log", "mime_guess", "notify", "once_cell", + "open", "paste", "rust-embed", "serde", + "shlex", "smol_str", - "systemicons", "tokio", "trash", + "vergen", + "xdg-mime", ] [[package]] @@ -1233,7 +1154,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.11.2" -source = "git+https://github.com/pop-os/cosmic-text.git#2766961af621b9235616e186046f6d14a2f5fbc0" +source = "git+https://github.com/pop-os/cosmic-text.git#b08676909f882f553ab574601b35b58276a52458" dependencies = [ "bitflags 2.4.2", "fontdb", @@ -1245,7 +1166,7 @@ dependencies = [ "self_cell 1.0.3", "swash", "sys-locale", - "ttf-parser 0.20.0", + "ttf-parser", "unicode-bidi", "unicode-linebreak", "unicode-script", @@ -1255,15 +1176,17 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "almost", "cosmic-config", "csscolorparser", + "dirs", "lazy_static", "palette", "ron", "serde", + "thiserror", ] [[package]] @@ -1281,27 +1204,14 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", + "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ "crossbeam-utils", ] @@ -1325,15 +1235,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.19" @@ -1379,15 +1280,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.51", + "syn 2.0.53", ] -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - [[package]] name = "cursor-icon" version = "1.1.0" @@ -1400,42 +1295,18 @@ version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "bitflags 2.4.2", - "libloading 0.8.1", + "libloading 0.8.3", "winapi", ] -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - [[package]] name = "darling" version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn 1.0.109", + "darling_core", + "darling_macro", ] [[package]] @@ -1448,19 +1319,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.51", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", - "syn 1.0.109", + "strsim", + "syn 2.0.53", ] [[package]] @@ -1469,9 +1329,9 @@ version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ - "darling_core 0.20.8", + "darling_core", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -1480,7 +1340,7 @@ version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "hashbrown", "lock_api", "once_cell", @@ -1493,16 +1353,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" -[[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - [[package]] name = "deranged" version = "0.3.11" @@ -1529,10 +1379,10 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" dependencies = [ - "darling 0.20.8", + "darling", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -1560,7 +1410,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -1601,16 +1451,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", -] - -[[package]] -name = "dlib" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76" -dependencies = [ - "libloading 0.6.7", + "syn 2.0.53", ] [[package]] @@ -1619,7 +1460,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.1", + "libloading 0.8.3", ] [[package]] @@ -1700,7 +1541,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -1728,9 +1569,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ "anstream", "anstyle", @@ -1810,9 +1651,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.1.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" dependencies = [ "concurrent-queue", "parking", @@ -1835,7 +1676,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" dependencies = [ - "event-listener 5.1.0", + "event-listener 5.2.0", "pin-project-lite", ] @@ -1849,7 +1690,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide 0.7.2", + "miniz_oxide", "rayon-core", "smallvec", "zune-inflate", @@ -1891,7 +1732,7 @@ version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall 0.4.1", "windows-sys 0.52.0", @@ -1913,7 +1754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", - "miniz_oxide 0.7.2", + "miniz_oxide", ] [[package]] @@ -1989,9 +1830,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd7f3ea17572640b606b35df42cfb6ecdf003704b062580e59918692190b73d" +checksum = "5b7f6040d337bd44434ab21fc6509154edf2cece88b23758d9d64654c4e7730b" [[package]] name = "fontconfig-parser" @@ -2010,19 +1851,10 @@ checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.9.4", + "memmap2", "slotmap", "tinyvec", - "ttf-parser 0.20.0", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", + "ttf-parser", ] [[package]] @@ -2032,7 +1864,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ "foreign-types-macros", - "foreign-types-shared 0.3.1", + "foreign-types-shared", ] [[package]] @@ -2043,15 +1875,9 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "foreign-types-shared" version = "0.3.1" @@ -2174,9 +2000,9 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ "fastrand 2.0.1", "futures-core", @@ -2193,7 +2019,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -2282,21 +2108,11 @@ version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi", ] -[[package]] -name = "gif" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.12.0" @@ -2504,7 +2320,7 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crunchy", ] @@ -2527,7 +2343,7 @@ dependencies = [ "bitflags 2.4.2", "com", "libc", - "libloading 0.8.1", + "libloading 0.8.3", "thiserror", "widestring", "winapi", @@ -2541,9 +2357,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379dada1584ad501b383485dd706b8afb7a70fcbc7f4da7d780638a5a6124a60" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2593,7 +2409,7 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "toml 0.8.10", + "toml 0.8.12", "unic-langid", ] @@ -2635,8 +2451,8 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.51", + "strsim", + "syn 2.0.53", "unic-langid", ] @@ -2650,7 +2466,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -2660,7 +2476,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.6", + "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", @@ -2679,7 +2495,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "iced_accessibility", "iced_core", @@ -2687,14 +2503,15 @@ dependencies = [ "iced_renderer", "iced_widget", "iced_winit", - "image 0.24.9", + "image", "thiserror", + "window_clipboard", ] [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "accesskit", "accesskit_winit", @@ -2703,7 +2520,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "bitflags 1.3.2", "log", @@ -2714,13 +2531,14 @@ dependencies = [ "smol_str", "thiserror", "web-time", + "window_clipboard", "xxhash-rust", ] [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "futures", "iced_core", @@ -2733,7 +2551,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2742,7 +2560,7 @@ dependencies = [ "half", "iced_core", "iced_futures", - "image 0.24.9", + "image", "kamadak-exif", "log", "lyon_path", @@ -2757,7 +2575,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2769,17 +2587,18 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "iced_core", "iced_futures", "thiserror", + "window_clipboard", ] [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "iced_core", "once_cell", @@ -2789,7 +2608,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "bytemuck", "cosmic-text", @@ -2806,7 +2625,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2825,7 +2644,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "iced_renderer", "iced_runtime", @@ -2839,7 +2658,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "iced_graphics", "iced_runtime", @@ -2850,7 +2669,7 @@ dependencies = [ "web-sys", "winapi", "window_clipboard", - "winit 0.29.10", + "winit", ] [[package]] @@ -2890,25 +2709,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "image" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif 0.11.4", - "jpeg-decoder 0.1.22", - "num-iter", - "num-rational 0.3.2", - "num-traits", - "png 0.16.8", - "scoped_threadpool", - "tiff 0.6.1", -] - [[package]] name = "image" version = "0.24.9" @@ -2920,11 +2720,11 @@ dependencies = [ "color_quant", "exr", "gif 0.13.1", - "jpeg-decoder 0.3.1", + "jpeg-decoder", "num-traits", - "png 0.17.13", + "png", "qoi", - "tiff 0.9.1", + "tiff", ] [[package]] @@ -2935,9 +2735,9 @@ checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] name = "indexmap" -version = "2.2.3" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", "hashbrown", @@ -2969,7 +2769,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -3045,7 +2845,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", - "cfg-if 1.0.0", + "cfg-if", "combine", "jni-sys", "log", @@ -3061,12 +2861,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] -name = "jpeg-decoder" -version = "0.1.22" +name = "jobserver" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ - "rayon", + "libc", ] [[package]] @@ -3080,9 +2880,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -3103,7 +2903,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.1", + "libloading 0.8.3", "pkg-config", ] @@ -3171,7 +2971,7 @@ checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec 0.5.2", "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "ryu", "static_assertions", ] @@ -3193,10 +2993,11 @@ source = "git+https://gitlab.redox-os.org/redox-os/liblibc.git?branch=redox_0.2. [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#a09e76e729895690caac6ac620c212a2e3745d32" +source = "git+https://github.com/pop-os/libcosmic.git#01d7e46feadccf70825c3a822a566fb266d3add6" dependencies = [ "apply", - "ashpd", + "ashpd 0.7.0", + "chrono", "cosmic-config", "cosmic-theme", "css-color", @@ -3226,34 +3027,24 @@ dependencies = [ "zbus", ] -[[package]] -name = "libloading" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" -dependencies = [ - "cfg-if 1.0.0", - "winapi", -] - [[package]] name = "libloading" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "winapi", ] [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", + "cfg-if", + "windows-targets 0.52.4", ] [[package]] @@ -3327,9 +3118,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lru" @@ -3407,15 +3198,6 @@ version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" -[[package]] -name = "memmap2" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a" -dependencies = [ - "libc", -] - [[package]] name = "memmap2" version = "0.9.4" @@ -3452,12 +3234,20 @@ dependencies = [ "bitflags 2.4.2", "block", "core-graphics-types", - "foreign-types 0.5.0", + "foreign-types", "log", "objc", "paste", ] +[[package]] +name = "mime" +version = "0.1.0" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" +dependencies = [ + "smithay-clipboard", +] + [[package]] name = "mime" version = "0.3.17" @@ -3470,29 +3260,10 @@ version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ - "mime", + "mime 0.3.17", "unicase", ] -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - [[package]] name = "miniz_oxide" version = "0.7.2" @@ -3505,22 +3276,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -dependencies = [ - "libc", - "log", - "miow 0.3.7", - "ntapi", - "winapi", -] - -[[package]] -name = "mio" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -3528,27 +3286,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mio-misc" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47412f3a52115b936ff2a229b803498c7b4d332adeb87c2f1498c9da54c398c" -dependencies = [ - "crossbeam", - "crossbeam-queue", - "log", - "mio 0.7.14", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - [[package]] name = "miow" version = "0.6.0" @@ -3584,18 +3321,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "ndk" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab" -dependencies = [ - "jni-sys", - "ndk-sys 0.2.2", - "num_enum 0.5.11", - "thiserror", -] - [[package]] name = "ndk" version = "0.8.0" @@ -3605,8 +3330,8 @@ dependencies = [ "bitflags 2.4.2", "jni-sys", "log", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.2", + "ndk-sys", + "num_enum", "raw-window-handle 0.6.0", "thiserror", ] @@ -3617,39 +3342,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-glue" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk 0.3.0", - "ndk-macro", - "ndk-sys 0.2.2", -] - -[[package]] -name = "ndk-macro" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" -dependencies = [ - "darling 0.10.2", - "proc-macro-crate 0.1.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ndk-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" - [[package]] name = "ndk-sys" version = "0.5.0+25.2.9519653" @@ -3659,30 +3351,6 @@ dependencies = [ "jni-sys", ] -[[package]] -name = "nix" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if 0.1.10", - "libc", -] - -[[package]] -name = "nix" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if 1.0.0", - "libc", -] - [[package]] name = "nix" version = "0.26.4" @@ -3690,7 +3358,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset 0.7.1", ] @@ -3720,20 +3388,11 @@ dependencies = [ "kqueue", "libc", "log", - "mio 0.8.10", + "mio", "walkdir", "windows-sys 0.48.0", ] -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - [[package]] name = "num" version = "0.4.1" @@ -3744,7 +3403,7 @@ dependencies = [ "num-complex", "num-integer", "num-iter", - "num-rational 0.4.1", + "num-rational", "num-traits", ] @@ -3794,17 +3453,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.1" @@ -3837,34 +3485,13 @@ dependencies = [ "libc", ] -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - [[package]] name = "num_enum" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.2", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "num_enum_derive", ] [[package]] @@ -3876,7 +3503,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -3982,9 +3609,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.0.2" +version = "5.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eedff767bc49d336bff300224f73307ae36963c843e38dc9312a22171b012cbc" +checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" dependencies = [ "is-wsl", "libc", @@ -4047,16 +3674,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.51", -] - -[[package]] -name = "owned_ttf_parser" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb" -dependencies = [ - "ttf-parser 0.15.2", + "syn 2.0.53", ] [[package]] @@ -4065,7 +3683,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" dependencies = [ - "ttf-parser 0.20.0", + "ttf-parser", ] [[package]] @@ -4089,7 +3707,7 @@ checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -4137,7 +3755,7 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", "redox_syscall 0.2.16", @@ -4151,7 +3769,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall 0.4.1", "smallvec", @@ -4206,7 +3824,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -4253,18 +3871,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "png" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "deflate", - "miniz_oxide 0.3.7", -] - [[package]] name = "png" version = "0.17.13" @@ -4275,7 +3881,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.2", + "miniz_oxide", ] [[package]] @@ -4286,7 +3892,7 @@ checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "libc", "log", @@ -4300,7 +3906,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "pin-project-lite", "rustix 0.38.28", @@ -4326,15 +3932,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml 0.5.11", -] - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -4380,9 +3977,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -4468,25 +4065,6 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" -[[package]] -name = "raw-window-handle" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" -dependencies = [ - "libc", - "raw-window-handle 0.4.3", -] - -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - [[package]] name = "raw-window-handle" version = "0.5.2" @@ -4501,9 +4079,9 @@ checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" [[package]] name = "rayon" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -4527,9 +4105,9 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "read-fonts" -version = "0.15.6" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ea23eedb4d938031b6d4343222444608727a6aa68ec355e13588d9947ffe92" +checksum = "81c524658d3b77930a391f559756d91dbe829ab6cf4687083f615d395df99722" dependencies = [ "font-types", ] @@ -4586,9 +4164,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -4603,9 +4181,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "renderdoc-sys" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "resvg" @@ -4614,10 +4192,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" dependencies = [ "gif 0.12.0", - "jpeg-decoder 0.3.1", + "jpeg-decoder", "log", "pico-args", - "png 0.17.13", + "png", "rgb", "svgtypes", "tiny-skia", @@ -4630,7 +4208,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0d8ab342bcc5436e04d3a4c1e09e17d74958bfaddf8d5fad6f85607df0f994f" dependencies = [ - "ashpd", + "ashpd 0.6.8", "block", "dispatch", "glib-sys", @@ -4663,7 +4241,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64", + "base64 0.21.7", "bitflags 2.4.2", "serde", "serde_derive", @@ -4695,7 +4273,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.51", + "syn 2.0.53", "walkdir", ] @@ -4715,7 +4293,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ordered-multimap", ] @@ -4770,16 +4348,6 @@ dependencies = [ "rustix 0.38.28", ] -[[package]] -name = "rusttype" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff8374aa04134254b7995b63ad3dc41c7f7236f69528b28553da7d72efaa967" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser 0.15.2", -] - [[package]] name = "rustversion" version = "1.0.14" @@ -4796,7 +4364,7 @@ dependencies = [ "bytemuck", "libm", "smallvec", - "ttf-parser 0.20.0", + "ttf-parser", "unicode-bidi-mirroring", "unicode-ccc", "unicode-properties", @@ -4824,12 +4392,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" -[[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.2.0" @@ -4844,8 +4406,8 @@ checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.4", - "smithay-client-toolkit 0.18.1", + "memmap2", + "smithay-client-toolkit", "tiny-skia", ] @@ -4881,7 +4443,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -4892,7 +4454,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -4910,7 +4472,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -4921,7 +4483,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -4996,25 +4558,6 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" -[[package]] -name = "smithay-client-toolkit" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80" -dependencies = [ - "andrew", - "bitflags 1.3.2", - "calloop 0.6.5", - "dlib 0.4.2", - "lazy_static", - "log", - "memmap2 0.1.0", - "nix 0.18.0", - "wayland-client 0.28.6", - "wayland-cursor 0.28.6", - "wayland-protocols 0.28.6", -] - [[package]] name = "smithay-client-toolkit" version = "0.18.1" @@ -5022,32 +4565,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ "bitflags 2.4.2", - "calloop 0.12.4", + "calloop", "calloop-wayland-source", "cursor-icon", "libc", "log", - "memmap2 0.9.4", + "memmap2", "rustix 0.38.28", "thiserror", "wayland-backend", - "wayland-client 0.31.2", + "wayland-client", "wayland-csd-frame", - "wayland-cursor 0.31.1", - "wayland-protocols 0.31.2", + "wayland-cursor", + "wayland-protocols", "wayland-protocols-wlr", - "wayland-scanner 0.31.1", + "wayland-scanner", "xkeysym", ] [[package]] name = "smithay-clipboard" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +version = "0.8.0" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-mime-types#cc0101c1f9ccc937a413bd3af3c0f6217f27e935" dependencies = [ "libc", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "wayland-backend", ] @@ -5088,14 +4630,14 @@ dependencies = [ "as-raw-xcb-connection", "bytemuck", "cfg_aliases 0.2.0", - "cocoa 0.25.0", - "core-graphics 0.23.1", + "cocoa", + "core-graphics", "drm", "fastrand 2.0.1", - "foreign-types 0.5.0", + "foreign-types", "js-sys", "log", - "memmap2 0.9.4", + "memmap2", "objc", "raw-window-handle 0.6.0", "redox_syscall 0.4.1", @@ -5103,8 +4645,8 @@ dependencies = [ "tiny-xlib", "wasm-bindgen", "wayland-backend", - "wayland-client 0.31.2", - "wayland-sys 0.31.1", + "wayland-client", + "wayland-sys", "web-sys", "windows-sys 0.52.0", "x11rb", @@ -5143,12 +4685,6 @@ dependencies = [ "float-cmp", ] -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "strsim" version = "0.10.0" @@ -5157,9 +4693,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "svg_fmt" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" +checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499" [[package]] name = "svgtypes" @@ -5173,9 +4709,9 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06ff4664af8923625604261c645f5c4cc610cc83c84bec74b50d76237089de7" +checksum = "9af636fb90d39858650cae1088a37e2862dab4e874a0bb49d6dfb5b2dacf0e24" dependencies = [ "read-fonts", "yazi", @@ -5195,9 +4731,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.51" +version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ "proc-macro2", "quote", @@ -5215,32 +4751,17 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "e8e9199467bcbc77c6a13cc6e32a6af21721ab8c96aa0261856c4fda5a4433f0" dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.8.10", + "toml 0.8.12", "version-compare", ] -[[package]] -name = "systemicons" -version = "0.7.0" -source = "git+https://github.com/jackpot51/systemicons#501887629ebf3f9b9d3384383da62d352af3fbd7" -dependencies = [ - "cocoa 0.24.1", - "freedesktop-icons", - "image 0.23.14", - "lazy_static", - "objc", - "winapi", - "winit 0.25.0", - "xdg-mime", -] - [[package]] name = "taffy" version = "0.3.11" @@ -5264,7 +4785,7 @@ version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand 2.0.1", "redox_syscall 0.4.1", "rustix 0.38.28", @@ -5282,33 +4803,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", -] - -[[package]] -name = "tiff" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" -dependencies = [ - "jpeg-decoder 0.1.22", - "miniz_oxide 0.4.4", - "weezl", + "syn 2.0.53", ] [[package]] @@ -5318,7 +4828,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", - "jpeg-decoder 0.3.1", + "jpeg-decoder", "weezl", ] @@ -5373,9 +4883,9 @@ dependencies = [ "arrayref", "arrayvec 0.7.4", "bytemuck", - "cfg-if 1.0.0", + "cfg-if", "log", - "png 0.17.13", + "png", "tiny-skia-path", ] @@ -5398,7 +4908,7 @@ checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" dependencies = [ "as-raw-xcb-connection", "ctor", - "libloading 0.8.1", + "libloading 0.8.3", "tracing", ] @@ -5435,7 +4945,7 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio 0.8.10", + "mio", "num_cpus", "pin-project-lite", "signal-hook-registry", @@ -5455,14 +4965,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.8", ] [[package]] @@ -5498,15 +5008,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.2", + "winnow 0.6.5", ] [[package]] @@ -5528,7 +5038,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] @@ -5556,12 +5066,6 @@ dependencies = [ "windows 0.44.0", ] -[[package]] -name = "ttf-parser" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" - [[package]] name = "ttf-parser" version = "0.20.0" @@ -5715,7 +5219,7 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" dependencies = [ - "base64", + "base64 0.21.7", "log", "pico-args", "usvg-parser", @@ -5783,7 +5287,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" dependencies = [ "anyhow", - "cfg-if 1.0.0", + "cfg-if", "rustversion", "time", ] @@ -5832,9 +5336,9 @@ checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -5848,36 +5352,36 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -5885,9 +5389,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5895,22 +5399,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-timer" @@ -5938,23 +5442,7 @@ dependencies = [ "rustix 0.38.28", "scoped-tls", "smallvec", - "wayland-sys 0.31.1", -] - -[[package]] -name = "wayland-client" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix 0.20.0", - "scoped-tls", - "wayland-commons", - "wayland-scanner 0.28.6", - "wayland-sys 0.28.6", + "wayland-sys", ] [[package]] @@ -5966,19 +5454,7 @@ dependencies = [ "bitflags 2.4.2", "rustix 0.38.28", "wayland-backend", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-commons" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda" -dependencies = [ - "nix 0.20.0", - "once_cell", - "smallvec", - "wayland-sys 0.28.6", + "wayland-scanner", ] [[package]] @@ -5992,17 +5468,6 @@ dependencies = [ "wayland-backend", ] -[[package]] -name = "wayland-cursor" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a" -dependencies = [ - "nix 0.20.0", - "wayland-client 0.28.6", - "xcursor", -] - [[package]] name = "wayland-cursor" version = "0.31.1" @@ -6010,22 +5475,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" dependencies = [ "rustix 0.38.28", - "wayland-client 0.31.2", + "wayland-client", "xcursor", ] -[[package]] -name = "wayland-protocols" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f" -dependencies = [ - "bitflags 1.3.2", - "wayland-client 0.28.6", - "wayland-commons", - "wayland-scanner 0.28.6", -] - [[package]] name = "wayland-protocols" version = "0.31.2" @@ -6034,8 +5487,8 @@ checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ "bitflags 2.4.2", "wayland-backend", - "wayland-client 0.31.2", - "wayland-scanner 0.31.1", + "wayland-client", + "wayland-scanner", ] [[package]] @@ -6046,9 +5499,9 @@ checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ "bitflags 2.4.2", "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", - "wayland-scanner 0.31.1", + "wayland-client", + "wayland-protocols", + "wayland-scanner", ] [[package]] @@ -6059,20 +5512,9 @@ checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ "bitflags 2.4.2", "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-scanner" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", + "wayland-client", + "wayland-protocols", + "wayland-scanner", ] [[package]] @@ -6086,24 +5528,13 @@ dependencies = [ "quote", ] -[[package]] -name = "wayland-sys" -version = "0.28.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8" -dependencies = [ - "dlib 0.5.2", - "lazy_static", - "pkg-config", -] - [[package]] name = "wayland-sys" version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" dependencies = [ - "dlib 0.5.2", + "dlib", "log", "once_cell", "pkg-config", @@ -6111,9 +5542,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -6141,7 +5572,7 @@ version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "arrayvec 0.7.4", - "cfg-if 1.0.0", + "cfg-if", "cfg_aliases 0.1.1", "js-sys", "log", @@ -6207,7 +5638,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.1", + "libloading 0.8.3", "log", "metal", "naga", @@ -6277,13 +5708,13 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d692d46038c433f9daee7ad8757e002a4248c20b0a3fbc991d99521d3bcb6d" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea" dependencies = [ "clipboard-win", "clipboard_macos", "clipboard_wayland", "clipboard_x11", + "mime 0.1.0", "raw-window-handle 0.6.0", "thiserror", ] @@ -6315,7 +5746,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.3", + "windows-targets 0.52.4", ] [[package]] @@ -6324,7 +5755,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.3", + "windows-targets 0.52.4", ] [[package]] @@ -6373,7 +5804,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.3", + "windows-targets 0.52.4", ] [[package]] @@ -6408,17 +5839,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.3", - "windows_aarch64_msvc 0.52.3", - "windows_i686_gnu 0.52.3", - "windows_i686_msvc 0.52.3", - "windows_x86_64_gnu 0.52.3", - "windows_x86_64_gnullvm 0.52.3", - "windows_x86_64_msvc 0.52.3", + "windows_aarch64_gnullvm 0.52.4", + "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_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -6435,9 +5866,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -6453,9 +5884,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -6471,9 +5902,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -6489,9 +5920,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -6507,9 +5938,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -6525,9 +5956,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -6543,41 +5974,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.3" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" - -[[package]] -name = "winit" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79610794594d5e86be473ef7763f604f2159cbac8c94debd00df8fb41e86c2f8" -dependencies = [ - "bitflags 1.3.2", - "cocoa 0.24.1", - "core-foundation 0.9.4", - "core-graphics 0.22.3", - "core-video-sys", - "dispatch", - "instant", - "lazy_static", - "libc", - "log", - "mio 0.7.14", - "mio-misc", - "ndk 0.3.0", - "ndk-glue", - "ndk-sys 0.2.2", - "objc", - "parking_lot 0.11.2", - "percent-encoding", - "raw-window-handle 0.3.4", - "scopeguard", - "smithay-client-toolkit 0.12.3", - "wayland-client 0.28.6", - "winapi", - "x11-dl", -] +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winit" @@ -6589,18 +5988,18 @@ dependencies = [ "atomic-waker", "bitflags 2.4.2", "bytemuck", - "calloop 0.12.4", + "calloop", "cfg_aliases 0.1.1", - "core-foundation 0.9.4", - "core-graphics 0.23.1", + "core-foundation", + "core-graphics", "cursor-icon", "icrate 0.0.4", "js-sys", "libc", "log", - "memmap2 0.9.4", - "ndk 0.8.0", - "ndk-sys 0.5.0+25.2.9519653", + "memmap2", + "ndk", + "ndk-sys", "objc2 0.4.1", "once_cell", "orbclient", @@ -6609,14 +6008,14 @@ dependencies = [ "redox_syscall 0.3.5", "rustix 0.38.28", "sctk-adwaita", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "smol_str", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", + "wayland-client", + "wayland-protocols", "wayland-protocols-plasma", "web-sys", "web-time", @@ -6637,9 +6036,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a4191c47f15cc3ec71fcb4913cb83d58def65dd3787610213c649283b5ce178" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] @@ -6664,7 +6063,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.1", + "libloading 0.8.3", "once_cell", "rustix 0.38.28", "x11rb-protocol", @@ -6706,7 +6105,7 @@ checksum = "87bf7b69bb50588d70a36e467be29d3df3e8c32580276d62eded9738c1a797aa" dependencies = [ "dirs-next", "glob", - "mime", + "mime 0.3.17", "nom", "unicase", ] @@ -6718,7 +6117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ "bitflags 2.4.2", - "dlib 0.5.2", + "dlib", "log", "once_cell", "xkeysym", @@ -6778,7 +6177,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.26.4", + "nix", "once_cell", "ordered-stream", "rand", @@ -6812,9 +6211,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ "serde", "static_assertions", @@ -6844,7 +6243,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.53", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/package.nix index bbd3591e38..9a0453e0ee 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-term/package.nix @@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-term"; - version = "unstable-2024-02-28"; + version = "unstable-2024-04-14"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; - rev = "36477e06dc6d05bd01dc08b3f20e0a6e388d6c7e"; - hash = "sha256-VkRVfV4sC+5+/8g1FOlBjJCeR/KGb5gP0SWy5bmFo+Y="; + rev = "3e41d261a9d5d2284cd6ae85acde2562b8a5ccd6"; + hash = "sha256-IVLwWG4WUGXK9jY/d0Vr8RX/Klj1mUe4Q7Huv0BkjDo="; }; cargoLock = { @@ -32,14 +32,15 @@ rustPlatform.buildRustPackage rec { outputHashes = { "accesskit-0.12.2" = "sha256-ksaYMGT/oug7isQY8/1WD97XDUsX2ShBdabUzxWffYw="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "cosmic-config-0.1.0" = "sha256-Zyi95zcBAohM1WBropLzJczSIfNNNBK2odB4AmW4h5I="; - "cosmic-files-0.1.0" = "sha256-64An0MPgnFgyVlWmtBGBs+IV2z+4vmEY2uRPetZM4/M="; - "cosmic-text-0.11.2" = "sha256-Y9i5stMYpx+iqn4y5DJm1O1+3UIGp0/fSsnNq3Zloug="; + "clipboard_macos-0.1.0" = "sha256-PEH+aCpjDCEIj8s39nIeWxb7qu3u9IfriGqf0pYObMk="; + "cosmic-config-0.1.0" = "sha256-x/xWMR5w2oEbghTSa8iCi24DA2s99+tcnga8K6jS6HQ="; + "cosmic-files-0.1.0" = "sha256-KzWlmeZP3F5Kavi9FFXo3o8nB/h79TtOhqWUyI1ZRB0="; + "cosmic-text-0.11.2" = "sha256-K9cZeClr1zz4LanJS0WPEpxAplQrXfCjFKrSn5n4rDA="; "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; "libc-0.2.151" = "sha256-VcNTcLOnVXMlX86yeY0VDfIfKOZyyx/DO1Hbe30BsaI="; + "smithay-clipboard-0.8.0" = "sha256-OZOGbdzkgRIeDFrAENXE7g62eQTs60Je6lYVr0WudlE="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; - "systemicons-0.7.0" = "sha256-zzAI+6mnpQOh+3mX7/sJ+w4a7uX27RduQ99PNxLNF78="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; }; @@ -47,7 +48,7 @@ rustPlatform.buildRustPackage rec { # COSMIC applications now uses vergen for the About page # Update the COMMIT_DATE to match when the commit was made - env.VERGEN_GIT_COMMIT_DATE = "2024-02-28"; + env.VERGEN_GIT_COMMIT_DATE = "2024-04-14"; env.VERGEN_GIT_SHA = src.rev; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/co/cowsql/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cowsql/package.nix index 8089fc95a3..0c790fd505 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/cowsql/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cowsql/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - changelog = "https://github.com/cowsql/cowsql/releases/tag/${version}"; + changelog = "https://github.com/cowsql/cowsql/releases/tag/${finalAttrs.version}"; description = "Embeddable, replicated and fault tolerant SQL engine"; homepage = "https://github.com/cowsql/cowsql"; license = licenses.lgpl3Only; diff --git a/third_party/nixpkgs/pkgs/by-name/cp/cpu-x/package.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpu-x/package.nix index d8db8212ba..bb1b7cf10f 100644 --- a/third_party/nixpkgs/pkgs/by-name/cp/cpu-x/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cp/cpu-x/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, ncurses -, libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper +, libcpuid, pciutils, procps, wrapGAppsHook3, nasm, makeWrapper , opencl-headers, ocl-icd , vulkan-headers, vulkan-loader, glfw , libXdmcp, pcre, util-linux @@ -16,16 +16,16 @@ stdenv.mkDerivation rec { pname = "cpu-x"; - version = "5.0.3"; + version = "5.0.4"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "sha256-iaqqBeoack41D07Bbr0Fo1JXfF2ksXbqS5V5Ymt6Qvg="; + sha256 = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 nasm makeWrapper ]; buildInputs = [ gtk3 ncurses libcpuid pciutils procps vulkan-headers vulkan-loader glfw diff --git a/third_party/nixpkgs/pkgs/by-name/cr/criterion/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/criterion/package.nix new file mode 100644 index 0000000000..efa1459dc7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cr/criterion/package.nix @@ -0,0 +1,117 @@ +{ + lib, + stdenv, + fetchFromGitHub, + boxfort, + meson, + libcsptr, + pkg-config, + gettext, + cmake, + ninja, + protobuf, + libffi, + libgit2, + dyncall, + nanomsg, + nanopbMalloc, + python3Packages, + testers, + criterion, + callPackage +}: + +let + # follow revisions defined in .wrap files + debugbreak = fetchFromGitHub { + owner = "MrAnno"; + repo = "debugbreak"; + rev = "83bf7e933311b88613cbaadeced9c2e2c811054a"; + hash = "sha256-OPrPGBUZN73Nl5NMEf/nME843yTolt913yjut3rAos0="; + }; + + klib = fetchFromGitHub { + owner = "attractivechaos"; + repo = "klib"; + rev = "cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502"; + hash = "sha256-+GaI5nXz4jYI0rO17xDhNtFpLlGL2WzeSVLMfB6Cl6E="; + }; +in +stdenv.mkDerivation rec { + pname = "criterion"; + version = "2.4.2"; + + src = fetchFromGitHub { + owner = "Snaipe"; + repo = "Criterion"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-5GH7AYjrnBnqiSmp28BoaM1Xmy8sPs1atfqJkGy3Yf0="; + }; + + nativeBuildInputs = [ + meson + ninja + cmake + pkg-config + protobuf + ]; + + buildInputs = [ + (lib.getDev boxfort) + dyncall + gettext + libcsptr + nanomsg + nanopbMalloc + libgit2 + libffi + ]; + + nativeCheckInputs = with python3Packages; [ cram ]; + + doCheck = true; + + prePatch = '' + cp -r ${debugbreak} subprojects/debugbreak + cp -r ${klib} subprojects/klib + + for dep in "debugbreak" "klib"; do + local meson="$dep/meson.build" + + chmod +w subprojects/$dep + cp subprojects/packagefiles/$meson subprojects/$meson + done + ''; + + postPatch = '' + patchShebangs ci/isdir.py src/protocol/gen-pb.py + ''; + + outputs = [ + "out" + "dev" + ]; + + passthru.tests.version = + let + tester = callPackage ./tests/001-version.nix {}; + in + testers.testVersion { + package = criterion; + command = "${lib.getExe tester} --version"; + version = "v${version}"; + }; + + meta = { + description = "A cross-platform C and C++ unit testing framework for the 21th century"; + homepage = "https://github.com/Snaipe/Criterion"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + thesola10 + Yumasi + sigmanificient + ]; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cr/criterion/tests/001-version.nix b/third_party/nixpkgs/pkgs/by-name/cr/criterion/tests/001-version.nix new file mode 100644 index 0000000000..25a98b5a0c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cr/criterion/tests/001-version.nix @@ -0,0 +1,25 @@ +{ + stdenv, + pkg-config, + criterion, +}: +stdenv.mkDerivation rec { + name = "version-tester"; + version = "v${criterion.version}"; + src = ./test_dummy.c; + + dontUnpack = true; + buildInputs = [ criterion ]; + nativeBuildInputs = [ pkg-config ]; + + buildPhase = '' + cc -o ${name} $src `pkg-config --libs criterion` + ''; + + installPhase = '' + mkdir -p $out/bin + cp ${name} $out/bin/${name} + ''; + + meta.mainProgram = name; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cr/criterion/tests/test_dummy.c b/third_party/nixpkgs/pkgs/by-name/cr/criterion/tests/test_dummy.c new file mode 100644 index 0000000000..6ae1ef73ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cr/criterion/tests/test_dummy.c @@ -0,0 +1,7 @@ +#include +#include + +Test(test_dummy, always_succeed) +{ + cr_assert(true); +} diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/Cargo.lock index 682b85db2f..44a47cd532 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/Cargo.lock @@ -43,47 +43,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -91,9 +92,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" [[package]] name = "async-speed-limit" @@ -120,9 +121,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" @@ -147,9 +148,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64-serde" @@ -179,18 +180,6 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" -[[package]] -name = "bytemuck" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - [[package]] name = "bytes" version = "1.6.0" @@ -199,9 +188,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.94" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" [[package]] name = "cfg-if" @@ -217,9 +206,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -291,9 +280,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "console" @@ -354,7 +343,7 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "crunchy-cli" -version = "3.4.3" +version = "3.6.1" dependencies = [ "chrono", "clap", @@ -367,7 +356,7 @@ dependencies = [ [[package]] name = "crunchy-cli-core" -version = "3.4.3" +version = "3.6.1" dependencies = [ "anyhow", "async-speed-limit", @@ -381,8 +370,6 @@ dependencies = [ "fs2", "futures-util", "http", - "image", - "image_hasher", "indicatif", "lazy_static", "log", @@ -390,7 +377,9 @@ dependencies = [ "num_cpus", "regex", "reqwest", + "rsubs-lib", "rustls-native-certs", + "rusty-chromaprint", "serde", "serde_json", "serde_plain", @@ -404,9 +393,9 @@ dependencies = [ [[package]] name = "crunchyroll-rs" -version = "0.10.7" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eaf93641a3697ba4cd6845b3a741089f4b4c692a91ed40dece6d7376c419ef9" +checksum = "58580acc9c0abf96a231ec8b1a4597ea55d9426ea17f684ce3582e2b26437bbb" dependencies = [ "async-trait", "chrono", @@ -430,9 +419,9 @@ dependencies = [ [[package]] name = "crunchyroll-rs-internal" -version = "0.10.7" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48daba6fe0296c2b400cd6545cf2e8ee23870f1a5a35291fa2d61987098a5692" +checksum = "ce3c844dec8a3390f8c9853b5cf1d65c3d38fd0657b8b5d0e008db8945dea326" dependencies = [ "darling", "quote", @@ -486,11 +475,11 @@ dependencies = [ [[package]] name = "dash-mpd" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cafa2c33eff2857e1a14c38aa9a432aa565a01e77804a541fce7aec3affb8f8" +checksum = "79b4bdd5f1c0c7493d780c645f0bff5b9361e6408210fa88910adb181efca64c" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "base64-serde", "chrono", "fs-err", @@ -601,9 +590,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fnv" @@ -723,9 +712,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -767,9 +756,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -831,9 +820,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "hyper" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", @@ -951,32 +940,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "image" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" -dependencies = [ - "bytemuck", - "byteorder", - "num-traits", - "zune-core", - "zune-jpeg", -] - -[[package]] -name = "image_hasher" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9481465fe767d92494987319b0b447a5829edf57f09c52bf8639396abaaeaf78" -dependencies = [ - "base64 0.22.0", - "image", - "rustdct", - "serde", - "transpose", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -995,7 +958,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -1027,6 +990,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "iso8601" version = "0.6.1" @@ -1072,9 +1041,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libredox" @@ -1210,9 +1179,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1375,9 +1344,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -1417,6 +1386,15 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "realfft" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953d9f7e5cdd80963547b456251296efc2626ed4e3cbf36c869d9564e0220571" +dependencies = [ + "rustfft", +] + [[package]] name = "redox_users" version = "0.4.5" @@ -1459,11 +1437,11 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "bytes", "cookie", "cookie_store", @@ -1531,21 +1509,34 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" +[[package]] +name = "rsubs-lib" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dcca2a9560fca05de8f95bc3767e46673d4b4c1f2c7a11092e10efd95bbdf62" +dependencies = [ + "regex", + "serde", +] + +[[package]] +name = "rubato" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6dd52e80cfc21894deadf554a5673002938ae4625f7a283e536f9cf7c17b0d5" +dependencies = [ + "num-complex", + "num-integer", + "num-traits", + "realfft", +] + [[package]] name = "rustc-demangle" version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustdct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b61555105d6a9bf98797c063c362a1d24ed8ab0431655e38f1cf51e52089551" -dependencies = [ - "rustfft", -] - [[package]] name = "rustfft" version = "6.2.0" @@ -1563,9 +1554,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -1576,9 +1567,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.3" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", @@ -1607,27 +1598,37 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" dependencies = [ "ring", "rustls-pki-types", "untrusted", ] +[[package]] +name = "rusty-chromaprint" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1755646867c36ecb391776deaa0b557a76d3badf20c142de7282630c34b20440" +dependencies = [ + "rubato", + "rustfft", +] + [[package]] name = "ryu" version = "1.0.17" @@ -1645,11 +1646,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -1658,9 +1659,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -1668,18 +1669,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", @@ -1688,9 +1689,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -1730,11 +1731,11 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.7.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", @@ -1748,9 +1749,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.7.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ "darling", "proc-macro2", @@ -1798,9 +1799,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1838,9 +1839,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.58" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -1897,18 +1898,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", @@ -2024,16 +2025,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -2144,9 +2144,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "untrusted" @@ -2501,18 +2501,3 @@ name = "zeroize" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" - -[[package]] -name = "zune-core" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" - -[[package]] -name = "zune-jpeg" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" -dependencies = [ - "zune-core", -] diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/package.nix index a07cdeb9fa..0855864a3f 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cr/crunchy-cli/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "crunchy-cli"; - version = "3.4.3"; + version = "3.6.1"; src = fetchFromGitHub { owner = "crunchy-labs"; repo = "crunchy-cli"; rev = "v${version}"; - hash = "sha256-/7zJbmMPoHEpcsDPe1eVenxGenPCU6CcHE8nTBTHil8="; + hash = "sha256-SlTdyEeqQ9lCrFFTDtMhP0Kvm+3gxiUS+ZB5LvNWSZU="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/by-name/cr/cryptor/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/cryptor/package.nix index b47edbbab5..edbaa0903b 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/cryptor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cr/cryptor/package.nix @@ -6,7 +6,7 @@ , ninja , pkg-config , vala -, wrapGAppsHook +, wrapGAppsHook3 , gocryptfs , gtk3 , json-glib @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/cs/csharpier/package.nix b/third_party/nixpkgs/pkgs/by-name/cs/csharpier/package.nix index cfebb97f03..1be70bd225 100644 --- a/third_party/nixpkgs/pkgs/by-name/cs/csharpier/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cs/csharpier/package.nix @@ -2,10 +2,10 @@ buildDotnetGlobalTool { pname = "csharpier"; - version = "0.27.2"; + version = "0.28.2"; executables = "dotnet-csharpier"; - nugetSha256 = "sha256-P4v4h09FuisIry9B/6batrG0CpLqnrkxnlk1yEd1JbY="; + nugetSha256 = "sha256-fXyE25niM80pPXCLC80Hm9XEHGUMx0XZOMxdVoA0h18="; meta = with lib; { description = "An opinionated code formatter for C#"; diff --git a/third_party/nixpkgs/pkgs/by-name/cs/csvkit/package.nix b/third_party/nixpkgs/pkgs/by-name/cs/csvkit/package.nix index 6c4da10bfd..3b0a3b5639 100644 --- a/third_party/nixpkgs/pkgs/by-name/cs/csvkit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cs/csvkit/package.nix @@ -5,7 +5,7 @@ let pname = "csvkit"; - version = "1.5.0"; + version = "2.0.0"; pythonEnv = python3; in pythonEnv.pkgs.buildPythonApplication { @@ -14,7 +14,7 @@ pythonEnv.pkgs.buildPythonApplication { src = fetchPypi { inherit pname version; - hash = "sha256-lnqL6PxY7fViEiW1pqaXsOhzC5YupoCFkWqRhgsiIRw="; + hash = "sha256-MR8heHYVqRZWiX4hfGKrJshEbWcwm2G9AT40WzWBb98="; }; propagatedBuildInputs = with pythonEnv.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/by-name/cs/csvlens/package.nix b/third_party/nixpkgs/pkgs/by-name/cs/csvlens/package.nix index 7995881c2e..7840dba022 100644 --- a/third_party/nixpkgs/pkgs/by-name/cs/csvlens/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cs/csvlens/package.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "csvlens"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "YS-L"; repo = "csvlens"; rev = "refs/tags/v${version}"; - hash = "sha256-4lKiqojBF8mqAp56eTDfJcK276IzEDLA3pORKIZpC94="; + hash = "sha256-Qpda9qADnj3eGz+nvD6VgxUOwTXrFI1rMam6+sfK6MQ="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - cargoHash = "sha256-EzM7qGor/B17N4KDTsQzgiV4pgXE2D47RZcrmKVkPu8="; + cargoHash = "sha256-PDOuAz+ov1S7i7TpRp4YaeoQQJ4paal6FI0VU25d4zU="; meta = with lib; { description = "Command line csv viewer"; diff --git a/third_party/nixpkgs/pkgs/development/tools/csvq/default.nix b/third_party/nixpkgs/pkgs/by-name/cs/csvq/package.nix similarity index 78% rename from third_party/nixpkgs/pkgs/development/tools/csvq/default.nix rename to third_party/nixpkgs/pkgs/by-name/cs/csvq/package.nix index 74121fa832..050b25f8da 100644 --- a/third_party/nixpkgs/pkgs/development/tools/csvq/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/cs/csvq/package.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, testers, lib, csvq }: buildGoModule rec { pname = "csvq"; @@ -13,6 +13,11 @@ buildGoModule rec { vendorHash = "sha256-byBYp+iNnnsAXR+T3XmdwaeeBG8oB1EgNkDabzgUC98="; + passthru.tests.version = testers.testVersion { + package = csvq; + version = "csvq version ${version}"; + }; + meta = with lib; { description = "SQL-like query language for CSV"; mainProgram = "csvq"; diff --git a/third_party/nixpkgs/pkgs/by-name/cu/cue/package.nix b/third_party/nixpkgs/pkgs/by-name/cu/cue/package.nix index f8185f7c34..97ad585ddc 100644 --- a/third_party/nixpkgs/pkgs/by-name/cu/cue/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cu/cue/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cue"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-0HNE7NzTdq1bXj9tBZvBQ3m6Q5iuyAMKMOz0kyOJi7w="; + hash = "sha256-GU1PG5ciUqbRlAveq2ouqnBYIBEdMSSM0H/1eHL+zlo="; }; vendorHash = "sha256-0OZtKIDdEnQLnSj109EpGvaZvMIy7gPAZ+weHzYKGSg="; @@ -24,7 +24,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - ldflags = [ "-s" "-w" "-X cuelang.org/go/cmd/cue/cmd.version=${version}" ]; + ldflags = [ "-s" "-w" ]; postInstall = '' installShellCompletion --cmd cue \ @@ -40,6 +40,7 @@ buildGoModule rec { version = testers.testVersion { package = cue; command = "cue version"; + version = "v${version}"; }; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/cu/cups-printers/package.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-printers/package.nix index 9b5e336316..50af156ff6 100644 --- a/third_party/nixpkgs/pkgs/by-name/cu/cups-printers/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cu/cups-printers/package.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -16,26 +17,27 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ + "typer" "validators" ]; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ - pycups - typer - validators - ] ++ typer.optional-dependencies.all; + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; + + dependencies = + with python3.pkgs; + [ + pycups + typer + validators + ] + ++ typer.optional-dependencies.all; # Project has no tests doCheck = false; - pythonImportsCheck = [ - "cups_printers" - ]; + pythonImportsCheck = [ "cups_printers" ]; meta = with lib; { description = "Tool for interacting with a CUPS server"; diff --git a/third_party/nixpkgs/pkgs/by-name/cu/cursewords/package.nix b/third_party/nixpkgs/pkgs/by-name/cu/cursewords/package.nix index 44c49cbb87..7a51705c1a 100644 --- a/third_party/nixpkgs/pkgs/by-name/cu/cursewords/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cu/cursewords/package.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { description = "Graphical command line program for solving crossword puzzles in the terminal"; mainProgram = "cursewords"; license = licenses.agpl3Only; - maintainers = with maintainers; [ danderson ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dapr-cli/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix rename to third_party/nixpkgs/pkgs/by-name/da/dapr-cli/package.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/darklua/default.nix b/third_party/nixpkgs/pkgs/by-name/da/darklua/package.nix similarity index 82% rename from third_party/nixpkgs/pkgs/development/tools/darklua/default.nix rename to third_party/nixpkgs/pkgs/by-name/da/darklua/package.nix index adcce178df..c9969fec4c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/darklua/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/da/darklua/package.nix @@ -1,8 +1,9 @@ -{ lib -, stdenv -, darwin -, rustPlatform -, fetchFromGitHub +{ + lib, + stdenv, + darwin, + rustPlatform, + fetchFromGitHub, }: rustPlatform.buildRustPackage rec { @@ -18,10 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-XrWhOosQM+BaqViIju7urCi1B8+6kq8Taxe5T8LFzVE="; - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/da/daytona-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/da/daytona-bin/package.nix index 15965d2837..0c3fa458c7 100644 --- a/third_party/nixpkgs/pkgs/by-name/da/daytona-bin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/da/daytona-bin/package.nix @@ -6,26 +6,26 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "daytona-bin"; - version = "0.9.0"; + version = "0.12.0"; src = let urls = { "x86_64-linux" = { url = "https://download.daytona.io/daytona/v${finalAttrs.version}/daytona-linux-amd64"; - hash = "sha256-vJVGFmaGP9oCCzdvhuAPsoTaxzGvdDKDupMYuepRUCA="; + hash = "sha256-5nUWeIAKUSrbEAzo1SCSrebKvt2DKB/f2JZZ9c2vjxA="; }; "x86_64-darwin" = { url = "https://download.daytona.io/daytona/v${finalAttrs.version}/daytona-darwin-amd64"; - hash = "sha256-R63AQVt5DudzJub+TYcJiHkBGVeOhjvgJZgnqvJb8t0="; + hash = "sha256-JAc9EbuZnRCX2v1UXPBF8mlqz478DtrVEk6XEICW7CU="; }; "aarch64-linux" = { url = "https://download.daytona.io/daytona/v${finalAttrs.version}/daytona-linux-arm64"; - hash = "sha256-98OEhJ1gakPTVO73M9WW0QuSDgR42gNjoioEkkNbf6w="; + hash = "sha256-1yy3S4JRtabQBK9LzepL+CVaj+3HPuG6oJe4YdbEi6E="; }; "aarch64-darwin" = { url = "https://download.daytona.io/daytona/v${finalAttrs.version}/daytona-darwin-arm64"; - hash = "sha256-YmLyioFueEfi/2Q+JwINDhkwo617/KUZrimz9CibdA8="; + hash = "sha256-x5RVx5X2PD1Yu0g0umf2ywRymqa+1EFCzuXFEVSQImw="; }; }; in @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/daytonaio/daytona"; license = lib.licenses.asl20; mainProgram = "daytona"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ osslate ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/third_party/nixpkgs/pkgs/by-name/de/delfin/package.nix b/third_party/nixpkgs/pkgs/by-name/de/delfin/package.nix index d46e5a94a6..eaf775ef94 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/delfin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/delfin/package.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "delfin"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitea { domain = "codeberg.org"; owner = "avery42"; repo = "delfin"; rev = "v${version}"; - hash = "sha256-7GHwwwFibmwBcrlC2zSpEUZ2dca14wZFU6PJWjincPQ="; + hash = "sha256-qbl0PvGKI3S845xLr0aXf/uk2uuOXMjvu9S3BOPzxa0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-zlecw6230AC/+y537iEhJU+BgWRs2WCFP0AIcxchZBA="; + hash = "sha256-Js1mIotSOayYDjDVQMqXwaeSC2a1g1DeqD6QmeWwztk="; }; nativeBuildInputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { description = "Stream movies and TV shows from Jellyfin"; homepage = "https://www.delfin.avery.cafe/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ colinsane ]; + maintainers = with maintainers; [ colinsane avery ]; mainProgram = "delfin"; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/by-name/de/dep-scan/package.nix b/third_party/nixpkgs/pkgs/by-name/de/dep-scan/package.nix index a9dc4b718c..d666f4f030 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/dep-scan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/dep-scan/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dep-scan"; - version = "5.3.3"; + version = "5.3.4"; pyproject = true; src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-ehQsRTMoHr6LDXCka3/4YcyEKLN7DQW4mUp4nyid/aE="; + hash = "sha256-5iMhl3Wcxwgq4Wr0TUcAuRnb2+y8DHBugnnkpcZfSAM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/de/devcontainer/package.nix b/third_party/nixpkgs/pkgs/by-name/de/devcontainer/package.nix index 20eebbc9d5..affb09cad6 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/devcontainer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/devcontainer/package.nix @@ -13,18 +13,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.58.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-pnhyyTJMSlTdMsSFzbmZ6SkGdbfr9qCIkrBxxSM42UE="; + hash = "sha256-/QznJhw+DYwnj/kdP6f4liJlOFhNQO0y7r4i55bJPug="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-Wy0UP8QaQzZ1par7W5UhnRLc5DF2PAif0JIZJtRokBk="; + hash = "sha256-tN7qAvfYmDz5ZtgZL5+ZZtkuxZxvlS9FM3+dGl+daUQ="; }; nativeBuildInputs = [ yarn fixup-yarn-lock python3 makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/de/devenv/package.nix b/third_party/nixpkgs/pkgs/by-name/de/devenv/package.nix index ee864183f5..9284bc2218 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/devenv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/devenv/package.nix @@ -21,15 +21,15 @@ let src = fetchFromGitHub { owner = "domenkozar"; repo = "nix"; - rev = "ecd0af0c1f56de32cbad14daa1d82a132bf298f8"; - hash = "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM="; + rev = "b24a9318ea3f3600c1e24b4a00691ee912d4de12"; + hash = "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794="; }; buildInputs = old.buildInputs ++ [ libgit2 ]; doCheck = false; doInstallCheck = false; }); - version = "1.0.4"; + version = "1.0.5"; in rustPlatform.buildRustPackage { pname = "devenv"; inherit version; @@ -38,10 +38,10 @@ in rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-JODoFPcYKOr39dErx8JFSjeWKmO5PUsHJrF2VU6MFEg="; + hash = "sha256-W5DFIifCjGYJXJzLU3RpqBeqes4zrf0Sr/6rwzTygPU="; }; - cargoHash = "sha256-//THEzW0OYEDSLrOELBaWnwjDbUc4jpwRDQfWJO/saA="; + cargoHash = "sha256-a6o28oonA6G0xo83PXwbH86V0aDDAAA2zajE67qsSU0="; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/di/diffedit3/package.nix b/third_party/nixpkgs/pkgs/by-name/di/diffedit3/package.nix new file mode 100644 index 0000000000..6e1edaf882 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/di/diffedit3/package.nix @@ -0,0 +1,30 @@ +{ lib, rustPlatform, fetchCrate +, testers, nix-update-script, diffedit3 +}: + +rustPlatform.buildRustPackage rec { + pname = "diffedit3"; + version = "0.4.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-qw5Wos2u/H6ccJ3qkrVOCisMFDTNwxp/YeOTE1x5lcU="; + }; + + cargoHash = "sha256-e5bm8GLubA9BzH9oKKSC/Ysh+O+GJA8x6W576vKIIUA="; + + passthru = { + updateScript = nix-update-script { }; + tests = testers.testVersion { + package = diffedit3; + }; + }; + + meta = with lib; { + homepage = "https://github.com/ilyagr/diffedit3"; + description = "3-pane diff editor"; + license = with licenses; [ asl20 ]; + mainProgram = "diffedit3"; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/di/digikam/package.nix b/third_party/nixpkgs/pkgs/by-name/di/digikam/package.nix index 01659a6517..27e7403c81 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/digikam/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/digikam/package.nix @@ -1,4 +1,4 @@ -{ stdenv, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ stdenv, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook3 # For `digitaglinktree` , perl, sqlite @@ -26,6 +26,7 @@ , x265 , jasper +, bash # For panorama and focus stacking , enblend-enfuse , hugin @@ -37,11 +38,11 @@ stdenv.mkDerivation rec { pname = "digikam"; - version = "8.2.0"; + version = "8.3.0"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz"; - hash = "sha256-L3/LVZsSPtnsrlpa729FYO7l9JIG2dF0beyatsj7OL8="; + url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}-1.tar.xz"; + hash = "sha256-BbFF/38vIAX6IbxXnBUqsjyBkbZ4/ylEyPBAbWud5tg="; }; strictDeps = true; @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { extra-cmake-modules libsForQt5.kdoctools libsForQt5.wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]); @@ -110,6 +111,13 @@ stdenv.mkDerivation rec { cuda_cudart ]); + postPatch = '' + substituteInPlace \ + core/dplugins/bqm/custom/userscript/userscript.cpp \ + core/utilities/import/backend/cameracontroller.cpp \ + --replace-fail \"/bin/bash\" \"${lib.getExe bash}\" + ''; + cmakeFlags = [ "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" diff --git a/third_party/nixpkgs/pkgs/by-name/di/dillo/package.nix b/third_party/nixpkgs/pkgs/by-name/di/dillo/package.nix new file mode 100644 index 0000000000..760a9941b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/di/dillo/package.nix @@ -0,0 +1,87 @@ +{ + lib, + autoreconfHook, + fetchFromGitHub, + fltk, + giflib, + libXcursor, + libXi, + libXinerama, + libjpeg, + libpng, + libressl, + mbedtls, + openssl, + perl, + pkg-config, + stdenv, + which, + # Configurable options + tlsLibrary? "libressl" +}: + +let + ssl = { + "libressl" = libressl; + "mbedtls" = mbedtls; + "openssl" = openssl; + }.${tlsLibrary} or (throw "Unrecognized tlsLibrary option: ${tlsLibrary}"); +in +stdenv.mkDerivation (finalAttrs: { + pname = "dillo"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "dillo-browser"; + repo = "dillo"; + rev = "v${finalAttrs.version}"; + hash = "sha256-AqffkUPLvVSGq9iYksyvHf3HQ3DLWNlB3CYw4GCAAEI="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + fltk + which + ]; + + buildInputs = [ + fltk + giflib + libXcursor + libXi + libXinerama + libjpeg + libpng + perl + ssl + ]; + + outputs = [ "out" "doc" "man" ]; + + strictDeps = true; + + meta = { + homepage = "https://dillo-browser.github.io/"; + description = "A fast graphical web browser with a small footprint"; + longDescription = '' + Dillo is a fast and small graphical web browser with the following + features: + + - Multi-platform, running on Linux, BSD, MacOS, Windows (via Cygwin) and + even Atari. + - Written in C and C++ with few dependencies. + - Implements its own real-time rendering engine. + - Low memory usage and fast rendering, even with large pages. + - Uses the fast and bloat-free FLTK GUI library. + - Support for HTTP, HTTPS, FTP and local files. + - Extensible with plugins written in any language. + - Is free software licensed with the GPLv3. + - Helps authors to comply with web standards by using the bug meter. + ''; + mainProgram = "dillo"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/dillong/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dillong/package.nix similarity index 74% rename from third_party/nixpkgs/pkgs/applications/networking/browsers/dillong/default.nix rename to third_party/nixpkgs/pkgs/by-name/di/dillong/package.nix index 365b1119f9..31e76fa89d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/dillong/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/dillong/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, which -, fltk -, mbedtls_2 +{ + lib, + autoreconfHook, + fetchFromGitHub, + fltk, + mbedtls_2, + pkg-config, + stdenv, + which, }: stdenv.mkDerivation { pname = "dillong"; - version = "unstable-2021-12-13"; + version = "0-unstable-2021-12-13"; src = fetchFromGitHub { owner = "w00fpack"; @@ -21,6 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook + fltk pkg-config which ]; @@ -30,6 +32,19 @@ stdenv.mkDerivation { mbedtls_2 ]; + outputs = [ "out" "doc" "man" ]; + + configureFlags = [ + (lib.enableFeature true "ssl") + ]; + + strictDeps = true; + + # Workaround build failure on -fno-common toolchains: + # ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set'; + # dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here + env.NIX_CFLAGS_COMPILE = "-fcommon"; + # The start_page and home settings refer to /usr. # We can't change /usr to $out because dillorc is copied to the home directory # on first launch, so the paths would quickly become outdated. @@ -40,19 +55,12 @@ stdenv.mkDerivation { --replace "home=" "#home=" ''; - configureFlags = [ "--enable-ssl=yes" ]; - - # Workaround build failure on -fno-common toolchains: - # ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set'; - # dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - meta = with lib; { - description = "Fork of Dillo, a lightweight web browser"; + meta = { homepage = "https://github.com/w00fpack/dilloNG"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ fgaz ]; + description = "Fork of Dillo, a lightweight web browser"; + license = lib.licenses.gpl3Plus; mainProgram = "dillo"; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/di/dim/package.nix b/third_party/nixpkgs/pkgs/by-name/di/dim/package.nix index 9b59329e76..fba2c5e11f 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/dim/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/dim/package.nix @@ -4,6 +4,7 @@ rustPlatform, fetchFromGitHub, buildNpmPackage, + darwin, makeWrapper, ffmpeg_5, git, @@ -11,6 +12,7 @@ sqlite, libvaSupport ? stdenv.hostPlatform.isLinux, libva, + fetchpatch, }: rustPlatform.buildRustPackage rec { pname = "dim"; @@ -45,6 +47,14 @@ rustPlatform.buildRustPackage rec { # (ffmpeg) binaries in the same directory as the binary. Patch it to use # the working dir and PATH instead. ./relative-paths.diff + + # Upstream has some unused imports that prevent things from compiling... + # Remove for next release. + (fetchpatch { + name = "remove-unused-imports.patch"; + url = "https://github.com/Dusk-Labs/dim/commit/f62de1d38e6e52f27b1176f0dabbbc51622274cb.patch"; + hash = "sha256-Gk+RHWtCKN7McfFB3siIOOhwi3+k17MCQr4Ya4RCKjc="; + }) ]; postConfigure = '' @@ -57,9 +67,14 @@ rustPlatform.buildRustPackage rec { git ]; - buildInputs = [ - sqlite - ] ++ lib.optional libvaSupport libva; + buildInputs = + [ sqlite ] + ++ lib.optional stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.SystemConfiguration + ] + ++ lib.optional libvaSupport libva; buildFeatures = lib.optional libvaSupport "vaapi"; @@ -86,7 +101,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/dim \ - --prefix PATH : ${lib.makeBinPath [ffmpeg_5]} + --prefix PATH : ${lib.makeBinPath [ ffmpeg_5 ]} ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/discord-gamesdk/default.nix b/third_party/nixpkgs/pkgs/by-name/di/discord-gamesdk/package.nix similarity index 84% rename from third_party/nixpkgs/pkgs/development/libraries/discord-gamesdk/default.nix rename to third_party/nixpkgs/pkgs/by-name/di/discord-gamesdk/package.nix index 86e1a70acc..b2f9a08dc7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/discord-gamesdk/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/discord-gamesdk/package.nix @@ -1,7 +1,8 @@ -{ lib -, stdenv -, fetchzip -, autoPatchelfHook +{ + lib, + stdenv, + fetchzip, + autoPatchelfHook, }: stdenv.mkDerivation rec { @@ -14,7 +15,10 @@ stdenv.mkDerivation rec { stripRoot = false; }; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; buildInputs = [ (stdenv.cc.cc.libgcc or null) ]; @@ -41,6 +45,11 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ tomodachi94 ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "x86_64-windows" ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + "x86_64-windows" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/di/discordchatexporter-cli/deps.nix b/third_party/nixpkgs/pkgs/by-name/di/discordchatexporter-cli/deps.nix index c75966de85..46c8ca0682 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/discordchatexporter-cli/deps.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/discordchatexporter-cli/deps.nix @@ -2,22 +2,21 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; }) - (fetchNuGet { pname = "AngleSharp"; version = "1.0.7"; sha256 = "1f0sb4jknw7f9mhg4f5khk1q257mn97b9qyy017jjljhqyxp449f"; }) - (fetchNuGet { pname = "AsyncKeyedLock"; version = "6.2.4"; sha256 = "1sizwdkj7ysk7nvdrnnnvl67r4smyq45k6ih4si38kxm27sqwhjw"; }) + (fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.1"; sha256 = "1qc5b9vlh42yyw00kppkrdz0cji0cxslh97794km9nid8wcv3f54"; }) + (fetchNuGet { pname = "AngleSharp"; version = "1.1.2"; sha256 = "0rfild46lmqhxkfh6nhy7a9m8zzv25lj29riav5j6dmzw07l7wif"; }) + (fetchNuGet { pname = "AsyncKeyedLock"; version = "6.4.2"; sha256 = "1pghspgz9xis139b5v8h2y40gp14x6qfcam27zawq6cp278gnjhi"; }) (fetchNuGet { pname = "CliFx"; version = "2.3.5"; sha256 = "0rlbv93ssw0d8kvhnvrz2f06ka66gz4gbz1va2q135dab99cmrin"; }) - (fetchNuGet { pname = "CSharpier.MsBuild"; version = "0.26.7"; sha256 = "1pa96gci9nwav1g93vxq4mc0h1bjasax9j6giya1ms6rdmqxxlyn"; }) + (fetchNuGet { pname = "CSharpier.MsBuild"; version = "0.28.2"; sha256 = "10c3v3pqv49y5wi0slswfzkwjh9q93diihpmkbfp3r7yjpv6871d"; }) (fetchNuGet { pname = "Deorcify"; version = "1.0.2"; sha256 = "0nwxyrl4rd5x621i2hs5fl3w7fxpm13lkdssxr9fd5042px2gqbm"; }) - (fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.5.2"; sha256 = "0j3z9wdhn6d4np0cjxv2wb5n9blm9frgbxs1p6zdafbxr98qzb73"; }) + (fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.5.4"; sha256 = "0pjzyvq0a975m0y7b0k8wsr7mskykv3bzba98xmcc29nsyib2a8h"; }) (fetchNuGet { pname = "Gress"; version = "2.1.1"; sha256 = "1svz1flhyl26h3xjch0acjjinympgf6bhj5vpb188njfih3ip4ck"; }) (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) - (fetchNuGet { pname = "Polly"; version = "8.2.0"; sha256 = "0gxdi4sf60vpxsb258v592ykkq9a3dq2awayp99yy9djys8bglks"; }) - (fetchNuGet { pname = "Polly.Core"; version = "8.2.0"; sha256 = "00b4jbyiyslqvswy4j2lfw0rl0gq8m4v5fj2asb96i6l224bs7d3"; }) - (fetchNuGet { pname = "RazorBlade"; version = "0.5.0"; sha256 = "11s68yqvpp65yam954f281vw9pmb2c5mxnk0n5j6xv1xylng4x5b"; }) - (fetchNuGet { pname = "Spectre.Console"; version = "0.48.0"; sha256 = "0v3zijim9k5lcmhn0ajlsix0japvx3c20r9b7x7f7gvraa8w3gl6"; }) + (fetchNuGet { pname = "Polly"; version = "8.3.1"; sha256 = "19q7s493sv90879052pxfcbsk3bmxjg5688ya7l12964ddafiwsl"; }) + (fetchNuGet { pname = "Polly.Core"; version = "8.3.1"; sha256 = "15ylkqdcwpr76n0nfzpvd6s00ywjagn1ignyrcz9arwahrxpsm4b"; }) + (fetchNuGet { pname = "RazorBlade"; version = "0.6.0"; sha256 = "11k2j7d7ddb47sj4lkply8v4aqrfxl0b314cv0l4f5syi4ilfa6s"; }) + (fetchNuGet { pname = "Spectre.Console"; version = "0.49.1"; sha256 = "0fhl96p3xjd5k1wwvhs80cp35rrlgnza6mw9vy0knhmf7ji9b95n"; }) (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) - (fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.14.0"; sha256 = "0c41zw1bwz6ybxagq5vr26cx7najd17rrdbqjpn8mabynq380ayr"; }) - (fetchNuGet { pname = "YoutubeExplode"; version = "6.3.10"; sha256 = "0b3n8mfxa4l7bfk0c1s7yfw4m1kvnm2r5pqfvr6s20gjq3wzfih5"; }) + (fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.16.0"; sha256 = "0cbkgrrkam76bhygrjzd4nj4mpzpgbnsddfzwry1933rcvjlqh6m"; }) + (fetchNuGet { pname = "YoutubeExplode"; version = "6.3.14"; sha256 = "12w9zz6y7cdw6p2gvr34r4qcl35hh19zn9fm0risrrcs8577msxs"; }) ] diff --git a/third_party/nixpkgs/pkgs/by-name/di/discordchatexporter-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/di/discordchatexporter-cli/package.nix index 9f3d709fd1..ed6f4e836a 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/discordchatexporter-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/discordchatexporter-cli/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.42.8"; + version = "2.43"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - hash = "sha256-54NTeIs0a8hd2xKQkAxwfyGwEPUlSSXXvDamGLfa9ls="; + hash = "sha256-FbZ2Kt5lKTINpj0EsJGXWY1aK0qitks16GClBWa/iQ4="; }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; diff --git a/third_party/nixpkgs/pkgs/by-name/di/discover-overlay/package.nix b/third_party/nixpkgs/pkgs/by-name/di/discover-overlay/package.nix index 3ce0d8b9b0..7f3c2c5a74 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/discover-overlay/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/discover-overlay/package.nix @@ -1,24 +1,21 @@ -{ lib, python3, fetchFromGitHub, gtk3, gobject-introspection, gtk-layer-shell, wrapGAppsHook }: +{ lib, python3, fetchFromGitHub, gtk3, gobject-introspection, gtk-layer-shell, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { pname = "discover-overlay"; - version = "0.7.0"; + version = "0.7.4"; pyproject = true; src = fetchFromGitHub { owner = "trigg"; repo = "Discover"; rev = "refs/tags/v${version}"; - hash = "sha256-//QW6N87Uhm2aH0RSuykHG3+EfzYSHOcSNLSn1y0rFw="; + hash = "sha256-qA+gvgKQlTjcm0JPUmJp47Ttvm+69CW4lOngnueLVpo="; }; - buildInputs = [ - gtk3 - gtk-layer-shell - ]; + buildInputs = [ gtk3 gtk-layer-shell ]; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; @@ -26,6 +23,7 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" "--set DISPLAY ':0.0'" ]; propagatedBuildInputs = with python3.pkgs; [ + pulsectl-asyncio pycairo pygobject3 websocket-client diff --git a/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix b/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix index 20048c763b..cc493065f3 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix @@ -9,12 +9,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { name = "disko"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; rev = "v${finalAttrs.version}"; - hash = "sha256-5DUNQl9BSmLxgGLbF05G7hi/UTk9DyZq8AuEszhQA7Q="; + hash = "sha256-5CNvkH0Nf7yMwgKhjUNg/lUK40C7DXB4zKOuA2jVO90="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bash ]; diff --git a/third_party/nixpkgs/pkgs/by-name/di/displaycal/package.nix b/third_party/nixpkgs/pkgs/by-name/di/displaycal/package.nix index a48355fbb8..80e7b256b2 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/displaycal/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/displaycal/package.nix @@ -1,7 +1,7 @@ { lib , python3 , fetchPypi -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , librsvg , xorg @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/di/dissent/package.nix b/third_party/nixpkgs/pkgs/by-name/di/dissent/package.nix index b1580283a5..fdcc4ad37c 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/dissent/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/dissent/package.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "dissent"; - version = "0.0.23"; + version = "0.0.24"; src = fetchFromGitHub { owner = "diamondburned"; repo = "dissent"; rev = "v${version}"; - hash = "sha256-aHY2XmrJv2SSoXIKj63xu6t+Yzaur/6OJUFKga7DWDg="; + hash = "sha256-XoppHkKQhWZbqVIViGIV0e0W/NhZW0v6ufmXlVtmzvI="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ buildGoModule rec { install -D -m 444 internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg $out/share/icons/hicolor/scalable/apps/so.libdb.dissent.svg ''; - vendorHash = "sha256-mwY1M81EWfbF/gYXQl5bcEXxN9N1npD+GgUSMc7gy90="; + vendorHash = "sha256-8/k9auM7+rceV26f3pNjEK1trzzAM530CX008pLZ1OA="; meta = with lib; { description = "GTK4 Discord client in Go, attempt #4 (formerly gtkcord4)"; diff --git a/third_party/nixpkgs/pkgs/by-name/dm/dmarc-report-converter/package.nix b/third_party/nixpkgs/pkgs/by-name/dm/dmarc-report-converter/package.nix index 5fff732e84..e91c35698c 100644 --- a/third_party/nixpkgs/pkgs/by-name/dm/dmarc-report-converter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/dm/dmarc-report-converter/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "dmarc-report-converter"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "tierpod"; repo = "dmarc-report-converter"; rev = "v${version}"; - hash = "sha256-cP96tiBpMFNEHuIF0sovi+Q4yW8wMUqr138RyMOFoho="; + hash = "sha256-TqvAqMZEXhMO3/0VNY3Mr/E15QQbucuKyG95j2jWU5g="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/by-name/do/docfd/package.nix b/third_party/nixpkgs/pkgs/by-name/do/docfd/package.nix index ebefb6f1cd..c8c3e193c3 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/docfd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/docfd/package.nix @@ -1,15 +1,16 @@ -{ lib -, ocamlPackages -, stdenv -, overrideSDK -, fetchFromGitHub -, python3 -, dune_3 -, makeWrapper -, pandoc -, poppler_utils -, testers -, docfd +{ + lib, + ocamlPackages, + stdenv, + overrideSDK, + fetchFromGitHub, + python3, + dune_3, + makeWrapper, + pandoc, + poppler_utils, + testers, + docfd, }: let @@ -20,7 +21,7 @@ let in buildDunePackage' rec { pname = "docfd"; - version = "4.0.0"; + version = "6.0.1"; minimalOCamlVersion = "5.1"; @@ -28,10 +29,15 @@ buildDunePackage' rec { owner = "darrenldl"; repo = "docfd"; rev = version; - hash = "sha256-fgwUXRZ6k5i3XLxXpjbrl0TJZMT+NkGXf7KNwRgi+q8="; + hash = "sha256-pNBWSPII+r9MMmyXBzxQ6hMNrN7nwcdhrpufzj00s2E="; }; - nativeBuildInputs = [ python3 dune_3 makeWrapper ]; + nativeBuildInputs = [ + python3 + dune_3 + makeWrapper + ]; + buildInputs = with ocamlPackages; [ cmdliner containers-data @@ -43,18 +49,24 @@ buildDunePackage' rec { notty ocolor oseq + ppx_deriving + ppxlib + re spelll timedesc yojson ]; postInstall = '' - wrapProgram $out/bin/docfd --prefix PATH : "${lib.makeBinPath [ pandoc poppler_utils ]}" + wrapProgram $out/bin/docfd --prefix PATH : "${ + lib.makeBinPath [ + pandoc + poppler_utils + ] + }" ''; - passthru.tests.version = testers.testVersion { - package = docfd; - }; + passthru.tests.version = testers.testVersion { package = docfd; }; meta = with lib; { description = "TUI multiline fuzzy document finder"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dooit/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dooit/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/misc/dooit/default.nix rename to third_party/nixpkgs/pkgs/by-name/do/dooit/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/do/door-knocker/package.nix b/third_party/nixpkgs/pkgs/by-name/do/door-knocker/package.nix index 98635e0abf..c75cbd8078 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/door-knocker/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/door-knocker/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "door-knocker"; - version = "0.4.4"; + version = "0.5.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "tytan652"; repo = "door-knocker"; rev = finalAttrs.version; - hash = "sha256-pC/Fv+GzHw0PTzJoDAUK/EzVVWXha2cflAqiznM9ZYM="; + hash = "sha256-932zUfCEN24hZxkCX9uJ2HpvmLNdTtbkXvv50Hu7KxE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doppler/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/security/doppler/default.nix rename to third_party/nixpkgs/pkgs/by-name/do/doppler/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix index 9e77085ac9..b9c63b443d 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix @@ -8,16 +8,16 @@ , libappindicator , libayatana-appindicator , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { name = "dorion"; - version = "4.1.3"; + version = "4.2.1"; src = fetchurl { url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version }/Dorion_${finalAttrs.version}_amd64.deb"; - hash = "sha256-O6KXOouutrNla5dkHRQeT0kp8DQO9MLoJrIMuqam/60="; + hash = "sha256-ki1cNrMUSO9JX8HCm4lFKid3Jq6pwKJcb4bVPaha+IA="; }; unpackCmd = '' @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoPatchelfHook dpkg - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/do/doublecmd/package.nix b/third_party/nixpkgs/pkgs/by-name/do/doublecmd/package.nix index eb4de12dfd..a77be53cd2 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/doublecmd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/doublecmd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.13"; + version = "1.1.14"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-QJPLDqdXttUSeCm1QpQ7oFgvDmzStz9maW0c5xhOLtg="; + hash = "sha256-2ZFLQoz25q3uwjQkogSyuLxSNJQ6Gh553Yj4zl70jno="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/downonspot/Cargo.lock.patch b/third_party/nixpkgs/pkgs/by-name/do/downonspot/Cargo.lock.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/misc/downonspot/Cargo.lock.patch rename to third_party/nixpkgs/pkgs/by-name/do/downonspot/Cargo.lock.patch diff --git a/third_party/nixpkgs/pkgs/applications/misc/downonspot/default.nix b/third_party/nixpkgs/pkgs/by-name/do/downonspot/package.nix similarity index 76% rename from third_party/nixpkgs/pkgs/applications/misc/downonspot/default.nix rename to third_party/nixpkgs/pkgs/by-name/do/downonspot/package.nix index 5a7c6ce693..f6e568d964 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/downonspot/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/downonspot/package.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "downonspot"; - version = "unstable-2023-11-26"; + version = "unstable-2024-04-30"; src = fetchFromGitHub { owner = "oSumAtrIX"; repo = "DownOnSpot"; - rev = "406fbf137306208bcb9835ad3aa92b0edbc01805"; - hash = "sha256-gY5pDZ5EwKhBmV8VyuKW/19BgfPSIZSp9rEI/GuonYQ="; + rev = "669dbb18e105129fff4886ba3710596d54a5f33a"; + hash = "sha256-sUptn+tmQoI2i9WBpJU23MkdQ9h+Lmx590+2+0XXC7w="; }; # Use official public librespot version cargoPatches = [ ./Cargo.lock.patch ]; - cargoHash = "sha256-CG9QY9Nfy/dxzvSPG2NB2/6yjTvdoDI76PRSaM138Wk="; + cargoHash = "sha256-GHhijwgTge7jzdkn0qynQIBNYeqtY26C5BaLpQ/UWgQ="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/dp/dpp/package.nix b/third_party/nixpkgs/pkgs/by-name/dp/dpp/package.nix index c76e3e57f4..6079585e5d 100644 --- a/third_party/nixpkgs/pkgs/by-name/dp/dpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/dp/dpp/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dpp"; - version = "10.0.29"; + version = "10.0.30"; src = fetchFromGitHub { owner = "brainboxdotcc"; repo = "DPP"; rev = "v${finalAttrs.version}"; - hash = "sha256-BJMg3MLSfb9x/2lPHITeI3SWwW1OZVUUMVltTWUcw9I="; + hash = "sha256-FW1DKbVwPPlvLtv8XzpqaAZjS1y5hasq3Rhh2u08Sz0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/dp/dps8m/package.nix b/third_party/nixpkgs/pkgs/by-name/dp/dps8m/package.nix new file mode 100644 index 0000000000..939bb17c85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/dp/dps8m/package.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitLab +, libuv +, coreutils-full +, pkg-config +, gnugrep +, gnused +}: + +stdenv.mkDerivation rec { + pname = "dps8m"; + version = "3.0.1"; + + src = fetchFromGitLab { + owner = "dps8m"; + repo = "dps8m"; + rev = "R${version}"; + hash = "sha256-YCDeHryxXZXOXqUXkbWwH7Vna+ljzydFXPeo2et87x8="; + fetchSubmodules = true; + }; + + env = { + ENV = "${coreutils-full}/bin/env"; + GREP = "${gnugrep}/bin/grep"; + SED = "${gnused}/bin/sed"; + PREFIX = placeholder "out"; + }; + + nativeBuildInputs = [ + coreutils-full + pkg-config + ]; + + buildInputs = [ + libuv + ]; + + meta = with lib; { + description = "DPS8M: GE / Honeywell / Bull DPS‑8/M mainframe simulator"; + homepage = "https://gitlab.com/dps8m/dps8m"; + license = licenses.icu; + maintainers = with maintainers; [ matthewcroughan sarcasticadmin ]; + mainProgram = "dps8m"; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/games/dualsensectl/default.nix b/third_party/nixpkgs/pkgs/by-name/du/dualsensectl/package.nix similarity index 56% rename from third_party/nixpkgs/pkgs/tools/games/dualsensectl/default.nix rename to third_party/nixpkgs/pkgs/by-name/du/dualsensectl/package.nix index 12b3a8492f..63eefab713 100644 --- a/third_party/nixpkgs/pkgs/tools/games/dualsensectl/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/du/dualsensectl/package.nix @@ -1,20 +1,23 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, dbus -, hidapi -, udev +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + dbus, + hidapi, + udev, + testers, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dualsensectl"; version = "0.5"; src = fetchFromGitHub { owner = "nowrep"; repo = "dualsensectl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-+OSp9M0A0J4nm7ViDXG63yrUZuZxR7gyckwSCdy3qm0="; }; @@ -22,9 +25,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "/usr/" "/" ''; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus @@ -32,11 +33,15 @@ stdenv.mkDerivation rec { udev ]; - makeFlags = [ - "DESTDIR=$(out)" - ]; + makeFlags = [ "DESTDIR=$(out)" ]; + + passthru = { + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + updateScript = nix-update-script { }; + }; meta = with lib; { + changelog = "https://github.com/nowrep/dualsensectl/releases/tag/v${finalAttrs.version}"; description = "Linux tool for controlling PS5 DualSense controller"; homepage = "https://github.com/nowrep/dualsensectl"; license = licenses.gpl2Only; @@ -44,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ azuwis ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix new file mode 100644 index 0000000000..1f19ed3026 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "dumbpipe"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "n0-computer"; + repo = pname; + rev = "v${version}"; + hash = "sha256-NaN3r4Vk4SCdgfFgtyCgeMOyOCfxj15vLrXRmUKTAWM="; + }; + + cargoHash = "sha256-Efuif2fIP20tXCq7bpa/n1lthvi0jcyYCpWM//qEHCY="; + + buildInputs = lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; [ + SystemConfiguration + ] + ); + + meta = with lib; { + description = "Connect A to B - Send Data"; + homepage = "https://www.dumbpipe.dev/"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ cameronfyfe ]; + mainProgram = "dumbpipe"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/du/dune3d/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dune3d/package.nix index 797819354a..f5274a99e3 100644 --- a/third_party/nixpkgs/pkgs/by-name/du/dune3d/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/du/dune3d/package.nix @@ -16,18 +16,18 @@ pkg-config, python3, stdenv, - wrapGAppsHook, + wrapGAppsHook3, }: stdenv.mkDerivation rec { pname = "dune3d"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "dune3d"; repo = "dune3d"; rev = "v${version}"; - hash = "sha256-y7jlqH1p2vCFTM14rFURxTkrWUT5hNkCseC3xB6bFFo="; + hash = "sha256-Z/kdOc/MbnnEyRsel3aZGndTAy1eCdAK0Wdta0HxaE4="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/by-name/du/dunst/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dunst/package.nix index f89bcd196a..f01f65c862 100644 --- a/third_party/nixpkgs/pkgs/by-name/du/dunst/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/du/dunst/package.nix @@ -1,28 +1,69 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper -, pkg-config, which, perl, jq, libXrandr, coreutils -, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver -, wayland, wayland-protocols -, libXinerama, libnotify, pango, xorgproto, librsvg -, testers, dunst +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, pkg-config +, which +, perl +, jq +, libXrandr +, coreutils +, cairo +, dbus +, systemd +, gdk-pixbuf +, glib +, libX11 +, libXScrnSaver +, wayland +, wayland-protocols +, libXinerama +, libnotify +, pango +, xorgproto +, librsvg +, testers +, dunst +, withX11 ? true +, withWayland ? true }: stdenv.mkDerivation (finalAttrs: { pname = "dunst"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${finalAttrs.version}"; - hash = "sha256-6smFUdWqOuYB0btsDgHtIpDBfHhkpIQfjyZ8wtRg1bQ="; + hash = "sha256-eiFvvavXGNcHZnEGwlTLxRqFNdkvEZMwNIkVyDn1V6o="; }; - nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; + nativeBuildInputs = [ + perl + pkg-config + which + systemd + makeWrapper + ]; buildInputs = [ - cairo dbus gdk-pixbuf glib libX11 libXScrnSaver - libXinerama libnotify pango xorgproto librsvg libXrandr - wayland wayland-protocols + cairo + dbus + gdk-pixbuf + glib + libnotify + pango + librsvg + ] ++ lib.optionals withX11 [ + libX11 + libXScrnSaver + libXinerama + xorgproto + libXrandr + ] ++ lib.optionals withWayland [ + wayland + wayland-protocols ]; outputs = [ "out" "man" ]; @@ -33,7 +74,9 @@ stdenv.mkDerivation (finalAttrs: { "SYSCONFDIR=$(out)/etc" "SERVICEDIR_DBUS=$(out)/share/dbus-1/services" "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user" - ]; + ] + ++ lib.optional (!withX11) "X11=0" + ++ lib.optional (!withWayland) "WAYLAND=0"; postInstall = '' wrapProgram $out/bin/dunst \ @@ -42,10 +85,8 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/dunstctl \ --prefix PATH : "${lib.makeBinPath [ coreutils dbus ]}" - install -D contrib/_dunst.zshcomp $out/share/zsh/site-functions/_dunst - install -D contrib/_dunstctl.zshcomp $out/share/zsh/site-functions/_dunstctl - substituteInPlace $out/share/zsh/site-functions/_dunstctl \ - --replace "jq -M" "${jq}/bin/jq -M" + substituteInPlace $out/share/zsh/site-functions/_dunstctl $out/share/fish/vendor_completions.d/{dunstctl,dunstify} \ + --replace-fail "jq" "${lib.getExe jq}" ''; passthru.tests.version = testers.testVersion { package = dunst; }; @@ -56,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; # NOTE: 'unix' or even 'all' COULD work too, I'm not sure platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ domenkozar gepbird ]; mainProgram = "dunst"; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/dx/dxvk/package.nix b/third_party/nixpkgs/pkgs/by-name/dx/dxvk/package.nix index d363921505..7a8e059ecf 100644 --- a/third_party/nixpkgs/pkgs/by-name/dx/dxvk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/dx/dxvk/package.nix @@ -1,38 +1,68 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, pkgsCross -, stdenv -, bash +{ + lib, + stdenvNoCC, + overrideCC, + fetchFromGitHub, + pkgsCross, + bash, }: -stdenvNoCC.mkDerivation (finalAttrs: +stdenvNoCC.mkDerivation ( + finalAttrs: let - dxvk32 = if stdenv.isDarwin - then pkgsCross.mingw32.dxvk_1.override { enableMoltenVKCompat = true; } - else pkgsCross.mingw32.dxvk_2; - dxvk64 = if stdenv.isDarwin - then pkgsCross.mingwW64.dxvk_1.override { enableMoltenVKCompat = true; } - else pkgsCross.mingwW64.dxvk_2; + useWin32ThreadModel = + stdenv: + overrideCC stdenv ( + stdenv.cc.override (old: { + cc = old.cc.override { + threadsCross = { + model = "win32"; + package = null; + }; + }; + }) + ); + + mingw32Stdenv = useWin32ThreadModel pkgsCross.mingw32.stdenv; + mingwW64Stdenv = useWin32ThreadModel pkgsCross.mingwW64.stdenv; + + dxvk32 = + if stdenvNoCC.isDarwin then + pkgsCross.mingw32.dxvk_1.override { + stdenv = mingw32Stdenv; + enableMoltenVKCompat = true; + } + else + pkgsCross.mingw32.dxvk_2.override { stdenv = mingw32Stdenv; }; + + dxvk64 = + if stdenvNoCC.isDarwin then + pkgsCross.mingwW64.dxvk_1.override { + stdenv = mingwW64Stdenv; + enableMoltenVKCompat = true; + } + else + pkgsCross.mingwW64.dxvk_2.override { stdenv = mingwW64Stdenv; }; in { pname = "dxvk"; inherit (dxvk64) version; - outputs = [ "out" "bin" "lib" ]; + outputs = [ + "out" + "bin" + "lib" + ]; - dontUnpack = true; - dontConfigure = true; - dontBuild = true; + strictDeps = true; - installPhase = '' + buildCommand = '' mkdir -p $out/bin $bin $lib substitute ${./setup_dxvk.sh} $out/bin/setup_dxvk.sh \ --subst-var-by bash ${bash} \ --subst-var-by dxvk32 ${dxvk32} \ --subst-var-by dxvk64 ${dxvk64} \ - --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads_pre_gcc_13}" \ - --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads_pre_gcc_13}" + --subst-var-by version ${finalAttrs.version} chmod a+x $out/bin/setup_dxvk.sh declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} ) for arch in "''${!dxvks[@]}"; do @@ -41,6 +71,10 @@ stdenvNoCC.mkDerivation (finalAttrs: done ''; + passthru = { inherit dxvk32 dxvk64; }; + + __structuredAttrs = true; + meta = { description = "Setup script for DXVK"; mainProgram = "setup_dxvk.sh"; @@ -48,6 +82,11 @@ stdenvNoCC.mkDerivation (finalAttrs: changelog = "https://github.com/doitsujin/dxvk/releases"; maintainers = [ lib.maintainers.reckenrode ]; license = lib.licenses.zlib; - platforms = [ "x86_64-darwin" "i686-linux" "x86_64-linux" ]; + platforms = [ + "x86_64-darwin" + "i686-linux" + "x86_64-linux" + ]; }; - }) + } +) diff --git a/third_party/nixpkgs/pkgs/by-name/dx/dxvk/setup_dxvk.sh b/third_party/nixpkgs/pkgs/by-name/dx/dxvk/setup_dxvk.sh index 4926acd3ba..27e5d6aa03 100644 --- a/third_party/nixpkgs/pkgs/by-name/dx/dxvk/setup_dxvk.sh +++ b/third_party/nixpkgs/pkgs/by-name/dx/dxvk/setup_dxvk.sh @@ -6,11 +6,9 @@ set -eu -o pipefail { dxvk32_dir=@dxvk32@/bin dxvk64_dir=@dxvk64@/bin - - mcfgthreads32_dir=@mcfgthreads32@/bin - mcfgthreads64_dir=@mcfgthreads64@/bin } + ## Defaults declare -A dlls=( @@ -18,10 +16,23 @@ declare -A dlls=( [d3d10]="dxvk/d3d10.dll dxvk/d3d10_1.dll dxvk/d3d10core.dll" [d3d11]="dxvk/d3d11.dll" [dxgi]="dxvk/dxgi.dll" +) + +declare -A obsolete_dlls=( [mcfgthreads]="mcfgthreads/mcfgthread-12.dll" ) -declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1 [mcfgthreads]=1) +declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1) + + +# Option variables + +do_cleanup=false +ignore_obsolete=false + +do_symlink=false +do_makeprefix=false + ## Command-line Parsing @@ -46,6 +57,10 @@ usage() { } case "${1:-}" in + cleanup) + do_cleanup=true + shift + ;; uninstall|install) action=$1 shift @@ -61,10 +76,6 @@ case "${1:-}" in ;; esac - -do_symlink=false -do_makeprefix=false - while [ -n "${1:-}" ]; do case "$1" in --with-dxgi) @@ -100,6 +111,10 @@ while [ -n "${1:-}" ]; do usage fi ;; + --ignore-obsolete) + shift + ignore_obsolete=true + ;; -h|--help) usage ;; @@ -111,6 +126,7 @@ while [ -n "${1:-}" ]; do shift done + ## Get information on the Wine environment export WINEPREFIX=${WINEPREFIX:-"$HOME/.wine"} @@ -165,6 +181,7 @@ if [ -z "${win32_sys_path:-}" ] && [ -z "${win64_sys_path:-}" ]; then exit 1 fi + ## Utility functions install_file() { @@ -200,6 +217,13 @@ install_file() { uninstall_file() { srcfile=$1 dstfile=$2 + args=$3 + + if [ "${args}" = "-f" ]; then + rm -v "${dstfile}" + [ -e "${dstfile}.old" ] && rm -v "${dstfile}.old" + return 0 + fi if [ -f "${srcfile}.so" ]; then srcfile="${srcfile}.so" @@ -239,6 +263,26 @@ uninstall_override() { fi } +print_cleanup_message() { + declare -a obsolete_paths=($@) + if ! $ignore_obsolete && [ -n "${obsolete_paths[@]}" ]; then + fold -w $COLUMNS -s <&2 +Obsolete DLLs detected at the specified Wine prefix. These DLLs are no longer needed \ +or managed by the \`setup_dxvk.sh\` script in nixpkgs. You should remove them manually, \ +use the cleanup command, or suppress this message using the \`--ignore-obsolete\` option. +MSG + for obspath in "${obsolete_paths[@]}"; do + if $do_cleanup; then + cleanup_file "$obspath" + else + echo " - ${obspath}" + fi + done + ! $do_cleanup && echo + fi +} + + ## Perform the requested command declare -A paths @@ -260,7 +304,32 @@ for target in "${!targets[@]}"; do done done -for srcpath in "${!paths[@]}"; do - "${action}_file" "$srcpath" "${paths["$srcpath"]}" +declare -A obsolete_paths + +for target in "${!obsolete_dlls[@]}"; do + for dll in ${obsolete_dlls[$target]}; do + dllname=$(basename "$dll") + basedir=$(dirname "$dll") + + if [ -e "${win32_sys_path:-}/$dllname" ]; then + obsolete_paths["${basedir}32_dir/$dllname"]="${win32_sys_path:-}/$dllname" + fi + if [ -e "${win64_sys_path:-}/$dllname" ]; then + obsolete_paths["${basedir}64_dir/$dllname"]="${win64_sys_path:-}/$dllname" + fi + done +done + +if $do_cleanup; then + declare -n action_paths=obsolete_paths + action=uninstall + args=-f +else + declare -n action_paths=paths + print_cleanup_message "${obsolete_paths[@]}" +fi + +for srcpath in "${!action_paths[@]}"; do + "${action}_file" "$srcpath" "${action_paths["$srcpath"]}" "${args:-}" "${action}_override" "$(basename "$srcpath" .dll)" done diff --git a/third_party/nixpkgs/pkgs/by-name/dx/dxvk_1/package.nix b/third_party/nixpkgs/pkgs/by-name/dx/dxvk_1/package.nix index a02680d77e..71223ecea2 100644 --- a/third_party/nixpkgs/pkgs/by-name/dx/dxvk_1/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/dx/dxvk_1/package.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -, glslang -, meson -, ninja -, windows -, pkgsBuildHost -, enableMoltenVKCompat ? false +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + glslang, + meson, + ninja, + windows, + enableMoltenVKCompat ? false, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "dxvk"; version = "1.10.3"; @@ -21,22 +22,35 @@ stdenv.mkDerivation (finalAttrs: { }; # These patches are required when using DXVK with Wine on Darwin. - patches = lib.optionals enableMoltenVKCompat [ - # Patch DXVK to work with MoltenVK even though it doesn’t support some required features. - # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well. - ./darwin-dxvk-compat.patch - # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin. - # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/ - ./darwin-thread-primitives.patch - ]; + patches = + [ + # Fixes errors building with GCC 13. + (fetchpatch { + url = "https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a.patch"; + hash = "sha256-tTAsQOMAazgH/6laLNTuG2lki257VUR9EBivnD4vCuY="; + }) + ] + ++ lib.optionals enableMoltenVKCompat [ + # Patch DXVK to work with MoltenVK even though it doesn’t support some required features. + # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well. + ./darwin-dxvk-compat.patch + # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin. + # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/ + ./darwin-thread-primitives.patch + ]; - nativeBuildInputs = [ glslang meson ninja ]; + strictDeps = true; + + nativeBuildInputs = [ + glslang + meson + ninja + ]; buildInputs = [ windows.pthreads ]; - mesonFlags = [ - "--buildtype" "release" - "--prefix" "${placeholder "out"}" - ]; + mesonBuildType = "release"; + + __structuredAttrs = true; meta = { description = "A Vulkan-based translation layer for Direct3D 9/10/11"; diff --git a/third_party/nixpkgs/pkgs/by-name/dx/dxvk_2/package.nix b/third_party/nixpkgs/pkgs/by-name/dx/dxvk_2/package.nix index 8c589fd725..a42c97a06c 100644 --- a/third_party/nixpkgs/pkgs/by-name/dx/dxvk_2/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/dx/dxvk_2/package.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkgsBuildHost -, glslang -, meson -, ninja -, windows -, spirv-headers -, vulkan-headers -, SDL2 -, glfw -, gitUpdater -, sdl2Support ? true -, glfwSupport ? false +{ + lib, + stdenv, + fetchFromGitHub, + pkgsBuildHost, + glslang, + meson, + ninja, + windows, + spirv-headers, + vulkan-headers, + SDL2, + glfw, + gitUpdater, + sdl2Support ? true, + glfwSupport ? false, }: # SDL2 and GLFW support are mutually exclusive. @@ -21,15 +22,15 @@ assert !sdl2Support || !glfwSupport; let isWindows = stdenv.hostPlatform.uname.system == "Windows"; in -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "dxvk"; - version = "2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "doitsujin"; repo = "dxvk"; rev = "v${finalAttrs.version}"; - hash = "sha256-RU+B0XfphD5HHW/vSzqHLUaGS3E31d5sOLp3lMmrCB8="; + hash = "sha256-lUzD1NHFLO4UqOg/BUr7PnYMJCMr1KBh3VNx8etbt8c="; fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info }; @@ -38,8 +39,18 @@ stdenv.mkDerivation (finalAttrs: { --replace "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3" ''; - nativeBuildInputs = [ glslang meson ninja ]; - buildInputs = [ spirv-headers vulkan-headers ] + strictDeps = true; + + nativeBuildInputs = [ + glslang + meson + ninja + ]; + buildInputs = + [ + spirv-headers + vulkan-headers + ] ++ lib.optionals (!isWindows && sdl2Support) [ SDL2 ] ++ lib.optionals (!isWindows && glfwSupport) [ glfw ] ++ lib.optionals isWindows [ windows.pthreads ]; @@ -50,15 +61,16 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p include/spirv/include include/vulkan/include ''; - mesonFlags = [ - "--buildtype" "release" - "--prefix" "${placeholder "out"}" - ] ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw"; + mesonBuildType = "release"; + + mesonFlags = lib.optionals glfwSupport [ "-Ddxvk_native_wsi=glfw" ]; doCheck = true; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + __structuredAttrs = true; + meta = { description = "A Vulkan-based translation layer for Direct3D 9/10/11"; homepage = "https://github.com/doitsujin/dxvk"; diff --git a/third_party/nixpkgs/pkgs/by-name/dy/dynamodb-local/package.nix b/third_party/nixpkgs/pkgs/by-name/dy/dynamodb-local/package.nix index 846f8cac68..39799fbf9f 100644 --- a/third_party/nixpkgs/pkgs/by-name/dy/dynamodb-local/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/dy/dynamodb-local/package.nix @@ -26,11 +26,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "dynamodb-local"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-03-14.tar.gz"; - hash = "sha256-BmLbmT63CaETgu1a/Tcf0KyF+Xwol67yKVwSMa9fJbw="; + url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-04-17.tar.gz"; + hash = "sha256-sEsS5qX1qKNoH/zh+mXWZtUd0ycxDtSWtyq+Hkkzr0Q="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/e1/e1s/package.nix b/third_party/nixpkgs/pkgs/by-name/e1/e1s/package.nix new file mode 100644 index 0000000000..b13d5ff947 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/e1/e1s/package.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, buildGoModule, fetchFromGitHub }: +let + pname = "e1s"; + version = "1.0.34"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "keidarcy"; + repo = "e1s"; + rev = "refs/tags/v${version}"; + hash = "sha256-fxo7TQjFrp2BbXz7bwMC5AuacKpyi5UmAMEVBmR91ko="; + }; + + vendorHash = "sha256-pM6win2W6HqjIg9QBblDl3ptKEI6sANliXkpwlFnTb0="; + + meta = with lib; { + description = "Easily Manage AWS ECS Resources in Terminal 🐱"; + homepage = "https://github.com/keidarcy/e1s"; + changelog = "https://github.com/derailed/e1s/releases/tag/v${version}"; + license = licenses.mit; + mainProgram = "e1s"; + maintainers = with maintainers; [ zelkourban ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ea/earlyoom/package.nix b/third_party/nixpkgs/pkgs/by-name/ea/earlyoom/package.nix index ba69b72b3b..4efb5a52e3 100644 --- a/third_party/nixpkgs/pkgs/by-name/ea/earlyoom/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ea/earlyoom/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "earlyoom"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; rev = "v${finalAttrs.version}"; - hash = "sha256-jgNoYOGor2i3ngDuU3It238n5ky+AppzlRKdkwXb2AI="; + hash = "sha256-7gVwR/D3HEMv2sRXYe/B2aluxncDkMGyiBklwAJkWjk="; }; outputs = [ "out" ] ++ lib.optionals withManpage [ "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/eclint/default.nix b/third_party/nixpkgs/pkgs/by-name/ec/eclint/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/eclint/default.nix rename to third_party/nixpkgs/pkgs/by-name/ec/eclint/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/ed/eduvpn-client/package.nix b/third_party/nixpkgs/pkgs/by-name/ed/eduvpn-client/package.nix index e3b5b9d8a0..8a4fd7db89 100644 --- a/third_party/nixpkgs/pkgs/by-name/ed/eduvpn-client/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ed/eduvpn-client/package.nix @@ -7,7 +7,7 @@ , libsecret , networkmanager , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gdk-pixbuf gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ei/eigenlayer/package.nix b/third_party/nixpkgs/pkgs/by-name/ei/eigenlayer/package.nix index 484d1007f2..e7811b782b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ei/eigenlayer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ei/eigenlayer/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "eigenlayer"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Layr-Labs"; repo = "eigenlayer-cli"; rev = "v${version}"; - hash = "sha256-HsDuDe2ANxL+cTJ3mm1enLoKRewZ9Ey/YajpsLO66JA="; + hash = "sha256-bj1+gm11gYwvuut8tUrML7Sg1W5rmGH49tZ4u/76s84="; }; - vendorHash = "sha256-aclRbQtGg6yQMJtaO1WjtHLXU7cE1HX1ZDckRIEtw6o="; + vendorHash = "sha256-Hws6qlt0O/1xP94ghiIBIF/FwvYGu0fY8LWjVgAp/pQ="; ldflags = ["-s" "-w"]; subPackages = ["cmd/eigenlayer"]; diff --git a/third_party/nixpkgs/pkgs/by-name/ek/eksctl/package.nix b/third_party/nixpkgs/pkgs/by-name/ek/eksctl/package.nix index 7608234233..b749c561ee 100644 --- a/third_party/nixpkgs/pkgs/by-name/ek/eksctl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.175.0"; + version = "0.176.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-Cz6zOQumkhxyMkkOJbzOUUB15godryDC8Uwid33+8TU="; + hash = "sha256-snxpAHxej/RySdC0k1r/4UZx+yUNVOTVb37xDrxpJKY="; }; - vendorHash = "sha256-wdH4+s9SU2WgIy7bJ4YrT53URvHC4vw7RZpllT2DfV8="; + vendorHash = "sha256-aDv9ZV3v94pIpUYQaREPellHBo9sxrAKUIYqJzBSWXA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix b/third_party/nixpkgs/pkgs/by-name/en/endlessh-go/package.nix similarity index 70% rename from third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix rename to third_party/nixpkgs/pkgs/by-name/en/endlessh-go/package.nix index 44c574a316..988438ac89 100644 --- a/third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/en/endlessh-go/package.nix @@ -6,20 +6,24 @@ buildGoModule rec { pname = "endlessh-go"; - version = "20230625-3"; + version = "2024.0119.1"; src = fetchFromGitHub { owner = "shizunge"; repo = "endlessh-go"; rev = version; - sha256 = "sha256-ug01nwlUCKe7DkhSJJ9XUU4QHZeH0A2f/oH6wl2VzIc="; + hash = "sha256-CLmlcuRb5dt1oPNdBfx0ql1Zmn/HahcmhVA0k50i6yA="; }; - vendorHash = "sha256-n7lzSLtR3bUslT6Q1khsFeofSvwuSaBv3n33+HIdssU="; + vendorHash = "sha256-unIyU60IrbiKDIjUf9F2pqqGNIA4gFp5XyQlvx6+xxQ="; + + CGO_ENABLED = 0; ldflags = [ "-s" "-w" ]; - passthru.tests = nixosTests.endlessh-go; + passthru.tests = { + inherit (nixosTests) endlessh-go; + }; meta = with lib; { description = "An implementation of endlessh exporting Prometheus metrics"; diff --git a/third_party/nixpkgs/pkgs/by-name/en/engage/package.nix b/third_party/nixpkgs/pkgs/by-name/en/engage/package.nix index b873b81155..4d7cfc5bcd 100644 --- a/third_party/nixpkgs/pkgs/by-name/en/engage/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/en/engage/package.nix @@ -1,7 +1,7 @@ { lib , installShellFiles , rustPlatform -, fetchgit +, fetchFromGitLab }: let @@ -11,9 +11,10 @@ in rustPlatform.buildRustPackage { inherit pname version; - # fetchFromGitLab doesn't work on GitLab's end for unknown reasons - src = fetchgit { - url = "https://or.computer.surgery/charles/${pname}"; + src = fetchFromGitLab { + domain = "gitlab.computer.surgery"; + owner = "charles"; + repo = pname; rev = "v${version}"; hash = "sha256-niXh63xTpXSp9Wqwfi8hUBKJSClOUSvB+TPCTaqHfZk="; }; @@ -39,8 +40,8 @@ rustPlatform.buildRustPackage { meta = { description = "A task runner with DAG-based parallelism"; mainProgram = "engage"; - homepage = "https://or.computer.surgery/charles/engage"; - changelog = "https://or.computer.surgery/charles/engage/-/blob/v${version}/CHANGELOG.md"; + homepage = "https://gitlab.computer.surgery/charles/engage"; + changelog = "https://gitlab.computer.surgery/charles/engage/-/blob/v${version}/CHANGELOG.md"; license = with lib.licenses; [ asl20 mit ]; maintainers = with lib.maintainers; [ CobaltCause ]; }; diff --git a/third_party/nixpkgs/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/et/etlegacy-unwrapped/package.nix index 84526ae11a..906ffa86c2 100644 --- a/third_party/nixpkgs/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -22,7 +22,7 @@ , zlib }: let - version = "2.82.0"; + version = "2.82.1"; fakeGit = writeShellApplication { name = "git"; @@ -41,7 +41,7 @@ stdenv.mkDerivation { owner = "etlegacy"; repo = "etlegacy"; rev = "refs/tags/v${version}"; - hash = "sha256-yNVVEa+3+Swm3hgwm9cSLV0K88E37TgVVjh1uUl8O2o="; + hash = "sha256-DA5tudbehXIU+4hX3ggcxWZ7AAOa8LUkIvUHbgMgDY8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/et/etlegacy/package.nix b/third_party/nixpkgs/pkgs/by-name/et/etlegacy/package.nix index 446659c014..245291d1e9 100644 --- a/third_party/nixpkgs/pkgs/by-name/et/etlegacy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/et/etlegacy/package.nix @@ -7,7 +7,7 @@ symlinkJoin { name = "etlegacy"; - version = "2.82.0"; + version = "2.82.1"; paths = [ etlegacy-assets etlegacy-unwrapped diff --git a/third_party/nixpkgs/pkgs/by-name/ew/eww/package.nix b/third_party/nixpkgs/pkgs/by-name/ew/eww/package.nix new file mode 100644 index 0000000000..76cd0eb46f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ew/eww/package.nix @@ -0,0 +1,72 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, wrapGAppsHook3 +, gtk3 +, librsvg +, gtk-layer-shell +, stdenv +, libdbusmenu-gtk3 +}: + +rustPlatform.buildRustPackage rec { + pname = "eww"; + version = "0.6.0-unstable-2024-04-26"; + + src = fetchFromGitHub { + owner = "elkowar"; + repo = "eww"; + # FIXME: change to a release tag once a new release is available + # https://github.com/elkowar/eww/pull/1084 + # using the revision to fix string truncation issue in eww config + rev = "2c8811512460ce6cc75e021d8d081813647699dc"; + hash = "sha256-eDOg5Ink3iWT/B1WpD9po5/UxS4DEaVO4NPIRyjSheM="; + }; + + cargoHash = "sha256-ClnIW7HxbQcC85OyoMhBLFjVtdEUCOARuimfS4uRi+E="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + gtk3 + gtk-layer-shell + libdbusmenu-gtk3 + librsvg + ]; + + cargoBuildFlags = [ + "--bin" + "eww" + ]; + + cargoTestFlags = cargoBuildFlags; + + # requires unstable rust features + RUSTC_BOOTSTRAP = 1; + + meta = { + description = "A widget system made in Rust to create widgets for any WM"; + longDescription = '' + Eww (ElKowar's Wacky Widgets) is a widget system made in Rust which lets + you create your own widgets similarly to how you can in AwesomeWM. + The key difference: It is independent of your window manager! + It can be configured in yuck and themed using CSS, is very easy + to customize and provides all the flexibility you need! + ''; + homepage = "https://github.com/elkowar/eww"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + coffeeispower + eclairevoyant + figsoda + lom + w-lfchen + ]; + mainProgram = "eww"; + broken = stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix b/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix index 80aa328d28..6080850add 100644 --- a/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.18.11"; + version = "0.18.15"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-jh1YmY3G3oL8HfgojGtrJLvgLT+gyTX0fsv/11UDIJ0="; + hash = "sha256-8Kv2jDWb1HDjxeGZ36btQM/b+lx3yKkkvMxDyzmMUvw="; }; - cargoHash = "sha256-4ziEG7P7igCkN6UnVqaWXgqfW+XssUP4Rn867ELXYmU="; + cargoHash = "sha256-xV1pa2vQwB9u7KUMiTawuVSgg7fmxOUxz6tFsyXak8o="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fasole/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fasole/package.nix new file mode 100644 index 0000000000..81df4e88d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fa/fasole/package.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "fasole"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "ProggerX"; + repo = "fasole"; + rev = "v${version}"; + hash = "sha256-qcCJgz/YXfd8+9ST1U4YFxLLd25D8HrfZzsDGpKgCdM="; + }; + + vendorHash = "sha256-V5jqsNy4Pu1AKikIZqEXERdggwBe3gXKMJVmgivVT6A="; + + meta = { + description = "Minimalist's todo-list"; + homepage = "https://github.com/ProggerX/fasole"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ proggerx ]; + mainProgram = "fasole"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fastahack/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastahack/package.nix new file mode 100644 index 0000000000..ed8f342007 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fa/fastahack/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + runCommand, + fastahack, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fastahack"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "ekg"; + repo = "fastahack"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-SWu2iRwNgdhsn4sH9/3jPNG3+l1xFAHXPq5/ODVd4WY="; + }; + + installFlags = [ "PREFIX=${placeholder "out"}" ]; + + passthru.tests = { + simple = runCommand "${finalAttrs.pname}-test" { } '' + mkdir $out + cp ${fastahack.src}/tests/* $out + grep -v ERROR <(${lib.getExe fastahack} $out/correct.fasta 2>&1) + grep -v ERROR <(${lib.getExe fastahack} $out/crlf.fasta 2>&1) + grep "ERROR: embedded newline " <(${lib.getExe fastahack} $out/embedded_newline.fasta 2>&1) + grep "ERROR: mismatched line lengths" <(${lib.getExe fastahack} $out/mismatched_lines.fasta 2>&1) + grep -v ERROR <(${lib.getExe fastahack} $out/trailing_newlines.fasta 2>&1) + ''; + }; + + meta = { + description = "Utilities for indexing and sequence extraction from FASTA files"; + homepage = "https://github.com/ekg/fastahack"; + changelog = "https://github.com/ekg/fastahack/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "fastahack"; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/misc/fastfetch/default.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix similarity index 85% rename from third_party/nixpkgs/pkgs/tools/misc/fastfetch/default.nix rename to third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix index 27da89ceb3..b4a56bb6ca 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fastfetch/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix @@ -11,6 +11,7 @@ , hwdata , imagemagick_light , libXrandr +, libdrm , libglvnd , libpulseaudio , libselinux @@ -21,6 +22,7 @@ , nix-update-script , ocl-icd , opencl-headers +, overrideSDK , pcre , pcre2 , pkg-config @@ -40,16 +42,18 @@ , waylandSupport ? true , x11Support ? true }: - -stdenv.mkDerivation (finalAttrs: { +let + stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.9.2"; + version = "2.12.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-SEt/qw8ixlgRY2+fqyCmhqzLVoAw/BMl//JqQxbuB0s="; + hash = "sha256-4/9LRXDUVd/8cAxfbyAj9so13bvKe/A9uu0mEYehlj4="; }; outputs = [ "out" "man" ]; @@ -74,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: { ddcutil glib hwdata + libdrm libpulseaudio libselinux libsepol @@ -129,6 +134,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.isDarwin))) (lib.cmakeBool "ENABLE_XRANDR" x11Support) + ] ++ lib.optionals stdenv.isLinux [ + (lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids") + (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids") ]; postInstall = '' @@ -151,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Like neofetch, but much faster because written in C"; homepage = "https://github.com/fastfetch-cli/fastfetch"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ gerg-l khaneliman federicoschonborn ]; + maintainers = with lib.maintainers; [ gerg-l khaneliman ]; platforms = lib.platforms.all; mainProgram = "fastfetch"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/fe/feather/package.nix b/third_party/nixpkgs/pkgs/by-name/fe/feather/package.nix index 659f7ad187..9c2dbd0350 100644 --- a/third_party/nixpkgs/pkgs/by-name/fe/feather/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fe/feather/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feather"; - version = "2.6.5"; + version = "2.6.7"; src = fetchFromGitHub { owner = "feather-wallet"; repo = "feather"; rev = finalAttrs.version; - hash = "sha256-HvjcjiVXTK9mZOvh91iCMf/cZ9BMlPxXjgFKYWolJ74="; + hash = "sha256-zXNpNhBOtDvuuxzZ8o2XDLqNSi/XK4I6eYAfWuiCgRI="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ff/ff2mpv-rust/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ff/ff2mpv-rust/Cargo.lock deleted file mode 100644 index 0142037d22..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/ff/ff2mpv-rust/Cargo.lock +++ /dev/null @@ -1,112 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "ff2mpv-rust" -version = "1.1.0" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - -[[package]] -name = "indexmap" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "proc-macro2" -version = "1.0.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "serde" -version = "1.0.195" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.195" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.111" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "syn" -version = "2.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" diff --git a/third_party/nixpkgs/pkgs/by-name/ff/ff2mpv-rust/package.nix b/third_party/nixpkgs/pkgs/by-name/ff/ff2mpv-rust/package.nix index bbc7f303f1..8114704b98 100644 --- a/third_party/nixpkgs/pkgs/by-name/ff/ff2mpv-rust/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ff/ff2mpv-rust/package.nix @@ -3,35 +3,59 @@ , fetchFromGitHub }: +let + firefoxPaths = [ + "lib/mozilla/native-messaging-hosts" + + # wrapFirefox only links lib/mozilla path, so this is ineffective + # Still the above path works, despite documentation stating otherwise + # See: https://librewolf.net/docs/faq/#how-do-i-get-native-messaging-to-work + # "lib/librewolf/native-messaging-hosts" + ]; + + chromiumPaths = [ + "etc/chromium/native-messaging-hosts" + "etc/opt/vivaldi/native-messaging-hosts" + "etc/opt/chrome/native-messaging-hosts" + "etc/opt/edge/native-messaging-hosts" + ]; +in + rustPlatform.buildRustPackage rec { pname = "ff2mpv-rust"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "ryze312"; repo = "ff2mpv-rust"; rev = version; - hash = "sha256-sofv5uRLNbMT+w+ZDGjtKqBjYJk+UDzUDQrOiWvl5Hs="; + hash = "sha256-gk3MqoMCau6RTlttTLqFtlXhrYMOf89YFg8aAlh++9s="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; + cargoHash = "sha256-NjzqzfueqR1MNR23lRYj7IYIa+OHzVhpuAo18avKMUk="; postInstall = '' - mkdir -p $out/lib/mozilla/native-messaging-hosts/ - $out/bin/ff2mpv-rust manifest > $out/lib/mozilla/native-messaging-hosts/ff2mpv.json + $out/bin/ff2mpv-rust manifest > manifest.json + $out/bin/ff2mpv-rust manifest_chromium > manifest_chromium.json + + for path in ${toString firefoxPaths} + do + mkdir -p "$out/$path" + cp manifest.json "$out/$path/ff2mpv.json" + done + + for path in ${toString chromiumPaths} + do + mkdir -p "$out/$path" + cp manifest_chromium.json "$out/$path/ff2mpv.json" + done ''; meta = with lib; { description = "Native messaging host for ff2mpv written in Rust"; homepage = "https://github.com/ryze312/ff2mpv-rust"; license = licenses.gpl3Only; - maintainers = with maintainers; [ arthsmn ]; + maintainers = with maintainers; [ arthsmn ryze ]; mainProgram = "ff2mpv-rust"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ff/fflogs/package.nix b/third_party/nixpkgs/pkgs/by-name/ff/fflogs/package.nix new file mode 100644 index 0000000000..350b62c224 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ff/fflogs/package.nix @@ -0,0 +1,37 @@ +{ lib +, appimageTools +, fetchurl +}: + +let + pname = "fflogs"; + version = "8.4.0"; + src = fetchurl { + url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; + hash = "sha256-dj6WUatWJBQZwNc8uHJYTRTpbhAmJowJmfUzbB2qbnw="; + }; + extracted = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mkdir -p $out/share/applications + cp -r ${extracted}/usr/share/icons $out/share/ + chmod -R +w $out/share/ + mv $out/share/icons/hicolor/0x0 $out/share/icons/hicolor/512x512 # https://github.com/electron-userland/electron-builder/issues/5294 + cp ${extracted}/fflogs.desktop $out/share/applications/ + sed -i 's@^Exec=AppRun --no-sandbox@Exec=fflogs@g' $out/share/applications/fflogs.desktop + ''; + + meta = with lib; { + description = "An application for uploading Final Fantasy XIV combat logs to fflogs.com"; + homepage = "https://www.fflogs.com/client/download"; + downloadPage = "https://github.com/RPGLogs/Uploaders-fflogs/releases/latest"; + license = licenses.unfree; # no license listed + mainProgram = "fflogs"; + platforms = platforms.linux; + maintainers = with maintainers; [ sersorrel ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fg/fgqcanvas/package.nix b/third_party/nixpkgs/pkgs/by-name/fg/fgqcanvas/package.nix new file mode 100644 index 0000000000..2d2fda2264 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fg/fgqcanvas/package.nix @@ -0,0 +1,53 @@ +{ fetchgit +, pkg-config +, stdenv +, lib +# Package dependencies +, qt5 +}: + +stdenv.mkDerivation rec { + pname = "fgqcanvas"; + version = "0-unstable-2024-02-11"; + + src = fetchgit { + url = "https://git.code.sf.net/p/flightgear/flightgear"; + rev = "3168828949d6b42959ccee6c202b8895493edb2b"; + sha256 = "sha256-QiIMkrzaB/ljVf6c+RJNFWKLZa84cIjYPO5nxEFDqjg="; + }; + + nativeBuildInputs = [ + qt5.wrapQtAppsHook + qt5.qmake + pkg-config + qt5.qttools + ]; + buildInputs = [ + qt5.qtwebsockets + ]; + + configurePhase = '' + runHook preConfigure + cd utils/fgqcanvas/ + mkdir -p build + cd build + qmake -makefile ../fgcanvas.pro CONFIG+="release" QMAKE_CXXFLAGS+=' -Wno-deprecated-copy -Wno-deprecated -Wno-deprecated-declarations' + runHook postConfigure + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mv fgqcanvas $out/bin/ + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://sourceforge.net/p/flightgear/flightgear/ci/next/tree/utils/fgqcanvas/README.md"; + description = "A Qt-based remote canvas application for FlightGear"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ nayala ]; + mainProgram = "fgqcanvas"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fi/files-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/files-cli/package.nix index 4694a57c68..886bf6297c 100644 --- a/third_party/nixpkgs/pkgs/by-name/fi/files-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.2"; + version = "2.13.41"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-xlsM3WVnhZlEwnPNpUaB8IIwsoqt1C0XVsbqm9G1vuU="; + hash = "sha256-WW6E0K3HOi8gtBwcmN9syV4wM73BPGyXbv3t4ZJjoIc="; }; - vendorHash = "sha256-7KL73P7oKrK2Sfgk/74D3cmQGXoDau+3gBThn+37pb8="; + vendorHash = "sha256-LdebAbdbiUX0xw1EJKCzK1jdt5+FgoZQBPI0apZkcsc="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/fi/find-billy/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/find-billy/package.nix new file mode 100644 index 0000000000..89d89dd104 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fi/find-billy/package.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchFromGitea +, godot3-headless +, godot3-export-templates +, godot3 +, makeWrapper +, just +, inkscape +, imagemagick +}: + +stdenv.mkDerivation rec { + pname = "find-billy"; + version = "0.37.3"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "annaaurora"; + repo = "Find-Billy"; + rev = "v${version}"; + hash = "sha256-z1GR5W67LJb5z+u/qeFZreMK4B6PjB18coecLCYFHy8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ godot3-headless makeWrapper just inkscape imagemagick ]; + + postPatch = '' + substituteInPlace export_presets.cfg --replace 'res://build/icons/usr/share/icons/hicolor' $out/share/icons/hicolor + substituteInPlace project.godot --replace 'res://build/icons/usr/share/icons/hicolor' $out/share/icons/hicolor + + substituteInPlace justfile --replace '{{build_icons_dir}}/usr' $out + ''; + + buildPhase = '' + runHook preBuild + + # Cannot create file `/homeless-shelter/.config/godot/projects/...` + export HOME=$TMPDIR + # Link the export-templates to the expected location. The `--export` option expects the templates in the home directory. + mkdir -p $HOME/.local/share/godot + ln -s ${godot3-export-templates}/share/godot/templates $HOME/.local/share/godot + + mkdir -p $out/share/find-billy + godot3-headless --export-pack 'Linux/X11' $out/share/${pname}/${pname}.pck + makeWrapper ${godot3}/bin/godot3 $out/bin/${pname} \ + --add-flags "--main-pack" \ + --add-flags "$out/share/${pname}/${pname}.pck" + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + just build-icons + install -D ${pname}.desktop -t $out/share/applications + + runHook postInstall + ''; + + meta = with lib; { + description = "A 2 dimensional Pixel Art Jump & Run"; + homepage = "https://codeberg.org/annaaurora/Find-Billy"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.annaaurora ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fi/firefly-iii/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/firefly-iii/package.nix index 850bb85755..ad1782de12 100644 --- a/third_party/nixpkgs/pkgs/by-name/fi/firefly-iii/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fi/firefly-iii/package.nix @@ -8,24 +8,25 @@ let pname = "firefly-iii"; - version = "6.1.13"; + version = "6.1.15"; phpPackage = php83; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; rev = "v${version}"; - hash = "sha256-85zI8uCyyoCflzxDkvba6FWa9B3kh179DJfQ2Um6MGM="; + hash = "sha256-9Od8tR8X2OZ2hu81tHWDpBX8snWCRvTnlY1AwjIcMug="; }; assets = buildNpmPackage { pname = "${pname}-assets"; inherit version src; - npmDepsHash = "sha256-wuPUE6XuzzgKjpxZVgwh2wGut15M61WSBFG+YIZwOFM="; + npmDepsHash = "sha256-UVySgcj1tQLQIxlsZuig4ixkfxfsYWYPKWLz5zHA+Dg="; dontNpmBuild = true; installPhase = '' runHook preInstall - npm run build + npm run prod --workspace=v1 + npm run build --workspace=v2 cp -r ./public $out/ runHook postInstall ''; @@ -35,7 +36,7 @@ in phpPackage.buildComposerProject (finalAttrs: { inherit pname src version; - vendorHash = "sha256-CVGKyyLp5hjjpEulDNEYfljU4OgPBaFcYQQAUf6GeGs="; + vendorHash = "sha256-RDkAbTKj7M7lE8bVRxb+RR5CA6hJIMp61U0+aRtFE50="; passthru = { inherit phpPackage; diff --git a/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/Cargo.lock index 191f6d2a5a..66005e4280 100644 --- a/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" +checksum = "6f90148830dac590fac7ccfe78ec4a8ea404c60f75a24e16407a71f0f40de775" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -41,13 +41,19 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + [[package]] name = "alloc-no-stdlib" version = "2.0.4" @@ -80,9 +86,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -94,9 +100,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -128,9 +134,26 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "arrayref" @@ -146,9 +169,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "async-compression" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693" dependencies = [ "brotli", "flate2", @@ -156,25 +179,50 @@ dependencies = [ "memchr", "pin-project-lite", "tokio", + "zstd", + "zstd-safe", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.2", "object", "rustc-demangle", ] @@ -185,6 +233,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bit_field" version = "0.10.2" @@ -199,15 +253,34 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "bitstream-io" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" + +[[package]] +name = "blake3" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] [[package]] name = "brotli" -version = "3.4.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "19483b140a7ac7174d34b5a581b406c64f84da5409d3e09cf4fff604f9270e67" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -216,25 +289,31 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", ] [[package]] -name = "bumpalo" -version = "3.14.0" +name = "built" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -243,10 +322,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "bytes" -version = "1.5.0" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bzip2" @@ -271,11 +356,23 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" dependencies = [ + "jobserver", "libc", + "once_cell", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", ] [[package]] @@ -292,22 +389,22 @@ checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "clap" -version = "4.4.18" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -315,30 +412,30 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.1", ] [[package]] name = "clap_complete" -version = "4.4.8" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf7dcb7c21d8ca1a2482ee0f1d341f437c9a7af6ca6da359dc5e1b164e98215" +checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ "heck", "proc-macro2", @@ -348,9 +445,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "color_quant" @@ -390,6 +487,12 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + [[package]] name = "core-foundation" version = "0.9.4" @@ -408,9 +511,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -458,9 +561,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -468,23 +571,23 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn", ] [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", @@ -550,15 +653,15 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -581,15 +684,15 @@ dependencies = [ [[package]] name = "exr" -version = "1.71.0" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", "half", "lebe", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.2", "rayon-core", "smallvec", "zune-inflate", @@ -597,9 +700,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -639,6 +742,7 @@ version = "0.0.0" dependencies = [ "ab_glyph", "anyhow", + "blake3", "byteorder", "bzip2", "cfg-if", @@ -679,12 +783,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.2", ] [[package]] @@ -710,18 +814,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" dependencies = [ - "roxmltree 0.18.1", + "roxmltree", ] [[package]] name = "fontdb" -version = "0.16.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b88c54a38407f7352dd2c4238830115a6377741098ffd1f997c813d0e088a6" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", @@ -768,6 +872,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -802,6 +907,7 @@ checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-io", + "futures-sink", "futures-task", "memchr", "pin-project-lite", @@ -821,20 +927,22 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -854,9 +962,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.24" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" dependencies = [ "bytes", "fnv", @@ -864,7 +972,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -873,10 +981,11 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ + "cfg-if", "crunchy", ] @@ -888,21 +997,21 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -912,9 +1021,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "http" -version = "0.2.11" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -923,12 +1032,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", "pin-project-lite", ] @@ -938,54 +1059,67 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - [[package]] name = "hyper" -version = "0.14.28" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", + "http-body-util", "hyper", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1032,20 +1166,35 @@ dependencies = [ [[package]] name = "image" -version = "0.24.8" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", "color_quant", "exr", "gif", - "jpeg-decoder", + "image-webp", "num-traits", - "png 0.17.11", + "png 0.17.13", "qoi", + "ravif", + "rayon", + "rgb", "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +dependencies = [ + "byteorder-lite", + "thiserror", ] [[package]] @@ -1054,6 +1203,12 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + [[package]] name = "indexmap" version = "1.9.3" @@ -1067,15 +1222,26 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "ipnet" version = "2.9.0" @@ -1083,36 +1249,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] -name = "itoa" -version = "1.0.10" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] [[package]] name = "jpeg-decoder" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "kurbo" -version = "0.9.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "6e5aa9f0f96a938266bdb12928a67169e8d22c6a786fda8ed984b85e6ba93c3c" dependencies = [ "arrayvec", + "smallvec", ] [[package]] @@ -1138,29 +1320,36 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", - "redox_syscall", ] [[package]] name = "line-wrap" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" [[package]] name = "linux-raw-sys" @@ -1170,9 +1359,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1180,21 +1369,40 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] @@ -1220,6 +1428,12 @@ name = "mime-parse" version = "0.0.0" source = "git+https://github.com/filips123/mime?branch=implement-eq-partialeq#57416f447a10c3343df7fe80deb0ae8a7c77cf0a" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.3.7" @@ -1231,9 +1445,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", @@ -1269,10 +1483,81 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.17" +name = "new_debug_unreachable" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "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-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -1289,9 +1574,9 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] @@ -1313,11 +1598,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.63" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -1345,18 +1630,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.1+3.2.0" +version = "300.2.3+3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -1406,6 +1691,12 @@ dependencies = [ "syn", ] +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + [[package]] name = "percent-encoding" version = "2.3.1" @@ -1451,7 +1742,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -1461,10 +1752,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] -name = "pin-project-lite" -version = "0.2.13" +name = "pin-project" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1480,18 +1791,18 @@ checksum = "5de5067af0cd27add969cdb4ef2eecc955f59235f3b7a75a3c6ac9562cfb6b81" [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" dependencies = [ - "base64", - "indexmap 2.1.0", + "base64 0.21.7", + "indexmap 2.2.6", "line-wrap", "quick-xml", "serde", @@ -1512,15 +1823,15 @@ dependencies = [ [[package]] name = "png" -version = "0.17.11" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.2", ] [[package]] @@ -1537,13 +1848,32 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn", +] + [[package]] name = "qoi" version = "0.4.1" @@ -1559,6 +1889,12 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quick-xml" version = "0.31.0" @@ -1570,9 +1906,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1583,7 +1919,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9586f8867f39941d8e796c18340a9cb5221a018df021169dc3e61c87d9f5f567" dependencies = [ - "quick-error", + "quick-error 1.2.3", ] [[package]] @@ -1617,10 +1953,60 @@ dependencies = [ ] [[package]] -name = "rayon" -version = "1.8.1" +name = "rav1e" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error 2.0.1", + "rav1e", + "rayon", + "rgb", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -1636,12 +2022,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rctree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" - [[package]] name = "redox_syscall" version = "0.4.1" @@ -1653,9 +2033,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -1664,25 +2044,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -1693,27 +2073,30 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.11.23" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "async-compression", - "base64", + "base64 0.22.1", "bytes", "encoding_rs", + "futures-channel", "futures-core", "futures-util", "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -1722,9 +2105,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -1740,15 +2125,15 @@ dependencies = [ [[package]] name = "resvg" -version = "0.37.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" +checksum = "c2327ced609dadeed3e9702fec3e6b2ddd208758a9268d13e06566c6101ba533" dependencies = [ "gif", "jpeg-decoder", "log", "pico-args", - "png 0.17.11", + "png 0.17.13", "rgb", "svgtypes", "tiny-skia", @@ -1764,15 +2149,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "roxmltree" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" -dependencies = [ - "xmlparser", -] - [[package]] name = "roxmltree" version = "0.19.0" @@ -1787,11 +2163,11 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -1799,12 +2175,28 @@ dependencies = [ ] [[package]] -name = "rustybuzz" -version = "0.12.1" +name = "rustls-pemfile" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "bitflags 2.4.2", + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" + +[[package]] +name = "rustybuzz" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88117946aa1bfb53c2ae0643ceac6506337f44887f8c9fbfb43587b1cc52ba49" +dependencies = [ + "bitflags 2.5.0", "bytemuck", "smallvec", "ttf-parser", @@ -1816,15 +2208,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "sanitize-filename" @@ -1853,9 +2239,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -1866,9 +2252,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -1876,18 +2262,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.195" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", @@ -1896,15 +2282,24 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1919,16 +2314,17 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.5.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58c3a1b3e418f61c25b2aeb43fc6c95eaa252b8cecdda67f401943e9e08d33f" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ - "base64", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", + "serde_derive", "serde_json", "serde_with_macros", "time", @@ -1936,9 +2332,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.5.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2068b437a31fc68f25dd7edc296b078f04b45145c199d8eed9866e45f1ff274" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ "darling", "proc-macro2", @@ -1952,6 +2348,15 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + [[package]] name = "simplecss" version = "0.2.1" @@ -1963,9 +2368,9 @@ dependencies = [ [[package]] name = "simplelog" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" +checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" dependencies = [ "log", "termcolor", @@ -1978,6 +2383,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "slab" version = "0.4.9" @@ -1998,9 +2409,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smart-default" @@ -2015,12 +2426,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2047,6 +2458,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "structmeta" version = "0.2.0" @@ -2072,25 +2489,31 @@ dependencies = [ [[package]] name = "svgtypes" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +checksum = "d97ca9a891c9c70da8139ac9d8e8ea36a210fa21bb50eccd75d4a9561c83e87f" dependencies = [ "kurbo", - "siphasher", + "siphasher 1.0.1", ] [[package]] name = "syn" -version = "2.0.48" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "system-configuration" version = "0.5.1" @@ -2112,6 +2535,19 @@ dependencies = [ "libc", ] +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + [[package]] name = "tar" version = "0.4.40" @@ -2124,41 +2560,46 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.9.0" +name = "target-lexicon" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", "windows-sys 0.52.0", ] [[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", ] [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", @@ -2178,13 +2619,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -2200,33 +2642,34 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "tiny-skia" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a067b809476893fce6a254cf285850ff69c847e6cfbade6a20b655b6c7e80d" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", "arrayvec", "bytemuck", "cfg-if", "log", - "png 0.17.11", + "png 0.17.13", "tiny-skia-path", ] [[package]] name = "tiny-skia-path" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de35e8a90052baaaf61f171680ac2f8e925a1e43ea9d2e3a00514772250e541" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" dependencies = [ "arrayref", "bytemuck", @@ -2250,9 +2693,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -2300,6 +2743,62 @@ dependencies = [ "tracing", ] +[[package]] +name = "toml" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -2312,6 +2811,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-core", ] @@ -2339,12 +2839,14 @@ checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" [[package]] name = "ulid" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" +checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" dependencies = [ + "getrandom", "rand", "serde", + "web-time", ] [[package]] @@ -2355,15 +2857,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bidi-mirroring" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" [[package]] name = "unicode-ccc" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" [[package]] name = "unicode-ident" @@ -2373,9 +2875,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -2388,9 +2890,9 @@ checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" [[package]] name = "unicode-script" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" [[package]] name = "unicode-vo" @@ -2424,63 +2926,29 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "usvg" -version = "0.37.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" -dependencies = [ - "base64", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", -] - -[[package]] -name = "usvg-parser" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" +checksum = "5c704361d822337cfc00387672c7b59eaa72a1f0744f62b2a68aa228a0c6927d" dependencies = [ + "base64 0.22.1", "data-url", "flate2", + "fontdb", "imagesize", "kurbo", "log", - "roxmltree 0.19.0", - "simplecss", - "siphasher", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" -dependencies = [ - "fontdb", - "kurbo", - "log", + "pico-args", + "roxmltree", "rustybuzz", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" -dependencies = [ - "rctree", + "simplecss", + "siphasher 1.0.1", "strict-num", "svgtypes", "tiny-skia-path", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "xmlwriter", ] [[package]] @@ -2489,12 +2957,29 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + [[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + [[package]] name = "version_check" version = "0.9.4" @@ -2518,9 +3003,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2528,9 +3013,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", @@ -2543,9 +3028,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -2555,9 +3040,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2565,9 +3050,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", @@ -2578,15 +3063,25 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -2610,9 +3105,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "winapi" @@ -2632,11 +3127,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -2652,7 +3147,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -2661,7 +3156,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -2679,7 +3174,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -2699,17 +3194,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -2720,9 +3216,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2732,9 +3228,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -2744,9 +3240,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -2756,9 +3258,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -2768,9 +3270,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -2780,9 +3282,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -2792,15 +3294,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" +dependencies = [ + "memchr", +] [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -2817,18 +3328,46 @@ dependencies = [ "rustix", ] -[[package]] -name = "xmlparser" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" - [[package]] name = "xmlwriter" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" +[[package]] +name = "zstd" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.10+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + [[package]] name = "zune-inflate" version = "0.2.54" @@ -2837,3 +3376,12 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" dependencies = [ "simd-adler32", ] + +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] diff --git a/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/package.nix index 971d5ac16f..3564ce0296 100644 --- a/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fi/firefoxpwa/package.nix @@ -1,33 +1,37 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, makeWrapper -, pkg-config -, installShellFiles -, firefox-unwrapped -, openssl -, stdenv -, udev -, libva -, mesa -, libnotify -, xorg -, cups -, pciutils -, libcanberra-gtk3 -, extraLibs ? [ ] -, nixosTests +{ + extraLibs ? [ ], + + lib, + fetchFromGitHub, + installShellFiles, + makeWrapper, + rustPlatform, + + cups, + firefox-unwrapped, + libcanberra-gtk3, + libglvnd, + libnotify, + libva, + mesa, + nixosTests, + openssl, + pciutils, + pkg-config, + stdenv, + udev, + xorg, }: rustPlatform.buildRustPackage rec { pname = "firefoxpwa"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "filips123"; repo = "PWAsForFirefox"; rev = "v${version}"; - hash = "sha256-ZD/bTziVmHtQVKejzj+fUXVazCm2PaulS2NZjTribSk="; + hash = "sha256-T2X+41ScE8FDZGJdgAjZCp1MQX51UACuNsWFk+6cR3A="; }; sourceRoot = "${src.name}/native"; @@ -47,7 +51,11 @@ rustPlatform.buildRustPackage rec { sed -i $'s;DISTRIBUTION_VERSION = \'0.0.0\';DISTRIBUTION_VERSION = \'${version}\';' userchrome/profile/chrome/pwa/chrome.jsm ''; - nativeBuildInputs = [ makeWrapper pkg-config installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + ]; buildInputs = [ openssl ]; FFPWA_EXECUTABLES = ""; # .desktop entries generated without any store path references @@ -55,7 +63,23 @@ rustPlatform.buildRustPackage rec { completions = "target/${stdenv.targetPlatform.config}/release/completions"; gtk_modules = map (x: x + x.gtkModule) [ libcanberra-gtk3 ]; - libs = let libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] ++ gtk_modules ++ extraLibs; in lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs; + libs = + let + libs = + lib.optionals stdenv.isLinux [ + cups + libglvnd + libnotify + libva + mesa + pciutils + udev + xorg.libXScrnSaver + ] + ++ gtk_modules + ++ extraLibs; + in + lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs; postInstall = '' # Runtime @@ -95,7 +119,7 @@ rustPlatform.buildRustPackage rec { passthru.tests.firefoxpwa = nixosTests.firefoxpwa; - meta = with lib; { + meta = { description = "A tool to install, manage and use Progressive Web Apps (PWAs) in Mozilla Firefox (native component)"; longDescription = '' Progressive Web Apps (PWAs) are web apps that use web APIs and features along @@ -125,9 +149,13 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://pwasforfirefox.filips.si/"; changelog = "https://github.com/filips123/PWAsForFirefox/releases/tag/v${version}"; - license = licenses.mpl20; - platforms = platforms.unix; - maintainers = with maintainers; [ camillemndn pasqui23 ]; + license = lib.licenses.mpl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + adamcstephens + camillemndn + pasqui23 + ]; mainProgram = "firefoxpwa"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flac123/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flac123/package.nix new file mode 100644 index 0000000000..2a042366cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fl/flac123/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + flac, + libao, + libogg, + popt, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "flac123"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "flac123"; + repo = "flac123"; + rev = "v${finalAttrs.version}"; + hash = "sha256-LtL69t2r9TlIkpQWZLge8ib7NZ5rvLW6JllG2UM16Kw="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ + flac + libao + libogg + popt + ]; + + meta = { + homepage = "https://github.com/flac123/flac123"; + description = "A command-line program for playing FLAC audio files"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ kiike ]; + mainProgram = "flac123"; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flarectl/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flarectl/package.nix index 98f5f46412..c094fe961a 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flarectl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flarectl/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "flarectl"; - version = "0.93.0"; + version = "0.95.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-XN/GRay5fJ2EjGHguG9i4ENCRBPZQcwQJg/2ka0HyaE="; + hash = "sha256-GcmFRtQ8aqicvawCpFDo+oheUSOgKewBETIizPKcyGU="; }; - vendorHash = "sha256-/81Onrs+qyKEt79DtfX4EDDVxhzB0uqaHa3X+GbupWQ="; + vendorHash = "sha256-Jtap4hGwNr8lpXi6huGikL4iUSP242cIiFyvGveszq8="; subPackages = [ "cmd/flarectl" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flashgbx/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flashgbx/package.nix new file mode 100644 index 0000000000..c816f7d005 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fl/flashgbx/package.nix @@ -0,0 +1,63 @@ +{ lib +, python3Packages +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, qt6 +}: + +python3Packages.buildPythonApplication rec { + pname = "flashgbx"; + version = "3.37"; + + src = fetchFromGitHub { + repo = "FlashGBX"; + owner = "lesserkuma"; + rev = version; + hash = "sha256-3527QmSSpGotFHKTg0yb6MgHKSze+9BECQWqZM3qKsw="; + }; + + desktopItems = [ + (makeDesktopItem { + name = "flashgbx"; + desktopName = "FlashGBX UI"; + icon = "flashgbx"; + exec = meta.mainProgram; + comment = "UI for reading and writing Game Boy and Game Boy Advance cartridges"; + categories = [ "Utility" ]; + }) + ]; + + postInstall = + '' + install -D FlashGBX/res/icon.png $out/share/icons/hicolor/256x256/apps/flashgbx.png + ''; + + pyproject = true; + + nativeBuildInputs = [ + python3Packages.setuptools + copyDesktopItems + qt6.wrapQtAppsHook + ]; + + propagatedBuildInputs = with python3Packages; [ + pillow + pyserial + pyside6 + python-dateutil + requests + setuptools + qt6.qtbase + ] ++ lib.optionals stdenv.isLinux [ + qt6.qtwayland + ]; + + meta = with lib; { + description = "GUI for reading and writing GB and GBA cartridges with the GBxCart RW"; + homepage = "https://github.com/lesserkuma/FlashGBX"; + license = licenses.gpl3Only; + mainProgram = "flashgbx"; + maintainers = with maintainers; [ grahamnorris ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flashprog/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flashprog/package.nix index 509c0fb550..fe04a6586c 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flashprog/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flashprog/package.nix @@ -12,14 +12,14 @@ , withGpio ? stdenv.isLinux }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "flashprog"; - version = "1.0.1"; + version = "1.1"; src = fetchgit { url = "https://review.sourcearcade.org/flashprog"; - rev = "2ca11f9a4101ea230081d448ab2b570425b7f0bd"; - hash = "sha256-pm9g9iOJAKnzzY9couzt8RmqZFbIpKcO++zsUJ9o49U="; + rev = "v${finalAttrs.version}"; + hash = "sha256-CLwaGxVOo8FJaWfvrJ2hAm7XonP5nHT6YTsaw7scKCM="; }; nativeBuildInputs = [ @@ -60,4 +60,4 @@ stdenv.mkDerivation { platforms = platforms.all; mainProgram = "flashprog"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/flowtime/default.nix b/third_party/nixpkgs/pkgs/by-name/fl/flowtime/package.nix similarity index 92% rename from third_party/nixpkgs/pkgs/applications/misc/flowtime/default.nix rename to third_party/nixpkgs/pkgs/by-name/fl/flowtime/package.nix index 06962d7545..d372d1d453 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/flowtime/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/fl/flowtime/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "flowtime"; - version = "6.1"; + version = "6.5"; src = fetchFromGitHub { owner = "Diego-Ivan"; repo = "Flowtime"; rev = "v${version}"; - hash = "sha256-wTqHTkt1O3Da2fzxf6DiQjrqOt65ZEhLOkGK5C6HzIk="; + hash = "sha256-J0Pscv0ZOpA/LV2mPTLOmDPQpfZhizTghatGnrJHToE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/fm/fmtoy/package.nix b/third_party/nixpkgs/pkgs/by-name/fm/fmtoy/package.nix index a3fe819ae7..fd466b777f 100644 --- a/third_party/nixpkgs/pkgs/by-name/fm/fmtoy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fm/fmtoy/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fmtoy"; - version = "0.0.0-unstable-2023-05-21"; + version = "0-unstable-2024-04-18"; src = fetchFromGitHub { owner = "vampirefrog"; repo = "fmtoy"; - rev = "2b54180d8edd0de90e2af01bf9ff303bc916e893"; - hash = "sha256-qoMw4P+QEw4Q/wKBvFPh+WxkmOW6qH9FuFFkO2ZRrMc="; + rev = "aca005c770724f21c8a91dc6a482738871e78c9f"; + hash = "sha256-vrd7Eg3Bh8ll2yCfD1rAJpotEe+Zq+JuF4VMhiYsbDw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/fn/fnott/package.nix b/third_party/nixpkgs/pkgs/by-name/fn/fnott/package.nix index 8e4327bc80..ad66d38748 100644 --- a/third_party/nixpkgs/pkgs/by-name/fn/fnott/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fn/fnott/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "fnott"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fnott"; rev = version; - hash = "sha256-8SKInlj54BP3Gn/DNVoLN62+Dfa8G5d/q2xGUXXdsjo="; + hash = "sha256-F2Pt3xbWDZZ3s056KU3qLXUrFQ0wT7QYK4GvR7slMYc="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fontfor/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/fontfor/package.nix similarity index 65% rename from third_party/nixpkgs/pkgs/tools/misc/fontfor/default.nix rename to third_party/nixpkgs/pkgs/by-name/fo/fontfor/package.nix index b973317b72..d2a5747809 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fontfor/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/fontfor/package.nix @@ -1,22 +1,24 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, cmake -, pkg-config -, expat -, fontconfig -, freetype +{ + lib, + rustPlatform, + fetchFromGitHub, + cmake, + pkg-config, + expat, + fontconfig, + freetype, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "fontfor"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "7sDream"; repo = "fontfor"; rev = "v${version}"; - sha256 = "sha256-/UoZ+5X6Csoyqc+RSP0Hree7NtCDs7BjsqcpALxAazc="; + hash = "sha256-gJl9SPL/KeYFzKIjwWPVR1iVy6h/W7OP7xE7krhYaY8="; }; nativeBuildInputs = [ @@ -29,7 +31,9 @@ rustPlatform.buildRustPackage rec { freetype ]; - cargoHash = "sha256-j1Qf0IKlAUEyiGAUoF7IlEbPIv2pGkn+YMCoFdF9oUE="; + cargoHash = "sha256-9Ac2NuUFfluXN4NOT645gszGApBIsFxQiTZDf8PHbvo="; + + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Find fonts which can show a specified character and preview them in browser"; diff --git a/third_party/nixpkgs/pkgs/by-name/fo/forbidden/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/forbidden/package.nix index adbd83ada4..a3f57a4a05 100644 --- a/third_party/nixpkgs/pkgs/by-name/fo/forbidden/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/forbidden/package.nix @@ -5,23 +5,17 @@ python3.pkgs.buildPythonApplication rec { pname = "forbidden"; - version = "10.8"; + version = "10.9"; pyproject = true; src = fetchFromGitHub { owner = "ivan-sincek"; repo = "forbidden"; rev = "refs/tags/v${version}"; - hash = "sha256-jitmgN+We6m5CTgRc1NYwZkg5GYvD6ZlJ8FKtTa+rAY="; + hash = "sha256-LggF9giKKKO2F65zS0lPCshaDauy+s6YyRGr3BL0tJU="; }; - pythonRemoveDeps = [ - # https://github.com/ivan-sincek/forbidden/pull/3 - "argparse" - ]; - build-system = with python3.pkgs; [ - pythonRelaxDepsHook setuptools ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fo/forge-sparks/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/forge-sparks/package.nix index 5a16010047..f7fb36ad2c 100644 --- a/third_party/nixpkgs/pkgs/by-name/fo/forge-sparks/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/forge-sparks/package.nix @@ -17,15 +17,15 @@ , wrapGAppsHook4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "forge-sparks"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "rafaelmardojai"; - repo = pname; - rev = version; - hash = "sha256-kUvUAJLCqIQpjm8RzAZaHVkdDCD9uKSQz9cYN60xS+4="; + repo = "forge-sparks"; + rev = finalAttrs.version; + hash = "sha256-1Aq9Bv1UEckoA9IkQ9++rM6623GD41hgBJoeXKr2ipM="; fetchSubmodules = true; }; @@ -59,12 +59,12 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + changelog = "https://github.com/rafaelmardojai/forge-sparks/releases/tag/${finalAttrs.version}"; description = "Get Git forges notifications"; homepage = "https://github.com/rafaelmardojai/forge-sparks"; - changelog = "https://github.com/rafaelmardojai/forge-sparks/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ michaelgrahamevans ]; mainProgram = "forge-sparks"; + maintainers = with maintainers; [ michaelgrahamevans ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/package-json-npm-build-frontend.patch b/third_party/nixpkgs/pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch similarity index 58% rename from third_party/nixpkgs/pkgs/applications/version-management/forgejo/package-json-npm-build-frontend.patch rename to third_party/nixpkgs/pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch index 57e2b7ec69..f7567da020 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/package-json-npm-build-frontend.patch +++ b/third_party/nixpkgs/pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch @@ -1,11 +1,11 @@ diff --git a/package.json b/package.json -index 57dcfc2f7..c9f23dbf7 100644 +index b50c52cf43..d6aafb8775 100644 --- a/package.json +++ b/package.json -@@ -79,5 +79,8 @@ - "defaults", - "not ie > 0", - "not ie_mob > 0" +@@ -98,5 +98,8 @@ + }, + "browserslist": [ + "defaults" - ] + ], + "scripts": { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/forgejo/package.nix similarity index 68% rename from third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix rename to third_party/nixpkgs/pkgs/by-name/fo/forgejo/package.nix index 65c683ddbe..93fea61bfb 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/fo/forgejo/package.nix @@ -24,7 +24,7 @@ let pname = "forgejo-frontend"; inherit (forgejo) src version; - npmDepsHash = "sha256-uMPy4cqMDNZTpF+pk7YibXEJO1zxVfwlCeFzGgJBiU0="; + npmDepsHash = "sha256-BffoEbIzTU61bw3ECEm5eDHcav4S27MB5jQKsMprkcw="; patches = [ ./package-json-npm-build-frontend.patch @@ -39,33 +39,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.21.11-1"; + version = "7.0.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-7oYsoZpZcNIUw3iXSi1Q5So2yYgKnT5U7GHQ4NVqVdc="; - # Forgejo has multiple different version strings that need to be provided - # via ldflags. main.ForgejoVersion for example is a combination of a - # hardcoded gitea compatibility version string (in the Makefile) and - # git describe and is easiest to get by invoking the Makefile. - # So we do that, store it the src FOD to then extend the ldflags array - # in preConfigure. - # The `echo -e >> Makefile` is temporary and already part of the next - # major release. Furthermore, the ldflags will change next major release - # and need to be updated accordingly. - leaveDotGit = true; - postFetch = '' - cd "$out" - echo -e 'show-version-full:\n\t@echo ''${FORGEJO_VERSION}' >> Makefile - make show-version-full > FULL_VERSION - find "$out" -name .git -print0 | xargs -0 rm -rf - ''; + hash = "sha256-YY5dHXWMqlCIPfqsDtHZLHjEdYmrFnh4yc0hfTUESww="; }; - vendorHash = "sha256-OuWNF+muWM6xqwkFxLIUsn/huqXj2VKg8BN9+JHVw58="; + vendorHash = "sha256-UcjaMi/4XYLdaJhi2j3UWqHqkpTbZBo6EwNXxdRIKLw="; subPackages = [ "." ]; @@ -93,7 +77,7 @@ buildGoModule rec { ]; preConfigure = '' - export ldflags+=" -X code.gitea.io/gitea/routers/api/forgejo/v1.ForgejoVersion=$(cat FULL_VERSION) -X main.ForgejoVersion=$(cat FULL_VERSION)" + export ldflags+=" -X main.ForgejoVersion=$(GITEA_VERSION=${version} make show-version-api)" ''; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/static-root-path.patch b/third_party/nixpkgs/pkgs/by-name/fo/forgejo/static-root-path.patch similarity index 60% rename from third_party/nixpkgs/pkgs/applications/version-management/forgejo/static-root-path.patch rename to third_party/nixpkgs/pkgs/by-name/fo/forgejo/static-root-path.patch index 7f70329c60..598c3a8103 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/static-root-path.patch +++ b/third_party/nixpkgs/pkgs/by-name/fo/forgejo/static-root-path.patch @@ -1,10 +1,10 @@ diff --git a/modules/setting/server.go b/modules/setting/server.go -index 183906268..fa02e8915 100644 +index c20dd1949d..c9bcdce99a 100644 --- a/modules/setting/server.go +++ b/modules/setting/server.go -@@ -319,7 +319,7 @@ func loadServerFrom(rootCfg ConfigProvider) { - OfflineMode = sec.Key("OFFLINE_MODE").MustBool() - Log.DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() +@@ -317,7 +317,7 @@ func loadServerFrom(rootCfg ConfigProvider) { + RedirectorUseProxyProtocol = sec.Key("REDIRECTOR_USE_PROXY_PROTOCOL").MustBool(UseProxyProtocol) + OfflineMode = sec.Key("OFFLINE_MODE").MustBool(true) if len(StaticRootPath) == 0 { - StaticRootPath = AppWorkPath + StaticRootPath = "@data@" diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix b/third_party/nixpkgs/pkgs/by-name/fr/fragments/package.nix similarity index 60% rename from third_party/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix rename to third_party/nixpkgs/pkgs/by-name/fr/fragments/package.nix index edb31ba669..7976a2add1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/fr/fragments/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , appstream-glib , cargo , dbus @@ -17,36 +16,26 @@ , rustPlatform , rustc , sqlite -, transmission +, transmission_4 , wrapGAppsHook4 }: -let - patchedTransmission = transmission.overrideAttrs (oldAttrs: { - patches = (oldAttrs.patches or []) ++ [ - (fetchpatch { - url = "https://raw.githubusercontent.com/flathub/de.haeckerfelix.Fragments/2aee477c8e26a24570f8dbbdbd1c49e017ae32eb/transmission_pdeathsig.patch"; - sha256 = "sha256-/rCoA566tMmzqcIfffC082Y56TwEyyQJ0knxymtscbA="; - }) - ]; - }); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "fragments"; - version = "2.1.1"; + version = "3.0.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Fragments"; rev = version; - sha256 = "sha256-tZcVw4rxmNPcKKgyRB+alEktktZfKK+7FYUVAAGA9bw="; + hash = "sha256-HtulyB1XYBsA595ghJN0EmyJT7DjGUbtJKaMGM3f0I8="; }; - patches = []; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src patches; + inherit src; name = "${pname}-${version}"; - hash = "sha256-nqVaYnL3jKGBsAsakIkgwksjH4yuMhwCQe0zq3jgjnA="; + hash = "sha256-EUE+Qc+MqsKPqHMYJflZQ6zm3ErW+KLuJq/7HEBf8VM="; }; nativeBuildInputs = [ @@ -71,9 +60,9 @@ in stdenv.mkDerivation rec { sqlite ]; - preFixup = '' + preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ patchedTransmission ]}" + --prefix PATH : "${lib.makeBinPath [ transmission_4 ]}" ) ''; diff --git a/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix index e6ce4c97d2..45b0fed971 100644 --- a/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix @@ -7,6 +7,7 @@ , testers , frankenphp , darwin +, libiconv , pkg-config , makeBinaryWrapper , runCommand @@ -26,13 +27,13 @@ let pieBuild = stdenv.hostPlatform.isMusl; in buildGoModule rec { pname = "frankenphp"; - version = "1.1.2"; + version = "1.1.5"; src = fetchFromGitHub { owner = "dunglas"; repo = "frankenphp"; rev = "v${version}"; - hash = "sha256-r6BMlcjvRbVnBHsfRhJyMiyZzH2Z+FLOYz6ik4I8p+A="; + hash = "sha256-W+9p/9qT7v1jq6m/gRgfw4AmnPRZVY3UixXaypUVn4E="; }; sourceRoot = "${src.name}/caddy"; @@ -40,7 +41,7 @@ in buildGoModule rec { # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 proxyVendor = true; - vendorHash = "sha256-gxBD2KPkWtAM0MsaQ9Ed4QDjJCg1uJQpXvnCOnAsZTw="; + vendorHash = "sha256-eNW03oBaON2X5X2ZbM3Ly5T+bJzSDhEYajY5LaZhwdQ="; buildInputs = [ phpUnwrapped brotli ] ++ phpUnwrapped.buildInputs; nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config darwin.cctools darwin.autoSignDarwinBinariesHook ]; @@ -64,7 +65,7 @@ in buildGoModule rec { '' + lib.optionalString stdenv.isDarwin '' # replace hard-code homebrew path substituteInPlace ../frankenphp.go \ - --replace "-L/opt/homebrew/opt/libiconv/lib" "-L${darwin.libiconv}/lib" + --replace "-L/opt/homebrew/opt/libiconv/lib" "-L${libiconv}/lib" ''; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/by-name/fr/free42/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/free42/package.nix index 415f6f6f8b..679e43fc1d 100644 --- a/third_party/nixpkgs/pkgs/by-name/fr/free42/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fr/free42/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "free42"; - version = "3.1.5"; + version = "3.1.8"; src = fetchFromGitHub { owner = "thomasokken"; repo = "free42"; rev = "v${finalAttrs.version}"; - hash = "sha256-YFTmEyOd/r8Pbj+PzD+VYkkB0gqDJ4wteLBTdwa1qcE="; + hash = "sha256-z1HlI2e3mCRJ/sWMdsLF7IpcvTh+Zlrk77M8gaJXMzQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix index 436d94bd0f..61fa9a395e 100644 --- a/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix @@ -27,7 +27,7 @@ , stdenv , swig , vtk -, wrapGAppsHook +, wrapGAppsHook3 , xercesc , zlib }: @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { pyside2-tools gfortran wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/fr/freefilesync/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/freefilesync/package.nix index 529516bb0d..c19efa63a4 100644 --- a/third_party/nixpkgs/pkgs/by-name/fr/freefilesync/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fr/freefilesync/package.nix @@ -5,7 +5,7 @@ , fetchDebianPatch , copyDesktopItems , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , unzip , curl , glib @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "freefilesync"; - version = "13.5"; + version = "13.6"; src = fetchurl { url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip"; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { rm -f $out tryDownload "$url" ''; - hash = "sha256-8At8QobAQR2mQnFjFSPTkEuxmP9M8gINP0qH28J3ynY="; + hash = "sha256-lJ4LiisUy8w6OPd44wJufH+ol1YwjOfFQfqzj3HWb2w="; }; sourceRoot = "."; @@ -56,20 +56,12 @@ stdenv.mkDerivation (finalAttrs: { patch = "Disable_wxWidgets_uncaught_exception_handling.patch"; hash = "sha256-Fem7eDDKSqPFU/t12Jco8OmYC8FM9JgB4/QVy/ouvbI="; }) - # Disable update patch - (fetchDebianPatch { - pname = "freefilesync"; - version = "13.3"; - debianRevision = "1"; - patch = "ffs_no_check_updates.patch"; - hash = "sha256-lPyHpxhZz8BSnDI8QfAzKpKwVkp2jiF49RWjKNuZGII="; - }) ]; nativeBuildInputs = [ copyDesktopItems pkg-config - wrapGAppsHook + wrapGAppsHook3 unzip ]; diff --git a/third_party/nixpkgs/pkgs/by-name/fr/fretboard/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/fretboard/package.nix index fa772d6186..a4582832ae 100644 --- a/third_party/nixpkgs/pkgs/by-name/fr/fretboard/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fr/fretboard/package.nix @@ -16,21 +16,21 @@ , wrapGAppsHook4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fretboard"; - version = "5.4"; + version = "6.1"; src = fetchFromGitHub { owner = "bragefuglseth"; repo = "fretboard"; - rev = "v${version}"; - hash = "sha256-GqnwAB7hmg2QLwSWqrZtTp6+FybK8/v4GZx/lMi0dGY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-Jr7DxoOmggcAxU1y+2jXZvMgAf9SDSA7t5Jr2AYZV7s="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-sGvb1+HKIqNSgCV9UzkCrkGrpjA34Pe9eq2/w3K/w/E="; + src = finalAttrs.src; + name = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-P7dafWBaHVrxh30YxKiraKPMjtmGTTNd8qvoJ1M2vKI="; }; nativeBuildInputs = [ @@ -58,12 +58,12 @@ stdenv.mkDerivation rec { ]); meta = with lib; { + changelog = "https://github.com/bragefuglseth/fretboard/releases/tag/v${finalAttrs.version}"; description = "Look up guitar chords"; - homepage = "https://github.com/bragefuglseth/fretboard"; - changelog = "https://github.com/bragefuglseth/fretboard/releases/tag/v${version}"; + homepage = "https://apps.gnome.org/Fretboard/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ michaelgrahamevans ]; mainProgram = "fretboard"; + maintainers = with maintainers; [ michaelgrahamevans ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ft/fte/package.nix b/third_party/nixpkgs/pkgs/by-name/ft/fte/package.nix new file mode 100644 index 0000000000..149bb4adf9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ft/fte/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchurl, + unzip, + perl, + libX11, + libXpm, + gpm, + ncurses, + slang, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fte"; + version = "0.50.02"; + + ftesrc = fetchurl { + url = "mirror://sourceforge/fte/fte-20110708-src.zip"; + hash = "sha256-1jEcVC0/DyiQpUpmHDtnIo4nuJS0Fk6frynwFPJUSZ4="; + }; + + ftecommon = fetchurl { + url = "mirror://sourceforge/fte/fte-20110708-common.zip"; + hash = "sha256-WEEVeLMZWHZfQtK/Kbeu3Z+RaVXCwZyWkJocA+Akavc="; + }; + + src = [ + finalAttrs.ftesrc + finalAttrs.ftecommon + ]; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ + perl + libX11 + libXpm + gpm + ncurses + slang + ]; + + hardeningDisable = [ "all" ]; + enableParallelBuilding = true; + + env.NIX_CFLAGS_COMPILE = "-DHAVE_STRLCAT -DHAVE_STRLCPY"; + installFlags = [ "INSTALL_NONROOT=1" ]; + + # not setting it cause fte to not find xfte + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = { + description = "A free text editor for developers"; + homepage = "https://fte.sourceforge.net/"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/furnace/default.nix b/third_party/nixpkgs/pkgs/by-name/fu/furnace/package.nix similarity index 66% rename from third_party/nixpkgs/pkgs/applications/audio/furnace/default.nix rename to third_party/nixpkgs/pkgs/by-name/fu/furnace/package.nix index cc52c19797..10d55b9871 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/furnace/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/fu/furnace/package.nix @@ -8,6 +8,7 @@ , makeWrapper , fftw , fmt_8 +, freetype , libsndfile , libX11 , rtmidi @@ -16,7 +17,7 @@ , withJACK ? stdenv.hostPlatform.isUnix , libjack2 , withGUI ? true -, Cocoa +, darwin , portaudio , alsa-lib # Enable GL/GLES rendering @@ -25,23 +26,23 @@ , preferGLES ? stdenv.hostPlatform.isAarch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "furnace"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Pv9Sx+bdoy8uV5o9i1rUSuokwQVA8EPYFkZXM8Fynmk="; + hash = "sha256-z0WvJvkry/9T4Fgp2fX83CxPpDBoOPNVtyX2OUk26FI="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' # To offer scaling detection on X11, furnace checks if libX11.so is available via dlopen and uses some of its functions # But it's being linked against a versioned libX11.so.VERSION via SDL, so the unversioned one is not on the rpath substituteInPlace src/gui/scaling.cpp \ - --replace 'libX11.so' '${lib.getLib libX11}/lib/libX11.so' + --replace-fail 'libX11.so' '${lib.getLib libX11}/lib/libX11.so' ''; nativeBuildInputs = [ @@ -54,6 +55,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftw fmt_8 + freetype libsndfile rtmidi SDL2 @@ -64,26 +66,30 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # portaudio pkg-config is pulling this in as a link dependency, not set in propagatedBuildInputs alsa-lib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa - ]; + ]); cmakeFlags = [ - "-DBUILD_GUI=${if withGUI then "ON" else "OFF"}" - "-DSYSTEM_FFTW=ON" - "-DSYSTEM_FMT=ON" - "-DSYSTEM_LIBSNDFILE=ON" - "-DSYSTEM_RTMIDI=ON" - "-DSYSTEM_SDL2=ON" - "-DSYSTEM_ZLIB=ON" - "-DSYSTEM_PORTAUDIO=ON" - "-DWITH_JACK=${if withJACK then "ON" else "OFF"}" - "-DWITH_PORTAUDIO=ON" - "-DWITH_RENDER_SDL=ON" - "-DWITH_RENDER_OPENGL=${lib.boolToString withGL}" - "-DWARNINGS_ARE_ERRORS=ON" - ] ++ lib.optionals withGL [ - "-DUSE_GLES=${lib.boolToString preferGLES}" + (lib.cmakeBool "BUILD_GUI" withGUI) + (lib.cmakeBool "SYSTEM_FFTW" true) + (lib.cmakeBool "SYSTEM_FMT" true) + (lib.cmakeBool "SYSTEM_LIBSNDFILE" true) + (lib.cmakeBool "SYSTEM_RTMIDI" true) + (lib.cmakeBool "SYSTEM_SDL2" true) + (lib.cmakeBool "SYSTEM_ZLIB" true) + (lib.cmakeBool "USE_FREETYPE" true) + (lib.cmakeBool "SYSTEM_FREETYPE" true) + (lib.cmakeBool "WITH_JACK" withJACK) + (lib.cmakeBool "WITH_PORTAUDIO" true) + (lib.cmakeBool "SYSTEM_PORTAUDIO" true) + (lib.cmakeBool "WITH_RENDER_SDL" true) + (lib.cmakeBool "WITH_RENDER_OPENGL" withGL) + (lib.cmakeBool "USE_GLES" (withGL && preferGLES)) + (lib.cmakeBool "WITH_RENDER_METAL" false) # fails to build + (lib.cmakeBool "WITH_RENDER_OPENGL1" (withGL && !preferGLES)) + (lib.cmakeBool "WARNINGS_ARE_ERRORS" true) + (lib.cmakeBool "FORCE_APPLE_BIN" true) ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -109,13 +115,13 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { description = "Multi-system chiptune tracker compatible with DefleMask modules"; homepage = "https://github.com/tildearrow/furnace"; - changelog = "https://github.com/tildearrow/furnace/releases/tag/v${version}"; - license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.all; + changelog = "https://github.com/tildearrow/furnace/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.all; mainProgram = "furnace"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/furnace/update.sh b/third_party/nixpkgs/pkgs/by-name/fu/furnace/update.sh similarity index 100% rename from third_party/nixpkgs/pkgs/applications/audio/furnace/update.sh rename to third_party/nixpkgs/pkgs/by-name/fu/furnace/update.sh diff --git a/third_party/nixpkgs/pkgs/by-name/fw/fwupd/package.nix b/third_party/nixpkgs/pkgs/by-name/fw/fwupd/package.nix index e8726689e8..5e4b1d7ba7 100644 --- a/third_party/nixpkgs/pkgs/by-name/fw/fwupd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fw/fwupd/package.nix @@ -92,7 +92,7 @@ let test-firmware = let - version = "unstable-2022-04-02"; + version = "0-unstable-2022-04-02"; src = fetchFromGitHub { name = "fwupd-test-firmware-${version}"; owner = "fwupd"; @@ -120,7 +120,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.9.16"; + version = "1.9.19"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-mM8HSSQD5znjpl9q/f+u0RzZEkFA1tnh+BPB2qdcWvI="; + hash = "sha256-PQwUBOsKejXpS3G3VSJgatCltGy+wejPXCdEsDw87jo="; }; patches = [ @@ -228,7 +228,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dplugin_msr=disabled" ]; - # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF + # TODO: wrapGAppsHook3 wraps efi capsule even though it is not ELF dontWrapGApps = true; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/by-name/fz/fzf-make/package.nix b/third_party/nixpkgs/pkgs/by-name/fz/fzf-make/package.nix index e989b2e191..864bb8f0c9 100644 --- a/third_party/nixpkgs/pkgs/by-name/fz/fzf-make/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fz/fzf-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.28.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-USBK3In/1Uor33wrab1iTt0akQTcjuHd7I86XfERzzg="; + hash = "sha256-C2CDzcS6iE2ojXtFjQfHDJE2C1b5QNG6rda/MiDW8kk="; }; - cargoHash = "sha256-zEcll6X0iclDap40bQ1CXuVBQnVin8VwjpErm+/B0ZY="; + cargoHash = "sha256-N5hM5xTMNeryFgdICQcKvPt4lHgh02DCaPD3TTGmFBo="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix b/third_party/nixpkgs/pkgs/by-name/fz/fzf/package.nix similarity index 83% rename from third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix rename to third_party/nixpkgs/pkgs/by-name/fz/fzf/package.nix index 916b939b93..68c939d9d9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/fz/fzf/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "fzf"; - version = "0.50.0"; + version = "0.52.1"; src = fetchFromGitHub { owner = "junegunn"; - repo = pname; + repo = "fzf"; rev = version; - hash = "sha256-b8B05aj0+c620K6ftCXx1EGUt8mdqQYTE0D9aPU+/wA="; + hash = "sha256-cnLPn1AKq1BaWwXsWwQfC/lnejdyd1WdH1qIJRcfdks="; }; - vendorHash = "sha256-Ho2jVD/U/2BFt3BF5w+KHp5nSVmukx0o2l3ISDGDSt0="; + vendorHash = "sha256-Kc/bYzakx9c/bF42LYyE1t8JCUqBsJQFtczrFocx/Ps="; CGO_ENABLED = 0; @@ -79,13 +79,13 @@ buildGoModule rec { package = fzf; }; - meta = with lib; { - homepage = "https://github.com/junegunn/fzf"; - description = "A command-line fuzzy finder written in Go"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ma27 zowoq ]; - platforms = platforms.unix; + meta = { changelog = "https://github.com/junegunn/fzf/blob/${version}/CHANGELOG.md"; + description = "Command-line fuzzy finder written in Go"; + homepage = "https://github.com/junegunn/fzf"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ma27 zowoq ]; mainProgram = "fzf"; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ga/galah/package.nix b/third_party/nixpkgs/pkgs/by-name/ga/galah/package.nix new file mode 100644 index 0000000000..d384aa7679 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ga/galah/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "galah"; + version = "0-unstable-2024-04-28"; + + src = fetchFromGitHub { + owner = "0x4D31"; + repo = "galah"; + rev = "69346522df6e5849ca808546d40f1ee0a70f56d8"; + hash = "sha256-9Muo08AYtpMmLvpWl2W/WbvyFl8h364BzDbmcJteIAg="; + }; + + vendorHash = "sha256-+I4K5T6fQcS7KJexFGxpjq5QUX9VnopK8i81veeP6Cw="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "LLM-powered web honeypot using the OpenAI API"; + homepage = "https://github.com/0x4D31/galah"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "galah"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ga/gamescope/package.nix b/third_party/nixpkgs/pkgs/by-name/ga/gamescope/package.nix index 96102fe225..900f7c5980 100644 --- a/third_party/nixpkgs/pkgs/by-name/ga/gamescope/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ga/gamescope/package.nix @@ -5,6 +5,7 @@ , ninja , xorg , libdrm +, libei , vulkan-loader , vulkan-headers , wayland @@ -43,14 +44,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.14.3"; + version = "3.14.13"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; rev = "refs/tags/${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-+6RyrdHRDk9aeM52wcgLo966jP70EAiXSMR3sffNeZM="; + hash = "sha256-oBOD4kGrZaiAoK1vmr9FB9igMnraNpm0+mHqezHwC78="; }; patches = [ @@ -114,6 +115,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXxf86vm libavif libdrm + libei libliftoff SDL2 libdecor diff --git a/third_party/nixpkgs/pkgs/by-name/ga/garnet/package.nix b/third_party/nixpkgs/pkgs/by-name/ga/garnet/package.nix index af98dd1c0f..eac945cfcf 100644 --- a/third_party/nixpkgs/pkgs/by-name/ga/garnet/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ga/garnet/package.nix @@ -7,13 +7,13 @@ }: buildDotnetModule { pname = "garnet"; - version = "1.0.1"; + version = "1.0.6"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; rev = "v${garnet.version}"; - hash = "sha256-elUmM9Yw1/gazIV194P+noIm7ajQpRTccEhD5gN9D2Q="; + hash = "sha256-GBXRRLP4bBvKHr7tqvrOFFkTpUiiSYxj3DBrrehIl84="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; diff --git a/third_party/nixpkgs/pkgs/by-name/gb/gbsplay/package.nix b/third_party/nixpkgs/pkgs/by-name/gb/gbsplay/package.nix new file mode 100644 index 0000000000..64df774af5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gb/gbsplay/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + libpulseaudio, + nas, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gbsplay"; + version = "0.0.97"; + + src = fetchFromGitHub { + owner = "mmitch"; + repo = "gbsplay"; + rev = finalAttrs.version; + hash = "sha256-O4t5OzXcrGoxzSXr0nzc01bItjcp1LvFeWnbdSUDwFU="; + }; + + configureFlags = [ + "--without-test" # See mmitch/gbsplay#62 + "--without-contrib" + ]; + + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ + libpulseaudio + nas + ]; + + postInstall = '' + installShellCompletion --bash --name gbsplay contrib/gbsplay.bashcompletion + ''; + + meta = { + description = "Gameboy sound player"; + license = lib.licenses.gpl1Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "gbsplay"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ge/gema/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/gema/package.nix new file mode 100644 index 0000000000..564941444d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ge/gema/package.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, installShellFiles +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gema"; + version = "2.0"; + + src = fetchurl { + url = "https://sourceforge.net/projects/gema/files/gema/gema-${finalAttrs.version}/gema-${finalAttrs.version}-source.tar.gz"; + hash = "sha256-c7qxgZYk/QaqocjRXVlgJxUWCgf3T1JBY7v9Fg9YfIU="; + }; + + makeFlags = [ "--directory=src" ]; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + install -Dm755 src/gema -t $out/bin + installManPage doc/gema.1 + runHook postInstall + ''; + + meta = { + description = "General purpose text processing utility based on the concept of pattern matching."; + longDescription = "Reads an input file and copies it to an output file transforming the data as specified by the patterns defined by the user."; + homepage = "https://gema.sourceforge.net/"; + license = lib.licenses.mit; + mainProgram = "gema"; + maintainers = with lib.maintainers; [ quag ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ge/germinal/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/germinal/package.nix index 4d7409bf4a..d38e31aea8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ge/germinal/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ge/germinal/package.nix @@ -9,7 +9,7 @@ , pkg-config , tmux , vte -, wrapGAppsHook +, wrapGAppsHook3 , nixosTests }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/gh/gh-notify/package.nix b/third_party/nixpkgs/pkgs/by-name/gh/gh-notify/package.nix index e2690d383b..402d409e6c 100644 --- a/third_party/nixpkgs/pkgs/by-name/gh/gh-notify/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gh/gh-notify/package.nix @@ -23,13 +23,13 @@ let in stdenvNoCC.mkDerivation { pname = "gh-notify"; - version = "0-unstable-2024-03-19"; + version = "0-unstable-2024-04-24"; src = fetchFromGitHub { owner = "meiji163"; repo = "gh-notify"; - rev = "0d8fa377d79cfef0f66d2f03a5921a5e598e6807"; - hash = "sha256-Ao6gUtgW7enVlWBQhlQDc8ZW/gP90atc2F4rDNUnjj8="; + rev = "5c2db4cffe39f312d25979dc366f2bc219def9a2"; + hash = "sha256-AgpNjeRz0RHf8D3ib7x1zixBxh32UUZJleub5W/suuM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/gh/gh-poi/package.nix b/third_party/nixpkgs/pkgs/by-name/gh/gh-poi/package.nix index e10a74a1c9..fd8a5bddc5 100644 --- a/third_party/nixpkgs/pkgs/by-name/gh/gh-poi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gh/gh-poi/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gh-poi"; - version = "0.9.8"; + version = "0.9.10"; src = fetchFromGitHub { owner = "seachicken"; repo = "gh-poi"; rev = "v${version}"; - hash = "sha256-QpUZxho9hzmgbCFgNxwwKi6hhfyqc4b/JYKH3rP4Eb8="; + hash = "sha256-0QzCXja1UXPEC8JQIXH9Dl4PPKzqWgIy13FCYxEqggA="; }; ldflags = [ "-s" "-w" ]; @@ -19,7 +19,7 @@ buildGoModule rec { vendorHash = "sha256-D/YZLwwGJWCekq9mpfCECzJyJ/xSlg7fC6leJh+e8i0="; # Skip checks because some of test suites require fixture. - # See: https://github.com/seachicken/gh-poi/blob/v0.9.8/.github/workflows/contract-test.yml#L28-L29 + # See: https://github.com/seachicken/gh-poi/blob/v0.9.10/.github/workflows/contract-test.yml#L28-L29 doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/gh/ghciwatch/package.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghciwatch/package.nix new file mode 100644 index 0000000000..4e8796e70b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gh/ghciwatch/package.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, nix-update-script +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "ghciwatch"; + version = "0.5.11"; + + src = fetchFromGitHub { + owner = "MercuryTechnologies"; + repo = "ghciwatch"; + rev = "v${version}"; + hash = "sha256-lWeQ0nBJDUJ9c915WWy/YsIoWwtipz5ns2xvFJSD9LQ="; + }; + + cargoHash = "sha256-1jcdhTLCdCOh3EHywlFi83KupmWX4hGvB2/LhtzUPRk="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreServices + ]; + + # integration tests are not run but the macros need this variable to be set + GHC_VERSIONS = ""; + checkFlags = "--test \"unit\""; + + meta = with lib; { + description = "Ghci-based file watching recompiler for Haskell development"; + homepage = "https://github.com/MercuryTechnologies/ghciwatch"; + license = licenses.mit; + maintainers = with maintainers; [ mangoiv _9999years ]; + mainProgram = "ghciwatch"; + }; + + passthru.updateScript = nix-update-script { }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gickup/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gickup/package.nix index 849bfac6e6..75f132f06f 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gickup/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gickup/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gickup"; - version = "0.10.29"; + version = "0.10.30"; src = fetchFromGitHub { owner = "cooperspencer"; repo = "gickup"; rev = "refs/tags/v${version}"; - hash = "sha256-Y03SdmO/GJx1gans58IW/Q9N7spRswvjyNbzYLdkD80="; + hash = "sha256-knnc4FAzGk1hV/Pzoc+klm4dt1cFrn4BYZx1lY7iLp8="; }; vendorHash = "sha256-XxDsEmi945CduurQRsH7rjFAEu/SMX3rSd63Dwq2r8A="; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-instafix/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-instafix/package.nix index a0792af8ac..6dc4a101b2 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/git-instafix/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-instafix/package.nix @@ -13,7 +13,7 @@ let maintainers ; - version = "0.2.2"; + version = "0.2.3"; in rustPlatform.buildRustPackage { pname = "git-instafix"; @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage { owner = "quodlibetor"; repo = "git-instafix"; rev = "v${version}"; - hash = "sha256-cwScEEijhMgBdTeYuOOxW13x4ZpyrUouZvAiD17dOog="; + hash = "sha256-gh0/pD07oWODZAOu82KijOFWUHfqSHyGLXg67K/rhqo="; }; - cargoHash = "sha256-o4oIDqr+vRvfICtZbIuD2kBEneLJrvyPVr5FPLlYGv8="; + cargoHash = "sha256-FncpFgmbB186ZKl8XMjeNAFtAf1qlNW8hbhTOKBlUWc="; buildInputs = [ libgit2 ]; nativeCheckInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-standup/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-standup/package.nix similarity index 72% rename from third_party/nixpkgs/pkgs/applications/version-management/git-standup/default.nix rename to third_party/nixpkgs/pkgs/by-name/gi/git-standup/package.nix index 0fcdd265a0..d40d100869 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-standup/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-standup/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, git }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "git-standup"; version = "2.3.2"; src = fetchFromGitHub { owner = "kamranahmedse"; - repo = pname; - rev = version; + repo = "git-standup"; + rev = finalAttrs.version; sha256 = "1xnn0jjha56v7l2vj45zzxncl6m5x2hq6nkffgc1bcikhp1pidn7"; }; @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath [ git ]}" ''; - meta = with lib; { + meta = { description = "Recall what you did on the last working day"; homepage = "https://github.com/kamranahmedse/git-standup"; - license = licenses.mit; - maintainers = [ maintainers.marsam ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.all; mainProgram = "git-standup"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/gi/githooks/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/githooks/package.nix new file mode 100644 index 0000000000..f4e4cd02bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gi/githooks/package.nix @@ -0,0 +1,85 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, + testers, + makeWrapper, +}: +buildGoModule rec { + pname = "githooks"; + version = "3.0.2"; + + src = fetchFromGitHub { + owner = "gabyx"; + repo = "githooks"; + rev = "v${version}"; + hash = "sha256-gTvbvW+AFyZUBt7gSKJGc9lrl7CAy+cOElcADlIvuRk="; + }; + + modRoot = "./githooks"; + vendorHash = "sha256-ZcDD4Z/thtyCvXg6GzzKC/FSbh700QEaqXU8FaZaZc4="; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ git ]; + + strictDeps = true; + + ldflags = [ + "-s" # Disable symbole table. + "-w" # Disable DWARF generation. + ]; + + # We need to disable updates and other features: + # That is done with tag `package_manager_enabled`. + tags = [ "package_manager_enabled" ]; + + checkFlags = + let + skippedTests = [ + "TestGithooksCompliesWithGit" # Needs internet to download all hooks documentation. + "TestUpdateImages" # Needs docker/podman. + ]; + in + [ + "-v" + "-skip" + "(${builtins.concatStringsSep "|" skippedTests})" + ]; + + doCheck = true; + + # We need to generate some build files before building. + postConfigure = '' + GH_BUILD_VERSION="${version}" \ + GH_BUILD_TAG="v${version}" \ + go generate -mod=vendor ./... + ''; + + postInstall = '' + # Rename executable to proper names. + mv $out/bin/cli $out/bin/githooks-cli + mv $out/bin/runner $out/bin/githooks-runner + mv $out/bin/dialog $out/bin/githooks-dialog + ''; + + postFixup = '' + wrapProgram "$out/bin/githooks-cli" --prefix PATH : ${lib.makeBinPath [ git ]} + wrapProgram "$out/bin/githooks-runner" --prefix PATH : ${lib.makeBinPath [ git ]} + ''; + + passthru.tests.version = testers.testVersion { + package = "githooks-cli"; + command = "githooks-cli --version"; + inherit version; + }; + + meta = with lib; { + description = "A Git hooks manager with per-repo and shared Git hooks including version control"; + homepage = "https://github.com/gabyx/Githooks"; + license = licenses.mpl20; + maintainers = with maintainers; [ gabyx ]; + mainProgram = "githooks-cli"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gi/github-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/github-desktop/package.nix index 7ada2ddb66..1ac8deb248 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/github-desktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/github-desktop/package.nix @@ -2,7 +2,7 @@ , lib , fetchurl , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , gnome , libsecret @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoPatchelfHook - (wrapGAppsHook.override { inherit makeWrapper; }) + (wrapGAppsHook3.override { inherit makeWrapper; }) ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitlab-ci-local/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-ci-local/package.nix index 40466b99d2..ae9e10033e 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "gitlab-ci-local"; - version = "4.47.0"; + version = "4.49.0"; src = fetchFromGitHub { owner = "firecow"; repo = "gitlab-ci-local"; rev = version; - hash = "sha256-AMqifAdC4aPra/KfM0Z8L1mF6+lA0dv9tt/cXSd3Ov4="; + hash = "sha256-hhzkC9wnPNwQwky2FegTMRIbcyCMzrZ/hoQlfZwk3sk="; }; - npmDepsHash = "sha256-GVqGA4aMfA08j/+fy+DA6udi52lmfDeAkE59d9CMAqg="; + npmDepsHash = "sha256-mnnP1YvKSm/CgZYQWF8VU+cuQ0SUV5tW1dCRrGRBrmg="; postPatch = '' # remove cleanup which runs git commands diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gittuf/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gittuf/package.nix index 8b7e9063f7..3d33fdbae0 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gittuf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gittuf/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gittuf"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "gittuf"; repo = pname; rev = "v${version}"; - hash = "sha256-lECvgagcqBS+BVD296e6WjjSCA3vI0nfLzpLTi/7N0I="; + hash = "sha256-BXqxVtdxUbcl2cK4kYEBZIbMCKOjPvuoTnDh8L6+mO8="; }; - vendorHash = "sha256-UKhXbZXKNtMnQe7sHBOmzzXGBHuDTYeZGKnteZirskA="; + vendorHash = "sha256-yRUgtUeoTthxSGZ6VX/MOVeY0NUXq0Nf+XlysHqcpWw="; ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix index 8754c3bb7e..40a729927e 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.17.1"; + version = "0.20.1"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-9OY6zBW7UA4lTH+NI61xuil5p2ChQESXrG2zTxdJblE="; + hash = "sha256-H1REl6DkWYwZ1s8FLyHlsFi1DQY0C3Zizz/o9KUO7XQ="; }; - cargoHash = "sha256-gVmoKneAtC5dJh5Z+3aXwxCixrPZTRcxQRpoSh4S1e4="; + cargoHash = "sha256-/u6VmcaQpVagz7W/eAFql9sKF+9dn/o1VGvFGJAJkaA="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitversion/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitversion/package.nix new file mode 100644 index 0000000000..871ccf82b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitversion/package.nix @@ -0,0 +1,20 @@ +{ lib +, buildDotnetGlobalTool +}: + +buildDotnetGlobalTool { + pname = "dotnet-gitversion"; + nugetName = "GitVersion.Tool"; + version = "5.12.0"; + + nugetSha256 = "sha256-dclYG2D0uSYqf++y33JCefkYLwbuRCuKd3qLMnx3BDI="; + + meta = with lib; { + description = "From git log to SemVer in no time"; + homepage = "https://gitversion.net/"; + downloadPage = "https://github.com/GitTools/GitVersion"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ acesyde ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gl/glance/package.nix b/third_party/nixpkgs/pkgs/by-name/gl/glance/package.nix new file mode 100644 index 0000000000..1e36360311 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gl/glance/package.nix @@ -0,0 +1,32 @@ +{ lib, +buildGoModule, +fetchFromGitHub, +nix-update-script +}: + +buildGoModule rec { + pname = "glance"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "glanceapp"; + repo = pname; + rev = "v${version}"; + hash = "sha256-vcK8AW+B/YK4Jor86SRvJ8XFWvzeAUX5mVbXwrgxGlA="; + }; + + vendorHash = "sha256-Okme73vLc3Pe9+rNlmG8Bj1msKaVb5PaIBsAAeTer6s="; + + excludedPackages = [ "scripts/build-and-ship" ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/glanceapp/glance"; + changelog = "https://github.com/glanceapp/glance/releases/tag/v${version}"; + description = "A self-hosted dashboard that puts all your feeds in one place"; + mainProgram = "glance"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ dvn0 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gl/glasskube/package.nix b/third_party/nixpkgs/pkgs/by-name/gl/glasskube/package.nix index 91d2dcceef..029f86e230 100644 --- a/third_party/nixpkgs/pkgs/by-name/gl/glasskube/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gl/glasskube/package.nix @@ -7,12 +7,12 @@ }: let - version = "0.1.0"; + version = "0.2.1"; gitSrc = fetchFromGitHub { owner = "glasskube"; repo = "glasskube"; rev = "refs/tags/v${version}"; - hash = "sha256-iJjO4V2sK3e/SpDZ5Lfw7gILgZrI4CGg0wLLVKthGUE="; + hash = "sha256-yHktQZ/s3RYcRQd0U+0VTnLOMTyRmlny9RtAdfFT6J8="; }; web-bundle = buildNpmPackage rec { inherit version; @@ -20,7 +20,7 @@ let src = gitSrc; - npmDepsHash = "sha256-nv2ng8gUOi9K46bDuWt/Y3S6AJovUWaqM+8uGiu/QSs="; + npmDepsHash = "sha256-WKwEAVMG6r/ZFmxgLR+zJCW8F2DOHxpWDYqhX/vcdrs="; dontNpmInstall = true; @@ -40,7 +40,7 @@ in buildGoModule rec { src = gitSrc; - vendorHash = "sha256-iFWcTzZP0DKJ9hrmfUWR4U/VX2zsR+3uojI+GRI2R3I="; + vendorHash = "sha256-ADa3nQZ/5K9m0aB5NwGQpjqhGwAne5pN2Z5RUb3eEcU="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/by-name/gl/glsl_analyzer/package.nix b/third_party/nixpkgs/pkgs/by-name/gl/glsl_analyzer/package.nix new file mode 100644 index 0000000000..ed57790a27 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gl/glsl_analyzer/package.nix @@ -0,0 +1,39 @@ +{ lib +, pkgs +, fetchFromGitHub +, zig_0_12 +, darwin +}: + +let stdenv = if pkgs.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in + +stdenv.mkDerivation (finalAttrs: { + pname = "glsl_analyzer"; + version = "1.4.5"; + + src = fetchFromGitHub { + owner = "nolanderc"; + repo = "glsl_analyzer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+eYBw/F1RzI5waAkLgbV0J/Td91hbNcAtHcisQaL82k="; + }; + + nativeBuildInputs = [ + zig_0_12.hook + ]; + + postPatch = '' + substituteInPlace build.zig \ + --replace-fail 'b.run(&.{ "git", "describe", "--tags", "--always" })' '"${finalAttrs.src.rev}"' + ''; + + meta = { + description = "Language server for GLSL (OpenGL Shading Language)"; + changelog = "https://github.com/nolanderc/glsl_analyzer/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/nolanderc/glsl_analyzer"; + mainProgram = "glsl_analyzer"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ wr7 ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch b/third_party/nixpkgs/pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch index 87a6e4cab1..f05edf96a7 100644 --- a/third_party/nixpkgs/pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch +++ b/third_party/nixpkgs/pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch @@ -1,13 +1,24 @@ -diff --git a/vendor/glycin/src/dbus.rs b/vendor/glycin/src/dbus.rs -index aa5a876..4f37420 100644 ---- a/vendor/glycin/src/dbus.rs -+++ b/vendor/glycin/src/dbus.rs -@@ -43,7 +43,7 @@ impl<'a> DecoderProcess<'a> { +diff --git a/vendor/glycin/src/sandbox.rs b/vendor/glycin/src/sandbox.rs +index 7d00b36..aa70dc7 100644 +--- a/vendor/glycin/src/sandbox.rs ++++ b/vendor/glycin/src/sandbox.rs +@@ -165,7 +165,7 @@ impl Sandbox { - let (bin, args, final_arg) = match sandbox_mechanism { - SandboxMechanism::Bwrap => ( -- "bwrap".into(), -+ "@bwrap@".into(), - vec![ - "--unshare-all", - "--die-with-parent", + args.push(self.command); + +- ("bwrap".into(), args, Some(seccomp_memfd)) ++ ("@bwrap@".into(), args, Some(seccomp_memfd)) + } + SandboxMechanism::FlatpakSpawn => { + let memory_limit = Self::memory_limit(); +@@ -233,8 +233,8 @@ impl Sandbox { + "/", + // Make /usr available as read only + "--ro-bind", +- "/usr", +- "/usr", ++ "/nix/store", ++ "/nix/store", + // Make tmpfs dev available + "--dev", + "/dev", diff --git a/third_party/nixpkgs/pkgs/by-name/gl/glycin-loaders/package.nix b/third_party/nixpkgs/pkgs/by-name/gl/glycin-loaders/package.nix index 6509f4c66e..7804acd778 100644 --- a/third_party/nixpkgs/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gl/glycin-loaders/package.nix @@ -9,20 +9,23 @@ , ninja , pkg-config , rustc +, rustPlatform , gtk4 , cairo , libheif , libxml2 +, libseccomp +, libjxl , gnome }: stdenv.mkDerivation (finalAttrs: { pname = "glycin-loaders"; - version = "0.1.2"; + version = "1.0.1"; src = fetchurl { url = "mirror://gnome/sources/glycin-loaders/${lib.versions.majorMinor finalAttrs.version}/glycin-loaders-${finalAttrs.version}.tar.xz"; - hash = "sha256-x2wBklq9BwF0WJzLkWpEpXOrZbHp1JPxVOQnVkMebdc="; + hash = "sha256-0PAiRi/1VYVuheqUBHRHC7NrN8n/y8umOgP+XpVDcM8="; }; patches = [ @@ -40,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config rustc + rustPlatform.bindgenHook # for libheif-sys ]; buildInputs = [ @@ -47,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: { cairo libheif libxml2 # for librsvg crate + libseccomp + libjxl ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/by-name/gm/gmetronome/package.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmetronome/package.nix index 64d0c19a96..c3f1629a4c 100644 --- a/third_party/nixpkgs/pkgs/by-name/gm/gmetronome/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gm/gmetronome/package.nix @@ -3,27 +3,27 @@ , fetchFromGitLab , pkg-config , autoreconfHook -, wrapGAppsHook +, wrapGAppsHook3 , gtkmm3 , libpulseaudio }: stdenv.mkDerivation rec { pname = "gmetronome"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "dqpb"; repo = "gmetronome"; rev = version; - hash = "sha256-ilFO1HwleWIQ51Bkzck1sm1Yu3ugqkvZrpxPOYzXydM="; + hash = "sha256-fjtdM2/LMZx0dFt78Ih4BG5+NZoocPknh5INA+2e5qk="; }; nativeBuildInputs = [ pkg-config autoreconfHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix new file mode 100644 index 0000000000..d8dbbc5806 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, glib +, glib-networking +, gnome-online-accounts +, gtk4 +, libadwaita +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-online-accounts-gtk"; + version = "3.50.2"; + + src = fetchFromGitHub { + owner = "xapp-project"; + repo = "gnome-online-accounts-gtk"; + rev = finalAttrs.version; + hash = "sha256-6yGesg/L/9syX990uDuw5Or/uEQ8DGPQYiCRRw4OMzY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + glib-networking + gnome-online-accounts + gtk4 + libadwaita # for goa-backend + ]; + + meta = with lib; { + description = "Online accounts configuration utility"; + homepage = "https://github.com/xapp-project/gnome-online-accounts-gtk"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.cinnamon.members; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/go/go-camo/package.nix b/third_party/nixpkgs/pkgs/by-name/go/go-camo/package.nix index 42cc8b7ba5..677a64b705 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/go-camo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/go-camo/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-camo"; - version = "2.4.11"; + version = "2.4.13"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wgneDCBiHg9M1PtLHFxEXRhK9fBNKPWQwV0fwUFxEgQ="; + sha256 = "sha256-nrkc+uYgPES3CfRjmfH/9eM6NL8Vo3kUBX9JHEw/1C4="; }; - vendorHash = "sha256-duTW42UL8EtnxUvPr2GXHKcaGQ3d0u2maMzSIOHIxxI="; + vendorHash = "sha256-iyZNOooPH1jvT+S9/ETRoXsTwXUIUi1UKmDzhB7NRuE="; ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/go/go-cover-treemap/package.nix b/third_party/nixpkgs/pkgs/by-name/go/go-cover-treemap/package.nix new file mode 100644 index 0000000000..1afb919160 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/go/go-cover-treemap/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "go-cover-treemap"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "nikolaydubina"; + repo = "go-cover-treemap"; + rev = "v${version}"; + hash = "sha256-MSkPot8uYcr8pxsIkJh2FThVK9xpzkN9Y69KeiQnQlA="; + }; + + vendorHash = "sha256-k/k+EGkuBnZFHrcWxnzLG8efWgb2i35Agf/sWbgTc4g="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Go code coverage to SVG treemap"; + homepage = "https://github.com/nikolaydubina/go-cover-treemap"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + mainProgram = "go-cover-treemap"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/go/go-errorlint/package.nix b/third_party/nixpkgs/pkgs/by-name/go/go-errorlint/package.nix index 5c67519c4e..239c10a47a 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/go-errorlint/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/go-errorlint/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-errorlint"; - version = "1.4.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "polyfloyd"; repo = "go-errorlint"; rev = "v${version}"; - hash = "sha256-BU+3sLUGBCFA1JYFxTEyIan+iWB7Y7SaMFVomfNObMg="; + hash = "sha256-xO9AC1z3JNTRVEpM/FF8x+AMfmspU64kUywvpMb2yxM="; }; - vendorHash = "sha256-xn7Ou4l8vbPD44rsN0mdFjTzOvkfv6QN6i5XR1XPxTE="; + vendorHash = "sha256-pSajd2wyefHgxMvhDKs+qwre4BMRBv97v/tZOjiT3LE="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/go/go-judge/package.nix b/third_party/nixpkgs/pkgs/by-name/go/go-judge/package.nix index f46a0d0a41..91f2c5c107 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/go-judge/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/go-judge/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-judge"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "criyle"; repo = pname; rev = "v${version}"; - hash = "sha256-i6c7uKnnyO+tyQwrEFvyPaw3N9VfFB+L7xYHsUPy6RM="; + hash = "sha256-dViiTTT/OjgAXecViuBdWOycCpn97g+Lr1ZHubfVExw="; }; - vendorHash = "sha256-WAO7nMDm7/KuDOIZSopRVKUVWmjDl30d95NWBuebiE4="; + vendorHash = "sha256-xnTM7QN+ZJP3iPf+k8HgFYMFv6W6BboM5Yh7938s9lM="; tags = [ "nomsgpack" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/go/go-landlock/package.nix b/third_party/nixpkgs/pkgs/by-name/go/go-landlock/package.nix new file mode 100644 index 0000000000..44b7ba5573 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/go/go-landlock/package.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "go-landlock"; + version = "0-unstable-2024-02-16"; + + src = fetchFromGitHub { + owner = "landlock-lsm"; + repo = "go-landlock"; + rev = "efb66220540a9ef86aa0160d15e55f429d5b94d9"; + hash = "sha256-U0+364NIw3kVcfS8/RTcpSMrv4v2ATCcC1v+5IsxeXQ="; + }; + + vendorHash = "sha256-IOaFToz/66Z1DP5O6gLqTyEiiYyrwZ5At93qPLa7hg8="; + + subPackages = [ + "cmd/landlock-restrict-net" + "cmd/landlock-restrict" + ]; + + meta = { + description = "A Go library for the Linux Landlock sandboxing feature"; + homepage = "https://github.com/landlock-lsm/go-landlock"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomfitzhenry ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/go/go-passbolt-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/go/go-passbolt-cli/package.nix new file mode 100644 index 0000000000..e774769ae4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/go/go-passbolt-cli/package.nix @@ -0,0 +1,52 @@ +{ buildGoModule, fetchFromGitHub, installShellFiles, lib, stdenv }: + +buildGoModule rec { + pname = "go-passbolt-cli"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "passbolt"; + repo = "go-passbolt-cli"; + rev = "v${version}"; + hash = "sha256-I+niNUowKTFDMa7yOnRToMFPzO/CbnjXHJr5nAhhHcg="; + }; + + vendorHash = "sha256-XRHGq3Qeq7VWHzw5WWVv4x5orQu740lttGVreiu7qP4="; + + ldflags = [ + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" + "-X=main.date=1970-01-01T00:00:00Z" + ]; + + subPackages = [ "." ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + installPhase = '' + runHook preInstall + install -D $GOPATH/bin/go-passbolt-cli $out/bin/passbolt + runHook postInstall + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd passbolt \ + --bash <($out/bin/passbolt completion bash) \ + --fish <($out/bin/passbolt completion fish) \ + --zsh <($out/bin/passbolt completion zsh) + + export tmpDir=$(mktemp -d) + cd $tmpDir && mkdir man && $out/bin/passbolt gendoc --type man && installManPage man/* + ''; + + meta = with lib; { + description = "CLI tool to interact with Passbolt, an open source password manager for teams"; + homepage = "https://github.com/passbolt/go-passbolt-cli"; + license = licenses.mit; + maintainers = with maintainers; [ pbek ]; + mainProgram = "passbolt"; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/go/godns/package.nix b/third_party/nixpkgs/pkgs/by-name/go/godns/package.nix index 0e5e155523..e2dd4669a1 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/godns/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/godns/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "godns"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "refs/tags/v${version}"; - hash = "sha256-kdClyeU0hR0ymVLn9xe/kYVJE/9P/hAz/5UwRAQ2KCU="; + hash = "sha256-Kr+zMmjpHR2JtCaDyLMcQwOUXlPJeisu94zHRpEYV/I="; }; - vendorHash = "sha256-kSREFNIGH0MXiyKMp1LmrLkhKBhovvNRz46LTXT2XME="; + vendorHash = "sha256-E15h5p4ppRb91EUoz5dyWNFl745rt419NMCSurMLxis="; npmDeps = fetchNpmDeps { src = "${src}/web"; hash = "sha256-2yeqLly0guU/kpX+yH/QOoDGzyJTxkTaCt8EleJhybU="; diff --git a/third_party/nixpkgs/pkgs/by-name/go/godot_4-export-templates/package.nix b/third_party/nixpkgs/pkgs/by-name/go/godot_4-export-templates/package.nix new file mode 100644 index 0000000000..be12407376 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/go/godot_4-export-templates/package.nix @@ -0,0 +1,13 @@ +# Export templates is necessary for setting up Godot engine, it's used when exporting projects. +# Godot applications/games packages needs to reference export templates. +# Export templates version should be kept in sync with Godot version. +# https://docs.godotengine.org/en/stable/tutorials/export/exporting_projects.html#export-templates + +{ fetchzip, godot_4, ... }: + +fetchzip { + pname = "export_templates"; + extension = "zip"; + url = "https://github.com/godotengine/godot/releases/download/${godot_4.version}/Godot_v${godot_4.version}_export_templates.tpz"; + hash = "sha256-eomGLH9lbZhl7VtHTWjJ5mxVt0Yg8LfnAnpqoCksPgs="; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix similarity index 78% rename from third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix rename to third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix index 17b7e288f0..ff54ecddd6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, patchelf, makeWrapper +{ lib, stdenv, patchelf, makeWrapper, fetchurl, writeScript # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, nss, nspr @@ -28,15 +28,9 @@ ## Gentoo , bzip2, libcap -# Which distribution channel to use. -, channel ? "stable" - # Necessary for USB audio devices. , pulseSupport ? true, libpulseaudio -# Only needed for getting information about upstream binaries -, chromium - , gsettings-desktop-schemas , gnome @@ -52,8 +46,6 @@ let withCustomModes = true; }; - version = chromium.upstream-info.version; - deps = [ glib fontconfig freetype pango cairo libX11 libXi atk nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb @@ -70,18 +62,14 @@ let ++ lib.optional libvaSupport libva ++ [ gtk3 gtk4 ]; - suffix = lib.optionalString (channel != "stable") "-${channel}"; +in stdenv.mkDerivation (finalAttrs: { + pname = "google-chrome"; + version = "124.0.6367.201"; - crashpadHandlerBinary = if lib.versionAtLeast version "94" - then "chrome_crashpad_handler" - else "crashpad_handler"; - -in stdenv.mkDerivation { - inherit version; - - name = "google-chrome${suffix}-${version}"; - - src = chromium.chromeSrc; + src = fetchurl { + url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; + hash = "sha256-RvQdpDmWRcsASh1b8M0Zg+AvZprE5qhi14shfo0WlfE="; + }; nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ @@ -103,11 +91,8 @@ in stdenv.mkDerivation { installPhase = '' runHook preInstall - case ${channel} in - beta) appname=chrome-beta dist=beta ;; - dev) appname=chrome-unstable dist=unstable ;; - *) appname=chrome dist=stable ;; - esac + appname=chrome + dist=stable exe=$out/bin/google-chrome-$dist @@ -149,7 +134,7 @@ in stdenv.mkDerivation { --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} - for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary}}; do + for elf in $out/share/google/$appname/{chrome,chrome-sandbox,chrome_crashpad_handler}; do patchelf --set-rpath $rpath $elf patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf done @@ -157,18 +142,24 @@ in stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + passthru = { + updateScript = writeScript "update-google-chrome.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + url="https://versionhistory.googleapis.com/v1/chrome/platforms/linux/channels/stable/versions/all/releases" + response=$(curl --silent $url) + version=$(jq ".releases[0].version" --raw-output <<< "$response") + update-source-version ${finalAttrs.pname} "$version" --ignore-same-hash + ''; + }; + + meta = { description = "A freeware web browser developed by Google"; homepage = "https://www.google.com/chrome/browser/"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ primeos ]; - # Note from primeos: By updating Chromium I also update Google Chrome and - # will try to merge PRs and respond to issues but I'm not actually using - # Google Chrome. + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ jnsgruk johnrtitor ]; platforms = [ "x86_64-linux" ]; - mainProgram = - if (channel == "dev") then "google-chrome-unstable" - else "google-chrome-${channel}"; + mainProgram = "google-chrome-stable"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/go/gophish/package.nix b/third_party/nixpkgs/pkgs/by-name/go/gophish/package.nix new file mode 100644 index 0000000000..a319b2bd97 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/go/gophish/package.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gophish"; + version = "0.12.1"; + + src = fetchFromGitHub { + owner = "gophish"; + repo = "gophish"; + rev = "v${version}"; + hash = "sha256-6OUhRB2d8k7h9tI3IPKy9f1KoEx1mvGbxQZF1sCngqs="; + }; + + vendorHash = "sha256-2seQCVALU35l+aAsfag0W19FWlSTlEsSmxTmKKi3A+0="; + + meta = with lib; { + description = "Open-Source Phishing Toolkit"; + longDescription = '' + Open-source phishing toolkit designed for businesses and penetration testers. + Provides the ability to quickly and easily setup and execute phishing engagements and security awareness training. + ''; + homepage = "https://github.com/gophish/gophish"; + license = licenses.mit; + maintainers = with maintainers; [ mib ]; + mainProgram = "gophish"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix b/third_party/nixpkgs/pkgs/by-name/go/got/package.nix similarity index 77% rename from third_party/nixpkgs/pkgs/applications/version-management/got/default.nix rename to third_party/nixpkgs/pkgs/by-name/go/got/package.nix index 2448e4ccff..d6f5629e3c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/got/package.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , pkg-config -, openssl +, libressl , libbsd , libevent , libuuid @@ -12,25 +12,24 @@ , ncurses , bison , autoPatchelfHook +, testers }: stdenv.mkDerivation (finalAttrs: { pname = "got"; - version = "0.97"; + version = "0.99"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-4HpIlKRYUDoymCBH8GS8DDXaY0nYiVvotpBkwglOO3I="; + hash = "sha256-rqQINToCsuOtm00bdgeQAmmvl5htQJmMV/EKzfD6Hjg="; }; nativeBuildInputs = [ pkg-config bison ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - buildInputs = [ openssl libbsd libevent libuuid libmd zlib ncurses ] + buildInputs = [ libressl libbsd libevent libuuid libmd zlib ncurses ] ++ lib.optionals stdenv.isDarwin [ libossp_uuid ]; - configureFlags = [ "--enable-gotd" ]; - preConfigure = lib.optionalString stdenv.isDarwin '' # The configure script assumes dependencies on Darwin are installed via # Homebrew or MacPorts and hardcodes assumptions about the paths of @@ -45,17 +44,13 @@ stdenv.mkDerivation (finalAttrs: { "-include getopt.h" ]); - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - test "$($out/bin/got --version)" = "got ${finalAttrs.version}" - runHook postInstallCheck - ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; meta = { changelog = "https://gameoftrees.org/releases/CHANGES"; - description = "A version control system which prioritizes ease of use and simplicity over flexibility"; + description = "Version control system which prioritizes ease of use and simplicity over flexibility"; longDescription = '' Game of Trees (Got) is a version control system which prioritizes ease of use and simplicity over flexibility. diff --git a/third_party/nixpkgs/pkgs/by-name/gp/gpscorrelate/package.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpscorrelate/package.nix index 6e029d4113..e50f160e54 100644 --- a/third_party/nixpkgs/pkgs/by-name/gp/gpscorrelate/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gp/gpscorrelate/package.nix @@ -9,7 +9,7 @@ , docbook_xsl , docbook_xml_dtd_42 , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 , desktopToDarwinBundle }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { docbook_xsl libxslt pkg-config - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/gp/gpt4all/package.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpt4all/package.nix index 83705d3906..40fe6a8832 100644 --- a/third_party/nixpkgs/pkgs/by-name/gp/gpt4all/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gp/gpt4all/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpt4all"; - version = "2.7.3"; + version = "2.7.5"; src = fetchFromGitHub { fetchSubmodules = true; - hash = "sha256-hIfeADP3tiooGZr/OMVFIkOAniMWXj9AsVzMPlVbucE="; + hash = "sha256-i/T6gk8ICneW624008eiStgYNv5CE8w0Yx8knk57EFw="; owner = "nomic-ai"; repo = "gpt4all"; rev = "v${finalAttrs.version}"; @@ -23,11 +23,6 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/gpt4all-chat"; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'set(CMAKE_INSTALL_PREFIX ''${CMAKE_BINARY_DIR}/install)' "" - ''; - nativeBuildInputs = [ cmake qt6.wrapQtAppsHook diff --git a/third_party/nixpkgs/pkgs/by-name/gp/gptscript/package.nix b/third_party/nixpkgs/pkgs/by-name/gp/gptscript/package.nix index 0cd7af6cb2..f76c765987 100644 --- a/third_party/nixpkgs/pkgs/by-name/gp/gptscript/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gp/gptscript/package.nix @@ -5,22 +5,21 @@ }: buildGo122Module rec { pname = "gptscript"; - version = "0.1.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "gptscript-ai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zG75L10WvfkmjwW3ifBHaTkHNXqXvNO0PaXejCc2tls="; + hash = "sha256-teZQhGYKJ5Ma5by3Wug5B1hAV1tox94MF586ZeEXp6o="; }; - vendorHash = "sha256-LV9uLLwdtLJTIxaBB1Jew92S0QjQsceyLEfSrDeDnR4="; + vendorHash = "sha256-0irUcEomQzo9+vFJEk28apLNuJdsX1RHEqB7T88X7Ks="; ldflags = [ "-s" "-w" - "-X main.Version=${version}" - "-X main.Commit=${version}" + "-X github.com/gptscript-ai/gptscript/pkg/version.Tag=v${version}" ]; # Requires network access @@ -30,8 +29,8 @@ buildGo122Module rec { homepage = "https://gptscript.ai"; changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v{version}"; description = "Natural Language Programming"; - license = with licenses; [asl20]; - maintainers = with maintainers; [jamiemagee]; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ jamiemagee ]; mainProgram = "gptscript"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/gr/grafana-kiosk/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/grafana-kiosk/package.nix new file mode 100644 index 0000000000..d9f21655d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gr/grafana-kiosk/package.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub, chromium, makeWrapper }: + +buildGoModule rec { + pname = "grafana-kiosk"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "grafana"; + repo = "grafana-kiosk"; + rev = "v${version}"; + hash = "sha256-KXEbhRFD++VeVI1Fbrai+IYb3lyGKs+plYPoKIZD0JM="; + }; + + vendorHash = "sha256-sXaxyPNuHDUOkYcWYm94YvJmr1mGe4HdzttWrNSK2Pw="; + + nativeBuildInputs = [ makeWrapper ]; + postFixup = '' + wrapProgram $out/bin/grafana-kiosk --prefix PATH : ${lib.makeBinPath [ chromium ]} + ''; + + meta = with lib; { + description = "Kiosk Utility for Grafana"; + homepage = "https://github.com/grafana/grafana-kiosk"; + license = licenses.asl20; + maintainers = with maintainers; [ marcusramberg ]; + mainProgram = "grafana-kiosk"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/graphene-hardened-malloc/package.nix similarity index 86% rename from third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix rename to third_party/nixpkgs/pkgs/by-name/gr/graphene-hardened-malloc/package.nix index 48df439a1e..c92fc2c398 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/graphene-hardened-malloc/package.nix @@ -1,35 +1,47 @@ -{ lib -, stdenv -, fetchFromGitHub +{ fetchFromGitHub +, lib +, makeWrapper , python3 , runCommand -, makeWrapper +, stdenv , stress-ng }: stdenv.mkDerivation (finalAttrs: { pname = "graphene-hardened-malloc"; - version = "12"; + version = "2024040900"; src = fetchFromGitHub { owner = "GrapheneOS"; repo = "hardened_malloc"; rev = finalAttrs.version; - sha256 = "sha256-ujwzr4njNsf/VTyEq7zKHWxoivU3feavSTx+MLIj1ZM="; + sha256 = "sha256-1j7xzhuhK8ZRAJm9dJ95xiTIla7lh3LBiWc/+x/kjp0="; }; - doCheck = true; nativeCheckInputs = [ python3 ]; # these tests cover use as a build-time-linked library checkTarget = "test"; + doCheck = true; + + buildPhase = '' + runHook preBuild + + for VARIANT in default light; do make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES} VARIANT=$VARIANT; done + + runHook postBuild + ''; installPhase = '' + runHook preInstall + install -Dm444 -t $out/include include/* - install -Dm444 -t $out/lib out/libhardened_malloc.so + install -Dm444 -t $out/lib out/libhardened_malloc.so out-light/libhardened_malloc-light.so mkdir -p $out/bin substitute preload.sh $out/bin/preload-hardened-malloc --replace "\$dir" $out/lib chmod 0555 $out/bin/preload-hardened-malloc + + runHook postInstall ''; separateDebugInfo = true; diff --git a/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package-lock.json b/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package-lock.json index 953548f1f9..72a0fa9474 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.2.8", + "version": "1.3.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.2.8", + "version": "1.3.4", "hasInstallScript": true, "license": "None", "dependencies": { @@ -211,9 +211,9 @@ } }, "node_modules/ws": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", - "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz", + "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==", "engines": { "node": ">=10.0.0" }, diff --git a/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package.nix index 7bb433e359..df4f95b88b 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,14 +7,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.2.8"; + version = "1.3.4"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-fDnCQVHsdP5xXfMrbndha3sl96W4F3Z4gEGq7g9p9w0="; + hash = "sha256-Rc/dj3r3EpMbxx9rYj4kXnstmUGLR46U+7v6n1jSaiQ="; }; - npmDepsHash = "sha256-qzU+wG2ESkDxok55RE37LtbsnPZWEwJcTGnkOkRdRS0="; + npmDepsHash = "sha256-w9d96SMLISPua9LMZscDjL7L8mGPO1RGyNjg8eU40hw="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/third_party/nixpkgs/pkgs/by-name/gr/greenmask/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/greenmask/package.nix new file mode 100644 index 0000000000..4e5504ce76 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gr/greenmask/package.nix @@ -0,0 +1,50 @@ +{ + lib, + buildGoModule, + coreutils, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "greenmask"; + version = "0.1.14"; + + src = fetchFromGitHub { + owner = "GreenmaskIO"; + repo = "greenmask"; + rev = "refs/tags/v${version}"; + hash = "sha256-R/JJnHBp9MPnq/fIDwYrePIUH3/FvDPFaRpmrpwhU6o="; + }; + + vendorHash = "sha256-WCsZ5DU+mZk9M1lldBY4q2PXI8DDFytPojzGJ6wqXsg="; + + subPackages = [ "cmd/greenmask/" ]; + + ldflags = [ + "-s" + "-w" + "-X=github.com/greenmaskio/greenmask/cmd/greenmask/cmd.Version=${version}" + ]; + + nativeCheckInputs = [ coreutils ]; + + preCheck = '' + substituteInPlace internal/db/postgres/transformers/custom/dynamic_definition_test.go \ + --replace-fail "/bin/echo" "${coreutils}/bin/echo" + + substituteInPlace tests/integration/greenmask/main_test.go \ + --replace-fail "TestTocLibrary" "SkipTestTocLibrary" \ + --replace-fail "TestGreenmaskBackwardCompatibility" "SkipTestGreenmaskBackwardCompatibility" + substituteInPlace tests/integration/storages/main_test.go \ + --replace-fail "TestS3Storage" "SkipTestS3Storage" + ''; + + meta = with lib; { + description = "PostgreSQL database anonymization tool"; + homepage = "https://github.com/GreenmaskIO/greenmask"; + changelog = "https://github.com/GreenmaskIO/greenmask/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "greenmask"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/gruvbox-plus-icons/package.nix index fd9c88e5de..7525953259 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/gruvbox-plus-icons/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/gruvbox-plus-icons/package.nix @@ -8,15 +8,15 @@ , hicolor-icon-theme }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "gruvbox-plus-icons"; - version = "unstable-2023-12-07"; + version = "5.3.1"; src = fetchFromGitHub { owner = "SylEleuth"; repo = "gruvbox-plus-icon-pack"; - rev = "f3109979fe93b31ea14eb2d5c04247a895302ea0"; - sha256 = "sha256-EijTEDkPmcDcMhCuL6fOWjU9eXFUwmeOEwfGlxadb1U="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-Y+wNmZTVWsg6Hn+fak71jnoZ72Cz/8YYpGWkKr4+C9Q="; }; nativeBuildInputs = [ gtk3 ]; @@ -44,4 +44,4 @@ stdenvNoCC.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ eureka-cpu RGBCube ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix b/third_party/nixpkgs/pkgs/by-name/gr/grype/package.nix similarity index 92% rename from third_party/nixpkgs/pkgs/tools/security/grype/default.nix rename to third_party/nixpkgs/pkgs/by-name/gr/grype/package.nix index 927059a248..25cf7d4728 100644 --- a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.76.0"; + version = "0.77.4"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-FdxtJVLeH7UQBYjoOuimCoswvIkz/2sBJ4Kn5NGBDWY="; + hash = "sha256-xD6G4DGimmYVVCZHpXlvC24zaRwpRpQ0iRc4Yxac3O8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-oJNTvbfVkz4fK+EsF2ZoFfBSlkt0pFT4r2QDyhZhv5Y="; + vendorHash = "sha256-WosgdN49MEXSfK42l4em+Cpk8iAQphf9KOhY0mgBQ7U="; nativeBuildInputs = [ installShellFiles ]; @@ -90,6 +90,8 @@ buildGoModule rec { --replace-fail "TestAllNames" "SkipAllNames" substituteInPlace test/cli/version_cmd_test.go \ --replace-fail "TestVersionCmdPrintsToStdout" "SkipVersionCmdPrintsToStdout" + substituteInPlace grype/presenter/sarif/presenter_test.go \ + --replace-fail "Test_SarifIsValid" "SkipTest_SarifIsValid" # segfault rm grype/db/v5/namespace/cpe/namespace_test.go @@ -103,10 +105,9 @@ buildGoModule rec { ''; meta = with lib; { + description = "Vulnerability scanner for container images and filesystems"; homepage = "https://github.com/anchore/grype"; changelog = "https://github.com/anchore/grype/releases/tag/v${version}"; - description = "Vulnerability scanner for container images and filesystems"; - mainProgram = "grype"; longDescription = '' As a vulnerability scanner grype is able to scan the contents of a container image or filesystem to find known vulnerabilities. @@ -117,5 +118,6 @@ buildGoModule rec { jk kashw2 ]; + mainProgram = "grype"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/gt/gtimelog/package.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtimelog/package.nix index 1385751329..471a0fd890 100644 --- a/third_party/nixpkgs/pkgs/by-name/gt/gtimelog/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gt/gtimelog/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook +{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook3 , glibcLocales, gobject-introspection, gtk3, libsoup_3, libsecret }: @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-+iBHfbUJtAtI/vcHj0Y8f9OxAp1SnhQyMqedVzSYPZQ="; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ glibcLocales gtk3 libsoup_3 libsecret ]; propagatedBuildInputs = with python3Packages; [ pygobject3 diff --git a/third_party/nixpkgs/pkgs/by-name/gt/gtk-session-lock/package.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtk-session-lock/package.nix new file mode 100644 index 0000000000..713c9aa3c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gt/gtk-session-lock/package.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gobject-introspection +, vala +, gtk3 +, wayland-scanner +, wayland +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gtk-session-lock"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "Cu3PO42"; + repo = "gtk-session-lock"; + rev = "v${finalAttrs.version}"; + hash = "sha256-SHKAYmdev08oRB/V6UpfSFqYwplF59IaNSOoWcACPig="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + wayland-scanner + ]; + + buildInputs = [ + gtk3 + wayland + ]; + + # Tests are not fully prepared, but may be enabled in later versions + doCheck = false; + + strictDeps = true; + + meta = { + description = "A library to use GTK 3 to build screen lockers using ext-session-lock-v1 protocol"; + homepage = "https://github.com/Cu3PO42/gtk-session-lock"; + # The author stated "GTK Session Lock is licensed under the GNU General + # Public License version 3.0 or any later version approved by me (Cu3PO42)." + # Since we don't know if the author will approve later versions, we mark gpl3Only + license = with lib.licenses; [ gpl3Only ]; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/gt/gtkhash/package.nix b/third_party/nixpkgs/pkgs/by-name/gt/gtkhash/package.nix index 63d0c788c9..87cfcf374b 100644 --- a/third_party/nixpkgs/pkgs/by-name/gt/gtkhash/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gt/gtkhash/package.nix @@ -5,7 +5,7 @@ , ninja , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , glib , openssl @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ninja cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-goblins/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-goblins/package.nix index 13b391e4f6..aa5bcbc4bc 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guile-goblins/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-goblins/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "guile-goblins"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { url = "https://spritely.institute/files/releases/guile-goblins/guile-goblins-${version}.tar.gz"; - hash = "sha256-P5WKKv5i5Lrs4en+IWL40AkYAD+bgTyFdsQqE4FxPfA="; + hash = "sha256-efmyOtPAz1ZPdMCuVaGALR6e0lg7gcjt81BUMBVUKug="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-lzlib/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-lzlib/package.nix index f60a03b6da..701c364da7 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guile-lzlib/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-lzlib/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "guile-lzlib"; - version = "0.0.2"; + version = "0.3.0"; src = fetchurl { url = "https://notabug.org/guile-lzlib/guile-lzlib/archive/${version}.tar.gz"; - hash = "sha256-hiPbd9RH57n/v8vCiDkOcGprGomxFx2u1gh0z+x+T4c="; + hash = "sha256-p/mcjSoUPgXqItstyLnObCfK6UIWK0XuMBXtkCevD/I="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/gv/gvisor/package.nix b/third_party/nixpkgs/pkgs/by-name/gv/gvisor/package.nix index 0a83adc595..4389f6b1f9 100644 --- a/third_party/nixpkgs/pkgs/by-name/gv/gvisor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gv/gvisor/package.nix @@ -46,7 +46,7 @@ buildGoModule { description = "Application Kernel for Containers"; homepage = "https://github.com/google/gvisor"; license = licenses.asl20; - maintainers = with maintainers; [ andrew-d gpl ]; + maintainers = with maintainers; [ gpl ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock index 774723b056..74e5fa582d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ha/halloy/Cargo.lock @@ -120,6 +120,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anyhow" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" + [[package]] name = "approx" version = "0.5.1" @@ -245,6 +251,18 @@ dependencies = [ "futures-lite 2.3.0", ] +[[package]] +name = "async-http-proxy" +version = "1.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29faa5d4d308266048bd7505ba55484315a890102f9345b9ff4b87de64201592" +dependencies = [ + "base64 0.13.1", + "httparse", + "thiserror", + "tokio", +] + [[package]] name = "async-io" version = "1.13.0" @@ -412,6 +430,12 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + [[package]] name = "base64" version = "0.21.7" @@ -923,7 +947,7 @@ dependencies = [ name = "data" version = "0.1.0" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "chrono", "dirs-next", @@ -947,6 +971,7 @@ dependencies = [ "tokio", "tokio-stream", "toml", + "xdg", ] [[package]] @@ -1270,6 +1295,20 @@ dependencies = [ "zune-inflate", ] +[[package]] +name = "fast-socks5" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89f36d4ee12370d30d57b16c7e190950a1a916e7dbbb5fd5a412f5ef913fe84" +dependencies = [ + "anyhow", + "async-trait", + "log", + "thiserror", + "tokio", + "tokio-stream", +] + [[package]] name = "fast-srgb8" version = "1.0.0" @@ -1924,7 +1963,7 @@ dependencies = [ [[package]] name = "iced" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21" +source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" dependencies = [ "iced_core", "iced_futures", @@ -1938,7 +1977,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21" +source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" dependencies = [ "bitflags 2.5.0", "dark-light", @@ -1957,7 +1996,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21" +source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" dependencies = [ "futures", "iced_core", @@ -1971,7 +2010,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21" +source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -1992,7 +2031,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21" +source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2004,7 +2043,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21" +source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" dependencies = [ "iced_core", "iced_futures", @@ -2015,7 +2054,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21" +source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" dependencies = [ "bytemuck", "cosmic-text", @@ -2030,7 +2069,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21" +source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2049,7 +2088,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21" +source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" dependencies = [ "iced_renderer", "iced_runtime", @@ -2063,7 +2102,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=31d1d5fecbef50fa319cabd5d4194f1e4aaefa21#31d1d5fecbef50fa319cabd5d4194f1e4aaefa21" +source = "git+https://github.com/iced-rs/iced?rev=a05b8044a9a82c1802d4d97f1723e24b9d9dad9c#a05b8044a9a82c1802d4d97f1723e24b9d9dad9c" dependencies = [ "iced_graphics", "iced_runtime", @@ -2156,7 +2195,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" name = "irc" version = "0.1.0" dependencies = [ + "async-http-proxy", "bytes", + "fast-socks5", "futures", "irc_proto", "rustls-native-certs", @@ -3377,7 +3418,7 @@ version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -3548,7 +3589,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64", + "base64 0.21.7", ] [[package]] @@ -3557,7 +3598,7 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" dependencies = [ - "base64", + "base64 0.21.7", "rustls-pki-types", ] @@ -5301,6 +5342,12 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + [[package]] name = "xdg-home" version = "1.1.0" diff --git a/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix index b38708b974..7075d2a4a9 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/halloy/package.nix @@ -1,34 +1,35 @@ -{ lib -, stdenv -, darwin -, fetchFromGitHub -, copyDesktopItems -, makeDesktopItem -, libxkbcommon -, openssl -, pkg-config -, rustPlatform -, vulkan-loader -, wayland -, xorg +{ + lib, + stdenv, + darwin, + fetchFromGitHub, + copyDesktopItems, + makeDesktopItem, + libxkbcommon, + openssl, + pkg-config, + rustPlatform, + vulkan-loader, + wayland, + xorg, }: rustPlatform.buildRustPackage rec { pname = "halloy"; - version = "2024.6"; + version = "2024.7"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; rev = "refs/tags/${version}"; - hash = "sha256-UfeGRLZ0k2hHiA6o5kTysszU1WS4JUF5AXhKmE86bDM="; + hash = "sha256-CXuodMndUvltwjIiEdJuIazCYKqD/azROgSBTM6g87A="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "iced-0.13.0-dev" = "sha256-acGN7yxf33fDoh8J8uKvwiID+Xz1oVJ7KiiWgNWDXfo="; "glyphon-0.5.0" = "sha256-e1jTuaWh9eFdk2pDE4Ov/l3b/Q7GA3hqx6dPoOde1hM="; + "iced-0.13.0-dev" = "sha256-K1B9rVkShxQC97kwebHPsqJsJmxjEsFCKpg+p2lt09U="; "winit-0.29.15" = "sha256-9i2i4KcEv7vIImJtcw2NALQ3uDb4EAZXjShG6tfmhkc="; }; }; @@ -38,26 +39,27 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ - libxkbcommon - openssl - vulkan-loader - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.Metal - darwin.apple_sdk.frameworks.QuartzCore - darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals stdenv.isLinux [ - wayland - ]; + buildInputs = + [ + libxkbcommon + openssl + vulkan-loader + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreGraphics + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Metal + darwin.apple_sdk.frameworks.QuartzCore + darwin.apple_sdk.frameworks.Security + ] + ++ lib.optionals stdenv.isLinux [ wayland ]; desktopItems = [ (makeDesktopItem { @@ -67,21 +69,35 @@ rustPlatform.buildRustPackage rec { icon = "org.squidowl.halloy"; exec = pname; terminal = false; - mimeTypes = [ "x-scheme-handler/irc" "x-scheme-handler/ircs" ]; - categories = [ "Network" "IRCClient" ]; - keywords = [ "IM" "Chat" ]; + mimeTypes = [ + "x-scheme-handler/irc" + "x-scheme-handler/ircs" + ]; + categories = [ + "Network" + "IRCClient" + ]; + keywords = [ + "IM" + "Chat" + ]; startupWMClass = "org.squidowl.halloy"; }) ]; postFixup = lib.optional stdenv.isLinux ( let - rpathWayland = lib.makeLibraryPath [ wayland vulkan-loader libxkbcommon ]; + rpathWayland = lib.makeLibraryPath [ + wayland + vulkan-loader + libxkbcommon + ]; in '' rpath=$(patchelf --print-rpath $out/bin/halloy) patchelf --set-rpath "$rpath:${rpathWayland}" $out/bin/halloy - ''); + '' + ); postInstall = '' install -Dm644 assets/linux/icons/hicolor/128x128/apps/org.squidowl.halloy.png \ diff --git a/third_party/nixpkgs/pkgs/by-name/ha/halo/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/halo/package.nix new file mode 100644 index 0000000000..998e1f3706 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ha/halo/package.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper + # official jre size is 500MB, but temurin-jre-bin is 100MB. +, temurin-jre-bin +}: +stdenv.mkDerivation rec { + pname = "halo"; + version = "2.15.2"; + src = fetchurl { + url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar"; + hash = "sha256-BCcIDaWtn8OkI+GWs741nWgqyO8qlE9m2hZ3e+iViUI="; + }; + + nativeBuildInputs = [ + makeWrapper + temurin-jre-bin + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + cp $src halo.jar + # Extract the jar file. + # Because jar vs extract, jar startup time is 4s slower than extract. + java -Djarmode=tools -jar halo.jar extract --layers --launcher + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/halo + find halo -type d -empty -delete + for target in halo/*; do + cp -r $target/* $out/share/halo + done + + # 'HALO_WORK_DIR' + # Set the working directory for halo, then plug-ins and other content will be stored in this directory. + # Note: that the '/' symbol is not required at the end of the path. + # default: /var/lib/halo + # 'JVM_OPTS' + # Note: 'apache.lucene' requires us to set HotspotVMOptions. + # You can override this via environment variables. + # default: -Xms256m -Xmx256m + # 'SPRING_CONFIG_LOCATION' + # Note: 'spring.config.location' is used to specify the configuration file location. + # Warning: This variable is based on "HALO_WORK_DIR", you do not need and should not set or override it. + mkdir -p $out/bin + makeWrapper ${temurin-jre-bin}/bin/java $out/bin/halo \ + --chdir $out/share/halo \ + --set-default HALO_WORK_DIR "/var/lib/halo" \ + --set-default JVM_OPTS "-Xms256m -Xmx256m" \ + --set SPRING_CONFIG_LOCATION "optional:classpath:/;optional:file:\`\$HALO_WORK_DIR\`/" \ + --add-flags "-server \$JVM_OPTS" \ + --add-flags "org.springframework.boot.loader.launch.JarLauncher" + + runHook postInstall + ''; + + meta = { + homepage = "https://www.halo.run"; + description = "Self-hosted dynamic blogging program"; + maintainers = with lib.maintainers; [ yah ]; + license = lib.licenses.gpl3Only; + platforms = [ "aarch64-linux" "x86_64-linux" ]; + mainProgram = "halo"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ha/hamtransfer/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/hamtransfer/package.nix new file mode 100644 index 0000000000..49dbe40cd9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ha/hamtransfer/package.nix @@ -0,0 +1,42 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, protobuf +, sqlite +}: + +rustPlatform.buildRustPackage { + pname = "hamtransfer"; + version = "unstable-2024-04-05"; + + src = fetchFromGitHub { + owner = "ThomasHabets"; + repo = "hamtransfer"; + rev = "6b0ac28e0b8cdcc3ac9aba9cd6115e48c4f26c1e"; + hash = "sha256-yZwbFjs+mnTbU+75dwRhVjvXXoHQuzgE9GlliUQZV1s="; + }; + + cargoHash = "sha256-lFzsURGhEcuTL6dHt4/l54eT3mD7H8tsW/+unisdjKY="; + + nativeBuildInputs = [ + pkg-config + protobuf + ]; + + buildInputs = [ + sqlite + ]; + + postInstall = '' + mv $out/bin/downloader $out/bin/hamtransfer-downloader + mv $out/bin/uploader $out/bin/hamtransfer-uploader + ''; + + meta = with lib; { + description = "Tool for transferring files over amateur radio using modern techniques"; + homepage = "https://github.com/ThomasHabets/hamtransfer"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ matthewcroughan sarcasticadmin pkharvey ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ha/handheld-daemon/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/handheld-daemon/package.nix index 246e3879bb..ec24637dde 100644 --- a/third_party/nixpkgs/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/handheld-daemon/package.nix @@ -9,14 +9,14 @@ }: python3.pkgs.buildPythonApplication rec { pname = "handheld-daemon"; - version = "2.6.4"; + version = "2.7.2"; pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; rev = "v${version}"; - hash = "sha256-S77APtE1GGfqnv1IkZdJOSlprPOBtrqVXV60yVMvopg="; + hash = "sha256-jWLL1nmKam1iJ1R1l/OuIp+isgZ7toRhVamx1nOID/8="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/by-name/ha/hashid/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/hashid/package.nix new file mode 100644 index 0000000000..5679fb1a27 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ha/hashid/package.nix @@ -0,0 +1,25 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3Packages +}: + +python3Packages.buildPythonApplication { + pname = "hashid"; + version = "3.1.4-unstable-2015-03-17"; + + src = fetchFromGitHub { + owner = "psypanda"; + repo = "hashID"; + rev = "7e8473a823060e56d4b6090a98591e252bd9505e"; + hash = "sha256-R2r/UYRcHbpfOz/XqtSUIpd826eT1Erfo7frAiArT34="; + }; + + meta = with lib; { + description = "Software to identify the different types of hashes"; + homepage = "https://github.com/psypanda/hashID"; + mainProgram = "hashid"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ d3vil0p3r ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/hatch/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/hatch/package.nix similarity index 81% rename from third_party/nixpkgs/pkgs/development/tools/hatch/default.nix rename to third_party/nixpkgs/pkgs/by-name/ha/hatch/package.nix index 4f3dec85ff..06f2911faa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hatch/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/hatch/package.nix @@ -8,14 +8,19 @@ python3.pkgs.buildPythonApplication rec { pname = "hatch"; - version = "1.9.0"; + version = "1.9.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-4ealEeFS7HzU26vE9Pahh0hwvUnJfRfTkLkjLdpoXOM="; + hash = "sha256-Gae4IXn5Tyrd2612qn5lq5DK1VqxA9U4J2N5NcnmYkw="; }; + postPatch = '' + # Loosen hatchling runtime version dependency + sed -i 's/hatchling<1.22/hatchling/' pyproject.toml + ''; + nativeBuildInputs = with python3.pkgs; [ hatchling hatch-vcs @@ -69,19 +74,13 @@ python3.pkgs.buildPythonApplication rec { "test_editable_exact_force_include_option" "test_editable_exact_force_include_build_data_precedence" "test_editable_pth" - # AssertionError: assert len(extract_installed_requirements(output.splitlines())) > 0 - "test_creation_allow_system_packages" - # cli table output mismatch - "test_context_formatting" # expects sh, finds bash "test_all" "test_already_installed_update_flag" "test_already_installed_update_prompt" - # unmet expectations about the binary module we provide - "test_dependency_not_found" - "test_marker_unmet" - # output capturing mismatch, likely stdout/stderr mixup - "test_no_compatibility_check_if_exists" + # Loosen hatchling runtime version dependency + "test_core" + "test_correct" ] ++ lib.optionals stdenv.isDarwin [ # https://github.com/NixOS/nixpkgs/issues/209358 "test_scripts_no_environment" @@ -90,6 +89,8 @@ python3.pkgs.buildPythonApplication rec { # It is not possible to run it in a nix build using a /nix/store shell. # See https://github.com/pypa/hatch/pull/709 for the relevant code. "test_populate_default_popen_kwargs_executable" + ] ++ lib.optionals stdenv.isAarch64 [ + "test_resolve" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/hb/hb-honeypot/package.nix b/third_party/nixpkgs/pkgs/by-name/hb/hb-honeypot/package.nix new file mode 100644 index 0000000000..9af6039573 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/hb/hb-honeypot/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, perl +}: + +stdenv.mkDerivation { + pname = "hb-honeypot"; + version = "0-unstable-2024-02-13"; + + src = fetchFromGitHub { + owner = "D3vil0p3r"; + repo = "hb-honeypot"; + rev = "06ca7336bfb7deca54eae2cee239496d26f21b5b"; + hash = "sha256-vnq7u/sqDLD+PsZ9DlxfjNuTkO8lhZujjAgmTcWf/3I="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share/hb-honeypot} + cp hb-honeypot.pl $out/share/hb-honeypot/ + makeWrapper ${perl}/bin/perl $out/bin/hb-honeypot \ + --add-flags "$out/share/hb-honeypot/hb-honeypot.pl" + runHook postInstall + ''; + + meta = with lib; { + description = "Script that listens on TCP port 443 and responds with completely bogus SSL heartbeat responses"; + mainProgram = "hb-honeypot"; + homepage = "https://github.com/D3vil0p3r/hb-honeypot"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl3Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/he/hexedit/package.nix b/third_party/nixpkgs/pkgs/by-name/he/hexedit/package.nix new file mode 100644 index 0000000000..e592d6633b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/he/hexedit/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + ncurses, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hexedit"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "pixel"; + repo = "hexedit"; + rev = finalAttrs.version; + hash = "sha256-fIgPbr7qmxyEga2YaAD0+NBM8LeDm/tVAq99ub7aiAI="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ncurses ]; + + meta = { + description = "View and edit files in hexadecimal or in ASCII"; + homepage = "http://rigaux.org/hexedit.html"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "hexedit"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/hi/hieroglyphic/package.nix b/third_party/nixpkgs/pkgs/by-name/hi/hieroglyphic/package.nix new file mode 100644 index 0000000000..f130488e95 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/hi/hieroglyphic/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + cargo, + rustc, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + desktop-file-utils, + glib, + gtk4, + libadwaita, + darwin, + gettext, +}: + +let + inherit (darwin.apple_sdk.frameworks) CoreFoundation Foundation; +in +stdenv.mkDerivation (finalAttrs: { + pname = "hieroglyphic"; + version = "1.0.1"; + # Note: 1.1.0 requires a higher gtk4 version. This requirement could be patched out. + + src = fetchFromGitHub { + owner = "FineFindus"; + repo = "Hieroglyphic"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-Twx3yM71xn2FT3CbiFGbo2knGvb4MBl6VwjWlbjfks0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + name = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-Se/YCi0e+Uoh5guDteLRXZYyk7et0NA8cv+vNpLxzx4="; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + cargo + rustc + meson + ninja + pkg-config + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = + [ + glib + gtk4 + libadwaita + ] + ++ lib.optionals stdenv.isDarwin [ + CoreFoundation + Foundation + ]; + + # needed for darwin + env.GETTEXT_DIR = "${gettext}"; + + meta = { + changelog = "https://github.com/FineFindus/Hieroglyphic/releases/tag/v${finalAttrs.version}"; + description = "A tool based on detexify for finding LaTeX symbols from drawings"; + homepage = "https://apps.gnome.org/en/Hieroglyphic/"; + license = lib.licenses.gpl3Only; + mainProgram = "hieroglyphic"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/hi/hifile/package.nix b/third_party/nixpkgs/pkgs/by-name/hi/hifile/package.nix index 5af67f9177..4e06e08231 100644 --- a/third_party/nixpkgs/pkgs/by-name/hi/hifile/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hi/hifile/package.nix @@ -17,8 +17,6 @@ in appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/HiFile.desktop $out/share/applications/HiFile.desktop install -m 444 -D ${appimageContents}/HiFile.png $out/share/icons/hicolor/512x512/apps/HiFile.png substituteInPlace $out/share/applications/HiFile.desktop \ diff --git a/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix b/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix index 6aea05d15a..c2a9cd7fd6 100644 --- a/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "unstable-2024-04-16"; + version = "0-unstable-2024-05-12"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7"; - hash = "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI="; + rev = "44677a1c96810a8e8c4ffaeaad10c842402647c1"; + hash = "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ho/hoppscotch/package.nix b/third_party/nixpkgs/pkgs/by-name/ho/hoppscotch/package.nix index e7d1dbdc27..a798f05c7e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ho/hoppscotch/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ho/hoppscotch/package.nix @@ -3,36 +3,43 @@ , fetchurl , appimageTools , undmg -, nix-update-script }: let pname = "hoppscotch"; - version = "23.12.5"; + version = "24.3.3-1"; src = fetchurl { aarch64-darwin = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}-1/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-WUJW38vQ7o5KEmCxhVnJ03/f5tPOTYcczrEcmt6NSCY="; + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; + hash = "sha256-litOYRsUOx6VpkA1LPx7aGGagqIVL9fgNsYoP5n/2mo="; }; x86_64-darwin = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}-1/Hoppscotch_mac_x64.dmg"; - hash = "sha256-bQFD+9IoelinWYUndzbVvPNaRde6ACPvw9ifX9mYdno="; + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; + hash = "sha256-UG89Fv9J8SnzPVoIO16LOprxPmZuu/zyox1b+jn+eNw="; }; x86_64-linux = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}-1/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-MYQ7SRm+CUPIXROZxejbbZ0/wH+U5DQO4YGbE/HQAj8="; + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; + hash = "sha256-110l1DTyvH2M0ex1r35Q+55NiJ8nYum1KdWQXDvAdxo="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - meta = { + meta = with lib; { description = "Open source API development ecosystem"; - mainProgram = "hoppscotch"; + longDescription = '' + Hoppscotch is a lightweight, web-based API development suite. It was built + from the ground up with ease of use and accessibility in mind providing + all the functionality needed for API developers with minimalist, + unobtrusive UI. + ''; homepage = "https://hoppscotch.com"; - changelog = "https://github.com/hoppscotch/hoppscotch/releases/tag/${version}"; + downloadPage = "https://hoppscotch.com/downloads"; + changelog = "https://hoppscotch.com/changelog"; + license = licenses.mit; + maintainers = with maintainers; [ DataHearth ]; + mainProgram = "hoppscotch"; platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ DataHearth ]; + sourceProvenance = [ sourceTypes.binaryNativeCode ]; }; in if stdenv.isDarwin then stdenv.mkDerivation @@ -55,16 +62,11 @@ if stdenv.isDarwin then stdenv.mkDerivation else appimageTools.wrapType2 { inherit pname version src meta; - extraPkgs = pkgs: - appimageTools.defaultFhsEnvArgs.multiPkgs pkgs; - extraInstallCommands = let appimageContents = appimageTools.extractType2 { inherit pname version src; }; in '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - # Install .desktop files install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps diff --git a/third_party/nixpkgs/pkgs/by-name/ht/htb-toolkit/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/htb-toolkit/package.nix index b833fed505..cedbe645f9 100644 --- a/third_party/nixpkgs/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ht/htb-toolkit/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage { pname = "htb-toolkit"; - version = "unstable-2024-01-17"; + version = "0-unstable-2024-04-22"; src = fetchFromGitHub { owner = "D3vil0p3r"; repo = "htb-toolkit"; # https://github.com/D3vil0p3r/htb-toolkit/issues/3 - rev = "54e11774ea8746ea540548082d3b25c22306b4fc"; - hash = "sha256-QYUqdqFV9Qn+VbJTnz5hx5I0XV1nrzCoCKtRS7jBLsE="; + rev = "921e4b352a9dd8b3bc8ac8774e13509abd179aef"; + hash = "sha256-o91p/m06pm9qoYZZVh+qHulqHO2G7xVJQPpEvRsq+8Q="; }; - cargoHash = "sha256-XDE6A6EIAUbuzt8Zb/ROfDAPp0ZyN0WQ4D1gWHjRVhg="; + cargoHash = "sha256-vTUiagI0eTrADr6zCMI5btLRvXgZSaohldg4jYmjfyA="; # Patch to disable prompt change of the shell when a target machine is run. Needed due to Nix declarative nature patches = [ @@ -39,24 +39,25 @@ rustPlatform.buildRustPackage { ]; buildInputs = [ - gnome.gnome-keyring openssl + ] ++ lib.optionals stdenv.isLinux [ + gnome.gnome-keyring ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; postPatch = '' substituteInPlace src/manage.rs \ - --replace /usr/share/htb-toolkit/icons/ $out/share/htb-toolkit/icons/ + --replace-fail /usr/share/icons/htb-toolkit/ $out/share/icons/htb-toolkit/ substituteInPlace src/utils.rs \ - --replace /usr/bin/bash ${bash} \ - --replace "\"base64\"" "\"${coreutils}/bin/base64\"" \ - --replace "\"gunzip\"" "\"${gzip}/bin/gunzip\"" + --replace-fail "\"base64\"" "\"${coreutils}/bin/base64\"" \ + --replace-fail "\"gunzip\"" "\"${gzip}/bin/gunzip\"" substituteInPlace src/appkey.rs \ - --replace secret-tool ${lib.getExe libsecret} + --replace-fail secret-tool ${lib.getExe libsecret} substituteInPlace src/vpn.rs \ - --replace "arg(\"openvpn\")" "arg(\"${openvpn}/bin/openvpn\")" \ - --replace "arg(\"killall\")" "arg(\"${killall}/bin/killall\")" + --replace-fail "arg(\"openvpn\")" "arg(\"${openvpn}/bin/openvpn\")" \ + --replace-fail "arg(\"killall\")" "arg(\"${killall}/bin/killall\")" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/ht/httpie-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/httpie-desktop/package.nix new file mode 100644 index 0000000000..e8f3dbb1c0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ht/httpie-desktop/package.nix @@ -0,0 +1,23 @@ +{ + appimageTools, + lib, + fetchurl, +}: +appimageTools.wrapType2 rec { + pname = "httpie-desktop"; + version = "2024.1.2"; + + src = fetchurl { + url = "https://github.com/httpie/desktop/releases/download/v${version}/HTTPie-${version}.AppImage"; + sha256 = "sha256-OOP1l7J2BgO3nOPSipxfwfN/lOUsl80UzYMBosyBHrM="; + }; + + meta = with lib; { + description = "Cross-platform API testing client for humans. Painlessly test REST, GraphQL, and HTTP APIs."; + homepage = "https://github.com/httpie/desktop"; + license = licenses.unfree; + maintainers = with maintainers; [ luftmensch-luftmensch ]; + mainProgram = "httpie-desktop"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix b/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix index 49ebe5433c..496c9b6235 100644 --- a/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.125.0"; + version = "0.125.7"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-aPBS/8m57Dn8Uvem58KzaCZJ1Hn8doL1BsDdF7w5nJc="; + hash = "sha256-aONA9qfoilte73wBTZFu8rrVz+O8xtnRk/rOxJLANS8="; }; - vendorHash = "sha256-jGCHlAE5mSDKpZVWgjCEN51sL+3GR/C5ROI9065OhRU="; + vendorHash = "sha256-ZEaByHlJIfzGbmdadDpCJGCybj9SOHRzrrzR/S/zRnc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix b/third_party/nixpkgs/pkgs/by-name/hu/humioctl/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix rename to third_party/nixpkgs/pkgs/by-name/hu/humioctl/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprcursor/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprcursor/package.nix index 144c2d71df..eade6e6945 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprcursor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprcursor/package.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprcursor"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprcursor"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-T0lV+xA07RzroRLwZsGbF9bWZNHInXS+oB0RJ6YdvWg="; + hash = "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprdim/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/hy/hyprdim/Cargo.lock deleted file mode 100644 index 8c22c7838d..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprdim/Cargo.lock +++ /dev/null @@ -1,1213 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "assert_cmd" -version = "2.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" -dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "async-trait" -version = "0.1.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" - -[[package]] -name = "cc" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd97381a8cc6493395a5afc4c691c1084b3768db713b73aa215217aa245d153" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_complete" -version = "4.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_derive" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "clap_mangen" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dd95b5ebb5c1c54581dd6346f3ed6a79a3eef95dd372fc2ac13d535535300e" -dependencies = [ - "clap", - "roff", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "ctrlc" -version = "3.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" -dependencies = [ - "nix 0.28.0", - "windows-sys 0.52.0", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hyprdim" -version = "2.2.4" -dependencies = [ - "assert_cmd", - "clap", - "clap_complete", - "clap_mangen", - "ctrlc", - "hyprland", - "rustympkglib", - "serde", - "single-instance", - "toml", -] - -[[package]] -name = "hyprland" -version = "0.3.13" -source = "git+https://github.com/hyprland-community/hyprland-rs.git#7a60845c9bfaf264e4dd9f5d7977f4a1f15599c8" -dependencies = [ - "async-trait", - "derive_more", - "doc-comment", - "futures", - "hex", - "hyprland-macros", - "lazy_static", - "num-traits", - "paste", - "regex", - "serde", - "serde_json", - "serde_repr", - "strum", - "tokio", -] - -[[package]] -name = "hyprland-macros" -version = "0.3.13" -source = "git+https://github.com/hyprland-community/hyprland-rs.git#7a60845c9bfaf264e4dd9f5d7977f4a1f15599c8" -dependencies = [ - "quote", - "syn 2.0.58", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "libc", - "memoffset", -] - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "cfg_aliases", - "libc", -] - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "predicates" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" -dependencies = [ - "anstyle", - "difflib", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "roff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustversion" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" - -[[package]] -name = "rustympkglib" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a6a04e9c4cc5d0fd4291f8ce8e1aa9d438d3e7b5ea09699cc81acd83272a16" -dependencies = [ - "serde", - "tree-sitter", - "tree-sitter-bash", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "semver" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "single-instance" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4637485391f8545c9d3dbf60f9d9aab27a90c789a700999677583bcb17c8795d" -dependencies = [ - "libc", - "nix 0.23.2", - "thiserror", - "widestring", - "winapi", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "strum" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.58", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "tokio" -version = "1.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "toml" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tree-sitter" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad726ec26496bf4c083fff0f43d4eb3a2ad1bba305323af5ff91383c0b6ecac0" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-bash" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c629e2d29ebb85b34cd195a1c511a161ed775451456cde110470e7af693424db" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "widestring" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "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_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "winnow" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" -dependencies = [ - "memchr", -] diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprdim/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprdim/package.nix index 2ce84331f4..11afcf6daa 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprdim/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprdim/package.nix @@ -8,21 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprdim"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "donovanglover"; repo = "hyprdim"; rev = version; - hash = "sha256-XRaBrn8gnXyMiCf3UQvdZGnZ//YMUivfVg0IoZF5F88="; + hash = "sha256-EWZnimLLV879FiZUax1YK5ML/Qz4qt29rJWn5uoKtqw="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "hyprland-0.3.13" = "sha256-gjShmFcECdX0/t7mL035l9e9OzZuJqX0Ueozv38l03g="; - }; - }; + cargoHash = "sha256-V4Z3PKavxfQm7zSoTyoWtxpc8yuuGPemO4OdadQEVdg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprland-activewindow/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprland-activewindow/package.nix new file mode 100644 index 0000000000..5bbdd467fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprland-activewindow/package.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "hyprland-activewindow"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "FieldOfClay"; + repo = "hyprland-activewindow"; + rev = "v${version}"; + hash = "sha256-kRxA2DLbbABPJFwv/L7yeNJ8eqNUbuV6U/PB5iJNoAw="; + }; + + cargoHash = "sha256-s3Ho0+OzuLuWqFvaBu9NLXoasByHSuun9eJGAAISOJc="; + + meta = with lib; { + description = "A multi-monitor-aware Hyprland workspace widget helper"; + homepage = "https://github.com/FieldofClay/hyprland-activewindow"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ kiike donovanglover ]; + mainProgram = "hyprland-activewindow"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprland-monitor-attached/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprland-monitor-attached/package.nix index 6f505aa798..291b1f5a24 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprland-monitor-attached/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprland-monitor-attached/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-monitor-attached"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "coffebar"; repo = "hyprland-monitor-attached"; rev = version; - hash = "sha256-McenpaoEjQIB709VlLkyVGoUwVoMe7TJPb8Lrh1efw8="; + hash = "sha256-+bgOOm1B513COcWdUIJ/+GREQH5CR8/RNOcZVkjO2hI="; }; - cargoHash = "sha256-QH32NYZJcSxTMgHZKqksy2+DLw62G+knJgoj6OGRfQE="; + cargoHash = "sha256-vQfDsP2Tc+Kj95wXIzPTlf6kRdBgdio0QkM9EJRjZjE="; meta = with lib; { description = "Automatically run a script when a monitor connects (or disconnects) in Hyprland"; diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprland-workspaces/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprland-workspaces/package.nix new file mode 100644 index 0000000000..11307059e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprland-workspaces/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "hyprland-workspaces"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "FieldofClay"; + repo = "hyprland-workspaces"; + rev = "v${version}"; + hash = "sha256-GhUjvFMlgjTdgtV9ASW7IqE2dBktPyOlRwg6qM1r7vc="; + }; + + cargoHash = "sha256-RZVQSkegX8Fa9SNY7tGNxyu312oeDjXK4U1+1/UIAyA="; + + meta = with lib; { + description = "A multi-monitor aware Hyprland workspace widget"; + homepage = "https://github.com/FieldofClay/hyprland-workspaces"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ kiike donovanglover ]; + mainProgram = "hyprland-workspaces"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprlock/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprlock/package.nix index 5bac39c63d..722e90b445 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprlock/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprlock/package.nix @@ -1,30 +1,35 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libGL -, libxkbcommon -, hyprlang -, pam -, wayland -, wayland-protocols -, cairo -, pango -, libdrm -, mesa -, nix-update-script +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libGL, + libxkbcommon, + hyprlang, + pam, + wayland, + wayland-protocols, + cairo, + file, + libjpeg, + libwebp, + pango, + libdrm, + mesa, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.2.0"; + version = "0.3.0-unstable-2024-04-24"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; - rev = "v${finalAttrs.version}"; - hash = "sha256-1p6Y/8+ETaz7GQ8wsXLUTrk2dD0YN9ySOfwjRp2TSG4="; + # FIXME: Change to a stable release once available + rev = "415262065fff0a04b229cd00165f346a86a0a73a"; + hash = "sha256-jla5Wo0Qt3NEnD0OjNj85BGw0pR4Zlz5uy8AqHH7tuE="; }; strictDeps = true; @@ -36,9 +41,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo + file hyprlang libdrm libGL + libjpeg + libwebp libxkbcommon mesa pam @@ -53,8 +61,11 @@ stdenv.mkDerivation (finalAttrs: { description = "Hyprland's GPU-accelerated screen locking utility"; homepage = "https://github.com/hyprwm/hyprlock"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "hyprlock"; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/i2/i2p/package.nix b/third_party/nixpkgs/pkgs/by-name/i2/i2p/package.nix index 0c659755ee..7f1cfb0255 100644 --- a/third_party/nixpkgs/pkgs/by-name/i2/i2p/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/i2/i2p/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "i2p"; - version = "2.5.0"; + version = "2.5.1"; src = fetchzip { urls = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { "https://files.i2p-projekt.de/" "https://download.i2p2.no/releases/" ]); - hash = "sha256-mGBt2BrHU2ETV3jRay5tEpMJEO3b3K6BlBjYZNedtEA="; + hash = "sha256-38kG0UyU1ngVdUb/H5tIuG3p+bsvJznjervDh3TWoGo="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/i3/i3bar-river/package.nix b/third_party/nixpkgs/pkgs/by-name/i3/i3bar-river/package.nix index b31e4ca129..f94b8628f6 100644 --- a/third_party/nixpkgs/pkgs/by-name/i3/i3bar-river/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/i3/i3bar-river/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "i3bar-river"; - version = "0.1.6"; + version = "0.1.9"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "i3bar-river"; rev = "v${version}"; - hash = "sha256-wtyC8cGK408KZYpWniW2y4XI1ScTSBZJJlUt6b2Z5KA="; + hash = "sha256-tG23bdEKp8+9RMS1fpW8EVe+bAdjQp7nVW0eHl3eYSQ="; }; - cargoHash = "sha256-PdSMDsV3yFy3kSNS6OBxFdrZsIn70gXOTd2AhyU4a9o="; + cargoHash = "sha256-nSzGWpnyGRus9qCTPAd+BM4KsujSNyRmFUCc4Lg4D5k="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ic/icloudpd/package.nix b/third_party/nixpkgs/pkgs/by-name/ic/icloudpd/package.nix index 01f30919e2..f4e9208838 100644 --- a/third_party/nixpkgs/pkgs/by-name/ic/icloudpd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ic/icloudpd/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "icloudpd"; - version = "1.17.4"; + version = "1.17.5"; pyproject = true; src = fetchFromGitHub { owner = "icloud-photos-downloader"; repo = "icloud_photos_downloader"; rev = "v${version}"; - hash = "sha256-xsUayewn6c+TFqQnvDWe+1y4o76Quq8sK1WkSFFgPkc="; + hash = "sha256-1tyvoDAlh2UuPWDqA7mwC1v5kij3v3aBZBfIG/vluJo="; }; pythonRelaxDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ic/icnsify/package.nix b/third_party/nixpkgs/pkgs/by-name/ic/icnsify/package.nix new file mode 100644 index 0000000000..a1017f14a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ic/icnsify/package.nix @@ -0,0 +1,29 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +let + version = "0.1.0"; +in +rustPlatform.buildRustPackage { + pname = "icnsify"; + inherit version; + + src = fetchFromGitHub { + owner = "uncenter"; + repo = "icnsify"; + rev = "v${version}"; + hash = "sha256-v8jwN29S6ZTt2XkPpZM+lJugbP9ClzPhqu52mdwdP00="; + }; + + cargoHash = "sha256-5wgioCOKvZ0J/t5v/Ic3unAA5h5Bt6MuCUzFJP7Dusw="; + + meta = { + description = "Convert PNGs to .icns"; + homepage = "https://github.com/uncenter/icnsify"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ uncenter ]; + mainProgram = "icnsify"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ig/igvm-tooling/package.nix b/third_party/nixpkgs/pkgs/by-name/ig/igvm-tooling/package.nix new file mode 100644 index 0000000000..b5fb283084 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ig/igvm-tooling/package.nix @@ -0,0 +1,78 @@ +{ lib +, python3 +, fetchFromGitHub +, fetchpatch +, which +, acpica-tools +}: + +python3.pkgs.buildPythonApplication rec { + pname = "igvm-tooling"; + version = "1.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "igvm-tooling"; + rev = "igvm-${version}"; + hash = "sha256-13TtiJv2w9WXSW6oPMfo+rRah+Q1wHV14aBaFGfz9CE="; + }; + + patches = [ + # drop unused libclang dependency + # remove once https://github.com/microsoft/igvm-tooling/pull/53 is merged + (fetchpatch { + name = "0001-setup.py-remove-unused-libclang-dependency.patch"; + url = "https://github.com/microsoft/igvm-tooling/commit/7182e925de9b5e9f5c8c3a3ce6e3942a92506064.patch"; + sha256 = "sha256-tcVxcuLxknyEdo2YjeHOqSG9xQna8US+YyvlcfX+Htw="; + stripLen = 1; + }) + # write updated acpi files to tempdir (instead of nix store path) at runtime + # remove once https://github.com/microsoft/igvm-tooling/pull/54 is merged + (fetchpatch { + name = "0002-acpi-update-dsl-files-in-tempdir.patch"; + url = "https://github.com/microsoft/igvm-tooling/commit/20f8d123ec6531d8540074b7df2ee12de60e73b8.patch"; + sha256 = "sha256-hNfkclxaYViy66TPHqLV3mqD7wqBuBN9MnMLaDOeRNM="; + stripLen = 1; + }) + ]; + + postPatch = '' + substituteInPlace igvm/acpi.py \ + --replace-fail 'os.path.join(os.path.dirname(__file__), "acpi", "acpi.zip")' "\"$out/share/igvm-tooling/acpi/acpi.zip\"" + ''; + + sourceRoot = "${src.name}/src"; + + nativeBuildInputs = [ acpica-tools ]; + + propagatedBuildInputs = with python3.pkgs; [ + setuptools + ecdsa + cstruct + pyelftools + pytest + cached-property + frozendict + ] ++ [ + acpica-tools + which + ]; + + postInstall = '' + mkdir -p $out/share/igvm-tooling/acpi/acpi-clh + cp -rT igvm/acpi/acpi-clh $out/share/igvm-tooling/acpi/acpi-clh + cp igvm/acpi/acpi.zip $out/share/igvm-tooling/acpi/acpi.zip + find $out/share/igvm-tooling/acpi -name "*.dsl" -exec iasl -f {} \; + ''; + + meta = { + description = "IGVM Image Generator"; + homepage = "https://github.com/microsoft/igvm-tooling"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.malt3 ]; + changelog = "https://github.com/microsoft/igvm-tooling/releases/tag/igvm-${version}"; + mainProgram = "igvmgen"; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/linux.nix b/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/linux.nix index fa4332e914..cab32531fd 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/linux.nix +++ b/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/linux.nix @@ -7,8 +7,4 @@ appimageTools.wrapType2 rec { inherit pname version src meta; name = "${pname}-${version}"; - - extraInstallCommands = '' - mv $out/bin/{${name},${pname}} - ''; } diff --git a/third_party/nixpkgs/pkgs/by-name/im/imposm/package.nix b/third_party/nixpkgs/pkgs/by-name/im/imposm/package.nix new file mode 100644 index 0000000000..e52cac5634 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/im/imposm/package.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub, leveldb, geos }: + +buildGoModule rec { + pname = "imposm"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "omniscale"; + repo = "imposm3"; + rev = "v${version}"; + hash = "sha256-xX4cV/iU7u/g9n7dtkkkCtNOPZK5oyprNHGDUuW+ees="; + }; + + vendorHash = null; + + buildInputs = [ leveldb geos ]; + + ldflags = [ + "-s -w" + "-X github.com/omniscale/imposm3.Version=${version}" + ]; + + # requires network access + doCheck = false; + + meta = with lib; { + description = "Imposm imports OpenStreetMap data into PostGIS"; + homepage = "https://imposm.org/"; + changelog = "https://github.com/omniscale/imposm3/releases/tag/${src.rev}"; + license = licenses.apsl20; + maintainers = with maintainers; [ sikmir ]; + mainProgram = "imposm"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/in/incus/client.nix b/third_party/nixpkgs/pkgs/by-name/in/incus/client.nix index ecad050f04..c2b8020936 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/incus/client.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/incus/client.nix @@ -16,7 +16,6 @@ in buildGoModule { inherit - meta patches pname src @@ -39,4 +38,8 @@ buildGoModule { # don't run the full incus test suite doCheck = false; + + meta = meta // { + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; } diff --git a/third_party/nixpkgs/pkgs/by-name/in/incus/generic.nix b/third_party/nixpkgs/pkgs/by-name/in/incus/generic.nix index cf73d366e1..56b1080407 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/incus/generic.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/incus/generic.nix @@ -81,7 +81,8 @@ buildGoModule rec { make incus-agent incus-migrate ''; - preCheck = + # Disable tests requiring local operations + checkFlags = let skippedTests = [ "TestValidateConfig" @@ -91,10 +92,7 @@ buildGoModule rec { "TestContainerTestSuite" ]; in - '' - # Disable tests requiring local operations - buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") - ''; + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; postInstall = '' installShellCompletion --cmd incus \ @@ -115,7 +113,7 @@ buildGoModule rec { ; }; - tests = nixosTests.incus; + tests = if lts then nixosTests.incus-lts else nixosTests.incus; ui = callPackage ./ui.nix { }; diff --git a/third_party/nixpkgs/pkgs/by-name/in/incus/package.nix b/third_party/nixpkgs/pkgs/by-name/in/incus/package.nix index 50fccf3e77..be289a05e0 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/incus/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/incus/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - hash = "sha256-+q5qP7w2RdtuwvxPThCryYYEJ7s5WDnWHRvjo4TuajA="; - version = "6.0.0"; - vendorHash = "sha256-wcauzIbBcYpSWttZCVVE9m49AEQGolGYSsv9eEkhb7Y="; + hash = "sha256-BFB4bdfh3hI7D1m7a20ckPPyP9CYXW7mjqeTZ/21Gqs="; + version = "6.1.0"; + vendorHash = "sha256-a8ZPhzs7sNIJLjQ9Y87Zf9SXAsmbdVn250Q0OQwy69A="; patches = [ ]; } diff --git a/third_party/nixpkgs/pkgs/by-name/in/inotify-info/package.nix b/third_party/nixpkgs/pkgs/by-name/in/inotify-info/package.nix index 2faa457711..ea7235917c 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/inotify-info/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/inotify-info/package.nix @@ -1,14 +1,17 @@ -{ lib, stdenv, fetchFromGitHub }: - +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "inotify-info"; - version = "unstable-2024-01-05"; + version = "0.0.1"; src = fetchFromGitHub { owner = "mikesart"; repo = "inotify-info"; - rev = "a7ff6fa62ed96ec5d2195ef00756cd8ffbf23ae1"; - hash = "sha256-yY+hjdb5J6dpFkIMMUWvZlwoGT/jqOuQIcFp3Dv+qB8="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-fsUvIXWnP6Iy9Db0wDG+ntSw6mUt0MQOTJA5vFxhH+U="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/in/inshellisense/package.nix b/third_party/nixpkgs/pkgs/by-name/in/inshellisense/package.nix index 20fa220039..5e9610d0c2 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/inshellisense/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/inshellisense/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "inshellisense"; - version = "0.0.1-rc.12"; + version = "0.0.1-rc.15"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dDjIKVV1dSCIa2Y2d1AQQAw9Rcflh0AnKlwsQSblIhs="; + hash = "sha256-/6pU8ubasONPMe1qnE+Db0nzdHRQTo9fhMr7Xxjgsos="; }; - npmDepsHash = "sha256-uBsPaUvEiR5oCl8rZvpyNPXSB/Vlcx937lT4WqgekHI="; + npmDepsHash = "sha256-rOyvFA5X3o1TCgY54XxNSg0+QotA8IUauLngTtJuRj4="; # Needed for dependency `@homebridge/node-pty-prebuilt-multiarch` # On Darwin systems the build fails with, diff --git a/third_party/nixpkgs/pkgs/by-name/in/integresql/package.nix b/third_party/nixpkgs/pkgs/by-name/in/integresql/package.nix index 3741206239..409ef736d9 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/integresql/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/integresql/package.nix @@ -31,7 +31,7 @@ buildGoModule rec { homepage = "https://github.com/allaboutapps/integresql"; changelog = "https://github.com/allaboutapps/integresql/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "integresql"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/in/intune-portal/package.nix b/third_party/nixpkgs/pkgs/by-name/in/intune-portal/package.nix index 6e60df8bde..c517718244 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/intune-portal/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/intune-portal/package.nix @@ -23,11 +23,11 @@ }: stdenv.mkDerivation rec { pname = "intune-portal"; - version = "1.2402.12-jammy"; + version = "1.2404.23-jammy"; src = fetchurl { url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/${pname}/${pname}_${version}_amd64.deb"; - hash = "sha256-S5+Ddm13OJ4eQTQ9Q8OgsCqnpM6GxuZ1hEycZCy6//g="; + hash = "sha256-zAH35iF+3YpDNGo3UhmzL4pRJXlEhG1PaT71qnRtpAg="; }; nativeBuildInputs = [ dpkg ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ir/iredis/package.nix b/third_party/nixpkgs/pkgs/by-name/ir/iredis/package.nix index 6946abf507..5694ed44be 100644 --- a/third_party/nixpkgs/pkgs/by-name/ir/iredis/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ir/iredis/package.nix @@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/laixintao/iredis/blob/${src.rev}/CHANGELOG.md"; homepage = "https://iredis.xbin.io/"; license = licenses.bsd3; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; mainProgram = "iredis"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ir/ironbar/package.nix b/third_party/nixpkgs/pkgs/by-name/ir/ironbar/package.nix index 1576f06528..006eb00461 100644 --- a/third_party/nixpkgs/pkgs/by-name/ir/ironbar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ir/ironbar/package.nix @@ -1,63 +1,76 @@ -{ gtk3 -, gdk-pixbuf -, librsvg -, webp-pixbuf-loader -, gobject-introspection -, glib-networking -, glib -, shared-mime-info -, gsettings-desktop-schemas -, wrapGAppsHook -, gtk-layer-shell -, gnome -, libxkbcommon -, openssl -, pkg-config -, hicolor-icon-theme -, rustPlatform -, lib -, fetchFromGitHub +{ + gtk3, + gdk-pixbuf, + librsvg, + webp-pixbuf-loader, + gobject-introspection, + glib-networking, + glib, + shared-mime-info, + gsettings-desktop-schemas, + wrapGAppsHook3, + gtk-layer-shell, + gnome, + libxkbcommon, + openssl, + pkg-config, + hicolor-icon-theme, + rustPlatform, + lib, + fetchFromGitHub, + luajit, + luajitPackages, + libpulseaudio, + features ? [ ], }: +let + hasFeature = f: features == [ ] || builtins.elem f features; +in rustPlatform.buildRustPackage rec { pname = "ironbar"; - version = "0.14.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "ironbar"; rev = "v${version}"; - hash = "sha256-y4w4i/IVe1+wjB2tsCPQH6c7XTl93u45Q0pXFi3TY1E="; + hash = "sha256-TPbvKQdoGfZMzp+fl72vy6MtRV1yGcOG/es67VOA0xw="; }; - cargoHash = "sha256-h5yNJM+NvX/Hi86iSegHWevPcPZeDmJ4y/qNr3G20Qg="; + cargoHash = "sha256-+9R505xyEycv5Dav4ZCh1BiYRp3U1I9yBDqSPefo9uY="; - buildInputs = [ - gtk3 - gdk-pixbuf - glib - gtk-layer-shell - glib-networking - shared-mime-info - gnome.adwaita-icon-theme - hicolor-icon-theme - gsettings-desktop-schemas - libxkbcommon - openssl - ]; + buildInputs = + [ + gtk3 + gdk-pixbuf + glib + gtk-layer-shell + glib-networking + shared-mime-info + gnome.adwaita-icon-theme + hicolor-icon-theme + gsettings-desktop-schemas + libxkbcommon + ] + ++ lib.optionals (hasFeature "http") [ openssl ] + ++ lib.optionals (hasFeature "volume") [ libpulseaudio ] + ++ lib.optionals (hasFeature "cairo") [ luajit ]; nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; + propagatedBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ - gtk3 - ]; + runtimeDeps = [ luajitPackages.lgi ]; - preFixup = '' - gappsWrapperArgs+=( + buildNoDefaultFeatures = features != [ ]; + buildFeatures = features; + + gappsWrapperArgs = + '' # Thumbnailers --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" @@ -66,6 +79,15 @@ rustPlatform.buildRustPackage rec { # gtk-launch --suffix PATH : "${lib.makeBinPath [ gtk3 ]}" + '' + + lib.optionalString (hasFeature "cairo") '' + --prefix LUA_PATH : "./?.lua;${luajitPackages.lgi}/share/lua/5.1/?.lua;${luajitPackages.lgi}/share/lua/5.1/?/init.lua;${luajit}/share/lua/5.1/\?.lua;${luajit}/share/lua/5.1/?/init.lua" + --prefix LUA_CPATH : "./?.so;${luajitPackages.lgi}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/?.so;${luajit}/lib/lua/5.1/loadall.so" + ''; + + preFixup = '' + gappsWrapperArgs+=( + ${gappsWrapperArgs} ) ''; @@ -74,7 +96,11 @@ rustPlatform.buildRustPackage rec { description = "Customizable gtk-layer-shell wlroots/sway bar written in Rust"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ yavko donovanglover jakestanger ]; + maintainers = with maintainers; [ + yavko + donovanglover + jakestanger + ]; mainProgram = "ironbar"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/is/iscc/package.nix b/third_party/nixpkgs/pkgs/by-name/is/iscc/package.nix new file mode 100644 index 0000000000..1f3472d288 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/is/iscc/package.nix @@ -0,0 +1,63 @@ +{ stdenv +, fetchurl +, innoextract +, runtimeShell +, wineWow64Packages +, lib +}: + +let + version = "6.2.2"; + majorVersion = builtins.substring 0 1 version; +in +stdenv.mkDerivation rec { + pname = "iscc"; + inherit version; + src = fetchurl { + url = "https://files.jrsoftware.org/is/${majorVersion}/innosetup-${version}.exe"; + hash = "sha256-gRfRDQCirTOhOQl46jhyhhwzDgh5FEEKY3eyLExbhWM="; + }; + nativeBuildInputs = [ + innoextract + wineWow64Packages.stable + ]; + unpackPhase = '' + runHook preUnpack + innoextract $src + runHook postUnpack + ''; + dontBuild = true; + installPhase = '' + runHook preInstall + mkdir -p "$out/bin" + cp -r ./app/* "$out/bin" + + cat << 'EOF' > "$out/bin/${pname}" + #!${runtimeShell} + export PATH=${wineWow64Packages.stable}/bin:$PATH + export WINEDLLOVERRIDES="mscoree=" # disable mono + + # Solves PermissionError: [Errno 13] Permission denied: '/homeless-shelter/.wine' + export HOME=$(mktemp -d) + + wineInputFile=$(${wineWow64Packages.stable}/bin/wine winepath -w $1) + ${wineWow64Packages.stable}/bin/wine "$out/bin/ISCC.exe" "$wineInputFile" + EOF + + substituteInPlace $out/bin/${pname} \ + --replace "\$out" "$out" + + chmod +x "$out/bin/${pname}" + + runHook postInstall + ''; + + + meta = with lib; { + description = "A compiler for Inno Setup, a tool for creating Windows installers"; + homepage = "https://jrsoftware.org/isinfo.php"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ ]; + platforms = wineWow64Packages.stable.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ja/jailer/package.nix b/third_party/nixpkgs/pkgs/by-name/ja/jailer/package.nix new file mode 100644 index 0000000000..867d813b1f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ja/jailer/package.nix @@ -0,0 +1,83 @@ +{ + lib, + ant, + copyDesktopItems, + fetchFromGitHub, + jdk, + jre, + makeDesktopItem, + makeWrapper, + stdenv, + stripJavaArchivesHook, + wrapGAppsHook4, +}: +stdenv.mkDerivation (finalAttrs: { + name = "jailer"; + version = "16.1.4"; + + src = fetchFromGitHub { + owner = "Wisser"; + repo = "Jailer"; + rev = "dcde48b2e0c7b68cc1b6f73c80fde06fdf31fdc6"; + sha256 = "sha256-cPOWW2z44vCc/Fw1zYZUsYafgKr82e0g+K0Db5A9F5M="; + }; + + + buildPhase = '' + runHook preBuild + rm jailer.jar + ant + runHook postBuild + ''; + + nativeBuildInputs = [ ant jdk stripJavaArchivesHook makeWrapper wrapGAppsHook4 copyDesktopItems ]; + + installPhase = '' + runHook preInstall + + install -Dm644 jailer.jar $out/share/java/jailer.jar + install -Dm644 jailer-engine-${finalAttrs.version}.jar $out/share/java/ + mkdir -p $out/share/java/lib + for f in lib/*.jar; do + install -Dm644 $f $out/share/java/lib + done + + mkdir -p $out/bin + mkdir -p $out/share + mkdir -p $out/share/pixmaps + cp driverlist.csv $out/share + cp admin/jailer.png $out/share/pixmaps + + # On first run, create a local configuration folder and copy driverlist.csv there. + cat << EOF > $out/bin/jailer + #!/usr/bin/env bash + CFG="''${XDG_CONFIG_HOME:-\$HOME/.config}/jailer" + mkdir -p \$CFG + cp -n $out/share/driverlist.csv \$CFG + cd \$CFG + _JAVA_AWT_WM_NONREPARENTING=1 ${jre}/bin/java -jar $out/share/java/jailer.jar + EOF + chmod +x $out/bin/jailer + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Jailer"; + desktopName = "Jailer"; + exec = "jailer"; + icon = "jailer"; + categories = [ "Development" ]; + }) + ]; + + meta = { + description = "A tool for database subsetting and relational data browsing"; + license = lib.licenses.asl20; + homepage = "https://github.com/Wisser/Jailer"; + changelog = "https://github.com/Wisser/Jailer/releases/tag/${finalAttrs.version}"; + maintainers = with lib.maintainers; [ guillaumematheron ]; + mainProgram = "jailer"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix b/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix index 49b6f245f7..b397b06203 100644 --- a/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix @@ -5,10 +5,10 @@ let pname = "jan"; - version = "0.4.11"; + version = "0.4.12"; src = fetchurl { url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage"; - hash = "sha256-EDQK8W0MxwXSNaHx2snByHs2Wr3RXtlNiXajzDMVJpc="; + hash = "sha256-IMqTQGuMuivUq8UTpgNRSHwskxvA/2XWA1bp38MDJdI="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; @@ -17,7 +17,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/jan-${version} $out/bin/jan install -Dm444 ${appimageContents}/jan.desktop -t $out/share/applications substituteInPlace $out/share/applications/jan.desktop \ --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=jan' diff --git a/third_party/nixpkgs/pkgs/by-name/ja/jazz2/package.nix b/third_party/nixpkgs/pkgs/by-name/ja/jazz2/package.nix index 8db964b251..0bd4238bf2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ja/jazz2/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ja/jazz2/package.nix @@ -1,6 +1,5 @@ { cmake , fetchFromGitHub -, glfw , jazz2-content , lib , libopenmpt @@ -10,10 +9,8 @@ , stdenv , testers , zlib -, graphicsLibrary ? "GLFW" }: -assert lib.assertOneOf "graphicsLibrary" graphicsLibrary [ "SDL2" "GLFW" ]; stdenv.mkDerivation (finalAttrs: { pname = "jazz2"; version = "2.6.0"; @@ -28,16 +25,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./nocontent.patch ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ libopenmpt libvorbis openal zlib ] - ++ lib.optionals (graphicsLibrary == "GLFW") [ glfw ] - ++ lib.optionals (graphicsLibrary == "SDL2") [ SDL2 ]; + buildInputs = [ libopenmpt libvorbis openal SDL2 zlib ]; cmakeFlags = [ "-DLIBOPENMPT_INCLUDE_DIR=${lib.getDev libopenmpt}/include/libopenmpt" "-DNCINE_DOWNLOAD_DEPENDENCIES=OFF" "-DNCINE_OVERRIDE_CONTENT_PATH=${jazz2-content}" - ] ++ lib.optionals (graphicsLibrary == "GLFW") [ - "-DGLFW_INCLUDE_DIR=${glfw}/include/GLFW" ]; passthru.tests.version = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/by-name/je/jetbrains-toolbox/package.nix b/third_party/nixpkgs/pkgs/by-name/je/jetbrains-toolbox/package.nix index 6019ffed2b..653bd84517 100644 --- a/third_party/nixpkgs/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -9,11 +9,11 @@ }: let pname = "jetbrains-toolbox"; - version = "2.2.3.20090"; + version = "2.3.1.31116"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-SqxQF5pG61CySsDzdZ1P2C9cCe/B145D0S+T4NByif8="; + sha256 = "sha256-mrTeUp9DBSO1S6Nxx077lqtY847CiCBCCi/vboZ8ADs="; stripRoot = false; }; @@ -35,7 +35,6 @@ let appimage = appimageTools.wrapAppImage { inherit pname version; src = appimageContents; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs); }; in stdenv.mkDerivation { @@ -47,7 +46,7 @@ stdenv.mkDerivation { runHook preInstall install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg - makeWrapper ${appimage}/bin/${pname}-${version} $out/bin/${pname} \ + makeWrapper ${appimage}/bin/${pname} $out/bin/${pname} \ --append-flags "--update-failed" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [icu]} diff --git a/third_party/nixpkgs/pkgs/by-name/ji/jigmo/package.nix b/third_party/nixpkgs/pkgs/by-name/ji/jigmo/package.nix index 18c84916db..ef70e0d5d7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ji/jigmo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ji/jigmo/package.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { description = "Japanese Kanji font set which is the official successor to Hanazono Mincho"; homepage = "https://kamichikoichi.github.io/jigmo/"; license = licenses.cc0; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ji/jikken/package.nix b/third_party/nixpkgs/pkgs/by-name/ji/jikken/package.nix new file mode 100644 index 0000000000..9b51b96ac2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ji/jikken/package.nix @@ -0,0 +1,44 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + pkg-config, + openssl, + stdenv, + darwin, +}: +rustPlatform.buildRustPackage rec { + pname = "jikken"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "jikkenio"; + repo = "jikken"; + rev = "v${version}"; + hash = "sha256-bV9NjwTcX1euk8zRJMGkAULegQmiT8z4jxngOwOPr+M="; + }; + + cargoHash = "sha256-gJg/l7L19qk6DELqo4fYc2ZWTHqKeUFEF3YU3+uyFjQ="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A powerful, source control friendly REST API testing toolkit"; + homepage = "https://jikken.io/"; + changelog = "https://github.com/jikkenio/jikken/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ vinnymeller ]; + mainProgram = "jk"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/jn/jnv/package.nix b/third_party/nixpkgs/pkgs/by-name/jn/jnv/package.nix index 9fe979bad4..740a536be0 100644 --- a/third_party/nixpkgs/pkgs/by-name/jn/jnv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/jn/jnv/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "jnv"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "ynqa"; repo = "jnv"; rev = "v${version}"; - hash = "sha256-CdpEo8hnO61I2Aocfd3nka81FTDPRguwxxcemzH+zcc="; + hash = "sha256-IvpbVcTGGD7cn59SPlcqMuu9YXB3ur3AFaoWDVADoqI="; }; - cargoHash = "sha256-KF15Y2VrFJ7p5ut5cR80agaJ7bM9U9Ikcz1Ux8Ah138="; + cargoHash = "sha256-dqWQi0DYl2P1qPzmtYOcarnfu2bfSnLk/SVQq5d+Z8Y="; nativeBuildInputs = [ autoconf diff --git a/third_party/nixpkgs/pkgs/by-name/js/jsoncons/package.nix b/third_party/nixpkgs/pkgs/by-name/js/jsoncons/package.nix index 57908ded4a..0e40d8935b 100644 --- a/third_party/nixpkgs/pkgs/by-name/js/jsoncons/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/js/jsoncons/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jsoncons"; - version = "0.173.4"; + version = "0.175.0"; src = fetchFromGitHub { owner = "danielaparker"; repo = "jsoncons"; rev = "v${finalAttrs.version}"; - hash = "sha256-Mf3kvfYAcwNrwbvGyMP6PQmk5e5Mz7b0qCZ6yi95ksk="; + hash = "sha256-pLOKgZx3f0Jka0Tm3SBC1JlQ2Rc3ViPgmXRbjgF4UXI="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/by-name/jt/jtdx/package.nix b/third_party/nixpkgs/pkgs/by-name/jt/jtdx/package.nix new file mode 100644 index 0000000000..a058c52c15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/jt/jtdx/package.nix @@ -0,0 +1,16 @@ +{ wsjtx, fetchgit, qt5, lib }: +wsjtx.overrideAttrs (old: { + name = "jtdx"; + version = "unstable-2022-03-01"; + src = fetchgit { + url = "https://github.com/jtdx-project/jtdx.git"; + rev = "2a0e2bea8c66c9ca94d2ea8034cf83a68cfa40eb"; + hash = "sha256-5KlFBlzG3hKFFGO37c+VN+FvZKSnTQXvSorB+Grns8w="; + }; + buildInputs = old.buildInputs ++ [ qt5.qtwebsockets ]; + meta = { + description = "wsjtx fork with some extra features"; + maintainers = with lib.maintainers; [ matthewcroughan sarcasticadmin pkharvey ]; + homepage = "https://github.com/jtdx-project/jtdx"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ju/just/package.nix b/third_party/nixpkgs/pkgs/by-name/ju/just/package.nix index c613853ef3..d635d1271a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ju/just/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ju/just/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.25.2"; + version = "1.26.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-w7tHLjIFnlvyuTw5yG6zxJtQ7oDNdKRXHIRKY638vTo="; + hash = "sha256-jPVvKxTHTOFkjpTsnjy9/IxQtHLgv1fInKA6knKUmu8="; }; - cargoHash = "sha256-VL2uNbEtqOv3xmLukhdCmo3lrfx5yFwOAMGwgBlgAVw="; + cargoHash = "sha256-ssZ5JxOd0XVs4hsvnSz1IvtKE7ftEKX3nN2B8SsMesw="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/servers/kanidm/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix similarity index 79% rename from third_party/nixpkgs/pkgs/servers/kanidm/default.nix rename to third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix index 57a235da05..8a4f0416da 100644 --- a/third_party/nixpkgs/pkgs/servers/kanidm/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix @@ -5,6 +5,7 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, nix-update-script , pkg-config , udev , openssl @@ -19,23 +20,16 @@ let in rustPlatform.buildRustPackage rec { pname = "kanidm"; - version = "1.1.0-rc.16"; + version = "1.2.0"; src = fetchFromGitHub { owner = pname; repo = pname; - # Latest revision of 1.1.0-rc.16 stable branch - rev = "e51d0dee44ecabbf7be9e855753453bb2f61cced"; - hash = "sha256-YgrlmSrjOzn/oFWmYy/71xwcq53lJbmiLIFzn2sIFAk="; + rev = "refs/tags/v${version}"; + hash = "sha256-Clg9jQgKvWP9LniHmNq+WjRmEOzJGfuCU2K9ActZhzo="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "base64urlsafedata-0.1.3" = "sha256-lYVWuKqF4c34LpFmTIg98TEXIlP4dHen0XkGnLOiq8Q="; - "sshkeys-0.3.2" = "sha256-CNG9HW8kSwezAdIYW+CR5rqFfmuso4R0+m4OpIyXbSM="; - }; - }; + cargoHash = "sha256-m3H2mQm+k6vFH+nP+hWl07Z7NJKJlt1E4eRDRA2Z0+o="; KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; @@ -87,7 +81,13 @@ rustPlatform.buildRustPackage rec { mv $out/lib/libpam_kanidm.so $out/lib/pam_kanidm.so ''; - passthru.tests = { inherit (nixosTests) kanidm; }; + passthru = { + tests = { + inherit (nixosTests) kanidm; + }; + + updateScript = nix-update-script { }; + }; meta = with lib; { changelog = "https://github.com/kanidm/kanidm/releases/tag/v${version}"; @@ -95,6 +95,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kanidm/kanidm"; license = licenses.mpl20; platforms = platforms.linux; - maintainers = with maintainers; [ erictapen Flakebi ]; + maintainers = with maintainers; [ adamcstephens erictapen Flakebi ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix b/third_party/nixpkgs/pkgs/by-name/ka/karmor/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix rename to third_party/nixpkgs/pkgs/by-name/ka/karmor/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/ka/katriawm/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/katriawm/package.nix index 85116255e2..7e8817a9e8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ka/katriawm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ka/katriawm/package.nix @@ -1,10 +1,12 @@ -{ lib -, stdenv -, fetchzip -, libX11 -, libXft -, libXrandr -, pkg-config +{ + lib, + stdenv, + fetchzip, + libX11, + libXft, + libXrandr, + pkg-config, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { @@ -16,9 +18,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-IWviLboZz421/Amz/QG4o8jYaG8Y/l5PvmvXfK5nzJE="; }; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 @@ -26,11 +26,17 @@ stdenv.mkDerivation (finalAttrs: { libXrandr ]; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; strictDeps = true; - makeFlags = [ "-C" "src" ]; + makeFlags = [ + "-C" + "src" + ]; installFlags = [ "prefix=$(out)" ]; @@ -39,6 +45,11 @@ stdenv.mkDerivation (finalAttrs: { --replace pkg-config "$PKG_CONFIG" ''; + passthru.updateScript = gitUpdater { + url = "https://www.uninformativ.de/git/katriawm.git/"; + rev-prefix = "v"; + }; + meta = { homepage = "https://www.uninformativ.de/git/katriawm/file/README.html"; description = "A non-reparenting, dynamic window manager with decorations"; diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kchat/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kchat/package.nix index bb806d5aa0..1eaf7650b6 100644 --- a/third_party/nixpkgs/pkgs/by-name/kc/kchat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kc/kchat/package.nix @@ -23,7 +23,7 @@ appimageTools.wrapType2 rec { cp -r ${contents}/{locales,resources} "$out/share/lib/kchat" cp -r ${contents}/usr/* "$out" cp "${contents}/kchat-desktop.desktop" "$out/share/applications/" - mv "$out/bin/kchat-${version}" "$out/bin/${meta.mainProgram}" + mv "$out/bin/kchat" "$out/bin/${meta.mainProgram}" || true substituteInPlace $out/share/applications/kchat-desktop.desktop --replace 'Exec=AppRun' 'Exec=${meta.mainProgram}' ''; diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kcl-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kcl-cli/package.nix index 5a8dfc9e4d..a6aa42ead1 100644 --- a/third_party/nixpkgs/pkgs/by-name/kc/kcl-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kc/kcl-cli/package.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "kcl-cli"; - version = "0.8.6"; + version = "0.8.8"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "cli"; rev = "v${version}"; - hash = "sha256-A98Y5ktXFwn1XrFTwL8l04VW5zPNcMLtZCUf+niXx6c="; + hash = "sha256-Bk/sCNMDupdY/YyKT+VoPIzEfjFDa5z9pevcCPnTX8U="; }; - vendorHash = "sha256-zFTcwyK5HT1cwfHJB3n5Eh2JE3xuXqAluU3McA+FurQ="; + vendorHash = "sha256-Xv8Tfq9Kb1xGFCWZQwBFDX9xZW9j99td/DUb7jBtkpE="; ldflags = [ "-X=kcl-lang.io/cli/pkg/version.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/kd/kdotool/package.nix b/third_party/nixpkgs/pkgs/by-name/kd/kdotool/package.nix new file mode 100644 index 0000000000..f6c8f77cea --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kd/kdotool/package.nix @@ -0,0 +1,30 @@ +{ lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + dbus +}: + +rustPlatform.buildRustPackage rec { + version = "0.2.1"; + pname = "kdotool"; + + src = fetchFromGitHub { + owner = "jinliu"; + repo = "kdotool"; + rev = "v${version}"; + hash = "sha256-ogdZziNV4b3h9LiEyWFrD/I/I4k8Z5rNFTNjQpWBQtg="; + }; + + cargoHash = "sha256-pL5vLfNWsZi75mI5K/PYVmgHTPCyIKpQY0YU2CJABN8="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dbus ]; + + meta = with lib; { + description = "xdotool-like for KDE Wayland"; + homepage = "https://github.com/jinliu/kdotool"; + license = licenses.asl20; + maintainers = with maintainers; [ kotatsuyaki ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ke/keto/package.nix b/third_party/nixpkgs/pkgs/by-name/ke/keto/package.nix new file mode 100644 index 0000000000..8f50762bfe --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ke/keto/package.nix @@ -0,0 +1,45 @@ +{ + fetchFromGitHub, + buildGoModule, + lib, +}: +let + pname = "keto"; + version = "0.13.0-alpha.0"; + commit = "c75695837f170334b526359f28967aa33d61bce6"; +in +buildGoModule { + inherit pname version commit; + + src = fetchFromGitHub { + owner = "ory"; + repo = "keto"; + rev = "v${version}"; + sha256 = "sha256-0yylaaXogN2HWXY8Tb7ScN4jdyeHecJ0gBYlVvcwaNE="; + }; + + vendorHash = "sha256-lgwV4Ysjmd9e850Rf5c0wSZtMW3U34/piwwG7dQEUV4="; + + tags = [ + "sqlite" + "json1" + "hsm" + ]; + + subPackages = [ "." ]; + + # Pass versioning information via ldflags + ldflags = [ + "-s" + "-w" + "-X github.com/ory/keto/internal/driver/config.Version=${version}" + "-X github.com/ory/keto/internal/driver/config.Commit=${commit}" + ]; + + meta = { + description = "ORY Keto, the open source access control server"; + homepage = "https://www.ory.sh/keto/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mrmebelman ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ke/keydb/package.nix b/third_party/nixpkgs/pkgs/by-name/ke/keydb/package.nix index 3fc085b40a..3be46ff770 100644 --- a/third_party/nixpkgs/pkgs/by-name/ke/keydb/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ke/keydb/package.nix @@ -18,14 +18,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "keydb"; version = "6.3.4"; src = fetchFromGitHub { owner = "snapchat"; repo = "keydb"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-j6qgK6P3Fv+b6k9jwKQ5zW7XLkKbXXcmHKBCQYvwEIU="; }; @@ -94,13 +94,13 @@ stdenv.mkDerivation rec { passthru.tests.redis = nixosTests.redis; passthru.serverBin = "keydb-server"; - meta = with lib; { + meta = { homepage = "https://keydb.dev"; description = "A Multithreaded Fork of Redis"; - license = licenses.bsd3; - platforms = platforms.all; - changelog = "https://github.com/Snapchat/KeyDB/raw/v${version}/00-RELEASENOTES"; - maintainers = teams.helsinki-systems.members; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + changelog = "https://github.com/Snapchat/KeyDB/raw/v${finalAttrs.version}/00-RELEASENOTES"; + maintainers = lib.teams.helsinki-systems.members; mainProgram = "keydb-cli"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ki/ki/package.nix b/third_party/nixpkgs/pkgs/by-name/ki/ki/package.nix new file mode 100644 index 0000000000..549f60acd8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ki/ki/package.nix @@ -0,0 +1,69 @@ +{ lib +, fetchFromGitHub +, python3Packages +, cmake +, anki +}: + +python3Packages.buildPythonApplication rec { + pname = "ki"; + version = "0-unstable-2023-11-08"; + + pyproject = true; + + disabled = python3Packages.pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "langfield"; + repo = pname; + rev = "eb32fbd3229dc1a60bcc76a937ad63f3eb869f65"; + sha256 = "sha256-5mQhJhvJQC9835goL3t3DRbD+c4P3KxnOflxvqmxL58="; + }; + + patches = [ + ./update-to-newer-anki-versions.patch + ./replace-deprecated-distutils-with-setuptools.patch + ]; + + nativeBuildInputs = [ cmake ]; + + propagatedBuildInputs = with python3Packages; [ + beartype + click + colorama + git-filter-repo + gitpython + lark + tqdm + whatthepatch + ] ++ [ + anki + ]; + + nativeCheckInputs = with python3Packages; [ + bitstring + checksumdir + gitpython + loguru + pytest-mock + pytestCheckHook + ]; + + disabledTests = [ + # requires git to not be in path, but git is needed for other tests + "test_clone_cleans_up_on_error" + "test_clone_clean_up_preserves_directories_that_exist_a_priori" + ]; + + dontCheckRuntimeDeps = true; + + # CMake needs to be run by pyproject rather than by its hook + dontConfigure = true; + + meta = with lib; { + description = "Version control for Anki collections"; + homepage = "https://github.com/langfield/ki"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ eljamm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ki/ki/replace-deprecated-distutils-with-setuptools.patch b/third_party/nixpkgs/pkgs/by-name/ki/ki/replace-deprecated-distutils-with-setuptools.patch new file mode 100644 index 0000000000..0a47f1a731 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ki/ki/replace-deprecated-distutils-with-setuptools.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_integration.py b/tests/test_integration.py +index 93d3661..ef24fca 100644 +--- a/tests/test_integration.py ++++ b/tests/test_integration.py +@@ -7,7 +7,7 @@ import sqlite3 + import tempfile + import subprocess + from pathlib import Path +-from distutils.dir_util import copy_tree ++from setuptools._distutils.dir_util import copy_tree + from importlib.metadata import version + + import git diff --git a/third_party/nixpkgs/pkgs/by-name/ki/ki/update-to-newer-anki-versions.patch b/third_party/nixpkgs/pkgs/by-name/ki/ki/update-to-newer-anki-versions.patch new file mode 100644 index 0000000000..e0f8549f12 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ki/ki/update-to-newer-anki-versions.patch @@ -0,0 +1,141 @@ +diff --git a/ki/__init__.py b/ki/__init__.py +index 3f29c1a..f4ad950 100644 +--- a/ki/__init__.py ++++ b/ki/__init__.py +@@ -1321,7 +1321,7 @@ def _clone1(collection: str, directory: str = "") -> git.Repo: + try: + col = M.collection(col_file) + _, _ = _clone2(col, targetdir, msg="Initial commit", silent=False) +- col.close(save=False) ++ col.close() + kirepo: KiRepo = M.kirepo(targetdir) + kirepo.repo.create_tag(LCA) + kirepo.repo.close() +@@ -1404,11 +1404,11 @@ def _pull1() -> None: + hashes = list(filter(lambda l: l != "", hashes)) + if md5sum in hashes[-1]: + echo("ki pull: up to date.") +- col.close(save=False) ++ col.close() + return + + col = _pull2(kirepo, col) +- col.close(save=False) ++ col.close() + + + @beartype +@@ -1545,7 +1545,7 @@ def _push() -> PushResult: + # If there are no changes, quit. + if len(set(deltas)) == 0: + echo("ki push: up to date.") +- col.close(save=False) ++ col.close() + return PushResult.UP_TO_DATE + + echo(f"Pushing to '{kirepo.col_file}'") +@@ -1603,7 +1603,7 @@ def write_collection( + do(warn, F.cat(map(push_note(tempcol, timestamp_ns, guids, new_nids), decknotes))) + + # It is always safe to save changes to the DB, since the DB is a copy. +- tempcol.close(save=True) ++ tempcol.close() + + # Backup collection file and overwrite collection. + backup(kirepo) +@@ -1621,7 +1621,7 @@ def write_collection( + renames = filter(lambda a: a.file.name != a.new_name, map(addmedia(col), mbytes)) + warnings = map(lambda r: RenamedMediaFileWarning(r.file.name, r.new_name), renames) + do(warn, warnings) +- col.close(save=True) ++ col.close() + + # Append and commit collection checksum to hashes file. + append_md5sum(kirepo.ki, kirepo.col_file.name, F.md5(kirepo.col_file)) +diff --git a/tests/test_integration.py b/tests/test_integration.py +index e046b8c..93d3661 100644 +--- a/tests/test_integration.py ++++ b/tests/test_integration.py +@@ -320,7 +320,7 @@ def test_clone_generates_deck_tree_correctly(): + # Create empty decks. + col = opencol(a) + do(col.decks.id, [":a:::b:", "blank::blank", "blank::Hello"]) +- col.close(save=True) ++ col.close() + + os.chdir(F.mkdtemp()) + clone(a) +@@ -401,7 +401,7 @@ def test_clone_writes_media_files(): + a: File = mkcol([("Basic", ["Default"], 1, ["a", "b[sound:1sec.mp3]"])]) + col = opencol(a) + col.media.add_file(DATA / "media/1sec.mp3") +- col.close(save=True) ++ col.close() + clone(a) + assert (Path(MEDIA) / "1sec.mp3").is_file() + +@@ -883,7 +883,7 @@ def test_push_writes_media(): + write_basic("Default", ("air", '')) + col = opencol(a) + col.media.add_file(DATA / "media/bullhorn-lg.png") +- col.close(save=True) ++ col.close() + F.commitall(repo, ".") + repo.close() + out = push() +@@ -987,7 +987,7 @@ def test_push_doesnt_unnecessarily_deduplicate_notetypes(): + + col = opencol(a) + models = col.models.all_names_and_ids() +- col.close(save=False) ++ col.close() + + # Remove a note. + assert os.path.isfile("Default/a.md") +@@ -1012,7 +1012,7 @@ def test_push_doesnt_unnecessarily_deduplicate_notetypes(): + + col = opencol(a) + assert len(models) == len(col.models.all_names_and_ids()) +- col.close(save=False) ++ col.close() + + + def test_push_is_nontrivial_when_pushed_changes_are_reverted_in_repository(): +diff --git a/tests/test_ki.py b/tests/test_ki.py +index 5270b56..e5f3297 100644 +--- a/tests/test_ki.py ++++ b/tests/test_ki.py +@@ -482,7 +482,7 @@ def mkcol(ns: List[NoteSpec]) -> File: + file = F.touch(F.mkdtemp(), "a.anki2") + col = opencol(file) + do(addnote(col), ns) +- col.close(save=True) ++ col.close() + return F.chk(file) + + +@@ -491,7 +491,7 @@ def rm(f: File, nid: int) -> File: + """Remove note with given `nid`.""" + col = opencol(f) + col.remove_notes([nid]) +- col.close(save=True) ++ col.close() + return f + + +@@ -514,7 +514,7 @@ def edit(f: File, spec: NoteSpec) -> File: + """Edit a note with specified nid.""" + col = opencol(f) + editnote(col, spec) +- col.close(save=True) ++ col.close() + return f + + +@@ -531,7 +531,7 @@ def editcol( + do(addnote(col), adds) + do(editnote(col), edits) + col.remove_notes(deletes) +- col.close(save=True) ++ col.close() + return f diff --git a/third_party/nixpkgs/pkgs/by-name/ki/kittysay/package.nix b/third_party/nixpkgs/pkgs/by-name/ki/kittysay/package.nix index 27433adcc9..df36247ead 100644 --- a/third_party/nixpkgs/pkgs/by-name/ki/kittysay/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ki/kittysay/package.nix @@ -3,7 +3,7 @@ rustPlatform, fetchFromGitHub, }: let - version = "0.5.0"; + version = "0.6.0"; in rustPlatform.buildRustPackage { pname = "kittysay"; @@ -13,10 +13,10 @@ in owner = "uncenter"; repo = "kittysay"; rev = "v${version}"; - sha256 = "sha256-eOcHrEvU3nBKFokwE8CyDOUYoBA1+gBlnl7VRUuoFfE="; + sha256 = "sha256-dJpbRPrpilaOFVPjAESk4DyZtH/hJm16p6pMRqrzOk4="; }; - cargoHash = "sha256-dVgPp5jY3ii8mO/HLTDESQzQyZXzqut8Bjm2KfWD0+U="; + cargoHash = "sha256-r1xdMczqVyX7ZPjkyDdgVW3BFOeKOw1Dp6mGHb2XzrM="; meta = { description = "Cowsay, but with a cute kitty :3"; diff --git a/third_party/nixpkgs/pkgs/by-name/km/kmeet/package.nix b/third_party/nixpkgs/pkgs/by-name/km/kmeet/package.nix index 8c928e4341..287a746163 100644 --- a/third_party/nixpkgs/pkgs/by-name/km/kmeet/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/km/kmeet/package.nix @@ -23,7 +23,7 @@ appimageTools.wrapType2 rec { cp -r ${contents}/{locales,resources} "$out/share/lib/kmeet" cp -r ${contents}/usr/* "$out" cp "${contents}/kMeet.desktop" "$out/share/applications/" - mv "$out/bin/kmeet-${version}" "$out/bin/${meta.mainProgram}" + mv "$out/bin/kmeet" "$out/bin/${meta.mainProgram}" || true substituteInPlace $out/share/applications/kMeet.desktop --replace 'Exec=AppRun' 'Exec=${meta.mainProgram}' ''; diff --git a/third_party/nixpkgs/pkgs/by-name/ko/komac/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/komac/package.nix index 3a87faa3c4..b15fc902b2 100644 --- a/third_party/nixpkgs/pkgs/by-name/ko/komac/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ko/komac/package.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchFromGitHub +, pkg-config +, openssl , rustPlatform , darwin , testers @@ -8,12 +10,12 @@ }: let - version = "2.1.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "russellbanks"; repo = "Komac"; rev = "v${version}"; - hash = "sha256-L8UYpNqjRyqf4hPQwD9LaXWu6jYaP34yTwTxcqg+e2U="; + hash = "sha256-dPX8/JUQ+vugd+M/jIjBf4/sNbac0FVQ0obhyAAGI84="; }; in rustPlatform.buildRustPackage { @@ -21,9 +23,13 @@ rustPlatform.buildRustPackage { pname = "komac"; - cargoHash = "sha256-J4QZzbyDr4SDt6LlAy9ZdpqgIufZCZHmOC9eu70wMsM="; + cargoHash = "sha256-CDPN90X3m/9FRLolAVCIcAuajZbB5OAgLcFXq2ICS8g="; - buildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + + buildInputs = lib.optionals stdenv.isLinux [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ko/konbucase/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/konbucase/package.nix index 56a977eeeb..a846bc775a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ko/konbucase/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ko/konbucase/package.nix @@ -5,7 +5,7 @@ , ninja , vala , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , pantheon , gtksourceview5 }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ninja vala pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/fix-isdev.patch b/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/fix-isdev.patch new file mode 100644 index 0000000000..956cb2042f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/fix-isdev.patch @@ -0,0 +1,13 @@ +diff --git a/main.js b/main.js +index a4b5c8ef..743d63ca 100644 +--- a/main.js ++++ b/main.js +@@ -8,7 +8,7 @@ const { + nativeTheme, + } = require("electron"); + const path = require("path"); +-const isDev = require("electron-is-dev"); ++const isDev = false; + const Store = require("electron-store"); + const store = new Store(); + const fs = require("fs"); diff --git a/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/mime-types.xml b/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/mime-types.xml new file mode 100644 index 0000000000..46b70db743 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/mime-types.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/package.json b/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/package.json new file mode 100644 index 0000000000..5c8f5140d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/package.json @@ -0,0 +1,312 @@ +{ + "name": "koodo-reader", + "main": "main.js", + "version": "1.6.6", + "description": "A cross-platform ebook reader", + "author": { + "name": "App by Troye", + "email": "support@960960.xyz" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=6.0.0" + }, + "repository": "https://github.com/koodo-reader/koodo-reader", + "private": false, + "resolutions": { + "//": "See https://github.com/facebook/create-react-app/issues/11773", + "react-error-overlay": "6.0.9" + }, + "dependencies": { + "@aws-sdk/client-s3": "^3.485.0", + "adm-zip": "^0.5.2", + "axios": "^0.19.2", + "buffer": "^6.0.3", + "copy-text-to-clipboard": "^2.2.0", + "dompurify": "^3.0.1", + "electron-is-dev": "^1.1.0", + "electron-store": "^8.0.1", + "font-list": "^1.4.5", + "fs-extra": "^9.1.0", + "ftp": "^0.3.10", + "howler": "^2.2.3", + "iconv-lite": "^0.6.3", + "qs": "^6.11.2", + "react-hot-toast": "^2.1.1", + "react-tooltip": "^5.26.3", + "ssh2-sftp-client": "^9.1.0", + "webdav": "^3.6.2", + "wink-lemmatizer": "^3.0.4", + "ws": "^8.13.0", + "zip-a-folder": "^0.0.12" + }, + "devDependencies": { + "@types/i18next": "^13.0.0", + "@types/iconv-lite": "^0.0.1", + "@types/node": "^13.13.2", + "@types/react": "17.0.2", + "@types/react-dom": "17.0.2", + "@types/react-i18next": "^8.1.0", + "@types/react-lottie": "^1.2.5", + "@types/react-redux": "^7.1.7", + "@types/react-router-dom": "^5.1.6", + "@types/spark-md5": "^3.0.2", + "@types/ws": "^8.5.5", + "classnames": "^2.2.6", + "concurrently": "^5.0.1", + "cross-env": "^6.0.3", + "electron": "14.1.1", + "electron-builder": "^23.6.0", + "hard-source-webpack-plugin": "^0.13.1", + "html-react-parser": "^0.13.0", + "i18next": "^20.2.4", + "node-sass": "^9.0.0", + "nodemon": "^2.0.6", + "rc-color-picker": "^1.2.6", + "react": "^17.0.2", + "react-device-detect": "^1.12.1", + "react-dom": "^17.0.2", + "react-dropzone": "^11.3.0", + "react-i18next": "^13.2.2", + "react-lottie": "^1.2.3", + "react-redux": "^7.2.0", + "react-router-dom": "^5.2.0", + "react-scripts": "^5.0.1", + "redux": "^4.0.5", + "redux-thunk": "^2.3.0", + "sass-loader": "^13.3.2", + "source-map-explorer": "^2.5.2", + "spark-md5": "^3.0.1", + "typescript": "3.8.3", + "wait-on": "^7.0.1" + }, + "scripts": { + "analyze": "source-map-explorer 'build/static/js/*.js'", + "start": "react-scripts start", + "build": "react-scripts build", + "test": "react-scripts test", + "eject": "react-scripts eject", + "ele": "electron .", + "dev": "concurrently \"cross-env BROWSER=none npm start\" \"wait-on http://127.0.0.1:3000/ && nodemon --watch main.js --exec electron .\"", + "release": "electron-builder", + "prerelease": "react-scripts build" + }, + "homepage": "./", + "build": { + "appId": "xyz.960960.koodo", + "productName": "Koodo Reader", + "copyright": "Copyright (c) 2021-2022 ${author}", + "files": [ + "build/**/*", + "node_modules/**/*", + "package.json", + "main.js", + "edge-tts.js" + ], + "directories": { + "buildResources": "assets" + }, + "publish": { + "provider": "github", + "repo": "koodo-reader", + "owner": "koodo-reader" + }, + "buildDependenciesFromSource": false, + "nodeGypRebuild": false, + "fileAssociations": [ + { + "ext": "epub", + "icon": "assets/icons/epub", + "role": "Viewer", + "mimeType": "application/epub+zip" + }, + { + "ext": "pdf", + "icon": "assets/icons/pdf", + "role": "Viewer", + "mimeType": "application/pdf" + }, + { + "ext": "mobi", + "icon": "assets/icons/mobi", + "role": "Viewer", + "mimeType": "application/x-mobipocket-ebook" + }, + { + "ext": "azw3", + "icon": "assets/icons/azw3", + "role": "Viewer", + "mimeType": "application/vnd.amazon.ebook" + }, + { + "ext": "azw", + "icon": "assets/icons/azw3", + "role": "Viewer", + "mimeType": "application/vnd.amazon.ebook" + }, + { + "ext": "cbz", + "icon": "assets/icons/comic", + "role": "Viewer", + "mimeType": "application/x-cbz" + }, + { + "ext": "cbr", + "icon": "assets/icons/comic", + "role": "Viewer", + "mimeType": "application/x-cbr" + }, + { + "ext": "cbt", + "icon": "assets/icons/comic", + "role": "Viewer", + "mimeType": "application/x-cbt" + }, + { + "ext": "cb7", + "icon": "assets/icons/comic", + "role": "Viewer", + "mimeType": "application/x-cb7" + }, + { + "ext": "fb2", + "icon": "assets/icons/fb2", + "role": "Viewer", + "mimeType": "application/x-fictionbook+xml" + } + ], + "extends": null, + "dmg": { + "contents": [ + { + "x": 410, + "y": 150, + "type": "link", + "path": "/Applications" + }, + { + "x": 130, + "y": 150, + "type": "file" + } + ] + }, + "mac": { + "target": [ + { + "target": "dmg", + "arch": [ + "x64", + "arm64" + ] + } + ], + "icon": "assets/icons/icon.icns", + "category": "public.app-category.productivity", + "artifactName": "${productName}-${version}-${arch}.${ext}" + }, + "win": { + "target": [ + { + "target": "nsis", + "arch": [ + "x64" + ] + }, + { + "target": "zip", + "arch": [ + "x64", + "ia32", + "arm64" + ] + }, + { + "target": "portable", + "arch": [ + "x64" + ] + } + ], + "icon": "assets/icons/icon.ico", + "artifactName": "${productName}-${version}-${arch}-Win.${ext}", + "publisherName": "App by Troye" + }, + "linux": { + "icon": "assets/icons", + "category": "Office", + "target": [ + { + "target": "snap", + "arch": [ + "x64" + ] + }, + { + "target": "deb", + "arch": [ + "arm64", + "ia32", + "x64" + ] + }, + { + "target": "rpm", + "arch": [ + "x64" + ] + }, + { + "target": "AppImage", + "arch": [ + "arm64", + "ia32", + "x64" + ] + } + ], + "artifactName": "${productName}-${version}-${arch}.${ext}" + }, + "portable": { + "artifactName": "${productName}-${version}-Portable.${ext}" + }, + "nsis": { + "artifactName": "${productName}-${version}.${ext}", + "oneClick": false, + "allowToChangeInstallationDirectory": true, + "include": "assets/windows/installer.nsh" + }, + "snap": { + "publish": [ + { + "provider": "github" + } + ] + } + }, + "eslintConfig": { + "extends": "react-app" + }, + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] + }, + "babel": { + "presets": [ + "react-app" + ], + "plugins": [ + [ + "react-hot-loader/babel" + ] + ] + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/package.nix new file mode 100644 index 0000000000..059dfeda02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/package.nix @@ -0,0 +1,133 @@ +{ + lib, + stdenv, + mkYarnPackage, + fetchFromGitHub, + applyPatches, + fetchYarnDeps, + makeDesktopItem, + copyDesktopItems, + makeWrapper, + wrapGAppsHook3, + electron, +}: + +mkYarnPackage rec { + pname = "koodo-reader"; + version = "1.6.6"; + + src = applyPatches { + src = fetchFromGitHub { + owner = "troyeguo"; + repo = "koodo-reader"; + rev = "v${version}"; + hash = "sha256-g2bVm8LFeEIPaWlaxzMI0SrpM+79zQFzJ7Vs5CbWBT4="; + }; + patches = [ ./update-react-i18next.patch ]; # Could be upstreamed + }; + + # should be copied from `koodo-reader.src` + packageJSON = ./package.json; + + patches = [ ./fix-isdev.patch ]; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-VvYkotVb74zR9+/IWiQwOX/6RJf+xukpi7okRovfVzc="; + }; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + wrapGAppsHook3 + ]; + + dontWrapGApps = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + configurePhase = '' + runHook preConfigure + + cp -r $node_modules node_modules + chmod +w node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + yarn --offline build + yarn --offline run electron-builder --dir \ + -c.electronDist=${electron}/libexec/electron \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 assets/icons/256x256.png $out/share/icons/hicolor/256x256/apps/koodo-reader.png + install -Dm644 ${./mime-types.xml} $out/share/mime/packages/koodo-reader.xml + + mkdir -p $out/share/lib/koodo-reader + cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/lib/koodo-reader + + runHook postInstall + ''; + + # we use makeShellWrapper instead of the makeBinaryWrapper provided by wrapGAppsHook for proper shell variable expansion + postFixup = '' + makeShellWrapper ${electron}/bin/electron $out/bin/koodo-reader \ + --add-flags $out/share/lib/koodo-reader/resources/app.asar \ + "''${gappsWrapperArgs[@]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --inherit-argv0 + ''; + + doDist = false; + + desktopItems = [ + (makeDesktopItem { + name = "koodo-reader"; + desktopName = "Koodo Reader"; + exec = "koodo-reader %U"; + icon = "koodo-reader"; + comment = meta.description; + categories = [ "Office" ]; + mimeTypes = [ + "application/epub+zip" + "application/pdf" + "image/vnd.djvu" + "application/x-mobipocket-ebook" + "application/vnd.amazon.ebook" + "application/vnd.amazon.ebook" + "application/x-cbz" + "application/x-cbr" + "application/x-cbt" + "application/x-cb7" + "application/x-fictionbook+xml" + ]; + startupWMClass = "Koodo Reader"; + terminal = false; + }) + ]; + + meta = { + broken = stdenv.isDarwin; + changelog = "https://github.com/troyeguo/koodo-reader/releases/tag/v${version}"; + description = "A cross-platform ebook reader"; + longDescription = '' + A modern ebook manager and reader with sync and backup capacities + for Windows, macOS, Linux and Web + ''; + homepage = "https://github.com/troyeguo/koodo-reader"; + license = lib.licenses.agpl3Only; + mainProgram = "koodo-reader"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = electron.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/update-react-i18next.patch b/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/update-react-i18next.patch new file mode 100644 index 0000000000..6d71460ee3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ko/koodo-reader/update-react-i18next.patch @@ -0,0 +1,58 @@ +diff --git a/package.json b/package.json +index c71b04a1..a4b4b3ef 100644 +--- a/package.json ++++ b/package.json +@@ -67,7 +67,7 @@ + "react-device-detect": "^1.12.1", + "react-dom": "^17.0.2", + "react-dropzone": "^11.3.0", +- "react-i18next": "^11.8.15", ++ "react-i18next": "^13.2.2", + "react-lottie": "^1.2.3", + "react-redux": "^7.2.0", + "react-router-dom": "^5.2.0", +diff --git a/yarn.lock b/yarn.lock +index 881db5b2..2df4d362 100644 +--- a/yarn.lock ++++ b/yarn.lock +@@ -1828,7 +1828,7 @@ + resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" + integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== + +-"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.20.6", "@babel/runtime@^7.20.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": ++"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.20.6", "@babel/runtime@^7.20.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673" + integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== +@@ -1842,6 +1842,13 @@ + dependencies: + regenerator-runtime "^0.14.0" + ++"@babel/runtime@^7.22.5": ++ version "7.23.1" ++ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.1.tgz#72741dc4d413338a91dcb044a86f3c0bc402646d" ++ integrity sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g== ++ dependencies: ++ regenerator-runtime "^0.14.0" ++ + "@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" +@@ -10951,12 +10958,12 @@ react-i18next@*: + "@babel/runtime" "^7.20.6" + html-parse-stringify "^3.0.1" + +-react-i18next@^11.8.15: +- version "11.18.6" +- resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.6.tgz#e159c2960c718c1314f1e8fcaa282d1c8b167887" +- integrity sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA== ++react-i18next@^13.2.2: ++ version "13.2.2" ++ resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-13.2.2.tgz#b1e78ed66a54f4bc819616f68b98221e1b1a1936" ++ integrity sha512-+nFUkbRByFwnrfDcYqvzBuaeZb+nACHx+fAWN/pZMddWOCJH5hoc21+Sa/N/Lqi6ne6/9wC/qRGOoQhJa6IkEQ== + dependencies: +- "@babel/runtime" "^7.14.5" ++ "@babel/runtime" "^7.22.5" + html-parse-stringify "^3.0.1" + + react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: diff --git a/third_party/nixpkgs/pkgs/by-name/ko/kor/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/kor/package.nix index ee9d43af7c..a04132f991 100644 --- a/third_party/nixpkgs/pkgs/by-name/ko/kor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ko/kor/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kor"; - version = "0.3.7"; + version = "0.4.0"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-wjq4IkF3agmculIH+WfBAGd0ciJBX9aj4EsmUvje9Aw="; + hash = "sha256-OZSec1S583jVGqSET0y4WhKxWf9CyLKuhEwu39Zg9vE="; }; - vendorHash = "sha256-UN3Zf8eo6kMNNzkGsnqyDVMgE2QXRn4wg+XULu/uBGE="; + vendorHash = "sha256-4XcmaW4H+IgZZx3PuG0aimqSG1eUnRtcbebKXuencnQ="; preCheck = '' HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/by-name/ko/kotlin-interactive-shell/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/kotlin-interactive-shell/package.nix new file mode 100644 index 0000000000..23848a4896 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ko/kotlin-interactive-shell/package.nix @@ -0,0 +1,45 @@ +{ lib, maven, fetchFromGitHub, makeWrapper, jre }: + +maven.buildMavenPackage rec { + pname = "kotlin-interactive-shell"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "Kotlin"; + repo = "kotlin-interactive-shell"; + rev = "v${version}"; + hash = "sha256-3DTyo7rPswpEVzFkcprT6FD+ITGJ+qCXFKXEGoCK+oE="; + }; + + mvnHash = "sha256-m1o0m0foqJhEzWjC9behBeld5HT08WClcZN2xc3fZrI="; + mvnParameters = "-DskipTests compile"; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + cp lib/ki-shell.jar $out/lib/ki-shell.jar + makeWrapper ${lib.getExe jre} $out/bin/ki \ + --add-flags "-jar $out/lib/ki-shell.jar" + + runHook postInstall + ''; + + meta = with lib; { + description = "Kotlin Language Interactive Shell"; + longDescription = '' + The shell is an extensible implementation of Kotlin REPL with a rich set of features including: + - Syntax highlight + - Type inference command + - Downloading dependencies in runtime using Maven coordinates + - List declared symbols + ''; + homepage = "https://github.com/Kotlin/kotlin-interactive-shell"; + license = licenses.asl20; + maintainers = [ maintainers.starsep ]; + platforms = jre.meta.platforms; + mainProgram = "ki"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/kt/ktfmt/package.nix b/third_party/nixpkgs/pkgs/by-name/kt/ktfmt/package.nix index 49546fd411..99d5b03f9a 100644 --- a/third_party/nixpkgs/pkgs/by-name/kt/ktfmt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/kt/ktfmt/package.nix @@ -11,14 +11,17 @@ maven.buildMavenPackage rec { hash = "sha256-vdvKHTTD84OAQacv/VE/5BxYdW4n3bxPUHF2MdH+sQQ="; }; - mvnHash = "sha256-Cl7P2i4VFJ/yk7700u62YPcacfKkhBztFvcDkYBfZEA="; + patches = [ ./pin-default-maven-plugin-versions.patch ]; + + mvnHash = "sha256-iw28HS0WMFC9BKQKr0v33D77rMQeIMKjXduqPcYU1XA="; + + mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"; nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall - mkdir -p $out/bin install -Dm644 core/target/ktfmt-*-jar-with-dependencies.jar $out/share/ktfmt/ktfmt.jar makeWrapper ${jre_headless}/bin/java $out/bin/ktfmt \ diff --git a/third_party/nixpkgs/pkgs/by-name/kt/ktfmt/pin-default-maven-plugin-versions.patch b/third_party/nixpkgs/pkgs/by-name/kt/ktfmt/pin-default-maven-plugin-versions.patch new file mode 100644 index 0000000000..d3425669da --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kt/ktfmt/pin-default-maven-plugin-versions.patch @@ -0,0 +1,60 @@ +diff --git a/core/pom.xml b/core/pom.xml +index 267689e..6b6e04d 100644 +--- a/core/pom.xml ++++ b/core/pom.xml +@@ -34,6 +34,55 @@ + ${project.basedir}/src/main/java + ${project.basedir}/src/test/java + ++ ++ org.apache.maven.plugins ++ maven-enforcer-plugin ++ 3.4.1 ++ ++ ++ require-all-plugin-versions-to-be-set ++ validate ++ ++ enforce ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ org.apache.maven.plugins ++ maven-surefire-plugin ++ 3.2.5 ++ ++ ++ org.apache.maven.plugins ++ maven-clean-plugin ++ 3.3.2 ++ ++ ++ org.apache.maven.plugins ++ maven-install-plugin ++ 3.1.1 ++ ++ ++ org.apache.maven.plugins ++ maven-site-plugin ++ 4.0.0-M13 ++ ++ ++ org.apache.maven.plugins ++ maven-resources-plugin ++ 3.3.1 ++ ++ ++ org.apache.maven.plugins ++ maven-deploy-plugin ++ 3.1.1 ++ + + org.jetbrains.kotlin + kotlin-maven-plugin diff --git a/third_party/nixpkgs/pkgs/by-name/ky/kyua/kyua-check-hook.sh b/third_party/nixpkgs/pkgs/by-name/ky/kyua/kyua-check-hook.sh new file mode 100644 index 0000000000..0e8f724d5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ky/kyua/kyua-check-hook.sh @@ -0,0 +1,10 @@ +kyuaCheckPhase() { + runHook preCheck + # Kyua expects to save test results in ~/.kyua/store + HOME=$TMPDIR kyua test + runHook postCheck +} + +if [ -z "${dontUseKyuaCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=kyuaCheckPhase +fi diff --git a/third_party/nixpkgs/pkgs/by-name/ky/kyua/package.nix b/third_party/nixpkgs/pkgs/by-name/ky/kyua/package.nix new file mode 100644 index 0000000000..6209c20480 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ky/kyua/package.nix @@ -0,0 +1,119 @@ +{ + lib, + stdenv, + fetchFromGitHub, + atf, + autoreconfHook, + lutok, + pkg-config, + sqlite, + gitUpdater, +}: + +let + # Avoid an infinite recursion (because ATF uses Kyua for testing). + atf' = atf.overrideAttrs (_: { + doInstallCheck = false; + }); +in +stdenv.mkDerivation (finalAttrs: { + pname = "kyua"; + version = "0.13-unstable-2024-01-22"; # Match the commit used in FreeBSD’s port. + + src = fetchFromGitHub { + owner = "freebsd"; + repo = "kyua"; + rev = "c85354e09ad93a902c9e8a701c042c045ec2a5b7"; + hash = "sha256-fZ0WFgOTj8Gw8IT5O8DnuaNyZscKpg6B94m+l5UoZGc"; + }; + + setupHooks = ./kyua-check-hook.sh; + + postPatch = + '' + # Fix a linking error on Darwin. Embedding an archive in an archive isn’t portable. + substituteInPlace cli/Makefile.am.inc \ + --replace-fail 'libcli_a_LIBADD = libutils.a' "" \ + --replace-fail 'CLI_LIBS = ' 'CLI_LIBS = libutils.a ' + '' + # These tests fail on Darwin or are unreliable. + + lib.optionalString (finalAttrs.doInstallCheck && stdenv.isDarwin) '' + sed -i utils/process/Makefile.am.inc -e '/executor_pid_test/d' + substituteInPlace utils/process/Kyuafile \ + --replace-fail 'atf_test_program{name="executor_pid_test"}' "" + substituteInPlace engine/atf_test.cpp \ + --replace-fail 'ATF_ADD_TEST_CASE(tcs, test__body_only__crashes);' "" + substituteInPlace engine/scheduler_test.cpp \ + --replace-fail 'ATF_ADD_TEST_CASE(tcs, integration__stacktrace);' "" + substituteInPlace utils/stacktrace_test.cpp \ + --replace-fail 'ATF_ADD_TEST_CASE(tcs, unlimit_core_size);' "" + substituteInPlace utils/process/isolation_test.cpp \ + --replace-fail 'ATF_ADD_TEST_CASE(tcs, isolate_child__enable_core_dumps);' "" + substituteInPlace utils/process/operations_test.cpp \ + --replace-fail 'ATF_ADD_TEST_CASE(tcs, terminate_self_with__termsig_and_core);' "" + substituteInPlace utils/process/status_test.cpp \ + --replace-fail 'ATF_ADD_TEST_CASE(tcs, integration__coredump);' "" + substituteInPlace integration/cmd_test_test.sh \ + --replace-fail 'atf_add_test_case premature_exit' "" + '' + # fchflags and UF_NOUNLINK are not supported on Linux. Other tests also fail. + + lib.optionalString (finalAttrs.doInstallCheck && stdenv.isLinux) '' + sed -i utils/process/Makefile.am.inc -e '/executor_pid_test/d' + substituteInPlace utils/process/Kyuafile \ + --replace-fail 'atf_test_program{name="executor_pid_test"}' "" + substituteInPlace engine/atf_test.cpp \ + --replace-fail 'ATF_ADD_TEST_CASE(tcs, test__body_only__crashes);' "" + substituteInPlace utils/stacktrace_test.cpp \ + --replace-fail 'ATF_ADD_TEST_CASE(tcs, dump_stacktrace__ok);' "" \ + --replace-fail 'ATF_ADD_TEST_CASE(tcs, dump_stacktrace_if_available__append);' "" \ + --replace-fail 'ATF_ADD_TEST_CASE(tcs, find_core__found__long);' "" \ + --replace-fail 'ATF_ADD_TEST_CASE(tcs, find_core__found__short);' "" \ + --replace-fail 'ATF_ADD_TEST_CASE(tcs, unlimit_core_size__hard_is_zero);' "" + substituteInPlace integration/cmd_test_test.sh \ + --replace-fail 'atf_add_test_case premature_exit' "" + ''; + + strictDeps = true; + + buildInputs = [ + lutok + sqlite + ]; + + nativeBuildInputs = [ + atf' + autoreconfHook + pkg-config + ]; + + enableParallelBuilding = true; + + makeFlags = [ + # Kyua isn’t compatible with C++17, which is the default on current clang and GCC. + "CXXFLAGS=-std=c++11" + ]; + + doInstallCheck = true; + + installCheckInputs = [ atf' ]; + nativeInstallCheckInputs = [ sqlite ]; + + installCheckPhase = '' + runHook preInstallCheck + HOME=$TMPDIR PATH=$out/bin:$PATH kyua test + runHook postInstallCheck + ''; + + passthru.updateScript = gitUpdater { rev-prefix = "kyua-"; }; + + __structuredAttrs = true; + + meta = { + description = "Testing framework for infrastructure software"; + homepage = "https://github.com/freebsd/kyua/"; + license = lib.licenses.bsd3; + mainProgram = "kyua"; + maintainers = with lib.maintainers; [ reckenrode ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/third_party/nixpkgs/pkgs/by-name/ky/kyverno-chainsaw/package.nix index 0853481fe1..827716689e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ky/kyverno-chainsaw/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ky/kyverno-chainsaw/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kyverno-chainsaw"; - version = "0.1.9"; + version = "0.2.0"; src = fetchFromGitHub { owner = "kyverno"; repo = "chainsaw"; rev = "v${version}"; - hash = "sha256-qn5EjddLVRhN90SICa39A28giXQ24Ol1nfbxNH5TXhc="; + hash = "sha256-+w7cn2lrNlgMvmmIJgx6wukJcSyeHLEzpM3uH20cYJ8="; }; - vendorHash = "sha256-R9qaG19Vp+1a7AL0q8Cl1jN89cbXzLwbnN163WMWAEw="; + vendorHash = "sha256-BDpNt/0d/QkJlkyWkw96xVos8kml1BwvStM8NqB4WC8="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/by-name/la/labelle/package.nix b/third_party/nixpkgs/pkgs/by-name/la/labelle/package.nix index 39d4a1f76a..6ff68d63b8 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/labelle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/labelle/package.nix @@ -8,14 +8,14 @@ }: python3Packages.buildPythonApplication rec { pname = "labelle"; - version = "1.1.0"; + version = "1.2.2"; pyproject = true; src = fetchFromGitHub { owner = "labelle-org"; repo = "labelle"; - rev = "v${version}"; - hash = "sha256-JnV5A3/toTCHCEb0dygouR9MZfk2kdmsKVscwYI2y/Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-Im1mZ9kJB+0uPAmEXpUWoOYBooejes05vTGLDqPCAN4="; }; postPatch = '' @@ -39,6 +39,8 @@ python3Packages.buildPythonApplication rec { pyqt6 python-barcode pyusb + rich + typer ]; desktopItems = [ diff --git a/third_party/nixpkgs/pkgs/by-name/la/labwc-gtktheme/package.nix b/third_party/nixpkgs/pkgs/by-name/la/labwc-gtktheme/package.nix index dd2e9ca254..0e9645e596 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/labwc-gtktheme/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/labwc-gtktheme/package.nix @@ -3,13 +3,13 @@ , gobject-introspection , gtk3 , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , unstableGitUpdater }: python3Packages.buildPythonApplication rec { pname = "labwc-gtktheme"; - version = "unstable-2022-07-17"; + version = "0-unstable-2022-07-17"; pyproject = false; src = fetchFromGitHub { @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/la/labwc-menu-generator/package.nix b/third_party/nixpkgs/pkgs/by-name/la/labwc-menu-generator/package.nix index 17254a077d..79c43706cc 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/labwc-menu-generator/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/labwc-menu-generator/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-menu-generator"; - version = "unstable-2024-03-27"; + version = "0-unstable-2024-03-27"; src = fetchFromGitHub { owner = "labwc"; diff --git a/third_party/nixpkgs/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/third_party/nixpkgs/pkgs/by-name/la/labwc-tweaks-gtk/package.nix new file mode 100644 index 0000000000..c8f6fdca99 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/la/labwc-tweaks-gtk/package.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gtk3 +, libxml2 +, xkeyboard_config +, wrapGAppsHook3 +, unstableGitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "labwc-tweaks-gtk"; + version = "0-unstable-2024-04-07"; + + src = fetchFromGitHub { + owner = "labwc"; + repo = "labwc-tweaks-gtk"; + rev = "67adbedd610a1b44e7ba667ae72a5c9b07105119"; + hash = "sha256-RGPm+hvyTWxkd3z841Y8ozXrDD1ZgHCZjimyRdRNrCs="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + gtk3 + libxml2 + ]; + + strictDeps = true; + + postPatch = '' + substituteInPlace stack-lang.c --replace /usr/share/X11/xkb ${xkeyboard_config}/share/X11/xkb + substituteInPlace theme.c --replace /usr/share /run/current-system/sw/share + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/labwc/labwc-tweaks-gtk"; + description = "Configuration gui app for labwc; gtk fork"; + mainProgram = "labwc-tweaks"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ AndersonTorres romildo ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/la/labwc-tweaks/package.nix b/third_party/nixpkgs/pkgs/by-name/la/labwc-tweaks/package.nix index fee334974a..c79b598469 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/labwc-tweaks/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/labwc-tweaks/package.nix @@ -1,44 +1,42 @@ { lib , stdenv , fetchFromGitHub -, meson -, ninja +, cmake +, perl , pkg-config -, gtk3 -, libxml2 +, qt6 , xkeyboard_config -, wrapGAppsHook , unstableGitUpdater }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "labwc-tweaks"; - version = "unstable-2024-04-02"; + version = "0-unstable-2024-04-27"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-tweaks"; - rev = "a1a3cfaefd1908de8752d0d6d6b7170b04ee075c"; - hash = "sha256-uvUsoqiQBuNMBQWAxl/tCIvWsEYmZ4dQ31TrznI/XcA="; + rev = "9007079640e0f38c1d69ac94899229354a5c67b2"; + hash = "sha256-klKPHAhJ6fedFojXPfesjs1dG5NJhBZkzynhka5vD8M="; }; nativeBuildInputs = [ - meson - ninja + cmake + perl pkg-config - wrapGAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; buildInputs = [ - gtk3 - libxml2 + qt6.qtbase + qt6.qtwayland ]; strictDeps = true; postPatch = '' - substituteInPlace stack-lang.c --replace /usr/share/X11/xkb ${xkeyboard_config}/share/X11/xkb - substituteInPlace theme.c --replace /usr/share /run/current-system/sw/share + substituteInPlace tweaks-qt/gen-layout-list --replace-fail /usr/share/X11/xkb ${xkeyboard_config}/share/X11/xkb ''; passthru.updateScript = unstableGitUpdater { }; @@ -51,4 +49,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ AndersonTorres romildo ]; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/by-name/la/labwc/package.nix b/third_party/nixpkgs/pkgs/by-name/la/labwc/package.nix index 36aa398e87..a6906f440e 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/labwc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/labwc/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; rev = finalAttrs.version; - hash = "sha256-6l+pYEMFQT8P0j40IcujSzlKgXzR5GIyuxkAJi65RiY="; + hash = "sha256-8TSBBNg9+W65vEKmwyAWB2yEOpHqV9YRm5+ttL19ke4="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/la/lacus/package.nix b/third_party/nixpkgs/pkgs/by-name/la/lacus/package.nix index 1bef9b5060..0f62ff18fe 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/lacus/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/lacus/package.nix @@ -5,21 +5,21 @@ python3.pkgs.buildPythonApplication rec { pname = "lacus"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "ail-project"; repo = "lacus"; rev = "refs/tags/v${version}"; - hash = "sha256-3sgTt3SsasltChCqHAWyujtUvoLwHWZzfWwlfnJA+zE="; + hash = "sha256-VFNW13PupJOroIhqnuLOq3mqU9nXEy1hmjHBQfErSN8="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ flask-restx gunicorn lacuscore diff --git a/third_party/nixpkgs/pkgs/by-name/la/lager/package.nix b/third_party/nixpkgs/pkgs/by-name/la/lager/package.nix index 11b7595fcc..1786e0cc50 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/lager/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/lager/package.nix @@ -8,15 +8,17 @@ , zug }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lager"; version = "0.1.0"; + src = fetchFromGitHub { owner = "arximboldi"; repo = "lager"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-KTHrVV/186l4klwlcfDwFsKVoOVqWCUPzHnIbWuatbg="; }; + buildInputs = [ boost immer @@ -28,10 +30,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Dlager_BUILD_EXAMPLES=OFF" ]; - meta = with lib; { - homepage = "https://github.com/arximboldi/lager"; + + meta = { + homepage = "https://github.com/arximboldi/lager"; description = "C++ library for value-oriented design using the unidirectional data-flow architecture — Redux for C++"; - license = licenses.mit; - maintainers = with maintainers; [ nek0 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nek0 ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/la/laudanum/package.nix b/third_party/nixpkgs/pkgs/by-name/la/laudanum/package.nix new file mode 100644 index 0000000000..a744fe7720 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/la/laudanum/package.nix @@ -0,0 +1,31 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation { + pname = "laudanum"; + version = "1.0-unstable-2017-12-15"; + + src = fetchFromGitHub { + owner = "junk13"; + repo = "laudanum"; + rev = "50e1c09d5f23b446c20ecec652c64f9622348364"; + hash = "sha256-Od/ciCQ5QM4b/u9nizHosj/zte2pdifO8IDZkrcmIeI="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/laudanum + cp -a * $out/share/laudanum/ + runHook postInstall + ''; + + meta = with lib; { + description = "A collection of injectable files, designed to be used in a pentest when SQL injection flaws are found and are in multiple languages for different environments"; + homepage = "https://github.com/junk13/laudanum"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.all; + license = licenses.gpl2Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/lb/lbd/package.nix b/third_party/nixpkgs/pkgs/by-name/lb/lbd/package.nix new file mode 100644 index 0000000000..f84ed553ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lb/lbd/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, makeWrapper +, bash +, coreutils +, diffutils +, gawk +, gnugrep +, gnused +, host +, netcat-openbsd +}: + +stdenvNoCC.mkDerivation { + pname = "lbd"; + version = "0-unstable-2024-02-17"; + + src = fetchFromGitHub { + owner = "D3vil0p3r"; + repo = "lbd"; + rev = "73baaaecddcd834d43d79f50f0808b779c9a97c3"; + hash = "sha256-NHY3NoPigsmfRjOx9Lt3/fGsyeq1/bzKHIXMDBJiI6c="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share/lbd} + cp lbd $out/share/lbd/ + makeWrapper ${lib.getExe bash} $out/bin/lbd \ + --prefix PATH : "${lib.makeBinPath [ coreutils diffutils gawk gnugrep gnused host netcat-openbsd ]}" \ + --add-flags "$out/share/lbd/lbd" + runHook postInstall + ''; + + meta = with lib; { + description = "Detect if a domain uses DNS and/or HTTP Load-Balancing"; + mainProgram = "lbd"; + homepage = "https://github.com/D3vil0p3r/lbd"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/lb/lbreakouthd/package.nix b/third_party/nixpkgs/pkgs/by-name/lb/lbreakouthd/package.nix index 6e0f05082d..4de44c27dc 100644 --- a/third_party/nixpkgs/pkgs/by-name/lb/lbreakouthd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lb/lbreakouthd/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lbreakouthd"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { url = "mirror://sourceforge/lgames/lbreakouthd-${finalAttrs.version}.tar.gz"; - hash = "sha256-ivgT8yYEFK4kEJkilj3NP4OO2mBkk2Zx6I+Elde0TkE="; + hash = "sha256-3WZ77KVDNitdIcXPFf0CMXtjDvEXi91Jr7mpeV09Wt4="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/lc/lc0/package.nix b/third_party/nixpkgs/pkgs/by-name/lc/lc0/package.nix new file mode 100644 index 0000000000..4ccb192753 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lc/lc0/package.nix @@ -0,0 +1,72 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, pkg-config +, python3 +, zlib +, gtest +, eigen +}: + +stdenv.mkDerivation rec { + pname = "lc0"; + version = "0.30.0"; + + src = fetchFromGitHub { + owner = "LeelaChessZero"; + repo = "lc0"; + rev = "refs/tags/v${version}"; + hash = "sha256-Q85hXNSexHhk6W48tgJLk0Sf32xBipfg2P2SH1FF89Q="; + fetchSubmodules = true; + }; + + patchPhase = '' + runHook prePatch + + patchShebangs --build /build/source/scripts/* + + runHook postPatch + ''; + + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + ]; + + buildInputs = [ + eigen + gtest + zlib + ]; + + mesonFlags = [ + "-Dplain_cuda=false" + "-Daccelerate=false" + "-Dmetal=disabled" + "-Dembed=false" + ] + # in version 31 this option will be required + ++ lib.optionals (lib.versionAtLeast version "0.31") [ "-Dnative_cuda=false" ]; + + + enableParallelBuilding = true; + + meta = { + homepage = "https://lczero.org/"; + description = "Open source neural network based chess engine"; + longDescription = '' + Lc0 is a UCI-compliant chess engine designed to play chess via neural network, specifically those of the LeelaChessZero project. + ''; + maintainers = with lib.maintainers; [ _9glenda ]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3Plus; + broken = stdenv.hostPlatform.isDarwin; + }; + +} diff --git a/third_party/nixpkgs/pkgs/by-name/le/ledger/package.nix b/third_party/nixpkgs/pkgs/by-name/le/ledger/package.nix index 89a614247f..0029b1b7df 100644 --- a/third_party/nixpkgs/pkgs/by-name/le/ledger/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/le/ledger/package.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { their data, there really is no alternative. ''; platforms = platforms.all; - maintainers = with maintainers; [ jwiegley marsam ]; + maintainers = with maintainers; [ jwiegley ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/le/lefthook/package.nix b/third_party/nixpkgs/pkgs/by-name/le/lefthook/package.nix index cba2661b00..65e7ffd529 100644 --- a/third_party/nixpkgs/pkgs/by-name/le/lefthook/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/le/lefthook/package.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.6.10"; + version = "1.6.11"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-6VjvlGA6PBYLa1Ct05jokgF9zlYKihr+ESG4C8MHnO0="; + hash = "sha256-l94RysGILYju0u1jOIGxLVe/TECw1naMq9SzpYq6ooM="; }; vendorHash = "sha256-sDqP+fzAFavqtvJ98nwsD5+GxNhmLgtOkTzIK06wp9E="; diff --git a/third_party/nixpkgs/pkgs/by-name/le/lexical/package.nix b/third_party/nixpkgs/pkgs/by-name/le/lexical/package.nix index d7f9f46ee7..d836b471cc 100644 --- a/third_party/nixpkgs/pkgs/by-name/le/lexical/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/le/lexical/package.nix @@ -2,25 +2,24 @@ lib, beamPackages, fetchFromGitHub, - writeScript, elixir, }: beamPackages.mixRelease rec { pname = "lexical"; - version = "0.5.2"; + version = "0.6.1"; src = fetchFromGitHub { owner = "lexical-lsp"; repo = "lexical"; rev = "refs/tags/v${version}"; - hash = "sha256-HWqwJ7PAz80bm6YeDG84hLWPE11n06K98GOyeDQWZWU="; + hash = "sha256-gDiNjtYeEGoYoyoNmPh73EuYCvY36y9lUyLasbFrFgs="; }; mixFodDeps = beamPackages.fetchMixDeps { inherit pname version src; - hash = "sha256-G0mT+rvXZWLJIMfrhxq3TXt26wDImayu44wGEYJ+3CE="; + hash = "sha256-xihxPfdLPr5jWFfcX2tccFUl7ND1mi9u8Dn28k6lGVA="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/li/libation/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libation/package.nix index cad371b891..692de5d3d9 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libation/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libation/package.nix @@ -1,20 +1,21 @@ -{ lib -, stdenv -, buildDotnetModule -, fetchFromGitHub -, dotnetCorePackages -, wrapGAppsHook +{ + lib, + stdenv, + buildDotnetModule, + fetchFromGitHub, + dotnetCorePackages, + wrapGAppsHook3, -, libX11 -, libICE -, libSM -, libXi -, libXcursor -, libXext -, libXrandr -, fontconfig -, glew -, gtk3 + libX11, + libICE, + libSM, + libXi, + libXcursor, + libXext, + libXrandr, + fontconfig, + glew, + gtk3, }: buildDotnetModule rec { @@ -43,7 +44,7 @@ buildDotnetModule rec { "HangoverAvalonia/HangoverAvalonia.csproj" ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; runtimeDeps = [ # For Avalonia UI @@ -61,10 +62,10 @@ buildDotnetModule rec { ]; postInstall = '' - install -Dm644 LoadByOS/LinuxConfigApp/libation_glass.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg - install -Dm644 LoadByOS/LinuxConfigApp/Libation.desktop $out/share/applications/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace "/usr/bin/libation" "${meta.mainProgram}" + install -Dm644 LoadByOS/LinuxConfigApp/libation_glass.svg $out/share/icons/hicolor/scalable/apps/libation.svg + install -Dm644 LoadByOS/LinuxConfigApp/Libation.desktop $out/share/applications/libation.desktop + substituteInPlace $out/share/applications/libation.desktop \ + --replace-fail "/usr/bin/libation" "${meta.mainProgram}" ''; # wrap manually, because we need lower case excutables diff --git a/third_party/nixpkgs/pkgs/by-name/li/libcpuid/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libcpuid/package.nix index 7e63d25a53..cf4afd8df7 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libcpuid/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libcpuid/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcpuid"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "anrieff"; repo = "libcpuid"; rev = "v${version}"; - sha256 = "sha256-Zs5GKvSasdfLqo8oErDQNAuXRG27Bm9vNwyooqbol0Q="; + sha256 = "sha256-Bq16UH4IUR7dU57bGHKq8P6JsjaB4arOJ4zFeNyxXSg="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libdict/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libdict/package.nix index 1c6e770299..ad2ecbf4f2 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libdict/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libdict/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/rtbrick/libdict/"; - changelog = "https://github.com/rtbrick/libdict/releases/tag/${version}"; + changelog = "https://github.com/rtbrick/libdict/releases/tag/${finalAttrs.version}"; description = "C library of key-value data structures"; license = licenses.bsd2; maintainers = teams.wdz.members; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libgedit-gfls/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libgedit-gfls/package.nix new file mode 100644 index 0000000000..8964898851 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libgedit-gfls/package.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchFromGitHub +, docbook-xsl-nons +, gobject-introspection +, gtk-doc +, meson +, ninja +, pkg-config +, mesonEmulatorHook +, gtk3 +, glib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libgedit-gfls"; + version = "0.1.0"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitHub { + owner = "gedit-technology"; + repo = "libgedit-gfls"; + rev = finalAttrs.version; + hash = "sha256-tES8UGWcCT8lRd/fnOt9EN3wHkNSLRM4j8ONrCDPBK0="; + }; + + nativeBuildInputs = [ + docbook-xsl-nons + gobject-introspection + gtk-doc + meson + ninja + pkg-config + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + + buildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + # Required by libgedit-gfls-1.pc + glib + ]; + + meta = { + homepage = "https://github.com/gedit-technology/libgedit-gfls"; + description = "Module dedicated to file loading and saving"; + maintainers = with lib.maintainers; [ bobby285271 ]; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/li/libgedit-gtksourceview/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libgedit-gtksourceview/package.nix index 3de70506f3..70b3fb276e 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libgedit-gtksourceview/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libgedit-gtksourceview/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gtksourceview"; - version = "299.0.5"; + version = "299.2.1"; outputs = [ "out" "dev" "devdoc" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "gedit-technology"; repo = "libgedit-gtksourceview"; rev = finalAttrs.version; - hash = "sha256-PQ7cpul9h1JzywDWm9YyD95B1ONSdUUk0EQJMEGoRN0="; + hash = "sha256-fmYIZvsB3opstpPEd9vahcD9yUZKPBpSIrlNDs+eCdw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libgedit-tepl/package.nix similarity index 51% rename from third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix rename to third_party/nixpkgs/pkgs/by-name/li/libgedit-tepl/package.nix index 5ceb76b9bf..5c2c84ac9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libgedit-tepl/package.nix @@ -1,14 +1,15 @@ { stdenv , lib -, fetchurl +, fetchFromGitHub , meson , mesonEmulatorHook , ninja -, gnome , gobject-introspection , gtk3 , icu +, libhandy , libgedit-amtk +, libgedit-gfls , libgedit-gtksourceview , pkg-config , gtk-doc @@ -16,14 +17,16 @@ }: stdenv.mkDerivation rec { - pname = "tepl"; - version = "6.8.0"; + pname = "libgedit-tepl"; + version = "6.10.0"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Rubl8b/bxS5ZVvBq3VdenHaXxnPVPTgD3+do9JC1YPA="; + src = fetchFromGitHub { + owner = "gedit-technology"; + repo = "libgedit-tepl"; + rev = version; + hash = "sha256-lGmOaDNu+iqwpeaP0AL28exoTqx1j03Z8gdhTBgk1i8="; }; strictDeps = true; @@ -40,28 +43,18 @@ stdenv.mkDerivation rec { buildInputs = [ icu + libhandy ]; propagatedBuildInputs = [ gtk3 libgedit-amtk + libgedit-gfls libgedit-gtksourceview ]; - doCheck = false; - # TODO: one test fails because of - # (./test-file-metadata:20931): Tepl-WARNING **: 14:41:36.942: GVfs metadata - # is not supported. Fallback to TeplMetadataManager. Either GVfs is not - # correctly installed or GVfs metadata are not supported on this platform. In - # the latter case, you should configure Tepl with --disable-gvfs-metadata. - - passthru.updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Tepl"; + homepage = "https://github.com/gedit-technology/libgedit-tepl"; description = "Text editor product line"; maintainers = with maintainers; [ manveru bobby285271 ]; license = licenses.lgpl3Plus; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/meson.build b/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/meson.build new file mode 100644 index 0000000000..99adeb7fe0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/meson.build @@ -0,0 +1,303 @@ +# Build settings based on the upstream Xcode project. +# See: https://github.com/apple-oss-distributions/libiconv/blob/main/libiconv.xcodeproj/project.pbxproj + +# Project settings +project('libiconv', 'c', version : '@version@') + +fs = import('fs') + + +# Dependencies +cc = meson.get_compiler('c') + + +# Definitions +prefix_libdir = get_option('prefix') / get_option('libdir') +prefix_datadir = get_option('prefix') / get_option('datadir') + +i18nmoduledir = prefix_libdir / 'i18n' +esdbdir = prefix_datadir / 'i18n/esdb' +csmapperdir = prefix_datadir / 'i18n/csmapper' + + +# Libraries +libcharset = library( + 'charset', + darwin_versions : '1', + install : true, + include_directories : ['libcharset'], + sources : [ + 'libcharset/libcharset.c' + ], + soversion : '1' +) +install_headers( + 'libcharset/libcharset.h', + 'libcharset/localcharset.h' +) + +libiconv = library( + 'iconv', + build_rpath : fs.parent(libcharset.full_path()), + c_args : [ + f'-D_PATH_I18NMODULE="@i18nmoduledir@"', + f'-D_PATH_ESDB="@esdbdir@"', + f'-D_PATH_CSMAPPER="@csmapperdir@"' + ], + darwin_versions : '7', + install : true, + include_directories : ['citrus', 'libcharset'], + link_args : ['-Wl,-reexport_library', fs.name(libcharset.full_path())], + link_depends : [libcharset], + override_options : {'b_asneeded' : false}, # Make sure the libcharset reexport is not stripped + sources : [ + 'citrus/__iconv_get_list.c', + 'citrus/__iconv_free_list.c', + 'citrus/__iconv.c', + 'citrus/bsd_iconv.c', + 'citrus/citrus_bcs_strtol.c', + 'citrus/citrus_bcs_strtoul.c', + 'citrus/citrus_bcs.c', + 'citrus/citrus_csmapper.c', + 'citrus/citrus_db.c', + 'citrus/citrus_db_factory.c', + 'citrus/citrus_db_hash.c', + 'citrus/citrus_esdb.c', + 'citrus/citrus_hash.c', + 'citrus/citrus_iconv.c', + 'citrus/citrus_lookup_factory.c', + 'citrus/citrus_lookup.c', + 'citrus/citrus_mapper.c', + 'citrus/citrus_memstream.c', + 'citrus/citrus_mmap.c', + 'citrus/citrus_module.c', + 'citrus/citrus_none.c', + 'citrus/citrus_pivot_factory.c', + 'citrus/citrus_prop.c', + 'citrus/citrus_stdenc.c', + 'citrus/iconv_canonicalize.c', + 'citrus/iconv_close.c', + 'citrus/iconv_compat.c', + 'citrus/iconv_open_into.c', + 'citrus/iconv_open.c', + 'citrus/iconv_set_relocation_prefix.c', + 'citrus/iconvctl.c', + 'citrus/iconvlist.c', + 'citrus/iconv.c', + ], + soversion : '2' +) +install_headers( + 'citrus/iconv.h' +) +install_man( + 'citrus/__iconv_get_list.3', + 'citrus/iconv_canonicalize.3', + 'citrus/iconv.3', + 'citrus/iconvctl.3', + 'citrus/iconvlist.3', +) + + +# Binaries +executable( + 'iconv', + install : true, + include_directories : ['citrus', 'libcharset'], + link_with : [libiconv], + sources : [ + 'iconv/iconv.c' + ] +) +install_man('iconv/iconv.1') + + +# Data +## csmapper +csmapper_modules = [ + 'APPLE', + 'AST', + 'BIG5', + 'CNS', + 'CP', + 'EBCDIC', + 'GB', + 'GEORGIAN', + 'ISO-8859', + 'ISO646', + 'JIS', + 'KAZAKH', + 'KOI', + 'KS', + 'MISC', + 'TCVN' +] + +foreach module : csmapper_modules + mps_files = run_command( + 'find', 'i18n/csmapper' / module, '-regex', '.*\\.\\(mps\\|646\\)', + check : true + ).stdout().strip().split('\n') + install_data(mps_files, install_dir : csmapperdir / module) +endforeach + +install_data( + 'i18n/csmapper/charset.pivot', + 'i18n/csmapper/charset.pivot.pvdb', + 'i18n/csmapper/mapper.dir', + 'i18n/csmapper/mapper.dir.db', + install_dir : csmapperdir +) + +## esdb +esdb_modules = [ + 'APPLE', + 'AST', + 'BIG5', + 'CP', + 'DEC', + 'EBCDIC', + 'EUC', + 'GB', + 'GEORGIAN', + 'ISO-2022', + 'ISO-8859', + 'ISO646', + 'KAZAKH', + 'KOI', + 'MISC', + 'TCVN', + 'UTF' +] + +foreach module : esdb_modules + esdb_files = run_command( + 'find', 'i18n/esdb' / module, '-name', '*.esdb', + check : true + ).stdout().strip().split('\n') + install_data(esdb_files, install_dir : esdbdir / module) +endforeach + +install_data( + 'i18n/esdb/esdb.alias', + 'i18n/esdb/esdb.alias.db', + 'i18n/esdb/esdb.dir', + 'i18n/esdb/esdb.dir.db', + install_dir : esdbdir +) + + +# Modules +libiconv_modules = [ + 'BIG5', + 'DECHanyu', + 'DECKanji', + 'EUC', + 'EUCTW', + 'GBK2K', + 'HZ', + 'ISO2022', + 'JOHAB', + 'MSKanji', + 'UES', + 'UTF1632', + 'UTF7', + 'UTF8', + 'UTF8MAC', + 'VIQR', + 'ZW', + 'iconv_none', + 'iconv_std', + 'mapper_646', + 'mapper_none', + 'mapper_serial', + 'mapper_parallel', + 'mapper_std', + 'mapper_zone' +] + +foreach module : libiconv_modules + module_source = module.to_lower() + module_path = 'libiconv_modules' / module + + if module == 'UTF8MAC' + extra_headers = 'libiconv_modules/UTF8' + else + extra_headers = [ ] + endif + + # Upstream builds this module under both names. + # See: https://github.com/apple-oss-distributions/libiconv/blob/81be60a93521c931a01aab9c747dd2b078bc0679/libiconv.xcodeproj/project.pbxproj#L2549-L2556 + # See also: https://cgit.freebsd.org/src/tree/lib/libiconv_modules/mapper_parallel/Makefile?id=9241ebc796c11cf133c550f188f324bd2c12d89a + if module == 'mapper_parallel' + module_source = 'mapper_serial' + module_path = 'libiconv_modules/mapper_serial' + endif + + library( + module, + darwin_versions : '1', + install : true, + install_dir : i18nmoduledir, + include_directories : [module_path, 'citrus', 'libcharset'] + extra_headers, + link_with : [libiconv], + override_options : {'b_asneeded' : false}, # Upstream always links libiconv + sources : [ + module_path / f'citrus_@module_source@.c' + ] + ) +endforeach + + +# Tests +if get_option('tests') == true +## Only required for running the tests + atf = dependency('atf-c') + foreach suite : ['libiconv_test', 'mbopt_test', 'nixpkgs_test'] + test_src = f'tests/libiconv/@suite@.c' + test_exe = executable( + suite, + dependencies : [atf], + include_directories : ['citrus', 'libcharset'], + link_with : [libiconv], + sources : [test_src] + ) + + # Extract the tests to run from the test source code. + tests = run_command( + 'sed', '-n', '-E', 's|.*ATF_TP_ADD_TC\\([^,]*, ([^)]*).*$|\\1|p', test_src, + check : true + ).stdout().strip().split('\n') + + foreach test : tests + test(test, test_exe, args : [test], suite : suite, timeout : 300) + endforeach + endforeach + +# These tests depend on `os_variant_has_internal_content`, which is stubbed out. +# atf_sh = find_program('atf-sh') +# print_charset = executable( +# 'print_charset', +# include_directories : ['citrus', 'libcharset'], +# link_with : [libiconv], +# sources : 'tests/libcharset/print_charset.c' +# ) +# +# test_charset = custom_target( +# 'test_charset.sh', +# command : ['cp', '@INPUT@', '@OUTPUT@'], +# depends : print_charset, +# input : 'tests/libcharset/test_charset.sh', +# output : 'test_charset.sh' +# ) +# +# # Extract the tests to run from the test source code. +# tests = run_command( +# 'sed', '-n', '-E', 's|.*atf_add_test_case (.*$)|\\1|p', 'tests/libcharset/test_charset.sh', +# check : true +# ).stdout().strip().split('\n') +# +# foreach test : tests +# test(test, atf_sh, args : [test_charset, test], suite : 'libcharset', timeout : 300) +# endforeach +endif diff --git a/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/meson.options b/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/meson.options new file mode 100644 index 0000000000..c75832a377 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/meson.options @@ -0,0 +1 @@ +option('tests', type : 'boolean') diff --git a/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/nixpkgs_test.c b/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/nixpkgs_test.c new file mode 100644 index 0000000000..40400ef832 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/nixpkgs_test.c @@ -0,0 +1,82 @@ +#include +#include +#include + +// The following tests were failing in libarchive due to libiconv issues. +// 218: test_read_format_cab_filename (4 failures) +// 415: test_read_format_zip_filename_CP932_eucJP (4 failures) +// 426: test_read_format_zip_filename_CP932_CP932 (2 failures) + +ATF_TC(test_cp932_eucjp); +ATF_TC_HEAD(test_cp932_eucjp, tc) +{ + atf_tc_set_md_var(tc, "descr", "regression test for CP932 to EUC-JP conversion"); +} +ATF_TC_BODY(test_cp932_eucjp, tc) +{ + char expected[] = "\xc9\xbd\xa4\xc0\xa4\xe8\x5c\xb4\xc1\xbb\xfa\x2e\x74\x78\x74"; + size_t expected_length = sizeof(expected) - 1; + + char input[] = "\x95\x5c\x82\xbe\x82\xe6\x5c\x8a\xbf\x8e\x9a\x2e\x74\x78\x74"; + size_t input_length = sizeof(input) - 1; + + size_t output_available = sizeof(expected) - 1 ; + char output[sizeof(expected)] = { 0 }; + + iconv_t cd = iconv_open("eucJP", "CP932"); + ATF_REQUIRE((size_t)cd != -1); + + char* input_buf = input; + char* output_buf = output; + + size_t res = iconv(cd, &input_buf, &input_length, &output_buf, &output_available); + iconv_close(cd); + + ATF_CHECK(res != -1); + + size_t output_length = sizeof(output) - output_available - 1; + + ATF_CHECK_INTEQ(expected_length, output_length); + ATF_CHECK_STREQ(expected, output); +} + +ATF_TC(test_cp932_cp932); +ATF_TC_HEAD(test_cp932_cp932, tc) +{ + atf_tc_set_md_var(tc, "descr", "regression test for CP932 to CP932 conversion"); +} +ATF_TC_BODY(test_cp932_cp932, tc) +{ + char expected[] = "\x95\x5c\x82\xbe\x82\xe6\x5c\x8a\xbf\x8e\x9a\x2e\x74\x78\x74"; + size_t expected_length = sizeof(expected) - 1; + + char input[] = "\x95\x5c\x82\xbe\x82\xe6\x5c\x8a\xbf\x8e\x9a\x2e\x74\x78\x74"; + size_t input_length = sizeof(input) - 1; + + size_t output_available = sizeof(expected) - 1 ; + char output[sizeof(expected)] = { 0 }; + + iconv_t cd = iconv_open("CP932", "CP932"); + ATF_REQUIRE((size_t)cd != -1); + + char* input_buf = input; + char* output_buf = output; + + size_t res = iconv(cd, &input_buf, &input_length, &output_buf, &output_available); + iconv_close(cd); + + ATF_CHECK(res != -1); + + size_t output_length = sizeof(output) - output_available - 1; + + ATF_CHECK_INTEQ(expected_length, output_length); + ATF_CHECK_STREQ(expected, output); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, test_cp932_eucjp); + ATF_TP_ADD_TC(tp, test_cp932_cp932); + + return atf_no_error(); +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/package.nix new file mode 100644 index 0000000000..bb5291831b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libiconv-darwin/package.nix @@ -0,0 +1,95 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + atf, + libiconvReal, + meson, + ninja, + pkg-config, + gitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libiconv"; + version = "99"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "libiconv"; + rev = "libiconv-${finalAttrs.version}"; + hash = "sha256-TGt6rsU52ztfW2rCqwnhMAExLbexI/59IoDOGY+XGu0="; + }; + + inherit (libiconvReal) setupHooks; + + postPatch = + '' + substitute ${./meson.build} meson.build --subst-var version + cp ${./meson.options} meson.options + + # Work around unnecessary private API usage in libcharset + mkdir -p libcharset/os && cat <<-header > libcharset/os/variant_private.h + #pragma once + #include + static inline bool os_variant_has_internal_content(const char*) { return false; } + header + + cp ${./nixpkgs_test.c} tests/libiconv/nixpkgs_test.c + ''; + + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + ]; + + mesonBuildType = "release"; + + mesonFlags = [ (lib.mesonBool "tests" finalAttrs.doInstallCheck) ]; + + postInstall = lib.optionalString stdenv.isDarwin '' + ${stdenv.cc.targetPrefix}install_name_tool "$out/lib/libiconv.2.dylib" \ + -change '@rpath/libcharset.1.dylib' "$out/lib/libcharset.1.dylib" + ''; + + # Tests have to be run in `installCheckPhase` because libiconv expects to `dlopen` + # modules from `$out/lib/i18n`. + nativeInstallCheckInputs = [ pkg-config ]; + installCheckInputs = [ atf ]; + + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # Can’t use `mesonCheckPhase` because it runs the wrong hooks for `installCheckPhase`. + installCheckPhase = '' + runHook preInstallCheck + meson test --no-rebuild + runHook postInstallCheck + ''; + + passthru.updateScript = gitUpdater { rev-prefix = "libiconv-"; }; + + __structuredAttrs = true; + + meta = { + description = "An iconv(3) implementation"; + homepage = "https://opensource.apple.com/releases/"; + license = + with lib.licenses; + [ + bsd2 + bsd3 + ] + ++ lib.optional finalAttrs.doInstallCheck apsl10; + mainProgram = "iconv"; + maintainers = with lib.maintainers; [ reckenrode ]; + platforms = lib.platforms.darwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/li/libiff/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libiff/package.nix new file mode 100644 index 0000000000..40138dc2d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libiff/package.nix @@ -0,0 +1,34 @@ +{ + stdenv, + fetchFromGitHub, + lib, + autoreconfHook, + help2man, +}: + +stdenv.mkDerivation { + pname = "libiff"; + version = "0-unstable-2024-03-02"; + src = fetchFromGitHub { + owner = "svanderburg"; + repo = "libiff"; + rev = "b5f542a83c824f26e0816770c9a17c22bd388606"; + sha256 = "sha256-Arh3Ihd5TWg5tdemodrxz2EDxh/hwz9b2/AvrTONFy8="; + }; + nativeBuildInputs = [ + autoreconfHook + help2man + ]; + meta = with lib; { + description = "Parser for the Interchange File Format (IFF)"; + longDescription = '' + libiff is a portable, extensible parser library implemented in + ANSI C, for EA-IFF 85: Electronic Arts' Interchange File Format + (IFF). + ''; + homepage = "https://github.com/svanderburg/libiff"; + maintainers = with maintainers; [ _414owen ]; + platforms = platforms.all; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/libilbm/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libilbm/package.nix new file mode 100644 index 0000000000..4d145a0002 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libilbm/package.nix @@ -0,0 +1,38 @@ +{ + stdenv, + fetchFromGitHub, + lib, + libiff, + autoreconfHook, + pkg-config, + help2man, +}: + +stdenv.mkDerivation { + pname = "libilbm"; + version = "0-unstable-2024-03-02"; + src = fetchFromGitHub { + owner = "svanderburg"; + repo = "libilbm"; + rev = "586f5822275ef5780509a851cb90c7407b2633d9"; + sha256 = "sha256-EcsrspL/N40yFE15UFWGienpJHhoq1zd8zZe6x4nK6o="; + }; + buildInputs = [ libiff ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + help2man + ]; + meta = with lib; { + description = "Parser for the ILBM: IFF Interleaved BitMap format"; + longDescription = '' + libilbm is a portable parser library built on top of libiff, + for ILBM: IFF Interleaved BitMap format, which is used by programs + such as Deluxe Paint and Graphicraft to read and write images. + ''; + homepage = "https://github.com/svanderburg/libilbm"; + maintainers = with maintainers; [ _414owen ]; + platforms = platforms.all; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/libmamba/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libmamba/package.nix new file mode 100644 index 0000000000..af87959a2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libmamba/package.nix @@ -0,0 +1,60 @@ +{ + fetchFromGitHub, + lib, + stdenv, + cmake, + fmt, + spdlog, + tl-expected, + nlohmann_json, + yaml-cpp, + simdjson, + reproc, + libsolv, + curl, + libarchive, + zstd, + bzip2, + python3Packages, +}: +stdenv.mkDerivation rec { + pname = "libmamba"; + version = "1.5.8"; + src = fetchFromGitHub { + owner = "mamba-org"; + repo = "mamba"; + rev = "${pname}-${version}"; + hash = "sha256-sxZDlMFoMLq2EAzwBVO++xvU1C30JoIoZXEX/sqkXS0="; + }; + nativeBuildInputs = [ + cmake + python3Packages.python + ]; + buildInputs = [ + fmt + spdlog + tl-expected + nlohmann_json + yaml-cpp + simdjson + reproc + libsolv + curl + libarchive + zstd + bzip2 + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_LIBMAMBA" true) + (lib.cmakeBool "BUILD_SHARED" true) + ]; + + meta = { + description = "The library for the fast Cross-Platform Package Manager"; + homepage = "https://github.com/mamba-org/mamba"; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.ericthemagician ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/libmediainfo/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libmediainfo/package.nix index c0abeb221e..d1a6986274 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libmediainfo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libmediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "24.03"; + version = "24.04"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-zCu0TkB8iQq1ZpNMVnY5GFBatYwUE0tT8NHanuokLI0="; + hash = "sha256-dqb/BgiHdz8ll3tYiuUISEuxLRHLeivjMi2qnG5T8bI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/li/libmsgraph/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libmsgraph/package.nix new file mode 100644 index 0000000000..a3cb929f80 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libmsgraph/package.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchurl +, gi-docgen +, gobject-introspection +, meson +, ninja +, pkg-config +, uhttpmock_1_0 +, glib +, gnome-online-accounts +, json-glib +, librest_1_0 +, libsoup_3 +, gnome +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libmsgraph"; + version = "0.2.1"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/msgraph/${lib.versions.majorMinor finalAttrs.version}/msgraph-${finalAttrs.version}.tar.xz"; + hash = "sha256-4OWeqorj4KSOwKbC/tBHCFanCSSOkhK2odA33leS7Ls="; + }; + + nativeBuildInputs = [ + gi-docgen + gobject-introspection + meson + ninja + pkg-config + ]; + + buildInputs = [ + uhttpmock_1_0 + ]; + + propagatedBuildInputs = [ + glib + gnome-online-accounts + json-glib + librest_1_0 + libsoup_3 + ]; + + mesonFlags = [ + # https://gitlab.gnome.org/GNOME/msgraph/-/merge_requests/9 + "-Dc_args=-Wno-error=format-security" + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc/msgraph-0" "$devdoc" + ''; + + passthru = { + updateScript = gnome.updateScript { + attrPath = "libmsgraph"; + packageName = "msgraph"; + }; + }; + + meta = with lib; { + description = "Library to access MS Graph API for Office 365"; + homepage = "https://gitlab.gnome.org/GNOME/msgraph"; + license = licenses.lgpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/li/libsbml/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libsbml/package.nix new file mode 100644 index 0000000000..ce895beee0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libsbml/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + pkg-config, + bzip2, + libxml2, + swig, +}: +stdenv.mkDerivation (attrs: { + pname = "libsbml"; + version = "5.20.2"; + + src = fetchFromGitHub { + owner = "sbmlteam"; + repo = "libsbml"; + rev = "v${attrs.version}"; + hash = "sha256-8JT2r0zuf61VewtZaOAccaOUmDlQPnllA0fXE9rT5X8="; + }; + + patches = [ + # This should be in next release, remember to remove fetchpatch + (fetchpatch { + name = "fix-xmlerror-conversion.patch"; + url = "https://github.com/sbmlteam/libsbml/pull/358.patch"; + hash = "sha256-uirG6XJ+w0hqBUEAGDnzhHoVtJVRdN1eqBYeneKMBao="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + swig + ]; + + buildInputs = [ + bzip2.dev + libxml2 + ]; + + # libSBML doesn't always make use of pkg-config + cmakeFlags = [ + "-DLIBXML_INCLUDE_DIR=${lib.getDev libxml2}/include/libxml2" + "-DLIBXML_LIBRARY=${lib.getLib libxml2}/lib/libxml2${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DPKG_CONFIG_EXECUTABLE=${lib.getBin pkg-config}/bin/pkg-config" + "-DSWIG_EXECUTABLE=${lib.getBin swig}/bin/swig" + ]; + + meta = with lib; { + description = "Library for manipulating Systems Biology Markup Language (SBML)"; + homepage = "https://github.com/sbmlteam/libsbml"; + license = licenses.lgpl21Only; + maintainers = [maintainers.kupac]; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/li/libscfg/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libscfg/package.nix new file mode 100644 index 0000000000..d0c7426080 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libscfg/package.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromSourcehut, meson, ninja, pkg-config, wayland }: + +stdenv.mkDerivation rec { + pname = "libscfg"; + version = "0.1.1"; + + src = fetchFromSourcehut { + owner = "~emersion"; + repo = "libscfg"; + rev = "v${version}"; + sha256 = "sha256-aTcvs7QuDOx17U/yP37LhvIGxmm2WR/6qFYRtfjRN6w="; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ wayland ]; + + meta = with lib; { + homepage = "https://sr.ht/~emersion/libscfg"; + description = "A simple configuration file format"; + license = licenses.mit; + maintainers = with maintainers; [ michaeladler ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/libstrophe/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libstrophe/package.nix index 81c31d5f80..f66c15edfd 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libstrophe/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libstrophe/package.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://strophe.im/libstrophe/"; license = with licenses; [ gpl3Only mit ]; platforms = platforms.unix; - broken = stdenv.isDarwin; maintainers = with maintainers; [ devhell flosse ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/li/libui-ng/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libui-ng/package.nix index 3652bb9080..80e0589ac2 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libui-ng/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libui-ng/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libui-ng"; - version = "unstable-2024-02-05"; + version = "4.1-unstable-2024-05-03"; src = fetchFromGitHub { owner = "libui-ng"; repo = "libui-ng"; - rev = "4d46de31eafad84c88b939356bcd64e6c5ee3821"; - hash = "sha256-Yb8VdJe75uBzRnsfTOVxUXstZmu6dJ9nBuOrf86KO5s="; + rev = "56f1ad65f0f32bb1eb67a268cca4658fbe4567c1"; + hash = "sha256-wo4iS/a1ErdipFDPYKvaGpO/JGtk6eU/qMLC4eUoHnA="; }; postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' @@ -47,13 +47,15 @@ stdenv.mkDerivation rec { (lib.mesonBool "examples" (!stdenv.isDarwin)) ]; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "alpha"; + }; meta = with lib; { description = "A portable GUI library for C"; homepage = "https://github.com/libui-ng/libui-ng"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/li/license-go/package.nix b/third_party/nixpkgs/pkgs/by-name/li/license-go/package.nix new file mode 100644 index 0000000000..2aa87c8020 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/license-go/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +let + version = "5.0.4"; +in +buildGoModule { + pname = "license-go"; + inherit version; + + src = fetchFromGitHub { + owner = "nishanths"; + repo = "license"; + rev = "v${version}"; + hash = "sha256-Rz/eIGa3xLjirPMOs4otfmwy4OzJgopKPbka2OKt8Fo="; + }; + + vendorHash = "sha256-kx3lPhmEo515sHgHBqDC6udz6xkZvB+nn6x3/JaBHbo="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.builtBy=nixpkgs" + ]; + + meta = { + description = "Command line license text generator"; + homepage = "https://github.com/nishanths/license"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ uncenter ]; + mainProgram = "license"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/lightningcss/package.nix b/third_party/nixpkgs/pkgs/by-name/li/lightningcss/package.nix index 598a6033c3..7b9c58e087 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/lightningcss/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/lightningcss/package.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub +, nix-update-script }: rustPlatform.buildRustPackage rec { @@ -37,6 +38,8 @@ rustPlatform.buildRustPackage rec { "--lib" ]; + passthru.updateScript = nix-update-script {}; + meta = with lib; { description = "Extremely fast CSS parser, transformer, and minifier written in Rust"; homepage = "https://lightningcss.dev/"; diff --git a/third_party/nixpkgs/pkgs/by-name/li/lilipod/package.nix b/third_party/nixpkgs/pkgs/by-name/li/lilipod/package.nix new file mode 100644 index 0000000000..b5d6f56768 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/lilipod/package.nix @@ -0,0 +1,70 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, stdenv +}: + +buildGoModule rec { + pname = "lilipod"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "89luca89"; + repo = "lilipod"; + rev = "v${version}"; + hash = "sha256-PqeYNLr4uXe+H+DLENlUpl1H2wV6VJvDoA+MVP3SRqY="; + }; + + vendorHash = null; + + nativeBuildInputs = [ installShellFiles ]; + + buildPhase = '' + runHook preBuild + + RELEASE_VERSION=${version} make all + + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + + make coverage + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 lilipod $out/bin/lilipod + + runHook postInstall + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd lilipod \ + --bash <($out/bin/lilipod completion bash) \ + --fish <($out/bin/lilipod completion fish) \ + --zsh <($out/bin/lilipod completion zsh) + ''; + + meta = { + description = "A very simple (as in few features) container and image manager"; + longDescription = '' + Lilipod is a very simple container manager with minimal features to: + + - Download and manager images + - Create and run containers + + It tries to keep a somewhat compatible CLI interface with Podman/Docker/Nerdctl. + ''; + homepage = "https://github.com/89luca89/lilipod"; + license = lib.licenses.gpl3Only; + mainProgram = "lilipod"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/limine/package.nix b/third_party/nixpkgs/pkgs/by-name/li/limine/package.nix index aa1c7afa34..1a004b42f2 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/limine/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/limine/package.nix @@ -12,7 +12,7 @@ }: let - version = "7.4.0"; + version = "7.5.1"; in # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"; - sha256 = "sha256-lPesgQENZkMbxl/4sh+wTR21QfPJg57CDmqTwcy4b2k="; + sha256 = "sha256-aWzhUwW4799v0qZDpzzztb2LnfRYwjPXWM2dgpqwYIo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/li/listen1/package.nix b/third_party/nixpkgs/pkgs/by-name/li/listen1/package.nix index cf0ec27d69..97470e33c7 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/listen1/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/listen1/package.nix @@ -13,7 +13,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/listen1.desktop -t $out/share/applications substituteInPlace $out/share/applications/listen1.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/third_party/nixpkgs/pkgs/by-name/li/litmusctl/package.nix b/third_party/nixpkgs/pkgs/by-name/li/litmusctl/package.nix new file mode 100644 index 0000000000..83ba16b98d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/litmusctl/package.nix @@ -0,0 +1,43 @@ +{ buildGoModule +, fetchFromGitHub +, installShellFiles +, kubectl +, lib +}: + +buildGoModule rec { + pname = "litmusctl"; + version = "1.5.0"; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = [ + kubectl + ]; + + src = fetchFromGitHub { + owner = "litmuschaos"; + repo = "litmusctl"; + rev = "${version}"; + hash = "sha256-FORrvPKDTG48WV03+HbXiBJa1IHfHV7yMDhQX64kn6U="; + }; + + vendorHash = "sha256-U4dp2E2TZ3rds63PS6GzUVhb2qDSv92bf9JCkWpdLew="; + + postInstall = '' + installShellCompletion --cmd litmusctl \ + --bash <($out/bin/litmusctl completion bash) \ + --fish <($out/bin/listmusctl completion fish) \ + --zsh <($out/bin/litmusctl completion zsh) + ''; + + meta = { + description = "Command-Line tool to manage Litmuschaos's agent plane"; + homepage = "https://github.com/litmuschaos/litmusctl"; + license = lib.licenses.asl20; + mainProgram = "litmusctl"; + maintainers = with lib.maintainers; [ vinetos sailord ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/littlefs-fuse/package.nix b/third_party/nixpkgs/pkgs/by-name/li/littlefs-fuse/package.nix index 0ed4453d62..81300a8a82 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/littlefs-fuse/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/littlefs-fuse/package.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "littlefs-fuse"; - version = "2.7.7"; + version = "2.7.8"; src = fetchFromGitHub { owner = "littlefs-project"; repo = pname; rev = "v${version}"; - hash = "sha256-MCmi0CBs3RLuYn+1BsS6pIeR/tHS1lGNyV3ZwlsnQCA="; + hash = "sha256-dJt2Tcw+qdcOoZ9ejao9NXys/OYQTvbP9+dD6DCzFAw="; }; buildInputs = [ fuse ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix b/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix index 5051944cab..e8fb130984 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix @@ -1,15 +1,16 @@ -{ lib -, darwin -, fetchurl -, fetchpatch -, openssl -, stdenv -, vlc +{ + lib, + darwin, + fetchpatch, + fetchurl, + openssl, + stdenv, + vlc, }: stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2024.03.08"; + version = "2024.05.05"; src = fetchurl { urls = [ @@ -18,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-wWUC4EbxxfK+OxXiyNbNMGObVMZOqb+8jTG078pnDeU="; + hash = "sha256-jGT1jg5pa4bwIcxUy7/svIhU2HCxx2TNMkWvBfN33nM="; }; patches = [ @@ -53,18 +54,19 @@ stdenv.mkDerivation (finalAttrs: { config.linux '' # condition from icu/base.nix - + lib.optionalString (stdenv.hostPlatform.libc == "glibc" - || stdenv.hostPlatform.libc == "musl") '' + + lib.optionalString (lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" ]) '' substituteInPlace liveMedia/include/Locale.hh \ --replace '' '' ''; configurePhase = let - platform = if stdenv.isLinux - then "linux" - else if stdenv.isDarwin - then "macosx-catalina" - else throw "Unsupported platform: ${stdenv.hostPlatform.system}"; + platform = + if stdenv.isLinux then + "linux" + else if stdenv.isDarwin then + "macosx-catalina" + else + throw "Unsupported platform: ${stdenv.hostPlatform.system}"; in '' runHook preConfigure @@ -75,8 +77,15 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" + "C_COMPILER=$(CC)" + "CPLUSPLUS_COMPILER=$(CXX)" + "LIBRARY_LINK=$(AR) cr " + "LINK=$(CXX) -o " ]; + # required for whitespaces in makeFlags + __structuredAttrs = true; + enableParallelBuilding = true; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/by-name/li/livekit-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/li/livekit-cli/package.nix index 75682ea71b..fe276c14c3 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/livekit-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/livekit-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "livekit-cli"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit-cli"; rev = "v${version}"; - hash = "sha256-/H7Xn/nUumKf62qV6kt2PBbvIt67IwA1dt+hj8mbE30="; + hash = "sha256-IARQ5yxktem729SrxdT5i+7+1dY60xw+2KZU+unlsKM="; }; - vendorHash = "sha256-yO2Qr6H5sZGLMHiue5IVHkF1IDsZZh48s6KNpXR+nzA="; + vendorHash = "sha256-3ePOwEEPexM+k0atW/mW4yNVtnsEXwv1w5NVQLyexbs="; subPackages = [ "cmd/livekit-cli" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/li/livekit/package.nix b/third_party/nixpkgs/pkgs/by-name/li/livekit/package.nix index b362366e51..74bc3b03e6 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/livekit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/livekit/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "livekit"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit"; rev = "v${version}"; - hash = "sha256-tgoVHRv8hnDkjFYShZ/3lieknhIobHv27RVvQOCtEWU="; + hash = "sha256-i6G221n6wIOYo//+w/4XN4QpTkt7AYwAw6RBYo66vXI="; }; - vendorHash = "sha256-TZ435gu5naFi/JLz6B/1fpvGA3diJp4JIWL1zgNlb4Q="; + vendorHash = "sha256-7MPjhjTIO7ZKKyc0Du8+0F+8PvpiwiIBMnXZiYX2XyI="; subPackages = [ "cmd/server" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/li/livi/package.nix b/third_party/nixpkgs/pkgs/by-name/li/livi/package.nix index 92c7edee95..b36f08497a 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/livi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/livi/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "livi"; - version = "0.0.6"; + version = "0.1.0"; src = fetchFromGitLab { owner = "guidog"; repo = "livi"; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "sha256-DaIbBCJT4Da5noW6Q5z1yzTZ256HNqrvdXgwSY7p/D8="; + sha256 = "sha256-FJ43BDRsZUFuRrNFWuEJ/nSO+suWad2QvqhwzuXWBtY="; }; nativeBuildInputs = [ meson diff --git a/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix index ed37e7d448..8b888d2bce 100644 --- a/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix @@ -72,18 +72,27 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "2674"; + version = "2843"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-5Vc9DkXD83X22xRxZ2laCxrAZe2RdsL6FwR2tC/YGU0="; + hash = "sha256-wT/E4osmhZUSSW73DoNTs5BMTa1yU4E2mDpwiS0pEQc="; + leaveDotGit = true; + postFetch = '' + git -C "$out" rev-parse --short HEAD > $out/COMMIT + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; postPatch = '' substituteInPlace ./ggml-metal.m \ - --replace '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";" + --replace-fail '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";" + + substituteInPlace ./scripts/build-info.cmake \ + --replace-fail 'set(BUILD_NUMBER 0)' 'set(BUILD_NUMBER ${finalAttrs.version})' \ + --replace-fail 'set(BUILD_COMMIT "unknown")' "set(BUILD_COMMIT \"$(cat COMMIT)\")" ''; nativeBuildInputs = [ cmake ninja pkg-config git ] diff --git a/third_party/nixpkgs/pkgs/by-name/ll/llm-ls/package.nix b/third_party/nixpkgs/pkgs/by-name/ll/llm-ls/package.nix index a29db52765..d9fb4d6f60 100644 --- a/third_party/nixpkgs/pkgs/by-name/ll/llm-ls/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ll/llm-ls/package.nix @@ -1,11 +1,13 @@ { lib , rustPlatform , fetchFromGitHub +, pkg-config +, openssl }: let pname = "llm-ls"; - version = "0.4.0"; + version = "0.5.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -14,10 +16,14 @@ rustPlatform.buildRustPackage { owner = "huggingface"; repo = "llm-ls"; rev = version; - sha256 = "sha256-aMoT/rH6o4dHCSiSI/btdKysFfIbHvV7R5dRHIOF/Qs="; + sha256 = "sha256-DyPdx+nNBhOZ86GQljMYULatWny2EteNNzzO6qv1Wlk="; }; - cargoHash = "sha256-Z6BO4kDtlIrVdDk1fiwyelpu1rj7e4cibgFZRsl1pfA="; + cargoHash = "sha256-7McUyQjnCuV0JG65hUoR8TtB4vrjiEO1l7NXYochgG8="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; meta = with lib; { description = "LSP server leveraging LLMs for code completion (and more?)"; diff --git a/third_party/nixpkgs/pkgs/by-name/lm/lms/package.nix b/third_party/nixpkgs/pkgs/by-name/lm/lms/package.nix new file mode 100644 index 0000000000..778414a5db --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lm/lms/package.nix @@ -0,0 +1,86 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + cmake, + pkg-config, + gtest, + boost, + wt, + taglib, + libconfig, + libarchive, + graphicsmagick, + ffmpeg, + zlib, + libSM, + libICE, +}: + +stdenv.mkDerivation rec { + pname = "lms"; + version = "3.51.1"; + src = fetchFromGitHub { + owner = "epoupon"; + repo = "lms"; + rev = "v${version}"; + hash = "sha256-5lEbrB218EVVHIzo1efvQYybut2OpfDKpLlRs0brhXg="; + }; + + strictDeps = true; + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + buildInputs = [ + gtest + boost + wt + taglib + libconfig + libarchive + graphicsmagick + ffmpeg + zlib + libSM + libICE + ]; + + postPatch = '' + substituteInPlace src/lms/main.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" + substituteInPlace src/tools/recommendation/LmsRecommendation.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" + substituteInPlace src/tools/db-generator/LmsDbGenerator.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" + substituteInPlace src/tools/cover/LmsCover.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" + ''; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + + postInstall = '' + substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/bin/ffmpeg" "${ffmpeg}/bin/ffmpeg" + substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/Wt/resources" "${wt}/share/Wt/resources" + substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms/docroot" "$out/share/lms/docroot" + substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms/approot" "$out/share/lms/approot" + substituteInPlace $out/share/lms/default.service --replace-fail "/usr/bin/lms" "$out/bin/lms" + install -Dm444 $out/share/lms/default.service -T $out/lib/systemd/system/lmsd.service + ''; + + preFixup = '' + wrapProgram $out/bin/lms \ + --prefix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath [libSM libICE]}" + wrapProgram $out/bin/lms-metadata \ + --prefix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath [libSM libICE]}" + wrapProgram $out/bin/lms-recommendation \ + --prefix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath [libSM libICE]}" + ''; + + meta = with lib; { + homepage = "https://github.com/epoupon/lms"; + description = "Lightweight Music Server - Access your self-hosted music using a web interface"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + mainProgram = "lms"; + maintainers = with maintainers; [ mksafavi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/darwin.nix b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/darwin.nix new file mode 100644 index 0000000000..5fa30e699d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/darwin.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchurl +, undmg +, lib +, meta +, pname +, version +}: +stdenv.mkDerivation { + inherit meta pname version; + + src = fetchurl { + url = "https://releases.lmstudio.ai/mac/arm64/${version}/b/latest/LM-Studio-${version}-arm64.dmg"; + hash = "sha256-kb1XoTZjhCL1+CsV+r3/EN0srzIJ43H2VMZ779dVq1k="; + }; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -r *.app $out/Applications + runHook postInstall + ''; +} + diff --git a/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/linux.nix b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/linux.nix new file mode 100644 index 0000000000..add6274d36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/linux.nix @@ -0,0 +1,29 @@ +{ lib +, appimageTools +, fetchurl +, version +, pname +, meta +}: +let + src = fetchurl { + url = "https://releases.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage"; + hash = "sha256-hcV8wDhulFAxHDBDKicpEGovwcsn9RaIi/idUz+YzD8="; + }; + + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit meta pname version src; + + extraPkgs = pkgs: [ pkgs.ocl-icd ]; + + extraInstallCommands = '' + mkdir -p $out/share/applications + cp -r ${appimageContents}/usr/share/icons $out/share + install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications + substituteInPlace $out/share/applications/lm-studio.desktop \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio' + ''; +} + diff --git a/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/package.nix b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/package.nix index f1edf4d8c5..d18c76acef 100644 --- a/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lm/lmstudio/package.nix @@ -1,39 +1,22 @@ { lib -, appimageTools -, fetchurl +, stdenv +, callPackage +, ... }: - let pname = "lmstudio"; - version = "0.2.18"; - src = fetchurl { - url = "https://releases.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage"; - hash = "sha256-cUa0fjV7xx6+2tnGVP7uLG0QQb44LhP2nYsn6Qn0al4="; - }; - - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.ocl-icd ]; - - extraInstallCommands = '' - mkdir -p $out/share/applications - mv $out/bin/lmstudio-${version} $out/bin/lmstudio - cp -r ${appimageContents}/usr/share/icons $out/share - install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications - substituteInPlace $out/share/applications/lm-studio.desktop \ - --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio' - ''; - + version = "0.2.22"; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; license = lib.licenses.unfree; mainProgram = "lmstudio"; - maintainers = with lib.maintainers; [ drupol ]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ drupol eeedean ]; + platforms = lib.platforms.linux ++ [ "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -} +in + if stdenv.isDarwin + then callPackage ./darwin.nix { inherit pname version meta; } + else callPackage ./linux.nix { inherit pname version meta; } + diff --git a/third_party/nixpkgs/pkgs/by-name/lo/local-ai/lib.nix b/third_party/nixpkgs/pkgs/by-name/lo/local-ai/lib.nix new file mode 100644 index 0000000000..46f3ba88e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lo/local-ai/lib.nix @@ -0,0 +1,30 @@ +{ lib +, writers +, writeText +, linkFarmFromDrvs +}: { + genModels = configs: + let + name = lib.strings.sanitizeDerivationName + (builtins.concatStringsSep "_" ([ "local-ai-models" ] ++ (builtins.attrNames configs))); + + genModelFiles = name: config: + let + templateName = type: name + "_" + type; + + config' = lib.recursiveUpdate config ({ + inherit name; + } // lib.optionalAttrs (lib.isDerivation config.parameters.model) { + parameters.model = config.parameters.model.name; + } // lib.optionalAttrs (config ? template) { + template = builtins.mapAttrs (n: _: templateName n) config.template; + }); + in + [ (writers.writeYAML "${name}.yaml" config') ] + ++ lib.optional (lib.isDerivation config.parameters.model) + config.parameters.model + ++ lib.optionals (config ? template) + (lib.mapAttrsToList (n: writeText "${templateName n}.tmpl") config.template); + in + linkFarmFromDrvs name (lib.flatten (lib.mapAttrsToList genModelFiles configs)); +} diff --git a/third_party/nixpkgs/pkgs/by-name/lo/local-ai/module.nix b/third_party/nixpkgs/pkgs/by-name/lo/local-ai/module.nix new file mode 100644 index 0000000000..70f486b43b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lo/local-ai/module.nix @@ -0,0 +1,64 @@ +{ pkgs, config, lib, ... }: +let + cfg = config.services.local-ai; + inherit (lib) mkOption types; +in +{ + options.services.local-ai = { + enable = lib.mkEnableOption "Enable service"; + + package = lib.mkPackageOption pkgs "local-ai" { }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + }; + + port = mkOption { + type = types.port; + default = 8080; + }; + + threads = mkOption { + type = types.int; + default = 1; + }; + + models = mkOption { + type = types.either types.package types.str; + default = "models"; + }; + + parallelRequests = mkOption { + type = types.int; + default = 1; + }; + + logLevel = mkOption { + type = types.enum [ "error" "warn" "info" "debug" "trace" ]; + default = "warn"; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.local-ai = { + wantedBy = [ "multi-user.target" ]; + environment.LLAMACPP_PARALLEL = toString cfg.parallelRequests; + serviceConfig = { + DynamicUser = true; + ExecStart = lib.escapeShellArgs ([ + "${cfg.package}/bin/local-ai" + "--address=:${toString cfg.port}" + "--threads=${toString cfg.threads}" + "--localai-config-dir=." + "--models-path=${cfg.models}" + "--log-level=${cfg.logLevel}" + ] + ++ lib.optional (cfg.parallelRequests > 1) "--parallel-requests" + ++ cfg.extraArgs); + RuntimeDirectory = "local-ai"; + WorkingDirectory = "%t/local-ai"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/lo/local-ai/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/local-ai/package.nix index f597097dc8..5d582f3604 100644 --- a/third_party/nixpkgs/pkgs/by-name/lo/local-ai/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lo/local-ai/package.nix @@ -3,9 +3,10 @@ , stdenv , lib , addDriverRunpath -, fetchpatch , fetchFromGitHub , protobuf +, protoc-gen-go +, protoc-gen-go-grpc , grpc , openssl , llama-cpp @@ -61,8 +62,8 @@ let inherit (cudaPackages) libcublas cuda_nvcc cuda_cccl cuda_cudart cudatoolkit; - go-llama-ggml = effectiveStdenv.mkDerivation { - name = "go-llama-ggml"; + go-llama = effectiveStdenv.mkDerivation { + name = "go-llama"; src = fetchFromGitHub { owner = "go-skynet"; repo = "go-llama.cpp"; @@ -98,8 +99,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; - rev = "1b67731e184e27a465b8c5476061294a4af668ea"; - hash = "sha256-0WWbsklpW6HhFRkvWpYh8Lhi8VIansS/zmyIKNQRkIs="; + rev = "c12452c7aec8a02264afc00196a13caa591a13ac"; + hash = "sha256-Kji8dlz7OfhPeNXnYgBHzpGGMhCsRLJ9d+EFf77Q6Co="; fetchSubmodules = true; }; postPatch = prev.postPatch + '' @@ -252,8 +253,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = "8f253ef3af1c62c04316ba4afa7145fc4d701a8c"; - hash = "sha256-yHHjhpQIn99A/hqFwAb7TfTf4Q9KnKat93zyXS70bT8="; + rev = "73d13ad19a8c9c4da4f405088a85169b1a171e66"; + hash = "sha256-7g/J3a3behGgcJXy9ryAYXxgOYnsRMlGmux13re28AY="; }; nativeBuildInputs = [ cmake pkg-config ] @@ -303,8 +304,8 @@ let src = fetchFromGitHub { owner = "mudler"; repo = "go-stable-diffusion"; - rev = "362df9da29f882dbf09ade61972d16a1f53c3485"; - hash = "sha256-A5KvMZOviPsIpPHxM8cacT+qE2x1iFJAbPsRs4sLijY="; + rev = "4a3cd6aeae6f66ee57eae9a0075f8c58c3a6a38f"; + hash = "sha256-KXUvMP6cDyWib4rG0RmVRm3pgrdsfKXaH3k0v5/mTe8="; fetchSubmodules = true; }; buildFlags = [ "libstablediffusion.a" ]; @@ -340,8 +341,8 @@ let src = fetchFromGitHub { owner = "M0Rf30"; repo = "go-tiny-dream"; - rev = "22a12a4bc0ac5455856f28f3b771331a551a4293"; - hash = "sha256-DAVHD6E0OKHf4C2ldoI0Mm7813DIrmWFONUhSCQPCfc="; + rev = "c04fa463ace9d9a6464313aa5f9cd0f953b6c057"; + hash = "sha256-uow3vbAI4F/fTGjYOKOLqTpKq7NgGYSZhGlEhn7h6s0="; fetchSubmodules = true; }; postUnpack = '' @@ -371,18 +372,18 @@ let stdenv; pname = "local-ai"; - version = "2.12.4"; + version = "2.15.0"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-piu2B6u4ZfxiOd9SXrE7jiiiwL2SM8EqXo2s5qeKRl0="; + hash = "sha256-AjNgfZjVxlw0LtPbUTbJuLcUfqJdPzn6vOmUDz/v7Jc="; }; self = buildGoModule.override { stdenv = effectiveStdenv; } { inherit pname version src; - vendorHash = "sha256-8Hu1y/PK21twnB7D22ltslFFzRrsB8d1R2hkgIFB/XY="; + vendorHash = "sha256-+ZPZkOpaTsKrL2HDOEtAr8sT6uqTiQXo/XS+MBNZq5E="; env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4"; @@ -392,21 +393,23 @@ let in '' sed -i Makefile \ - -e 's;git clone.*go-llama-ggml$;${cp} ${go-llama-ggml} sources/go-llama-ggml;' \ + -e 's;git clone.*go-llama\.cpp$;${cp} ${go-llama} sources/go-llama\.cpp;' \ -e 's;git clone.*gpt4all$;${cp} ${gpt4all} sources/gpt4all;' \ -e 's;git clone.*go-piper$;${cp} ${if with_tts then go-piper else go-piper.src} sources/go-piper;' \ - -e 's;git clone.*go-rwkv$;${cp} ${go-rwkv} sources/go-rwkv;' \ + -e 's;git clone.*go-rwkv\.cpp$;${cp} ${go-rwkv} sources/go-rwkv\.cpp;' \ -e 's;git clone.*whisper\.cpp$;${cp} ${whisper-cpp.src} sources/whisper\.cpp;' \ - -e 's;git clone.*go-bert$;${cp} ${go-bert} sources/go-bert;' \ + -e 's;git clone.*go-bert\.cpp$;${cp} ${go-bert} sources/go-bert\.cpp;' \ -e 's;git clone.*diffusion$;${cp} ${if with_stablediffusion then go-stable-diffusion else go-stable-diffusion.src} sources/go-stable-diffusion;' \ -e 's;git clone.*go-tiny-dream$;${cp} ${if with_tinydream then go-tiny-dream else go-tiny-dream.src} sources/go-tiny-dream;' \ -e 's, && git checkout.*,,g' \ -e '/mod download/ d' \ + -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-/ d' \ + ''; - ${cp} ${llama-cpp-grpc}/bin/*grpc-server backend/cpp/llama/grpc-server - echo "grpc-server:" > backend/cpp/llama/Makefile - '' - ; + postConfigure = '' + mkdir -p backend-assets/grpc + cp ${llama-cpp-grpc}/bin/*grpc-server backend-assets/grpc/llama-cpp + ''; buildInputs = [ ] ++ lib.optionals with_cublas [ libcublas ] @@ -415,14 +418,19 @@ let ++ lib.optionals with_stablediffusion go-stable-diffusion.buildInputs ++ lib.optionals with_tts go-piper.buildInputs; - nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals with_cublas [ cuda_nvcc ]; + nativeBuildInputs = [ + protobuf + protoc-gen-go + protoc-gen-go-grpc + makeWrapper + ] + ++ lib.optionals with_cublas [ cuda_nvcc ]; enableParallelBuilding = false; modBuildPhase = '' mkdir sources - make prepare-sources + make prepare-sources protogen-go go mod tidy -v ''; @@ -486,7 +494,7 @@ let passthru.local-packages = { inherit - go-tiny-dream go-rwkv go-bert go-llama-ggml gpt4all go-piper + go-tiny-dream go-rwkv go-bert go-llama gpt4all go-piper llama-cpp-grpc whisper-cpp go-tiny-dream-ncnn espeak-ng' piper-phonemize piper-tts'; }; @@ -498,6 +506,7 @@ let }; passthru.tests = callPackages ./tests.nix { inherit self; }; + passthru.lib = callPackages ./lib.nix { }; meta = with lib; { description = "OpenAI alternative to run local LLMs, image and audio generation"; diff --git a/third_party/nixpkgs/pkgs/by-name/lo/local-ai/tests.nix b/third_party/nixpkgs/pkgs/by-name/lo/local-ai/tests.nix index 82d1b775da..5740362f24 100644 --- a/third_party/nixpkgs/pkgs/by-name/lo/local-ai/tests.nix +++ b/third_party/nixpkgs/pkgs/by-name/lo/local-ai/tests.nix @@ -5,156 +5,270 @@ , fetchurl , writers , symlinkJoin -, linkFarmFromDrvs , jq +, prom2json }: +let + common-config = { config, ... }: { + imports = [ ./module.nix ]; + services.local-ai = { + enable = true; + package = self; + threads = config.virtualisation.cores; + logLevel = "debug"; + }; + }; + + inherit (self.lib) genModels; +in { version = testers.testVersion { package = self; version = "v" + self.version; + command = "local-ai --help"; }; - health = - let - port = "8080"; - in - testers.runNixOSTest { - name = self.name + "-health"; - nodes.machine = { - systemd.services.local-ai = { - wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${self}/bin/local-ai --debug --localai-config-dir . --address :${port}"; - }; - }; - testScript = '' + health = testers.runNixOSTest { + name = self.name + "-health"; + nodes.machine = common-config; + testScript = + let + port = "8080"; + in + '' machine.wait_for_open_port(${port}) machine.succeed("curl -f http://localhost:${port}/readyz") - ''; - }; - # https://localai.io/docs/getting-started/manual/ - llama = + machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json") + machine.copy_from_vm("metrics.json") + ''; + }; + + # https://localai.io/features/embeddings/#bert-embeddings + bert = let - port = "8080"; - gguf = fetchurl { - url = "https://huggingface.co/TheBloke/Luna-AI-Llama2-Uncensored-GGUF/resolve/main/luna-ai-llama2-uncensored.Q4_K_M.gguf"; - sha256 = "6a9dc401c84f0d48996eaa405174999c3a33bf12c2bfd8ea4a1e98f376de1f15"; + model = "embedding"; + model-configs.${model} = { + # Note: q4_0 and q4_1 models can not be loaded + parameters.model = fetchurl { + url = "https://huggingface.co/skeskinen/ggml/resolve/main/all-MiniLM-L6-v2/ggml-model-f16.bin"; + sha256 = "9c195b2453a4fef60a4f6be3a88a39211366214df6498a4fe4885c9e22314f50"; + }; + backend = "bert-embeddings"; + embeddings = true; + }; + + models = genModels model-configs; + + requests.request = { + inherit model; + input = "Your text string goes here"; }; - models = linkFarmFromDrvs "models" [ - gguf - ]; in testers.runNixOSTest { - name = self.name + "-llama"; - nodes.machine = - let - cores = 4; - in - { - virtualisation = { - inherit cores; - memorySize = 8192; - }; - systemd.services.local-ai = { - wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${self}/bin/local-ai --debug --threads ${toString cores} --models-path ${models} --localai-config-dir . --address :${port}"; - }; - }; + name = self.name + "-bert"; + nodes.machine = { + imports = [ common-config ]; + virtualisation.cores = 2; + virtualisation.memorySize = 2048; + services.local-ai.models = models; + }; + passthru = { inherit models requests; }; testScript = let - # https://localai.io/features/text-generation/#chat-completions - request-chat-completions = { - model = gguf.name; - messages = [{ role = "user"; content = "Say this is a test!"; }]; - temperature = 0.7; - }; - # https://localai.io/features/text-generation/#edit-completions - request-edit-completions = { - model = gguf.name; - instruction = "rephrase"; - input = "Black cat jumped out of the window"; - temperature = 0.7; - }; - # https://localai.io/features/text-generation/#completions - request-completions = { - model = gguf.name; - prompt = "A long time ago in a galaxy far, far away"; - temperature = 0.7; - }; + port = "8080"; in '' machine.wait_for_open_port(${port}) machine.succeed("curl -f http://localhost:${port}/readyz") machine.succeed("curl -f http://localhost:${port}/v1/models --output models.json") - machine.succeed("${jq}/bin/jq --exit-status 'debug | .data[].id == \"${gguf.name}\"' models.json") - machine.succeed("curl -f http://localhost:${port}/v1/chat/completions --json @${writers.writeJSON "request-chat-completions.json" request-chat-completions} --output chat-completions.json") - machine.succeed("${jq}/bin/jq --exit-status 'debug | .object == \"chat.completion\"' chat-completions.json") - machine.succeed("curl -f http://localhost:${port}/v1/edits --json @${writers.writeJSON "request-edit-completions.json" request-edit-completions} --output edit-completions.json") - machine.succeed("${jq}/bin/jq --exit-status 'debug | .object == \"edit\"' edit-completions.json") - machine.succeed("curl -f http://localhost:${port}/v1/completions --json @${writers.writeJSON "request-completions.json" request-completions} --output completions.json") - machine.succeed("${jq}/bin/jq --exit-status 'debug | .object ==\"text_completion\"' completions.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .data[].id == \"${model}\"' models.json") + + machine.succeed("curl -f http://localhost:${port}/embeddings --json @${writers.writeJSON "request.json" requests.request} --output embeddings.json") + machine.copy_from_vm("embeddings.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .model == \"${model}\"' embeddings.json") + + machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json") + machine.copy_from_vm("metrics.json") ''; }; -} // lib.optionalAttrs self.features.with_tts { - # https://localai.io/features/text-to-audio/#piper - tts = +} // lib.optionalAttrs (!self.features.with_cublas && !self.features.with_clblas) { + # https://localai.io/docs/getting-started/manual/ + llama = let - port = "8080"; - voice-en-us = fetchzip { - url = "https://github.com/rhasspy/piper/releases/download/v0.0.2/voice-en-us-danny-low.tar.gz"; - hash = "sha256-5wf+6H5HeQY0qgdqnAG1vSqtjIFM9lXH53OgouuPm0M="; - stripRoot = false; + model = "gpt-3.5-turbo"; + + # https://localai.io/advanced/#full-config-model-file-reference + model-configs.${model} = rec { + context_size = 8192; + backend = "llama-cpp"; + parameters = { + # https://huggingface.co/lmstudio-community/Meta-Llama-3-8B-Instruct-GGUF + # https://ai.meta.com/blog/meta-llama-3/ + model = fetchurl { + url = "https://huggingface.co/lmstudio-community/Meta-Llama-3-8B-Instruct-GGUF/resolve/main/Meta-Llama-3-8B-Instruct-Q4_K_M.gguf"; + sha256 = "ab9e4eec7e80892fd78f74d9a15d0299f1e22121cea44efd68a7a02a3fe9a1da"; + }; + # defaults from: + # https://deepinfra.com/meta-llama/Meta-Llama-3-8B-Instruct + temperature = 0.7; + top_p = 0.9; + top_k = 0; + # following parameter leads to outputs like: !!!!!!!!!!!!!!!!!!! + #repeat_penalty = 1; + presence_penalty = 0; + frequency_penalty = 0; + max_tokens = 100; + }; + stopwords = [ "<|eot_id|>" ]; + template = { + # Templates implement following specifications + # https://github.com/meta-llama/llama3/tree/main?tab=readme-ov-file#instruction-tuned-models + # ... and are insprired by: + # https://github.com/mudler/LocalAI/blob/master/embedded/models/llama3-instruct.yaml + # + # The rules for template evaluateion are defined here: + # https://pkg.go.dev/text/template + chat_message = '' + <|start_header_id|>{{.RoleName}}<|end_header_id|> + + {{.Content}}${builtins.head stopwords}''; + + chat = "<|begin_of_text|>{{.Input}}<|start_header_id|>assistant<|end_header_id|>"; + }; }; - ggml-tiny-en = fetchurl { - url = "https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-tiny.en-q5_1.bin"; - hash = "sha256-x3xXZvHO8JtrfUfyG1Rsvd1BV4hrO11tT3CekeZsfCs="; - }; - whisper-en = { - name = "whisper-en"; - backend = "whisper"; - parameters.model = ggml-tiny-en.name; - }; - models = symlinkJoin { - name = "models"; - paths = [ - voice-en-us - (linkFarmFromDrvs "whisper-en" [ - (writers.writeYAML "whisper-en.yaml" whisper-en) - ggml-tiny-en - ]) - ]; + + models = genModels model-configs; + + requests = { + # https://localai.io/features/text-generation/#chat-completions + chat-completions = { + inherit model; + messages = [{ role = "user"; content = "1 + 2 = ?"; }]; + }; + # https://localai.io/features/text-generation/#edit-completions + edit-completions = { + inherit model; + instruction = "rephrase"; + input = "Black cat jumped out of the window"; + max_tokens = 50; + }; + # https://localai.io/features/text-generation/#completions + completions = { + inherit model; + prompt = "A long time ago in a galaxy far, far away"; + }; }; in testers.runNixOSTest { - name = self.name + "-tts"; - nodes.machine = - let - cores = 2; - in - { - virtualisation = { - inherit cores; - }; - systemd.services.local-ai = { - wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${self}/bin/local-ai --debug --threads ${toString cores} --models-path ${models} --localai-config-dir . --address :${port}"; - }; - }; + name = self.name + "-llama"; + nodes.machine = { + imports = [ common-config ]; + virtualisation.cores = 4; + virtualisation.memorySize = 8192; + services.local-ai.models = models; + # TODO: Add test case parallel requests + services.local-ai.parallelRequests = 2; + }; + passthru = { inherit models requests; }; testScript = let - request = { - model = "en-us-danny-low.onnx"; - backend = "piper"; - input = "Hello, how are you?"; - }; + port = "8080"; in '' machine.wait_for_open_port(${port}) machine.succeed("curl -f http://localhost:${port}/readyz") - machine.succeed("curl -f http://localhost:${port}/tts --json @${writers.writeJSON "request.json" request} --output out.wav") - machine.succeed("curl -f http://localhost:${port}/v1/audio/transcriptions --header 'Content-Type: multipart/form-data' --form file=@out.wav --form model=${whisper-en.name} --output transcription.json") - machine.succeed("${jq}/bin/jq --exit-status 'debug | .segments | first.text == \"${request.input}\"' transcription.json") + machine.succeed("curl -f http://localhost:${port}/v1/models --output models.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .data[].id == \"${model}\"' models.json") + + machine.succeed("curl -f http://localhost:${port}/v1/chat/completions --json @${writers.writeJSON "request-chat-completions.json" requests.chat-completions} --output chat-completions.json") + machine.copy_from_vm("chat-completions.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .object == \"chat.completion\"' chat-completions.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .choices | first.message.content | tonumber == 3' chat-completions.json") + + machine.succeed("curl -f http://localhost:${port}/v1/edits --json @${writers.writeJSON "request-edit-completions.json" requests.edit-completions} --output edit-completions.json") + machine.copy_from_vm("edit-completions.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .object == \"edit\"' edit-completions.json") + machine.succeed("${jq}/bin/jq --exit-status '.usage.completion_tokens | debug == ${toString requests.edit-completions.max_tokens}' edit-completions.json") + + machine.succeed("curl -f http://localhost:${port}/v1/completions --json @${writers.writeJSON "request-completions.json" requests.completions} --output completions.json") + machine.copy_from_vm("completions.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .object ==\"text_completion\"' completions.json") + machine.succeed("${jq}/bin/jq --exit-status '.usage.completion_tokens | debug == ${toString model-configs.${model}.parameters.max_tokens}' completions.json") + + machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json") + machine.copy_from_vm("metrics.json") + ''; + }; + +} // lib.optionalAttrs (self.features.with_tts && !self.features.with_cublas && !self.features.with_clblas) { + # https://localai.io/features/text-to-audio/#piper + tts = + let + model-stt = "whisper-en"; + model-configs.${model-stt} = { + backend = "whisper"; + parameters.model = fetchurl { + url = "https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-tiny.en-q5_1.bin"; + hash = "sha256-x3xXZvHO8JtrfUfyG1Rsvd1BV4hrO11tT3CekeZsfCs="; + }; + }; + + model-tts = "piper-en"; + model-configs.${model-tts} = { + backend = "piper"; + parameters.model = "en-us-danny-low.onnx"; + }; + + models = + let + models = genModels model-configs; + in + symlinkJoin { + inherit (models) name; + paths = [ + models + (fetchzip { + url = "https://github.com/rhasspy/piper/releases/download/v0.0.2/voice-en-us-danny-low.tar.gz"; + hash = "sha256-5wf+6H5HeQY0qgdqnAG1vSqtjIFM9lXH53OgouuPm0M="; + stripRoot = false; + }) + ]; + }; + + requests.request = { + model = model-tts; + input = "Hello, how are you?"; + }; + in + testers.runNixOSTest { + name = self.name + "-tts"; + nodes.machine = { + imports = [ common-config ]; + virtualisation.cores = 2; + services.local-ai.models = models; + }; + passthru = { inherit models requests; }; + testScript = + let + port = "8080"; + in + '' + machine.wait_for_open_port(${port}) + machine.succeed("curl -f http://localhost:${port}/readyz") + machine.succeed("curl -f http://localhost:${port}/v1/models --output models.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug' models.json") + + machine.succeed("curl -f http://localhost:${port}/tts --json @${writers.writeJSON "request.json" requests.request} --output out.wav") + machine.copy_from_vm("out.wav") + + machine.succeed("curl -f http://localhost:${port}/v1/audio/transcriptions --header 'Content-Type: multipart/form-data' --form file=@out.wav --form model=${model-stt} --output transcription.json") + machine.copy_from_vm("transcription.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .segments | first.text == \"${requests.request.input}\"' transcription.json") + + machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json") + machine.copy_from_vm("metrics.json") ''; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/lo/lorem/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/lorem/package.nix index d024aeaf61..05200e2ef6 100644 --- a/third_party/nixpkgs/pkgs/by-name/lo/lorem/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lo/lorem/package.nix @@ -14,22 +14,22 @@ , wrapGAppsHook4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lorem"; - version = "1.3"; + version = "1.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World/design"; - repo = pname; - rev = version; - hash = "sha256-+Dp/o1rZSHWihLLLe6CzV6c7uUnSsE8Ct3tbLNqlGF0="; + repo = "lorem"; + rev = finalAttrs.version; + hash = "sha256-6+kDKKK1bkIOZlqzKWpzpjAS5o7bkbVFITMZVmJijuU="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-YYjPhlPp211i+ECPu1xgDumz8nVqWRO8YzcZXy8uunI="; + src = finalAttrs.src; + name = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-nzP2Jp9l1QgL7Wk9SWlsSVNaeVe3t48MmeX7Xuz+PKM="; }; nativeBuildInputs = [ @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + changelog = "https://gitlab.gnome.org/World/design/lorem/-/releases/${finalAttrs.version}"; description = "Generate placeholder text"; - homepage = "https://gitlab.gnome.org/World/design/lorem"; - changelog = "https://gitlab.gnome.org/World/design/lorem/-/releases/${version}"; + homepage = "https://apps.gnome.org/Lorem/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ michaelgrahamevans ]; mainProgram = "lorem"; + maintainers = with maintainers; [ michaelgrahamevans ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/lo/loupe/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/loupe/package.nix index 06820aa28a..346da941ba 100644 --- a/third_party/nixpkgs/pkgs/by-name/lo/loupe/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lo/loupe/package.nix @@ -15,17 +15,18 @@ , lcms2 , libadwaita , libgweather +, libseccomp , glycin-loaders , gnome }: stdenv.mkDerivation (finalAttrs: { pname = "loupe"; - version = "45.3"; + version = "46.2"; src = fetchurl { url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz"; - hash = "sha256-9l8tEgjQhatf+pmN1DyS/pUictTVm1HP7MEevf/KLYY="; + hash = "sha256-OhWj+c+PiJp+ZC45AimfeSGKkAHAjFY3TgWRT/71qzA="; }; patches = [ @@ -51,13 +52,14 @@ stdenv.mkDerivation (finalAttrs: { lcms2 libadwaita libgweather + libseccomp ]; postPatch = '' # Replace hash of file we patch in vendored glycin. jq \ - --arg hash "$(sha256sum vendor/glycin/src/dbus.rs | cut -d' ' -f 1)" \ - '.files."src/dbus.rs" = $hash' \ + --arg hash "$(sha256sum vendor/glycin/src/sandbox.rs | cut -d' ' -f 1)" \ + '.files."src/sandbox.rs" = $hash' \ vendor/glycin/.cargo-checksum.json \ | sponge vendor/glycin/.cargo-checksum.json ''; diff --git a/third_party/nixpkgs/pkgs/by-name/lo/louvain-community/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/louvain-community/package.nix index 8578570923..21ef70400c 100644 --- a/third_party/nixpkgs/pkgs/by-name/lo/louvain-community/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lo/louvain-community/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "louvain-community"; - version = "unstable-2024-01-30"; + version = "0-unstable-2024-01-30"; src = fetchFromGitHub { owner = "meelgroup"; diff --git a/third_party/nixpkgs/pkgs/by-name/lp/lprint/package.nix b/third_party/nixpkgs/pkgs/by-name/lp/lprint/package.nix index 26167ccb0d..deefd68a73 100644 --- a/third_party/nixpkgs/pkgs/by-name/lp/lprint/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lp/lprint/package.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/michaelrsweet/lprint"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ ChlorideCull ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lubelogger/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/lubelogger/package.nix index e7526a74b6..24b5d9992b 100644 --- a/third_party/nixpkgs/pkgs/by-name/lu/lubelogger/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lu/lubelogger/package.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "lubelogger"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "hargata"; repo = "lubelog"; rev = "v${version}"; - hash = "sha256-L2iimh1weZ2f1mh42ahJVZLnemY3kFGK19jLyhcktjI="; + hash = "sha256-5gpwB4x2/JAaNtPQrlgFwh7om3rTJE0/mGr/Kn4qIIw="; }; projectFile = "CarCareTracker.sln"; diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lumafly/deps.nix b/third_party/nixpkgs/pkgs/by-name/lu/lumafly/deps.nix new file mode 100644 index 0000000000..7573409bb5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lu/lumafly/deps.nix @@ -0,0 +1,729 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! +{fetchNuGet}: [ + (fetchNuGet { + pname = "Avalonia"; + version = "11.0.4"; + sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; + }) + (fetchNuGet { + pname = "Avalonia.Angle.Windows.Natives"; + version = "2.1.0.2023020321"; + sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; + }) + (fetchNuGet { + pname = "Avalonia.AvaloniaEdit"; + version = "11.0.0"; + sha256 = "12ibz472083iiz5zskd1ivigggbl0d9yv3nazgw17s97nmnl2lpj"; + }) + (fetchNuGet { + pname = "Avalonia.BuildServices"; + version = "0.0.29"; + sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; + }) + (fetchNuGet { + pname = "Avalonia.Controls.ColorPicker"; + version = "11.0.4"; + sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; + }) + (fetchNuGet { + pname = "Avalonia.Controls.DataGrid"; + version = "11.0.4"; + sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; + }) + (fetchNuGet { + pname = "Avalonia.Controls.ItemsRepeater"; + version = "11.0.4"; + sha256 = "1p7mz33a6dn6ghvwajxdghq15mn5f6isvvqzxcjbnhh3m5c1zhrz"; + }) + (fetchNuGet { + pname = "Avalonia.Desktop"; + version = "11.0.4"; + sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; + }) + (fetchNuGet { + pname = "Avalonia.Diagnostics"; + version = "11.0.4"; + sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; + }) + (fetchNuGet { + pname = "Avalonia.FreeDesktop"; + version = "11.0.4"; + sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; + }) + (fetchNuGet { + pname = "Avalonia.HtmlRenderer"; + version = "11.0.0-rc1.1"; + sha256 = "0b8idah8s6xi34s3ldvhl0rrph0sdbyvkx4yj3934ghcq1iga79a"; + }) + (fetchNuGet { + pname = "Avalonia.Native"; + version = "11.0.4"; + sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; + }) + (fetchNuGet { + pname = "Avalonia.ReactiveUI"; + version = "11.0.4"; + sha256 = "1hs29qvbhm5qdhys0j3d89c37qfalx1pcpxl3hh9adz11wc0nb3b"; + }) + (fetchNuGet { + pname = "Avalonia.Remote.Protocol"; + version = "11.0.4"; + sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; + }) + (fetchNuGet { + pname = "Avalonia.Skia"; + version = "11.0.4"; + sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; + }) + (fetchNuGet { + pname = "Avalonia.Svg"; + version = "11.0.0"; + sha256 = "1xmgaj2wnjdl16x4y6rmfp3q9faca5na90zlb8j62rxcwf1v3lkr"; + }) + (fetchNuGet { + pname = "Avalonia.Themes.Fluent"; + version = "11.0.4"; + sha256 = "03zdixi6m9g4mcxmp24z8dzamzqqy9i0wg069m4gl5p3wcvfbqla"; + }) + (fetchNuGet { + pname = "Avalonia.Themes.Simple"; + version = "11.0.4"; + sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; + }) + (fetchNuGet { + pname = "Avalonia.Win32"; + version = "11.0.4"; + sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; + }) + (fetchNuGet { + pname = "Avalonia.X11"; + version = "11.0.4"; + sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; + }) + (fetchNuGet { + pname = "ColorTextBlock.Avalonia"; + version = "11.0.1"; + sha256 = "0mkqh9hzr3z40wxhp0xy569cb4sq6lvq49f51n0kbdyvfnvbsipy"; + }) + (fetchNuGet { + pname = "Deadpikle.AvaloniaProgressRing"; + version = "0.10.1"; + sha256 = "1zk7ylw4iwl1rbnipq8djcrzwmgbsdwa6di00ml7drdpnrvzf600"; + }) + (fetchNuGet { + pname = "DialogHost.Avalonia"; + version = "0.7.6"; + sha256 = "1byzs1fqz4nhn2ljhyxpifhvdkpyg7k4xfjcb1h3pf0hr4y9fgf6"; + }) + (fetchNuGet { + pname = "DynamicData"; + version = "7.9.5"; + sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; + }) + (fetchNuGet { + pname = "ExCSS"; + version = "4.1.4"; + sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; + }) + (fetchNuGet { + pname = "Fizzler"; + version = "1.2.1"; + sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; + }) + (fetchNuGet { + pname = "HarfBuzzSharp"; + version = "2.8.2.3"; + sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; + }) + (fetchNuGet { + pname = "HarfBuzzSharp.NativeAssets.Linux"; + version = "2.8.2.3"; + sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; + }) + (fetchNuGet { + pname = "HarfBuzzSharp.NativeAssets.macOS"; + version = "2.8.2.3"; + sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; + }) + (fetchNuGet { + pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; + version = "2.8.2.3"; + sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; + }) + (fetchNuGet { + pname = "HarfBuzzSharp.NativeAssets.Win32"; + version = "2.8.2.3"; + sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; + }) + (fetchNuGet { + pname = "HPackage.Net"; + version = "1.0.1"; + sha256 = "1jm2gaydndpyhywdm4sbbvwzjk3sdd825fw2gxd1s6x6dbppsl3i"; + }) + (fetchNuGet { + pname = "HtmlAgilityPack"; + version = "1.11.42"; + sha256 = "0cvnc1qdfcjbqkh335bv4wp44zisb4hc69lq3zphiyzqfrjisnyb"; + }) + (fetchNuGet { + pname = "JetBrains.Annotations"; + version = "2023.2.0"; + sha256 = "0nx7nrzbg9gk9skdc9x330cbr5xbsly6z9gzxm46vywf55yp8vaj"; + }) + (fetchNuGet { + pname = "Markdown.Avalonia"; + version = "11.0.1"; + sha256 = "08sv0cmzhhwnw0mv9dc7gzr1kvlqrl5pgmc045gigkqb3fi4zps1"; + }) + (fetchNuGet { + pname = "Markdown.Avalonia.Html"; + version = "11.0.1"; + sha256 = "00ipmxrq994w3vdqxicbw2dpv6nm54n2xz0xkvn127p8qvb734a7"; + }) + (fetchNuGet { + pname = "Markdown.Avalonia.Svg"; + version = "11.0.1"; + sha256 = "1lhfb9jk70fgfng87k2kxr82glrmrhv3llyd1kylmdv2vl3w9gwg"; + }) + (fetchNuGet { + pname = "Markdown.Avalonia.SyntaxHigh"; + version = "11.0.1"; + sha256 = "076wn8ylpxiawn9vnsy6z6d8y4mb0nk80j52aaqm3293f9cqajz6"; + }) + (fetchNuGet { + pname = "Markdown.Avalonia.Tight"; + version = "11.0.1"; + sha256 = "0bxclsly98jngdw4ykf23ip1x78d5l0xkqbqmny0pjw3pi4nsxzk"; + }) + (fetchNuGet { + pname = "MessageBox.Avalonia"; + version = "3.1.4"; + sha256 = "1qfaadvax0yc6wlqbm88ilz3jqzx0qh855ixymlkbi7wmg62fxzc"; + }) + (fetchNuGet { + pname = "MicroCom.Runtime"; + version = "0.11.0"; + sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Analyzers"; + version = "3.0.0"; + sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Common"; + version = "3.8.0"; + sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.CSharp"; + version = "3.8.0"; + sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; + version = "3.8.0"; + sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Scripting.Common"; + version = "3.8.0"; + sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; + }) + (fetchNuGet { + pname = "Microsoft.CSharp"; + version = "4.3.0"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection"; + version = "8.0.0-preview.7.23375.6"; + sha256 = "0xjffkqxhz0a2fv91rpiajksni7g8h3nl6cq1jzgyh0vx692n7xg"; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "8.0.0-preview.7.23375.6"; + sha256 = "15c3pjyqqn47shxmzxkp0bmsnqa6721cphncmp7vqa3735wqp7jh"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "2.1.2"; + sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + pname = "Microsoft.Toolkit.HighPerformance"; + version = "7.1.2"; + sha256 = "18l950mq0l8s1z771l9p332ni7jryidjh4hi9p37l6p8frcnccxb"; + }) + (fetchNuGet { + pname = "Microsoft.Win32.SystemEvents"; + version = "6.0.0"; + sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; + }) + (fetchNuGet { + pname = "Mono.Cecil"; + version = "0.11.5"; + sha256 = "1l388sy7ibsq4b2pj08g3di0g8yppq47chd7ip10kwml6mpp1wcw"; + }) + (fetchNuGet { + pname = "NetSparkleUpdater.SparkleUpdater"; + version = "2.3.0-preview20230704001"; + sha256 = "07j73ak79wwxl62pj35za1la47537xjbb4c7fjq8zdy2bzjifc23"; + }) + (fetchNuGet { + pname = "NetSparkleUpdater.UI.Avalonia"; + version = "3.0.0-preview20230703001"; + sha256 = "04d53xb30hx86p6ski6kvv67bfdi6p4xim8v59rfyc388f363nkl"; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "13.0.3"; + sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; + }) + (fetchNuGet { + pname = "Newtonsoft.Json.Schema"; + version = "3.0.15"; + sha256 = "1nmc9zxpcyyf3f2ypxw6vnjwlw5sxjv13r65p2dy8xrx8jkgaslp"; + }) + (fetchNuGet { + pname = "Portable.BouncyCastle"; + version = "1.9.0"; + sha256 = "0kphjwz4hk2nki3b4f9z096xzd520nrpvi3cjib8fkjk6zhwrr8q"; + }) + (fetchNuGet { + pname = "PropertyChanged.SourceGenerator"; + version = "1.0.8"; + sha256 = "05ygdj1sizcw678vf459hzhz4ynz2s5s206vl99g5gy3d9kaham6"; + }) + (fetchNuGet { + pname = "ReactiveUI"; + version = "18.3.1"; + sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; + }) + (fetchNuGet { + pname = "runtime.any.System.Collections"; + version = "4.3.0"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; + }) + (fetchNuGet { + pname = "runtime.any.System.Globalization"; + version = "4.3.0"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }) + (fetchNuGet { + pname = "runtime.any.System.IO"; + version = "4.3.0"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection"; + version = "4.3.0"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; + }) + (fetchNuGet { + pname = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; + }) + (fetchNuGet { + pname = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime"; + version = "4.3.0"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; + }) + (fetchNuGet { + pname = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; + }) + (fetchNuGet { + pname = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }) + (fetchNuGet { + pname = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; + }) + (fetchNuGet { + pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + (fetchNuGet { + pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + (fetchNuGet { + pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + (fetchNuGet { + pname = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + (fetchNuGet { + pname = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + (fetchNuGet { + pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + (fetchNuGet { + pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + (fetchNuGet { + pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + (fetchNuGet { + pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + (fetchNuGet { + pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + (fetchNuGet { + pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + (fetchNuGet { + pname = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; + }) + (fetchNuGet { + pname = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; + }) + (fetchNuGet { + pname = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; + }) + (fetchNuGet { + pname = "ShimSkiaSharp"; + version = "1.0.0"; + sha256 = "0gdsrzh8q8mxlm7sxvai7zshaz93a3dm1ha4cgs4845lfhpn8nhc"; + }) + (fetchNuGet { + pname = "SkiaSharp"; + version = "2.88.3"; + sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; + }) + (fetchNuGet { + pname = "SkiaSharp.NativeAssets.Linux"; + version = "2.88.3"; + sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; + }) + (fetchNuGet { + pname = "SkiaSharp.NativeAssets.macOS"; + version = "2.88.3"; + sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; + }) + (fetchNuGet { + pname = "SkiaSharp.NativeAssets.WebAssembly"; + version = "2.88.3"; + sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; + }) + (fetchNuGet { + pname = "SkiaSharp.NativeAssets.Win32"; + version = "2.88.3"; + sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; + }) + (fetchNuGet { + pname = "Splat"; + version = "14.4.1"; + sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; + }) + (fetchNuGet { + pname = "Splat"; + version = "14.7.1"; + sha256 = "1rs8bmwcvzg4yn05zglgk7vbmyi2flyyhjqn62sx1cjkrd9m0cs7"; + }) + (fetchNuGet { + pname = "Splat.Microsoft.Extensions.DependencyInjection"; + version = "14.7.1"; + sha256 = "0niwhksr74frjrkb47ihf44fq0353y4y1i3cim0fd855brvq8xh5"; + }) + (fetchNuGet { + pname = "Svg.Custom"; + version = "1.0.0"; + sha256 = "0bmvgaqy4iaxw9x88ifx3a2zz0vw3p9w6pj4bk3xfnf5p9vjx1mr"; + }) + (fetchNuGet { + pname = "Svg.Model"; + version = "1.0.0"; + sha256 = "0yrjcqcrlgqpdm3bi59nc3fppcqgrfc7jddjwxjj2q423gimip97"; + }) + (fetchNuGet { + pname = "Svg.SourceGenerator.Skia"; + version = "1.0.0.1"; + sha256 = "0sjx3kqwrmrlv9jsb59hwgs9ahj4qryrmqmgq41qnqi0w8d7yjyr"; + }) + (fetchNuGet { + pname = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + pname = "System.Collections.Immutable"; + version = "1.6.0"; + sha256 = "1pbxzdz3pwqyybzv5ff2b7nrc281bhg7hq34w0fn1w3qfgrbwyw2"; + }) + (fetchNuGet { + pname = "System.Collections.Immutable"; + version = "5.0.0"; + sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; + }) + (fetchNuGet { + pname = "System.ComponentModel.Annotations"; + version = "4.5.0"; + sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; + }) + (fetchNuGet { + pname = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + pname = "System.Drawing.Common"; + version = "6.0.0"; + sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; + }) + (fetchNuGet { + pname = "System.Dynamic.Runtime"; + version = "4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) + (fetchNuGet { + pname = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + pname = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + pname = "System.IO.Abstractions"; + version = "19.2.69"; + sha256 = "0k22xbyypfw0s4lia46c2ykcw1mwnkq1fqrw7bql6q3kvwm7ab7h"; + }) + (fetchNuGet { + pname = "System.IO.Pipelines"; + version = "6.0.0"; + sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; + }) + (fetchNuGet { + pname = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + pname = "System.Linq.Expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.4"; + sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; + }) + (fetchNuGet { + pname = "System.Numerics.Vectors"; + version = "4.5.0"; + sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; + }) + (fetchNuGet { + pname = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + (fetchNuGet { + pname = "System.Private.Uri"; + version = "4.3.0"; + sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; + }) + (fetchNuGet { + pname = "System.Reactive"; + version = "5.0.0"; + sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; + }) + (fetchNuGet { + pname = "System.Reactive"; + version = "6.0.0"; + sha256 = "1mkvx1fwychpczksy6svfmniqhbm3xqblxqik6178l12xgq7aw45"; + }) + (fetchNuGet { + pname = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + pname = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + (fetchNuGet { + pname = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + pname = "System.Reflection.Metadata"; + version = "5.0.0"; + sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; + }) + (fetchNuGet { + pname = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + pname = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + pname = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + pname = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "4.7.1"; + sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; + }) + (fetchNuGet { + pname = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + pname = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + pname = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "4.5.1"; + sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; + }) + (fetchNuGet { + pname = "System.Text.Encodings.Web"; + version = "7.0.0"; + sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; + }) + (fetchNuGet { + pname = "System.Text.Json"; + version = "7.0.3"; + sha256 = "0zjrnc9lshagm6kdb9bdh45dmlnkpwcpyssa896sda93ngbmj8k9"; + }) + (fetchNuGet { + pname = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + pname = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.5.4"; + sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; + }) + (fetchNuGet { + pname = "System.ValueTuple"; + version = "4.5.0"; + sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; + }) + (fetchNuGet { + pname = "TestableIO.System.IO.Abstractions"; + version = "19.2.69"; + sha256 = "1y6xn5fgh4ia5ympjf33pvry4l76hgn7jwimvirbq8bkkc32v4hg"; + }) + (fetchNuGet { + pname = "TestableIO.System.IO.Abstractions.Wrappers"; + version = "19.2.69"; + sha256 = "1fjcgya57bx9n00y926d9bwrcii7l41gr470gz00q9ipj726wy30"; + }) + (fetchNuGet { + pname = "Tmds.DBus.Protocol"; + version = "0.15.0"; + sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; + }) +] diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lumafly/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/lumafly/package.nix new file mode 100644 index 0000000000..14227990c4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lu/lumafly/package.nix @@ -0,0 +1,75 @@ +{ + lib, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + zlib, + icu, + fontconfig, + openssl, + libX11, + libICE, + libSM, + icoutils, + copyDesktopItems, + makeDesktopItem, +}: +buildDotnetModule rec { + pname = "lumafly"; + version = "3.2.0.0"; + + src = fetchFromGitHub { + owner = "TheMulhima"; + repo = "lumafly"; + rev = "v${version}"; + hash = "sha256-oDSM5Ev9SCjbvCgDZcpzm2bVnzG04yy/WaSwJyh0b18="; + }; + + projectFile = "Lumafly/Lumafly.csproj"; + + nugetDeps = ./deps.nix; + + dotnet-sdk = dotnetCorePackages.sdk_7_0; + + selfContainedBuild = true; + + runtimeDeps = [ + zlib + icu + fontconfig + openssl + libX11 + libICE + libSM + ]; + + nativeBuildInputs = [ + icoutils + copyDesktopItems + ]; + + postFixup = '' + # Icon for the desktop file + icotool -x $src/Lumafly/Assets/Lumafly.ico + install -D Lumafly_1_32x32x32.png $out/share/icons/hicolor/32x32/apps/lumafly.png + ''; + + desktopItems = [(makeDesktopItem { + desktopName = "Lumafly"; + name = "lumafly"; + exec = "Lumafly"; + icon = "lumafly"; + comment = meta.description; + type = "Application"; + categories = [ "Game" ]; + })]; + + meta = { + description = "A cross platform mod manager for Hollow Knight written in Avalonia"; + homepage = "https://themulhima.github.io/Lumafly/"; + license = lib.licenses.gpl3Plus; + mainProgram = "Lumafly"; + maintainers = with lib.maintainers; [ rohanssrao ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lunacy/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/lunacy/package.nix index feb03529d1..1e3ad510bf 100644 --- a/third_party/nixpkgs/pkgs/by-name/lu/lunacy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lu/lunacy/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lunacy"; - version = "9.5.0"; + version = "9.6.0"; src = fetchurl { url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb"; - hash = "sha256-dG2xLoqRQJsaR7v00iN46GP4jB8WVrxayn2CSQLCUlQ="; + hash = "sha256-PvQGDUC9BsIql4xMM1OH45gq3YtJMKJcYg4N2o18hno="; }; unpackCmd = '' diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix index b675a0295b..4a727834f6 100644 --- a/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix @@ -6,17 +6,16 @@ appimageTools.wrapType2 rec { pname = "lunar-client"; - version = "3.2.4"; + version = "3.2.7"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-KaQvjtSzQzebzPrcFBntCqP6fRbenH9tQo4LYO1TwDoJ7pAeZ8D4kSMRaRfFV0CPZ/pDnKECYdKXAuaujOpw8g=="; + hash = "sha512-dziL9lnpsiJ2BV+jNOhVMvZtYY/K4chyiZB5/fMCw9/4/3Boe/DO7s2steEOhxEsPqUcWaf1Sjs6DFSX/CHUqw=="; }; extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - mv $out/bin/{lunar-client-*,lunar-client} source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/lunar-client \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/third_party/nixpkgs/pkgs/by-name/lu/luneta/dub-lock.json b/third_party/nixpkgs/pkgs/by-name/lu/luneta/dub-lock.json new file mode 100644 index 0000000000..b45bfa0fd6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lu/luneta/dub-lock.json @@ -0,0 +1,24 @@ +{ + "dependencies": { + "arsd-official": { + "version": "7.2.0", + "sha256": "1m546r6l0pkk80y5f3ff8im08hp59nwzjb5ikjhfiswvdizpwjlh" + }, + "fuzzyd": { + "version": "2.2.0-beta", + "sha256": "0wzih4yrlrrj12ls9hd27gnxrj4j4c0ha9xprdfc7azszlv16j6g" + }, + "ncurses": { + "version": "1.0.0", + "sha256": "0ivl88vp2dy9rpv6x3f9jlyqa7aps2x1kkyx80w2d4vcs31pzmb2" + }, + "riverd-loader": { + "version": "1.0.2", + "sha256": "0c94551bscnia7vpixaq4xd2anprkd7pkf0q0anyadv5kqa8xgip" + }, + "riverd-ncurses": { + "version": "1.0.5", + "sha256": "1wgdschv6hpdjykf5bblxphnhnpy2kvw8hq8h5iaygi9zr7jf286" + } + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/lu/luneta/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/luneta/package.nix new file mode 100644 index 0000000000..02e9a0724d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lu/luneta/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildDubPackage, + fetchFromGitHub, + ncurses, +}: + +buildDubPackage rec { + pname = "luneta"; + version = "0.7.4"; + + src = fetchFromGitHub { + owner = "fbeline"; + repo = "luneta"; + rev = "v${version}"; + hash = "sha256-pYE8hccXT87JIMh71PtXzVQBegTzU7bdpVEaV2VkaEk="; + }; + + # not sure why, but this alias does not resolve + postPatch = '' + substituteInPlace source/luneta/keyboard.d \ + --replace-fail "wint_t" "dchar" + ''; + + # ncurses dub package version is locked to 1.0.0 instead of using ~master + dubLock = ./dub-lock.json; + + buildInputs = [ ncurses ]; + + installPhase = '' + runHook preInstall + install -Dm755 luneta -t $out/bin + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/fbeline/luneta/releases/tag/${src.rev}"; + description = "An interactive filter and fuzzy finder for the command-line"; + homepage = "https://github.com/fbeline/luneta"; + license = lib.licenses.gpl2Only; + mainProgram = "luneta"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lutgen/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/lutgen/package.nix index 7877905134..dc1955b684 100644 --- a/third_party/nixpkgs/pkgs/by-name/lu/lutgen/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lu/lutgen/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lutgen"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "ozwaldorf"; repo = "lutgen-rs"; rev = "v${version}"; - hash = "sha256-O2995+DLiCRDM/+oPTOBiM0L1x0jmbLTlR48+5IfOQw="; + hash = "sha256-Rj6y8ZiNWQsGn8B+iNMZvuE/U2703oYbJW+ZSdV3fl4="; }; - cargoHash = "sha256-ys4c/YUJJikDEUJjzagZBB+kSy+EFf+PqQdK/h+3gWU="; + cargoHash = "sha256-7yNr6Zc5A7rj6sUnplo2gB2xNUgZ3TLwUuBEfVKZfIQ="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lutok/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/lutok/package.nix new file mode 100644 index 0000000000..a09724b534 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lu/lutok/package.nix @@ -0,0 +1,87 @@ +{ + lib, + stdenv, + fetchFromGitHub, + atf, + autoreconfHook, + kyua, + lua, + pkg-config, + gitUpdater, +}: + +lib.fix ( + drv: + let + # Avoid infinite recursions: + # - Lutok depends on ATF and Kyua for testing; but + # - ATF depends on Kyua for testing, and Kyua depends on Lutok as a build input. + # To break the cycle (ATF -> Kyua -> Lutok -> ATF and Kyua): + # - Build ATF without testing (avoiding the Kyua dependency); and + # - Build Kyua against a version of Lutok without testing (also avoiding the ATF and Kyua dependencies). + atf' = atf.overrideAttrs (_: { + doInstallCheck = false; + }); + kyua' = + (kyua.override { + lutok = drv.overrideAttrs (_: { + doCheck = false; + }); + }).overrideAttrs + (_: { + # Assume Kyua’s install check phase will run when Kyua is built. Don’t run it again + # while building Lutok because it can take four to five minutes to run. + doInstallCheck = false; + }); + in + stdenv.mkDerivation (finalAttrs: { + pname = "lutok"; + version = "0.4"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitHub { + owner = "freebsd"; + repo = "lutok"; + rev = "lutok-${finalAttrs.version}"; + hash = "sha256-awAFxx9q8dZ6JO1/mShjhJnOPTLn1wCT4VrB4rlgWyg="; + }; + + strictDeps = true; + + propagatedBuildInputs = [ lua ]; + + nativeBuildInputs = [ + atf' + autoreconfHook + pkg-config + ]; + + enableParallelBuilding = true; + + makeFlags = [ + # Lutok isn’t compatible with C++17, which is the default on current clang and GCC. + "CXXFLAGS=-std=c++11" + ]; + + doCheck = true; + + checkInputs = [ atf' ]; + nativeCheckInputs = [ kyua' ]; + + passthru.updateScript = gitUpdater { rev-prefix = "lutok-"; }; + + __structuredAttrs = true; + + meta = { + description = "Libraries to write tests in C, C++, and shell"; + homepage = "https://github.com/freebsd/lutok/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ reckenrode ]; + platforms = lib.platforms.unix; + }; + }) +) diff --git a/third_party/nixpkgs/pkgs/by-name/lx/lx-music-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/lx/lx-music-desktop/package.nix new file mode 100644 index 0000000000..0886f7282b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -0,0 +1,88 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper + +, dpkg +, libGL +, systemd +, electron_28 + +, commandLineArgs ? "" +}: + +let + pname = "lx-music-desktop"; + version = "2.7.0"; + + buildUrl = version: arch: "https://github.com/lyswhut/lx-music-desktop/releases/download/v${version}/lx-music-desktop_${version}_${arch}.deb"; + + srcs = { + x86_64-linux = fetchurl { + url = buildUrl version "amd64"; + hash = "sha256-+mCAFfiJwa+RQ/9vnSPDrC1LoLIoZyFUEJAF6sXdqRM="; + }; + + aarch64-linux = fetchurl { + url = buildUrl version "arm64"; + hash = "sha256-fDlgHJqoZLGnUuZeZGdocYLbsE02QBrWPKS31fbGThk="; + }; + + armv7l-linux = fetchurl { + url = buildUrl version "armv7l"; + hash = "sha256-X6EXsBvTbPGXCJ+ektMCMGDG2zqGKBvWT/TwjGFL3ug="; + }; + }; + + host = stdenv.hostPlatform.system; + src = srcs.${host} or (throw "Unsupported system: ${host}"); + + runtimeLibs = lib.makeLibraryPath [ + libGL + stdenv.cc.cc.lib + ]; +in +stdenv.mkDerivation { + inherit pname version src; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + + runtimeDependencies = map lib.getLib [ + systemd + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/opt/lx-music-desktop + cp -r opt/lx-music-desktop/{resources,locales} $out/opt/lx-music-desktop + cp -r usr/share $out/share + + substituteInPlace $out/share/applications/lx-music-desktop.desktop \ + --replace-fail "/opt/lx-music-desktop/lx-music-desktop" "$out/bin/lx-music-desktop" \ + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron_28}/bin/electron $out/bin/lx-music-desktop \ + --add-flags $out/opt/lx-music-desktop/resources/app.asar \ + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} \ + ''; + + meta = with lib; { + description = "A music software based on Electron and Vue"; + homepage = "https://github.com/lyswhut/lx-music-desktop"; + changelog = "https://github.com/lyswhut/lx-music-desktop/releases/tag/v${version}"; + license = licenses.asl20; + platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "lx-music-desktop"; + maintainers = with maintainers; [ oo-infty ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/lx/lxc/4428.diff b/third_party/nixpkgs/pkgs/by-name/lx/lxc/4428.diff new file mode 100644 index 0000000000..05f0c660c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lx/lxc/4428.diff @@ -0,0 +1,78 @@ +diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml +index 92d6f01c3d..d2b67d8d6f 100644 +--- a/.github/workflows/build.yml ++++ b/.github/workflows/build.yml +@@ -50,6 +50,7 @@ jobs: + meson setup build \ + -Dtests=true \ + -Dpam-cgroup=true \ ++ -Dtools-multicall=true \ + -Dwerror=true \ + -Db_lto_mode=default + ninja -C build +diff --git a/src/lxc/cmd/meson.build b/src/lxc/cmd/meson.build +index 3ed3670e4b..edfb986622 100644 +--- a/src/lxc/cmd/meson.build ++++ b/src/lxc/cmd/meson.build +@@ -46,7 +46,7 @@ cmd_lxc_init_static_sources = files( + '../string_utils.c', + '../string_utils.h') + include_sources + +-cmd_lxc_monitord_sources = files('lxc_monitord.c') + include_sources + netns_ifaddrs_sources ++cmd_lxc_monitord_sources = files('lxc_monitord.c') + cmd_lxc_user_nic_sources = files('lxc_user_nic.c') + cmd_common_sources + netns_ifaddrs_sources + cmd_lxc_usernsexec_sources = files('lxc_usernsexec.c') + cmd_common_sources + netns_ifaddrs_sources + +@@ -88,8 +88,8 @@ cmd_programs += executable( + 'lxc-monitord', + cmd_lxc_monitord_sources, + include_directories: liblxc_includes, +- dependencies: liblxc_dep, +- link_with: [liblxc_static], ++ dependencies: liblxc_dependencies, ++ link_whole: [liblxc_static], + install: true, + install_dir: lxclibexec) + +diff --git a/src/lxc/tools/meson.build b/src/lxc/tools/meson.build +index 00a863d936..6d317fc80b 100644 +--- a/src/lxc/tools/meson.build ++++ b/src/lxc/tools/meson.build +@@ -1,6 +1,7 @@ + # SPDX-License-Identifier: LGPL-2.1+ + +-tools_common_sources = files('arguments.c', 'arguments.h') + include_sources + netns_ifaddrs_sources ++tools_common_sources = files('arguments.c', 'arguments.h') + include_sources ++tools_common_sources_for_dynamic_link = tools_common_sources + netns_ifaddrs_sources + + tools_commands_dynamic_link = ['attach', 'autostart', 'cgroup', 'checkpoint', 'config', + 'console', 'copy', 'create', 'destroy', 'device', 'execute', 'freeze', +@@ -15,7 +16,7 @@ if want_tools + foreach cmd : tools_commands_dynamic_link + public_programs += executable( + 'lxc-' + cmd, +- files('lxc_' + cmd + '.c') + tools_common_sources + liblxc_ext_sources, ++ files('lxc_' + cmd + '.c') + tools_common_sources_for_dynamic_link + liblxc_ext_sources, + dependencies: liblxc_dependencies, + include_directories: liblxc_includes, + c_args: ['-DNO_LXC_CONF'], +@@ -26,16 +27,16 @@ if want_tools + foreach cmd : tools_commands_static_link + public_programs += executable( + 'lxc-' + cmd, +- files('lxc_' + cmd + '.c') + tools_common_sources, ++ files('lxc_' + cmd + '.c') + files('arguments.c', 'arguments.h'), + dependencies: liblxc_dependencies, + include_directories: liblxc_includes, +- link_with: [liblxc_static], ++ link_whole: [liblxc_static], + install: true) + endforeach + endif + + if want_tools_multicall +- tools_all_sources = files('lxc_multicall.c') + tools_common_sources ++ tools_all_sources = files('lxc_multicall.c') + tools_common_sources_for_dynamic_link + foreach cmd : tools_commands + tools_all_sources += files('lxc_' + cmd + '.c') + endforeach diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lxc/docbook-hack.patch b/third_party/nixpkgs/pkgs/by-name/lx/lxc/docbook-hack.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/lxc/docbook-hack.patch rename to third_party/nixpkgs/pkgs/by-name/lx/lxc/docbook-hack.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxc/package.nix similarity index 79% rename from third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix rename to third_party/nixpkgs/pkgs/by-name/lx/lxc/package.nix index e525c9c3f5..ba817c1e2e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/lx/lxc/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + dbus, docbook2x, libapparmor, libcap, @@ -9,22 +10,22 @@ libselinux, meson, ninja, - nix-update-script, nixosTests, openssl, pkg-config, systemd, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxc"; - version = "5.0.3"; + version = "6.0.0"; src = fetchFromGitHub { owner = "lxc"; repo = "lxc"; - rev = "refs/tags/lxc-${version}"; - hash = "sha256-lnLmLgWXt3pI2S+4OeHRlPP5gui7S7ZXXClFt+n/8sY="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-D994gekFgW/1Q4iVFM/3Zi0JXKn9Ghfd3UcjckVfoFY="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + dbus libapparmor libcap libseccomp @@ -44,17 +46,19 @@ stdenv.mkDerivation rec { ]; patches = [ - # make build more nix compatible - ./add-meson-options.patch - # fix docbook2man version detection ./docbook-hack.patch + + # fix linking + ./4428.diff ]; mesonFlags = [ "-Dinstall-init-files=false" "-Dinstall-state-dirs=false" "-Dspecfile=false" + # re-enable when fixed https://github.com/lxc/lxc/issues/4427 + # "-Dtools-multicall=true" ]; enableParallelBuilding = true; @@ -65,11 +69,13 @@ stdenv.mkDerivation rec { tests = { incus-legacy-init = nixosTests.incus.container-legacy-init; incus-systemd-init = nixosTests.incus.container-systemd-init; + lxd = nixosTests.lxd.container; }; + updateScript = nix-update-script { extraArgs = [ - "-vr" - "lxc-(.*)" + "--version-regex" + "v(6.0.*)" ]; }; }; @@ -88,4 +94,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = lib.teams.lxc.members; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/lx/lxd-lts/package.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxd-lts/package.nix index 67dda7437b..ef61e0a7bc 100644 --- a/third_party/nixpkgs/pkgs/by-name/lx/lxd-lts/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lx/lxd-lts/package.nix @@ -141,7 +141,7 @@ symlinkJoin { ''; passthru = { - inherit (lxd-unwrapped-lts) tests ui; + inherit (lxd-unwrapped-lts) tests; }; inherit (lxd-unwrapped-lts) meta pname version; diff --git a/third_party/nixpkgs/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix index c11ece294d..41b20f4860 100644 --- a/third_party/nixpkgs/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix @@ -71,7 +71,7 @@ buildGo122Module rec { make lxd-agent lxd-migrate ''; - preCheck = + checkFlags = let skippedTests = [ "TestValidateConfig" @@ -81,10 +81,7 @@ buildGo122Module rec { "TestContainerTestSuite" ]; in - '' - # Disable tests requiring local operations - buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") - ''; + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; postInstall = '' installShellCompletion --bash --name lxd ./scripts/bash/lxd-client diff --git a/third_party/nixpkgs/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxgw-neoxihei/package.nix index aa8df5a625..b3175e871b 100644 --- a/third_party/nixpkgs/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.120.2"; + version = "1.121"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-RN0OmNS3aSRMK19nNiqXYJ4PIAQh6u5W/+L8DCeqMcE="; + hash = "sha256-3+th4alWV+i9kRT4F5tx8kOD4j8emcN2melcyN/mMMQ="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix new file mode 100644 index 0000000000..7b93d94b42 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix @@ -0,0 +1,30 @@ +{ stdenvNoCC +, fetchurl +, lib +}: + +stdenvNoCC.mkDerivation rec { + pname = "lxgw-wenkai-tc"; + version = "1.330"; + src = fetchurl { + url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/${pname}-v${version}.tar.gz"; + hash = "sha256-qpX5shH1HbGMa287u/R1rMFgQeAUC0wwKFVD+QSTyho="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + mv *.ttf $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/lxgw/LxgwWenKaiTC"; + description = "The Traditional Chinese Edition of LXGW WenKai."; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ lebensterben ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/pin.json index cb63a81700..c6056d3c9d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/pin.json +++ b/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/pin.json @@ -1,10 +1,10 @@ { "stable": { - "version": "5.2.1", - "hash": "sha256-pyvHhFfwgozaTP3AhqWPKOuXdC23stXiUW2PpdYRR7M=" + "version": "5.2.3", + "hash": "sha256-fjlvP5PPmSSNYefYRrEBVdhbN3yZ0pCbvIe763U5y5o=" }, "beta": { - "version": "5.2.1", - "hash": "sha256-pyvHhFfwgozaTP3AhqWPKOuXdC23stXiUW2PpdYRR7M=" + "version": "5.2.3", + "hash": "sha256-fjlvP5PPmSSNYefYRrEBVdhbN3yZ0pCbvIe763U5y5o=" } } diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maa-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maa-cli/package.nix index c083f6451e..47949052b8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/maa-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/maa-cli/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "maa-cli"; - version = "0.4.5"; + version = "0.4.7"; src = fetchFromGitHub { owner = "MaaAssistantArknights"; repo = "maa-cli"; rev = "v${version}"; - hash = "sha256-LeEIbfDQ+GO3gNmdpWGTNkpbhSqLz4fYQ+MdcrcbDk0="; + hash = "sha256-FR0sUHAxxW49c/lnZteJGzgfvTskWNyc8gmQvghtrB8="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = true; buildFeatures = [ "git2" "core_installer" ]; - cargoHash = "sha256-tkUJH7oFY5eZ5A7J+qzeyHlqOUnTipf6o+leZz7KOiQ="; + cargoHash = "sha256-iy9myT3bVW1TXCZx3ddiiDoDXx5BWqeQnSsJ97bc4IA="; # maa-cli would only seach libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 diff --git a/third_party/nixpkgs/pkgs/by-name/ma/mac-robber/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/mac-robber/package.nix new file mode 100644 index 0000000000..977d6bd1bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ma/mac-robber/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mac-robber"; + version = "1.02"; + + src = fetchurl { + url = "mirror://sourceforge/project/mac-robber/mac-robber/${finalAttrs.version}/mac-robber-${finalAttrs.version}.tar.gz"; + hash = "sha256-WJXTMuyNh+FfIUQcYVRbf2iDCi7iyWfTgXc70IUEgG0="; + }; + + patches = [ + # add GCC hardening. + (fetchurl { + name = "10_add-GCC-hardening.patch"; + url = "https://salsa.debian.org/pkg-security-team/mac-robber/-/raw/b6a59d78e2f58fbfab7f1b3ed9b72531d28693ca/debian/patches/10_add-GCC-hardening.patch"; + hash = "sha256-1ma6Vh1MTE6WlCcm2KzRLK/ZV3hAw7xP25yi7TrIqLI="; + }) + ]; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "GCC_OPT=" + ]; + + installPhase = '' + runHook preInstall + install -D mac-robber $out/bin/mac-robber + runHook postInstall + ''; + + meta = with lib; { + description = "A digital investigation tool that collects data from allocated files in a mounted file system"; + mainProgram = "mac-robber"; + homepage = "https://www.sleuthkit.org/mac-robber/"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl2Only; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ma/makejinja/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/makejinja/package.nix new file mode 100644 index 0000000000..cc53732ae3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ma/makejinja/package.nix @@ -0,0 +1,52 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication rec { + pname = "makejinja"; + version = "2.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mirkolenz"; + repo = "makejinja"; + rev = "v${version}"; + hash = "sha256-sH4m+rcHA6nW21xEJon10lS7e5QiFwUyvV49NZ3UY+s="; + }; + + build-system = with python3Packages; [ poetry-core ]; + + dependencies = + with python3Packages; + [ + jinja2 + pyyaml + rich-click + typed-settings + immutables + ] + ++ typed-settings.optional-dependencies.attrs + ++ typed-settings.optional-dependencies.cattrs + ++ typed-settings.optional-dependencies.click; + + preCheck = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov makejinja --cov-report term-missing" "" + ''; + + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + + meta = { + description = "Generate entire directory structures using Jinja templates with support for external data and custom plugins"; + homepage = "https://github.com/mirkolenz/makejinja"; + license = lib.licenses.mit; + mainProgram = "makejinja"; + maintainers = with lib.maintainers; [ + tomasajt + mirkolenz + ]; + platforms = lib.platforms.darwin ++ lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ma/makima/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/makima/package.nix index 31552c840f..6ff1ddb8d9 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/makima/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/makima/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec{ pname = "makima"; - version = "0.5.2"; + version = "0.6.6"; src = fetchFromGitHub { owner = "cyber-sushi"; repo = "makima"; rev = "v${version}"; - hash = "sha256-x8vjTXB6kFJ9o6EGCtlX6eT/VrzLF17fIA2gDLFumzY="; + hash = "sha256-Orl79ETROaQzAraGGgYQSSreASanYQHkpEetIR8kJmo="; }; - cargoHash = "sha256-p4oMeDL7T/a9OCgMdriGtgHkZq8tZVzPspEsU4IPfAo="; + cargoHash = "sha256-npnAbzy2EN3tK1/pSJnnucMj5lLn30lrgKtcPDl0HQQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mako/default.nix b/third_party/nixpkgs/pkgs/by-name/ma/mako/package.nix similarity index 65% rename from third_party/nixpkgs/pkgs/applications/misc/mako/default.nix rename to third_party/nixpkgs/pkgs/by-name/ma/mako/package.nix index ca7849c566..ad518f00e5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mako/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/mako/package.nix @@ -1,21 +1,20 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc , systemd, pango, cairo, gdk-pixbuf, jq, bash , wayland, wayland-protocols -, wrapGAppsHook }: +, wrapGAppsHook3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mako"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "emersion"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-sUFMcCrc5iNPeAmRbqDaT/n8OIlFJEwJTzY1HMx94RU="; + repo = "mako"; + rev = "refs/tags/v${finalAttrs.version}"; + sha256 = "sha256-QtYtondP7E5QXLRnmcaOQlAm9fKXctfjxeUFqK6FnnE="; }; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook3 ]; buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; mesonFlags = [ @@ -29,12 +28,12 @@ stdenv.mkDerivation rec { ) ''; - meta = with lib; { + meta = { description = "A lightweight Wayland notification daemon"; homepage = "https://wayland.emersion.fr/mako/"; - license = licenses.mit; - maintainers = with maintainers; [ dywedir synthetica ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dywedir synthetica ]; + platforms = lib.platforms.linux; mainProgram = "mako"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maltego/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maltego/package.nix index 223de91d8e..749a426c47 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/maltego/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/maltego/package.nix @@ -12,24 +12,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "maltego"; - version = "4.6.0"; + version = "4.7.0"; src = fetchzip { url = "https://downloads.maltego.com/maltego-v4/linux/Maltego.v${finalAttrs.version}.linux.zip"; - hash = "sha256-q+1RYToZtBxAIDSiUWf3i/3GBBDwh6NWteHiK4VM1HY="; + hash = "sha256-dPpkIoWK/mzC9wD+3QTNv3tYG27QVgCxtAymkwjIwUY="; }; postPatch = '' - substituteInPlace bin/maltego \ - --replace /usr/bin/awk ${lib.getExe gawk} + substituteInPlace bin/maltego \ + --replace-fail /usr/bin/awk ${lib.getExe gawk} ''; - desktopItems = [ + desktopItems = [ (makeDesktopItem { - name = finalAttrs.pname; + name = "maltego"; desktopName = "Maltego"; - exec = finalAttrs.meta.mainProgram; - icon = finalAttrs.pname; + exec = "maltego"; + icon = "maltego"; comment = "An open source intelligence and forensics application"; categories = [ "Network" "Security" ]; startupNotify = false; @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { cp -aR . "$out/share/maltego/" - makeWrapper $out/share/maltego/bin/maltego $out/bin/${finalAttrs.meta.mainProgram} \ + makeWrapper $out/share/maltego/bin/maltego $out/bin/maltego \ --set JAVA_HOME ${jre} \ --prefix PATH : ${lib.makeBinPath [ jre ]} @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { description = "An open source intelligence and forensics application, enabling to easily gather information about DNS, domains, IP addresses, websites, persons, and so on"; mainProgram = "maltego"; maintainers = with maintainers; [ emilytrau d3vil0p3r ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ma/markdown-oxide/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/markdown-oxide/package.nix index 60c764c436..439f845a1a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/markdown-oxide/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/markdown-oxide/package.nix @@ -5,13 +5,13 @@ rustPlatform.buildRustPackage rec { pname = "markdown-oxide"; - version = "0.0.17"; + version = "0.0.21"; src = fetchFromGitHub { owner = "Feel-ix-343"; repo = "markdown-oxide"; rev = "v${version}"; - hash = "sha256-bJlyzBnxUw1OyWLbVEFXgPc/YjmfyyQjfeGAA7G1QlY="; + hash = "sha256-PrsTHAlFFeqyZTsoKvoe19P2ed7xDtOlBgoKftFytVw="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/by-name/ma/marwaita-x/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/marwaita-x/package.nix new file mode 100644 index 0000000000..c342d71e46 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ma/marwaita-x/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, nix-update-script +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "marwaita-x"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = "marwaita-x"; + rev = finalAttrs.version; + sha256 = "sha256-yf/3ukb52rbCXMObeiHrMdD1cTRjY739p7Vg+DBFReo="; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Marwaita* $out/share/themes + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A new version for Marwaita GTK theme"; + homepage = "https://www.pling.com/p/2044790/"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ romildo ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ma/materialx/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/materialx/package.nix new file mode 100644 index 0000000000..cac615eaec --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ma/materialx/package.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + darwin, + libX11, + libXt, + libGL, + openimageio, + imath, + python3Packages, + python3 +}: + +python3Packages.buildPythonPackage rec { + pname = "materialx"; + version = "1.38.10"; + + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "MaterialX"; + rev = "v${version}"; + sha256 = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo="; + }; + + format = "other"; + + nativeBuildInputs = [ + cmake + python3Packages.setuptools + ]; + + buildInputs = + [ + openimageio + imath + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + OpenGL + Cocoa + ] + ) + ++ lib.optionals (!stdenv.isDarwin) [ + libX11 + libXt + libGL + ]; + + cmakeFlags = [ + (lib.cmakeBool "MATERIALX_BUILD_OIIO" true) + (lib.cmakeBool "MATERIALX_BUILD_PYTHON" true) + # don't build MSL shader back-end on x86_x64-darwin, as it requires a newer SDK with metal support + (lib.cmakeBool "MATERIALX_BUILD_GEN_MSL" (stdenv.isLinux || (stdenv.isAarch64 && stdenv.isDarwin))) + ]; + + pythonImportsCheck = [ "MaterialX" ]; + + postInstall = '' + # Make python lib properly accessible + target_dir=$out/${python3.sitePackages} + mkdir -p $(dirname $target_dir) + # required for cmake to find the bindings, when included in other projects + ln -s $out/python $target_dir + ''; + + meta = { + description = "Open standard for representing rich material and look-development content in computer graphics"; + homepage = "https://materialx.org"; + maintainers = [ lib.maintainers.gador ]; + platforms = lib.platforms.unix; + license = lib.licenses.mpl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ma/mathemagix/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/mathemagix/package.nix new file mode 100644 index 0000000000..f9c53759df --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ma/mathemagix/package.nix @@ -0,0 +1,48 @@ +{ + stdenv, + lib, + fetchsvn, + readline, + ncurses, + bison, + libtool, + gmp, + mpfr, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mathemagix"; + version = "11126"; + + src = fetchsvn { + url = "https://subversion.renater.fr/anonscm/svn/mmx/"; + rev = finalAttrs.version; + hash = "sha256-AFnYd5oFg/wgaHPjfZmqXNljEpoFW4h6f3UG+KZauEs="; + }; + + strictDeps = true; + + buildInputs = [ + gmp + libtool + mpfr + ncurses + readline + ]; + + nativeBuildInputs = [ + bison + ]; + + preConfigure = '' + export HOME="$PWD" + ''; + + meta = { + description = "A free computer algebra and analysis system consisting of a high level language with a compiler and a series of mathematical libraries"; + homepage = "http://www.mathemagix.org/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/Cargo.lock index c9967434de..9104af7bb8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/Cargo.lock @@ -39,9 +39,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -64,12 +64,12 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", "zerocopy", @@ -107,9 +107,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -121,56 +121,56 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "apalis-core" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dbe998f2a77a65433e3e893f7ffba5b0c4835a9601ccab02aa868d1d3ed71eb" +checksum = "1deb48475efcdece1f23a0553209ee842f264c2a5e9bcc4928bfa6a15a044cde" dependencies = [ "async-stream", "async-trait", "chrono", "futures", "graceful-shutdown", - "http 1.0.0", + "http 1.1.0", "log", "pin-project-lite", "serde", @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "apalis-cron" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc57450bd6a857d2370bb5504cf3d7f2a1fb85c7b68bdb7f92f50aac0e26aac" +checksum = "43310b7e0132f9520b09224fb6faafb32eec82a672aa79c09e46b5b488ed505b" dependencies = [ "apalis-core", "async-stream", @@ -205,15 +205,15 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" [[package]] name = "argon2" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" +checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" dependencies = [ "base64ct", "blake2", @@ -262,43 +262,43 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 3.1.0", - "event-listener-strategy", + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5ea910c42e5ab19012bab31f53cb4d63d54c3a27730f9a833a88efcf4bb52d" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 3.1.1", + "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.0.1", + "futures-lite 2.3.0", "slab", ] [[package]] name = "async-global-executor" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4353121d5644cdf2beb5726ab752e79a8db1ebb52031770ec47db31d245526" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.1.0", + "async-channel 2.2.0", "async-executor", - "async-io 2.2.0", - "async-lock 3.1.1", + "async-io 2.3.2", + "async-lock 3.3.0", "blocking", - "futures-lite 2.0.1", + "futures-lite 2.3.0", "once_cell", ] @@ -320,8 +320,8 @@ dependencies = [ "fnv", "futures-util", "handlebars", - "http 0.2.11", - "indexmap 2.1.0", + "http 0.2.12", + "indexmap 2.2.5", "mime", "multer", "num-traits", @@ -347,12 +347,12 @@ checksum = "c7f329c7eb9b646a72f70c9c4b516c70867d356ec46cb00dcac8ad343fd006b0" dependencies = [ "Inflector", "async-graphql-parser", - "darling 0.20.3", + "darling 0.20.8", "proc-macro-crate", "proc-macro2", "quote", "strum", - "syn 2.0.39", + "syn 2.0.53", "thiserror", ] @@ -375,7 +375,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "323a5143f5bdd2030f45e3f2e0c821c9b1d36e79cf382129c64299c50a7f3750" dependencies = [ "bytes", - "indexmap 2.1.0", + "indexmap 2.2.5", "serde", "serde_json", ] @@ -402,22 +402,21 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.0" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ - "async-lock 3.1.1", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.0.1", + "futures-lite 2.3.0", "parking", - "polling 3.3.0", - "rustix 0.38.25", + "polling 3.5.0", + "rustix 0.38.31", "slab", "tracing", - "waker-fn", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -431,12 +430,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.1.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b9c7fe787d3b25cc0f804a1a8401790f0c5bc395beb5a64dc77d8de079105" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 3.1.0", - "event-listener-strategy", + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", "pin-project-lite", ] @@ -453,7 +452,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.25", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -463,13 +462,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.2.0", + "async-io 2.3.2", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.25", + "rustix 0.38.31", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -521,24 +520,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] @@ -565,16 +564,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "atomic-write-file" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c232177ba50b16fe7a4588495bd474a62a9e45a8e4ca6fd7d0b7ac29d164631e" -dependencies = [ - "nix", - "rand 0.8.5", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -593,7 +582,7 @@ dependencies = [ "bytes", "futures-util", "headers", - "http 0.2.11", + "http 0.2.12", "http-body", "hyper", "itoa", @@ -623,7 +612,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.11", + "http 0.2.12", "http-body", "mime", "rustversion", @@ -640,9 +629,9 @@ dependencies = [ "axum", "axum-core", "bytes", - "cookie", + "cookie 0.17.0", "futures-util", - "http 0.2.11", + "http 0.2.12", "http-body", "mime", "pin-project-lite", @@ -659,10 +648,10 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] @@ -694,9 +683,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "base64ct" @@ -706,13 +701,13 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bcrypt" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d1c9c15093eb224f0baa400f38fcd713fc1391a6f1c389d886beef146d60a3" +checksum = "e65938ed058ef47d92cf8b346cc76ef48984572ade631927e9937b5ffc7662c7" dependencies = [ - "base64 0.21.5", + "base64 0.22.0", "blowfish", - "getrandom 0.2.11", + "getrandom 0.2.12", "subtle", "zeroize", ] @@ -734,9 +729,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -774,12 +769,12 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel 2.1.0", - "async-lock 3.1.1", + "async-channel 2.2.0", + "async-lock 3.3.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.0.1", + "futures-lite 2.3.0", "piper", "tracing", ] @@ -796,15 +791,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -821,6 +816,16 @@ dependencies = [ "serde", ] +[[package]] +name = "calendrical_calculations" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dfe3bc6a50b4667fafdb6d9cf26731c5418c457e317d8166c972014facf9a5d" +dependencies = [ + "core_maths", + "displaydoc", +] + [[package]] name = "camino" version = "1.1.6" @@ -841,14 +846,20 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ "jobserver", "libc", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cfg-if" version = "1.0.0" @@ -881,22 +892,22 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[package]] name = "chrono-tz" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76" +checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" dependencies = [ "chrono", "chrono-tz-build", @@ -929,7 +940,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", "stacker", ] @@ -946,9 +957,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.8" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" dependencies = [ "clap_builder", "clap_derive", @@ -956,33 +967,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.0", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" @@ -991,31 +1002,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] -name = "concurrent-queue" -version = "2.3.0" +name = "combine" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "convert_case" @@ -1033,7 +1054,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "aes-gcm", - "base64 0.21.5", + "base64 0.21.7", "hkdf", "percent-encoding", "rand 0.8.5", @@ -1044,13 +1065,24 @@ dependencies = [ ] [[package]] -name = "cookie_store" -version = "0.20.0" +name = "cookie" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" +checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" dependencies = [ - "cookie", - "idna 0.3.0", + "percent-encoding", + "time", + "version_check", +] + +[[package]] +name = "cookie_store" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa" +dependencies = [ + "cookie 0.18.0", + "idna 0.5.0", "log", "publicsuffix", "serde", @@ -1062,9 +1094,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -1072,33 +1104,42 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "cranelift-bforest" -version = "0.102.0" +version = "0.105.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eb38f2af690b5a4411d9a8782b6d77dabff3ca939e0518453ab9f9a4392d41" +checksum = "16d5521e2abca66bbb1ddeecbb6f6965c79160352ae1579b39f8c86183895c24" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.102.0" +version = "0.105.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39526c036b92912417e8931f52c1e235796688068d3efdbbd8b164f299d19156" +checksum = "ef40a4338a47506e832ac3e53f7f1375bc59351f049a8379ff736dd02565bd95" dependencies = [ "bumpalo", "cranelift-bforest", @@ -1108,7 +1149,7 @@ dependencies = [ "cranelift-entity", "cranelift-isle", "gimli", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "log", "regalloc2", "smallvec", @@ -1117,33 +1158,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.102.0" +version = "0.105.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb0deedc9fccf2db53a5a3c9c9d0163e44143b0d004dca9bf6ab6a0024cd79a" +checksum = "d24cd5d85985c070f73dfca07521d09086362d1590105ba44b0932bf33513b61" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.102.0" +version = "0.105.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea2d1b274e45aa8e61e9103efa1ba82d4b5a19d12bd1fd10744c3b7380ba3ff" +checksum = "e0584c4363e3aa0a3c7cb98a778fbd5326a3709f117849a727da081d4051726c" [[package]] name = "cranelift-control" -version = "0.102.0" +version = "0.105.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea5977559a71e63db79a263f0e81a89b996e8a38212c4281e37dd1dbaa8b65c" +checksum = "f25ecede098c6553fdba362a8e4c9ecb8d40138363bff47f9712db75be7f0571" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.102.0" +version = "0.105.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f871ada808b58158d84dfc43a6a2e2d2756baaf4ed1c51fd969ca8330e6ca5c" +checksum = "6ea081a42f25dc4c5b248b87efdd87dcd3842a1050a37524ec5391e6172058cb" dependencies = [ "serde", "serde_derive", @@ -1151,9 +1192,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.102.0" +version = "0.105.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e6890f587ef59824b3debe577e68fdf9b307b3808c54b8d93a18fd0b70941b" +checksum = "9796e712f5af797e247784f7518e6b0a83a8907d73d51526982d86ecb3a58b68" dependencies = [ "cranelift-codegen", "log", @@ -1163,15 +1204,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.102.0" +version = "0.105.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d5fc6d5d3b52d1917002b17a8ecce448c2621b5bf394bb4e77e2f676893537" +checksum = "f4a66ccad5782f15c80e9dd5af0df4acfe6e3eee98e8f7354a2e5c8ec3104bdd" [[package]] name = "cranelift-native" -version = "0.102.0" +version = "0.105.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e10c2e7faa65d4ae7de9a83b44f2c31aca7dc638e17d0a79572fdf8103d720b" +checksum = "285e80df1d9b79ded9775b285df68b920a277b84f88a7228d2f5bc31fcdc58eb" dependencies = [ "cranelift-codegen", "libc", @@ -1180,9 +1221,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.102.0" +version = "0.105.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2755807efc7ec80d1cc0b6815e70f10cedf968889f0469091dbff9c5c0741c48" +checksum = "4135b0ab01fd16aa8f8821196e9e2fe15953552ccaef8ba5153be0ced04ef757" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1211,18 +1252,18 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] name = "cron" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff76b51e4c068c52bfd2866e1567bee7c567ae8f24ada09fd4307019e25eab7" +checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07" dependencies = [ "chrono", "nom", @@ -1231,56 +1272,46 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-bigint" @@ -1347,12 +1378,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core 0.20.8", + "darling_macro 0.20.8", ] [[package]] @@ -1365,22 +1396,22 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.39", + "strsim 0.10.0", + "syn 2.0.53", ] [[package]] @@ -1396,13 +1427,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ - "darling_core 0.20.3", + "darling_core 0.20.8", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] @@ -1453,9 +1484,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", @@ -1502,7 +1533,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] @@ -1513,9 +1544,9 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "duration-str" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e172e85f305d6a442b250bf40667ffcb91a24f52c9a1ca59e2fa991ac9b7790" +checksum = "a8bb6a301a95ba86fa0ebaf71d49ae4838c51f8b84cb88ed140dfb66452bb3c4" dependencies = [ "nom", "rust_decimal", @@ -1524,9 +1555,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" @@ -1544,9 +1575,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" dependencies = [ "serde", ] @@ -1578,7 +1609,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbfb21b9878cf7a348dcb8559109aabc0ec40d69924bd706fa5149846c4fef75" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "memchr", ] @@ -1611,12 +1642,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1649,9 +1680,20 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" dependencies = [ "concurrent-queue", "parking", @@ -1660,11 +1702,21 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 3.1.0", + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.2.0", "pin-project-lite", ] @@ -1710,9 +1762,9 @@ dependencies = [ [[package]] name = "figment" -version = "0.10.12" +version = "0.10.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "649f3e5d826594057e9a519626304d8da859ea8a0b18ce99500c586b8d45faee" +checksum = "7270677e7067213e04f323b55084586195f18308cd7546cfac9f873344ccceb6" dependencies = [ "atomic", "parking_lot", @@ -1769,9 +1821,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1784,9 +1836,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1794,15 +1846,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1822,9 +1874,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -1843,52 +1895,51 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.0.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ "fastrand 2.0.1", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", ] [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1926,20 +1977,22 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ "opaque-debug", "polyval", @@ -1952,7 +2005,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator", - "indexmap 2.1.0", + "indexmap 2.2.5", "stable_deref_trait", ] @@ -1998,17 +2051,17 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.11", - "indexmap 2.1.0", + "http 0.2.12", + "indexmap 2.2.5", "slab", "tokio", "tokio-util", @@ -2046,9 +2099,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -2060,17 +2113,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.2", -] - -[[package]] -name = "hdrhistogram" -version = "7.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" -dependencies = [ - "byteorder", - "num-traits", + "hashbrown 0.14.3", ] [[package]] @@ -2079,10 +2122,10 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "headers-core", - "http 0.2.11", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -2094,7 +2137,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http 0.2.11", + "http 0.2.12", ] [[package]] @@ -2107,10 +2150,16 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.3.3" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2120,9 +2169,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac", ] @@ -2138,11 +2187,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2158,9 +2207,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -2169,9 +2218,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -2180,12 +2229,12 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] @@ -2205,7 +2254,7 @@ dependencies = [ "async-channel 1.9.0", "base64 0.13.1", "futures-lite 1.13.0", - "http 0.2.11", + "http 0.2.12", "infer", "pin-project-lite", "rand 0.7.3", @@ -2230,22 +2279,22 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http 0.2.11", + "http 0.2.12", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.6", "tokio", "tower-service", "tracing", @@ -2254,36 +2303,24 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "399c78f9338483cb7e630c8474b07268983c6bd5acee012e4211f9f7bb21b070" dependencies = [ "futures-util", - "http 0.2.11", + "http 0.2.12", "hyper", - "rustls", - "rustls-native-certs", + "rustls 0.22.2", + "rustls-pki-types", "tokio", "tokio-rustls", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2302,6 +2339,79 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_calendar" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb932a690c92f87955e923106181ee0d5682e688ff37fb5c7b296e1fe806edb" +dependencies = [ + "calendrical_calculations", + "displaydoc", + "icu_calendar_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_calendar_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22aec7d032735d9acb256eeef72adcac43c3b7572f19b51576a63d664b524ca2" + +[[package]] +name = "icu_datetime" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1508c7ed627cc0b031c81203eb98f34433e24b32b39d5b2c0238e4962a00957d" +dependencies = [ + "displaydoc", + "either", + "fixed_decimal", + "icu_calendar", + "icu_datetime_data", + "icu_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_timezone", + "smallvec", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_datetime_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6abc569cb4ee80b30707566f05c5c9ed4bed765f91ce41e7f5a37c5e6a75b3f" + +[[package]] +name = "icu_decimal" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf994f9ed8061c17bb313f28fba6cffc736f0a16c7fab827efc9b73fd3f7778" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "writeable", +] + +[[package]] +name = "icu_decimal_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2de3548316b697c70f30dec1395c9212db09df1d86a27624ee24872b71326c" + [[package]] name = "icu_list" version = "1.4.0" @@ -2414,9 +2524,54 @@ checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] +[[package]] +name = "icu_relativetime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47825312a5eb0790bad7b718fa8d41a8ea1e0ba597b4f7bb84bcfe97d7fc5aba" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_relativetime_data", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_relativetime_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b55cc15ea8981fbba78e9347d0c4003d4490c85f76e9adc7f270290046cae8" + +[[package]] +name = "icu_timezone" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35aabe571a7c653c0f543ff1512b8a1b2ad481cfa24b3d25115298d2ff3b50f" +dependencies = [ + "displaydoc", + "icu_calendar", + "icu_locid", + "icu_provider", + "icu_timezone_data", + "tinystr", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_timezone_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceee21e181cce2ab44e95923da6b3418df75369f570df82264c29c51ca398d4" + [[package]] name = "id-arena" version = "2.2.1" @@ -2462,12 +2617,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "serde", ] @@ -2485,13 +2640,13 @@ checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" [[package]] name = "inherent" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce243b1bfa62ffc028f1cc3b6034ec63d649f3031bc8a4fbbb004e1ac17d1f68" +checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] @@ -2512,9 +2667,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.34.0" +version = "1.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "0a7c22c4d34ef4788c351e971c52bfdfe7ea2766f8c5466bc175dd46e52ac22e" dependencies = [ "console", "lazy_static", @@ -2533,12 +2688,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "integer-encoding" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" - [[package]] name = "io-lifetimes" version = "1.0.11" @@ -2589,25 +2738,54 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.9" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2625,9 +2803,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", @@ -2672,13 +2850,13 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "lettre" -version = "0.11.2" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a48c2e9831b370bc2d7233c2620298c45f3a158ed6b4b8d7416b2ada5a268fd8" +checksum = "357ff5edb6d8326473a64c82cf41ddf78ab116f89668c50c4fac1b321e5e80f4" dependencies = [ "async-std", "async-trait", - "base64 0.21.5", + "base64 0.21.7", "chumsky", "email-encoding", "email_address", @@ -2690,23 +2868,23 @@ dependencies = [ "idna 0.5.0", "mime", "nom", - "once_cell", + "percent-encoding", "quoted_printable", - "rustls", - "rustls-pemfile", - "socket2 0.5.5", + "rustls 0.22.2", + "rustls-pemfile 2.1.1", + "socket2 0.5.6", "tokio", "tokio-rustls", "tracing", "url", - "webpki-roots", + "webpki-roots 0.26.1", ] [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libm" @@ -2720,7 +2898,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", "redox_syscall", ] @@ -2750,9 +2928,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "listenfd" @@ -2783,9 +2961,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" dependencies = [ "value-bag", ] @@ -2801,7 +2979,7 @@ dependencies = [ [[package]] name = "mas-axum-utils" -version = "0.7.0" +version = "0.9.0" dependencies = [ "async-trait", "axum", @@ -2810,7 +2988,7 @@ dependencies = [ "data-encoding", "futures-util", "headers", - "http 0.2.11", + "http 0.2.12", "http-body", "icu_locid", "mas-data-model", @@ -2838,17 +3016,18 @@ dependencies = [ [[package]] name = "mas-cli" -version = "0.7.0" +version = "0.9.0" dependencies = [ "anyhow", "axum", "camino", "clap", "dotenvy", + "figment", "httpdate", "hyper", "ipnetwork", - "itertools 0.11.0", + "itertools 0.12.1", "listenfd", "mas-config", "mas-data-model", @@ -2873,17 +3052,16 @@ dependencies = [ "oauth2-types", "opentelemetry", "opentelemetry-http", - "opentelemetry-jaeger", + "opentelemetry-jaeger-propagator", "opentelemetry-otlp", "opentelemetry-prometheus", "opentelemetry-semantic-conventions", "opentelemetry-stdout", - "opentelemetry-zipkin", "opentelemetry_sdk", "prometheus", "rand 0.8.5", "rand_chacha 0.3.1", - "rustls", + "rustls 0.22.2", "sentry", "sentry-tower", "sentry-tracing", @@ -2903,10 +3081,9 @@ dependencies = [ [[package]] name = "mas-config" -version = "0.7.0" +version = "0.9.0" dependencies = [ "anyhow", - "async-trait", "camino", "chrono", "figment", @@ -2918,7 +3095,8 @@ dependencies = [ "pem-rfc7468", "rand 0.8.5", "rand_chacha 0.3.1", - "rustls-pemfile", + "rustls-pemfile 2.1.1", + "rustls-pki-types", "schemars", "serde", "serde_json", @@ -2932,7 +3110,7 @@ dependencies = [ [[package]] name = "mas-data-model" -version = "0.7.0" +version = "0.9.0" dependencies = [ "chrono", "crc", @@ -2941,15 +3119,17 @@ dependencies = [ "oauth2-types", "rand 0.8.5", "rand_chacha 0.3.1", + "regex", "serde", "thiserror", "ulid", "url", + "woothee", ] [[package]] name = "mas-email" -version = "0.7.0" +version = "0.9.0" dependencies = [ "async-trait", "headers", @@ -2961,7 +3141,7 @@ dependencies = [ [[package]] name = "mas-graphql" -version = "0.7.0" +version = "0.9.0" dependencies = [ "anyhow", "async-graphql", @@ -2984,7 +3164,7 @@ dependencies = [ [[package]] name = "mas-handlers" -version = "0.7.0" +version = "0.9.0" dependencies = [ "anyhow", "argon2", @@ -3047,22 +3227,21 @@ dependencies = [ [[package]] name = "mas-http" -version = "0.7.0" +version = "0.9.0" dependencies = [ "anyhow", - "axum", "bytes", "futures-util", "headers", - "http 0.2.11", + "http 0.2.12", "http-body", "hyper", "hyper-rustls", "mas-tower", - "once_cell", "opentelemetry", - "rustls", - "rustls-native-certs", + "opentelemetry-semantic-conventions", + "rustls 0.22.2", + "rustls-platform-verifier", "serde", "serde_json", "serde_urlencoded", @@ -3072,20 +3251,22 @@ dependencies = [ "tower-http", "tracing", "tracing-opentelemetry", - "webpki-roots", ] [[package]] name = "mas-i18n" -version = "0.7.0" +version = "0.9.0" dependencies = [ "camino", + "icu_calendar", + "icu_datetime", "icu_list", "icu_locid", "icu_locid_transform", "icu_plurals", "icu_provider", "icu_provider_adapters", + "icu_relativetime", "pad", "pest", "pest_derive", @@ -3097,7 +3278,7 @@ dependencies = [ [[package]] name = "mas-i18n-scan" -version = "0.7.0" +version = "0.9.0" dependencies = [ "camino", "clap", @@ -3111,7 +3292,7 @@ dependencies = [ [[package]] name = "mas-iana" -version = "0.7.0" +version = "0.9.0" dependencies = [ "schemars", "serde", @@ -3119,7 +3300,7 @@ dependencies = [ [[package]] name = "mas-iana-codegen" -version = "0.7.0" +version = "0.9.0" dependencies = [ "anyhow", "async-trait", @@ -3136,7 +3317,7 @@ dependencies = [ [[package]] name = "mas-jose" -version = "0.7.0" +version = "0.9.0" dependencies = [ "base64ct", "chrono", @@ -3167,7 +3348,7 @@ dependencies = [ [[package]] name = "mas-keystore" -version = "0.7.0" +version = "0.9.0" dependencies = [ "aead", "base64ct", @@ -3196,18 +3377,18 @@ dependencies = [ [[package]] name = "mas-listener" -version = "0.7.0" +version = "0.9.0" dependencies = [ "anyhow", "bytes", - "event-listener 4.0.0", + "event-listener 5.2.0", "futures-util", "http-body", "hyper", "libc", "pin-project-lite", - "rustls-pemfile", - "socket2 0.5.5", + "rustls-pemfile 2.1.1", + "socket2 0.5.6", "thiserror", "tokio", "tokio-rustls", @@ -3220,11 +3401,11 @@ dependencies = [ [[package]] name = "mas-matrix" -version = "0.7.0" +version = "0.9.0" dependencies = [ "anyhow", "async-trait", - "http 0.2.11", + "http 0.2.12", "serde", "tokio", "url", @@ -3232,11 +3413,11 @@ dependencies = [ [[package]] name = "mas-matrix-synapse" -version = "0.7.0" +version = "0.9.0" dependencies = [ "anyhow", "async-trait", - "http 0.2.11", + "http 0.2.12", "mas-axum-utils", "mas-http", "mas-matrix", @@ -3248,18 +3429,17 @@ dependencies = [ [[package]] name = "mas-oidc-client" -version = "0.7.0" +version = "0.9.0" dependencies = [ "assert_matches", "base64ct", - "bitflags 2.4.1", + "bitflags 2.5.0", "bytes", "chrono", "form_urlencoded", - "futures", "futures-util", "headers", - "http 0.2.11", + "http 0.2.12", "http-body", "hyper", "hyper-rustls", @@ -3270,10 +3450,10 @@ dependencies = [ "mas-keystore", "mime", "oauth2-types", - "once_cell", "rand 0.8.5", "rand_chacha 0.3.1", - "rustls", + "rustls 0.22.2", + "rustls-platform-verifier", "serde", "serde_json", "serde_urlencoded", @@ -3289,7 +3469,7 @@ dependencies = [ [[package]] name = "mas-policy" -version = "0.7.0" +version = "0.9.0" dependencies = [ "anyhow", "mas-data-model", @@ -3306,7 +3486,7 @@ dependencies = [ [[package]] name = "mas-router" -version = "0.7.0" +version = "0.9.0" dependencies = [ "axum", "serde", @@ -3317,7 +3497,7 @@ dependencies = [ [[package]] name = "mas-spa" -version = "0.7.0" +version = "0.9.0" dependencies = [ "camino", "serde", @@ -3326,7 +3506,7 @@ dependencies = [ [[package]] name = "mas-storage" -version = "0.7.0" +version = "0.9.0" dependencies = [ "apalis-core", "async-trait", @@ -3349,7 +3529,7 @@ dependencies = [ [[package]] name = "mas-storage-pg" -version = "0.7.0" +version = "0.9.0" dependencies = [ "async-trait", "chrono", @@ -3359,6 +3539,7 @@ dependencies = [ "mas-jose", "mas-storage", "oauth2-types", + "opentelemetry-semantic-conventions", "rand 0.8.5", "rand_chacha 0.3.1", "sea-query", @@ -3375,7 +3556,7 @@ dependencies = [ [[package]] name = "mas-tasks" -version = "0.7.0" +version = "0.9.0" dependencies = [ "anyhow", "apalis-core", @@ -3383,8 +3564,8 @@ dependencies = [ "async-stream", "async-trait", "chrono", - "event-listener 4.0.0", - "futures-lite 2.0.1", + "event-listener 5.2.0", + "futures-lite 2.3.0", "mas-data-model", "mas-email", "mas-i18n", @@ -3410,13 +3591,13 @@ dependencies = [ [[package]] name = "mas-templates" -version = "0.7.0" +version = "0.9.0" dependencies = [ "anyhow", "arc-swap", "camino", "chrono", - "http 0.2.11", + "http 0.2.12", "mas-data-model", "mas-i18n", "mas-router", @@ -3438,9 +3619,9 @@ dependencies = [ [[package]] name = "mas-tower" -version = "0.7.0" +version = "0.9.0" dependencies = [ - "http 0.2.11", + "http 0.2.12", "opentelemetry", "opentelemetry-http", "opentelemetry-semantic-conventions", @@ -3484,9 +3665,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memfd" @@ -3494,7 +3675,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.25", + "rustix 0.38.31", ] [[package]] @@ -3503,15 +3684,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "374c335b2df19e62d4cb323103473cbc6510980253119180de862d89184f6a83" -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.0" @@ -3539,9 +3711,9 @@ dependencies = [ [[package]] name = "minijinja" -version = "1.0.10" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208758577ef2c86cf5dd3e85730d161413ec3284e2d73b2ef65d9a24d9971bcb" +checksum = "562e7acc6adf9a8359061ea3e0634560a3f636dc0539d36cd300c82fd703f528" dependencies = [ "memo-map", "self_cell", @@ -3558,18 +3730,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -3585,7 +3757,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 0.2.11", + "http 0.2.12", "httparse", "log", "memchr", @@ -3594,19 +3766,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", - "pin-utils", -] - [[package]] name = "nom" version = "7.1.3" @@ -3627,6 +3786,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-bigint-dig" version = "0.8.4" @@ -3645,20 +3815,25 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -3667,9 +3842,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -3687,16 +3862,15 @@ dependencies = [ [[package]] name = "oauth2-types" -version = "0.7.0" +version = "0.9.0" dependencies = [ "assert_matches", "chrono", "data-encoding", - "http 0.2.11", + "http 0.2.12", "language-tags", "mas-iana", "mas-jose", - "parse-display", "serde", "serde_json", "serde_with", @@ -3707,29 +3881,29 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "crc32fast", - "hashbrown 0.14.2", - "indexmap 2.1.0", + "hashbrown 0.14.3", + "indexmap 2.2.5", "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opa-wasm" version = "0.1.0" -source = "git+https://github.com/matrix-org/rust-opa-wasm.git#ba83f2d4391823b1b34de3e786d1454a0fc90efb" +source = "git+https://github.com/matrix-org/rust-opa-wasm.git#d8a83a223880a863a1bc970811113cd7c819ba7c" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.7", "cc", "chrono", "chrono-tz", @@ -3739,6 +3913,7 @@ dependencies = [ "form_urlencoded", "hex", "hmac", + "indexmap 2.2.5", "json-patch", "md-5", "parse-size", @@ -3759,9 +3934,9 @@ dependencies = [ [[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" @@ -3771,13 +3946,12 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "opentelemetry" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" +checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" dependencies = [ "futures-core", "futures-sink", - "indexmap 2.1.0", "js-sys", "once_cell", "pin-project-lite", @@ -3787,60 +3961,50 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" +checksum = "7cbfa5308166ca861434f0b0913569579b8e587430a3d6bcd7fd671921ec145a" dependencies = [ "async-trait", "bytes", - "http 0.2.11", + "http 0.2.12", "hyper", "opentelemetry", "tokio", ] [[package]] -name = "opentelemetry-jaeger" -version = "0.20.0" +name = "opentelemetry-jaeger-propagator" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e617c66fd588e40e0dbbd66932fdc87393095b125d4459b1a3a10feb1712f8a1" +checksum = "beb4ec62efc537b60aaa89b92624f986f2523d3a609079f3511cc8ee73490826" dependencies = [ - "async-trait", - "futures-core", - "futures-util", - "http 0.2.11", "opentelemetry", - "opentelemetry-http", - "opentelemetry-semantic-conventions", - "opentelemetry_sdk", - "thrift", - "tokio", ] [[package]] name = "opentelemetry-otlp" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" +checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb" dependencies = [ "async-trait", "futures-core", - "http 0.2.11", + "http 0.2.12", "opentelemetry", + "opentelemetry-http", "opentelemetry-proto", "opentelemetry-semantic-conventions", "opentelemetry_sdk", "prost", "thiserror", - "tokio", - "tonic", ] [[package]] name = "opentelemetry-prometheus" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8f082da115b0dcb250829e3ed0b8792b8f963a1ad42466e48422fbe6a079bd" +checksum = "30bbcf6341cab7e2193e5843f0ac36c446a5b3fccb28747afaeda17996dcd02e" dependencies = [ "once_cell", "opentelemetry", @@ -3851,9 +4015,9 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" +checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4" dependencies = [ "opentelemetry", "opentelemetry_sdk", @@ -3863,54 +4027,31 @@ dependencies = [ [[package]] name = "opentelemetry-semantic-conventions" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" -dependencies = [ - "opentelemetry", -] +checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910" [[package]] name = "opentelemetry-stdout" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13b2df4cd59c176099ac82806725ba340c8fa7b1a7004c0912daad30470f63e" +checksum = "4bdf28b381f23afcd150afc0b38a4183dd321fc96320c1554752b6b761648f78" dependencies = [ "async-trait", "chrono", "futures-util", "opentelemetry", "opentelemetry_sdk", - "ordered-float 4.1.1", + "ordered-float", "serde", "serde_json", ] -[[package]] -name = "opentelemetry-zipkin" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2bee3ec1be4d0088378e0eb1dd54c113cbd7ec5622cc4f26181debf1d4d7b5" -dependencies = [ - "async-trait", - "futures-core", - "http 0.2.11", - "once_cell", - "opentelemetry", - "opentelemetry-http", - "opentelemetry-semantic-conventions", - "opentelemetry_sdk", - "serde", - "serde_json", - "thiserror", - "typed-builder", -] - [[package]] name = "opentelemetry_sdk" -version = "0.21.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968ba3f2ca03e90e5187f5e4f46c791ef7f2c163ae87789c8ce5f5ca3b7b7de5" +checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" dependencies = [ "async-trait", "crossbeam-channel", @@ -3920,7 +4061,7 @@ dependencies = [ "glob", "once_cell", "opentelemetry", - "ordered-float 4.1.1", + "ordered-float", "percent-encoding", "rand 0.8.5", "thiserror", @@ -3930,31 +4071,22 @@ dependencies = [ [[package]] name = "ordered-float" -version = "2.10.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" -dependencies = [ - "num-traits", -] - -[[package]] -name = "ordered-float" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" dependencies = [ "num-traits", ] [[package]] name = "os_info" -version = "3.7.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +checksum = "6cbb46d5d01695d7a1fb8be5f0d1968bd2b2b8ba1d1b3e7062ce2a0593e57af1" dependencies = [ "log", "serde", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4025,32 +4157,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "parse-display" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6509d08722b53e8dafe97f2027b22ccbe3a5db83cb352931e9716b0aa44bc5c" -dependencies = [ - "once_cell", - "parse-display-derive", - "regex", -] - -[[package]] -name = "parse-display-derive" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68517892c8daf78da08c0db777fcc17e07f2f63ef70041718f8a7630ad84f341" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "regex", - "regex-syntax 0.7.5", - "structmeta", - "syn 2.0.39", -] - [[package]] name = "parse-size" version = "1.0.0" @@ -4098,9 +4204,9 @@ dependencies = [ [[package]] name = "pear" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a386cd715229d399604b50d1361683fe687066f42d56f54be995bc6868f71c" +checksum = "4ccca0f6c17acc81df8e242ed473ec144cbf5c98037e69aa6d144780aad103c8" dependencies = [ "inlinable_string", "pear_codegen", @@ -4109,14 +4215,14 @@ dependencies = [ [[package]] name = "pear_codegen" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f0f13dac8069c139e8300a6510e3f4143ecf5259c60b116a9b271b4ca0d54" +checksum = "2e22670e8eb757cff11d6c199ca7b987f352f0346e0be4dd23869ec72cb53c77" dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] @@ -4136,9 +4242,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" dependencies = [ "memchr", "thiserror", @@ -4147,9 +4253,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026" dependencies = [ "pest", "pest_generator", @@ -4157,22 +4263,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293" dependencies = [ "once_cell", "pest", @@ -4219,22 +4325,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] @@ -4300,9 +4406,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "polling" @@ -4322,16 +4428,16 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.25", + "rustix 0.38.31", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4347,9 +4453,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -4390,9 +4496,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -4405,7 +4511,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", "version_check", "yansi", ] @@ -4427,9 +4533,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.9" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", "prost-derive", @@ -4437,15 +4543,15 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.11.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.53", ] [[package]] @@ -4456,9 +4562,9 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "psl" -version = "2.1.12" +version = "2.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc9f7a25d234ba11af714be527b60c8bc7ce1310011ef8dc032bd5ab1a7eadd" +checksum = "610dd51a0e8bf3e9d042b3c4fa6e66a6d0f70f9a624db7a49348c55046faba35" dependencies = [ "psl-types", ] @@ -4490,9 +4596,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -4562,7 +4668,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -4576,9 +4682,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -4586,9 +4692,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -4609,7 +4715,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "libredox", "thiserror", ] @@ -4629,13 +4735,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.6", "regex-syntax 0.8.2", ] @@ -4659,9 +4765,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -4674,12 +4780,6 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - [[package]] name = "regex-syntax" version = "0.8.2" @@ -4704,23 +4804,24 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "getrandom 0.2.11", + "cfg-if", + "getrandom 0.2.12", "libc", "spin 0.9.8", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rsa" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3211b01eea83d80687da9eef70e39d65144a3894866a5153a2723e425a157f" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ "const-oid", "digest", @@ -4738,9 +4839,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.33.1" +version = "1.34.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" +checksum = "b39449a79f45e8da28c57c341891b69a183044b29518bb8f86dbac9df60bb7df" dependencies = [ "arrayvec", "num-traits", @@ -4783,37 +4884,51 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.11", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.9" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ - "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] [[package]] -name = "rustls-native-certs" -version = "0.6.3" +name = "rustls" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 2.1.1", + "rustls-pki-types", "schannel", "security-framework", ] @@ -4824,9 +4939,52 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" +dependencies = [ + "base64 0.21.7", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" + +[[package]] +name = "rustls-platform-verifier" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c35b9a497e588f1fb2e1d18a0d46a6d057710f34c3da7084b27353b319453cc" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.22.2", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.2", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.1", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -4837,6 +4995,17 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -4845,9 +5014,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "salsa20" @@ -4869,11 +5038,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4884,6 +5053,7 @@ checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ "chrono", "dyn-clone", + "indexmap 1.9.3", "schemars_derive", "serde", "serde_json", @@ -4931,9 +5101,9 @@ dependencies = [ [[package]] name = "sea-query" -version = "0.30.3" +version = "0.30.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3472e143a83f7f03d306dcc62af88c5afdcd7e35f96ef0001a806fe244b3b15a" +checksum = "4166a1e072292d46dc91f31617c2a1cdaf55a8be4b5c9f4bf2ba248e3ac4999b" dependencies = [ "chrono", "inherent", @@ -4949,7 +5119,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "878cf3d57f0e5bfacd425cdaccc58b4c06d68a7b71c63fc28710a20c88676808" dependencies = [ "darling 0.14.4", - "heck", + "heck 0.4.1", "quote", "syn 1.0.109", ] @@ -4972,10 +5142,10 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25a82fcb49253abcb45cdcb2adf92956060ec0928635eb21b4f7a6d8f25ab0bc" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", "thiserror", ] @@ -5003,6 +5173,7 @@ dependencies = [ "core-foundation", "core-foundation-sys", "libc", + "num-bigint", "security-framework-sys", ] @@ -5018,15 +5189,15 @@ dependencies = [ [[package]] name = "self_cell" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "sentry" @@ -5097,7 +5268,7 @@ version = "0.31.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88e782e369edac4adfc5bf528b27577270bc3e7023c388ebad9db08e1d56b30b" dependencies = [ - "http 0.2.11", + "http 0.2.12", "pin-project", "sentry-core", "tower-layer", @@ -5136,22 +5307,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] @@ -5167,10 +5338,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ + "indexmap 2.2.5", "itoa", "ryu", "serde", @@ -5178,9 +5350,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ "itoa", "serde", @@ -5211,16 +5383,17 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.1.0", + "indexmap 2.2.5", "serde", + "serde_derive", "serde_json", "serde_with_macros", "time", @@ -5228,23 +5401,23 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ - "darling 0.20.3", + "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] name = "serde_yaml" -version = "0.9.27" +version = "0.9.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.5", "itoa", "ryu", "serde", @@ -5303,9 +5476,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" +checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" [[package]] name = "siphasher" @@ -5330,9 +5503,9 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" @@ -5346,12 +5519,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5371,9 +5544,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -5381,9 +5554,12 @@ dependencies = [ [[package]] name = "sprintf" -version = "0.1.4" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c0cdea5a20a06e7c57f627094e7b1618e5665592cd88f2d45fa4014e348db58" +checksum = "f2819cb5194dfe9e6d102f4519a9fb9dc7106d2879b71b4fd4d4677f1175bd39" +dependencies = [ + "thiserror", +] [[package]] name = "sptr" @@ -5393,20 +5569,20 @@ checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" [[package]] name = "sqlformat" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" +checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" dependencies = [ - "itertools 0.11.0", + "itertools 0.12.1", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" dependencies = [ "sqlx-core", "sqlx-macros", @@ -5417,9 +5593,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" dependencies = [ "ahash", "atoi", @@ -5428,7 +5604,6 @@ dependencies = [ "chrono", "crc", "crossbeam-queue", - "dotenvy", "either", "event-listener 2.5.3", "futures-channel", @@ -5438,15 +5613,15 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.1.0", + "indexmap 2.2.5", "ipnetwork", "log", "memchr", "once_cell", "paste", "percent-encoding", - "rustls", - "rustls-pemfile", + "rustls 0.21.10", + "rustls-pemfile 1.0.4", "serde", "serde_json", "sha2", @@ -5458,14 +5633,14 @@ dependencies = [ "tracing", "url", "uuid", - "webpki-roots", + "webpki-roots 0.25.4", ] [[package]] name = "sqlx-macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" dependencies = [ "proc-macro2", "quote", @@ -5476,14 +5651,13 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" dependencies = [ - "atomic-write-file", "dotenvy", "either", - "heck", + "heck 0.4.1", "hex", "once_cell", "proc-macro2", @@ -5503,13 +5677,13 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" dependencies = [ "atoi", - "base64 0.21.5", - "bitflags 2.4.1", + "base64 0.21.7", + "bitflags 2.5.0", "byteorder", "bytes", "chrono", @@ -5547,13 +5721,13 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" dependencies = [ "atoi", - "base64 0.21.5", - "bitflags 2.4.1", + "base64 0.21.7", + "bitflags 2.5.0", "byteorder", "chrono", "crc", @@ -5576,7 +5750,6 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha1", "sha2", "smallvec", "sqlx-core", @@ -5589,9 +5762,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" dependencies = [ "atoi", "chrono", @@ -5655,27 +5828,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "structmeta" -version = "0.2.0" +name = "strsim" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d" -dependencies = [ - "proc-macro2", - "quote", - "structmeta-derive", - "syn 2.0.39", -] - -[[package]] -name = "structmeta-derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "strum" @@ -5692,11 +5848,11 @@ version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] @@ -5718,9 +5874,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ "proc-macro2", "quote", @@ -5735,95 +5891,72 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "synstructure" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", - "unicode-xid", + "syn 2.0.53", ] [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.25", - "windows-sys 0.48.0", + "rustix 0.38.31", + "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", ] -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "thrift" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" -dependencies = [ - "byteorder", - "integer-encoding", - "log", - "ordered-float 2.10.1", - "threadpool", -] - [[package]] name = "time" -version = "0.3.30" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -5838,10 +5971,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -5872,9 +6006,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -5884,21 +6018,11 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.6", "tokio-macros", "windows-sys 0.48.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.2.0" @@ -5907,24 +6031,25 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls", + "rustls 0.22.2", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -5933,9 +6058,9 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" +checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" dependencies = [ "async-stream", "bytes", @@ -5979,34 +6104,27 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.5", "toml_datetime", "winnow", ] [[package]] name = "tonic" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ "async-trait", - "axum", - "base64 0.21.5", + "base64 0.21.7", "bytes", - "futures-core", - "futures-util", - "h2", - "http 0.2.11", + "http 0.2.12", "http-body", - "hyper", - "hyper-timeout", "percent-encoding", "pin-project", "prost", "tokio", "tokio-stream", - "tower", "tower-layer", "tower-service", "tracing", @@ -6020,12 +6138,8 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "hdrhistogram", - "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand 0.8.5", - "slab", "tokio", "tokio-util", "tower-layer", @@ -6039,11 +6153,11 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "bytes", "futures-core", "futures-util", - "http 0.2.11", + "http 0.2.12", "http-body", "http-range-header", "httpdate", @@ -6104,7 +6218,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] @@ -6142,9 +6256,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" +checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" dependencies = [ "js-sys", "once_cell", @@ -6176,20 +6290,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "typed-builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6179333b981641242a768f30f371c9baccbfcc03749627000c500ab88bf4528b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" @@ -6205,13 +6308,15 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "ulid" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" +checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" dependencies = [ + "getrandom 0.2.12", "rand 0.8.5", "serde", "uuid", + "web-time", ] [[package]] @@ -6225,9 +6330,9 @@ dependencies = [ [[package]] name = "uncased" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" dependencies = [ "version_check", ] @@ -6243,9 +6348,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -6255,18 +6360,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -6298,9 +6403,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "untrusted" @@ -6334,9 +6439,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "serde", ] @@ -6355,9 +6460,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.2" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" +checksum = "74797339c3b98616c009c7c3eb53a0ce41e85c8ec66bd3db96ed132d20cfdee8" [[package]] name = "vcpkg" @@ -6379,9 +6484,9 @@ checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -6409,10 +6514,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.88" +name = "wasite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6420,24 +6531,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -6447,9 +6558,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6457,60 +6568,62 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-encoder" -version = "0.36.2" +version = "0.41.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822b645bf4f2446b949776ffca47e2af60b167209ffb70814ef8779d299cd421" +checksum = "972f97a5d8318f908dded23594188a90bcd09365986b1163e66d70170e5287ae" dependencies = [ "leb128", ] [[package]] name = "wasmparser" -version = "0.116.1" +version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a58e28b80dd8340cb07b8242ae654756161f6fc8d0038123d679b7b99964fa50" +checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ - "indexmap 2.1.0", + "bitflags 2.5.0", + "indexmap 2.2.5", "semver", ] [[package]] name = "wasmtime" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae4b1702ef55144d6f594085f4989dc71fb71a791be1c8354ecc8e489b81199b" +checksum = "8106d7d22d63d1bcb940e22dcc7b03e46f0fc8bfbaf2fd7b6cb8f448f9449774" dependencies = [ "anyhow", "async-trait", "bincode", "bumpalo", "cfg-if", - "indexmap 2.1.0", + "gimli", + "indexmap 2.2.5", "libc", "log", "object", "once_cell", "paste", - "psm", + "rustix 0.38.31", "serde", "serde_derive", "serde_json", @@ -6521,50 +6634,50 @@ dependencies = [ "wasmtime-cranelift", "wasmtime-environ", "wasmtime-fiber", - "wasmtime-jit", + "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-asm-macros" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c981d0e87bb3e98e08e76644e7ae5dfdef7f1d4105145853f3d677bb4535d65f" +checksum = "3b0cf02cea951ace34ee3b0e64b7f446c3519d1c95ad75bc5330f405e275ee8f" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7ba8adaa84fdb9dd659275edcf7fc5282c44b9c9f829986c71d44fd52ea80a" +checksum = "3249204a71d728d53fb3eea18afd0473f87e520445707a4d567ac4da0bb3eb5d" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.7", "bincode", "directories-next", "log", - "rustix 0.38.25", + "rustix 0.38.31", "serde", "serde_derive", "sha2", "toml", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "zstd", ] [[package]] name = "wasmtime-component-macro" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91dcbbd0e1f094351d1ae0e53463c63ba53ec8f8e0e21d17567c1979a8c3758" +checksum = "7d3786c0531565ec6c9852c0e46299f06cb6e4b58d36e30f3c234cfa69bde376" dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -6572,15 +6685,15 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e85f1319a7ed36aa59446ab7e967d0c2fb0cd179bf56913633190b44572023e" +checksum = "81eae2ec98027ee0b3950da83bc320120a23087ac4d39b3d59201cb5ebf52777" [[package]] name = "wasmtime-cranelift" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1453665878e16245b9a25405e550c4a36c6731c6e34ea804edc002a38c3e6741" +checksum = "595abdb067acdc812ab0f21d8d46d5aa4022392aa7c3e0632c20bff9ec49ffb4" dependencies = [ "anyhow", "cfg-if", @@ -6603,9 +6716,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift-shared" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dface3d9b72b4670781ff72675eabb291e2836b5dded6bb312b577d2bb561f" +checksum = "e8c24c1fdea167b992d82ebe76471fd1cbe7b0b406bc72f9250f86353000134e" dependencies = [ "anyhow", "cranelift-codegen", @@ -6619,14 +6732,15 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0116108e7d231cce15fe7dd642c66c3abb14dbcf169b0130e11f223ce8d1ad7" +checksum = "3279d510005358141550d8a90a5fc989d7e81748e5759d582fe6bfdcbf074a04" dependencies = [ "anyhow", + "bincode", "cranelift-entity", "gimli", - "indexmap 2.1.0", + "indexmap 2.2.5", "log", "object", "serde", @@ -6639,96 +6753,63 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a5896355c37bf0f9feb4f1299142ef4bed8c92576aa3a41d150fed0cafa056" +checksum = "9b1df665f2117741d1265f5663b0d93068b18120c2c4b18b9faed49d00d92c31" dependencies = [ "anyhow", "cc", "cfg-if", - "rustix 0.38.25", + "rustix 0.38.31", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "wasmtime-jit" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32b210767452f6b20157bb7c7d98295b92cc47aaad2a8aa31652f4469813a5d" -dependencies = [ - "anyhow", - "bincode", - "cfg-if", - "gimli", - "log", - "object", - "rustix 0.38.25", - "serde", - "serde_derive", - "target-lexicon", - "wasmtime-environ", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", - "windows-sys 0.48.0", -] - -[[package]] -name = "wasmtime-jit-debug" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffd2785a16c55ac77565613ebda625f5850d4014af0499df750e8de97c04547" -dependencies = [ - "once_cell", - "wasmtime-versioned-export-macros", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b73ad1395eda136baec5ece7e079e0536a82ef73488e345456cc9b89858ad0ec" +checksum = "866634605089b4632b32226b54aa3670d72e1849f9fc425c7e50b3749c2e6df3" dependencies = [ "cfg-if", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-runtime" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b50f7f3c1a8dabb2607f32a81242917bd77cee75f3dec66e04b02ccbb8ba07" +checksum = "e11185c88cadf595d228f5ae4ff9b4badbf9ca98dcb37b0310c36e31fa74867f" dependencies = [ "anyhow", "cc", "cfg-if", - "indexmap 2.1.0", + "indexmap 2.2.5", "libc", "log", "mach", "memfd", - "memoffset 0.9.0", + "memoffset", "paste", - "rand 0.8.5", - "rustix 0.38.25", + "psm", + "rustix 0.38.31", "sptr", "wasm-encoder", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", - "wasmtime-jit-debug", "wasmtime-versioned-export-macros", "wasmtime-wmemcheck", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-types" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447973db3dc5c24db14130ab0922795c58790aec296d198ad9d253b82ec67471" +checksum = "f32377cbd827bee06fcb2f6bf97b0477fdcc86888bbe6db7b9cab8e644082e0a" dependencies = [ "cranelift-entity", "serde", @@ -6739,38 +6820,38 @@ dependencies = [ [[package]] name = "wasmtime-versioned-export-macros" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a347bb8ecf12275fb180afb1b1c85c9e186553c43109737bffed4f54c2aa365" +checksum = "4ab8d7566d206c42f8cf1d4ac90c5e40d3582e8eabad9b3b67e9e73c61fc47a1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] name = "wasmtime-wit-bindgen" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41786c7bbbf250c0e685b291323b50c6bb65f0505a2c0b4f0b598c740f13f185" +checksum = "faf2c76781a27e07802669f6f0e11eb4441546407eb65be60c3d862200988b92" dependencies = [ "anyhow", - "heck", - "indexmap 2.1.0", + "heck 0.4.1", + "indexmap 2.2.5", "wit-parser", ] [[package]] name = "wasmtime-wmemcheck" -version = "15.0.0" +version = "18.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47907bdd67500c66fa308acbce7387c7bfb63b5505ef81be7fc897709afcca60" +checksum = "3847d969bd203b8cd239f89581e52432a0f00b8c5c9bc917be2fccd7542c4f2f" [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -6778,9 +6859,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -6788,15 +6869,28 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall", + "wasite", +] [[package]] name = "winapi" @@ -6831,20 +6925,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.52.4", ] [[package]] @@ -6857,18 +6942,12 @@ dependencies = [ ] [[package]] -name = "windows-targets" -version = "0.42.2" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.52.4", ] [[package]] @@ -6887,10 +6966,19 @@ dependencies = [ ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" +name = "windows-targets" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "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_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", +] [[package]] name = "windows_aarch64_gnullvm" @@ -6899,10 +6987,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" +name = "windows_aarch64_gnullvm" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -6911,10 +6999,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] -name = "windows_i686_gnu" -version = "0.42.2" +name = "windows_aarch64_msvc" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -6923,10 +7011,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] -name = "windows_i686_msvc" -version = "0.42.2" +name = "windows_i686_gnu" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -6935,10 +7023,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" +name = "windows_i686_msvc" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -6947,10 +7035,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" +name = "windows_x86_64_gnu" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -6959,10 +7047,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" +name = "windows_x86_64_gnullvm" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -6971,23 +7059,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "winnow" -version = "0.5.19" +name = "windows_x86_64_msvc" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] name = "wiremock" -version = "0.5.21" +version = "0.5.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079aee011e8a8e625d16df9e785de30a6b77f80a6126092d76a57375f96448da" +checksum = "13a3a53eaf34f390dd30d7b1b078287dd05df2aa2e21a589ccb80f5c7253c2e9" dependencies = [ "assert-json-diff", "async-trait", - "base64 0.21.5", + "base64 0.21.7", "deadpool", "futures", "futures-timer", @@ -7003,13 +7097,13 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15df6b7b28ce94b8be39d8df5cb21a08a4f3b9f33b631aedb4aa5776f785ead3" +checksum = "316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08" dependencies = [ "anyhow", "id-arena", - "indexmap 2.1.0", + "indexmap 2.2.5", "log", "semver", "serde", @@ -7018,6 +7112,16 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "woothee" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "896174c6a4779d4d7d4523dd27aef7d46609eda2497e370f6c998325c6bf6971" +dependencies = [ + "lazy_static", + "regex", +] + [[package]] name = "writeable" version = "0.5.4" @@ -7035,9 +7139,9 @@ dependencies = [ [[package]] name = "yansi" -version = "1.0.0-rc.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yoke" @@ -7059,28 +7163,28 @@ checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.26" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.26" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] @@ -7100,7 +7204,7 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", "synstructure", ] @@ -7110,6 +7214,17 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +[[package]] +name = "zerotrie" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0594125a0574fb93059c92c588ab209cc036a23d1baeb3410fa9181bea551a0" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + [[package]] name = "zerovec" version = "0.10.1" @@ -7129,7 +7244,7 @@ checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.53", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/package.nix index ce4748af91..dce2081a42 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -14,26 +14,26 @@ rustPlatform.buildRustPackage rec { pname = "matrix-authentication-service"; - version = "0.7.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-authentication-service"; rev = "refs/tags/v${version}"; - hash = "sha256-foipChunzRKIbeO+O+XYx0luzaA0G9LKrH59luQl9R0="; + hash = "sha256-e5JlkcSJ44iE+pVnGQpGiSNahxUcIFeaPyOjp9E3eD0="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "opa-wasm-0.1.0" = "sha256-GuOlUNGegdDieTvthk9SyfQSTeem7ArJTdiD1t7Ojd4="; + "opa-wasm-0.1.0" = "sha256-f3IIln7BbN7NJiCVMgfoell/plzlqkSm4YYK7mqzKgw="; }; }; npmDeps = fetchNpmDeps { name = "${pname}-${version}-npm-deps"; src = "${src}/${npmRoot}"; - hash = "sha256-ymI+ZkPEGMTLMdTLfKv/v/cgW5iS/nd9PNXFvYaYNjo="; + hash = "sha256-xoPclMK+io/3tx139MNyMSP0kr61XHiSzAf3YkX0YZo="; }; npmRoot = "frontend"; @@ -49,9 +49,9 @@ rustPlatform.buildRustPackage rec { sqlite zstd ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration + darwin.apple_sdk_11_0.frameworks.CoreFoundation + darwin.apple_sdk_11_0.frameworks.Security + darwin.apple_sdk_11_0.frameworks.SystemConfiguration ]; env = { diff --git a/third_party/nixpkgs/pkgs/by-name/ma/matugen/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/matugen/package.nix new file mode 100644 index 0000000000..f2b80a0a76 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ma/matugen/package.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "matugen"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "InioX"; + repo = "matugen"; + rev = "v${version}"; + hash = "sha256-4VX7Rt+ftEH8nwg59eT7TsvHYUf8/euUmwh/JLc4rLc="; + }; + + cargoHash = "sha256-axBdOzCUwseV2ltgarmIS3IOYLX3q3rXeA2y6y7aNFI="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + meta = with lib; { + description = "A material you color generation tool"; + homepage = "git@github.com:InioX/matugen.git"; + changelog = "https://github.com/InioX/matugen/blob/${src.rev}/CHANGELOG.md"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ lampros ]; + mainProgram = "matugen"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maxfetch/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maxfetch/package.nix new file mode 100644 index 0000000000..3b664020a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ma/maxfetch/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, makeBinaryWrapper +, gnused +, ncurses +, procps +}: + +stdenvNoCC.mkDerivation { + pname = "maxfetch"; + version = "unstable-2023-07-31"; + + src = fetchFromGitHub { + owner = "jobcmax"; + repo = "maxfetch"; + rev = "17baa4047073e20572403b70703c69696af6b68d"; + hash = "sha256-LzOhrFFjGs9GIDjk1lUFKhlnzJuEUrKjBcv1eT3kaY8="; + }; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + installPhase = '' + runHook preInstall + install -Dm755 maxfetch $out/bin/maxfetch + wrapProgram $out/bin/maxfetch \ + --prefix PATH : ${lib.makeBinPath [ gnused ncurses procps ]} + runHook postInstall + ''; + + meta = with lib; { + description = "Nice fetching program written in sh"; + homepage = "https://github.com/jobcmax/maxfetch"; + license = licenses.gpl2Plus; + mainProgram = "maxfetch"; + maintainers = with maintainers; [ jtbx ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mc/mcap-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/mc/mcap-cli/package.nix index 8f4fd9d740..735f780214 100644 --- a/third_party/nixpkgs/pkgs/by-name/mc/mcap-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mc/mcap-cli/package.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, nix-update-script }: let - version = "0.0.43"; + version = "0.0.44"; in buildGoModule { @@ -13,10 +13,10 @@ buildGoModule { repo = "mcap"; owner = "foxglove"; rev = "releases/mcap-cli/v${version}"; - hash = "sha256-AWmPqymnNZxKbhxiQOO9djQXbP56mNh9Ucmty2jd+4Q="; + hash = "sha256-OAL2z28FhMXlyVzgmLCzHNCpCeK7hIkQB6jd7v3WHHA="; }; - vendorHash = "sha256-YFbfrqu2H7yU6vANH56MnxipDxaJLT76qZkvqLCFTTg="; + vendorHash = "sha256-ofJYarmnOHONu2lZ76GvSua0ViP1gr6968xAuQ/VRNk="; modRoot = "go/cli/mcap"; diff --git a/third_party/nixpkgs/pkgs/by-name/mc/mcomix/package.nix b/third_party/nixpkgs/pkgs/by-name/mc/mcomix/package.nix index 170386de3e..900b40fed4 100644 --- a/third_party/nixpkgs/pkgs/by-name/mc/mcomix/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mc/mcomix/package.nix @@ -6,7 +6,7 @@ , mcomix , python3 , testers -, wrapGAppsHook +, wrapGAppsHook3 # Recommended Dependencies: , p7zip @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection python3.pkgs.setuptools - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/by-name/me/mealie/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mealie/package.nix index 2d1512f67e..0bd096f797 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/mealie/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/mealie/package.nix @@ -112,7 +112,7 @@ in pythonpkgs.buildPythonPackage rec { postPatch = '' substituteInPlace mealie/__init__.py \ - --replace-fail '__version__ = ' '__version__ = "${version}" #' + --replace-fail '__version__ = ' '__version__ = "v${version}" #' ''; postInstall = let diff --git a/third_party/nixpkgs/pkgs/by-name/me/mediainfo-gui/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mediainfo-gui/package.nix index a321db5231..7016a9a6cc 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/mediainfo-gui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/mediainfo-gui/package.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "mediainfo-gui"; - version = "24.03"; + version = "24.04"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-b/jx+i+FmhMJH3Wiz5E0hmRPbiWa0cJa+5qT5IRExWM="; + hash = "sha256-6+sctwGiMFnHNsszuRoxcsT5jnNB5EoLMKEZGRkaJ00="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/me/mediainfo/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mediainfo/package.nix index 4fcaf4636d..581b37dcde 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/mediainfo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/mediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "24.03"; + version = "24.04"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-b/jx+i+FmhMJH3Wiz5E0hmRPbiWa0cJa+5qT5IRExWM="; + hash = "sha256-6+sctwGiMFnHNsszuRoxcsT5jnNB5EoLMKEZGRkaJ00="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/me/mednafen/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mednafen/package.nix index 057f3ed4cf..a001edd0e0 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/mednafen/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/mednafen/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mednafen"; - version = "1.29.0"; + version = "1.32.1"; src = fetchurl { url = "https://mednafen.github.io/releases/files/mednafen-${finalAttrs.version}.tar.xz"; - hash = "sha256-2j+88Ch3+b4PAov6XRy1npU6QEm5D+fjk4ijOG2fNi4="; + hash = "sha256-3n65SrZiEq53WDdlJDaKirIII0szeWYlymMFR9vIODI="; }; outputs = [ "out" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/me/mednaffe/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mednaffe/package.nix index 5625c380ea..5722754908 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/mednaffe/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/mednaffe/package.nix @@ -6,7 +6,7 @@ mednafen, pkg-config, stdenv, - wrapGAppsHook, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/me/megapixels/package.nix b/third_party/nixpkgs/pkgs/by-name/me/megapixels/package.nix index eef5e4c7ad..91bd2b302b 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/megapixels/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/megapixels/package.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "megapixels"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitLab { owner = "megapixels-org"; repo = "Megapixels"; rev = finalAttrs.version; - hash = "sha256-J94kDSqQkfdltbYbzvJofd5o/Dhivtld475CaQs7+Ok="; + hash = "sha256-odsOYrk//ZhodsumLpJjhPDcwF1gkE/no166u+IDxSY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meli/package.nix similarity index 76% rename from third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix rename to third_party/nixpkgs/pkgs/by-name/me/meli/package.nix index 3dc373a090..ab5d838c0a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/meli/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchgit +, fetchzip , rustPlatform # native build inputs @@ -22,15 +22,18 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "0.8.4"; + version = "0.8.5"; - src = fetchgit { - url = "https://git.meli-email.org/meli/meli.git"; - rev = "v${version}"; - hash = "sha256-wmIlYgXB17/i9Q+6C7pbcEjVlEuvhmqrSH+cDmaBKLs="; + src = fetchzip { + urls = [ + "https://git.meli-email.org/meli/meli/archive/v${version}.tar.gz" + "https://codeberg.org/meli/meli/archive/v${version}.tar.gz" + "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz" + ]; + hash = "sha256-xfc4DZGKQi/n87JcjTl+s2UFJ20v+6JmzSL36pZlSc0="; }; - cargoHash = "sha256-gYS/dxNMz/HkCmRXH5AdHPXJ2giqpAHc4eVXJGOpMDM="; + cargoHash = "sha256-7ax3VQ+McmzxdG8TeKnMnD0uJmM0pi9Sskfdl2SZkz4="; # Needed to get openssl-sys to use pkg-config OPENSSL_NO_VENDOR=1; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix b/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix similarity index 55% rename from third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix rename to third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix index 0603373dfe..7fc24f718d 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix @@ -3,13 +3,14 @@ , cmake , extra-cmake-modules , fetchFromGitHub +, libGL , libarchive , libpcap , libsForQt5 , libslirp -, libGL , pkg-config , stdenv +, unstableGitUpdater , wayland , zstd }: @@ -22,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-01-17"; + version = "0.9.5-unstable-2024-05-13"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "7897bd387bfd37615a049eba28d02dc23cfa5194"; - hash = "sha256-7BrUa8QJnudJkiCtuBdfar+FeeJSrdMGJdhXrPP6uww="; + rev = "5df83c97c766bff3da8ba5a1504a6a5974467133"; + hash = "sha256-Fo+HtTvkfrHU361ccH9zPifRoR6tNcw9gKIaExKEQh4="; }; nativeBuildInputs = [ @@ -55,9 +56,30 @@ stdenv.mkDerivation (finalAttrs: { "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" ]; + passthru = { + updateScript = unstableGitUpdater { }; + }; + meta = { homepage = "https://melonds.kuribo64.net/"; description = "Work in progress Nintendo DS emulator"; + longDescription = '' + melonDS aims at providing fast and accurate Nintendo DS emulation. While + it is still a work in progress, it has a pretty solid set of features: + + - Nearly complete core (CPU, video, audio, ...) + - JIT recompiler for fast emulation + - OpenGL renderer, 3D upscaling + - RTC, microphone, lid close/open + - Joystick support + - Savestates + - Various display position/sizing/rotation modes + - (WIP) Wifi: local multiplayer, online connectivity + - (WIP) DSi emulation + - DLDI + - (WIP) GBA slot add-ons + - and more are planned! + ''; license = with lib.licenses; [ gpl3Plus ]; mainProgram = "melonDS"; maintainers = with lib.maintainers; [ @@ -65,7 +87,6 @@ stdenv.mkDerivation (finalAttrs: { artemist benley shamilton - xfix ]; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/by-name/me/menulibre/package.nix b/third_party/nixpkgs/pkgs/by-name/me/menulibre/package.nix index 134c7cc98c..414f591965 100644 --- a/third_party/nixpkgs/pkgs/by-name/me/menulibre/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/menulibre/package.nix @@ -5,7 +5,7 @@ , gtk3 , intltool , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , nix-update-script , testers , menulibre @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { gtk3 intltool gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix b/third_party/nixpkgs/pkgs/by-name/mg/mgba/package.nix similarity index 87% rename from third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix rename to third_party/nixpkgs/pkgs/by-name/mg/mgba/package.nix index 457d5c7e4f..6eaf56419d 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/mg/mgba/package.nix @@ -1,20 +1,21 @@ -{ lib -, SDL2 -, cmake -, fetchFromGitHub -, ffmpeg -, discord-rpc -, libedit -, elfutils -, libepoxy -, libsForQt5 -, libzip -, lua -, minizip -, pkg-config -, stdenv -, wrapGAppsHook -, enableDiscordRpc ? false +{ + lib, + SDL2, + cmake, + fetchFromGitHub, + ffmpeg, + discord-rpc, + libedit, + elfutils, + libepoxy, + libsForQt5, + libzip, + lua, + minizip, + pkg-config, + stdenv, + wrapGAppsHook3, + enableDiscordRpc ? false, }: let @@ -41,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook ]; @@ -92,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://raw.githubusercontent.com/mgba-emu/mgba/${finalAttrs.src.rev}/CHANGES"; license = with lib.licenses; [ mpl20 ]; mainProgram = "mgba"; - maintainers = with lib.maintainers; [ MP2E AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; broken = enableDiscordRpc; # Some obscure `ld` error }; diff --git a/third_party/nixpkgs/pkgs/by-name/mi/mihomo/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/mihomo/package.nix index 6e880a4a0c..b397c9a3e2 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/mihomo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/mihomo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-/fFVUI++OhOer5DrvcXO+R+4whtb5+3Qg3e4+ikJr1Y="; + hash = "sha256-mqNcMB2nb8+e9XEGKqwaBE/nC4+jRaEFxE17e0JTo8Y="; }; - vendorHash = "sha256-k4xB/jO78VGD+n9HtuoWXoXB+kZCEyPKJTTwj32nGIw="; + vendorHash = "sha256-9Ey4roUm/Y6GfFmLD6ij/A+YIgetStawWmhD+Iq3qc8="; excludedPackages = [ "./test" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/mi/mimikatz/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/mimikatz/package.nix new file mode 100644 index 0000000000..d834e9fdf8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mi/mimikatz/package.nix @@ -0,0 +1,31 @@ +{ lib +, fetchzip +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "mimikatz"; + version = "2.2.0-20220919"; + + src = fetchzip { + url = "https://github.com/gentilkiwi/mimikatz/releases/download/${finalAttrs.version}/mimikatz_trunk.zip"; + hash = "sha256-wmatI/rEMziBdNiA3HE3MJ0ckdpvsD+LdbB7SKOYdI0="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/windows/mimikatz + cp -a * $out/share/windows/mimikatz/ + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/gentilkiwi/mimikatz"; + description = "A little tool to play with Windows security"; + license = with lib.licenses; [ cc-by-40 ]; + maintainers = with lib.maintainers; [ d3vil0p3r ]; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/mi/mini-calc/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/mini-calc/package.nix index 2faa44a338..d8a385121e 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/mini-calc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/mini-calc/package.nix @@ -1,22 +1,29 @@ -{ lib, rustPlatform, fetchpatch, fetchFromGitHub }: +{ + lib, + rustPlatform, + fetchFromGitHub, + gnuplot, + makeWrapper, +}: rustPlatform.buildRustPackage rec { pname = "mini-calc"; - version = "2.12.3"; + version = "2.13.0"; src = fetchFromGitHub { owner = "coco33920"; repo = "calc"; rev = version; - hash = "sha256-/aTfh3d63wwk3xai2F/D1fMJiDO4mg+OeLIanV4vSuA="; + hash = "sha256-rvQXn0VuOjB7CSf+bDTGxjeMKpbJGhVmyDLNYSy/Mlw="; }; - cargoHash = "sha256-BfaOhEAKZmTYkzz6rvcSmDPufyQMJFtQO6CRksgA/2U="; - cargoPatches = [ - (fetchpatch { - url = "https://github.com/coco33920/calc/commit/a010c72b5c06c75b7f644071f2861394dd5c74b8.patch"; - sha256 = "sha256-ceyxfgiXHS+oOJ4apM8+cSjMICwGlQHMKjFICATmKTU="; - }) - ]; + cargoHash = "sha256-QFzrJBnGKAgDhjbbik0WP3Y1fNoHMAiWpEHfidFQGPk="; + + nativeBuildInputs = [ makeWrapper ]; + postFixup = '' + wrapProgram $out/bin/mini-calc \ + --prefix PATH : "${lib.makeBinPath [ gnuplot ]}" + + ''; meta = { description = "A fully-featured minimalistic configurable calculator written in Rust"; diff --git a/third_party/nixpkgs/pkgs/by-name/mi/minijinja/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/minijinja/package.nix index 686cb741eb..fa96849902 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/minijinja/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/minijinja/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "1.0.20"; + version = "2.0.1"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-NVG9Zpt/CRumlJYsILzjJLo5nY6IZxVdjf6asrglIW0="; + hash = "sha256-6TUi9YY/CtxaFpW8itAiXDFYRet56y6h+okc3cNKzdk="; }; - cargoHash = "sha256-fMlk48H9qz8r3gwDD5tXHc+CEgOnQo0pWzhsD9dvl0I="; + cargoHash = "sha256-QNGdJg+6mUhWTvLSuLRnPFe2F42UDGnYPEqlVr7jF3s="; # The tests relies on the presence of network connection doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix index 45e747ad97..e8bcb7729d 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/miru/package.nix @@ -5,12 +5,12 @@ appimageTools.wrapType2 rec { pname = "miru"; - version = "5.0.3"; + version = "5.1.0"; src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-vKV1Scd+YiJMIV8EWx4udoOxTXW9NA7k/CxRVNRqrjk="; + sha256 = "sha256-N9I5YNFIfBmANCnJA3gUmgq04cc5LLfOsYiEdwJupf8="; }; extraInstallCommands = @@ -23,7 +23,6 @@ appimageTools.wrapType2 rec { cp -r ${contents}/{locales,resources} "$out/share/lib/miru" cp -r ${contents}/usr/* "$out" cp "${contents}/${pname}.desktop" "$out/share/applications/" - mv "$out/bin/${pname}-${version}" "$out/bin/${pname}" substituteInPlace $out/share/applications/${pname}.desktop --replace 'Exec=AppRun' 'Exec=${pname}' ''; diff --git a/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix new file mode 100644 index 0000000000..971fd8a641 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "misconfig-mapper"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "intigriti"; + repo = "misconfig-mapper"; + rev = "refs/tags/v${version}"; + hash = "sha256-D9VQthfkWC+qmqIZKIVuFuf9ZDNtyRmjh7tT/QGhQig="; + }; + + vendorHash = "sha256-lkVTgnWdk9eW6QtKScK8NckcXGzsHeIwjSoUx85AGU8="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Tool to uncover security misconfigurations on popular third-party services"; + homepage = "https://github.com/intigriti/misconfig-mapper"; + changelog = "https://github.com/intigriti/misconfig-mapper/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "misconfig-mapper"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mi/missidentify/fix-darwin-build.patch b/third_party/nixpkgs/pkgs/by-name/mi/missidentify/fix-darwin-build.patch new file mode 100644 index 0000000000..cc54480567 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mi/missidentify/fix-darwin-build.patch @@ -0,0 +1,11 @@ +--- a/main.h ++++ b/main.h +@@ -68,7 +68,7 @@ memset(VAR,0,SIZE * sizeof(TYPE)); + + + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) || defined (__APPLE__) + extern char *__progname; + #else + char *__progname; \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/by-name/mi/missidentify/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/missidentify/package.nix new file mode 100644 index 0000000000..2fbce5bf96 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mi/missidentify/package.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchurl +, autoreconfHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "missidentify"; + version = "1.0"; + + src = fetchurl { + url = "mirror://sourceforge/project/missidentify/missidentify/missidentify-${finalAttrs.version}/missidentify-${finalAttrs.version}.tar.gz"; + hash = "sha256-nnIRN8hpKM0IZCe0HUrrJGrxvBYKeBmdU168rlo8op0="; + }; + + patches = [ + # define PATH_MAX variable to fix a FTBFS in Hurd. + (fetchurl { + name = "fix-FTBFS-Hurd.patch"; + url = "https://salsa.debian.org/pkg-security-team/missidentify/-/raw/14b7169c3157dbad65fc80fdd82ec6634df20ffd/debian/patches/fix-FTBFS-Hurd.patch"; + hash = "sha256-wGEzTfT76s5Q7s/5s913c4x9MMn9c0v/4Lhr+QakPQY="; + }) + # fix a hyphen used as minus sign and a typo in manpage. + (fetchurl { + name = "fix-manpage.patch"; + url = "https://salsa.debian.org/pkg-security-team/missidentify/-/raw/14b7169c3157dbad65fc80fdd82ec6634df20ffd/debian/patches/fix-manpage.patch"; + hash = "sha256-7LzQs6ETRSjdnEhlKOVWC3grevwOmGs0h4Z6AYGysD8="; + }) + # fix darwin build + ./fix-darwin-build.patch + ]; + + nativeBuildInputs = [ autoreconfHook ]; + + configureFlags = lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "--build=arm" ]; + + meta = with lib; { + description = "Find Win32 applications"; + longDescription = '' + Miss Identify is a program to find Win32 applications. In + its default mode it displays the filename of any executable + that does not have an executable extension (i.e. exe, dll, + com, sys, cpl, hxs, hxi, olb, rll, or tlb). The program can + also be run to display all executables encountered, + regardless of the extension. This is handy when looking + for all of the executables on a drive. Other options allow + the user to record the strings found in an executable and + to work recursively. + ''; + mainProgram = "missidentify"; + homepage = "https://missidentify.sourceforge.net"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl2Only; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/mi/mixxc/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/mixxc/package.nix new file mode 100644 index 0000000000..44287a81ae --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mi/mixxc/package.nix @@ -0,0 +1,67 @@ +{ + lib, + rustPlatform, + fetchCrate, + pkg-config, + libpulseaudio, + gtk4-layer-shell, + gtk4, + wrapGAppsHook4, + libxcb, + installShellFiles, + enableWayland ? true, + enableSass ? true, + enableX11 ? true, +}: + +rustPlatform.buildRustPackage rec { + pname = "mixxc"; + version = "0.2.2"; + + src = fetchCrate { + pname = "mixxc"; + inherit version; + hash = "sha256-Y/9l8t6Vz7yq9T1AyoHnWmIcju1rfcV0S74hiK1fEjo="; + }; + + cargoHash = "sha256-l9inqqUiLObrqd/8pNobwBbLaiPJD39YK/38CWfDh+Q="; + + cargoBuildFlags = [ "--locked" ]; + + buildFeatures = [ + (lib.optionals enableWayland "Wayland") + (lib.optionals enableX11 "X11") + (lib.optionals enableSass "Sass") + ]; + + nativeBuildInputs = [ + pkg-config + installShellFiles + wrapGAppsHook4 + ]; + + buildInputs = [ + libpulseaudio + gtk4 + (lib.optionals enableWayland gtk4-layer-shell) + (lib.optionals enableX11 libxcb) + ]; + + outputs = [ + "out" + "man" + ]; + + postInstall = '' + installManPage $src/doc/mixxc.1 + ''; + + meta = { + description = "A minimalistic and customizable volume mixer"; + homepage = "https://github.com/Elvyria/mixxc"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ daru-san ]; + mainProgram = "mixxc"; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mk/mkjson/generated.nix b/third_party/nixpkgs/pkgs/by-name/mk/mkjson/generated.nix new file mode 100644 index 0000000000..a89306f5b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mk/mkjson/generated.nix @@ -0,0 +1,46 @@ +{ mkDerivation, lib, fetchFromGitHub +, aeson, base, bytestring, containers, criterion +, doctest, Glob, mersenne-random-pure64, mtl +, optparse-applicative, parsec, random, regex-tdfa, scientific +, text, time, unordered-containers, uuid, vector +}: + +mkDerivation rec { + pname = "mkjson"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "mfussenegger"; + repo = "mkjson"; + rev = "${version}"; + hash = "sha256-+NDLFtsWWxHv/6XC9hJOAHPU6YED5oHqS/j5BPwNsqA="; + }; + + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers mersenne-random-pure64 mtl + optparse-applicative parsec random regex-tdfa scientific text time + unordered-containers uuid vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers mersenne-random-pure64 mtl + optparse-applicative parsec random regex-tdfa scientific text time + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring containers doctest Glob + mersenne-random-pure64 mtl optparse-applicative parsec random + regex-tdfa scientific text time unordered-containers uuid vector + ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers criterion mersenne-random-pure64 + mtl optparse-applicative parsec random regex-tdfa scientific text + time unordered-containers uuid vector + ]; + + description = "A commandline tool to generate static or random JSON records"; + homepage = "https://github.com/mfussenegger/mkjson"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ athas ]; + mainProgram = "mkjson"; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mk/mkjson/package.nix b/third_party/nixpkgs/pkgs/by-name/mk/mkjson/package.nix new file mode 100644 index 0000000000..dfa170a530 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mk/mkjson/package.nix @@ -0,0 +1 @@ +{ haskell, haskellPackages }: haskell.lib.justStaticExecutables (haskellPackages.callPackage ./generated.nix { }) diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mo/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mo/package.nix new file mode 100644 index 0000000000..5de0716fde --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mo/mo/package.nix @@ -0,0 +1,36 @@ +{ stdenv +, lib +, fetchFromGitHub +, runtimeShell +}: + +stdenv.mkDerivation rec { + pname = "mo"; + version = "3.0.5"; + + src = fetchFromGitHub { + owner = "tests-always-included"; + repo = pname; + rev = version; + hash = "sha256-CFAvTpziKzSkdomvCf8PPXYbYcJxjB4EValz2RdD2b0="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp mo $out/bin/. + + runHook postInstall + ''; + + meta = with lib; { + description = "Moustache templates for Bash"; + homepage = "https://github.com/tests-always-included/mo"; + license = licenses.mit; + maintainers = with maintainers; [ sheepforce ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mo/modprobed-db/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/modprobed-db/package.nix index 2a307aeb83..84edaa3f63 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/modprobed-db/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/modprobed-db/package.nix @@ -9,7 +9,7 @@ }: let pname = "modprobed-db"; - version = "2.46"; + version = "2.47"; in stdenv.mkDerivation { inherit pname version; @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "graysky2"; repo = "modprobed-db"; rev = "v${version}"; - hash = "sha256-GQME5CAZsGVHSPowKQMyUR7OjHeFZi/5YcWFUT9L/AQ="; + hash = "sha256-r/2ZENricRE03eyFnWDnfPNAz2863/9HKlF6a2xOkc0="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mold/package.nix similarity index 97% rename from third_party/nixpkgs/pkgs/development/tools/mold/default.nix rename to third_party/nixpkgs/pkgs/by-name/mo/mold/package.nix index 0caa0513d8..32992d6a04 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mold/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "2.30.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; rev = "v${version}"; - hash = "sha256-VVgJDKf21V7Mkfalh8tJ0Tx73VG1ong+8C6uPC23154="; + hash = "sha256-CUIk1YACM+eCuxyUqyKaVBF00Ybxr23D+FQuXv45Qrs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/mo/monaspace/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/monaspace/package.nix index a27be47afa..b19532c8fb 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/monaspace/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/monaspace/package.nix @@ -5,12 +5,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "monaspace"; - version = "1.000"; + version = "1.100"; src = fetchzip { url = "https://github.com/githubnext/monaspace/releases/download/v${finalAttrs.version}/monaspace-v${finalAttrs.version}.zip"; stripRoot = false; - hash = "sha256-H8NOS+pVkrY9DofuJhPR2OlzkF4fMdmP2zfDBfrk83A="; + hash = "sha256-PNeWDWYSd/oAviwyvwiQSLeATGqGIFYZWjKp+trT5x4="; }; outputs = [ "out" "woff" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/mo/moneydance/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/moneydance/package.nix index 5222684f70..0c86365380 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/moneydance/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/moneydance/package.nix @@ -1,16 +1,22 @@ -{ lib, stdenv, fetchzip, makeWrapper, openjdk21, openjfx21, jvmFlags ? [ ] }: -let jdk = openjdk21.override { enableJavaFX = true; }; -in stdenv.mkDerivation (finalAttrs: { +{ lib, stdenv, fetchzip, makeWrapper, openjdk22, openjfx22, jvmFlags ? [ ] }: +let + openjfx = openjfx22; + jdk = openjdk22.override { + enableJavaFX = true; + inherit openjfx; + }; +in +stdenv.mkDerivation (finalAttrs: { pname = "moneydance"; - version = "2023.3_5064"; + version = "2024.1_5118"; src = fetchzip { - url = "https://infinitekind.com/stabledl/${finalAttrs.version}/moneydance-linux.tar.gz"; - hash = "sha256-jHr1V/gV1seenw2Q0/G405lTiabEYEsOS8p/XyByrtM="; + url = "https://infinitekind.com/stabledl/2024_5118/moneydance-linux.tar.gz"; + hash = "sha256-wwSb3CuhuXB4I9jq+TpLPbd1k9UzqQbAaZkGKgi+nns="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk openjfx21 ]; + buildInputs = [ jdk openjfx ]; # Note the double escaping in the call to makeWrapper. The escapeShellArgs # call quotes each element of the flags list as a word[1] and returns a @@ -43,6 +49,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://infinitekind.com/moneydance"; + changelog = "https://infinitekind.com/stabledl/2024_5118/changelog.txt"; description = "An easy to use and full-featured personal finance app that doesn't compromise your privacy"; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; license = lib.licenses.unfree; diff --git a/third_party/nixpkgs/pkgs/by-name/mo/monophony/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/monophony/package.nix index f0f268ca14..bf048768b5 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/monophony/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/monophony/package.nix @@ -11,7 +11,7 @@ }: python3Packages.buildPythonApplication rec { pname = "monophony"; - version = "2.8.2"; + version = "2.9.0"; format = "other"; sourceRoot = "${src.name}/source"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "zehkira"; repo = "monophony"; rev = "v${version}"; - hash = "sha256-sCJVcf/VAW5UVMwrpri+PPJjQF0s7f2KpmaytuH0jN4="; + hash = "sha256-fZ+EQqcHJGOLBwyHZJvML6+SkfFpnt6hb8xHedJ7VSU="; }; pythonPath = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mosdepth/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mosdepth/package.nix index dbe5bc8772..da7f210ecf 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mosdepth/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mosdepth/package.nix @@ -2,7 +2,7 @@ buildNimPackage (finalAttrs: { pname = "mosdepth"; - version = "0.3.7"; + version = "0.3.8"; requiredNimVersion = 1; @@ -10,7 +10,7 @@ buildNimPackage (finalAttrs: { owner = "brentp"; repo = "mosdepth"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-VyEZNY/P3BfJ3PCRn7R+37XH4gfc9JEOFB0WmrSxpIc="; + sha256 = "sha256-IkCLlIugnOO2LpS79gakURvPR1ZuayFtrOOoPyNKLMQ="; }; lockFile = ./lock.json; diff --git a/third_party/nixpkgs/pkgs/by-name/mo/movim/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/movim/package.nix index 6380baf3d4..ed00000634 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/movim/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/movim/package.nix @@ -1,13 +1,12 @@ { lib -, fetchpatch , fetchFromGitHub +, writeShellScript , dash , php , phpCfg ? null , withPgsql ? true # “strongly recommended” according to docs , withMysql ? false , minifyStaticFiles ? false # default files are often not minified -, parallel , esbuild , lightningcss , scour @@ -39,13 +38,13 @@ let in php.buildComposerProject (finalAttrs: { pname = "movim"; - version = "0.23.0.20240328"; + version = "0.24.1"; src = fetchFromGitHub { owner = "movim"; repo = "movim"; - rev = "c3a43cd7e3a1a3a6efd595470e6a85b2ec578cba"; - hash = "sha256-x0C4w3SRP3NMOhGSZOQALk6PNWUre4MvFW5cESr8Wvk="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-Ai82d1VwtAlKmM8N/hazMWsn5F6HS4I1do3VkpLPlBo="; }; php = php.buildEnv ({ @@ -60,8 +59,7 @@ php.buildComposerProject (finalAttrs: { }); nativeBuildInputs = - lib.optional (lib.any (x: x.enable) (lib.attrValues minify)) parallel - ++ lib.optional minify.script.enable esbuild + lib.optional minify.script.enable esbuild ++ lib.optional minify.style.enable lightningcss ++ lib.optional minify.svg.enable scour; @@ -69,7 +67,7 @@ php.buildComposerProject (finalAttrs: { # pinned commonmark composerStrictValidation = false; - vendorHash = "sha256-RFIi1I+gcagRgkDpgQeR1oGJeBGA7z9q3DCfW+ZDr2Y="; + vendorHash = "sha256-1sQm+eRrs9m52CepPXahsOJhyLZ68+FIDNHyY33IoD4="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; @@ -94,39 +92,30 @@ php.buildComposerProject (finalAttrs: { ''; preBuild = lib.optionalString minify.script.enable '' - find ./public -type f -iname "*.js" \ - | parallel ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - '' - tmp="$(mktemp)" - esbuild {} --minify --target=${lib.escapeShellArg minify.script.target} --outfile=$tmp - [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s {})" ]] && mv $tmp {} - '' - ]} + find ./public -type f -iname "*.js" -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${writeShellScript "movim_script_minify" '' + file="$1" + tmp="$(mktemp)" + esbuild $file --minify --target=${lib.escapeShellArg minify.script.target} --outfile=$tmp + [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s $file)" ]] && mv $tmp $file + ''} '' + lib.optionalString minify.style.enable '' - export BROWSERLIST=${lib.escapeShellArg minify.style.browserslist} - find ./public -type f -iname "*.css" \ - | parallel ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - '' - tmp="$(mktemp)" - lightningcss {} --minify --browserslist --output-file=$tmp - [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s {})" ]] && mv $tmp {} - '' - ]} + find ./public -type f -iname "*.css" -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${writeShellScript "movim_style_minify" '' + export BROWSERLIST="${lib.escapeShellArg minify.style.browserslist}" + file="$1" + tmp="$(mktemp)" + lightningcss $file --minify --browserslist --output-file=$tmp + [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s $file)" ]] && mv $tmp $file + ''} '' + lib.optionalString minify.svg.enable '' - find ./public -type f -iname "*.svg" -a -not -path "*/emojis/*" \ - | parallel ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - '' - tmp="$(mktemp)" - scour -i {} -o $tmp --disable-style-to-xml --enable-comment-stripping --enable-viewboxing --indent=tab - [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s {})" ]] && mv $tmp {} - '' - ]} + find ./public -type f -iname "*.svg" -a -not -path "*/emojis/*" -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${writeShellScript "movim_svg_minify" '' + file="$1" + tmp="$(mktemp)" + scour -i $file -o $tmp --disable-style-to-xml --enable-comment-stripping --enable-viewboxing --indent=tab + [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s $file)" ]] && mv $tmp $file + ''} ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/by-name/mq/mqttx/package.nix b/third_party/nixpkgs/pkgs/by-name/mq/mqttx/package.nix index f2c22d54ad..975db394ab 100644 --- a/third_party/nixpkgs/pkgs/by-name/mq/mqttx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mq/mqttx/package.nix @@ -31,10 +31,7 @@ in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: [ ]; - extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/1024x1024/apps/${pname}.png diff --git a/third_party/nixpkgs/pkgs/by-name/my/mycelium/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/my/mycelium/Cargo.lock index 9151a00466..bf8ad6ce4d 100644 --- a/third_party/nixpkgs/pkgs/by-name/my/mycelium/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/my/mycelium/Cargo.lock @@ -922,9 +922,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" @@ -1041,7 +1041,7 @@ dependencies = [ [[package]] name = "mycelium" -version = "0.5.1" +version = "0.5.2" dependencies = [ "aes-gcm", "blake3", @@ -1075,7 +1075,7 @@ dependencies = [ [[package]] name = "myceliumd" -version = "0.5.1" +version = "0.5.2" dependencies = [ "axum", "base64 0.22.0", @@ -1463,16 +1463,9 @@ dependencies = [ "memchr", "parking_lot", "procfs", - "protobuf", "thiserror", ] -[[package]] -name = "protobuf" -version = "2.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" - [[package]] name = "quinn" version = "0.10.2" @@ -1626,9 +1619,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "base64 0.22.0", "bytes", @@ -1756,9 +1749,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "ring 0.17.7", "rustls-webpki", @@ -1817,18 +1810,18 @@ checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", @@ -1837,9 +1830,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", diff --git a/third_party/nixpkgs/pkgs/by-name/my/mycelium/package.nix b/third_party/nixpkgs/pkgs/by-name/my/mycelium/package.nix index a180a77278..eea61e0c32 100644 --- a/third_party/nixpkgs/pkgs/by-name/my/mycelium/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/my/mycelium/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "mycelium"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "threefoldtech"; repo = "mycelium"; rev = "v${version}"; - hash = "sha256-x3XqFKcOLwKhgF/DKo8Qp3QLyaE2hdCTjfLSE8K3ifQ="; + hash = "sha256-Mz4YYpnuSGUwQANiXzsJNAYMugXL229E30wnZCu2lSM="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/by-name/my/mysql84/no-force-outline-atomics.patch b/third_party/nixpkgs/pkgs/by-name/my/mysql84/no-force-outline-atomics.patch new file mode 100644 index 0000000000..a716a4f7f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/my/mysql84/no-force-outline-atomics.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 727d66011f9..acae1aada57 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1338,19 +1338,6 @@ IF(UNIX AND MY_COMPILER_IS_GNU_OR_CLANG + ENDIF() + ENDIF() + +-# For aarch64 some sub-architectures support LSE atomics and some don't. Thus, +-# compiling for the common denominator (-march=armv8-a) means LSE is not used. +-# The -moutline-atomics switch enables run-time detection of LSE support. +-# There are compilers (gcc 9.3.1 for example) which support this switch, but +-# do not enable it by default, even though it seems to help. So, we force it. +-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") +- MY_CHECK_CXX_COMPILER_FLAG( "-moutline-atomics" HAVE_OUTLINE_ATOMICS) +- IF(HAVE_OUTLINE_ATOMICS) +- STRING_APPEND(CMAKE_C_FLAGS " -moutline-atomics") +- STRING_APPEND(CMAKE_CXX_FLAGS " -moutline-atomics") +- ENDIF() +-ENDIF() +- + IF(LINUX) + OPTION(LINK_RANDOMIZE "Randomize the order of all symbols in the binary" OFF) + SET(LINK_RANDOMIZE_SEED "mysql" diff --git a/third_party/nixpkgs/pkgs/by-name/my/mysql84/package.nix b/third_party/nixpkgs/pkgs/by-name/my/mysql84/package.nix new file mode 100644 index 0000000000..d7081f6141 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/my/mysql84/package.nix @@ -0,0 +1,78 @@ +{ lib, stdenv, fetchurl, bison, cmake, pkg-config +, icu, libedit, libevent, lz4, ncurses, openssl, protobuf_21, re2, readline, zlib, zstd, libfido2 +, darwin, numactl, libtirpc, rpcsvc-proto, curl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mysql"; + version = "8.4.0"; + + src = fetchurl { + url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; + hash = "sha256-R6VDP83WOduDa5nhtUWcK4E8va0j/ytd1K0n95K6kY4="; + }; + + nativeBuildInputs = [ bison cmake pkg-config ] + ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + + patches = [ + ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch + ]; + + ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. + postPatch = '' + substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool + substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + ''; + + buildInputs = [ + (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf_21 re2 readline zlib + zstd libfido2 + ] ++ lib.optionals stdenv.isLinux [ + numactl libtirpc + ] ++ lib.optionals stdenv.isDarwin [ + darwin.cctools darwin.apple_sdk.frameworks.CoreServices darwin.developer_cmds darwin.DarwinTools + ]; + + outputs = [ "out" "static" ]; + + cmakeFlags = [ + "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. + "-DWITH_ROUTER=OFF" # It may be packaged separately. + "-DWITH_SYSTEM_LIBS=ON" + "-DWITH_UNIT_TESTS=OFF" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + ]; + + postInstall = '' + moveToOutput "lib/*.a" $static + so=${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + ''; + + passthru = { + client = finalAttrs.finalPackage; + connector-c = finalAttrs.finalPackage; + server = finalAttrs.finalPackage; + mysqlVersion = lib.versions.majorMinor finalAttrs.version; + }; + + meta = with lib; { + homepage = "https://www.mysql.com/"; + description = "The world's most popular open source database"; + license = licenses.gpl2; + maintainers = with maintainers; [ orivej shyim ]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/my/mystmd/package.nix b/third_party/nixpkgs/pkgs/by-name/my/mystmd/package.nix index 2be16bb1c8..ee07a8fef3 100644 --- a/third_party/nixpkgs/pkgs/by-name/my/mystmd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/my/mystmd/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "mystmd"; - version = "1.1.55"; + version = "1.2.0"; src = fetchFromGitHub { owner = "executablebooks"; repo = "mystmd"; rev = "mystmd@${version}"; - hash = "sha256-aIqIcNXlzpvW90WJs9tJajXvnEQB0IiNCu8B62cwElo="; + hash = "sha256-SxUZvPSitzWZzTa490dkJWw6fZ5PtN8hy7fglifPn6o="; }; - npmDepsHash = "sha256-QIGqx1Peogmdo1KLHkzUKqvAuA6jCJRfxeQ1X7p6vTM="; + npmDepsHash = "sha256-fwjtEw2mAnNX7lo9ovCC58qqtJPDLc2Ho9I1Ui0k/iI="; dontNpmInstall = true; @@ -36,7 +36,7 @@ buildNpmPackage rec { homepage = "https://github.com/executablebooks/mystmd"; changelog = "https://github.com/executablebooks/mystmd/blob/${src.rev}/packages/myst-cli/CHANGELOG.md"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "myst"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/my/myxer/package.nix b/third_party/nixpkgs/pkgs/by-name/my/myxer/package.nix index 200ca4bce1..61dd704db6 100644 --- a/third_party/nixpkgs/pkgs/by-name/my/myxer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/my/myxer/package.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , libpulseaudio , glib , pango @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-IH+SLIHO/wu+przH+mgOEnH9m+iAE5s/BJhh0UUHR/0="; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ libpulseaudio glib pango gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix index 01301c6375..463fad2268 100644 --- a/third_party/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.356"; + version = "0.0.369"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-sQZ0kwZXaYoiXCaSvCcnMqYNeLHvtZzHih52+2AYdeY="; + hash = "sha256-OmU6C0hapdpM/41kEeNwpcMRooCWMLzI5FgQbIvjsb8="; }; - vendorHash = "sha256-a/e+xPOD9BDSlKknmfcX2tTMyIUrzKxqtUpFXcFIDSE="; + vendorHash = "sha256-72cHswoTZszo42NOrPNuokDlqoJ3/YEhGe+rQSKvgAw="; subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; diff --git a/third_party/nixpkgs/pkgs/by-name/na/nanoboyadvance/dont-fetch-glad.patch b/third_party/nixpkgs/pkgs/by-name/na/nanoboyadvance/dont-fetch-glad.patch new file mode 100644 index 0000000000..efe9b59726 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/na/nanoboyadvance/dont-fetch-glad.patch @@ -0,0 +1,14 @@ +diff --git a/src/platform/core/CMakeLists.txt b/src/platform/core/CMakeLists.txt +index 2bc6d8c..3175c14 100644 +--- a/src/platform/core/CMakeLists.txt ++++ b/src/platform/core/CMakeLists.txt +@@ -18,8 +18,7 @@ find_package(OpenGL REQUIRED) + + include(FetchContent) + FetchContent_Declare(glad +- GIT_REPOSITORY https://github.com/Dav1dde/glad.git +- GIT_TAG adc3d7a1d704e099581ca25bc5bbdf728c2db67b # v2.0.5-2-gadc3d7a ++ SOURCE_DIR @gladSrc@ + SOURCE_SUBDIR cmake + ) + FetchContent_MakeAvailable(glad) diff --git a/third_party/nixpkgs/pkgs/by-name/na/nanoboyadvance/package.nix b/third_party/nixpkgs/pkgs/by-name/na/nanoboyadvance/package.nix new file mode 100644 index 0000000000..64e670614c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/na/nanoboyadvance/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + substituteAll, + cmake, + python3Packages, + libsForQt5, + SDL2, + fmt, + toml11, + libunarr, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nanoboyadvance"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "nba-emu"; + repo = "NanoBoyAdvance"; + rev = "v${finalAttrs.version}"; + hash = "sha256-du3dPTg3OxNTWXDQo2m9W0rJxtrkn+lQSh/XGiu/eGg="; + }; + + patches = [ + (substituteAll { + src = ./dont-fetch-glad.patch; + gladSrc = fetchFromGitHub { + owner = "Dav1dde"; + repo = "glad"; + rev = "v2.0.5"; + hash = "sha256-Ba7nbd0DxDHfNXXu9DLfnxTQTiJIQYSES9CP5Bfq4K0="; + }; + }) + ]; + + nativeBuildInputs = [ + cmake + python3Packages.jinja2 + libsForQt5.wrapQtAppsHook + ]; + + buildInputs = [ + libsForQt5.qtbase + SDL2 + fmt + toml11 + libunarr + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_FMT" true) + (lib.cmakeBool "USE_SYSTEM_TOML11" true) + (lib.cmakeBool "USE_SYSTEM_UNARR" true) + ]; + + meta = { + description = "A cycle-accurate Nintendo Game Boy Advance emulator"; + homepage = "https://github.com/nba-emu/NanoBoyAdvance"; + license = lib.licenses.gpl3Plus; + mainProgram = "NanoBoyAdvance"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix b/third_party/nixpkgs/pkgs/by-name/na/navidrome/package.nix similarity index 88% rename from third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix rename to third_party/nixpkgs/pkgs/by-name/na/navidrome/package.nix index b663df8809..fda3170bd0 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/navidrome/package.nix @@ -10,7 +10,6 @@ , ffmpeg-headless , taglib , zlib -, makeWrapper , nixosTests , nix-update-script , ffmpegSupport ? true @@ -18,23 +17,23 @@ buildGoModule rec { pname = "navidrome"; - version = "0.51.1"; + version = "0.52.0"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${version}"; - hash = "sha256-6IYQrSWqrvYz2tDlk14UaX36bdXN0DbF7ynaa3Qboa4="; + hash = "sha256-AbavYvXMVJTopnfBFNx2TVqITPZCRtVeUFqROpNmtt8="; }; - vendorHash = "sha256-Q95OchWkxd/EmG7Vu0e/dge9nOIrGmcTgjGL5dBvEKA="; + vendorHash = "sha256-rwRWyegjlDFqbq1/cI2DhC1UJEySJaZkeoxgeH+u5Rc="; npmRoot = "ui"; npmDeps = fetchNpmDeps { inherit src; sourceRoot = "${src.name}/ui"; - hash = "sha256-LrLswdt6RA55FQE/YWHNwtjxljjlCNSTLWJNqy1ohKo="; + hash = "sha256-OZvEPC+MobCJn16d3MsMtrStbsmRD9Ef0/leVSXtVZ8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/na/nawk/package.nix b/third_party/nixpkgs/pkgs/by-name/na/nawk/package.nix index 2ad1e2c9c3..bb93e77892 100644 --- a/third_party/nixpkgs/pkgs/by-name/na/nawk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/nawk/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nawk"; - version = "20240311"; + version = "20240422"; src = fetchFromGitHub { owner = "onetrueawk"; repo = "awk"; rev = finalAttrs.version; - hash = "sha256-4iAQR8djhhp5Yn4H1IdzotQLY0d/Gz/vNQPfAUNQV0A="; + hash = "sha256-wsRkSXCLtK2jk4gW/Lpg/14NiOUANfmCrYqeKZW6CLY="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nekoray/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nekoray/package.nix index 4a1ce8f046..1fda18056a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/nekoray/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/nekoray/package.nix @@ -84,11 +84,12 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + strictDeps = true; + nativeBuildInputs = [ libsForQt5.wrapQtAppsHook cmake ninja - protobuf copyDesktopItems ]; @@ -96,8 +97,9 @@ stdenv.mkDerivation (finalAttrs: { libsForQt5.qtbase libsForQt5.qttools libsForQt5.qtx11extras - zxing-cpp + protobuf yaml-cpp + zxing-cpp ]; # NKR_PACKAGE makes sure the app uses the user's config directory to store it's non-static content diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nemu/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nemu/package.nix new file mode 100644 index 0000000000..c57b4dca6e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ne/nemu/package.nix @@ -0,0 +1,108 @@ +{ busybox +, cmake +, coreutils +, dbus +, fetchFromGitHub +, gettext +, graphviz +, json_c +, lib +, libarchive +, libusb1 +, libxml2 +, makeWrapper +, ncurses +, ninja +, openssl +, picocom +, pkg-config +, qemu +, socat +, sqlite +, stdenv +, systemd +, tigervnc +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nemu"; + version = "3.3.1"; + + src = fetchFromGitHub { + owner = "nemuTUI"; + repo = "nemu"; + rev = "v${finalAttrs.version}"; + hash = "sha256-6WzqBkspKKs1e8kg1i71ntZHa78s5pJ1u02mXvzpiEc="; + }; + + cmakeFlags = [ + "-DNM_WITH_DBUS=ON" + "-DNM_WITH_NETWORK_MAP=ON" + "-DNM_WITH_REMOTE=ON" + "-DNM_WITH_USB=ON" + ]; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + makeWrapper + ]; + + buildInputs = [ + busybox # for start-stop-daemon + coreutils + dbus + gettext + graphviz + json_c + libarchive + libusb1 + libxml2 + ncurses + openssl + picocom + qemu + socat + sqlite + systemd # for libudev + tigervnc + ]; + + runtimeDependencies = [ + busybox + picocom + qemu + socat + tigervnc + ]; + + postPatch = '' + substituteInPlace nemu.cfg.sample \ + --replace-fail /usr/bin/vncviewer ${tigervnc}/bin/vncviewer \ + --replace-fail "qemu_bin_path = /usr/bin" "qemu_bin_path = ${qemu}/bin" + + substituteInPlace sh/ntty \ + --replace-fail /usr/bin/socat ${socat}/bin/socat \ + --replace-fail /usr/bin/picocom ${picocom}/bin/picocom \ + --replace-fail start-stop-daemon ${busybox}/bin/start-stop-daemon + + substituteInPlace sh/setup_nemu_nonroot.sh \ + --replace-fail /usr/bin/nemu $out/bin/nemu + ''; + + postInstall = '' + wrapProgram $out/share/nemu/scripts/upgrade_db.sh \ + --prefix PATH : "${sqlite}/bin" + ''; + + meta = { + changelog = "https://github.com/nemuTUI/nemu/releases/tag/v${finalAttrs.version}"; + description = "Ncurses UI for QEMU"; + homepage = "https://github.com/nemuTUI/nemu"; + license = lib.licenses.bsd2; + mainProgram = "nemu"; + maintainers = with lib.maintainers; [ msanft ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ne/neothesia/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ne/neothesia/Cargo.lock new file mode 100644 index 0000000000..775eacbe57 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ne/neothesia/Cargo.lock @@ -0,0 +1,4672 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "alsa" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" +dependencies = [ + "alsa-sys", + "bitflags 1.3.2", + "libc", + "nix 0.24.3", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.4.2", + "cc", + "cesu8", + "jni 0.21.1", + "jni-sys", + "libc", + "log", + "ndk 0.8.0", + "ndk-context", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.2", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b22517ee647547c01a687cf9b76074e1c91334032a4324f7243c6ee0f949390" +dependencies = [ + "async-fs", + "async-net", + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "url", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +dependencies = [ + "event-listener 5.1.0", + "event-listener-strategy 0.5.0", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +dependencies = [ + "concurrent-queue", + "event-listener 5.1.0", + "event-listener-strategy 0.5.0", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +dependencies = [ + "async-lock 3.3.0", + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" +dependencies = [ + "async-lock 3.3.0", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-process" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" +dependencies = [ + "async-channel", + "async-io", + "async-lock 3.3.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 5.1.0", + "futures-lite", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + +[[package]] +name = "async-thread" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f8127d0634ad2b788f12e8c8623f91c584c2eb7496157b2e0cada5b01e0fbfd" +dependencies = [ + "futures-channel", +] + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bindgen" +version = "0.64.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 1.0.109", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.4.2", + "cexpr", + "clang-sys", + "itertools", + "lazy_static", + "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.48", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +dependencies = [ + "serde", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2", +] + +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel", + "async-lock 3.3.0", + "async-task", + "fastrand", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "byte-slice-cast" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" + +[[package]] +name = "bytemuck" +version = "1.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea31d69bda4949c1c1562c1e6f042a1caefac98cdc8a298260a2ff41c1e2d42b" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.4.2", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" + +[[package]] +name = "clang-sys" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +dependencies = [ + "glob", + "libc", + "libloading 0.8.1", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "com" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "coreaudio-rs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" +dependencies = [ + "bitflags 1.3.2", + "core-foundation-sys", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" +dependencies = [ + "bindgen 0.69.4", +] + +[[package]] +name = "coremidi" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a7847ca018a67204508b77cb9e6de670125075f7464fff5f673023378fa34f5" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "coremidi-sys", +] + +[[package]] +name = "coremidi-sys" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79a6deed0c97b2d40abbab77e4c97f81d71e162600423382c277dd640019116c" +dependencies = [ + "core-foundation-sys", +] + +[[package]] +name = "cosmic-text" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75acbfb314aeb4f5210d379af45ed1ec2c98c7f1790bf57b8a4c562ac0c51b71" +dependencies = [ + "fontdb", + "libm", + "log", + "rangemap", + "rustc-hash", + "rustybuzz", + "self_cell", + "swash", + "sys-locale", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cpal" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "dasp_sample", + "jni 0.19.0", + "js-sys", + "libc", + "mach2", + "ndk 0.7.0", + "ndk-context", + "oboe", + "once_cell", + "parking_lot 0.12.1", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.46.0", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ctor" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "d3d12" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" +dependencies = [ + "bitflags 2.4.2", + "libloading 0.8.1", + "winapi", +] + +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "drm" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" +dependencies = [ + "bitflags 2.4.2", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "rustix", +] + +[[package]] +name = "drm-ffi" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" +dependencies = [ + "drm-sys", + "rustix", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" +dependencies = [ + "libc", + "linux-raw-sys 0.6.4", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "embed-resource" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bde55e389bea6a966bd467ad1ad7da0ae14546a5bc794d16d1e55e7fca44881" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml", + "vswhom", + "winreg", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "etagere" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.1.0", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "ffmpeg-sys-next" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2529ad916d08c3562c754c21bc9b17a26c7882c0f5706cc2cd69472175f1620" +dependencies = [ + "bindgen 0.64.0", + "cc", + "libc", + "num_cpus", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fluidlite" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c0265cc6e1b01b9418d29acc5b48c57b21775b5de59264f1afe13d9b529a401" +dependencies = [ + "bitflags 1.3.2", + "doc-comment", + "fluidlite-sys", +] + +[[package]] +name = "fluidlite-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8574ea7d1f3d03d9713f9983c5c2f128abda23a99603f6af86bbecb2a03809" +dependencies = [ + "cc", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] + +[[package]] +name = "font-types" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd7f3ea17572640b606b35df42cfb6ecdf003704b062580e59918692190b73d" + +[[package]] +name = "fontconfig-parser" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.8.0", + "slotmap", + "tinyvec", + "ttf-parser 0.19.2", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fps_ticker" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe164905ff69757d4bdc4c61d7df2930e47e2f5b4a132895a8f995990b2b9219" + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generational-arena" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glam" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "glyphon" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a62d0338e4056db6a73221c2fb2e30619452f6ea9651bac4110f51b0f7a7581" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.4.2", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.4.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +dependencies = [ + "log", + "presser", + "thiserror", + "winapi", + "windows 0.52.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.2", + "gpu-descriptor-types", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.2", +] + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" +dependencies = [ + "bitflags 2.4.2", + "com", + "libc", + "libloading 0.8.1", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "hermit-abi" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "iced_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55f9226618af7e8155fc8a233e4d84dc1ec44438705f972e35d5d50e62f937df" +dependencies = [ + "bitflags 2.4.2", + "glam", + "log", + "num-traits", + "palette", + "raw-window-handle 0.6.0", + "smol_str", + "thiserror", + "web-time", + "xxhash-rust", +] + +[[package]] +name = "iced_futures" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "370bad88fb3832cbeeb3fa6c486b4701fb7e8da32a753b3101d4ce81fc1d9497" +dependencies = [ + "futures", + "iced_core", + "log", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0660df444c64a13f72999c55a324f6d3ea020167bb1af8ef43fe2bff168d8c27" +dependencies = [ + "bitflags 2.4.2", + "bytemuck", + "cosmic-text", + "half", + "iced_core", + "iced_futures", + "image", + "kamadak-exif", + "log", + "once_cell", + "raw-window-handle 0.6.0", + "rustc-hash", + "thiserror", + "unicode-segmentation", + "xxhash-rust", +] + +[[package]] +name = "iced_renderer" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59d931249515deb5fe116c7d199792cd9fd32d31bf18ffc08c6c2ad2dee5fd3e" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "618a845cd752ca195f0805b7a4f0be42c071a4fdef0b88df047006572d219a5a" +dependencies = [ + "iced_core", + "iced_futures", + "raw-window-handle 0.6.0", + "thiserror", +] + +[[package]] +name = "iced_style" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb6b3992bceeac1393ce0e83d06ab786be4c17c6a0004eefbdd4f6d89d5e8058" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e079a4ae34df06894500e486b20bae8d8f2806fd64efe4fa9abe329e7f585f21" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "rustc-hash", + "softbuffer", + "tiny-skia", + "xxhash-rust", +] + +[[package]] +name = "iced_wgpu" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa5d3ce370c7044ddc9535c8f87057f1008434a495be6b9f46b2666c3e9638f7" +dependencies = [ + "bitflags 2.4.2", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "once_cell", + "wgpu", +] + +[[package]] +name = "iced_widget" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99f30ebbcc0706c19a92f01669193271d82bb209fda83576392d04cef3214ca2" +dependencies = [ + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "thiserror", + "unicode-segmentation", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2", + "dispatch", + "objc2", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "indexmap" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "is-terminal" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.1", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "kurbo" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" +dependencies = [ + "arrayvec", + "smallvec", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "linux-raw-sys" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lru" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.4.2", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", +] + +[[package]] +name = "midi-file" +version = "0.1.0" +dependencies = [ + "midi-io", + "midly", +] + +[[package]] +name = "midi-io" +version = "0.1.0" +dependencies = [ + "midir", +] + +[[package]] +name = "midir" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a456444d83e7ead06ae6a5c0a215ed70282947ff3897fb45fcb052b757284731" +dependencies = [ + "alsa", + "bitflags 1.3.2", + "coremidi", + "js-sys", + "libc", + "wasm-bindgen", + "web-sys", + "windows 0.43.0", +] + +[[package]] +name = "midly" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "207d755f4cb882d20c4da58d707ca9130a0c9bc5061f657a4f299b8e36362b7a" +dependencies = [ + "rayon", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mpeg_encoder" +version = "0.2.1" +source = "git+https://github.com/PolyMeilex/mpeg_encoder_next.git#577efd933e4b556526df773f267dd0fb066f724c" +dependencies = [ + "ffmpeg-sys-next", +] + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899" +dependencies = [ + "bit-set", + "bitflags 2.4.2", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "ndk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys 0.4.1+23.1.7779620", + "num_enum 0.5.11", + "raw-window-handle 0.5.2", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.4.2", + "jni-sys", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.2", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.4.1+23.1.7779620" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "neothesia" +version = "0.1.0" +dependencies = [ + "async-thread", + "cpal", + "embed-resource", + "env_logger", + "fluidlite", + "fps_ticker", + "futures", + "iced_core", + "iced_graphics", + "iced_runtime", + "iced_style", + "iced_wgpu", + "iced_widget", + "image", + "log", + "midi-file", + "midi-io", + "neothesia-core", + "neothesia-iced-widgets", + "oxisynth", + "piano-math", + "rfd", + "wgpu", + "wgpu-jumpstart", + "winit", +] + +[[package]] +name = "neothesia-cli" +version = "0.1.0" +dependencies = [ + "env_logger", + "futures", + "midi-file", + "mpeg_encoder", + "neothesia-core", + "piano-math", + "wgpu-jumpstart", +] + +[[package]] +name = "neothesia-core" +version = "0.1.0" +dependencies = [ + "bytemuck", + "glyphon", + "log", + "midi-file", + "objc", + "piano-math", + "ron", + "serde", + "wgpu", + "wgpu-jumpstart", +] + +[[package]] +name = "neothesia-iced-widgets" +version = "0.1.0" +dependencies = [ + "iced_core", + "iced_graphics", + "iced_style", + "iced_wgpu", + "iced_widget", + "piano-math", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "libc", + "memoffset", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive 0.7.2", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "oboe" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +dependencies = [ + "jni 0.20.0", + "ndk 0.7.0", + "ndk-context", + "num-derive 0.3.3", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" +dependencies = [ + "cc", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "owned_ttf_parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +dependencies = [ + "ttf-parser 0.20.0", +] + +[[package]] +name = "oxisynth" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ac4177ce94a34c3bcfa9e39f8338c8170918faa560d00dd923d984331a749e4" +dependencies = [ + "bitflags 2.4.2", + "byte-slice-cast", + "byteorder", + "generational-arena", + "lazy_static", + "log", + "num-derive 0.4.2", + "num-traits", + "soundfont", + "thiserror", +] + +[[package]] +name = "palette" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d38e6e5ca1612e2081cc31188f08c3cba630ce4ba44709a153f1a0f38d678f2" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", +] + +[[package]] +name = "palette_derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05d1c929301fee6830dafa764341118829b2535c216b0571e3821ecac5c885b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "piano-math" +version = "0.1.0" + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" + +[[package]] +name = "png" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42" + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + +[[package]] +name = "rayon" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "read-fonts" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1362980db95801b70031dd592dc052a44b1810ca9da8fbcf7b25983f3174ed0" +dependencies = [ + "font-types", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] +name = "rfd" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "373d2fc6310e2d14943d4e66ebed5b774a2b6b3b1610e7377edf124fb2760d6b" +dependencies = [ + "ashpd", + "block", + "dispatch", + "js-sys", + "log", + "objc", + "objc-foundation", + "objc_id", + "pollster", + "raw-window-handle 0.6.0", + "urlencoding", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "riff" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b1a3d5f46d53f4a3478e2be4a5a5ce5108ea58b100dcd139830eae7f79a3a1" + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.4.2", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustybuzz" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.20.0", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sctk-adwaita" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +dependencies = [ + "ab_glyph", + "log", + "memmap2 0.9.4", + "smithay-client-toolkit", + "tiny-skia", +] + +[[package]] +name = "self_cell" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" + +[[package]] +name = "semver" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" + +[[package]] +name = "serde" +version = "1.0.196" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.196" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f" +dependencies = [ + "bitflags 2.4.2", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smol_str" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +dependencies = [ + "serde", +] + +[[package]] +name = "softbuffer" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071916a85d1db274b4ed57af3a14afb66bd836ae7f82ebb6f1fd3455107830d9" +dependencies = [ + "as-raw-xcb-connection", + "bytemuck", + "cfg_aliases 0.2.0", + "cocoa", + "core-graphics", + "drm", + "fastrand", + "foreign-types", + "js-sys", + "log", + "memmap2 0.9.4", + "objc", + "raw-window-handle 0.6.0", + "redox_syscall 0.4.1", + "rustix", + "tiny-xlib", + "wasm-bindgen", + "wayland-backend", + "wayland-client", + "wayland-sys", + "web-sys", + "windows-sys 0.52.0", + "x11rb", +] + +[[package]] +name = "soundfont" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88f3c4ee9be1386dc5d4f33fb1df6f813eb2f49510cb24e8bfd30784f4853fce" +dependencies = [ + "riff", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.4.2", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" + +[[package]] +name = "svg_fmt" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" + +[[package]] +name = "swash" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06ff4664af8923625604261c645f5c4cc610cc83c84bec74b50d76237089de7" +dependencies = [ + "read-fonts", + "yazi", + "zeno", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "tempfile" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-xlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" +dependencies = [ + "as-raw-xcb-connection", + "ctor", + "libloading 0.8.1", + "tracing", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.4", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "ttf-parser" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" + +[[package]] +name = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset", + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + +[[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +dependencies = [ + "bitflags 2.4.2", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.2", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +dependencies = [ + "rustix", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "wgpu" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe9a310dcf2e6b85f00c46059aaeaf4184caa8e29a1ecd4b7a704c3482332d" +dependencies = [ + "arrayvec", + "cfg-if", + "cfg_aliases 0.1.1", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle 0.6.0", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.2", + "cfg_aliases 0.1.1", + "codespan-reporting", + "indexmap", + "log", + "naga", + "once_cell", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle 0.6.0", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bb47856236bfafc0bc591a925eb036ac19cd987624a447ff353e7a7e7e6f72" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.2", + "block", + "cfg_aliases 0.1.1", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "once_cell", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle 0.6.0", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-jumpstart" +version = "0.1.0" +dependencies = [ + "bytemuck", + "log", + "raw-window-handle 0.6.0", + "wgpu", +] + +[[package]] +name = "wgpu-types" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2" +dependencies = [ + "bitflags 2.4.2", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winit" +version = "0.29.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c824f11941eeae66ec71111cc2674373c772f482b58939bb4066b642aa2ffcf" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.4.2", + "bytemuck", + "calloop", + "cfg_aliases 0.1.1", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "memmap2 0.9.4", + "ndk 0.8.0", + "ndk-sys 0.5.0+25.2.9519653", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", + "redox_syscall 0.3.5", + "rustix", + "sctk-adwaita", + "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading 0.8.1", + "once_cell", + "rustix", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "xkbcommon-dl" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699" +dependencies = [ + "bitflags 2.4.2", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xxhash-rust" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53be06678ed9e83edb1745eb72efc0bbcd7b5c3c35711a860906aed827a13d61" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zbus" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock 3.3.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "derivative", + "enumflags2", + "event-listener 5.1.0", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.27.1", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7a3e850ff1e7217a3b7a07eba90d37fe9bb9e89a310f718afcde5885ca9b6d7" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e09e8be97d44eeab994d752f341e67b3b0d80512a8b315a0671d47232ef1b65" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72a5857e2856435331636a9fbb415b09243df4521a267c5bedcd5289b4d5799e" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/third_party/nixpkgs/pkgs/by-name/ne/neothesia/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/neothesia/package.nix new file mode 100644 index 0000000000..9169d9caba --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ne/neothesia/package.nix @@ -0,0 +1,70 @@ +{ rustPlatform +, fetchFromGitHub +, lib +, ffmpeg +, pkg-config +, alsa-lib +, wayland +, makeWrapper +, llvmPackages +, libxkbcommon +, vulkan-loader +, xorg +}: +let + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "PolyMeilex"; + repo = "Neothesia"; + rev = "v${version}"; + hash = "sha256-bQ2546q+oachvuNKMJHjQzF6uv06LG+f7eFQPoAn6mw="; + }; +in +rustPlatform.buildRustPackage { + pname = "neothesia"; + + inherit src version; + + buildInputs = [ + ffmpeg + alsa-lib + ]; + + nativeBuildInputs = [ + pkg-config + llvmPackages.clang + makeWrapper + ]; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "mpeg_encoder-0.2.1" = "sha256-+BNZZ1FIr1374n8Zs1mww2w3eWHOH6ENOTYXz9RT2Ck="; + }; + }; + + cargoBuildFlags = [ + "-p neothesia -p neothesia-cli" + ]; + + postInstall = '' + wrapProgram $out/bin/neothesia --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland libxkbcommon vulkan-loader xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrender ]}" + install -Dm 644 flatpak/com.github.polymeilex.neothesia.desktop $out/share/applications/com.github.polymeilex.neothesia.desktop + ''; + + env = { + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + }; + + meta = { + description = "Flashy Synthesia Like Software For Linux, Windows and macOS"; + homepage = "https://github.com/PolyMeilex/Neothesia"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + mainProgram = "neothesia"; + maintainers = [ + lib.maintainers.naxdy + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neovide/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix rename to third_party/nixpkgs/pkgs/by-name/ne/neovide/package.nix diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/skia-externals.json b/third_party/nixpkgs/pkgs/by-name/ne/neovide/skia-externals.json similarity index 100% rename from third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/skia-externals.json rename to third_party/nixpkgs/pkgs/by-name/ne/neovide/skia-externals.json diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix b/third_party/nixpkgs/pkgs/by-name/ne/neovim-unwrapped/package.nix similarity index 99% rename from third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix rename to third_party/nixpkgs/pkgs/by-name/ne/neovim-unwrapped/package.nix index b29e020cbf..0dd8ca8a08 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -148,7 +148,7 @@ in { # check that the above patching actually works disallowedRequisites = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua; - cmakeFlags = [ + cmakeFlagsArray = [ # Don't use downloaded dependencies. At the end of the configurePhase one # can spot that cmake says this option was "not used by the project". # That's because all dependencies were found and diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/system_rplugin_manifest.patch b/third_party/nixpkgs/pkgs/by-name/ne/neovim-unwrapped/system_rplugin_manifest.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/editors/neovim/system_rplugin_manifest.patch rename to third_party/nixpkgs/pkgs/by-name/ne/neovim-unwrapped/system_rplugin_manifest.patch diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/treesitter-parsers.nix b/third_party/nixpkgs/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/editors/neovim/treesitter-parsers.nix rename to third_party/nixpkgs/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/update-treesitter-parsers.py b/third_party/nixpkgs/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py similarity index 100% rename from third_party/nixpkgs/pkgs/applications/editors/neovim/update-treesitter-parsers.py rename to third_party/nixpkgs/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nestopia-ue/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nestopia-ue/package.nix index 78c15e6dfe..34ba7112e4 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/nestopia-ue/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/nestopia-ue/package.nix @@ -14,7 +14,7 @@ , pkg-config , stdenv , unzip -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils }: @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { fltk pkg-config makeWrapper - wrapGAppsHook + wrapGAppsHook3 unzip ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix index dc00b6856c..0d99763f4f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "netclient"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "gravitl"; repo = "netclient"; rev = "v${version}"; - hash = "sha256-Wglh6tcpanEmXwoRKdAot/l4RS+EbIIHI1etQ9ic7BI="; + hash = "sha256-p7cPOPmD/13Mvp0aHRDj3MXfkiaimqrTeg9D7bRU3AM="; }; - vendorHash = "sha256-or/0z+RiOkZ2qgEqXNI/LafN+eWAzvLuSZta/QNUI3g="; + vendorHash = "sha256-mxDhjvNrV4oMHKHQHaxg35Tn30czmjGD3MTRh/Dexv4="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ++ lib.optional stdenv.isLinux libX11; diff --git a/third_party/nixpkgs/pkgs/by-name/ne/netscanner/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/netscanner/package.nix index 7aa745856d..01dd71d3ca 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/netscanner/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/netscanner/package.nix @@ -6,7 +6,7 @@ }: let pname = "netscanner"; - version = "0.4.2"; + version = "0.4.5"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "Chleba"; repo = "netscanner"; rev = "refs/tags/v${version}"; - hash = "sha256-xdY3moWRmSMZ3PVyuHBnp8c9k5KxH+MoE5+s0QWSUM4="; + hash = "sha256-mR+jazZ2Xnf5xuWbVrFCfGOR+sjEUWL3WqHJynIHVFQ="; }; - cargoHash = "sha256-15BNkrr79KMyFcn7NJrGCj25RjH/a4WUOQAoMPzJieQ="; + cargoHash = "sha256-+FTbvS4wqBjEL+uWYKhHQp0uMmrvVPYwxdQeZ4cWrhw="; postFixup = '' wrapProgram $out/bin/netscanner \ diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix index 2288100599..4f2092e5d9 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "nezha-agent"; - version = "0.16.5"; + version = "0.16.7"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; rev = "v${version}"; - hash = "sha256-WRHYI3/6qrVZRa4ANA6VBBJCaINP1N8Xjy0GWO4LqgA="; + hash = "sha256-SKPDNYbtN93GVOlghYS69iHORDUshN47lAZ9DDoX0jM="; }; - vendorHash = "sha256-AtcRfvYBgTZJz9dpsMgacnV8RNi2Ph7QgUrcE6zzTo8="; + vendorHash = "sha256-kqu3+hO0juxI5qbczVFg0GF+pljmePFbKd59a14U7Pg="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/nf/nf-test/package.nix b/third_party/nixpkgs/pkgs/by-name/nf/nf-test/package.nix new file mode 100644 index 0000000000..44a6c5d8f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/nf/nf-test/package.nix @@ -0,0 +1,58 @@ +{ lib +, fetchurl +, makeWrapper +, nextflow +, nf-test +, openjdk11 +, stdenv +, testers +}: +stdenv.mkDerivation rec { + + pname = "nf-test"; + version = "0.8.4"; + + src = fetchurl { + url = "https://github.com/askimed/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-gCO75uNUKU+6UUST9CP4DnWGnl2vflH0y4CId/3IQ4E="; + }; + sourceRoot = "."; + + buildInputs = [ + makeWrapper + ]; + + nativeBuildInputs = [ + nextflow + ]; + + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/nf-test + install -Dm644 nf-test.jar $out/share/nf-test + + mkdir -p $out/bin + makeWrapper ${openjdk11}/bin/java $out/bin/nf-test \ + --add-flags "-jar $out/share/nf-test/nf-test.jar" \ + --prefix PATH : ${lib.makeBinPath nativeBuildInputs} \ + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = nf-test; + command = "nf-test version"; + }; + + meta = with lib; { + description = "Simple test framework for Nextflow pipelines"; + homepage = "https://www.nf-test.com/"; + changelog = "https://github.com/askimed/nf-test/releases"; + license = licenses.mit; + maintainers = with maintainers; [ rollf ]; + mainProgram = "nf-test"; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ng/nginx-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/ng/nginx-language-server/package.nix new file mode 100644 index 0000000000..891d6e4d5c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ng/nginx-language-server/package.nix @@ -0,0 +1,44 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "nginx-language-server"; + version = "0.8.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pappasam"; + repo = "nginx-language-server"; + rev = "refs/tags/v${version}"; + hash = "sha256-AXWrNt4f3jkAbidE1goDgFicu4sSBv08f/Igyh2bRII="; + }; + + build-system = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pydantic" + ]; + + dependencies = with python3.pkgs; [ + crossplane + lsprotocol + pydantic + pygls + ]; + + pythonImportsCheck = [ "nginx_language_server" ]; + + meta = with lib; { + description = "Language server for nginx.conf"; + homepage = "https://github.com/pappasam/nginx-language-server"; + changelog = "https://github.com/pappasam/nginx-language-server/blob/${src.rev}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ GaetanLepage ]; + mainProgram = "nginx-language-server"; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix b/third_party/nixpkgs/pkgs/by-name/ng/nginx-sso/package.nix similarity index 93% rename from third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix rename to third_party/nixpkgs/pkgs/by-name/ng/nginx-sso/package.nix index 6628eb48c1..578d55b447 100644 --- a/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ng/nginx-sso/package.nix @@ -30,7 +30,7 @@ buildGoModule rec { description = "SSO authentication provider for the auth_request nginx module"; homepage = "https://github.com/Luzifer/nginx-sso"; license = licenses.asl20; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ ambroisie ]; mainProgram = "nginx-sso"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/nh/nh/package.nix b/third_party/nixpkgs/pkgs/by-name/nh/nh/package.nix index 3d1480da73..e20797546f 100644 --- a/third_party/nixpkgs/pkgs/by-name/nh/nh/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nh/nh/package.nix @@ -10,7 +10,7 @@ , nix-output-monitor }: let - version = "3.5.13"; + version = "3.5.15"; runtimeDeps = [ nvd nix-output-monitor ]; in rustPlatform.buildRustPackage { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "viperML"; repo = "nh"; rev = "refs/tags/v${version}"; - hash = "sha256-lTy5gmB3dJZJKag2uuuxXvZCAt/RhLnI0jbIicBJfCo="; + hash = "sha256-1mE4ZXGAMZl2Mufr47y+2UMDHBelqsvChaCsQDK3m70="; }; strictDeps = true; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-X8+GmPFxvgeNxMuOacoCUCgdZ/+N4mwQFMUtvO1E998="; + cargoHash = "sha256-5BazSJGsafSl0eE7GOWw2SrVgC3k1tlrLiIFIpC51/o="; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nibtools/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nibtools/package.nix new file mode 100644 index 0000000000..ea8dad3b2c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nibtools/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, opencbm +, cc65 +}: + +stdenv.mkDerivation { + pname = "nibtools"; + version = "0-unstable-2024-02-22"; + + src = fetchFromGitHub { + owner = "OpenCBM"; + repo = "nibtools"; + rev = "1d69f64eec55031c346a2ce115227479f9579a8a"; + hash = "sha256-+hnkj0uevURkRboTH8WbSt82pZTdWL4ii2PKr6NO0Cg="; + }; + + NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; + + nativeBuildInputs = [ + cc65 + ]; + + buildInputs = [ + opencbm + ]; + + preBuild = "mkdir build"; + makeFlags = [ "-f" "GNU/Makefile" "linux" ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mv nibread nibwrite nibscan nibconv nibrepair nibsrqtest $out/bin/ + runHook postInstall + ''; + + meta = with lib; { + description = "disk transfer utility for imaging and converting commodore 64 disk images"; + homepage = "https://github.com/OpenCBM/nibtools/"; + license = licenses.gpl2; + maintainers = with maintainers; [ matthewcroughan ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nickel/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ni/nickel/Cargo.lock index 69c9bddd61..a9577c251f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nickel/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ni/nickel/Cargo.lock @@ -1241,25 +1241,6 @@ dependencies = [ "yaml-rust", ] -[[package]] -name = "ipc-channel" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab3a34c91b7e84a72643bd75d1bac3afd241f78f9859fe0b5e5b2a6a75732c2" -dependencies = [ - "bincode", - "crossbeam-channel", - "fnv", - "lazy_static", - "libc", - "mio", - "rand", - "serde", - "tempfile", - "uuid", - "windows", -] - [[package]] name = "is-terminal" version = "0.4.12" @@ -1668,7 +1649,7 @@ dependencies = [ [[package]] name = "nickel-lang-cli" -version = "1.5.0" +version = "1.6.0" dependencies = [ "clap 4.5.2", "clap_complete", @@ -1686,7 +1667,7 @@ dependencies = [ [[package]] name = "nickel-lang-core" -version = "0.6.0" +version = "0.7.0" dependencies = [ "ansi_term", "assert_matches", @@ -1741,7 +1722,7 @@ dependencies = [ [[package]] name = "nickel-lang-lsp" -version = "1.5.0" +version = "1.6.0" dependencies = [ "anyhow", "assert_cmd", @@ -1757,7 +1738,6 @@ dependencies = [ "env_logger", "glob", "insta", - "ipc-channel", "lalrpop", "lalrpop-util", "lazy_static", @@ -1769,6 +1749,7 @@ dependencies = [ "nickel-lang-utils", "pretty_assertions", "regex", + "scopeguard", "serde", "serde_json", "test-generator", @@ -1788,7 +1769,7 @@ dependencies = [ [[package]] name = "nickel-wasm-repl" -version = "0.6.0" +version = "0.7.0" dependencies = [ "nickel-lang-core", ] @@ -2048,12 +2029,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - [[package]] name = "precomputed-hash" version = "0.1.1" @@ -2139,7 +2114,7 @@ dependencies = [ [[package]] name = "pyckel" -version = "1.5.0" +version = "1.6.0" dependencies = [ "codespan-reporting", "nickel-lang-core", @@ -2269,36 +2244,6 @@ dependencies = [ "nibble_vec", ] -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - [[package]] name = "raw-cpuid" version = "10.7.0" @@ -3066,7 +3011,7 @@ dependencies = [ [[package]] name = "topiary-core" version = "0.3.0" -source = "git+https://github.com/tweag/topiary.git?rev=614abf5d1a5cc3118c9687e18dc1c70a00c3e686#614abf5d1a5cc3118c9687e18dc1c70a00c3e686" +source = "git+https://github.com/tweag/topiary.git?rev=82a94a9f57104b89d4316afaeeab271cc51f7698#82a94a9f57104b89d4316afaeeab271cc51f7698" dependencies = [ "futures", "itertools 0.11.0", @@ -3084,12 +3029,12 @@ dependencies = [ [[package]] name = "topiary-queries" version = "0.3.0" -source = "git+https://github.com/tweag/topiary.git?rev=9ae9ef49c2fa968d15107b817864ff6627e0983e#9ae9ef49c2fa968d15107b817864ff6627e0983e" +source = "git+https://github.com/tweag/topiary.git?rev=82a94a9f57104b89d4316afaeeab271cc51f7698#82a94a9f57104b89d4316afaeeab271cc51f7698" [[package]] name = "topiary-tree-sitter-facade" version = "0.3.0" -source = "git+https://github.com/tweag/topiary.git?rev=614abf5d1a5cc3118c9687e18dc1c70a00c3e686#614abf5d1a5cc3118c9687e18dc1c70a00c3e686" +source = "git+https://github.com/tweag/topiary.git?rev=82a94a9f57104b89d4316afaeeab271cc51f7698#82a94a9f57104b89d4316afaeeab271cc51f7698" dependencies = [ "js-sys", "topiary-web-tree-sitter-sys", @@ -3101,7 +3046,7 @@ dependencies = [ [[package]] name = "topiary-web-tree-sitter-sys" version = "0.3.0" -source = "git+https://github.com/tweag/topiary.git?rev=614abf5d1a5cc3118c9687e18dc1c70a00c3e686#614abf5d1a5cc3118c9687e18dc1c70a00c3e686" +source = "git+https://github.com/tweag/topiary.git?rev=82a94a9f57104b89d4316afaeeab271cc51f7698#82a94a9f57104b89d4316afaeeab271cc51f7698" dependencies = [ "js-sys", "wasm-bindgen", @@ -3122,7 +3067,7 @@ dependencies = [ [[package]] name = "tree-sitter-nickel" version = "0.1.0" -source = "git+https://github.com/nickel-lang/tree-sitter-nickel?rev=091b5dcc7d138901bcc162da9409c0bb626c0d27#091b5dcc7d138901bcc162da9409c0bb626c0d27" +source = "git+https://github.com/nickel-lang/tree-sitter-nickel?rev=58baf89db8fdae54a84bcf22c80ff10ee3f929ed#58baf89db8fdae54a84bcf22c80ff10ee3f929ed" dependencies = [ "cc", "tree-sitter", @@ -3226,9 +3171,6 @@ name = "uuid" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" -dependencies = [ - "getrandom", -] [[package]] name = "version_check" @@ -3396,15 +3338,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-sys" version = "0.48.0" diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nickel/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nickel/package.nix index 8ba97749be..bd829aa6ba 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nickel/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nickel/package.nix @@ -8,21 +8,20 @@ rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "tweag"; repo = "nickel"; rev = "refs/tags/${version}"; - hash = "sha256-tb0nIBj/5nb0WbkceL7Rt1Rs0Qjy5/2leSOofF4zhTY="; + hash = "sha256-AL5YkdITO9CPFYzMGQwHbuFZrMDUvF1yTt2XTotoymM="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "topiary-core-0.3.0" = "sha256-2oVdtBcH1hF+p3PixBOljHXvGX2YCoRzA/vlBDvN7fE="; - "topiary-queries-0.3.0" = "sha256-1leQLRohX0iDiOOO96ETM2L3yOElW8OwR5IcrsoxfOo="; - "tree-sitter-nickel-0.1.0" = "sha256-HyHdameEgET5UXKMgw7EJvZsJxToc9Qz26XHvc5qmU0="; + "topiary-core-0.3.0" = "sha256-KWfgbVFV2zbCuNNFp9yeSgAa0Cc7cT090KK2J1ynfKg="; + "tree-sitter-nickel-0.1.0" = "sha256-WuY6X1mnXdjiy4joIcY8voK2sqICFf0GvudulZ9lwqg="; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nim_lk/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nim_lk/package.nix index 680ba976b5..184d1e2774 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nim_lk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nim_lk/package.nix @@ -1,23 +1,26 @@ -{ lib -, buildNimPackage -, fetchFromSourcehut -, nim -, nix-prefetch -, nix-prefetch-git -, openssl -, makeWrapper +{ + lib, + buildNimPackage, + fetchFromSourcehut, + nim, + nix-prefetch, + nix-prefetch-git, + openssl, + makeWrapper, }: -let nim' = nim.passthru.nim; -in buildNimPackage (finalAttrs: { +let + nim' = nim.passthru.nim; +in +buildNimPackage (finalAttrs: { pname = "nim_lk"; - version = "20240210"; + version = "20240510"; src = fetchFromSourcehut { owner = "~ehmry"; repo = "nim_lk"; rev = finalAttrs.version; - hash = "sha256-LLOf8HNee0Mol+e7/dvu9hQUCmpaVBNggTxaAl/wV6Y="; + hash = "sha256-fwoGyYkbGstWG0qw15dOq1gmr3GyIn6ZEBeBmEivHlA="; }; lockFile = ./lock.json; @@ -29,7 +32,13 @@ in buildNimPackage (finalAttrs: { postFixup = '' wrapProgram $out/bin/nim_lk \ - --suffix PATH : ${lib.makeBinPath [ nim' nix-prefetch nix-prefetch-git ]} + --suffix PATH : ${ + lib.makeBinPath [ + nim' + nix-prefetch + nix-prefetch-git + ] + } ''; meta = finalAttrs.src.meta // { diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nimdow/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nimdow/package.nix index 7a5542c2c0..974bb430ce 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nimdow/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nimdow/package.nix @@ -3,19 +3,21 @@ buildNimPackage (finalAttrs: { pname = "nimdow"; - version = "0.7.37"; - - requiredNimVersion = 1; + version = "0.7.38"; src = fetchFromGitHub { owner = "avahe-kellenberger"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-930wDS0UW65QzpUHHOuM25oi/OhFmG0Q7N05ftu7XlI="; + hash = "sha256-GPu3Z63rFBgCCV7bdBg9cJh5thv2xrv/nSMa5Q/zp48="; }; lockFile = ./lock.json; + nimFlags = [ + "--deepcopy:on" + ]; + postInstall = '' install -D config.default.toml $out/share/nimdow/config.default.toml install -D nimdow.desktop $out/share/applications/nimdow.desktop diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nimlsp/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nimlsp/package.nix index 78d015cc7b..40e1b0fb9e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nimlsp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nimlsp/package.nix @@ -41,6 +41,6 @@ buildNimPackage (finalAttrs: { description = "Language Server Protocol implementation for Nim"; homepage = "https://github.com/PMunch/nimlsp"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.marsam ]; + maintainers = [ ]; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nitter/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nitter/package.nix index 3b3e89cf3e..28884a7deb 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nitter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nitter/package.nix @@ -8,7 +8,7 @@ buildNimPackage (finalAttrs: prevAttrs: { pname = "nitter"; - version = "unstable-2024-02-26"; + version = "0-unstable-2024-02-26"; src = fetchFromGitHub { owner = "zedeus"; diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-inspect/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-inspect/package.nix index a77365dcc1..e433517fcb 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nix-inspect/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-inspect/package.nix @@ -13,15 +13,15 @@ src = fetchFromGitHub { owner = "bluskript"; repo = "nix-inspect"; - rev = "74007c580b8282bd336130ddf354e71502b421a6"; - hash = "sha256-JichXRSfTLfy+7fhbTvA89rQLkqsY2eHgEAeAHWbA9s="; + rev = "86f636b1e01579b3a63b2c778c21a818b00c3d1e"; + hash = "sha256-G5Md4ghux4LBRkPE8vzLTUWxzlQ7s1xKxZ8i3ICWZU8="; }; workerPackage = stdenv.mkDerivation { inherit src; pname = "nix-inspect-worker"; - version = "0.1.1"; + version = "0.1.2"; sourceRoot = "source/worker"; nativeBuildInputs = [meson ninja pkg-config]; @@ -38,9 +38,9 @@ in rustPlatform.buildRustPackage { inherit src; pname = "nix-inspect"; - version = "0.1.1"; + version = "0.1.2"; - cargoHash = "sha256-l+R7BLgJvK9mQ89GVAdTyQX81VMoV11h5KFlMUqAH30="; + cargoHash = "sha256-/0CrHqOL4B0Rx0ZbUpW54FiisfpW6UU4uk6wctfCX5c="; buildInputs = [workerPackage]; diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-search-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-search-cli/package.nix index 56bde6ac04..daf80cf9a7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nix-search-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-search-cli/package.nix @@ -6,7 +6,7 @@ buildGoModule { pname = "nix-search-cli"; - version = "unstable-2023-09-12"; + version = "0-unstable-2023-09-12"; src = fetchFromGitHub { owner = "peterldowns"; @@ -17,7 +17,11 @@ buildGoModule { vendorHash = "sha256-JDOu7YdX9ztMZt0EFAMz++gD7n+Mn1VOe5g6XwrgS5M="; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + # Almost every commit is tagged as "release--", software doesn't keep track of its version + # Using 0 feels closer to what the tagging is trying to express + hardcodeZeroVersion = true; + }; meta = with lib; { description = "CLI for searching packages on search.nixos.org"; diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-web/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-web/package.nix index bc79ba376e..50ef3aed96 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nix-web/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-web/package.nix @@ -5,8 +5,9 @@ , pkg-config , openssl , nixVersions -, nixPackage ? nixVersions.nix_2_17 +, nixPackage ? nixVersions.nix_2_18 , darwin +, nukeReferences }: let @@ -14,16 +15,23 @@ let in rustPlatform.buildRustPackage rec { pname = "nix-web"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "gorgon"; repo = "gorgon"; rev = "nix-web-v${version}"; - hash = "sha256-M/0nlD2jUtvdWJ647QHrp8JcUUVYxiLJlGjnZ+cfpYU="; + hash = "sha256-/tjcin3p+nE9Y7bhTCj7D4lpjKEFGM1bRqKE8T6igJE="; + + # Various unit tests contain /nix/store/* paths. This breaks the fetcher in a very funny way: + # error: illegal path references in fixed-output derivation '/nix/store/52nmkc6v9qhdyzszlvbncndxyrcdfjn3-source.drv' + nativeBuildInputs = [ nukeReferences ]; + postFetch = '' + find $out -name "*.rs" -print0 | xargs -0 nuke-refs + ''; }; - cargoHash = "sha256-6kcpP/CFiy571B98Y96/cdcClH50gdyPLZ28Npva7B4="; + cargoHash = "sha256-5pPn6APz0kdxuBdz9pgqvECTk6KhXnW/YTjxKgiuD9Q="; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optional (!stdenv.isDarwin) openssl @@ -39,6 +47,11 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = cargoFlags; cargoTestFlags = cargoFlags; + checkFlags = [ + # Skip tests that rely on store paths nuked by `nuke-refs`. + "--skip=test_env_value_to_html_store_path_subpath" + "--skip=test_env_value_to_html_store_path" + ]; NIX_WEB_BUILD_NIX_CLI_PATH = "${nixPackage}/bin/nix"; diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nixos-anywhere/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-anywhere/package.nix index 197a320d4c..36ee25429b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -12,11 +12,11 @@ , gnused , lib , makeWrapper +, sshpass }: let runtimeDeps = [ gitMinimal # for git flakes - rsync nix coreutils curl # when uploading tarballs @@ -24,20 +24,23 @@ let gawk findutils gnused # needed by ssh-copy-id + sshpass # used to provide password for ssh-copy-id + rsync # used to upload extra-files ]; in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "numtide"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-JzgZnHQ4Bknh1ebE4iMVzR3cWZG+8k7MRy0X7cNSnBE="; + hash = "sha256-u3PFJup/XOz2MBhvqCzm94iH6Z4nrE0KmBgT/OnNDqU="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -D -m 0755 src/nixos-anywhere.sh $out/bin/nixos-anywhere + install -D -m 0755 src/get-facts.sh $out/bin/get-facts.sh # We prefer the system's openssh over our own, since it might come with features not present in ours: # https://github.com/numtide/nixos-anywhere/issues/62 diff --git a/third_party/nixpkgs/pkgs/by-name/no/nodeinfo/package.nix b/third_party/nixpkgs/pkgs/by-name/no/nodeinfo/package.nix new file mode 100644 index 0000000000..2027ce8035 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/no/nodeinfo/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitea, + buildGoModule, +}: +buildGoModule rec { + pname = "nodeinfo"; + version = "0.3.2"; + vendorHash = "sha256-4nHdz/Js8xBUMiH+hH+hSYP25cB4yHbe+QVk0RMqLgc="; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "thefederationinfo"; + repo = "nodeinfo-go"; + rev = "refs/tags/v${version}"; + hash = "sha256-NNrMv4AS7ybuJfTgs+p61btSIxo+iMvzH7Y5ct46Dag="; + }; + + tags = "extension"; + + sourceRoot = "${src.name}/cli"; + + CGO_ENABLED = 0; + + meta = with lib; { + mainProgram = "nodeinfo"; + description = "A command line tool to query nodeinfo based on a given domain"; + homepage = "https://codeberg.org/thefederationinfo/nodeinfo-go"; + changelog = "https://codeberg.org/thefederationinfo/nodeinfo-go/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ _6543 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/no/nom/package.nix b/third_party/nixpkgs/pkgs/by-name/no/nom/package.nix index 2d1c40e09c..5729181087 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/nom/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/nom/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "nom"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; rev = "v${version}"; - hash = "sha256-AAgkxBbGH45n140jm28+J3hqYxzUIL6IVLGWD9oBexo="; + hash = "sha256-W0HDoQURZxTvMyFfRGOu8gcZJihtvXvrEaObmi/CAk0="; }; - vendorHash = "sha256-fP6yxfIQoVaBC9hYcrCyo3YP3ntEVDbDTwKMO9TdyDI="; + vendorHash = "sha256-wWdsLU656wBAUmnVw21wo+a/OLmyhZ2Bq0j8S190XQs="; meta = with lib; { homepage = "https://github.com/guyfedwards/nom"; diff --git a/third_party/nixpkgs/pkgs/by-name/no/normcap/package.nix b/third_party/nixpkgs/pkgs/by-name/no/normcap/package.nix index 7018cc5657..40c7d66a9f 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/normcap/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/normcap/package.nix @@ -25,7 +25,7 @@ in ps.buildPythonApplication rec { pname = "normcap"; - version = "0.5.4"; + version = "0.5.6"; format = "pyproject"; disabled = ps.pythonOlder "3.9"; @@ -34,13 +34,13 @@ ps.buildPythonApplication rec { owner = "dynobo"; repo = "normcap"; rev = "refs/tags/v${version}"; - hash = "sha256-bYja05U/JBwSij1J2LxN+c5Syrb4qzWSZY5+HNmC9Zo="; + hash = "sha256-pvctgJCst536D3yLlel70hCwe1T3lxA8F6L3KKbfiEA="; }; postPatch = '' # disable coverage testing substituteInPlace pyproject.toml \ - --replace "addopts = [" "addopts_ = [" + --replace-fail "addopts = [" "addopts_ = [" ''; pythonRemoveDeps = [ @@ -57,7 +57,7 @@ ps.buildPythonApplication rec { ps.babel ]; - propagatedBuildInputs = [ + dependencies = [ ps.pyside6 ps.jeepney ]; @@ -97,6 +97,8 @@ ps.buildPythonApplication rec { disabledTests = [ # requires a wayland session (no xclip support) "test_wl_copy" + # RuntimeError: Please destroy the QApplication singleton before creating a new QApplication instance + "test_get_application" # times out, unknown why "test_update_checker_triggers_checked_signal" # touches network @@ -124,6 +126,9 @@ ps.buildPythonApplication rec { "tests/tests_gui/test_downloader.py" # fails to import, causes pytest to freeze "tests/tests_gui/test_language_manager.py" + # RuntimeError("Internal C++ object (PySide6.QtGui.QHideEvent) already deleted.") + # AttributeError("'LoadingIndicator' object has no attribute 'timer'") + "tests/tests_gui/test_loading_indicator.py" ] ++ lib.optionals stdenv.isDarwin [ # requires a display "tests/integration/test_normcap.py" diff --git a/third_party/nixpkgs/pkgs/by-name/no/nosql-workbench/package.nix b/third_party/nixpkgs/pkgs/by-name/no/nosql-workbench/package.nix index 1b96328b21..e3d1890665 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/nosql-workbench/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/nosql-workbench/package.nix @@ -58,9 +58,9 @@ if stdenv.isDarwin then stdenv.mkDerivation { } else appimageTools.wrapType2 { inherit pname version src meta; - extraPkgs = ps: (appimageTools.defaultFhsEnvArgs.multiPkgs ps) ++ [ + extraPkgs = pkgs: [ # Required to run DynamoDB locally - ps.jdk21 + pkgs.jdk21 ]; extraInstallCommands = let @@ -68,9 +68,6 @@ if stdenv.isDarwin then stdenv.mkDerivation { inherit pname version src; }; in '' - # Replace version from binary name - mv $out/bin/${pname}-${version} $out/bin/${pname} - # Install XDG Desktop file and its icon install -Dm444 ${appimageContents}/nosql-workbench.desktop -t $out/share/applications install -Dm444 ${appimageContents}/nosql-workbench.png -t $out/share/pixmaps diff --git a/third_party/nixpkgs/pkgs/by-name/no/novops/package.nix b/third_party/nixpkgs/pkgs/by-name/no/novops/package.nix index f5893bf661..02f11dc208 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/novops/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/no/novops/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "novops"; - version = "0.12.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "PierreBeucher"; repo = pname; rev = "v${version}"; - hash = "sha256-iQFw3m7dpAii/Nc1UQ/ZXTuHvj5vGsp3SOqd14uHUpc="; + hash = "sha256-b6CM7dDjEzFuL6SZQsFMBOq8p66Jnd7BdXFspWYlTps="; }; - cargoHash = "sha256-mQ7Vm80S4FALWiEsV+68pNrah36aYu7PediRlJUXLAk="; + cargoHash = "sha256-mhNEeczbqXVsHoErwEIPUuJqNcyR6dTKBDeHCVH+KsE="; buildInputs = [ openssl # required for openssl-sys diff --git a/third_party/nixpkgs/pkgs/by-name/nr/nray/package.nix b/third_party/nixpkgs/pkgs/by-name/nr/nray/package.nix new file mode 100644 index 0000000000..1641e1c4df --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/nr/nray/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "nray"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "nray-scanner"; + repo = "nray"; + rev = "refs/tags/v${version}"; + hash = "sha256-N78Bm/Le+pbA8hvDaUbjQpcdRlM0RKXnXyjOB8Nz3AE="; + }; + + vendorHash = "sha256-hCFFMSaT73Wx54KayuFc2xJRGp0p10Pn93N8t4Xad8g="; + + ldflags = [ + "-s" + "-w" + ]; + + env = { + CGO_CFLAGS = "-Wno-undef-prefix"; + }; + + meta = with lib; { + description = "Distributed port scanner"; + homepage = "https://github.com/nray-scanner/nray"; + changelog = "https://github.com/nray-scanner/nray/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "nray"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/nr/nrfconnect/package.nix b/third_party/nixpkgs/pkgs/by-name/nr/nrfconnect/package.nix index c3a6e0e7f3..a60ddd5334 100644 --- a/third_party/nixpkgs/pkgs/by-name/nr/nrfconnect/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nr/nrfconnect/package.nix @@ -5,11 +5,11 @@ let pname = "nrfconnect"; - version = "4.3.0"; + version = "4.4.1"; src = fetchurl { url = "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-connect-for-desktop/${lib.versions.major version}-${lib.versions.minor version}-${lib.versions.patch version}/nrfconnect-${version}-x86_64.appimage"; - hash = "sha256-G8//dZqPxn6mR8Bjzf/bAn9Gv7t2AFWIF9twCGbqMd8="; + hash = "sha256-x/vVSOEajuQtLATRXk8DVLlXHegCqP+acecaOFNeBb8="; name = "${pname}-${version}.AppImage"; }; @@ -20,12 +20,9 @@ let in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: with pkgs; [ - segger-jlink - ]; + extraPkgs = pkgs: [ pkgs.segger-jlink ]; extraInstallCommands = '' - mv $out/bin/nrfconnect-* $out/bin/nrfconnect install -Dm444 ${appimageContents}/nrfconnect.desktop -t $out/share/applications install -Dm444 ${appimageContents}/usr/share/icons/hicolor/512x512/apps/nrfconnect.png \ -t $out/share/icons/hicolor/512x512/apps diff --git a/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix b/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix index 0992152aed..7d43400dba 100644 --- a/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "nrr"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ryanccn"; repo = "nrr"; rev = "v${version}"; - hash = "sha256-94BeBCYCxZBoOp6xo4I/uxd6ULjIfmF4nw/vUWoaEpo="; + hash = "sha256-wof/KmoHiBkcn2aTh+M6bNH/B6Le3H6hnT8BzUCs0Pw="; }; - cargoHash = "sha256-DTQTIAk914XC+LecQTXk1TdBc/5sMFG8KiD9lO5HLiM="; + cargoHash = "sha256-BtYZNZxFjgY/BFd1kwGyy/F1iRezSDxoPHF4exrNzuk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/third_party/nixpkgs/pkgs/by-name/nu/nuclei-templates/package.nix b/third_party/nixpkgs/pkgs/by-name/nu/nuclei-templates/package.nix index 989a97f0c5..90eb9d35d2 100644 --- a/third_party/nixpkgs/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "9.8.1"; + version = "9.8.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-g1MwzJK9a8bpbbP9EoUi0UBR54nfnyg3RDi9qwIKlH0="; + hash = "sha256-3hJfWSBciJ/UutVBIGisptcxmtWfvSfTbx55cyWxs4k="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/nw/nwg-drawer/package.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-drawer/package.nix index 42a69d5949..647ca14b3c 100644 --- a/third_party/nixpkgs/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nw/nwg-drawer/package.nix @@ -6,7 +6,7 @@ , gtk-layer-shell , gtk3 , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils }: @@ -29,7 +29,7 @@ buildGoModule { nativeBuildInputs = [ gobject-introspection pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/nw/nwg-hello/package.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-hello/package.nix index cae3fd2d25..8efe84411f 100644 --- a/third_party/nixpkgs/pkgs/by-name/nw/nwg-hello/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nw/nwg-hello/package.nix @@ -4,7 +4,7 @@ , gtk-layer-shell , gtk3 , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/nx/nxengine-evo/assets.nix b/third_party/nixpkgs/pkgs/by-name/nx/nxengine-evo/assets.nix new file mode 100644 index 0000000000..96c2e5f1e7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/nx/nxengine-evo/assets.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchzip +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "nxengine-assets"; + version = "2.6.5-1"; + + src = fetchzip { + url = "https://github.com/nxengine/nxengine-evo/releases/download/v${finalAttrs.version}/NXEngine-Evo-v${finalAttrs.version}-Win64.zip"; + hash = "sha256-+PjjhJYL1yk67QJ7ixfpCRg1coQnSPpXDUIwsqp9aIM="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/nxengine/ + cp -r data/ $out/share/nxengine/data + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/nxengine/nxengine-evo"; + description = "Assets for nxengine-evo"; + license = with lib.licenses; [ + unfreeRedistributable + ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/nx/nxengine-evo/package.nix b/third_party/nixpkgs/pkgs/by-name/nx/nxengine-evo/package.nix new file mode 100644 index 0000000000..4503c0ec9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/nx/nxengine-evo/package.nix @@ -0,0 +1,92 @@ +{ + lib, + SDL2, + SDL2_mixer, + callPackage, + cmake, + pkg-config, + ninja, + fetchFromGitHub, + fetchpatch, + fetchurl, + libpng, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nxengine-evo"; + version = "2.6.4"; + + src = fetchFromGitHub { + owner = "nxengine"; + repo = "nxengine-evo"; + rev = "v${finalAttrs.version}"; + hash = "sha256-krK2b1E5JUMxRoEWmb3HZMNSIHfUUGXSpyb4/Zdp+5A="; + }; + + patches = [ + # Fix building by adding SDL_MIXER to include path + (fetchpatch { + url = "https://github.com/nxengine/nxengine-evo/commit/1890127ec4b4b5f8d6cb0fb30a41868e95659840.patch"; + hash = "sha256-wlsIdN2RugOo94V3qj/AzYgrs2kf0i1Iw5zNOP8WQqI="; + }) + # Fix buffer overflow + (fetchpatch { + url = "https://github.com/nxengine/nxengine-evo/commit/75b8b8e3b067fd354baa903332f2a3254d1cc017.patch"; + hash = "sha256-fZVaZAOHgFoNakOR2MfsvRJjuLhbx+5id/bcN8w/WWo="; + }) + # Add missing include + (fetchpatch { + url = "https://github.com/nxengine/nxengine-evo/commit/0076ebb11bcfec5dc5e2e923a50425f1a33a4133.patch"; + hash = "sha256-8j3fFFw8DMljV7aAFXE+eA+vkbz1HdFTMAJmk3BRU04="; + }) + ]; + + nativeBuildInputs = [ + SDL2 + cmake + ninja + pkg-config + ]; + + buildInputs = [ + SDL2 + SDL2_mixer + libpng + ]; + + strictDeps = true; + + # Allow finding game assets. + postPatch = '' + sed -i -e "s,/usr/share/,$out/share/," src/ResourceManager.cpp + ''; + + installPhase = '' + runHook preInstall + + cd .. + mkdir -p $out/bin/ $out/share/nxengine/ + install bin/* $out/bin/ + '' + '' + cp -r ${finalAttrs.finalPackage.assets}/share/nxengine/data $out/share/nxengine/data + chmod -R a=r,a+X $out/share/nxengine/data + '' + '' + runHook postInstall + ''; + + passthru = { + assets = callPackage ./assets.nix { }; + }; + + meta = { + homepage = "https://github.com/nxengine/nxengine-evo"; + description = "A complete open-source clone/rewrite of the masterpiece jump-and-run platformer Doukutsu Monogatari (also known as Cave Story)"; + license = with lib.licenses; [ + gpl3Plus + ]; + mainProgram = "nx"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/oc/ocenaudio/package.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocenaudio/package.nix index 592a75b773..a78ce59e49 100644 --- a/third_party/nixpkgs/pkgs/by-name/oc/ocenaudio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oc/ocenaudio/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.13.5"; + version = "3.13.8"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=v${version}"; - hash = "sha256-9eDDllf6D2hAhjztPhi1MrUky7zQfiE4uLAbfRDx+7s="; + hash = "sha256-GKNho2xV6Lc4U5Ys4j+ZiGxE8irolcrTttN3PG1S2Ug="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/oc/ocis-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocis-bin/package.nix index 6e7abc30ac..a9f3657728 100644 --- a/third_party/nixpkgs/pkgs/by-name/oc/ocis-bin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oc/ocis-bin/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ownCloud Infinite Scale Stack "; homepage = "https://owncloud.dev/ocis/"; - changelog = "https://github.com/owncloud/ocis/releases/tag/v${version}"; + changelog = "https://github.com/owncloud/ocis/releases/tag/v${finalAttrs.version}"; # oCIS is licensed under non-free EULA which can be found here : # https://github.com/owncloud/ocis/releases/download/v5.0.1/End-User-License-Agreement-for-ownCloud-Infinite-Scale.pdf license = licenses.unfree; diff --git a/third_party/nixpkgs/pkgs/by-name/oe/oelint-adv/package.nix b/third_party/nixpkgs/pkgs/by-name/oe/oelint-adv/package.nix index 480d92a161..2656d2dd6f 100644 --- a/third_party/nixpkgs/pkgs/by-name/oe/oelint-adv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oe/oelint-adv/package.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "oelint-adv"; - version = "5.1.3"; + version = "5.3.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_adv"; - hash = "sha256-Jo3Z5hhZH0tzu4+RL+ElaenlWCRoIYANWGx5U2u9xy8="; + hash = "sha256-8fftHQpv2GZhi3ZDXYUG7uAiWuuX79dntGAbKIvv4Kc="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/by-name/of/offat/package.nix b/third_party/nixpkgs/pkgs/by-name/of/offat/package.nix index e5b1186af7..029fab3da7 100644 --- a/third_party/nixpkgs/pkgs/by-name/of/offat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/of/offat/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "offat"; - version = "0.17.2"; + version = "0.17.5"; pyproject = true; src = fetchFromGitHub { owner = "OWASP"; repo = "OFFAT"; rev = "refs/tags/v${version}"; - hash = "sha256-tyQoTc/cfzYxK+vLg9TvZdbKRX3B4tL1Do/wDMArJSA="; + hash = "sha256-61VJPsmSvKZKBWQNl7klqZqFjEjhM3n4LuafZh4d6g4="; }; sourceRoot = "${src.name}/src"; diff --git a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix b/third_party/nixpkgs/pkgs/by-name/oh/oh-my-posh/package.nix similarity index 89% rename from third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix rename to third_party/nixpkgs/pkgs/by-name/oh/oh-my-posh/package.nix index 64562c17f5..698aa781b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "19.20.0"; + version = "19.29.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-f85CKfYPNh06eVHu5nn4MhX5wuptpJCmvSiPHWGzjkg="; + hash = "sha256-vn3P9upO6d0jpZzrG77/xkhfn4NINnBZ3YymlRdoONw="; }; - vendorHash = "sha256-SeeVHqeQCfOJTNfWIfTd71jGk5mYH5HRArUosZqRreY="; + vendorHash = "sha256-mZNhsvEI1AbsAhoK7AuNgrQvYlkGrrpPVuv3R5nssC4="; sourceRoot = "${src.name}/src"; diff --git a/third_party/nixpkgs/pkgs/by-name/ol/olvid/package.nix b/third_party/nixpkgs/pkgs/by-name/ol/olvid/package.nix index 1aaf472fef..ec90fcb72f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ol/olvid/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ol/olvid/package.nix @@ -13,7 +13,7 @@ , openjfx21 , autoPatchelfHook , makeBinaryWrapper -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -53,20 +53,20 @@ in stdenv.mkDerivation (finalAttrs: { pname = "olvid"; - version = "1.5.0"; + version = "1.5.2"; dontUnpack = true; dontWrapGApps = true; src = fetchurl { url = "https://static.olvid.io/linux/${repo}-${finalAttrs.version}.tar.gz"; - hash = "sha256-iiMc9mM+uUVeS1i1gzXMZaMwSChdz7vNrL9uqJlR8NU="; + hash = "sha256-WjIOk3dPSXQdAR2fdXseV0NdOjld0PzyqnUx/VbvQio="; }; nativeBuildInputs = [ autoPatchelfHook makeBinaryWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/om/omnictl/package.nix b/third_party/nixpkgs/pkgs/by-name/om/omnictl/package.nix index 4f803fe356..9fa32bb169 100644 --- a/third_party/nixpkgs/pkgs/by-name/om/omnictl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/om/omnictl/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "omnictl"; - version = "0.32.2"; + version = "0.35.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-db/bYwMPrOZvD/YPtFaRK80yaYdsE70YPh0xQe0uVi4="; + hash = "sha256-y4kWIj7DDeUs521csW26w1K6esZMgvI4MQtgZAeOtlk="; }; - vendorHash = "sha256-uwzVUdA51eT9fi2Wr0ilNPMpXx430UIYYWXQa1hpzRM="; + vendorHash = "sha256-BYKIAgWR+PDJbDJ72PS6TDvpZx7yRaDJzbq0/b/MIKs="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/on/onagre/package.nix b/third_party/nixpkgs/pkgs/by-name/on/onagre/package.nix new file mode 100644 index 0000000000..2943e8f032 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/on/onagre/package.nix @@ -0,0 +1,58 @@ +{ lib +, fetchFromGitHub +, makeWrapper +, rustPlatform +, cmake +, pkgconf +, freetype +, expat +, wayland +, xorg +, libxkbcommon +, pop-launcher +, vulkan-loader +, libGL +}: + +rustPlatform.buildRustPackage rec { + pname = "onagre"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "onagre-launcher"; + repo = "onagre"; + rev = "1.1.0"; + hash = "sha256-ASeLvgj2RyhsZQtkUTYeA7jWyhbLg8yl6HbN2A/Sl2M="; + }; + + cargoHash = "sha256-17Hw3jtisOXwARpp0jB0hrNax7nzMWS0kCE3ZAruBj8="; + + nativeBuildInputs = [ makeWrapper cmake pkgconf ]; + buildInputs = [ + expat + freetype + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + ]; + + postFixup = let + rpath = lib.makeLibraryPath [ libGL vulkan-loader wayland libxkbcommon ]; + in '' + patchelf --set-rpath ${rpath} $out/bin/onagre + wrapProgram $out/bin/onagre \ + --prefix PATH ':' ${lib.makeBinPath [ + pop-launcher + ]} + ''; + + meta = with lib; { + description = "A general purpose application launcher for X and wayland inspired by rofi/wofi and alfred"; + homepage = "https://github.com/onagre-launcher/onagre"; + license = licenses.mit; + maintainers = [ maintainers.jfvillablanca maintainers.ilya-epifanov ]; + platforms = platforms.linux; + mainProgram = "onagre"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/on/onedriver/package.nix b/third_party/nixpkgs/pkgs/by-name/on/onedriver/package.nix index 348f4b658b..c4e3ba572d 100644 --- a/third_party/nixpkgs/pkgs/by-name/on/onedriver/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/on/onedriver/package.nix @@ -6,7 +6,8 @@ , glib , fuse , installShellFiles -, wrapGAppsHook +, wrapGAppsHook3 +, glib-networking , wrapperDir ? "/run/wrappers/bin" }: let @@ -24,8 +25,8 @@ buildGoModule { inherit pname version src; vendorHash = "sha256-OOiiKtKb+BiFkoSBUQQfqm4dMfDW3Is+30Kwcdg8LNA="; - nativeBuildInputs = [ pkg-config installShellFiles wrapGAppsHook ]; - buildInputs = [ webkitgtk_4_1 glib fuse ]; + nativeBuildInputs = [ pkg-config installShellFiles wrapGAppsHook3 ]; + buildInputs = [ webkitgtk_4_1 glib fuse glib-networking ]; ldflags = [ "-X github.com/jstaf/onedriver/cmd/common.commit=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/on/onevpl-intel-gpu/package.nix b/third_party/nixpkgs/pkgs/by-name/on/onevpl-intel-gpu/package.nix index 64e6f9d262..da1e611e8d 100644 --- a/third_party/nixpkgs/pkgs/by-name/on/onevpl-intel-gpu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/on/onevpl-intel-gpu/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "onevpl-intel-gpu"; - version = "23.4.3"; + version = "24.2.2"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "oneapi-src"; repo = "oneVPL-intel-gpu"; rev = "intel-onevpl-${version}"; - sha256 = "sha256-oDwDMUq6JpRJH5nbANb7TJLW7HRYA9y0xZxEsoepx/U="; + sha256 = "sha256-JtvRh4p4wPRnqFfE86tJW+yS9AKMoi3TPZO+LZ2Q7Mo="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-bin/package.nix index 8abf0909e6..4c9c0cd1e3 100644 --- a/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-bin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-bin/package.nix @@ -28,7 +28,7 @@ , nss , pulseaudio , qt5 -, wrapGAppsHook +, wrapGAppsHook3 , xkeyboard_config , xorg }: @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { autoPatchelfHook dpkg makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-bin_latest/package.nix b/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-bin_latest/package.nix index 4f3aaea95f..538e55b8bb 100644 --- a/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-bin_latest/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/on/onlyoffice-bin_latest/package.nix @@ -31,7 +31,7 @@ , nss , pulseaudio , qt5 -, wrapGAppsHook +, wrapGAppsHook3 , xkeyboard_config , xorg }: @@ -76,7 +76,7 @@ let autoPatchelfHook dpkg makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -164,7 +164,7 @@ in # Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. # Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them buildFHSEnv { - name = derivation.name; + inherit (derivation) pname version; targetPkgs = pkgs': [ curl @@ -175,7 +175,6 @@ buildFHSEnv { runScript = "/bin/onlyoffice-desktopeditors"; extraInstallCommands = '' - mv $out/bin/$name $out/bin/onlyoffice-desktopeditors mkdir -p $out/share ln -s ${derivation}/share/icons $out/share cp -r ${derivation}/share/applications $out/share diff --git a/third_party/nixpkgs/pkgs/by-name/op/open-scq30/package.nix b/third_party/nixpkgs/pkgs/by-name/op/open-scq30/package.nix index 12b709282f..7ab3452bd2 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/open-scq30/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/open-scq30/package.nix @@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec { pname = "open-scq30"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "Oppzippy"; repo = "OpenSCQ30"; rev = "v${version}"; - hash = "sha256-yls7F6ou0TsoY6CDi694fJrq30Y3B6d96T1VWl47K0w="; + hash = "sha256-DL2hYm1j27K0nnBvE3iGnguqm0m1k56bkuG+6+u4u4c="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Foundation ]; - cargoHash = "sha256-VxweKzXNWOrBrzLzId8D6O0tZG8bI7HjhD+GJ3vRyhk="; + cargoHash = "sha256-YBJd43xOCumQbrvzfV/+F63McYzHg1bGI3icgGzGZrQ="; INSTALL_PREFIX = placeholder "out"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/third_party/nixpkgs/pkgs/by-name/op/openasar/package.nix similarity index 54% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix rename to third_party/nixpkgs/pkgs/by-name/op/openasar/package.nix index dbb05162f1..a03e3205ff 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openasar/package.nix @@ -1,14 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, nodejs, bash, asar, unzip }: +{ + lib, + stdenv, + fetchFromGitHub, + unstableGitUpdater, + nodejs, + bash, + asar, + unzip, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openasar"; - version = "unstable-2023-10-24"; + version = "0-unstable-2024-01-13"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "eee9bab822e3dbd97a735d0050ddd41ba27917f2"; - hash = "sha256-SSWQSqGgTZjowgrzF6qHZDTw/Y9xFHNTZvetxqZubYI="; + rev = "4f264d860a5a6a32e1862ce26178b9cf6402335d"; + hash = "sha256-NPUUDqntsMxnT/RN5M9DtLDwJXDyjOED4GlXa1oU8l8="; }; postPatch = '' @@ -23,7 +32,7 @@ stdenv.mkDerivation rec { runHook preBuild bash scripts/injectPolyfills.sh - substituteInPlace src/index.js --replace 'nightly' '${version}' + substituteInPlace src/index.js --replace 'nightly' '${finalAttrs.version}' ${nodejs}/bin/node scripts/strip.js ${asar}/bin/asar pack src app.asar @@ -40,11 +49,19 @@ stdenv.mkDerivation rec { doCheck = false; + passthru.updateScript = unstableGitUpdater { + # Only has a "nightly" tag (untaged version 0.2 is latest) see https://github.com/GooseMod/OpenAsar/commit/8f79dcef9b1f7732421235a392f06e5bd7382659 + hardcodeZeroVersion = true; + }; + meta = with lib; { description = "Open-source alternative of Discord desktop's \"app.asar\"."; homepage = "https://openasar.dev"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = licenses.agpl3Only; + maintainers = with maintainers; [ + Scrumplex + jopejoe1 + ]; platforms = nodejs.meta.platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix index dff4e5988c..8e58c90dfd 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix @@ -12,18 +12,18 @@ , vulkan-loader , xorg -, nix-update-script +, unstableGitUpdater }: stdenv.mkDerivation { pname = "opencomposite"; - version = "unstable-2024-03-04"; + version = "0-unstable-2024-05-08"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "1bfdf67358add5f573efedbec1fa65d18b790e0e"; - hash = "sha256-qF5oMI9B5a1oE2gQb/scbom/39Efccja0pTPHHaHMA8="; + rev = "5ddd6024efafa82c7a432c9dd8a67e3d5c3f9b38"; + hash = "sha256-m6Xhi6xlDWiVqtYyxpQP2vp5JsB2EKsoXkmd0IYtPQ8="; }; nativeBuildInputs = [ @@ -52,8 +52,9 @@ stdenv.mkDerivation { runHook postInstall ''; - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch=openxr" ]; + passthru.updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; + branch = "openxr"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/op/openfga-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openfga-cli/package.nix new file mode 100644 index 0000000000..1cdbfaca78 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/openfga-cli/package.nix @@ -0,0 +1,55 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: + +let + pname = "openfga-cli"; + version = "0.4.0"; +in + +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "openfga"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-nwzUBzu8c8kuSTbjwOB1mCFMLF1zoUReXofXeBOAO1U="; + }; + + vendorHash = "sha256-3fElvsy248lRwmIKWv8ac6BLJ1y5Qyr+kKh/1vprmvo="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = + let + buildInfoPkg = "github.com/openfga/cli/internal/build"; + in + [ + "-s" + "-w" + "-X ${buildInfoPkg}.Version=${version}" + "-X ${buildInfoPkg}.Commit=${version}" + "-X ${buildInfoPkg}.Date=19700101" + ]; + + postInstall = '' + completions_dir=$TMPDIR/fga_completions + mkdir $completions_dir + $out/bin/fga completion bash > $completions_dir/fga.bash + $out/bin/fga completion zsh > $completions_dir/_fga.zsh + $out/bin/fga completion fish > $completions_dir/fga.fish + installShellCompletion $completions_dir/* + ''; + + meta = { + description = "A cross-platform CLI to interact with an OpenFGA server"; + homepage = "https://github.com/openfga/cli"; + license = lib.licenses.asl20; + mainProgram = "fga"; + maintainers = with lib.maintainers; [ jlesquembre ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/op/openfga/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openfga/package.nix new file mode 100644 index 0000000000..3b034bb116 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/openfga/package.nix @@ -0,0 +1,58 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: + +let + pname = "openfga"; + version = "1.5.3"; +in + +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "openfga"; + repo = "openfga"; + rev = "v${version}"; + hash = "sha256-+ECfBG0Z1XnopMPbq9jngcZ3lcSFOIomWo5iD0T1teQ="; + }; + + vendorHash = "sha256-MyoqdmNtpsoT08BKA9DPlpldIEXb82qzeXnW4KQXTiE="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = + let + buildInfoPkg = "github.com/openfga/openfga/internal/build"; + in + [ + "-s" + "-w" + "-X ${buildInfoPkg}.Version=${version}" + "-X ${buildInfoPkg}.Commit=${version}" + "-X ${buildInfoPkg}.Date=19700101" + ]; + + # Tests depend on docker + doCheck = false; + + postInstall = '' + completions_dir=$TMPDIR/openfga_completions + mkdir $completions_dir + $out/bin/openfga completion bash > $completions_dir/openfga.bash + $out/bin/openfga completion zsh > $completions_dir/_openfga.zsh + $out/bin/openfga completion fish > $completions_dir/openfga.fish + installShellCompletion $completions_dir/* + ''; + + meta = { + description = "A high performance and flexible authorization/permission engine built for developers and inspired by Google Zanzibar"; + homepage = "https://openfga.dev/"; + license = lib.licenses.asl20; + mainProgram = "openfga"; + maintainers = with lib.maintainers; [ jlesquembre ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix index ed81711d8f..76e61b6658 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "OpenPathGuidingLibrary"; - repo = finalAttrs.pname; + repo = "openpgl"; rev = "v${finalAttrs.version}"; hash = "sha256-dbHmGGiHQkU0KPpQYpY/o0uCWdb3L5namETdOcOREgs="; }; @@ -31,12 +31,12 @@ stdenv.mkDerivation (finalAttrs: { "-DTBB_ROOT=${tbb.out}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-flax-vector-conversions"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isAarch64 && !stdenv.isDarwin) "-flax-vector-conversions"; meta = { description = "Intel Open Path Guiding Library"; homepage = "https://github.com/OpenPathGuidingLibrary/openpgl"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.amarshall ]; license = lib.licenses.asl20; }; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openpomodoro-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openpomodoro-cli/package.nix new file mode 100644 index 0000000000..5e29d1e1c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/openpomodoro-cli/package.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "openpomodoro-cli"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "open-pomodoro"; + repo = "openpomodoro-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-h/o4yxrZ8ViHhN2JS0ZJMfvcJBPCsyZ9ZQw9OmKnOfY="; + }; + + vendorHash = "sha256-BR9d/PMQ1ZUYWSDO5ID2bkTN+A+VbaLTlz5t0vbkO60="; + + ldflags = [ + "-w" + "-s" + "-X=main.Version=${version}" + ]; + + meta = with lib; { + description = "A command-line Pomodoro tracker which uses the Open Pomodoro Format"; + homepage = "https://github.com/open-pomodoro/openpomodoro-cli"; + changelog = "https://github.com/open-pomodoro/openpomodoro-cli/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ gdifolco ]; + mainProgram = "openpomodoro-cli"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/op/openrocket/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openrocket/package.nix index 92b179bd36..b8d83dd8b3 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openrocket/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openrocket/package.nix @@ -4,6 +4,7 @@ , ant , jdk17 , makeWrapper +, stripJavaArchivesHook }: let @@ -25,6 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ant jdk makeWrapper + stripJavaArchivesHook ]; buildPhase = '' @@ -58,7 +60,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/openrocket/openrocket/releases/tag/${finalAttrs.src.rev}"; description = "Model-rocketry aerodynamics and trajectory simulation software"; - homepage = "openrocket.info"; + homepage = "https://openrocket.info"; license = lib.licenses.gpl3Plus; mainProgram = "openrocket"; maintainers = with lib.maintainers; [ tomasajt ]; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/package.nix index 4483d5271f..1e14580b42 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/package.nix @@ -34,7 +34,7 @@ , tbb_2021_11 , wayland , wayland-protocols -, wrapGAppsHook +, wrapGAppsHook3 , xorg }: let @@ -97,7 +97,7 @@ clangStdenv.mkDerivation rec { flex libsForQt5.qt5.wrapQtAppsHook llvmPackages.bintools - wrapGAppsHook + wrapGAppsHook3 ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/op/opensplat/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opensplat/package.nix new file mode 100644 index 0000000000..cd6052f536 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/opensplat/package.nix @@ -0,0 +1,89 @@ +{ + lib, + stdenv, + cmake, + ninja, + fetchFromGitHub, + fetchpatch, + python3, + opencv, + nlohmann_json, + nanoflann, + glm, + cxxopts, + config, + # Upstream has rocm/hip support, too. anyone? + cudaSupport ? config.cudaSupport, + cudaPackages, + autoAddDriverRunpath, +}: +let + version = "1.1.2"; + torch = python3.pkgs.torch.override { inherit cudaSupport; }; + # Using a normal stdenv with cuda torch gives + # ld: /nix/store/k1l7y96gv0nc685cg7i3g43i4icmddzk-python3.11-torch-2.2.1-lib/lib/libc10.so: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32' + stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv; +in +stdenv'.mkDerivation { + pname = "opensplat"; + inherit version; + + src = fetchFromGitHub { + owner = "pierotofy"; + repo = "OpenSplat"; + rev = "refs/tags/v${version}"; + hash = "sha256-3tk62b5fSf6wzuc5TwkdfAKgUMrw3ZxetCJa2RVMS/s="; + }; + + patches = [ + (fetchpatch { + name = "install-executables.patch"; + url = "https://github.com/pierotofy/OpenSplat/commit/b4c4176819b508978583b7ebf66306171807a8e6.patch"; + hash = "sha256-BUgPMcO3lt3ZEzv24u36k3aTEIoloOhxrCGi1KQ5Epk="; + }) + ]; + + postPatch = '' + # the two vendored gsplats are so heavily modified they may be considered a fork + find vendor ! -name 'gsplat*' -maxdepth 1 -mindepth 1 -exec rm -rf {} + + mkdir vendor/{nanoflann,glm} + ln -s ${glm}/include/glm vendor/glm/glm + ln -s ${nanoflann}/include/nanoflann.hpp vendor/nanoflann/nanoflann.hpp + ln -s ${nlohmann_json}/include/nlohmann vendor/json + ln -s ${cxxopts}/include/cxxopts.hpp vendor/cxxopts.hpp + ''; + + nativeBuildInputs = [ + cmake + ninja + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + autoAddDriverRunpath + ]; + + buildInputs = [ + nlohmann_json + torch.cxxdev + torch + opencv + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + ]; + + env.TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" python3.pkgs.torch.cudaCapabilities}"; + + cmakeFlags = [ + (lib.cmakeBool "CMAKE_SKIP_RPATH" true) + ] ++ lib.optionals cudaSupport [ + (lib.cmakeFeature "GPU_RUNTIME" "CUDA") + (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}/") + ]; + + meta = { + description = "Production-grade 3D gaussian splatting"; + homepage = "https://github.com/pierotofy/OpenSplat/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jcaesar ]; + platforms = lib.platforms.linux ++ lib.optionals (!cudaSupport) lib.platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/op/openswitcher/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openswitcher/package.nix index 569ed3597e..fb47a9f95a 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openswitcher/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openswitcher/package.nix @@ -9,7 +9,7 @@ , ninja , pkg-config , scdoc -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { ninja pkg-config scdoc - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openturns/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openturns/package.nix new file mode 100644 index 0000000000..152714133f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/openturns/package.nix @@ -0,0 +1,99 @@ +{ + lib, + boost, + ceres-solver, + cmake, + cminpack, + darwin, + dlib, + fetchFromGitHub, + fetchpatch, + hdf5, + hmat-oss, + ipopt, + libxml2, + nlopt, + pagmo2, + primesieve, + python3Packages, + spectra, + stdenv, + swig, + tbb, + # Boolean flags + runTests ? false, # tests take an hour to build on a 48-core machine + enablePython ? false, +}: + +let + inherit (darwin.apple_sdk.frameworks) Accelerate; +in +stdenv.mkDerivation (finalAttrs: { + pname = "openturns"; + version = "1.22"; + + src = fetchFromGitHub { + owner = "openturns"; + repo = "openturns"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ku3/mPoa1YJVJB99R/kWlOubIO+OZAiKfPqS/DrtJQk="; + }; + + nativeBuildInputs = [ + cmake + ] + ++ lib.optionals enablePython [ python3Packages.sphinx ]; + + buildInputs = [ + (lib.getLib primesieve) + boost + ceres-solver + cminpack + dlib + hdf5 + hmat-oss + ipopt + libxml2 + nlopt + pagmo2 + spectra + swig + tbb + ] + ++ lib.optionals enablePython [ + python3Packages.dill + python3Packages.matplotlib + python3Packages.psutil + python3Packages.python + ] + ++ lib.optionals stdenv.isDarwin [ + Accelerate + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_PYTHON" enablePython) + (lib.cmakeBool "CMAKE_UNITY_BUILD" true) + (lib.cmakeBool "USE_SPHINX" enablePython) + (lib.cmakeFeature "CMAKE_UNITY_BUILD_BATCH_SIZE" "32") + (lib.cmakeFeature "SWIG_COMPILE_FLAGS" "-O1") + (lib.cmakeOptionType "PATH" "OPENTURNS_SYSCONFIG_PATH" "$out/etc") + ]; + + checkTarget = lib.concatStringsSep " " [ + "tests" + "check" + ]; + + strictDeps = true; + + doCheck = runTests; + + meta = { + homepage = "https://openturns.github.io/www/"; + description = "Multivariate probabilistic modeling and uncertainty treatment library"; + changelog = "https://github.com/openturns/openturns/raw/v${finalAttrs.version}/ChangeLog"; + license = with lib.licenses; [ lgpl3Plus gpl3Plus ]; + maintainers = with lib.maintainers; [ gdinh ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/op/openvas-scanner/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openvas-scanner/package.nix index 85a60640d7..f20eaafd2f 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openvas-scanner/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.0.1"; + version = "23.2.1"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-pqbwi3btNEM+qiTqtjIxiDv2wMf1LerltFvLCybiW0Y="; + hash = "sha256-fP21F9SGT20sGPsQI5BxwQUCgZdLCBt+fsXutZu463k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvr/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openvr/package.nix similarity index 92% rename from third_party/nixpkgs/pkgs/development/libraries/openvr/default.nix rename to third_party/nixpkgs/pkgs/by-name/op/openvr/package.nix index 5bdb105490..418004909a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openvr/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openvr/package.nix @@ -7,17 +7,18 @@ , lib , libGL , stdenv +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "openvr"; - version = "2.2.3"; + version = "2.5.1"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "openvr"; rev = "v${finalAttrs.version}"; - hash = "sha256-Dpl88Te+EoVasoCtwERGrYt3xK8o03h15r8IVxxPPCw="; + hash = "sha256-bIKjZ7DvJVmDK386WgXaAFQrS0E1TNEUMhfQp7FNnvk="; }; patches = [ @@ -56,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DUSE_SYSTEM_JSONCPP=ON" "-DBUILD_SHARED=1" ]; + passthru.updateScript = nix-update-script { }; + meta = { broken = stdenv.isDarwin; description = "An API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/generic.nix b/third_party/nixpkgs/pkgs/by-name/op/openvswitch/generic.nix similarity index 74% rename from third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/generic.nix rename to third_party/nixpkgs/pkgs/by-name/op/openvswitch/generic.nix index ce800a7ba9..9833661ef5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/generic.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openvswitch/generic.nix @@ -1,32 +1,35 @@ -{ version -, hash -, updateScriptArgs ? "" +{ + version, + hash, + updateScriptArgs ? "", }: -{ lib -, stdenv -, fetchurl -, autoconf -, automake -, installShellFiles -, iproute2 -, kernel ? null -, libcap_ng -, libtool -, openssl -, perl -, pkg-config -, procps -, python3 -, sphinxHook -, util-linux -, which -, writeScript +{ + lib, + stdenv, + fetchurl, + autoconf, + automake, + installShellFiles, + iproute2, + kernel ? null, + libcap_ng, + libtool, + openssl, + perl, + pkg-config, + procps, + python3, + sphinxHook, + util-linux, + which, + writeScript, }: let _kernel = kernel; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "openvswitch"; inherit version; @@ -45,6 +48,9 @@ in stdenv.mkDerivation rec { patches = [ # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664) ./patches/disable-bash-arg-completion-test.patch + + # https://github.com/openvswitch/ovs/commit/9185793e75435d890f18d391eaaeab0ade6f1415 + ./patches/fix-python313.patch ]; nativeBuildInputs = [ @@ -56,9 +62,7 @@ in stdenv.mkDerivation rec { sphinxHook ]; - sphinxBuilders = [ - "man" - ]; + sphinxBuilders = [ "man" ]; sphinxRoot = "./Documentation"; @@ -78,7 +82,7 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" "--sharedstatedir=/var" "--sbindir=$(out)/bin" - ] ++ (lib.optionals (_kernel != null) ["--with-linux"]); + ] ++ (lib.optionals (_kernel != null) [ "--with-linux" ]); # Leave /var out of this! installFlags = [ @@ -102,13 +106,14 @@ in stdenv.mkDerivation rec { patchShebangs tests/ ''; - nativeCheckInputs = [ - iproute2 - ] ++ (with python3.pkgs; [ - netaddr - pyparsing - pytest - ]); + nativeCheckInputs = + [ iproute2 ] + ++ (with python3.pkgs; [ + netaddr + pyparsing + pytest + setuptools + ]); passthru.updateScript = writeScript "ovs-update.nu" '' ${./update.nu} ${updateScriptArgs} @@ -129,7 +134,11 @@ in stdenv.mkDerivation rec { ''; homepage = "https://www.openvswitch.org/"; license = licenses.asl20; - maintainers = with maintainers; [ netixx kmcopper ]; + maintainers = with maintainers; [ + adamcstephens + kmcopper + netixx + ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix b/third_party/nixpkgs/pkgs/by-name/op/openvswitch/lts.nix similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/lts.nix rename to third_party/nixpkgs/pkgs/by-name/op/openvswitch/lts.nix diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix b/third_party/nixpkgs/pkgs/by-name/op/openvswitch/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/default.nix rename to third_party/nixpkgs/pkgs/by-name/op/openvswitch/package.nix diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/patches/disable-bash-arg-completion-test.patch b/third_party/nixpkgs/pkgs/by-name/op/openvswitch/patches/disable-bash-arg-completion-test.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/patches/disable-bash-arg-completion-test.patch rename to third_party/nixpkgs/pkgs/by-name/op/openvswitch/patches/disable-bash-arg-completion-test.patch diff --git a/third_party/nixpkgs/pkgs/by-name/op/openvswitch/patches/fix-python313.patch b/third_party/nixpkgs/pkgs/by-name/op/openvswitch/patches/fix-python313.patch new file mode 100644 index 0000000000..0b68c0560d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/openvswitch/patches/fix-python313.patch @@ -0,0 +1,12 @@ +diff --git a/tests/vlog.at b/tests/vlog.at +index 785014956e7..efe91479a63 100644 +--- a/tests/vlog.at ++++ b/tests/vlog.at +@@ -8,6 +8,7 @@ AT_CHECK([$PYTHON3 $srcdir/test-vlog.py --log-file log_file \ + + AT_CHECK([sed -e 's/.*-.*-.*T..:..:..Z |//' \ + -e 's/File ".*", line [[0-9]][[0-9]]*,/File , line ,/' \ ++-e '/\^\+/d' \ + stderr_log], [0], [dnl + 0 | module_0 | EMER | emergency + 1 | module_0 | ERR | error diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/update.nu b/third_party/nixpkgs/pkgs/by-name/op/openvswitch/update.nu similarity index 81% rename from third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/update.nu rename to third_party/nixpkgs/pkgs/by-name/op/openvswitch/update.nu index 5d457dda5f..60e462f462 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/update.nu +++ b/third_party/nixpkgs/pkgs/by-name/op/openvswitch/update.nu @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -i nu -p nushell common-updater-scripts -def main [--lts: bool = false, --regex: string] { +def main [--lts = false, --regex: string] { let tags = list-git-tags --url=https://github.com/openvswitch/ovs | lines | sort --natural | str replace v '' let latest_tag = if $regex == null { $tags } else { $tags | find --regex $regex } | last @@ -9,9 +9,9 @@ def main [--lts: bool = false, --regex: string] { if $latest_tag != $current_version { if $lts { - update-source-version openvswitch-lts $latest_tag $"--file=(pwd)/pkgs/os-specific/linux/openvswitch/lts.nix" + update-source-version openvswitch-lts $latest_tag $"--file=(pwd)/pkgs/by-name/op/openvswitch/lts.nix" } else { - update-source-version openvswitch $latest_tag $"--file=(pwd)/pkgs/os-specific/linux/openvswitch/default.nix" + update-source-version openvswitch $latest_tag $"--file=(pwd)/pkgs/by-name/op/openvswitch/default.nix" } } diff --git a/third_party/nixpkgs/pkgs/by-name/or/orca/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/or/orca/fix-paths.patch new file mode 100644 index 0000000000..5f5feacb33 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/or/orca/fix-paths.patch @@ -0,0 +1,75 @@ +diff --git a/src/orca/debug.py b/src/orca/debug.py +index eb939a236..4e4db2e84 100644 +--- a/src/orca/debug.py ++++ b/src/orca/debug.py +@@ -522,7 +522,7 @@ def traceit(frame, event, arg): + return traceit + + def getOpenFDCount(pid): +- procs = subprocess.check_output([ 'lsof', '-w', '-Ff', '-p', str(pid)]) ++ procs = subprocess.check_output([ '@lsof@', '-w', '-Ff', '-p', str(pid)]) + procs = procs.decode('UTF-8').split('\n') + files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs)) + +@@ -540,7 +540,7 @@ def getCmdline(pid): + return cmdline + + def pidOf(procName): +- openFile = subprocess.Popen(f'pgrep {procName}', ++ openFile = subprocess.Popen(f'@pgrep@ {procName}', + shell=True, + stdout=subprocess.PIPE).stdout + pids = openFile.read() +diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in +index c6f99de14..2370204f3 100755 +--- a/src/orca/orca_bin.py.in ++++ b/src/orca/orca_bin.py.in +@@ -62,7 +62,7 @@ class ListApps(argparse.Action): + name = "[DEAD]" + + try: +- cmdline = subprocess.getoutput('cat /proc/%s/cmdline' % pid) ++ cmdline = subprocess.getoutput('@cat@ /proc/%s/cmdline' % pid) + except Exception: + cmdline = '(exception encountered)' + else: +@@ -195,7 +195,7 @@ def inGraphicalDesktop(): + def otherOrcas(): + """Returns the pid of any other instances of Orca owned by this user.""" + +- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(), ++ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(), + shell=True, + stdout=subprocess.PIPE).stdout + pids = openFile.read() +diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py +index c45cd4a5b..3f2ec59f0 100644 +--- a/src/orca/orca_modifier_manager.py ++++ b/src/orca/orca_modifier_manager.py +@@ -115,7 +115,7 @@ class OrcaModifierManager: + debug.printMessage(debug.LEVEL_INFO, msg, True) + + self.unset_orca_modifiers(reason) +- self._original_xmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-']) ++ self._original_xmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-']) + self._create_orca_xmodmap() + + def update_key_map(self, keyboard_event): +@@ -162,7 +162,7 @@ class OrcaModifierManager: + return + + self._caps_lock_cleared = False +- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], ++ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], + stdin=subprocess.PIPE, stdout=None, stderr=None) + p.communicate(self._original_xmodmap) + +@@ -223,7 +223,7 @@ class OrcaModifierManager: + if modified: + msg = "ORCA MODIFIER MANAGER: Updating xmodmap" + debug.printMessage(debug.LEVEL_INFO, msg, True) +- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], ++ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], + stdin=subprocess.PIPE, stdout=None, stderr=None) + p.communicate(bytes('\n'.join(lines), 'UTF-8')) + else: diff --git a/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix b/third_party/nixpkgs/pkgs/by-name/or/orca/package.nix similarity index 83% rename from third_party/nixpkgs/pkgs/applications/misc/orca/default.nix rename to third_party/nixpkgs/pkgs/by-name/or/orca/package.nix index dcb578dd56..edc89bbaf2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/or/orca/package.nix @@ -1,24 +1,20 @@ { lib , pkg-config , fetchurl -, buildPythonApplication -, autoreconfHook -, wrapGAppsHook +, meson +, ninja +, wrapGAppsHook3 , gobject-introspection , gettext , yelp-tools , itstool -, python -, pygobject3 +, python3 , gtk3 , gnome , substituteAll , at-spi2-atk , at-spi2-core -, pyatspi , dbus -, dbus-python -, pyxdg , xkbcomp , procps , lsof @@ -27,20 +23,18 @@ , speechd , brltty , liblouis -, setproctitle , gst_all_1 -, gst-python }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "orca"; - version = "45.2"; + version = "46.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "8PLFeaW+7f5WU7x/4kSBxNaqxd0fccHnoghZXzx473Y="; + hash = "sha256-z2deNQwYrA+ilDbGVZ0dqXX3///vqAjr5HbY+enRERQ="; }; patches = [ @@ -54,8 +48,9 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - autoreconfHook - wrapGAppsHook + meson + ninja + wrapGAppsHook3 pkg-config gettext yelp-tools @@ -63,13 +58,13 @@ buildPythonApplication rec { gobject-introspection ]; - pythonPath = [ + pythonPath = with python3.pkgs; [ pygobject3 - pyatspi dbus-python pyxdg brltty liblouis + psutil speechd gst-python setproctitle @@ -78,7 +73,7 @@ buildPythonApplication rec { strictDeps = false; buildInputs = [ - python + python3 gtk3 at-spi2-atk at-spi2-core @@ -89,6 +84,12 @@ buildPythonApplication rec { gst_all_1.gst-plugins-good ]; + dontWrapGApps = true; # Prevent double wrapping + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/third_party/nixpkgs/pkgs/by-name/or/orchard/package.nix b/third_party/nixpkgs/pkgs/by-name/or/orchard/package.nix index fb411f824b..f5996ccbbd 100644 --- a/third_party/nixpkgs/pkgs/by-name/or/orchard/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/or/orchard/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-mOlAMlvWEdkPxvhqrt7PHJjmtUBRsFwsSchHRQtaACc="; + hash = "sha256-rzfGECRa3IPt9LRX8Av7NabaIzaKfxzkOR85q9zl9sk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -19,7 +19,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-qqq1CKZm95pJ3u7/oHKhRL3ZIGN9LCRcnESE2w/DJrQ="; + vendorHash = "sha256-dVWCxEmqzJw9oN6mCwFVn81Mhq4XfBEM3iXHQn4NXko="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ot/oterm/package.nix b/third_party/nixpkgs/pkgs/by-name/ot/oterm/package.nix index 00c9d59417..c321aca862 100644 --- a/third_party/nixpkgs/pkgs/by-name/ot/oterm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ot/oterm/package.nix @@ -1,58 +1,58 @@ -{ lib -, python3Packages -, fetchFromGitHub +{ + lib, + python3Packages, + fetchFromGitHub, }: python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.2.6"; + version = "0.2.8"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; rev = "refs/tags/${version}"; - hash = "sha256-I/0U4lYqYZ6QCmWbDYhSOTCQ8o09W2cdd8kW7iN9iHU="; + hash = "sha256-6UFNsEc6bYBrBYfCbeiDfemueeRMEXHGCT8junZVFtk="; }; pythonRelaxDeps = [ "aiosqlite" - "pillow" "httpx" + "ollama" "packaging" + "pillow" + "typer" ]; + build-system = with python3Packages; [ poetry-core ]; + + nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; + propagatedBuildInputs = with python3Packages; [ - ollama - textual - typer - python-dotenv - httpx + aiohttp aiosql aiosqlite - pyperclip + httpx + ollama packaging - rich-pixels pillow - aiohttp + pyperclip + python-dotenv + rich-pixels + textual + typer ]; - nativeBuildInputs = with python3Packages; [ - poetry-core - pythonRelaxDepsHook - ]; - - pythonImportsCheck = [ - "oterm" - ]; + pythonImportsCheck = [ "oterm" ]; # Tests require a HTTP connection to ollama doCheck = false; meta = { - changelog = "https://github.com/ggozad/oterm/releases/tag/${version}"; description = "A text-based terminal client for Ollama"; homepage = "https://github.com/ggozad/oterm"; + changelog = "https://github.com/ggozad/oterm/releases/tag/${version}"; license = lib.licenses.mit; mainProgram = "oterm"; maintainers = with lib.maintainers; [ suhr ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pa/pablodraw/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/pablodraw/package.nix index 418b9a9c01..1f1d4ccd79 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/pablodraw/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/pablodraw/package.nix @@ -2,7 +2,7 @@ , buildDotnetModule , fetchFromGitHub , dotnetCorePackages -, wrapGAppsHook +, wrapGAppsHook3 , copyDesktopItems , gtk3 , libnotify @@ -35,7 +35,7 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; - nativeBuildInputs = [ wrapGAppsHook copyDesktopItems ]; + nativeBuildInputs = [ wrapGAppsHook3 copyDesktopItems ]; runtimeDeps = [ gtk3 libnotify ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pahole/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix rename to third_party/nixpkgs/pkgs/by-name/pa/pahole/package.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pahole/threading-reproducibility.patch b/third_party/nixpkgs/pkgs/by-name/pa/pahole/threading-reproducibility.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/pahole/threading-reproducibility.patch rename to third_party/nixpkgs/pkgs/by-name/pa/pahole/threading-reproducibility.patch diff --git a/third_party/nixpkgs/pkgs/by-name/pa/paper-age/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/paper-age/package.nix index cb8c0e3bde..3a2c20f95b 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/paper-age/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/paper-age/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "paper-age"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "matiaskorhonen"; repo = "paper-age"; rev = "v${version}"; - hash = "sha256-JlmiHnST/UnN4WsiDqSva+01odoc5h/J/mlGN3K0OfI="; + hash = "sha256-hrqjnZmcGUgFWn8Z85oJEbeUBaF2SccytMr1AG0GGos="; }; - cargoHash = "sha256-zdq036ag7+mvWg4OJHtbltPlF9j49dCPNJjgVQcQ+u4="; + cargoHash = "sha256-sFofS+POvJwGo/+tiF6dawKgQci/54tUKkQQalqT+K0="; meta = with lib; { description = "Easy and secure paper backups of secrets"; diff --git a/third_party/nixpkgs/pkgs/by-name/pa/paper-clip/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/paper-clip/package.nix index bd1d78b8e4..032bb9b5db 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/paper-clip/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/paper-clip/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "paper-clip"; - version = "5.0"; + version = "5.5"; src = fetchFromGitHub { owner = "Diego-Ivan"; repo = "Paper-Clip"; rev = "v${finalAttrs.version}"; - hash = "sha256-lkPX8S/0e7qEAfRiq0MyacDrqSWllncd9STxR7NKUFw="; + hash = "sha256-WCnWWVYaKq4U2RG3S4Xfja0NvreJIqU2VUJzpX7KI/E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/pa/paper-plane/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/paper-plane/package.nix index de900ef102..dcbee261c4 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/paper-plane/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/paper-plane/package.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , gtk4 -, wrapGAppsHook +, wrapGAppsHook3 , libadwaita , tdlib , rlottie @@ -35,7 +35,7 @@ let gtk4-paperplane = gtk4.overrideAttrs (prev: { patches = (prev.patches or []) ++ [ "${src}/build-aux/gtk-reversed-list.patch" ]; }); - wrapPaperPlaneHook = wrapGAppsHook.override { + wrapPaperPlaneHook = wrapGAppsHook3.override { gtk3 = gtk4-paperplane; }; # libadwaita has gtk4 in propagatedBuildInputs so it must be overrided diff --git a/third_party/nixpkgs/pkgs/by-name/pa/paperless-asn-qr-codes/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/paperless-asn-qr-codes/package.nix new file mode 100644 index 0000000000..1661d7a5a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pa/paperless-asn-qr-codes/package.nix @@ -0,0 +1,42 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "paperless-asn-qr-codes"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "entropia"; + repo = "paperless-asn-qr-codes"; + rev = "v${version}"; + hash = "sha256-/xCU6xDrmhkua4Iw/BCzhOuqO5GT/0rTJ+Y59wuMz6E="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "\"argparse\"," "" + ''; + + nativeBuildInputs = [ + python3.pkgs.hatch-vcs + python3.pkgs.hatchling + ]; + + propagatedBuildInputs = with python3.pkgs; [ + reportlab + reportlab-qrcode + ]; + + pythonImportsCheck = [ "paperless_asn_qr_codes" ]; + + meta = with lib; { + description = "Command line utility for generating ASN labels for paperless with both a human-readable representation, as well as a QR code for machine consumption"; + homepage = "https://github.com/entropia/paperless-asn-qr-codes"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ xanderio ]; + mainProgram = "paperless-asn-qr-codes"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/pa/papers/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/pa/papers/Cargo.lock new file mode 100644 index 0000000000..39f0481e5d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pa/papers/Cargo.lock @@ -0,0 +1,1251 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "anyhow" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "cairo-rs" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "bitflags", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "cc" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" + +[[package]] +name = "cfg-expr" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4" +version = "0.9.0" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk4-sys" +version = "0.9.0" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gettext-rs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gio" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "windows-sys", +] + +[[package]] +name = "glib" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "glib-sys" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "graphene-rs" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "glib", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "glib-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gsk4" +version = "0.9.0" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +dependencies = [ + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.9.0" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk4" +version = "0.9.0" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +dependencies = [ + "cairo-rs", + "field-offset", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gtk4-macros" +version = "0.9.0" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "gtk4-sys" +version = "0.9.0" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=master#4136ba2de5fc6190821ec1ec126ba3cf2d9db18e" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "indexmap" +version = "2.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libadwaita" +version = "0.7.0" +source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git?branch=master#9f9b3e8026f3cf7d7f1095fe5d0599f4fa78f625" +dependencies = [ + "gdk4", + "gio", + "glib", + "gtk4", + "libadwaita-sys", + "libc", + "pango", +] + +[[package]] +name = "libadwaita-sys" +version = "0.7.0" +source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git?branch=master#9f9b3e8026f3cf7d7f1095fe5d0599f4fa78f625" +dependencies = [ + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "pango" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "gio", + "glib", + "libc", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.20.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#8e5054e4daea31be1fe2843d4003a00ccc8b6451" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "papers" +version = "0.1.0" +dependencies = [ + "env_logger", + "gdk-pixbuf", + "gdk4", + "gettext-rs", + "gio", + "glib", + "gtk4", + "libadwaita", + "log", + "lru", + "papers-document", + "papers-shell", + "papers-view", +] + +[[package]] +name = "papers-document" +version = "0.1.0" +dependencies = [ + "bitflags", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libc", + "papers-document-sys", +] + +[[package]] +name = "papers-document-sys" +version = "0.0.1" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "shell-words", + "system-deps", + "tempfile", +] + +[[package]] +name = "papers-shell" +version = "0.1.0" +dependencies = [ + "bitflags", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libadwaita", + "libc", + "papers-document", + "papers-shell-sys", + "papers-view", +] + +[[package]] +name = "papers-shell-sys" +version = "0.0.1" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libadwaita-sys", + "libc", + "pango-sys", + "papers-document-sys", + "papers-view-sys", + "shell-words", + "system-deps", + "tempfile", +] + +[[package]] +name = "papers-view" +version = "0.1.0" +dependencies = [ + "bitflags", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libc", + "papers-document", + "papers-view-sys", +] + +[[package]] +name = "papers-view-sys" +version = "0.0.1" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "papers-document-sys", + "shell-words", + "system-deps", + "tempfile", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "temp-dir" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "toml" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.6", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.5", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] diff --git a/third_party/nixpkgs/pkgs/by-name/pa/papers/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/papers/package.nix new file mode 100644 index 0000000000..e599b4a779 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pa/papers/package.nix @@ -0,0 +1,133 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, appstream +, desktop-file-utils +, gtk4 +, glib +, pango +, atk +, gdk-pixbuf +, shared-mime-info +, itstool +, poppler +, ghostscriptX +, djvulibre +, libspectre +, libarchive +, libsecret +, wrapGAppsHook4 +, librsvg +, gobject-introspection +, yelp-tools +, gsettings-desktop-schemas +, dbus +, gi-docgen +, libgxps +, supportXPS ? true # Open XML Paper Specification via libgxps +, withLibsecret ? true +, libadwaita +, exempi +, cargo +, rustPlatform +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "papers"; + version = "45.0-unstable-2024-03-27"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME/Incubator"; + repo = "papers"; + rev = "4374535f4f5e5cea613b2df7b3dc99e97da27d99"; + hash = "sha256-wjLRGENJ+TjXV3JPn/lcqv3DonAsJrC0OiLs1DoNHkc="; + }; + + cargoRoot = "shell-rs"; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + + outputHashes = { + "cairo-rs-0.20.0" = "sha256-aCG9rh/tXqmcCIijuqJZJEgrGdG/IygcdWlvKYzVPhU="; + "gdk4-0.9.0" = "sha256-KYisC8nm6KVfowiKXtMoimXzB3UjHarH+2ZLhvW8oMU="; + "libadwaita-0.7.0" = "sha256-gfkaj/BIqvWj1UNVAGNNXww4aoJPlqvBwIRGmDiv48E="; + }; + }; + + nativeBuildInputs = [ + appstream + desktop-file-utils + gobject-introspection + gi-docgen + itstool + meson + ninja + pkg-config + wrapGAppsHook4 + yelp-tools + cargo + rustPlatform.cargoSetupHook + ]; + + buildInputs = [ + atk + dbus # only needed to find the service directory + djvulibre + exempi + gdk-pixbuf + ghostscriptX + glib + gtk4 + gsettings-desktop-schemas + libadwaita + libarchive + librsvg + libspectre + pango + poppler + ] ++ lib.optionals withLibsecret [ + libsecret + ] ++ lib.optionals supportXPS [ + libgxps + ]; + + mesonFlags = [ + "-Dnautilus=false" + "-Dps=enabled" + ] ++ lib.optionals (!withLibsecret) [ + "-Dkeyring=disabled" + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/papers"; + description = "GNOME's document viewer"; + + longDescription = '' + papers is a document viewer for multiple document formats. It + currently supports PDF, PostScript, DjVu, and TIFF (not DVI anymore). + The goal of papers is to replace the evince document viewer that exist + on the GNOME Desktop with a more modern interface. + ''; + + license = licenses.gpl2Plus; + platforms = platforms.unix; + mainProgram = "papers"; + maintainers = teams.gnome.members; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/pa/parallel-hashmap/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/parallel-hashmap/package.nix new file mode 100644 index 0000000000..767b760c92 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pa/parallel-hashmap/package.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "parallel-hashmap"; + version = "1.3.12"; + + src = fetchFromGitHub { + owner = "greg7mdp"; + repo = "parallel-hashmap"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-6KhzXUxa4WOsRrPmSSgguFxRGTOTIaxiJBFFSzOhch0="; + }; + + postPatch = '' + # don't download googletest, but build it from source + # https://github.com/greg7mdp/parallel-hashmap/blob/be6a2c79857c9ea76760ca6ce782e1609713428e/CMakeLists.txt#L98 + substituteInPlace CMakeLists.txt \ + --replace "include(cmake/DownloadGTest.cmake)" "add_subdirectory(${gtest.src} ./googletest-build EXCLUDE_FROM_ALL)" + ''; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DPHMAP_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DPHMAP_BUILD_EXAMPLES=OFF" + ]; + + nativeCheckInputs = [ + gtest + ]; + + doCheck = true; + + meta = with lib; { + description = "A family of header-only, very fast and memory-friendly hashmap and btree containers"; + homepage = "https://github.com/greg7mdp/parallel-hashmap"; + changelog = "https://github.com/greg7mdp/parallel-hashmap/releases/tag/${finalAttrs.src.rev}"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ natsukium ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/pa/parsedmarc/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/parsedmarc/package.nix new file mode 100644 index 0000000000..fab1e01e8b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pa/parsedmarc/package.nix @@ -0,0 +1,41 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +let + python = python3.override { + packageOverrides = self: super: { + # https://github.com/domainaware/parsedmarc/issues/464 + msgraph-core = super.msgraph-core.overridePythonAttrs (old: rec { + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "microsoftgraph"; + repo = "msgraph-sdk-python-core"; + rev = "v${version}"; + hash = "sha256-eRRlG3GJX3WeKTNJVWgNTTHY56qiUGOlxtvEZ2xObLA="; + }; + + nativeBuildInputs = with self; [ + flit-core + ]; + + propagatedBuildInputs = with self; [ + requests + ]; + + nativeCheckInputs = with self; [ + pytestCheckHook + responses + ]; + + disabledTestPaths = [ + "tests/integration" + ]; + + pythonImportsCheck = [ "msgraph.core" ]; + }); + }; + }; +in with python.pkgs; toPythonApplication parsedmarc diff --git a/third_party/nixpkgs/pkgs/by-name/pa/parsify/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/parsify/package.nix index b02c6c3ae0..b5c1227172 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/parsify/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/parsify/package.nix @@ -15,8 +15,6 @@ appimageTools.wrapType2 rec { extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${contents}/@parsifydesktop.desktop -t $out/share/applications substituteInPlace $out/share/applications/@parsifydesktop.desktop \ diff --git a/third_party/nixpkgs/pkgs/by-name/pa/passt/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/passt/package.nix index 3ce1715d2a..8a149b07a9 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/passt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/passt/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "passt"; - version = "2024_04_05.954589b"; + version = "2024_04_26.d03c4e2"; src = fetchurl { url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz"; - hash = "sha256-lwiHjr7rv1xBwXktKAsYIjDzNDkHGjZsW/FsQyFbLng="; + hash = "sha256-SE9ae4ewwgpGv+Mc1GwUsAi2VZS26Ne7Flvw1ggjb4U="; }; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/pa/patch2pr/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/patch2pr/package.nix index 67b5f227bc..488d2f8583 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/patch2pr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/patch2pr/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.22.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-tG0pSXmrWT5PCcR25XngbKAS3q9jKdDKqWdPqA62omE="; + hash = "sha256-ot/PECNRuhJUYX1woektKC6VEV+rLKiSnCVCLIRhSUo="; }; - vendorHash = "sha256-Z6BHUD7WrEpUmCaLvrFYCQCSbhPhee+gR5ep1oLzqbE="; + vendorHash = "sha256-K2qYfS0A1gOo2n3pBy00oLbd1/q/p5N8RoId+OP1Jmw="; ldflags = [ "-X main.version=${version}" diff --git a/third_party/nixpkgs/pkgs/by-name/pa/payme/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/payme/package.nix index 5465274e18..4dd5af7076 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/payme/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pa/payme/package.nix @@ -2,17 +2,18 @@ buildGoModule rec { pname = "payme"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "jovandeginste"; repo = "payme"; rev = "v${version}"; - hash = "sha256-2gZgmYgLaJQRQ+3VOUDnMm5QBjfKyxyutVf9NrbGO3g="; + hash = "sha256-LZyTwi4VCetIF39yc7WU3VR20DfFxfhDr3FvVQo7b/Q="; leaveDotGit = true; postFetch = '' cd "$out" git rev-parse HEAD > $out/COMMIT + TZ=UTC0 git show --quiet --date=iso-local --format=%cd > $out/BUILD_TIME find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; @@ -27,6 +28,7 @@ buildGoModule rec { preBuild = '' ldflags+=" -X main.gitCommit=$(cat COMMIT)" + ldflags+=" -X 'main.buildTime=$(cat BUILD_TIME)'" ''; meta = { diff --git a/third_party/nixpkgs/pkgs/by-name/pd/pdfannots/package.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdfannots/package.nix index 14672b3717..7a7cbeeeba 100644 --- a/third_party/nixpkgs/pkgs/by-name/pd/pdfannots/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pd/pdfannots/package.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { description = "Extracts and formats text annotations from a PDF file"; homepage = "https://github.com/0xabu/pdfannots"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "pdfannots"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdns-recursor/package.nix similarity index 94% rename from third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix rename to third_party/nixpkgs/pkgs/by-name/pd/pdns-recursor/package.nix index d56b4c7c03..e2ba9cf842 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/pd/pdns-recursor/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns-recursor"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2"; - hash = "sha256-AdFwooUOsqylAdaDijREE2WJmA1cssK1M5K3ZFnjjAc="; + hash = "sha256-1SqrEIoK2ei+HeIXmmk7uF6ZXGpNlYpQcC3Pee7I7yg="; }; cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/third_party/nixpkgs/pkgs/by-name/pe/peergos/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/peergos/package.nix index f91c8ea786..dc142f44ce 100644 --- a/third_party/nixpkgs/pkgs/by-name/pe/peergos/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pe/peergos/package.nix @@ -1,20 +1,19 @@ -{ lib -, stdenv -, fetchurl -, jre -, makeWrapper +{ + lib, + stdenv, + fetchurl, + jre, + makeWrapper, + nix-update-script, }: -let - version = "0.14.1"; - peergos = fetchurl { - url = "https://github.com/Peergos/web-ui/releases/download/v${version}/Peergos.jar"; - hash = "sha256-oCsUuFxTAL0vAabGggGhZHaF40A5TLfkT15HYPiKHlU="; - }; -in stdenv.mkDerivation rec { pname = "peergos"; - inherit version; + version = "0.17.0"; + src = fetchurl { + url = "https://github.com/Peergos/web-ui/releases/download/v${version}/Peergos.jar"; + hash = "sha256-sQPEKvtQDRQ4dF22tZjPhK7DLtDVAcudxoA4+GOeeZA="; + }; dontUnpack = true; dontBuild = true; @@ -24,21 +23,33 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -D ${peergos} $out/share/java/peergos.jar - makeWrapper ${lib.getExe jre} $out/bin/${pname} \ - --add-flags "-jar -Djava.library.path=native-lib $out/share/java/${pname}.jar" + install -D ${src} $out/share/java/peergos.jar + makeWrapper ${lib.getExe jre} $out/bin/peergos \ + --add-flags "-jar -Djava.library.path=native-lib $out/share/java/peergos.jar" runHook postInstall ''; - meta = with lib; { + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^(v[0-9.]+)$" + ]; + }; + + meta = { + changelog = "https://github.com/Peergos/web-ui/releases/tag/v${version}"; description = "A p2p, secure file storage, social network and application protocol"; - mainProgram = "peergos"; + downloadPage = "https://github.com/Peergos/web-ui"; homepage = "https://peergos.org/"; # peergos have agpt3 license, peergos-web-ui have gpl3, both are used - license = [ licenses.agpl3Only licenses.gpl3Only ]; - platforms = platforms.all; - maintainers = with maintainers; [ raspher ]; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = [ + lib.licenses.agpl3Only + lib.licenses.gpl3Only + ]; + mainProgram = "peergos"; + maintainers = with lib.maintainers; [ raspher ]; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/pe/perf_data_converter/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/perf_data_converter/package.nix index 18b6704877..22f6e5aa9a 100644 --- a/third_party/nixpkgs/pkgs/by-name/pe/perf_data_converter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pe/perf_data_converter/package.nix @@ -28,7 +28,7 @@ buildBazelPackage rec { ]; fetchAttrs = { - sha256 = "sha256-IauQ4zEn9YHppLgW+4XjPv4N5IZlEkp//tE/Dy7k28s="; + sha256 = "sha256-Qm6Ng9cXvKx043P7qyNHyyMvdGK9aNarX1ZKeCp3mgY="; }; nativeBuildInputs = [ jdk ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pg/pgagroal/package.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgagroal/package.nix index 8ba0803d96..72eb5c153a 100644 --- a/third_party/nixpkgs/pkgs/by-name/pg/pgagroal/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pg/pgagroal/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://agroal.github.io/pgagroal/"; changelog = "https://github.com/agroal/pgagroal/releases/tag/${finalAttrs.version}"; license = licenses.bsd3; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix index b65d5ca77b..cc415c4d8a 100644 --- a/third_party/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/dimitri/pgcopydb"; changelog = "https://github.com/dimitri/pgcopydb/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.postgresql; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; mainProgram = "pgcopydb"; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/by-name/pg/pgmoneta/package.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgmoneta/package.nix index da725b46e3..535eff92fb 100644 --- a/third_party/nixpkgs/pkgs/by-name/pg/pgmoneta/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pg/pgmoneta/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "pgmoneta"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = version; - hash = "sha256-gViXbL54YGY2NFg0ScyiarMB4vYjpOrdkyTjWzwP2vo="; + hash = "sha256-+2pS3KG5wwP7bnaV+x8WxvDvQuXqmiMbuLScMNLqBtI="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://pgmoneta.github.io/"; changelog = "https://github.com/pgmoneta/pgmoneta/releases/tag/${version}"; license = licenses.bsd3; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ph/phel/package.nix b/third_party/nixpkgs/pkgs/by-name/ph/phel/package.nix index 209f7bd8bb..a03d991478 100644 --- a/third_party/nixpkgs/pkgs/by-name/ph/phel/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ph/phel/package.nix @@ -5,16 +5,16 @@ php.buildComposerProject (finalAttrs: { pname = "phel"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "phel-lang"; repo = "phel-lang"; rev = "v${finalAttrs.version}"; - hash = "sha256-5PMd87Xp7i3Q1ryKQWJBmNbU5TGo2LQ6uvIFP3T36vk="; + hash = "sha256-EITeApaQ1nmQb53/DrSidcmWUACapjTUuUYuJQDML0Y="; }; - vendorHash = "sha256-83GX/dxHa6w1E34wnJshg7yxlVyRkDT5jmAPCCqPdtA="; + vendorHash = "sha256-IWFOpsPcrPg2/QWemRJ8tP6k0sIc2OogETdiBFAQ5BI="; doInstallCheck = true; postInstallCheck = '' diff --git a/third_party/nixpkgs/pkgs/by-name/ph/photocollage/package.nix b/third_party/nixpkgs/pkgs/by-name/ph/photocollage/package.nix index f02efb9f2e..46c6bedd77 100644 --- a/third_party/nixpkgs/pkgs/by-name/ph/photocollage/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ph/photocollage/package.nix @@ -4,7 +4,7 @@ , gettext , gdk-pixbuf , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ph/photonvision/package.nix b/third_party/nixpkgs/pkgs/by-name/ph/photonvision/package.nix index e36f5393bb..0efd253e14 100644 --- a/third_party/nixpkgs/pkgs/by-name/ph/photonvision/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ph/photonvision/package.nix @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { pname = "photonvision"; - version = "2024.2.3"; + version = "2024.3.1"; src = { "x86_64-linux" = fetchurl { url = "https://github.com/PhotonVision/photonvision/releases/download/v${version}/photonvision-v${version}-linuxx64.jar"; - hash = "sha256-45ae9sElAmN6++F9OGAvY/nUl/9UxvHtFxhetKVKfDc="; + hash = "sha256-t9drkGFA3IurZqWAkzEaONVJkp5JHMEFBBW50r+SD68="; }; "aarch64-linux" = fetchurl { url = "https://github.com/PhotonVision/photonvision/releases/download/v${version}/photonvision-v${version}-linuxarm64.jar"; - hash = "sha256-i/osKO+RAg2nFUPjBdkn3q0Id+uCSTiucfKFVVlEqgs="; + hash = "sha256-ninCVxse0x6lBA2NL3kwMeuHAeNzSa9rdP2dnmMNFgc="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/third_party/nixpkgs/pkgs/by-name/ph/phpdocumentor/package.nix b/third_party/nixpkgs/pkgs/by-name/ph/phpdocumentor/package.nix index d94b143a0c..e0eeef5935 100644 --- a/third_party/nixpkgs/pkgs/by-name/ph/phpdocumentor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ph/phpdocumentor/package.nix @@ -1,6 +1,7 @@ { lib , php , fetchFromGitHub +, makeBinaryWrapper }: php.buildComposerProject (finalAttrs: { @@ -19,6 +20,8 @@ php.buildComposerProject (finalAttrs: { # Needed because of the unbound version constraint on phpdocumentor/json-path composerStrictValidation = false; + nativeBuildInputs = [ makeBinaryWrapper ]; + installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/by-name/ph/phpunit/package.nix b/third_party/nixpkgs/pkgs/by-name/ph/phpunit/package.nix index e11c6812c4..47a29be92f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ph/phpunit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ph/phpunit/package.nix @@ -1,27 +1,30 @@ { lib , fetchFromGitHub +, nix-update-script , php }: php.buildComposerProject (finalAttrs: { pname = "phpunit"; - version = "11.1.1"; + version = "11.1.3"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; rev = finalAttrs.version; - hash = "sha256-aS2mQeE8WnEaTexl8qhhfGyi1MP48s6fjrTXkVLq1LU="; + hash = "sha256-Wq2k44WpUhDhSyIx8ofn/jUR7FS3zn2CCe4OiFKHXEA="; }; vendorHash = "sha256-kjMJCrMG08AXX662GAR5+V6w1+WOv8F9r6ONIOowP8Q="; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md"; description = "PHP Unit Testing framework"; homepage = "https://phpunit.de"; license = lib.licenses.bsd3; mainProgram = "phpunit"; - maintainers = [ lib.maintainers.onny lib.maintainers.patka ] ++ lib.teams.php.members; + maintainers = with lib.maintainers; [ onny patka ] ++ lib.teams.php.members; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pinact/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pinact/package.nix index a5cee76cd9..7e710c8f27 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/pinact/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/pinact/package.nix @@ -7,18 +7,18 @@ let pname = "pinact"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "suzuki-shunsuke"; repo = "pinact"; rev = "v${version}"; - hash = "sha256-OQo21RHk0c+eARKrA2qB4NAWWanb94DOZm4b9lqDz8o="; + hash = "sha256-ifUnF7u4/vMy89xb7sk4tPKQYdFBYAIHc0GYVBMWvWM="; }; in buildGoModule { inherit pname version src; - vendorHash = "sha256-g7rdIE+w/pn70i8fOmAo/QGjpla3AUWm7a9MOhNmrgE="; + vendorHash = "sha256-ht4eV62w9AWKYahrd83LmBI+Tu2Q64YA3t90N4BR1e4="; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pingtunnel/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pingtunnel/package.nix new file mode 100644 index 0000000000..826a562699 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pi/pingtunnel/package.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "pingtunnel"; + version = "2.8"; + + src = fetchFromGitHub { + owner = "esrrhs"; + repo = "pingtunnel"; + rev = version; + hash = "sha256-qkIeE6gNBUUd5/IhcKhDmXZbzeSTR0r6qCAK/Nz7Kew="; + }; + + vendorHash = "sha256-SkBHFvQn3Q6fl/d1npEspTYhq1YrnusXNWr/Ky4bv64="; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/pingtunnel + ''; + + meta = with lib; { + description = "A tool that send TCP/UDP traffic over ICMP"; + homepage = "https://github.com/esrrhs/pingtunnel"; + license = licenses.mit; + maintainers = with maintainers; [ oluceps ]; + mainProgram = "pingtunnel"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/pi/piv-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/piv-agent/package.nix index 283edba536..f29c4bdf43 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/piv-agent/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/piv-agent/package.nix @@ -35,7 +35,7 @@ buildGoModule rec { description = "An SSH and GPG agent which you can use with your PIV hardware security device (e.g. a Yubikey)"; homepage = "https://github.com/smlx/piv-agent"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "piv-agent"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pixi/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/pi/pixi/Cargo.lock index 7b274474d3..090963583b 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/pixi/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/pi/pixi/Cargo.lock @@ -135,9 +135,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "archspec" @@ -171,9 +171,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", "event-listener 5.3.0", @@ -202,11 +202,10 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand 2.0.2", @@ -316,7 +315,7 @@ checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -345,20 +344,20 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "async_http_range_reader" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf8eeab30c68da4dc2c51f3afc4327ab06fe0f3f028ca423f7ca398c7ed8c5e7" +checksum = "8561e6613f8361df8bed11c0eef05b98384643bc81f6b753eec7c1d91f097509" dependencies = [ "bisection", "futures", @@ -376,8 +375,8 @@ dependencies = [ [[package]] name = "async_zip" -version = "0.0.16" -source = "git+https://github.com/charliermarsh/rs-async-zip?rev=d76801da0943de985254fc6255c0e476b57c5836#d76801da0943de985254fc6255c0e476b57c5836" +version = "0.0.17" +source = "git+https://github.com/charliermarsh/rs-async-zip?rev=1dcb40cfe1bf5325a6fd4bfcf9894db40241f585#1dcb40cfe1bf5325a6fd4bfcf9894db40241f585" dependencies = [ "async-compression", "crc32fast", @@ -450,6 +449,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "bincode" version = "1.3.3" @@ -572,9 +577,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecheck" @@ -633,9 +638,9 @@ dependencies = [ [[package]] name = "cacache" -version = "12.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142316461ed3a3dfcba10417317472da5bfd0461e4d276bf7c07b330766d9490" +checksum = "a61ff12b19d89c752c213316b87fdb4a587f073d219b893cc56974b8c9f39bf7" dependencies = [ "digest", "either", @@ -661,7 +666,7 @@ dependencies = [ [[package]] name = "cache-key" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "hex", "seahash", @@ -708,9 +713,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.91" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd97381a8cc6493395a5afc4c691c1084b3768db713b73aa215217aa245d153" +checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" dependencies = [ "jobserver", "libc", @@ -740,9 +745,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -750,7 +755,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -797,9 +802,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" +checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" dependencies = [ "clap", ] @@ -813,7 +818,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -976,7 +981,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -987,7 +992,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1104,7 +1109,7 @@ dependencies = [ [[package]] name = "distribution-filename" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "pep440_rs", "platform-tags", @@ -1118,7 +1123,7 @@ dependencies = [ [[package]] name = "distribution-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "cache-key", @@ -1151,9 +1156,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "elsa" @@ -1172,9 +1177,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1197,7 +1202,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1209,7 +1214,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1230,7 +1235,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1510,7 +1515,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1621,25 +1626,6 @@ dependencies = [ "regex-syntax 0.8.3", ] -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -1720,9 +1706,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1731,20 +1717,32 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", "pin-project-lite", ] [[package]] name = "http-cache" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5ab65432bbdfe8490dfde21d0366353a8d39f2bc24aca0146889f931b0b4b5" +checksum = "d6ffb12b95bb2a369fe47ca8924016c72c2fa0e6059ba98bd1516f558696c5a8" dependencies = [ "async-trait", "bincode", @@ -1758,9 +1756,9 @@ dependencies = [ [[package]] name = "http-cache-reqwest" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8285341ce7e709c56a0f259ff1c789c70edfbaa88acd69d27e4d63980b92dc" +checksum = "be3e27c4e2e510571cbcc601407b639667146aa9a4e818d5cc1d97c8b4b27d61" dependencies = [ "anyhow", "async-trait", @@ -1770,15 +1768,14 @@ dependencies = [ "reqwest", "reqwest-middleware", "serde", - "task-local-extensions", "url", ] [[package]] name = "http-cache-semantics" -version = "1.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aec9f678bca3f4a15194b980f20ed9bfe0dd38e8d298c65c559a93dfbd6380a" +checksum = "92baf25cf0b8c9246baecf3a444546360a97b569168fdf92563ee6a47829920c" dependencies = [ "http", "http-serde", @@ -1794,9 +1791,9 @@ checksum = "9f0d1a8ef218a86416107794b34cc446958d9203556c312bb41eab4c924c1d2e" [[package]] name = "http-serde" -version = "1.1.3" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" +checksum = "1133cafcce27ea69d35e56b3a8772e265633e04de73c5f4e1afdffc1d19b5419" dependencies = [ "http", "serde", @@ -1837,53 +1834,74 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.6", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", "http", "hyper", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", + "http-body-util", "hyper", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.6", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2000,7 +2018,7 @@ dependencies = [ [[package]] name = "install-wheel-rs" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "configparser", "csv", @@ -2090,9 +2108,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "685a7d121ee3f65ae4fddd72b25a04bb36b6af81bc0828f7d5434c0fe60fa3a2" dependencies = [ "libc", ] @@ -2162,7 +2180,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -2198,7 +2216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2405,7 +2423,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -2416,7 +2434,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -2425,21 +2443,11 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "minijinja" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb3bf58a1ec4f3f228bec851a2066c7717ad308817cd8a08f67c10660c6ff7b" +checksum = "fb5c5e3d2b4c0a6832bd3d571f7c19a7c1c1f05f11a6e85ae1a29f76be5f9455" dependencies = [ "serde", ] @@ -2573,9 +2581,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" dependencies = [ "num-bigint", "num-complex", @@ -2680,7 +2688,7 @@ dependencies = [ [[package]] name = "once-map" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "dashmap", "tokio", @@ -2721,7 +2729,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -2800,7 +2808,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -2875,6 +2883,15 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "path-absolutize" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" +dependencies = [ + "path-dedot", +] + [[package]] name = "path-dedot" version = "3.1.1" @@ -2893,10 +2910,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pep440_rs" version = "0.5.0" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "once_cell", - "pubgrub", "rkyv", "serde", "unicode-width", @@ -2906,7 +2922,7 @@ dependencies = [ [[package]] name = "pep508_rs" version = "0.4.2" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "derivative", "once_cell", @@ -2966,7 +2982,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "unicase", ] @@ -2997,7 +3013,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -3025,7 +3041,7 @@ dependencies = [ [[package]] name = "pixi" -version = "0.19.1" +version = "0.20.0" dependencies = [ "assert_matches", "async-once-cell", @@ -3078,7 +3094,7 @@ dependencies = [ "requirements-txt", "reqwest", "reqwest-middleware", - "reqwest-retry 0.4.0", + "reqwest-retry", "rstest", "self-replace", "serde", @@ -3098,20 +3114,22 @@ dependencies = [ "tokio", "tokio-util", "toml", - "toml_edit 0.22.9", + "toml_edit 0.22.11", "tracing", "tracing-subscriber", "url", "uv-build", "uv-cache", "uv-client", + "uv-configuration", "uv-dispatch", "uv-distribution", + "uv-git", "uv-installer", "uv-interpreter", "uv-normalize", "uv-resolver", - "uv-traits", + "uv-types", "xxhash-rust", "zip", ] @@ -3124,9 +3142,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platform-info" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6259c4860e53bf665016f1b2f46a8859cadfa717581dc9d597ae4069de6300f" +checksum = "d5ff316b9c4642feda973c18f0decd6c8b0919d4722566f6e4337cce0dd88217" dependencies = [ "libc", "winapi", @@ -3135,7 +3153,7 @@ dependencies = [ [[package]] name = "platform-tags" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "rustc-hash", "serde", @@ -3228,9 +3246,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -3243,7 +3261,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "version_check", "yansi", ] @@ -3271,7 +3289,7 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=e981e4dfe315582e84e2fd724832fb0e0c50b7aa#e981e4dfe315582e84e2fd724832fb0e0c50b7aa" +source = "git+https://github.com/astral-sh/pubgrub?rev=c26e485213e39582c6f2e4d45c0328422670e7a7#c26e485213e39582c6f2e4d45c0328422670e7a7" dependencies = [ "indexmap 2.2.6", "log", @@ -3298,9 +3316,10 @@ dependencies = [ [[package]] name = "pypi-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "chrono", + "indexmap 2.2.6", "mailparse", "once_cell", "pep440_rs", @@ -3309,6 +3328,7 @@ dependencies = [ "rkyv", "serde", "thiserror", + "toml", "tracing", "url", "uv-normalize", @@ -3338,9 +3358,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3389,12 +3409,11 @@ dependencies = [ [[package]] name = "rattler" -version = "0.20.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cf17592e2097c40bb78458d5894cd0c4f4e54fa3c7e48a4ca2cdc09bf48d18f" +checksum = "4c954c00bfef8915def6b043db4d61d4d61a4436c89382915839c4360424a02e" dependencies = [ "anyhow", - "async-compression", "bytes", "chrono", "clap", @@ -3403,31 +3422,25 @@ dependencies = [ "fs-err", "futures", "fxhash", - "hex", "indexmap 2.2.6", "itertools", "memchr", "memmap2 0.9.4", - "nom", "once_cell", - "pin-project-lite", "rattler_conda_types", "rattler_digest", "rattler_networking", "rattler_package_streaming", + "rattler_shell", "reflink-copy", "regex", "reqwest", "reqwest-middleware", - "serde", - "serde_json", - "serde_with", "smallvec", "tempfile", "thiserror", "tokio", "tokio-stream", - "tokio-util", "tracing", "url", "uuid", @@ -3435,15 +3448,14 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.20.5" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22355c9ca09dcba831e8530c09787516d29ebfdd78eebd6e3157cdffa9ebde70" +checksum = "15c4109edd67464a8f43c3a68b031df0f92c8efe89b3d1cf09fdc407cd90abae" dependencies = [ "chrono", "fxhash", "glob", "hex", - "indexmap 2.2.6", "itertools", "lazy-regex", "nom", @@ -3455,7 +3467,6 @@ dependencies = [ "serde_json", "serde_repr", "serde_with", - "serde_yaml", "smallvec", "strum", "thiserror", @@ -3465,9 +3476,9 @@ dependencies = [ [[package]] name = "rattler_digest" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a15f14fa0e0fdf3fbacabd21d66a3d6b15af5c7c0cda2e0e29bd6605dec4569" +checksum = "fe7143db952a9256f187ec5f69d6289c87d51b73e591cb21c653034b06fb0de7" dependencies = [ "blake2", "digest", @@ -3481,9 +3492,9 @@ dependencies = [ [[package]] name = "rattler_lock" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf007f6e5a6f27ae33d15185a72c198e4662bf38be53c30ceea8b86a504c8ff" +checksum = "2b6c653f0af03d910a09e8c2d2938da6462c1218518760d3c88eddb776221d57" dependencies = [ "chrono", "fxhash", @@ -3495,7 +3506,6 @@ dependencies = [ "rattler_conda_types", "rattler_digest", "serde", - "serde-json-python-formatter", "serde_json", "serde_with", "serde_yaml", @@ -3505,23 +3515,23 @@ dependencies = [ [[package]] name = "rattler_macros" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6c3aedd4fa6a50b41be9537c8abc7190ae24f1b0add0ab722275fa0ec8d6d" +checksum = "10cef20e8356ea6840294e5754c6a8663b0eb1b97f29d517642f0f99215a2483" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "rattler_networking" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235b836c1acac144780e2255d8b514fd89d3f7e5e865553f22ff0cc2a5744d21" +checksum = "4586c089e479cfb541d81db67cd8b43e0036507ffbf536e1d393e8147aa685c6" dependencies = [ "anyhow", "async-trait", - "base64 0.21.7", + "base64 0.22.0", "chrono", "dirs", "fslock", @@ -3529,16 +3539,12 @@ dependencies = [ "http", "itertools", "keyring", - "lazy_static", - "libc", "netrc-rs", - "once_cell", "reqwest", "reqwest-middleware", - "retry-policies 0.3.0", + "retry-policies", "serde", "serde_json", - "task-local-extensions", "thiserror", "tracing", "url", @@ -3546,14 +3552,13 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.20.2" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ab40c7851026ce066437a7aa8f41bd855631de1df7119cd6c4592f5e7c8761" +checksum = "4761292a1fb0346ad20a76c81da1261454bf87a4993935506b220429d8e2b63c" dependencies = [ "bzip2", "chrono", "futures-util", - "itertools", "num_cpus", "rattler_conda_types", "rattler_digest", @@ -3573,9 +3578,9 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.19.5" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5a431bebc785418239234de099d93c762f36ee9eccc25fb771e66f7e67dc478" +checksum = "6f450d02a301c9da95b6f48d8fe29a921af036bb43553eee0b58b390dba70219" dependencies = [ "anyhow", "async-compression", @@ -3589,7 +3594,6 @@ dependencies = [ "itertools", "json-patch", "libc", - "md-5", "memmap2 0.9.4", "ouroboros", "pin-project-lite", @@ -3613,9 +3617,9 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.19.6" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0786444f12ae6ad5a159a4c5cdca90a8fab06d45998da04e176d3cd1eee0757" +checksum = "df3d2cc94dc0b26d871688be08bc72d8d24a69cafdf408adf7a1c4dab9dc32e4" dependencies = [ "enum_dispatch", "indexmap 2.2.6", @@ -3631,19 +3635,16 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "0.20.5" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c04b27a7c16d0be56a398236a08575c5180752a07de9b86fa9ae5ccae59326" +checksum = "5ecc29d71862c0b9307a18c8dc8dcddb6042715f26d44085f950426e8b2ef65b" dependencies = [ - "anyhow", "chrono", "futures", - "hex", "itertools", "rattler_conda_types", "rattler_digest", "resolvo", - "serde", "tempfile", "thiserror", "tracing", @@ -3652,12 +3653,11 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "0.19.6" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078daeab0c71d739969e28b280bd58450b85e9d360b75feedd23e2b6613b531" +checksum = "0a0ce73b5939df90e9f968d3d3751e97314bc030bc35ee084e6e292a1e27690a" dependencies = [ "archspec", - "cfg-if", "libloading", "nom", "once_cell", @@ -3729,13 +3729,13 @@ dependencies = [ [[package]] name = "reflink-copy" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52b1349400e2ffd64a9fb5ed9008e33c0b8ef86bd5bae8f73080839c7082f1d5" +checksum = "4dea9fb2ba3bcc8c51607906e56fe392ba2eb9947dcc84597f26d73f56877c66" dependencies = [ "cfg-if", "rustix 0.38.32", - "windows 0.54.0", + "windows 0.56.0", ] [[package]] @@ -3800,9 +3800,8 @@ dependencies = [ [[package]] name = "requirements-txt" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ - "async-recursion", "fs-err", "pep508_rs", "regex", @@ -3811,6 +3810,7 @@ dependencies = [ "unscanny", "url", "uv-client", + "uv-configuration", "uv-fs", "uv-normalize", "uv-warnings", @@ -3818,27 +3818,27 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" dependencies = [ "async-compression", - "base64 0.21.7", + "base64 0.22.0", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-rustls", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", "mime", - "mime_guess", "native-tls", "once_cell", "percent-encoding", @@ -3846,11 +3846,11 @@ dependencies = [ "rustls", "rustls-native-certs", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", @@ -3867,24 +3867,24 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" +checksum = "0209efb52486ad88136190094ee214759ef7507068b27992256ed6610eb71a01" dependencies = [ "anyhow", "async-trait", "http", "reqwest", "serde", - "task-local-extensions", "thiserror", + "tower-service", ] [[package]] name = "reqwest-retry" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9af20b65c2ee9746cc575acb6bd28a05ffc0d15e25c992a8f4462d8686aacb4f" +checksum = "40f342894422862af74c50e1e9601cf0931accc9c6981e5eb413c46603b616b5" dependencies = [ "anyhow", "async-trait", @@ -3896,31 +3896,7 @@ dependencies = [ "parking_lot 0.11.2", "reqwest", "reqwest-middleware", - "retry-policies 0.2.1", - "task-local-extensions", - "tokio", - "tracing", - "wasm-timer", -] - -[[package]] -name = "reqwest-retry" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadced6a67c5c2d1c819cc2d7e6ddf066f32b9b6a04f8866203ceeb44b79c37f" -dependencies = [ - "anyhow", - "async-trait", - "chrono", - "futures", - "getrandom", - "http", - "hyper", - "parking_lot 0.11.2", - "reqwest", - "reqwest-middleware", - "retry-policies 0.3.0", - "task-local-extensions", + "retry-policies", "tokio", "tracing", "wasm-timer", @@ -3941,17 +3917,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "retry-policies" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd" -dependencies = [ - "anyhow", - "chrono", - "rand", -] - [[package]] name = "retry-policies" version = "0.3.0" @@ -4009,9 +3974,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -4020,9 +3985,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "938a142ab806f18b88a97b0dea523d39e0fd730a064b035726adcfc58a8a5188" dependencies = [ "byteorder", "rmp", @@ -4031,9 +3996,9 @@ dependencies = [ [[package]] name = "rstest" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" +checksum = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330" dependencies = [ "futures", "futures-timer", @@ -4043,9 +4008,9 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" +checksum = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25" dependencies = [ "cfg-if", "glob", @@ -4054,7 +4019,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.58", + "syn 2.0.60", "unicode-ident", ] @@ -4117,44 +4082,55 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" dependencies = [ "log", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", "rustls-pemfile", + "rustls-pki-types", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", + "rustls-pki-types", ] [[package]] -name = "rustls-webpki" -version = "0.101.7" +name = "rustls-pki-types" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" + +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] @@ -4194,16 +4170,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "seahash" version = "4.1.0" @@ -4271,22 +4237,13 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-json-python-formatter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db62ee54077c67a8cff258c919175f0b3cb78d2b6dcafb0d166ff98dcb21aa5d" -dependencies = [ - "serde_json", -] - [[package]] name = "serde-untagged" version = "0.1.5" @@ -4299,20 +4256,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "indexmap 2.2.6", "itoa", @@ -4322,13 +4279,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -4379,7 +4336,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -4417,7 +4374,7 @@ checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -4647,7 +4604,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -4696,9 +4653,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -4737,9 +4694,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.8" +version = "0.30.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b1a378e48fb3ce3a5cf04359c456c9c98ff689bcf1c1bc6e6a31f247686f275" +checksum = "87341a165d73787554941cd5ef55ad728011566fe714e987d1b976c15dbc3a83" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4750,27 +4707,6 @@ dependencies = [ "windows 0.52.0", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tabwriter" version = "1.4.0" @@ -4797,15 +4733,6 @@ dependencies = [ "xattr", ] -[[package]] -name = "task-local-extensions" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" -dependencies = [ - "pin-utils", -] - [[package]] name = "tempfile" version = "3.10.1" @@ -4856,7 +4783,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -4871,9 +4798,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -4892,9 +4819,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -4947,7 +4874,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -4962,11 +4889,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] @@ -5021,7 +4949,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.11", ] [[package]] @@ -5046,17 +4974,39 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "fb686a972ccef8537b39eead3968b0e8616cb5040dbb9bba93007c8e07c9215f" dependencies = [ "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.6", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -5069,6 +5019,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5082,7 +5033,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -5259,15 +5210,15 @@ dependencies = [ [[package]] name = "uv-auth" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "async-trait", - "base64 0.21.7", + "base64 0.22.0", + "http", "once_cell", "reqwest", "reqwest-middleware", "rust-netrc", - "task-local-extensions", "thiserror", "tracing", "url", @@ -5277,7 +5228,7 @@ dependencies = [ [[package]] name = "uv-build" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "distribution-types", @@ -5296,16 +5247,17 @@ dependencies = [ "tokio", "toml", "tracing", + "uv-configuration", "uv-fs", "uv-interpreter", - "uv-traits", + "uv-types", "uv-virtualenv", ] [[package]] name = "uv-cache" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "cache-key", "cachedir", @@ -5328,7 +5280,7 @@ dependencies = [ [[package]] name = "uv-client" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "async-trait", @@ -5349,16 +5301,12 @@ dependencies = [ "pypi-types", "reqwest", "reqwest-middleware", - "reqwest-retry 0.3.0", + "reqwest-retry", "rkyv", "rmp-serde", - "rustc-hash", - "rustls", - "rustls-native-certs", "serde", "serde_json", "sys-info", - "task-local-extensions", "tempfile", "thiserror", "tl", @@ -5369,21 +5317,36 @@ dependencies = [ "urlencoding", "uv-auth", "uv-cache", + "uv-configuration", "uv-fs", "uv-normalize", "uv-version", "uv-warnings", - "webpki-roots", +] + +[[package]] +name = "uv-configuration" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +dependencies = [ + "anyhow", + "itertools", + "pep508_rs", + "rustc-hash", + "serde", + "serde_json", + "uv-normalize", ] [[package]] name = "uv-dispatch" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "distribution-types", "futures", + "install-wheel-rs", "itertools", "pep508_rs", "rustc-hash", @@ -5391,16 +5354,17 @@ dependencies = [ "uv-build", "uv-cache", "uv-client", + "uv-configuration", "uv-installer", "uv-interpreter", "uv-resolver", - "uv-traits", + "uv-types", ] [[package]] name = "uv-distribution" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "cache-key", @@ -5409,7 +5373,9 @@ dependencies = [ "fs-err", "futures", "install-wheel-rs", + "md-5", "nanoid", + "once_cell", "pep440_rs", "pep508_rs", "platform-tags", @@ -5419,6 +5385,7 @@ dependencies = [ "rmp-serde", "rustc-hash", "serde", + "sha2", "tempfile", "thiserror", "tokio", @@ -5427,25 +5394,29 @@ dependencies = [ "url", "uv-cache", "uv-client", + "uv-configuration", "uv-extract", "uv-fs", "uv-git", "uv-normalize", - "uv-traits", + "uv-types", "zip", ] [[package]] name = "uv-extract" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "async-compression", "async_zip", "fs-err", "futures", + "md-5", + "pypi-types", "rayon", "rustc-hash", + "sha2", "thiserror", "tokio", "tokio-tar", @@ -5457,7 +5428,7 @@ dependencies = [ [[package]] name = "uv-fs" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "backoff", "dunce", @@ -5466,6 +5437,7 @@ dependencies = [ "fs2", "junction", "once_cell", + "path-absolutize", "tempfile", "tokio", "tracing", @@ -5476,10 +5448,10 @@ dependencies = [ [[package]] name = "uv-git" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", - "base64 0.21.7", + "base64 0.22.0", "cache-key", "cargo-util", "fs-err", @@ -5499,7 +5471,7 @@ dependencies = [ [[package]] name = "uv-installer" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "async-channel", @@ -5511,9 +5483,9 @@ dependencies = [ "pep508_rs", "platform-tags", "pypi-types", - "pyproject-toml", "rayon", "requirements-txt", + "rmp-serde", "rustc-hash", "serde", "tempfile", @@ -5524,12 +5496,13 @@ dependencies = [ "url", "uv-cache", "uv-client", + "uv-configuration", "uv-distribution", "uv-extract", "uv-fs", "uv-interpreter", "uv-normalize", - "uv-traits", + "uv-types", "uv-warnings", "walkdir", ] @@ -5537,7 +5510,7 @@ dependencies = [ [[package]] name = "uv-interpreter" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "cache-key", "configparser", @@ -5558,6 +5531,7 @@ dependencies = [ "tracing", "uv-cache", "uv-fs", + "uv-toolchain", "which", "winapi", ] @@ -5565,7 +5539,7 @@ dependencies = [ [[package]] name = "uv-normalize" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "rkyv", "serde", @@ -5574,7 +5548,7 @@ dependencies = [ [[package]] name = "uv-resolver" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anstream", "anyhow", @@ -5587,6 +5561,7 @@ dependencies = [ "either", "futures", "indexmap 2.2.6", + "install-wheel-rs", "itertools", "once-map", "once_cell", @@ -5600,6 +5575,7 @@ dependencies = [ "requirements-txt", "rkyv", "rustc-hash", + "textwrap", "thiserror", "tokio", "tokio-stream", @@ -5607,38 +5583,70 @@ dependencies = [ "url", "uv-cache", "uv-client", + "uv-configuration", "uv-distribution", "uv-interpreter", "uv-normalize", - "uv-traits", + "uv-types", "uv-warnings", ] [[package]] -name = "uv-traits" +name = "uv-toolchain" +version = "0.1.0" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" +dependencies = [ + "anyhow", + "fs-err", + "futures", + "once_cell", + "pep440_rs", + "pep508_rs", + "reqwest", + "reqwest-middleware", + "tempfile", + "thiserror", + "tokio", + "tokio-util", + "tracing", + "url", + "uv-client", + "uv-extract", + "uv-fs", +] + +[[package]] +name = "uv-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anyhow", "distribution-types", + "itertools", "once-map", + "pep440_rs", "pep508_rs", + "pypi-types", + "rustc-hash", "serde", "serde_json", + "thiserror", + "url", "uv-cache", + "uv-configuration", "uv-interpreter", "uv-normalize", ] [[package]] name = "uv-version" -version = "0.1.24" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +version = "0.1.32" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" [[package]] name = "uv-virtualenv" version = "0.0.4" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anstream", "cachedir", @@ -5657,7 +5665,7 @@ dependencies = [ [[package]] name = "uv-warnings" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.1.24#01b7a27be42b3673f25e0ab64dfe1a6cebcc3a2f" +source = "git+https://github.com/astral-sh/uv?tag=0.1.32#f6b1580d8bd5388d80592701a02d0e77a199ddd5" dependencies = [ "anstream", "once_cell", @@ -5735,7 +5743,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -5769,7 +5777,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5820,9 +5828,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "which" @@ -5874,17 +5885,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] name = "windows" -version = "0.54.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ - "windows-core 0.54.0", - "windows-targets 0.52.4", + "windows-core 0.56.0", + "windows-targets 0.52.5", ] [[package]] @@ -5893,26 +5904,50 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] name = "windows-core" -version = "0.54.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" dependencies = [ + "windows-implement", + "windows-interface", "windows-result", - "windows-targets 0.52.4", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", ] [[package]] name = "windows-result" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5930,7 +5965,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5950,17 +5985,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "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_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -5971,9 +6007,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -5983,9 +6019,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -5995,9 +6031,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -6007,9 +6049,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -6019,9 +6061,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -6031,9 +6073,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -6043,9 +6085,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -6058,18 +6100,18 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix index 8d81e3748c..660126bebe 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix @@ -13,21 +13,21 @@ rustPlatform.buildRustPackage rec { pname = "pixi"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; rev = "v${version}"; - hash = "sha256-rCnW2Ghh6SN1G9u4ybk0jUUFYevH6FozeSjXZfJhW8s="; + hash = "sha256-7ah5u3E9nodo/0YSuaswRY07zz8EQgvttbVKjw/USCc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "async_zip-0.0.16" = "sha256-M94ceTCtyQc1AtPXYrVGplShQhItqZZa/x5qLiL+gs0="; - "cache-key-0.0.1" = "sha256-XsBTfe2+J5CGdjYZjhgxiP20OA7+VTCvD9JniLOjhKs="; - "pubgrub-0.2.1" = "sha256-SdgxoJ37cs+XwWRCFX4uKhJ9Juu9R/jENb6tzUMam4k="; + "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs="; + "cache-key-0.0.1" = "sha256-qGFjI/LNf2p11BOgacYHU0hoXvCEjjnyAcAAIcD7YTo="; + "pubgrub-0.2.1" = "sha256-sqC7R2mtqymYFULDW0wSbM/MKCZc8rP7Yy/gaQpjYEI="; }; }; @@ -68,6 +68,8 @@ rustPlatform.buildRustPackage rec { "--skip=test_compressed_mapping_catch_missing_package" "--skip=test_incremental_lock_file" "--skip=test_purl_are_added_for_pypi" + + "--skip=test_task_with_env" # `/usr/bin/env` required ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/by-name/pl/plasticity/package.nix b/third_party/nixpkgs/pkgs/by-name/pl/plasticity/package.nix index d624184c96..0c7128724e 100644 --- a/third_party/nixpkgs/pkgs/by-name/pl/plasticity/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pl/plasticity/package.nix @@ -27,22 +27,22 @@ , systemd , trash-cli , vulkan-loader -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils , xorg }: stdenv.mkDerivation rec { pname = "plasticity"; - version = "1.4.19"; + version = "1.4.20"; src = fetchurl { url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm"; - hash = "sha256-pbq00eMabouGP33d4wbjVvw+AZ+aBWg0e3lc3ZcAwmQ="; + hash = "sha256-i2n35UmRSEtkaPvJDPC2imYqgIx+qKu4bOaarYl9qQQ="; }; passthru.updateScript = ./update.sh; - nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook rpmextract mesa ]; + nativeBuildInputs = [ wrapGAppsHook3 autoPatchelfHook rpmextract mesa ]; buildInputs = [ alsa-lib diff --git a/third_party/nixpkgs/pkgs/by-name/pl/pls/package.nix b/third_party/nixpkgs/pkgs/by-name/pl/pls/package.nix index 5a6ad9ade4..eca50c8c7a 100644 --- a/third_party/nixpkgs/pkgs/by-name/pl/pls/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pl/pls/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "pls"; - version = "0.0.1-beta.4"; + version = "0.0.1-beta.6"; src = fetchFromGitHub { - owner = "dhruvkb"; + owner = "pls-rs"; repo = "pls"; rev = "v${version}"; - hash = "sha256-YndQx7FImtbAfcbOpIGOdHQA1V7mbQiYBbpik2I+FCE="; + hash = "sha256-T+OUvupPXg9dEV9GJozEyDLKqBkeH6UFYuSxX2BTZkM="; }; - cargoHash = "sha256-HzkN856GHhY2sQ0jmQCCQva/yB4zzh+ccrQvibLFhxQ="; + cargoHash = "sha256-bo6tySTgGYO+TedBLGwvk+HZmO0KvJEal/eHGSZlp7c="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/by-name/po/poethepoet/package.nix b/third_party/nixpkgs/pkgs/by-name/po/poethepoet/package.nix index b186b8866e..08237d2b8a 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/poethepoet/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/poethepoet/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "poethepoet"; - version = "0.25.1"; + version = "0.26.1"; pyproject = true; src = fetchFromGitHub { owner = "nat-n"; repo = "poethepoet"; rev = "refs/tags/v${version}"; - hash = "sha256-x57/7Qw2cLSmB01uiIAIu0dBhFqol+ewO1fRs45U0qE="; + hash = "sha256-7mRzWxMhDNUc+eY9uEszt/qQUUJhlgJqadCL+Z7QzWo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/po/pokemon-cursor/package.nix b/third_party/nixpkgs/pkgs/by-name/po/pokemon-cursor/package.nix new file mode 100644 index 0000000000..ef9d35b49c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/po/pokemon-cursor/package.nix @@ -0,0 +1,50 @@ +{ fetchFromGitHub +, lib +, stdenvNoCC + +, # build deps + clickgen +, python3Packages +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "pokemon-cursor"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "ful1e5"; + repo = "pokemon-cursor"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-EL6Ztbzjm1YuQP+8ZbrhbuBXn+GFiJGG0iGNWzU/rBY="; + }; + + nativeBuildInputs = [ + clickgen + python3Packages.attrs + ]; + + buildPhase = '' + runHook preBuild + + ctgen build.toml -p x11 -o $out + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + mv $out/Pokemon $out/share/icons + + runHook postInstall + ''; + + meta = with lib; { + description = "An unofficial open-source Pokemon cursor theme"; + homepage = "https://github.com/ful1e5/pokemon-cursor"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.getpsyched ]; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/po/polybar/package.nix b/third_party/nixpkgs/pkgs/by-name/po/polybar/package.nix index 613b75d646..870968ef65 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/polybar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/polybar/package.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://polybar.github.io/"; - changelog = "https://github.com/polybar/polybar/releases/tag/${version}"; + changelog = "https://github.com/polybar/polybar/releases/tag/${finalAttrs.version}"; description = "A fast and easy-to-use tool for creating status bars"; longDescription = '' Polybar aims to help users build beautiful and highly customizable @@ -111,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = licenses.mit; maintainers = with maintainers; [ afldcr Br1ght0ne moni ckie ]; + mainProgram = "polybar"; platforms = platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/po/pom/package.nix b/third_party/nixpkgs/pkgs/by-name/po/pom/package.nix new file mode 100644 index 0000000000..7cfde2d59a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/po/pom/package.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pom"; + version = "0-unstable-2024-04-29"; + + src = fetchFromGitHub { + owner = "maaslalani"; + repo = "pom"; + rev = "a8a2da7043f222b9c849d1ea93726433980469c0"; + hash = "sha256-EAt0Q0gSHngQj2G4qYM3zhUGkl/vqa7J36iajlH4dzs="; + }; + + vendorHash = "sha256-2ghUITtL6RDRVqAZZ+PMj4sYDuh4VaKtGT11eSMlBiA="; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + meta = with lib; { + description = "Pomodoro timer in your terminal"; + homepage = "https://github.com/maaslalani/pom"; + license = licenses.mit; + maintainers = with maintainers; [ maaslalani redyf ]; + mainProgram = "pom"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/po/popcorntime/package.nix b/third_party/nixpkgs/pkgs/by-name/po/popcorntime/package.nix index 240836d600..28fd5b60e6 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/popcorntime/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/popcorntime/package.nix @@ -4,30 +4,31 @@ , gsettings-desktop-schemas , gtk3 , lib +, libGL , makeDesktopItem , makeWrapper , nwjs , stdenv , unzip , udev -, wrapGAppsHook +, wrapGAppsHook3 , copyDesktopItems }: stdenv.mkDerivation rec { pname = "popcorntime"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/popcorn-official/popcorn-desktop/releases/download/v${version}/Popcorn-Time-${version}-linux64.zip"; - hash = "sha256-A5G66KkCQ1AiOOO02dZFAVz6dqvComrd5lXQ4Wc1S0s="; + hash = "sha256-lCsIioR252GWP/+wNwkTw5PLSal/M9x6mlR/EKOd/hs="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper unzip - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems ]; @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { dontUnpack = true; makeWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib gtk3 udev ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib gtk3 udev libGL ]}" "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/po/portablemc/package.nix b/third_party/nixpkgs/pkgs/by-name/po/portablemc/package.nix new file mode 100644 index 0000000000..444dd9d205 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/po/portablemc/package.nix @@ -0,0 +1,97 @@ +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, + installShellFiles, + jre, + + libX11, + libXext, + libXcursor, + libXrandr, + libXxf86vm, + libpulseaudio, + libGL, + glfw, + openal, + udev, + + textToSpeechSupport ? stdenv.isLinux, + flite, +}: + +let + # Copied from the `prismlauncher` package + runtimeLibs = [ + libX11 + libXext + libXcursor + libXrandr + libXxf86vm + + # lwjgl + libpulseaudio + libGL + glfw + openal + stdenv.cc.cc.lib + + # oshi + udev + ] ++ lib.optional textToSpeechSupport flite; +in +python3Packages.buildPythonApplication rec { + pname = "portablemc"; + version = "4.3.0"; + pyproject = true; + + disabled = python3Packages.pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "mindstorm38"; + repo = "portablemc"; + rev = "v${version}"; + hash = "sha256-jCv4ncXUWbkWlBZr3P1hNeVpdQzY9HtrFz+pmKknL0I="; + }; + + patches = [ + # Use the jre package provided by nixpkgs by default + ./use-builtin-java.patch + ]; + + nativeBuildInputs = [ installShellFiles ]; + + build-system = [ python3Packages.poetry-core ]; + + dependencies = [ python3Packages.certifi ]; + + # Note: Tests use networking, so we don't run them + + postInstall = '' + installShellCompletion --cmd portablemc \ + --bash <($out/bin/portablemc show completion bash) \ + --zsh <($out/bin/portablemc show completion zsh) + ''; + + preFixup = '' + makeWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath runtimeLibs} + --prefix PATH : ${lib.makeBinPath [ jre ]} + ) + ''; + + meta = { + homepage = "https://github.com/mindstorm38/portablemc"; + description = "A fast, reliable and cross-platform command-line Minecraft launcher and API for developers"; + longDescription = '' + A fast, reliable and cross-platform command-line Minecraft launcher and API for developers. + Including fast and easy installation of common mod loaders such as Fabric, Forge, NeoForge and Quilt. + This launcher is compatible with the standard Minecraft directories. + ''; + changelog = "https://github.com/mindstorm38/portablemc/releases/tag/${src.rev}"; + license = lib.licenses.gpl3Only; + mainProgram = "portablemc"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/po/portablemc/use-builtin-java.patch b/third_party/nixpkgs/pkgs/by-name/po/portablemc/use-builtin-java.patch new file mode 100644 index 0000000000..a88d97bae9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/po/portablemc/use-builtin-java.patch @@ -0,0 +1,47 @@ +diff --git a/portablemc/standard.py b/portablemc/standard.py +index f59c55d..0f017e1 100644 +--- a/portablemc/standard.py ++++ b/portablemc/standard.py +@@ -843,6 +843,8 @@ class Version: + if jvm_major_version is not None and not isinstance(jvm_major_version, int): + raise ValueError("metadata: /javaVersion/majorVersion must be an integer") + ++ return self._resolve_builtin_jvm(watcher, JvmNotFoundError.UNSUPPORTED_ARCH, jvm_major_version) ++ + if platform.system() == "Linux" and platform.libc_ver()[0] != "glibc": + return self._resolve_builtin_jvm(watcher, JvmNotFoundError.UNSUPPORTED_LIBC, jvm_major_version) + +@@ -926,31 +928,10 @@ class Version: + builtin_path = shutil.which(jvm_bin_filename) + if builtin_path is None: + raise JvmNotFoundError(reason) +- +- try: +- +- # Get version of the JVM. +- process = Popen([builtin_path, "-version"], bufsize=1, stdout=PIPE, stderr=STDOUT, universal_newlines=True) +- stdout, _stderr = process.communicate(timeout=1) +- +- version_start = stdout.index(f"1.{major_version}" if major_version <= 8 else str(major_version)) +- version = None +- +- # Parse version by getting all character that are numeric or '.'. +- for i, ch in enumerate(stdout[version_start:]): +- if not ch.isnumeric() and ch not in (".", "_"): +- version = stdout[version_start:i] +- break +- +- if version is None: +- raise ValueError() +- +- except (TimeoutExpired, ValueError): +- raise JvmNotFoundError(JvmNotFoundError.BUILTIN_INVALID_VERSION) + + self._jvm_path = Path(builtin_path) +- self._jvm_version = version +- watcher.handle(JvmLoadedEvent(version, JvmLoadedEvent.BUILTIN)) ++ self._jvm_version = "nixpkgs" ++ watcher.handle(JvmLoadedEvent("nixpkgs", JvmLoadedEvent.BUILTIN)) + + def _download(self, watcher: Watcher) -> None: + diff --git a/third_party/nixpkgs/pkgs/by-name/po/pot/package.nix b/third_party/nixpkgs/pkgs/by-name/po/pot/package.nix index aac04e5a0b..0547e72f48 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/pot/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/pot/package.nix @@ -3,7 +3,7 @@ , stdenvNoCC , rustPlatform , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , cargo , rustc , cargo-tauri @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { cargo rustc cargo-tauri - wrapGAppsHook + wrapGAppsHook3 nodePackages.pnpm pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/po/powersploit/package.nix b/third_party/nixpkgs/pkgs/by-name/po/powersploit/package.nix index 8e33c26ae7..a3a86cb75c 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/powersploit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/powersploit/package.nix @@ -16,9 +16,9 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall - mkdir -p $out/share/powersploit - cp -a * $out/share/powersploit - find $out/share -type f -exec chmod -x {} \; + mkdir -p $out/share/windows/powersploit + cp -a * $out/share/windows/powersploit + find $out/share/windows -type f -exec chmod -x {} \; runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/by-name/po/powersupply/package.nix b/third_party/nixpkgs/pkgs/by-name/po/powersupply/package.nix index ce86cf2da7..31216d8467 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/powersupply/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/powersupply/package.nix @@ -8,7 +8,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/pp/ppsspp/package.nix b/third_party/nixpkgs/pkgs/by-name/pp/ppsspp/package.nix index 01c24a71bf..0dd5e3492a 100644 --- a/third_party/nixpkgs/pkgs/by-name/pp/ppsspp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pp/ppsspp/package.nix @@ -1,25 +1,29 @@ -{ lib -, stdenv -, fetchFromGitHub -, SDL2 -, cmake -, copyDesktopItems -, ffmpeg_4 -, glew -, libffi -, libsForQt5 -, libzip -, makeDesktopItem -, makeWrapper -, pkg-config -, python3 -, snappy -, vulkan-loader -, wayland -, zlib -, enableQt ? false -, enableVulkan ? true -, forceWayland ? false +{ + lib, + SDL2, + cmake, + copyDesktopItems, + fetchFromGitHub, + ffmpeg, + glew, + libffi, + libsForQt5, + libzip, + makeDesktopItem, + makeWrapper, + pkg-config, + python3, + snappy, + stdenv, + vulkan-loader, + wayland, + zlib, + + enableQt ? false, + enableVulkan ? true, + forceWayland ? false, + useSystemFfmpeg? false, + useSystemSnappy? true, }: let @@ -55,26 +59,33 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper pkg-config python3 - ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; + ] + ++ lib.optionals enableQt [ wrapQtAppsHook ]; buildInputs = [ SDL2 - ffmpeg_4 - (glew.override { enableEGL = forceWayland; }) + glew libzip - snappy zlib - ] ++ lib.optionals enableQt [ + ] + ++ lib.optionals useSystemFfmpeg [ + ffmpeg + ] + ++ lib.optionals useSystemSnappy [ + snappy + ] + ++ lib.optionals enableQt [ qtbase qtmultimedia - ] ++ lib.optionals enableVulkan [ vulkan-loader ] + ] + ++ lib.optionals enableVulkan [ vulkan-loader ] ++ lib.optionals vulkanWayland [ wayland libffi ]; cmakeFlags = [ (lib.cmakeBool "HEADLESS" (!enableQt)) - (lib.cmakeBool "USE_SYSTEM_FFMPEG" true) + (lib.cmakeBool "USE_SYSTEM_FFMPEG" useSystemFfmpeg) (lib.cmakeBool "USE_SYSTEM_LIBZIP" true) - (lib.cmakeBool "USE_SYSTEM_SNAPPY" true) + (lib.cmakeBool "USE_SYSTEM_SNAPPY" useSystemSnappy) (lib.cmakeBool "USE_WAYLAND_WSI" vulkanWayland) (lib.cmakeBool "USING_QT_UI" enableQt) (lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND") @@ -91,33 +102,40 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - installPhase = let - vulkanPath = lib.makeLibraryPath [ vulkan-loader ]; - in - '' - runHook preInstall + installPhase = + lib.concatStringsSep "\n" ([ + ''runHook preInstall'' + ] + ++ [ + ''mkdir -p $out/share/{applications,ppsspp/bin,icons}'' + ] + ++ (if enableQt then [ + ''install -Dm555 PPSSPPQt $out/share/ppsspp/bin/'' + ] else [ + ''install -Dm555 PPSSPPHeadless $out/share/ppsspp/bin/'' + ''makeWrapper $out/share/ppsspp/bin/PPSSPPHeadless $out/bin/ppsspp-headless'' + ''install -Dm555 PPSSPPSDL $out/share/ppsspp/bin/'' + ]) + ++ [ + ''mv assets $out/share/ppsspp'' + ''mv ../icons/hicolor $out/share/icons'' + ] + ++ [ + ''runHook postInstall'' + ]); - mkdir -p $out/share/{applications,ppsspp,icons} - '' - + (if enableQt then '' - install -Dm555 PPSSPPQt $out/bin/ppsspp - wrapProgram $out/bin/ppsspp \ - '' else '' - install -Dm555 PPSSPPHeadless $out/bin/ppsspp-headless - install -Dm555 PPSSPPSDL $out/share/ppsspp/ - makeWrapper $out/share/ppsspp/PPSSPPSDL $out/bin/ppsspp \ - --set SDL_VIDEODRIVER ${if forceWayland then "wayland" else "x11"} \ - '') - + lib.optionalString enableVulkan '' - --prefix LD_LIBRARY_PATH : ${vulkanPath} \ - '' - + '' - - mv assets $out/share/ppsspp - mv ../icons/hicolor $out/share/icons - - runHook postInstall - ''; + postFixup = + let + wrapperArgs = + lib.concatStringsSep " " + (lib.optionals enableVulkan [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" + ] ++ lib.optionals (!enableQt) [ + "--set SDL_VIDEODRIVER ${if forceWayland then "wayland" else "x11"}" + ]); + binToBeWrapped = if enableQt then "PPSSPPQt" else "PPSSPPSDL"; + in + ''makeWrapper $out/share/ppsspp/bin/${binToBeWrapped} $out/bin/ppsspp ${wrapperArgs}''; meta = { homepage = "https://www.ppsspp.org/"; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pragtical/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/pragtical/package.nix new file mode 100644 index 0000000000..cfa6269b89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pr/pragtical/package.nix @@ -0,0 +1,86 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cacert, + meson, + ninja, + pkg-config, + freetype, + libgit2, + libuchardet, + libzip, + lua5_4, + luajit, + mbedtls_2, + pcre2, + SDL2, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pragtical"; + version = "3.3.1"; + pluginManagerVersion = "1.2.9"; + + src = fetchFromGitHub { + owner = "pragtical"; + repo = "pragtical"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + + # also fetch required git submodules + postFetch = '' + cd "$out" + + export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + + substituteInPlace subprojects/ppm.wrap \ + --replace-fail 'revision = head' 'revision = v${finalAttrs.pluginManagerVersion}' + + ${lib.getExe meson} subprojects download \ + colors plugins ppm + + find subprojects -type d -name .git -prune -execdir rm -r {} + + ''; + + hash = "sha256-T0IHpfMfx4P84RyBLtaYNead6a7cID2cUYwkyNnYMgc="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + freetype + libgit2 + libuchardet + libzip + lua5_4 + luajit + mbedtls_2 + pcre2 + SDL2 + zlib + ]; + + # workaround for `libmbedx509.so.1, libmbedcrypto.so.7: error adding symbols: DSO missing from command line` + env.NIX_LDFLAGS = "-lmbedx509 -lmbedcrypto"; + + mesonFlags = [ "-Duse_system_lua=true" ]; + + meta = { + changelog = "https://github.com/pragtical/pragtical/blob/${finalAttrs.src.rev}/changelog.md"; + description = "A practical and pragmatic code editor"; + homepage = "https://pragtical.dev"; + license = lib.licenses.mit; + mainProgram = "pragtical"; + maintainers = with lib.maintainers; [ + suhr + tomasajt + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/package.nix index 9f733eeb8f..78b2f8d4df 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/package.nix @@ -42,7 +42,7 @@ let homepage = "https://github.com/pretalx/pretalx"; changelog = "https://docs.pretalx.org/en/latest/changelog.html"; license = licenses.asl20; - maintainers = teams.c3d2.members; + maintainers = with maintainers; [ hexa] ++ teams.c3d2.members; platforms = platforms.linux; }; @@ -85,10 +85,16 @@ python.pkgs.buildPythonApplication rec { ]); pythonRelaxDeps = [ + "celery" + "css-inline" "cssutils" "django-csp" "django-filter" + "django-hierarkey" + "markdown" + "pillow" "python-dateutil" + "reportlab" ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pretix/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretix/package.nix index 2456720db7..a45fdbdf2f 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pretix/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/pretix/package.nix @@ -29,13 +29,13 @@ let }; pname = "pretix"; - version = "2024.3.0"; + version = "2024.4.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-Wz1vZcqgwyS0xJgTtRxqfaJpJ1fAMhIyxvTvBT/ABSo="; + hash = "sha256-+F5EOMMkO1ngGeFscDipwbldsY0AhOUKbjqgNpuph4g="; }; npmDeps = buildNpmPackage { @@ -43,7 +43,7 @@ let inherit version src; sourceRoot = "${src.name}/src/pretix/static/npm_dir"; - npmDepsHash = "sha256-2fHlEEmYzpF3SyvF7+FbwCt+zQVGF0/kslDFnJ+DQGE="; + npmDepsHash = "sha256-0Q/BCRHlnyQJlCF3PgIP9q3Qyr/ff+GP0lPIwPsIMSU="; dontBuild = true; @@ -81,16 +81,15 @@ python.pkgs.buildPythonApplication rec { --replace-fail psycopg2-binary psycopg2 \ --replace-fail vat_moss_forked==2020.3.20.0.11.0 vat-moss \ --replace-fail "bleach==5.0.*" bleach \ + --replace-fail "django-hierarkey==1.1.*" django-hierarkey \ + --replace-fail "djangorestframework==3.15.*" djangorestframework \ --replace-fail "dnspython==2.6.*" dnspython \ - --replace-fail "django-countries==7.5.*" django-countries \ - --replace-fail "django-filter==24.1" django-filter \ --replace-fail "importlib_metadata==7.*" importlib_metadata \ --replace-fail "markdown==3.6" markdown \ --replace-fail "protobuf==5.26.*" protobuf \ --replace-fail "pycryptodome==3.20.*" pycryptodome \ --replace-fail "pypdf==3.9.*" pypdf \ --replace-fail "python-dateutil==2.9.*" python-dateutil \ - --replace-fail "sentry-sdk==1.42.*" sentry-sdk \ --replace-fail "stripe==7.9.*" stripe ''; @@ -175,6 +174,7 @@ python.pkgs.buildPythonApplication rec { text-unidecode tlds tqdm + ua-parser vat-moss vobject webauthn @@ -213,6 +213,11 @@ python.pkgs.buildPythonApplication rec { "--reruns" "3" ]; + disabledTests = [ + # unreliable around day changes + "test_order_create_invoice" + ]; + preCheck = '' export PYTHONPATH=$(pwd)/src:$PYTHONPATH export DJANGO_SETTINGS_MODULE=tests.settings diff --git a/third_party/nixpkgs/pkgs/by-name/pr/primesieve/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/primesieve/package.nix index 470b62111b..b5e2da3702 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/primesieve/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/primesieve/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "primesieve"; - version = "12.1"; + version = "12.3"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primesieve"; rev = "v${finalAttrs.version}"; - hash = "sha256-AHl2GfZ1oJ8ZyjJzvg10AqN7TA7HFZ+qa6N2v51Qa78="; + hash = "sha256-jULYLJK3iwPKgWpdTEetmSz1Nv2md1XUfR9A9mTQu9M="; }; outputs = [ "out" "dev" "lib" "man" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/private-gpt/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/private-gpt/package.nix new file mode 100644 index 0000000000..1b717cc2bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pr/private-gpt/package.nix @@ -0,0 +1,17 @@ +{ python3Packages +, makeBinaryWrapper +}: + +python3Packages.toPythonApplication (python3Packages.private-gpt.overrideAttrs (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeBinaryWrapper ]; + + passthru.cl100k_base = { + inherit (python3Packages.private-gpt.cl100k_base) tiktoken; + }; + + postInstall = '' + makeWrapper ${python3Packages.python.interpreter} $out/bin/private-gpt \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --add-flags "-m private_gpt" + ''; +})) diff --git a/third_party/nixpkgs/pkgs/by-name/pr/promptfoo/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/promptfoo/package.nix index 30c5024c1c..f6859c50f1 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/promptfoo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/promptfoo/package.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "promptfoo"; - version = "0.51.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "promptfoo"; repo = "promptfoo"; rev = "${version}"; - hash = "sha256-M9NmSi8gij4nqWCvy9y7wXL76D2vzH2RzibP82XVTh4="; + hash = "sha256-XQnsOr+L2MCKPzZeIKzx4XjWF6B18gBVDU0j31CgjUc="; }; - npmDepsHash = "sha256-bBI87CYDm36MOm2mVMRwnq5n+3RM1AnKFaNX5NZSeaw="; + npmDepsHash = "sha256-f7tlRZHjdeIk17hQhzmIbhMwUkoca3J+F65cr0dvSmU="; dontNpmBuild = true; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/proto/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/proto/package.nix index 94753d08d4..3383f6bb5e 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/proto/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/proto/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.34.4"; + version = "0.35.1"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-sh4EeK9LGY1t7BDWV31pOjp6CYhOIRR/wCb6LAv68ok="; + hash = "sha256-ympqli1CHqS4iR76Rs9SFTVP4PxHsnFpZMDReg3+LhA="; }; - cargoHash = "sha256-PU6r6Iwv00TLhAZSt9hERWvCgpC27Cuf3rrsjN1gO5k="; + cargoHash = "sha256-moabqZlj3vWkQo/yZEcwbvXuqrTswfSFaci/FEJzfnQ="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-js/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-js/package.nix index e9e8207b3c..0df0cb62a8 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-js/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-js/package.nix @@ -19,7 +19,7 @@ buildBazelPackage rec { LIBTOOL = lib.optionalString stdenv.isDarwin "${darwin.cctools}/bin/libtool"; - fetchAttrs.sha256 = "sha256-H0zTMCMFct09WdR/mzcs9FcC2OU/ZhGye7GAkx4tGa8="; + fetchAttrs.sha256 = "sha256-WOBlZ0XNrl5UxIaSDxZeOfzS2a8ZkrKdTLKHBDC9UNQ="; buildAttrs.installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-rust/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-rust/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/protoc-gen-rust/default.nix rename to third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-rust/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix index 3537d60cbb..a281607d50 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-4"; + version = "GE-Proton9-5"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-OR4SUqm5Xsycv/KVBW2Ug/lz4Xr6IQBp8gXacorRe3U="; + hash = "sha256-bUlV533M5BL5UEOB0ED8VIMmquvVAvIm+E/ZJNjftRU="; }; outputs = [ "out" "steamcompattool" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/protonmail-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/protonmail-desktop/package.nix index b3edfaa9dc..fce6e7bef5 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -10,11 +10,11 @@ let mainProgram = "proton-mail"; in stdenv.mkDerivation rec { pname = "protonmail-desktop"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/proton-mail_${version}_amd64.deb"; - hash = "sha256-fNK//x3DOsynWSkG9N+nZ3wjYoC+RreaYVC6KEDXh4w="; + hash = "sha256-c+0iFBpcg+t983oOttPokA5sLGsIQFIsC+GbsVY6hmI="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/protonplus/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/protonplus/package.nix new file mode 100644 index 0000000000..cd715b3a36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pr/protonplus/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + desktop-file-utils, + wrapGAppsHook4, + meson, + ninja, + pkg-config, + vala, + glib, + glib-networking, + gtk4, + json-glib, + libadwaita, + libarchive, + libgee, + libsoup_3, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "protonplus"; + version = "0.4.10"; + + src = fetchFromGitHub { + owner = "Vysp3r"; + repo = "protonplus"; + rev = "v${finalAttrs.version}"; + hash = "sha256-dKhGXpsBCZBNNJRAjzSvP0B/3DbS9wRdhTS4WL2NZjE="; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkg-config + vala + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + glib-networking + gtk4 + json-glib + libadwaita + libarchive + libgee + libsoup_3 + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + mainProgram = "com.vysp3r.ProtonPlus"; + description = "A simple Wine and Proton-based compatibility tools manager"; + homepage = "https://github.com/Vysp3r/ProtonPlus"; + changelog = "https://github.com/Vysp3r/ProtonPlus/releases/tag/v${finalAttrs.version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ getchoo ]; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prowler/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prowler/package.nix index 01dc71bf2f..a8c5fb546e 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/prowler/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/prowler/package.nix @@ -17,8 +17,10 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ + "azure-identity" "azure-keyvault-keys" "azure-mgmt-compute" + "azure-mgmt-containerservice" "azure-mgmt-network" "azure-mgmt-security" "azure-storage-blob" diff --git a/third_party/nixpkgs/pkgs/tools/system/ps_mem/default.nix b/third_party/nixpkgs/pkgs/by-name/ps/ps_mem/package.nix similarity index 55% rename from third_party/nixpkgs/pkgs/tools/system/ps_mem/default.nix rename to third_party/nixpkgs/pkgs/by-name/ps/ps_mem/package.nix index 96c21e461d..c6cdbab672 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ps_mem/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ps/ps_mem/package.nix @@ -1,22 +1,26 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonApplication rec { pname = "ps_mem"; - version = "3.13"; + version = "3.14"; src = fetchFromGitHub { owner = "pixelb"; repo = pname; rev = "v${version}"; - sha256 = "0pgi9hvwfbkzvwicqlkwx4rwal1ikza018yxbwpnf7c80zw0zaw9"; + hash = "sha256-jCfPtPSky/QFk9Xo/tq3W7609Pie1yLC4iS4dqjCa+E="; }; - meta = with lib; { + meta = { description = "A utility to accurately report the in core memory usage for a program"; homepage = "https://github.com/pixelb/ps_mem"; - license = licenses.lgpl21; - maintainers = [ ]; - platforms = platforms.linux; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.linux; mainProgram = "ps_mem"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/pt/ptyxis/package.nix b/third_party/nixpkgs/pkgs/by-name/pt/ptyxis/package.nix new file mode 100644 index 0000000000..3ff45bffb4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pt/ptyxis/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + json-glib, + vte-gtk4, + libportal-gtk4, + pcre2, +}: + +let + version = "46.2"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "chergert"; + repo = "ptyxis"; + rev = version; + hash = "sha256-/n/S2ws6qsVwTXX96MPa+/ISozDDu8A1wkD1g3dmAtQ="; + }; + + vte-gtk4-patched = vte-gtk4.overrideAttrs (prev: { + patches = (prev.patches or [ ]) ++ [ + "${src}/build-aux/0001-add-notification-and-shell-precmd-preexec.patch" + ]; + }); +in +stdenv.mkDerivation { + pname = "ptyxis"; + inherit version src; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + json-glib + vte-gtk4-patched + libportal-gtk4 + pcre2 + ]; + + passthru = { + inherit vte-gtk4-patched; + }; + + meta = { + description = "A terminal for GNOME with first-class support for containers"; + homepage = "https://gitlab.gnome.org/chergert/ptyxis"; + license = lib.licenses.gpl3Plus; + mainProgram = "ptyxis"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix b/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix index a0740f4869..52a62f0426 100644 --- a/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "pupdate"; - version = "3.10.1"; + version = "3.10.2"; src = fetchFromGitHub { owner = "mattpannella"; repo = "${pname}"; rev = "${version}"; - hash = "sha256-xr5XD0V3kt4fDm8GNotGuttAeWwwlAr2iFA/RezvC4w="; + hash = "sha256-XPPbxlmwuM9q1NkeI8MX6w+ZbC272o2BPopQgkqU4Ek="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/pu/puppet-bolt/package.nix b/third_party/nixpkgs/pkgs/by-name/pu/puppet-bolt/package.nix index 23047c3cff..7340ed9eb7 100644 --- a/third_party/nixpkgs/pkgs/by-name/pu/puppet-bolt/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pu/puppet-bolt/package.nix @@ -7,7 +7,7 @@ testers, }: -bundlerApp { +(bundlerApp { pname = "bolt"; gemdir = ./.; @@ -42,4 +42,6 @@ bundlerApp { maintainers = with lib.maintainers; [ uvnikita anthonyroussel ]; platforms = lib.platforms.unix; }; -} +}).overrideAttrs (old: { + name = "puppet-bolt-${(import ./gemset.nix).bolt.version}"; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/pw/pw3270/package.nix b/third_party/nixpkgs/pkgs/by-name/pw/pw3270/package.nix index 4e35f393db..657a218069 100644 --- a/third_party/nixpkgs/pkgs/by-name/pw/pw3270/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pw/pw3270/package.nix @@ -14,7 +14,7 @@ , gettext , desktop-file-utils , glib -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { automake libtool desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/pw/pwndbg/package.nix b/third_party/nixpkgs/pkgs/by-name/pw/pwndbg/package.nix index 2967130b7f..473a401ce1 100644 --- a/third_party/nixpkgs/pkgs/by-name/pw/pwndbg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pw/pwndbg/package.nix @@ -18,7 +18,7 @@ let python3.pkgs.ropgadget # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32 ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pwndbg"; version = lib.getVersion pwndbg-py; format = "other"; @@ -31,20 +31,32 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/share/pwndbg - cp gdbinit.py $out/share/pwndbg + cp gdbinit.py $out/share/pwndbg/gdbinit.py chmod +x $out/share/pwndbg/gdbinit.py + # First line is a import from future, so we need to append our imports after that + sed '2 i import sys, os + 3 i [sys.path.append(p) for p in "${pythonPath}".split(":")] + 4 i os.environ["PATH"] += ":${binPath}"' -i $out/share/pwndbg/gdbinit.py # Don't require an in-package venv touch $out/share/pwndbg/.skip-venv makeWrapper ${gdb}/bin/gdb $out/bin/pwndbg \ - --add-flags "-q -x $out/share/pwndbg/gdbinit.py" \ - --prefix PATH : ${binPath} \ - --set PYTHONPATH ${pythonPath} \ + --add-flags "-q -x $out/share/pwndbg/gdbinit.py" runHook postInstall ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + # Check if pwndbg is installed correctly + HOME=$TMPDIR LC_CTYPE=C.UTF-8 $out/bin/pwndbg -ex exit + + runHook postInstallCheck + ''; + meta = with lib; { description = "Exploit Development and Reverse Engineering with GDB Made Easy"; mainProgram = "pwndbg"; diff --git a/third_party/nixpkgs/pkgs/by-name/pw/pwru/package.nix b/third_party/nixpkgs/pkgs/by-name/pw/pwru/package.nix index d8dca376fc..5f393ff9ce 100644 --- a/third_party/nixpkgs/pkgs/by-name/pw/pwru/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pw/pwru/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "pwru"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "cilium"; repo = "pwru"; rev = "v${version}"; - hash = "sha256-2CpjTVBuiGU5cYkdSIxIpk1EoZAUhlXxVU+KJXHosiA="; + hash = "sha256-8pXyzmzMCxOzwstzvzeZB2HBMeMzGMLZesTURZD3Rt8="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/by-name/py/pyprland/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pyprland/package.nix index baa05e840c..2692b2c51b 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pyprland/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/py/pyprland/package.nix @@ -1,8 +1,13 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, + nix-update-script, +}: python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.2.5"; + version = "2.2.17"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -11,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-ech+KqB0SyFYDWNP+luv+K2aDjJHZDWp72V6wkGBJJw="; + hash = "sha256-S1bIIazrBWyjF8tOcIk0AwwWq9gbpTKNsjr9iYA5lKk="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; @@ -53,12 +58,17 @@ python3Packages.buildPythonApplication rec { "pyprland.plugins.workspaces_follow_focus" ]; - meta = with lib; { + passthru.updateScript = nix-update-script {}; + + meta = { mainProgram = "pypr"; description = "An hyperland plugin system"; homepage = "https://github.com/hyprland-community/pyprland"; - license = licenses.mit; - maintainers = with maintainers; [ iliayar ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + iliayar + johnrtitor + ]; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/py/pyright/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pyright/package.nix index 3e264bc20e..1f91e91abb 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pyright/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.359"; + version = "1.1.362"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-gqMAfmYjYO6D9sRu+uJv4yJ/+csioFAwsUPBDF29VDs="; + hash = "sha256-sz+Om2bfsJJTe2W8l49pI+K9phCTwoczeG1Q7qlMIig="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-p2KamNFJ3sJHmJm0MEPhI8L/8zAVzfc9NYy24rAdFcQ="; + npmDepsHash = "sha256-xcr9j5/90gfV/r0yI9ifj6Nrr9WrawwvukuVkl387r4="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-U7WdMIYg9U4fJ8YtDruMzloRS2BQAa2QWExle9uwPbU="; + npmDepsHash = "sha256-79tXMdOt1XH3KTT46bq35J4AcCVyoB2d4KEkr9EjqVY="; postPatch = '' chmod +w ../../ diff --git a/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix b/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix index f35e6a0ef1..ff1e25ee27 100644 --- a/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "qrtool"; - version = "0.10.8"; + version = "0.10.10"; src = fetchFromGitHub { owner = "sorairolake"; repo = "qrtool"; rev = "v${version}"; - sha256 = "sha256-YNA8LdqkgScBAoLyWsr4JIeFcU4KfNAYByXSvaccOoU="; + sha256 = "sha256-2gUvnQjAA0nTeJL4IbsfCmeSD+mGKjywJCCi914f5mM="; }; - cargoHash = "sha256-6yQVH15oW8dCjNKwL2Gb6IQKilVYokBs2j+M4fWLm+4="; + cargoHash = "sha256-M5G5f+aycpIbFaPbkUNalMK3if1PIAXD7MaNsLzdvI4="; nativeBuildInputs = [ asciidoctor installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/qu/quark-goldleaf/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quark-goldleaf/package.nix index 71321a76fb..353bca5fea 100644 --- a/third_party/nixpkgs/pkgs/by-name/qu/quark-goldleaf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qu/quark-goldleaf/package.nix @@ -6,7 +6,7 @@ , makeDesktopItem , copyDesktopItems , imagemagick -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 }: @@ -46,7 +46,7 @@ maven'.buildMavenPackage rec { nativeBuildInputs = [ imagemagick # for icon conversion copyDesktopItems - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/qu/quarkus/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quarkus/package.nix index 5e6faa4316..6d73673b26 100644 --- a/third_party/nixpkgs/pkgs/by-name/qu/quarkus/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qu/quarkus/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.9.4"; + version = "3.10.0"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-ez4D+czYDhs/GNrjRF8Bx999JRW0EigMxc39fOH54V8="; + hash = "sha256-hJNlz2DpA30fKpZu2O0I31oDSAfdW/s/xXzwOdRX9kw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/quickemu/default.nix b/third_party/nixpkgs/pkgs/by-name/qu/quickemu/package.nix similarity index 74% rename from third_party/nixpkgs/pkgs/development/quickemu/default.nix rename to third_party/nixpkgs/pkgs/by-name/qu/quickemu/package.nix index c8893a4e06..9280eaa990 100644 --- a/third_party/nixpkgs/pkgs/development/quickemu/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/qu/quickemu/package.nix @@ -2,21 +2,23 @@ , fetchFromGitHub , stdenv , makeWrapper -, qemu +, cdrtools +, curl +, gawk , gnugrep , gnused -, lsb-release , jq +, ncurses +, pciutils , procps , python3 -, cdrtools -, usbutils -, util-linux +, qemu , socat , spice-gtk , swtpm +, usbutils +, util-linux , unzip -, wget , xdg-user-dirs , xrandr , zsync @@ -28,35 +30,37 @@ }: let runtimePaths = [ - qemu + cdrtools + curl + gawk gnugrep gnused jq - lsb-release + ncurses + pciutils procps python3 - cdrtools + qemu + socat + swtpm usbutils util-linux unzip - socat - swtpm - wget xdg-user-dirs xrandr zsync ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs : { pname = "quickemu"; - version = "4.9.2"; + version = "4.9.4"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; - rev = version; - hash = "sha256-StYgnFBnEJUkJDyFluMm01xhgejXc99AEldGGxIvZU0="; + rev = finalAttrs.version; + hash = "sha256-fjbXgze6klvbRgkJtPIUh9kEkP/As7dAj+cazpzelBY="; }; postPatch = '' @@ -74,11 +78,11 @@ stdenv.mkDerivation rec { runHook preInstall installManPage docs/quickget.1 docs/quickemu.1 docs/quickemu_conf.1 - install -Dm755 -t "$out/bin" macrecovery quickemu quickget windowskey + install -Dm755 -t "$out/bin" chunkcheck quickemu quickget quickreport windowskey # spice-gtk needs to be put in suffix so that when virtualisation.spiceUSBRedirection # is enabled, the wrapped spice-client-glib-usb-acl-helper is used - for f in macrecovery quickget quickemu windowskey; do + for f in chunkcheck quickget quickemu quickreport windowskey; do wrapProgram $out/bin/$f \ --prefix PATH : "${lib.makeBinPath runtimePaths}" \ --suffix PATH : "${lib.makeBinPath [ spice-gtk ]}" @@ -89,10 +93,11 @@ stdenv.mkDerivation rec { passthru.tests = testers.testVersion { package = quickemu; }; - meta = with lib; { - description = "Quickly create and run optimised Windows, macOS and Linux desktop virtual machines"; + meta = { + description = "Quickly create and run optimised Windows, macOS and Linux virtual machines"; homepage = "https://github.com/quickemu-project/quickemu"; - license = licenses.mit; - maintainers = with maintainers; [ fedx-sudo ]; + mainProgram = "quickemu"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fedx-sudo flexiondotorg ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/qu/quickjs-ng/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quickjs-ng/package.nix index 88b46c8377..33a057dc6f 100644 --- a/third_party/nixpkgs/pkgs/by-name/qu/quickjs-ng/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qu/quickjs-ng/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A mighty JavaScript engine"; homepage = "https://github.com/quickjs-ng/quickjs"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; mainProgram = "qjs"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/qu/quicktype/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quicktype/package.nix index fb4a801af6..ecf33e6e92 100644 --- a/third_party/nixpkgs/pkgs/by-name/qu/quicktype/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qu/quicktype/package.nix @@ -29,7 +29,7 @@ buildNpmPackage rec { description = "Generate types and converters from JSON, Schema, and GraphQL"; homepage = "https://quicktype.io/"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "quicktype"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix b/third_party/nixpkgs/pkgs/by-name/ra/radicale/package.nix similarity index 91% rename from third_party/nixpkgs/pkgs/servers/radicale/3.x.nix rename to third_party/nixpkgs/pkgs/by-name/ra/radicale/package.nix index c952323337..d3637df36b 100644 --- a/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix +++ b/third_party/nixpkgs/pkgs/by-name/ra/radicale/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.1.9"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "v${version}"; - hash = "sha256-i4NQ1+ltRE0g8AoyGKKVcgZgSmLeppnobu6bf2+XmWY="; + hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ="; }; postPatch = '' @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { defusedxml passlib vobject + pika python-dateutil pytz # https://github.com/Kozea/Radicale/issues/816 ] ++ passlib.optional-dependencies.bcrypt; diff --git a/third_party/nixpkgs/pkgs/by-name/ra/radicle-node/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/radicle-node/package.nix new file mode 100644 index 0000000000..4cfcef61f3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ra/radicle-node/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchgit +, asciidoctor +, git +, installShellFiles +, rustPlatform +, testers +, radicle-node +, darwin +}: rustPlatform.buildRustPackage rec { + pname = "radicle-node"; + version = "1.0.0-rc.8"; + env.RADICLE_VERSION = version; + + src = fetchgit { + url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"; + rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}"; + hash = "sha256-F2n7ui0EgXK8fT76M14RVhXXGeRYub+VpH+puDUJ1pQ="; + }; + cargoHash = "sha256-+QthR5M3qAxC42TPnR5iylfpuWnsSmg68SuCbhmkCvw="; + + nativeBuildInputs = [ asciidoctor installShellFiles ]; + nativeCheckInputs = [ git ]; + buildInputs = lib.optionals stdenv.buildPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + doCheck = with stdenv.hostPlatform; isx86_64 && isLinux; + + preCheck = '' + export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release + ''; + checkFlags = [ + "--skip=service::message::tests::test_node_announcement_validate" + "--skip=tests::test_announcement_relay" + "--skip=tests::e2e" + ]; + + postInstall = '' + for page in $(find -name '*.adoc'); do + asciidoctor -d manpage -b manpage $page + installManPage ''${page::-5} + done + ''; + + passthru.tests.version = testers.testVersion { package = radicle-node; }; + + meta = { + description = "Radicle node and CLI for decentralized code collaboration"; + longDescription = '' + Radicle is an open source, peer-to-peer code collaboration stack built on Git. + Unlike centralized code hosting platforms, there is no single entity controlling the network. + Repositories are replicated across peers in a decentralized manner, and users are in full control of their data and workflow. + ''; + homepage = "https://radicle.xyz"; + license = with lib.licenses; [ asl20 mit ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ amesgen lorenzleutgeb ]; + mainProgram = "rad"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ra/rage/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/rage/package.nix index bd3fb0a2ea..3c33b5025f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/rage/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ra/rage/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/str4d/rage"; changelog = "https://github.com/str4d/rage/blob/v${version}/rage/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; # either at your option - maintainers = with maintainers; [ marsam ryantm ]; + maintainers = with maintainers; [ ryantm ]; mainProgram = "rage"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ra/ratslap/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/ratslap/package.nix index 6ea5cc1916..59ff8ffb8e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/ratslap/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ra/ratslap/package.nix @@ -7,15 +7,15 @@ , git }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ratslap"; version = "0.4.1"; src = fetchFromGitHub { owner = "krayon"; repo = "ratslap"; - rev = version; - sha256 = "sha256-PO/79tTiO4TBtojrEtkSf5W6zuG+Ml2iJGAtYHDwHEY="; + rev = finalAttrs.version; + hash = "sha256-PO/79tTiO4TBtojrEtkSf5W6zuG+Ml2iJGAtYHDwHEY="; leaveDotGit = true; }; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { makeFlagsArray+=( "-W gitup" "VDIRTY=" - "MAJVER=${version}" + "MAJVER=${finalAttrs.version}" "APPBRANCH=main" - "BINNAME=${pname}" + "BINNAME=ratslap" "MARKDOWN_GEN=" "BUILD_DATE=$(git show -s --date=format:'%Y-%m-%d %H:%M:%S%z' --format=%cd)" "BUILD_MONTH=$(git show -s --date=format:'%B' --format=%cd)" @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp ratslap $out/bin - mv manpage.1 ${pname}.1 - installManPage ${pname}.1 + mv manpage.1 ratslap.1 + installManPage ratslap.1 runHook postInstall ''; @@ -62,9 +62,9 @@ stdenv.mkDerivation rec { all buttons and configuring modes, DPI settings and the LED. ''; homepage = "https://github.com/krayon/ratslap"; - changelog = "https://github.com/krayon/ratslap/releases/tag/${version}"; + changelog = "https://github.com/krayon/ratslap/releases/tag/${finalAttrs.version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ zebreus ]; - platforms = platforms.all; + platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/rc/rclip/package.nix b/third_party/nixpkgs/pkgs/by-name/rc/rclip/package.nix index e98c41815e..ed611edfda 100644 --- a/third_party/nixpkgs/pkgs/by-name/rc/rclip/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rc/rclip/package.nix @@ -4,14 +4,14 @@ }: python3Packages.buildPythonApplication rec { pname = "rclip"; - version = "1.7.26"; + version = "1.8.10"; pyproject = true; src = fetchFromGitHub { owner = "yurijmikhalevich"; repo = "rclip"; - rev = "v${version}"; - hash = "sha256-u+xnrqJXtjElVXlwkCTHztcRl998CwoTEIvaGYzGOLU="; + rev = "refs/tags/v${version}"; + hash = "sha256-wjwi6GBblv8Z3SA1bMrtPz3KVF8Zw5595Hqyp8FPgcg="; }; nativeBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/by-name/re/redka/package.nix b/third_party/nixpkgs/pkgs/by-name/re/redka/package.nix new file mode 100644 index 0000000000..3ead73db83 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/re/redka/package.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "redka"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "nalgeon"; + repo = "redka"; + rev = "v${version}"; + hash = "sha256-Dm+QMmCYoYJWv+Crot0bwcSPHuUYQzhRgTO65jRjLLE="; + }; + + vendorHash = "sha256-aX0X6TWVEouo884LunCt+UzLyvDHgmvuxdV0wh0r7Ro="; + + subPackages = [ "cmd/redka" "cmd/cli" ]; + + ldflags = [ "-X main.version=v${version}" ]; + + postInstall = '' + mv $out/bin/{cli,redka-cli} + ''; + + meta = { + description = "Redis re-implemented with SQLite"; + homepage = "https://github.com/nalgeon/redka"; + maintainers = with lib.maintainers; [ sikmir ]; + license = lib.licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/re/redocly-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/re/redocly/package.nix similarity index 64% rename from third_party/nixpkgs/pkgs/by-name/re/redocly-cli/package.nix rename to third_party/nixpkgs/pkgs/by-name/re/redocly/package.nix index fd3606c1e4..eb1b0715d4 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/redocly-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/redocly/package.nix @@ -2,20 +2,22 @@ , buildNpmPackage , fetchFromGitHub , makeWrapper +, redocly +, testers }: buildNpmPackage rec { - pname = "redocly-cli"; - version = "1.6.0"; + pname = "redocly"; + version = "1.12.0"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-xoehTTpXT/9tlL0VoDQwKbyUnNGeMyH+VBIVLiz69ko="; + hash = "sha256-KfNwBRGDFNMsba+yjwUHiiO2BJbIl4pW1b3cvLBe+lk="; }; - npmDepsHash = "sha256-9fI9P96iNmHrhjbgjePpRnknFe3yIjkirOoIMkVGkH4="; + npmDepsHash = "sha256-I3cxMw9zOZb9sfP8UUoHc1UJ0RpDqVn9D29arSdNob4="; npmBuildScript = "prepare"; @@ -32,24 +34,25 @@ buildNpmPackage rec { mkdir $out/bin makeWrapper $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js \ - $out/bin/redocly-cli \ + $out/bin/redocly \ --set-default REDOCLY_TELEMETRY off \ --set-default CI true # Silence update messages + + # Symlink for backwards compatibility. Remove after 24.05. + ln -s $out/bin/redocly $out/bin/redocly-cli ''; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/redocly-cli --version - runHook postInstallCheck - ''; - - doInstallCheck = true; + passthru = { + tests.version = testers.testVersion { + package = redocly; + }; + }; meta = { - description = "Redocly CLI makes OpenAPI easy. Lint/validate to any standard, generate beautiful docs, and more."; + description = "Makes OpenAPI easy. Lint/validate to any standard, generate beautiful docs, and more"; homepage = "https://github.com/Redocly/redocly-cli"; license = lib.licenses.mit; - mainProgram = "redocly-cli"; + mainProgram = "redocly"; maintainers = with lib.maintainers; [ szlend ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/refinery-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/re/refinery-cli/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/refinery-cli/default.nix rename to third_party/nixpkgs/pkgs/by-name/re/refinery-cli/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/re/regal/package.nix b/third_party/nixpkgs/pkgs/by-name/re/regal/package.nix new file mode 100644 index 0000000000..d97004f643 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/re/regal/package.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + name = "regal"; + version = "0.21.3"; + + src = fetchFromGitHub { + owner = "StyraInc"; + repo = "regal"; + rev = "v${version}"; + hash = "sha256-MeEamVAETl+PJXJ2HpbhYdEG3kqvEeT5bGzRHyTrjcY="; + }; + + vendorHash = "sha256-5rj2dCWya24VUmIFf0oJQop80trq9NnqqFlBW/A6opk="; + + meta = with lib; { + description = "a linter and language server for Rego"; + mainProgram = "regal"; + homepage = "https://github.com/StyraInc/regal"; + license = licenses.asl20; + maintainers = with maintainers; [ rinx ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/re/regina/package.nix b/third_party/nixpkgs/pkgs/by-name/re/regina/package.nix index 7480ade541..f551d09dfc 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/regina/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/regina/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "regina-rexx"; - version = "3.9.5"; + version = "3.9.6"; src = fetchurl { url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-COmpBhvuADjPtFRG3iB2b/2uUO6jf2ZCRG7E5zoqvFE="; + hash = "sha256-7ZjHp/HVpBSLAv7xsWruSmpthljQGoDPXFAwFe8Br6U="; }; buildInputs = [ ncurses ]; diff --git a/third_party/nixpkgs/pkgs/by-name/re/renode-dts2repl/package.nix b/third_party/nixpkgs/pkgs/by-name/re/renode-dts2repl/package.nix index 2472831eac..f9ad25154d 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "unstable-2024-04-16"; + version = "0-unstable-2024-05-09"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "83e2d743202684eb1f89a1b93e859c69cd736455"; - hash = "sha256-iD+59mrFNVRu6g58XXLR2Pg8oDpNIiI/+TyCdbRbjtM="; + rev = "b95c930c2122e227bbacee42f35933a4c2d40771"; + hash = "sha256-Sax+ckln+R6ll/UPztESJEjO8dtq8THmi309CaFTv0I="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/re/renode-unstable/package.nix b/third_party/nixpkgs/pkgs/by-name/re/renode-unstable/package.nix index 65a2d2cad8..147cd5aa51 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/renode-unstable/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/renode-unstable/package.nix @@ -5,11 +5,11 @@ renode.overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.0+20240404gitbfa16ba07"; + version = "1.15.0+20240509git8750f2500"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-pXA6sGYBlLU2EnhFvUwRWkYirMi5BTgzyUbQ33sIMrg="; + hash = "sha256-bvPY+VPKCHG0/QHBsM7frU0+9sSMHV0ImISChHfWiAE="; }; passthru.updateScript = diff --git a/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix b/third_party/nixpkgs/pkgs/by-name/re/renpy/package.nix similarity index 57% rename from third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix rename to third_party/nixpkgs/pkgs/by-name/re/renpy/package.nix index 45a3630f7c..d31ad9ced8 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/renpy/package.nix @@ -1,6 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, python3, pkg-config, SDL2 -, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib -, makeWrapper +{ + lib, + stdenv, + fetchFromGitHub, + python3, + pkg-config, + SDL2, + libpng, + ffmpeg, + freetype, + glew, + libGL, + libGLU, + fribidi, + zlib, + harfbuzz, + makeWrapper, }: let @@ -8,42 +22,71 @@ let # base_version is of the form major.minor.patch # vc_version is of the form YYMMDDCC # version corresponds to the tag on GitHub - base_version = "8.1.3"; - vc_version = "23091805"; -in stdenv.mkDerivation rec { - pname = "renpy"; - + base_version = "8.2.1"; + vc_version = "24030407"; version = "${base_version}.${vc_version}"; +in +stdenv.mkDerivation { + pname = "renpy"; + inherit version; src = fetchFromGitHub { owner = "renpy"; repo = "renpy"; rev = version; - sha256 = "sha256-bYqnKSWY8EEGr1+12cWeT9/ZSv5OrKLsRqCnnIruDQw="; + hash = "sha256-07Hj8mJGR0+Pn1DQ+sK5YQ3x3CTMsZ5h5yEoz44b2TM="; }; nativeBuildInputs = [ pkg-config makeWrapper - python3.pkgs.cython + # Ren'Py currently does not compile on Cython 3.x. + # See https://github.com/renpy/renpy/issues/5359 + python3.pkgs.cython_0 python3.pkgs.setuptools ]; - buildInputs = [ - SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib - ] ++ (with python3.pkgs; [ - python pygame-sdl2 tkinter future six pefile requests ecdsa - ]); + buildInputs = + [ + SDL2 + libpng + ffmpeg + freetype + glew + libGLU + libGL + fribidi + zlib + harfbuzz + ] + ++ (with python3.pkgs; [ + python + pygame-sdl2 + tkinter + future + six + pefile + requests + ecdsa + ]); - RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ - SDL2 SDL2.dev libpng ffmpeg.lib freetype glew.dev libGLU libGL fribidi zlib - ]); + RENPY_DEPS_INSTALL = lib.concatStringsSep "::" [ + SDL2 + SDL2.dev + libpng + ffmpeg.lib + freetype + glew.dev + libGLU + libGL + fribidi + zlib + harfbuzz.dev + ]; enableParallelBuilding = true; - patches = [ - ./shutup-erofs-errors.patch - ]; + patches = [ ./shutup-erofs-errors.patch ]; postPatch = '' cp tutorial/game/tutorial_director.rpy{m,} @@ -53,7 +96,7 @@ in stdenv.mkDerivation rec { official = False nightly = False # Look at https://renpy.org/latest.html for what to put. - version_name = 'Where No One Has Gone Before' + version_name = '64bit Sensation' EOF ''; @@ -79,15 +122,17 @@ in stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame-sdl2}/include/${python.libPrefix}"; - meta = with lib; { + meta = { description = "Visual Novel Engine"; mainProgram = "renpy"; homepage = "https://renpy.org/"; changelog = "https://renpy.org/doc/html/changelog.html"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ shadowrz ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ shadowrz ]; }; - passthru = { inherit base_version vc_version; }; + passthru = { + inherit base_version vc_version; + }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch b/third_party/nixpkgs/pkgs/by-name/re/renpy/shutup-erofs-errors.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch rename to third_party/nixpkgs/pkgs/by-name/re/renpy/shutup-erofs-errors.patch diff --git a/third_party/nixpkgs/pkgs/by-name/re/retool/package.nix b/third_party/nixpkgs/pkgs/by-name/re/retool/package.nix index 18a982176d..dd47fa3e6d 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/retool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/retool/package.nix @@ -5,9 +5,9 @@ , qt6 }: -python3.pkgs.buildPythonApplication { +python3.pkgs.buildPythonApplication rec { pname = "retool"; - version = "2.02.2-unstable-2024-03-17"; + version = "2.3.8"; pyproject = true; disabled = python3.pkgs.pythonOlder "3.10"; @@ -15,12 +15,13 @@ python3.pkgs.buildPythonApplication { src = fetchFromGitHub { owner = "unexpectedpanda"; repo = "retool"; - rev = "30d547c7d04b8cbf7710b2037388bf18a00a0c22"; - hash = "sha256-5Tmi3eVJh9STP9A0dDNPDs4SlIWHw8sk+g1GgpnmqeE="; + rev = "refs/tags/v${version}"; + hash = "sha256-KGBpGZAC0SjStp0aulxVRJMmNwlpvSG0i0rtZgvFCpc="; }; nativeBuildInputs = with python3.pkgs; [ hatchling + pythonRelaxDepsHook qt6.wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/by-name/re/retrospy/deps.nix b/third_party/nixpkgs/pkgs/by-name/re/retrospy/deps.nix new file mode 100644 index 0000000000..3e91b89624 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/re/retrospy/deps.nix @@ -0,0 +1,154 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Avalonia"; version = "11.0.0"; sha256 = "0wfbwrr8p5hg9f809d44gh2zfkfwnwayfw84vs33hh7ms0r380gd"; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.28"; sha256 = "0d9hyc1zmyvzlb320arwrv12ncp45llq98hibv711b7ibm11dm7c"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0"; sha256 = "06wgzhxkivlaxkn8p61wainsprml2g1q4jmvy9fpn64qnfywjdn7"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0"; sha256 = "0qlcdx4w1pcljgs7sfbn5xmmnqwp2m0fqyswrgz6c8cvjzcfsjsj"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0"; sha256 = "08y31b357fax7c1ggwhjsfwgaj6zkm2abhpc6amlmk6ci4zn12lf"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0"; sha256 = "134xl19rfswnz75a1mhil9yqy8haqa788rmd1p1kk6ibjbhb3np9"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0"; sha256 = "042s8lc83lw6ygcsiza14wlsc09rgzw3ch2qaxkhlp73bh736ps3"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0"; sha256 = "1j7wpv81wqwh6zhfzc1f36vb5dp6s2ig45v8km9sp0q6f66zkrsh"; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0"; sha256 = "1fhp6f2aj2bmzlcj0s5r9i9rcxwakdg9gvjqvdqaq8s98d0s06qh"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; sha256 = "1b5031k8slwiz7bncih67fjl6ny234yd4skqxk611l9zp5snjic2"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; sha256 = "1ra1kd0kkblppr5zy7rzdbwllggrzvp9lkxblf9mg3y8rnp6fk83"; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.0"; sha256 = "0v1pnk3hjclr2yqxmff8w6mlgmjch5gfb6yb8h0z1a5m5j6y31qv"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0"; sha256 = "1qw76n78c14xl419yzabahbsrgymm850ql05gd4fh5naq2brksdm"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0"; sha256 = "1djp4m5yin4i2f9sjv4v3syv02fllwbfinzm9h0hm2abc2ccvrm3"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0"; sha256 = "1gd4zrjyw3hg3d48ivhxp0ca7ma13dnpr8y1wc7d51ddlrj3c86g"; }) + (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.0-d1"; sha256 = "1vf5fp11zx21bsakbpf12j6mchafh749cs03w9cifb6ci98jchgh"; }) + (fetchNuGet { pname = "Desktop.Robot"; version = "1.5.0"; sha256 = "1y78cpv97cwk4xas0rcpr2wwyags424f3in63kzj8w80d9gradr1"; }) + (fetchNuGet { pname = "DialogHost.Avalonia"; version = "0.7.5"; sha256 = "1wkvqrzvhjhhg128gfr57fcm2xvs9yvix405nm7v06kn6xr12d73"; }) + (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) + (fetchNuGet { pname = "LibUsbDotNet"; version = "3.0.102-alpha"; sha256 = "05hz68aj5z76lgxz87r26314xw1a37s9wjy6gmvwwa77kg6av4d0"; }) + (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.0-d1"; sha256 = "0ks9k3wqwvdssiwbcjc4gnrfn1r8x2dbp9amraxkmws5a7vbjdyk"; }) + (fetchNuGet { pname = "MessageBox.Avalonia"; version = "3.0.0"; sha256 = "1hyfhbayyi8dqsy9fnp09qh92qdil9wsjy97pdfp2mywgr121q50"; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) + (fetchNuGet { pname = "NodaTime"; version = "3.1.9"; sha256 = "10vyhv24awjqxjhyq6sw0gbbim8wddj1hnsv9l7mjv2vmg71qz1w"; }) + (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; sha256 = "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"; }) + (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.linux-arm.runtime.native.System.IO.Ports"; version = "7.0.0"; sha256 = "1q38c2fq6c464h1hs3g6528m0m8c3a5a08vsg59mzmm42r0ayh4k"; }) + (fetchNuGet { pname = "runtime.linux-arm.runtime.native.System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "0gvrha8fp26hnzxqw99r50ki3mjnpjr6iaa483b4lahpljk06ijb"; }) + (fetchNuGet { pname = "runtime.linux-arm64.runtime.native.System.IO.Ports"; version = "7.0.0"; sha256 = "1z35v6bwwl8lv7yz37xj99gablhs9sr5y0r3zb57qmjx4psvix3f"; }) + (fetchNuGet { pname = "runtime.linux-arm64.runtime.native.System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "1flvgvbpk7iqsi3cr23bjm9kdj63rmb97bn1hxzcia8iyybdzcnj"; }) + (fetchNuGet { pname = "runtime.linux-x64.runtime.native.System.IO.Ports"; version = "7.0.0"; sha256 = "1gfzdz42rsv5gp1p4w5ygkw43gm101q444a3jzgsspp2jk50hdj7"; }) + (fetchNuGet { pname = "runtime.linux-x64.runtime.native.System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "17fw28ymsdbwpimmvh3nx2shc2khqm8gypg5q1s90kvyzb5ivzpg"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Ports"; version = "7.0.0"; sha256 = "0l52l3kkl4rg9wg25lacb8khywmclcyq230mss0aqsyjqlyxv9l8"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "0gigh53b9ddkycvhm8vg5gz53wq02qzb7kivwh69vh2454f1qap7"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx-arm64.runtime.native.System.IO.Ports"; version = "7.0.0"; sha256 = "03fjxh2lcrkgbr63zdk3sal99rrr60z9rgwa58pz4a2y78zy5h53"; }) + (fetchNuGet { pname = "runtime.osx-arm64.runtime.native.System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "0zphic782inl2mc6ijv7m4003pdlrk3rb7xdkcavxb5gy00lgc7n"; }) + (fetchNuGet { pname = "runtime.osx-x64.runtime.native.System.IO.Ports"; version = "7.0.0"; sha256 = "0y3rj0dv8l4fsw4w149q94zbqz4wm28ix5cvbhs8da3r92nqy9dj"; }) + (fetchNuGet { pname = "runtime.osx-x64.runtime.native.System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "0rnx41sgf690wx02z3i6bxgiw43khx5xq7f27arp53v7m0d11xny"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; sha256 = "1250z6sa9ghf84czlkzvaysb29c0n229z1f0vh5qls89akrkl7h8"; }) + (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; sha256 = "1lmv3jp2g7mgy9j23pd3j0wr3p89qiq8v6c6qxqf688izyni1166"; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.0.1"; sha256 = "12ypfknphk30szsymmn1378vlp4jmlcvsz88flfxyhwgxrir0453"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) + (fetchNuGet { pname = "Splat"; version = "14.4.1"; sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; }) + (fetchNuGet { pname = "SSH.NET"; version = "2020.0.2"; sha256 = "18mq7jjdbzc7qcsh5wg2j0gd39qbnrxkn811cy8wrdvki0pfi0sm"; }) + (fetchNuGet { pname = "SshNet.Security.Cryptography"; version = "1.3.0"; sha256 = "1y9r9c2dn81l1l4nn976fwf0by83qbvb0sp1hw7m19pqz7pmaflh"; }) + (fetchNuGet { pname = "System.CodeDom"; version = "7.0.0"; sha256 = "08a2k2v7kdx8wmzl4xcpfj749yy476ggqsy4cps4iyqqszgyv0zc"; }) + (fetchNuGet { pname = "System.CodeDom"; version = "8.0.0-preview.6.23329.7"; sha256 = "1wbh229qyhrhcwihpkh99kzcfmn7f13s8l94gbw3hm4d24kqks7b"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "7.0.0"; sha256 = "149d9kmakzkbw69cip1ny0wjlgcvnhrr7vz5pavpsip36k2mw02a"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0-preview.6.23329.7"; sha256 = "1jj4yizbcj54m0qhj18il5b2r2cw4njl5z46v0121qvsxsgllc8k"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "7.0.0"; sha256 = "16p8z975dnzmncfifa9gw9n3k9ycpr2qvz7lglpghsvx0fava8k9"; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0-preview.6.23329.7"; sha256 = "0c1m9c6fq4mqxv8mnwzmhpv5321lrgnn3sikis9l2072cm5lzcnm"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) + (fetchNuGet { pname = "System.IO.Ports"; version = "7.0.0"; sha256 = "0nk5r3vair9kvbgcrp8zbc60x2yr464cnm6gjsz6wj1pm5b51gvp"; }) + (fetchNuGet { pname = "System.IO.Ports"; version = "8.0.0-preview.6.23329.7"; sha256 = "0mc02ngqdbgazg7kw82g68kpbm5f7pdyjbfssjj30281116plyqq"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Management"; version = "7.0.2"; sha256 = "0mjdkzl459hnz0qg4m0xp2kwizsqgdc9vc3xk7y7cv0znhhbb7bc"; }) + (fetchNuGet { pname = "System.Management"; version = "8.0.0-preview.6.23329.7"; sha256 = "1f7apr1yq5jpr9alq03g90mj8wg9s30vxd8hp6irnf3pk9sgk5ys"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; sha256 = "1mkvx1fwychpczksy6svfmniqhbm3xqblxqik6178l12xgq7aw45"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0-preview.6.23329.7"; sha256 = "1xs1fmz30gr0g5c2m0xy1dx5rlfsfapyj8l6v7a9c312bd02m4id"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; sha256 = "0wkm6bj4abknzj41ygkziifx8mzhj4bix92wjvj6lihaw1gniq8c"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) + (fetchNuGet { pname = "Vortice.DirectInput"; version = "3.2.0"; sha256 = "0ig60651kvynw6x3f70y3c95n581shr1k75b407p1n9mr8qnzfsy"; }) + (fetchNuGet { pname = "Vortice.DirectX"; version = "3.2.0"; sha256 = "15wlzag7p8kvrjzjpndaa1pb9acpvylnxz8vb3rx2d3q62k9k2hw"; }) + (fetchNuGet { pname = "Vortice.Mathematics"; version = "1.5.2"; sha256 = "04s282b07fz1h1d6rw1iiqcsfpj415fin5q5cxmq2bg7a930rfjz"; }) + (fetchNuGet { pname = "Vortice.XInput"; version = "3.2.0"; sha256 = "00bkrsml45rzy1yvxfrykdgmg9g74ac3a2xb0251205mziwa0m3x"; }) +] diff --git a/third_party/nixpkgs/pkgs/by-name/re/retrospy/package.nix b/third_party/nixpkgs/pkgs/by-name/re/retrospy/package.nix new file mode 100644 index 0000000000..07ba2d35da --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/re/retrospy/package.nix @@ -0,0 +1,89 @@ +{ buildDotnetModule +, fetchFromGitHub +, dotnetCorePackages +, copyDesktopItems +, makeDesktopItem +, lib +, fontconfig +, libX11 +, libXcursor +, libICE +, libSM +, runCommandLocal +}: +let + version = "6.4.8"; + + src = fetchFromGitHub { + owner = "retrospy"; + repo = "RetroSpy"; + rev = "v${version}"; + hash = "sha256-0rdLdud78gnBX8CIdG81caJ1IRoIjGzb7coP4huEPDA="; + }; + + executables = [ + "RetroSpy" + "GBPemu" + "GBPUpdater" + "UsbUpdater" + ]; + + retrospy-icons = runCommandLocal "retrospy-icons" { } '' + mkdir -p $out/share/retrospy + ${builtins.concatStringsSep "\n" (map (e: "cp ${src}/${e}.ico $out/share/retrospy/${e}.ico") executables)} + ''; +in +buildDotnetModule { + pname = "retrospy"; + inherit version; + + inherit src; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + runtimeDeps = [ + fontconfig + libX11 + libICE + libXcursor + libSM + ]; + + projectFile = [ + "RetroSpyX/RetroSpyX.csproj" + "GBPemuX/GBPemuX.csproj" + "GBPUpdaterX2/GBPUpdaterX2.csproj" + "UsbUpdaterX2/UsbUpdaterX2.csproj" + ]; + + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; + + nugetDeps = ./deps.nix; + + inherit executables; + + passthru.updateScript = ./update.sh; + + desktopItems = map + (e: (makeDesktopItem { + name = e; + exec = e; + icon = "${retrospy-icons}/share/retrospy/${e}.ico"; + desktopName = "${e}"; + categories = [ "Utility" ]; + startupWMClass = e; + })) + executables; + + meta = { + description = "Live controller viewer for Nintendo consoles as well as many other retro consoles and computers"; + homepage = "https://retro-spy.com/"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.naxdy ]; + platforms = lib.platforms.linux; + }; +} + diff --git a/third_party/nixpkgs/pkgs/by-name/re/retrospy/update.sh b/third_party/nixpkgs/pkgs/by-name/re/retrospy/update.sh new file mode 100755 index 0000000000..f3715f9da4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/re/retrospy/update.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts +# shellcheck shell=bash +set -euo pipefail + +new_version="$(curl -s "https://api.github.com/repos/retrospy/RetroSpy/releases?per_page=1" | jq -r '.[0].tag_name')" +new_version=${new_version#v} +old_version=$(nix-instantiate --eval -A retrospy.version | jq -e -r) + +if [[ "$new_version" == "$old_version" ]]; then + echo "Up to date" + exit 0 +fi + +update-source-version retrospy "$new_version" + +eval "$(nix-build . -A retrospy.fetch-deps --no-out-link)" diff --git a/third_party/nixpkgs/pkgs/by-name/rh/rHttp/package.nix b/third_party/nixpkgs/pkgs/by-name/rh/rHttp/package.nix new file mode 100644 index 0000000000..bd28007dc3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/rh/rHttp/package.nix @@ -0,0 +1,27 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + ... +}: +buildGoModule { + pname = "rHttp"; + version = "unstable-2024-04-28"; + + src = fetchFromGitHub { + owner = "1buran"; + repo = "rHttp"; + rev = "9b7da3a0f7c2e35c9d326e7920ded15f806f8113"; + sha256 = "1nz3f6zgpbxlwn6c5rqxa8897ygi5r7h7f6624i27rq9kr729cra"; + }; + + vendorHash = "sha256-NR1q44IUSME+x1EOcnXXRoIXw8Av0uH7iXhD+cdd99I="; + + meta = with lib; { + description = "Go REPL for HTTP"; + homepage = "https://github.com/1buran/rHttp"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ luftmensch-luftmensch ]; + mainProgram = "rhttp"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ri/ride/mk.patch b/third_party/nixpkgs/pkgs/by-name/ri/ride/mk.patch new file mode 100644 index 0000000000..0a26356b09 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ri/ride/mk.patch @@ -0,0 +1,34 @@ +diff --git a/mk b/mk +index a5baa0f8..37cac28e 100755 +--- a/mk ++++ b/mk +@@ -25,7 +25,7 @@ const rm = (x) => { + }; + const pj = JSON.parse(rf('package.json')); + // v:version string - "x.y.z" where z is the number of commits since the beginning of the project +-const v = `${pj.version.replace(/\.0$/, '')}.${sh('git rev-list --count HEAD')}`; ++const v = "@version@"; + const isDyalogBuild = /^dyalog/.test(pj.name); + const tasks = { }; + +@@ -36,8 +36,8 @@ const b = (f) => { + const vi = { + versionInfo: { + version: v, +- date: sh('git show -s HEAD --pretty=format:%ci'), +- rev: sh('git rev-parse HEAD'), ++ date: 'unknown', ++ rev: 'nixpkgs', + }, + }; + wf('_/version.js', `D=${JSON.stringify(vi)}`); +@@ -50,6 +50,9 @@ const incl = new RegExp('^$' + + '|^/style($|/(fonts|img)|.*\\.css$)'); + const pkg = (x, y, f) => { + rq('electron-packager')({ ++ asar: true, ++ electronZipDir: "local-cache", ++ electronVersion: "@electron_version@", + dir: '.', + platform: x, + arch: y, diff --git a/third_party/nixpkgs/pkgs/by-name/ri/ride/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/ride/package.nix new file mode 100644 index 0000000000..55ad02104b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ri/ride/package.nix @@ -0,0 +1,152 @@ +{ + lib, + stdenv, + buildNpmPackage, + fetchFromGitHub, + substituteAll, + jq, + moreutils, + zip, + makeWrapper, + copyDesktopItems, + makeDesktopItem, + electron_27, +}: + +let + platformInfos = { + "x86_64-linux" = { + zipSuffix = "linux-x64"; + buildCmd = "linux"; + }; + "x86_64-darwin" = { + zipSuffix = "darwin-x64"; + buildCmd = "osx"; + }; + "aarch64-darwin" = { + zipSuffix = "darwin-arm64"; + buildCmd = "osxarm"; + }; + }; + + platformInfo = platformInfos.${stdenv.system}; + + # Electron 27 is the latest version that works as of RIDE version 4.5.4097 + electron = electron_27; +in +buildNpmPackage rec { + pname = "ride"; + version = "4.5.4097"; + + src = fetchFromGitHub { + owner = "Dyalog"; + repo = "ride"; + rev = "v${version}"; + hash = "sha256-xR+HVC1JVrPkgPhIJZxdTVG52+QbanmD1c/uO5l84oc="; + }; + + npmDepsHash = "sha256-EG3pZkjDGBI2dDaQZ6351+oU4xfHd6HNB8eD7ErpYIg="; + + patches = [ + # Fix info in the "about" page, set electron version, set local-cache as zipdir + (substituteAll { + src = ./mk.patch; + version = version; + electron_version = electron.version; + }) + ]; + + postPatch = '' + # Remove spectron (it would download electron-chromedriver binaries) + ${jq}/bin/jq 'del(.devDependencies.spectron)' package.json | ${moreutils}/bin/sponge package.json + + pushd style + + # Remove non-deterministic glob ordering + sed -i "/\*\*/d" layout.less light-theme.less dark-theme.less + + # Individually include all files that were previously globbed + shopt -s globstar + for file in less/layout/**/*.less; do + echo "@import '$file';" >> layout.less + done + for file in less/colour/**/*.less; do + echo "@import '$file';" >> light-theme.less + echo "@import '$file';" >> dark-theme.less + done + shopt -u globstar + + popd + ''; + + nativeBuildInputs = [ + zip + makeWrapper + copyDesktopItems + ]; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + npmBuildFlags = platformInfo.buildCmd; + + # This package uses electron-packager instead of electron-builder + # Here, we create a local cache of electron zip-files, so electron-packager can copy from it + postConfigure = '' + mkdir local-cache + cp -r --no-preserve=all ${electron}/libexec/electron electron + pushd electron + zip -qr ../local-cache/electron-v${electron.version}-${platformInfo.zipSuffix}.zip * + popd + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 D.png $out/share/icons/hicolor/64x64/apps/ride.png + install -Dm644 D.svg $out/share/icons/hicolor/scalable/apps/ride.svg + + pushd _/ride*/* + + install -Dm644 ThirdPartyNotices.txt -t $out/share/doc/ride + + mkdir -p $out/share/ride + cp -r locales resources{,.pak} $out/share/ride + makeWrapper ${lib.getExe electron} $out/bin/ride \ + --add-flags $out/share/ride/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --inherit-argv0 + + popd + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ride"; + exec = "ride"; + icon = "ride"; + desktopName = "RIDE"; + categories = [ + "Development" + "IDE" + ]; + comment = meta.description; + terminal = false; + }) + ]; + + meta = { + broken = stdenv.isDarwin; + changelog = "https://github.com/Dyalog/ride/releases/tag/${src.rev}"; + description = "Remote IDE for Dyalog APL"; + homepage = "https://github.com/Dyalog/ride"; + license = lib.licenses.mit; + mainProgram = "ride"; + maintainers = with lib.maintainers; [ + tomasajt + markus1189 + ]; + platforms = lib.attrNames platformInfos; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ri/rifiuti/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/rifiuti/package.nix new file mode 100644 index 0000000000..d1134e2288 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ri/rifiuti/package.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchzip +, fetchurl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rifiuti"; + version = "20040505_1"; + + src = fetchzip { + url = "mirror://sourceforge/project/odessa/Rifiuti/${finalAttrs.version}/rifiuti_${finalAttrs.version}.zip"; + hash = "sha256-bVPz0nXexGtQtXxGb3Mc79tzyZikc7KxNNWuvgu6pQ0="; + }; + + patches = [ + (fetchurl { + name = "add-GCC-hardening.patch"; + url = "https://salsa.debian.org/pkg-security-team/rifiuti/-/raw/f237358a91b12776beb9942c79ccb3aea180968a/debian/patches/add-GCC-hardening"; + hash = "sha256-Z4UajJ8WydoCKjkG4q7WsBSXWwkM8B6UXBoWN1Qas60="; + }) + (fetchurl { + name = "fix-bts-crash-on-malformed-file.patch"; + url = "https://salsa.debian.org/pkg-security-team/rifiuti/-/raw/5b51604942b518b7752843cf7d693f202dc9c6f1/debian/patches/fix-bts-crash-on-malformed-file.patch"; + hash = "sha256-1kZKC6qIGpCl1zOvKiWh6FcyYX3WozHBSPBHUsL2eMI="; + }) + (fetchurl { + name = "fix-warnings"; + url = "https://salsa.debian.org/pkg-security-team/rifiuti/-/raw/f237358a91b12776beb9942c79ccb3aea180968a/debian/patches/fix-warnings"; + hash = "sha256-9/OckpNqZQdkmNsUeHUEi6wT12mBd7aMA5dKgQAxXq8="; + }) + (fetchurl { + name = "use-CC-and-abort-on-error.patch"; + url = "https://salsa.debian.org/pkg-security-team/rifiuti/-/raw/5bd48acbcb63cee324556c4ec29750ce1e41755c/debian/patches/use-CC-and-abort-on-error.patch"; + hash = "sha256-RE4Vswtc887neJ3yAe0YWcs5YtZbwd1UtcTF4zBsmlo="; + }) + ]; + + postPatch = '' + substituteInPlace src/Makefile \ + --replace-fail gcc cc + ''; + + makeFlags = [ + "-C src" + ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + install -D bin/rifiuti $out/bin/rifiuti + runHook postInstall + ''; + + meta = with lib; { + description = "Analyze Windows Recycle Bin INFO2 file"; + mainProgram = "rifiuti"; + homepage = "https://sourceforge.net/projects/odessa/files/Rifiuti"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.bsd3; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ri/ripsecrets/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/ripsecrets/package.nix index d578a13ead..540eb3a8d9 100644 --- a/third_party/nixpkgs/pkgs/by-name/ri/ripsecrets/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ri/ripsecrets/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "ripsecrets"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "sirwart"; repo = "ripsecrets"; rev = "v${version}"; - hash = "sha256-NDSMxIq6eBXOv/mI662vsIIOfWQEzQ5fDGznC4+gFyE="; + hash = "sha256-MyFeSEZAG99g1Uh8KVA7CSZZVXUOF2qYJ0o1YviiPp4="; }; - cargoHash = "sha256-vp2gQUf6TWFkJ09STOlqlEB+jsGrVGAmix2eSgBDG/o="; + cargoHash = "sha256-BKq1ttf8ctXvIbhKxHwCpjeiRKqSyN5+kP2k4CV511I="; meta = with lib; { description = "A command-line tool to prevent committing secret keys into your source code"; diff --git a/third_party/nixpkgs/pkgs/by-name/ri/river-bnf/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/river-bnf/package.nix index f869a6e2ff..bae48c2684 100644 --- a/third_party/nixpkgs/pkgs/by-name/ri/river-bnf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ri/river-bnf/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "river-bnf"; - version = "unstable-2023-10-10"; + version = "0-unstable-2023-10-10"; src = fetchFromSourcehut { owner = "~leon_plickat"; diff --git a/third_party/nixpkgs/pkgs/by-name/ri/river-filtile/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/river-filtile/package.nix new file mode 100644 index 0000000000..e54c3e9b43 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ri/river-filtile/package.nix @@ -0,0 +1,31 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "river-filtile"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "pkulak"; + repo = "filtile"; + rev = "v${version}"; + hash = "sha256-wBU4CX6KGnTvrBsXvFAlRrvDqvHHbAlVkDqTCJx90G8="; + }; + + cargoHash = "sha256-W5e19gzkZZjTTSZdww2x7M0LnR/gClQxMeAiDITO3HY="; + + nativeBuildInputs = [ + pkg-config + ]; + + meta = with lib; { + description = "A layout manager for the River window manager"; + homepage = "https://github.com/pkulak/filtile"; + license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ pkulak ]; + mainProgram = "filtile"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/rk/rkbin/package.nix b/third_party/nixpkgs/pkgs/by-name/rk/rkbin/package.nix index 9ccff94a4e..5579703dac 100644 --- a/third_party/nixpkgs/pkgs/by-name/rk/rkbin/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rk/rkbin/package.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation { homepage = "https://github.com/rockchip-linux/rkbin"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ thefossguy ]; - platforms = [ "aarch64-linux" ]; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/rk/rkboot/package.nix b/third_party/nixpkgs/pkgs/by-name/rk/rkboot/package.nix new file mode 100644 index 0000000000..5e71406967 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/rk/rkboot/package.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, rkbin +, box64 +}: + +stdenv.mkDerivation { + name = "rkboot"; + + src = rkbin.src; + + postPatch = '' + substituteInPlace RKBOOT/*.ini --replace 'PATH=' 'PATH=rkboot/' + ''; + + buildPhase = '' + mkdir rkboot + for i in $(ls ./RKBOOT/*.ini) + do + # The proprietary, statically linked binaries to perform boot_merge are + # x86_64 only. Though we use box64 to emulate if building on aarch64-linux + ${lib.optionalString stdenv.isAarch64 "${lib.getExe box64}"} ./tools/boot_merger "$i" || true + done + ''; + + installPhase = '' + mkdir -p $out + if [ -z "$(ls -A rkboot)" ]; then + echo "Error: The 'rkboot' directory is empty." + exit 1 + else + mv rkboot $out/bin + fi + ''; + + meta = with lib; { + description = "Rockchip proprietary SPL bootloader blobs"; + homepage = "https://github.com/rockchip-linux/rkbin"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ matthewcroughan ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/rm/rmenu/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/rm/rmenu/Cargo.lock index 33210d3b2f..6ed58a03c5 100644 --- a/third_party/nixpkgs/pkgs/by-name/rm/rmenu/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/rm/rmenu/Cargo.lock @@ -76,9 +76,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arrayref" @@ -105,27 +105,26 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-lite 2.3.0", "slab", ] @@ -136,7 +135,7 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.2.0", + "async-channel 2.2.1", "async-executor", "async-io 2.3.2", "async-lock 3.3.0", @@ -177,8 +176,8 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.6.0", - "rustix 0.38.32", + "polling 3.7.0", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -232,19 +231,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -357,18 +356,16 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ - "async-channel 2.2.0", + "async-channel 2.2.1", "async-lock 3.3.0", "async-task", - "fastrand 2.0.2", "futures-io", "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] @@ -489,9 +486,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.92" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" [[package]] name = "cesu8" @@ -512,9 +509,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -557,7 +554,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -610,9 +607,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -620,9 +617,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -772,7 +769,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -843,7 +840,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -876,7 +873,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -900,7 +897,7 @@ dependencies = [ [[package]] name = "desktop" -version = "0.0.1" +version = "0.0.2" dependencies = [ "freedesktop-desktop-entry", "freedesktop-icons", @@ -968,7 +965,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1079,7 +1076,7 @@ dependencies = [ "dioxus-core", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1161,9 +1158,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "enumset" @@ -1183,7 +1180,7 @@ dependencies = [ "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1265,9 +1262,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ "event-listener 5.3.0", "pin-project-lite", @@ -1284,9 +1281,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1309,9 +1306,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "4556222738635b7a3417ae6130d8f52201e45a0c4d1a907f0826383adb5f85e7" dependencies = [ "crc32fast", "miniz_oxide", @@ -1480,7 +1477,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -1495,7 +1492,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1822,7 +1819,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -2324,9 +2321,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2674,9 +2671,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -2684,15 +2681,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -2799,7 +2796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.2", + "fastrand 2.1.0", "futures-io", ] @@ -2840,15 +2837,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi", "pin-project-lite", - "rustix 0.38.32", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] @@ -2867,12 +2864,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "prettyplease" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" dependencies = [ "proc-macro2", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -2917,9 +2914,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -2935,9 +2932,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3037,11 +3034,11 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] @@ -3137,7 +3134,7 @@ dependencies = [ [[package]] name = "rmenu" -version = "1.2.1" +version = "1.2.2" dependencies = [ "cached 0.44.0", "clap", @@ -3257,9 +3254,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -3333,9 +3330,9 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] @@ -3352,20 +3349,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa 1.0.11", "ryu", @@ -3380,7 +3377,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -3639,9 +3636,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -3774,22 +3771,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -3870,7 +3867,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -3891,7 +3888,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.12", ] [[package]] @@ -3916,15 +3913,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.7", ] [[package]] @@ -3946,7 +3943,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -4211,7 +4208,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -4245,7 +4242,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4268,9 +4265,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd595fb70f33583ac61644820ebc144a26c96028b625b96cafcd861f4743fbc8" +checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" dependencies = [ "core-foundation", "home", @@ -4380,7 +4377,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.32", + "rustix 0.38.34", ] [[package]] @@ -4401,11 +4398,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4498,7 +4495,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4533,17 +4530,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "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_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -4566,9 +4564,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -4584,9 +4582,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -4602,9 +4600,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -4620,9 +4624,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -4638,9 +4642,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -4656,9 +4660,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -4674,9 +4678,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -4689,9 +4693,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" dependencies = [ "memchr", ] diff --git a/third_party/nixpkgs/pkgs/by-name/rm/rmenu/package.nix b/third_party/nixpkgs/pkgs/by-name/rm/rmenu/package.nix index 15de597438..f5abbc9dd6 100644 --- a/third_party/nixpkgs/pkgs/by-name/rm/rmenu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rm/rmenu/package.nix @@ -7,22 +7,22 @@ , pkg-config , rustPlatform , webkitgtk_4_1 -, wrapGAppsHook +, wrapGAppsHook3 }: rustPlatform.buildRustPackage rec { pname = "rmenu"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "imgurbot12"; repo = "rmenu"; - hash = "sha256-JHJZfDxrDi0rJSloPdOVdvo/XkrFhvshd7yZWn/zELU="; + hash = "sha256-khauloUGVuekR+Lran1DLnsxwY8sIf5PsEKY7sNy1K4="; }; nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/rmfakecloud/default.nix b/third_party/nixpkgs/pkgs/by-name/rm/rmfakecloud/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/rmfakecloud/default.nix rename to third_party/nixpkgs/pkgs/by-name/rm/rmfakecloud/package.nix diff --git a/third_party/nixpkgs/pkgs/servers/rmfakecloud/webui.nix b/third_party/nixpkgs/pkgs/by-name/rm/rmfakecloud/webui.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/rmfakecloud/webui.nix rename to third_party/nixpkgs/pkgs/by-name/rm/rmfakecloud/webui.nix diff --git a/third_party/nixpkgs/pkgs/by-name/rm/rmg/package.nix b/third_party/nixpkgs/pkgs/by-name/rm/rmg/package.nix index 50436f36b9..4c2643346a 100644 --- a/third_party/nixpkgs/pkgs/by-name/rm/rmg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rm/rmg/package.nix @@ -20,12 +20,13 @@ , which , xdg-user-dirs , zlib +, withWayland ? false # Affects final license , withAngrylionRdpPlus ? false }: let - inherit (qt6Packages) qtbase qtsvg wrapQtAppsHook; + inherit (qt6Packages) qtbase qtsvg qtwayland wrapQtAppsHook; in stdenv.mkDerivation rec { pname = "rmg"; @@ -72,7 +73,7 @@ stdenv.mkDerivation rec { vulkan-loader xdg-user-dirs zlib - ]; + ] ++ lib.optional withWayland qtwayland; cmakeFlags = [ "-DPORTABLE_INSTALL=OFF" @@ -84,7 +85,7 @@ stdenv.mkDerivation rec { qtWrapperArgs = lib.optionals stdenv.isLinux [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" - ]; + ] ++ lib.optional withWayland "--set RMG_WAYLAND 1"; meta = with lib; { homepage = "https://github.com/Rosalie241/RMG"; diff --git a/third_party/nixpkgs/pkgs/by-name/ro/rofimoji/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/rofimoji/package.nix index 56730c975f..c694f88dd1 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/rofimoji/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/rofimoji/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "rofimoji"; - version = "6.2.0"; + version = "6.3.1"; pyproject = true; src = fetchFromGitHub { owner = "fdw"; repo = "rofimoji"; - rev = version; - hash = "sha256-9P9hXBEfq6sqCvb2SfPBNadEoXAdWF3cmcKGEOK+EHE="; + rev = "refs/tags/${version}"; + hash = "sha256-gYLUUbT6OHMo2nzJ//Pa0vZ9WPcHs6YnAjTKNO07VNk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ro/rosa/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/rosa/package.nix index c50ca87e82..b9156afa9d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/rosa/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/rosa/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rosa"; - version = "1.2.36"; + version = "1.2.38"; src = fetchFromGitHub { owner = "openshift"; repo = "rosa"; rev = "v${version}"; - hash = "sha256-jdLMQLbk446QJ+8+HjTCTjtlCuLlZZsLUBInRg4UMH0="; + hash = "sha256-eS9mK5iK/fXWMpgA/RF7wYybcJtPDW/pIWo9Iw0I+K8="; }; vendorHash = null; @@ -16,6 +16,18 @@ buildGoModule rec { __darwinAllowLocalNetworking = true; + postPatch = '' + # e2e tests require network access + rm -r tests/e2e + ''; + + preCheck = '' + # Workaround for cmd/list/rhRegion/cmd_test.go:39 + # Failed to get OCM regions: Can't retrieve shards: Get "https://api.stage.openshift.com/static/ocm-shards.json": dial tcp: lookup api.stage.openshift.com on [::1]:53: read udp [::1]:55793->[::1]:53: read: connection refused + substituteInPlace "cmd/list/rhRegion/cmd_test.go" \ + --replace-fail "TestRhRegionCommand" "SkipRhRegionCommand" + ''; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' installShellCompletion --cmd rosa \ diff --git a/third_party/nixpkgs/pkgs/by-name/ro/route-graph/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/route-graph/package.nix index 7b5e20451a..36158282f7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/route-graph/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/route-graph/package.nix @@ -6,22 +6,26 @@ python3.pkgs.buildPythonApplication rec { pname = "route-graph"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; src = fetchFromGitHub { owner = "audiusGmbH"; repo = "route-graph"; rev = "refs/tags/${version}"; - hash = "sha256-OOXLmHxWre5t4tysDXV23PTkyUG6Zcpanw0fVCOLFTM="; + hash = "sha256-HmfmUeT5vt0yWVs7GhIPVt4NZtTfe7HYPLRqfQE/tZM="; }; pythonRelaxDeps = [ + "typer" "typing-extensions" ]; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core + ]; + + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ro/roxterm/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/roxterm/package.nix index 8b4f2e79c2..bf4d5ec499 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/roxterm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/roxterm/package.nix @@ -25,7 +25,7 @@ , stdenv , util-linuxMinimal , vte -, wrapGAppsHook +, wrapGAppsHook3 , xmlto }: @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { cmake libxslt pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/rp/rpcs3/package.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpcs3/package.nix index 87470d96c2..ef9b5965af 100644 --- a/third_party/nixpkgs/pkgs/by-name/rp/rpcs3/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rp/rpcs3/package.nix @@ -32,10 +32,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "16334-fba1db29b"; - rpcs3Version = "0.0.31-16334-fba1db29b"; - rpcs3Revision = "fba1db29b32b5cfeb66cb6bd3c2745e190557b10"; - rpcs3Hash = "sha256-vCdZVecvFeWXYG9Hb0oT/gGdlLnTFOORTUdKGBD9onM="; + rpcs3GitVersion = "16391-39e946630"; + rpcs3Version = "0.0.31-16391-39e946630"; + rpcs3Revision = "39e946630da8e23c4d2d2b763f63145eb9205e43"; + rpcs3Hash = "sha256-CIPUmcpBc6iRMzZJZ5vKty/Uh4TYiR65xXD4aKRPSKc="; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in diff --git a/third_party/nixpkgs/pkgs/by-name/rq/rqbit/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/rq/rqbit/Cargo.lock index a24314e30e..e8515b5987 100644 --- a/third_party/nixpkgs/pkgs/by-name/rq/rqbit/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/rq/rqbit/Cargo.lock @@ -91,9 +91,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "async-recursion" @@ -130,9 +130,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", @@ -186,7 +186,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.2.0", + "hyper 1.3.1", "hyper-util", "itoa", "matchit", @@ -199,7 +199,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 1.0.0", + "sync_wrapper 1.0.1", "tokio", "tower", "tower-layer", @@ -327,9 +327,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -345,9 +345,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.90" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" [[package]] name = "cfg-if" @@ -357,9 +357,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -367,7 +367,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -643,15 +643,15 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -840,9 +840,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", @@ -1042,9 +1042,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", @@ -1069,7 +1069,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.2.0", + "hyper 1.3.1", "hyper-util", "rustls", "rustls-pki-types", @@ -1098,7 +1098,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.2.0", + "hyper 1.3.1", "hyper-util", "native-tls", "tokio", @@ -1117,7 +1117,7 @@ dependencies = [ "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.2.0", + "hyper 1.3.1", "pin-project-lite", "socket2", "tokio", @@ -1261,7 +1261,7 @@ dependencies = [ [[package]] name = "librqbit" -version = "5.6.0" +version = "5.6.1" dependencies = [ "anyhow", "async-stream", @@ -1384,7 +1384,7 @@ dependencies = [ [[package]] name = "librqbit-peer-protocol" -version = "3.5.2" +version = "3.5.3" dependencies = [ "anyhow", "bincode", @@ -1843,9 +1843,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -1884,9 +1884,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1993,9 +1993,9 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "base64 0.22.0", "bytes", @@ -2006,7 +2006,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.2.0", + "hyper 1.3.1", "hyper-rustls", "hyper-tls", "hyper-util", @@ -2064,7 +2064,7 @@ dependencies = [ [[package]] name = "rqbit" -version = "5.6.0" +version = "5.6.1" dependencies = [ "anyhow", "bytes", @@ -2093,9 +2093,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -2106,9 +2106,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.3" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", @@ -2120,25 +2120,25 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" dependencies = [ "ring", "rustls-pki-types", @@ -2147,9 +2147,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" @@ -2197,9 +2197,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] @@ -2218,9 +2218,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", @@ -2229,9 +2229,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -2365,9 +2365,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.58" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -2382,9 +2382,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "system-configuration" @@ -2427,18 +2427,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", @@ -2467,9 +2467,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -2488,9 +2488,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -2978,7 +2978,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2996,7 +2996,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -3016,17 +3016,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "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_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -3037,9 +3038,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -3049,9 +3050,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -3061,9 +3062,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -3073,9 +3080,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -3085,9 +3092,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -3097,9 +3104,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -3109,9 +3116,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winreg" diff --git a/third_party/nixpkgs/pkgs/by-name/rq/rqbit/package.nix b/third_party/nixpkgs/pkgs/by-name/rq/rqbit/package.nix index 6ce43d31db..0aece0632d 100644 --- a/third_party/nixpkgs/pkgs/by-name/rq/rqbit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rq/rqbit/package.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "5.6.0"; + version = "5.6.1"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - hash = "sha256-KpwKSbj9B/O/RBO1PLkcYguZiuxrGcYyX3Wt4sQhe2o="; + hash = "sha256-SRom/rLyF7R+ESWsAKeLLujvuj5w7+Evlsm+8BKe2f0="; }; cargoLock = { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ikatson/rqbit"; changelog = "https://github.com/ikatson/rqbit/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "rqbit"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/rt/rtaudio_6/package.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtaudio_6/package.nix new file mode 100644 index 0000000000..f00788782f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/rt/rtaudio_6/package.nix @@ -0,0 +1,68 @@ +{ stdenv +, lib +, config +, fetchFromGitHub +, testers +, cmake +, pkg-config +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsa-lib +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux +, libpulseaudio +, jackSupport ? true +, libjack2 +, coreaudioSupport ? stdenv.hostPlatform.isDarwin +, darwin +, validatePkgConfig +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rtaudio"; + version = "6.0.1"; + + src = fetchFromGitHub { + owner = "thestk"; + repo = "rtaudio"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-Acsxbnl+V+Y4mKC1gD11n0m03E96HMK+oEY/YV7rlIY="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + validatePkgConfig + ]; + + buildInputs = lib.optionals alsaSupport [ + alsa-lib + ] ++ lib.optionals pulseaudioSupport [ + libpulseaudio + ] ++ lib.optionals jackSupport [ + libjack2 + ] ++ lib.optionals coreaudioSupport [ + darwin.apple_sdk.frameworks.CoreAudio + ]; + + cmakeFlags = [ + (lib.cmakeBool "RTAUDIO_API_ALSA" alsaSupport) + (lib.cmakeBool "RTAUDIO_API_PULSE" pulseaudioSupport) + (lib.cmakeBool "RTAUDIO_API_JACK" jackSupport) + (lib.cmakeBool "RTAUDIO_API_CORE" coreaudioSupport) + ]; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + description = "A set of C++ classes that provide a cross platform API for realtime audio input/output"; + homepage = "https://www.music.mcgill.ca/~gary/rtaudio/"; + changelog = "https://github.com/thestk/rtaudio/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ magnetophon ]; + platforms = lib.platforms.unix; + pkgConfigModules = [ + "rtaudio" + ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/rw/rwpspread/package.nix b/third_party/nixpkgs/pkgs/by-name/rw/rwpspread/package.nix index 347835506d..23df67be87 100644 --- a/third_party/nixpkgs/pkgs/by-name/rw/rwpspread/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/rw/rwpspread/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "rwpspread"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "0xk1f0"; repo = "rwpspread"; rev = "v${version}"; - hash = "sha256-kISC3fYtwgjNRWCFniIzNaaNLnvlFL+y5J14PdcZ7fQ="; + hash = "sha256-6pYMKBm3f0kH+KD6yWy7/H/bg8v7hNm81KAKHp02HY8="; }; - cargoHash = "sha256-2SjgY9YIHOUXL0+Njkh/peXUWJGlyI0fW8DVvdJXWV8="; + cargoHash = "sha256-/SjSwjrqODx9imtVxmOCrG4KwhXymHokyQ8FSC1SOd8="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/deps.nix b/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/deps.nix index d012144840..393c492d21 100644 --- a/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/deps.nix +++ b/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/deps.nix @@ -151,7 +151,7 @@ (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; sha256 = "05918f6fl8byla2m7qjp7dvxww2rbpj2sqd4xq26rl885fmddfvf"; }) (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.KHR"; version = "2.16.0"; sha256 = "1j4wsv7kjgjkmf2vlm5jjnqkdh265rkz5s1hx42i0f4bmdaz2kj1"; }) (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0"; sha256 = "1lsc789fqsnh3jx5w0g5k2n1wlww58zyzrcf5rs3wx2fjrqi084k"; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.7"; sha256 = "07rd8vbd23ynhpz4y81b8fqnbn5q5q7rvcdwcky3nzngdg3vgw08"; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.8"; sha256 = "049k8zf9acqncfdbdc7875fvndk2089mwlm5igam88vwc5i5vh75"; }) (fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0"; sha256 = "0gh6xzw0jhjxf2slky11sdj0s8mp5dmps5k0rlx4krm68xb98zr0"; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; sha256 = "0xs11zjw9ha68maw3l825kfwlrid43qwy0mswljxhpjh0y1k6k6b"; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/package.nix b/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/package.nix index a32f86e239..4740e943a5 100644 --- a/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ry/ryujinx/package.nix @@ -26,13 +26,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.1281"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1298"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "8884d1fd732c9ba788f0ab711e6a9f507d934ac8"; - sha256 = "0g4x10whiybckvx8hhpdrpa8mbypwmpq1av6cjk53zc7iwkhvigw"; + rev = "a23d8cb92f3f1bb8dc144f4d9fb3fddee749feae"; + sha256 = "1vf4xwn1z7bfm7c49r2yydx3dqqzqwp0qgzq12m9yskqsj898d63"; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; diff --git a/third_party/nixpkgs/pkgs/tools/system/s0ix-selftest-tool/default.nix b/third_party/nixpkgs/pkgs/by-name/s0/s0ix-selftest-tool/package.nix similarity index 50% rename from third_party/nixpkgs/pkgs/tools/system/s0ix-selftest-tool/default.nix rename to third_party/nixpkgs/pkgs/by-name/s0/s0ix-selftest-tool/package.nix index 535a68f6ff..89b5c104aa 100644 --- a/third_party/nixpkgs/pkgs/tools/system/s0ix-selftest-tool/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/s0/s0ix-selftest-tool/package.nix @@ -1,6 +1,5 @@ { acpica-tools, - bash, bc, coreutils, fetchFromGitHub, @@ -11,71 +10,65 @@ lib, pciutils, powertop, - resholve, + makeWrapper, + stdenv, + unstableGitUpdater, util-linux, xorg, xxd, }: -resholve.mkDerivation { + +let + deps = [ + acpica-tools + bc + coreutils + gawk + gnugrep + gnused + linuxPackages.turbostat + pciutils + powertop + util-linux + xorg.xset + xxd + ]; +in +stdenv.mkDerivation { pname = "s0ix-selftest-tool"; - version = "unstable-2022-11-04"; + version = "0-unstable-2024-02-07"; src = fetchFromGitHub { owner = "intel"; repo = "S0ixSelftestTool"; - rev = "1b6db3c3470a3a74b052cb728a544199661d18ec"; - hash = "sha256-w97jfdppW8kC8K8XvBntmkfntIctXDQCWmvug+H1hKA="; + rev = "c12ae3ea611812547e09bb755dd015dd969b664c"; + hash = "sha256-9O72TxlLrkQbt80izWdbLQt9OW/4Aq1p4RuQoD2yQ5E="; }; # don't use the bundled turbostat binary postPatch = '' substituteInPlace s0ix-selftest-tool.sh --replace '"$DIR"/turbostat' 'turbostat' - substituteInPlace s0ix-selftest-tool.sh --replace 'sudo ' "" - ''; + nativeBuildInputs = [ makeWrapper ]; dontConfigure = true; dontBuild = true; installPhase = '' runHook preInstall install -Dm555 s0ix-selftest-tool.sh "$out/bin/s0ix-selftest-tool" + wrapProgram "$out/bin/s0ix-selftest-tool" --prefix PATH : ${lib.escapeShellArg deps} runHook postInstall ''; - solutions = { - default = { - scripts = ["bin/s0ix-selftest-tool"]; - interpreter = lib.getExe bash; - inputs = [ - acpica-tools - bc - coreutils - gawk - gnugrep - gnused - linuxPackages.turbostat - pciutils - powertop - util-linux - xorg.xset - xxd - ]; - execer = [ - "cannot:${util-linux}/bin/dmesg" - "cannot:${powertop}/bin/powertop" - "cannot:${util-linux}/bin/rtcwake" - "cannot:${linuxPackages.turbostat}/bin/turbostat" - ]; - }; - }; + passthru.updateScript = unstableGitUpdater { }; meta = with lib; { homepage = "https://github.com/intel/S0ixSelftestTool"; description = "A tool for testing the S2idle path CPU Package C-state and S0ix failures"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [adamcstephens]; + maintainers = with maintainers; [ adamcstephens ]; mainProgram = "s0ix-selftest-tool"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix b/third_party/nixpkgs/pkgs/by-name/sa/sabnzbd/package.nix similarity index 90% rename from third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix rename to third_party/nixpkgs/pkgs/by-name/sa/sabnzbd/package.nix index 4f2217be34..99a8e66514 100644 --- a/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/sa/sabnzbd/package.nix @@ -13,6 +13,7 @@ let pythonEnv = python3.withPackages(ps: with ps; [ + apprise babelfish cffi chardet @@ -47,14 +48,14 @@ let ]); path = lib.makeBinPath [ coreutils par2cmdline-turbo unrar unzip p7zip util-linux ]; in stdenv.mkDerivation rec { - version = "4.2.3"; + version = "4.3.1"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-DM+sgrb7Zvtvp0th8GlOloSBcD8mG1RYyM91+uvCOgU="; + sha256 = "sha256-OlACGAYP4nMZZAVJduzj0AGTzSwM+lE7+H2xgmQVSWg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -82,7 +83,7 @@ in stdenv.mkDerivation rec { homepage = "https://sabnzbd.org"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with lib.maintainers; [ fridh jojosch adamcstephens ]; + maintainers = with lib.maintainers; [ jojosch adamcstephens ]; mainProgram = "sabnzbd"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/sa/samrewritten/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/samrewritten/package.nix index f90c31395f..1cbaf4b79d 100644 --- a/third_party/nixpkgs/pkgs/by-name/sa/samrewritten/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sa/samrewritten/package.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "samrewritten"; - version = "unstable-2023-05-23"; + version = "202008-unstable-2023-05-22"; src = fetchFromGitHub { owner = "PaulCombal"; diff --git a/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix index ef900d6d47..9c77d1070e 100644 --- a/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.10"; + version = "1.0.12"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-P7A788hlyfb3bQsltMvGlbMn67643h6/ijEQP0yjIaU="; + hash = "sha256-icZT/CEvCCbDTklcca3LjtX7wnvx35wg4RyK1jHDmwk="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/sa/sarif-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/sarif-tools/package.nix new file mode 100644 index 0000000000..881c2604ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sa/sarif-tools/package.nix @@ -0,0 +1,4 @@ +{ python3Packages }: + +with python3Packages; +toPythonApplication sarif-tools diff --git a/third_party/nixpkgs/pkgs/by-name/sa/satellite/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/satellite/package.nix index ad3afe454b..70b7f84c12 100644 --- a/third_party/nixpkgs/pkgs/by-name/sa/satellite/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sa/satellite/package.nix @@ -5,7 +5,7 @@ , gtk3 , libhandy , modemmanager -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection python3.pkgs.setuptools - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sb/sbom-utility/package.nix b/third_party/nixpkgs/pkgs/by-name/sb/sbom-utility/package.nix index 213dc94cff..0b3b9ffba2 100644 --- a/third_party/nixpkgs/pkgs/by-name/sb/sbom-utility/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sb/sbom-utility/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sbom-utility"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "sbom-utility"; rev = "refs/tags/v${version}"; - hash = "sha256-tNLMrtJj1eeJ4sVhDRR24/KVI1HzZSRquiImuDTNZFI="; + hash = "sha256-EqK2TGlv2RGfvR95lzYz3EHJkfq4q4Ty5H2zFdd9cME="; }; - vendorHash = "sha256-EdzI5ypwZRksQVmcfGDUgEMa4CeAPcm237ZaKqmWQDY="; + vendorHash = "sha256-qh8kIwgrlmHkocM5ZoGnOY7ISJlct/TV7dAxvXlPw68="; preCheck = '' cd test diff --git a/third_party/nixpkgs/pkgs/by-name/sc/scalingo/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/scalingo/package.nix index 38f1a8691c..db17f1fad6 100644 --- a/third_party/nixpkgs/pkgs/by-name/sc/scalingo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sc/scalingo/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scalingo"; - version = "1.31.0"; + version = "1.32.0"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = version; - hash = "sha256-Y162BHTlerTbsRJ1KhT82iBMv+jI7Rq+h8JfBIV0uIs="; + hash = "sha256-kursqM0/HxTnEvrVxEd4YUiIG4I974JKZqkQTqP00ko="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/scc/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scc/package.nix similarity index 61% rename from third_party/nixpkgs/pkgs/development/tools/misc/scc/default.nix rename to third_party/nixpkgs/pkgs/by-name/sc/scc/package.nix index 63ef5ed345..5895b2f0b4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/scc/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/sc/scc/package.nix @@ -1,14 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: - +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "scc"; - version = "3.2.0"; + version = "3.3.3"; src = fetchFromGitHub { owner = "boyter"; repo = "scc"; rev = "v${version}"; - hash = "sha256-ZQIOV7TznaIrgSUgc5Pyc4sz2d5MFO+RgczQq3gZevk="; + hash = "sha256-YbTPRUxkSKYZwOSK7XFr6wHqACp0rkFyzQCMcAFlZ7Y="; }; vendorHash = null; @@ -19,7 +22,14 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/boyter/scc"; description = "A very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go"; - maintainers = with maintainers; [ sigma Br1ght0ne ]; - license = with licenses; [ unlicense /* or */ mit ]; + maintainers = with maintainers; [ + sigma + Br1ght0ne + ]; + license = with licenses; [ + unlicense + # or + mit + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/sc/scenefx/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/scenefx/package.nix new file mode 100644 index 0000000000..c9b50e5af0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sc/scenefx/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + wlroots, + scdoc, + pkg-config, + wayland, + libdrm, + libxkbcommon, + pixman, + wayland-protocols, + libGL, + mesa, + validatePkgConfig, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "scenefx"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "wlrfx"; + repo = "scenefx"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-vBmunqXwGbMNiGRd372TdMU4siWhIVYn5RVYne9C7uQ="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + validatePkgConfig + ]; + + buildInputs = [ + libdrm + libGL + libxkbcommon + mesa + pixman + wayland + wayland-protocols + wlroots + ]; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + description = "A drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects"; + homepage = "https://github.com/wlrfx/scenefx"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ eclairevoyant ]; + mainProgram = "scenefx"; + pkgConfigModules = [ "scenefx" ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/scotch/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scotch/package.nix similarity index 64% rename from third_party/nixpkgs/pkgs/applications/science/math/scotch/default.nix rename to third_party/nixpkgs/pkgs/by-name/sc/scotch/package.nix index 1eb057cfc7..7a93705cd9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/scotch/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/sc/scotch/package.nix @@ -1,24 +1,39 @@ -{ lib, stdenv, fetchurl, bison, mpi, flex, zlib}: +{ + lib, + stdenv, + fetchFromGitLab, + bison, + mpi, + flex, + zlib, +}: -stdenv.mkDerivation rec { - version = "6.1.1"; +stdenv.mkDerivation (finalAttrs: { pname = "scotch"; - src_name = "scotch_${version}"; + version = "6.1.1"; - buildInputs = [ bison mpi flex zlib ]; + buildInputs = [ + bison + mpi + flex + zlib + ]; - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; - sha256 = "sha256-OQUvWf9HSkppzvwlzzyvhClACIneugEO5kA8oYj4sxE="; + src = fetchFromGitLab { + domain = "gitlab.inria.fr"; + owner = "scotch"; + repo = "scotch"; + rev = "v${finalAttrs.version}"; + hash = "sha256-GUV6s+P56OAJq9AMe+LZOMPICQO/RuIi+hJAecmO5Wc="; }; - sourceRoot = "${src_name}/src"; - preConfigure = '' + cd src ln -s Make.inc/Makefile.inc.x86-64_pc_linux2 Makefile.inc ''; buildFlags = [ "scotch ptscotch" ]; + installFlags = [ "prefix=\${out}" ]; meta = { @@ -32,5 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bzizou ]; platforms = lib.platforms.linux; }; -} - +}) diff --git a/third_party/nixpkgs/pkgs/by-name/sc/screenly-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/screenly-cli/package.nix index b2f0cf70cc..360e1d2abb 100644 --- a/third_party/nixpkgs/pkgs/by-name/sc/screenly-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sc/screenly-cli/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "screenly-cli"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "screenly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-lRvJuoGxuKeijdFkJp6Gm+zXAhomYdSKCt8ng0cPjZg="; + hash = "sha256-JHGtF6xwAiSZg8Z3F7RvimoMsrPhmKEgqCInBnU5VtE="; }; - cargoHash = "sha256-7hgm5i3Wr0qX+l3OihlxgBz6UO975bfC9mMXsYJ9Qhw="; + cargoHash = "sha256-YaxOoHIuoxiB5VJ9Cd1l4EnSN7OL1c9GDZlraDXxM6I="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer/package.nix new file mode 100644 index 0000000000..c271614d8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer/package.nix @@ -0,0 +1,82 @@ +{ + lib, + SDL2, + darwin, + fetchFromGitHub, + flac, + fluidsynth, + libmodplug, + libogg, + libvorbis, + mpg123, + opusfile, + pkg-config, + smpeg2, + stdenv, + timidity, +}: + +let + inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; +in +stdenv.mkDerivation (finalAttrs: { + pname = "SDL2_mixer"; + version = "2.8.0"; + + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "SDL_mixer"; + rev = "release-${finalAttrs.version}"; + hash = "sha256-jLKawxnwP5dJglUhgHfWgmKh27i32Rr4LcJQdpXasco="; + }; + + nativeBuildInputs = [ + SDL2 + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + AudioToolbox + AudioUnit + CoreServices + ]; + + propagatedBuildInputs = [ + SDL2 + flac + fluidsynth + libmodplug + libogg + libvorbis + mpg123 + opusfile + smpeg2 + # MIDI patterns + timidity + ]; + + outputs = [ "out" "dev" ]; + + strictDeps = true; + + configureFlags = [ + (lib.enableFeature false "music-ogg-shared") + (lib.enableFeature false "music-flac-shared") + (lib.enableFeature false "music-mod-modplug-shared") + (lib.enableFeature false "music-mp3-mpg123-shared") + (lib.enableFeature false "music-opus-shared") + (lib.enableFeature false "music-midi-fluidsynth-shared") + (lib.enableFeature (!stdenv.isDarwin) "sdltest") + (lib.enableFeature (!stdenv.isDarwin) "smpegtest") + # override default path to allow MIDI files to be played + (lib.withFeatureAs true "timidity-cfg" "${timidity}/share/timidity/timidity.cfg") + ]; + + meta = { + homepage = "https://github.com/libsdl-org/SDL_mixer"; + description = "SDL multi-channel audio mixer library"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer_2_0/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch rename to third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer_2_0/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix new file mode 100644 index 0000000000..9413b8dda9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix @@ -0,0 +1,40 @@ +# SDL2_mixer_2_0 pinned for lzwolf +{ + SDL2_mixer, + fetchFromGitHub, + fetchpatch, + lzwolf, + timidity, +}: + +let + attrset = { + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "SDL_mixer"; + rev = "release-${attrset.version}"; + hash = "sha256-vo9twUGeK2emDiGd9kSGuA/X8TxVmQrRFFm71zawWYM="; + }; + + patches = [ + # These patches fix incompatible function pointer conversion errors with clang 16. + (fetchpatch { + url = "https://github.com/libsdl-org/SDL_mixer/commit/4119ec3fe838d38d2433f4432cd18926bda5d093.patch"; + stripLen = 2; + hash = "sha256-Ug1EEZIRcV8+e1MeMsGHuTW7Zn6j4szqujP8IkIq2VM="; + }) + # Based on https://github.com/libsdl-org/SDL_mixer/commit/64ab759111ddb1b033bcce64e1a04e0cba6e498f + ./SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch + ]; + + # fix default path to timidity.cfg so MIDI files could be played + postPatch = '' + substituteInPlace timidity/options.h \ + --replace "/usr/share/timidity" "${timidity}/share/timidity" + ''; + + passthru.tests.lzwolf = lzwolf; + }; +in SDL2_mixer.overrideAttrs(_: attrset) diff --git a/third_party/nixpkgs/pkgs/by-name/sd/SDL2_net/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_net/package.nix new file mode 100644 index 0000000000..79e0e00986 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sd/SDL2_net/package.nix @@ -0,0 +1,50 @@ +{ + lib, + SDL2, + darwin, + fetchFromGitHub, + pkg-config, + stdenv, + # Boolean flags + enableSdltest ? (!stdenv.isDarwin), +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "SDL2_net"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "SDL_net"; + rev = "release-${finalAttrs.version}"; + hash = "sha256-sEcKn/apA6FcR7ijb7sfuvP03ZdVfjkNZTXsasK8fAI="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + SDL2 + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.libobjc + ]; + + propagatedBuildInputs = [ SDL2 ]; + + configureFlags = [ + (lib.enableFeature false "examples") # can't find libSDL2_test.a + (lib.enableFeature enableSdltest "sdltest") + ]; + + strictDeps = true; + + meta = { + homepage = "https://github.com/libsdl-org/SDL_net"; + description = "SDL multiplatform networking library"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (SDL2.meta) platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/se/seabird/package.nix b/third_party/nixpkgs/pkgs/by-name/se/seabird/package.nix index 2727b04067..6aae87efa8 100644 --- a/third_party/nixpkgs/pkgs/by-name/se/seabird/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/se/seabird/package.nix @@ -14,16 +14,16 @@ buildGo122Module rec { pname = "seabird"; - version = "0.2.2"; + version = "0.3.2"; src = fetchFromGitHub { owner = "getseabird"; repo = "seabird"; rev = "v${version}"; - hash = "sha256-wrZLWDTgcUS8snCqc5rInqitAkrsStL8zmc8vjl4ApQ="; + hash = "sha256-MZEgzTwaBNXLimSj/vXR624DCJ7i2W5lYUdVxqvFii0="; }; - vendorHash = "sha256-z9l6g5NkAErRQo8oiqwKG9ssm8K2S+eSZBD0w4kO3kc="; + vendorHash = "sha256-g7qKI78VeDUu8yafrk2llCIirW/1uxfx6urVLRexsPE="; nativeBuildInputs = [ copyDesktopItems diff --git a/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix b/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix index 21091bfec2..08b7c8d232 100644 --- a/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "sendme"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-y34x4XLIWsxS5+R+6rAejz0z6TCTxoQYPosXmpt9234="; + hash = "sha256-x4RN/C/XMvpfsbWJTX5wDj1K+ADz2YIb/esAIEpFVcs="; }; - cargoHash = "sha256-q4U4w4STs+34gJNyIibitf6RMvH6P/kBDZlOcwFrOxw="; + cargoHash = "sha256-yeexP6wfhg2Ir1oJzaxMwRMen9M409MB4cNZ8fd6cHc="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/third_party/nixpkgs/pkgs/by-name/sh/shell-gpt/package.nix b/third_party/nixpkgs/pkgs/by-name/sh/shell-gpt/package.nix new file mode 100644 index 0000000000..92f451b240 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sh/shell-gpt/package.nix @@ -0,0 +1,51 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "shell-gpt"; + version = "1.4.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "TheR1D"; + repo = "shell_gpt"; + rev = "refs/tags/${version}"; + hash = "sha256-T37L4U1kOrrIQJ2znq2UupD3pyit9xd8rAsEwUvGiQ8="; + }; + + pythonRelaxDeps = [ + "requests" + "rich" + "distro" + "typer" + "instructor" + ]; + + build-system = with python3.pkgs; [ hatchling ]; + + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + distro + instructor + openai + rich + typer + ]; + + # Tests want to read the OpenAI API key from stdin + doCheck = false; + + meta = with lib; { + description = "Access ChatGPT from your terminal"; + homepage = "https://github.com/TheR1D/shell_gpt"; + changelog = "https://github.com/TheR1D/shell_gpt/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ mglolenstine ]; + mainProgram = "sgpt"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sh/shopware-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/sh/shopware-cli/package.nix index e49ce5136a..899b956b50 100644 --- a/third_party/nixpkgs/pkgs/by-name/sh/shopware-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sh/shopware-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.4.35"; + version = "0.4.43"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-RJKne2Nq8mrVBgiOkXoM1HKIJ/BU0MQckbequ/0THGk="; + hash = "sha256-c8CaPxV54bF4Unlz15SIh64jiGZMZywcKOzdZ74AtaM="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeCheckInputs = [ git dart-sass ]; - vendorHash = "sha256-jQCTdvJVe99sL8C9AkJZDsQV9tUoAXY18ar3+FNXEdM="; + vendorHash = "sha256-7K56fBX4y2UPofksAl6+u7jBg5tySvtrutUJXDJ/qz4="; postInstall = '' export HOME="$(mktemp -d)" diff --git a/third_party/nixpkgs/pkgs/applications/video/showmethekey/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/showmethekey/package.nix similarity index 74% rename from third_party/nixpkgs/pkgs/applications/video/showmethekey/default.nix rename to third_party/nixpkgs/pkgs/by-name/sh/showmethekey/package.nix index cd61cfc9d0..7faf5dec43 100644 --- a/third_party/nixpkgs/pkgs/applications/video/showmethekey/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/sh/showmethekey/package.nix @@ -12,15 +12,16 @@ , libxkbcommon , pkg-config }: + stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.12.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "AlynxZhou"; - repo = pname; - rev = "v${version}"; - hash = "sha256-eeObomb4Gv/vpvViHsi3+O0JR/rYamrlZNZaXKL6KJw="; + repo = "showmethekey"; + rev = "refs/tags/v${version}"; + hash = "sha256-kifUp/neqTBPRuZKqNdW6JOinzh9LKfppyvW9AgxAYo="; }; nativeBuildInputs = [ @@ -40,8 +41,9 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://showmethekey.alynx.one/"; description = "Show keys you typed on screen"; + homepage = "https://showmethekey.alynx.one/"; + changelog = "https://github.com/AlynxZhou/showmethekey/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ ocfox ]; diff --git a/third_party/nixpkgs/pkgs/by-name/si/silverbullet/package.nix b/third_party/nixpkgs/pkgs/by-name/si/silverbullet/package.nix index b8732b4c69..4a41b37014 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/silverbullet/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/silverbullet/package.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "silverbullet"; - version = "0.7.6"; + version = "0.7.7"; src = fetchurl { url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet.js"; - hash = "sha256-bnD9iZVRIg6otgDi4yNWySqmJsJJIVnjFGsTrGCMw/o="; + hash = "sha256-EhHPysliRi1bv/skS4+ljQW6qFsijmSup1+7/fVfFdg="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/by-name/si/simde/package.nix b/third_party/nixpkgs/pkgs/by-name/si/simde/package.nix index 4892914e2f..e3896021e0 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/simde/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/simde/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simde"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "simd-everywhere"; repo = "simde"; rev = "v${version}"; - hash = "sha256-hQtSxO8Uld6LT6V1ZhR6tbshTK1QTGgyQ99o3jOIbQk="; + hash = "sha256-igjDHCpKXy6EbA9Mf6peL4OTVRPYTV0Y2jbgYQuWMT4="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/by-name/si/simdutf/package.nix b/third_party/nixpkgs/pkgs/by-name/si/simdutf/package.nix index 2656688392..82d2baf04a 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/simdutf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/simdutf/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "5.2.4"; + version = "5.2.8"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-ty4LqRJzwDRMCqPUcvgCAuvNExb0iRIzCOSMCfDzGEU="; + hash = "sha256-EFyKefq03fpkrKQoSgfvWAjMwwB5UubQouZZU9Obn3k="; }; # Fix build on darwin diff --git a/third_party/nixpkgs/pkgs/by-name/si/simplex-chat-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/si/simplex-chat-desktop/package.nix index 1868e2669c..c3e5c618a7 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "simplex-chat-desktop"; - version = "5.5.5"; + version = "5.7.0"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-MD1AbpHlpaMaPlpJmGp0oPbOYPmJEhhIXmexkpCr1wY="; + hash = "sha256-T8ojnay/FCa9Q4PObqlfy2MC4pKTF73taNW8elNDjIg="; }; appimageContents = appimageTools.extract { @@ -19,17 +19,11 @@ let in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: with pkgs; [ - makeWrapper - ]; - extraBwrapArgs = [ "--setenv _JAVA_AWT_WM_NONREPARENTING 1" ]; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install --mode=444 -D ${appimageContents}/chat.simplex.app.desktop --target-directory=$out/share/applications substituteInPlace $out/share/applications/chat.simplex.app.desktop \ --replace 'Exec=simplex' 'Exec=${pname}' diff --git a/third_party/nixpkgs/pkgs/by-name/si/simplotask/package.nix b/third_party/nixpkgs/pkgs/by-name/si/simplotask/package.nix index a3ec04ca5d..d08d53ed88 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/simplotask/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/simplotask/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "simplotask"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; rev = "v${version}"; - hash = "sha256-pd6bue/uo6+ZBaN7ZKf/byuPOKOLZdCQau7I7F+iZb0="; + hash = "sha256-VnQIg5HXZZwvYpaYDF1CIphLtE4S+1zADE1WnicXOSQ="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/by-name/si/sispmctl/package.nix b/third_party/nixpkgs/pkgs/by-name/si/sispmctl/package.nix index d431e1a29f..7a09e9471d 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/sispmctl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/sispmctl/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "sispmctl"; - version = "4.11"; + version = "4.12"; src = fetchurl { url = "mirror://sourceforge/sispmctl/sispmctl-${version}.tar.gz"; - hash = "sha256-dLlKNxAEaxUHDHMR8MrLgVVMhrQidxnMJzPLlscFJXg="; + hash = "sha256-51eGOkg42m4cpypXrcWspvxH/73ccqaQUtir10PVcII="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/si/siyuan/package-lock.json b/third_party/nixpkgs/pkgs/by-name/si/siyuan/package-lock.json new file mode 100644 index 0000000000..0efb71901c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/si/siyuan/package-lock.json @@ -0,0 +1,7762 @@ +{ + "name": "SiYuan", + "version": "3.0.11", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "SiYuan", + "version": "3.0.11", + "dependencies": { + "@electron/remote": "^2.1.2" + }, + "devDependencies": { + "@types/node": "^18.13.0", + "@typescript-eslint/eslint-plugin": "^5.30.6", + "@typescript-eslint/parser": "^5.30.6", + "blueimp-md5": "^2.19.0", + "clean-webpack-plugin": "^4.0.0", + "css-loader": "^6.7.1", + "dayjs": "^1.11.5", + "electron": "28.2.10", + "electron-builder": "^24.13.3", + "encoding": "^0.1.13", + "esbuild-loader": "^3.0.1", + "eslint": "^8.19.0", + "file-loader": "^6.2.0", + "html-loader": "^2.1.2", + "html-webpack-plugin": "^5.5.0", + "iconv-lite": "^0.6.3", + "ifdef-loader": "^2.3.2", + "mini-css-extract-plugin": "2.7.6", + "path-browserify": "^1.0.1", + "safer-buffer": "^2.1.2", + "sass": "^1.53.0", + "sass-loader": "^12.6.0", + "typescript": "^4.7.4", + "webpack": "^5.76.0", + "webpack-bundle-analyzer": "^4.5.0", + "webpack-cli": "^4.10.0" + } + }, + "node_modules/@develar/schema-utils": { + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz", + "integrity": "sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==", + "dev": true, + "dependencies": { + "ajv": "^6.12.0", + "ajv-keywords": "^3.4.1" + }, + "engines": { + "node": ">= 8.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/@discoveryjs/json-ext": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", + "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", + "dev": true, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/@electron/asar": { + "version": "3.2.10", + "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.10.tgz", + "integrity": "sha512-mvBSwIBUeiRscrCeJE1LwctAriBj65eUDm0Pc11iE5gRwzkmsdbS7FnZ1XUWjpSeQWL1L5g12Fc/SchPM9DUOw==", + "dev": true, + "dependencies": { + "commander": "^5.0.0", + "glob": "^7.1.6", + "minimatch": "^3.0.4" + }, + "bin": { + "asar": "bin/asar.js" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/@electron/asar/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@electron/asar/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@electron/get": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz", + "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==", + "dependencies": { + "debug": "^4.1.1", + "env-paths": "^2.2.0", + "fs-extra": "^8.1.0", + "got": "^11.8.5", + "progress": "^2.0.3", + "semver": "^6.2.0", + "sumchecker": "^3.0.1" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "global-agent": "^3.0.0" + } + }, + "node_modules/@electron/get/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@electron/notarize": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.2.1.tgz", + "integrity": "sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==", + "dev": true, + "dependencies": { + "debug": "^4.1.1", + "fs-extra": "^9.0.1", + "promise-retry": "^2.0.1" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron/notarize/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@electron/notarize/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/@electron/notarize/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron/osx-sign": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.5.tgz", + "integrity": "sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==", + "dev": true, + "dependencies": { + "compare-version": "^0.1.2", + "debug": "^4.3.4", + "fs-extra": "^10.0.0", + "isbinaryfile": "^4.0.8", + "minimist": "^1.2.6", + "plist": "^3.0.5" + }, + "bin": { + "electron-osx-flat": "bin/electron-osx-flat.js", + "electron-osx-sign": "bin/electron-osx-sign.js" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/@electron/osx-sign/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@electron/osx-sign/node_modules/isbinaryfile": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz", + "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==", + "dev": true, + "engines": { + "node": ">= 8.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/gjtorikian/" + } + }, + "node_modules/@electron/osx-sign/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/@electron/osx-sign/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@electron/remote": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz", + "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==", + "peerDependencies": { + "electron": ">= 13.0.0" + } + }, + "node_modules/@electron/universal": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.5.1.tgz", + "integrity": "sha512-kbgXxyEauPJiQQUNG2VgUeyfQNFk6hBF11ISN2PNI6agUgPl55pv4eQmaqHzTAzchBvqZ2tQuRVaPStGf0mxGw==", + "dev": true, + "dependencies": { + "@electron/asar": "^3.2.1", + "@malept/cross-spawn-promise": "^1.1.0", + "debug": "^4.3.1", + "dir-compare": "^3.0.0", + "fs-extra": "^9.0.1", + "minimatch": "^3.0.4", + "plist": "^3.0.4" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/@electron/universal/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@electron/universal/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@electron/universal/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/@electron/universal/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@electron/universal/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz", + "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz", + "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz", + "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz", + "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz", + "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz", + "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz", + "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz", + "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz", + "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz", + "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz", + "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz", + "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz", + "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz", + "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz", + "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz", + "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz", + "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz", + "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz", + "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz", + "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz", + "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz", + "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz", + "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/eslintrc/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "dev": true + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", + "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "dev": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@malept/cross-spawn-promise": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz", + "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/malept" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" + } + ], + "dependencies": { + "cross-spawn": "^7.0.1" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@malept/flatpak-bundler": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz", + "integrity": "sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==", + "dev": true, + "dependencies": { + "debug": "^4.1.1", + "fs-extra": "^9.0.0", + "lodash": "^4.17.15", + "tmp-promise": "^3.0.2" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@malept/flatpak-bundler/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@malept/flatpak-bundler/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/@malept/flatpak-bundler/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@polka/url": { + "version": "1.0.0-next.25", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz", + "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==", + "dev": true + }, + "node_modules/@sindresorhus/is": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", + "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/is?sponsor=1" + } + }, + "node_modules/@szmarczak/http-timer": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", + "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", + "dependencies": { + "defer-to-connect": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@types/cacheable-request": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", + "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==", + "dependencies": { + "@types/http-cache-semantics": "*", + "@types/keyv": "^3.1.4", + "@types/node": "*", + "@types/responselike": "^1.0.0" + } + }, + "node_modules/@types/debug": { + "version": "4.1.12", + "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", + "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==", + "dev": true, + "dependencies": { + "@types/ms": "*" + } + }, + "node_modules/@types/eslint": { + "version": "8.56.10", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz", + "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==", + "dev": true, + "dependencies": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/eslint-scope": { + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "dev": true, + "dependencies": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, + "node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true + }, + "node_modules/@types/fs-extra": { + "version": "9.0.13", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", + "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", + "dev": true, + "dependencies": { + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "node_modules/@types/html-minifier-terser": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", + "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==", + "dev": true + }, + "node_modules/@types/http-cache-semantics": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", + "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==" + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true + }, + "node_modules/@types/keyv": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", + "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/minimatch": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", + "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", + "dev": true + }, + "node_modules/@types/ms": { + "version": "0.7.34", + "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz", + "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==", + "dev": true + }, + "node_modules/@types/node": { + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", + "dependencies": { + "undici-types": "~5.26.4" + } + }, + "node_modules/@types/plist": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz", + "integrity": "sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==", + "dev": true, + "optional": true, + "dependencies": { + "@types/node": "*", + "xmlbuilder": ">=11.0.1" + } + }, + "node_modules/@types/responselike": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz", + "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/semver": { + "version": "7.5.8", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", + "dev": true + }, + "node_modules/@types/verror": { + "version": "1.10.10", + "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.10.tgz", + "integrity": "sha512-l4MM0Jppn18hb9xmM6wwD1uTdShpf9Pn80aXTStnK1C94gtPvJcV2FrDmbOQUAQfJ1cKZHktkQUDwEqaAKXMMg==", + "dev": true, + "optional": true + }, + "node_modules/@types/yauzl": { + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", + "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", + "optional": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", + "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", + "dev": true, + "dependencies": { + "@eslint-community/regexpp": "^4.4.0", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/type-utils": "5.62.0", + "@typescript-eslint/utils": "5.62.0", + "debug": "^4.3.4", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "natural-compare-lite": "^1.4.0", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^5.0.0", + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", + "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", + "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", + "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", + "dev": true, + "dependencies": { + "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/utils": "5.62.0", + "debug": "^4.3.4", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", + "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", + "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", + "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@types/json-schema": "^7.0.9", + "@types/semver": "^7.3.12", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", + "eslint-scope": "^5.1.1", + "semver": "^7.3.7" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", + "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, + "node_modules/@webassemblyjs/ast": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", + "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", + "dev": true, + "dependencies": { + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + } + }, + "node_modules/@webassemblyjs/floating-point-hex-parser": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "dev": true + }, + "node_modules/@webassemblyjs/helper-api-error": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "dev": true + }, + "node_modules/@webassemblyjs/helper-buffer": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", + "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", + "dev": true + }, + "node_modules/@webassemblyjs/helper-numbers": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "dev": true, + "dependencies": { + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "dev": true + }, + "node_modules/@webassemblyjs/helper-wasm-section": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", + "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.12.1" + } + }, + "node_modules/@webassemblyjs/ieee754": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "dev": true, + "dependencies": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "node_modules/@webassemblyjs/leb128": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "dev": true, + "dependencies": { + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/utf8": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "dev": true + }, + "node_modules/@webassemblyjs/wasm-edit": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", + "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-opt": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1", + "@webassemblyjs/wast-printer": "1.12.1" + } + }, + "node_modules/@webassemblyjs/wasm-gen": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", + "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wasm-opt": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", + "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1" + } + }, + "node_modules/@webassemblyjs/wasm-parser": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", + "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wast-printer": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", + "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "dev": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webpack-cli/configtest": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", + "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", + "dev": true, + "peerDependencies": { + "webpack": "4.x.x || 5.x.x", + "webpack-cli": "4.x.x" + } + }, + "node_modules/@webpack-cli/info": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", + "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", + "dev": true, + "dependencies": { + "envinfo": "^7.7.3" + }, + "peerDependencies": { + "webpack-cli": "4.x.x" + } + }, + "node_modules/@webpack-cli/serve": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", + "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", + "dev": true, + "peerDependencies": { + "webpack-cli": "4.x.x" + }, + "peerDependenciesMeta": { + "webpack-dev-server": { + "optional": true + } + } + }, + "node_modules/@xmldom/xmldom": { + "version": "0.8.10", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", + "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", + "dev": true, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true + }, + "node_modules/@xtuc/long": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", + "dev": true + }, + "node_modules/7zip-bin": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz", + "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==", + "dev": true + }, + "node_modules/acorn": { + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-import-assertions": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "dev": true, + "peerDependencies": { + "acorn": "^8" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", + "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "dev": true, + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "node_modules/ajv-formats/node_modules/ajv": { + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", + "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.3", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.4.1" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv-formats/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "node_modules/ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true, + "peerDependencies": { + "ajv": "^6.9.1" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/app-builder-bin": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-4.0.0.tgz", + "integrity": "sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==", + "dev": true + }, + "node_modules/app-builder-lib": { + "version": "24.13.3", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.13.3.tgz", + "integrity": "sha512-FAzX6IBit2POXYGnTCT8YHFO/lr5AapAII6zzhQO3Rw4cEDOgK+t1xhLc5tNcKlicTHlo9zxIwnYCX9X2DLkig==", + "dev": true, + "dependencies": { + "@develar/schema-utils": "~2.6.5", + "@electron/notarize": "2.2.1", + "@electron/osx-sign": "1.0.5", + "@electron/universal": "1.5.1", + "@malept/flatpak-bundler": "^0.4.0", + "@types/fs-extra": "9.0.13", + "async-exit-hook": "^2.0.1", + "bluebird-lst": "^1.0.9", + "builder-util": "24.13.1", + "builder-util-runtime": "9.2.4", + "chromium-pickle-js": "^0.2.0", + "debug": "^4.3.4", + "ejs": "^3.1.8", + "electron-publish": "24.13.1", + "form-data": "^4.0.0", + "fs-extra": "^10.1.0", + "hosted-git-info": "^4.1.0", + "is-ci": "^3.0.0", + "isbinaryfile": "^5.0.0", + "js-yaml": "^4.1.0", + "lazy-val": "^1.0.5", + "minimatch": "^5.1.1", + "read-config-file": "6.3.2", + "sanitize-filename": "^1.6.3", + "semver": "^7.3.8", + "tar": "^6.1.12", + "temp-file": "^3.4.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "dmg-builder": "24.13.3", + "electron-builder-squirrel-windows": "24.13.3" + } + }, + "node_modules/app-builder-lib/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/app-builder-lib/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/app-builder-lib/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/archiver": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz", + "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==", + "dev": true, + "peer": true, + "dependencies": { + "archiver-utils": "^2.1.0", + "async": "^3.2.4", + "buffer-crc32": "^0.2.1", + "readable-stream": "^3.6.0", + "readdir-glob": "^1.1.2", + "tar-stream": "^2.2.0", + "zip-stream": "^4.1.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/archiver-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz", + "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", + "dev": true, + "peer": true, + "dependencies": { + "glob": "^7.1.4", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", + "lodash.defaults": "^4.2.0", + "lodash.difference": "^4.5.0", + "lodash.flatten": "^4.4.0", + "lodash.isplainobject": "^4.0.6", + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", + "readable-stream": "^2.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/archiver-utils/node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dev": true, + "peer": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/archiver-utils/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "peer": true + }, + "node_modules/archiver-utils/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "peer": true, + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/async": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", + "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", + "dev": true + }, + "node_modules/async-exit-hook": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz", + "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true + }, + "node_modules/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dev": true, + "peer": true, + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "dev": true + }, + "node_modules/bluebird-lst": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz", + "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==", + "dev": true, + "dependencies": { + "bluebird": "^3.5.5" + } + }, + "node_modules/blueimp-md5": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz", + "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==", + "dev": true + }, + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", + "dev": true + }, + "node_modules/boolean": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", + "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==", + "optional": true + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browserslist": { + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.13" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", + "engines": { + "node": "*" + } + }, + "node_modules/buffer-equal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz", + "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==", + "dev": true, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "node_modules/builder-util": { + "version": "24.13.1", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.13.1.tgz", + "integrity": "sha512-NhbCSIntruNDTOVI9fdXz0dihaqX2YuE1D6zZMrwiErzH4ELZHE6mdiB40wEgZNprDia+FghRFgKoAqMZRRjSA==", + "dev": true, + "dependencies": { + "@types/debug": "^4.1.6", + "7zip-bin": "~5.2.0", + "app-builder-bin": "4.0.0", + "bluebird-lst": "^1.0.9", + "builder-util-runtime": "9.2.4", + "chalk": "^4.1.2", + "cross-spawn": "^7.0.3", + "debug": "^4.3.4", + "fs-extra": "^10.1.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.1", + "is-ci": "^3.0.0", + "js-yaml": "^4.1.0", + "source-map-support": "^0.5.19", + "stat-mode": "^1.0.0", + "temp-file": "^3.4.0" + } + }, + "node_modules/builder-util-runtime": { + "version": "9.2.4", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz", + "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==", + "dev": true, + "dependencies": { + "debug": "^4.3.4", + "sax": "^1.2.4" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/builder-util/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/builder-util/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/builder-util/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/cacheable-lookup": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", + "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", + "engines": { + "node": ">=10.6.0" + } + }, + "node_modules/cacheable-request": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", + "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", + "dependencies": { + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^4.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^6.0.1", + "responselike": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/camel-case": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", + "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", + "dev": true, + "dependencies": { + "pascal-case": "^3.1.2", + "tslib": "^2.0.3" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001616", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz", + "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ] + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/chrome-trace-event": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", + "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", + "dev": true, + "engines": { + "node": ">=6.0" + } + }, + "node_modules/chromium-pickle-js": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", + "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==", + "dev": true + }, + "node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "engines": { + "node": ">=8" + } + }, + "node_modules/clean-css": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", + "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", + "dev": true, + "dependencies": { + "source-map": "~0.6.0" + }, + "engines": { + "node": ">= 4.0" + } + }, + "node_modules/clean-webpack-plugin": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz", + "integrity": "sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==", + "dev": true, + "dependencies": { + "del": "^4.1.1" + }, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "webpack": ">=4.0.0 <6.0.0" + } + }, + "node_modules/cli-truncate": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", + "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", + "dev": true, + "optional": true, + "dependencies": { + "slice-ansi": "^3.0.0", + "string-width": "^4.2.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "dev": true, + "dependencies": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/clone-response": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", + "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", + "dependencies": { + "mimic-response": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/colorette": { + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", + "dev": true + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", + "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/compare-version": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", + "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/compress-commons": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz", + "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==", + "dev": true, + "peer": true, + "dependencies": { + "buffer-crc32": "^0.2.13", + "crc32-stream": "^4.0.2", + "normalize-path": "^3.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/config-file-ts": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/config-file-ts/-/config-file-ts-0.2.6.tgz", + "integrity": "sha512-6boGVaglwblBgJqGyxm4+xCmEGcWgnWHSWHY5jad58awQhB6gftq0G8HbzU39YqCIYHMLAiL1yjwiZ36m/CL8w==", + "dev": true, + "dependencies": { + "glob": "^10.3.10", + "typescript": "^5.3.3" + } + }, + "node_modules/config-file-ts/node_modules/glob": { + "version": "10.3.12", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", + "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", + "dev": true, + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.6", + "minimatch": "^9.0.1", + "minipass": "^7.0.4", + "path-scurry": "^1.10.2" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/config-file-ts/node_modules/minimatch": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/config-file-ts/node_modules/minipass": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.0.tgz", + "integrity": "sha512-oGZRv2OT1lO2UF1zUcwdTb3wqUwI0kBGTgt/T7OdSj6M6N5m3o5uPf0AIW6lVxGGoiWUR7e2AwTE+xiwK8WQig==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/config-file-ts/node_modules/typescript": { + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", + "dev": true + }, + "node_modules/crc": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", + "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", + "dev": true, + "optional": true, + "dependencies": { + "buffer": "^5.1.0" + } + }, + "node_modules/crc-32": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", + "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", + "dev": true, + "peer": true, + "bin": { + "crc32": "bin/crc32.njs" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/crc32-stream": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz", + "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==", + "dev": true, + "peer": true, + "dependencies": { + "crc-32": "^1.2.0", + "readable-stream": "^3.4.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/css-loader": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz", + "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==", + "dev": true, + "dependencies": { + "icss-utils": "^5.1.0", + "postcss": "^8.4.33", + "postcss-modules-extract-imports": "^3.1.0", + "postcss-modules-local-by-default": "^4.0.5", + "postcss-modules-scope": "^3.2.0", + "postcss-modules-values": "^4.0.0", + "postcss-value-parser": "^4.2.0", + "semver": "^7.5.4" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "@rspack/core": "0.x || 1.x", + "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "@rspack/core": { + "optional": true + }, + "webpack": { + "optional": true + } + } + }, + "node_modules/css-select": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", + "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", + "dev": true, + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^6.0.1", + "domhandler": "^4.3.1", + "domutils": "^2.8.0", + "nth-check": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/css-what": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", + "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", + "dev": true, + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "dev": true, + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/dayjs": { + "version": "1.11.11", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz", + "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==", + "dev": true + }, + "node_modules/debounce": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz", + "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==", + "dev": true + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decompress-response/node_modules/mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/defer-to-connect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", + "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", + "engines": { + "node": ">=10" + } + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "optional": true, + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "optional": true, + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/del": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", + "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", + "dev": true, + "dependencies": { + "@types/glob": "^7.1.1", + "globby": "^6.1.0", + "is-path-cwd": "^2.0.0", + "is-path-in-cwd": "^2.0.0", + "p-map": "^2.0.0", + "pify": "^4.0.1", + "rimraf": "^2.6.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/del/node_modules/array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==", + "dev": true, + "dependencies": { + "array-uniq": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/del/node_modules/globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==", + "dev": true, + "dependencies": { + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/del/node_modules/globby/node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/detect-node": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", + "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", + "optional": true + }, + "node_modules/dir-compare": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-3.3.0.tgz", + "integrity": "sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==", + "dev": true, + "dependencies": { + "buffer-equal": "^1.0.0", + "minimatch": "^3.0.4" + } + }, + "node_modules/dir-compare/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/dir-compare/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/dmg-builder": { + "version": "24.13.3", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.13.3.tgz", + "integrity": "sha512-rcJUkMfnJpfCboZoOOPf4L29TRtEieHNOeAbYPWPxlaBw/Z1RKrRA86dOI9rwaI4tQSc/RD82zTNHprfUHXsoQ==", + "dev": true, + "dependencies": { + "app-builder-lib": "24.13.3", + "builder-util": "24.13.1", + "builder-util-runtime": "9.2.4", + "fs-extra": "^10.1.0", + "iconv-lite": "^0.6.2", + "js-yaml": "^4.1.0" + }, + "optionalDependencies": { + "dmg-license": "^1.0.11" + } + }, + "node_modules/dmg-builder/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/dmg-builder/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/dmg-builder/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/dmg-license": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz", + "integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==", + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "@types/plist": "^3.0.1", + "@types/verror": "^1.10.3", + "ajv": "^6.10.0", + "crc": "^3.8.0", + "iconv-corefoundation": "^1.1.7", + "plist": "^3.0.4", + "smart-buffer": "^4.0.2", + "verror": "^1.10.0" + }, + "bin": { + "dmg-license": "bin/dmg-license.js" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dom-converter": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", + "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", + "dev": true, + "dependencies": { + "utila": "~0.4" + } + }, + "node_modules/dom-serializer": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", + "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", + "dev": true, + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", + "entities": "^2.0.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ] + }, + "node_modules/domhandler": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", + "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "dev": true, + "dependencies": { + "domelementtype": "^2.2.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domutils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "dev": true, + "dependencies": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/dot-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", + "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", + "dev": true, + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/dotenv": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz", + "integrity": "sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/dotenv-expand": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz", + "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==", + "dev": true + }, + "node_modules/duplexer": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", + "dev": true + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, + "node_modules/ejs": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", + "dev": true, + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/electron": { + "version": "28.2.10", + "resolved": "https://registry.npmjs.org/electron/-/electron-28.2.10.tgz", + "integrity": "sha512-0rGBJNogcl2FIRxGRUv9zuMaBP78nSBJW+Bd1U7OGeg8IEkSIbHOhfn71XoGxgbOUSCEXjjyftq4mtAAVbUsZQ==", + "hasInstallScript": true, + "dependencies": { + "@electron/get": "^2.0.0", + "@types/node": "^18.11.18", + "extract-zip": "^2.0.1" + }, + "bin": { + "electron": "cli.js" + }, + "engines": { + "node": ">= 12.20.55" + } + }, + "node_modules/electron-builder": { + "version": "24.13.3", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.13.3.tgz", + "integrity": "sha512-yZSgVHft5dNVlo31qmJAe4BVKQfFdwpRw7sFp1iQglDRCDD6r22zfRJuZlhtB5gp9FHUxCMEoWGq10SkCnMAIg==", + "dev": true, + "dependencies": { + "app-builder-lib": "24.13.3", + "builder-util": "24.13.1", + "builder-util-runtime": "9.2.4", + "chalk": "^4.1.2", + "dmg-builder": "24.13.3", + "fs-extra": "^10.1.0", + "is-ci": "^3.0.0", + "lazy-val": "^1.0.5", + "read-config-file": "6.3.2", + "simple-update-notifier": "2.0.0", + "yargs": "^17.6.2" + }, + "bin": { + "electron-builder": "cli.js", + "install-app-deps": "install-app-deps.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/electron-builder-squirrel-windows": { + "version": "24.13.3", + "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-24.13.3.tgz", + "integrity": "sha512-oHkV0iogWfyK+ah9ZIvMDpei1m9ZRpdXcvde1wTpra2U8AFDNNpqJdnin5z+PM1GbQ5BoaKCWas2HSjtR0HwMg==", + "dev": true, + "peer": true, + "dependencies": { + "app-builder-lib": "24.13.3", + "archiver": "^5.3.1", + "builder-util": "24.13.1", + "fs-extra": "^10.1.0" + } + }, + "node_modules/electron-builder-squirrel-windows/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "peer": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/electron-builder-squirrel-windows/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "peer": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/electron-builder-squirrel-windows/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "peer": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/electron-builder/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/electron-builder/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/electron-builder/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/electron-publish": { + "version": "24.13.1", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.13.1.tgz", + "integrity": "sha512-2ZgdEqJ8e9D17Hwp5LEq5mLQPjqU3lv/IALvgp+4W8VeNhryfGhYEQC/PgDPMrnWUp+l60Ou5SJLsu+k4mhQ8A==", + "dev": true, + "dependencies": { + "@types/fs-extra": "^9.0.11", + "builder-util": "24.13.1", + "builder-util-runtime": "9.2.4", + "chalk": "^4.1.2", + "fs-extra": "^10.1.0", + "lazy-val": "^1.0.5", + "mime": "^2.5.2" + } + }, + "node_modules/electron-publish/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/electron-publish/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/electron-publish/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.4.756", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.756.tgz", + "integrity": "sha512-RJKZ9+vEBMeiPAvKNWyZjuYyUqMndcP1f335oHqn3BEQbs2NFtVrnK5+6Xg5wSM9TknNNpWghGDUCKGYF+xWXw==", + "dev": true + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "dev": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/enhanced-resolve": { + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz", + "integrity": "sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "dev": true, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "engines": { + "node": ">=6" + } + }, + "node_modules/envinfo": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz", + "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==", + "dev": true, + "bin": { + "envinfo": "dist/cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", + "dev": true + }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "optional": true, + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "optional": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-module-lexer": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.2.tgz", + "integrity": "sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA==", + "dev": true + }, + "node_modules/es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "optional": true + }, + "node_modules/esbuild": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", + "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==", + "dev": true, + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.19.12", + "@esbuild/android-arm": "0.19.12", + "@esbuild/android-arm64": "0.19.12", + "@esbuild/android-x64": "0.19.12", + "@esbuild/darwin-arm64": "0.19.12", + "@esbuild/darwin-x64": "0.19.12", + "@esbuild/freebsd-arm64": "0.19.12", + "@esbuild/freebsd-x64": "0.19.12", + "@esbuild/linux-arm": "0.19.12", + "@esbuild/linux-arm64": "0.19.12", + "@esbuild/linux-ia32": "0.19.12", + "@esbuild/linux-loong64": "0.19.12", + "@esbuild/linux-mips64el": "0.19.12", + "@esbuild/linux-ppc64": "0.19.12", + "@esbuild/linux-riscv64": "0.19.12", + "@esbuild/linux-s390x": "0.19.12", + "@esbuild/linux-x64": "0.19.12", + "@esbuild/netbsd-x64": "0.19.12", + "@esbuild/openbsd-x64": "0.19.12", + "@esbuild/sunos-x64": "0.19.12", + "@esbuild/win32-arm64": "0.19.12", + "@esbuild/win32-ia32": "0.19.12", + "@esbuild/win32-x64": "0.19.12" + } + }, + "node_modules/esbuild-loader": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-3.2.0.tgz", + "integrity": "sha512-lnIdRMQpk50alCa0QoW0ozc0D3rjJXl02mtMsk9INIcW25RPZhDja332bu85ixwVNbhQ7VfBRcQyZ/qza8mWiA==", + "dev": true, + "dependencies": { + "esbuild": "^0.19.0", + "get-tsconfig": "^4.6.2", + "loader-utils": "^2.0.4", + "webpack-sources": "^1.4.3" + }, + "funding": { + "url": "https://github.com/esbuild-kit/esbuild-loader?sponsor=1" + }, + "peerDependencies": { + "webpack": "^4.40.0 || ^5.0.0" + } + }, + "node_modules/escalade": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "devOptional": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/eslint/node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/eslint/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esquery/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esrecurse/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "dev": true, + "engines": { + "node": ">=0.8.x" + } + }, + "node_modules/extract-zip": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", + "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", + "dependencies": { + "debug": "^4.1.1", + "get-stream": "^5.1.0", + "yauzl": "^2.10.0" + }, + "bin": { + "extract-zip": "cli.js" + }, + "engines": { + "node": ">= 10.17.0" + }, + "optionalDependencies": { + "@types/yauzl": "^2.9.1" + } + }, + "node_modules/extsprintf": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", + "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "optional": true + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/fastest-levenshtein": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", + "dev": true, + "engines": { + "node": ">= 4.9.1" + } + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", + "dependencies": { + "pend": "~1.2.0" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/file-loader": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz", + "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==", + "dev": true, + "dependencies": { + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^4.0.0 || ^5.0.0" + } + }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "dev": true, + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "bin": { + "flat": "cli.js" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flat-cache/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/flatted": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "dev": true + }, + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true, + "peer": true + }, + "node_modules/fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dev": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "devOptional": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "optional": true, + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-tsconfig": { + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.3.tgz", + "integrity": "sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==", + "dev": true, + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true + }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/glob/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/global-agent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", + "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==", + "optional": true, + "dependencies": { + "boolean": "^3.0.1", + "es6-error": "^4.1.1", + "matcher": "^3.0.0", + "roarr": "^2.15.3", + "semver": "^7.3.2", + "serialize-error": "^7.0.1" + }, + "engines": { + "node": ">=10.0" + } + }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "optional": true, + "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "optional": true, + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/got": { + "version": "11.8.6", + "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", + "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", + "dependencies": { + "@sindresorhus/is": "^4.0.0", + "@szmarczak/http-timer": "^4.0.5", + "@types/cacheable-request": "^6.0.1", + "@types/responselike": "^1.0.0", + "cacheable-lookup": "^5.0.3", + "cacheable-request": "^7.0.2", + "decompress-response": "^6.0.0", + "http2-wrapper": "^1.0.0-beta.5.2", + "lowercase-keys": "^2.0.0", + "p-cancelable": "^2.0.0", + "responselike": "^2.0.0" + }, + "engines": { + "node": ">=10.19.0" + }, + "funding": { + "url": "https://github.com/sindresorhus/got?sponsor=1" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true + }, + "node_modules/gzip-size": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", + "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==", + "dev": true, + "dependencies": { + "duplexer": "^0.1.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "optional": true, + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "optional": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "optional": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "devOptional": true, + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/hosted-git-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "node_modules/html-loader": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-2.1.2.tgz", + "integrity": "sha512-XB4O1+6mpLp4qy/3qg5+1QPZ/uXvWtO64hNAX87sKHwcHkp1LJGU7V3sJ9iVmRACElAZXQ4YOO/Lbkx5kYfl9A==", + "dev": true, + "dependencies": { + "html-minifier-terser": "^5.1.1", + "parse5": "^6.0.1" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" + } + }, + "node_modules/html-minifier-terser": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz", + "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==", + "dev": true, + "dependencies": { + "camel-case": "^4.1.1", + "clean-css": "^4.2.3", + "commander": "^4.1.1", + "he": "^1.2.0", + "param-case": "^3.0.3", + "relateurl": "^0.2.7", + "terser": "^4.6.3" + }, + "bin": { + "html-minifier-terser": "cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/html-minifier-terser/node_modules/commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/html-webpack-plugin": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz", + "integrity": "sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==", + "dev": true, + "dependencies": { + "@types/html-minifier-terser": "^6.0.0", + "html-minifier-terser": "^6.0.2", + "lodash": "^4.17.21", + "pretty-error": "^4.0.0", + "tapable": "^2.0.0" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/html-webpack-plugin" + }, + "peerDependencies": { + "@rspack/core": "0.x || 1.x", + "webpack": "^5.20.0" + }, + "peerDependenciesMeta": { + "@rspack/core": { + "optional": true + }, + "webpack": { + "optional": true + } + } + }, + "node_modules/html-webpack-plugin/node_modules/clean-css": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz", + "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==", + "dev": true, + "dependencies": { + "source-map": "~0.6.0" + }, + "engines": { + "node": ">= 10.0" + } + }, + "node_modules/html-webpack-plugin/node_modules/commander": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "dev": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/html-webpack-plugin/node_modules/html-minifier-terser": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", + "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", + "dev": true, + "dependencies": { + "camel-case": "^4.1.2", + "clean-css": "^5.2.2", + "commander": "^8.3.0", + "he": "^1.2.0", + "param-case": "^3.0.4", + "relateurl": "^0.2.7", + "terser": "^5.10.0" + }, + "bin": { + "html-minifier-terser": "cli.js" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/html-webpack-plugin/node_modules/terser": { + "version": "5.31.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz", + "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==", + "dev": true, + "dependencies": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/html-webpack-plugin/node_modules/terser/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, + "node_modules/htmlparser2": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", + "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "dev": true, + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.5.2", + "entities": "^2.0.0" + } + }, + "node_modules/http-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + }, + "node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/http2-wrapper": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", + "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", + "dependencies": { + "quick-lru": "^5.1.1", + "resolve-alpn": "^1.0.0" + }, + "engines": { + "node": ">=10.19.0" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dev": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/iconv-corefoundation": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz", + "integrity": "sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==", + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "cli-truncate": "^2.1.0", + "node-addon-api": "^1.6.3" + }, + "engines": { + "node": "^8.11.2 || >=10" + } + }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/icss-utils": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", + "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", + "dev": true, + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/ifdef-loader": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/ifdef-loader/-/ifdef-loader-2.3.2.tgz", + "integrity": "sha512-kH9bHPrfIFxLpq3XEruJqSlHXch2nOljKIDRS/6MU5LDZTyHeaSWVf04wNYX+8RT+NDmeS8Vm5HwZ7akkXo8ig==", + "dev": true, + "dependencies": { + "loader-utils": "^1.1.0" + } + }, + "node_modules/ifdef-loader/node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/ifdef-loader/node_modules/loader-utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", + "dev": true, + "dependencies": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/ignore": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/immutable": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", + "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==", + "dev": true + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-local": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", + "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", + "dev": true, + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/interpret": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", + "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", + "dev": true, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-ci": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", + "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", + "dev": true, + "dependencies": { + "ci-info": "^3.2.0" + }, + "bin": { + "is-ci": "bin.js" + } + }, + "node_modules/is-core-module": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "dev": true, + "dependencies": { + "hasown": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-path-cwd": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", + "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/is-path-in-cwd": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", + "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", + "dev": true, + "dependencies": { + "is-path-inside": "^2.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/is-path-in-cwd/node_modules/is-path-inside": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", + "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", + "dev": true, + "dependencies": { + "path-is-inside": "^1.0.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true, + "peer": true + }, + "node_modules/isbinaryfile": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.2.tgz", + "integrity": "sha512-GvcjojwonMjWbTkfMpnVHVqXW/wKMYDfEpY94/8zy8HFMOqb/VL6oeONq9v87q4ttVlaTLnGXnJD4B5B1OTGIg==", + "dev": true, + "engines": { + "node": ">= 18.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/gjtorikian/" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dev": true, + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/jake": { + "version": "10.9.1", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz", + "integrity": "sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==", + "dev": true, + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jake/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/jake/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/jest-worker": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", + "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "dev": true, + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", + "optional": true + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/klona": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", + "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/lazy-val": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz", + "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==", + "dev": true + }, + "node_modules/lazystream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", + "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", + "dev": true, + "peer": true, + "dependencies": { + "readable-stream": "^2.0.5" + }, + "engines": { + "node": ">= 0.6.3" + } + }, + "node_modules/lazystream/node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dev": true, + "peer": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/lazystream/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "peer": true + }, + "node_modules/lazystream/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "peer": true, + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/loader-runner": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", + "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", + "dev": true, + "engines": { + "node": ">=6.11.5" + } + }, + "node_modules/loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "dev": true, + "dependencies": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + }, + "engines": { + "node": ">=8.9.0" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true + }, + "node_modules/lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", + "dev": true, + "peer": true + }, + "node_modules/lodash.difference": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", + "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==", + "dev": true, + "peer": true + }, + "node_modules/lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==", + "dev": true, + "peer": true + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", + "dev": true, + "peer": true + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, + "node_modules/lodash.union": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", + "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==", + "dev": true, + "peer": true + }, + "node_modules/lower-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "dev": true, + "dependencies": { + "tslib": "^2.0.3" + } + }, + "node_modules/lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "devOptional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/matcher": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", + "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", + "optional": true, + "dependencies": { + "escape-string-regexp": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "dev": true, + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", + "engines": { + "node": ">=4" + } + }, + "node_modules/mini-css-extract-plugin": { + "version": "2.7.6", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz", + "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==", + "dev": true, + "dependencies": { + "schema-utils": "^4.0.0" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" + } + }, + "node_modules/mini-css-extract-plugin/node_modules/ajv": { + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", + "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.3", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.4.1" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, + "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "node_modules/mini-css-extract-plugin/node_modules/schema-utils": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", + "dev": true, + "dependencies": { + "@types/json-schema": "^7.0.9", + "ajv": "^8.9.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.1.0" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dev": true, + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mrmime": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz", + "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/nanoid": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "node_modules/natural-compare-lite": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", + "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", + "dev": true + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true + }, + "node_modules/no-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "dev": true, + "dependencies": { + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + } + }, + "node_modules/node-addon-api": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", + "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==", + "dev": true, + "optional": true + }, + "node_modules/node-releases": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", + "dev": true + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/normalize-url": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nth-check": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "dev": true, + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "optional": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/opener": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz", + "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", + "dev": true, + "bin": { + "opener": "bin/opener-bin.js" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-cancelable": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", + "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", + "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/param-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", + "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", + "dev": true, + "dependencies": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", + "dev": true + }, + "node_modules/pascal-case": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", + "dev": true, + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/path-browserify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", + "dev": true + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==", + "dev": true + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "node_modules/path-scurry": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz", + "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==", + "dev": true, + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", + "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", + "dev": true, + "engines": { + "node": "14 || >=16.14" + } + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" + }, + "node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", + "dev": true, + "dependencies": { + "pinkie": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/plist": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz", + "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==", + "dev": true, + "dependencies": { + "@xmldom/xmldom": "^0.8.8", + "base64-js": "^1.5.1", + "xmlbuilder": "^15.1.1" + }, + "engines": { + "node": ">=10.4.0" + } + }, + "node_modules/postcss": { + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "nanoid": "^3.3.7", + "picocolors": "^1.0.0", + "source-map-js": "^1.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/postcss-modules-extract-imports": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz", + "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==", + "dev": true, + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-modules-local-by-default": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz", + "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==", + "dev": true, + "dependencies": { + "icss-utils": "^5.0.0", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-modules-scope": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz", + "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==", + "dev": true, + "dependencies": { + "postcss-selector-parser": "^6.0.4" + }, + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-modules-values": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", + "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", + "dev": true, + "dependencies": { + "icss-utils": "^5.0.0" + }, + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-selector-parser": { + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz", + "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==", + "dev": true, + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/postcss-value-parser": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "dev": true + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/pretty-error": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", + "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==", + "dev": true, + "dependencies": { + "lodash": "^4.17.20", + "renderkid": "^3.0.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true, + "peer": true + }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "dev": true, + "dependencies": { + "err-code": "^2.0.2", + "retry": "^0.12.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/quick-lru": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/read-config-file": { + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-6.3.2.tgz", + "integrity": "sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==", + "dev": true, + "dependencies": { + "config-file-ts": "^0.2.4", + "dotenv": "^9.0.2", + "dotenv-expand": "^5.1.0", + "js-yaml": "^4.1.0", + "json5": "^2.2.0", + "lazy-val": "^1.0.4" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "peer": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/readdir-glob": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz", + "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==", + "dev": true, + "peer": true, + "dependencies": { + "minimatch": "^5.1.0" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/rechoir": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", + "dev": true, + "dependencies": { + "resolve": "^1.9.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/relateurl": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", + "dev": true, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/renderkid": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", + "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==", + "dev": true, + "dependencies": { + "css-select": "^4.1.3", + "dom-converter": "^0.2.0", + "htmlparser2": "^6.1.0", + "lodash": "^4.17.21", + "strip-ansi": "^6.0.1" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-alpn": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", + "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==" + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-cwd/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, + "node_modules/responselike": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", + "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", + "dependencies": { + "lowercase-keys": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/roarr": { + "version": "2.15.4", + "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", + "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", + "optional": true, + "dependencies": { + "boolean": "^3.0.1", + "detect-node": "^2.0.4", + "globalthis": "^1.0.1", + "json-stringify-safe": "^5.0.1", + "semver-compare": "^1.0.0", + "sprintf-js": "^1.1.2" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, + "node_modules/sanitize-filename": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz", + "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==", + "dev": true, + "dependencies": { + "truncate-utf8-bytes": "^1.0.0" + } + }, + "node_modules/sass": { + "version": "1.76.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.76.0.tgz", + "integrity": "sha512-nc3LeqvF2FNW5xGF1zxZifdW3ffIz5aBb7I7tSvOoNu7z1RQ6pFt9MBuiPtjgaI62YWrM/txjWlOCFiGtf2xpw==", + "dev": true, + "dependencies": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-loader": { + "version": "12.6.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz", + "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==", + "dev": true, + "dependencies": { + "klona": "^2.0.4", + "neo-async": "^2.6.2" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "fibers": ">= 3.1.0", + "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", + "sass": "^1.3.0", + "sass-embedded": "*", + "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "fibers": { + "optional": true + }, + "node-sass": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + } + } + }, + "node_modules/sax": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz", + "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==", + "dev": true + }, + "node_modules/schema-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "dev": true, + "dependencies": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/semver": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "devOptional": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver-compare": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", + "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", + "optional": true + }, + "node_modules/serialize-error": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", + "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", + "optional": true, + "dependencies": { + "type-fest": "^0.13.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/serialize-error/node_modules/type-fest": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", + "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", + "optional": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "dev": true, + "dependencies": { + "kind-of": "^6.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/simple-update-notifier": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", + "dev": true, + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/sirv": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz", + "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==", + "dev": true, + "dependencies": { + "@polka/url": "^1.0.0-next.24", + "mrmime": "^2.0.0", + "totalist": "^3.0.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/slice-ansi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", + "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", + "dev": true, + "optional": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "dev": true, + "optional": true, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/source-list-map": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", + "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==", + "dev": true + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "optional": true + }, + "node_modules/stat-mode": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz", + "integrity": "sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "peer": true, + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/sumchecker": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", + "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", + "dependencies": { + "debug": "^4.1.0" + }, + "engines": { + "node": ">= 8.0" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/tar": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "dev": true, + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "dev": true, + "peer": true, + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/temp-file": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz", + "integrity": "sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==", + "dev": true, + "dependencies": { + "async-exit-hook": "^2.0.1", + "fs-extra": "^10.0.0" + } + }, + "node_modules/temp-file/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/temp-file/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/temp-file/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/terser": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz", + "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==", + "dev": true, + "dependencies": { + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/terser-webpack-plugin": { + "version": "5.3.10", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", + "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", + "dev": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.20", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.26.0" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, + "node_modules/terser-webpack-plugin/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, + "node_modules/terser-webpack-plugin/node_modules/terser": { + "version": "5.31.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz", + "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==", + "dev": true, + "dependencies": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/terser/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, + "node_modules/tmp": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", + "dev": true, + "engines": { + "node": ">=14.14" + } + }, + "node_modules/tmp-promise": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", + "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", + "dev": true, + "dependencies": { + "tmp": "^0.2.0" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/totalist": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz", + "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/truncate-utf8-bytes": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", + "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==", + "dev": true, + "dependencies": { + "utf8-byte-length": "^1.0.1" + } + }, + "node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "dev": true + }, + "node_modules/tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + }, + "node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.15.tgz", + "integrity": "sha512-K9HWH62x3/EalU1U6sjSZiylm9C8tgq2mSvshZpqc7QE69RaA2qjhkW2HlNA0tFpEbtyFz7HTqbSdN4MSwUodA==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "escalade": "^3.1.2", + "picocolors": "^1.0.0" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/utf8-byte-length": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", + "integrity": "sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==", + "dev": true + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true + }, + "node_modules/utila": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", + "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==", + "dev": true + }, + "node_modules/verror": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", + "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==", + "dev": true, + "optional": true, + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/watchpack": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz", + "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==", + "dev": true, + "dependencies": { + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/webpack": { + "version": "5.91.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz", + "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==", + "dev": true, + "dependencies": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.5", + "@webassemblyjs/ast": "^1.12.1", + "@webassemblyjs/wasm-edit": "^1.12.1", + "@webassemblyjs/wasm-parser": "^1.12.1", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.21.10", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.16.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.11", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", + "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "node_modules/webpack-bundle-analyzer": { + "version": "4.10.2", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz", + "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==", + "dev": true, + "dependencies": { + "@discoveryjs/json-ext": "0.5.7", + "acorn": "^8.0.4", + "acorn-walk": "^8.0.0", + "commander": "^7.2.0", + "debounce": "^1.2.1", + "escape-string-regexp": "^4.0.0", + "gzip-size": "^6.0.0", + "html-escaper": "^2.0.2", + "opener": "^1.5.2", + "picocolors": "^1.0.0", + "sirv": "^2.0.3", + "ws": "^7.3.1" + }, + "bin": { + "webpack-bundle-analyzer": "lib/bin/analyzer.js" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/webpack-bundle-analyzer/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/webpack-cli": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", + "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==", + "dev": true, + "dependencies": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^1.2.0", + "@webpack-cli/info": "^1.5.0", + "@webpack-cli/serve": "^1.7.0", + "colorette": "^2.0.14", + "commander": "^7.0.0", + "cross-spawn": "^7.0.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^2.2.0", + "rechoir": "^0.7.0", + "webpack-merge": "^5.7.3" + }, + "bin": { + "webpack-cli": "bin/cli.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "4.x.x || 5.x.x" + }, + "peerDependenciesMeta": { + "@webpack-cli/generators": { + "optional": true + }, + "@webpack-cli/migrate": { + "optional": true + }, + "webpack-bundle-analyzer": { + "optional": true + }, + "webpack-dev-server": { + "optional": true + } + } + }, + "node_modules/webpack-cli/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/webpack-merge": { + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz", + "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==", + "dev": true, + "dependencies": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/webpack-sources": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", + "dev": true, + "dependencies": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" + } + }, + "node_modules/webpack/node_modules/webpack-sources": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wildcard": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", + "dev": true + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + }, + "node_modules/ws": { + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "dev": true, + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xmlbuilder": { + "version": "15.1.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", + "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", + "dev": true, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "devOptional": true + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/yauzl": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", + "dependencies": { + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/zip-stream": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz", + "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==", + "dev": true, + "peer": true, + "dependencies": { + "archiver-utils": "^3.0.4", + "compress-commons": "^4.1.2", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/zip-stream/node_modules/archiver-utils": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz", + "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==", + "dev": true, + "peer": true, + "dependencies": { + "glob": "^7.2.3", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", + "lodash.defaults": "^4.2.0", + "lodash.difference": "^4.5.0", + "lodash.flatten": "^4.4.0", + "lodash.isplainobject": "^4.0.6", + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">= 10" + } + } + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/si/siyuan/package.nix b/third_party/nixpkgs/pkgs/by-name/si/siyuan/package.nix new file mode 100644 index 0000000000..c80d27b612 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/si/siyuan/package.nix @@ -0,0 +1,100 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + buildNpmPackage, + substituteAll, + pandoc, + electron, +}: + +buildNpmPackage rec { + pname = "siyuan"; + version = "3.0.11"; + + src = fetchFromGitHub { + owner = "siyuan-note"; + repo = "siyuan"; + rev = "v${version}"; + hash = "sha256-s82g5os944us85V2TBnm+HNd37vVzNjaOJYrbBrgLSI="; + }; + + kernel = buildGoModule { + name = "${pname}-${version}-kernel"; + inherit src; + sourceRoot = "${src.name}/kernel"; + vendorHash = "sha256-onZBrw0fDsjqXgQF06C40ArxNmsbFDIwD57fJ0jB0ls="; + + patches = [ + (substituteAll { + src = ./set-pandoc-path.patch; + pandoc_path = lib.getExe pandoc; + }) + ]; + + # this patch makes it so that file permissions are not kept when copying files using the gulu package + # this fixes a problem where it was copying files from the store and keeping their permissions + # hopefully this doesn't break other functionality + modPostBuild = '' + chmod +w vendor/github.com/88250/gulu + substituteInPlace vendor/github.com/88250/gulu/file.go \ + --replace-fail "os.Chmod(dest, sourceinfo.Mode())" "os.Chmod(dest, 0644)" + ''; + }; + + sourceRoot = "${src.name}/app"; + + postPatch = '' + ln -s ${./package-lock.json} package-lock.json + # for some reason the default page is broken, use the redirection link automatically + substituteInPlace electron/main.js \ + --replace-fail ' "/stage/build/app/index.html?v=" + new Date().getTime()' '"/stage/build/desktop"' + ''; + + npmDepsHash = "sha256-Yv/iOCyry3CNeKPxS206Y5y5mvzPU873PJdi0UQkVLs="; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + npmBuildScript = "build:desktop"; + + postBuild = '' + substituteInPlace electron-builder-linux.yml \ + --replace-fail '- target: "AppImage"' "" \ + --replace-fail '- target: "tar.gz"' '- target: "dir"' + + # add extra fields to resolve the electron provided by nixpkgs + sed -e 1i'electronDist: ${electron}/libexec/electron' \ + -e 1i'electronVersion: ${electron.version}' \ + -i electron-builder-linux.yml + + npm run dist-linux + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/siyuan + cp -r build/*-unpacked/{locales,resources{,.pak}} $out/share/siyuan + + mkdir $out/share/siyuan/resources/kernel + ln -s ${kernel}/bin/kernel $out/share/siyuan/resources/kernel/SiYuan-Kernel + + makeWrapper ${lib.getExe electron} $out/bin/siyuan \ + --chdir $out/share/siyuan/resources \ + --add-flags $out/share/siyuan/resources/app \ + --set ELECTRON_FORCE_IS_PACKAGED 1 \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --inherit-argv0 + + runHook postInstall + ''; + + meta = { + description = "A privacy-first personal knowledge management system that supports complete offline usage, as well as end-to-end encrypted data sync"; + homepage = "https://b3log.org/siyuan/"; + license = lib.licenses.agpl3Plus; + mainProgram = "siyuan"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/si/siyuan/set-pandoc-path.patch b/third_party/nixpkgs/pkgs/by-name/si/siyuan/set-pandoc-path.patch new file mode 100644 index 0000000000..e3b75b6988 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/si/siyuan/set-pandoc-path.patch @@ -0,0 +1,13 @@ +diff --git a/util/pandoc.go b/util/pandoc.go +index 5dbc58d..5f32644 100644 +--- a/util/pandoc.go ++++ b/util/pandoc.go +@@ -97,6 +97,8 @@ var ( + ) + + func InitPandoc() { ++ PandocBinPath = "@pandoc_path@" ++ return + if ContainerStd != Container { + return + } diff --git a/third_party/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix b/third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix similarity index 92% rename from third_party/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix rename to third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix index ff1a2fe7c7..e13b23e3fb 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -18,7 +18,7 @@ lib.checkListOfEnum "sketchybar-app-font: artifacts" artifacts artifactList in { pname = "sketchybar-app-font"; - version = "2.0.17"; + version = "2.0.18"; srcs = selectedSources; @@ -52,15 +52,15 @@ lib.checkListOfEnum "sketchybar-app-font: artifacts" artifacts artifactList sources = { font = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-iVSWFqhzf0ZxfQODAf+uvGIiWMjWbir6ZWurlx3n6/w="; + hash = "sha256-ajwyBUfgvIUcac8gdFUnzGJCXsUcOJnscIdtrxo7ZqY="; }; lua = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/icon_map.lua"; - hash = "sha256-/N16zLflQ2sONBFOZiIdC8KR1rd5pZvXftiXjXJvTVA="; + hash = "sha256-jxIBLE1UDD1S8nu4b9y7AUYb0XHH/3iknhmBloi1Qrs="; }; shell = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/icon_map.sh"; - hash = "sha256-nPBiNz+3oHwiertjMJ6YW6g6WZglGjassUGrsQVvnRM="; + hash = "sha256-I0t9KbC3Cs73021z9lm7TZUhmwdIaIgPVuLe8IjwkCU="; }; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix b/third_party/nixpkgs/pkgs/by-name/sk/sketchybar/package.nix similarity index 61% rename from third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix rename to third_party/nixpkgs/pkgs/by-name/sk/sketchybar/package.nix index 0cc820986c..37a9849b28 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/sk/sketchybar/package.nix @@ -1,27 +1,37 @@ -{ lib -, stdenv -, fetchFromGitHub -, AppKit -, Carbon -, CoreAudio -, CoreWLAN -, CoreVideo -, DisplayServices -, IOKit -, MediaRemote -, SkyLight -, testers -, nix-update-script +{ + lib, + overrideSDK, + stdenv, + darwin, + fetchFromGitHub, + testers, + nix-update-script, }: let inherit (stdenv.hostPlatform) system; - target = { - "aarch64-darwin" = "arm64"; - "x86_64-darwin" = "x86"; - }.${system} or (throw "Unsupported system: ${system}"); + inherit (darwin.apple_sdk_11_0.frameworks) + AppKit + Carbon + CoreAudio + CoreWLAN + CoreVideo + DisplayServices + IOKit + MediaRemote + SkyLight + ; + + target = + { + "aarch64-darwin" = "arm64"; + "x86_64-darwin" = "x86"; + } + .${system} or (throw "Unsupported system: ${system}"); + + stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; in -stdenv.mkDerivation (finalAttrs: { +stdenv'.mkDerivation (finalAttrs: { pname = "sketchybar"; version = "2.21.0"; @@ -44,9 +54,7 @@ stdenv.mkDerivation (finalAttrs: { SkyLight ]; - makeFlags = [ - target - ]; + makeFlags = [ target ]; installPhase = '' runHook preInstall @@ -71,7 +79,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/FelixKratz/SketchyBar"; license = lib.licenses.gpl3; mainProgram = "sketchybar"; - maintainers = with lib.maintainers; [ azuwis khaneliman ]; + maintainers = with lib.maintainers; [ + azuwis + khaneliman + ]; platforms = lib.platforms.darwin; }; }) diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist b/third_party/nixpkgs/pkgs/by-name/sk/skhd/org.nixos.skhd.plist similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist rename to third_party/nixpkgs/pkgs/by-name/sk/skhd/org.nixos.skhd.plist diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix b/third_party/nixpkgs/pkgs/by-name/sk/skhd/package.nix similarity index 70% rename from third_party/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix rename to third_party/nixpkgs/pkgs/by-name/sk/skhd/package.nix index 539e90562e..d3b3b9adb9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/sk/skhd/package.nix @@ -1,13 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub -, Carbon -, Cocoa -, testers -, nix-update-script +{ + lib, + overrideSDK, + stdenv, + darwin, + fetchFromGitHub, + testers, + nix-update-script, }: +let + inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa; -stdenv.mkDerivation (finalAttrs: { + stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { pname = "skhd"; version = "0.3.9"; @@ -23,9 +28,7 @@ stdenv.mkDerivation (finalAttrs: { Cocoa ]; - makeFlags = [ - "BUILD_PATH=$(out)/bin" - ]; + makeFlags = [ "BUILD_PATH=$(out)/bin" ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; @@ -49,7 +52,12 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/koekeishiya/skhd"; license = lib.licenses.mit; mainProgram = "skhd"; - maintainers = with lib.maintainers; [ cmacrae lnl7 periklis khaneliman ]; + maintainers = with lib.maintainers; [ + cmacrae + lnl7 + periklis + khaneliman + ]; platforms = lib.platforms.darwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/sk/skimpdf/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/skimpdf/package.nix new file mode 100644 index 0000000000..0be793c9cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sk/skimpdf/package.nix @@ -0,0 +1,36 @@ +{ stdenv +, lib +, undmg +, fetchurl +}: +stdenv.mkDerivation rec { + pname = "Skim"; + version = "1.7.2"; + + src = fetchurl { + name = "Skim-${version}.dmg"; + url = "mirror://sourceforge/project/skim-app/Skim/Skim-${version}/Skim-${version}.dmg"; + sha256 = "t/A3Bd7mQ8hFGdbpQou4ru9i5jX4HaYOXgMvfPAUEYc="; + }; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -R Skim.app $out/Applications + runHook postInstall + ''; + + meta = with lib; { + description = "Skim is a PDF reader and note-taker for OS X"; + homepage = "https://skim-app.sourceforge.io/"; + license = licenses.bsd0; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "Skim.app"; + maintainers = with maintainers; [ YvesStraten ]; + platforms = platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sl/slimserver/package.nix b/third_party/nixpkgs/pkgs/by-name/sl/slimserver/package.nix index 94b13c99e9..4e5b2e45fd 100644 --- a/third_party/nixpkgs/pkgs/by-name/sl/slimserver/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sl/slimserver/package.nix @@ -1,109 +1,124 @@ -{ faad2 -, fetchFromGitHub -, flac -, lame -, lib -, makeWrapper -, monkeysAudio -, nixosTests -, perlPackages -, sox -, stdenv -, wavpack -, zlib -, enableUnfreeFirmware ? false +{ + faad2, + fetchFromGitHub, + flac, + lame, + lib, + makeWrapper, + monkeysAudio, + nixosTests, + perlPackages, + sox, + stdenv, + wavpack, + zlib, + enableUnfreeFirmware ? false, }: let - binPath = lib.makeBinPath ([ lame flac faad2 sox wavpack ] ++ (lib.optional stdenv.isLinux monkeysAudio)); - libPath = lib.makeLibraryPath [ zlib stdenv.cc.cc.lib ]; + binPath = lib.makeBinPath ( + [ + lame + flac + faad2 + sox + wavpack + ] + ++ (lib.optional stdenv.isLinux monkeysAudio) + ); + libPath = lib.makeLibraryPath [ + zlib + stdenv.cc.cc.lib + ]; in perlPackages.buildPerlPackage rec { pname = "slimserver"; - version = "8.5.0"; + version = "8.5.1"; src = fetchFromGitHub { owner = "LMS-Community"; repo = "slimserver"; rev = version; - hash = "sha256-yDJVqZ0+qVm4r/wmQK/hf9uRJaN56WQMO28RE59mNNI="; + hash = "sha256-ULyYZC0/ruJCdwR6cxvBRV1S3DTBJiNua64foi80qvI="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = with perlPackages; [ - AnyEvent - ArchiveZip - AsyncUtil - AudioScan - CarpClan - CGI - ClassAccessor - ClassAccessorChained - ClassC3 - # ClassC3Componentised # Error: DBIx::Class::Row::throw_exception(): DBIx::Class::Relationship::BelongsTo::belongs_to(): Can't infer join condition for track - ClassDataInheritable - ClassInspector - ClassISA - ClassMember - ClassSingleton - ClassVirtual - ClassXSAccessor - CompressRawZlib - CryptOpenSSLRSA - DataDump - DataPage - DataURIEncode - DBDSQLite - DBI - # DBIxClass # https://github.com/LMS-Community/slimserver/issues/138 - DigestSHA1 - EncodeDetect - EV - ExporterLite - FileBOM - FileCopyRecursive - FileNext - FileReadBackwards - FileSlurp - FileWhich - HTMLParser - HTTPCookies - HTTPDaemon - HTTPMessage - ImageScale - IOAIO - IOInterface - IOSocketSSL - IOString - JSONXS - JSONXSVersionOneAndTwo - # LogLog4perl # Internal error: Root Logger not initialized. - LWP - LWPProtocolHttps - MP3CutGapless - NetHTTP - NetHTTPSNB - PathClass - ProcBackground - # SQLAbstract # DBI Exception: DBD::SQLite::db prepare_cached failed: no such function: ARRAY - SQLAbstractLimit - SubName - TemplateToolkit - TextUnidecode - TieCacheLRU - TieCacheLRUExpires - TieRegexpHash - TimeDate - URI - URIFind - UUIDTiny - XMLParser - XMLSimple - YAMLLibYAML - ] - # ++ (lib.optional stdenv.isDarwin perlPackages.MacFSEvents) - ++ (lib.optional stdenv.isLinux perlPackages.LinuxInotify2); + buildInputs = + with perlPackages; + [ + AnyEvent + ArchiveZip + AsyncUtil + AudioScan + CarpClan + CGI + ClassAccessor + ClassAccessorChained + ClassC3 + # ClassC3Componentised # Error: DBIx::Class::Row::throw_exception(): DBIx::Class::Relationship::BelongsTo::belongs_to(): Can't infer join condition for track + ClassDataInheritable + ClassInspector + ClassISA + ClassMember + ClassSingleton + ClassVirtual + ClassXSAccessor + CompressRawZlib + CryptOpenSSLRSA + DataDump + DataPage + DataURIEncode + DBDSQLite + DBI + # DBIxClass # https://github.com/LMS-Community/slimserver/issues/138 + DigestSHA1 + EncodeDetect + EV + ExporterLite + FileBOM + FileCopyRecursive + FileNext + FileReadBackwards + FileSlurp + FileWhich + HTMLParser + HTTPCookies + HTTPDaemon + HTTPMessage + ImageScale + IOAIO + IOInterface + IOSocketSSL + IOString + JSONXS + JSONXSVersionOneAndTwo + # LogLog4perl # Internal error: Root Logger not initialized. + LWP + LWPProtocolHttps + MP3CutGapless + NetHTTP + NetHTTPSNB + PathClass + ProcBackground + # SQLAbstract # DBI Exception: DBD::SQLite::db prepare_cached failed: no such function: ARRAY + SQLAbstractLimit + SubName + TemplateToolkit + TextUnidecode + TieCacheLRU + TieCacheLRUExpires + TieRegexpHash + TimeDate + URI + URIFind + UUIDTiny + XMLParser + XMLSimple + YAMLLibYAML + ] + # ++ (lib.optional stdenv.isDarwin perlPackages.MacFSEvents) + ++ (lib.optional stdenv.isLinux perlPackages.LinuxInotify2); prePatch = '' # remove vendored binaries @@ -151,14 +166,17 @@ perlPackages.buildPerlPackage rec { }; meta = with lib; { - homepage = "https://github.com/LMS-Community/slimserver"; + homepage = "https://lyrion.org/"; changelog = "https://github.com/LMS-Community/slimserver/blob/${version}/Changelog${lib.versions.major version}.html"; - description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; + description = "Lyrion Music Server (formerly Logitech Media Server) is open-source server software which controls a wide range of Squeezebox audio players."; # the firmware is not under a free license, so we do not include firmware in the default package # https://github.com/LMS-Community/slimserver/blob/public/8.3/License.txt license = if enableUnfreeFirmware then licenses.unfree else licenses.gpl2Only; mainProgram = "slimserver"; - maintainers = with maintainers; [ adamcstephens jecaro ]; + maintainers = with maintainers; [ + adamcstephens + jecaro + ]; platforms = platforms.unix; broken = stdenv.isDarwin; }; diff --git a/third_party/nixpkgs/pkgs/by-name/sl/slumber/package.nix b/third_party/nixpkgs/pkgs/by-name/sl/slumber/package.nix new file mode 100644 index 0000000000..f203aa313c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sl/slumber/package.nix @@ -0,0 +1,30 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, +}: +rustPlatform.buildRustPackage rec { + pname = "slumber"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "LucasPickering"; + repo = "slumber"; + rev = "v${version}"; + hash = "sha256-afceWAmVpY0x3eXXhQ5unXWNvatiEfqGUwf2lRHTYf8="; + }; + + cargoHash = "sha256-8wleYN0sAgwm0aFsmbwfFw6JEtSYgvKbwkv92LZR5rg="; + + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + + meta = with lib; { + description = "Terminal-based HTTP/REST client"; + homepage = "https://slumber.lucaspickering.me"; + license = licenses.mit; + mainProgram = "slumber"; + maintainers = with maintainers; [ javaes ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sm/smartgithg/package.nix b/third_party/nixpkgs/pkgs/by-name/sm/smartgithg/package.nix index 4693511951..65c5a78ad2 100644 --- a/third_party/nixpkgs/pkgs/by-name/sm/smartgithg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sm/smartgithg/package.nix @@ -6,7 +6,7 @@ , gtk3 , glib , gnome -, wrapGAppsHook +, wrapGAppsHook3 , libXtst , which }: @@ -15,14 +15,14 @@ let in stdenv.mkDerivation rec { pname = "smartgithg"; - version = "23.1.2"; + version = "23.1.3"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - hash = "sha256-gXfHmRPUhs8s7IQIhN0vQyx8NpLrS28ufNNYOMA4AXw="; + hash = "sha256-UvdHr1L5MYwl7eT1BVS/M8Ydtw8VjDG+QuqMW0Q5La4="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ jre gnome.adwaita-icon-theme gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sm/smpq/package.nix b/third_party/nixpkgs/pkgs/by-name/sm/smpq/package.nix new file mode 100644 index 0000000000..117e05d087 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sm/smpq/package.nix @@ -0,0 +1,36 @@ +{ + lib, + cmake, + fetchurl, + stdenv, + stormlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "smpq"; + version = "1.6"; + + src = fetchurl { + url = "https://launchpad.net/smpq/trunk/${finalAttrs.version}/+download/smpq_${finalAttrs.version}.orig.tar.gz"; + hash = "sha256-tdLcil3oYptx7l02ErboTYhBi4bFzTm6MV6esEYvGMs="; + }; + + cmakeFlags = [ + (lib.cmakeBool "WITH_KDE" false) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ stormlib ]; + + strictDeps = true; + + meta = { + homepage = "https://launchpad.net/smpq"; + description = "StormLib MPQ archiving utility"; + license = lib.licenses.gpl3Only; + mainProgram = "smpq"; + maintainers = with lib.maintainers; [ aanderse karolchmist ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snapcraft/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snapcraft/package.nix index 57e16a1a13..38d0f47edb 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/snapcraft/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/snapcraft/package.nix @@ -11,7 +11,7 @@ }: python3Packages.buildPythonApplication rec { pname = "snapcraft"; - version = "8.2.0"; + version = "8.2.5"; pyproject = true; @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { owner = "canonical"; repo = "snapcraft"; rev = "refs/tags/${version}"; - hash = "sha256-uRapRL+492FOju83o3OBsYK52hwOOG6b4EbdMVpAlBs="; + hash = "sha256-+1Gzseuq402m5FvlRAGXl7Lsy2VnRmd1cXNXhkMDDDE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/snes9x/default.nix b/third_party/nixpkgs/pkgs/by-name/sn/snes9x/package.nix similarity index 51% rename from third_party/nixpkgs/pkgs/applications/emulators/snes9x/default.nix rename to third_party/nixpkgs/pkgs/by-name/sn/snes9x/package.nix index 34c2f72c7d..3f57aee0ed 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/snes9x/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/snes9x/package.nix @@ -1,46 +1,44 @@ -{ lib -, stdenv -, alsa-lib -, cmake -, fetchFromGitHub -, gtkmm3 -, libepoxy -, libpng -, libselinux -, libX11 -, libXdmcp -, libXext -, libXinerama -, libXrandr -, libXv -, minizip -, ninja -, pcre2 -, pkg-config -, portaudio -, pulseaudio -, python3 -, SDL2 -, util-linuxMinimal -, wrapGAppsHook -, zlib -, withGtk ? false +{ + lib, + SDL2, + alsa-lib, + cmake, + fetchFromGitHub, + gtkmm3, + libX11, + libXdmcp, + libXext, + libXinerama, + libXrandr, + libXv, + libepoxy, + libpng, + libselinux, + minizip, + ninja, + pcre2, + pkg-config, + portaudio, + pulseaudio, + python3, + stdenv, + util-linuxMinimal, + wrapGAppsHook3, + zlib, + # Boolean flags + withGtk ? false, }: -stdenv.mkDerivation rec { - pname = - if withGtk then - "snes9x-gtk" - else - "snes9x"; - version = "1.62.3"; +stdenv.mkDerivation (finalAttrs: { + pname = "snes9x" + lib.optionalString withGtk "-gtk"; + version = "1.62.3-unstable-2024-04-22"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; - rev = version; + rev = "582128bce7ccf4e3cf7848ae9f6a729a1ebad4c4"; fetchSubmodules = true; - hash = "sha256-+KHpvz7nfwGXjzDAK/V+2JDRT1sa0kXDkg7XcRyvSP8="; + hash = "sha256-fJ1g/L7oA9bhEawTsWjfLl1dDIKEGI+pcpWQCTutyR8="; }; nativeBuildInputs = [ @@ -50,7 +48,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withGtk [ cmake ninja - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -59,10 +57,11 @@ stdenv.mkDerivation rec { minizip zlib ] - # on non-Linux platforms this will build without sound support on X11 build ++ lib.optionals stdenv.isLinux [ alsa-lib pulseaudio + libselinux + util-linuxMinimal # provides libmount ] ++ lib.optionals (!withGtk) [ libpng @@ -72,42 +71,43 @@ stdenv.mkDerivation rec { ++ lib.optionals withGtk [ gtkmm3 libepoxy - libselinux libXdmcp libXrandr pcre2 portaudio SDL2 - util-linuxMinimal # provides libmount ]; - configureFlags = - lib.optional stdenv.hostPlatform.sse4_1Support "--enable-sse41" - ++ lib.optional stdenv.hostPlatform.avx2Support "--enable-avx2"; + hardeningDisable = [ "format" ]; + + configureFlags = lib.optionals stdenv.hostPlatform.sse4_1Support [ + "--enable-sse41" + ] + ++ lib.optionals stdenv.hostPlatform.avx2Support [ + "--enable-avx2" + ]; + + preConfigure = '' + cd ${if withGtk then "gtk" else "unix"} + ''; installPhase = lib.optionalString (!withGtk) '' runHook preInstall install -Dm755 snes9x -t "$out/bin/" - install -Dm644 snes9x.conf.default -t "$out/share/doc/${pname}/" + install -Dm644 snes9x.conf.default -t "$out/share/doc/${finalAttrs.pname}/" install -Dm644 ../docs/{control-inputs,controls,snapshots}.txt -t \ - "$out/share/doc/${pname}/" + "$out/share/doc/${finalAttrs.pname}/" runHook postInstall ''; - preConfigure = if withGtk then "cd gtk" else "cd unix"; - - enableParallelBuilding = true; - - meta = with lib; - let - interface = if withGtk then "GTK" else "X11"; - in + meta = let + interface = if withGtk then "GTK" else "X11"; + in { homepage = "https://www.snes9x.com"; description = "Super Nintendo Entertainment System (SNES) emulator, ${interface} version"; - longDescription = '' Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) emulator. It basically allows you to play most games designed for the SNES @@ -116,13 +116,16 @@ stdenv.mkDerivation rec { Version build with ${interface} interface. ''; - - license = licenses.unfreeRedistributable // { - url = "https://github.com/snes9xgit/snes9x/blob/${version}/LICENSE"; + license = lib.licenses.unfreeRedistributable // { + url = "https://github.com/snes9xgit/snes9x/blob/${finalAttrs.src.rev}/LICENSE"; }; - maintainers = with maintainers; [ qknight xfix thiagokokada ]; - platforms = platforms.unix; - broken = (withGtk && stdenv.isDarwin); mainProgram = "snes9x"; + maintainers = with lib.maintainers; [ + AndersonTorres + qknight + thiagokokada + ]; + platforms = lib.platforms.unix; + broken = (withGtk && stdenv.isDarwin); }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snipe-it/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snipe-it/package.nix index ee8abb0554..db68a36a4d 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/snipe-it/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/snipe-it/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject (finalAttrs: { pname = "snipe-it"; - version = "6.3.4"; + version = "6.4.1"; src = fetchFromGitHub { owner = "snipe"; repo = "snipe-it"; rev = "v${finalAttrs.version}"; - hash = "sha256-xjVrf8RgHzVHSyPK+fqLOCS2pjPvUMFUHZtwkrQWHWM="; + hash = "sha256-7IK5KLdWYcdzsJwzXfHsYvxWiR/R4407gGAGiY9+czY="; }; - vendorHash = "sha256-HNMn50gTYtRHH9bKcvrM7fnCMQsf6lBOqr825kgEsvE="; + vendorHash = "sha256-KkFoc/fqYVgA5Vv6oEk+1/Rcj9VA52ZnH5O5qmLhmE4="; postInstall = '' snipe_it_out="$out/share/php/snipe-it" @@ -53,7 +53,7 @@ php.buildComposerProject (finalAttrs: { Details for snipe-it can be found on the official website at https://snipeitapp.com/. ''; homepage = "https://snipeitapp.com/"; - changelog = "https://github.com/snipe/snipe-it/releases/tag/v${version}"; + changelog = "https://github.com/snipe/snipe-it/releases/tag/v${finalAttrs.version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ yayayayaka ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snippetexpandergui/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snippetexpandergui/package.nix index c43ce82c5e..a5b68fbce9 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/snippetexpandergui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/snippetexpandergui/package.nix @@ -1,7 +1,7 @@ { lib , buildGoModule , fetchFromSourcehut -, wrapGAppsHook +, wrapGAppsHook3 , wails , scdoc , installShellFiles @@ -28,7 +28,7 @@ buildGoModule rec { wails scdoc installShellFiles - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sn/snippetexpanderx/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snippetexpanderx/package.nix index 50da8f0550..c1d7827a4c 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/snippetexpanderx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sn/snippetexpanderx/package.nix @@ -3,7 +3,7 @@ , fetchFromSourcehut , pkg-config , vala -, wrapGAppsHook +, wrapGAppsHook3 , installShellFiles , scdoc , at-spi2-atk @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config vala - wrapGAppsHook + wrapGAppsHook3 installShellFiles scdoc ]; diff --git a/third_party/nixpkgs/pkgs/by-name/so/solana-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/so/solana-cli/package.nix index e1a0ae412c..b4a56dda78 100644 --- a/third_party/nixpkgs/pkgs/by-name/so/solana-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/solana-cli/package.nix @@ -6,7 +6,7 @@ , udev , protobuf , libcxx -, rocksdb +, rocksdb_8_3 , installShellFiles , pkg-config , openssl @@ -33,6 +33,7 @@ let version = "1.17.31"; sha256 = "sha256-5qPW199o+CVJlqGwiAegsquBRWEb5uDKITxjN5dQYAQ="; + rocksdb = rocksdb_8_3; inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security; diff --git a/third_party/nixpkgs/pkgs/by-name/so/soupault/package.nix b/third_party/nixpkgs/pkgs/by-name/so/soupault/package.nix index f14774c486..a3d9257d3e 100644 --- a/third_party/nixpkgs/pkgs/by-name/so/soupault/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/soupault/package.nix @@ -7,13 +7,9 @@ , testers }: -let +ocamlPackages.buildDunePackage rec { pname = "soupault"; - - version = "4.9.0"; -in -ocamlPackages.buildDunePackage { - inherit pname version; + version = "4.10.0"; minimalOCamlVersion = "4.13"; @@ -22,7 +18,7 @@ ocamlPackages.buildDunePackage { "https://github.com/PataphysicalSociety/soupault/archive/${version}.tar.gz" "https://codeberg.org/PataphysicalSociety/soupault/archive/${version}.tar.gz" ]; - hash = "sha256-vGTJUbAeYs/EYFykNSmCc4c9G66/Lz3BsUYnZQ8feFo="; + hash = "sha256-mkbRWw4Qj7pk2MQJERA9cAuC8DXD/fOShVXz2zPtXZ4="; }; nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ darwin.sigtool ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spacedrive/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spacedrive/package.nix index f6b9372709..80220ae4b9 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spacedrive/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spacedrive/package.nix @@ -9,20 +9,20 @@ let pname = "spacedrive"; - version = "0.2.4"; + version = "0.2.14"; src = fetchurl { aarch64-darwin = { url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-aarch64.dmg"; - hash = "sha256-rVRmlhsvvFFRr3ghX0cvfcJO3WlbaNNBo+r4I556YEg="; + hash = "sha256-G0Ey7ewZeXegiqkAXFmS0MdaYllTphp7Buqs5/4/mWY="; }; x86_64-darwin = { url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-x86_64.dmg"; - hash = "sha256-etRAcGC5S0GwVrBWICfB5ef83xcp/35K0/QndKmPUSE="; + hash = "sha256-ypUDb94RlGqJfkf4htWKZ0UrGZ0SyCZrrAqtMuxDzDI="; }; x86_64-linux = { url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.AppImage"; - hash = "sha256-D8etNXrDVLHa1wg+7Xu9yXUvhlAXxMVBM3GpOerFsu0="; + hash = "sha256-DFJ1/uJW0BwEtJZxGpnvGC7U8YmsJTUbcuWEOAP2Bno="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); @@ -57,17 +57,13 @@ if stdenv.isDarwin then stdenv.mkDerivation else appimageTools.wrapType2 { inherit pname version src meta passthru; - extraPkgs = pkgs: - (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ]; + extraPkgs = pkgs: [ pkgs.libthai ]; extraInstallCommands = let appimageContents = appimageTools.extractType2 { inherit pname version src; }; in '' - # Remove version from entrypoint - mv $out/bin/spacedrive-${version} $out/bin/spacedrive - # Install .desktop files install -Dm444 ${appimageContents}/com.spacedrive.desktop -t $out/share/applications install -Dm444 ${appimageContents}/spacedrive.png -t $out/share/pixmaps diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spectral-language-server/package.json b/third_party/nixpkgs/pkgs/by-name/sp/spectral-language-server/package.json new file mode 100644 index 0000000000..1f3651349c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sp/spectral-language-server/package.json @@ -0,0 +1,159 @@ +{ + "activationEvents": [ + "onStartupFinished" + ], + "author": "Stoplight ", + "bugs": { + "url": "https://github.com/stoplightio/vscode-spectral/issues" + }, + "categories": [ + "Linters" + ], + "contributes": { + "configuration": { + "properties": { + "spectral.enable": { + "default": true, + "description": "Controls whether or not Spectral is enabled.", + "scope": "resource", + "type": "boolean" + }, + "spectral.rulesetFile": { + "description": "Location of the ruleset file to use when validating. If omitted, the default is a .spectral.yml/.spectral.json in the same folder as the document being validated. Paths are relative to the workspace. This can also be a remote HTTP url.", + "scope": "resource", + "type": "string" + }, + "spectral.run": { + "default": "onType", + "description": "Run the linter on save (onSave) or as you type (onType).", + "enum": [ + "onSave", + "onType" + ], + "scope": "resource", + "type": "string" + }, + "spectral.trace.server": { + "default": "off", + "description": "Traces the communication between VS Code and the language server.", + "enum": [ + "off", + "messages", + "verbose" + ], + "scope": "window", + "type": "string" + }, + "spectral.validateFiles": { + "description": "An array of file globs (e.g., `**/*.yaml`) in minimatch glob format which should be validated by Spectral. If language identifiers are also specified, the file must match both in order to be validated. You can also use negative file globs (e.g., `!**/package.json`) here to exclude files.", + "items": { + "type": "string" + }, + "scope": "resource", + "type": "array" + }, + "spectral.validateLanguages": { + "default": [ + "json", + "yaml" + ], + "description": "An array of language IDs which should be validated by Spectral. If file globs are also specified, the file must match both in order to be validated.", + "items": { + "type": "string" + }, + "scope": "resource", + "type": "array" + } + }, + "title": "Spectral", + "type": "object" + }, + "commands": [ + { + "title": "Show Output Channel", + "category": "Spectral", + "command": "spectral.showOutputChannel" + } + ] + }, + "description": "JSON/YAML linter with OpenAPI and custom ruleset support.", + "devDependencies": { + "@types/chai": "^4.3.1", + "@types/chai-jest-snapshot": "^1.3.6", + "@types/glob": "^7.2.0", + "@types/mocha": "^9.1.0", + "@types/node": "^18.11.18", + "@types/vscode": "^1.48.0", + "@typescript-eslint/eslint-plugin": "^4.33.0", + "@typescript-eslint/parser": "^4.1.0", + "chai": "^4.2.0", + "chai-jest-snapshot": "^2.0.0", + "copyfiles": "^2.4.1", + "cross-env": "^7.0.3", + "eslint": "^7.8.1", + "eslint-config-google": "^0.14.0", + "glob": "^8.0.3", + "http-test-servers": "^2.0.0", + "merge-options": "^3.0.0", + "mocha": "^8.1.3", + "rimraf": "^3.0.2", + "semver": "^7.3.2", + "shelljs": "^0.8.5", + "ts-loader": "^9.2.8", + "ts-node": "^8.10.2", + "typescript": "beta", + "vsce": "^1.103.1", + "vscode-test": "^1.5.0", + "webpack": "^5.72.0", + "webpack-cli": "^4.9.2" + }, + "displayName": "Spectral", + "engines": { + "vscode": "^1.48.0", + "node": "^12.20 || >= 14.13" + }, + "homepage": "https://github.com/stoplightio/vscode-spectral", + "icon": "icon.png", + "keywords": [ + "linter", + "validator", + "OpenAPI", + "Swagger", + "API", + "style guide", + "API description", + "API specification", + "OAS", + "OAS2", + "OAS3", + "AsyncAPI", + "json", + "yaml" + ], + "license": "Apache-2.0", + "main": "./client/index.js", + "name": "spectral", + "private": true, + "publisher": "stoplight", + "repository": { + "type": "git", + "url": "https://github.com/stoplightio/vscode-spectral" + }, + "scripts": { + "clean": "rimraf dist && rimraf \"{server,client}/dist\"", + "lint": "eslint --ext .ts,.js .", + "test": "mocha -r ts-node/register \"./+(client|server)/__tests__/unit/**/*.test.ts\"", + "test:e2e": "cross-env CI=true CHAI_JEST_SNAPSHOT_UPDATE_ALL=false ts-node ./client/src/__tests__/e2e/index.ts" + }, + "version": "1.1.2", + "workspaces": { + "packages": [ + "client", + "server" + ], + "nohoist": [ + "client/**", + "server/**" + ] + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spectral-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spectral-language-server/package.nix new file mode 100644 index 0000000000..8193ff3ace --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sp/spectral-language-server/package.nix @@ -0,0 +1,109 @@ +{ lib +, buildNpmPackage +, mkYarnPackage +, fetchYarnDeps +, fetchFromGitHub +, typescript +, jq +, fetchpatch +}: +let + # Instead of the build script that spectral-language-server provides (ref: https://github.com/luizcorreia/spectral-language-server/blob/master/script/vscode-spectral-build.sh), we build vscode-spectral manually. + # This is because the script must go through the network and will not work under the Nix sandbox environment. + vscodeSpectral = mkYarnPackage rec { + pname = "vscode-spectral"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "stoplightio"; + repo = "vscode-spectral"; + rev = "v${version}"; + hash = "sha256-TWy+bC6qhTKDY874ORTBbvCIH8ycpmBiU8GLYxBIiAs="; + }; + + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-am27A9VyFoXuOlgG9mnvNqV3Q7Bi7GJzDqqVFGDVWIA="; + }; + + nativeBuildInputs = [ typescript jq ]; + + postPatch = '' + cp server/tsconfig.json server/tsconfig.json.bak + jq '.compilerOptions += {"module": "NodeNext", "moduleResolution": "NodeNext"}' server/tsconfig.json.bak > server/tsconfig.json + ''; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + # FIXME: vscode-spactral depends on @rollup/pluginutils, but it may have a bug that doesn't provide the type definitions for NodeNext module resolution. (ref: https://github.com/rollup/plugins/issues/1192) + # tsc detects some type errors in the code. However we ignore this because it's not a problem for the final build if server/dist is generated. + tsc -p server || true + test -d server/dist + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -R server/dist $out + runHook postInstall + ''; + + doDist = false; + + meta = with lib; { + homepage = "https://github.com/stoplightio/vscode-spectral"; + description = "VS Code extension bringing the awesome Spectral JSON/YAML linter with OpenAPI/AsyncAPI support"; + license = licenses.asl20; + }; + }; +in +buildNpmPackage rec { + pname = "spectral-language-server"; + version = "1.0.8-unstable-2023-06-06"; + + src = fetchFromGitHub { + owner = "luizcorreia"; + repo = "spectral-language-server"; + rev = "c9a7752b08e6bba937ef4f5435902afd41b6957f"; + hash = "sha256-VD2aAzlCnJ6mxPUSbNRfMOlslM8kLPqrAI2ah6sX9cU="; + }; + + npmDepsHash = "sha256-ixAXy/rRkyWL3jdAkrXJh1qhWcKIkr5nH/Bhu2JV6k8="; + + patches = [ + # https://github.com/luizcorreia/spectral-language-server/pull/15 + (fetchpatch { + name = "fix-package-lock.patch"; + url = "https://github.com/luizcorreia/spectral-language-server/commit/909704850dd10e7b328fc7d15f8b07cdef88899d.patch"; + hash = "sha256-+mN93xP4HCll4dTcnh2W/m9k3XovvgnB6AOmuJpZUZ0="; + }) + ]; + + dontNpmBuild = true; + + npmFlags = [ "--ignore-scripts" ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mkdir -p $out/node_modules + mkdir -p $out/dist/spectral-language-server + cp -R ${vscodeSpectral}/dist/* $out/dist/spectral-language-server/ + cp ./bin/* $out/bin + cp -R ./node_modules/* $out/node_modules + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/luizcorreia/spectral-language-server"; + description = "Awesome Spectral JSON/YAML linter with OpenAPI/AsyncAPI support"; + maintainers = with maintainers; [ momeemt ]; + license = licenses.mit; + mainProgram = "spectral-language-server"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spicetify-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spicetify-cli/package.nix index e884a5177f..22489b3b7c 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spicetify-cli/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.36.5"; + version = "2.36.11"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-amalb1NNoA9KqeQtMtJZamLFNL3Wc/21ZVkr/Evhmik="; + hash = "sha256-ZqWGKuYDxuKVqz6cNxZ3cTcKTxkxuu42b48hlAialKc="; }; vendorHash = "sha256-UPrLXzAdvCOmLm1tekzKyulQ4+2BSyPUF1k66GwKS88="; diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spirit/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spirit/package.nix index 2dbd712eac..ada3c2e9e0 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spirit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spirit/package.nix @@ -5,13 +5,13 @@ buildGoModule { pname = "spirit"; - version = "0-unstable-2024-03-20"; + version = "0-unstable-2024-04-18"; src = fetchFromGitHub { owner = "cashapp"; repo = "spirit"; - rev = "10e4bba0a89ef3b372046dc367c2b2d12e9d0c0b"; - hash = "sha256-tw+gHSxIHKEsHaVuknylk4zWsTRKGVNci9WimDC9y1A="; + rev = "886ee21e7338faef6612495b27d409713a202082"; + hash = "sha256-xXObprJCo9evArCX5ezqrD+lagiHMO4SwycY+pTkHPg="; }; vendorHash = "sha256-r6iQs5kgOniHCN8KteQ17rPhQ/73Exuqlu6qWgKEIzs="; diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix index 03ee6ad8d8..cc63a6b680 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spotube/package.nix @@ -8,7 +8,7 @@ makeBinaryWrapper, makeWrapper, undmg, - wrapGAppsHook, + wrapGAppsHook3, libappindicator, libnotify, @@ -84,7 +84,7 @@ let autoPatchelfHook dpkg makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sq/squirreldisk/package.nix b/third_party/nixpkgs/pkgs/by-name/sq/squirreldisk/package.nix index d274abae5e..f394cce79a 100644 --- a/third_party/nixpkgs/pkgs/by-name/sq/squirreldisk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sq/squirreldisk/package.nix @@ -6,7 +6,7 @@ gtk3, webkitgtk, pkg-config, - wrapGAppsHook, + wrapGAppsHook3, parallel-disk-usage, fetchFromGitHub, buildNpmPackage, @@ -65,7 +65,7 @@ in cp ${parallel-disk-usage}/bin/pdu bin/pdu-${stdenv.hostPlatform.config} ''; - nativeBuildInputs = [pkg-config wrapGAppsHook copyDesktopItems]; + nativeBuildInputs = [pkg-config wrapGAppsHook3 copyDesktopItems]; buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk]; # Disable checkPhase, since the project doesn't contain tests diff --git a/third_party/nixpkgs/pkgs/by-name/ss/sse2neon/package.nix b/third_party/nixpkgs/pkgs/by-name/ss/sse2neon/package.nix new file mode 100644 index 0000000000..f7ef8cca15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ss/sse2neon/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sse2neon"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "DLTcollab"; + repo = "sse2neon"; + rev = "v${finalAttrs.version}"; + hash = "sha256-riFFGIA0H7e5StYSjO0/JDrduzfwS+lOASzk5BRUyo4="; + }; + + postPatch = '' + # remove warning about gcc < 10 + substituteInPlace sse2neon.h --replace-fail "#warning \"GCC versions" "// " + ''; + + nativeBuildInputs = [ pkg-config ]; + + dontInstall = true; + # use postBuild instead of installPhase, because the build + # in itself doesn't produce any ($out) output + postBuild = '' + mkdir -p $out/lib + install -m444 sse2neon.h $out/lib/ + ''; + + meta = { + description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems"; + homepage = "https://www.mono-project.com/docs/gui/libgdiplus/"; + platforms = lib.platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.gador ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/st/stackit-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stackit-cli/package.nix index 1e2eab4da2..8d1b10f809 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stackit-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.2.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-0SI7hRJxdtdpGgEsUCWNsIcT50W7uyxLs5Mp+alHE0I="; + hash = "sha256-qujqRLXkQqUrpmyEkawPyEmCleXN43Wvv+sFwevVtqA="; }; - vendorHash = "sha256-FXy3qVSf57cPmxkY2XPEjFz3qRYkH5pPmCoIiWb28FY="; + vendorHash = "sha256-SOX6jL7KX4FvYUyE3vyA8pjKwe4co073QZ1qRMGm3/Q="; subPackages = [ "." ]; @@ -35,22 +35,13 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; - preCheck = '' - export HOME=$TMPDIR # needed because the binary always creates a dir & config file - ''; - postInstall = '' - export HOME=$TMPDIR # needed because the binary always creates a dir & config file mv $out/bin/{${pname},stackit} # rename the binary - installShellCompletion --cmd stackit --bash <($out/bin/stackit completion bash) - installShellCompletion --cmd stackit --zsh <($out/bin/stackit completion zsh) - installShellCompletion --cmd stackit --fish <($out/bin/stackit completion fish) - # Use this instead, once https://github.com/stackitcloud/stackit-cli/issues/153 is fixed: - # installShellCompletion --cmd stackit \ - # --bash <($out/bin/stackit completion bash) \ - # --zsh <($out/bin/stackit completion zsh) \ - # --fish <($out/bin/stackit completion fish) + installShellCompletion --cmd stackit \ + --bash <($out/bin/stackit completion bash) \ + --zsh <($out/bin/stackit completion zsh) \ + --fish <($out/bin/stackit completion fish) # Ensure that all 3 completion scripts exist AND have content (should be kept for regression testing) [ $(find $out/share -not -empty -type f | wc -l) -eq 3 ] ''; @@ -65,7 +56,7 @@ buildGoModule rec { passthru.tests = { version = testers.testVersion { package = stackit-cli; - command = "HOME=$TMPDIR stackit --version"; + command = "stackit --version"; }; }; diff --git a/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix index e52e1d0ca2..803898ea36 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix @@ -2,16 +2,21 @@ , stdenvNoCC , fetchurl , undmg +, writeShellApplication +, curl +, jq +, common-updater-scripts }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.10.7"; + version = "2.10.11"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-B44KFrKy76IZB7QeivE4a/e8JARp4VwJs0mTffa622w="; + hash = "sha256-vF32tDuSAZJrZ21iKtM+/2qk9WWoyMddrtg5wK2+IaI="; }; + sourceRoot = "."; nativeBuildInputs = [ undmg ]; @@ -25,12 +30,23 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = lib.getExe (writeShellApplication { + name = "stats-update-script"; + runtimeInputs = [ curl jq common-updater-scripts ]; + text = '' + set -euo pipefail + url="$(curl --silent "https://api.github.com/repos/exelban/stats/tags?per_page=1")" + version="$(echo "$url" | jq -r '.[0].name' | cut -c 2-)" + update-source-version stats "$version" --file=./pkgs/by-name/st/stats/package.nix + ''; + }); + meta = with lib; { description = "macOS system monitor in your menu bar"; homepage = "https://github.com/exelban/stats"; license = licenses.mit; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau Enzime donteatoreo ]; platforms = platforms.darwin; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/stduuid/default.nix b/third_party/nixpkgs/pkgs/by-name/st/stduuid/package.nix similarity index 51% rename from third_party/nixpkgs/pkgs/development/libraries/stduuid/default.nix rename to third_party/nixpkgs/pkgs/by-name/st/stduuid/package.nix index c7e31c9900..af9ea37639 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/stduuid/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stduuid/package.nix @@ -1,7 +1,8 @@ -{ stdenv, cmake, fetchFromGitHub, lib }: let +{ stdenv, cmake, fetchFromGitHub, fetchpatch, lib }: let version = "1.2.3"; in stdenv.mkDerivation { - name = "stduuid-${version}"; + pname = "stduuid"; + inherit version; src = fetchFromGitHub { owner = "mariusbancila"; @@ -12,6 +13,15 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; + patches = [ + # stduuid report version 1.0 instead of 1.2.3 for cmake's find_package to properly work + # If version is updated one day, this patch will need to be updated + (fetchpatch { + url = "https://github.com/OlivierLDff/stduuid/commit/b02c70c0a4bef2c82152503e13c9a67d6631b13d.patch"; + hash = "sha256-tv4rllhngdgjXX35kcM69yXo0DXF/BQ+AUbiC1gJIU8="; + }) + ]; + meta = { description = "A C++17 cross-platform implementation for UUIDs"; license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/by-name/st/step-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/st/step-cli/package.nix new file mode 100644 index 0000000000..65f8959e34 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/st/step-cli/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: let + version = "0.26.1"; +in + buildGoModule { + pname = "step-cli"; + inherit version; + + src = fetchFromGitHub { + owner = "smallstep"; + repo = "cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-BVxdgyQsfCwHw/zjP3AKNib3sRWoBpMlZ7vh71nso94="; + }; + + ldflags = [ + "-w" + "-s" + "-X=main.Version=${version}" + ]; + + preCheck = '' + # Tries to connect to smallstep.com + rm command/certificate/remote_test.go + ''; + + vendorHash = "sha256-Z6wrWkyAGi01gH7+v2+VkyqRNqDwLFVwXm/1FIMzURg="; + + meta = { + description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; + homepage = "https://smallstep.com/cli/"; + changelog = "https://github.com/smallstep/cli/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [isabelroses]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + mainProgram = "step"; + }; + } diff --git a/third_party/nixpkgs/pkgs/by-name/st/stirling-pdf/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stirling-pdf/package.nix index 0b2e17aee8..dcd4f61d81 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stirling-pdf/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stirling-pdf/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stirling-pdf"; - version = "0.22.8"; + version = "0.23.1"; src = fetchFromGitHub { owner = "Stirling-Tools"; repo = "Stirling-PDF"; rev = "v${finalAttrs.version}"; - hash = "sha256-wFxIMubZ6327iBRyHxeo/hsPyq572gk6K8waJ3KyMEw="; + hash = "sha256-71caSM4J0sNMqWX0ok8aO3wdpVcjfrn/yVGLWeO5fOk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/by-name/st/stlink-tool/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stlink-tool/package.nix new file mode 100644 index 0000000000..029bb0a9b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/st/stlink-tool/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, pkg-config +, fetchFromGitHub +, libusb1 +}: + +# IMPORTANT: You need permissions to access the stlink usb devices. +# Add services.udev.packages = [ pkgs.stlink ] to your configuration.nix +stdenv.mkDerivation { + pname = "stlink-tool"; + version = "0-unstable-2020-06-10"; + + src = fetchFromGitHub { + owner = "jeanthom"; + repo = "stlink-tool"; + rev = "8cbdffee012d5a782dd67d1277ed22fa889b9ba9"; + hash = "sha256-1Mk4rFyIviJ9hcJo1GyzRmlPIemBJtuj3PgvnNhche0="; + fetchSubmodules = true; + }; + + buildInputs = [ libusb1 ]; + nativeBuildInputs = [ pkg-config ]; + + env.NIX_CFLAGS_COMPILE = "-Wno-uninitialized"; + + installPhase = '' + runHook preInstall + install -D stlink-tool $out/bin/stlink-tool + runHook postInstall + ''; + + meta = with lib; { + description = "libusb tool for flashing chinese ST-Link dongles"; + homepage = "https://github.com/jeanthom/stlink-tool"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.wucke13 ]; + mainProgram = "stlink-tool"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/st/stormlib/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stormlib/package.nix index cfa218c34e..8248956f26 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stormlib/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/stormlib/package.nix @@ -1,41 +1,61 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bzip2, libtomcrypt, zlib, darwin }: +{ + lib, + bzip2, + cmake, + darwin, + fetchFromGitHub, + libtomcrypt, + stdenv, + zlib, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stormlib"; - version = "9.22"; + version = "9.23"; src = fetchFromGitHub { owner = "ladislav-zezula"; repo = "StormLib"; - rev = "v${version}"; - sha256 = "1rcdl6ryrr8fss5z5qlpl4prrw8xpbcdgajg2hpp0i7fpk21ymcc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-8JDMqZ5BWslH4+Mfo5lnWTmD2QDaColwBOLzcuGZciY="; }; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "FRAMEWORK DESTINATION /Library/Frameworks" "FRAMEWORK DESTINATION Library/Frameworks" - ''; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DWITH_LIBTOMCRYPT=ON" + nativeBuildInputs = [ + cmake ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ bzip2 libtomcrypt zlib ] ++ - lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Carbon ]; + buildInputs = [ + bzip2 + libtomcrypt + zlib + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Carbon + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "WITH_LIBTOMCRYPT" true) + ]; + + strictDeps = true; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-Wno-implicit-function-declaration" "-Wno-int-conversion" ]); - meta = with lib; { + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "FRAMEWORK DESTINATION /Library/Frameworks" "FRAMEWORK DESTINATION Library/Frameworks" + ''; + + meta = { homepage = "https://github.com/ladislav-zezula/StormLib"; - license = licenses.mit; description = "An open-source project that can work with Blizzard MPQ archives"; - mainProgram = "storm_test"; - platforms = platforms.all; - maintainers = with maintainers; [ aanderse karolchmist ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aanderse karolchmist ]; + platforms = lib.platforms.all; + broken = stdenv.isDarwin; # installation directory mismatch }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/st/strictdoc/package.nix b/third_party/nixpkgs/pkgs/by-name/st/strictdoc/package.nix index 153213dd1c..d428d4638f 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/strictdoc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/strictdoc/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "strictdoc"; - version = "0.0.51"; + version = "0.0.54"; pyproject = true; src = fetchFromGitHub { owner = "strictdoc-project"; repo = "strictdoc"; rev = "refs/tags/${version}"; - hash = "sha256-OFKWeFtVwZKh9KLeA3wiyqAkbPYEQy5/IeHLINkF1C0="; + hash = "sha256-gsZgvT3bSHxxFLhEqlHjoRZiYZwyFr377CGYWYOssyM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/st/sttr/package.nix b/third_party/nixpkgs/pkgs/by-name/st/sttr/package.nix index 000af4a30a..a645940a59 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/sttr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/sttr/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sttr"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "abhimanyu003"; repo = "sttr"; rev = "v${version}"; - hash = "sha256-OE7sp3K6a3XRc2yQTweoszacW8id/+/blND+4Bwlras="; + hash = "sha256-8xIVLUbqk7bPjDTO2tdU9dGslBEorQusaJSAuFhRZYw="; }; - vendorHash = "sha256-Bkau3OKVwLBId8O/vc2XdjiPDSevoDcWICh2kLTCpz0="; + vendorHash = "sha256-OuPPK4ordP/yzH+0sCRKO9szJ81LUbvM2Z8U88O6Qwc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/su/superfile/package.nix b/third_party/nixpkgs/pkgs/by-name/su/superfile/package.nix new file mode 100644 index 0000000000..21abce75d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/su/superfile/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +let + version = "1.1.2"; +in +buildGoModule { + pname = "superfile"; + inherit version; + + src = + fetchFromGitHub { + owner = "MHNightCat"; + repo = "superfile"; + rev = "v${version}"; + hash = "sha256-Cn03oPGT+vCZQcC62p7COx8N8BGgra+qQaZyF+osVsA="; + } + + "/src"; + + vendorHash = "sha256-gWrhy3qzlXG072u5mW971N2Y4Vmt0KbZkB8SFsFgSzo="; + + meta = { + changelog = "https://github.com/MHNightCat/superfile/blob/v${version}/changelog.md"; + description = "Pretty fancy and modern terminal file manager"; + homepage = "https://github.com/MHNightCat/superfile"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ momeemt ]; + mainProgram = "superfile"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix b/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix index 15621682aa..fee32dc5f8 100644 --- a/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-sleXZnJ/JPlyCMf6Js+Yym1RhtfZT7Q+qYAWLCavZFA="; + hash = "sha256-0MbR6ah3UakLn/6Mfd156BlTZe7thNK6mAPLTuz298g="; }; - vendorHash = "sha256-JKihU597ZBq1VygpWB73V2m9NN/GDrquX9hNzBdszSQ="; + vendorHash = "sha256-Ld1j/SFq5W+SKppAzk7UV74RD6/Dw+PWk0BhEGML5+k="; nativeBuildInputs = [ copyDesktopItems diff --git a/third_party/nixpkgs/pkgs/by-name/su/surrealdb/package.nix b/third_party/nixpkgs/pkgs/by-name/su/surrealdb/package.nix index f5c8fecc1b..0e881eeb7d 100644 --- a/third_party/nixpkgs/pkgs/by-name/su/surrealdb/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/su/surrealdb/package.nix @@ -4,25 +4,28 @@ , fetchFromGitHub , pkg-config , openssl -, rocksdb +, rocksdb_8_3 , testers , surrealdb , darwin , protobuf }: +let + rocksdb = rocksdb_8_3; +in rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "1.3.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-dnfgU7nTX3vvqN9Mox6USRfpFdEI/dAOKIVZ2Jd4t9o="; + hash = "sha256-MX7XE+1YCP6zSc207GAaFgr0QJLMX0dbFqGjLMf/KOI="; }; - cargoHash = "sha256-B+x+xEcwHqoYMolAuMQzSiO/QA1FiBGO3eis9kgN1S4="; + cargoHash = "sha256-skPCmQVH76qdmBVd4IVCnKn1uHP7mEgJ8YXprycpQ5I="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' @@ -35,6 +38,8 @@ rustPlatform.buildRustPackage rec { ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + RUSTFLAGS = "--cfg surrealdb_unstable"; + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook diff --git a/third_party/nixpkgs/pkgs/by-name/sw/sway-easyfocus/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/sway-easyfocus/package.nix index 022770a223..43a9f9ab13 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/sway-easyfocus/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/sway-easyfocus/package.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , atk , cairo , gdk-pixbuf @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/sw/sway-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/sway-unwrapped/package.nix index 89af07a9af..8a747f8e19 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/sway-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg +{ lib, stdenv, fetchFromGitHub, substituteAll, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc , libGL, wayland, libxkbcommon, pcre2, json_c, libevdev , pango, cairo, libinput, gdk-pixbuf, librsvg @@ -60,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = let + inherit (lib.strings) mesonEnable mesonOption; + # The "sd-bus-provider" meson option does not include a "none" option, # but it is silently ignored iff "-Dtray=disabled". We use "basu" # (which is not in nixpkgs) instead of "none" to alert us if this @@ -67,15 +69,15 @@ stdenv.mkDerivation (finalAttrs: { # assert trayEnabled -> systemdSupport && dbusSupport; sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; - in - [ "-Dsd-bus-provider=${sd-bus-provider}" ] - ++ lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled" - ++ lib.optional (!finalAttrs.trayEnabled) "-Dtray=disabled" - ; + in [ + (mesonOption "sd-bus-provider" sd-bus-provider) + (mesonEnable "xwayland" finalAttrs.enableXWayland) + (mesonEnable "tray" finalAttrs.trayEnabled) + ]; passthru.tests.basic = nixosTests.sway; - meta = with lib; { + meta = { description = "An i3-compatible tiling Wayland compositor"; longDescription = '' Sway is a tiling Wayland compositor and a drop-in replacement for the i3 @@ -87,10 +89,10 @@ stdenv.mkDerivation (finalAttrs: { using only the keyboard. ''; homepage = "https://swaywm.org"; - changelog = "https://github.com/swaywm/sway/releases/tag/${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; + changelog = "https://github.com/swaywm/sway/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ primeos synthetica ]; mainProgram = "sway"; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/sw/sway/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/sway/package.nix index 3e9ed51613..5506447f69 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/sway/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/sway/package.nix @@ -2,7 +2,7 @@ , sway-unwrapped , makeWrapper, symlinkJoin, writeShellScriptBin , withBaseWrapper ? true, extraSessionCommands ? "", dbus -, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3 +, withGtkWrapper ? false, wrapGAppsHook3, gdk-pixbuf, glib, gtk3 , extraOptions ? [] # E.g.: [ "--verbose" ] # Used by the NixOS module: , isNixOS ? false @@ -13,9 +13,12 @@ assert extraSessionCommands != "" -> withBaseWrapper; -with lib; - let + inherit (builtins) replaceStrings; + inherit (lib.lists) optional optionals; + inherit (lib.meta) getExe; + inherit (lib.strings) concatMapStrings optionalString; + sway = sway-unwrapped.overrideAttrs (oa: { inherit isNixOS enableXWayland; }); baseWrapper = writeShellScriptBin sway.meta.mainProgram '' set -o errexit @@ -26,13 +29,13 @@ let fi if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then export DBUS_SESSION_BUS_ADDRESS - exec ${lib.getExe sway} "$@" + exec ${getExe sway} "$@" else - exec ${lib.optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${lib.getExe sway} "$@" + exec ${optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${getExe sway} "$@" fi ''; in symlinkJoin rec { - pname = lib.replaceStrings ["-unwrapped"] [""] sway.pname; + pname = replaceStrings ["-unwrapped"] [""] sway.pname; inherit (sway) version; name = "${pname}-${version}"; @@ -41,7 +44,7 @@ in symlinkJoin rec { strictDeps = false; nativeBuildInputs = [ makeWrapper ] - ++ (optional withGtkWrapper wrapGAppsHook); + ++ (optional withGtkWrapper wrapGAppsHook3); buildInputs = optionals withGtkWrapper [ gdk-pixbuf glib gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swaybg/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/swaybg/package.nix index aa5d12cdfc..6536847abb 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/swaybg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/swaybg/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "swaybg"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaybg"; rev = "v${version}"; - hash = "sha256-Qk5iGALlSVSzgBJzYzyLdLHhj/Zq1R4nFseACBmIBuA="; + hash = "sha256-IJcPSBJErf8Dy9YhYAc9eg/llgaaLZCQSB0Brof+kpg="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/fix-paths.patch new file mode 100644 index 0000000000..c52f65b146 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/sway/config.c ++++ b/sway/config.c +@@ -276,7 +276,7 @@ + + if (!(config->active_bar_modifiers = create_list())) goto cleanup; + +- if (!(config->swaybg_command = strdup("swaybg"))) goto cleanup; ++ if (!(config->swaybg_command = strdup("@swaybg@/bin/swaybg"))) goto cleanup; + + if (!(config->config_chain = create_list())) goto cleanup; + config->current_config_path = NULL; diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/load-configuration-from-etc.patch b/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/load-configuration-from-etc.patch new file mode 100644 index 0000000000..46a170abc0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/load-configuration-from-etc.patch @@ -0,0 +1,48 @@ +From 92283df3acbffa5c1bb21f23cdd686113d905114 Mon Sep 17 00:00:00 2001 +From: Patrick Hilhorst +Date: Wed, 31 Mar 2021 21:14:13 +0200 +Subject: [PATCH] Load configs from /etc but fallback to /nix/store + +This change will load all configuration files from /etc, to make it easy +to override them, but fallback to /nix/store/.../etc/sway/config to make +Sway work out-of-the-box with the default configuration on non NixOS +systems. + +Original patch by Michael Weiss, updated for Sway 1.6 by Patrick Hilhorst + +Co-authored-by: Michael Weiss +--- + meson.build | 3 ++- + sway/config.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index b7a29660..8ae8ceb3 100644 +--- a/meson.build ++++ b/meson.build +@@ -164,7 +164,8 @@ if scdoc.found() + endforeach + endif + +-add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c') ++add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') ++add_project_arguments('-DNIX_SYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c') + + version = '"@0@"'.format(meson.project_version()) + git = find_program('git', native: true, required: false) +diff --git a/sway/config.c b/sway/config.c +index 76b9ec08..fb5b51aa 100644 +--- a/sway/config.c ++++ b/sway/config.c +@@ -374,7 +374,8 @@ static char *get_config_path(void) { + { .prefix = home, .config_folder = ".i3"}, + { .prefix = config_home, .config_folder = "i3"}, + { .prefix = SYSCONFDIR, .config_folder = "sway"}, +- { .prefix = SYSCONFDIR, .config_folder = "i3"} ++ { .prefix = SYSCONFDIR, .config_folder = "i3"}, ++ { .prefix = NIX_SYSCONFDIR, .config_folder = "sway"}, + }; + + size_t num_config_paths = sizeof(config_paths)/sizeof(config_paths[0]); +-- +2.30.1 diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/package.nix index dfbb2e540c..b90220a7c1 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/package.nix @@ -1,10 +1,33 @@ { lib, fetchFromGitHub, - sway-unwrapped, stdenv, systemd, - wlroots_0_16, + meson, + substituteAll, + swaybg, + ninja, + pkg-config, + gdk-pixbuf, + librsvg, + wayland-protocols, + libdrm, + libinput, + cairo, + pango, + wayland, + libGL, + libxkbcommon, + pcre2, + json_c, + libevdev, + scdoc, + scenefx, + wayland-scanner, + xcbutilwm, + wlroots, + testers, + nixosTests, # Used by the NixOS module: isNixOS ? false, enableXWayland ? true, @@ -12,32 +35,112 @@ trayEnabled ? systemdSupport, }: -(sway-unwrapped.override { +stdenv.mkDerivation (finalAttrs: { inherit - isNixOS enableXWayland + isNixOS systemdSupport trayEnabled ; - wlroots = wlroots_0_16; -}).overrideAttrs (oldAttrs: rec { pname = "swayfx-unwrapped"; - version = "0.3.2"; + version = "0.4"; src = fetchFromGitHub { owner = "WillPower3309"; repo = "swayfx"; - rev = version; - sha256 = "sha256-Gwewb0yDVhEBrefSSGDf1hLtpWcntzifPCPJQhqLqI0="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-VT+JjQPqCIdtaLeSnRiZ3rES0KgDJR7j5Byxr+d6oRg="; }; - meta = with lib; { + patches = + [ + ./load-configuration-from-etc.patch + + (substituteAll { + src = ./fix-paths.patch; + inherit swaybg; + }) + ] + ++ lib.optionals (!finalAttrs.isNixOS) [ + # References to /nix/store/... will get GC'ed which causes problems when + # copying the default configuration: + ./sway-config-no-nix-store-references.patch + ] + ++ lib.optionals finalAttrs.isNixOS [ + # Use /run/current-system/sw/share and /etc instead of /nix/store + # references: + ./sway-config-nixos-paths.patch + ]; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + + buildInputs = [ + cairo + gdk-pixbuf + json_c + libdrm + libevdev + libGL + libinput + librsvg + libxkbcommon + pango + pcre2 + scenefx + wayland + wayland-protocols + (wlroots.override { inherit (finalAttrs) enableXWayland; }) + ] ++ lib.optionals finalAttrs.enableXWayland [ xcbutilwm ]; + + mesonFlags = + let + inherit (lib.strings) mesonEnable mesonOption; + + # The "sd-bus-provider" meson option does not include a "none" option, + # but it is silently ignored iff "-Dtray=disabled". We use "basu" + # (which is not in nixpkgs) instead of "none" to alert us if this + # changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761 + # assert trayEnabled -> systemdSupport && dbusSupport; + + sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; + in + [ + (mesonOption "sd-bus-provider" sd-bus-provider) + (mesonEnable "xwayland" finalAttrs.enableXWayland) + (mesonEnable "tray" finalAttrs.trayEnabled) + ]; + + passthru = { + tests = { + basic = nixosTests.swayfx; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "sway --version"; + version = "swayfx version ${finalAttrs.version}"; + }; + }; + }; + + meta = { description = "Sway, but with eye candy!"; homepage = "https://github.com/WillPower3309/swayfx"; - license = licenses.mit; - maintainers = with maintainers; [ eclairevoyant ricarch97 ]; - platforms = platforms.linux; + changelog = "https://github.com/WillPower3309/swayfx/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + eclairevoyant + ricarch97 + ]; + platforms = lib.platforms.linux; mainProgram = "sway"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/sway-config-nixos-paths.patch b/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/sway-config-nixos-paths.patch new file mode 100644 index 0000000000..bbb0f722b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/sway-config-nixos-paths.patch @@ -0,0 +1,21 @@ +diff --git a/config.in b/config.in +index 08703bef..f3872730 100644 +--- a/config.in ++++ b/config.in +@@ -22,8 +22,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec -- + + ### Output configuration + # +-# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/) +-output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill ++# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/) ++output * bg /run/current-system/sw/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill + # + # Example configuration: + # +@@ -214,4 +214,4 @@ bar { + } + } + +-include @sysconfdir@/sway/config.d/* ++include /etc/sway/config.d/* diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/sway-config-no-nix-store-references.patch b/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/sway-config-no-nix-store-references.patch new file mode 100644 index 0000000000..009c129594 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/sway-config-no-nix-store-references.patch @@ -0,0 +1,21 @@ +diff --git a/config.in b/config.in +--- a/config.in ++++ b/config.in +@@ -21,8 +21,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec + + ### Output configuration + # +-# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/) +-output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill ++# Default wallpaper ++#output * bg ~/.config/sway/backgrounds/Sway_Wallpaper_Blue_1920x1080.png fill + # + # Example configuration: + # +@@ -213,5 +213,3 @@ bar { + inactive_workspace #32323200 #32323200 #5c5c5c + } + } +- +-include @sysconfdir@/sway/config.d/* + diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swayimg/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/swayimg/package.nix index ac077868e6..ec69daf3f3 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/swayimg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/swayimg/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/artemsen/swayimg"; description = "Image viewer for Sway/Wayland"; - changelog = "https://github.com/artemsen/swayimg/releases/tag/v${version}"; + changelog = "https://github.com/artemsen/swayimg/releases/tag/v${finalAttrs.version}"; license = licenses.mit; maintainers = with maintainers; [ matthewcroughan ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swayosd/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/swayosd/package.nix index d3238053c0..c6e9dc2a80 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/swayosd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/swayosd/package.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , brightnessctl , cargo , coreutils @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 pkg-config meson rustc diff --git a/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/.gitignore b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/.gitignore new file mode 100644 index 0000000000..ea8c4bf7f3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/.gitignore @@ -0,0 +1 @@ +/target diff --git a/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock new file mode 100644 index 0000000000..d66a2c6e75 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock @@ -0,0 +1,527 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "dbus-codegen" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcd91775d91fc83c7d526aa7c08078bac0b30f382706689901ac819fe6ddc812" +dependencies = [ + "clap", + "dbus", + "xml-rs", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "dlv-list" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "libc" +version = "0.2.154" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "ordered-multimap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" +dependencies = [ + "dlv-list", + "hashbrown", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "proc-macro2" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "rust-ini" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" +dependencies = [ + "cfg-if", + "ordered-multimap", + "trim-in-place", +] + +[[package]] +name = "serde" +version = "1.0.200" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.200" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "switch-to-configuration" +version = "0.1.0" +dependencies = [ + "anyhow", + "dbus", + "dbus-codegen", + "glob", + "log", + "nix", + "regex", + "rust-ini", + "syslog", +] + +[[package]] +name = "syn" +version = "2.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syslog" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc7e95b5b795122fafe6519e27629b5ab4232c73ebb2428f568e82b1a457ad3" +dependencies = [ + "error-chain", + "hostname", + "libc", + "log", + "time", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "trim-in-place" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-width" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" diff --git a/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.toml b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.toml new file mode 100644 index 0000000000..51d805dcd9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "switch-to-configuration" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +anyhow = "1.0.82" +dbus = "0.9.7" +glob = "0.3.1" +log = "0.4.21" +nix = { version = "0.28.0", features = ["fs", "signal"] } +regex = "1.10.4" +rust-ini = "0.21.0" +syslog = "6.1.1" + +[build-dependencies] +dbus-codegen = "0.11.0" diff --git a/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/build.rs b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/build.rs new file mode 100644 index 0000000000..41fed3086e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/build.rs @@ -0,0 +1,30 @@ +use std::io::Write; + +fn code_for_dbus_xml(xml: impl AsRef) -> String { + dbus_codegen::generate( + &std::fs::read_to_string(xml).unwrap(), + &dbus_codegen::GenOpts { + methodtype: None, + connectiontype: dbus_codegen::ConnectionType::Blocking, + ..Default::default() + }, + ) + .unwrap() +} + +fn main() { + let systemd_dbus_interface_dir = std::env::var("SYSTEMD_DBUS_INTERFACE_DIR").unwrap(); + let systemd_dbus_interface_dir = std::path::Path::new(systemd_dbus_interface_dir.as_str()); + + let out_path = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap()); + + let systemd_manager_code = + code_for_dbus_xml(systemd_dbus_interface_dir.join("org.freedesktop.systemd1.Manager.xml")); + let mut file = std::fs::File::create(out_path.join("systemd_manager.rs")).unwrap(); + file.write_all(systemd_manager_code.as_bytes()).unwrap(); + + let logind_manager_code = + code_for_dbus_xml(systemd_dbus_interface_dir.join("org.freedesktop.login1.Manager.xml")); + let mut file = std::fs::File::create(out_path.join("logind_manager.rs")).unwrap(); + file.write_all(logind_manager_code.as_bytes()).unwrap(); +} diff --git a/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/package.nix new file mode 100644 index 0000000000..aa748a0c2b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/package.nix @@ -0,0 +1,36 @@ +{ + buildPackages, + dbus, + lib, + pkg-config, + rustPlatform, +}: + +rustPlatform.buildRustPackage { + pname = "switch-to-configuration"; + version = "0.1.0"; + + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./Cargo.lock + ./Cargo.toml + ./build.rs + ./src + ]; + }; + + cargoLock.lockFile = ./Cargo.lock; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dbus ]; + + env.SYSTEMD_DBUS_INTERFACE_DIR = "${buildPackages.systemd}/share/dbus-1/interfaces"; + + meta = { + description = "NixOS switch-to-configuration program"; + mainProgram = "switch-to-configuration"; + maintainers = with lib.maintainers; [ jmbaur ]; + license = lib.licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs new file mode 100644 index 0000000000..e050e74d79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs @@ -0,0 +1,2077 @@ +use std::{ + cell::RefCell, + collections::HashMap, + io::{BufRead, Write}, + os::unix::{fs::PermissionsExt, process::CommandExt}, + path::{Path, PathBuf}, + rc::Rc, + str::FromStr, + sync::OnceLock, + time::Duration, +}; + +use anyhow::{anyhow, bail, Context, Result}; +use dbus::{ + blocking::{stdintf::org_freedesktop_dbus::Properties, LocalConnection, Proxy}, + Message, +}; +use glob::glob; +use ini::Ini; +use log::LevelFilter; +use nix::{ + fcntl::{Flock, FlockArg, OFlag}, + sys::{ + signal::{self, SigHandler, Signal}, + stat::Mode, + }, +}; +use regex::Regex; +use syslog::Facility; + +mod systemd_manager { + #![allow(non_upper_case_globals)] + #![allow(non_camel_case_types)] + #![allow(non_snake_case)] + #![allow(unused)] + include!(concat!(env!("OUT_DIR"), "/systemd_manager.rs")); +} + +mod logind_manager { + #![allow(non_upper_case_globals)] + #![allow(non_camel_case_types)] + #![allow(non_snake_case)] + #![allow(unused)] + include!(concat!(env!("OUT_DIR"), "/logind_manager.rs")); +} + +use crate::systemd_manager::OrgFreedesktopSystemd1Manager; +use crate::{ + logind_manager::OrgFreedesktopLogin1Manager, + systemd_manager::{ + OrgFreedesktopSystemd1ManagerJobRemoved, OrgFreedesktopSystemd1ManagerReloading, + }, +}; + +type UnitInfo = HashMap>>; + +const SYSINIT_REACTIVATION_TARGET: &str = "sysinit-reactivation.target"; + +// To be robust against interruption, record what units need to be started etc. We read these files +// again every time this program starts to make sure we continue where the old (interrupted) script +// left off. +const START_LIST_FILE: &str = "/run/nixos/start-list"; +const RESTART_LIST_FILE: &str = "/run/nixos/restart-list"; +const RELOAD_LIST_FILE: &str = "/run/nixos/reload-list"; + +// Parse restart/reload requests by the activation script. Activation scripts may write +// newline-separated units to the restart file and switch-to-configuration will handle them. While +// `stopIfChanged = true` is ignored, switch-to-configuration will handle `restartIfChanged = +// false` and `reloadIfChanged = true`. This is the same as specifying a restart trigger in the +// NixOS module. +// +// The reload file asks this program to reload a unit. This is the same as specifying a reload +// trigger in the NixOS module and can be ignored if the unit is restarted in this activation. +const RESTART_BY_ACTIVATION_LIST_FILE: &str = "/run/nixos/activation-restart-list"; +const RELOAD_BY_ACTIVATION_LIST_FILE: &str = "/run/nixos/activation-reload-list"; +const DRY_RESTART_BY_ACTIVATION_LIST_FILE: &str = "/run/nixos/dry-activation-restart-list"; +const DRY_RELOAD_BY_ACTIVATION_LIST_FILE: &str = "/run/nixos/dry-activation-reload-list"; + +#[derive(Debug, Clone, PartialEq)] +enum Action { + Switch, + Boot, + Test, + DryActivate, +} + +impl std::str::FromStr for Action { + type Err = anyhow::Error; + + fn from_str(s: &str) -> std::result::Result { + Ok(match s { + "switch" => Self::Switch, + "boot" => Self::Boot, + "test" => Self::Test, + "dry-activate" => Self::DryActivate, + _ => bail!("invalid action {s}"), + }) + } +} + +impl Into<&'static str> for &Action { + fn into(self) -> &'static str { + match self { + Action::Switch => "switch", + Action::Boot => "boot", + Action::Test => "test", + Action::DryActivate => "dry-activate", + } + } +} + +// Allow for this switch-to-configuration to remain consistent with the perl implementation. +// Perl's "die" uses errno to set the exit code: https://perldoc.perl.org/perlvar#%24%21 +fn die() -> ! { + std::process::exit(std::io::Error::last_os_error().raw_os_error().unwrap_or(1)); +} + +fn parse_os_release() -> Result> { + Ok(std::fs::read_to_string("/etc/os-release") + .context("Failed to read /etc/os-release")? + .lines() + .into_iter() + .fold(HashMap::new(), |mut acc, line| { + if let Some((k, v)) = line.split_once('=') { + acc.insert(k.to_string(), v.to_string()); + } + + acc + })) +} + +fn do_install_bootloader(command: &str, toplevel: &Path) -> Result<()> { + let mut cmd_split = command.split_whitespace(); + let Some(argv0) = cmd_split.next() else { + bail!("missing first argument in install bootloader commands"); + }; + + match std::process::Command::new(argv0) + .args(cmd_split.collect::>()) + .arg(toplevel) + .spawn() + .map(|mut child| child.wait()) + { + Ok(Ok(status)) if status.success() => {} + _ => { + eprintln!("Failed to install bootloader"); + die(); + } + } + + Ok(()) +} + +extern "C" fn handle_sigpipe(_signal: nix::libc::c_int) {} + +fn required_env(var: &str) -> anyhow::Result { + std::env::var(var).with_context(|| format!("missing required environment variable ${var}")) +} + +#[derive(Debug)] +struct UnitState { + state: String, + substate: String, +} + +// Asks the currently running systemd instance via dbus which units are active. Returns a hash +// where the key is the name of each unit and the value a hash of load, state, substate. +fn get_active_units<'a>( + systemd_manager: &Proxy<'a, &LocalConnection>, +) -> Result> { + let units = systemd_manager + .list_units_by_patterns(Vec::new(), Vec::new()) + .context("Failed to list systemd units")?; + + Ok(units + .into_iter() + .filter_map( + |( + id, + _description, + _load_state, + active_state, + sub_state, + following, + _unit_path, + _job_id, + _job_type, + _job_path, + )| { + if following == "" && active_state != "inactive" { + Some((id, active_state, sub_state)) + } else { + None + } + }, + ) + .fold(HashMap::new(), |mut acc, (id, active_state, sub_state)| { + acc.insert( + id, + UnitState { + state: active_state, + substate: sub_state, + }, + ); + + acc + })) +} + +// This function takes a single ini file that specified systemd configuration like unit +// configuration and parses it into a HashMap where the keys are the sections of the unit file and +// the values are HashMaps themselves. These HashMaps have the unit file keys as their keys (left +// side of =) and an array of all values that were set as their values. If a value is empty (for +// example `ExecStart=`), then all current definitions are removed. +// +// Instead of returning the HashMap, this function takes a mutable reference to a HashMap to return +// the data in. This allows calling the function multiple times with the same Hashmap to parse +// override files. +fn parse_systemd_ini(data: &mut UnitInfo, unit_file: &Path) -> Result<()> { + let ini = Ini::load_from_file(unit_file) + .with_context(|| format!("Failed to load unit file {}", unit_file.display()))?; + + // Copy over all sections + for (section, properties) in ini.iter() { + let Some(section) = section else { + continue; + }; + + if section == "Install" { + // Skip the [Install] section because it has no relevant keys for us + continue; + } + + let section_map = if let Some(section_map) = data.get_mut(section) { + section_map + } else { + data.insert(section.to_string(), HashMap::new()); + data.get_mut(section) + .ok_or(anyhow!("section name should exist in hashmap"))? + }; + + for (ini_key, _) in properties { + let values = properties.get_all(ini_key); + let values = values + .into_iter() + .map(String::from) + .collect::>(); + + // Go over all values + let mut new_vals = Vec::new(); + let mut clear_existing = false; + + for val in values { + // If a value is empty, it's an override that tells us to clean the value + if val.is_empty() { + new_vals.clear(); + clear_existing = true; + } else { + new_vals.push(val); + } + } + + match (section_map.get_mut(ini_key), clear_existing) { + (Some(existing_vals), false) => existing_vals.extend(new_vals), + _ => _ = section_map.insert(ini_key.to_string(), new_vals), + }; + } + } + + Ok(()) +} + +// This function takes the path to a systemd configuration file (like a unit configuration) and +// parses it into a UnitInfo structure. +// +// If a directory with the same basename ending in .d exists next to the unit file, it will be +// assumed to contain override files which will be parsed as well and handled properly. +fn parse_unit(unit_file: &Path, base_unit_file: &Path) -> Result { + // Parse the main unit and all overrides + let mut unit_data = HashMap::new(); + + parse_systemd_ini(&mut unit_data, base_unit_file)?; + + for entry in + glob(&format!("{}.d/*.conf", base_unit_file.display())).context("Invalid glob pattern")? + { + let Ok(entry) = entry else { + continue; + }; + + parse_systemd_ini(&mut unit_data, &entry)?; + } + + // Handle drop-in template-unit instance overrides + if unit_file != base_unit_file { + for entry in + glob(&format!("{}.d/*.conf", unit_file.display())).context("Invalid glob pattern")? + { + let Ok(entry) = entry else { + continue; + }; + + parse_systemd_ini(&mut unit_data, &entry)?; + } + } + + Ok(unit_data) +} + +// Checks whether a specified boolean in a systemd unit is true or false, with a default that is +// applied when the value is not set. +fn parse_systemd_bool( + unit_data: Option<&UnitInfo>, + section_name: &str, + bool_name: &str, + default: bool, +) -> bool { + if let Some(Some(Some(Some(b)))) = unit_data.map(|data| { + data.get(section_name).map(|section| { + section.get(bool_name).map(|vals| { + vals.last() + .map(|last| matches!(last.as_str(), "1" | "yes" | "true" | "on")) + }) + }) + }) { + b + } else { + default + } +} + +#[derive(Debug, PartialEq)] +enum UnitComparison { + Equal, + UnequalNeedsRestart, + UnequalNeedsReload, +} + +// Compare the contents of two unit files and return whether the unit needs to be restarted or +// reloaded. If the units differ, the service is restarted unless the only difference is +// `X-Reload-Triggers` in the `Unit` section. If this is the only modification, the unit is +// reloaded instead of restarted. If the only difference is `Options` in the `[Mount]` section, the +// unit is reloaded rather than restarted. +fn compare_units(current_unit: &UnitInfo, new_unit: &UnitInfo) -> UnitComparison { + let mut ret = UnitComparison::Equal; + + let unit_section_ignores = HashMap::from( + [ + "X-Reload-Triggers", + "Description", + "Documentation", + "OnFailure", + "OnSuccess", + "OnFailureJobMode", + "IgnoreOnIsolate", + "StopWhenUnneeded", + "RefuseManualStart", + "RefuseManualStop", + "AllowIsolate", + "CollectMode", + "SourcePath", + ] + .map(|name| (name, ())), + ); + + let mut section_cmp = new_unit.keys().fold(HashMap::new(), |mut acc, key| { + acc.insert(key.as_str(), ()); + acc + }); + + // Iterate over the sections + for (section_name, section_val) in current_unit { + // Missing section in the new unit? + if !section_cmp.contains_key(section_name.as_str()) { + // If the [Unit] section was removed, make sure that only keys were in it that are + // ignored + if section_name == "Unit" { + for (ini_key, _ini_val) in section_val { + if !unit_section_ignores.contains_key(ini_key.as_str()) { + return UnitComparison::UnequalNeedsRestart; + } + } + continue; // check the next section + } else { + return UnitComparison::UnequalNeedsRestart; + } + } + + section_cmp.remove(section_name.as_str()); + + // Comparison hash for the section contents + let mut ini_cmp = new_unit + .get(section_name) + .map(|section_val| { + section_val.keys().fold(HashMap::new(), |mut acc, ini_key| { + acc.insert(ini_key.as_str(), ()); + acc + }) + }) + .unwrap_or_default(); + + // Iterate over the keys of the section + for (ini_key, current_value) in section_val { + ini_cmp.remove(ini_key.as_str()); + let Some(Some(new_value)) = new_unit + .get(section_name) + .map(|section| section.get(ini_key)) + else { + // If the key is missing in the new unit, they are different unless the key that is + // now missing is one of the ignored keys + if section_name == "Unit" && unit_section_ignores.contains_key(ini_key.as_str()) { + continue; + } + return UnitComparison::UnequalNeedsRestart; + }; + + // If the contents are different, the units are different + if current_value != new_value { + if section_name == "Unit" { + if ini_key == "X-Reload-Triggers" { + ret = UnitComparison::UnequalNeedsReload; + continue; + } else if unit_section_ignores.contains_key(ini_key.as_str()) { + continue; + } + } + + // If this is a mount unit, check if it was only `Options` + if section_name == "Mount" && ini_key == "Options" { + ret = UnitComparison::UnequalNeedsReload; + continue; + } + + return UnitComparison::UnequalNeedsRestart; + } + } + + // A key was introduced that was missing in the previous unit + if !ini_cmp.is_empty() { + if section_name == "Unit" { + for (ini_key, _) in ini_cmp { + if ini_key == "X-Reload-Triggers" { + ret = UnitComparison::UnequalNeedsReload; + } else if unit_section_ignores.contains_key(ini_key) { + continue; + } else { + return UnitComparison::UnequalNeedsRestart; + } + } + } else { + return UnitComparison::UnequalNeedsRestart; + } + } + } + + // A section was introduced that was missing in the previous unit + if !section_cmp.is_empty() { + if section_cmp.keys().len() == 1 && section_cmp.contains_key("Unit") { + if let Some(new_unit_unit) = new_unit.get("Unit") { + for (ini_key, _) in new_unit_unit { + if !unit_section_ignores.contains_key(ini_key.as_str()) { + return UnitComparison::UnequalNeedsRestart; + } else if ini_key == "X-Reload-Triggers" { + ret = UnitComparison::UnequalNeedsReload; + } + } + } + } else { + return UnitComparison::UnequalNeedsRestart; + } + } + + ret +} + +// Called when a unit exists in both the old systemd and the new system and the units differ. This +// figures out of what units are to be stopped, restarted, reloaded, started, and skipped. +fn handle_modified_unit( + toplevel: &Path, + unit: &str, + base_name: &str, + new_unit_file: &Path, + new_base_unit_file: &Path, + new_unit_info: Option<&UnitInfo>, + active_cur: &HashMap, + units_to_stop: &mut HashMap, + units_to_start: &mut HashMap, + units_to_reload: &mut HashMap, + units_to_restart: &mut HashMap, + units_to_skip: &mut HashMap, +) -> Result<()> { + let use_restart_as_stop_and_start = new_unit_info.is_none(); + + if matches!( + unit, + "sysinit.target" | "basic.target" | "multi-user.target" | "graphical.target" + ) || unit.ends_with(".unit") + || unit.ends_with(".slice") + { + // Do nothing. These cannot be restarted directly. + + // Slices and Paths don't have to be restarted since properties (resource limits and + // inotify watches) seem to get applied on daemon-reload. + } else if unit.ends_with(".mount") { + // Just restart the unit. We wouldn't have gotten into this subroutine if only `Options` + // was changed, in which case the unit would be reloaded. The only exception is / and /nix + // because it's very unlikely we can safely unmount them so we reload them instead. This + // means that we may not get all changes into the running system but it's better than + // crashing it. + if unit == "-.mount" || unit == "nix.mount" { + units_to_reload.insert(unit.to_string(), ()); + record_unit(RELOAD_LIST_FILE, unit); + } else { + units_to_restart.insert(unit.to_string(), ()); + record_unit(RESTART_LIST_FILE, unit); + } + } else if unit.ends_with(".socket") { + // FIXME: do something? + // Attempt to fix this: https://github.com/NixOS/nixpkgs/pull/141192 + // Revert of the attempt: https://github.com/NixOS/nixpkgs/pull/147609 + // More details: https://github.com/NixOS/nixpkgs/issues/74899#issuecomment-981142430 + } else { + let fallback = parse_unit(new_unit_file, new_base_unit_file)?; + let new_unit_info = if new_unit_info.is_some() { + new_unit_info + } else { + Some(&fallback) + }; + + if parse_systemd_bool(new_unit_info, "Service", "X-ReloadIfChanged", false) + && !units_to_restart.contains_key(unit) + && !(if use_restart_as_stop_and_start { + units_to_restart.contains_key(unit) + } else { + units_to_stop.contains_key(unit) + }) + { + units_to_reload.insert(unit.to_string(), ()); + record_unit(RELOAD_LIST_FILE, unit); + } else if !parse_systemd_bool(new_unit_info, "Service", "X-RestartIfChanged", true) + || parse_systemd_bool(new_unit_info, "Unit", "RefuseManualStop", false) + || parse_systemd_bool(new_unit_info, "Unit", "X-OnlyManualStart", false) + { + units_to_skip.insert(unit.to_string(), ()); + } else { + // It doesn't make sense to stop and start non-services because they can't have + // ExecStop= + if !parse_systemd_bool(new_unit_info, "Service", "X-StopIfChanged", true) + || !unit.ends_with(".service") + { + // This unit should be restarted instead of stopped and started. + units_to_restart.insert(unit.to_string(), ()); + record_unit(RESTART_LIST_FILE, unit); + // Remove from units to reload so we don't restart and reload + if units_to_reload.contains_key(unit) { + units_to_reload.remove(unit); + unrecord_unit(RELOAD_LIST_FILE, unit); + } + } else { + // If this unit is socket-activated, then stop the socket unit(s) as well, and + // restart the socket(s) instead of the service. + let mut socket_activated = false; + if unit.ends_with(".service") { + let mut sockets = if let Some(Some(Some(sockets))) = new_unit_info.map(|info| { + info.get("Service") + .map(|service_section| service_section.get("Sockets")) + }) { + sockets + .join(" ") + .split_whitespace() + .into_iter() + .map(String::from) + .collect() + } else { + Vec::new() + }; + + if sockets.is_empty() { + sockets.push(format!("{}.socket", base_name)); + } + + for socket in &sockets { + if active_cur.contains_key(socket) { + // We can now be sure this is a socket-activated unit + + if use_restart_as_stop_and_start { + units_to_restart.insert(socket.to_string(), ()); + } else { + units_to_stop.insert(socket.to_string(), ()); + } + + // Only restart sockets that actually exist in new configuration: + if toplevel.join("etc/systemd/system").join(socket).exists() { + if use_restart_as_stop_and_start { + units_to_restart.insert(socket.to_string(), ()); + record_unit(RESTART_LIST_FILE, socket); + } else { + units_to_start.insert(socket.to_string(), ()); + record_unit(START_LIST_FILE, socket); + } + + socket_activated = true; + } + + // Remove from units to reload so we don't restart and reload + if units_to_reload.contains_key(unit) { + units_to_reload.remove(unit); + unrecord_unit(RELOAD_LIST_FILE, unit); + } + } + } + } + + // If the unit is not socket-activated, record that this unit needs to be started + // below. We write this to a file to ensure that the service gets restarted if + // we're interrupted. + if !socket_activated { + if use_restart_as_stop_and_start { + units_to_restart.insert(unit.to_string(), ()); + record_unit(RESTART_LIST_FILE, unit); + } else { + units_to_start.insert(unit.to_string(), ()); + record_unit(START_LIST_FILE, unit); + } + } + + if use_restart_as_stop_and_start { + units_to_restart.insert(unit.to_string(), ()); + } else { + units_to_stop.insert(unit.to_string(), ()); + } + // Remove from units to reload so we don't restart and reload + if units_to_reload.contains_key(unit) { + units_to_reload.remove(unit); + unrecord_unit(RELOAD_LIST_FILE, unit); + } + } + } + } + + Ok(()) +} + +// Writes a unit name into a given file to be more resilient against crashes of the script. Does +// nothing when the action is dry-activate. +fn record_unit(p: impl AsRef, unit: &str) { + if ACTION.get() != Some(&Action::DryActivate) { + if let Ok(mut f) = std::fs::File::options().append(true).create(true).open(p) { + _ = writeln!(&mut f, "{unit}"); + } + } +} + +// The opposite of record_unit, removes a unit name from a file +fn unrecord_unit(p: impl AsRef, unit: &str) { + if ACTION.get() != Some(&Action::DryActivate) { + if let Ok(contents) = std::fs::read_to_string(&p) { + if let Ok(mut f) = std::fs::File::options() + .write(true) + .truncate(true) + .create(true) + .open(&p) + { + contents + .lines() + .into_iter() + .filter(|line| line != &unit) + .for_each(|line| _ = writeln!(&mut f, "{line}")) + } + } + } +} + +fn map_from_list_file(p: impl AsRef) -> HashMap { + std::fs::read_to_string(p) + .unwrap_or_default() + .lines() + .filter(|line| !line.is_empty()) + .into_iter() + .fold(HashMap::new(), |mut acc, line| { + acc.insert(line.to_string(), ()); + acc + }) +} + +#[derive(Debug)] +struct Filesystem { + device: String, + fs_type: String, + options: String, +} + +#[derive(Debug)] +#[allow(unused)] +struct Swap(String); + +// Parse a fstab file, given its path. Returns a tuple of filesystems and swaps. +// +// Filesystems is a hash of mountpoint and { device, fsType, options } Swaps is a hash of device +// and { options } +fn parse_fstab(fstab: impl BufRead) -> (HashMap, HashMap) { + let mut filesystems = HashMap::new(); + let mut swaps = HashMap::new(); + + for line in fstab.lines() { + let Ok(line) = line else { + break; + }; + + if line.contains('#') { + continue; + } + + let mut split = line.split_whitespace(); + let (Some(device), Some(mountpoint), Some(fs_type), options) = ( + split.next(), + split.next(), + split.next(), + split.next().unwrap_or_default(), + ) else { + continue; + }; + + if fs_type == "swap" { + swaps.insert(device.to_string(), Swap(options.to_string())); + } else { + filesystems.insert( + mountpoint.to_string(), + Filesystem { + device: device.to_string(), + fs_type: fs_type.to_string(), + options: options.to_string(), + }, + ); + } + } + + (filesystems, swaps) +} + +// Converts a path to the name of a systemd mount unit that would be responsible for mounting this +// path. +fn path_to_unit_name(bin_path: &Path, path: &str) -> String { + let Ok(output) = std::process::Command::new(bin_path.join("systemd-escape")) + .arg("--suffix=mount") + .arg("-p") + .arg(path) + .output() + else { + eprintln!("Unable to escape {}!", path); + die(); + }; + + let Ok(unit) = String::from_utf8(output.stdout) else { + eprintln!("Unable to convert systemd-espape output to valid UTF-8"); + die(); + }; + + unit.trim().to_string() +} + +// Returns a HashMap containing the same contents as the passed in `units`, minus the units in +// `units_to_filter`. +fn filter_units( + units_to_filter: &HashMap, + units: &HashMap, +) -> HashMap { + let mut res = HashMap::new(); + + for (unit, _) in units { + if !units_to_filter.contains_key(unit) { + res.insert(unit.to_string(), ()); + } + } + + res +} + +fn unit_is_active<'a>(conn: &LocalConnection, unit: &str) -> Result { + let unit_object_path = conn + .with_proxy( + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + Duration::from_millis(5000), + ) + .get_unit(unit) + .with_context(|| format!("Failed to get unit {unit}"))?; + + let active_state: String = conn + .with_proxy( + "org.freedesktop.systemd1", + unit_object_path, + Duration::from_millis(5000), + ) + .get("org.freedesktop.systemd1.Unit", "ActiveState") + .with_context(|| format!("Failed to get ExecMainStatus for {unit}"))?; + + Ok(matches!(active_state.as_str(), "active" | "activating")) +} + +static ACTION: OnceLock = OnceLock::new(); + +#[derive(Debug)] +enum Job { + Start, + Restart, + Reload, + Stop, +} + +impl std::fmt::Display for Job { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!( + f, + "{}", + match self { + Job::Start => "start", + Job::Restart => "restart", + Job::Reload => "reload", + Job::Stop => "stop", + } + ) + } +} + +fn new_dbus_proxies<'a>( + conn: &'a LocalConnection, +) -> ( + Proxy<'a, &'a LocalConnection>, + Proxy<'a, &'a LocalConnection>, +) { + ( + conn.with_proxy( + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + Duration::from_millis(5000), + ), + conn.with_proxy( + "org.freedesktop.login1", + "/org/freedesktop/login1", + Duration::from_millis(5000), + ), + ) +} + +fn block_on_jobs( + conn: &LocalConnection, + submitted_jobs: &Rc, Job>>>, +) { + while !submitted_jobs.borrow().is_empty() { + _ = conn.process(Duration::from_millis(500)); + } +} + +fn remove_file_if_exists(p: impl AsRef) -> std::io::Result<()> { + match std::fs::remove_file(p) { + Err(err) if err.kind() != std::io::ErrorKind::NotFound => Err(err), + _ => Ok(()), + } +} + +/// Performs switch-to-configuration functionality for a single non-root user +fn do_user_switch(parent_exe: String) -> anyhow::Result<()> { + if Path::new(&parent_exe) + != Path::new("/proc/self/exe") + .canonicalize() + .context("Failed to get full path to current executable")? + .as_path() + { + eprintln!( + r#"This program is not meant to be called from outside of switch-to-configuration."# + ); + die(); + } + + let dbus_conn = LocalConnection::new_session().context("Failed to open dbus connection")?; + let (systemd, _) = new_dbus_proxies(&dbus_conn); + + let nixos_activation_done = Rc::new(RefCell::new(false)); + let _nixos_activation_done = nixos_activation_done.clone(); + let jobs_token = systemd + .match_signal( + move |signal: OrgFreedesktopSystemd1ManagerJobRemoved, + _: &LocalConnection, + _: &Message| { + if signal.unit.as_str() == "nixos-activation.service" { + *_nixos_activation_done.borrow_mut() = true; + } + + true + }, + ) + .context("Failed to add signal match for systemd removed jobs")?; + + // The systemd user session seems to not send a Reloaded signal, so we don't have anything to + // wait on here. + _ = systemd.reexecute(); + + systemd + .restart_unit("nixos-activation.service", "replace") + .context("Failed to restart nixos-activation.service")?; + + while !*nixos_activation_done.borrow() { + _ = dbus_conn + .process(Duration::from_secs(500)) + .context("Failed to process dbus messages")?; + } + + dbus_conn + .remove_match(jobs_token) + .context("Failed to remove jobs token")?; + + Ok(()) +} + +/// Performs switch-to-configuration functionality for the entire system +fn do_system_switch() -> anyhow::Result<()> { + let out = PathBuf::from(required_env("OUT")?); + let toplevel = PathBuf::from(required_env("TOPLEVEL")?); + let distro_id = required_env("DISTRO_ID")?; + let install_bootloader = required_env("INSTALL_BOOTLOADER")?; + let locale_archive = required_env("LOCALE_ARCHIVE")?; + let new_systemd = PathBuf::from(required_env("SYSTEMD")?); + + let mut args = std::env::args(); + let argv0 = args.next().ok_or(anyhow!("no argv[0]"))?; + + let Some(Ok(action)) = args.next().map(|a| Action::from_str(&a)) else { + eprintln!( + r#"Usage: {} [switch|boot|test|dry-activate] +switch: make the configuration the boot default and activate now +boot: make the configuration the boot default +test: activate the configuration, but don't make it the boot default +dry-activate: show what would be done if this configuration were activated +"#, + argv0 + .split(std::path::MAIN_SEPARATOR_STR) + .last() + .unwrap_or("switch-to-configuration") + ); + std::process::exit(1); + }; + + let action = ACTION.get_or_init(|| action); + + // The action that is to be performed (like switch, boot, test, dry-activate) Also exposed via + // environment variable from now on + std::env::set_var("NIXOS_ACTION", Into::<&'static str>::into(action)); + + // Expose the locale archive as an environment variable for systemctl and the activation script + if !locale_archive.is_empty() { + std::env::set_var("LOCALE_ARCHIVE", locale_archive); + } + + let current_system_bin = std::path::PathBuf::from("/run/current-system/sw/bin") + .canonicalize() + .context("/run/current-system/sw/bin is missing")?; + + let os_release = parse_os_release().context("Failed to parse os-release")?; + + let distro_id_re = Regex::new(format!("^\"?{}\"?$", distro_id).as_str()) + .context("Invalid regex for distro ID")?; + + // This is a NixOS installation if it has /etc/NIXOS or a proper /etc/os-release. + if !Path::new("/etc/NIXOS").is_file() + && !os_release + .get("ID") + .map(|id| distro_id_re.is_match(id)) + .unwrap_or_default() + { + eprintln!("This is not a NixOS installation!"); + die(); + } + + std::fs::create_dir_all("/run/nixos").context("Failed to create /run/nixos directory")?; + let perms = std::fs::Permissions::from_mode(0o755); + std::fs::set_permissions("/run/nixos", perms) + .context("Failed to set permissions on /run/nixos directory")?; + + let Ok(lock) = std::fs::OpenOptions::new() + .append(true) + .create(true) + .open("/run/nixos/switch-to-configuration.lock") + else { + eprintln!("Could not open lock"); + die(); + }; + + let Ok(_lock) = Flock::lock(lock, FlockArg::LockExclusive) else { + eprintln!("Could not acquire lock"); + die(); + }; + + if syslog::init(Facility::LOG_USER, LevelFilter::Debug, Some("nixos")).is_err() { + bail!("Failed to initialize logger"); + } + + // Install or update the bootloader. + if matches!(action, Action::Switch | Action::Boot) { + do_install_bootloader(&install_bootloader, &toplevel)?; + } + + // Just in case the new configuration hangs the system, do a sync now. + if std::env::var("NIXOS_NO_SYNC") + .as_deref() + .unwrap_or_default() + != "1" + { + let fd = nix::fcntl::open("/nix/store", OFlag::O_NOCTTY, Mode::S_IROTH) + .context("Failed to open /nix/store")?; + nix::unistd::syncfs(fd).context("Failed to sync /nix/store")?; + } + + if *action == Action::Boot { + std::process::exit(0); + } + + let current_init_interface_version = + std::fs::read_to_string("/run/current-system/init-interface-version").unwrap_or_default(); + + let new_init_interface_version = + std::fs::read_to_string(toplevel.join("init-interface-version")) + .context("File init-interface-version should exist")?; + + // Check if we can activate the new configuration. + if current_init_interface_version != new_init_interface_version { + eprintln!( + r#"Warning: the new NixOS configuration has an ‘init’ that is +incompatible with the current configuration. The new configuration +won't take effect until you reboot the system. +"# + ); + std::process::exit(100); + } + + // Ignore SIGHUP so that we're not killed if we're running on (say) virtual console 1 and we + // restart the "tty1" unit. + let handler = SigHandler::Handler(handle_sigpipe); + unsafe { signal::signal(Signal::SIGPIPE, handler) }.context("Failed to set SIGPIPE handler")?; + + let mut units_to_stop = HashMap::new(); + let mut units_to_skip = HashMap::new(); + let mut units_to_filter = HashMap::new(); // units not shown + + let mut units_to_start = map_from_list_file(START_LIST_FILE); + let mut units_to_restart = map_from_list_file(RESTART_LIST_FILE); + let mut units_to_reload = map_from_list_file(RELOAD_LIST_FILE); + + let dbus_conn = LocalConnection::new_system().context("Failed to open dbus connection")?; + let (systemd, logind) = new_dbus_proxies(&dbus_conn); + + let submitted_jobs = Rc::new(RefCell::new(HashMap::new())); + let finished_jobs = Rc::new(RefCell::new(HashMap::new())); + + let systemd_reload_status = Rc::new(RefCell::new(false)); + + systemd + .subscribe() + .context("Failed to subscribe to systemd dbus messages")?; + + // Wait for the system to have finished booting. + loop { + let system_state: String = systemd + .get("org.freedesktop.systemd1.Manager", "SystemState") + .context("Failed to get system state")?; + + match system_state.as_str() { + "running" | "degraded" | "maintenance" => break, + _ => { + _ = dbus_conn + .process(Duration::from_millis(500)) + .context("Failed to process dbus messages")? + } + } + } + + let _systemd_reload_status = systemd_reload_status.clone(); + let reloading_token = systemd + .match_signal( + move |signal: OrgFreedesktopSystemd1ManagerReloading, + _: &LocalConnection, + _msg: &Message| { + *_systemd_reload_status.borrow_mut() = signal.active; + + true + }, + ) + .context("Failed to add systemd Reloading match")?; + + let _submitted_jobs = submitted_jobs.clone(); + let _finished_jobs = finished_jobs.clone(); + let job_removed_token = systemd + .match_signal( + move |signal: OrgFreedesktopSystemd1ManagerJobRemoved, + _: &LocalConnection, + _msg: &Message| { + if let Some(old) = _submitted_jobs.borrow_mut().remove(&signal.job) { + let mut finished_jobs = _finished_jobs.borrow_mut(); + finished_jobs.insert(signal.job, (signal.unit, old, signal.result)); + } + + true + }, + ) + .context("Failed to add systemd JobRemoved match")?; + + let current_active_units = get_active_units(&systemd)?; + + let template_unit_re = Regex::new(r"^(.*)@[^\.]*\.(.*)$") + .context("Invalid regex for matching systemd template units")?; + let unit_name_re = Regex::new(r"^(.*)\.[[:lower:]]*$") + .context("Invalid regex for matching systemd unit names")?; + + for (unit, unit_state) in ¤t_active_units { + let current_unit_file = Path::new("/etc/systemd/system").join(&unit); + let new_unit_file = toplevel.join("etc/systemd/system").join(&unit); + + let mut base_unit = unit.clone(); + let mut current_base_unit_file = current_unit_file.clone(); + let mut new_base_unit_file = new_unit_file.clone(); + + // Detect template instances + if let Some((Some(template_name), Some(template_instance))) = + template_unit_re.captures(&unit).map(|captures| { + ( + captures.get(1).map(|c| c.as_str()), + captures.get(2).map(|c| c.as_str()), + ) + }) + { + if !current_unit_file.exists() && !new_unit_file.exists() { + base_unit = format!("{}@.{}", template_name, template_instance); + current_base_unit_file = Path::new("/etc/systemd/system").join(&base_unit); + new_base_unit_file = toplevel.join("etc/systemd/system").join(&base_unit); + } + } + + let mut base_name = base_unit.as_str(); + if let Some(Some(new_base_name)) = unit_name_re + .captures(&base_unit) + .map(|capture| capture.get(1).map(|first| first.as_str())) + { + base_name = new_base_name; + } + + if current_base_unit_file.exists() + && (unit_state.state == "active" || unit_state.state == "activating") + { + if new_base_unit_file + .canonicalize() + .map(|full_path| full_path == Path::new("/dev/null")) + .unwrap_or(true) + { + let current_unit_info = parse_unit(¤t_unit_file, ¤t_base_unit_file)?; + if parse_systemd_bool(Some(¤t_unit_info), "Unit", "X-StopOnRemoval", true) { + _ = units_to_stop.insert(unit.to_string(), ()); + } + } else if unit.ends_with(".target") { + let new_unit_info = parse_unit(&new_unit_file, &new_base_unit_file)?; + + // Cause all active target units to be restarted below. This should start most + // changed units we stop here as well as any new dependencies (including new mounts + // and swap devices). FIXME: the suspend target is sometimes active after the + // system has resumed, which probably should not be the case. Just ignore it. + if !matches!( + unit.as_str(), + "suspend.target" | "hibernate.target" | "hybrid-sleep.target" + ) { + if !(parse_systemd_bool( + Some(&new_unit_info), + "Unit", + "RefuseManualStart", + false, + ) || parse_systemd_bool( + Some(&new_unit_info), + "Unit", + "X-OnlyManualStart", + false, + )) { + units_to_start.insert(unit.to_string(), ()); + record_unit(START_LIST_FILE, unit); + // Don't spam the user with target units that always get started. + if std::env::var("STC_DISPLAY_ALL_UNITS").as_deref() != Ok("1") { + units_to_filter.insert(unit.to_string(), ()); + } + } + } + + // Stop targets that have X-StopOnReconfiguration set. This is necessary to respect + // dependency orderings involving targets: if unit X starts after target Y and + // target Y starts after unit Z, then if X and Z have both changed, then X should + // be restarted after Z. However, if target Y is in the "active" state, X and Z + // will be restarted at the same time because X's dependency on Y is already + // satisfied. Thus, we need to stop Y first. Stopping a target generally has no + // effect on other units (unless there is a PartOf dependency), so this is just a + // bookkeeping thing to get systemd to do the right thing. + if parse_systemd_bool( + Some(&new_unit_info), + "Unit", + "X-StopOnReconfiguration", + false, + ) { + units_to_stop.insert(unit.to_string(), ()); + } + } else { + let current_unit_info = parse_unit(¤t_unit_file, ¤t_base_unit_file)?; + let new_unit_info = parse_unit(&new_unit_file, &new_base_unit_file)?; + match compare_units(¤t_unit_info, &new_unit_info) { + UnitComparison::UnequalNeedsRestart => { + handle_modified_unit( + &toplevel, + &unit, + base_name, + &new_unit_file, + &new_base_unit_file, + Some(&new_unit_info), + ¤t_active_units, + &mut units_to_stop, + &mut units_to_start, + &mut units_to_reload, + &mut units_to_restart, + &mut units_to_skip, + )?; + } + UnitComparison::UnequalNeedsReload if !units_to_restart.contains_key(unit) => { + units_to_reload.insert(unit.clone(), ()); + record_unit(RELOAD_LIST_FILE, &unit); + } + _ => {} + } + } + } + } + + // Compare the previous and new fstab to figure out which filesystems need a remount or need to + // be unmounted. New filesystems are mounted automatically by starting local-fs.target. + // FIXME: might be nicer if we generated units for all mounts; then we could unify this with + // the unit checking code above. + let (current_filesystems, current_swaps) = std::fs::read_to_string("/etc/fstab") + .map(|fstab| parse_fstab(std::io::Cursor::new(fstab))) + .unwrap_or_default(); + let (new_filesystems, new_swaps) = std::fs::read_to_string(toplevel.join("etc/fstab")) + .map(|fstab| parse_fstab(std::io::Cursor::new(fstab))) + .unwrap_or_default(); + + for (mountpoint, current_filesystem) in current_filesystems { + // Use current version of systemctl binary before daemon is reexeced. + let unit = path_to_unit_name(¤t_system_bin, &mountpoint); + if let Some(new_filesystem) = new_filesystems.get(&mountpoint) { + if current_filesystem.fs_type != new_filesystem.fs_type + || current_filesystem.device != new_filesystem.device + { + if matches!(mountpoint.as_str(), "/" | "/nix") { + if current_filesystem.options != new_filesystem.options { + // Mount options changes, so remount it. + units_to_reload.insert(unit.to_string(), ()); + record_unit(RELOAD_LIST_FILE, &unit) + } else { + // Don't unmount / or /nix if the device changed + units_to_skip.insert(unit, ()); + } + } else { + // Filesystem type or device changed, so unmount and mount it. + units_to_restart.insert(unit.to_string(), ()); + record_unit(RESTART_LIST_FILE, &unit); + } + } else if current_filesystem.options != new_filesystem.options { + // Mount options changes, so remount it. + units_to_reload.insert(unit.to_string(), ()); + record_unit(RELOAD_LIST_FILE, &unit) + } + } else { + // Filesystem entry disappeared, so unmount it. + units_to_stop.insert(unit, ()); + } + } + + // Also handles swap devices. + for (device, _) in current_swaps { + if new_swaps.get(&device).is_none() { + // Swap entry disappeared, so turn it off. Can't use "systemctl stop" here because + // systemd has lots of alias units that prevent a stop from actually calling "swapoff". + if *action == Action::DryActivate { + eprintln!("would stop swap device: {}", &device); + } else { + eprintln!("stopping swap device: {}", &device); + let c_device = std::ffi::CString::new(device.clone()) + .context("failed to convert device to cstring")?; + if unsafe { nix::libc::swapoff(c_device.as_ptr()) } != 0 { + let err = std::io::Error::last_os_error(); + eprintln!("Failed to stop swapping to {device}: {err}"); + } + } + } + // FIXME: update swap options (i.e. its priority). + } + + // Should we have systemd re-exec itself? + let current_pid1_path = Path::new("/proc/1/exe") + .canonicalize() + .unwrap_or_else(|_| PathBuf::from("/unknown")); + let current_systemd_system_config = Path::new("/etc/systemd/system.conf") + .canonicalize() + .unwrap_or_else(|_| PathBuf::from("/unknown")); + let Ok(new_pid1_path) = new_systemd.join("lib/systemd/systemd").canonicalize() else { + die(); + }; + let new_systemd_system_config = toplevel + .join("etc/systemd/system.conf") + .canonicalize() + .unwrap_or_else(|_| PathBuf::from("/unknown")); + + let restart_systemd = current_pid1_path != new_pid1_path + || current_systemd_system_config != new_systemd_system_config; + + let units_to_stop_filtered = filter_units(&units_to_filter, &units_to_stop); + + // Show dry-run actions. + if *action == Action::DryActivate { + if !units_to_stop_filtered.is_empty() { + let mut units = units_to_stop_filtered + .keys() + .into_iter() + .map(String::as_str) + .collect::>(); + units.sort_by_key(|name| name.to_lowercase()); + eprintln!("would stop the following units: {}", units.join(", ")); + } + + if !units_to_skip.is_empty() { + let mut units = units_to_skip + .keys() + .into_iter() + .map(String::as_str) + .collect::>(); + units.sort_by_key(|name| name.to_lowercase()); + eprintln!( + "would NOT stop the following changed units: {}", + units.join(", ") + ); + } + + eprintln!("would activate the configuration..."); + _ = std::process::Command::new(out.join("dry-activate")) + .arg(&out) + .spawn() + .map(|mut child| child.wait()); + + // Handle the activation script requesting the restart or reload of a unit. + for unit in std::fs::read_to_string(DRY_RESTART_BY_ACTIVATION_LIST_FILE) + .unwrap_or_default() + .lines() + { + let current_unit_file = Path::new("/etc/systemd/system").join(unit); + let new_unit_file = toplevel.join("etc/systemd/system").join(unit); + let mut base_unit = unit.to_string(); + let mut new_base_unit_file = new_unit_file.clone(); + + // Detect template instances. + if let Some((Some(template_name), Some(template_instance))) = + template_unit_re.captures(&unit).map(|captures| { + ( + captures.get(1).map(|c| c.as_str()), + captures.get(2).map(|c| c.as_str()), + ) + }) + { + if !current_unit_file.exists() && !new_unit_file.exists() { + base_unit = format!("{}@.{}", template_name, template_instance); + new_base_unit_file = toplevel.join("etc/systemd/system").join(&base_unit); + } + } + + let mut base_name = base_unit.as_str(); + if let Some(Some(new_base_name)) = unit_name_re + .captures(&base_unit) + .map(|capture| capture.get(1).map(|first| first.as_str())) + { + base_name = new_base_name; + } + + // Start units if they were not active previously + if !current_active_units.contains_key(unit) { + units_to_start.insert(unit.to_string(), ()); + continue; + } + + handle_modified_unit( + &toplevel, + unit, + base_name, + &new_unit_file, + &new_base_unit_file, + None, + ¤t_active_units, + &mut units_to_stop, + &mut units_to_start, + &mut units_to_reload, + &mut units_to_restart, + &mut units_to_skip, + )?; + } + + remove_file_if_exists(DRY_RESTART_BY_ACTIVATION_LIST_FILE) + .with_context(|| format!("Failed to remove {}", DRY_RESTART_BY_ACTIVATION_LIST_FILE))?; + + for unit in std::fs::read_to_string(DRY_RELOAD_BY_ACTIVATION_LIST_FILE) + .unwrap_or_default() + .lines() + { + if current_active_units.contains_key(unit) + && !units_to_restart.contains_key(unit) + && !units_to_stop.contains_key(unit) + { + units_to_reload.insert(unit.to_string(), ()); + record_unit(RELOAD_LIST_FILE, unit); + } + } + + remove_file_if_exists(DRY_RELOAD_BY_ACTIVATION_LIST_FILE) + .with_context(|| format!("Failed to remove {}", DRY_RELOAD_BY_ACTIVATION_LIST_FILE))?; + + if restart_systemd { + eprintln!("would restart systemd"); + } + + if !units_to_reload.is_empty() { + let mut units = units_to_reload + .keys() + .into_iter() + .map(String::as_str) + .collect::>(); + units.sort_by_key(|name| name.to_lowercase()); + eprintln!("would reload the following units: {}", units.join(", ")); + } + + if !units_to_restart.is_empty() { + let mut units = units_to_restart + .keys() + .into_iter() + .map(String::as_str) + .collect::>(); + units.sort_by_key(|name| name.to_lowercase()); + eprintln!("would restart the following units: {}", units.join(", ")); + } + + let units_to_start_filtered = filter_units(&units_to_filter, &units_to_start); + if !units_to_start_filtered.is_empty() { + let mut units = units_to_start_filtered + .keys() + .into_iter() + .map(String::as_str) + .collect::>(); + units.sort_by_key(|name| name.to_lowercase()); + eprintln!("would start the following units: {}", units.join(", ")); + } + + std::process::exit(0); + } + + log::info!("switching to system configuration {}", toplevel.display()); + + if !units_to_stop.is_empty() { + if !units_to_stop_filtered.is_empty() { + let mut units = units_to_stop_filtered + .keys() + .into_iter() + .map(String::as_str) + .collect::>(); + units.sort_by_key(|name| name.to_lowercase()); + eprintln!("stopping the following units: {}", units.join(", ")); + } + + for unit in units_to_stop.keys() { + match systemd.stop_unit(unit, "replace") { + Ok(job_path) => { + let mut j = submitted_jobs.borrow_mut(); + j.insert(job_path.to_owned(), Job::Stop); + } + Err(_) => {} + }; + } + + block_on_jobs(&dbus_conn, &submitted_jobs); + } + + if !units_to_skip.is_empty() { + let mut units = units_to_skip + .keys() + .into_iter() + .map(String::as_str) + .collect::>(); + units.sort_by_key(|name| name.to_lowercase()); + eprintln!( + "NOT restarting the following changed units: {}", + units.join(", "), + ); + } + + // Wait for all stop jobs to finish + block_on_jobs(&dbus_conn, &submitted_jobs); + + let mut exit_code = 0; + + // Activate the new configuration (i.e., update /etc, make accounts, and so on). + eprintln!("activating the configuration..."); + match std::process::Command::new(out.join("activate")) + .arg(&out) + .spawn() + .map(|mut child| child.wait()) + { + Ok(Ok(status)) if status.success() => {} + Err(_) => { + // allow toplevel to not have an activation script + } + _ => { + eprintln!("Failed to run activate script"); + exit_code = 2; + } + } + + // Handle the activation script requesting the restart or reload of a unit. + for unit in std::fs::read_to_string(RESTART_BY_ACTIVATION_LIST_FILE) + .unwrap_or_default() + .lines() + { + let new_unit_file = toplevel.join("etc/systemd/system").join(unit); + let mut base_unit = unit.to_string(); + let mut new_base_unit_file = new_unit_file.clone(); + + // Detect template instances. + if let Some((Some(template_name), Some(template_instance))) = + template_unit_re.captures(&unit).map(|captures| { + ( + captures.get(1).map(|c| c.as_str()), + captures.get(2).map(|c| c.as_str()), + ) + }) + { + if !new_unit_file.exists() { + base_unit = format!("{}@.{}", template_name, template_instance); + new_base_unit_file = toplevel.join("etc/systemd/system").join(&base_unit); + } + } + + let mut base_name = base_unit.as_str(); + if let Some(Some(new_base_name)) = unit_name_re + .captures(&base_unit) + .map(|capture| capture.get(1).map(|first| first.as_str())) + { + base_name = new_base_name; + } + + // Start units if they were not active previously + if !current_active_units.contains_key(unit) { + units_to_start.insert(unit.to_string(), ()); + record_unit(START_LIST_FILE, unit); + continue; + } + + handle_modified_unit( + &toplevel, + unit, + base_name, + &new_unit_file, + &new_base_unit_file, + None, + ¤t_active_units, + &mut units_to_stop, + &mut units_to_start, + &mut units_to_reload, + &mut units_to_restart, + &mut units_to_skip, + )?; + } + + // We can remove the file now because it has been propagated to the other restart/reload files + remove_file_if_exists(RESTART_BY_ACTIVATION_LIST_FILE) + .with_context(|| format!("Failed to remove {}", RESTART_BY_ACTIVATION_LIST_FILE))?; + + for unit in std::fs::read_to_string(RELOAD_BY_ACTIVATION_LIST_FILE) + .unwrap_or_default() + .lines() + { + if current_active_units.contains_key(unit) + && !units_to_restart.contains_key(unit) + && !units_to_stop.contains_key(unit) + { + units_to_reload.insert(unit.to_string(), ()); + record_unit(RELOAD_LIST_FILE, unit); + } + } + + // We can remove the file now because it has been propagated to the other reload file + remove_file_if_exists(RELOAD_BY_ACTIVATION_LIST_FILE) + .with_context(|| format!("Failed to remove {}", RELOAD_BY_ACTIVATION_LIST_FILE))?; + + // Restart systemd if necessary. Note that this is done using the current version of systemd, + // just in case the new one has trouble communicating with the running pid 1. + if restart_systemd { + eprintln!("restarting systemd..."); + _ = systemd.reexecute(); // we don't get a dbus reply here + + while !*systemd_reload_status.borrow() { + _ = dbus_conn + .process(Duration::from_millis(500)) + .context("Failed to process dbus messages")?; + } + } + + // Forget about previously failed services. + systemd + .reset_failed() + .context("Failed to reset failed units")?; + + // Make systemd reload its units. + _ = systemd.reload(); // we don't get a dbus reply here + while !*systemd_reload_status.borrow() { + _ = dbus_conn + .process(Duration::from_millis(500)) + .context("Failed to process dbus messages")?; + } + + dbus_conn + .remove_match(reloading_token) + .context("Failed to cleanup systemd Reloading match")?; + + // Reload user units + match logind.list_users() { + Err(err) => { + eprintln!("Unable to list users with logind: {err}"); + die(); + } + Ok(users) => { + for (uid, name, _) in users { + eprintln!("reloading user units for {}...", name); + let myself = Path::new("/proc/self/exe") + .canonicalize() + .context("Failed to get full path to /proc/self/exe")?; + + std::process::Command::new(&myself) + .uid(uid) + .env("XDG_RUNTIME_DIR", format!("/run/user/{}", uid)) + .env("__NIXOS_SWITCH_TO_CONFIGURATION_PARENT_EXE", &myself) + .spawn() + .map(|mut child| _ = child.wait()) + .with_context(|| format!("Failed to run user activation for {name}"))?; + } + } + } + + // Restart sysinit-reactivation.target. This target only exists to restart services ordered + // before sysinit.target. We cannot use X-StopOnReconfiguration to restart sysinit.target + // because then ALL services of the system would be restarted since all normal services have a + // default dependency on sysinit.target. sysinit-reactivation.target ensures that services + // ordered BEFORE sysinit.target get re-started in the correct order. Ordering between these + // services is respected. + eprintln!("restarting {SYSINIT_REACTIVATION_TARGET}"); + match systemd.restart_unit(SYSINIT_REACTIVATION_TARGET, "replace") { + Ok(job_path) => { + let mut jobs = submitted_jobs.borrow_mut(); + jobs.insert(job_path, Job::Restart); + } + Err(err) => { + eprintln!("Failed to restart {SYSINIT_REACTIVATION_TARGET}: {err}"); + exit_code = 4; + } + } + + // Wait for the restart job of sysinit-reactivation.service to finish + block_on_jobs(&dbus_conn, &submitted_jobs); + + // Before reloading we need to ensure that the units are still active. They may have been + // deactivated because one of their requirements got stopped. If they are inactive but should + // have been reloaded, the user probably expects them to be started. + if !units_to_reload.is_empty() { + for (unit, _) in units_to_reload.clone() { + if !unit_is_active(&dbus_conn, &unit)? { + // Figure out if we need to start the unit + let unit_info = parse_unit( + toplevel.join("etc/systemd/system").join(&unit).as_path(), + toplevel.join("etc/systemd/system").join(&unit).as_path(), + )?; + if !parse_systemd_bool(Some(&unit_info), "Unit", "RefuseManualStart", false) + || parse_systemd_bool(Some(&unit_info), "Unit", "X-OnlyManualStart", false) + { + units_to_start.insert(unit.clone(), ()); + record_unit(START_LIST_FILE, &unit); + } + // Don't reload the unit, reloading would fail + units_to_reload.remove(&unit); + unrecord_unit(RELOAD_LIST_FILE, &unit); + } + } + } + + // Reload units that need it. This includes remounting changed mount units. + if !units_to_reload.is_empty() { + let mut units = units_to_reload + .keys() + .into_iter() + .map(String::as_str) + .collect::>(); + units.sort_by_key(|name| name.to_lowercase()); + eprintln!("reloading the following units: {}", units.join(", ")); + + for unit in units { + match systemd.reload_unit(unit, "replace") { + Ok(job_path) => { + submitted_jobs + .borrow_mut() + .insert(job_path.clone(), Job::Reload); + } + Err(err) => { + eprintln!("Failed to reload {unit}: {err}"); + exit_code = 4; + } + } + } + + block_on_jobs(&dbus_conn, &submitted_jobs); + + remove_file_if_exists(RELOAD_LIST_FILE) + .with_context(|| format!("Failed to remove {}", RELOAD_LIST_FILE))?; + } + + // Restart changed services (those that have to be restarted rather than stopped and started). + if !units_to_restart.is_empty() { + let mut units = units_to_restart + .keys() + .into_iter() + .map(String::as_str) + .collect::>(); + units.sort_by_key(|name| name.to_lowercase()); + eprintln!("restarting the following units: {}", units.join(", ")); + + for unit in units { + match systemd.restart_unit(unit, "replace") { + Ok(job_path) => { + let mut jobs = submitted_jobs.borrow_mut(); + jobs.insert(job_path, Job::Restart); + } + Err(err) => { + eprintln!("Failed to restart {unit}: {err}"); + exit_code = 4; + } + } + } + + block_on_jobs(&dbus_conn, &submitted_jobs); + + remove_file_if_exists(RESTART_LIST_FILE) + .with_context(|| format!("Failed to remove {}", RESTART_LIST_FILE))?; + } + + // Start all active targets, as well as changed units we stopped above. The latter is necessary + // because some may not be dependencies of the targets (i.e., they were manually started). + // FIXME: detect units that are symlinks to other units. We shouldn't start both at the same + // time because we'll get a "Failed to add path to set" error from systemd. + let units_to_start_filtered = filter_units(&units_to_filter, &units_to_start); + if !units_to_start_filtered.is_empty() { + let mut units = units_to_start_filtered + .keys() + .into_iter() + .map(String::as_str) + .collect::>(); + units.sort_by_key(|name| name.to_lowercase()); + eprintln!("starting the following units: {}", units.join(", ")); + } + + for unit in units_to_start.keys() { + match systemd.start_unit(unit, "replace") { + Ok(job_path) => { + let mut jobs = submitted_jobs.borrow_mut(); + jobs.insert(job_path, Job::Start); + } + Err(err) => { + eprintln!("Failed to start {unit}: {err}"); + exit_code = 4; + } + } + } + + block_on_jobs(&dbus_conn, &submitted_jobs); + + remove_file_if_exists(START_LIST_FILE) + .with_context(|| format!("Failed to remove {}", START_LIST_FILE))?; + + for (unit, job, result) in finished_jobs.borrow().values() { + match result.as_str() { + "timeout" | "failed" | "dependency" => { + eprintln!("Failed to {} {}", job, unit); + exit_code = 4; + } + _ => {} + } + } + + dbus_conn + .remove_match(job_removed_token) + .context("Failed to cleanup systemd job match")?; + + // Print failed and new units. + let mut failed_units = Vec::new(); + let mut new_units = Vec::new(); + + // NOTE: We want switch-to-configuration to be able to report to the user any units that failed + // to start or units that systemd had to restart due to having previously failed. This is + // inherently a race condition between how long our program takes to run and how long the unit + // in question takes to potentially fail. The amount of time we wait for new messages on the + // bus to settle is purely tuned so that this program is compatible with the Perl + // implementation. + // + // Wait for events from systemd to settle. process() will return true if we have received any + // messages on the bus. + while dbus_conn + .process(Duration::from_millis(250)) + .unwrap_or_default() + {} + + let new_active_units = get_active_units(&systemd)?; + + for (unit, unit_state) in new_active_units { + if &unit_state.state == "failed" { + failed_units.push(unit); + continue; + } + + if unit_state.substate == "auto-restart" && unit.ends_with(".service") { + // A unit in auto-restart substate is a failure *if* it previously failed to start + let unit_object_path = systemd + .get_unit(&unit) + .context("Failed to get unit info for {unit}")?; + let exec_main_status: i32 = dbus_conn + .with_proxy( + "org.freedesktop.systemd1", + unit_object_path, + Duration::from_millis(5000), + ) + .get("org.freedesktop.systemd1.Service", "ExecMainStatus") + .context("Failed to get ExecMainStatus for {unit}")?; + + if exec_main_status != 0 { + failed_units.push(unit); + continue; + } + } + + // Ignore scopes since they are not managed by this script but rather created and managed + // by third-party services via the systemd dbus API. This only lists units that are not + // failed (including ones that are in auto-restart but have not failed previously) + if unit_state.state != "failed" + && !current_active_units.contains_key(&unit) + && !unit.ends_with(".scope") + { + new_units.push(unit); + } + } + + if !new_units.is_empty() { + new_units.sort_by_key(|name| name.to_lowercase()); + eprintln!( + "the following new units were started: {}", + new_units.join(", ") + ); + } + + if !failed_units.is_empty() { + failed_units.sort_by_key(|name| name.to_lowercase()); + eprintln!( + "warning: the following units failed: {}", + failed_units.join(", ") + ); + _ = std::process::Command::new(new_systemd.join("bin/systemctl")) + .arg("status") + .arg("--no-pager") + .arg("--full") + .args(failed_units) + .spawn() + .map(|mut child| child.wait()); + + exit_code = 4; + } + + if exit_code == 0 { + log::info!( + "finished switching to system configuration {}", + toplevel.display() + ); + } else { + log::error!( + "switching to system configuration {} failed (status {})", + toplevel.display(), + exit_code + ); + } + + std::process::exit(exit_code); +} + +fn main() -> anyhow::Result<()> { + match ( + unsafe { nix::libc::geteuid() }, + std::env::var("__NIXOS_SWITCH_TO_CONFIGURATION_PARENT_EXE").ok(), + ) { + (0, None) => do_system_switch(), + (1..=u32::MAX, None) => bail!("This program does not support being ran outside of the switch-to-configuration environment"), + (_, Some(parent_exe)) => do_user_switch(parent_exe), + } +} + +#[cfg(test)] +mod tests { + use std::collections::HashMap; + + #[test] + fn parse_fstab() { + { + let (filesystems, swaps) = super::parse_fstab(std::io::Cursor::new("")); + assert!(filesystems.is_empty()); + assert!(swaps.is_empty()); + } + + { + let (filesystems, swaps) = super::parse_fstab(std::io::Cursor::new( + r#"\ +invalid + "#, + )); + assert!(filesystems.is_empty()); + assert!(swaps.is_empty()); + } + + { + let (filesystems, swaps) = super::parse_fstab(std::io::Cursor::new( + r#"\ +# This is a generated file. Do not edit! +# +# To make changes, edit the fileSystems and swapDevices NixOS options +# in your /etc/nixos/configuration.nix file. +# +# + +# Filesystems. +/dev/mapper/root / btrfs x-initrd.mount,compress=zstd,noatime,defaults 0 0 +/dev/disk/by-partlabel/BOOT /boot vfat x-systemd.automount 0 2 +/dev/disk/by-partlabel/home /home ext4 defaults 0 2 +/dev/mapper/usr /nix/.ro-store erofs x-initrd.mount,ro 0 2 + + +# Swap devices. + "#, + )); + assert_eq!(filesystems.len(), 4); + assert_eq!(swaps.len(), 0); + let home_fs = filesystems.get("/home").unwrap(); + assert_eq!(home_fs.fs_type, "ext4"); + assert_eq!(home_fs.device, "/dev/disk/by-partlabel/home"); + assert_eq!(home_fs.options, "defaults"); + } + } + + #[test] + fn filter_units() { + assert_eq!( + super::filter_units(&HashMap::from([]), &HashMap::from([])), + HashMap::from([]) + ); + + assert_eq!( + super::filter_units( + &HashMap::from([("foo".to_string(), ())]), + &HashMap::from([("foo".to_string(), ()), ("bar".to_string(), ())]) + ), + HashMap::from([("bar".to_string(), ())]) + ); + } + + #[test] + fn compare_units() { + { + assert!( + super::compare_units(&HashMap::from([]), &HashMap::from([])) + == super::UnitComparison::Equal + ); + + assert!( + super::compare_units( + &HashMap::from([("Unit".to_string(), HashMap::from([]))]), + &HashMap::from([]) + ) == super::UnitComparison::Equal + ); + + assert!( + super::compare_units( + &HashMap::from([( + "Unit".to_string(), + HashMap::from([( + "X-Reload-Triggers".to_string(), + vec!["foobar".to_string()] + )]) + )]), + &HashMap::from([]) + ) == super::UnitComparison::Equal + ); + } + + { + assert!( + super::compare_units( + &HashMap::from([("foobar".to_string(), HashMap::from([]))]), + &HashMap::from([]) + ) == super::UnitComparison::UnequalNeedsRestart + ); + + assert!( + super::compare_units( + &HashMap::from([( + "Mount".to_string(), + HashMap::from([("Options".to_string(), vec![])]) + )]), + &HashMap::from([( + "Mount".to_string(), + HashMap::from([("Options".to_string(), vec!["ro".to_string()])]) + )]) + ) == super::UnitComparison::UnequalNeedsReload + ); + } + + { + assert!( + super::compare_units( + &HashMap::from([]), + &HashMap::from([( + "Unit".to_string(), + HashMap::from([( + "X-Reload-Triggers".to_string(), + vec!["foobar".to_string()] + )]) + )]) + ) == super::UnitComparison::UnequalNeedsReload + ); + + assert!( + super::compare_units( + &HashMap::from([( + "Unit".to_string(), + HashMap::from([( + "X-Reload-Triggers".to_string(), + vec!["foobar".to_string()] + )]) + )]), + &HashMap::from([( + "Unit".to_string(), + HashMap::from([( + "X-Reload-Triggers".to_string(), + vec!["barfoo".to_string()] + )]) + )]) + ) == super::UnitComparison::UnequalNeedsReload + ); + + assert!( + super::compare_units( + &HashMap::from([( + "Mount".to_string(), + HashMap::from([("Type".to_string(), vec!["ext4".to_string()])]) + )]), + &HashMap::from([( + "Mount".to_string(), + HashMap::from([("Type".to_string(), vec!["btrfs".to_string()])]) + )]) + ) == super::UnitComparison::UnequalNeedsRestart + ); + } + } +} diff --git a/third_party/nixpkgs/pkgs/by-name/sw/switcheroo/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/switcheroo/package.nix index 9d2327f409..aa132910b1 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/switcheroo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/switcheroo/package.nix @@ -18,19 +18,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "switcheroo"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitLab { owner = "adhami3310"; repo = "Switcheroo"; rev = "v${finalAttrs.version}"; - hash = "sha256-hopN2ynksaYoNYjXrh7plmhfmGYyqqK75GOtbsE95ZY="; + hash = "sha256-AwecOA8HWGimhQyCEG3Z3hhwa9RVWssykUXsdvqqs9U="; }; cargoDeps = rustPlatform.fetchCargoTarball { src = finalAttrs.src; name = "switcheroo-${finalAttrs.version}"; - hash = "sha256-wN6MsiOgYFgzDzdGei0ptRbG+h+xMJiFfzCcg6Xtryw="; + hash = "sha256-fpI4ue30DhkeWAolyeots+LkaRyaIPhYmIqRmx08i2s="; }; nativeBuildInputs = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { changelog = "https://gitlab.com/adhami3310/Switcheroo/-/releases/v${finalAttrs.version}"; description = "An app for converting images between different formats"; - homepage = "https://gitlab.com/adhami3310/Switcheroo"; + homepage = "https://apps.gnome.org/Converter/"; license = licenses.gpl3Plus; mainProgram = "switcheroo"; maintainers = with maintainers; [ michaelgrahamevans ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swww/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sw/swww/Cargo.lock index d9c0ee3e72..bc481ee36a 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/swww/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/sw/swww/Cargo.lock @@ -31,47 +31,48 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -228,6 +229,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "cast" version = "0.3.0" @@ -236,12 +243,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.94" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -345,9 +353,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "crc32fast" @@ -521,9 +529,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -571,9 +579,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -612,11 +620,11 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" dependencies = [ - "byteorder", + "byteorder-lite", "thiserror", ] @@ -658,6 +666,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.10.5" @@ -684,9 +698,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685a7d121ee3f65ae4fddd72b25a04bb36b6af81bc0828f7d5434c0fe60fa3a2" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -724,9 +738,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libfuzzer-sys" @@ -763,9 +777,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1020,9 +1034,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -1219,9 +1233,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -1265,18 +1279,18 @@ checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", @@ -1361,7 +1375,7 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "swww" -version = "0.9.4" +version = "0.9.5" dependencies = [ "assert_cmd", "clap", @@ -1374,7 +1388,7 @@ dependencies = [ [[package]] name = "swww-daemon" -version = "0.9.4" +version = "0.9.5" dependencies = [ "bitcode", "keyframe", @@ -1394,9 +1408,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.59" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -1449,18 +1463,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", @@ -1544,9 +1558,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap", "serde", @@ -1569,7 +1583,7 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utils" -version = "0.9.4" +version = "0.9.5" dependencies = [ "bitcode", "criterion", @@ -1763,37 +1777,15 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-sys" version = "0.48.0" @@ -1935,9 +1927,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" +checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" dependencies = [ "memchr", ] diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swww/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/swww/package.nix index 4dc92570f9..de6889f5b1 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/swww/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sw/swww/package.nix @@ -1,22 +1,23 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, pkg-config -, lz4 -, libxkbcommon -, installShellFiles -, scdoc +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + lz4, + libxkbcommon, + installShellFiles, + scdoc, }: rustPlatform.buildRustPackage rec { pname = "swww"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "LGFae"; repo = "swww"; rev = "refs/tags/v${version}"; - hash = "sha256-LvSPKg8cWlwKu4a+P/G0dOqV+aPsUq3axI1QqnLj4U8="; + hash = "sha256-ldy9HhIsWdtTdvtRLV3qDT80oX646BI4Q+YX5wJXbsc="; }; cargoLock = { @@ -52,12 +53,15 @@ rustPlatform.buildRustPackage rec { --zsh completions/_swww ''; - meta = with lib; { + meta = { description = "Efficient animated wallpaper daemon for wayland, controlled at runtime"; homepage = "https://github.com/LGFae/swww"; - license = licenses.gpl3; - maintainers = with maintainers; [ mateodd25 donovanglover ]; - platforms = platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ + mateodd25 + donovanglover + ]; + platforms = lib.platforms.linux; mainProgram = "swww"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix b/third_party/nixpkgs/pkgs/by-name/sy/syft/package.nix similarity index 93% rename from third_party/nixpkgs/pkgs/tools/admin/syft/default.nix rename to third_party/nixpkgs/pkgs/by-name/sy/syft/package.nix index 7735f8951e..91727c9490 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/syft/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "syft"; - version = "1.2.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; rev = "refs/tags/v${version}"; - hash = "sha256-HlV+DeLI6/vYAYkp0ZM7z9uWC+nZLso6xlvCQJ2Imjg="; + hash = "sha256-fFJcRNqXhhdxsxQkP5S8xSeeUOa+KbS9CkUs1sbNuOg="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-yXl8f3f3XO8o80PkX6hS/12p80z4LczghdmY1Elp0aE="; + vendorHash = "sha256-vuKvQjWMFHtTjTb7Sg/jXvzpR2IxrHaWyfibTQdpSd4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sy/symfony-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/symfony-cli/package.nix index 9931e4f590..20a30fd5d2 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/symfony-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/symfony-cli/package.nix @@ -10,14 +10,19 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.8.15"; - vendorHash = "sha256-rkvQhZSoKZIl/gFgekLUelem2FGbRL9gp1LEzYN88Dc="; + version = "5.8.17"; + vendorHash = "sha256-ARTKJVHgN1Y3xOUc3P2Ch7e8gN9BZbhBEZ1DiM7nEWs="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-HbBg2oCsogY3X4jgjknqwNe2bszXjylvE+h5/iyg2pM="; + hash = "sha256-UmGyIZk5s5A8ModafWMZqeJHdZ4fa+hAHi62pdlfJ8I="; + leaveDotGit = true; + postFetch = '' + git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE + rm -rf $out/.git + ''; }; ldflags = [ @@ -27,6 +32,10 @@ buildGoModule rec { "-X main.channel=stable" ]; + preBuild = '' + ldflags+=" -X main.buildDate=$(cat SOURCE_DATE)" + ''; + buildInputs = [ makeBinaryWrapper ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/by-name/sy/symphony/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/symphony/package.nix new file mode 100644 index 0000000000..51d3316c7d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sy/symphony/package.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, coin-utils +, CoinMP +, gfortran +, libtool +, glpk +, osi +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "symphony"; + version = "5.7.2"; + + outputs = [ "out" ]; + + src = fetchFromGitHub { + owner = "coin-or"; + repo = "SYMPHONY"; + rev = "releases/${version}"; + sha256 = "sha256-OdTUMG3iVhjhw5uKtUnsLCZ4DfMjYHm8+/ozfmw7J6c="; + }; + + nativeBuildInputs = [ libtool pkg-config glpk gfortran CoinMP osi coin-utils ]; + + meta = { + description = "SYMPHONY is an open-source solver, callable library, and development framework for mixed-integer linear programs (MILPs) written in C with a number of unique features"; + homepage = "https://www.coin-or.org/SYMPHONY/index.htm"; + changelog = "https://github.com/coin-or/SYMPHONY/blob/${version}/CHANGELOG.md"; + platforms = [ "x86_64-linux" ]; + license = lib.licenses.epl20; + maintainers = with lib.maintainers; [ b-rodrigues ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sy/syslogng/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syslogng/package.nix index afbf3b257e..c8f45f834a 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/syslogng/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/syslogng/package.nix @@ -59,15 +59,15 @@ let ]; py = python3.withPackages python-deps; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "syslog-ng"; - version = "4.6.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "syslog-ng"; repo = "syslog-ng"; - rev = "syslog-ng-${version}"; - hash = "sha256-B9s7mprPpS4xc7mfJbsDaq2hB1rjYmuOnOnpu+NnMRs="; + rev = "syslog-ng-${finalAttrs.version}"; + hash = "sha256-runFMUxQv7B023I38QfGqn89ZbzA5vMXHOOkYwMxArI="; fetchSubmodules = true; }; nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config which bison flex libxslt perl gperf python3Packages.setuptools ]; @@ -117,11 +117,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://www.syslog-ng.com"; description = "Next-generation syslogd with advanced networking and filtering capabilities"; - license = with licenses; [ gpl2Plus lgpl21Plus ]; - maintainers = with maintainers; [ vifino ]; - platforms = platforms.linux; + license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = with lib.maintainers; [ vifino ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix index 23a831e9e9..f51ada76c0 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "systemctl-tui"; - version = "0.3.3"; + version = "0.3.5"; src = fetchCrate { inherit pname version; - hash = "sha256-oFXLxWS2G+CkG0yuJLkA34SqoGGcXU/eZmFMRYw+Gzo="; + hash = "sha256-CONg4amz4WaaZC/RtptzZDxLY8QnYqSnmpbBTILHjos="; }; - cargoHash = "sha256-MKxeRQupgAxA2ui8qSK8BvhxqqgjJarD8pY9wmk8MvA="; + cargoHash = "sha256-EQ5vAAO52KXt9RhnB+P0cX7mCvXDYSxPfSh+Ak/DN0g="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tabby/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ta/tabby/Cargo.lock index ab4805aecd..873b1d4d25 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/tabby/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ta/tabby/Cargo.lock @@ -19,11 +19,12 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -40,7 +41,7 @@ dependencies = [ [[package]] name = "aim-downloader" -version = "0.8.3" +version = "0.11.0" dependencies = [ "async-stream", "clap", @@ -51,7 +52,7 @@ dependencies = [ "indicatif", "netrc", "regex", - "reqwest", + "reqwest 0.12.4", "serial_test 2.0.0", "sha2", "strfmt", @@ -144,6 +145,86 @@ version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +[[package]] +name = "apalis" +version = "0.5.1" +source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" +dependencies = [ + "apalis-core", + "apalis-cron", + "apalis-redis", + "apalis-sql", + "futures", + "pin-project-lite", + "serde", + "thiserror", + "tokio", + "tower", + "tracing", + "tracing-futures", +] + +[[package]] +name = "apalis-core" +version = "0.5.1" +source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" +dependencies = [ + "async-oneshot", + "futures", + "pin-project-lite", + "serde", + "serde_json", + "thiserror", + "tokio", + "tower", + "ulid", +] + +[[package]] +name = "apalis-cron" +version = "0.5.1" +source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" +dependencies = [ + "apalis-core", + "async-stream", + "chrono", + "cron", + "futures", + "tower", +] + +[[package]] +name = "apalis-redis" +version = "0.5.1" +source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" +dependencies = [ + "apalis-core", + "async-stream", + "async-trait", + "chrono", + "futures", + "log", + "redis", + "serde", + "tokio", +] + +[[package]] +name = "apalis-sql" +version = "0.5.1" +source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" +dependencies = [ + "apalis-core", + "async-stream", + "futures", + "futures-lite", + "log", + "serde", + "serde_json", + "sqlx", + "tokio", +] + [[package]] name = "arc-swap" version = "1.6.0" @@ -184,6 +265,49 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "async-convert" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d416feee97712e43152cd42874de162b8f9b77295b1c85e5d92725cc8310bae" +dependencies = [ + "async-trait", +] + +[[package]] +name = "async-oneshot" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae47de2a02d543205f3f5457a90b6ecbc9494db70557bd29590ec8f1ddff5463" +dependencies = [ + "futures-micro", +] + +[[package]] +name = "async-openai" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11e97f9c5e0ee3260caee9700ba1bb61a6fdc34d2b6786a31e018c5de5198491" +dependencies = [ + "async-convert", + "backoff", + "base64 0.22.0", + "bytes", + "derive_builder 0.20.0", + "futures", + "rand", + "reqwest 0.12.4", + "reqwest-eventsource", + "secrecy", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", +] + [[package]] name = "async-stream" version = "0.3.5" @@ -203,18 +327,39 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "auto_enums" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1899bfcfd9340ceea3533ea157360ba8fa864354eccbceab58e1006ecab35393" +dependencies = [ + "derive_utils", + "proc-macro2", + "quote", + "syn 2.0.52", ] [[package]] @@ -225,20 +370,20 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", "base64 0.21.5", - "bitflags 1.3.2", "bytes", "futures-util", - "headers", - "http", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "itoa", "matchit", "memchr", @@ -251,44 +396,71 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper", + "sync_wrapper 1.0.1", "tokio", "tokio-tungstenite", "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", + "tracing", ] [[package]] -name = "axum-prometheus" -version = "0.4.0" +name = "axum-extra" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97def327c5481791abb57ac295bfc70f2e1a0727675b7dbf74bd1b27a72b6fd8" +checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" dependencies = [ "axum", "axum-core", "bytes", + "futures-util", + "headers", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "serde", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-prometheus" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b683cbc43010e9a3d72c2f31ca464155ff4f95819e88a32924b0f47a43898978" +dependencies = [ + "axum", + "bytes", "futures", "futures-core", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.0", "matchit", "metrics", "metrics-exporter-prometheus", @@ -296,23 +468,21 @@ dependencies = [ "pin-project", "tokio", "tower", - "tower-http 0.4.0", + "tower-http", ] [[package]] -name = "axum-tracing-opentelemetry" -version = "0.10.0" +name = "backoff" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164b95427e83b79583c7699a72b4a6b485a12bbdef5b5c054ee5ff2296d82f52" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ - "axum", - "futures", - "http", - "opentelemetry", - "tower", - "tower-http 0.3.5", - "tracing", - "tracing-opentelemetry", + "futures-core", + "getrandom", + "instant", + "pin-project-lite", + "rand", + "tokio", ] [[package]] @@ -342,6 +512,12 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.6.0" @@ -368,6 +544,9 @@ name = "bitflags" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] [[package]] name = "bitpacking" @@ -396,23 +575,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "bson" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0aa578035b938855a710ba58d43cfb4d435f3619f99236fb35922a574d6cb1" -dependencies = [ - "base64 0.13.1", - "chrono", - "hex", - "lazy_static", - "linked-hash-map", - "rand 0.7.3", - "serde", - "serde_json", - "uuid 0.8.2", -] - [[package]] name = "bstr" version = "1.7.0" @@ -441,6 +603,42 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +[[package]] +name = "cached" +version = "0.49.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e8e463fceca5674287f32d252fb1d94083758b8709c160efae66d263e5f4eba" +dependencies = [ + "ahash", + "async-trait", + "cached_proc_macro", + "cached_proc_macro_types", + "futures", + "hashbrown 0.14.3", + "instant", + "once_cell", + "thiserror", + "tokio", +] + +[[package]] +name = "cached_proc_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad9f16c0d84de31a2ab7fdf5f7783c14631f7075cf464eb3bb43119f61c9cb2a" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cached_proc_macro_types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" + [[package]] name = "cargo-lock" version = "9.0.0" @@ -450,7 +648,7 @@ dependencies = [ "petgraph", "semver", "serde", - "toml", + "toml 0.7.4", "url", ] @@ -532,7 +730,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -579,6 +777,20 @@ dependencies = [ "unreachable", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", + "tokio-util", +] + [[package]] name = "console" version = "0.15.7" @@ -592,6 +804,12 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "core-foundation" version = "0.9.3" @@ -617,6 +835,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.3.2" @@ -628,23 +861,12 @@ dependencies = [ [[package]] name = "cron" -version = "0.6.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab00a636277f7ea5d8dd92ac7a5099fc9a46e5327bba84d3640b41ae127eada9" +checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07" dependencies = [ "chrono", - "error-chain", - "nom 4.1.1", -] - -[[package]] -name = "cron" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff76b51e4c068c52bfd2866e1567bee7c567ae8f24ada09fd4307019e25eab7" -dependencies = [ - "chrono", - "nom 7.1.3", + "nom", "once_cell", ] @@ -683,14 +905,20 @@ dependencies = [ ] [[package]] -name = "crossbeam-utils" -version = "0.8.16" +name = "crossbeam-queue" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", + "crossbeam-utils", ] +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + [[package]] name = "crunchy" version = "0.2.2" @@ -737,7 +965,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -754,7 +982,7 @@ checksum = "4a076022ece33e7686fb76513518e219cca4fce5750a8ae6d1ce6c0f48fd1af9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -777,6 +1005,16 @@ dependencies = [ "darling_macro 0.14.4", ] +[[package]] +name = "darling" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +dependencies = [ + "darling_core 0.20.8", + "darling_macro 0.20.8", +] + [[package]] name = "darling_core" version = "0.10.2" @@ -805,6 +1043,20 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_core" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 2.0.52", +] + [[package]] name = "darling_macro" version = "0.10.2" @@ -827,6 +1079,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_macro" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +dependencies = [ + "darling_core 0.20.8", + "quote", + "syn 2.0.52", +] + [[package]] name = "dashmap" version = "5.5.3" @@ -837,7 +1100,7 @@ dependencies = [ "hashbrown 0.14.3", "lock_api", "once_cell", - "parking_lot_core", + "parking_lot_core 0.9.8", ] [[package]] @@ -847,21 +1110,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] -name = "deranged" -version = "0.3.8" +name = "der" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", "serde", ] +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro 0.11.2", +] + [[package]] name = "derive_builder" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" dependencies = [ - "derive_builder_macro", + "derive_builder_macro 0.12.0", +] + +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro 0.20.0", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -876,25 +1181,57 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling 0.20.8", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "derive_builder_macro" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +dependencies = [ + "derive_builder_core 0.11.2", + "syn 1.0.109", +] + [[package]] name = "derive_builder_macro" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ - "derive_builder_core", + "derive_builder_core 0.12.0", "syn 1.0.109", ] [[package]] -name = "derive_utils" -version = "0.11.2" +name = "derive_builder_macro" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532b4c15dccee12c7044f1fcad956e98410860b22231e44a3b827464797ca7bf" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core 0.20.0", + "syn 2.0.52", +] + +[[package]] +name = "derive_utils" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] @@ -904,30 +1241,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", "subtle", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "dotenvy" version = "0.15.7" @@ -942,9 +1260,12 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "either" -version = "1.8.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +dependencies = [ + "serde", +] [[package]] name = "email-encoding" @@ -1005,25 +1326,32 @@ dependencies = [ ] [[package]] -name = "error-chain" -version = "0.10.0" +name = "etcetera" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" dependencies = [ - "backtrace", + "cfg-if", + "home", + "windows-sys 0.48.0", ] [[package]] -name = "fallible-iterator" -version = "0.3.0" +name = "event-listener" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" +name = "eventsource-stream" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" +checksum = "74fef4569247a5f429d9156b9d0a2599914385dd189c539334c625d8099d90ab" +dependencies = [ + "futures-core", + "nom", + "pin-project-lite", +] [[package]] name = "fastdivide" @@ -1046,6 +1374,15 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +[[package]] +name = "fid-rs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c28658c0c3420305705adde833a0d2d614207507d013a5f25707553fb2ae2cd" +dependencies = [ + "rayon", +] + [[package]] name = "file-rotate" version = "0.7.5" @@ -1057,13 +1394,10 @@ dependencies = [ ] [[package]] -name = "filenamify" -version = "0.1.0" +name = "finl_unicode" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b781e8974b2cc71ac3c587c881c11ee5fe9a379f43503674e1e1052647593b4c" -dependencies = [ - "regex", -] +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" [[package]] name = "fixedbitset" @@ -1081,6 +1415,17 @@ dependencies = [ "miniz_oxide 0.7.1", ] +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin 0.9.8", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1111,6 +1456,16 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "fs4" version = "0.6.6" @@ -1121,6 +1476,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "futures" version = "0.3.28" @@ -1152,17 +1513,6 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" -[[package]] -name = "futures-enum" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3422d14de7903a52e9dbc10ae05a7e14445ec61890100e098754e120b2bd7b1e" -dependencies = [ - "derive_utils", - "quote", - "syn 1.0.109", -] - [[package]] name = "futures-executor" version = "0.3.28" @@ -1174,12 +1524,36 @@ dependencies = [ "futures-util", ] +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot 0.12.1", +] + [[package]] name = "futures-io" version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" version = "0.3.29" @@ -1188,7 +1562,16 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", +] + +[[package]] +name = "futures-micro" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b460264b3593d68b16a7bc35f7bc226ddfebdf9a1c8db1ed95d5cc6b7168c826" +dependencies = [ + "pin-project-lite", ] [[package]] @@ -1203,6 +1586,12 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + [[package]] name = "futures-util" version = "0.3.29" @@ -1221,6 +1610,15 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "generator" version = "0.7.4" @@ -1244,17 +1642,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.11" @@ -1262,8 +1649,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", + "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", + "wasm-bindgen", ] [[package]] @@ -1272,6 +1661,47 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +[[package]] +name = "git2" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" +dependencies = [ + "bitflags 2.4.0", + "libc", + "libgit2-sys", + "log", + "openssl-probe", + "openssl-sys", + "url", +] + +[[package]] +name = "gitlab" +version = "0.1610.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6c802fc7eb82ff5ba2e4447c5acd0f18ec1b7bb95dbe95b6d77639e25be7cbe" +dependencies = [ + "async-trait", + "base64 0.13.1", + "bytes", + "chrono", + "cron", + "derive_builder 0.11.2", + "futures-util", + "graphql_client", + "http 0.2.11", + "itertools 0.10.5", + "log", + "percent-encoding", + "reqwest 0.11.22", + "serde", + "serde_json", + "serde_urlencoded", + "thiserror", + "url", +] + [[package]] name = "glob" version = "0.3.1" @@ -1280,15 +1710,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata 0.4.6", + "regex-syntax 0.8.2", ] [[package]] @@ -1302,15 +1732,63 @@ dependencies = [ ] [[package]] -name = "graphql-parser" -version = "0.3.0" +name = "graphql-introspection-query" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1abd4ce5247dfc04a03ccde70f87a048458c9356c7e41d21ad8c407b3dde6f2" +checksum = "7f2a4732cf5140bd6c082434494f785a19cfb566ab07d1382c3671f5812fed6d" dependencies = [ - "combine", + "serde", +] + +[[package]] +name = "graphql-parser" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ebc8013b4426d5b81a4364c419a95ed0b404af2b82e2457de52d9348f0e474" +dependencies = [ + "combine 3.8.1", "thiserror", ] +[[package]] +name = "graphql_client" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc16d75d169fddb720d8f1c7aed6413e329e1584079b9734ff07266a193f5bc" +dependencies = [ + "graphql_query_derive", + "serde", + "serde_json", +] + +[[package]] +name = "graphql_client_codegen" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f290ecfa3bea3e8a157899dc8a1d96ee7dd6405c18c8ddd213fc58939d18a0e9" +dependencies = [ + "graphql-introspection-query", + "graphql-parser", + "heck", + "lazy_static", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 1.0.109", +] + +[[package]] +name = "graphql_query_derive" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a755cc59cda2641ea3037b4f9f7ef40471c329f55c1fa2db6fa0bb7ae6c1f7ce" +dependencies = [ + "graphql_client_codegen", + "proc-macro2", + "syn 1.0.109", +] + [[package]] name = "h2" version = "0.3.19" @@ -1322,7 +1800,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", "indexmap 1.9.3", "slab", "tokio", @@ -1330,21 +1808,37 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hash-ids" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9289cbc8064a1c2f505c92d4d17f7fe5050d487728c19cee7936bd204069bc9d" + [[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.14.3" @@ -1366,15 +1860,14 @@ dependencies = [ [[package]] name = "headers" -version = "0.3.8" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.5", "bytes", "headers-core", - "http", + "http 1.1.0", "httpdate", "mime", "sha1", @@ -1382,11 +1875,11 @@ dependencies = [ [[package]] name = "headers-core" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" dependencies = [ - "http", + "http 1.1.0", ] [[package]] @@ -1394,6 +1887,9 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "hermit-abi" @@ -1416,6 +1912,24 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + [[package]] name = "home" version = "0.5.5" @@ -1453,18 +1967,32 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-api-bindings" -version = "0.8.3" +version = "0.11.0" dependencies = [ "anyhow", + "async-openai", + "async-stream", "async-trait", "futures", - "reqwest", + "reqwest 0.12.4", + "reqwest-eventsource", "serde", "serde_json", + "tabby-common", "tabby-inference", - "tokio", "tracing", ] @@ -1475,15 +2003,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] [[package]] name = "http-range-header" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" +checksum = "3ce4ef31cda248bbdb6e6820603b82dfcd9e833db65a43e997a0ccec777d11fe" [[package]] name = "httparse" @@ -1513,9 +2064,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.19", + "http 0.2.11", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -1528,28 +2079,106 @@ dependencies = [ ] [[package]] -name = "hyper-timeout" -version = "0.4.1" +name = "hyper" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ - "hyper", + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.11", + "hyper 0.14.27", + "rustls 0.21.10", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.3.1", + "hyper-util", + "log", + "rustls 0.22.4", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", +] + +[[package]] +name = "hyper-timeout" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper 1.3.1", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", - "hyper", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.3.1", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1609,40 +2238,20 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" dependencies = [ + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata 0.4.6", "same-file", - "thread_local", "walkdir", "winapi-util", ] -[[package]] -name = "include_dir" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" -dependencies = [ - "proc-macro2", - "quote", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -1651,17 +2260,17 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] name = "indexmap" -version = "2.0.1" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", + "serde", ] [[package]] @@ -1722,6 +2331,16 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +[[package]] +name = "iri-string" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f5f6c2df22c009ac44f6f1499308e7a3ac7ba42cd2378475cc691510e1eef1b" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "itertools" version = "0.10.5" @@ -1740,23 +2359,21 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" -[[package]] -name = "job_scheduler" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f368c9c76dde2282714ae32dc274b79c27527a0c06c816f6dda048904d0d7c" -dependencies = [ - "chrono", - "cron 0.6.1", - "uuid 0.8.2", -] - [[package]] name = "jobserver" version = "0.1.26" @@ -1791,31 +2408,32 @@ dependencies = [ [[package]] name = "juniper" -version = "0.15.11" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52adf17d43d0b526eed31fac15d9312941c5c2558ffbfb105811690b96d6e2f1" +checksum = "943306315b1a7a03d27af9dfb0c288d9f4da8830c17df4bceb7d50a47da0982c" dependencies = [ "async-trait", - "bson", + "auto_enums", "chrono", "fnv", "futures", - "futures-enum", "graphql-parser", - "indexmap 1.9.3", + "indexmap 2.2.6", "juniper_codegen", "serde", "smartstring", "static_assertions", - "url", - "uuid 0.8.2", + "void", ] [[package]] -name = "juniper-axum" -version = "0.8.3" +name = "juniper_axum" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f81e883bc6ffb2e5a3cc7276bfe9519c49108bdc1330d5aab1b79cb088f2f26" dependencies = [ "axum", + "bytes", "juniper", "juniper_graphql_ws", "serde", @@ -1824,21 +2442,21 @@ dependencies = [ [[package]] name = "juniper_codegen" -version = "0.15.9" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aee97671061ad50301ba077d054d295e01d31a1868fbd07902db651f987e71db" +checksum = "760dbe46660494d469023d661e8d268f413b2cb68c999975dcc237407096a693" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", + "url", ] [[package]] name = "juniper_graphql_ws" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5526c2f2a9c40f08841dc559971641fdd71c008a265745d18bb0c8b7e105b3" +checksum = "709eb11c716072f5c9fcbfa705dd684bd3c070943102f9fc56ccb812a36ba017" dependencies = [ "juniper", "juniper_subscriptions", @@ -1848,9 +2466,9 @@ dependencies = [ [[package]] name = "juniper_subscriptions" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2983b26a1e12b691c17432aee3881d8bec4a94d6c64bc933c0eaf6d9e3429f13" +checksum = "e6208a839bd4ca2131924a238311d088d6604ea267c0917903392bad7b70a92c" dependencies = [ "futures", "juniper", @@ -1866,11 +2484,28 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "kv" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "620727085ac39ee9650b373fe6d8073a0aee6f99e52a9c72b25f7671078039ab" +dependencies = [ + "pin-project-lite", + "serde", + "serde_json", + "sled", + "thiserror", + "toml 0.5.11", +] + [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] [[package]] name = "lettre" @@ -1878,21 +2513,24 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5aaf628956b6b0852e12ac3505d20d7a12ecc1e32d5ea921f002af4a74036a5" dependencies = [ + "async-trait", "base64 0.21.5", "chumsky", "email-encoding", "email_address", "fastrand 2.0.1", + "futures-io", "futures-util", "hostname", "httpdate", "idna 0.5.0", "mime", "native-tls", - "nom 7.1.3", + "nom", "quoted_printable", "socket2 0.5.5", "tokio", + "tokio-native-tls", "url", ] @@ -1908,6 +2546,20 @@ version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +[[package]] +name = "libgit2-sys" +version = "0.16.2+1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +dependencies = [ + "cc", + "libc", + "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +] + [[package]] name = "libloading" version = "0.7.4" @@ -1918,6 +2570,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + [[package]] name = "libsqlite3-sys" version = "0.27.0" @@ -1929,6 +2587,32 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "libssh2-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "link-cplusplus" version = "1.0.8" @@ -1958,14 +2642,14 @@ checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "llama-cpp-bindings" -version = "0.8.3" +version = "0.11.0" dependencies = [ "async-stream", "async-trait", "cmake", "cxx", "cxx-build", - "derive_builder", + "derive_builder 0.12.0", "futures", "tabby-inference", "tokio", @@ -2002,6 +2686,15 @@ dependencies = [ "tracing-subscriber 0.3.17", ] +[[package]] +name = "louds-rs" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16a91fb20f74b6d9a758a0103a2884af525a2fa34fbfe19f4b3c5482a4a54e9" +dependencies = [ + "fid-rs", +] + [[package]] name = "lru" version = "0.11.1" @@ -2017,15 +2710,6 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" -[[package]] -name = "mach2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" -dependencies = [ - "libc", -] - [[package]] name = "match_cfg" version = "0.1.0" @@ -2056,6 +2740,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + [[package]] name = "measure_time" version = "0.8.2" @@ -2068,9 +2762,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.2" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -2098,53 +2792,40 @@ dependencies = [ [[package]] name = "metrics" -version = "0.21.1" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" +checksum = "2be3cbd384d4e955b231c895ce10685e3d8260c5ccffae898c96c723b0772835" dependencies = [ "ahash", - "metrics-macros", "portable-atomic", ] [[package]] name = "metrics-exporter-prometheus" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5" +checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21" dependencies = [ "base64 0.21.5", - "hyper", - "indexmap 1.9.3", + "hyper 0.14.27", + "indexmap 2.2.6", "ipnet", "metrics", "metrics-util", "quanta", "thiserror", "tokio", - "tracing", -] - -[[package]] -name = "metrics-macros" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.32", ] [[package]] name = "metrics-util" -version = "0.15.1" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e" +checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.13.1", + "hashbrown 0.14.3", "metrics", "num_cpus", "quanta", @@ -2209,16 +2890,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - [[package]] name = "murmurhash32" version = "0.3.0" @@ -2249,15 +2924,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9a91b326434fca226707ed8ec1fd22d4e1c96801abdf10c412afdc7d97116e0" -[[package]] -name = "nom" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a" -dependencies = [ - "memchr", -] - [[package]] name = "nom" version = "7.1.3" @@ -2268,6 +2934,17 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "npm-package-json" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df163f89771bd6654d5e116952b9ab2d0b952cd8e3315ddaa615f6d2bfbb1fde" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "ntapi" version = "0.4.1" @@ -2287,6 +2964,27 @@ dependencies = [ "winapi", ] +[[package]] +name = "nucleo" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5262af4c94921c2646c5ac6ff7900c2af9cbb08dc26a797e18130a7019c039d4" +dependencies = [ + "nucleo-matcher", + "parking_lot 0.12.1", + "rayon", +] + +[[package]] +name = "nucleo-matcher" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf33f538733d1a5a3494b836ba913207f14d9d4a1d3cd67030c5061bdd2cac85" +dependencies = [ + "memchr", + "unicode-segmentation", +] + [[package]] name = "num-bigint" version = "0.4.4" @@ -2298,6 +2996,29 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -2319,6 +3040,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.17" @@ -2326,6 +3058,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2386,10 +3119,49 @@ dependencies = [ ] [[package]] -name = "once_cell" -version = "1.18.0" +name = "octocrab" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "68a8a3df00728324ad654ecd1ed449a60157c55b7ff8c109af3a35989687c367" +dependencies = [ + "arc-swap", + "async-trait", + "base64 0.22.0", + "bytes", + "cfg-if", + "chrono", + "either", + "futures", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-rustls 0.26.0", + "hyper-timeout", + "hyper-util", + "jsonwebtoken", + "once_cell", + "percent-encoding", + "pin-project", + "secrecy", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "snafu", + "tokio", + "tower", + "tower-http", + "tracing", + "url", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oneshot" @@ -2423,7 +3195,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -2464,45 +3236,12 @@ dependencies = [ "opentelemetry_sdk", ] -[[package]] -name = "opentelemetry-otlp" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" -dependencies = [ - "async-trait", - "futures", - "futures-util", - "http", - "opentelemetry", - "opentelemetry-proto", - "prost", - "thiserror", - "tokio", - "tonic", -] - -[[package]] -name = "opentelemetry-proto" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" -dependencies = [ - "futures", - "futures-util", - "opentelemetry", - "prost", - "tonic", - "tonic-build", -] - [[package]] name = "opentelemetry_api" version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" dependencies = [ - "fnv", "futures-channel", "futures-util", "indexmap 1.9.3", @@ -2520,18 +3259,14 @@ checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" dependencies = [ "async-trait", "crossbeam-channel", - "dashmap", - "fnv", "futures-channel", "futures-executor", "futures-util", "once_cell", "opentelemetry_api", "percent-encoding", - "rand 0.8.5", + "rand", "thiserror", - "tokio", - "tokio-stream", ] [[package]] @@ -2549,6 +3284,35 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "package-lock-json-parser" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8707d34f4a67f9c733970b8afc7b82d8623bc0746ff17b460aa6f2ea5ef487d3" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + [[package]] name = "parking_lot" version = "0.12.1" @@ -2556,7 +3320,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core", + "parking_lot_core 0.9.8", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", ] [[package]] @@ -2572,6 +3350,16 @@ dependencies = [ "windows-targets 0.48.0", ] +[[package]] +name = "parse-git-url" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd626725d3855a68fdede6483fae43429129bf246f42d8db598911c8036cf47" +dependencies = [ + "tracing", + "url", +] + [[package]] name = "password-hash" version = "0.5.0" @@ -2579,7 +3367,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -2599,6 +3387,15 @@ dependencies = [ "serde", ] +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -2636,7 +3433,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -2677,7 +3474,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -2692,6 +3489,27 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.27" @@ -2704,22 +3522,18 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2746,67 +3560,13 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes", - "heck", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost", -] - [[package]] name = "psm" version = "0.1.21" @@ -2818,25 +3578,30 @@ dependencies = [ [[package]] name = "quanta" -version = "0.11.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" dependencies = [ "crossbeam-utils", "libc", - "mach2", "once_cell", "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "web-sys", "winapi", ] [[package]] -name = "quote" -version = "1.0.32" +name = "querystring" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "9318ead08c799aad12a55a3e78b82e0b6167271ffd1f627b758891282f739187" + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2847,19 +3612,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -2867,18 +3619,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -2888,16 +3630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -2906,25 +3639,16 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] name = "raw-cpuid" -version = "10.7.0" +version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", ] [[package]] @@ -2949,6 +3673,29 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "redis" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6472825949c09872e8f2c50bde59fcefc17748b6be5c90fd67cd8b4daca73bfd" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "combine 4.6.7", + "futures", + "futures-util", + "itoa", + "percent-encoding", + "pin-project-lite", + "ryu", + "sha1_smol", + "tokio", + "tokio-retry", + "tokio-util", + "url", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -2967,26 +3714,15 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.11", - "redox_syscall 0.2.16", - "thiserror", -] - [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.6", "regex-syntax 0.8.2", ] @@ -3001,9 +3737,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -3046,25 +3782,75 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", + "h2 0.3.19", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-rustls 0.24.2", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", + "rustls 0.21.10", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", "system-configuration", "tokio", + "tokio-rustls 0.24.1", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.0", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-rustls 0.26.0", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.22.4", + "rustls-native-certs", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "system-configuration", + "tokio", "tokio-native-tls", + "tokio-rustls 0.25.0", "tokio-util", "tower-service", "url", @@ -3072,7 +3858,23 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg", + "winreg 0.52.0", +] + +[[package]] +name = "reqwest-eventsource" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "632c55746dbb44275691640e7b40c907c16a2dc1a5842aa98aaec90da6ec6bde" +dependencies = [ + "eventsource-stream", + "futures-core", + "futures-timer", + "mime", + "nom", + "pin-project-lite", + "reqwest 0.12.4", + "thiserror", ] [[package]] @@ -3082,9 +3884,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom 0.2.11", + "getrandom", "libc", - "spin", + "spin 0.9.8", "untrusted", "windows-sys 0.48.0", ] @@ -3112,42 +3914,23 @@ dependencies = [ ] [[package]] -name = "rusqlite" -version = "0.30.0" +name = "rsa" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ - "bitflags 2.4.0", - "chrono", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rusqlite_migration" -version = "1.1.0-beta.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5767f8cb28e54d1ed745f072b72c6e68bfa6179fabb4cd15bdb8575858e301d" -dependencies = [ - "include_dir", - "log", - "rusqlite", - "tokio", - "tokio-rusqlite", -] - -[[package]] -name = "rust-embed" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b68543d5527e158213414a92832d2aab11a84d2571a5eb021ebe22c43aab066" -dependencies = [ - "rust-embed-impl 6.5.0", - "rust-embed-utils 7.5.0", - "walkdir", + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", ] [[package]] @@ -3156,22 +3939,8 @@ version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" dependencies = [ - "rust-embed-impl 8.0.0", - "rust-embed-utils 8.0.0", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4e0f0ced47ded9a68374ac145edd65a6c1fa13a96447b873660b2a568a0fd7" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils 7.5.0", - "shellexpand", - "syn 1.0.109", + "rust-embed-impl", + "rust-embed-utils", "walkdir", ] @@ -3183,18 +3952,8 @@ checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" dependencies = [ "proc-macro2", "quote", - "rust-embed-utils 8.0.0", - "syn 2.0.32", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "7.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512b0ab6853f7e14e3c8754acb43d6f748bb9ced66aa5915a6553ac8213f7731" -dependencies = [ - "sha2", + "rust-embed-utils", + "syn 2.0.52", "walkdir", ] @@ -3257,6 +4016,91 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.3", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.5", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.0", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -3305,6 +4149,26 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "secrecy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" +dependencies = [ + "serde", + "zeroize", +] + [[package]] name = "security-framework" version = "2.9.2" @@ -3345,9 +4209,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.171" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] @@ -3374,22 +4238,21 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ - "indexmap 2.0.1", "itoa", "ryu", "serde", @@ -3434,7 +4297,7 @@ dependencies = [ "rmp-serde", "serde", "serde_json", - "toml", + "toml 0.7.4", "trackable", ] @@ -3448,7 +4311,7 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot", + "parking_lot 0.12.1", "serial_test_derive 2.0.0", ] @@ -3462,7 +4325,7 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot", + "parking_lot 0.12.1", "serial_test_derive 3.0.0", ] @@ -3474,7 +4337,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -3485,7 +4348,7 @@ checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -3499,6 +4362,12 @@ dependencies = [ "digest", ] +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + [[package]] name = "sha2" version = "0.10.8" @@ -3532,15 +4401,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shellexpand" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" -dependencies = [ - "dirs", -] - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -3550,6 +4410,16 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + [[package]] name = "similar" version = "2.3.0" @@ -3587,10 +4457,26 @@ dependencies = [ ] [[package]] -name = "smallvec" -version = "1.10.0" +name = "sled" +version = "0.34.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935" +dependencies = [ + "crc32fast", + "crossbeam-epoch", + "crossbeam-utils", + "fs2", + "fxhash", + "libc", + "log", + "parking_lot 0.11.2", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smartstring" @@ -3603,6 +4489,27 @@ dependencies = [ "version_check", ] +[[package]] +name = "snafu" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75976f4748ab44f6e5332102be424e7c2dc18daeaf7e725f2040c3ebb133512e" +dependencies = [ + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b19911debfb8c2fb1107bc6cb2d61868aaf53a988449213959bb1b5b1ed95f" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "socket2" version = "0.4.9" @@ -3623,11 +4530,248 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sql_query_builder" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b371e496dc275fae413896ef31160eaeb949df66a942245cf3f37fb741389611" + +[[package]] +name = "sqlformat" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" +dependencies = [ + "itertools 0.12.1", + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +dependencies = [ + "ahash", + "atoi", + "byteorder", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.2.6", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls 0.21.10", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "webpki-roots", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +dependencies = [ + "dotenvy", + "either", + "heck", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +dependencies = [ + "atoi", + "base64 0.21.5", + "bitflags 2.4.0", + "byteorder", + "bytes", + "chrono", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +dependencies = [ + "atoi", + "base64 0.21.5", + "bitflags 2.4.0", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", + "urlencoding", +] [[package]] name = "stable_deref_trait" @@ -3660,6 +4804,17 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a8348af2d9fc3258c8733b8d9d8db2e56f54b2363a4b5b81585c7875ed65e65" +[[package]] +name = "stringprep" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +dependencies = [ + "finl_unicode", + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "strsim" version = "0.9.3" @@ -3713,9 +4868,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -3728,6 +4883,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "sysinfo" version = "0.29.8" @@ -3766,30 +4927,31 @@ dependencies = [ [[package]] name = "tabby" -version = "0.8.3" +version = "0.11.0" dependencies = [ "anyhow", "assert-json-diff", "async-stream", "async-trait", "axum", + "axum-extra", "axum-prometheus", - "axum-tracing-opentelemetry", + "cached", "chrono", "clap", "futures", "http-api-bindings", - "hyper", + "hyper 1.3.1", "insta", "lazy_static", "llama-cpp-bindings", "minijinja", "nvml-wrapper", "openssl", - "opentelemetry", - "opentelemetry-otlp", + "parse-git-url", "regex", - "reqwest", + "reqwest 0.12.4", + "reqwest-eventsource", "serde", "serde-jsonlines 0.5.0", "serde_json", @@ -3807,58 +4969,66 @@ dependencies = [ "textdistance", "thiserror", "tokio", - "tower-http 0.4.0", + "tower-http", "tracing", - "tracing-opentelemetry", "tracing-subscriber 0.3.17", "utoipa", "utoipa-swagger-ui", - "uuid 1.6.1", + "uuid", "vergen", ] [[package]] name = "tabby-common" -version = "0.8.3" +version = "0.11.0" dependencies = [ "anyhow", "async-trait", - "filenamify", "glob", "home", "lazy_static", - "regex", - "reqwest", + "reqwest 0.12.4", "serde", "serde-jsonlines 0.4.0", "serde_json", "serdeconv", "tantivy", + "temp_testdir", "thiserror", + "tokio", + "url", "utoipa", - "uuid 1.6.1", + "uuid", ] [[package]] name = "tabby-db" -version = "0.8.3" +version = "0.11.0" dependencies = [ "anyhow", "assert_matches", + "cached", "chrono", - "include_dir", + "hash-ids", "lazy_static", - "rusqlite", - "rusqlite_migration", - "tabby-common", + "sql_query_builder", + "sqlx", + "tabby-db-macros", "tokio", - "tokio-rusqlite", - "uuid 1.6.1", + "uuid", +] + +[[package]] +name = "tabby-db-macros" +version = "0.11.0" +dependencies = [ + "quote", + "syn 2.0.52", ] [[package]] name = "tabby-download" -version = "0.8.3" +version = "0.11.0" dependencies = [ "aim-downloader", "anyhow", @@ -3870,39 +5040,47 @@ dependencies = [ [[package]] name = "tabby-inference" -version = "0.8.3" +version = "0.11.0" dependencies = [ + "anyhow", "async-stream", "async-trait", "dashmap", - "derive_builder", + "derive_builder 0.12.0", "futures", - "regex", "tabby-common", + "trie-rs", ] [[package]] name = "tabby-scheduler" -version = "0.8.3" +version = "0.11.0" dependencies = [ "anyhow", + "async-trait", "cargo-lock", "file-rotate", "ignore", - "job_scheduler", "kdam", + "kv", "lazy_static", + "npm-package-json", + "package-lock-json-parser", "requirements", + "serde", "serde-jsonlines 0.4.0", "serde_json", "serdeconv", "tabby-common", "tantivy", "temp_testdir", + "text-splitter", "tokio", + "tokio-cron-scheduler", "tracing", "tracing-test", "tree-sitter-c", + "tree-sitter-c-sharp", "tree-sitter-cpp", "tree-sitter-go", "tree-sitter-java", @@ -3910,47 +5088,95 @@ dependencies = [ "tree-sitter-python", "tree-sitter-ruby", "tree-sitter-rust", + "tree-sitter-solidity", "tree-sitter-tags", "tree-sitter-typescript", + "yarn-lock-parser", +] + +[[package]] +name = "tabby-schema" +version = "0.11.0" +dependencies = [ + "anyhow", + "async-trait", + "axum", + "base64 0.22.0", + "chrono", + "futures", + "hash-ids", + "juniper", + "lazy_static", + "regex", + "serde", + "strum", + "tabby-common", + "tabby-db", + "thiserror", + "tokio", + "tracing", + "validator", +] + +[[package]] +name = "tabby-search" +version = "0.11.0" +dependencies = [ + "anyhow", + "git2", + "nucleo", + "temp_testdir", ] [[package]] name = "tabby-webserver" -version = "0.8.3" +version = "0.11.0" dependencies = [ "anyhow", + "apalis", "argon2", "assert_matches", "async-trait", "axum", + "axum-extra", "bincode", "chrono", + "fs_extra", "futures", - "hyper", + "gitlab", + "hyper 1.3.1", + "hyper-util", "jsonwebtoken", "juniper", - "juniper-axum", + "juniper_axum", + "juniper_graphql_ws", "lazy_static", "lettre", "mime_guess", + "octocrab", "pin-project", - "reqwest", - "rust-embed 8.0.0", + "querystring", + "reqwest 0.12.4", + "rust-embed", "serde", "serde_json", + "serial_test 3.0.0", "tabby-common", "tabby-db", + "tabby-schema", + "tabby-search", "tarpc", + "temp_testdir", "thiserror", "tokio", - "tokio-cron-scheduler", "tokio-tungstenite", "tower", - "tower-http 0.4.0", + "tower-http", "tracing", "unicase", - "uuid 1.6.1", - "validator", + "url", + "urlencoding", + "uuid", ] [[package]] @@ -4001,7 +5227,7 @@ dependencies = [ "tempfile", "thiserror", "time", - "uuid 1.6.1", + "uuid", "winapi", ] @@ -4060,7 +5286,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d39c5a03100ac10c96e0c8b07538e2ab8b17da56434ab348309b31f23fada77" dependencies = [ - "nom 7.1.3", + "nom", ] [[package]] @@ -4105,7 +5331,7 @@ dependencies = [ "humantime", "opentelemetry", "pin-project", - "rand 0.8.5", + "rand", "serde", "static_assertions", "tarpc-plugins", @@ -4166,6 +5392,21 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "text-splitter" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d5315f993b00372fd909fcf8587535e65f03ac5fd9400f49dd72ce1f6be23cf" +dependencies = [ + "ahash", + "auto_enums", + "either", + "itertools 0.12.1", + "once_cell", + "regex", + "unicode-segmentation", +] + [[package]] name = "textdistance" version = "1.0.2" @@ -4174,22 +5415,22 @@ checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -4204,14 +5445,16 @@ dependencies = [ [[package]] name = "time" -version = "0.3.26" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -4219,16 +5462,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.12" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -4258,7 +5502,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot", + "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", "socket2 0.5.5", @@ -4273,22 +5517,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de2c1fd54a857b29c6cd1846f31903d0ae8e28175615c14a277aed45c58d8e27" dependencies = [ "chrono", - "cron 0.12.0", + "cron", "num-derive", "num-traits", "tokio", "tracing", - "uuid 1.6.1", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", + "uuid", ] [[package]] @@ -4299,7 +5533,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -4319,18 +5553,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ "pin-project", - "rand 0.8.5", + "rand", "tokio", ] [[package]] -name = "tokio-rusqlite" -version = "0.5.0" +name = "tokio-rustls" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc785c98d0c872455381e59be1f33a8f3a6b4e852544212e37601cc2ccb21d39" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "crossbeam-channel", - "rusqlite", + "rustls 0.21.10", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.4", + "rustls-pki-types", "tokio", ] @@ -4359,9 +5603,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", @@ -4387,6 +5631,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + [[package]] name = "toml" version = "0.7.4" @@ -4421,51 +5674,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tonic" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.13.1", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "prost-derive", - "tokio", - "tokio-stream", - "tokio-util", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" -dependencies = [ - "prettyplease", - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.109", -] - [[package]] name = "tower" version = "0.4.13" @@ -4474,11 +5682,8 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand 0.8.5", - "slab", "tokio", "tokio-util", "tower-layer", @@ -4488,43 +5693,26 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.3.5" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "bytes", - "futures-core", "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" -dependencies = [ - "bitflags 1.3.2", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", "http-range-header", "httpdate", + "iri-string", "mime", "mime_guess", "percent-encoding", "pin-project-lite", "tokio", "tokio-util", + "tower", "tower-layer", "tower-service", "tracing", @@ -4563,7 +5751,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -4582,7 +5770,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project", "tracing", ] @@ -4607,7 +5794,6 @@ dependencies = [ "opentelemetry", "tracing", "tracing-core", - "tracing-log", "tracing-subscriber 0.3.17", ] @@ -4722,6 +5908,16 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "tree-sitter-c-sharp" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ab3dc608f34924fa9e10533a95f62dbc14b6de0ddd7107722eba66fe19ae31" +dependencies = [ + "cc", + "tree-sitter", +] + [[package]] name = "tree-sitter-cpp" version = "0.20.3" @@ -4791,6 +5987,15 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "tree-sitter-solidity" +version = "0.0.3" +source = "git+https://github.com/JoranHonig/tree-sitter-solidity?rev=b239a95#b239a95f94cfcc6e7b3e961bc73a28d55e214f02" +dependencies = [ + "cc", + "tree-sitter", +] + [[package]] name = "tree-sitter-tags" version = "0.20.2" @@ -4813,6 +6018,15 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "trie-rs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5096c019d49566aff57593a06e401c7f588da84e9a575d0ed2ac0913f51928c0" +dependencies = [ + "louds-rs", +] + [[package]] name = "try-lock" version = "0.2.4" @@ -4821,17 +6035,17 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 1.1.0", "httparse", "log", - "rand 0.8.5", + "rand", "sha1", "thiserror", "url", @@ -4850,6 +6064,17 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +[[package]] +name = "ulid" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" +dependencies = [ + "getrandom", + "rand", + "web-time", +] + [[package]] name = "unicase" version = "2.7.0" @@ -4880,12 +6105,24 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + [[package]] name = "unicode-width" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + [[package]] name = "unreachable" version = "1.0.0" @@ -4910,6 +6147,7 @@ dependencies = [ "form_urlencoded", "idna 0.5.0", "percent-encoding", + "serde", ] [[package]] @@ -4921,6 +6159,12 @@ dependencies = [ "regex", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "utf-8" version = "0.7.6" @@ -4941,11 +6185,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utoipa" -version = "3.3.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ae74ef183fae36d650f063ae7bde1cacbe1cd7e72b617cbe1e985551878b98" +checksum = "272ebdfbc99111033031d2f10e018836056e4d2c8e2acda76450ec7974269fa7" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.2.6", "serde", "serde_json", "utoipa-gen", @@ -4953,49 +6197,41 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "3.3.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea8ac818da7e746a63285594cce8a96f5e00ee31994e655bd827569cb8b137b" +checksum = "d3c9f4d08338c1bfa70dde39412a040a884c6f318b3d09aaaf3437a1e52027fc" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.32", + "regex", + "syn 2.0.52", ] [[package]] name = "utoipa-swagger-ui" -version = "3.1.3" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062bba5a3568e126ac72049a63254f4cb1da2eb713db0c1ab2a4c76be191db8c" +checksum = "0b39868d43c011961e04b41623e050aedf2cc93652562ff7935ce0f819aaf2da" dependencies = [ "axum", "mime_guess", "regex", - "rust-embed 6.6.1", + "rust-embed", "serde", "serde_json", "utoipa", "zip", ] -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.11", -] - [[package]] name = "uuid" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ - "getrandom 0.2.11", - "rand 0.8.5", + "getrandom", + "rand", "serde", "uuid-macro-internal", ] @@ -5008,7 +6244,7 @@ checksum = "f49e7f3f3db8040a100710a11932239fd30697115e2ba4107080d8252939845e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] [[package]] @@ -5090,9 +6326,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -5108,12 +6344,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -5141,7 +6371,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", "wasm-bindgen-shared", ] @@ -5175,7 +6405,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5188,9 +6418,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -5210,16 +6440,27 @@ dependencies = [ ] [[package]] -name = "which" -version = "4.4.0" +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ - "either", - "libc", - "once_cell", + "js-sys", + "wasm-bindgen", ] +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" + [[package]] name = "winapi" version = "0.3.9" @@ -5426,6 +6667,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wrapcenum-derive" version = "0.4.0" @@ -5447,6 +6698,16 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "yarn-lock-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d0603904f8482a1a2a038c9f89c75b0e435392513c3abd3d284123381bbe51f" +dependencies = [ + "nom", + "thiserror", +] + [[package]] name = "zerocopy" version = "0.7.32" @@ -5464,9 +6725,15 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.52", ] +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + [[package]] name = "zip" version = "0.6.6" diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tabby/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/tabby/package.nix index 1879a9f335..bfda935d4d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/tabby/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/tabby/package.nix @@ -2,6 +2,7 @@ , lib , rustPlatform , fetchFromGitHub +, nix-update-script , stdenv , git @@ -31,7 +32,7 @@ let # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix pname = "tabby"; - version = "0.8.3"; + version = "0.11.0"; availableAccelerations = flatten [ @@ -77,7 +78,7 @@ let # to use a specific device type as it is relying on llama-cpp only being # built to use one type of device. # - # See: https://github.com/TabbyML/tabby/blob/v0.8.3/crates/llama-cpp-bindings/include/engine.h#L20 + # See: https://github.com/TabbyML/tabby/blob/v0.11.0/crates/llama-cpp-bindings/include/engine.h#L20 # llamaccpPackage = llama-cpp.override { rocmSupport = enableRocm; @@ -107,15 +108,17 @@ rustPlatform.buildRustPackage { owner = "TabbyML"; repo = "tabby"; rev = "v${version}"; - hash = "sha256-+5Q5XKfh7+g24y2hBqJC/jNEoRytDdcRdn838xc7c8w="; + hash = "sha256-7PHCvI2/QSFVs6SAXrx8rohU5Wu8QRaqsI1CimnUGQY="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "apalis-0.5.1" = "sha256-hGvVuSy32lSTR5DJdiyf8q1sXbIeuLSGrtyq6m2QlUQ="; "tree-sitter-c-0.20.6" = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4="; "tree-sitter-cpp-0.20.3" = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA="; + "tree-sitter-solidity-0.0.3" = "sha256-b+LthCf+g19sjKeNgXZmUV0RNi94O3u0WmXfgKRpaE0="; }; }; @@ -152,6 +155,8 @@ rustPlatform.buildRustPackage { # file cannot create directory: /var/empty/local/lib64/cmake/Llama doCheck = false; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/TabbyML/tabby"; changelog = "https://github.com/TabbyML/tabby/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/tailscale-nginx-auth/package.nix index 8f62b21a5d..51b992bf7d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/tailscale-nginx-auth/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/tailscale-nginx-auth/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub }: let - version = "1.64.0"; + version = "1.66.0"; in buildGoModule { pname = "tailscale-nginx-auth"; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-qBZoiqhBMBNbeytDBH+sOxxsVjOcH6vnSgIufx+Op04="; + hash = "sha256-ZI9/YlVHbdvEwD0YHWfUhciU2x4wp4GzTanwDvuIpz4="; }; - vendorHash = "sha256-pYeHqYd2cCOVQlD1r2lh//KC+732H0lj1fPDBr+W8qA="; + vendorHash = "sha256-Hd77xy8stw0Y6sfk3/ItqRIbM/349M/4uf0iNy1xJGw="; CGO_ENABLED = 0; @@ -38,6 +38,6 @@ buildGoModule { description = "Tool that allows users to use Tailscale Whois authentication with NGINX as a reverse proxy."; license = licenses.bsd3; mainProgram = "tailscale.nginx-auth"; - maintainers = with maintainers; [ danderson phaer ]; + maintainers = with maintainers; [ phaer ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ta/taler-exchange/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/taler-exchange/package.nix new file mode 100644 index 0000000000..d5139dafaa --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ta/taler-exchange/package.nix @@ -0,0 +1,97 @@ +{ + lib, + stdenv, + fetchgit, + curl, + gnunet, + jansson, + libgcrypt, + libmicrohttpd, + libsodium, + libunistring, + pkg-config, + postgresql, + autoreconfHook, + python3, + recutils, + wget, + jq, + gettext, + texinfo, +}: + +let + version = "0.10.2"; +in +stdenv.mkDerivation { + pname = "taler-exchange"; + inherit version; + + src = fetchgit { + url = "https://git.taler.net/exchange.git"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-dl8lZ7uKUr+KSUaT4xlkaX3W5UoW2Zfu/0iVXvLejnA="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libgcrypt + libmicrohttpd + jansson + libsodium + postgresql + curl + recutils + gettext + texinfo # Fix 'makeinfo' is missing on your system. + libunistring + python3.pkgs.jinja2 + # jq is necessary for some tests and is checked by configure script + jq + ]; + + propagatedBuildInputs = [ gnunet ]; + + # From ./bootstrap + preAutoreconf = '' + ./contrib/gana-generate.sh + pushd contrib + find wallet-core/aml-backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext + truncate -s -2 Makefile.am.ext + cat Makefile.am.in Makefile.am.ext >> Makefile.am + popd + ''; + + enableParallelBuilding = true; + + doInstallCheck = true; + + nativeCheckInputs = [ + wget + curl + ]; + + checkTarget = "check"; + + meta = with lib; { + description = '' + Taler is an electronic payment system providing the ability to pay + anonymously using digital cash. Taler consists of a network protocol + definition (using a RESTful API over HTTP), a Exchange (which creates + digital coins), a Wallet (which allows customers to manage, store and + spend digital coins), and a Merchant website which allows customers to + spend their digital coins. Naturally, each Merchant is different, but + Taler includes code examples to help Merchants integrate Taler as a + payment system. + ''; + homepage = "https://taler.net/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ astro ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ta/taler-merchant/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/taler-merchant/package.nix new file mode 100644 index 0000000000..59fb722b72 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ta/taler-merchant/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchgit, + gnunet, + qrencode, + taler-exchange, + libtool, + pkg-config, + autoreconfHook, + jq, +}: + +let + version = "0.10.2"; + + taler-wallet-core = fetchgit { + url = "https://git.taler.net/wallet-core.git"; + rev = "v${version}"; + hash = "sha256-jC8XhcHZxv7ww+wspJUqTq6x6FIeEehQmE03ttJZWT4="; + }; +in +stdenv.mkDerivation { + pname = "taler-merchant"; + inherit version; + + src = fetchgit { + url = "https://git.taler.net/merchant.git"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-WY5Fk5HcVjxsnqt69m8E9ikW+nQDkCuKtT1CTsupz5c="; + }; + + postUnpack = '' + ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/ + ''; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = taler-exchange.buildInputs ++ [ + qrencode + taler-exchange + # for ltdl.h + libtool + ]; + + propagatedBuildInputs = [ gnunet ]; + + # From ./bootstrap + preAutoreconf = '' + pushd contrib + find wallet-core/backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext + truncate -s -2 Makefile.am.ext + cat Makefile.am.in Makefile.am.ext >> Makefile.am + popd + ''; + + configureFlags = [ + "--with-gnunet=${gnunet}" + "--with-exchange=${taler-exchange}" + ]; + + enableParallelBuilding = true; + + doInstallCheck = true; + + nativeCheckInputs = [ jq ]; + + checkTarget = "check"; + + meta = with lib; { + description = '' + This is the GNU Taler merchant backend. It provides the logic that should run + at every GNU Taler merchant. The GNU Taler merchant is a RESTful backend that + can be used to setup orders and process payments. This component allows + merchants to receive payments without invading the customers' privacy. Of + course, this applies mostly for digital goods, as the merchant does not need + to know the customer's physical address. + ''; + homepage = "https://taler.net/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ astro ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tartan/default.nix b/third_party/nixpkgs/pkgs/by-name/ta/tartan/package.nix similarity index 67% rename from third_party/nixpkgs/pkgs/development/tools/analysis/tartan/default.nix rename to third_party/nixpkgs/pkgs/by-name/ta/tartan/package.nix index 1106d017cb..d7d4d4a6f7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tartan/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/tartan/package.nix @@ -1,25 +1,26 @@ -{ stdenv -, lib -, fetchFromGitLab -, meson -, ninja -, pkg-config -, llvmPackages -, gobject-introspection -, glib -, unstableGitUpdater +{ + stdenv, + lib, + fetchFromGitLab, + meson, + ninja, + pkg-config, + llvmPackages, + gobject-introspection, + glib, + unstableGitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tartan"; - version = "unstable-2021-12-23"; + version = "0.3.0-unstable-2023-10-11"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "tartan"; repo = "tartan"; - rev = "bd4ea95d8b3ce1258491e9fac7fcc37d2b241a16"; - sha256 = "l3duPt8Kh/JljzOV+Dm26XbS7gZ+mmFfYUYofWSJRyo="; + rev = "4a7c945535d746d3d874ebebc0217715d674a862"; + hash = "sha256-DYvbBGgytf1JOYKejZB+ReehD8iKm1n4BhMmLQURay0="; }; nativeBuildInputs = [ @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "Tools and Clang plugins for developing code with GLib"; - homepage = "https://freedesktop.org/wiki/Software/tartan"; + homepage = "https://gitlab.freedesktop.org/tartan/tartan"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ jtojnar ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ta/taskwarrior3/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/taskwarrior3/package.nix index 5b9372189c..dd5f038b15 100644 --- a/third_party/nixpkgs/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ta/taskwarrior3/package.nix @@ -12,17 +12,18 @@ python3, xdg-utils, installShellFiles, + darwin, }: stdenv.mkDerivation rec { - pname = "taskwarrior"; - version = "3.0.0-unstable-2024-04-07"; - src = fetchFromGitHub { - owner = "GothenburgBitFactory"; - repo = "taskwarrior"; - rev = "fd306712b85dda3ea89de4e617aebeb98b2ede80"; - fetchSubmodules = true; - sha256 = "sha256-vzfHq/LHfnTx6CVGFCuO6W5aSqj1jVqldMdmyciSDDk="; - }; + pname = "taskwarrior"; + version = "3.0.2"; + src = fetchFromGitHub { + owner = "GothenburgBitFactory"; + repo = "taskwarrior"; + rev = "v3.0.2"; + hash = "sha256-vN3X6vLuD4Fw9wpEUYLf8sboA5GIcdP5EFb41KS6d5s="; + fetchSubmodules = true; + }; postPatch = '' substituteInPlace src/commands/CmdNews.cpp \ @@ -38,6 +39,10 @@ stdenv.mkDerivation rec { cargo rustc rustPlatform.cargoSetupHook + ] ++ lib.optionals stdenv.isDarwin [ + # darwin dependencies + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; doCheck = true; @@ -50,7 +55,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}-cargo-deps"; inherit src; sourceRoot = src.name; - hash = "sha256-zQca/1tI/GUCekKhrg2iSL+h69SH6Ttsj3MqwDKj8HQ="; + hash = "sha256-4hdM9LgDa47ZYcX30HXvixIRy0xaahG4XBqPiUM+IUM="; }; cargoRoot = "./"; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/by-name/td/tdl/package.nix b/third_party/nixpkgs/pkgs/by-name/td/tdl/package.nix index 3a8e5608a8..5b82f368df 100644 --- a/third_party/nixpkgs/pkgs/by-name/td/tdl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/td/tdl/package.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "tdl"; - version = "0.16.2"; + version = "0.17.0"; src = fetchFromGitHub { owner = "iyear"; repo = "tdl"; rev = "v${version}"; - hash = "sha256-YbyTUmYXcltmvJVatS1TLkqZli7sba4ARi9bRkcd07M="; + hash = "sha256-bIDgxCv9jSN3OxS0FydFwfJYr8BUQ+8U/0s2BkM4M70="; }; - vendorHash = "sha256-WFhwmV4zlYDQA2Xow51m/AQ9GwUwr26rW3WMldduLl8="; + vendorHash = "sha256-uCQ5HixoChppLO9kJvMWVENhHDnQsEe/qiJnbwUjE70="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/td/tdnf/package.nix b/third_party/nixpkgs/pkgs/by-name/td/tdnf/package.nix new file mode 100644 index 0000000000..e6c339d1e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/td/tdnf/package.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, curl +, gpgme +, libsolv +, libxml2 +, pkg-config +, python3 +, rpm +, sqlite +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tdnf"; + version = "3.5.6"; + + src = fetchFromGitHub { + owner = "vmware"; + repo = "tdnf"; + rev = "v${finalAttrs.version}"; + hash = "sha256-gj0IW0EwWBXi2s7xFdghop8f1lMhkUJVAkns5nnl7sg="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + + buildInputs = [ + curl.dev + gpgme.dev + libsolv + libxml2.dev + sqlite.dev + ]; + + propagatedBuildInputs = [ + rpm + ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=$out" + "-DCMAKE_INSTALL_FULL_SYSCONDIR=$out/etc" + "-DCMAKE_INSTALL_SYSCONFDIR=$out/etc" + "-DSYSTEMD_DIR=$out/lib/systemd/system" + ]; + + # error: format not a string literal and no format arguments [-Werror=format-security] + hardeningDisable = [ "format" ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'SYSCONFDIR /etc' 'SYSCONFDIR $out/etc' \ + --replace-fail '/etc/motdgen.d' '$out/etc/motdgen.d' + substituteInPlace client/tdnf.pc.in \ + --replace-fail 'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_FULL_LIBDIR@' + substituteInPlace tools/cli/lib/tdnf-cli-libs.pc.in \ + --replace-fail 'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_FULL_LIBDIR@' + ''; + + # remove binaries used for testing from the final output + postInstall = "rm $out/bin/*test"; + + meta = { + description = "Tiny Dandified Yum"; + homepage = "https://github.com/vmware/tdnf"; + changelog = "https://github.com/vmware/tdnf/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ gpl2 lgpl21 ]; + maintainers = [ lib.maintainers.malt3 ]; + mainProgram = "tdnf"; + # rpm only supports linux + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/te/tecoc/package.nix b/third_party/nixpkgs/pkgs/by-name/te/tecoc/package.nix index a5531b3aa8..a28e814c90 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/tecoc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/tecoc/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tecoc"; - version = "unstable-2023-06-21"; + version = "0-unstable-2023-06-21"; src = fetchFromGitHub { owner = "blakemcbride"; diff --git a/third_party/nixpkgs/pkgs/by-name/te/templ/package.nix b/third_party/nixpkgs/pkgs/by-name/te/templ/package.nix index f3442c0de4..a7a74e993f 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/templ/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/templ/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "templ"; - version = "0.2.663"; + version = "0.2.680"; src = fetchFromGitHub { owner = "a-h"; repo = "templ"; rev = "v${version}"; - hash = "sha256-TU8QG6OmUzSNDAX9W0Ntmz5cucLqVQeTskfnJbm/YM0="; + hash = "sha256-n5OSbVc+UhN0WeWzG1Lop5oX5Zc/hlp/aaBoFjpua64="; }; - vendorHash = "sha256-Upd5Wq4ajsyOMDiAWS2g2iNO1sm1XJc43AFQLIo5eDM="; + vendorHash = "sha256-zYW2dM+g9RfiOrNjhIsfszy3yqTcAKzGbDPpQh5TP6E="; subPackages = [ "cmd/templ" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/te/tenki/package.nix b/third_party/nixpkgs/pkgs/by-name/te/tenki/package.nix index 406e49c512..b4a1d22a72 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/tenki/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/tenki/package.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "tenki"; - version = "1.7.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ckaznable"; repo = "tenki"; rev = "v${version}"; - hash = "sha256-FlygsPvlftlCrAuViB/MpI9m10o1iVtfJ8djn5ycHa4="; + hash = "sha256-+04rQt+hQQan85k1AxnVaQN2xfWWrJII+GdLMSn+cck="; }; - cargoHash = "sha256-mWxdZilKbC7+OygCmPB09kZJdtGbUqrGpaEZG/Bn5QQ="; + cargoHash = "sha256-/ygw6bCJEeTmrG8XXMhoMl25NHK4E6mmML/V+E8e6UE="; meta = with lib; { description = "tty-clock with weather effect"; diff --git a/third_party/nixpkgs/pkgs/by-name/te/tenv/package.nix b/third_party/nixpkgs/pkgs/by-name/te/tenv/package.nix index 37724fe2d1..ac334c508d 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/tenv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/tenv/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tenv"; - version = "1.7.1"; + version = "1.10.1"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; rev = "v${version}"; - hash = "sha256-Iq1yv80qiQxISS0r1ShjJOXVtp/ryodgih1m3ykI8+0="; + hash = "sha256-c283egT5KOcR+PjwWnKkCI3RKr+Tqa6a+ORsjq4wuXs="; }; - vendorHash = "sha256-NMkR90+kJ3VsuhF45l5K68uOqenPfINZDEE0GfjULro="; + vendorHash = "sha256-GAUpQbZfaF3N2RaQO0ZDe8DywOZwIfXNImsZCk6iB+U="; # Tests disabled for requiring network access to release.hashicorp.com doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/te/termsonic/package.nix b/third_party/nixpkgs/pkgs/by-name/te/termsonic/package.nix new file mode 100644 index 0000000000..2dfb146775 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/te/termsonic/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchzip, + pkg-config, + alsa-lib +}: +buildGoModule rec { + name = "termsonic"; + version = "0-unstable-2024-02-02"; + + src = fetchzip { + url = "https://git.sixfoisneuf.fr/termsonic/snapshot/termsonic-7a3aabee59e1a427aff755fc69759265ad9d0adc.zip"; + hash = "sha256-C5/4679qw4CAdUt9lXpPIR3yejrPdddvmjgbpLF3SvA="; + }; + + vendorHash = "sha256-wCtQD9f1mbN/0qUZnamPoVn9p4Ra5dQ34vlT+XjPF3k="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ alsa-lib ]; + + strictDeps = true; + + meta = with lib; { + homepage = "https://git.sixfoisneuf.fr/termsonic"; + description = "A Subsonic client running in your terminal"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + mainProgram = "termsonic"; + maintainers = with maintainers; [ mksafavi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terraform-compliance/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix rename to third_party/nixpkgs/pkgs/by-name/te/terraform-compliance/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/te/terraform-plugin-docs/package.nix b/third_party/nixpkgs/pkgs/by-name/te/terraform-plugin-docs/package.nix index e1468d2513..5e893a6e6e 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/terraform-plugin-docs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "terraform-plugin-docs"; - version = "0.18.0"; + version = "0.19.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform-plugin-docs"; rev = "refs/tags/v${version}"; - sha256 = "sha256-8rNoH01fWNGWH3cSqqFCGetl5S/d3yVh+pmIzg79g3k="; + sha256 = "sha256-1ZJPy/kRYKcwr/k/u8ux5Eo1LIkrNpVyXrd9ff+Na6I="; }; - vendorHash = "sha256-9ddxgceILBP1NqbGr08cfdPs0BHSjQWN0MkFA5oqyPE="; + vendorHash = "sha256-dBDvh3aIHu8iGwFt+29SdCl1gICwO7LnxQ7Wux+2tOk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terragrunt/package.nix similarity index 85% rename from third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix rename to third_party/nixpkgs/pkgs/by-name/te/terragrunt/package.nix index a2f8fd2fba..36ed4f13f8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/terragrunt/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.56.5"; + version = "0.58.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aKgcXLxFZBoomrKJFmUr/XfxHmNrkvK2IlfTR2dJNY0="; + hash = "sha256-Bcn3wwhAzbdO3XBrLKApAurpnpRcVJLWo6C9x/n3Nz0="; }; - vendorHash = "sha256-joEmkFtoVxqlVrgl2mtJN9Cyr3YdnT6tBjaSXj9z2WU="; + vendorHash = "sha256-ZuOgbwE32yFXPn+AqlQ397a4UZ+MWuj5ppCrDGnC3og="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/package.json b/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/package.json deleted file mode 100644 index 65bf8ea63f..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/package.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "tetrio-desktop", - "version": "9.0.0", - "author": { - "name": "osk", - "email": "me@osk.sh" - }, - "license": "© osk 2019-2024. All Rights Reserved.", - "homepage": "https://tetr.io/", - "main": "main.js", - "description": "Puzzle together in this modern yet familiar online stacker!", - "dependencies": { - "discord-rich-presence": "0.0.8", - "electron-store": "^8.1.0", - "image-size": "^1.1.1", - "node-fetch": "2.6.1", - "openpgp": "^5.11.1", - "systeminformation": "^5.22.0", - "whatwg-url": "^14.0.0", - "xmldom": "^0.6.0" - } -} diff --git a/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/package.nix index c3749de57d..f07299b37c 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/package.nix @@ -6,7 +6,7 @@ , callPackage , addOpenGLRunpath , electron -, withTetrioPlus ? true +, withTetrioPlus ? false , tetrio-plus ? null }: @@ -28,7 +28,12 @@ stdenv.mkDerivation (finalAttrs: { let tetrio-plus' = if tetrio-plus == null - then callPackage ./tetrio-plus.nix { tetrio-src = finalAttrs.src; } + then + callPackage ./tetrio-plus.nix + { + tetrio-src = finalAttrs.src; + tetrio-version = finalAttrs.version; + } else tetrio-plus; asarPath = diff --git a/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix b/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix index a0c67265e5..a9c6f6080b 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix @@ -14,16 +14,17 @@ , asar , tetrio-src +, tetrio-version }: let - version = "unstable-2024-03-31"; + version = "0.27.2"; src = fetchFromGitLab { owner = "UniQMG"; repo = "tetrio-plus"; - rev = "b13d476a162a2aec4ca0def29eb7a4ada9ebf523"; - hash = "sha256-bZwx0r2lu4Ed/pYRvNog6IIok/HMoK+UeDIQctggUEs="; + rev = "electron-v${version}-tetrio-v${lib.versions.major tetrio-version}"; + hash = "sha256-PvTivTt1Zuvk5gaCcQDcIBFsUf/ZG7TJYXqm0NP++Bw="; fetchSubmodules = true; # tetrio-plus uses this info for displaying its version, @@ -52,7 +53,7 @@ let sourceRoot = "${src.name}/tpsecore"; - cargoHash = "sha256-14UjPSlfiuf696cqy8+fz3SmfmFoGQlEDg9obP0EKXg="; + cargoHash = "sha256-K9l8wQOtjf3l8gZMMdVnaNrgzVWGl62iBBcpA+ulJbw="; nativeBuildInputs = [ wasm-pack @@ -81,8 +82,8 @@ let }; offlineCache = fetchYarnDeps { - yarnLock = ./yarn.lock; - hash = "sha256-VYUh9y6PRc1OTLELkqCxP89Xbesv3Nu+eUq6fkuoQHE="; + yarnLock = "${src}/resources/desktop-ci/yarn.lock"; + hash = "sha256-LfUC2bkUX+sFq3vMMOC1YVYbpDxUSnLO9GiKdoQBdAw="; }; in @@ -107,8 +108,8 @@ stdenv.mkDerivation (finalAttrs: { # Install custom package.json/yarn.lock that describe the additional node # dependencies that tetrio-plus needs to run, and install them in our output - install -m644 ${./package.json} package.json - install -m644 ${./yarn.lock} yarn.lock + cp ../resources/desktop-ci/yarn.lock . + patch package.json ../resources/desktop-ci/package.json.diff export HOME=$(mktemp -d) yarn config --offline set yarn-offline-mirror ${offlineCache} @@ -127,6 +128,11 @@ stdenv.mkDerivation (finalAttrs: { cp -r $src out/tetrioplus chmod -R u+w out/tetrioplus + # Disable the uninstall button in the tetrio-plus popup, + # as it doesn't make sense to mutably uninstall it in a nix package + substituteInPlace out/tetrioplus/desktop-manifest.js \ + --replace-fail '"show_uninstaller_button": true' '"show_uninstaller_button": false' + # We don't need the tpsecore source code bundled rm -rf out/tetrioplus/tpsecore/ # since we install the compiled version here diff --git a/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/yarn.lock b/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/yarn.lock deleted file mode 100644 index 9c6cd6519a..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/yarn.lock +++ /dev/null @@ -1,348 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== - dependencies: - ajv "^8.0.0" - -ajv@^8.0.0, ajv@^8.6.3: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" - integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -asn1.js@^5.0.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" - integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== - dependencies: - bn.js "^4.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - safer-buffer "^2.1.0" - -atomically@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz#c07a0458432ea6dbc9a3506fffa424b48bccaafe" - integrity sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w== - -bindings@^1.3.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" - integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== - dependencies: - file-uri-to-path "1.0.0" - -bn.js@^4.0.0: - version "4.12.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" - integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== - -conf@^10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/conf/-/conf-10.2.0.tgz#838e757be963f1a2386dfe048a98f8f69f7b55d6" - integrity sha512-8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg== - dependencies: - ajv "^8.6.3" - ajv-formats "^2.1.1" - atomically "^1.7.0" - debounce-fn "^4.0.0" - dot-prop "^6.0.1" - env-paths "^2.2.1" - json-schema-typed "^7.0.3" - onetime "^5.1.2" - pkg-up "^3.1.0" - semver "^7.3.5" - -debounce-fn@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-4.0.0.tgz#ed76d206d8a50e60de0dd66d494d82835ffe61c7" - integrity sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ== - dependencies: - mimic-fn "^3.0.0" - -discord-rich-presence@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/discord-rich-presence/-/discord-rich-presence-0.0.8.tgz#7a2b41ff87a278e8a2c8835cd91c9890d6b9fbdd" - integrity sha512-IpVMPjv15C9UvppxvrrGdv6bzQHOW1P1vLoMH15HvdJwGJ3dBd2bnrJ63Uy36YRUfrAMxGLiwUDHncvC8AuPaQ== - dependencies: - discord-rpc "github:discordjs/rpc" - -"discord-rpc@github:discordjs/rpc": - version "4.0.1" - resolved "https://codeload.github.com/discordjs/rpc/tar.gz/9e7de2a6d917591f10a66389e62e1dc053c04fec" - dependencies: - node-fetch "^2.6.1" - ws "^7.3.1" - optionalDependencies: - register-scheme "github:devsnek/node-register-scheme" - -dot-prop@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083" - integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA== - dependencies: - is-obj "^2.0.0" - -electron-store@^8.1.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-8.2.0.tgz#114e6e453e8bb746ab4ccb542424d8c881ad2ca1" - integrity sha512-ukLL5Bevdil6oieAOXz3CMy+OgaItMiVBg701MNlG6W5RaC0AHN7rvlqTCmeb6O7jP0Qa1KKYTE0xV0xbhF4Hw== - dependencies: - conf "^10.2.0" - type-fest "^2.17.0" - -env-paths@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" - integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== - -fast-deep-equal@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -file-uri-to-path@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" - integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== - -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - -image-size@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.1.1.tgz#ddd67d4dc340e52ac29ce5f546a09f4e29e840ac" - integrity sha512-541xKlUw6jr/6gGuk92F+mYM5zaFAc5ahphvkqvNe2bQ6gVBkd6bfrmVJ2t4KDAfikAYZyIqTnktX3i6/aQDrQ== - dependencies: - queue "6.0.2" - -inherits@^2.0.1, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== - -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -json-schema-typed@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz#23ff481b8b4eebcd2ca123b4fa0409e66469a2d9" - integrity sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A== - -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mimic-fn@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" - integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== - -minimalistic-assert@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== - -node-addon-api@^1.3.0: - version "1.7.2" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" - integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== - -node-fetch@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== - -node-fetch@^2.6.1: - version "2.7.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" - integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== - dependencies: - whatwg-url "^5.0.0" - -onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -openpgp@^5.11.1: - version "5.11.1" - resolved "https://registry.yarnpkg.com/openpgp/-/openpgp-5.11.1.tgz#97f3a1dfb3d3573a0a73fe2efb29e6b1f8fefb1c" - integrity sha512-TynUBPuaSI7dN0gP+A38CjNRLxkOkkptefNanalDQ71BFAKKm+dLbksymSW5bUrB7RcAneMySL/Y+r/TbLpOnQ== - dependencies: - asn1.js "^5.0.0" - -p-limit@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ== - -pkg-up@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" - integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== - dependencies: - find-up "^3.0.0" - -punycode@^2.1.0, punycode@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" - integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== - -queue@6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65" - integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA== - dependencies: - inherits "~2.0.3" - -"register-scheme@github:devsnek/node-register-scheme": - version "0.0.2" - resolved "https://codeload.github.com/devsnek/node-register-scheme/tar.gz/e7cc9a63a1f512565da44cb57316d9fb10750e17" - dependencies: - bindings "^1.3.0" - node-addon-api "^1.3.0" - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -safer-buffer@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -semver@^7.3.5: - version "7.6.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" - integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== - dependencies: - lru-cache "^6.0.0" - -systeminformation@^5.22.0: - version "5.22.7" - resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.22.7.tgz#9a20810c7eacad4aebe7591cb7c78c0dd96dbd1a" - integrity sha512-AWxlP05KeHbpGdgvZkcudJpsmChc2Y5Eo/GvxG/iUA/Aws5LZKHAMSeAo+V+nD+nxWZaxrwpWcnx4SH3oxNL3A== - -tr46@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.0.0.tgz#3b46d583613ec7283020d79019f1335723801cec" - integrity sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g== - dependencies: - punycode "^2.3.1" - -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== - -type-fest@^2.17.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" - integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== - -webidl-conversions@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" - integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== - -whatwg-url@^14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.0.0.tgz#00baaa7fd198744910c4b1ef68378f2200e4ceb6" - integrity sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw== - dependencies: - tr46 "^5.0.0" - webidl-conversions "^7.0.0" - -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== - dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" - -ws@^7.3.1: - version "7.5.9" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" - integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== - -xmldom@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f" - integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== diff --git a/third_party/nixpkgs/pkgs/by-name/te/textsnatcher/package.nix b/third_party/nixpkgs/pkgs/by-name/te/textsnatcher/package.nix index 21b75c31a3..670c87faeb 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/textsnatcher/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/textsnatcher/package.nix @@ -4,7 +4,7 @@ , meson , ninja , vala -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , pantheon , libhandy @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { vala pkg-config desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/th/the-powder-toy/package.nix b/third_party/nixpkgs/pkgs/by-name/th/the-powder-toy/package.nix new file mode 100644 index 0000000000..ee3265ccd3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/th/the-powder-toy/package.nix @@ -0,0 +1,75 @@ +{ + bzip2, + Cocoa, + copyDesktopItems, + curl, + fetchFromGitHub, + fftwFloat, + jsoncpp, + lib, + libpng, + lua, + luajit, + meson, + ninja, + pkg-config, + SDL2, + stdenv, + zlib, +}: +stdenv.mkDerivation rec { + pname = "the-powder-toy"; + version = "98.2.365"; + + src = fetchFromGitHub { + owner = "The-Powder-Toy"; + repo = "The-Powder-Toy"; + rev = "refs/tags/v${version}"; + hash = "sha256-S2aUa25EnUfX6ShW6D+wHrsTLxTcCFcZ/uLE9EWGu4Q="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ] ++ lib.optional stdenv.isLinux copyDesktopItems; + + buildInputs = [ + bzip2 + curl + fftwFloat + jsoncpp + libpng + lua + luajit + SDL2 + zlib + ] ++ lib.optional stdenv.isDarwin Cocoa; + + mesonFlags = [ "-Dworkaround_elusive_bzip2=false" ]; + + installPhase = '' + runHook preInstall + + install -Dm 755 powder $out/bin/powder + + mkdir -p $out/share + mv ../resources $out/share + + runHook postInstall + ''; + + desktopItems = [ "resources/powder.desktop" ]; + + meta = with lib; { + description = "A free 2D physics sandbox game"; + homepage = "https://powdertoy.co.uk/"; + platforms = platforms.unix; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + abbradar + siraben + ]; + mainProgram = "powder"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/th/themix-gui/package.nix b/third_party/nixpkgs/pkgs/by-name/th/themix-gui/package.nix index c73724a0ca..8393884cb5 100644 --- a/third_party/nixpkgs/pkgs/by-name/th/themix-gui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/th/themix-gui/package.nix @@ -8,7 +8,7 @@ , gtk3 , python3 , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -33,7 +33,7 @@ stdenv.mkDerivation { gobject-introspection py sassc - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -72,7 +72,7 @@ stdenv.mkDerivation { homepage = "https://github.com/themix-project/themix-gui"; license = lib.licenses.gpl3Only; mainProgram = "themix-gui"; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tilemaker/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tilemaker/package.nix index 6a06e17f1f..7e7714635c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tilemaker/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ti/tilemaker/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Make OpenStreetMap vector tiles without the stack"; homepage = "https://tilemaker.org/"; - changelog = "https://github.com/systemed/tilemaker/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/systemed/tilemaker/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.free; # FTWPL maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tilix/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tilix/package.nix index 2e0bdad0be..4394a2a52f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tilix/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ti/tilix/package.nix @@ -13,7 +13,7 @@ , gettext , gtkd , libsecret -, wrapGAppsHook +, wrapGAppsHook3 , libunwind , appstream , nixosTests @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 appstream ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tiny-dfr/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tiny-dfr/package.nix new file mode 100644 index 0000000000..ab1d5298ec --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ti/tiny-dfr/package.nix @@ -0,0 +1,40 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config +, cairo, gdk-pixbuf, glib, libinput, libxml2, pango, udev +}: + +rustPlatform.buildRustPackage rec { + pname = "tiny-dfr"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "WhatAmISupposedToPutHere"; + repo = "tiny-dfr"; + rev = "v${version}"; + hash = "sha256-oawKYrfXAQ5RFMdUCG7F12wHcnFif++44s2KsX9ns6U="; + }; + + cargoHash = "sha256-QOkztErJLFXPxCb8MvaXi7jGXeI5A0q8LwZtYddzUZE="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo gdk-pixbuf glib libinput libxml2 pango udev ]; + + postConfigure = '' + substituteInPlace etc/systemd/system/tiny-dfr.service \ + --replace-fail /usr/bin $out/bin + substituteInPlace src/*.rs --replace-quiet /usr/share $out/share + ''; + + postInstall = '' + cp -R etc $out/lib + cp -R share $out + ''; + + meta = with lib; { + homepage = "https://github.com/WhatAmISupposedToPutHere/tiny-dfr"; + description = "The most basic dynamic function row daemon possible"; + license = [ licenses.asl20 licenses.mit ]; + mainProgram = "tiny-dfr"; + maintainers = [ maintainers.qyliss ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/Cargo.lock index 8880b3dbab..d841971169 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/Cargo.lock @@ -28,6 +28,18 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "1.1.3" @@ -37,6 +49,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -121,6 +139,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" + [[package]] name = "arrayref" version = "0.3.7" @@ -625,7 +649,7 @@ version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ - "encode_unicode", + "encode_unicode 0.3.6", "lazy_static", "libc", "windows-sys 0.52.0", @@ -925,6 +949,16 @@ dependencies = [ "dirs-sys", ] +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + [[package]] name = "dirs-sys" version = "0.4.1" @@ -937,6 +971,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + [[package]] name = "displaydoc" version = "0.2.4" @@ -1014,6 +1059,12 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + [[package]] name = "encoding_rs" version = "0.8.33" @@ -1441,7 +1492,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.8", ] [[package]] @@ -1449,6 +1500,19 @@ name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash 0.8.11", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.3", +] [[package]] name = "hayagriva" @@ -1909,6 +1973,17 @@ dependencies = [ "once_cell", ] +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "is-wsl" version = "0.4.0" @@ -2633,6 +2708,20 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "prettytable-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" +dependencies = [ + "csv", + "encode_unicode 1.0.0", + "is-terminal", + "lazy_static", + "term", + "unicode-width", +] + [[package]] name = "proc-macro2" version = "1.0.79" @@ -2961,6 +3050,29 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +[[package]] +name = "rust_iso3166" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e676677b94480848a8d88c74553bad50aed2ee77d8c0985aa50d8c4e26f3054b" +dependencies = [ + "js-sys", + "phf", + "prettytable-rs", + "wasm-bindgen", +] + +[[package]] +name = "rust_iso639" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a079fa995fd99d42d7244f325b6737677852036ce2efe5244227d2c75ff4bd73" +dependencies = [ + "phf", + "prettytable-rs", + "wasm-bindgen", +] + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -3574,6 +3686,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + [[package]] name = "termcolor" version = "1.4.1" @@ -3595,7 +3718,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.4" +version = "0.11.8" dependencies = [ "insta", "lsp-server", @@ -3692,7 +3815,7 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.4" +version = "0.11.8" dependencies = [ "anyhow", "async-trait", @@ -3743,9 +3866,10 @@ dependencies = [ [[package]] name = "tinymist-query" -version = "0.11.4" +version = "0.11.8" dependencies = [ "anyhow", + "biblatex", "comemo 0.4.0", "ecow 0.2.2", "ena", @@ -3764,9 +3888,13 @@ dependencies = [ "percent-encoding", "reflexo", "regex", + "rust_iso3166", + "rust_iso639", "serde", "serde_json", + "serde_yaml", "sha2", + "siphasher 1.0.1", "strum 0.26.2", "toml 0.8.12", "ttf-parser", @@ -3775,11 +3903,12 @@ dependencies = [ "typst-ts-core", "unscanny", "walkdir", + "yaml-rust2", ] [[package]] name = "tinymist-render" -version = "0.11.4" +version = "0.11.8" dependencies = [ "base64 0.22.0", "log", @@ -4043,7 +4172,7 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typst" version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0#88608109579929b0c1fbab12d7a2afaea0baaf74" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" dependencies = [ "az", "bitflags 2.5.0", @@ -4110,7 +4239,7 @@ checksum = "f13f85360328da54847dd7fefaf272dfa5b6d1fdeb53f32938924c39bf5b2c6c" [[package]] name = "typst-macros" version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0#88608109579929b0c1fbab12d7a2afaea0baaf74" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -4121,7 +4250,7 @@ dependencies = [ [[package]] name = "typst-pdf" version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0#88608109579929b0c1fbab12d7a2afaea0baaf74" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" dependencies = [ "base64 0.22.0", "bytemuck", @@ -4181,7 +4310,7 @@ dependencies = [ [[package]] name = "typst-render" version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0#88608109579929b0c1fbab12d7a2afaea0baaf74" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" dependencies = [ "bytemuck", "comemo 0.4.0", @@ -4201,7 +4330,7 @@ dependencies = [ [[package]] name = "typst-svg" version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0#88608109579929b0c1fbab12d7a2afaea0baaf74" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" dependencies = [ "base64 0.22.0", "comemo 0.4.0", @@ -4234,7 +4363,7 @@ dependencies = [ [[package]] name = "typst-syntax" version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0#88608109579929b0c1fbab12d7a2afaea0baaf74" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" dependencies = [ "comemo 0.4.0", "ecow 0.2.2", @@ -4250,7 +4379,7 @@ dependencies = [ [[package]] name = "typst-timing" version = "0.11.0" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0#88608109579929b0c1fbab12d7a2afaea0baaf74" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.0-2#6f1cdbb625fd16ad2f26466f4d72818ac24b83d9" dependencies = [ "parking_lot", "serde", @@ -4370,9 +4499,9 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.13" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f04e5495bff9deed2a9155dca07889ec0fe1c79f48eb2d9ea99fc272459499" +checksum = "b25283094eca3cf1200a2105bb339f367e1fb127e69b22ae106d7e706d7eb08d" dependencies = [ "anyhow", "clap", @@ -5044,6 +5173,17 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "yaml-rust2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498f4d102a79ea1c9d4dd27573c0fc96ad74c023e8da38484e47883076da25fb" +dependencies = [ + "arraydeque", + "encoding_rs", + "hashlink", +] + [[package]] name = "yoke" version = "0.7.3" @@ -5068,6 +5208,26 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.55", +] + [[package]] name = "zerofrom" version = "0.1.3" diff --git a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix index 371e4d6f21..9849b56f1e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ti/tinymist/package.nix @@ -13,19 +13,19 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.4"; + version = "0.11.8"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "v${version}"; - hash = "sha256-zMwyM4Y+nn/u/UXGlOxGB/JApgmYQW4qAek40uJO0Fc="; + hash = "sha256-1mgtyOXSvovO2f4XSdirzTIcUlbFoT9t/UFa2uW5CpI="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "typst-0.11.0" = "sha256-UzZ0tbC6Dhn178GQDyLl70WTp3h5WdaBCsEKgLisZ2M="; + "typst-0.11.0" = "sha256-J3oSrxylR00r3Tc4KDmuW6ungQkoYJiI7cZEpbyyNsc="; "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; "typstfmt_lib-0.2.7" = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI="; }; diff --git a/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/189.patch b/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/189.patch deleted file mode 100644 index c638727d3b..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/189.patch +++ /dev/null @@ -1,71 +0,0 @@ -Index: tkdiff -=================================================================== -diff --git a/tkdiff b/tkdiff ---- a/tkdiff (revision 188) -+++ b/tkdiff (revision 189) -@@ -111,7 +111,7 @@ - } - - # Determine the name of the temporary directory, the rc file name, --# and possible VPATH EnvVar, all of which are platform dependent. -+# NULLdev, and possible VPATH EnvVar, all of which are platform dependent. - # - # Much MAY likely be overridden by a preference in .tkdiffrc, - # EXCEPT (obviously) when no such file actually exists yet -@@ -126,6 +126,9 @@ - set opts(tmpdir) C:/temp - } - -+ # Reserved filename which is actually a NULL device -+ set opts(NULLdev) "nul" -+ - # Split up and store a VPATH if it exists - if {[info exists ::env(VPATH)]} { - set finfo(Vpath) [split $::env(VPATH) ";"] -@@ -145,6 +148,9 @@ - set opts(tmpdir) $::env(TMPDIR) - } {set opts(tmpdir) /tmp } - -+ # Reserved filename which is actually a NULL device (Unix-like platforms) -+ set opts(NULLdev) "/dev/null" -+ - # Split up and store a VPATH if it exists - if {[info exists ::env(VPATH)]} { - set finfo(Vpath) [split $::env(VPATH) ":"] -@@ -2106,7 +2112,7 @@ - # 1 Failed (PLUS a 'pushed' HARD-error message to the caller) - ############################################################################### - proc get-file {fn ndx {probe 0}} { -- global g finfo -+ global g opts finfo - - # Ancestor files are stored into a slightly adjusted array element name - # N.B> 'ndx' AS PASSED *can* be an EXPRESSION (not just a number): resolve! -@@ -2121,7 +2127,7 @@ - } elseif {!$tildechk} { - # DO NOT REPORT non-existence if this attempt was ONLY a probe - if {$probe} { return 1 } { set MSG "File '$fn' does not exist" } -- } elseif {[file isfile $fn]} { -+ } elseif {[file isfile $fn] || $fn == $opts(NULLdev)} { - set finfo(${A}lbl,$ndx) [shortNm [set finfo(${A}pth,$ndx) "$fn"]] - } else { set MSG "'$fn' exists, but is not a file" } - -@@ -2857,7 +2863,7 @@ - # Align various label decorations to the CURRENT input file pairing - ############################################################################### - proc alignDecor {pairnum} { -- global g w finfo -+ global g w opts finfo - - # Establish if 3way mode is NOW active and what file indices are in use - set g(is3way) [info exists finfo(albl,$pairnum)] -@@ -2874,7 +2880,8 @@ - set finfo(lbl,$LR) $finfo(ulbl,$ndx($n)) ;# Override lbl display - } else {set finfo(lbl,$LR) $finfo(lbl,$ndx($n))} - -- if {![info exists finfo(tmp,$ndx($n))]} { -+ if {![info exists finfo(tmp,$ndx($n))] \ -+ && $finfo(pth,$ndx($n)) != $opts(NULLdev)} { - # (N.B> Tip data will ALSO be used by report generation heading) - set g(tooltip,${LR}Label) "{$finfo(pth,$ndx($n))\n" - append g(tooltip,${LR}Label) \ diff --git a/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/194.patch b/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/194.patch deleted file mode 100644 index 0fc50db302..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/194.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: tkdiff -=================================================================== -diff --git a/tkdiff b/tkdiff ---- a/tkdiff (revision 193) -+++ b/tkdiff (revision 194) -@@ -4557,7 +4557,8 @@ - } - } - } -- } -+ # But KICK scroll to *LOOK* for Ratcliff (when ON); otherwise is a NOOP -+ } { $w(acTxWdg) SEE @1,1 } - } - - ############################################################################### diff --git a/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/package.nix b/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/package.nix index b057a07e56..8cf0e575f8 100644 --- a/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/package.nix @@ -2,24 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tkdiff"; - version = "5.6"; + version = "5.7"; src = fetchzip { url = "mirror://sourceforge/tkdiff/tkdiff-${builtins.replaceStrings ["."] ["-"] finalAttrs.version}.zip"; - hash = "sha256-EpbIdjsejkkTaSpoZRM5AHz0r1Cio+YzRryK0BoghBk="; + hash = "sha256-ZndpolvaXoCAzR4KF+Bu7DJrXyB/C2H2lWp5FyzOc4M="; }; - patches = [ - # fix regression: allow /dev/null again. eg: "tkdiff /dev/null file" - # svn diff --git -r188:189 https://svn.code.sf.net/p/tkdiff/code/trunk - ./189.patch - - # fix regression: trigger redraw when inline recursive diff requested - # svn diff --git -r193:194 https://svn.code.sf.net/p/tkdiff/code/trunk | \ - # sed -e '/^@@ -4545,7/,14d' -e '/^@@ -18063,7/,$d' - ./194.patch - ]; - nativeBuildInputs = [ makeBinaryWrapper ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix b/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix index 5ac8fe12fb..247f345bd7 100644 --- a/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "tlrc"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "tldr-pages"; repo = "tlrc"; rev = "v${version}"; - hash = "sha256-RzGw4rvak055V48bkeuzKAH6F/wlFMLya8Ny3mgU+H4="; + hash = "sha256-JQx4vuXbsLrPAbmPlwPiPXJIpRufUzQN+R+Wqj4H8n4="; }; - cargoHash = "sha256-BbBt6oCO9y++EWx9/CXISGfB/FEcEPKYeXNXcejevrg="; + cargoHash = "sha256-5caZTdpEog8xdCn+LOfW5UdbuWZmO8iggSstxvdjwb0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/to/tootik/package.nix b/third_party/nixpkgs/pkgs/by-name/to/tootik/package.nix index 51d890f5c7..c3b81e1722 100644 --- a/third_party/nixpkgs/pkgs/by-name/to/tootik/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/to/tootik/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tootik"; - version = "0.10.2"; + version = "0.11.2"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; rev = version; - hash = "sha256-roB1mrhq9LQcdi7ynPzI9UmeawSw9fX7jl3bb6+ygfM="; + hash = "sha256-aAIyEUeIZvDbWfUcfcETGrB3Md8GqRB8hvRBUtMU5Zs="; }; - vendorHash = "sha256-Lsc8nK4I1gZEW7RbEapHr3IJ6wTATLElX3XfNX1LwvM="; + vendorHash = "sha256-kAnGMNBWqH37QETnn2ncp7qOaCSx6Xd4HCFhCehh/kU="; nativeBuildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/by-name/to/torctl/package.nix b/third_party/nixpkgs/pkgs/by-name/to/torctl/package.nix new file mode 100644 index 0000000000..706ec96a59 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/to/torctl/package.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "torctl"; + version = "0.5.7"; + + src = fetchFromGitHub { + owner = "BlackArch"; + repo = "torctl"; + rev = "v${version}"; + hash = "sha256-rTJR+9pbK/sWMqdHyIqJgASgCGtGtpUPoHmYZJ7COFQ="; + }; + + installPhase = '' + mkdir -p $out/{bin,etc/{systemd,bash_completion.d}} + cp -R torctl $out/bin + cp -R bash-completion $out/etc/bash_completion.d/ + cp -R service $out/etc/systemd/ + ''; + + meta = with lib; { + description = "Script to redirect all traffic through tor network including dns queries for anonymizing entire system"; + homepage = "https://github.com/BlackArch/torctl"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ tochiaha ]; + mainProgram = "torctl"; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/to/torrentstream/deps.nix b/third_party/nixpkgs/pkgs/by-name/to/torrentstream/deps.nix index 048d85c10a..b68fcf2d6c 100644 --- a/third_party/nixpkgs/pkgs/by-name/to/torrentstream/deps.nix +++ b/third_party/nixpkgs/pkgs/by-name/to/torrentstream/deps.nix @@ -2,38 +2,42 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "7.0.0"; sha256 = "0n1grglxql9llmrsbbnlz5chx8mxrb5cpvjngm0hfyrkgzcwz90d"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "7.0.0"; sha256 = "1qifb1pv7s76lih8wnjk418wdk4qwn87q2n6dx54knfvxai410bl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "7.0.0"; sha256 = "1pmgjrvwdzqrxjb24cg3fd624r64lgywbqc9symd5hyl4175pwk8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "7.0.0"; sha256 = "0nhh7rnh45s39x8sjn88czg7nyfpry85pkm0g619j8b468zj8nb4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "7.0.0"; sha256 = "1fk7dcz6gfhd1k1d8ksz22rnjvj1waqjzk29ym4i3dz73rsq8j1i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "7.0.0"; sha256 = "05zjmrpp99l128wijp1fy8asskc11ls871qaqr4mjnz3gbfycxnj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "7.0.0"; sha256 = "0ks7lcyvfvr3ar36f5gp89bnnblxzic5vawppfcrvhw1ivas4mp1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "7.0.0"; sha256 = "0ff20yklyjgyjzdyv7sybczgqhgd557m05dbwxzjznr0x41b180d"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "7.0.0"; sha256 = "1f1h0l47abw0spssd64qkhgd7b54pyzslyb586zp21milimcfmgv"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "7.0.0"; sha256 = "1812vnkn8n0i4yr3k5azcxcfx1bbpcsmms95rdyxjfrzfksr05ai"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "7.0.0"; sha256 = "0wx50kswqv8jw1vr8sma1hf1mm3wkwsnml0hzzlilvak9ql7cr3n"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "7.0.0"; sha256 = "1h5szfsr1dalsvdj9c18y6362853chisfns0hfpsq44hz0pr8j9q"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Systemd"; version = "7.0.0"; sha256 = "07cr2lzmlczmz1f9sjv1i9sfqwinkcmkq1q0kkscnh9bqa85aaqd"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.WindowsServices"; version = "7.0.0"; sha256 = "1cvc24ma18vi2hb3kwkb9k7hfx5v8lcfdvy9n8bc12d5nhmh9zcc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "7.0.0"; sha256 = "1f5fhpvzwyrwxh3g1ry027s4skmklf6mbm2w0p13h0x6fbmxcb24"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "7.0.0"; sha256 = "1m8ri2m3vlv9vzk0068jkrx0vkk4sqmk1kxmn8pc3wys38d38qaf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "7.0.0"; sha256 = "14p7hrhdd58fxdhjbyjwmlzr00vs03bmns3sf2f6alsgpvbf2h1i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "7.0.0"; sha256 = "0q1cgi456shngxs70ar0ibshpm5qk8whw369jrl6xdxnf1vxkkq8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "7.0.0"; sha256 = "11rskmrijf6xv78slm38zywj6l3wjlm017kijhan1kfg56f1kvdk"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) + (fetchNuGet { pname = "dotnet-ef"; version = "8.0.0"; sha256 = "1qh1zwyfgzy2486xvwiblg8algmwi70w2p1sqaiw4pfjz5c6dn21"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "8.0.0"; sha256 = "026f7f2iv6ph2dc5rnslll0bly8qcx5clmh2nn9hgyqjizzc4qvy"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; sha256 = "13qb8wz3k59ihq0mjcqz1kwrpyzxn5da4dhk2pvcgc42z9kcbf7r"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; sha256 = "1jrmlfzy4h32nzf1nm5q8bhkpx958b0ww9qx1k1zm4pyaf6mqb04"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; sha256 = "1n3ss26v1lq6b69fxk1vz3kqv9ppxq8ypgdqpd7415xrq66y4bqn"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "8.0.0"; sha256 = "1br01zhzhnxjzqx63bxd25x48y9xs69hcs71pjni8y9kl50zja7z"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; sha256 = "0ghwkld91k20hcbmzg2137w81mzzdh8hfaapdwckhza0vipya4kw"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; sha256 = "15m4j6w9n8h0mj7hlfzb83hd3wn7aq1s7fxbicm16slsjfwzj82i"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; sha256 = "05wxjvjbx79ir7vfkri6b28k8zl8fa6bbr0i7gahqrim2ijvkp6v"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; sha256 = "1igf2bqism22fxv7km5yv028r4rg12a4lki2jh4xg3brjkagiv7q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "8.0.0"; sha256 = "1f2af5m1yny8b43251gsj75hjd9ixni1clcldy8cg91z1vxxm8dh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; sha256 = "00d5dwmzw76iy8z40ly01hy9gly49a7rpf7k7m99vrid1kxp346h"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Systemd"; version = "8.0.0"; sha256 = "1jhxx8wyk18vspvfp30j5dymv8m85jg9s1iahdkfyin5v5j8g0xq"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.WindowsServices"; version = "8.0.0"; sha256 = "1xwbk1xa2y888a4qrmxn50l9b2l8vnfq1lmia9xh7zykl9zhmrps"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; sha256 = "1d9b734vnll935661wqkgl7ry60rlh5p876l2bsa930mvfsaqfcv"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; sha256 = "1mvp3ipw7k33v2qw2yrvc4vl5yzgpk3yxa94gg0gz7wmcmhzvmkd"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "8.0.0"; sha256 = "1h7mg97lj0ss47kq7zwnihh9c6xcrkwrr8ffhc16qcsrh36sg6q0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "8.0.0"; sha256 = "05vfrxw7mlwlwhsl6r4yrhxk3sd8dv5sl0hdlcpgw62n53incw5x"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "8.0.0"; sha256 = "0gbjll6p03rmw0cf8fp0p8cxzn9awmzv8hvnyqbczrkax5h7p94i"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) (fetchNuGet { pname = "Mono.Nat"; version = "3.0.0"; sha256 = "17lyjcpwp5j2dwx0gi975x710r7kqkx50c1wmyzwdyqhar3kszi8"; }) (fetchNuGet { pname = "MonoTorrent"; version = "3.0.0-beta.rev0106"; sha256 = "0zz64nnb02d4pjpffs9x26jvbalm48yaghbgj3vc7j8ff0sm8xr4"; }) (fetchNuGet { pname = "ReusableTasks"; version = "2.0.2"; sha256 = "0dkyirzspp8spmgd3ad9mak5jhqfmib6m437r2bmmyb3m4mxp5rb"; }) - (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "7.0.0"; sha256 = "16p8z975dnzmncfifa9gw9n3k9ycpr2qvz7lglpghsvx0fava8k9"; }) - (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "7.0.0"; sha256 = "0xgg9y06j6ch3h65lyrpnghb7iaf9g97w1kg5sz0ji6ikfiqlkxz"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; sha256 = "0scb0lp7wbgcinaa4kqiqs7b8i5nx4ppfad81138jiwd1sl37pyp"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; sha256 = "1xnvcidh2qf6k7w8ij1rvj0viqkq84cq47biw0c98xhxg5rk3pxf"; }) + (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "8.0.0"; sha256 = "00hlb8vmfgs2kk39mqmij5h3bz5sgkqxpxvpnki4ncayqadx1bws"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; }) ] diff --git a/third_party/nixpkgs/pkgs/by-name/to/torrentstream/package.nix b/third_party/nixpkgs/pkgs/by-name/to/torrentstream/package.nix index b59c17dd59..34b7e4866d 100644 --- a/third_party/nixpkgs/pkgs/by-name/to/torrentstream/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/to/torrentstream/package.nix @@ -2,39 +2,39 @@ , buildDotnetModule , fetchFromGitHub , dotnetCorePackages -, fetchpatch }: buildDotnetModule rec { pname = "torrentstream"; - version = "1.0.1.6"; + version = "1.0.1.11"; src = fetchFromGitHub { owner = "trueromanus"; repo = "TorrentStream"; rev = version; - hash = "sha256-41zlzrQ+YGY2wEvq4Su/lp6lOmGW4u0F37ub2a3z+7o="; + hash = "sha256-3lmQWx00Ulp0ZyQBEhFT+djHBi84foMlWGJEp/UOGek="; }; sourceRoot = "${src.name}/src"; - projectFile = "TorrentStream.sln"; - nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; executables = [ "TorrentStream" ]; + nugetDeps = ./deps.nix; + projectFile = "TorrentStream.csproj"; + selfContainedBuild = true; + + dotnetFlags = [ + "-p:PublishAot=false" # untill https://github.com/NixOS/nixpkgs/issues/280923 is fixed + "-p:PublishSingleFile=true" + ]; patches = [ - (fetchpatch { - name = "allow-setting-listen-address.patch"; - url = "https://github.com/trueromanus/TorrentStream/compare/1.0.1.6..6900b6f33f2b4b94888a8a1355029a81767e66a4.patch"; - hash = "sha256-jOUs5SO2BnNnkz3wJ710Z4stVlhZ8nKqpmHr4BNlGs0="; - stripLen = 1; - excludes = [ "README.md" ]; - }) ./0001-display-the-message-of-caught-exceptions.patch ]; + postInstall = "rm $out/lib/torrentstream/NuGet.config"; # reduce closure size + meta = { homepage = "https://github.com/trueromanus/TorrentStream"; description = "Simple web server for streaming torrent files in video players"; diff --git a/third_party/nixpkgs/pkgs/by-name/tp/tplay/cargo.diff b/third_party/nixpkgs/pkgs/by-name/tp/tplay/cargo.diff deleted file mode 100644 index 8248bdb8bd..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/tp/tplay/cargo.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 0eb70e4..8d81ba0 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2069,7 +2069,7 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - - [[package]] - name = "tplay" --version = "0.4.4" -+version = "0.4.5" - dependencies = [ - "clap", - "crossbeam-channel", diff --git a/third_party/nixpkgs/pkgs/by-name/tp/tplay/package.nix b/third_party/nixpkgs/pkgs/by-name/tp/tplay/package.nix index 619192ddf5..37bf1db7d1 100644 --- a/third_party/nixpkgs/pkgs/by-name/tp/tplay/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tp/tplay/package.nix @@ -11,17 +11,16 @@ }: rustPlatform.buildRustPackage rec { pname = "tplay"; - version = "0.4.5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "maxcurzi"; repo = "tplay"; rev = "v${version}"; - hash = "sha256-qt5I5rel88NWJZ6dYLCp063PfVmGTzkUUKgF3JkhLQk="; + hash = "sha256-/3ui0VOxf+kYfb0JQXPVbjAyXPph2LOg2xB0DGmAbwc="; }; - cargoHash = "sha256-0kHh7Wb9Dp+t2G9/Kz/3K43bQdFCl+q2Vc3W32koc2I="; - cargoPatches = [ ./cargo.diff ]; + cargoHash = "sha256-zRkIEH37pvxHUbnfg25GW1Z7od9XMkRmP2Qvs64uUjg="; checkFlags = [ # requires network access "--skip=pipeline::image_pipeline::tests::test_process" @@ -30,7 +29,13 @@ rustPlatform.buildRustPackage rec { "--skip=pipeline::runner::tests::test_time_to_send_next_frame" ]; - nativeBuildInputs = [ pkg-config clang ffmpeg ]; + nativeBuildInputs = [ + rustPlatform.bindgenHook + pkg-config + clang + ffmpeg + ]; + buildInputs = [ openssl.dev alsa-lib.dev @@ -39,13 +44,11 @@ rustPlatform.buildRustPackage rec { opencv ]; - env.LIBCLANG_PATH = "${libclang.lib}/lib"; - meta = { description = "Terminal Media Player"; homepage = "https://github.com/maxcurzi/tplay"; platforms = lib.platforms.linux; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ demine ]; + maintainers = with lib.maintainers; [ demine colemickens ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/tr/trak/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/trak/package.nix new file mode 100644 index 0000000000..2129850159 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tr/trak/package.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "trak"; + version = "0.0.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lcfd"; + repo = "trak"; + rev = "v${version}"; + hash = "sha256-YJMX7pNRWdNPyWNZ1HfpdYsKSStRWLcianLz6nScMa8="; + }; + + sourceRoot = "${src.name}/cli"; + + dependencies = with python3Packages; [ + questionary + typer + ] ++ typer.optional-dependencies.all; + + build-system = [ python3Packages.poetry-core ]; + + meta = { + description = "Keep a record of the time you dedicate to your projects"; + homepage = "https://github.com/lcfd/trak"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ buurro ]; + mainProgram = "trak"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/tr/treedome/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/treedome/package.nix index 86a554b2f8..07efeebccb 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/treedome/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/treedome/package.nix @@ -13,7 +13,7 @@ , pkg-config , rustPlatform , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , sqlite }: @@ -98,7 +98,7 @@ rustPlatform.buildRustPackage { cmake pkg-config cargo-tauri - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/treefmt/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix rename to third_party/nixpkgs/pkgs/by-name/tr/treefmt/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/tr/treefmt2/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/treefmt2/package.nix new file mode 100644 index 0000000000..defe910090 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tr/treefmt2/package.nix @@ -0,0 +1,33 @@ +{ lib, buildGoModule, fetchFromGitHub }: +buildGoModule rec { + pname = "treefmt"; + version = "2.0.0-rc1"; + + src = fetchFromGitHub { + owner = "numtide"; + repo = "treefmt"; + rev = "v${version}"; + hash = "sha256-iRjd7iYd3617XZrGD6Bi6d1SoE8dgATMbT4AMXklfgM="; + }; + + vendorHash = "sha256-xbXy5Csl2JD5/F5mtvh8J36VZqrUIfO3OBV/LE+KzWA="; + + subPackages = [ "." ]; + + CGO_ENABLED = 1; + + ldflags = [ + "-s" + "-w" + "-X git.numtide.com/numtide/treefmt/build.Name=${pname}" + "-X git.numtide.com/numtide/treefmt/build.Version=v${version}" + ]; + + meta = { + description = "one CLI to format the code tree"; + homepage = "https://github.com/numtide/treefmt"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brianmcgee lib.maintainers.zimbatm ]; + mainProgram = "treefmt"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix b/third_party/nixpkgs/pkgs/by-name/tr/tribler/package.nix similarity index 53% rename from third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix rename to third_party/nixpkgs/pkgs/by-name/tr/tribler/package.nix index bb009ff0ad..db89a613d3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/tribler/package.nix @@ -1,23 +1,25 @@ -{ lib -, stdenv -, fetchurl -, fetchPypi -, python3 -, makeWrapper -, libtorrent-rasterbar-1_2_x -, qt5 +{ + lib, + stdenv, + fetchurl, + fetchPypi, + python3, + makeWrapper, + libtorrent-rasterbar-1_2_x, + qt5, + nix-update-script, }: let libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tribler"; - version = "7.13.0"; + version = "7.14.0"; src = fetchurl { - url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-${version}.tar.xz"; - hash = "sha256-j9+Kq6dOqiJCTY3vuRWGnciuwACU7L0pl73l6nkDLN4="; + url = "https://github.com/Tribler/tribler/releases/download/v${finalAttrs.version}/Tribler-${finalAttrs.version}.tar.xz"; + hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4="; }; nativeBuildInputs = [ @@ -28,57 +30,55 @@ stdenv.mkDerivation rec { qt5.wrapQtAppsHook ]; - buildInputs = [ - python3.pkgs.python - ]; + buildInputs = [ python3.pkgs.python ]; - pythonPath = [ - libtorrent - ] ++ (with python3.pkgs; [ - # requirements-core.txt - aiohttp - aiohttp-apispec - anyio - chardet - configobj - cryptography - decorator - faker - libnacl - lz4 - marshmallow - netifaces - networkx - pony - psutil - pyasn1 - pydantic_1 - pyopenssl - pyyaml - sentry-sdk - service-identity - yappi - yarl - bitarray - (pyipv8.overrideAttrs (p: rec { - version = "2.10.0"; - src = fetchPypi { - inherit (p) pname; - inherit version; - hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU="; - }; - })) - libtorrent - file-read-backwards - brotli - human-readable - # requirements.txt - pillow - pyqt5 - #pyqt5-sip - pyqtgraph - pyqtwebengine - ]); + pythonPath = + [ libtorrent ] + ++ (with python3.pkgs; [ + # requirements-core.txt + aiohttp + aiohttp-apispec + anyio + chardet + configobj + cryptography + decorator + faker + libnacl + lz4 + marshmallow + netifaces + networkx + pony + psutil + pyasn1 + pydantic_1 + pyopenssl + pyyaml + sentry-sdk + service-identity + yappi + yarl + bitarray + filelock + (pyipv8.overrideAttrs (p: rec { + version = "2.10.0"; + src = fetchPypi { + inherit (p) pname; + inherit version; + hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU="; + }; + })) + file-read-backwards + brotli + human-readable + # requirements.txt + pillow + pyqt5 + #pyqt5-sip + pyqtgraph + pyqtwebengine + ]); installPhase = '' mkdir -pv $out @@ -106,12 +106,19 @@ stdenv.mkDerivation rec { export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Decentralised P2P filesharing client based on the Bittorrent protocol"; mainProgram = "tribler"; homepage = "https://www.tribler.org/"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ xvapx viric mkg20001 ]; - platforms = platforms.linux; + changelog = "https://github.com/Tribler/tribler/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ + xvapx + viric + mkg20001 + ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/tr/trickest-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/trickest-cli/package.nix new file mode 100644 index 0000000000..228dccf4ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tr/trickest-cli/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "trickest-cli"; + version = "1.7.5"; + + src = fetchFromGitHub { + owner = "trickest"; + repo = "trickest-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-erPcb+cHCAmhPGwfu+g0yyAFx252+tpIOFQiUBuPUcs="; + }; + + vendorHash = "sha256-gk8YMMvTHBL7yoXU9n0jhtUS472fqLW5m+mSl4Lio6c="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "CLI tool to execute Trickest workflows"; + homepage = "https://github.com/trickest/trickest-cli"; + changelog = "https://github.com/trickest/trickest-cli/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "trickest"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/tr/troubadix/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/troubadix/package.nix index 2386693e11..d70553604b 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/troubadix/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/troubadix/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "troubadix"; - version = "24.4.0"; + version = "24.5.1"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "troubadix"; rev = "refs/tags/v${version}"; - hash = "sha256-I/c26dqD7cJ0AtLhJK4XaR5vvud/NsoeXr6/k6+Dezk="; + hash = "sha256-kA+9zcP3unNb2tE3OU8J/3xHX+pRZ/06lEQtH/0QEk4="; }; pythonRelaxDeps = [ "validators" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/tt/tt/package.nix b/third_party/nixpkgs/pkgs/by-name/tt/tt/package.nix new file mode 100644 index 0000000000..f45376aa4c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tt/tt/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + installShellFiles, +}: + +buildGoModule rec { + pname = "tt"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "lemnos"; + repo = "tt"; + rev = "v${version}"; + hash = "sha256-vKh19xYBeNqvVFilvA7NeQ34RM5VnwDs+Hu/pe3J0y4="; + }; + + vendorHash = "sha256-edY2CcZXOIed0+7IA8kr4lAfuSJx/nHtmc734XzT4z4="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + mv $out/bin/src $out/bin/tt + installManPage tt.1.gz + ''; + + meta = { + description = "Typing test in the terminal written in Go"; + homepage = "https://github.com/lemnos/tt"; + license = lib.licenses.mit; + mainProgram = "tt"; + maintainers = with lib.maintainers; [ vinetos ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/tu/tuifimanager/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuifimanager/package.nix index aaa4902933..7d54de40be 100644 --- a/third_party/nixpkgs/pkgs/by-name/tu/tuifimanager/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tu/tuifimanager/package.nix @@ -1,34 +1,65 @@ -{ lib +{ stdenv +, lib , python3 , fetchFromGitHub +, kdePackages +, gnome +, qt6 +, makeWrapper +, x11Support ? stdenv.isLinux +# pypinput is marked as broken for darwin +, pynputSupport ? stdenv.isLinux +# Experimental Drag & Drop support requires x11 & pyinput suport +, hasDndSupport ? x11Support && pynputSupport +, enableDragAndDrop ? false }: +lib.throwIf (enableDragAndDrop && !hasDndSupport) + "Drag and drop support is only available for linux with xorg." + python3.pkgs.buildPythonApplication rec { pname = "tuifimanager"; - version = "3.3.5"; + version = "4.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "GiorgosXou"; repo = "TUIFIManager"; - rev = "refs/tags/v.${version}"; - hash = "sha256-O4cAHFurgF6QzpeAMoipX2/JywU1drZOTw/Ob9Pa8WQ="; + rev = "v.${version}"; + hash = "sha256-pppPlpPA1UYjUCKvGCjUo9jFNyOOkk6aF7/v5sXIptI="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "Send2Trash == 1.8.0" "Send2Trash >= 1.8.0" - ''; - nativeBuildInputs = [ python3.pkgs.setuptools python3.pkgs.setuptools-scm - ]; + ] ++ (lib.optionals enableDragAndDrop [ + qt6.wrapQtAppsHook + makeWrapper + ]); + + propagatedBuildInputs = [ + python3.pkgs.send2trash + python3.pkgs.unicurses + ] ++ (lib.optionals enableDragAndDrop [ + python3.pkgs.pynput + python3.pkgs.pyside6 + python3.pkgs.requests + python3.pkgs.xlib + kdePackages.qtbase + kdePackages.qt6gtk2 + ]); + + postFixup = let + # fix missing 'adwaita' warning missing with ncurses tui + # see: https://github.com/NixOS/nixpkgs/issues/60918 + theme = gnome.gnome-themes-extra; + in + lib.optionalString enableDragAndDrop '' + wrapProgram $out/bin/tuifi \ + --prefix GTK_PATH : "${theme}/lib/gtk-2.0" \ + --set tuifi_synth_dnd True + ''; - propagatedBuildInputs = with python3.pkgs; [ - send2trash - unicurses - ]; pythonImportsCheck = [ "TUIFIManager" ]; meta = with lib; { @@ -39,7 +70,6 @@ python3.pkgs.buildPythonApplication rec { attempt to get more attention to the Uni-Curses project. ''; homepage = "https://github.com/GiorgosXou/TUIFIManager"; - changelog = "https://github.com/GiorgosXou/TUIFIManager/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ michaelBelsanti sigmanificient ]; mainProgram = "tuifi"; diff --git a/third_party/nixpkgs/pkgs/development/tools/twiggy/default.nix b/third_party/nixpkgs/pkgs/by-name/tw/twiggy/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/twiggy/default.nix rename to third_party/nixpkgs/pkgs/by-name/tw/twiggy/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/tw/twitch-dl/package.nix b/third_party/nixpkgs/pkgs/by-name/tw/twitch-dl/package.nix index 29340a7f06..fa78dc273c 100644 --- a/third_party/nixpkgs/pkgs/by-name/tw/twitch-dl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tw/twitch-dl/package.nix @@ -7,24 +7,24 @@ python3Packages.buildPythonApplication rec { pname = "twitch-dl"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "ihabunek"; repo = "twitch-dl"; rev = "refs/tags/${version}"; - hash = "sha256-H2SxZgEjVdj/GRguJ2v/WWUrh0VTrwFV9mZVn/EYyPg="; + hash = "sha256-0uOOc3ANXleQlENB+gdWheafBiOOcyZsFvYj7r+WMCY="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'm3u8>=1.0.0,<4.0.0' 'm3u8>=1.0.0' - ''; + pythonRelaxDeps = [ + "m3u8" + ]; nativeBuildInputs = [ python3Packages.setuptools python3Packages.setuptools-scm + python3Packages.pythonRelaxDepsHook installShellFiles scdoc ]; @@ -42,10 +42,21 @@ python3Packages.buildPythonApplication rec { disabledTestPaths = [ # Requires network access "tests/test_api.py" + "tests/test_cli.py" ]; pythonImportsCheck = [ "twitchdl" + "twitchdl.cli" + "twitchdl.download" + "twitchdl.entities" + "twitchdl.http" + "twitchdl.output" + "twitchdl.playlists" + "twitchdl.progress" + "twitchdl.twitch" + "twitchdl.utils" + "twitchdl.commands" ]; postInstall = '' @@ -58,7 +69,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/ihabunek/twitch-dl"; changelog = "https://github.com/ihabunek/twitch-dl/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ pbsds ]; mainProgram = "twitch-dl"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typos-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/ty/typos-lsp/package.nix index 821c169cad..0c69a0cf1a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ty/typos-lsp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ty/typos-lsp/package.nix @@ -4,16 +4,18 @@ }: rustPlatform.buildRustPackage rec { pname = "typos-lsp"; - version = "0.1.17"; + # Please update the corresponding VSCode extension too. + # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix + version = "0.1.18"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-Q/V9WabxtsUQ69r7qHzslko8anWyuB3VqVRQJ6gl9O8="; + hash = "sha256-6ELn2Q7pAUgnwe8+vAUbuRjaKFWvbGZ1SMfXQ1qKp5c="; }; - cargoHash = "sha256-Rus79FpYBgz1CPK4n805Au0ncom8rhD3zD82a2DyR3k="; + cargoHash = "sha256-UDID+dI8ETP084WR482uWli2++bI4mRiMvpFpWUlvZE="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typstyle/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ty/typstyle/Cargo.lock index 47ae5437f5..73892cb629 100644 --- a/third_party/nixpkgs/pkgs/by-name/ty/typstyle/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ty/typstyle/Cargo.lock @@ -3649,7 +3649,7 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.13" +version = "0.11.16" dependencies = [ "anyhow", "clap", diff --git a/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix b/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix index aa44d1de31..1022537164 100644 --- a/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ty/typstyle/package.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch , pkg-config , libgit2 , zlib @@ -10,15 +11,24 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.11.13"; + version = "0.11.16"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "v${version}"; - hash = "sha256-xJoL/YgdkORQf+U/1E2OVk6pD/IuXxJJTw+Xufonjd0="; + hash = "sha256-ZmGrdAHbU4PQgd9haoVEZ8Wn8Scujm9bJAtvO2+aPoQ="; }; + patches = [ + (fetchpatch { + # Trim whitespace patch + name = "whitespace-trim.patch"; + url = "https://github.com/Enter-tainer/typstyle/commit/127b7362f5938e091e2e5a33976ad3f63b6e4ee3.patch"; + hash = "sha256-Xzo51bgpEUKP7WDQ7BFNAZsyofPcPDIJMWOf4S+GGvI="; + }) + ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/third_party/nixpkgs/pkgs/by-name/uc/ucblogo/package.nix b/third_party/nixpkgs/pkgs/by-name/uc/ucblogo/package.nix new file mode 100644 index 0000000000..08e3610b6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/uc/ucblogo/package.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, wxGTK32 +, texinfo +, tetex +, wrapGAppsHook3 +, autoconf-archive +, autoreconfHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ucblogo-code"; + version = "6.2.4"; + + src = fetchFromGitHub { + owner = "jrincayc"; + repo = "ucblogo-code"; + rev = "ca23b30a62eaaf03ea203ae71d00dc45a046514e"; + hash = "sha256-BVNKkT0YUqI/z5W6Y/u3WbrHmaw7Z165vFt/mlzjd+8="; + }; + + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + texinfo + tetex + wrapGAppsHook3 + ]; + + buildInputs = [ + wxGTK32 + ]; + + meta = with lib; { + description = "Berkeley Logo interpreter"; + homepage = "https://github.com/jrincayc/ucblogo-code"; + changelog = "https://github.com/jrincayc/ucblogo-code/blob/${finalAttrs.src.rev}/changes.txt"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ matthewcroughan ]; + mainProgram = "ucblogo-code"; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/uc/uclibc-ng/package.nix b/third_party/nixpkgs/pkgs/by-name/uc/uclibc-ng/package.nix index d2ce33e4ba..aee6f6f015 100644 --- a/third_party/nixpkgs/pkgs/by-name/uc/uclibc-ng/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/uc/uclibc-ng/package.nix @@ -59,11 +59,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uclibc-ng"; - version = "1.0.47"; + version = "1.0.48"; src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz"; - hash = "sha256-KaTWhKBto0TuPuCazCynZJ1ZKuP/hI9pgUXEbe8F78s="; + hash = "sha256-O/X8bMXLxFS2xHhCR1XG9x58FVeKLJZvAmBqpcVZbiE="; }; # 'ftw' needed to build acl, a coreutils dependency diff --git a/third_party/nixpkgs/pkgs/by-name/ue/ueberzugpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ue/ueberzugpp/package.nix index 82fe4ef72c..cc0e0cd795 100644 --- a/third_party/nixpkgs/pkgs/by-name/ue/ueberzugpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ue/ueberzugpp/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "ueberzugpp"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; rev = "v${version}"; - hash = "sha256-D+7a+3Vxrt+XUq7c2F2eqi8ZGQ2eZd37aTqighWEKPs="; + hash = "sha256-BuVInCYpogkn1CnQ2hqLaTi1KJ0mHEEfRIOrTIg9duY="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ue/ueviewer/package.nix b/third_party/nixpkgs/pkgs/by-name/ue/ueviewer/package.nix new file mode 100644 index 0000000000..7ce9fc3d18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ue/ueviewer/package.nix @@ -0,0 +1,97 @@ +{ gccStdenv +, lib +, fetchFromGitHub +, fetchpatch +, unstableGitUpdater +, libpng +, perl +, SDL2 +, zlib +}: + +gccStdenv.mkDerivation (finalAttrs: { + pname = "ueviewer"; + version = "0-unstable-2024-02-23"; + + src = fetchFromGitHub { + owner = "gildor2"; + repo = "UEViewer"; + rev = "a0bfb468d42be831b126632fd8a0ae6b3614f981"; + hash = "sha256-Cz4jK2jJMzz57/RcEzjIjD611vCy7l3xQ0pQZjneTFQ="; + }; + + patches = [ + # Fix compilation on Darwin + # Remove when https://github.com/gildor2/UEViewer/pull/319 merged + (fetchpatch { + name = "0001-ueviewer-Dont-use-c++2a-standard.patch"; + url = "https://github.com/gildor2/UEViewer/commit/d44bef038abca99c84d7f418aedcbcb761de58aa.patch"; + hash = "sha256-v68yoBLz0dUB3evlKApKuajKQiOwbJczVeW5oxYaVyw="; + }) + ]; + + postPatch = '' + patchShebangs build.sh Unreal/Shaders/make.pl Tools/genmake + + # Enable more verbose build output + # Unify -j arguments on make calls + # Show what's being run + substituteInPlace build.sh \ + --replace-fail '# echo ">> Debug: $*"' ' echo ">> Debug: $*"' \ + --replace-fail 'make -j 4 -f $makefile' 'make -f $makefile' \ + --replace-fail 'make -f $makefile' "make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}} -f \$makefile SHELL='sh -x'" + + # - Use correct compiler from stdenv + # - Use C++ compiler instead of relying on leniency + # -pipe breaks GCC on Darwin: clang-16: error: no input files + substituteInPlace Tools/genmake \ + --replace-fail 'my $platf = "gcc";' "my \$platf = \"$CXX\";" \ + --replace-fail '-pipe' "" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + perl + ]; + + buildInputs = [ + libpng + zlib + ] ++ lib.optionals (!gccStdenv.hostPlatform.isDarwin) [ + SDL2 + ]; + + enableParallelBuilding = true; + + buildPhase = '' + runHook preBuild + + ./build.sh + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 umodel $out/bin/umodel + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { + # Tags represent various milestones, nothing that can be mapped to a numerical version number + hardcodeZeroVersion = true; + }; + + meta = with lib; { + description = "Viewer and exporter for Unreal Engine 1-4 assets (aka umodel)"; + homepage = "https://www.gildor.org/en/projects/umodel"; + license = licenses.mit; + mainProgram = "umodel"; + maintainers = with maintainers; [ OPNA2608 ]; + # Hardcoded usage of SSE2 + platforms = platforms.x86; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/uh/uhttpmock_1_0/package.nix b/third_party/nixpkgs/pkgs/by-name/uh/uhttpmock_1_0/package.nix new file mode 100644 index 0000000000..1cc16f96eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/uh/uhttpmock_1_0/package.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitLab +, meson +, mesonEmulatorHook +, ninja +, pkg-config +, gobject-introspection +, vala +, gtk-doc +, docbook-xsl-nons +, glib +, libsoup_3 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "uhttpmock"; + version = "0.10.0"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pwithnall"; + repo = "uhttpmock"; + rev = finalAttrs.version; + hash = "sha256-d3IVlPOLOLzlUDuGOLll8pOK5FMsXI/d2wbwPZ6WI34="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + + propagatedBuildInputs = [ + glib + libsoup_3 + ]; + + meta = with lib; { + description = "Project for mocking web service APIs which use HTTP or HTTPS"; + homepage = "https://gitlab.freedesktop.org/pwithnall/uhttpmock/"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix b/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix index 5e21f43076..e6f518fc09 100644 --- a/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix @@ -1,17 +1,21 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, pkg-config -, audioSupport ? true -, darwin -, alsa-lib +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + audioSupport ? true, + darwin, + alsa-lib, -# passthru.tests.run -, runCommand -, uiua + # passthru.tests.run + runCommand, + uiua, }: +let + inherit (darwin.apple_sdk.frameworks) AppKit AudioUnit CoreServices; +in rustPlatform.buildRustPackage rec { pname = "uiua"; version = "0.10.3"; @@ -25,19 +29,17 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-R97KO3MYmtO9C1Hi9kU+1FDdbOCVQk+gwVXTTvbeok4="; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ - rustPlatform.bindgenHook - ] ++ lib.optionals audioSupport [ - pkg-config - ]; + nativeBuildInputs = + lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ] + ++ lib.optionals audioSupport [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ] ++ lib.optionals (audioSupport && stdenv.isDarwin) [ - darwin.apple_sdk.frameworks.AudioUnit - ] ++ lib.optionals (audioSupport && stdenv.isLinux) [ - alsa-lib - ]; + buildInputs = + lib.optionals stdenv.isDarwin [ + AppKit + CoreServices + ] + ++ lib.optionals (audioSupport && stdenv.isDarwin) [ AudioUnit ] + ++ lib.optionals (audioSupport && stdenv.isLinux) [ alsa-lib ]; buildFeatures = lib.optional audioSupport "audio"; @@ -59,6 +61,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.uiua.org/"; license = lib.licenses.mit; mainProgram = "uiua"; - maintainers = with lib.maintainers; [ cafkafk tomasajt defelo ]; + maintainers = with lib.maintainers; [ + cafkafk + tomasajt + defelo + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/un/unciv/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unciv/package.nix index b73b581137..c849498f1b 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/unciv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/unciv/package.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.11.4"; + version = "4.11.10"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-QqnM1kTXHHpf8l99J8ydIjTkl/LetijzIJgLYt6OaRA="; + hash = "sha256-RBdMgxJRVM8dj4eDh/ZAzJkyWoAJnpge3Vg25H9+Eak="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/by-name/un/unipicker/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unipicker/package.nix new file mode 100644 index 0000000000..5f0bca5ef9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/un/unipicker/package.nix @@ -0,0 +1,47 @@ +{ + stdenv, + fetchFromGitHub, + lib, + fzf, + xclip, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "unipicker"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "jeremija"; + repo = "unipicker"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Br9nCK5eWoSN1i4LM2F31B62L9vuN5KzjS9pC9lq9oM="; + }; + + buildInputs = [ + fzf + xclip + ]; + + preInstall = '' + substituteInPlace unipicker \ + --replace-fail "/etc/unipickerrc" "$out/etc/unipickerrc" \ + --replace-fail "fzf" "${fzf}/bin/fzf" + substituteInPlace unipickerrc \ + --replace-fail "/usr/local" "$out" \ + --replace-fail "fzf" "${fzf}/bin/fzf" + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "DESTDIR=${placeholder "out"}" + ]; + + meta = { + description = "A CLI utility for searching unicode characters by description and optionally copying them to clipboard"; + homepage = "https://github.com/jeremija/unipicker"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.unix; + mainProgram = "unipicker"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/un/unison/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unison/package.nix index 2d68ba5799..f512d775ea 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/unison/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/unison/package.nix @@ -4,20 +4,20 @@ , ocamlPackages , copyDesktopItems , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 , gsettings-desktop-schemas , enableX11 ? !stdenv.isDarwin }: stdenv.mkDerivation (finalAttrs: { pname = "unison"; - version = "2.53.4"; + version = "2.53.5"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${finalAttrs.version}"; - hash = "sha256-nFT6FjlQjh6qx0fepmT4aiQj2SxA7U/as+IU9xXNok0="; + hash = "sha256-XCdK38jG7tRI+/Zk72JVY8a/pPJF6KVaf8l2s3hgxLs="; }; strictDeps = true; @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] - ++ lib.optionals enableX11 [ copyDesktopItems wrapGAppsHook ]; + ++ lib.optionals enableX11 [ copyDesktopItems wrapGAppsHook3 ]; buildInputs = lib.optionals enableX11 [ gsettings-desktop-schemas ocamlPackages.lablgtk3 ]; makeFlags = [ "PREFIX=$(out)" ] diff --git a/third_party/nixpkgs/pkgs/by-name/un/universal-android-debloater/package.nix b/third_party/nixpkgs/pkgs/by-name/un/universal-android-debloater/package.nix index 6ce6fb28a8..f48cfebe0e 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/universal-android-debloater/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/universal-android-debloater/package.nix @@ -6,6 +6,8 @@ , freetype , lib , libglvnd +, libxkbcommon +, wayland , makeWrapper , mold , pkg-config @@ -47,7 +49,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/uad-ng \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype libglvnd xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype libglvnd libxkbcommon wayland xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr ]} \ --suffix PATH : ${lib.makeBinPath [ android-tools ]} ''; @@ -57,7 +59,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation"; license = licenses.gpl3Only; mainProgram = "uad-ng"; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ lavafroth ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/un/unrar/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unrar/package.nix index ea97195c2a..d99a991ebc 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/unrar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/un/unrar/package.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "unrar"; - version = "7.0.7"; + version = "7.0.8"; src = fetchzip { url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; stripRoot = false; - hash = "sha256-S7BMywydetDh1GINcK3k3fN9ciDoKTCAe/1tkgykoAQ="; + hash = "sha256-oyLU4LkjzqjpiPLMpsTJWqaF9Tr4Tg441vXo3JiORDo="; }; sourceRoot = finalAttrs.src.name; diff --git a/third_party/nixpkgs/pkgs/development/tools/upbound/default.nix b/third_party/nixpkgs/pkgs/by-name/up/upbound/package.nix similarity index 80% rename from third_party/nixpkgs/pkgs/development/tools/upbound/default.nix rename to third_party/nixpkgs/pkgs/by-name/up/upbound/package.nix index 92031aa6dd..421be958b1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/upbound/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/up/upbound/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "upbound"; - version = "0.28.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-74kmEjJTcFYRgbuH8hFPS+sadVWk7FkFE+MrapQw/lw="; + sha256 = "sha256-KAWyHlqgj4xz3abSSa1cezpeDTmJbGSZAMffq3p/CyI="; }; - vendorHash = "sha256-hNEM8U+3T4biEqGoN2ClKLSgKlfT/eoUkQQGiTrR2vM="; + vendorHash = "sha256-4o1WJHGHiO9r8RC8hr4KWZBiC8h52la1gKdYaYxEjbk="; subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/up/updatecli/package.nix b/third_party/nixpkgs/pkgs/by-name/up/updatecli/package.nix index 6f0022f127..c3999383ba 100644 --- a/third_party/nixpkgs/pkgs/by-name/up/updatecli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/up/updatecli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "updatecli"; - version = "0.75.0"; + version = "0.77.0"; src = fetchFromGitHub { owner = "updatecli"; repo = pname; rev = "v${version}"; - hash = "sha256-8jQCwnc/kj3m/02nrA/na422rrvxxF7D3LzUen3O6ms="; + hash = "sha256-sBkTdr4/DqNrCxtaM1tVTx+rQ1dvJ1KwlFvAJHIZCuw="; }; - vendorHash = "sha256-7LC5gzK54u8zEtDOyeU1kgIycGLxOeMWYrrDTvC3gVQ="; + vendorHash = "sha256-xY2nNDMnUyV2sOMOJfSHbXaEU/gOKfZkA77d0lhDlgg="; # tests require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/up/uplosi/package.nix b/third_party/nixpkgs/pkgs/by-name/up/uplosi/package.nix index 775657e5a6..f58db5625a 100644 --- a/third_party/nixpkgs/pkgs/by-name/up/uplosi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/up/uplosi/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "uplosi"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "edgelesssys"; repo = pname; rev = "v${version}"; - hash = "sha256-TrHREV/bmrjwlE4bsXZDKvIQKa68AnUSktnqCKdvOe8="; + hash = "sha256-i/RVCoeQLeOaPaEtJS/l+42CVohMucA6cBBt0mdJ4uE="; }; - vendorHash = "sha256-0uQBhNRP3OGn3hw6Mx6tRliTqIhoBnyfRmdtdtuYwaY="; + vendorHash = "sha256-f8Yz99qlN0S0Ybewifc0VQanYXKinb1togBkUwDPSvw="; CGO_ENABLED = "0"; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/up/ups/package.nix b/third_party/nixpkgs/pkgs/by-name/up/ups/package.nix new file mode 100644 index 0000000000..bfd743a823 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/up/ups/package.nix @@ -0,0 +1,24 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: +buildGoModule rec { + pname = "ups"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "rameshvarun"; + repo = "ups"; + rev = "v${version}"; + sha256 = "sha256-7AuZ1gyp8tAWHM0Ry54tKucPJ3enaGDtvrM1J8uBIT8="; + }; + + vendorHash = "sha256-c6aE6iD6yCnnuSEDhhr3v1ArcfLmSP8QhS7Cz7rtVHs="; + + meta = with lib; { + description = "Command line tool for creating and applying UPS patch files"; + homepage = "https://github.com/rameshvarun/ups"; + license = licenses.mit; + maintainers = with maintainers; [ ruby0b ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/up/upsun/package.nix b/third_party/nixpkgs/pkgs/by-name/up/upsun/package.nix index 5e2d53d786..3aac03e985 100644 --- a/third_party/nixpkgs/pkgs/by-name/up/upsun/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/up/upsun/package.nix @@ -5,14 +5,22 @@ stdenvNoCC.mkDerivation rec { version = "5.0.12"; src = { - x86_64-linux = fetchurl { + x86_64-darwin = (fetchurl { + url = "https://github.com/platformsh/cli/releases/download/${version}/upsun_${version}_darwin_all.tar.gz"; + hash = "sha256-RwTMJwvkuX/okHSyxzpvaD6uD8fheVbr7bgBC2eMQOo="; + }); + aarch64-darwin = (fetchurl { + url = "https://github.com/platformsh/cli/releases/download/${version}/upsun_${version}_darwin_all.tar.gz"; + hash = "sha256-RwTMJwvkuX/okHSyxzpvaD6uD8fheVbr7bgBC2eMQOo="; + }); + x86_64-linux = (fetchurl { url = "https://github.com/platformsh/cli/releases/download/${version}/upsun_${version}_linux_amd64.tar.gz"; hash = "sha256-svEPMVY7r7pAoXwFIMYqCEduqR3Nkocaguf2nIGt+G8="; - }; - aarch64-linux = fetchurl { + }); + aarch64-linux = (fetchurl { url = "https://github.com/platformsh/cli/releases/download/${version}/upsun_${version}_linux_arm64.tar.gz"; hash = "sha256-ZraS/PqSPL/kcj5o6hzDdL70IV2IWXOma6OHCiXIDQc="; - }; + }); }.${stdenvNoCC.system} or (throw "${pname}-${version}: ${stdenvNoCC.system} is unsupported."); dontConfigure = true; @@ -26,9 +34,10 @@ stdenvNoCC.mkDerivation rec { meta = { homepage = "https://github.com/platformsh/cli"; description = "The unified tool for managing your Upsun services from the command line"; + mainProgram = "upsun"; maintainers = with lib.maintainers; [ spk ]; license = lib.licenses.mit; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/us/usql/package.nix b/third_party/nixpkgs/pkgs/by-name/us/usql/package.nix index 27ea4e6bb9..1297da876c 100644 --- a/third_party/nixpkgs/pkgs/by-name/us/usql/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/us/usql/package.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "usql"; - version = "0.18.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-2/qB05LQGw4XjnODn0dzuTVqkc9X6YACJ45z+/juHXk="; + hash = "sha256-O0NsxOPp09W6FFdVjoCBUDSEkMct/MX/sLWDpoCmwwM="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-PFXULlYMSUoJ23jDA3CTImiUAlcoqHoh1zq+749qO2g="; + vendorHash = "sha256-4WGxstIwjq7u+4UZ03IAONi58Vlg3p82fEOkfPS3eT4="; proxyVendor = true; # Exclude drivers from the bad group diff --git a/third_party/nixpkgs/pkgs/by-name/us/ustr/package.nix b/third_party/nixpkgs/pkgs/by-name/us/ustr/package.nix new file mode 100644 index 0000000000..0da9320675 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/us/ustr/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchgit, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ustr"; + version = "1.0.4"; + + src = fetchgit { + url = "http://www.and.org/ustr/ustr.git"; + rev = "v${finalAttrs.version}"; + hash = "sha256-pQrQy+S9fVFl8Mop4QmwEAXGiBSheQE4HgAZ4srFz64="; + }; + + # Fixes bogus warnings that failed libsemanage + patches = [ ./va_args.patch ]; + + # Work around gcc5 switch to gnu11 + env.NIX_CFLAGS_COMPILE = "-std=gnu89"; + + # Fix detection of stdint.h + postPatch = '' + substituteInPlace Makefile \ + --replace-fail "have_stdint_h=0" "have_stdint_h=1" + + cat ustr-import.in | grep USTR_CONF + substituteInPlace ustr-import.in \ + --replace-fail "USTR_CONF_HAVE_STDINT_H 0" "USTR_CONF_HAVE_STDINT_H 1" + ''; + + makeFlags = [ + "prefix=${placeholder "out"}" + "LDCONFIG=echo" + "HIDE=" + ]; + + # Remove debug libraries + postInstall = '' + find $out/lib -name \*debug\* -delete + ''; + + meta = with lib; { + homepage = "http://www.and.org/ustr/"; + description = "Micro String API for C language"; + mainProgram = "ustr-import"; + license = licenses.bsd2; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/ustr/va_args.patch b/third_party/nixpkgs/pkgs/by-name/us/ustr/va_args.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/ustr/va_args.patch rename to third_party/nixpkgs/pkgs/by-name/us/ustr/va_args.patch diff --git a/third_party/nixpkgs/pkgs/by-name/uu/uuu/package.nix b/third_party/nixpkgs/pkgs/by-name/uu/uuu/package.nix index 4166d99d34..d0fa46bb6a 100755 --- a/third_party/nixpkgs/pkgs/by-name/uu/uuu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/uu/uuu/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uuu"; - version = "1.5.179"; + version = "1.5.181"; src = fetchFromGitHub { owner = "nxp-imx"; repo = "mfgtools"; rev = "uuu_${finalAttrs.version}"; - hash = "sha256-W0jFwivjD19SQmXz2G7cIvWh1zkyN4AXh3bfqF302MA="; + hash = "sha256-HMpirdXpcBFTkO7anGDIjsBJKjQ+kIN4kDhPlcqIDqY="; }; passthru.updateScript = nix-update-script { diff --git a/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock index 2044212a42..ecdb3054e6 100644 --- a/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock @@ -75,15 +75,16 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] @@ -127,6 +128,15 @@ version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "arc-swap" version = "1.7.1" @@ -200,9 +210,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" +checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693" dependencies = [ "brotli", "bzip2", @@ -229,9 +239,9 @@ dependencies = [ [[package]] name = "async_http_range_reader" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8561e6613f8361df8bed11c0eef05b98384643bc81f6b753eec7c1d91f097509" +checksum = "f1a0e0571c5d724d17fbe0b608d31a91e94938722c141877d3a2982216b084c2" dependencies = [ "bisection", "futures", @@ -308,9 +318,9 @@ dependencies = [ [[package]] name = "axoupdater" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04daf26062f90764242d0e144ad52d1952cb0d02ef7ce3ffbb9127b4f1340f36" +checksum = "aa409472ff4f15f57ed338dc73f9586b3ee244c65ddbaa1f4f9bdbb26c9bd4f6" dependencies = [ "axoasset", "axoprocess", @@ -377,17 +387,31 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bench" version = "0.0.0" dependencies = [ + "anyhow", + "codspeed-criterion-compat", "criterion", "distribution-filename", + "distribution-types", + "fs-err", + "once_cell", + "pep508_rs", "platform-tags", + "tempfile", + "tokio", + "uv-cache", + "uv-client", + "uv-configuration", + "uv-interpreter", + "uv-resolver", + "uv-types", ] [[package]] @@ -431,9 +455,9 @@ dependencies = [ [[package]] name = "brotli" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "125740193d7fee5cc63ab9e16c2fdc4e07c74ba755cc53b327d6ea029e9fc569" +checksum = "19483b140a7ac7174d34b5a581b406c64f84da5409d3e09cf4fff604f9270e67" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -442,9 +466,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65622a320492e09b5e0ac436b14c54ff68199bac392d0e89a6832c4518eea525" +checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -557,9 +581,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2d9a9a8d3e0b61b1110c49ab8f6ed7a76ce4f2b1d53ae48a83152d3d5e8f5b" +checksum = "f6e977de2867ec90a1654882ff95ca5849a526e893bab588f84664cfcdb11c0a" dependencies = [ "anyhow", "core-foundation", @@ -628,7 +652,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -749,6 +773,28 @@ dependencies = [ "cc", ] +[[package]] +name = "codspeed" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a104ac948e0188b921eb3fcbdd55dcf62e542df4c7ab7e660623f6288302089" +dependencies = [ + "colored", + "libc", + "serde_json", +] + +[[package]] +name = "codspeed-criterion-compat" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "722c36bdc62d9436d027256ce2627af81ac7a596dfc7d13d849d0d212448d7fe" +dependencies = [ + "codspeed", + "colored", + "criterion", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -761,6 +807,16 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + [[package]] name = "concurrent-queue" version = "2.4.0" @@ -834,6 +890,7 @@ dependencies = [ "ciborium", "clap", "criterion-plot", + "futures", "is-terminal", "itertools 0.10.5", "num-traits", @@ -844,6 +901,7 @@ dependencies = [ "serde_derive", "serde_json", "tinytemplate", + "tokio", "walkdir", ] @@ -944,9 +1002,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "data-url" @@ -983,6 +1041,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + [[package]] name = "diff" version = "0.1.13" @@ -1027,6 +1096,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + [[package]] name = "distribution-filename" version = "0.0.1" @@ -1049,6 +1129,8 @@ dependencies = [ "cache-key", "distribution-filename", "fs-err", + "git2", + "indexmap", "itertools 0.12.1", "once_cell", "pep440_rs", @@ -1189,9 +1271,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "libz-ng-sys", @@ -1618,9 +1700,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f24ce812868d86d19daa79bf3bf9175bc44ea323391147a5e3abde2a283871b" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", @@ -1857,6 +1939,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.10.5" @@ -1907,12 +1995,12 @@ dependencies = [ [[package]] name = "junction" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca39ef0d69b18e6a2fd14c2f0a1d593200f4a4ed949b240b5917ab51fac754cb" +checksum = "1c9c415a9b7b1e86cd5738f39d34c9e78c765da7fb1756dbd7d31b3b0d2e7afa" dependencies = [ "scopeguard", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -1961,9 +2049,9 @@ dependencies = [ [[package]] name = "libmimalloc-sys" -version = "0.1.35" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "81eb4061c0582dedea1cbc7aff2240300dd6982e0239d1c99e65c1dbf4a30ba7" dependencies = [ "cc", "libc", @@ -2045,9 +2133,9 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "mailparse" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d096594926cab442e054e047eb8c1402f7d5b2272573b97ba68aa40629f9757" +checksum = "3da03d5980411a724e8aaf7b61a7b5e386ec55a7fb49ee3d0ff79efc7e5e7c7e" dependencies = [ "charset", "data-encoding", @@ -2148,9 +2236,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.39" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +checksum = "9f41a2280ded0da56c8cf898babb86e8f10651a34adcfff190ae9a1159c6908d" dependencies = [ "libmimalloc-sys", ] @@ -2269,6 +2357,27 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.58", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -2453,6 +2562,7 @@ name = "pep508_rs" version = "0.4.2" dependencies = [ "derivative", + "indexmap", "insta", "log", "once_cell", @@ -2468,6 +2578,7 @@ dependencies = [ "unicode-width", "url", "uv-fs", + "uv-git", "uv-normalize", ] @@ -2681,6 +2792,15 @@ dependencies = [ "indexmap", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + [[package]] name = "proc-macro2" version = "1.0.79" @@ -2713,7 +2833,7 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=c26e485213e39582c6f2e4d45c0328422670e7a7#c26e485213e39582c6f2e4d45c0328422670e7a7" +source = "git+https://github.com/astral-sh/pubgrub?rev=0e684a874c9fb8f74738cd8875524c80e3d4820b#0e684a874c9fb8f74738cd8875524c80e3d4820b" dependencies = [ "indexmap", "log", @@ -2724,15 +2844,15 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" dependencies = [ "cfg-if", "indoc", "libc", "memoffset 0.9.1", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -2742,9 +2862,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" dependencies = [ "once_cell", "target-lexicon", @@ -2752,9 +2872,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" dependencies = [ "libc", "pyo3-build-config", @@ -2762,9 +2882,9 @@ dependencies = [ [[package]] name = "pyo3-log" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd" +checksum = "2af49834b8d2ecd555177e63b273b708dea75150abc6f5341d0a6e1a9623976c" dependencies = [ "arc-swap", "log", @@ -2773,9 +2893,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -2785,9 +2905,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -2933,13 +3053,13 @@ dependencies = [ [[package]] name = "reflink-copy" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52b1349400e2ffd64a9fb5ed9008e33c0b8ef86bd5bae8f73080839c7082f1d5" +checksum = "7c3138c30c59ed9b8572f82bed97ea591ecd7e45012566046cc39e72679cff22" dependencies = [ "cfg-if", "rustix", - "windows 0.54.0", + "windows 0.56.0", ] [[package]] @@ -3001,10 +3121,12 @@ version = "0.0.1" dependencies = [ "anyhow", "assert_fs", + "distribution-types", "fs-err", "indoc", "insta", "itertools 0.12.1", + "pep440_rs", "pep508_rs", "regex", "reqwest", @@ -3012,6 +3134,7 @@ dependencies = [ "serde", "tempfile", "test-case", + "thiserror", "tokio", "tracing", "unscanny", @@ -3030,7 +3153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "async-compression", - "base64 0.22.0", + "base64 0.22.1", "bytes", "futures-channel", "futures-core", @@ -3191,9 +3314,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -3202,9 +3325,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -3306,7 +3429,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "rustls-pki-types", ] @@ -3369,26 +3492,27 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.16" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" +checksum = "7f55c82c700538496bdc329bb4918a81f87cc8888811bd123cf325a0f2f8d309" dependencies = [ "dyn-clone", "schemars_derive", "serde", "serde_json", + "url", ] [[package]] name = "schemars_derive" -version = "0.8.16" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" +checksum = "83263746fe5e32097f06356968a077f96089739c927a61450efa069905eec108" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] @@ -3434,18 +3558,18 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", @@ -3454,20 +3578,20 @@ dependencies = [ [[package]] name = "serde_derive_internals" -version = "0.26.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -3814,9 +3938,9 @@ dependencies = [ [[package]] name = "test-log" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b319995299c65d522680decf80f2c108d85b861d81dfe340a10d16cee29d9e6" +checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" dependencies = [ "test-log-macros", "tracing-subscriber", @@ -3855,18 +3979,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", @@ -4029,9 +4153,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -4039,7 +4163,6 @@ dependencies = [ "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -4051,7 +4174,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.22.9", ] [[package]] @@ -4063,6 +4186,17 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + [[package]] name = "toml_edit" version = "0.22.9" @@ -4073,7 +4207,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.5", ] [[package]] @@ -4304,9 +4438,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unindent" @@ -4397,14 +4531,14 @@ checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "uv" -version = "0.1.35" +version = "0.1.42" dependencies = [ "anstream", "anyhow", "assert_cmd", "assert_fs", "axoupdater", - "base64 0.22.0", + "base64 0.22.1", "byteorder", "chrono", "clap", @@ -4413,6 +4547,7 @@ dependencies = [ "filetime", "flate2", "fs-err", + "indexmap", "indicatif", "indoc", "insta", @@ -4421,6 +4556,7 @@ dependencies = [ "miette", "mimalloc", "owo-colors", + "pep440_rs", "pep508_rs", "platform-tags", "predicates", @@ -4436,6 +4572,7 @@ dependencies = [ "thiserror", "tikv-jemallocator", "tokio", + "toml", "tracing", "tracing-durations-export", "tracing-subscriber", @@ -4454,7 +4591,6 @@ dependencies = [ "uv-normalize", "uv-requirements", "uv-resolver", - "uv-toolchain", "uv-types", "uv-virtualenv", "uv-warnings", @@ -4465,19 +4601,19 @@ dependencies = [ name = "uv-auth" version = "0.0.1" dependencies = [ + "anyhow", "async-trait", - "base64 0.22.0", + "base64 0.22.1", + "futures", "http", "insta", + "once-map", "once_cell", "reqwest", "reqwest-middleware", "rust-netrc", - "schemars", - "serde", "tempfile", "test-log", - "thiserror", "tokio", "tracing", "url", @@ -4519,7 +4655,6 @@ name = "uv-cache" version = "0.0.1" dependencies = [ "cache-key", - "cachedir", "clap", "directories", "distribution-types", @@ -4593,6 +4728,7 @@ version = "0.0.1" dependencies = [ "anyhow", "clap", + "distribution-types", "itertools 0.12.1", "pep508_rs", "platform-tags", @@ -4600,6 +4736,7 @@ dependencies = [ "schemars", "serde", "serde_json", + "tracing", "uv-auth", "uv-cache", "uv-normalize", @@ -4611,7 +4748,6 @@ version = "0.0.1" dependencies = [ "anstream", "anyhow", - "chrono", "clap", "distribution-filename", "distribution-types", @@ -4648,8 +4784,8 @@ dependencies = [ "uv-installer", "uv-interpreter", "uv-normalize", + "uv-requirements", "uv-resolver", - "uv-toolchain", "uv-types", "uv-workspace", "walkdir", @@ -4688,7 +4824,6 @@ dependencies = [ "fs-err", "futures", "install-wheel-rs", - "md-5", "nanoid", "once_cell", "pep440_rs", @@ -4700,7 +4835,6 @@ dependencies = [ "rmp-serde", "rustc-hash", "serde", - "sha2", "tempfile", "thiserror", "tokio", @@ -4744,6 +4878,7 @@ name = "uv-fs" version = "0.0.1" dependencies = [ "backoff", + "cachedir", "dunce", "encoding_rs_io", "fs-err", @@ -4763,7 +4898,7 @@ name = "uv-git" version = "0.0.1" dependencies = [ "anyhow", - "base64 0.22.0", + "base64 0.22.1", "cache-key", "cargo-util", "fs-err", @@ -4786,6 +4921,8 @@ version = "0.0.1" dependencies = [ "anyhow", "async-channel", + "cache-key", + "distribution-filename", "distribution-types", "fs-err", "futures", @@ -4796,7 +4933,6 @@ dependencies = [ "pypi-types", "rayon", "requirements-txt", - "rmp-serde", "rustc-hash", "serde", "tempfile", @@ -4813,6 +4949,7 @@ dependencies = [ "uv-fs", "uv-interpreter", "uv-normalize", + "uv-requirements", "uv-types", "uv-warnings", "walkdir", @@ -4826,6 +4963,7 @@ dependencies = [ "cache-key", "configparser", "fs-err", + "futures", "indoc", "insta", "install-wheel-rs", @@ -4836,16 +4974,23 @@ dependencies = [ "platform-tags", "pypi-types", "regex", + "reqwest", + "reqwest-middleware", "rmp-serde", "same-file", + "schemars", "serde", "serde_json", "tempfile", "thiserror", + "tokio-util", "tracing", + "url", "uv-cache", + "uv-client", + "uv-extract", "uv-fs", - "uv-toolchain", + "uv-warnings", "which", "winapi", ] @@ -4872,11 +5017,18 @@ dependencies = [ "distribution-types", "fs-err", "futures", + "glob", "indexmap", + "indoc", + "insta", + "itertools 0.12.1", + "path-absolutize", + "pep440_rs", "pep508_rs", "pypi-types", "requirements-txt", "rustc-hash", + "schemars", "serde", "thiserror", "toml", @@ -4886,6 +5038,7 @@ dependencies = [ "uv-configuration", "uv-distribution", "uv-fs", + "uv-git", "uv-normalize", "uv-resolver", "uv-types", @@ -4941,46 +5094,18 @@ dependencies = [ "uv-warnings", ] -[[package]] -name = "uv-toolchain" -version = "0.1.0" -dependencies = [ - "anyhow", - "fs-err", - "futures", - "once_cell", - "pep440_rs", - "pep508_rs", - "reqwest", - "reqwest-middleware", - "schemars", - "serde", - "tempfile", - "thiserror", - "tokio", - "tokio-util", - "tracing", - "url", - "uv-client", - "uv-extract", - "uv-fs", -] - [[package]] name = "uv-types" version = "0.0.1" dependencies = [ "anyhow", - "clap", "distribution-types", - "itertools 0.12.1", "once-map", "pep440_rs", "pep508_rs", "pypi-types", + "requirements-txt", "rustc-hash", - "serde", - "serde_json", "thiserror", "url", "uv-cache", @@ -4991,17 +5116,17 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.1.35" +version = "0.1.42" [[package]] name = "uv-virtualenv" version = "0.0.4" dependencies = [ "anstream", - "cachedir", "clap", "directories", "fs-err", + "itertools 0.12.1", "pathdiff", "platform-tags", "pypi-types", @@ -5011,6 +5136,7 @@ dependencies = [ "uv-cache", "uv-fs", "uv-interpreter", + "uv-version", ] [[package]] @@ -5031,18 +5157,16 @@ dependencies = [ "distribution-types", "fs-err", "install-wheel-rs", - "pep508_rs", "schemars", "serde", "thiserror", "toml", "tracing", - "uv-auth", "uv-configuration", "uv-fs", + "uv-interpreter", "uv-normalize", "uv-resolver", - "uv-toolchain", "uv-warnings", ] @@ -5306,19 +5430,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-implement", - "windows-interface", - "windows-targets 0.52.4", + "windows-implement 0.52.0", + "windows-interface 0.52.0", + "windows-targets 0.52.5", ] [[package]] name = "windows" -version = "0.54.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ - "windows-core 0.54.0", - "windows-targets 0.52.4", + "windows-core 0.56.0", + "windows-targets 0.52.5", ] [[package]] @@ -5327,17 +5451,19 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] name = "windows-core" -version = "0.54.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" dependencies = [ + "windows-implement 0.56.0", + "windows-interface 0.56.0", "windows-result", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5351,6 +5477,17 @@ dependencies = [ "syn 2.0.58", ] +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + [[package]] name = "windows-interface" version = "0.52.0" @@ -5363,12 +5500,23 @@ dependencies = [ ] [[package]] -name = "windows-result" -version = "0.1.0" +name = "windows-interface" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ - "windows-targets 0.52.4", + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "windows-result" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] @@ -5386,7 +5534,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5406,17 +5554,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "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_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -5427,9 +5576,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -5439,9 +5588,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -5451,9 +5600,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -5463,9 +5618,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -5475,9 +5630,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -5487,9 +5642,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -5499,9 +5654,18 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] [[package]] name = "winnow" @@ -5606,14 +5770,18 @@ checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] name = "zip" -version = "0.6.6" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" dependencies = [ - "byteorder", + "arbitrary", "crc32fast", "crossbeam-utils", + "displaydoc", "flate2", + "indexmap", + "num_enum", + "thiserror", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix b/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix index f4aab33401..3b24f93f62 100644 --- a/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.1.35"; + version = "0.1.42"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = version; - hash = "sha256-GcAvpX7oanJ8G1dgTyTa8jk9xhTroF2G+ir8j7Yua1M="; + hash = "sha256-yfPipwfnHAPuzQqi9Jh1FFdZ2C9pCqStIf/Yu2KxQJs="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs="; - "pubgrub-0.2.1" = "sha256-sqC7R2mtqymYFULDW0wSbM/MKCZc8rP7Yy/gaQpjYEI="; + "pubgrub-0.2.1" = "sha256-mAPyo2R996ymzCt6TAX2G7xU1C3vDGjYF0z7R8lI1yg="; }; }; @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/astral-sh/uv"; changelog = "https://github.com/astral-sh/uv/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ GaetanLepage ]; mainProgram = "uv"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix b/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix index 9180f1b3d9..3bd43ac3dd 100644 --- a/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "unstable-2024-04-15"; + version = "1.0-unstable-2024-05-06"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "b0bfb38dccff4ff7b0fa6d384651f7847a76fd1f"; - hash = "sha256-OLrIIrcIfFI96+Q2fc0JSqJHBMcoN9+LL5E/YCN21Kc="; + rev = "3a696f8fa9931857e99e50074c6994649ee62d37"; + hash = "sha256-wJUyFuF7ZCKQSa3RvklQYTDGmuQa062w5E2h0/aI0cQ="; }; outputs = [ "out" "projects" ]; diff --git a/third_party/nixpkgs/pkgs/servers/uxplay/default.nix b/third_party/nixpkgs/pkgs/by-name/ux/uxplay/package.nix similarity index 70% rename from third_party/nixpkgs/pkgs/servers/uxplay/default.nix rename to third_party/nixpkgs/pkgs/by-name/ux/uxplay/package.nix index 0eecf8e8c5..53c2c76f5a 100644 --- a/third_party/nixpkgs/pkgs/servers/uxplay/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ux/uxplay/package.nix @@ -1,25 +1,27 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, openssl -, libplist -, pkg-config -, wrapGAppsHook -, avahi -, avahi-compat -, gst_all_1 +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + openssl, + libplist, + pkg-config, + wrapGAppsHook3, + avahi, + avahi-compat, + gst_all_1, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "uxplay"; - version = "1.68.2"; + version = "1.68.3"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ax2RhIIWb7BvBvE8GQlR3lwTSA5P5Qpj45cOc8xZNtY="; + hash = "sha256-Ev+VXI37zLRQ3yqllJVo1JZK/U82HeB65Hi9+c0O8Ks="; }; postPatch = '' @@ -33,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { openssl libplist pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -47,12 +49,15 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-libav ]; + passthru.updateScript = nix-update-script { }; + meta = { + changelog = "https://github.com/FDH2/UxPlay/releases/tag/v${finalAttrs.version}"; description = "AirPlay Unix mirroring server"; homepage = "https://github.com/FDH2/UxPlay"; license = lib.licenses.gpl3Plus; + mainProgram = "uxplay"; maintainers = [ lib.maintainers.azuwis ]; platforms = lib.platforms.unix; - mainProgram = "uxplay"; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/va/vale-ls/package.nix b/third_party/nixpkgs/pkgs/by-name/va/vale-ls/package.nix new file mode 100644 index 0000000000..b79f94c762 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/va/vale-ls/package.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, rustPlatform +, pkg-config +, openssl +, darwin +, vale +}: + +rustPlatform.buildRustPackage { + pname = "vale-ls"; + version = "0.3.7-unstable-2024-03-13"; + + src = fetchFromGitHub { + owner = "errata-ai"; + repo = "vale-ls"; + rev = "473e16bc88ec48b35e2bd208adc174878c4d5396"; + hash = "sha256-ywJsnWMc9NSjYjsK6SXdMAQl+hcP+KQ7Xp1A99aeqAg="; + }; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + pkg-config + makeWrapper + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + SystemConfiguration + ]); + + checkFlags = [ + # The following tests are reaching to the network. + "--skip=vale::tests" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # This test does not account for the existence of aarch64-linux machines, + # despite upstream shipping artifacts for that architecture + "--skip=utils::tests::arch" + ]; + + env.OPENSSL_NO_VENDOR = true; + + cargoHash = "sha256-ifKdSTmVWfDZF5Kn9b5JpzDxa160oRTfzjvxeL9POBg="; + + postInstall = '' + wrapProgram $out/bin/vale-ls \ + --prefix PATH : ${lib.makeBinPath [ vale ]} + ''; + + meta = with lib; { + description = "LSP implementation for the Vale command-line tool"; + homepage = "https://github.com/errata-ai/vale-ls"; + license = licenses.mit; + mainProgram = "vale-ls"; + maintainers = with maintainers; [ foo-dogsquared jansol ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/by-name/va/valkey/package.nix b/third_party/nixpkgs/pkgs/by-name/va/valkey/package.nix new file mode 100644 index 0000000000..60c8669926 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/va/valkey/package.nix @@ -0,0 +1,85 @@ +{ lib, stdenv, fetchFromGitHub, lua, jemalloc, pkg-config +, tcl, which, ps, getconf +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd +# dependency ordering is broken at the moment when building with openssl +, tlsSupport ? !stdenv.hostPlatform.isStatic, openssl + +# Using system jemalloc fixes cross-compilation and various setups. +# However the experimental 'active defragmentation' feature of valkey requires +# their custom patched version of jemalloc. +, useSystemJemalloc ? true +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "valkey"; + version = "7.2.5"; + + src = fetchFromGitHub { + owner = "valkey-io"; + repo = "valkey"; + rev = finalAttrs.version; + hash = "sha256-nDAQbxlSBXKSJqZgvElsrZeDnHw4A4eA8f9ecXdx0/U="; + }; + + patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ lua ] + ++ lib.optional useSystemJemalloc jemalloc + ++ lib.optional withSystemd systemd + ++ lib.optional tlsSupport openssl; + + preBuild = lib.optionalString stdenv.isDarwin '' + substituteInPlace src/Makefile --replace-fail "-flto" "" + ''; + + # More cross-compiling fixes. + makeFlags = [ "PREFIX=${placeholder "out"}" ] + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ] + ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ] + ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ]; + + enableParallelBuilding = true; + + hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); + + # darwin currently lacks a pure `pgrep` which is extensively used here + doCheck = !stdenv.isDarwin; + nativeCheckInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; + checkPhase = '' + runHook preCheck + + # disable test "Connect multiple replicas at the same time": even + # upstream find this test too timing-sensitive + substituteInPlace tests/integration/replication.tcl \ + --replace-fail 'foreach mdl {no yes}' 'foreach mdl {}' + + substituteInPlace tests/support/server.tcl \ + --replace-fail 'exec /usr/bin/env' 'exec env' + + sed -i '/^proc wait_load_handlers_disconnected/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \ + tests/support/util.tcl + + ./runtest \ + --no-latency \ + --timeout 2000 \ + --clients $NIX_BUILD_CORES \ + --tags -leaks \ + --skipunit integration/failover # flaky and slow + + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://valkey.io/"; + description = "A high-performance data structure server that primarily serves key/value workloads"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ rucadi ]; + changelog = "https://github.com/valkey-io/valkey/releases/tag/${finalAttrs.version}"; + mainProgram = "valkey-cli"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/va/valkey/use_system_jemalloc.patch b/third_party/nixpkgs/pkgs/by-name/va/valkey/use_system_jemalloc.patch new file mode 100644 index 0000000000..41451e3936 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/va/valkey/use_system_jemalloc.patch @@ -0,0 +1,15 @@ +diff --git a/src/Makefile b/src/Makefile +index 3bc9f11c0..a4b23d986 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -229,8 +229,8 @@ endif + + ifeq ($(MALLOC),jemalloc) + DEPENDENCY_TARGETS+= jemalloc +- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include +- FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS) ++ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc ++ FINAL_LIBS := -ljemalloc $(FINAL_LIBS) + endif + + ifeq ($(BUILD_TLS),yes) \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/by-name/va/valuta/package.nix b/third_party/nixpkgs/pkgs/by-name/va/valuta/package.nix new file mode 100644 index 0000000000..cabd2edc28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/va/valuta/package.nix @@ -0,0 +1,65 @@ +{ lib +, python3Packages +, fetchFromGitHub +, meson +, ninja +, pkg-config +, blueprint-compiler +, desktop-file-utils +, gtk4 +, gst_all_1 +, libsoup_3 +, libadwaita +, wrapGAppsHook4 +}: + +python3Packages.buildPythonApplication rec { + pname = "valuta"; + version = "1.2.0"; + + pyproject = false; + + src = fetchFromGitHub { + owner = "ideveCore"; + repo = "Valuta"; + rev = "v${version}"; + hash = "sha256-ygroF9hlmsjQTocly7CNL6zQi4N6h8va/ZkJ8w8QHms="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + blueprint-compiler + desktop-file-utils + wrapGAppsHook4 + ]; + + buildInputs = [ + gtk4 + gst_all_1.gstreamer + libsoup_3 + libadwaita + ]; + + propagatedBuildInputs = with python3Packages; [ + dbus-python + pygobject3 + ]; + + dontWrapGApps = true; + + # Arguments to be passed to `makeWrapper`, only used by buildPython* + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "A simple application for converting currencies, with support for various APIs"; + homepage = "https://github.com/ideveCore/Valuta"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ arthsmn ]; + mainProgram = "currencyconverter"; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/va/varia/package.nix b/third_party/nixpkgs/pkgs/by-name/va/varia/package.nix index 8b54794298..d638671a27 100644 --- a/third_party/nixpkgs/pkgs/by-name/va/varia/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/va/varia/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication rec { pname = "varia"; - version = "2024.3.20"; + version = "2024.5.7"; pyproject = false; src = fetchFromGitHub { owner = "giantpinkrobots"; repo = "varia"; rev = "v${version}"; - hash = "sha256-kvpARXunKaybw9mNCvCTjtHTGbnbVmja5npcjFY5cdM="; + hash = "sha256-axBBJYIFCt3J0aCY8tMYehho0QN1eIcUMPhWb5g5uDc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/va/vaults/package.nix b/third_party/nixpkgs/pkgs/by-name/va/vaults/package.nix index e44c3b73ef..6e0f107881 100644 --- a/third_party/nixpkgs/pkgs/by-name/va/vaults/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/va/vaults/package.nix @@ -10,7 +10,7 @@ , rustPlatform , rustc , cargo -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtk4 , libadwaita @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 cargo rustc rustPlatform.cargoSetupHook diff --git a/third_party/nixpkgs/pkgs/by-name/vc/vcpkg-tool/package.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcpkg-tool/package.nix index 468a259e21..327366ddd8 100644 --- a/third_party/nixpkgs/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vcpkg-tool"; - version = "2024-03-14"; + version = "2024-04-23"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg-tool"; rev = finalAttrs.version; - hash = "sha256-xe5a1cK56KvO4DFFz/K1omBCebzTRUOpXDpkOGek10M="; + hash = "sha256-PqmkQcpxuYJGZJs2qemv0hshvO4KTiKc1ZY0//Gq0pY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/vc/vcpkg/package.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcpkg/package.nix index befa6eab94..8e2753617a 100644 --- a/third_party/nixpkgs/pkgs/by-name/vc/vcpkg/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vc/vcpkg/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2024.03.25"; + version = "2024.04.26"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; rev = finalAttrs.version; - hash = "sha256-HMK3sebq/9TuxHQ75+5UIMvN09cPWmq7TFBBwRY4X7o="; + hash = "sha256-Bu1sZhk8fqG5D7m/0QK3uI97stXx8l8y30lnffTr9h0="; }; installPhase = let diff --git a/third_party/nixpkgs/pkgs/by-name/vd/vdhcoapp/ffmpeg-filepicker.patch b/third_party/nixpkgs/pkgs/by-name/vd/vdhcoapp/ffmpeg-filepicker.patch new file mode 100644 index 0000000000..f6fb777e18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/vd/vdhcoapp/ffmpeg-filepicker.patch @@ -0,0 +1,46 @@ +diff --git a/src/converter.js b/src/converter.js +index af7b4c3..20da407 100644 +--- a/src/converter.js ++++ b/src/converter.js +@@ -1,4 +1,4 @@ +-import open from 'open'; ++const open = import('open'); + + const os = require("os"); + const path = require('path'); +@@ -9,9 +9,9 @@ const rpc = require('./weh-rpc'); + + const exec_dir = path.dirname(process.execPath); + +-const ffmpeg = findExecutableFullPath("ffmpeg", exec_dir); +-const ffprobe = findExecutableFullPath("ffprobe", exec_dir); +-const filepicker = findExecutableFullPath("filepicker", exec_dir); ++const ffmpeg = "@ffmpeg@/bin/ffmpeg"; ++const ffprobe = "@ffmpeg@/bin/ffprobe"; ++const filepicker = "@filepicker@"; + + if (!fileExistsSync(ffmpeg)) { + logger.error("ffmpeg not found. Install ffmpeg and make sure it's in your path."); +diff --git a/src/main.js b/src/main.js +index 47b92de..e2e9402 100644 +--- a/src/main.js ++++ b/src/main.js +@@ -1,4 +1,4 @@ +-const config = require('config.json'); ++const config = require('./config.json'); + const converter = require('./converter'); + const os = require("os"); + +diff --git a/src/native-autoinstall.js b/src/native-autoinstall.js +index 556a22b..c729568 100644 +--- a/src/native-autoinstall.js ++++ b/src/native-autoinstall.js +@@ -1,7 +1,7 @@ + const os = require("os"); + const path = require("path"); + const { spawn, exec } = require('child_process'); +-const config = require('config.json'); ++const config = require('./config.json'); + + let fs; + if (process.versions.node.startsWith("10")) { \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/by-name/vd/vdhcoapp/filepicker.nix b/third_party/nixpkgs/pkgs/by-name/vd/vdhcoapp/filepicker.nix new file mode 100644 index 0000000000..7aec0f9e28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/vd/vdhcoapp/filepicker.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, atk +, gtk3 +, glib +}: + +rustPlatform.buildRustPackage rec { + pname = "filepicker"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "paulrouget"; + repo = "static-filepicker"; + rev = "v${version}"; + hash = "sha256-7sRzf3SA9RSBf4O36olXgka8c6Bufdb0qsuTofVe55s="; + }; + + cargoHash = "sha256-aal7ppFkCpNc+QTS4Qklsb9WfJ65QqG6p1eOskiX+/Q="; + + buildInputs = [ + atk + gtk3 + glib + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + meta = with lib; { + description = "File picker used by VDHCoApp"; + homepage = "https://github.com/paulrouget/static-filepicker"; + license = licenses.gpl2; + mainProgram = "filepicker"; + maintainers = with maintainers; [ hannesgith ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/vd/vdhcoapp/package.nix b/third_party/nixpkgs/pkgs/by-name/vd/vdhcoapp/package.nix new file mode 100644 index 0000000000..ad61515b9e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/vd/vdhcoapp/package.nix @@ -0,0 +1,83 @@ +{ lib +, fetchFromGitHub +, buildNpmPackage +, nodejs +, ffmpeg +, callPackage +, substituteAll +, makeWrapper +, toml2json +, jq +}: +buildNpmPackage rec { + pname = "vdhcoapp"; + version = "2.0.19"; + + src = fetchFromGitHub { + owner = "aclap-dev"; + repo = "vdhcoapp"; + rev = "v${version}"; + hash = "sha256-8xeZvqpRq71aShVogiwlVD3gQoPGseNOmz5E3KbsZxU="; + }; + + sourceRoot = "${src.name}/app"; + npmDepsHash = "sha256-E032U2XZdyTER6ROkBosOTn7bweDXHl8voC3BQEz8Wg="; + dontNpmBuild = true; + + nativeBuildInputs = [ + makeWrapper + toml2json + jq + ]; + + patches = [ + (substituteAll { + src = ./ffmpeg-filepicker.patch; + inherit ffmpeg; + filepicker = lib.getExe (callPackage ./filepicker.nix {}); + }) + ]; + + postPatch = '' + # Cannot use patch, setting placeholder here + substituteInPlace src/native-autoinstall.js \ + --replace process.execPath "\"${placeholder "out"}/bin/vdhcoapp\"" + ''; + + preBuild = '' + toml2json --pretty ../config.toml > src/config.json + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/opt/vdhcoapp + cp -r . "$out/opt/vdhcoapp" + + makeWrapper ${nodejs}/bin/node $out/bin/vdhcoapp \ + --add-flags $out/opt/vdhcoapp/src/main.js + + generateManifest() { + type=$1 + outputFolder=$2 + mkdir -p $outputFolder + manifestName=$(jq -r '.meta.id' src/config.json).json + jq '.store.'$type'.manifest * (.meta | with_entries(select (.key == "description")) * {"name": .id}) * {"path" : "${placeholder "out"}/bin/vdhcoapp"}' src/config.json > $outputFolder/$manifestName + } + + generateManifest google $out/etc/opt/chrome/native-messaging-hosts + generateManifest google $out/etc/chromium/native-messaging-hosts + generateManifest mozilla $out/lib/mozilla/native-messaging-hosts + generateManifest google $out/etc/opt/edge/native-messaging-hosts + + runHook postInstall + ''; + + meta = with lib; { + description = "Companion application for the Video DownloadHelper browser add-on"; + homepage = "https://www.downloadhelper.net/"; + license = licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with maintainers; [ hannesgith ]; + mainProgram = "vdhcoapp"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package-lock.json b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package-lock.json index 6f6e7e3fae..a5c9f7b543 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package-lock.json +++ b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.7.8", + "version": "1.8.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.7.8", + "version": "1.8.2", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -54,15 +54,6 @@ "pnpm": ">=8" } }, - "node_modules/@aashutoshrathi/word-wrap": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/@babel/code-frame": { "version": "7.24.2", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz", @@ -77,21 +68,21 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "version": "7.24.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz", + "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.24.2", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz", - "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==", + "version": "7.24.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.5.tgz", + "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-validator-identifier": "^7.24.5", "chalk": "^2.4.2", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" @@ -172,9 +163,9 @@ } }, "node_modules/@csstools/css-parser-algorithms": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.6.1.tgz", - "integrity": "sha512-ubEkAaTfVZa+WwGhs5jbo5Xfqpeaybr/RvWzvFxRs4jfq16wH8l8Ty/QEEpINxll4xhuGfdMbipRyz5QZh9+FA==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.6.3.tgz", + "integrity": "sha512-xI/tL2zxzEbESvnSxwFgwvy5HS00oCXxL4MLs6HUiDcYfwowsoQaABKxUElp1ARITrINzBnsECOc1q0eg2GOrA==", "dev": true, "funding": [ { @@ -190,13 +181,13 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { - "@csstools/css-tokenizer": "^2.2.4" + "@csstools/css-tokenizer": "^2.3.1" } }, "node_modules/@csstools/css-tokenizer": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.2.4.tgz", - "integrity": "sha512-PuWRAewQLbDhGeTvFuq2oClaSCKPIBmHyIobCV39JHRYN0byDcUWJl5baPeNUcqrjtdMNqFooE0FGl31I3JOqw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.3.1.tgz", + "integrity": "sha512-iMNHTyxLbBlWIfGtabT157LH9DUx9X8+Y3oymFEuMj8HNc+rpE3dPFGFgHjpKfjeFDjLjYIAIhXPGvS2lKxL9g==", "dev": true, "funding": [ { @@ -213,9 +204,9 @@ } }, "node_modules/@csstools/media-query-list-parser": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.9.tgz", - "integrity": "sha512-qqGuFfbn4rUmyOB0u8CVISIp5FfJ5GAR3mBrZ9/TKndHakdnm6pY0L/fbLcpPnrzwCyyTEZl1nUcXAYHEWneTA==", + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.11.tgz", + "integrity": "sha512-uox5MVhvNHqitPP+SynrB1o8oPxPMt2JLgp5ghJOWf54WGQ5OKu47efne49r1SWqs3wRP8xSWjnO9MBKxhB1dA==", "dev": true, "funding": [ { @@ -231,8 +222,8 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^2.6.1", - "@csstools/css-tokenizer": "^2.2.4" + "@csstools/css-parser-algorithms": "^2.6.3", + "@csstools/css-tokenizer": "^2.3.1" } }, "node_modules/@csstools/selector-specificity": { @@ -779,9 +770,9 @@ } }, "node_modules/@types/diff": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.9.tgz", - "integrity": "sha512-RWVEhh/zGXpAVF/ZChwNnv7r4rvqzJ7lYNSmZSVTxjV0PBLf6Qu7RNg+SUtkpzxmiNkjCx0Xn2tPp7FIkshJwQ==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.2.1.tgz", + "integrity": "sha512-uxpcuwWJGhe2AR1g8hD9F5OYGCqjqWnBUQFD8gMZsDbv8oPHzxJF6iMO6n8Tk0AdzlxoaaoQhOYlIg/PukVU8g==", "dev": true }, "node_modules/@types/filesystem": { @@ -812,9 +803,9 @@ "dev": true }, "node_modules/@types/lodash": { - "version": "4.17.0", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz", - "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==", + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.1.tgz", + "integrity": "sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==", "dev": true }, "node_modules/@types/minimist": { @@ -824,9 +815,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.19.31", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", - "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", + "version": "18.19.33", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.33.tgz", + "integrity": "sha512-NR9+KrpSajr2qBVp/Yt5TU/rp+b5Mayi3+OlMlcg2cVCfRmcG5PWZ7S4+MG9PZ5gWBoc9Pd0BKSRViuBCRPu0A==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -845,9 +836,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.79", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.79.tgz", - "integrity": "sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.1.tgz", + "integrity": "sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -855,9 +846,9 @@ } }, "node_modules/@types/react-dom": { - "version": "18.2.25", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.25.tgz", - "integrity": "sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==", + "version": "18.3.0", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz", + "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==", "dev": true, "dependencies": { "@types/react": "*" @@ -1658,9 +1649,9 @@ } }, "node_modules/css-functions-list": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz", - "integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.2.tgz", + "integrity": "sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==", "dev": true, "engines": { "node": ">=12 || >=16" @@ -2756,9 +2747,9 @@ } }, "node_modules/get-tsconfig": { - "version": "4.7.3", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.3.tgz", - "integrity": "sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==", + "version": "4.7.5", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.5.tgz", + "integrity": "sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==", "dev": true, "dependencies": { "resolve-pkg-maps": "^1.0.0" @@ -2779,8 +2770,7 @@ "node_modules/gifenc": { "version": "1.0.3", "resolved": "git+ssh://git@github.com/mattdesl/gifenc.git#64842fca317b112a8590f8fef2bf3825da8f6fe3", - "integrity": "sha512-TCgWVyjxLxM20WaQQT5neiMbdt2cuFL0BngwxcK8sV9x+M6IF0x3RIETc3VRVxfmRUxzZk+Yfv1b9cLdDnTRIw==", - "license": "MIT" + "integrity": "sha512-TCgWVyjxLxM20WaQQT5neiMbdt2cuFL0BngwxcK8sV9x+M6IF0x3RIETc3VRVxfmRUxzZk+Yfv1b9cLdDnTRIw==" }, "node_modules/glob": { "version": "7.2.3", @@ -3823,17 +3813,17 @@ } }, "node_modules/optionator": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", - "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", "dev": true, "dependencies": { - "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0" + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" }, "engines": { "node": ">= 0.8.0" @@ -4408,13 +4398,10 @@ } }, "node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, @@ -4977,15 +4964,15 @@ } }, "node_modules/table/node_modules/ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", + "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", "dev": true, "dependencies": { - "fast-deep-equal": "^3.1.1", + "fast-deep-equal": "^3.1.3", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" + "uri-js": "^4.4.1" }, "funding": { "type": "github", @@ -5435,6 +5422,15 @@ "node": ">= 8" } }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix index b445b00b90..3cfc974a77 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix @@ -5,8 +5,8 @@ , buildWebExtension ? false }: let - version = "1.7.8"; - gitHash = "97ce410"; + version = "1.8.2"; + gitHash = "449f955"; in buildNpmPackage rec { pname = "vencord"; @@ -16,7 +16,7 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-5kMBUdFupVxmlQ7NVJ7qzFoyQieDGHrFNkrzhlhEzJ0="; + hash = "sha256-zMiote0b3Uk2P+snjYBOCGEnJEErlSUj9nW/DxFtadY="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { @@ -34,7 +34,7 @@ buildNpmPackage rec { npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-LdLPNM2yCUXh0PxAbzI2YNF6QoX1iG2TixMh6XdVuX0="; + npmDepsHash = "sha256-yb9Dbu9Rb1+xV/XiDP49uaQdBP9uM+oimzkeznpGrKw="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; @@ -60,6 +60,6 @@ buildNpmPackage rec { description = "Vencord web extension"; homepage = "https://github.com/Vendicated/Vencord"; license = licenses.gpl3Only; - maintainers = with maintainers; [ FlafyDev fwam NotAShelf Scrumplex ]; + maintainers = with maintainers; [ FlafyDev NotAShelf Scrumplex ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix index 980258ed86..8b06a570de 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix @@ -13,6 +13,9 @@ , moreutils , cacert , nodePackages +, pipewire +, libpulseaudio +, autoPatchelfHook , withTTS ? true # Enables the use of vencord from nixpkgs instead of # letting vesktop manage it's own version @@ -20,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${finalAttrs.version}"; - hash = "sha256-OyAGzlwwdEKBbJJ7h3glwx/THy2VvUn/kA/Df3arWQU="; + hash = "sha256-cZOyydwpIW9Xq716KVi1RGtSlgVnOP3w8vXDwouS70E="; }; # NOTE: This requires pnpm 8.10.0 or newer @@ -73,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { dontBuild = true; dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-JLjJZYFMH4YoIFuyXbGUp6lIy+VlYZtmwk2+oUwtTxQ="; + outputHash = "sha256-6ezEBeYmK5va3gCh00YnJzZ77V/Ql7A3l/+csohkz68="; }; nativeBuildInputs = [ @@ -81,6 +84,13 @@ stdenv.mkDerivation (finalAttrs: { nodePackages.pnpm nodePackages.nodejs makeWrapper + autoPatchelfHook + ]; + + buildInputs = [ + pipewire + libpulseaudio + stdenv.cc.cc.lib ]; patches = [ @@ -106,6 +116,7 @@ stdenv.mkDerivation (finalAttrs: { # using `pnpm exec` here apparently makes it ignore ELECTRON_SKIP_BINARY_DOWNLOAD ./node_modules/.bin/electron-builder \ --dir \ + -c.asarUnpack="**/*.node" \ -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} ''; @@ -115,8 +126,8 @@ stdenv.mkDerivation (finalAttrs: { '' runHook preInstall - mkdir -p $out/opt/Vesktop/resources - cp dist/linux-*unpacked/resources/app.asar $out/opt/Vesktop/resources + mkdir -p $out/opt/Vesktop + cp -r dist/linux-*unpacked/resources $out/opt/Vesktop/ pushd build ${libicns}/bin/icns2png -x icon.icns @@ -128,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${electron}/bin/electron $out/bin/vesktop \ --add-flags $out/opt/Vesktop/resources/app.asar \ ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/by-name/vi/victoriametrics/package.nix b/third_party/nixpkgs/pkgs/by-name/vi/victoriametrics/package.nix index 5ff42e61b6..2f6d03ddea 100644 --- a/third_party/nixpkgs/pkgs/by-name/vi/victoriametrics/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vi/victoriametrics/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.100.1"; + version = "1.101.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-OheW6sCn/yXgSrtUe1zqDGaH6G8HG4QRQhFznaZGvX0="; + hash = "sha256-Jjz/CbVCvc9NFbvzYTFthG8cov4pYpc6y1A1Kmd3Mjg="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vis/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/vis/package.nix similarity index 94% rename from third_party/nixpkgs/pkgs/applications/editors/vis/default.nix rename to third_party/nixpkgs/pkgs/by-name/vi/vis/package.nix index 479a475e07..0ef1efaf75 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vis/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/vi/vis/package.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "vis"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { rev = "v${version}"; - sha256 = "sha256-XvWj6fZxzXeRA5oCAqIIwlfjrJcHnDrjeiPExEQKSkY="; + sha256 = "sha256-SYM3zlzhp3NdyOjtXc+pOiWY4/WA/Ax+qAWe18ggq3g="; repo = "vis"; owner = "martanne"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/vl/vlc/package.nix b/third_party/nixpkgs/pkgs/by-name/vl/vlc/package.nix index 9b89cca9a1..86406bdba0 100644 --- a/third_party/nixpkgs/pkgs/by-name/vl/vlc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vl/vlc/package.nix @@ -77,7 +77,7 @@ , unzip , wayland , wayland-protocols -, wrapGAppsHook +, wrapGAppsHook3 , xcbutilkeysyms , zlib @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config removeReferencesTo unzip - wrapGAppsHook + wrapGAppsHook3 ] ++ optionals chromecastSupport [ protobuf ] ++ optionals withQt5 [ libsForQt5.wrapQtAppsHook ] diff --git a/third_party/nixpkgs/pkgs/by-name/vu/vunnel/package.nix b/third_party/nixpkgs/pkgs/by-name/vu/vunnel/package.nix index c6a5256fdf..df8787c52b 100644 --- a/third_party/nixpkgs/pkgs/by-name/vu/vunnel/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "vunnel"; - version = "0.22.0"; + version = "0.23.0"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; rev = "refs/tags/v${version}"; - hash = "sha256-+L1MUD9IKPnbh/yjRuF3aOszeMvkILuqHHWj949SrMo="; + hash = "sha256-pfR3LxC1sSvLKIwq0P/9DcNkGVIIDfwMiSOpwJ7km9Y="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/wapm/cli/default.nix b/third_party/nixpkgs/pkgs/by-name/wa/wapm/package.nix similarity index 86% rename from third_party/nixpkgs/pkgs/tools/package-management/wapm/cli/default.nix rename to third_party/nixpkgs/pkgs/by-name/wa/wapm/package.nix index bd345ca694..658aa93ce7 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/wapm/cli/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/wapm/package.nix @@ -4,9 +4,8 @@ , libiconv , openssl , rustPlatform -, Security , stdenv -, SystemConfiguration +, darwin }: rustPlatform.buildRustPackage rec { @@ -25,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl ]; buildInputs = [ libiconv openssl ] - ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/package.nix index 972afafda5..573e086781 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/package.nix @@ -10,9 +10,12 @@ , libglvnd , libxkbcommon , vulkan-loader +, wayland , xdg-utils , xorg , zlib +, makeWrapper +, waylandSupport ? false }: let @@ -35,7 +38,7 @@ linux = stdenv.mkDerivation (finalAttrs: { --replace-fail /opt/ $out/opt/ ''; - nativeBuildInputs = [ autoPatchelfHook zstd ]; + nativeBuildInputs = [ autoPatchelfHook zstd makeWrapper ]; buildInputs = [ curl @@ -54,7 +57,7 @@ linux = stdenv.mkDerivation (finalAttrs: { xorg.libxcb xorg.libXcursor xorg.libXi - ]; + ] ++ lib.optionals waylandSupport [wayland]; installPhase = '' runHook preInstall @@ -62,6 +65,9 @@ linux = stdenv.mkDerivation (finalAttrs: { mkdir $out cp -r opt usr/* $out + '' + lib.optionalString waylandSupport '' + wrapProgram $out/bin/warp-terminal --set WARP_ENABLE_WAYLAND 1 + '' + '' runHook postInstall ''; }); @@ -93,7 +99,7 @@ meta = with lib; { homepage = "https://www.warp.dev"; license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime imadnyc ]; + maintainers = with maintainers; [ emilytrau Enzime imadnyc donteatoreo ]; platforms = platforms.darwin ++ [ "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json index f0d9321a1f..28891c02ce 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json +++ b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,10 +1,10 @@ { "darwin": { - "hash": "sha256-t8Qobl20YXY71vZVAIq6uJ+vnEeT3wFTmAy2dfthvIY=", - "version": "0.2024.04.16.08.02.stable_00" + "hash": "sha256-Ky5JyocpI9JKvhmmhk0Cg/Eo7icmo6FQAT639cGIGrA=", + "version": "0.2024.05.07.08.02.stable_02" }, "linux": { - "hash": "sha256-V1bG4Sx0cWv1+5mPnktQ3pPQm6Qwj0Ec6qDXmxGqB+8=", - "version": "0.2024.04.16.08.02.stable_00" + "hash": "sha256-zUbWNgiupBoFWoN3I726FejGtGne9dctaiGlPBbj5KU=", + "version": "0.2024.05.07.08.02.stable_02" } } diff --git a/third_party/nixpkgs/pkgs/by-name/wa/waybar/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/waybar/package.nix new file mode 100644 index 0000000000..cf8eb3b9b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wa/waybar/package.nix @@ -0,0 +1,203 @@ +{ + lib, + stdenv, + bash, + fetchFromGitHub, + SDL2, + alsa-lib, + catch2_3, + fftw, + glib, + gobject-introspection, + gtk-layer-shell, + gtkmm3, + howard-hinnant-date, + hyprland, + iniparser, + jsoncpp, + libdbusmenu-gtk3, + libevdev, + libinotify-kqueue, + libinput, + libjack2, + libmpdclient, + libnl, + libpulseaudio, + libsigcxx, + libxkbcommon, + meson, + ncurses, + ninja, + pipewire, + pkg-config, + playerctl, + portaudio, + python3, + scdoc, + sndio, + spdlog, + sway, + udev, + upower, + wayland, + wayland-scanner, + wireplumber, + wrapGAppsHook3, + + cavaSupport ? true, + enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + evdevSupport ? true, + experimentalPatches ? true, + hyprlandSupport ? true, + inputSupport ? true, + jackSupport ? true, + mpdSupport ? true, + mprisSupport ? stdenv.isLinux, + nlSupport ? true, + pipewireSupport ? true, + pulseSupport ? true, + rfkillSupport ? true, + runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + sndioSupport ? true, + swaySupport ? true, + traySupport ? true, + udevSupport ? true, + upowerSupport ? true, + wireplumberSupport ? true, + withMediaPlayer ? mprisSupport && false, + nix-update-script, +}: + +let + # Derived from subprojects/cava.wrap + libcava.src = fetchFromGitHub { + owner = "LukashonakV"; + repo = "cava"; + rev = "0.10.1"; + hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "waybar"; + version = "0.10.3"; + + src = fetchFromGitHub { + owner = "Alexays"; + repo = "Waybar"; + rev = finalAttrs.version; + hash = "sha256-LUageV0xC42MldMmYY1njkm95icBsqID1tEGy3wwrRM="; + }; + + postUnpack = lib.optional cavaSupport '' + pushd "$sourceRoot" + cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.1 + patchShebangs . + popd + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wayland-scanner + wrapGAppsHook3 + ] ++ lib.optional withMediaPlayer gobject-introspection ++ lib.optional enableManpages scdoc; + + propagatedBuildInputs = lib.optionals withMediaPlayer [ + glib + playerctl + python3.pkgs.pygobject3 + ]; + + buildInputs = + [ + gtk-layer-shell + gtkmm3 + howard-hinnant-date + jsoncpp + libsigcxx + libxkbcommon + spdlog + wayland + ] + ++ lib.optionals cavaSupport [ + SDL2 + alsa-lib + fftw + iniparser + ncurses + portaudio + ] + ++ lib.optional evdevSupport libevdev + ++ lib.optional hyprlandSupport hyprland + ++ lib.optional inputSupport libinput + ++ lib.optional jackSupport libjack2 + ++ lib.optional mpdSupport libmpdclient + ++ lib.optional mprisSupport playerctl + ++ lib.optional nlSupport libnl + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional sndioSupport sndio + ++ lib.optional swaySupport sway + ++ lib.optional traySupport libdbusmenu-gtk3 + ++ lib.optional udevSupport udev + ++ lib.optional upowerSupport upower + ++ lib.optional wireplumberSupport wireplumber + ++ lib.optional (cavaSupport || pipewireSupport) pipewire + ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; + + nativeCheckInputs = [ catch2_3 ]; + doCheck = runTests; + + mesonFlags = + (lib.mapAttrsToList lib.mesonEnable { + "cava" = cavaSupport; + "dbusmenu-gtk" = traySupport; + "jack" = jackSupport; + "libinput" = inputSupport; + "libnl" = nlSupport; + "libudev" = udevSupport; + "man-pages" = enableManpages; + "mpd" = mpdSupport; + "mpris" = mprisSupport; + "pipewire" = pipewireSupport; + "pulseaudio" = pulseSupport; + "rfkill" = rfkillSupport; + "sndio" = sndioSupport; + "systemd" = false; + "tests" = runTests; + "upower_glib" = upowerSupport; + "wireplumber" = wireplumberSupport; + }) + ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); + + postPatch = '' + substituteInPlace include/util/command.hpp \ + --replace-fail /bin/sh ${lib.getExe' bash "sh"} + ''; + + preFixup = lib.optionalString withMediaPlayer '' + cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py + + wrapProgram $out/bin/waybar-mediaplayer.py \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/alexays/waybar"; + description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; + changelog = "https://github.com/alexays/waybar/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "waybar"; + maintainers = with lib.maintainers; [ + FlorianFranzen + lovesegfault + minijackson + rodrgz + synthetica + khaneliman + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/wa/waycheck/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/waycheck/package.nix index 4ac98f6a64..73eb314666 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/waycheck/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/waycheck/package.nix @@ -7,26 +7,26 @@ , qt6 , wayland , glib -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { pname = "waycheck"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "serebit"; repo = "waycheck"; rev = "v${finalAttrs.version}"; - hash = "sha256-sDfIR+F2W59mh50jXoOrcNZ1nuckm3r7jN613BH4Eog="; + hash = "sha256-82jOYWhgD9JNDn24eCAeMm63R5BTy20lQVpiAwhDIOk="; }; nativeBuildInputs = [ meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 qt6.wrapQtAppsHook ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple GUI that displays the protocols implemented by a Wayland compositor"; homepage = "https://gitlab.freedesktop.org/serebit/waycheck"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ julienmalka federicoschonborn ]; + maintainers = with lib.maintainers; [ julienmalka ]; mainProgram = "waycheck"; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wbg/default.nix b/third_party/nixpkgs/pkgs/by-name/wb/wbg/package.nix similarity index 93% rename from third_party/nixpkgs/pkgs/applications/misc/wbg/default.nix rename to third_party/nixpkgs/pkgs/by-name/wb/wbg/package.nix index 4501f2c3ff..b971bce46d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wbg/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/wb/wbg/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "wbg"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "wbg"; rev = version; - sha256 = "sha256-JJIIqSc0qHgjtpGKai8p6vihXg16unsO7vW91pioAmc="; + sha256 = "sha256-zd5OWC0r/75IaeKy5xjV+pQefRy48IcFTxx93iy0a0Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/we/weasis/package.nix b/third_party/nixpkgs/pkgs/by-name/we/weasis/package.nix index 0637fea1c5..ae500efec3 100644 --- a/third_party/nixpkgs/pkgs/by-name/we/weasis/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/we/weasis/package.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "weasis"; - version = "4.3.0"; + version = "4.4.0"; # Their build instructions indicate to use the packaging script src = fetchzip { url = "https://github.com/nroduit/Weasis/releases/download/v${version}/weasis-native.zip"; - hash = "sha256-4Ew7RG8eM8pa6AiblREgt03fGOQVKVzkQMR87GIJIVM="; + hash = "sha256-+Bi9rTuM9osKzbKVA4exqsFm8p9+1OHgJqRSNnCC6QQ="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/add-extension.patch b/third_party/nixpkgs/pkgs/by-name/we/webcord-vencord/add-extension.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/add-extension.patch rename to third_party/nixpkgs/pkgs/by-name/we/webcord-vencord/add-extension.patch diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webcord-vencord/package.nix similarity index 53% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix rename to third_party/nixpkgs/pkgs/by-name/we/webcord-vencord/package.nix index 47e0673455..352e372d00 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/we/webcord-vencord/package.nix @@ -1,9 +1,11 @@ -{ webcord -, substituteAll -, lib -, vencord-web-extension +{ + webcord, + substituteAll, + lib, + vencord-web-extension, }: +# nixpkgs-update: no auto update webcord.overrideAttrs (old: { pname = "webcord-vencord"; @@ -14,8 +16,13 @@ webcord.overrideAttrs (old: { }) ]; - meta = with lib; old.meta // { + meta = { + inherit (old.meta) license mainProgram platforms; + description = "Webcord with Vencord web extension"; - maintainers = with maintainers; [ FlafyDev NotAShelf ]; + maintainers = with lib.maintainers; [ + FlafyDev + NotAShelf + ]; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webcord/package.nix similarity index 50% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix rename to third_party/nixpkgs/pkgs/by-name/we/webcord/package.nix index aebe2998bd..f3fb33f5dc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/we/webcord/package.nix @@ -1,26 +1,26 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, copyDesktopItems -, python3 -, xdg-utils -, electron_29 -, makeDesktopItem -, nix-update-script +{ + lib, + buildNpmPackage, + fetchFromGitHub, + copyDesktopItems, + python3, + xdg-utils, + electron, + makeDesktopItem, }: buildNpmPackage rec { pname = "webcord"; - version = "4.8.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "SpacingBat3"; repo = "WebCord"; - rev = "v${version}"; - hash = "sha256-x9Ejb8yxgQhlEfUUfoqbgSffNNtOoFeAyb3OISR+Jz4="; + rev = "refs/tags/v${version}"; + hash = "sha256-sYTMfqZokwJ3CFtArkUckCpQlnyJ1BVpewU92sNaKC8="; }; - npmDepsHash = "sha256-7H4I4vKygMgsPh+OvZZGhpkoQQu1a51yUTwEPJSBM18="; + npmDepsHash = "sha256-LxOqpUVl2hXZrfTQfMz1+fVGRuNwG6dX03fGQVYmqq0="; nativeBuildInputs = [ copyDesktopItems @@ -41,25 +41,25 @@ buildNpmPackage rec { let binPath = lib.makeBinPath [ xdg-utils ]; in - '' - runHook preInstall + '' + runHook preInstall - # Remove dev deps that aren't necessary for running the app - npm prune --omit=dev + # Remove dev deps that aren't necessary for running the app + npm prune --omit=dev - mkdir -p $out/lib/node_modules/webcord - cp -r app node_modules sources package.json $out/lib/node_modules/webcord/ + mkdir -p $out/lib/node_modules/webcord + cp -r app node_modules sources package.json $out/lib/node_modules/webcord/ - install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png + install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png - # Add xdg-utils to path via suffix, per PR #181171 - makeWrapper '${lib.getExe electron_29}' $out/bin/webcord \ - --suffix PATH : "${binPath}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags $out/lib/node_modules/webcord/ + # Add xdg-utils to path via suffix, per PR #181171 + makeWrapper '${lib.getExe electron}' $out/bin/webcord \ + --suffix PATH : "${binPath}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags $out/lib/node_modules/webcord/ - runHook postInstall - ''; + runHook postInstall + ''; desktopItems = [ (makeDesktopItem { @@ -68,11 +68,14 @@ buildNpmPackage rec { icon = "webcord"; desktopName = "WebCord"; comment = meta.description; - categories = [ "Network" "InstantMessaging" ]; + categories = [ + "Network" + "InstantMessaging" + ]; }) ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = ./update.sh; meta = { description = "A Discord and SpaceBar electron-based client implemented without Discord API"; @@ -81,7 +84,10 @@ buildNpmPackage rec { changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}"; license = lib.licenses.mit; mainProgram = "webcord"; - maintainers = with lib.maintainers; [ eclairevoyant huantian ]; + maintainers = with lib.maintainers; [ + eclairevoyant + huantian + ]; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/we/webcord/update.sh b/third_party/nixpkgs/pkgs/by-name/we/webcord/update.sh new file mode 100755 index 0000000000..ea79effc86 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/we/webcord/update.sh @@ -0,0 +1,15 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq nix-update + +set -ex + +curl_github() { + curl -L ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@" +} + +latestTag=$(curl_github https://api.github.com/repos/SpacingBat3/Webcord/releases/latest | jq -r ".tag_name") +latestVersion="$(expr "$latestTag" : 'v\(.*\)')" + +nix-update --version "$latestVersion" webcord +electronVersion=$(curl_github "https://raw.githubusercontent.com/SpacingBat3/WebCord/v$latestVersion/package.json" | jq -r ".devDependencies.electron" | sed -r 's|^\^([0-9]+).*|\1|') +sed -r "/webcord = / s|(electron_)[0-9]+|\1$electronVersion|" -i pkgs/top-level/all-packages.nix diff --git a/third_party/nixpkgs/pkgs/by-name/we/wechat-uos/package.nix b/third_party/nixpkgs/pkgs/by-name/we/wechat-uos/package.nix index 7a8f806426..0fd6dbd8ea 100644 --- a/third_party/nixpkgs/pkgs/by-name/we/wechat-uos/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/we/wechat-uos/package.nix @@ -60,11 +60,7 @@ └── uos └── .license.key */ - uosLicense ? requireFile { - name = "license.tar.gz"; - url = "https://www.uniontech.com"; - sha256 = "53760079c1a5b58f2fa3d5effe1ed35239590b288841d812229ef4e55b2dbd69"; - } + uosLicense ? null }: let wechat-uos-env = stdenvNoCC.mkDerivation { @@ -87,6 +83,30 @@ let preferLocalBuild = true; }; + uosLicenseUnzipped = stdenvNoCC.mkDerivation { + name = "uos-license-unzipped"; + src = + if uosLicense == null then + requireFile + { + name = "license.tar.gz"; + url = "https://www.uniontech.com"; + sha256 = "53760079c1a5b58f2fa3d5effe1ed35239590b288841d812229ef4e55b2dbd69"; + } else uosLicense; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r * $out/ + + runHook postInstall + ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-pNftwtUZqBsKBSPQsEWlYLlb6h2Xd9j56ZRMi8I82ME="; + }; + wechat-uos-runtime = with xorg; [ stdenv.cc.cc stdenv.cc.libc @@ -195,11 +215,10 @@ let dpkg -x $src ./wechat-uos dpkg -x $uosSrc ./wechat-uos-old-source - tar -xvf $uosLicense - runHook postUnpack ''; + # Use ln for license to prevent being garbage collection installPhase = '' runHook preInstall mkdir -p $out @@ -207,7 +226,7 @@ let cp -r wechat-uos/* $out mkdir -pv $out/usr/lib/wechat-uos/license - cp -r license/* $out/usr/lib/wechat-uos/license + ln -s ${uosLicenseUnzipped}/* $out/usr/lib/wechat-uos/license/ cp -r wechat-uos-old-source/usr/lib/license/libuosdevicea.so $out/usr/lib/wechat-uos/license/ runHook postInstall diff --git a/third_party/nixpkgs/pkgs/by-name/wh/whatsapp-emoji-font/package.nix b/third_party/nixpkgs/pkgs/by-name/wh/whatsapp-emoji-font/package.nix index 5e34282891..bf70c0271c 100644 --- a/third_party/nixpkgs/pkgs/by-name/wh/whatsapp-emoji-font/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wh/whatsapp-emoji-font/package.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "whatsapp-emoji-linux"; - version = "2.23.2.72-1"; + version = "2.24.8.85-1"; src = fetchFromGitHub { rev = "refs/tags/${version}"; owner = "dmlls"; repo = "whatsapp-emoji-linux"; - hash = "sha256-dwX+y8jCpR+SyiH13Os9VeXLDwmAYB7ARW2lAMl/7RE="; + hash = "sha256-6bei+kR+5UF4GQ140sUXy8TDXZKNFmM+XgvMKf+8s2Y="; }; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix b/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix index da86bd7dfb..1196a9d659 100644 --- a/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.68"; + version = "2.9.70"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-8UWYh2pm0UX6tb/7DT5ZaHvmHdxk6hwE7fFHKY6pGOs="; + hash = "sha256-KtZZa/t/WqMSjEAET8wutIhu7sp55/CtaBnNDThkEUI="; }; - npmDepsHash = "sha256-/WnrhtVr972Na8rpZ7dzH3998WDPsS5X6jCPkCj3hyc="; + npmDepsHash = "sha256-0XDfi23BktYDH58sDjaBtt6x2ZZDFqtBBL9agnHwgeo="; dontNpmBuild = true; @@ -20,7 +20,7 @@ buildNpmPackage rec { homepage = "https://github.com/avwo/whistle"; changelog = "https://github.com/avwo/whistle/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "whistle"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/wi/windows10-icons/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/windows10-icons/package.nix new file mode 100644 index 0000000000..8609aa7508 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wi/windows10-icons/package.nix @@ -0,0 +1,36 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "windows10-icons"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "B00merang-Artwork"; + repo = "Windows-10"; + rev = "${finalAttrs.version}"; + hash = "sha256-Yz6a7FcgPfzz4w8cKp8oq7/usIBUUZV7qhVmDewmzrI="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons/windows10 + find . \ + ! -path ./README.md \ + -mindepth 1 -maxdepth 1 \ + -exec cp -r {} $out/share/icons/windows10 \; + + runHook postInstall + ''; + + dontConfigure = true; + dontBuild = true; + + meta = with lib; { + description = "Windows 10 icon theme"; + homepage = "http://b00merang.weebly.com/windows-10.html"; + license = licenses.unfree; + maintainers = with maintainers; [ mib ]; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wio/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wio/package.nix index 5a39e30ea3..5982f80cef 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/wio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/wio/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wio"; - version = "unstable-2024-03-23"; + version = "0.17.3-unstable-2024-04-30"; src = fetchFromGitHub { owner = "Rubo3"; repo = "wio"; - rev = "a68fbaf0011610d55db0413ebb7aca6ff79a8dc3"; - hash = "sha256-iQulldgYuz++ank2rOL92Ydj6IOiBtNEVEEcVOlhkMk="; + rev = "9d459df379efdcf20ea10906c48c79c506c32066"; + hash = "sha256-Bn7mCVQPH/kH2WRsGPPGIGgvk0r894zZHCHl6BVmWVg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix index 9f910079ee..a38699cf0d 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "wireguard-vanity-keygen"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "axllent"; repo = "wireguard-vanity-keygen"; rev = version; - hash = "sha256-qTVPPr7lmjMvUqetDupZCo8RdoBHr++0V9CB4b6Bp4Y="; + hash = "sha256-K5lJSDRBf3NCs6v+HmjYJiHjfKt/6djvM847/C4qfeI="; }; - vendorHash = "sha256-9/waDAfHYgKh+FsGZEp7HbgI83urRDQPuvtuEKHOf58="; + vendorHash = "sha256-kAPw5M9o99NijCC9BzYhIpzHK/8fSAJxvckaj8iRby0="; ldflags = [ "-s" "-w" "-X main.appVersion=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix index eba4083201..4478fed50d 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wiremock"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar"; - hash = "sha256-HIWhuaW36/kdsj8iZD0ANHQ26olURnYL1q5fcQXHHjw="; + hash = "sha256-BljkiUs5POPY2e+bmB8E6z+BWJME6ENP9NDc0XR5Vl0="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wireviz/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wireviz/package.nix new file mode 100644 index 0000000000..99cb370268 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wi/wireviz/package.nix @@ -0,0 +1,36 @@ +{ lib +, python3 +, fetchPypi +}: + +python3.pkgs.buildPythonApplication rec { + pname = "wireviz"; + version = "0.3.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-MBgX7dWOr3SorOJQjVlRGlSvL+A7Lg+gC1UoS3un9rU="; + }; + + nativeBuildInputs = [ + python3.pkgs.setuptools + python3.pkgs.wheel + ]; + + propagatedBuildInputs = with python3.pkgs; [ + graphviz + pillow + pyyaml + ]; + + pythonImportsCheck = [ "wireviz" ]; + + meta = with lib; { + description = "Easily document cables and wiring harnesses"; + homepage = "https://pypi.org/project/wireviz/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ pinpox ]; + mainProgram = "wireviz"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/wizer/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wizer/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/wizer/default.nix rename to third_party/nixpkgs/pkgs/by-name/wi/wizer/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wl-clip-persist/package.nix b/third_party/nixpkgs/pkgs/by-name/wl/wl-clip-persist/package.nix new file mode 100644 index 0000000000..3b31f14f8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wl/wl-clip-persist/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + wayland, +}: + +rustPlatform.buildRustPackage rec { + pname = "wl-clip-persist"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "Linus789"; + repo = "wl-clip-persist"; + rev = "v${version}"; + hash = "sha256-dFhHsBazBHVWgPxoRDNwh8Yctt4w64E0RyFaHEC4mvk="; + }; + + cargoHash = "sha256-rhXVjXhRPCjt7ur7fQviGFXVtQneuFKWZcDNkhM9tkY="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ wayland ]; + + meta = with lib; { + broken = stdenv.isDarwin; + description = "Keep Wayland clipboard even after programs close"; + homepage = "https://github.com/Linus789/wl-clip-persist"; + inherit (wayland.meta) platforms; + license = licenses.mit; + mainProgram = "wl-clip-persist"; + maintainers = with maintainers; [ name-snrl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wljoywake/package.nix b/third_party/nixpkgs/pkgs/by-name/wl/wljoywake/package.nix new file mode 100644 index 0000000000..209e61e9d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wl/wljoywake/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, udev +, wayland +, wayland-protocols +, wayland-scanner +}: + +let + version = "0.3"; +in +stdenv.mkDerivation { + pname = "wljoywake"; + inherit version; + + src = fetchFromGitHub { + repo = "wljoywake"; + owner = "nowrep"; + rev = "v${version}"; + hash = "sha256-zSYNfsFjswaSXZPlIDMDC87NK/6AKtArHBeWCWDDR3E="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wayland-scanner + ]; + + buildInputs = [ + udev + wayland + wayland-protocols + ]; + + meta = with lib; { + description = "Wayland tool for idle inhibit when using joysticks"; + homepage = "https://github.com/nowrep/wljoywake"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.jtrees ]; + mainProgram = "wljoywake"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wlogout/package.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlogout/package.nix index 0107dbad89..4f328cb9f5 100644 --- a/third_party/nixpkgs/pkgs/by-name/wl/wlogout/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wl/wlogout/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wlogout"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "ArtsyMacaw"; repo = "wlogout"; rev = finalAttrs.version; - hash = "sha256-n8r+E6GXXjyDYBTOMiv5musamaUFSpRTM2qHgb047og="; + hash = "sha256-/tYZy56ku68ziSOhy6Dex9RGy+blkU6CN2ze76y7718="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wlr-layout-ui/package.nix b/third_party/nixpkgs/pkgs/by-name/wl/wlr-layout-ui/package.nix index f115bf1215..efa72ee133 100644 --- a/third_party/nixpkgs/pkgs/by-name/wl/wlr-layout-ui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wl/wlr-layout-ui/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "wlr-layout-ui"; - version = "1.4.7"; + version = "1.6.10"; pyproject = true; src = fetchFromGitHub { owner = "fdev31"; repo = "wlr-layout-ui"; - rev = "${version}"; - hash = "sha256-3NV02/Lk43h3r17jwmSAqx7wofaHFJKDh+vaWwU17Gw="; + rev = "refs/tags/${version}"; + hash = "sha256-UM1p5b5+xJY6BgPUMXjluIC9zQxe388+gBWTbNQPWYQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/wo/workout-tracker/package.nix b/third_party/nixpkgs/pkgs/by-name/wo/workout-tracker/package.nix index c324829e0a..ab15fced52 100644 --- a/third_party/nixpkgs/pkgs/by-name/wo/workout-tracker/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wo/workout-tracker/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "workout-tracker"; - version = "0.13.4"; + version = "0.14.3"; src = fetchFromGitHub { owner = "jovandeginste"; repo = "workout-tracker"; rev = "refs/tags/v${version}"; - hash = "sha256-wBDLf4UfE3YXH2naub9Z//z5HWaTBuz6MyCQovZcsFI="; + hash = "sha256-NGj3W6SYZauaAhMinPzsSXM8Dqy+B+am985JJjh6xTs="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/by-name/wo/wowup-cf/package.nix b/third_party/nixpkgs/pkgs/by-name/wo/wowup-cf/package.nix new file mode 100644 index 0000000000..2fcbd36003 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wo/wowup-cf/package.nix @@ -0,0 +1,37 @@ +{ lib, appimageTools, fetchurl }: + +let + version = "2.12.0"; + pname = "wowup-cf"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/WowUp/WowUp.CF/releases/download/v${version}/WowUp-CF-${version}.AppImage"; + hash = "sha256-uWz/EQBX/d1UBfpc9EL4x+UH72kINd6pqFIvJkV16e8="; + }; + + appimageContents = appimageTools.extractType1 { inherit name src; }; +in appimageTools.wrapType1 { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "World of Warcraft addon updater with CurseForge support"; + longDescription = '' + WowUp is the community centered World of Warcraft addon updater. We attempt to bring the addon community together in an easy to use updater application. We have an ever growing list of supported features. + ''; + homepage = "https://wowup.io/"; + downloadPage = "https://github.com/WowUp/WowUp.CF/releases"; + license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ pbek ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wpaperd/default.nix b/third_party/nixpkgs/pkgs/by-name/wp/wpaperd/package.nix similarity index 63% rename from third_party/nixpkgs/pkgs/tools/wayland/wpaperd/default.nix rename to third_party/nixpkgs/pkgs/by-name/wp/wpaperd/package.nix index dc7ce198e8..f059b22640 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wpaperd/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/wp/wpaperd/package.nix @@ -1,35 +1,27 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, libxkbcommon }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, libxkbcommon, wayland, libGL }: rustPlatform.buildRustPackage rec { pname = "wpaperd"; - version = "0.3.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "danyspin97"; - repo = pname; + repo = "wpaperd"; rev = version; - sha256 = "cgjHCSBrkX3aoz42qBS/1JUGhc7sZKarKByntp7ubaQ="; + hash = "sha256-5riZ/6yjgsW++SUIyJP5rFG65tkjJKgtvDLIGaoiHN0="; }; + cargoHash = "sha256-EkCGLxUQeSCR88Y95Hog9TAjpYMmZHlOqEM//ENiCco="; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ + wayland + libGL libxkbcommon ]; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "smithay-client-toolkit-0.16.0" = "iPDL7pxTez4EnIBaUH25lLSWpu3RRL2QBF9pfdTDsP8="; - }; - }; - - postPatch = '' - rm Cargo.lock - ln -s ${./Cargo.lock} Cargo.lock - ''; - meta = with lib; { description = "Minimal wallpaper daemon for Wayland"; longDescription = '' @@ -41,7 +33,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/danyspin97/wpaperd"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ DPDmancul ]; + maintainers = with maintainers; [ DPDmancul nu-nu-ko ]; mainProgram = "wpaperd"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/wt/wtfis/package.nix b/third_party/nixpkgs/pkgs/by-name/wt/wtfis/package.nix index 56d302208d..4163a31ac9 100644 --- a/third_party/nixpkgs/pkgs/by-name/wt/wtfis/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wt/wtfis/package.nix @@ -5,12 +5,12 @@ let pname = "wtfis"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "pirxthepilot"; repo = "wtfis"; rev = "refs/tags/v${version}"; - hash = "sha256-eSmvyDr8PbB15UWIl67Qp2qHeOq+dmnP8eMsvcGypVw="; + hash = "sha256-nVcF7mPoWL5PNLh0W4FBPE7WVU72FidHpBZqMNl+Fd4="; }; in python3.pkgs.buildPythonApplication { inherit pname version src; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix b/third_party/nixpkgs/pkgs/by-name/wt/wttrbar/package.nix similarity index 81% rename from third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix rename to third_party/nixpkgs/pkgs/by-name/wt/wttrbar/package.nix index 6cba42d0c1..0d3fce04d1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/wt/wttrbar/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "wttrbar"; - version = "0.9.4"; + version = "0.10.1"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; rev = version; - hash = "sha256-kRrVqUfkrSK/9z3Hj4J+mKcdV7JdTzjhxlVRa/kf8sw="; + hash = "sha256-rUiLB0M/dzNxzBPAqlGy5m/gOTGYw4GRzb+ud0l/1+8="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); - cargoHash = "sha256-HxSyGME95FWR5VwodmrMUX0jPlfE9SJV0WBbICuuTok="; + cargoHash = "sha256-v415OJ6dmWSLUDeFUtd27mBaQlB3x1vC37sjpMhKyYY="; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/by-name/xa/xarcan/package.nix b/third_party/nixpkgs/pkgs/by-name/xa/xarcan/package.nix index 2f10a984aa..d2c06e3603 100644 --- a/third_party/nixpkgs/pkgs/by-name/xa/xarcan/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xa/xarcan/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , arcan , audit , dbus @@ -30,21 +29,23 @@ , systemd , xcbutil , xcbutilwm +, xcbutilimage , xkbcomp , xkeyboard_config , xorgproto , xtrans +, unstableGitUpdater }: stdenv.mkDerivation (finalPackages: { pname = "xarcan"; - version = "unstable-2023-11-03"; + version = "0-unstable-2024-05-11"; src = fetchFromGitHub { owner = "letoram"; repo = "xarcan"; - rev = "380ea856307f593535dfc8b23799938db69e31b0"; - hash = "sha256-RdizezCbJylQDkOmUdqL0lBTNLsjyvo+lKAjfZXTXf4="; + rev = "ecc4d0a6408dfeb19934e3bfd4c382b0862c03b4"; + hash = "sha256-PmaoeemQpin5NN8I6JYOumP+PrzkyTYrqAyxxwBO9K0="; }; nativeBuildInputs = [ @@ -79,6 +80,7 @@ stdenv.mkDerivation (finalPackages: { systemd xcbutil xcbutilwm + xcbutilimage xkbcomp xkeyboard_config xorgproto @@ -104,6 +106,8 @@ stdenv.mkDerivation (finalPackages: { "--with-xkb-path=${xkeyboard_config}/share/X11/xkb" ]; + passthru.updateScript = unstableGitUpdater {}; + meta = { homepage = "https://github.com/letoram/letoram"; description = "Patched Xserver that bridges connections to Arcan"; diff --git a/third_party/nixpkgs/pkgs/servers/caddy/xcaddy/inject_version_info.diff b/third_party/nixpkgs/pkgs/by-name/xc/xcaddy/inject_version_info.diff similarity index 100% rename from third_party/nixpkgs/pkgs/servers/caddy/xcaddy/inject_version_info.diff rename to third_party/nixpkgs/pkgs/by-name/xc/xcaddy/inject_version_info.diff diff --git a/third_party/nixpkgs/pkgs/servers/caddy/xcaddy/default.nix b/third_party/nixpkgs/pkgs/by-name/xc/xcaddy/package.nix similarity index 89% rename from third_party/nixpkgs/pkgs/servers/caddy/xcaddy/default.nix rename to third_party/nixpkgs/pkgs/by-name/xc/xcaddy/package.nix index c90ef853b0..69a531c707 100644 --- a/third_party/nixpkgs/pkgs/servers/caddy/xcaddy/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/xc/xcaddy/package.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "xcaddy"; - version = "0.4.0"; + version = "0.4.1"; subPackages = [ "cmd/xcaddy" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - hash = "sha256-wzX6+O7hN8x3DDkTdNMBuWTCY8dp1gGrF2TW1d07PEc="; + hash = "sha256-xEPSRKrQC9hb+G9/rV9/k4btvZxXZkcsxmaxWcgl2fk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/caddy/xcaddy/use_tmpdir_on_darwin.diff b/third_party/nixpkgs/pkgs/by-name/xc/xcaddy/use_tmpdir_on_darwin.diff similarity index 100% rename from third_party/nixpkgs/pkgs/servers/caddy/xcaddy/use_tmpdir_on_darwin.diff rename to third_party/nixpkgs/pkgs/by-name/xc/xcaddy/use_tmpdir_on_darwin.diff diff --git a/third_party/nixpkgs/pkgs/by-name/xc/xclicker/package.nix b/third_party/nixpkgs/pkgs/by-name/xc/xclicker/package.nix index 3a6597dc48..e61c86c2b3 100644 --- a/third_party/nixpkgs/pkgs/by-name/xc/xclicker/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xc/xclicker/package.nix @@ -1,39 +1,30 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , libXtst }: stdenv.mkDerivation (finalAttrs: { pname = "xclicker"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "robiot"; repo = "xclicker"; rev = "v${finalAttrs.version}"; - hash = "sha256-3D49iMzCCT9Z2Pf5INHYFZusG0BQI7La7lLaSVM/4mc="; + hash = "sha256-zVbOfqh21+/41N3FcAFajcZCrQ8iNqedZjgNQO0Zj04="; }; - patches = [ - (fetchpatch { - name = "fix-malloc-size.patch"; - url = "https://github.com/robiot/xclicker/commit/c99f69a747e9df75fb3676be20a3ec805526d022.patch"; - hash = "sha256-ESbMBusJVNfbGxlEn1Kby00mnXvM5H0r03bX5ofC6Fg="; - }) - ]; - nativeBuildInputs = [ meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -57,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://xclicker.xyz/"; license = lib.licenses.gpl3Only; mainProgram = "xclicker"; - maintainers = with lib.maintainers; [ tomasajt ]; + maintainers = with lib.maintainers; [ gepbird tomasajt ]; platforms = lib.platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix new file mode 100644 index 0000000000..1d6e61edb6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitea, +}: +rustPlatform.buildRustPackage rec { + pname = "xdg-terminal-exec-mkhl"; + version = "0.2.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "mkhl"; + repo = "xdg-terminal-exec"; + rev = "v${version}"; + hash = "sha256-iVp+tg+OujMMddKsQ/T9wyqh/Jk/j/jQgsl23uQA/iM="; + }; + + cargoHash = "sha256-x2oEPFx2KRhnKPX3QjGBM16nkYGclxR5mELGYvxjtMA="; + + meta = { + description = "Alternative rust-based implementation of the proposed XDG Default Terminal Execution Specification"; + license = lib.licenses.gpl3Plus; + mainProgram = "xdg-terminal-exec"; + maintainers = with lib.maintainers; [ quantenzitrone ]; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/xe/xemu/package.nix b/third_party/nixpkgs/pkgs/by-name/xe/xemu/package.nix index 7fc390049c..e8d2f665f9 100644 --- a/third_party/nixpkgs/pkgs/by-name/xe/xemu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xe/xemu/package.nix @@ -23,19 +23,19 @@ , stdenv , vte , which -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.7.120"; + version = "0.7.121"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-FFxYp53LLDOPZ1Inr70oyQXhNjJO23G+gNmXd/lvrYs="; + hash = "sha256-VcztVzG/IN9N0SVKj6BipyqnhxXC2nTTuMjKMtFKzGw="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { perl pkg-config which - wrapGAppsHook + wrapGAppsHook3 ] ++ (with python3Packages; [ python pyyaml diff --git a/third_party/nixpkgs/pkgs/by-name/xe/xeol/package.nix b/third_party/nixpkgs/pkgs/by-name/xe/xeol/package.nix index 5c880a56b6..d783e5c794 100644 --- a/third_party/nixpkgs/pkgs/by-name/xe/xeol/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xe/xeol/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "xeol"; - version = "0.9.14"; + version = "0.9.15"; src = fetchFromGitHub { owner = "xeol-io"; repo = "xeol"; rev = "refs/tags/v${version}"; - hash = "sha256-ubgOZFCWBU5wtxL7l7yHplnVOBwf+b6MMWgP/W0VwW8="; + hash = "sha256-/DWBDc8m5XYM5UBX5/GWuPRR3YktRar/LbENx2d5bc4="; }; - vendorHash = "sha256-X3RJiqndHsApKHfAaZVw3ZdmxMT/+aNht2Jx5uHX1EQ="; + vendorHash = "sha256-9zDzwiVEVsfgVzSrouNtLYpjumoWGlfSDpGWbj+zCGQ="; subPackages = [ "cmd/xeol/" diff --git a/third_party/nixpkgs/pkgs/by-name/xe/xeve/package.nix b/third_party/nixpkgs/pkgs/by-name/xe/xeve/package.nix index 5132656e58..efcc31e390 100644 --- a/third_party/nixpkgs/pkgs/by-name/xe/xeve/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xe/xeve/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xeve"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "mpeg5"; repo = "xeve"; rev = "v${finalAttrs.version}"; - hash = "sha256-8YueEx2oIh24jV38bzpDlCVHNZB7HDOXeP5MANM8zBc="; + hash = "sha256-8jXntm/yFme9ZPImdW54jAr11hEsU1K+N5/7RLmITPs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/xh/xhosts/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/xh/xhosts/Cargo.lock new file mode 100644 index 0000000000..3b686a7cac --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/xh/xhosts/Cargo.lock @@ -0,0 +1,67 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" + +[[package]] +name = "libnss" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48b67ef5ebef2a035ac8106c9b71176b6246be2a580ff4ee94bb80919e55b34c" +dependencies = [ + "lazy_static", + "libc", + "paste 0.1.18", +] + +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "xhosts" +version = "0.1.0" +dependencies = [ + "lazy_static", + "libc", + "libnss", + "paste 1.0.14", +] diff --git a/third_party/nixpkgs/pkgs/by-name/xh/xhosts/package.nix b/third_party/nixpkgs/pkgs/by-name/xh/xhosts/package.nix new file mode 100644 index 0000000000..ba6b5a184d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/xh/xhosts/package.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage { + pname = "nss-xhosts"; + version = "unstable-2023-12-30"; + + src = fetchFromGitHub { + owner = "dvob"; + repo = "nss-xhosts"; + rev = "78658cc24abb2546936f2b298a27d4abdf629186"; + hash = "sha256-saK9CxN4Ek1QBlPOydzEFei1217gPe5MZrUaUHh80hI="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + postFixup = "mv $out/lib/*.so $out/lib/libnss_xhosts.so.2"; + + meta = with lib; { + description = "NSS Module which supports wildcards"; + homepage = "https://github.com/dvob/nss-xhosts"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + mainProgram = "nss-xhosts"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/xi/xiu/package.nix b/third_party/nixpkgs/pkgs/by-name/xi/xiu/package.nix index c6088ed389..7857c9b1c3 100644 --- a/third_party/nixpkgs/pkgs/by-name/xi/xiu/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xi/xiu/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/harlanc/xiu"; changelog = "https://github.com/harlanc/xiu/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ cafkafk ]; mainProgram = "xiu"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/xlights/default.nix b/third_party/nixpkgs/pkgs/by-name/xl/xlights/package.nix similarity index 59% rename from third_party/nixpkgs/pkgs/applications/misc/xlights/default.nix rename to third_party/nixpkgs/pkgs/by-name/xl/xlights/package.nix index e878039d0e..c18875ca26 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xlights/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/xl/xlights/package.nix @@ -2,19 +2,19 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2023.13"; + version = "2024.10"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-vNauKG7F7AiSMZrkMPwR9C+Mshot4NOf4oIdEr5Pu3Q="; + hash = "sha256-h5jChYlTzKenZl0EnScU+vA+535pICXKdUhj8zAU4wc="; }; - meta = with lib; { - description = "xLights is a sequencer for Lights. xLights has usb and E1.31 drivers. You can create sequences in this object oriented program. You can create playlists, schedule them, test your hardware, convert between different sequencers."; + meta = { + description = "xLights is a sequencer for Lights. xLights has usb and E1.31 drivers. You can create sequences in this object oriented program. You can create playlists, schedule them, test your hardware, convert between different sequencers"; homepage = "https://xlights.org"; - license = licenses.gpl3; - maintainers = with maintainers; [ kashw2 ]; - platforms = platforms.linux; - mainProgram = "xlights-${version}"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ kashw2 ]; + platforms = lib.platforms.linux; + mainProgram = "xlights"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix b/third_party/nixpkgs/pkgs/by-name/xm/xml-tooling-c/package.nix similarity index 53% rename from third_party/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix rename to third_party/nixpkgs/pkgs/by-name/xm/xml-tooling-c/package.nix index f58f50b4a7..439f7e6489 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/xm/xml-tooling-c/package.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkg-config -, boost, curl, openssl, log4shib, xercesc, xml-security-c +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + pkg-config, + boost, + curl, + openssl, + log4shib, + xercesc, + xml-security-c, }: stdenv.mkDerivation rec { @@ -12,17 +22,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-FQ109ahOSWj3hvaxu1r/0FTpCuWaLgSEKM8NBio+wqU="; }; - buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ + boost + curl + openssl + log4shib + xercesc + xml-security-c + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14"; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2"; - platforms = platforms.unix; - license = licenses.asl20; - maintainers = [ ]; + platforms = lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.sigmanificient ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/xn/xnlinkfinder/package.nix b/third_party/nixpkgs/pkgs/by-name/xn/xnlinkfinder/package.nix new file mode 100644 index 0000000000..85429a64ec --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/xn/xnlinkfinder/package.nix @@ -0,0 +1,55 @@ +{ + lib, + fetchFromGitHub, + fetchpatch, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "xnlinkfinder"; + version = "6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xnl-h4ck3r"; + repo = "xnLinkFinder"; + rev = "refs/tags/v${version}"; + hash = "sha256-UMHMWHLJOhEeR+vO4YE3aNzdsvMAXPpQHQgdFf1QeMY="; + }; + + patches = [ + # Clean-up setup.py + (fetchpatch { + name = "clean-up.patch"; + url = "https://github.com/xnl-h4ck3r/xnLinkFinder/commit/8ef5e2ecf4c627b389cb7bb526f10fffe84acc13.patch"; + hash = "sha256-14j3dFgehhPdqAe4e9FsB8sD66hKnNaPmDJRV1mQTDo="; + }) + ]; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + beautifulsoup4 + html5lib + lxml + psutil + pyyaml + requests + termcolor + urllib3 + ]; + + # Project has no test + doCheck = false; + + pythonImportsCheck = [ "xnLinkFinder" ]; + + meta = with lib; { + description = "Tool to discover endpoints, potential parameters, and a target specific wordlist for a given target"; + homepage = "https://github.com/xnl-h4ck3r/xnLinkFinder"; + changelog = "https://github.com/xnl-h4ck3r/xnLinkFinder/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "xnLinkFinder"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/xp/xplr/package.nix b/third_party/nixpkgs/pkgs/by-name/xp/xplr/package.nix index 8d23449c18..920ddb8720 100644 --- a/third_party/nixpkgs/pkgs/by-name/xp/xplr/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/xp/xplr/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.21.7"; + version = "0.21.8"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZitwO/XfNrlTFNepQ5Wyk1A7cwlNm6+26nPHdZ8Wh3c="; + sha256 = "sha256-GpGYCGXSCQhFEPDUnHaOdz0LZ0jjRcCRnRCyOrulDVs="; }; - cargoHash = "sha256-mfSVjm0s/tLjjygwu8TuKn92mFM3Ui6TEHkIzS0eEOA="; + cargoHash = "sha256-eCIoUUWHpFk+O5ipswwiQxf1H1ygkj07Sjyj4L8Ui6I="; # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin env = lib.optionalAttrs (stdenv.isx86_64 && stdenv.isDarwin) { @@ -43,6 +43,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://xplr.dev"; changelog = "https://github.com/sayanarijit/xplr/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g mimame figsoda ]; + maintainers = with maintainers; [ sayanarijit suryasr007 pyrox0 mimame figsoda ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/X11/xpointerbarrier/default.nix b/third_party/nixpkgs/pkgs/by-name/xp/xpointerbarrier/package.nix similarity index 65% rename from third_party/nixpkgs/pkgs/tools/X11/xpointerbarrier/default.nix rename to third_party/nixpkgs/pkgs/by-name/xp/xpointerbarrier/package.nix index 8621e76443..06dc1c64b7 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/xp/xpointerbarrier/package.nix @@ -1,24 +1,24 @@ -{ lib, +{ + lib, stdenv, fetchurl, pkg-config, libX11, libXfixes, libXrandr, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "xpointerbarrier"; - version = "20.07"; + version = "23.08"; src = fetchurl { url = "https://www.uninformativ.de/git/xpointerbarrier/archives/xpointerbarrier-v${finalAttrs.version}.tar.gz"; - hash = "sha256-V1sNAQjsPVSjJ2nhCSdZqZQA78pjUE0z3IU4+I85CpI="; + hash = "sha256-d0PcZ4z8JgN4ncPUGeJZwIV5vB7M0Jo7o1/L6mrJtUc="; }; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 @@ -28,11 +28,19 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "prefix=$(out)" ]; + passthru.updateScript = gitUpdater { + url = "https://www.uninformativ.de/git/xpointerbarrier.git/"; + rev-prefix = "v"; + }; + meta = with lib; { homepage = "https://www.uninformativ.de/git/xpointerbarrier/file/README.html"; description = "Create X11 pointer barriers around your working area"; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres xzfc ]; + maintainers = with maintainers; [ + AndersonTorres + xzfc + ]; platforms = platforms.linux; mainProgram = "xpointerbarrier"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix b/third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix similarity index 57% rename from third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix rename to third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix index 150db49319..2a0e5e9cea 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix @@ -1,42 +1,51 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchzip -, installShellFiles -, testers -, writeShellScript -, common-updater-scripts -, curl -, jq -, xcodebuild -, xxd -, yabai -, Carbon -, Cocoa -, ScriptingBridge -, SkyLight +{ + lib, + stdenv, + overrideSDK, + fetchFromGitHub, + fetchzip, + installShellFiles, + testers, + writeShellScript, + common-updater-scripts, + curl, + darwin, + jq, + xcodebuild, + xxd, + yabai, }: +let + inherit (darwin.apple_sdk_11_0.frameworks) + Carbon + Cocoa + ScriptingBridge + SkyLight + ; -stdenv.mkDerivation (finalAttrs: { + stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { pname = "yabai"; version = "7.1.0"; - src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + src = + finalAttrs.passthru.sources.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); env = { # silence service.h error NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; }; - nativeBuildInputs = [ - installShellFiles - ] - ++ lib.optionals stdenv.isx86_64 [ - xcodebuild - xxd - ]; + nativeBuildInputs = + [ installShellFiles ] + ++ lib.optionals stdenv.isx86_64 [ + xcodebuild + xxd + ]; - buildInputs = [ ] ++ lib.optionals stdenv.isx86_64 [ + buildInputs = lib.optionals stdenv.isx86_64 [ Carbon Cocoa ScriptingBridge @@ -59,20 +68,22 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postPatch = lib.optionalString stdenv.isx86_64 /* bash */ '' - # aarch64 code is compiled on all targets, which causes our Apple SDK headers to error out. - # Since multilib doesnt work on darwin i dont know of a better way of handling this. - substituteInPlace makefile \ - --replace "-arch arm64e" "" \ - --replace "-arch arm64" "" \ - --replace "clang" "${stdenv.cc.targetPrefix}clang" + postPatch = + lib.optionalString stdenv.isx86_64 # bash + '' + # aarch64 code is compiled on all targets, which causes our Apple SDK headers to error out. + # Since multilib doesn't work on darwin i dont know of a better way of handling this. + substituteInPlace makefile \ + --replace "-arch arm64e" "" \ + --replace "-arch arm64" "" \ + --replace "clang" "${stdenv.cc.targetPrefix}clang" - # `NSScreen::safeAreaInsets` is only available on macOS 12.0 and above, which frameworks arent packaged. - # When a lower OS version is detected upstream just returns 0, so we can hardcode that at compiletime. - # https://github.com/koekeishiya/yabai/blob/v4.0.2/src/workspace.m#L109 - substituteInPlace src/workspace.m \ - --replace 'return screen.safeAreaInsets.top;' 'return 0;' - ''; + # `NSScreen::safeAreaInsets` is only available on macOS 12.0 and above, which frameworks aren't packaged. + # When a lower OS version is detected upstream just returns 0, so we can hardcode that at compile time. + # https://github.com/koekeishiya/yabai/blob/v4.0.2/src/workspace.m#L109 + substituteInPlace src/workspace.m \ + --replace 'return screen.safeAreaInsets.top;' 'return 0;' + ''; passthru = { tests.version = testers.testVersion { @@ -87,18 +98,23 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; hash = "sha256-88Sh2nizAQ0a0cnlnrkhb5x3VjHa372HhjHlmNjGdQ4="; }; - "x86_64-darwin" = fetchFromGitHub - { - owner = "koekeishiya"; - repo = "yabai"; - rev = "v${finalAttrs.version}"; - hash = "sha256-5iC1U6tyUYFLjOfnIxCrjCjj2deUZ/rvsJN4jlrr2Tc="; - }; + "x86_64-darwin" = fetchFromGitHub { + owner = "koekeishiya"; + repo = "yabai"; + rev = "v${finalAttrs.version}"; + hash = "sha256-5iC1U6tyUYFLjOfnIxCrjCjj2deUZ/rvsJN4jlrr2Tc="; + }; }; updateScript = writeShellScript "update-yabai" '' set -o errexit - export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}" + export PATH="${ + lib.makeBinPath [ + curl + jq + common-updater-scripts + ] + }" NEW_VERSION=$(curl --silent https://api.github.com/repos/koekeishiya/yabai/releases/latest | jq '.tag_name | ltrimstr("v")' --raw-output) if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then echo "The new version same as the old version." @@ -130,12 +146,8 @@ stdenv.mkDerivation (finalAttrs: { ivar khaneliman ]; - sourceProvenance = with lib.sourceTypes; [ ] - ++ lib.optionals stdenv.isx86_64 [ - fromSource - ] ++ lib.optionals stdenv.isAarch64 [ - binaryNativeCode - ]; + sourceProvenance = + with lib.sourceTypes; + lib.optionals stdenv.isx86_64 [ fromSource ] ++ lib.optionals stdenv.isAarch64 [ binaryNativeCode ]; }; }) - diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yamlscript/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yamlscript/package.nix index 5d53e08bad..eb67d09dbb 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yamlscript/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.56"; + version = "0.1.58"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-4ZjQYl4NdqbzyeEWDthBA8fWJFlIuMRtvHLtdlVYQmw="; + hash = "sha256-rARUkbVq77uPrQZwfQ0NNM4XwYaVhSinLi0sCoVR63E="; }; executable = "ys"; diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix index 9bf70a8645..d0a0d77ecf 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -5,27 +5,28 @@ , installShellFiles , stdenv , Foundation +, rust-jemalloc-sys , nix-update-script }: rustPlatform.buildRustPackage rec { pname = "yazi"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "sxyazi"; repo = "yazi"; rev = "v${version}"; - hash = "sha256-c8fWWCOVBqQVdQch9BniCaJPrVEOCv35lLH8/hMIbvE="; + hash = "sha256-RwkgJX4naD3t97ce4Zg/VWJ41QiVFFqDW5nHpyMtISY="; }; - cargoHash = "sha256-VeDyO+KCD3Axse4iPIoRxIvoAn3L33e2ObBZFV/REeg="; + cargoHash = "sha256-qnbinuTuaPiD7ib3aCJzSwuA4s3naFzi+txqX7jkHIo="; env.YAZI_GEN_COMPLETIONS = true; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; + buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; postInstall = '' installShellCompletion --cmd yazi \ diff --git a/third_party/nixpkgs/pkgs/tools/wayland/ydotool/default.nix b/third_party/nixpkgs/pkgs/by-name/yd/ydotool/package.nix similarity index 55% rename from third_party/nixpkgs/pkgs/tools/wayland/ydotool/default.nix rename to third_party/nixpkgs/pkgs/by-name/yd/ydotool/package.nix index 42f95735de..137a701d87 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/ydotool/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/yd/ydotool/package.nix @@ -1,13 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux, xorg }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + scdoc, + util-linux, + xorg, + nixosTests, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ydotool"; version = "1.0.4"; src = fetchFromGitHub { owner = "ReimuNotMoe"; repo = "ydotool"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-MtanR+cxz6FsbNBngqLE+ITKPZFHmWGsD1mBDk0OVng="; }; @@ -19,13 +28,22 @@ stdenv.mkDerivation rec { ''; strictDeps = true; - nativeBuildInputs = [ cmake scdoc ]; + nativeBuildInputs = [ + cmake + scdoc + ]; - meta = with lib; { - homepage = "https://github.com/ReimuNotMoe/ydotool"; + passthru.tests.basic = nixosTests.ydotool; + + meta = { description = "Generic Linux command-line automation tool"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ willibutz kraem ]; - platforms = with platforms; linux; + homepage = "https://github.com/ReimuNotMoe/ydotool"; + license = lib.licenses.agpl3Plus; + mainProgram = "ydotool"; + maintainers = with lib.maintainers; [ + willibutz + kraem + ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ye/yesplaymusic/package.nix b/third_party/nixpkgs/pkgs/by-name/ye/yesplaymusic/package.nix index c5292401fa..576547669f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ye/yesplaymusic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ye/yesplaymusic/package.nix @@ -4,7 +4,7 @@ , _7zz , dpkg , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , alsa-lib , at-spi2-atk @@ -98,7 +98,7 @@ else stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/yo/yofi/package.nix b/third_party/nixpkgs/pkgs/by-name/yo/yofi/package.nix new file mode 100644 index 0000000000..5227efa6fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/yo/yofi/package.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, autoPatchelfHook +, fontconfig +, libxkbcommon +, pkg-config +, libgcc +, wayland +}: +rustPlatform.buildRustPackage rec { + pname = "yofi"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "l4l"; + repo = "yofi"; + rev = "refs/tags/${version}"; + hash = "sha256-cepAZyA4RBgqeF20g6YOlZTM0aRqErw17yuQ3U24UEg="; + }; + + cargoHash = "sha256-iSy/y1iwhR8x3wDIfazMeROSrJ8uRyA10hoNo6y2OQc="; + nativeBuildInputs = [ + autoPatchelfHook + pkg-config + ]; + + buildInputs = [ + libgcc + libxkbcommon + ]; + + appendRunpaths = [ + (lib.makeLibraryPath [ fontconfig wayland ]) + ]; + + checkFlags = [ + # Fail to run in sandbox environment. + "--skip=screen::context::test" + ]; + + meta = { + description = "A minimalist app launcher in Rust"; + homepage = "https://github.com/l4l/yofi"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ rayslash ]; + mainProgram = "yofi"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/yo/your_spotify/client.nix b/third_party/nixpkgs/pkgs/by-name/yo/your_spotify/client.nix new file mode 100644 index 0000000000..420498821b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/yo/your_spotify/client.nix @@ -0,0 +1,58 @@ +{ + apiEndpoint ? "http://localhost:3000", + fetchYarnDeps, + your_spotify, + mkYarnPackage, + fixup-yarn-lock, + src, + version, + yarn, +}: +mkYarnPackage rec { + inherit version src; + pname = "your_spotify_client"; + name = "your_spotify_client-${version}"; + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-5SgknaRVzgO2Dzc8MhAaM8UERWMv+PrItzevoWHbWnA="; + }; + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror $offlineCache + fixup-yarn-lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + + runHook postConfigure + ''; + buildPhase = '' + runHook preBuild + pushd ./apps/client/ + yarn --offline run build + export API_ENDPOINT="${apiEndpoint}" + substituteInPlace scripts/run/variables.sh --replace-quiet '/app/apps/client/' "./" + + chmod +x ./scripts/run/variables.sh + patchShebangs --build ./scripts/run/variables.sh + + ./scripts/run/variables.sh + + popd + runHook postBuild + ''; + nativeBuildInputs = [yarn fixup-yarn-lock]; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r ./apps/client/build/* $out + runHook postInstall + ''; + doDist = false; + meta = { + inherit (your_spotify.meta) homepage changelog description license maintainers; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/yo/your_spotify/package.json b/third_party/nixpkgs/pkgs/by-name/yo/your_spotify/package.json new file mode 100644 index 0000000000..8c10988ffb --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/yo/your_spotify/package.json @@ -0,0 +1,10 @@ +{ + "name": "@your_spotify/root", + "version": "1.10.1", + "repository": "git@github.com:Yooooomi/your_spotify.git", + "author": "Timothee ", + "private": true, + "workspaces": [ + "apps/*" + ] +} diff --git a/third_party/nixpkgs/pkgs/by-name/yo/your_spotify/package.nix b/third_party/nixpkgs/pkgs/by-name/yo/your_spotify/package.nix new file mode 100644 index 0000000000..0296b9d22c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/yo/your_spotify/package.nix @@ -0,0 +1,85 @@ +{ + callPackage, + fetchFromGitHub, + fetchYarnDeps, + lib, + makeWrapper, + mkYarnPackage, + nodejs, + fixup-yarn-lock, + yarn, +}: let + version = "1.10.1"; + src = fetchFromGitHub { + owner = "Yooooomi"; + repo = "your_spotify"; + rev = "refs/tags/${version}"; + hash = "sha256-e82j2blGxQLWAlBNuAnFvlD9vwMk4/mRI0Vf7vuaPA0="; + }; + client = callPackage ./client.nix {inherit src version;}; +in + mkYarnPackage rec { + inherit version src; + pname = "your_spotify_server"; + name = "your_spotify_server-${version}"; + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-5SgknaRVzgO2Dzc8MhAaM8UERWMv+PrItzevoWHbWnA="; + }; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror $offlineCache + fixup-yarn-lock yarn.lock + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + + pushd ./apps/server/ + yarn --offline run build + popd + + rm -r node_modules + export NODE_ENV="production" + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + + runHook postBuild + ''; + nativeBuildInputs = [makeWrapper yarn fixup-yarn-lock]; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/your_spotify + cp -r node_modules $out/share/your_spotify/node_modules + cp -r ./apps/server/{lib,package.json} $out + mkdir -p $out/bin + makeWrapper ${lib.escapeShellArg (lib.getExe nodejs)} "$out/bin/your_spotify_migrate" \ + --add-flags "$out/lib/migrations.js" --set NODE_PATH "$out/share/your_spotify/node_modules" + makeWrapper ${lib.escapeShellArg (lib.getExe nodejs)} "$out/bin/your_spotify_server" \ + --add-flags "$out/lib/index.js" --set NODE_PATH "$out/share/your_spotify/node_modules" + + runHook postInstall + ''; + doDist = false; + passthru = { + inherit client; + }; + meta = with lib; { + homepage = "https://github.com/Yooooomi/your_spotify"; + changelog = "https://github.com/Yooooomi/your_spotify/releases/tag/${version}"; + description = "Self-hosted application that tracks what you listen and offers you a dashboard to explore statistics about it"; + license = licenses.gpl3Only; + maintainers = with maintainers; [patrickdag]; + mainProgram = "your_spotify_server"; + }; + } diff --git a/third_party/nixpkgs/pkgs/by-name/yo/youtrack/package.nix b/third_party/nixpkgs/pkgs/by-name/yo/youtrack/package.nix index 564c86e284..5dbe8b9710 100644 --- a/third_party/nixpkgs/pkgs/by-name/yo/youtrack/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/yo/youtrack/package.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "youtrack"; - version = "2024.1.27971"; + version = "2024.1.29548"; src = fetchzip { url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip"; - hash = "sha256-DropdHT3ZA4kuxyE8xyHB079OMzYH4zKPt38oW7XoFY="; + hash = "sha256-01av1leVJz+QbnFNYyxEeL1zd6I25VNt45YFgV25n+0="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/yt/ytdownloader/package.nix b/third_party/nixpkgs/pkgs/by-name/yt/ytdownloader/package.nix index 9a607c16e4..b471ec8193 100644 --- a/third_party/nixpkgs/pkgs/by-name/yt/ytdownloader/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/yt/ytdownloader/package.nix @@ -10,13 +10,13 @@ buildNpmPackage rec { pname = "ytDownloader"; - version = "3.17.3"; + version = "3.17.4"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "ytDownloader"; rev = "refs/tags/v${version}"; - hash = "sha256-aqQGOqPLKKTBjWjL3KyRD4paBGCQLhCBjXwVVhoHDSk="; + hash = "sha256-GW+17DfPiFxw2QyJ5KTMZLDWmqXfnHfkg+QpM5XOP0M="; }; npmDepsHash = "sha256-lhFyiWy9dgnxxaElavzqA4YpRm7cVC23pvL5Kwve58E="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/onagre/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/yt/ytermusic/Cargo.lock similarity index 55% rename from third_party/nixpkgs/pkgs/applications/misc/onagre/Cargo.lock rename to third_party/nixpkgs/pkgs/by-name/yt/ytermusic/Cargo.lock index b576dbc902..1fbd706c0c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/onagre/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/yt/ytermusic/Cargo.lock @@ -3,21 +3,14 @@ version = 3 [[package]] -name = "ab_glyph" -version = "0.2.15" +name = "addr2line" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24606928a235e73cdef55a0c909719cadd72fce573e5713d58cb2952d8f5794c" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", + "gimli", ] -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13739d7177fbd22bb0ed28badfff9f372f8bef46c863db4e1c6248f6b223b6e" - [[package]] name = "adler" version = "1.0.2" @@ -25,75 +18,86 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "adler32" -version = "1.2.0" +name = "aes" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if 1.0.0", + "cipher", + "cpufeatures", +] [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ - "getrandom 0.2.6", + "cfg-if 1.0.0", + "getrandom 0.2.12", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "allocator-api2" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "alsa" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" dependencies = [ - "winapi", + "alsa-sys", + "bitflags 1.3.2", + "libc", + "nix 0.23.2", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", ] [[package]] name = "anyhow" -version = "1.0.57" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" - -[[package]] -name = "approx" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" -dependencies = [ - "num-traits", -] - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "arrayvec" @@ -102,136 +106,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] -name = "ash" -version = "0.34.0+1.2.203" +name = "async-compression" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0f780da53d0063880d45554306489f09dd8d1bda47688b4a57bc579119356df" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" dependencies = [ - "libloading", -] - -[[package]] -name = "async-broadcast" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bbd92a9bd0e9c1298118ecf8a2f825e86b12c3ec9e411573e34aaf3a0c03cdd" -dependencies = [ - "easy-parallel", - "event-listener", + "flate2", "futures-core", - "parking_lot", + "memchr", + "pin-project-lite", + "tokio", ] -[[package]] -name = "async-channel" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "once_cell", - "slab", -] - -[[package]] -name = "async-io" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" -dependencies = [ - "concurrent-queue", - "futures-lite", - "libc", - "log", - "once_cell", - "parking", - "polling", - "slab", - "socket2", - "waker-fn", - "winapi", -] - -[[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-oneshot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec7c75bcbcb0139e9177f30692fd617405ca4e0c27802e128d53171f7042e2c" -dependencies = [ - "futures-micro", -] - -[[package]] -name = "async-pidfd" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12177058299bb8e3507695941b6d0d7dc0e4e6515b8bc1bf4609d9e32ef51799" -dependencies = [ - "async-io", - "libc", -] - -[[package]] -name = "async-recursion" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "async-task" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" - [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", ] [[package]] -name = "atty" -version = "0.2.14" +name = "atomic_float" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] +checksum = "62af46d040ba9df09edc6528dae9d8e49f5f3e82f55b7d2ec31a733c38dbc49d" [[package]] name = "autocfg" @@ -239,6 +141,21 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide 0.7.2", + "object", + "rustc-demangle", +] + [[package]] name = "base64" version = "0.13.0" @@ -246,19 +163,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] -name = "bit-set" -version = "0.5.2" +name = "base64" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "bit-vec", + "serde", ] [[package]] -name = "bit-vec" -version = "0.6.3" +name = "bindgen" +version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", +] [[package]] name = "bitflags" @@ -266,6 +202,15 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +dependencies = [ + "serde", +] + [[package]] name = "block" version = "0.1.6" @@ -274,68 +219,171 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-buffer" -version = "0.7.3" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" dependencies = [ - "block-padding", - "byte-tools", - "byteorder", "generic-array", ] [[package]] name = "block-padding" -version = "0.1.5" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" dependencies = [ - "byte-tools", + "generic-array", ] [[package]] -name = "bstr" -version = "0.2.17" +name = "boa_ast" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "73498e9b2f0aa7db74977afa4d594657611e90587abf0dd564c0b55b4a130163" dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", + "bitflags 2.4.2", + "boa_interner", + "boa_macros", + "indexmap", + "num-bigint", + "rustc-hash", ] +[[package]] +name = "boa_engine" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16377479d5d6d33896e7acdd1cc698d04a8f72004025bbbddf47558cd29146a6" +dependencies = [ + "bitflags 2.4.2", + "boa_ast", + "boa_gc", + "boa_icu_provider", + "boa_interner", + "boa_macros", + "boa_parser", + "boa_profiler", + "chrono", + "dashmap", + "fast-float", + "icu_normalizer", + "indexmap", + "itertools 0.11.0", + "num-bigint", + "num-integer", + "num-traits", + "num_enum 0.6.1", + "once_cell", + "pollster", + "rand 0.8.5", + "regress", + "rustc-hash", + "ryu-js", + "serde", + "serde_json", + "sptr", + "static_assertions", + "tap", + "thin-vec", + "thiserror", +] + +[[package]] +name = "boa_gc" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c97b44beaef9d4452342d117d94607fdfa8d474280f1ba0fd97853834e3a49b2" +dependencies = [ + "boa_macros", + "boa_profiler", + "thin-vec", +] + +[[package]] +name = "boa_icu_provider" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30e52e34e451dd0bfc2c654a9a43ed34b0073dbd4ae3394b40313edda8627aa" +dependencies = [ + "icu_collections", + "icu_normalizer", + "icu_properties", + "icu_provider", + "icu_provider_adapters", + "icu_provider_blob", + "once_cell", +] + +[[package]] +name = "boa_interner" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e5afa991908cfbe79bd3109b824e473a1dc5f74f31fab91bb44c9e245daa77" +dependencies = [ + "boa_gc", + "boa_macros", + "hashbrown 0.14.3", + "indexmap", + "once_cell", + "phf 0.11.2", + "rustc-hash", + "static_assertions", +] + +[[package]] +name = "boa_macros" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "005fa0c5bd20805466dda55eb34cd709bb31a2592bb26927b47714eeed6914d8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "synstructure", +] + +[[package]] +name = "boa_parser" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e09afb035377a9044443b598187a7d34cd13164617182a4d7c348522ee3f052" +dependencies = [ + "bitflags 2.4.2", + "boa_ast", + "boa_icu_provider", + "boa_interner", + "boa_macros", + "boa_profiler", + "fast-float", + "icu_locid", + "icu_properties", + "icu_provider", + "icu_provider_macros", + "num-bigint", + "num-traits", + "once_cell", + "regress", + "rustc-hash", + "tinystr", +] + +[[package]] +name = "boa_profiler" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3190f92dfe48224adc92881c620f08ccf37ff62b91a094bb357fe53bd5e84647" + [[package]] name = "bumpalo" version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "bytemuck" -version = "1.9.1" +version = "1.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562e382481975bc61d11275ac5e62a19abd00b0547d99516a415336f183dcd0e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "ea31d69bda4949c1c1562c1e6f042a1caefac98cdc8a298260a2ff41c1e2d42b" [[package]] name = "byteorder" @@ -343,24 +391,12 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - [[package]] name = "calloop" version = "0.9.3" @@ -372,19 +408,53 @@ dependencies = [ ] [[package]] -name = "cast" -version = "0.2.7" +name = "cassowary" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "castaway" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" dependencies = [ - "rustc_version 0.4.0", + "rustversion", +] + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", ] [[package]] name = "cc" -version = "1.0.73" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] [[package]] name = "cfg-if" @@ -399,71 +469,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "cfg_aliases" -version = "0.1.1" +name = "chrono" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ - "bitflags", - "textwrap", - "unicode-width", + "android-tzdata", + "iana-time-zone", + "num-traits", + "windows-targets 0.52.0", ] [[package]] -name = "clipboard-win" -version = "4.4.1" +name = "cipher" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3e1238132dc01f081e1cbb9dace14e5ef4c3a51ee244bd982275fb514605db" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "error-code", - "str-buf", - "winapi", + "crypto-common", + "inout", ] [[package]] -name = "clipboard_macos" -version = "0.1.0" +name = "clang-sys" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95" +checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21" dependencies = [ - "objc", - "objc-foundation", - "objc_id", + "glob", + "libc", + "libloading 0.7.3", ] [[package]] -name = "clipboard_wayland" -version = "0.2.0" +name = "cobs" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747" -dependencies = [ - "smithay-clipboard", -] - -[[package]] -name = "clipboard_x11" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64240d63f1883d87e5637bfcaf9d77e5c8bd24e30fd440ea2dff5c48c0bf0b7a" -dependencies = [ - "thiserror", - "x11rb", -] - -[[package]] -name = "cmake" -version = "0.1.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" -dependencies = [ - "cc", -] +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] name = "cocoa" @@ -471,7 +513,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", "core-foundation 0.9.3", @@ -487,7 +529,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-foundation 0.9.3", "core-graphics-types", @@ -497,56 +539,63 @@ dependencies = [ ] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "combine" +version = "4.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948" dependencies = [ - "termcolor", - "unicode-width", + "bytes", + "memchr", ] [[package]] -name = "color_quant" -version = "1.1.0" +name = "compact_str" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "concurrent-queue" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" +checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" dependencies = [ - "cache-padded", + "castaway", + "cfg-if 1.0.0", + "itoa", + "ryu", + "serde", + "static_assertions", ] [[package]] -name = "const_format" -version = "0.2.23" +name = "convert_case" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0936ffe6d0c8d6a51b3b0a73b2acbe925d786f346cf45bfddc8341d79fb7dc8a" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "cookie" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ - "const_format_proc_macros", + "percent-encoding", + "time", + "version_check", ] [[package]] -name = "const_format_proc_macros" -version = "0.2.22" +name = "cookie_store" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef196d5d972878a48da7decb7686eded338b4858fbabeed513d63a7c98b2b82d" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", + "cookie", + "idna 0.3.0", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time", + "url", ] -[[package]] -name = "copyless" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" - [[package]] name = "core-foundation" version = "0.7.0" @@ -585,7 +634,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation 0.7.0", "foreign-types", "libc", @@ -597,7 +646,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation 0.9.3", "core-graphics-types", "foreign-types", @@ -610,24 +659,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation 0.9.3", "foreign-types", "libc", ] -[[package]] -name = "core-text" -version = "19.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" -dependencies = [ - "core-foundation 0.9.3", - "core-graphics 0.22.3", - "foreign-types", - "libc", -] - [[package]] name = "core-video-sys" version = "0.1.4" @@ -641,6 +678,59 @@ dependencies = [ "objc", ] +[[package]] +name = "coreaudio-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" +dependencies = [ + "bitflags 1.3.2", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dff444d80630d7073077d38d40b4501fd518bd2b922c2a55edcc8b0f7be57e6" +dependencies = [ + "bindgen", +] + +[[package]] +name = "cpal" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" +dependencies = [ + "alsa", + "core-foundation-sys 0.8.3", + "coreaudio-rs", + "jni", + "js-sys", + "lazy_static", + "libc", + "mach", + "ndk 0.6.0", + "ndk-glue 0.6.1", + "nix 0.23.2", + "oboe", + "parking_lot 0.11.2", + "stdweb", + "thiserror", + "web-sys", + "winapi", +] + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + [[package]] name = "crc32fast" version = "1.3.2" @@ -651,116 +741,71 @@ dependencies = [ ] [[package]] -name = "criterion" -version = "0.3.5" +name = "critical-section" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10" +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" + +[[package]] +name = "crossterm" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "atty", - "cast", - "clap", - "criterion-plot", - "csv", - "itertools", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_cbor", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", + "bitflags 2.4.2", + "crossterm_winapi", + "libc", + "mio", + "parking_lot 0.12.0", + "signal-hook", + "signal-hook-mio", + "winapi", ] [[package]] -name = "criterion-plot" -version = "0.4.4" +name = "crossterm_winapi" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" dependencies = [ - "cast", - "itertools", + "winapi", ] [[package]] -name = "crossbeam-channel" -version = "0.5.4" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", + "generic-array", + "typenum", ] [[package]] -name = "crossbeam-deque" -version = "0.8.1" +name = "cssparser" +version = "0.29.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", + "cssparser-macros", + "dtoa-short", + "itoa", + "matches", + "phf 0.10.1", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.99", ] [[package]] -name = "crossbeam-epoch" -version = "0.9.8" +name = "cssparser-macros" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils", - "lazy_static", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" -dependencies = [ - "cfg-if 1.0.0", - "lazy_static", -] - -[[package]] -name = "csv" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" -dependencies = [ - "bstr", - "csv-core", - "itoa 0.4.8", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - -[[package]] -name = "ctor" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn", + "syn 2.0.48", ] [[package]] @@ -769,22 +814,11 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" -[[package]] -name = "d3d12" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daefd788d1e96e0a9d66dee4b828b883509bc3ea9ce30665f04c3246372690c" -dependencies = [ - "bitflags", - "libloading", - "winapi", -] - [[package]] name = "darling" -version = "0.13.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4" dependencies = [ "darling_core", "darling_macro", @@ -792,65 +826,69 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.99", ] [[package]] name = "darling_macro" -version = "0.13.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.99", ] [[package]] -name = "data-url" -version = "0.1.1" +name = "dashmap" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "matches", + "cfg-if 1.0.0", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", ] [[package]] -name = "deflate" -version = "0.7.20" +name = "dbus" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" +checksum = "de0a745c25b32caa56b82a3950f5fec7893a960f4c10ca3b02060b0c38d8c2ce" dependencies = [ - "adler32", - "byteorder", + "libc", + "libdbus-sys", + "winapi", ] [[package]] -name = "deflate" -version = "0.8.6" +name = "dbus-crossroads" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" +checksum = "a5d83c4b78f7c7d0dec4859d286665a06858a607ba406c91a36316ff36918141" dependencies = [ - "adler32", - "byteorder", + "dbus", ] [[package]] -name = "deflate" -version = "1.0.0" +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "adler32", + "powerfmt", ] [[package]] @@ -861,72 +899,51 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] -name = "diff" -version = "0.1.12" +name = "derive_more" +version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.99", +] [[package]] name = "digest" -version = "0.8.1" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "generic-array", + "block-buffer", + "crypto-common", ] [[package]] -name = "dirs" -version = "3.0.2" +name = "directories" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ "dirs-sys", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -936,19 +953,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] -name = "dlib" -version = "0.5.0" +name = "displaydoc" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ - "libloading", + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] -name = "dlv-list" -version = "0.3.0" +name = "dlib" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] [[package]] name = "downcast-rs" @@ -957,166 +979,97 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] -name = "dwrote" -version = "0.11.0" +name = "dtoa" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" dependencies = [ - "lazy_static", - "libc", - "winapi", - "wio", + "dtoa", ] [[package]] -name = "easy-parallel" -version = "3.2.0" +name = "ego-tree" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946" +checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591" [[package]] name = "either" -version = "1.6.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" dependencies = [ "cfg-if 1.0.0", ] [[package]] -name = "enumflags2" -version = "0.7.5" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" -dependencies = [ - "enumflags2_derive", - "serde", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] -name = "enumflags2_derive" -version = "0.7.4" +name = "errno" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "str-buf", + "windows-sys 0.52.0", ] [[package]] -name = "euclid" -version = "0.22.7" +name = "fast-float" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade" -dependencies = [ - "num-traits", -] - -[[package]] -name = "event-listener" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" - -[[package]] -name = "expat-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" -dependencies = [ - "cmake", - "pkg-config", -] - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" +checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] name = "fastrand" -version = "1.7.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" -dependencies = [ - "instant", -] - -[[package]] -name = "find-crate" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" -dependencies = [ - "toml", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "flate2" -version = "1.0.23" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" dependencies = [ "cfg-if 1.0.0", "crc32fast", "libc", - "miniz_oxide 0.5.1", + "miniz_oxide 0.4.4", ] -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" - -[[package]] -name = "float-ord" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e" - [[package]] name = "flume" -version = "0.10.12" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843c03199d0c0ca54bc1ea90ac0d507274c28abcc4f691ae8b4eaa375087c76a" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", "nanorand", - "pin-project 1.0.10", - "spin 0.9.3", + "spin 0.9.8", ] [[package]] @@ -1125,42 +1078,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "font-kit" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c9a156ec38864999bc9c4156e5f3b50224d4a5578028a64e5a3875caa9ee28" -dependencies = [ - "bitflags", - "byteorder", - "core-foundation 0.9.3", - "core-graphics 0.22.3", - "core-text", - "dirs-next", - "dwrote", - "float-ord", - "freetype", - "lazy_static", - "libc", - "log", - "pathfinder_geometry", - "pathfinder_simd", - "servo-fontconfig", - "walkdir", - "winapi", -] - -[[package]] -name = "fontdb" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d66551cc28351f0bc6a73da86459ee7765caaad03ce284f2dc36472dbf539cd" -dependencies = [ - "log", - "memmap2", - "ttf-parser 0.12.3", -] - [[package]] name = "foreign-types" version = "0.3.2" @@ -1176,87 +1093,25 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -[[package]] -name = "fork" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b4f1a740392e495821244cc1658d86496ac6e67a47da67e243ed401b937717" -dependencies = [ - "libc", -] - [[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", ] [[package]] -name = "freedesktop-desktop-entry" -version = "0.5.0" +name = "futf" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45157175a725e81f3f594382430b6b78af5f8f72db9bd51b94f0785f80fc6d29" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" dependencies = [ - "dirs 3.0.2", - "gettext-rs", - "memchr", - "thiserror", - "xdg", + "mac", + "new_debug_unreachable", ] -[[package]] -name = "freedesktop-icons" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420b2cb0cf0ab0d5f34c068830f3b5c17b378ab3c2acaf7ca4bfde671d70be51" -dependencies = [ - "dirs 4.0.0", - "once_cell", - "rust-ini", - "thiserror", -] - -[[package]] -name = "freetype" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6" -dependencies = [ - "freetype-sys", - "libc", -] - -[[package]] -name = "freetype-sys" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" -dependencies = [ - "cmake", - "libc", - "pkg-config", -] - -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "futures" version = "0.3.21" @@ -1274,9 +1129,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ "futures-core", "futures-sink", @@ -1284,9 +1139,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] name = "futures-executor" @@ -1297,67 +1152,42 @@ dependencies = [ "futures-core", "futures-task", "futures-util", - "num_cpus", ] [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" - -[[package]] -name = "futures-lite" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "futures-micro" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b460264b3593d68b16a7bc35f7bc226ddfebdf9a1c8db1ed95d5cc6b7168c826" -dependencies = [ - "pin-project-lite", + "syn 1.0.99", ] [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ "futures-channel", "futures-core", @@ -1371,18 +1201,6 @@ dependencies = [ "slab", ] -[[package]] -name = "futures_codec" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b" -dependencies = [ - "bytes 0.5.6", - "futures", - "memchr", - "pin-project 0.4.29", -] - [[package]] name = "fxhash" version = "0.2.1" @@ -1392,32 +1210,23 @@ dependencies = [ "byteorder", ] -[[package]] -name = "gen-z" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e87038e64f38cb7fcd57f54c8d6654ad65712babbf70f38d1834d3150ad2415" -dependencies = [ - "futures", -] - [[package]] name = "generic-array" -version = "0.12.4" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", + "version_check", ] [[package]] -name = "gethostname" -version = "0.2.3" +name = "getopts" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" dependencies = [ - "libc", - "winapi", + "unicode-width", ] [[package]] @@ -1433,163 +1242,36 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.6" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if 1.0.0", "js-sys", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] [[package]] -name = "gettext-rs" -version = "0.7.0" +name = "gimli" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", -] +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] -name = "gettext-sys" -version = "0.21.3" +name = "glob" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gif" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a7187e78088aead22ceedeee99779455b23fc231fe13ec443f99bb71694e5b" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "glam" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579160312273c954cc51bd440f059dde741029ac8daf8c84fece76cb77f62c15" -dependencies = [ - "version_check", -] - -[[package]] -name = "glow" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glyph_brush" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69c65dd1f1fbb6209aa00f78636e436ad0a55b7d8e5de886d00720dcad9c6e2" -dependencies = [ - "glyph_brush_draw_cache", - "glyph_brush_layout", - "log", - "ordered-float", - "rustc-hash", - "twox-hash", -] - -[[package]] -name = "glyph_brush_draw_cache" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6010675390f6889e09a21e2c8b575b3ee25667ea8237a8d59423f73cb8c28610" -dependencies = [ - "ab_glyph", - "crossbeam-channel", - "crossbeam-deque", - "linked-hash-map", - "rayon", - "rustc-hash", -] - -[[package]] -name = "glyph_brush_layout" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38" -dependencies = [ - "ab_glyph", - "approx 0.5.1", - "xi-unicode", -] - -[[package]] -name = "gpu-alloc" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d" -dependencies = [ - "bitflags", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" -dependencies = [ - "bitflags", -] - -[[package]] -name = "gpu-descriptor" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a538f217be4d405ff4719a283ca68323cc2384003eca5baaa87501e821c81dda" -dependencies = [ - "bitflags", - "gpu-descriptor-types", - "hashbrown 0.11.2", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" -dependencies = [ - "bitflags", -] - -[[package]] -name = "guillotiere" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" -dependencies = [ - "euclid", - "svg_fmt", -] +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "h2" -version = "0.3.13" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", "futures-core", "futures-sink", @@ -1602,38 +1284,30 @@ dependencies = [ "tracing", ] -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ "ahash", ] [[package]] name = "hashbrown" -version = "0.12.1" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", + "allocator-api2", ] [[package]] name = "heck" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -1651,20 +1325,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "hexf-parse" -version = "0.2.1" +name = "html5ever" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.99", +] [[package]] name = "http" -version = "0.2.7" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", - "itoa 1.0.1", + "itoa", ] [[package]] @@ -1673,16 +1355,16 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ - "bytes 1.1.0", + "bytes", "http", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1690,31 +1372,13 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" -[[package]] -name = "human-sort" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140a09c9305e6d5e557e2ed7cbc68e05765a7d4213975b87cb04920689cc6219" - -[[package]] -name = "human_format" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86cce260d758a9aa3d7c4b99d55c815a540f8a37514ba6046ab6be402a157cb0" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" -version = "0.14.18" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -1723,7 +1387,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.1", + "itoa", "pin-project-lite", "socket2", "tokio", @@ -1734,10 +1398,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", "rustls", @@ -1746,131 +1411,155 @@ dependencies = [ ] [[package]] -name = "iced" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6025abe6b1056c9b5adad79c484c5fd8b7012e5230f3b0439a1294ade7ded7bf" -dependencies = [ - "iced_core", - "iced_futures", - "iced_graphics", - "iced_native", - "iced_wgpu", - "iced_winit", - "thiserror", -] - -[[package]] -name = "iced_core" +name = "hyper-tls" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf9133ceb345ec640047d5597fb8aa88e9cf74ce2d0277a9a62e2d6ed4a8148" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bitflags", - "palette 0.6.0", - "wasm-timer", -] - -[[package]] -name = "iced_futures" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a93ebc9bcad1745b0852f961c17f3311d8ad797dca5ec5d76c2f7b48922030d" -dependencies = [ - "futures", - "log", + "bytes", + "hyper", + "native-tls", "tokio", - "wasm-bindgen-futures", - "wasm-timer", + "tokio-native-tls", ] [[package]] -name = "iced_graphics" -version = "0.3.0" +name = "iana-time-zone" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f5e700f76069666fe7eb920f715a46471a6b8063d8c237b17ff2c1d2f31ce5" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ - "bytemuck", - "font-kit", - "glam", - "iced_native", - "iced_style", - "raw-window-handle 0.4.3", - "thiserror", + "android_system_properties", + "core-foundation-sys 0.8.3", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", ] [[package]] -name = "iced_native" -version = "0.5.0" +name = "iana-time-zone-haiku" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7bde7e7c754a0579bb1565394c2167014a8e29824195aecb598cbdf69dba4c5" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "iced_core", - "iced_futures", - "iced_style", - "num-traits", - "twox-hash", - "unicode-segmentation", + "cc", ] [[package]] -name = "iced_style" -version = "0.4.0" +name = "icu_collections" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90028c94ab62c13cd3b6fb1499a593a51510d4729c5b4e8e60705b2b28c6bc2" +checksum = "ef8302d8dfd6044d3ddb3f807a5ef3d7bbca9a574959c6d6e4dc39aa7012d0d5" dependencies = [ - "iced_core", + "displaydoc", + "serde", + "yoke", + "zerofrom", + "zerovec", ] [[package]] -name = "iced_wgpu" -version = "0.5.0" +name = "icu_locid" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef85bef80e9a6ce3bd5e1c783661f4911424e922bfa30b2e600a33a1e5d5716" +checksum = "3003f85dccfc0e238ff567693248c59153a46f4e6125ba4020b973cef4d1d335" dependencies = [ - "bitflags", - "bytemuck", - "futures", - "glyph_brush", - "guillotiere", - "iced_graphics", - "iced_native", - "image", - "kamadak-exif", - "log", - "raw-window-handle 0.4.3", - "resvg", - "tiny-skia", - "usvg", - "wgpu", - "wgpu_glyph", + "displaydoc", + "litemap", + "serde", + "tinystr", + "writeable", + "zerovec", ] [[package]] -name = "iced_winit" -version = "0.4.0" +name = "icu_normalizer" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72011b895e439e2ebad8f545720e3e97c7368ecfc47a23cbfeaa9508a98af90c" +checksum = "652869735c9fb9f5a64ba180ee16f2c848390469c116deef517ecc53f4343598" dependencies = [ - "iced_futures", - "iced_graphics", - "iced_native", - "log", - "thiserror", - "web-sys", - "winapi", - "window_clipboard", - "winit", + "displaydoc", + "icu_collections", + "icu_properties", + "icu_provider", + "serde", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", ] [[package]] -name = "ico" -version = "0.1.0" +name = "icu_properties" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4b3331534254a9b64095ae60d3dc2a8225a7a70229cd5888be127cdc1f6804" +checksum = "ce0e1aa26851f16c9e04412a5911c86b7f8768dac8f8d4c5f1c568a7e5d7a434" dependencies = [ - "byteorder", - "png 0.11.0", + "displaydoc", + "icu_collections", + "icu_provider", + "serde", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_provider" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dc312a7b6148f7dfe098047ae2494d12d4034f48ade58d4f353000db376e305" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "postcard", + "serde", + "stable_deref_trait", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_adapters" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ae1e2bd0c41728b77e7c46e9afdec5e2127d1eedacc684724667d50c126bd3" +dependencies = [ + "icu_locid", + "icu_provider", + "serde", + "tinystr", + "yoke", + "zerovec", +] + +[[package]] +name = "icu_provider_blob" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd364c9a01f791a4bc04a74cf2a1d01d9f6926a40fd5ae1c28004e1e70d8338b" +dependencies = [ + "icu_provider", + "postcard", + "serde", + "writeable", + "yoke", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.99", ] [[package]] @@ -1881,56 +1570,49 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] [[package]] -name = "image" -version = "0.23.14" +name = "idna" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif", - "jpeg-decoder", - "num-iter", - "num-rational 0.3.2", - "num-traits", - "png 0.16.8", + "unicode-bidi", + "unicode-normalization", ] [[package]] name = "indexmap" -version = "1.8.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ - "autocfg", - "hashbrown 0.11.2", + "equivalent", + "hashbrown 0.14.3", ] [[package]] -name = "inflate" -version = "0.3.4" +name = "indoc" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f9f47468e9a76a6452271efadc88fe865a82be91fe75e6c0c57b87ccea59d4" -dependencies = [ - "adler32", -] +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] -name = "inplace_it" -version = "0.3.3" +name = "inout" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90953f308a79fe6d62a4643e51f848fbfddcd05975a38e69fdf4ab86a7baf7ca" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] [[package]] name = "instant" @@ -1946,24 +1628,27 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c" [[package]] name = "itertools" -version = "0.10.3" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] [[package]] -name = "itoa" -version = "0.4.8" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] [[package]] name = "itoa" @@ -1971,6 +1656,20 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + [[package]] name = "jni-sys" version = "0.3.0" @@ -1978,51 +1677,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] -name = "jpeg-decoder" -version = "0.1.22" +name = "jobserver" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" dependencies = [ - "rayon", + "libc", ] [[package]] name = "js-sys" -version = "0.3.57" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kamadak-exif" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70494964492bf8e491eb3951c5d70c9627eb7100ede6cc56d748b9a3f302cfb6" -dependencies = [ - "mutate_once", -] - -[[package]] -name = "khronos-egl" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" -dependencies = [ - "libc", - "libloading", -] - -[[package]] -name = "kurbo" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb348d766edbac91ba1eb83020d96f4f8867924d194393083c15a51f185e6a82" -dependencies = [ - "arrayvec 0.5.2", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -2030,10 +1701,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "libc" -version = "0.2.125" +name = "lazycell" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libdbus-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +dependencies = [ + "pkg-config", +] [[package]] name = "libloading" @@ -2046,29 +1732,42 @@ dependencies = [ ] [[package]] -name = "linked-hash-map" -version = "0.5.4" +name = "libloading" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", + "cfg-if 1.0.0", + "windows-sys 0.48.0", ] [[package]] -name = "lock_api" -version = "0.4.7" +name = "libmimalloc-sys" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "litemap" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2076,11 +1775,42 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lru" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" dependencies = [ - "cfg-if 1.0.0", + "hashbrown 0.14.3", +] + +[[package]] +name = "m3u8-rs" +version = "5.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c1d7ba86f7ea62f17f4310c55e93244619ddc7dadfc7e565de1967e4e41e6e7" +dependencies = [ + "chrono", + "nom", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", ] [[package]] @@ -2093,18 +1823,17 @@ dependencies = [ ] [[package]] -name = "maplit" -version = "1.0.2" +name = "markup5ever" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" dependencies = [ - "regex-automata", + "log", + "phf 0.10.1", + "phf_codegen 0.10.0", + "string_cache", + "string_cache_codegen", + "tendril", ] [[package]] @@ -2115,9 +1844,9 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -2138,17 +1867,12 @@ dependencies = [ ] [[package]] -name = "metal" -version = "0.23.1" +name = "mimalloc" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0514f491f4cc03632ab399ee01e2c1c1b12d3e1cf2d667c1ff5f87d6dcd2084" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" dependencies = [ - "bitflags", - "block", - "core-graphics-types", - "foreign-types", - "log", - "objc", + "libmimalloc-sys", ] [[package]] @@ -2157,6 +1881,16 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2165,56 +1899,33 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.3.7" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ - "adler32", + "adler", + "autocfg", ] [[package]] name = "miniz_oxide" -version = "0.5.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.3" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", -] - -[[package]] -name = "mutate_once" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" - -[[package]] -name = "naga" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3012f2dbcc79e8e0b5825a4836a7106a75dd9b2fe42c528163be0f572538c705" -dependencies = [ - "bit-set", - "bitflags", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits", - "rustc-hash", - "spirv", - "thiserror", + "windows-sys 0.48.0", ] [[package]] @@ -2223,7 +1934,25 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.6", + "getrandom 0.2.12", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", ] [[package]] @@ -2232,10 +1961,23 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d868f654c72e75f8687572699cdabe755f03effbb62542768e995d5b8d699d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", - "ndk-sys", - "num_enum", + "ndk-sys 0.2.2", + "num_enum 0.5.7", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys 0.3.0", + "num_enum 0.5.7", "thiserror", ] @@ -2254,10 +1996,25 @@ dependencies = [ "lazy_static", "libc", "log", - "ndk", + "ndk 0.5.0", "ndk-context", "ndk-macro", - "ndk-sys", + "ndk-sys 0.2.2", +] + +[[package]] +name = "ndk-glue" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9ffb7443daba48349d545028777ca98853b018b4c16624aa01223bc29e078da" +dependencies = [ + "lazy_static", + "libc", + "log", + "ndk 0.6.0", + "ndk-context", + "ndk-macro", + "ndk-sys 0.3.0", ] [[package]] @@ -2270,7 +2027,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -2280,26 +2037,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" [[package]] -name = "new_mime_guess" -version = "4.0.1" +name = "ndk-sys" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d684d1b59e0dc07b37e2203ef576987473288f530082512aff850585c61b1f" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" dependencies = [ - "mime", - "unicase", + "jni-sys", ] [[package]] -name = "nix" -version = "0.20.0" +name = "new_debug_unreachable" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", -] +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "nix" @@ -2307,7 +2057,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if 1.0.0", "libc", @@ -2316,17 +2066,35 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if 1.0.0", "libc", "memoffset", ] +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.0", + "libc", + "memoffset", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + [[package]] name = "nom" version = "7.1.1" @@ -2337,40 +2105,33 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational 0.1.42", - "num-traits", -] - [[package]] name = "num-bigint" -version = "0.1.44" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ + "autocfg", "num-integer", "num-traits", - "rand 0.4.6", - "rustc-serialize", + "serde", ] [[package]] -name = "num-complex" -version = "0.1.43" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "num-traits", - "rustc-serialize", + "proc-macro2", + "quote", + "syn 1.0.99", ] [[package]] @@ -2383,45 +2144,11 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", - "rustc-serialize", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -2442,7 +2169,16 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.5.7", +] + +[[package]] +name = "num_enum" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +dependencies = [ + "num_enum_derive 0.6.1", ] [[package]] @@ -2454,14 +2190,20 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] -name = "numtoa" -version = "0.2.4" +name = "num_enum_derive" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.48", +] [[package]] name = "objc" @@ -2470,192 +2212,99 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] -name = "objc-foundation" -version = "0.1.1" +name = "object" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ - "block", - "objc", - "objc_id", + "memchr", ] [[package]] -name = "objc_exception" -version = "0.1.2" +name = "oboe" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" +dependencies = [ + "jni", + "ndk 0.6.0", + "ndk-context", + "num-derive", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" dependencies = [ "cc", ] [[package]] -name = "objc_id" +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +dependencies = [ + "critical-section", + "portable-atomic", +] + +[[package]] +name = "openssl" +version = "0.10.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +dependencies = [ + "bitflags 2.4.2", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "onagre" -version = "1.0.0-alpha.0" -dependencies = [ - "anyhow", - "criterion", - "dirs 4.0.0", - "env_logger", - "font-kit", - "freedesktop-icons", - "iced", - "iced_native", - "iced_style", - "ico", - "log", - "once_cell", - "palette 0.5.0", - "pest", - "pest_derive", - "pop-launcher-toolkit", - "pretty_assertions", - "regex", - "ron 0.6.6", - "serde", - "serde_ini", - "serde_json", - "serde_with", - "shell-words", - "sled", - "speculoos", - "structopt", - "thiserror", - "tokio", -] - -[[package]] -name = "once_cell" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "ordered-float" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bcbab4bfea7a59c2c0fe47211a1ac4e3e96bea6eb446d704f310bc5c732ae2" -dependencies = [ - "num-traits", -] - -[[package]] -name = "ordered-multimap" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" -dependencies = [ - "dlv-list", - "hashbrown 0.12.1", -] - -[[package]] -name = "ordered-stream" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44630c059eacfd6e08bdaa51b1db2ce33119caa4ddc1235e923109aa5f25ccb1" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - -[[package]] -name = "owned_ttf_parser" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1e509cfe7a12db2a90bfa057dfcdbc55a347f5da677c506b53dd099cfec9d" -dependencies = [ - "ttf-parser 0.15.0", -] - -[[package]] -name = "palette" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05c0334468e62a4dfbda34b29110aa7d70d58c7fdb2c9857b5874dd9827cc59" -dependencies = [ - "approx 0.3.2", - "num-traits", - "palette_derive 0.5.0", - "phf 0.8.0", - "phf_codegen", - "serde", -] - -[[package]] -name = "palette" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9735f7e1e51a3f740bacd5dc2724b61a7806f23597a8736e679f38ee3435d18" -dependencies = [ - "approx 0.5.1", - "num-traits", - "palette_derive 0.6.0", - "phf 0.9.0", -] - -[[package]] -name = "palette_derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b4b5f600e60dd3a147fb57b4547033d382d1979eb087af310e91cb45a63b1f4" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", ] [[package]] -name = "palette_derive" -version = "0.6.0" +name = "openssl-probe" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7799c3053ea8a6d8a1193c7ba42f534e7863cf52e378a7f90406f4a645d33bad" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" dependencies = [ - "find-crate", - "proc-macro2", - "quote", - "syn", + "cc", + "libc", + "pkg-config", + "vcpkg", ] [[package]] -name = "parking" -version = "2.0.0" +name = "option-ext" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "parking_lot" @@ -2665,90 +2314,63 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.11", "smallvec", "winapi", ] [[package]] -name = "pathfinder_geometry" -version = "0.5.1" +name = "parking_lot_core" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ - "log", - "pathfinder_simd", + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", ] [[package]] -name = "pathfinder_simd" -version = "0.5.1" +name = "paste" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39fe46acc5503595e5949c17b818714d26fdf9b4920eacf3b2947f0199f4a6ff" -dependencies = [ - "rustc_version 0.3.3", -] +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[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", -] - -[[package]] -name = "pest_derive" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pest_meta" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" -dependencies = [ - "maplit", - "pest", - "sha-1", -] +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" @@ -2761,15 +2383,25 @@ dependencies = [ [[package]] name = "phf" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac8b67553a7ca9457ce0e526948cad581819238f4a9d1ea74545851fa24f37" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_macros", - "phf_shared 0.9.0", + "phf_macros 0.10.0", + "phf_shared 0.10.0", "proc-macro-hack", ] +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros 0.11.2", + "phf_shared 0.11.2", +] + [[package]] name = "phf_codegen" version = "0.8.0" @@ -2780,6 +2412,16 @@ dependencies = [ "phf_shared 0.8.0", ] +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + [[package]] name = "phf_generator" version = "0.8.0" @@ -2792,26 +2434,49 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43f3220d96e0080cc9ea234978ccd80d904eafb17be31bb0f76daaea6493082" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ - "phf_shared 0.9.0", + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", "rand 0.8.5", ] [[package]] name = "phf_macros" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b706f5936eb50ed880ae3009395b43ed19db5bff2ebd459c95e7bf013a89ab86" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" dependencies = [ - "phf_generator 0.9.1", - "phf_shared 0.9.0", + "phf_generator 0.10.0", + "phf_shared 0.10.0", "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 1.0.99", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] @@ -2825,64 +2490,27 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68318426de33640f02be62b4ae8eb1261be2efbc337b60c54d845bf4484e0d9" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ "siphasher", ] [[package]] -name = "pico-args" -version = "0.4.2" +name = "phf_shared" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" - -[[package]] -name = "pin-project" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "pin-project-internal 0.4.29", -] - -[[package]] -name = "pin-project" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" -dependencies = [ - "pin-project-internal 1.0.10", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "siphasher", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2892,192 +2520,61 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" [[package]] -name = "plotters" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" - -[[package]] -name = "plotters-svg" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "png" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925" -dependencies = [ - "bitflags", - "deflate 0.7.20", - "inflate", - "num-iter", -] - -[[package]] -name = "png" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags", - "crc32fast", - "deflate 0.8.6", - "miniz_oxide 0.3.7", -] - -[[package]] -name = "png" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba" -dependencies = [ - "bitflags", - "crc32fast", - "deflate 1.0.0", - "miniz_oxide 0.5.1", -] - -[[package]] -name = "polling" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "log", - "wepoll-ffi", - "winapi", -] - -[[package]] -name = "pop-launcher" -version = "1.2.1" -source = "git+https://github.com/pop-os/launcher/#47852e53cb6f637003ed6bdb178fe76cb90dff24" -dependencies = [ - "const_format", - "dirs 4.0.0", - "futures", - "serde", - "serde_json", - "serde_with", - "tokio", - "tokio-stream", -] - -[[package]] -name = "pop-launcher-plugins" -version = "1.2.1" -source = "git+https://github.com/pop-os/launcher/#47852e53cb6f637003ed6bdb178fe76cb90dff24" -dependencies = [ - "anyhow", - "async-pidfd", - "bytes 1.1.0", - "dirs 4.0.0", - "flume", - "fork", - "freedesktop-desktop-entry", - "futures", - "human-sort", - "human_format", - "new_mime_guess", - "pop-launcher", - "recently-used-xbel", - "regex", - "reqwest", - "ron 0.7.0", - "serde", - "serde_json", - "slab", - "strsim", - "sysfs-class", - "tokio", - "tracing", - "url", - "urlencoding", - "ward", - "zbus", - "zvariant", -] - -[[package]] -name = "pop-launcher-service" -version = "1.2.1" -source = "git+https://github.com/pop-os/launcher/#47852e53cb6f637003ed6bdb178fe76cb90dff24" -dependencies = [ - "anyhow", - "async-oneshot", - "async-trait", - "flume", - "futures", - "futures_codec", - "gen-z", - "num_cpus", - "pop-launcher", - "regex", - "ron 0.7.0", - "serde", - "serde_json", - "serde_with", - "slab", - "strsim", - "tokio", - "tokio-stream", - "toml", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "pop-launcher-toolkit" +name = "player" version = "0.1.0" -source = "git+https://github.com/pop-os/launcher/#47852e53cb6f637003ed6bdb178fe76cb90dff24" dependencies = [ - "pop-launcher", - "pop-launcher-plugins", - "pop-launcher-service", + "atomic_float", + "cpal", + "flume", + "symphonia", + "tokio", ] +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "postcard" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +dependencies = [ + "cobs", + "embedded-io", + "serde", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "pretty_assertions" -version = "1.2.1" +name = "precomputed-hash" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563" -dependencies = [ - "ansi_term", - "ctor", - "diff", - "output_vt100", -] +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro-crate" @@ -3086,31 +2583,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ "thiserror", - "toml", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "toml 0.5.9", ] [[package]] @@ -3121,41 +2594,38 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.38" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] -name = "profiling" -version = "1.0.5" +name = "psl-types" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9145ac0af1d93c638c98c40cf7d25665f427b2a44ad0a99b1dccf3e2f25bb987" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[package]] +name = "publicsuffix" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +dependencies = [ + "idna 0.3.0", + "psl-types", +] [[package]] name = "quote" -version = "1.0.18" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - [[package]] name = "rand" version = "0.7.3" @@ -3178,7 +2648,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -3198,24 +2668,9 @@ 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]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.5.1" @@ -3227,11 +2682,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.12", ] [[package]] @@ -3253,19 +2708,24 @@ dependencies = [ ] [[package]] -name = "range-alloc" -version = "0.1.2" +name = "ratatui" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6" - -[[package]] -name = "raw-window-handle" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" +checksum = "154b85ef15a5d1719bcaa193c3c81fe645cd120c156874cd660fe49fd21d1373" dependencies = [ - "libc", - "raw-window-handle 0.4.3", + "bitflags 2.4.2", + "cassowary", + "compact_str", + "crossterm", + "indoc", + "itertools 0.12.1", + "lru", + "paste", + "serde", + "stability", + "strum", + "unicode-segmentation", + "unicode-width", ] [[package]] @@ -3278,63 +2738,21 @@ dependencies = [ ] [[package]] -name = "rayon" -version = "1.5.2" +name = "redox_syscall" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" +checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "rctree" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae028b272a6e99d9f8260ceefa3caa09300a8d6c8d2b2001316474bc52122e9" - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "recently-used-xbel" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9533c371523034735c8c68da31004561dd011df9d45d0e5886c141858a7d17" -dependencies = [ - "dirs 4.0.0", - "serde", - "serde-xml-rs", - "thiserror", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.2.13" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3343,60 +2761,61 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.6", - "redox_syscall", + "getrandom 0.2.12", + "redox_syscall 0.2.11", "thiserror", ] [[package]] name = "regex" -version = "1.5.5" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", "regex-syntax", ] -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax", -] - [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "regress" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +checksum = "82a9ecfa0cb04d0b04dddb99b8ccf4f66bc8dfd23df694b398570bd8ae3a50fb" dependencies = [ - "winapi", + "hashbrown 0.13.2", + "memchr", ] -[[package]] -name = "renderdoc-sys" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" - [[package]] name = "reqwest" -version = "0.11.10" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ - "base64", - "bytes 1.1.0", + "async-compression", + "base64 0.21.7", + "bytes", + "cookie", + "cookie_store", "encoding_rs", "futures-core", "futures-util", @@ -3405,11 +2824,14 @@ dependencies = [ "http-body", "hyper", "hyper-rustls", + "hyper-tls", "ipnet", "js-sys", - "lazy_static", "log", "mime", + "mime_guess", + "native-tls", + "once_cell", "percent-encoding", "pin-project-lite", "rustls", @@ -3417,8 +2839,13 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", + "tokio-native-tls", "tokio-rustls", + "tokio-util", + "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -3428,34 +2855,52 @@ dependencies = [ ] [[package]] -name = "result" -version = "1.0.0" +name = "reqwest-middleware" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194d8e591e405d1eecf28819740abed6d719d1a2db87fc0bcdedee9a26d55560" - -[[package]] -name = "resvg" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608c6e8aa6fb2c13bc06e4184d7c7b2cc1b7c138f88a539da8be55c3c033d7f4" +checksum = "88a3e86aa6053e59030e7ce2d2a3b258dd08fc2d337d52f73f6cb480f5858690" dependencies = [ - "jpeg-decoder", - "log", - "pico-args", - "png 0.17.5", - "rgb", - "svgfilters", - "tiny-skia", - "usvg", + "anyhow", + "async-trait", + "http", + "reqwest", + "serde", + "task-local-extensions", + "thiserror", ] [[package]] -name = "rgb" -version = "0.8.32" +name = "reqwest-retry" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e74fdc210d8f24a7dbfedc13b04ba5764f5232754ccebfdf5fff1bad791ccbc6" +checksum = "9af20b65c2ee9746cc575acb6bd28a05ffc0d15e25c992a8f4462d8686aacb4f" dependencies = [ - "bytemuck", + "anyhow", + "async-trait", + "chrono", + "futures", + "getrandom 0.2.12", + "http", + "hyper", + "parking_lot 0.11.2", + "reqwest", + "reqwest-middleware", + "retry-policies", + "task-local-extensions", + "tokio", + "tracing", + "wasm-timer", +] + +[[package]] +name = "retry-policies" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd" +dependencies = [ + "anyhow", + "chrono", + "rand 0.8.5", ] [[package]] @@ -3468,51 +2913,30 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] [[package]] -name = "ron" -version = "0.6.6" +name = "ring" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86018df177b1beef6c7c8ef949969c4f7cb9a9344181b92486b23c79995bdaa4" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ - "base64", - "bitflags", - "serde", + "cc", + "getrandom 0.2.12", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", ] [[package]] -name = "ron" -version = "0.7.0" +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678" -dependencies = [ - "base64", - "bitflags", - "serde", -] - -[[package]] -name = "roxmltree" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "rust-ini" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" -dependencies = [ - "cfg-if 1.0.0", - "ordered-multimap", -] +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -3520,49 +2944,57 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.9", + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.20.4" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring", + "ring 0.17.7", + "rustls-webpki", "sct", - "webpki", ] [[package]] name = "rustls-pemfile" -version = "0.3.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" +checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" dependencies = [ - "base64", + "base64 0.13.0", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -3572,19 +3004,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" [[package]] -name = "rustybuzz" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44561062e583c4873162861261f16fd1d85fe927c4904d71329a4fe43dc355ef" +name = "rusty_ytdl" +version = "0.6.6" +source = "git+https://github.com/Mithronn/rusty_ytdl/?branch=main#32232d4fc8ab2ccdab77147d557cde0152a66893" dependencies = [ - "bitflags", - "bytemuck", - "smallvec", - "ttf-parser 0.12.3", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-general-category", - "unicode-script", + "aes", + "async-trait", + "boa_engine", + "cbc", + "derivative", + "derive_more", + "hex", + "m3u8-rs", + "once_cell", + "rand 0.8.5", + "regex", + "reqwest", + "reqwest-middleware", + "reqwest-retry", + "scraper", + "serde", + "serde_json", + "serde_qs", + "thiserror", + "tokio", + "unicode-segmentation", + "url", + "urlencoding", ] [[package]] @@ -3594,13 +3040,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" [[package]] -name = "safe_arch" -version = "0.5.2" +name = "ryu-js" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" -dependencies = [ - "bytemuck", -] +checksum = "6518fc26bced4d53678a22d6e423e9d8716377def84545fe328236e3af070e7f" [[package]] name = "same-file" @@ -3611,6 +3054,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "scoped-tls" version = "1.0.0" @@ -3623,113 +3075,129 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scraper" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e25654b5e9fd557a67dbaab5a5d36b8c448d0561beb4c041b6dbb902eddfa6" +dependencies = [ + "ahash", + "cssparser", + "ego-tree", + "getopts", + "html5ever", + "once_cell", + "selectors", + "smallvec", + "tendril", +] + [[package]] name = "sct" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.3", + "core-foundation-sys 0.8.3", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys 0.8.3", + "libc", +] + +[[package]] +name = "selectors" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", ] [[package]] name = "semver" -version = "0.11.0" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] +checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d" [[package]] name = "serde" -version = "1.0.137" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-xml-rs" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65162e9059be2f6a3421ebbb4fef3e74b7d9e7c60c50a0e292c6239f19f1edfa" -dependencies = [ - "log", - "serde", - "thiserror", - "xml-rs", -] - -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "serde_ini" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb236687e2bb073a7521c021949be944641e671b8505a94069ca37b656c81139" -dependencies = [ - "result", - "serde", - "void", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.81" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ - "itoa 1.0.1", + "itoa", "ryu", "serde", ] [[package]] -name = "serde_repr" -version = "0.1.8" +name = "serde_qs" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ad84e47328a31223de7fed7a4f5087f2d6ddfe586cf3ca25b7a165bc0a5aed" +checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c" dependencies = [ - "proc-macro2", - "quote", - "syn", + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", ] [[package]] @@ -3739,96 +3207,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.1", + "itoa", "ryu", "serde", ] [[package]] -name = "serde_with" -version = "1.13.0" +name = "servo_arc" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b827f2113224f3f19a665136f006709194bdfdcb1fdc1e4b2b5cbac8e0cced54" +checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" dependencies = [ - "rustversion", - "serde", - "serde_with_macros", -] - -[[package]] -name = "serde_with_macros" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "servo-fontconfig" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" -dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", -] - -[[package]] -name = "sha-1" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" -dependencies = [ - "block-buffer", - "digest", - "fake-simd", - "opaque-debug", + "nodrop", + "stable_deref_trait", ] [[package]] name = "sha1" -version = "0.6.1" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "sha1_smol", + "cfg-if 1.0.0", + "cpufeatures", + "digest", ] [[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shell-words" +name = "shlex" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] [[package]] name = "signal-hook-registry" @@ -3839,57 +3269,26 @@ dependencies = [ "libc", ] -[[package]] -name = "simplecss" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" -dependencies = [ - "log", -] - [[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 = "slab" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" - -[[package]] -name = "sled" -version = "0.34.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "crc32fast", - "crossbeam-epoch", - "crossbeam-utils", - "fs2", - "fxhash", - "libc", - "log", - "parking_lot", -] - -[[package]] -name = "slotmap" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" -dependencies = [ - "version_check", + "autocfg", ] [[package]] name = "smallvec" -version = "1.8.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smithay-client-toolkit" @@ -3897,7 +3296,7 @@ version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a28f16a97fa0e8ce563b2774d1e732dd5d4025d2772c5dba0a41a0f90a29da3" dependencies = [ - "bitflags", + "bitflags 1.3.2", "calloop", "dlib", "lazy_static", @@ -3910,33 +3309,31 @@ dependencies = [ "wayland-protocols", ] -[[package]] -name = "smithay-clipboard" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610b551bd25378bfd2b8e7a0fcbd83d427e8f2f6a40c47ae0f70688e9949dd55" -dependencies = [ - "smithay-client-toolkit", - "wayland-client", -] - [[package]] name = "socket2" -version = "0.4.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] -name = "speculoos" -version = "0.9.0" +name = "souvlaki" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bcff6a72e2ddfb09ce0064568857e70d3cf6f4342244ebb1f84fa6f89b16c26" +checksum = "ea4544ba17df4ac03d6503ae8abba19adad3ae89203a425945dc4c12d7790bfa" dependencies = [ - "num", + "block", + "cocoa", + "core-graphics 0.22.3", + "dbus", + "dbus-crossroads", + "dispatch", + "objc", + "thiserror", + "windows", ] [[package]] @@ -3947,23 +3344,35 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.3" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] [[package]] -name = "spirv" -version = "0.2.0+1.5.4" +name = "sptr" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + +[[package]] +name = "stability" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" dependencies = [ - "bitflags", - "num-traits", + "quote", + "syn 1.0.99", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -3971,10 +3380,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "str-buf" -version = "1.0.5" +name = "stdweb" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d44a3643b4ff9caf57abcee9c2c621d6c03d9135e0d8b589bd9afb5992cb176a" +checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot 0.12.0", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] [[package]] name = "strsim" @@ -3983,166 +3418,343 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "structopt" -version = "0.3.26" +name = "strum" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" dependencies = [ - "clap", - "lazy_static", - "structopt-derive", + "strum_macros", ] [[package]] -name = "structopt-derive" -version = "0.4.18" +name = "strum_macros" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "rustversion", + "syn 2.0.48", ] [[package]] -name = "svg_fmt" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" - -[[package]] -name = "svgfilters" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639abcebc15fdc2df179f37d6f5463d660c1c79cd552c12343a4600827a04bce" +name = "symphonia" +version = "0.5.1" +source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385" dependencies = [ - "float-cmp", - "rgb", + "lazy_static", + "symphonia-bundle-flac", + "symphonia-codec-aac", + "symphonia-codec-adpcm", + "symphonia-codec-pcm", + "symphonia-codec-vorbis", + "symphonia-core", + "symphonia-format-isomp4", + "symphonia-format-mkv", + "symphonia-format-ogg", + "symphonia-format-wav", + "symphonia-metadata", ] [[package]] -name = "svgtypes" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabb3eb59a457c56d5282ab4545609e2cc382b41f6af239bb8d59a7267ef94b3" +name = "symphonia-bundle-flac" +version = "0.5.1" +source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385" dependencies = [ - "siphasher", + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-codec-aac" +version = "0.5.1" +source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385" +dependencies = [ + "lazy_static", + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-adpcm" +version = "0.5.1" +source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385" +dependencies = [ + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-pcm" +version = "0.5.1" +source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385" +dependencies = [ + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-vorbis" +version = "0.5.1" +source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385" +dependencies = [ + "log", + "symphonia-core", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-core" +version = "0.5.1" +source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385" +dependencies = [ + "arrayvec", + "bitflags 1.3.2", + "bytemuck", + "lazy_static", + "log", +] + +[[package]] +name = "symphonia-format-isomp4" +version = "0.5.1" +source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385" +dependencies = [ + "encoding_rs", + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-format-mkv" +version = "0.5.1" +source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385" +dependencies = [ + "lazy_static", + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-format-ogg" +version = "0.5.1" +source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385" +dependencies = [ + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-format-wav" +version = "0.5.1" +source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385" +dependencies = [ + "log", + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-metadata" +version = "0.5.1" +source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385" +dependencies = [ + "encoding_rs", + "lazy_static", + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-utils-xiph" +version = "0.5.1" +source = "git+https://github.com/pdeljanov/Symphonia#bb7c180e8d696cdd896f0a179abfe0c01d5e6385" +dependencies = [ + "symphonia-core", + "symphonia-metadata", ] [[package]] name = "syn" -version = "1.0.92" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52" +checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] -name = "sysfs-class" -version = "0.1.3" +name = "syn" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1bbcf869732c45a77898f7f61ed6d411dfc37613517e444842f58d428856d1" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ - "numtoa", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] -name = "temp-dir" -version = "0.1.11" +name = "sync_wrapper" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] -name = "tempdir" -version = "0.3.7" +name = "synstructure" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ - "rand 0.4.6", - "remove_dir_all", + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] -name = "termcolor" -version = "1.1.3" +name = "system-configuration" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "winapi-util", + "bitflags 1.3.2", + "core-foundation 0.9.3", + "system-configuration-sys", ] [[package]] -name = "textwrap" -version = "0.11.0" +name = "system-configuration-sys" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ - "unicode-width", + "core-foundation-sys 0.8.3", + "libc", ] +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "task-local-extensions" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" +dependencies = [ + "pin-utils", +] + +[[package]] +name = "tempfile" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +dependencies = [ + "cfg-if 1.0.0", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "thin-vec" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" + [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", ] [[package]] -name = "thread_local" -version = "1.1.4" +name = "time" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tiny-skia" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bcfd4339bdd4545eabed74b208f2f1555f2e6540fb58135c01f46c0940aa138" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "bytemuck", - "cfg-if 1.0.0", - "png 0.17.5", - "safe_arch", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", "serde", - "serde_json", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8faa444297615a4e020acb64146b0603c9c395c03a97c17fd9028816d3b4d63e" +dependencies = [ + "displaydoc", + "serde", + "zerovec", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" dependencies = [ "tinyvec_macros", ] @@ -4155,63 +3767,61 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.18.2" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ - "bytes 1.1.0", + "backtrace", + "bytes", "libc", - "memchr", "mio", "num_cpus", - "once_cell", + "parking_lot 0.12.0", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.7.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", ] [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", - "webpki", -] - -[[package]] -name = "tokio-stream" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", ] [[package]] name = "tokio-util" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" +checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-core", "futures-sink", "pin-project-lite", @@ -4228,6 +3838,40 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower-service" version = "0.3.1" @@ -4236,11 +3880,10 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.34" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if 1.0.0", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4248,38 +3891,22 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.21" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", ] [[package]] name = "tracing-core" -version = "0.1.26" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ - "lazy_static", - "valuable", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" -dependencies = [ - "lazy_static", - "matchers", - "regex", - "sharded-slab", - "thread_local", - "tracing", - "tracing-core", + "once_cell", ] [[package]] @@ -4288,110 +3915,47 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -[[package]] -name = "ttf-parser" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae2f58a822f08abdaf668897e96a5656fe72f5a9ce66422423e8849384872e6" - -[[package]] -name = "ttf-parser" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74c96594835e10fa545e2a51e8709f30b173a092bfd6036ef2cec53376244f3" - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if 1.0.0", - "rand 0.8.5", - "static_assertions", -] - [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - -[[package]] -name = "uds_windows" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486992108df0fe0160680af1941fe856c521be931d5a5ecccefe0de86dc47e4a" -dependencies = [ - "tempdir", - "winapi", -] +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] -name = "unicode-bidi-mirroring" -version = "0.1.0" +name = "unicode-ident" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" - -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - -[[package]] -name = "unicode-general-category" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07547e3ee45e28326cc23faac56d44f58f16ab23e413db526debce3b0bfd2742" +checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-script" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dd944fd05f2f0b5c674917aea8a4df6af84f2d8de3fe8d988b95d28fb8fb09" - [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - -[[package]] -name = "unicode-vo" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -4399,12 +3963,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" -[[package]] -name = "unicode-xid" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" - [[package]] name = "untrusted" version = "0.7.1" @@ -4412,55 +3970,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] -name = "url" -version = "2.2.2" +name = "untrusted" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna", - "matches", + "idna 0.5.0", "percent-encoding", ] [[package]] name = "urlencoding" -version = "2.1.0" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b90931029ab9b034b300b797048cf23723400aa757e8a2bfb9d748102f9821" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] -name = "usvg" -version = "0.18.0" +name = "utf-8" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4058e0bd091a56f905e6963e40776ce6880b271275f0b493bff951433e303071" -dependencies = [ - "base64", - "data-url", - "flate2", - "float-cmp", - "fontdb", - "kurbo", - "log", - "pico-args", - "rctree", - "roxmltree", - "rustybuzz", - "simplecss", - "siphasher", - "svgtypes", - "ttf-parser 0.12.3", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "xmlwriter", -] +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] -name = "valuable" -version = "0.1.0" +name = "utf16_iter" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "varuint" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "896414bb0f21aba00ff26b0a8a3679331b5a86886f217c9d9396b919a7bf4ac6" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" @@ -4468,18 +4028,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - [[package]] name = "walkdir" version = "2.3.2" @@ -4501,24 +4049,12 @@ dependencies = [ "try-lock", ] -[[package]] -name = "ward" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cbcd609d606e1307a1530061482ed2ee3fc9963128990238cefb2013127b61e" - [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -4527,9 +4063,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.80" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -4537,24 +4073,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.80" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.30" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -4564,9 +4100,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.80" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4574,22 +4110,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.80" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.80" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasm-timer" @@ -4599,7 +4135,7 @@ checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ "futures", "js-sys", - "parking_lot", + "parking_lot 0.11.2", "pin-utils", "wasm-bindgen", "wasm-bindgen-futures", @@ -4608,14 +4144,14 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.29.4" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91223460e73257f697d9e23d401279123d36039a3f7a449e983f123292d4458f" +checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" dependencies = [ - "bitflags", + "bitflags 1.3.2", "downcast-rs", "libc", - "nix 0.22.3", + "nix 0.24.3", "scoped-tls", "wayland-commons", "wayland-scanner", @@ -4624,11 +4160,11 @@ dependencies = [ [[package]] name = "wayland-commons" -version = "0.29.4" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f6e5e340d7c13490eca867898c4cec5af56c27a5ffe5c80c6fc4708e22d33e" +checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" dependencies = [ - "nix 0.22.3", + "nix 0.24.3", "once_cell", "smallvec", "wayland-sys", @@ -4636,22 +4172,22 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.29.4" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c52758f13d5e7861fc83d942d3d99bf270c83269575e52ac29e5b73cb956a6bd" +checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" dependencies = [ - "nix 0.22.3", + "nix 0.24.3", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.29.4" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60147ae23303402e41fe034f74fb2c35ad0780ee88a1c40ac09a3be1e7465741" +checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-client", "wayland-commons", "wayland-scanner", @@ -4659,9 +4195,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.29.4" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a1ed3143f7a143187156a2ab52742e89dac33245ba505c17224df48939f9e0" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" dependencies = [ "proc-macro2", "quote", @@ -4670,9 +4206,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.29.4" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9341df79a8975679188e37dab3889bfa57c44ac2cb6da166f519a81cbe452d4" +checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" dependencies = [ "dlib", "lazy_static", @@ -4681,150 +4217,19 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.57" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ "js-sys", "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki-roots" -version = "0.22.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" -dependencies = [ - "webpki", -] - -[[package]] -name = "weezl" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c97e489d8f836838d497091de568cf16b117486d529ec5579233521065bd5e4" - -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - -[[package]] -name = "wgpu" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97cd781ff044d6d697b632a2e212032c2e957d1afaa21dbf58069cbb8f78567" -dependencies = [ - "arrayvec 0.7.2", - "js-sys", - "log", - "naga", - "parking_lot", - "raw-window-handle 0.4.3", - "smallvec", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-core" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4688c000eb841ca55f7b35db659b78d6e1cd77d7caf8fb929f4e181f754047d" -dependencies = [ - "arrayvec 0.7.2", - "bitflags", - "cfg_aliases", - "codespan-reporting", - "copyless", - "fxhash", - "log", - "naga", - "parking_lot", - "profiling", - "raw-window-handle 0.4.3", - "smallvec", - "thiserror", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d684ea6a34974a2fc19f1dfd183d11a62e22d75c4f187a574bb1224df8e056c2" -dependencies = [ - "arrayvec 0.7.2", - "ash", - "bit-set", - "bitflags", - "block", - "core-graphics-types", - "d3d12", - "foreign-types", - "fxhash", - "glow", - "gpu-alloc", - "gpu-descriptor", - "inplace_it", - "js-sys", - "khronos-egl", - "libloading", - "log", - "metal", - "naga", - "objc", - "parking_lot", - "profiling", - "range-alloc", - "raw-window-handle 0.4.3", - "renderdoc-sys", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549533d9e1cdd4b4cda7718d33ff500fc4c34b5467b71d76b547ae0324f3b2a2" -dependencies = [ - "bitflags", -] - -[[package]] -name = "wgpu_glyph" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8134edb15ae465caf308125646c9e98bdef7398cdefc69227ac77a5eb795e7fe" -dependencies = [ - "bytemuck", - "glyph_brush", - "log", - "wgpu", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "winapi" @@ -4851,15 +4256,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -4867,61 +4263,211 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "window_clipboard" -version = "0.2.2" +name = "windows" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086ed826cc4468377b6b995300d5f7f852a2fe1eb02e6cd1ccd4a574deb9d310" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" dependencies = [ - "clipboard-win", - "clipboard_macos", - "clipboard_wayland", - "clipboard_x11", - "raw-window-handle 0.3.4", - "thiserror", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows-targets 0.48.5", ] [[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winit" @@ -4929,7 +4475,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b43cc931d58b99461188607efd7acb2a093e65fc621f54cad78517a6063e73a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cocoa", "core-foundation 0.9.3", "core-graphics 0.22.3", @@ -4940,13 +4486,13 @@ dependencies = [ "libc", "log", "mio", - "ndk", - "ndk-glue", - "ndk-sys", + "ndk 0.5.0", + "ndk-glue 0.5.2", + "ndk-sys 0.2.2", "objc", - "parking_lot", + "parking_lot 0.11.2", "percent-encoding", - "raw-window-handle 0.4.3", + "raw-window-handle", "smithay-client-toolkit", "wasm-bindgen", "wayland-client", @@ -4957,23 +4503,36 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.10.1" +name = "winnow" +version = "0.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" dependencies = [ - "winapi", + "memchr", ] [[package]] -name = "wio" -version = "0.2.2" +name = "winreg" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if 1.0.0", + "windows-sys 0.48.0", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e" + [[package]] name = "x11-dl" version = "2.19.1" @@ -4985,18 +4544,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "x11rb" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffb080b3f2f616242a4eb8e7d325035312127901025b0052bc3154a282d0f19" -dependencies = [ - "gethostname", - "nix 0.20.0", - "winapi", - "winapi-wsapoll", -] - [[package]] name = "xcursor" version = "0.3.4" @@ -5006,123 +4553,135 @@ dependencies = [ "nom", ] -[[package]] -name = "xdg" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" -dependencies = [ - "dirs 4.0.0", -] - -[[package]] -name = "xi-unicode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" - [[package]] name = "xml-rs" -version = "0.8.4" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] -name = "xmlparser" -version = "0.13.3" +name = "yoke" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "114ba2b24d2167ef6d67d7d04c8cc86522b87f490025f39f0303b7db5bf5e3d8" +checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] [[package]] -name = "xmlwriter" +name = "yoke-derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "synstructure", +] + +[[package]] +name = "ytermusic" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - -[[package]] -name = "zbus" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53819092b9db813b2c6168b097b4b13ad284d81c9f2b0165a0a1b190e505a1f3" dependencies = [ - "async-broadcast", - "async-channel", - "async-executor", - "async-io", - "async-lock", - "async-recursion", - "async-task", - "async-trait", - "byteorder", - "derivative", - "enumflags2", - "event-listener", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "lazy_static", - "nix 0.23.1", + "bincode", + "crossterm", + "directories", + "flume", + "log", + "mimalloc", "once_cell", - "ordered-stream", + "player", "rand 0.8.5", + "ratatui", + "raw-window-handle", + "rusty_ytdl", "serde", - "serde_repr", + "serde_json", + "souvlaki", + "tokio", + "toml 0.8.10", + "urlencoding", + "varuint", + "winit", + "ytpapi2", +] + +[[package]] +name = "ytpapi2" +version = "0.1.0" +dependencies = [ + "log", + "reqwest", + "serde", + "serde_json", "sha1", - "static_assertions", - "uds_windows", - "winapi", - "zbus_macros", - "zbus_names", - "zvariant", + "tokio", ] [[package]] -name = "zbus_macros" -version = "2.2.0" +name = "zerocopy" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7174ebe6722c280d6d132d694bb5664ce50a788cb70eeb518e7fc1ca095a114" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ - "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn", + "syn 2.0.48", ] [[package]] -name = "zbus_names" -version = "2.1.0" +name = "zerofrom" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45dfcdcf87b71dad505d30cc27b1b7b88a64b6d1c435648f48f9dbc1fdc4b7e1" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" dependencies = [ - "serde", - "static_assertions", - "zvariant", + "zerofrom-derive", ] [[package]] -name = "zvariant" -version = "3.2.0" +name = "zerofrom-derive" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e18ba99d71e03af262953f476071607da0c44e225236cf9b5b9f7f11f1d0b6b0" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9042892ebdca35261951a83d17bcbfd4d3d528cb3bde828498a9b306b50d05c0" -dependencies = [ - "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.48", + "synstructure", +] + +[[package]] +name = "zerovec" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "591691014119b87047ead4dcf3e6adfbf73cb7c38ab6980d4f18a32138f35d46" +dependencies = [ + "serde", + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a4a1638a1934450809c2266a70362bfc96cd90550c073f5b8a55014d1010157" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", ] diff --git a/third_party/nixpkgs/pkgs/by-name/yt/ytermusic/package.nix b/third_party/nixpkgs/pkgs/by-name/yt/ytermusic/package.nix new file mode 100644 index 0000000000..7b325afb9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/yt/ytermusic/package.nix @@ -0,0 +1,54 @@ +{ alsa-lib +, dbus +, fetchFromGitHub +, lib +, openssl +, pkg-config +, rustPlatform +, stdenv +, +}: + +rustPlatform.buildRustPackage rec { + pname = "ytermusic"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "ccgauche"; + repo = "ytermusic"; + rev = "beta-${version}"; + hash = "sha256-nu/vedQNs5TgCG1v5qwwDTnFTyXCS2KnLVrnEhCtzCs="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "rusty_ytdl-0.6.6" = "sha256-htXD8v9Yd7S0iLjP6iZu94tP5KO5vbmkdUybqA7OtlU="; + "symphonia-0.5.1" = "sha256-rGvde5w7czMLcOPARK1gFfDLn70VeIrn4nKOL6FPc2U="; + }; + }; + postPatch = "cp ${./Cargo.lock} Cargo.lock"; + + doCheck = true; + + cargoBuildType = "release"; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + alsa-lib + dbus + ]; + + meta = { + description = "TUI based Youtube Music Player that aims to be as fast and simple as possible"; + homepage = "https://github.com/ccgauche/ytermusic"; + changelog = "https://github.com/ccgauche/ytermusic/releases/tag/${src.rev}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ codebam ]; + mainProgram = "ytermusic"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/za/zapzap/package.nix b/third_party/nixpkgs/pkgs/by-name/za/zapzap/package.nix index aba1afff3e..3cbd71616a 100644 --- a/third_party/nixpkgs/pkgs/by-name/za/zapzap/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/za/zapzap/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "zapzap"; - version = "5.3"; + version = "5.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "zapzap-linux"; repo = "zapzap"; rev = "refs/tags/${version}"; - hash = "sha256-KUWkpdT0v4Y85ga8NsF3fbiSjfhWXC+WpHESTPCW+oE="; + hash = "sha256-RDkuYR74vjXnPgiqDCeY6y9yQNvAWAaQfWmfs7xic9E="; }; nativeBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock index 04d3e032fb..094e56b190 100644 --- a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -16,7 +16,6 @@ dependencies = [ "project", "smallvec", "ui", - "util", "workspace", ] @@ -264,12 +263,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -290,21 +283,21 @@ checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading 0.8.0", ] [[package]] name = "ash-window" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b912285a7c29f3a8f87ca6f55afc48768624e5e33ec17dbd2f2075903f5e35ab" +checksum = "52bca67b61cb81e5553babde81b8211f713cb6db79766f80168f3e5f40ea6c82" dependencies = [ "ash", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "raw-window-metal", ] @@ -377,6 +370,54 @@ dependencies = [ "workspace", ] +[[package]] +name = "assistant2" +version = "0.1.0" +dependencies = [ + "anyhow", + "assets", + "assistant_tooling", + "client", + "collections", + "editor", + "env_logger", + "feature_flags", + "fs", + "futures 0.3.28", + "gpui", + "language", + "languages", + "log", + "nanoid", + "node_runtime", + "open_ai", + "project", + "rand 0.8.5", + "release_channel", + "rich_text", + "schemars", + "semantic_index", + "serde", + "serde_json", + "settings", + "story", + "theme", + "ui", + "util", + "workspace", +] + +[[package]] +name = "assistant_tooling" +version = "0.1.0" +dependencies = [ + "anyhow", + "gpui", + "schemars", + "serde", + "serde_json", +] + [[package]] name = "async-broadcast" version = "0.7.0" @@ -649,7 +690,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -716,7 +757,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -747,7 +788,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -1391,7 +1432,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.59", "which 4.4.2", ] @@ -1440,7 +1481,7 @@ dependencies = [ [[package]] name = "blade-graphics" version = "0.4.0" -source = "git+https://github.com/kvark/blade?rev=810ec594358aafea29a4a3d8ab601d25292b2ce4#810ec594358aafea29a4a3d8ab601d25292b2ce4" +source = "git+https://github.com/kvark/blade?rev=e82eec97691c3acdb43494484be60d661edfebf3#e82eec97691c3acdb43494484be60d661edfebf3" dependencies = [ "ash", "ash-window", @@ -1461,7 +1502,7 @@ dependencies = [ "mint", "naga", "objc", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "slab", "wasm-bindgen", "web-sys", @@ -1470,11 +1511,11 @@ dependencies = [ [[package]] name = "blade-macros" version = "0.2.1" -source = "git+https://github.com/kvark/blade?rev=810ec594358aafea29a4a3d8ab601d25292b2ce4#810ec594358aafea29a4a3d8ab601d25292b2ce4" +source = "git+https://github.com/kvark/blade?rev=e82eec97691c3acdb43494484be60d661edfebf3#e82eec97691c3acdb43494484be60d661edfebf3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -1584,17 +1625,6 @@ dependencies = [ "workspace", ] -[[package]] -name = "bromberg_sl2" -version = "0.6.0" -source = "git+https://github.com/zed-industries/bromberg_sl2?rev=950bc5482c216c395049ae33ae4501e08975f17f#950bc5482c216c395049ae33ae4501e08975f17f" -dependencies = [ - "digest 0.9.0", - "lazy_static", - "rayon", - "seq-macro", -] - [[package]] name = "bstr" version = "1.6.2" @@ -1651,7 +1681,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -1883,6 +1913,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "channel" version = "0.1.0" @@ -2030,7 +2066,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -2058,6 +2094,7 @@ dependencies = [ "core-services", "ipc-channel", "plist", + "release_channel", "serde", "util", ] @@ -2244,6 +2281,7 @@ dependencies = [ "git", "google_ai", "gpui", + "headless", "hex", "indoc", "language", @@ -2263,6 +2301,7 @@ dependencies = [ "prost", "rand 0.8.5", "release_channel", + "remote_projects", "reqwest", "rpc", "rustc-demangle", @@ -2621,16 +2660,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c578f2b9abb4d5f3fbb12aba4008084d435dc6a8425c195cfe0b3594bfea0c25" dependencies = [ "bitflags 2.4.2", - "fontdb 0.16.2", + "fontdb", "libm", "log", "rangemap", "rustc-hash", - "rustybuzz 0.12.1", + "rustybuzz", "self_cell", "swash", "sys-locale", - "ttf-parser 0.20.0", + "ttf-parser", "unicode-bidi", "unicode-linebreak", "unicode-script", @@ -2967,16 +3006,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] name = "ctrlc" -version = "3.4.2" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.27.1", + "nix 0.28.0", "windows-sys 0.52.0", ] @@ -3043,12 +3082,9 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "data-url" -version = "0.1.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193" -dependencies = [ - "matches", -] +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "db" @@ -3147,13 +3183,17 @@ dependencies = [ "anyhow", "client", "collections", + "ctor", "editor", + "env_logger", "futures 0.3.28", "gpui", "language", "log", "lsp", + "pretty_assertions", "project", + "rand 0.8.5", "schemars", "serde", "serde_json", @@ -3277,6 +3317,15 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +[[package]] +name = "doxygen-rs" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "415b6ec780d34dcf624666747194393603d0373b7141eef01d12ee58881507d9" +dependencies = [ + "phf", +] + [[package]] name = "dwrote" version = "0.11.0" @@ -3391,10 +3440,18 @@ dependencies = [ ] [[package]] -name = "embed-manifest" -version = "1.4.0" +name = "embed-resource" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cd446c890d6bed1d8b53acef5f240069ebef91d6fae7c5f52efe61fe8b5eae" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml 0.8.10", + "vswhom", + "winreg 0.52.0", +] [[package]] name = "emojis" @@ -3444,7 +3501,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -3708,6 +3765,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + [[package]] name = "feature_flags" version = "0.1.0" @@ -3764,6 +3830,7 @@ dependencies = [ "ctor", "editor", "env_logger", + "futures 0.3.28", "fuzzy", "gpui", "itertools 0.11.0", @@ -3772,6 +3839,7 @@ dependencies = [ "picker", "project", "serde_json", + "settings", "text", "theme", "ui", @@ -3791,6 +3859,17 @@ dependencies = [ "util", ] +[[package]] +name = "filedescriptor" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e" +dependencies = [ + "libc", + "thiserror", + "winapi", +] + [[package]] name = "filetime" version = "0.2.22" @@ -3827,9 +3906,9 @@ dependencies = [ [[package]] name = "float-cmp" -version = "0.5.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75224bec9bfe1a65e2d34132933f2de7fe79900c96a0174307554244ece8150e" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" [[package]] name = "float-ord" @@ -3891,18 +3970,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" dependencies = [ - "roxmltree 0.19.0", -] - -[[package]] -name = "fontdb" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58903f4f8d5b58c7d300908e4ebe5289c1bfdf5587964330f12023b8ff17fd1" -dependencies = [ - "log", - "memmap2 0.2.3", - "ttf-parser 0.12.3", + "roxmltree", ] [[package]] @@ -3916,7 +3984,7 @@ dependencies = [ "memmap2 0.9.4", "slotmap", "tinyvec", - "ttf-parser 0.20.0", + "ttf-parser", ] [[package]] @@ -3946,7 +4014,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -3998,6 +4066,7 @@ dependencies = [ "anyhow", "async-tar", "async-trait", + "cocoa", "collections", "fsevent", "futures 0.3.28", @@ -4006,15 +4075,13 @@ dependencies = [ "gpui", "lazy_static", "libc", - "log", "notify", + "objc", "parking_lot", "rope", "serde", - "serde_derive", "serde_json", "smol", - "sum_tree", "tempfile", "text", "time", @@ -4038,6 +4105,7 @@ name = "fsevent" version = "0.1.0" dependencies = [ "bitflags 2.4.2", + "core-foundation", "fsevent-sys 3.1.0", "parking_lot", "tempfile", @@ -4098,6 +4166,17 @@ dependencies = [ "futures-util", ] +[[package]] +name = "futures-batch" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f444c45a1cb86f2a7e301469fd50a82084a60dadc25d94529a8312276ecb71a" +dependencies = [ + "futures 0.3.28", + "futures-timer", + "pin-utils", +] + [[package]] name = "futures-channel" version = "0.3.30" @@ -4178,7 +4257,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -4193,6 +4272,12 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + [[package]] name = "futures-util" version = "0.3.30" @@ -4305,7 +4390,10 @@ dependencies = [ "git2", "lazy_static", "log", + "parking_lot", "pretty_assertions", + "regex", + "rope", "serde", "serde_json", "smol", @@ -4314,15 +4402,17 @@ dependencies = [ "time", "unindent", "url", + "util", + "windows 0.53.0", ] [[package]] name = "git2" -version = "0.15.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" +checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "libc", "libgit2-sys", "log", @@ -4420,9 +4510,9 @@ dependencies = [ [[package]] name = "gpu-alloc-ash" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2424bc9be88170e1a56e57c25d3d0e2dfdd22e8f328e892786aeb4da1415732" +checksum = "cbda7a18a29bc98c2e0de0435c347df935bf59489935d0cbd0b73f1679b6f79a" dependencies = [ "ash", "gpu-alloc-types", @@ -4464,8 +4554,10 @@ dependencies = [ "cosmic-text", "ctor", "derive_more", + "embed-resource", "env_logger", "etagere", + "filedescriptor", "flume", "font-kit", "foreign-types 0.5.0", @@ -4488,7 +4580,6 @@ dependencies = [ "postage", "profiling", "rand 0.8.5", - "raw-window-handle 0.5.2", "raw-window-handle 0.6.0", "refineable", "resvg", @@ -4505,7 +4596,6 @@ dependencies = [ "taffy", "thiserror", "time", - "tiny-skia", "usvg", "util", "uuid", @@ -4635,6 +4725,27 @@ dependencies = [ "http 0.2.9", ] +[[package]] +name = "headless" +version = "0.1.0" +dependencies = [ + "anyhow", + "client", + "ctrlc", + "fs", + "futures 0.3.28", + "gpui", + "language", + "log", + "node_runtime", + "postage", + "project", + "rpc", + "settings", + "shellexpand", + "util", +] + [[package]] name = "heck" version = "0.3.3" @@ -4653,6 +4764,41 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heed" +version = "0.20.0-alpha.9" +source = "git+https://github.com/meilisearch/heed?rev=036ac23f73a021894974b9adc815bc95b3e0482a#036ac23f73a021894974b9adc815bc95b3e0482a" +dependencies = [ + "bitflags 2.4.2", + "byteorder", + "heed-traits", + "heed-types", + "libc", + "lmdb-master-sys", + "once_cell", + "page_size", + "serde", + "synchronoise", + "url", +] + +[[package]] +name = "heed-traits" +version = "0.20.0-alpha.9" +source = "git+https://github.com/meilisearch/heed?rev=036ac23f73a021894974b9adc815bc95b3e0482a#036ac23f73a021894974b9adc815bc95b3e0482a" + +[[package]] +name = "heed-types" +version = "0.20.0-alpha.9" +source = "git+https://github.com/meilisearch/heed?rev=036ac23f73a021894974b9adc815bc95b3e0482a#036ac23f73a021894974b9adc815bc95b3e0482a" +dependencies = [ + "bincode", + "byteorder", + "heed-traits", + "serde", + "serde_json", +] + [[package]] name = "hermit-abi" version = "0.1.19" @@ -4919,7 +5065,7 @@ dependencies = [ "num-iter", "num-rational 0.3.2", "num-traits", - "png", + "png 0.16.8", "scoped_threadpool", "tiff", ] @@ -4937,6 +5083,12 @@ dependencies = [ "workspace", ] +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + [[package]] name = "indexmap" version = "1.9.3" @@ -4973,7 +5125,7 @@ checksum = "ce243b1bfa62ffc028f1cc3b6034ec63d649f3031bc8a4fbbb004e1ac17d1f68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -5289,11 +5441,12 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.8.3" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449" +checksum = "6e5aa9f0f96a938266bdb12928a67169e8d22c6a786fda8ed984b85e6ba93c3c" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", + "smallvec", ] [[package]] @@ -5321,6 +5474,7 @@ dependencies = [ "globset", "gpui", "indoc", + "itertools 0.11.0", "lazy_static", "log", "lsp", @@ -5413,17 +5567,13 @@ dependencies = [ "log", "lsp", "node_runtime", - "parking_lot", "project", "regex", "rope", "rust-embed", - "schemars", "serde", - "serde_derive", "serde_json", "settings", - "shellexpand", "smol", "task", "text", @@ -5434,31 +5584,19 @@ dependencies = [ "tree-sitter-c", "tree-sitter-cpp", "tree-sitter-css", - "tree-sitter-elixir", - "tree-sitter-elm", "tree-sitter-embedded-template", - "tree-sitter-glsl", "tree-sitter-go", "tree-sitter-gomod", "tree-sitter-gowork", - "tree-sitter-hcl", - "tree-sitter-heex", "tree-sitter-jsdoc", "tree-sitter-json 0.20.0", - "tree-sitter-lua", "tree-sitter-markdown", - "tree-sitter-nix", - "tree-sitter-nu", - "tree-sitter-ocaml", "tree-sitter-proto", "tree-sitter-python", - "tree-sitter-racket", "tree-sitter-regex", "tree-sitter-ruby", "tree-sitter-rust", - "tree-sitter-scheme", "tree-sitter-typescript", - "tree-sitter-vue", "tree-sitter-yaml", "unindent", "util", @@ -5500,9 +5638,9 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libgit2-sys" -version = "0.14.2+1.5.1" +version = "0.16.2+1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" dependencies = [ "cc", "libc", @@ -5604,7 +5742,7 @@ checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -5659,6 +5797,16 @@ dependencies = [ "sha2 0.10.7", ] +[[package]] +name = "lmdb-master-sys" +version = "0.1.0" +source = "git+https://github.com/meilisearch/heed?rev=036ac23f73a021894974b9adc815bc95b3e0482a#036ac23f73a021894974b9adc815bc95b3e0482a" +dependencies = [ + "cc", + "doxygen-rs", + "libc", +] + [[package]] name = "lock_api" version = "0.4.10" @@ -5773,6 +5921,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-recursion 1.0.5", + "collections", "editor", "gpui", "language", @@ -5794,12 +5943,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "matchit" version = "0.7.3" @@ -5835,9 +5978,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memfd" @@ -5848,15 +5991,6 @@ dependencies = [ "rustix 0.38.32", ] -[[package]] -name = "memmap2" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4" -dependencies = [ - "libc", -] - [[package]] name = "memmap2" version = "0.8.0" @@ -5954,6 +6088,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] @@ -5990,14 +6125,18 @@ dependencies = [ "anyhow", "clock", "collections", + "ctor", + "env_logger", "futures 0.3.28", "git", "gpui", + "itertools 0.11.0", "language", "log", "parking_lot", "rand 0.8.5", "settings", + "smallvec", "sum_tree", "text", "theme", @@ -6124,6 +6263,18 @@ dependencies = [ "memoffset", ] +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "cfg_aliases", + "libc", +] + [[package]] name = "node_runtime" version = "0.1.0" @@ -6553,7 +6704,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -6629,7 +6780,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -6680,6 +6831,16 @@ dependencies = [ "sha2 0.10.7", ] +[[package]] +name = "page_size" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "palette" version = "0.7.5" @@ -6699,7 +6860,7 @@ checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -6853,9 +7014,33 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ + "phf_macros", "phf_shared", ] +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.59", +] + [[package]] name = "phf_shared" version = "0.11.2" @@ -6883,9 +7068,9 @@ dependencies = [ [[package]] name = "pico-args" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" @@ -6904,7 +7089,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -7021,6 +7206,19 @@ dependencies = [ "miniz_oxide 0.3.7", ] +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.7.1", +] + [[package]] name = "polling" version = "2.8.0" @@ -7115,7 +7313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -7172,9 +7370,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -7195,7 +7393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -7256,6 +7454,7 @@ dependencies = [ "db", "editor", "file_icons", + "git", "gpui", "language", "menu", @@ -7547,14 +7746,14 @@ checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" [[package]] name = "raw-window-metal" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac4ea493258d54c24cb46aa9345d099e58e2ea3f30dd63667fc54fc892f18e76" +checksum = "76e8caa82e31bb98fee12fa8f051c94a6aa36b07cddb03f0d4fc558988360ff1" dependencies = [ "cocoa", "core-graphics", "objc", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", ] [[package]] @@ -7577,12 +7776,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rctree" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9e29cb19c8fe84169fcb07f8f11e66bc9e6e0280efd4715c54818296f8a4a8" - [[package]] name = "read-fonts" version = "0.15.3" @@ -7596,7 +7789,9 @@ dependencies = [ name = "recent_projects" version = "0.1.0" dependencies = [ + "anyhow", "editor", + "feature_flags", "fuzzy", "gpui", "language", @@ -7604,10 +7799,15 @@ dependencies = [ "ordered-float 2.10.0", "picker", "project", + "remote_projects", + "rpc", "serde", "serde_json", + "settings", "smol", + "theme", "ui", + "ui_text_field", "util", "workspace", ] @@ -7734,6 +7934,18 @@ dependencies = [ "once_cell", ] +[[package]] +name = "remote_projects" +version = "0.1.0" +dependencies = [ + "anyhow", + "client", + "gpui", + "rpc", + "serde", + "serde_json", +] + [[package]] name = "rend" version = "0.4.0" @@ -7777,21 +7989,19 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "winreg 0.50.0", ] [[package]] name = "resvg" -version = "0.14.1" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09697862c5c3f940cbaffef91969c62188b5c8ed385b0aef43a5ff01ddc8000f" +checksum = "c2327ced609dadeed3e9702fec3e6b2ddd208758a9268d13e06566c6101ba533" dependencies = [ - "jpeg-decoder", "log", "pico-args", - "png", "rgb", - "svgfilters", + "svgtypes", "tiny-skia", "usvg", ] @@ -7922,26 +8132,17 @@ dependencies = [ name = "rope" version = "0.1.0" dependencies = [ - "arrayvec 0.7.4", - "bromberg_sl2", + "arrayvec", "criterion", "gpui", "log", "rand 0.8.5", "smallvec", "sum_tree", + "unicode-segmentation", "util", ] -[[package]] -name = "roxmltree" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b" -dependencies = [ - "xmlparser", -] - [[package]] name = "roxmltree" version = "0.19.0" @@ -8035,7 +8236,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.48", + "syn 2.0.59", "walkdir", ] @@ -8056,7 +8257,7 @@ version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "borsh", "bytes 1.5.0", "num-traits", @@ -8176,22 +8377,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" -[[package]] -name = "rustybuzz" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab463a295d00f3692e0974a0bfd83c7a9bcd119e27e07c2beecdb1b44a09d10" -dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "smallvec", - "ttf-parser 0.9.0", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-general-category", - "unicode-script", -] - [[package]] name = "rustybuzz" version = "0.12.1" @@ -8202,7 +8387,7 @@ dependencies = [ "bytemuck", "libm", "smallvec", - "ttf-parser 0.20.0", + "ttf-parser", "unicode-bidi-mirroring", "unicode-ccc", "unicode-properties", @@ -8215,15 +8400,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" -[[package]] -name = "safe_arch" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" -dependencies = [ - "bytemuck", -] - [[package]] name = "safemem" version = "0.3.3" @@ -8334,7 +8510,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -8375,7 +8551,7 @@ dependencies = [ "proc-macro2", "quote", "sea-bae", - "syn 2.0.48", + "syn 2.0.59", "unicode-ident", ] @@ -8499,6 +8675,36 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" +[[package]] +name = "semantic_index" +version = "0.1.0" +dependencies = [ + "anyhow", + "client", + "clock", + "collections", + "env_logger", + "fs", + "futures 0.3.28", + "futures-batch", + "gpui", + "heed", + "language", + "languages", + "log", + "open_ai", + "parking_lot", + "project", + "serde", + "serde_json", + "settings", + "sha2 0.10.7", + "smol", + "tempfile", + "util", + "worktree", +] + [[package]] name = "semantic_version" version = "0.1.0" @@ -8513,12 +8719,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" -[[package]] -name = "seq-macro" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9f47faea3cad316faa914d013d24f471cd90bfca1a0c70f05a3f42c6441e99" - [[package]] name = "serde" version = "1.0.196" @@ -8536,7 +8736,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -8601,7 +8801,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -8774,6 +8974,12 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "simdutf8" version = "0.1.4" @@ -8818,18 +9024,18 @@ dependencies = [ "termcolor", ] -[[package]] -name = "siphasher" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" - [[package]] name = "siphasher" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "slab" version = "0.4.9" @@ -9293,12 +9499,12 @@ name = "storybook" version = "0.1.0" dependencies = [ "anyhow", + "assistant2", "clap 4.4.4", "collab_ui", "ctrlc", "dialoguer", "editor", - "embed-manifest", "fuzzy", "gpui", "indoc", @@ -9306,6 +9512,7 @@ dependencies = [ "log", "menu", "picker", + "project", "rust-embed", "settings", "simplelog", @@ -9315,6 +9522,15 @@ dependencies = [ "ui", ] +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + [[package]] name = "stringprep" version = "0.1.4" @@ -9351,17 +9567,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.48", -] - -[[package]] -name = "subst" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca1318e5d6716d6541696727c88d9b8dfc8cfe6afd6908e186546fd4af7f5b98" -dependencies = [ - "memchr", - "unicode-width", + "syn 2.0.59", ] [[package]] @@ -9374,7 +9580,7 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" name = "sum_tree" version = "0.1.0" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "ctor", "env_logger", "log", @@ -9456,24 +9662,14 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" -[[package]] -name = "svgfilters" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0dce2fee79ac40c21dafba48565ff7a5fa275e23ffe9ce047a40c9574ba34e" -dependencies = [ - "float-cmp", - "rgb", -] - [[package]] name = "svgtypes" -version = "0.5.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c536faaff1a10837cfe373142583f6e27d81e96beba339147e77b67c9f260ff" +checksum = "d97ca9a891c9c70da8139ac9d8e8ea36a210fa21bb50eccd75d4a9561c83e87f" dependencies = [ - "float-cmp", - "siphasher 0.2.3", + "kurbo", + "siphasher 1.0.1", ] [[package]] @@ -9500,9 +9696,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" dependencies = [ "proc-macro2", "quote", @@ -9515,6 +9711,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "synchronoise" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dbc01390fc626ce8d1cffe3376ded2b72a11bb70e1c75f404a210e4daa4def2" +dependencies = [ + "crossbeam-queue", +] + [[package]] name = "sys-locale" version = "0.3.1" @@ -9583,7 +9788,7 @@ name = "taffy" version = "0.3.11" source = "git+https://github.com/DioxusLabs/taffy?rev=1876f72bee5e376023eaa518aa7b8a34c769bd1b#1876f72bee5e376023eaa518aa7b8a34c769bd1b" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "grid", "num-traits", "slotmap", @@ -9615,11 +9820,12 @@ dependencies = [ "collections", "futures 0.3.28", "gpui", + "hex", "schemars", "serde", "serde_json_lenient", + "sha2 0.10.7", "shellexpand", - "subst", "util", ] @@ -9632,7 +9838,6 @@ dependencies = [ "file_icons", "fuzzy", "gpui", - "itertools 0.11.0", "language", "picker", "project", @@ -9641,7 +9846,6 @@ dependencies = [ "serde_json", "settings", "task", - "terminal", "tree-sitter-rust", "tree-sitter-typescript", "ui", @@ -9739,6 +9943,7 @@ dependencies = [ "shellexpand", "smol", "task", + "tasks_ui", "terminal", "theme", "ui", @@ -9858,7 +10063,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -9937,16 +10142,28 @@ dependencies = [ [[package]] name = "tiny-skia" -version = "0.5.1" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf81f2900d2e235220e6f31ec9f63ade6a7f59090c556d74fe949bb3b15e9fe" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "bytemuck", "cfg-if", - "png", - "safe_arch", + "log", + "png 0.17.13", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", ] [[package]] @@ -10025,7 +10242,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -10232,11 +10449,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -10245,20 +10461,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -10276,12 +10492,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -10297,9 +10513,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -10319,7 +10535,7 @@ dependencies = [ [[package]] name = "tree-sitter" version = "0.20.100" -source = "git+https://github.com/tree-sitter/tree-sitter?rev=7f21c3b98c0749ac192da67a0d65dfe3eabc4a63#7f21c3b98c0749ac192da67a0d65dfe3eabc4a63" +source = "git+https://github.com/tree-sitter/tree-sitter?rev=7b4894ba2ae81b988846676f54c0988d4027ef4f#7b4894ba2ae81b988846676f54c0988d4027ef4f" dependencies = [ "cc", "regex", @@ -10372,15 +10588,6 @@ dependencies = [ "tree-sitter", ] -[[package]] -name = "tree-sitter-elm" -version = "5.6.4" -source = "git+https://github.com/elm-tooling/tree-sitter-elm?rev=692c50c0b961364c40299e73c1306aecb5d20f40#692c50c0b961364c40299e73c1306aecb5d20f40" -dependencies = [ - "cc", - "tree-sitter", -] - [[package]] name = "tree-sitter-embedded-template" version = "0.20.0" @@ -10391,15 +10598,6 @@ dependencies = [ "tree-sitter", ] -[[package]] -name = "tree-sitter-glsl" -version = "0.1.4" -source = "git+https://github.com/theHamsta/tree-sitter-glsl?rev=2a56fb7bc8bb03a1892b4741279dd0a8758b7fb3#2a56fb7bc8bb03a1892b4741279dd0a8758b7fb3" -dependencies = [ - "cc", - "tree-sitter", -] - [[package]] name = "tree-sitter-go" version = "0.19.1" @@ -10427,15 +10625,6 @@ dependencies = [ "tree-sitter", ] -[[package]] -name = "tree-sitter-hcl" -version = "0.0.1" -source = "git+https://github.com/MichaHoffmann/tree-sitter-hcl?rev=v1.1.0#636dbe70301ecbab8f353c8c78b3406fe4f185f5" -dependencies = [ - "cc", - "tree-sitter", -] - [[package]] name = "tree-sitter-heex" version = "0.0.1" @@ -10458,7 +10647,7 @@ dependencies = [ [[package]] name = "tree-sitter-jsdoc" version = "0.20.0" -source = "git+https://github.com/tree-sitter/tree-sitter-jsdoc#6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55" +source = "git+https://github.com/tree-sitter/tree-sitter-jsdoc?rev=6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55#6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55" dependencies = [ "cc", "tree-sitter", @@ -10483,16 +10672,6 @@ dependencies = [ "tree-sitter", ] -[[package]] -name = "tree-sitter-lua" -version = "0.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d489873fd1a2fa6d5f04930bfc5c081c96f0c038c1437104518b5b842c69b282" -dependencies = [ - "cc", - "tree-sitter", -] - [[package]] name = "tree-sitter-markdown" version = "0.0.1" @@ -10502,33 +10681,6 @@ dependencies = [ "tree-sitter", ] -[[package]] -name = "tree-sitter-nix" -version = "0.0.1" -source = "git+https://github.com/nix-community/tree-sitter-nix?rev=66e3e9ce9180ae08fc57372061006ef83f0abde7#66e3e9ce9180ae08fc57372061006ef83f0abde7" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-nu" -version = "0.0.1" -source = "git+https://github.com/nushell/tree-sitter-nu?rev=7dd29f9616822e5fc259f5b4ae6c4ded9a71a132#7dd29f9616822e5fc259f5b4ae6c4ded9a71a132" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-ocaml" -version = "0.20.4" -source = "git+https://github.com/tree-sitter/tree-sitter-ocaml?rev=4abfdc1c7af2c6c77a370aee974627be1c285b3b#4abfdc1c7af2c6c77a370aee974627be1c285b3b" -dependencies = [ - "cc", - "tree-sitter", -] - [[package]] name = "tree-sitter-proto" version = "0.0.2" @@ -10548,15 +10700,6 @@ dependencies = [ "tree-sitter", ] -[[package]] -name = "tree-sitter-racket" -version = "0.0.1" -source = "git+https://github.com/zed-industries/tree-sitter-racket?rev=eb010cf2c674c6fd9a6316a84e28ef90190fe51a#eb010cf2c674c6fd9a6316a84e28ef90190fe51a" -dependencies = [ - "cc", - "tree-sitter", -] - [[package]] name = "tree-sitter-regex" version = "0.20.0" @@ -10587,15 +10730,6 @@ dependencies = [ "tree-sitter", ] -[[package]] -name = "tree-sitter-scheme" -version = "0.2.0" -source = "git+https://github.com/6cdh/tree-sitter-scheme?rev=af0fd1fa452cb2562dc7b5c8a8c55551c39273b9#af0fd1fa452cb2562dc7b5c8a8c55551c39273b9" -dependencies = [ - "cc", - "tree-sitter", -] - [[package]] name = "tree-sitter-typescript" version = "0.20.2" @@ -10605,15 +10739,6 @@ dependencies = [ "tree-sitter", ] -[[package]] -name = "tree-sitter-vue" -version = "0.0.1" -source = "git+https://github.com/zed-industries/tree-sitter-vue?rev=6608d9d60c386f19d80af7d8132322fa11199c42#6608d9d60c386f19d80af7d8132322fa11199c42" -dependencies = [ - "cc", - "tree-sitter", -] - [[package]] name = "tree-sitter-yaml" version = "0.0.1" @@ -10629,18 +10754,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" -[[package]] -name = "ttf-parser" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ddb402ac6c2af6f7a2844243887631c4e94b51585b229fcfddb43958cd55ca" - -[[package]] -name = "ttf-parser" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae2f58a822f08abdaf668897e96a5656fe72f5a9ce66422423e8849384872e6" - [[package]] name = "ttf-parser" version = "0.20.0" @@ -10719,6 +10832,17 @@ dependencies = [ "windows 0.53.0", ] +[[package]] +name = "ui_text_field" +version = "0.1.0" +dependencies = [ + "editor", + "gpui", + "settings", + "theme", + "ui", +] + [[package]] name = "unicase" version = "2.7.0" @@ -10746,12 +10870,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" -[[package]] -name = "unicode-general-category" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9af028e052a610d99e066b33304625dea9613170a2563314490a4e6ec5cf7f" - [[package]] name = "unicode-ident" version = "1.0.12" @@ -10791,12 +10909,6 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" -[[package]] -name = "unicode-vo" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" - [[package]] name = "unicode-width" version = "0.1.11" @@ -10853,28 +10965,23 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "usvg" -version = "0.14.1" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8352f317d8f9a918ba5154797fb2a93e2730244041cf7d5be35148266adfa5" +checksum = "5c704361d822337cfc00387672c7b59eaa72a1f0744f62b2a68aa228a0c6927d" dependencies = [ - "base64 0.13.1", + "base64 0.22.0", "data-url", "flate2", - "fontdb 0.5.4", + "imagesize", "kurbo", "log", - "memmap2 0.2.3", "pico-args", - "rctree", - "roxmltree 0.14.1", - "rustybuzz 0.3.0", + "roxmltree", "simplecss", - "siphasher 0.2.3", + "siphasher 1.0.1", + "strict-num", "svgtypes", - "ttf-parser 0.12.3", - "unicode-bidi", - "unicode-script", - "unicode-vo", + "tiny-skia-path", "xmlwriter", ] @@ -10981,8 +11088,8 @@ name = "vcs_menu" version = "0.1.0" dependencies = [ "anyhow", - "fs", "fuzzy", + "git", "gpui", "picker", "ui", @@ -11010,6 +11117,7 @@ dependencies = [ "futures 0.3.28", "gpui", "indoc", + "itertools 0.11.0", "language", "log", "lsp", @@ -11045,6 +11153,26 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "vte" version = "0.13.0" @@ -11127,7 +11255,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wasm-bindgen-shared", ] @@ -11161,7 +11289,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -11298,7 +11426,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -11459,7 +11587,7 @@ checksum = "6d6d967f01032da7d4c6303da32f6a00d5efe1bac124b156e7342d8ace6ffdfc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -11739,7 +11867,7 @@ dependencies = [ "proc-macro2", "quote", "shellexpand", - "syn 2.0.48", + "syn 2.0.59", "witx", ] @@ -11751,7 +11879,7 @@ checksum = "512d816dbcd0113103b2eb2402ec9018e7f0755202a5b3e67db726f229d8dcae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wiggle-generate", ] @@ -11869,7 +11997,7 @@ checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -11880,7 +12008,7 @@ checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -12118,6 +12246,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "winresource" version = "0.1.17" @@ -12197,7 +12335,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -12277,6 +12415,7 @@ dependencies = [ "parking_lot", "postage", "project", + "remote_projects", "schemars", "serde", "serde_json", @@ -12515,12 +12654,13 @@ dependencies = [ [[package]] name = "zed" -version = "0.131.6" +version = "0.134.4" dependencies = [ "activity_indicator", "anyhow", "assets", "assistant", + "assistant2", "audio", "auto_update", "backtrace", @@ -12540,7 +12680,6 @@ dependencies = [ "db", "diagnostics", "editor", - "embed-manifest", "env_logger", "extension", "extensions_ui", @@ -12551,6 +12690,7 @@ dependencies = [ "futures 0.3.28", "go_to_line", "gpui", + "headless", "image_viewer", "install_cli", "isahc", @@ -12563,6 +12703,7 @@ dependencies = [ "markdown_preview", "menu", "mimalloc", + "nix 0.28.0", "node_runtime", "notifications", "outline", @@ -12574,6 +12715,7 @@ dependencies = [ "quick_action_bar", "recent_projects", "release_channel", + "remote_projects", "rope", "search", "serde", @@ -12584,6 +12726,7 @@ dependencies = [ "tab_switcher", "task", "tasks_ui", + "telemetry_events", "terminal_view", "theme", "theme_selector", @@ -12615,20 +12758,41 @@ dependencies = [ [[package]] name = "zed_clojure" -version = "0.0.1" +version = "0.0.2" dependencies = [ "zed_extension_api 0.0.4", ] [[package]] name = "zed_csharp" -version = "0.0.1" +version = "0.0.2" dependencies = [ "zed_extension_api 0.0.4", ] [[package]] name = "zed_dart" +version = "0.0.2" +dependencies = [ + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zed_deno" +version = "0.0.1" +dependencies = [ + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zed_elixir" +version = "0.0.1" +dependencies = [ + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zed_elm" version = "0.0.1" dependencies = [ "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -12636,7 +12800,7 @@ dependencies = [ [[package]] name = "zed_emmet" -version = "0.0.1" +version = "0.0.2" dependencies = [ "zed_extension_api 0.0.4", ] @@ -12657,15 +12821,6 @@ dependencies = [ "wit-bindgen", ] -[[package]] -name = "zed_extension_api" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f4ae4e302a80591635ef9a236b35fde6fcc26cfd060e66fde4ba9f9fd394a1" -dependencies = [ - "wit-bindgen", -] - [[package]] name = "zed_extension_api" version = "0.0.6" @@ -12688,14 +12843,21 @@ dependencies = [ [[package]] name = "zed_gleam" -version = "0.0.2" +version = "0.1.1" +dependencies = [ + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zed_glsl" +version = "0.1.0" dependencies = [ "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "zed_haskell" -version = "0.0.1" +version = "0.1.0" dependencies = [ "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -12708,15 +12870,29 @@ dependencies = [ ] [[package]] -name = "zed_php" +name = "zed_lua" +version = "0.0.2" +dependencies = [ + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zed_ocaml" version = "0.0.1" +dependencies = [ + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zed_php" +version = "0.0.2" dependencies = [ "zed_extension_api 0.0.4", ] [[package]] name = "zed_prisma" -version = "0.0.1" +version = "0.0.2" dependencies = [ "zed_extension_api 0.0.4", ] @@ -12736,10 +12912,17 @@ dependencies = [ ] [[package]] -name = "zed_toml" -version = "0.0.2" +name = "zed_terraform" +version = "0.0.3" dependencies = [ - "zed_extension_api 0.0.5", + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zed_toml" +version = "0.1.0" +dependencies = [ + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -12750,10 +12933,17 @@ dependencies = [ ] [[package]] -name = "zed_zig" +name = "zed_vue" version = "0.0.1" dependencies = [ - "zed_extension_api 0.0.5", + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zed_zig" +version = "0.1.1" +dependencies = [ + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -12779,7 +12969,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -12799,7 +12989,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix index d656f2a33e..9680f16798 100644 --- a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix @@ -22,18 +22,17 @@ darwin, makeFontsConf, vulkan-loader, - makeDesktopItem, }: rustPlatform.buildRustPackage rec { pname = "zed"; - version = "0.131.6"; + version = "0.134.4"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-IhFOA+g2I5vb72CTSZ8WTa9K0ieYbPD/BMShGqaUb84="; + hash = "sha256-2/onI/tc5FlwyRuu4Yq3xJYqwNXhnIrCebQQpCKGzfs="; fetchSubmodules = true; }; @@ -41,36 +40,27 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE="; - "blade-graphics-0.4.0" = "sha256-S1PNdQ9YbJgLLsJU1mvDZ3feVDIrZGwU37JqIm+kfcE="; - "bromberg_sl2-0.6.0" = "sha256-+bwdnk3EgYEAxQSP4KpEPicCfO+r2er1DRZjvfF4jSM="; + "blade-graphics-0.4.0" = "sha256-J6mVvMC8u3+8RGp6qSwU/EpvdtUPyIs2Ry9XGGiimB0="; "font-kit-0.11.0" = "sha256-+4zMzjFyMS60HfLMEXGfXqKn6P+pOngLA45udV09DM8="; + "heed-0.20.0-alpha.9" = "sha256-8bzoMmfKS+6AmeTzh0/F7WM9OBdIex+NYFER28bpA/s="; "lsp-types-0.94.1" = "sha256-kplgPsafrgZFMI1D9pQCwmg+FKMn5HNWLbcgdXHUFVU="; "nvim-rs-0.6.0-pre" = "sha256-bdWWuCsBv01mnPA5e5zRpq48BgOqaqIcAu+b7y1NnM8="; "pathfinder_simd-0.5.3" = "sha256-bakBcAQZJdHQPXybe0zoMzE49aOHENQY7/ZWZUMt+pM="; "taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw="; - "tree-sitter-0.20.100" = "sha256-k8au4++UJyaOCNo0cqokaQ5Is3BmIiCBSxiUkbrzhFQ="; + "tree-sitter-0.20.100" = "sha256-xZDWAjNIhWC2n39H7jJdKDgyE/J6+MAVSa8dHtZ6CLE="; "tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; "tree-sitter-cpp-0.20.0" = "sha256-2QYEFkpwcRmh2kf4qEAL2a5lGSa316CetOhF73e7rEM="; "tree-sitter-css-0.19.0" = "sha256-5Qti/bFac2A1PJxqZEOuSLK3GGKYwPDKAp3OOassBxU="; "tree-sitter-elixir-0.1.0" = "sha256-hBHqQ3eBjknRPJjP+lQJU6NPFhUMtiv4FbKsTw28Bog="; - "tree-sitter-elm-5.6.4" = "sha256-0LpuyebOB5ew9fULBcaw8aUbF7HM5sXQpv+Jroz4tXg="; - "tree-sitter-glsl-0.1.4" = "sha256-TRuiT3ndCeDCsCFokAN8cosNKccB0NjWVRiBJuBJXZw="; "tree-sitter-go-0.19.1" = "sha256-5+L5QqVjZyeh+sKfxKZWrjIBFE5xM9KZlHcLiHzJCIA="; "tree-sitter-gomod-1.0.2" = "sha256-OPtqXe6OMC9c5dgFH8Msj+6DU01LvLKVbCzGLj0PnLI="; "tree-sitter-gowork-0.0.1" = "sha256-lM4L4Ap/c8uCr4xUw9+l/vaGb3FxxnuZI0+xKYFDPVg="; - "tree-sitter-hcl-0.0.1" = "sha256-saVKSYUJY7OuIuNm9EpQnhFO/vQGKxCXuv3EKYOJzfs="; "tree-sitter-heex-0.0.1" = "sha256-6LREyZhdTDt3YHVRPDyqCaDXqcsPlHOoMFDb2B3+3xM="; "tree-sitter-jsdoc-0.20.0" = "sha256-fKscFhgZ/BQnYnE5EwurFZgiE//O0WagRIHVtDyes/Y="; "tree-sitter-json-0.20.0" = "sha256-fZNftzNavJQPQE4S1VLhRyGQRoJgbWA5xTPa8ZI5UX4="; "tree-sitter-markdown-0.0.1" = "sha256-F8VVd7yYa4nCrj/HEC13BTC7lkV3XSb2Z3BNi/VfSbs="; - "tree-sitter-nix-0.0.1" = "sha256-+o+f1TlhcrcCB3TNw1RyCjVZ+37e11nL+GWBPo0Mxxg="; - "tree-sitter-nu-0.0.1" = "sha256-V6EZfba5e0NdOG4n3DNI25luNXfcCN3+/vNYuz9llUk="; - "tree-sitter-ocaml-0.20.4" = "sha256-ycmjIKfrsVSVHmPP3HCxfk5wcBIF/JFH8OnU8mY1Cc8="; "tree-sitter-proto-0.0.2" = "sha256-W0diP2ByAXYrc7Mu/sbqST6lgVIyHeSBmH7/y/X3NhU="; - "tree-sitter-racket-0.0.1" = "sha256-ie64no94TtAWsSYaBXmic4oyRAA01fMl97+JWcFU1E8="; - "tree-sitter-scheme-0.2.0" = "sha256-K3+zmykjq2DpCnk17Ko9LOyGQTBZb1/dgVXIVynCYd4="; "tree-sitter-typescript-0.20.2" = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; - "tree-sitter-vue-0.0.1" = "sha256-8v2e03A/Uj6zCJTH4j6TPwDQcNFeze1jepMADT6UVis="; "tree-sitter-yaml-0.0.1" = "sha256-S59jLlipBI2kwFuZDMmpv0TOZpGyXpbAizN3yC6wJ5I="; }; }; @@ -146,50 +136,11 @@ rustPlatform.buildRustPackage rec { postInstall = '' mv $out/bin/Zed $out/bin/zed - install -D ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/Zed.png - install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/Zed.png + install -D ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png + install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png + install -D ${src}/crates/zed/resources/zed.desktop $out/share/applications/dev.zed.Zed.desktop ''; - desktopItems = [ - (makeDesktopItem { - name = "dev.zed.Zed"; - exec = "zed %F"; - tryExec = "zed"; - icon = "Zed"; - comment = meta.description; - desktopName = "Zed"; - genericName = "Text Editor"; - categories = [ - "Utility" - "TextEditor" - "Development" - ]; - keywords = [ - "Text" - "Editor" - ]; - terminal = false; - type = "Application"; - mimeTypes = [ - "inode/directory" - "text/plain" - "text/x-makefile" - "text/x-c++hdr" - "text/x-c++src" - "text/x-chdr" - "text/x-csrc" - "text/x-java" - "text/x-moc" - "text/x-pascal" - "text/x-tcl" - "text/x-tex" - "application/x-shellscript" - "text/x-c" - "text/x-c++" - ]; - }) - ]; - meta = with lib; { description = "High-performance, multiplayer code editor from the creators of Atom and Tree-sitter"; homepage = "https://zed.dev"; diff --git a/third_party/nixpkgs/pkgs/by-name/zp/zpaqfranz/package.nix b/third_party/nixpkgs/pkgs/by-name/zp/zpaqfranz/package.nix index 158dbade94..7908f050ba 100644 --- a/third_party/nixpkgs/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/zp/zpaqfranz/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "59.2"; + version = "59.4"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-NPkaOmjeLPznG/kY2cF9ROA7SzWEeKKCcPhP91PnYOk="; + hash = "sha256-tdkb/qyxpgORC8UcyDl3giGrU1VI0BAriBN7jDNBJzA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/zw/zwave-js-server/package.nix b/third_party/nixpkgs/pkgs/by-name/zw/zwave-js-server/package.nix index bde444b7aa..dfdf0ce307 100644 --- a/third_party/nixpkgs/pkgs/by-name/zw/zwave-js-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/zw/zwave-js-server/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "zwave-js-server"; - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "zwave-js"; repo = pname; rev = version; - hash = "sha256-aTUV9FYE4m/f7rGv7BBFNzCVQpSO9vK1QkeofnMnbzM="; + hash = "sha256-9TUS8m3Vizs36GVYaDQTRXPO8zLLJUs8RPkArRRCqsw="; }; - npmDepsHash = "sha256-Jne4vzPcNNfHO1LQa609Jdv22Nh3md9KfBXuQoILpbY="; + npmDepsHash = "sha256-zTcN04g7EsLFCA+rdqhSQMy06NoMFYCyiUxe9ck2kIE="; # For some reason the zwave-js dependency is in devDependencies npmFlags = [ "--include=dev" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/zx/zxtune/package.nix b/third_party/nixpkgs/pkgs/by-name/zx/zxtune/package.nix index 436a241533..7cf8e5043e 100644 --- a/third_party/nixpkgs/pkgs/by-name/zx/zxtune/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/zx/zxtune/package.nix @@ -41,7 +41,7 @@ let ++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase); in stdenv.mkDerivation rec { pname = "zxtune"; - version = "5056"; + version = "5060"; outputs = [ "out" ]; @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { owner = "zxtune"; repo = "zxtune"; rev = "r${version}"; - hash = "sha256-zvLbgS8AFW4kkvTccGXcr1KEw3EH47XcHwzq6CKzusQ="; + hash = "sha256-mfObtcpBk9sltPckwjY/e5NwEILaxiPy/mbvmyQHeCo="; }; passthru.updateScript = nix-update-script { diff --git a/third_party/nixpkgs/pkgs/common-updater/unstable-updater.nix b/third_party/nixpkgs/pkgs/common-updater/unstable-updater.nix index 29b7fcf196..d7a9c73fbc 100644 --- a/third_party/nixpkgs/pkgs/common-updater/unstable-updater.nix +++ b/third_party/nixpkgs/pkgs/common-updater/unstable-updater.nix @@ -1,5 +1,5 @@ { lib -, writeShellScript +, writeShellApplication , coreutils , git , nix @@ -8,116 +8,168 @@ # This is an updater for unstable packages that should always use the latest # commit. +# To use this updater, add the following to your package set: +# passthru.updateScript = unstableGitUpdater { }; +# relevant attributes can be passed as below: + { url ? null # The git url, if empty it will be set to src.gitRepoUrl , branch ? null -, stableVersion ? false # Use version format according to RFC 107 (i.e. LAST_TAG+date=YYYY-MM-DD) -, tagPrefix ? "" # strip this prefix from a tag name when using stable version +, hardcodeZeroVersion ? false # Use a made-up version "0" instead of latest tag. Use when there is no previous release, or the project's tagging system is incompatible with what we expect from versions +, tagFormat ? "*" # A `git describe --tags --match ''` pattern that tags must match to be considered +, tagPrefix ? null # strip this prefix from a tag name +, tagConverter ? null # A command to convert more complex tag formats. It receives the git tag via stdin and should convert it into x.y.z format to stdout , shallowClone ? true }: +assert lib.asserts.assertMsg (tagPrefix == null || tagConverter == null) "Can only use either tagPrefix or tagConverter!"; + let - updateScript = writeShellScript "unstable-update-script.sh" '' - set -ex + updateScript = writeShellApplication { + name = "unstable-update-script"; + runtimeInputs = [ + common-updater-scripts + coreutils + git + nix + ]; + text = '' + set -ex - url="" - branch="" - use_stable_version="" - tag_prefix="" - shallow_clone="" + url="" + branch="" + hardcode_zero_version="" + tag_format="" + tag_prefix="" + tag_converter="" + shallow_clone="" + : "''${systemArg:=}" - while (( $# > 0 )); do - flag="$1" - shift 1 - case "$flag" in - --url=*) - url="''${flag#*=}" - ;; - --branch=*) - branch="''${flag#*=}" - ;; - --use-stable-version) - use_stable_version=1 - ;; - --tag-prefix=*) - tag_prefix="''${flag#*=}" - ;; - --shallow-clone) - shallow_clone=1 - ;; - *) - echo "$0: unknown option ‘''${flag}’" - exit 1 - ;; - esac - done + while (( $# > 0 )); do + flag="$1" + shift 1 + case "$flag" in + --url=*) + url="''${flag#*=}" + ;; + --branch=*) + branch="''${flag#*=}" + ;; + --hardcode-zero-version) + hardcode_zero_version=1 + ;; + --tag-format=*) + tag_format="''${flag#*=}" + ;; + --tag-prefix=*) + tag_prefix="''${flag#*=}" + ;; + --tag-converter=*) + tag_converter="''${flag#*=}" + ;; + --shallow-clone) + shallow_clone=1 + ;; + *) + echo "$0: unknown option ‘''${flag}’" + exit 1 + ;; + esac + done - # By default we set url to src.gitRepoUrl - if [[ -z "$url" ]]; then - url="$(${nix}/bin/nix-instantiate $systemArg --eval -E \ - "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.gitRepoUrl" \ - | tr -d '"')" - fi + # By default we set url to src.gitRepoUrl + if [[ -z "$url" ]]; then + # system argument cannot be passed as 1 argument + # shellcheck disable=SC2086 + url="$(nix-instantiate $systemArg --eval -E \ + "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.gitRepoUrl" \ + | tr -d '"')" + fi - # Get info about HEAD from a shallow git clone - tmpdir="$(${coreutils}/bin/mktemp -d)" + # Get info about HEAD from a shallow git clone + tmpdir="$(mktemp -d)" - cloneArgs=( - --bare - ) + cloneArgs=() - if [[ "$shallow_clone" == "1" ]]; then - cloneArgs+=(--depth=1) - fi + if [[ "$shallow_clone" == "1" ]]; then + cloneArgs+=(--depth=1) + fi - if [[ -n "$branch" ]]; then - cloneArgs+=(--branch="$branch") - fi + if [[ -n "$branch" ]]; then + cloneArgs+=(--branch="$branch") + fi - ${git}/bin/git clone "''${cloneArgs[@]}" "$url" "$tmpdir" + git clone "''${cloneArgs[@]}" "$url" "$tmpdir" + getLatestVersion() { + git describe --tags --abbrev=0 --match "''${tag_format}" 2> /dev/null || true + } - pushd "$tmpdir" - commit_date="$(${git}/bin/git show -s --pretty='format:%cs')" - commit_sha="$(${git}/bin/git show -s --pretty='format:%H')" - if [[ -z "$use_stable_version" ]]; then - new_version="unstable-$commit_date" - else - depth=100 - while (( $depth < 10000 )); do - last_tag="$(${git}/bin/git describe --tags --abbrev=0 2> /dev/null || true)" - if [[ -n "$last_tag" ]]; then - break - fi - ${git}/bin/git fetch --depth="$depth" --tags - depth=$(( $depth * 2 )) - done - if [[ -z "$last_tag" ]]; then - echo "Cound not found a tag within last 10000 commits" > /dev/stderr - exit 1 - fi - if [[ -n "$tag_prefix" ]]; then - last_tag="''${last_tag#$tag_prefix}" - fi - new_version="$last_tag+date=$commit_date" - fi - popd - # ${coreutils}/bin/rm -rf "$tmpdir" + pushd "$tmpdir" + commit_date="$(git show -s --pretty='format:%cs')" + commit_sha="$(git show -s --pretty='format:%H')" + last_tag="" + if [[ -z "$hardcode_zero_version" ]]; then + if [[ "$shallow_clone" == "1" ]]; then + depth=100 + while (( depth < 10000 )); do + last_tag="$(getLatestVersion)" + if [[ -n "$last_tag" ]]; then + break + fi + git fetch --depth="$depth" --tags + depth=$(( depth * 2 )) + done - # update the nix expression - ${common-updater-scripts}/bin/update-source-version \ - "$UPDATE_NIX_ATTR_PATH" \ - "$new_version" \ - --rev="$commit_sha" - ''; + if [[ -z "$last_tag" ]]; then + # To be extra sure, check if full history helps with finding a tag + git fetch --tags + last_tag="$(getLatestVersion)" + fi + else + last_tag="$(getLatestVersion)" + fi + if [[ -z "$last_tag" ]]; then + last_tag="0" + fi + if [[ -n "$tag_prefix" ]]; then + echo "Stripping prefix '$tag_prefix' from tag '$last_tag'" + last_tag="''${last_tag#"''${tag_prefix}"}" + fi + if [[ -n "$tag_converter" ]]; then + echo "Running '$last_tag' through: $tag_converter" + last_tag="$(echo "''${last_tag}" | ''${tag_converter})" + fi + else + last_tag="0" + fi + if [[ ! "$last_tag" =~ ^[[:digit:]] ]]; then + echo "Last tag '$last_tag' does not start with a digit" > /dev/stderr + exit 1 + fi + new_version="$last_tag-unstable-$commit_date" + popd + # rm -rf "$tmpdir" + + # update the nix expression + update-source-version \ + "$UPDATE_NIX_ATTR_PATH" \ + "$new_version" \ + --rev="$commit_sha" + ''; + }; in [ - updateScript + (lib.getExe updateScript) "--url=${builtins.toString url}" + "--tag-format=${tagFormat}" ] ++ lib.optionals (branch != null) [ "--branch=${branch}" -] ++ lib.optionals stableVersion [ - "--use-stable-version" +] ++ lib.optionals (tagPrefix != null) [ "--tag-prefix=${tagPrefix}" +] ++ lib.optionals (tagConverter != null) [ + "--tag-converter=${tagConverter}" +] ++ lib.optionals hardcodeZeroVersion [ + "--hardcode-zero-version" ] ++ lib.optionals shallowClone [ "--shallow-clone" ] diff --git a/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix b/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix index 30382918c6..873346c777 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "45.5"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-dBZ/z0KgTZ5dPMEw0nvCA9h7aFzmBqhGdN8k4f9xnlQ="; + hash = "sha256-qXKTy+63l+tPTRadcTu2WDvRLDeR4UAoPkNW0v4YCto="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix index 468938a0a7..96d8d9ac11 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,7 +2,7 @@ stdenvNoCC.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2024-02-11"; + version = "0-unstable-2024-02-11"; src = fetchFromGitHub { owner = "schemedoc"; @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec { description = "Unix manual pages for R6RS and R7RS"; homepage = "https://github.com/schemedoc/manpages"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/0xproto/default.nix b/third_party/nixpkgs/pkgs/data/fonts/0xproto/default.nix index ee43ede57d..6a0cf9b5f1 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/0xproto/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/0xproto/default.nix @@ -4,14 +4,14 @@ }: stdenvNoCC.mkDerivation rec { pname = "0xproto"; - version = "1.603"; + version = "2.000"; src = let underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in fetchzip { url = "https://github.com/0xType/0xProto/releases/download/${version}/0xProto_${underscoreVersion}.zip"; - hash = "sha256-20KqPX6BKlyX+R3zrhDMz3p9Vwgd4RlRe2qhJpic6W4="; + hash = "sha256-ekoCvN3A0mrYUwIG61508bRAvLdOa+MQ4IXPWE5zKHw="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix index 68bdd7e70d..56ee110a4b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/3270font/default.nix @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/rbanffy/3270font"; changelog = "https://github.com/rbanffy/3270font/blob/v${version}/CHANGELOG.md"; license = [ licenses.bsd3 licenses.ofl ]; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/apl386/default.nix b/third_party/nixpkgs/pkgs/data/fonts/apl386/default.nix index 15c61d41aa..e1bab248f3 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/apl386/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/apl386/default.nix @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation { homepage = "https://abrudz.github.io/APL386/"; description = "APL385 Unicode font evolved"; license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/barlow/default.nix b/third_party/nixpkgs/pkgs/data/fonts/barlow/default.nix index e9bfa4dee3..ad1d985c31 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/barlow/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/barlow/default.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { description = "A grotesk variable font superfamily"; homepage = "https://tribby.com/fonts/barlow/"; license = licenses.ofl; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix index df1af86d5c..e4f92ebe71 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "cascadia-code"; - version = "2111.01"; + version = "2404.23"; src = fetchzip { url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; stripRoot = false; - hash = "sha256-v9Vm5X80wEvorMhIlRw3MnyuSOdBpTl9ibBPpmm1vig="; + hash = "sha256-Z2AzBeNiM6mc1OHCJRv0rUvH8WRygyQGSOvwbAISYHE="; }; installPhase = '' @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/microsoft/cascadia-code"; changelog = "https://github.com/microsoft/cascadia-code/raw/v${version}/FONTLOG.txt"; license = licenses.ofl; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ ryanccn ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix index 5a3bb59c25..843fb851c1 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { description = "A contemporary sans serif, with characters composed of modified-geometric curves and arches"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix index de8e64c843..e1f6e57c89 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.23.2"; + version = "1.24.0"; src = fetchzip { url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${builtins.replaceStrings ["."] ["-"] version}.zip"; - hash = "sha256-v1UWrVx1PnNPiFtMMy4kOkIe//iHxx0LOA4nHo95Zws="; + hash = "sha256-BA3pVcqZnakoYhF00OqDzo4GwRB5txGKN/ou2EvadWo="; }; installPhase = '' @@ -28,6 +28,6 @@ stdenvNoCC.mkDerivation rec { changelog = "https://github.com/slavfox/Cozette/blob/v.${version}/CHANGELOG.md"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ brettlyons marsam ]; + maintainers = with maintainers; [ brettlyons ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix b/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix index dfc808971b..8705a07d25 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix @@ -48,7 +48,7 @@ in hash = "sha256-gd23ZplNY56sm1lfkU3kPXUOmNmY5SRnT0qlQZRNuBo="; }; v6 = font-awesome { - version = "6.4.2"; - hash = "sha256-/utIhn7CWxlWXshcCUj57WuObRmLTGhTfQo7L6FDHqA="; + version = "6.5.2"; + hash = "sha256-kUa/L/Krxb5v8SmtACCSC6CI3qTTOTr4Ss/FMRBlKuw="; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix index 21bab9002b..b41dc1ea80 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec { description = "A display, “Old Style” soft-serif typeface inspired by early 20th century typefaces"; homepage = "https://github.com/undercasetype/Fraunces"; license = licenses.ofl; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix index 483ed98737..dc0471b65f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix @@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation { homepage = "https://ia.net/topics/in-search-of-the-perfect-writing-font"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index 749658086b..7676036860 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "29.1.0"; + version = "30.0.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 1350b01d96..5628df5393 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "29.2.1"; + version = "30.0.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-WWumGi6+jaQUGi1eArS9l3G8sOQL4ZetixVB5RWDPQ4="; + hash = "sha256-THs6kN5VZpTvzTK7w/sGQbxoEyyPwzl93JDOvwucgeo="; }; - npmDepsHash = "sha256-Gm3R8lWmYbLOfyGW+f8CYXlodp11vMCMAhagILxLKFA="; + npmDepsHash = "sha256-maDIkbe4BKY7XYOQNGdOalyTGdBXgIU5t0QjVJW6lvQ="; nativeBuildInputs = [ remarshal diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 268f2c80f1..4d51d9acd5 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "1mz2l4j2kczk540gx2nbj40apympy9b7sih9nr3585yg14axihfa"; - IosevkaAile = "0rlajr2gzj8n2jynz86yr382jbxffi6rygkb7a2psp6b91p3q8yg"; - IosevkaCurly = "1zp5015qvrnzpp2hr8cxrdb8qw86bmn80cr7jwl119dmdsk7aaks"; - IosevkaCurlySlab = "1lkq462j3a2bm791d67xsymdgz3fjjakakdzyjj3plvycg39rszd"; - IosevkaEtoile = "17shszmnrsxis5hvafsp3j0p7izzqw9fv0j0bp7x0dxljdhj9f4x"; - IosevkaSlab = "03xcj0y7m9rp9p9vh8mah83kap3bfssbxfpl4jwdjq661f43pkxw"; - IosevkaSS01 = "1hc3x3m5p22483asdfy1anvlxvpagwf8k23kri0r5i003cyhs4kb"; - IosevkaSS02 = "0rcmiirz5hkfb8pjsgz1sqjr6dj6w922yx60fz8icg5743q7n8gs"; - IosevkaSS03 = "02lyihd7acr6ai22k78qk18zfgs63rmwv57v2hkz248nz04xhg5v"; - IosevkaSS04 = "06by2zj9m5v70hpa7krf443817dikzyc1sawldgqjz83nwhnnbyq"; - IosevkaSS05 = "1f6bvc47rc843n6a12j3mdf223df8rr542xjvg4zh9g6lmm35bj9"; - IosevkaSS06 = "0vrpygvg5ywhqzam1yndmbxlq72fmab70ns6pmn9yx4gpa95gdr3"; - IosevkaSS07 = "0g69bwhxgnk8lyqyvvg7hg88lfgakh4vjkxcjpqnymia3bd5siiy"; - IosevkaSS08 = "0a02ar74m8cas3x9mfwi1ncbnvrgcipii17qip0c3f1d7a0qpf8i"; - IosevkaSS09 = "1mh77424jxnf5hicy9v3kgzngy4cvh0kwkqpyfhdk8f7alqnlk8v"; - IosevkaSS10 = "05bqjz33j78q4daf40js6rcli8q7i2y1ldxnpgsrlirk7cr3q88y"; - IosevkaSS11 = "11blakgiqhvl5z34py7lw23m32f1qqinajrya1pi10i2q2kwhm06"; - IosevkaSS12 = "0zb9xrw83a3g4rany2prkxw6x707rxziv0fjj1vjmdpxcdpmndi6"; - IosevkaSS13 = "1li250cjnyihs1ha3y3xhw3fbr60bz068513zjf7pjqwjpaj1lqq"; - IosevkaSS14 = "027g4lj3qqmq6m2bpk79i8bf0d402yqwnk800zzbhvgc32pmrwz5"; - IosevkaSS15 = "0ndn2y8sq9b3667j4cvz5nqyfs5sldn231xba4q79naq4cgjphkl"; - IosevkaSS16 = "17vndj8h8dcgbsvzmjvzyzj30zzpqjyxch346a1zhrpaq4slmahp"; - IosevkaSS17 = "0y95r32x5z75nk3rqvqx9makr3lpkyap8zlwg1aq2hfcnfppf2mf"; - IosevkaSS18 = "1w70hv0fapx3a7zmnrayzxc0wxsk6rc9czr2spjjy42l60nrf4fl"; - SGr-Iosevka = "1n8haiwyvsxi9qf2h63jp2ilr9iqc7dgw7j3znji8dpwzvyl86hh"; - SGr-IosevkaCurly = "0g86gdhqw231bgqy26shi8bm6216rvyxzwvnjis7hjqg3b312z9x"; - SGr-IosevkaCurlySlab = "0cy1nzqn138cd1xipb76pz36dd3mgss2vmmqlbqwjjcwpr8h0s0s"; - SGr-IosevkaFixed = "187g1q32blj0nkfd3yxjgscnz7zslh5k58abnx7fjd30s5n5yscr"; - SGr-IosevkaFixedCurly = "1mgbbhazvqxm1r9cl6slr1y0bdna6h7as0q5iggh6zqan0zrr70c"; - SGr-IosevkaFixedCurlySlab = "1v8gsjbl5136scnd06k7hhbkzsvjbg9j2g1xj5pgvda0lanqy0r4"; - SGr-IosevkaFixedSlab = "05jf8yzkp61aggyb8rky9wlj16g9xfhf0qgr8n9p4wf51i1fikky"; - SGr-IosevkaFixedSS01 = "1h43f0vn1hlv7676v620dss9ijwlnjkdjzf3zs590k5cm0xpfmfj"; - SGr-IosevkaFixedSS02 = "004idwfv9fww05q44bdqcc1m47sjdkh0ybrv3k3djgkm4ii3irjf"; - SGr-IosevkaFixedSS03 = "0l4i8fzy1ypfcb43475jyccij8a9s2bm7pvbbrckkhmi357f53mh"; - SGr-IosevkaFixedSS04 = "15kmg0xvi1l32fd3swl5rz539xxif5vx57rr0byrg9bi9ksvsfg6"; - SGr-IosevkaFixedSS05 = "07i8nd9z42xxjqb73if3zqznipgkjlvh06rckrp3k9ylpr608rgr"; - SGr-IosevkaFixedSS06 = "0s9zh2v0qykqjrms8wbrarjid3vjd3d0mas7pl75d207smcy1sf2"; - SGr-IosevkaFixedSS07 = "1bkqj44xjnafp1vmlyg91zpjwsqc991infbpcgrmm1kd7nxsdki1"; - SGr-IosevkaFixedSS08 = "1jyrnc94cr47glmjn9as5yz534j2lzb171rr5ybmjf1f1iir8hh5"; - SGr-IosevkaFixedSS09 = "1kpf263mjddjdl4nk06pp0x48ia73pyicvqkkk6jw556w0gbmd38"; - SGr-IosevkaFixedSS10 = "0dx5bjc8xhxg6a6h6620v3nz3jnldq4is1cw2g4j0xxr2wigi1q2"; - SGr-IosevkaFixedSS11 = "0zc66j2x7z95lycmi7phyjl7wxf8fxy0x6dywsksm54rzqpw2x2n"; - SGr-IosevkaFixedSS12 = "0z7riwx6kq3v35vap4vnp23xlwdczp4mdzkwq8w73v0ki47mm1vf"; - SGr-IosevkaFixedSS13 = "0nq1l70fw1rlj6ijs3drjrgwsfrgl3r7hzmv4dzaw3135irbw7jl"; - SGr-IosevkaFixedSS14 = "15i7qy09x7xgcl097l430nbs4zfmdqsjqlqxlnvxh8l7if52glx0"; - SGr-IosevkaFixedSS15 = "04pl83npfvy7zyhxnzsds04sq0ffilkgvj74i8w74jrr6ncsigc5"; - SGr-IosevkaFixedSS16 = "0ib27fr1mj6zdyp99h425wyw1g4a0qdgz7wkbvnvjm7s9api750w"; - SGr-IosevkaFixedSS17 = "0ln4i0q5yszb1162rm6dgfnssqc09zak400rjhwkf89z8nggyjnr"; - SGr-IosevkaFixedSS18 = "0pi4qnzjlkzfdlnf853aamhb1dbinhcs42al6dara8j4la2mw9b0"; - SGr-IosevkaSlab = "17fcn0b79z901kdzyjxlx46d6b40x2rib6lnh6bja7g4n42ha8rc"; - SGr-IosevkaSS01 = "1xrdrydi9ync2iybpbf4k5iax1i7pfbmn1grbql07b13snagcjsy"; - SGr-IosevkaSS02 = "13m6si5mamblvdbnaz16fl9gnpq0r5zr0iwrv4fycs21bz12gz3w"; - SGr-IosevkaSS03 = "0s6ljh6igx7i188c86xy3gpwc37xzm2d5w3f6sdp1sg8cgr71iaf"; - SGr-IosevkaSS04 = "15xlzn0mi150h8hy03bz611w5vla61nhannglfmsa8bljqwb33sp"; - SGr-IosevkaSS05 = "1ljkb44sycdh6gira2fjflbmcfkqs3fsv2xf493bl2mvd46kkh2b"; - SGr-IosevkaSS06 = "1ra5s2f1ydpzg742yg1d1fawvhvxijq8ibi7maf99k1pf4qkpvak"; - SGr-IosevkaSS07 = "1cx9k8f6qnqfz2klcqdbnbz9ndr353kvg5w817b84zqbb2isyy2g"; - SGr-IosevkaSS08 = "0i3sz05nmabvxa62j85hw4hs53q378x4sy715af8cpzy1xwg46qh"; - SGr-IosevkaSS09 = "1pbd35y5rfa7hlvgci3a5mfixpq3dcg69yd539csy4riz99nbnzz"; - SGr-IosevkaSS10 = "0br4g7hdf3crnxkax2qy6nm1prgygl8j78jlhkfqhzfmzxajf2v3"; - SGr-IosevkaSS11 = "1k6vg4xkarch1vxry6wk1fsns563a6afv88pd286gid332hjlzk5"; - SGr-IosevkaSS12 = "01sraf0kw9kfm33ybglpqml59blggsp7q4hpi2jmf2nm05qzd5kz"; - SGr-IosevkaSS13 = "0ga9j1cd9vgiwji2pz3w1dmgd7r8abnd8486fyfjqzjcw9vh4w06"; - SGr-IosevkaSS14 = "0d1d65d52r7snmzhyb8r6i78z7mjmhz8psw20843bg8wrbpd35yq"; - SGr-IosevkaSS15 = "11bxcnpj4b6w9v4kwg6lfg4gingh9aigfwwi7q7iv8bzhv6pznng"; - SGr-IosevkaSS16 = "0bk8cs7qm4q36s28hrdg3sd7b6v2b9xfvam8vsxfbdsdwy8p7ksv"; - SGr-IosevkaSS17 = "0qz53fa53bin4an8dh66j29j019zhb4pni1j6isijm1lr37i7xmf"; - SGr-IosevkaSS18 = "02d57rs879r8rnikdpcr6vk1i191c674jvxw7qzanyflfi9xr90m"; - SGr-IosevkaTerm = "1pamv5s6d11kxvhcy6id985rz895y02px65dv7s761ci5a1rvayx"; - SGr-IosevkaTermCurly = "09781j6hhv7v3qrh79kdg3kzyfdwfy217fz5mwhr36qjikwlbbiq"; - SGr-IosevkaTermCurlySlab = "1kx0nzgcrggwgw06520nrfhym5yi6k1rfgbgdc6f7a93hdkyb8v1"; - SGr-IosevkaTermSlab = "07i6wbqxaaxr4xg9avs7473x0w2zcyg6zxpgby8l7lcv4g6wrn23"; - SGr-IosevkaTermSS01 = "1g8lbkk5z1kypcwhkn9izdbg246imnhfa0g2xssy2xd41jmk9djn"; - SGr-IosevkaTermSS02 = "04n26jkd8dp91n1a0ifr4srsxhpg3rcp9k56r1xjrc0wjpwmw05n"; - SGr-IosevkaTermSS03 = "108160gn6ggw1piz7r4ngwyfhycqhx350v8x6lcrfjlcx1mp5isk"; - SGr-IosevkaTermSS04 = "0qw7n2i8p323mr73pimjyb1rlk2m07d34qswgwpqvfj0jbbp3bp3"; - SGr-IosevkaTermSS05 = "0diwqrdyl43c6kng7rvg8wc7m2r5bri999rvn99xdhsll644b7zd"; - SGr-IosevkaTermSS06 = "08wql4iwkczxb0nz74iwnkr2gnafw4wa3x2yaxyd7rqf5qdlf0pr"; - SGr-IosevkaTermSS07 = "1hlcfx89yz0j0f93v0gww72m8jdy8k6cbmj7nhh4yqyvph9clqqa"; - SGr-IosevkaTermSS08 = "1z4qxhlibyimjwizwp5i3b8c827c4pvdfib1ma7f8c654jni7v8k"; - SGr-IosevkaTermSS09 = "1847m7zksg0ndn8kzx7hlqmwc9hs7rgaywqqzyp7ahpa5cwyk9zr"; - SGr-IosevkaTermSS10 = "16nyrrim1g0zf5n4mp9k1iz8l5pgb3w9hlafhl4ys5xn7fw47cfc"; - SGr-IosevkaTermSS11 = "0ry7h0ghwgi5ra36dgsc8zdkyxrd8srpc12ix9glcficbkhkkisp"; - SGr-IosevkaTermSS12 = "1iri5bcjlwcni9k64y7cq3rh4106hrimpi4c47ii249nk6q2ppak"; - SGr-IosevkaTermSS13 = "0qkkxq4gmf13wzic31y477hi3rkyihs0bxmch8nh1myy8fmj4fik"; - SGr-IosevkaTermSS14 = "04pjjmy3mh3721fxf10hgii2d8gzc7x76v4mv6m84spwa2g8c72c"; - SGr-IosevkaTermSS15 = "1lix7g00xx4yrq7xc2jik0bh6iib7sqyn2zsrng9pph4589vri22"; - SGr-IosevkaTermSS16 = "076wy7yix7d217c87pp61x4nwqmmlzpqzlidq5v49jcdrdxj4b7k"; - SGr-IosevkaTermSS17 = "0qdb5603nxs93sv1f06svf0r0c9b0qmpnr3grif3qx09ifpqnkfb"; - SGr-IosevkaTermSS18 = "0whg2lxndn3j5jlnhjy6zj1lkwd4q0qf0pbf8kajhvnlrn6yx0ca"; + Iosevka = "08phw6jy5zml9gs5wvizqil9m24xx3bfiq026dqxfa7b45qwhvy9"; + IosevkaAile = "0mhfq4rn6jfxyvci5dky5a72gdsw40rvgzqrzwdhdb95ydbpv0yg"; + IosevkaCurly = "0bnwg2y1nxldx8pc4qfbdxb7z6cdqlx37fhz1a4xf7qydy8bcrwl"; + IosevkaCurlySlab = "1ik3r5nbdg9x7lm508zwlvyqvnr50r0w8wmkw8qp5x57xf9bwpgn"; + IosevkaEtoile = "13gqlsycnkf4n2zsb621dzc4s8hgb04r6r9jaz6585bnr5pjm1gs"; + IosevkaSlab = "0ww4p5qlp4anb6g80dydm730357rpr4w90z845r3z12i5x6pv4xn"; + IosevkaSS01 = "0b3yrlcxm7wxzd6zy8p2zm6a3qgj3y5sa065g3qjkybmdzl8r9j4"; + IosevkaSS02 = "0jv9b2jff2v8hqmbnx734x7ncnn83z1azcfmv819saw06wsqig05"; + IosevkaSS03 = "06sy9ml1igw0p167gjb3vwm3b33jd8yh42wjlwsx0vz88220hp78"; + IosevkaSS04 = "0r3rbdcyn3ffqxl3mk0y1r9h77nr8b31fi065p0yfdciqlhas4zn"; + IosevkaSS05 = "042n54596lqir70j19kz8vqpvr6r7kqcsg9b0q679qrsny03brrw"; + IosevkaSS06 = "0wf0b842sh7z7f3x1y6bxz9a7qp207jm4vgdzjba5fq56dzzqv1s"; + IosevkaSS07 = "1qzyvp9g0j3lj05rafll1yaki818a421kl4h2vsgfqks9h4knp3b"; + IosevkaSS08 = "1ypj0vsq94qx1fhsqkpwxwhp0bv1ks1cgg40n4kyk8icjx41c2bv"; + IosevkaSS09 = "1dw6jcmnlxpq9c7429c01nw0v3lb4p3x25vzn63xznwgnxlp3zd0"; + IosevkaSS10 = "1sjzs7hn5r3n85w9rb35v93jdaq86mga2xwfmsalhmw1k5dbdp65"; + IosevkaSS11 = "00a2wkxpqfsy9m2kxp4w91iwyxdacmh2r9gmr10ycp11v0d7q9dy"; + IosevkaSS12 = "0nvx4r7w9kdlgd2js6q6fn1dfcwmfjqln6j5l7cm9kpjxalq4xz7"; + IosevkaSS13 = "1is6qgwjds28ljsc65bnqrm40233qw4w5n6wqkmc689pqh96c5zf"; + IosevkaSS14 = "1p037map2fpn0wrx3jlv6hw84p8jpvv2gm7w9sr1rwfb0sgqj422"; + IosevkaSS15 = "1dd2i5b25a1hzmnq5pan98f4fs8nd98q50jawx3m87xczl0y25ym"; + IosevkaSS16 = "0jvf1p8k8pdakcm0ygmn8c4s1fkay0yjrnnjpz764wh9kmvif2ah"; + IosevkaSS17 = "11529msxvjqgv2m0lh0ydiapwszjhy2bb1kqqvm2k0if42jaw0aq"; + IosevkaSS18 = "1rqg15imhcwfivi0q8gxvk69xszfl3vqbik2a24kkl64ngs8j6ld"; + SGr-Iosevka = "07izlilvkf688jv06myq4iayghsggk8mlqhd52cyyj14y3705hiq"; + SGr-IosevkaCurly = "010w2qczbdjh1p6my2nvq498zwlzk6as70db1m7mphqyzf0pypdq"; + SGr-IosevkaCurlySlab = "0lhav6950vxm0x66xkdqf50gzvh4sznzfd20k2ly58pr1wjnzmgg"; + SGr-IosevkaFixed = "0c6wviqhgxvcaz8lb0f3hwnwqqcjdqxywr2vj91ac7sy5fwn29k0"; + SGr-IosevkaFixedCurly = "0a0hs7lxbgfimn0vcl9yhpsdqm9zdffly9glpbrffr6j5lfzr3hk"; + SGr-IosevkaFixedCurlySlab = "0cpsiv06gpp69c9iv3v095fk181kf1vxv9rzhjs18n7f4l1mvl0f"; + SGr-IosevkaFixedSlab = "18g7bwmiqf6hl8y3c4s9hkr4a99484c470w2j5bimvby1sajj1lh"; + SGr-IosevkaFixedSS01 = "0byi5zp92s3ib18n4jjq1rqh8si58qr853977p8s8xgpwmw0dpv1"; + SGr-IosevkaFixedSS02 = "1vi4zw117id31bmj1v6srfkbmx0a12v7zvbvqww5gq2al51c2wld"; + SGr-IosevkaFixedSS03 = "0p8gaf53qlhrgpk4ycrz0499mzcqndrndhcjim41qmn37pxragdc"; + SGr-IosevkaFixedSS04 = "0y00i5s0csw9ca7r1hajqjdn7ip0ryhrai16h9f901ckxrl8icp0"; + SGr-IosevkaFixedSS05 = "0ncyjv3bap46db2l75w3q3g6gs1z6g4gd2459qs1mh66m4avw9yy"; + SGr-IosevkaFixedSS06 = "0hpkxvybzjwjzk4ran18zhli6cp44dd9dmjsi3qr7cp057sv2nxc"; + SGr-IosevkaFixedSS07 = "17rycr4bbpskzkb134ywa409ylx0hgqy76idxpnp0nzgacrdqw63"; + SGr-IosevkaFixedSS08 = "0na7j1nwwpzigaxbndw4hsgbvr020ljjnpcmp2cw0q6gaw86gzn4"; + SGr-IosevkaFixedSS09 = "06smgacjm7csnjv6105c47mwg7i3gfg4b18hghxy6vwcf7323skk"; + SGr-IosevkaFixedSS10 = "0b053yfmx0jp10cizcdcv9hq1xdbjkzpfasw9dchywj0j4l77i3f"; + SGr-IosevkaFixedSS11 = "16ycvndlmcpasdc9c2mncm6vj221iy2y40ni6kbdz6rlhi88i1cj"; + SGr-IosevkaFixedSS12 = "03sq2i6fhlmljqfk8ji6bkq7kg0iibd7yxxdmsgfrwi9bspfynmv"; + SGr-IosevkaFixedSS13 = "0s6f35px4frf3fkzmq8nrv16h9n55nmm2jwn9h9pfds01wl6y3h3"; + SGr-IosevkaFixedSS14 = "14a92rzj1w50xczpn8gjf2vsd5ms38yg82a9hl32g522b7bmg3si"; + SGr-IosevkaFixedSS15 = "11g9y220djq6nxpzqqjmj9frcxgdxsagkf4rjpi1ldwy6v3jbvqj"; + SGr-IosevkaFixedSS16 = "1ncjmg7fwsgilivpjgfjgsh4giihqzbmf60slwcjkgxhiwq6sk6w"; + SGr-IosevkaFixedSS17 = "0fzxjrdlqxl4y617lwjc8sbvh1azz6wkyfvg3894j82r1s4myn4y"; + SGr-IosevkaFixedSS18 = "111krj392zmx6m0ikmwjcg32j5wx5a4cbjj36l3ksc7cjhpv0vn6"; + SGr-IosevkaSlab = "1z6swxvq3yhslq9sjxgvay5g3bzgip2lf9pqjkbs3pm03qv77ah0"; + SGr-IosevkaSS01 = "1gp768wzc8nxz8b7b65mdiprxwabsr4h7xcz145lw8bkxdcv8c0s"; + SGr-IosevkaSS02 = "0vdvi5fk49lwyyrkyc1qc77ia0jckp64zdqksrqh8y20iyx8z3jd"; + SGr-IosevkaSS03 = "0f2m5283cr76zwzcym4mib9dyhwzyj9ca6zp0marh30fnfyl1pi4"; + SGr-IosevkaSS04 = "1z3wc4v73dc9shzsbjnb732ihkd85m5kfmy3dns6qyqbyn5grsz4"; + SGr-IosevkaSS05 = "1glwqkjg8q6rjigi30r44zlhsg8q1209h4yj0mg0pvlqai802v0l"; + SGr-IosevkaSS06 = "1ysyl05s98g97bwqq1gra8irxxryzm32gwqp5gv6w54407s4gjyr"; + SGr-IosevkaSS07 = "00lxp584ys3ngjqk578szxrgi3pga18r64gl1i72y30c1wmvp29d"; + SGr-IosevkaSS08 = "0pck7kn82g56r245zblbbnn5k7ax5x175hlbb0ib4zd59w59bw07"; + SGr-IosevkaSS09 = "0rhb2hmp7sygwhysazwldxygzmyymrazcprf42impiw87s6z46bx"; + SGr-IosevkaSS10 = "0swy1k8arjxllcx965ln8fjpwyd6h5y5w9i4kdx9x1kac4graki6"; + SGr-IosevkaSS11 = "07c0qmrca6z0vwmfli9ipzjiv84192wq8b15lbn04fn2m1xvbdlr"; + SGr-IosevkaSS12 = "072scbxs85fwv04b77zy0sk3bmy6ql358k4z38vgfhbck1920rdp"; + SGr-IosevkaSS13 = "0cbcjgl209msq1rf5kh9gi9cx49h8wlnrkvwqcabpwg3vfh2y508"; + SGr-IosevkaSS14 = "1sj0hs6wmsngkrkjfp9ki9zpnssqd2xia4n71pwjmc63zydmbpgm"; + SGr-IosevkaSS15 = "1c79zyddjjgmly3ssz75bgn6lg7jmlc1jspq59hxcwcvv2maf4h8"; + SGr-IosevkaSS16 = "1mf7zacqsf0jfr5sn36g6cpmkwkk41lfprcxrvy3xvbmd68kj0ap"; + SGr-IosevkaSS17 = "0fvwj7v338sqh02v8pb7gzz3lw83z7ahqal15ygzjl5xk7f1z51j"; + SGr-IosevkaSS18 = "180ixkl7777v43a9h4iybp8x1iw6jcdiq9p6027ayjxd81hvbd67"; + SGr-IosevkaTerm = "142pq2h18x9mr9myvyx7mdmyw7c658c1pn1z0z6w9k3jy0cmf8cm"; + SGr-IosevkaTermCurly = "1cd0wr51d7470ifzfbk1va2q1daylkd462zag9ilxb0iqha35wfp"; + SGr-IosevkaTermCurlySlab = "0jd3jj5hbq1axn2wa0x19kf059wmac953zd6f02h878lpvcj88hi"; + SGr-IosevkaTermSlab = "07aff9wdh014fnqgl88pwfbd0a7b9qakqy4c6kscplhr4sp7q122"; + SGr-IosevkaTermSS01 = "01i707n4z798y2i7flj9x1rzsdp0fqfxw7cqxyjlczr4s1ydf6a3"; + SGr-IosevkaTermSS02 = "01nq3gxajgfx55gyn302sl44ami26kw0n4fjw8va9xcz812bg472"; + SGr-IosevkaTermSS03 = "1a6v0vvf2z38bxddsaaixyswdx6fyrvmzyhz0v1p82xlzvbpmr83"; + SGr-IosevkaTermSS04 = "1kblkagawachgb70ab4jymbnw28dznh56p8k7cmbi3ixkykfbmn5"; + SGr-IosevkaTermSS05 = "0g3mnxbly3ckwi37cvwywcj4jzp1x1nm759vykk2pkqjimdjgksr"; + SGr-IosevkaTermSS06 = "1jgxp066zns4bh4amlsn4spa5z87x3zfbbwmqx998x98yblqzf16"; + SGr-IosevkaTermSS07 = "1h85lhslc0k6l06zxxc2cgcj8fnpaq31rxkdpx18gxkniy6bqmip"; + SGr-IosevkaTermSS08 = "07q9mjjpnbkfardplx9hps4xf2b08kwrv6m4ws6zqyylvn4mvhlj"; + SGr-IosevkaTermSS09 = "0i8bcqxgw0glgin22nrl80ivvcagw2810b1c23ngjfkv2sfblmnk"; + SGr-IosevkaTermSS10 = "1h031pr83dfc2xjkzfw85k4w3001a5v0gqilwbxz05gnv582k5yf"; + SGr-IosevkaTermSS11 = "04pg8ilnbyzci8jggrzx8kw5k2zj43whl30rllnb0krvfqn82g1m"; + SGr-IosevkaTermSS12 = "18vzqv8l1iyyiq9pfzlw9b02jn73qqqy1b1dhly1qliwdgnzcliy"; + SGr-IosevkaTermSS13 = "0ya3bg29nc4ja7qflfqds00yqqpb9r7dq40hkmdi7qgjj1l681wi"; + SGr-IosevkaTermSS14 = "143mfn7dh7a9vngagq1q3zz5b57rcjznwa62jjivy30rhvnnpxx8"; + SGr-IosevkaTermSS15 = "0xqw8nsjd0wsj0mk5x2b934738fj617451hkb3cymcrhrvbrd4fq"; + SGr-IosevkaTermSS16 = "0lwq7ijc0r64wx3816d97avzrayp77avkv53cqm2ad5bdkink0z5"; + SGr-IosevkaTermSS17 = "09g2r6531g1pw3dpd4s78i8x3d4l78dd25c91hy0xry06dvb0da6"; + SGr-IosevkaTermSS18 = "1lwlc9mj7q7irjx74q3q22gzm52kjk487rsrxih9ijvpw3fdnlvy"; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix index bdc732ef1a..c13f42abe6 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://jetbrains.com/mono/"; changelog = "https://github.com/JetBrains/JetBrainsMono/blob/v${version}/Changelog.md"; license = licenses.ofl; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ vinnymeller ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index dc9ebf5ef2..50172de67f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.054"; + version = "0.055"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-DtvaFu3r2r5WmlFCbkbzqAk/Y2BNEnxR6hPDfKM+/aQ="; + hash = "sha256-bE7XjVzleSo5hjc7Azcl8R4OgJzsj1U21UOuXrBkulA="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/kanji-stroke-order-font/default.nix index 80c97024ac..7d7d025bbb 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/kanji-stroke-order-font/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/kanji-stroke-order-font/default.nix @@ -1,28 +1,36 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchzip }: let - version = "4.003"; - debianVersion = "dfsg-1"; -in stdenv.mkDerivation { - name = "kanji-stroke-order-font-${version}"; + font = "kanji-stroke-order"; + version = "4.004"; +in +stdenv.mkDerivation { + pname = "${font}-font"; + inherit version; - src = fetchurl { - url = "https://salsa.debian.org/fonts-team/fonts-kanjistrokeorders/-/archive/debian/${version}_${debianVersion}/fonts-kanjistrokeorders-debian-${version}_${debianVersion}.tar.bz2"; - sha256 = "1a8hxzkrfjz0h5gl9h0panzzsn7cldlklxryyzmpam23g32q6bg1"; + src = fetchzip { + # https://github.com/NixOS/nixpkgs/issues/60157 + url = "https://drive.google.com/uc?export=download&id=1snpD-IQmT6fGGQjEePHdDzE2aiwuKrz4#${font}.zip"; + hash = "sha256-wQpurDS6APnpNMbMHofwW/UKeBF8FXeiCVx4wAOeRoE="; + stripRoot = false; }; installPhase = '' - mkdir -p $out/share/fonts/kanji-stroke-order $out/share/doc/kanji-stroke-order - cp *.ttf $out/share/fonts/kanji-stroke-order - cp *.txt $out/share/doc/kanji-stroke-order + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/${font} + install -Dm644 *.txt -t $out/share/doc/${font} + install -Dm644 *.pdf -t $out/share/doc/${font} + + runHook postInstall ''; meta = with lib; { description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; - homepage = "https://sites.google.com/site/nihilistorguk/"; + homepage = "https://www.nihilist.org.uk/"; license = [ licenses.bsd3 ]; - maintainers = with maintainers; [ ptrhlm ]; + maintainers = with maintainers; [ ptrhlm stephen-huan ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix index 8ce458d3e4..e5d8094e39 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.320"; + version = "1.330"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-9crFUfj1mOXg4gD607jL2eHq8wlq/yEi5sgzKJ5YavM="; + hash = "sha256-CscUUcyLsk/S70tT2uGRqLiF8fa4KxC9pVrOziWJ/fI="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/fonts/martian-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/martian-mono/default.nix index ca15d938d9..4cfeb61cda 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/martian-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/martian-mono/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/evilmartians/mono"; changelog = "https://github.com/evilmartians/mono/raw/v${version}/Changelog.md"; license = licenses.ofl; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/rhodium-libre/default.nix b/third_party/nixpkgs/pkgs/data/fonts/rhodium-libre/default.nix index 1c36f41b48..114061db1b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/rhodium-libre/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/rhodium-libre/default.nix @@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/DunwichType/RhodiumLibre"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix b/third_party/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix index c1b22f7871..f981b9f85e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "undefined-medium"; - version = "1.2"; + version = "1.3"; src = fetchzip { - url = "https://github.com/andirueckel/undefined-medium/archive/v1.2.zip"; - hash = "sha256-hgHwi25T+aM7ljzk5uR4x+CqoRJ3/IOyktdp/mDW46I="; + url = "https://github.com/andirueckel/undefined-medium/archive/v1.3.zip"; + hash = "sha256-cVdk6a0xijAQ/18W5jalqRS7IiPufMJW27Scns+nbEY="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/fonts/work-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/work-sans/default.nix index 07c5704b51..c46b101328 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/work-sans/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/work-sans/default.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { description = "A grotesque sans"; homepage = "https://weiweihuanghuang.github.io/Work-Sans/"; license = licenses.ofl; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix index c1ddbe9fae..b9ef9f0cda 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix @@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/ipython/xkcd-font"; license = licenses.cc-by-nc-30; platforms = platforms.all; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix index a490d1c728..6ff07f749e 100644 --- a/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-YKdqV41HlQMvkyWoWbOCMUASshnEDnXtxzdmJdTEQGw="; + sha256 = "sha256-cWfQiJeyH/bkvASoe2nl4efHQdMpYFh587d5yycs31k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix index 1e7b2f29b6..3aedf3b2c9 100644 --- a/third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "nordzy-icon-theme"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "alvatip"; repo = "Nordzy-icon"; rev = version; - sha256 = "sha256-EJDnT6ft70eTR7o2ps+zyLGNZL9NBn6Qn4nHKsskzvE="; + sha256 = "sha256-r/WYGcHRAFX7TennestobjcJhwu3GE8aQXxnaeokQM0="; }; # In the post patch phase we should first make sure to patch shebangs. diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index 5422eaac80..215d2f4c31 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "24.03.12"; + version = "24.04.22"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-WWgppmMIXa7AtMu8Tu3TOt4JvsAkpufZva1reE+UaWg="; + sha256 = "sha256-FRE3zb/81IEHFFvX+rIDFPVe5vw/hToLqVLkXssMgoA="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index 7641a9a7ba..4b4c5305ff 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "24.04.16"; + version = "24.04.22"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-PYsGP0Snn9A5cJ5CG+RyjC+TJwAqJOFQdnYIUkugnq0="; + sha256 = "sha256-Co6tMvYFl0v4pZSGtamlIb6g6koAUyC0xyxcQig62J4="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix index 24eb68ceed..fcf8436323 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme"; - version = "23.12.02"; + version = "24.04.22"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-ks2JJROSYzeDqq7i6Y4iJAB994ZRcDOGGRcCL3Dt1zI="; + sha256 = "sha256-hFUsj0nODUVbzKyN6ud3HsaoTZBLGW+jjwc6kFFH02c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index 4a39dfe473..fd1603e08d 100644 --- a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20240201"; + version = "20240501"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - hash = "sha256-hAmtvib6wENEAGQdK242wwDqF3Ddu4YR00KPaWR8JMo="; + hash = "sha256-ZTijLslItfXRBUVKrz9KcOc78Efr5rRV+HfQckKcZSI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix b/third_party/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix index 17a6d31b8a..0261206347 100644 --- a/third_party/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tau-OS/tau-hydrogen"; license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = with maintainers; [ ashvith-shetty ]; + maintainers = [ ]; }; }) diff --git a/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix index 9b1043467f..68ac845466 100644 --- a/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-10-07"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-il+bYIcwm0BQF6U0J6h6rlzHSGSHYN/O8BezehYIpQ4="; + hash = "sha256-vtEmnoARlz1F+E+T3ceFDgLXjlCi8UzHLr4AwTA39fA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix index f77ab73032..d49e77fd0d 100644 --- a/third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "tela-icon-theme"; - version = "2023-06-25"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "tela-icon-theme"; rev = version; - hash = "sha256-tv0C4mW2A3dScUXBWa7a3lkG4lPIjZTsj5b1/oEVuiw="; + hash = "sha256-Z1U0KJMnNNXL5fn3kPoZ2RZNi95T27/tnWVgR8kTj1o="; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix b/third_party/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix index c16efa996d..167c2b3578 100644 --- a/third_party/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix @@ -1,17 +1,18 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub +{ + lib, + stdenvNoCC, + fetchFromGitHub, }: stdenvNoCC.mkDerivation { pname = "whitesur-cursors"; - version = "unstable-2022-06-17"; + version = "0-unstable-2022-06-17"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "WhiteSur-cursors"; rev = "5c94e8c22de067282f4cf6d782afd7b75cdd08c8"; - sha256 = "sha256-CFse0XZzJu+PWDcqmvIXvue+3cKX47oavZU9HYRDAg0="; + hash = "sha256-CFse0XZzJu+PWDcqmvIXvue+3cKX47oavZU9HYRDAg0="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix index e9ca757add..70f5357a89 100644 --- a/third_party/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024.04.08"; + version = "2024-04-22"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-Baf0BowyR4P7MDx+LmH6MHlANl+9lXlCaQispN4/i9o="; + hash = "sha256-CnAnD5ky+LNcyE59O/iGeoe+1JyhtPM/XUHwU5d8FA4="; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/cldr-annotations/default.nix b/third_party/nixpkgs/pkgs/data/misc/cldr-annotations/default.nix index 953ae55626..e230382727 100644 --- a/third_party/nixpkgs/pkgs/data/misc/cldr-annotations/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/cldr-annotations/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "cldr-annotations"; - version = "44.0"; + version = "45.0"; src = fetchzip { url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip"; stripRoot = false; - hash = "sha256-oK+NlzuRF45laEMJKhNDzr12RF4CHIfDFNBFsIjJh1I="; + hash = "sha256-8Id9thc3LWSw87aNpuSjQuLmFsx+XvXcz8Ox1Ua3sJw="; }; installPhase = '' @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Names and keywords for Unicode characters from the Common Locale Data Repository"; homepage = "https://cldr.unicode.org"; - license = licenses.unicode-dfs-2016; + license = licenses.unicode-30; platforms = platforms.all; maintainers = with maintainers; [ DeeUnderscore ]; }; diff --git a/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix b/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix index ca151c3b4d..9bf3cbdf4c 100644 --- a/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2024-04"; + version = "2024-05"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-tpiggDnhYPeLJ21mctXjbNSS2Gw4RI8gnpc1stDVmMc="; + hash = "sha256-MFhBCnYOJOVQl+xJ4wxi10nyb5MfRHnNVlba9LV1nsY="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index ede51924e0..1d8b772782 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "5bae847bf7e96ce10e824377f4cb7f02c51b7245", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/5bae847bf7e96ce10e824377f4cb7f02c51b7245.tar.gz", - "sha256": "1p45mapjca2d7r8ky27s0pn3sflp61iippcabsb85s49fi9sqlv2", - "msg": "Update from Hackage at 2024-04-09T20:48:09Z" + "commit": "9e419b038d7108160caf4efc41ebd5dfc4d51821", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/9e419b038d7108160caf4efc41ebd5dfc4d51821.tar.gz", + "sha256": "1vqsxznsq6s1hfb3b7ghs0fqa1rapqccjcz5jy3h9w3dq4v3gfqz", + "msg": "Update from Hackage at 2024-04-27T10:57:54Z" } diff --git a/third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 4113b35001..66e66e1852 100644 --- a/third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mobile broadband service provider database"; - homepage = "https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders"; + homepage = "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info"; license = licenses.publicDomain; maintainers = [ ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix b/third_party/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix index ae14a27c8b..580dfef90b 100644 --- a/third_party/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/unicode-emoji/default.nix @@ -5,7 +5,7 @@ }: let - version = "15.0"; + version = "15.1"; fetchData = { suffix, hash }: stdenvNoCC.mkDerivation { pname = "unicode-emoji-${suffix}"; @@ -32,15 +32,15 @@ let srcs = { emoji-sequences = fetchData { suffix = "sequences"; - hash = "sha256-XCIi2KQy2JagMaaML1SwT79HsPzi5phT8euKPpRetW0="; + hash = "sha256-63LJEV41BPu+HIYhthn4eUcaRszFbi9EVBe3wcrQUNE="; }; emoji-test = fetchData { suffix = "test"; - hash = "sha256-hEXyOsg4jglr4Z0CYuFPzv+Fb/Ugk/I1bciUhfGoU9s="; + hash = "sha256-2HbuJJqijqp2z6bfqnAoR6jROwYqpIjUZdA5XugTftk="; }; emoji-zwj-sequences = fetchData { suffix = "zwj-sequences"; - hash = "sha256-/jV/kRe3dGZ2Bjdl1YcTft+bJZA6eSvVSTW/CFZ5EYI="; + hash = "sha256-mnagPcrPzY+b/gjEnI2QtVGCuXfLzIemlOioGT77Dlc="; }; }; in diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix index fb73738345..c8ca0bc939 100644 --- a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -1,14 +1,14 @@ -{ stdenv, pkgsBuildBuild, fetchFromGitHub, lib }: +{ stdenv, pkgsBuildBuild, fetchFromGitHub, lib, nix-update-script }: let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20240410101316"; + version = "20240426060244"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-llj1z9fIzELeIIhyW6dmAl8Z/0DtZq3tkMrfwSJkZbE="; + hash = "sha256-DkZcqjYwXRNlRnfwbRZL6zlkYL9kig3cZ5H6LEzakeY="; }; vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY="; meta = with lib; { @@ -31,5 +31,8 @@ stdenv.mkDerivation { install -Dm644 dlc.dat $out/share/v2ray/geosite.dat runHook postInstall ''; - passthru.generator = generator; + passthru = { + inherit generator; + updateScript = nix-update-script { }; + }; } diff --git a/third_party/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix b/third_party/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix index 284e6f524d..fa2db6f822 100644 --- a/third_party/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "wireless-regdb"; - version = "2024.01.23"; + version = "2024.05.08"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-yKYcms92+n60I56J9kDe4+hwmNn2m001GMnGD8bSDFU="; + hash = "sha256-mu4dhuvrs2O3FL7JQbKCDzHjt/Gkhd3J/L2ZhcfT58Q="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix index b24f27f326..96cf66197f 100644 --- a/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix @@ -1,18 +1,18 @@ { lib , fetchFromGitHub -, nix-update-script +, unstableGitUpdater , stdenvNoCC , ... }: stdenvNoCC.mkDerivation (self: { - name = "alacritty-theme"; - version = "unstable-2024-03-06"; + pname = "alacritty-theme"; + version = "0-unstable-2024-05-03"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "cb786242b6f5e00a57e2f541e7bf1115f3950650"; - hash = "sha256-fZJ0F4zJy6HOwWtZGm5yN4WfeFNJnW/UJhoQSZ0Bpxk="; + rev = "94e1dc0b9511969a426208fbba24bd7448493785"; + hash = "sha256-bPup3AKFGVuUC8CzVhWJPKphHdx0GAc62GxWsUWQ7Xk="; }; dontConfigure = true; @@ -26,8 +26,8 @@ stdenvNoCC.mkDerivation (self: { runHook postInstall ''; - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; + passthru.updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix b/third_party/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix index 2e552290ff..bbe670f99e 100644 --- a/third_party/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix @@ -29,13 +29,13 @@ lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "catppuccin"; repo = "gtk"; rev = "v${version}"; - hash = "sha256-pGL8vaE63ss2ZT2FoNDfDkeuCxjcbl02RmwwfHC/Vxg="; + hash = "sha256-RFhahwiBTsjeRW71JkAveOHO70O6SbTZhUEvq8oMQ4Y="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix index ef69114c85..60849a407d 100644 --- a/third_party/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -22,13 +22,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "everforest" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-04-14"; + version = "2024-05-13"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-DQYnR2V86KbIJfAA4ObRtKQq1IuECie1qdOBYVu8NtA="; + hash = "sha256-24U1iMByy+cFQuLUWYPBSuvJwYzwS0rCr7L6OWyMUz0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/dracula-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/dracula-theme/default.nix index db1ef4da0b..d21264f4e0 100644 --- a/third_party/nixpkgs/pkgs/data/themes/dracula-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "unstable-2024-04-08"; + version = "4.0.0-unstable-2024-05-12"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "18350cafd8e9c775737f97fb5acf0890e29bc47a"; - hash = "sha256-uhcRV7E7GDjWjetUHcz/E/g36m/yYTg3c9WJo6gYTJA="; + rev = "98ad13fb6efbdcbf944b3c5507de01cf94338c0c"; + hash = "sha256-qF35jUvoDw3xMGGscET18sKqqQ0+oZJYNnSXbvy7ayM="; }; propagatedUserEnvPkgs = [ @@ -38,13 +38,15 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "Dracula variant of the Ant theme"; homepage = "https://github.com/dracula/gtk"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ alexarice msfjarvis ]; + maintainers = with maintainers; [ alexarice ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix b/third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix index 61ddd00abd..3cd6710e5b 100644 --- a/third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix @@ -7,25 +7,25 @@ let # make install will use dconf to find desktop background file uri. # consider adding an args to allow specify pictures manually. - # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L38 + # https://github.com/daniruiz/flat-remix-gnome/blob/20240503/Makefile#L38 fake-dconf = writeScriptBin "dconf" "echo -n"; in stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20231026"; + version = "20240503"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-sKQOq0GMslkzND2ayL5M6XIxJv8t0yj6XCP3poA6wRc="; + hash = "sha256-02hYxgq8Go++oYT8r86wA7HVXQJeUZ0JpwIu3VWfjQE="; }; nativeBuildInputs = [ glib fake-dconf ]; makeFlags = [ "PREFIX=$(out)" ]; # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L56 + # https://github.com/daniruiz/flat-remix-gnome/blob/20240503/Makefile#L56 preInstall = '' mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource diff --git a/third_party/nixpkgs/pkgs/data/themes/fluent-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/fluent-gtk-theme/default.nix index b6f3fdc092..9efa36aa88 100644 --- a/third_party/nixpkgs/pkgs/data/themes/fluent-gtk-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/fluent-gtk-theme/default.nix @@ -21,15 +21,15 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] col lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants lib.checkListOfEnum "${pname}: tweaks" [ "solid" "float" "round" "blur" "noborder" "square" ] tweaks -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { inherit pname; - version = "2023-06-20"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "vinceliuice"; - repo = pname; - rev = version; - hash = "sha256-hUXlzLdcWeOHEJx3+vCMpxvJst6Rr8ISvlzlsUgCrhg="; + repo = "fluent-gtk-theme"; + rev = finalAttrs.version; + hash = "sha256-0zf3fHtWcrbT26jgwgsPEDDhBWErOkgXyvGwSWV8rGs="; }; nativeBuildInputs = [ @@ -67,11 +67,11 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Fluent design gtk theme"; homepage = "https://github.com/vinceliuice/Fluent-gtk-theme"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ romildo ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix index ef453e7cbb..5fadc70d11 100644 --- a/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-12-31"; + version = "2024-04-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-tAby1nLRBdkVQy448BXloBw8oeYqN2aFEs0jahNI3jg="; + hash = "sha256-7P8dTPk0LwXU3e44TeechCNsxtzw+w01B56IWtCUcCI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/third_party/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index b70bc18d78..99c5f7fe3f 100644 --- a/third_party/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "kde-rounded-corners"; - version = "0.6.1"; + version = "0.6.5"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; rev = "v${version}"; - hash = "sha256-8QkuIuHC0/fMxh8K3/I8GNhNPX+tw7kUMiU2oK12c0U="; + hash = "sha256-g7gNFv4/ighfxYz/VXF5KvcoT6t4lT5soDLlV3oAKvc="; }; postConfigure = '' diff --git a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix index d19ed938bf..94408f6722 100644 --- a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "aliz" "azul" "sea" "pueril" "a stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-10-30"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "+sWYUCFp5J+fhPHxicwtsHCQkFTpKwjj9H3GAXqNaYo="; + sha256 = "trQwRZ/JKIS8TcRIg0eL5GmB/yymDwqqNued0ddRuqU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/material-kwin-decoration/default.nix b/third_party/nixpkgs/pkgs/data/themes/material-kwin-decoration/default.nix index ba81e1f629..85bf37cc78 100644 --- a/third_party/nixpkgs/pkgs/data/themes/material-kwin-decoration/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/material-kwin-decoration/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { pname = "material-kwin-decoration"; - version = "unstable-2023-01-15"; + version = "7-unstable-2023-01-15"; src = fetchFromGitHub { owner = "Zren"; @@ -47,7 +47,9 @@ mkDerivation rec { ]; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/themes/nixos-bgrt-plymouth/default.nix b/third_party/nixpkgs/pkgs/data/themes/nixos-bgrt-plymouth/default.nix index 0486aed864..b6b5be1add 100644 --- a/third_party/nixpkgs/pkgs/data/themes/nixos-bgrt-plymouth/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/nixos-bgrt-plymouth/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "nixos-bgrt-plymouth"; - version = "unstable-2023-03-10"; + version = "0-unstable-2023-03-10"; src = fetchFromGitHub { repo = "plymouth-theme-nixos-bgrt"; diff --git a/third_party/nixpkgs/pkgs/data/themes/onestepback/default.nix b/third_party/nixpkgs/pkgs/data/themes/onestepback/default.nix index c18d55db5b..ed0d0235fc 100644 --- a/third_party/nixpkgs/pkgs/data/themes/onestepback/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/onestepback/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "onestepback"; - version = "0.994"; + version = "0.997"; srcs = [ (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip"; - hash = "sha256-kjGiGo4bF1mWJPnaPv2lf7rGG/uAntHK61mH6lcJ6e4="; + url = "http://www.vide.memoire.free.fr/pages/onestepback/OneStepBack-v${version}.zip"; + hash = "sha256-uB6pfnTkMKeP71rAvn1olJJeCL84222UT5uxG72sywE="; }) (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-darker-v${version}.zip"; - hash = "sha256-AuurSa45uF5GbPqaMXKblWkv3YGkYL1z0VjWrbnsB/I="; + url = "http://www.vide.memoire.free.fr/pages/onestepback/OneStepBack-wm2-v${version}.zip"; + hash = "sha256-Zdv4ZrQPficbCxPBKF3RFNavlSn/VV/efiZVUT86zRc="; }) ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gtk theme inspired by the NextStep look"; - homepage = "http://www.vide.memoire.free.fr/perso/OneStepBack"; + homepage = "http://www.vide.memoire.free.fr/pages/onestepback"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.romildo ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix index 75bdf7b07a..e1dd0a2565 100644 --- a/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix @@ -26,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-04-18"; + version = "2024-05-01"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - hash = "sha256-Kvafbvw1q8F0+l47WshFHPfZEQhFXPPXuI0RjBJnP4s="; + hash = "sha256-xi4kYT566bQqQEY4CByTrpwMfC1uhzeIqpprpe59oIM="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/vimix/default.nix b/third_party/nixpkgs/pkgs/data/themes/vimix/default.nix index 1a49b5cff8..18a5b2c893 100644 --- a/third_party/nixpkgs/pkgs/data/themes/vimix/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/vimix/default.nix @@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "flat" "grey" "mix" "translucent" ] twe stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-09-09"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "dfdPEJnSmD0eqzx4ysiGPp77Beo32l2Tz1qSrbShLlc="; + sha256 = "RbAdoix+UWKiLB+04YiPa0UwzO1fFLy56IG1MipmE+E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix b/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix index 8c1651fff2..969641b487 100644 --- a/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix @@ -32,7 +32,7 @@ lib.checkListOfEnum "${pname}: alt variants" [ "normal" "alt" "all" ] altVariant lib.checkListOfEnum "${pname}: color variants" [ "Light" "Dark" ] colorVariants lib.checkListOfEnum "${pname}: opacity variants" [ "normal" "solid" ] opacityVariants lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants -lib.checkListOfEnum "${pname}: Activities icon variants" [ "standard" "simple" "gnome" "ubuntu" "tux" "arch" "manjaro" "fedora" "debian" "void" "opensuse" "popos" "mxlinux" "zorin" ] (single iconVariant) +lib.checkListOfEnum "${pname}: Activities icon variants" [ "standard" "simple" "gnome" "ubuntu" "tux" "arch" "manjaro" "fedora" "debian" "void" "opensuse" "popos" "mxlinux" "zorin" "budgie" "gentoo" ] (single iconVariant) lib.checkListOfEnum "${pname}: nautilus style" [ "stable" "normal" "mojave" "glassy" ] (single nautilusStyle) lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize) lib.checkListOfEnum "${pname}: panel opacity" [ "default" "30" "45" "60" "75" ] (single panelOpacity) @@ -40,13 +40,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2024-02-26"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-9HYsORTd5n0jUYmwiObPZ90mOGhR2j+tzs6Y1NNnrn4="; + sha256 = "sha256-NgmFQtgVJvVXJjZUXt/BIx1hdzjHfVmmwXUCDZZD7+g="; }; nativeBuildInputs = [ @@ -103,11 +103,11 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "MacOS BigSur like Gtk+ theme based on Elegant Design"; homepage = "https://github.com/vinceliuice/WhiteSur-gtk-theme"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ romildo ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix index 4810bfd55e..d22064014e 100644 --- a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "23.10.0"; + version = "24.04.2"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - hash = "sha256-+Szk77QeoM4PwusxKflTh83h16qz6Es6UwDXpbydJUE="; + hash = "sha256-nvNJ0ppx3oete+CsklJtpDOLyUA0Oj/oUmcLjsR54MU="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; diff --git a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-control-center/default.nix index aea55e6625..25b8b66f60 100644 --- a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -52,7 +52,7 @@ , udisks2 , upower , webp-pixbuf-loader -, wrapGAppsHook +, wrapGAppsHook3 , enableSshSocket ? false }: @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config shared-mime-info - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop-view/default.nix b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop-view/default.nix index a1869cfa91..b7be5ff42c 100644 --- a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop-view/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop-view/default.nix @@ -9,7 +9,7 @@ , ninja , pkg-config , vala -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop/default.nix index 50068621be..0a15124121 100644 --- a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -33,7 +33,7 @@ , upower , vala , xfce -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop/wrapper.nix b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop/wrapper.nix index 99b33b68cb..d25643e660 100644 --- a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop/wrapper.nix +++ b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop/wrapper.nix @@ -2,7 +2,7 @@ , stdenv , glib , xorg -, wrapGAppsHook +, wrapGAppsHook3 , budgie-desktop , plugins ? [ ] }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ glib - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = lib.forEach plugins (plugin: plugin.buildInputs) ++ plugins; diff --git a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix index d853a584a7..a9f4274508 100644 --- a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix @@ -31,9 +31,6 @@ let document-font-name="Noto Sans 10" monospace-font-name="Hack 10" - [org.gnome.desktop.peripherals.touchpad:Budgie] - tap-to-click=true - [org.gnome.desktop.wm.preferences:Budgie] titlebar-font="Noto Sans Bold 10" diff --git a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-screensaver/default.nix b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-screensaver/default.nix index 68c253a2a1..d0c4964a04 100644 --- a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-screensaver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-screensaver/default.nix @@ -13,7 +13,7 @@ , ninja , pkg-config , systemd -, wrapGAppsHook +, wrapGAppsHook3 , xorg }: @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/budgie/magpie/default.nix b/third_party/nixpkgs/pkgs/desktops/budgie/magpie/default.nix index f900e82a9c..5f42b1986c 100644 --- a/third_party/nixpkgs/pkgs/desktops/budgie/magpie/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/budgie/magpie/default.nix @@ -35,7 +35,7 @@ , meson , xorgserver , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gi-docgen , sysprof , libsysprof-capture @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { xvfb-run pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 gi-docgen xorgserver ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/bulky/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/bulky/default.nix index 21cd436019..c3927ece25 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/bulky/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/bulky/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , python3 , gobject-introspection , gsettings-desktop-schemas @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gsettings-desktop-schemas gettext gobject-introspection diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 9577399807..957af30624 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -9,6 +9,7 @@ , cjs , evolution-data-server , fetchFromGitHub +, fetchpatch , gdk-pixbuf , gettext , libgnomekbd @@ -29,7 +30,7 @@ , polkit , lib , stdenv -, wrapGAppsHook +, wrapGAppsHook3 , libxml2 , gtk-doc , gnome @@ -83,6 +84,13 @@ stdenv.mkDerivation rec { patches = [ ./use-sane-install-dir.patch ./libdir.patch + + # Switch to GNOME Online Accounts GTK + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon/commit/d22f889c376734f0ca5d904885c2772e790fbadc.patch"; + includes = [ "files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py" ]; + hash = "sha256-xutJqxtzk3/BUQGZY/tnBkRyAfZZY7AckaGC6b7Sfn8="; + }) ]; buildInputs = [ @@ -132,7 +140,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - wrapGAppsHook + wrapGAppsHook3 intltool gtk-doc perl @@ -140,13 +148,6 @@ stdenv.mkDerivation rec { pkg-config ]; - # Use locales from cinnamon-translations. - # FIXME: Upstream does not respect localedir option from Meson currently. - # https://github.com/linuxmint/cinnamon/pull/11244#issuecomment-1305855783 - postInstall = '' - ln -s ${cinnamon-translations}/share/locale $out/share/locale - ''; - postPatch = '' find . -type f -exec sed -i \ -e s,/usr/share/cinnamon,$out/share/cinnamon,g \ @@ -173,6 +174,22 @@ stdenv.mkDerivation rec { patchShebangs src/data-to-c.pl ''; + postInstall = '' + # Use locales from cinnamon-translations. + ln -s ${cinnamon-translations}/share/locale $out/share/locale + + # Do not install online accounts module, with a -Donlineaccounts=false c-c-c + # this just shows an empty page. + rm -f $out/share/cinnamon/cinnamon-settings/modules/cs_online_accounts.py + + # g-o-a-gtk already provides its own desktop item. + rm -f $out/share/applications/cinnamon-settings-online-accounts.desktop + + # Actually removes Adwaita and HighContrast from Cinnamon styles with mint-artwork 1.8.2. + # https://github.com/linuxmint/cinnamon/commit/13b1ad104e88197f6c4e2d02ab2674c07254b8e8 + rm -r $out/share/cinnamon/styles.d + ''; + preFixup = '' # https://github.com/NixOS/nixpkgs/issues/101881 gappsWrapperArgs+=( diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index e0aee4bde6..c09bf55a3e 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -9,7 +9,6 @@ , gtk3 , libnotify , libxml2 -, gnome-online-accounts , colord , polkit , libxkbfile @@ -20,7 +19,7 @@ , libgudev , libwacom , gnome -, wrapGAppsHook +, wrapGAppsHook3 , tzdata , glibc , libnma @@ -59,7 +58,6 @@ stdenv.mkDerivation rec { colord libgudev libwacom - gnome-online-accounts tzdata networkmanager libnma @@ -85,13 +83,15 @@ stdenv.mkDerivation rec { mesonFlags = [ # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" + # https://github.com/linuxmint/cinnamon-control-center/issues/326 + "-Donlineaccounts=false" ]; nativeBuildInputs = [ pkg-config meson ninja - wrapGAppsHook + wrapGAppsHook3 gettext python3 ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 0f53fbbb65..830abafa28 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -13,7 +13,7 @@ , systemd , xkeyboard_config , xorg -, wrapGAppsHook +, wrapGAppsHook3 , glib }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meson ninja python3 - wrapGAppsHook + wrapGAppsHook3 intltool pkg-config gobject-introspection diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 754a5c43a1..6934955911 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -6,7 +6,7 @@ , pkg-config , lib , stdenv -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - wrapGAppsHook + wrapGAppsHook3 pkg-config gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 98d1a4f39c..6ed8c0247b 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -15,7 +15,7 @@ , libgnomekbd , gnome , libtool -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , python3 , pam @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 gettext intltool dbus # for meson.build diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 66044ccefc..bb8a4f192c 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -16,7 +16,7 @@ , lib , stdenv , systemd -, wrapGAppsHook +, wrapGAppsHook3 , xapp , xorg , libexecinfo @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - wrapGAppsHook + wrapGAppsHook3 libexecinfo python3 pkg-config diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 65828b3da6..1c948d6224 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -10,7 +10,7 @@ , libgnomekbd , libnotify , libxklavier -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , lib , stdenv @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - wrapGAppsHook + wrapGAppsHook3 pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix index 7641272b0e..ef2c6ec4fa 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.8.0"; + version = "1.8.2"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20240122135036/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20240505123538/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" ]; - hash = "sha256-eCrch5IQdTd92DIqdjZFzvE4oShv3HuXfrLLUmLb0Ms="; + hash = "sha256-MegMFrnU8Gcc2v5y3BQCIZS31JdpfSM5FIJJNcyt4LY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-l-icons/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-l-icons/default.nix index d4ace1290c..1fa0dd7424 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-l-icons/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-l-icons/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-icons"; - version = "1.6.7"; + version = "1.7.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-4fBqdJq/JG9SZOLRxv/wXYG9g4wWGkvGwkWzUTDDjXY="; + hash = "sha256-nVdx+d+KpTh9EPLhW0+FFzq3OEyacDSxHgllMm51BKk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-x-icons/default.nix index 595fca6612..50819783db 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-x-icons"; - version = "1.6.5"; + version = "1.6.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Z07475Uiv4GKCOrKhDBXPZVBGpxdjN7vn2y0rRAZVm0="; + hash = "sha256-cxBZsAcGgoIY9KhjR/BWnMcttrywN6qap4lu5b2hauo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix index 4742e7af83..3ac2792546 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.7.2"; + version = "1.7.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-8dwJyvM5sQNtUzhreBCgSWeElGlp/z3Dk7/xCeUSGKU="; + hash = "sha256-ZStRvT0qP8W1RCSJoXZHMrECp6k8dh/18UvgmV87oNQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix index f00a92ddc6..fa054f1eae 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix @@ -33,7 +33,7 @@ , udev , wayland , wayland-protocols -, wrapGAppsHook +, wrapGAppsHook3 , xorgserver , xwayland }: @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 xorgserver # for cvt command gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix index fe61e9701d..482c9b6b41 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix @@ -7,7 +7,7 @@ , pkg-config , lib , stdenv -, wrapGAppsHook +, wrapGAppsHook3 , libxml2 , gtk3 , gvfs @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meson pkg-config ninja - wrapGAppsHook + wrapGAppsHook3 intltool shared-mime-info gobject-introspection diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/pix/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/pix/default.nix index 1264ca82fc..45b8da1760 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/pix/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/pix/default.nix @@ -20,7 +20,7 @@ , bison , flex , clutter-gtk -, wrapGAppsHook +, wrapGAppsHook3 , shared-mime-info , python3 , desktop-file-utils @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix index 69a5aadb6c..6f9a7e5a24 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix @@ -8,7 +8,7 @@ , gtk3 , gdk-pixbuf , xapp -, wrapGAppsHook +, wrapGAppsHook3 , gettext , polkit , glib @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meson ninja gobject-introspection - wrapGAppsHook + wrapGAppsHook3 gettext polkit # for its gettext ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/xapp/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/xapp/default.nix index 5c691cd409..14b706fbd4 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/xapp/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/xapp/default.nix @@ -13,7 +13,7 @@ , lib , stdenv , vala -, wrapGAppsHook +, wrapGAppsHook3 , inxi , mate , dbus @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix index c64f57ec3c..05a4aedfb6 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix @@ -6,7 +6,7 @@ , intltool , shared-mime-info , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , libarchive , libxml2 , xapp @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ shared-mime-info - wrapGAppsHook + wrapGAppsHook3 meson ninja pkg-config diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix index 47e4e331da..e0ff80b74f 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix @@ -20,7 +20,7 @@ , ninja , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook3 , xapp , yelp-tools }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 yelp-tools ]; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix index cbfbb34f33..ffb94b9b52 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix @@ -6,7 +6,7 @@ , qttools , doxygen , wrapQtAppsHook -, wrapGAppsHook +, wrapGAppsHook3 , dtkwidget , qt5integration , qt5platform-plugins @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { qttools doxygen wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-dock/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-dock/default.nix index 9c827e96a7..275d8e5894 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-dock/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-dock/default.nix @@ -7,7 +7,7 @@ , qttools , pkg-config , wrapQtAppsHook -, wrapGAppsHook +, wrapGAppsHook3 , qtbase , dtkwidget , qt5integration @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { qttools pkg-config wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/default.nix index 552fa748d5..42d371628b 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-file-manager/default.nix @@ -23,7 +23,7 @@ , polkit-qt , polkit , wrapQtAppsHook -, wrapGAppsHook +, wrapGAppsHook3 , lucenepp , boost , taglib @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { qttools pkg-config wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session-shell/default.nix index b30840f74f..cfaa12338e 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-session-shell/default.nix @@ -6,7 +6,7 @@ , pkg-config , qttools , wrapQtAppsHook -, wrapGAppsHook +, wrapGAppsHook3 , qtbase , dtkwidget , qt5integration @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { pkg-config qttools wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix index 2edf1359be..4b2dc27c11 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix @@ -23,6 +23,11 @@ let image-editor = callPackage ./library/image-editor { }; udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; util-dfm = callPackage ./library/util-dfm { }; + dtk6core = callPackage ./library/dtk6core { }; + dtk6gui = callPackage ./library/dtk6gui { }; + dtk6widget = callPackage ./library/dtk6widget { }; + dtk6declarative = callPackage ./library/dtk6declarative { }; + dtk6systemsettings = callPackage ./library/dtk6systemsettings { }; #### CORE deepin-kwin = callPackage ./core/deepin-kwin { }; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-api/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-api/default.nix index d86c369763..2c7c6276cf 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-api/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-api/default.nix @@ -5,7 +5,7 @@ , pkg-config , deepin-gettext-tools , wrapQtAppsHook -, wrapGAppsHook +, wrapGAppsHook3 , alsa-lib , gtk3 , libcanberra @@ -57,7 +57,7 @@ buildGoModule rec { pkg-config deepin-gettext-tools wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index b79f1fe472..4a63b779c4 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -7,7 +7,7 @@ , deepin-gettext-tools , gettext , python3 -, wrapGAppsHook +, wrapGAppsHook3 , ddcutil , alsa-lib , glib @@ -95,7 +95,7 @@ buildGoModule rec { deepin-gettext-tools gettext python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/startdde/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/startdde/default.nix index 2408410b2f..63ebea8f08 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/startdde/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/startdde/default.nix @@ -5,7 +5,7 @@ , gettext , pkg-config , jq -, wrapGAppsHook +, wrapGAppsHook3 , glib , libgnome-keyring , gtk3 @@ -47,7 +47,7 @@ buildGoModule rec { gettext pkg-config jq - wrapGAppsHook + wrapGAppsHook3 glib ]; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix new file mode 100644 index 0000000000..d86bebdea1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, doxygen +, qt6Packages +, lshw +, libuchardet +, spdlog +, dtkcommon +, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dtk6core"; + version = "6.0.15"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dtk6core"; + rev = finalAttrs.version; + hash = "sha256-zUJFilafR0hNH/Owmuyh6BLBFPbBuFKcHv40fena0GM="; + }; + + patches = [ + ./fix-pkgconfig-path.patch + ./fix-pri-path.patch + ]; + + nativeBuildInputs = [ + cmake + pkg-config + doxygen + qt6Packages.qttools + qt6Packages.wrapQtAppsHook + ]; + + dontWrapQtApps = true; + + buildInputs = [ + qt6Packages.qtbase + lshw + libuchardet + spdlog + ] + ++ lib.optional withSystemd systemd; + + propagatedBuildInputs = [ dtkcommon ]; + + cmakeFlags = [ + "-DDTK_VERSION=${finalAttrs.version}" + "-DBUILD_DOCS=ON" + "-DBUILD_EXAMPLES=OFF" + "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" + "-DDSG_PREFIX_PATH='/run/current-system/sw'" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata" + "-DBUILD_WITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}" + ]; + + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} + ''; + + outputs = [ "out" "dev" "doc" ]; + + postFixup = '' + for binary in $out/libexec/dtk6/DCore/bin/*; do + wrapQtApp $binary + done + ''; + + meta = { + description = "Deepin tool kit core library"; + homepage = "https://github.com/linuxdeepin/dtk6core"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +}) diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch new file mode 100644 index 0000000000..570e34c061 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch @@ -0,0 +1,14 @@ +diff --git a/misc/dtkcore.pc.in b/misc/dtkcore.pc.in +index 83eecb7..da24ce8 100644 +--- a/misc/dtkcore.pc.in ++++ b/misc/dtkcore.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@LIBRARY_INSTALL_DIR@ +-includedir=${prefix}/@INCLUDE_INSTALL_DIR@ ++libdir=@LIBRARY_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ + + Name: dtk@DTK_VERSION_MAJOR@core + Description: Deepin Tool Kit dtkcore header files diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch new file mode 100644 index 0000000000..19953ed173 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch @@ -0,0 +1,17 @@ +diff --git a/misc/qt_lib_dtkcore.pri.in b/misc/qt_lib_dtkcore.pri.in +index a331f52..ce01dc0 100644 +--- a/misc/qt_lib_dtkcore.pri.in ++++ b/misc/qt_lib_dtkcore.pri.in +@@ -4,9 +4,9 @@ QT.dtkcore.MINOR_VERSION = @PROJECT_VERSION_MINOR@ + QT.dtkcore.PATCH_VERSION = @PROJECT_VERSION_PATCH@ + QT.dtkcore.name = dtkcore + QT.dtkcore.module = dtk@DTK_VERSION_MAJOR@core +-QT.dtkcore.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ +-QT.dtkcore.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ +-QT.dtkcore.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ ++QT.dtkcore.tools = @TOOL_INSTALL_DIR@ ++QT.dtkcore.libs = @LIBRARY_INSTALL_DIR@ ++QT.dtkcore.includes = @INCLUDE_INSTALL_DIR@ + QT.dtkcore.frameworks = + QT.dtkcore.depends = core dbus xml + QT.dtkcore.module_config = v2 ltcg diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix new file mode 100644 index 0000000000..ecafebf66b --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, doxygen +, qt6Packages +, dtk6gui +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dtk6declarative"; + version = "6.0.15"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dtk6declarative"; + rev = finalAttrs.version; + hash = "sha256-euHEfK2N2jtWMzeajgvTnHSl39zXwp7I0cQIqZRVGZ0="; + }; + + patches = [ + ./fix-pkgconfig-path.patch + ./fix-pri-path.patch + ]; + + nativeBuildInputs = [ + cmake + pkg-config + doxygen + qt6Packages.qttools + qt6Packages.wrapQtAppsHook + ]; + + propagatedBuildInputs = [ + dtk6gui + ] ++ (with qt6Packages ; [ + qtbase + qtdeclarative + qtshadertools + qt5compat + ]); + + cmakeFlags = [ + "-DDTK_VERSION=${finalAttrs.version}" + "-DBUILD_DOCS=ON" + "-DBUILD_EXAMPLES=ON" + "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" + "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" + "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" + ]; + + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} + export QML2_IMPORT_PATH=${lib.getBin qt6Packages.qtdeclarative}/${qt6Packages.qtbase.qtQmlPrefix} + ''; + + outputs = [ "out" "dev" "doc" ]; + + meta = { + description = "A widget development toolkit based on QtQuick/QtQml"; + mainProgram = "dtk-exhibition"; + homepage = "https://github.com/linuxdeepin/dtk6declarative"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +}) diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch new file mode 100644 index 0000000000..e15ee2f7a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch @@ -0,0 +1,14 @@ +diff --git a/misc/dtkdeclarative.pc.in b/misc/dtkdeclarative.pc.in +index dc3827f..fd0949e 100644 +--- a/misc/dtkdeclarative.pc.in ++++ b/misc/dtkdeclarative.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@LIB_INSTALL_DIR@ +-includedir=${prefix}/@INCLUDE_INSTALL_DIR@ ++libdir=@LIB_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ + + Name: DtkDeclarative + Description: Deepin Tool Kit DtkDeclarative header files diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch new file mode 100644 index 0000000000..e622809c39 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch @@ -0,0 +1,15 @@ +diff --git a/misc/qt_lib_dtkdeclarative.pri.in b/misc/qt_lib_dtkdeclarative.pri.in +index 8797802..44e32a3 100644 +--- a/misc/qt_lib_dtkdeclarative.pri.in ++++ b/misc/qt_lib_dtkdeclarative.pri.in +@@ -4,8 +4,8 @@ QT.dtkdeclarative.MINOR_VERSION = @PROJECT_VERSION_MINOR@ + QT.dtkdeclarative.PATCH_VERSION = @PROJECT_VERSION_PATCH@ + QT.dtkdeclarative.name = dtkdeclarative + QT.dtkdeclarative.module = dtk@DTK_VERSION_MAJOR@declarative +-QT.dtkdeclarative.libs = @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@ +-QT.dtkdeclarative.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ ++QT.dtkdeclarative.libs = @LIB_INSTALL_DIR@ ++QT.dtkdeclarative.includes = @INCLUDE_INSTALL_DIR@ + QT.dtkdeclarative.frameworks = + QT.dtkdeclarative.depends = core dbus xml gui dtkcore dtkgui quick quick_private + QT.dtkdeclarative.module_config = v2 ltcg diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix new file mode 100644 index 0000000000..73638c39e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, doxygen +, qt6Packages +, dtk6core +, librsvg +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dtk6gui"; + version = "6.0.15"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dtk6gui"; + rev = finalAttrs.version; + hash = "sha256-B/A3VXPCon+NIUhO+IVGoojACVjut2h0nH5pLdJYufw="; + }; + + patches = [ + ./fix-pkgconfig-path.patch + ./fix-pri-path.patch + ]; + + nativeBuildInputs = [ + cmake + pkg-config + doxygen + qt6Packages.qttools + qt6Packages.wrapQtAppsHook + ]; + + buildInputs = [ + qt6Packages.qtbase + librsvg + ]; + + propagatedBuildInputs = [ + dtk6core + qt6Packages.qtimageformats + ]; + + cmakeFlags = [ + "-DDTK_VERSION=${finalAttrs.version}" + "-DBUILD_DOCS=ON" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" + ]; + + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} + ''; + + outputs = [ "out" "dev" "doc" ]; + + postFixup = '' + for binary in $out/libexec/dtk6/DGui/bin/*; do + wrapQtApp $binary + done + ''; + + meta = { + description = "Deepin Toolkit, gui module for DDE look and feel"; + homepage = "https://github.com/linuxdeepin/dtk6gui"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +}) diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch new file mode 100644 index 0000000000..1485baccc2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch @@ -0,0 +1,16 @@ +diff --git a/misc/dtkgui.pc.in b/misc/dtkgui.pc.in +index 89fdbbf..ad817c4 100644 +--- a/misc/dtkgui.pc.in ++++ b/misc/dtkgui.pc.in +@@ -1,8 +1,8 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@LIBRARY_INSTALL_DIR@ +-includedir=${prefix}/@INCLUDE_INSTALL_DIR@ +-tooldir=${prefix}/@PACKAGE_TOOL_INSTALL_DIR@ ++libdir=@LIBRARY_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ ++tooldir=@PACKAGE_TOOL_INSTALL_DIR@ + + Name: dtk@DTK_VERSION_MAJOR@gui + Description: Deepin Tool Kit dtkgui header files diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch new file mode 100644 index 0000000000..b746d34b1c --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch @@ -0,0 +1,17 @@ +diff --git a/misc/qt_lib_dtkgui.pri.in b/misc/qt_lib_dtkgui.pri.in +index 28308ee..9fb25e6 100644 +--- a/misc/qt_lib_dtkgui.pri.in ++++ b/misc/qt_lib_dtkgui.pri.in +@@ -4,9 +4,9 @@ QT.dtkgui.MINOR_VERSION = @PROJECT_VERSION_MINOR@ + QT.dtkgui.PATCH_VERSION = @PROJECT_VERSION_PATCH@ + QT.dtkgui.name = dtkgui + QT.dtkgui.module = dtk@DTK_VERSION_MAJOR@gui +-QT.dtkgui.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ +-QT.dtkgui.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ +-QT.dtkgui.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ ++QT.dtkgui.tools = @TOOL_INSTALL_DIR@ ++QT.dtkgui.libs = @LIBRARY_INSTALL_DIR@ ++QT.dtkgui.includes = @INCLUDE_INSTALL_DIR@ + QT.dtkgui.frameworks = + QT.dtkgui.depends = core gui dtkcore gui_private dbus network + QT.dtkgui.module_config = v2 internal_module ltcg diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix new file mode 100644 index 0000000000..d9f400ce97 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, doxygen +, qt6Packages +, dtk6core +, libxcrypt +}: + +stdenv.mkDerivation rec { + pname = "dtk6systemsettings"; + version = "6.0.2"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + hash = "sha256-b/iI2OKQQoFj3vWatfGdDP9z+SEsK5XBra9KqjlGzqs="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + doxygen + qt6Packages.qttools + ]; + + dontWrapQtApps = true; + + buildInputs = [ + qt6Packages.qtbase + dtk6core + libxcrypt + ]; + + cmakeFlags = [ + "-DDTK_VERSION=${version}" + "-DBUILD_DOCS=ON" + "-DBUILD_EXAMPLES=OFF" + "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DDTK_INCLUDE_INSTALL_DIR=${placeholder "dev"}/include/dtk/DSystemSettings" + ]; + + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} + ''; + + outputs = [ "out" "dev" "doc" ]; + + meta = { + description = "Qt-based development library for system settings"; + homepage = "https://github.com/linuxdeepin/dtk6systemsettings"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix new file mode 100644 index 0000000000..3c18705819 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/default.nix @@ -0,0 +1,83 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, doxygen +, qt6Packages +, dtk6gui +, cups +, libstartup_notification +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dtk6widget"; + version = "6.0.15"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dtk6widget"; + rev = finalAttrs.version; + hash = "sha256-QCdRjkD4JTPecLeZK+Y5U/H9pBgKI4DHRuchz/GymWQ="; + }; + + patches = [ + ./fix-pkgconfig-path.patch + ./fix-pri-path.patch + ./fix-build-on-qt-6_7.patch + ]; + + postPatch = '' + substituteInPlace src/widgets/dapplication.cpp \ + --replace-fail "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \ + "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";" + ''; + + nativeBuildInputs = [ + cmake + doxygen + pkg-config + qt6Packages.qttools + qt6Packages.wrapQtAppsHook + ]; + + buildInputs = [ + cups + libstartup_notification + ] ++ (with qt6Packages; [ + qtbase + qtmultimedia + qtsvg + ]); + + propagatedBuildInputs = [ dtk6gui ]; + + cmakeFlags = [ + "-DDTK_VERSION=${finalAttrs.version}" + "-DBUILD_DOCS=ON" + "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" + "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" + ]; + + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} + ''; + + outputs = [ "out" "dev" "doc" ]; + + postFixup = '' + for binary in $out/lib/dtk6/DWidget/bin/*; do + wrapQtApp $binary + done + ''; + + meta = { + description = "Deepin graphical user interface library"; + homepage = "https://github.com/linuxdeepin/dtk6widget"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +}) diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch new file mode 100644 index 0000000000..16d2d2ec9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch @@ -0,0 +1,20 @@ +diff --git a/src/widgets/dkeysequenceedit.cpp b/src/widgets/dkeysequenceedit.cpp +index a99e17ae..0e1c57f6 100644 +--- a/src/widgets/dkeysequenceedit.cpp ++++ b/src/widgets/dkeysequenceedit.cpp +@@ -276,13 +276,13 @@ void DKeySequenceEdit::keyPressEvent(QKeyEvent *e) + } + + if (e->modifiers() & Qt::ShiftModifier) { +- QList possibleKeys = QKeyMapper::possibleKeys(e); ++ auto possibleKeys = QKeyMapper::possibleKeys(e); + int pkTotal = possibleKeys.count(); + if (!pkTotal) + return; + bool found = false; + for (int i = 0; i < possibleKeys.size(); ++i) { +- if (possibleKeys.at(i) - nextKey == int(e->modifiers()) ++ if (static_cast(possibleKeys.at(i)) - nextKey == static_cast(e->modifiers()) + || (possibleKeys.at(i) == nextKey && e->modifiers() == Qt::ShiftModifier)) { + nextKey = possibleKeys.at(i); + found = true; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch new file mode 100644 index 0000000000..df44522595 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch @@ -0,0 +1,14 @@ +diff --git a/misc/DtkWidget.pc.in b/misc/DtkWidget.pc.in +index 3c610669..b6ed04ca 100644 +--- a/misc/DtkWidget.pc.in ++++ b/misc/DtkWidget.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@LIBRARY_INSTALL_DIR@ +-includedir=${prefix}/@INCLUDE_INSTALL_DIR@ ++libdir=@LIBRARY_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ + + Name: dtk@DTK_VERSION_MAJOR@widget + Description: Deepin Tool Kit dtkwidget header files diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch new file mode 100644 index 0000000000..cf2faac948 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch @@ -0,0 +1,17 @@ +diff --git a/misc/qt_lib_DtkWidget.pri.in b/misc/qt_lib_DtkWidget.pri.in +index 623878d3..561f5186 100644 +--- a/misc/qt_lib_DtkWidget.pri.in ++++ b/misc/qt_lib_DtkWidget.pri.in +@@ -4,9 +4,9 @@ QT.dtkwidget.MINOR_VERSION = @PROJECT_VERSION_MINOR@ + QT.dtkwidget.PATCH_VERSION = @PROJECT_VERSION_PATCH@ + QT.dtkwidget.name = dtkwidget + QT.dtkwidget.module = dtk@DTK_VERSION_MAJOR@widget +-QT.dtkwidget.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ +-QT.dtkwidget.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ +-QT.dtkwidget.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ ++QT.dtkwidget.tools = @TOOL_INSTALL_DIR@ ++QT.dtkwidget.libs = @LIBRARY_INSTALL_DIR@ ++QT.dtkwidget.includes = @INCLUDE_INSTALL_DIR@ + QT.dtkwidget.frameworks = + QT.dtkwidget.depends = core gui dtkcore network concurrent dtkgui printsupport printsupport_private widgets widgets_private gui_private x11extras dbus + QT.dtkwidget.module_config = v2 internal_module ltcg diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/rage/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/rage/default.nix index 2ed7384ca0..afe70fd9e3 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/rage/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/rage/default.nix @@ -6,7 +6,7 @@ , pkg-config , efl , gst_all_1 -, wrapGAppsHook +, wrapGAppsHook3 , directoryListingUpdater }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix index e486a3b283..b8f5d15346 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix @@ -3,7 +3,7 @@ , pkg-config , gnome , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , itstool , libxml2 @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { libxml2 pkg-config dbus - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -68,7 +68,7 @@ python3.pkgs.buildPythonApplication rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Accerciser"; + homepage = "https://gitlab.gnome.org/GNOME/accerciser"; description = "Interactive Python accessibility explorer"; mainProgram = "accerciser"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix index ce5d841c9d..9dd578438c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix @@ -2,7 +2,7 @@ , stdenv , gettext , fetchurl -, wrapGAppsHook +, wrapGAppsHook3 , gnome-video-effects , libcanberra-gtk3 , pkg-config @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 glib # for glib-compile-schemas ]; @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Cheese"; + homepage = "https://gitlab.gnome.org/GNOME/cheese"; description = "Take photos and videos with your webcam, with fun graphical effects"; mainProgram = "cheese"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix index 650a2a2d2b..27c189af64 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -11,25 +11,26 @@ , ninja , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook4 , cpio , glib , gnome -, gtk3 +, gtk4 +, libadwaita , libhandy , json-glib , libarchive -, libportal-gtk3 +, libportal-gtk4 , nautilus }: stdenv.mkDerivation (finalAttrs: { pname = "file-roller"; - version = "43.1"; + version = "44.2"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz"; - sha256 = "hJlAI5lyk76zRdl5Pbj18Lu0H6oVXG/7SDKPIDlXrQg="; + hash = "sha256-LFcXzn8F+6sTyEe2zjGxsCSIYfp6uPD/Hx4dRdHizfk="; }; nativeBuildInputs = [ @@ -42,17 +43,18 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ cpio glib - gtk3 + gtk4 + libadwaita libhandy json-glib libarchive - libportal-gtk3 + libportal-gtk4 nautilus ]; @@ -68,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/FileRoller"; + homepage = "https://gitlab.gnome.org/GNOME/file-roller"; description = "Archive manager for the GNOME desktop environment"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix index b2abd36af2..f58ca108e9 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "45.1"; + version = "46.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+ysII80WJJ7b6u6DAvm9UAXgFQNos18eR8JmgMrKwvo="; + hash = "sha256-ocRvMCDLNYuDIwJds6U5yX2ZSkxG9wH0jtxjV/f7y9E="; }; nativeBuildInputs = [ @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Ghex"; + homepage = "https://gitlab.gnome.org/GNOME/ghex"; description = "Hex editor for GNOME desktop environment"; mainProgram = "ghex"; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 24b889fb58..2ef940122a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -3,7 +3,7 @@ , fetchurl , meson , ninja -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , gettext , itstool @@ -14,7 +14,6 @@ , gtk3 , libvirt , spice-gtk -, appstream-glib , spice-protocol , libhandy , libsoup_3 @@ -44,15 +43,16 @@ , vte , glib-networking , qemu-utils +, libportal-gtk3 }: stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "45.0"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "zGMIDu+hR6hHKrGl/wh7l6J6tyOk7gBe1B6Mndd5jkE="; + hash = "sha256-kAwXf2diZANwpmNM+efTzYIH5Jg2eopmemtzGwQRYDY="; }; patches = [ @@ -64,7 +64,6 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ - appstream-glib # for appstream-util gettext gobject-introspection itstool @@ -72,7 +71,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 # For post install script glib gtk3 @@ -114,6 +113,7 @@ stdenv.mkDerivation rec { vte webkitgtk_4_1 yajl + libportal-gtk3 ]; preFixup = '' @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple GNOME 3 application to access remote or virtual systems"; mainProgram = "gnome-boxes"; - homepage = "https://wiki.gnome.org/Apps/Boxes"; + homepage = "https://apps.gnome.org/Boxes/"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index 78829cfd74..d56c8114bd 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "45.1"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "f6hQdUOGWqdDK7UxmDDIcVi1RHygnMpFtgfcZ5bHEAg="; + hash = "sha256-mGH/e4q9W3sgaQulXrdULH7FNLVmJp4ptbHoWMFhCJc="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Calendar"; + homepage = "https://apps.gnome.org/Calendar/"; description = "Simple and beautiful calendar application for GNOME"; mainProgram = "gnome-calendar"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 570bdccafd..9a6676ad4c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "P9VPzBTSkbd//xLe7/8A2jg+CmQAr1B9FgX7y0m4x0E="; + hash = "sha256-pOjixRC/SCBLmZSk581TeEQkbnTIqYb52+BOIj9dgnw="; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Characters"; + homepage = "https://apps.gnome.org/Characters/"; description = "Simple utility application to find and insert unusual characters"; mainProgram = "gnome-characters"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 3e719ef122..5bdbe12f70 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "/I60/ZUw8eZB3ADuIIbufTVKegCwoNFyLjBdXJqrkbU="; + hash = "sha256-6qPFeM3O+XVOZotWJnCbc/NSZxAjX0tyB20v9JpPmcc="; }; nativeBuildInputs = [ @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Clocks"; + homepage = "https://apps.gnome.org/Clocks/"; description = "Clock application designed for GNOME 3"; mainProgram = "gnome-clocks"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix index 933c80a9ff..bd501c1be9 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -7,9 +7,8 @@ , vala , gettext , itstool -, appstream-glib , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtk3 , libhandy @@ -22,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-ufq1JbkKPifRE8FvuGjCucR7+BSTENFNuGLqGRLAb7g="; + hash = "sha256-+xzqaOeTC73B2yi3zQqaN80xDUtOeHL+gU9QoWqNJdM="; }; nativeBuildInputs = [ @@ -36,10 +35,9 @@ stdenv.mkDerivation rec { vala gettext itstool - appstream-glib desktop-file-utils glib # glib-compile-resources - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-logs/default.nix index e2dc57d670..77a9ba3332 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-logs/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "45.beta"; + version = "45.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "nbxJ/7J90jQuji/UmK8ltUENsjkQ/I7/XmiTrHa7jK4="; + hash = "sha256-sooG6lyYvRfyhztQfwhbDKDemBATZhH08u6wmGFOzlI="; }; nativeBuildInputs = [ @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Logs"; + homepage = "https://apps.gnome.org/Logs/"; description = "A log viewer for the systemd journal"; mainProgram = "gnome-logs"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 730a98e192..9981510962 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -24,18 +24,19 @@ , gjs , libadwaita , geocode-glib_2 +, tzdata }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-maps"; - version = "45.5"; + version = "46.10"; src = fetchurl { url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz"; - hash = "sha256-HCD14Q3OaEre+ylhUmJmoiTmxGwW+gO5VK/6Czobt0A="; + hash = "sha256-XyXul6DC/t+E8M8DkrTvi+GT4/bOJfl1RntvzsBUIa8="; }; - doCheck = true; + doCheck = !stdenv.isDarwin; nativeBuildInputs = [ gettext @@ -80,6 +81,19 @@ stdenv.mkDerivation (finalAttrs: { preCheck = '' # “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema. export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS" + export HOME=$(mktemp -d) + export TZDIR=${tzdata}/share/zoneinfo + + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that we will delete before installation. + mkdir -p $out/lib/gnome-maps + ln -s $PWD/lib/libgnome-maps.so.0 $out/lib/gnome-maps/libgnome-maps.so.0 + ''; + + postCheck = '' + rm $out/lib/gnome-maps/libgnome-maps.so.0 ''; passthru = { @@ -90,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Maps"; + homepage = "https://apps.gnome.org/Maps/"; description = "A map application for GNOME 3"; mainProgram = "gnome-maps"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix index 5275e6e9de..7def9a535d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "45.1"; + version = "46.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lZWc24AkRASNUKGpHELbiyUWWgpoUzvAOJXrNyxN3gs="; + hash = "sha256-pFDVzgFokvavL4q3H8fDlDguIse2ILqSpuFc9mvF7F8="; }; nativeBuildInputs = [ @@ -102,7 +102,7 @@ python3.pkgs.buildPythonApplication rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Music"; + homepage = "https://apps.gnome.org/Music/"; description = "Music player and management application for the GNOME desktop environment"; mainProgram = "gnome-music"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-nettool/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-nettool/default.nix index 761d55a403..bf377b288a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-nettool/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-nettool/default.nix @@ -8,7 +8,7 @@ , ninja , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtk3 , libgtop @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-notes/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-notes/default.nix index 86d7253ae5..dd47456719 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-notes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-notes/default.nix @@ -6,7 +6,7 @@ , fetchurl , fetchpatch , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , itstool , desktop-file-utils , python3 @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { libxml2 desktop-file-utils python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Note editor designed to remain simple to use"; mainProgram = "bijiben"; - homepage = "https://wiki.gnome.org/Apps/Notes"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-notes"; license = licenses.gpl3; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix index 3797f9df6f..0f63059310 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix @@ -10,7 +10,7 @@ , upower , python3 , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 , gnome }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 gettext # needed by meson_post_install.sh diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix index 5a6cab8177..d112de9784 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and modern sound recorder"; mainProgram = "gnome-sound-recorder"; - homepage = "https://wiki.gnome.org/Apps/SoundRecorder"; + homepage = "https://gitlab.gnome.org/World/vocalis"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index 3dd7b2f4de..deb3e011c1 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -18,21 +18,19 @@ , libadwaita , editorconfig-core-c , libxml2 -, appstream-glib , desktop-file-utils }: stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "45.3"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-8//LEakt/QS6PDs9DmZ4R9REmiHgEq428H3aBax9OlI="; + hash = "sha256-AFtIEEqQm+Zq4HRI0rxXBsfRE3gQV6JP9tpVvfMkxz0="; }; nativeBuildInputs = [ - appstream-glib desktop-file-utils itstool libxml2 # for xmllint diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix index c4b5743cb5..f614094d62 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "MMAClwKIPcjYFg5t4dYRaHfNbCW8lQ1OSQKmq0Z7L6Q="; + hash = "sha256-FTgmcFzPZy4U8v5N/Hgvjom3xMvkqv6VpVMvveej1J0="; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Weather"; + homepage = "https://apps.gnome.org/Weather/"; description = "Access current weather conditions and forecasts"; mainProgram = "gnome-weather"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix index 31ad6c94a6..65ff3851e6 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix @@ -13,6 +13,7 @@ , desktop-file-utils , pkg-config , gtk4 +, tracker , libadwaita , gtk3 , glib @@ -20,21 +21,19 @@ , libsoup_3 , webkitgtk_4_1 , gobject-introspection -, appstream-glib , gnome , wrapGAppsHook4 -, telepathy-logger , gspell , gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "polari"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "nbfdwJSqhVfxkXfhZMQti+Fn9UckuScTC3YhyCnB1KE="; + hash = "sha256-0rFwnjeRiSlPU9TvFfA/i8u76MUvD0FeYvfV8Aw2CjE="; }; patches = [ @@ -46,7 +45,6 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ telepathy-idle - telepathy-logger ]; nativeBuildInputs = [ @@ -59,17 +57,16 @@ stdenv.mkDerivation rec { libxml2 desktop-file-utils gobject-introspection - appstream-glib ]; buildInputs = [ gtk4 + tracker libadwaita gtk3 # for thumbnailer glib gsettings-desktop-schemas telepathy-glib - telepathy-logger gjs gspell gdk-pixbuf @@ -90,7 +87,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Polari"; + homepage = "https://apps.gnome.org/Polari/"; description = "IRC chat client designed to integrate with the GNOME desktop"; mainProgram = "polari"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix index c3c1aa020a..4cbc455c3d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -10,7 +10,7 @@ , gtk3 , glib , glib-networking -, wrapGAppsHook +, wrapGAppsHook3 , itstool , gnupg , desktop-file-utils @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { pkg-config vala itstool - wrapGAppsHook + wrapGAppsHook3 python3 openssh gnupg @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Seahorse"; + homepage = "https://gitlab.gnome.org/GNOME/seahorse"; description = "Application for managing encryption keys and passwords in the GnomeKeyring"; mainProgram = "seahorse"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/vinagre/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/vinagre/default.nix index 5ef01e04fc..72c1f7b322 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/vinagre/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/vinagre/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk3, gnome, vte, libxml2, gtk-vnc, intltool -, libsecret, itstool, wrapGAppsHook, librsvg }: +, libsecret, itstool, wrapGAppsHook3, librsvg }: stdenv.mkDerivation rec { pname = "vinagre"; @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { patches = [ # Pull fix pending upstream inclusion for -fno-common toolchain support: - # https://gitlab.gnome.org/GNOME/vinagre/-/merge_requests/8 + # https://gitlab.gnome.org/Archive/vinagre/-/merge_requests/8 (fetchpatch { name = "fno-common.patch"; - url = "https://gitlab.gnome.org/GNOME/vinagre/-/commit/c51662cf4338516773d64776c3c92796917ff2bd.diff"; + url = "https://gitlab.gnome.org/Archive/vinagre/-/commit/c51662cf4338516773d64776c3c92796917ff2bd.diff"; sha256 = "0zn8cd93hjdz6rw2d7gfl1ghzkc9h0x40k9l0jx3n5qfwdq4sir8"; }) ]; - nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook3 ]; buildInputs = [ gtk3 vte libxml2 gtk-vnc libsecret gnome.adwaita-icon-theme librsvg ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Remote desktop viewer for GNOME"; mainProgram = "vinagre"; - homepage = "https://wiki.gnome.org/Apps/Vinagre"; + homepage = "https://gitlab.gnome.org/Archive/vinagre"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index 5d287f4e6f..324d439d75 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JEK/sG9ObMlb9uJoL9/5j6Xt3GiHUbnWIVxiPLTkL/E="; + hash = "sha256-S8tTm9ddZNo4XW+gjLqp3erOtqyOgrhbpsQRF79bpk4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/baobab/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/baobab/default.nix index aad394c2d9..3978661baa 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/baobab/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/baobab/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "baobab"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "p9LPMIpsg57gsL8HT49f1g1iri8GSpSzxhDWVgt1joY="; + hash = "sha256-zk3vXILQVnGlAJ9768+FrJhnXZ2BYNKK2RgbJppy43w="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Graphical application to analyse disk usage in any GNOME environment"; mainProgram = "baobab"; - homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; + homepage = "https://apps.gnome.org/Baobab/"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/caribou/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/caribou/default.nix index a0d6623b59..5f853efdab 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/caribou/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/caribou/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook -, wrapGAppsHook, libgee, vala }: +, wrapGAppsHook3, libgee, vala }: let pname = "caribou"; @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook vala ]; + nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook3 vala ]; buildInputs = [ glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "An input assistive technology intended for switch and pointer users"; mainProgram = "caribou-preferences"; - homepage = "https://wiki.gnome.org/Projects/Caribou"; + homepage = "https://gitlab.gnome.org/Archive/caribou"; license = licenses.lgpl21; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/dconf-editor/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/dconf-editor/default.nix index 4189063c14..2b1b747a74 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/dconf-editor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/dconf-editor/default.nix @@ -16,7 +16,7 @@ , libxml2 , gettext , docbook-xsl-nons -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { vala libxslt pkg-config - wrapGAppsHook + wrapGAppsHook3 gettext docbook-xsl-nons libxml2 @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GSettings editor for GNOME"; mainProgram = "dconf-editor"; - homepage = "https://wiki.gnome.org/Apps/DconfEditor"; + homepage = "https://apps.gnome.org/DconfEditor/"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix index 095845b8ac..b59eb108c0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix @@ -20,7 +20,7 @@ , gdk-pixbuf , exempi , shared-mime-info -, wrapGAppsHook +, wrapGAppsHook3 , libjxl , librsvg , webp-pixbuf-loader @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { pkg-config gettext itstool - wrapGAppsHook + wrapGAppsHook3 libxml2 # for xmllint for xml-stripblanks gobject-introspection gi-docgen @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNOME image viewer"; - homepage = "https://wiki.gnome.org/Apps/EyeOfGnome"; + homepage = "https://gitlab.gnome.org/GNOME/eog"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix index efac41be7c..ab1c4d6b10 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "45.3"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "bDAum91mKQyw4m9ihDzUxDWklVq9u08VHwfcgEldZzA="; + hash = "sha256-9DSPLPUcB8DBBtEwFy1NI/LNQGh3Hh3gB7dYyireVmA="; }; nativeBuildInputs = [ @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Epiphany"; + homepage = "https://apps.gnome.org/Epiphany/"; description = "WebKit based web browser for GNOME"; mainProgram = "epiphany"; maintainers = teams.gnome.members ++ teams.pantheon.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix index f02f2e323e..daf912e2a7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix @@ -23,7 +23,7 @@ , libarchive , libhandy , libsecret -, wrapGAppsHook +, wrapGAppsHook3 , librsvg , gobject-introspection , yelp-tools @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "45.0"; + version = "46.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0YZH1Cdcvd8NMoF7HQTjBzQqhb6RTsTa0tgIKq+KpKg="; + hash = "sha256-lLtSU2WwYKKML2AX0iy/KvURVQclSqQum/wAC7wYq2I="; }; depsBuildBuild = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 yelp-tools ]; @@ -110,8 +110,6 @@ stdenv.mkDerivation rec { "-Dmultimedia=disabled" ]; - env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; @@ -128,7 +126,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Evince"; + homepage = "https://apps.gnome.org/Evince/"; description = "GNOME's document viewer"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 286f799382..b5326c4e7f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -21,7 +21,7 @@ , nss , libical , gperf -, wrapGAppsHook +, wrapGAppsHook3 , glib-networking , gsettings-desktop-schemas , pcre @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.50.4"; + version = "3.52.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1+3/vgOgu87L7mc5MhS4McexjNiVuExNv+E4d3biV8U="; + hash = "sha256-gls9fVRoRApn0R3SojkzlgwHue7MeXuxJYQ8sshwo0g="; }; patches = [ @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { gettext python3 gperf - wrapGAppsHook + wrapGAppsHook3 gobject-introspection vala ]; @@ -147,10 +147,6 @@ stdenv.mkDerivation rec { --replace "-Wl,--no-undefined" "" substituteInPlace src/services/evolution-alarm-notify/e-alarm-notify.c \ --replace "G_OS_WIN32" "__APPLE__" - '' + lib.optionalString stdenv.cc.isClang '' - # https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/513 - substituteInPlace src/addressbook/libebook-contacts/e-phone-number-private.cpp \ - --replace "std::auto_ptr" "std::unique_ptr" ''; postInstall = lib.optionalString stdenv.isDarwin '' @@ -185,7 +181,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Unified backend for programs that work with contacts, tasks, and calendar information"; - homepage = "https://wiki.gnome.org/Apps/Evolution"; + homepage = "https://gitlab.gnome.org/GNOME/evolution-data-server"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index 6fef728193..de8186d01c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -1,8 +1,8 @@ diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c -index bd479d8..bd049b3 100644 +index 5e65ec8..8ca28c6 100644 --- a/src/addressbook/libebook/e-book-client.c +++ b/src/addressbook/libebook/e-book-client.c -@@ -1997,7 +1997,18 @@ e_book_client_get_self (ESourceRegistry *registry, +@@ -1924,7 +1924,18 @@ e_book_client_get_self (ESourceRegistry *registry, *out_client = book_client; @@ -22,7 +22,7 @@ index bd479d8..bd049b3 100644 uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); -@@ -2065,7 +2076,18 @@ e_book_client_set_self (EBookClient *client, +@@ -1992,7 +2003,18 @@ e_book_client_set_self (EBookClient *client, g_return_val_if_fail ( e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE); @@ -42,7 +42,7 @@ index bd479d8..bd049b3 100644 g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2101,8 +2123,18 @@ e_book_client_is_self (EContact *contact) +@@ -2028,8 +2050,18 @@ e_book_client_is_self (EContact *contact) * unfortunately the API doesn't allow that. */ g_mutex_lock (&mutex); @@ -128,7 +128,7 @@ index e85a56b..59d3fe2 100644 g_object_unref (settings); diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c -index 63e1016..0492756 100644 +index 5b4debf..77c8d9c 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c @@ -144,7 +144,18 @@ ebmb_is_power_saver_enabled (void) @@ -152,10 +152,10 @@ index 63e1016..0492756 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c -index 42f3457..b4926af 100644 +index 43bd383..4dce824 100644 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c -@@ -1387,7 +1387,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) +@@ -1369,7 +1369,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) (GDestroyNotify) g_free, (GDestroyNotify) contact_record_free); @@ -202,10 +202,10 @@ index 2525856..7ecc1a8 100644 g_clear_object (&settings); } diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index ade0a73..d7c3e73 100644 +index 44ba49c..dfac2a2 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c -@@ -2626,8 +2626,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) +@@ -2826,8 +2826,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) watcher->priv = e_reminder_watcher_get_instance_private (watcher); watcher->priv->cancellable = g_cancellable_new (); @@ -242,7 +242,7 @@ index ade0a73..d7c3e73 100644 g_signal_connect_object ( watcher->priv->desktop_settings, diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c -index 27fa153..3679d72 100644 +index b9145af..350fcd3 100644 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c @@ -156,7 +156,18 @@ ecmb_is_power_saver_enabled (void) @@ -265,7 +265,7 @@ index 27fa153..3679d72 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; -@@ -2633,7 +2644,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, +@@ -2632,7 +2643,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, if (is_declined) { GSettings *settings; @@ -288,7 +288,7 @@ index 27fa153..3679d72 100644 g_clear_object (&settings); } diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c -index bef9188..ce92f6c 100644 +index d5a0823..2ae03f8 100644 --- a/src/camel/camel-cipher-context.c +++ b/src/camel/camel-cipher-context.c @@ -1631,7 +1631,18 @@ camel_cipher_can_load_photos (void) @@ -312,7 +312,7 @@ index bef9188..ce92f6c 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index 4deae76..ebe0a1b 100644 +index cecd740..9a15180 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c @@ -747,7 +747,18 @@ gpg_ctx_get_executable_name (void) @@ -361,10 +361,10 @@ index e61160c..b6553a4 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index 8518c90..6a655a9 100644 +index bbf214b..bed39d2 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5627,7 +5627,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) +@@ -5661,7 +5661,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) if (do_old_flags_update) { GSettings *eds_settings; @@ -433,10 +433,10 @@ index 188f276..939f89b 100644 settings, "network-monitor-gio-name", object, "gio-name", diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c -index ec08afe..7b31227 100644 +index 1453410..a3f06b0 100644 --- a/src/libedataserver/e-oauth2-service-google.c +++ b/src/libedataserver/e-oauth2-service-google.c -@@ -71,7 +71,18 @@ eos_google_read_settings (EOAuth2Service *service, +@@ -72,7 +72,18 @@ eos_google_read_settings (EOAuth2Service *service, if (!value) { GSettings *settings; @@ -529,10 +529,10 @@ index af59b0b..0c7e75e 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c -index 4a9b398..e7cb404 100644 +index 1539f8b..77cf123 100644 --- a/src/libedataserver/e-source-registry.c +++ b/src/libedataserver/e-source-registry.c -@@ -1773,7 +1773,19 @@ e_source_registry_init (ESourceRegistry *registry) +@@ -1754,7 +1754,19 @@ e_source_registry_init (ESourceRegistry *registry) g_mutex_init (®istry->priv->sources_lock); diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix index 25f9fe8c63..bbbe4fbb25 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix @@ -7,6 +7,7 @@ , ninja , pkg-config , glib +, json-glib , itstool , xorg , accountsservice @@ -42,13 +43,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gdm"; - version = "45.0.1"; + version = "46.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - sha256 = "ZXJXjAXjxladbtJp994qrzoDVldlRYbYJDkHu3pv+oU="; + hash = "sha256-jWy1IXbspItrvxz+L9rgjZZ3taDyvKYA3uRgTeDdHvw="; }; mesonFlags = [ @@ -76,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { accountsservice audit glib + json-glib gtk3 keyutils libX11 @@ -94,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/92 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/ccecd9c975d04da80db4cd547b67a1a94fa83292.patch"; - sha256 = "5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q="; + hash = "sha256-5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q="; revert = true; }) @@ -187,7 +189,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A program that manages graphical display servers and handles graphical user logins"; - homepage = "https://wiki.gnome.org/Projects/GDM"; + homepage = "https://gitlab.gnome.org/GNOME/gdm"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/fix-paths.patch index 980627c78d..4ad417285f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c -index 5fbbad68..739718ec 100644 +index f2d8e155b..54b998826 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c -@@ -233,9 +233,9 @@ struct GdmDisplayServerConfiguration { +@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration { const char *session_type; } display_server_configuration[] = { #ifdef ENABLE_WAYLAND_SUPPORT @@ -15,10 +15,10 @@ index 5fbbad68..739718ec 100644 }; diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c -index cc61efc9..4c9d15af 100644 +index fc5aef6ac..c61e0046b 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c -@@ -148,7 +148,7 @@ plymouth_is_running (void) +@@ -151,7 +151,7 @@ plymouth_is_running (void) GError *error; error = NULL; @@ -27,7 +27,7 @@ index cc61efc9..4c9d15af 100644 NULL, NULL, &status, &error); if (! res) { g_debug ("Could not ping plymouth: %s", error->message); -@@ -166,7 +166,7 @@ plymouth_prepare_for_transition (void) +@@ -169,7 +169,7 @@ plymouth_prepare_for_transition (void) GError *error; error = NULL; @@ -36,7 +36,7 @@ index cc61efc9..4c9d15af 100644 NULL, NULL, NULL, &error); if (! res) { g_warning ("Could not deactivate plymouth: %s", error->message); -@@ -181,7 +181,7 @@ plymouth_quit_with_transition (void) +@@ -184,7 +184,7 @@ plymouth_quit_with_transition (void) GError *error; error = NULL; @@ -45,7 +45,7 @@ index cc61efc9..4c9d15af 100644 if (! res) { g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); -@@ -197,7 +197,7 @@ plymouth_quit_without_transition (void) +@@ -200,7 +200,7 @@ plymouth_quit_without_transition (void) GError *error; error = NULL; @@ -55,10 +55,10 @@ index cc61efc9..4c9d15af 100644 g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index 4b709731..245ac0cf 100644 +index a4c4b2dcf..67416b204 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c -@@ -2972,16 +2972,16 @@ gdm_session_start_session (GdmSession *self, +@@ -3193,16 +3193,16 @@ gdm_session_start_session (GdmSession *self, */ if (run_launcher) { if (is_x11) { @@ -79,7 +79,7 @@ index 4b709731..245ac0cf 100644 } } diff --git a/data/gdm.service.in b/data/gdm.service.in -index 17e8a8de..afc70977 100644 +index 17e8a8de8..afc709778 100644 --- a/data/gdm.service.in +++ b/data/gdm.service.in @@ -26,7 +26,7 @@ Restart=always diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index 808ff7c0c2..f60631ac22 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "zuDmiPuuXvenXzNa2i0Qd54I68qURfFYbeMsWptt7i0="; + hash = "sha256-Td06xDmkoGeHaAWSG7dfTTyLhaIY1Hwnbd3eiShEPC4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix index 9389127e57..526363a613 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix @@ -12,7 +12,7 @@ , udev , itstool , libxml2 -, wrapGAppsHook +, wrapGAppsHook3 , libnotify , libcanberra-gtk3 , gobject-introspection @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { itstool pkg-config libxml2 - wrapGAppsHook + wrapGAppsHook3 gobject-introspection gtk-doc docbook-xsl-nons diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index b9701f3d5e..8b1fd59d3f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "42.8"; + version = "46.0"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "dsJB6MosmxA1NkU1yiYIT4n8XA4YKVEPiQlYMRX8wts="; + hash = "sha256-E/4edfMXrNvfXoDJAp0uBjLWCpzPcqQ64263VFAh++8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 0ea86b7b45..3b66697668 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, appstream , meson , ninja , vala @@ -24,14 +25,15 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "45.0.2"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "fcvzI4SJcXHL5Ug+xmTZlOXnVekSrh35EWJPA8kIZ8I="; + hash = "sha256-LTZ1CnOJAIYSLPPwyD5oUXiRWFYVFlMG+hWWqRhmgkc="; }; nativeBuildInputs = [ + appstream meson ninja pkg-config @@ -70,7 +72,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Calculator"; + homepage = "https://apps.gnome.org/Calculator/"; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/default.nix index 7c9d3df9f1..786e19277e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-color-manager/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; attrPath = "gnome.${pname}"; + freeze = true; }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 9e41193c03..5dd008cc5c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -11,7 +11,6 @@ , gtk4 , glib , libportal-gtk4 -, gnome-desktop , gnome-online-accounts , qrencode , wrapGAppsHook4 @@ -27,11 +26,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "45.1"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "gj9WCe7NkMQk3T5khXKHvBMh+23+KJJKR0/w6azyG3U="; + hash = "sha256-cK606DWhx3+bzH5XotzCN22TvbYXVxYYJXRF9WxjcN8="; }; nativeBuildInputs = [ @@ -54,7 +53,6 @@ stdenv.mkDerivation rec { evolution-data-server-gtk4 gsettings-desktop-schemas folks - gnome-desktop libadwaita libxml2 gnome-online-accounts @@ -71,7 +69,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Contacts"; + homepage = "https://apps.gnome.org/Contacts/"; description = "GNOME’s integrated address book"; mainProgram = "gnome-contacts"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 48566ba669..b3b5d2594d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -7,13 +7,14 @@ , colord , colord-gtk4 , cups +, dbus , docbook-xsl-nons , fontconfig , gdk-pixbuf , gettext , glib , glib-networking -, gcr +, gcr_4 , glibc , gnome-bluetooth , gnome-color-manager @@ -37,7 +38,9 @@ , librsvg , webp-pixbuf-loader , libsecret +, libsoup_3 , libwacom +, libXi , libxml2 , libxslt , meson @@ -69,11 +72,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "45.3"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-selJxOhsBiTsam7Q3wnJ+uKyKYPB3KYO2GrsjvCyQAQ="; + hash = "sha256-gXkkIwGd7aHSoHTB7Pan5u8xcsCcvm9NeZWktd6igxI="; }; patches = [ @@ -102,12 +105,12 @@ stdenv.mkDerivation (finalAttrs: { adwaita-icon-theme colord colord-gtk4 - libepoxy + cups fontconfig gdk-pixbuf glib glib-networking - gcr + gcr_4 gnome-bluetooth gnome-desktop gnome-online-accounts @@ -119,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: { gsound gtk4 ibus + libepoxy libgtop libgudev libadwaita @@ -128,7 +132,9 @@ stdenv.mkDerivation (finalAttrs: { libpwquality librsvg libsecret + libsoup_3 libwacom + libXi libxml2 modemmanager mutter # schemas for the keybindings @@ -146,6 +152,7 @@ stdenv.mkDerivation (finalAttrs: { ]); nativeCheckInputs = [ + dbus python3.pkgs.python-dbusmock setxkbmap xvfb-run diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/paths.patch index be2ca4b5e0..41dd5979aa 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/paths.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -37,10 +37,10 @@ index f6c84e3d2..cd897f8f5 100644 gtk_widget_set_sensitive (self->toolbutton_profile_view, TRUE); else gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE); -diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h +diff --git a/panels/system/datetime/tz.h b/panels/system/datetime/tz.h index feef16580..4b88ef7b1 100644 ---- a/panels/datetime/tz.h -+++ b/panels/datetime/tz.h +--- a/panels/system/datetime/tz.h ++++ b/panels/system/datetime/tz.h @@ -27,11 +27,7 @@ G_BEGIN_DECLS @@ -67,37 +67,6 @@ index ec5a905a5..689fdbebe 100644 if (self->is_new_connection) { g_autofree gchar *type_str = NULL; -diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c -index 303f4a8af..e5afc4dff 100644 ---- a/panels/network/net-device-bluetooth.c -+++ b/panels/network/net-device-bluetooth.c -@@ -80,7 +80,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) - update_off_switch_from_device_state (self->device_off_switch, state, self); - - /* set up the Options button */ -- path = g_find_program_in_path ("nm-connection-editor"); -+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); - gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL); - } - -@@ -131,7 +131,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) - - connection = net_device_get_find_connection (self->client, self->device); - uuid = nm_connection_get_uuid (connection); -- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); - g_debug ("Launching '%s'\n", cmdline); - if (!g_spawn_command_line_async (cmdline, &error)) - g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -173,7 +173,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) - - gtk_widget_init_template (GTK_WIDGET (self)); - -- path = g_find_program_in_path ("nm-connection-editor"); -+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); - gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); - } - diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c index 166670224..36f720d36 100644 --- a/panels/network/net-device-mobile.c @@ -133,10 +102,10 @@ index a31a606e3..ed5133d29 100644 argv[1] = g_strdup (priv->hostname); /* Use SNMP to get printer's informations */ -diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c +diff --git a/panels/system/users/run-passwd.c b/panels/system/users/run-passwd.c index edbc99830..1e1d90141 100644 ---- a/panels/user-accounts/run-passwd.c -+++ b/panels/user-accounts/run-passwd.c +--- a/panels/system/users/run-passwd.c ++++ b/panels/system/users/run-passwd.c @@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) gchar **envp; gint my_stdin, my_stdout; @@ -146,10 +115,10 @@ index edbc99830..1e1d90141 100644 argv[1] = NULL; envp = g_get_environ (); -diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c +diff --git a/panels/system/users/user-utils.c b/panels/system/users/user-utils.c index 5b7bc1f02..13ffe6ca8 100644 ---- a/panels/user-accounts/user-utils.c -+++ b/panels/user-accounts/user-utils.c +--- a/panels/system/users/user-utils.c ++++ b/panels/system/users/user-utils.c @@ -215,7 +215,7 @@ is_valid_username_async (const gchar *username, * future, so it would be nice to have some official way for this * instead of relying on the current "--login" implementation. diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-dictionary/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-dictionary/default.nix index d5dfce9f7e..0fed6638f9 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-dictionary/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-dictionary/default.nix @@ -11,7 +11,7 @@ , libxml2 , gettext , itstool -, wrapGAppsHook +, wrapGAppsHook3 , docbook_xsl , docbook_xml_dtd_43 , gnome @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { # Fix test dependencies with meson 0.57, can be removed on next bump # We need to explicitly depend on the generated files. (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/-/commit/87c026cfe4acbcfc62d15950f88a71d8d9678c7e.patch"; + url = "https://gitlab.gnome.org/Archive/gnome-dictionary/-/commit/87c026cfe4acbcfc62d15950f88a71d8d9678c7e.patch"; sha256 = "tKesWeOK3OqOxrXm4dZvCZHHdTD7AQbYDjtYDCsLd3A="; }) # Fix build with meson 0.61, can be removed on next bump # data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/-/commit/cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68.patch"; + url = "https://gitlab.gnome.org/Archive/gnome-dictionary/-/commit/cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68.patch"; sha256 = "cIRM6ACqsnEo2JWYvr6EBye5o0BudugZMShCe1U5hz8="; }) ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 libxml2 gettext itstool @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Dictionary"; + homepage = "https://gitlab.gnome.org/Archive/gnome-dictionary"; description = "Dictionary is the GNOME application to look up definitions"; mainProgram = "gnome-dictionary"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index a35e6921ff..dcd376fda1 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -11,7 +11,7 @@ , ninja , gtk3 , glib -, wrapGAppsHook +, wrapGAppsHook3 , libnotify , itstool , gnome @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "45.1"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VA/07JprljAAP/TNYNYk85/nDyWpVZ5TMziWA8hblSk="; + hash = "sha256-RkZJFIxtZ3HxrC6/5DpOUZIFsRwtkUoJ8qABgh0GlX0="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 libxml2 ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Disks"; + homepage = "https://apps.gnome.org/DiskUtility/"; description = "A udisks graphical front-end"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 9e5003ae2f..5a0f8d82cb 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "l8traN2mDeCrMDg4NYbx5LwdpaSPRAJb1rvnTqBcKwg="; + hash = "sha256-WS9AHkhdAswETUh7tcjgTJYdpoViFnaKWfH/mL0tU3w="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index d20700233a..055c811263 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -16,14 +16,11 @@ , geocode-glib_2 , glib , gnome-desktop -, gnome-online-accounts -, gtk3 , gtk4 , libgweather , json-glib , krb5 , libpwquality -, librest_1_0 , libsecret , networkmanager , pango @@ -39,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "45.4.1"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Nj4JqjMI5/QHTgZiU6AYKzIqtgN2dD3heLu0AOVLqO4="; + hash = "sha256-+O6dzqfjXnNeqjvI0QQdBrtk6/HhBG5ejkjx+0QVGEc="; }; patches = [ @@ -72,9 +69,7 @@ stdenv.mkDerivation rec { geocode-glib_2 glib gnome-desktop - gnome-online-accounts gsettings-desktop-schemas - gtk3 gtk4 json-glib krb5 @@ -82,7 +77,6 @@ stdenv.mkDerivation rec { libadwaita libnma-gtk4 libpwquality - librest_1_0 libsecret networkmanager pango diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 6a160f6cf7..472d9a4135 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -15,7 +15,7 @@ , libselinux , p11-kit , openssh -, wrapGAppsHook +, wrapGAppsHook3 , docbook-xsl-nons , docbook_xml_dtd_43 , gnome @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gnome-keyring"; - version = "42.1"; + version = "46.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "x/TQQMx2prf+Z+CO+RBpEcPIDUD8iMv8jiaEpMlG4+Y="; + hash = "sha256-sdOukTL/L4s/JaGQeQiSlo49Cs+VKkh+QPZEqFUM4/Y="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { autoreconfHook docbook-xsl-nons docbook_xml_dtd_43 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -60,6 +60,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories "--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/" + # gnome-keyring doesn't build with ssh-agent by default anymore, we need to + # switch to using gcr https://github.com/NixOS/nixpkgs/issues/140824 + "--enable-ssh-agent" ]; # Tends to fail non-deterministically. @@ -97,7 +100,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; - homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-keyring"; license = licenses.gpl2; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-online-miners/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-online-miners/default.nix index a45cd7a1ed..8cc2689f29 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-online-miners/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-online-miners/default.nix @@ -21,7 +21,7 @@ , gmp , openssl , dleyna-server -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GnomeOnlineMiners"; + homepage = "https://gitlab.gnome.org/Archive/gnome-online-miners"; description = "A set of crawlers that go through your online content and index them locally in Tracker"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 58fbbc0cfc..abd6d21026 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , cairo , meson @@ -6,7 +7,7 @@ , pkg-config , python3 , asciidoc -, wrapGAppsHook +, wrapGAppsHook3 , glib , libei , libepoxy @@ -16,22 +17,24 @@ , systemd , libsecret , libnotify +, libopus , libxkbcommon , gdk-pixbuf -, freerdp +, freerdp3 , fdk_aac , tpm2-tss , fuse3 , gnome +, polkit }: stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "45.1"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-3NnBisIwZpVjH88AqIZFw443DroFxp3zn1QCBNTq/Y0="; + hash = "sha256-fGKkKB/fqVIhEK/7910JlzA18q3H+kV3UR1zMYa+to8="; }; nativeBuildInputs = [ @@ -40,12 +43,12 @@ stdenv.mkDerivation rec { pkg-config python3 asciidoc - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ cairo - freerdp + freerdp3 fdk_aac tpm2-tss fuse3 @@ -56,15 +59,23 @@ stdenv.mkDerivation rec { libdrm nv-codec-headers-11 libnotify + libopus libsecret libxkbcommon pipewire systemd + polkit # For polkit-gobject ]; mesonFlags = [ + "-Dconf_dir=/etc/gnome-remote-desktop" "-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user" + "-Dsystemd_system_unit_dir=${placeholder "out"}/lib/systemd/system" + "-Dsystemd_sysusers_dir=${placeholder "out"}/lib/sysusers.d" + "-Dsystemd_tmpfiles_dir=${placeholder "out"}/lib/tmpfiles.d" "-Dtests=false" # Too deep of a rabbit hole. + # TODO: investigate who should be fixed here. + "-Dc_args=-I${freerdp3}/include/winpr3" ]; passthru = { @@ -75,7 +86,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-remote-desktop"; description = "GNOME Remote Desktop server"; mainProgram = "grdctl"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-screenshot/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-screenshot/default.nix index 0a345fe0d8..b8fa9a9f0c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-screenshot/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-screenshot/default.nix @@ -12,7 +12,7 @@ , meson , ninja , python3 -, wrapGAppsHook +, wrapGAppsHook3 , appstream-glib , desktop-file-utils , gnome @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libxml2 desktop-file-utils python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/ctl.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/ctl.nix index 09fc80bf9e..10b59d660b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/ctl.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/ctl.nix @@ -6,7 +6,7 @@ , pkg-config , glib , systemd -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/default.nix index 710829a506..5d4504b908 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "45.0"; + version = "46.0"; outputs = [ "out" "sessions" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "cG0v/KysOFU6PAGFeT9aK0qslAu154nZU8mAgWO+8vE="; + hash = "sha256-xuFiSvYJC8ThoZH+Imir+nqN4HgxynpX8hfmeb97mlQ="; }; patches = [ @@ -76,11 +76,6 @@ stdenv.mkDerivation rec { libepoxy ]; - mesonFlags = [ - "-Dsystemd=true" - "-Dsystemd_session=default" - ]; - postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py @@ -132,7 +127,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNOME session manager"; - homepage = "https://wiki.gnome.org/Projects/SessionManagement"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-session"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix index 95eb6fe1d2..6e87a2ab6e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix @@ -33,7 +33,7 @@ , gnome-desktop , geocode-glib_2 , docbook_xsl -, wrapGAppsHook +, wrapGAppsHook3 , python3 , tzdata , nss @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { libxml2 libxslt docbook_xsl - wrapGAppsHook + wrapGAppsHook3 python3 ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 1719127a6c..4284a68ee3 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -31,7 +31,7 @@ , gnome-desktop , geocode-glib_2 , docbook_xsl -, wrapGAppsHook +, wrapGAppsHook3 , python3 , tzdata , gcr_4 @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "45.1"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "xiv+yYF+7luD6+kBqShhiaZ+tf8DPF3UFQZXT4Ir8JA="; + hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c="; }; patches = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { libxml2 libxslt docbook_xsl - wrapGAppsHook + wrapGAppsHook3 python3 ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 5c17a3eb59..2fd7112669 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "45.2"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; - sha256 = "7jL2OHotGK2/96lWaJvHR4ZrSocS1zeQwAKr6uTMqq8="; + hash = "sha256-xbpQcA2nephvAGC+7az8AX5+yCKD8qY4SEKggHvEVT8="; }; patches = [ @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GnomeShell/Extensions"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions"; description = "Modify and extend GNOME Shell functionality and behavior"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix index 3a7da11739..7b94533f7b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -12,8 +12,7 @@ , python3 , polkit , networkmanager -, gtk-doc -, docbook-xsl-nons +, gi-docgen , at-spi2-core , libstartup_notification , unzip @@ -24,7 +23,6 @@ , webp-pixbuf-loader , geoclue2 , perl -, docbook_xml_dtd_45 , desktop-file-utils , libpulseaudio , libical @@ -68,13 +66,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "45.5"; + version = "46.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-vVw9PQKNRyM+QgUiPwrAKsmpc7aZvCd0OQlNQaeNarA="; + hash = "sha256-ZPmZhEwQHmO/KU1FsTjeVjGa0vMmKCchqtD6hgZTs2k="; }; patches = [ @@ -101,8 +99,15 @@ stdenv.mkDerivation (finalAttrs: { # Work around failing fingerprint auth (fetchpatch { - url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; - sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw="; + url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/dcd112d9708954187e7490564c2229d82ba5326f/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; + hash = "sha256-mgXty5HhiwUO1UV3/eDgWtauQKM0cRFQ0U7uocST25s="; + }) + + # screencast: Correct expected bus name for streams + # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3303 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/50a011a19dcc6997ea6173c07bb80b2d9888d363.patch"; + hash = "sha256-ccEpdWgDxwnj7ouzFekpoln5Y2PtgRikWetwK+0U9Fg="; }) ]; @@ -111,9 +116,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config gettext - docbook-xsl-nons - docbook_xml_dtd_45 - gtk-doc + gi-docgen perl wrapGAppsHook4 sassc @@ -213,6 +216,9 @@ stdenv.mkDerivation (finalAttrs: { for svc in org.gnome.ScreenSaver org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do wrapGApp $out/share/gnome-shell/$svc done + + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; separateDebugInfo = true; @@ -227,7 +233,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Core user interface for the GNOME 3 desktop"; - homepage = "https://wiki.gnome.org/Projects/GnomeShell"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-shell"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch index e27847378b..a87f512915 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch @@ -56,16 +56,3 @@ index 11fb4b6b7..e00e4807b 100644 NULL); if (!g_subprocess_wait_check (proc, NULL, &error)) -diff --git a/subprojects/extensions-tool/src/command-pack.c b/subprojects/extensions-tool/src/command-pack.c -index f2cfcd51a..2a9a7efdf 100644 ---- a/subprojects/extensions-tool/src/command-pack.c -+++ b/subprojects/extensions-tool/src/command-pack.c -@@ -168,7 +168,7 @@ extension_pack_add_schemas (ExtensionPack *pack, - #else - dstpath = g_file_get_path (dstdir); - proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, error, -- "glib-compile-schemas", "--strict", dstpath, NULL); -+ "@glib_compile_schemas@", "--strict", dstpath, NULL); - - if (!g_subprocess_wait_check (proc, NULL, error)) - return FALSE; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch index e58610ddc2..93965a4752 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch @@ -1,16 +1,16 @@ diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js -index a3e4372b4..36f6c1f47 100644 +index 28db1a9de..805b686bf 100644 --- a/js/gdm/loginDialog.js +++ b/js/gdm/loginDialog.js -@@ -43,6 +43,7 @@ import * as UserWidget from '../ui/userWidget.js'; - const _FADE_ANIMATION_TIME = 250; +@@ -46,6 +46,7 @@ const _FADE_ANIMATION_TIME = 250; const _SCROLL_ANIMATION_TIME = 500; const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0; + const _CONFLICTING_SESSION_DIALOG_TIMEOUT = 60; +const _LOGO_ICON_HEIGHT = 48; export const UserListItem = GObject.registerClass({ Signals: {'activate': {}}, -@@ -839,7 +840,7 @@ export const LoginDialog = GObject.registerClass({ +@@ -908,7 +909,7 @@ export const LoginDialog = GObject.registerClass({ const scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor; const texture = this._textureCache.load_file_async( this._logoFile, diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix index f45f643cb5..43adcd092f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , substituteAll , pkg-config , meson @@ -46,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "45.3"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1rkkWyIjfae9FzndKMI8yPODX5n6EMEDfZ3XY1M1JRw="; + hash = "sha256-tu63iRAN6UtQ6+Lnfxaya+TC2xVImQXxmNBgxCXhkHY="; }; patches = [ @@ -58,17 +57,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit isocodes; }) - - # Add support for AppStream 1.0. - # https://gitlab.gnome.org/GNOME/gnome-software/-/issues/2393 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-software/-/commit/0655f358ed0e8455e12d9634f60bc4dbaee434e3.patch"; - hash = "sha256-8IXXUfNeha5yRlRLuxQV8whwQmyNw7Aoi/r5NNFS/zA="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-software/-/commit/e431ab003f3fabf616b6eb7dc93f8967bc9473e5.patch"; - hash = "sha256-Y5GcC1XMbb9Bl2/VKFnrV1B/ipLKxY4guse25LhxhKM="; - }) ]; nativeBuildInputs = [ @@ -130,7 +118,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software store that lets you install and update applications and system extensions"; mainProgram = "gnome-software"; - homepage = "https://wiki.gnome.org/Apps/Software"; + homepage = "https://apps.gnome.org/Software/"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index eef86a4603..bc7caa3ad2 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -3,13 +3,13 @@ , gettext , fetchurl , pkg-config -, gtkmm3 +, gtkmm4 , libxml2 , bash -, gtk3 -, libhandy +, gtk4 +, libadwaita , glib -, wrapGAppsHook +, wrapGAppsHook4 , meson , ninja , gsettings-desktop-schemas @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "45.0.2"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "xeJy2Qv5mGo/hhPXbg0n+kLfrO5cAZLnOSG7lLGGii4="; + hash = "sha256-U3YkgVjGhsMIJVRy6MKp5MFyVWQsFJ/HGYxtA05UdZk="; }; patches = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pkg-config gettext itstool - wrapGAppsHook + wrapGAppsHook4 meson ninja glib @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { buildInputs = [ bash - gtk3 - libhandy + gtk4 + libadwaita glib libxml2 - gtkmm3 + gtkmm4 libgtop gdk-pixbuf gnome.adwaita-icon-theme @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/SystemMonitor"; + homepage = "https://apps.gnome.org/SystemMonitor/"; description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; mainProgram = "gnome-system-monitor"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 92d1a7a37e..7b3306df57 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -6,7 +6,6 @@ , pkg-config , python3 , libxml2 -, gnome , gitUpdater , nautilus , glib @@ -21,7 +20,7 @@ , vala , desktop-file-utils , itstool -, wrapGAppsHook +, wrapGAppsHook3 , pcre2 , libxslt , docbook-xsl-nons @@ -30,14 +29,14 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.50.1"; + version = "3.52.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-terminal"; rev = version; - sha256 = "sha256-lJAzmz8tvEbr371VtYjlV4+z3cSy4QrmP0vmD5WiJD4="; + hash = "sha256-npoQfe5+HTn7CsrW6MuOoiYBc3rYMAMv4apC6dFR8O4="; }; nativeBuildInputs = [ @@ -53,7 +52,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons vala desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 pcre2 python3 ]; @@ -69,13 +68,7 @@ stdenv.mkDerivation rec { nautilus # For extension ]; - # Silly build system, it looks for dbus file from gnome-shell in the - # installation tree of the package it is configuring. postPatch = '' - substituteInPlace src/meson.build \ - --replace "gt_prefix / gt_dbusinterfacedir / 'org.gnome.ShellSearchProvider2.xml'" \ - "'${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml'" - patchShebangs \ data/icons/meson_updateiconcache.py \ data/meson_desktopfile.py \ @@ -96,7 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The GNOME Terminal Emulator"; mainProgram = "gnome-terminal"; - homepage = "https://wiki.gnome.org/Apps/Terminal"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-terminal"; platforms = platforms.linux; license = licenses.gpl3Plus; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix index c6d58c4805..0cc5c596bb 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-tour"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-W+S470uPTV7KzMMQSNtuCFqPe/+tqghDuOiniP8dre4="; + hash = "sha256-8yZSqp1+8GQ3YM5jkyCCz9NkHnczt2xCm3jQl4O3xGo="; }; cargoVendorDir = "vendor"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix index 83706f36ab..2d0dd75539 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -12,7 +12,7 @@ , glib , desktop-file-utils , gtk-doc -, wrapGAppsHook +, wrapGAppsHook3 , itstool , libxml2 , yelp-tools @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 unzip intltool itstool @@ -106,7 +106,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "GNOME Character Map, based on the Unicode Character Database"; mainProgram = "gucharmap"; - homepage = "https://wiki.gnome.org/Apps/Gucharmap"; + homepage = "https://gitlab.gnome.org/GNOME/gucharmap"; license = licenses.gpl3; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/libgnome-keyring/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/libgnome-keyring/default.nix index f6d2eb4bf6..912953dfb3 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/libgnome-keyring/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/libgnome-keyring/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Framework for managing passwords and other secrets"; - homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; + homepage = "https://gitlab.gnome.org/Archive/libgnome-keyring"; license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; pkgConfigModules = [ "gnome-keyring-1" ]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/43/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/43/default.nix index 63110d9d90..9d40303fad 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/43/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/43/default.nix @@ -37,7 +37,7 @@ , gnome-settings-daemon , xorgserver , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gi-docgen , sysprof , libsysprof-capture @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { xvfb-run pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 gi-docgen xorgserver gobject-introspection diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix index 570d954766..0efd14124a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix @@ -36,6 +36,7 @@ , libinput , libdrm , libei +, libdisplay-info , gsettings-desktop-schemas , glib , atk @@ -67,13 +68,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "45.5"; + version = "46.1"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-UcMyS4qXX5luWsaTqzhWPElubxQubNM1e0lQ0lAzSHQ="; + hash = "sha256-Y7JmDdD6GT+mYsgO4S64sW8rjDvDiWNmIAx5lDgk1R0="; }; mesonFlags = [ @@ -125,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: { libcanberra libdrm libei + libdisplay-info libgudev libinput libstartup_notification @@ -172,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. # TODO: Move this into a directory devhelp can find. - moveToOutput "share/mutter-13/doc" "$devdoc" + moveToOutput "share/mutter-14/doc" "$devdoc" ''; # Install udev files into our own tree. @@ -181,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; passthru = { - libdir = "${finalAttrs.finalPackage}/lib/mutter-13"; + libdir = "${finalAttrs.finalPackage}/lib/mutter-14"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix index 9279d967cc..063914060d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix @@ -7,7 +7,6 @@ , gi-docgen , docbook-xsl-nons , gettext -, libxml2 , desktop-file-utils , wrapGAppsHook4 , gtk4 @@ -39,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "45.2.1"; + version = "46.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; - sha256 = "ul1T3zmhVVYt+XHvXjHoJwdJBdDEjqseskIaEChLmQ0="; + hash = "sha256-zBpf3x3XL5Lp4/PHrSY3CaDeU5Golb6TRPamf0OIe9c="; }; patches = [ @@ -63,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils gettext gobject-introspection - libxml2 meson ninja pkg-config @@ -128,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "The file manager for GNOME"; - homepage = "https://wiki.gnome.org/Apps/Files"; + homepage = "https://apps.gnome.org/Nautilus/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/extension_dir.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/extension_dir.patch index a1bdd64f98..d7cd161a8d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/extension_dir.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/extension_dir.patch @@ -21,6 +21,4 @@ index cd889ff18..e2cd6468e 100644 + } + + load_module_dir (extensiondir); - - eel_debug_call_at_shutdown (free_module_objects); } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix index dd890ab17f..9cc4e1ee8d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix @@ -7,7 +7,7 @@ , gettext , libxml2 , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , python3 , glib , gssdp_1_6 @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { gettext libxml2 gobject-introspection - wrapGAppsHook + wrapGAppsHook3 python3 ]; @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices"; - homepage = "https://wiki.gnome.org/Projects/Rygel"; + homepage = "https://gitlab.gnome.org/GNOME/rygel"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/simple-scan/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/simple-scan/default.nix index 3aea02678a..e7f2954ca3 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/simple-scan/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -6,15 +6,15 @@ , gettext , itstool , python3 -, wrapGAppsHook +, wrapGAppsHook4 , cairo , gdk-pixbuf , colord , glib -, gtk3 +, libadwaita +, gtk4 , gusb , packagekit -, libhandy , libwebp , libxml2 , sane-backends @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "44.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Obhw/Ub0R/dH6uzC3yYEnvdzGFCZ8OE8Z1ZWJk3ZjpU="; + hash = "sha256-wW5lkBQv5WO+UUMSKzu7U/awCn2p2VL2HEf6Jve08Kk="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { itstool pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 libxml2 gobject-introspection # For setup hook vala @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { colord glib gusb - gtk3 - libhandy + libadwaita + gtk4 libwebp packagekit sane-backends diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix index 0765b7af0b..c6165869a3 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix @@ -11,7 +11,7 @@ , libsoup_3 , webkitgtk_4_1 , icu -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , gdk-pixbuf , librsvg @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "sushi"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "al8UsFo0cf5DhTzCsOGuVITX+fhvfqN2F5gpub9Kwd0="; + hash = "sha256-lghbqqQwqyFCxgaqtcR+L7sv0+two1ITfmXFmlig8sY="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ninja gettext gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix index 1f6755002f..56da00923f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix @@ -13,7 +13,7 @@ , glib , gobject-introspection , totem-pl-parser -, wrapGAppsHook +, wrapGAppsHook3 , itstool , libxml2 , vala @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { python3Packages.python itstool gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Videos"; + homepage = "https://apps.gnome.org/Totem/"; description = "Movie player for the GNOME desktop based on GStreamer"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix index 2fa3ec0ecd..e440df2423 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Yelp"; + homepage = "https://gitlab.gnome.org/GNOME/yelp-xsl"; description = "Yelp's universal stylesheets for Mallard and DocBook"; maintainers = teams.gnome.members; license = with licenses; [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix index ee76194433..217c6afab0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix @@ -13,7 +13,7 @@ , libxml2 , libxslt , gst_all_1 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pkg-config gettext itstool - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Yelp"; + homepage = "https://apps.gnome.org/Yelp/"; description = "The help viewer in Gnome"; maintainers = teams.gnome.members; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix index a203e54055..aa98b8c833 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { mainProgram = "zenity"; description = "Tool to display dialogs from the commandline and shell scripts"; - homepage = "https://wiki.gnome.org/Projects/Zenity"; + homepage = "https://gitlab.gnome.org/GNOME/zenity"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix index 6a1bbde4f4..4a6577adbe 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -6,7 +6,7 @@ , pkg-config , gnome , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , glib , gobject-introspection , gi-docgen @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { pkg-config gettext itstool - wrapGAppsHook + wrapGAppsHook3 gobject-introspection gi-docgen # post install script @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "API documentation browser for GNOME"; mainProgram = "devhelp"; - homepage = "https://wiki.gnome.org/Apps/Devhelp"; + homepage = "https://apps.gnome.org/Devhelp/"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix index a36251e81e..48a42fb3a0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix @@ -54,7 +54,8 @@ let description = builtins.head (lib.splitString "\n" description); longDescription = description; homepage = link; - license = lib.licenses.gpl2Plus; # https://wiki.gnome.org/Projects/GnomeShell/Extensions/Review#Licensing + license = lib.licenses.gpl2Plus; # https://gjs.guide/extensions/review-guidelines/review-guidelines.html#licensing + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ]; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/default.nix index e6aac226f5..85b4fc5fca 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/default.nix @@ -67,7 +67,7 @@ in rec { gnome46Extensions = mapUuidNames (produceExtensionsList "46"); # Keep the last three versions in here - gnomeExtensions = lib.trivial.pipe (gnome44Extensions // gnome45Extensions) [ + gnomeExtensions = lib.trivial.pipe (gnome44Extensions // gnome45Extensions // gnome46Extensions) [ (v: builtins.removeAttrs v [ "__attrsFailEvaluation" ]) # Apply some custom patches for automatically packaged extensions (callPackage ./extensionOverrides.nix {}) diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix index 6fd01d1b52..373715d357 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -21,7 +21,7 @@ , touchegg , util-linux , vte -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils }: let @@ -46,7 +46,7 @@ super: lib.trivial.pipe super [ })) (patchExtension "ddterm@amezin.github.com" (old: { - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; buildInputs = [ vte ]; postFixup = '' substituteInPlace "$out/share/gnome-shell/extensions/ddterm@amezin.github.com/bin/com.github.amezin.ddterm" --replace "gjs" "${gjs}/bin/gjs" @@ -94,7 +94,7 @@ super: lib.trivial.pipe super [ })) (patchExtension "gtk4-ding@smedius.gitlab.com" (old: { - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; patches = [ (substituteAll { inherit gjs util-linux xdg-utils; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix index b3aaf3fa15..6d43b575c7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -17,6 +17,9 @@ "batime@martin.zurowietz.de" = "battery-time"; "batterytime@typeof.pw" = "battery-time-2"; + "power-profile-indicator@laux.wtf" = "power-profile-indicator"; + "power-profile@fthx" = "power-profile-indicator-2"; + # ############################################################################ # These are conflicts for older extensions (i.e. they don't support the latest GNOME version). # Make sure to move them up once they are updated diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json index 470b4aa9af..7ce60200a4 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json @@ -6,7 +6,7 @@ "43": {"version": "28", "sha256": "12hwvdc7hk0p6p72fp4lj43wsq7gq0dwv6kra785v6q8mq298vvd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJNb3ZlX0Nsb2NrQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "44": {"version": "28", "sha256": "12hwvdc7hk0p6p72fp4lj43wsq7gq0dwv6kra785v6q8mq298vvd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJNb3ZlX0Nsb2NrQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "45": {"version": "29", "sha256": "0463xm7cm4m83j4jhhr4rq9b336dgqib0v2zh6wl5pzprn3p092h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIk1vdmVfQ2xvY2tAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}, - "46": {"version": "30", "sha256": "1k274i7hg4l0m4dcazcaifkb0rhm0kc56qd2xin9daz8ijrwgwzm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIk1vdmVfQ2xvY2tAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"} + "46": {"version": "31", "sha256": "0b5h8ra2a7d0lbkax9dqjsq3wbd9pfwiqi63m03wivy97hl8xg1i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIk1vdmVfQ2xvY2tAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"} }} , {"uuid": "Bottom_Panel@rmy.pobox.com", "name": "Frippery Bottom Panel", "pname": "bottom-panel", "description": "Add a bottom panel to the shell", "link": "https://extensions.gnome.org/extension/3/bottom-panel/", "shell_version_map": { "38": {"version": "49", "sha256": "09gsbnj564z8f7m593iv8j7s6f32230k0ikfsl1dlv1jsfpfn8zv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJvdHRvbSBwYW5lbCB0byB0aGUgc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJuYW1lIjogIkZyaXBwZXJ5IEJvdHRvbSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkuYm90dG9tLXBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIkJvdHRvbV9QYW5lbEBybXkucG9ib3guY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, @@ -210,7 +210,7 @@ "43": {"version": "104", "sha256": "1qsdr2jr0474z9hzcz1hk1hz10cq0v71f9p4zd4maxy0fqnsw84r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb21pZC9QZXJzaWFuLUNhbGVuZGFyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiUGVyc2lhbkNhbGVuZGFyQG94eWdlbndzLmNvbSIsCiAgInZlcnNpb24iOiAxMDQKfQ=="}, "44": {"version": "104", "sha256": "1qsdr2jr0474z9hzcz1hk1hz10cq0v71f9p4zd4maxy0fqnsw84r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb21pZC9QZXJzaWFuLUNhbGVuZGFyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiUGVyc2lhbkNhbGVuZGFyQG94eWdlbndzLmNvbSIsCiAgInZlcnNpb24iOiAxMDQKfQ=="}, "45": {"version": "107", "sha256": "1nkqfk7r6rvagfr5wvg5adxm5p70c0v61n8hc63cq8yrg4432jcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29taWQvUGVyc2lhbi1DYWxlbmRhci1mb3ItR25vbWUtU2hlbGwiLAogICJ1dWlkIjogIlBlcnNpYW5DYWxlbmRhckBveHlnZW53cy5jb20iLAogICJ2ZXJzaW9uIjogMTA3Cn0="}, - "46": {"version": "109", "sha256": "0dqsxmjaicfya7prkhcs84klgfdqx3n7pq37j7sizxnlpwv8v0sx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29taWQvUGVyc2lhbi1DYWxlbmRhci1mb3ItR25vbWUtU2hlbGwiLAogICJ1dWlkIjogIlBlcnNpYW5DYWxlbmRhckBveHlnZW53cy5jb20iLAogICJ2ZXJzaW9uIjogMTA5Cn0="} + "46": {"version": "110", "sha256": "0vgnnxng5983s0qz7v2g1mh25qy6ydvr8yc9jrsm11bz9ckysp52", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEuIFBlcnNpYW4gY2FsZW5kYXJcbjIuIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy4gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC4gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LiBFdmVudHM6XG41LjEuIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUuMi4gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS4zLiBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUuNC4gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LjUuIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFx1MjAxY3JhdGVcdTIwMWQgaGVyZSBhbmQgXHUyMDFjc3Rhclx1MjAxZCB0aGUgcHJvamVjdCBvbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhIiwKICAibmFtZSI6ICJQZXJzaWFuIENhbGVuZGFyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJPbWlkIE1vdHRhZ2hpIFJhZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzaWFuLWNhbGVuZGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29taWQvUGVyc2lhbi1DYWxlbmRhci1mb3ItR25vbWUtU2hlbGwiLAogICJ1dWlkIjogIlBlcnNpYW5DYWxlbmRhckBveHlnZW53cy5jb20iLAogICJ2ZXJzaW9uIjogMTEwCn0="} }} , {"uuid": "notifications-alert-on-user-menu@hackedbellini.gmail.com", "name": "Notifications Alert", "pname": "notifications-alert-on-user-menu", "description": "Changes the color of the time and date indicator in the top bar when there are unread notifications. Colors and blinking are customizable.\n\nIf you have questions, please take a look at the FAQ:\nhttp://goo.gl/lmwtW\n\nCredits: The idea of painting the message on user's menu was borrowed from 'Pidgin Persistent Notification' extension by nemo. The code itself has some parts forked from 'Message Notifier' extension by barisione, 'Media player indicator' extension by eon and convenience.js from git.gnome.org/gnome-shell-extensions. The blink idea and it's initial code was written by hossman. The initial gnome 3.10 support was done by Anthony25. The filtering support was done by ilgarmehmetali", "link": "https://extensions.gnome.org/extension/258/notifications-alert-on-user-menu/", "shell_version_map": { "40": {"version": "47", "sha256": "0pvm01r7x8cl8dww1bm491znlcrymcnq4ndrbfxjlvigdnk46pz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW5ldmVyIHRoZXJlIGlzIGFuIHVucmVhZCBub3RpZmljYXRpb24gKGUuZy4gY2hhdCBtZXNzYWdlcyksIGJsaW5rcyB0aGUgbWVzc2FnZSBpbiB0aGUgdXNlcidzIG1lbnUgd2l0aCBhIGNvbG9yIGNob3NlbiBieSB0aGUgdXNlci5cblxuTm93IGNvbmZpZ3VyYWJsZSAoMy40KyBvbmx5KSEhIEFsZXJ0IGNvbG9yIGFuZCBibGluayByYXRlIGNhbiBiZSBjaGFuZ2VkIG9uIHNldHRpbmdzIDspXG5cbklmIHlvdSBoYXZlIGFueSBxdWVzdGlvbiwgYmUgc3VyZSB0byB0YWtlIGEgbG9vayBhdCB0aGUgRkFROlxuaHR0cDovL2dvby5nbC9sbXd0VyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLW5vdGlmaWNhdGlvbnMtYWxlcnQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgQWxlcnQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlRoaWFnbyBCZWxsaW5pIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb25zLWFsZXJ0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iZWxsaW5pNjY2L2dub21lLXNoZWxsLW5vdGlmaWNhdGlvbnMtYWxlcnQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnMtYWxlcnQtb24tdXNlci1tZW51QGhhY2tlZGJlbGxpbmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ3Cn0="}, @@ -236,7 +236,8 @@ "42": {"version": "22", "sha256": "1npc0y8bf5rrwl1v55hlf213pd5vp8wrj6qyhp2yhvz6km1ib6q2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "1npc0y8bf5rrwl1v55hlf213pd5vp8wrj6qyhp2yhvz6km1ib6q2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "44": {"version": "22", "sha256": "1npc0y8bf5rrwl1v55hlf213pd5vp8wrj6qyhp2yhvz6km1ib6q2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, - "45": {"version": "24", "sha256": "0qdmj4nzc1m7wg2rjzd5zxwgr786rfvdhdd5ivl9rs9raqz7sbq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0LmdmeG1vbmsuaW1wYXRpZW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHA6Ly9nZnhtb25rLm5ldC9kaXN0LzBpbnN0YWxsL2dub21lLXNoZWxsLWltcGF0aWVuY2UueG1sIiwKICAidXVpZCI6ICJpbXBhdGllbmNlQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDI0Cn0="} + "45": {"version": "25", "sha256": "0nrn3qaz3dv6wrf69ammp847ggkcxmzmzql91vr42r9ds9fr2gml", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0LmdmeG1vbmsuaW1wYXRpZW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2Z4bW9uay5uZXQvZGlzdC8waW5zdGFsbC9nbm9tZS1zaGVsbC1pbXBhdGllbmNlLnhtbCIsCiAgInV1aWQiOiAiaW1wYXRpZW5jZUBnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyNQp9"}, + "46": {"version": "25", "sha256": "0nrn3qaz3dv6wrf69ammp847ggkcxmzmzql91vr42r9ds9fr2gml", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0LmdmeG1vbmsuaW1wYXRpZW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2Z4bW9uay5uZXQvZGlzdC8waW5zdGFsbC9nbm9tZS1zaGVsbC1pbXBhdGllbmNlLnhtbCIsCiAgInV1aWQiOiAiaW1wYXRpZW5jZUBnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyNQp9"} }} , {"uuid": "windowoverlay-icons@sustmidown.centrum.cz", "name": "WindowOverlay Icons", "pname": "windowoverlay-icons", "description": "Add application icons to window overview", "link": "https://extensions.gnome.org/extension/302/windowoverlay-icons/", "shell_version_map": { "38": {"version": "37", "sha256": "108a5i5v62a9i61av5pib3b0hcpmb6pw3np7c29jfngs25n14wd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhcHBsaWNhdGlvbiBpY29ucyB0byB3aW5kb3cgb3ZlcnZpZXciLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aW5kb3dvdmVybGF5LWljb25zIiwKICAibmFtZSI6ICJXaW5kb3dPdmVybGF5IEljb25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd292ZXJsYXktaWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdXN0bWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd292ZXJsYXktaWNvbnMiLAogICJ1dWlkIjogIndpbmRvd292ZXJsYXktaWNvbnNAc3VzdG1pZG93bi5jZW50cnVtLmN6IiwKICAidmVyc2lvbiI6IDM3Cn0="} @@ -248,7 +249,8 @@ "42": {"version": "84", "sha256": "0a62pmg5jwp812nxb4gsxw2m0jn7p5l3y9m7a57zxzk6cy831asi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogODQKfQ=="}, "43": {"version": "84", "sha256": "0a62pmg5jwp812nxb4gsxw2m0jn7p5l3y9m7a57zxzk6cy831asi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogODQKfQ=="}, "44": {"version": "84", "sha256": "0a62pmg5jwp812nxb4gsxw2m0jn7p5l3y9m7a57zxzk6cy831asi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogODQKfQ=="}, - "45": {"version": "89", "sha256": "1h17jbc4p9cda77ysypdfg78lvb1mm3g5w93p1padl2598636v65", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL21pY2hlbGVnLmdpdGh1Yi5pby9kYXNoLXRvLWRvY2svIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2tAbWljeGd4LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA4OQp9"} + "45": {"version": "91", "sha256": "1knv9lcyc4cym9iphhijdm4ldnwly7kzdj3wywpkhnb0hn3ng95d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOTEKfQ=="}, + "46": {"version": "91", "sha256": "1knv9lcyc4cym9iphhijdm4ldnwly7kzdj3wywpkhnb0hn3ng95d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOTEKfQ=="} }} , {"uuid": "mythtv-fnx@fnxweb.com", "name": "MythTV", "pname": "mythtv", "description": "Displays MythTV status (free space and upcoming recordings)", "link": "https://extensions.gnome.org/extension/321/mythtv/", "shell_version_map": { "38": {"version": "10", "sha256": "070h11gk5zpxn5xbc71skdz174hbb72l0isia2vp7d9wy4ackl0k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbnh3ZWIvZ25vbWUtc2hlbGwtbXl0aHR2IiwKICAidXVpZCI6ICJteXRodHYtZm54QGZueHdlYi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, @@ -275,7 +277,8 @@ "42": {"version": "24", "sha256": "092ydcl7f0s9bfwnb8366hrjbfmd4xrjipfbqr6h6mwiavmphip9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3A5MXBhdWwvc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nQG1hdGhlbWF0aWNhbC5jb2ZmZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "43": {"version": "24", "sha256": "092ydcl7f0s9bfwnb8366hrjbfmd4xrjipfbqr6h6mwiavmphip9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3A5MXBhdWwvc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nQG1hdGhlbWF0aWNhbC5jb2ZmZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "44": {"version": "24", "sha256": "092ydcl7f0s9bfwnb8366hrjbfmd4xrjipfbqr6h6mwiavmphip9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3A5MXBhdWwvc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nQG1hdGhlbWF0aWNhbC5jb2ZmZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}, - "45": {"version": "26", "sha256": "187mxv4381sqh9xclnh1n3mq48dw6x5c4wdzknq3b8cglfv3ii6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS41IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wOTFwYXVsL3N0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZy1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZ0BtYXRoZW1hdGljYWwuY29mZmVlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"} + "45": {"version": "26", "sha256": "187mxv4381sqh9xclnh1n3mq48dw6x5c4wdzknq3b8cglfv3ii6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS41IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wOTFwYXVsL3N0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZy1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZ0BtYXRoZW1hdGljYWwuY29mZmVlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, + "46": {"version": "28", "sha256": "1hcb108xi257w4mnw2qddz2avfxd9vfir9vxn9c57wkclblzm2qd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS41IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wOTFwYXVsL3N0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZy1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZ0BtYXRoZW1hdGljYWwuY29mZmVlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"} }} , {"uuid": "activities-config@nls1729", "name": "Activities Configurator", "pname": "activities-configurator", "description": "Activities Configurator, activities-config@nls1729 - Effective March 29, 2021 the extension is NOT MAINTAINED. I give my permission to anyone who may want to become the maintainer. I do not have the free time or energy necessary to maintain the extension.\n\nConfigure the Activities Button and Top Panel. Select an icon. Change the text. Disable Hot Corner or set the Hot Corner Threshold. Set Panel Background color and transparency plus much more to enhance your desktop. Click the icon or text with the secondary mouse button to launch the GS Extension Prefs.", "link": "https://extensions.gnome.org/extension/358/activities-configurator/", "shell_version_map": { "38": {"version": "89", "sha256": "1z00smimg5fj6ri35g80bvfzzy5xxxrgwy4idsakphszdwryi8ny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2aXRpZXMgQ29uZmlndXJhdG9yLCBhY3Rpdml0aWVzLWNvbmZpZ0BubHMxNzI5IC0gIEVmZmVjdGl2ZSBNYXJjaCAyOSwgMjAyMSB0aGUgZXh0ZW5zaW9uIGlzIE5PVCBNQUlOVEFJTkVELiAgSSBnaXZlIG15IHBlcm1pc3Npb24gdG8gYW55b25lIHdobyBtYXkgd2FudCB0byBiZWNvbWUgdGhlIG1haW50YWluZXIuICBJIGRvIG5vdCBoYXZlIHRoZSBmcmVlIHRpbWUgb3IgZW5lcmd5IG5lY2Vzc2FyeSB0byBtYWludGFpbiB0aGUgZXh0ZW5zaW9uLlxuXG5Db25maWd1cmUgdGhlIEFjdGl2aXRpZXMgQnV0dG9uIGFuZCBUb3AgUGFuZWwuIFNlbGVjdCBhbiBpY29uLiBDaGFuZ2UgdGhlIHRleHQuIERpc2FibGUgSG90IENvcm5lciBvciBzZXQgdGhlIEhvdCBDb3JuZXIgVGhyZXNob2xkLiBTZXQgUGFuZWwgQmFja2dyb3VuZCBjb2xvciBhbmQgdHJhbnNwYXJlbmN5IHBsdXMgbXVjaCBtb3JlIHRvIGVuaGFuY2UgeW91ciBkZXNrdG9wLiAgQ2xpY2sgdGhlIGljb24gb3IgdGV4dCB3aXRoIHRoZSBzZWNvbmRhcnkgbW91c2UgYnV0dG9uIHRvIGxhdW5jaCB0aGUgR1MgRXh0ZW5zaW9uIFByZWZzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhY3Rpdml0aWVzLWNvbmZpZyIsCiAgImdldHRleHQtZG9tYWluIjogImFjdGl2aXRpZXMtY29uZmlnLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBDb25maWd1cmF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWN0aXZpdGllcy1jb25maWciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmxzMTcyOS5naXRodWIuaW8vYWN0aXZpdGllc19jb25maWcuaHRtbCIsCiAgInV1aWQiOiAiYWN0aXZpdGllcy1jb25maWdAbmxzMTcyOSIsCiAgInZlcnNpb24iOiA4OQp9"} @@ -400,7 +403,8 @@ "42": {"version": "53", "sha256": "18c8dykfnd7ci8d3lxcaimh60sbcsimrl8zygv85yhm44j8hcv8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTMKfQ=="}, "43": {"version": "53", "sha256": "18c8dykfnd7ci8d3lxcaimh60sbcsimrl8zygv85yhm44j8hcv8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTMKfQ=="}, "44": {"version": "53", "sha256": "18c8dykfnd7ci8d3lxcaimh60sbcsimrl8zygv85yhm44j8hcv8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTMKfQ=="}, - "45": {"version": "57", "sha256": "0gfg6x0cha5p2jrw1lzzhq84y5zxh1qxndx6ca89czc9cnagcgdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VidW50dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhcHBpbmRpY2F0b3JzdXBwb3J0QHJnY2pvbmFzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1Nwp9"} + "45": {"version": "58", "sha256": "1fbf4n2wvli1hayv6mhmncx4jh30gp4a6gmh5l6j6xman8lig319", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, + "46": {"version": "58", "sha256": "1fbf4n2wvli1hayv6mhmncx4jh30gp4a6gmh5l6j6xman8lig319", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTgKfQ=="} }} , {"uuid": "bitcoin-markets@ottoallmendinger.github.com", "name": "Bitcoin Markets", "pname": "bitcoin-markets", "description": "Display info on various crypto-currency exchanges.", "link": "https://extensions.gnome.org/extension/648/bitcoin-markets/", "shell_version_map": { "38": {"version": "57", "sha256": "1dbrkr49gi93nps610afvw2q68d1ialkhxsxd0waa8xgwjxwzyxd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjU3IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3R0b0FsbG1lbmRpbmdlci9nbm9tZS1zaGVsbC1iaXRjb2luLW1hcmtldHMvIiwKICAidXVpZCI6ICJiaXRjb2luLW1hcmtldHNAb3R0b2FsbG1lbmRpbmdlci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="}, @@ -409,7 +413,8 @@ "42": {"version": "66", "sha256": "0a1156n4ding1ypjnxm1xz5cqihrf5m2d4bf2zmci29nsjina9c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY2IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Ngp9"}, "43": {"version": "67", "sha256": "114kwp1q0qzkd03851mky1syxz8i5zgvazb53rh800wacb4wsh5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY3IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Nwp9"}, "44": {"version": "68", "sha256": "1b936kcvc29p19nzwk32bswgjd7bsj5ap47fw65cz81rracb46fi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY4IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2OAp9"}, - "45": {"version": "71", "sha256": "1g1jglchqyg47a50pgybarmiq5fafvvq0y4y9m8v3ra89w4mh1jq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjcxIiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3MQp9"} + "45": {"version": "71", "sha256": "1g1jglchqyg47a50pgybarmiq5fafvvq0y4y9m8v3ra89w4mh1jq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjcxIiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3MQp9"}, + "46": {"version": "72", "sha256": "1g24qcg599bbmrh9z1rwd19wjd41qgk9qgh332g82f680827vfm9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjcxLTEtZ2JlMDY2ODgtZGlydHkiLAogICJuYW1lIjogIkJpdGNvaW4gTWFya2V0cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaXRjb2luLW1hcmtldHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3R0b0FsbG1lbmRpbmdlci9nbm9tZS1zaGVsbC1iaXRjb2luLW1hcmtldHMvIiwKICAidXVpZCI6ICJiaXRjb2luLW1hcmtldHNAb3R0b2FsbG1lbmRpbmdlci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcyCn0="} }} , {"uuid": "ShellTile@emasab.it", "name": "ShellTile", "pname": "shelltile", "description": "A tiling window extension for GNOME Shell. Just move a window to the edges of the screen to create a tiling, otherwise move a window over another one, holding down the Control key. Grouped windows minimize, resize, raise and change workspace together. Move or maximize a window to remove it from the group.", "link": "https://extensions.gnome.org/extension/657/shelltile/", "shell_version_map": { "38": {"version": "69", "sha256": "1kpsqaq2fcj1z3jcbvgh23c8k6bv9l6vyl05kpw0fclzsmy60mh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGlsaW5nIHdpbmRvdyBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBKdXN0IG1vdmUgYSB3aW5kb3cgdG8gdGhlIGVkZ2VzIG9mIHRoZSBzY3JlZW4gdG8gY3JlYXRlIGEgdGlsaW5nLCBvdGhlcndpc2UgbW92ZSBhIHdpbmRvdyBvdmVyIGFub3RoZXIgb25lLCBob2xkaW5nIGRvd24gdGhlIENvbnRyb2wga2V5LiBHcm91cGVkIHdpbmRvd3MgbWluaW1pemUsIHJlc2l6ZSwgcmFpc2UgYW5kIGNoYW5nZSB3b3Jrc3BhY2UgdG9nZXRoZXIuIE1vdmUgb3IgbWF4aW1pemUgYSB3aW5kb3cgdG8gcmVtb3ZlIGl0IGZyb20gdGhlIGdyb3VwLiIsCiAgImdldHRleHQtZG9tYWluIjogInNoZWxsdGlsZSIsCiAgIm5hbWUiOiAiU2hlbGxUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNoZWxsdGlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW1hc2FiL3NoZWxsdGlsZSIsCiAgInV1aWQiOiAiU2hlbGxUaWxlQGVtYXNhYi5pdCIsCiAgInZlcnNpb24iOiA2OQp9"} @@ -534,7 +539,7 @@ "43": {"version": "47", "sha256": "1w34xlbsphxp0k9smlcf8kq9ccq15yarnf265q0fbh6qc7lgfj4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LiIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "44": {"version": "47", "sha256": "1w34xlbsphxp0k9smlcf8kq9ccq15yarnf265q0fbh6qc7lgfj4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LiIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "45": {"version": "57", "sha256": "1cpa30a9y6gw9k27njcb795j3vdwpx2jfivz858zs2k5n9wl9ypq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBtb3N0IHBvcHVsYXIgY2xpcGJvYXJkIG1hbmFnZXIgZm9yIEdOT01FLCB3aXRoIG92ZXIgMU0gZG93bmxvYWRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2xpcGJvYXJkLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbGlwYm9hcmQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}, - "46": {"version": "61", "sha256": "115qvifq5sskpxjrs5srkqafs3cykwrv9yndvi75v7xyjri4lzrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBtb3N0IHBvcHVsYXIgY2xpcGJvYXJkIG1hbmFnZXIgZm9yIEdOT01FLCB3aXRoIG92ZXIgMU0gZG93bmxvYWRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2xpcGJvYXJkLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbGlwYm9hcmQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogNjEKfQ=="} + "46": {"version": "62", "sha256": "176j2z381pyw5d754b77ykq7mjvfgwj3xxjdjcysbvf81lafajmb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBtb3N0IHBvcHVsYXIgY2xpcGJvYXJkIG1hbmFnZXIgZm9yIEdOT01FLCB3aXRoIG92ZXIgMU0gZG93bmxvYWRzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2xpcGJvYXJkLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbGlwYm9hcmQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="} }} , {"uuid": "pidgin@muffinmad", "name": "Pidgin IM integration", "pname": "pidgin-im-integration", "description": "Integrate Pidgin IMs in the Gnome Shell message tray", "link": "https://extensions.gnome.org/extension/782/pidgin-im-integration/", "shell_version_map": { "40": {"version": "44", "sha256": "0s7xra49fbm5byh82ihwrz0b8bvli0bmsmwz58868bl42zb0l0zs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBQaWRnaW4gSU1zIGluIHRoZSBHbm9tZSBTaGVsbCBtZXNzYWdlIHRyYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tcGlkZ2luIiwKICAibmFtZSI6ICJQaWRnaW4gSU0gaW50ZWdyYXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlkZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211ZmZpbm1hZC9waWRnaW4taW0tZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJwaWRnaW5AbXVmZmlubWFkIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, @@ -773,7 +778,7 @@ "44": {"version": "20", "sha256": "0ymrcci3pn62x80kazp2rn3yb52pz885w99djl25s8x764nzksjd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL251bm9mYXJydWNhL1dpbmRvd0lzUmVhZHlfUmVtb3ZlciIsCiAgInV1aWQiOiAid2luZG93SXNSZWFkeV9SZW1vdmVyQG51bm9mYXJydWNhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "45": {"version": "22", "sha256": "0dm711ds72xgkim2jq3g6yjv253ryh3gzmbsxgqvj0ja5wzpks5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbnVub2ZhcnJ1Y2EvV2luZG93SXNSZWFkeV9SZW1vdmVyIiwKICAidXVpZCI6ICJ3aW5kb3dJc1JlYWR5X1JlbW92ZXJAbnVub2ZhcnJ1Y2FAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="} }} -, {"uuid": "arch-update@RaphaelRochet", "name": "Arch Linux Updates Indicator", "pname": "archlinux-updates-indicator", "description": "Update indicator for Arch Linux and GNOME Shell.\n** Note : you now need to install the package pacman-contrib to use the checkupdates script. **\n Can support AUR or other distros by changing command used to check for and apply updates.\n See README about Gnome Console", "link": "https://extensions.gnome.org/extension/1010/archlinux-updates-indicator/", "shell_version_map": { +, {"uuid": "arch-update@RaphaelRochet", "name": "Arch Linux Updates Indicator", "pname": "archlinux-updates-indicator", "description": "Update indicator for Arch Linux and GNOME Shell.\n** Note : you now need to install the package pacman-contrib to use the checkupdates script. **\n Can support AUR or other distros by changing command used to check for and apply updates. There are examples in the wiki page on GitHub.\n See README about Gnome Console", "link": "https://extensions.gnome.org/extension/1010/archlinux-updates-indicator/", "shell_version_map": { "38": {"version": "39", "sha256": "1wcyjy9idj674s7pyz0210pb6kzb3jmj1fv08cm93frdl9g61dn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMSIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "40": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"}, "41": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"}, @@ -781,7 +786,7 @@ "43": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"}, "44": {"version": "53", "sha256": "09vkzz2rkjaf0z3snpkd67brq2kimq5l2clyhyfvyp2wf71f5zp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1Mwp9"}, "45": {"version": "57", "sha256": "1g66g1abf0hsshihc76n3qznfd476sxg8yrj8h279cvqh8q6xgqx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcmNoLXVwZGF0ZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNoLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYXBoYWVsUm9jaGV0L2FyY2gtdXBkYXRlIiwKICAidXVpZCI6ICJhcmNoLXVwZGF0ZUBSYXBoYWVsUm9jaGV0IiwKICAidmVyc2lvbiI6IDU3Cn0="}, - "46": {"version": "60", "sha256": "1gpmqxlnnf7g9a528dwj6dzmllxvs11v1wnsc1awjkc7qbv77ywi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcmNoLXVwZGF0ZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNoLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYXBoYWVsUm9jaGV0L2FyY2gtdXBkYXRlIiwKICAidXVpZCI6ICJhcmNoLXVwZGF0ZUBSYXBoYWVsUm9jaGV0IiwKICAidmVyc2lvbiI6IDYwCn0="} + "46": {"version": "61", "sha256": "19zicr5d5pl954i45zglpyh8h99z9plsnmajbsx8n2q2awbl2svf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcmNoLXVwZGF0ZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNoLXVwZGF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYXBoYWVsUm9jaGV0L2FyY2gtdXBkYXRlIiwKICAidXVpZCI6ICJhcmNoLXVwZGF0ZUBSYXBoYWVsUm9jaGV0IiwKICAidmVyc2lvbiI6IDYxCn0="} }} , {"uuid": "dynamic-panel-transparency@rockon999.github.io", "name": "Dynamic Panel Transparency", "pname": "dynamic-panel-transparency", "description": "This extension fades your top panel to nothingness when there are no maximized windows present. Never again will the panel be abruptly darkened!", "link": "https://extensions.gnome.org/extension/1011/dynamic-panel-transparency/", "shell_version_map": { "38": {"version": "34", "sha256": "118j8sc295szqlsz7r7sdywvp5lxpzpv24q2g1f4lzl79v6i9i1m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGZhZGVzIHlvdXIgdG9wIHBhbmVsIHRvIG5vdGhpbmduZXNzIHdoZW4gdGhlcmUgYXJlIG5vIG1heGltaXplZCB3aW5kb3dzIHByZXNlbnQuIE5ldmVyIGFnYWluIHdpbGwgdGhlIHBhbmVsIGJlIGFicnVwdGx5IGRhcmtlbmVkISIsCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5IiwKICAibmFtZSI6ICJEeW5hbWljIFBhbmVsIFRyYW5zcGFyZW5jeSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5keW5hbWljLXBhbmVsLXRyYW5zcGFyZW5jeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V3bHNoL2R5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5LyIsCiAgInV1aWQiOiAiZHluYW1pYy1wYW5lbC10cmFuc3BhcmVuY3lAcm9ja29uOTk5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzNAp9"}, @@ -865,7 +870,8 @@ "42": {"version": "27", "sha256": "08l9xsbndgi7v863x76q4br89gjysaxwx8rhfkcp2nwqw247wfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "43": {"version": "31", "sha256": "1kv8n1iv436pfxc3in6p2m9apr4jjhc120l5x3wn2z6chryxspl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tLzJudjJ1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeW5jdGhpbmctaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzeW5jdGhpbmdAZ25vbWUuMm52MnUuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "44": {"version": "31", "sha256": "1kv8n1iv436pfxc3in6p2m9apr4jjhc120l5x3wn2z6chryxspl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tLzJudjJ1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeW5jdGhpbmctaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzeW5jdGhpbmdAZ25vbWUuMm52MnUuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, - "45": {"version": "34", "sha256": "10r0xawan7n6jsb2ffmh2v66b42y0j526waj71882b3ridq3w9a8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeW5jdGhpbmdAZ25vbWUuMm52MnUuY29tIiwKICAibmFtZSI6ICJTeW5jdGhpbmcgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tLzJudjJ1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeW5jdGhpbmctaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzeW5jdGhpbmdAZ25vbWUuMm52MnUuY29tIiwKICAidmVyc2lvbiI6IDM0Cn0="} + "45": {"version": "35", "sha256": "0q9scpih53y3i1ybjqcfr0jmk4caykk2pyl5739yqw0f6y64mkca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeW5jdGhpbmdAZ25vbWUuMm52MnUuY29tIiwKICAibmFtZSI6ICJTeW5jdGhpbmcgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, + "46": {"version": "35", "sha256": "0q9scpih53y3i1ybjqcfr0jmk4caykk2pyl5739yqw0f6y64mkca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeW5jdGhpbmdAZ25vbWUuMm52MnUuY29tIiwKICAibmFtZSI6ICJTeW5jdGhpbmcgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"} }} , {"uuid": "applications-overview-tooltip@RaphaelRochet", "name": "Applications Overview Tooltip", "pname": "applications-overview-tooltip", "description": "Shows a tooltip over applications icons on applications overview with application name and/or description.", "link": "https://extensions.gnome.org/extension/1071/applications-overview-tooltip/", "shell_version_map": { "38": {"version": "11", "sha256": "0alvg0l46hls3jz3a5ic21fgbjbg0kv0nn0pkknzsgjfw5mmwz69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYXBoYWVsUm9jaGV0L2FwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwIiwKICAidXVpZCI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcEBSYXBoYWVsUm9jaGV0IiwKICAidmVyc2lvbiI6IDExCn0="}, @@ -910,7 +916,8 @@ "42": {"version": "11", "sha256": "0ppvb3j8f8b9r1n72cdwwjj488grvqnk9b3j0y103kgwbxhr8qw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJqYW4vZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImdub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "11", "sha256": "0ppvb3j8f8b9r1n72cdwwjj488grvqnk9b3j0y103kgwbxhr8qw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJqYW4vZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImdub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "44": {"version": "11", "sha256": "0ppvb3j8f8b9r1n72cdwwjj488grvqnk9b3j0y103kgwbxhr8qw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJqYW4vZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImdub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, - "45": {"version": "12", "sha256": "07h3yi0hfhmpa875hdqdwq45s2dsasg9x9gcwx8qc0z8xcrp2649", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmphbi9nbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2VAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"} + "45": {"version": "13", "sha256": "19rg75wpw1ar1wg6qxw4v9hwd9g1nwgf0n94j5f9y71b6q4a17j3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJqYW4vZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImdub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, + "46": {"version": "13", "sha256": "19rg75wpw1ar1wg6qxw4v9hwd9g1nwgf0n94j5f9y71b6q4a17j3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJqYW4vZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImdub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="} }} , {"uuid": "KeepAwake@jepfa.de", "name": "Keep awake!", "pname": "keep-awake", "description": "Keep your computer awake! Prevents that your computer activates sceensaver, turns off screen(s) or goes to hibernate when not actively used for a while. Click the indicator icon once to keep your computer awake for the current session. Click again to keep it awake also between restarts (indicated by a small lock icon on the indicator). Clicking again to not keep awake.", "link": "https://extensions.gnome.org/extension/1097/keep-awake/", "shell_version_map": { "38": {"version": "11", "sha256": "0v16xkjry4anjk12iy5p1ny5mh3ckbf4s4h9qmbfljfhmzsfkm09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZW5zcGZhaGwvS2VlcEF3YWtlIiwKICAidXVpZCI6ICJLZWVwQXdha2VAamVwZmEuZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, @@ -1081,7 +1088,8 @@ "42": {"version": "39", "sha256": "1p7k1jlbbi8ahbwi6bcscykikifdl4sr0bhl9war1m5aiasf2dk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDM5Cn0="}, "43": {"version": "36", "sha256": "0cgjsq1m508255pnr28l7a3170iz6nh92vzzzcb9a1w6lk7wws14", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0VsaW52ZW50aW9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1uYXNhLWFwb2QiLAogICJ1dWlkIjogIm5hc2FfYXBvZEBlbGludmVudGlvbi5vdmgiLAogICJ2ZXJzaW9uIjogMzYKfQ=="}, "44": {"version": "36", "sha256": "0cgjsq1m508255pnr28l7a3170iz6nh92vzzzcb9a1w6lk7wws14", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0VsaW52ZW50aW9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1uYXNhLWFwb2QiLAogICJ1dWlkIjogIm5hc2FfYXBvZEBlbGludmVudGlvbi5vdmgiLAogICJ2ZXJzaW9uIjogMzYKfQ=="}, - "45": {"version": "38", "sha256": "0ycjwzg7p6lsw06czbahiayfnw8s3am9mpxd2ninlirgmx95158d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hc2EtYXBvZCIsCiAgInV1aWQiOiAibmFzYV9hcG9kQGVsaW52ZW50aW9uLm92aCIsCiAgInZlcnNpb24iOiAzOAp9"} + "45": {"version": "40", "sha256": "0kw9mbdsw5awxbg09xc5snkn0dcn9vnp3w2za792hv1gvp1vkrzh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0VsaW52ZW50aW9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1uYXNhLWFwb2QiLAogICJ1dWlkIjogIm5hc2FfYXBvZEBlbGludmVudGlvbi5vdmgiLAogICJ2ZXJzaW9uIjogNDAKfQ=="}, + "46": {"version": "40", "sha256": "0kw9mbdsw5awxbg09xc5snkn0dcn9vnp3w2za792hv1gvp1vkrzh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0VsaW52ZW50aW9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1uYXNhLWFwb2QiLAogICJ1dWlkIjogIm5hc2FfYXBvZEBlbGludmVudGlvbi5vdmgiLAogICJ2ZXJzaW9uIjogNDAKfQ=="} }} , {"uuid": "SystemMenu@jonnius.github.com", "name": "System Menu", "pname": "system-menu", "description": "System menu with usefull shortcuts", "link": "https://extensions.gnome.org/extension/1204/system-menu/", "shell_version_map": { "38": {"version": "5", "sha256": "10zfr3fhqvq0fxqjzqmnxmhmdw5xcw9m5k3jm1apcjqnm38r896w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBtZW51IHdpdGggdXNlZnVsbCBzaG9ydGN1dHMiLAogICJuYW1lIjogIlN5c3RlbSBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlN5c3RlbU1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL2pvbm5pdXMvZ25vbWUtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogIlN5c3RlbU1lbnVAam9ubml1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="} @@ -1204,7 +1212,8 @@ "42": {"version": "9", "sha256": "0bynvnz5vb4v1h83f0qbv3brjqvz780vawy0ym8lpzz8ghl3kvsr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgRFM1L0RTNC9EUzMgYmF0dGVyeSByZW1haW5pbmcgcG93ZXIgcGVyY2VudGFnZSBhdCB0aGUgdG9wIHBhbmVsIiwKICAibmFtZSI6ICJEdWFsU2hvY2svRHVhbFNlbnNlIGJhdHRlcnkgcGVyY2VudGFnZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWVAc2xpZS5ydSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoYW5ranVyYS9kczRiYXR0ZXJ5IiwKICAidXVpZCI6ICJkczRiYXR0ZXJ5QHNsaWUucnUiLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "0bynvnz5vb4v1h83f0qbv3brjqvz780vawy0ym8lpzz8ghl3kvsr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgRFM1L0RTNC9EUzMgYmF0dGVyeSByZW1haW5pbmcgcG93ZXIgcGVyY2VudGFnZSBhdCB0aGUgdG9wIHBhbmVsIiwKICAibmFtZSI6ICJEdWFsU2hvY2svRHVhbFNlbnNlIGJhdHRlcnkgcGVyY2VudGFnZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWVAc2xpZS5ydSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoYW5ranVyYS9kczRiYXR0ZXJ5IiwKICAidXVpZCI6ICJkczRiYXR0ZXJ5QHNsaWUucnUiLAogICJ2ZXJzaW9uIjogOQp9"}, "44": {"version": "9", "sha256": "0bynvnz5vb4v1h83f0qbv3brjqvz780vawy0ym8lpzz8ghl3kvsr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgRFM1L0RTNC9EUzMgYmF0dGVyeSByZW1haW5pbmcgcG93ZXIgcGVyY2VudGFnZSBhdCB0aGUgdG9wIHBhbmVsIiwKICAibmFtZSI6ICJEdWFsU2hvY2svRHVhbFNlbnNlIGJhdHRlcnkgcGVyY2VudGFnZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWVAc2xpZS5ydSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoYW5ranVyYS9kczRiYXR0ZXJ5IiwKICAidXVpZCI6ICJkczRiYXR0ZXJ5QHNsaWUucnUiLAogICJ2ZXJzaW9uIjogOQp9"}, - "45": {"version": "10", "sha256": "0sdy493fg4k7d50vbpyi6x8ivczb1061lkb7arqqv0yhsgsyl26b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgRFM1L0RTNC9EUzMgYmF0dGVyeSByZW1haW5pbmcgcG93ZXIgcGVyY2VudGFnZSBhdCB0aGUgdG9wIHBhbmVsIiwKICAibmFtZSI6ICJEdWFsU2hvY2svRHVhbFNlbnNlIGJhdHRlcnkgcGVyY2VudGFnZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWVAc2xpZS5ydSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhhbmtqdXJhL2RzNGJhdHRlcnkiLAogICJ1dWlkIjogImRzNGJhdHRlcnlAc2xpZS5ydSIsCiAgInZlcnNpb24iOiAxMAp9"} + "45": {"version": "11", "sha256": "0qdy4v3165y703jy6zknd7qxsm979wpcn16lhlcv89mlnaczrm0k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgRFM1L0RTNC9EUzMgYmF0dGVyeSByZW1haW5pbmcgcG93ZXIgcGVyY2VudGFnZSBhdCB0aGUgdG9wIHBhbmVsIiwKICAibmFtZSI6ICJEdWFsU2hvY2svRHVhbFNlbnNlIGJhdHRlcnkgcGVyY2VudGFnZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWVAc2xpZS5ydSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoYW5ranVyYS9kczRiYXR0ZXJ5IiwKICAidXVpZCI6ICJkczRiYXR0ZXJ5QHNsaWUucnUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, + "46": {"version": "11", "sha256": "0qdy4v3165y703jy6zknd7qxsm979wpcn16lhlcv89mlnaczrm0k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgRFM1L0RTNC9EUzMgYmF0dGVyeSByZW1haW5pbmcgcG93ZXIgcGVyY2VudGFnZSBhdCB0aGUgdG9wIHBhbmVsIiwKICAibmFtZSI6ICJEdWFsU2hvY2svRHVhbFNlbnNlIGJhdHRlcnkgcGVyY2VudGFnZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWVAc2xpZS5ydSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoYW5ranVyYS9kczRiYXR0ZXJ5IiwKICAidXVpZCI6ICJkczRiYXR0ZXJ5QHNsaWUucnUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="} }} , {"uuid": "hotel-manager@hardpixel.eu", "name": "Hotel Manager", "pname": "hotel-manager", "description": "Hotel Manager allows to start and stop the Hotel daemon and your development servers via a menu in the status area.", "link": "https://extensions.gnome.org/extension/1285/hotel-manager/", "shell_version_map": { "38": {"version": "20", "sha256": "0wzal14p19x0wqm0g3nih645hz9lg2cri0gf83magl02nl76rxzp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhvdGVsIE1hbmFnZXIgYWxsb3dzIHRvIHN0YXJ0IGFuZCBzdG9wIHRoZSBIb3RlbCBkYWVtb24gYW5kIHlvdXIgZGV2ZWxvcG1lbnQgc2VydmVycyB2aWEgYSBtZW51IGluIHRoZSBzdGF0dXMgYXJlYS4iLAogICJuYW1lIjogIkhvdGVsIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9ob3RlbC1tYW5hZ2VyIiwKICAidXVpZCI6ICJob3RlbC1tYW5hZ2VyQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAyMAp9"}, @@ -1237,7 +1246,8 @@ "42": {"version": "50", "sha256": "1rn5pf3s7b1iy8i63afa8a40590v6cn919rdn9shxcdxww97rj9n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUwCn0="}, "43": {"version": "54", "sha256": "1964vai2d5jn0s9aa0nckdsq17mgirl57jznp5glhp4gpq5y970j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDU0Cn0="}, "44": {"version": "55", "sha256": "048ykk6mzvvdwi9kyppgcgl0dhv2pda9ify7m6fq2xkmkyxk39ka", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDU1Cn0="}, - "45": {"version": "56", "sha256": "1f24lagkn7wi250f5yq1s472asm845ad8njm3fgwjx2dgfv4bmhc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDU2Cn0="} + "45": {"version": "56", "sha256": "1f24lagkn7wi250f5yq1s472asm845ad8njm3fgwjx2dgfv4bmhc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDU2Cn0="}, + "46": {"version": "57", "sha256": "14y3zqrg06y1himnriwk09r3j0jlv0xh695gxxdpr379fnhzqzv2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoLCBpT1MsIG1hY09TIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDU3Cn0="} }} , {"uuid": "nvidiautil@ethanwharris", "name": "NVIDIA GPU Stats Tool", "pname": "nvidia-gpu-stats-tool", "description": "Shows NVIDIA GPU stats in the toolbar. Requires nvidia-settings or nvidia-smi. Includes Bumblebee support.", "link": "https://extensions.gnome.org/extension/1320/nvidia-gpu-stats-tool/", "shell_version_map": { "38": {"version": "8", "sha256": "12yi2kcq2rm1ddb8djjlffvk6dhpfd996wjhwdf4jch1r85r8a30", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5WSURJQSBHUFUgc3RhdHMgaW4gdGhlIHRvb2xiYXIuIFJlcXVpcmVzIG52aWRpYS1zZXR0aW5ncyBvciBudmlkaWEtc21pLiBJbmNsdWRlcyBCdW1ibGViZWUgc3VwcG9ydC4iLAogICJuYW1lIjogIk5WSURJQSBHUFUgU3RhdHMgVG9vbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5udmlkaWF1dGlsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXRoYW53aGFycmlzL2dub21lLW52aWRpYS1leHRlbnNpb24iLAogICJ1dWlkIjogIm52aWRpYXV0aWxAZXRoYW53aGFycmlzIiwKICAidmVyc2lvbiI6IDgKfQ=="}, @@ -1343,7 +1353,8 @@ "42": {"version": "12", "sha256": "0bdspqf9vyhfv9rcj1xz9jkswh4gy3laj2vhnfsl64skfp2c8qsl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "43": {"version": "12", "sha256": "0bdspqf9vyhfv9rcj1xz9jkswh4gy3laj2vhnfsl64skfp2c8qsl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "44": {"version": "12", "sha256": "0bdspqf9vyhfv9rcj1xz9jkswh4gy3laj2vhnfsl64skfp2c8qsl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, - "45": {"version": "14", "sha256": "1jaxplknxsxwvvb79lngvciknwxs17dkgmjrl0ncwnw6370gdkh2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3N5c3BlZWstZ3MiLAogICJ1dWlkIjogInN5c3BlZWstZ3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxNAp9"} + "45": {"version": "15", "sha256": "1h97v8v19lwvc5xcmxyyikmrs8lz3kxhx55hh5wahdk8gi8yycbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, + "46": {"version": "15", "sha256": "1h97v8v19lwvc5xcmxyyikmrs8lz3kxhx55hh5wahdk8gi8yycbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="} }} , {"uuid": "discrete-brightness@gs.eros2.info", "name": "Discrete brightness", "pname": "discrete-brightness", "description": "Discrete brightness indicator changes brightness in discrete steps, unlike default smooth brightness bar in Gnome Shell. Extension for notebooks/tablets only, default brightness bar must be present in Gnome Shell.", "link": "https://extensions.gnome.org/extension/1410/discrete-brightness/", "shell_version_map": { "38": {"version": "7", "sha256": "0p9ljikhp0l7m2yq0rdr9xkamyrrc4jdcnicbq8qli2zfj5n97g2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZXMgYnJpZ2h0bmVzcyBpbiBkaXNjcmV0ZSBzdGVwcywgdW5saWtlIGRlZmF1bHQgc21vb3RoIGJyaWdodG5lc3MgYmFyIGluIEdub21lIFNoZWxsLiBFeHRlbnNpb24gZm9yIG5vdGVib29rcy90YWJsZXRzIG9ubHksIGRlZmF1bHQgYnJpZ2h0bmVzcyBiYXIgbXVzdCBiZSBwcmVzZW50IGluIEdub21lIFNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzY3JldGUgYnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vZGlzY3JldGUtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZGlzY3JldGUtYnJpZ2h0bmVzc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, @@ -1378,7 +1389,8 @@ "42": {"version": "13", "sha256": "0crmp0fxmca3xkgplnsd22jzyhvdsppfjhx9h1393slvm10w5i5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "13", "sha256": "0crmp0fxmca3xkgplnsd22jzyhvdsppfjhx9h1393slvm10w5i5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDEzCn0="}, "44": {"version": "13", "sha256": "0crmp0fxmca3xkgplnsd22jzyhvdsppfjhx9h1393slvm10w5i5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDEzCn0="}, - "45": {"version": "15", "sha256": "0jnhjb99h3wnadvqnr44j9d1jfy6fw36vm97kyjm46ikqis16327", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vdmJveC1hcHBsZXQiLAogICJ1dWlkIjogInZib3gtYXBwbGV0QGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="} + "45": {"version": "16", "sha256": "1cy0mdh6ba7sjv6bmmvz30wxrza8q2nvxpr00wsqbhqgq0i2x5n3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDE2Cn0="}, + "46": {"version": "16", "sha256": "1cy0mdh6ba7sjv6bmmvz30wxrza8q2nvxpr00wsqbhqgq0i2x5n3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDE2Cn0="} }} , {"uuid": "stocks@infinicode.de", "name": "Stocks Extension", "pname": "stocks-extension", "description": "Stocks Extension brings stock quotes to your GNOME Shell Panel", "link": "https://extensions.gnome.org/extension/1422/stocks-extension/", "shell_version_map": { "38": {"version": "19", "sha256": "1414cksayqpv0w0q632yi33ifqlwyfggwf684aci6qj81fs644y2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0b2NrcyBFeHRlbnNpb24gYnJpbmdzIHN0b2NrIHF1b3RlcyB0byB5b3VyIEdOT01FIFNoZWxsIFBhbmVsIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTdG9ja3MgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMvc3RvY2tzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RvY2tzQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, @@ -1504,7 +1516,8 @@ "42": {"version": "38", "sha256": "04fdwjpc9x9zql2ziiapg5j57z3iqv3hghg9azfzvwfh2l8kp7dx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzgKfQ=="}, "43": {"version": "38", "sha256": "04fdwjpc9x9zql2ziiapg5j57z3iqv3hghg9azfzvwfh2l8kp7dx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzgKfQ=="}, "44": {"version": "40", "sha256": "1cmy7y5v36n5jm5xhccwg2n7j7z6jkx1zx1a12hq1hpmmmgn3qdi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndzbWF0cml4IiwKICAia2V5YmluZGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LWtleWJpbmRpbmdzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgTWF0cml4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogNDAKfQ=="}, - "45": {"version": "43", "sha256": "029vizybxq1ivk1pkaiyq6haxdp6g1yzs4rv5hbn31v4aflyl3gg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndzbWF0cml4IiwKICAia2V5YmluZGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LWtleWJpbmRpbmdzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgTWF0cml4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogNDMKfQ=="} + "45": {"version": "43", "sha256": "029vizybxq1ivk1pkaiyq6haxdp6g1yzs4rv5hbn31v4aflyl3gg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndzbWF0cml4IiwKICAia2V5YmluZGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LWtleWJpbmRpbmdzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgTWF0cml4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogNDMKfQ=="}, + "46": {"version": "44", "sha256": "02da4kalr53vwj48k3w2gfhpk7x5jcfj2n69j5fxi3821ypqgqfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuXG5cbklmIHlvdSBhcHByZWNpYXRlIHRoaXMgZXh0ZW5zaW9uIHBsZWFzZSBjb25zaWRlciB0byBkb25hdGUgJDEuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJtenVyIiwKICAgICJwYXlwYWwiOiAiZHJtenVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndzbWF0cml4IiwKICAia2V5YmluZGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LWtleWJpbmRpbmdzIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgTWF0cml4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndzbWF0cml4LXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogNDQKfQ=="} }} , {"uuid": "extensions-sync@elhan.io", "name": "Extensions Sync", "pname": "extensions-sync", "description": "Sync all extensions and their configurations across all gnome instances", "link": "https://extensions.gnome.org/extension/1486/extensions-sync/", "shell_version_map": { "38": {"version": "12", "sha256": "0yb0brjnqvvlqpdyh841qwh3q2d02vi1an0s93gb2b6kagy1g7zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtc3luYyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zeW5jQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}, @@ -1520,7 +1533,8 @@ "42": {"version": "33", "sha256": "1pywy1sn2szb01s4f9kq69kyxnmnbffz3hiwmcmfr1g4l2sx7sns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAzMwp9"}, "43": {"version": "33", "sha256": "1pywy1sn2szb01s4f9kq69kyxnmnbffz3hiwmcmfr1g4l2sx7sns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAzMwp9"}, "44": {"version": "33", "sha256": "1pywy1sn2szb01s4f9kq69kyxnmnbffz3hiwmcmfr1g4l2sx7sns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAzMwp9"}, - "45": {"version": "32", "sha256": "1k1h1xw4hm6hyircxgy3i1cn2qpd0wl3yrbg173aaw25zw634798", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZ29sYW5naC9nbm9tZS1zaGVsbC1leHRlbnNpb24tY29udGFpbmVycyIsCiAgInV1aWQiOiAiY29udGFpbmVyc0Byb3lnIiwKICAidmVyc2lvbiI6IDMyCn0="} + "45": {"version": "34", "sha256": "1y9nyiaqi4vrsm7y6xz4w5xcjc695npkwla6wq6l6r1xcsrpz3ja", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAzNAp9"}, + "46": {"version": "34", "sha256": "1y9nyiaqi4vrsm7y6xz4w5xcjc695npkwla6wq6l6r1xcsrpz3ja", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAzNAp9"} }} , {"uuid": "fullscreenworkspace@satran.in", "name": "Fullscreen On New Workspace", "pname": "fullscreen-on-new-workspace", "description": "Move window to a new workspace when you maximize or make it fullscreen.", "link": "https://extensions.gnome.org/extension/1502/fullscreen-on-new-workspace/", "shell_version_map": { "38": {"version": "8", "sha256": "0csx7mqgbjjvf3cwk492bk9b92l2270qw2c2badckwsyl6qwahj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zYXRyYW4vZnVsbHNjcmVlbndvcmtzcGFjZS1zYXRyYW4uaW4iLAogICJ1dWlkIjogImZ1bGxzY3JlZW53b3Jrc3BhY2VAc2F0cmFuLmluIiwKICAidmVyc2lvbiI6IDgKfQ=="}, @@ -1558,7 +1572,8 @@ "42": {"version": "10", "sha256": "0916v0xrfzq9zpsqy6r2z3gly4cvfmrcdjjlmb8qcp44q61hxqx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlbm5hcnQtay9nbm9tZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogIlJvdW5kZWRfQ29ybmVyc0BsZW5uYXJ0LWsiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "43": {"version": "10", "sha256": "0916v0xrfzq9zpsqy6r2z3gly4cvfmrcdjjlmb8qcp44q61hxqx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlbm5hcnQtay9nbm9tZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogIlJvdW5kZWRfQ29ybmVyc0BsZW5uYXJ0LWsiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "44": {"version": "10", "sha256": "0916v0xrfzq9zpsqy6r2z3gly4cvfmrcdjjlmb8qcp44q61hxqx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlbm5hcnQtay9nbm9tZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogIlJvdW5kZWRfQ29ybmVyc0BsZW5uYXJ0LWsiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, - "45": {"version": "12", "sha256": "1lswyjpkbwdrfq1bl47d5g2v8fklidjmmc9k6xq7a24rz688m74m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGVubmFydC1rLnJvdW5kZWRfY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sZW5uYXJ0LWsvZ25vbWUtcm91bmRlZC1jb3JuZXJzIiwKICAidXVpZCI6ICJSb3VuZGVkX0Nvcm5lcnNAbGVubmFydC1rIiwKICAidmVyc2lvbiI6IDEyCn0="} + "45": {"version": "13", "sha256": "01aphkw696xzcaimng2j3zawss6h7dijryipkxj8zr0df0yq61m2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGVubmFydC1rLnJvdW5kZWRfY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGVubmFydC1rL2dub21lLXJvdW5kZWQtY29ybmVycyIsCiAgInV1aWQiOiAiUm91bmRlZF9Db3JuZXJzQGxlbm5hcnQtayIsCiAgInZlcnNpb24iOiAxMwp9"}, + "46": {"version": "13", "sha256": "01aphkw696xzcaimng2j3zawss6h7dijryipkxj8zr0df0yq61m2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubGVubmFydC1rLnJvdW5kZWRfY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGVubmFydC1rL2dub21lLXJvdW5kZWQtY29ybmVycyIsCiAgInV1aWQiOiAiUm91bmRlZF9Db3JuZXJzQGxlbm5hcnQtayIsCiAgInZlcnNpb24iOiAxMwp9"} }} , {"uuid": "scrovol@andyholmes.github.io", "name": "Scrovol", "pname": "scrovol", "description": "Change the volume by scrolling anywhere on the System Tray.\n\nWith this extension, you can scroll over Night Light, WiFi, Volume, Battery or any other icon in the system status tray to change the volume, instead of just the Volume icon.", "link": "https://extensions.gnome.org/extension/1519/scrovol/", "shell_version_map": { "40": {"version": "4", "sha256": "1md52ygz481nvhq00bkq2ymby7f647cfvw4wx1wqkwp7b796d59c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgdm9sdW1lIGJ5IHNjcm9sbGluZyBhbnl3aGVyZSBvbiB0aGUgU3lzdGVtIFRyYXkuXG5cbldpdGggdGhpcyBleHRlbnNpb24sIHlvdSBjYW4gc2Nyb2xsIG92ZXIgTmlnaHQgTGlnaHQsIFdpRmksIFZvbHVtZSwgQmF0dGVyeSBvciBhbnkgb3RoZXIgaWNvbiBpbiB0aGUgc3lzdGVtIHN0YXR1cyB0cmF5IHRvIGNoYW5nZSB0aGUgdm9sdW1lLCBpbnN0ZWFkIG9mIGp1c3QgdGhlIFZvbHVtZSBpY29uLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3Jvdm9sIiwKICAibmFtZSI6ICJTY3Jvdm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5keWhvbG1lcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2Nyb3ZvbC8iLAogICJ1dWlkIjogInNjcm92b2xAYW5keWhvbG1lcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"} @@ -1791,14 +1806,15 @@ "41": {"version": "7", "sha256": "1vkrwbdqgpbs5m6gq7awar53bflr59a1c3lgr3g642gswdnr2230", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2ljbW8vZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnYW1lbW9kZUBjaHJpc3RpYW4ua2VsbG5lci5tZSIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "1vkrwbdqgpbs5m6gq7awar53bflr59a1c3lgr3g642gswdnr2230", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2ljbW8vZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnYW1lbW9kZUBjaHJpc3RpYW4ua2VsbG5lci5tZSIsCiAgInZlcnNpb24iOiA3Cn0="} }} -, {"uuid": "unredirect@vaina.lt", "name": "Disable unredirect fullscreen windows", "pname": "disable-unredirect-fullscreen-windows", "description": "Disables unredirect fullscreen windows in gnome-shell to workaround https://bugzilla.redhat.com/show_bug.cgi?id=767397 and https://bugzilla.gnome.org/show_bug.cgi?id=738719", "link": "https://extensions.gnome.org/extension/1873/disable-unredirect-fullscreen-windows/", "shell_version_map": { +, {"uuid": "unredirect@vaina.lt", "name": "Disable unredirect fullscreen windows", "pname": "disable-unredirect-fullscreen-windows", "description": "Disables unredirect fullscreen windows in gnome-shell to workaround a bug when clicking on full screen windows goes through to windows underneath. This also happens to fix screen tearing in full-screen windows.", "link": "https://extensions.gnome.org/extension/1873/disable-unredirect-fullscreen-windows/", "shell_version_map": { "38": {"version": "7", "sha256": "1jh7mp6gh8xsymmp3slqznzypjnjcfwncmf4lq13xjc5c9cid9sy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "1jh7mp6gh8xsymmp3slqznzypjnjcfwncmf4lq13xjc5c9cid9sy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1jh7mp6gh8xsymmp3slqznzypjnjcfwncmf4lq13xjc5c9cid9sy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "1jh7mp6gh8xsymmp3slqznzypjnjcfwncmf4lq13xjc5c9cid9sy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "7", "sha256": "1jh7mp6gh8xsymmp3slqznzypjnjcfwncmf4lq13xjc5c9cid9sy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiA3Cn0="}, "44": {"version": "7", "sha256": "1jh7mp6gh8xsymmp3slqznzypjnjcfwncmf4lq13xjc5c9cid9sy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiA3Cn0="}, - "45": {"version": "9", "sha256": "1py9l39n50r2mhnp4j1zlmy1ivvnz2nk5d6kvdgbvvvvwyb0ib70", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNnaT9pZD03NjczOTcgYW5kIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3MTkiLAogICJuYW1lIjogIkRpc2FibGUgdW5yZWRpcmVjdCBmdWxsc2NyZWVuIHdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiA5Cn0="} + "45": {"version": "11", "sha256": "0m5z7hdxv3zzw0fsq9ic42xfrg25afa5gbdl1ck7ypik6lc3fk7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgYSBidWcgd2hlbiBjbGlja2luZyBvbiBmdWxsIHNjcmVlbiB3aW5kb3dzIGdvZXMgdGhyb3VnaCB0byB3aW5kb3dzIHVuZGVybmVhdGguIFRoaXMgYWxzbyBoYXBwZW5zIHRvIGZpeCBzY3JlZW4gdGVhcmluZyBpbiBmdWxsLXNjcmVlbiB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB1bnJlZGlyZWN0IGZ1bGxzY3JlZW4gd2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiAxMQp9"}, + "46": {"version": "11", "sha256": "0m5z7hdxv3zzw0fsq9ic42xfrg25afa5gbdl1ck7ypik6lc3fk7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHdvcmthcm91bmQgYSBidWcgd2hlbiBjbGlja2luZyBvbiBmdWxsIHNjcmVlbiB3aW5kb3dzIGdvZXMgdGhyb3VnaCB0byB3aW5kb3dzIHVuZGVybmVhdGguIFRoaXMgYWxzbyBoYXBwZW5zIHRvIGZpeCBzY3JlZW4gdGVhcmluZyBpbiBmdWxsLXNjcmVlbiB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB1bnJlZGlyZWN0IGZ1bGxzY3JlZW4gd2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtdW5yZWRpcmVjdCIsCiAgInV1aWQiOiAidW5yZWRpcmVjdEB2YWluYS5sdCIsCiAgInZlcnNpb24iOiAxMQp9"} }} , {"uuid": "krypto@sereneblue", "name": "krypto", "pname": "krypto", "description": "GNOME extension to display cryptocurrency prices", "link": "https://extensions.gnome.org/extension/1913/krypto/", "shell_version_map": { "38": {"version": "5", "sha256": "1rpp22asfnhi11lprl70lr9dh2cw7w23yqf4hi629357592px2sv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiB0byBkaXNwbGF5IGNyeXB0b2N1cnJlbmN5IHByaWNlcyIsCiAgIm5hbWUiOiAia3J5cHRvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3J5cHRvIiwKICAidXVpZCI6ICJrcnlwdG9Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiA1Cn0="}, @@ -1838,15 +1854,15 @@ "43": {"version": "28", "sha256": "14c6l7d3jrjvk4q7hjy9i1h8isp4igyh8f3lcmfw8llq0lf4brny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9nb2xkcHJpY2Vtb25pdG9yIiwKICAidXVpZCI6ICJHb2xkX1ByaWNlX01vbml0b3JAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDI4Cn0="}, "44": {"version": "28", "sha256": "14c6l7d3jrjvk4q7hjy9i1h8isp4igyh8f3lcmfw8llq0lf4brny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9nb2xkcHJpY2Vtb25pdG9yIiwKICAidXVpZCI6ICJHb2xkX1ByaWNlX01vbml0b3JAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDI4Cn0="} }} -, {"uuid": "ding@rastersoft.com", "name": "Desktop Icons NG (DING)", "pname": "desktop-icons-ng-ding", "description": "Adds icons to the desktop. Fork of the original Desktop Icons extension, with several enhancements . It requires libgnome-desktop-3-dev.", "link": "https://extensions.gnome.org/extension/2087/desktop-icons-ng-ding/", "shell_version_map": { +, {"uuid": "ding@rastersoft.com", "name": "Desktop Icons NG (DING)", "pname": "desktop-icons-ng-ding", "description": "Adds icons to the desktop. Fork of the original Desktop Icons extension, with several enhancements .", "link": "https://extensions.gnome.org/extension/2087/desktop-icons-ng-ding/", "shell_version_map": { "38": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="}, "40": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="}, "41": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="}, "42": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="}, "43": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="}, "44": {"version": "63", "sha256": "0c1zlpkbs1a1vsnlvg7if29dmw535bgybm5glczdki2fgdzrchw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjMKfQ=="}, - "45": {"version": "67", "sha256": "02j0xw8zm7bfsg2dhp1d70x6fjz2psl1999bcbd83fsq88456n2q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjcKfQ=="}, - "46": {"version": "67", "sha256": "02j0xw8zm7bfsg2dhp1d70x6fjz2psl1999bcbd83fsq88456n2q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjcKfQ=="} + "45": {"version": "68", "sha256": "1i2f7qc48ggs9byr2j5jhhrh3g63q2ad63hsbvj3k79aavvhc4ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjgKfQ=="}, + "46": {"version": "68", "sha256": "1i2f7qc48ggs9byr2j5jhhrh3g63q2ad63hsbvj3k79aavvhc4ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogNjgKfQ=="} }} , {"uuid": "order-extensions@wa4557.github.com", "name": "Order Gnome Shell extensions", "pname": "order-gnome-shell-extensions", "description": "Fixes order of gnome-shell extensions", "link": "https://extensions.gnome.org/extension/2114/order-gnome-shell-extensions/", "shell_version_map": { "38": {"version": "6", "sha256": "0hcbjrhrg11f5p23bhss75nhc9sqlh6p1bmfq7p7m7d276ckdmkk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICIzLjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm9yZGVyLWV4dGVuc2lvbnNAd2E0NTU3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, @@ -1915,7 +1931,7 @@ "45": {"version": "75", "sha256": "1ivhdg0kwn5v720jcgrm4d0ma98i8cbnl3xhynj552wzpd4bqf8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJ1aWxkLXR5cGUiOiAicmVsZWFzZSIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA3NQp9"}, "46": {"version": "77", "sha256": "0bprqy4gq30nlkjm4x4vmr7ymknfa2325dzj9a6i4nqk37ai5igp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJ1aWxkLXR5cGUiOiAicmVsZWFzZSIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgdG9nZ2xlIHlvdXIgZGVza3RvcFx1MjAxOXMgY29sb3Igc2NoZW1lIGJldHdlZW4gbGlnaHQgYW5kIGRhcmssIHN3aXRjaCBiYWNrZ3JvdW5kcyBhbmQgcnVuIGN1c3RvbSBjb21tYW5kcyBhdCBzdW5zZXQgYW5kIHN1bnJpc2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgIm5hbWUiOiAiTmlnaHQgVGhlbWUgU3dpdGNoZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA3Nwp9"} }} -, {"uuid": "binaryclock@vancha.march", "name": "binaryclock", "pname": "binaryclock", "description": "adds a binary clock to the gnome bar", "link": "https://extensions.gnome.org/extension/2284/binaryclock/", "shell_version_map": { +, {"uuid": "binaryclock@vancha.march", "name": "binaryclock DEPRECATED", "pname": "binaryclock", "description": "Adds a binary clock to the gnome bar\nDoes not work for gnome shell 45 and up. Use the maintained version over at Adds a binary clock to the gnome bar", "link": "https://extensions.gnome.org/extension/2284/binaryclock/", "shell_version_map": { "38": {"version": "6", "sha256": "1bvzlqfhwlk1sh9q3538yipjwzgndd4wnn2l8wc3sshb93ggvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIGJhciIsCiAgIm5hbWUiOiAiYmluYXJ5Y2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi43IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZhbmNoYS9nbm9tZVNoZWxsQmluYXJ5Q2xvY2svIiwKICAidXVpZCI6ICJiaW5hcnljbG9ja0B2YW5jaGEubWFyY2giLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1bvzlqfhwlk1sh9q3538yipjwzgndd4wnn2l8wc3sshb93ggvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIGJhciIsCiAgIm5hbWUiOiAiYmluYXJ5Y2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi43IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZhbmNoYS9nbm9tZVNoZWxsQmluYXJ5Q2xvY2svIiwKICAidXVpZCI6ICJiaW5hcnljbG9ja0B2YW5jaGEubWFyY2giLAogICJ2ZXJzaW9uIjogNgp9"} }} @@ -2058,7 +2074,8 @@ "42": {"version": "31", "sha256": "035j0qswaw2hj06ybq2qdhlsshwfi2fyh2l0mca7jq1qp2w955xw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzEKfQ=="}, "43": {"version": "44", "sha256": "0566dw0517wb3xz64grv5bk3kvk9494ijzkkpvhi0jzx87b2dgvr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, "44": {"version": "44", "sha256": "0566dw0517wb3xz64grv5bk3kvk9494ijzkkpvhi0jzx87b2dgvr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, - "45": {"version": "48", "sha256": "1syci2i1ml548rhwaj4a5amkb64vvj7pdv4zmpzkn6rkjr0lynl7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDgKfQ=="} + "45": {"version": "49", "sha256": "0s3kwzjlp9zx558hh9ih50sd2dvap491i6cqd2iwym4q33jwdi6f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, + "46": {"version": "49", "sha256": "0s3kwzjlp9zx558hh9ih50sd2dvap491i6cqd2iwym4q33jwdi6f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="} }} , {"uuid": "timezones@masquerade-circus.net", "name": "Timezones extension", "pname": "timezones-extension", "description": "Show multiple clocks in the panel. For those who need more than one additional clock.", "link": "https://extensions.gnome.org/extension/2657/timezones-extension/", "shell_version_map": { "38": {"version": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, @@ -2229,7 +2246,9 @@ "38": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}, - "42": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="} + "42": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}, + "45": {"version": "10", "sha256": "04rcc0b8l9xyhzngvrkf601szkrlxpi9946vls9jkv5qvan4rs1r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1iYXR0ZXJ5LXRpbWUtcGVyY2VudGFnZS1jb21wYWN0IiwKICAidXVpZCI6ICJiYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0QHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDEwCn0="}, + "46": {"version": "10", "sha256": "04rcc0b8l9xyhzngvrkf601szkrlxpi9946vls9jkv5qvan4rs1r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1iYXR0ZXJ5LXRpbWUtcGVyY2VudGFnZS1jb21wYWN0IiwKICAidXVpZCI6ICJiYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0QHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDEwCn0="} }} , {"uuid": "executor@raujonas.github.io", "name": "Executor", "pname": "executor", "description": "Execute multiple shell commands periodically with separate intervals and display the output in gnome top bar.", "link": "https://extensions.gnome.org/extension/2932/executor/", "shell_version_map": { "38": {"version": "23", "sha256": "137lcwg6c0xarz6px5z846cfpl1vaklh5m525a8p3793cxa24lbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhdWpvbmFzL2V4ZWN1dG9yIiwKICAidXVpZCI6ICJleGVjdXRvckByYXVqb25hcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, @@ -2258,7 +2277,7 @@ "42": {"version": "67", "sha256": "0405yz8w5a1h56csh2xl9kn7bbxr7r8vmsslh9y4l16gxs2nmkrh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzIG9yIHRyYW5zbGF0aW9uc1xuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Nwp9"}, "43": {"version": "71", "sha256": "01hmh278h8kjym6zvvqglfdg8qkfrz364p3srci137vwkc2rpd9x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzIG9yIHRyYW5zbGF0aW9uc1xuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3MQp9"}, "45": {"version": "76", "sha256": "1m4k6gkda7axddm6y16z6d10sv0awxp6vsa23sw10djzk211bgf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1saWdodC1kaWN0IiwKICAibmFtZSI6ICJMaWdodCBEaWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxpZ2h0LWRpY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9saWdodC1kaWN0IiwKICAidXVpZCI6ICJsaWdodC1kaWN0QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDc2Cn0="}, - "46": {"version": "77", "sha256": "0x0c429bgxy688dc3rncj50mlpizxj442gr2dhdmvl4d7pmz2d4n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1saWdodC1kaWN0IiwKICAibmFtZSI6ICJMaWdodCBEaWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxpZ2h0LWRpY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9saWdodC1kaWN0IiwKICAidXVpZCI6ICJsaWdodC1kaWN0QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDc3Cn0="} + "46": {"version": "78", "sha256": "1nwra9gakrr5h77z62kfn917186z5f01066rzi97c5lzqxza70zy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1saWdodC1kaWN0IiwKICAibmFtZSI6ICJMaWdodCBEaWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxpZ2h0LWRpY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9saWdodC1kaWN0IiwKICAidXVpZCI6ICJsaWdodC1kaWN0QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDc4Cn0="} }} , {"uuid": "InternetSpeedMeter@alshakib.dev", "name": "Internet Speed Meter", "pname": "internet-speed-meter", "description": "Simple and minimal internet speed meter extension for the Gnome Shell", "link": "https://extensions.gnome.org/extension/2980/internet-speed-meter/", "shell_version_map": { "38": {"version": "11", "sha256": "1y33l24q441nc147njjp4ylygmfr73br8adc8yfbp9p8dzh084f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIHRoZSBHbm9tZSBTaGVsbCIsCiAgIm5hbWUiOiAiSW50ZXJuZXQgU3BlZWQgTWV0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDExCn0="}, @@ -2397,7 +2416,7 @@ "43": {"version": "47", "sha256": "04h957nzzvblk8zxiyanzyw02czdk459ljq1kkkhgk929cqsc0b3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImF1bmV0eCIsCiAgICAia29maSI6ICJhdW5ldHgiCiAgfSwKICAibmFtZSI6ICJCbHVyIG15IFNoZWxsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJtZUBhdW5ldHguZGV2IgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ibHVyLW15LXNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1ibHVyLW15LXNoZWxsIiwKICAidXVpZCI6ICJibHVyLW15LXNoZWxsQGF1bmV0eCIsCiAgInZlcnNpb24iOiA0Nwp9"}, "44": {"version": "47", "sha256": "04h957nzzvblk8zxiyanzyw02czdk459ljq1kkkhgk929cqsc0b3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImF1bmV0eCIsCiAgICAia29maSI6ICJhdW5ldHgiCiAgfSwKICAibmFtZSI6ICJCbHVyIG15IFNoZWxsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJtZUBhdW5ldHguZGV2IgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ibHVyLW15LXNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1ibHVyLW15LXNoZWxsIiwKICAidXVpZCI6ICJibHVyLW15LXNoZWxsQGF1bmV0eCIsCiAgInZlcnNpb24iOiA0Nwp9"}, "45": {"version": "58", "sha256": "05f2v981nfmnrddb2pd0zdncyj5p76z4sz96xy8hyp9brskwv4wf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImF1bmV0eCIsCiAgICAia29maSI6ICJhdW5ldHgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIm1lQGF1bmV0eC5kZXYiCiAgXSwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ibHVyLW15LXNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, - "46": {"version": "59", "sha256": "17s0i67bxalr8m1c60nfcqahpv0i3ivf3fwyw106izxrwy95g6z4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImF1bmV0eCIsCiAgICAia29maSI6ICJhdW5ldHgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIm1lQGF1bmV0eC5kZXYiCiAgXSwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ibHVyLW15LXNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9ibHVyLW15LXNoZWxsIiwKICAidXVpZCI6ICJibHVyLW15LXNoZWxsQGF1bmV0eCIsCiAgInZlcnNpb24iOiA1OQp9"} + "46": {"version": "61", "sha256": "13lrdj4wnwqgxkpgn8aa9jngyw61ayfjp40wbys2rxz3ww09jp3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImF1bmV0eCIsCiAgICAia29maSI6ICJhdW5ldHgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIm1lQGF1bmV0eC5kZXYiCiAgXSwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ibHVyLW15LXNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9ibHVyLW15LXNoZWxsIiwKICAidXVpZCI6ICJibHVyLW15LXNoZWxsQGF1bmV0eCIsCiAgInZlcnNpb24iOiA2MQp9"} }} , {"uuid": "escape-overview@raelgc", "name": "ESCape Overview", "pname": "escape-overview", "description": "Close the Overview with a single ESC press when searchbox is empty.\n\nThe default gnome-shell behaviour is, during first ESC press, clean the searchbox, then second ESC press get back to Activities overview and then third ESC press will finally close the overview.", "link": "https://extensions.gnome.org/extension/3204/escape-overview/", "shell_version_map": { "38": {"version": "5", "sha256": "12jycfdlywlc2gf7hcpa1draqsy8jgb2dgr8sihh2f97b31dk1nh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBPdmVydmlldyB3aXRoIGEgc2luZ2xlIEVTQyBwcmVzcyB3aGVuIHNlYXJjaGJveCBpcyBlbXB0eS5cblxuVGhlIGRlZmF1bHQgZ25vbWUtc2hlbGwgYmVoYXZpb3VyIGlzLCBkdXJpbmcgZmlyc3QgRVNDIHByZXNzLCBjbGVhbiB0aGUgc2VhcmNoYm94LCB0aGVuIHNlY29uZCBFU0MgcHJlc3MgZ2V0IGJhY2sgdG8gQWN0aXZpdGllcyBvdmVydmlldyBhbmQgdGhlbiB0aGlyZCBFU0MgcHJlc3Mgd2lsbCBmaW5hbGx5IGNsb3NlIHRoZSBvdmVydmlldy4iLAogICJuYW1lIjogIkVTQ2FwZSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZWxnYy9lc2NhcGUtb3ZlcnZpZXciLAogICJ1dWlkIjogImVzY2FwZS1vdmVydmlld0ByYWVsZ2MiLAogICJ2ZXJzaW9uIjogNQp9"}, @@ -2511,14 +2530,15 @@ , {"uuid": "ascii_emoji_buckets@HarshKhandeparkar", "name": "ASCII Emoji Buckets", "pname": "ascii-emoji-buckets", "description": "Buckets of ASCII emojis for your messaging pleasure. A fork of Emoji Buckets.", "link": "https://extensions.gnome.org/extension/3408/ascii-emoji-buckets/", "shell_version_map": { "38": {"version": "9", "sha256": "1srqsjzcywywlhapaca41v4pc99w503m5532g6cc6qwz9f2r4w5h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1Y2tldHMgb2YgQVNDSUkgZW1vamlzIGZvciB5b3VyIG1lc3NhZ2luZyBwbGVhc3VyZS4gQSBmb3JrIG9mIEVtb2ppIEJ1Y2tldHMuIiwKICAibmFtZSI6ICJBU0NJSSBFbW9qaSBCdWNrZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFzY2lpLWVtb2ppLWJ1Y2tldHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjMuMzguMSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hhcnNoS2hhbmRlcGFya2FyL2dub21lLWFzY2lpLWVtb2ppLWJ1Y2tldHMiLAogICJ1dWlkIjogImFzY2lpX2Vtb2ppX2J1Y2tldHNASGFyc2hLaGFuZGVwYXJrYXIiLAogICJ2ZXJzaW9uIjogOQp9"} }} -, {"uuid": "user-stylesheet@tomaszgasior.pl", "name": "User style sheet & font", "pname": "user-stylesheet-font", "description": "Load custom style sheet from ~/.config/gnome-shell/gnome-shell.css. Use GTK font family and font size from GNOME Tweaks in GNOME Shell.", "link": "https://extensions.gnome.org/extension/3414/user-stylesheet-font/", "shell_version_map": { +, {"uuid": "user-stylesheet@tomaszgasior.pl", "name": "User style sheet", "pname": "user-stylesheet-font", "description": "Load custom style sheet from ~/.config/gnome-shell/gnome-shell.css.", "link": "https://extensions.gnome.org/extension/3414/user-stylesheet-font/", "shell_version_map": { "38": {"version": "7", "sha256": "1hqaab95wsc284d78pw56zhk72qjnqpn0adr04icybv4pk11dnjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "1hqaab95wsc284d78pw56zhk72qjnqpn0adr04icybv4pk11dnjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "1hqaab95wsc284d78pw56zhk72qjnqpn0adr04icybv4pk11dnjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "1hqaab95wsc284d78pw56zhk72qjnqpn0adr04icybv4pk11dnjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "1hqaab95wsc284d78pw56zhk72qjnqpn0adr04icybv4pk11dnjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNwp9"}, "44": {"version": "7", "sha256": "1hqaab95wsc284d78pw56zhk72qjnqpn0adr04icybv4pk11dnjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNwp9"}, - "45": {"version": "8", "sha256": "1h98d46qvj5cncb6l7xfi67iaqs8vw9nfi3ix0iajdjs7fr95x5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tYXN6R2FzaW9yL2dub21lLXNoZWxsLXVzZXItc3R5bGVzaGVldC1hbmQtZm9udCIsCiAgInV1aWQiOiAidXNlci1zdHlsZXNoZWV0QHRvbWFzemdhc2lvci5wbCIsCiAgInZlcnNpb24iOiA4Cn0="} + "45": {"version": "8", "sha256": "1h98d46qvj5cncb6l7xfi67iaqs8vw9nfi3ix0iajdjs7fr95x5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tYXN6R2FzaW9yL2dub21lLXNoZWxsLXVzZXItc3R5bGVzaGVldC1hbmQtZm9udCIsCiAgInV1aWQiOiAidXNlci1zdHlsZXNoZWV0QHRvbWFzemdhc2lvci5wbCIsCiAgInZlcnNpb24iOiA4Cn0="}, + "46": {"version": "9", "sha256": "1m1cmasa5cxz2gmcq3d22lzgw5jb35qzhqy70kz6s9549a0lww4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4iLAogICJuYW1lIjogIlVzZXIgc3R5bGUgc2hlZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tYXN6R2FzaW9yL2dub21lLXNoZWxsLXVzZXItc3R5bGVzaGVldCIsCiAgInV1aWQiOiAidXNlci1zdHlsZXNoZWV0QHRvbWFzemdhc2lvci5wbCIsCiAgInZlcnNpb24iOiA5Cn0="} }} , {"uuid": "wg-indicator@dpf12110.gmail.com", "name": "WG Indicator", "pname": "wg-indicator", "description": "A status indicator for Wireguard connections.", "link": "https://extensions.gnome.org/extension/3418/wg-indicator/", "shell_version_map": { "40": {"version": "15", "sha256": "1zzr04l03aka1rk2rhqvj102dan80zdywgizxfygffvy4fjh99n0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgV2lyZWd1YXJkIGNvbm5lY3Rpb25zLiIsCiAgIm5hbWUiOiAiV0cgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3luYzEyMTEvd2ctaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ3Zy1pbmRpY2F0b3JAZHBmMTIxMTAuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, @@ -2532,8 +2552,8 @@ "42": {"version": "22", "sha256": "1y0gx662rhs32bjng5i5w3f6bkgc7i71rxki9qav4rp69fpnqnxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9GbHktUGllIiwKICAidXVpZCI6ICJmbHlwaWVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}, "43": {"version": "22", "sha256": "1y0gx662rhs32bjng5i5w3f6bkgc7i71rxki9qav4rp69fpnqnxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9GbHktUGllIiwKICAidXVpZCI6ICJmbHlwaWVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}, "44": {"version": "22", "sha256": "1y0gx662rhs32bjng5i5w3f6bkgc7i71rxki9qav4rp69fpnqnxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9GbHktUGllIiwKICAidXVpZCI6ICJmbHlwaWVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}, - "45": {"version": "25", "sha256": "1rsdic4g09ab0jmdzj0p941pfpc3qazk7swb01vdiq1fcflpkyp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9GbHktUGllIiwKICAidXVpZCI6ICJmbHlwaWVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="}, - "46": {"version": "25", "sha256": "1rsdic4g09ab0jmdzj0p941pfpc3qazk7swb01vdiq1fcflpkyp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9GbHktUGllIiwKICAidXVpZCI6ICJmbHlwaWVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="} + "45": {"version": "26", "sha256": "0mcja775pi9wkl2cnz3g44skcg817krs3c7jvwsbm8f6kx2xlaqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9GbHktUGllIiwKICAidXVpZCI6ICJmbHlwaWVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="}, + "46": {"version": "26", "sha256": "0mcja775pi9wkl2cnz3g44skcg817krs3c7jvwsbm8f6kx2xlaqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiBPbmNlIGluc3RhbGxlZCwgcHJlc3MgQ3RybCtTcGFjZSB0byBvcGVuIHRoZSBkZWZhdWx0IG1lbnUuIE9wZW4gdGhlIHByZWZlcmVuY2VzIGRpYWxvZyBmb3IgYW4gaW50ZXJhY3RpdmUgdHV0b3JpYWwgYW5kIGZvciBjcmVhdGluZyBjdXN0b20gbWVudXMhIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJzY2huZWVnYW5zIiwKICAgICJrb2ZpIjogInNjaG5lZWdhbnMiLAogICAgInBheXBhbCI6ICJzaW1vbnNjaG5lZWdhbnMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmx5cGllIiwKICAibmFtZSI6ICJGbHktUGllIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZseXBpZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9GbHktUGllIiwKICAidXVpZCI6ICJmbHlwaWVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="} }} , {"uuid": "jiggle@jeffchannell.com", "name": "Jiggle", "pname": "jiggle", "description": "Jiggle is a Gnome Shell extension that highlights the cursor position when the mouse is moved rapidly.", "link": "https://extensions.gnome.org/extension/3438/jiggle/", "shell_version_map": { "38": {"version": "8", "sha256": "0f5zwvcqz648sn11nl49r0ki6zy5c2hp4imgba0dlc02fags7pxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkppZ2dsZSBpcyBhIEdub21lIFNoZWxsIGV4dGVuc2lvbiB0aGF0IGhpZ2hsaWdodHMgdGhlIGN1cnNvciBwb3NpdGlvbiB3aGVuIHRoZSBtb3VzZSBpcyBtb3ZlZCByYXBpZGx5LiIsCiAgIm5hbWUiOiAiSmlnZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2LjMiLAogICAgIjMuMzguMSIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plZmZjaGFubmVsbC9qaWdnbGUiLAogICJ1dWlkIjogImppZ2dsZUBqZWZmY2hhbm5lbGwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, @@ -2745,8 +2765,8 @@ "42": {"version": "36", "sha256": "1dj98am80c82mfw7cz9mzhqnahxqpkgm7lazd2s023rs0hfx825c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDM2Cn0="}, "43": {"version": "45", "sha256": "1ghplv7qvdh1l2r7y9wnfbgmlq2js5sifyv6jhj20mc50j0dwd59", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDQ1Cn0="}, "44": {"version": "45", "sha256": "1ghplv7qvdh1l2r7y9wnfbgmlq2js5sifyv6jhj20mc50j0dwd59", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDQ1Cn0="}, - "45": {"version": "46", "sha256": "0kwm0sw2c38yf1xiafrad4wy88anrwsf6wd703fdmzl6k9hllis1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInRpbGluZy1hc3Npc3RhbnRAbGVsZWF0LW9uLWdpdGh1YiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, - "46": {"version": "46", "sha256": "0kwm0sw2c38yf1xiafrad4wy88anrwsf6wd703fdmzl6k9hllis1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInRpbGluZy1hc3Npc3RhbnRAbGVsZWF0LW9uLWdpdGh1YiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDQ2Cn0="} + "45": {"version": "47", "sha256": "07ar75i1lbgbby0zp9961298qcj7va6mm0l4vcizka6p3y25ag75", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInRpbGluZy1hc3Npc3RhbnRAbGVsZWF0LW9uLWdpdGh1YiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDQ3Cn0="}, + "46": {"version": "47", "sha256": "07ar75i1lbgbby0zp9961298qcj7va6mm0l4vcizka6p3y25ag75", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgImdldHRleHQtZG9tYWluIjogInRpbGluZy1hc3Npc3RhbnRAbGVsZWF0LW9uLWdpdGh1YiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDQ3Cn0="} }} , {"uuid": "airpods-battery-status@ju.wtf", "name": "Airpods Battery status", "pname": "airpods-battery-status", "description": "Show Airpods battery level in top bar\n\n/!\\ Needs AirStatus to work: https://github.com/delphiki/AirStatus", "link": "https://extensions.gnome.org/extension/3736/airpods-battery-status/", "shell_version_map": { "38": {"version": "7", "sha256": "1dyiqinjzjlh89vas00q78dzalh5mgj7q1a3vp8k13xfki4l0gzd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL2dub21lLWFpcnBvZHMtYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImFpcnBvZHMtYmF0dGVyeS1zdGF0dXNAanUud3RmIiwKICAidmVyc2lvbiI6IDcKfQ=="}, @@ -3087,7 +3107,8 @@ "42": {"version": "14", "sha256": "0apds8yqqq5hnbjqdnsag7xrqk3jiv9k3djrahhwfgxwy0l2j0f2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L0FsdFRhYi1Nb2QiLAogICJ1dWlkIjogImFsdHRhYi1tb2RAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxNAp9"}, "43": {"version": "14", "sha256": "0apds8yqqq5hnbjqdnsag7xrqk3jiv9k3djrahhwfgxwy0l2j0f2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L0FsdFRhYi1Nb2QiLAogICJ1dWlkIjogImFsdHRhYi1tb2RAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxNAp9"}, "44": {"version": "14", "sha256": "0apds8yqqq5hnbjqdnsag7xrqk3jiv9k3djrahhwfgxwy0l2j0f2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L0FsdFRhYi1Nb2QiLAogICJ1dWlkIjogImFsdHRhYi1tb2RAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxNAp9"}, - "45": {"version": "18", "sha256": "1ppdz0g7sy0j0cmvp1y43p9mgsxn73cc273fmhi47i9phcp117in", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9BbHRUYWItTW9kIiwKICAidXVpZCI6ICJhbHR0YWItbW9kQGxlbGVhdC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMTgKfQ=="} + "45": {"version": "18", "sha256": "1ppdz0g7sy0j0cmvp1y43p9mgsxn73cc273fmhi47i9phcp117in", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9BbHRUYWItTW9kIiwKICAidXVpZCI6ICJhbHR0YWItbW9kQGxlbGVhdC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, + "46": {"version": "19", "sha256": "1rzb9445jpdka7947wcvncal6sfm0qg9mni0073qa4alncp573fm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzb21lIFFvTCBjaGFuZ2VzIHRvIHRoZSBBcHAgU3dpdGNoZXIgKEFsdC9TdXBlcitUYWIpLi4uXG4tIHVzZSBgV0FTRGAsIGBoamtsYCBvciB0aGUgYXJyb3cga2V5cyBmb3IgbmF2aWdhdGlvblxuLSBgUWAgb25seSBjbG9zZXMgdGhlIHNlbGVjdGVkIHdpbmRvdyBpbnN0ZWFkIG9mIHRoZSBlbnRpcmUgYXBwXG4tIG9ubHkgcmFpc2UgdGhlIGZpcnN0IHdpbmRvdyBpbnN0ZWFkIG9mIGV2ZXJ5IGluc3RhbmNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgd29ya3NwYWNlXG4tIG9wdGlvbmFsbHk6IG9ubHkgc2hvdyB3aW5kb3dzIGZyb20gdGhlIGN1cnJlbnQgbW9uaXRvclxuLSBvcHRpb25hbGx5OiByZW1vdmUgdGhlIEFwcCBTd2l0Y2hlcidzIGRlbGF5ZWQgYXBwZWFyYW5jZSIsCiAgIm5hbWUiOiAiQWx0VGFiIE1vZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHRUYWItbW9kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9BbHRUYWItTW9kIiwKICAidXVpZCI6ICJhbHR0YWItbW9kQGxlbGVhdC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMTkKfQ=="} }} , {"uuid": "personalize@Selenium-H", "name": "Personalize", "pname": "personalize", "description": "Personalize the looks of GNOME Desktop.\n\nSet the theme variant, window corner curvature and select accent color.\nThe Colors section contains colors generated from the selected accent color.\nThe color generation is not accurate. However, individual colors can be customised.\n\nNot all settings are applied automatically.\nPress Refresh button on the left of the headerbar to reload the extension \n\nCurrently, only Adwaita theme is supported. Also, Adwaita and Adwaita-dark gtk-2 themes\nmust be installed for the extension to work properly. Not all widgets are themed perfectly.", "link": "https://extensions.gnome.org/extension/4010/personalize/", "shell_version_map": { "38": {"version": "1", "sha256": "1rgh2zq7086ymf0222pbrx5n8q11v3f45095w4x3ikw7k12j9s0n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiUGVyc29uYWxpemUgR05PTUUgdGhlbWUgYW5kIGN1c3RvbWl6ZSB0aGVtLiIsCiAgImRlc2NyaXB0aW9uIjogIlBlcnNvbmFsaXplIHRoZSBsb29rcyBvZiBHTk9NRSBEZXNrdG9wLlxuXG5TZXQgdGhlIHRoZW1lIHZhcmlhbnQsIHdpbmRvdyBjb3JuZXIgY3VydmF0dXJlIGFuZCBzZWxlY3QgYWNjZW50IGNvbG9yLlxuVGhlIENvbG9ycyBzZWN0aW9uIGNvbnRhaW5zIGNvbG9ycyBnZW5lcmF0ZWQgZnJvbSB0aGUgc2VsZWN0ZWQgYWNjZW50IGNvbG9yLlxuVGhlIGNvbG9yIGdlbmVyYXRpb24gaXMgbm90IGFjY3VyYXRlLiBIb3dldmVyLCBpbmRpdmlkdWFsIGNvbG9ycyBjYW4gYmUgY3VzdG9taXNlZC5cblxuTm90IGFsbCBzZXR0aW5ncyBhcmUgYXBwbGllZCBhdXRvbWF0aWNhbGx5LlxuUHJlc3MgUmVmcmVzaCBidXR0b24gb24gdGhlIGxlZnQgb2YgdGhlIGhlYWRlcmJhciB0byByZWxvYWQgdGhlIGV4dGVuc2lvbiBcblxuQ3VycmVudGx5LCBvbmx5IEFkd2FpdGEgdGhlbWUgaXMgc3VwcG9ydGVkLiBBbHNvLCBBZHdhaXRhIGFuZCBBZHdhaXRhLWRhcmsgZ3RrLTIgdGhlbWVzXG5tdXN0IGJlIGluc3RhbGxlZCBmb3IgdGhlIGV4dGVuc2lvbiB0byB3b3JrIHByb3Blcmx5LiBOb3QgYWxsIHdpZGdldHMgYXJlIHRoZW1lZCBwZXJmZWN0bHkuIiwKICAibmFtZSI6ICJQZXJzb25hbGl6ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzb25hbGl6ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJzdGF0dXMiOiAiICIsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2VsZW5pdW0tSC9QZXJzb25hbGl6ZSIsCiAgInV1aWQiOiAicGVyc29uYWxpemVAU2VsZW5pdW0tSCIsCiAgInZlcnNpb24iOiAxCn0="} @@ -3153,7 +3174,8 @@ "42": {"version": "6", "sha256": "12rif8ssd726c4l77p2cidmjzwjjl30x5nh8r635kkzaj5ycjgwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "12rif8ssd726c4l77p2cidmjzwjjl30x5nh8r635kkzaj5ycjgwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"}, "44": {"version": "6", "sha256": "12rif8ssd726c4l77p2cidmjzwjjl30x5nh8r635kkzaj5ycjgwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"}, - "45": {"version": "7", "sha256": "1wfi8w12dwk5wpfnr9x733nwkxhi9ynwpkfpr3gx327q0ibvzbi1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzd2l0Y2h0d29sYXlvdXRzQHF0bWF4LmRldiIsCiAgInZlcnNpb24iOiA3Cn0="} + "45": {"version": "8", "sha256": "0s90zixj9bbbjkrpk6bk1mxrl8qnz794b2nghk5qzg56hwv2ydgj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogOAp9"}, + "46": {"version": "8", "sha256": "0s90zixj9bbbjkrpk6bk1mxrl8qnz794b2nghk5qzg56hwv2ydgj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogOAp9"} }} , {"uuid": "notification-dismiss@kronosoul.xyz", "name": "Dismiss Notifications on Right Click", "pname": "dismiss-notifications-on-right-click", "description": "Simple extension that removes notification popups when they are right clicked.", "link": "https://extensions.gnome.org/extension/4048/dismiss-notifications-on-right-click/", "shell_version_map": { "38": {"version": "1", "sha256": "19pdz3lg1ybmgvpahfwzzhwk8fyhm1sr3wawddz5z66i22spcgjj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwubm90aWZpY2F0aW9uLWRpc21pc3MiLAogICJkZXNjcmlwdGlvbiI6ICJTaW1wbGUgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyBub3RpZmljYXRpb24gcG9wdXBzIHdoZW4gdGhleSBhcmUgcmlnaHQgY2xpY2tlZC4iLAogICJleHRlbnNpb24taWQiOiAiZ2R0b29scyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJEaXNtaXNzIE5vdGlmaWNhdGlvbnMgb24gUmlnaHQgQ2xpY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYWRtaW5Aa3Jvbm9zb3VsLnh5eiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4wIiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tZGlzbWlzc0Brcm9ub3NvdWwueHl6IiwKICAidmVyc2lvbiI6IDEKfQ=="} @@ -3787,12 +3809,12 @@ "42": {"version": "5", "sha256": "1j6q1mgl75mjbr53z88vj2ablnrp4nx0q2a416wdgbiiwdazidbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXBlMzg2L2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogImZlZG9yYS11cGRhdGVAcGVwZTM4NiIsCiAgInZlcnNpb24iOiA1Cn0="} }} , {"uuid": "readingstrip@lupantano.gihthub", "name": "ReadingStrip", "pname": "reading-strip", "description": "It's an extension for Gnome-Shell. It works as a reading guide for computer and this is really useful for people affected by dyslexia. It works great in helping children focusing to read very well, it marks the sentence that they are reading and hides the previous and the next one. It's already used in education projects at schools, it puts the attention on screen but it's also really useful for programmers and graphic designers who want to check their works.", "link": "https://extensions.gnome.org/extension/4419/reading-strip/", "shell_version_map": { - "38": {"version": "29", "sha256": "1m6wbcmd47yg7p62pg1clh731h4wg5j4fzl39qcji2dgwkyqw0qa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbC4gSXQgd29ya3MgYXMgYSByZWFkaW5nIGd1aWRlIGZvciBjb21wdXRlciBhbmQgdGhpcyBpcyByZWFsbHkgdXNlZnVsIGZvciBwZW9wbGUgYWZmZWN0ZWQgYnkgZHlzbGV4aWEuIEl0IHdvcmtzIGdyZWF0IGluIGhlbHBpbmcgY2hpbGRyZW4gZm9jdXNpbmcgdG8gcmVhZCB2ZXJ5IHdlbGwsIGl0IG1hcmtzIHRoZSBzZW50ZW5jZSB0aGF0IHRoZXkgYXJlIHJlYWRpbmcgYW5kIGhpZGVzIHRoZSBwcmV2aW91cyBhbmQgdGhlIG5leHQgb25lLiBJdCdzIGFscmVhZHkgdXNlZCBpbiBlZHVjYXRpb24gcHJvamVjdHMgYXQgc2Nob29scywgaXQgcHV0cyB0aGUgYXR0ZW50aW9uIG9uIHNjcmVlbiBidXQgaXQncyBhbHNvIHJlYWxseSB1c2VmdWwgZm9yIHByb2dyYW1tZXJzIGFuZCBncmFwaGljIGRlc2lnbmVycyB3aG8gd2FudCB0byBjaGVjayB0aGVpciB3b3Jrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZWFkaW5nLXN0cmlwIiwKICAibmFtZSI6ICJSZWFkaW5nU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, - "40": {"version": "29", "sha256": "1m6wbcmd47yg7p62pg1clh731h4wg5j4fzl39qcji2dgwkyqw0qa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbC4gSXQgd29ya3MgYXMgYSByZWFkaW5nIGd1aWRlIGZvciBjb21wdXRlciBhbmQgdGhpcyBpcyByZWFsbHkgdXNlZnVsIGZvciBwZW9wbGUgYWZmZWN0ZWQgYnkgZHlzbGV4aWEuIEl0IHdvcmtzIGdyZWF0IGluIGhlbHBpbmcgY2hpbGRyZW4gZm9jdXNpbmcgdG8gcmVhZCB2ZXJ5IHdlbGwsIGl0IG1hcmtzIHRoZSBzZW50ZW5jZSB0aGF0IHRoZXkgYXJlIHJlYWRpbmcgYW5kIGhpZGVzIHRoZSBwcmV2aW91cyBhbmQgdGhlIG5leHQgb25lLiBJdCdzIGFscmVhZHkgdXNlZCBpbiBlZHVjYXRpb24gcHJvamVjdHMgYXQgc2Nob29scywgaXQgcHV0cyB0aGUgYXR0ZW50aW9uIG9uIHNjcmVlbiBidXQgaXQncyBhbHNvIHJlYWxseSB1c2VmdWwgZm9yIHByb2dyYW1tZXJzIGFuZCBncmFwaGljIGRlc2lnbmVycyB3aG8gd2FudCB0byBjaGVjayB0aGVpciB3b3Jrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZWFkaW5nLXN0cmlwIiwKICAibmFtZSI6ICJSZWFkaW5nU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, - "41": {"version": "29", "sha256": "1m6wbcmd47yg7p62pg1clh731h4wg5j4fzl39qcji2dgwkyqw0qa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbC4gSXQgd29ya3MgYXMgYSByZWFkaW5nIGd1aWRlIGZvciBjb21wdXRlciBhbmQgdGhpcyBpcyByZWFsbHkgdXNlZnVsIGZvciBwZW9wbGUgYWZmZWN0ZWQgYnkgZHlzbGV4aWEuIEl0IHdvcmtzIGdyZWF0IGluIGhlbHBpbmcgY2hpbGRyZW4gZm9jdXNpbmcgdG8gcmVhZCB2ZXJ5IHdlbGwsIGl0IG1hcmtzIHRoZSBzZW50ZW5jZSB0aGF0IHRoZXkgYXJlIHJlYWRpbmcgYW5kIGhpZGVzIHRoZSBwcmV2aW91cyBhbmQgdGhlIG5leHQgb25lLiBJdCdzIGFscmVhZHkgdXNlZCBpbiBlZHVjYXRpb24gcHJvamVjdHMgYXQgc2Nob29scywgaXQgcHV0cyB0aGUgYXR0ZW50aW9uIG9uIHNjcmVlbiBidXQgaXQncyBhbHNvIHJlYWxseSB1c2VmdWwgZm9yIHByb2dyYW1tZXJzIGFuZCBncmFwaGljIGRlc2lnbmVycyB3aG8gd2FudCB0byBjaGVjayB0aGVpciB3b3Jrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZWFkaW5nLXN0cmlwIiwKICAibmFtZSI6ICJSZWFkaW5nU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, - "42": {"version": "29", "sha256": "1m6wbcmd47yg7p62pg1clh731h4wg5j4fzl39qcji2dgwkyqw0qa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbC4gSXQgd29ya3MgYXMgYSByZWFkaW5nIGd1aWRlIGZvciBjb21wdXRlciBhbmQgdGhpcyBpcyByZWFsbHkgdXNlZnVsIGZvciBwZW9wbGUgYWZmZWN0ZWQgYnkgZHlzbGV4aWEuIEl0IHdvcmtzIGdyZWF0IGluIGhlbHBpbmcgY2hpbGRyZW4gZm9jdXNpbmcgdG8gcmVhZCB2ZXJ5IHdlbGwsIGl0IG1hcmtzIHRoZSBzZW50ZW5jZSB0aGF0IHRoZXkgYXJlIHJlYWRpbmcgYW5kIGhpZGVzIHRoZSBwcmV2aW91cyBhbmQgdGhlIG5leHQgb25lLiBJdCdzIGFscmVhZHkgdXNlZCBpbiBlZHVjYXRpb24gcHJvamVjdHMgYXQgc2Nob29scywgaXQgcHV0cyB0aGUgYXR0ZW50aW9uIG9uIHNjcmVlbiBidXQgaXQncyBhbHNvIHJlYWxseSB1c2VmdWwgZm9yIHByb2dyYW1tZXJzIGFuZCBncmFwaGljIGRlc2lnbmVycyB3aG8gd2FudCB0byBjaGVjayB0aGVpciB3b3Jrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZWFkaW5nLXN0cmlwIiwKICAibmFtZSI6ICJSZWFkaW5nU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, - "43": {"version": "29", "sha256": "1m6wbcmd47yg7p62pg1clh731h4wg5j4fzl39qcji2dgwkyqw0qa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbC4gSXQgd29ya3MgYXMgYSByZWFkaW5nIGd1aWRlIGZvciBjb21wdXRlciBhbmQgdGhpcyBpcyByZWFsbHkgdXNlZnVsIGZvciBwZW9wbGUgYWZmZWN0ZWQgYnkgZHlzbGV4aWEuIEl0IHdvcmtzIGdyZWF0IGluIGhlbHBpbmcgY2hpbGRyZW4gZm9jdXNpbmcgdG8gcmVhZCB2ZXJ5IHdlbGwsIGl0IG1hcmtzIHRoZSBzZW50ZW5jZSB0aGF0IHRoZXkgYXJlIHJlYWRpbmcgYW5kIGhpZGVzIHRoZSBwcmV2aW91cyBhbmQgdGhlIG5leHQgb25lLiBJdCdzIGFscmVhZHkgdXNlZCBpbiBlZHVjYXRpb24gcHJvamVjdHMgYXQgc2Nob29scywgaXQgcHV0cyB0aGUgYXR0ZW50aW9uIG9uIHNjcmVlbiBidXQgaXQncyBhbHNvIHJlYWxseSB1c2VmdWwgZm9yIHByb2dyYW1tZXJzIGFuZCBncmFwaGljIGRlc2lnbmVycyB3aG8gd2FudCB0byBjaGVjayB0aGVpciB3b3Jrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZWFkaW5nLXN0cmlwIiwKICAibmFtZSI6ICJSZWFkaW5nU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, - "44": {"version": "29", "sha256": "1m6wbcmd47yg7p62pg1clh731h4wg5j4fzl39qcji2dgwkyqw0qa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbC4gSXQgd29ya3MgYXMgYSByZWFkaW5nIGd1aWRlIGZvciBjb21wdXRlciBhbmQgdGhpcyBpcyByZWFsbHkgdXNlZnVsIGZvciBwZW9wbGUgYWZmZWN0ZWQgYnkgZHlzbGV4aWEuIEl0IHdvcmtzIGdyZWF0IGluIGhlbHBpbmcgY2hpbGRyZW4gZm9jdXNpbmcgdG8gcmVhZCB2ZXJ5IHdlbGwsIGl0IG1hcmtzIHRoZSBzZW50ZW5jZSB0aGF0IHRoZXkgYXJlIHJlYWRpbmcgYW5kIGhpZGVzIHRoZSBwcmV2aW91cyBhbmQgdGhlIG5leHQgb25lLiBJdCdzIGFscmVhZHkgdXNlZCBpbiBlZHVjYXRpb24gcHJvamVjdHMgYXQgc2Nob29scywgaXQgcHV0cyB0aGUgYXR0ZW50aW9uIG9uIHNjcmVlbiBidXQgaXQncyBhbHNvIHJlYWxseSB1c2VmdWwgZm9yIHByb2dyYW1tZXJzIGFuZCBncmFwaGljIGRlc2lnbmVycyB3aG8gd2FudCB0byBjaGVjayB0aGVpciB3b3Jrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZWFkaW5nLXN0cmlwIiwKICAibmFtZSI6ICJSZWFkaW5nU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMjkKfQ=="} + "38": {"version": "30", "sha256": "1c821kxdavrqcr2cb8jd9jjfj4hqxblp0jd9ix5s90pdfr9dp49a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbC4gSXQgd29ya3MgYXMgYSByZWFkaW5nIGd1aWRlIGZvciBjb21wdXRlciBhbmQgdGhpcyBpcyByZWFsbHkgdXNlZnVsIGZvciBwZW9wbGUgYWZmZWN0ZWQgYnkgZHlzbGV4aWEuIEl0IHdvcmtzIGdyZWF0IGluIGhlbHBpbmcgY2hpbGRyZW4gZm9jdXNpbmcgdG8gcmVhZCB2ZXJ5IHdlbGwsIGl0IG1hcmtzIHRoZSBzZW50ZW5jZSB0aGF0IHRoZXkgYXJlIHJlYWRpbmcgYW5kIGhpZGVzIHRoZSBwcmV2aW91cyBhbmQgdGhlIG5leHQgb25lLiBJdCdzIGFscmVhZHkgdXNlZCBpbiBlZHVjYXRpb24gcHJvamVjdHMgYXQgc2Nob29scywgaXQgcHV0cyB0aGUgYXR0ZW50aW9uIG9uIHNjcmVlbiBidXQgaXQncyBhbHNvIHJlYWxseSB1c2VmdWwgZm9yIHByb2dyYW1tZXJzIGFuZCBncmFwaGljIGRlc2lnbmVycyB3aG8gd2FudCB0byBjaGVjayB0aGVpciB3b3Jrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZWFkaW5nLXN0cmlwIiwKICAibmFtZSI6ICJSZWFkaW5nU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, + "40": {"version": "30", "sha256": "1c821kxdavrqcr2cb8jd9jjfj4hqxblp0jd9ix5s90pdfr9dp49a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbC4gSXQgd29ya3MgYXMgYSByZWFkaW5nIGd1aWRlIGZvciBjb21wdXRlciBhbmQgdGhpcyBpcyByZWFsbHkgdXNlZnVsIGZvciBwZW9wbGUgYWZmZWN0ZWQgYnkgZHlzbGV4aWEuIEl0IHdvcmtzIGdyZWF0IGluIGhlbHBpbmcgY2hpbGRyZW4gZm9jdXNpbmcgdG8gcmVhZCB2ZXJ5IHdlbGwsIGl0IG1hcmtzIHRoZSBzZW50ZW5jZSB0aGF0IHRoZXkgYXJlIHJlYWRpbmcgYW5kIGhpZGVzIHRoZSBwcmV2aW91cyBhbmQgdGhlIG5leHQgb25lLiBJdCdzIGFscmVhZHkgdXNlZCBpbiBlZHVjYXRpb24gcHJvamVjdHMgYXQgc2Nob29scywgaXQgcHV0cyB0aGUgYXR0ZW50aW9uIG9uIHNjcmVlbiBidXQgaXQncyBhbHNvIHJlYWxseSB1c2VmdWwgZm9yIHByb2dyYW1tZXJzIGFuZCBncmFwaGljIGRlc2lnbmVycyB3aG8gd2FudCB0byBjaGVjayB0aGVpciB3b3Jrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZWFkaW5nLXN0cmlwIiwKICAibmFtZSI6ICJSZWFkaW5nU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, + "41": {"version": "30", "sha256": "1c821kxdavrqcr2cb8jd9jjfj4hqxblp0jd9ix5s90pdfr9dp49a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbC4gSXQgd29ya3MgYXMgYSByZWFkaW5nIGd1aWRlIGZvciBjb21wdXRlciBhbmQgdGhpcyBpcyByZWFsbHkgdXNlZnVsIGZvciBwZW9wbGUgYWZmZWN0ZWQgYnkgZHlzbGV4aWEuIEl0IHdvcmtzIGdyZWF0IGluIGhlbHBpbmcgY2hpbGRyZW4gZm9jdXNpbmcgdG8gcmVhZCB2ZXJ5IHdlbGwsIGl0IG1hcmtzIHRoZSBzZW50ZW5jZSB0aGF0IHRoZXkgYXJlIHJlYWRpbmcgYW5kIGhpZGVzIHRoZSBwcmV2aW91cyBhbmQgdGhlIG5leHQgb25lLiBJdCdzIGFscmVhZHkgdXNlZCBpbiBlZHVjYXRpb24gcHJvamVjdHMgYXQgc2Nob29scywgaXQgcHV0cyB0aGUgYXR0ZW50aW9uIG9uIHNjcmVlbiBidXQgaXQncyBhbHNvIHJlYWxseSB1c2VmdWwgZm9yIHByb2dyYW1tZXJzIGFuZCBncmFwaGljIGRlc2lnbmVycyB3aG8gd2FudCB0byBjaGVjayB0aGVpciB3b3Jrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZWFkaW5nLXN0cmlwIiwKICAibmFtZSI6ICJSZWFkaW5nU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, + "42": {"version": "30", "sha256": "1c821kxdavrqcr2cb8jd9jjfj4hqxblp0jd9ix5s90pdfr9dp49a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbC4gSXQgd29ya3MgYXMgYSByZWFkaW5nIGd1aWRlIGZvciBjb21wdXRlciBhbmQgdGhpcyBpcyByZWFsbHkgdXNlZnVsIGZvciBwZW9wbGUgYWZmZWN0ZWQgYnkgZHlzbGV4aWEuIEl0IHdvcmtzIGdyZWF0IGluIGhlbHBpbmcgY2hpbGRyZW4gZm9jdXNpbmcgdG8gcmVhZCB2ZXJ5IHdlbGwsIGl0IG1hcmtzIHRoZSBzZW50ZW5jZSB0aGF0IHRoZXkgYXJlIHJlYWRpbmcgYW5kIGhpZGVzIHRoZSBwcmV2aW91cyBhbmQgdGhlIG5leHQgb25lLiBJdCdzIGFscmVhZHkgdXNlZCBpbiBlZHVjYXRpb24gcHJvamVjdHMgYXQgc2Nob29scywgaXQgcHV0cyB0aGUgYXR0ZW50aW9uIG9uIHNjcmVlbiBidXQgaXQncyBhbHNvIHJlYWxseSB1c2VmdWwgZm9yIHByb2dyYW1tZXJzIGFuZCBncmFwaGljIGRlc2lnbmVycyB3aG8gd2FudCB0byBjaGVjayB0aGVpciB3b3Jrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZWFkaW5nLXN0cmlwIiwKICAibmFtZSI6ICJSZWFkaW5nU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, + "43": {"version": "30", "sha256": "1c821kxdavrqcr2cb8jd9jjfj4hqxblp0jd9ix5s90pdfr9dp49a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbC4gSXQgd29ya3MgYXMgYSByZWFkaW5nIGd1aWRlIGZvciBjb21wdXRlciBhbmQgdGhpcyBpcyByZWFsbHkgdXNlZnVsIGZvciBwZW9wbGUgYWZmZWN0ZWQgYnkgZHlzbGV4aWEuIEl0IHdvcmtzIGdyZWF0IGluIGhlbHBpbmcgY2hpbGRyZW4gZm9jdXNpbmcgdG8gcmVhZCB2ZXJ5IHdlbGwsIGl0IG1hcmtzIHRoZSBzZW50ZW5jZSB0aGF0IHRoZXkgYXJlIHJlYWRpbmcgYW5kIGhpZGVzIHRoZSBwcmV2aW91cyBhbmQgdGhlIG5leHQgb25lLiBJdCdzIGFscmVhZHkgdXNlZCBpbiBlZHVjYXRpb24gcHJvamVjdHMgYXQgc2Nob29scywgaXQgcHV0cyB0aGUgYXR0ZW50aW9uIG9uIHNjcmVlbiBidXQgaXQncyBhbHNvIHJlYWxseSB1c2VmdWwgZm9yIHByb2dyYW1tZXJzIGFuZCBncmFwaGljIGRlc2lnbmVycyB3aG8gd2FudCB0byBjaGVjayB0aGVpciB3b3Jrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZWFkaW5nLXN0cmlwIiwKICAibmFtZSI6ICJSZWFkaW5nU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, + "44": {"version": "30", "sha256": "1c821kxdavrqcr2cb8jd9jjfj4hqxblp0jd9ix5s90pdfr9dp49a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbC4gSXQgd29ya3MgYXMgYSByZWFkaW5nIGd1aWRlIGZvciBjb21wdXRlciBhbmQgdGhpcyBpcyByZWFsbHkgdXNlZnVsIGZvciBwZW9wbGUgYWZmZWN0ZWQgYnkgZHlzbGV4aWEuIEl0IHdvcmtzIGdyZWF0IGluIGhlbHBpbmcgY2hpbGRyZW4gZm9jdXNpbmcgdG8gcmVhZCB2ZXJ5IHdlbGwsIGl0IG1hcmtzIHRoZSBzZW50ZW5jZSB0aGF0IHRoZXkgYXJlIHJlYWRpbmcgYW5kIGhpZGVzIHRoZSBwcmV2aW91cyBhbmQgdGhlIG5leHQgb25lLiBJdCdzIGFscmVhZHkgdXNlZCBpbiBlZHVjYXRpb24gcHJvamVjdHMgYXQgc2Nob29scywgaXQgcHV0cyB0aGUgYXR0ZW50aW9uIG9uIHNjcmVlbiBidXQgaXQncyBhbHNvIHJlYWxseSB1c2VmdWwgZm9yIHByb2dyYW1tZXJzIGFuZCBncmFwaGljIGRlc2lnbmVycyB3aG8gd2FudCB0byBjaGVjayB0aGVpciB3b3Jrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyZWFkaW5nLXN0cmlwIiwKICAibmFtZSI6ICJSZWFkaW5nU3RyaXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVhZGluZ3N0cmlwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMzAKfQ=="} }} , {"uuid": "gnome-clipboard@b00f.github.io", "name": "Gnome Clipboard", "pname": "gnome-clipboard", "description": "A gnome shell extension to manage your clipboard.", "link": "https://extensions.gnome.org/extension/4422/gnome-clipboard/", "shell_version_map": { "38": {"version": "8", "sha256": "1zgymry549c6pmj1c0f6gvpyyfj0z93fwbhhxa67fx3nf95gb3kv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJnbm9tZS1jbGlwYm9hcmRAYjAwZi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, @@ -3865,7 +3887,8 @@ "42": {"version": "24", "sha256": "04gyrqdhx4rd3zl6rlfpyrff5p2wc7bqw9wc07849c557bfkhnwc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDIsIDQzLCA0NCBcbiAgICAtIENhY2hlcyBhbGJ1bSBhcnRcbiAgICAtIENvbnRyb2wgZXZlcnkgZWxlbWVudCBpbiB0aGUgZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJNZWRpYSBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tZWRpYWNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2xpZmZuaWZmL21lZGlhLWNvbnRyb2xzIiwKICAidXVpZCI6ICJtZWRpYWNvbnRyb2xzQGNsaWZmbmlmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "43": {"version": "29", "sha256": "02asfdrc3z5834xn000x5qhb3yhm3vgr7pr15sxms8h5wcw43p40", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDIsIDQzLCA0NCBcbiAgICAtIENhY2hlcyBhbGJ1bSBhcnRcbiAgICAtIENvbnRyb2wgZXZlcnkgZWxlbWVudCBpbiB0aGUgZXh0ZW5zaW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVkaWFjb250cm9scyIsCiAgIm5hbWUiOiAiTWVkaWEgQ29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVkaWFjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2xpZmZuaWZmL21lZGlhLWNvbnRyb2xzIiwKICAidXVpZCI6ICJtZWRpYWNvbnRyb2xzQGNsaWZmbmlmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "44": {"version": "29", "sha256": "02asfdrc3z5834xn000x5qhb3yhm3vgr7pr15sxms8h5wcw43p40", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MSwgNDIsIDQzLCA0NCBcbiAgICAtIENhY2hlcyBhbGJ1bSBhcnRcbiAgICAtIENvbnRyb2wgZXZlcnkgZWxlbWVudCBpbiB0aGUgZXh0ZW5zaW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVkaWFjb250cm9scyIsCiAgIm5hbWUiOiAiTWVkaWEgQ29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVkaWFjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2xpZmZuaWZmL21lZGlhLWNvbnRyb2xzIiwKICAidXVpZCI6ICJtZWRpYWNvbnRyb2xzQGNsaWZmbmlmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, - "45": {"version": "34", "sha256": "16jxcssqj3lkd88vrl2sq8lxf5fjj6g7nq6l19p3ahc5ma89dpif", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiTWVkaWEgQ29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVkaWFjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jbGlmZm5pZmYvbWVkaWEtY29udHJvbHMiLAogICJ1dWlkIjogIm1lZGlhY29udHJvbHNAY2xpZmZuaWZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQsCiAgInZlcnNpb24tbmFtZSI6ICIyLjAuMCIKfQ=="} + "45": {"version": "36", "sha256": "0mccq5h71m41xw4wl4ja0xq1dga4iivq9nrrknnfyfhr81rca41n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiTWVkaWEgQ29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVkaWFjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2xpZmZuaWZmL21lZGlhLWNvbnRyb2xzIiwKICAidXVpZCI6ICJtZWRpYWNvbnRyb2xzQGNsaWZmbmlmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM2LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi4wLjEiCn0="}, + "46": {"version": "36", "sha256": "0mccq5h71m41xw4wl4ja0xq1dga4iivq9nrrknnfyfhr81rca41n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiTWVkaWEgQ29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWVkaWFjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2xpZmZuaWZmL21lZGlhLWNvbnRyb2xzIiwKICAidXVpZCI6ICJtZWRpYWNvbnRyb2xzQGNsaWZmbmlmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM2LAogICJ2ZXJzaW9uLW5hbWUiOiAiMi4wLjEiCn0="} }} , {"uuid": "sp-tray@sp-tray.esenliyim.github.com", "name": "spotify-tray", "pname": "spotify-tray", "description": "Adds a button to the panel that shows information Spotify playback. For bug reports, feature requests, translation contributions, etc., please visit the extension's github page.", "link": "https://extensions.gnome.org/extension/4472/spotify-tray/", "shell_version_map": { "38": {"version": "17", "sha256": "11gyy143n5bvsrydlr4hvy3ggn49k1pxk1d7x11dafic8xxwv5cl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}, @@ -3874,7 +3897,8 @@ "42": {"version": "22", "sha256": "1vs92fcas0mzq8pl461cbph1m9yb974qmpsn6wc8r80hd6hr4znx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VzZW5saXlpbS9zcC10cmF5IiwKICAidXVpZCI6ICJzcC10cmF5QHNwLXRyYXkuZXNlbmxpeWltLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "1vs92fcas0mzq8pl461cbph1m9yb974qmpsn6wc8r80hd6hr4znx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VzZW5saXlpbS9zcC10cmF5IiwKICAidXVpZCI6ICJzcC10cmF5QHNwLXRyYXkuZXNlbmxpeWltLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "44": {"version": "22", "sha256": "1vs92fcas0mzq8pl461cbph1m9yb974qmpsn6wc8r80hd6hr4znx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VzZW5saXlpbS9zcC10cmF5IiwKICAidXVpZCI6ICJzcC10cmF5QHNwLXRyYXkuZXNlbmxpeWltLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, - "45": {"version": "24", "sha256": "07j6frv0v58dfc30rbb7dcbwgqkd18a2a2dfsqj3wv93nhbvdym5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInNwLXRyYXkiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VzZW5saXlpbS9zcC10cmF5IiwKICAidXVpZCI6ICJzcC10cmF5QHNwLXRyYXkuZXNlbmxpeWltLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="} + "45": {"version": "25", "sha256": "1chp7ayp84xcr17m5cnfhd78s4wcqldr3iq58rczli47svsxwxm0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInNwLXRyYXkiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="}, + "46": {"version": "25", "sha256": "1chp7ayp84xcr17m5cnfhd78s4wcqldr3iq58rczli47svsxwxm0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInNwLXRyYXkiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="} }} , {"uuid": "aws-default-profile-switcher@kevin-chappell.com", "name": "AWS Default Profile Switcher", "pname": "aws-default-profile-switcher", "description": "Gnome shell extension for quickly setting named profiles as the default", "link": "https://extensions.gnome.org/extension/4473/aws-default-profile-switcher/", "shell_version_map": { "38": {"version": "4", "sha256": "1imgp4d42g05j88y8ilvfcfdvygaqchi9hivvap1kyshbl08ys3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgcXVpY2tseSBzZXR0aW5nIG5hbWVkIHByb2ZpbGVzIGFzIHRoZSBkZWZhdWx0IiwKICAibmFtZSI6ICJBV1MgRGVmYXVsdCBQcm9maWxlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5jaGFwcGVsbC9hd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJhd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyQGtldmluLWNoYXBwZWxsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, @@ -3959,7 +3983,8 @@ "42": {"version": "18", "sha256": "13pg4lzqpa7m7qhdrqw5vlnjaqc843cxyinygg197lafgx10ya1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaXBsYWItRHV0dGEvTmVwYWxpX0RhdGUiLAogICJ1dWlkIjogIm5lcGFsaS1kYXRlQGJpcGxhYiIsCiAgInZlcnNpb24iOiAxOAp9"}, "43": {"version": "18", "sha256": "13pg4lzqpa7m7qhdrqw5vlnjaqc843cxyinygg197lafgx10ya1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaXBsYWItRHV0dGEvTmVwYWxpX0RhdGUiLAogICJ1dWlkIjogIm5lcGFsaS1kYXRlQGJpcGxhYiIsCiAgInZlcnNpb24iOiAxOAp9"}, "44": {"version": "18", "sha256": "13pg4lzqpa7m7qhdrqw5vlnjaqc843cxyinygg197lafgx10ya1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaXBsYWItRHV0dGEvTmVwYWxpX0RhdGUiLAogICJ1dWlkIjogIm5lcGFsaS1kYXRlQGJpcGxhYiIsCiAgInZlcnNpb24iOiAxOAp9"}, - "45": {"version": "29", "sha256": "0ybb4rnj5w1q46v7wjq7qz1j3r8a3350qbarq4vvs28bqc1g55pr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpcGxhYi1EdXR0YS9OZXBhbGlfRGF0ZSIsCiAgInV1aWQiOiAibmVwYWxpLWRhdGVAYmlwbGFiIiwKICAidmVyc2lvbiI6IDI5Cn0="} + "45": {"version": "30", "sha256": "0mjy8fjnj4faazawwg9ckl16fl6xs98m4vl22panjajsh9fqqsck", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaXBsYWItRHV0dGEvTmVwYWxpX0RhdGUiLAogICJ1dWlkIjogIm5lcGFsaS1kYXRlQGJpcGxhYiIsCiAgInZlcnNpb24iOiAzMAp9"}, + "46": {"version": "30", "sha256": "0mjy8fjnj4faazawwg9ckl16fl6xs98m4vl22panjajsh9fqqsck", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaXBsYWItRHV0dGEvTmVwYWxpX0RhdGUiLAogICJ1dWlkIjogIm5lcGFsaS1kYXRlQGJpcGxhYiIsCiAgInZlcnNpb24iOiAzMAp9"} }} , {"uuid": "clock-left@mapuut", "name": "Clock Left", "pname": "clock-left", "description": "Moves clock to left.\n\nAlso this one might suit you better: extensions.gnome.org/extension/4667/left-clock/", "link": "https://extensions.gnome.org/extension/4526/clock-left/", "shell_version_map": { "38": {"version": "4", "sha256": "0hvr7nmbrn7nqn3nk9p1a659yhkgja3gy9kbw18yykyqf0lbssqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIGNsb2NrIHRvIGxlZnQuXG5cbkFsc28gdGhpcyBvbmUgbWlnaHQgc3VpdCB5b3UgYmV0dGVyOiBleHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDY2Ny9sZWZ0LWNsb2NrLyIsCiAgIm5hbWUiOiAiQ2xvY2sgTGVmdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjbG9jay1sZWZ0QG1hcHV1dCIsCiAgInZlcnNpb24iOiA0Cn0="}, @@ -4033,7 +4058,8 @@ "42": {"version": "8", "sha256": "0an2p1ijnza2pxl20f69l5r8rly4kn5243wvlzydq139sq23kg0p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiAgSXQgZml4ZXMgYWxzbyBmb2N1cyBpc3N1ZXMgd2l0aCB0aGUgYWN0aXZlIHdpbmRvdy4iLAogICJuYW1lIjogIlF1aWNrIExhbmcgU3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmtvc3Rpcy9nbm9tZS1zaGVsbC1xdWljay1sYW5nLXN3aXRjaCIsCiAgInV1aWQiOiAicXVpY2stbGFuZy1zd2l0Y2hAYW5rb3N0aXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "43": {"version": "8", "sha256": "0an2p1ijnza2pxl20f69l5r8rly4kn5243wvlzydq139sq23kg0p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiAgSXQgZml4ZXMgYWxzbyBmb2N1cyBpc3N1ZXMgd2l0aCB0aGUgYWN0aXZlIHdpbmRvdy4iLAogICJuYW1lIjogIlF1aWNrIExhbmcgU3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmtvc3Rpcy9nbm9tZS1zaGVsbC1xdWljay1sYW5nLXN3aXRjaCIsCiAgInV1aWQiOiAicXVpY2stbGFuZy1zd2l0Y2hAYW5rb3N0aXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "44": {"version": "8", "sha256": "0an2p1ijnza2pxl20f69l5r8rly4kn5243wvlzydq139sq23kg0p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiAgSXQgZml4ZXMgYWxzbyBmb2N1cyBpc3N1ZXMgd2l0aCB0aGUgYWN0aXZlIHdpbmRvdy4iLAogICJuYW1lIjogIlF1aWNrIExhbmcgU3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmtvc3Rpcy9nbm9tZS1zaGVsbC1xdWljay1sYW5nLXN3aXRjaCIsCiAgInV1aWQiOiAicXVpY2stbGFuZy1zd2l0Y2hAYW5rb3N0aXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, - "45": {"version": "9", "sha256": "1j3h463si1hilr1afm5y1j7j0i89zrlyawi5fn1g3m6m165yjxkk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiAgSXQgZml4ZXMgYWxzbyBmb2N1cyBpc3N1ZXMgd2l0aCB0aGUgYWN0aXZlIHdpbmRvdy4iLAogICJuYW1lIjogIlF1aWNrIExhbmcgU3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Fua29zdGlzL2dub21lLXNoZWxsLXF1aWNrLWxhbmctc3dpdGNoIiwKICAidXVpZCI6ICJxdWljay1sYW5nLXN3aXRjaEBhbmtvc3Rpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"} + "45": {"version": "11", "sha256": "180w6gyldmqw9y2x4v5yhiq4d8kk1751s5mpgc1dqzmkwf4gk4r9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiAgSXQgZml4ZXMgYWxzbyBmb2N1cyBpc3N1ZXMgd2l0aCB0aGUgYWN0aXZlIHdpbmRvdy4iLAogICJuYW1lIjogIlF1aWNrIExhbmcgU3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmtvc3Rpcy9nbm9tZS1zaGVsbC1xdWljay1sYW5nLXN3aXRjaCIsCiAgInV1aWQiOiAicXVpY2stbGFuZy1zd2l0Y2hAYW5rb3N0aXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, + "46": {"version": "11", "sha256": "180w6gyldmqw9y2x4v5yhiq4d8kk1751s5mpgc1dqzmkwf4gk4r9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiAgSXQgZml4ZXMgYWxzbyBmb2N1cyBpc3N1ZXMgd2l0aCB0aGUgYWN0aXZlIHdpbmRvdy4iLAogICJuYW1lIjogIlF1aWNrIExhbmcgU3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmtvc3Rpcy9nbm9tZS1zaGVsbC1xdWljay1sYW5nLXN3aXRjaCIsCiAgInV1aWQiOiAicXVpY2stbGFuZy1zd2l0Y2hAYW5rb3N0aXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDExCn0="} }} , {"uuid": "ssh-connect-menu@edavidf", "name": "SSH Connect Menu", "pname": "ssh-connect-menu", "description": "This extension puts an icon in the panel with a simple dropdown menu that launches items from your ~.ssh/config. \n\nThis is a fork of original by Josh Martens (https://extensions.gnome.org/extension/3237/ssh-quick-connect/) for Gnome 40 compatible changes that Josh made but did not upload here for quick/easy install/remove. Besides this description, uuid, name, and version number, no changes were made.", "link": "https://extensions.gnome.org/extension/4564/ssh-connect-menu/", "shell_version_map": { "40": {"version": "1", "sha256": "1s85qm4gzsywr5wagvkwag2344iandh57gc7cj00wlx34y642kpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgd2l0aCBhIHNpbXBsZSBkcm9wZG93biBtZW51IHRoYXQgbGF1bmNoZXMgaXRlbXMgZnJvbSB5b3VyIH4uc3NoL2NvbmZpZy4gXG5cblRoaXMgaXMgYSBmb3JrIG9mIG9yaWdpbmFsIGJ5IEpvc2ggTWFydGVucyAoaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzIzNy9zc2gtcXVpY2stY29ubmVjdC8pIGZvciBHbm9tZSA0MCBjb21wYXRpYmxlIGNoYW5nZXMgdGhhdCBKb3NoIG1hZGUgYnV0IGRpZCBub3QgdXBsb2FkIGhlcmUgZm9yIHF1aWNrL2Vhc3kgaW5zdGFsbC9yZW1vdmUuIEJlc2lkZXMgdGhpcyBkZXNjcmlwdGlvbiwgdXVpZCwgbmFtZSwgYW5kIHZlcnNpb24gbnVtYmVyLCBubyBjaGFuZ2VzIHdlcmUgbWFkZS4iLAogICJuYW1lIjogIlNTSCBDb25uZWN0IE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5naXRodWIuY29tL0VEYXZpZEYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNzaC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJzc2gtY29ubmVjdC1tZW51QGVkYXZpZGYiLAogICJ2ZXJzaW9uIjogMQp9"} @@ -4093,8 +4119,8 @@ "42": {"version": "9", "sha256": "1vnraf73wvsq5kmw78gjiyn7ix4mzvfq803fhmk2781v9j5f4jgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhIG5ldyB3b3Jrc3BhY2Ugb24gdGhlIHJpZ2h0IG9mIHlvdXIgY3VycmVudCB3b3Jrc3BhY2U6IEN0bCArIFN1cGVyICsgU2hpZnQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIFNoaWZ0ICsgTGVmdFxuXG5OZXctZW1wdHktd29ya3NwYWNlIFNob3J0Y3V0OlxuICAgICAgICBVc2UgYSBzaG9ydGN1dCB0byBjcmVhdGUgYW4gZW1wdHkgd29ya3NwYWNlIG9uIHRoZSByaWdodDogQ3RsICsgU3VwZXIgKyBBbHQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIEFsdCArIExlZnRcblxuUmVvcmRlci13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZTogQ3RsICsgU3VwZXIgKyBMZWZ0IG9yIEN0bCArIFN1cGVyICsgUmlnaHRcbiAgICAgICAgQnkgZGVmYXVsdCwgdGhpcyBzaG9ydGN1dCB3aXRoIGF1dG9tYXRpY2FsbHkgdHJpZ2dlciB0aGUgT3ZlcnZpZXcgdG8gcHJvdmlkZSBhIGxpbWl0ZWQgZm9ybSBvZiB2aXN1YWwgZmVlZGJhY2suIEhvd2V2ZXIsIHRoaXMgcHJlZmVyZW5jZSBjYW4gYmUgY2hhbmdlZCB2aWEgdGhlIGV4dGVuc2lvbidzIFNldHRpbmdzIHBhbmVsLiIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "1vnraf73wvsq5kmw78gjiyn7ix4mzvfq803fhmk2781v9j5f4jgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhIG5ldyB3b3Jrc3BhY2Ugb24gdGhlIHJpZ2h0IG9mIHlvdXIgY3VycmVudCB3b3Jrc3BhY2U6IEN0bCArIFN1cGVyICsgU2hpZnQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIFNoaWZ0ICsgTGVmdFxuXG5OZXctZW1wdHktd29ya3NwYWNlIFNob3J0Y3V0OlxuICAgICAgICBVc2UgYSBzaG9ydGN1dCB0byBjcmVhdGUgYW4gZW1wdHkgd29ya3NwYWNlIG9uIHRoZSByaWdodDogQ3RsICsgU3VwZXIgKyBBbHQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIEFsdCArIExlZnRcblxuUmVvcmRlci13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZTogQ3RsICsgU3VwZXIgKyBMZWZ0IG9yIEN0bCArIFN1cGVyICsgUmlnaHRcbiAgICAgICAgQnkgZGVmYXVsdCwgdGhpcyBzaG9ydGN1dCB3aXRoIGF1dG9tYXRpY2FsbHkgdHJpZ2dlciB0aGUgT3ZlcnZpZXcgdG8gcHJvdmlkZSBhIGxpbWl0ZWQgZm9ybSBvZiB2aXN1YWwgZmVlZGJhY2suIEhvd2V2ZXIsIHRoaXMgcHJlZmVyZW5jZSBjYW4gYmUgY2hhbmdlZCB2aWEgdGhlIGV4dGVuc2lvbidzIFNldHRpbmdzIHBhbmVsLiIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "44": {"version": "10", "sha256": "02mkarap1bzj3znnfc2wbkjm8g1zidifbm1lcf12wxvi7b5db8i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhIG5ldyB3b3Jrc3BhY2Ugb24gdGhlIHJpZ2h0IG9mIHlvdXIgY3VycmVudCB3b3Jrc3BhY2U6IEN0bCArIFN1cGVyICsgU2hpZnQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIFNoaWZ0ICsgTGVmdFxuXG5OZXctZW1wdHktd29ya3NwYWNlIFNob3J0Y3V0OlxuICAgICAgICBVc2UgYSBzaG9ydGN1dCB0byBjcmVhdGUgYW4gZW1wdHkgd29ya3NwYWNlIG9uIHRoZSByaWdodDogQ3RsICsgU3VwZXIgKyBBbHQgKyBSaWdodFxuICAgICAgICBPciB0byB0aGUgbGVmdCAvIGJhY2t3YXJkOiBDdGwgKyBTdXBlciArIEFsdCArIExlZnRcblxuUmVvcmRlci13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gICAgICAgIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZTogQ3RsICsgU3VwZXIgKyBMZWZ0IG9yIEN0bCArIFN1cGVyICsgUmlnaHRcbiAgICAgICAgQnkgZGVmYXVsdCwgdGhpcyBzaG9ydGN1dCB3aXRoIGF1dG9tYXRpY2FsbHkgdHJpZ2dlciB0aGUgT3ZlcnZpZXcgdG8gcHJvdmlkZSBhIGxpbWl0ZWQgZm9ybSBvZiB2aXN1YWwgZmVlZGJhY2suIEhvd2V2ZXIsIHRoaXMgcHJlZmVyZW5jZSBjYW4gYmUgY2hhbmdlZCB2aWEgdGhlIGV4dGVuc2lvbidzIFNldHRpbmdzIHBhbmVsLiIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXJuc2NvdHQvbmV3d29ya3NwYWNlc2hvcnRjdXQtYmFybml4LmlvIiwKICAidXVpZCI6ICJuZXd3b3Jrc3BhY2VzaG9ydGN1dEBiYXJuaXguaW8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, - "45": {"version": "16", "sha256": "19rvv5rgyj65k7xgd0sn345kqdg24f17g2czf05vmkgkqilqac2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3J0Y3V0cyB0byAoMSkgaW5zZXJ0IGEgbmV3IHdvcmtzcGFjZSwgKDIpIHJlb3JkZXIgd29ya3NwYWNlcyBhbmQgKDMpIHdpbmRvdy1tYW5nZW1lbnQgYXNzaXRhbnQgZm9yIG1pbmltYWwgdGlsaW5nLiIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmFybnNjb3R0L25ld3dvcmtzcGFjZXNob3J0Y3V0LWJhcm5peC5pbyIsCiAgInV1aWQiOiAibmV3d29ya3NwYWNlc2hvcnRjdXRAYmFybml4LmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}, - "46": {"version": "16", "sha256": "19rvv5rgyj65k7xgd0sn345kqdg24f17g2czf05vmkgkqilqac2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3J0Y3V0cyB0byAoMSkgaW5zZXJ0IGEgbmV3IHdvcmtzcGFjZSwgKDIpIHJlb3JkZXIgd29ya3NwYWNlcyBhbmQgKDMpIHdpbmRvdy1tYW5nZW1lbnQgYXNzaXRhbnQgZm9yIG1pbmltYWwgdGlsaW5nLiIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmFybnNjb3R0L25ld3dvcmtzcGFjZXNob3J0Y3V0LWJhcm5peC5pbyIsCiAgInV1aWQiOiAibmV3d29ya3NwYWNlc2hvcnRjdXRAYmFybml4LmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="} + "45": {"version": "17", "sha256": "0n5rbhac7wxf3kg2m0q9glgmpnfid7kvhm9zwqkqiw9jxg7b84d2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3J0Y3V0cyB0byAoMSkgaW5zZXJ0IGEgbmV3IHdvcmtzcGFjZSwgKDIpIHJlb3JkZXIgd29ya3NwYWNlcyBhbmQgKDMpIHdpbmRvdy1tYW5nZW1lbnQgYXNzaXRhbnQgZm9yIG1pbmltYWwgdGlsaW5nLiIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmFybnNjb3R0L25ld3dvcmtzcGFjZXNob3J0Y3V0LWJhcm5peC5pbyIsCiAgInV1aWQiOiAibmV3d29ya3NwYWNlc2hvcnRjdXRAYmFybml4LmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}, + "46": {"version": "17", "sha256": "0n5rbhac7wxf3kg2m0q9glgmpnfid7kvhm9zwqkqiw9jxg7b84d2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3J0Y3V0cyB0byAoMSkgaW5zZXJ0IGEgbmV3IHdvcmtzcGFjZSwgKDIpIHJlb3JkZXIgd29ya3NwYWNlcyBhbmQgKDMpIHdpbmRvdy1tYW5nZW1lbnQgYXNzaXRhbnQgZm9yIG1pbmltYWwgdGlsaW5nLiIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmFybnNjb3R0L25ld3dvcmtzcGFjZXNob3J0Y3V0LWJhcm5peC5pbyIsCiAgInV1aWQiOiAibmV3d29ya3NwYWNlc2hvcnRjdXRAYmFybml4LmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="} }} , {"uuid": "p.stonham@switcheroo.org", "name": "Switcheroo", "pname": "switcheroo", "description": "Switch to the first window with the title x\n\nA very small extension to allow you to switch windows via gdbus. This is particularly useful if you are using wayland as utilities such as wmctrl won't work.\n\nSince Gnome 41 removed org.gnome.Shell.Eval for security reasons, if you ever used a command such as:\n\ngdbus call --session --dest org.gnome.Shell --object-path /org/gnome/Shell --method org.gnome.Shell.Eval\"var mw = global.get_window_actors().map(w=>w.meta_window).find(mw=>mw.get_title().includes('Firefox'));mw && mw.activate(0)\"\n\nthis can now be replaced with:\n\ngdbus call --session --dest org.gnome.Shell --object-path /org/switcheroo/Switcheroo --method org.switcheroo.Switcheroo.Set Firefox\n\nThis can then be assigned to a shortcut key in Gnome settings or called programmatically.", "link": "https://extensions.gnome.org/extension/4600/switcheroo/", "shell_version_map": { "41": {"version": "3", "sha256": "0pfjhx8pm26zpizazd2pbpfqsr8vwc6znrm1cbf4ydcyvfxsnwwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB0byB0aGUgZmlyc3Qgd2luZG93IHdpdGggdGhlIHRpdGxlIHhcblxuQSB2ZXJ5IHNtYWxsIGV4dGVuc2lvbiB0byBhbGxvdyB5b3UgdG8gc3dpdGNoIHdpbmRvd3MgdmlhIGdkYnVzLiBUaGlzIGlzIHBhcnRpY3VsYXJseSB1c2VmdWwgaWYgeW91IGFyZSB1c2luZyB3YXlsYW5kIGFzIHV0aWxpdGllcyBzdWNoIGFzIHdtY3RybCB3b24ndCB3b3JrLlxuXG5TaW5jZSBHbm9tZSA0MSByZW1vdmVkIG9yZy5nbm9tZS5TaGVsbC5FdmFsIGZvciBzZWN1cml0eSByZWFzb25zLCBpZiB5b3UgZXZlciB1c2VkIGEgY29tbWFuZCBzdWNoIGFzOlxuXG5nZGJ1cyBjYWxsIC0tc2Vzc2lvbiAtLWRlc3Qgb3JnLmdub21lLlNoZWxsIC0tb2JqZWN0LXBhdGggL29yZy9nbm9tZS9TaGVsbCAtLW1ldGhvZCBvcmcuZ25vbWUuU2hlbGwuRXZhbFwidmFyIG13ID0gZ2xvYmFsLmdldF93aW5kb3dfYWN0b3JzKCkubWFwKHc9Jmd0O3cubWV0YV93aW5kb3cpLmZpbmQobXc9Jmd0O213LmdldF90aXRsZSgpLmluY2x1ZGVzKCdGaXJlZm94JykpO213ICZhbXA7JmFtcDsgbXcuYWN0aXZhdGUoMClcIlxuXG50aGlzIGNhbiBub3cgYmUgcmVwbGFjZWQgd2l0aDpcblxuZ2RidXMgY2FsbCAtLXNlc3Npb24gLS1kZXN0IG9yZy5nbm9tZS5TaGVsbCAtLW9iamVjdC1wYXRoIC9vcmcvc3dpdGNoZXJvby9Td2l0Y2hlcm9vIC0tbWV0aG9kIG9yZy5zd2l0Y2hlcm9vLlN3aXRjaGVyb28uU2V0IEZpcmVmb3hcblxuVGhpcyBjYW4gdGhlbiBiZSBhc3NpZ25lZCB0byBhIHNob3J0Y3V0IGtleSBpbiBHbm9tZSBzZXR0aW5ncyBvciBjYWxsZWQgcHJvZ3JhbW1hdGljYWxseS4iLAogICJuYW1lIjogIlN3aXRjaGVyb28iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInAuc3RvbmhhbUBzd2l0Y2hlcm9vLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="} @@ -4186,8 +4212,8 @@ "42": {"version": "23", "sha256": "02kgp6ihg8gkkhxprxd7m9i186i0l3sy954lp6s3aq23v2ya0yn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "43": {"version": "23", "sha256": "02kgp6ihg8gkkhxprxd7m9i186i0l3sy954lp6s3aq23v2ya0yn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "44": {"version": "23", "sha256": "02kgp6ihg8gkkhxprxd7m9i186i0l3sy954lp6s3aq23v2ya0yn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, - "45": {"version": "22", "sha256": "08hlrhm82y69wbdyms1xmp1sk4kq7jpk46kkqjj2y674484wc9m3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9EZXNrdG9wLUN1YmUiLAogICJ1dWlkIjogImRlc2t0b3AtY3ViZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, - "46": {"version": "22", "sha256": "08hlrhm82y69wbdyms1xmp1sk4kq7jpk46kkqjj2y674484wc9m3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9EZXNrdG9wLUN1YmUiLAogICJ1dWlkIjogImRlc2t0b3AtY3ViZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="} + "45": {"version": "24", "sha256": "1aixlp25w5ch4g00c2rx6231ba6d385y3h9776s1cx0ykqpm1rzb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9EZXNrdG9wLUN1YmUiLAogICJ1dWlkIjogImRlc2t0b3AtY3ViZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, + "46": {"version": "24", "sha256": "1aixlp25w5ch4g00c2rx6231ba6d385y3h9776s1cx0ykqpm1rzb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2NobmVlZ2FucyIsCiAgICAia29maSI6ICJzY2huZWVnYW5zIiwKICAgICJwYXlwYWwiOiAic2ltb25zY2huZWVnYW5zIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9EZXNrdG9wLUN1YmUiLAogICJ1dWlkIjogImRlc2t0b3AtY3ViZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="} }} , {"uuid": "notification-banner-reloaded@marcinjakubowski.github.com", "name": "Notification Banner Reloaded", "pname": "notification-banner-reloaded", "description": "Configure notification banner position and animation to your liking.\nVersion 9: Gnome 45 changes by mannjani@github\nVersion 10: mannjani@github added a test button inside prefs", "link": "https://extensions.gnome.org/extension/4651/notification-banner-reloaded/", "shell_version_map": { "40": {"version": "8", "sha256": "1g0aa6xclyfbcaa4rccv5cgqmc6jr41yz821wvpa2rww64djl0jb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9ub3RpZmljYXRpb24tcG9zaXRpb24tcmVsb2FkZWQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1iYW5uZXItcmVsb2FkZWRAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, @@ -4239,7 +4265,9 @@ , {"uuid": "keyboard-backlight-menu@ophir.dev", "name": "Keyboard Backlight Slider", "pname": "keyboard-backlight-slider", "description": "Allow setting the keyboard backlight brightness with a slider in the main menu", "link": "https://extensions.gnome.org/extension/4669/keyboard-backlight-slider/", "shell_version_map": { "40": {"version": "5", "sha256": "06sp86ffvplyc1k937mg5lmfggbakr7fks74b4klxxg9595lg91q", "metadata": "ewogICJ2ZXJzaW9uIjogMiwKICAibmFtZSI6ICJLZXlib2FyZCBCYWNrbGlnaHQgU2xpZGVyIiwKICAiZGVzY3JpcHRpb24iOiAiQWxsb3cgc2V0dGluZyB0aGUga2V5Ym9hcmQgYmFja2xpZ2h0IGJyaWdodG5lc3Mgd2l0aCBhIHNsaWRlciBpbiB0aGUgbWFpbiBtZW51IiwKICAidXVpZCI6ICJrZXlib2FyZC1iYWNrbGlnaHQtbWVudUBvcGhpci5kZXYiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xvdmFzb2EvZ25vbWUta2V5Ym9hcmQtYmFja2xpZ2h0LW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXQp9Cg=="}, "41": {"version": "5", "sha256": "06sp86ffvplyc1k937mg5lmfggbakr7fks74b4klxxg9595lg91q", "metadata": "ewogICJ2ZXJzaW9uIjogMiwKICAibmFtZSI6ICJLZXlib2FyZCBCYWNrbGlnaHQgU2xpZGVyIiwKICAiZGVzY3JpcHRpb24iOiAiQWxsb3cgc2V0dGluZyB0aGUga2V5Ym9hcmQgYmFja2xpZ2h0IGJyaWdodG5lc3Mgd2l0aCBhIHNsaWRlciBpbiB0aGUgbWFpbiBtZW51IiwKICAidXVpZCI6ICJrZXlib2FyZC1iYWNrbGlnaHQtbWVudUBvcGhpci5kZXYiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xvdmFzb2EvZ25vbWUta2V5Ym9hcmQtYmFja2xpZ2h0LW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXQp9Cg=="}, - "42": {"version": "5", "sha256": "06sp86ffvplyc1k937mg5lmfggbakr7fks74b4klxxg9595lg91q", "metadata": "ewogICJ2ZXJzaW9uIjogMiwKICAibmFtZSI6ICJLZXlib2FyZCBCYWNrbGlnaHQgU2xpZGVyIiwKICAiZGVzY3JpcHRpb24iOiAiQWxsb3cgc2V0dGluZyB0aGUga2V5Ym9hcmQgYmFja2xpZ2h0IGJyaWdodG5lc3Mgd2l0aCBhIHNsaWRlciBpbiB0aGUgbWFpbiBtZW51IiwKICAidXVpZCI6ICJrZXlib2FyZC1iYWNrbGlnaHQtbWVudUBvcGhpci5kZXYiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xvdmFzb2EvZ25vbWUta2V5Ym9hcmQtYmFja2xpZ2h0LW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXQp9Cg=="} + "42": {"version": "5", "sha256": "06sp86ffvplyc1k937mg5lmfggbakr7fks74b4klxxg9595lg91q", "metadata": "ewogICJ2ZXJzaW9uIjogMiwKICAibmFtZSI6ICJLZXlib2FyZCBCYWNrbGlnaHQgU2xpZGVyIiwKICAiZGVzY3JpcHRpb24iOiAiQWxsb3cgc2V0dGluZyB0aGUga2V5Ym9hcmQgYmFja2xpZ2h0IGJyaWdodG5lc3Mgd2l0aCBhIHNsaWRlciBpbiB0aGUgbWFpbiBtZW51IiwKICAidXVpZCI6ICJrZXlib2FyZC1iYWNrbGlnaHQtbWVudUBvcGhpci5kZXYiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xvdmFzb2EvZ25vbWUta2V5Ym9hcmQtYmFja2xpZ2h0LW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXQp9Cg=="}, + "45": {"version": "6", "sha256": "1aadyxd8q87yiknfvxvq83p5q7dp9dbjn051yzqgy6i05z35diym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHNldHRpbmcgdGhlIGtleWJvYXJkIGJhY2tsaWdodCBicmlnaHRuZXNzIHdpdGggYSBzbGlkZXIgaW4gdGhlIG1haW4gbWVudSIsCiAgIm5hbWUiOiAiS2V5Ym9hcmQgQmFja2xpZ2h0IFNsaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbG92YXNvYS9nbm9tZS1rZXlib2FyZC1iYWNrbGlnaHQtbWVudSIsCiAgInV1aWQiOiAia2V5Ym9hcmQtYmFja2xpZ2h0LW1lbnVAb3BoaXIuZGV2IiwKICAidmVyc2lvbiI6IDYKfQ=="}, + "46": {"version": "6", "sha256": "1aadyxd8q87yiknfvxvq83p5q7dp9dbjn051yzqgy6i05z35diym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHNldHRpbmcgdGhlIGtleWJvYXJkIGJhY2tsaWdodCBicmlnaHRuZXNzIHdpdGggYSBzbGlkZXIgaW4gdGhlIG1haW4gbWVudSIsCiAgIm5hbWUiOiAiS2V5Ym9hcmQgQmFja2xpZ2h0IFNsaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbG92YXNvYS9nbm9tZS1rZXlib2FyZC1iYWNrbGlnaHQtbWVudSIsCiAgInV1aWQiOiAia2V5Ym9hcmQtYmFja2xpZ2h0LW1lbnVAb3BoaXIuZGV2IiwKICAidmVyc2lvbiI6IDYKfQ=="} }} , {"uuid": "cloudflare-warp-gnome@harshan01", "name": "Cloudflare 1.1.1.1 WARP Switcher", "pname": "cloudflare-1111-warp-switcher", "description": "Unofficial Cloudflare 1.1.1.1 WARP Switcher extension for GNOME shell", "link": "https://extensions.gnome.org/extension/4670/cloudflare-1111-warp-switcher/", "shell_version_map": { "38": {"version": "6", "sha256": "1zq03ih8ahc5xkfcn7wdjs6dpmhswvdm55bds9wzchscs041sfrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xvdWRmbGFyZS13YXJwLXN3aXRjaGVyLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJzaGFuMDEvQ2xvdWRmbGFyZS1XQVJQLUdOT01FLVN3aXRjaGVyIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtZ25vbWVAaGFyc2hhbjAxIiwKICAidmVyc2lvbiI6IDYKfQ=="}, @@ -4405,11 +4433,13 @@ "43": {"version": "6", "sha256": "1q2s04i7wgl185xrz72jmji1327jghhzgk2zymkfbgnrpz6ln3xs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyc2hhZGdhdmFsaS9zZWFyY2hwcm92aWRlci1mb3ItYnJvd3Nlci10YWJzLmdpdC8iLAogICJ1dWlkIjogImJyb3dzZXItdGFic0Bjb20uZ2l0aHViLmhhcnNoYWRnYXZhbGkiLAogICJ2ZXJzaW9uIjogNgp9"}, "44": {"version": "6", "sha256": "1q2s04i7wgl185xrz72jmji1327jghhzgk2zymkfbgnrpz6ln3xs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyc2hhZGdhdmFsaS9zZWFyY2hwcm92aWRlci1mb3ItYnJvd3Nlci10YWJzLmdpdC8iLAogICJ1dWlkIjogImJyb3dzZXItdGFic0Bjb20uZ2l0aHViLmhhcnNoYWRnYXZhbGkiLAogICJ2ZXJzaW9uIjogNgp9"} }} -, {"uuid": "smart-auto-move@khimaros.com", "name": "Smart Auto Move", "pname": "smart-auto-move", "description": "Smart Auto Move learns the size and position of your application windows and restores them to the correct place on subsequent launches. Supports Wayland.\n\nNOTE: Optimized for use with static workspaces. For more control, can be set to default IGNORE and then selectively RESTORE only desired apps.", "link": "https://extensions.gnome.org/extension/4736/smart-auto-move/", "shell_version_map": { +, {"uuid": "smart-auto-move@khimaros.com", "name": "Smart Auto Move", "pname": "smart-auto-move", "description": "Smart Auto Move learns the position, size, and workspace of your application windows and restores them on subsequent launches. Supports Wayland.\n\nNOTE: Optimized for use with static workspaces. For more control, set the default behavior to IGNORE and then selectively RESTORE only desired apps.\n\nKNOWN ISSUES: Multi-monitor is not yet well supported. You may need to manually delete Saved Windows in preferences after adding or removing a display.", "link": "https://extensions.gnome.org/extension/4736/smart-auto-move/", "shell_version_map": { "41": {"version": "20", "sha256": "0m1kckimsqhks2lfjg5v1jjg462xjkvbhzja6x1wkd462pcbkz52", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "42": {"version": "20", "sha256": "0m1kckimsqhks2lfjg5v1jjg462xjkvbhzja6x1wkd462pcbkz52", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "43": {"version": "20", "sha256": "0m1kckimsqhks2lfjg5v1jjg462xjkvbhzja6x1wkd462pcbkz52", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, - "44": {"version": "20", "sha256": "0m1kckimsqhks2lfjg5v1jjg462xjkvbhzja6x1wkd462pcbkz52", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="} + "44": {"version": "20", "sha256": "0m1kckimsqhks2lfjg5v1jjg462xjkvbhzja6x1wkd462pcbkz52", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, + "45": {"version": "26", "sha256": "050inkl5y31xgl5lgw03yd8gi7sdcclk53g64dckrmr289zl6khp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, + "46": {"version": "26", "sha256": "050inkl5y31xgl5lgw03yd8gi7sdcclk53g64dckrmr289zl6khp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHBvc2l0aW9uLCBzaXplLCBhbmQgd29ya3NwYWNlIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBzZXQgdGhlIGRlZmF1bHQgYmVoYXZpb3IgdG8gSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuXG5cbktOT1dOIElTU1VFUzogTXVsdGktbW9uaXRvciAgaXMgbm90IHlldCB3ZWxsIHN1cHBvcnRlZC4gWW91IG1heSBuZWVkIHRvIG1hbnVhbGx5IGRlbGV0ZSBTYXZlZCBXaW5kb3dzIGluIHByZWZlcmVuY2VzIGFmdGVyIGFkZGluZyBvciByZW1vdmluZyBhIGRpc3BsYXkuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21hcnQtYXV0by1tb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="} }} , {"uuid": "hplip-menu2@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip2", "pname": "alternate-menu-for-hplip2", "description": "control your hp printers by calling the device manager hp-toolbox, also some useful links\nMotivation: the hp-systray doesn't work reliably under gnome shell\nyou need to have installed hplip in order to use this\nChoice of using a printer icon or a hp_logo.png if it's installed in the same place as mine on Ubuntu\nyou could use symbolic links to fake the path.\nThis is a replacement for the old \"Alternate Menu for Hplip\" which doesn't work under the new Gome-Shell I have cleaned it up a bit and it has a few new menu's but it is still basically the same thing.\n Added even more menus all most all system settings ones.\n\nNote: the menu will be too big if your resolution is way too low like 800x600 I have no soln for this just now.\n\nDutch language support added by Vistaus (Heimen Stoffels) https://github.com/Vistaus\n\nyou'll need to restart gnome-shell after upgrades so either reboot,\nlog out and back in again, or if your using X11 then alt+F2 then run r", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": { "40": {"version": "11", "sha256": "19h44pn5afqc89vn5xjrhmd375651zhf2w78cs8fgazp7pc0hsr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, @@ -4417,7 +4447,8 @@ "42": {"version": "11", "sha256": "19h44pn5afqc89vn5xjrhmd375651zhf2w78cs8fgazp7pc0hsr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "11", "sha256": "19h44pn5afqc89vn5xjrhmd375651zhf2w78cs8fgazp7pc0hsr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "44": {"version": "11", "sha256": "19h44pn5afqc89vn5xjrhmd375651zhf2w78cs8fgazp7pc0hsr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, - "45": {"version": "21", "sha256": "12vjvacakn7dal2mai9cjws35bh0dzdwjqyxjkgmqdlchbydizdp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJocGxpcC1tZW51MiIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDIxCn0="} + "45": {"version": "22", "sha256": "1smy8rmi6vxwgkdk3h9mffx9lkv2v5yn8hgn66wlm989bndyvxrw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJocGxpcC1tZW51MiIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3JpenpseXNtaXQvaHBsaXAtbWVudTItZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInV1aWQiOiAiaHBsaXAtbWVudTJAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiAyMgp9"}, + "46": {"version": "22", "sha256": "1smy8rmi6vxwgkdk3h9mffx9lkv2v5yn8hgn66wlm989bndyvxrw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWRpdHMiOiAiKEMpIEZyYW5jaXMgR3JpenpseSBTbWl0XG5cbkR1dGNoIHRyYW5zbGF0aW9uIFZpc3RhdXMgKEhlaW1lbiBTdG9mZmVscykgaHR0cHM6Ly9naXRodWIuY29tL1Zpc3RhdXNcblxuTGljZW5jZSBHUEwgdjIrXG5cbiIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cblxuRHV0Y2ggbGFuZ3VhZ2Ugc3VwcG9ydCBhZGRlZCBieSBWaXN0YXVzIChIZWltZW4gU3RvZmZlbHMpIGh0dHBzOi8vZ2l0aHViLmNvbS9WaXN0YXVzXG5cbnlvdSdsbCBuZWVkIHRvIHJlc3RhcnQgZ25vbWUtc2hlbGwgYWZ0ZXIgdXBncmFkZXMgc28gZWl0aGVyIHJlYm9vdCxcbmxvZyBvdXQgYW5kIGJhY2sgaW4gYWdhaW4sIG9yIGlmIHlvdXIgdXNpbmcgWDExIHRoZW4gYWx0K0YyIHRoZW4gcnVuIHIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJocGxpcC1tZW51MiIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3JpenpseXNtaXQvaHBsaXAtbWVudTItZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInV1aWQiOiAiaHBsaXAtbWVudTJAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiAyMgp9"} }} , {"uuid": "dash-from-panel@fthx", "name": "Dash from Panel", "pname": "dash-from-panel", "description": "NOT MAINTAINED ANYMORE\n\nTop dock for GNOME 40+. Hover top panel and GNOME Shell dash appears without overview.\n\n Scroll on dock or panel changes workspace. Preferences UI.\n\n Does use native GNOME Shell Dash. Very light extension.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4741/dash-from-panel/", "shell_version_map": { "40": {"version": "3", "sha256": "18ikbd1hxlc6rd28dnif2x74g3q9gdkgxc6jpag6qh7c51qd5klz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuVG9wIGRvY2sgZm9yIEdOT01FIDQwKy4gSG92ZXIgdG9wIHBhbmVsIGFuZCBHTk9NRSBTaGVsbCBkYXNoIGFwcGVhcnMgd2l0aG91dCBvdmVydmlldy5cblxuIFNjcm9sbCBvbiBkb2NrIG9yIHBhbmVsIGNoYW5nZXMgd29ya3NwYWNlLiBQcmVmZXJlbmNlcyBVSS5cblxuIERvZXMgdXNlIG5hdGl2ZSBHTk9NRSBTaGVsbCBEYXNoLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi5cblxuIFBsZWFzZSByZXBvcnQgYnVncyB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRhc2ggZnJvbSBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZGFzaC1mcm9tLXBhbmVsIiwKICAidXVpZCI6ICJkYXNoLWZyb20tcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiAzCn0="}, @@ -4563,7 +4594,7 @@ "43": {"version": "7", "sha256": "1waws1iwsk0li6x3c9l9w80kijsmfynrlp506hmq8zqqqxrh5npy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogNwp9"}, "44": {"version": "7", "sha256": "1waws1iwsk0li6x3c9l9w80kijsmfynrlp506hmq8zqqqxrh5npy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogNwp9"}, "45": {"version": "11", "sha256": "1r65y95rvp4a7hmbc88ggx3bhb2zlbb6mllqsq2lqb7zi6z6mm7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxpY2UgTWlraGF5bGVua286IGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC8tL21lcmdlX3JlcXVlc3RzLzEzMjgiLAogICJuYW1lIjogIlBhbmVsIGNvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFuZWwtY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, - "46": {"version": "10", "sha256": "1cvx9g1z54d6n70v98f3icdvk64xdj38vilprinysq8s7rfzn2if", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxpY2UgTWlraGF5bGVua286IGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC8tL21lcmdlX3JlcXVlc3RzLzEzMjgiLAogICJuYW1lIjogIlBhbmVsIGNvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFuZWwtY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L3BhbmVsLWNvcm5lcnMiLAogICJ1dWlkIjogInBhbmVsLWNvcm5lcnNAYXVuZXR4IiwKICAidmVyc2lvbiI6IDEwCn0="} + "46": {"version": "12", "sha256": "00756r347ihmwrnlm12ycscsz96dh5acgfli7iw479zg5s9m2knp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxpY2UgTWlraGF5bGVua286IGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC8tL21lcmdlX3JlcXVlc3RzLzEzMjgiLAogICJuYW1lIjogIlBhbmVsIGNvcm5lcnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFuZWwtY29ybmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMTIKfQ=="} }} , {"uuid": "WhatWatch@Zappo-II.github.io", "name": "What Watch", "pname": "what-watch", "description": "Shows a customizeable analog desktop clock.\nPlease visit the GitHub repository for documentation and to report any issues.", "link": "https://extensions.gnome.org/extension/4806/what-watch/", "shell_version_map": { "38": {"version": "7", "sha256": "0k5i38dp5lgmvhpi73d6ahndz31hm9alixbr3jz1sd1j0xh95mcm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWmFwcG8tSUkvV2hhdFdhdGNoIiwKICAidXVpZCI6ICJXaGF0V2F0Y2hAWmFwcG8tSUkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, @@ -4912,7 +4943,8 @@ "42": {"version": "11", "sha256": "0bid6qwwxfw862sb4qw027017c9ya3p26cg10kjx7p3dwc54ccwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTG9yZW56b01vcmVsbGkvR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJ1dWlkIjogIkdQVV9wcm9maWxlX3NlbGVjdG9yQGxvcmVuem85OTA0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "43": {"version": "14", "sha256": "1kj6wypjfa5clclvwnz4jym02sygknxbspmv8lv0piys1gw6n7h2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "44": {"version": "16", "sha256": "0i5y87ry7vkabd6r6036sd0kbl91j55ns9pkgbhkzf4nwa8z79h9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, - "45": {"version": "18", "sha256": "12360938qrpvdcjwymj1y1f14ynpmvpgbwlwidmagywcpdyyywsh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSB0byBtYWtlIHRoaXMgZXh0ZW5zaW9uIHdvcmsuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvciIsCiAgIm5hbWUiOiAiR1BVIHByb2ZpbGUgc2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTG9yZW56b01vcmVsbGkvR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJ1dWlkIjogIkdQVV9wcm9maWxlX3NlbGVjdG9yQGxvcmVuem85OTA0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"} + "45": {"version": "19", "sha256": "0047wrc00bk83p2yib4pbgmr6szghjmyhlqsc2gdf60la12mg81k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSB0byBtYWtlIHRoaXMgZXh0ZW5zaW9uIHdvcmsuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvciIsCiAgIm5hbWUiOiAiR1BVIHByb2ZpbGUgc2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, + "46": {"version": "19", "sha256": "0047wrc00bk83p2yib4pbgmr6szghjmyhlqsc2gdf60la12mg81k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIHRvIGluc3RhbGwgZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSB0byBtYWtlIHRoaXMgZXh0ZW5zaW9uIHdvcmsuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvciIsCiAgIm5hbWUiOiAiR1BVIHByb2ZpbGUgc2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuR1BVX3Byb2ZpbGVfc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="} }} , {"uuid": "username-to-activities@deserts", "name": "Replace Activities text with username", "pname": "replce-activities-text-with-username", "description": "Replace Activities text with username.\nThis is a fork of Replace Activities Text by pratap@fastmail.fm", "link": "https://extensions.gnome.org/extension/5010/replce-activities-text-with-username/", "shell_version_map": { "38": {"version": "5", "sha256": "1by99cvd9jsrm7bzq0906n4pd0sd6hl5bg9ym17xdwb9nvl4aa0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZXNlcnRzdHN1bmcvdXNlcm5hbWUtdG8tYWN0aXZpdGllcyIsCiAgInV1aWQiOiAidXNlcm5hbWUtdG8tYWN0aXZpdGllc0BkZXNlcnRzIiwKICAidmVyc2lvbiI6IDUKfQ=="}, @@ -5062,8 +5094,8 @@ "42": {"version": "14", "sha256": "1yqp2hhmcymzjyq3shwh1cld423iah9s8s3caqmjrln7vjh4syrw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVWJheUdEL3JlYm9vdHRvdWVmaSIsCiAgInV1aWQiOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "43": {"version": "14", "sha256": "1yqp2hhmcymzjyq3shwh1cld423iah9s8s3caqmjrln7vjh4syrw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVWJheUdEL3JlYm9vdHRvdWVmaSIsCiAgInV1aWQiOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "44": {"version": "14", "sha256": "1yqp2hhmcymzjyq3shwh1cld423iah9s8s3caqmjrln7vjh4syrw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVWJheUdEL3JlYm9vdHRvdWVmaSIsCiAgInV1aWQiOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, - "45": {"version": "20", "sha256": "0rxxhqqnwnbnrvivv2ink3vm2f8c9139mbjpn7gn0rmvqaggyi0m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJsaWNlbnNlIjogIkdQTHYzIiwKICAibmFtZSI6ICJSZWJvb3RUb1VFRkkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ViYXlHRC9yZWJvb3R0b3VlZmkiLAogICJ1dWlkIjogInJlYm9vdHRvdWVmaUB1YmF5Z2QuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, - "46": {"version": "20", "sha256": "0rxxhqqnwnbnrvivv2ink3vm2f8c9139mbjpn7gn0rmvqaggyi0m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJsaWNlbnNlIjogIkdQTHYzIiwKICAibmFtZSI6ICJSZWJvb3RUb1VFRkkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ViYXlHRC9yZWJvb3R0b3VlZmkiLAogICJ1dWlkIjogInJlYm9vdHRvdWVmaUB1YmF5Z2QuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="} + "45": {"version": "21", "sha256": "18c7ib0cmpf1ac3x1b3p91ydf4c3f08vp3zzivmx1qgj2b4595a1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJsaWNlbnNlIjogIkdQTHYzIiwKICAibmFtZSI6ICJSZWJvb3RUb1VFRkkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ViYXlHRC9yZWJvb3R0b3VlZmkiLAogICJ1dWlkIjogInJlYm9vdHRvdWVmaUB1YmF5Z2QuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}, + "46": {"version": "21", "sha256": "18c7ib0cmpf1ac3x1b3p91ydf4c3f08vp3zzivmx1qgj2b4595a1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJsaWNlbnNlIjogIkdQTHYzIiwKICAibmFtZSI6ICJSZWJvb3RUb1VFRkkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ViYXlHRC9yZWJvb3R0b3VlZmkiLAogICJ1dWlkIjogInJlYm9vdHRvdWVmaUB1YmF5Z2QuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="} }} , {"uuid": "touch-ux@dblandford.com", "name": "Touch-UX", "pname": "touch-ux", "description": "Provides a swipe up gesture bar and a status bar shortcut to force the on screen keyboard to show in scenarios that it does not automatically show when expected.", "link": "https://extensions.gnome.org/extension/5108/touch-ux/", "shell_version_map": { "42": {"version": "3", "sha256": "1vjchsz0jml0qaj2mz0khsagacxz1m60ypcjnymh3swrx9lj765m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgc3dpcGUgdXAgZ2VzdHVyZSBiYXIgYW5kIGEgc3RhdHVzIGJhciBzaG9ydGN1dCB0byBmb3JjZSB0aGUgb24gc2NyZWVuIGtleWJvYXJkIHRvIHNob3cgaW4gc2NlbmFyaW9zIHRoYXQgaXQgZG9lcyBub3QgYXV0b21hdGljYWxseSBzaG93IHdoZW4gZXhwZWN0ZWQuIiwKICAibmFtZSI6ICJUb3VjaC1VWCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EYW5pZWwtQmxhbmRmb3JkL1RvdWNoLVVYIiwKICAidXVpZCI6ICJ0b3VjaC11eEBkYmxhbmRmb3JkLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="} @@ -5156,20 +5188,21 @@ "44": {"version": "10", "sha256": "0ca4nlss4j5rmq8xaqvjxxacdhb1vlmydqp4cal77mgzk79q63nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29kaWxpYS91cG93ZXItYmF0dGVyeSIsCiAgInV1aWQiOiAidXBvd2VyLWJhdHRlcnlAY29kaWxpYS5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "45": {"version": "16", "sha256": "09hxl6scc3jslfjxl4dsy76fkj8sjb0rhbs4y3d9id6n3gszgqny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvZGlsaWEvdXBvd2VyLWJhdHRlcnkiLAogICJ1dWlkIjogInVwb3dlci1iYXR0ZXJ5QGNvZGlsaWEuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="} }} -, {"uuid": "vertical-workspaces@G-dH.github.com", "name": "V-Shell (Vertical Workspaces)", "pname": "vertical-workspaces", "description": "Customize your GNOME Shell UX to fit your workflow, whether you like horizontally or vertically stacked workspaces. Originally Vertical Workspaces.\n\nDear users, the reliability and stability of this extension is my priority, but V-Shell is an extension to default GNOME Shell and cannot be compatible with all available extensions. If you encounter any problem, first check for conflicts with other extensions and then open an issue on the Github page linked below.\n\nV-Shell includes many workarounds to survive conflicts and work with Dash to Dock / Ubuntu Dock extensions and other popular extensions, but issues may occur. The patched Dash to Dock for V-Shell is already available in my GitHub repository.\n\nAny feedback is greatly appreciated!\n\nV-Shell features:\n- vertical or horizontal orientation of workspaces\n- customize the overview layout, dimensions and contents\n- alternative overview modes with static workspace preview that reduces unnecessary movement on the screen\n- 4 predefined profiles with different layout and behavior that can be overwritten by your settings\n- wallpaper background with adjustable blur effect in the overview\n- dash icon size, content, icon click and scroll behavior\n- app grid dimensions, icon size, contents and behavior\n- active icons in the folder preview\n- close workspace button on workspace thumbnail\n- main panel position and visibility\n- hot corner/edge position and behavior\n- notifications, OSD and workspace switcher popup position\n- custom window attention handler behavior\n- improved app search provider with custom icon size\n- recent files search provider\n- static background in the workspace switcher animation outside of the overview\n- independent workspace switching for each monitor (workaround)\n- workspace switcher popup appears even when switching workspace with a gesture\n- workspace isolated Dash\n- fixes (works around) several upstream bugs (known and reported)\n- modular structure of the V-Shell allows you to disable modules that you don't need or conflict with other extension that you like better for the task", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": { +, {"uuid": "vertical-workspaces@G-dH.github.com", "name": "V-Shell (Vertical Workspaces)", "pname": "vertical-workspaces", "description": "Customize your GNOME Shell UX to fit your workflow, whether you like horizontally or vertically stacked workspaces. Originally Vertical Workspaces.\n\nDear users, the reliability and stability of this extension is my priority, but V-Shell is an extension to default GNOME Shell and cannot be compatible with all available extensions. If you encounter any problem, first check for conflicts with other extensions and then open an issue on the Github page linked below.\n\nV-Shell includes many workarounds to survive conflicts and work with Dash to Dock / Ubuntu Dock extensions and other popular extensions, but issues may occur. The patched Dash to Dock for V-Shell is already available in my GitHub repository.\n\nAny feedback is greatly appreciated!\n\nV-Shell features:\n- vertical or horizontal orientation of workspaces\n- customize the overview layout, dimensions and contents\n- alternative overview modes with static workspace preview that reduces unnecessary movement on the screen\n- 4 predefined profiles with different layout and behavior that can be overwritten by your settings\n- wallpaper background with adjustable blur effect in the overview\n- dash icon size, content, icon click and scroll behavior\n- app grid dimensions, icon size, contents and behavior\n- active icons in the folder preview\n- close workspace button on workspace thumbnail\n- main panel position and visibility\n- hot corner/edge position and behavior\n- notifications, OSD and workspace switcher popup position\n- custom window attention handler behavior\n- improved app search provider with custom icon size\n- static background in the workspace switcher animation outside of the overview\n- independent workspace switching for each monitor (workaround)\n- workspace switcher popup appears even when switching workspace with a gesture\n- workspace isolated Dash\n- fixes (works around) several upstream bugs (known and reported)\n- modular structure of the V-Shell allows you to disable modules that you don't need or conflict with other extension that you like better for the task", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": { "40": {"version": "23", "sha256": "0dp7qbbcs46w1lc2v46cvhfx7r8h1jrp95mhd8wip8c7npmnr66q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuXG5cbkRlYXIgdXNlcnMsIHRoZSByZWxpYWJpbGl0eSBhbmQgc3RhYmlsaXR5IG9mIHRoaXMgZXh0ZW5zaW9uIGlzIG15IHByaW9yaXR5LCBpZiB5b3UgZW5jb3VudGVyIGFueSBwcm9ibGVtLCBmaXJzdCBjaGVjayBmb3IgY29uZmxpY3RzIHdpdGggb3RoZXIgZXh0ZW5zaW9ucyBhbmQgdGhlbiBvcGVuIGFuIGlzc3VlIG9uIHRoZSBHaXRodWIgcGFnZSBsaW5rZWQgYmVsb3cuXG5cblYtU2hlbGwgaW5jbHVkZXMgbWFueSB3b3JrYXJvdW5kcyB0byBzdXJ2aXZlIGNvbmZsaWN0cyBhbmQgd29yayB3aXRoIERhc2ggdG8gRG9jayAvIFVidW50dSBEb2NrIGV4dGVuc2lvbnMsIGJ1dCBpc3N1ZXMgbWF5IG9jY3VyLiBJbiBhbnkgY2FzZSwgVi1TaGVsbCB3b3JrcyBiZXR0ZXIgd2l0aG91dCBEYXNoIHRvIERvY2suXG5cbkFueSBmZWVkYmFjayBpcyBncmVhdGx5IGFwcHJlY2lhdGVkLCBidXQgZG9uJ3QgZm9yZ2V0IC0gaWYgeW91IHdhbnQgbWUgdG8gd29yayBmb3IgeW91LCBiZSBuaWNlIDspXG5cblYtU2hlbGwgZmVhdHVyZXM6XG4tIHZlcnRpY2FsIG9yIGhvcml6b250YWwgb3JpZW50YXRpb24gb2Ygd29ya3NwYWNlc1xuLSBjdXN0b21pemUgdGhlIG92ZXJ2aWV3IGxheW91dCwgZGltZW5zaW9ucyBhbmQgY29udGVudHNcbi0gYWx0ZXJuYXRpdmUgb3ZlcnZpZXcgbW9kZXMgd2l0aCBzdGF0aWMgd29ya3NwYWNlIHByZXZpZXcgdGhhdCByZWR1Y2VzIHVubmVjZXNzYXJ5IG1vdmVtZW50IG9uIHRoZSBzY3JlZW5cbi0gd2FsbHBhcGVyIGJhY2tncm91bmQgd2l0aCBhZGp1c3RhYmxlIGJsdXIgZWZmZWN0IGluIHRoZSBvdmVydmlld1xuLSBkYXNoIGljb24gc2l6ZSwgY29udGVudCwgaWNvbiBjbGljayBhbmQgc2Nyb2xsIGJlaGF2aW9yXG4tIGFwcCBncmlkIGRpbWVuc2lvbnMsIGljb25zIHNpemUsIGNvbnRlbnRzIGFuZCBiZWhhdmlvclxuLSBhY3RpdmUgaWNvbnMgaW4gdGhlIGZvbGRlciBwcmV2aWV3XG4tIGNsb3NlIHdvcmtzcGFjZSBidXR0b24gb24gd29ya3NwYWNlIHRodW1ibmFpbFxuLSBtYWluIHBhbmVsIHBvc2l0aW9uIGFuZCB2aXNpYmlsaXR5XG4tIGhvdCBjb3JuZXIvZWRnZSBwb3NpdGlvbiBhbmQgYmVoYXZpb3Jcbi0gbm90aWZpY2F0aW9ucywgT1NEIGFuZCB3b3Jrc3BhY2Ugc3dpdGNoZXIgcG9wdXAgcG9zaXRpb25cbi0gY3VzdG9tIHdpbmRvdyBhdHRlbnRpb24gaGFuZGxlciBiZWhhdmlvclxuLSBpbXByb3ZlZCBhcHAgc2VhcmNoIHByb3ZpZGVyIHdpdGggY3VzdG9tIGljb24gc2l6ZVxuLSB3aW5kb3cgc2VhcmNoIHByb3ZpZGVyIGZvciBxdWljayBuYXZpZ2F0aW9uIGJldHdlZW4gd2luZG93c1xuLSByZWNlbnQgZmlsZXMgc2VhcmNoIHByb3ZpZGVyXG4tIHN0YXRpYyBiYWNrZ3JvdW5kIGluIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoZXIgYW5pbWF0aW9uIG91dHNpZGUgb2YgdGhlIG92ZXJ2aWV3XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJzIGV2ZW4gd2hlbiBzd2l0Y2hpbmcgd29ya3NwYWNlIHdpdGggYSBnZXN0dXJlXG4tIDQgcHJlZGVmaW5lZCBwcm9maWxlcyB3aXRoIGRpZmZlcmVudCBsYXlvdXQgYW5kIGJlaGF2aW9yIHRoYXQgY2FuIGJlIG92ZXJ3cml0dGVuIGJ5IHlvdXIgc2V0dGluZ3Ncbi0gZml4ZXMgKHdvcmtzIGFyb3VuZCkgc2V2ZXJhbCB1cHN0cmVhbSBidWdzIChrbm93biBhbmQgcmVwb3J0ZWQpXG4tIG1vZHVsYXIgc3RydWN0dXJlIG9mIHRoZSBWLVNoZWxsIGFsbG93cyB5b3UgdG8gZGlzYWJsZSBtb2R1bGVzIHRoYXQgeW91IGRvbid0IG5lZWQgb3IgY29uZmxpY3RzIHdpdGggb3RoZXIgZXh0ZW5zaW9uIHRoYXQgeW91IGxpa2UgYmV0dGVyIGZvciB0aGUgdGFzayIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "0dp7qbbcs46w1lc2v46cvhfx7r8h1jrp95mhd8wip8c7npmnr66q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuXG5cbkRlYXIgdXNlcnMsIHRoZSByZWxpYWJpbGl0eSBhbmQgc3RhYmlsaXR5IG9mIHRoaXMgZXh0ZW5zaW9uIGlzIG15IHByaW9yaXR5LCBpZiB5b3UgZW5jb3VudGVyIGFueSBwcm9ibGVtLCBmaXJzdCBjaGVjayBmb3IgY29uZmxpY3RzIHdpdGggb3RoZXIgZXh0ZW5zaW9ucyBhbmQgdGhlbiBvcGVuIGFuIGlzc3VlIG9uIHRoZSBHaXRodWIgcGFnZSBsaW5rZWQgYmVsb3cuXG5cblYtU2hlbGwgaW5jbHVkZXMgbWFueSB3b3JrYXJvdW5kcyB0byBzdXJ2aXZlIGNvbmZsaWN0cyBhbmQgd29yayB3aXRoIERhc2ggdG8gRG9jayAvIFVidW50dSBEb2NrIGV4dGVuc2lvbnMsIGJ1dCBpc3N1ZXMgbWF5IG9jY3VyLiBJbiBhbnkgY2FzZSwgVi1TaGVsbCB3b3JrcyBiZXR0ZXIgd2l0aG91dCBEYXNoIHRvIERvY2suXG5cbkFueSBmZWVkYmFjayBpcyBncmVhdGx5IGFwcHJlY2lhdGVkLCBidXQgZG9uJ3QgZm9yZ2V0IC0gaWYgeW91IHdhbnQgbWUgdG8gd29yayBmb3IgeW91LCBiZSBuaWNlIDspXG5cblYtU2hlbGwgZmVhdHVyZXM6XG4tIHZlcnRpY2FsIG9yIGhvcml6b250YWwgb3JpZW50YXRpb24gb2Ygd29ya3NwYWNlc1xuLSBjdXN0b21pemUgdGhlIG92ZXJ2aWV3IGxheW91dCwgZGltZW5zaW9ucyBhbmQgY29udGVudHNcbi0gYWx0ZXJuYXRpdmUgb3ZlcnZpZXcgbW9kZXMgd2l0aCBzdGF0aWMgd29ya3NwYWNlIHByZXZpZXcgdGhhdCByZWR1Y2VzIHVubmVjZXNzYXJ5IG1vdmVtZW50IG9uIHRoZSBzY3JlZW5cbi0gd2FsbHBhcGVyIGJhY2tncm91bmQgd2l0aCBhZGp1c3RhYmxlIGJsdXIgZWZmZWN0IGluIHRoZSBvdmVydmlld1xuLSBkYXNoIGljb24gc2l6ZSwgY29udGVudCwgaWNvbiBjbGljayBhbmQgc2Nyb2xsIGJlaGF2aW9yXG4tIGFwcCBncmlkIGRpbWVuc2lvbnMsIGljb25zIHNpemUsIGNvbnRlbnRzIGFuZCBiZWhhdmlvclxuLSBhY3RpdmUgaWNvbnMgaW4gdGhlIGZvbGRlciBwcmV2aWV3XG4tIGNsb3NlIHdvcmtzcGFjZSBidXR0b24gb24gd29ya3NwYWNlIHRodW1ibmFpbFxuLSBtYWluIHBhbmVsIHBvc2l0aW9uIGFuZCB2aXNpYmlsaXR5XG4tIGhvdCBjb3JuZXIvZWRnZSBwb3NpdGlvbiBhbmQgYmVoYXZpb3Jcbi0gbm90aWZpY2F0aW9ucywgT1NEIGFuZCB3b3Jrc3BhY2Ugc3dpdGNoZXIgcG9wdXAgcG9zaXRpb25cbi0gY3VzdG9tIHdpbmRvdyBhdHRlbnRpb24gaGFuZGxlciBiZWhhdmlvclxuLSBpbXByb3ZlZCBhcHAgc2VhcmNoIHByb3ZpZGVyIHdpdGggY3VzdG9tIGljb24gc2l6ZVxuLSB3aW5kb3cgc2VhcmNoIHByb3ZpZGVyIGZvciBxdWljayBuYXZpZ2F0aW9uIGJldHdlZW4gd2luZG93c1xuLSByZWNlbnQgZmlsZXMgc2VhcmNoIHByb3ZpZGVyXG4tIHN0YXRpYyBiYWNrZ3JvdW5kIGluIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoZXIgYW5pbWF0aW9uIG91dHNpZGUgb2YgdGhlIG92ZXJ2aWV3XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJzIGV2ZW4gd2hlbiBzd2l0Y2hpbmcgd29ya3NwYWNlIHdpdGggYSBnZXN0dXJlXG4tIDQgcHJlZGVmaW5lZCBwcm9maWxlcyB3aXRoIGRpZmZlcmVudCBsYXlvdXQgYW5kIGJlaGF2aW9yIHRoYXQgY2FuIGJlIG92ZXJ3cml0dGVuIGJ5IHlvdXIgc2V0dGluZ3Ncbi0gZml4ZXMgKHdvcmtzIGFyb3VuZCkgc2V2ZXJhbCB1cHN0cmVhbSBidWdzIChrbm93biBhbmQgcmVwb3J0ZWQpXG4tIG1vZHVsYXIgc3RydWN0dXJlIG9mIHRoZSBWLVNoZWxsIGFsbG93cyB5b3UgdG8gZGlzYWJsZSBtb2R1bGVzIHRoYXQgeW91IGRvbid0IG5lZWQgb3IgY29uZmxpY3RzIHdpdGggb3RoZXIgZXh0ZW5zaW9uIHRoYXQgeW91IGxpa2UgYmV0dGVyIGZvciB0aGUgdGFzayIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "42": {"version": "53", "sha256": "14jva97bd3shc3skz348pw41h9slxrkz6zd7s3x9snf4rv5xj59r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MywKICAidmVyc2lvbi1uYW1lIjogIjQ0LjExIgp9"}, "43": {"version": "53", "sha256": "14jva97bd3shc3skz348pw41h9slxrkz6zd7s3x9snf4rv5xj59r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MywKICAidmVyc2lvbi1uYW1lIjogIjQ0LjExIgp9"}, "44": {"version": "53", "sha256": "14jva97bd3shc3skz348pw41h9slxrkz6zd7s3x9snf4rv5xj59r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MywKICAidmVyc2lvbi1uYW1lIjogIjQ0LjExIgp9"}, "45": {"version": "52", "sha256": "172b9qzq2a6gp0qi1fv3nvnv4i3cvfwbklaa5z7n6gkx71nib400", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvdmVydGljYWwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAidmVydGljYWwtd29ya3NwYWNlc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTIsCiAgInZlcnNpb24tbmFtZSI6ICI0NS4zIgp9"}, - "46": {"version": "56", "sha256": "06lyz527877ax08hbsr1f57vyfmcxcqgbwcs12bcmzypv1kww43f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvdmVydGljYWwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAidmVydGljYWwtd29ya3NwYWNlc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTYsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4wIgp9"} + "46": {"version": "57", "sha256": "04vrcx2bg68cnpv93k8f3k5fp4lrm53p362jjppa2gg9hjgkjys5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIEdOT01FIFNoZWxsIFVYIHRvIHN1aXQgeW91ciB3b3JrZmxvdywgd2hldGhlciB5b3UgbGlrZSBob3Jpem9udGFsbHkgb3IgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJnZW9yZ2RoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlYtU2hlbGwgKFZlcnRpY2FsIFdvcmtzcGFjZXMpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvdmVydGljYWwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAidmVydGljYWwtd29ya3NwYWNlc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTcsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4wLjEiCn0="} }} , {"uuid": "rocketbar@chepkun.github.com", "name": "Rocketbar", "pname": "rocketbar", "description": "Taskbar and misc additions for the GNOME Shell.", "link": "https://extensions.gnome.org/extension/5180/rocketbar/", "shell_version_map": { "42": {"version": "8", "sha256": "0p8msiyqpic8d0cv65j97gqp03vgi935rqgs2gjrffq3cg7wy2iq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuXG5cbkEgbmV3IG1ham9yIHJlbGVhc2Ugd2lsbCBiZSBvdXQgbGF0ZXIgdGhpcyB5ZWFyLi4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtaXMtYXdlc29tZS9nbm9tZV9leHRlbnNpb25fcm9ja2V0YmFyIiwKICAidXVpZCI6ICJyb2NrZXRiYXJAY2hlcGt1bi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "43": {"version": "8", "sha256": "0p8msiyqpic8d0cv65j97gqp03vgi935rqgs2gjrffq3cg7wy2iq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuXG5cbkEgbmV3IG1ham9yIHJlbGVhc2Ugd2lsbCBiZSBvdXQgbGF0ZXIgdGhpcyB5ZWFyLi4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtaXMtYXdlc29tZS9nbm9tZV9leHRlbnNpb25fcm9ja2V0YmFyIiwKICAidXVpZCI6ICJyb2NrZXRiYXJAY2hlcGt1bi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "44": {"version": "8", "sha256": "0p8msiyqpic8d0cv65j97gqp03vgi935rqgs2gjrffq3cg7wy2iq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuXG5cbkEgbmV3IG1ham9yIHJlbGVhc2Ugd2lsbCBiZSBvdXQgbGF0ZXIgdGhpcyB5ZWFyLi4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtaXMtYXdlc29tZS9nbm9tZV9leHRlbnNpb25fcm9ja2V0YmFyIiwKICAidXVpZCI6ICJyb2NrZXRiYXJAY2hlcGt1bi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, - "45": {"version": "10", "sha256": "0xk47cqjpm7fjcywf96jqal2n883zw104zbdca1vyyjmvp5m6q9r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LWlzLWF3ZXNvbWUvZ25vbWVfZXh0ZW5zaW9uX3JvY2tldGJhciIsCiAgInV1aWQiOiAicm9ja2V0YmFyQGNoZXBrdW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"} + "45": {"version": "10", "sha256": "0xk47cqjpm7fjcywf96jqal2n883zw104zbdca1vyyjmvp5m6q9r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LWlzLWF3ZXNvbWUvZ25vbWVfZXh0ZW5zaW9uX3JvY2tldGJhciIsCiAgInV1aWQiOiAicm9ja2V0YmFyQGNoZXBrdW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, + "46": {"version": "11", "sha256": "1cmmllyqlr37dy0y5zwccbd7bwml1x7irbhsfq74mp0ggci1xffy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LWlzLWF3ZXNvbWUvZ25vbWVfZXh0ZW5zaW9uX3JvY2tldGJhciIsCiAgInV1aWQiOiAicm9ja2V0YmFyQGNoZXBrdW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"} }} , {"uuid": "contestcountdown@raghav", "name": "Contest Countdown", "pname": "contest-countdown", "description": "Countdown to next coding contests. This extension uses the API of kontests.net to get the list of all upcoming contests. A countdown to the closest upcoming contest (that you are participating in) is shown in the panel, which can be clicked on to view the list of all upcoming contests.", "link": "https://extensions.gnome.org/extension/5183/contest-countdown/", "shell_version_map": { "40": {"version": "6", "sha256": "0cd80apqlxznrq2p0mdkrd4njns6w6sl44z4b1nvshm456nw5mbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biB0byBuZXh0IGNvZGluZyBjb250ZXN0cy4gVGhpcyBleHRlbnNpb24gdXNlcyB0aGUgQVBJIG9mIGtvbnRlc3RzLm5ldCB0byBnZXQgdGhlIGxpc3Qgb2YgYWxsIHVwY29taW5nIGNvbnRlc3RzLiBBIGNvdW50ZG93biB0byB0aGUgY2xvc2VzdCB1cGNvbWluZyBjb250ZXN0ICh0aGF0IHlvdSBhcmUgcGFydGljaXBhdGluZyBpbikgaXMgc2hvd24gaW4gdGhlIHBhbmVsLCB3aGljaCBjYW4gYmUgY2xpY2tlZCBvbiB0byB2aWV3IHRoZSBsaXN0IG9mIGFsbCB1cGNvbWluZyBjb250ZXN0cy4iLAogICJuYW1lIjogIkNvbnRlc3QgQ291bnRkb3duIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbnRlc3QtY291bnRkb3duIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFnLWhhdi9jb250ZXN0Y291bnRkb3duIiwKICAidXVpZCI6ICJjb250ZXN0Y291bnRkb3duQHJhZ2hhdiIsCiAgInZlcnNpb24iOiA2Cn0="}, @@ -5256,14 +5289,14 @@ "43": {"version": "14", "sha256": "0s73v3m8xb641hha7rbs4dfy944zmddi428hvaf6li6fjq81z6wf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgTGVub3ZvIElkZWFQYWQgbGFwdG9wcyBvcHRpb25zOiBDb25zZXJ2YXRpb24gTW9kZSwgQ2FtZXJhIExvY2ssIEZuIExvY2ssIFRvdWNocGFkIExvY2ssIFVTQiBjaGFyZ2luZyIsCiAgIm5hbWUiOiAiSWRlYVBhZCBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pZGVhcGFkLWNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXp6YW1BbHNoYXJhZmkvaWRlYXBhZC1jb250cm9scy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImlkZWFwYWQtY29udHJvbHNAYXp6YW1hbHNoYXJhZmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "44": {"version": "14", "sha256": "0s73v3m8xb641hha7rbs4dfy944zmddi428hvaf6li6fjq81z6wf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgTGVub3ZvIElkZWFQYWQgbGFwdG9wcyBvcHRpb25zOiBDb25zZXJ2YXRpb24gTW9kZSwgQ2FtZXJhIExvY2ssIEZuIExvY2ssIFRvdWNocGFkIExvY2ssIFVTQiBjaGFyZ2luZyIsCiAgIm5hbWUiOiAiSWRlYVBhZCBDb250cm9scyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pZGVhcGFkLWNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXp6YW1BbHNoYXJhZmkvaWRlYXBhZC1jb250cm9scy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImlkZWFwYWQtY29udHJvbHNAYXp6YW1hbHNoYXJhZmkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="} }} -, {"uuid": "gtk4-ding@smedius.gitlab.com", "name": "Gtk4 Desktop Icons NG (DING)", "pname": "gtk4-desktop-icons-ng-ding", "description": "Libadwaita/Gtk4 port of Desktop Icons NG with multiple fixes and new features.\n\nIcons can be positioned anywhere on desktop or are snapped to a grid. Can make links on the Desktop. GSconnect Integration, can send files to connected devices. Drag and Drop support on to Dock, Dash, or from Dock, Dash to the Desktop.\n\nUpdated and modified code base, uses Gio menus, all translations on Weblate. All functions are asynchronous where possible. It is ported to ESM modules, supports Gnome 45 and higher.\n\nMultiple fixes and new features-\n\n* New - Icons can be placed on any arbitrary position. Make a mess! - icons can overlap each other etc. Neat people can keep the default behavior and have the icons always snapped to a grid. Controlled in preferences, tweaks, 'Snap to grid'. Affects the shape of icons and drag and drop behavior as well. Free positioning has trapezoidal icons, drop only works with direct overlap. Grid positioning has rectangular icons, and drag and drop works on overlap with the grid holding the icon. This behavior is consistent with other desktop environments.\n* Icons on background on overview, improved gesture switching icons appear to be on all work spaces on the background with workspace switching, with no flashing.\n* Support for dragging icons onto the dock - Drag icons from desktop to and drop over application icon to open them with the app. Works with Dash to Dock and Dash to Panel.\n* Support for dragging icons from desktop directly to Trash on Dash to Dock, or to mounted volumes on the dock, to copy them directly.\n* Set the correct cursor with proposed action on drop on dock.\n* Drag Navigation on Dock - dragging an icon over the Gnome Files icon on the dock or mounted drives, and hovering over it for 1/2 seconds will open a Gnome Files Window. Behavior can be changed in preferences.\n* Drag Navigation - dragging an icon over a folder icon or a drive icon, and then hovering over it for 1/2 seconds will open that location in Gnome Files.\n* Sets correct hovering behavior during drag and drop on the Dock, enables scrolling in the dock to icons when they are hidden.\n* Drag and drop Favorite apps from Dash to Dock, Dash to Panel directly to Desktop. Pressing shift, ctr or alt while doing this will copy or move the app to Desktop, allowing launching from the desktop. Just dropping an app from the dock to the desktop will remove from Dash/Dock.\n* Follows xdg-terminal-exec to display the correct terminal in right click menus, and will launch the correct terminal, even if xdg-terminal-exec is not installed.\n* Shows the correct file manager in the right click menu and give the user the option to change the file manager.\n* Gio menus, menus display all keyboard shortcuts.\n* Uses Gtk4 AlertDialog, uses asynchronous promises for dialog's, shows button to launch URL for help and troubleshooting information.\n* Automatically zip Folders if mailing them.\n* Tool tips are now positioned correctly to not go under the dash or make it auto hide, or go over/under any gnome shell actors on the edge of the screen.\n* Right Click Menus will not go under the dock.\n* Make Links on Desktop with Alt button on Wayland. Shift, Ctr or Alt button control the effect, move, copy, drop or link. (Linking may not work on X11)\n* Copied/dropped/pasted files retain dropped position. Undo action after trashing or moving files puts icons back in the old position.\n* Better multi monitor support, preference to place icons on non primary monitor.\n* GSconnect extension integration, can send files from desktop directly to connected mobile device.\n* Accessibility support with screen readers\n* Deals correctly with appimage files on desktop.\n* Display GIMP thumbnails, even for snap and flatpack installs.\n\nPlease see Readme for full details of new features. Works best on Wayland. However your mileage may vary on X11. Multiple bugs fixed on X11.\n\nPlease report all issues on the Gitlab link below, this page is not monitored. All known issues as well as all the features are detailed there.", "link": "https://extensions.gnome.org/extension/5263/gtk4-desktop-icons-ng-ding/", "shell_version_map": { +, {"uuid": "gtk4-ding@smedius.gitlab.com", "name": "Gtk4 Desktop Icons NG (DING)", "pname": "gtk4-desktop-icons-ng-ding", "description": "Libadwaita/Gtk4 port of Desktop Icons NG with multiple fixes and new features.\n\nIcons can be positioned anywhere on desktop or are snapped to a grid. Can make links on the Desktop. GSconnect Integration, can send files to connected devices. Drag and Drop support on to Dock, Dash, or from Dock, Dash to the Desktop.\n\nUpdated and modified code base, uses Gio menus, all translations on Weblate. All functions are asynchronous where possible. It is ported to ESM modules, supports Gnome 45 and higher.\n\nMultiple fixes and new features-\n\n* New - Icons can be placed on any arbitrary position. Make a mess! - icons can overlap each other etc. Neat people can keep the default behavior and have the icons always snapped to a grid. Controlled in preferences, tweaks, 'Snap to grid'. Affects the shape of icons and drag and drop behavior as well. Free positioning has trapezoidal icons, drop only works with direct overlap. Grid positioning has rectangular icons, and drag and drop works on overlap with the grid holding the icon. This behavior is consistent with other desktop environments.\n* Icons on background on overview, improved gesture switching icons appear to be on all work spaces on the background with workspace switching, with no flashing.\n* Support for dragging icons onto the dock - Drag icons from desktop to and drop over application icon to open them with the app. Works with Dash to Dock and Dash to Panel.\n* Support for dragging icons from desktop directly to Trash on Dash to Dock, or to mounted volumes on the dock, to copy them directly.\n* Set the correct cursor with proposed action on drop on dock.\n* Drag Navigation on Dock - dragging an icon over the Gnome Files icon on the dock or mounted drives, and hovering over it for 1/2 seconds will open a Gnome Files Window. Behavior can be changed in preferences.\n* Drag Navigation - dragging an icon over a folder icon or a drive icon, and then hovering over it for one and half seconds will open that location in Gnome Files.\n* Sets correct hovering behavior during drag and drop on the Dock, enables scrolling in the dock to icons when they are hidden.\n* Drag and drop Favorite apps from Dash to Dock, Dash to Panel directly to Desktop. Pressing shift, ctr or alt while doing this will copy or move the app to Desktop, allowing launching from the desktop. Just dropping an app from the dock to the desktop will remove from Dash/Dock.\n* Follows xdg-terminal-exec to display the correct terminal in right click menus, and will launch the correct terminal, even if xdg-terminal-exec is not installed.\n* Shows the correct file manager in the right click menu and give the user the option to change the file manager.\n* Gio menus, menus display all keyboard shortcuts.\n* Uses Gtk4 AlertDialog, uses asynchronous promises for dialog's, shows button to launch URL for help and troubleshooting information.\n* Automatically zip Folders if mailing them.\n* Tool tips are now positioned correctly to not go under the dash or make it auto hide, or go over/under any gnome shell actors on the edge of the screen.\n* Right Click Menus will not go under the dock.\n* Make Links on Desktop with Alt button on Wayland. Shift, Ctr or Alt button control the effect, move, copy, drop or link. (Linking may not work on X11)\n* Copied/dropped/pasted files retain dropped position. Undo action after trashing or moving files puts icons back in the old position.\n* Better multi monitor support, preference to place icons on non primary monitor.\n* GSconnect extension integration, can send files from desktop directly to connected mobile device.\n* Accessibility support with screen readers\n* Deals correctly with appimage files on desktop.\n* Display GIMP thumbnails, even for snap and flatpack installs.\n\nPlease see Readme for full details of new features. Works best on Wayland. However your mileage may vary on X11. Multiple bugs fixed on X11.\n\nPlease report all issues on the Gitlab link below, this page is not monitored. All known issues as well as all the features are detailed there.", "link": "https://extensions.gnome.org/extension/5263/gtk4-desktop-icons-ng-ding/", "shell_version_map": { "40": {"version": "17", "sha256": "1d1xpjypmim6yzsscrkv1n9p7b141k9xi3mab1sz8cqic5v8401z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpYmFkd2FpdGEvR3RrNCBQb3J0IG9mIERlc2t0b3AgSWNvbnMgTkcgd2l0aCB1cGRhdGVkIGFuZCBtb2RpZmllZCBjb2RlIGJhc2UsIHVzZXMgZ2lvIG1lbnVzLCBhbGwgZnVuY3Rpb25zIGFyZSBhc3luYyB3aGVyZSBwb3NzaWJsZSwgbXVsdGlwbGUgZml4ZXMgYW5kIG5ldyBmZWF0dXJlcy1cblxuKiBOZXcgRHJhZyBOYXZpZ2F0aW9uIG9uIERvY2sgLSBkcmFnZ2luZyBhbiBpY29uIG92ZXIgdGhlIEdub21lIEZpbGVzIGljb24gb24gdGhlIGRvY2sgb3IgbW91bnRlZCBkcml2ZXMsIGFuZCBob3ZlcmluZyBvdmVyIGl0IGZvciAxLzIgc2Vjb25kIHdpbGwgb3BlbiBhIEdub21lIEZpbGVzIFdpbmRvdy5cbiogTmV3IC0gU2V0IHRoZSBjb3JyZWN0IGN1cnNvciB3aXRoIHByb3Bvc2VkIGFjdGlvbiBvbiBkcm9wIG9uIGRvY2ssIGltcHJvdmUgZHJvcCBkZXRlY3Rpb24uXG4qIE5ldyAtIERyYWcgTmF2aWdhdGlvbiAtIGRyYWdnaW5nIGFuIGljb24gb3ZlciBhIGZvbGRlciBpY29uIG9yIGEgZHJpdmUgaWNvbiwgYW5kIHRoZW4gaG92ZXJpbmcgb3ZlciBpdCBmb3IgMS8yIHNlY29uZCB3aWxsIG9wZW4gdGhhdCBsb2NhdGlvbiBpbiBHbm9tZSBGaWxlcy5cbiogTmV3IC0gRHJhZyBJY29uIG5vdyBmb3JtcyBhIGJ1bmNoIG9mIGljb25zIGlmIG11bHRpcGxlIGljb25zIGFyZSBkcmFnZ2VkLiBDb2RlIGZyb20gTmF1dGlsdXMsIHRyYW5zbGF0ZWQgdG8gZmlsZXMuXG4qIE5ldyAtIE5vdyBkZWFscyBjb3JyZWN0bHkgd2l0aCBhcHBpbWFnZSBmaWxlcyBvbiBkZXNrdG9wLlxuKiBOb3cgdXNlcyBsaWJhZHdhaXRhLlxuKiBNYWtlIExpbmtzIG9uIERlc2t0b3Agd2l0aCBBbHQgYnV0dG9uIG9uIFdheWxhbmQuIERvZXMgbm90IHdvcmsgd2l0aCBYMTEuXG4qIENvcGllZC9kcm9wcGVkL3Bhc3RlZCBmaWxlcyByZXRhaW4gZHJvcHBlZCBwb3NpdGlvbi5cbiogUmlnaHQgQ2xpY2sgTWVudXMgd2lsbCBub3QgZ28gdW5kZXIgdGhlIGRvY2suXG4qIEJldHRlciBtdWx0aSBtb25pdG9yIHN1cHBvcnQsIHByZWZlcmVuY2UgdG8gcGxhY2UgaWNvbnMgb24gbm9uIHByaW1hcnkgbW9uaXRvci5cbiogR1Njb25uZWN0IGV4dGVuc2lvbiBpbnRlZ3JhdGlvbiwgY2FuIHNlbmQgZmlsZXMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIG1vYmlsZSBkZXZpY2UuXG4qIERyYWcgYW5kIGRyb3AgRmF2b3JpdGUgYXBwcyBmcm9tIERhc2ggdG8gRG9jaywgRGFzaCB0byBQYW5lbCBkaXJlY3RseSB0byBEZXNrdG9wIG9yIHJlbW92ZSBmcm9tIGZhdm9yaXRlcy5cbiogSW1wcm92ZWQgZ2VzdHVyZSBzd2l0Y2hpbmcgb2Ygd29ya3NwYWNlcywgaWNvbnMgYXBwZWFyIHRvIGJlIG9uIGFsbCB3b3Jrc3BhY2VzIGluIG1vdmluZyB3aW5kb3dzLlxuKiBTdXBwb3J0IGZvciBkcmFnZ2luZyBpY29ucyBvbnRvIHRoZSBkb2NrIC0gRHJhZyBpY29ucyBmcm9tIGRlc2t0b3AgdG8gYW5kIGRyb3Agb3ZlciBhcHBsaWNhdGlvbiBpY29uIHRvIG9wZW4gdGhlbSB3aXRoIHRoZSBhcHAuIFdvcmtzIHdpdGggRGFzaCB0byBEb2NrIGFuZCBEYXNoIHRvIFBhbmVsLlxuKiBTdXBwb3J0IGZvciBkcmFnZ2luZyBpY29ucyBmcm9tIGRlc2t0b3AgZGlyZWN0bHkgdG8gVHJhc2ggb24gRGFzaCB0byBEb2NrIG9yIHRvIG1vdW50ZWQgdm9sdW1lcyB0byBjb3B5IHRoZW0gZGlyZWN0bHkuXG4qIERpc3BsYXkgR0lNUCB0aHVtYm5haWxzLCBldmVuIGZvciBzbmFwIGFuZCBmbGF0cGFjayBpbnN0YWxscy5cblxuUGxlYXNlIHNlZSBSZWFkbWUgZm9yIGZ1bGwgZGV0YWlscyBvZiBuZXcgZmVhdHVyZXMuIFdvcmtzIGJlc3Qgb24gV2F5bGFuZC4gVGhlcmUgaXMgYSBidWcgaW4gR0pTIG9uIFgxMSwgcGxlYXNlIHNlZSBSZWFkbWUuIFRoaXMgZXh0ZW5zaW9uIG5vdyB3b3JrcyB3aXRoIHNvbWUgaGFja3MsIGV2ZW4gb24gWDExLiBIb3dldmVyIHlvdXIgbWlsZWFnZSBtYXkgdmFyeSBhbmQgdXNlIHdpdGggY2F1dGlvbiBvbiBYMTEgYW5kIHJlcG9ydCBhbnkgaXNzdWVzLlxuXG5QbGVhc2UgcmVwb3J0IGFsbCBpc3N1ZXMgb24gdGhlIGdpdGxhYiBsaW5rIGJlbG93LCB0aGlzIHBhZ2UgaXMgbm90IG1vbml0b3JlZC4gQWxsIGtub3duIGlzc3VlcyBhcmUgZGV0YWlsZWQgdGhlcmUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiTGliYWR3YWl0YSwgR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "17", "sha256": "1d1xpjypmim6yzsscrkv1n9p7b141k9xi3mab1sz8cqic5v8401z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpYmFkd2FpdGEvR3RrNCBQb3J0IG9mIERlc2t0b3AgSWNvbnMgTkcgd2l0aCB1cGRhdGVkIGFuZCBtb2RpZmllZCBjb2RlIGJhc2UsIHVzZXMgZ2lvIG1lbnVzLCBhbGwgZnVuY3Rpb25zIGFyZSBhc3luYyB3aGVyZSBwb3NzaWJsZSwgbXVsdGlwbGUgZml4ZXMgYW5kIG5ldyBmZWF0dXJlcy1cblxuKiBOZXcgRHJhZyBOYXZpZ2F0aW9uIG9uIERvY2sgLSBkcmFnZ2luZyBhbiBpY29uIG92ZXIgdGhlIEdub21lIEZpbGVzIGljb24gb24gdGhlIGRvY2sgb3IgbW91bnRlZCBkcml2ZXMsIGFuZCBob3ZlcmluZyBvdmVyIGl0IGZvciAxLzIgc2Vjb25kIHdpbGwgb3BlbiBhIEdub21lIEZpbGVzIFdpbmRvdy5cbiogTmV3IC0gU2V0IHRoZSBjb3JyZWN0IGN1cnNvciB3aXRoIHByb3Bvc2VkIGFjdGlvbiBvbiBkcm9wIG9uIGRvY2ssIGltcHJvdmUgZHJvcCBkZXRlY3Rpb24uXG4qIE5ldyAtIERyYWcgTmF2aWdhdGlvbiAtIGRyYWdnaW5nIGFuIGljb24gb3ZlciBhIGZvbGRlciBpY29uIG9yIGEgZHJpdmUgaWNvbiwgYW5kIHRoZW4gaG92ZXJpbmcgb3ZlciBpdCBmb3IgMS8yIHNlY29uZCB3aWxsIG9wZW4gdGhhdCBsb2NhdGlvbiBpbiBHbm9tZSBGaWxlcy5cbiogTmV3IC0gRHJhZyBJY29uIG5vdyBmb3JtcyBhIGJ1bmNoIG9mIGljb25zIGlmIG11bHRpcGxlIGljb25zIGFyZSBkcmFnZ2VkLiBDb2RlIGZyb20gTmF1dGlsdXMsIHRyYW5zbGF0ZWQgdG8gZmlsZXMuXG4qIE5ldyAtIE5vdyBkZWFscyBjb3JyZWN0bHkgd2l0aCBhcHBpbWFnZSBmaWxlcyBvbiBkZXNrdG9wLlxuKiBOb3cgdXNlcyBsaWJhZHdhaXRhLlxuKiBNYWtlIExpbmtzIG9uIERlc2t0b3Agd2l0aCBBbHQgYnV0dG9uIG9uIFdheWxhbmQuIERvZXMgbm90IHdvcmsgd2l0aCBYMTEuXG4qIENvcGllZC9kcm9wcGVkL3Bhc3RlZCBmaWxlcyByZXRhaW4gZHJvcHBlZCBwb3NpdGlvbi5cbiogUmlnaHQgQ2xpY2sgTWVudXMgd2lsbCBub3QgZ28gdW5kZXIgdGhlIGRvY2suXG4qIEJldHRlciBtdWx0aSBtb25pdG9yIHN1cHBvcnQsIHByZWZlcmVuY2UgdG8gcGxhY2UgaWNvbnMgb24gbm9uIHByaW1hcnkgbW9uaXRvci5cbiogR1Njb25uZWN0IGV4dGVuc2lvbiBpbnRlZ3JhdGlvbiwgY2FuIHNlbmQgZmlsZXMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIG1vYmlsZSBkZXZpY2UuXG4qIERyYWcgYW5kIGRyb3AgRmF2b3JpdGUgYXBwcyBmcm9tIERhc2ggdG8gRG9jaywgRGFzaCB0byBQYW5lbCBkaXJlY3RseSB0byBEZXNrdG9wIG9yIHJlbW92ZSBmcm9tIGZhdm9yaXRlcy5cbiogSW1wcm92ZWQgZ2VzdHVyZSBzd2l0Y2hpbmcgb2Ygd29ya3NwYWNlcywgaWNvbnMgYXBwZWFyIHRvIGJlIG9uIGFsbCB3b3Jrc3BhY2VzIGluIG1vdmluZyB3aW5kb3dzLlxuKiBTdXBwb3J0IGZvciBkcmFnZ2luZyBpY29ucyBvbnRvIHRoZSBkb2NrIC0gRHJhZyBpY29ucyBmcm9tIGRlc2t0b3AgdG8gYW5kIGRyb3Agb3ZlciBhcHBsaWNhdGlvbiBpY29uIHRvIG9wZW4gdGhlbSB3aXRoIHRoZSBhcHAuIFdvcmtzIHdpdGggRGFzaCB0byBEb2NrIGFuZCBEYXNoIHRvIFBhbmVsLlxuKiBTdXBwb3J0IGZvciBkcmFnZ2luZyBpY29ucyBmcm9tIGRlc2t0b3AgZGlyZWN0bHkgdG8gVHJhc2ggb24gRGFzaCB0byBEb2NrIG9yIHRvIG1vdW50ZWQgdm9sdW1lcyB0byBjb3B5IHRoZW0gZGlyZWN0bHkuXG4qIERpc3BsYXkgR0lNUCB0aHVtYm5haWxzLCBldmVuIGZvciBzbmFwIGFuZCBmbGF0cGFjayBpbnN0YWxscy5cblxuUGxlYXNlIHNlZSBSZWFkbWUgZm9yIGZ1bGwgZGV0YWlscyBvZiBuZXcgZmVhdHVyZXMuIFdvcmtzIGJlc3Qgb24gV2F5bGFuZC4gVGhlcmUgaXMgYSBidWcgaW4gR0pTIG9uIFgxMSwgcGxlYXNlIHNlZSBSZWFkbWUuIFRoaXMgZXh0ZW5zaW9uIG5vdyB3b3JrcyB3aXRoIHNvbWUgaGFja3MsIGV2ZW4gb24gWDExLiBIb3dldmVyIHlvdXIgbWlsZWFnZSBtYXkgdmFyeSBhbmQgdXNlIHdpdGggY2F1dGlvbiBvbiBYMTEgYW5kIHJlcG9ydCBhbnkgaXNzdWVzLlxuXG5QbGVhc2UgcmVwb3J0IGFsbCBpc3N1ZXMgb24gdGhlIGdpdGxhYiBsaW5rIGJlbG93LCB0aGlzIHBhZ2UgaXMgbm90IG1vbml0b3JlZC4gQWxsIGtub3duIGlzc3VlcyBhcmUgZGV0YWlsZWQgdGhlcmUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiTGliYWR3YWl0YSwgR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "42": {"version": "60", "sha256": "0gxn065ls150nj88zslng8lkhqfzba8lkhxyi74rpqn477ss6y9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAibmFtZSI6ICJHdGs0IERlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndGs0LWRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNjAKfQ=="}, "43": {"version": "60", "sha256": "0gxn065ls150nj88zslng8lkhqfzba8lkhxyi74rpqn477ss6y9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAibmFtZSI6ICJHdGs0IERlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndGs0LWRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNjAKfQ=="}, "44": {"version": "67", "sha256": "1bz5bs2llbklzn0wvqn300gd1g39qgdsgl5hwi1ndwd2wdl1mdbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAibmFtZSI6ICJHdGs0IERlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndGs0LWRpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDY3Cn0="}, - "45": {"version": "73", "sha256": "1q4372ki5x89v7fk3cgnvbjxzknn0plqj741ynbjnsjcchzc44vn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDczLAogICJ2ZXJzaW9uLW5hbWUiOiAiNzMiCn0="}, - "46": {"version": "73", "sha256": "1q4372ki5x89v7fk3cgnvbjxzknn0plqj741ynbjnsjcchzc44vn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDczLAogICJ2ZXJzaW9uLW5hbWUiOiAiNzMiCn0="} + "45": {"version": "78", "sha256": "0xf2wwx7srrmyjss4gb5mkr6rjaax8zyilbhs92jigvi2qz8ryz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDc4LAogICJ2ZXJzaW9uLW5hbWUiOiAiNzUiCn0="}, + "46": {"version": "78", "sha256": "0xf2wwx7srrmyjss4gb5mkr6rjaax8zyilbhs92jigvi2qz8ryz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJndGs0LWRpbmciLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDc4LAogICJ2ZXJzaW9uLW5hbWUiOiAiNzUiCn0="} }} , {"uuid": "fig-gnome-integration@fig.io", "name": "Fig GNOME Integration", "pname": "fig-gnome-integration", "description": "Tightly integrates Fig with GNOME shell", "link": "https://extensions.gnome.org/extension/5266/fig-gnome-integration/", "shell_version_map": { "41": {"version": "6", "sha256": "1j5wy8zb5jnm4gh0y3brr6663ykjh56ximygkchns8ahyjmba85p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpZ2h0bHkgaW50ZWdyYXRlcyBGaWcgd2l0aCBHTk9NRSBzaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgIm5hbWUiOiAiRmlnIEdOT01FIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dpdGhmaWcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJmaWctZ25vbWUtaW50ZWdyYXRpb25AZmlnLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, @@ -5444,8 +5477,8 @@ "42": {"version": "13", "sha256": "0677akxfj5jwl1i75srkr1ylb69hydkzafim42xbq6ask7y9d19x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaHl6dXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRlQHNoeXp1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "43": {"version": "13", "sha256": "0677akxfj5jwl1i75srkr1ylb69hydkzafim42xbq6ask7y9d19x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaHl6dXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRlQHNoeXp1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "44": {"version": "13", "sha256": "0677akxfj5jwl1i75srkr1ylb69hydkzafim42xbq6ask7y9d19x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaHl6dXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRlQHNoeXp1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, - "45": {"version": "19", "sha256": "0ilkks5wjzxv3nahb0vjm1xq61kyiwk7zr246jl7kwdsfyrnxq69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaHl6dXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRlQHNoeXp1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, - "46": {"version": "19", "sha256": "0ilkks5wjzxv3nahb0vjm1xq61kyiwk7zr246jl7kwdsfyrnxq69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaHl6dXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRlQHNoeXp1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="} + "45": {"version": "20", "sha256": "0rspavp64lvr51hjgf7gw51zcwvpp7v2k9mp3sg4bcmaqjmp96b1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaHl6dXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRlQHNoeXp1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, + "46": {"version": "20", "sha256": "0rspavp64lvr51hjgf7gw51zcwvpp7v2k9mp3sg4bcmaqjmp96b1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaHl6dXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNjcmVlbi1hdXRvcm90YXRlIiwKICAidXVpZCI6ICJzY3JlZW4tcm90YXRlQHNoeXp1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="} }} , {"uuid": "devtools@romix.ch", "name": "Dev Tools", "pname": "dev-tools", "description": "Generate random UUID and some timestamp and base64 conversions.", "link": "https://extensions.gnome.org/extension/5393/dev-tools/", "shell_version_map": { "42": {"version": "11", "sha256": "10w3yl0x69nxp0ad4wkfniqav2k005sfmf6c9v87ys7qad8gp1zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIHJhbmRvbSBVVUlEIGFuZCBjdXJyZW50IHRpbWUgaW4gbWlsbGlzZWNvbmRzIGFzIGEgc2hlbGwgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiRGV2IFRvb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcm9taXhjaC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGV2LXRvb2xzIiwKICAidXVpZCI6ICJkZXZ0b29sc0Byb21peC5jaCIsCiAgInZlcnNpb24iOiAxMQp9"}, @@ -5606,7 +5639,7 @@ , {"uuid": "customreboot@nova1545", "name": "Custom Reboot", "pname": "custom-reboot", "description": "Reboot into another OS directly from GNOME.\nA expansion of https://github.com/docquantum/gnome-shell-extension-customreboot", "link": "https://extensions.gnome.org/extension/5542/custom-reboot/", "shell_version_map": { "43": {"version": "7", "sha256": "1xj7b97z0y5ryb5zikawlzsknk3l1zhb2xflpf28gvfbrk1gc642", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBpbnRvIGFub3RoZXIgT1MgZGlyZWN0bHkgZnJvbSBHTk9NRS5cbkEgZXhwYW5zaW9uIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9kb2NxdWFudHVtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJuYW1lIjogIkN1c3RvbSBSZWJvb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiTm92YTE1NDUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vdmExNTQ1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJ1dWlkIjogImN1c3RvbXJlYm9vdEBub3ZhMTU0NSIsCiAgInZlcnNpb24iOiA3Cn0="}, "44": {"version": "7", "sha256": "1xj7b97z0y5ryb5zikawlzsknk3l1zhb2xflpf28gvfbrk1gc642", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBpbnRvIGFub3RoZXIgT1MgZGlyZWN0bHkgZnJvbSBHTk9NRS5cbkEgZXhwYW5zaW9uIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9kb2NxdWFudHVtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJuYW1lIjogIkN1c3RvbSBSZWJvb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiTm92YTE1NDUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vdmExNTQ1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJ1dWlkIjogImN1c3RvbXJlYm9vdEBub3ZhMTU0NSIsCiAgInZlcnNpb24iOiA3Cn0="}, - "45": {"version": "9", "sha256": "0pgzmin2d7jni530spf2b0yf8m99qhas59n2al6nkn44lg4iwv03", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBpbnRvIGFub3RoZXIgT1MgZGlyZWN0bHkgZnJvbSBHTk9NRS5cbkEgZXhwYW5zaW9uIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9kb2NxdWFudHVtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJuYW1lIjogIkN1c3RvbSBSZWJvb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiTm92YTE1NDUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm92YTE1NDUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWN1c3RvbXJlYm9vdCIsCiAgInV1aWQiOiAiY3VzdG9tcmVib290QG5vdmExNTQ1IiwKICAidmVyc2lvbiI6IDkKfQ=="} + "45": {"version": "10", "sha256": "1jjnd5zjhwr91ybvcm5i2a099gwy6svca6m4y3brdn05zl8jn42i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBpbnRvIGFub3RoZXIgT1MgZGlyZWN0bHkgZnJvbSBHTk9NRS5cbkEgZXhwYW5zaW9uIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9kb2NxdWFudHVtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jdXN0b21yZWJvb3QiLAogICJuYW1lIjogIkN1c3RvbSBSZWJvb3QiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiTm92YTE1NDUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm92YTE1NDUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWN1c3RvbXJlYm9vdCIsCiAgInV1aWQiOiAiY3VzdG9tcmVib290QG5vdmExNTQ1IiwKICAidmVyc2lvbiI6IDEwCn0="} }} , {"uuid": "custom-accent-colors@demiskp", "name": "Custom Accent Colors", "pname": "custom-accent-colors", "description": "A GNOME Shell Extension that provides 7 Custom Accent Colors. The selected Accent Color can be applied to GTK4/GTK3 apps and the Gnome Shell.", "link": "https://extensions.gnome.org/extension/5547/custom-accent-colors/", "shell_version_map": { "43": {"version": "6", "sha256": "1cfmqp524m3zkw5vj6msr9pjjwwwys3mcvjipfdl875lkwdb3xg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgdXNlciB0byBjaG9vc2UgYmV0d2VlbiA5IEN1c3RvbSBBY2NlbnQgQ29sb3JzLiBUaGUgQWNjZW50IENvbG9yIGNhbiBiZSBhcHBsaWVkIHRvIEdUSzQvR1RLMyBhcHBzIGFuZCB0aGUgR25vbWUgU2hlbGwuIiwKICAibmFtZSI6ICJDdXN0b20gQWNjZW50IENvbG9ycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVtaXNrcC9jdXN0b20tYWNjZW50LWNvbG9ycyIsCiAgInV1aWQiOiAiY3VzdG9tLWFjY2VudC1jb2xvcnNAZGVtaXNrcCIsCiAgInZlcnNpb24iOiA2Cn0="}, @@ -5746,7 +5779,8 @@ , {"uuid": "gnome-one-window-wonderland@jqno.nl", "name": "One Window Wonderland", "pname": "one-window-wonderland", "description": "Automatically maximizes new windows, leaving 'useless gaps' around them.\n\nFeatures:\n- Sizes and positions a new window so that it takes the full workspace, except for the gaps around it.\n- Sizes and positions a window that moves to another monitor so that it takes the full workspace, except for the gaps around it.\n- The size of the gaps is configurable.\n- You can define a list of apps that should be left alone by this extension (the 'ignore list').\n- You can define a list of apps that should forcibly be kept in place (the 'force list').\n\nNote that One Window Wonderland leaves windows alone after they've been created or moved to another monitor. You are free to resize them as you see fit, or add them to the force list to keep them in place.", "link": "https://extensions.gnome.org/extension/5696/one-window-wonderland/", "shell_version_map": { "43": {"version": "9", "sha256": "1azrpcg9wsf3l1rw5hxh2bj1w7xrslfrm1592kc4v27rflynvfkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kLyIsCiAgInV1aWQiOiAiZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kQGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogOQp9"}, "44": {"version": "9", "sha256": "1azrpcg9wsf3l1rw5hxh2bj1w7xrslfrm1592kc4v27rflynvfkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kLyIsCiAgInV1aWQiOiAiZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kQGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogOQp9"}, - "45": {"version": "11", "sha256": "0hwdx3d7nv8h49qyqjz45jiy7qvbwdp8bb30f916w9cxrpy4sdh3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmQvIiwKICAidXVpZCI6ICJnbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmRAanFuby5ubCIsCiAgInZlcnNpb24iOiAxMQp9"} + "45": {"version": "12", "sha256": "13ms5vccxf7aav8181xhlg03g6hkk45y65raxg841h35s04kmja2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kLyIsCiAgInV1aWQiOiAiZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kQGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, + "46": {"version": "12", "sha256": "13ms5vccxf7aav8181xhlg03g6hkk45y65raxg841h35s04kmja2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtLlxuXG5GZWF0dXJlczpcbi0gU2l6ZXMgYW5kIHBvc2l0aW9ucyBhIG5ldyB3aW5kb3cgc28gdGhhdCBpdCB0YWtlcyB0aGUgZnVsbCB3b3Jrc3BhY2UsIGV4Y2VwdCBmb3IgdGhlIGdhcHMgYXJvdW5kIGl0LlxuLSBTaXplcyBhbmQgcG9zaXRpb25zIGEgd2luZG93IHRoYXQgbW92ZXMgdG8gYW5vdGhlciBtb25pdG9yIHNvIHRoYXQgaXQgdGFrZXMgdGhlIGZ1bGwgd29ya3NwYWNlLCBleGNlcHQgZm9yIHRoZSBnYXBzIGFyb3VuZCBpdC5cbi0gVGhlIHNpemUgb2YgdGhlIGdhcHMgaXMgY29uZmlndXJhYmxlLlxuLSBZb3UgY2FuIGRlZmluZSBhIGxpc3Qgb2YgYXBwcyB0aGF0IHNob3VsZCBiZSBsZWZ0IGFsb25lIGJ5IHRoaXMgZXh0ZW5zaW9uICh0aGUgJ2lnbm9yZSBsaXN0JykuXG4tIFlvdSBjYW4gZGVmaW5lIGEgbGlzdCBvZiBhcHBzIHRoYXQgc2hvdWxkIGZvcmNpYmx5IGJlIGtlcHQgaW4gcGxhY2UgKHRoZSAnZm9yY2UgbGlzdCcpLlxuXG5Ob3RlIHRoYXQgT25lIFdpbmRvdyBXb25kZXJsYW5kIGxlYXZlcyB3aW5kb3dzIGFsb25lIGFmdGVyIHRoZXkndmUgYmVlbiBjcmVhdGVkIG9yIG1vdmVkIHRvIGFub3RoZXIgbW9uaXRvci4gWW91IGFyZSBmcmVlIHRvIHJlc2l6ZSB0aGVtIGFzIHlvdSBzZWUgZml0LCBvciBhZGQgdGhlbSB0byB0aGUgZm9yY2UgbGlzdCB0byBrZWVwIHRoZW0gaW4gcGxhY2UuIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kLyIsCiAgInV1aWQiOiAiZ25vbWUtb25lLXdpbmRvdy13b25kZXJsYW5kQGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogMTIKfQ=="} }} , {"uuid": "otp-keys@osmank3.net", "name": "OTP keys", "pname": "otp-keys", "description": "Show and copy otp keys", "link": "https://extensions.gnome.org/extension/5697/otp-keys/", "shell_version_map": { "42": {"version": "21", "sha256": "1a94fmqg8rgrz0fz7m3millh9hgfa3vbw22ivffa31ifssr52a13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3RwLWtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vc21hbmszL290cC1rZXlzIiwKICAidXVpZCI6ICJvdHAta2V5c0Bvc21hbmszLm5ldCIsCiAgInZlcnNpb24iOiAyMQp9"}, @@ -5789,8 +5823,8 @@ "42": {"version": "59", "sha256": "01c1a7k20cnwi18sklvwzsbmdlqfjaph3np2gs7syjy087cff4j6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueVxuLSBIdWF3ZWlcbi0gVG9zaGliYVxuLSBTeXN0ZW03NlxuLSBMZW5vdm8gKElkZWFwYWQsIExlZ2lvbilcbi0gVGhpbmtwYWRcbi0gUGFuYXNvbmljXG4tIEFjZXIgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gTVNJIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFR1eGVkbyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBTbGltYm9vayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFhNRyBJbnRlbFFDNzEgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRWx1a3Ryb25pY3MgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFB1cmlzbSBMaWJyZW0gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gR2lnYWJ5dGUgQWVyby9Bb3J1cyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBEZWxsIChkZXBlbmRlbmNpZXM6IGN1c3RvbSBwYWNrYWdlIGxpYnNtYmlvcylcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBEZWxsIENvbW1hbmQgQ2VudGVyKVxuLSBBcHBsZSBNYWNib29rIEludGVsLXNlcmllcyBjaGlwIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEFwcGxlIE1hY2Jvb2sgTS1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBjdXN0b20ga2VybmVsKVxuLSBSYXplciAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSByYXplci1jbGkpXG4tIEZyYW1ld29yayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuXG5Ob3QgYWxsIG1vZGVscyBhcmUgY29tYXB0aWJsZS4gUGxlYXNlIHJlYWQgYWJvdXQgdGhlIGNvbXBhdGliaWxpdHkgYW5kIGRlcGVuZGVuY2llcyBvZiB5b3VyIGRldmljZSBvbiBnaXRodWIgbGluayBiZWxvdy5cblxuaHR0cHM6Ly9tYW5pYWN4LmdpdGh1Yi5pby9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZy8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkJhdHRlcnkgSGVhbHRoIENoYXJnaW5nIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbmlhY3gvQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJ1dWlkIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1OQp9"}, "43": {"version": "59", "sha256": "01c1a7k20cnwi18sklvwzsbmdlqfjaph3np2gs7syjy087cff4j6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueVxuLSBIdWF3ZWlcbi0gVG9zaGliYVxuLSBTeXN0ZW03NlxuLSBMZW5vdm8gKElkZWFwYWQsIExlZ2lvbilcbi0gVGhpbmtwYWRcbi0gUGFuYXNvbmljXG4tIEFjZXIgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gTVNJIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFR1eGVkbyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBTbGltYm9vayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFhNRyBJbnRlbFFDNzEgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRWx1a3Ryb25pY3MgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFB1cmlzbSBMaWJyZW0gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gR2lnYWJ5dGUgQWVyby9Bb3J1cyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBEZWxsIChkZXBlbmRlbmNpZXM6IGN1c3RvbSBwYWNrYWdlIGxpYnNtYmlvcylcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBEZWxsIENvbW1hbmQgQ2VudGVyKVxuLSBBcHBsZSBNYWNib29rIEludGVsLXNlcmllcyBjaGlwIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEFwcGxlIE1hY2Jvb2sgTS1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBjdXN0b20ga2VybmVsKVxuLSBSYXplciAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSByYXplci1jbGkpXG4tIEZyYW1ld29yayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuXG5Ob3QgYWxsIG1vZGVscyBhcmUgY29tYXB0aWJsZS4gUGxlYXNlIHJlYWQgYWJvdXQgdGhlIGNvbXBhdGliaWxpdHkgYW5kIGRlcGVuZGVuY2llcyBvZiB5b3VyIGRldmljZSBvbiBnaXRodWIgbGluayBiZWxvdy5cblxuaHR0cHM6Ly9tYW5pYWN4LmdpdGh1Yi5pby9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZy8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkJhdHRlcnkgSGVhbHRoIENoYXJnaW5nIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbmlhY3gvQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJ1dWlkIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1OQp9"}, "44": {"version": "59", "sha256": "01c1a7k20cnwi18sklvwzsbmdlqfjaph3np2gs7syjy087cff4j6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueVxuLSBIdWF3ZWlcbi0gVG9zaGliYVxuLSBTeXN0ZW03NlxuLSBMZW5vdm8gKElkZWFwYWQsIExlZ2lvbilcbi0gVGhpbmtwYWRcbi0gUGFuYXNvbmljXG4tIEFjZXIgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gTVNJIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFR1eGVkbyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBTbGltYm9vayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFhNRyBJbnRlbFFDNzEgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRWx1a3Ryb25pY3MgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFB1cmlzbSBMaWJyZW0gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gR2lnYWJ5dGUgQWVyby9Bb3J1cyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBEZWxsIChkZXBlbmRlbmNpZXM6IGN1c3RvbSBwYWNrYWdlIGxpYnNtYmlvcylcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBEZWxsIENvbW1hbmQgQ2VudGVyKVxuLSBBcHBsZSBNYWNib29rIEludGVsLXNlcmllcyBjaGlwIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEFwcGxlIE1hY2Jvb2sgTS1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBjdXN0b20ga2VybmVsKVxuLSBSYXplciAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSByYXplci1jbGkpXG4tIEZyYW1ld29yayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuXG5Ob3QgYWxsIG1vZGVscyBhcmUgY29tYXB0aWJsZS4gUGxlYXNlIHJlYWQgYWJvdXQgdGhlIGNvbXBhdGliaWxpdHkgYW5kIGRlcGVuZGVuY2llcyBvZiB5b3VyIGRldmljZSBvbiBnaXRodWIgbGluayBiZWxvdy5cblxuaHR0cHM6Ly9tYW5pYWN4LmdpdGh1Yi5pby9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZy8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkJhdHRlcnkgSGVhbHRoIENoYXJnaW5nIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbmlhY3gvQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJ1dWlkIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1OQp9"}, - "45": {"version": "60", "sha256": "07h72vpc949z50fhhkn86mq2qcdibgl5263wi29l136260nsiv9p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueVxuLSBIdWF3ZWlcbi0gVG9zaGliYVxuLSBTeXN0ZW03NlxuLSBMZW5vdm8gKElkZWFwYWQsIExlZ2lvbilcbi0gVGhpbmtwYWRcbi0gUGFuYXNvbmljXG4tIEFjZXIgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gTVNJIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFR1eGVkbyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBTbGltYm9vayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFhNRyBJbnRlbFFDNzEgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRWx1a3Ryb25pY3MgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFB1cmlzbSBMaWJyZW0gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gR2lnYWJ5dGUgQWVyby9Bb3J1cyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBEZWxsIChkZXBlbmRlbmNpZXM6IGN1c3RvbSBwYWNrYWdlIGxpYnNtYmlvcylcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBEZWxsIENvbW1hbmQgQ2VudGVyKVxuLSBBcHBsZSBNYWNib29rIEludGVsLXNlcmllcyBjaGlwIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEFwcGxlIE1hY2Jvb2sgTS1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBjdXN0b20ga2VybmVsKVxuLSBSYXplciAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSByYXplci1jbGkpXG4tIEZyYW1ld29yayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuXG5Ob3QgYWxsIG1vZGVscyBhcmUgY29tYXB0aWJsZS4gUGxlYXNlIHJlYWQgYWJvdXQgdGhlIGNvbXBhdGliaWxpdHkgYW5kIGRlcGVuZGVuY2llcyBvZiB5b3VyIGRldmljZSBvbiBnaXRodWIgbGluayBiZWxvdy5cblxuaHR0cHM6Ly9tYW5pYWN4LmdpdGh1Yi5pby9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZy8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkJhdHRlcnkgSGVhbHRoIENoYXJnaW5nIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInV1aWQiOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYwCn0="}, - "46": {"version": "60", "sha256": "07h72vpc949z50fhhkn86mq2qcdibgl5263wi29l136260nsiv9p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueVxuLSBIdWF3ZWlcbi0gVG9zaGliYVxuLSBTeXN0ZW03NlxuLSBMZW5vdm8gKElkZWFwYWQsIExlZ2lvbilcbi0gVGhpbmtwYWRcbi0gUGFuYXNvbmljXG4tIEFjZXIgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gTVNJIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFR1eGVkbyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBTbGltYm9vayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFhNRyBJbnRlbFFDNzEgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRWx1a3Ryb25pY3MgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFB1cmlzbSBMaWJyZW0gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gR2lnYWJ5dGUgQWVyby9Bb3J1cyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBEZWxsIChkZXBlbmRlbmNpZXM6IGN1c3RvbSBwYWNrYWdlIGxpYnNtYmlvcylcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBEZWxsIENvbW1hbmQgQ2VudGVyKVxuLSBBcHBsZSBNYWNib29rIEludGVsLXNlcmllcyBjaGlwIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEFwcGxlIE1hY2Jvb2sgTS1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBjdXN0b20ga2VybmVsKVxuLSBSYXplciAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSByYXplci1jbGkpXG4tIEZyYW1ld29yayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuXG5Ob3QgYWxsIG1vZGVscyBhcmUgY29tYXB0aWJsZS4gUGxlYXNlIHJlYWQgYWJvdXQgdGhlIGNvbXBhdGliaWxpdHkgYW5kIGRlcGVuZGVuY2llcyBvZiB5b3VyIGRldmljZSBvbiBnaXRodWIgbGluayBiZWxvdy5cblxuaHR0cHM6Ly9tYW5pYWN4LmdpdGh1Yi5pby9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZy8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkJhdHRlcnkgSGVhbHRoIENoYXJnaW5nIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInV1aWQiOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYwCn0="} + "45": {"version": "61", "sha256": "0dfrqwicrhxf24hva03zpbdl5q9dcjs54rvlyx2pggrb78bnairb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueVxuLSBIdWF3ZWlcbi0gVG9zaGliYVxuLSBTeXN0ZW03NlxuLSBMZW5vdm8gKElkZWFwYWQsIExlZ2lvbilcbi0gVGhpbmtwYWRcbi0gUGFuYXNvbmljXG4tIEFjZXIgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gTVNJIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFR1eGVkbyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBTbGltYm9vayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFhNRyBJbnRlbFFDNzEgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRWx1a3Ryb25pY3MgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFB1cmlzbSBMaWJyZW0gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gR2lnYWJ5dGUgQWVyby9Bb3J1cyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBEZWxsIChkZXBlbmRlbmNpZXM6IGN1c3RvbSBwYWNrYWdlIGxpYnNtYmlvcylcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBEZWxsIENvbW1hbmQgQ2VudGVyKVxuLSBBcHBsZSBNYWNib29rIEludGVsLXNlcmllcyBjaGlwIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEFwcGxlIE1hY2Jvb2sgTS1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBjdXN0b20ga2VybmVsKVxuLSBSYXplciAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSByYXplci1jbGkpXG4tIEZyYW1ld29yayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuXG5Ob3QgYWxsIG1vZGVscyBhcmUgY29tYXB0aWJsZS4gUGxlYXNlIHJlYWQgYWJvdXQgdGhlIGNvbXBhdGliaWxpdHkgYW5kIGRlcGVuZGVuY2llcyBvZiB5b3VyIGRldmljZSBvbiBnaXRodWIgbGluayBiZWxvdy5cblxuaHR0cHM6Ly9tYW5pYWN4LmdpdGh1Yi5pby9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZy8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkJhdHRlcnkgSGVhbHRoIENoYXJnaW5nIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInV1aWQiOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYxCn0="}, + "46": {"version": "61", "sha256": "0dfrqwicrhxf24hva03zpbdl5q9dcjs54rvlyx2pggrb78bnairb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueVxuLSBIdWF3ZWlcbi0gVG9zaGliYVxuLSBTeXN0ZW03NlxuLSBMZW5vdm8gKElkZWFwYWQsIExlZ2lvbilcbi0gVGhpbmtwYWRcbi0gUGFuYXNvbmljXG4tIEFjZXIgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gTVNJIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFR1eGVkbyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBTbGltYm9vayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFhNRyBJbnRlbFFDNzEgKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gRWx1a3Ryb25pY3MgSW50ZWxRQzcxIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFB1cmlzbSBMaWJyZW0gKGRlcGVuZGVuY2llczoga2VybmVsIG1vZHVsZSlcbi0gR2lnYWJ5dGUgQWVyby9Bb3J1cyAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBEZWxsIChkZXBlbmRlbmNpZXM6IGN1c3RvbSBwYWNrYWdlIGxpYnNtYmlvcylcbi0gRGVsbCAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSBEZWxsIENvbW1hbmQgQ2VudGVyKVxuLSBBcHBsZSBNYWNib29rIEludGVsLXNlcmllcyBjaGlwIChkZXBlbmRlbmNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIEFwcGxlIE1hY2Jvb2sgTS1zZXJpZXMgY2hpcCAoZGVwZW5kZW5jaWVzOiBjdXN0b20ga2VybmVsKVxuLSBSYXplciAoZGVwZW5kZW5jaWVzOiBjdXN0b20gcGFja2FnZSByYXplci1jbGkpXG4tIEZyYW1ld29yayAoZGVwZW5kZW5jaWVzOiBrZXJuZWwgbW9kdWxlKVxuXG5Ob3QgYWxsIG1vZGVscyBhcmUgY29tYXB0aWJsZS4gUGxlYXNlIHJlYWQgYWJvdXQgdGhlIGNvbXBhdGliaWxpdHkgYW5kIGRlcGVuZGVuY2llcyBvZiB5b3VyIGRldmljZSBvbiBnaXRodWIgbGluayBiZWxvdy5cblxuaHR0cHM6Ly9tYW5pYWN4LmdpdGh1Yi5pby9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZy8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJuYW1lIjogIkJhdHRlcnkgSGVhbHRoIENoYXJnaW5nIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInV1aWQiOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYxCn0="} }} , {"uuid": "oneclickbios@sao.studio", "name": "One-Click BIOS", "pname": "one-click-bios", "description": "Restart into firmware settings directly from OS\n\nHold Shift and click the power menu button to trigger restart into firmware settings.\n\nAny suggestion is appreciated on GitHub!", "link": "https://extensions.gnome.org/extension/5733/one-click-bios/", "shell_version_map": { "43": {"version": "5", "sha256": "07r9vspq35s632j0pzywrhb8islb9fq49dv0a1s6yvp23d7bzni7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncyBkaXJlY3RseSBmcm9tIE9TXG5cbkhvbGQgU2hpZnQgYW5kIGNsaWNrIHRoZSBwb3dlciBtZW51IGJ1dHRvbiB0byB0cmlnZ2VyIHJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncy5cblxuQW55IHN1Z2dlc3Rpb24gaXMgYXBwcmVjaWF0ZWQgb24gR2l0SHViISIsCiAgIm5hbWUiOiAiT25lLUNsaWNrIEJJT1MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbTFuaWNydXNoZXIvb25lLWNsaWNrLWJpb3MiLAogICJ1dWlkIjogIm9uZWNsaWNrYmlvc0BzYW8uc3R1ZGlvIiwKICAidmVyc2lvbiI6IDUKfQ=="} @@ -5924,7 +5958,8 @@ "42": {"version": "3", "sha256": "0xm32ywlvkb0wphn9zkxlhjv256db5v47ff6lc67zxwk9v881ylw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmlrdy9yeC1pbnB1dC1sYXlvdXQtc3dpdGNoZXIiLAogICJ1dWlkIjogInJ4LWlucHV0LWxheW91dC1zd2l0Y2hlckB3em1uLm5ldCIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0xm32ywlvkb0wphn9zkxlhjv256db5v47ff6lc67zxwk9v881ylw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmlrdy9yeC1pbnB1dC1sYXlvdXQtc3dpdGNoZXIiLAogICJ1dWlkIjogInJ4LWlucHV0LWxheW91dC1zd2l0Y2hlckB3em1uLm5ldCIsCiAgInZlcnNpb24iOiAzCn0="}, "44": {"version": "3", "sha256": "0xm32ywlvkb0wphn9zkxlhjv256db5v47ff6lc67zxwk9v881ylw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmlrdy9yeC1pbnB1dC1sYXlvdXQtc3dpdGNoZXIiLAogICJ1dWlkIjogInJ4LWlucHV0LWxheW91dC1zd2l0Y2hlckB3em1uLm5ldCIsCiAgInZlcnNpb24iOiAzCn0="}, - "45": {"version": "6", "sha256": "0lmr7h14ps2a59raq5hxdqd3hy1i4rql2bs8rcxcqvmly5bq7gl0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyaWt3L3J4LWlucHV0LWxheW91dC1zd2l0Y2hlciIsCiAgInV1aWQiOiAicngtaW5wdXQtbGF5b3V0LXN3aXRjaGVyQHd6bW4ubmV0IiwKICAidmVyc2lvbiI6IDYKfQ=="} + "45": {"version": "7", "sha256": "0n216mh2ai5yflr59jf8q3y003ymmc1013lr0yx2gfii1clwf97g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmlrdy9yeC1pbnB1dC1sYXlvdXQtc3dpdGNoZXIiLAogICJ1dWlkIjogInJ4LWlucHV0LWxheW91dC1zd2l0Y2hlckB3em1uLm5ldCIsCiAgInZlcnNpb24iOiA3Cn0="}, + "46": {"version": "7", "sha256": "0n216mh2ai5yflr59jf8q3y003ymmc1013lr0yx2gfii1clwf97g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBBbHQrU2hpZnQgdG8gY2hhbmdlIHRoZSBrZXlib2FyZCBsYW5ndWFnZSIsCiAgIm5hbWUiOiAiUlggSW5wdXQgTGF5b3V0IFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmlrdy9yeC1pbnB1dC1sYXlvdXQtc3dpdGNoZXIiLAogICJ1dWlkIjogInJ4LWlucHV0LWxheW91dC1zd2l0Y2hlckB3em1uLm5ldCIsCiAgInZlcnNpb24iOiA3Cn0="} }} , {"uuid": "admission@github.com.orbitcorrection", "name": "Admission", "pname": "admission", "description": "Override the styling. It makes gnome-shell default theme fit to Ubuntu.", "link": "https://extensions.gnome.org/extension/5838/admission/", "shell_version_map": { "40": {"version": "9", "sha256": "1mx02i0nl3cv3pmv7ck1g4ddkjk4mqpcv6hlxsfsvn46ijwrjrjd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlIHRoZSBzdHlsaW5nLiAgSXQgbWFrZXMgZ25vbWUtc2hlbGwgZGVmYXVsdCB0aGVtZSBmaXQgdG8gVWJ1bnR1LiIsCiAgIm5hbWUiOiAiQWRtaXNzaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29yYml0Y29ycmVjdG9uL1ZhbmlsbGEvdHJlZS9leHBlcmltZW50YWwyIiwKICAidXVpZCI6ICJhZG1pc3Npb25AZ2l0aHViLmNvbS5vcmJpdGNvcnJlY3Rpb24iLAogICJ2ZXJzaW9uIjogOQp9"}, @@ -6054,8 +6089,8 @@ "42": {"version": "5", "sha256": "08i7qzs1c9ifpa9z5xdiif31jp10g4jxr0ijnn18vmcgv2pkfyln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBpbmNsdWRlcyBzdXBwb3J0IGZvciBHTk9NRSA0MysuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJuYW1lIjogIlNvZnQgQnJpZ2h0bmVzcyBQbHVzIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamtpdGNoaW5nL3NvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAidXVpZCI6ICJzb2Z0LWJyaWdodG5lc3MtcGx1c0Bqb2Vsa2l0Y2hpbmcuY29tIiwKICAidmNzX3JldmlzaW9uIjogIjc3YjVmOTIiLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "08i7qzs1c9ifpa9z5xdiif31jp10g4jxr0ijnn18vmcgv2pkfyln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBpbmNsdWRlcyBzdXBwb3J0IGZvciBHTk9NRSA0MysuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJuYW1lIjogIlNvZnQgQnJpZ2h0bmVzcyBQbHVzIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamtpdGNoaW5nL3NvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAidXVpZCI6ICJzb2Z0LWJyaWdodG5lc3MtcGx1c0Bqb2Vsa2l0Y2hpbmcuY29tIiwKICAidmNzX3JldmlzaW9uIjogIjc3YjVmOTIiLAogICJ2ZXJzaW9uIjogNQp9"}, "44": {"version": "5", "sha256": "08i7qzs1c9ifpa9z5xdiif31jp10g4jxr0ijnn18vmcgv2pkfyln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBpbmNsdWRlcyBzdXBwb3J0IGZvciBHTk9NRSA0MysuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJuYW1lIjogIlNvZnQgQnJpZ2h0bmVzcyBQbHVzIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamtpdGNoaW5nL3NvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAidXVpZCI6ICJzb2Z0LWJyaWdodG5lc3MtcGx1c0Bqb2Vsa2l0Y2hpbmcuY29tIiwKICAidmNzX3JldmlzaW9uIjogIjc3YjVmOTIiLAogICJ2ZXJzaW9uIjogNQp9"}, - "45": {"version": "16", "sha256": "1kabp7xm4qjnbr1wrmzdy20v6h3i3yiy8ni87apc48bb5hnzj127", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBtYWludGFpbnMgc3VwcG9ydCBmb3IgbmV3IEdOT01FIHJlbGVhc2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogInNvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAibmFtZSI6ICJTb2Z0IEJyaWdodG5lc3MgUGx1cyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2praXRjaGluZy9zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInV1aWQiOiAic29mdC1icmlnaHRuZXNzLXBsdXNAam9lbGtpdGNoaW5nLmNvbSIsCiAgInZjc19yZXZpc2lvbiI6ICJhZmMxZjUxIiwKICAidmVyc2lvbiI6IDE2Cn0="}, - "46": {"version": "16", "sha256": "1kabp7xm4qjnbr1wrmzdy20v6h3i3yiy8ni87apc48bb5hnzj127", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBtYWludGFpbnMgc3VwcG9ydCBmb3IgbmV3IEdOT01FIHJlbGVhc2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogInNvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAibmFtZSI6ICJTb2Z0IEJyaWdodG5lc3MgUGx1cyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2praXRjaGluZy9zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInV1aWQiOiAic29mdC1icmlnaHRuZXNzLXBsdXNAam9lbGtpdGNoaW5nLmNvbSIsCiAgInZjc19yZXZpc2lvbiI6ICJhZmMxZjUxIiwKICAidmVyc2lvbiI6IDE2Cn0="} + "45": {"version": "18", "sha256": "0x7378p3srqwria4b8qwag7lqvdjvxyd3q8m67b8285ndspc9y8s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBtYWludGFpbnMgc3VwcG9ydCBmb3IgbmV3IEdOT01FIHJlbGVhc2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogInNvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAibmFtZSI6ICJTb2Z0IEJyaWdodG5lc3MgUGx1cyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2praXRjaGluZy9zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInV1aWQiOiAic29mdC1icmlnaHRuZXNzLXBsdXNAam9lbGtpdGNoaW5nLmNvbSIsCiAgInZjc19yZXZpc2lvbiI6ICI3YzRhOWM5IiwKICAidmVyc2lvbiI6IDE4Cn0="}, + "46": {"version": "18", "sha256": "0x7378p3srqwria4b8qwag7lqvdjvxyd3q8m67b8285ndspc9y8s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS5cblxuVGhpcyBleHRlbnNpb24gaXMgYSBmb3JrIG9mIHRoZSBvcmlnaW5hbCAnU29mdCBicmlnaHRuZXNzJyBleHRlbnNpb24sIGFuZCBtYWludGFpbnMgc3VwcG9ydCBmb3IgbmV3IEdOT01FIHJlbGVhc2VzLiIsCiAgImdldHRleHQtZG9tYWluIjogInNvZnQtYnJpZ2h0bmVzcy1wbHVzIiwKICAibmFtZSI6ICJTb2Z0IEJyaWdodG5lc3MgUGx1cyIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc29mdC1icmlnaHRuZXNzLXBsdXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2praXRjaGluZy9zb2Z0LWJyaWdodG5lc3MtcGx1cyIsCiAgInV1aWQiOiAic29mdC1icmlnaHRuZXNzLXBsdXNAam9lbGtpdGNoaW5nLmNvbSIsCiAgInZjc19yZXZpc2lvbiI6ICI3YzRhOWM5IiwKICAidmVyc2lvbiI6IDE4Cn0="} }} , {"uuid": "swatch-clock@okatotf.github.io", "name": "Swatch Clock", "pname": "swatch-clock", "description": "An extension which displays the Swatch Internet Time on the panel.", "link": "https://extensions.gnome.org/extension/5946/swatch-clock/", "shell_version_map": { "44": {"version": "2", "sha256": "131rlf6q1w6jxz95j8yf3vpi40y80p1rjax5b2mapm6ppasdlkl2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV4dGVuc2lvbiB3aGljaCBkaXNwbGF5cyB0aGUgU3dhdGNoIEludGVybmV0IFRpbWUgb24gdGhlIHBhbmVsLiIsCiAgIm5hbWUiOiAiU3dhdGNoIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29rYXRvdGYvc3dhdGNoLWNsb2NrIiwKICAidXVpZCI6ICJzd2F0Y2gtY2xvY2tAb2thdG90Zi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"} @@ -6104,8 +6139,8 @@ "42": {"version": "95", "sha256": "0myj4g5351fi04w3iwpshjhy9a5vgq85nwd186ymlvnjby12d6fh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi4iLAogICJuYW1lIjogIkdpdGh1YiBBY3Rpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhcm9ub25ha0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdpdGh1Yi1hY3Rpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcm9ub25hay9naXRodWItYWN0aW9ucy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGh1Yi1hY3Rpb25zQGFyb25vbmFrLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5NQp9"}, "43": {"version": "95", "sha256": "0myj4g5351fi04w3iwpshjhy9a5vgq85nwd186ymlvnjby12d6fh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi4iLAogICJuYW1lIjogIkdpdGh1YiBBY3Rpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhcm9ub25ha0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdpdGh1Yi1hY3Rpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcm9ub25hay9naXRodWItYWN0aW9ucy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGh1Yi1hY3Rpb25zQGFyb25vbmFrLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5NQp9"}, "44": {"version": "95", "sha256": "0myj4g5351fi04w3iwpshjhy9a5vgq85nwd186ymlvnjby12d6fh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi4iLAogICJuYW1lIjogIkdpdGh1YiBBY3Rpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhcm9ub25ha0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdpdGh1Yi1hY3Rpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcm9ub25hay9naXRodWItYWN0aW9ucy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGh1Yi1hY3Rpb25zQGFyb25vbmFrLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5NQp9"}, - "45": {"version": "132", "sha256": "1q3xan9sr06ymkp2ywwwfk4xkhz2gqvylqxc5njch89n4gjwg5kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi5cblxuVmVyc2lvbnMgYmVsb3cgZ25vbWUgNDUgd2lsbCBubyBsb25nZXIgYmUgc3VwcG9ydGVkIDovIiwKICAibmFtZSI6ICJHaXRodWIgQWN0aW9ucyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiYXJvbm9uYWtAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5naXRodWItYWN0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJvbm9uYWsvZ2l0aHViLWFjdGlvbnMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRodWItYWN0aW9uc0Bhcm9ub25hay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMyCn0="}, - "46": {"version": "132", "sha256": "1q3xan9sr06ymkp2ywwwfk4xkhz2gqvylqxc5njch89n4gjwg5kf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi5cblxuVmVyc2lvbnMgYmVsb3cgZ25vbWUgNDUgd2lsbCBubyBsb25nZXIgYmUgc3VwcG9ydGVkIDovIiwKICAibmFtZSI6ICJHaXRodWIgQWN0aW9ucyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiYXJvbm9uYWtAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5naXRodWItYWN0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJvbm9uYWsvZ2l0aHViLWFjdGlvbnMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRodWItYWN0aW9uc0Bhcm9ub25hay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMyCn0="} + "45": {"version": "135", "sha256": "1mas611qax46pyn9r953z3b1jp1n7r9wd7z7s3ifqq4038ihywck", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi5cblxuVmVyc2lvbnMgYmVsb3cgZ25vbWUgNDUgd2lsbCBubyBsb25nZXIgYmUgc3VwcG9ydGVkIDovIiwKICAibmFtZSI6ICJHaXRodWIgQWN0aW9ucyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiYXJvbm9uYWtAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5naXRodWItYWN0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJvbm9uYWsvZ2l0aHViLWFjdGlvbnMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRodWItYWN0aW9uc0Bhcm9ub25hay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTM1Cn0="}, + "46": {"version": "135", "sha256": "1mas611qax46pyn9r953z3b1jp1n7r9wd7z7s3ifqq4038ihywck", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi5cblxuVmVyc2lvbnMgYmVsb3cgZ25vbWUgNDUgd2lsbCBubyBsb25nZXIgYmUgc3VwcG9ydGVkIDovIiwKICAibmFtZSI6ICJHaXRodWIgQWN0aW9ucyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiYXJvbm9uYWtAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5naXRodWItYWN0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJvbm9uYWsvZ2l0aHViLWFjdGlvbnMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRodWItYWN0aW9uc0Bhcm9ub25hay5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTM1Cn0="} }} , {"uuid": "dim-completed-calendar-events@marcinjahn.com", "name": "Dim Completed Calendar Events", "pname": "dim-completed-calendar-events", "description": "Dim completed events in the top panel menu to easily distinguish between upcoming and past events. You can also highlight events that are ongoing.", "link": "https://extensions.gnome.org/extension/5979/dim-completed-calendar-events/", "shell_version_map": { "44": {"version": "3", "sha256": "0dpyrhdc70f77wv8hx7d6xnpxx13c2qfp7dbx716mqq90raij39f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSBjb21wbGV0ZWQgZXZlbnRzIGluIHRoZSB0b3AgcGFuZWwgbWVudSB0byBlYXNpbHkgZGlzdGluZ3Vpc2ggYmV0d2VlbiB1cGNvbWluZyBhbmQgcGFzdCBldmVudHMuIFlvdSBjYW4gYWxzbyBoaWdobGlnaHQgZXZlbnRzIHRoYXQgYXJlIG9uZ29pbmcuIiwKICAibmFtZSI6ICJEaW0gQ29tcGxldGVkIENhbGVuZGFyIEV2ZW50cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLWRpbS1jb21wbGV0ZWQtY2FsZW5kYXItZXZlbnRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLWNvbXBsZXRlZC1jYWxlbmRhci1ldmVudHNAbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, @@ -6199,7 +6234,8 @@ }} , {"uuid": "happy-appy-hotkey@jqno.nl", "name": "Happy Appy Hotkey", "pname": "happy-appy-hotkey", "description": "Assign hotkeys to applications to give them focus or launch them\n\nFeatures:\n- Assign a hotkey to an app to:\n-- Give it focus if it's already running, or\n-- Launch it if it's not.\n- Assign a hotkey to cycle through all the apps that don't have a hotkey\n- Optionally restrict hotkeys to current workspace\n- Supports Wayland", "link": "https://extensions.gnome.org/extension/6057/happy-appy-hotkey/", "shell_version_map": { "44": {"version": "3", "sha256": "0fg9967jwsp24pphv1bdiz6fns2kslrg3dx4xq4q894aiwxzagrv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzc2lnbiBob3RrZXlzIHRvIGFwcGxpY2F0aW9ucyB0byBnaXZlIHRoZW0gZm9jdXMgb3IgbGF1bmNoIHRoZW1cblxuRmVhdHVyZXM6XG4tIEFzc2lnbiBhIGhvdGtleSB0byBhbiBhcHAgdG86XG4tLSBHaXZlIGl0IGZvY3VzIGlmIGl0J3MgYWxyZWFkeSBydW5uaW5nLCBvclxuLS0gTGF1bmNoIGl0IGlmIGl0J3Mgbm90LlxuLSBBc3NpZ24gYSBob3RrZXkgdG8gY3ljbGUgdGhyb3VnaCBhbGwgdGhlIGFwcHMgdGhhdCBkb24ndCBoYXZlIGEgaG90a2V5XG4tIFN1cHBvcnRzIFdheWxhbmQiLAogICJuYW1lIjogIkhhcHB5IEFwcHkgSG90a2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pxbm8vZ25vbWUtaGFwcHktYXBweS1ob3RrZXkvIiwKICAidXVpZCI6ICJoYXBweS1hcHB5LWhvdGtleUBqcW5vLm5sIiwKICAidmVyc2lvbiI6IDMKfQ=="}, - "45": {"version": "7", "sha256": "06fsmszy4mg1x89w578mc5hsm9hnfgmyls0hl2nzp2fh1dqdpbmf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzc2lnbiBob3RrZXlzIHRvIGFwcGxpY2F0aW9ucyB0byBnaXZlIHRoZW0gZm9jdXMgb3IgbGF1bmNoIHRoZW1cblxuRmVhdHVyZXM6XG4tIEFzc2lnbiBhIGhvdGtleSB0byBhbiBhcHAgdG86XG4tLSBHaXZlIGl0IGZvY3VzIGlmIGl0J3MgYWxyZWFkeSBydW5uaW5nLCBvclxuLS0gTGF1bmNoIGl0IGlmIGl0J3Mgbm90LlxuLSBBc3NpZ24gYSBob3RrZXkgdG8gY3ljbGUgdGhyb3VnaCBhbGwgdGhlIGFwcHMgdGhhdCBkb24ndCBoYXZlIGEgaG90a2V5XG4tIE9wdGlvbmFsbHkgcmVzdHJpY3QgaG90a2V5cyB0byBjdXJyZW50IHdvcmtzcGFjZVxuLSBTdXBwb3J0cyBXYXlsYW5kIiwKICAibmFtZSI6ICJIYXBweSBBcHB5IEhvdGtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qcW5vL2dub21lLWhhcHB5LWFwcHktaG90a2V5LyIsCiAgInV1aWQiOiAiaGFwcHktYXBweS1ob3RrZXlAanFuby5ubCIsCiAgInZlcnNpb24iOiA3Cn0="} + "45": {"version": "8", "sha256": "1bwmnrlnma0nrvzzy7ng4kbag4p93nvnczp3pff6ajnmsqzp9hfh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzc2lnbiBob3RrZXlzIHRvIGFwcGxpY2F0aW9ucyB0byBnaXZlIHRoZW0gZm9jdXMgb3IgbGF1bmNoIHRoZW1cblxuRmVhdHVyZXM6XG4tIEFzc2lnbiBhIGhvdGtleSB0byBhbiBhcHAgdG86XG4tLSBHaXZlIGl0IGZvY3VzIGlmIGl0J3MgYWxyZWFkeSBydW5uaW5nLCBvclxuLS0gTGF1bmNoIGl0IGlmIGl0J3Mgbm90LlxuLSBBc3NpZ24gYSBob3RrZXkgdG8gY3ljbGUgdGhyb3VnaCBhbGwgdGhlIGFwcHMgdGhhdCBkb24ndCBoYXZlIGEgaG90a2V5XG4tIE9wdGlvbmFsbHkgcmVzdHJpY3QgaG90a2V5cyB0byBjdXJyZW50IHdvcmtzcGFjZVxuLSBTdXBwb3J0cyBXYXlsYW5kIiwKICAibmFtZSI6ICJIYXBweSBBcHB5IEhvdGtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1oYXBweS1hcHB5LWhvdGtleS8iLAogICJ1dWlkIjogImhhcHB5LWFwcHktaG90a2V5QGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogOAp9"}, + "46": {"version": "8", "sha256": "1bwmnrlnma0nrvzzy7ng4kbag4p93nvnczp3pff6ajnmsqzp9hfh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzc2lnbiBob3RrZXlzIHRvIGFwcGxpY2F0aW9ucyB0byBnaXZlIHRoZW0gZm9jdXMgb3IgbGF1bmNoIHRoZW1cblxuRmVhdHVyZXM6XG4tIEFzc2lnbiBhIGhvdGtleSB0byBhbiBhcHAgdG86XG4tLSBHaXZlIGl0IGZvY3VzIGlmIGl0J3MgYWxyZWFkeSBydW5uaW5nLCBvclxuLS0gTGF1bmNoIGl0IGlmIGl0J3Mgbm90LlxuLSBBc3NpZ24gYSBob3RrZXkgdG8gY3ljbGUgdGhyb3VnaCBhbGwgdGhlIGFwcHMgdGhhdCBkb24ndCBoYXZlIGEgaG90a2V5XG4tIE9wdGlvbmFsbHkgcmVzdHJpY3QgaG90a2V5cyB0byBjdXJyZW50IHdvcmtzcGFjZVxuLSBTdXBwb3J0cyBXYXlsYW5kIiwKICAibmFtZSI6ICJIYXBweSBBcHB5IEhvdGtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1oYXBweS1hcHB5LWhvdGtleS8iLAogICJ1dWlkIjogImhhcHB5LWFwcHktaG90a2V5QGpxbm8ubmwiLAogICJ2ZXJzaW9uIjogOAp9"} }} , {"uuid": "window-switcher@tbepdb", "name": "WindowSwitcher", "pname": "windowswitcher", "description": "One windows circle with Alt+tab. Another one with Super+tab(in my case instant messangers).", "link": "https://extensions.gnome.org/extension/6060/windowswitcher/", "shell_version_map": { "42": {"version": "2", "sha256": "1lgs3mr9384az7ybjbxpxz4dndwypz98awyg1qz8k7sfl631w3n7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbXVsdGlwbGUgd2luZG93IGJhc2VkIHN3aXRjaGVycy4iLAogICJleHRlbnNpb24taWQiOiAid2luZG93LXN3aXRjaGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvdy1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiV2luZG93U3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJlcGRiL3dpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAid2luZG93LXN3aXRjaGVyQHRiZXBkYiIsCiAgInZlcnNpb24iOiAyCn0="}, @@ -6221,9 +6257,10 @@ "45": {"version": "23", "sha256": "0nm9jy3f7ryyylwrgwxrbmk5ffj680adrpb1dkwy3y2px1fdmhk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHN3aXRjaGluZyBvZiBpbnB1dCBtZXRob2QgYW5kIHRvdWNocGFkIHdpdGggdXNlciBjb25maWd1cmFibGUgc2hvcnRjdXQgYmluZGluZyIsCiAgIm5hbWUiOiAiSW5wdXQgbWV0aG9kIGFuZCB0b3VjaHBhZCBzaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW5wdXRtZXRob2Qtc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vc2FtdWFva2kvaW5wdXRtZXRob2Qtc2hvcnRjdXRzIiwKICAidXVpZCI6ICJpbnB1dG1ldGhvZC1zaG9ydGN1dHNAb3NhbXUuZGViaWFuLm9yZyIsCiAgInZlcnNpb24iOiAyMwp9"}, "46": {"version": "23", "sha256": "0nm9jy3f7ryyylwrgwxrbmk5ffj680adrpb1dkwy3y2px1fdmhk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHN3aXRjaGluZyBvZiBpbnB1dCBtZXRob2QgYW5kIHRvdWNocGFkIHdpdGggdXNlciBjb25maWd1cmFibGUgc2hvcnRjdXQgYmluZGluZyIsCiAgIm5hbWUiOiAiSW5wdXQgbWV0aG9kIGFuZCB0b3VjaHBhZCBzaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW5wdXRtZXRob2Qtc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vc2FtdWFva2kvaW5wdXRtZXRob2Qtc2hvcnRjdXRzIiwKICAidXVpZCI6ICJpbnB1dG1ldGhvZC1zaG9ydGN1dHNAb3NhbXUuZGViaWFuLm9yZyIsCiAgInZlcnNpb24iOiAyMwp9"} }} -, {"uuid": "kmonad-toggle@jurf.github.io", "name": "KMonad Toggle", "pname": "kmonad-toggle", "description": "Quickly turn your programmable keyboard into a normal one if someone else needs to use your computer!\n\nThis extension allows you to:\n • Toggle KMonad on or off with a quick setting\n • Autostart KMonad on login\n • Quickly check if KMonad is running from the top bar\n • Easily configure the KMonad launch command\n\nDo you miss any functionality in this extension? Feel free to open an issue on GitHub!\n\nNote: This extension does not manage the KMonad installation. See the installation guide and FAQ in the KMonad repo for instructions on how to set it up. https://github.com/kmonad/kmonad", "link": "https://extensions.gnome.org/extension/6069/kmonad-toggle/", "shell_version_map": { +, {"uuid": "kmonad-toggle@jurf.github.io", "name": "KMonad Toggle", "pname": "kmonad-toggle", "description": "Is your keyboard unusable for other people? Toggle it with one click!\n\nThis extension allows you to:\n • Toggle KMonad on or off with a quick setting\n • Autostart KMonad on login\n • Quickly check if KMonad is running from the top bar\n • Easily configure the KMonad launch command\n\nDo you miss any functionality in this extension? Feel free to open an issue on GitHub!\n\nNote: This extension does not manage the KMonad installation. See the installation guide and FAQ in the KMonad repo for instructions on how to set it up. https://github.com/kmonad/kmonad", "link": "https://extensions.gnome.org/extension/6069/kmonad-toggle/", "shell_version_map": { "44": {"version": "6", "sha256": "12d7zh3mrxjaippm0n1dwfwhai88iwdy3pb34m24km73g7nwln97", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgS01vbmFkIGRpcmVjdGx5IGZyb20gR05PTUUgU2hlbGwhXG5cblRoaXMgZXh0ZW5zaW9uIGFsbG93cyB5b3UgdG86XG4gXHUyMDIyIEF1dG9zdGFydCBLTW9uYWQgb24gbG9naW5cbiBcdTIwMjIgUXVpY2tseSBjaGVjayBpZiBLTW9uYWQgaXMgcnVubmluZyBmcm9tIHRoZSB0b3AgYmFyXG4gXHUyMDIyIFRvZ2dsZSBLTW9uYWQgb24gb3Igb2ZmIHdpdGggYSBxdWljayBzZXR0aW5nXG4gXHUyMDIyIEVhc2lseSBjb25maWd1cmUgdGhlIEtNb25hZCBsYXVuY2ggY29tbWFuZFxuXG5Ob3RlOiBUaGlzIGV4dGVuc2lvbiBkb2VzIG5vdCBtYW5hZ2UgdGhlIEtNb25hZCBpbnN0YWxsYXRpb24uIFNlZSB0aGUgaW5zdGFsbGF0aW9uIGd1aWRlIGFuZCBGQVEgaW4gdGhlIEtNb25hZCByZXBvIGZvciBpbnN0cnVjdGlvbnMgb24gaG93IHRvIHNldCBpdCB1cC4gaHR0cHM6Ly9naXRodWIuY29tL2ttb25hZC9rbW9uYWQiLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJqdXJhamZpYWxhIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImttb25hZC10b2dnbGUiLAogICJuYW1lIjogIktNb25hZCBUb2dnbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua21vbmFkLXRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qdXJmL2dub21lLWttb25hZC10b2dnbGUiLAogICJ1dWlkIjogImttb25hZC10b2dnbGVAanVyZi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, - "45": {"version": "8", "sha256": "07nfl4ndvkp58q7c1z5yy3cj9ffxxkzgrq41zs4bp213qz20192j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgS01vbmFkIGRpcmVjdGx5IGZyb20gR05PTUUgU2hlbGwhXG5cblRoaXMgZXh0ZW5zaW9uIGFsbG93cyB5b3UgdG86XG4gXHUyMDIyIEF1dG9zdGFydCBLTW9uYWQgb24gbG9naW5cbiBcdTIwMjIgUXVpY2tseSBjaGVjayBpZiBLTW9uYWQgaXMgcnVubmluZyBmcm9tIHRoZSB0b3AgYmFyXG4gXHUyMDIyIFRvZ2dsZSBLTW9uYWQgb24gb3Igb2ZmIHdpdGggYSBxdWljayBzZXR0aW5nXG4gXHUyMDIyIEVhc2lseSBjb25maWd1cmUgdGhlIEtNb25hZCBsYXVuY2ggY29tbWFuZFxuXG5Ob3RlOiBUaGlzIGV4dGVuc2lvbiBkb2VzIG5vdCBtYW5hZ2UgdGhlIEtNb25hZCBpbnN0YWxsYXRpb24uIFNlZSB0aGUgaW5zdGFsbGF0aW9uIGd1aWRlIGFuZCBGQVEgaW4gdGhlIEtNb25hZCByZXBvIGZvciBpbnN0cnVjdGlvbnMgb24gaG93IHRvIHNldCBpdCB1cC4gaHR0cHM6Ly9naXRodWIuY29tL2ttb25hZC9rbW9uYWQiLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJqdXJhamZpYWxhIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImttb25hZC10b2dnbGUiLAogICJuYW1lIjogIktNb25hZCBUb2dnbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua21vbmFkLXRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qdXJmL2dub21lLWttb25hZC10b2dnbGUiLAogICJ1dWlkIjogImttb25hZC10b2dnbGVAanVyZi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"} + "45": {"version": "9", "sha256": "00ryps0858lq6war7360fy8y315g2y7pqlyrj6f66a6x8y1fx1b8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIHlvdXIga2V5Ym9hcmQgdW51c2FibGUgZm9yIG90aGVyIHBlb3BsZT8gVG9nZ2xlIGl0IHdpdGggb25lIGNsaWNrIVxuXG5UaGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvOlxuIFx1MjAyMiBUb2dnbGUgS01vbmFkIG9uIG9yIG9mZiB3aXRoIGEgcXVpY2sgc2V0dGluZ1xuIFx1MjAyMiBBdXRvc3RhcnQgS01vbmFkIG9uIGxvZ2luXG4gXHUyMDIyIFF1aWNrbHkgY2hlY2sgaWYgS01vbmFkIGlzIHJ1bm5pbmcgZnJvbSB0aGUgdG9wIGJhclxuIFx1MjAyMiBFYXNpbHkgY29uZmlndXJlIHRoZSBLTW9uYWQgbGF1bmNoIGNvbW1hbmRcblxuRG8geW91IG1pc3MgYW55IGZ1bmN0aW9uYWxpdHkgaW4gdGhpcyBleHRlbnNpb24/IEZlZWwgZnJlZSB0byBvcGVuIGFuIGlzc3VlIG9uIEdpdEh1YiFcblxuTm90ZTogVGhpcyBleHRlbnNpb24gZG9lcyBub3QgbWFuYWdlIHRoZSBLTW9uYWQgaW5zdGFsbGF0aW9uLiBTZWUgdGhlIGluc3RhbGxhdGlvbiBndWlkZSBhbmQgRkFRIGluIHRoZSBLTW9uYWQgcmVwbyBmb3IgaW5zdHJ1Y3Rpb25zIG9uIGhvdyB0byBzZXQgaXQgdXAuIGh0dHBzOi8vZ2l0aHViLmNvbS9rbW9uYWQva21vbmFkIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAianVyYWpmaWFsYSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJrbW9uYWQtdG9nZ2xlIiwKICAibmFtZSI6ICJLTW9uYWQgVG9nZ2xlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmttb25hZC10b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2p1cmYvZ25vbWUta21vbmFkLXRvZ2dsZSIsCiAgInV1aWQiOiAia21vbmFkLXRvZ2dsZUBqdXJmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, + "46": {"version": "9", "sha256": "00ryps0858lq6war7360fy8y315g2y7pqlyrj6f66a6x8y1fx1b8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIHlvdXIga2V5Ym9hcmQgdW51c2FibGUgZm9yIG90aGVyIHBlb3BsZT8gVG9nZ2xlIGl0IHdpdGggb25lIGNsaWNrIVxuXG5UaGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvOlxuIFx1MjAyMiBUb2dnbGUgS01vbmFkIG9uIG9yIG9mZiB3aXRoIGEgcXVpY2sgc2V0dGluZ1xuIFx1MjAyMiBBdXRvc3RhcnQgS01vbmFkIG9uIGxvZ2luXG4gXHUyMDIyIFF1aWNrbHkgY2hlY2sgaWYgS01vbmFkIGlzIHJ1bm5pbmcgZnJvbSB0aGUgdG9wIGJhclxuIFx1MjAyMiBFYXNpbHkgY29uZmlndXJlIHRoZSBLTW9uYWQgbGF1bmNoIGNvbW1hbmRcblxuRG8geW91IG1pc3MgYW55IGZ1bmN0aW9uYWxpdHkgaW4gdGhpcyBleHRlbnNpb24/IEZlZWwgZnJlZSB0byBvcGVuIGFuIGlzc3VlIG9uIEdpdEh1YiFcblxuTm90ZTogVGhpcyBleHRlbnNpb24gZG9lcyBub3QgbWFuYWdlIHRoZSBLTW9uYWQgaW5zdGFsbGF0aW9uLiBTZWUgdGhlIGluc3RhbGxhdGlvbiBndWlkZSBhbmQgRkFRIGluIHRoZSBLTW9uYWQgcmVwbyBmb3IgaW5zdHJ1Y3Rpb25zIG9uIGhvdyB0byBzZXQgaXQgdXAuIGh0dHBzOi8vZ2l0aHViLmNvbS9rbW9uYWQva21vbmFkIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAianVyYWpmaWFsYSIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJrbW9uYWQtdG9nZ2xlIiwKICAibmFtZSI6ICJLTW9uYWQgVG9nZ2xlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmttb25hZC10b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2p1cmYvZ25vbWUta21vbmFkLXRvZ2dsZSIsCiAgInV1aWQiOiAia21vbmFkLXRvZ2dsZUBqdXJmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="} }} , {"uuid": "fullscreen-to-empty-workspace@aiono.dev", "name": "Fullscreen to Empty Workspace", "pname": "fullscreen-to-empty-workspace", "description": "New, maximized and fullscreen windows will be moved to empty workspaces.\nForked from https://github.com/kaiseracm/gnome-shell-extension-maximize-to-empty-workspace.", "link": "https://extensions.gnome.org/extension/6072/fullscreen-to-empty-workspace/", "shell_version_map": { "38": {"version": "5", "sha256": "0bsl6iwrjkf0jn4j6y7m7jprxrjmr60alwj613nzxdnqqpawiq3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldywgbWF4aW1pemVkIGFuZCBmdWxsc2NyZWVuIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuRm9ya2VkIGZyb20gaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiB0byBFbXB0eSBXb3Jrc3BhY2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZnVsbHNjcmVlbi10by1lbXB0eS13b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29uc2FoL2Z1bGxzY3JlZW4tdG8tbmV3LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi10by1lbXB0eS13b3Jrc3BhY2VAYWlvbm8uZGV2IiwKICAidmVyc2lvbiI6IDUKfQ=="}, @@ -6240,7 +6277,8 @@ "42": {"version": "7", "sha256": "1xbyn41h7kynm0ydj6qsh05rzd11n0zclwvmh5ypzzk5h6lml99s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "7", "sha256": "1xbyn41h7kynm0ydj6qsh05rzd11n0zclwvmh5ypzzk5h6lml99s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "44": {"version": "7", "sha256": "1xbyn41h7kynm0ydj6qsh05rzd11n0zclwvmh5ypzzk5h6lml99s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, - "45": {"version": "8", "sha256": "0nzf3a7sjvqn8my94zpgld8njpgklijf7hzh7anivl1fxyys9pvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hpZGRuL2ZpeC1mb2N1cy1vbi13b3Jrc3BhY2Utc3dpdGNoIiwKICAidXVpZCI6ICJmaXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaEBoaWRkbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="} + "45": {"version": "10", "sha256": "0hphxhhc0s0nwlcxjjk2ppja2xn37c1s2ij5y0x6is4yi3xiv5il", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, + "46": {"version": "10", "sha256": "0hphxhhc0s0nwlcxjjk2ppja2xn37c1s2ij5y0x6is4yi3xiv5il", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYSB3b3Jrc3BhY2Ugc3dpdGNoIG9jY3VycywgdGhpcyBleHRlbnNpb24gZW5zdXJlcyB0aGUgZm9jdXMgaXMgb24gYSB3aW5kb3cgbG9jYXRlZCBpbiB0aGUgbmV3IHdvcmtzcGFjZS5cblxuVGhpcyBleHRlbnNpb24gaXMgZXNzZW50aWFsIGZvciBhIG11bHRpLW1vbml0b3Igc2V0dXAgdXNpbmcgbXVsdGlwbGUgd29ya3NwYWNlcy4iLAogICJuYW1lIjogIkZpeCBmb2N1cyBvbiB3b3Jrc3BhY2Ugc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oaWRkbi9maXgtZm9jdXMtb24td29ya3NwYWNlLXN3aXRjaCIsCiAgInV1aWQiOiAiZml4LWZvY3VzLW9uLXdvcmtzcGFjZS1zd2l0Y2hAaGlkZG4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"} }} , {"uuid": "showip@lacodificadora.com", "name": "Show Public IP", "pname": "show-current-public-ip", "description": "Simple GNOME Shell Extension that shows your current public IP address. It's retrieved by a curl command to ip.lacodificadora.com", "link": "https://extensions.gnome.org/extension/6087/show-current-public-ip/", "shell_version_map": { "40": {"version": "11", "sha256": "0ij134h3nxk9lvi1zxk49n5b022gx893g41xhkpz6anci462mzz5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBFeHRlbnNpb24gdGhhdCBzaG93cyB5b3VyIGN1cnJlbnQgcHVibGljIElQIGFkZHJlc3MuIEl0J3MgcmV0cmlldmVkIGJ5IGEgY3VybCBjb21tYW5kIHRvIGlwLmxhY29kaWZpY2Fkb3JhLmNvbSIsCiAgIm5hbWUiOiAiU2hvdyBwdWJsaWMgSVAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsY2FtaWxldC9zaG93LWlwLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2hvd2lwQGxhY29kaWZpY2Fkb3JhLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, @@ -6260,8 +6298,8 @@ "42": {"version": "71", "sha256": "1w626hadaskid3dn39ab4nm9d3sky852rjng4vy4l62a46xvrn7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNzEsCiAgInZlcnNpb24tbmFtZSI6ICI0NC4xNy4wIgp9"}, "43": {"version": "71", "sha256": "1w626hadaskid3dn39ab4nm9d3sky852rjng4vy4l62a46xvrn7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNzEsCiAgInZlcnNpb24tbmFtZSI6ICI0NC4xNy4wIgp9"}, "44": {"version": "71", "sha256": "1w626hadaskid3dn39ab4nm9d3sky852rjng4vy4l62a46xvrn7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNzEsCiAgInZlcnNpb24tbmFtZSI6ICI0NC4xNy4wIgp9"}, - "45": {"version": "93", "sha256": "192kmjrnbah8nwa1z733yjl10j4gqb99m9i87qkyg6z0w2dk2kml", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImpheXRhYWxhIiwKICAgICJwYXRyZW9uIjogInZhbHBhY2tldHQiCiAgfSwKICAibmFtZSI6ICJQYXBlcldNIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhcGVyd20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOTMsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni40LjEiCn0="}, - "46": {"version": "93", "sha256": "192kmjrnbah8nwa1z733yjl10j4gqb99m9i87qkyg6z0w2dk2kml", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImpheXRhYWxhIiwKICAgICJwYXRyZW9uIjogInZhbHBhY2tldHQiCiAgfSwKICAibmFtZSI6ICJQYXBlcldNIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhcGVyd20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOTMsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni40LjEiCn0="} + "45": {"version": "100", "sha256": "0b6sl818smh6l5jdmcr4qq9jxn0111rrk2zsl0r9zfdxsd12g05n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImpheXRhYWxhIiwKICAgICJwYXRyZW9uIjogInZhbHBhY2tldHQiCiAgfSwKICAibmFtZSI6ICJQYXBlcldNIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhcGVyd20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAwLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuNi40Igp9"}, + "46": {"version": "100", "sha256": "0b6sl818smh6l5jdmcr4qq9jxn0111rrk2zsl0r9zfdxsd12g05n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImpheXRhYWxhIiwKICAgICJwYXRyZW9uIjogInZhbHBhY2tldHQiCiAgfSwKICAibmFtZSI6ICJQYXBlcldNIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhcGVyd20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAwLAogICJ2ZXJzaW9uLW5hbWUiOiAiNDYuNi40Igp9"} }} , {"uuid": "lightshell@dikasp.gitlab", "name": "Light Shell", "pname": "light-shell", "description": "the missing full light style gnome shell theme you had been looking for :D\n\nNOTE: later release are merged and continue within Luminus extension. brings various improvement and dark mode integration.", "link": "https://extensions.gnome.org/extension/6102/light-shell/", "shell_version_map": { "42": {"version": "11", "sha256": "0fqshl06w2amy8d3gw2car4rab6zqpi79dg5dr05d5swggq1vm8n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGx5IGZ1bGwgbGlnaHQgdGhlbWUgaW50byBkZWZhdWx0IGdub21lIHNoZWxsLCBpbmNsdWRpbmcgbGlnaHQgb3ZlcnZpZXcuIiwKICAibmFtZSI6ICJMaWdodCBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2xpZ2h0LXNoZWxsIiwKICAidXVpZCI6ICJsaWdodHNoZWxsQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, @@ -6476,8 +6514,8 @@ "44": {"version": "2", "sha256": "0yhczb1cbh39ryrk2zw5nqmda819h748pdslpm0rxn4jy3dzpn4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBzYW1lIGFzIFdvcmtzcGFjZSBJbmRpY2F0b3IsIGJ1dCBvbiB0aGUgbGVmdCBsaWtlIHN3YXl3bS5cblxuSXQgaXMgYSBmb3JrIG9mIFdvcmtzcGFjZSBJbmRpY2F0b3IgYnkgZm11ZWxsbmVyLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yLWxlZnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvci1sZWZ0IiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgSW5kaWNhdG9yIExlZnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3VzdGF2b210Ym9yZ2VzL2dub21lLXdvcmtzcGFjZS1pbmRpY2F0b3ItbGVmdC5naXQiLAogICJ1dWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3ItbGVmdEBnbXRib3JnZXMuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="} }} , {"uuid": "quake-terminal@diegodario88.github.io", "name": "Quake Terminal", "pname": "quake-terminal", "description": "Quickly launch a terminal in Quake mode using a keyboard shortcut", "link": "https://extensions.gnome.org/extension/6307/quake-terminal/", "shell_version_map": { - "45": {"version": "19", "sha256": "01s0w36g107k5i758i1xmrrfrmw5639gv6rgqm4frjzzjy8q3dqa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kaWVnb2RhcmlvODgvcXVha2UtdGVybWluYWwiLAogICJ1dWlkIjogInF1YWtlLXRlcm1pbmFsQGRpZWdvZGFyaW84OC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTksCiAgInZlcnNpb24tbmFtZSI6ICIxLjYuMiIKfQ=="}, - "46": {"version": "19", "sha256": "01s0w36g107k5i758i1xmrrfrmw5639gv6rgqm4frjzzjy8q3dqa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kaWVnb2RhcmlvODgvcXVha2UtdGVybWluYWwiLAogICJ1dWlkIjogInF1YWtlLXRlcm1pbmFsQGRpZWdvZGFyaW84OC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTksCiAgInZlcnNpb24tbmFtZSI6ICIxLjYuMiIKfQ=="} + "45": {"version": "20", "sha256": "0xa9k504sny6b6d15ypx92w517y7jyqhh3r8xi87489grzyx6lgz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kaWVnb2RhcmlvODgvcXVha2UtdGVybWluYWwiLAogICJ1dWlkIjogInF1YWtlLXRlcm1pbmFsQGRpZWdvZGFyaW84OC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjAsCiAgInZlcnNpb24tbmFtZSI6ICIxLjYuMyIKfQ=="}, + "46": {"version": "20", "sha256": "0xa9k504sny6b6d15ypx92w517y7jyqhh3r8xi87489grzyx6lgz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kaWVnb2RhcmlvODgvcXVha2UtdGVybWluYWwiLAogICJ1dWlkIjogInF1YWtlLXRlcm1pbmFsQGRpZWdvZGFyaW84OC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjAsCiAgInZlcnNpb24tbmFtZSI6ICIxLjYuMyIKfQ=="} }} , {"uuid": "window-title-is-back@fthx", "name": "Window title is back", "pname": "window-title-is-back", "description": "Focused window icon + app name + title + menu in the top bar.\n\n Options in preferences UI: toggle items, colored icon, icon size.", "link": "https://extensions.gnome.org/extension/6310/window-title-is-back/", "shell_version_map": { "45": {"version": "26", "sha256": "16wfrl47211cpcka5brfpdijvwinb83xn37522508jqby41hccwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzZWQgd2luZG93IGljb24gKyBhcHAgbmFtZSArIHRpdGxlICsgbWVudSBpbiB0aGUgdG9wIGJhci5cblxuIE9wdGlvbnMgaW4gcHJlZmVyZW5jZXMgVUk6IHRvZ2dsZSBpdGVtcywgY29sb3JlZCBpY29uLCBpY29uIHNpemUuIiwKICAibmFtZSI6ICJXaW5kb3cgdGl0bGUgaXMgYmFjayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGl0bGUtaXMtYmFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3dpbmRvdy10aXRsZS1pcy1iYWNrIiwKICAidXVpZCI6ICJ3aW5kb3ctdGl0bGUtaXMtYmFja0BmdGh4IiwKICAidmVyc2lvbiI6IDI2Cn0="}, @@ -6498,8 +6536,8 @@ "42": {"version": "3", "sha256": "1jh39196758jn7yffb1dlzg4w49rn9934vdmbnh3bvw5a5q88abv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "1jh39196758jn7yffb1dlzg4w49rn9934vdmbnh3bvw5a5q88abv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}, "44": {"version": "3", "sha256": "1jh39196758jn7yffb1dlzg4w49rn9934vdmbnh3bvw5a5q88abv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}, - "45": {"version": "7", "sha256": "18igv70a1sk40jd6lb7aks2wkc6i19ixqwk3c6gxpk67apkk5c7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"}, - "46": {"version": "7", "sha256": "18igv70a1sk40jd6lb7aks2wkc6i19ixqwk3c6gxpk67apkk5c7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogNwp9"} + "45": {"version": "9", "sha256": "0mbm5r45pwpmqphy6kyzlrg52yw1fqzgisp7pklg895x4wqvw8sp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogOQp9"}, + "46": {"version": "9", "sha256": "0mbm5r45pwpmqphy6kyzlrg52yw1fqzgisp7pklg895x4wqvw8sp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZXMgaW5kaWNhdG9yIGZvciBEZWJpYW4gTGludXggYmFzZWQgZGlzdHJpYnV0aW9ucy5cblxuQ2hlY2sgZm9yIHVwZGF0ZXMgYW5kIHNob3dzIGFsc28gdGhlIGZvbGxvd2luZyBwYWNrYWdlcyBzdGF0dXMgKGFzIGluIFN5bmFwdGljKTpcblx1MjZhYiBBdmFpbGFibGUgdXBkYXRlcy5cblx1MjZhYiBOZXcgcGFja2FnZXMgaW4gcmVwb3NpdG9yeS5cblx1MjZhYiBMb2NhbC9PYnNvbGV0ZSBwYWNrYWdlcy5cblx1MjZhYiBSZXNpZHVhbCBjb25maWcgZmlsZXMuXG5cdTI2YWIgQXV0b3JlbW92YWJsZSBwYWNrYWdlcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJnbGVycm8iCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiRGViaWFuIExpbnV4IFVwZGF0ZXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlYmlhbi11cGRhdGVzLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWJpYW4tdXBkYXRlcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRlYmlhbi11cGRhdGVzLWluZGljYXRvckBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogOQp9"} }} , {"uuid": "monitor-brightness-volume@ailin.nemui", "name": "Control monitor brightness and volume with ddcutil", "pname": "control-monitor-brightness-and-volume-with-ddcutil", "description": "Brightness and volume control for monitors. Requires setting up the external ddcutil program for your user.\n\nNote: ensure that ddcutil works properly on the command line before attempting this extension.", "link": "https://extensions.gnome.org/extension/6325/control-monitor-brightness-and-volume-with-ddcutil/", "shell_version_map": { "45": {"version": "5", "sha256": "06mllpwvrwzjbdia339dn5p5bzngvrl3yiflr14180mlcg1yfx69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiQnJpZ2h0bmVzcyBhbmQgdm9sdW1lIGNvbnRyb2wgZm9yIG1vbml0b3JzLiBSZXF1aXJlcyBzZXR0aW5nIHVwIHRoZSBleHRlcm5hbCBkZGN1dGlsIHByb2dyYW0gZm9yIHlvdXIgdXNlci5cblxuTm90ZTogZW5zdXJlIHRoYXQgZGRjdXRpbCB3b3JrcyBwcm9wZXJseSBvbiB0aGUgY29tbWFuZCBsaW5lIGJlZm9yZSBhdHRlbXB0aW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImFpbGluIgogIH0sCiAgIm5hbWUiOiAiQ29udHJvbCBtb25pdG9yIGJyaWdodG5lc3MgYW5kIHZvbHVtZSB3aXRoIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubW9uaXRvci1icmlnaHRuZXNzLXZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvTmVpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb25pdG9yLWJyaWdodG5lc3Mtdm9sdW1lLy0vaXNzdWVzIiwKICAidXVpZCI6ICJtb25pdG9yLWJyaWdodG5lc3Mtdm9sdW1lQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDUKfQ=="}, @@ -6635,7 +6673,8 @@ "45": {"version": "2", "sha256": "1dfjz3spbbk18wr1jsp6xbky3mc7d64zbpxpxg4bgvv39j1gz337", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJSZW11bG8gQ29zdGEgPHJlbXVsby5jb3N0YUBnbWFpbC5jb20+IiwKICAiZGVzY3JpcHRpb24iOiAiU3lzdGVtU3RhdHNQbHVzIGEgcm9idXN0IGFuZCB1c2VyLWZyaWVuZGx5IEdOT01FIGV4dGVuc2lvbiB0aGF0IHByb3ZpZGVzIHJlYWwtdGltZSB2aXN1YWxpemF0aW9uIG9mIGtleSBzeXN0ZW0gcmVzb3VyY2VzLlxuXG5JdCdzIGEgcmVmaW5lZCBmb3JrIG9mIHRoZSBvcmlnaW5hbCwgYnV0IG5vdyBzZWVtaW5nbHkgaW5hY3RpdmUsIGdub21lLXN0YXRzLXBybyBodHRwczovL2dpdGh1Yi5jb20vdHBlbmd1aW4vZ25vbWUtc3RhdHMtcHJvXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGFuIGVzc2VudGlhbCB0b29sIGZvciBhbnlvbmUgbG9va2luZyB0byBrZWVwIGEgY2xvc2UgZXllIG9uIHRoZWlyIHN5c3RlbSdzIHBlcmZvcm1hbmNlLlxuXG5LZXkgRmVhdHVyZXM6XG5cbi0gUGVyIENQVSBjb3JlL3Byb2Nlc3NvciB1dGlsaXphdGlvblxuLSBSQU0gdXRpbGl6YXRpb25cbi0gU3dhcCBtZW1vcnkgdXRpbGl6YXRpb25cbi0gTmV0d29yayB1dGlsaXphdGlvblxuXG5JbiBhZGRpdGlvbiB0byB1dGlsaXphdGlvbiBkaXNwbGF5ZWQgaW4gdGhlIHRyYXksIGl0IG9mZmVycyBkcm9wIGRvd24gZGlzcGxheSBvZiBoaXN0b3JpY2FsIHV0aWxpemF0aW9ucy5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicgKG9yIGxvZ291dC9sb2dpbiB1bmRlciBXYXlsYW5kKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tc3RhdHMtcGx1cyIsCiAgIm5hbWUiOiAiU3lzdGVtU3RhdHNQbHVzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImpvZUB0aHJhbGxpbmdwZW5ndWluLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZW11bG9jb3N0YS9zeXN0ZW0tc3RhdHMtcGx1cyIsCiAgInV1aWQiOiAic3lzdGVtLXN0YXRzLXBsdXNAcmVtdWxvLmNvc3RhLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyLAogICJ2ZXJzaW9uLW5hbWUiOiAiMC4xLjAiCn0="} }} , {"uuid": "toggle-proxy@wuma", "name": "Toggle Proxy", "pname": "toggle-proxy", "description": "Toggle v2ray proxy", "link": "https://extensions.gnome.org/extension/6511/toggle-proxy/", "shell_version_map": { - "45": {"version": "2", "sha256": "0zi8s4whbbvc7s2b9pysbzbchhya97sd987mr7ggxkqpfs2r20h1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB2MnJheSBwcm94eSIsCiAgIm5hbWUiOiAiVG9nZ2xlIFByb3h5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvZ2dsZXByb3h5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoanhzL3RvZ2dsZS1wcm94eSIsCiAgInV1aWQiOiAidG9nZ2xlLXByb3h5QHd1bWEiLAogICJ2ZXJzaW9uIjogMgp9"} + "45": {"version": "2", "sha256": "0zi8s4whbbvc7s2b9pysbzbchhya97sd987mr7ggxkqpfs2r20h1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB2MnJheSBwcm94eSIsCiAgIm5hbWUiOiAiVG9nZ2xlIFByb3h5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvZ2dsZXByb3h5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoanhzL3RvZ2dsZS1wcm94eSIsCiAgInV1aWQiOiAidG9nZ2xlLXByb3h5QHd1bWEiLAogICJ2ZXJzaW9uIjogMgp9"}, + "46": {"version": "3", "sha256": "04d9zzz81qa288zhs6i2lb46c18lp7pqkv3fb4y06abnx5y090hq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB2MnJheSBwcm94eSIsCiAgIm5hbWUiOiAiVG9nZ2xlIFByb3h5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvZ2dsZXByb3h5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoanhzL3RvZ2dsZS1wcm94eSIsCiAgInV1aWQiOiAidG9nZ2xlLXByb3h5QHd1bWEiLAogICJ2ZXJzaW9uIjogMwp9"} }} , {"uuid": "usd-rub@rus-99-pk.github.com", "name": "USD-RUB", "pname": "usd-rub", "description": "Convert US Dollar to Russian ruble. Updates are received every 30 seconds.\n\nIt is a fork of USD-TRY. This extension uses economia.awesomeapi.com.br.", "link": "https://extensions.gnome.org/extension/6514/usd-rub/", "shell_version_map": { "43": {"version": "2", "sha256": "1jr8w2kyby1jsmw7ycv0kang2hb8514p4lqn06h3hlm1vf5hd0zy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgVVMgRG9sbGFyIHRvIFJ1c3NpYW4gcnVibGUuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMuXG5cbkl0IGlzIGEgZm9yayBvZiBVU0QtVFJZLiBUaGlzIGV4dGVuc2lvbiB1c2VzIGVjb25vbWlhLmF3ZXNvbWVhcGkuY29tLmJyIiwKICAibmFtZSI6ICJVU0QtUlVCIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ydXMtOTktcGsvVVNELVJVQiIsCiAgInV1aWQiOiAidXNkLXJ1YkBydXMtOTktcGsuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, @@ -6729,8 +6768,8 @@ , {"uuid": "always-allow-onscreen-keyboard@dvdzmr.extension", "name": "Always allow onscreen keyboard", "pname": "always-allow-onscreen-keyboard", "description": "Always allow the use of the onscreen keyboard (osk), regardless of touch/tablet mode.", "link": "https://extensions.gnome.org/extension/6598/always-allow-onscreen-keyboard/", "shell_version_map": { "45": {"version": "3", "sha256": "0d3rk4ygvabw865frf4pv687fmdsshd7287w8k2klcwgszj04v43", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBhbGxvdyB0aGUgdXNlIG9mIHRoZSBvbnNjcmVlbiBrZXlib2FyZCAob3NrKSwgcmVnYXJkbGVzcyBvZiB0b3VjaC90YWJsZXQgbW9kZS4iLAogICJuYW1lIjogIkFsd2F5cyBhbGxvdyBvbnNjcmVlbiBrZXlib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdmR6bXIvYWx3YXlzLXNob3ctb25zY3JlZW4ta2V5Ym9hcmQiLAogICJ1dWlkIjogImFsd2F5cy1hbGxvdy1vbnNjcmVlbi1rZXlib2FyZEBkdmR6bXIuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDMKfQ=="} }} -, {"uuid": "dev-container-manager@devopsnextgenx", "name": "docker podman kind kubernetes cluster container manager", "pname": "dev-container-manager", "description": "Gnome Extension to enable cicd/container/kubernetes and cloud resource handling. you can use docker, podman and use kubernetes clusters with kind.", "link": "https://extensions.gnome.org/extension/6601/dev-container-manager/", "shell_version_map": { - "45": {"version": "15", "sha256": "026ignqqj1kggsxz7mq15fq700pagjpnl68w71i219ds25389r62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIEV4dGVuc2lvbiB0byBlbmFibGUgY2ljZC9jb250YWluZXIva3ViZXJuZXRlcyBhbmQgY2xvdWQgcmVzb3VyY2UgaGFuZGxpbmcuIHlvdSBjYW4gdXNlIGRvY2tlciwgcG9kbWFuIGFuZCB1c2Uga3ViZXJuZXRlcyBjbHVzdGVycyB3aXRoIGtpbmQuIiwKICAiZG9uYXRpb25zIjogewogICAgImtvZmkiOiAiZGV2b3BzbmV4dGdlbngiCiAgfSwKICAibmFtZSI6ICJkb2NrZXIgcG9kbWFuIGtpbmQga3ViZXJuZXRlcyBjbHVzdGVyIGNvbnRhaW5lciBtYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRldi1jb250YWluZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZXZvcHNuZXh0Z2VueC9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJkZXYtY29udGFpbmVyLW1hbmFnZXJAZGV2b3BzbmV4dGdlbngiLAogICJ2ZXJzaW9uIjogMTUsCiAgInZlcnNpb24tbmFtZSI6ICIwLjAuNSIKfQ=="} +, {"uuid": "dev-container-manager@devopsnextgenx", "name": "docker podman kind kubernetes cluster container manager", "pname": "dev-container-manager", "description": "Gnome Extension to enable cicd/container/kubernetes and cloud resource handling. you can use docker, podman and use kubernetes clusters with kind. Added resize, delete container and filter active containers.", "link": "https://extensions.gnome.org/extension/6601/dev-container-manager/", "shell_version_map": { + "45": {"version": "21", "sha256": "1pakhrkhfmjxmry6n2v8dbciq1mpcdclyhvn4cin84gwsdhalfcc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIEV4dGVuc2lvbiB0byBlbmFibGUgY2ljZC9jb250YWluZXIva3ViZXJuZXRlcyBhbmQgY2xvdWQgcmVzb3VyY2UgaGFuZGxpbmcuIHlvdSBjYW4gdXNlIGRvY2tlciwgcG9kbWFuIGFuZCB1c2Uga3ViZXJuZXRlcyBjbHVzdGVycyB3aXRoIGtpbmQuIEFkZGVkIHJlc2l6ZSwgZGVsZXRlIGNvbnRhaW5lciBhbmQgZmlsdGVyIGFjdGl2ZSBjb250YWluZXJzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImRldm9wc25leHRnZW54IgogIH0sCiAgIm5hbWUiOiAiZG9ja2VyIHBvZG1hbiBraW5kIGt1YmVybmV0ZXMgY2x1c3RlciBjb250YWluZXIgbWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kZXYtY29udGFpbmVyLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGV2b3BzbmV4dGdlbngvZ25vbWUtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiZGV2LWNvbnRhaW5lci1tYW5hZ2VyQGRldm9wc25leHRnZW54IiwKICAidmVyc2lvbiI6IDIxLAogICJ2ZXJzaW9uLW5hbWUiOiAiMC4wLjgiCn0="} }} , {"uuid": "move-to-next-screen@wosar.me", "name": "Move To Next Screen", "pname": "move-to-next-screen", "description": "Adds a keyboard shortcut (CTRL+SHIFT+PAGEUP) to move the current window to the next screen.", "link": "https://extensions.gnome.org/extension/6610/move-to-next-screen/", "shell_version_map": { "45": {"version": "1", "sha256": "0n28xnphka81ajypqwnbjpm24zwa8sdan3wzsan68f4raz9bf5xy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBrZXlib2FyZCBzaG9ydGN1dCB0byBtb3ZlIHRoZSBjdXJyZW50IHdpbmRvdyB0byB0aGUgbmV4dCBzY3JlZW4iLAogICJuYW1lIjogIk1vdmUgVG8gTmV4dCBTY3JlZW4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubW92ZS10by1uZXh0LXNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9md29zYXIvbW92ZS10by1uZXh0LXNjcmVlbiIsCiAgInV1aWQiOiAibW92ZS10by1uZXh0LXNjcmVlbkB3b3Nhci5tZSIsCiAgInZlcnNpb24iOiAxCn0="} @@ -6768,12 +6807,13 @@ "43": {"version": "9", "sha256": "10i3chc6vzsw04a5jm8p39rlkj7klz96g4979gvia7j6xfpcs1bc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgJiBIaWRlIGljb25zIGZyb20gdGhlIHRvcCBwYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1pY29uaGlkZXJ1cGRhdGVkIiwKICAibmFtZSI6ICJJY29uIEhpZGVyIFVwZGF0ZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWNvbi1oaWRlci11cGRhdGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9seDM1OGhjbC9saW51eGljb25oaWRlcnVwZGF0ZWQiLAogICJ1dWlkIjogImljb24taGlkZXItdXBkYXRlZEBseDM1OGhjbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "44": {"version": "9", "sha256": "10i3chc6vzsw04a5jm8p39rlkj7klz96g4979gvia7j6xfpcs1bc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgJiBIaWRlIGljb25zIGZyb20gdGhlIHRvcCBwYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1pY29uaGlkZXJ1cGRhdGVkIiwKICAibmFtZSI6ICJJY29uIEhpZGVyIFVwZGF0ZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWNvbi1oaWRlci11cGRhdGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9seDM1OGhjbC9saW51eGljb25oaWRlcnVwZGF0ZWQiLAogICJ1dWlkIjogImljb24taGlkZXItdXBkYXRlZEBseDM1OGhjbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"} }} -, {"uuid": "openweather-extension@penguin-teal.github.io", "name": "OpenWeather Refined", "pname": "openweather", "description": "Display weather for the current or a specified location. Fork of OpenWeather.\nWeather data is provided by OpenWeatherMap.org.\nIf location is set to \"My Location,\" which is the case by default on laptops, this extension will use location services and Nominatim (from openstreetmap.org), or infoip.io if that failed.", "link": "https://extensions.gnome.org/extension/6655/openweather/", "shell_version_map": { - "45": {"version": "12", "sha256": "19jyggaah9lx9pycr822fjh2ypdf7vc3mpskqyncphhn10rjg19m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBmb3IgdGhlIGN1cnJlbnQgb3IgYSBzcGVjaWZpZWQgbG9jYXRpb24uIEZvcmsgb2YgT3BlbldlYXRoZXIuXG5XZWF0aGVyIGRhdGEgaXMgcHJvdmlkZWQgYnkgT3BlbldlYXRoZXJNYXAub3JnLlxuSWYgbG9jYXRpb24gaXMgc2V0IHRvIFwiTXkgTG9jYXRpb24sXCIgd2hpY2ggaXMgdGhlIGNhc2UgYnkgZGVmYXVsdCBvbiBsYXB0b3BzLCB0aGlzIGV4dGVuc2lvbiB3aWxsIHVzZSBsb2NhdGlvbiBzZXJ2aWNlcyBhbmQgTm9taW5hdGltIChmcm9tIG9wZW5zdHJlZXRtYXAub3JnKSwgb3IgaW5mb2lwLmlvIGlmIHRoYXQgZmFpbGVkLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1vcGVud2VhdGhlcnJlZmluZWQiLAogICJnaXQtdmVyc2lvbiI6ICIxMzMucjAuZzU5YTE0OTAiLAogICJuYW1lIjogIk9wZW5XZWF0aGVyIFJlZmluZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3BlbndlYXRoZXJyZWZpbmVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZW5ndWluLXRlYWwvZ25vbWUtb3BlbndlYXRoZXIiLAogICJ1dWlkIjogIm9wZW53ZWF0aGVyLWV4dGVuc2lvbkBwZW5ndWluLXRlYWwuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyLAogICJ2ZXJzaW9uLW5hbWUiOiAiMTMzIgp9"}, - "46": {"version": "12", "sha256": "19jyggaah9lx9pycr822fjh2ypdf7vc3mpskqyncphhn10rjg19m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBmb3IgdGhlIGN1cnJlbnQgb3IgYSBzcGVjaWZpZWQgbG9jYXRpb24uIEZvcmsgb2YgT3BlbldlYXRoZXIuXG5XZWF0aGVyIGRhdGEgaXMgcHJvdmlkZWQgYnkgT3BlbldlYXRoZXJNYXAub3JnLlxuSWYgbG9jYXRpb24gaXMgc2V0IHRvIFwiTXkgTG9jYXRpb24sXCIgd2hpY2ggaXMgdGhlIGNhc2UgYnkgZGVmYXVsdCBvbiBsYXB0b3BzLCB0aGlzIGV4dGVuc2lvbiB3aWxsIHVzZSBsb2NhdGlvbiBzZXJ2aWNlcyBhbmQgTm9taW5hdGltIChmcm9tIG9wZW5zdHJlZXRtYXAub3JnKSwgb3IgaW5mb2lwLmlvIGlmIHRoYXQgZmFpbGVkLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1vcGVud2VhdGhlcnJlZmluZWQiLAogICJnaXQtdmVyc2lvbiI6ICIxMzMucjAuZzU5YTE0OTAiLAogICJuYW1lIjogIk9wZW5XZWF0aGVyIFJlZmluZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3BlbndlYXRoZXJyZWZpbmVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZW5ndWluLXRlYWwvZ25vbWUtb3BlbndlYXRoZXIiLAogICJ1dWlkIjogIm9wZW53ZWF0aGVyLWV4dGVuc2lvbkBwZW5ndWluLXRlYWwuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyLAogICJ2ZXJzaW9uLW5hbWUiOiAiMTMzIgp9"} +, {"uuid": "openweather-extension@penguin-teal.github.io", "name": "OpenWeather Refined", "pname": "openweather", "description": "Display weather for the current or a specified location. Fork of OpenWeather.\nWeather data is provided by OpenWeatherMap.org or WeatherAPI.com.\nIf location is set to \"My Location,\" which is the case by default on laptops, this extension will use location services and Nominatim (from openstreetmap.org), or infoip.io if that failed.", "link": "https://extensions.gnome.org/extension/6655/openweather/", "shell_version_map": { + "45": {"version": "13", "sha256": "05cdybcfbzv15k3dk6fqckp9s3z7n5wcfsgv2zvrjlvp78yj3q6c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBmb3IgdGhlIGN1cnJlbnQgb3IgYSBzcGVjaWZpZWQgbG9jYXRpb24uIEZvcmsgb2YgT3BlbldlYXRoZXIuXG5XZWF0aGVyIGRhdGEgaXMgcHJvdmlkZWQgYnkgT3BlbldlYXRoZXJNYXAub3JnIG9yIFdlYXRoZXJBUEkuY29tLlxuSWYgbG9jYXRpb24gaXMgc2V0IHRvIFwiTXkgTG9jYXRpb24sXCIgd2hpY2ggaXMgdGhlIGNhc2UgYnkgZGVmYXVsdCBvbiBsYXB0b3BzLCB0aGlzIGV4dGVuc2lvbiB3aWxsIHVzZSBsb2NhdGlvbiBzZXJ2aWNlcyBhbmQgTm9taW5hdGltIChmcm9tIG9wZW5zdHJlZXRtYXAub3JnKSwgb3IgaW5mb2lwLmlvIGlmIHRoYXQgZmFpbGVkLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1vcGVud2VhdGhlcnJlZmluZWQiLAogICJnaXQtdmVyc2lvbiI6ICIxMzQucjAuZ2YyZDczOWUiLAogICJuYW1lIjogIk9wZW5XZWF0aGVyIFJlZmluZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3BlbndlYXRoZXJyZWZpbmVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZW5ndWluLXRlYWwvZ25vbWUtb3BlbndlYXRoZXIiLAogICJ1dWlkIjogIm9wZW53ZWF0aGVyLWV4dGVuc2lvbkBwZW5ndWluLXRlYWwuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzLAogICJ2ZXJzaW9uLW5hbWUiOiAiMTM0Igp9"}, + "46": {"version": "13", "sha256": "05cdybcfbzv15k3dk6fqckp9s3z7n5wcfsgv2zvrjlvp78yj3q6c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBmb3IgdGhlIGN1cnJlbnQgb3IgYSBzcGVjaWZpZWQgbG9jYXRpb24uIEZvcmsgb2YgT3BlbldlYXRoZXIuXG5XZWF0aGVyIGRhdGEgaXMgcHJvdmlkZWQgYnkgT3BlbldlYXRoZXJNYXAub3JnIG9yIFdlYXRoZXJBUEkuY29tLlxuSWYgbG9jYXRpb24gaXMgc2V0IHRvIFwiTXkgTG9jYXRpb24sXCIgd2hpY2ggaXMgdGhlIGNhc2UgYnkgZGVmYXVsdCBvbiBsYXB0b3BzLCB0aGlzIGV4dGVuc2lvbiB3aWxsIHVzZSBsb2NhdGlvbiBzZXJ2aWNlcyBhbmQgTm9taW5hdGltIChmcm9tIG9wZW5zdHJlZXRtYXAub3JnKSwgb3IgaW5mb2lwLmlvIGlmIHRoYXQgZmFpbGVkLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1vcGVud2VhdGhlcnJlZmluZWQiLAogICJnaXQtdmVyc2lvbiI6ICIxMzQucjAuZ2YyZDczOWUiLAogICJuYW1lIjogIk9wZW5XZWF0aGVyIFJlZmluZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMub3BlbndlYXRoZXJyZWZpbmVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZW5ndWluLXRlYWwvZ25vbWUtb3BlbndlYXRoZXIiLAogICJ1dWlkIjogIm9wZW53ZWF0aGVyLWV4dGVuc2lvbkBwZW5ndWluLXRlYWwuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzLAogICJ2ZXJzaW9uLW5hbWUiOiAiMTM0Igp9"} }} , {"uuid": "wallhub@sakithb.github.io", "name": "Wallhub", "pname": "wallhub", "description": "Manage wallpapers with ease", "link": "https://extensions.gnome.org/extension/6661/wallhub/", "shell_version_map": { - "45": {"version": "5", "sha256": "1m7n8pv2hfjfw3ffmwhmb8khmrymqij0n6p1lgr93cxqm9myj0qx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB3YWxscGFwZXJzIHdpdGggZWFzZSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2FraXRoYiIsCiAgICAia29maSI6ICJzYWtpdGhiIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndhbGxodWJAc2FraXRoYi5naXRodWIuaW8iLAogICJuYW1lIjogIldhbGxodWIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2FsbGh1YiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zYWtpdGhiL3dhbGxodWIiLAogICJ1dWlkIjogIndhbGxodWJAc2FraXRoYi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNSwKICAidmVyc2lvbi1uYW1lIjogIjEuMS4yIgp9"} + "45": {"version": "6", "sha256": "1nqjab3hji06046x2ihg8i2izcpgxy9l7pwv4w21aq04fb2742hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB3YWxscGFwZXJzIHdpdGggZWFzZSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2FraXRoYiIsCiAgICAia29maSI6ICJzYWtpdGhiIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndhbGxodWJAc2FraXRoYi5naXRodWIuaW8iLAogICJuYW1lIjogIldhbGxodWIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2FsbGh1YiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FraXRoYi93YWxsaHViIiwKICAidXVpZCI6ICJ3YWxsaHViQHNha2l0aGIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYsCiAgInZlcnNpb24tbmFtZSI6ICIxLjEuMyIKfQ=="}, + "46": {"version": "6", "sha256": "1nqjab3hji06046x2ihg8i2izcpgxy9l7pwv4w21aq04fb2742hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB3YWxscGFwZXJzIHdpdGggZWFzZSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAic2FraXRoYiIsCiAgICAia29maSI6ICJzYWtpdGhiIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIndhbGxodWJAc2FraXRoYi5naXRodWIuaW8iLAogICJuYW1lIjogIldhbGxodWIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2FsbGh1YiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FraXRoYi93YWxsaHViIiwKICAidXVpZCI6ICJ3YWxsaHViQHNha2l0aGIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYsCiAgInZlcnNpb24tbmFtZSI6ICIxLjEuMyIKfQ=="} }} , {"uuid": "mountMeter@dhariharan26.gmail.com", "name": "Mount Meter", "pname": "mount-meter", "description": "Easily monitor and manage your mounted removable drives, displaying sizes and highlighting the mount with the least used space in the top bar.\n\nForked and Modified extensively from Removable Drive Menu by fmuellner.\n\nNote:- \n1.The list will automatically refresh every 5 seconds to provide updated information.\n2.Any ongoing event(e.g. a file transfer) which result in changes(% used) in mount sizes will trigger the top bar indicator to highlight/flash until the file operation completes,this is intended and also partially doubles up as a file transfer operation indicator :)", "link": "https://extensions.gnome.org/extension/6664/mount-meter/", "shell_version_map": { "45": {"version": "3", "sha256": "0c2xlbrhjczmdqbwr8a1xnibdvhgaq23fd58g2hcw8nmp4jw0sdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtb25pdG9yIGFuZCBtYW5hZ2UgeW91ciBtb3VudGVkIHJlbW92YWJsZSBkcml2ZXMsIGRpc3BsYXlpbmcgc2l6ZXMgYW5kIGhpZ2hsaWdodGluZyB0aGUgbW91bnQgd2l0aCB0aGUgbGVhc3QgdXNlZCBzcGFjZSBpbiB0aGUgdG9wIGJhci5Gb3JrZWQgYW5kIE1vZGlmaWVkIGV4dGVuc2l2ZWx5IGZyb20gUmVtb3ZhYmxlIERyaXZlIE1lbnUgYnkgZm11ZWxsbmVyIiwKICAibmFtZSI6ICJNb3VudCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kaGFyaWhhcmFuLTA1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb3VudC1tZXRlciIsCiAgInV1aWQiOiAibW91bnRNZXRlckBkaGFyaWhhcmFuMjYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="} @@ -6794,8 +6834,8 @@ "46": {"version": "5", "sha256": "1fmz31bm2kf6rbzkib1756sg25chyxs5vbllqjzc49dalm0cla2b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBjdXJyZW50IHBvd2VyIHByb2ZpbGUgaW4gcGFuZWwncyBzeXN0ZW0gaWNvbnMuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiUG93ZXIgcHJvZmlsZSBpbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvcG93ZXItcHJvZmlsZSIsCiAgInV1aWQiOiAicG93ZXItcHJvZmlsZUBmdGh4IiwKICAidmVyc2lvbiI6IDUKfQ=="} }} , {"uuid": "monitor@astraext.github.io", "name": "Astra Monitor", "pname": "astra-monitor", "description": "Astra Monitor is a cutting-edge, fully customizable, and performance-focused system monitoring extension for GNOME's top bar. It's an all-in-one solution for those seeking to keep a close eye on their system's performance metrics like CPU, GPU, RAM, disk usage, network statistics, and sensor readings.", "link": "https://extensions.gnome.org/extension/6682/astra-monitor/", "shell_version_map": { - "45": {"version": "30", "sha256": "0indl8ixd6wlxgmf4y8y1z8c70bp8703jkphqjk75glr05i2lk9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzdHJhIE1vbml0b3IgaXMgYSBjdXR0aW5nLWVkZ2UsIGZ1bGx5IGN1c3RvbWl6YWJsZSwgYW5kIHBlcmZvcm1hbmNlLWZvY3VzZWQgc3lzdGVtIG1vbml0b3JpbmcgZXh0ZW5zaW9uIGZvciBHTk9NRSdzIHRvcCBiYXIuIEl0J3MgYW4gYWxsLWluLW9uZSBzb2x1dGlvbiBmb3IgdGhvc2Ugc2Vla2luZyB0byBrZWVwIGEgY2xvc2UgZXllIG9uIHRoZWlyIHN5c3RlbSdzIHBlcmZvcm1hbmNlIG1ldHJpY3MgbGlrZSBDUFUsIEdQVSwgUkFNLCBkaXNrIHVzYWdlLCBuZXR3b3JrIHN0YXRpc3RpY3MsIGFuZCBzZW5zb3IgcmVhZGluZ3MuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhc3RyYS5leHQiLAogICAgInBhdHJlb24iOiAiQXN0cmFFeHQiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJsaWNlbnNlIjogIkdQTC0zLjAtb3ItbGF0ZXIiLAogICJuYW1lIjogIkFzdHJhIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXN0cmEtbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXN0cmFFeHQvYXN0cmEtbW9uaXRvciIsCiAgInV1aWQiOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzAsCiAgInZlcnNpb24tbmFtZSI6ICIxOSIKfQ=="}, - "46": {"version": "30", "sha256": "0indl8ixd6wlxgmf4y8y1z8c70bp8703jkphqjk75glr05i2lk9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzdHJhIE1vbml0b3IgaXMgYSBjdXR0aW5nLWVkZ2UsIGZ1bGx5IGN1c3RvbWl6YWJsZSwgYW5kIHBlcmZvcm1hbmNlLWZvY3VzZWQgc3lzdGVtIG1vbml0b3JpbmcgZXh0ZW5zaW9uIGZvciBHTk9NRSdzIHRvcCBiYXIuIEl0J3MgYW4gYWxsLWluLW9uZSBzb2x1dGlvbiBmb3IgdGhvc2Ugc2Vla2luZyB0byBrZWVwIGEgY2xvc2UgZXllIG9uIHRoZWlyIHN5c3RlbSdzIHBlcmZvcm1hbmNlIG1ldHJpY3MgbGlrZSBDUFUsIEdQVSwgUkFNLCBkaXNrIHVzYWdlLCBuZXR3b3JrIHN0YXRpc3RpY3MsIGFuZCBzZW5zb3IgcmVhZGluZ3MuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhc3RyYS5leHQiLAogICAgInBhdHJlb24iOiAiQXN0cmFFeHQiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJsaWNlbnNlIjogIkdQTC0zLjAtb3ItbGF0ZXIiLAogICJuYW1lIjogIkFzdHJhIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXN0cmEtbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXN0cmFFeHQvYXN0cmEtbW9uaXRvciIsCiAgInV1aWQiOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzAsCiAgInZlcnNpb24tbmFtZSI6ICIxOSIKfQ=="} + "45": {"version": "35", "sha256": "1n2x6qhnm3xm4md5r8g8gzj5zs3894iy2hzlv31p4wrq7b7xvx5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzdHJhIE1vbml0b3IgaXMgYSBjdXR0aW5nLWVkZ2UsIGZ1bGx5IGN1c3RvbWl6YWJsZSwgYW5kIHBlcmZvcm1hbmNlLWZvY3VzZWQgc3lzdGVtIG1vbml0b3JpbmcgZXh0ZW5zaW9uIGZvciBHTk9NRSdzIHRvcCBiYXIuIEl0J3MgYW4gYWxsLWluLW9uZSBzb2x1dGlvbiBmb3IgdGhvc2Ugc2Vla2luZyB0byBrZWVwIGEgY2xvc2UgZXllIG9uIHRoZWlyIHN5c3RlbSdzIHBlcmZvcm1hbmNlIG1ldHJpY3MgbGlrZSBDUFUsIEdQVSwgUkFNLCBkaXNrIHVzYWdlLCBuZXR3b3JrIHN0YXRpc3RpY3MsIGFuZCBzZW5zb3IgcmVhZGluZ3MuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhc3RyYS5leHQiLAogICAgInBhdHJlb24iOiAiQXN0cmFFeHQiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJsaWNlbnNlIjogIkdQTC0zLjAtb3ItbGF0ZXIiLAogICJuYW1lIjogIkFzdHJhIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXN0cmEtbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXN0cmFFeHQvYXN0cmEtbW9uaXRvciIsCiAgInV1aWQiOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzUsCiAgInZlcnNpb24tbmFtZSI6ICIyMSIKfQ=="}, + "46": {"version": "35", "sha256": "1n2x6qhnm3xm4md5r8g8gzj5zs3894iy2hzlv31p4wrq7b7xvx5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzdHJhIE1vbml0b3IgaXMgYSBjdXR0aW5nLWVkZ2UsIGZ1bGx5IGN1c3RvbWl6YWJsZSwgYW5kIHBlcmZvcm1hbmNlLWZvY3VzZWQgc3lzdGVtIG1vbml0b3JpbmcgZXh0ZW5zaW9uIGZvciBHTk9NRSdzIHRvcCBiYXIuIEl0J3MgYW4gYWxsLWluLW9uZSBzb2x1dGlvbiBmb3IgdGhvc2Ugc2Vla2luZyB0byBrZWVwIGEgY2xvc2UgZXllIG9uIHRoZWlyIHN5c3RlbSdzIHBlcmZvcm1hbmNlIG1ldHJpY3MgbGlrZSBDUFUsIEdQVSwgUkFNLCBkaXNrIHVzYWdlLCBuZXR3b3JrIHN0YXRpc3RpY3MsIGFuZCBzZW5zb3IgcmVhZGluZ3MuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJhc3RyYS5leHQiLAogICAgInBhdHJlb24iOiAiQXN0cmFFeHQiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJsaWNlbnNlIjogIkdQTC0zLjAtb3ItbGF0ZXIiLAogICJuYW1lIjogIkFzdHJhIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXN0cmEtbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXN0cmFFeHQvYXN0cmEtbW9uaXRvciIsCiAgInV1aWQiOiAibW9uaXRvckBhc3RyYWV4dC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzUsCiAgInZlcnNpb24tbmFtZSI6ICIyMSIKfQ=="} }} , {"uuid": "collector-pip@mijorus.it", "name": "Collector - complementary extension", "pname": "collector-complementary-extension", "description": "Allows the Collector window to stay always on top", "link": "https://extensions.gnome.org/extension/6685/collector-complementary-extension/", "shell_version_map": { "45": {"version": "1", "sha256": "0ndzxkw8rxjb3nxwyi4znhyq7j2p4yb6vj9gxfdz9hl2kcbsn1k7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgQ29sbGVjdG9yIHdpbmRvdyB0byBzdGF5IGFsd2F5cyBvbiB0b3AiLAogICJuYW1lIjogIkNvbGxlY3RvciAtIGNvbXBsZW1lbnRhcnkgZXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pam9ydXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbGxlY3RvciIsCiAgInV1aWQiOiAiY29sbGVjdG9yLXBpcEBtaWpvcnVzLml0IiwKICAidmVyc2lvbiI6IDEKfQ=="} @@ -6826,7 +6866,7 @@ "45": {"version": "2", "sha256": "0yr8vcnxqglgpn1p36fnj2jb2fklx7s4vcsdcd5k8jj8lakk37gj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNtYWxsIG5vdGUgdG8geW91ciBHTk9NRSBwYW5lbCIsCiAgIm5hbWUiOiAiUGFuZWwgTm90ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYW5lbG5vdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dpdHR5TWFjL1BhbmVsTm90ZSIsCiAgInV1aWQiOiAicGFuZWxub3RlQGdpdHR5bWFjLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "46": {"version": "2", "sha256": "0yr8vcnxqglgpn1p36fnj2jb2fklx7s4vcsdcd5k8jj8lakk37gj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNtYWxsIG5vdGUgdG8geW91ciBHTk9NRSBwYW5lbCIsCiAgIm5hbWUiOiAiUGFuZWwgTm90ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wYW5lbG5vdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dpdHR5TWFjL1BhbmVsTm90ZSIsCiAgInV1aWQiOiAicGFuZWxub3RlQGdpdHR5bWFjLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="} }} -, {"uuid": "extensions-search-provider@G-dH.github.com", "name": "ESP (Extensions Search Provider)", "pname": "esp-extensions-search-provider", "description": "Search and access settings of installed extensions from the Activities overview", "link": "https://extensions.gnome.org/extension/6721/esp-extensions-search-provider/", "shell_version_map": { +, {"uuid": "extensions-search-provider@G-dH.github.com", "name": "ESP (Extensions Search Provider)", "pname": "esp-extensions-search-provider", "description": "Search and manage installed extensions from the Activities overview.\n\nFeatures:\n- List all installed extensions using configurable search prefix\n- Quick access to extension settings without dedicated application\n- Enable, disable, remove extensions\n- Search results are expandable so you can check additional information: extension error (if any), description, homepage (click to open), uuid (click to open metadata in editor), schema id (click to open schema in the dconf Editor), installation path (click to open the folder)", "link": "https://extensions.gnome.org/extension/6721/esp-extensions-search-provider/", "shell_version_map": { "42": {"version": "18", "sha256": "1ml6wg8njmsi4pkkmrqx7jx40q22qscvfk92h1ilhzfjxmp507jb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9leHRlbnNpb25zLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE4LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuNiIKfQ=="}, "43": {"version": "18", "sha256": "1ml6wg8njmsi4pkkmrqx7jx40q22qscvfk92h1ilhzfjxmp507jb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9leHRlbnNpb25zLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE4LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuNiIKfQ=="}, "44": {"version": "18", "sha256": "1ml6wg8njmsi4pkkmrqx7jx40q22qscvfk92h1ilhzfjxmp507jb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgYWNjZXNzIHNldHRpbmdzIG9mIGluc3RhbGxlZCBleHRlbnNpb25zIGZyb20gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImdlb3JnZGgiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXIiLAogICJuYW1lIjogIkVTUCAoRXh0ZW5zaW9ucyBTZWFyY2ggUHJvdmlkZXIpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmV4dGVuc2lvbnMtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9leHRlbnNpb25zLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zZWFyY2gtcHJvdmlkZXJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE4LAogICJ2ZXJzaW9uLW5hbWUiOiAiNDQuNiIKfQ=="}, @@ -6865,7 +6905,7 @@ "45": {"version": "2", "sha256": "16wgh92pn6i94hcxykyy09km75xk6mmnsvbr0c571mhad928a5b2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5ncyBmdWxsIGxpZ2h0IHN0eWxlIGludGVncmF0aW9uIGludG8gQmx1ciBteSBTaGVsbCBleHRlbnNpb24uIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJkaWthc3AiCiAgfSwKICAibmFtZSI6ICJMdW1pbnVzIFNoZWxsIFkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZGlrYXNldHlhcHJheW9naS9sdW1pbnVzLXByb2plY3QiLAogICJ1dWlkIjogImx1bWludXMtc2hlbGwteUBkaWthc3AuZ2l0bGFiIiwKICAidmVyc2lvbiI6IDIsCiAgInZlcnNpb24tbmFtZSI6ICI0NS4yIgp9"}, "46": {"version": "3", "sha256": "09l7sflp40q67ms9x57g230mjy9ndqbkbmd4bb2iybk5r0ii2h2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5ncyBsaWdodCBzdHlsZSBpbnRlZ3JhdGlvbiBpbnRvIEJsdXIgbXkgU2hlbGwgZXh0ZW5zaW9uIChzaGVsbCBvbmx5KS4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImRpa2FzcCIKICB9LAogICJuYW1lIjogIkx1bWludXMgU2hlbGwgWSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2x1bWludXMtcHJvamVjdCIsCiAgInV1aWQiOiAibHVtaW51cy1zaGVsbC15QGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMywKICAidmVyc2lvbi1uYW1lIjogIjQ2LjIiCn0="} }} -, {"uuid": "luminus-desktop@dikasp.gitlab", "name": "Luminus Desktop", "pname": "luminus-desktop", "description": "Brings global light style integration into gnome shell and GTK apps.\n\nrelease announcement & wallpaper download: https://www.buymeacoffee.com/dikasp/luminus-desktop-v46-released", "link": "https://extensions.gnome.org/extension/6750/luminus-desktop/", "shell_version_map": { +, {"uuid": "luminus-desktop@dikasp.gitlab", "name": "Luminus Desktop", "pname": "luminus-desktop", "description": "Brings global light style integration into gnome shell and GTK apps.", "link": "https://extensions.gnome.org/extension/6750/luminus-desktop/", "shell_version_map": { "45": {"version": "3", "sha256": "1ai9rzr0lx8myy6cqfsm4cck5l1v5yq8fwfil0rawpnzlbr6rmgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5ncyBnbG9iYWwgZnVsbCBsaWdodCBzdHlsZSBpbnRlZ3JhdGlvbiBpbnRvIGdub21lLXNoZWxsIGFuZCBHVEsgYXBwcy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogImRpa2FzcCIKICB9LAogICJuYW1lIjogIkx1bWludXMgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9kaWthc2V0eWFwcmF5b2dpL2x1bWludXMtcHJvamVjdCIsCiAgInV1aWQiOiAibHVtaW51cy1kZXNrdG9wQGRpa2FzcC5naXRsYWIiLAogICJ2ZXJzaW9uIjogMywKICAidmVyc2lvbi1uYW1lIjogIjQ1LjIiCn0="}, "46": {"version": "5", "sha256": "1v4kb8qrrjf4ganp698wc2pd03n8gy4mpccy8443icnl93xi4qb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5ncyBnbG9iYWwgbGlnaHQgc3R5bGUgaW50ZWdyYXRpb24gaW50byBnbm9tZSBzaGVsbCBhbmQgR1RLIGFwcHMuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJkaWthc3AiCiAgfSwKICAibmFtZSI6ICJMdW1pbnVzIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZGlrYXNldHlhcHJheW9naS9sdW1pbnVzLXByb2plY3QiLAogICJ1dWlkIjogImx1bWludXMtZGVza3RvcEBkaWthc3AuZ2l0bGFiIiwKICAidmVyc2lvbiI6IDUsCiAgInZlcnNpb24tbmFtZSI6ICI0Ni4yIgp9"} }} @@ -6877,7 +6917,8 @@ "46": {"version": "6", "sha256": "153q4y47xkxga06qx9lx06nknbc8d3ylr7dkywwx3062gqn6zjfy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IGxldCB0aGUgdXNlciB0byB2aWV3IGFuZCBjb3B5IHRoZSBwdWJsaWMgSVB2NCBhbmQgSVB2NiBhZGRyZXNzLCBieSB1c2luZyBpcGlmeS5vcmcgc2VydmljZXMuIiwKICAibmFtZSI6ICJNeVB1YklQIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbmlydC9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXlwdWJpcCIsCiAgInV1aWQiOiAibXlwdWJpcEBzbmlydCIsCiAgInZlcnNpb24iOiA2Cn0="} }} , {"uuid": "lomotion@lorens.com", "name": "Lomotion", "pname": "lomotion", "description": "Lomotion extension lets you switch and manage Gnome's workspaces seamlessly\n\nHow ?\n\t- Switch to the previous workspace with[CapsLock + A] and the next with [CapsLock + S]\n\t- Move the current window to the previous workspace with [CapsLock + D] or the next with [CapsLock + F]\n\t- Switch between windows in the current workspace [CapsLock + E]\n\t- Show workspaces overview hit [CapsLock] once\n\t- Show applications hit [CapsLock] twice\n\nWhy ?!\n\t- One-handed control, manage your workspaces with just one hand, boosting your efficiency and focus.\n\t- Enjoy immersive fullscreen applications without worrying about switching workspaces.\n\t- intutive, simple and fast.\n\nTip\n\t- For applications with tabs like Visual Studio Code, web browsers, and many others, you can use keyboard shortcuts to switch between tabs, you can set switch to previous tab [CapsLock + Q] and the next with [CapsLock + W]", "link": "https://extensions.gnome.org/extension/6768/lomotion/", "shell_version_map": { - "45": {"version": "1", "sha256": "0vgpfgl8rycc8wklaih53sl5fpc7ybic1jhfj7na2cnya5f9k1x8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvbW90aW9uIGV4dGVuc2lvbiBsZXRzIHlvdSBzd2l0Y2ggYW5kIG1hbmFnZSBHbm9tZSdzIHdvcmtzcGFjZXMgc2VhbWxlc3NseVxuXG5Ib3cgP1xuXHQtIFN3aXRjaCB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlIHdpdGhbQ2Fwc0xvY2sgKyBBXSBhbmQgdGhlIG5leHQgd2l0aCBbQ2Fwc0xvY2sgKyBTXVxuXHQtIE1vdmUgdGhlIGN1cnJlbnQgd2luZG93IHRvIHRoZSBwcmV2aW91cyB3b3Jrc3BhY2Ugd2l0aCBbQ2Fwc0xvY2sgKyBEXSBvciB0aGUgbmV4dCB3aXRoIFtDYXBzTG9jayArIEZdXG5cdC0gU3dpdGNoIGJldHdlZW4gd2luZG93cyBpbiB0aGUgY3VycmVudCB3b3Jrc3BhY2UgW0NhcHNMb2NrICsgRV1cblx0LSBTaG93IHdvcmtzcGFjZXMgb3ZlcnZpZXcgaGl0IFtDYXBzTG9ja10gb25jZVxuXHQtIFNob3cgYXBwbGljYXRpb25zIGhpdCBbQ2Fwc0xvY2tdIHR3aWNlXG5cbldoeSA/IVxuXHQtIE9uZS1oYW5kZWQgY29udHJvbCwgbWFuYWdlIHlvdXIgd29ya3NwYWNlcyB3aXRoIGp1c3Qgb25lIGhhbmQsIGJvb3N0aW5nIHlvdXIgZWZmaWNpZW5jeSBhbmQgZm9jdXMuXG5cdC0gRW5qb3kgaW1tZXJzaXZlIGZ1bGxzY3JlZW4gYXBwbGljYXRpb25zIHdpdGhvdXQgd29ycnlpbmcgYWJvdXQgc3dpdGNoaW5nIHdvcmtzcGFjZXMuXG5cdC0gaW50dXRpdmUsIHNpbXBsZSBhbmQgZmFzdC5cblxuVGlwXG5cdC0gRm9yIGFwcGxpY2F0aW9ucyB3aXRoIHRhYnMgbGlrZSBWaXN1YWwgU3R1ZGlvIENvZGUsIHdlYiBicm93c2VycywgYW5kIG1hbnkgb3RoZXJzLCB5b3UgY2FuIHVzZSBrZXlib2FyZCBzaG9ydGN1dHMgdG8gc3dpdGNoIGJldHdlZW4gdGFicywgeW91IGNhbiBzZXQgc3dpdGNoIHRvIHByZXZpb3VzIHRhYiBbQ2Fwc0xvY2sgKyBRXSBhbmQgdGhlIG5leHQgd2l0aCBbQ2Fwc0xvY2sgKyBXXSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAibG9yZW5zIgogIH0sCiAgIm5hbWUiOiAiTG9tb3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbG9yZW5zLW9zbWFuLWRldi9sb21vdGlvbiIsCiAgInV1aWQiOiAibG9tb3Rpb25AbG9yZW5zLmNvbSIsCiAgInZlcnNpb24iOiAxLAogICJ2ZXJzaW9uLW5hbWUiOiAiMSIKfQ=="} + "45": {"version": "2", "sha256": "12hymjfb1l0wyd5s61hggk1vi7j61c92fg89lqxgxlz4xbmxvp39", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvbW90aW9uIGV4dGVuc2lvbiBsZXRzIHlvdSBzd2l0Y2ggYW5kIG1hbmFnZSBHbm9tZSdzIHdvcmtzcGFjZXMgc2VhbWxlc3NseVxuXG5Ib3cgP1xuXHQtIFN3aXRjaCB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlIHdpdGhbQ2Fwc0xvY2sgKyBBXSBhbmQgdGhlIG5leHQgd2l0aCBbQ2Fwc0xvY2sgKyBTXVxuXHQtIE1vdmUgdGhlIGN1cnJlbnQgd2luZG93IHRvIHRoZSBwcmV2aW91cyB3b3Jrc3BhY2Ugd2l0aCBbQ2Fwc0xvY2sgKyBEXSBvciB0aGUgbmV4dCB3aXRoIFtDYXBzTG9jayArIEZdXG5cdC0gU3dpdGNoIGJldHdlZW4gd2luZG93cyBpbiB0aGUgY3VycmVudCB3b3Jrc3BhY2UgW0NhcHNMb2NrICsgRV1cblx0LSBTaG93IHdvcmtzcGFjZXMgb3ZlcnZpZXcgaGl0IFtDYXBzTG9ja10gb25jZVxuXHQtIFNob3cgYXBwbGljYXRpb25zIGhpdCBbQ2Fwc0xvY2tdIHR3aWNlXG5cbldoeSA/IVxuXHQtIE9uZS1oYW5kZWQgY29udHJvbCwgbWFuYWdlIHlvdXIgd29ya3NwYWNlcyB3aXRoIGp1c3Qgb25lIGhhbmQsIGJvb3N0aW5nIHlvdXIgZWZmaWNpZW5jeSBhbmQgZm9jdXMuXG5cdC0gRW5qb3kgaW1tZXJzaXZlIGZ1bGxzY3JlZW4gYXBwbGljYXRpb25zIHdpdGhvdXQgd29ycnlpbmcgYWJvdXQgc3dpdGNoaW5nIHdvcmtzcGFjZXMuXG5cdC0gaW50dXRpdmUsIHNpbXBsZSBhbmQgZmFzdC5cblxuVGlwXG5cdC0gRm9yIGFwcGxpY2F0aW9ucyB3aXRoIHRhYnMgbGlrZSBWaXN1YWwgU3R1ZGlvIENvZGUsIHdlYiBicm93c2VycywgYW5kIG1hbnkgb3RoZXJzLCB5b3UgY2FuIHVzZSBrZXlib2FyZCBzaG9ydGN1dHMgdG8gc3dpdGNoIGJldHdlZW4gdGFicywgeW91IGNhbiBzZXQgc3dpdGNoIHRvIHByZXZpb3VzIHRhYiBbQ2Fwc0xvY2sgKyBRXSBhbmQgdGhlIG5leHQgd2l0aCBbQ2Fwc0xvY2sgKyBXXSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAibG9yZW5zIgogIH0sCiAgIm5hbWUiOiAiTG9tb3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xvcmVucy1vc21hbi1kZXYvbG9tb3Rpb24iLAogICJ1dWlkIjogImxvbW90aW9uQGxvcmVucy5jb20iLAogICJ2ZXJzaW9uIjogMiwKICAidmVyc2lvbi1uYW1lIjogIjEiCn0="}, + "46": {"version": "2", "sha256": "12hymjfb1l0wyd5s61hggk1vi7j61c92fg89lqxgxlz4xbmxvp39", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvbW90aW9uIGV4dGVuc2lvbiBsZXRzIHlvdSBzd2l0Y2ggYW5kIG1hbmFnZSBHbm9tZSdzIHdvcmtzcGFjZXMgc2VhbWxlc3NseVxuXG5Ib3cgP1xuXHQtIFN3aXRjaCB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlIHdpdGhbQ2Fwc0xvY2sgKyBBXSBhbmQgdGhlIG5leHQgd2l0aCBbQ2Fwc0xvY2sgKyBTXVxuXHQtIE1vdmUgdGhlIGN1cnJlbnQgd2luZG93IHRvIHRoZSBwcmV2aW91cyB3b3Jrc3BhY2Ugd2l0aCBbQ2Fwc0xvY2sgKyBEXSBvciB0aGUgbmV4dCB3aXRoIFtDYXBzTG9jayArIEZdXG5cdC0gU3dpdGNoIGJldHdlZW4gd2luZG93cyBpbiB0aGUgY3VycmVudCB3b3Jrc3BhY2UgW0NhcHNMb2NrICsgRV1cblx0LSBTaG93IHdvcmtzcGFjZXMgb3ZlcnZpZXcgaGl0IFtDYXBzTG9ja10gb25jZVxuXHQtIFNob3cgYXBwbGljYXRpb25zIGhpdCBbQ2Fwc0xvY2tdIHR3aWNlXG5cbldoeSA/IVxuXHQtIE9uZS1oYW5kZWQgY29udHJvbCwgbWFuYWdlIHlvdXIgd29ya3NwYWNlcyB3aXRoIGp1c3Qgb25lIGhhbmQsIGJvb3N0aW5nIHlvdXIgZWZmaWNpZW5jeSBhbmQgZm9jdXMuXG5cdC0gRW5qb3kgaW1tZXJzaXZlIGZ1bGxzY3JlZW4gYXBwbGljYXRpb25zIHdpdGhvdXQgd29ycnlpbmcgYWJvdXQgc3dpdGNoaW5nIHdvcmtzcGFjZXMuXG5cdC0gaW50dXRpdmUsIHNpbXBsZSBhbmQgZmFzdC5cblxuVGlwXG5cdC0gRm9yIGFwcGxpY2F0aW9ucyB3aXRoIHRhYnMgbGlrZSBWaXN1YWwgU3R1ZGlvIENvZGUsIHdlYiBicm93c2VycywgYW5kIG1hbnkgb3RoZXJzLCB5b3UgY2FuIHVzZSBrZXlib2FyZCBzaG9ydGN1dHMgdG8gc3dpdGNoIGJldHdlZW4gdGFicywgeW91IGNhbiBzZXQgc3dpdGNoIHRvIHByZXZpb3VzIHRhYiBbQ2Fwc0xvY2sgKyBRXSBhbmQgdGhlIG5leHQgd2l0aCBbQ2Fwc0xvY2sgKyBXXSIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJidXltZWFjb2ZmZWUiOiAibG9yZW5zIgogIH0sCiAgIm5hbWUiOiAiTG9tb3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IiwKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xvcmVucy1vc21hbi1kZXYvbG9tb3Rpb24iLAogICJ1dWlkIjogImxvbW90aW9uQGxvcmVucy5jb20iLAogICJ2ZXJzaW9uIjogMiwKICAidmVyc2lvbi1uYW1lIjogIjEiCn0="} }} , {"uuid": "HideItems@fablevi.github.io", "name": "Hide Items", "pname": "hide-items", "description": "Hide everything on the right box exept this button and Settings window", "link": "https://extensions.gnome.org/extension/6771/hide-items/", "shell_version_map": { "45": {"version": "7", "sha256": "1rb2h4lnanv5rvxp3kagn6x5zsqd13mifmvravhhzcmzflph6lrl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgZXZlcnl0aGluZyBvbiB0aGUgcmlnaHQgYm94IGV4ZXB0IHRoaXMgYnV0dG9uIGFuZCBTZXR0aW5ncyB3aW5kb3ciLAogICJleHRlbnNpb24taWQiOiAiSGlkZUl0ZW1zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiSGlkZUl0ZW1zIiwKICAibmFtZSI6ICJIaWRlIEl0ZW1zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhpZGVJdGVtcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmFibGV2aS9IaWRlSXRlbXMiLAogICJ1dWlkIjogIkhpZGVJdGVtc0BmYWJsZXZpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, @@ -6909,15 +6950,16 @@ "45": {"version": "2", "sha256": "14vi9cd9qm6f6z1krhh6s4l8z0121aayf1jmkgaj6i52i7559cmw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpZ2dsZSBpcyBhIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0aGF0IG1hZ25pZmllcyB0aGUgY3Vyc29yIHdoZW4gdGhlIG1vdXNlIGlzIG1vdmVkIHJhcGlkbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZ2dsZSIsCiAgIm5hbWUiOiAiV2lnZ2xlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWNodGlmcy93aWdnbGUiLAogICJ1dWlkIjogIndpZ2dsZUBtZWNodGlmcyIsCiAgInZlcnNpb24iOiAyCn0="}, "46": {"version": "3", "sha256": "14gwkx6z9v7ca13qdy1jad64bahqhs7dkrl1c7v4r49qvhkqg5ka", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpZ2dsZSBpcyBhIEdOT01FIFNoZWxsIGV4dGVuc2lvbiB0aGF0IG1hZ25pZmllcyB0aGUgY3Vyc29yIHdoZW4gdGhlIG1vdXNlIGlzIG1vdmVkIHJhcGlkbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpZ2dsZSIsCiAgIm5hbWUiOiAiV2lnZ2xlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWNodGlmcy93aWdnbGUiLAogICJ1dWlkIjogIndpZ2dsZUBtZWNodGlmcyIsCiAgInZlcnNpb24iOiAzCn0="} }} -, {"uuid": "favorite-apps@venovar.tr", "name": "Favorite Apps Menu on Top Bar Panel", "pname": "show-favorite-apps", "description": "This extension adds a favorite applications menu panel to top bar\n\n\n\nI recommend using with this extension:\nhttps://extensions.gnome.org/extension/6556/task-up/", "link": "https://extensions.gnome.org/extension/6787/show-favorite-apps/", "shell_version_map": { - "45": {"version": "7", "sha256": "1jcqmijfzfqhvrkv5agf3hq05kri1nfh1zri0278nmwmk1b9xfhh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZHMgYSBmYXZvcml0ZSBhcHBsaWNhdGlvbnMgbWVudSBwYW5lbCB0byB0b3AgYmFyIiwKICAibmFtZSI6ICJGYXZvcml0ZSBBcHBzIE1lbnUgb24gVG9wIEJhciBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZW5mYXZhcHAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnIiwKICAidXVpZCI6ICJmYXZvcml0ZS1hcHBzQHZlbm92YXIudHIiLAogICJ2ZXJzaW9uIjogNwp9"} +, {"uuid": "favorite-apps@venovar.tr", "name": "Favorite Apps Menu", "pname": "show-favorite-apps", "description": "This extension adds a favorite applications menu to top panel.\n\n\nGnome Shell 46:\nDrag drop to reorder favorites.\nMiddle click menu icon to open Gnome apps menu.\nRight click menu icon to open Gnome activities window.", "link": "https://extensions.gnome.org/extension/6787/show-favorite-apps/", "shell_version_map": { + "45": {"version": "7", "sha256": "1jcqmijfzfqhvrkv5agf3hq05kri1nfh1zri0278nmwmk1b9xfhh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZHMgYSBmYXZvcml0ZSBhcHBsaWNhdGlvbnMgbWVudSBwYW5lbCB0byB0b3AgYmFyIiwKICAibmFtZSI6ICJGYXZvcml0ZSBBcHBzIE1lbnUgb24gVG9wIEJhciBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZW5mYXZhcHAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnIiwKICAidXVpZCI6ICJmYXZvcml0ZS1hcHBzQHZlbm92YXIudHIiLAogICJ2ZXJzaW9uIjogNwp9"}, + "46": {"version": "8", "sha256": "1jfnrjd3jihaj0jnggm23a5rny6i8p97w9cccwm7x75xy1mvc231", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZHMgYSBmYXZvcml0ZSBhcHBsaWNhdGlvbnMgbWVudSB0byB0b3AgcGFuZWwiLAogICJuYW1lIjogIkZhdm9yaXRlIEFwcHMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZW5mYXZhcHBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZyIsCiAgInV1aWQiOiAiZmF2b3JpdGUtYXBwc0B2ZW5vdmFyLnRyIiwKICAidmVyc2lvbiI6IDgKfQ=="} }} , {"uuid": "totp@dkosmari.github.com", "name": "TOTP", "pname": "totp", "description": "Generate Time-based One-Time Passwords (TOTP aka OTP) for websites that use Two-Factor Authentication (2FA) like Google, Facebook, Discord, Amazon, Steam, etc.", "link": "https://extensions.gnome.org/extension/6793/totp/", "shell_version_map": { - "42": {"version": "26", "sha256": "0nc0wps5m4pa04ykqraimqjpdiw3cc0bl2ya4if3s04d92p2fh3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRvdHAiLAogICJ1dWlkIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, - "43": {"version": "26", "sha256": "0nc0wps5m4pa04ykqraimqjpdiw3cc0bl2ya4if3s04d92p2fh3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRvdHAiLAogICJ1dWlkIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, - "44": {"version": "26", "sha256": "0nc0wps5m4pa04ykqraimqjpdiw3cc0bl2ya4if3s04d92p2fh3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRvdHAiLAogICJ1dWlkIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, - "45": {"version": "27", "sha256": "1wlpp0b3099pqa49zzhllpanac6c2qa6jf5ki9ics68xhcd92shd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ka29zbWFyaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdG90cCIsCiAgInV1aWQiOiAidG90cEBka29zbWFyaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, - "46": {"version": "27", "sha256": "1wlpp0b3099pqa49zzhllpanac6c2qa6jf5ki9ics68xhcd92shd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ka29zbWFyaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdG90cCIsCiAgInV1aWQiOiAidG90cEBka29zbWFyaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="} + "42": {"version": "36", "sha256": "16isyi8r64nbzddy9pfhzkmwklvk0x9rxhiyry7arc2gvd7c09zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRvdHAiLAogICJ1dWlkIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNgp9"}, + "43": {"version": "36", "sha256": "16isyi8r64nbzddy9pfhzkmwklvk0x9rxhiyry7arc2gvd7c09zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRvdHAiLAogICJ1dWlkIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNgp9"}, + "44": {"version": "36", "sha256": "16isyi8r64nbzddy9pfhzkmwklvk0x9rxhiyry7arc2gvd7c09zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGtvc21hcmkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRvdHAiLAogICJ1dWlkIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNgp9"}, + "45": {"version": "37", "sha256": "01a51cffdqpzzpfdag7av5z11hsdjja21qkbsl0fsjcslxwad4fs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ka29zbWFyaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdG90cCIsCiAgInV1aWQiOiAidG90cEBka29zbWFyaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="}, + "46": {"version": "37", "sha256": "01a51cffdqpzzpfdag7av5z11hsdjja21qkbsl0fsjcslxwad4fs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIFRpbWUtYmFzZWQgT25lLVRpbWUgUGFzc3dvcmRzIChUT1RQIGFrYSBPVFApIGZvciB3ZWJzaXRlcyB0aGF0IHVzZSBUd28tRmFjdG9yIEF1dGhlbnRpY2F0aW9uICgyRkEpIGxpa2UgR29vZ2xlLCBGYWNlYm9vaywgRGlzY29yZCwgQW1hem9uLCBTdGVhbSwgZXRjLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvdHBAZGtvc21hcmkuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiVE9UUCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3RwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ka29zbWFyaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdG90cCIsCiAgInV1aWQiOiAidG90cEBka29zbWFyaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="} }} , {"uuid": "better-end-session-dialog@popov895.ukr.net", "name": "Better End Session Dialog", "pname": "better-end-session-dialog", "description": "Show logout/reboot/shutdown together in the end session dialog", "link": "https://extensions.gnome.org/extension/6796/better-end-session-dialog/", "shell_version_map": { "42": {"version": "10", "sha256": "040aji5xnq66mlf3hwabngwzhgmbw1vd4z6agp6r4d55y9ydblcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbG9nb3V0L3JlYm9vdC9zaHV0ZG93biB0b2dldGhlciBpbiB0aGUgZW5kIHNlc3Npb24gZGlhbG9nIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJwb3Bvdjg5NWEiCiAgfSwKICAibmFtZSI6ICJCZXR0ZXIgRW5kIFNlc3Npb24gRGlhbG9nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvYmV0dGVyLWVuZC1zZXNzaW9uLWRpYWxvZyIsCiAgInV1aWQiOiAiYmV0dGVyLWVuZC1zZXNzaW9uLWRpYWxvZ0Bwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDEwCn0="}, @@ -6950,7 +6992,11 @@ "40": {"version": "4", "sha256": "0h8lb37ic08727vw0lwk2hwxjnyk93y3l1w1q5i040da180hmpgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRpbWVyIHRvIHJlbWluZCB1c2VycyB0byB0YWtlIGJyZWFrcyBhbmQgcmVkdWNlIGV5ZSBzdHJhaW4gYnkgZm9sbG93aW5nIHRoZSAyMCcyMCcyMCBydWxlLiIsCiAgImdldHRleHQtZG9tYWluIjogIjIwMjAyMHJ1bGV0aW1lciIsCiAgIm5hbWUiOiAiMjAgMjAgMjAgUnVsZSBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmlsaXBwb2JlcnRpMjAyMC8yMC0yMC0yMC1ydWxlLXRpbWVyIiwKICAidXVpZCI6ICIyMDIwMjBydWxldGltZXJAMjAyMDIwcnVsZXRpbWVyLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "0h8lb37ic08727vw0lwk2hwxjnyk93y3l1w1q5i040da180hmpgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRpbWVyIHRvIHJlbWluZCB1c2VycyB0byB0YWtlIGJyZWFrcyBhbmQgcmVkdWNlIGV5ZSBzdHJhaW4gYnkgZm9sbG93aW5nIHRoZSAyMCcyMCcyMCBydWxlLiIsCiAgImdldHRleHQtZG9tYWluIjogIjIwMjAyMHJ1bGV0aW1lciIsCiAgIm5hbWUiOiAiMjAgMjAgMjAgUnVsZSBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmlsaXBwb2JlcnRpMjAyMC8yMC0yMC0yMC1ydWxlLXRpbWVyIiwKICAidXVpZCI6ICIyMDIwMjBydWxldGltZXJAMjAyMDIwcnVsZXRpbWVyLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="} }} -, {"uuid": "geminiaiubuntu@arda.com", "name": "Gemini AI for Gnome", "pname": "gemini-ai", "description": "This Add-on is using gemini ai 1.0 pro model for chatting. \n This extensions using thisipcan.cyou for location detection and googleapis.com for gemini model \n also if you are planing to use Vertex api you should install `gcloud` as dependency (optional) \n NOTE: This extension is not affiliated, funded, or in any way associated with Google and Gemini.", "link": "https://extensions.gnome.org/extension/6834/gemini-ai/", "shell_version_map": { +, {"uuid": "geminiaiubuntu@arda.com", "name": "Gemini AI ChatBot", "pname": "gemini-ai", "description": "This Add-on is using gemini ai 1.0 pro model for chatting. \n This extensions using thisipcan.cyou for location detection and googleapis.com for gemini model \n also if you are planing to use Vertex api you should install `gcloud` as dependency (optional) \n NOTE: This extension is not affiliated, funded, or in any way associated with Google and Gemini.", "link": "https://extensions.gnome.org/extension/6834/gemini-ai/", "shell_version_map": { + "40": {"version": "17", "sha256": "1qnjvlp1z96xg1whzjlmnkvhxzmn49zpv8zk4w2kghcr8xav2dzz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgQWRkLW9uIGlzIHVzaW5nIGdlbWluaSBhaSAxLjAgcHJvIG1vZGVsIGZvciBjaGF0dGluZy4gXG4gVGhpcyBleHRlbnNpb25zIHVzaW5nIHRoaXNpcGNhbi5jeW91IGZvciBsb2NhdGlvbiBkZXRlY3Rpb24gYW5kIGdvb2dsZWFwaXMuY29tIGZvciBnZW1pbmkgbW9kZWwgXG4gYWxzbyBpZiB5b3UgYXJlIHBsYW5pbmcgdG8gdXNlIFZlcnRleCBhcGkgeW91IHNob3VsZCBpbnN0YWxsIGBnY2xvdWRgIGFzIGRlcGVuZGVuY3kgKG9wdGlvbmFsKSBcbiBOT1RFOiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBHb29nbGUgYW5kIEdlbWluaS4iLAogICJuYW1lIjogIkdlbWluaSBBSSBDaGF0Qm90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdlbWluaWFpdWJ1bnR1IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3d3YXJkYXd3L2dub21lLWdlbWluaS1haSIsCiAgInV1aWQiOiAiZ2VtaW5pYWl1YnVudHVAYXJkYS5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, + "42": {"version": "17", "sha256": "1qnjvlp1z96xg1whzjlmnkvhxzmn49zpv8zk4w2kghcr8xav2dzz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgQWRkLW9uIGlzIHVzaW5nIGdlbWluaSBhaSAxLjAgcHJvIG1vZGVsIGZvciBjaGF0dGluZy4gXG4gVGhpcyBleHRlbnNpb25zIHVzaW5nIHRoaXNpcGNhbi5jeW91IGZvciBsb2NhdGlvbiBkZXRlY3Rpb24gYW5kIGdvb2dsZWFwaXMuY29tIGZvciBnZW1pbmkgbW9kZWwgXG4gYWxzbyBpZiB5b3UgYXJlIHBsYW5pbmcgdG8gdXNlIFZlcnRleCBhcGkgeW91IHNob3VsZCBpbnN0YWxsIGBnY2xvdWRgIGFzIGRlcGVuZGVuY3kgKG9wdGlvbmFsKSBcbiBOT1RFOiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBHb29nbGUgYW5kIEdlbWluaS4iLAogICJuYW1lIjogIkdlbWluaSBBSSBDaGF0Qm90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdlbWluaWFpdWJ1bnR1IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3d3YXJkYXd3L2dub21lLWdlbWluaS1haSIsCiAgInV1aWQiOiAiZ2VtaW5pYWl1YnVudHVAYXJkYS5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, + "43": {"version": "17", "sha256": "1qnjvlp1z96xg1whzjlmnkvhxzmn49zpv8zk4w2kghcr8xav2dzz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgQWRkLW9uIGlzIHVzaW5nIGdlbWluaSBhaSAxLjAgcHJvIG1vZGVsIGZvciBjaGF0dGluZy4gXG4gVGhpcyBleHRlbnNpb25zIHVzaW5nIHRoaXNpcGNhbi5jeW91IGZvciBsb2NhdGlvbiBkZXRlY3Rpb24gYW5kIGdvb2dsZWFwaXMuY29tIGZvciBnZW1pbmkgbW9kZWwgXG4gYWxzbyBpZiB5b3UgYXJlIHBsYW5pbmcgdG8gdXNlIFZlcnRleCBhcGkgeW91IHNob3VsZCBpbnN0YWxsIGBnY2xvdWRgIGFzIGRlcGVuZGVuY3kgKG9wdGlvbmFsKSBcbiBOT1RFOiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBHb29nbGUgYW5kIEdlbWluaS4iLAogICJuYW1lIjogIkdlbWluaSBBSSBDaGF0Qm90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdlbWluaWFpdWJ1bnR1IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3d3YXJkYXd3L2dub21lLWdlbWluaS1haSIsCiAgInV1aWQiOiAiZ2VtaW5pYWl1YnVudHVAYXJkYS5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, + "44": {"version": "17", "sha256": "1qnjvlp1z96xg1whzjlmnkvhxzmn49zpv8zk4w2kghcr8xav2dzz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgQWRkLW9uIGlzIHVzaW5nIGdlbWluaSBhaSAxLjAgcHJvIG1vZGVsIGZvciBjaGF0dGluZy4gXG4gVGhpcyBleHRlbnNpb25zIHVzaW5nIHRoaXNpcGNhbi5jeW91IGZvciBsb2NhdGlvbiBkZXRlY3Rpb24gYW5kIGdvb2dsZWFwaXMuY29tIGZvciBnZW1pbmkgbW9kZWwgXG4gYWxzbyBpZiB5b3UgYXJlIHBsYW5pbmcgdG8gdXNlIFZlcnRleCBhcGkgeW91IHNob3VsZCBpbnN0YWxsIGBnY2xvdWRgIGFzIGRlcGVuZGVuY3kgKG9wdGlvbmFsKSBcbiBOT1RFOiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBHb29nbGUgYW5kIEdlbWluaS4iLAogICJuYW1lIjogIkdlbWluaSBBSSBDaGF0Qm90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdlbWluaWFpdWJ1bnR1IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3d3YXJkYXd3L2dub21lLWdlbWluaS1haSIsCiAgInV1aWQiOiAiZ2VtaW5pYWl1YnVudHVAYXJkYS5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "45": {"version": "13", "sha256": "09n18gb9wxwabjy37qiaanv719simfir1bfyjyz1gf08zng9p0km", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgQWRkLW9uIGlzIHVzaW5nIGdlbWluaSAxLjAgcHJvIG1vZGVsIGZvciBjaGF0dGluZy4gXG4gVGhpcyBleHRlbnNpb25zIHVzaW5nIHRoaXNpcGNhbi5jeW91IGZvciBsb2NhdGlvbiBkZXRlY3Rpb24gYW5kIGdvb2dsZWFwaXMuY29tIGZvciBnZW1pbmkgbW9kZWwgXG4gYWxzbyBpZiB5b3UgYXJlIHBsYW5pbmcgdG8gdXNlIFZlcnRleCBhcGkgeW91IHNob3VsZCBpbnN0YWxsIGBnY2xvdWRgIGFzIGRlcGVuZGVuY3kgKG9wdGlvbmFsKSBcbiBOT1RFOiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBHb29nbGUgYW5kIEdlbWluaS4iLAogICJuYW1lIjogIkdlbWluaSBBSSBmb3IgR25vbWUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ2VtaW5pYWl1YnVudHUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd3dhcmRhd3cvZ25vbWUtZ2VtaW5pLWFpIiwKICAidXVpZCI6ICJnZW1pbmlhaXVidW50dUBhcmRhLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "46": {"version": "12", "sha256": "033g213z068qakd26ymwx3vzmjzp9c8q4crs9h7i08qhs6l4xys5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgQWRkLW9uIGlzIHVzaW5nIGdlbWluaSAxLjAgcHJvIG1vZGVsIGZvciBjaGF0dGluZy4gXG4gVGhpcyBleHRlbnNpb25zIHVzaW5nIHRoaXNpcGNhbi5jeW91IGZvciBsb2NhdGlvbiBkZXRlY3Rpb24gYW5kIGdvb2dsZWFwaXMuY29tIGZvciBnZW1pbmkgbW9kZWwgXG4gYWxzbyBpZiB5b3UgYXJlIHBsYW5pbmcgdG8gdXNlIFZlcnRleCBhcGkgeW91IHNob3VsZCBpbnN0YWxsIGBnY2xvdWRgIGFzIGRlcGVuZGVuY3kgKG9wdGlvbmFsKSBcbiBOT1RFOiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBHb29nbGUgYW5kIEdlbWluaS4iLAogICJuYW1lIjogIkdlbWluaSBBSSBmb3IgR25vbWUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ2VtaW5pYWl1YnVudHUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd3dhcmRhd3cvZ25vbWUtZ2VtaW5pLWFpIiwKICAidXVpZCI6ICJnZW1pbmlhaXVidW50dUBhcmRhLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"} }} @@ -7002,8 +7048,26 @@ "45": {"version": "1", "sha256": "1zsx2q845ng31nn3qavhf2wd3n7qhghr5w1kz6wvvq3i92zf8alk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbi13YWtpbmcgYmVoYXZpb3Igb2YgbG9jayBzY3JlZW4gbm90aWZpY2F0aW9ucyIsCiAgIm5hbWUiOiAiU2xlZXAgVGhyb3VnaCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9yaGVuZHJpYy9zbGVlcC10aHJvdWdoLW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInNsZWVwLXRocm91Z2gtbm90aWZpY2F0aW9uc0ByaGVuZHJpYy5naXRsYWIudGhlX25hbWVfb2ZfdGhpc19kZXNrdG9wX2Vudmlyb25tZW50Lm9yZyIsCiAgInZlcnNpb24iOiAxCn0="}, "46": {"version": "1", "sha256": "1zsx2q845ng31nn3qavhf2wd3n7qhghr5w1kz6wvvq3i92zf8alk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbi13YWtpbmcgYmVoYXZpb3Igb2YgbG9jayBzY3JlZW4gbm90aWZpY2F0aW9ucyIsCiAgIm5hbWUiOiAiU2xlZXAgVGhyb3VnaCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9yaGVuZHJpYy9zbGVlcC10aHJvdWdoLW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInNsZWVwLXRocm91Z2gtbm90aWZpY2F0aW9uc0ByaGVuZHJpYy5naXRsYWIudGhlX25hbWVfb2ZfdGhpc19kZXNrdG9wX2Vudmlyb25tZW50Lm9yZyIsCiAgInZlcnNpb24iOiAxCn0="} }} +, {"uuid": "dual-monitor-toggle@poka", "name": "Dual Monitor Toggle", "pname": "dual-monitor-toggle", "description": "Easily enable or disable your secondary monitor with a single click. This extension adds a toggle button to the system menu, allowing you to quickly switch your second screen on or off without needing to navigate through settings. It automatically detects your connected monitors and their configurations, making it simple to manage your multi-monitor setup.", "link": "https://extensions.gnome.org/extension/6898/dual-monitor-toggle/", "shell_version_map": { + "45": {"version": "5", "sha256": "0zg6g9yrhmabz74gdsh1qw7p69garmxn22pi6w8zqhggh6i9m4zy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJwb2thIiwKICAiZGVzY3JpcHRpb24iOiAiRWFzaWx5IGVuYWJsZSBvciBkaXNhYmxlIHlvdXIgc2Vjb25kYXJ5IG1vbml0b3Igd2l0aCBhIHNpbmdsZSBjbGljay4gVGhpcyBleHRlbnNpb24gYWRkcyBhIHRvZ2dsZSBidXR0b24gdG8gdGhlIHN5c3RlbSBtZW51LCBhbGxvd2luZyB5b3UgdG8gcXVpY2tseSBzd2l0Y2ggeW91ciBzZWNvbmQgc2NyZWVuIG9uIG9yIG9mZiB3aXRob3V0IG5lZWRpbmcgdG8gbmF2aWdhdGUgdGhyb3VnaCBzZXR0aW5ncy4gSXQgYXV0b21hdGljYWxseSBkZXRlY3RzIHlvdXIgY29ubmVjdGVkIG1vbml0b3JzIGFuZCB0aGVpciBjb25maWd1cmF0aW9ucywgbWFraW5nIGl0IHNpbXBsZSB0byBtYW5hZ2UgeW91ciBtdWx0aS1tb25pdG9yIHNldHVwLiIsCiAgImxpY2Vuc2UiOiAiR1BMLTMuMCIsCiAgIm5hbWUiOiAiRHVhbCBNb25pdG9yIFRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9rYS1JVC9nbm9tZS1kdWFsLW1vbml0b3ItdG9nZ2xlIiwKICAidXVpZCI6ICJkdWFsLW1vbml0b3ItdG9nZ2xlQHBva2EiLAogICJ2ZXJzaW9uIjogNQp9"}, + "46": {"version": "5", "sha256": "0zg6g9yrhmabz74gdsh1qw7p69garmxn22pi6w8zqhggh6i9m4zy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJwb2thIiwKICAiZGVzY3JpcHRpb24iOiAiRWFzaWx5IGVuYWJsZSBvciBkaXNhYmxlIHlvdXIgc2Vjb25kYXJ5IG1vbml0b3Igd2l0aCBhIHNpbmdsZSBjbGljay4gVGhpcyBleHRlbnNpb24gYWRkcyBhIHRvZ2dsZSBidXR0b24gdG8gdGhlIHN5c3RlbSBtZW51LCBhbGxvd2luZyB5b3UgdG8gcXVpY2tseSBzd2l0Y2ggeW91ciBzZWNvbmQgc2NyZWVuIG9uIG9yIG9mZiB3aXRob3V0IG5lZWRpbmcgdG8gbmF2aWdhdGUgdGhyb3VnaCBzZXR0aW5ncy4gSXQgYXV0b21hdGljYWxseSBkZXRlY3RzIHlvdXIgY29ubmVjdGVkIG1vbml0b3JzIGFuZCB0aGVpciBjb25maWd1cmF0aW9ucywgbWFraW5nIGl0IHNpbXBsZSB0byBtYW5hZ2UgeW91ciBtdWx0aS1tb25pdG9yIHNldHVwLiIsCiAgImxpY2Vuc2UiOiAiR1BMLTMuMCIsCiAgIm5hbWUiOiAiRHVhbCBNb25pdG9yIFRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9rYS1JVC9nbm9tZS1kdWFsLW1vbml0b3ItdG9nZ2xlIiwKICAidXVpZCI6ICJkdWFsLW1vbml0b3ItdG9nZ2xlQHBva2EiLAogICJ2ZXJzaW9uIjogNQp9"} + }} , {"uuid": "gbinaryclock@isopolito", "name": "gBinaryClock", "pname": "gbinaryclock", "description": "Adds a binary clock to the gnome top bar", "link": "https://extensions.gnome.org/extension/6901/gbinaryclock/", "shell_version_map": { "45": {"version": "3", "sha256": "1g4qw6cvwxh90y2rdv37vl868yb4766fc7k8frwwrgp9k7mx62jk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIHRvcCBiYXIiLAogICJuYW1lIjogImdCaW5hcnlDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dCaW5hcnlDbG9jayIsCiAgInV1aWQiOiAiZ2JpbmFyeWNsb2NrQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAzCn0="}, "46": {"version": "3", "sha256": "1g4qw6cvwxh90y2rdv37vl868yb4766fc7k8frwwrgp9k7mx62jk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIHRvcCBiYXIiLAogICJuYW1lIjogImdCaW5hcnlDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiLAogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dCaW5hcnlDbG9jayIsCiAgInV1aWQiOiAiZ2JpbmFyeWNsb2NrQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAzCn0="} }} +, {"uuid": "mock-tray@kramo.page", "name": "Mock Tray", "pname": "mock-tray", "description": "Creates an invisible system tray (TopIcons) for apps (like MEGAsync) that won't run properly without one.", "link": "https://extensions.gnome.org/extension/6913/mock-tray/", "shell_version_map": { + "45": {"version": "2", "sha256": "0vp951zha0d6glda9f7b7yp8cradssj477lymmspx19p0iwz7zcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgYW4gaW52aXNpYmxlIHN5c3RlbSB0cmF5IChUb3BJY29ucykgZm9yIGFwcHMgKGxpa2UgTUVHQXN5bmMpIHRoYXQgd29uJ3QgcnVuIHByb3Blcmx5IHdpdGhvdXQgb25lLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAia3JhLW1vIgogIH0sCiAgIm5hbWUiOiAiTW9jayBUcmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rcmEtbW8vbW9jay10cmF5LyIsCiAgInV1aWQiOiAibW9jay10cmF5QGtyYW1vLnBhZ2UiLAogICJ2ZXJzaW9uIjogMgp9"}, + "46": {"version": "2", "sha256": "0vp951zha0d6glda9f7b7yp8cradssj477lymmspx19p0iwz7zcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgYW4gaW52aXNpYmxlIHN5c3RlbSB0cmF5IChUb3BJY29ucykgZm9yIGFwcHMgKGxpa2UgTUVHQXN5bmMpIHRoYXQgd29uJ3QgcnVuIHByb3Blcmx5IHdpdGhvdXQgb25lLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJnaXRodWIiOiAia3JhLW1vIgogIH0sCiAgIm5hbWUiOiAiTW9jayBUcmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rcmEtbW8vbW9jay10cmF5LyIsCiAgInV1aWQiOiAibW9jay10cmF5QGtyYW1vLnBhZ2UiLAogICJ2ZXJzaW9uIjogMgp9"} + }} +, {"uuid": "portforwarding-extension@SJBERTRAND.github.com", "name": "Port Forwarding Extension", "pname": "port-forwarding-extension", "description": "Extension to enable port forwarding via SSH ", "link": "https://extensions.gnome.org/extension/6919/port-forwarding-extension/", "shell_version_map": { + "45": {"version": "1", "sha256": "1xzj9nj12zzc34qdskrpimlcrq37nmhh7wrwvcv05x2s8slr9rjj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TSkJFUlRSQU5EL3BvcnRmb3J3YXJkaW5nLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, + "46": {"version": "1", "sha256": "1xzj9nj12zzc34qdskrpimlcrq37nmhh7wrwvcv05x2s8slr9rjj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBlbmFibGUgcG9ydCBmb3J3YXJkaW5nIHZpYSBTU0ggIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiUG9ydCBGb3J3YXJkaW5nIEV4dGVuc2lvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3J0Zm9yd2FyZGluZy1leHRlbnNpb25AU0pCRVJUUkFORC5naXRodWIuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIsCiAgICAiNDYiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TSkJFUlRSQU5EL3BvcnRmb3J3YXJkaW5nLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicG9ydGZvcndhcmRpbmctZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="} + }} +, {"uuid": "gravatar@dsheeler.net", "name": "Gravatar", "pname": "gravatar", "description": "Synchronize GNOME Shell user icon with Gravatar. This extension is not affiliated, funded, or in any way associated with Automattic and Gravatar.", "link": "https://extensions.gnome.org/extension/6922/gravatar/", "shell_version_map": { + "46": {"version": "2", "sha256": "1hxv64cbh3jqxirzpshj35nq4hz1pam86q1n5592yw9h9kfdal6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmNocm9uaXplIEdOT01FIFNoZWxsIHVzZXIgaWNvbiB3aXRoIEdyYXZhdGFyLiBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBBdXRvbWF0dGljIGFuZCBHcmF2YXRhci4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogImRzaGVlbGVyIiwKICAgICJsaWJlcmFwYXkiOiAiZHNoZWVsZXIiLAogICAgInBheXBhbCI6ICJEYW5pZWxTaGVlbGVyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMtZ3JhdmF0YXIiLAogICJuYW1lIjogIkdyYXZhdGFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdyYXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RzaGVlbGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtZ3JhdmF0YXIiLAogICJ1dWlkIjogImdyYXZhdGFyQGRzaGVlbGVyLm5ldCIsCiAgInZlcnNpb24iOiAyCn0="} + }} +, {"uuid": "boostvolume@shaquib.dev", "name": "Volume Booster", "pname": "boost-volume", "description": "Boosts volume above limits", "link": "https://extensions.gnome.org/extension/6928/boost-volume/", "shell_version_map": { + "46": {"version": "6", "sha256": "1z4baifmz6q3h1vkm2196z08nh8z3pp2w8rxcgy7xbsmbppr9i23", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJvb3N0cyB2b2x1bWUgYWJvdmUgbGltaXRzIiwKICAibmFtZSI6ICJCb29zdCBWb2x1bWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ2IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hhcXVpYmltZGFkL2dub21lX2V4dF92b2x1bWVfYm9vc3QiLAogICJ1dWlkIjogImJvb3N0dm9sdW1lQHNoYXF1aWIuZGV2IiwKICAidmVyc2lvbiI6IDYKfQ=="} + }} ] diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix index 1b09d4da0e..37e4d249d2 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix @@ -57,9 +57,9 @@ buildPythonApplication rec { meta = with lib; { description = "Native host connector for the GNOME Shell browser extension"; - homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegration"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-browser-connector"; longDescription = '' - To use the integration, install the browser extension, and then set to true. + To use the integration, install the [browser extension](https://gitlab.gnome.org/GNOME/gnome-browser-extension), and then set `services.gnome.gnome-browser-connector.enable` to `true`. ''; license = licenses.gpl3Plus; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix index b7577888df..3401db037e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -9,7 +9,7 @@ , ninja , pkg-config , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , glib , glib-networking , gtk3 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-gsconnect"; - version = "56"; + version = "57"; outputs = [ "out" "installedTests" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GSConnect"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - hash = "sha256-V2L65Fz1WcJE2ENE8uNgIuVSXLDHokcgM4Caz1sOdZM="; + hash = "sha256-0o5CEkdFPL7bZkHIA/zFWB8sY1OYROl4P3rl24+lze0="; }; patches = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ninja pkg-config gobject-introspection # for locating typelibs - wrapGAppsHook # for wrapping daemons + wrapGAppsHook3 # for wrapping daemons desktop-file-utils # update-desktop-database ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch index 4d072f8870..040c403738 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch @@ -24,3 +24,15 @@ index fbcafbf..ef409ee 100644 if (!resp) { return null; } +diff --git a/src/color_dialog/src/main.ts b/src/color_dialog/src/main.ts +index a9637e5..5cb86ce 100644 +--- a/src/color_dialog/src/main.ts ++++ b/src/color_dialog/src/main.ts +@@ -6,6 +6,7 @@ import Gtk from 'gi://Gtk?version=3.0'; + import Gdk from 'gi://Gdk'; + + const EXT_PATH_DEFAULTS = [ ++ '/run/current-system/sw/share/gnome-shell/extensions/', + GLib.get_home_dir() + '/.local/share/gnome-shell/extensions/', + '/usr/share/gnome-shell/extensions/', + ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/valent/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/valent/default.nix index e9b5c14f14..1aa4799cd8 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/valent/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/valent/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://valent.andyholmes.ca/"; changelog = "https://github.com/andyholmes/gnome-shell-extension-valent/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/aisleriot/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/aisleriot/default.nix index e0a3722727..dfba82308d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -5,7 +5,7 @@ , pkg-config , itstool , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , meson , librsvg , libxml2 @@ -13,27 +13,25 @@ , guile , libcanberra-gtk3 , ninja -, appstream-glib , yelp-tools }: stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.30"; + version = "3.22.32"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "aisleriot"; rev = version; - sha256 = "sha256-Fj5v2h6xDqf+PPxduxGr3vTy+eZ3aIv0u/ThrheYLGQ="; + sha256 = "sha256-+U/EsKTZjWa05DbILWAxqIpMcZ0DP0l4LIYxM2wCFdM="; }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 meson ninja - appstream-glib pkg-config itstool libxml2 @@ -65,7 +63,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Aisleriot"; + homepage = "https://gitlab.gnome.org/GNOME/aisleriot"; description = "A collection of patience games written in guile scheme"; mainProgram = "sol"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/atomix/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/atomix/default.nix index 2e72d43009..7b29205470 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/atomix/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/atomix/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , python3 , gettext , gnome @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config gettext - wrapGAppsHook + wrapGAppsHook3 python3 ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Puzzle game where you move atoms to build a molecule"; mainProgram = "atomix"; - homepage = "https://wiki.gnome.org/Apps/Atomix"; + homepage = "https://gitlab.gnome.org/GNOME/atomix"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/five-or-more/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/five-or-more/default.nix index 749f0de9ac..099aecf7b4 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/five-or-more/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/five-or-more/default.nix @@ -6,7 +6,7 @@ , pkg-config , gnome , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , librsvg , libgnome-games-support , gettext @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { itstool libxml2 python3 - wrapGAppsHook + wrapGAppsHook3 vala ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Five_or_more"; + homepage = "https://gitlab.gnome.org/GNOME/five-or-more"; description = "Remove colored balls from the board by forming lines"; mainProgram = "five-or-more"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/four-in-a-row/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/four-in-a-row/default.nix index cc866abde2..a866e3797a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/four-in-a-row/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/four-in-a-row/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook3 , gettext, meson, gsound, librsvg, itstool, vala , python3, ninja, desktop-file-utils }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkg-config wrapGAppsHook gettext meson itstool vala + pkg-config wrapGAppsHook3 gettext meson itstool vala ninja python3 desktop-file-utils ]; buildInputs = [ gtk3 gsound librsvg gnome.adwaita-icon-theme ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Four-in-a-row"; + homepage = "https://gitlab.gnome.org/GNOME/four-in-a-row"; description = "Make lines of the same color to win"; mainProgram = "four-in-a-row"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-2048/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-2048/default.nix index 563d298883..fc04ee0b8f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-2048/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-2048/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , fetchpatch -, wrapGAppsHook +, wrapGAppsHook3 , meson , vala , pkg-config @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/2048"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-2048"; description = "Obtain the 2048 tile"; mainProgram = "gnome-2048"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix index 41599e6cf0..53d656b93f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "43.2"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NIUI+PbnRRwHNE/6egmpkM8dKIO8z1M0CdvgKSaNSfI="; + hash = "sha256-oryQ4KdUMSxXibkZi0knMDd1tiWDqOlnbSxqlztG/ec="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Chess"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-chess"; description = "Play the classic two-player boardgame of chess"; mainProgram = "gnome-chess"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-klotski/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-klotski/default.nix index 8545fefaa5..3b976c633e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-klotski/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-klotski/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gnome, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils +{ lib, stdenv, fetchurl, pkg-config, vala, gnome, gtk3, wrapGAppsHook3, appstream-glib, desktop-file-utils , glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support , meson, ninja, python3 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkg-config vala meson ninja python3 wrapGAppsHook + pkg-config vala meson ninja python3 wrapGAppsHook3 gettext itstool libxml2 appstream-glib desktop-file-utils gnome.adwaita-icon-theme ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Klotski"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-klotski"; description = "Slide blocks to solve the puzzle"; mainProgram = "gnome-klotski"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix index 993ad93cd9..5d21f41e60 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Mahjongg"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-mahjongg"; description = "Disassemble a pile of tiles by removing matching pairs"; mainProgram = "gnome-mahjongg"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mines/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mines/default.nix index 7594b94c7a..ee9509309e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mines/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-mines/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gnome, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gnome, gtk3, wrapGAppsHook3 , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja vala pkg-config gettext itstool python3 - libxml2 wrapGAppsHook desktop-file-utils + libxml2 wrapGAppsHook3 desktop-file-utils ]; buildInputs = [ gtk3 librsvg gnome.adwaita-icon-theme libgnome-games-support libgee ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Mines"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-mines"; description = "Clear hidden mines from a minefield"; mainProgram = "gnome-mines"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-nibbles/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-nibbles/default.nix index c0a9e3d269..58538d24bd 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-nibbles/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-nibbles/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-nibbles"; - version = "4.0.2"; + version = "4.0.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz"; - sha256 = "SF+Mnq03/xr/ANXFfZk40PXc/xyocDHyKkrjhS6HU8U="; + hash = "sha256-1xKkxpQ78ylWrfuSIvHxQ2mRHlTs67DNYffCWr16Wdo="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Guide a worm around a maze"; mainProgram = "gnome-nibbles"; - homepage = "https://wiki.gnome.org/Apps/Nibbles"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-nibbles"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-robots/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-robots/default.nix index 75f86f2c88..5222fc8160 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-robots/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-robots/default.nix @@ -4,7 +4,7 @@ , pkg-config , gnome , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , librsvg , gsound , gettext @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { vala python3 libxml2 - wrapGAppsHook + wrapGAppsHook3 gettext itstool desktop-file-utils @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Robots"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-robots"; description = "Avoid the robots and make them crash into each other"; mainProgram = "gnome-robots"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 8cd6201b16..4c84e0053b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "45.5"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "jo4rymzaSfBdAGHD+YZgILNj74TDow9bfo7U5BpX/Q8="; + hash = "sha256-ObtDHxCjH1Vq9im2aFyG1Qyknymhuv6GIZwgwVUQcKY="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Sudoku"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-sudoku"; description = "Test your logic skills in this number grid puzzle"; mainProgram = "gnome-sudoku"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-taquin/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-taquin/default.nix index b2c65ecb6c..75f68731cb 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-taquin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-taquin/default.nix @@ -5,7 +5,7 @@ , pkg-config , gnome , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , librsvg , gsound , gettext @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 meson ninja python3 @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Taquin"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-taquin"; description = "Move tiles so that they reach their places"; mainProgram = "gnome-taquin"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-tetravex/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-tetravex/default.nix index 3527f8b541..8c86a4c090 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-tetravex/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -5,7 +5,7 @@ , pkg-config , gnome , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , libxml2 , gettext , itstool @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 itstool libxml2 gnome.adwaita-icon-theme @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Tetravex"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-tetravex"; description = "Complete the puzzle by matching numbered tiles"; mainProgram = "gnome-tetravex"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix index d22ded0e5b..77cc67f41a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix @@ -8,7 +8,7 @@ , glib , gtk3 , cairo -, wrapGAppsHook +, wrapGAppsHook3 , libxml2 , python3 , gettext @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils libxml2 python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Hitori"; + homepage = "https://gitlab.gnome.org/GNOME/hitori"; description = "GTK application to generate and let you play games of Hitori"; mainProgram = "hitori"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/iagno/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/iagno/default.nix index e409b04c0a..4dc3e9eabd 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/iagno/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/iagno/default.nix @@ -6,7 +6,7 @@ , gnome , gdk-pixbuf , librsvg -, wrapGAppsHook +, wrapGAppsHook3 , itstool , gsound , libxml2 @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { vala desktop-file-utils pkg-config - wrapGAppsHook + wrapGAppsHook3 itstool libxml2 ]; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Iagno"; + homepage = "https://gitlab.gnome.org/GNOME/iagno"; description = "Computer version of the game Reversi, more popularly called Othello"; mainProgram = "iagno"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/lightsoff/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/lightsoff/default.nix index 52b2cec7e1..1884fe8691 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/lightsoff/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/lightsoff/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook +{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook3 , gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib , meson, ninja, python3 }: stdenv.mkDerivation rec { pname = "lightsoff"; - version = "40.0.1"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1aziy64g15bm83zfn3ifs20z9yvscdvsxbx132xnq77i0r3qvlxc"; + hash = "sha256-ZysVMuBkX64C8oN6ltU57c/Uw7pPcuWR3HP+R567i5I="; }; nativeBuildInputs = [ - vala pkg-config wrapGAppsHook itstool gettext appstream-glib libxml2 + vala pkg-config wrapGAppsHook3 itstool gettext appstream-glib libxml2 meson ninja python3 ]; buildInputs = [ gtk3 gnome.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Lightsoff"; + homepage = "https://gitlab.gnome.org/GNOME/lightsoff"; description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; mainProgram = "lightsoff"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/quadrapassel/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/quadrapassel/default.nix index c3a883306b..d867ad4f16 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/quadrapassel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/quadrapassel/default.nix @@ -14,7 +14,7 @@ libxml2, clutter, clutter-gtk, - wrapGAppsHook, + wrapGAppsHook3, meson, ninja, python3, @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libxml2 itstool gettext - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Classic falling-block game, Tetris"; mainProgram = "quadrapassel"; - homepage = "https://wiki.gnome.org/Apps/Quadrapassel"; + homepage = "https://gitlab.gnome.org/GNOME/quadrapassel"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/swell-foop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/swell-foop/default.nix index 98a01140fd..6a8d641035 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/swell-foop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/swell-foop/default.nix @@ -6,26 +6,26 @@ , pkg-config , vala , glib -, gtk3 -, libgnome-games-support +, gtk4 +, libgee +, libgnome-games-support_2_0 +, pango , gnome , desktop-file-utils -, clutter -, clutter-gtk , gettext , itstool , libxml2 -, wrapGAppsHook +, wrapGAppsHook4 , python3 }: stdenv.mkDerivation rec { pname = "swell-foop"; - version = "41.1"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JD96VeXnU6UQhu7CVoMg12ktWxWmanI6tZFwXg2O9t0="; + hash = "sha256-BvireAfXHOyUi4aDcfR/ut7vzLXDV+E9HvPISBiR/KM="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ninja vala pkg-config - wrapGAppsHook + wrapGAppsHook4 python3 itstool gettext @@ -43,17 +43,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk3 - libgnome-games-support - clutter - clutter-gtk + gtk4 + libgee + libgnome-games-support_2_0 + pango ]; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname; @@ -62,7 +57,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; + homepage = "https://gitlab.gnome.org/GNOME/swell-foop"; description = "Puzzle game, previously known as Same GNOME"; mainProgram = "swell-foop"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix index baac54eab9..fac4a1fb57 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix @@ -11,7 +11,7 @@ gettext, itstool, libxml2, - wrapGAppsHook, + wrapGAppsHook3, meson, ninja, python3, @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libxml2 itstool gettext - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Tali"; + homepage = "https://gitlab.gnome.org/GNOME/tali"; description = "Sort of poker with dice and less money"; mainProgram = "tali"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix index 3a89f83cb6..e2cbaaa6da 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix @@ -5,7 +5,7 @@ , gtk3 , vala , enchant2 -, wrapGAppsHook +, wrapGAppsHook3 , meson , ninja , desktop-file-utils @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -148,7 +148,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Geary"; + homepage = "https://gitlab.gnome.org/GNOME/geary"; description = "Mail client for GNOME 3"; maintainers = teams.gnome.members; license = licenses.lgpl21Plus; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gitg/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gitg/default.nix index df722bc868..923f1ccc28 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gitg/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gitg/default.nix @@ -7,7 +7,7 @@ , glib , gpgme , json-glib -, wrapGAppsHook +, wrapGAppsHook3 , libpeas , bash , gobject-introspection @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { strictDeps = true; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Gitg"; + homepage = "https://gitlab.gnome.org/GNOME/gitg"; description = "GNOME GUI client to view git repositories"; mainProgram = "gitg"; maintainers = with maintainers; [ domenkozar Luflosi ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-applets/default.nix index 194ad991c5..0270045dad 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-applets/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-applets/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-applets"; - version = "3.50.0"; + version = "3.52.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "b3kagx8WQ+YvOJ7sCLHqPfHzr+1DqzQJb6Ic+njcgKU="; + hash = "sha256-bz07QoZW/21bHT7lzLfs49Kxi1S/BFes9DtxHlXi1iw="; }; nativeBuildInputs = [ @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Applets for use with the GNOME panel"; mainProgram = "cpufreq-selector"; - homepage = "https://wiki.gnome.org/Projects/GnomeApplets"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-applets"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index baf25a27b9..f54860ba19 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -22,7 +22,7 @@ , systemd , upower , pam -, wrapGAppsHook +, wrapGAppsHook3 , writeTextFile , xkeyboard_config , xorg @@ -31,11 +31,11 @@ }: let pname = "gnome-flashback"; - version = "3.50.0"; + version = "3.52.1"; # From data/sessions/Makefile.am requiredComponentsCommon = enableGnomePanel: - [ "gnome-flashback" ] + [ ] ++ lib.optional enableGnomePanel "gnome-panel"; requiredComponentsGsd = [ "org.gnome.SettingsDaemon.A11ySettings" @@ -62,13 +62,13 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "sha256-0ExDSCICLJ+n5gh05cjNIGDI88BwPBnytAMr4lQnKv4="; + hash = "sha256-ugRhPNrbYr2iBkN8BHKZ4WAlzeG9gJXglKp3dpx4YDo="; }; # make .desktop Execs absolute postPatch = '' patch -p0 < 1.0.2 + # Fixes tests with very-recent python-dbusmock + # Remove when version > 1.1.0 (fetchpatch { - name = "0003-lomiri-system-settings-Use-GSettings-for-DT2W-value.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/29e2533efcac23e41b083b11c540c9221b71de7e.patch"; - hash = "sha256-d52d/b1ZdafaqhOljCg5E3I12XWtFAfG4rmn8CYngB4="; - }) - ] ++ lib.optionals (lib.strings.versionOlder python3.pkgs.python-dbusmock.version "0.30.1") [ - # Makes tests work with newer dbusmock, but breaks with much-newer dbusmock - # See for details: - # - https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/354 - # - https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/426 - # Remove/adjust based on merges & next LSS release, and packaged version of dbusmock - (fetchpatch { - name = "0101-lomiri-system-settings-Pass-missing-parameters-to-dbusmock.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/b9aacd88e3789dbb7578f32b31ad5b239db227a2.patch"; - hash = "sha256-jf+jMc+6QxONavlX5C9UZyX23jb6fZnYV8mWFyQGGbU="; - }) - (fetchpatch { - name = "0102-lomiri-system-settings-Fix-BT-plugin-testIsPaired.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/e39b9728e18635413f07f9c9f6ddc73208260b2a.patch"; - hash = "sha256-YUtdlQ2XcanXzsxD40SbML7fSxG75yMKz/XnaQN9YP8="; - }) - (fetchpatch { - name = "0103-lomiri-system-settings-Fix-BT-plugin-testGet-IconName-Type.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/9ad5d9324945f06f764d3a963dbfc7bccefe574b.patch"; - # Merge conflict, relevant change handled further down - excludes = [ "CMakeLists.txt" ]; - hash = "sha256-QCgkVos9Q9/8jd25rqzdEKdnBw0Re47X7B9nLH8QOQU="; + name = "0003-lomiri-system-settings-Revert-Pass-missing-parameter-to-dbusmock-bluez-PairDevice-function.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/67d9e28ebab8bdb9473d5bf8da2b7573e6848fa2.patch"; + hash = "sha256-pFWNne2UH3R5Fz9ayHvIpDXDQbXPs0k4b/oRg0fzi+s="; }) ] ++ [ diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix index 74767f41d9..682001b62e 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix @@ -5,7 +5,7 @@ , lndir , lomiri-system-settings-unwrapped , lomiri-system-settings-security-privacy -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , plugins ? [ lomiri-system-settings-security-privacy ] }: @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ lndir - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri/default.nix index 2c1b64bf0c..f9eead00da 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri/default.nix @@ -54,7 +54,7 @@ , qtmultimedia , qtsvg , telephony-service -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , xwayland }: @@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: { cmake glib # populates GSETTINGS_SCHEMAS_PATH pkg-config - wrapGAppsHook # XDG_DATA_DIRS wrapper flags for schemas + wrapGAppsHook3 # XDG_DATA_DIRS wrapper flags for schemas wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch b/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch index 1eac4fde58..dc1d1e2083 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch @@ -1,20 +1,18 @@ -From 243477a2bd6e315c77ebaf5b2ed4a9c9c4e1e22a Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Sat, 25 Nov 2023 10:49:32 +0100 +From c71d5fed4ef1f0b6d56400cddf02d8ac438168c8 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Wed, 17 Apr 2024 16:18:23 +0200 Subject: [PATCH] Mark problematic tests - ShapeMaterial requires a Qt OpenGL context, doesn't work in our sandbox - SignalSpy on QML shaders compilers don't see changes -- Scaling value from environment not picked up properly since Qt 5.15.11 - https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/34 - TypeError on some properties with Qt 5.15 https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/9 --- - tests/checkresults.sh | 89 ++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 83 insertions(+), 6 deletions(-) + tests/checkresults.sh | 88 ++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 82 insertions(+), 6 deletions(-) diff --git a/tests/checkresults.sh b/tests/checkresults.sh -index fc498985e..730b9d406 100755 +index fc498985e..b5d204d0d 100755 --- a/tests/checkresults.sh +++ b/tests/checkresults.sh @@ -22,6 +22,7 @@ ERRORS_PATTERN=' -Date: Fri, 8 Dec 2023 23:32:20 +0100 -Subject: [PATCH] packaging: ensure consistency of Cargo.lock with Cargo.toml - -2.4.0 failed to generate a consistent Cargo.lock, which made impossible -offline installs of Cairo 2.4.0. ---- - Cargo.lock | 384 +++++++++++++++++++++++++++++++---------------------- - 1 file changed, 223 insertions(+), 161 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 17d139184..67c438c18 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -57,9 +57,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - - [[package]] - name = "anstream" --version = "0.6.4" -+version = "0.6.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -+checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" - dependencies = [ - "anstyle", - "anstyle-parse", -@@ -77,30 +77,30 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - - [[package]] - name = "anstyle-parse" --version = "0.2.2" -+version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" - dependencies = [ - "utf8parse", - ] - - [[package]] - name = "anstyle-query" --version = "1.0.0" -+version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" - dependencies = [ -- "windows-sys 0.48.0", -+ "windows-sys 0.52.0", - ] - - [[package]] - name = "anstyle-wincon" --version = "3.0.1" -+version = "3.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" - dependencies = [ - "anstyle", -- "windows-sys 0.48.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -395,7 +395,7 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - - [[package]] - name = "cairo-compile" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -419,7 +419,7 @@ dependencies = [ - - [[package]] - name = "cairo-format" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-formatter", -@@ -432,7 +432,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-casm" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-utils", - "env_logger", -@@ -452,7 +452,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-compiler" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-defs", -@@ -473,7 +473,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-debug" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-proc-macros", - "cairo-lang-utils", -@@ -484,7 +484,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-defs" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-diagnostics", -@@ -504,7 +504,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-diagnostics" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-filesystem", -@@ -518,7 +518,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-eq-solver" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-utils", - "env_logger", -@@ -528,7 +528,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-filesystem" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-utils", -@@ -543,7 +543,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-formatter" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-diagnostics", -@@ -563,7 +563,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-language-server" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -591,7 +591,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-lowering" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", -@@ -621,7 +621,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-parser" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-diagnostics", - "cairo-lang-filesystem", -@@ -643,7 +643,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-plugins" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", -@@ -665,7 +665,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-proc-macros" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "quote", -@@ -674,7 +674,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-project" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-filesystem", - "cairo-lang-utils", -@@ -687,7 +687,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-runner" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "ark-ff", - "ark-secp256k1", -@@ -714,7 +714,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-semantic" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", -@@ -742,7 +742,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "bimap", -@@ -772,7 +772,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-ap-change" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-eq-solver", - "cairo-lang-sierra", -@@ -785,7 +785,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-gas" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-eq-solver", - "cairo-lang-sierra", -@@ -803,7 +803,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-generator" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", -@@ -833,7 +833,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-to-casm" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "assert_matches", - "cairo-felt", -@@ -856,7 +856,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-type-size" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-sierra", - "cairo-lang-utils", -@@ -864,7 +864,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-starknet" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-felt", -@@ -905,7 +905,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-syntax" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-filesystem", -@@ -922,7 +922,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-syntax-codegen" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "env_logger", - "genco", -@@ -932,7 +932,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-test-plugin" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-felt", -@@ -957,7 +957,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-test-runner" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-felt", -@@ -978,7 +978,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-test-utils" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-utils", - "colored", -@@ -990,7 +990,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-utils" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "env_logger", - "indexmap 2.1.0", -@@ -1009,7 +1009,7 @@ dependencies = [ - - [[package]] - name = "cairo-language-server" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-language-server", - "cairo-lang-utils", -@@ -1019,7 +1019,7 @@ dependencies = [ - - [[package]] - name = "cairo-run" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -1032,7 +1032,7 @@ dependencies = [ - - [[package]] - name = "cairo-test" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -1051,7 +1051,7 @@ dependencies = [ - "bitvec", - "cairo-felt", - "generic-array", -- "hashbrown 0.14.2", -+ "hashbrown 0.14.3", - "hex", - "keccak", - "lazy_static", -@@ -1081,9 +1081,9 @@ dependencies = [ - - [[package]] - name = "cc" --version = "1.0.84" -+version = "1.0.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856" -+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" - dependencies = [ - "libc", - ] -@@ -1096,9 +1096,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "clap" --version = "4.4.8" -+version = "4.4.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" -+checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" - dependencies = [ - "clap_builder", - "clap_derive", -@@ -1106,9 +1106,9 @@ dependencies = [ - - [[package]] - name = "clap_builder" --version = "4.4.8" -+version = "4.4.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" -+checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" - dependencies = [ - "anstream", - "anstyle", -@@ -1249,9 +1249,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - - [[package]] - name = "crypto-bigint" --version = "0.5.3" -+version = "0.5.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" -+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" - dependencies = [ - "generic-array", - "subtle", -@@ -1275,7 +1275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" - dependencies = [ - "cfg-if", -- "hashbrown 0.14.2", -+ "hashbrown 0.14.3", - "lock_api", - "once_cell", - "parking_lot_core 0.9.9", -@@ -1283,9 +1283,9 @@ dependencies = [ - - [[package]] - name = "deranged" --version = "0.3.9" -+version = "0.3.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -+checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" - dependencies = [ - "powerfmt", - ] -@@ -1396,12 +1396,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - - [[package]] - name = "errno" --version = "0.3.6" -+version = "0.3.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" -+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" - dependencies = [ - "libc", -- "windows-sys 0.48.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -1418,9 +1418,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - - [[package]] - name = "form_urlencoded" --version = "1.2.0" -+version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" - dependencies = [ - "percent-encoding", - ] -@@ -1550,7 +1550,7 @@ dependencies = [ - - [[package]] - name = "generate-syntax" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-syntax-codegen", - "cairo-lang-utils", -@@ -1582,9 +1582,9 @@ dependencies = [ - - [[package]] - name = "gimli" --version = "0.28.0" -+version = "0.28.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" -+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - - [[package]] - name = "glob" -@@ -1594,15 +1594,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - - [[package]] - name = "globset" --version = "0.4.13" -+version = "0.4.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" -+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" - dependencies = [ - "aho-corasick", - "bstr", -- "fnv", - "log", -- "regex", -+ "regex-automata", -+ "regex-syntax 0.8.2", - ] - - [[package]] -@@ -1635,9 +1635,9 @@ dependencies = [ - - [[package]] - name = "hashbrown" --version = "0.14.2" -+version = "0.14.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" -+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - dependencies = [ - "ahash 0.8.6", - "allocator-api2", -@@ -1700,9 +1700,9 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" - - [[package]] - name = "idna" --version = "0.4.0" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" - dependencies = [ - "unicode-bidi", - "unicode-normalization", -@@ -1710,17 +1710,16 @@ dependencies = [ - - [[package]] - name = "ignore" --version = "0.4.20" -+version = "0.4.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -+checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" - dependencies = [ -+ "crossbeam-deque", - "globset", -- "lazy_static", - "log", - "memchr", -- "regex", -+ "regex-automata", - "same-file", -- "thread_local", - "walkdir", - "winapi-util", - ] -@@ -1760,7 +1759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" - dependencies = [ - "equivalent", -- "hashbrown 0.14.2", -+ "hashbrown 0.14.3", - "serde", - ] - -@@ -1829,9 +1828,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - - [[package]] - name = "js-sys" --version = "0.3.65" -+version = "0.3.66" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" -+checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" - dependencies = [ - "wasm-bindgen", - ] -@@ -1915,9 +1914,9 @@ dependencies = [ - - [[package]] - name = "linux-raw-sys" --version = "0.4.11" -+version = "0.4.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" -+checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" - - [[package]] - name = "lock_api" -@@ -2017,9 +2016,9 @@ dependencies = [ - - [[package]] - name = "mio" --version = "0.8.9" -+version = "0.8.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" -+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" - dependencies = [ - "libc", - "wasi", -@@ -2179,9 +2178,9 @@ dependencies = [ - - [[package]] - name = "once_cell" --version = "1.18.0" -+version = "1.19.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - - [[package]] - name = "oorandom" -@@ -2197,9 +2196,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - - [[package]] - name = "parity-scale-codec" --version = "3.6.5" -+version = "3.6.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" -+checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" - dependencies = [ - "arrayvec", - "bitvec", -@@ -2210,9 +2209,9 @@ dependencies = [ - - [[package]] - name = "parity-scale-codec-derive" --version = "3.6.5" -+version = "3.6.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" -+checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" - dependencies = [ - "proc-macro-crate", - "proc-macro2", -@@ -2282,9 +2281,9 @@ checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" - - [[package]] - name = "percent-encoding" --version = "2.3.0" -+version = "2.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" -+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - - [[package]] - name = "petgraph" -@@ -2345,9 +2344,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - - [[package]] - name = "portable-atomic" --version = "1.5.1" -+version = "1.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" -+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - - [[package]] - name = "powerfmt" -@@ -2379,12 +2378,11 @@ dependencies = [ - - [[package]] - name = "proc-macro-crate" --version = "1.3.1" -+version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" - dependencies = [ -- "once_cell", -- "toml_edit 0.19.15", -+ "toml_edit 0.20.7", - ] - - [[package]] -@@ -2413,9 +2411,9 @@ dependencies = [ - - [[package]] - name = "proc-macro2" --version = "1.0.69" -+version = "1.0.70" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" - dependencies = [ - "unicode-ident", - ] -@@ -2623,15 +2621,15 @@ dependencies = [ - - [[package]] - name = "rustix" --version = "0.38.21" -+version = "0.38.27" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" -+checksum = "bfeae074e687625746172d639330f1de242a178bf3189b51e35a7a21573513ac" - dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", -- "windows-sys 0.48.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -2739,18 +2737,18 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.192" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" -+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.192" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" -+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" - dependencies = [ - "proc-macro2", - "quote", -@@ -2822,7 +2820,7 @@ dependencies = [ - - [[package]] - name = "sierra-compile" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-sierra", -@@ -2901,7 +2899,7 @@ dependencies = [ - - [[package]] - name = "starknet-compile" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -2992,7 +2990,7 @@ dependencies = [ - - [[package]] - name = "starknet-sierra-compile" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-sierra", -@@ -3005,7 +3003,7 @@ dependencies = [ - - [[package]] - name = "starknet-sierra-extract-code" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-starknet", -@@ -3015,7 +3013,7 @@ dependencies = [ - - [[package]] - name = "starknet-sierra-upgrade-validate" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-starknet", -@@ -3093,30 +3091,29 @@ dependencies = [ - - [[package]] - name = "termcolor" --version = "1.3.0" -+version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -+checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" - dependencies = [ - "winapi-util", - ] - - [[package]] - name = "test-case" --version = "3.2.1" -+version = "3.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" -+checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" - dependencies = [ - "test-case-macros", - ] - - [[package]] - name = "test-case-core" --version = "3.2.1" -+version = "3.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" -+checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" - dependencies = [ - "cfg-if", -- "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.39", -@@ -3124,11 +3121,10 @@ dependencies = [ - - [[package]] - name = "test-case-macros" --version = "3.2.1" -+version = "3.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" -+checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" - dependencies = [ -- "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.39", -@@ -3137,9 +3133,19 @@ dependencies = [ - - [[package]] - name = "test-log" --version = "0.2.13" -+version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f66edd6b6cd810743c0c71e1d085e92b01ce6a72782032e3f794c8284fe4bcdd" -+checksum = "6159ab4116165c99fc88cce31f99fa2c9dbe08d3691cb38da02fc3b45f357d2b" -+dependencies = [ -+ "env_logger", -+ "test-log-macros", -+] -+ -+[[package]] -+name = "test-log-macros" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ba277e77219e9eea169e8508942db1bf5d8a41ff2db9b20aab5a5aadc9fa25d" - dependencies = [ - "proc-macro2", - "quote", -@@ -3148,7 +3154,7 @@ dependencies = [ - - [[package]] - name = "tests" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "assert_matches", - "cairo-felt", -@@ -3220,16 +3226,6 @@ dependencies = [ - "thiserror-impl-no-std", - ] - --[[package]] --name = "thread_local" --version = "1.1.7" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" --dependencies = [ -- "cfg-if", -- "once_cell", --] -- - [[package]] - name = "time" - version = "0.3.30" -@@ -3352,9 +3348,9 @@ dependencies = [ - - [[package]] - name = "toml_edit" --version = "0.19.15" -+version = "0.20.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" - dependencies = [ - "indexmap 2.1.0", - "toml_datetime", -@@ -3473,18 +3469,18 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - - [[package]] - name = "unescaper" --version = "0.1.2" -+version = "0.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a96a44ae11e25afb520af4534fd7b0bd8cd613e35a78def813b8cf41631fa3c8" -+checksum = "d8f0f68e58d297ba8b22b8b5a96a87b863ba6bb46aaf51e19a4b02c5a6dd5b7f" - dependencies = [ - "thiserror", - ] - - [[package]] - name = "unicode-bidi" --version = "0.3.13" -+version = "0.3.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" -+checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" - - [[package]] - name = "unicode-ident" -@@ -3521,9 +3517,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - - [[package]] - name = "url" --version = "2.4.1" -+version = "2.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" - dependencies = [ - "form_urlencoded", - "idna", -@@ -3561,9 +3557,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - - [[package]] - name = "wasm-bindgen" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" -+checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" - dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -@@ -3571,9 +3567,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-backend" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" -+checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" - dependencies = [ - "bumpalo", - "log", -@@ -3586,9 +3582,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-macro" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" -+checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" - dependencies = [ - "quote", - "wasm-bindgen-macro-support", -@@ -3596,9 +3592,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-macro-support" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" -+checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" - dependencies = [ - "proc-macro2", - "quote", -@@ -3609,9 +3605,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-shared" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" -+checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" - - [[package]] - name = "winapi" -@@ -3662,6 +3658,15 @@ dependencies = [ - "windows-targets 0.48.5", - ] - -+[[package]] -+name = "windows-sys" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -+dependencies = [ -+ "windows-targets 0.52.0", -+] -+ - [[package]] - name = "windows-targets" - version = "0.42.2" -@@ -3692,6 +3697,21 @@ dependencies = [ - "windows_x86_64_msvc 0.48.5", - ] - -+[[package]] -+name = "windows-targets" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -+dependencies = [ -+ "windows_aarch64_gnullvm 0.52.0", -+ "windows_aarch64_msvc 0.52.0", -+ "windows_i686_gnu 0.52.0", -+ "windows_i686_msvc 0.52.0", -+ "windows_x86_64_gnu 0.52.0", -+ "windows_x86_64_gnullvm 0.52.0", -+ "windows_x86_64_msvc 0.52.0", -+] -+ - [[package]] - name = "windows_aarch64_gnullvm" - version = "0.42.2" -@@ -3704,6 +3724,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -+[[package]] -+name = "windows_aarch64_gnullvm" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" -+ - [[package]] - name = "windows_aarch64_msvc" - version = "0.42.2" -@@ -3716,6 +3742,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" -+ - [[package]] - name = "windows_i686_gnu" - version = "0.42.2" -@@ -3728,6 +3760,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -+[[package]] -+name = "windows_i686_gnu" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" -+ - [[package]] - name = "windows_i686_msvc" - version = "0.42.2" -@@ -3740,6 +3778,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -+[[package]] -+name = "windows_i686_msvc" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" -+ - [[package]] - name = "windows_x86_64_gnu" - version = "0.42.2" -@@ -3752,6 +3796,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" -+ - [[package]] - name = "windows_x86_64_gnullvm" - version = "0.42.2" -@@ -3764,6 +3814,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -+[[package]] -+name = "windows_x86_64_gnullvm" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" -+ - [[package]] - name = "windows_x86_64_msvc" - version = "0.42.2" -@@ -3776,11 +3832,17 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" -+ - [[package]] - name = "winnow" --version = "0.5.19" -+version = "0.5.26" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" -+checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" - dependencies = [ - "memchr", - ] -@@ -3817,18 +3879,18 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - - [[package]] - name = "zerocopy" --version = "0.7.25" -+version = "0.7.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" -+checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7" - dependencies = [ - "zerocopy-derive", - ] - - [[package]] - name = "zerocopy-derive" --version = "0.7.25" -+version = "0.7.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" -+checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba" - dependencies = [ - "proc-macro2", - "quote", -@@ -3837,9 +3899,9 @@ dependencies = [ - - [[package]] - name = "zeroize" --version = "1.6.0" -+version = "1.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" -+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" - dependencies = [ - "zeroize_derive", - ] --- -2.42.0 - diff --git a/third_party/nixpkgs/pkgs/development/compilers/cakelisp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cakelisp/default.nix index c71f2dd48e..4c5af8d26b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cakelisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cakelisp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation { pname = "cakelisp"; # using unstable as it's the only version that builds against gcc-13 - version = "0.3.0-unstable-2024-04-18"; + version = "0.3.0-unstable-2024-04-25"; src = fetchgit { url = "https://macoy.me/code/macoy/cakelisp"; - rev = "115ab436056602b7f3a1ca30be40edbfcc88299d"; - hash = "sha256-rgBtT24aopXLTeDffjXGvJ3RgT+QLlr50Ju9a6ccyzc="; + rev = "eb4427f555c3def9d65612672ccfe59e11b14059"; + hash = "sha256-wFyqAbHrBMFKqMYlBjS6flYHPn3Rxtaiqb1rRmlZrB4="; }; buildInputs = [ gcc ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix index adaad31b52..d29f52661b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix @@ -36,11 +36,30 @@ in // (addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 srfi-13 ]) old); cmark = addToBuildInputs pkgs.cmark; dbus = addToBuildInputsWithPkgConfig pkgs.dbus; - epoxy = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy; + epoxy = old: + (addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy old) + // lib.optionalAttrs stdenv.cc.isClang { + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=incompatible-function-pointer-types" + "-Wno-error=int-conversion" + ]; + }; espeak = addToBuildInputsWithPkgConfig pkgs.espeak-ng; exif = addToBuildInputsWithPkgConfig pkgs.libexif; - expat = addToBuildInputsWithPkgConfig pkgs.expat; - ezxdisp = addToBuildInputsWithPkgConfig pkgs.xorg.libX11; + expat = old: + (addToBuildInputsWithPkgConfig pkgs.expat old) + // lib.optionalAttrs stdenv.cc.isClang { + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=incompatible-function-pointer-types" + ]; + }; + ezxdisp = old: + (addToBuildInputsWithPkgConfig pkgs.xorg.libX11 old) + // lib.optionalAttrs stdenv.cc.isClang { + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + ]; + }; freetype = addToBuildInputsWithPkgConfig pkgs.freetype; fuse = addToBuildInputsWithPkgConfig pkgs.fuse; gl-utils = addPkgConfig; @@ -54,7 +73,14 @@ in // lib.optionalAttrs stdenv.isDarwin (addToCscOptions "-L -linotify" old); leveldb = addToBuildInputs pkgs.leveldb; magic = addToBuildInputs pkgs.file; - mdh = addToBuildInputs pkgs.pcre; + mdh = old: + (addToBuildInputs pkgs.pcre old) + // lib.optionalAttrs stdenv.cc.isClang { + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; # missing dependency in upstream egg mistie = addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 ]); mosquitto = addToPropagatedBuildInputs ([ pkgs.mosquitto ]); @@ -65,7 +91,7 @@ in openssl = addToBuildInputs pkgs.openssl; plot = addToBuildInputs pkgs.plotutils; postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql; - rocksdb = addToBuildInputs pkgs.rocksdb; + rocksdb = addToBuildInputs pkgs.rocksdb_8_3; scheme2c-compatibility = old: addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ]) (addPkgConfig old); diff --git a/third_party/nixpkgs/pkgs/development/compilers/circt/circt-llvm.nix b/third_party/nixpkgs/pkgs/development/compilers/circt/circt-llvm.nix index b3005af55f..efde87b078 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/circt/circt-llvm.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/circt/circt-llvm.nix @@ -23,7 +23,7 @@ "-DLLVM_BUILD_EXAMPLES=OFF" "-DLLVM_OPTIMIZED_TABLEGEN=ON" "-DLLVM_ENABLE_PROJECTS=mlir" - "-DLLVM_TARGETS_TO_BUILD=" + "-DLLVM_TARGETS_TO_BUILD=Native" # This option is needed to install llvm-config "-DLLVM_INSTALL_UTILS=ON" @@ -50,7 +50,9 @@ --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" # patch path for llvm-config ''; - doCheck = true; + # circt only use the mlir part of llvm, occasionally there are some unrelated failure from llvm, + # disable the llvm check, but keep the circt check enabled. + doCheck = false; checkTarget = "check-mlir"; meta = llvm.meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix index 58174f3fde..2b9f64bb6b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix @@ -7,6 +7,7 @@ , fetchFromGitHub , ninja , lit +, z3 , gitUpdater , callPackage }: @@ -17,18 +18,18 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.73.0"; + version = "1.74.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-C50PiToXrKf94Vg1yv++3xVhIuCW/KVPs0yLv5Fg0dY="; + hash = "sha256-RFvWUd98OiL2I3aFrP61LQRZr4FSKrrZ5YOblBKRCA4="; fetchSubmodules = true; }; requiredSystemFeatures = [ "big-parallel" ]; - nativeBuildInputs = [ cmake ninja git pythonEnv ]; + nativeBuildInputs = [ cmake ninja git pythonEnv z3 ]; buildInputs = [ circt-llvm ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/corretto/11.nix b/third_party/nixpkgs/pkgs/development/compilers/corretto/11.nix index 9e61e133f4..06de7a7bbd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/corretto/11.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/corretto/11.nix @@ -14,6 +14,12 @@ let inherit lib stdenv rsync runCommand testers; jdk = jdk11; gradle = gradle_7; + extraConfig = [ + # jdk11 is built with --disable-warnings-as-errors (see openjdk/11.nix) + # because of several compile errors. We need to include this parameter for + # Corretto, too. + "--disable-warnings-as-errors" + ]; version = "11.0.20.9.1"; src = fetchFromGitHub { owner = "corretto"; @@ -23,15 +29,4 @@ let }; }; in -corretto.overrideAttrs (oldAttrs: { - # jdk11 is built with --disable-warnings-as-errors (see openjdk/11.nix) - # because of several compile errors. We need to include this parameter for - # Corretto, too. Since the build is invoked via `gradle` build.gradle has to - # be adapted. - postPatch = oldAttrs.postPatch + '' - for file in $(find installers -name "build.gradle"); do - substituteInPlace $file --replace "command += archSpecificFlags" "command += archSpecificFlags + ['--disable-warnings-as-errors']" - done - ''; - -}) +corretto diff --git a/third_party/nixpkgs/pkgs/development/compilers/corretto/21.nix b/third_party/nixpkgs/pkgs/development/compilers/corretto/21.nix new file mode 100644 index 0000000000..fed3aa05f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/corretto/21.nix @@ -0,0 +1,26 @@ +{ corretto21 +, fetchFromGitHub +, gradle_7 +, jdk21 +, lib +, stdenv +, rsync +, runCommand +, testers +}: + +let + corretto = import ./mk-corretto.nix { + inherit lib stdenv rsync runCommand testers; + jdk = jdk21; + gradle = gradle_7; + version = "21.0.3.9.1"; + src = fetchFromGitHub { + owner = "corretto"; + repo = "corretto-21"; + rev = "97b366227b4dc8f5a89bbedea88b0b18c9e21886"; + sha256 = "sha256-V8UDyukDCQVTWUg4IpSKoY0qnnQ5fePbm3rxcw06Vr0="; + }; + }; +in +corretto diff --git a/third_party/nixpkgs/pkgs/development/compilers/corretto/mk-corretto.nix b/third_party/nixpkgs/pkgs/development/compilers/corretto/mk-corretto.nix index adc6a86d98..c26614e476 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/corretto/mk-corretto.nix @@ -4,6 +4,7 @@ , lib , stdenv , gradle +, extraConfig ? [ ] , rsync , runCommand , testers @@ -38,7 +39,7 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: { # `/usr/bin/rsync` is invoked to copy the source tree. We don't have that. for file in $(find installers -name "build.gradle"); do - substituteInPlace $file --replace "workingDir '/usr/bin'" "workingDir '.'" + substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" done ''; @@ -51,12 +52,13 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: { if stdenv.isDarwin then ":installers:mac:tar:packageBuildResults" else ":installers:linux:universal:tar:packageBuildResults"; + extra_config = builtins.concatStringsSep " " extraConfig; in '' runHook preBuild # Corretto's actual built is triggered via `gradle`. - gradle --console=plain --no-daemon ${task} + gradle -Pcorretto.extra_config="${extra_config}" --console=plain --no-daemon ${task} # Prepare for the installPhase so that it looks like if a normal # OpenJDK had been built. diff --git a/third_party/nixpkgs/pkgs/development/compilers/dart/package-source-builders/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/package-source-builders/default.nix index 38d07c40ec..89108420b5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dart/package-source-builders/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dart/package-source-builders/default.nix @@ -6,5 +6,7 @@ matrix = callPackage ./matrix { }; media_kit_libs_linux = callPackage ./media_kit_libs_linux { }; olm = callPackage ./olm { }; + sqlcipher_flutter_libs = callPackage ./sqlcipher_flutter_libs { }; + sqlite3 = callPackage ./sqlite3 { }; system_tray = callPackage ./system-tray { }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dart/package-source-builders/sqlcipher_flutter_libs/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/package-source-builders/sqlcipher_flutter_libs/default.nix new file mode 100644 index 0000000000..9810140339 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/dart/package-source-builders/sqlcipher_flutter_libs/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchurl +, lib +}: + +{ version, src, ... }: + +let + artifacts = lib.mapAttrs (version: sha512: + fetchurl { + url = "https://storage.googleapis.com/simon-public-euw3/assets/sqlcipher/${version}.c"; + inherit sha512; + }) + { + v4_5_7 = "11bb454d761b994f7e44f35dabd3fc8ac3b40499d6fdc29d58a38fb9b4dcdd6eb14ff3978ceb7c6f3bd5eee4a5abeec5f0453b944268f9aaf942b0366df1e73d"; + v4_5_6 = "939ae692239adc0581211a37ed9ffa8b37c8f771c830977ecb06dc6accc4c3db767ce6abeaf91133815e2ae837785affa92f4c95b2e68cb6d563bd761f3e0cb1"; + }; +in +stdenv.mkDerivation rec { + pname = "sqlcipher_flutter_libs"; + inherit version src; + inherit (src) passthru; + + installPhase = '' + runHook preInstall + + cp -r "$src" "$out" + _replace() { + URL="https://storage.googleapis.com/simon-public-euw3/assets/sqlcipher/v$1.c" + # --replace-fail messes with the file if it fails (is empty afterwards) so we do this instead + if cat "$out/linux/CMakeLists.txt" | grep "$URL" >/dev/null 2>/dev/null; then + substituteInPlace "$out/linux/CMakeLists.txt" --replace "$URL" "file://$2" + else + return 2 + fi + } + _replace "4_5_7" "${artifacts.v4_5_7}" || \ + _replace "4_5_6" "${artifacts.v4_5_6}" || \ + (echo "unknown version of sqlcipher, please add to pkgs/development/compilers/dart/package-source-builders/sqlcipher_flutter_libs" && cat linux/CMakeLists.txt | grep "https://storage.*" -o && exit 2) + + runHook postInstall + ''; + + meta.sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/dart/package-source-builders/sqlite3/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/package-source-builders/sqlite3/default.nix new file mode 100644 index 0000000000..579bc1732c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/dart/package-source-builders/sqlite3/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, lib +, writeScript +, sqlite +}: + +{ version, src, ... }: + +stdenv.mkDerivation rec { + pname = "sqlite3"; + inherit version src; + inherit (src) passthru; + + setupHook = writeScript "${pname}-setup-hook" '' + sqliteFixupHook() { + runtimeDependencies+=('${lib.getLib sqlite}') + } + + preFixupHooks+=(sqliteFixupHook) + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + ln -s '${src}'/* "$out" + + runHook postInstall + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix index e2028d92b5..f4cce2eb2f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.3.3"; in +let version = "3.3.4"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "0amlh1cx0jshd3fdrs18dp3ws3qwmi3qhjpg991330mlvwn93zik"; + sha256 = "0jicbpdhwlag51wgjbaxicj3mpvjnxx35g10ji1v8vxzas8msa32"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "0rxjd2znvzl5hznc055yda4pqbf86dim2gn6dbq72s4p0412sjyq"; + sha256 = "0l8bsrhk7ycb7q2b3w4j76qkab4py2m535qa466xj6nwlyi99i81"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "15d5gc7r2d43ylkcjcg44srcyg3c6g1s0d95pxzyff5jx287dnpk"; + sha256 = "1jdx0sk3356rn3ik9pfx19fc8ppjivcsnk1c44s72wg83ml3yiy3"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "1gggfxyn3sndgmplw1gn4k1xhcyhrsyw19k112ba0cm663vrcymc"; + sha256 = "1cm710bifr2g04h520a8r8jz75ndy4apr1y4kljknvyfc0m94wv7"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "1p82m0sr7mch0nabw2d73dys8lnpgf79b65dswaf8prnba8rn1lj"; + sha256 = "0j5j582lvlwdaqznb8bi96x3sck13l82l0p627bqpn6nm5qv21sj"; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix index 8ee0bd9e7b..11ece53971 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -25,6 +25,8 @@ assert if type == "sdk" then packages != null else true; , writeShellScript , mkNugetDeps , callPackage +, dotnetCorePackages +, xmlstarlet }: let @@ -44,6 +46,11 @@ let mkCommon = callPackage ./common.nix {}; + targetRid = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system; + + sigtool = callPackage ./sigtool.nix {}; + signAppHost = callPackage ./sign-apphost.nix {}; + in mkCommon type rec { inherit pname version; @@ -51,7 +58,11 @@ mkCommon type rec { # Some of these dependencies are `dlopen()`ed. nativeBuildInputs = [ makeWrapper - ] ++ lib.optional stdenv.isLinux autoPatchelfHook; + ] ++ lib.optional stdenv.isLinux autoPatchelfHook + ++ lib.optionals (type == "sdk" && stdenv.isDarwin) [ + xmlstarlet + sigtool + ]; buildInputs = [ stdenv.cc.cc @@ -68,6 +79,16 @@ mkCommon type rec { sourceRoot = "."; + postPatch = if type == "sdk" && stdenv.isDarwin then '' + xmlstarlet ed \ + --inplace \ + -s //_:Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${signAppHost}" \ + sdk/*/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.targets + + codesign --remove-signature packs/Microsoft.NETCore.App.Host.osx-*/*/runtimes/osx-*/native/{apphost,singlefilehost} + '' else null; + dontPatchELF = true; noDumpEnvVars = true; @@ -88,21 +109,29 @@ mkCommon type rec { # Tell autoPatchelf about runtime dependencies. # (postFixup phase is run before autoPatchelfHook.) - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.targetPlatform.isLinux '' patchelf \ --add-needed libicui18n.so \ --add-needed libicuuc.so \ $out/shared/Microsoft.NETCore.App/*/libcoreclr.so \ $out/shared/Microsoft.NETCore.App/*/*System.Globalization.Native.so \ - $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost + $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host patchelf \ --add-needed libgssapi_krb5.so \ $out/shared/Microsoft.NETCore.App/*/*System.Net.Security.Native.so \ - $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost + $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host patchelf \ --add-needed libssl.so \ $out/shared/Microsoft.NETCore.App/*/*System.Security.Cryptography.Native.OpenSsl.so \ - $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost + $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host + ''; + + # fixes: Could not load ICU data. UErrorCode: 2 + propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + (allow file-read* (subpath "/usr/share/icu")) + (allow file-read* (subpath "/private/var/db/mds/system")) + (allow mach-lookup (global-name "com.apple.SecurityServer") + (global-name "com.apple.system.opendirectoryd.membership")) ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/common.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/common.nix index a757dd36d1..e26fd0e337 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/common.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/common.nix @@ -50,9 +50,18 @@ runtime ? finalAttrs.finalPackage, runInputs ? [], run ? null, + runAllowNetworking ? false, }: let - built = runCommand "dotnet-test-${name}" { buildInputs = [ finalAttrs.finalPackage ]; } ('' + sdk = finalAttrs.finalPackage; + built = runCommand "dotnet-test-${name}" { + buildInputs = [ sdk ]; + # make sure ICU works in a sandbox + propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile + '' + (allow network-inbound (local ip)) + (allow mach-lookup (global-name "com.apple.FSEvents")) + ''; + } ('' HOME=$PWD/.home dotnet new nugetconfig dotnet nuget disable source nuget @@ -63,16 +72,26 @@ '' + build); in if run == null - then build + then built else - runCommand "${built.name}-run" { src = built; nativeBuildInputs = runInputs; } ( - lib.optionalString (runtime != null) '' - # TODO: use runtime here - export DOTNET_ROOT=${runtime} - '' + run); + runCommand "${built.name}-run" ({ + src = built; + nativeBuildInputs = [ built ] ++ runInputs; + } // lib.optionalAttrs (stdenv.isDarwin && runAllowNetworking) { + sandboxProfile = '' + (allow network-inbound (local ip)) + (allow mach-lookup (global-name "com.apple.FSEvents")) + ''; + __darwinAllowLocalNetworking = true; + }) (lib.optionalString (runtime != null) '' + # TODO: use runtime here + export DOTNET_ROOT=${runtime} + '' + run); + # Setting LANG to something other than 'C' forces the runtime to search + # for ICU, which will be required in most user environments. checkConsoleOutput = command: '' - output="$(${command})" + output="$(LANG=C.UTF-8 ${command})" # yes, older SDKs omit the comma [[ "$output" =~ Hello,?\ World! ]] && touch "$out" ''; @@ -98,6 +117,15 @@ run = checkConsoleOutput "$src/test"; }; + self-contained = mkDotnetTest { + name = "self-contained"; + template = "console"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime --sc -o $out"; + runtime = null; + run = checkConsoleOutput "$src/test"; + }; + single-file = mkDotnetTest { name = "single-file"; template = "console"; @@ -116,6 +144,7 @@ expect <<"EOF" set status 1 spawn $env(src)/test + proc abort { } { exit 2 } expect_before default abort expect -re {Now listening on: ([^\r]+)\r} { set url $expect_out(1,string) @@ -127,11 +156,14 @@ exit 1 } send \x03 + expect_before timeout abort + expect eof catch wait result exit [lindex $result 3] EOF touch $out ''; + runAllowNetworking = true; }; } // args.passthru.tests or {}; } // args.passthru or {}; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/record-downloaded-packages.patch b/third_party/nixpkgs/pkgs/development/compilers/dotnet/record-downloaded-packages.patch deleted file mode 100644 index 4c5b45939d..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/record-downloaded-packages.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a5a4a77dd77ed5c997bec6519adf7b6be3108af2 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Sun, 31 Dec 2023 01:48:31 -0400 -Subject: [PATCH 2/2] record downloaded packages - ---- - .../buildBootstrapPreviouslySB.csproj | 6 +++++ - repo-projects/Directory.Build.targets | 27 +++++++++++++++++++ - 2 files changed, 33 insertions(+) - -diff --git a/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/eng/bootstrap/buildBootstrapPreviouslySB.csproj -index d85e32ca76..280c9eaf89 100644 ---- a/eng/bootstrap/buildBootstrapPreviouslySB.csproj -+++ b/eng/bootstrap/buildBootstrapPreviouslySB.csproj -@@ -102,6 +102,12 @@ - - - -+ -+ -+ -+ - -diff --git a/repo-projects/Directory.Build.targets b/repo-projects/Directory.Build.targets -index 3fa15da862..afd7b87088 100644 ---- a/repo-projects/Directory.Build.targets -+++ b/repo-projects/Directory.Build.targets -@@ -471,6 +497,7 @@ - - - -+ - - - --- -2.40.1 - diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage0.nix index e0caad3f9a..5806a5ee6d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/stage0.nix @@ -25,8 +25,6 @@ let patchNupkgs = pkgsBuildHost.callPackage ./patch-nupkgs.nix {}; - signAppHost = callPackage ./sign-apphost.nix {}; - deps = mkNugetDeps { name = "dotnet-vmr-deps"; sourceFile = depsFile; @@ -51,12 +49,6 @@ let -s //Project -t elem -n Import \ -i \$prev -t attr -n Project -v "${./patch-restored-packages.proj}" \ src/*/Directory.Build.targets - '' + lib.optionalString stdenv.isDarwin '' - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${signAppHost}" \ - src/runtime/Directory.Build.targets ''; postConfigure = old.postConfigure or "" + '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix index 60bce2f6e4..9548f8fe06 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix @@ -47,6 +47,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/dgibson/dtc/commit/35f26d2921b68d97fefbd5a2b6e821a2f02ff65d.patch"; sha256 = "sha256-cO4f/jJX/pQL7kk4jpKUhsCVESW2ZuWaTr7z3BuvVkw="; }) + + (fetchpatch { + name = "static.patch"; + url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=3fbfdd08afd2a7a25b27433f6f5678c0fe694721"; + hash = "sha256-skK8m1s4xkK6x9AqzxiEK+1uMEmS27dBI1CdEXNFTfU="; + }) ]; env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix index 26f1ec471a..c11f471641 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "ecl"; - version = "23.9.9"; + version = "24.5.10"; src = fetchurl { url = "https://common-lisp.net/project/ecl/static/files/release/ecl-${version}.tgz"; - sha256 = "107q6gmxlsya4yv38r1x1axrgyyfgdrfkkz97zfp64bcrasdl6y5"; + hash = "sha256-5Opluxhh4OSVOGv6i8ZzvQFOltPPnZHpA4+RQ1y+Yis="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix b/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix index 033d6a46b1..6a8741be05 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.34"; + version = "0.6.36"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-AGBr4Hx/QqImQnm5lQxIgRFY0lrLQv7q++ThCIiWwNY="; + hash = "sha256-fwuAlIUPEzc2ZjKJ+4gdzXM679MAAJpg9Mh0d7LAt5s="; }; - cargoHash = "sha256-mRocHInOrLO72F5hj8+0VddMiE4LMILiJ38ASAQLrBc="; + cargoHash = "sha256-MfetCaYK5bBsV6EszNkwqlBFMykmLW7jX4gZWuIbHek="; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix index 926c98d680..3499b7390f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.46.0"; + version = "0.47.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-jj8h30QsIF5HlunrqUktHY6bCUq9gMNVlAVsAH0F0U0="; + sha256 = "sha256-HlVJR8SPwhOFn3yuxJzUWSS+xascf4pGsoKCqzBDG6Y="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_19/data.json b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_19/data.json index 988bafb05c..9eeddd3361 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_19/data.json +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_19/data.json @@ -1,20 +1,20 @@ { - "version": "3.19.0", - "engineVersion": "04817c99c9fd4956f27505204f7e344335810aed", - "dartVersion": "3.3.0", + "version": "3.19.4", + "engineVersion": "a5c24f538d05aaf66f7972fb23959d8cafb9f95a", + "dartVersion": "3.3.2", "dartHash": { - "x86_64-linux": "sha256-wUg8GpieBD84LkrqfbZ6goHKgq+ZNJFzN8DMMmHJTns=", - "aarch64-linux": "sha256-s/RiVtOLtTtA1CAcYi/okothRO/0Ph+s9eogL84V6zc=", - "x86_64-darwin": "sha256-aseeiQkv8/9yuAVMn2nxL7tNjfK2H9zM+GtXBvV6R3E=", - "aarch64-darwin": "sha256-A6Ru36rYKf+IyUTB6LZkzl+hj1fJmuMJedltiSSxtF0=" + "x86_64-linux": "sha256-eO8qcSQNWGEz/5oVaJ5tjRMnGy2aq3PbcF15z/Pi3xQ=", + "aarch64-linux": "sha256-K/sxpQAVd5Z75KPCb3XbIZ8dhuS/zTIDgO/YZoIKQjU=", + "x86_64-darwin": "sha256-Zh+nXms2NIOuS3Cc25kQT2ZKUXW3NbDZB6CugI4GJnM=", + "aarch64-darwin": "sha256-5mSNavcc3l8Cv3WkJFTjtpbR/x6MRZ1i9iwyv7V1BYQ=" }, - "flutterHash": "sha256-rIPveNuzNEvWhO/1aY0hFfmJbsV3hTm6fTfLH6pWZ7c=", + "flutterHash": "sha256-y1zU74xU8xwJAJM2TlWTbyzySvKUZ42tA6hTIYE6ies=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-U1DFJZDf7m7WL3cOHeAWa0D01nO5Trsd/EUZFbU2iY0=", - "aarch64-linux": "sha256-ACQdmNgU52jWmp9BWOzSdPEkEigXts16/pYVgbBM11k=", - "x86_64-darwin": "sha256-U1DFJZDf7m7WL3cOHeAWa0D01nO5Trsd/EUZFbU2iY0=", - "x86_64-linux": "sha256-ACQdmNgU52jWmp9BWOzSdPEkEigXts16/pYVgbBM11k=" + "aarch64-darwin": "sha256-x6L9qgzcd6HKuTV/L4iCHdyoh9eoQQqZX5B2IgLzqQI=", + "aarch64-linux": "sha256-MgDFaeQ/1cSGY751I7bExD/x8ZLw3youhpXlvcSuDaE=", + "x86_64-darwin": "sha256-x6L9qgzcd6HKuTV/L4iCHdyoh9eoQQqZX5B2IgLzqQI=", + "x86_64-linux": "sha256-MgDFaeQ/1cSGY751I7bExD/x8ZLw3youhpXlvcSuDaE=" }, "fuchsia": { "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", @@ -23,40 +23,40 @@ "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" }, "ios": { - "aarch64-darwin": "sha256-nMtIjyLeDNLERmjU8CCtmGrCckG5uXnu53zvKPEii9g=", - "aarch64-linux": "sha256-nMtIjyLeDNLERmjU8CCtmGrCckG5uXnu53zvKPEii9g=", - "x86_64-darwin": "sha256-nMtIjyLeDNLERmjU8CCtmGrCckG5uXnu53zvKPEii9g=", - "x86_64-linux": "sha256-nMtIjyLeDNLERmjU8CCtmGrCckG5uXnu53zvKPEii9g=" + "aarch64-darwin": "sha256-mqHe53QP6SCFkSkTSaoORAmCYnXYsk/MqgsIv3B2nZk=", + "aarch64-linux": "sha256-mqHe53QP6SCFkSkTSaoORAmCYnXYsk/MqgsIv3B2nZk=", + "x86_64-darwin": "sha256-mqHe53QP6SCFkSkTSaoORAmCYnXYsk/MqgsIv3B2nZk=", + "x86_64-linux": "sha256-mqHe53QP6SCFkSkTSaoORAmCYnXYsk/MqgsIv3B2nZk=" }, "linux": { - "aarch64-darwin": "sha256-XqrkmbUjNvcVSoHQlGK75JsxHEcsSrzBplRtx8xNrIU=", - "aarch64-linux": "sha256-XqrkmbUjNvcVSoHQlGK75JsxHEcsSrzBplRtx8xNrIU=", - "x86_64-darwin": "sha256-J3J+gE0nSOnhMEo7mjVLCxdZtaBrWsQHr6xfBdvHamU=", - "x86_64-linux": "sha256-J3J+gE0nSOnhMEo7mjVLCxdZtaBrWsQHr6xfBdvHamU=" + "aarch64-darwin": "sha256-6EUraGnPYhPiZZikCMZE8gDw+FAsZj5XzCsmLOLULE8=", + "aarch64-linux": "sha256-6EUraGnPYhPiZZikCMZE8gDw+FAsZj5XzCsmLOLULE8=", + "x86_64-darwin": "sha256-2B1gVRil51sQEO65pD7To7sGa3aIzXFcQbIGoX97FJM=", + "x86_64-linux": "sha256-2B1gVRil51sQEO65pD7To7sGa3aIzXFcQbIGoX97FJM=" }, "macos": { - "aarch64-darwin": "sha256-PJ1y+yZEHgB74rJAtnTZKgn6R9m4p5eiwVap6QkLx/Q=", - "aarch64-linux": "sha256-PJ1y+yZEHgB74rJAtnTZKgn6R9m4p5eiwVap6QkLx/Q=", - "x86_64-darwin": "sha256-PJ1y+yZEHgB74rJAtnTZKgn6R9m4p5eiwVap6QkLx/Q=", - "x86_64-linux": "sha256-PJ1y+yZEHgB74rJAtnTZKgn6R9m4p5eiwVap6QkLx/Q=" + "aarch64-darwin": "sha256-rcB6lKXqmLsbI/RHAtTJgV1TJQf3w4B3tohwln0Fgw0=", + "aarch64-linux": "sha256-rcB6lKXqmLsbI/RHAtTJgV1TJQf3w4B3tohwln0Fgw0=", + "x86_64-darwin": "sha256-rcB6lKXqmLsbI/RHAtTJgV1TJQf3w4B3tohwln0Fgw0=", + "x86_64-linux": "sha256-rcB6lKXqmLsbI/RHAtTJgV1TJQf3w4B3tohwln0Fgw0=" }, "universal": { - "aarch64-darwin": "sha256-GgvIuqvGPjxx6V2Mz1/TK8c6p8Frc3XKbWCgsduFhWU=", - "aarch64-linux": "sha256-SwgsbQECd1uqU11V6jKZ0hf1NZRBiC3xZuIf3cthFz0=", - "x86_64-darwin": "sha256-q8Kn9F1w1zavq/LFvPITaWSRdCkAOKi3olDVoHpeu5g=", - "x86_64-linux": "sha256-iDV57cKmDL0eUqtJ28RO+Xwomzwnaet4g30gVUXv8jY=" + "aarch64-darwin": "sha256-gX4WA4lHIinwbOK2z3RiQ3JBD73mMyazvv4VvT5mkQw=", + "aarch64-linux": "sha256-lgftQbVZhZtikAr6D8TaPoplUFtxE9uQgGLje4RHMlM=", + "x86_64-darwin": "sha256-TFfI6gifj73LbZ1kbxngnRMzH7kckyMlCJD6hRKl5ts=", + "x86_64-linux": "sha256-6pQLVOewI86CkEUUp25XuPhgVKB3yQUHiusLqK1Muug=" }, "web": { - "aarch64-darwin": "sha256-mttYf65rooXs3ctkaXrJsz4mGY2t4zqXZZ/R16EoCYw=", - "aarch64-linux": "sha256-mttYf65rooXs3ctkaXrJsz4mGY2t4zqXZZ/R16EoCYw=", - "x86_64-darwin": "sha256-mttYf65rooXs3ctkaXrJsz4mGY2t4zqXZZ/R16EoCYw=", - "x86_64-linux": "sha256-mttYf65rooXs3ctkaXrJsz4mGY2t4zqXZZ/R16EoCYw=" + "aarch64-darwin": "sha256-Fdnq1VhiGvLdqv4g3rRy3PzC2xYKozBr6kDaXeGlPLM=", + "aarch64-linux": "sha256-Fdnq1VhiGvLdqv4g3rRy3PzC2xYKozBr6kDaXeGlPLM=", + "x86_64-darwin": "sha256-Fdnq1VhiGvLdqv4g3rRy3PzC2xYKozBr6kDaXeGlPLM=", + "x86_64-linux": "sha256-Fdnq1VhiGvLdqv4g3rRy3PzC2xYKozBr6kDaXeGlPLM=" }, "windows": { - "aarch64-darwin": "sha256-/ZQwetr5gqhrvLF7/Sl/9mmi9oAg9k3s7poqVk57GIA=", - "aarch64-linux": "sha256-/ZQwetr5gqhrvLF7/Sl/9mmi9oAg9k3s7poqVk57GIA=", - "x86_64-darwin": "sha256-/ZQwetr5gqhrvLF7/Sl/9mmi9oAg9k3s7poqVk57GIA=", - "x86_64-linux": "sha256-/ZQwetr5gqhrvLF7/Sl/9mmi9oAg9k3s7poqVk57GIA=" + "aarch64-darwin": "sha256-MRzcLlYApeKPMTSkf5ql4EuvVY8PL9asAKNSFUFA/YY=", + "aarch64-linux": "sha256-MRzcLlYApeKPMTSkf5ql4EuvVY8PL9asAKNSFUFA/YY=", + "x86_64-darwin": "sha256-MRzcLlYApeKPMTSkf5ql4EuvVY8PL9asAKNSFUFA/YY=", + "x86_64-linux": "sha256-MRzcLlYApeKPMTSkf5ql4EuvVY8PL9asAKNSFUFA/YY=" } }, "pubspecLock": { @@ -845,11 +845,11 @@ "dependency": "direct main", "description": { "name": "unified_analytics", - "sha256": "fbcb0ad896a15c1ddea7ec45e8bfc92a894490e5792e07b74b2e6e992f4c77f8", + "sha256": "18204ce613142fc252b36f919d0f6dae4124df221812fe0b1bfb66251df280c1", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.8.0" + "version": "5.8.0+1" }, "usage": { "dependency": "direct main", diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix index 4a7aedf97d..f5b8b2e205 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix @@ -20,7 +20,7 @@ , makeWrapper , runCommandLocal , writeShellScript -, wrapGAppsHook +, wrapGAppsHook3 , git , which , pkg-config @@ -123,7 +123,7 @@ in nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ] - ++ lib.optionals supportsLinuxDesktopTarget [ glib wrapGAppsHook ]; + ++ lib.optionals supportsLinuxDesktopTarget [ glib wrapGAppsHook3 ]; passthru = flutter.passthru // { inherit (flutter) version; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix index 77179d7397..75f59163bd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -38,31 +38,6 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export GFORTRAN_FOR_TARGET=${pkgsBuildTarget.gfortran}/bin/${stdenv.targetPlatform.config}-gfortran '' -# On x86_64-darwin, the gnat-bootstrap bootstrap compiler that we need to build a -# native GCC with Ada support emits assembly that is accepted by the Clang -# integrated assembler, but not by the GNU assembler in cctools-port that Nix -# usually in the x86_64-darwin stdenv. In particular, x86_64-darwin gnat-bootstrap -# emits MOVQ as the mnemonic for quadword interunit moves, such as between XMM -# and general registers (e.g "movq %xmm0, %rbp"); the cctools-port assembler, -# however, only recognises MOVD for such moves. -# -# Therefore, for native x86_64-darwin builds that support Ada, we have to use -# the Clang integrated assembler to build (at least stage 1 of) GCC, but have to -# target GCC at the cctools-port GNU assembler. In the wrapped x86_64-darwin -# gnat-bootstrap, the former is provided as `as`, while the latter is provided as -# `gas`. -# -+ lib.optionalString ( - langAda - && buildPlatform == hostPlatform - && hostPlatform == targetPlatform - && targetPlatform.isx86_64 - && targetPlatform.isDarwin - ) '' - export AS_FOR_BUILD=${gnat-bootstrap}/bin/as - export AS_FOR_TARGET=${gnat-bootstrap}/bin/gas -'' - # NOTE 2020/3/18: This environment variable prevents configure scripts from # detecting the presence of aligned_alloc on Darwin. There are many facts that # collectively make this fix necessary: diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix index 4a770d993a..cc819ff8dc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, autoreconfHook, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx , xattr, autoSignDarwinBinariesHook , bash @@ -223,6 +223,12 @@ stdenv.mkDerivation (rec { stripLen = 3; extraPrefix = "libraries/Cabal/Cabal/"; }) + + # We need to be able to set AR_STAGE0 and LD_STAGE0 when cross-compiling + (fetchpatch { + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8f7dd5710b80906ea7a3e15b7bb56a883a49fed8.patch"; + hash = "sha256-C636Nq2U8YOG/av7XQmG3L1rU0bmC9/7m7Hty5pm5+s="; + }) ] ++ lib.optionals stdenv.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { @@ -334,7 +340,7 @@ stdenv.mkDerivation (rec { dontAddExtraLibs = true; nativeBuildInputs = [ - perl autoconf automake m4 python3 + perl autoreconfHook autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.10.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.10.1.nix new file mode 100644 index 0000000000..7955661f50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.10.1.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix rec { + version = "9.10.1"; + sha256 = "bf386a302d4ee054791ffd51748900f15d71760fd199157922d120cc1f89e2f7"; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix index 079bbefbae..5db97cc0d9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix @@ -29,6 +29,7 @@ , xattr , autoSignDarwinBinariesHook , bash +, srcOnly , libiconv ? null, ncurses , glibcLocales ? null @@ -116,8 +117,11 @@ -- no way to set this via the command line finalStage :: Stage finalStage = ${ - if stdenv.hostPlatform == stdenv.targetPlatform - then "Stage2" # native compiler + # Always build the stage 2 compiler if possible. Note we can currently + # assume hostPlatform == buildPlatform. + # TODO(@sternenseemann): improve this condition when we can cross-compile GHC + if stdenv.hostPlatform.canExecute stdenv.targetPlatform + then "Stage2" # native compiler or “native” cross e.g. pkgsStatic else "Stage1" # cross compiler } @@ -142,25 +146,60 @@ return $ verbosity >= Verbose '' -, ghcSrc ? (if rev != null then fetchgit else fetchurl) ({ - inherit url sha256; - } // lib.optionalAttrs (rev != null) { - inherit rev; - } // lib.optionalAttrs (postFetch != null) { - inherit postFetch; - }) +, ghcSrc ? + srcOnly { + name = "ghc-${version}"; # -source appended by srcOnly + src = + (if rev != null then fetchgit else fetchurl) ({ + inherit url sha256; + } // lib.optionalAttrs (rev != null) { + inherit rev; + } // lib.optionalAttrs (postFetch != null) { + inherit postFetch; + }); + + patches = + let + # Disable haddock generating pretty source listings to stay under 3GB on aarch64-linux + enableHyperlinkedSource = + lib.versionAtLeast version "9.8" || + !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); + in + [ + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + (if lib.versionAtLeast version "9.8" + then ./docs-sphinx-7-ghc98.patch + else ./docs-sphinx-7.patch ) + ] + ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ + # Prevent the paths module from emitting symbols that we don't use + # when building with separate outputs. + # + # These cause problems as they're not eliminated by GHC's dead code + # elimination on aarch64-darwin. (see + # https://github.com/NixOS/nixpkgs/issues/140774 for details). + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch + ] + # Prevents passing --hyperlinked-source to haddock. This is a custom + # workaround as we wait for this to be configurable via userSettings or + # similar. https://gitlab.haskell.org/ghc/ghc/-/issues/23625 + ++ lib.optionals (!enableHyperlinkedSource) [ + # TODO(@sternenseemann): Doesn't apply for GHC >= 9.8 + ../../tools/haskell/hadrian/disable-hyperlinked-source.patch + ] + # Incorrect bounds on Cabal in hadrian + # https://gitlab.haskell.org/ghc/ghc/-/issues/24100 + ++ lib.optionals (lib.elem version [ "9.8.1" "9.8.2" ]) [ + ../../tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch + ]; + } # GHC's build system hadrian built from the GHC-to-build's source tree # using our bootstrap GHC. , hadrian ? import ../../tools/haskell/hadrian/make-hadrian.nix { inherit bootPkgs lib; } { - ghcSrc = ghcSrc; + inherit ghcSrc; ghcVersion = version; userSettings = hadrianUserSettings; - # Disable haddock generating pretty source listings to stay under 3GB on aarch64-linux - enableHyperlinkedSource = - # TODO(@sternenseemann): Disabling currently doesn't work with GHC >= 9.8 - lib.versionAtLeast version "9.8" || - !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); } , # Whether to build sphinx documentation. @@ -266,21 +305,6 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; - patches = [ - # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 - (if lib.versionAtLeast version "9.8" - then ./docs-sphinx-7-ghc98.patch - else ./docs-sphinx-7.patch ) - ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ - # Prevent the paths module from emitting symbols that we don't use - # when building with separate outputs. - # - # These cause problems as they're not eliminated by GHC's dead code - # elimination on aarch64-darwin. (see - # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch - ]; - postPatch = '' patchShebangs --build . ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix b/third_party/nixpkgs/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix index 8b54ee2e35..8f791b73ab 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix @@ -15,5 +15,6 @@ in self: super: { }) (super.ghcjs.overrideScope (self: super: { # Allow transformers-compat >= 0.7 optparse-applicative = doJailbreak self.optparse-applicative_0_15_1_0; + ansi-wl-pprint = self.ansi-wl-pprint_0_6_9; })); } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix index 84109f7436..96f1db0e64 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { description = "VHDL 2008/93/87 simulator"; license = lib.licenses.gpl2Plus; mainProgram = "ghdl"; - maintainers = with lib.maintainers; [ eclairevoyant lucus16 thoughtpolice ]; + maintainers = with lib.maintainers; [ lucus16 thoughtpolice ]; platforms = lib.platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gnu-cim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gnu-cim/default.nix index b1cb9f0859..f689517196 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gnu-cim/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gnu-cim/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { postPatch = '' for fname in lib/{simulation,simset}.c; do substituteInPlace "$fname" \ - --replace \ + --replace-fail \ '#include "../../lib/cim.h"' \ '#include "../lib/cim.h"' done ''; - CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + env.CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-return-type -Wno-error=implicit-function-declaration -Wno-error=implicit-int"; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix index b9694f7d4b..4d9982f2b2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.9"; + version = "1.21.10"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-WPDFztRaABK84v96nfA+Eoq8yIGOur5QJ7uSuv4g5CE="; + hash = "sha256-kA4K/okAwe5lqKjE8MWjygLc+FwdHLE6ZSviLCE5k5Q="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch b/third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch deleted file mode 100644 index 9edf6efa85..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch +++ /dev/null @@ -1,23 +0,0 @@ -Starting from go1.14, go verifes that vendor/modules.txt matches the requirements -and replacements listed in the main module go.mod file, and it is a hard failure if -vendor/modules.txt is missing. - -Relax module consistency checks and switch back to pre go1.14 behaviour if -vendor/modules.txt is missing regardless of go version requirement in go.mod. - -This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 -See https://github.com/golang/go/issues/37948 for discussion. - -diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go -index d8fd91f1fe..8bc08e6fed 100644 ---- a/src/cmd/go/internal/modload/vendor.go -+++ b/src/cmd/go/internal/modload/vendor.go -@@ -133,7 +133,7 @@ func checkVendorConsistency() { - readVendorList() - - pre114 := false -- if semver.Compare(index.goVersionV, "v1.14") < 0 { -+ if semver.Compare(index.goVersionV, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. diff --git a/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix b/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix index 99fde9c66a..f7a05f8d14 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix @@ -2,8 +2,8 @@ let ocamlDependencies = version: - if lib.versionAtLeast version "4.2" - then with ocaml-ng.ocamlPackages_4_12; [ + if lib.versionAtLeast version "4.3" + then with ocaml-ng.ocamlPackages_4_14; [ ocaml findlib sedlex @@ -126,7 +126,7 @@ in { sha256 = "0rns6d28qzkbai6yyws08yzbyvxfn848nj0fsji7chdi0y7pzzj0"; }; haxe_4_3 = generic { - version = "4.3.3"; - sha256 = "sha256-sMklqQkVbWCYCKpOU23AjkuxzcVV7Aa8ljlFpruam9Y="; + version = "4.3.4"; + sha256 = "sha256-XGV4VG8nUofHGjHbtrLA+2kIpnnPqw5IlcNrP3EsL+Q="; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/idris2/idris2.nix b/third_party/nixpkgs/pkgs/development/compilers/idris2/idris2.nix index 421fb93cf0..452e9da97c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/idris2/idris2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/idris2/idris2.nix @@ -17,10 +17,12 @@ # NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs let - # Taken from Idris2/idris2/flake.nix. Check if the idris2 project does it this - # way, still, every now and then. - platformChez = if stdenv.system == "x86_64-linux" then chez else chez-racket; -# Uses scheme to bootstrap the build of idris2 + platformChez = + if (stdenv.system == "x86_64-linux") || (lib.versionAtLeast chez.version "10.0.0") + then + chez + else + chez-racket; in stdenv.mkDerivation rec { pname = "idris2"; version = "0.7.0"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix index 49af7e6676..ccbf8ef5da 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "inform6"; - version = "6.41-r11"; + version = "6.42-r1"; src = fetchurl { url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz"; - sha256 = "sha256-kfFfjJL03f3af1h/JdvkItuDFu8aGlM3BRa2eBB+ddY="; + sha256 = "sha256-JZaMhA4M+fDgk52tWCJokG9J/a1+FQHL7+VxAT4PgQo="; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix b/third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix index fa701d8fd2..52c278a1bd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, autoPatchelfHook , buildDotnetModule , dotnetCorePackages , fetchFromGitHub @@ -17,7 +16,6 @@ buildDotnetModule rec { hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA=="; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; projectFile = "inklecate/inklecate.csproj"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/default.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/default.nix index b143780428..130b65158c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/default.nix @@ -30,12 +30,12 @@ in { }); julia_110-bin = wrapJulia (callPackage (import ./generic-bin.nix { - version = "1.10.2"; + version = "1.10.3"; sha256 = { - x86_64-linux = "51bccc9bb245197f24e6b2394e6aa69c0dc1e41b4e300b796e17da34ef64db1e"; - aarch64-linux = "f319ff2812bece0918cb9ea6e0df54cc9412fc5ef8c0589b6a4fea485c07535d"; - x86_64-darwin = "52679b9285b9aa8354afade8cc5a6c98d30af31ee72e4e879d17cef5dd4d4213"; - aarch64-darwin = "c7392237725b54d2d145bf56ce362e502596ea4338523a91bf20ce02379cea80"; + x86_64-linux = "81b910c922fff0e27ae1f256f2cc803db81f3960215281eddd2d484721928c70"; + aarch64-linux = "2d52a61826872b3170c65f99a954bd9d21a31211cb50948056d924f811a0024f"; + x86_64-darwin = "af61600db0abdc56fffb1b47cd18c30213b8925796546b53b657e164126082b4"; + aarch64-darwin = "9ea32daa1bef34c8e48d6c76187f48fd2bf1054cc921fb8c374b737b51c9ffdd"; }; }) { }); @@ -50,8 +50,8 @@ in { }); julia_110 = wrapJulia (callPackage (import ./generic.nix { - version = "1.10.2"; - hash = "sha256-YkaHIK+8QQ608mLtJDOpITJieHLJ9pC3BNwEXMsVVAE="; + version = "1.10.3"; + hash = "sha256-2JKyEjvmTaz50F5My61/F5f2v4fDl6dIBLARyHUPbI8="; patches = [ ./patches/1.10/0001-skip-building-docs-as-it-requires-network-access.patch ./patches/1.10/0002-skip-failing-and-flaky-tests.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.9/0001-skip-building-doc.patch b/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.9/0001-skip-building-doc.patch deleted file mode 100644 index 3b507bf26d..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/patches/1.9/0001-skip-building-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ce73c82ebadeb2e358e1a8e244eef723ffa96c76 Mon Sep 17 00:00:00 2001 -From: Nick Cao -Date: Tue, 20 Sep 2022 18:42:31 +0800 -Subject: [PATCH 1/2] skip building doc - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 94df626014..418f6ff268 100644 ---- a/Makefile -+++ b/Makefile -@@ -229,7 +229,7 @@ define stringreplace - endef - - --install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html -+install: $(build_depsbindir)/stringreplace - ifeq ($(BUNDLE_DEBUG_LIBS),1) - @$(MAKE) $(QUIET_MAKE) all - else --- -2.38.1 - diff --git a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix index e2fc481d3b..68b648846e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.9.23"; + version = "1.9.24"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "125yb2yzah7laf38m78pysvcd5a16b129a06rckrpylsmcx7s4wk"; + sha256 = "sha256-63to4BAp+me8jQYO5UwSAY8sYN3EOM8h2xRRcimqaTs="; }; propagatedBuildInputs = [ jre ] ; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix index 0d9202df8a..82a9d63ab3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix @@ -56,9 +56,54 @@ let then tools.bintools else bootBintools; - in rec { + in { - libllvm = callPackage ./llvm { + libllvm = callPackage ../common/llvm { + src = fetch "llvm" "1pzx9zrmd7r3481sbhwvkms68fwhffpp4mmz45dgrkjpyl2q96kx"; + polly_src = fetch "polly" "1yfm9ixda4a2sx7ak5vswijx4ydk5lv1c1xh39xmd2kh299y4m12"; + patches = [ + # When cross-compiling we configure llvm-config-native with an approximation + # of the flags used for the normal LLVM build. To avoid the need for building + # a native libLLVM.so (which would fail) we force llvm-config to be linked + # statically against the necessary LLVM components always. + ../common/llvm/llvm-config-link-static.patch + # Fix llvm being miscompiled by some gccs. See llvm/llvm-project#49955 + # Fix llvm being miscompiled by some gccs. See https://github.com/llvm/llvm-project/issues/49955 + ./llvm/fix-llvm-issue-49955.patch + + ./llvm/gnu-install-dirs.patch + # On older CPUs (e.g. Hydra/wendy) we'd be getting an error in this test. + (fetchpatch { + name = "uops-CMOV16rm-noreg.diff"; + url = "https://github.com/llvm/llvm-project/commit/9e9f991ac033.diff"; + sha256 = "sha256:12s8vr6ibri8b48h2z38f3afhwam10arfiqfy4yg37bmc054p5hi"; + stripLen = 1; + }) + + # Fix musl build. + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; + relative = "llvm"; + hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; + }) + + # Backport gcc-13 fixes with missing includes. + (fetchpatch { + name = "signals-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; + hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; + stripLen = 1; + }) + (fetchpatch { + name = "base64-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; + hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; + stripLen = 1; + }) + ]; + pollyPatches = [ + ./llvm/gnu-install-dirs-polly.patch + ]; inherit llvm_meta; }; @@ -74,7 +119,7 @@ let ./clang/gnu-install-dirs.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit clang-tools-extra_src llvm_meta; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix deleted file mode 100644 index 4745345a3f..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix +++ /dev/null @@ -1,357 +0,0 @@ -{ lib, stdenv, llvm_meta -, pkgsBuildBuild -, fetch -, fetchpatch -, cmake -, python3 -, libffi -, enableGoldPlugin ? libbfd.hasPluginAPI -, libbfd -, libpfm -, libxml2 -, ncurses -, version -, release_version -, zlib -, buildLlvmTools -, debugVersion ? false -, doCheck ? stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl) - && (stdenv.hostPlatform == stdenv.buildPlatform) -, enableManpages ? false -, enableSharedLibraries ? !stdenv.hostPlatform.isStatic -# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 -# broken for the armv7l builder -, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch -, enablePolly ? false -}: - -let - inherit (lib) optional optionals optionalString; - - # Used when creating a version-suffixed symlink of libLLVM.dylib - shortVersion = with lib; - concatStringsSep "." (take 1 (splitString "." release_version)); - - # Ordinarily we would just the `doCheck` and `checkDeps` functionality - # `mkDerivation` gives us to manage our test dependencies (instead of breaking - # out `doCheck` as a package level attribute). - # - # Unfortunately `lit` does not forward `$PYTHONPATH` to children processes, in - # particular the children it uses to do feature detection. - # - # This means that python deps we add to `checkDeps` (which the python - # interpreter is made aware of via `$PYTHONPATH` – populated by the python - # setup hook) are not picked up by `lit` which causes it to skip tests. - # - # Adding `python3.withPackages (ps: [ ... ])` to `checkDeps` also doesn't work - # because this package is shadowed in `$PATH` by the regular `python3` - # package. - # - # So, we "manually" assemble one python derivation for the package to depend - # on, taking into account whether checks are enabled or not: - python = if doCheck then - let - checkDeps = ps: with ps; [ psutil ]; - in python3.withPackages checkDeps - else python3; - -in stdenv.mkDerivation (rec { - pname = "llvm"; - inherit version; - - src = fetch pname "1pzx9zrmd7r3481sbhwvkms68fwhffpp4mmz45dgrkjpyl2q96kx"; - polly_src = fetch "polly" "1yfm9ixda4a2sx7ak5vswijx4ydk5lv1c1xh39xmd2kh299y4m12"; - - unpackPhase = '' - unpackFile $src - mv llvm-${release_version}* llvm - sourceRoot=$PWD/llvm - '' + optionalString enablePolly '' - unpackFile $polly_src - mv polly-* $sourceRoot/tools/polly - ''; - - outputs = [ "out" "lib" "dev" "python" ]; - - nativeBuildInputs = [ cmake python ] - ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; - - buildInputs = [ libxml2 libffi ] - ++ optional enablePFM libpfm; # exegesis - - propagatedBuildInputs = optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ ncurses ] - ++ [ zlib ]; - - patches = [ - # When cross-compiling we configure llvm-config-native with an approximation - # of the flags used for the normal LLVM build. To avoid the need for building - # a native libLLVM.so (which would fail) we force llvm-config to be linked - # statically against the necessary LLVM components always. - ../../common/llvm/llvm-config-link-static.patch - # Fix llvm being miscompiled by some gccs. See llvm/llvm-project#49955 - # Fix llvm being miscompiled by some gccs. See https://github.com/llvm/llvm-project/issues/49955 - ./fix-llvm-issue-49955.patch - - ./gnu-install-dirs.patch - # On older CPUs (e.g. Hydra/wendy) we'd be getting an error in this test. - (fetchpatch { - name = "uops-CMOV16rm-noreg.diff"; - url = "https://github.com/llvm/llvm-project/commit/9e9f991ac033.diff"; - sha256 = "sha256:12s8vr6ibri8b48h2z38f3afhwam10arfiqfy4yg37bmc054p5hi"; - stripLen = 1; - }) - - # Fix musl build. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; - relative = "llvm"; - hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; - }) - - # Backport gcc-13 fixes with missing includes. - (fetchpatch { - name = "signals-gcc-13.patch"; - url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; - hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; - stripLen = 1; - }) - (fetchpatch { - name = "base64-gcc-13.patch"; - url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; - hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; - stripLen = 1; - }) - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" - '' + '' - # FileSystem permissions tests fail with various special bits - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - rm unittests/Support/Path.cpp - substituteInPlace unittests/IR/CMakeLists.txt \ - --replace "PassBuilderCallbacksTest.cpp" "" - rm unittests/IR/PassBuilderCallbacksTest.cpp - # TODO: Fix failing tests: - rm test/DebugInfo/X86/vla-multi.ll - '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../common/llvm/TLI-musl.patch} - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "add_subdirectory(DynamicLibrary)" "" - rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - # valgrind unhappy with musl or glibc, but fails w/musl only - rm test/CodeGen/AArch64/wineh4.mir - '' + optionalString stdenv.hostPlatform.isAarch32 '' - # skip failing X86 test cases on 32-bit ARM - rm test/DebugInfo/X86/convert-debugloc.ll - rm test/DebugInfo/X86/convert-inlined.ll - rm test/DebugInfo/X86/convert-linked.ll - rm test/tools/dsymutil/X86/op-convert.test - rm test/tools/gold/X86/split-dwarf.ll - rm test/tools/llvm-objcopy/MachO/universal-object.test - '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' - # Seems to require certain floating point hardware (NEON?) - rm test/ExecutionEngine/frem.ll - '' + '' - patchShebangs test/BugPoint/compile-custom.ll.py - '' + '' - # Tweak tests to ignore namespace part of type to support - # gcc-12: https://gcc.gnu.org/PR103598. - # The change below mangles strings like: - # CHECK-NEXT: Starting llvm::Function pass manager run. - # to: - # CHECK-NEXT: Starting {{.*}}Function pass manager run. - for f in \ - test/Other/new-pass-manager.ll \ - test/Other/new-pm-O0-defaults.ll \ - test/Other/new-pm-defaults.ll \ - test/Other/new-pm-lto-defaults.ll \ - test/Other/new-pm-thinlto-defaults.ll \ - test/Other/pass-pipeline-parsing.ll \ - test/Transforms/Inline/cgscc-incremental-invalidate.ll \ - test/Transforms/Inline/clear-analyses.ll \ - test/Transforms/LoopUnroll/unroll-loop-invalidation.ll \ - test/Transforms/SCCP/ipsccp-preserve-analysis.ll \ - test/Transforms/SCCP/preserve-analysis.ll \ - test/Transforms/SROA/dead-inst.ll \ - test/tools/gold/X86/new-pm.ll \ - ; do - echo "PATCH: $f" - substituteInPlace $f \ - --replace 'Starting llvm::' 'Starting {{.*}}' \ - --replace 'Finished llvm::' 'Finished {{.*}}' - done - '' + '' - # gcc-13 fix - sed -i '/#include /i#include ' \ - include/llvm/DebugInfo/Symbolize/DIPrinter.h - ''; - - preConfigure = '' - # Workaround for configure flags that need to have spaces - cmakeFlagsArray+=( - -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - # E.g. mesa.drivers use the build-id as a cache key (see #93946): - LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; - - hardeningDisable = [ "trivialautovarinit" ]; - - cmakeBuildType = if debugVersion then "Debug" else "Release"; - - cmakeFlags = with stdenv; let - # These flags influence llvm-config's BuildVariables.inc in addition to the - # general build. We need to make sure these are also passed via - # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native - # will return different results from the cross llvm-config. - # - # Some flags don't need to be repassed because LLVM already does so (like - # CMAKE_BUILD_TYPE), others are irrelevant to the result. - flagsForLlvmConfig = [ - "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ optionals enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ]; - in flagsForLlvmConfig ++ [ - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_ENABLE_DUMP=ON" - ] ++ optionals stdenv.hostPlatform.isStatic [ - # Disables building of shared libs, -fPIC is still injected by cc-wrapper - "-DLLVM_ENABLE_PIC=OFF" - "-DLLVM_BUILD_STATIC=ON" - # libxml2 needs to be disabled because the LLVM build system ignores its .la - # file and doesn't link zlib as well. - # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 - "-DLLVM_ENABLE_LIBXML2=OFF" - ] ++ optionals enableManpages [ - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (enableGoldPlugin) [ - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals isDarwin [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ - "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ( - let - nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; - nativeBintools = nativeCC.bintools.bintools; - nativeToolchainFlags = [ - "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" - "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" - "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" - "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" - "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" - ]; - # We need to repass the custom GNUInstallDirs values, otherwise CMake - # will choose them for us, leading to wrong results in llvm-config-native - nativeInstallFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" - "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" - ]; - in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" - + lib.concatStringsSep ";" (lib.concatLists [ - flagsForLlvmConfig - nativeToolchainFlags - nativeInstallFlags - ]) - ) - ]; - - postBuild = '' - rm -fR $out - ''; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - ''; - - postInstall = '' - mkdir -p $python/share - mv $out/share/opt-viewer $python/share/opt-viewer - moveToOutput "bin/llvm-config*" "$dev" - substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' - '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib - '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; - - inherit doCheck; - - checkTarget = "check-all"; - - requiredSystemFeatures = [ "big-parallel" ]; - meta = llvm_meta // { - homepage = "https://llvm.org/"; - description = "A collection of modular and reusable compiler and toolchain technologies"; - longDescription = '' - The LLVM Project is a collection of modular and reusable compiler and - toolchain technologies. Despite its name, LLVM has little to do with - traditional virtual machines. The name "LLVM" itself is not an acronym; it - is the full name of the project. - LLVM began as a research project at the University of Illinois, with the - goal of providing a modern, SSA-based compilation strategy capable of - supporting both static and dynamic compilation of arbitrary programming - languages. Since then, LLVM has grown to be an umbrella project consisting - of a number of subprojects, many of which are being used in production by - a wide variety of commercial and open source projects as well as being - widely used in academic research. Code in the LLVM project is licensed - under the "Apache 2.0 License with LLVM exceptions". - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "llvm-manpages"; - - buildPhase = '' - make docs-llvm-man - ''; - - propagatedBuildInputs = []; - - installPhase = '' - make -C docs install - ''; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLVM ${version}"; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix index ecdbd14e98..9348e19e6d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix @@ -82,9 +82,49 @@ in let then tools.bintools else bootBintools; - in rec { + in { - libllvm = callPackage ./llvm { + libllvm = callPackage ../common/llvm { + patches = [ + # When cross-compiling we configure llvm-config-native with an approximation + # of the flags used for the normal LLVM build. To avoid the need for building + # a native libLLVM.so (which would fail) we force llvm-config to be linked + # statically against the necessary LLVM components always. + ../common/llvm/llvm-config-link-static.patch + + ./llvm/gnu-install-dirs.patch + + # Fix random compiler crashes: https://bugs.llvm.org/show_bug.cgi?id=50611 + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4764a4f8c920912a2bfd8b0eea57273acfe0d8a8/trunk/no-strict-aliasing-DwarfCompileUnit.patch"; + sha256 = "18l6mrvm2vmwm77ckcnbjvh6ybvn72rhrb799d4qzwac4x2ifl7g"; + stripLen = 1; + }) + + # Fix musl build. + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; + relative = "llvm"; + hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; + }) + + # Backport gcc-13 fixes with missing includes. + (fetchpatch { + name = "signals-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; + hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; + stripLen = 1; + }) + (fetchpatch { + name = "base64-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; + hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; + stripLen = 1; + }) + ]; + pollyPatches = [ + ./llvm/gnu-install-dirs-polly.patch + ]; inherit llvm_meta; }; @@ -105,7 +145,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix deleted file mode 100644 index 58e742b9b4..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix +++ /dev/null @@ -1,315 +0,0 @@ -{ lib, stdenv, llvm_meta -, pkgsBuildBuild -, src -, fetchpatch -, cmake -, python3 -, libffi -, enableGoldPlugin ? libbfd.hasPluginAPI -, libbfd -, libpfm -, libxml2 -, ncurses -, version -, release_version -, zlib -, which -, buildLlvmTools -, debugVersion ? false -, doCheck ? stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl) - && (stdenv.hostPlatform == stdenv.buildPlatform) -, enableManpages ? false -, enableSharedLibraries ? !stdenv.hostPlatform.isStatic -# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 -# broken for the armv7l builder -, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch -, enablePolly ? false -}: - -let - inherit (lib) optional optionals optionalString; - - # Used when creating a version-suffixed symlink of libLLVM.dylib - shortVersion = with lib; - concatStringsSep "." (take 1 (splitString "." release_version)); - - # Ordinarily we would just the `doCheck` and `checkDeps` functionality - # `mkDerivation` gives us to manage our test dependencies (instead of breaking - # out `doCheck` as a package level attribute). - # - # Unfortunately `lit` does not forward `$PYTHONPATH` to children processes, in - # particular the children it uses to do feature detection. - # - # This means that python deps we add to `checkDeps` (which the python - # interpreter is made aware of via `$PYTHONPATH` – populated by the python - # setup hook) are not picked up by `lit` which causes it to skip tests. - # - # Adding `python3.withPackages (ps: [ ... ])` to `checkDeps` also doesn't work - # because this package is shadowed in `$PATH` by the regular `python3` - # package. - # - # So, we "manually" assemble one python derivation for the package to depend - # on, taking into account whether checks are enabled or not: - python = if doCheck then - let - checkDeps = ps: with ps; [ psutil ]; - in python3.withPackages checkDeps - else python3; - -in stdenv.mkDerivation (rec { - pname = "llvm"; - inherit version; - - inherit src; - sourceRoot = "${src.name}/${pname}"; - - outputs = [ "out" "lib" "dev" "python" ]; - - nativeBuildInputs = [ cmake python ] - ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; - - buildInputs = [ libxml2 libffi ] - ++ optional enablePFM libpfm; # exegesis - - propagatedBuildInputs = optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ ncurses ] - ++ [ zlib ]; - - nativeCheckInputs = [ which ]; - - patches = [ - # When cross-compiling we configure llvm-config-native with an approximation - # of the flags used for the normal LLVM build. To avoid the need for building - # a native libLLVM.so (which would fail) we force llvm-config to be linked - # statically against the necessary LLVM components always. - ../../common/llvm/llvm-config-link-static.patch - - ./gnu-install-dirs.patch - - # Fix random compiler crashes: https://bugs.llvm.org/show_bug.cgi?id=50611 - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4764a4f8c920912a2bfd8b0eea57273acfe0d8a8/trunk/no-strict-aliasing-DwarfCompileUnit.patch"; - sha256 = "18l6mrvm2vmwm77ckcnbjvh6ybvn72rhrb799d4qzwac4x2ifl7g"; - stripLen = 1; - }) - - # Fix musl build. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; - relative = "llvm"; - hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; - }) - - # Backport gcc-13 fixes with missing includes. - (fetchpatch { - name = "signals-gcc-13.patch"; - url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; - hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; - stripLen = 1; - }) - (fetchpatch { - name = "base64-gcc-13.patch"; - url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; - hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; - stripLen = 1; - }) - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" - '' + '' - # FileSystem permissions tests fail with various special bits - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - rm unittests/Support/Path.cpp - substituteInPlace unittests/IR/CMakeLists.txt \ - --replace "PassBuilderCallbacksTest.cpp" "" - rm unittests/IR/PassBuilderCallbacksTest.cpp - rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test - '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../common/llvm/TLI-musl.patch} - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "add_subdirectory(DynamicLibrary)" "" - rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - # valgrind unhappy with musl or glibc, but fails w/musl only - rm test/CodeGen/AArch64/wineh4.mir - '' + optionalString stdenv.hostPlatform.isAarch32 '' - # skip failing X86 test cases on 32-bit ARM - rm test/DebugInfo/X86/convert-debugloc.ll - rm test/DebugInfo/X86/convert-inlined.ll - rm test/DebugInfo/X86/convert-linked.ll - rm test/tools/dsymutil/X86/op-convert.test - rm test/tools/gold/X86/split-dwarf.ll - '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' - # Seems to require certain floating point hardware (NEON?) - rm test/ExecutionEngine/frem.ll - '' + '' - patchShebangs test/BugPoint/compile-custom.ll.py - ''; - - preConfigure = '' - # Workaround for configure flags that need to have spaces - cmakeFlagsArray+=( - -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - # E.g. mesa.drivers use the build-id as a cache key (see #93946): - LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; - - hardeningDisable = [ "trivialautovarinit" ]; - - cmakeBuildType = if debugVersion then "Debug" else "Release"; - - cmakeFlags = with stdenv; let - # These flags influence llvm-config's BuildVariables.inc in addition to the - # general build. We need to make sure these are also passed via - # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native - # will return different results from the cross llvm-config. - # - # Some flags don't need to be repassed because LLVM already does so (like - # CMAKE_BUILD_TYPE), others are irrelevant to the result. - flagsForLlvmConfig = [ - "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ optionals enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ]; - in flagsForLlvmConfig ++ [ - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_ENABLE_DUMP=ON" - ] ++ optionals stdenv.hostPlatform.isStatic [ - # Disables building of shared libs, -fPIC is still injected by cc-wrapper - "-DLLVM_ENABLE_PIC=OFF" - "-DLLVM_BUILD_STATIC=ON" - # libxml2 needs to be disabled because the LLVM build system ignores its .la - # file and doesn't link zlib as well. - # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 - "-DLLVM_ENABLE_LIBXML2=OFF" - ] ++ optionals enableManpages [ - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (enableGoldPlugin) [ - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals isDarwin [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ - "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ( - let - nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; - nativeBintools = nativeCC.bintools.bintools; - nativeToolchainFlags = [ - "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" - "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" - "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" - "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" - "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" - ]; - # We need to repass the custom GNUInstallDirs values, otherwise CMake - # will choose them for us, leading to wrong results in llvm-config-native - nativeInstallFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" - "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" - ]; - in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" - + lib.concatStringsSep ";" (lib.concatLists [ - flagsForLlvmConfig - nativeToolchainFlags - nativeInstallFlags - ]) - ) - ]; - - postBuild = '' - rm -fR $out - ''; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - ''; - - postInstall = '' - mkdir -p $python/share - mv $out/share/opt-viewer $python/share/opt-viewer - moveToOutput "bin/llvm-config*" "$dev" - substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' - '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib - '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; - - inherit doCheck; - - checkTarget = "check-all"; - - requiredSystemFeatures = [ "big-parallel" ]; - meta = llvm_meta // { - homepage = "https://llvm.org/"; - description = "A collection of modular and reusable compiler and toolchain technologies"; - longDescription = '' - The LLVM Project is a collection of modular and reusable compiler and - toolchain technologies. Despite its name, LLVM has little to do with - traditional virtual machines. The name "LLVM" itself is not an acronym; it - is the full name of the project. - LLVM began as a research project at the University of Illinois, with the - goal of providing a modern, SSA-based compilation strategy capable of - supporting both static and dynamic compilation of arbitrary programming - languages. Since then, LLVM has grown to be an umbrella project consisting - of a number of subprojects, many of which are being used in production by - a wide variety of commercial and open source projects as well as being - widely used in academic research. Code in the LLVM project is licensed - under the "Apache 2.0 License with LLVM exceptions". - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "llvm-manpages"; - - buildPhase = '' - make docs-llvm-man - ''; - - propagatedBuildInputs = []; - - installPhase = '' - make -C docs install - ''; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLVM ${version}"; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix index fb1b8743b6..f7368050d6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix @@ -1,6 +1,6 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake , preLibcCrossHeaders -, libxml2, python3, fetchFromGitHub, substitute, substituteAll, overrideCC, wrapCCWith, wrapBintoolsWith +, libxml2, python3, fetchFromGitHub, substitute, substituteAll, fetchpatch, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvm @@ -78,9 +78,28 @@ in let then tools.bintools else bootBintools; - in rec { + in { - libllvm = callPackage ./llvm { + libllvm = callPackage ../common/llvm { + patches = [ + ./llvm/gnu-install-dirs.patch + + # Fix musl build. + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; + relative = "llvm"; + hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; + }) + # fix RuntimeDyld usage on aarch64-linux (e.g. python312Packages.numba tests) + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/2e1b838a889f9793d4bcd5dbfe10db9796b77143.patch"; + relative = "llvm"; + hash = "sha256-Ot45P/iwaR4hkcM3xtLwfryQNgHI6pv6ADjv98tgdZA="; + }) + ]; + pollyPatches = [ + ./llvm/gnu-install-dirs-polly.patch + ]; inherit llvm_meta; }; @@ -96,7 +115,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix deleted file mode 100644 index 124d07e4bb..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix +++ /dev/null @@ -1,323 +0,0 @@ -{ lib, stdenv, llvm_meta -, pkgsBuildBuild -, monorepoSrc -, runCommand -, fetchpatch -, cmake -, python3 -, libffi -, enableGoldPlugin ? libbfd.hasPluginAPI -, libbfd -, libpfm -, libxml2 -, ncurses -, version -, release_version -, zlib -, which -, buildLlvmTools -, debugVersion ? false -, doCheck ? stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl) - && (stdenv.hostPlatform == stdenv.buildPlatform) -, enableManpages ? false -, enableSharedLibraries ? !stdenv.hostPlatform.isStatic -# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 -# broken for the armv7l builder -, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch -, enablePolly ? true -}: - -let - inherit (lib) optional optionals optionalString; - - # Used when creating a version-suffixed symlink of libLLVM.dylib - shortVersion = with lib; - concatStringsSep "." (take 1 (splitString "." release_version)); - - # Ordinarily we would just the `doCheck` and `checkDeps` functionality - # `mkDerivation` gives us to manage our test dependencies (instead of breaking - # out `doCheck` as a package level attribute). - # - # Unfortunately `lit` does not forward `$PYTHONPATH` to children processes, in - # particular the children it uses to do feature detection. - # - # This means that python deps we add to `checkDeps` (which the python - # interpreter is made aware of via `$PYTHONPATH` – populated by the python - # setup hook) are not picked up by `lit` which causes it to skip tests. - # - # Adding `python3.withPackages (ps: [ ... ])` to `checkDeps` also doesn't work - # because this package is shadowed in `$PATH` by the regular `python3` - # package. - # - # So, we "manually" assemble one python derivation for the package to depend - # on, taking into account whether checks are enabled or not: - python = if doCheck then - let - checkDeps = ps: with ps; [ psutil ]; - in python3.withPackages checkDeps - else python3; - -in stdenv.mkDerivation (rec { - pname = "llvm"; - inherit version; - - src = runCommand "${pname}-src-${version}" {} ('' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - cp -r ${monorepoSrc}/third-party "$out" - '' + lib.optionalString enablePolly '' - chmod u+w "$out/${pname}/tools" - cp -r ${monorepoSrc}/polly "$out/${pname}/tools" - ''); - - sourceRoot = "${src.name}/${pname}"; - - outputs = [ "out" "lib" "dev" "python" ]; - - nativeBuildInputs = [ cmake python ] - ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; - - buildInputs = [ libxml2 libffi ] - ++ optional enablePFM libpfm; # exegesis - - propagatedBuildInputs = [ ncurses zlib ]; - - nativeCheckInputs = [ which ]; - - patches = [ - ./gnu-install-dirs.patch - - # Fix musl build. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; - relative = "llvm"; - hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; - }) - # fix RuntimeDyld usage on aarch64-linux (e.g. python312Packages.numba tests) - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/2e1b838a889f9793d4bcd5dbfe10db9796b77143.patch"; - relative = "llvm"; - hash = "sha256-Ot45P/iwaR4hkcM3xtLwfryQNgHI6pv6ADjv98tgdZA="; - }) - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" - '' + '' - # FileSystem permissions tests fail with various special bits - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - rm unittests/Support/Path.cpp - substituteInPlace unittests/IR/CMakeLists.txt \ - --replace "PassBuilderCallbacksTest.cpp" "" - rm unittests/IR/PassBuilderCallbacksTest.cpp - rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test - '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../common/llvm/TLI-musl.patch} - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "add_subdirectory(DynamicLibrary)" "" - rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - # valgrind unhappy with musl or glibc, but fails w/musl only - rm test/CodeGen/AArch64/wineh4.mir - '' + optionalString stdenv.hostPlatform.isAarch32 '' - # skip failing X86 test cases on 32-bit ARM - rm test/DebugInfo/X86/convert-debugloc.ll - rm test/DebugInfo/X86/convert-inlined.ll - rm test/DebugInfo/X86/convert-linked.ll - rm test/tools/dsymutil/X86/op-convert.test - rm test/tools/gold/X86/split-dwarf.ll - rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s - rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s - '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' - # Seems to require certain floating point hardware (NEON?) - rm test/ExecutionEngine/frem.ll - '' + optionalString stdenv.hostPlatform.isRiscV '' - rm test/ExecutionEngine/frem.ll - rm test/ExecutionEngine/mov64zext32.ll - rm test/ExecutionEngine/test-interp-vec-arithm_float.ll - rm test/ExecutionEngine/test-interp-vec-arithm_int.ll - rm test/ExecutionEngine/test-interp-vec-logical.ll - rm test/ExecutionEngine/test-interp-vec-setcond-fp.ll - rm test/ExecutionEngine/test-interp-vec-setcond-int.ll - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "CrashRecoveryTest.cpp" "" - rm unittests/Support/CrashRecoveryTest.cpp - substituteInPlace unittests/ExecutionEngine/Orc/CMakeLists.txt \ - --replace "OrcCAPITest.cpp" "" - rm unittests/ExecutionEngine/Orc/OrcCAPITest.cpp - '' + '' - patchShebangs test/BugPoint/compile-custom.ll.py - ''; - - preConfigure = '' - # Workaround for configure flags that need to have spaces - cmakeFlagsArray+=( - -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - # E.g. mesa.drivers use the build-id as a cache key (see #93946): - LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; - - hardeningDisable = [ "trivialautovarinit" ]; - - cmakeBuildType = if debugVersion then "Debug" else "Release"; - - cmakeFlags = with stdenv; let - # These flags influence llvm-config's BuildVariables.inc in addition to the - # general build. We need to make sure these are also passed via - # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native - # will return different results from the cross llvm-config. - # - # Some flags don't need to be repassed because LLVM already does so (like - # CMAKE_BUILD_TYPE), others are irrelevant to the result. - flagsForLlvmConfig = [ - "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ optionals enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ]; - in flagsForLlvmConfig ++ [ - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_ENABLE_DUMP=ON" - ] ++ optionals stdenv.hostPlatform.isStatic [ - # Disables building of shared libs, -fPIC is still injected by cc-wrapper - "-DLLVM_ENABLE_PIC=OFF" - "-DLLVM_BUILD_STATIC=ON" - "-DLLVM_LINK_LLVM_DYLIB=off" - # libxml2 needs to be disabled because the LLVM build system ignores its .la - # file and doesn't link zlib as well. - # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 - "-DLLVM_ENABLE_LIBXML2=OFF" - ] ++ optionals enableManpages [ - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (enableGoldPlugin) [ - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals isDarwin [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ - "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ( - let - nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; - nativeBintools = nativeCC.bintools.bintools; - nativeToolchainFlags = [ - "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" - "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" - "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" - "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" - "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" - ]; - # We need to repass the custom GNUInstallDirs values, otherwise CMake - # will choose them for us, leading to wrong results in llvm-config-native - nativeInstallFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" - "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" - ]; - in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" - + lib.concatStringsSep ";" (lib.concatLists [ - flagsForLlvmConfig - nativeToolchainFlags - nativeInstallFlags - ]) - ) - ]; - - postBuild = '' - rm -fR $out - ''; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - ''; - - postInstall = '' - mkdir -p $python/share - mv $out/share/opt-viewer $python/share/opt-viewer - moveToOutput "bin/llvm-config*" "$dev" - substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' - '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib - '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; - - inherit doCheck; - - checkTarget = "check-all"; - - # For the update script: - passthru.monorepoSrc = monorepoSrc; - - requiredSystemFeatures = [ "big-parallel" ]; - meta = llvm_meta // { - homepage = "https://llvm.org/"; - description = "A collection of modular and reusable compiler and toolchain technologies"; - longDescription = '' - The LLVM Project is a collection of modular and reusable compiler and - toolchain technologies. Despite its name, LLVM has little to do with - traditional virtual machines. The name "LLVM" itself is not an acronym; it - is the full name of the project. - LLVM began as a research project at the University of Illinois, with the - goal of providing a modern, SSA-based compilation strategy capable of - supporting both static and dynamic compilation of arbitrary programming - languages. Since then, LLVM has grown to be an umbrella project consisting - of a number of subprojects, many of which are being used in production by - a wide variety of commercial and open source projects as well as being - widely used in academic research. Code in the LLVM project is licensed - under the "Apache 2.0 License with LLVM exceptions". - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "llvm-manpages"; - - buildPhase = '' - make docs-llvm-man - ''; - - propagatedBuildInputs = []; - - installPhase = '' - make -C docs install - ''; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLVM ${version}"; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix index ce8426857e..5003ef32d1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix @@ -84,9 +84,66 @@ in let then tools.bintools else bootBintools; - in rec { + in { - libllvm = callPackage ./llvm { + libllvm = callPackage ../common/llvm { + patches = [ + ./llvm/gnu-install-dirs.patch + + # Running the tests involves invoking binaries (like `opt`) that depend on + # the LLVM dylibs and reference them by absolute install path (i.e. their + # nix store path). + # + # Because we have not yet run the install phase (we're running these tests + # as part of `checkPhase` instead of `installCheckPhase`) these absolute + # paths do not exist yet; to work around this we point the loader (`ld` on + # unix, `dyld` on macOS) at the `lib` directory which will later become this + # package's `lib` output. + # + # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` + # dir but: + # - this doesn't generalize well to other platforms; `lit` doesn't forward + # `DYLD_LIBRARY_PATH` (macOS): + # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 + # - even if `lit` forwarded this env var, we actually cannot set + # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because + # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for + # "protected processes" (i.e. the python interpreter that runs `lit`): + # https://stackoverflow.com/a/35570229 + # - other LLVM subprojects deal with this issue by having their `lit` + # configuration set these env vars for us; it makes sense to do the same + # for LLVM: + # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 + # + # !!! TODO: look into upstreaming this patch + ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch + + # `lit` has a mode where it executes run lines as a shell script which is + # constructs; this is problematic for macOS because it means that there's + # another process in between `lit` and the binaries being tested. As noted + # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our + # tests fail with dyld errors. + # + # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when + # present in the test configuration. + # + # It's not clear to me why this isn't an issue for LLVM developers running + # on macOS (nothing about this _seems_ nix specific).. + ./llvm/lit-shell-script-runner-set-dyld-library-path.patch + + # Fix musl build. + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; + relative = "llvm"; + hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; + }) + ]; + pollyPatches = [ + ./llvm/gnu-install-dirs-polly.patch + + # Just like the `llvm-lit-cfg` patch, but for `polly`. + ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch + ]; inherit llvm_meta; }; @@ -102,7 +159,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix deleted file mode 100644 index d7ebcbcf8b..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix +++ /dev/null @@ -1,442 +0,0 @@ -{ lib, stdenv, llvm_meta -, pkgsBuildBuild -, monorepoSrc -, runCommand -, fetchpatch -, cmake -, darwin -, ninja -, python3 -, python3Packages -, libffi -, enableGoldPlugin ? libbfd.hasPluginAPI -, libbfd -, libpfm -, libxml2 -, ncurses -, version -, release_version -, zlib -, which -, sysctl -, buildLlvmTools -, debugVersion ? false -, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) - && (stdenv.hostPlatform == stdenv.buildPlatform) -, enableManpages ? false -, enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? stdenv.isLinux /* PFM only supports Linux */ - # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 - # broken for the armv7l builder - && !stdenv.hostPlatform.isAarch -, enablePolly ? true -}: - -let - inherit (lib) optional optionals optionalString; - - # Used when creating a version-suffixed symlink of libLLVM.dylib - shortVersion = with lib; - concatStringsSep "." (take 1 (splitString "." release_version)); - - # Ordinarily we would just the `doCheck` and `checkDeps` functionality - # `mkDerivation` gives us to manage our test dependencies (instead of breaking - # out `doCheck` as a package level attribute). - # - # Unfortunately `lit` does not forward `$PYTHONPATH` to children processes, in - # particular the children it uses to do feature detection. - # - # This means that python deps we add to `checkDeps` (which the python - # interpreter is made aware of via `$PYTHONPATH` – populated by the python - # setup hook) are not picked up by `lit` which causes it to skip tests. - # - # Adding `python3.withPackages (ps: [ ... ])` to `checkDeps` also doesn't work - # because this package is shadowed in `$PATH` by the regular `python3` - # package. - # - # So, we "manually" assemble one python derivation for the package to depend - # on, taking into account whether checks are enabled or not: - python = if doCheck then - # Note that we _explicitly_ ask for a python interpreter for our host - # platform here; the splicing that would ordinarily take care of this for - # us does not seem to work once we use `withPackages`. - let - checkDeps = ps: with ps; [ psutil ]; - in pkgsBuildBuild.targetPackages.python3.withPackages checkDeps - else python3; - -in stdenv.mkDerivation (rec { - pname = "llvm"; - inherit version; - - src = runCommand "${pname}-src-${version}" {} ('' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - cp -r ${monorepoSrc}/third-party "$out" - '' + lib.optionalString enablePolly '' - chmod u+w "$out/${pname}/tools" - cp -r ${monorepoSrc}/polly "$out/${pname}/tools" - ''); - - sourceRoot = "${src.name}/${pname}"; - - outputs = [ "out" "lib" "dev" "python" ]; - - nativeBuildInputs = [ cmake ninja python ] - ++ optionals enableManpages [ - # Note: we intentionally use `python3Packages` instead of `python3.pkgs`; - # splicing does *not* work with the latter. (TODO: fix) - python3Packages.sphinx python3Packages.recommonmark - ]; - - buildInputs = [ libxml2 libffi ] - ++ optional enablePFM libpfm; # exegesis - - propagatedBuildInputs = [ ncurses zlib ]; - - nativeCheckInputs = [ - which - ] ++ lib.optional stdenv.isDarwin sysctl; - - patches = [ - ./gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./lit-shell-script-runner-set-dyld-library-path.patch - - # Fix musl build. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; - relative = "llvm"; - hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; - }) - ] ++ lib.optionals enablePolly [ - ./gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" - - # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick - # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 - rm test/MC/ELF/cfi-version.ll - - # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) - # and thus fails under the sandbox: - substituteInPlace unittests/Support/Host.cpp \ - --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" - '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' - # This test tries to call the intrinsics `@llvm.roundeven.f32` and - # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` - # and `roundeven` on x86_64 macOS. - # - # However these functions are glibc specific so the test fails: - # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html - # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html - # - # TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it - # pass there? - substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ - --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ - --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" - - # This test fails on darwin x86_64 because `sw_vers` reports a different - # macOS version than what LLVM finds by reading - # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into - # the sandbox on macOS). - # - # The `sw_vers` provided by nixpkgs reports the macOS version associated - # with the `CoreFoundation` framework with which it was built. Because - # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what - # `sw_vers` reports is not guaranteed to match the macOS version of the host - # that's building this derivation. - # - # Astute readers will note that we only _patch_ this test on aarch64-darwin - # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright. - # So why does this test pass on aarch64? - # - # Well, it seems that `sw_vers` on aarch64 actually links against the _host_ - # CoreFoundation framework instead of the nixpkgs provided one. - # - # Not entirely sure what the right fix is here. I'm assuming aarch64 - # `sw_vers` doesn't intentionally link against the host `CoreFoundation` - # (still digging into how this ends up happening, will follow up) but that - # aside I think the more pertinent question is: should we be patching LLVM's - # macOS version detection logic to use `sw_vers` instead of reading host - # paths? This *is* a way in which details about builder machines can creep - # into the artifacts that are produced, affecting reproducibility, but it's - # not clear to me when/where/for what this even gets used in LLVM. - # - # TODO(@rrbutani): fix/follow-up - substituteInPlace unittests/Support/Host.cpp \ - --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" - - # This test fails with a `dysmutil` crash; have not yet dug into what's - # going on here (TODO(@rrbutani)). - rm test/tools/dsymutil/ARM/obfuscated.test - '' + '' - # FileSystem permissions tests fail with various special bits - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - rm unittests/Support/Path.cpp - substituteInPlace unittests/IR/CMakeLists.txt \ - --replace "PassBuilderCallbacksTest.cpp" "" - rm unittests/IR/PassBuilderCallbacksTest.cpp - rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test - # timing-based tests are trouble - rm utils/lit/tests/googletest-timeout.py - '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../common/llvm/TLI-musl.patch} - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "add_subdirectory(DynamicLibrary)" "" - rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - # valgrind unhappy with musl or glibc, but fails w/musl only - rm test/CodeGen/AArch64/wineh4.mir - '' + optionalString stdenv.hostPlatform.isAarch32 '' - # skip failing X86 test cases on 32-bit ARM - rm test/DebugInfo/X86/convert-debugloc.ll - rm test/DebugInfo/X86/convert-inlined.ll - rm test/DebugInfo/X86/convert-linked.ll - rm test/tools/dsymutil/X86/op-convert.test - rm test/tools/gold/X86/split-dwarf.ll - rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s - rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s - - # !!! Note: these tests are removed in LLVM 16. - # - # See here for context: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999790443 - rm test/CodeGen/RISCV/rv32zbp.ll - rm test/CodeGen/RISCV/rv64zbp.ll - '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' - # Seems to require certain floating point hardware (NEON?) - rm test/ExecutionEngine/frem.ll - '' + '' - patchShebangs test/BugPoint/compile-custom.ll.py - ''; - - preConfigure = '' - # Workaround for configure flags that need to have spaces - cmakeFlagsArray+=( - -DLLVM_LIT_ARGS="-svj''${NIX_BUILD_CORES} --no-progress-bar" - ) - ''; - - # Defensive check: some paths (that we make symlinks to) depend on the release - # version, for example: - # - https://github.com/llvm/llvm-project/blob/406bde9a15136254f2b10d9ef3a42033b3cb1b16/clang/lib/Headers/CMakeLists.txt#L185 - # - # So we want to sure that the version in the source matches the release - # version we were given. - # - # We do this check here, in the LLVM build, because it happens early. - postConfigure = let - v = lib.versions; - major = v.major release_version; - minor = v.minor release_version; - patch = v.patch release_version; - in '' - # $1: part, $2: expected - check_version() { - part="''${1^^}" - part="$(cat include/llvm/Config/llvm-config.h | grep "#define LLVM_VERSION_''${part} " | cut -d' ' -f3)" - - if [[ "$part" != "$2" ]]; then - echo >&2 \ - "mismatch in the $1 version! we have version ${release_version}" \ - "and expected the $1 version to be '$2'; the source has '$part' instead" - exit 3 - fi - } - - check_version major ${major} - check_version minor ${minor} - check_version patch ${patch} - ''; - - # E.g. mesa.drivers use the build-id as a cache key (see #93946): - LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; - - hardeningDisable = [ "trivialautovarinit" ]; - - cmakeBuildType = if debugVersion then "Debug" else "Release"; - - cmakeFlags = with stdenv; let - # These flags influence llvm-config's BuildVariables.inc in addition to the - # general build. We need to make sure these are also passed via - # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native - # will return different results from the cross llvm-config. - # - # Some flags don't need to be repassed because LLVM already does so (like - # CMAKE_BUILD_TYPE), others are irrelevant to the result. - flagsForLlvmConfig = [ - "-DLLVM_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/llvm" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ optionals enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ]; - in flagsForLlvmConfig ++ [ - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_ENABLE_DUMP=ON" - ] ++ optionals stdenv.hostPlatform.isStatic [ - # Disables building of shared libs, -fPIC is still injected by cc-wrapper - "-DLLVM_ENABLE_PIC=OFF" - "-DLLVM_BUILD_STATIC=ON" - "-DLLVM_LINK_LLVM_DYLIB=off" - # libxml2 needs to be disabled because the LLVM build system ignores its .la - # file and doesn't link zlib as well. - # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 - "-DLLVM_ENABLE_LIBXML2=OFF" - ] ++ optionals enableManpages [ - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (enableGoldPlugin) [ - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals isDarwin [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ - "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ( - let - nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; - nativeBintools = nativeCC.bintools.bintools; - nativeToolchainFlags = [ - "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" - "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" - "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" - "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" - "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" - ]; - # We need to repass the custom GNUInstallDirs values, otherwise CMake - # will choose them for us, leading to wrong results in llvm-config-native - nativeInstallFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" - "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" - ]; - in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" - + lib.concatStringsSep ";" (lib.concatLists [ - flagsForLlvmConfig - nativeToolchainFlags - nativeInstallFlags - ]) - ) - ]; - - postInstall = '' - mkdir -p $python/share - mv $out/share/opt-viewer $python/share/opt-viewer - moveToOutput "bin/llvm-config*" "$dev" - substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' - '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib - '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; - - inherit doCheck; - - checkTarget = "check-all"; - - # For the update script: - passthru.monorepoSrc = monorepoSrc; - - requiredSystemFeatures = [ "big-parallel" ]; - meta = llvm_meta // { - homepage = "https://llvm.org/"; - description = "A collection of modular and reusable compiler and toolchain technologies"; - longDescription = '' - The LLVM Project is a collection of modular and reusable compiler and - toolchain technologies. Despite its name, LLVM has little to do with - traditional virtual machines. The name "LLVM" itself is not an acronym; it - is the full name of the project. - LLVM began as a research project at the University of Illinois, with the - goal of providing a modern, SSA-based compilation strategy capable of - supporting both static and dynamic compilation of arbitrary programming - languages. Since then, LLVM has grown to be an umbrella project consisting - of a number of subprojects, many of which are being used in production by - a wide variety of commercial and open source projects as well as being - widely used in academic research. Code in the LLVM project is licensed - under the "Apache 2.0 License with LLVM exceptions". - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "llvm-manpages"; - - propagatedBuildInputs = []; - - ninjaFlags = [ "docs-llvm-man" ]; - installTargets = [ "install-docs-llvm-man" ]; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLVM ${version}"; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/default.nix index 5716267426..79d5f85890 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/default.nix @@ -85,9 +85,59 @@ in let then tools.bintools else bootBintools; - in rec { + in { - libllvm = callPackage ./llvm { + libllvm = callPackage ../common/llvm { + patches = [ + ./llvm/gnu-install-dirs.patch + + # Running the tests involves invoking binaries (like `opt`) that depend on + # the LLVM dylibs and reference them by absolute install path (i.e. their + # nix store path). + # + # Because we have not yet run the install phase (we're running these tests + # as part of `checkPhase` instead of `installCheckPhase`) these absolute + # paths do not exist yet; to work around this we point the loader (`ld` on + # unix, `dyld` on macOS) at the `lib` directory which will later become this + # package's `lib` output. + # + # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` + # dir but: + # - this doesn't generalize well to other platforms; `lit` doesn't forward + # `DYLD_LIBRARY_PATH` (macOS): + # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 + # - even if `lit` forwarded this env var, we actually cannot set + # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because + # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for + # "protected processes" (i.e. the python interpreter that runs `lit`): + # https://stackoverflow.com/a/35570229 + # - other LLVM subprojects deal with this issue by having their `lit` + # configuration set these env vars for us; it makes sense to do the same + # for LLVM: + # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 + # + # !!! TODO: look into upstreaming this patch + ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch + + # `lit` has a mode where it executes run lines as a shell script which is + # constructs; this is problematic for macOS because it means that there's + # another process in between `lit` and the binaries being tested. As noted + # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our + # tests fail with dyld errors. + # + # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when + # present in the test configuration. + # + # It's not clear to me why this isn't an issue for LLVM developers running + # on macOS (nothing about this _seems_ nix specific).. + ./llvm/lit-shell-script-runner-set-dyld-library-path.patch + ]; + pollyPatches = [ + ./llvm/gnu-install-dirs-polly.patch + + # Just like the `llvm-lit-cfg` patch, but for `polly`. + ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch + ]; inherit llvm_meta; }; @@ -103,7 +153,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/llvm/default.nix deleted file mode 100644 index 0a8d877ba8..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/llvm/default.nix +++ /dev/null @@ -1,435 +0,0 @@ -{ lib, stdenv, llvm_meta -, pkgsBuildBuild -, monorepoSrc -, runCommand -, cmake -, darwin -, ninja -, python3 -, python3Packages -, libffi -# TODO: Gold plugin on LLVM16 has a severe memory corruption bug: https://github.com/llvm/llvm-project/issues/61350. -, enableGoldPlugin ? false -, libbfd -, libpfm -, libxml2 -, ncurses -, version -, release_version -, zlib -, which -, sysctl -, buildLlvmTools -, debugVersion ? false -, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) - && (stdenv.hostPlatform == stdenv.buildPlatform) -, enableManpages ? false -, enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? stdenv.isLinux /* PFM only supports Linux */ - # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 - # broken for the armv7l builder - && !stdenv.hostPlatform.isAarch -, enablePolly ? true -}: - -let - inherit (lib) optional optionals optionalString; - - # Used when creating a version-suffixed symlink of libLLVM.dylib - shortVersion = with lib; - concatStringsSep "." (take 1 (splitString "." release_version)); - - # Ordinarily we would just the `doCheck` and `checkDeps` functionality - # `mkDerivation` gives us to manage our test dependencies (instead of breaking - # out `doCheck` as a package level attribute). - # - # Unfortunately `lit` does not forward `$PYTHONPATH` to children processes, in - # particular the children it uses to do feature detection. - # - # This means that python deps we add to `checkDeps` (which the python - # interpreter is made aware of via `$PYTHONPATH` – populated by the python - # setup hook) are not picked up by `lit` which causes it to skip tests. - # - # Adding `python3.withPackages (ps: [ ... ])` to `checkDeps` also doesn't work - # because this package is shadowed in `$PATH` by the regular `python3` - # package. - # - # So, we "manually" assemble one python derivation for the package to depend - # on, taking into account whether checks are enabled or not: - python = if doCheck then - # Note that we _explicitly_ ask for a python interpreter for our host - # platform here; the splicing that would ordinarily take care of this for - # us does not seem to work once we use `withPackages`. - let - checkDeps = ps: with ps; [ psutil ]; - in pkgsBuildBuild.targetPackages.python3.withPackages checkDeps - else python3; - -in - assert (lib.assertMsg (!enableGoldPlugin) "Gold plugin cannot be enabled on LLVM16 due to a upstream issue: https://github.com/llvm/llvm-project/issues/61350"); - stdenv.mkDerivation (rec { - pname = "llvm"; - inherit version; - - src = runCommand "${pname}-src-${version}" {} ('' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - cp -r ${monorepoSrc}/third-party "$out" - '' + lib.optionalString enablePolly '' - chmod u+w "$out/${pname}/tools" - cp -r ${monorepoSrc}/polly "$out/${pname}/tools" - ''); - - sourceRoot = "${src.name}/${pname}"; - - outputs = [ "out" "lib" "dev" "python" ]; - - nativeBuildInputs = [ cmake ninja python ] - ++ optionals enableManpages [ - # Note: we intentionally use `python3Packages` instead of `python3.pkgs`; - # splicing does *not* work with the latter. (TODO: fix) - python3Packages.sphinx python3Packages.recommonmark - ]; - - buildInputs = [ libxml2 libffi ] - ++ optional enablePFM libpfm; # exegesis - - propagatedBuildInputs = [ ncurses zlib ]; - - nativeCheckInputs = [ - which - ] ++ lib.optional stdenv.isDarwin sysctl; - - patches = [ - ./gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./lit-shell-script-runner-set-dyld-library-path.patch - ] ++ lib.optionals enablePolly [ - ./gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" - - # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick - # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 - rm test/MC/ELF/cfi-version.ll - - # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) - # and thus fails under the sandbox: - substituteInPlace unittests/TargetParser/Host.cpp \ - --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" - - # This test tries to call the intrinsics `@llvm.roundeven.f32` and - # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` - # and `roundeven` on macOS. - # - # However these functions are glibc specific so the test fails: - # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html - # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html - # - substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ - --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ - --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" - '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' - # This test fails on darwin x86_64 because `sw_vers` reports a different - # macOS version than what LLVM finds by reading - # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into - # the sandbox on macOS). - # - # The `sw_vers` provided by nixpkgs reports the macOS version associated - # with the `CoreFoundation` framework with which it was built. Because - # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what - # `sw_vers` reports is not guaranteed to match the macOS version of the host - # that's building this derivation. - # - # Astute readers will note that we only _patch_ this test on aarch64-darwin - # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright. - # So why does this test pass on aarch64? - # - # Well, it seems that `sw_vers` on aarch64 actually links against the _host_ - # CoreFoundation framework instead of the nixpkgs provided one. - # - # Not entirely sure what the right fix is here. I'm assuming aarch64 - # `sw_vers` doesn't intentionally link against the host `CoreFoundation` - # (still digging into how this ends up happening, will follow up) but that - # aside I think the more pertinent question is: should we be patching LLVM's - # macOS version detection logic to use `sw_vers` instead of reading host - # paths? This *is* a way in which details about builder machines can creep - # into the artifacts that are produced, affecting reproducibility, but it's - # not clear to me when/where/for what this even gets used in LLVM. - # - # TODO(@rrbutani): fix/follow-up - substituteInPlace unittests/TargetParser/Host.cpp \ - --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" - - # This test fails with a `dysmutil` crash; have not yet dug into what's - # going on here (TODO(@rrbutani)). - rm test/tools/dsymutil/ARM/obfuscated.test - '' + '' - # FileSystem permissions tests fail with various special bits - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - rm unittests/Support/Path.cpp - substituteInPlace unittests/IR/CMakeLists.txt \ - --replace "PassBuilderCallbacksTest.cpp" "" - rm unittests/IR/PassBuilderCallbacksTest.cpp - rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test - - # Fails in the presence of anti-virus software or other intrusion-detection software that - # modifies the atime when run. See #284056. - rm test/tools/llvm-objcopy/ELF/strip-preserve-atime.test - - # timing-based tests are trouble - rm utils/lit/tests/googletest-timeout.py - '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../common/llvm/TLI-musl.patch} - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "add_subdirectory(DynamicLibrary)" "" - rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - # valgrind unhappy with musl or glibc, but fails w/musl only - rm test/CodeGen/AArch64/wineh4.mir - '' + optionalString stdenv.hostPlatform.isAarch32 '' - # skip failing X86 test cases on 32-bit ARM - rm test/DebugInfo/X86/convert-debugloc.ll - rm test/DebugInfo/X86/convert-inlined.ll - rm test/DebugInfo/X86/convert-linked.ll - rm test/tools/dsymutil/X86/op-convert.test - rm test/tools/gold/X86/split-dwarf.ll - rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s - rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s - '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' - # Seems to require certain floating point hardware (NEON?) - rm test/ExecutionEngine/frem.ll - '' + '' - patchShebangs test/BugPoint/compile-custom.ll.py - ''; - - preConfigure = '' - # Workaround for configure flags that need to have spaces - cmakeFlagsArray+=( - -DLLVM_LIT_ARGS="-svj''${NIX_BUILD_CORES} --no-progress-bar" - ) - ''; - - # Defensive check: some paths (that we make symlinks to) depend on the release - # version, for example: - # - https://github.com/llvm/llvm-project/blob/406bde9a15136254f2b10d9ef3a42033b3cb1b16/clang/lib/Headers/CMakeLists.txt#L185 - # - # So we want to sure that the version in the source matches the release - # version we were given. - # - # We do this check here, in the LLVM build, because it happens early. - postConfigure = let - v = lib.versions; - major = v.major release_version; - minor = v.minor release_version; - patch = v.patch release_version; - in '' - # $1: part, $2: expected - check_version() { - part="''${1^^}" - part="$(cat include/llvm/Config/llvm-config.h | grep "#define LLVM_VERSION_''${part} " | cut -d' ' -f3)" - - if [[ "$part" != "$2" ]]; then - echo >&2 \ - "mismatch in the $1 version! we have version ${release_version}" \ - "and expected the $1 version to be '$2'; the source has '$part' instead" - exit 3 - fi - } - - check_version major ${major} - check_version minor ${minor} - check_version patch ${patch} - ''; - - # E.g. mesa.drivers use the build-id as a cache key (see #93946): - LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; - - hardeningDisable = [ "trivialautovarinit" ]; - - cmakeBuildType = if debugVersion then "Debug" else "Release"; - - cmakeFlags = with stdenv; let - # These flags influence llvm-config's BuildVariables.inc in addition to the - # general build. We need to make sure these are also passed via - # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native - # will return different results from the cross llvm-config. - # - # Some flags don't need to be repassed because LLVM already does so (like - # CMAKE_BUILD_TYPE), others are irrelevant to the result. - flagsForLlvmConfig = [ - "-DLLVM_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/llvm" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ optionals enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ]; - in flagsForLlvmConfig ++ [ - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_ENABLE_DUMP=ON" - ] ++ optionals stdenv.hostPlatform.isStatic [ - # Disables building of shared libs, -fPIC is still injected by cc-wrapper - "-DLLVM_ENABLE_PIC=OFF" - "-DLLVM_BUILD_STATIC=ON" - "-DLLVM_LINK_LLVM_DYLIB=off" - # libxml2 needs to be disabled because the LLVM build system ignores its .la - # file and doesn't link zlib as well. - # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 - "-DLLVM_ENABLE_LIBXML2=OFF" - ] ++ optionals enableManpages [ - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals enableGoldPlugin [ - # For LLVMgold plugin - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals isDarwin [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ - "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ( - let - nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; - nativeBintools = nativeCC.bintools.bintools; - nativeToolchainFlags = [ - "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" - "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" - "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" - "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" - "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" - ]; - # We need to repass the custom GNUInstallDirs values, otherwise CMake - # will choose them for us, leading to wrong results in llvm-config-native - nativeInstallFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" - "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" - ]; - in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" - + lib.concatStringsSep ";" (lib.concatLists [ - flagsForLlvmConfig - nativeToolchainFlags - nativeInstallFlags - ]) - ) - ]; - - postInstall = '' - mkdir -p $python/share - mv $out/share/opt-viewer $python/share/opt-viewer - moveToOutput "bin/llvm-config*" "$dev" - substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' - '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib - '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; - - inherit doCheck; - - checkTarget = "check-all"; - - # For the update script: - passthru.monorepoSrc = monorepoSrc; - - requiredSystemFeatures = [ "big-parallel" ]; - meta = llvm_meta // { - homepage = "https://llvm.org/"; - description = "A collection of modular and reusable compiler and toolchain technologies"; - longDescription = '' - The LLVM Project is a collection of modular and reusable compiler and - toolchain technologies. Despite its name, LLVM has little to do with - traditional virtual machines. The name "LLVM" itself is not an acronym; it - is the full name of the project. - LLVM began as a research project at the University of Illinois, with the - goal of providing a modern, SSA-based compilation strategy capable of - supporting both static and dynamic compilation of arbitrary programming - languages. Since then, LLVM has grown to be an umbrella project consisting - of a number of subprojects, many of which are being used in production by - a wide variety of commercial and open source projects as well as being - widely used in academic research. Code in the LLVM project is licensed - under the "Apache 2.0 License with LLVM exceptions". - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "llvm-manpages"; - - propagatedBuildInputs = []; - - ninjaFlags = [ "docs-llvm-man" ]; - installTargets = [ "install-docs-llvm-man" ]; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLVM ${version}"; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/17/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/17/default.nix index 2f60666536..b4039540ba 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/17/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/17/default.nix @@ -80,9 +80,59 @@ in let then tools.bintools else bootBintools; - in rec { + in { - libllvm = callPackage ./llvm { + libllvm = callPackage ../common/llvm { + patches = [ + ./llvm/gnu-install-dirs.patch + + # Running the tests involves invoking binaries (like `opt`) that depend on + # the LLVM dylibs and reference them by absolute install path (i.e. their + # nix store path). + # + # Because we have not yet run the install phase (we're running these tests + # as part of `checkPhase` instead of `installCheckPhase`) these absolute + # paths do not exist yet; to work around this we point the loader (`ld` on + # unix, `dyld` on macOS) at the `lib` directory which will later become this + # package's `lib` output. + # + # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` + # dir but: + # - this doesn't generalize well to other platforms; `lit` doesn't forward + # `DYLD_LIBRARY_PATH` (macOS): + # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 + # - even if `lit` forwarded this env var, we actually cannot set + # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because + # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for + # "protected processes" (i.e. the python interpreter that runs `lit`): + # https://stackoverflow.com/a/35570229 + # - other LLVM subprojects deal with this issue by having their `lit` + # configuration set these env vars for us; it makes sense to do the same + # for LLVM: + # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 + # + # !!! TODO: look into upstreaming this patch + ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch + + # `lit` has a mode where it executes run lines as a shell script which is + # constructs; this is problematic for macOS because it means that there's + # another process in between `lit` and the binaries being tested. As noted + # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our + # tests fail with dyld errors. + # + # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when + # present in the test configuration. + # + # It's not clear to me why this isn't an issue for LLVM developers running + # on macOS (nothing about this _seems_ nix specific).. + ./llvm/lit-shell-script-runner-set-dyld-library-path.patch + ]; + pollyPatches = [ + ./llvm/gnu-install-dirs-polly.patch + + # Just like the `llvm-lit-cfg` patch, but for `polly`. + ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch + ]; inherit llvm_meta; }; @@ -98,7 +148,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/17/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/17/llvm/default.nix deleted file mode 100644 index a045bea9f4..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/17/llvm/default.nix +++ /dev/null @@ -1,431 +0,0 @@ -{ lib, stdenv, llvm_meta -, pkgsBuildBuild -, monorepoSrc -, runCommand -, cmake -, darwin -, ninja -, python3 -, python3Packages -, libffi -, enableGoldPlugin ? libbfd.hasPluginAPI -, libbfd -, libpfm -, libxml2 -, ncurses -, version -, release_version -, zlib -, which -, sysctl -, buildLlvmTools -, debugVersion ? false -, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) - && (stdenv.hostPlatform == stdenv.buildPlatform) -, enableManpages ? false -, enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? stdenv.isLinux /* PFM only supports Linux */ - # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 - # broken for the armv7l builder - && !stdenv.hostPlatform.isAarch -, enablePolly ? true -}: - -let - inherit (lib) optional optionals optionalString; - - # Used when creating a version-suffixed symlink of libLLVM.dylib - shortVersion = with lib; - concatStringsSep "." (take 1 (splitString "." release_version)); - - # Ordinarily we would just the `doCheck` and `checkDeps` functionality - # `mkDerivation` gives us to manage our test dependencies (instead of breaking - # out `doCheck` as a package level attribute). - # - # Unfortunately `lit` does not forward `$PYTHONPATH` to children processes, in - # particular the children it uses to do feature detection. - # - # This means that python deps we add to `checkDeps` (which the python - # interpreter is made aware of via `$PYTHONPATH` – populated by the python - # setup hook) are not picked up by `lit` which causes it to skip tests. - # - # Adding `python3.withPackages (ps: [ ... ])` to `checkDeps` also doesn't work - # because this package is shadowed in `$PATH` by the regular `python3` - # package. - # - # So, we "manually" assemble one python derivation for the package to depend - # on, taking into account whether checks are enabled or not: - python = if doCheck then - # Note that we _explicitly_ ask for a python interpreter for our host - # platform here; the splicing that would ordinarily take care of this for - # us does not seem to work once we use `withPackages`. - let - checkDeps = ps: with ps; [ psutil ]; - in pkgsBuildBuild.targetPackages.python3.withPackages checkDeps - else python3; - -in - -stdenv.mkDerivation (rec { - pname = "llvm"; - inherit version; - - src = runCommand "${pname}-src-${version}" {} ('' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - cp -r ${monorepoSrc}/third-party "$out" - '' + lib.optionalString enablePolly '' - chmod u+w "$out/${pname}/tools" - cp -r ${monorepoSrc}/polly "$out/${pname}/tools" - ''); - - sourceRoot = "${src.name}/${pname}"; - - outputs = [ "out" "lib" "dev" "python" ]; - - nativeBuildInputs = [ cmake ninja python ] - ++ optionals enableManpages [ - # Note: we intentionally use `python3Packages` instead of `python3.pkgs`; - # splicing does *not* work with the latter. (TODO: fix) - python3Packages.sphinx python3Packages.recommonmark - ]; - - buildInputs = [ libxml2 libffi ] - ++ optional enablePFM libpfm; # exegesis - - propagatedBuildInputs = [ ncurses zlib ]; - - nativeCheckInputs = [ - which - ] ++ lib.optional stdenv.isDarwin sysctl; - - patches = [ - ./gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./lit-shell-script-runner-set-dyld-library-path.patch - ] ++ lib.optionals enablePolly [ - ./gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" - - # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick - # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 - rm test/MC/ELF/cfi-version.ll - - # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) - # and thus fails under the sandbox: - substituteInPlace unittests/TargetParser/Host.cpp \ - --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" - - # This test tries to call the intrinsics `@llvm.roundeven.f32` and - # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` - # and `roundeven` on macOS. - # - # However these functions are glibc specific so the test fails: - # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html - # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html - # - substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ - --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ - --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" - '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' - # This test fails on darwin x86_64 because `sw_vers` reports a different - # macOS version than what LLVM finds by reading - # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into - # the sandbox on macOS). - # - # The `sw_vers` provided by nixpkgs reports the macOS version associated - # with the `CoreFoundation` framework with which it was built. Because - # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what - # `sw_vers` reports is not guaranteed to match the macOS version of the host - # that's building this derivation. - # - # Astute readers will note that we only _patch_ this test on aarch64-darwin - # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright. - # So why does this test pass on aarch64? - # - # Well, it seems that `sw_vers` on aarch64 actually links against the _host_ - # CoreFoundation framework instead of the nixpkgs provided one. - # - # Not entirely sure what the right fix is here. I'm assuming aarch64 - # `sw_vers` doesn't intentionally link against the host `CoreFoundation` - # (still digging into how this ends up happening, will follow up) but that - # aside I think the more pertinent question is: should we be patching LLVM's - # macOS version detection logic to use `sw_vers` instead of reading host - # paths? This *is* a way in which details about builder machines can creep - # into the artifacts that are produced, affecting reproducibility, but it's - # not clear to me when/where/for what this even gets used in LLVM. - # - # TODO(@rrbutani): fix/follow-up - substituteInPlace unittests/TargetParser/Host.cpp \ - --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" - - # This test fails with a `dysmutil` crash; have not yet dug into what's - # going on here (TODO(@rrbutani)). - rm test/tools/dsymutil/ARM/obfuscated.test - '' + '' - # FileSystem permissions tests fail with various special bits - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - rm unittests/Support/Path.cpp - substituteInPlace unittests/IR/CMakeLists.txt \ - --replace "PassBuilderCallbacksTest.cpp" "" - rm unittests/IR/PassBuilderCallbacksTest.cpp - rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test - - # Fails in the presence of anti-virus software or other intrusion-detection software that - # modifies the atime when run. See #284056. - rm test/tools/llvm-objcopy/ELF/strip-preserve-atime.test - '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../common/llvm/TLI-musl.patch} - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "add_subdirectory(DynamicLibrary)" "" - rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - # valgrind unhappy with musl or glibc, but fails w/musl only - rm test/CodeGen/AArch64/wineh4.mir - '' + optionalString stdenv.hostPlatform.isAarch32 '' - # skip failing X86 test cases on 32-bit ARM - rm test/DebugInfo/X86/convert-debugloc.ll - rm test/DebugInfo/X86/convert-inlined.ll - rm test/DebugInfo/X86/convert-linked.ll - rm test/tools/dsymutil/X86/op-convert.test - rm test/tools/gold/X86/split-dwarf.ll - rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s - rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s - rm test/CodeGen/RISCV/attributes.ll - rm test/CodeGen/RISCV/xtheadmempair.ll - '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' - # Seems to require certain floating point hardware (NEON?) - rm test/ExecutionEngine/frem.ll - '' + '' - patchShebangs test/BugPoint/compile-custom.ll.py - ''; - - preConfigure = '' - # Workaround for configure flags that need to have spaces - cmakeFlagsArray+=( - -DLLVM_LIT_ARGS="-svj''${NIX_BUILD_CORES} --no-progress-bar" - ) - ''; - - # Defensive check: some paths (that we make symlinks to) depend on the release - # version, for example: - # - https://github.com/llvm/llvm-project/blob/406bde9a15136254f2b10d9ef3a42033b3cb1b16/clang/lib/Headers/CMakeLists.txt#L185 - # - # So we want to sure that the version in the source matches the release - # version we were given. - # - # We do this check here, in the LLVM build, because it happens early. - postConfigure = let - v = lib.versions; - major = v.major release_version; - minor = v.minor release_version; - patch = v.patch release_version; - in '' - # $1: part, $2: expected - check_version() { - part="''${1^^}" - part="$(cat include/llvm/Config/llvm-config.h | grep "#define LLVM_VERSION_''${part} " | cut -d' ' -f3)" - - if [[ "$part" != "$2" ]]; then - echo >&2 \ - "mismatch in the $1 version! we have version ${release_version}" \ - "and expected the $1 version to be '$2'; the source has '$part' instead" - exit 3 - fi - } - - check_version major ${major} - check_version minor ${minor} - check_version patch ${patch} - ''; - - # E.g. mesa.drivers use the build-id as a cache key (see #93946): - LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; - - cmakeBuildType = if debugVersion then "Debug" else "Release"; - - cmakeFlags = with stdenv; let - # These flags influence llvm-config's BuildVariables.inc in addition to the - # general build. We need to make sure these are also passed via - # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native - # will return different results from the cross llvm-config. - # - # Some flags don't need to be repassed because LLVM already does so (like - # CMAKE_BUILD_TYPE), others are irrelevant to the result. - flagsForLlvmConfig = [ - "-DLLVM_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/llvm" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ optionals enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ]; - in flagsForLlvmConfig ++ [ - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_ENABLE_DUMP=ON" - ] ++ optionals stdenv.hostPlatform.isStatic [ - # Disables building of shared libs, -fPIC is still injected by cc-wrapper - "-DLLVM_ENABLE_PIC=OFF" - "-DLLVM_BUILD_STATIC=ON" - "-DLLVM_LINK_LLVM_DYLIB=off" - # libxml2 needs to be disabled because the LLVM build system ignores its .la - # file and doesn't link zlib as well. - # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 - "-DLLVM_ENABLE_LIBXML2=OFF" - ] ++ optionals enableManpages [ - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals enableGoldPlugin [ - # For LLVMgold plugin - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals isDarwin [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ - "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ( - let - nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; - nativeBintools = nativeCC.bintools.bintools; - nativeToolchainFlags = [ - "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" - "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" - "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" - "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" - "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" - ]; - # We need to repass the custom GNUInstallDirs values, otherwise CMake - # will choose them for us, leading to wrong results in llvm-config-native - nativeInstallFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" - "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" - ]; - in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" - + lib.concatStringsSep ";" (lib.concatLists [ - flagsForLlvmConfig - nativeToolchainFlags - nativeInstallFlags - ]) - ) - ]; - - postInstall = '' - mkdir -p $python/share - mv $out/share/opt-viewer $python/share/opt-viewer - moveToOutput "bin/llvm-config*" "$dev" - substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' - '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib - '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; - - inherit doCheck; - - checkTarget = "check-all"; - - # For the update script: - passthru.monorepoSrc = monorepoSrc; - - requiredSystemFeatures = [ "big-parallel" ]; - meta = llvm_meta // { - homepage = "https://llvm.org/"; - description = "A collection of modular and reusable compiler and toolchain technologies"; - longDescription = '' - The LLVM Project is a collection of modular and reusable compiler and - toolchain technologies. Despite its name, LLVM has little to do with - traditional virtual machines. The name "LLVM" itself is not an acronym; it - is the full name of the project. - LLVM began as a research project at the University of Illinois, with the - goal of providing a modern, SSA-based compilation strategy capable of - supporting both static and dynamic compilation of arbitrary programming - languages. Since then, LLVM has grown to be an umbrella project consisting - of a number of subprojects, many of which are being used in production by - a wide variety of commercial and open source projects as well as being - widely used in academic research. Code in the LLVM project is licensed - under the "Apache 2.0 License with LLVM exceptions". - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "llvm-manpages"; - - propagatedBuildInputs = []; - - ninjaFlags = [ "docs-llvm-man" ]; - installTargets = [ "install-docs-llvm-man" ]; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLVM ${version}"; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/18/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/18/default.nix index 0a30288755..3c0e551791 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/18/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/18/default.nix @@ -25,7 +25,7 @@ # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; # } -, officialRelease ? { version = "18.1.3"; sha256 = "sha256-saQGbpYd95JuudwLcdG80GL8YhadH7TUY1FC0o0ithY="; } +, officialRelease ? { version = "18.1.5"; sha256 = "0n44chqn96xsa00ryhwk8g0vv3zx908xjakkgjsa14sjr9mcsq8q"; } # i.e.: # { # version = /* i.e. "15.0.0" */; @@ -80,9 +80,59 @@ in let then tools.bintools else bootBintools; - in rec { + in { - libllvm = callPackage ./llvm { + libllvm = callPackage ../common/llvm { + patches = [ + ./llvm/gnu-install-dirs.patch + + # Running the tests involves invoking binaries (like `opt`) that depend on + # the LLVM dylibs and reference them by absolute install path (i.e. their + # nix store path). + # + # Because we have not yet run the install phase (we're running these tests + # as part of `checkPhase` instead of `installCheckPhase`) these absolute + # paths do not exist yet; to work around this we point the loader (`ld` on + # unix, `dyld` on macOS) at the `lib` directory which will later become this + # package's `lib` output. + # + # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` + # dir but: + # - this doesn't generalize well to other platforms; `lit` doesn't forward + # `DYLD_LIBRARY_PATH` (macOS): + # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 + # - even if `lit` forwarded this env var, we actually cannot set + # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because + # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for + # "protected processes" (i.e. the python interpreter that runs `lit`): + # https://stackoverflow.com/a/35570229 + # - other LLVM subprojects deal with this issue by having their `lit` + # configuration set these env vars for us; it makes sense to do the same + # for LLVM: + # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 + # + # !!! TODO: look into upstreaming this patch + ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch + + # `lit` has a mode where it executes run lines as a shell script which is + # constructs; this is problematic for macOS because it means that there's + # another process in between `lit` and the binaries being tested. As noted + # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our + # tests fail with dyld errors. + # + # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when + # present in the test configuration. + # + # It's not clear to me why this isn't an issue for LLVM developers running + # on macOS (nothing about this _seems_ nix specific).. + ./llvm/lit-shell-script-runner-set-dyld-library-path.patch + ]; + pollyPatches = [ + ./llvm/gnu-install-dirs-polly.patch + + # Just like the `llvm-lit-cfg` patch, but for `polly`. + ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch + ]; inherit llvm_meta; }; @@ -98,7 +148,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch deleted file mode 100644 index 93504316ed..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp -index 37ec73468570..b73e75aa6e59 100644 ---- a/lib/Driver/ToolChains/CommonArgs.cpp -+++ b/lib/Driver/ToolChains/CommonArgs.cpp -@@ -370,8 +370,8 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, - #endif - - SmallString<1024> Plugin; -- llvm::sys::path::native(Twine(ToolChain.getDriver().Dir) + -- "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" + -+ llvm::sys::path::native(Twine("@libllvmLibdir@" -+ "/LLVMgold") + - Suffix, - Plugin); - CmdArgs.push_back(Args.MakeArgString(Plugin)); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/default.nix index 2373795b49..58af0340a1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/clang/default.nix @@ -71,7 +71,11 @@ let "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" ]); - postPatch = (if lib.versionOlder release_version "13" then '' + postPatch = '' + # Make sure clang passes the correct location of libLTO to ld64 + substituteInPlace lib/Driver/ToolChains/Darwin.cpp \ + --replace-fail 'StringRef P = llvm::sys::path::parent_path(D.Dir);' 'StringRef P = "${lib.getLib libllvm}";' + '' + (if lib.versionOlder release_version "13" then '' sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ lib/Driver/ToolChains/*.cpp diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch deleted file mode 100644 index 890230cc14..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch +++ /dev/null @@ -1,80 +0,0 @@ -https://github.com/llvm/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.patch -https://reviews.llvm.org/D102059 ---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -@@ -370,15 +370,6 @@ static void ioctl_table_fill() { - - #if SANITIZER_GLIBC - // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE -- _(CYGETDEFTHRESH, WRITE, sizeof(int)); -- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); -- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); -- _(CYGETTHRESH, WRITE, sizeof(int)); -- _(CYGETTIMEOUT, WRITE, sizeof(int)); -- _(CYSETDEFTHRESH, NONE, 0); -- _(CYSETDEFTIMEOUT, NONE, 0); -- _(CYSETTHRESH, NONE, 0); -- _(CYSETTIMEOUT, NONE, 0); - _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); - _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); - _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t; - # include - #endif - #include --#include - #include - #include - #include -@@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - - #if SANITIZER_GLIBC - unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); -- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); - #if EV_VERSION > (0x010000) - unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); - #else -@@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; -- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; -- unsigned IOCTL_CYGETMON = CYGETMON; -- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; -- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; -- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; -- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; -- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; -- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; - unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; - unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; - unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz; - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - extern unsigned struct_ax25_parms_struct_sz; --extern unsigned struct_cyclades_monitor_sz; - extern unsigned struct_input_keymap_entry_sz; - extern unsigned struct_ipx_config_data_sz; - extern unsigned struct_kbdiacrs_sz; -@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE; - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID --extern unsigned IOCTL_CYGETDEFTHRESH; --extern unsigned IOCTL_CYGETDEFTIMEOUT; --extern unsigned IOCTL_CYGETMON; --extern unsigned IOCTL_CYGETTHRESH; --extern unsigned IOCTL_CYGETTIMEOUT; --extern unsigned IOCTL_CYSETDEFTHRESH; --extern unsigned IOCTL_CYSETDEFTIMEOUT; --extern unsigned IOCTL_CYSETTHRESH; --extern unsigned IOCTL_CYSETTIMEOUT; - extern unsigned IOCTL_EQL_EMANCIPATE; - extern unsigned IOCTL_EQL_ENSLAVE; - extern unsigned IOCTL_EQL_GETMASTRCFG; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libcxxabi/no-threads.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libcxxabi/no-threads.patch deleted file mode 100644 index 787f3e1650..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/libcxxabi/no-threads.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4138acf..41b4763 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS) - " is also set to ON.") - endif() - add_definitions(-D_LIBCXXABI_HAS_NO_THREADS) -+ add_definitions(-D_LIBCPP_HAS_NO_THREADS) - endif() - - if (LIBCXXABI_HAS_EXTERNAL_THREAD_API) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/18/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix similarity index 66% rename from third_party/nixpkgs/pkgs/development/compilers/llvm/18/llvm/default.nix rename to third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix index a9732763e9..705dfed8a2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/18/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -1,6 +1,12 @@ -{ lib, stdenv, llvm_meta +{ lib +, stdenv +, llvm_meta , pkgsBuildBuild -, monorepoSrc +, pollyPatches ? [] +, patches ? [] +, polly_src ? null +, src ? null +, monorepoSrc ? null , runCommand , cmake , darwin @@ -8,6 +14,8 @@ , python3 , python3Packages , libffi + # TODO: Can this memory corruption bug still occur? + # , enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm @@ -20,7 +28,9 @@ , sysctl , buildLlvmTools , debugVersion ? false -, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) +, doCheck ? !stdenv.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.isLinux else true) + && (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) + && !(stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) && (stdenv.hostPlatform == stdenv.buildPlatform) , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic @@ -28,7 +38,7 @@ # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 # broken for the armv7l builder && !stdenv.hostPlatform.isAarch -, enablePolly ? true +, enablePolly ? lib.versionAtLeast release_version "14" }: let @@ -64,27 +74,36 @@ let in pkgsBuildBuild.targetPackages.python3.withPackages checkDeps else python3; + pname = "llvm"; + + src' = if monorepoSrc != null then + runCommand "${pname}-src-${version}" {} ('' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" + '' + lib.optionalString enablePolly '' + chmod u+w "$out/${pname}/tools" + cp -r ${monorepoSrc}/polly "$out/${pname}/tools" + '') else src; + + patches' = patches ++ lib.optionals enablePolly pollyPatches; in stdenv.mkDerivation (rec { - pname = "llvm"; - inherit version; + inherit pname version; - src = runCommand "${pname}-src-${version}" {} ('' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - cp -r ${monorepoSrc}/third-party "$out" - '' + lib.optionalString enablePolly '' - chmod u+w "$out/${pname}/tools" - cp -r ${monorepoSrc}/polly "$out/${pname}/tools" - ''); + src = src'; + patches = patches'; - sourceRoot = "${src.name}/${pname}"; + sourceRoot = if lib.versionOlder release_version "13" then null + else "${src.name}/${pname}"; outputs = [ "out" "lib" "dev" "python" ]; - nativeBuildInputs = [ cmake ninja python ] + nativeBuildInputs = [ cmake ] + ++ (lib.optional (lib.versionAtLeast release_version "15") ninja) + ++ [ python ] ++ optionals enableManpages [ # Note: we intentionally use `python3Packages` instead of `python3.pkgs`; # splicing does *not* work with the latter. (TODO: fix) @@ -98,66 +117,14 @@ stdenv.mkDerivation (rec { buildInputs = [ libxml2 libffi ] ++ optional enablePFM libpfm; # exegesis - propagatedBuildInputs = [ ncurses zlib ]; + propagatedBuildInputs = (lib.optional (lib.versionAtLeast release_version "14" || stdenv.buildPlatform == stdenv.hostPlatform) ncurses) + ++ [ zlib ]; - nativeCheckInputs = [ - which - ] ++ lib.optional stdenv.isDarwin sysctl; - - patches = [ - ./gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./lit-shell-script-runner-set-dyld-library-path.patch - ] ++ lib.optionals enablePolly [ - ./gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - - postPatch = optionalString stdenv.isDarwin '' + postPatch = optionalString stdenv.isDarwin ('' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + '' + (optionalString (lib.versionAtLeast release_version "15") ('' # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 @@ -165,8 +132,13 @@ stdenv.mkDerivation (rec { # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) # and thus fails under the sandbox: + '' + (if lib.versionAtLeast release_version "16" then '' substituteInPlace unittests/TargetParser/Host.cpp \ --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" + '' else '' + substituteInPlace unittests/Support/Host.cpp \ + --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" + '') + optionalString (lib.versionAtLeast release_version "16") '' # This test tries to call the intrinsics `@llvm.roundeven.f32` and # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` @@ -179,11 +151,32 @@ stdenv.mkDerivation (rec { substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" + '' + optionalString (!stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "18") '' # fails when run in sandbox substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \ --replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" - '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' + ''))) + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") '' + # This test tries to call the intrinsics `@llvm.roundeven.f32` and + # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` + # and `roundeven` on x86_64 macOS. + # + # However these functions are glibc specific so the test fails: + # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html + # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html + # + # TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it + # pass there? + substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ + --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ + --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" + + '' + ((optionalString (lib.versionAtLeast release_version "18") '' + + # fails when run in sandbox + substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \ + --replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" + '') + '' # This test fails on darwin x86_64 because `sw_vers` reports a different # macOS version than what LLVM finds by reading # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into @@ -212,13 +205,18 @@ stdenv.mkDerivation (rec { # not clear to me when/where/for what this even gets used in LLVM. # # TODO(@rrbutani): fix/follow-up + '' + (if lib.versionAtLeast release_version "16" then '' substituteInPlace unittests/TargetParser/Host.cpp \ --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" + '' else '' + substituteInPlace unittests/Support/Host.cpp \ + --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" + '') + '' # This test fails with a `dysmutil` crash; have not yet dug into what's # going on here (TODO(@rrbutani)). rm test/tools/dsymutil/ARM/obfuscated.test - '' + '' + '')) + '' # FileSystem permissions tests fail with various special bits substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" @@ -226,13 +224,23 @@ stdenv.mkDerivation (rec { substituteInPlace unittests/IR/CMakeLists.txt \ --replace "PassBuilderCallbacksTest.cpp" "" rm unittests/IR/PassBuilderCallbacksTest.cpp + '' + lib.optionalString (lib.versionAtLeast release_version "13") '' rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + '' + lib.optionalString (lib.versionOlder release_version "13") '' + # TODO: Fix failing tests: + rm test/DebugInfo/X86/vla-multi.ll + '' + lib.optionalString (lib.versionAtLeast release_version "16") ('' # Fails in the presence of anti-virus software or other intrusion-detection software that # modifies the atime when run. See #284056. rm test/tools/llvm-objcopy/ELF/strip-preserve-atime.test + '' + lib.optionalString (lib.versionOlder release_version "17") '' + + '') + lib.optionalString (lib.versionAtLeast release_version "15" && lib.versionOlder release_version "17") '' + # timing-based tests are trouble + rm utils/lit/tests/googletest-timeout.py '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../common/llvm/TLI-musl.patch} + patch -p1 -i ${./TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp @@ -245,61 +253,59 @@ stdenv.mkDerivation (rec { rm test/DebugInfo/X86/convert-linked.ll rm test/tools/dsymutil/X86/op-convert.test rm test/tools/gold/X86/split-dwarf.ll - rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s - rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s - rm test/CodeGen/RISCV/attributes.ll - rm test/CodeGen/RISCV/xtheadmempair.ll + rm test/tools/llvm-objcopy/MachO/universal-object.test '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' # Seems to require certain floating point hardware (NEON?) rm test/ExecutionEngine/frem.ll '' + '' patchShebangs test/BugPoint/compile-custom.ll.py - ''; + '' + (lib.optionalString (lib.versionOlder release_version "13") '' + # Tweak tests to ignore namespace part of type to support + # gcc-12: https://gcc.gnu.org/PR103598. + # The change below mangles strings like: + # CHECK-NEXT: Starting llvm::Function pass manager run. + # to: + # CHECK-NEXT: Starting {{.*}}Function pass manager run. + for f in \ + test/Other/new-pass-manager.ll \ + test/Other/new-pm-O0-defaults.ll \ + test/Other/new-pm-defaults.ll \ + test/Other/new-pm-lto-defaults.ll \ + test/Other/new-pm-thinlto-defaults.ll \ + test/Other/pass-pipeline-parsing.ll \ + test/Transforms/Inline/cgscc-incremental-invalidate.ll \ + test/Transforms/Inline/clear-analyses.ll \ + test/Transforms/LoopUnroll/unroll-loop-invalidation.ll \ + test/Transforms/SCCP/ipsccp-preserve-analysis.ll \ + test/Transforms/SCCP/preserve-analysis.ll \ + test/Transforms/SROA/dead-inst.ll \ + test/tools/gold/X86/new-pm.ll \ + ; do + echo "PATCH: $f" + substituteInPlace $f \ + --replace 'Starting llvm::' 'Starting {{.*}}' \ + --replace 'Finished llvm::' 'Finished {{.*}}' + done + # gcc-13 fix + sed -i '/#include /i#include ' \ + include/llvm/DebugInfo/Symbolize/DIPrinter.h + ''); - preConfigure = '' + preConfigure = if lib.versionAtLeast release_version "15" then '' # Workaround for configure flags that need to have spaces cmakeFlagsArray+=( -DLLVM_LIT_ARGS="-svj''${NIX_BUILD_CORES} --no-progress-bar" ) - ''; - - # Defensive check: some paths (that we make symlinks to) depend on the release - # version, for example: - # - https://github.com/llvm/llvm-project/blob/406bde9a15136254f2b10d9ef3a42033b3cb1b16/clang/lib/Headers/CMakeLists.txt#L185 - # - # So we want to sure that the version in the source matches the release - # version we were given. - # - # We do this check here, in the LLVM build, because it happens early. - postConfigure = let - v = lib.versions; - major = v.major release_version; - minor = v.minor release_version; - patch = v.patch release_version; - in '' - # $1: part, $2: expected - check_version() { - part="''${1^^}" - part="$(cat include/llvm/Config/llvm-config.h | grep "#define LLVM_VERSION_''${part} " | cut -d' ' -f3)" - - if [[ "$part" != "$2" ]]; then - echo >&2 \ - "mismatch in the $1 version! we have version ${release_version}" \ - "and expected the $1 version to be '$2'; the source has '$part' instead" - exit 3 - fi - } - - check_version major ${major} - check_version minor ${minor} - check_version patch ${patch} + '' else '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) ''; # E.g. mesa.drivers use the build-id as a cache key (see #93946): LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; - hardeningDisable = [ "trivialautovarinit" ]; - cmakeBuildType = if debugVersion then "Debug" else "Release"; cmakeFlags = with stdenv; let @@ -310,8 +316,11 @@ stdenv.mkDerivation (rec { # # Some flags don't need to be repassed because LLVM already does so (like # CMAKE_BUILD_TYPE), others are irrelevant to the result. - flagsForLlvmConfig = [ + flagsForLlvmConfig = (if lib.versionOlder release_version "15" then [ + "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" + ] else [ "-DLLVM_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/llvm" + ]) ++ [ "-DLLVM_ENABLE_RTTI=ON" ] ++ optionals enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" @@ -327,7 +336,6 @@ stdenv.mkDerivation (rec { # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" "-DLLVM_BUILD_STATIC=ON" - "-DLLVM_LINK_LLVM_DYLIB=off" # libxml2 needs to be disabled because the LLVM build system ignores its .la # file and doesn't link zlib as well. # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 @@ -338,7 +346,7 @@ stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals enableGoldPlugin [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" @@ -382,8 +390,15 @@ stdenv.mkDerivation (rec { substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + '' + (if lib.versionOlder release_version "15" then '' + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' + '' else '' substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' + '') + + optionalString (stdenv.isDarwin && enableSharedLibraries && lib.versionOlder release_version "18") '' + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib '' + optionalString (stdenv.isDarwin && enableSharedLibraries) '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib @@ -418,14 +433,11 @@ stdenv.mkDerivation (rec { under the "Apache 2.0 License with LLVM exceptions". ''; }; -} // lib.optionalAttrs enableManpages { +} // lib.optionalAttrs enableManpages ({ pname = "llvm-manpages"; propagatedBuildInputs = []; - ninjaFlags = [ "docs-llvm-man" ]; - installTargets = [ "install-docs-llvm-man" ]; - postPatch = null; postInstall = null; @@ -436,4 +448,79 @@ stdenv.mkDerivation (rec { meta = llvm_meta // { description = "man pages for LLVM ${version}"; }; +} // (if lib.versionOlder release_version "15" then { + buildPhase = '' + make docs-llvm-man + ''; + + installPhase = '' + make -C docs install + ''; +} else { + ninjaFlags = [ "docs-llvm-man" ]; + installTargets = [ "install-docs-llvm-man" ]; + + postPatch = null; + postInstall = null; +})) // lib.optionalAttrs (lib.versionOlder release_version "13") { + inherit polly_src; + + unpackPhase = '' + unpackFile $src + mv llvm-${release_version}* llvm + sourceRoot=$PWD/llvm + '' + optionalString enablePolly '' + unpackFile $polly_src + mv polly-* $sourceRoot/tools/polly + ''; +} // lib.optionalAttrs (lib.versionAtLeast release_version "13") { + nativeCheckInputs = [ which ] ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast release_version "15") sysctl; +} // lib.optionalAttrs (lib.versionOlder release_version "15") { + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + postBuild = '' + rm -fR $out + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib + ''; +} // lib.optionalAttrs (lib.versionAtLeast release_version "15") { + # Defensive check: some paths (that we make symlinks to) depend on the release + # version, for example: + # - https://github.com/llvm/llvm-project/blob/406bde9a15136254f2b10d9ef3a42033b3cb1b16/clang/lib/Headers/CMakeLists.txt#L185 + # + # So we want to sure that the version in the source matches the release + # version we were given. + # + # We do this check here, in the LLVM build, because it happens early. + postConfigure = let + v = lib.versions; + major = v.major release_version; + minor = v.minor release_version; + patch = v.patch release_version; + in '' + # $1: part, $2: expected + check_version() { + part="''${1^^}" + part="$(cat include/llvm/Config/llvm-config.h | grep "#define LLVM_VERSION_''${part} " | cut -d' ' -f3)" + + if [[ "$part" != "$2" ]]; then + echo >&2 \ + "mismatch in the $1 version! we have version ${release_version}" \ + "and expected the $1 version to be '$2'; the source has '$part' instead" + exit 3 + fi + } + + check_version major ${major} + check_version minor ${minor} + check_version patch ${patch} + ''; +} // lib.optionalAttrs (lib.versionOlder release_version "17" || lib.versionAtLeast release_version "18") { + hardeningDisable = [ "trivialautovarinit" ]; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/mlir/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/mlir/default.nix index 7a79ac30ba..044e5c6731 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -1,6 +1,9 @@ -{ lib, stdenv, llvm_meta +{ lib +, stdenv +, llvm_meta , buildLlvmTools -, monorepoSrc, runCommand +, monorepoSrc +, runCommand , cmake , ninja , libxml2 @@ -14,7 +17,7 @@ stdenv.mkDerivation rec { inherit version doCheck; # Blank llvm dir just so relative path works - src = runCommand "${pname}-src-${version}" {} '' + src = runCommand "${pname}-src-${version}" { } '' mkdir -p "$out" cp -r ${monorepoSrc}/cmake "$out" cp -r ${monorepoSrc}/mlir "$out" @@ -45,7 +48,7 @@ stdenv.mkDerivation rec { "-DLLVM_INSTALL_TOOLCHAIN_ONLY=OFF" "-DMLIR_TOOLS_INSTALL_DIR=${placeholder "out"}/bin/" "-DLLVM_ENABLE_IDE=OFF" - "-DLLD_INSTALL_PACKAGE_DIR=${placeholder "out"}/lib/cmake/mlir" + "-DMLIR_INSTALL_PACKAGE_DIR=${placeholder "out"}/lib/cmake/mlir" "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix index 56fae64d59..c995845fb6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix @@ -85,9 +85,59 @@ in let then tools.bintools else bootBintools; - in rec { + in { - libllvm = callPackage ./llvm { + libllvm = callPackage ../common/llvm { + patches = [ + ./llvm/gnu-install-dirs.patch + + # Running the tests involves invoking binaries (like `opt`) that depend on + # the LLVM dylibs and reference them by absolute install path (i.e. their + # nix store path). + # + # Because we have not yet run the install phase (we're running these tests + # as part of `checkPhase` instead of `installCheckPhase`) these absolute + # paths do not exist yet; to work around this we point the loader (`ld` on + # unix, `dyld` on macOS) at the `lib` directory which will later become this + # package's `lib` output. + # + # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` + # dir but: + # - this doesn't generalize well to other platforms; `lit` doesn't forward + # `DYLD_LIBRARY_PATH` (macOS): + # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 + # - even if `lit` forwarded this env var, we actually cannot set + # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because + # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for + # "protected processes" (i.e. the python interpreter that runs `lit`): + # https://stackoverflow.com/a/35570229 + # - other LLVM subprojects deal with this issue by having their `lit` + # configuration set these env vars for us; it makes sense to do the same + # for LLVM: + # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 + # + # !!! TODO: look into upstreaming this patch + ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch + + # `lit` has a mode where it executes run lines as a shell script which is + # constructs; this is problematic for macOS because it means that there's + # another process in between `lit` and the binaries being tested. As noted + # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our + # tests fail with dyld errors. + # + # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when + # present in the test configuration. + # + # It's not clear to me why this isn't an issue for LLVM developers running + # on macOS (nothing about this _seems_ nix specific).. + ./llvm/lit-shell-script-runner-set-dyld-library-path.patch + ]; + pollyPatches = [ + ./llvm/gnu-install-dirs-polly.patch + + # Just like the `llvm-lit-cfg` patch, but for `polly`. + ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch + ]; inherit llvm_meta; }; @@ -103,7 +153,7 @@ in let ../common/clang/add-nostdlibinc-flag.patch (substituteAll { src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; + libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; inherit llvm_meta; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix deleted file mode 100644 index 8987103e22..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix +++ /dev/null @@ -1,435 +0,0 @@ -{ lib, stdenv, llvm_meta -, pkgsBuildBuild -, monorepoSrc -, runCommand -, cmake -, darwin -, ninja -, python3 -, python3Packages -, libffi -, enableGoldPlugin ? libbfd.hasPluginAPI -, libbfd -, libpfm -, libxml2 -, ncurses -, version -, release_version -, zlib -, which -, sysctl -, buildLlvmTools -, debugVersion ? false -, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) - && (stdenv.hostPlatform == stdenv.buildPlatform) -, enableManpages ? false -, enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? stdenv.isLinux /* PFM only supports Linux */ - # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 - # broken for the armv7l builder - && !stdenv.hostPlatform.isAarch -, enablePolly ? true -}: - -let - inherit (lib) optional optionals optionalString; - - # Used when creating a version-suffixed symlink of libLLVM.dylib - shortVersion = with lib; - concatStringsSep "." (take 1 (splitString "." release_version)); - - # Ordinarily we would just the `doCheck` and `checkDeps` functionality - # `mkDerivation` gives us to manage our test dependencies (instead of breaking - # out `doCheck` as a package level attribute). - # - # Unfortunately `lit` does not forward `$PYTHONPATH` to children processes, in - # particular the children it uses to do feature detection. - # - # This means that python deps we add to `checkDeps` (which the python - # interpreter is made aware of via `$PYTHONPATH` – populated by the python - # setup hook) are not picked up by `lit` which causes it to skip tests. - # - # Adding `python3.withPackages (ps: [ ... ])` to `checkDeps` also doesn't work - # because this package is shadowed in `$PATH` by the regular `python3` - # package. - # - # So, we "manually" assemble one python derivation for the package to depend - # on, taking into account whether checks are enabled or not: - python = if doCheck then - # Note that we _explicitly_ ask for a python interpreter for our host - # platform here; the splicing that would ordinarily take care of this for - # us does not seem to work once we use `withPackages`. - let - checkDeps = ps: with ps; [ psutil ]; - in pkgsBuildBuild.targetPackages.python3.withPackages checkDeps - else python3; - -in - -stdenv.mkDerivation (rec { - pname = "llvm"; - inherit version; - - src = runCommand "${pname}-src-${version}" {} ('' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - cp -r ${monorepoSrc}/third-party "$out" - '' + lib.optionalString enablePolly '' - chmod u+w "$out/${pname}/tools" - cp -r ${monorepoSrc}/polly "$out/${pname}/tools" - ''); - - sourceRoot = "${src.name}/${pname}"; - - outputs = [ "out" "lib" "dev" "python" ]; - - nativeBuildInputs = [ cmake ninja python ] - ++ optionals enableManpages [ - # Note: we intentionally use `python3Packages` instead of `python3.pkgs`; - # splicing does *not* work with the latter. (TODO: fix) - python3Packages.sphinx - ] ++ optionals (lib.versionOlder version "18" && enableManpages) [ - python3Packages.recommonmark - ] ++ optionals (lib.versionAtLeast version "18" && enableManpages) [ - python3Packages.myst-parser - ]; - - buildInputs = [ libxml2 libffi ] - ++ optional enablePFM libpfm; # exegesis - - propagatedBuildInputs = [ ncurses zlib ]; - - nativeCheckInputs = [ - which - ] ++ lib.optional stdenv.isDarwin sysctl; - - patches = [ - ./gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./lit-shell-script-runner-set-dyld-library-path.patch - ] ++ lib.optionals enablePolly [ - ./gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" - - # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick - # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 - rm test/MC/ELF/cfi-version.ll - - # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) - # and thus fails under the sandbox: - substituteInPlace unittests/TargetParser/Host.cpp \ - --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" - - # This test tries to call the intrinsics `@llvm.roundeven.f32` and - # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` - # and `roundeven` on macOS. - # - # However these functions are glibc specific so the test fails: - # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html - # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html - # - substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ - --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ - --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" - - # fails when run in sandbox - substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \ - --replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" - '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' - # This test fails on darwin x86_64 because `sw_vers` reports a different - # macOS version than what LLVM finds by reading - # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into - # the sandbox on macOS). - # - # The `sw_vers` provided by nixpkgs reports the macOS version associated - # with the `CoreFoundation` framework with which it was built. Because - # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what - # `sw_vers` reports is not guaranteed to match the macOS version of the host - # that's building this derivation. - # - # Astute readers will note that we only _patch_ this test on aarch64-darwin - # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright. - # So why does this test pass on aarch64? - # - # Well, it seems that `sw_vers` on aarch64 actually links against the _host_ - # CoreFoundation framework instead of the nixpkgs provided one. - # - # Not entirely sure what the right fix is here. I'm assuming aarch64 - # `sw_vers` doesn't intentionally link against the host `CoreFoundation` - # (still digging into how this ends up happening, will follow up) but that - # aside I think the more pertinent question is: should we be patching LLVM's - # macOS version detection logic to use `sw_vers` instead of reading host - # paths? This *is* a way in which details about builder machines can creep - # into the artifacts that are produced, affecting reproducibility, but it's - # not clear to me when/where/for what this even gets used in LLVM. - # - # TODO(@rrbutani): fix/follow-up - substituteInPlace unittests/TargetParser/Host.cpp \ - --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" - '' + '' - # FileSystem permissions tests fail with various special bits - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - rm unittests/Support/Path.cpp - substituteInPlace unittests/IR/CMakeLists.txt \ - --replace "PassBuilderCallbacksTest.cpp" "" - rm unittests/IR/PassBuilderCallbacksTest.cpp - rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test - - # Fails in the presence of anti-virus software or other intrusion-detection software that - # modifies the atime when run. See #284056. - rm test/tools/llvm-objcopy/ELF/strip-preserve-atime.test - '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../common/llvm/TLI-musl.patch} - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "add_subdirectory(DynamicLibrary)" "" - rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - # valgrind unhappy with musl or glibc, but fails w/musl only - rm test/CodeGen/AArch64/wineh4.mir - '' + optionalString stdenv.hostPlatform.isAarch32 '' - # skip failing X86 test cases on 32-bit ARM - rm test/DebugInfo/X86/convert-debugloc.ll - rm test/DebugInfo/X86/convert-inlined.ll - rm test/DebugInfo/X86/convert-linked.ll - rm test/tools/dsymutil/X86/op-convert.test - rm test/tools/gold/X86/split-dwarf.ll - rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s - rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s - rm test/CodeGen/RISCV/attributes.ll - rm test/CodeGen/RISCV/xtheadmempair.ll - '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' - # Seems to require certain floating point hardware (NEON?) - rm test/ExecutionEngine/frem.ll - '' + '' - patchShebangs test/BugPoint/compile-custom.ll.py - ''; - - preConfigure = '' - # Workaround for configure flags that need to have spaces - cmakeFlagsArray+=( - -DLLVM_LIT_ARGS="-svj''${NIX_BUILD_CORES} --no-progress-bar" - ) - ''; - - # Defensive check: some paths (that we make symlinks to) depend on the release - # version, for example: - # - https://github.com/llvm/llvm-project/blob/406bde9a15136254f2b10d9ef3a42033b3cb1b16/clang/lib/Headers/CMakeLists.txt#L185 - # - # So we want to sure that the version in the source matches the release - # version we were given. - # - # We do this check here, in the LLVM build, because it happens early. - postConfigure = let - v = lib.versions; - major = v.major release_version; - minor = v.minor release_version; - patch = v.patch release_version; - in '' - # $1: part, $2: expected - check_version() { - part="''${1^^}" - part="$(cat include/llvm/Config/llvm-config.h | grep "#define LLVM_VERSION_''${part} " | cut -d' ' -f3)" - - if [[ "$part" != "$2" ]]; then - echo >&2 \ - "mismatch in the $1 version! we have version ${release_version}" \ - "and expected the $1 version to be '$2'; the source has '$part' instead" - exit 3 - fi - } - - check_version major ${major} - check_version minor ${minor} - check_version patch ${patch} - ''; - - # E.g. mesa.drivers use the build-id as a cache key (see #93946): - LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; - - hardeningDisable = [ "trivialautovarinit" ]; - - cmakeBuildType = if debugVersion then "Debug" else "Release"; - - cmakeFlags = with stdenv; let - # These flags influence llvm-config's BuildVariables.inc in addition to the - # general build. We need to make sure these are also passed via - # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native - # will return different results from the cross llvm-config. - # - # Some flags don't need to be repassed because LLVM already does so (like - # CMAKE_BUILD_TYPE), others are irrelevant to the result. - flagsForLlvmConfig = [ - "-DLLVM_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/llvm" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ optionals enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ]; - in flagsForLlvmConfig ++ [ - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_ENABLE_DUMP=ON" - ] ++ optionals stdenv.hostPlatform.isStatic [ - # Disables building of shared libs, -fPIC is still injected by cc-wrapper - "-DLLVM_ENABLE_PIC=OFF" - "-DLLVM_BUILD_STATIC=ON" - "-DLLVM_LINK_LLVM_DYLIB=off" - # libxml2 needs to be disabled because the LLVM build system ignores its .la - # file and doesn't link zlib as well. - # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 - "-DLLVM_ENABLE_LIBXML2=OFF" - ] ++ optionals enableManpages [ - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals enableGoldPlugin [ - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals isDarwin [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ - "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ( - let - nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; - nativeBintools = nativeCC.bintools.bintools; - nativeToolchainFlags = [ - "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" - "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" - "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" - "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" - "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" - ]; - # We need to repass the custom GNUInstallDirs values, otherwise CMake - # will choose them for us, leading to wrong results in llvm-config-native - nativeInstallFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" - "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" - ]; - in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" - + lib.concatStringsSep ";" (lib.concatLists [ - flagsForLlvmConfig - nativeToolchainFlags - nativeInstallFlags - ]) - ) - ]; - - postInstall = '' - mkdir -p $python/share - mv $out/share/opt-viewer $python/share/opt-viewer - moveToOutput "bin/llvm-config*" "$dev" - substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' - '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib - '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; - - inherit doCheck; - - checkTarget = "check-all"; - - # For the update script: - passthru.monorepoSrc = monorepoSrc; - - requiredSystemFeatures = [ "big-parallel" ]; - meta = llvm_meta // { - homepage = "https://llvm.org/"; - description = "A collection of modular and reusable compiler and toolchain technologies"; - longDescription = '' - The LLVM Project is a collection of modular and reusable compiler and - toolchain technologies. Despite its name, LLVM has little to do with - traditional virtual machines. The name "LLVM" itself is not an acronym; it - is the full name of the project. - LLVM began as a research project at the University of Illinois, with the - goal of providing a modern, SSA-based compilation strategy capable of - supporting both static and dynamic compilation of arbitrary programming - languages. Since then, LLVM has grown to be an umbrella project consisting - of a number of subprojects, many of which are being used in production by - a wide variety of commercial and open source projects as well as being - widely used in academic research. Code in the LLVM project is licensed - under the "Apache 2.0 License with LLVM exceptions". - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "llvm-manpages"; - - propagatedBuildInputs = []; - - ninjaFlags = [ "docs-llvm-man" ]; - installTargets = [ "install-docs-llvm-man" ]; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLVM ${version}"; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix b/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix index f0d95323fe..8385f5063d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix @@ -55,7 +55,11 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: types.o:(.bss+0x11b0): multiple definition of `current_file'; y.tab.o:(.bss+0x70): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = toString ([ + "-fcommon" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=int-conversion" + ]); makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" diff --git a/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix index 0a08159661..a379a29812 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "An embeddable implementation of the Ruby language"; homepage = "https://mruby.org"; - maintainers = with maintainers; [ nicknovitski marsam ]; + maintainers = with maintainers; [ nicknovitski ]; license = licenses.mit; platforms = platforms.all; mainProgram = "mruby"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/nasm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nasm/default.nix index 64abd3a1e3..2ba33b2c68 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nasm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nasm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "nasm"; - version = "2.16.02"; + version = "2.16.03"; src = fetchurl { url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-HhuULqiPIu2uiWWeFb4m+gJ+rgdH9RQTVA9S1OrEeQ0="; + hash = "sha256-FBKhx2C70F2wJrbA0WV6/9ZjHNCmPN229zzG1KphYUg="; }; nativeBuildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix index 1b5f21ddef..089043dc6d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -76,12 +76,12 @@ in { nim-unwrapped-2 = stdenv.mkDerivation (finalAttrs: { pname = "nim-unwrapped"; - version = "2.0.2"; + version = "2.0.4"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZPUdO/Vt6dDueeLKapzpRFSvmmOhQaaWnOjFmmC4LM8="; + hash = "sha256-cVJr0HQ53I43j6Gm60B+2hKY8fPU30R23KDjyjy+Pwk="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ] @@ -161,10 +161,10 @@ in { }); nim-unwrapped-1 = nim-unwrapped-2.overrideAttrs (finalAttrs: prevAttrs: { - version = "1.6.18"; + version = "1.6.20"; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-UCQaxyIpG6ljdT8EWqo1h7c8GqKK4pxXPBWluKYCoss="; + hash = "sha256-/+0EdQTR/K9hDw3Xzz4Ce+kaKSsMnFEWFQTC87mE/7k="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/5.2.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/5.2.nix index 26d77f6304..5a0c278320 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/5.2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/5.2.nix @@ -1,9 +1,6 @@ import ./generic.nix { major_version = "5"; minor_version = "2"; - patch_version = "0-beta1"; - src = fetchTarball { - url = "https://caml.inria.fr/pub/distrib/ocaml-5.2/ocaml-5.2.0~beta1.tar.xz"; - sha256 = "sha256:0prf87a41k2y1znnh2pjkggrvhh5cihj68sxqrjn162889rf7wam"; - }; + patch_version = "0"; + sha256 = "sha256-L0v0efUUefm/jH8WlKbqcza793T0rW2mtZ0a1JOd2Kc="; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix index 36ea949d1e..230c911ef6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -9,9 +9,9 @@ let x11deps = [ libX11 xorgproto ]; inherit (lib) optionals; - baseOcamlBranch = "4.11"; + baseOcamlBranch = "4.14"; baseOcamlVersion = "${baseOcamlBranch}.1"; - metaocamlPatch = "111"; + metaocamlPatch = "114"; in stdenv.mkDerivation rec { @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://caml.inria.fr/pub/distrib/ocaml-${baseOcamlBranch}/ocaml-${baseOcamlVersion}.tar.gz"; - sha256 = "sha256-3Yi2OFvZLgrZInMuKMxoyHd4QXcOoAPCC9FS9dtEFc4="; + sha256 = "sha256-GDl53JwJyw9YCiMraFMaCbAlqmKLjY1ydEnxRv1vX+4="; }; metaocaml = fetchurl { url = "http://okmij.org/ftp/ML/ber-metaocaml-${metaocamlPatch}.tar.gz"; - sha256 = "sha256-hDb0w0ZCm0hCz8jktZKmr/7gPSfBoKPT/cc7sPjt0yE="; + sha256 = "sha256-vvq3xI4jSAsrXcDk97TPbFDYgO9NcQeN/yBcUbcb/y0="; }; x11env = buildEnv { name = "x11env"; paths = x11deps; }; @@ -38,17 +38,6 @@ stdenv.mkDerivation rec { dontStrip = true; buildInputs = [ ncurses ] ++ optionals useX11 x11deps; - patches = [ - # glibc 2.34 changed SIGSTKSZ from a #define'd integer to an - # expression involving a function call. This broke all code that - # used SIGSTKSZ as the size of a statically-allocated array. This - # patch is also applied by the ocaml/4.07.nix expression. - (fetchpatch { - url = "https://github.com/ocaml/ocaml/commit/dd28ac0cf4365bd0ea1bcc374cbc5e95a6f39bea.patch"; - sha256 = "sha256-OmyovAu+8sgg3n5YD29Cytx3u/9PO2ofMsmrwiKUxks="; - }) - ]; - postConfigure = '' tar -xvzf $metaocaml cd ${pname}-${version} diff --git a/third_party/nixpkgs/pkgs/development/compilers/odin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/odin/default.nix index 9168ad485e..3cf9d568af 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/odin/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/odin/default.nix @@ -30,13 +30,11 @@ in stdenv.mkDerivation rec { LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; postPatch = lib.optionalString stdenv.isDarwin '' - sed -i src/main.cpp \ - -e 's|-syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk|-syslibroot ${MacOSX-SDK}|' - '' + '' - sed -i build_odin.sh \ - -e 's/^GIT_SHA=.*$/GIT_SHA=/' \ - -e 's/LLVM-C/LLVM/' \ - -e 's/framework System/lSystem/' + substituteInPlace src/linker.cpp \ + --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK} + '' + '' + substituteInPlace build_odin.sh \ + --replace-fail '-framework System' '-lSystem' patchShebangs build_odin.sh ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix b/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix index 37503496c9..de4aad453c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; # nixpkgs-update: no auto update - version = "unstable-2023-11-24"; + version = "0-unstable-2023-11-24"; src = fetchFromGitHub { owner = "open-watcom"; @@ -89,6 +89,8 @@ stdenv.mkDerivation rec { prettyName = "open-watcom-v2"; updateScript = unstableGitUpdater { url = "https://github.com/open-watcom/open-watcom-v2.git"; + # no numerical releases, monthly "YYYY-MM-DD-Build" tags and daily "Current-build", "Last-CI-build" & "Coverity-scan" retagging + hardcodeZeroVersion = true; }; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix index 6d550538b0..424c41ce3c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, icu68 +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, fetchurl, runCommand , openjdk11-bootstrap , withMedia ? true , withWebKit ? false @@ -14,6 +14,16 @@ let java = openjdk11-bootstrap; }); + icuVersionWithSep = s: "71${s}1"; + icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; + icuData = fetchurl { + url = "https://github.com/unicode-org/icu/releases/${icuPath}"; + hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; + }; + icuFakeRepository = runCommand "icu-data-repository" {} '' + install -Dm644 ${icuData} $out/${icuPath} + ''; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}-${build}"; @@ -24,7 +34,7 @@ let sha256 = "sha256-46DjIzcBHkmp5vnhYnLu78CG72bIBRM4A6mgk2OLOko="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -32,6 +42,11 @@ let postPatch = '' substituteInPlace buildSrc/linux.gradle \ --replace ', "-Werror=implicit-function-declaration"' "" + + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h ''; config = writeText "gradle.properties" ('' @@ -46,7 +61,7 @@ let export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk + gradle --no-daemon --console=plain $gradleFlags sdk runHook postBuild ''; @@ -77,6 +92,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/17.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/17.nix index 58444abd3f..c5d6c6aaa5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_4-headless, python3, ruby, icu71, fetchurl, runCommand +, ffmpeg_4-headless, python3, ruby, fetchurl, runCommand , withMedia ? true , withWebKit ? false }: @@ -14,16 +14,14 @@ let java = openjdk17_headless; }); - dashed-icu-version = lib.concatStringsSep "-" (lib.splitVersion (lib.getVersion icu71)); - underscored-icu-version = lib.concatStringsSep "_" (lib.splitVersion (lib.getVersion icu71)); - icu-data = fetchurl { - url = "https://github.com/unicode-org/icu/releases/download/release-${dashed-icu-version}/icu4c-${underscored-icu-version}-data-bin-l.zip"; + icuVersionWithSep = s: "71${s}1"; + icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; + icuData = fetchurl { + url = "https://github.com/unicode-org/icu/releases/${icuPath}"; hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; }; - - fakeRepository = runCommand "icu-data-repository" {} '' - mkdir -p $out/download/release-${dashed-icu-version} - cp ${icu-data} $out/download/release-${dashed-icu-version}/icu4c-${underscored-icu-version}-data-bin-l.zip + icuFakeRepository = runCommand "icu-data-repository" {} '' + install -Dm644 ${icuData} $out/${icuPath} ''; makePackage = args: stdenv.mkDerivation ({ @@ -36,7 +34,7 @@ let sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu71 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -60,7 +58,7 @@ let export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk + gradle --no-daemon --console=plain $gradleFlags sdk runHook postBuild ''; @@ -91,7 +89,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${fakeRepository}"} + ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/19.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/19.nix index 802a0eb9b4..6f173db832 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/19.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/19.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68 +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true , withWebKit ? false }: @@ -15,6 +15,16 @@ let java = openjdk17_headless; }); + icuVersionWithSep = s: "68${s}2"; + icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "."}-data-bin-l.zip"; + icuData = fetchurl { + url = "https://github.com/unicode-org/icu/releases/${icuPath}"; + hash = "sha256-ieQCLBTNrskuf8j3IUQS3QLIAQzLom/O58muMP363Lw="; + }; + icuFakeRepository = runCommand "icu-data-repository" {} '' + install -Dm644 ${icuData} $out/${icuPath} + ''; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}${build}"; @@ -38,7 +48,14 @@ let }) ]; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + ''; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -55,7 +72,7 @@ let export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk + gradle --no-daemon --console=plain $gradleFlags sdk runHook postBuild ''; @@ -89,6 +106,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/20.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/20.nix index d570db3b9a..794590dc7e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/20.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/20.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68 +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true , withWebKit ? false }: @@ -15,6 +15,16 @@ let java = openjdk17_headless; }); + icuVersionWithSep = s: "71${s}1"; + icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; + icuData = fetchurl { + url = "https://github.com/unicode-org/icu/releases/${icuPath}"; + hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; + }; + icuFakeRepository = runCommand "icu-data-repository" {} '' + install -Dm644 ${icuData} $out/${icuPath} + ''; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}${build}"; @@ -25,11 +35,18 @@ let hash = "sha256-QPPJyl6+XU+m5xqYOFtQKJNNrovqy7ngNE/e7kiEJVU="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + ''; + config = writeText "gradle.properties" ('' CONF = Release JDK_HOME = ${openjdk19_headless.home} @@ -42,7 +59,7 @@ let export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk + gradle --no-daemon --console=plain $gradleFlags sdk runHook postBuild ''; @@ -76,6 +93,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/21.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/21.nix index 2f0d83f9f2..f49dbe3b0e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/21.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/21.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68 +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true , withWebKit ? false }: @@ -15,6 +15,16 @@ let java = openjdk17_headless; }); + icuVersionWithSep = s: "73${s}1"; + icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; + icuData = fetchurl { + url = "https://github.com/unicode-org/icu/releases/${icuPath}"; + hash = "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="; + }; + icuFakeRepository = runCommand "icu-data-repository" {} '' + install -Dm644 ${icuData} $out/${icuPath} + ''; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}${build}"; @@ -25,11 +35,18 @@ let hash = "sha256-deNAGfnA6gwcAa64l0AWdkX+vJd3ZOfIgAifSl+/m+s="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + ''; + config = writeText "gradle.properties" ('' CONF = Release JDK_HOME = ${openjdk19_headless.home} @@ -42,7 +59,7 @@ let export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk + gradle --no-daemon --console=plain $gradleFlags sdk runHook postBuild ''; @@ -76,6 +93,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/22.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/22.nix index 89908779c9..d585dbdf01 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/22.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/22.nix @@ -2,6 +2,8 @@ , lib , fetchFromGitHub , fetchpatch +, fetchurl +, runCommand , writeText , openjdk21_headless , gradle @@ -18,7 +20,6 @@ , ffmpeg_4 , python3 , ruby -, icu68 , withMedia ? true , withWebKit ? false }: @@ -29,6 +30,16 @@ let build = "+30"; repover = "${major}${update}${build}"; + icuVersionWithSep = s: "73${s}1"; + icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; + icuData = fetchurl { + url = "https://github.com/unicode-org/icu/releases/${icuPath}"; + hash = "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="; + }; + icuFakeRepository = runCommand "icu-data-repository" {} '' + install -Dm644 ${icuData} $out/${icuPath} + ''; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}${build}"; @@ -39,7 +50,7 @@ let hash = "sha256-sZF7ZPC0kgTTxWgtkxmGtOlfroGPGVZcMw0/wSTJUxQ="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -56,7 +67,7 @@ let export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk + gradle --no-daemon --console=plain $gradleFlags sdk runHook postBuild ''; @@ -88,6 +99,7 @@ makePackage { gradleProperties = '' COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/orc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/orc/default.nix index 07bee8ecd2..9841fd94f2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/orc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/orc/default.nix @@ -60,6 +60,6 @@ in stdenv.mkDerivation rec { # under the 3-clause BSD license. The rest is 2-clause BSD license. license = with licenses; [ bsd3 bsd2 ]; platforms = platforms.unix; - maintainers = [ ]; + maintainers = with maintainers; [ lilyinstarlight ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/osl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/osl/default.nix index c9c849f0a6..d05d01bc6c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/osl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/osl/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "openshadinglanguage"; - version = "1.13.8.0"; + version = "1.13.9.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenShadingLanguage"; rev = "v${version}"; - hash = "sha256-AixN3cj6r/PUGvAhVN4wGfpuLiBt5LglgJp68hFfJMo="; + hash = "sha256-3HSmiIvGk+C5rnHzCXnYlFVeOWYa5M0WZRLTSb8Zsh8="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/rasm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rasm/default.nix index 3246e01414..c131e4b799 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rasm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rasm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mainProgram = "rasm"; # use -n option to display all licenses license = licenses.mit; # expat version - maintainers = [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_77.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_77.nix index 24c1b7bcb5..ab501aba8f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_77.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_77.nix @@ -19,8 +19,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.77.1"; - rustcSha256 = "7hBuTFafUtujtbKCsQWCD4a9j2s9CcBrjc6C+xuzpKE="; + rustcVersion = "1.77.2"; + rustcSha256 = "xhRX749ZZjj928dxZ3iy9rmf8SUTo7DxOZTDvFIWOMM="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_17.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_17.libllvm.override { enableSharedLibraries = true; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix index ee4ee37dfc..4c02692b75 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -274,7 +274,7 @@ in stdenv.mkDerivation (finalAttrs: { # Platforms with host tools from # https://doc.rust-lang.org/nightly/rustc/platform-support.html "x86_64-darwin" "i686-darwin" "aarch64-darwin" - "i686-freebsd13" "x86_64-freebsd13" + "i686-freebsd" "x86_64-freebsd" "x86_64-solaris" "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" "loongarch64-linux" "powerpc64-linux" "powerpc64le-linux" diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix index f22a455e45..75ead6184a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, clisp, coreutils, fetchurl, strace, texinfo, which, writeText, zstd +{ lib, stdenv, callPackage, ecl, coreutils, fetchurl, strace, texinfo, which, writeText, zstd , threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system) , linkableRuntime ? stdenv.hostPlatform.isx86 , disableImmobileSpace ? false @@ -6,37 +6,31 @@ # Note that the created binaries still need `patchelf --set-interpreter ...` # to get rid of ${glibc} dependency. , purgeNixReferences ? false -, coreCompression ? lib.versionAtLeast version "2.2.6" -, markRegionGC ? lib.versionAtLeast version "2.4.0" +, coreCompression ? true +, markRegionGC ? true , version - # Set this to a lisp binary to use a custom bootstrap lisp compiler for - # SBCL. Leave as null to use the default. This is useful for local development - # of SBCL, because you can use your existing stock SBCL as a boostrap. On Hydra + # Set this to a lisp binary to use a custom bootstrap lisp compiler for SBCL. + # Leave as null to use the default. This is useful for local development of + # SBCL, because you can use your existing stock SBCL as a boostrap. On Hydra # of course we can’t do that because SBCL hasn’t been built yet, so we use - # CLISP, but that’s much slower. + # ECL but that’s much slower. , bootstrapLisp ? null }: let versionMap = { - "2.4.2" = { - sha256 = "sha256-/APLUtEqr+h1nmMoRQogG73fibFwcaToPznoC0Pd7w8="; - }; "2.4.3" = { sha256 = "sha256-icmq35K4KtPHSj1PFYoDiJPeoOTzlNyvyWNYPDC3w/I="; }; + "2.4.4" = { + sha256 = "sha256-ipMmJ7Px2OlhjxzcIl7csAJFaARpfiyH0UBoN2ShBtU="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for - # bootstrapping. Ideally these are to be avoided. If CLISP (or any other + # bootstrapping. Ideally these are to be avoided. If ECL (or any other # non-binary-distributed Lisp) can run on any of these systems, that entry # should be removed from this list. bootstrapBinaries = rec { - # This build segfaults using CLISP. - x86_64-darwin = { - version = "2.2.9"; - system = "x86-64-darwin"; - sha256 = "sha256-b1BLkoLIOELAYBYA9eBmMgm1OxMxJewzNP96C9ADfKY="; - }; i686-linux = { version = "1.2.7"; system = "x86-linux"; @@ -67,7 +61,7 @@ let then bootstrapLisp else if (builtins.hasAttr stdenv.hostPlatform.system bootstrapBinaries) then "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" - else "${clisp}/bin/clisp -E UTF-8 --silent -norc"; + else "${lib.getExe ecl} --norc"; in @@ -119,6 +113,15 @@ stdenv.mkDerivation (self: rec { # have it block a release. "futex-wait.test.sh" ]; + patches = [ + # Support the NIX_SBCL_DYNAMIC_SPACE_SIZE envvar. Upstream SBCL didn’t want + # to include this (see + # "https://sourceforge.net/p/sbcl/mailman/sbcl-devel/thread/2cf20df7-01d0-44f2-8551-0df01fe55f1a%400brg.net/"), + # but for Nix envvars are sufficiently useful that it’s worth maintaining + # this functionality downstream. + ./dynamic-space-size-envvar-feature.patch + ./dynamic-space-size-envvar-tests.patch + ]; postPatch = lib.optionalString (self.disabledTestFiles != [ ]) '' (cd tests ; rm -f ${lib.concatStringsSep " " self.disabledTestFiles}) '' @@ -173,15 +176,8 @@ stdenv.mkDerivation (self: rec { "--arch=arm64" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (lib.versionOlder self.version "2.1.10") [ - # Workaround build failure on -fno-common toolchains like upstream - # clang-13. Without the change build fails as: - # duplicate symbol '_static_code_space_free_pointer' in: alloc.o traceroot.o - # Should be fixed past 2.1.10 release. - "-fcommon" - ] - # Fails to find `O_LARGEFILE` otherwise. - ++ [ "-D_GNU_SOURCE" ]); + # Fails to find `O_LARGEFILE` otherwise. + env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; buildPhase = '' runHook preBuild @@ -241,6 +237,7 @@ stdenv.mkDerivation (self: rec { platforms = attrNames bootstrapBinaries ++ [ # These aren’t bootstrapped using the binary distribution but compiled # using a separate (lisp) host + "x86_64-darwin" "x86_64-linux" "aarch64-darwin" "aarch64-linux" diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-feature.patch b/third_party/nixpkgs/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-feature.patch new file mode 100644 index 0000000000..f1596958a6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-feature.patch @@ -0,0 +1,63 @@ +From ac15f9f7c75c1fb5767514e64b609e2a75e6fe9d Mon Sep 17 00:00:00 2001 +From: Hraban Luyat +Date: Sat, 13 Apr 2024 14:04:57 -0400 +Subject: [PATCH] feat: NIX_SBCL_DYNAMIC_SPACE_SIZE envvar + +Read SBCL dynamic space size configuration from env if available. +--- + src/runtime/runtime.c | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c +index 274687c8f..970caa8f4 100644 +--- a/src/runtime/runtime.c ++++ b/src/runtime/runtime.c +@@ -422,6 +422,29 @@ static int is_memsize_arg(char *argv[], int argi, int argc, int *merge_core_page + return 0; + } + ++/** ++ * Read memory options from the environment, if present. ++ * ++ * Memory settings are read in the following priority: ++ * ++ * 1. command line arguments ++ * 2. environment variable ++ * 3. embedded options in core ++ * 4. default ++ */ ++static void ++read_memsize_from_env(void) { ++ const char *val = getenv("NIX_SBCL_DYNAMIC_SPACE_SIZE"); ++ // The distinction is blurry between setting an envvar to the empty string and ++ // unsetting it entirely. Depending on the calling environment it can even be ++ // tricky to properly unset an envvar in the first place. An empty envvar is ++ // practically always intended to just mean “unset”, so let’s interpret it ++ // that way. ++ if (val != NULL && (strcmp(val, "") != 0)) { ++ dynamic_space_size = parse_size_arg(val, "NIX_SBCL_DYNAMIC_SPACE_SIZE"); ++ } ++} ++ + static struct cmdline_options + parse_argv(struct memsize_options memsize_options, + int argc, char *argv[], char *envp[], char *core) +@@ -462,6 +485,7 @@ parse_argv(struct memsize_options memsize_options, + dynamic_space_size = memsize_options.dynamic_space_size; + thread_control_stack_size = memsize_options.thread_control_stack_size; + dynamic_values_bytes = memsize_options.thread_tls_bytes; ++ read_memsize_from_env(); + int stop_parsing = 0; // have we seen '--' + int output_index = 1; + +@@ -488,6 +512,7 @@ parse_argv(struct memsize_options memsize_options, + } + sbcl_argv[output_index] = 0; + } else { ++ read_memsize_from_env(); + bool end_runtime_options = 0; + /* Parse our any of the command-line options that we handle from C, + * stopping at the first one that we don't, and leave the rest */ +-- +2.44.0 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-tests.patch b/third_party/nixpkgs/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-tests.patch new file mode 100644 index 0000000000..1a507cc903 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-tests.patch @@ -0,0 +1,104 @@ +From 9d4a886a8a76ea8be51bcf754cefacdf30986f46 Mon Sep 17 00:00:00 2001 +From: Hraban Luyat +Date: Sat, 13 Apr 2024 15:39:58 -0400 +Subject: [PATCH 2/2] test: dynamic space size envvar and precedence + +--- + tests/memory-args.test.sh | 22 ++++++++++++++++++++++ + tests/save7.test.sh | 37 ++++++++++++++++++++++++++++++++----- + 2 files changed, 54 insertions(+), 5 deletions(-) + create mode 100755 tests/memory-args.test.sh + +diff --git a/tests/memory-args.test.sh b/tests/memory-args.test.sh +new file mode 100755 +index 000000000..72ef0cc79 +--- /dev/null ++++ b/tests/memory-args.test.sh +@@ -0,0 +1,22 @@ ++#!/bin/sh ++ ++. ./subr.sh ++ ++use_test_subdirectory ++ ++set -e ++ ++# Allow slight shrinkage if heap relocation has to adjust for alignment ++NIX_SBCL_DYNAMIC_SPACE_SIZE=234mb run_sbcl_with_args --script < -Date: Tue, 2 Jan 2024 09:20:48 -0500 -Subject: [PATCH] Fix multiple def error - -reported by Hraban Luyat ---- - src/runtime/gc-common.c | 1 + - src/runtime/gc.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/runtime/gc-common.c b/src/runtime/gc-common.c -index 51963b8ff..07536f628 100644 ---- a/src/runtime/gc-common.c -+++ b/src/runtime/gc-common.c -@@ -2999,6 +2999,7 @@ void recompute_gen_bytes_allocated() { - #endif - - #ifdef LISP_FEATURE_DARWIN_JIT -+_Atomic(char) *page_execp; - #include "sys_mmap.inc" - #include - /* darwin-jit has another reason to remap besides just zeroing, namely, -diff --git a/src/runtime/gc.h b/src/runtime/gc.h -index 804e6fce2..5fdc215c2 100644 ---- a/src/runtime/gc.h -+++ b/src/runtime/gc.h -@@ -151,7 +151,7 @@ extern void prepare_pages(bool commit, page_index_t start, page_index_t end, - * squeeze a bit into the 'type' field of the page table, but it's clearer to - * have this externally so that page type 0 remains as "free" */ - #ifdef LISP_FEATURE_DARWIN_JIT --_Atomic(char) *page_execp; -+extern _Atomic(char) *page_execp; - static inline void set_page_executable(page_index_t i, bool val) { page_execp[i] = val; } - #endif - --- -2.42.0 - diff --git a/third_party/nixpkgs/pkgs/development/compilers/scryer-prolog/default.nix b/third_party/nixpkgs/pkgs/development/compilers/scryer-prolog/default.nix index 02383e6b4a..28744a00a5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/scryer-prolog/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/scryer-prolog/default.nix @@ -7,6 +7,7 @@ , libmpc , mpfr , stdenv +, darwin }: rustPlatform.buildRustPackage rec { @@ -23,12 +24,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl gmp libmpc mpfr ]; + + buildInputs = [ openssl gmp libmpc mpfr ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; CARGO_FEATURE_USE_SYSTEM_LIBS = true; meta = with lib; { - broken = stdenv.isDarwin; description = "A modern Prolog implementation written mostly in Rust"; mainProgram = "scryer-prolog"; homepage = "https://github.com/mthom/scryer-prolog"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/shaderc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/shaderc/default.nix index 8982382247..bb8030406a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/shaderc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/shaderc/default.nix @@ -8,25 +8,25 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "a91631b260cba3f22858d6c6827511e636c2458a"; - hash = "sha256-7kIIU45pe+IF7lGltpIKSvQBmcXR+TWFvmx7ztMNrpc="; + rev = "6be56e45e574b375d759b89dad35f780bbd4792f"; + hash = "sha256-tktdsj4sxwQHBavHzu1x8H28RrIqSQs/fp2TQcVCm2g="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"; - hash = "sha256-RzGvoDt1Qc+f6mZsfs99MxX4YB3yFc5FP92Yx/WGrsI="; + rev = "360d469b9eac54d6c6e20f609f9ec35e3a5380ad"; + hash = "sha256-Bned5Pa6zCFByfNvqD0M5t3l4uAJYkDlpe6wu8e7a3U="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3"; - hash = "sha256-/I9dJlBE0kvFvqooKuqMETtOE72Jmva3zIGnq0o4+aE="; + rev = "4183b260f4cccae52a89efdfcdd43c4897989f42"; + hash = "sha256-RKjw3H1z02bl6730xsbo38yjMaOCsHZP9xJOQbmWpnw="; }; in stdenv.mkDerivation rec { pname = "shaderc"; - version = "2023.8"; + version = "2024.0"; outputs = [ "out" "lib" "bin" "dev" "static" ]; @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { owner = "google"; repo = "shaderc"; rev = "v${version}"; - hash = "sha256-c8mJ361DY2VlSFZ4/RCrV+nqB9HblbOdfMkI4cM1QzM="; + hash = "sha256-Cwp7WbaKWw/wL9m70wfYu47xoUGQW+QGeoYhbyyzstQ="; }; - patchPhase = '' + postPatch = '' cp -r --no-preserve=mode ${glslang} third_party/glslang cp -r --no-preserve=mode ${spirv-tools} third_party/spirv-tools ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/patches/force-unwrap-file-handles.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/patches/force-unwrap-file-handles.patch deleted file mode 100644 index a2f2d38c37..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/patches/force-unwrap-file-handles.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8d9ab4b6ed24a97e8af0cc338a52aacdcf438b8c Mon Sep 17 00:00:00 2001 -From: Pavel Sobolev -Date: Tue, 21 Nov 2023 20:53:33 +0300 -Subject: [PATCH] Force-unwrap file handles. - ---- - Sources/TSCBasic/FileSystem.swift | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift -index 3a63bdf..a1f3d9d 100644 ---- a/Sources/TSCBasic/FileSystem.swift -+++ b/Sources/TSCBasic/FileSystem.swift -@@ -425,7 +425,7 @@ private class LocalFileSystem: FileSystem { - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Read the data one block at a time. - let data = BufferedOutputByteStream() -@@ -455,7 +455,7 @@ private class LocalFileSystem: FileSystem { - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Write the data in one chunk. - var contents = bytes.contents --- -2.42.0 diff --git a/third_party/nixpkgs/pkgs/development/compilers/terra/default.nix b/third_party/nixpkgs/pkgs/development/compilers/terra/default.nix index 3f6934f042..ae81adf5f5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/terra/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/terra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, llvmPackages, ncurses, cmake, libxml2 +{ lib, stdenv, fetchFromGitHub, llvmPackages_16, ncurses, cmake, libxml2 , symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false , libffi, libobjc, libpfm, Cocoa, Foundation }: @@ -14,6 +14,7 @@ let sha256 = "1g87pl014b5v6z2nnhiwn3wf405skawszfr5wdzyfbx00j3kgxd0"; }; + llvmPackages = llvmPackages_16; llvmMerged = symlinkJoin { name = "llvmClangMerged"; paths = with llvmPackages; [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/tvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/tvm/default.nix index 3613ed55e0..1f714f1b2d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/tvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/tvm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tvm"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "apache"; repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-VbJptTUi12pJh1wz4I+xL6HVo/rSiUHCkvgEMPe1F6o="; + sha256 = "sha256-g8Z5MRM3KIgCjGxtU9JLEsFUjFxPKmc6OwY17C59cxg="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/typescript/default.nix b/third_party/nixpkgs/pkgs/development/compilers/typescript/default.nix index e9f75b22b0..802d31f0d6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/typescript/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/typescript/default.nix @@ -28,7 +28,7 @@ buildNpmPackage rec { homepage = "https://www.typescriptlang.org/"; changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "tsc"; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix index d29fb743c7..a7041bfc6a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, fetchurl, fetchpatch, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook -, gnome, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll, vala +, gnome, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll, vala, gobject-introspection }: let generic = lib.makeOverridable ({ - version, sha256, + version, hash, extraNativeBuildInputs ? [], extraBuildInputs ? [], withGraphviz ? false @@ -30,7 +30,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - inherit sha256; + inherit hash; }; postPatch = '' @@ -49,7 +49,7 @@ let outputs = [ "out" "devdoc" ]; nativeBuildInputs = [ - pkg-config flex bison libxslt + pkg-config flex bison libxslt gobject-introspection ] ++ lib.optional (stdenv.isDarwin) expat ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ vala ] @@ -77,17 +77,17 @@ let meta = with lib; { description = "Compiler for GObject type system"; - homepage = "https://wiki.gnome.org/Projects/Vala"; + homepage = "https://vala.dev"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar amaxine ] ++ teams.pantheon.members; + maintainers = with maintainers; [ antono jtojnar ] ++ teams.pantheon.members; }; }); in rec { vala_0_56 = generic { - version = "0.56.14"; - sha256 = "k4LCaMqb3AKq7cgVKpgYvzk1JzBB9inFbeQQ42Cj9Vc="; + version = "0.56.17"; + hash = "sha256-JhAMTk7wBJxhknXxQNl89WWIPQDHVDyCvM5aQmk07Wo="; }; vala = vala_0_56; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/hook.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/hook.nix index 0c099a4c0d..e01309b258 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zig/hook.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zig/hook.nix @@ -32,7 +32,9 @@ makeSetupHook { zig_default_flags = let releaseType = - if lib.versionAtLeast zig.version "0.11" then + if lib.versionAtLeast zig.version "0.12" then + "--release=safe" + else if lib.versionAtLeast zig.version "0.11" then "-Doptimize=ReleaseSafe" else "-Drelease-safe=true"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/shell-completions.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/shell-completions.nix index d60f7950dc..44773cf9a5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zig/shell-completions.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zig/shell-completions.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zig-shell-completions"; - version = "unstable-2023-11-18"; + version = "0-unstable-2023-11-18"; src = fetchFromGitHub { owner = "ziglang"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zulu/22.nix b/third_party/nixpkgs/pkgs/development/compilers/zulu/22.nix index 96b0e6805a..93891d6511 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zulu/22.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zulu/22.nix @@ -11,7 +11,7 @@ callPackage ./common.nix ({ zuluVersion = "22.28.91"; jdkVersion = "22.0.0"; hash = - if enableJavaFX then "sha256-HvMiODsz+puu1xtxG2RRXH/PWCk91PGNZ7UcOd9orqQ=" + if enableJavaFX then "sha256-+qUrZ+GlspSP3RLTAbgEtFm0B0fzX/VD1WUl6mk2c/0=" else "sha256-HvMiODsz+puu1xtxG2RRXH/PWCk91PGNZ7UcOd9orqQ="; }; @@ -27,7 +27,7 @@ callPackage ./common.nix ({ zuluVersion = "22.28.91"; jdkVersion = "22.0.0"; hash = - if enableJavaFX then "sha256-Y6PSNQjHRXukwux2sVbvpTIqT+Cg+KeG1C0iSEwyKZw=" + if enableJavaFX then "sha256-QkFwbc2YFEWb5rddhH4a+zmtsrXxUBSuS8yg9qUb728=" else "sha256-Y6PSNQjHRXukwux2sVbvpTIqT+Cg+KeG1C0iSEwyKZw="; }; @@ -35,7 +35,7 @@ callPackage ./common.nix ({ zuluVersion = "22.28.91"; jdkVersion = "22.0.0"; hash = - if enableJavaFX then "sha256-o0VkWB4+PzBmNNWy+FZlyjTgukBTe6owfydb3YNfEE0=" + if enableJavaFX then "sha256-256UP6MtUReQYqCKVt0ThN9BVDyKLAMXQTdpcDB9t24=" else "sha256-o0VkWB4+PzBmNNWy+FZlyjTgukBTe6owfydb3YNfEE0="; }; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zz/Cargo.lock b/third_party/nixpkgs/pkgs/development/compilers/zz/Cargo.lock deleted file mode 100644 index 8b72d6a3e4..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/zz/Cargo.lock +++ /dev/null @@ -1,961 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "aho-corasick" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi", -] - -[[package]] -name = "askama" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a1fb9e41eb366cbcd267da2094be5b7e62fdbca9f82091e7503e80f885050d" -dependencies = [ - "askama_derive", - "askama_escape", - "askama_shared", -] - -[[package]] -name = "askama_derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1012c270085fa35ece6a48a569544fde85b6d9ee41074c7b706cc912a03f939" -dependencies = [ - "askama_shared", - "nom", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "askama_escape" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a577aeba5fec1aafb9f195d98cfcc38a78b588e4ebf9b15f62ca1c7aa33795a" - -[[package]] -name = "askama_shared" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee517f4e33c27b129928e71d8a044d54c513e72e0b72ec5c4f5f1823e9de353" -dependencies = [ - "askama_escape", - "humansize", - "num-traits", - "serde", - "toml", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" - -[[package]] -name = "backtrace" -version = "0.3.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e692897359247cc6bb902933361652380af0f1b7651ae5c5013407f30e109e" -dependencies = [ - "backtrace-sys", - "cfg-if", - "libc", - "rustc-demangle", -] - -[[package]] -name = "backtrace-sys" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fbebbe1c9d1f383a9cc7e8ccdb471b91c8d024ee9c2ca5b5346121fe8b4399" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" - -[[package]] -name = "cc" -version = "1.0.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "clap" -version = "2.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "lazy_static", - "maybe-uninit", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if", - "lazy_static", -] - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "either" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" - -[[package]] -name = "env_logger" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "error-chain" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd" -dependencies = [ - "backtrace", - "version_check", -] - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", -] - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "generic-array" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -dependencies = [ - "typenum", -] - -[[package]] -name = "getrandom" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hermit-abi" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4" -dependencies = [ - "libc", -] - -[[package]] -name = "humansize" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" - -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - -[[package]] -name = "idna" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "itoa" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" - -[[package]] -name = "log" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" - -[[package]] -name = "memoffset" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metrohash" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ba553cb19e2acbc54baa16faef215126243fe45e53357a3b2e9f4ebc7b0506c" - -[[package]] -name = "nom" -version = "5.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6" -dependencies = [ - "memchr", - "version_check", -] - -[[package]] -name = "num-traits" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "numtoa" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "pathdiff" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877630b3de15c0b64cc52f659345724fbf6bdad9bd9566699fc53688f3c34a34" - -[[package]] -name = "pbr" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4403eb718d70c03ee279e51737782902c68cca01e870a33b6a2f9dfb50b9cd83" -dependencies = [ - "libc", - "termion", - "time", - "winapi", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -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", -] - -[[package]] -name = "pest_derive" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pest_meta" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" -dependencies = [ - "maplit", - "pest", - "sha-1", -] - -[[package]] -name = "proc-macro2" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8872cf6f48eee44265156c111456a700ab3483686b3f96df4cf5481c89157319" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rayon" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" -dependencies = [ - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" -dependencies = [ - "crossbeam-deque", - "crossbeam-queue", - "crossbeam-utils", - "lazy_static", - "num_cpus", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" - -[[package]] -name = "redox_termios" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -dependencies = [ - "redox_syscall", -] - -[[package]] -name = "regex" -version = "1.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", - "thread_local", -] - -[[package]] -name = "regex-syntax" -version = "0.6.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" - -[[package]] -name = "remove_dir_all" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -dependencies = [ - "winapi", -] - -[[package]] -name = "rmp" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f10b46df14cf1ee1ac7baa4d2fbc2c52c0622a4b82fa8740e37bc452ac0184f" -dependencies = [ - "byteorder", - "num-traits", -] - -[[package]] -name = "rmp-serde" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c1ee98f14fe8b8e9c5ea13d25da7b2a1796169202c57a09d7288de90d56222b" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "rsmt2" -version = "0.11.0" -source = "git+https://github.com/kino-mc/rsmt2?rev=ebce2e4#ebce2e403d25ca739cfd717817be68844f80f13c" -dependencies = [ - "error-chain", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" - -[[package]] -name = "ryu" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "serde" -version = "1.0.106" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.106" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha-1" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" -dependencies = [ - "block-buffer", - "digest", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" -dependencies = [ - "block-buffer", - "digest", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "smallvec" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "syn" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand", - "remove_dir_all", -] - -[[package]] -name = "termcolor" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "termion" -version = "1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22cec9d8978d906be5ac94bceb5a010d885c626c4c8855721a4dbd20e3ac905" -dependencies = [ - "libc", - "numtoa", - "redox_syscall", - "redox_termios", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "toml" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -dependencies = [ - "serde", -] - -[[package]] -name = "typenum" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" - -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - -[[package]] -name = "unicode-bidi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" -dependencies = [ - "smallvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" - -[[package]] -name = "unicode-xid" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" - -[[package]] -name = "url" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" -dependencies = [ - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "vec_map" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" - -[[package]] -name = "version_check" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "which" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" -dependencies = [ - "failure", - "libc", -] - -[[package]] -name = "winapi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "zz" -version = "0.1.1" -dependencies = [ - "askama", - "clap", - "env_logger", - "getrandom", - "lazy_static", - "log", - "metrohash", - "pathdiff", - "pbr", - "pest", - "pest_derive", - "rayon", - "rmp-serde", - "rsmt2", - "serde", - "serde_json", - "sha2", - "tempdir", - "toml", - "url", - "which", -] diff --git a/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix deleted file mode 100644 index ea4e33b8a9..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, makeWrapper, z3, pkgsHostTarget }: - -let - runtimeDeps = [ - z3 - pkgsHostTarget.targetPackages.stdenv.cc - ]; -in - -rustPlatform.buildRustPackage rec { - pname = "zz"; - version = "unstable-2021-05-04"; - - # when updating, choose commit of the latest build on http://bin.zetz.it/ - src = fetchFromGitHub { - owner = "zetzit"; - repo = "zz"; - rev = "18020b10b933cfe2fc7f2256b71e646889f9b1d2"; - sha256 = "01nlyyk1qxk76dq2hw3wpbjwkh27zzp6mpczjnxdpv6rxs7mc825"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "rsmt2-0.11.0" = "sha256-RwNsS0zge8uOXmgzTvDwp8AD70NspIZq0LgW/v3yrpA="; - }; - }; - - postPatch = '' - # remove search path entry which would reference /build - sed -i '/env!("CARGO_MANIFEST_DIR")/d' src/lib.rs - ''; - - postInstall = '' - mkdir -p "$out/share/zz" - cp -r modules "$out/share/zz/" - - wrapProgram $out/bin/zz \ - --prefix PATH ":" "${lib.makeBinPath runtimeDeps}" \ - --suffix ZZ_MODULE_PATHS ":" "$out/share/zz/modules" - ''; - - meta = with lib; { - description = "ZetZ a zymbolic verifier and tranzpiler to bare metal C"; - mainProgram = "zz"; - homepage = "https://github.com/zetzit/zz"; - license = licenses.mit; - maintainers = [ maintainers.marsam ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix index 769017d4e2..0557311c36 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix @@ -29,7 +29,7 @@ compcert = mkCoqDerivation { releaseRev = v: "v${v}"; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.19"; out = "3.13.1"; } + { case = range "8.14" "8.19"; out = "3.14"; } { case = isEq "8.13" ; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } { case = range "8.8" "8.11"; out = "3.8"; } @@ -43,6 +43,7 @@ compcert = mkCoqDerivation { "3.12".sha256 = "sha256-hXkQ8UnAx3k50OJGBmSm4hgrnRFCosu4+PEMrcKfmV0="; "3.13".sha256 = "sha256-ZedxgEPr1ZgKIcyhQ6zD1l2xr6RDNNUYq/4ZyR6ojM4="; "3.13.1".sha256 = "sha256-ldXbuzVB0Z+UVTd5S4yGSg6oRYiKbXLMmUZcQsJLcns="; + "3.14".sha256 = "sha256-QXJMpp/BaPiK5okHeo2rcmXENToXKjB51UqljMHTDgw="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-lsp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-lsp/default.nix index 790c264d28..afa42728bb 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-lsp/default.nix @@ -36,7 +36,7 @@ mkCoqDerivation rec { description = "Language Server Protocol and VS Code Extension for Coq"; homepage = "https://github.com/ejgallego/coq-lsp"; changelog = "https://github.com/ejgallego/coq-lsp/blob/${defaultVersion}/CHANGES.md"; - maintainers = with maintainers; [ alizter marsam ]; + maintainers = with maintainers; [ alizter ]; license = licenses.lgpl21Only; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix index d65a486476..b9a295617b 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix @@ -5,8 +5,9 @@ owner = "tchajed"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.19"; out = "0.3.3"; } + { case = range "8.10" "8.19"; out = "0.3.4"; } ] null; + release."0.3.4".sha256 = "sha256-AhEcugUiVIsgbq884Lur/bQIuGw8prk+3AlNkP1omcw="; release."0.3.3".sha256 = "sha256-HDIPeFHiC9EwhiOH7yMGJ9d2zJMhboTpRGf9kWcB9Io="; release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk="; release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqide/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqide/default.nix index d2dda145f6..449e81040d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqide/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqide/default.nix @@ -1,7 +1,7 @@ { lib , makeDesktopItem , copyDesktopItems -, wrapGAppsHook +, wrapGAppsHook3 , glib , gnome , mkCoqDerivation @@ -26,7 +26,7 @@ mkCoqDerivation rec { buildInputs = [ copyDesktopItems - wrapGAppsHook + wrapGAppsHook3 coq.ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix index 0ae9fc5ca6..5e72d4a97e 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix @@ -4,6 +4,7 @@ mkCoqDerivation rec { pname = "corn"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = (range "8.17" "8.19"); out = "8.19.0"; } { case = (range "8.14" "8.18"); out = "8.18.0"; } { case = (range "8.11" "8.17"); out = "8.16.0"; } { case = (range "8.7" "8.15"); out = "8.13.0"; } @@ -15,6 +16,7 @@ mkCoqDerivation rec { "8.13.0".sha256 = "1wzr7mdsnf1rq7q0dvmv55vxzysy85b00ahwbs868bl7m8fk8x5b"; "8.16.0".sha256 = "sha256-ZE/EEIndxHfo/9Me5NX4ZfcH0ZAQ4sRfZY7LRZfLXBQ="; "8.18.0".sha256 = "sha256-ow3mfarZ1PvBGf5WLnI8LdF3E+8A6fN7cOcXHrZJLo0="; + "8.19.0".sha256 = "sha256-h5MlfRuv2hTbxGmpLUEGQO1YqQTwUNEHZzCfvdOU1TA="; }; configureScript = "./configure.sh"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix index 69d65d4b55..4630f14dea 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation { pname = "math-classes"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.17" "8.19"; out = "8.19.0"; } { case = range "8.12" "8.18"; out = "8.18.0"; } { case = range "8.12" "8.17"; out = "8.17.0"; } { case = range "8.6" "8.16"; out = "8.15.0"; } @@ -14,6 +15,7 @@ mkCoqDerivation { release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw"; release."8.17.0".sha256 = "sha256-WklL8pgYTd0l4TGt7h7tWj1qcFcXvoPn25+XKF1pIKA="; release."8.18.0".sha256 = "sha256-0WwPss8+Vr37zX616xeuS4TvtImtSbToFQkQostIjO8="; + release."8.19.0".sha256 = "sha256-rsV96W9MPFi/DKsepNPm1QnC2DMemio+uALIgzVYw0w="; propagatedBuildInputs = [ bignums ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/ssprove/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/ssprove/default.nix new file mode 100644 index 0000000000..714872170c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/ssprove/default.nix @@ -0,0 +1,48 @@ +{ lib, mkCoqDerivation, coq, version ? null +, equations +, mathcomp-ssreflect +, mathcomp-analysis +, extructures +, deriving +}: + +(mkCoqDerivation { + pname = "ssprove"; + owner = "SSProve"; + + inherit version; + defaultVersion = with lib.versions; lib.switch [coq.coq-version mathcomp-ssreflect.version] [ + { cases = [(range "8.18" "8.19") (range "2.1.0" "2.2.0")]; out = "0.2.0"; } + # This is the original dependency: + # { cases = ["8.17" "1.18.0"]; out = "0.1.0"; } + # But it is not loadable. The math-comp nixpkgs configuration + # will always only output version 1.18.0 for Coq 8.17. + # Hence, the Coq 8.17 and math-comp 1.17.0 must be explicitly set + # to load it. + # (This version is not on the math-comp CI and hence not checked.) + { cases = ["8.17" "1.17.0"]; out = "0.1.0"; } + ] null; + + releaseRev = v: "v${v}"; + + release."0.2.0".sha256 = "sha256-GDkWH0LUsW165vAUoYC5of9ndr0MbfBtmrPhsJVXi3o="; + release."0.1.0".sha256 = "sha256-Yj+k+mBsudi3d6bRVlZLyM4UqQnzAX5tHvxtKoIuNTE="; + + propagatedBuildInputs = [equations + mathcomp-ssreflect + mathcomp-analysis + extructures + deriving]; + + meta = with lib; { + description = "SSProve: A Foundational Framework for Modular Cryptographic Proofs in Coq"; + license = licenses.mit; + maintainers = [ { + name = "Sebastian Ertel"; + email = "sebastian.ertel@gmail.com"; + github = "sertel"; + githubId = 3703100; + } ]; + }; + +}) diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/vscoq-language-server/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/vscoq-language-server/default.nix index ee74d77101..e79bd4f60f 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -1,4 +1,4 @@ -{ metaFetch, mkCoqDerivation, coq, lib, glib, gnome, wrapGAppsHook, +{ metaFetch, mkCoqDerivation, coq, lib, glib, gnome, wrapGAppsHook3, version ? null }: let ocamlPackages = coq.ocamlPackages; @@ -21,7 +21,7 @@ ocamlPackages.buildDunePackage { src = "${fetched.src}/language-server"; nativeBuildInputs = [ coq ]; buildInputs = - [ coq glib gnome.adwaita-icon-theme wrapGAppsHook ] ++ + [ coq glib gnome.adwaita-icon-theme wrapGAppsHook3 ] ++ (with ocamlPackages; [ findlib lablgtk3-sourceview3 yojson zarith ppx_inline_test ppx_assert ppx_sexp_conv ppx_deriving ppx_import sexplib diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix index a97fa50aeb..2efab1f1e2 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix @@ -14,7 +14,6 @@ buildFHSEnv { pyserial ])) ]); - multiArch = false; extraInstallCommands = '' ${lib.optionalString withGui '' diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/default.nix index e823966697..43e6292143 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -4,6 +4,7 @@ , fetchurl , jdk , ant +, stripJavaArchivesHook , libusb-compat-0_1 , libusb1 , unzip @@ -12,7 +13,7 @@ , readline , withGui ? false , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , withTeensyduino ? false /* Packages needed for Teensyduino */ , upx @@ -112,7 +113,7 @@ stdenv.mkDerivation rec { # the glib setup hook will populate GSETTINGS_SCHEMAS_PATH, # wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS # so 'save as...' works: - nativeBuildInputs = [ glib wrapGAppsHook unzip ]; + nativeBuildInputs = [ glib stripJavaArchivesHook wrapGAppsHook3 unzip ]; buildInputs = [ jdk ant diff --git a/third_party/nixpkgs/pkgs/development/embedded/bossa/default.nix b/third_party/nixpkgs/pkgs/development/embedded/bossa/default.nix index 58ee0642fb..0444a2000a 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/bossa/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/bossa/default.nix @@ -5,6 +5,7 @@ , libX11 , readline , darwin +, fetchpatch }: let @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw="; }; + patches = [ + (fetchpatch { + # Required for building on Darwin with clang >=15. + name = "pr-172-fix.patch"; + url = "https://github.com/shumatech/BOSSA/commit/6e54973c3c758674c3d04b5e2cf12e097006f6a3.patch"; + hash = "sha256-2lp6Ej3IfofztC1n/yHLjabn0MH4BA/CM3dsnAw8klA="; + }) + ]; + postPatch = '' substituteInPlace Makefile \ --replace "-arch x86_64" "" diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix index 15465d4a43..5309093f17 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "openFPGALoader"; homepage = "https://github.com/trabucayre/openFPGALoader"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ danderson ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix index 4bcad690bb..6d58322767 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -13,11 +13,11 @@ let iconame = "STM32CubeMX"; package = stdenvNoCC.mkDerivation rec { pname = "stm32cubemx"; - version = "6.10.0"; + version = "6.11.1"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-B5Sf+zM7h9BiFqDYrLS0JdqZi3dGy6H9gAaJIN3izeM="; + hash = "sha256-By9T43GLM1J63TkRi3kl05h1RflBorU1QHgYOrXQ9N0="; stripRoot = false; }; @@ -84,7 +84,7 @@ let }; in buildFHSEnv { - inherit (package) pname meta; + inherit (package) pname version meta; runScript = "${package.outPath}/bin/stm32cubemx"; targetPkgs = pkgs: with pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix index 0314ed738e..ef5213b26c 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "guile-git"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitLab { owner = "guile-git"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+GVGM9XOy8+nFChyJazRWsNBjS+HYUBnbUErCVkxZyg="; + sha256 = "sha256-7xKs5Biq9HHOJbNILLU1oX8oPuEbti0uLMiobKz//bU="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix index ca9989bfcd..1262cd73f6 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "guile-lib"; - version = "0.2.8"; + version = "0.2.8.1"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-ZOkC7gy7LO4e+4Fow7+e1J4LMqiiPbhj6DvxSBfXZ9k="; + hash = "sha256-E3TC2Dnmoz0ZDNHavZx/h3U/g4T1W4ZvPhQhVcIrSbE="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 8e7396a3fb..b16a9abfe8 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2024-02-05"; + version = "unstable-2024-04-21"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/173e8a5fa70dc95a1aeb0bd877bf5fee6d5e6b4a.tar.gz"; - sha256 = "1pld7jfsjmw486ch6li1fqci1jj5p2nvfq7nrkxrmf5p2ja5528g"; + url = "https://github.com/NixOS/cabal2nix/archive/f8e6bf749a158a5ed866c57deee907b5f16c38e5.tar.gz"; + sha256 = "0c73mvza65iy46fv8c8cadsy7klk4jzmimm1mfdavvm8i2cr5476"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 00dcc3b7a5..c07e2faa55 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -24,7 +24,7 @@ self: super: { Cabal-syntax = self.Cabal-syntax_3_10_3_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible - process = self.process_1_6_18_0; + process = self.process_1_6_19_0; })); # cabal-install needs most recent versions of Cabal and Cabal-syntax, @@ -48,7 +48,7 @@ self: super: { # cabal-install, but we need to recompile process even if the correct # version is available to prevent inconsistent dependencies: # process depends on directory. - process = cself.process_1_6_18_0; + process = cself.process_1_6_19_0; # Prevent dependency on doctest which causes an inconsistent dependency # due to depending on ghc which depends on directory etc. @@ -270,20 +270,7 @@ self: super: { ghcjs-base = null; ghcjs-prim = null; - # 2024-03-10: Compatibility fixes have been applied upstream, but are unreleased. - ghc-debug-brick = appendPatches [ - (fetchpatch { - url = "https://gitlab.haskell.org/ghc/ghc-debug/-/commit/4f195b98a8d3159bd4586af49ea8e269214a848e.patch"; - sha256 = "sha256-ZMxDkkI365w/qtRc21k9UTcIiTjoOd/BGJgt/6C6P6A="; - relative = "ghc-debug-brick"; - includes = ["ghc-debug-brick.cabal"]; - }) - (fetchpatch { - url = "https://gitlab.haskell.org/ghc/ghc-debug/-/commit/5b8f848b82ea4c5a1867b9965a973e73e5d58dad.patch"; - sha256 = "sha256-XydmqScUuXyxqvW1HeKlKiiGFQi/MkM81RMPxmADrhw="; - relative = "ghc-debug-brick"; - }) - ] super.ghc-debug-brick; + ghc-debug-client = doJailbreak super.ghc-debug-client; # Test failure. Tests also disabled in Stackage: # https://github.com/jtdaugherty/brick/issues/499 @@ -411,6 +398,13 @@ self: super: { rm -r $out/doc/?ndroid* ''; }; + + patches = drv.patches or [ ] ++ [ + # Prevent .desktop files from being installed to $out/usr/share. + # TODO(@sternenseemann): submit upstreamable patch resolving this + # (this should be possible by also taking PREFIX into account). + ./patches/git-annex-no-usr-prefix.patch + ]; }) super.git-annex; # Too strict bounds on servant @@ -738,7 +732,6 @@ self: super: { Rlang-QQ = dontCheck super.Rlang-QQ; safecopy = dontCheck super.safecopy; sai-shape-syb = dontCheck super.sai-shape-syb; - saltine = dontCheck super.saltine; # https://github.com/tel/saltine/pull/56 scp-streams = dontCheck super.scp-streams; sdl2 = dontCheck super.sdl2; # the test suite needs an x server separated = dontCheck super.separated; @@ -758,6 +751,7 @@ self: super: { translatable-intset = dontCheck super.translatable-intset; ua-parser = dontCheck super.ua-parser; unagi-chan = dontCheck super.unagi-chan; + universe-some = dontCheck super.universe-some; wai-logger = dontCheck super.wai-logger; WebBits = dontCheck super.WebBits; # http://hydra.cryp.to/build/499604/log/raw webdriver = dontCheck super.webdriver; @@ -940,22 +934,6 @@ self: super: { # https://github.com/Euterpea/Euterpea2/issues/40 Euterpea = doJailbreak super.Euterpea; - # Install icons, metadata and cli program. - bustle = appendPatches [ - # Fix build with libpcap 1.10.2 - # https://gitlab.freedesktop.org/bustle/bustle/-/merge_requests/21 - (pkgs.fetchpatch { - url = "https://gitlab.freedesktop.org/bustle/bustle/-/commit/77e2de892cd359f779c84739682431a66eb8cf31.patch"; - hash = "sha256-sPb6/Z/ANids53aL9VsMHa/v5y+TA1ZY3jwAXlEH3Ec="; - }) - ] (overrideCabal (drv: { - buildDepends = [ pkgs.libpcap ]; - buildTools = with pkgs.buildPackages; [ gettext perl help2man ]; - postInstall = '' - make install PREFIX=$out - ''; - }) super.bustle); - # Byte-compile elisp code for Emacs. ghc-mod = overrideCabal (drv: { preCheck = "export HOME=$TMPDIR"; @@ -1326,9 +1304,6 @@ self: super: { # https://github.com/haskell/hoopl/issues/50 hoopl = dontCheck super.hoopl; - # Generate shell completion for spago - spago = self.generateOptparseApplicativeCompletions [ "spago" ] super.spago; - # https://github.com/DanielG/cabal-helper/pull/123 cabal-helper = doJailbreak super.cabal-helper; @@ -1367,11 +1342,21 @@ self: super: { (dontCheckIf (!pkgs.postgresql.doCheck)) ]; + # Requires pqueue <1.5 but it works fine with pqueue-1.5.0.0 + # https://github.com/haskell-beam/beam/pull/705 + beam-migrate = doJailbreak super.beam-migrate; + users-postgresql-simple = addTestToolDepends [ pkgs.postgresql pkgs.postgresqlTestHook ] super.users-postgresql-simple; + # Need https://github.com/obsidiansystems/gargoyle/pull/45 + gargoyle = doJailbreak super.gargoyle; + gargoyle-postgresql = doJailbreak super.gargoyle-postgresql; + gargoyle-postgresql-nix = doJailbreak (addBuildTool [pkgs.postgresql] super.gargoyle-postgresql-nix); + gargoyle-postgresql-connect = doJailbreak super.gargoyle-postgresql-connect; + # PortMidi needs an environment variable to have ALSA find its plugins: # https://github.com/NixOS/nixpkgs/issues/6860 PortMidi = overrideCabal (drv: { @@ -1401,8 +1386,6 @@ self: super: { # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch ./patches/xattr-fix-build.patch super.xattr; - patch = dontCheck super.patch; - esqueleto = overrideCabal (drv: { @@ -1552,11 +1535,6 @@ self: super: { # 2021-12-26: Too strict bounds on doctest polysemy-plugin = doJailbreak super.polysemy-plugin; - # hasn’t bumped upper bounds - # upstream: https://github.com/obsidiansystems/which/pull/6 - which = doJailbreak super.which; - - # 2024-02-28: The Hackage version dhall-lsp-server-1.1.3 requires # lsp-1.4.0.0 which is hard to build with this LTS. However, the latest # git version of dhall-lsp-server works with lsp-2.1.0.0, and only @@ -1583,12 +1561,16 @@ self: super: { doJailbreak ]; - # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19 jsaddle-dom = overrideCabal (old: { postPatch = old.postPatch or "" + '' - sed -i 's/lens.*4.20/lens/' jsaddle-dom.cabal + rm Setup.hs ''; - }) (doJailbreak super.jsaddle-dom); + }) super.jsaddle-dom; + jsaddle-hello = doJailbreak super.jsaddle-hello; + ghcjs-dom-hello = doJailbreak super.ghcjs-dom-hello; + + # Too strict upper bounds on text + lsql-csv = doJailbreak super.lsql-csv; reflex-dom = lib.pipe super.reflex-dom [ (appendPatch @@ -1849,9 +1831,6 @@ self: super: { # https://github.com/adnelson/semver-range/issues/15 semver-range = dontCheck super.semver-range; - # https://github.com/obsidiansystems/dependent-sum/issues/55 - dependent-sum = doJailbreak super.dependent-sum; - # 2022-06-19: Disable checks because of https://github.com/reflex-frp/reflex/issues/475 reflex = doJailbreak (dontCheck super.reflex); @@ -2079,18 +2058,31 @@ self: super: { # Issue reported upstream, no bug tracker url yet. darcs = doJailbreak super.darcs; - # Too strict version bounds on cryptonite and github. - # PRs are merged, will be fixed next release or Hackage revision. - nix-thunk = appendPatches [ - (fetchpatch { - url = "https://github.com/obsidiansystems/nix-thunk/commit/49d27a85dd39cd9413c99958c67e596756a502b5.patch"; - sha256 = "1p1n0123yrbdqyfk4kx3gq6bdv65l1bxgbsg51ckcwclg54xp2p5"; - }) - (fetchpatch { - url = "https://github.com/obsidiansystems/nix-thunk/commit/512867c651977265d5d8f456b538f7a364ec8a8b.patch"; - sha256 = "121yg26y4g28k8xv7y1j6c3pxm17vsjn3vi62kkc8g928c47yd02"; - }) - ] super.nix-thunk; + # Need https://github.com/obsidiansystems/cli-extras/pull/12 and more + cli-extras = doJailbreak super.cli-extras; + + # https://github.com/obsidiansystems/cli-git/pull/7 turned into a flat patch + cli-git = lib.pipe super.cli-git [ + (appendPatch (fetchpatch { + url = "https://github.com/obsidiansystems/cli-git/commit/be378a97e2f46522174231b77c952f759df3fad6.patch"; + sha256 = "sha256-6RrhqkKpnb+FTHxccHNx6pdC7ClfqcJ2eoo+W7h+JUo="; + excludes = [ ".github/**" ]; + })) + doJailbreak + (addBuildTool pkgs.git) + ]; + + # Need https://github.com/obsidiansystems/cli-nix/pull/5 and more + cli-nix = addBuildTools [ + pkgs.nix + pkgs.nix-prefetch-git + ] (doJailbreak super.cli-nix); + + # https://github.com/obsidiansystems/nix-thunk/pull/51/ + nix-thunk = appendPatch (fetchpatch { + url = "https://github.com/obsidiansystems/nix-thunk/commit/c3dc3e799e8ce7756330f98b9f73f59c4b7a5502.patch"; + sha256 = "sha256-C1ii1FXiCPFfw5NzyQZ0cEG6kIYGohVsnHycpYEJ24Q="; + }) (doJailbreak super.nix-thunk); # list `modbus` in librarySystemDepends, correct to `libmodbus` libmodbus = doJailbreak (addExtraLibrary pkgs.libmodbus super.libmodbus); @@ -2103,9 +2095,14 @@ self: super: { ginger = doJailbreak super.ginger; - # Too strict version bounds on cryptonite - # https://github.com/obsidiansystems/haveibeenpwned/issues/7 - haveibeenpwned = doJailbreak super.haveibeenpwned; + # 2024-05-05 syntax changes: https://github.com/obsidiansystems/haveibeenpwned/pull/9 + haveibeenpwned = appendPatch + (fetchpatch { + url = "https://github.com/obsidiansystems/haveibeenpwned/pull/9/commits/14c134eec7de12f755b2d4667727762a8a1a6476.patch"; + sha256 = "sha256-fau5+b6tufJ+MscrLgbYvvBsekPe8R6QAy/4H31dcQ4"; + }) + (doJailbreak super.haveibeenpwned); + # Too strict version bounds on ghc-events # https://github.com/mpickering/hs-speedscope/issues/16 @@ -2188,11 +2185,6 @@ self: super: { compiler: ${self.ghc.haskellCompilerName} core-packages: - # Hack: The following package is a core package of GHCJS. If we don't declare - # it, then hackage2nix will generate a Hackage database where all dependants - # of this library are marked as "broken". - - ghcjs-base-0 - EOF ghc-pkg list \ @@ -2258,6 +2250,13 @@ self: super: { # https://github.com/merijn/paramtree/issues/4 paramtree = dontCheck super.paramtree; + # https://github.com/haskell-gi/haskell-gi/issues/431 + haskell-gi = appendPatch (fetchpatch { + url = "https://github.com/haskell-gi/haskell-gi/pull/430/commits/9ee545ad5028e5de8e1e1d96bbba2b9dbab47480.diff"; + hash = "sha256-kh32mZ7EdlOsg7HQILB7Y/EkHIqG/mozbnd/kbP+WDk="; + }) + super.haskell-gi; + # Too strict version bounds on haskell-gi # https://github.com/owickstrom/gi-gtk-declarative/issues/100 gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; @@ -2608,8 +2607,30 @@ self: super: { # 2022-03-16: Upstream stopped updating bounds https://github.com/haskell-hvr/base-noprelude/pull/15 base-noprelude = doJailbreak super.base-noprelude; - # 2022-03-16: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/issues/10 - dependent-sum-aeson-orphans = doJailbreak super.dependent-sum-aeson-orphans; + # 2025-05-05: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/13 + dependent-monoidal-map = appendPatch (fetchpatch { + url = "https://github.com/obsidiansystems/dependent-monoidal-map/commit/3f8be15fa9bd2796d1c917e9f0979b4d6c62cf91.patch"; + hash = "sha256-QKDUh4jO8xZrThrkjTVNnkoVY+GejxOhpXOVA4+n1H8="; + }) super.dependent-monoidal-map; + + # 2025-05-05: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/13 + dependent-sum-aeson-orphans = appendPatch (fetchpatch { + url = "https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/9b4698154303a9865d7d68a2f01d280a8a39f108.patch"; + hash = "sha256-Pzjl2yp01XsYWcyhpLnsuccg7bOACgv+RpafauUox8c="; + }) super.dependent-sum-aeson-orphans; + + # https://github.com/obsidiansystems/dependent-sum/pull/73 + dependent-sum-template = appendPatch (fetchpatch { + url = "https://github.com/obsidiansystems/dependent-sum/commit/619727ba1792e39a68d23c62e75a923672e87a54.patch"; + hash = "sha256-SyD1/KrX1KUjrR82fvI+BRcqLC2Q3AbvSeKNrdGstjg="; + relative = "dependent-sum-template"; + }) super.dependent-sum-template; + + aeson-gadt-th = appendPatch (fetchpatch { + url = "https://github.com/obsidiansystems/aeson-gadt-th/commit/8f6922a6440019dece637d73d70766c473bcd6c0.patch"; + hash = "sha256-564DhfiubwNV8nAj8L5DzsWn4MdzqqaYYNmOSPUa7ys="; + excludes = [ ".github/**" ]; + }) super.aeson-gadt-th; # Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24 system-fileio = doJailbreak super.system-fileio; @@ -2626,12 +2647,27 @@ self: super: { # https://github.com/ngless-toolkit/ngless/issues/152 NGLess = dontCheck super.NGLess; - # Raise version bounds for hspec + # Raise version bounds: https://github.com/well-typed/lens-sop/pull/4 + lens-sop = appendPatches [ + (fetchpatch { + url = "https://github.com/well-typed/lens-sop/commit/d8657f27c12191a7c0a91701c0fcd9a590e0090e.patch"; + sha256 = "sha256-9ODfbOb6Bs3EVTY9b7cUvkNmqzzZPWUmgmlAneaN3Tw="; + }) + (fetchpatch { + url = "https://github.com/well-typed/lens-sop/commit/b7ecffdeb836d19373871659e2f8cd24da6f7312.patch"; + sha256 = "sha256-hDUQ2fW9Qyom65YvtW9bsbz7XtueRmdsAbAB42D+gu4="; + }) + ] super.lens-sop; + + # Raise version bounds: https://github.com/kosmikus/records-sop/pull/15 records-sop = appendPatch (fetchpatch { - url = "https://github.com/kosmikus/records-sop/pull/11/commits/d88831388ab3041190130fec3cdd679a4217b3c7.patch"; - sha256 = "sha256-O+v/OxvqnlWX3HaDvDIBZnJ+Og3xs/SJqI3gaouU3ZI="; + url = "https://github.com/kosmikus/records-sop/commit/fb149f453a816ff14d0cb20b3ea56b80ff49d9f1.patch"; + sha256 = "sha256-iHiF4EWL/GjJFnr/6aR+yMZKLMLAZK+gsgSxG8YaeDI="; }) super.records-sop; + # Need https://github.com/well-typed/large-records/pull/151 + large-generics = doJailbreak super.large-generics; + # Fix build failures for ghc 9 (https://github.com/mokus0/polynomial/pull/20) polynomial = appendPatch (fetchpatch { name = "haskell-polynomial.20.patch"; @@ -2944,7 +2980,7 @@ self: super: { # Requires a newer zlib version than stackage provides futhark = super.futhark.override { - zlib = self.zlib_0_7_0_0; + zlib = self.zlib_0_7_1_0; }; # Tests rely on (missing) submodule @@ -2998,6 +3034,14 @@ self: super: { # 2024-03-25: HSH broken because of the unix-2.8.0.0 breaking change HSH = appendPatches [./patches/HSH-unix-openFd.patch] super.HSH; + # Support unix < 2.8 to build in older ghc than 9.6 + linux-namespaces = appendPatch + (fetchpatch { + url = "https://github.com/redneb/hs-linux-namespaces/commit/f4a3546541bb6c7172fdd03e177a961da60e3951.patch"; + sha256 = "sha256-6Qv7NWIbzR3ktMGFogw5597bIqPH7Z4hoFvvBQAoquY="; + }) + super.linux-namespaces; + inherit (let unbreakRepa = packageName: drv: lib.pipe drv [ @@ -3056,4 +3100,11 @@ self: super: { # Too strict bounds on text. Can be removed after https://github.com/alx741/currencies/pull/3 is merged currencies = doJailbreak super.currencies; + + # https://github.com/awakesecurity/proto3-wire/pull/104 + proto3-wire = appendPatch (pkgs.fetchpatch { + url = "https://github.com/awakesecurity/proto3-wire/commit/c1cadeb5fca2e82c5b28e2811c01f5b37eb21ed8.patch"; + hash = "sha256-tFOWpjGmZANC7H82QapZ36raaNWuZ6F3BgjxnfTXpMs="; + }) super.proto3-wire; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix index 480059de14..f3267f376b 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix @@ -82,6 +82,17 @@ self: super: ({ # the system-fileio tests use canonicalizePath, which fails in the sandbox system-fileio = dontCheck super.system-fileio; + git-annex = overrideCabal (drv: { + # We can't use testFlags since git-annex side steps the Cabal test mechanism + preCheck = drv.preCheck or "" + '' + checkFlagsArray+=( + # The addurl test cases require security(1) to be in PATH which we can't + # provide from nixpkgs to my (@sternenseemann) knowledge. + "-p" "!/addurl/" + ) + ''; + }) super.git-annex; + # Prevents needing to add `security_tool` as a run-time dependency for # everything using x509-system to give access to the `security` executable. # @@ -305,6 +316,13 @@ self: super: ({ # Tests fail on macOS https://github.com/mrkkrp/zip/issues/112 zip = dontCheck super.zip; + + # cabal lib set as unbuildable in linux so callCabal2nix generates a dummy derivation + jsaddle-wkwebview = overrideCabal (drv: { + libraryFrameworkDepends = with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ Cocoa WebKit ]; + libraryHaskellDepends = with self; [ aeson data-default jsaddle ]; + }) super.jsaddle-wkwebview; + } // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin # https://github.com/fpco/unliftio/issues/87 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 3e79076898..961d4caffb 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -82,9 +82,6 @@ self: super: { base-noprelude = doJailbreak super.base-noprelude; unliftio-core = doJailbreak super.unliftio-core; - # Jailbreaking because monoidal-containers hasn’t bumped it's base dependency for 8.10. - monoidal-containers = doJailbreak super.monoidal-containers; - # Jailbreak to fix the build. brick = doJailbreak super.brick; exact-pi = doJailbreak super.exact-pi; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 35a886c1d6..14084bcf03 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -180,6 +180,16 @@ self: super: { sha256 = "sha256-b7u9GiIAd2xpOrM0MfILHNb6Nt7070lNRIadn2l3DfQ="; })]; }) super.ConfigFile; + + # This runs into the following GHC bug currently affecting 9.6.* and 9.8.* as + # well as 9.10.1: https://gitlab.haskell.org/ghc/ghc/-/issues/24432 + inherit (lib.mapAttrs (_: overrideCabal (drv: { + badPlatforms = drv.badPlatforms or [ ] ++ [ "aarch64-linux" ]; + })) super) + mueval + lambdabot + lambdabot-haskell-plugins + ; } # super.ghc is required to break infinite recursion as Nix is strict in the attrNames // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isAarch64 && lib.versionOlder super.ghc.version "9.6.4") { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index cf197f9fb3..a065117aaa 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -55,7 +55,7 @@ self: super: { th-abstraction = doDistribute self.th-abstraction_0_7_0_0; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_2_20240223; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; - ghc-lib = doDistribute self.ghc-lib_9_8_1_20231121; + ghc-lib = doDistribute self.ghc-lib_9_8_2_20240223; megaparsec = doDistribute self.megaparsec_9_6_1; # TODO: remove when aeson updates or launches a revision # see https://github.com/haskell/aeson/issues/1089 and https://github.com/haskell/aeson/pulls/1088 @@ -88,10 +88,14 @@ self: super: { # blaze-svg = doJailbreak super.blaze-svg; # base <4.19 commutative-semigroups = doJailbreak super.commutative-semigroups; # base < 4.19 + dependent-sum-template = doJailbreak super.dependent-sum-template_0_2_0_1; # template-haskell < 2.21 diagrams-lib = doJailbreak super.diagrams-lib; # base <4.19, text <2.1 diagrams-postscript = doJailbreak super.diagrams-postscript; # base <4.19, bytestring <0.12 diagrams-svg = doJailbreak super.diagrams-svg; # base <4.19, text <2.1 + generics-sop = doJailbreak super.generics-sop_0_5_1_4; # th-abstraction >=0.6 && <0.7 ghc-trace-events = doJailbreak super.ghc-trace-events; # text < 2.1, bytestring < 0.12, base < 4.19 + hashing = doJailbreak super.hashing; # bytestring <0.12 + json-sop = doJailbreak super.json-sop; # aeson <2.2, base <4.19, text <2.1 primitive-unlifted = doJailbreak super.primitive-unlifted; # bytestring < 0.12 statestack = doJailbreak super.statestack; # base < 4.19 newtype-generics = doJailbreak super.newtype-generics; # base < 4.19 @@ -102,10 +106,12 @@ self: super: { terminfo_0_4_1_6 = doJailbreak super.terminfo_0_4_1_6; HaskellNet-SSL = doJailbreak super.HaskellNet-SSL; # bytestring >=0.9 && <0.12 raven-haskell = doJailbreak super.raven-haskell; # aeson <2.2 + saltine = doJailbreak super.saltine; # bytestring && <0.12, deepseq <1.5, text > 1.2 && <1.3 || >=2.0 && <2.1 stripe-concepts = doJailbreak super.stripe-concepts; # text >=1.2.5 && <1.3 || >=2.0 && <2.1 stripe-signature = doJailbreak super.stripe-signature; # text >=1.2.5 && <1.3 || >=2.0 && <2.1 string-random = doJailbreak super.string-random; # text >=1.2.2.1 && <2.1 inflections = doJailbreak super.inflections; # text >=0.2 && <2.1 + universe-some = doJailbreak super.universe-some; # th-abstraction < 0.7 # # Test suite issues @@ -131,4 +137,14 @@ self: super: { }) super.libmpd; + # Loosen bounds + patch = appendPatch (pkgs.fetchpatch { + url = "https://github.com/reflex-frp/patch/commit/91fed138483a7bf2b098d45b9e5cc36191776320.patch"; + sha256 = "sha256-/KLfIshia88lU5G/hA7ild7+a2mqc7qgSa9AEBqEqkQ="; + }) super.patch; + reflex = appendPatch (pkgs.fetchpatch { + url = "https://github.com/reflex-frp/reflex/commit/0ac53ca3eab2649dd3f3edc585e10af8d13b28cd.patch"; + sha256 = "sha256-umjwgdSKebJdRrXjwHhsi8HBqotx1vFibY9ttLkyT/0="; + }) super.reflex; + } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix index d98107957e..f90f3094ab 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -26,7 +26,7 @@ self: super: # GHCJS does not ship with the same core packages as GHC. # https://github.com/ghcjs/ghcjs/issues/676 - stm = doJailbreak self.stm_2_5_3_0; + stm = doJailbreak self.stm_2_5_3_1; exceptions = dontCheck self.exceptions_0_10_7; ## OTHER PACKAGES diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7885fa5f21..aaa45de71e 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -38,6 +38,7 @@ broken-packages: - acme-memorandom # failure in job https://hydra.nixos.org/build/233222926 at 2023-09-02 - acme-miscorder # failure in job https://hydra.nixos.org/build/233209957 at 2023-09-02 - acme-mutable-package # failure in job https://hydra.nixos.org/build/233213349 at 2023-09-02 + - acme-not-a-joke # failure in job https://hydra.nixos.org/build/259604911 at 2024-05-15 - acme-now # failure in job https://hydra.nixos.org/build/233243289 at 2023-09-02 - acme-numbersystem # failure in job https://hydra.nixos.org/build/233208106 at 2023-09-02 - acme-operators # failure in job https://hydra.nixos.org/build/233248282 at 2023-09-02 @@ -83,7 +84,6 @@ broken-packages: - aeson-flat # failure in job https://hydra.nixos.org/build/233220787 at 2023-09-02 - aeson-flatten # failure in job https://hydra.nixos.org/build/233242954 at 2023-09-02 - aeson-flowtyped # failure in job https://hydra.nixos.org/build/233245878 at 2023-09-02 - - aeson-gadt-th # failure in job https://hydra.nixos.org/build/233247060 at 2023-09-02 - aeson-generics-typescript # failure in job https://hydra.nixos.org/build/245703304 at 2024-01-07 - aeson-injector # failure in job https://hydra.nixos.org/build/233200351 at 2023-09-02 - aeson-json-ast # failure in job https://hydra.nixos.org/build/233249406 at 2023-09-02 @@ -369,7 +369,6 @@ broken-packages: - bash # failure in job https://hydra.nixos.org/build/252719390 at 2024-03-16 - basic-gps # failure in job https://hydra.nixos.org/build/252718385 at 2024-03-16 - basics # failure in job https://hydra.nixos.org/build/236678238 at 2023-10-04 - - basic-sop # failure in job https://hydra.nixos.org/build/233253357 at 2023-09-02 - baskell # failure in job https://hydra.nixos.org/build/233246705 at 2023-09-02 - battlenet # failure in job https://hydra.nixos.org/build/233260076 at 2023-09-02 - battleplace # failure in job https://hydra.nixos.org/build/233230199 at 2023-09-02 @@ -381,7 +380,6 @@ broken-packages: - bdo # failure in job https://hydra.nixos.org/build/233216486 at 2023-09-02 - beamable # failure in job https://hydra.nixos.org/build/233211619 at 2023-09-02 - beam # failure in job https://hydra.nixos.org/build/233213313 at 2023-09-02 - - beam-migrate # failure in job https://hydra.nixos.org/build/252730758 at 2024-03-16 - beam-mysql # failure in job https://hydra.nixos.org/build/233253237 at 2023-09-02 - beam-newtype-field # failure in job https://hydra.nixos.org/build/233206317 at 2023-09-02 - bech32 # failure in job https://hydra.nixos.org/build/233194823 at 2023-09-02 @@ -605,6 +603,7 @@ broken-packages: - cabal2json # failure in job https://hydra.nixos.org/build/233196099 at 2023-09-02 - cabal-audit # failure in job https://hydra.nixos.org/build/233193414 at 2023-09-02 - cabal-auto-expose # failure in job https://hydra.nixos.org/build/233195440 at 2023-09-02 + - cabal-build-programs # failure in job https://hydra.nixos.org/build/257091363 at 2024-04-27 - cabal-bundle-clib # failure in job https://hydra.nixos.org/build/233199225 at 2023-09-02 - cabal-constraints # failure in job https://hydra.nixos.org/build/233214316 at 2023-09-02 - cabal-db # failure in job https://hydra.nixos.org/build/233197235 at 2023-09-02 @@ -706,7 +705,6 @@ broken-packages: - cayene-lpp # failure in job https://hydra.nixos.org/build/233228959 at 2023-09-02 - cayley-client # failure in job https://hydra.nixos.org/build/233260112 at 2023-09-02 - cblrepo # failure in job https://hydra.nixos.org/build/233251926 at 2023-09-02 - - cbor-tool # failure in job https://hydra.nixos.org/build/233198797 at 2023-09-02 - CCA # failure in job https://hydra.nixos.org/build/233206723 at 2023-09-02 - ccast # failure in job https://hydra.nixos.org/build/233254517 at 2023-09-02 - CC-delcont-cxe # failure in job https://hydra.nixos.org/build/233190865 at 2023-09-02 @@ -738,6 +736,8 @@ broken-packages: - changelog-d # failure in job https://hydra.nixos.org/build/252716175 at 2024-03-16 - changelog-d # failure in job https://hydra.nixos.org/build/253689337 at 2024-03-31 - changelog-d # failure in job https://hydra.nixos.org/build/255671571 at 2024-04-16 + - changelog-d # failure in job https://hydra.nixos.org/build/257082502 at 2024-04-27 + - changelog-d # failure in job https://hydra.nixos.org/build/259607598 at 2024-05-15 - changelogged # failure in job https://hydra.nixos.org/build/233211675 at 2023-09-02 - character-cases # failure in job https://hydra.nixos.org/build/233197636 at 2023-09-02 - charter # failure in job https://hydra.nixos.org/build/233237264 at 2023-09-02 @@ -803,7 +803,6 @@ broken-packages: - clevercss # failure in job https://hydra.nixos.org/build/233206298 at 2023-09-02 - clexer # failure in job https://hydra.nixos.org/build/233229804 at 2023-09-02 - cli-builder # failure in job https://hydra.nixos.org/build/233209961 at 2023-09-02 - - cli-extras # failure in job https://hydra.nixos.org/build/233226908 at 2023-09-02 - CLI # failure in job https://hydra.nixos.org/build/233191087 at 2023-09-02 - clif # failure in job https://hydra.nixos.org/build/233197110 at 2023-09-02 - clifm # failure in job https://hydra.nixos.org/build/233227426 at 2023-09-02 @@ -1004,6 +1003,7 @@ broken-packages: - core-haskell # failure in job https://hydra.nixos.org/build/233222588 at 2023-09-02 - corenlp-types # failure in job https://hydra.nixos.org/build/243808366 at 2024-01-01 - core-warn # failure in job https://hydra.nixos.org/build/233204404 at 2023-09-02 + - cornelis # failure in job https://hydra.nixos.org/build/259604220 at 2024-05-15 - Coroutine # failure in job https://hydra.nixos.org/build/233211213 at 2023-09-02 - coroutine-object # failure in job https://hydra.nixos.org/build/233220413 at 2023-09-02 - couchdb-conduit # failure in job https://hydra.nixos.org/build/233227244 at 2023-09-02 @@ -1231,7 +1231,6 @@ broken-packages: - dense-int-set # failure in job https://hydra.nixos.org/build/233214797 at 2023-09-02 - dependency # failure in job https://hydra.nixos.org/build/252727325 at 2024-03-16 - dependent-hashmap # failure in job https://hydra.nixos.org/build/233202881 at 2023-09-02 - - dependent-monoidal-map # failure in job https://hydra.nixos.org/build/233212829 at 2023-09-02 - dep-t # failure in job https://hydra.nixos.org/build/233217847 at 2023-09-02 - deptrack-core # failure in job https://hydra.nixos.org/build/233239143 at 2023-09-02 - derangement # failure in job https://hydra.nixos.org/build/233209660 at 2023-09-02 @@ -1303,6 +1302,7 @@ broken-packages: - dijkstra-simple # failure in job https://hydra.nixos.org/build/233218373 at 2023-09-02 - DimensionalHash # failure in job https://hydra.nixos.org/build/233230945 at 2023-09-02 - dino # failure in job https://hydra.nixos.org/build/252725815 at 2024-03-16 + - diohsc # failure in job https://hydra.nixos.org/build/259625302 at 2024-05-15 - diophantine # failure in job https://hydra.nixos.org/build/233229215 at 2023-09-02 - diplomacy # failure in job https://hydra.nixos.org/build/233207895 at 2023-09-02 - direct-binary-files # failure in job https://hydra.nixos.org/build/233246387 at 2023-09-02 @@ -1546,6 +1546,7 @@ broken-packages: - erlang # failure in job https://hydra.nixos.org/build/233195837 at 2023-09-02 - erlang-ffi # failure in job https://hydra.nixos.org/build/233233314 at 2023-09-02 - eros # failure in job https://hydra.nixos.org/build/233247983 at 2023-09-02 + - errata # failure in job https://hydra.nixos.org/build/259627186 at 2024-05-15 - errno # failure in job https://hydra.nixos.org/build/252725782 at 2024-03-16 - error-context # failure in job https://hydra.nixos.org/build/233245027 at 2023-09-02 - error-continuations # failure in job https://hydra.nixos.org/build/233232357 at 2023-09-02 @@ -1898,7 +1899,6 @@ broken-packages: - gang-of-threads # failure in job https://hydra.nixos.org/build/252716251 at 2024-03-16 - Ganymede # failure in job https://hydra.nixos.org/build/233248892 at 2023-09-02 - garepinoh # failure in job https://hydra.nixos.org/build/233238111 at 2023-09-02 - - gargoyle # failure in job https://hydra.nixos.org/build/233196445 at 2023-09-02 - gas # failure in job https://hydra.nixos.org/build/233233966 at 2023-09-02 - gasp # failure in job https://hydra.nixos.org/build/252731457 at 2024-03-16 - gather # failure in job https://hydra.nixos.org/build/233208848 at 2023-09-02 @@ -2408,7 +2408,6 @@ broken-packages: - hat # failure in job https://hydra.nixos.org/build/233243655 at 2023-09-02 - hats # failure in job https://hydra.nixos.org/build/233256724 at 2023-09-02 - hatt # failure in job https://hydra.nixos.org/build/233195039 at 2023-09-02 - - haveibeenpwned # failure in job https://hydra.nixos.org/build/233253058 at 2023-09-02 - haven # failure in job https://hydra.nixos.org/build/233216806 at 2023-09-02 - haverer # failure in job https://hydra.nixos.org/build/233210491 at 2023-09-02 - hax # failure in job https://hydra.nixos.org/build/233212147 at 2023-09-02 @@ -3206,9 +3205,6 @@ broken-packages: - jort # failure in job https://hydra.nixos.org/build/233195250 at 2023-09-02 - joy-rewrite # failure in job https://hydra.nixos.org/build/233201002 at 2023-09-02 - jpeg # failure in job https://hydra.nixos.org/build/233204056 at 2023-09-02 - - jsaddle-clib # failure in job https://hydra.nixos.org/build/233203899 at 2023-09-02 - - jsaddle-warp # failure in job https://hydra.nixos.org/build/233252373 at 2023-09-02 - - jsaddle-wkwebview # failure in job https://hydra.nixos.org/build/233242986 at 2023-09-02 - js-good-parts # failure in job https://hydra.nixos.org/build/233198958 at 2023-09-02 - json2 # failure in job https://hydra.nixos.org/build/233242447 at 2023-09-02 - json-alt # failure in job https://hydra.nixos.org/build/233242230 at 2023-09-02 @@ -3391,7 +3387,7 @@ broken-packages: - language-webidl # failure in job https://hydra.nixos.org/build/233194656 at 2023-09-02 - laop # failure in job https://hydra.nixos.org/build/233204106 at 2023-09-02 - LargeCardinalHierarchy # failure in job https://hydra.nixos.org/build/233250339 at 2023-09-02 - - large-generics # failure in job https://hydra.nixos.org/build/233210324 at 2023-09-02 + - large-records - Lastik # failure in job https://hydra.nixos.org/build/233194460 at 2023-09-02 - latest-npm-version # failure in job https://hydra.nixos.org/build/233239108 at 2023-09-02 - latex-formulae-image # failure in job https://hydra.nixos.org/build/233251243 at 2023-09-02 @@ -3434,7 +3430,6 @@ broken-packages: - lens-process # failure in job https://hydra.nixos.org/build/233242948 at 2023-09-02 - lensref # failure in job https://hydra.nixos.org/build/233205479 at 2023-09-02 - lens-simple # failure in job https://hydra.nixos.org/build/233245452 at 2023-09-02 - - lens-sop # failure in job https://hydra.nixos.org/build/252721754 at 2024-03-16 - lens-tell # failure in job https://hydra.nixos.org/build/233234619 at 2023-09-02 - lens-text-encoding # failure in job https://hydra.nixos.org/build/233222713 at 2023-09-02 - lens-th-rewrite # failure in job https://hydra.nixos.org/build/233201025 at 2023-09-02 @@ -4197,6 +4192,7 @@ broken-packages: - op2 # failure in job https://hydra.nixos.org/build/255683846 at 2024-04-16 - opaleye-classy # failure in job https://hydra.nixos.org/build/233214120 at 2023-09-02 - opaleye-sqlite # failure in job https://hydra.nixos.org/build/233191474 at 2023-09-02 + - opaleye-textsearch # failure in job https://hydra.nixos.org/build/259602432 at 2024-05-15 - opaleye-trans # failure in job https://hydra.nixos.org/build/233210536 at 2023-09-02 - open-adt # failure in job https://hydra.nixos.org/build/233201191 at 2023-09-02 - OpenAFP # failure in job https://hydra.nixos.org/build/233249295 at 2023-09-02 @@ -4736,6 +4732,7 @@ broken-packages: - process-sequential # failure in job https://hydra.nixos.org/build/233221064 at 2023-09-02 - procrastinating-variable # failure in job https://hydra.nixos.org/build/233229350 at 2023-09-02 - procstat # failure in job https://hydra.nixos.org/build/233256320 at 2023-09-02 + - prodapi # failure in job https://hydra.nixos.org/build/259624456 at 2024-05-15 - product-isomorphic # failure in job https://hydra.nixos.org/build/233230736 at 2023-09-02 - prof2pretty # failure in job https://hydra.nixos.org/build/233240665 at 2023-09-02 - prof-flamegraph # failure in job https://hydra.nixos.org/build/233254675 at 2023-09-02 @@ -4765,11 +4762,9 @@ broken-packages: - pro-source # failure in job https://hydra.nixos.org/build/233226793 at 2023-09-02 - prosper # failure in job https://hydra.nixos.org/build/233244079 at 2023-09-02 - proteaaudio # failure in job https://hydra.nixos.org/build/233225498 at 2023-09-02 - - proto3-wire # failure in job https://hydra.nixos.org/build/233208217 at 2023-09-02 - protocol-buffers # failure in job https://hydra.nixos.org/build/233220653 at 2023-09-02 - protocol-buffers-fork # failure in job https://hydra.nixos.org/build/233228361 at 2023-09-02 - protocol # failure in job https://hydra.nixos.org/build/233224436 at 2023-09-02 - - proto-lens-arbitrary # failure in job https://hydra.nixos.org/build/233239393 at 2023-09-02 - proto-lens-combinators # failure in job https://hydra.nixos.org/build/252726979 at 2024-03-16 - protolude-lifted # failure in job https://hydra.nixos.org/build/233196312 at 2023-09-02 - proton-haskell # failure in job https://hydra.nixos.org/build/233214383 at 2023-09-02 @@ -4910,6 +4905,7 @@ broken-packages: - rclient # failure in job https://hydra.nixos.org/build/233239290 at 2023-09-02 - rdf4h # failure in job https://hydra.nixos.org/build/233234057 at 2023-09-02 - rds-data-codecs # failure in job https://hydra.nixos.org/build/253696582 at 2024-03-31 + - react # failure in job https://hydra.nixos.org/build/257372364 at 2024-04-27 - react-flux # failure in job https://hydra.nixos.org/build/233246819 at 2023-09-02 - react-haskell # failure in job https://hydra.nixos.org/build/233242976 at 2023-09-02 - reaction-logic # failure in job https://hydra.nixos.org/build/233216789 at 2023-09-02 @@ -4935,7 +4931,6 @@ broken-packages: - record-encode # failure in job https://hydra.nixos.org/build/233216156 at 2023-09-02 - record # failure in job https://hydra.nixos.org/build/233242406 at 2023-09-02 - records # failure in job https://hydra.nixos.org/build/233254822 at 2023-09-02 - - records-sop # failure in job https://hydra.nixos.org/build/233251652 at 2023-09-02 - record-wrangler # failure in job https://hydra.nixos.org/build/233212838 at 2023-09-02 - rec-smallarray # failure in job https://hydra.nixos.org/build/233258592 at 2023-09-02 - recursive-line-count # failure in job https://hydra.nixos.org/build/252736942 at 2024-03-16 @@ -5389,6 +5384,7 @@ broken-packages: - show-type # failure in job https://hydra.nixos.org/build/233225756 at 2023-09-02 - Shpadoinkle-console # failure in job https://hydra.nixos.org/build/233228559 at 2023-09-02 - Shpadoinkle-debug # failure in job https://hydra.nixos.org/build/233194479 at 2023-09-02 + - Shpadoinkle # failure in job https://hydra.nixos.org/build/257372361 at 2024-04-27 - Shpadoinkle-isreal # failure in job https://hydra.nixos.org/build/233200051 at 2023-09-02 - shwifty # failure in job https://hydra.nixos.org/build/233249022 at 2023-09-02 - sifflet # failure in job https://hydra.nixos.org/build/233210515 at 2023-09-02 @@ -5681,6 +5677,7 @@ broken-packages: - stm-firehose # failure in job https://hydra.nixos.org/build/233220943 at 2023-09-02 - stm-lifted # failure in job https://hydra.nixos.org/build/252726872 at 2024-03-16 - stm-promise # failure in job https://hydra.nixos.org/build/233204293 at 2023-09-02 + - stm-queue # failure in job https://hydra.nixos.org/build/259624889 at 2024-05-15 - stm-stats # failure in job https://hydra.nixos.org/build/233214914 at 2023-09-02 - stochastic # failure in job https://hydra.nixos.org/build/233242019 at 2023-09-02 - Stomp # failure in job https://hydra.nixos.org/build/233252583 at 2023-09-02 @@ -5791,7 +5788,6 @@ broken-packages: - SVD2HS # failure in job https://hydra.nixos.org/build/233248575 at 2023-09-02 - svfactor # failure in job https://hydra.nixos.org/build/233256743 at 2023-09-02 - svg-builder-fork # failure in job https://hydra.nixos.org/build/233224461 at 2023-09-02 - - svgsym # failure in job https://hydra.nixos.org/build/233255287 at 2023-09-02 - svgutils # failure in job https://hydra.nixos.org/build/233193438 at 2023-09-02 - svm-light-utils # failure in job https://hydra.nixos.org/build/233219138 at 2023-09-02 - svm-simple # failure in job https://hydra.nixos.org/build/233235871 at 2023-09-02 @@ -6288,7 +6284,6 @@ broken-packages: - universal-binary # failure in job https://hydra.nixos.org/build/233240583 at 2023-09-02 - universe-instances-base # failure in job https://hydra.nixos.org/build/233197845 at 2023-09-02 - universe-instances-trans # failure in job https://hydra.nixos.org/build/233235623 at 2023-09-02 - - universe-some # failure in job https://hydra.nixos.org/build/233254356 at 2023-09-02 - unix-handle # failure in job https://hydra.nixos.org/build/233233273 at 2023-09-02 - unix-memory # failure in job https://hydra.nixos.org/build/252735802 at 2024-03-16 - unix-process-conduit # failure in job https://hydra.nixos.org/build/233191509 at 2023-09-02 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 4799e9c3bc..2294abaea1 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -28,16 +28,17 @@ default-package-overrides: - gi-gdkx11 < 4 # 2021-11-09: ghc-bignum is bundled starting with 9.0.1; only 1.0 builds with GHCs prior to 9.2.1 - ghc-bignum == 1.0 - # Needs to be pinned to match jsaddle from Stackage LTS (9.8.*) - - jsaddle-dom < 0.9.9.0 - - jsaddle-webkit2gtk < 0.9.9.0 + - hie-bios == 0.13.1 + # 2024-05-10: need to match hlegder from stackage + - hledger-ui < 1.33 extra-packages: - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 - Cabal == 3.6.* # used for packages needing newer Cabal on ghc 8.10 and 9.0 - Cabal-syntax == 3.8.* # version required for ormolu and fourmolu on ghc 9.2 and 9.0 - - Cabal-syntax == 3.10.* # newest version required for cabal-install and other packages + - Cabal-syntax == 3.10.* # version required for cabal-install and other packages + - Cabal == 3.10.* # version required for cabal-install and other packages - directory == 1.3.7.* # required to build cabal-install 3.10.* with GHC 9.2 - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - aeson < 2 # required by pantry-0.5.2 @@ -46,7 +47,6 @@ extra-packages: - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now - base16-bytestring < 1 # required for cabal-install etc. - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 - - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9 - brick == 0.70.* # 2022-08-13: needed by taskell - brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8 - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses @@ -69,6 +69,7 @@ extra-packages: - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy == 1.19.12 # for ghcjs - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 + - ansi-wl-pprint >= 0.6 && < 0.7 # 2024-03-23: required for ghcjs - hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8 - hlint == 3.4.1 # 2022-09-21: needed for hls with ghc-lib-parser 9.2 - hnix-store-core < 0.7 # 2023-12-11: required by hnix-store-remote 0.6 @@ -112,6 +113,8 @@ extra-packages: - algebraic-graphs < 0.7 # 2023-08-14: Needed for building weeder < 2.6.0 - fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10 - ShellCheck == 0.9.0 # 2024-03-21: pinned by haskell-ci + - versions < 6 # 2024-04-22: required by spago-0.21 + - fsnotify < 0.4 # 2024-04-22: required by spago-0.21 package-maintainers: abbradar: @@ -252,22 +255,22 @@ package-maintainers: libjared: - sensei maralorn: + - bluefin - cabal-fmt - - clay - eventlog2html + - falsify - generic-optics - ghc-debug-brick - ghc-debug-stub - ghcid - graphql-client - haskell-language-server - - hedgehog - hledger - hledger-ui - hledger-web - hlint - - hmatrix - hspec-discover + - jsaddle-warp - matrix-client - optics - pandoc @@ -276,9 +279,9 @@ package-maintainers: - postgresql-simple - purebred-email - reflex-dom - - releaser - replace-megaparsec - req + - say - shake-bench - shh - shh-extras @@ -286,7 +289,9 @@ package-maintainers: - stm-containers - streamly - streamly-bytestring + - string-interpolate - taskwarrior + - tasty - threadscope - tz - weeder @@ -733,6 +738,7 @@ supported-platforms: htune: [ platforms.linux ] # depends on alsa-pcm hw-prim-bits: [ platforms.x86 ] # x86 assembler inline-asm: [ platforms.x86 ] # x86 assembler + jsaddle-wkwebview: [ platforms.darwin ] keid-core: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) keid-frp-banana: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) keid-geometry: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 17ce50df0f..739ad0797b 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 22.16 +# Stackage LTS 22.18 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -394,7 +394,7 @@ default-package-overrides: - atom-basic ==0.2.5 - atom-conduit ==0.9.0.1 - atomic-counter ==0.1.2.1 - - atomic-primops ==0.8.5 + - atomic-primops ==0.8.7 - atomic-write ==0.2.0.7 - attoparsec ==0.14.4 - attoparsec-aeson ==2.1.0.0 @@ -564,7 +564,7 @@ default-package-overrides: - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.12 - bytestring-trie ==0.2.7.2 - - bz2 ==1.0.1.1 + - bz2 ==1.0.1.2 - bzip2-clib ==1.0.8 - bzlib ==0.5.2.0 - bzlib-conduit ==0.3.0.3 @@ -661,7 +661,7 @@ default-package-overrides: - code-page ==0.2.1 - coinor-clp ==0.0.0.2 - cointracking-imports ==0.1.0.2 - - collect-errors ==0.1.5.0 + - collect-errors ==0.1.6.0 - co-log ==0.6.1.0 - co-log-concurrent ==0.5.1.0 - co-log-core ==0.3.2.1 @@ -929,7 +929,7 @@ default-package-overrides: - doctest-exitcode-stdio ==0.0 - doctest-extract ==0.1.2 - doctest-lib ==0.1.1 - - doctest-parallel ==0.3.1 + - doctest-parallel ==0.3.1.1 - doldol ==0.4.1.2 - do-list ==1.0.1 - domain ==0.1.1.5 @@ -1050,7 +1050,7 @@ default-package-overrides: - fakedata-quickcheck ==0.2.0 - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 - - faktory ==1.1.2.6 + - faktory ==1.1.2.7 - fasta ==0.10.4.2 - fast-digits ==0.3.2.0 - fast-logger ==3.2.2 @@ -1345,13 +1345,13 @@ default-package-overrides: - haskoin-node ==1.0.1 - haskoin-store-data ==1.2.5 - hasktags ==0.73.0 - - hasql ==1.6.4.3 + - hasql ==1.6.4.4 - hasql-dynamic-statements ==0.3.1.5 - hasql-implicits ==0.1.1.2 - hasql-interpolate ==0.2.1.0 - hasql-listen-notify ==0.1.0.1 - hasql-migration ==0.3.0 - - hasql-notifications ==0.2.1.0 + - hasql-notifications ==0.2.1.1 - hasql-optparse-applicative ==0.7.1.3 - hasql-pool ==0.10.1 - hasql-th ==0.4.0.19 @@ -1457,7 +1457,7 @@ default-package-overrides: - hsini ==0.5.2.2 - hsinstall ==2.8 - HSlippyMap ==3.0.1 - - hslogger ==1.3.1.0 + - hslogger ==1.3.1.1 - hslua ==2.3.1 - hslua-aeson ==2.3.1 - hslua-classes ==2.3.1 @@ -1490,7 +1490,7 @@ default-package-overrides: - hspec-expectations-json ==1.0.2.1 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.6 - - hspec-golden ==0.2.1.0 + - hspec-golden ==0.2.2.0 - hspec-golden-aeson ==0.9.0.0 - hspec-hedgehog ==0.1.1.0 - hspec-junit-formatter ==1.1.0.2 @@ -1667,7 +1667,7 @@ default-package-overrides: - jose ==0.11 - jose-jwt ==0.9.6 - journalctl-stream ==0.6.0.6 - - jsaddle ==0.9.8.3 + - jsaddle ==0.9.9.0 - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1881,10 +1881,10 @@ default-package-overrides: - microlens ==0.4.13.1 - microlens-aeson ==2.5.2 - microlens-contra ==0.1.0.3 - - microlens-ghc ==0.4.14.2 + - microlens-ghc ==0.4.14.3 - microlens-mtl ==0.2.0.3 - microlens-platform ==0.4.3.5 - - microlens-th ==0.4.3.14 + - microlens-th ==0.4.3.15 - microspec ==0.2.1.3 - microstache ==1.0.2.3 - midair ==0.2.0.1 @@ -1953,7 +1953,7 @@ default-package-overrides: - monoidal-containers ==0.6.4.0 - monoidal-functors ==0.2.3.0 - monoid-extras ==0.6.2 - - monoid-subclasses ==1.2.4.1 + - monoid-subclasses ==1.2.5 - monoid-transformer ==0.0.4 - monomer ==1.6.0.1 - mono-traversable ==1.0.17.0 @@ -2031,7 +2031,7 @@ default-package-overrides: - network-messagepack-rpc ==0.1.2.0 - network-messagepack-rpc-websocket ==0.1.1.1 - network-multicast ==0.3.2 - - network-run ==0.2.7 + - network-run ==0.2.8 - network-simple ==0.4.5 - network-transport ==0.5.7 - network-uri ==2.6.4.2 @@ -2089,7 +2089,7 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - oops ==0.2.0.1 - - opaleye ==0.10.2.3 + - opaleye ==0.10.3.0 - OpenAL ==1.7.0.5 - openapi3 ==3.2.4 - open-browser ==0.2.1.0 @@ -2318,12 +2318,12 @@ default-package-overrides: - protobuf-simple ==0.1.1.1 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 - - proto-lens ==0.7.1.4 - - proto-lens-arbitrary ==0.1.2.12 - - proto-lens-optparse ==0.1.1.11 - - proto-lens-runtime ==0.7.0.5 + - proto-lens ==0.7.1.5 + - proto-lens-arbitrary ==0.1.2.13 + - proto-lens-optparse ==0.1.1.12 + - proto-lens-runtime ==0.7.0.6 - protolude ==0.3.4 - - proxied ==0.3.1 + - proxied ==0.3.2 - psql-helpers ==0.1.0.0 - PSQueue ==1.2.0 - psqueues ==0.2.8.0 @@ -2354,7 +2354,7 @@ default-package-overrides: - quickcheck-higherorder ==0.1.0.1 - quickcheck-instances ==0.3.30 - quickcheck-io ==0.2.0 - - quickcheck-monoid-subclasses ==0.3.0.1 + - quickcheck-monoid-subclasses ==0.3.0.2 - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 - quickcheck-state-machine ==0.8.0 @@ -2539,7 +2539,7 @@ default-package-overrides: - secp256k1-haskell ==1.1.0 - securemem ==0.1.10 - selections ==0.3.0.0 - - selective ==0.7 + - selective ==0.7.0.1 - semialign ==1.3 - semigroupoids ==6.0.0.1 - semigroups ==0.20 @@ -2804,7 +2804,7 @@ default-package-overrides: - symengine ==0.1.2.0 - symmetry-operations-symbols ==0.0.2.1 - synthesizer-alsa ==0.5.0.6 - - synthesizer-core ==0.8.3 + - synthesizer-core ==0.8.4 - synthesizer-dimensional ==0.8.1.1 - synthesizer-midi ==0.6.1.2 - sysinfo ==0.1.1 @@ -2904,8 +2904,8 @@ default-package-overrides: - text-regex-replace ==0.1.1.5 - text-rope ==0.2 - text-short ==0.1.5 - - text-show ==3.10.4 - - text-show-instances ==3.9.7 + - text-show ==3.10.5 + - text-show-instances ==3.9.8 - text-zipper ==0.13 - tfp ==1.0.2 - tf-random ==0.5 @@ -2921,7 +2921,7 @@ default-package-overrides: - these-optics ==1.0.1.2 - these-skinny ==0.7.5 - th-expand-syns ==0.4.11.0 - - th-extras ==0.0.0.7 + - th-extras ==0.0.0.8 - th-lego ==0.3.0.3 - th-lift ==0.8.4 - th-lift-instances ==0.1.20 @@ -3179,7 +3179,7 @@ default-package-overrides: - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - warp ==3.3.31 - - warp-tls ==3.4.4 + - warp-tls ==3.4.5 - wave ==0.2.1 - wcwidth ==0.0.2 - webdriver ==0.12.0.0 @@ -3218,7 +3218,7 @@ default-package-overrides: - writer-cps-transformers ==0.5.6.1 - ws ==0.0.6 - wss-client ==0.3.0.0 - - wuss ==2.0.1.7 + - wuss ==2.0.1.8 - X11 ==1.10.3 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 @@ -3253,11 +3253,11 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.19 - - Yampa ==0.14.7 + - Yampa ==0.14.8 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 - - yesod-auth ==1.6.11.2 + - yesod-auth ==1.6.11.3 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.2.0 @@ -3292,8 +3292,8 @@ default-package-overrides: - zeromq4-patterns ==0.3.1.0 - zigzag ==0.0.1.0 - zim-parser ==0.2.1.0 - - zip ==2.0.0 - - zip-archive ==0.4.3.1 + - zip ==2.0.1 + - zip-archive ==0.4.3.2 - zippers ==0.3.2 - zip-stream ==0.2.2.0 - zlib ==0.6.3.0 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index dcaa495f6b..7b358dd113 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -357,7 +357,6 @@ dont-distribute-packages: - Shellac-haskeline - Shellac-readline - ShortestPathProblems - - Shpadoinkle - Shpadoinkle-backend-pardiff - Shpadoinkle-backend-snabbdom - Shpadoinkle-backend-static @@ -634,12 +633,11 @@ dont-distribute-packages: - bdcs-api - beam-automigrate - beam-postgres - - beam-sqlite - beam-th - bearriver - beautifHOL - bech32-th - - beeminder-api + - bech32-th_1_1_6 - bein - belka - bff @@ -876,8 +874,6 @@ dont-distribute-packages: - cleff-plugin - cless - cleveland - - cli-git - - cli-nix - click-clack - clickhouse-haskell - clifford @@ -1477,7 +1473,6 @@ dont-distribute-packages: - funion - funnyprint - funsat - - fused-effects-squeal - fwgl-glfw - fwgl-javascript - fxpak @@ -1488,9 +1483,6 @@ dont-distribute-packages: - galois-fft - galois-field - gamma - - gargoyle-postgresql - - gargoyle-postgresql-connect - - gargoyle-postgresql-nix - gbs-downloader - gbu - gdax @@ -1528,7 +1520,6 @@ dont-distribute-packages: - ghc-plugs-out - ghc-session - ghci-pretty - - ghcjs-dom-hello - ghcjs-dom-webkit - ghcjs-hplay - ghcup @@ -1834,6 +1825,7 @@ dont-distribute-packages: - gtkrsync - guarded-rewriting - guess-combinator + - h3spec - hArduino - hOff-display - hPDB @@ -1919,7 +1911,6 @@ dont-distribute-packages: - haskanoid - haskdeep - haskeem - - haskell-abci - haskell-admin - haskell-admin-health - haskell-admin-managed-functions @@ -2419,7 +2410,6 @@ dont-distribute-packages: - jordan-servant-openapi - jordan-servant-server - jot - - jsaddle-hello - jsc - jsmw - json-ast-json-encoder @@ -2432,7 +2422,6 @@ dont-distribute-packages: - json-query - json-rpc-client - json-schema - - json-sop - json-spec-elm - json-spec-elm-servant - json-spec-openapi @@ -2541,7 +2530,6 @@ dont-distribute-packages: - language-qux - language-spelling - large-anon - - large-records - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -2663,6 +2651,7 @@ dont-distribute-packages: - lol-typing - loli - longshot + - looksee - looksee-trip - loop-effin - lorentz @@ -2753,6 +2742,7 @@ dont-distribute-packages: - metar-http - metronome - micro-gateway + - microdns - microformats2-types - midimory - mighttpd @@ -2942,7 +2932,6 @@ dont-distribute-packages: - ngx-export-tools-extra - nikepub - nirum - - nix-thunk - nkjp - nlp-scores-scripts - nom @@ -3000,6 +2989,7 @@ dont-distribute-packages: - olwrapper - om-kubernetes - om-legion + - one-time-password - online-csv - oops-examples - opc-xml-da-client @@ -3230,6 +3220,8 @@ dont-distribute-packages: - process-qq - process-streaming - procrastinating-structure + - prodapi-proxy + - prodapi-userauth - producer - product - prof2dot @@ -3347,7 +3339,6 @@ dont-distribute-packages: - rc - rdf4h-vocab-activitystreams - rdioh - - react - react-flux-servant - reactive - reactive-banana-sdl @@ -3374,7 +3365,6 @@ dont-distribute-packages: - reflex-backend-wai - reflex-dom-colonnade - reflex-dynamic-containers - - reflex-gadt-api - reflex-gloss-scene - reflex-libtelnet - reflex-localize @@ -3673,7 +3663,6 @@ dont-distribute-packages: - si-clock - sibe - sigma-ij - - signable - signals - signature - silvi @@ -3783,6 +3772,7 @@ dont-distribute-packages: - sproxy - sproxy-web - sproxy2 + - sq - sql-simple-mysql - sql-simple-pool - sql-simple-postgresql @@ -3790,9 +3780,6 @@ dont-distribute-packages: - sqlcli-odbc - sqlite-simple-interpolate - sqlite-simple-typed - - squeal-postgresql - - squeal-postgresql-ltree - - squeal-postgresql-uuid-ossp - squeeze - sr-extra - srt-dhall @@ -4102,8 +4089,6 @@ dont-distribute-packages: - unitym-servant - unitym-yesod - universal - - universe - - universe-dependent-sum - universe-th - unix-fcntl - unpacked-these @@ -4166,14 +4151,12 @@ dont-distribute-packages: - verifiable-expressions - verismith - versioning-servant - - vessel - vflow-types - vformat-aeson - vformat-time - vfr-waypoints - vigilance - vimeta - - vinyl-generics - vinyl-operational - vision - visual-graphrewrite diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 72cc9c4c85..6b49a4ec25 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -444,7 +444,7 @@ self: super: builtins.intersectAttrs super { leksah = dontCheck (overrideCabal (drv: { executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ gnome.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... - wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + wrapGAppsHook3 # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]); postPatch = (drv.postPatch or "") + '' @@ -719,14 +719,63 @@ self: super: builtins.intersectAttrs super { }) (addBuildTools (with pkgs.buildPackages; [makeWrapper python3Packages.sphinx]) super.futhark); - git-annex = overrideCabal (drv: { - # This is an instance of https://github.com/NixOS/nix/pull/1085 - # Fails with: - # gpg: can't connect to the agent: File name too long - postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' - substituteInPlace Test.hs \ - --replace ', testCase "crypto" test_crypto' "" - '' + (drv.postPatch or ""); + git-annex = let + # Executables git-annex needs at runtime. git-annex detects these at configure + # time and expects to be able to execute them. This means that cross-compiling + # git-annex is not possible and strictDeps must be false (runtimeExecDeps go + # into executableSystemDepends/buildInputs). + runtimeExecDeps = [ + pkgs.bup + pkgs.curl + pkgs.git + pkgs.gnupg + pkgs.lsof + pkgs.openssh + pkgs.perl + pkgs.rsync + pkgs.wget + pkgs.which + ]; + in + overrideCabal (drv: { + executableSystemDepends = runtimeExecDeps; + enableSharedExecutables = false; + + preConfigure = drv.preConfigure or "" + '' + export HOME=$TEMPDIR + patchShebangs . + ''; + + # git-annex ships its test suite as part of the final executable instead of + # using a Cabal test suite. + checkPhase = '' + runHook preCheck + + # Setup PATH for the actual tests + ln -sf dist/build/git-annex/git-annex git-annex + ln -sf git-annex git-annex-shell + PATH+=":$PWD" + + echo checkFlags: $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"} + + # Doesn't use Cabal's test mechanism + git-annex test $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"} + + runHook postCheck + ''; + + # Use default installPhase of pkgs/stdenv/generic/setup.sh. We need to set + # the environment variables it uses via the preInstall hook since the Haskell + # generic builder doesn't accept them as arguments. + preInstall = drv.preInstall or "" + '' + installTargets="install" + installFlagsArray+=( + "BUILDER=:" + "PREFIX=" + "DESTDIR=$out" + ) + ''; + installPhase = null; # Ensure git-annex uses the exact same coreutils it saw at build-time. # This is especially important on Darwin but also in Linux environments @@ -744,13 +793,6 @@ self: super: builtins.intersectAttrs super { # `git-annex-shell` by making `shell = haskellPackages.git-annex`. # https://git-annex.branchable.com/git-annex-shell/ passthru.shellPath = "/bin/git-annex-shell"; - - # Install man pages which is no longer done by Setup.hs - # TODO(@sternenseemann): figure out why install-desktops wants to create /usr - # and run that, too. - postInstall = drv.postInstall or "" + '' - make install-mans "DESTDIR=$out" PREFIX= - ''; }) (super.git-annex.override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; @@ -807,8 +849,12 @@ self: super: builtins.intersectAttrs super { url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.11/purescript-docs-search"; sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; - - spagoDocs = overrideCabal (drv: { + in + lib.pipe (super.spago.override { + versions = self.versions_5_0_5; + fsnotify = self.fsnotify_0_3_0_1; + }) [ + (overrideCabal (drv: { postUnpack = (drv.postUnpack or "") + '' # Spago includes the following two files directly into the binary # with Template Haskell. They are fetched at build-time from the @@ -833,21 +879,17 @@ self: super: builtins.intersectAttrs super { "$sourceRoot/templates/docs-search-app-0.0.11.js" \ "$sourceRoot/templates/purescript-docs-search-0.0.11" ''; - }) super.spago; - - spagoOldAeson = spagoDocs.overrideScope (hfinal: hprev: { - # spago is not yet updated for aeson 2.0 - aeson = hfinal.aeson_1_5_6_0; - # bower-json 1.1.0.0 only supports aeson 2.0, so we pull in the older version here. - bower-json = hprev.bower-json_1_0_0_1; - }); + })) # Tests require network access. - spagoWithoutChecks = dontCheck spagoOldAeson; - in - # spago doesn't currently build with ghc92. Top-level spago is pulled from - # ghc90 and explicitly marked unbroken. - markBroken spagoWithoutChecks; + dontCheck + + # Overly strict upper bound on text + doJailbreak + + # Generate shell completion for spago + (self.generateOptparseApplicativeCompletions [ "spago" ]) + ]; # checks SQL statements at compile time, and so requires a running PostgreSQL # database to run it's test suite @@ -1335,4 +1377,6 @@ self: super: builtins.intersectAttrs super { pvar = dontCheck super.pvar; kmonad = enableSeparateBinOutput super.kmonad; + + xmobar = enableSeparateBinOutput super.xmobar; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix index cda49e0f87..f9acdd0f4a 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix @@ -1,13 +1,24 @@ { lib, stdenv, buildPackages, buildHaskellPackages, ghc -, jailbreak-cabal, hscolour, cpphs, nodejs +, jailbreak-cabal, hscolour, cpphs , ghcWithHoogle, ghcWithPackages +, nodejs }: let isCross = stdenv.buildPlatform != stdenv.hostPlatform; + + # Pass the "wrong" C compiler rather than none at all so packages that just + # use the C preproccessor still work, see + # https://github.com/haskell/cabal/issues/6466 for details. + cc = + if stdenv.hasCC then "$CC" + else if stdenv.hostPlatform.isGhcjs then "${emscripten}/bin/emcc" + else "$CC_FOR_BUILD"; + inherit (buildPackages) fetchurl removeReferencesTo - pkg-config coreutils gnugrep glibcLocales; + pkg-config coreutils gnugrep glibcLocales + emscripten; in { pname @@ -40,7 +51,8 @@ in , enableSharedExecutables ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false) , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin -, enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm) +# Disabling this for ghcjs prevents this crash: https://gitlab.haskell.org/ghc/ghc/-/issues/23235 +, enableStaticLibraries ? !(stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isWasm || stdenv.hostPlatform.isGhcjs) , enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] # On macOS, statically linking against system frameworks is not supported; @@ -188,10 +200,7 @@ let crossCabalFlags = [ "--with-ghc=${ghcCommand}" "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" - # Pass the "wrong" C compiler rather than none at all so packages that just - # use the C preproccessor still work, see - # https://github.com/haskell/cabal/issues/6466 for details. - "--with-gcc=${if stdenv.hasCC then "$CC" else "$CC_FOR_BUILD"}" + "--with-gcc=${cc}" ] ++ optionals stdenv.hasCC [ "--with-ld=${stdenv.cc.bintools.targetPrefix}ld" "--with-ar=${stdenv.cc.bintools.targetPrefix}ar" @@ -315,7 +324,7 @@ let optionals doBenchmark benchmarkToolDepends; nativeBuildInputs = [ ghc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) (assert pkg-config != null; pkg-config) ++ - setupHaskellDepends ++ collectedToolDepends; + setupHaskellDepends ++ collectedToolDepends ++ optional stdenv.hostPlatform.isGhcjs nodejs; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends; otherBuildInputsHaskell = optionals doCheck (testDepends ++ testHaskellDepends) ++ @@ -442,6 +451,11 @@ stdenv.mkDerivation ({ '' + '' done '' + + (optionalString stdenv.hostPlatform.isGhcjs '' + export EM_CACHE="$(realpath "$(mktemp -d emcache.XXXXXXXXXX)")" + cp -Lr ${emscripten}/share/emscripten/cache/* "$EM_CACHE/" + chmod u+rwX -R "$EM_CACHE" + '') # only use the links hack if we're actually building dylibs. otherwise, the # "dynamic-library-dirs" point to nonexistent paths, and the ln command becomes # "ln -s $out/lib/links", which tries to recreate the links dir and fails diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index f66a166c2c..b8e04d8d86 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -2878,6 +2878,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "Cabal_3_12_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers + , deepseq, directory, filepath, mtl, parsec, pretty, process, time + , transformers, unix + }: + mkDerivation { + pname = "Cabal"; + version = "3.12.0.0"; + sha256 = "0cqs1i4qyf4y2xyq8wgk1xbjy5ra9bk5pc8y9bhl82cvqm625qpp"; + setupHaskellDepends = [ mtl parsec ]; + libraryHaskellDepends = [ + array base bytestring Cabal-syntax containers deepseq directory + filepath mtl parsec pretty process time transformers unix + ]; + doCheck = false; + description = "A framework for packaging Haskell software"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Cabal-ide-backend" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , deepseq, directory, extensible-exceptions, filepath, HUnit @@ -2955,6 +2975,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "Cabal-syntax_3_12_0_0" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, mtl, parsec, pretty, text, time + , transformers + }: + mkDerivation { + pname = "Cabal-syntax"; + version = "3.12.0.0"; + sha256 = "090zv977zp85q6kwa2nwyh0plrb73dhss2wx00jdxz7v8zl2masp"; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + mtl parsec pretty text time transformers + ]; + libraryToolDepends = [ alex ]; + description = "A library for working with .cabal files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "CabalSearch" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HDBC , HDBC-sqlite3, process, unix @@ -3276,6 +3315,25 @@ self: { license = lib.licenses.mit; }) {}; + "ChasingBottoms_1_3_1_14" = callPackage + ({ mkDerivation, array, base, containers, mtl, QuickCheck, random + , syb + }: + mkDerivation { + pname = "ChasingBottoms"; + version = "1.3.1.14"; + sha256 = "0rmpi7n0b9spvx84645z2zcnnvg75s40zl05c8iigzciyjax3v5y"; + libraryHaskellDepends = [ + base containers mtl QuickCheck random syb + ]; + testHaskellDepends = [ + array base containers mtl QuickCheck random syb + ]; + description = "For testing partial and infinite values"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "CheatSheet" = callPackage ({ mkDerivation, base, containers, directory }: mkDerivation { @@ -9453,8 +9511,8 @@ self: { ({ mkDerivation, base, bcm2835, bytestring }: mkDerivation { pname = "HPi"; - version = "0.10.0"; - sha256 = "1b3lwa1j2w9vwqxpccyg4mcy338q4byyqpysxd2ciljq3wcf5nkw"; + version = "0.11.0"; + sha256 = "1m2sa97883dvw1m10a1rb19dc7a1wc5cgs89zsrw2mlkl3877946"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ bcm2835 ]; description = "GPIO, I2C, SPI, and PWM functions for the Raspberry Pi"; @@ -9947,8 +10005,8 @@ self: { pname = "HTTP"; version = "4000.4.1"; sha256 = "0lyl5lpkk51xn3dfndh8ksgvwcdsviyigmsnp3d28lbpxkpxhcfz"; - revision = "3"; - editedCabalFile = "0nsg7j94f8wz9pv4c221c744sncac7hp5x0hlvbljgklj0jmfdqf"; + revision = "4"; + editedCabalFile = "18ywxacq8p51p84haqgm8h19jnsja4dgx32sxl9ncgvh2xwyj35r"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time transformers @@ -11532,6 +11590,8 @@ self: { pname = "HsYAML"; version = "0.2.1.3"; sha256 = "144xixvi6nfhg1rjq5aglj0vmvpf482rxzn5vlv19n4gbfnaj9p0"; + revision = "1"; + editedCabalFile = "0nxnk3lajarvfk0841x4zhqv7m3avscd21bzlnlism7dymq0dkh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11545,6 +11605,28 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "HsYAML_0_2_1_4" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec + , QuickCheck, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "HsYAML"; + version = "0.2.1.4"; + sha256 = "09hsva1qnnnyvbf7860wqpi5b3i6hbshf3wmhx3fm4hi7i3ak05m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq mtl parsec text transformers + ]; + testHaskellDepends = [ + base bytestring containers mtl QuickCheck tasty tasty-quickcheck + text + ]; + description = "Pure Haskell YAML 1.2 processor"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "HsYAML-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, HsYAML, mtl , scientific, text, unordered-containers, vector @@ -14327,8 +14409,8 @@ self: { pname = "MissingH"; version = "1.6.0.1"; sha256 = "0f5d7ws2vqm1vpwjab9cp691jn5j3dxycfn4w5p1rb4aim504aa9"; - revision = "2"; - editedCabalFile = "1qvdaa5im36x6j7z060n084q62gp35sp7sa6cgcbdjva5bqgi2iy"; + revision = "3"; + editedCabalFile = "00cx3sszr8f6adkl5w09mk7yg6pl38mym2mcl2nicdpz9vyvjb2f"; libraryHaskellDepends = [ array base containers directory filepath hslogger mtl network network-bsd old-locale old-time parsec process regex-compat time @@ -17507,6 +17589,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "QuickCheck_2_15" = callPackage + ({ mkDerivation, base, containers, deepseq, process, random + , splitmix, template-haskell, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.15"; + sha256 = "10hd896c8vb19aj3q0dg90aymsiq73ffxgx8z1p39w7x21m2vdnc"; + libraryHaskellDepends = [ + base containers deepseq random splitmix template-haskell + transformers + ]; + testHaskellDepends = [ base containers deepseq process ]; + description = "Automatic testing of Haskell programs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mmorph, QuickCheck, random, transformers }: mkDerivation { @@ -19478,6 +19578,7 @@ self: { description = "A programming model for declarative, high performance user interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Shpadoinkle-backend-pardiff" = callPackage @@ -23235,24 +23336,6 @@ self: { }) {}; "Yampa" = callPackage - ({ mkDerivation, base, criterion, deepseq, filepath, random - , simple-affine-space, time - }: - mkDerivation { - pname = "Yampa"; - version = "0.14.7"; - sha256 = "0y9aagh532xdp2qq5xfk8qzf326pjs5x3lvrfby2d2qbbh724nav"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base deepseq random simple-affine-space - ]; - benchmarkHaskellDepends = [ base criterion filepath time ]; - description = "Elegant Functional Reactive Programming Language for Hybrid Systems"; - license = lib.licenses.bsd3; - }) {}; - - "Yampa_0_14_8" = callPackage ({ mkDerivation, base, criterion, deepseq, filepath, random , simple-affine-space, time }: @@ -23268,7 +23351,6 @@ self: { benchmarkHaskellDepends = [ base criterion filepath time ]; description = "Elegant Functional Reactive Programming Language for Hybrid Systems"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Yampa-core" = callPackage @@ -24566,6 +24648,8 @@ self: { pname = "acid-state"; version = "0.16.1.3"; sha256 = "0vmggxzp6alv92ycwc9bc53vn73s1cbn8rhmbcb2jvcglyakvws5"; + revision = "1"; + editedCabalFile = "17m2071y2vam37ixgqa4rgfmcrwvc4x0k6a89hz70fmpzx52hhad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25010,6 +25094,24 @@ self: { broken = true; }) {}; + "acme-not-a-joke" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptohash-sha256, filepath, jose, lens, text, time, wreq + }: + mkDerivation { + pname = "acme-not-a-joke"; + version = "0.1.0.0"; + sha256 = "016zaz5mlbj9v1mwx8208azgvazdz7ng2g6971kjmsp3jxdp27v5"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptohash-sha256 filepath + jose lens text time wreq + ]; + description = "implements ACME clients (rfc-8555)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "acme-now" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -25314,6 +25416,8 @@ self: { pname = "active"; version = "0.2.1"; sha256 = "150kwir36aj9q219qi80mlqd0vxm4941dh6x4xp58rbd5a3mhmv1"; + revision = "2"; + editedCabalFile = "16gc6vksf5gn5v6m9zbiphb2bd2chbypk8iykn1y7ak3f8g30asn"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -26437,9 +26541,7 @@ self: { ]; description = "Derivation of Aeson instances for GADTs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "readme"; - broken = true; }) {}; "aeson-generic-compat" = callPackage @@ -35466,15 +35568,16 @@ self: { "amqp-streamly" = callPackage ({ mkDerivation, amqp, base, bytestring, hspec, process, streamly - , testcontainers, text + , streamly-core, testcontainers, text }: mkDerivation { pname = "amqp-streamly"; - version = "0.2.1"; - sha256 = "17qh1f05byyysmmyyz6lsqgkkn3bhxw6jpg4pm53ii1m6myfnqw9"; - libraryHaskellDepends = [ amqp base streamly text ]; + version = "0.3.0"; + sha256 = "1095f9da87y1h47a2sskliyx71iy6xv00wzzjv7va8rqdlfzch5b"; + libraryHaskellDepends = [ amqp base streamly streamly-core text ]; testHaskellDepends = [ - amqp base bytestring hspec process streamly testcontainers text + amqp base bytestring hspec process streamly streamly-core + testcontainers text ]; description = "A simple streamly wrapper for amqp"; license = lib.licenses.bsd3; @@ -36177,12 +36280,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "ansi-terminal_1_1" = callPackage + "ansi-terminal_1_1_1" = callPackage ({ mkDerivation, ansi-terminal-types, base, colour }: mkDerivation { pname = "ansi-terminal"; - version = "1.1"; - sha256 = "0lxjf546x2b382hhg8ws2ay9yhva9kk07ki8lmgpbndsprbn4paj"; + version = "1.1.1"; + sha256 = "0k5wl5b9bzvkgplg4rgsz92rkps18s1qy5p560ypzad5z36qyi3y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal-types base colour ]; @@ -36201,6 +36304,8 @@ self: { pname = "ansi-terminal-game"; version = "1.9.3.0"; sha256 = "1yy7hzdcawdmwl8wqzabbamzjdg260xbwryj0hdjn7b0n6qlqymk"; + revision = "1"; + editedCabalFile = "0r2jm1yrprhh7wy06xxf3xw6m56wx5w4x3flig6cwgvgqk08py0s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36243,6 +36348,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ansi-wl-pprint_0_6_9" = callPackage + ({ mkDerivation, ansi-terminal, base }: + mkDerivation { + pname = "ansi-wl-pprint"; + version = "0.6.9"; + sha256 = "1b2fg8px98dzbaqyns10kvs8kn6cl1hdq5wb9saz40izrpkyicm7"; + revision = "4"; + editedCabalFile = "04ljsk64bzwsczh0zc5w3r98qr1zlzbwwm2xb6nk9vradv4pnwzv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base ]; + description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ansi-wl-pprint" = callPackage ({ mkDerivation, base, prettyprinter-compat-ansi-wl-pprint }: mkDerivation { @@ -37898,6 +38019,27 @@ self: { broken = true; }) {}; + "apply-merge" = callPackage + ({ mkDerivation, base, containers, falsify, pqueue, tasty + , tasty-bench, tasty-expected-failure, tasty-hunit, transformers + , vector + }: + mkDerivation { + pname = "apply-merge"; + version = "0.1.0.0"; + sha256 = "1wkm96jhy9z0k3nyzba6x33r9nv69chsyd44srwpp3qryzm3884k"; + libraryHaskellDepends = [ base containers pqueue ]; + testHaskellDepends = [ + base containers falsify pqueue tasty tasty-expected-failure + tasty-hunit transformers vector + ]; + benchmarkHaskellDepends = [ + base containers pqueue tasty-bench transformers vector + ]; + description = "Lift a binary, non-decreasing function onto ordered lists and order the output"; + license = lib.licenses.bsd3; + }) {}; + "apply-refact_0_9_3_0" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative @@ -39224,12 +39366,12 @@ self: { broken = true; }) {inherit (pkgs) arpack;}; - "array_0_5_6_0" = callPackage + "array_0_5_7_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "array"; - version = "0.5.6.0"; - sha256 = "0bhiw4zwnlapy4fznck7kna5f59dv33pk34x6r0liw0n81s22pm8"; + version = "0.5.7.0"; + sha256 = "155ka0ax0z0niwgy68cnrh3zd75a5xw1i6wvaaqk0sszgxqr6myh"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = lib.licenses.bsd3; @@ -40611,6 +40753,8 @@ self: { pname = "async"; version = "2.2.5"; sha256 = "1xqnixmcxbird7rxl124bn5swpyyxxx2jxpdsbx2l8drp8z4f60q"; + revision = "1"; + editedCabalFile = "1y1cd3dkllrwbqj9ca8rr4vv2v751vrvia0kkq4qv5ajbxh9wpcx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -41130,8 +41274,8 @@ self: { ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "atomic-primops"; - version = "0.8.5"; - sha256 = "07wbza3xrgxbbdajgayyvbdki69v12rz2z3yfiy0gf5dqfa5g98w"; + version = "0.8.7"; + sha256 = "1xwws46hwb0m2zqyllkb9rb0jjiqq0xp128dv03w3l5kz0ixk9jv"; libraryHaskellDepends = [ base ghc-prim primitive ]; description = "A safe approach to CAS and other atomic ops in Haskell"; license = lib.licenses.bsd3; @@ -42235,6 +42379,22 @@ self: { license = lib.licenses.mit; }) {}; + "auto-update_0_2_0" = callPackage + ({ mkDerivation, base, exceptions, hspec, hspec-discover, HUnit + , retry + }: + mkDerivation { + pname = "auto-update"; + version = "0.2.0"; + sha256 = "13z0h0zjccf8fj0lfcbjhrzfpq1cw9kc9aciycs97lrr6iz7y6m2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base exceptions hspec HUnit retry ]; + testToolDepends = [ hspec-discover ]; + description = "Efficiently run periodic, on-demand actions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "autoapply" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, logict, mtl , template-haskell, th-desugar, transformers, unification-fd @@ -44647,6 +44807,8 @@ self: { pname = "bank-holiday-germany"; version = "1.3.0.0"; sha256 = "1agf4flql5xkj2rpdbdxpmvajhigcwzbxsmrh76bckmcj2b38k9f"; + revision = "1"; + editedCabalFile = "15hkd2s9hd7xml0r8cq3apsnzh1a9k34vyljz7bfl811krx01f0j"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base doctest hedgehog hspec hspec-hedgehog time @@ -45735,8 +45897,6 @@ self: { ]; description = "Basic examples and functions for generics-sop"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "basics" = callPackage @@ -46447,8 +46607,6 @@ self: { ]; description = "SQL DDL support and migrations support library for Beam"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "beam-mysql" = callPackage @@ -46537,7 +46695,6 @@ self: { ]; description = "Beam driver for SQLite"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "beam-th" = callPackage @@ -46594,8 +46751,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.7"; - sha256 = "1yxjqsy24af1i36haax1bqizmwgimqkgygwimqrcmbazmrjdcfj2"; + version = "0.14.8"; + sha256 = "06wnlshgf2anp3xg3vf0cz6lxjn0rpfvnjfn568dj007km8y2n9p"; libraryHaskellDepends = [ base deepseq dunai MonadRandom mtl simple-affine-space transformers ]; @@ -46650,6 +46807,37 @@ self: { broken = true; }) {}; + "bech32_1_1_6" = callPackage + ({ mkDerivation, array, base, base58-bytestring, bytestring + , containers, deepseq, extra, hspec, hspec-discover, memory + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , process, QuickCheck, text, vector + }: + mkDerivation { + pname = "bech32"; + version = "1.1.6"; + sha256 = "03a0xf1c7zjirg4y3rv0frrqifzqsqx327hdcvxzbpgflwgs225h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring containers extra text + ]; + executableHaskellDepends = [ + base base58-bytestring bytestring extra memory optparse-applicative + prettyprinter prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + base base58-bytestring bytestring containers deepseq extra hspec + memory process QuickCheck text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "bech32"; + broken = true; + }) {}; + "bech32-th" = callPackage ({ mkDerivation, base, bech32, hspec, hspec-discover , template-haskell, text @@ -46666,6 +46854,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "bech32-th_1_1_6" = callPackage + ({ mkDerivation, base, bech32, hspec, hspec-discover + , template-haskell, text + }: + mkDerivation { + pname = "bech32-th"; + version = "1.1.6"; + sha256 = "0y1hw7419sw84gs13wh40qj9m1snyz0ly5aasmkynjpb9ixhn54k"; + libraryHaskellDepends = [ base bech32 template-haskell text ]; + testHaskellDepends = [ base bech32 hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Template Haskell extensions to the Bech32 library"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "bed-and-breakfast" = callPackage ({ mkDerivation, array, base, binary, cpphs, deepseq, QuickCheck , template-haskell @@ -46705,7 +46909,6 @@ self: { ]; description = "Bindings to the beeminder.com JSON API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bein" = callPackage @@ -46811,10 +47014,8 @@ self: { }: mkDerivation { pname = "bench"; - version = "1.0.12"; - sha256 = "1sy97qpv6paar2d5syppk6lc06wjx6qyz5aidsmh30jq853nydx6"; - revision = "8"; - editedCabalFile = "1xsvw5mid9f4gildrw4hdxp77hqx33vkp6x015ig0rm8b2cpp0r7"; + version = "1.0.13"; + sha256 = "0v2sfblzwjb0y8dnjpl9jxsiz14lqdnpa1vccbnm2y73b5pkj30p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47706,7 +47907,7 @@ self: { mainProgram = "binance-exports"; }) {}; - "binary_0_8_9_1" = callPackage + "binary_0_8_9_2" = callPackage ({ mkDerivation, array, attoparsec, base, base-orphans, bytestring , Cabal, cereal, containers, criterion, deepseq, directory , filepath, generic-deriving, HUnit, mtl, QuickCheck, random @@ -47715,8 +47916,8 @@ self: { }: mkDerivation { pname = "binary"; - version = "0.8.9.1"; - sha256 = "1h7bmrzipfkglh627dmwm7vqf7akkilmfz5qr85rpz1d8miwl8dc"; + version = "0.8.9.2"; + sha256 = "0k7pkc6rkxfq6xz5hai5y31rhi8d3hrn5nxsp4ya3nyc9rmi2dw4"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base base-orphans bytestring Cabal containers directory @@ -49226,31 +49427,36 @@ self: { }) {}; "binrep" = callPackage - ({ mkDerivation, base, bytestring, bytezap, deepseq, flatparse - , gauge, generic-data-asserts, generic-data-functions - , generic-random, hspec, hspec-discover, parser-combinators - , QuickCheck, quickcheck-instances, refined1, strongweak, text - , text-icu + ({ mkDerivation, base, bytestring, bytezap, deepseq, defun-core + , flatparse, gauge, generic-data-functions, generic-random + , generic-type-asserts, generic-type-functions, hspec + , hspec-discover, parser-combinators, QuickCheck + , quickcheck-instances, refined1, strongweak, text, text-icu + , type-level-bytestrings }: mkDerivation { pname = "binrep"; - version = "0.6.0"; - sha256 = "1rd27h3i39zibz7dvwk53akqkrfhwln2igfczxdwflhav372ah18"; + version = "0.8.0"; + sha256 = "1bsncrkxixp28ffmm2dgfpai3nv8cq0db3fdy11y6gi7rri7g8cj"; libraryHaskellDepends = [ - base bytestring bytezap deepseq flatparse generic-data-asserts - generic-data-functions parser-combinators refined1 strongweak text - text-icu + base bytestring bytezap deepseq defun-core flatparse + generic-data-functions generic-type-asserts generic-type-functions + parser-combinators refined1 strongweak text text-icu + type-level-bytestrings ]; testHaskellDepends = [ - base bytestring bytezap deepseq flatparse generic-data-asserts - generic-data-functions generic-random hspec parser-combinators - QuickCheck quickcheck-instances refined1 strongweak text text-icu + base bytestring bytezap deepseq defun-core flatparse + generic-data-functions generic-random generic-type-asserts + generic-type-functions hspec parser-combinators QuickCheck + quickcheck-instances refined1 strongweak text text-icu + type-level-bytestrings ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base bytestring bytezap deepseq flatparse gauge - generic-data-asserts generic-data-functions parser-combinators - refined1 strongweak text text-icu + base bytestring bytezap deepseq defun-core flatparse gauge + generic-data-functions generic-type-asserts generic-type-functions + parser-combinators refined1 strongweak text text-icu + type-level-bytestrings ]; description = "Encode precise binary representations directly in types"; license = lib.licenses.mit; @@ -50896,8 +51102,8 @@ self: { pname = "blank-canvas"; version = "0.7.4"; sha256 = "1qm0ms3jk8m5zv81lh3pn5n04afyq7bpn9lc137ddmm9blnkzndi"; - revision = "2"; - editedCabalFile = "1ksinbzz47750ka0cfam41v3pfqyw2dvzj8xypq6q317zjliicab"; + revision = "3"; + editedCabalFile = "02ci5si3bzcf2f29zi7npvbgq6x1d9jgn97p2n6yn1kfj5g4ff7m"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -51881,11 +52087,12 @@ self: { ({ mkDerivation, bluefin-internal }: mkDerivation { pname = "bluefin"; - version = "0.0.4.2"; - sha256 = "08r1xma5kg7kcc88lflq59kz3qs1qix2pg4hq882pabis0lnwr64"; + version = "0.0.4.3"; + sha256 = "13hb0wn232j2rxavjrxhnxadv683zdcvg08744pjm1scyv3p4012"; libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "bluefin-internal" = callPackage @@ -52008,8 +52215,8 @@ self: { pname = "bm"; version = "0.2.0.0"; sha256 = "17dnv1vdsh43nc8b0p92d01nz1zvxd9bfcghlz0w6c8wc5yflg31"; - revision = "3"; - editedCabalFile = "0nz83kp7gymlvnsap29ki2m6gy3aal902bazal5232slmsg49d7a"; + revision = "4"; + editedCabalFile = "11mj69y43chqr50m9g8shqdyc3q31hha9gjqx05dn1dnkz3xgzxb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53194,27 +53401,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "bower-json_1_0_0_1" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, base, bytestring - , deepseq, ghc-prim, mtl, scientific, tasty, tasty-hunit, text - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "bower-json"; - version = "1.0.0.1"; - sha256 = "0wvygg3rdbxzrmr61a9w6ddv9pfric85ih8hnxyk0ydzn7i59abs"; - libraryHaskellDepends = [ - aeson aeson-better-errors base bytestring deepseq ghc-prim mtl - scientific text transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring tasty tasty-hunit text unordered-containers - ]; - description = "Read bower.json from Haskell"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "bower-json" = callPackage ({ mkDerivation, aeson, aeson-better-errors, base, bytestring , deepseq, ghc-prim, mtl, scientific, tasty, tasty-hunit, text @@ -53254,17 +53440,17 @@ self: { }) {}; "bowtie" = callPackage - ({ mkDerivation, base, bifunctors, comonad, mtl - , nonempty-containers, prettyprinter, recursion-schemes - , semigroupoids + ({ mkDerivation, base, bifunctors, comonad, dependent-map, mtl + , nonempty-containers, optics, prettyprinter, recursion-schemes + , semigroupoids, some }: mkDerivation { pname = "bowtie"; - version = "0.3.1"; - sha256 = "04g44lfvbnh84vqwf3mvqwgnxfbc4w8lhx2a6g9jxl79fbsdzpwa"; + version = "0.4.0"; + sha256 = "1azsd73srpq0ly25dj1in0fgv8ja1b0sx0q23hbw43af5y885k7s"; libraryHaskellDepends = [ - base bifunctors comonad mtl nonempty-containers prettyprinter - recursion-schemes semigroupoids + base bifunctors comonad dependent-map mtl nonempty-containers + optics prettyprinter recursion-schemes semigroupoids some ]; description = "Tying knots in polynomial functors"; license = lib.licenses.bsd3; @@ -54211,8 +54397,8 @@ self: { pname = "brotli"; version = "0.0.0.1"; sha256 = "0fp8vhqzl6i1vvb4fw4zya6cgkzmj0yaaw94jdf2kggm3gn8zwfc"; - revision = "4"; - editedCabalFile = "1p6zr2yr1hd6k9vkpgwdidrkiykv09av2q77f37bfg0985b0xwpx"; + revision = "5"; + editedCabalFile = "06a4fsqw1xz4jmvfz4kybf1xg0l5w5klr77c5mibl39aafa0wnf5"; libraryHaskellDepends = [ base bytestring transformers ]; libraryPkgconfigDepends = [ brotli ]; testHaskellDepends = [ @@ -54253,8 +54439,8 @@ self: { pname = "brotli-streams"; version = "0.0.0.0"; sha256 = "14jc1nhm50razsl99d95amdf4njf75dnzx8vqkihgrgp7qisyz3z"; - revision = "8"; - editedCabalFile = "05ri1yv1q2h0zlbcqgk1rpyb7p36zb6asrj6f3w0yyr4s5hsqwww"; + revision = "9"; + editedCabalFile = "1rhy0d1jy3v9r1skg3bdlnjj5avxy968ih1cyg9x9yb7rbyf3za5"; libraryHaskellDepends = [ base brotli bytestring io-streams ]; testHaskellDepends = [ base bytestring HUnit io-streams QuickCheck test-framework @@ -55215,6 +55401,27 @@ self: { license = lib.licenses.mit; }) {}; + "burrito_2_0_1_9" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, parsec + , QuickCheck, template-haskell, text, transformers + }: + mkDerivation { + pname = "burrito"; + version = "2.0.1.9"; + sha256 = "0sz9j9yv7whwvxrnh4v3r5fz8z4v9c7c2s45kpvsgvshds9vbr7f"; + libraryHaskellDepends = [ + base bytestring containers parsec template-haskell text + transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec parsec QuickCheck template-haskell + text transformers + ]; + description = "Parse and render URI templates"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "burst-detection" = callPackage ({ mkDerivation, base, criterion, deepseq }: mkDerivation { @@ -56159,6 +56366,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "bytestring-lexing_0_5_0_12" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "bytestring-lexing"; + version = "0.5.0.12"; + sha256 = "09g5x7jwz9kby578rlj8c6f6zi0pzs169rsqd1vsn3q9gimkpj3j"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring tasty tasty-quickcheck tasty-smallcheck + ]; + description = "Efficiently parse and produce common integral and fractional numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytestring-mmap" = callPackage ({ mkDerivation, base, bytestring, unix }: mkDerivation { @@ -56389,6 +56613,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "bytestring-trie_0_2_7_3" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "bytestring-trie"; + version = "0.2.7.3"; + sha256 = "0cxhsczvfn0cxh4mmhv70rskrc023gy0gl57xiggbf64ng5c60f7"; + libraryHaskellDepends = [ base binary bytestring deepseq ]; + testHaskellDepends = [ + base binary bytestring deepseq QuickCheck smallcheck tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion deepseq QuickCheck + ]; + description = "An efficient finite map from bytestrings to values"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytestring-typenats" = callPackage ({ mkDerivation, base, binary, blake2, bytestring, cereal , criterion, cryptohash, deepseq, entropy, QuickCheck @@ -56484,27 +56730,32 @@ self: { }) {}; "bytezap" = callPackage - ({ mkDerivation, base, bytestring, primitive, text }: + ({ mkDerivation, base, bytestring, defun-core + , generic-type-functions, primitive, text, type-level-bytestrings + }: mkDerivation { pname = "bytezap"; - version = "1.1.0"; - sha256 = "08nr0iyj80bc19fj8dgfzyyb1dws93lclpmgxq2m0jcaxxzid1kj"; - libraryHaskellDepends = [ base bytestring primitive text ]; + version = "1.3.0"; + sha256 = "0ichvvl1f76m520q3pq0m90wi4f0gzmhbsxkk5xnh72kdbaj164h"; + libraryHaskellDepends = [ + base bytestring defun-core generic-type-functions primitive text + type-level-bytestrings + ]; description = "Bytestring builder with zero intermediate allocation"; license = lib.licenses.mit; }) {}; "bz2" = callPackage - ({ mkDerivation, base, bytestring, bzip2-clib, bzlib, c2hs, cpphs - , criterion, deepseq, directory, filepath, tasty, tasty-golden - , tasty-hunit, temporary + ({ mkDerivation, base, bytestring, bzlib, c2hs, cpphs, criterion + , deepseq, directory, filepath, tasty, tasty-golden, tasty-hunit + , temporary }: mkDerivation { pname = "bz2"; - version = "1.0.1.1"; - sha256 = "1pa7qswh3sl9d0pbil14c8w8dvqs4va97ich2fck0gw25y4dwphn"; + version = "1.0.1.2"; + sha256 = "0pjcpp365lnfmmp0x9yi71h9nvvmglpc4pvkb7qcvpygx35vxzb1"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base bytestring bzip2-clib ]; + libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring deepseq directory filepath tasty tasty-golden @@ -57018,6 +57269,8 @@ self: { libraryHaskellDepends = [ base Cabal ]; description = "Adds executable dependencies to the Cabal build"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cabal-bundle-clib" = callPackage @@ -57461,13 +57714,13 @@ self: { "cabal-gild" = callPackage ({ mkDerivation, base, bytestring, Cabal-syntax, containers - , directory, exceptions, filepath, hspec, parsec, pretty, text - , transformers + , directory, exceptions, filepath, hspec, parsec, pretty, temporary + , text, transformers }: mkDerivation { pname = "cabal-gild"; - version = "1.3.0.1"; - sha256 = "18sa7c3rniczb218lzi9iizfi1czllp9hy4ai1djz4hvqvbmlh9r"; + version = "1.3.1.0"; + sha256 = "1ghrzw1fqslyhy9hmsmwwyv7kfbzf3bm9d0bzvf2k62s7yihrs4p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57476,7 +57729,8 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring containers exceptions filepath hspec transformers + base bytestring containers directory exceptions filepath hspec + temporary transformers ]; description = "Formats package descriptions"; license = lib.licenses.mit; @@ -59299,6 +59553,31 @@ self: { broken = true; }) {}; + "call-alloy_0_5_0_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , exceptions, extra, file-embed, filepath, hspec, process, split + , string-interpolate, transformers, trifecta, unix + }: + mkDerivation { + pname = "call-alloy"; + version = "0.5.0.1"; + sha256 = "0c34yd6l0650qk760mmgsfgmwvhqhs43nzm7nhzkps5z1p966wmc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + async base bytestring containers directory exceptions extra + filepath process split transformers trifecta unix + ]; + testHaskellDepends = [ + async base bytestring containers directory exceptions extra + file-embed filepath hspec process split string-interpolate + transformers trifecta unix + ]; + description = "A simple library to call Alloy given a specification"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "call-haskell-from-anything" = callPackage ({ mkDerivation, base, bytestring, data-msgpack, mtl , storable-endian, template-haskell @@ -60827,6 +61106,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "cassava_0_5_3_1" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, containers + , deepseq, hashable, HUnit, Only, QuickCheck, quickcheck-instances + , scientific, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, text-short, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "cassava"; + version = "0.5.3.1"; + sha256 = "14kz47i6f9c747h2mf8cf6r22gib4a2ggh57fviz0z9sr6y760av"; + configureFlags = [ "-f-bytestring--lt-0_10_4" ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers deepseq hashable Only + scientific text text-short transformers unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring hashable HUnit QuickCheck + quickcheck-instances scientific test-framework test-framework-hunit + test-framework-quickcheck2 text unordered-containers vector + ]; + description = "A CSV parsing and encoding library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cassava-conduit" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, containers, criterion, mtl, QuickCheck, text @@ -61457,9 +61762,7 @@ self: { ]; description = "A tool for manipulating CBOR"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "cbor-tool"; - broken = true; }) {}; "cborg" = callPackage @@ -61496,6 +61799,8 @@ self: { pname = "cborg-json"; version = "0.2.6.0"; sha256 = "1p6xdimwypmlsc0zdyw1vyyapnhwn2g8b9n0a83ca6h4r90722yv"; + revision = "1"; + editedCabalFile = "0bgr0m1p4r2snp8d1irsyql2a9kcpp09lkajjfsyqq8riaf75a2v"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring cborg scientific text unordered-containers vector @@ -62099,8 +62404,8 @@ self: { }: mkDerivation { pname = "cfg"; - version = "0.0.2.1"; - sha256 = "0fy21jxpr3720r4l6xnsbg2xasyrq94ljjnnk6639q4w8waqqrb2"; + version = "0.0.2.2"; + sha256 = "1v0k3gkwwifps4msd2888slaf4wdw5ppfpp0a0rzgmp14fbxz2sw"; libraryHaskellDepends = [ base bytestring containers errors free megaparsec mtl pretty-simple text vector @@ -63470,7 +63775,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "chimera_0_4_0_0" = callPackage + "chimera_0_4_1_0" = callPackage ({ mkDerivation, adjunctions, base, distributive, infinite-list , mtl, primitive, QuickCheck, random, tasty, tasty-bench , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers @@ -63478,15 +63783,15 @@ self: { }: mkDerivation { pname = "chimera"; - version = "0.4.0.0"; - sha256 = "0fwwirx911421d48p0hsd8r2hhik1hsf8z7gqysd0cr2riz4b6q7"; + version = "0.4.1.0"; + sha256 = "1wxw0d9dq7q3a9rn3h69yjiyi94xhyip1ssii982rm35jsywak49"; libraryHaskellDepends = [ adjunctions base distributive infinite-list mtl primitive transformers vector ]; testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck - vector + base infinite-list QuickCheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck vector ]; benchmarkHaskellDepends = [ base mtl random tasty tasty-bench vector @@ -65160,6 +65465,8 @@ self: { pname = "clash-shake"; version = "0.3.2"; sha256 = "0bgnl1q1xm1yhwspqlfr02p37iy8vka727r4awr2lihg12x83bjx"; + revision = "1"; + editedCabalFile = "1gqzayyqdrhfd11as965bmi06ahnx72sr5ghxczrlfxsihdrbcgl"; libraryHaskellDepends = [ aeson base bytestring clash-ghc clash-lib clash-prelude directory shake split stache text unordered-containers @@ -65230,8 +65537,8 @@ self: { }: mkDerivation { pname = "clashilator"; - version = "0.1.2.1"; - sha256 = "1sldbsx1w3qpa9djilrfc9ag9bja64pk2qw4bi8gn9d3zqybyn92"; + version = "0.1.4"; + sha256 = "1221csxfv7m95c782l85aww9mjxfj7x7snpc451j13qv37ia62cn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65496,7 +65803,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "CSS preprocessor as embedded Haskell"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "clay_0_15_0" = callPackage @@ -65511,7 +65817,6 @@ self: { description = "CSS preprocessor as embedded Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "clckwrks" = callPackage @@ -66067,8 +66372,6 @@ self: { ]; description = "Miscellaneous utilities for building and working with command line interfaces"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "cli-git" = callPackage @@ -66085,7 +66388,6 @@ self: { ]; description = "Bindings to the git command-line interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cli-nix" = callPackage @@ -66102,7 +66404,6 @@ self: { ]; description = "Bindings to the nix command-line interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cli-setup" = callPackage @@ -68460,8 +68761,8 @@ self: { ({ mkDerivation, base, containers, deepseq, QuickCheck }: mkDerivation { pname = "collect-errors"; - version = "0.1.5.0"; - sha256 = "1hljcnmwpk47rivlds9901129hgkm7j8h3yhz2j1j2pga5w43ck9"; + version = "0.1.6.0"; + sha256 = "0afyd8qyih6aqkavgk2dc4a6dsnc1yk5xqq1vi54lgmjdhrh6xbg"; libraryHaskellDepends = [ base containers deepseq QuickCheck ]; description = "Error monad with a Float instance"; license = lib.licenses.bsd3; @@ -69538,6 +69839,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "commutative-semigroups_0_2" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "commutative-semigroups"; + version = "0.2"; + sha256 = "0jkqfslrvyh17p9llf1ga249fcnhfjlp1rb3nvj0078a19c0xcd8"; + libraryHaskellDepends = [ base containers ]; + description = "Commutative semigroups"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "comonad" = callPackage ({ mkDerivation, base, containers, distributive , indexed-traversable, tagged, transformers, transformers-compat @@ -75164,6 +75477,44 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; + "cornelis" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , diff-loc, directory, filepath, fingertree, generic-lens, hspec + , lens, levenshtein, megaparsec, mtl, nvim-hs, nvim-hs-contrib + , prettyprinter, process, QuickCheck, random, resourcet, temporary + , text, transformers, unagi-chan, unliftio-core, vector + }: + mkDerivation { + pname = "cornelis"; + version = "0.2.0.0"; + sha256 = "10frpbc0944pv5vc4qlh5blww8z5y6318gb5lhlrm3pm28sbxy1k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring containers diff-loc directory filepath + fingertree generic-lens hspec lens levenshtein megaparsec mtl + nvim-hs nvim-hs-contrib prettyprinter process QuickCheck random + resourcet text transformers unagi-chan unliftio-core vector + ]; + executableHaskellDepends = [ + aeson async base bytestring containers diff-loc directory filepath + fingertree generic-lens hspec lens levenshtein megaparsec mtl + nvim-hs nvim-hs-contrib prettyprinter process QuickCheck random + resourcet text transformers unagi-chan unliftio-core vector + ]; + testHaskellDepends = [ + aeson async base bytestring containers diff-loc directory filepath + fingertree generic-lens hspec lens levenshtein megaparsec mtl + nvim-hs nvim-hs-contrib prettyprinter process QuickCheck random + resourcet temporary text transformers unagi-chan unliftio-core + vector + ]; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "cornelis"; + broken = true; + }) {}; + "coroutine-enumerator" = callPackage ({ mkDerivation, base, enumerator, monad-coroutine }: mkDerivation { @@ -77657,8 +78008,8 @@ self: { pname = "cryptohash-md5"; version = "0.11.101.0"; sha256 = "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"; - revision = "3"; - editedCabalFile = "1v7gv0xa9yfkxq3g9j79ppzn6hjf467aajzb4x5882yflibfi9ki"; + revision = "4"; + editedCabalFile = "1m077jax8jz68i9c0nl27465qmcww97wziwmy8apxcfkgfifzlx6"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -77677,8 +78028,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.101.0"; sha256 = "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154"; - revision = "3"; - editedCabalFile = "08f68cjmdrwx76id4hcyp3jxs8dsnb1jv9pfkm5x7gsvxmrk6pdw"; + revision = "4"; + editedCabalFile = "1m0q2zmljjxr1v5szzb7xlbf2gnmaxnsgbvr9v3lgy3az192gdjr"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -77697,8 +78048,8 @@ self: { pname = "cryptohash-sha256"; version = "0.11.102.1"; sha256 = "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"; - revision = "3"; - editedCabalFile = "1204ybm4685yc78mpyriwbplg3ppciid3g1b79562zwqc58hdnq3"; + revision = "4"; + editedCabalFile = "1gdc6clkyx5dlf8g9pn8gbknvwjjhbnm1sy6pai7rarvgdm7a390"; configureFlags = [ "-fuse-cbits" ]; isLibrary = true; isExecutable = true; @@ -77720,8 +78071,8 @@ self: { pname = "cryptohash-sha512"; version = "0.11.102.0"; sha256 = "0b48qwgyn68rfbq4fh6fmsk1kc07n8qq95217n8gjnlzvsh2395z"; - revision = "2"; - editedCabalFile = "1v1d8bv54vwwz31z8pdni6pa5lzm5zaxkzdg0857jzghzkdzg7d5"; + revision = "3"; + editedCabalFile = "0n2b0q0a45vrklg69qa4rblijg9j87lqm1v4r3rwkqgl9y2f5bq1"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -77849,6 +78200,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "crypton_1_0_0" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, gauge + , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit + , tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "crypton"; + version = "1.0.0"; + sha256 = "1q1kv37hv8cl6hykvssbd4hsd0zj8a562q42jr2gwk59lnwklhcx"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge memory random + ]; + description = "Cryptography Primitives sink"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "crypton-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, crypton, exceptions, memory, resourcet, tasty @@ -78974,8 +79348,8 @@ self: { ({ mkDerivation, base, parsec, text }: mkDerivation { pname = "curly-expander"; - version = "0.3.0.2"; - sha256 = "0ag6yqg260y9hal6kzp3phsfa3rwj6lxd8g6k85x81s2lilxgynx"; + version = "0.3.0.3"; + sha256 = "07fqwq9k7ig0xyncyv39j48qv4wjfhdjvddm2v2h1rw93jxj06cf"; libraryHaskellDepends = [ base parsec text ]; testHaskellDepends = [ base parsec text ]; description = "Curly braces (brackets) expanding"; @@ -79892,6 +80266,23 @@ self: { broken = true; }) {}; + "dani-servant-lucid2" = callPackage + ({ mkDerivation, base, http-media, http-types, lucid2, servant + , servant-server + }: + mkDerivation { + pname = "dani-servant-lucid2"; + version = "0.1.0.0"; + sha256 = "0zgxzc6gfkhfv873bdvwqaw2f7fqyqk94ayacnnbi4ml55mypx3v"; + libraryHaskellDepends = [ + base http-media http-types lucid2 servant servant-server + ]; + testHaskellDepends = [ base http-media lucid2 servant-server ]; + doHaddock = false; + description = "Servant support for lucid2"; + license = lib.licenses.bsd3; + }) {}; + "danibot" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , conceit, containers, foldl, lens, lens-aeson, monoid-subclasses @@ -83123,6 +83514,34 @@ self: { license = lib.licenses.asl20; }) {}; + "dbus_1_3_4" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary + , text, th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.3.4"; + sha256 = "01q5jdlvf0mfvr2wfy3z4mkamj6ypzyni0919g99p2byx6aynq98"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck temporary text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "dbus-app-launcher" = callPackage ({ mkDerivation, base, containers, dbus, extra, unix }: mkDerivation { @@ -84802,8 +85221,8 @@ self: { }: mkDerivation { pname = "demangler"; - version = "1.2.0.0"; - sha256 = "1pv4qhmn5hmksrv868f2mdln938hin917s856xmfpmlnc9zgp6ml"; + version = "1.3.2.0"; + sha256 = "1fabcnvdbsy4q2phz4w06qj1wwabczg4ha25za8fr8jqfgl5zpqh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85136,8 +85555,6 @@ self: { ]; description = "Dependent map that uses semigroup mappend"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dependent-state" = callPackage @@ -87136,6 +87553,8 @@ self: { pname = "diagrams-core"; version = "1.5.1.1"; sha256 = "168kjikw3x21pjgfy3lmxmrm89g9zlhbypkmzdg5xz9rl7acn7rc"; + revision = "1"; + editedCabalFile = "1ii5qcwdzaljzq39vrvrsjf06ydnvvyr5q44ks566c347vna7igb"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -88509,8 +88928,8 @@ self: { }: mkDerivation { pname = "diohsc"; - version = "0.1.14.6"; - sha256 = "00856rbgk7xq6mq1q58ibzbbkag6jh3zqvyzapjw6baj83gd4br3"; + version = "0.1.14.7"; + sha256 = "0vyjp0p48d4m3wc0rzi4jljnv9yx0lfiwnxhismrpmf0cr0jfyzh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88523,7 +88942,9 @@ self: { ]; description = "Gemini client"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "diohsc"; + broken = true; }) {}; "diophantine" = callPackage @@ -88752,14 +89173,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "directory_1_3_8_3" = callPackage + "directory_1_3_8_4" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.8.3"; - sha256 = "1hzn11nairaj1n20znhgnsg43cxl2l1cqb55gixq0bkkkj2ygl6b"; - revision = "1"; - editedCabalFile = "0jx9x76xg38ibfnhrrghnx2vqnrk3myl33ncrhml8jyn32dsqbx0"; + version = "1.3.8.4"; + sha256 = "0r10g7a68r5asjgs5r0zpjzq0qiqf5i8h5bmaylpm6ikwnj9irx4"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -90608,23 +91027,23 @@ self: { }) {}; "dnf-repo" = callPackage - ({ mkDerivation, base, directory, extra, filepath, Glob + ({ mkDerivation, base, curl, directory, extra, filepath, Glob , http-directory, simple-cmd, simple-cmd-args, simple-prompt }: mkDerivation { pname = "dnf-repo"; - version = "0.5.5"; - sha256 = "0yj0dizzdhrb44hzr7b6pa5wy5bik4m8pz6ckx4r3lg9rkgqhjfk"; + version = "0.6"; + sha256 = "1420jj5kmvj2h3ix8v6hmf4fdkzn1ixbvxg9fi7zfdfll7831gk0"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base directory extra filepath Glob http-directory simple-cmd + base curl directory extra filepath Glob http-directory simple-cmd simple-cmd-args simple-prompt ]; testHaskellDepends = [ base simple-cmd ]; - description = "DNF wrapper tool to control repos"; - license = lib.licenses.bsd3; + description = "A dnf wrapper with fine control of enabled repos"; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "dnf-repo"; }) {}; @@ -91452,8 +91871,8 @@ self: { }: mkDerivation { pname = "doctest-parallel"; - version = "0.3.1"; - sha256 = "0lbiwi2jc6d68hhkvsgwhrwrbhw9f56r2mqnp7l6i779gpzdriqd"; + version = "0.3.1.1"; + sha256 = "1xpk020024vsqh27sp225hx50i1hn5fkhxiyww6wqnhrkxypjkwa"; libraryHaskellDepends = [ base base-compat Cabal code-page containers deepseq directory exceptions filepath ghc ghc-paths Glob process random syb @@ -92277,8 +92696,8 @@ self: { ({ mkDerivation, base, Cabal-syntax, text }: mkDerivation { pname = "double-x-encoding"; - version = "1.1.1"; - sha256 = "1y9grxp9xbjx4ldx6idmzy275wkr2jgajf6dki96janiwcjwmnym"; + version = "1.2.1"; + sha256 = "0sg8sh9a1krzfhdwxcd3ja56kzr6hif11s4iqicrdqz3qgi905ia"; libraryHaskellDepends = [ base Cabal-syntax text ]; testHaskellDepends = [ base Cabal-syntax text ]; description = "Encoding scheme to encode any Unicode string with only [0-9a-zA-Z_]"; @@ -93613,8 +94032,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.12.2"; - sha256 = "07qij8dmfawdhzd3aldg2kwy0rrma2yybiwd3w989kfih4mf6mbp"; + version = "0.12.3"; + sha256 = "10262cqc6ynbpvqpa3ijfacwyid4fxqxks6rm68brmqrzdqyh6wk"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -93647,8 +94066,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.12.2"; - sha256 = "093p31bcbpwn4bsz1id946d5mxk2an2akxm2xvpls9vydvm255zw"; + version = "0.12.3"; + sha256 = "0whmsiixv1iid1cd3faz0zib8hv4v09yclq6a7ypz4zyvjyk0szh"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -96046,8 +96465,8 @@ self: { pname = "either"; version = "5.0.2"; sha256 = "1gl748ia68bldbqb2fl7vjv44g0y8ivn659fjmy1qyypgyb5p95z"; - revision = "1"; - editedCabalFile = "1w2rxrj0gc3a7p74pybji8yy2zsjnhxyi4zhlmx4qsyz6w616ggv"; + revision = "2"; + editedCabalFile = "1lx6ls938vssg75ib2fr1ww4nsig2rkhjc6x57yfinx1yb9r62vz"; libraryHaskellDepends = [ base bifunctors mtl profunctors semigroupoids ]; @@ -98655,18 +99074,18 @@ self: { "eo-phi-normalizer" = callPackage ({ mkDerivation, aeson, aeson-pretty, alex, array, base, blaze-html - , blaze-markup, BNFC, Cabal, directory, file-embed, filepath - , generic-lens, happy, hspec, hspec-discover, lens, mtl - , optparse-applicative, process, QuickCheck, scientific + , blaze-markup, BNFC, Cabal, directory, doctest-parallel + , file-embed, filepath, generic-lens, happy, hspec, hspec-discover + , lens, mtl, optparse-applicative, process, QuickCheck, scientific , string-interpolate, template-haskell, text, yaml }: mkDerivation { pname = "eo-phi-normalizer"; - version = "0.3.0"; - sha256 = "00shchphrpr8gasd5vypwk512mdpk1ff4a10jlk63mc3lz7c553c"; + version = "0.3.1"; + sha256 = "0ap9p8ls5k692ldhkpiasnkdq0a33py8kc3i150yjcbqv5falhc3"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal process ]; + setupHaskellDepends = [ base Cabal process string-interpolate ]; libraryHaskellDepends = [ aeson array base blaze-html blaze-markup directory file-embed filepath generic-lens lens mtl scientific string-interpolate @@ -98680,9 +99099,9 @@ self: { ]; executableToolDepends = [ alex BNFC happy ]; testHaskellDepends = [ - aeson array base blaze-html blaze-markup directory file-embed - filepath generic-lens hspec hspec-discover lens mtl QuickCheck - scientific string-interpolate template-haskell text yaml + aeson array base blaze-html blaze-markup directory doctest-parallel + file-embed filepath generic-lens hspec hspec-discover lens mtl + QuickCheck scientific string-interpolate template-haskell text yaml ]; testToolDepends = [ alex BNFC happy hspec-discover ]; description = "Command line normalizer of 𝜑-calculus expressions"; @@ -99215,7 +99634,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Source code error pretty printing"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "errata-example"; + broken = true; }) {}; "errno" = callPackage @@ -101519,17 +101940,17 @@ self: { broken = true; }) {}; - "exceptions_0_10_7" = callPackage + "exceptions_0_10_8" = callPackage ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell , test-framework, test-framework-hunit, test-framework-quickcheck2 , transformers }: mkDerivation { pname = "exceptions"; - version = "0.10.7"; - sha256 = "0jb0ah5k2mb4clhb34c59f615vzl54lhx3hf6njqsgdmr3jashls"; - revision = "2"; - editedCabalFile = "14zz1abaj62p7f0gmnxr2ss1cpciin64zy7yz3vhkcvy1k00ynm8"; + version = "0.10.8"; + sha256 = "125mgcw94x7d47ps0lkiq0g2hzzfjkmcq3gfkbi7w78az0sdjq4d"; + revision = "1"; + editedCabalFile = "0rxaahjp8zmp3xhdvvfgkb9qz1j9vsjgr9gz2jxnq69nbnrxj7y3"; libraryHaskellDepends = [ base mtl stm template-haskell transformers ]; @@ -102907,8 +103328,8 @@ self: { }: mkDerivation { pname = "extism"; - version = "1.2.0.3"; - sha256 = "12kaar2jhhxg7pkq5hll7w2iqrahp4d8qw76qypzhqnhzv4s9zmc"; + version = "1.2.1.0"; + sha256 = "0x2vwc5r812i3jk7z9y8qfkxlq3acqv560y1z97fsahkb1frydqy"; libraryHaskellDepends = [ base binary bytestring extism-manifest json uuid ]; @@ -102924,8 +103345,8 @@ self: { ({ mkDerivation, base, base64-bytestring, bytestring, json }: mkDerivation { pname = "extism-manifest"; - version = "1.2.0.3"; - sha256 = "07ypncyml5p1p0yy3x45s8gj5vz8z0xjzpcy2q8mdxpk5qgaa6z1"; + version = "1.2.1.0"; + sha256 = "1jxv93grdvr02q7gqg1gg9vqjirn3z84x8992zz3spgf4p1h2f2i"; libraryHaskellDepends = [ base base64-bytestring bytestring json ]; description = "Extism manifest bindings"; license = lib.licenses.bsd3; @@ -103547,8 +103968,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.1.2.6"; - sha256 = "1ddzq4pxx6blvqa2s6y7jmx6s49g9ckywiidi2hvq7r0dympsz03"; + version = "1.1.2.7"; + sha256 = "057rrfrfxa5xsv9pqy3jsx5gzrg0lwcx50w0hlwvkgpzlxnfch30"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103642,6 +104063,7 @@ self: { ]; description = "Property-based testing with internal integrated shrinking"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "familiar-reflection" = callPackage @@ -105170,20 +105592,20 @@ self: { "feedback" = callPackage ({ mkDerivation, autodocodec, autodocodec-yaml, base, bytestring , conduit, containers, envparse, fsnotify, optparse-applicative - , path, path-io, pretty-show, safe-coloured-text + , path, path-io, pretty-show, process, safe-coloured-text , safe-coloured-text-layout, safe-coloured-text-terminfo, text , time, typed-process, unix, unliftio, yaml }: mkDerivation { pname = "feedback"; - version = "0.1.0.4"; - sha256 = "0x7c8jr2mrvkfjxw919fkwngkxzbwly1xi1c1z4i0finkzfz8x6w"; + version = "0.1.0.5"; + sha256 = "0g15yinnxh8x0dknhfjpy88z5bzary8midj5qskrbkyqbvkni20l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ autodocodec autodocodec-yaml base bytestring conduit containers envparse fsnotify optparse-applicative path path-io pretty-show - safe-coloured-text safe-coloured-text-layout + process safe-coloured-text safe-coloured-text-layout safe-coloured-text-terminfo text time typed-process unix unliftio yaml ]; @@ -106228,6 +106650,8 @@ self: { pname = "filepath"; version = "1.5.2.0"; sha256 = "19vq749100f1nfjn9cpw99wx392x6rf439ly5lm965w5zas6sq6j"; + revision = "1"; + editedCabalFile = "16j1jjkf1rlyqwndpv6kphyc5s3ffqmh155f8j6xrvd7rd1sixwa"; libraryHaskellDepends = [ base bytestring deepseq exceptions os-string template-haskell ]; @@ -109158,8 +109582,8 @@ self: { pname = "foldable1-classes-compat"; version = "0.1"; sha256 = "04pzjppmb195ffgxdzh8dh39z5dalr5wd6sifcnbg9p1b3rw6myh"; - revision = "4"; - editedCabalFile = "0kpsp659y563h2vanhrdnbza9skq1j9sm6y3fg2j4p1xsgnkqjzv"; + revision = "6"; + editedCabalFile = "13g7igqcq6nr0sqschzm7scrpq90nhjjkjq1866ww8ikkq7w9wgj"; libraryHaskellDepends = [ base ghc-prim tagged ]; testHaskellDepends = [ base containers QuickCheck quickcheck-instances test-framework @@ -112077,6 +112501,30 @@ self: { broken = true; }) {}; + "fsnotify_0_3_0_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , filepath, hinotify, random, shelly, tasty, tasty-hunit, temporary + , text, time, unix, unix-compat + }: + mkDerivation { + pname = "fsnotify"; + version = "0.3.0.1"; + sha256 = "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny"; + revision = "2"; + editedCabalFile = "12m0y5583plk9pikvwqy1rc0yyvicxf8j5nz0nwxb4grsgfqrv7v"; + libraryHaskellDepends = [ + async base bytestring containers directory filepath hinotify shelly + text time unix unix-compat + ]; + testHaskellDepends = [ + async base directory filepath random tasty tasty-hunit temporary + unix-compat + ]; + description = "Cross platform library for file change notification"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fsnotify" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , exceptions, filepath, hinotify, monad-control, random, retry @@ -112269,6 +112717,8 @@ self: { pname = "ftp-client"; version = "0.5.1.5"; sha256 = "08sxbk4s3prh22b1c19cv571fgdc5k9347i17jqmvfwjl3lkv5w7"; + revision = "1"; + editedCabalFile = "09ri1dqkmy1hipssy3shy15lb0gyswc2r6ji71mbvy3lv71n4wjh"; libraryHaskellDepends = [ attoparsec base bytestring containers crypton-connection exceptions network transformers @@ -113208,7 +113658,6 @@ self: { ]; description = "A fused-effects adapter for squeal-postgresql"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-th" = callPackage @@ -114121,8 +114570,6 @@ self: { ]; description = "Automatically spin up and spin down local daemons"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "gargoyle-postgresql" = callPackage @@ -114144,7 +114591,6 @@ self: { ]; description = "Manage PostgreSQL servers with gargoyle"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "gargoyle-postgresql-connect" = callPackage @@ -114162,7 +114608,6 @@ self: { ]; description = "Connect to gargoyle-managed postgresql instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "gargoyle-postgresql-nix" = callPackage @@ -114183,7 +114628,6 @@ self: { ]; description = "Manage PostgreSQL servers with gargoyle and nix"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "garlic-bread" = callPackage @@ -115287,8 +115731,8 @@ self: { ({ mkDerivation, base, contravariant, text }: mkDerivation { pname = "generic-data-functions"; - version = "0.5.0"; - sha256 = "0qjbwn0b59i5lrq26v36ai7z8xckid3gjz33w6l0kq1cvpfvzrnx"; + version = "0.5.1"; + sha256 = "1yw9v9s9nsz492d6v4sfi0s9nm3mq2kvxn4q9y01s7fwabdijpk1"; libraryHaskellDepends = [ base contravariant text ]; description = "Familiar functions lifted to generic data types"; license = lib.licenses.mit; @@ -115759,6 +116203,29 @@ self: { broken = true; }) {}; + "generic-type-asserts" = callPackage + ({ mkDerivation, base, type-spec }: + mkDerivation { + pname = "generic-type-asserts"; + version = "0.3.0"; + sha256 = "1xsr6syv85rwzrfyqgjhv751fc2njbmq0a36wnil19p08nrzbrmr"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base type-spec ]; + description = "Structural assertions on generic type representations"; + license = lib.licenses.mit; + }) {}; + + "generic-type-functions" = callPackage + ({ mkDerivation, base, defun-core }: + mkDerivation { + pname = "generic-type-functions"; + version = "0.1.0"; + sha256 = "0li28kwaidcpn0n8j40jp6i9yyb473w68c31vqlf8xrzgc7lmjls"; + libraryHaskellDepends = [ base defun-core ]; + description = "Familiar functions lifted to type-level functions on generic types"; + license = lib.licenses.mit; + }) {}; + "generic-xml" = callPackage ({ mkDerivation, base, HaXml, mtl, syb-with-class, template-haskell }: @@ -117618,21 +118085,23 @@ self: { }) {}; "ghc-debug-brick" = callPackage - ({ mkDerivation, base, brick, containers, contra-tracer, deepseq - , directory, exceptions, filepath, ghc-debug-client - , ghc-debug-common, ghc-debug-convention, microlens - , microlens-platform, text, time, unordered-containers, vty + ({ mkDerivation, base, brick, bytestring, byteunits, containers + , contra-tracer, deepseq, directory, exceptions, filepath + , ghc-debug-client, ghc-debug-common, ghc-debug-convention + , microlens, microlens-platform, text, time, unordered-containers + , vty, vty-crossplatform }: mkDerivation { pname = "ghc-debug-brick"; - version = "0.5.0.0"; - sha256 = "1k5gl9paz5z8w9h49ilpjxk0k73qyk2rwncnfhx11b64y2n74w2m"; + version = "0.6.0.0"; + sha256 = "0mmy484sj89g5y69j7lgcczipmmhlra7kmv230kg3380mh3r1ndv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base brick containers contra-tracer deepseq directory exceptions - filepath ghc-debug-client ghc-debug-common ghc-debug-convention - microlens microlens-platform text time unordered-containers vty + base brick bytestring byteunits containers contra-tracer deepseq + directory exceptions filepath ghc-debug-client ghc-debug-common + ghc-debug-convention microlens microlens-platform text time + unordered-containers vty vty-crossplatform ]; description = "A simple TUI using ghc-debug"; license = lib.licenses.bsd3; @@ -117645,17 +118114,17 @@ self: { , containers, contra-tracer, directory, dom-lt, filepath , ghc-debug-common, ghc-debug-convention, ghc-prim, hashable , language-dot, monoidal-containers, mtl, network, process - , psqueues, stm, text, unordered-containers + , psqueues, stm, text, unordered-containers, vector }: mkDerivation { pname = "ghc-debug-client"; - version = "0.5.0.0"; - sha256 = "0djv1y0fxg0vzr0baxml023i3a9di2zy0xhyxqg8wb0j9k5pszh0"; + version = "0.6.0.0"; + sha256 = "0002w48g4fw053vwzdi5l1qaglr6035jnmxajd8i9c1ppz09q8kn"; libraryHaskellDepends = [ async base binary bitwise bytestring containers contra-tracer directory dom-lt filepath ghc-debug-common ghc-debug-convention ghc-prim hashable language-dot monoidal-containers mtl network - process psqueues stm text unordered-containers + process psqueues stm text unordered-containers vector ]; description = "Useful functions for writing heap analysis tools which use ghc-debug"; license = lib.licenses.bsd3; @@ -117664,15 +118133,15 @@ self: { "ghc-debug-common" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, cpu , deepseq, directory, dom-lt, filepath, ghc-debug-convention - , ghc-heap, hashable, transformers, unordered-containers + , hashable, transformers, unordered-containers }: mkDerivation { pname = "ghc-debug-common"; - version = "0.5.0.0"; - sha256 = "0x2phkcnbfybkfy94g6jyc1s4wcls1r8ws4b5wnjl58pf8q09ni2"; + version = "0.6.0.0"; + sha256 = "1i2212qd7qvighvrb8x7hb6fisg3fb6vr49xgdcv66wrclj9n0hd"; libraryHaskellDepends = [ array base binary bytestring containers cpu deepseq directory - dom-lt filepath ghc-debug-convention ghc-heap hashable transformers + dom-lt filepath ghc-debug-convention hashable transformers unordered-containers ]; description = "Connect to a socket created by ghc-debug-stub and analyse the heap of the debuggee program"; @@ -117683,8 +118152,8 @@ self: { ({ mkDerivation, base, directory, filepath }: mkDerivation { pname = "ghc-debug-convention"; - version = "0.5.0.0"; - sha256 = "1hg2b3g7nqba5y4s1imaikx9y8vm4i6cb47nbnp07zwqg9zjlq3k"; + version = "0.6.0.0"; + sha256 = "0iwjfqxl0q6kja2zzrv3ypcc39vyc9cfaab83854jd1qi9vffkm9"; libraryHaskellDepends = [ base directory filepath ]; description = "Definitions needed by ghc-debug-stub and ghc-debug-common"; license = lib.licenses.bsd3; @@ -117696,8 +118165,8 @@ self: { }: mkDerivation { pname = "ghc-debug-stub"; - version = "0.5.0.0"; - sha256 = "1ykwfp841wbnqgsvvspixr95ars1np2khjlzycmb3q7cxv2xn2lw"; + version = "0.6.0.0"; + sha256 = "0cajxbz0lfin2vm9cs4ap7h2s4wxynrp606aqbnlj4m5x1yp6fp0"; libraryHaskellDepends = [ base directory filepath ghc-debug-convention ghc-prim ]; @@ -119551,7 +120020,7 @@ self: { license = lib.licenses.mit; }) {}; - "ghcjs-base_0_8_0_0" = callPackage + "ghcjs-base" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghcjs-base"; @@ -119559,7 +120028,6 @@ self: { sha256 = "1bbgvyw4vbwi7whidldrxi46hjx9hsg3hp6l2py30528n7hfdpdp"; description = "base library for GHCJS"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ghcjs-base-stub" = callPackage @@ -119628,7 +120096,6 @@ self: { description = "GHCJS DOM Hello World, an example package"; license = lib.licenses.mit; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; }) {}; "ghcjs-dom-javascript" = callPackage @@ -121805,34 +122272,32 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, aws, base - , blaze-builder, bloomfilter, bup, byteable, bytestring, Cabal + , blaze-builder, bloomfilter, byteable, bytestring, Cabal , case-insensitive, clientsession, concurrent-output, conduit - , containers, crypto-api, crypton, curl, data-default, DAV, dbus - , deepseq, directory, disk-free-space, dlist, edit-distance - , exceptions, fdo-notify, feed, filepath, filepath-bytestring, free - , git, git-lfs, gnupg, hinotify, http-client - , http-client-restricted, http-client-tls, http-conduit, http-types - , IfElse, lsof, magic, memory, microlens, monad-control - , monad-logger, mountpoints, mtl, network, network-bsd - , network-info, network-multicast, network-uri, old-locale, openssh - , optparse-applicative, path-pieces, perl, persistent + , containers, crypto-api, crypton, data-default, DAV, dbus, deepseq + , directory, disk-free-space, dlist, edit-distance, exceptions + , fdo-notify, feed, filepath, filepath-bytestring, free, git-lfs + , hinotify, http-client, http-client-restricted, http-client-tls + , http-conduit, http-types, IfElse, magic, memory, microlens + , monad-control, monad-logger, mountpoints, mtl, network + , network-bsd, network-info, network-multicast, network-uri + , old-locale, optparse-applicative, path-pieces, persistent , persistent-sqlite, persistent-template, process, QuickCheck - , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi - , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup - , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun - , template-haskell, text, time, torrent, transformers, unix - , unix-compat, unliftio-core, unordered-containers, utf8-string - , uuid, vector, wai, wai-extra, warp, warp-tls, wget, which, yesod - , yesod-core, yesod-form, yesod-static + , random, regex-tdfa, resourcet, SafeSemaphore, sandi, securemem + , shakespeare, socks, split, stm, stm-chans, tagsoup, tasty + , tasty-hunit, tasty-quickcheck, tasty-rerun, template-haskell + , text, time, torrent, transformers, unix, unix-compat + , unliftio-core, unordered-containers, utf8-string, uuid, vector + , wai, wai-extra, warp, warp-tls, yesod, yesod-core, yesod-form + , yesod-static }: mkDerivation { pname = "git-annex"; version = "10.20240227"; sha256 = "07py6xfss8jpw5yhvj203g4yd7qqx600j20hz0kqk80dpn7i3nqq"; configureFlags = [ - "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" - "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" - "-fwebapp" "-fwebdav" + "-fassistant" "-f-benchmark" "-fcrypton" "-fdbus" "-f-debuglocks" + "-fmagicmime" "-fpairing" "-fproduction" "-ftorrentparser" ]; isLibrary = false; isExecutable = true; @@ -121859,25 +122324,11 @@ self: { utf8-string uuid vector wai wai-extra warp warp-tls yesod yesod-core yesod-form yesod-static ]; - executableSystemDepends = [ - bup curl git gnupg lsof openssh perl rsync wget which - ]; - preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; - postBuild = '' - ln -sf dist/build/git-annex/git-annex git-annex - ln -sf git-annex git-annex-shell - ''; - installPhase = "make PREFIX=$out BUILDER=: install install-completions"; - checkPhase = ''PATH+=":$PWD" git-annex test''; - enableSharedExecutables = false; description = "manage files with git, without checking their contents into git"; license = lib.licenses.agpl3Only; mainProgram = "git-annex"; maintainers = [ lib.maintainers.peti lib.maintainers.roosemberth ]; - }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; - inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; - inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; - inherit (pkgs) which;}; + }) {}; "git-brunch" = callPackage ({ mkDerivation, base, brick, extra, hspec, microlens @@ -129291,10 +129742,10 @@ self: { }: mkDerivation { pname = "grisette"; - version = "0.4.1.0"; - sha256 = "00nkg8mz0mi5d0zvjxn7jj149nvjpzcflpqv2f4p8kbis95iccm8"; + version = "0.5.0.1"; + sha256 = "0wrvasr5kbz27ddwlmpxwzda4ya5phyn21hwi2ci7xgcfb0q3szh"; revision = "2"; - editedCabalFile = "0jkilmbz5drg1vrzc6zy6d6axw4fcq7bgqwsrdf6c917pmciip6q"; + editedCabalFile = "0sihj9hivxc3w3fr8yc8bp6wnphjspvm1fwgzx3iimsw26vb21cd"; libraryHaskellDepends = [ array async base bytestring deepseq generic-deriving hashable hashtables intern loch-th mtl parallel prettyprinter QuickCheck sbv @@ -130875,8 +131326,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "5.1.1.0"; - sha256 = "1jbdrgdvzap5i67509qdmy669cijf94wa5a96cnc2626yvjirycc"; + version = "5.1.3.0"; + sha256 = "11m93r38i9ncb036rpm56qd03hcyfvgx6a1h0lynlbg8mfd4hg19"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130962,6 +131413,26 @@ self: { broken = true; }) {}; + "h3spec" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-core, http-types + , http3, network, quic, tls, unliftio + }: + mkDerivation { + pname = "h3spec"; + version = "0.1.10"; + sha256 = "0cqqhskk4rip3j903ynml1dcbm2v8si15c2kfwy2l42rj2fj0s1g"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring hspec hspec-core http-types http3 network quic tls + unliftio + ]; + description = "QUIC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "h3spec"; + }) {}; + "hArduino" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, serialport , time @@ -132150,20 +132621,18 @@ self: { "hackage-repo-tool" = callPackage ({ mkDerivation, base, bytestring, Cabal, Cabal-syntax, directory , filepath, hackage-security, microlens, network, network-uri - , old-time, optparse-applicative, tar, time, unix, zlib + , optparse-applicative, tar, time, unix, zlib }: mkDerivation { pname = "hackage-repo-tool"; - version = "0.1.1.3"; - sha256 = "13q81gi3xmkzwfrbyk5dwxws3c92vnrlslksi021iasmjwhw2h6l"; - revision = "6"; - editedCabalFile = "0a3ylq1r8zsvh34cjg2vqdx7r8ykla4myzjhv5vnc1bpq34bw5y8"; + version = "0.1.1.4"; + sha256 = "1nqm6rri8rkhrqvppyzy04s3875c4wjcay8gny4ygbr65c6iw81v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring Cabal Cabal-syntax directory filepath - hackage-security microlens network network-uri old-time - optparse-applicative tar time unix zlib + hackage-security microlens network network-uri optparse-applicative + tar time unix zlib ]; description = "Manage secure file-based package repositories"; license = lib.licenses.bsd3; @@ -132213,6 +132682,8 @@ self: { pname = "hackage-security"; version = "0.6.2.6"; sha256 = "0sfvd5y9v01bjsxsrf446ldcqf56arzr94jk2zsvj49yddbn2hif"; + revision = "1"; + editedCabalFile = "05jbc1wv5njv4jdqfiq12y1cni7fa1qis1g5z03dg6jg64j0bxwg"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -132235,10 +132706,8 @@ self: { }: mkDerivation { pname = "hackage-security-HTTP"; - version = "0.1.1.1"; - sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2"; - revision = "8"; - editedCabalFile = "14y8lj2gbm19swc3z3wi0slc2ax61gnzgpyzmrxay4zjqsv6qfvc"; + version = "0.1.1.2"; + sha256 = "0nsnn0lnnpvvfwgl480vhbmf4pfc11h128y252lslnlhzj1c66l3"; libraryHaskellDepends = [ base bytestring hackage-security HTTP mtl network network-uri zlib ]; @@ -133276,8 +133745,8 @@ self: { pname = "hakyll"; version = "4.16.2.0"; sha256 = "1p3x9f1ha6dkis71nzbxh1h7mzldsj4qvmfx3f0vng7y1ydlcw0z"; - revision = "5"; - editedCabalFile = "01ny9jsz0drdh497pvhlnwxn946db8a1qc1fxy96l3pjc6plvxcb"; + revision = "6"; + editedCabalFile = "1pdasij9bz7pzfb9f3lvvixzch7ac3xhqqx5cd3wjl40annawsaw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -133603,8 +134072,8 @@ self: { }: mkDerivation { pname = "hakyll-images"; - version = "1.2.1"; - sha256 = "08vbkjf3nnl7dwz5r4vzgbylpql0b3xgnw7ivhxmc2k2sqzgs2rp"; + version = "1.2.2"; + sha256 = "10pn4hk9gzlz92jxln6zj2i5vg42n369njzlrhbxf50dlgy4x05q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring hakyll JuicyPixels JuicyPixels-extra @@ -133861,8 +134330,8 @@ self: { pname = "half"; version = "0.3.1"; sha256 = "1l8m2spqg0ac50qys2jk5b32v6wxklbbk5ypjp3ga6z14hkw7bz2"; - revision = "1"; - editedCabalFile = "0z0sdic28ji6lq9hz9fh534igy6g3g7b1q799cmwkga23dkicgzl"; + revision = "2"; + editedCabalFile = "01yv2wdiljx7nsija2dgxim0h9fca7c47nw3jrhy2n3gpcnsrfdn"; libraryHaskellDepends = [ base binary deepseq template-haskell ]; testHaskellDepends = [ base binary bytestring QuickCheck test-framework @@ -136940,7 +137409,6 @@ self: { ]; description = "Haskell Application BlockChain Interface (ABCI) Server Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "haskell-abci-counter"; }) {}; @@ -139524,8 +139992,8 @@ self: { }: mkDerivation { pname = "haskellish"; - version = "0.3.2.2"; - sha256 = "07h421qychchii79s2cbpcfvh6h8qipd6wl9qn5jkdg9d2gycc34"; + version = "0.3.2.3"; + sha256 = "0hvnyrh5i6iwzlisdqv0cw952w2kxs1k9c9yc7qmvwr01wfm88lr"; libraryHaskellDepends = [ base containers haskell-src-exts mtl template-haskell text ]; @@ -140106,8 +140574,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.5.0"; - sha256 = "01lrrbz6811jcj47bj2ah0i23jkx2gdl326s2hx03rvfnygbz1bq"; + version = "1.5.2"; + sha256 = "0yqmhzp0056y5ws4qxps90brcyczpmh02vxq9mszf36kqzgpbgyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141067,19 +141535,20 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.6.4.3"; - sha256 = "1qy50xnpbikvqqv82wqy9491fgvnl8721xszvjyfhw4r7bf0gn3n"; + version = "1.6.4.4"; + sha256 = "1mwr9v5q5wvf1bk4lc7pdyyqf26snw23mxsz0j4mnrk7ybk6daad"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-strict-builder contravariant dlist hashable hashtables mtl network-ip - postgresql-binary postgresql-libpq profunctors scientific text - text-builder time transformers uuid vector + postgresql-binary postgresql-libpq profunctors rerebase scientific + text text-builder time transformers uuid vector ]; testHaskellDepends = [ contravariant-extras quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ criterion rerebase ]; + doHaddock = false; description = "An efficient PostgreSQL driver with a flexible mapping API"; license = lib.licenses.mit; }) {}; @@ -141325,8 +141794,8 @@ self: { }: mkDerivation { pname = "hasql-notifications"; - version = "0.2.1.0"; - sha256 = "0f415g6y13sndyn66ssj0hfrqm6l5p1r48v2lix0cvi1gkrv9wm2"; + version = "0.2.1.1"; + sha256 = "0pw9m72b2rxg9yiirz48260ypgqzn8icarq0rj3sdzs7b255s6m5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141401,14 +141870,14 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-pool_1_0_1" = callPackage + "hasql-pool_1_1" = callPackage ({ mkDerivation, async, base, bytestring, hasql, hspec, random , rerebase, stm, text, time, uuid }: mkDerivation { pname = "hasql-pool"; - version = "1.0.1"; - sha256 = "1z14fdpw1vjr07xz9mjv04i4implk71l61b1p3b1kl34zgvllg1y"; + version = "1.1"; + sha256 = "0hqr2l7yasbrb17xs000d4rzjg18y56basw4rfydzphl9yf5ihil"; libraryHaskellDepends = [ base bytestring hasql stm text time uuid ]; @@ -142170,9 +142639,7 @@ self: { ]; description = "Library for checking for weak/compromised passwords"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "readme"; - broken = true; }) {}; "haven" = callPackage @@ -142380,8 +142847,8 @@ self: { pname = "haxr"; version = "3000.11.5"; sha256 = "1n2q7r0a6c24xbvdnl7ql5cc25sbbalmdc75rmlpazhkazq8jy99"; - revision = "2"; - editedCabalFile = "0nra68lczd019nxcgdxh82k6h846dwjd14k9ql1ngh6g35sq9hdq"; + revision = "3"; + editedCabalFile = "1a14kyf9lv2jw8pvb0ypcmmcks9jqbnpf485g005s3wnggd7w7wr"; libraryHaskellDepends = [ array base base-compat base64-bytestring blaze-builder bytestring HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat @@ -144060,7 +144527,6 @@ self: { ]; description = "Release with confidence"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "hedgehog-checkers" = callPackage @@ -144129,13 +144595,14 @@ self: { ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring , deepseq, Diff, directory, exceptions, filepath, hedgehog , http-conduit, lifted-async, lifted-base, mmorph, monad-control - , mtl, network, process, resourcet, stm, tar, temporary, text, time - , transformers, transformers-base, unliftio, yaml, zlib + , mtl, network, process, resourcet, stm, tar, tasty, tasty-discover + , tasty-hedgehog, temporary, text, time, transformers + , transformers-base, unliftio, yaml, zlib }: mkDerivation { pname = "hedgehog-extras"; - version = "0.6.1.0"; - sha256 = "1j0b78l1dbffwgmkjlxcycccgl62gglc0cmmbdmgaxr75hmdcm2d"; + version = "0.6.2.0"; + sha256 = "0rnfp09q7pdzrs4f7yrbrklnjs8h2zk621wiclchmd1wgc06qwdh"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring deepseq Diff directory exceptions filepath hedgehog http-conduit lifted-async lifted-base @@ -144143,6 +144610,10 @@ self: { temporary text time transformers transformers-base unliftio yaml zlib ]; + testHaskellDepends = [ + base hedgehog network tasty tasty-hedgehog + ]; + testToolDepends = [ tasty-discover ]; description = "Supplemental library for hedgehog"; license = lib.licenses.asl20; }) {}; @@ -144645,6 +145116,8 @@ self: { pname = "heist"; version = "1.1.1.2"; sha256 = "1377740si611j0szp64axy0xj1fi2a6w8i9s3xij89h34m7rb3rz"; + revision = "1"; + editedCabalFile = "0glg856n9w1pf74d0kr3v10saw26z54j32mb12hd3xqh8xq34lf6"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -147499,6 +147972,41 @@ self: { mainProgram = "hie-bios"; }) {}; + "hie-bios_0_14_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , co-log-core, conduit, conduit-extra, cryptohash-sha1, deepseq + , directory, exceptions, extra, file-embed, filepath, ghc + , optparse-applicative, prettyprinter, tasty + , tasty-expected-failure, tasty-hunit, template-haskell, temporary + , text, time, transformers, unix-compat, unordered-containers, yaml + }: + mkDerivation { + pname = "hie-bios"; + version = "0.14.0"; + sha256 = "1caszgj3x3l13q6w26snx49yqyzjfgiik4403gl3mfalkrgbvk2g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring co-log-core conduit + conduit-extra cryptohash-sha1 deepseq directory exceptions extra + file-embed filepath ghc prettyprinter template-haskell temporary + text time transformers unix-compat unordered-containers yaml + ]; + executableHaskellDepends = [ + base co-log-core directory filepath optparse-applicative + prettyprinter + ]; + testHaskellDepends = [ + aeson base co-log-core directory extra filepath ghc prettyprinter + tasty tasty-expected-failure tasty-hunit temporary transformers + yaml + ]; + description = "Set up a GHC API session"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hie-bios"; + }) {}; + "hie-compat" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, ghc, ghc-boot, transformers @@ -149574,6 +150082,54 @@ self: { ]; }) {}; + "hledger_1_33" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs + , containers, data-default, Decimal, Diff, directory, extra + , filepath, githash, hashable, haskeline, hledger-lib, lucid + , math-functions, megaparsec, microlens, mtl, process, regex-tdfa + , safe, shakespeare, split, tabular, tasty, temporary, terminfo + , text, text-ansi, time, timeit, transformers, unordered-containers + , utf8-string, utility-ht, wizards + }: + mkDerivation { + pname = "hledger"; + version = "1.33"; + sha256 = "118pk5vgj8k1g4lkvknhrf5vid4y7dvs3b5g5q6wf5j9g0kya1wi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers data-default + Decimal Diff directory extra filepath githash hashable haskeline + hledger-lib lucid math-functions megaparsec microlens mtl process + regex-tdfa safe shakespeare split tabular tasty temporary terminfo + text text-ansi time timeit transformers unordered-containers + utf8-string utility-ht wizards + ]; + executableHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers data-default + Decimal directory extra filepath githash haskeline hledger-lib + math-functions megaparsec microlens mtl process regex-tdfa safe + shakespeare split tabular tasty temporary terminfo text text-ansi + time timeit transformers unordered-containers utf8-string + utility-ht wizards + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers data-default + Decimal directory extra filepath githash haskeline hledger-lib + math-functions megaparsec microlens mtl process regex-tdfa safe + shakespeare split tabular tasty temporary terminfo text text-ansi + time timeit transformers unordered-containers utf8-string + utility-ht wizards + ]; + description = "Command-line interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "hledger"; + maintainers = [ + lib.maintainers.maralorn lib.maintainers.sternenseemann + ]; + }) {}; + "hledger-api" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , Decimal, docopt, either, hledger, hledger-lib, microlens @@ -149701,6 +150257,42 @@ self: { broken = true; }) {}; + "hledger-iadd_1_3_21" = callPackage + ({ mkDerivation, base, brick, containers, directory, free + , hledger-lib, hspec, hspec-discover, megaparsec, microlens + , microlens-mtl, microlens-th, optparse-applicative, QuickCheck + , quickcheck-instances, text, text-zipper, time, transformers + , unordered-containers, vector, vty, xdg-basedir + }: + mkDerivation { + pname = "hledger-iadd"; + version = "1.3.21"; + sha256 = "00x0vbfp08kqs1nbknndk9h56hcidf6xnrk0ldz45dvjrmgcv3w2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base brick containers directory free hledger-lib megaparsec + microlens microlens-mtl microlens-th optparse-applicative text + text-zipper time transformers unordered-containers vector vty + xdg-basedir + ]; + executableHaskellDepends = [ + base brick directory free hledger-lib megaparsec microlens + microlens-mtl microlens-th optparse-applicative text text-zipper + time transformers unordered-containers vector vty xdg-basedir + ]; + testHaskellDepends = [ + base free hledger-lib hspec megaparsec QuickCheck + quickcheck-instances text text-zipper time transformers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "A terminal UI as drop-in replacement for hledger add"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hledger-iadd"; + broken = true; + }) {}; + "hledger-interest" = callPackage ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time }: @@ -149708,8 +150300,8 @@ self: { pname = "hledger-interest"; version = "1.6.6"; sha256 = "0hklpg9sgghrcvkrgz7kfr8jc6kwsv8zzpbbg0c3idhbdxwg74d8"; - revision = "2"; - editedCabalFile = "0bb1bhybiaih7fc54y3n24xrcpxv6k6iccv2c6byypbcv4jx8m8d"; + revision = "3"; + editedCabalFile = "0yywynp3yrdssh2vr7jwp0izr890hfn9kjy6cl9ad8mx1qfyg771"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -149781,6 +150373,46 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "hledger-lib_1_33" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base + , base-compat, blaze-markup, bytestring, call-stack, cassava + , cassava-megaparsec, cmdargs, colour, containers, data-default + , Decimal, deepseq, directory, doclayout, extra, file-embed + , filepath, Glob, hashtables, megaparsec, microlens, microlens-th + , mtl, pager, parser-combinators, pretty-simple, regex-tdfa, safe + , tabular, tasty, tasty-hunit, template-haskell, terminal-size + , text, text-ansi, time, timeit, transformers, uglymemo + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "hledger-lib"; + version = "1.33"; + sha256 = "15f1wqb0zsrn491lfv0ryiy04fah5sifig7n4rvj53m02shrn35r"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal array base base-compat + blaze-markup bytestring call-stack cassava cassava-megaparsec + cmdargs colour containers data-default Decimal deepseq directory + doclayout extra file-embed filepath Glob hashtables megaparsec + microlens microlens-th mtl pager parser-combinators pretty-simple + regex-tdfa safe tabular tasty tasty-hunit template-haskell + terminal-size text text-ansi time timeit transformers uglymemo + unordered-containers utf8-string + ]; + testHaskellDepends = [ + aeson aeson-pretty ansi-terminal array base base-compat + blaze-markup bytestring call-stack cassava cassava-megaparsec + cmdargs colour containers data-default Decimal deepseq directory + doclayout extra file-embed filepath Glob hashtables megaparsec + microlens microlens-th mtl pager parser-combinators pretty-simple + regex-tdfa safe tabular tasty tasty-hunit template-haskell + terminal-size text text-ansi time timeit transformers uglymemo + unordered-containers utf8-string + ]; + description = "A library providing the core functionality of hledger"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "hledger-makeitso" = callPackage ({ mkDerivation, base, containers, foldl, HUnit, stm, text, time , turtle @@ -149861,6 +150493,33 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "hledger-ui_1_33" = callPackage + ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs + , containers, data-default, directory, doclayout, extra, filepath + , fsnotify, hledger, hledger-lib, megaparsec, microlens + , microlens-platform, mtl, process, safe, split, text, text-zipper + , time, transformers, unix, vector, vty, vty-crossplatform + }: + mkDerivation { + pname = "hledger-ui"; + version = "1.33"; + sha256 = "1zdysls1jng3rlxjb90dmiz4iavgaf656kkljld6q15575v5f3qj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal async base brick cmdargs containers data-default + directory doclayout extra filepath fsnotify hledger hledger-lib + megaparsec microlens microlens-platform mtl process safe split text + text-zipper time transformers unix vector vty vty-crossplatform + ]; + executableHaskellDepends = [ base ]; + description = "Terminal interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "hledger-ui"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "hledger-vty" = callPackage ({ mkDerivation, base, cmdargs, hledger, hledger-lib, HUnit, safe , time, vty @@ -149918,6 +150577,42 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "hledger-web_1_33" = callPackage + ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup + , bytestring, case-insensitive, clientsession, cmdargs, conduit + , conduit-extra, containers, data-default, Decimal, directory + , extra, filepath, hjsmin, hledger, hledger-lib, hspec, http-client + , http-conduit, http-types, megaparsec, mtl, network, safe + , shakespeare, template-haskell, text, time, transformers + , unix-compat, unordered-containers, utf8-string, wai, wai-cors + , wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core + , yesod-form, yesod-static, yesod-test + }: + mkDerivation { + pname = "hledger-web"; + version = "1.33"; + sha256 = "1ylfi63yb868ygb5mbp9nvklzdrx169bhfhqnq4w78pipk6kqznk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64 blaze-html blaze-markup bytestring + case-insensitive clientsession cmdargs conduit conduit-extra + containers data-default Decimal directory extra filepath hjsmin + hledger hledger-lib hspec http-client http-conduit http-types + megaparsec mtl network safe shakespeare template-haskell text time + transformers unix-compat unordered-containers utf8-string wai + wai-cors wai-extra wai-handler-launch warp yaml yesod yesod-core + yesod-form yesod-static yesod-test + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Web user interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "hledger-web"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "hlex" = callPackage ({ mkDerivation, base, HUnit, regex-tdfa }: mkDerivation { @@ -151190,7 +151885,6 @@ self: { librarySystemDepends = [ openblasCompat ]; description = "Numeric Linear Algebra"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.maralorn ]; }) {inherit (pkgs) openblasCompat;}; "hmatrix-backprop" = callPackage @@ -153741,8 +154435,8 @@ self: { pname = "horizontal-rule"; version = "0.6.0.0"; sha256 = "03rh58znaghcf1gicbwbxkx5ya4lv7qi8b2lq5nawi35ljars02x"; - revision = "3"; - editedCabalFile = "06jfn80vrss7vz4g3wxbn2cz5x77sm8mw03d9lvchsnxmpw1yhxc"; + revision = "4"; + editedCabalFile = "0bax92xg4rd92y7fv332bqfl6k2wk8k1dbmrgr6a5p4vx36l58f0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base terminal-size text ]; @@ -154507,6 +155201,29 @@ self: { mainProgram = "hpc-codecov"; }) {}; + "hpc-codecov_0_6_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, directory + , filepath, hpc, process, tasty, tasty-golden, tasty-hunit, time + }: + mkDerivation { + pname = "hpc-codecov"; + version = "0.6.0.0"; + sha256 = "1if8nmqv6pcv92ww8ncaxkvaawdr9shmsdsnr9xvzfmhqjq83q7w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring containers directory filepath hpc time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory filepath hpc process tasty tasty-golden tasty-hunit + ]; + description = "Generate reports from hpc data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hpc-codecov"; + }) {}; + "hpc-coveralls" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs , containers, curl, directory, directory-tree, hpc, HUnit, process @@ -158601,10 +159318,8 @@ self: { }: mkDerivation { pname = "hslogger"; - version = "1.3.1.0"; - sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz"; - revision = "9"; - editedCabalFile = "1isrz8a09n88fww66qdrq76xlglai8sq14jk2ibv79g045qapj1g"; + version = "1.3.1.1"; + sha256 = "0k8imyj2531j6k3c2bn0bavr175km2vwjlwg89vjvl00gdb107c4"; libraryHaskellDepends = [ base bytestring containers deepseq network network-bsd old-locale time unix @@ -159428,6 +160143,22 @@ self: { license = lib.licenses.mit; }) {}; + "hspec_2_11_8" = callPackage + ({ mkDerivation, base, hspec-core, hspec-discover + , hspec-expectations, QuickCheck + }: + mkDerivation { + pname = "hspec"; + version = "2.11.8"; + sha256 = "1w0ryyr9h1f87jgz56yl09x3yvd9zm2w1bj70k5p6pzdyz984cjr"; + libraryHaskellDepends = [ + base hspec-core hspec-discover hspec-expectations QuickCheck + ]; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-api" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-discover , transformers @@ -159443,6 +160174,22 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-api_2_11_8" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover + , transformers + }: + mkDerivation { + pname = "hspec-api"; + version = "2.11.8"; + sha256 = "02hhmxgd4vz5jakp3nd6cwslh8qmqnlg6j3fq7my8lbdim95wnf6"; + libraryHaskellDepends = [ base hspec-core transformers ]; + testHaskellDepends = [ base hspec hspec-core transformers ]; + testToolDepends = [ hspec-discover ]; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -159511,8 +160258,8 @@ self: { pname = "hspec-core"; version = "2.7.10"; sha256 = "12k9yp5gznrda449ir60d5wv3xl7nnyffkb5mhfc0svw9f8lxlv1"; - revision = "1"; - editedCabalFile = "0g6x70fqwblf2dzjgq6hp4nj5vqrbfvzphl3j8a73h1966zhrxy9"; + revision = "2"; + editedCabalFile = "0l16mgxgapnihrvbwvhbz9i60v5fx68mhpv6zww9b68bdj6cpbsk"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -159542,6 +160289,8 @@ self: { pname = "hspec-core"; version = "2.11.7"; sha256 = "0d5i67vm1skqyign9mi711vhyl72l98cii27vvlbg6x7p239pykg"; + revision = "1"; + editedCabalFile = "1bm87k49mbcnm5h7l87c05y6hssgl9bj1wkkmzixvsqq8kqp0h7m"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -159559,6 +160308,35 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-core_2_11_8" = callPackage + ({ mkDerivation, ansi-terminal, array, base, base-orphans + , call-stack, deepseq, directory, filepath, haskell-lexer + , hspec-expectations, hspec-meta, HUnit, process, QuickCheck + , quickcheck-io, random, silently, stm, temporary, tf-random, time + , transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.11.8"; + sha256 = "18zaiac5s830q01hq9ai67z5sk0ilvhz471vxabraif3rznrsmla"; + libraryHaskellDepends = [ + ansi-terminal array base call-stack deepseq directory filepath + haskell-lexer hspec-expectations HUnit process QuickCheck + quickcheck-io random stm tf-random time transformers + ]; + testHaskellDepends = [ + ansi-terminal array base base-orphans call-stack deepseq directory + filepath haskell-lexer hspec-expectations hspec-meta HUnit process + QuickCheck quickcheck-io random silently stm temporary tf-random + time transformers + ]; + testToolDepends = [ hspec-meta ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-dirstream" = callPackage ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core , pipes, pipes-safe, system-filepath, text @@ -159624,6 +160402,29 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "hspec-discover_2_11_8" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, mockery + , QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.11.8"; + sha256 = "0s81mjb7an628c0gr3g74navnxzfahdl92zixdgys2is5rbd6yqf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath hspec-meta mockery QuickCheck + ]; + testToolDepends = [ hspec-meta ]; + description = "Automatically discover and run Hspec tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hspec-discover"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -159778,17 +160579,19 @@ self: { }) {}; "hspec-golden" = callPackage - ({ mkDerivation, base, directory, filepath, hspec, hspec-core - , hspec-discover, optparse-applicative, silently + ({ mkDerivation, ansi-terminal, base, directory, filepath, hspec + , hspec-core, hspec-discover, optparse-applicative, silently }: mkDerivation { pname = "hspec-golden"; - version = "0.2.1.0"; - sha256 = "07bfwj10n75l5zskwx4yzi86xxp5b4f692bjjkqs5b970h6gw33y"; + version = "0.2.2.0"; + sha256 = "1wpn9ll8x3gr0y86f5s9266x94jlc6hh778vc0npdynabipirwbs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath hspec-core ]; - executableHaskellDepends = [ base directory optparse-applicative ]; + executableHaskellDepends = [ + ansi-terminal base directory optparse-applicative + ]; testHaskellDepends = [ base directory hspec hspec-core silently ]; testToolDepends = [ hspec-discover ]; description = "Golden tests for hspec"; @@ -159994,6 +160797,34 @@ self: { mainProgram = "hspec-meta-discover"; }) {}; + "hspec-meta_2_11_8" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq + , directory, filepath, haskell-lexer, hspec-expectations, HUnit + , process, QuickCheck, quickcheck-io, random, stm, tf-random, time + , transformers + }: + mkDerivation { + pname = "hspec-meta"; + version = "2.11.8"; + sha256 = "0diwxrp6rkf0pchfnfhc5xdbhv9arbbmpgl8hyw5afbfmqjsd4kv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base call-stack deepseq directory filepath + haskell-lexer hspec-expectations HUnit process QuickCheck + quickcheck-io random stm tf-random time transformers + ]; + executableHaskellDepends = [ + ansi-terminal array base call-stack deepseq directory filepath + haskell-lexer hspec-expectations HUnit process QuickCheck + quickcheck-io random stm tf-random time transformers + ]; + description = "A version of Hspec which is used to test Hspec itself"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hspec-meta-discover"; + }) {}; + "hspec-monad-control" = callPackage ({ mkDerivation, base, hspec-core, monad-control, transformers , transformers-base @@ -160426,21 +161257,23 @@ self: { }) {}; "hspray" = callPackage - ({ mkDerivation, base, containers, hashable, matrix + ({ mkDerivation, base, containers, extra, hashable, matrix , numeric-prelude, tasty, tasty-bench, tasty-hunit, text , unordered-containers }: mkDerivation { pname = "hspray"; - version = "0.2.5.0"; - sha256 = "00md7i8g7sqxac7lplgdxy6csabaz35bm2lnb6c290fn261mvlx1"; + version = "0.3.0.0"; + sha256 = "1byk1i2fawyv36k8ap9pg9hpyvzd0zrj82h3gnrdj1ah5m3qg8sf"; libraryHaskellDepends = [ - base containers hashable matrix numeric-prelude text + base containers extra hashable matrix numeric-prelude text unordered-containers ]; - testHaskellDepends = [ base numeric-prelude tasty tasty-hunit ]; - benchmarkHaskellDepends = [ base tasty-bench ]; - description = "Multivariate polynomials"; + testHaskellDepends = [ + base matrix numeric-prelude tasty tasty-hunit unordered-containers + ]; + benchmarkHaskellDepends = [ base numeric-prelude tasty-bench ]; + description = "Multivariate polynomials and fractions of multivariate polynomials"; license = lib.licenses.gpl3Only; }) {}; @@ -160891,20 +161724,20 @@ self: { "hstar" = callPackage ({ mkDerivation, base, brotli, bytestring, bz2, composition-prelude - , cpphs, dir-traverse, libarchive, lz4-hs, lzlib, lzma, lzo + , cpphs, dir-traverse, libarchive, lz4-hs, lzlib, lzma-static, lzo , optparse-applicative, process, zlib, zstd }: mkDerivation { pname = "hstar"; - version = "0.1.0.5"; - sha256 = "1cp7g4c38psfb9nlq8481dqazl7shy8zswli7058mgyf2xbalw0y"; + version = "0.1.0.6"; + sha256 = "0fcb37yi81059r2nqmq1809q5mdx8q2fyvs7b9fsj3j2fqmgnai6"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base brotli bytestring bz2 composition-prelude dir-traverse - libarchive lz4-hs lzlib lzma lzo optparse-applicative process zlib - zstd + libarchive lz4-hs lzlib lzma-static lzo optparse-applicative + process zlib zstd ]; executableToolDepends = [ cpphs ]; description = "Haskell version of tar CLI utility"; @@ -161396,8 +162229,8 @@ self: { }: mkDerivation { pname = "htalkat"; - version = "0.1.2.4"; - sha256 = "0ckqri1ilkjgr71774y7hsdp3w9if5yr99lldxsprmz5k30csrnx"; + version = "0.1.2.5"; + sha256 = "043y9pmjqd7b45bmiddnc4dv8vk5mgl3gz8xc3aqmg8vf2drmvp5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -163150,6 +163983,23 @@ self: { broken = true; }) {}; + "http-semantics" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , http-types, network, network-byte-order, time-manager + , utf8-string + }: + mkDerivation { + pname = "http-semantics"; + version = "0.0.0"; + sha256 = "04wi14c0hy2dpzazv6v49100dc4r16rzkii14625xkijcgjlcx7w"; + libraryHaskellDepends = [ + array base bytestring case-insensitive http-types network + network-byte-order time-manager utf8-string + ]; + description = "HTTP senmatics libarry"; + license = lib.licenses.bsd3; + }) {}; + "http-server" = callPackage ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix , url, utf8-string @@ -163371,29 +164221,31 @@ self: { license = lib.licenses.bsd3; }) {}; - "http2_5_1_4" = callPackage + "http2_5_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers , crypton, directory, filepath, gauge, Glob, hspec, hspec-discover - , http-types, network, network-byte-order, network-control - , network-run, random, stm, text, time-manager, typed-process - , unix-time, unliftio, unordered-containers, utf8-string, vector + , http-semantics, http-types, network, network-byte-order + , network-control, network-run, random, stm, text, time-manager + , typed-process, unix-time, unliftio, unordered-containers + , utf8-string, vector }: mkDerivation { pname = "http2"; - version = "5.1.4"; - sha256 = "0asf51bfzbn0nxp0zn58089ym1c4wkcmh67qdd0s094r1qh9d5x2"; + version = "5.2.1"; + sha256 = "0qgyykw866m06d8br6ppwwq3dxzm028gssjq402qfs46axxkxzdf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array async base bytestring case-insensitive containers http-types - network network-byte-order network-control stm time-manager - unix-time unliftio utf8-string + array async base bytestring case-insensitive containers + http-semantics http-types network network-byte-order + network-control stm time-manager unix-time unliftio utf8-string ]; testHaskellDepends = [ aeson aeson-pretty async base base16-bytestring bytestring crypton - directory filepath Glob hspec http-types network network-byte-order - network-run random text typed-process unordered-containers vector + directory filepath Glob hspec http-semantics http-types network + network-byte-order network-run random text typed-process unliftio + unordered-containers vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ @@ -163414,6 +164266,8 @@ self: { pname = "http2-client"; version = "0.10.0.1"; sha256 = "1051qcnnigxyq20067r26gm3wp61p4ipga2pzjymd2wvnndx56hg"; + revision = "1"; + editedCabalFile = "1kh14m7r59lssxjrjdasrxbw6fh5ngbq0amn41863vsfff3rh1sq"; libraryHaskellDepends = [ async base bytestring containers deepseq http2 lifted-async lifted-base mtl network stm time tls transformers-base @@ -163472,8 +164326,8 @@ self: { }: mkDerivation { pname = "http2-grpc-proto-lens"; - version = "0.1.0.0"; - sha256 = "0nhygkv1z7qrhnrgms3kzzay5h5qqrdi4081v896prwjl2xd2p4f"; + version = "0.1.1.0"; + sha256 = "07x1qv819sh5axw3irdam07j00pfhrh7c5f9fl9dqj3sq60ssvkn"; libraryHaskellDepends = [ base binary bytestring case-insensitive http2-grpc-types proto-lens zlib @@ -163491,8 +164345,8 @@ self: { pname = "http2-grpc-proto3-wire"; version = "0.1.0.0"; sha256 = "00k7sm7z0q8k1zr3lcsyaciylk03c18cpdciqq33rfj6p7jwyphv"; - revision = "1"; - editedCabalFile = "0454bzkjf63avp8rckl5pp3l30nc41d3ixzbh9diaml70hkhsv2g"; + revision = "2"; + editedCabalFile = "141gxfhdy2dchxy7mymp6fp7iwf8ww0gsn7p1d0kcc5qr62my31f"; libraryHaskellDepends = [ base binary bytestring case-insensitive http2-grpc-types proto3-wire zlib @@ -163526,8 +164380,8 @@ self: { }: mkDerivation { pname = "http2-tls"; - version = "0.2.8"; - sha256 = "0zb9wgwlyd4lac3ivcm9s49xjx226fiqxnx11rb39fnkyvldw01w"; + version = "0.2.11"; + sha256 = "1vi55fk0n168j42n83mdiifqksh7d2fq3pyg3fq06b7bj1597khm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163544,24 +164398,25 @@ self: { "http3" = callPackage ({ mkDerivation, array, attoparsec, base, base16-bytestring , bytestring, case-insensitive, conduit, conduit-extra, containers - , crypton, hspec, hspec-discover, http-types, http2, iproute - , network, network-byte-order, quic, QuickCheck, sockaddr, stm - , time-manager, tls, unliftio + , crypton, hspec, hspec-discover, http-semantics, http-types, http2 + , iproute, network, network-byte-order, quic, QuickCheck, sockaddr + , stm, time-manager, tls, unliftio }: mkDerivation { pname = "http3"; - version = "0.0.9"; - sha256 = "0y6fvkjn5lxh4r8qnnjqkq9r38ziw10smcgrws408wfpm948j3kd"; + version = "0.0.11"; + sha256 = "1z3hqalylraxmx18h82gljpbaslzd8mz2ndv8g15mhfac6jjz4rd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring case-insensitive containers http-types http2 - network network-byte-order quic sockaddr stm time-manager unliftio + array base bytestring case-insensitive containers http-semantics + http-types http2 network network-byte-order quic sockaddr stm + time-manager unliftio ]; testHaskellDepends = [ attoparsec base base16-bytestring bytestring conduit conduit-extra - crypton hspec http-types http2 iproute network quic QuickCheck stm - tls unliftio + crypton hspec http-semantics http-types http2 iproute network quic + QuickCheck stm tls unliftio ]; testToolDepends = [ hspec-discover ]; description = "HTTP/3 library"; @@ -165614,8 +166469,8 @@ self: { pname = "hw-string-parse"; version = "0.0.0.5"; sha256 = "0sg5s84pqyl93wm052ifrqv90cyc28awh4i6vcd8zbq746wdqz4k"; - revision = "2"; - editedCabalFile = "0580mz2gr11jc6lyyrnp5jxijzbir8qcsq979bc91jwcvc99kc5r"; + revision = "3"; + editedCabalFile = "1vsr2b5j8iz28h163ymv3cm03f975qhjbw5jfzzs6f4j4m53dh49"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring doctest doctest-discover hspec QuickCheck vector @@ -166381,8 +167236,8 @@ self: { pname = "hybrid-vectors"; version = "0.2.4"; sha256 = "02sxx9263b9z4q9xh8d2mhg3g6mihydhzn7rjvpi3gp4bld2hg9m"; - revision = "1"; - editedCabalFile = "023f8i8110nm051wi372b9m21lpkxmdp0zp37fmimama9yv8rmxl"; + revision = "2"; + editedCabalFile = "1dijgrfidzjq2sddfb2a7dsyr956rx2g479vsyisdf067mszxq4j"; libraryHaskellDepends = [ base deepseq primitive semigroups vector ]; @@ -172050,19 +172905,20 @@ self: { "interval-patterns" = callPackage ({ mkDerivation, base, containers, deepseq, groups, hashable, heaps - , hspec, lattices, QuickCheck, semirings, time, time-compat + , hspec, lattices, parsec, QuickCheck, semirings, text, time + , time-compat }: mkDerivation { pname = "interval-patterns"; - version = "0.7.2"; - sha256 = "1cwv7yfc64zffa05mq300bb6zwdkgk85mjh10dzgnj1g1rd5z593"; + version = "0.8.0"; + sha256 = "1paciwq4wzl0kqkl5zzj486dsq5pg6275nj15gicv1czj7m9ncg9"; libraryHaskellDepends = [ base containers deepseq groups hashable heaps lattices semirings time time-compat ]; testHaskellDepends = [ - base containers deepseq groups hashable heaps hspec lattices - QuickCheck semirings time time-compat + base containers deepseq groups hashable heaps hspec lattices parsec + QuickCheck semirings text time time-compat ]; description = "Intervals, and monoids thereof"; license = lib.licenses.bsd3; @@ -172601,8 +173457,8 @@ self: { pname = "io-streams"; version = "1.5.2.2"; sha256 = "1zn4iyd18g9jc1qdgixp6hi56nj7czy4jdz2xca59hcn2q2xarfk"; - revision = "3"; - editedCabalFile = "1827mfvqdqarkl29jz84slzn2qf6pm7r7fzcn2b4ds1nv77lab2c"; + revision = "5"; + editedCabalFile = "0zwqb5wlwjs85j28z4znxpmf4m4svjbgzq8djybwvdhgniansyic"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring network primitive process text time @@ -172626,8 +173482,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.1.0"; sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp"; - revision = "8"; - editedCabalFile = "03gzlz7hg2jvnx2355r65201680lcm59ln7azzb118abirl460s6"; + revision = "9"; + editedCabalFile = "1waziyv0f1iap83abgn4ax1zwbdbhfhzh72smzm1azqzl6ggcdq2"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -174808,18 +175664,20 @@ self: { "jackpolynomials" = callPackage ({ mkDerivation, array, base, combinat, containers, hspray - , hypergeomatrix, ilist, lens, numeric-prelude, tasty, tasty-hunit + , hypergeomatrix, ilist, lens, miniterion, numeric-prelude, tasty + , tasty-hunit }: mkDerivation { pname = "jackpolynomials"; - version = "1.2.0.0"; - sha256 = "159hipi5xqshxlys5rsv1v116njnbbhgfkxhn9s4m4rjd2ng149g"; + version = "1.2.2.0"; + sha256 = "0pi4d848502hmrl2n9gin0zh426w91cbxvzjmcwd24idzgqqac1f"; libraryHaskellDepends = [ array base combinat containers hspray ilist lens numeric-prelude ]; testHaskellDepends = [ base hspray hypergeomatrix tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base hspray miniterion ]; description = "Jack, zonal, Schur and skew Schur polynomials"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; @@ -175308,6 +176166,8 @@ self: { pname = "javelin"; version = "0.1.2.0"; sha256 = "12xzs05dkkbn93yh1f5l7m64j3rifcz9qnd5nqqd62cj6nic10xl"; + revision = "1"; + editedCabalFile = "03pdxr80s9ah2yv3kxs76r1dz0j75zvcaylskm203c3cqg1f7scx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175337,6 +176197,8 @@ self: { pname = "javelin-io"; version = "0.1.1.1"; sha256 = "1c6w0p7yjbc3yw12f5bflgacvivzc1n0dxgmz2qn06yiraw6jyv6"; + revision = "1"; + editedCabalFile = "0z25nvwh5wzsaa022gp4pc5bxk1xqrfj98q6ni3mh4r3kydcm50g"; libraryHaskellDepends = [ base bytestring cassava containers javelin unordered-containers vector @@ -176300,27 +177162,6 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat - , base64-bytestring, bytestring, containers, deepseq, exceptions - , filepath, ghc-prim, http-types, lens, primitive, process, random - , ref-tf, scientific, stm, text, time, transformers, unliftio-core - , unordered-containers, vector - }: - mkDerivation { - pname = "jsaddle"; - version = "0.9.8.3"; - sha256 = "03d89cyhkwcvk3xjac3hgp7nfg8bq6lkig7y98yyha0chda1206w"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat base64-bytestring bytestring - containers deepseq exceptions filepath ghc-prim http-types lens - primitive process random ref-tf scientific stm text time - transformers unliftio-core unordered-containers vector - ]; - description = "Interface for JavaScript that works with GHCJS and GHC"; - license = lib.licenses.mit; - }) {}; - - "jsaddle_0_9_9_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, containers, deepseq, exceptions , filepath, ghc-prim, http-types, lens, primitive, process, random @@ -176339,7 +177180,6 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "jsaddle-clib" = callPackage @@ -176355,27 +177195,9 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "jsaddle-dom" = callPackage - ({ mkDerivation, base, base-compat, Cabal, exceptions, jsaddle - , lens, text, transformers - }: - mkDerivation { - pname = "jsaddle-dom"; - version = "0.9.5.0"; - sha256 = "1abl7rwh8yc7852vphv5g5k3jv6454cdrqd2dzmhxxhxqkgxv88p"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - base base-compat exceptions jsaddle lens text transformers - ]; - description = "DOM library that uses jsaddle to support both GHCJS and GHC"; - license = lib.licenses.mit; - }) {}; - - "jsaddle-dom_0_9_9_0" = callPackage ({ mkDerivation, base, base-compat, exceptions, jsaddle, lens, text , transformers }: @@ -176388,7 +177210,6 @@ self: { ]; description = "DOM library that uses jsaddle to support both GHCJS and GHC"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "jsaddle-hello" = callPackage @@ -176409,7 +177230,6 @@ self: { description = "JSaddle Hello World, an example package"; license = lib.licenses.mit; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; }) {}; "jsaddle-warp" = callPackage @@ -176432,31 +177252,10 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "jsaddle-webkit2gtk" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, gi-gio - , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base - , haskell-gi-overloading, jsaddle, text, unix - , webkit2gtk3-javascriptcore - }: - mkDerivation { - pname = "jsaddle-webkit2gtk"; - version = "0.9.8.4"; - sha256 = "1aky8lczbvhm11s6hhn5vnmssq8sdhd3nx93dihhsvlma1gg8gs3"; - libraryHaskellDepends = [ - aeson base bytestring directory gi-gio gi-glib gi-gtk - gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading - jsaddle text unix webkit2gtk3-javascriptcore - ]; - description = "Interface for JavaScript that works with GHCJS and GHC"; - license = lib.licenses.mit; - badPlatforms = lib.platforms.darwin; - }) {}; - - "jsaddle-webkit2gtk_0_9_9_0" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, gi-gio , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base , haskell-gi-overloading, jsaddle, text, unix @@ -176474,7 +177273,6 @@ self: { description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; }) {}; "jsaddle-webkitgtk" = callPackage @@ -176504,8 +177302,7 @@ self: { sha256 = "0r8payj72akz951jmv7frllj8cxpwgjyci7gad7250s7nmnd9f1s"; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = lib.platforms.darwin; }) {}; "jsc" = callPackage @@ -177257,7 +178054,6 @@ self: { ]; description = "Generics JSON (de)serialization using generics-sop"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "json-spec" = callPackage @@ -178766,8 +179562,8 @@ self: { pname = "kansas-comet"; version = "0.4.2"; sha256 = "01g30ck1nhj8qwz475mvwvmd8nc1yqxl5qi84c957gp116kig2v7"; - revision = "2"; - editedCabalFile = "1qila4mpczr0wrg4wn7pi65s7243w1flpdmj6v80684r33knspzc"; + revision = "3"; + editedCabalFile = "00wy4v9xdnp4801qww61gpqfshnbymmh4571rs56lq2f1apzifgv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -180333,8 +181129,8 @@ self: { pname = "keycode"; version = "0.2.2"; sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan"; - revision = "10"; - editedCabalFile = "1k2vh3pyxvhfxcx8ra16dl6jrgc5hz0wc4hn9w20z347v1hr51nq"; + revision = "11"; + editedCabalFile = "0il646ra0nb0fy1310im1y82w9gh08j6vwi7hw7kpxy1h9q6jp4j"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -181026,10 +181822,8 @@ self: { }: mkDerivation { pname = "knead"; - version = "1.0.1"; - sha256 = "0bga3kg1dridagd1ysvb4qk2gsjmacqm1z6qr1fhfcd59259acfz"; - revision = "1"; - editedCabalFile = "1h7w7y5s5mx7pxgmff45pfhh7cnxg9w2bv8787s80cfnnypwv3as"; + version = "1.0.1.1"; + sha256 = "1sd391wpnyzcyp2d7w4xfmmafsxkhcn7wfhpwdglvxzpv0sbixrd"; libraryHaskellDepends = [ base bool8 comfort-array fixed-length llvm-dsl llvm-extra llvm-tf prelude-compat storable-enum storable-record tagged tfp @@ -182302,6 +183096,8 @@ self: { pname = "lambdabot-core"; version = "5.3.1.2"; sha256 = "14my72cw39hfc0i7fzhgxv5xjrdfr4pz2ccrixaclngypfd08g28"; + revision = "1"; + editedCabalFile = "1g26gs4dj86vhr4ic8g38pxszlik47zd1c0hm62zj9lkl8qcfyxc"; libraryHaskellDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance exceptions filepath @@ -182327,6 +183123,8 @@ self: { pname = "lambdabot-haskell-plugins"; version = "5.3.1.2"; sha256 = "0pbhwhcxn4fqvn7ynhc19285r75fiksfd9yfjz6d8iq7wmp1frp8"; + revision = "1"; + editedCabalFile = "080a4iv2md1p9qa34ikqc6bliwlgmjsrlf7ys44lh3zj1ldshxfh"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts-simple hoogle HTTP IOSpec @@ -182348,6 +183146,8 @@ self: { pname = "lambdabot-irc-plugins"; version = "5.3.1.2"; sha256 = "00s27136i4xadm09clncrkm5annvnahrvcy04m5llrxa9ja09ixb"; + revision = "1"; + editedCabalFile = "15b4r4m2sqw4pa1yk90q9rg7cpk2davpib79sah13m8xf1lrf2ci"; libraryHaskellDepends = [ base bytestring containers directory filepath lambdabot-core lifted-base mtl network SafeSemaphore split time @@ -182367,6 +183167,8 @@ self: { pname = "lambdabot-misc-plugins"; version = "5.3.1.2"; sha256 = "0hkia5zziwabm847bl1f2pap47iyrvjwzdsygcvywving467302d"; + revision = "1"; + editedCabalFile = "09d3bngay0xai4sngp0ddly38qdpdzdaa4p5yp4qvrgg8b0nlv2w"; libraryHaskellDepends = [ base bytestring containers filepath lambdabot-core lifted-base mtl network network-uri parsec process regex-tdfa SafeSemaphore split @@ -182404,6 +183206,8 @@ self: { pname = "lambdabot-reference-plugins"; version = "5.3.1.2"; sha256 = "086ac4j85x2s156xzwmlldk7sll6jq3gq4mp2vjsa8w9q0p6yw0y"; + revision = "1"; + editedCabalFile = "1sglhkprhbdn3mv4iw1wrn8yfsc9rh1la2h2vqqx5jv7wdy3v9nd"; libraryHaskellDepends = [ base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string @@ -183442,6 +184246,30 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "language-docker_13_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , data-default-class, hspec, hspec-discover, hspec-megaparsec + , HUnit, megaparsec, prettyprinter, QuickCheck, split, text, time + }: + mkDerivation { + pname = "language-docker"; + version = "13.0.0"; + sha256 = "16ywhy8bah81x9agckqbkad0h7k6gzxgds5frbj4nvs7x8xp6vh8"; + libraryHaskellDepends = [ + base bytestring containers data-default data-default-class + megaparsec prettyprinter split text time + ]; + testHaskellDepends = [ + base bytestring containers data-default data-default-class hspec + hspec-megaparsec HUnit megaparsec prettyprinter QuickCheck split + text time + ]; + testToolDepends = [ hspec-discover ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -184391,21 +185219,22 @@ self: { }) {}; "language-toolkit" = callPackage - ({ mkDerivation, base, containers, deepseq, directory, filepath - , haskeline, parallel, process, transformers + ({ mkDerivation, array, base, containers, deepseq, directory + , exceptions, filepath, finite-semigroups, haskeline, parallel + , process, transformers }: mkDerivation { pname = "language-toolkit"; - version = "1.1.0.0"; - sha256 = "0ffr53jggh3c01v802xywy387jv5wa5vwwyvipiqpxwqcspr4nd7"; - revision = "4"; - editedCabalFile = "13m1qsn04yc4q04xihjivb6pz73gv0sn9d5qxb9q1a4cg63k21c8"; + version = "1.2.0.0"; + sha256 = "1nc94p3bnn6mdliag4pdgvb5mx5qcj0libqrpm7nwxhhs2ys8vd1"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base containers deepseq parallel ]; + libraryHaskellDepends = [ + array base containers deepseq finite-semigroups parallel + ]; executableHaskellDepends = [ - base containers deepseq directory filepath haskeline parallel - process transformers + base containers deepseq directory exceptions filepath + finite-semigroups haskeline parallel process transformers ]; description = "A set of tools for analyzing languages via logic and automata"; license = lib.licenses.mit; @@ -184642,8 +185471,6 @@ self: { ]; description = "Generic programming API for large-records and large-anon"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "large-hashable" = callPackage @@ -184703,6 +185530,7 @@ self: { description = "Efficient compilation for large records, linear in the size of the record"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "largeword" = callPackage @@ -186635,8 +187463,8 @@ self: { pname = "lens-properties"; version = "4.11.1"; sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g"; - revision = "6"; - editedCabalFile = "10c8phmf4znr6a9gkzvi2b9q9b9qc8cmslaxlx2hv59j62216h0f"; + revision = "7"; + editedCabalFile = "14n9yzar4zfqigyayxhi11a0g954nb4jcz0fahgpxyl2vbg7h1ch"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; description = "QuickCheck properties for lens"; license = lib.licenses.bsd3; @@ -186714,8 +187542,6 @@ self: { ]; description = "Computing lenses generically using generics-sop"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lens-tell" = callPackage @@ -188182,13 +189008,13 @@ self: { "libsecp256k1" = callPackage ({ mkDerivation, base, bytestring, deepseq, either, entropy - , hashable, hedgehog, hspec, HUnit, memory, monad-par, secp256k1 - , transformers + , hashable, hedgehog, hspec, hspec-api, HUnit, memory, monad-par + , secp256k1, transformers }: mkDerivation { pname = "libsecp256k1"; - version = "0.1.4"; - sha256 = "14y8r7f70jga8c3f2iwi8jfgbj0fd85nwz40qv8fm094yhw08hd3"; + version = "0.2.0"; + sha256 = "08mgdpcc70jw0v2jn69g6xxpl0xcfr82ybwah0i0rqh5pqjsi9zw"; libraryHaskellDepends = [ base bytestring deepseq entropy hashable hedgehog memory transformers @@ -188196,7 +189022,7 @@ self: { libraryPkgconfigDepends = [ secp256k1 ]; testHaskellDepends = [ base bytestring deepseq either entropy hashable hedgehog hspec - HUnit memory monad-par transformers + hspec-api HUnit memory monad-par transformers ]; description = "Bindings for secp256k1"; license = lib.licenses.mit; @@ -188520,14 +189346,14 @@ self: { "libyaml-streamly" = callPackage ({ mkDerivation, base, bytestring, deepseq, libyaml - , safe-exceptions, streamly + , safe-exceptions, streamly-core }: mkDerivation { pname = "libyaml-streamly"; - version = "0.2.2.1"; - sha256 = "01dq36mwp7kpkn05hs7dhn9lxnjy9gp2p39ync01d73x7a1ic548"; + version = "0.2.3.0"; + sha256 = "1jmrxnxh3qps3wa8b0hjlwxgc36j0hk2b6jkxsaymx03rjvml2zn"; libraryHaskellDepends = [ - base bytestring deepseq safe-exceptions streamly + base bytestring deepseq safe-exceptions streamly-core ]; libraryPkgconfigDepends = [ libyaml ]; description = "Low-level, streaming YAML interface via streamly"; @@ -188671,8 +189497,8 @@ self: { pname = "lift-generics"; version = "0.2.1"; sha256 = "1qkzq8hcb6j15cslv577bmhjcxmljzsrryysdgd7r99kr3q445b4"; - revision = "6"; - editedCabalFile = "0px8gjhzw1fvzbd1jha8kcc3p603hc8ki4kwi26vhg7n3ldy5nay"; + revision = "7"; + editedCabalFile = "1v61s0fhl87q6rvnw4qz0bvl75mpa2ag3yvjji6lbs9g6b8lh23q"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell th-compat ]; @@ -189288,6 +190114,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "linear_1_23" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, cereal, containers, deepseq, distributive, ghc-prim + , hashable, HUnit, indexed-traversable, lens, QuickCheck, random + , reflection, semigroupoids, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + , unordered-containers, vector, void + }: + mkDerivation { + pname = "linear"; + version = "1.23"; + sha256 = "13w6j1wnq40821nwrly7zl4qdsnih19f3p9fnmka42mblmin2lld"; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable indexed-traversable lens + random reflection semigroupoids tagged template-haskell + transformers transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq HUnit QuickCheck reflection + simple-reflect test-framework test-framework-hunit + test-framework-quickcheck2 vector + ]; + description = "Linear Algebra"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -191118,8 +191973,8 @@ self: { pname = "literatex"; version = "0.3.0.0"; sha256 = "0ph3s26hxvnkdqc3s09d3ka1p224zmgwc3k6zi7jmma0sgrmnm9x"; - revision = "6"; - editedCabalFile = "0kg4sqfjqx3abd0y0qhakaabpz62x6j535gkqgiz3zkkbkc0drpz"; + revision = "7"; + editedCabalFile = "0w03xl8i6j47li8cp0issjf6k2n5kwkhp461pp5spsw0hkb4gl3i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193361,6 +194216,7 @@ self: { ]; description = "A simple text parser with decent errors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "looksee-trip" = callPackage @@ -194117,6 +194973,21 @@ self: { mainProgram = "generator"; }) {}; + "lsql-csv" = callPackage + ({ mkDerivation, base, containers, Glob, parsec, text }: + mkDerivation { + pname = "lsql-csv"; + version = "0.1.0.3"; + sha256 = "0pvv2skbwnwn685hj75iwlxkgw9x1q7bjk5gdm5101kdnnnp464q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers Glob parsec text ]; + executableHaskellDepends = [ base ]; + description = "A tool for CSV files data querying from the shell with short queries"; + license = lib.licenses.gpl3Only; + mainProgram = "lsql-csv"; + }) {}; + "lss" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , hspec2, language-css, language-css-attoparsec, text, xmlhtml @@ -194568,6 +195439,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "lucid2_0_0_20240424" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, containers, hspec + , HUnit, mtl, parsec, text, transformers + }: + mkDerivation { + pname = "lucid2"; + version = "0.0.20240424"; + sha256 = "1ccpcbq84y53dxna700rfn6gaxn6xywqfdn27xpvbrl79w5x5p1j"; + libraryHaskellDepends = [ + base bytestring containers mtl text transformers + ]; + testHaskellDepends = [ + base bifunctors hspec HUnit mtl parsec text + ]; + description = "Clear to write, read and edit DSL for HTML"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lucid2-htmx" = callPackage ({ mkDerivation, base, hspec, HUnit, lucid2, text }: mkDerivation { @@ -199422,6 +200312,8 @@ self: { pname = "megaparsec-tests"; version = "9.6.1"; sha256 = "1l3rmg4ymw4czqkkb3502g322ijdg11c1img9l4p6ipy7hdzw52n"; + revision = "1"; + editedCabalFile = "0vycmn3c32z1bk19612277df41in55rkyk23gk3m007drsaq3xdl"; libraryHaskellDepends = [ base bytestring containers hspec hspec-megaparsec megaparsec mtl QuickCheck text transformers @@ -199483,8 +200375,8 @@ self: { }: mkDerivation { pname = "melf"; - version = "1.3.0"; - sha256 = "1fk439y6ykdfn36vk1b09x7abp2pin7iw0a73dqxgafagqxp8sqx"; + version = "1.3.1"; + sha256 = "0ivfzsw36qy0m93h353r3963vmhirzg3a5mirqn1hfbsk24xf1dx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -200882,8 +201774,8 @@ self: { pname = "microaeson"; version = "0.1.0.1"; sha256 = "0rx5gm7apazc0sm65v687ab5106ximka9khizxq1lbckd2x0cq3q"; - revision = "8"; - editedCabalFile = "1w9pm69vm0r3zkmcls3zd6b0vc3ifvsjmwj2wk7gc23pj4bwzwlb"; + revision = "9"; + editedCabalFile = "0w43nprqacq6vx645263x7sirnv4jkw985gyynhxfldyp3yw895h"; libraryHaskellDepends = [ array base bytestring containers deepseq fail text ]; @@ -200937,6 +201829,31 @@ self: { mainProgram = "microc-exe"; }) {}; + "microdns" = callPackage + ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring + , case-insensitive, cryptohash-sha256, dns, ip, iproute, megaparsec + , network, optparse-generic, prodapi, prometheus-client, servant + , servant-server, streaming-commons, text, wai-extra, warp + , warp-tls + }: + mkDerivation { + pname = "microdns"; + version = "0.1.0.0"; + sha256 = "0wr24630jqhfnnngrnvbc5zd96jj4rgc02g2gd24vywdspk2nk56"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async base base16-bytestring bytestring case-insensitive + cryptohash-sha256 dns ip iproute megaparsec network + optparse-generic prodapi prometheus-client servant servant-server + streaming-commons text wai-extra warp warp-tls + ]; + description = "a minimalistic DNS-authoritative server"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "microdns"; + }) {}; + "microformats2-parser" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat , blaze-markup, bytestring, case-insensitive, containers @@ -201065,8 +201982,8 @@ self: { }: mkDerivation { pname = "microlens-ghc"; - version = "0.4.14.2"; - sha256 = "17fdc5jpqlq3q61mf6qia7a18kqq4nfpbrv2j2n4a4cx62kcbraq"; + version = "0.4.14.3"; + sha256 = "13sczn286n6yjjhnf3nsjq1l43rgxawr61ma1f4pmwd4aj1ihdcp"; libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; @@ -201115,8 +202032,8 @@ self: { }: mkDerivation { pname = "microlens-pro"; - version = "0.2.0"; - sha256 = "03vadipi3qkyz6xyf2by8jqq453gvpisqhwvrhaykbwx6pxrzwnj"; + version = "0.2.0.1"; + sha256 = "16bb5myflaxwksqkl890vg3349sd5lcr6g2iaq8kn82k3wkq0ynm"; libraryHaskellDepends = [ base containers microlens microlens-contra microlens-platform microlens-th mtl profunctors tagged template-haskell text @@ -201153,8 +202070,8 @@ self: { }: mkDerivation { pname = "microlens-th"; - version = "0.4.3.14"; - sha256 = "0sjvzywcar5fxmpbdj5ili4m4pcz77hnk27i99qsdrxjzmmwkycj"; + version = "0.4.3.15"; + sha256 = "1ja59samyqng78v9lhrwa6x4vd5vvr9jkrm3pyi2kbcp28kv7khg"; libraryHaskellDepends = [ base containers microlens template-haskell th-abstraction transformers @@ -201987,8 +202904,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mini"; - version = "1.3.0.0"; - sha256 = "0qahnq95nxqgl5lj51j06hpmzi3fypm7flywibzyb5xad5hqp4db"; + version = "1.3.0.1"; + sha256 = "1f17mf4v2dv19wv1kzff3kql6yhn452vpjk8i1sd91rkznq28yr0"; libraryHaskellDepends = [ base ]; description = "Minimal essentials"; license = lib.licenses.mit; @@ -203426,8 +204343,8 @@ self: { }: mkDerivation { pname = "mmzk-typeid"; - version = "0.5.0.2"; - sha256 = "0ricw68ymglh4nh1ncyfhcwaw82apc8wi4nsqas7y1a9fk4pbgp2"; + version = "0.6.0.1"; + sha256 = "0dcwa97whwwk267cvbmvixya465v7hyc45i0s1jvgxqjhmpy3p6d"; libraryHaskellDepends = [ aeson array base binary bytestring entropy hashable random text time uuid uuid-types @@ -206301,8 +207218,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "1.2.4.1"; - sha256 = "0jpdazjxxfih8zz0myada1728r9103a882904i7cd1y6v2m17wdj"; + version = "1.2.5"; + sha256 = "17i07i5z4jhk7w35123hkikrl81v7vnp4qd8plci90vfix53z5aa"; libraryHaskellDepends = [ base bytestring commutative-semigroups containers primes text vector @@ -206379,8 +207296,8 @@ self: { }: mkDerivation { pname = "monoidmap"; - version = "0.0.1.1"; - sha256 = "0dp0gc0jqfr8rzlvg0zgyk21xizwhx0mr5r29xkkxc9n5mxsl0l7"; + version = "0.0.1.3"; + sha256 = "1hi4sqky1wwgx5i9cjn6dsf5dim9k5lw74j8a0wghq2rwab7b2ng"; libraryHaskellDepends = [ base containers deepseq groups monoid-subclasses nonempty-containers nothunks @@ -209215,6 +210132,8 @@ self: { pname = "mueval"; version = "0.9.4"; sha256 = "1r6gm1drfkblf6vl36z1kbjpvz5dmcjn4hnlm8r59m794palwzzk"; + revision = "1"; + editedCabalFile = "141maqz3b1d877fxnispbbcsc3yg7iil0smgdmw1zjb2cdrlmqh2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212263,8 +213182,8 @@ self: { }: mkDerivation { pname = "national-australia-bank"; - version = "0.0.3"; - sha256 = "11jh9lap1763qhpybylhsjvnqsiba1757rlcddqp391j4n2pmb51"; + version = "0.0.4"; + sha256 = "0fyymrwmkx58xgadvwsrpsigrdwz63hjwkqk6hjw3ish2q7527ss"; libraryHaskellDepends = [ base bytestring containers digit directory filepath lens mtl parsec sv time transformers utf8-string validation @@ -213789,6 +214708,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "network_3_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, hspec + , hspec-discover, HUnit, QuickCheck, temporary + }: + mkDerivation { + pname = "network"; + version = "3.2.0.0"; + sha256 = "1jmrkjxjypm3j0d3rzm3xm87nnwnd7c3s6l7aqxdjdy49ms9cmn4"; + libraryHaskellDepends = [ base bytestring deepseq directory ]; + testHaskellDepends = [ + base bytestring directory hspec HUnit QuickCheck temporary + ]; + testToolDepends = [ hspec-discover ]; + description = "Low-level networking interface"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "network-address" = callPackage ({ mkDerivation, base, Cabal, QuickCheck, test-framework , test-framework-quickcheck2 @@ -213889,8 +214826,8 @@ self: { }: mkDerivation { pname = "network-arbitrary"; - version = "0.7.0.0"; - sha256 = "0n3c9hm8p404diksx23l4afa7i4lcl92m2zp2aw4zy8n9vhpz8sv"; + version = "1.0.0.0"; + sha256 = "00h1qwnk2clybf06d172pjmf87qb7jwsdn2l1a08hszq1pxyb9ch"; libraryHaskellDepends = [ base bytestring http-media http-types network-uri QuickCheck ]; @@ -214498,8 +215435,8 @@ self: { ({ mkDerivation, base, bytestring, network, time-manager }: mkDerivation { pname = "network-run"; - version = "0.2.7"; - sha256 = "14x55n79cg74xbjcii00nyi0y7zxh7lw03qdkl4inm1smfsm7zjl"; + version = "0.2.8"; + sha256 = "1yqqvb9l17n2r4giigppj12xdpvx0m13yyhlx5ss3r4qkdj2b962"; libraryHaskellDepends = [ base bytestring network time-manager ]; description = "Simple network runner library"; license = lib.licenses.bsd3; @@ -215530,8 +216467,8 @@ self: { }: mkDerivation { pname = "ngx-export-distribution"; - version = "0.5.3.0"; - sha256 = "1dfjvzw65q6fjzdwisr6rbwfwcp4d36k56pn3vp7i86z9vn2syqx"; + version = "0.5.4.1"; + sha256 = "17dqaclyn40jqvmsffilhly1darmzi2p1viaqsylijibx60hn04r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -216141,7 +217078,6 @@ self: { ]; description = "Lightweight dependency management with Nix"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "nix-thunk"; }) {}; @@ -216518,6 +217454,19 @@ self: { license = lib.licenses.asl20; }) {}; + "no-recursion" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, ghc }: + mkDerivation { + pname = "no-recursion"; + version = "0.1.1.0"; + sha256 = "1696872aswsh00br5wwr5ccc77ab52qvznhbjkng26vcn08mdf0w"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ghc ]; + testHaskellDepends = [ base doctest ]; + description = "A GHC plugin to remove support for recursion"; + license = lib.licenses.agpl3Plus; + }) {}; + "no-role-annots" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -220592,21 +221541,33 @@ self: { }) {}; "one-time-password" = callPackage - ({ mkDerivation, base, bytestring, cereal, cryptonite, memory - , tasty, tasty-hunit, time + ({ mkDerivation, base, base16, base32, bytestring, cereal, chronos + , cryptohash-sha1, cryptonite, network-uri, optparse-applicative + , sel, tasty, tasty-hunit, tasty-quickcheck, text, text-display + , torsor }: mkDerivation { pname = "one-time-password"; - version = "2.0.0"; - sha256 = "18pr5cmkm89zhwi38gb87vgzagga9qggr03vysz0q1v7cdabld8a"; + version = "3.0.0.0"; + sha256 = "0yark6agy421mk7zblzy4vpccbd1i53gpiysa0a7s9sh0szy4bql"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring cereal cryptonite memory time + base bytestring cereal chronos cryptohash-sha1 network-uri sel text + text-display + ]; + executableHaskellDepends = [ + base bytestring chronos optparse-applicative sel text text-display + torsor ]; testHaskellDepends = [ - base bytestring cryptonite tasty tasty-hunit time + base base16 base32 bytestring chronos cryptonite sel tasty + tasty-hunit tasty-quickcheck text text-display torsor ]; description = "HMAC-Based and Time-Based One-Time Passwords"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "one-time-password"; }) {}; "oneOfN" = callPackage @@ -220807,8 +221768,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.10.2.3"; - sha256 = "1cbd6d5gp438bi3w2ml7lba6rjjykyxpc5dp5ph0n67pbvbzd66d"; + version = "0.10.3.0"; + sha256 = "1zq2d8rb1zwrvg0civh2a6r01nv1v2ini9rykf63px00srs98p67"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -220872,6 +221833,20 @@ self: { broken = true; }) {}; + "opaleye-textsearch" = callPackage + ({ mkDerivation, base, opaleye }: + mkDerivation { + pname = "opaleye-textsearch"; + version = "0.1.0.0"; + sha256 = "01wck3d21if4fnna3xj5k75g2yn6443jd3aq30nvb8p7sdvj6019"; + libraryHaskellDepends = [ base opaleye ]; + testHaskellDepends = [ base ]; + description = "Text search utilities for Opaleye"; + license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "opaleye-trans" = callPackage ({ mkDerivation, base, exceptions, mtl, opaleye, postgresql-simple , product-profunctors, transformers @@ -223794,6 +224769,8 @@ self: { pname = "os-string"; version = "2.0.2"; sha256 = "18fay8gmlwskfhdikkhb21za1zpmjvsp33f9afbp2ri9jrp14lq9"; + revision = "1"; + editedCabalFile = "09mfw49by3k1i1l0jwfm43wqzwijzn0hqpwi6f7gpjxdg7wvsmvk"; libraryHaskellDepends = [ base bytestring deepseq exceptions template-haskell ]; @@ -223807,6 +224784,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "os-string_2_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, QuickCheck + , quickcheck-classes-base, random, tasty-bench, template-haskell + }: + mkDerivation { + pname = "os-string"; + version = "2.0.2.1"; + sha256 = "1ppz0hnqra91pf18n2dqyxy59lrryk50cgllvxk6pfgwfkavglkx"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions template-haskell + ]; + testHaskellDepends = [ + base bytestring deepseq QuickCheck quickcheck-classes-base + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq random tasty-bench + ]; + description = "Library for manipulating Operating system strings"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "osc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , data-binary-ieee754, network @@ -225657,6 +226656,8 @@ self: { pname = "pandoc-lua-marshal"; version = "0.2.6"; sha256 = "029wqihgkcdfyy21pdc4gj8hh2av9c29nypcabxch8bfkz6lq0lw"; + revision = "1"; + editedCabalFile = "15rdndh2axp1mzpnygb3ilvdkd7gv0h9zdlv9hjaiavas6s28y4v"; libraryHaskellDepends = [ aeson base bytestring containers exceptions hslua hslua-list hslua-marshalling pandoc-types safe text @@ -225944,8 +226945,8 @@ self: { pname = "pandoc-types"; version = "1.23.1"; sha256 = "1hd18l1c5yh7x24gsligkbraadq12hn7mim16xyjnicdsa1s03xd"; - revision = "1"; - editedCabalFile = "02yaziq3xyz9zqr4qrqm4drlqpa3xnxmm5x0ci52c5p5dr3c3b3d"; + revision = "2"; + editedCabalFile = "1whymq4w5z08l5ng829kn8aslczda6svi6c6q72cnv200mlq7d1c"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb text transformers @@ -227610,6 +228611,8 @@ self: { pname = "parser-combinators-tests"; version = "1.3.0"; sha256 = "0sw6ws7za93y3lbmxp6jp1k17zi3wdg7698ab133kcw82f6mzba2"; + revision = "1"; + editedCabalFile = "0h6lwj0mdlirlwcadjvyblvgqg6yksw2bnp77qkjxm2kk3rw56hn"; isLibrary = false; isExecutable = false; testHaskellDepends = [ @@ -232037,8 +233040,8 @@ self: { pname = "phatsort"; version = "0.6.0.0"; sha256 = "1cjmamla9383fk9715jxzlw87qnd26hpkcqhk4vvgld51nraf2pl"; - revision = "3"; - editedCabalFile = "0fjd37sigkccr9dw70z3yy8hjn7p210b5nn52lj1hf0jlks81q0a"; + revision = "4"; + editedCabalFile = "0q5ilnq24n4zwhavvp2qxr5j91p3msj7ssb7qfbxvkzdml879bp7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232130,8 +233133,8 @@ self: { }: mkDerivation { pname = "phladiprelio-general-simple"; - version = "0.20.0.1"; - sha256 = "0rc7di62zcbssl21pa109k9klxkc44ihz12sdlzwq3hg3hrmnrsv"; + version = "0.20.0.2"; + sha256 = "016rb0x25584d7qxrqw4pgqlp0d6fyannhwjdy4677hlp5yi2812"; libraryHaskellDepends = [ async base cli-arguments deepseq directory halfsplit minmax phladiprelio-general-datatype phladiprelio-general-shared @@ -232196,8 +233199,8 @@ self: { }: mkDerivation { pname = "phladiprelio-ukrainian-simple"; - version = "0.20.2.1"; - sha256 = "1jlx3dffra7cs263bg1mgvbi1kzw15dy98jiysxb906ivwd5vnfd"; + version = "0.20.2.2"; + sha256 = "0fy9559zbza3jpiz502pqya00da67bvh2m0hca756lrh8agqmfjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236281,8 +237284,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.11"; - sha256 = "17xaxmyys7x1l3v3a72fdkb8klr0xp0mnh6aspfa7ysakagblnf0"; + version = "1.1.1.12"; + sha256 = "0mrrdmslcdk2ld8g78i00jwidn765w3l7la0qdlawc2lc17w2ili"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -239171,6 +240174,23 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; + "postgresql-libpq_0_10_1_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, postgresql, tasty + , tasty-hunit, unix + }: + mkDerivation { + pname = "postgresql-libpq"; + version = "0.10.1.0"; + sha256 = "1w49zp3izxi3s4mq71i93i4s08kwcv1j0j6m5cfpxcp5s4h12pwq"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring unix ]; + librarySystemDepends = [ postgresql ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + description = "low-level binding to libpq"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) postgresql;}; + "postgresql-libpq-notify" = callPackage ({ mkDerivation, async, base, hspec, postgres-options , postgresql-libpq, stm, text, tmp-postgres @@ -240478,8 +241498,8 @@ self: { }: mkDerivation { pname = "prairie"; - version = "0.0.3.0"; - sha256 = "0rm3cnvjs8825x7czdc948whjfjynzz9apbp2qbmyv3lihi4mib5"; + version = "0.0.4.0"; + sha256 = "0d5bfci30ck6kx9pspv0d68lxgs700xv6y6067ki9yvlnrimrff2"; libraryHaskellDepends = [ aeson base constraints containers lens template-haskell text ]; @@ -242671,16 +243691,14 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_18_0" = callPackage + "process_1_6_19_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.18.0"; - sha256 = "0zm3v2m95a7bsnndl1pvdj9a7gd4v84pb34rmgsqjkwpwi7lqpxa"; - revision = "2"; - editedCabalFile = "0ksri04db6g38n9h3qi0qwiq0gh0hy20irj90121mxp494kwwjwb"; + version = "1.6.19.0"; + sha256 = "15nbbn7zcs1pwicqdhzg5s6wrym1l29mbvbin5z56rk9nid3as5l"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -242993,6 +244011,67 @@ self: { mainProgram = "example-netcat-test"; }) {}; + "prodapi" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , contravariant, directory, http-api-data, http-client, http-media + , lucid, process-extras, prometheus-client, prometheus-metrics-ghc + , servant, servant-client, servant-server, text, time, uuid, wai + }: + mkDerivation { + pname = "prodapi"; + version = "0.1.0.0"; + sha256 = "0hqfxkg2il8sbbav5qwpydqvvj5zd9r9i2x7jlqxbdfg9jz2fr16"; + libraryHaskellDepends = [ + aeson async base bytestring containers contravariant directory + http-api-data http-client http-media lucid process-extras + prometheus-client prometheus-metrics-ghc servant servant-client + servant-server text time uuid wai + ]; + description = "Some curated and opinionated packages for building Haskell services"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "prodapi-proxy" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-client + , http-reverse-proxy, http-types, prodapi, prometheus-client + , random-shuffle, servant, servant-server, text, time, tls, wai + , warp-tls + }: + mkDerivation { + pname = "prodapi-proxy"; + version = "0.1.0.0"; + sha256 = "14zhvfwvkdxa2pi0p4nzn30001xsdmgx7dg3rnbv2b319jjq5pbm"; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-reverse-proxy + http-types prodapi prometheus-client random-shuffle servant + servant-server text time tls wai warp-tls + ]; + description = "write an HTTP proxy with prodapi counters"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "prodapi-userauth" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, cookie + , http-api-data, jwt, lucid, postgresql-simple, prodapi + , prometheus-client, servant, servant-server, text, time, uuid, wai + }: + mkDerivation { + pname = "prodapi-userauth"; + version = "0.1.0.0"; + sha256 = "0xmizx7xrh3hqxddnh699bhz1k8jy157n3rzn35akczp75d7gv1h"; + libraryHaskellDepends = [ + aeson base bytestring containers cookie http-api-data jwt lucid + postgresql-simple prodapi prometheus-client servant servant-server + text time uuid wai + ]; + description = "a base lib for performing user-authentication in prodapi services"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "producer" = callPackage ({ mkDerivation, base, checkers, QuickCheck, tasty, tasty-auto , tasty-hunit, tasty-quickcheck @@ -244177,27 +245256,6 @@ self: { }) {ribosome-menu = null;}; "proto-lens" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim - , lens-family, parsec, pretty, primitive, profunctors, QuickCheck - , tagged, tasty, tasty-quickcheck, text, transformers, vector - }: - mkDerivation { - pname = "proto-lens"; - version = "0.7.1.4"; - sha256 = "0nb1klrhms82mkjzr2zxdcj5ny6skjgqi6md05bmm99s0hg0ql15"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim lens-family parsec - pretty primitive profunctors tagged text transformers vector - ]; - testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-quickcheck vector - ]; - description = "A lens-based implementation of protocol buffers in Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens_0_7_1_5" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , lens-family, parsec, pretty, primitive, profunctors, QuickCheck , tagged, tasty, tasty-quickcheck, text, transformers, vector @@ -244216,27 +245274,9 @@ self: { ]; description = "A lens-based implementation of protocol buffers in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto-lens-arbitrary" = callPackage - ({ mkDerivation, base, bytestring, containers, lens-family - , proto-lens, QuickCheck, text - }: - mkDerivation { - pname = "proto-lens-arbitrary"; - version = "0.1.2.12"; - sha256 = "1hx3yifczzvl5h14c8yjqdq3q8g37hawqkbc6c25pcs8i40sagv7"; - libraryHaskellDepends = [ - base bytestring containers lens-family proto-lens QuickCheck text - ]; - description = "Arbitrary instances for proto-lens"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "proto-lens-arbitrary_0_1_2_13" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text }: @@ -244249,8 +245289,6 @@ self: { ]; description = "Arbitrary instances for proto-lens"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "proto-lens-combinators" = callPackage @@ -244310,19 +245348,6 @@ self: { }) {}; "proto-lens-optparse" = callPackage - ({ mkDerivation, base, optparse-applicative, proto-lens, text }: - mkDerivation { - pname = "proto-lens-optparse"; - version = "0.1.1.11"; - sha256 = "19iszwk1i8h9n7ryxmvf1rc102n6yn9d22rdnslw9s2vycb1645j"; - libraryHaskellDepends = [ - base optparse-applicative proto-lens text - ]; - description = "Adapting proto-lens to optparse-applicative ReadMs"; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens-optparse_0_1_1_12" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; @@ -244333,7 +245358,6 @@ self: { ]; description = "Adapting proto-lens to optparse-applicative ReadMs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto-lens-protobuf-types" = callPackage @@ -244377,22 +245401,6 @@ self: { }) {inherit (pkgs) protobuf;}; "proto-lens-runtime" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, filepath - , lens-family, proto-lens, text, vector - }: - mkDerivation { - pname = "proto-lens-runtime"; - version = "0.7.0.5"; - sha256 = "17c0ip6s3sca23mwmzl2ky8b220iiaasqmbv19ixfq82hl9sjvl1"; - libraryHaskellDepends = [ - base bytestring containers deepseq filepath lens-family proto-lens - text vector - ]; - doHaddock = false; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens-runtime_0_7_0_6" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, filepath , lens-family, proto-lens, text, vector }: @@ -244406,7 +245414,6 @@ self: { ]; doHaddock = false; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto-lens-setup" = callPackage @@ -244473,19 +245480,19 @@ self: { "proto3-wire" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, criterion - , deepseq, doctest, ghc-prim, hashable, parameterized, primitive - , QuickCheck, random, safe, tasty, tasty-hunit, tasty-quickcheck + , deepseq, doctest, hashable, parameterized, primitive, QuickCheck + , random, safe, tasty, tasty-hunit, tasty-quickcheck , template-haskell, text, text-short, transformers , unordered-containers, vector, word-compat }: mkDerivation { pname = "proto3-wire"; - version = "1.4.1"; - sha256 = "0liy2qnx9y10ad79nfw0idp2c5mz37pwb1h07f82g4rbg66qn465"; + version = "1.4.2"; + sha256 = "0ly8nc5z6ri1bj5l8h0r23kwsjr0m7nrwbyzxscp5q4880rqx492"; libraryHaskellDepends = [ - base bytestring cereal containers deepseq ghc-prim hashable - parameterized primitive QuickCheck safe template-haskell text - text-short transformers unordered-containers vector word-compat + base bytestring cereal containers deepseq hashable parameterized + primitive QuickCheck safe template-haskell text text-short + transformers unordered-containers vector word-compat ]; testHaskellDepends = [ base bytestring cereal doctest QuickCheck tasty tasty-hunit @@ -244494,8 +245501,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "A low-level implementation of the Protocol Buffers (version 3) wire format"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "protobuf" = callPackage @@ -244835,8 +245840,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "proxied"; - version = "0.3.1"; - sha256 = "0ldcyvzg5i4axkn5qwgkc8vrc0f0715842ca41d7237p1bh98s4r"; + version = "0.3.2"; + sha256 = "137g3xwjan292ablfqz32g7kbjyj43nvwq0ah9syq1ivz1w71ay2"; libraryHaskellDepends = [ base ]; description = "Make functions consume Proxy instead of undefined"; license = lib.licenses.bsd3; @@ -247688,8 +248693,10 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.19"; - sha256 = "0kxdiah415lsj06pdi14bcs3i7gqyyx9x093rxss8l48w1820zwr"; + version = "0.1.20"; + sha256 = "0zzpdb07xrgx3bcvnfmn778yamk6q86lqmj1ir1h3g82gcknzfxm"; + revision = "1"; + editedCabalFile = "0nnl78qiczrsqzjhfvwc89m6v1kyvaysph5v1m9bi37ainvy8222"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -247841,8 +248848,8 @@ self: { pname = "quickcheck-classes"; version = "0.6.5.0"; sha256 = "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2"; - revision = "2"; - editedCabalFile = "0gldr9kcij41b8imsyf11q26kd1nf8vhfh8wd9i1fn01jbxzgi37"; + revision = "3"; + editedCabalFile = "1pawam5rsdcdv21fqc87khzqjm0ixwzklfxd6gk3b2qrr5q66bn5"; libraryHaskellDepends = [ aeson base containers primitive primitive-addr QuickCheck quickcheck-classes-base semigroupoids semirings transformers vector @@ -247939,6 +248946,29 @@ self: { license = lib.licenses.asl20; }) {}; + "quickcheck-groups_0_0_1_2" = callPackage + ({ mkDerivation, base, groups, hspec, hspec-discover, pretty-show + , QuickCheck, quickcheck-classes, quickcheck-instances + , semigroupoids + }: + mkDerivation { + pname = "quickcheck-groups"; + version = "0.0.1.2"; + sha256 = "0pv1j93g4cmfsh4yijrcc7qgrkggk92jmhl1qjj83yzszm4fb80p"; + libraryHaskellDepends = [ + base groups pretty-show QuickCheck quickcheck-classes + quickcheck-instances semigroupoids + ]; + testHaskellDepends = [ + base groups hspec QuickCheck quickcheck-classes + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Testing group class instances with QuickCheck"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "quickcheck-higherorder" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, test-fun @@ -248021,8 +249051,8 @@ self: { }: mkDerivation { pname = "quickcheck-monoid-subclasses"; - version = "0.3.0.1"; - sha256 = "0fi2ixgd4cpc5q6ybbmgbf14dszpr3454bbwpzr74rnalj5qj7ym"; + version = "0.3.0.2"; + sha256 = "1baxylj4kh1vx5vfy8dcschzr9bfaby7y3m6m1kjpb4qdj8vlbk3"; libraryHaskellDepends = [ base containers monoid-subclasses pretty-show QuickCheck quickcheck-classes quickcheck-instances semigroupoids @@ -248038,6 +249068,32 @@ self: { license = lib.licenses.asl20; }) {}; + "quickcheck-monoid-subclasses_0_3_0_3" = callPackage + ({ mkDerivation, base, bytestring, commutative-semigroups + , containers, hspec, hspec-discover, monoid-subclasses, pretty-show + , QuickCheck, quickcheck-classes, quickcheck-instances + , semigroupoids, text, vector + }: + mkDerivation { + pname = "quickcheck-monoid-subclasses"; + version = "0.3.0.3"; + sha256 = "0z7i93f9r6f0c8xvyja8v4gwm4ydhymir9lzncails53v2aw1g71"; + libraryHaskellDepends = [ + base containers monoid-subclasses pretty-show QuickCheck + quickcheck-classes quickcheck-instances semigroupoids + ]; + testHaskellDepends = [ + base bytestring commutative-semigroups containers hspec + monoid-subclasses QuickCheck quickcheck-classes + quickcheck-instances text vector + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Testing monoid subclass instances with QuickCheck"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "quickcheck-poly" = callPackage ({ mkDerivation, base, haskell98, hint, MonadCatchIO-mtl , QuickCheck, regex-compat, regex-tdfa @@ -248099,8 +249155,8 @@ self: { }: mkDerivation { pname = "quickcheck-quid"; - version = "0.0.1.1"; - sha256 = "1nqc5ggm50pw7vzjxdc8kv3iz40lpkisrs35jmzx892b4iy361dz"; + version = "0.0.1.3"; + sha256 = "0f2y91znim4745fdgl37y2lgv1qf3isn698w2ix15ibcs6yvkczy"; libraryHaskellDepends = [ base containers deepseq extra hashable QuickCheck text ]; @@ -249248,26 +250304,20 @@ self: { }) {}; "radix-tree" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, gauge - , hashtables, HUnit, primitive, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, text, unordered-containers + ({ mkDerivation, base, bytestring, containers, deepseq, hspec + , primitive, random, template-haskell, text }: mkDerivation { pname = "radix-tree"; - version = "0.1"; - sha256 = "0hdlj97gzqb5rgyj5ybb4kki9b6xrlavcbz7i9w8q81vwjyv8cka"; + version = "1.0.0.0"; + sha256 = "1cyh6fqrl175mzl2g2565r0wv2jay0xgmv8fih91jqg5rrvgs4hq"; libraryHaskellDepends = [ - base bytestring containers deepseq primitive + base bytestring deepseq primitive template-haskell text ]; testHaskellDepends = [ - base bytestring containers HUnit QuickCheck tasty tasty-hunit - tasty-quickcheck + base bytestring containers hspec primitive random text ]; - benchmarkHaskellDepends = [ - base bytestring containers deepseq gauge hashtables text - unordered-containers - ]; - description = "Radix tree data structive over short byte-strings"; + description = "Radix trees"; license = lib.licenses.bsd3; }) {}; @@ -250730,6 +251780,29 @@ self: { broken = true; }) {}; + "rattletrap_13_0_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring + , containers, filepath, http-client, http-client-tls, text + }: + mkDerivation { + pname = "rattletrap"; + version = "13.0.2"; + sha256 = "0yrq5ydwp3p1mw5srk2x4rsv4x466xlkb7468v1mgvhnbd9i85cf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty array base bytestring containers filepath + http-client http-client-tls text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base bytestring filepath ]; + description = "Parse and generate Rocket League replays"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "rattletrap"; + broken = true; + }) {}; + "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit, mtl , network, random, resourcet, text, time, unordered-containers @@ -251191,6 +252264,7 @@ self: { description = "Create React components in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "react-flux" = callPackage @@ -252355,8 +253429,6 @@ self: { ]; description = "Record subtyping and record utilities with generics-sop"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "records-th" = callPackage @@ -253680,7 +254752,6 @@ self: { ]; description = "Interact with a GADT API in your reflex-dom application"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "readme"; }) {}; @@ -254660,8 +255731,8 @@ self: { pname = "regex-tdfa"; version = "1.3.2.2"; sha256 = "1dvmplkhma32y68v4vvpbwmjbg3hzd7qhsyq6pim1fs68b2xaglk"; - revision = "2"; - editedCabalFile = "165gd2gr0x9d3yvdzp8hdiapwz3cgdfbai15zbqdy0cq312d3bwj"; + revision = "3"; + editedCabalFile = "0y3l8ipsxyf47vpgg94p7mrn4f1b82y891vrmqzwcqlci6r1bsp5"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -255663,7 +256734,6 @@ self: { description = "Automation of Haskell package release process"; license = lib.licenses.asl20; mainProgram = "releaser"; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "relevant-time" = callPackage @@ -257243,8 +258313,8 @@ self: { }: mkDerivation { pname = "resourcet-extra"; - version = "0.1.0"; - sha256 = "1vmb0yh94vj507gw8narrwv9vh1imlq4s7373zh9zrpd4x4h9d15"; + version = "0.1.1"; + sha256 = "09da35ik9ic0dx82w1wss4dainp96dzk7lc0cvjyfyzarsyig5z1"; libraryHaskellDepends = [ async base containers resourcet safe-exceptions unliftio-core ]; @@ -257826,6 +258896,8 @@ self: { pname = "retroclash-lib"; version = "0.1.2.2"; sha256 = "18jkrbg3fhz64n6adxa674jng6ajrq89ib53rhjvm053qsafrllh"; + revision = "1"; + editedCabalFile = "0f2l2xvz704yhwb1qwk70z29j3gf1afxvszc6f1sk3cdkkxnxpsd"; libraryHaskellDepends = [ barbies base clash-ghc clash-lib clash-prelude containers ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise @@ -257847,6 +258919,8 @@ self: { pname = "retroclash-sim"; version = "0.1.1"; sha256 = "147i7nbxyxgsvyj2wiaiipi0s8sp14y1av33yba4s148k38zsiw3"; + revision = "1"; + editedCabalFile = "10s1p7j3i37ykwaaf58n1cl3ha128mbl3b6jp9lhvxgxj3f7j06d"; libraryHaskellDepends = [ array arrows base clash-ghc clash-lib clash-prelude ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise @@ -259681,6 +260755,26 @@ self: { broken = true; }) {}; + "roc-id_0_2_0_2" = callPackage + ({ mkDerivation, base, hspec, MonadRandom, Only, QuickCheck, text + , vector-sized + }: + mkDerivation { + pname = "roc-id"; + version = "0.2.0.2"; + sha256 = "1sx66ixilvfzwnic16balzfdynpc891b3lj8gsyp9xd6z059pa61"; + libraryHaskellDepends = [ + base MonadRandom Only text vector-sized + ]; + testHaskellDepends = [ + base hspec MonadRandom Only QuickCheck text vector-sized + ]; + description = "Implementation of the ROC (Taiwan) National ID standard"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "rock" = callPackage ({ mkDerivation, base, constraints, constraints-extras , dependent-hashmap, dependent-sum, deriving-compat, hashable @@ -262121,6 +263215,8 @@ self: { pname = "safe-json"; version = "1.2.0.1"; sha256 = "1y03smd9fjxqfs5q2zi8138k3aafwx691327xavsa2b7q27bvi5b"; + revision = "1"; + editedCabalFile = "1f2fax632djf5vq502ms7qj5jagfw8lz7f0vg53acj9qsnx8pkhp"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -262368,8 +263464,8 @@ self: { pname = "safecopy"; version = "0.10.4.2"; sha256 = "0r2mf0p82gf8vnldx477b5ykrj1x7hyg13nqfn6gzb50japs6h3i"; - revision = "8"; - editedCabalFile = "03w9x2p5cnwngwl698p12vm62gbbd5n3ckw6p9hm0j177jdhsynr"; + revision = "9"; + editedCabalFile = "0mx9d1apd25wg0v6k48kldfbj3vg4vliz7jfxnny91yhb46hql4z"; libraryHaskellDepends = [ array base bytestring cereal containers generic-data old-time template-haskell text time transformers vector @@ -262589,18 +263685,18 @@ self: { "sak" = callPackage ({ mkDerivation, base, bytestring, bz2, cpphs, directory, filepath - , lz4-hs, lzlib, lzma, lzo, optparse-applicative, parallel-io - , unix-compat, zlib, zstd + , lz4-hs, lzlib, lzma-static, lzo, optparse-applicative + , parallel-io, unix-compat, zlib, zstd }: mkDerivation { pname = "sak"; - version = "0.1.3.1"; - sha256 = "12vharmp5f0ffxy4j5kjwqnffc87y4wmzvgcfvp6prqyjfh87qfy"; + version = "0.1.3.2"; + sha256 = "00l01hl0biy4dhs11j2wsd7lqvg3pp20lyppdvf1fjyh2k1jlyiw"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base bytestring bz2 directory filepath lz4-hs lzlib lzma lzo + base bytestring bz2 directory filepath lz4-hs lzlib lzma-static lzo optparse-applicative parallel-io unix-compat zlib zstd ]; executableToolDepends = [ cpphs ]; @@ -263576,6 +264672,7 @@ self: { ]; description = "Send textual messages to a Handle in a thread-friendly way"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "say-my-name" = callPackage @@ -266586,11 +267683,9 @@ self: { ({ mkDerivation, base, containers, QuickCheck, transformers }: mkDerivation { pname = "selective"; - version = "0.7"; - sha256 = "0dhwfhfp57fmg86h5hkizchnk94zdgbpxxfv0r3xp65a7aq546fg"; - revision = "2"; - editedCabalFile = "1lrbw2ii7361hwijfaaw8zrlfqz14dik7wjb23bvn2749kvxms1s"; - libraryHaskellDepends = [ base containers transformers ]; + version = "0.7.0.1"; + sha256 = "1qxfnqidlqw5hbsqs80i77nrkanz73jzyd4w157gamkr3kklpyyv"; + libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base containers QuickCheck transformers ]; description = "Selective applicative functors"; license = lib.licenses.mit; @@ -267724,8 +268819,8 @@ self: { pname = "serialise"; version = "0.2.6.1"; sha256 = "1x3p9vi6daf50xgv5xxjnclqcq9ynqg1qw7af3ppa1nizycrg533"; - revision = "1"; - editedCabalFile = "1y1x0jrc5k7z8r54jk1p1iw18f2psky4ksxd0f8aqfvy1hamzra8"; + revision = "2"; + editedCabalFile = "1y21m10vx4k75x0im5448pl5mhl772hz1hfk47ryb3whz1l6d9vf"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive strict text these time unordered-containers vector @@ -273262,6 +274357,8 @@ self: { pname = "shelly"; version = "1.12.1"; sha256 = "0xqcz0105cvvhngnlzbn2pfrh17vx5p20a1c4c9rp3124922cnhk"; + revision = "1"; + editedCabalFile = "0f71dbh0a3xb82y578z95wchspm2r4i38wiv1s5ls6p6vchk7phm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -274113,7 +275210,6 @@ self: { ]; description = "Deterministic serialisation and signatures with proto-lens support"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "signable-haskell-protoc" = callPackage @@ -277825,31 +278921,27 @@ self: { "smcdel" = callPackage ({ mkDerivation, alex, ansi-terminal, array, base, bytestring - , cassava, containers, criterion, cudd, deepseq, directory - , file-embed, filepath, graphviz, happy, HasCacBDD, hspec - , js-jquery, process, QuickCheck, sandwich, sandwich-webdriver - , scientific, scotty, split, tagged, template-haskell, temporary - , text, time, vector, warp, webdriver + , cassava, containers, criterion, decision-diagrams, directory + , filepath, graphviz, happy, HasCacBDD, hspec, process, QuickCheck + , scientific, split, tagged, temporary, text, time, vector }: mkDerivation { pname = "smcdel"; - version = "1.2.0"; - sha256 = "0ssijqlfnd1nx6w8j1sl4bhwhw78dsbipxlbdknwx340np7rmx11"; + version = "1.3.0"; + sha256 = "09hc0i5v685fsa9slrqmfpqw353x0814r9x5bgw9qjvyrmjqdz2l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base containers cudd directory graphviz HasCacBDD process - QuickCheck tagged temporary text time + array base containers decision-diagrams directory filepath graphviz + HasCacBDD process QuickCheck tagged temporary text time ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ - ansi-terminal base deepseq directory file-embed filepath HasCacBDD - js-jquery process scotty template-haskell text warp + ansi-terminal base directory filepath process ]; executableToolDepends = [ alex happy ]; testHaskellDepends = [ - base containers HasCacBDD hspec process QuickCheck sandwich - sandwich-webdriver text webdriver + base containers HasCacBDD hspec QuickCheck ]; testToolDepends = [ alex happy ]; benchmarkHaskellDepends = [ @@ -277860,6 +278952,7 @@ self: { description = "Symbolic Model Checking for Dynamic Epistemic Logic"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; + mainProgram = "smcdel"; }) {}; "sme" = callPackage @@ -278452,6 +279545,8 @@ self: { pname = "snap"; version = "1.1.3.3"; sha256 = "1mqckzm9gasa04ls691zgw4c6m53mgcj86yd2p5qvy07mpn9rdvx"; + revision = "1"; + editedCabalFile = "06f9xcj6s7ci01v5gkrd1qhrhnnpwijiac83m6nhjpsisx1d11g3"; libraryHaskellDepends = [ aeson attoparsec attoparsec-aeson base bytestring cereal clientsession configurator containers directory directory-tree @@ -278578,8 +279673,8 @@ self: { pname = "snap-core"; version = "1.0.5.1"; sha256 = "00h5xijkjvnhcgxpw3vmkpf5nwfpknqflvxgig6gvsy4wahc2157"; - revision = "3"; - editedCabalFile = "0knsdp65pvj7nxsid6ais24h902k8ag480r1661wy9grkv2i8kp8"; + revision = "5"; + editedCabalFile = "02szs3kljcfzg9kvnv6m8mykrm5big6ki4a7hzian5bb2jpjw4f1"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -278785,8 +279880,8 @@ self: { pname = "snap-server"; version = "1.1.2.1"; sha256 = "0znadz0av6k31s8d175904d2kajxayl38sva3dqh5ckdfkymfx54"; - revision = "3"; - editedCabalFile = "0adjcah7hx47cg066jbjjgn7wz8pvkm0fc87fyz8c7lc0sdmp84f"; + revision = "4"; + editedCabalFile = "02h1gdhd4wi57145s3jjnrghszzry624q55kjry0d54mmxrzgsh1"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -279753,10 +280848,8 @@ self: { }: mkDerivation { pname = "snappy-c"; - version = "0.1.0"; - sha256 = "02q3bikni0ajwiiah3w6bay24wc9ip6jgnb2nidnwshk4s7i84y7"; - revision = "1"; - editedCabalFile = "057h4hmb035562s5zqgc23r6kyzlqmna3s0bf5qw8bama3dk75yp"; + version = "0.1.1"; + sha256 = "1ds454nvw5ps0aq51ld7hjml4096z1zc7m7nvf9dc3wi0awzy43f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -282762,6 +283855,40 @@ self: { broken = true; }) {}; + "sq" = callPackage + ({ mkDerivation, aeson, async, async-pool, attoparsec, base, binary + , bytestring, clock, containers, contravariant, criterion, deepseq + , df1, di, di-core, di-df1, direct-sqlite, directory, exceptions + , filepath, foldl, hedgehog, profunctors, ref-tf, resource-pool + , resourcet, resourcet-extra, safe-exceptions, stm, streaming + , tasty, tasty-hedgehog, tasty-hunit, template-haskell, text, time + , transformers + }: + mkDerivation { + pname = "sq"; + version = "0.0.1"; + sha256 = "064ysq4hvz218l0kcy04axq2g9nvina9q2a5yssgj8jx5qnv289h"; + libraryHaskellDepends = [ + aeson async attoparsec base binary bytestring clock containers + contravariant deepseq di-core di-df1 direct-sqlite directory + exceptions filepath foldl profunctors ref-tf resource-pool + resourcet resourcet-extra safe-exceptions stm streaming + template-haskell text time transformers + ]; + testHaskellDepends = [ + aeson async base binary bytestring df1 di di-core hedgehog ref-tf + resourcet resourcet-extra safe-exceptions tasty tasty-hedgehog + tasty-hunit text time + ]; + benchmarkHaskellDepends = [ + async async-pool base containers criterion df1 di di-core resourcet + resourcet-extra safe-exceptions stm + ]; + description = "High-level SQLite client"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "sqel" = callPackage ({ mkDerivation, aeson, base, chronos, composition, containers , contravariant, exon, extra, first-class-families, generic-lens @@ -283150,7 +284277,6 @@ self: { ]; description = "Squeal PostgreSQL Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "example"; }) {}; @@ -283168,7 +284294,6 @@ self: { ]; description = "LTree extension for Squeal"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "squeal-postgresql-uuid-ossp" = callPackage @@ -283180,7 +284305,6 @@ self: { libraryHaskellDepends = [ base squeal-postgresql ]; description = "UUID OSSP extension for Squeal"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "squeather" = callPackage @@ -283870,15 +284994,15 @@ self: { mainProgram = "stack-all"; }) {}; - "stack-all_0_5_1" = callPackage + "stack-all_0_5_2" = callPackage ({ mkDerivation, aeson, base, cached-json-file, config-ini , directory, extra, filepath, http-query, process, simple-cmd , simple-cmd-args, text }: mkDerivation { pname = "stack-all"; - version = "0.5.1"; - sha256 = "0s1kxilmzrdwf44gx7wrpxd443kyfwx435ps68hzv0qyz5q8k5nw"; + version = "0.5.2"; + sha256 = "0ih25r2avwl6f2nqxa7sqaf070mnr27baw9wxfyr2pvv9i9nv6an"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -285987,12 +287111,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "stm_2_5_3_0" = callPackage + "stm_2_5_3_1" = callPackage ({ mkDerivation, array, base }: mkDerivation { pname = "stm"; - version = "2.5.3.0"; - sha256 = "1xy3sj69wcb92fg0y5lp0qxcsi3pyvvrrrn4fpi2snji4j3k47hv"; + version = "2.5.3.1"; + sha256 = "1rrh4s07vav9mlhpqsq9r6r0gh3f4k8g1gjlx63ngkpdj59ldc7b"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = lib.licenses.bsd3; @@ -286255,6 +287379,8 @@ self: { ]; description = "An implementation of a real-time concurrent queue"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "stm-queue-extras" = callPackage @@ -288393,6 +289519,8 @@ self: { pname = "string-interpolate"; version = "0.3.3.0"; sha256 = "1m4m9ivi29q90fvrinigqwz4qmnxnbi895l1gmsrp7j0bmwjxhrb"; + revision = "1"; + editedCabalFile = "1xys5lmy4xj9z2yj3lnhcv43wi4yqgchkbkd0adr8m6snfpabbcl"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -288408,6 +289536,7 @@ self: { ]; description = "Haskell string/text/bytestring interpolation that just works"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "string-interpreter" = callPackage @@ -289088,8 +290217,8 @@ self: { pname = "structs"; version = "0.1.9"; sha256 = "033vx729k9jn4w4hs3kp8nlnf0ylsqgg3q4cmb7zjfpgk4bk511w"; - revision = "1"; - editedCabalFile = "1kqpzh7grxz0any100sk42v54idmvh27zh8k9q0yq684frmwf4mh"; + revision = "2"; + editedCabalFile = "1lkx7hflya4v5pkwrf3n01rx6z9rficy2s8k2b3xx8fsch932a4s"; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell th-abstraction ]; @@ -290901,9 +292030,7 @@ self: { ]; description = "A tool to prune unused symbols from icon SVG files"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "svgsym"; - broken = true; }) {}; "svgutils" = callPackage @@ -292304,6 +293431,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "symbol-parser" = callPackage + ({ mkDerivation, base, defun-core, type-spec }: + mkDerivation { + pname = "symbol-parser"; + version = "0.3.0"; + sha256 = "08p1zr1v6rfba0k36zppl2hgz08n9nibxbc4vwj8b59f47m39k9q"; + libraryHaskellDepends = [ base defun-core ]; + testHaskellDepends = [ base defun-core type-spec ]; + description = "Type level string parser combinators"; + license = lib.licenses.mit; + }) {}; + "symbolic-link" = callPackage ({ mkDerivation, base, directory, tasty, tasty-hunit, unix }: mkDerivation { @@ -292807,10 +293946,10 @@ self: { }: mkDerivation { pname = "synthesizer-core"; - version = "0.8.3"; - sha256 = "0a12qmr7fdlz5mbrki9nd1fl07670hll3wrdpp1apvf6zd36h7mn"; - revision = "4"; - editedCabalFile = "0xacplyxilmrly1nxdiz42divjiky7lz5aq5lizn7ax2n0jy1sdg"; + version = "0.8.4"; + sha256 = "11m5zvnwzrsd5ylyc6xd4k56ypmmwzyhixvzc55hgjfpsx9snks9"; + revision = "1"; + editedCabalFile = "1q274hspisb2qi45dj01dcm2sxfcqib0i96jkc2jzlvaynnnqhlr"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -295150,6 +296289,7 @@ self: { ]; description = "Modern and extensible testing framework"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "tasty_1_5" = callPackage @@ -295169,6 +296309,7 @@ self: { description = "Modern and extensible testing framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "tasty-ant-xml" = callPackage @@ -295818,6 +296959,8 @@ self: { pname = "tasty-lua"; version = "1.1.1"; sha256 = "186322a9gwndnpis4r7nzlca4iymrz712bbbxpm0pxsw63xary06"; + revision = "1"; + editedCabalFile = "180jy8dhr7mdfgj5xgnwddm5lh8ahbvs78y07g9zgpsxkdnm5ghn"; libraryHaskellDepends = [ base bytestring file-embed hslua-core hslua-marshalling lua-arbitrary QuickCheck tasty text @@ -295952,8 +297095,8 @@ self: { pname = "tasty-quickcheck"; version = "0.10.3"; sha256 = "02lw6gk83b6wc9dwd3shin58zqy9isgx4zh7z0whs0wkzwzkpyyg"; - revision = "1"; - editedCabalFile = "0rk57yzsrw8lbzjwcsd3pnfwic12cvnpv245g2dsw50dvqd2922k"; + revision = "2"; + editedCabalFile = "0j2g1cngc5xk190jsm2k7kh25y1afmbr37abi09wvlyq8ja4n59r"; libraryHaskellDepends = [ base optparse-applicative QuickCheck random tagged tasty ]; @@ -299970,10 +301113,10 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.10.4"; - sha256 = "0kjpl9wbvn5zcpwjyrvdnkcp260rizff598cmqh4py8225fl5bmz"; - revision = "3"; - editedCabalFile = "0zsds6226kymk9a6jq9hc45knp3rjwc3rmiar0kccjzd6khf7s9c"; + version = "3.10.5"; + sha256 = "0sn8mgj7f6jric4zyfigkf8abwwx3j9k0l9jy1lhrc5ih7w6xffm"; + revision = "1"; + editedCabalFile = "1q5bnaxcwpwn80sr7vbk87cxz8s46b2bxrsljq6h1sfdskvc5xkd"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -300004,8 +301147,10 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "3.9.7"; - sha256 = "1rxsg0i304wanzgd792nj7pgkmw3iq0n7pwsg27h55vi7kp2rmiw"; + version = "3.9.8"; + sha256 = "13h2nfbmqzll9glifi7n9dkmaxks72w8ciwzwk106iygzpbrnw3c"; + revision = "1"; + editedCabalFile = "17nzy1wr318m90bdmj37rrzwsfhri28azgaqrvpl5igllc4d0480"; libraryHaskellDepends = [ aeson base base-compat bifunctors binary containers directory ghc-boot-th haskeline hpc nonempty-vector old-locale old-time @@ -300472,6 +301617,8 @@ self: { pname = "th-compat"; version = "0.1.5"; sha256 = "07ia72hl6c1rqx1gl3zpvig7d8sw2ssbgf4wq1ipgbdgqypmzxc1"; + revision = "1"; + editedCabalFile = "0gyqnv9x7vb82ll1mppnv1w6wzmpzv40wkq0rpgxf68inwlf6vha"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base base-compat hspec mtl template-haskell @@ -300631,8 +301778,8 @@ self: { pname = "th-expand-syns"; version = "0.4.11.0"; sha256 = "1l7pkc16vnjgiam31745av14j7ngnr5mqmgp77xwd3h7fg75kkca"; - revision = "3"; - editedCabalFile = "1wgylchq9q30yf1f19rr6pvh7mkpwzdy4ij2r7174fjb1wkgnnx7"; + revision = "4"; + editedCabalFile = "0vjznxgzzvlr39hq0pqvachaihsbp0m2fwrii89rjzhx0mlfy4l7"; libraryHaskellDepends = [ base containers syb template-haskell th-abstraction ]; @@ -300647,8 +301794,10 @@ self: { }: mkDerivation { pname = "th-extras"; - version = "0.0.0.7"; - sha256 = "0zxbqmdzrljjcj5dh2yi0hgjjd6a3wyg2r989vvcsdfxfcb0dl46"; + version = "0.0.0.8"; + sha256 = "1hvpvb02j2zyg4mpdqzs3w4s7wva78npdlrnpsii7nps2fpvcmrs"; + revision = "1"; + editedCabalFile = "065l0xfzdq529d64qnh2s13zvswhjzv9ndyf7m7hzzbg8y83flbc"; libraryHaskellDepends = [ base containers syb template-haskell th-abstraction ]; @@ -300871,8 +302020,8 @@ self: { pname = "th-orphans"; version = "0.13.14"; sha256 = "0z07qcbbsj2b3j9p1qr4jvlpa7qgjfjvymkjd6vbizka1wd2mnwx"; - revision = "2"; - editedCabalFile = "1kjb7ik4js6bpsdb32sna8xcxamia02fhx1wcbg831mnf2qfpp6w"; + revision = "3"; + editedCabalFile = "19gh8f082ia27ch7xjj41vwlp7234sv545hhb3kcwkmw9brc67aj"; libraryHaskellDepends = [ base mtl template-haskell th-compat th-lift th-reify-many ]; @@ -302099,6 +303248,8 @@ self: { pname = "tidal"; version = "1.9.5"; sha256 = "1skm8x9gh60c0i1rr0a18jxi6y4mpi83fvzjcadlziwjna5x6a3w"; + revision = "1"; + editedCabalFile = "1hp0r7mav7m6ga6lxjvw7lkhnw240a7pzc65s97k4kcax2ibvq96"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clock colour containers deepseq exceptions hosc mtl @@ -302351,6 +303502,8 @@ self: { pname = "time"; version = "1.14"; sha256 = "0gkzffnvi33ksw4zln0d31dpmqiyl8gicrx04g8j13kjr5ygx86z"; + revision = "1"; + editedCabalFile = "13brg65cvava8w5wlfp3jwn7mpkprad1chws2v14jw1lgzh5b14i"; libraryHaskellDepends = [ base deepseq template-haskell ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -302551,6 +303704,18 @@ self: { license = lib.licenses.mit; }) {}; + "time-manager_0_1_0" = callPackage + ({ mkDerivation, auto-update, base, unliftio }: + mkDerivation { + pname = "time-manager"; + version = "0.1.0"; + sha256 = "1r2wgi160nkky220bdwknld1ymfpq4541pzbhmkna670r1ahzcb2"; + libraryHaskellDepends = [ auto-update base unliftio ]; + description = "Scalable timer"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "time-out" = callPackage ({ mkDerivation, base, data-default-class, exceptions , time-interval, time-units, transformers @@ -303077,6 +304242,8 @@ self: { pname = "timers-tick"; version = "0.5.0.4"; sha256 = "0q10njbdkiknqyvp276qpac7286z204f0a7qm7hafxzn7wrrp9mn"; + revision = "1"; + editedCabalFile = "1l4fcrdkmf96a962a5rhv7r1hbxzq7258d1qr25j8bsyci1jrzcd"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "tick based timers"; @@ -303919,7 +305086,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "tls_2_0_2" = callPackage + "tls_2_0_5" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base , base16-bytestring, bytestring, cereal, crypton, crypton-x509 , crypton-x509-store, crypton-x509-validation, data-default-class @@ -303928,8 +305095,10 @@ self: { }: mkDerivation { pname = "tls"; - version = "2.0.2"; - sha256 = "188m4p63h3wl0rjh8w99amyl6y0r3camk76f5ivnd56vxf3cx74g"; + version = "2.0.5"; + sha256 = "1qgwgbhp19a28ibb73h1ahkrwsjnv3hndfj3bsp9fb1s4856vn6z"; + revision = "1"; + editedCabalFile = "0717sfkj6jzpnp0r5013m3z6s25fnnrcd07lfdlpzxhs5fdjnk36"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -304013,8 +305182,8 @@ self: { pname = "tls-session-manager"; version = "0.0.5"; sha256 = "0zfls8ckskip43vrjvvqafv0c9wb5a6j507j2fjjczb0gm9gdq5m"; - revision = "1"; - editedCabalFile = "109d07s6gp5flhhnsy96fnz1i0y9r7j2c06ql7k9gv8xaa8pa9s9"; + revision = "2"; + editedCabalFile = "1qlm2y0zjcf3dsqnv0pi730bmbl4nqk3r0a826fydpaphv1xgh6v"; libraryHaskellDepends = [ auto-update base basement bytestring clock crypto-token memory psqueues serialise tls @@ -304145,25 +305314,28 @@ self: { license = lib.licenses.bsd3; }) {}; - "tmp-proc_0_6_1_0" = callPackage - ({ mkDerivation, async, base, bytestring, data-default, hspec - , http-client, http-types, mtl, network, process, text, tls + "tmp-proc_0_6_2_1" = callPackage + ({ mkDerivation, async, base, bytestring, crypton-connection + , crypton-x509-system, data-default, directory, filepath, fmt + , hspec, http-client, http-client-tls, http-types, mtl, mustache + , network, process, random, temporary, test-certs, text, tls, unix , unliftio, wai, warp, warp-tls }: mkDerivation { pname = "tmp-proc"; - version = "0.6.1.0"; - sha256 = "0qhapmpwlslcr0b4r4031arhixmfm5dwhjz6qhcbjdf1q7jq68lr"; + version = "0.6.2.1"; + sha256 = "1c636l8543fb2mpd9w2gx3njkk3b9lxs59x4r74pv5vg9idz11dk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - async base bytestring mtl network process text tls unliftio wai - warp warp-tls + async base bytestring fmt mtl network process random text tls + unliftio wai warp warp-tls ]; testHaskellDepends = [ - base bytestring data-default hspec http-client http-types text wai - warp + base bytestring crypton-connection crypton-x509-system data-default + directory filepath hspec http-client http-client-tls http-types + mustache temporary test-certs text tls unix wai warp warp-tls ]; description = "Run 'tmp' processes in integration tests"; license = lib.licenses.bsd3; @@ -304923,8 +306095,8 @@ self: { pname = "tomland"; version = "1.3.3.2"; sha256 = "152jqjv6n7n2hdysn903wfhpwh6vp8wmjiymzasazprasdcxpywm"; - revision = "2"; - editedCabalFile = "03xx2wqwyp11yxdnlwxi110wkm6shwpfgzdnzjwdw6cqijdc6zc8"; + revision = "3"; + editedCabalFile = "06kwxbrqvcpzk4dw4pk8icj9mf16rnaz2g301y0q57gdikxj8yca"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -309680,6 +310852,18 @@ self: { broken = true; }) {}; + "type-level-bytestrings" = callPackage + ({ mkDerivation, base, type-spec }: + mkDerivation { + pname = "type-level-bytestrings"; + version = "0.1.0"; + sha256 = "06iw0plkkwl514w4nx5188v35x22abxmqfg1alnlqr1ihssmgf63"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base type-spec ]; + description = "Tools for manipulating type-level bytes and bytestrings"; + license = lib.licenses.mit; + }) {}; + "type-level-integers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -310185,6 +311369,17 @@ self: { broken = true; }) {}; + "typeably" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "typeably"; + version = "0.1.0"; + sha256 = "1fz0yblkw304fvg138h31am930f4kdvsrf9r3nxnxcc21jzy18ps"; + libraryHaskellDepends = [ base ]; + description = "DerivingVia Typeable counterpart to Generically"; + license = lib.licenses.mit; + }) {}; + "typechain" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit , lens, mtl, split, template-haskell, unordered-containers @@ -313456,7 +314651,6 @@ self: { ]; description = "A class for finite and recursively enumerable types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "universe-base" = callPackage @@ -313485,7 +314679,6 @@ self: { libraryHaskellDepends = [ base universe-some ]; description = "Universe instances for types from dependent-sum"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "universe-instances-base" = callPackage @@ -313565,8 +314758,6 @@ self: { testHaskellDepends = [ base some template-haskell universe-base ]; description = "Universe instances for Some from some"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "universe-th" = callPackage @@ -315707,8 +316898,8 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.4.4"; - sha256 = "0is31qp6vbbbs4qnbbyh2wlcwrh2jkjq4ffml2nb4sbb47cl459z"; + version = "0.0.5.1"; + sha256 = "1k46h256vdzwqbg7g44la8k41rlwwa4xjpzl1506zr3dsxvjgab2"; libraryHaskellDepends = [ base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; @@ -315724,10 +316915,8 @@ self: { }: mkDerivation { pname = "utxorpc-client"; - version = "0.0.1.1"; - sha256 = "1l588nhg9ssqdwdx6pvqsj4mgl88rp4fbnba8ph4hf9jqf9j81ci"; - revision = "1"; - editedCabalFile = "1lqarn3bycipy6rbqy9p4ypsq0xvpm0qwmjpgkqs0ivr6wp9vnas"; + version = "0.0.2.0"; + sha256 = "1i9gzr4dlhy3j0x2mx9idgc16r0yz7qw72z6gc10s4vlbbrc1mnb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -315756,10 +316945,8 @@ self: { }: mkDerivation { pname = "utxorpc-server"; - version = "0.0.1.1"; - sha256 = "025lrc650b0kjw1z5vsjqg1ylb8zjv4bm5jrlk8dilb5yipk3zjq"; - revision = "1"; - editedCabalFile = "06hxrc4d93v814yiv09x6f7pjphx9hk3jbgv6cnwi4bx9ryp7sak"; + version = "0.0.2.0"; + sha256 = "1sbbyhf4av2vrqnz2g7gzm0q28bchw2jqnyqr42az7jddki9r93l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -317754,6 +318941,8 @@ self: { pname = "vector-hashtables"; version = "0.1.1.4"; sha256 = "0nvi9j18v8xfb3p2q65bi9f3rzrw2bc2nz2q096flxjf72ipapac"; + revision = "1"; + editedCabalFile = "1n3s6czg2h51dwqwfisi943agsi5x1fin5ja6waz67gyp1cc77hc"; libraryHaskellDepends = [ base hashable primitive vector ]; testHaskellDepends = [ base containers hashable hspec primitive QuickCheck @@ -317767,6 +318956,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector-hashtables_0_1_2_0" = callPackage + ({ mkDerivation, base, containers, criterion, hashable, hashtables + , hspec, hspec-discover, primitive, QuickCheck + , quickcheck-instances, unordered-containers, vector + }: + mkDerivation { + pname = "vector-hashtables"; + version = "0.1.2.0"; + sha256 = "1s0c3d4f61rgvb0i8c2m3lazxbxg2cpv1pq4k4lnr7nga7sama9r"; + libraryHaskellDepends = [ base hashable primitive vector ]; + testHaskellDepends = [ + base containers hashable hspec primitive QuickCheck + quickcheck-instances vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion hashtables primitive unordered-containers vector + ]; + description = "Efficient vector-based mutable hashtables implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-heterogenous" = callPackage ({ mkDerivation, base, vector }: mkDerivation { @@ -318077,8 +319289,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.2"; sha256 = "0j81m09xxv24zziv0nanfppckzmas5184jr3npjhc9w49r3cm94a"; - revision = "5"; - editedCabalFile = "1mw2ssj6a772cvw2mf0r5qvz4blaq8k194p6bj0wnl1plr16r90b"; + revision = "6"; + editedCabalFile = "1pdl1xvr1b4zg32b9d8jv4jakjnd5id5wdj2czgzajr6xlkvyhir"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -318424,6 +319636,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "versions_5_0_5" = callPackage + ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens + , parser-combinators, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "5.0.5"; + sha256 = "01kn3ilizzm5n05nz0qry1vjb6bj8dzinyqn3mbshds298acn70c"; + libraryHaskellDepends = [ + base deepseq hashable megaparsec parser-combinators text + ]; + testHaskellDepends = [ + base megaparsec microlens QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "versions" = callPackage ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens , parser-combinators, tasty, tasty-hunit, template-haskell, text @@ -318486,7 +319719,6 @@ self: { doHaddock = false; description = "Functor-parametric containers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "vflow-types" = callPackage @@ -318881,7 +320113,6 @@ self: { ]; description = "Convert plain records to vinyl (and vice versa), generically"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "vinyl-gl" = callPackage @@ -319727,8 +320958,8 @@ self: { }: mkDerivation { pname = "vty-windows"; - version = "0.2.0.2"; - sha256 = "12dd00lp5vx8fijj6i3ihd5553k9b127lh25li50dimkxf5vrwjv"; + version = "0.2.0.3"; + sha256 = "12f91izwg4r18zvdbnkwd8jk7agdyy3w3bcljrm92hib43i210id"; libraryHaskellDepends = [ base blaze-builder bytestring containers deepseq directory filepath microlens microlens-mtl microlens-th mtl parsec stm transformers @@ -321199,8 +322430,8 @@ self: { pname = "wai-middleware-static"; version = "0.9.2"; sha256 = "1ynm0xcr3pj5bbph78p1kpyxvd0n3a0gfdbm6yb7i004ixaqf33c"; - revision = "4"; - editedCabalFile = "0kmy18qq2mc5mlmnx6xaj1wkk63jl0s4fn16zbd6cyb6jb8n2lq4"; + revision = "5"; + editedCabalFile = "059vp0ipdgfpldzmqqhkayak6dicj8qhpb2qcwdk8y31bcg7895m"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash-sha1 directory expiring-cache-map filepath http-types mime-types @@ -322161,7 +323392,7 @@ self: { license = lib.licenses.mit; }) {}; - "warp_3_4_0" = callPackage + "warp_3_4_1" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client @@ -322171,8 +323402,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.4.0"; - sha256 = "0p68qzap25na55gnc521c8yvdf4zfy86l2x8cqfw9kmr28f71s75"; + version = "3.4.1"; + sha256 = "0f4cs9qb3cpagryijzw46r5y5bd2srvb4b3phffydj5aim253jfp"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers crypton-x509 ghc-prim hashable http-date http-types @@ -322300,8 +323531,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.4.4"; - sha256 = "1l8lxqakz5c060sif6qz3nz019xan5zhdf5l8xmwy00aq8ccs6ba"; + version = "3.4.5"; + sha256 = "0j4m5idjg7fa8snc46lhf5gwwdgq004pjmqzfcb78pf1px1y0gwy"; libraryHaskellDepends = [ base bytestring data-default-class network recv streaming-commons tls tls-session-manager unliftio wai warp @@ -327227,8 +328458,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "2.0.1.7"; - sha256 = "09ad7bxkg46kgmkf49n86wqkzpsz277kiiwhw81awgivfacqkcvy"; + version = "2.0.1.8"; + sha256 = "1pdh44r11yxyjgyb8la28crsm7sk09fshmqcgxyxczwfjsa85dpk"; libraryHaskellDepends = [ base bytestring crypton-connection exceptions network websockets ]; @@ -327650,8 +328881,8 @@ self: { ({ mkDerivation, base, containers, mtl, pretty, xml }: mkDerivation { pname = "xcb-types"; - version = "0.13.0"; - sha256 = "0qdfj4d83b1fjmlysqncgi65ldf3qnrsj4lync95mgbaq2kzxj2r"; + version = "0.14.0"; + sha256 = "184ap6lpd29bx4b3dxpcpzc3za9m4gz2fwf7565mxlxlwjbyamhv"; libraryHaskellDepends = [ base containers mtl pretty xml ]; description = "Parses XML files used by the XCB project"; license = lib.licenses.bsd3; @@ -329623,8 +330854,8 @@ self: { pname = "xor"; version = "0.0.1.2"; sha256 = "0c0a1zg0kwp3jdlgw6y1l6qp00680khxa3sizx5wafdv09rwmrxc"; - revision = "2"; - editedCabalFile = "160vvj5icka4i76b7x2qg3l9gvxib0shgs5zrvj27r587vd81rl5"; + revision = "3"; + editedCabalFile = "0lj7kp8119cbl5g3ndnkr4fjgcwk6liar79j4rvrf1zyr5xflknr"; libraryHaskellDepends = [ base bytestring ghc-byteorder ]; testHaskellDepends = [ base bytestring ghc-byteorder QuickCheck tasty tasty-hunit @@ -330697,24 +331928,25 @@ self: { ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , containers, criterion, deepseq, directory, filepath, hspec , hspec-discover, HUnit, libyaml-streamly, megaparsec, mockery, mtl - , raw-strings-qq, safe-exceptions, scientific, streamly, strict - , template-haskell, temporary, text, transformers + , raw-strings-qq, safe-exceptions, scientific, streamly-core + , strict, template-haskell, temporary, text, transformers , unordered-containers, vector, versions }: mkDerivation { pname = "yaml-streamly"; - version = "0.12.4"; - sha256 = "06cr9qqxxck6qgdc0lizjlkzm9j0mhyj4p64wymhkwd70dyhlfmz"; + version = "0.12.5"; + sha256 = "0gkgbqki58snxzsd1wa0gs22bwx6fax0b32zc3dy53n9fyivbwiz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers deepseq directory - filepath libyaml-streamly mtl safe-exceptions scientific streamly - template-haskell text transformers unordered-containers vector + filepath libyaml-streamly mtl safe-exceptions scientific + streamly-core template-haskell text transformers + unordered-containers vector ]; testHaskellDepends = [ aeson base base-compat bytestring directory hspec HUnit - libyaml-streamly mockery raw-strings-qq scientific streamly + libyaml-streamly mockery raw-strings-qq scientific streamly-core temporary text unordered-containers vector ]; testToolDepends = [ hspec-discover ]; @@ -330848,8 +332080,8 @@ self: { pname = "yampa-canvas"; version = "0.2.3"; sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r"; - revision = "12"; - editedCabalFile = "0j9n3xd4hxir1x46yrr8vwrbr8yziw5xfjzvn2j57jrx0qs9c0fb"; + revision = "13"; + editedCabalFile = "1401zbwg52q3y277h60c0ahwz105iakxfqpvi50bc8q6w56g7jbq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -331640,8 +332872,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.11.2"; - sha256 = "0yqyggdvfi0kg4qa0is3lqifz40kgyjll445yxcpv6m8vcd2r1a1"; + version = "1.6.11.3"; + sha256 = "1qfzg4khdzrhzq78323648780divjllqrxn9hhzpnis61f0fwni8"; libraryHaskellDepends = [ aeson attoparsec-aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup @@ -335642,10 +336874,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "2.0.0"; - sha256 = "1j3gwhgcn2j2jsdg4dw7a5y1pw0n273zkfk782pvzjqmccaywbdp"; - revision = "3"; - editedCabalFile = "1b6izcvvrhdra0jxp2s7xk9xv41iwq3yc9bpi44nmc2fj4ra4r2v"; + version = "2.0.1"; + sha256 = "0djjj1r30hfair0qq9vzla4qlaw60gmg2963vwch9pgiylzm2f5h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -335656,8 +336886,8 @@ self: { ]; executableHaskellDepends = [ base filepath ]; testHaskellDepends = [ - base bytestring conduit containers directory dlist exceptions - filepath hspec QuickCheck temporary text time transformers + base bytestring conduit containers directory dlist filepath hspec + QuickCheck temporary text time ]; description = "Operations on zip archives"; license = lib.licenses.bsd3; @@ -335665,30 +336895,6 @@ self: { }) {}; "zip-archive" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , digest, directory, filepath, HUnit, mtl, pretty, process - , temporary, text, time, unix, which, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.4.3.1"; - sha256 = "0f9z0p2vmqahk9fzxwp5914f3ls4wsacd9bf5p5nnd5vdp1navyf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl pretty text time unix zlib - ]; - testHaskellDepends = [ - base bytestring directory filepath HUnit process temporary time - unix - ]; - testToolDepends = [ which ]; - description = "Library for creating and modifying zip archives"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) which;}; - - "zip-archive_0_4_3_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, pretty, process , temporary, text, time, unix, which, zlib @@ -335710,7 +336916,6 @@ self: { testToolDepends = [ which ]; description = "Library for creating and modifying zip archives"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) which;}; "zip-cmd" = callPackage @@ -335935,16 +337140,14 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) zlib;}; - "zlib_0_7_0_0" = callPackage + "zlib_0_7_1_0" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, tasty , tasty-quickcheck, zlib }: mkDerivation { pname = "zlib"; - version = "0.7.0.0"; - sha256 = "0ivszx31jw560axchxz9g646baw2rs6fr1ih0d5mmzz1w42w4hvy"; - revision = "1"; - editedCabalFile = "1fiwhzs7sp3ck75ii176pakmwjqcjlv0fiqcqka6r8p9jdf958b4"; + version = "0.7.1.0"; + sha256 = "1g2md8z0ijcbrqlx9q9i49myi2lnlvzmma1ajmsd5y0xp2v3ipbf"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ zlib ]; testHaskellDepends = [ @@ -335989,6 +337192,17 @@ self: { broken = true; }) {}; + "zlib-clib" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "zlib-clib"; + version = "1.3.1"; + sha256 = "153aldw8vqy6wzz7knbzyfkxsr3gsv5hjf4y84s12ifx2fi8zfkn"; + doHaddock = false; + description = "zlib C library bits"; + license = lib.licenses.zlib; + }) {}; + "zlib-conduit" = callPackage ({ mkDerivation, base, conduit }: mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix index 52d0af869c..50dc7414ca 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix @@ -211,15 +211,21 @@ in package-set { inherit pkgs lib callPackage; } self // { }) firstRevision; # Creates a Haskell package from a source package by calling cabal2nix on the source. - callCabal2nixWithOptions = name: src: extraCabal2nixOptions: args: + callCabal2nixWithOptions = name: src: opts: args: let - filter = path: type: + extraCabal2nixOptions = if builtins.isString opts + then opts + else opts.extraCabal2nixOptions or ""; + srcModifier = opts.srcModifier or null; + defaultFilter = path: type: pkgs.lib.hasSuffix ".cabal" path || baseNameOf path == "package.yaml"; expr = self.haskellSrc2nix { inherit name extraCabal2nixOptions; - src = if pkgs.lib.canCleanSource src - then pkgs.lib.cleanSourceWith { inherit src filter; } + src = if srcModifier != null + then srcModifier src + else if pkgs.lib.canCleanSource src + then pkgs.lib.cleanSourceWith { inherit src; filter = defaultFilter; } else src; }; in overrideCabal (orig: { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/git-annex-no-usr-prefix.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/git-annex-no-usr-prefix.patch new file mode 100644 index 0000000000..03c9368d52 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/git-annex-no-usr-prefix.patch @@ -0,0 +1,13 @@ +diff --git a/Utility/FreeDesktop.hs b/Utility/FreeDesktop.hs +index 896b89b991..6cbb4f90ae 100644 +--- a/Utility/FreeDesktop.hs ++++ b/Utility/FreeDesktop.hs +@@ -112,7 +112,7 @@ desktopfile f = f ++ ".desktop" + + {- Directory used for installation of system wide data files.. -} + systemDataDir :: FilePath +-systemDataDir = "/usr/share" ++systemDataDir = "/share" + + {- Directory used for installation of system wide config files. -} + systemConfigDir :: FilePath diff --git a/third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix index 541c3525b6..e6570c2e89 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "boron"; - version = "2.0.8"; + version = "2.1.0"; src = fetchurl { url = "https://sourceforge.net/projects/urlan/files/Boron/boron-${version}.tar.gz"; - sha256 = "sha256-Ni/LJgOABC2wXDMsg1ZAuZWSQdFT9/Fa4lH4+V0gy8M="; + sha256 = "sha256-50HKcK2hQpe9k9RIoVa/N5krTRKlW9AsGYTmHITx7Nc="; }; # this is not a standard Autotools-like `configure` script diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix index cedc8ef292..8fd965874f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.11.2.1446"; + version = "1.11.3.1463"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-qn7/sPyVDfjZPLeWxlUBBljAW/d8cCw6lEm3/deS73E="; + hash = "sha256-26QZ3j54XztpW2WJ1xg0Gc+OwrsvmfK4iv0GsLV8FIc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/emilua/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/emilua/default.nix index 03ba8d81cf..e71c47ae59 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/emilua/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/emilua/default.nix @@ -1,45 +1,47 @@ -{ lib -, stdenv -, meson -, ninja -, fetchFromGitHub -, fetchFromGitLab -, re2c -, gperf -, gawk -, pkg-config -, boost182 -, fmt -, luajit_openresty -, ncurses -, serd -, sord -, libcap -, liburing -, openssl -, cereal -, cmake -, asciidoctor +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitHub, + fetchFromGitLab, + re2c, + gperf, + gawk, + pkg-config, + boost182, + fmt, + luajit_openresty, + ncurses, + serd, + sord, + libcap, + liburing, + openssl, + cereal, + cmake, + asciidoctor, + makeWrapper, }: let trial-protocol-wrap = fetchFromGitHub { - owner = "breese"; - repo = "trial.protocol"; - rev = "79149f604a49b8dfec57857ca28aaf508069b669"; - name = "trial-protocol"; - hash = "sha256-Xd8bX3z9PZWU17N9R95HXdj6qo9at5FBL/+PTVaJgkw="; + owner = "breese"; + repo = "trial.protocol"; + rev = "79149f604a49b8dfec57857ca28aaf508069b669"; + name = "trial-protocol"; + hash = "sha256-Xd8bX3z9PZWU17N9R95HXdj6qo9at5FBL/+PTVaJgkw="; }; in stdenv.mkDerivation rec { pname = "emilua"; - version = "0.6.0"; + version = "0.7.3"; src = fetchFromGitLab { - owner = "emilua"; - repo = "emilua"; - rev = "v${version}"; - hash = "sha256-cW2b+jUQT60hCCirBzxZltzA7KvBihnzWNPkKDID6kU="; + owner = "emilua"; + repo = "emilua"; + rev = "v${version}"; + hash = "sha256-j8ohhqHjSBgc4Xk9PcQNrbADmsz4VH2zCv+UNqiCv4I="; }; buildInputs = [ @@ -64,6 +66,7 @@ stdenv.mkDerivation rec { meson cmake ninja + makeWrapper ]; dontUseCmakeConfigure = true; @@ -90,7 +93,17 @@ stdenv.mkDerivation rec { cp "packagefiles/trial.protocol/meson.build" "trial-protocol/" popd - substituteInPlace src/emilua_gperf.awk --replace '#!/usr/bin/env -S gawk --file' '#!${gawk}/bin/gawk -f' + patchShebangs src/emilua_gperf.awk --interpreter '${lib.getExe gawk} -f' + ''; + + doCheck = true; + + # Skipped test: libpsx + # Known issue with no-new-privs disabled in the Nix build environment. + checkPhase = '' + runHook preCheck + meson test --print-errorlogs --no-suite libpsx + runHook postCheck ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix index 441d12d747..57de6e35dc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.11"; - sha256 = "sha256-GeYDTgUcU//KjEw8jX/zR5OagHQLqpYLitn1PVmcIi0="; + version = "25.3.2.12"; + sha256 = "sha256-ZqyJtKr0QdzuuzKnJ/S6Z4cGLWolVMVWcMuAHyOGzkQ="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/26.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/26.nix index 1de18ab101..a17facb1c1 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/26.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "26.2.4"; - sha256 = "sha256-gTyBS5Q5V+bjwQQz+C55ZfYf8iAivn3V5qtvmfCo1XM="; + version = "26.2.5"; + sha256 = "sha256-tUAvzkTE51gT4kS7voEZZpsMKVyBQR+wgk6mI0s1Vac="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/27-rc2.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/27-rc2.nix deleted file mode 100644 index a9b6fa05e5..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/27-rc2.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "27.0-rc2"; - sha256 = "sha256-o+uqQMlrh7wJQbiecMnn3/tv6nqSJh7unOj0A95mMb0="; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/27-rc3.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/27-rc3.nix new file mode 100644 index 0000000000..77e59672c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/27-rc3.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: + +mkDerivation { + version = "27.0-rc3"; + sha256 = "sha256-c2DTIqBd7UxpSv84F1cCB9K+MkJb5OwnWSghtewnw/4="; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index 32d1466f32..2f3b6de7d1 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -29,7 +29,7 @@ , common-updater-scripts , coreutils , git -, wrapGAppsHook +, wrapGAppsHook3 }: { baseName ? "erlang" , version @@ -46,7 +46,7 @@ , odbcSupport ? false , odbcPackages ? [ unixODBC ] , opensslPackage ? openssl -, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 wrapGAppsHook ] +, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 wrapGAppsHook3 ] , preUnpack ? "" , postUnpack ? "" , patches ? [ ] diff --git a/third_party/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix index ecd3bc1f8f..34efdc91ac 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "femtolisp"; - version = "unstable-2023-07-12"; + version = "0-unstable-2023-07-12"; src = fetchFromSourcehut { owner = "~ft"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/gnudatalanguage/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/gnudatalanguage/default.nix index 54b5c5898c..41f15afbee 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/gnudatalanguage/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/gnudatalanguage/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , cmake -, wrapGAppsHook +, wrapGAppsHook3 , readline , ncurses , zlib @@ -157,7 +157,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optional enableWX wrapGAppsHook; + ] ++ lib.optional enableWX wrapGAppsHook3; cmakeFlags = lib.optional (!enableHDF4) "-DHDF=OFF" ++ [ (if enableHDF5 then "-DHDF5DIR=${hdf5-custom}" else "-DHDF5=OFF") ] diff --git a/third_party/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix index e6d32f40c4..d97c94fbd8 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix @@ -5,7 +5,7 @@ , gtk3 , libffcall , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cd src ''; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ libffcall glib gtk3 ]; configureOptions = [ "--with-gtk3" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix index 7456619a9a..1c6cbb96a4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "janet"; - version = "1.33.0"; + version = "1.34.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = "janet"; rev = "v${finalAttrs.version}"; - hash = "sha256-kXbJtWxvysC4hLkgVyPpkunFhN+2iVu+S+LCo5ikj5s="; + hash = "sha256-DxUEFW9NzAyaE/6vNEFfddIaxsi7qovousxZ28Hveb4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix index 5f31e8ef29..8758c88b9c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jruby"; - version = "9.4.6.0"; + version = "9.4.7.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz"; - hash = "sha256-LaFN5BUrcf2/o1ukaHpG7xLNRldAM3tUnMH+bHwTmBM="; + hash = "sha256-8cOfgldQUwClKP+D/kch++YahVq7JePSfVLUOsl6TYA="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index 97ac535c93..b4eec6d8ff 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -89,6 +89,7 @@ let generatedRockspecFilename = "./${self.pname}-${self.rockspecVersion}.rockspec"; nativeBuildInputs = [ + lua # for lua.h wrapLua luarocks ]; @@ -167,6 +168,7 @@ let buildPhase = '' runHook preBuild + source ${lua}/nix-support/utils.sh nix_debug "Using LUAROCKS_CONFIG=$LUAROCKS_CONFIG" LUAROCKS_EXTRA_ARGS="" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/default.nix index ca9c15e8a3..02716568ac 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/default.nix @@ -10,19 +10,6 @@ let callPackage = lua.pkgs.callPackage; in { - lua-setup-hook = LuaPathSearchPaths: LuaCPathSearchPaths: - let - hook = ./setup-hook.sh; - in runCommand "lua-setup-hook.sh" { - # hum doesn't seem to like caps !! BUG ? - luapathsearchpaths=lib.escapeShellArgs LuaPathSearchPaths; - luacpathsearchpaths=lib.escapeShellArgs LuaCPathSearchPaths; - } '' - cp ${hook} hook.sh - substituteAllInPlace hook.sh - mv hook.sh $out - ''; - luarocksCheckHook = callPackage ({ luarocks }: makeSetupHook { name = "luarocks-check-hook"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh index 3027021661..0e9aa68970 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh @@ -1,56 +1,4 @@ # set -e -nix_print() { - if [ ${NIX_DEBUG:-0} -ge $1 ]; then - echo "$2" - fi -} - -nix_debug() { - nix_print 3 "$1" -} - -addToLuaSearchPathWithCustomDelimiter() { - local varName="$1" - local absPattern="$2" - - # export only if we haven't already got this dir in the search path - if [[ ${!varName-} == *"$absPattern"* ]]; then return; fi - - # if the path variable has not yet been set, initialize it to ";;" - # this is a magic value that will be replaced by the default, - # allowing relative modules to be used even when there are system modules. - if [[ ! -v "${varName}" ]]; then export "${varName}=;;"; fi - - # export only if the folder contains lua files - shopt -s globstar - - local adjustedPattern="${absPattern/\?/\*\*\/\*}" - for _file in $adjustedPattern; do - export "${varName}=${!varName:+${!varName};}${absPattern}" - shopt -u globstar - return; - done - shopt -u globstar -} - -addToLuaPath() { - local dir="$1" - - if [[ ! -d "$dir" ]]; then - nix_debug "$dir not a directory abort" - return 0 - fi - cd "$dir" - for pattern in @luapathsearchpaths@; do - addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern" - done - - # LUA_CPATH - for pattern in @luacpathsearchpaths@; do - addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern" - done - cd - >/dev/null -} - +source ./utils.sh addEnvHooks "$hostOffset" addToLuaPath diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix index 2856951d9f..7775fa5c84 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix @@ -3,6 +3,7 @@ , makeWrapper , self , packageOverrides ? (final: prev: {}) +, substituteAll , pkgsBuildBuild , pkgsBuildHost , pkgsBuildTarget @@ -51,9 +52,10 @@ stdenv.mkDerivation (finalAttrs: LuaPathSearchPaths = luaPackages.luaLib.luaPathList; LuaCPathSearchPaths = luaPackages.luaLib.luaCPathList; - setupHook = luaPackages.lua-setup-hook - finalAttrs.LuaPathSearchPaths - finalAttrs.LuaCPathSearchPaths; + setupHook = builtins.toFile "lua-setup-hook" '' + source @out@/nix-support/utils.sh + addEnvHooks "$hostOffset" addToLuaPath + ''; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ readline ]; @@ -107,7 +109,12 @@ stdenv.mkDerivation (finalAttrs: inherit postBuild; postInstall = '' - mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig" + mkdir -p "$out/nix-support" "$out/share/doc/lua" "$out/lib/pkgconfig" + cp ${substituteAll { + src = ./utils.sh; + luapathsearchpaths=lib.escapeShellArgs finalAttrs.LuaPathSearchPaths; + luacpathsearchpaths=lib.escapeShellArgs finalAttrs.LuaCPathSearchPaths; + }} $out/nix-support/utils.sh mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" rmdir $out/{share,lib}/lua/${luaversion} $out/{share,lib}/lua mkdir -p "$out/lib/pkgconfig" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/utils.sh b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/utils.sh new file mode 100644 index 0000000000..5491f8f7ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/utils.sh @@ -0,0 +1,54 @@ +#!/bin/sh +nix_print() { + if [ ${NIX_DEBUG:-0} -ge $1 ]; then + echo "$2" + fi +} + +nix_debug() { + nix_print 3 "$1" +} + +addToLuaSearchPathWithCustomDelimiter() { + local varName="$1" + local absPattern="$2" + + # export only if we haven't already got this dir in the search path + if [[ ${!varName-} == *"$absPattern"* ]]; then return; fi + + # if the path variable has not yet been set, initialize it to ";;" + # this is a magic value that will be replaced by the default, + # allowing relative modules to be used even when there are system modules. + if [[ ! -v "${varName}" ]]; then export "${varName}=;;"; fi + + # export only if the folder contains lua files + shopt -s globstar + + local adjustedPattern="${absPattern/\?/\*\*\/\*}" + for _file in $adjustedPattern; do + export "${varName}=${!varName:+${!varName};}${absPattern}" + shopt -u globstar + return; + done + shopt -u globstar +} + +addToLuaPath() { + local dir="$1" + + if [[ ! -d "$dir" ]]; then + nix_debug "$dir not a directory abort" + return 0 + fi + cd "$dir" + for pattern in @luapathsearchpaths@; do + addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern" + done + + # LUA_CPATH + for pattern in @luacpathsearchpaths@; do + addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern" + done + cd - >/dev/null +} + diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix index b6e24a44ee..c5e7c806cd 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -11,6 +11,4 @@ makeSetupHook { propagatedBuildInputs = [ makeWrapper ]; substitutions.executable = lua.interpreter; substitutions.lua = lua; - substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; - substitutions.LuaCPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; } ./wrap.sh diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrap.sh b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrap.sh index 5941ff4a6b..7d59cf6095 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrap.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrap.sh @@ -3,6 +3,8 @@ # variable is passed in from the buildLuarocksPackage function. set -e +source @lua@/nix-support/utils.sh + wrapLuaPrograms() { wrapLuaProgramsIn "$out/bin" "$out $luaPath" } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix index bd97e7186b..07ea75605c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix @@ -10,7 +10,7 @@ # Create a lua executable that knows about additional packages. let env = let - paths = requiredLuaModules (extraLibs ++ [ lua ] ); + paths = [ lua ] ++ requiredLuaModules extraLibs; in buildEnv { name = "${lua.name}-env"; @@ -20,11 +20,11 @@ let nativeBuildInputs = [ makeWrapper - (lua.pkgs.lua-setup-hook lua.LuaPathSearchPaths lua.LuaCPathSearchPaths) ]; # we create wrapper for the binaries in the different packages postBuild = '' + source ${lua}/nix-support/utils.sh if [ -L "$out/bin" ]; then unlink "$out/bin" fi diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix index 15bcfee3a4..3b98e8c790 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix @@ -3,6 +3,7 @@ , buildPackages , version , src +, substituteAll , extraMeta ? { } , self , packageOverrides ? (final: prev: {}) @@ -73,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { if test -n "''${dontStrip-}"; then # CCDEBUG must be non-empty or everything will be stripped, -g being # passed by nixpkgs CC wrapper is insufficient on its own - substituteInPlace src/Makefile --replace "#CCDEBUG= -g" "CCDEBUG= -g" + substituteInPlace src/Makefile --replace-fail "#CCDEBUG= -g" "CCDEBUG= -g" fi ''; @@ -95,6 +96,12 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString XCFLAGS; postInstall = '' + mkdir -p $out/nix-support + cp ${substituteAll { + src = ../lua-5/utils.sh; + luapathsearchpaths=lib.escapeShellArgs finalAttrs.LuaPathSearchPaths; + luacpathsearchpaths=lib.escapeShellArgs finalAttrs.LuaCPathSearchPaths; + }} $out/nix-support/utils.sh ( cd "$out/include"; ln -s luajit-*/* . ) ln -s "$out"/bin/luajit-* "$out"/bin/lua if [[ ! -e "$out"/bin/luajit ]]; then @@ -105,7 +112,10 @@ stdenv.mkDerivation (finalAttrs: { LuaPathSearchPaths = luaPackages.luaLib.luaPathList; LuaCPathSearchPaths = luaPackages.luaLib.luaCPathList; - setupHook = luaPackages.lua-setup-hook luaPackages.luaLib.luaPathList luaPackages.luaLib.luaCPathList; + setupHook = builtins.toFile "lua-setup-hook" '' + source @out@/nix-support/utils.sh + addEnvHooks "$hostOffset" addToLuaPath + ''; # copied from python passthru = let diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix index 4d17e1f735..4098d92fb4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/luau-lang/luau/releases/tag/${version}"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "luau"; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix index 00b0422783..07494f121b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "nelua"; - version = "unstable-2024-02-03"; + version = "0-unstable-2024-04-20"; src = fetchFromGitHub { owner = "edubart"; repo = "nelua-lang"; - rev = "05a2633a18dfdde7389394b9289da582c10e79bc"; - hash = "sha256-oRW+pCB10T0A6fEPP3S+8iurQ2J5WMpQlCYScfIk07c="; + rev = "9f75e009db190feda0f90ae858b48fd82f51b8b1"; + hash = "sha256-JwuZZXYcH8KRPxt4PBwhYDjZlwqe6VfaONU8rdLIDs4="; }; postPatch = '' substituteInPlace lualib/nelua/version.lua \ --replace "NELUA_GIT_HASH = nil" "NELUA_GIT_HASH = '${src.rev}'" \ - --replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "unstable-" version}'" + --replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "0-unstable-" version}'" ''; makeFlags = [ "PREFIX=$(out)" ]; @@ -23,13 +23,16 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + # no releases, only stale "latest" tag + hardcodeZeroVersion = true; + }; meta = with lib; { description = "Minimal, efficient, statically-typed and meta-programmable systems programming language heavily inspired by Lua, which compiles to C and native code"; homepage = "https://nelua.io/"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ngn-k/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ngn-k/default.nix index 0a24bbdfe0..9ec1f0b673 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ngn-k/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ngn-k/default.nix @@ -65,6 +65,6 @@ useStdenv.mkDerivation { homepage = "https://codeberg.org/ngn/k"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.sternenseemann ]; - platforms = [ "x86_64-linux" "x86_64-freebsd13" ]; + platforms = [ "x86_64-linux" "x86_64-freebsd" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix index d839e37257..a63f139161 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.18"; - hash = "sha256-ygsHwlQgAyD1GKxbPfVAqc8U2GbzyT7cMBO1Lgb6x5Y="; + version = "8.2.19"; + hash = "sha256-PBj3zlG3x7JreX4flwedOGswNH6wToF/XmyOmydeKmo="; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix index d7ac07c1fb..1da9841f78 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.3.6"; - hash = "sha256-YySx3djrMCWwQQNLiNwrwLSBmwAiEp7q66N+R4AxCLw="; + version = "8.3.7"; + hash = "sha256-AcIM3hxaVpZlGHXtIvUHhJZ5+6dA+MQhYWt9Q9f3l9o="; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/picoc/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/picoc/default.nix index 51bf82aafb..d27efe1f2b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/picoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/picoc/default.nix @@ -1,40 +1,43 @@ -{ lib, stdenv, fetchFromGitHub, readline }: +{ lib, stdenv, fetchFromGitLab, readline }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "picoc"; - version = "2015-05-04"; + version = "2.1-unstable-2018-06-05"; - src = fetchFromGitHub { - sha256 = "01w3jwl0vn9fsmh7p20ad4nl9ljzgfn576yvncd9pk9frx3pd8y4"; - rev = "4555e8456f020554bcac50751fbb9b36c7d8c13b"; - repo = "picoc"; + src = fetchFromGitLab { owner = "zsaleeba"; + repo = "picoc"; + rev = "dc85a51e9211cfb644f0a85ea9546e15dc1141c3"; + hash = "sha256-yWPRbJLT09E7pqqs9E2k48ECoRR2nhcgTgK5pumkrxo="; }; buildInputs = [ readline ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - postPatch = '' - substituteInPlace Makefile --replace '`svnversion -n`' "${version}" - ''; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + "-Wno-error=implicit-function-declaration" + ]); enableParallelBuilding = true; # Tests are currently broken on i686 see # https://hydra.nixos.org/build/24003763/nixlog/1 - doCheck = if stdenv.isi686 then false else true; + doCheck = !stdenv.isi686 && !stdenv.isAarch64; checkTarget = "test"; installPhase = '' + runHook preInstall + install -Dm755 picoc $out/bin/picoc mkdir -p $out/include install -m644 *.h $out/include + + runHook postInstall ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Very small C interpreter for scripting"; mainProgram = "picoc"; longDescription = '' @@ -47,7 +50,7 @@ stdenv.mkDerivation rec { very sparing of data space. This means it can work well in small embedded devices. ''; - homepage = "https://github.com/zsaleeba/picoc"; + homepage = "https://gitlab.com/zsaleeba/picoc"; downloadPage = "https://code.google.com/p/picoc/downloads/list"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix index dda254fca3..3ede01aa61 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -350,7 +350,6 @@ in with passthru; stdenv.mkDerivation ({ ''; license = lib.licenses.psfl; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ fridh ]; knownVulnerabilities = [ "Python 2.7 has reached its end of life after 2020-01-01. See https://www.python.org/doc/sunset-python-2/." # Quote: That means that we will not improve it anymore after that day, diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 301af7a29c..37b9d19fe8 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -662,7 +662,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { license = licenses.psfl; pkgConfigModules = [ "python3" ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.windows; - maintainers = with maintainers; [ fridh ]; mainProgram = executable; }; }) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index 4cc3f6f4e5..86eaf142d9 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -93,9 +93,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "a6"; + suffix = "b1"; }; - hash = "sha256-S+85PXKygaz4HTnXRV8AA26GYZPfohpO05cP0PTLoEg="; + hash = "sha256-unFqxWsDm1Ra1KkM5Yaleql4aTZFU3Ru8kRXKM7sGY4="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix index 9b414944bb..0380c29e9e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix @@ -42,7 +42,7 @@ let }; pname = passthru.executable; version = with sourceVersion; "${major}.${minor}.${patch}"; - pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); + pythonForPypy = python.withPackages (ppkgs: [ ]); in with passthru; stdenv.mkDerivation rec { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix index e2bd6cd5a5..2306292eb8 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix @@ -68,7 +68,10 @@ let passthru = (oldAttrs.passthru or {})// { pythonModule = python; pythonPath = [ ]; # Deprecated, for compatibility. - requiredPythonModules = requiredPythonModules drv.propagatedBuildInputs; + requiredPythonModules = + builtins.addErrorContext + "while calculating requiredPythonModules for ${drv.name or drv.pname}:" + (requiredPythonModules drv.propagatedBuildInputs); }; }); diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/Cargo.lock b/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/Cargo.lock index 36335bb395..01118ff8a9 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/Cargo.lock @@ -22,13 +22,15 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "getrandom 0.2.8", + "cfg-if", + "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -40,6 +42,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -125,9 +133,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "blake2" @@ -135,17 +143,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.6", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "block-padding", - "generic-array", + "digest", ] [[package]] @@ -157,12 +155,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - [[package]] name = "bstr" version = "0.2.17" @@ -236,18 +228,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "chrono" -version = "0.4.23" +name = "cfg_aliases" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", - "time", "wasm-bindgen", - "winapi", + "windows-targets 0.52.0", ] [[package]] @@ -267,13 +264,11 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc" dependencies = [ "error-code", - "str-buf", - "winapi", ] [[package]] @@ -339,18 +334,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cpython" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3052106c29da7390237bc2310c1928335733b286287754ea85e6093d2495280e" -dependencies = [ - "libc", - "num-traits", - "paste", - "python3-sys", -] - [[package]] name = "cranelift" version = "0.88.2" @@ -548,12 +531,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -616,7 +596,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.109", ] [[package]] @@ -633,7 +613,7 @@ checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -646,16 +626,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", + "syn 1.0.109", ] [[package]] @@ -664,7 +635,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "block-buffer 0.10.3", + "block-buffer", "crypto-common", "subtle", ] @@ -692,14 +663,14 @@ dependencies = [ [[package]] name = "dns-lookup" -version = "1.0.8" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ecafc952c4528d9b51a458d1a8904b81783feff9fde08ab6ed2545ff396872" +checksum = "e5766087c2235fec47fafa4cfecc81e494ee679d0fd4a59887ea0919bfb0e4fc" dependencies = [ "cfg-if", "libc", "socket2", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -723,7 +694,7 @@ dependencies = [ "base64", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -750,35 +721,26 @@ dependencies = [ ] [[package]] -name = "errno" -version = "0.3.1" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "errno" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] name = "error-code" -version = "2.3.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc" [[package]] name = "exitcode" @@ -788,13 +750,13 @@ checksum = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" [[package]] name = "fd-lock" -version = "3.0.12" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" +checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" dependencies = [ "cfg-if", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -818,7 +780,7 @@ checksum = "36b732da54fd4ea34452f2431cf464ac7be94ca4b339c9cd3d3d12eb06fe7aab" dependencies = [ "flame", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -828,16 +790,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3cc29a6c0dfa26d3a0e80021edda5671eeed79381130897737cdd273ea18909" dependencies = [ "flame", - "indexmap", + "indexmap 1.9.3", "serde", "serde_json", ] [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "libz-sys", @@ -895,26 +857,24 @@ dependencies = [ ] [[package]] -name = "getrandom" -version = "0.1.16" +name = "getopts" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "unicode-width", ] [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -936,6 +896,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[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.1" @@ -960,12 +926,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - [[package]] name = "hex" version = "0.4.3" @@ -978,6 +938,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "iana-time-zone" version = "0.1.53" @@ -1004,58 +973,53 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", ] [[package]] -name = "insta" -version = "1.28.0" +name = "indexmap" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea5b3894afe466b4bcf0388630fc15e11938a6074af0cd637c825ba2ec8a099" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", +] + +[[package]] +name = "indoc" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[package]] +name = "insta" +version = "1.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" dependencies = [ "console", "lazy_static 1.4.0", "linked-hash-map", "similar", - "yaml-rust", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", ] [[package]] name = "is-macro" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20" +checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e" dependencies = [ "Inflector", - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", + "syn 2.0.32", ] [[package]] @@ -1067,6 +1031,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.5" @@ -1141,9 +1114,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.141" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libffi" @@ -1204,9 +1177,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" @@ -1229,18 +1202,18 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.9.5" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8cbbb2831780bc3b9c15a41f5b49222ef756b6730a95f3decfdd15903eb5a3" +checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" dependencies = [ "twox-hash", ] [[package]] name = "mac_address" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b238e3235c8382b7653c6408ed1b08dd379bdb9fdf990fb0bbae3db2cc0ae963" +checksum = "4863ee94f19ed315bf3bc00299338d857d4b5bc856af375cc97d237382ad3856" dependencies = [ "nix 0.23.2", "winapi", @@ -1257,9 +1230,9 @@ dependencies = [ [[package]] name = "malachite" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6cf7f4730c30071ba374fac86ad35b1cb7a0716f774737768667ea3fa1828e3" +checksum = "220cb36c52aa6eff45559df497abe0e2a4c1209f92279a746a399f622d7b95c7" dependencies = [ "malachite-base", "malachite-nz", @@ -1268,22 +1241,19 @@ dependencies = [ [[package]] name = "malachite-base" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b06bfa98a4b4802af5a4263b4ad4660e28e51e8490f6354eb9336c70767e1c5" +checksum = "6538136c5daf04126d6be4899f7fe4879b7f8de896dd1b4210fe6de5b94f2555" dependencies = [ - "itertools 0.9.0", - "rand 0.7.3", - "rand_chacha 0.2.2", + "itertools 0.11.0", "ryu", - "sha3 0.9.1", ] [[package]] name = "malachite-bigint" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5110aee54537b0cef214efbebdd7df79b7408db8eef4f6a4b6db9d0d8fc01b" +checksum = "17703a19c80bbdd0b7919f0f104f3b0597f7de4fc4e90a477c15366a5ba03faa" dependencies = [ "derive_more", "malachite", @@ -1294,22 +1264,22 @@ dependencies = [ [[package]] name = "malachite-nz" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89e21c64b7af5be3dc8cef16f786243faf59459fe4ba93b44efdeb264e5ade4" +checksum = "5f0b05577b7a3f09433106460b10304f97fc572f0baabf6640e6cb1e23f5fc52" dependencies = [ "embed-doc-image", - "itertools 0.9.0", + "itertools 0.11.0", "malachite-base", ] [[package]] name = "malachite-q" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3755e541d5134b5016594c9043094172c4dda9259b3ce824a7b8101941850360" +checksum = "a1cfdb4016292e6acd832eaee261175f3af8bbee62afeefe4420ebce4c440cb5" dependencies = [ - "itertools 0.9.0", + "itertools 0.11.0", "malachite-base", "malachite-nz", ] @@ -1332,14 +1302,14 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.6", + "digest", ] [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -1369,10 +1339,19 @@ dependencies = [ ] [[package]] -name = "miniz_oxide" -version = "0.6.2" +name = "memoffset" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -1383,7 +1362,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ca7f22ed370d5991a9caec16a83187e865bc8a532f889670337d5a5689e3a1" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -1410,16 +1389,26 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg-if", "libc", - "memoffset 0.7.1", - "pin-utils", - "static_assertions", + "memoffset 0.9.1", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases", + "libc", ] [[package]] @@ -1471,30 +1460,30 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.9" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.9" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.32", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -1502,19 +1491,13 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -1531,7 +1514,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1542,18 +1525,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.25.0+1.1.1t" +version = "300.2.1+3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" +checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", @@ -1633,7 +1616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" dependencies = [ "phf_shared", - "rand 0.8.5", + "rand", ] [[package]] @@ -1645,12 +1628,6 @@ dependencies = [ "siphasher", ] -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - [[package]] name = "pkg-config" version = "0.3.26" @@ -1693,7 +1670,18 @@ checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "pmutil" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] @@ -1714,34 +1702,85 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] name = "puruspe" -version = "0.1.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7e158a385023d209d6d5f2585c4b468f6dcb3dd5aca9b75c4f1678c05bb375" +checksum = "06a1eed715f625eaa95fba5e049dcf7bc06fa396d6d2e55015b3764e234dfd3f" [[package]] -name = "python3-sys" -version = "0.7.1" +name = "pyo3" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f8b50d72fb3015735aa403eebf19bbd72c093bfeeae24ee798be5f2f1aab52" +checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset 0.9.1", + "parking_lot", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" dependencies = [ "libc", - "regex", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1762,19 +1801,6 @@ dependencies = [ "nibble_vec", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -1782,18 +1808,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -1803,16 +1819,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -1821,16 +1828,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -1876,7 +1874,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", + "getrandom", "redox_syscall 0.2.16", "thiserror", ] @@ -1930,23 +1928,23 @@ dependencies = [ [[package]] name = "result-like" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b80fe0296795a96913be20558326b797a187bb3986ce84ed82dee0fb7414428" +checksum = "ccc7ce6435c33898517a30e85578cd204cbb696875efb93dec19a2d31294f810" dependencies = [ "result-like-derive", ] [[package]] name = "result-like-derive" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a29c8a4ac7839f1dcb8b899263b501e0d6932f210300c8a0d271323727b35c1" +checksum = "1fabf0a2e54f711c68c50d49f648a1a8a37adcb57353f518ac4df374f0788f42" dependencies = [ - "pmutil", + "pmutil 0.5.3", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "syn-ext", ] @@ -1967,26 +1965,24 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.11" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rustpython" -version = "0.3.0" +version = "0.3.1" dependencies = [ "atty", "cfg-if", "clap", - "cpython", "criterion", "dirs-next", "env_logger", @@ -1994,7 +1990,7 @@ dependencies = [ "flamescope", "libc", "log", - "python3-sys", + "pyo3", "rustpython-compiler", "rustpython-parser", "rustpython-pylib", @@ -2005,8 +2001,8 @@ dependencies = [ [[package]] name = "rustpython-ast" -version = "0.3.0" -source = "git+https://github.com/RustPython/Parser.git?tag=0.3.0#a1e4336f7043807eda8a5ecb15d4115172cc4a7e" +version = "0.3.1" +source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" dependencies = [ "is-macro", "malachite-bigint", @@ -2017,13 +2013,13 @@ dependencies = [ [[package]] name = "rustpython-codegen" -version = "0.3.0" +version = "0.3.1" dependencies = [ "ahash", - "bitflags 2.3.1", - "indexmap", + "bitflags 2.5.0", + "indexmap 2.2.6", "insta", - "itertools 0.10.5", + "itertools 0.11.0", "log", "num-complex", "num-traits", @@ -2035,13 +2031,13 @@ dependencies = [ [[package]] name = "rustpython-common" -version = "0.3.0" +version = "0.3.1" dependencies = [ "ascii", - "bitflags 2.3.1", + "bitflags 2.5.0", "bstr", "cfg-if", - "itertools 0.10.5", + "itertools 0.11.0", "libc", "lock_api", "malachite-base", @@ -2052,7 +2048,7 @@ dependencies = [ "once_cell", "parking_lot", "radium", - "rand 0.8.5", + "rand", "rustpython-format", "siphasher", "volatile", @@ -2061,7 +2057,7 @@ dependencies = [ [[package]] name = "rustpython-compiler" -version = "0.3.0" +version = "0.3.1" dependencies = [ "rustpython-codegen", "rustpython-compiler-core", @@ -2070,10 +2066,10 @@ dependencies = [ [[package]] name = "rustpython-compiler-core" -version = "0.3.0" +version = "0.3.1" dependencies = [ - "bitflags 2.3.1", - "itertools 0.10.5", + "bitflags 2.5.0", + "itertools 0.11.0", "lz4_flex", "malachite-bigint", "num-complex", @@ -2083,18 +2079,18 @@ dependencies = [ [[package]] name = "rustpython-derive" -version = "0.3.0" +version = "0.3.1" dependencies = [ "rustpython-compiler", "rustpython-derive-impl", - "syn", + "syn 1.0.109", ] [[package]] name = "rustpython-derive-impl" -version = "0.3.0" +version = "0.3.1" dependencies = [ - "itertools 0.10.5", + "itertools 0.11.0", "maplit", "once_cell", "proc-macro2", @@ -2102,7 +2098,7 @@ dependencies = [ "rustpython-compiler-core", "rustpython-doc", "rustpython-parser-core", - "syn", + "syn 1.0.109", "syn-ext", "textwrap 0.15.2", ] @@ -2117,11 +2113,11 @@ dependencies = [ [[package]] name = "rustpython-format" -version = "0.3.0" -source = "git+https://github.com/RustPython/Parser.git?tag=0.3.0#a1e4336f7043807eda8a5ecb15d4115172cc4a7e" +version = "0.3.1" +source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" dependencies = [ - "bitflags 2.3.1", - "itertools 0.10.5", + "bitflags 2.5.0", + "itertools 0.11.0", "malachite-bigint", "num-traits", "rustpython-literal", @@ -2129,7 +2125,7 @@ dependencies = [ [[package]] name = "rustpython-jit" -version = "0.3.0" +version = "0.3.1" dependencies = [ "approx", "cranelift", @@ -2144,8 +2140,8 @@ dependencies = [ [[package]] name = "rustpython-literal" -version = "0.3.0" -source = "git+https://github.com/RustPython/Parser.git?tag=0.3.0#a1e4336f7043807eda8a5ecb15d4115172cc4a7e" +version = "0.3.1" +source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" dependencies = [ "hexf-parse", "is-macro", @@ -2156,12 +2152,12 @@ dependencies = [ [[package]] name = "rustpython-parser" -version = "0.3.0" -source = "git+https://github.com/RustPython/Parser.git?tag=0.3.0#a1e4336f7043807eda8a5ecb15d4115172cc4a7e" +version = "0.3.1" +source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" dependencies = [ "anyhow", "is-macro", - "itertools 0.10.5", + "itertools 0.11.0", "lalrpop-util", "log", "malachite-bigint", @@ -2179,8 +2175,8 @@ dependencies = [ [[package]] name = "rustpython-parser-core" -version = "0.3.0" -source = "git+https://github.com/RustPython/Parser.git?tag=0.3.0#a1e4336f7043807eda8a5ecb15d4115172cc4a7e" +version = "0.3.1" +source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" dependencies = [ "is-macro", "memchr", @@ -2189,8 +2185,8 @@ dependencies = [ [[package]] name = "rustpython-parser-vendored" -version = "0.3.0" -source = "git+https://github.com/RustPython/Parser.git?tag=0.3.0#a1e4336f7043807eda8a5ecb15d4115172cc4a7e" +version = "0.3.1" +source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f" dependencies = [ "memchr", "once_cell", @@ -2198,16 +2194,25 @@ dependencies = [ [[package]] name = "rustpython-pylib" -version = "0.3.0" +version = "0.3.1" dependencies = [ "glob", "rustpython-compiler-core", "rustpython-derive", ] +[[package]] +name = "rustpython-sre_engine" +version = "0.3.1" +dependencies = [ + "bitflags 2.5.0", + "num_enum", + "optional", +] + [[package]] name = "rustpython-stdlib" -version = "0.3.0" +version = "0.3.1" dependencies = [ "adler32", "ahash", @@ -2219,14 +2224,14 @@ dependencies = [ "crc32fast", "crossbeam-utils", "csv-core", - "digest 0.10.6", + "digest", "dns-lookup", "dyn-clone", "flate2", "foreign-types-shared", "gethostname", "hex", - "itertools 0.10.5", + "itertools 0.11.0", "libc", "libsqlite3-sys", "libz-sys", @@ -2236,7 +2241,7 @@ dependencies = [ "memchr", "memmap2", "mt19937", - "nix 0.26.2", + "nix 0.27.1", "num-complex", "num-integer", "num-traits", @@ -2249,15 +2254,15 @@ dependencies = [ "parking_lot", "paste", "puruspe", - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", "rustpython-common", "rustpython-derive", "rustpython-vm", "schannel", "sha-1", "sha2", - "sha3 0.10.6", + "sha3", "socket2", "system-configuration", "termios", @@ -2273,17 +2278,18 @@ dependencies = [ "uuid", "widestring", "winapi", + "windows-sys 0.52.0", "xml-rs", ] [[package]] name = "rustpython-vm" -version = "0.3.0" +version = "0.3.1" dependencies = [ "ahash", "ascii", "atty", - "bitflags 2.3.1", + "bitflags 2.5.0", "bstr", "caseless", "cfg-if", @@ -2292,19 +2298,19 @@ dependencies = [ "exitcode", "flame", "flamer", - "getrandom 0.2.8", + "getrandom", "glob", "half", "hex", - "indexmap", + "indexmap 2.2.6", "is-macro", - "itertools 0.10.5", + "itertools 0.11.0", "libc", "log", "malachite-bigint", "memchr", - "memoffset 0.6.5", - "nix 0.26.2", + "memoffset 0.9.1", + "nix 0.27.1", "num-complex", "num-integer", "num-traits", @@ -2314,7 +2320,7 @@ dependencies = [ "optional", "parking_lot", "paste", - "rand 0.8.5", + "rand", "result-like", "rustc_version", "rustpython-ast", @@ -2328,10 +2334,10 @@ dependencies = [ "rustpython-literal", "rustpython-parser", "rustpython-parser-core", + "rustpython-sre_engine", "rustyline", "schannel", "serde", - "sre-engine", "static_assertions", "strum", "strum_macros", @@ -2347,14 +2353,14 @@ dependencies = [ "wasm-bindgen", "which", "widestring", - "winapi", "windows", + "windows-sys 0.52.0", "winreg", ] [[package]] name = "rustpython_wasm" -version = "0.3.0" +version = "0.3.1" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2378,32 +2384,31 @@ checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "rustyline" -version = "11.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfc8644681285d1fb67a467fb3021bfea306b99b4146b166a1fe3ada965eece" +checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg-if", "clipboard-win", - "dirs-next", "fd-lock", + "home", "libc", "log", "memchr", - "nix 0.26.2", + "nix 0.28.0", "radix_trie", - "scopeguard", "unicode-segmentation", "unicode-width", "utf8parse", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -2416,11 +2421,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -2480,7 +2485,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2502,7 +2507,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest", ] [[package]] @@ -2513,19 +2518,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", -] - -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", + "digest", ] [[package]] @@ -2534,7 +2527,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" dependencies = [ - "digest 0.10.6", + "digest", "keccak", ] @@ -2564,23 +2557,12 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.7" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "sre-engine" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a490c5c46c35dba9a6f5e7ee8e4d67e775eb2d2da0f115750b8d10e1c1ac2d28" -dependencies = [ - "bitflags 1.3.2", - "num_enum", - "optional", + "windows-sys 0.48.0", ] [[package]] @@ -2589,12 +2571,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - [[package]] name = "strsim" version = "0.8.0" @@ -2617,7 +2593,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.109", ] [[package]] @@ -2628,9 +2604,20 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -2643,7 +2630,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b86cb2b68c5b3c078cac02588bc23f3c04bb828c5d3aedd17980876ec6a7be6" dependencies = [ - "syn", + "syn 1.0.109", ] [[package]] @@ -2723,7 +2710,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2749,15 +2736,20 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "serde", + "time-core", ] +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + [[package]] name = "timsort" version = "0.1.2" @@ -2810,7 +2802,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" dependencies = [ - "indexmap", + "indexmap 1.9.3", "nom8", "toml_datetime", ] @@ -2997,12 +2989,33 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode_names2" -version = "0.6.0" -source = "git+https://github.com/youknowone/unicode_names2.git?rev=4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde#4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b2c0942619ae1797f999a0ce7efc6c09592ad30e68e16cdbfdcd48a98c3579" dependencies = [ "phf", + "unicode_names2_generator", ] +[[package]] +name = "unicode_names2_generator" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d0d66ab60be9799a70f8eb227ea43da7dcc47561dd9102cbadacfe0930113f7" +dependencies = [ + "getopts", + "log", + "phf_codegen", + "rand", + "time", +] + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + [[package]] name = "utf8parse" version = "0.2.0" @@ -3016,8 +3029,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ "atomic", - "getrandom 0.2.8", - "rand 0.8.5", + "getrandom", + "rand", "uuid-macro-internal", ] @@ -3029,7 +3042,7 @@ checksum = "c1b300a878652a387d2a0de915bdae8f1a548f0c6d45e072fe2688794b656cc9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3067,18 +3080,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -3106,7 +3107,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -3140,7 +3141,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3174,9 +3175,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.5.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -3211,15 +3212,21 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.39.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -3265,7 +3272,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -3285,17 +3301,32 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -3306,9 +3337,15 @@ checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" @@ -3316,12 +3353,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" - [[package]] name = "windows_aarch64_msvc" version = "0.42.1" @@ -3330,9 +3361,15 @@ checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" @@ -3340,12 +3377,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" - [[package]] name = "windows_i686_gnu" version = "0.42.1" @@ -3354,9 +3385,15 @@ checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" @@ -3364,12 +3401,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" -[[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" - [[package]] name = "windows_i686_msvc" version = "0.42.1" @@ -3378,9 +3409,15 @@ checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" @@ -3388,12 +3425,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" - [[package]] name = "windows_x86_64_gnu" version = "0.42.1" @@ -3402,9 +3433,15 @@ checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" @@ -3414,9 +3451,15 @@ checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" @@ -3424,12 +3467,6 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" - [[package]] name = "windows_x86_64_msvc" version = "0.42.1" @@ -3438,9 +3475,15 @@ checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winreg" @@ -3458,10 +3501,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c" [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "zerocopy" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ - "linked-hash-map", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", ] diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix index 3d10ab361c..febb7f5cfa 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix @@ -8,21 +8,20 @@ rustPlatform.buildRustPackage rec { pname = "rustpython"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "RustPython"; repo = "RustPython"; rev = "refs/tags/${version}"; - hash = "sha256-8tDzgsmKLjsfMT5j5HqrQ93LsGHxmC2DJu5KbR3FNXc="; + hash = "sha256-AtIaWwE1pEIP1SJN9dYgHRP1GX4LTmetIPztHbsBXto="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "rustpython-ast-0.3.0" = "sha256-5IR/G6Y9OE0+gTvU1iTob0TxfiV3O9elA/0BUy2GA8g="; + "rustpython-ast-0.3.1" = "sha256-dT0x4E8k/FcSP/q0uwwBWniT1n9HGmFF/HV6hAE6bGU="; "rustpython-doc-0.3.0" = "sha256-34ERuLFKzUD9Xmf1zlafe42GLWZfUlw17ejf/NN6yH4="; - "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg="; }; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix index 8d4615f61c..f75470566e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix @@ -15,7 +15,7 @@ , disableDocs ? false , CoreFoundation , gsettings-desktop-schemas -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { (lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s") ]; - nativeBuildInputs = [ cacert wrapGAppsHook ]; + nativeBuildInputs = [ cacert wrapGAppsHook3 ]; buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ncurses ] ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/racket/racket_7_9.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/racket_7_9.nix index 836bc879db..78efe8e291 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/racket/racket_7_9.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/racket/racket_7_9.nix @@ -13,7 +13,7 @@ , disableDocs ? false , CoreFoundation , gsettings-desktop-schemas -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { (lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - nativeBuildInputs = [ cacert wrapGAppsHook ]; + nativeBuildInputs = [ cacert wrapGAppsHook3 ]; buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index 158fd6df4e..2d6959c324 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zef"; - version = "0.21.4"; + version = "0.22.0"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${finalAttrs.version}"; - hash = "sha256-k6jihTDbaSXv+XvfqxGIyCdD005tG8l3mSIkNG6FwPQ="; + hash = "sha256-HpDTxu846jb5hasH7nL93vRihFIZbVBXf/dV4itqFQg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/risor/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/risor/default.nix index 89b31b8aa9..c16eebf1e6 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/risor/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/risor/default.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "risor"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "risor-io"; repo = "risor"; rev = "v${version}"; - hash = "sha256-tvEiboH5cGRpyBmmpu8A1UlDR1Y9XPe1pUNS0/Jvooc="; + hash = "sha256-IUmkb23Fx+bjzXrXWfKPOo0HFt7HjtjQoCRtH77HGBg="; }; proxyVendor = true; - vendorHash = "sha256-eW6eSZp5Msg/u50i1+S2KSzDws0Rq8JBY1Yxzq7/hVo="; + vendorHash = "sha256-+XYwFYbvZvk0TWoRtCKQIzbQeznQkolB+NFqUiZMkpA="; subPackages = [ "cmd/risor" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix index ce99311e45..ed3a06591d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -264,7 +264,7 @@ let description = "An object-oriented language for quick and easy programming"; homepage = "https://www.ruby-lang.org/"; license = licenses.ruby; - maintainers = with maintainers; [ vrthra manveru marsam ]; + maintainers = with maintainers; [ vrthra manveru ]; platforms = platforms.all; knownVulnerabilities = op (lib.versionOlder ver.majMin "3.0") "This Ruby release has reached its end of life. See https://www.ruby-lang.org/en/downloads/branches/."; }; @@ -296,19 +296,19 @@ in { mkRuby = generic; ruby_3_1 = generic { - version = rubyVersion "3" "1" "4" ""; - hash = "sha256-o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y="; + version = rubyVersion "3" "1" "5" ""; + hash = "sha256-NoXFHu7hNSwx6gOXBtcZdvU9AKttdzEt5qoauvXNosU="; }; ruby_3_2 = generic { - version = rubyVersion "3" "2" "3" ""; - hash = "sha256-r38XV9ndtjA0WYgTkhHx/VcP9bqDDe8cx8Rorptlybo="; + version = rubyVersion "3" "2" "4" ""; + hash = "sha256-xys8XDBILcoYsPhoyQdfP0fYFo6vYm1OaCzltZyFhpI="; cargoHash = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ="; }; ruby_3_3 = generic { - version = rubyVersion "3" "3" "0" ""; - hash = "sha256-llGIFNmDK+zpKoVBWoGdSJOzB9tZIa4fD3Uamomla30="; + version = rubyVersion "3" "3" "1" ""; + hash = "sha256-jcKvKALMcAzRgtVDByY4jM+IWz8KFPzWoPIf8knJqpk="; cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk="; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix index 6a28bbb488..8c0bc2208c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.5.7"; + version = "3.5.9"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-w9BKIE0vcmX+mmtDqF1tInhplHdBok1W5R1xNtRinjk="; + hash = "sha256-KyA2Qhkea7ns4ZB19iJ1qIUmMZsSRoTEZmdBXcpDY/E="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix index 34a60c320b..58d9fb2ef5 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wamr"; - version = "1.3.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-micro-runtime"; rev = "WAMR-${finalAttrs.version}"; - hash = "sha256-4iH1PC0fEPehlez8YWgqPBxWnePFcMBzbGfd2CQjvd4="; + hash = "sha256-7k7FRe1mBH/+r9M19pYGAHX5rt54AomeWDBW4lwCfu4="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 0f56582c05..fafe521fbd 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "19.0.2"; + version = "20.0.2"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-t+2bkJ1SFN7Bi1Mj74CKGhnL2vWpruQKf8lYJWLOqB8="; + hash = "sha256-zXBVqSBq/dLY8oEs0dNZxtjs4H1aKTJYeeazysHvh3w="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-Jr02AQWz4ILYZWlGtcVYWTcBojHWZk871bWuEyG5QxE="; + cargoHash = "sha256-jFqLUWdW/UfOc843aWO7RNDx1E6sBhUWB5Xw2+A2u90="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; @@ -36,7 +36,6 @@ rustPlatform.buildRustPackage rec { install -d -m0755 $dev/include/wasmtime install -m0644 $src/crates/c-api/include/*.h $dev/include install -m0644 $src/crates/c-api/include/wasmtime/*.h $dev/include/wasmtime - install -m0644 $src/crates/c-api/wasm-c-api/include/* $dev/include '' + lib.optionalString stdenv.isDarwin '' install_name_tool -id \ $dev/lib/libwasmtime.dylib \ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix index 963abaa492..46d22b9399 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/racket/zuo"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/julia-modules/depot.nix b/third_party/nixpkgs/pkgs/development/julia-modules/depot.nix index 18bac9cb46..5614f1427a 100644 --- a/third_party/nixpkgs/pkgs/development/julia-modules/depot.nix +++ b/third_party/nixpkgs/pkgs/development/julia-modules/depot.nix @@ -55,6 +55,11 @@ runCommand "julia-depot" { # git config --global --add safe.directory '/nix' export JULIA_PKG_USE_CLI_GIT="true" + # At time of writing, this appears to be the only way to turn precompiling's + # terminal output into standard logging, so opportunistically do that. + # (Note this is different from JULIA_CI). + export CI=true + julia -e ' \ import Pkg import Pkg.Types: PRESERVE_NONE diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix index a15a963cb7..1e63f3bfde 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -182,7 +182,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A cross-platform multimedia library"; mainProgram = "sdl2-config"; homepage = "http://www.libsdl.org/"; - changelog = "https://github.com/libsdl-org/SDL/releases/tag/release-${version}"; + changelog = "https://github.com/libsdl-org/SDL/releases/tag/release-${finalAttrs.version}"; license = licenses.zlib; platforms = platforms.all; maintainers = with maintainers; [ cpages ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/2_0.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/2_0.nix deleted file mode 100644 index e75e0c9c5c..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/2_0.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ fetchurl -, fetchpatch -, lzwolf -, SDL2_mixer -, timidity -}: - -SDL2_mixer.overrideAttrs(oa: rec { - version = "2.0.4"; - - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${version}.tar.gz"; - sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"; - }; - - patches = [ - # These patches fix incompatible function pointer conversion errors with clang 16. - (fetchpatch { - url = "https://github.com/libsdl-org/SDL_mixer/commit/4119ec3fe838d38d2433f4432cd18926bda5d093.patch"; - stripLen = 2; - hash = "sha256-Ug1EEZIRcV8+e1MeMsGHuTW7Zn6j4szqujP8IkIq2VM="; - }) - # Based on https://github.com/libsdl-org/SDL_mixer/commit/64ab759111ddb1b033bcce64e1a04e0cba6e498f - ./SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch - ]; - - # fix default path to timidity.cfg so MIDI files could be played - postPatch = '' - substituteInPlace timidity/options.h \ - --replace "/usr/share/timidity" "${timidity}/share/timidity" - ''; - - passthru.tests.lzwolf = lzwolf; -}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix deleted file mode 100644 index 70d080e57a..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib, stdenv -, fetchurl -, pkg-config -, AudioToolbox -, AudioUnit -, CoreServices -, SDL2 -, flac -, fluidsynth -, libmodplug -, libogg -, libvorbis -, mpg123 -, opusfile -, smpeg2 -, timidity -}: - -stdenv.mkDerivation rec { - pname = "SDL2_mixer"; - version = "2.8.0"; - - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_mixer/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-HPs0yHsm29vHr9aMT1RcARarX5C7/sxa6+Kpy0uzFUk="; - }; - - configureFlags = [ - "--disable-music-ogg-shared" - "--disable-music-flac-shared" - "--disable-music-mod-modplug-shared" - "--disable-music-mp3-mpg123-shared" - "--disable-music-opus-shared" - "--disable-music-midi-fluidsynth-shared" - - # override default path to allow MIDI files to be played - "--with-timidity-cfg=${timidity}/share/timidity/timidity.cfg" - ] ++ lib.optionals stdenv.isDarwin [ - "--disable-sdltest" - "--disable-smpegtest" - ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - AudioToolbox - AudioUnit - CoreServices - ]; - - propagatedBuildInputs = [ - SDL2 - flac - fluidsynth - libmodplug - libogg - libvorbis - mpg123 - opusfile - smpeg2 - # MIDI patterns - timidity - ]; - - outputs = [ "out" "dev" ]; - - meta = with lib; { - description = "SDL multi-channel audio mixer library"; - platforms = platforms.unix; - homepage = "https://github.com/libsdl-org/SDL_mixer"; - maintainers = with maintainers; [ MP2E ]; - license = licenses.zlib; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix deleted file mode 100644 index b07d860cf0..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2_net/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2 }: - -stdenv.mkDerivation rec { - pname = "SDL2_net"; - version = "2.2.0"; - - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-TkqJGYgxYnGXT/TpWF7R73KaEj0iwIvUcxKRedyFf+s="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; - - configureFlags = [ "--disable-examples" ] - ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - - propagatedBuildInputs = [ SDL2 ]; - - meta = with lib; { - description = "SDL multiplatform networking library"; - homepage = "https://www.libsdl.org/projects/SDL_net"; - license = licenses.zlib; - maintainers = with maintainers; [ MP2E ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix index 8a11d33754..e96c4b0aca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix @@ -1,15 +1,15 @@ -{ stdenv, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }: +{ stdenv, lib, fetchFromGitLab, gitUpdater, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "accounts-qt"; - version = "1.16-unstable-2023-11-24"; + version = "1.17"; # pinned to fork with Qt6 support src = fetchFromGitLab { - owner = "nicolasfella"; + owner = "accounts-sso"; repo = "libaccounts-qt"; - rev = "18557f7def9af8f4a9e0e93e9f575ae11e5066aa"; - hash = "sha256-8FGZmg2ljSh1DYZfklMTrWN7Sdlk/Atw0qfpbb+GaBc="; + rev = "refs/tags/VERSION_${finalAttrs.version}"; + hash = "sha256-mPZgD4r7vlUP6wklvZVknGqTXZBckSOtNzK7p6e2qSA="; }; propagatedBuildInputs = [ glib libaccounts-glib ]; @@ -21,11 +21,15 @@ stdenv.mkDerivation { patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/* ''; + passthru.updateScript = gitUpdater { + rev-prefix = "VERSION_"; + }; + meta = with lib; { description = "Qt library for accessing the online accounts database"; mainProgram = "accountstest"; - homepage = "https://gitlab.com/accounts-sso"; + homepage = "https://gitlab.com/accounts-sso/libaccounts-qt"; license = licenses.lgpl21; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix index 50483758be..42edfc190c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz" - "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz" "mirror://gnu/adns/adns-${version}.tar.gz" ]; sha256 = "1pi0xl07pav4zm2jrbrfpv43s1r1q1y12awgak8k7q41m5jp4hpv"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix index ccdc06e906..e279a6d6e3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix @@ -13,7 +13,7 @@ , enableViewer ? true , gst_all_1 , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , enableUsb ? true , libusb1 @@ -25,7 +25,7 @@ assert enableGstPlugin -> gst_all_1 != null; assert enableViewer -> enableGstPlugin; assert enableViewer -> gtk3 != null; -assert enableViewer -> wrapGAppsHook != null; +assert enableViewer -> wrapGAppsHook3 != null; stdenv.mkDerivation rec { pname = "aravis"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pkg-config gi-docgen gobject-introspection - ] ++ lib.optional enableViewer wrapGAppsHook; + ] ++ lib.optional enableViewer wrapGAppsHook3; buildInputs = [ glib libxml2 ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix index f7e9369996..4ee5baa38b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.8.2"; + version = "12.8.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-A7YvjAnk9ddGQ7R4UgdBuOJ7VefkUll4/K4vXXkaw78="; + hash = "sha256-KSJYn2OHeWUEs0Daa7lUvvPYdXTCmFFYkyie3S2JAVE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 270f624965..c70044308d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.50.2"; + version = "2.52.0"; outputs = [ "out" "dev" ]; separateDebugInfo = true; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-W4GxRhpi3Y++0aJ2+p71txEvmuX/huHjKtlkS2VP94w="; + hash = "sha256-CsP8gyDI0B+hR8Jyun+gOAY4nGsD08QG0II+MONf9as="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix index dccb738a30..d67e18476a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/szechyjs/mbelib"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix index 11305b3735..8084963f39 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/rtaudio/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { pname = "rtaudio"; version = "5.2.0"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "thestk"; repo = "rtaudio"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix index 0fc0635747..f6b6eceb4c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix @@ -47,9 +47,6 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.com/drobilla/zix/-/blob/${src.rev}/NEWS"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ - fogti - yuu - ]; + maintainers = with maintainers; [ yuu ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix index 7a7d808795..c15cbe8bde 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.7.16"; + version = "0.7.18"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - hash = "sha256-76sBv4oChDrkv80HPktkULFNC37kfTNxjlwNg/FJiyA="; + hash = "sha256-JWYJz8ugYvXDvtJ5dRWVcA8F3PdjxO8aCc8l0jghYXg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix index 0188c8937c..5f4c303265 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aws-c-cal"; - version = "0.6.10"; + version = "0.6.12"; src = fetchFromGitHub { owner = "awslabs"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-rzJypIf0DrKI/2Wt5vFop34dL+KYTeCfWC0RflZpiMo="; + hash = "sha256-aegK01wYdOc6RGNVf/dZKn1HkqQr+yEblcu6hnlMZE4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index 360b82b6c6..5cf9de861c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.9.14"; + version = "0.9.17"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-aeuIXqnO8divpguDpiPlYJHABYIqegpaDNGwqJ5TKZw="; + hash = "sha256-Ee3wkgIOTsZn2PgHoaO5HqblXuOacuKm5vUwkl4Dg+4="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix index 65b5843897..1bc0c731a9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.14.6"; + version = "0.14.7"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-fekeGghqMKbUqKWIfpZg3a6dCpgxywhmXPoGz9y4Aos="; + hash = "sha256-Z4o1vv/8FWp3S7GfLDsV0a8ih+IdJIUC0DL4klOXjnw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix index 2e6c6a5611..829dc76dce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - hash = "sha256-MWcXTMwKtFnrNp+OnHxkiYCUXc3IUhM6iTQa+F9JwsQ="; + hash = "sha256-i+ssZzHC8MPfyOaRqvjq0z7w772BJqIA6BwntW1fRek="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix index 8db5b837ba..895babbb4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.5.4"; + version = "0.5.7"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - hash = "sha256-8eKQsP7AftNDccsZHPC9PcwpbpgZSvsioUuSsiggQDs="; + hash = "sha256-zzsRYhLgJfd02fPgoZBf7n6dTfbLHarc1aQa0fx/uck="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix index 7ced8b5a41..dc5dc02f62 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.15"; + version = "0.1.16"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - hash = "sha256-RTRDbdv+QmRG0Sk/R9qhl45WYEVyl+M0EceLFsoONTI="; + hash = "sha256-ih7U2uP5FrBx6or1Rp/k+HWDE6evEZyNM//wsPxH9Qo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix index c41c5426d5..cbf2e22ec7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.26.4"; + version = "0.26.8"; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-H5ms6fhhlkARn9g8S5Ma8bnisZv8mfNizP0QpzsF1tA="; + sha256 = "sha256-TW17Jcs9y8OqB0mnbHbOZgSWkYs70o2bhiLT/Rr1e8k="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index 0d210abd4a..50ec9d64bb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.11.296"; + version = "1.11.318"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; rev = version; - hash = "sha256-yg+OkeUaqwUQGQ5ThIVQUpF2rHm4FuFbcl5gE5WHHOQ="; + hash = "sha256-HQNtVCt8vemRVnz0v9TNjUpjYn/IlbgIOeDESt3iI4A="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix index 85c785be3c..7e15b74ebe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "sha256-uecUyqSL02SRdlLbWIy0luHACTFoyMXQ6rOIYuisZsw="; + sha256 = "sha256-Y+5fHUe1HAjU/cy7jWKE7zVQUezJNFg4q9tn7H1+NuA="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix index b3ec8194c9..e74947dd81 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -1,30 +1,36 @@ { stdenv , lib -, fetchpatch , fetchurl , meson , ninja , pkg-config +, gi-docgen , gobject-introspection , lcms2 , vala }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "babl"; - version = "0.1.106"; + version = "0.1.108"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/babl-${version}.tar.xz"; - hash = "sha256-0yUTXTME8IjBNMxiABOs8DXeLl0SWlCi2RBU5zd8QV8="; + url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor finalAttrs.version}/babl-${finalAttrs.version}.tar.xz"; + hash = "sha256-Jt7+neqresTQ4HbKtJwqDW69DfDDH9IJklpfB+3uFHU="; }; + patches = [ + # Allow overriding path to dev output that will be hardcoded e.g. in pkg-config file. + ./dev-prefix.patch + ]; + nativeBuildInputs = [ meson ninja pkg-config + gi-docgen gobject-introspection vala ]; @@ -33,6 +39,15 @@ stdenv.mkDerivation rec { lcms2 ]; + mesonFlags = [ + "-Dprefix-dev=${placeholder "dev"}" + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + meta = with lib; { description = "Image pixel format conversion library"; mainProgram = "babl"; @@ -42,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/babl/dev-prefix.patch b/third_party/nixpkgs/pkgs/development/libraries/babl/dev-prefix.patch new file mode 100644 index 0000000000..9dab6c6a9a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/babl/dev-prefix.patch @@ -0,0 +1,29 @@ +diff --git a/meson.build b/meson.build +index 2350a1f..56f015d 100644 +--- a/meson.build ++++ b/meson.build +@@ -551,7 +551,7 @@ pkgconfig.generate( + variables: [ + 'datadir=${prefix}/share', + 'pluginsdir=${libdir}/@0@'.format(lib_name), +- 'girdir=${datadir}/gir-1.0', ++ 'girdir=@0@/share/gir-1.0'.format(get_option('prefix-dev')), + 'typelibdir=${libdir}/girepository-1.0', + ], + uninstalled_variables: [ +diff --git a/meson_options.txt b/meson_options.txt +index f9d558c..3cac593 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -9,6 +9,11 @@ option('enable-gir', + choices: ['auto', 'true', 'false'], + description: 'gobject introspection .gir generation' + ) ++option('prefix-dev', ++ type: 'string', ++ value: '', ++ description: 'Like prefix but for dev output of the package' ++) + option('enable-vapi', + type: 'boolean', + value: 'true', diff --git a/third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix index 99c1df8e0a..8b11954429 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bamf/default.nix @@ -17,7 +17,7 @@ , xorgserver , dbus , python3 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { pkg-config vala which - wrapGAppsHook + wrapGAppsHook3 xorgserver ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix index 53b4e167a7..c9a45218df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix (args // { baseVersion = "2.19"; - revision = "3"; - hash = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU="; + revision = "4"; + hash = "sha256-WjqI72Qz6XvKsO+h7WDGGX5K2p2dMLwcR0N7+JuX8nY="; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/c-blosc/1.nix b/third_party/nixpkgs/pkgs/development/libraries/c-blosc/1.nix index 1060e44af0..0ed22a2620 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/c-blosc/1.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/c-blosc/1.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A blocking, shuffling and loss-less compression library"; homepage = "https://www.blosc.org"; - changelog = "https://github.com/Blosc/c-blosc/releases/tag/v${version}"; + changelog = "https://github.com/Blosc/c-blosc/releases/tag/v${finalAttrs.version}"; pkgConfigModules = [ "blosc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/c-blosc/2.nix b/third_party/nixpkgs/pkgs/development/libraries/c-blosc/2.nix index 7c186b3a2e..b49518bead 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/c-blosc/2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/c-blosc/2.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A fast, compressed, persistent binary data store library for C"; homepage = "https://www.blosc.org"; - changelog = "https://github.com/Blosc/c-blosc2/releases/tag/v${version}"; + changelog = "https://github.com/Blosc/c-blosc2/releases/tag/v${finalAttrs.version}"; pkgConfigModules = [ "blosc2" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix b/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix index fc18eef2ca..6da5885223 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix @@ -1,8 +1,8 @@ { lib , config -, stdenv , fetchFromGitHub , cmake +, darwin , libiconv , llvmPackages , ninja @@ -13,18 +13,22 @@ , zlib , cudaSupport ? config.cudaSupport , cudaPackages ? {} +, llvmPackages_12 , pythonSupport ? false }: +let + inherit (llvmPackages) stdenv; +in stdenv.mkDerivation (finalAttrs: { pname = "catboost"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-A1zCIqPOW21dHKBQHRtS+/sstZ2o6F8k71lmJFGn0+g="; + hash = "sha256-wn9STnpqX3zmdxPmMYAz9JPdg13Goux76CMaCiqohk8="; }; patches = [ @@ -33,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace cmake/common.cmake \ - --replace "\''${RAGEL_BIN}" "${ragel}/bin/ragel" \ - --replace "\''${YASM_BIN}" "${yasm}/bin/yasm" + --replace-fail "\''${RAGEL_BIN}" "${ragel}/bin/ragel" \ + --replace-fail "\''${YASM_BIN}" "${yasm}/bin/yasm" shopt -s globstar for cmakelists in **/CMakeLists.*; do @@ -55,6 +59,8 @@ stdenv.mkDerivation (finalAttrs: { (python3Packages.python.withPackages (ps: with ps; [ six ])) ragel yasm + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.cctools ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]); @@ -71,17 +77,19 @@ stdenv.mkDerivation (finalAttrs: { ]); env = { - CUDAHOSTCXX = lib.optionalString cudaSupport "${stdenv.cc}/bin/cc"; + # catboost requires clang 14+ for build, but does clang 12 for cuda build. + # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it. + # see https://catboost.ai/en/docs/installation/build-environment-setup-for-cmake#compilers,-linkers-and-related-tools + CUDAHOSTCXX = lib.optionalString cudaSupport "${llvmPackages_12.stdenv.cc}/bin/cc"; NIX_CFLAGS_LINK = lib.optionalString stdenv.isLinux "-fuse-ld=lld"; NIX_LDFLAGS = "-lc -lm"; }; cmakeFlags = [ - "-DCMAKE_BINARY_DIR=$out" - "-DCMAKE_POSITION_INDEPENDENT_CODE=on" - "-DCATBOOST_COMPONENTS=app;libs${lib.optionalString pythonSupport ";python-package"}" - ] ++ lib.optionals cudaSupport [ - "-DHAVE_CUDA=on" + (lib.cmakeFeature "CMAKE_BINARY_DIR" "$out") + (lib.cmakeBool "CMAKE_POSITION_INDEPENDENT_CODE" true) + (lib.cmakeFeature "CATBOOST_COMPONENTS" "app;libs${lib.optionalString pythonSupport ";python-package"}") + (lib.cmakeBool "HAVE_CUDA" cudaSupport) ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch b/third_party/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch index 6f96b7989a..44411ad416 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch @@ -1,26 +1,26 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index becd2ad03c..7e3c8c99b1 100644 +index ed6c53b220..5c6fb8f157 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -27,7 +27,6 @@ cmake_policy(SET CMP0104 OLD) - +@@ -29,7 +29,6 @@ include(cmake/global_flags.cmake) + include(cmake/global_vars.cmake) include(cmake/archive.cmake) include(cmake/common.cmake) -include(cmake/conan.cmake) include(cmake/cuda.cmake) include(cmake/cython.cmake) include(cmake/fbs.cmake) -@@ -37,21 +36,6 @@ include(cmake/recursive_library.cmake) +@@ -38,21 +37,6 @@ include(cmake/recursive_library.cmake) + include(cmake/shared_libs.cmake) include(cmake/swig.cmake) - include(cmake/global_vars.cmake) -if (CMAKE_CROSSCOMPILING) -- include(${CMAKE_BINARY_DIR}/conan_paths.cmake) +- include(${PROJECT_BINARY_DIR}/conan_paths.cmake) -else() - conan_cmake_autodetect(settings) - conan_cmake_install( -- PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} -- INSTALL_FOLDER ${CMAKE_BINARY_DIR} +- PATH_OR_REFERENCE ${PROJECT_SOURCE_DIR} +- INSTALL_FOLDER ${PROJECT_BINARY_DIR} - BUILD missing - REMOTE conancenter - SETTINGS ${settings} diff --git a/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix b/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix index 403c4f729b..cf0a0bf70f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix @@ -31,9 +31,12 @@ stdenv.mkDerivation rec { "-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests" ]; - # Tests fail on x86_32 if compiled with x87 floats: https://github.com/catchorg/Catch2/issues/2796 env = lib.optionalAttrs stdenv.isx86_32 { + # Tests fail on x86_32 if compiled with x87 floats: https://github.com/catchorg/Catch2/issues/2796 NIX_CFLAGS_COMPILE = "-msse2 -mfpmath=sse"; + } // lib.optionalAttrs (stdenv.hostPlatform.isRiscV || stdenv.hostPlatform.isAarch32) { + # Build failure caused by -Werror: https://github.com/catchorg/Catch2/issues/2808 + NIX_CFLAGS_COMPILE = "-Wno-error=cast-align"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix index 1e884b3d8a..0a1fd07e25 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeShellScript , cmake , ogre , freetype @@ -13,7 +14,7 @@ stdenv.mkDerivation { pname = "cegui"; - version = "unstable-2023-03-18"; + version = "0-unstable-2023-03-18"; src = fetchFromGitHub { owner = "paroj"; @@ -47,6 +48,12 @@ stdenv.mkDerivation { passthru.updateScript = unstableGitUpdater { branch = "v0"; + # The above branch is separate from the branch with the latest tags, so the updater doesn't pick them up + # This is what would be used to handle upstream's format, if it was able to see the tags + # tagConverter = writeShellScript "cegui-tag-converter.sh" '' + # sed -e 's/^v//g' -e 's/-/./g' + # ''; + hardcodeZeroVersion = true; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/cista/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cista/default.nix index 30070fe02d..e2f302b581 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cista/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cista/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation rec { pname = "cista"; @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://cista.rocks"; description = "A simple, high-performance, zero-copy C++ serialization & reflection library"; license = licenses.mit; - maintainers = []; + maintainers = [ maintainers.sigmanificient ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/cjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cjson/default.nix index e6e09a7ffe..38be1c30cd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cjson"; - version = "1.7.17"; + version = "1.7.18"; src = fetchFromGitHub { owner = "DaveGamble"; repo = "cJSON"; rev = "v${version}"; - sha256 = "sha256-jU9UbXvdXiNXFh7c9p/LppMsuqryFK40NTTyQGbNU84="; + sha256 = "sha256-UgUWc/+Zie2QNijxKK5GFe4Ypk97EidG8nTiiHhn5Ys="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix index 8637f5b7ab..7f12787003 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "codec2"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "drowe67"; repo = "codec2"; - rev = "v${version}"; - hash = "sha256-p1WMp17PCnr50bXDSd6A4Je7AfKVHuLmyEue9221zPs="; + rev = "${version}"; + hash = "sha256-69Mp4o3MgV98Fqfai4txv5jQw2WpoPuoWcwHsNAFPQM="; }; nativeBuildInputs = [ cmake ]; @@ -24,9 +24,8 @@ stdenv.mkDerivation rec { lpcnetfreedv ]; - # Install a binary that is used by openwebrx postInstall = '' - install -Dm0755 src/freedv_rx -t $out/bin/ + install -Dm0755 src/{c2enc,c2sim,freedv_rx,freedv_tx,cohpsk_*,fdmdv_*,fsk_*,ldpc_*,ofdm_*} -t $out/bin/ ''; # Swap keyword order to satisfy SWIG parser @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Speech codec designed for communications quality speech at low data rates"; - mainProgram = "freedv_rx"; homepage = "https://www.rowetel.com/codec2.html"; license = licenses.lgpl21Only; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index 49ebc34fbc..9a240d084f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -3,24 +3,24 @@ , fetchFromGitHub , cmake , cppunit -, iconv +, libiconv }: stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.24.7"; + version = "5.24.8"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-gfyvWnvUXgjocid0nvp3lWhdPb7MYm+1GJRP5RYInEY="; + sha256 = "sha256-Bo7XYArkJOK/dsX+K+xadz8SCh736ZMaB29jX4X+RGw="; }; nativeBuildInputs = [ cmake ]; nativeCheckInputs = [ cppunit ]; buildInputs = lib.optionals stdenv.isDarwin [ - iconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4 + libiconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4 ]; cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/criterion/default.nix b/third_party/nixpkgs/pkgs/development/libraries/criterion/default.nix deleted file mode 100644 index 9b3304f601..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/criterion/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, boxfort, meson, libcsptr, pkg-config, gettext -, cmake, ninja, protobuf, libffi, libgit2, dyncall, nanomsg, nanopbMalloc -, python3Packages }: - -stdenv.mkDerivation rec { - pname = "criterion"; - version = "2.4.1"; - - src = fetchFromGitHub { - owner = "Snaipe"; - repo = "Criterion"; - rev = "v${version}"; - sha256 = "KT1XvhT9t07/ubsqzrVUp4iKcpVc1Z+saGF4pm2RsgQ="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ meson ninja cmake pkg-config protobuf ]; - - buildInputs = [ - boxfort.dev - dyncall - gettext - libcsptr - nanomsg - nanopbMalloc - libgit2 - libffi - ]; - - nativeCheckInputs = with python3Packages; [ cram ]; - - doCheck = true; - - postPatch = '' - patchShebangs ci/isdir.py src/protocol/gen-pb.py - ''; - - outputs = [ "dev" "out" ]; - - meta = with lib; { - description = "A cross-platform C and C++ unit testing framework for the 21th century"; - homepage = "https://github.com/Snaipe/Criterion"; - license = licenses.mit; - maintainers = with maintainers; [ - thesola10 - Yumasi - ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix index e8d85ec23d..2b98aca1d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "crossguid"; - version = "unstable-2019-05-29"; + version = "0.2.2-unstable-2019-05-29"; src = fetchFromGitHub { owner = "graeme-hill"; @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional stdenv.isLinux libuuid; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "Lightweight cross platform C++ GUID/UUID library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix index dbd213f8a3..369630c812 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-P/aXrzaCF6Rz99Pz9CkpR/FlWXCj04q/4swiAddcwKk="; + hash = "sha256-Bg25HL7BDM+SHtM0m7mJ3mAdpFe4kefdiDx5Ek1pQBs="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix index 3100163632..13776e891c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -52,7 +52,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus glib expat ]; - configureFlags = [ "--disable-ecore" "--disable-tests" ]; + configureFlags = [ + "--disable-ecore" + "--disable-tests" + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "--disable-examples" + ]; meta = with lib; { homepage = "https://dbus-cplusplus.sourceforge.net"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix index 2f8ea0e685..ab3804dfcf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/dconf"; + homepage = "https://gitlab.gnome.org/GNOME/dconf"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix index c4ed0730cd..677c7e6369 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library for compressing and decompressing 3D geometric meshes and point clouds"; homepage = "https://google.github.io/draco/"; - changelog = "https://github.com/google/draco/releases/tag/${version}"; + changelog = "https://github.com/google/draco/releases/tag/${finalAttrs.version}"; license = licenses.asl20; maintainers = with maintainers; [ jansol ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix index 3e155d6f2d..2cdc6cfafb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-en8w8kda0ijg6b6s2WHxHfuGaa+p08928Jw57UBevDU="; + sha256 = "sha256-P6blu3EIBzmK1zikFPiV+tvFLfiQhK+cRdClQOhcBSU="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix index 03857e962a..343574f251 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { # fails with Out of Memory Error "test/sql/copy/parquet/batched_write/batch_memory_usage.test" # wants http connection + "test/sql/copy/csv/recursive_query_csv.test" "test/sql/copy/csv/test_mixed_lines.test" ] ++ lib.optionals stdenv.isAarch64 [ "test/sql/aggregate/aggregates/test_kurtosis.test" diff --git a/third_party/nixpkgs/pkgs/development/libraries/duckdb/versions.json b/third_party/nixpkgs/pkgs/development/libraries/duckdb/versions.json index efb151413e..de679be885 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/duckdb/versions.json +++ b/third_party/nixpkgs/pkgs/development/libraries/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "0.10.1", - "rev": "4a89d97db8a5a23a15f3025c8d2d2885337c2637", - "hash": "sha256-/j/DaUzsfACI5Izr4lblkYmIEmKsOXr760UTwC0l/qg=" + "version": "0.10.2", + "rev": "1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed", + "hash": "sha256-CTZ90KJvLPQqu1FYciEWsxJbvybCjeBsi/12bkfVd9Q=" } diff --git a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index 383a157acb..2fa7aec062 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.6.8"; + version = "2.6.9"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-9WWSMGLHfz1YhG8FWNIebQfKSkiMWIEt/e+zUgL6x64="; + hash = "sha256-2aWhDcmzikOzoPoix27W67fgnrU1r/YpVK/NvUDv/2s="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/faac/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faac/default.nix index 42f1f8db59..c1dba7c34b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/faac/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/faac/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, autoreconfHook -, mp4v2Support ? true, mp4v2 ? null +, mp4v2Support ? true, mp4v2 , drmSupport ? false # Digital Radio Mondiale }: -assert mp4v2Support -> (mp4v2 != null); - stdenv.mkDerivation rec { pname = "faac"; version = "1.30"; @@ -14,21 +12,20 @@ stdenv.mkDerivation rec { sha256 = "1lmj0dib3mjp84jhxc5ddvydkzzhb0gfrdh3ikcidjlcb378ghxd"; }; - configureFlags = [ ] - ++ lib.optional mp4v2Support "--with-external-mp4v2" + configureFlags = lib.optional mp4v2Support "--with-external-mp4v2" ++ lib.optional drmSupport "--enable-drm"; hardeningDisable = [ "format" ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ] - ++ lib.optional mp4v2Support mp4v2; + buildInputs = lib.optional mp4v2Support mp4v2; enableParallelBuilding = true; meta = with lib; { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; + homepage = "https://github.com/knik0/faac"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix index fc71ced981..743ef904dc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "24.04"; + version = "24.05"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-DuQG5AsfLtWHVun9P8iiBqp3xtb67feC5b2gveIRqpA="; + sha256 = "sha256-YL5JT/1JTfeKaLUEMnud6OOMk/NSCnBjohk+6qRaU60="; }; nativeBuildInputs = [cmake]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index bdc0cdd5ff..92a28d8a77 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -40,12 +40,14 @@ , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering , withAudioToolbox ? withHeadlessDeps && stdenv.isDarwin # Apple AudioToolbox , withAvFoundation ? withHeadlessDeps && stdenv.isDarwin # Apple AVFoundation framework +, withAvisynth ? withFullDeps # AviSynth script files reading , withBluray ? withFullDeps # BluRay reading , withBs2b ? withFullDeps # bs2b DSP library , withBzlib ? withHeadlessDeps , withCaca ? withFullDeps # Textual display (ASCII art) , withCelt ? withFullDeps # CELT decoder , withChromaprint ? withFullDeps # Audio fingerprinting +, withCodec2 ? withFullDeps # codec2 en/decoding , withCoreImage ? withHeadlessDeps && stdenv.isDarwin # Apple CoreImage framework , withCuda ? withFullDeps && withNvcodec , withCudaLLVM ? withFullDeps @@ -68,6 +70,7 @@ , withHarfbuzz ? withHeadlessDeps && lib.versionAtLeast version "6.1" # Needed for drawtext filter , withIconv ? withHeadlessDeps , withJack ? withFullDeps && !stdenv.isDarwin # Jack audio +, withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding , withLadspa ? withFullDeps # LADSPA audio filtering , withLzma ? withHeadlessDeps # xz-utils , withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx @@ -211,9 +214,11 @@ * External libraries options */ , alsa-lib +, avisynthplus , bzip2 , celt , chromaprint +, codec2 , clang , dav1d , fdk_aac @@ -243,6 +248,7 @@ , libGLU , libiconv , libjack2 +, libjxl , libmodplug , libmysofa , libogg @@ -415,6 +421,13 @@ stdenv.mkDerivation (finalAttrs: { ''; } ] + ++ (lib.optionals (lib.versionAtLeast version "5" && lib.versionOlder version "6") [ + { + name = "fix_build_failure_due_to_libjxl_version_to_new"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/75b1a555a70c178a9166629e43ec2f6250219eb2"; + hash = "sha256-+2kzfPJf5piim+DqEgDuVEEX5HLwRsxq0dWONJ4ACrU="; + } + ]) ++ (lib.optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [ { # this can be removed post 6.1 name = "fix_build_failure_due_to_PropertyKey_EncoderID"; @@ -527,12 +540,14 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withAss "libass") (enableFeature withAudioToolbox "audiotoolbox") (enableFeature withAvFoundation "avfoundation") + (enableFeature withAvisynth "avisynth") (enableFeature withBluray "libbluray") (enableFeature withBs2b "libbs2b") (enableFeature withBzlib "bzlib") (enableFeature withCaca "libcaca") (enableFeature withCelt "libcelt") (enableFeature withChromaprint "chromaprint") + (enableFeature withCodec2 "libcodec2") (enableFeature withCoreImage "coreimage") (enableFeature withCuda "cuda") (enableFeature withCudaLLVM "cuda-llvm") @@ -560,6 +575,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ [ (enableFeature withIconv "iconv") (enableFeature withJack "libjack") + ] ++ optionals (versionAtLeast finalAttrs.version "5.0") [ + (enableFeature withJxl "libjxl") + ] ++ [ (enableFeature withLadspa "ladspa") (enableFeature withLzma "lzma") (enableFeature withMfx "libmfx") @@ -671,12 +689,14 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withAss [ libass ] ++ optionals withAudioToolbox [ AudioToolbox ] ++ optionals withAvFoundation [ AVFoundation ] + ++ optionals withAvisynth [ avisynthplus ] ++ optionals withBluray [ libbluray ] ++ optionals withBs2b [ libbs2b ] ++ optionals withBzlib [ bzip2 ] ++ optionals withCaca [ libcaca ] ++ optionals withCelt [ celt ] ++ optionals withChromaprint [ chromaprint ] + ++ optionals withCodec2 [ codec2 ] ++ optionals withCoreImage [ CoreImage ] ++ optionals withDav1d [ dav1d ] ++ optionals withDc1394 [ libdc1394 libraw1394 ] @@ -696,6 +716,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withHarfbuzz [ harfbuzz ] ++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it? ++ optionals withJack [ libjack2 ] + ++ optionals withJxl [ libjxl ] ++ optionals withLadspa [ ladspaH ] ++ optionals withLzma [ xz ] ++ optionals withMfx [ intel-media-sdk ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/fizz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fizz/default.nix index 5415dde6ca..cc7a249cf7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fizz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fizz/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C++14 implementation of the TLS-1.3 standard"; homepage = "https://github.com/facebookincubator/fizz"; - changelog = "https://github.com/facebookincubator/fizz/releases/tag/v${version}"; + changelog = "https://github.com/facebookincubator/fizz/releases/tag/v${finalAttrs.version}"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ pierreis kylesferrazza ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix index c100a8862d..0f40be439a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "folks"; - version = "0.15.7"; + version = "0.15.9"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/folks/${lib.versions.majorMinor finalAttrs.version}/folks-${finalAttrs.version}.tar.xz"; - sha256 = "Eg8hnvYyEsqpWuf2rrZOKZKLCxqLlFIFQwSgDQ80eHE="; + hash = "sha256-IxGzc1XDUfM/Fj/cOUh0oioKBoLDGUk9bYpuQgcRQV8="; }; nativeBuildInputs = [ @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A library that aggregates people from multiple sources to create metacontacts"; - homepage = "https://wiki.gnome.org/Projects/Folks"; + homepage = "https://gitlab.gnome.org/GNOME/folks"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/functionalplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/functionalplus/default.nix index 6d3092e53c..e4eef8dfe5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/functionalplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/functionalplus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "functionalplus"; - version = "0.2.23"; + version = "0.2.24"; src = fetchFromGitHub { owner = "Dobiasd"; repo = "FunctionalPlus"; rev = "v${version}"; - sha256 = "sha256-WDufVO0vQyu7O3w9tq+19JioRUFgYlnTbO/AQzg0FnM="; + sha256 = "sha256-iQGvqFiTqejSqXALgUWCBjfH9QO0cg3vnI5PphgVoms="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gcr/4.nix b/third_party/nixpkgs/pkgs/development/libraries/gcr/4.nix index 243663e430..dd860d0bc7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gcr/4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gcr/4.nix @@ -26,15 +26,17 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "4.1.0"; + version = "4.3.0"; outputs = [ "out" "bin" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "nOqtKShLqRm5IW4oiMGOxnJAwsk7OkhWvFSIu8Hzo4M="; + hash = "sha256-w+6HKOQ2SwOX9DX6IPkvkBqxOdKyZPTgWdZ7PA9DzTY="; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config meson @@ -49,7 +51,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnupg libgcrypt libtasn1 pango @@ -72,6 +73,7 @@ stdenv.mkDerivation rec { # We are still using ssh-agent from gnome-keyring. # https://github.com/NixOS/nixpkgs/issues/140824 "-Dssh_agent=false" + "-Dgpg_path=${lib.getBin gnupg}/bin/gpg" ]; doCheck = false; # fails 21 out of 603 tests, needs dbus daemon diff --git a/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix index 5a388246c1..db31927b7a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix @@ -16,7 +16,7 @@ , openssh , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , gi-docgen , vala , gnome @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { sha256 = "utEPPFU6DhhUZJq1nFskNNoiyhpUrmE48fU5YVZ+Grc="; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config meson @@ -43,10 +45,9 @@ stdenv.mkDerivation rec { gettext gobject-introspection gi-docgen - wrapGAppsHook + wrapGAppsHook3 vala shared-mime-info - gnupg openssh ]; @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { # We are still using ssh-agent from gnome-keyring. # https://github.com/NixOS/nixpkgs/issues/140824 "-Dssh_agent=false" + "-Dgpg_path=${lib.getBin gnupg}/bin/gpg" ] ++ lib.optionals (!systemdSupport) [ "-Dsystemd=disabled" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix index f77daec2ea..a90a2c5c9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdk-pixbuf"; - version = "2.42.10"; + version = "2.42.11"; outputs = [ "out" "dev" "man" ] ++ lib.optional withIntrospection "devdoc" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "7ptsddE7oJaQei48aye2G80X9cfr6rWltDnS8uOf5Es="; + hash = "sha256-Sdy0AjiHCGR+jDIdVrb7MPIeUeUV0MWpQiaNIwUqLwA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/geis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geis/default.nix index 17ef806ec9..9f1cc784e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geis/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl , pkg-config , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , atk , dbus , evemu @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ pygobject3 ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython gobject-introspection ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 python3Packages.wrapPython gobject-introspection ]; buildInputs = [ atk dbus evemu frame gdk-pixbuf grail gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix index 74eb0f05d3..ea3fd6e1ac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GmVekTySfSOIWkKLdVuhhtJFQBBBfHBj410jNUfSrkc="; + sha256 = "sha256-UPAYqgZSJMp6/pRIVJYqh8i5olBSVoMUv2zCd14JBOg="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix index c2bf28d710..df58e5dc9e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix @@ -19,7 +19,7 @@ , avahi , glib-networking , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , vala , withDemoAgent ? false @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { intltool meson ninja - wrapGAppsHook + wrapGAppsHook3 python3 vala gobject-introspection diff --git a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix index e24f519d1c..38de277403 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -3,7 +3,7 @@ , callPackage , fetchurl , testers - +, ngspice , cmake }: @@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals stdenv.isDarwin [ ngspice ]; # https://github.com/libgeos/geos/issues/930 cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index 4a346fdcff..9753f78ec8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/gexiv2"; + homepage = "https://gitlab.gnome.org/GNOME/gexiv2"; description = "GObject wrapper around the Exiv2 photo metadata library"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix index d84dd96ce2..c3c41d971b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gfbgraph/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GFBGraph"; + homepage = "https://gitlab.gnome.org/GNOME/libgfbgraph"; description = "GLib/GObject wrapper for the Facebook Graph API"; maintainers = teams.gnome.members; license = licenses.lgpl21Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix index a73d120612..677db06e50 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix @@ -4,7 +4,6 @@ , fetchpatch , fixDarwinDylibNames , pkgsStatic -, imagemagick_light }: stdenv.mkDerivation rec { @@ -21,17 +20,15 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ # Build dll libraries. (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/001-mingw-build.patch?h=mingw-w64-giflib&id=4cf1e519bcf51338dc607d23388fca47d71790c0"; - sha256 = "KyJi3eqH/Ae+guEK6znraZI5+IPImaoYoW5NTkCvjsg="; + url = "https://aur.archlinux.org/cgit/aur.git/plain/001-mingw-build.patch?h=mingw-w64-giflib&id=b7311edf54824ac797c7916cd3ddc3a4b2368a19"; + hash = "sha256-bBx7lw7FWtxZJ+E9AAbKIpCGcJnS5lrGpjYcv/zBtKk="; }) # Install executables. ./mingw-install-exes.patch ]; - nativeBuildInputs = [ - imagemagick_light - ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; @@ -39,7 +36,11 @@ stdenv.mkDerivation rec { "PREFIX=${builtins.placeholder "out"}" ]; - postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + postPatch = '' + # we don't want to build HTML documentation + substituteInPlace doc/Makefile \ + --replace-fail "all: allhtml manpages" "all: manpages" + '' + lib.optionalString stdenv.hostPlatform.isStatic '' # Upstream build system does not support NOT building shared libraries. sed -i '/all:/ s/$(LIBGIFSO)//' Makefile sed -i '/all:/ s/$(LIBUTILSO)//' Makefile diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix index dc5f5e4697..604435cee5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -32,13 +32,13 @@ let ]; in stdenv.mkDerivation (finalAttrs: { pname = "gjs"; - version = "1.78.4"; + version = "1.80.2"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz"; - hash = "sha256-mux6uHLCBQQEkHrpTwrnq+yKVL2ciU3bXC0PUekyuaE="; + hash = "sha256-E145xaxZEJYjPlV8/ld9ZAk/UFRBHUfLLiFLrX1Bmb0="; }; patches = [ @@ -47,6 +47,10 @@ in stdenv.mkDerivation (finalAttrs: { # Allow installing installed tests to a separate output. ./installed-tests-path.patch + + # Disable introspection test in installed tests + # (minijasmine:1317): GLib-GIO-WARNING **: 17:33:39.556: Error creating IO channel for /proc/self/mountinfo: No such file or directory (g-io-error-quark, 1) + ./disable-introspection-test.patch ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/disable-introspection-test.patch b/third_party/nixpkgs/pkgs/development/libraries/gjs/disable-introspection-test.patch new file mode 100644 index 0000000000..1c438dd6b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gjs/disable-introspection-test.patch @@ -0,0 +1,12 @@ +diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build +index 07759690..43c87c59 100644 +--- a/installed-tests/js/meson.build ++++ b/installed-tests/js/meson.build +@@ -123,7 +123,6 @@ jasmine_tests = [ + 'GTypeClass', + 'Importer', + 'Importer2', +- 'Introspection', + 'Lang', + 'LegacyByteArray', + 'LegacyClass', diff --git a/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix index fdfb203ba1..c0934e7d18 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "gl3w"; - version = "unstable-2023-10-10"; + version = "0-unstable-2023-10-10"; src = fetchFromGitHub { owner = "skaslev"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/glfw/3.x.nix index 014e5f7e9f..5e0b6adbb2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glfw/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glfw/3.x.nix @@ -1,47 +1,54 @@ { stdenv, lib, fetchFromGitHub, cmake , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext , Carbon, Cocoa, Kernel, OpenGL, fixDarwinDylibNames -, waylandSupport ? false, extra-cmake-modules, wayland -, wayland-protocols, libxkbcommon +, extra-cmake-modules, wayland +, wayland-scanner, wayland-protocols, libxkbcommon }: stdenv.mkDerivation rec { - version = "3.3.10"; + version = "3.4"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "sha256-kTRXsfQ+9PFurG3ffz0lwnITAYAXtNl3h/3O6FSny5o="; + sha256 = "sha256-FcnQPDeNHgov1Z07gjFze0VMz2diOrpbKZCsI96ngz0="; }; # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) - patches = lib.optional (!waylandSupport) ./x11.patch; + patches = ./x11.patch; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ OpenGL ] ++ lib.optionals stdenv.isLinux [ libGL ]; - nativeBuildInputs = [ cmake ] + nativeBuildInputs = [ cmake extra-cmake-modules ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames - ++ lib.optional waylandSupport extra-cmake-modules; + ++ lib.optionals stdenv.isLinux [ wayland-scanner ]; buildInputs = lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ] - ++ lib.optionals (stdenv.isLinux && waylandSupport) [ wayland wayland-protocols libxkbcommon ] - ++ lib.optionals (stdenv.isLinux && !waylandSupport) [ libX11 libXrandr libXinerama libXcursor libXi libXext ]; + ++ lib.optionals stdenv.isLinux [ + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXinerama + libXcursor + libXi + libXext + ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] ++ lib.optionals (!stdenv.isDarwin && !stdenv.hostPlatform.isWindows) [ "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'" - ] ++ lib.optionals waylandSupport [ - "-DGLFW_USE_WAYLAND=ON" "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'" ]; - postPatch = lib.optionalString waylandSupport '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/wl_init.c \ --replace "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix index 39e17a894c..d74acc063e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.78.1"; + version = "2.80.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "5I8t27BJgyy7CSMFKcXkXayp8N8O2jJfgy9zeYWb8J8="; + hash = "sha256-2PTxqrITF5rjNRYXtZ2rXea8yeeFAh7uF4mY69S7Os8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix index 7c14141554..70d24842a8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -2,36 +2,35 @@ , lib , stdenv , fetchurl -, fetchpatch , gettext , meson , ninja , pkg-config , perl , python3 -, libiconv, zlib, libffi, pcre2, elfutils, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45, libxslt +, python3Packages +, libiconv, zlib, libffi, pcre2, elfutils, gnome, libselinux, bash, gnum4, libxslt +, docutils, gi-docgen # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null , buildPackages # this is just for tests (not in the closure of any regular package) -, coreutils, dbus, libxml2, tzdata +, coreutils, dbus, tzdata , desktop-file-utils, shared-mime-info , darwin , makeHardcodeGsettingsPatch , testers +, gobject-introspection +, mesonEmulatorHook +, withIntrospection ? + stdenv.hostPlatform.emulatorAvailable buildPackages && + lib.meta.availableOn stdenv.hostPlatform gobject-introspection && + stdenv.hostPlatform.isLittleEndian == stdenv.buildPlatform.isLittleEndian }: assert stdenv.isLinux -> util-linuxMinimal != null; -/* - * TODO: - * Use --enable-installed-tests for GNOME-related packages, - and use them as a separately installed tests run by Hydra - (they should test an already installed package) - https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests - * Support org.freedesktop.Application, including D-Bus activation from desktop files -*/ let # Some packages don't get "Cflags" from pkg-config correctly # and then fail to build when directly including like . @@ -46,16 +45,26 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; - buildDocs = stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isStatic; + gobject-introspection' = buildPackages.gobject-introspection.override { + propagateFullGlib = false; + # Avoid introducing cairo, which enables gobjectSupport by default. + x11Support = false; + }; + + librarySuffix = if (stdenv.hostPlatform.extensions.library == ".so") then "2.0.so.0" + else if (stdenv.hostPlatform.extensions.library == ".dylib") then "2.0.0.dylib" + else if (stdenv.hostPlatform.extensions.library == ".a") then "2.0.a" + else if (stdenv.hostPlatform.extensions.library == ".dll") then "2.0-0.dll" + else "2.0-0.lib"; in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.78.4"; + version = "2.80.0"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-JLjgZy3KEgzDLTlLzLhYROcy4E/nXRi7BXOy28dUj2M="; + hash = "sha256-giipL5KkEhYLE5rmi2NFvSjyRDSnta8VDr4h/1h6Vh0="; }; patches = lib.optionals stdenv.isDarwin [ @@ -64,13 +73,19 @@ stdenv.mkDerivation (finalAttrs: { ./quark_init_on_demand.patch ./gobject_init_on_demand.patch ] ++ [ - (fetchpatch { - name = "GLib-against-PCRE2-10.43.patch"; - url = "https://gitlab.gnome.org/GNOME/glib/-/commit/cce3ae98a2c1966719daabff5a4ec6cf94a846f6.patch"; - hash = "sha256-vgKzb5hQmFQGD8zxRrXnuX9Gpg/TeSrzehlOH2vA1xU="; - }) + # This patch lets GLib's GDesktopAppInfo API watch and notice changes + # to the Nix user and system profiles. That way, the list of available + # applications shown by the desktop environment is immediately updated + # when the user installs or removes any + # (see ). + # It does so by monitoring /nix/var/nix/profiles (for changes to the system + # profile) and /nix/var/nix/profiles/per-user/USER (for changes to the user + # profile) as well as /etc/profiles/per-user (for chanes to the user + # environment profile) and crawling their share/applications sub-directory when + # changes happen. ./glib-appinfo-watch.patch + ./schema-override-variable.patch # Add support for Pantheon’s terminal emulator. @@ -99,10 +114,6 @@ stdenv.mkDerivation (finalAttrs: { # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out) # * gio-launch-desktop ./split-dev-programs.patch - - # Disable flaky test. - # https://gitlab.gnome.org/GNOME/glib/-/issues/820 - ./skip-timer-test.patch ]; outputs = [ "bin" "out" "dev" "devdoc" ]; @@ -121,48 +132,44 @@ stdenv.mkDerivation (finalAttrs: { util-linuxMinimal # for libmount ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Carbon Cocoa CoreFoundation CoreServices Foundation - ]) ++ lib.optionals buildDocs [ - # Note: this needs to be both in buildInputs and nativeBuildInputs. The - # Meson gtkdoc module uses find_program to look it up (-> build dep), but - # glib's own Meson configuration uses the host pkg-config to find its - # version (-> host dep). We could technically go and fix this in glib, add - # pkg-config to depsBuildBuild, but this would be a futile exercise since - # Meson's gtkdoc integration does not support cross compilation[1] anyway - # and this derivation disables the docs build when cross compiling. - # - # [1] https://github.com/mesonbuild/meson/issues/2003 - gtk-doc - ]; + ]); strictDeps = true; + depsBuildBuild = [ + pkg-config # required to find native gi-docgen + ]; + nativeBuildInputs = [ + docutils # for rst2man, rst2html5 meson ninja pkg-config perl python3 + python3Packages.packaging # mostly used to make meson happy + python3Packages.wrapPython # for patchPythonScript gettext libxslt - docbook_xsl - ] ++ lib.optionals buildDocs [ - gtk-doc - docbook_xml_dtd_45 - libxml2 + ] ++ lib.optionals withIntrospection [ + gi-docgen + gobject-introspection' + ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; mesonFlags = [ - # Avoid the need for gobject introspection binaries in PATH in cross-compiling case. - # Instead we just copy them over from the native output. - "-Dgtk_doc=${lib.boolToString buildDocs}" + "-Ddocumentation=true" # gvariant specification can be built without gi-docgen "-Dnls=enabled" "-Ddevbindir=${placeholder "dev"}/bin" + (lib.mesonEnable "introspection" withIntrospection) + # FIXME: Fails when linking target glib/tests/libconstructor-helper.so + # relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object + "-Dtests=${lib.boolToString (!stdenv.hostPlatform.isStatic)}" ] ++ lib.optionals (!lib.meta.availableOn stdenv.hostPlatform elfutils) [ "-Dlibelf=disabled" - ] ++ lib.optionals (!stdenv.isDarwin) [ - "-Dman=true" # broken on Darwin ] ++ lib.optionals stdenv.isFreeBSD [ "-Db_lundef=false" "-Dxattr=false" @@ -176,14 +183,11 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - chmod +x gio/tests/gengiotypefuncs.py - patchShebangs gio/tests/gengiotypefuncs.py - chmod +x docs/reference/gio/concat-files-helper.py - patchShebangs docs/reference/gio/concat-files-helper.py patchShebangs glib/gen-unicode-tables.pl patchShebangs glib/tests/gen-casefold-txt.py patchShebangs glib/tests/gen-casemap-txt.py patchShebangs tools/gen-visibility-macros.py + patchShebangs tests # Needs machine-id, comment the test sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c @@ -219,8 +223,11 @@ stdenv.mkDerivation (finalAttrs: { for i in $dev/bin/*; do moveToOutput "share/bash-completion/completions/''${i##*/}" "$dev" done - '' + lib.optionalString (!buildDocs) '' - cp -r ${buildPackages.glib.devdoc} $devdoc + ''; + + preFixup = lib.optionalString (!stdenv.hostPlatform.isStatic) '' + buildPythonPath ${python3Packages.packaging} + patchPythonScript "$dev/share/glib-2.0/codegen/utils.py" ''; # Move man pages to the same output as their binaries (needs to be @@ -230,10 +237,14 @@ stdenv.mkDerivation (finalAttrs: { for i in $dev/bin/*; do moveToOutput "share/man/man1/''${i##*/}.1.*" "$dev" done + + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc/glib-2.0" "$devdoc" ''; nativeCheckInputs = [ tzdata desktop-file-utils shared-mime-info ]; + # Conditional necessary to break infinite recursion with passthru.tests preCheck = lib.optionalString finalAttrs.finalPackage.doCheck or config.doCheckByDefault or false '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/glib-${finalAttrs.version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" @@ -242,8 +253,34 @@ stdenv.mkDerivation (finalAttrs: { export HOME="$TMP" export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon" - export PATH="$PATH:$(pwd)/gobject" + + # pkg_config_tests expects a PKG_CONFIG_PATH that points to meson-private, wrapped pkg-config + # tries to be clever and picks up the wrong glib at the end. + export PATH="${buildPackages.pkg-config-unwrapped}/bin:$PATH:$(pwd)/gobject" echo "PATH=$PATH" + + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that we will delete before installation. + mkdir -p $out/lib + ln -s $PWD/gobject/libgobject-${librarySuffix} $out/lib/libgobject-${librarySuffix} + ln -s $PWD/gio/libgio-${librarySuffix} $out/lib/libgio-${librarySuffix} + ln -s $PWD/glib/libglib-${librarySuffix} $out/lib/libglib-${librarySuffix} + ''; + + checkPhase = '' + runHook preCheck + + meson test --print-errorlogs + + runHook postCheck + ''; + + postCheck = '' + rm $out/lib/libgobject-${librarySuffix} + rm $out/lib/libgio-${librarySuffix} + rm $out/lib/libglib-${librarySuffix} ''; separateDebugInfo = stdenv.isLinux; @@ -282,7 +319,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C library of programming buildings blocks"; - homepage = "https://wiki.gnome.org/Projects/GLib"; + homepage = "https://gitlab.gnome.org/GNOME/glib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); pkgConfigModules = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/elementary-terminal-support.patch b/third_party/nixpkgs/pkgs/development/libraries/glib/elementary-terminal-support.patch index 34a56c8487..5178f9d016 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/elementary-terminal-support.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/elementary-terminal-support.patch @@ -1,8 +1,8 @@ diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c -index 30fcb2937..a6a7163a7 100644 +index 87db7a97a..bf01fb6b6 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c -@@ -2704,6 +2704,7 @@ prepend_terminal_to_vector (int *argc, +@@ -2697,6 +2697,7 @@ prepend_terminal_to_vector (int *argc, { "gnome-terminal", "--" }, { "mate-terminal", "-x" }, { "xfce4-terminal", "-x" }, diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/glib-appinfo-watch.patch b/third_party/nixpkgs/pkgs/development/libraries/glib/glib-appinfo-watch.patch index cbd78a6db4..43641301d3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/glib-appinfo-watch.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/glib-appinfo-watch.patch @@ -1,20 +1,8 @@ -This patch lets GLib's GDesktopAppInfo API watch and notice changes -to the Nix user and system profiles. That way, the list of available -applications shown by the desktop environment is immediately updated -when the user installs or removes any -(see ). - -It does so by monitoring /nix/var/nix/profiles (for changes to the system -profile) and /nix/var/nix/profiles/per-user/USER (for changes to the user -profile) as well as /etc/profiles/per-user (for chanes to the user -environment profile) and crawling their share/applications sub-directory when -changes happen. - diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c -index b779b30..31069f7 100644 +index 87db7a97a..2e1689ed7 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c -@@ -150,6 +150,7 @@ typedef struct +@@ -147,6 +147,7 @@ typedef struct gchar *alternatively_watching; gboolean is_config; gboolean is_setup; @@ -22,7 +10,7 @@ index b779b30..31069f7 100644 GFileMonitor *monitor; GHashTable *app_names; GHashTable *mime_tweaks; -@@ -181,6 +182,7 @@ desktop_file_dir_unref (DesktopFileDir *dir) +@@ -179,6 +180,7 @@ desktop_file_dir_unref (DesktopFileDir *dir) { desktop_file_dir_reset (dir); g_free (dir->path); @@ -30,7 +18,7 @@ index b779b30..31069f7 100644 g_free (dir); } } -@@ -205,6 +207,14 @@ desktop_file_dir_get_alternative_dir (DesktopFileDir *dir) +@@ -203,6 +205,14 @@ desktop_file_dir_get_alternative_dir (DesktopFileDir *dir) { gchar *parent; @@ -45,7 +33,7 @@ index b779b30..31069f7 100644 /* If the directory itself exists then we need no alternative. */ if (g_access (dir->path, R_OK | X_OK) == 0) return NULL; -@@ -250,11 +260,11 @@ desktop_file_dir_changed (GFileMonitor *monitor, +@@ -248,11 +258,11 @@ desktop_file_dir_changed (GFileMonitor *monitor, * * If this is a notification for a parent directory (because the * desktop directory didn't exist) then we shouldn't fire the signal @@ -59,7 +47,7 @@ index b779b30..31069f7 100644 { gchar *alternative_dir; -@@ -1556,6 +1566,40 @@ desktop_file_dirs_lock (void) +@@ -1650,6 +1660,40 @@ desktop_file_dirs_lock (void) for (i = 0; dirs[i]; i++) g_ptr_array_add (desktop_file_dirs, desktop_file_dir_new (dirs[i])); @@ -84,7 +72,7 @@ index b779b30..31069f7 100644 + user_data_dir = g_build_filename (profile_dir, "profile", "share", NULL); + user_profile_dir = desktop_file_dir_new (user_data_dir); + user_profile_dir->nix_profile_watch_dir = profile_dir; -+ ++ + env_dir = g_build_filename ("/etc/profiles/per-user", NULL); + env_data_dir = g_build_filename (env_dir, user, "share", NULL); + user_env_dir = desktop_file_dir_new (env_data_dir); diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch b/third_party/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch index f98af04a7f..84d3e93730 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch @@ -1,8 +1,8 @@ diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c -index 1282c10a1..feadfe3aa 100644 +index b1918657d..504ff97c4 100644 --- a/gio/gsettingsschema.c +++ b/gio/gsettingsschema.c -@@ -360,6 +360,9 @@ initialise_schema_sources (void) +@@ -356,6 +356,9 @@ initialise_schema_sources (void) try_prepend_data_dir (g_get_user_data_dir ()); diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/skip-timer-test.patch b/third_party/nixpkgs/pkgs/development/libraries/glib/skip-timer-test.patch deleted file mode 100644 index 942f3e7864..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/skip-timer-test.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Skip test which performs some unreliable floating point comparisons -Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=722604 - -Index: b/glib/tests/timer.c -=================================================================== ---- a/glib/tests/timer.c -+++ b/glib/tests/timer.c -@@ -203,7 +203,7 @@ - { - g_test_init (&argc, &argv, NULL); - -- g_test_add_func ("/timer/basic", test_timer_basic); -+/* g_test_add_func ("/timer/basic", test_timer_basic);*/ -- g_test_add_func ("/timer/stop", test_timer_stop); -+/* g_test_add_func ("/timer/stop", test_timer_stop);*/ - g_test_add_func ("/timer/continue", test_timer_continue); - g_test_add_func ("/timer/reset", test_timer_reset); diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch b/third_party/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch index 0333c5c9ca..b32fccb837 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch @@ -1,5 +1,5 @@ diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build -index 65faae9b2..4297513d4 100644 +index 6d19cd4ba..0205e5074 100644 --- a/gio/gdbus-2.0/codegen/meson.build +++ b/gio/gdbus-2.0/codegen/meson.build @@ -20,7 +20,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir) @@ -12,13 +12,13 @@ index 65faae9b2..4297513d4 100644 configuration : gdbus_codegen_conf ) diff --git a/gio/meson.build b/gio/meson.build -index 75686bb3e..2f1a73482 100644 +index 59c2b0fc0..87cbb8229 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -882,14 +882,15 @@ pkg.generate(libgio, +@@ -885,14 +885,15 @@ pkg.generate(libgio, + variables : [ 'schemasdir=' + '${datadir}' / schemas_subdir, 'dtdsdir=' + '${datadir}' / dtds_subdir, - 'bindir=' + '${prefix}' / get_option('bindir'), + 'devbindir=' + get_option('devbindir'), 'giomoduledir=' + pkgconfig_giomodulesdir, 'gio=' + '${bindir}' / 'gio', @@ -36,7 +36,7 @@ index 75686bb3e..2f1a73482 100644 'gsettings=' + '${bindir}' / 'gsettings', ], version : glib_version, -@@ -992,6 +993,7 @@ executable('gio', gio_tool_sources, +@@ -995,6 +996,7 @@ gio_tool = executable('gio', gio_tool_sources, executable('gresource', 'gresource-tool.c', install : true, @@ -44,7 +44,7 @@ index 75686bb3e..2f1a73482 100644 install_tag : 'bin', # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, -@@ -999,7 +1001,7 @@ executable('gresource', 'gresource-tool.c', +@@ -1002,7 +1004,7 @@ executable('gresource', 'gresource-tool.c', gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c', install : true, @@ -53,7 +53,7 @@ index 75686bb3e..2f1a73482 100644 install_tag : 'bin', c_args : gio_c_args, # intl.lib is not compatible with SAFESEH -@@ -1009,7 +1011,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu +@@ -1012,7 +1014,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu glib_compile_schemas = executable('glib-compile-schemas', ['glib-compile-schemas.c'], install : true, @@ -62,7 +62,7 @@ index 75686bb3e..2f1a73482 100644 install_tag : 'bin', # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, -@@ -1018,6 +1020,7 @@ glib_compile_schemas = executable('glib-compile-schemas', +@@ -1021,6 +1023,7 @@ glib_compile_schemas = executable('glib-compile-schemas', glib_compile_resources = executable('glib-compile-resources', [gconstructor_as_data_h, 'glib-compile-resources.c'], install : true, @@ -71,10 +71,10 @@ index 75686bb3e..2f1a73482 100644 c_args : gio_c_args, # intl.lib is not compatible with SAFESEH diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 4ef3343ab..2a0a6b56b 100644 +index 232ecca5e..e292927ac 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -1131,16 +1131,18 @@ if have_bash and have_pkg_config +@@ -1182,16 +1182,18 @@ if have_bash and have_pkg_config gio_binaries = [ 'gio', @@ -97,7 +97,7 @@ index 4ef3343ab..2a0a6b56b 100644 foreach binary: gio_binaries pkg_config_tests += [ -@@ -1149,6 +1151,13 @@ if have_bash and have_pkg_config +@@ -1200,6 +1202,13 @@ if have_bash and have_pkg_config prefix / get_option('bindir') / binary) ] endforeach @@ -112,13 +112,13 @@ index 4ef3343ab..2a0a6b56b 100644 foreach binary: gio_multiarch_binaries pkg_config_tests += [ diff --git a/glib/meson.build b/glib/meson.build -index c26a35e42..38effe12a 100644 +index d2efebadc..eb9fa5b2f 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -447,9 +447,10 @@ pkg.generate(libglib, + subdirs : ['glib-2.0'], + extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : [ - 'bindir=' + '${prefix}' / get_option('bindir'), - 'datadir=' + '${prefix}' / get_option('datadir'), - 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal', - 'gobject_query=' + '${bindir}' / 'gobject-query', - 'glib_mkenums=' + '${bindir}' / 'glib-mkenums', @@ -147,10 +147,10 @@ index c26a35e42..38effe12a 100644 configuration: report_conf, install_mode: 'rwxr-xr-x' diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index 09ecd5ab3..9748d4122 100644 +index f6efc593a..5522dcb96 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -508,9 +508,9 @@ if have_bash and have_pkg_config +@@ -568,9 +568,9 @@ if have_bash and have_pkg_config 'test "$(pkg-config --variable=datadir glib-2.0)" = "@0@"'.format( prefix / get_option('datadir')), 'test "$(pkg-config --variable=gobject_query glib-2.0)" = "@0@"'.format( @@ -184,7 +184,7 @@ index 2129aaf8a..da8462428 100644 dependencies : [libglib_dep, libgobject_dep]) diff --git a/meson_options.txt b/meson_options.txt -index 517d5757c..198cc1b3c 100644 +index 69a2135bc..cfe14bb09 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,6 +4,11 @@ option('runtime_libdir', diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch index 3e0815573f..b1d7d60411 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch @@ -6,14 +6,6 @@ Date: Wed Jan 31 02:12:43 2024 +0100 Signed-off-by: Andreas K. Hüttel -diff --git a/ADVISORIES b/ADVISORIES -new file mode 100644 -index 0000000000..d4e33f2df3 ---- /dev/null -+++ b/ADVISORIES -@@ -0,0 +1,2 @@ -+For the GNU C Library Security Advisories, see the git master branch: -+https://sourceware.org/git/?p=glibc.git;a=tree;f=advisories;hb=HEAD diff --git a/advisories/GLIBC-SA-2023-0001 b/advisories/GLIBC-SA-2023-0001 deleted file mode 100644 index 3d19c91b6a..0000000000 @@ -564,3 +556,8521 @@ index 470676ab2b..2bc7124983 100644 -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include + +commit 1b9c1a0047fb26a65a9b2a7b8cd977243f7d353c +Author: Jakub Jelinek +Date: Wed Jan 31 19:17:27 2024 +0100 + + Use gcc __builtin_stdc_* builtins in stdbit.h if possible + + The following patch uses the GCC 14 __builtin_stdc_* builtins in stdbit.h + for the type-generic macros, so that when compiled with GCC 14 or later, + it supports not just 8/16/32/64-bit unsigned integers, but also 128-bit + (if target supports them) and unsigned _BitInt (any supported precision). + And so that the macros don't expand arguments multiple times and can be + evaluated in constant expressions. + + The new testcase is gcc's gcc/testsuite/gcc.dg/builtin-stdc-bit-1.c + adjusted to test stdbit.h and the type-generic macros in there instead + of the builtins and adjusted to use glibc test framework rather than + gcc style tests with __builtin_abort (). + + Signed-off-by: Jakub Jelinek + Reviewed-by: Joseph Myers + (cherry picked from commit da89496337b97e6a2aaf1e81d55cf998f6db1070) + +diff --git a/manual/stdbit.texi b/manual/stdbit.texi +index fe41c671d8..6c75ed9a20 100644 +--- a/manual/stdbit.texi ++++ b/manual/stdbit.texi +@@ -32,7 +32,13 @@ and @code{unsigned long long int}. In addition, there is a + corresponding type-generic macro (not listed below), named the same as + the functions but without any suffix such as @samp{_uc}. The + type-generic macro can only be used with an argument of an unsigned +-integer type with a width of 8, 16, 32 or 64 bits. ++integer type with a width of 8, 16, 32 or 64 bits, or when using ++a compiler with support for ++@uref{https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html,@code{__builtin_stdc_bit_ceil}}, ++etc.@:, built-in functions such as GCC 14.1 or later ++any unsigned integer type those built-in functions support. ++In GCC 14.1 that includes support for @code{unsigned __int128} and ++@code{unsigned _BitInt(@var{n})} if supported by the target. + + @deftypefun {unsigned int} stdc_leading_zeros_uc (unsigned char @var{x}) + @deftypefunx {unsigned int} stdc_leading_zeros_us (unsigned short @var{x}) +diff --git a/stdlib/Makefile b/stdlib/Makefile +index d587f054d1..9898cc5d8a 100644 +--- a/stdlib/Makefile ++++ b/stdlib/Makefile +@@ -308,6 +308,7 @@ tests := \ + tst-setcontext10 \ + tst-setcontext11 \ + tst-stdbit-Wconversion \ ++ tst-stdbit-builtins \ + tst-stdc_bit_ceil \ + tst-stdc_bit_floor \ + tst-stdc_bit_width \ +diff --git a/stdlib/stdbit.h b/stdlib/stdbit.h +index f334eb174d..2801590c63 100644 +--- a/stdlib/stdbit.h ++++ b/stdlib/stdbit.h +@@ -64,9 +64,13 @@ extern unsigned int stdc_leading_zeros_ul (unsigned long int __x) + __extension__ + extern unsigned int stdc_leading_zeros_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_leading_zeros(x) \ ++#if __glibc_has_builtin (__builtin_stdc_leading_zeros) ++# define stdc_leading_zeros(x) (__builtin_stdc_leading_zeros (x)) ++#else ++# define stdc_leading_zeros(x) \ + (stdc_leading_zeros_ull (x) \ + - (unsigned int) (8 * (sizeof (0ULL) - sizeof (x)))) ++#endif + + #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) + static __always_inline unsigned int +@@ -116,9 +120,13 @@ extern unsigned int stdc_leading_ones_ul (unsigned long int __x) + __extension__ + extern unsigned int stdc_leading_ones_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_leading_ones(x) \ ++#if __glibc_has_builtin (__builtin_stdc_leading_ones) ++# define stdc_leading_ones(x) (__builtin_stdc_leading_ones (x)) ++#else ++# define stdc_leading_ones(x) \ + (stdc_leading_ones_ull ((unsigned long long int) (x) \ + << 8 * (sizeof (0ULL) - sizeof (x)))) ++#endif + + #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) + static __always_inline unsigned int +@@ -168,11 +176,15 @@ extern unsigned int stdc_trailing_zeros_ul (unsigned long int __x) + __extension__ + extern unsigned int stdc_trailing_zeros_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_trailing_zeros(x) \ ++#if __glibc_has_builtin (__builtin_stdc_trailing_zeros) ++# define stdc_trailing_zeros(x) (__builtin_stdc_trailing_zeros (x)) ++#else ++# define stdc_trailing_zeros(x) \ + (sizeof (x) == 8 ? stdc_trailing_zeros_ull (x) \ + : sizeof (x) == 4 ? stdc_trailing_zeros_ui (x) \ + : sizeof (x) == 2 ? stdc_trailing_zeros_us (__pacify_uint16 (x)) \ + : stdc_trailing_zeros_uc (__pacify_uint8 (x))) ++#endif + + #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll) + static __always_inline unsigned int +@@ -222,7 +234,11 @@ extern unsigned int stdc_trailing_ones_ul (unsigned long int __x) + __extension__ + extern unsigned int stdc_trailing_ones_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_trailing_ones(x) (stdc_trailing_ones_ull (x)) ++#if __glibc_has_builtin (__builtin_stdc_trailing_ones) ++# define stdc_trailing_ones(x) (__builtin_stdc_trailing_ones (x)) ++#else ++# define stdc_trailing_ones(x) (stdc_trailing_ones_ull (x)) ++#endif + + #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll) + static __always_inline unsigned int +@@ -272,11 +288,15 @@ extern unsigned int stdc_first_leading_zero_ul (unsigned long int __x) + __extension__ + extern unsigned int stdc_first_leading_zero_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_first_leading_zero(x) \ ++#if __glibc_has_builtin (__builtin_stdc_first_leading_zero) ++# define stdc_first_leading_zero(x) (__builtin_stdc_first_leading_zero (x)) ++#else ++# define stdc_first_leading_zero(x) \ + (sizeof (x) == 8 ? stdc_first_leading_zero_ull (x) \ + : sizeof (x) == 4 ? stdc_first_leading_zero_ui (x) \ + : sizeof (x) == 2 ? stdc_first_leading_zero_us (__pacify_uint16 (x)) \ + : stdc_first_leading_zero_uc (__pacify_uint8 (x))) ++#endif + + #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) + static __always_inline unsigned int +@@ -326,11 +346,15 @@ extern unsigned int stdc_first_leading_one_ul (unsigned long int __x) + __extension__ + extern unsigned int stdc_first_leading_one_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_first_leading_one(x) \ ++#if __glibc_has_builtin (__builtin_stdc_first_leading_one) ++# define stdc_first_leading_one(x) (__builtin_stdc_first_leading_one (x)) ++#else ++# define stdc_first_leading_one(x) \ + (sizeof (x) == 8 ? stdc_first_leading_one_ull (x) \ + : sizeof (x) == 4 ? stdc_first_leading_one_ui (x) \ + : sizeof (x) == 2 ? stdc_first_leading_one_us (__pacify_uint16 (x)) \ + : stdc_first_leading_one_uc (__pacify_uint8 (x))) ++#endif + + #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) + static __always_inline unsigned int +@@ -380,11 +404,15 @@ extern unsigned int stdc_first_trailing_zero_ul (unsigned long int __x) + __extension__ + extern unsigned int stdc_first_trailing_zero_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_first_trailing_zero(x) \ ++#if __glibc_has_builtin (__builtin_stdc_first_trailing_zero) ++# define stdc_first_trailing_zero(x) (__builtin_stdc_first_trailing_zero (x)) ++#else ++# define stdc_first_trailing_zero(x) \ + (sizeof (x) == 8 ? stdc_first_trailing_zero_ull (x) \ + : sizeof (x) == 4 ? stdc_first_trailing_zero_ui (x) \ + : sizeof (x) == 2 ? stdc_first_trailing_zero_us (__pacify_uint16 (x)) \ + : stdc_first_trailing_zero_uc (__pacify_uint8 (x))) ++#endif + + #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll) + static __always_inline unsigned int +@@ -434,11 +462,15 @@ extern unsigned int stdc_first_trailing_one_ul (unsigned long int __x) + __extension__ + extern unsigned int stdc_first_trailing_one_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_first_trailing_one(x) \ ++#if __glibc_has_builtin (__builtin_stdc_first_trailing_one) ++# define stdc_first_trailing_one(x) (__builtin_stdc_first_trailing_one (x)) ++#else ++# define stdc_first_trailing_one(x) \ + (sizeof (x) == 8 ? stdc_first_trailing_one_ull (x) \ + : sizeof (x) == 4 ? stdc_first_trailing_one_ui (x) \ + : sizeof (x) == 2 ? stdc_first_trailing_one_us (__pacify_uint16 (x)) \ + : stdc_first_trailing_one_uc (__pacify_uint8 (x))) ++#endif + + #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_ctzll) + static __always_inline unsigned int +@@ -488,9 +520,13 @@ extern unsigned int stdc_count_zeros_ul (unsigned long int __x) + __extension__ + extern unsigned int stdc_count_zeros_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_count_zeros(x) \ ++#if __glibc_has_builtin (__builtin_stdc_count_zeros) ++# define stdc_count_zeros(x) (__builtin_stdc_count_zeros (x)) ++#else ++# define stdc_count_zeros(x) \ + (stdc_count_zeros_ull (x) \ + - (unsigned int) (8 * (sizeof (0ULL) - sizeof (x)))) ++#endif + + #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_popcountll) + static __always_inline unsigned int +@@ -540,7 +576,11 @@ extern unsigned int stdc_count_ones_ul (unsigned long int __x) + __extension__ + extern unsigned int stdc_count_ones_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_count_ones(x) (stdc_count_ones_ull (x)) ++#if __glibc_has_builtin (__builtin_stdc_count_ones) ++# define stdc_count_ones(x) (__builtin_stdc_count_ones (x)) ++#else ++# define stdc_count_ones(x) (stdc_count_ones_ull (x)) ++#endif + + #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_popcountll) + static __always_inline unsigned int +@@ -590,10 +630,14 @@ extern bool stdc_has_single_bit_ul (unsigned long int __x) + __extension__ + extern bool stdc_has_single_bit_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_has_single_bit(x) \ ++#if __glibc_has_builtin (__builtin_stdc_has_single_bit) ++# define stdc_has_single_bit(x) (__builtin_stdc_has_single_bit (x)) ++#else ++# define stdc_has_single_bit(x) \ + ((bool) (sizeof (x) <= sizeof (unsigned int) \ + ? stdc_has_single_bit_ui (x) \ + : stdc_has_single_bit_ull (x))) ++#endif + + static __always_inline bool + __hsb64_inline (uint64_t __x) +@@ -641,7 +685,11 @@ extern unsigned int stdc_bit_width_ul (unsigned long int __x) + __extension__ + extern unsigned int stdc_bit_width_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_bit_width(x) (stdc_bit_width_ull (x)) ++#if __glibc_has_builtin (__builtin_stdc_bit_width) ++# define stdc_bit_width(x) (__builtin_stdc_bit_width (x)) ++#else ++# define stdc_bit_width(x) (stdc_bit_width_ull (x)) ++#endif + + #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) + static __always_inline unsigned int +@@ -691,7 +739,11 @@ extern unsigned long int stdc_bit_floor_ul (unsigned long int __x) + __extension__ + extern unsigned long long int stdc_bit_floor_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_bit_floor(x) ((__typeof (x)) stdc_bit_floor_ull (x)) ++#if __glibc_has_builtin (__builtin_stdc_bit_floor) ++# define stdc_bit_floor(x) (__builtin_stdc_bit_floor (x)) ++#else ++# define stdc_bit_floor(x) ((__typeof (x)) stdc_bit_floor_ull (x)) ++#endif + + #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) + static __always_inline uint64_t +@@ -743,7 +795,11 @@ extern unsigned long int stdc_bit_ceil_ul (unsigned long int __x) + __extension__ + extern unsigned long long int stdc_bit_ceil_ull (unsigned long long int __x) + __THROW __attribute_const__; +-#define stdc_bit_ceil(x) ((__typeof (x)) stdc_bit_ceil_ull (x)) ++#if __glibc_has_builtin (__builtin_stdc_bit_ceil) ++# define stdc_bit_ceil(x) (__builtin_stdc_bit_ceil (x)) ++#else ++# define stdc_bit_ceil(x) ((__typeof (x)) stdc_bit_ceil_ull (x)) ++#endif + + #if __GNUC_PREREQ (3, 4) || __glibc_has_builtin (__builtin_clzll) + static __always_inline uint64_t +diff --git a/stdlib/tst-stdbit-builtins.c b/stdlib/tst-stdbit-builtins.c +new file mode 100644 +index 0000000000..536841ca8a +--- /dev/null ++++ b/stdlib/tst-stdbit-builtins.c +@@ -0,0 +1,778 @@ ++/* Test type-generic macros with compiler __builtin_stdc_* support. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++ ++#if __glibc_has_builtin (__builtin_stdc_leading_zeros) \ ++ && __glibc_has_builtin (__builtin_stdc_leading_ones) \ ++ && __glibc_has_builtin (__builtin_stdc_trailing_zeros) \ ++ && __glibc_has_builtin (__builtin_stdc_trailing_ones) \ ++ && __glibc_has_builtin (__builtin_stdc_first_leading_zero) \ ++ && __glibc_has_builtin (__builtin_stdc_first_leading_one) \ ++ && __glibc_has_builtin (__builtin_stdc_first_trailing_zero) \ ++ && __glibc_has_builtin (__builtin_stdc_first_trailing_one) \ ++ && __glibc_has_builtin (__builtin_stdc_count_zeros) \ ++ && __glibc_has_builtin (__builtin_stdc_count_ones) \ ++ && __glibc_has_builtin (__builtin_stdc_has_single_bit) \ ++ && __glibc_has_builtin (__builtin_stdc_bit_width) \ ++ && __glibc_has_builtin (__builtin_stdc_bit_floor) \ ++ && __glibc_has_builtin (__builtin_stdc_bit_ceil) ++ ++# if !defined (BITINT_MAXWIDTH) && defined (__BITINT_MAXWIDTH__) ++# define BITINT_MAXWIDTH __BITINT_MAXWIDTH__ ++# endif ++ ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long int ul; ++typedef unsigned long long int ull; ++ ++# define expr_has_type(e, t) _Generic (e, default : 0, t : 1) ++ ++static int ++do_test (void) ++{ ++ TEST_COMPARE (stdc_leading_zeros ((uc) 0), CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((uc) 0), ui), 1); ++ TEST_COMPARE (stdc_leading_zeros ((us) 0), sizeof (short) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((us) 0), ui), 1); ++ TEST_COMPARE (stdc_leading_zeros (0U), sizeof (int) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0U), ui), 1); ++ TEST_COMPARE (stdc_leading_zeros (0UL), sizeof (long int) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0UL), ui), 1); ++ TEST_COMPARE (stdc_leading_zeros (0ULL), sizeof (long long int) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0ULL), ui), 1); ++ TEST_COMPARE (stdc_leading_zeros ((uc) ~0U), 0); ++ TEST_COMPARE (stdc_leading_zeros ((us) ~0U), 0); ++ TEST_COMPARE (stdc_leading_zeros (~0U), 0); ++ TEST_COMPARE (stdc_leading_zeros (~0UL), 0); ++ TEST_COMPARE (stdc_leading_zeros (~0ULL), 0); ++ TEST_COMPARE (stdc_leading_zeros ((uc) 3), CHAR_BIT - 2); ++ TEST_COMPARE (stdc_leading_zeros ((us) 9), sizeof (short) * CHAR_BIT - 4); ++ TEST_COMPARE (stdc_leading_zeros (34U), sizeof (int) * CHAR_BIT - 6); ++ TEST_COMPARE (stdc_leading_zeros (130UL), sizeof (long int) * CHAR_BIT - 8); ++ TEST_COMPARE (stdc_leading_zeros (512ULL), ++ sizeof (long long int) * CHAR_BIT - 10); ++ TEST_COMPARE (stdc_leading_ones ((uc) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_leading_ones ((uc) 0), ui), 1); ++ TEST_COMPARE (stdc_leading_ones ((us) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_leading_ones ((us) 0), ui), 1); ++ TEST_COMPARE (stdc_leading_ones (0U), 0); ++ TEST_COMPARE (expr_has_type (stdc_leading_ones (0U), ui), 1); ++ TEST_COMPARE (stdc_leading_ones (0UL), 0); ++ TEST_COMPARE (expr_has_type (stdc_leading_ones (0UL), ui), 1); ++ TEST_COMPARE (stdc_leading_ones (0ULL), 0); ++ TEST_COMPARE (expr_has_type (stdc_leading_ones (0ULL), ui), 1); ++ TEST_COMPARE (stdc_leading_ones ((uc) ~0U), CHAR_BIT); ++ TEST_COMPARE (stdc_leading_ones ((us) ~0U), sizeof (short) * CHAR_BIT); ++ TEST_COMPARE (stdc_leading_ones (~0U), sizeof (int) * CHAR_BIT); ++ TEST_COMPARE (stdc_leading_ones (~0UL), sizeof (long int) * CHAR_BIT); ++ TEST_COMPARE (stdc_leading_ones (~0ULL), sizeof (long long int) * CHAR_BIT); ++ TEST_COMPARE (stdc_leading_ones ((uc) ~3), CHAR_BIT - 2); ++ TEST_COMPARE (stdc_leading_ones ((us) ~9), sizeof (short) * CHAR_BIT - 4); ++ TEST_COMPARE (stdc_leading_ones (~34U), sizeof (int) * CHAR_BIT - 6); ++ TEST_COMPARE (stdc_leading_ones (~130UL), sizeof (long int) * CHAR_BIT - 8); ++ TEST_COMPARE (stdc_leading_ones (~512ULL), ++ sizeof (long long int) * CHAR_BIT - 10); ++ TEST_COMPARE (stdc_trailing_zeros ((uc) 0), CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((uc) 0), ui), 1); ++ TEST_COMPARE (stdc_trailing_zeros ((us) 0), sizeof (short) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((us) 0), ui), 1); ++ TEST_COMPARE (stdc_trailing_zeros (0U), sizeof (int) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0U), ui), 1); ++ TEST_COMPARE (stdc_trailing_zeros (0UL), sizeof (long int) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0UL), ui), 1); ++ TEST_COMPARE (stdc_trailing_zeros (0ULL), sizeof (long long int) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0ULL), ui), 1); ++ TEST_COMPARE (stdc_trailing_zeros ((uc) ~0U), 0); ++ TEST_COMPARE (stdc_trailing_zeros ((us) ~0U), 0); ++ TEST_COMPARE (stdc_trailing_zeros (~0U), 0); ++ TEST_COMPARE (stdc_trailing_zeros (~0UL), 0); ++ TEST_COMPARE (stdc_trailing_zeros (~0ULL), 0); ++ TEST_COMPARE (stdc_trailing_zeros ((uc) 2), 1); ++ TEST_COMPARE (stdc_trailing_zeros ((us) 24), 3); ++ TEST_COMPARE (stdc_trailing_zeros (32U), 5); ++ TEST_COMPARE (stdc_trailing_zeros (128UL), 7); ++ TEST_COMPARE (stdc_trailing_zeros (512ULL), 9); ++ TEST_COMPARE (stdc_trailing_ones ((uc) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((uc) 0), ui), 1); ++ TEST_COMPARE (stdc_trailing_ones ((us) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((us) 0), ui), 1); ++ TEST_COMPARE (stdc_trailing_ones (0U), 0); ++ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0U), ui), 1); ++ TEST_COMPARE (stdc_trailing_ones (0UL), 0); ++ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0UL), ui), 1); ++ TEST_COMPARE (stdc_trailing_ones (0ULL), 0); ++ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0ULL), ui), 1); ++ TEST_COMPARE (stdc_trailing_ones ((uc) ~0U), CHAR_BIT); ++ TEST_COMPARE (stdc_trailing_ones ((us) ~0U), sizeof (short) * CHAR_BIT); ++ TEST_COMPARE (stdc_trailing_ones (~0U), sizeof (int) * CHAR_BIT); ++ TEST_COMPARE (stdc_trailing_ones (~0UL), sizeof (long int) * CHAR_BIT); ++ TEST_COMPARE (stdc_trailing_ones (~0ULL), sizeof (long long int) * CHAR_BIT); ++ TEST_COMPARE (stdc_trailing_ones ((uc) 5), 1); ++ TEST_COMPARE (stdc_trailing_ones ((us) 15), 4); ++ TEST_COMPARE (stdc_trailing_ones (127U), 7); ++ TEST_COMPARE (stdc_trailing_ones (511UL), 9); ++ TEST_COMPARE (stdc_trailing_ones (~0ULL >> 2), ++ sizeof (long long int) * CHAR_BIT - 2); ++ TEST_COMPARE (stdc_first_leading_zero ((uc) 0), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((uc) 0), ui), 1); ++ TEST_COMPARE (stdc_first_leading_zero ((us) 0), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((us) 0), ui), 1); ++ TEST_COMPARE (stdc_first_leading_zero (0U), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0U), ui), 1); ++ TEST_COMPARE (stdc_first_leading_zero (0UL), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0UL), ui), 1); ++ TEST_COMPARE (stdc_first_leading_zero (0ULL), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0ULL), ui), 1); ++ TEST_COMPARE (stdc_first_leading_zero ((uc) ~0U), 0); ++ TEST_COMPARE (stdc_first_leading_zero ((us) ~0U), 0); ++ TEST_COMPARE (stdc_first_leading_zero (~0U), 0); ++ TEST_COMPARE (stdc_first_leading_zero (~0UL), 0); ++ TEST_COMPARE (stdc_first_leading_zero (~0ULL), 0); ++ TEST_COMPARE (stdc_first_leading_zero ((uc) ~3U), CHAR_BIT - 1); ++ TEST_COMPARE (stdc_first_leading_zero ((us) ~15U), ++ sizeof (short) * CHAR_BIT - 3); ++ TEST_COMPARE (stdc_first_leading_zero (~63U), sizeof (int) * CHAR_BIT - 5); ++ TEST_COMPARE (stdc_first_leading_zero (~255UL), ++ sizeof (long int) * CHAR_BIT - 7); ++ TEST_COMPARE (stdc_first_leading_zero (~1023ULL), ++ sizeof (long long int) * CHAR_BIT - 9); ++ TEST_COMPARE (stdc_first_leading_one ((uc) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((uc) 0), ui), 1); ++ TEST_COMPARE (stdc_first_leading_one ((us) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((us) 0), ui), 1); ++ TEST_COMPARE (stdc_first_leading_one (0U), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0U), ui), 1); ++ TEST_COMPARE (stdc_first_leading_one (0UL), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0UL), ui), 1); ++ TEST_COMPARE (stdc_first_leading_one (0ULL), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0ULL), ui), 1); ++ TEST_COMPARE (stdc_first_leading_one ((uc) ~0U), 1); ++ TEST_COMPARE (stdc_first_leading_one ((us) ~0U), 1); ++ TEST_COMPARE (stdc_first_leading_one (~0U), 1); ++ TEST_COMPARE (stdc_first_leading_one (~0UL), 1); ++ TEST_COMPARE (stdc_first_leading_one (~0ULL), 1); ++ TEST_COMPARE (stdc_first_leading_one ((uc) 3), CHAR_BIT - 1); ++ TEST_COMPARE (stdc_first_leading_one ((us) 9), ++ sizeof (short) * CHAR_BIT - 3); ++ TEST_COMPARE (stdc_first_leading_one (34U), sizeof (int) * CHAR_BIT - 5); ++ TEST_COMPARE (stdc_first_leading_one (130UL), ++ sizeof (long int) * CHAR_BIT - 7); ++ TEST_COMPARE (stdc_first_leading_one (512ULL), ++ sizeof (long long int) * CHAR_BIT - 9); ++ TEST_COMPARE (stdc_first_trailing_zero ((uc) 0), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((uc) 0), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_zero ((us) 0), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((us) 0), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_zero (0U), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0U), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_zero (0UL), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0UL), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_zero (0ULL), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0ULL), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_zero ((uc) ~0U), 0); ++ TEST_COMPARE (stdc_first_trailing_zero ((us) ~0U), 0); ++ TEST_COMPARE (stdc_first_trailing_zero (~0U), 0); ++ TEST_COMPARE (stdc_first_trailing_zero (~0UL), 0); ++ TEST_COMPARE (stdc_first_trailing_zero (~0ULL), 0); ++ TEST_COMPARE (stdc_first_trailing_zero ((uc) 2), 1); ++ TEST_COMPARE (stdc_first_trailing_zero ((us) 15), 5); ++ TEST_COMPARE (stdc_first_trailing_zero (63U), 7); ++ TEST_COMPARE (stdc_first_trailing_zero (128UL), 1); ++ TEST_COMPARE (stdc_first_trailing_zero (511ULL), 10); ++ TEST_COMPARE (stdc_first_trailing_one ((uc) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((uc) 0), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_one ((us) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((us) 0), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_one (0U), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0U), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_one (0UL), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0UL), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_one (0ULL), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0ULL), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_one ((uc) ~0U), 1); ++ TEST_COMPARE (stdc_first_trailing_one ((us) ~0U), 1); ++ TEST_COMPARE (stdc_first_trailing_one (~0U), 1); ++ TEST_COMPARE (stdc_first_trailing_one (~0UL), 1); ++ TEST_COMPARE (stdc_first_trailing_one (~0ULL), 1); ++ TEST_COMPARE (stdc_first_trailing_one ((uc) 4), 3); ++ TEST_COMPARE (stdc_first_trailing_one ((us) 96), 6); ++ TEST_COMPARE (stdc_first_trailing_one (127U), 1); ++ TEST_COMPARE (stdc_first_trailing_one (511UL), 1); ++ TEST_COMPARE (stdc_first_trailing_one (~0ULL << 12), 13); ++ TEST_COMPARE (stdc_count_zeros ((uc) 0), CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_count_zeros ((uc) 0), ui), 1); ++ TEST_COMPARE (stdc_count_zeros ((us) 0), sizeof (short) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_count_zeros ((us) 0), ui), 1); ++ TEST_COMPARE (stdc_count_zeros (0U), sizeof (int) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_count_zeros (0U), ui), 1); ++ TEST_COMPARE (stdc_count_zeros (0UL), sizeof (long int) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_count_zeros (0UL), ui), 1); ++ TEST_COMPARE (stdc_count_zeros (0ULL), sizeof (long long int) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_count_zeros (0ULL), ui), 1); ++ TEST_COMPARE (stdc_count_zeros ((uc) ~0U), 0); ++ TEST_COMPARE (stdc_count_zeros ((us) ~0U), 0); ++ TEST_COMPARE (stdc_count_zeros (~0U), 0); ++ TEST_COMPARE (stdc_count_zeros (~0UL), 0); ++ TEST_COMPARE (stdc_count_zeros (~0ULL), 0); ++ TEST_COMPARE (stdc_count_zeros ((uc) 1U), CHAR_BIT - 1); ++ TEST_COMPARE (stdc_count_zeros ((us) 42), sizeof (short) * CHAR_BIT - 3); ++ TEST_COMPARE (stdc_count_zeros (291U), sizeof (int) * CHAR_BIT - 4); ++ TEST_COMPARE (stdc_count_zeros (~1315UL), 5); ++ TEST_COMPARE (stdc_count_zeros (3363ULL), ++ sizeof (long long int) * CHAR_BIT - 6); ++ TEST_COMPARE (stdc_count_ones ((uc) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_count_ones ((uc) 0), ui), 1); ++ TEST_COMPARE (stdc_count_ones ((us) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_count_ones ((us) 0), ui), 1); ++ TEST_COMPARE (stdc_count_ones (0U), 0); ++ TEST_COMPARE (expr_has_type (stdc_count_ones (0U), ui), 1); ++ TEST_COMPARE (stdc_count_ones (0UL), 0); ++ TEST_COMPARE (expr_has_type (stdc_count_ones (0UL), ui), 1); ++ TEST_COMPARE (stdc_count_ones (0ULL), 0); ++ TEST_COMPARE (expr_has_type (stdc_count_ones (0ULL), ui), 1); ++ TEST_COMPARE (stdc_count_ones ((uc) ~0U), CHAR_BIT); ++ TEST_COMPARE (stdc_count_ones ((us) ~0U), sizeof (short) * CHAR_BIT); ++ TEST_COMPARE (stdc_count_ones (~0U), sizeof (int) * CHAR_BIT); ++ TEST_COMPARE (stdc_count_ones (~0UL), sizeof (long int) * CHAR_BIT); ++ TEST_COMPARE (stdc_count_ones (~0ULL), sizeof (long long int) * CHAR_BIT); ++ TEST_COMPARE (stdc_count_ones ((uc) ~1U), CHAR_BIT - 1); ++ TEST_COMPARE (stdc_count_ones ((us) ~42), sizeof (short) * CHAR_BIT - 3); ++ TEST_COMPARE (stdc_count_ones (~291U), sizeof (int) * CHAR_BIT - 4); ++ TEST_COMPARE (stdc_count_ones (1315UL), 5); ++ TEST_COMPARE (stdc_count_ones (~3363ULL), ++ sizeof (long long int) * CHAR_BIT - 6); ++ TEST_COMPARE (stdc_has_single_bit ((uc) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((uc) 0), _Bool), 1); ++ TEST_COMPARE (stdc_has_single_bit ((us) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((us) 0), _Bool), 1); ++ TEST_COMPARE (stdc_has_single_bit (0U), 0); ++ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0U), _Bool), 1); ++ TEST_COMPARE (stdc_has_single_bit (0UL), 0); ++ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0UL), _Bool), 1); ++ TEST_COMPARE (stdc_has_single_bit (0ULL), 0); ++ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0ULL), _Bool), 1); ++ TEST_COMPARE (stdc_has_single_bit ((uc) 2), 1); ++ TEST_COMPARE (stdc_has_single_bit ((us) 8), 1); ++ TEST_COMPARE (stdc_has_single_bit (32U), 1); ++ TEST_COMPARE (stdc_has_single_bit (128UL), 1); ++ TEST_COMPARE (stdc_has_single_bit (512ULL), 1); ++ TEST_COMPARE (stdc_has_single_bit ((uc) 7), 0); ++ TEST_COMPARE (stdc_has_single_bit ((us) 96), 0); ++ TEST_COMPARE (stdc_has_single_bit (513U), 0); ++ TEST_COMPARE (stdc_has_single_bit (1022UL), 0); ++ TEST_COMPARE (stdc_has_single_bit (12ULL), 0); ++ TEST_COMPARE (stdc_bit_width ((uc) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_width ((uc) 0), ui), 1); ++ TEST_COMPARE (stdc_bit_width ((us) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_width ((us) 0), ui), 1); ++ TEST_COMPARE (stdc_bit_width (0U), 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_width (0U), ui), 1); ++ TEST_COMPARE (stdc_bit_width (0UL), 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_width (0UL), ui), 1); ++ TEST_COMPARE (stdc_bit_width (0ULL), 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_width (0ULL), ui), 1); ++ TEST_COMPARE (stdc_bit_width ((uc) ~0U), CHAR_BIT); ++ TEST_COMPARE (stdc_bit_width ((us) ~0U), sizeof (short) * CHAR_BIT); ++ TEST_COMPARE (stdc_bit_width (~0U), sizeof (int) * CHAR_BIT); ++ TEST_COMPARE (stdc_bit_width (~0UL), sizeof (long int) * CHAR_BIT); ++ TEST_COMPARE (stdc_bit_width (~0ULL), sizeof (long long int) * CHAR_BIT); ++ TEST_COMPARE (stdc_bit_width ((uc) ((uc) ~0U >> 1)), CHAR_BIT - 1); ++ TEST_COMPARE (stdc_bit_width ((uc) 6), 3); ++ TEST_COMPARE (stdc_bit_width ((us) 12U), 4); ++ TEST_COMPARE (stdc_bit_width ((us) ((us) ~0U >> 5)), ++ sizeof (short) * CHAR_BIT - 5); ++ TEST_COMPARE (stdc_bit_width (137U), 8); ++ TEST_COMPARE (stdc_bit_width (269U), 9); ++ TEST_COMPARE (stdc_bit_width (39UL), 6); ++ TEST_COMPARE (stdc_bit_width (~0UL >> 2), sizeof (long int) * CHAR_BIT - 2); ++ TEST_COMPARE (stdc_bit_width (1023ULL), 10); ++ TEST_COMPARE (stdc_bit_width (1024ULL), 11); ++ TEST_COMPARE (stdc_bit_floor ((uc) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_floor ((uc) 0), uc), 1); ++ TEST_COMPARE (stdc_bit_floor ((us) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_floor ((us) 0), us), 1); ++ TEST_COMPARE (stdc_bit_floor (0U), 0U); ++ TEST_COMPARE (expr_has_type (stdc_bit_floor (0U), ui), 1); ++ TEST_COMPARE (stdc_bit_floor (0UL), 0UL); ++ TEST_COMPARE (expr_has_type (stdc_bit_floor (0UL), ul), 1); ++ TEST_COMPARE (stdc_bit_floor (0ULL), 0ULL); ++ TEST_COMPARE (expr_has_type (stdc_bit_floor (0ULL), ull), 1); ++ TEST_COMPARE (stdc_bit_floor ((uc) ~0U), (1U << (CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_floor ((us) ~0U), ++ (1U << (sizeof (short) * CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_floor (~0U), (1U << (sizeof (int) * CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_floor (~0UL), ++ (1UL << (sizeof (long int) * CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_floor (~0ULL), ++ (1ULL << (sizeof (long long int) * CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_floor ((uc) 4), 4); ++ TEST_COMPARE (stdc_bit_floor ((uc) 7), 4); ++ TEST_COMPARE (stdc_bit_floor ((us) 8U), 8); ++ TEST_COMPARE (stdc_bit_floor ((us) 31U), 16); ++ TEST_COMPARE (stdc_bit_floor (137U), 128U); ++ TEST_COMPARE (stdc_bit_floor (269U), 256U); ++ TEST_COMPARE (stdc_bit_floor (511UL), 256UL); ++ TEST_COMPARE (stdc_bit_floor (512UL), 512UL); ++ TEST_COMPARE (stdc_bit_floor (513UL), 512ULL); ++ TEST_COMPARE (stdc_bit_floor (1024ULL), 1024ULL); ++ TEST_COMPARE (stdc_bit_ceil ((uc) 0), 1); ++ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((uc) 0), uc), 1); ++ TEST_COMPARE (stdc_bit_ceil ((us) 0), 1); ++ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((us) 0), us), 1); ++ TEST_COMPARE (stdc_bit_ceil (0U), 1U); ++ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0U), ui), 1); ++ TEST_COMPARE (stdc_bit_ceil (0UL), 1UL); ++ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0UL), ul), 1); ++ TEST_COMPARE (stdc_bit_ceil (0ULL), 1ULL); ++ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0ULL), ull), 1); ++ TEST_COMPARE (stdc_bit_ceil ((uc) ~0U), 0); ++ TEST_COMPARE (stdc_bit_ceil ((us) ~0U), 0); ++ TEST_COMPARE (stdc_bit_ceil (~0U), 0U); ++ TEST_COMPARE (stdc_bit_ceil (~0UL), 0UL); ++ TEST_COMPARE (stdc_bit_ceil (~0ULL), 0ULL); ++ TEST_COMPARE (stdc_bit_ceil ((uc) ((uc) ~0U >> 1)), (1U << (CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_ceil ((uc) ((uc) ~0U >> 1)), (1U << (CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_ceil ((us) ((us) ~0U >> 1)), ++ (1U << (sizeof (short) * CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_ceil ((us) ((us) ~0U >> 1)), ++ (1U << (sizeof (short) * CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_ceil (~0U >> 1), ++ (1U << (sizeof (int) * CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_ceil (1U << (sizeof (int) * CHAR_BIT - 1)), ++ (1U << (sizeof (int) * CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_ceil (~0UL >> 1), ++ (1UL << (sizeof (long int) * CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_ceil (~0UL >> 1), ++ (1UL << (sizeof (long int) * CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_ceil (1ULL ++ << (sizeof (long long int) * CHAR_BIT - 1)), ++ (1ULL << (sizeof (long long int) * CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_ceil (~0ULL >> 1), ++ (1ULL << (sizeof (long long int) * CHAR_BIT - 1))); ++ TEST_COMPARE (stdc_bit_ceil ((uc) 1), 1); ++ TEST_COMPARE (stdc_bit_ceil ((uc) 2), 2); ++ TEST_COMPARE (stdc_bit_ceil ((us) 3U), 4); ++ TEST_COMPARE (stdc_bit_ceil ((us) 4U), 4); ++ TEST_COMPARE (stdc_bit_ceil (5U), 8U); ++ TEST_COMPARE (stdc_bit_ceil (269U), 512U); ++ TEST_COMPARE (stdc_bit_ceil (511UL), 512UL); ++ TEST_COMPARE (stdc_bit_ceil (512UL), 512UL); ++ TEST_COMPARE (stdc_bit_ceil (513ULL), 1024ULL); ++ TEST_COMPARE (stdc_bit_ceil (1025ULL), 2048ULL); ++# ifdef __SIZEOF_INT128__ ++ TEST_COMPARE (stdc_leading_zeros ((unsigned __int128) 0), ++ sizeof (__int128) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((unsigned __int128) 0), ui), ++ 1); ++ TEST_COMPARE (stdc_leading_zeros (~(unsigned __int128) 0), 0); ++ TEST_COMPARE (stdc_leading_ones ((unsigned __int128) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_leading_ones ((unsigned __int128) 0), ui), ++ 1); ++ TEST_COMPARE (stdc_leading_ones (~(unsigned __int128) 0), ++ sizeof (__int128) * CHAR_BIT); ++ TEST_COMPARE (stdc_trailing_zeros ((unsigned __int128) 0), ++ sizeof (__int128) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((unsigned __int128) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_trailing_zeros (~(unsigned __int128) 0), 0); ++ TEST_COMPARE (stdc_trailing_ones ((unsigned __int128) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((unsigned __int128) 0), ui), ++ 1); ++ TEST_COMPARE (stdc_trailing_ones (~(unsigned __int128) 0), ++ sizeof (__int128) * CHAR_BIT); ++ TEST_COMPARE (stdc_first_leading_zero ((unsigned __int128) 0), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((unsigned __int128) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_first_leading_zero (~(unsigned __int128) 0), 0); ++ TEST_COMPARE (stdc_first_leading_one ((unsigned __int128) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((unsigned __int128) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_first_leading_one (~(unsigned __int128) 0), 1); ++ TEST_COMPARE (stdc_first_trailing_zero ((unsigned __int128) 0), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((unsigned __int128) ++ 0), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_zero (~(unsigned __int128) 0), 0); ++ TEST_COMPARE (stdc_first_trailing_one ((unsigned __int128) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((unsigned __int128) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_first_trailing_one (~(unsigned __int128) 0), 1); ++ TEST_COMPARE (stdc_count_zeros ((unsigned __int128) 0), ++ sizeof (__int128) * CHAR_BIT); ++ TEST_COMPARE (expr_has_type (stdc_count_zeros ((unsigned __int128) 0), ui), ++ 1); ++ TEST_COMPARE (stdc_count_zeros (~(unsigned __int128) 0), 0); ++ TEST_COMPARE (stdc_count_ones ((unsigned __int128) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_count_ones ((unsigned __int128) 0), ui), ++ 1); ++ TEST_COMPARE (stdc_count_ones (~(unsigned __int128) 0), ++ sizeof (__int128) * CHAR_BIT); ++ TEST_COMPARE (stdc_has_single_bit ((unsigned __int128) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((unsigned __int128) 0), ++ _Bool), 1); ++ TEST_COMPARE (stdc_has_single_bit (~(unsigned __int128) 0), 0); ++ TEST_COMPARE (stdc_bit_width ((unsigned __int128) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_width ((unsigned __int128) 0), ui), 1); ++ TEST_COMPARE (stdc_bit_width (~(unsigned __int128) 0), ++ sizeof (__int128) * CHAR_BIT); ++ TEST_COMPARE (stdc_bit_floor ((unsigned __int128) 0) != 0, 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_floor ((unsigned __int128) 0), ++ unsigned __int128), 1); ++ TEST_COMPARE (stdc_bit_floor (~(unsigned __int128) 0) ++ != ((unsigned __int128) 1) << (sizeof (__int128) ++ * CHAR_BIT - 1), 0); ++ TEST_COMPARE (stdc_bit_ceil ((unsigned __int128) 0) != 1, 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((unsigned __int128) 0), ++ unsigned __int128), 1); ++ TEST_COMPARE (stdc_bit_ceil ((unsigned __int128) 1) != 1, 0); ++ TEST_COMPARE (stdc_bit_ceil ((~(unsigned __int128) 0) >> 1) ++ != ((unsigned __int128) 1) << (sizeof (__int128) ++ * CHAR_BIT - 1), 0); ++ TEST_COMPARE (stdc_bit_ceil (~(unsigned __int128) 0) != 0, 0); ++# endif ++ uc a = 0; ++ TEST_COMPARE (stdc_bit_width (a++), 0); ++ TEST_COMPARE (a, 1); ++ ull b = 0; ++ TEST_COMPARE (stdc_bit_width (b++), 0); ++ TEST_COMPARE (b, 1); ++ TEST_COMPARE (stdc_bit_floor (a++), 1); ++ TEST_COMPARE (a, 2); ++ TEST_COMPARE (stdc_bit_floor (b++), 1); ++ TEST_COMPARE (b, 2); ++ TEST_COMPARE (stdc_bit_ceil (a++), 2); ++ TEST_COMPARE (a, 3); ++ TEST_COMPARE (stdc_bit_ceil (b++), 2); ++ TEST_COMPARE (b, 3); ++ TEST_COMPARE (stdc_leading_zeros (a++), CHAR_BIT - 2); ++ TEST_COMPARE (a, 4); ++ TEST_COMPARE (stdc_leading_zeros (b++), ++ sizeof (long long int) * CHAR_BIT - 2); ++ TEST_COMPARE (b, 4); ++ TEST_COMPARE (stdc_leading_ones (a++), 0); ++ TEST_COMPARE (a, 5); ++ TEST_COMPARE (stdc_leading_ones (b++), 0); ++ TEST_COMPARE (b, 5); ++ TEST_COMPARE (stdc_trailing_zeros (a++), 0); ++ TEST_COMPARE (a, 6); ++ TEST_COMPARE (stdc_trailing_zeros (b++), 0); ++ TEST_COMPARE (b, 6); ++ TEST_COMPARE (stdc_trailing_ones (a++), 0); ++ TEST_COMPARE (a, 7); ++ TEST_COMPARE (stdc_trailing_ones (b++), 0); ++ TEST_COMPARE (b, 7); ++ TEST_COMPARE (stdc_first_leading_zero (a++), 1); ++ TEST_COMPARE (a, 8); ++ TEST_COMPARE (stdc_first_leading_zero (b++), 1); ++ TEST_COMPARE (b, 8); ++ TEST_COMPARE (stdc_first_leading_one (a++), CHAR_BIT - 3); ++ TEST_COMPARE (a, 9); ++ TEST_COMPARE (stdc_first_leading_one (b++), ++ sizeof (long long int) * CHAR_BIT - 3); ++ TEST_COMPARE (b, 9); ++ TEST_COMPARE (stdc_first_trailing_zero (a++), 2); ++ TEST_COMPARE (a, 10); ++ TEST_COMPARE (stdc_first_trailing_zero (b++), 2); ++ TEST_COMPARE (b, 10); ++ TEST_COMPARE (stdc_first_trailing_one (a++), 2); ++ TEST_COMPARE (a, 11); ++ TEST_COMPARE (stdc_first_trailing_one (b++), 2); ++ TEST_COMPARE (b, 11); ++ TEST_COMPARE (stdc_count_zeros (a++), CHAR_BIT - 3); ++ TEST_COMPARE (a, 12); ++ TEST_COMPARE (stdc_count_zeros (b++), ++ sizeof (long long int) * CHAR_BIT - 3); ++ TEST_COMPARE (b, 12); ++ TEST_COMPARE (stdc_count_ones (a++), 2); ++ TEST_COMPARE (a, 13); ++ TEST_COMPARE (stdc_count_ones (b++), 2); ++ TEST_COMPARE (b, 13); ++ TEST_COMPARE (stdc_has_single_bit (a++), 0); ++ TEST_COMPARE (a, 14); ++ TEST_COMPARE (stdc_has_single_bit (b++), 0); ++ TEST_COMPARE (b, 14); ++# ifdef BITINT_MAXWIDTH ++# if BITINT_MAXWIDTH >= 64 ++ TEST_COMPARE (stdc_leading_zeros (0uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_leading_zeros (0uwb), ui), 1); ++ TEST_COMPARE (stdc_leading_zeros (1uwb), 0); ++ TEST_COMPARE (expr_has_type (stdc_leading_zeros (1uwb), ui), 1); ++ TEST_COMPARE (stdc_leading_ones (0uwb), 0); ++ TEST_COMPARE (expr_has_type (stdc_leading_ones (0uwb), ui), 1); ++ TEST_COMPARE (stdc_leading_ones (1uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_leading_ones (1uwb), ui), 1); ++ TEST_COMPARE (stdc_trailing_zeros (0uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (0uwb), ui), 1); ++ TEST_COMPARE (stdc_trailing_zeros (1uwb), 0); ++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros (1uwb), ui), 1); ++ TEST_COMPARE (stdc_trailing_ones (0uwb), 0); ++ TEST_COMPARE (expr_has_type (stdc_trailing_ones (0uwb), ui), 1); ++ TEST_COMPARE (stdc_trailing_ones (1uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_trailing_ones (1uwb), ui), 1); ++ TEST_COMPARE (stdc_first_leading_zero (0uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (0uwb), ui), 1); ++ TEST_COMPARE (stdc_first_leading_zero (1uwb), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero (1uwb), ui), 1); ++ TEST_COMPARE (stdc_first_leading_one (0uwb), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_one (0uwb), ui), 1); ++ TEST_COMPARE (stdc_first_leading_one (1uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_one (1uwb), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_zero (0uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (0uwb), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_zero (1uwb), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero (1uwb), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_one (0uwb), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (0uwb), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_one (1uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one (1uwb), ui), 1); ++ TEST_COMPARE (stdc_count_zeros (0uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_count_zeros (0uwb), ui), 1); ++ TEST_COMPARE (stdc_count_zeros (1uwb), 0); ++ TEST_COMPARE (expr_has_type (stdc_count_zeros (1uwb), ui), 1); ++ TEST_COMPARE (stdc_count_ones (0uwb), 0); ++ TEST_COMPARE (expr_has_type (stdc_count_ones (0uwb), ui), 1); ++ TEST_COMPARE (stdc_count_ones (1uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_count_ones (1uwb), ui), 1); ++ TEST_COMPARE (stdc_has_single_bit (0uwb), 0); ++ TEST_COMPARE (expr_has_type (stdc_has_single_bit (0uwb), _Bool), 1); ++ TEST_COMPARE (stdc_has_single_bit (1uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_has_single_bit (1uwb), _Bool), 1); ++ TEST_COMPARE (stdc_bit_width (0uwb), 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_width (0uwb), ui), 1); ++ TEST_COMPARE (stdc_bit_width (1uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_bit_width (1uwb), ui), 1); ++ TEST_COMPARE (stdc_bit_floor (0uwb), 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_floor (0uwb), unsigned _BitInt(1)), 1); ++ TEST_COMPARE (stdc_bit_floor (1uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_bit_floor (1uwb), unsigned _BitInt(1)), 1); ++ TEST_COMPARE (stdc_bit_ceil (0uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_bit_ceil (0uwb), unsigned _BitInt(1)), 1); ++ TEST_COMPARE (stdc_bit_ceil (1uwb), 1); ++ TEST_COMPARE (expr_has_type (stdc_bit_ceil (1uwb), unsigned _BitInt(1)), 1); ++ unsigned _BitInt(1) c = 0; ++ TEST_COMPARE (stdc_bit_floor (c++), 0); ++ TEST_COMPARE (c, 1); ++ TEST_COMPARE (stdc_bit_floor (c++), 1); ++ TEST_COMPARE (c, 0); ++ TEST_COMPARE (stdc_bit_ceil (c++), 1); ++ TEST_COMPARE (c, 1); ++ TEST_COMPARE (stdc_bit_ceil (c++), 1); ++ TEST_COMPARE (c, 0); ++# endif ++# if BITINT_MAXWIDTH >= 512 ++ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(512)) 0), 512); ++ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((unsigned _BitInt(512)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(373)) 0), 373); ++ TEST_COMPARE (expr_has_type (stdc_leading_zeros ((unsigned _BitInt(373)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_leading_zeros (~(unsigned _BitInt(512)) 0), 0); ++ TEST_COMPARE (stdc_leading_zeros (~(unsigned _BitInt(373)) 0), 0); ++ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(512)) 275), 512 - 9); ++ TEST_COMPARE (stdc_leading_zeros ((unsigned _BitInt(373)) 512), 373 - 10); ++ TEST_COMPARE (stdc_leading_ones ((unsigned _BitInt(512)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_leading_ones ((unsigned _BitInt(512)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_leading_ones ((unsigned _BitInt(373)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_leading_ones ((unsigned _BitInt(373)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(512)) 0), 512); ++ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(373)) 0), 373); ++ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(512)) 275), 512 - 9); ++ TEST_COMPARE (stdc_leading_ones (~(unsigned _BitInt(373)) 512), 373 - 10); ++ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(512)) 0), 512); ++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((unsigned _BitInt(512)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(373)) 0), 373); ++ TEST_COMPARE (expr_has_type (stdc_trailing_zeros ((unsigned _BitInt(373)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_trailing_zeros (~(unsigned _BitInt(512)) 0), 0); ++ TEST_COMPARE (stdc_trailing_zeros (~(unsigned _BitInt(373)) 0), 0); ++ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(512)) 256), 8); ++ TEST_COMPARE (stdc_trailing_zeros ((unsigned _BitInt(373)) 512), 9); ++ TEST_COMPARE (stdc_trailing_ones ((unsigned _BitInt(512)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((unsigned _BitInt(512)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_trailing_ones ((unsigned _BitInt(373)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_trailing_ones ((unsigned _BitInt(373)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_trailing_ones (~(unsigned _BitInt(512)) 0), 512); ++ TEST_COMPARE (stdc_trailing_ones (~(unsigned _BitInt(373)) 0), 373); ++ TEST_COMPARE (stdc_trailing_ones ((unsigned _BitInt(512)) 255), 8); ++ TEST_COMPARE (stdc_trailing_ones ((~(unsigned _BitInt(373)) 0) >> 2), ++ 373 - 2); ++ TEST_COMPARE (stdc_first_leading_zero ((unsigned _BitInt(512)) 0), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((unsigned _BitInt(512)) ++ 0), ui), 1); ++ TEST_COMPARE (stdc_first_leading_zero ((unsigned _BitInt(373)) 0), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_zero ((unsigned _BitInt(373)) ++ 0), ui), 1); ++ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(512)) 0), 0); ++ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(373)) 0), 0); ++ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(512)) 511), ++ 512 - 8); ++ TEST_COMPARE (stdc_first_leading_zero (~(unsigned _BitInt(373)) 1023), ++ 373 - 9); ++ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(512)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((unsigned _BitInt(512)) ++ 0), ui), 1); ++ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(373)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_leading_one ((unsigned _BitInt(373)) ++ 0), ui), 1); ++ TEST_COMPARE (stdc_first_leading_one (~(unsigned _BitInt(512)) 0), 1); ++ TEST_COMPARE (stdc_first_leading_one (~(unsigned _BitInt(373)) 0), 1); ++ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(512)) 275), 512 - 8); ++ TEST_COMPARE (stdc_first_leading_one ((unsigned _BitInt(373)) 512), 373 - 9); ++ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(512)) 0), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((unsigned ++ _BitInt(512)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(373)) 0), 1); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_zero ((unsigned ++ _BitInt(373)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_first_trailing_zero (~(unsigned _BitInt(512)) 0), 0); ++ TEST_COMPARE (stdc_first_trailing_zero (~(unsigned _BitInt(373)) 0), 0); ++ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(512)) 255), 9); ++ TEST_COMPARE (stdc_first_trailing_zero ((unsigned _BitInt(373)) 511), 10); ++ TEST_COMPARE (stdc_first_trailing_one ((unsigned _BitInt(512)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((unsigned _BitInt(512)) ++ 0), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_one ((unsigned _BitInt(373)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_first_trailing_one ((unsigned _BitInt(373)) ++ 0), ui), 1); ++ TEST_COMPARE (stdc_first_trailing_one (~(unsigned _BitInt(512)) 0), 1); ++ TEST_COMPARE (stdc_first_trailing_one (~(unsigned _BitInt(373)) 0), 1); ++ TEST_COMPARE (stdc_first_trailing_one (((unsigned _BitInt(512)) 255) << 175), ++ 176); ++ TEST_COMPARE (stdc_first_trailing_one ((~(unsigned _BitInt(373)) 0) << 311), ++ 312); ++ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(512)) 0), 512); ++ TEST_COMPARE (expr_has_type (stdc_count_zeros ((unsigned _BitInt(512)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(373)) 0), 373); ++ TEST_COMPARE (expr_has_type (stdc_count_zeros ((unsigned _BitInt(373)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_count_zeros (~(unsigned _BitInt(512)) 0), 0); ++ TEST_COMPARE (stdc_count_zeros (~(unsigned _BitInt(373)) 0), 0); ++ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(512)) 1315), 512 - 5); ++ TEST_COMPARE (stdc_count_zeros ((unsigned _BitInt(373)) 3363), 373 - 6); ++ TEST_COMPARE (stdc_count_ones ((unsigned _BitInt(512)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_count_ones ((unsigned _BitInt(512)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_count_ones ((unsigned _BitInt(373)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_count_ones ((unsigned _BitInt(373)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(512)) 0), 512); ++ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(373)) 0), 373); ++ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(512)) 1315), 512 - 5); ++ TEST_COMPARE (stdc_count_ones (~(unsigned _BitInt(373)) 3363), 373 - 6); ++ TEST_COMPARE (stdc_has_single_bit ((unsigned _BitInt(512)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((unsigned _BitInt(512)) 0), ++ _Bool), 1); ++ TEST_COMPARE (stdc_has_single_bit ((unsigned _BitInt(373)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_has_single_bit ((unsigned _BitInt(373)) 0), ++ _Bool), 1); ++ TEST_COMPARE (stdc_has_single_bit (~(unsigned _BitInt(512)) 0), 0); ++ TEST_COMPARE (stdc_has_single_bit (~(unsigned _BitInt(373)) 0), 0); ++ TEST_COMPARE (stdc_has_single_bit (((unsigned _BitInt(512)) 1022) << 279), ++ 0); ++ TEST_COMPARE (stdc_has_single_bit (((unsigned _BitInt(373)) 12) << 305), 0); ++ TEST_COMPARE (stdc_bit_width ((unsigned _BitInt(512)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_width ((unsigned _BitInt(512)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_bit_width ((unsigned _BitInt(373)) 0), 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_width ((unsigned _BitInt(373)) 0), ++ ui), 1); ++ TEST_COMPARE (stdc_bit_width (~(unsigned _BitInt(512)) 0), 512); ++ TEST_COMPARE (stdc_bit_width (~(unsigned _BitInt(373)) 0), 373); ++ TEST_COMPARE (stdc_bit_width (((unsigned _BitInt(512)) 1023) << 405), ++ 405 + 10); ++ TEST_COMPARE (stdc_bit_width (((unsigned _BitInt(373)) 1024) << 242), ++ 242 + 11); ++ TEST_COMPARE (stdc_bit_floor ((unsigned _BitInt(512)) 0) != 0, 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_floor ((unsigned _BitInt(512)) 0), ++ unsigned _BitInt(512)), 1); ++ TEST_COMPARE (stdc_bit_floor ((unsigned _BitInt(373)) 0) != 0, 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_floor ((unsigned _BitInt(373)) 0), ++ unsigned _BitInt(373)), 1); ++ TEST_COMPARE (stdc_bit_floor (~(unsigned _BitInt(512)) 0) ++ != ((unsigned _BitInt(512)) 1) << (512 - 1), 0); ++ TEST_COMPARE (stdc_bit_floor (~(unsigned _BitInt(373)) 0) ++ != ((unsigned _BitInt(373)) 1) << (373 - 1), 0); ++ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(512)) 511) << 405) ++ != (((unsigned _BitInt(512)) 256) << 405), 0); ++ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(373)) 512) << 242) ++ != (((unsigned _BitInt(512)) 512) << 242), 0); ++ TEST_COMPARE (stdc_bit_ceil ((unsigned _BitInt(512)) 0) != 1, 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((unsigned _BitInt(512)) 0), ++ unsigned _BitInt(512)), 1); ++ TEST_COMPARE (stdc_bit_ceil ((unsigned _BitInt(373)) 0) != 1, 0); ++ TEST_COMPARE (expr_has_type (stdc_bit_ceil ((unsigned _BitInt(373)) 0), ++ unsigned _BitInt(373)), 1); ++ TEST_COMPARE (stdc_bit_ceil (~(unsigned _BitInt(512)) 0) != 0, 0); ++ TEST_COMPARE (stdc_bit_ceil (~(unsigned _BitInt(373)) 0) != 0, 0); ++ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(512)) 1) << (512 - 1)) ++ != ((unsigned _BitInt(512)) 1) << (512 - 1), 0); ++ TEST_COMPARE (stdc_bit_ceil ((~(unsigned _BitInt(373)) 0) >> 1) ++ != ((unsigned _BitInt(373)) 1) << (373 - 1), 0); ++ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(512)) 512) << 405) ++ != (((unsigned _BitInt(512)) 512) << 405), 0); ++ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(373)) 513) << 242) ++ != (((unsigned _BitInt(512)) 1024) << 242), 0); ++ TEST_COMPARE (stdc_bit_floor ((unsigned _BitInt(BITINT_MAXWIDTH)) 0) != 0, ++ 0); ++ TEST_COMPARE (stdc_bit_floor (~(unsigned _BitInt(BITINT_MAXWIDTH)) 0) ++ != ((unsigned _BitInt(BITINT_MAXWIDTH)) 1) << (BITINT_MAXWIDTH ++ - 1), 0); ++ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(BITINT_MAXWIDTH)) 511) ++ << 405) ++ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 256) << 405), 0); ++ TEST_COMPARE (stdc_bit_floor (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) ++ << 405) ++ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) << 405), 0); ++ TEST_COMPARE (stdc_bit_ceil ((unsigned _BitInt(BITINT_MAXWIDTH)) 0) != 1, 0); ++ TEST_COMPARE (stdc_bit_ceil (~(unsigned _BitInt(BITINT_MAXWIDTH)) 0) != 0, ++ 0); ++ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(BITINT_MAXWIDTH)) 1) ++ << (BITINT_MAXWIDTH - 1)) ++ != ((unsigned _BitInt(BITINT_MAXWIDTH)) 1) << (BITINT_MAXWIDTH ++ - 1), 0); ++ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) ++ << 405) ++ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 512) << 405), 0); ++ TEST_COMPARE (stdc_bit_ceil (((unsigned _BitInt(BITINT_MAXWIDTH)) 513) ++ << 405) ++ != (((unsigned _BitInt(BITINT_MAXWIDTH)) 1024) << 405), 0); ++# endif ++# endif ++ return 0; ++} ++#else ++static int ++do_test (void) ++{ ++ return 0; ++} ++#endif ++ ++#include + +commit 71fcdba577884627c3ee4e43beb915da752efb1f +Author: Florian Weimer +Date: Fri Mar 15 19:08:24 2024 +0100 + + linux: Use rseq area unconditionally in sched_getcpu (bug 31479) + + Originally, nptl/descr.h included , but we removed that + in commit 2c6b4b272e6b4d07303af25709051c3e96288f2d ("nptl: + Unconditionally use a 32-byte rseq area"). After that, it was + not ensured that the RSEQ_SIG macro was defined during sched_getcpu.c + compilation that provided a definition. This commit always checks + the rseq area for CPU number information before using the other + approaches. + + This adds an unnecessary (but well-predictable) branch on + architectures which do not define RSEQ_SIG, but its cost is small + compared to the system call. Most architectures that have vDSO + acceleration for getcpu also have rseq support. + + Fixes: 2c6b4b272e6b4d07303af25709051c3e96288f2d + Fixes: 1d350aa06091211863e41169729cee1bca39f72f + Reviewed-by: Arjun Shankar + (cherry picked from commit 7a76f218677d149d8b7875b336722108239f7ee9) + +diff --git a/sysdeps/unix/sysv/linux/sched_getcpu.c b/sysdeps/unix/sysv/linux/sched_getcpu.c +index dfb884568d..72a3360550 100644 +--- a/sysdeps/unix/sysv/linux/sched_getcpu.c ++++ b/sysdeps/unix/sysv/linux/sched_getcpu.c +@@ -33,17 +33,9 @@ vsyscall_sched_getcpu (void) + return r == -1 ? r : cpu; + } + +-#ifdef RSEQ_SIG + int + sched_getcpu (void) + { + int cpu_id = THREAD_GETMEM_VOLATILE (THREAD_SELF, rseq_area.cpu_id); + return __glibc_likely (cpu_id >= 0) ? cpu_id : vsyscall_sched_getcpu (); + } +-#else /* RSEQ_SIG */ +-int +-sched_getcpu (void) +-{ +- return vsyscall_sched_getcpu (); +-} +-#endif /* RSEQ_SIG */ + +commit ee7f4c54e19738c2c27d3846e1e9b3595c89221f +Author: Manjunath Matti +Date: Tue Mar 19 15:29:48 2024 -0500 + + powerpc: Add HWCAP3/HWCAP4 data to TCB for Power Architecture. + + This patch adds a new feature for powerpc. In order to get faster + access to the HWCAP3/HWCAP4 masks, similar to HWCAP/HWCAP2 (i.e. for + implementing __builtin_cpu_supports() in GCC) without the overhead of + reading them from the auxiliary vector, we now reserve space for them + in the TCB. + + Suggested-by: Peter Bergner + Reviewed-by: Peter Bergner + (cherry picked from commit 3ab9b88e2ac91062b6d493fe32bd101a55006c6a) + +diff --git a/elf/dl-diagnostics.c b/elf/dl-diagnostics.c +index 7345ebc4e5..aaf67b87e8 100644 +--- a/elf/dl-diagnostics.c ++++ b/elf/dl-diagnostics.c +@@ -235,6 +235,8 @@ _dl_print_diagnostics (char **environ) + _dl_diagnostics_print_labeled_value ("dl_hwcap", GLRO (dl_hwcap)); + _dl_diagnostics_print_labeled_value ("dl_hwcap_important", HWCAP_IMPORTANT); + _dl_diagnostics_print_labeled_value ("dl_hwcap2", GLRO (dl_hwcap2)); ++ _dl_diagnostics_print_labeled_value ("dl_hwcap3", GLRO (dl_hwcap3)); ++ _dl_diagnostics_print_labeled_value ("dl_hwcap4", GLRO (dl_hwcap4)); + _dl_diagnostics_print_labeled_string + ("dl_hwcaps_subdirs", _dl_hwcaps_subdirs); + _dl_diagnostics_print_labeled_value +diff --git a/elf/dl-support.c b/elf/dl-support.c +index 2f502c8b0d..451932dd03 100644 +--- a/elf/dl-support.c ++++ b/elf/dl-support.c +@@ -158,6 +158,8 @@ const ElfW(Phdr) *_dl_phdr; + size_t _dl_phnum; + uint64_t _dl_hwcap; + uint64_t _dl_hwcap2; ++uint64_t _dl_hwcap3; ++uint64_t _dl_hwcap4; + + enum dso_sort_algorithm _dl_dso_sort_algo; + +diff --git a/elf/elf.h b/elf/elf.h +index 455731663c..1c394c64cd 100644 +--- a/elf/elf.h ++++ b/elf/elf.h +@@ -1234,6 +1234,10 @@ typedef struct + #define AT_RSEQ_FEATURE_SIZE 27 /* rseq supported feature size. */ + #define AT_RSEQ_ALIGN 28 /* rseq allocation alignment. */ + ++/* More machine-dependent hints about processor capabilities. */ ++#define AT_HWCAP3 29 /* extension of AT_HWCAP. */ ++#define AT_HWCAP4 30 /* extension of AT_HWCAP. */ ++ + #define AT_EXECFN 31 /* Filename of executable. */ + + /* Pointer to the global system page used for system calls and other +diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h +index 117c901ccc..50f58a60e3 100644 +--- a/sysdeps/generic/ldsodefs.h ++++ b/sysdeps/generic/ldsodefs.h +@@ -646,6 +646,8 @@ struct rtld_global_ro + /* Mask for more hardware capabilities that are available on some + platforms. */ + EXTERN uint64_t _dl_hwcap2; ++ EXTERN uint64_t _dl_hwcap3; ++ EXTERN uint64_t _dl_hwcap4; + + EXTERN enum dso_sort_algorithm _dl_dso_sort_algo; + +diff --git a/sysdeps/powerpc/dl-procinfo.c b/sysdeps/powerpc/dl-procinfo.c +index a76bb6e5b0..8cf00aa7e3 100644 +--- a/sysdeps/powerpc/dl-procinfo.c ++++ b/sysdeps/powerpc/dl-procinfo.c +@@ -38,6 +38,10 @@ + needed. + */ + ++/* The total number of available bits (including those prior to ++ _DL_HWCAP_FIRST). Some of these bits might not be used. */ ++#define _DL_HWCAP_COUNT 128 ++ + #ifndef PROCINFO_CLASS + # define PROCINFO_CLASS + #endif +@@ -61,7 +65,7 @@ PROCINFO_CLASS struct cpu_features _dl_powerpc_cpu_features + #if !defined PROCINFO_DECL && defined SHARED + ._dl_powerpc_cap_flags + #else +-PROCINFO_CLASS const char _dl_powerpc_cap_flags[64][15] ++PROCINFO_CLASS const char _dl_powerpc_cap_flags[_DL_HWCAP_COUNT][15] + #endif + #ifndef PROCINFO_DECL + = { +diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h +index 68f4241095..f8cb343877 100644 +--- a/sysdeps/powerpc/dl-procinfo.h ++++ b/sysdeps/powerpc/dl-procinfo.h +@@ -22,16 +22,17 @@ + #include + #include /* This defines the PPC_FEATURE[2]_* macros. */ + +-/* The total number of available bits (including those prior to +- _DL_HWCAP_FIRST). Some of these bits might not be used. */ +-#define _DL_HWCAP_COUNT 64 ++/* Feature masks are all 32-bits in size. */ ++#define _DL_HWCAP_SIZE 32 + +-/* Features started at bit 31 and decremented as new features were added. */ +-#define _DL_HWCAP_LAST 31 ++/* AT_HWCAP2 feature strings follow the AT_HWCAP feature strings. */ ++#define _DL_HWCAP2_OFFSET _DL_HWCAP_SIZE + +-/* AT_HWCAP2 features started at bit 31 and decremented as new features were +- added. HWCAP2 feature bits start at bit 0. */ +-#define _DL_HWCAP2_LAST 31 ++/* AT_HWCAP3 feature strings follow the AT_HWCAP2 feature strings. */ ++#define _DL_HWCAP3_OFFSET (_DL_HWCAP2_OFFSET + _DL_HWCAP_SIZE) ++ ++/* AT_HWCAP4 feature strings follow the AT_HWCAP3 feature strings. */ ++#define _DL_HWCAP4_OFFSET (_DL_HWCAP3_OFFSET + _DL_HWCAP_SIZE) + + /* These bits influence library search. */ + #define HWCAP_IMPORTANT (PPC_FEATURE_HAS_ALTIVEC \ +@@ -187,21 +188,42 @@ _dl_procinfo (unsigned int type, unsigned long int word) + case AT_HWCAP: + _dl_printf ("AT_HWCAP: "); + +- for (int i = 0; i <= _DL_HWCAP_LAST; ++i) ++ for (int i = 0; i < _DL_HWCAP_SIZE; ++i) + if (word & (1 << i)) + _dl_printf (" %s", _dl_hwcap_string (i)); + break; + case AT_HWCAP2: + { +- unsigned int offset = _DL_HWCAP_LAST + 1; + + _dl_printf ("AT_HWCAP2: "); + +- /* We have to go through them all because the kernel added the +- AT_HWCAP2 features starting with the high bits. */ +- for (int i = 0; i <= _DL_HWCAP2_LAST; ++i) +- if (word & (1 << i)) +- _dl_printf (" %s", _dl_hwcap_string (offset + i)); ++ /* We have to go through them all because the kernel added the ++ AT_HWCAP2 features starting with the high bits. */ ++ for (int i = 0; i < _DL_HWCAP_SIZE; ++i) ++ if (word & (1 << i)) ++ _dl_printf (" %s", _dl_hwcap_string (_DL_HWCAP2_OFFSET + i)); ++ break; ++ } ++ case AT_HWCAP3: ++ { ++ _dl_printf ("AT_HWCAP3: "); ++ ++ /* We have to go through them all because the kernel added the ++ AT_HWCAP3 features starting with the high bits. */ ++ for (int i = 0; i < _DL_HWCAP_SIZE; ++i) ++ if (word & (1 << i)) ++ _dl_printf (" %s", _dl_hwcap_string (_DL_HWCAP3_OFFSET + i)); ++ break; ++ } ++ case AT_HWCAP4: ++ { ++ _dl_printf ("AT_HWCAP4: "); ++ ++ /* We have to go through them all because the kernel added the ++ AT_HWCAP4 features starting with the high bits. */ ++ for (int i = 0; i <= _DL_HWCAP_SIZE; ++i) ++ if (word & (1 << i)) ++ _dl_printf (" %s", _dl_hwcap_string (_DL_HWCAP4_OFFSET + i)); + break; + } + case AT_L1I_CACHEGEOMETRY: +diff --git a/sysdeps/powerpc/hwcapinfo.c b/sysdeps/powerpc/hwcapinfo.c +index 76344f285a..f6fede15a7 100644 +--- a/sysdeps/powerpc/hwcapinfo.c ++++ b/sysdeps/powerpc/hwcapinfo.c +@@ -31,7 +31,7 @@ void + __tcb_parse_hwcap_and_convert_at_platform (void) + { + +- uint64_t h1, h2; ++ uint64_t h1, h2, h3, h4; + + /* Read AT_PLATFORM string from auxv and convert it to a number. */ + __tcb.at_platform = _dl_string_platform (GLRO (dl_platform)); +@@ -39,6 +39,8 @@ __tcb_parse_hwcap_and_convert_at_platform (void) + /* Read HWCAP and HWCAP2 from auxv. */ + h1 = GLRO (dl_hwcap); + h2 = GLRO (dl_hwcap2); ++ h3 = GLRO (dl_hwcap3); ++ h4 = GLRO (dl_hwcap4); + + /* hwcap contains only the latest supported ISA, the code checks which is + and fills the previous supported ones. */ +@@ -64,13 +66,16 @@ __tcb_parse_hwcap_and_convert_at_platform (void) + else if (h1 & PPC_FEATURE_POWER5) + h1 |= PPC_FEATURE_POWER4; + +- uint64_t array_hwcaps[] = { h1, h2 }; ++ uint64_t array_hwcaps[] = { h1, h2, h3, h4 }; + init_cpu_features (&GLRO(dl_powerpc_cpu_features), array_hwcaps); + + /* Consolidate both HWCAP and HWCAP2 into a single doubleword so that + we can read both in a single load later. */ + __tcb.hwcap = (h1 << 32) | (h2 & 0xffffffff); +- __tcb.hwcap_extn = 0x0; ++ ++ /* Consolidate both HWCAP3 and HWCAP4 into a single doubleword so that ++ we can read both in a single load later. */ ++ __tcb.hwcap_extn = (h3 << 32) | (h4 & 0xffffffff); + + } + #if IS_IN (rtld) +diff --git a/sysdeps/unix/sysv/linux/dl-parse_auxv.h b/sysdeps/unix/sysv/linux/dl-parse_auxv.h +index e3d758b163..ea2a58ecb1 100644 +--- a/sysdeps/unix/sysv/linux/dl-parse_auxv.h ++++ b/sysdeps/unix/sysv/linux/dl-parse_auxv.h +@@ -47,6 +47,8 @@ void _dl_parse_auxv (ElfW(auxv_t) *av, dl_parse_auxv_t auxv_values) + GLRO(dl_platform) = (void *) auxv_values[AT_PLATFORM]; + GLRO(dl_hwcap) = auxv_values[AT_HWCAP]; + GLRO(dl_hwcap2) = auxv_values[AT_HWCAP2]; ++ GLRO(dl_hwcap3) = auxv_values[AT_HWCAP3]; ++ GLRO(dl_hwcap4) = auxv_values[AT_HWCAP4]; + GLRO(dl_clktck) = auxv_values[AT_CLKTCK]; + GLRO(dl_fpu_control) = auxv_values[AT_FPUCW]; + _dl_random = (void *) auxv_values[AT_RANDOM]; +diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c +index ad3692d738..e1b14e9eb3 100644 +--- a/sysdeps/unix/sysv/linux/dl-sysdep.c ++++ b/sysdeps/unix/sysv/linux/dl-sysdep.c +@@ -197,6 +197,8 @@ _dl_show_auxv (void) + [AT_SYSINFO_EHDR - 2] = { "SYSINFO_EHDR: 0x", hex }, + [AT_RANDOM - 2] = { "RANDOM: 0x", hex }, + [AT_HWCAP2 - 2] = { "HWCAP2: 0x", hex }, ++ [AT_HWCAP3 - 2] = { "HWCAP3: 0x", hex }, ++ [AT_HWCAP4 - 2] = { "HWCAP4: 0x", hex }, + [AT_MINSIGSTKSZ - 2] = { "MINSIGSTKSZ: ", dec }, + [AT_L1I_CACHESIZE - 2] = { "L1I_CACHESIZE: ", dec }, + [AT_L1I_CACHEGEOMETRY - 2] = { "L1I_CACHEGEOMETRY: 0x", hex }, +diff --git a/sysdeps/unix/sysv/linux/powerpc/cpu-features.c b/sysdeps/unix/sysv/linux/powerpc/cpu-features.c +index 8e8a5ec2ea..a947d62db6 100644 +--- a/sysdeps/unix/sysv/linux/powerpc/cpu-features.c ++++ b/sysdeps/unix/sysv/linux/powerpc/cpu-features.c +@@ -94,6 +94,8 @@ init_cpu_features (struct cpu_features *cpu_features, uint64_t hwcaps[]) + which are set by __tcb_parse_hwcap_and_convert_at_platform. */ + cpu_features->hwcap = hwcaps[0]; + cpu_features->hwcap2 = hwcaps[1]; ++ cpu_features->hwcap3 = hwcaps[2]; ++ cpu_features->hwcap4 = hwcaps[3]; + /* Default is to use aligned memory access on optimized function unless + tunables is enable, since for this case user can explicit disable + unaligned optimizations. */ +diff --git a/sysdeps/unix/sysv/linux/powerpc/cpu-features.h b/sysdeps/unix/sysv/linux/powerpc/cpu-features.h +index 1294f0b601..e9eb6a13c8 100644 +--- a/sysdeps/unix/sysv/linux/powerpc/cpu-features.h ++++ b/sysdeps/unix/sysv/linux/powerpc/cpu-features.h +@@ -26,6 +26,8 @@ struct cpu_features + bool use_cached_memopt; + unsigned long int hwcap; + unsigned long int hwcap2; ++ unsigned long int hwcap3; ++ unsigned long int hwcap4; + }; + + static const char hwcap_names[] = { +diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-start.c b/sysdeps/unix/sysv/linux/powerpc/libc-start.c +index a4705daf1c..6a00cd88cd 100644 +--- a/sysdeps/unix/sysv/linux/powerpc/libc-start.c ++++ b/sysdeps/unix/sysv/linux/powerpc/libc-start.c +@@ -87,6 +87,12 @@ __libc_start_main_impl (int argc, char **argv, + case AT_HWCAP2: + _dl_hwcap2 = (unsigned long int) av->a_un.a_val; + break; ++ case AT_HWCAP3: ++ _dl_hwcap3 = (unsigned long int) av->a_un.a_val; ++ break; ++ case AT_HWCAP4: ++ _dl_hwcap4 = (unsigned long int) av->a_un.a_val; ++ break; + case AT_PLATFORM: + _dl_platform = (void *) av->a_un.a_val; + break; + +commit aad45c8ac30aa1072e54903ce6aead22702f244a +Author: Amrita H S +Date: Tue Mar 19 19:08:47 2024 -0500 + + powerpc: Placeholder and infrastructure/build support to add Power11 related changes. + + The following three changes have been added to provide initial Power11 support. + 1. Add the directories to hold Power11 files. + 2. Add support to select Power11 libraries based on AT_PLATFORM. + 3. Let submachine=power11 be set automatically. + + Reviewed-by: Florian Weimer + Reviewed-by: Peter Bergner + (cherry picked from commit 1ea051145612f199d8716ecdf78b084b00b5a727) + +diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h +index f8cb343877..b36697ba44 100644 +--- a/sysdeps/powerpc/dl-procinfo.h ++++ b/sysdeps/powerpc/dl-procinfo.h +@@ -38,7 +38,7 @@ + #define HWCAP_IMPORTANT (PPC_FEATURE_HAS_ALTIVEC \ + + PPC_FEATURE_HAS_DFP) + +-#define _DL_PLATFORMS_COUNT 16 ++#define _DL_PLATFORMS_COUNT 17 + + #define _DL_FIRST_PLATFORM 32 + /* Mask to filter out platforms. */ +@@ -62,6 +62,7 @@ + #define PPC_PLATFORM_POWER8 13 + #define PPC_PLATFORM_POWER9 14 + #define PPC_PLATFORM_POWER10 15 ++#define PPC_PLATFORM_POWER11 16 + + static inline const char * + __attribute__ ((unused)) +@@ -89,6 +90,11 @@ _dl_string_platform (const char *str) + ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER10; + str++; + } ++ else if (str[1] == '1') ++ { ++ ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER11; ++ str++; ++ } + else + return -1; + break; +diff --git a/sysdeps/powerpc/powerpc32/power11/Implies b/sysdeps/powerpc/powerpc32/power11/Implies +new file mode 100644 +index 0000000000..051cbe0f79 +--- /dev/null ++++ b/sysdeps/powerpc/powerpc32/power11/Implies +@@ -0,0 +1,2 @@ ++powerpc/powerpc32/power10/fpu ++powerpc/powerpc32/power10 +diff --git a/sysdeps/powerpc/powerpc32/power11/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc32/power11/fpu/multiarch/Implies +new file mode 100644 +index 0000000000..58edb2861d +--- /dev/null ++++ b/sysdeps/powerpc/powerpc32/power11/fpu/multiarch/Implies +@@ -0,0 +1 @@ ++powerpc/powerpc32/power10/fpu/multiarch +diff --git a/sysdeps/powerpc/powerpc32/power11/multiarch/Implies b/sysdeps/powerpc/powerpc32/power11/multiarch/Implies +new file mode 100644 +index 0000000000..c70f0428ba +--- /dev/null ++++ b/sysdeps/powerpc/powerpc32/power11/multiarch/Implies +@@ -0,0 +1 @@ ++powerpc/powerpc32/power10/multiarch +diff --git a/sysdeps/powerpc/powerpc64/be/power11/Implies b/sysdeps/powerpc/powerpc64/be/power11/Implies +new file mode 100644 +index 0000000000..de481d1c13 +--- /dev/null ++++ b/sysdeps/powerpc/powerpc64/be/power11/Implies +@@ -0,0 +1,2 @@ ++powerpc/powerpc64/be/power10/fpu ++powerpc/powerpc64/be/power10 +diff --git a/sysdeps/powerpc/powerpc64/be/power11/fpu/Implies b/sysdeps/powerpc/powerpc64/be/power11/fpu/Implies +new file mode 100644 +index 0000000000..dff0e13064 +--- /dev/null ++++ b/sysdeps/powerpc/powerpc64/be/power11/fpu/Implies +@@ -0,0 +1 @@ ++powerpc/powerpc64/be/power10/fpu +diff --git a/sysdeps/powerpc/powerpc64/be/power11/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power11/fpu/multiarch/Implies +new file mode 100644 +index 0000000000..c3f259e009 +--- /dev/null ++++ b/sysdeps/powerpc/powerpc64/be/power11/fpu/multiarch/Implies +@@ -0,0 +1 @@ ++powerpc/powerpc64/be/power10/fpu/multiarch +diff --git a/sysdeps/powerpc/powerpc64/be/power11/multiarch/Implies b/sysdeps/powerpc/powerpc64/be/power11/multiarch/Implies +new file mode 100644 +index 0000000000..9491a394c9 +--- /dev/null ++++ b/sysdeps/powerpc/powerpc64/be/power11/multiarch/Implies +@@ -0,0 +1 @@ ++powerpc/powerpc64/be/power10/multiarch +diff --git a/sysdeps/powerpc/powerpc64/le/power11/Implies b/sysdeps/powerpc/powerpc64/le/power11/Implies +new file mode 100644 +index 0000000000..e18182dcc1 +--- /dev/null ++++ b/sysdeps/powerpc/powerpc64/le/power11/Implies +@@ -0,0 +1,2 @@ ++powerpc/powerpc64/le/power10/fpu ++powerpc/powerpc64/le/power10 +diff --git a/sysdeps/powerpc/powerpc64/le/power11/fpu/Implies b/sysdeps/powerpc/powerpc64/le/power11/fpu/Implies +new file mode 100644 +index 0000000000..e41bd55684 +--- /dev/null ++++ b/sysdeps/powerpc/powerpc64/le/power11/fpu/Implies +@@ -0,0 +1 @@ ++powerpc/powerpc64/le/power10/fpu +diff --git a/sysdeps/powerpc/powerpc64/le/power11/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power11/fpu/multiarch/Implies +new file mode 100644 +index 0000000000..c838d50931 +--- /dev/null ++++ b/sysdeps/powerpc/powerpc64/le/power11/fpu/multiarch/Implies +@@ -0,0 +1 @@ ++powerpc/powerpc64/le/power10/fpu/multiarch +diff --git a/sysdeps/powerpc/powerpc64/le/power11/multiarch/Implies b/sysdeps/powerpc/powerpc64/le/power11/multiarch/Implies +new file mode 100644 +index 0000000000..687248c3c2 +--- /dev/null ++++ b/sysdeps/powerpc/powerpc64/le/power11/multiarch/Implies +@@ -0,0 +1 @@ ++powerpc/powerpc64/le/power10/multiarch +diff --git a/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c b/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c +index 77465d9133..65d3e69303 100644 +--- a/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c ++++ b/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c +@@ -36,9 +36,11 @@ compute_level (void) + return 9; + if (strcmp (platform, "power10") == 0) + return 10; ++ if (strcmp (platform, "power11") == 0) ++ return 11; + printf ("warning: unrecognized AT_PLATFORM value: %s\n", platform); +- /* Assume that the new platform supports POWER10. */ +- return 10; ++ /* Assume that the new platform supports POWER11. */ ++ return 11; + } + + static int +diff --git a/sysdeps/powerpc/preconfigure b/sysdeps/powerpc/preconfigure +index 4de94089a3..9e5a07ab6d 100644 +--- a/sysdeps/powerpc/preconfigure ++++ b/sysdeps/powerpc/preconfigure +@@ -58,7 +58,7 @@ fi + + ;; + +- a2|970|power[4-9]|power5x|power6+|power10) ++ a2|970|power[4-9]|power5x|power6+|power10|power11) + submachine=${archcpu} + if test ${libc_cv_cc_submachine+y} + then : +diff --git a/sysdeps/powerpc/preconfigure.ac b/sysdeps/powerpc/preconfigure.ac +index 6c63bd8257..14b6dafd4a 100644 +--- a/sysdeps/powerpc/preconfigure.ac ++++ b/sysdeps/powerpc/preconfigure.ac +@@ -46,7 +46,7 @@ case "${machine}:${submachine}" in + AC_CACHE_VAL(libc_cv_cc_submachine,libc_cv_cc_submachine="") + ;; + +- a2|970|power[[4-9]]|power5x|power6+|power10) ++ a2|970|power[[4-9]]|power5x|power6+|power10|power11) + submachine=${archcpu} + AC_CACHE_VAL(libc_cv_cc_submachine,libc_cv_cc_submachine="") + ;; + +commit 983f34a1252de3ca6f2305c211d86530ea42010e +Author: caiyinyu +Date: Mon Mar 11 16:07:48 2024 +0800 + + LoongArch: Correct {__ieee754, _}_scalb -> {__ieee754, _}_scalbf + +diff --git a/sysdeps/loongarch/fpu/e_scalbf.c b/sysdeps/loongarch/fpu/e_scalbf.c +index 9f05485236..7c0395fbb5 100644 +--- a/sysdeps/loongarch/fpu/e_scalbf.c ++++ b/sysdeps/loongarch/fpu/e_scalbf.c +@@ -57,4 +57,4 @@ __ieee754_scalbf (float x, float fn) + + return x; + } +-libm_alias_finite (__ieee754_scalb, __scalb) ++libm_alias_finite (__ieee754_scalbf, __scalbf) + +commit 7fc8242bf87828c935ac5df5cafb9dc7ab635fd9 +Author: H.J. Lu +Date: Fri Feb 16 07:17:10 2024 -0800 + + x86-64: Save APX registers in ld.so trampoline + + Add APX registers to STATE_SAVE_MASK so that APX registers are saved in + ld.so trampoline. This fixes BZ #31371. + + Also update STATE_SAVE_OFFSET and STATE_SAVE_MASK for i386 which will + be used by i386 _dl_tlsdesc_dynamic. + Reviewed-by: Noah Goldstein + + (cherry picked from commit dfb05f8e704edac70db38c4c8ee700769d91a413) + +diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h +index 85d0a8c943..837fd28734 100644 +--- a/sysdeps/x86/sysdep.h ++++ b/sysdeps/x86/sysdep.h +@@ -21,14 +21,54 @@ + + #include + ++/* The extended state feature IDs in the state component bitmap. */ ++#define X86_XSTATE_X87_ID 0 ++#define X86_XSTATE_SSE_ID 1 ++#define X86_XSTATE_AVX_ID 2 ++#define X86_XSTATE_BNDREGS_ID 3 ++#define X86_XSTATE_BNDCFG_ID 4 ++#define X86_XSTATE_K_ID 5 ++#define X86_XSTATE_ZMM_H_ID 6 ++#define X86_XSTATE_ZMM_ID 7 ++#define X86_XSTATE_PKRU_ID 9 ++#define X86_XSTATE_TILECFG_ID 17 ++#define X86_XSTATE_TILEDATA_ID 18 ++#define X86_XSTATE_APX_F_ID 19 ++ ++#ifdef __x86_64__ + /* Offset for fxsave/xsave area used by _dl_runtime_resolve. Also need + space to preserve RCX, RDX, RSI, RDI, R8, R9 and RAX. It must be +- aligned to 16 bytes for fxsave and 64 bytes for xsave. */ +-#define STATE_SAVE_OFFSET (8 * 7 + 8) +- +-/* Save SSE, AVX, AVX512, mask and bound registers. */ +-#define STATE_SAVE_MASK \ +- ((1 << 1) | (1 << 2) | (1 << 3) | (1 << 5) | (1 << 6) | (1 << 7)) ++ aligned to 16 bytes for fxsave and 64 bytes for xsave. ++ ++ NB: Is is non-zero because of the 128-byte red-zone. Some registers ++ are saved on stack without adjusting stack pointer first. When we ++ update stack pointer to allocate more space, we need to take the ++ red-zone into account. */ ++# define STATE_SAVE_OFFSET (8 * 7 + 8) ++ ++/* Save SSE, AVX, AVX512, mask, bound and APX registers. Bound and APX ++ registers are mutually exclusive. */ ++# define STATE_SAVE_MASK \ ++ ((1 << X86_XSTATE_SSE_ID) \ ++ | (1 << X86_XSTATE_AVX_ID) \ ++ | (1 << X86_XSTATE_BNDREGS_ID) \ ++ | (1 << X86_XSTATE_K_ID) \ ++ | (1 << X86_XSTATE_ZMM_H_ID) \ ++ | (1 << X86_XSTATE_ZMM_ID) \ ++ | (1 << X86_XSTATE_APX_F_ID)) ++#else ++/* Offset for fxsave/xsave area used by _dl_tlsdesc_dynamic. Since i386 ++ doesn't have red-zone, use 0 here. */ ++# define STATE_SAVE_OFFSET 0 ++ ++/* Save SSE, AVX, AXV512, mask and bound registers. */ ++# define STATE_SAVE_MASK \ ++ ((1 << X86_XSTATE_SSE_ID) \ ++ | (1 << X86_XSTATE_AVX_ID) \ ++ | (1 << X86_XSTATE_BNDREGS_ID) \ ++ | (1 << X86_XSTATE_K_ID) \ ++ | (1 << X86_XSTATE_ZMM_H_ID)) ++#endif + + /* Constants for bits in __x86_string_control: */ + + +commit a364304718725a31ab141936322855c76c73e35e +Author: H.J. Lu +Date: Mon Feb 26 06:37:03 2024 -0800 + + x86: Update _dl_tlsdesc_dynamic to preserve caller-saved registers + + Compiler generates the following instruction sequence for GNU2 dynamic + TLS access: + + leaq tls_var@TLSDESC(%rip), %rax + call *tls_var@TLSCALL(%rax) + + or + + leal tls_var@TLSDESC(%ebx), %eax + call *tls_var@TLSCALL(%eax) + + CALL instruction is transparent to compiler which assumes all registers, + except for EFLAGS and RAX/EAX, are unchanged after CALL. When + _dl_tlsdesc_dynamic is called, it calls __tls_get_addr on the slow + path. __tls_get_addr is a normal function which doesn't preserve any + caller-saved registers. _dl_tlsdesc_dynamic saved and restored integer + caller-saved registers, but didn't preserve any other caller-saved + registers. Add _dl_tlsdesc_dynamic IFUNC functions for FNSAVE, FXSAVE, + XSAVE and XSAVEC to save and restore all caller-saved registers. This + fixes BZ #31372. + + Add GLRO(dl_x86_64_runtime_resolve) with GLRO(dl_x86_tlsdesc_dynamic) + to optimize elf_machine_runtime_setup. + Reviewed-by: Noah Goldstein + + (cherry picked from commit 0aac205a814a8511e98d02b91a8dc908f1c53cde) + +diff --git a/elf/Makefile b/elf/Makefile +index 5d78b659ce..c5c37a9147 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -424,6 +424,7 @@ tests += \ + tst-glibc-hwcaps-prepend \ + tst-global1 \ + tst-global2 \ ++ tst-gnu2-tls2 \ + tst-initfinilazyfail \ + tst-initorder \ + tst-initorder2 \ +@@ -846,6 +847,9 @@ modules-names += \ + tst-filterobj-flt \ + tst-finilazyfailmod \ + tst-globalmod2 \ ++ tst-gnu2-tls2mod0 \ ++ tst-gnu2-tls2mod1 \ ++ tst-gnu2-tls2mod2 \ + tst-initlazyfailmod \ + tst-initorder2a \ + tst-initorder2b \ +@@ -3044,8 +3048,22 @@ $(objpfx)tst-tlsgap.out: \ + $(objpfx)tst-tlsgap-mod0.so \ + $(objpfx)tst-tlsgap-mod1.so \ + $(objpfx)tst-tlsgap-mod2.so ++ ++$(objpfx)tst-gnu2-tls2: $(shared-thread-library) ++$(objpfx)tst-gnu2-tls2.out: \ ++ $(objpfx)tst-gnu2-tls2mod0.so \ ++ $(objpfx)tst-gnu2-tls2mod1.so \ ++ $(objpfx)tst-gnu2-tls2mod2.so ++ + ifeq (yes,$(have-mtls-dialect-gnu2)) ++# This test fails if dl_tlsdesc_dynamic doesn't preserve all caller-saved ++# registers. See https://sourceware.org/bugzilla/show_bug.cgi?id=31372 ++test-xfail-tst-gnu2-tls2 = yes ++ + CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=gnu2 + CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=gnu2 + CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=gnu2 ++CFLAGS-tst-gnu2-tls2mod0.c += -mtls-dialect=gnu2 ++CFLAGS-tst-gnu2-tls2mod1.c += -mtls-dialect=gnu2 ++CFLAGS-tst-gnu2-tls2mod2.c += -mtls-dialect=gnu2 + endif +diff --git a/elf/tst-gnu2-tls2.c b/elf/tst-gnu2-tls2.c +new file mode 100644 +index 0000000000..7ac04d7f33 +--- /dev/null ++++ b/elf/tst-gnu2-tls2.c +@@ -0,0 +1,122 @@ ++/* Test TLSDESC relocation. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "tst-gnu2-tls2.h" ++ ++#ifndef IS_SUPPORTED ++# define IS_SUPPORTED() true ++#endif ++ ++/* An architecture can define it to clobber caller-saved registers in ++ malloc below to verify that the implicit TLSDESC call won't change ++ caller-saved registers. */ ++#ifndef PREPARE_MALLOC ++# define PREPARE_MALLOC() ++#endif ++ ++extern void * __libc_malloc (size_t); ++ ++size_t malloc_counter = 0; ++ ++void * ++malloc (size_t n) ++{ ++ PREPARE_MALLOC (); ++ malloc_counter++; ++ return __libc_malloc (n); ++} ++ ++static void *mod[3]; ++#ifndef MOD ++# define MOD(i) "tst-gnu2-tls2mod" #i ".so" ++#endif ++static const char *modname[3] = { MOD(0), MOD(1), MOD(2) }; ++#undef MOD ++ ++static void ++open_mod (int i) ++{ ++ mod[i] = xdlopen (modname[i], RTLD_LAZY); ++ printf ("open %s\n", modname[i]); ++} ++ ++static void ++close_mod (int i) ++{ ++ xdlclose (mod[i]); ++ mod[i] = NULL; ++ printf ("close %s\n", modname[i]); ++} ++ ++static void ++access_mod (int i, const char *sym) ++{ ++ struct tls var = { -1, -1, -1, -1 }; ++ struct tls *(*f) (struct tls *) = xdlsym (mod[i], sym); ++ /* Check that our malloc is called. */ ++ malloc_counter = 0; ++ struct tls *p = f (&var); ++ TEST_VERIFY (malloc_counter != 0); ++ printf ("access %s: %s() = %p\n", modname[i], sym, p); ++ TEST_VERIFY_EXIT (memcmp (p, &var, sizeof (var)) == 0); ++ ++(p->a); ++} ++ ++static void * ++start (void *arg) ++{ ++ /* The DTV generation is at the last dlopen of mod0 and the ++ entry for mod1 is NULL. */ ++ ++ open_mod (1); /* Reuse modid of mod1. Uses dynamic TLS. */ ++ ++ /* Force the slow path in GNU2 TLS descriptor call. */ ++ access_mod (1, "apply_tls"); ++ ++ return arg; ++} ++ ++static int ++do_test (void) ++{ ++ if (!IS_SUPPORTED ()) ++ return EXIT_UNSUPPORTED; ++ ++ open_mod (0); ++ open_mod (1); ++ open_mod (2); ++ close_mod (0); ++ close_mod (1); /* Create modid gap at mod1. */ ++ open_mod (0); /* Reuse modid of mod0, bump generation count. */ ++ ++ /* Create a thread where DTV of mod1 is NULL. */ ++ pthread_t t = xpthread_create (NULL, start, NULL); ++ xpthread_join (t); ++ return 0; ++} ++ ++#include +diff --git a/elf/tst-gnu2-tls2.h b/elf/tst-gnu2-tls2.h +new file mode 100644 +index 0000000000..77964a57a3 +--- /dev/null ++++ b/elf/tst-gnu2-tls2.h +@@ -0,0 +1,36 @@ ++/* Test TLSDESC relocation. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++struct tls ++{ ++ int64_t a, b, c, d; ++}; ++ ++extern struct tls *apply_tls (struct tls *); ++ ++/* An architecture can define them to verify that clobber caller-saved ++ registers aren't changed by the implicit TLSDESC call. */ ++#ifndef BEFORE_TLSDESC_CALL ++# define BEFORE_TLSDESC_CALL() ++#endif ++ ++#ifndef AFTER_TLSDESC_CALL ++# define AFTER_TLSDESC_CALL() ++#endif +diff --git a/elf/tst-gnu2-tls2mod0.c b/elf/tst-gnu2-tls2mod0.c +new file mode 100644 +index 0000000000..45556a0e17 +--- /dev/null ++++ b/elf/tst-gnu2-tls2mod0.c +@@ -0,0 +1,31 @@ ++/* DSO used by tst-gnu2-tls2. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include "tst-gnu2-tls2.h" ++ ++__thread struct tls tls_var0 __attribute__ ((visibility ("hidden"))); ++ ++struct tls * ++apply_tls (struct tls *p) ++{ ++ BEFORE_TLSDESC_CALL (); ++ tls_var0 = *p; ++ struct tls *ret = &tls_var0; ++ AFTER_TLSDESC_CALL (); ++ return ret; ++} +diff --git a/elf/tst-gnu2-tls2mod1.c b/elf/tst-gnu2-tls2mod1.c +new file mode 100644 +index 0000000000..e10b9dbc0a +--- /dev/null ++++ b/elf/tst-gnu2-tls2mod1.c +@@ -0,0 +1,31 @@ ++/* DSO used by tst-gnu2-tls2. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include "tst-gnu2-tls2.h" ++ ++__thread struct tls tls_var1[100] __attribute__ ((visibility ("hidden"))); ++ ++struct tls * ++apply_tls (struct tls *p) ++{ ++ BEFORE_TLSDESC_CALL (); ++ tls_var1[1] = *p; ++ struct tls *ret = &tls_var1[1]; ++ AFTER_TLSDESC_CALL (); ++ return ret; ++} +diff --git a/elf/tst-gnu2-tls2mod2.c b/elf/tst-gnu2-tls2mod2.c +new file mode 100644 +index 0000000000..141af51e55 +--- /dev/null ++++ b/elf/tst-gnu2-tls2mod2.c +@@ -0,0 +1,31 @@ ++/* DSO used by tst-gnu2-tls2. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include "tst-gnu2-tls2.h" ++ ++__thread struct tls tls_var2 __attribute__ ((visibility ("hidden"))); ++ ++struct tls * ++apply_tls (struct tls *p) ++{ ++ BEFORE_TLSDESC_CALL (); ++ tls_var2 = *p; ++ struct tls *ret = &tls_var2; ++ AFTER_TLSDESC_CALL (); ++ return ret; ++} +diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h +index fc1ef96587..50d74fe6e9 100644 +--- a/sysdeps/i386/dl-machine.h ++++ b/sysdeps/i386/dl-machine.h +@@ -347,7 +347,7 @@ and creates an unsatisfiable circular dependency.\n", + { + td->arg = _dl_make_tlsdesc_dynamic + (sym_map, sym->st_value + (ElfW(Word))td->arg); +- td->entry = _dl_tlsdesc_dynamic; ++ td->entry = GLRO(dl_x86_tlsdesc_dynamic); + } + else + # endif +diff --git a/sysdeps/i386/dl-tlsdesc-dynamic.h b/sysdeps/i386/dl-tlsdesc-dynamic.h +new file mode 100644 +index 0000000000..3627028577 +--- /dev/null ++++ b/sysdeps/i386/dl-tlsdesc-dynamic.h +@@ -0,0 +1,190 @@ ++/* Thread-local storage handling in the ELF dynamic linker. i386 version. ++ Copyright (C) 2004-2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#undef REGISTER_SAVE_AREA ++ ++#if !defined USE_FNSAVE && (STATE_SAVE_ALIGNMENT % 16) != 0 ++# error STATE_SAVE_ALIGNMENT must be multiple of 16 ++#endif ++ ++#if DL_RUNTIME_RESOLVE_REALIGN_STACK ++# ifdef USE_FNSAVE ++# error USE_FNSAVE shouldn't be defined ++# endif ++# ifdef USE_FXSAVE ++/* Use fxsave to save all registers. */ ++# define REGISTER_SAVE_AREA 512 ++# endif ++#else ++# ifdef USE_FNSAVE ++/* Use fnsave to save x87 FPU stack registers. */ ++# define REGISTER_SAVE_AREA 108 ++# else ++# ifndef USE_FXSAVE ++# error USE_FXSAVE must be defined ++# endif ++/* Use fxsave to save all registers. Add 12 bytes to align the stack ++ to 16 bytes. */ ++# define REGISTER_SAVE_AREA (512 + 12) ++# endif ++#endif ++ ++ .hidden _dl_tlsdesc_dynamic ++ .global _dl_tlsdesc_dynamic ++ .type _dl_tlsdesc_dynamic,@function ++ ++ /* This function is used for symbols that need dynamic TLS. ++ ++ %eax points to the TLS descriptor, such that 0(%eax) points to ++ _dl_tlsdesc_dynamic itself, and 4(%eax) points to a struct ++ tlsdesc_dynamic_arg object. It must return in %eax the offset ++ between the thread pointer and the object denoted by the ++ argument, without clobbering any registers. ++ ++ The assembly code that follows is a rendition of the following ++ C code, hand-optimized a little bit. ++ ++ptrdiff_t ++__attribute__ ((__regparm__ (1))) ++_dl_tlsdesc_dynamic (struct tlsdesc *tdp) ++{ ++ struct tlsdesc_dynamic_arg *td = tdp->arg; ++ dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET); ++ if (__builtin_expect (td->gen_count <= dtv[0].counter ++ && (dtv[td->tlsinfo.ti_module].pointer.val ++ != TLS_DTV_UNALLOCATED), ++ 1)) ++ return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset ++ - __thread_pointer; ++ ++ return ___tls_get_addr (&td->tlsinfo) - __thread_pointer; ++} ++*/ ++ cfi_startproc ++ .align 16 ++_dl_tlsdesc_dynamic: ++ /* Like all TLS resolvers, preserve call-clobbered registers. ++ We need two scratch regs anyway. */ ++ subl $32, %esp ++ cfi_adjust_cfa_offset (32) ++ movl %ecx, 20(%esp) ++ movl %edx, 24(%esp) ++ movl TLSDESC_ARG(%eax), %eax ++ movl %gs:DTV_OFFSET, %edx ++ movl TLSDESC_GEN_COUNT(%eax), %ecx ++ cmpl (%edx), %ecx ++ ja 2f ++ movl TLSDESC_MODID(%eax), %ecx ++ movl (%edx,%ecx,8), %edx ++ cmpl $-1, %edx ++ je 2f ++ movl TLSDESC_MODOFF(%eax), %eax ++ addl %edx, %eax ++1: ++ movl 20(%esp), %ecx ++ subl %gs:0, %eax ++ movl 24(%esp), %edx ++ addl $32, %esp ++ cfi_adjust_cfa_offset (-32) ++ ret ++ .p2align 4,,7 ++2: ++ cfi_adjust_cfa_offset (32) ++#if DL_RUNTIME_RESOLVE_REALIGN_STACK ++ movl %ebx, -28(%esp) ++ movl %esp, %ebx ++ cfi_def_cfa_register(%ebx) ++ and $-STATE_SAVE_ALIGNMENT, %esp ++#endif ++#ifdef REGISTER_SAVE_AREA ++ subl $REGISTER_SAVE_AREA, %esp ++# if !DL_RUNTIME_RESOLVE_REALIGN_STACK ++ cfi_adjust_cfa_offset(REGISTER_SAVE_AREA) ++# endif ++#else ++# if !DL_RUNTIME_RESOLVE_REALIGN_STACK ++# error DL_RUNTIME_RESOLVE_REALIGN_STACK must be true ++# endif ++ /* Allocate stack space of the required size to save the state. */ ++ LOAD_PIC_REG (cx) ++ subl RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_SIZE_OFFSET+_rtld_local_ro@GOTOFF(%ecx), %esp ++#endif ++#ifdef USE_FNSAVE ++ fnsave (%esp) ++#elif defined USE_FXSAVE ++ fxsave (%esp) ++#else ++ /* Save the argument for ___tls_get_addr in EAX. */ ++ movl %eax, %ecx ++ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax ++ xorl %edx, %edx ++ /* Clear the XSAVE Header. */ ++# ifdef USE_XSAVE ++ movl %edx, (512)(%esp) ++ movl %edx, (512 + 4 * 1)(%esp) ++ movl %edx, (512 + 4 * 2)(%esp) ++ movl %edx, (512 + 4 * 3)(%esp) ++# endif ++ movl %edx, (512 + 4 * 4)(%esp) ++ movl %edx, (512 + 4 * 5)(%esp) ++ movl %edx, (512 + 4 * 6)(%esp) ++ movl %edx, (512 + 4 * 7)(%esp) ++ movl %edx, (512 + 4 * 8)(%esp) ++ movl %edx, (512 + 4 * 9)(%esp) ++ movl %edx, (512 + 4 * 10)(%esp) ++ movl %edx, (512 + 4 * 11)(%esp) ++ movl %edx, (512 + 4 * 12)(%esp) ++ movl %edx, (512 + 4 * 13)(%esp) ++ movl %edx, (512 + 4 * 14)(%esp) ++ movl %edx, (512 + 4 * 15)(%esp) ++# ifdef USE_XSAVE ++ xsave (%esp) ++# else ++ xsavec (%esp) ++# endif ++ /* Restore the argument for ___tls_get_addr in EAX. */ ++ movl %ecx, %eax ++#endif ++ call HIDDEN_JUMPTARGET (___tls_get_addr) ++ /* Get register content back. */ ++#ifdef USE_FNSAVE ++ frstor (%esp) ++#elif defined USE_FXSAVE ++ fxrstor (%esp) ++#else ++ /* Save and retore ___tls_get_addr return value stored in EAX. */ ++ movl %eax, %ecx ++ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax ++ xorl %edx, %edx ++ xrstor (%esp) ++ movl %ecx, %eax ++#endif ++#if DL_RUNTIME_RESOLVE_REALIGN_STACK ++ mov %ebx, %esp ++ cfi_def_cfa_register(%esp) ++ movl -28(%esp), %ebx ++ cfi_restore(%ebx) ++#else ++ addl $REGISTER_SAVE_AREA, %esp ++ cfi_adjust_cfa_offset(-REGISTER_SAVE_AREA) ++#endif ++ jmp 1b ++ cfi_endproc ++ .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic ++ ++#undef STATE_SAVE_ALIGNMENT +diff --git a/sysdeps/i386/dl-tlsdesc.S b/sysdeps/i386/dl-tlsdesc.S +index 90d93caa0c..f002feee56 100644 +--- a/sysdeps/i386/dl-tlsdesc.S ++++ b/sysdeps/i386/dl-tlsdesc.S +@@ -18,8 +18,27 @@ + + #include + #include ++#include ++#include + #include "tlsdesc.h" + ++#ifndef DL_STACK_ALIGNMENT ++/* Due to GCC bug: ++ ++ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58066 ++ ++ __tls_get_addr may be called with 4-byte stack alignment. Although ++ this bug has been fixed in GCC 4.9.4, 5.3 and 6, we can't assume ++ that stack will be always aligned at 16 bytes. */ ++# define DL_STACK_ALIGNMENT 4 ++#endif ++ ++/* True if _dl_tlsdesc_dynamic should align stack for STATE_SAVE or align ++ stack to MINIMUM_ALIGNMENT bytes before calling ___tls_get_addr. */ ++#define DL_RUNTIME_RESOLVE_REALIGN_STACK \ ++ (STATE_SAVE_ALIGNMENT > DL_STACK_ALIGNMENT \ ++ || MINIMUM_ALIGNMENT > DL_STACK_ALIGNMENT) ++ + .text + + /* This function is used to compute the TP offset for symbols in +@@ -65,69 +84,35 @@ _dl_tlsdesc_undefweak: + .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak + + #ifdef SHARED +- .hidden _dl_tlsdesc_dynamic +- .global _dl_tlsdesc_dynamic +- .type _dl_tlsdesc_dynamic,@function +- +- /* This function is used for symbols that need dynamic TLS. +- +- %eax points to the TLS descriptor, such that 0(%eax) points to +- _dl_tlsdesc_dynamic itself, and 4(%eax) points to a struct +- tlsdesc_dynamic_arg object. It must return in %eax the offset +- between the thread pointer and the object denoted by the +- argument, without clobbering any registers. +- +- The assembly code that follows is a rendition of the following +- C code, hand-optimized a little bit. +- +-ptrdiff_t +-__attribute__ ((__regparm__ (1))) +-_dl_tlsdesc_dynamic (struct tlsdesc *tdp) +-{ +- struct tlsdesc_dynamic_arg *td = tdp->arg; +- dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET); +- if (__builtin_expect (td->gen_count <= dtv[0].counter +- && (dtv[td->tlsinfo.ti_module].pointer.val +- != TLS_DTV_UNALLOCATED), +- 1)) +- return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset +- - __thread_pointer; +- +- return ___tls_get_addr (&td->tlsinfo) - __thread_pointer; +-} +-*/ +- cfi_startproc +- .align 16 +-_dl_tlsdesc_dynamic: +- /* Like all TLS resolvers, preserve call-clobbered registers. +- We need two scratch regs anyway. */ +- subl $28, %esp +- cfi_adjust_cfa_offset (28) +- movl %ecx, 20(%esp) +- movl %edx, 24(%esp) +- movl TLSDESC_ARG(%eax), %eax +- movl %gs:DTV_OFFSET, %edx +- movl TLSDESC_GEN_COUNT(%eax), %ecx +- cmpl (%edx), %ecx +- ja .Lslow +- movl TLSDESC_MODID(%eax), %ecx +- movl (%edx,%ecx,8), %edx +- cmpl $-1, %edx +- je .Lslow +- movl TLSDESC_MODOFF(%eax), %eax +- addl %edx, %eax +-.Lret: +- movl 20(%esp), %ecx +- subl %gs:0, %eax +- movl 24(%esp), %edx +- addl $28, %esp +- cfi_adjust_cfa_offset (-28) +- ret +- .p2align 4,,7 +-.Lslow: +- cfi_adjust_cfa_offset (28) +- call HIDDEN_JUMPTARGET (___tls_get_addr) +- jmp .Lret +- cfi_endproc +- .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic ++# define USE_FNSAVE ++# define MINIMUM_ALIGNMENT 4 ++# define STATE_SAVE_ALIGNMENT 4 ++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fnsave ++# include "dl-tlsdesc-dynamic.h" ++# undef _dl_tlsdesc_dynamic ++# undef MINIMUM_ALIGNMENT ++# undef USE_FNSAVE ++ ++# define MINIMUM_ALIGNMENT 16 ++ ++# define USE_FXSAVE ++# define STATE_SAVE_ALIGNMENT 16 ++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave ++# include "dl-tlsdesc-dynamic.h" ++# undef _dl_tlsdesc_dynamic ++# undef USE_FXSAVE ++ ++# define USE_XSAVE ++# define STATE_SAVE_ALIGNMENT 64 ++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsave ++# include "dl-tlsdesc-dynamic.h" ++# undef _dl_tlsdesc_dynamic ++# undef USE_XSAVE ++ ++# define USE_XSAVEC ++# define STATE_SAVE_ALIGNMENT 64 ++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsavec ++# include "dl-tlsdesc-dynamic.h" ++# undef _dl_tlsdesc_dynamic ++# undef USE_XSAVEC + #endif /* SHARED */ +diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile +index 4d50b327b5..992aabe43e 100644 +--- a/sysdeps/x86/Makefile ++++ b/sysdeps/x86/Makefile +@@ -1,5 +1,5 @@ + ifeq ($(subdir),csu) +-gen-as-const-headers += cpu-features-offsets.sym ++gen-as-const-headers += cpu-features-offsets.sym features-offsets.sym + endif + + ifeq ($(subdir),elf) +@@ -86,6 +86,11 @@ endif + tst-ifunc-isa-2-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-SSE4_2,-AVX,-AVX2,-AVX512F + tst-ifunc-isa-2-static-ENV = $(tst-ifunc-isa-2-ENV) + tst-hwcap-tunables-ARGS = -- $(host-test-program-cmd) ++ ++CFLAGS-tst-gnu2-tls2.c += -msse ++CFLAGS-tst-gnu2-tls2mod0.c += -msse2 -mtune=haswell ++CFLAGS-tst-gnu2-tls2mod1.c += -msse2 -mtune=haswell ++CFLAGS-tst-gnu2-tls2mod2.c += -msse2 -mtune=haswell + endif + + ifeq ($(subdir),math) +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index 25e6622a79..835113b42f 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -27,8 +27,13 @@ + extern void TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *) + attribute_hidden; + +-#if defined SHARED && defined __x86_64__ +-# include ++#if defined SHARED ++extern void _dl_tlsdesc_dynamic_fxsave (void) attribute_hidden; ++extern void _dl_tlsdesc_dynamic_xsave (void) attribute_hidden; ++extern void _dl_tlsdesc_dynamic_xsavec (void) attribute_hidden; ++ ++# ifdef __x86_64__ ++# include + + static void + TUNABLE_CALLBACK (set_plt_rewrite) (tunable_val_t *valp) +@@ -47,6 +52,15 @@ TUNABLE_CALLBACK (set_plt_rewrite) (tunable_val_t *valp) + : plt_rewrite_jmp); + } + } ++# else ++extern void _dl_tlsdesc_dynamic_fnsave (void) attribute_hidden; ++# endif ++#endif ++ ++#ifdef __x86_64__ ++extern void _dl_runtime_resolve_fxsave (void) attribute_hidden; ++extern void _dl_runtime_resolve_xsave (void) attribute_hidden; ++extern void _dl_runtime_resolve_xsavec (void) attribute_hidden; + #endif + + #ifdef __LP64__ +@@ -1130,6 +1144,44 @@ no_cpuid: + TUNABLE_CALLBACK (set_x86_shstk)); + #endif + ++ if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) ++ { ++ if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)) ++ { ++#ifdef __x86_64__ ++ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_xsavec; ++#endif ++#ifdef SHARED ++ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_xsavec; ++#endif ++ } ++ else ++ { ++#ifdef __x86_64__ ++ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_xsave; ++#endif ++#ifdef SHARED ++ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_xsave; ++#endif ++ } ++ } ++ else ++ { ++#ifdef __x86_64__ ++ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave; ++# ifdef SHARED ++ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; ++# endif ++#else ++# ifdef SHARED ++ if (CPU_FEATURE_USABLE_P (cpu_features, FXSR)) ++ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; ++ else ++ GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave; ++# endif ++#endif ++ } ++ + #ifdef SHARED + # ifdef __x86_64__ + TUNABLE_GET (plt_rewrite, tunable_val_t *, +diff --git a/sysdeps/x86/dl-procinfo.c b/sysdeps/x86/dl-procinfo.c +index ee957b4d70..5920d4b320 100644 +--- a/sysdeps/x86/dl-procinfo.c ++++ b/sysdeps/x86/dl-procinfo.c +@@ -86,3 +86,19 @@ PROCINFO_CLASS const char _dl_x86_platforms[4][9] + #else + , + #endif ++ ++#if defined SHARED && !IS_IN (ldconfig) ++# if !defined PROCINFO_DECL ++ ._dl_x86_tlsdesc_dynamic ++# else ++PROCINFO_CLASS void * _dl_x86_tlsdesc_dynamic ++# endif ++# ifndef PROCINFO_DECL ++= NULL ++# endif ++# ifdef PROCINFO_DECL ++; ++# else ++, ++# endif ++#endif +diff --git a/sysdeps/x86_64/features-offsets.sym b/sysdeps/x86/features-offsets.sym +similarity index 89% +rename from sysdeps/x86_64/features-offsets.sym +rename to sysdeps/x86/features-offsets.sym +index 9e4be3393a..77e990c705 100644 +--- a/sysdeps/x86_64/features-offsets.sym ++++ b/sysdeps/x86/features-offsets.sym +@@ -3,4 +3,6 @@ + #include + + RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET offsetof (struct rtld_global_ro, _dl_x86_cpu_features) ++#ifdef __x86_64__ + RTLD_GLOBAL_DL_X86_FEATURE_1_OFFSET offsetof (struct rtld_global, _dl_x86_feature_1) ++#endif +diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h +index 837fd28734..485cad9c02 100644 +--- a/sysdeps/x86/sysdep.h ++++ b/sysdeps/x86/sysdep.h +@@ -70,6 +70,12 @@ + | (1 << X86_XSTATE_ZMM_H_ID)) + #endif + ++/* States which should be saved for TLSDESC_CALL and TLS_DESC_CALL. ++ Compiler assumes that all registers, including x87 FPU stack registers, ++ are unchanged after CALL, except for EFLAGS and RAX/EAX. */ ++#define TLSDESC_CALL_STATE_SAVE_MASK \ ++ (STATE_SAVE_MASK | (1 << X86_XSTATE_X87_ID)) ++ + /* Constants for bits in __x86_string_control: */ + + /* Avoid short distance REP MOVSB. */ +diff --git a/sysdeps/x86/tst-gnu2-tls2.c b/sysdeps/x86/tst-gnu2-tls2.c +new file mode 100644 +index 0000000000..de900a423b +--- /dev/null ++++ b/sysdeps/x86/tst-gnu2-tls2.c +@@ -0,0 +1,20 @@ ++#ifndef __x86_64__ ++#include ++ ++#define IS_SUPPORTED() CPU_FEATURE_ACTIVE (SSE2) ++#endif ++ ++/* Clear XMM0...XMM7 */ ++#define PREPARE_MALLOC() \ ++{ \ ++ asm volatile ("xorps %%xmm0, %%xmm0" : : : "xmm0" ); \ ++ asm volatile ("xorps %%xmm1, %%xmm1" : : : "xmm1" ); \ ++ asm volatile ("xorps %%xmm2, %%xmm2" : : : "xmm2" ); \ ++ asm volatile ("xorps %%xmm3, %%xmm3" : : : "xmm3" ); \ ++ asm volatile ("xorps %%xmm4, %%xmm4" : : : "xmm4" ); \ ++ asm volatile ("xorps %%xmm5, %%xmm5" : : : "xmm5" ); \ ++ asm volatile ("xorps %%xmm6, %%xmm6" : : : "xmm6" ); \ ++ asm volatile ("xorps %%xmm7, %%xmm7" : : : "xmm7" ); \ ++} ++ ++#include +diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile +index 90f4ecfd26..e8babc9a4e 100644 +--- a/sysdeps/x86_64/Makefile ++++ b/sysdeps/x86_64/Makefile +@@ -10,7 +10,7 @@ LDFLAGS-rtld += -Wl,-z,nomark-plt + endif + + ifeq ($(subdir),csu) +-gen-as-const-headers += features-offsets.sym link-defines.sym ++gen-as-const-headers += link-defines.sym + endif + + ifeq ($(subdir),gmon) +diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h +index 6d605d0d32..ff5d45f7cb 100644 +--- a/sysdeps/x86_64/dl-machine.h ++++ b/sysdeps/x86_64/dl-machine.h +@@ -71,9 +71,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], + int lazy, int profile) + { + Elf64_Addr *got; +- extern void _dl_runtime_resolve_fxsave (ElfW(Word)) attribute_hidden; +- extern void _dl_runtime_resolve_xsave (ElfW(Word)) attribute_hidden; +- extern void _dl_runtime_resolve_xsavec (ElfW(Word)) attribute_hidden; + extern void _dl_runtime_profile_sse (ElfW(Word)) attribute_hidden; + extern void _dl_runtime_profile_avx (ElfW(Word)) attribute_hidden; + extern void _dl_runtime_profile_avx512 (ElfW(Word)) attribute_hidden; +@@ -96,8 +93,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], + /* Identify this shared object. */ + *(ElfW(Addr) *) (got + 1) = (ElfW(Addr)) l; + +- const struct cpu_features* cpu_features = __get_cpu_features (); +- + #ifdef SHARED + /* The got[2] entry contains the address of a function which gets + called to get the address of a so far unresolved function and +@@ -107,6 +102,7 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], + end in this function. */ + if (__glibc_unlikely (profile)) + { ++ const struct cpu_features* cpu_features = __get_cpu_features (); + if (X86_ISA_CPU_FEATURE_USABLE_P (cpu_features, AVX512F)) + *(ElfW(Addr) *) (got + 2) = (ElfW(Addr)) &_dl_runtime_profile_avx512; + else if (X86_ISA_CPU_FEATURE_USABLE_P (cpu_features, AVX)) +@@ -126,15 +122,8 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[], + /* This function will get called to fix up the GOT entry + indicated by the offset on the stack, and then jump to + the resolved address. */ +- if (MINIMUM_X86_ISA_LEVEL >= AVX_X86_ISA_LEVEL +- || GLRO(dl_x86_cpu_features).xsave_state_size != 0) +- *(ElfW(Addr) *) (got + 2) +- = (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC) +- ? (ElfW(Addr)) &_dl_runtime_resolve_xsavec +- : (ElfW(Addr)) &_dl_runtime_resolve_xsave); +- else +- *(ElfW(Addr) *) (got + 2) +- = (ElfW(Addr)) &_dl_runtime_resolve_fxsave; ++ *(ElfW(Addr) *) (got + 2) ++ = (ElfW(Addr)) GLRO(dl_x86_64_runtime_resolve); + } + } + +@@ -383,7 +372,7 @@ and creates an unsatisfiable circular dependency.\n", + { + td->arg = _dl_make_tlsdesc_dynamic + (sym_map, sym->st_value + reloc->r_addend); +- td->entry = _dl_tlsdesc_dynamic; ++ td->entry = GLRO(dl_x86_tlsdesc_dynamic); + } + else + # endif +diff --git a/sysdeps/x86_64/dl-procinfo.c b/sysdeps/x86_64/dl-procinfo.c +index 4d1d790fbb..06637a8154 100644 +--- a/sysdeps/x86_64/dl-procinfo.c ++++ b/sysdeps/x86_64/dl-procinfo.c +@@ -41,5 +41,21 @@ + + #include + ++#if !IS_IN (ldconfig) ++# if !defined PROCINFO_DECL && defined SHARED ++ ._dl_x86_64_runtime_resolve ++# else ++PROCINFO_CLASS void * _dl_x86_64_runtime_resolve ++# endif ++# ifndef PROCINFO_DECL ++= NULL ++# endif ++# if !defined SHARED || defined PROCINFO_DECL ++; ++# else ++, ++# endif ++#endif ++ + #undef PROCINFO_DECL + #undef PROCINFO_CLASS +diff --git a/sysdeps/x86_64/dl-tlsdesc-dynamic.h b/sysdeps/x86_64/dl-tlsdesc-dynamic.h +new file mode 100644 +index 0000000000..0c2e8d5320 +--- /dev/null ++++ b/sysdeps/x86_64/dl-tlsdesc-dynamic.h +@@ -0,0 +1,166 @@ ++/* Thread-local storage handling in the ELF dynamic linker. x86_64 version. ++ Copyright (C) 2004-2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#ifndef SECTION ++# define SECTION(p) p ++#endif ++ ++#undef REGISTER_SAVE_AREA ++#undef LOCAL_STORAGE_AREA ++#undef BASE ++ ++#include "dl-trampoline-state.h" ++ ++ .section SECTION(.text),"ax",@progbits ++ ++ .hidden _dl_tlsdesc_dynamic ++ .global _dl_tlsdesc_dynamic ++ .type _dl_tlsdesc_dynamic,@function ++ ++ /* %rax points to the TLS descriptor, such that 0(%rax) points to ++ _dl_tlsdesc_dynamic itself, and 8(%rax) points to a struct ++ tlsdesc_dynamic_arg object. It must return in %rax the offset ++ between the thread pointer and the object denoted by the ++ argument, without clobbering any registers. ++ ++ The assembly code that follows is a rendition of the following ++ C code, hand-optimized a little bit. ++ ++ptrdiff_t ++_dl_tlsdesc_dynamic (register struct tlsdesc *tdp asm ("%rax")) ++{ ++ struct tlsdesc_dynamic_arg *td = tdp->arg; ++ dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET); ++ if (__builtin_expect (td->gen_count <= dtv[0].counter ++ && (dtv[td->tlsinfo.ti_module].pointer.val ++ != TLS_DTV_UNALLOCATED), ++ 1)) ++ return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset ++ - __thread_pointer; ++ ++ return __tls_get_addr_internal (&td->tlsinfo) - __thread_pointer; ++} ++*/ ++ cfi_startproc ++ .align 16 ++_dl_tlsdesc_dynamic: ++ _CET_ENDBR ++ /* Preserve call-clobbered registers that we modify. ++ We need two scratch regs anyway. */ ++ movq %rsi, -16(%rsp) ++ mov %fs:DTV_OFFSET, %RSI_LP ++ movq %rdi, -8(%rsp) ++ movq TLSDESC_ARG(%rax), %rdi ++ movq (%rsi), %rax ++ cmpq %rax, TLSDESC_GEN_COUNT(%rdi) ++ ja 2f ++ movq TLSDESC_MODID(%rdi), %rax ++ salq $4, %rax ++ movq (%rax,%rsi), %rax ++ cmpq $-1, %rax ++ je 2f ++ addq TLSDESC_MODOFF(%rdi), %rax ++1: ++ movq -16(%rsp), %rsi ++ sub %fs:0, %RAX_LP ++ movq -8(%rsp), %rdi ++ ret ++2: ++#if DL_RUNTIME_RESOLVE_REALIGN_STACK ++ movq %rbx, -24(%rsp) ++ mov %RSP_LP, %RBX_LP ++ cfi_def_cfa_register(%rbx) ++ and $-STATE_SAVE_ALIGNMENT, %RSP_LP ++#endif ++#ifdef REGISTER_SAVE_AREA ++# if DL_RUNTIME_RESOLVE_REALIGN_STACK ++ /* STATE_SAVE_OFFSET has space for 8 integer registers. But we ++ need space for RCX, RDX, RSI, RDI, R8, R9, R10 and R11, plus ++ RBX above. */ ++ sub $(REGISTER_SAVE_AREA + STATE_SAVE_ALIGNMENT), %RSP_LP ++# else ++ sub $REGISTER_SAVE_AREA, %RSP_LP ++ cfi_adjust_cfa_offset(REGISTER_SAVE_AREA) ++# endif ++#else ++ /* Allocate stack space of the required size to save the state. */ ++ sub _rtld_local_ro+RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_SIZE_OFFSET(%rip), %RSP_LP ++#endif ++ /* Besides rdi and rsi, saved above, save rcx, rdx, r8, r9, ++ r10 and r11. */ ++ movq %rcx, REGISTER_SAVE_RCX(%rsp) ++ movq %rdx, REGISTER_SAVE_RDX(%rsp) ++ movq %r8, REGISTER_SAVE_R8(%rsp) ++ movq %r9, REGISTER_SAVE_R9(%rsp) ++ movq %r10, REGISTER_SAVE_R10(%rsp) ++ movq %r11, REGISTER_SAVE_R11(%rsp) ++#ifdef USE_FXSAVE ++ fxsave STATE_SAVE_OFFSET(%rsp) ++#else ++ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax ++ xorl %edx, %edx ++ /* Clear the XSAVE Header. */ ++# ifdef USE_XSAVE ++ movq %rdx, (STATE_SAVE_OFFSET + 512)(%rsp) ++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8)(%rsp) ++# endif ++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 2)(%rsp) ++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 3)(%rsp) ++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 4)(%rsp) ++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 5)(%rsp) ++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 6)(%rsp) ++ movq %rdx, (STATE_SAVE_OFFSET + 512 + 8 * 7)(%rsp) ++# ifdef USE_XSAVE ++ xsave STATE_SAVE_OFFSET(%rsp) ++# else ++ xsavec STATE_SAVE_OFFSET(%rsp) ++# endif ++#endif ++ /* %rdi already points to the tlsinfo data structure. */ ++ call HIDDEN_JUMPTARGET (__tls_get_addr) ++ # Get register content back. ++#ifdef USE_FXSAVE ++ fxrstor STATE_SAVE_OFFSET(%rsp) ++#else ++ /* Save and retore __tls_get_addr return value stored in RAX. */ ++ mov %RAX_LP, %RCX_LP ++ movl $TLSDESC_CALL_STATE_SAVE_MASK, %eax ++ xorl %edx, %edx ++ xrstor STATE_SAVE_OFFSET(%rsp) ++ mov %RCX_LP, %RAX_LP ++#endif ++ movq REGISTER_SAVE_R11(%rsp), %r11 ++ movq REGISTER_SAVE_R10(%rsp), %r10 ++ movq REGISTER_SAVE_R9(%rsp), %r9 ++ movq REGISTER_SAVE_R8(%rsp), %r8 ++ movq REGISTER_SAVE_RDX(%rsp), %rdx ++ movq REGISTER_SAVE_RCX(%rsp), %rcx ++#if DL_RUNTIME_RESOLVE_REALIGN_STACK ++ mov %RBX_LP, %RSP_LP ++ cfi_def_cfa_register(%rsp) ++ movq -24(%rsp), %rbx ++ cfi_restore(%rbx) ++#else ++ add $REGISTER_SAVE_AREA, %RSP_LP ++ cfi_adjust_cfa_offset(-REGISTER_SAVE_AREA) ++#endif ++ jmp 1b ++ cfi_endproc ++ .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic ++ ++#undef STATE_SAVE_ALIGNMENT +diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S +index f748af2ece..ea69f5223a 100644 +--- a/sysdeps/x86_64/dl-tlsdesc.S ++++ b/sysdeps/x86_64/dl-tlsdesc.S +@@ -18,7 +18,19 @@ + + #include + #include ++#include ++#include + #include "tlsdesc.h" ++#include "dl-trampoline-save.h" ++ ++/* Area on stack to save and restore registers used for parameter ++ passing when calling _dl_tlsdesc_dynamic. */ ++#define REGISTER_SAVE_RCX 0 ++#define REGISTER_SAVE_RDX (REGISTER_SAVE_RCX + 8) ++#define REGISTER_SAVE_R8 (REGISTER_SAVE_RDX + 8) ++#define REGISTER_SAVE_R9 (REGISTER_SAVE_R8 + 8) ++#define REGISTER_SAVE_R10 (REGISTER_SAVE_R9 + 8) ++#define REGISTER_SAVE_R11 (REGISTER_SAVE_R10 + 8) + + .text + +@@ -67,80 +79,24 @@ _dl_tlsdesc_undefweak: + .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak + + #ifdef SHARED +- .hidden _dl_tlsdesc_dynamic +- .global _dl_tlsdesc_dynamic +- .type _dl_tlsdesc_dynamic,@function +- +- /* %rax points to the TLS descriptor, such that 0(%rax) points to +- _dl_tlsdesc_dynamic itself, and 8(%rax) points to a struct +- tlsdesc_dynamic_arg object. It must return in %rax the offset +- between the thread pointer and the object denoted by the +- argument, without clobbering any registers. +- +- The assembly code that follows is a rendition of the following +- C code, hand-optimized a little bit. +- +-ptrdiff_t +-_dl_tlsdesc_dynamic (register struct tlsdesc *tdp asm ("%rax")) +-{ +- struct tlsdesc_dynamic_arg *td = tdp->arg; +- dtv_t *dtv = *(dtv_t **)((char *)__thread_pointer + DTV_OFFSET); +- if (__builtin_expect (td->gen_count <= dtv[0].counter +- && (dtv[td->tlsinfo.ti_module].pointer.val +- != TLS_DTV_UNALLOCATED), +- 1)) +- return dtv[td->tlsinfo.ti_module].pointer.val + td->tlsinfo.ti_offset +- - __thread_pointer; +- +- return __tls_get_addr_internal (&td->tlsinfo) - __thread_pointer; +-} +-*/ +- cfi_startproc +- .align 16 +-_dl_tlsdesc_dynamic: +- _CET_ENDBR +- /* Preserve call-clobbered registers that we modify. +- We need two scratch regs anyway. */ +- movq %rsi, -16(%rsp) +- mov %fs:DTV_OFFSET, %RSI_LP +- movq %rdi, -8(%rsp) +- movq TLSDESC_ARG(%rax), %rdi +- movq (%rsi), %rax +- cmpq %rax, TLSDESC_GEN_COUNT(%rdi) +- ja .Lslow +- movq TLSDESC_MODID(%rdi), %rax +- salq $4, %rax +- movq (%rax,%rsi), %rax +- cmpq $-1, %rax +- je .Lslow +- addq TLSDESC_MODOFF(%rdi), %rax +-.Lret: +- movq -16(%rsp), %rsi +- sub %fs:0, %RAX_LP +- movq -8(%rsp), %rdi +- ret +-.Lslow: +- /* Besides rdi and rsi, saved above, save rdx, rcx, r8, r9, +- r10 and r11. Also, align the stack, that's off by 8 bytes. */ +- subq $72, %rsp +- cfi_adjust_cfa_offset (72) +- movq %rdx, 8(%rsp) +- movq %rcx, 16(%rsp) +- movq %r8, 24(%rsp) +- movq %r9, 32(%rsp) +- movq %r10, 40(%rsp) +- movq %r11, 48(%rsp) +- /* %rdi already points to the tlsinfo data structure. */ +- call HIDDEN_JUMPTARGET (__tls_get_addr) +- movq 8(%rsp), %rdx +- movq 16(%rsp), %rcx +- movq 24(%rsp), %r8 +- movq 32(%rsp), %r9 +- movq 40(%rsp), %r10 +- movq 48(%rsp), %r11 +- addq $72, %rsp +- cfi_adjust_cfa_offset (-72) +- jmp .Lret +- cfi_endproc +- .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic ++# define USE_FXSAVE ++# define STATE_SAVE_ALIGNMENT 16 ++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave ++# include "dl-tlsdesc-dynamic.h" ++# undef _dl_tlsdesc_dynamic ++# undef USE_FXSAVE ++ ++# define USE_XSAVE ++# define STATE_SAVE_ALIGNMENT 64 ++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsave ++# include "dl-tlsdesc-dynamic.h" ++# undef _dl_tlsdesc_dynamic ++# undef USE_XSAVE ++ ++# define USE_XSAVEC ++# define STATE_SAVE_ALIGNMENT 64 ++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_xsavec ++# include "dl-tlsdesc-dynamic.h" ++# undef _dl_tlsdesc_dynamic ++# undef USE_XSAVEC + #endif /* SHARED */ +diff --git a/sysdeps/x86_64/dl-trampoline-save.h b/sysdeps/x86_64/dl-trampoline-save.h +new file mode 100644 +index 0000000000..84eac4a8ac +--- /dev/null ++++ b/sysdeps/x86_64/dl-trampoline-save.h +@@ -0,0 +1,34 @@ ++/* x86-64 PLT trampoline register save macros. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#ifndef DL_STACK_ALIGNMENT ++/* Due to GCC bug: ++ ++ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58066 ++ ++ __tls_get_addr may be called with 8-byte stack alignment. Although ++ this bug has been fixed in GCC 4.9.4, 5.3 and 6, we can't assume ++ that stack will be always aligned at 16 bytes. */ ++# define DL_STACK_ALIGNMENT 8 ++#endif ++ ++/* True if _dl_runtime_resolve should align stack for STATE_SAVE or align ++ stack to 16 bytes before calling _dl_fixup. */ ++#define DL_RUNTIME_RESOLVE_REALIGN_STACK \ ++ (STATE_SAVE_ALIGNMENT > DL_STACK_ALIGNMENT \ ++ || 16 > DL_STACK_ALIGNMENT) +diff --git a/sysdeps/x86_64/dl-trampoline-state.h b/sysdeps/x86_64/dl-trampoline-state.h +new file mode 100644 +index 0000000000..575f120797 +--- /dev/null ++++ b/sysdeps/x86_64/dl-trampoline-state.h +@@ -0,0 +1,51 @@ ++/* x86-64 PLT dl-trampoline state macros. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#if (STATE_SAVE_ALIGNMENT % 16) != 0 ++# error STATE_SAVE_ALIGNMENT must be multiple of 16 ++#endif ++ ++#if (STATE_SAVE_OFFSET % STATE_SAVE_ALIGNMENT) != 0 ++# error STATE_SAVE_OFFSET must be multiple of STATE_SAVE_ALIGNMENT ++#endif ++ ++#if DL_RUNTIME_RESOLVE_REALIGN_STACK ++/* Local stack area before jumping to function address: RBX. */ ++# define LOCAL_STORAGE_AREA 8 ++# define BASE rbx ++# ifdef USE_FXSAVE ++/* Use fxsave to save XMM registers. */ ++# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET) ++# if (REGISTER_SAVE_AREA % 16) != 0 ++# error REGISTER_SAVE_AREA must be multiple of 16 ++# endif ++# endif ++#else ++# ifndef USE_FXSAVE ++# error USE_FXSAVE must be defined ++# endif ++/* Use fxsave to save XMM registers. */ ++# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET + 8) ++/* Local stack area before jumping to function address: All saved ++ registers. */ ++# define LOCAL_STORAGE_AREA REGISTER_SAVE_AREA ++# define BASE rsp ++# if (REGISTER_SAVE_AREA % 16) != 8 ++# error REGISTER_SAVE_AREA must be odd multiple of 8 ++# endif ++#endif +diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S +index b2e7e0f69b..87c5137837 100644 +--- a/sysdeps/x86_64/dl-trampoline.S ++++ b/sysdeps/x86_64/dl-trampoline.S +@@ -22,25 +22,7 @@ + #include + #include + #include +- +-#ifndef DL_STACK_ALIGNMENT +-/* Due to GCC bug: +- +- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58066 +- +- __tls_get_addr may be called with 8-byte stack alignment. Although +- this bug has been fixed in GCC 4.9.4, 5.3 and 6, we can't assume +- that stack will be always aligned at 16 bytes. We use unaligned +- 16-byte move to load and store SSE registers, which has no penalty +- on modern processors if stack is 16-byte aligned. */ +-# define DL_STACK_ALIGNMENT 8 +-#endif +- +-/* True if _dl_runtime_resolve should align stack for STATE_SAVE or align +- stack to 16 bytes before calling _dl_fixup. */ +-#define DL_RUNTIME_RESOLVE_REALIGN_STACK \ +- (STATE_SAVE_ALIGNMENT > DL_STACK_ALIGNMENT \ +- || 16 > DL_STACK_ALIGNMENT) ++#include "dl-trampoline-save.h" + + /* Area on stack to save and restore registers used for parameter + passing when calling _dl_fixup. */ +diff --git a/sysdeps/x86_64/dl-trampoline.h b/sysdeps/x86_64/dl-trampoline.h +index f55c6ea040..d9ccfb40d4 100644 +--- a/sysdeps/x86_64/dl-trampoline.h ++++ b/sysdeps/x86_64/dl-trampoline.h +@@ -27,39 +27,7 @@ + # undef LOCAL_STORAGE_AREA + # undef BASE + +-# if (STATE_SAVE_ALIGNMENT % 16) != 0 +-# error STATE_SAVE_ALIGNMENT must be multiple of 16 +-# endif +- +-# if (STATE_SAVE_OFFSET % STATE_SAVE_ALIGNMENT) != 0 +-# error STATE_SAVE_OFFSET must be multiple of STATE_SAVE_ALIGNMENT +-# endif +- +-# if DL_RUNTIME_RESOLVE_REALIGN_STACK +-/* Local stack area before jumping to function address: RBX. */ +-# define LOCAL_STORAGE_AREA 8 +-# define BASE rbx +-# ifdef USE_FXSAVE +-/* Use fxsave to save XMM registers. */ +-# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET) +-# if (REGISTER_SAVE_AREA % 16) != 0 +-# error REGISTER_SAVE_AREA must be multiple of 16 +-# endif +-# endif +-# else +-# ifndef USE_FXSAVE +-# error USE_FXSAVE must be defined +-# endif +-/* Use fxsave to save XMM registers. */ +-# define REGISTER_SAVE_AREA (512 + STATE_SAVE_OFFSET + 8) +-/* Local stack area before jumping to function address: All saved +- registers. */ +-# define LOCAL_STORAGE_AREA REGISTER_SAVE_AREA +-# define BASE rsp +-# if (REGISTER_SAVE_AREA % 16) != 8 +-# error REGISTER_SAVE_AREA must be odd multiple of 8 +-# endif +-# endif ++# include "dl-trampoline-state.h" + + .globl _dl_runtime_resolve + .hidden _dl_runtime_resolve + +commit 853e915fdd6ae6c5f1a7a68d2594ec8dbfef1286 +Author: H.J. Lu +Date: Wed Feb 28 12:08:03 2024 -0800 + + x86-64: Update _dl_tlsdesc_dynamic to preserve AMX registers + + _dl_tlsdesc_dynamic should also preserve AMX registers which are + caller-saved. Add X86_XSTATE_TILECFG_ID and X86_XSTATE_TILEDATA_ID + to x86-64 TLSDESC_CALL_STATE_SAVE_MASK. Compute the AMX state size + and save it in xsave_state_full_size which is only used by + _dl_tlsdesc_dynamic_xsave and _dl_tlsdesc_dynamic_xsavec. This fixes + the AMX part of BZ #31372. Tested on AMX processor. + + AMX test is enabled only for compilers with the fix for + + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114098 + + GCC 14 and GCC 11/12/13 branches have the bug fix. + Reviewed-by: Sunil K Pandey + + (cherry picked from commit 9b7091415af47082664717210ac49d51551456ab) + +diff --git a/sysdeps/unix/sysv/linux/x86_64/Makefile b/sysdeps/unix/sysv/linux/x86_64/Makefile +index 4223feb95f..9a1e7aa646 100644 +--- a/sysdeps/unix/sysv/linux/x86_64/Makefile ++++ b/sysdeps/unix/sysv/linux/x86_64/Makefile +@@ -63,6 +63,33 @@ $(objpfx)libx86-64-isa-level%.os: $(..)/sysdeps/unix/sysv/linux/x86_64/x86-64-is + $(objpfx)libx86-64-isa-level.so: $(objpfx)libx86-64-isa-level-1.so + cp $< $@ + endif ++ ++ifeq (yes,$(have-mamx-tile)) ++tests += \ ++ tst-gnu2-tls2-amx \ ++# tests ++ ++modules-names += \ ++ tst-gnu2-tls2-amx-mod0 \ ++ tst-gnu2-tls2-amx-mod1 \ ++ tst-gnu2-tls2-amx-mod2 \ ++# modules-names ++ ++$(objpfx)tst-gnu2-tls2-amx: $(shared-thread-library) ++$(objpfx)tst-gnu2-tls2-amx.out: \ ++ $(objpfx)tst-gnu2-tls2-amx-mod0.so \ ++ $(objpfx)tst-gnu2-tls2-amx-mod1.so \ ++ $(objpfx)tst-gnu2-tls2-amx-mod2.so ++$(objpfx)tst-gnu2-tls2-amx-mod0.so: $(libsupport) ++$(objpfx)tst-gnu2-tls2-amx-mod1.so: $(libsupport) ++$(objpfx)tst-gnu2-tls2-amx-mod2.so: $(libsupport) ++ ++CFLAGS-tst-gnu2-tls2-amx.c += -mamx-tile ++CFLAGS-tst-gnu2-tls2-amx-mod0.c += -mamx-tile -mtls-dialect=gnu2 ++CFLAGS-tst-gnu2-tls2-amx-mod1.c += -mamx-tile -mtls-dialect=gnu2 ++CFLAGS-tst-gnu2-tls2-amx-mod2.c += -mamx-tile -mtls-dialect=gnu2 ++endif ++ + endif # $(subdir) == elf + + ifneq ($(enable-cet),no) +diff --git a/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h b/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h +index 2f511321ad..ef4631bf4b 100644 +--- a/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h ++++ b/sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h +@@ -20,3 +20,8 @@ + # define ARCH_SHSTK_SHSTK 0x1 + # define ARCH_SHSTK_WRSS 0x2 + #endif ++ ++#ifndef ARCH_GET_XCOMP_PERM ++# define ARCH_GET_XCOMP_PERM 0x1022 ++# define ARCH_REQ_XCOMP_PERM 0x1023 ++#endif +diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod0.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod0.c +new file mode 100644 +index 0000000000..2e0c7b91b7 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod0.c +@@ -0,0 +1,2 @@ ++#include "tst-gnu2-tls2-amx.h" ++#include +diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod1.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod1.c +new file mode 100644 +index 0000000000..b8a8ccf1c1 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod1.c +@@ -0,0 +1,2 @@ ++#include "tst-gnu2-tls2-amx.h" ++#include +diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod2.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod2.c +new file mode 100644 +index 0000000000..cdf4a8f363 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx-mod2.c +@@ -0,0 +1,2 @@ ++#include "tst-gnu2-tls2-amx.h" ++#include +diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.c b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.c +new file mode 100644 +index 0000000000..ae4dd82556 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.c +@@ -0,0 +1,83 @@ ++/* Test TLSDESC relocation with AMX. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include "tst-gnu2-tls2-amx.h" ++ ++extern int arch_prctl (int, ...); ++ ++#define X86_XSTATE_TILECFG_ID 17 ++#define X86_XSTATE_TILEDATA_ID 18 ++ ++/* Initialize tile config. */ ++__attribute__ ((noinline, noclone)) ++static void ++init_tile_config (__tilecfg *tileinfo) ++{ ++ int i; ++ tileinfo->palette_id = 1; ++ tileinfo->start_row = 0; ++ ++ tileinfo->colsb[0] = MAX_ROWS; ++ tileinfo->rows[0] = MAX_ROWS; ++ ++ for (i = 1; i < 4; ++i) ++ { ++ tileinfo->colsb[i] = MAX_COLS; ++ tileinfo->rows[i] = MAX_ROWS; ++ } ++ ++ _tile_loadconfig (tileinfo); ++} ++ ++static bool ++enable_amx (void) ++{ ++ uint64_t bitmask; ++ if (arch_prctl (ARCH_GET_XCOMP_PERM, &bitmask) != 0) ++ return false; ++ ++ if ((bitmask & (1 << X86_XSTATE_TILECFG_ID)) == 0) ++ return false; ++ ++ if (arch_prctl (ARCH_REQ_XCOMP_PERM, X86_XSTATE_TILEDATA_ID) != 0) ++ return false; ++ ++ /* Load tile configuration. */ ++ __tilecfg tile_data = { 0 }; ++ init_tile_config (&tile_data); ++ ++ return true; ++} ++ ++/* An architecture can define it to clobber caller-saved registers in ++ malloc below to verify that the implicit TLSDESC call won't change ++ caller-saved registers. */ ++static void ++clear_tile_register (void) ++{ ++ _tile_zero (2); ++} ++ ++#define MOD(i) "tst-gnu2-tls2-amx-mod" #i ".so" ++#define IS_SUPPORTED() enable_amx () ++#define PREPARE_MALLOC() clear_tile_register () ++ ++#include +diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.h b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.h +new file mode 100644 +index 0000000000..1845a3caba +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/x86_64/tst-gnu2-tls2-amx.h +@@ -0,0 +1,63 @@ ++/* Test TLSDESC relocation with AMX. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++ ++#define MAX_ROWS 16 ++#define MAX_COLS 64 ++#define MAX 1024 ++#define STRIDE 64 ++ ++typedef struct __tile_config ++{ ++ uint8_t palette_id; ++ uint8_t start_row; ++ uint8_t reserved_0[14]; ++ uint16_t colsb[16]; ++ uint8_t rows[16]; ++} __tilecfg __attribute__ ((aligned (64))); ++ ++/* Initialize int8_t buffer */ ++static inline void ++init_buffer (int8_t *buf, int8_t value) ++{ ++ int rows, colsb, i, j; ++ rows = MAX_ROWS; ++ colsb = MAX_COLS; ++ ++ for (i = 0; i < rows; i++) ++ for (j = 0; j < colsb; j++) ++ buf[i * colsb + j] = value; ++} ++ ++#define BEFORE_TLSDESC_CALL() \ ++ int8_t src[MAX]; \ ++ int8_t res[MAX]; \ ++ /* Initialize src with data */ \ ++ init_buffer (src, 2); \ ++ /* Load tile rows from memory. */ \ ++ _tile_loadd (2, src, STRIDE); ++ ++#define AFTER_TLSDESC_CALL() \ ++ /* Store the tile data to memory. */ \ ++ _tile_stored (2, res, STRIDE); \ ++ _tile_release (); \ ++ TEST_VERIFY_EXIT (memcmp (src, res, sizeof (res)) == 0); +diff --git a/sysdeps/x86/cpu-features-offsets.sym b/sysdeps/x86/cpu-features-offsets.sym +index 6a8fd29813..21fc88d651 100644 +--- a/sysdeps/x86/cpu-features-offsets.sym ++++ b/sysdeps/x86/cpu-features-offsets.sym +@@ -3,3 +3,4 @@ + #include + + XSAVE_STATE_SIZE_OFFSET offsetof (struct cpu_features, xsave_state_size) ++XSAVE_STATE_FULL_SIZE_OFFSET offsetof (struct cpu_features, xsave_state_full_size) +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index 835113b42f..d71e8d3d2e 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -307,6 +307,8 @@ update_active (struct cpu_features *cpu_features) + __cpuid_count (0xd, 0, eax, ebx, ecx, edx); + if (ebx != 0) + { ++ /* NB: On AMX capable processors, ebx always includes AMX ++ states. */ + unsigned int xsave_state_full_size + = ALIGN_UP (ebx + STATE_SAVE_OFFSET, 64); + +@@ -320,6 +322,11 @@ update_active (struct cpu_features *cpu_features) + { + unsigned int xstate_comp_offsets[32]; + unsigned int xstate_comp_sizes[32]; ++#ifdef __x86_64__ ++ unsigned int xstate_amx_comp_offsets[32]; ++ unsigned int xstate_amx_comp_sizes[32]; ++ unsigned int amx_ecx; ++#endif + unsigned int i; + + xstate_comp_offsets[0] = 0; +@@ -327,16 +334,39 @@ update_active (struct cpu_features *cpu_features) + xstate_comp_offsets[2] = 576; + xstate_comp_sizes[0] = 160; + xstate_comp_sizes[1] = 256; ++#ifdef __x86_64__ ++ xstate_amx_comp_offsets[0] = 0; ++ xstate_amx_comp_offsets[1] = 160; ++ xstate_amx_comp_offsets[2] = 576; ++ xstate_amx_comp_sizes[0] = 160; ++ xstate_amx_comp_sizes[1] = 256; ++#endif + + for (i = 2; i < 32; i++) + { +- if ((STATE_SAVE_MASK & (1 << i)) != 0) ++ if ((FULL_STATE_SAVE_MASK & (1 << i)) != 0) + { + __cpuid_count (0xd, i, eax, ebx, ecx, edx); +- xstate_comp_sizes[i] = eax; ++#ifdef __x86_64__ ++ /* Include this in xsave_state_full_size. */ ++ amx_ecx = ecx; ++ xstate_amx_comp_sizes[i] = eax; ++ if ((AMX_STATE_SAVE_MASK & (1 << i)) != 0) ++ { ++ /* Exclude this from xsave_state_size. */ ++ ecx = 0; ++ xstate_comp_sizes[i] = 0; ++ } ++ else ++#endif ++ xstate_comp_sizes[i] = eax; + } + else + { ++#ifdef __x86_64__ ++ amx_ecx = 0; ++ xstate_amx_comp_sizes[i] = 0; ++#endif + ecx = 0; + xstate_comp_sizes[i] = 0; + } +@@ -349,6 +379,15 @@ update_active (struct cpu_features *cpu_features) + if ((ecx & (1 << 1)) != 0) + xstate_comp_offsets[i] + = ALIGN_UP (xstate_comp_offsets[i], 64); ++#ifdef __x86_64__ ++ xstate_amx_comp_offsets[i] ++ = (xstate_amx_comp_offsets[i - 1] ++ + xstate_amx_comp_sizes[i - 1]); ++ if ((amx_ecx & (1 << 1)) != 0) ++ xstate_amx_comp_offsets[i] ++ = ALIGN_UP (xstate_amx_comp_offsets[i], ++ 64); ++#endif + } + } + +@@ -357,6 +396,18 @@ update_active (struct cpu_features *cpu_features) + = xstate_comp_offsets[31] + xstate_comp_sizes[31]; + if (size) + { ++#ifdef __x86_64__ ++ unsigned int amx_size ++ = (xstate_amx_comp_offsets[31] ++ + xstate_amx_comp_sizes[31]); ++ amx_size = ALIGN_UP (amx_size + STATE_SAVE_OFFSET, ++ 64); ++ /* Set xsave_state_full_size to the compact AMX ++ state size for XSAVEC. NB: xsave_state_full_size ++ is only used in _dl_tlsdesc_dynamic_xsave and ++ _dl_tlsdesc_dynamic_xsavec. */ ++ cpu_features->xsave_state_full_size = amx_size; ++#endif + cpu_features->xsave_state_size + = ALIGN_UP (size + STATE_SAVE_OFFSET, 64); + CPU_FEATURE_SET (cpu_features, XSAVEC); +diff --git a/sysdeps/x86/include/cpu-features.h b/sysdeps/x86/include/cpu-features.h +index b9bf3115b6..cd7bd27cf3 100644 +--- a/sysdeps/x86/include/cpu-features.h ++++ b/sysdeps/x86/include/cpu-features.h +@@ -934,6 +934,8 @@ struct cpu_features + /* The full state size for XSAVE when XSAVEC is disabled by + + GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC ++ ++ and the AMX state size when XSAVEC is available. + */ + unsigned int xsave_state_full_size; + /* Data cache size for use in memory and string routines, typically +diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h +index 485cad9c02..db8e576e91 100644 +--- a/sysdeps/x86/sysdep.h ++++ b/sysdeps/x86/sysdep.h +@@ -56,6 +56,14 @@ + | (1 << X86_XSTATE_ZMM_H_ID) \ + | (1 << X86_XSTATE_ZMM_ID) \ + | (1 << X86_XSTATE_APX_F_ID)) ++ ++/* AMX state mask. */ ++# define AMX_STATE_SAVE_MASK \ ++ ((1 << X86_XSTATE_TILECFG_ID) | (1 << X86_XSTATE_TILEDATA_ID)) ++ ++/* States to be included in xsave_state_full_size. */ ++# define FULL_STATE_SAVE_MASK \ ++ (STATE_SAVE_MASK | AMX_STATE_SAVE_MASK) + #else + /* Offset for fxsave/xsave area used by _dl_tlsdesc_dynamic. Since i386 + doesn't have red-zone, use 0 here. */ +@@ -68,13 +76,17 @@ + | (1 << X86_XSTATE_BNDREGS_ID) \ + | (1 << X86_XSTATE_K_ID) \ + | (1 << X86_XSTATE_ZMM_H_ID)) ++ ++/* States to be included in xsave_state_size. */ ++# define FULL_STATE_SAVE_MASK STATE_SAVE_MASK + #endif + + /* States which should be saved for TLSDESC_CALL and TLS_DESC_CALL. +- Compiler assumes that all registers, including x87 FPU stack registers, +- are unchanged after CALL, except for EFLAGS and RAX/EAX. */ ++ Compiler assumes that all registers, including AMX and x87 FPU ++ stack registers, are unchanged after CALL, except for EFLAGS and ++ RAX/EAX. */ + #define TLSDESC_CALL_STATE_SAVE_MASK \ +- (STATE_SAVE_MASK | (1 << X86_XSTATE_X87_ID)) ++ (FULL_STATE_SAVE_MASK | (1 << X86_XSTATE_X87_ID)) + + /* Constants for bits in __x86_string_control: */ + +diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure +index 418cc4a9b8..04a534fa12 100755 +--- a/sysdeps/x86_64/configure ++++ b/sysdeps/x86_64/configure +@@ -134,6 +134,34 @@ fi + config_vars="$config_vars + enable-cet = $enable_cet" + ++# Check if -mamx-tile works properly. ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -mamx-tile works properly" >&5 ++printf %s "checking whether -mamx-tile works properly... " >&6; } ++if test ${libc_cv_x86_have_amx_tile+y} ++then : ++ printf %s "(cached) " >&6 ++else $as_nop ++ cat > conftest.c < ++EOF ++ libc_cv_x86_have_amx_tile=no ++ if { ac_try='${CC-cc} -E $CFLAGS -mamx-tile conftest.c > conftest.i' ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ if grep -q __builtin_ia32_ldtilecfg conftest.i; then ++ libc_cv_x86_have_amx_tile=yes ++ fi ++ fi ++ rm -rf conftest* ++fi ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_x86_have_amx_tile" >&5 ++printf "%s\n" "$libc_cv_x86_have_amx_tile" >&6; } ++config_vars="$config_vars ++have-mamx-tile = $libc_cv_x86_have_amx_tile" ++ + test -n "$critic_missing" && as_fn_error $? " + *** $critic_missing" "$LINENO" 5 + +diff --git a/sysdeps/x86_64/configure.ac b/sysdeps/x86_64/configure.ac +index d1f803c02e..c714c47351 100644 +--- a/sysdeps/x86_64/configure.ac ++++ b/sysdeps/x86_64/configure.ac +@@ -61,5 +61,20 @@ elif test $enable_cet = permissive; then + fi + LIBC_CONFIG_VAR([enable-cet], [$enable_cet]) + ++# Check if -mamx-tile works properly. ++AC_CACHE_CHECK(whether -mamx-tile works properly, ++ libc_cv_x86_have_amx_tile, [dnl ++cat > conftest.c < ++EOF ++ libc_cv_x86_have_amx_tile=no ++ if AC_TRY_COMMAND(${CC-cc} -E $CFLAGS -mamx-tile conftest.c > conftest.i); then ++ if grep -q __builtin_ia32_ldtilecfg conftest.i; then ++ libc_cv_x86_have_amx_tile=yes ++ fi ++ fi ++ rm -rf conftest*]) ++LIBC_CONFIG_VAR([have-mamx-tile], [$libc_cv_x86_have_amx_tile]) ++ + test -n "$critic_missing" && AC_MSG_ERROR([ + *** $critic_missing]) +diff --git a/sysdeps/x86_64/dl-tlsdesc-dynamic.h b/sysdeps/x86_64/dl-tlsdesc-dynamic.h +index 0c2e8d5320..9f02cfc3eb 100644 +--- a/sysdeps/x86_64/dl-tlsdesc-dynamic.h ++++ b/sysdeps/x86_64/dl-tlsdesc-dynamic.h +@@ -99,7 +99,7 @@ _dl_tlsdesc_dynamic: + # endif + #else + /* Allocate stack space of the required size to save the state. */ +- sub _rtld_local_ro+RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_SIZE_OFFSET(%rip), %RSP_LP ++ sub _rtld_local_ro+RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET+XSAVE_STATE_FULL_SIZE_OFFSET(%rip), %RSP_LP + #endif + /* Besides rdi and rsi, saved above, save rcx, rdx, r8, r9, + r10 and r11. */ + +commit 354cabcb2634abe16da7a2ba5e648aac1204b58e +Author: H.J. Lu +Date: Mon Mar 18 06:40:16 2024 -0700 + + x86-64: Allocate state buffer space for RDI, RSI and RBX + + _dl_tlsdesc_dynamic preserves RDI, RSI and RBX before realigning stack. + After realigning stack, it saves RCX, RDX, R8, R9, R10 and R11. Define + TLSDESC_CALL_REGISTER_SAVE_AREA to allocate space for RDI, RSI and RBX + to avoid clobbering saved RDI, RSI and RBX values on stack by xsave to + STATE_SAVE_OFFSET(%rsp). + + +==================+<- stack frame start aligned at 8 or 16 bytes + | |<- RDI saved in the red zone + | |<- RSI saved in the red zone + | |<- RBX saved in the red zone + | |<- paddings for stack realignment of 64 bytes + |------------------|<- xsave buffer end aligned at 64 bytes + | |<- + | |<- + | |<- + |------------------|<- xsave buffer start at STATE_SAVE_OFFSET(%rsp) + | |<- 8-byte padding for 64-byte alignment + | |<- 8-byte padding for 64-byte alignment + | |<- R11 + | |<- R10 + | |<- R9 + | |<- R8 + | |<- RDX + | |<- RCX + +==================+<- RSP aligned at 64 bytes + + Define TLSDESC_CALL_REGISTER_SAVE_AREA, the total register save area size + for all integer registers by adding 24 to STATE_SAVE_OFFSET since RDI, RSI + and RBX are saved onto stack without adjusting stack pointer first, using + the red-zone. This fixes BZ #31501. + Reviewed-by: Sunil K Pandey + + (cherry picked from commit 717ebfa85c8240d32d0d19d86a484c31c55c9617) + +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index d71e8d3d2e..6fe1b728c6 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -310,7 +310,7 @@ update_active (struct cpu_features *cpu_features) + /* NB: On AMX capable processors, ebx always includes AMX + states. */ + unsigned int xsave_state_full_size +- = ALIGN_UP (ebx + STATE_SAVE_OFFSET, 64); ++ = ALIGN_UP (ebx + TLSDESC_CALL_REGISTER_SAVE_AREA, 64); + + cpu_features->xsave_state_size + = xsave_state_full_size; +@@ -400,8 +400,10 @@ update_active (struct cpu_features *cpu_features) + unsigned int amx_size + = (xstate_amx_comp_offsets[31] + + xstate_amx_comp_sizes[31]); +- amx_size = ALIGN_UP (amx_size + STATE_SAVE_OFFSET, +- 64); ++ amx_size ++ = ALIGN_UP ((amx_size ++ + TLSDESC_CALL_REGISTER_SAVE_AREA), ++ 64); + /* Set xsave_state_full_size to the compact AMX + state size for XSAVEC. NB: xsave_state_full_size + is only used in _dl_tlsdesc_dynamic_xsave and +@@ -409,7 +411,8 @@ update_active (struct cpu_features *cpu_features) + cpu_features->xsave_state_full_size = amx_size; + #endif + cpu_features->xsave_state_size +- = ALIGN_UP (size + STATE_SAVE_OFFSET, 64); ++ = ALIGN_UP (size + TLSDESC_CALL_REGISTER_SAVE_AREA, ++ 64); + CPU_FEATURE_SET (cpu_features, XSAVEC); + } + } +diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h +index db8e576e91..7359149e17 100644 +--- a/sysdeps/x86/sysdep.h ++++ b/sysdeps/x86/sysdep.h +@@ -38,14 +38,59 @@ + #ifdef __x86_64__ + /* Offset for fxsave/xsave area used by _dl_runtime_resolve. Also need + space to preserve RCX, RDX, RSI, RDI, R8, R9 and RAX. It must be +- aligned to 16 bytes for fxsave and 64 bytes for xsave. +- +- NB: Is is non-zero because of the 128-byte red-zone. Some registers +- are saved on stack without adjusting stack pointer first. When we +- update stack pointer to allocate more space, we need to take the +- red-zone into account. */ ++ aligned to 16 bytes for fxsave and 64 bytes for xsave. It is non-zero ++ because MOV, instead of PUSH, is used to save registers onto stack. ++ ++ +==================+<- stack frame start aligned at 8 or 16 bytes ++ | |<- paddings for stack realignment of 64 bytes ++ |------------------|<- xsave buffer end aligned at 64 bytes ++ | |<- ++ | |<- ++ | |<- ++ |------------------|<- xsave buffer start at STATE_SAVE_OFFSET(%rsp) ++ | |<- 8-byte padding for 64-byte alignment ++ | |<- R9 ++ | |<- R8 ++ | |<- RDI ++ | |<- RSI ++ | |<- RDX ++ | |<- RCX ++ | |<- RAX ++ +==================+<- RSP aligned at 64 bytes ++ ++ */ + # define STATE_SAVE_OFFSET (8 * 7 + 8) + ++/* _dl_tlsdesc_dynamic preserves RDI, RSI and RBX before realigning ++ stack. After realigning stack, it saves RCX, RDX, R8, R9, R10 and ++ R11. Allocate space for RDI, RSI and RBX to avoid clobbering saved ++ RDI, RSI and RBX values on stack by xsave. ++ ++ +==================+<- stack frame start aligned at 8 or 16 bytes ++ | |<- RDI saved in the red zone ++ | |<- RSI saved in the red zone ++ | |<- RBX saved in the red zone ++ | |<- paddings for stack realignment of 64 bytes ++ |------------------|<- xsave buffer end aligned at 64 bytes ++ | |<- ++ | |<- ++ | |<- ++ |------------------|<- xsave buffer start at STATE_SAVE_OFFSET(%rsp) ++ | |<- 8-byte padding for 64-byte alignment ++ | |<- 8-byte padding for 64-byte alignment ++ | |<- R11 ++ | |<- R10 ++ | |<- R9 ++ | |<- R8 ++ | |<- RDX ++ | |<- RCX ++ +==================+<- RSP aligned at 64 bytes ++ ++ Define the total register save area size for all integer registers by ++ adding 24 to STATE_SAVE_OFFSET since RDI, RSI and RBX are saved onto ++ stack without adjusting stack pointer first, using the red-zone. */ ++# define TLSDESC_CALL_REGISTER_SAVE_AREA (STATE_SAVE_OFFSET + 24) ++ + /* Save SSE, AVX, AVX512, mask, bound and APX registers. Bound and APX + registers are mutually exclusive. */ + # define STATE_SAVE_MASK \ +@@ -66,8 +111,9 @@ + (STATE_SAVE_MASK | AMX_STATE_SAVE_MASK) + #else + /* Offset for fxsave/xsave area used by _dl_tlsdesc_dynamic. Since i386 +- doesn't have red-zone, use 0 here. */ ++ uses PUSH to save registers onto stack, use 0 here. */ + # define STATE_SAVE_OFFSET 0 ++# define TLSDESC_CALL_REGISTER_SAVE_AREA 0 + + /* Save SSE, AVX, AXV512, mask and bound registers. */ + # define STATE_SAVE_MASK \ +diff --git a/sysdeps/x86_64/tst-gnu2-tls2mod1.S b/sysdeps/x86_64/tst-gnu2-tls2mod1.S +new file mode 100644 +index 0000000000..1d636669ba +--- /dev/null ++++ b/sysdeps/x86_64/tst-gnu2-tls2mod1.S +@@ -0,0 +1,87 @@ ++/* Check if TLSDESC relocation preserves %rdi, %rsi and %rbx. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++/* On AVX512 machines, OFFSET == 40 caused _dl_tlsdesc_dynamic_xsavec ++ to clobber %rdi, %rsi and %rbx. On Intel AVX CPUs, the state size ++ is 960 bytes and this test didn't fail. It may be due to the unused ++ last 128 bytes. On AMD AVX CPUs, the state size is 832 bytes and ++ this test might fail without the fix. */ ++#ifndef OFFSET ++# define OFFSET 40 ++#endif ++ ++ .text ++ .p2align 4 ++ .globl apply_tls ++ .type apply_tls, @function ++apply_tls: ++ cfi_startproc ++ _CET_ENDBR ++ pushq %rbp ++ cfi_def_cfa_offset (16) ++ cfi_offset (6, -16) ++ movdqu (%RDI_LP), %xmm0 ++ lea tls_var1@TLSDESC(%rip), %RAX_LP ++ mov %RSP_LP, %RBP_LP ++ cfi_def_cfa_register (6) ++ /* Align stack to 64 bytes. */ ++ and $-64, %RSP_LP ++ sub $OFFSET, %RSP_LP ++ pushq %rbx ++ /* Set %ebx to 0xbadbeef. */ ++ movl $0xbadbeef, %ebx ++ movl $0xbadbeef, %esi ++ movq %rdi, saved_rdi(%rip) ++ movq %rsi, saved_rsi(%rip) ++ call *tls_var1@TLSCALL(%RAX_LP) ++ /* Check if _dl_tlsdesc_dynamic preserves %rdi, %rsi and %rbx. */ ++ cmpq saved_rdi(%rip), %rdi ++ jne L(hlt) ++ cmpq saved_rsi(%rip), %rsi ++ jne L(hlt) ++ cmpl $0xbadbeef, %ebx ++ jne L(hlt) ++ add %fs:0, %RAX_LP ++ movups %xmm0, 32(%RAX_LP) ++ movdqu 16(%RDI_LP), %xmm1 ++ mov %RAX_LP, %RBX_LP ++ movups %xmm1, 48(%RAX_LP) ++ lea 32(%RBX_LP), %RAX_LP ++ pop %rbx ++ leave ++ cfi_def_cfa (7, 8) ++ ret ++L(hlt): ++ hlt ++ cfi_endproc ++ .size apply_tls, .-apply_tls ++ .hidden tls_var1 ++ .globl tls_var1 ++ .section .tbss,"awT",@nobits ++ .align 16 ++ .type tls_var1, @object ++ .size tls_var1, 3200 ++tls_var1: ++ .zero 3200 ++ .local saved_rdi ++ .comm saved_rdi,8,8 ++ .local saved_rsi ++ .comm saved_rsi,8,8 ++ .section .note.GNU-stack,"",@progbits + +commit 15aebdbada54098787715448c94701f17033fc92 +Author: Adhemerval Zanella +Date: Tue Mar 12 13:21:18 2024 -0300 + + Ignore undefined symbols for -mtls-dialect=gnu2 + + So it does not fail for arm config that defaults to -mtp=soft (which + issues a call to __aeabi_read_tp). + Reviewed-by: H.J. Lu + + (cherry picked from commit 968b0ca9440040a2b31248a572891f0e55c1ab10) + +diff --git a/configure b/configure +index 59ff1e415d..117b48a421 100755 +--- a/configure ++++ b/configure +@@ -7020,7 +7020,7 @@ void foo (void) + } + EOF + if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nostartfiles +- conftest.c -o conftest 1>&5' ++ -shared conftest.c -o conftest 1>&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +diff --git a/configure.ac b/configure.ac +index 65799e5685..19b88a47a5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1297,7 +1297,7 @@ void foo (void) + } + EOF + if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nostartfiles +- conftest.c -o conftest 1>&AS_MESSAGE_LOG_FD]) ++ -shared conftest.c -o conftest 1>&AS_MESSAGE_LOG_FD]) + then + libc_cv_mtls_dialect_gnu2=yes + else + +commit a8ba52bde58c69f2b31da62ad2311f119adf6cb9 +Author: Adhemerval Zanella +Date: Tue Mar 12 13:21:19 2024 -0300 + + arm: Update _dl_tlsdesc_dynamic to preserve caller-saved registers (BZ 31372) + + ARM _dl_tlsdesc_dynamic slow path has two issues: + + * The ip/r12 is defined by AAPCS as a scratch register, and gcc is + used to save the stack pointer before on some function calls. So it + should also be saved/restored as well. It fixes the tst-gnu2-tls2. + + * None of the possible VFP registers are saved/restored. ARM has the + additional complexity to have different VFP bank sizes (depending of + VFP support by the chip). + + The tst-gnu2-tls2 test is extended to check for VFP registers, although + only for hardfp builds. Different than setcontext, _dl_tlsdesc_dynamic + does not have HWCAP_ARM_IWMMXT (I don't have a way to properly test + it and it is almost a decade since newer hardware was released). + + With this patch there is no need to mark tst-gnu2-tls2 as XFAIL. + + Checked on arm-linux-gnueabihf. + Reviewed-by: H.J. Lu + + (cherry picked from commit 64c7e344289ed085517c2227d8e3b06388242c13) + +diff --git a/config.h.in b/config.h.in +index 44a34072a4..4d33c63a84 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -141,6 +141,9 @@ + /* LOONGARCH floating-point ABI for ld.so. */ + #undef LOONGARCH_ABI_FRLEN + ++/* Define whether ARM used hard-float and support VFPvX-D32. */ ++#undef HAVE_ARM_PCS_VFP_D32 ++ + /* Linux specific: minimum supported kernel version. */ + #undef __LINUX_KERNEL_VERSION + +diff --git a/elf/Makefile b/elf/Makefile +index c5c37a9147..030db4d207 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -3056,10 +3056,6 @@ $(objpfx)tst-gnu2-tls2.out: \ + $(objpfx)tst-gnu2-tls2mod2.so + + ifeq (yes,$(have-mtls-dialect-gnu2)) +-# This test fails if dl_tlsdesc_dynamic doesn't preserve all caller-saved +-# registers. See https://sourceware.org/bugzilla/show_bug.cgi?id=31372 +-test-xfail-tst-gnu2-tls2 = yes +- + CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=gnu2 + CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=gnu2 + CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=gnu2 +diff --git a/elf/tst-gnu2-tls2.h b/elf/tst-gnu2-tls2.h +index 77964a57a3..1ade8151e2 100644 +--- a/elf/tst-gnu2-tls2.h ++++ b/elf/tst-gnu2-tls2.h +@@ -27,6 +27,10 @@ extern struct tls *apply_tls (struct tls *); + + /* An architecture can define them to verify that clobber caller-saved + registers aren't changed by the implicit TLSDESC call. */ ++#ifndef INIT_TLSDESC_CALL ++# define INIT_TLSDESC_CALL() ++#endif ++ + #ifndef BEFORE_TLSDESC_CALL + # define BEFORE_TLSDESC_CALL() + #endif +diff --git a/elf/tst-gnu2-tls2mod0.c b/elf/tst-gnu2-tls2mod0.c +index 45556a0e17..3fe3c14277 100644 +--- a/elf/tst-gnu2-tls2mod0.c ++++ b/elf/tst-gnu2-tls2mod0.c +@@ -16,13 +16,14 @@ + License along with the GNU C Library; if not, see + . */ + +-#include "tst-gnu2-tls2.h" ++#include + + __thread struct tls tls_var0 __attribute__ ((visibility ("hidden"))); + + struct tls * + apply_tls (struct tls *p) + { ++ INIT_TLSDESC_CALL (); + BEFORE_TLSDESC_CALL (); + tls_var0 = *p; + struct tls *ret = &tls_var0; +diff --git a/elf/tst-gnu2-tls2mod1.c b/elf/tst-gnu2-tls2mod1.c +index e10b9dbc0a..e210538468 100644 +--- a/elf/tst-gnu2-tls2mod1.c ++++ b/elf/tst-gnu2-tls2mod1.c +@@ -16,13 +16,14 @@ + License along with the GNU C Library; if not, see + . */ + +-#include "tst-gnu2-tls2.h" ++#include + + __thread struct tls tls_var1[100] __attribute__ ((visibility ("hidden"))); + + struct tls * + apply_tls (struct tls *p) + { ++ INIT_TLSDESC_CALL (); + BEFORE_TLSDESC_CALL (); + tls_var1[1] = *p; + struct tls *ret = &tls_var1[1]; +diff --git a/elf/tst-gnu2-tls2mod2.c b/elf/tst-gnu2-tls2mod2.c +index 141af51e55..6d3031dc5f 100644 +--- a/elf/tst-gnu2-tls2mod2.c ++++ b/elf/tst-gnu2-tls2mod2.c +@@ -16,13 +16,14 @@ + License along with the GNU C Library; if not, see + . */ + +-#include "tst-gnu2-tls2.h" ++#include + + __thread struct tls tls_var2 __attribute__ ((visibility ("hidden"))); + + struct tls * + apply_tls (struct tls *p) + { ++ INIT_TLSDESC_CALL (); + BEFORE_TLSDESC_CALL (); + tls_var2 = *p; + struct tls *ret = &tls_var2; +diff --git a/sysdeps/arm/configure b/sysdeps/arm/configure +index 35e2918922..4ef4d46cbd 100644 +--- a/sysdeps/arm/configure ++++ b/sysdeps/arm/configure +@@ -187,6 +187,38 @@ else + default-abi = soft" + fi + ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether VFP supports 32 registers" >&5 ++printf %s "checking whether VFP supports 32 registers... " >&6; } ++if test ${libc_cv_arm_pcs_vfp_d32+y} ++then : ++ printf %s "(cached) " >&6 ++else $as_nop ++ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++void foo (void) ++{ ++ asm volatile ("vldr d16,=17" : : : "d16"); ++} ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO" ++then : ++ libc_cv_arm_pcs_vfp_d32=yes ++else $as_nop ++ libc_cv_arm_pcs_vfp_d32=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_arm_pcs_vfp_d32" >&5 ++printf "%s\n" "$libc_cv_arm_pcs_vfp_d32" >&6; } ++if test "$libc_cv_arm_pcs_vfp_d32" = yes ; ++then ++ printf "%s\n" "#define HAVE_ARM_PCS_VFP_D32 1" >>confdefs.h ++ ++fi ++ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether PC-relative relocs in movw/movt work properly" >&5 + printf %s "checking whether PC-relative relocs in movw/movt work properly... " >&6; } + if test ${libc_cv_arm_pcrel_movw+y} +diff --git a/sysdeps/arm/configure.ac b/sysdeps/arm/configure.ac +index 5172e30bbe..cd00ddc9d9 100644 +--- a/sysdeps/arm/configure.ac ++++ b/sysdeps/arm/configure.ac +@@ -21,6 +21,21 @@ else + LIBC_CONFIG_VAR([default-abi], [soft]) + fi + ++AC_CACHE_CHECK([whether VFP supports 32 registers], ++ libc_cv_arm_pcs_vfp_d32, [ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++void foo (void) ++{ ++ asm volatile ("vldr d16,=17" : : : "d16"); ++} ++]])], ++ [libc_cv_arm_pcs_vfp_d32=yes], ++ [libc_cv_arm_pcs_vfp_d32=no])]) ++if test "$libc_cv_arm_pcs_vfp_d32" = yes ; ++then ++ AC_DEFINE(HAVE_ARM_PCS_VFP_D32) ++fi ++ + AC_CACHE_CHECK([whether PC-relative relocs in movw/movt work properly], + libc_cv_arm_pcrel_movw, [ + cat > conftest.s <<\EOF +diff --git a/sysdeps/arm/dl-tlsdesc.S b/sysdeps/arm/dl-tlsdesc.S +index 764c56e70f..ada106521d 100644 +--- a/sysdeps/arm/dl-tlsdesc.S ++++ b/sysdeps/arm/dl-tlsdesc.S +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include "tlsdesc.h" + + .text +@@ -83,14 +84,20 @@ _dl_tlsdesc_dynamic(struct tlsdesc *tdp) + .align 2 + _dl_tlsdesc_dynamic: + /* Our calling convention is to clobber r0, r1 and the processor +- flags. All others that are modified must be saved */ +- eabi_save ({r2,r3,r4,lr}) +- push {r2,r3,r4,lr} +- cfi_adjust_cfa_offset (16) ++ flags. All others that are modified must be saved. r5 is ++ used as the hwcap value to avoid reload after __tls_get_addr ++ call. If required we will save the vector register on the slow ++ path. */ ++ eabi_save ({r2,r3,r4,r5,ip,lr}) ++ push {r2,r3,r4,r5,ip,lr} ++ cfi_adjust_cfa_offset (24) + cfi_rel_offset (r2,0) + cfi_rel_offset (r3,4) + cfi_rel_offset (r4,8) +- cfi_rel_offset (lr,12) ++ cfi_rel_offset (r5,12) ++ cfi_rel_offset (ip,16) ++ cfi_rel_offset (lr,20) ++ + ldr r1, [r0] /* td */ + GET_TLS (lr) + mov r4, r0 /* r4 = tp */ +@@ -113,22 +120,69 @@ _dl_tlsdesc_dynamic: + rsbne r0, r4, r3 + bne 2f + 1: mov r0, r1 ++ ++ /* Load the hwcap to check for vector support. */ ++ ldr r2, 3f ++ ldr r1, .Lrtld_global_ro ++0: add r2, pc, r2 ++ ldr r2, [r2, r1] ++ ldr r5, [r2, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET] ++ ++#ifdef __SOFTFP__ ++ tst r5, #HWCAP_ARM_VFP ++ beq .Lno_vfp ++#endif ++ ++ /* Store the VFP registers. Don't use VFP instructions directly ++ because this code is used in non-VFP multilibs. */ ++#define VFP_STACK_REQ (32*8 + 8) ++ sub sp, sp, VFP_STACK_REQ ++ cfi_adjust_cfa_offset (VFP_STACK_REQ) ++ mov r3, sp ++ .inst 0xeca30b20 /* vstmia r3!, {d0-d15} */ ++ tst r5, #HWCAP_ARM_VFPD32 ++ beq 4f ++ .inst 0xece30b20 /* vstmia r3!, {d16-d31} */ ++ /* Store the floating-point status register. */ ++4: .inst 0xeef12a10 /* vmrs r2, fpscr */ ++ str r2, [r3] ++.Lno_vfp: + bl __tls_get_addr + rsb r0, r4, r0 ++#ifdef __SOFTFP__ ++ tst r5, #HWCAP_ARM_VFP ++ beq 2f ++#endif ++ mov r3, sp ++ .inst 0xecb30b20 /* vldmia r3!, {d0-d15} */ ++ tst r5, #HWCAP_ARM_VFPD32 ++ beq 5f ++ .inst 0xecf30b20 /* vldmia r3!, {d16-d31} */ ++ ldr r4, [r3] ++5: .inst 0xeee14a10 /* vmsr fpscr, r4 */ ++ add sp, sp, VFP_STACK_REQ ++ cfi_adjust_cfa_offset (-VFP_STACK_REQ) ++ + 2: + #if ((defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__)) \ + || defined (ARM_ALWAYS_BX)) +- pop {r2,r3,r4, lr} +- cfi_adjust_cfa_offset (-16) ++ pop {r2,r3,r4,r5,ip, lr} ++ cfi_adjust_cfa_offset (-20) + cfi_restore (lr) ++ cfi_restore (ip) ++ cfi_restore (r5) + cfi_restore (r4) + cfi_restore (r3) + cfi_restore (r2) + bx lr + #else +- pop {r2,r3,r4, pc} ++ pop {r2,r3,r4,r5,ip, pc} + #endif + eabi_fnend + cfi_endproc + .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic ++ ++3: .long _GLOBAL_OFFSET_TABLE_ - 0b - PC_OFS ++.Lrtld_global_ro: ++ .long C_SYMBOL_NAME(_rtld_global_ro)(GOT) + #endif /* SHARED */ +diff --git a/sysdeps/arm/tst-gnu2-tls2.h b/sysdeps/arm/tst-gnu2-tls2.h +new file mode 100644 +index 0000000000..e413ac21fb +--- /dev/null ++++ b/sysdeps/arm/tst-gnu2-tls2.h +@@ -0,0 +1,128 @@ ++/* Test TLSDESC relocation. ARM version. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#ifndef __SOFTFP__ ++ ++# ifdef HAVE_ARM_PCS_VFP_D32 ++# define SAVE_VFP_D32 \ ++ asm volatile ("vldr d16,=17" : : : "d16"); \ ++ asm volatile ("vldr d17,=18" : : : "d17"); \ ++ asm volatile ("vldr d18,=19" : : : "d18"); \ ++ asm volatile ("vldr d19,=20" : : : "d19"); \ ++ asm volatile ("vldr d20,=21" : : : "d20"); \ ++ asm volatile ("vldr d21,=22" : : : "d21"); \ ++ asm volatile ("vldr d22,=23" : : : "d22"); \ ++ asm volatile ("vldr d23,=24" : : : "d23"); \ ++ asm volatile ("vldr d24,=25" : : : "d24"); \ ++ asm volatile ("vldr d25,=26" : : : "d25"); \ ++ asm volatile ("vldr d26,=27" : : : "d26"); \ ++ asm volatile ("vldr d27,=28" : : : "d27"); \ ++ asm volatile ("vldr d28,=29" : : : "d28"); \ ++ asm volatile ("vldr d29,=30" : : : "d29"); \ ++ asm volatile ("vldr d30,=31" : : : "d30"); \ ++ asm volatile ("vldr d31,=32" : : : "d31"); ++# else ++# define SAVE_VFP_D32 ++# endif ++ ++# define INIT_TLSDESC_CALL() \ ++ unsigned long hwcap = getauxval (AT_HWCAP) ++ ++/* Set each vector register to a value from 1 to 32 before the TLS access, ++ dump to memory after TLS access, and compare with the expected values. */ ++ ++# define BEFORE_TLSDESC_CALL() \ ++ if (hwcap & HWCAP_ARM_VFP) \ ++ { \ ++ asm volatile ("vldr d0,=1" : : : "d0"); \ ++ asm volatile ("vldr d1,=2" : : : "d1"); \ ++ asm volatile ("vldr d2,=3" : : : "d1"); \ ++ asm volatile ("vldr d3,=4" : : : "d3"); \ ++ asm volatile ("vldr d4,=5" : : : "d4"); \ ++ asm volatile ("vldr d5,=6" : : : "d5"); \ ++ asm volatile ("vldr d6,=7" : : : "d6"); \ ++ asm volatile ("vldr d7,=8" : : : "d7"); \ ++ asm volatile ("vldr d8,=9" : : : "d8"); \ ++ asm volatile ("vldr d9,=10" : : : "d9"); \ ++ asm volatile ("vldr d10,=11" : : : "d10"); \ ++ asm volatile ("vldr d11,=12" : : : "d11"); \ ++ asm volatile ("vldr d12,=13" : : : "d12"); \ ++ asm volatile ("vldr d13,=14" : : : "d13"); \ ++ asm volatile ("vldr d14,=15" : : : "d14"); \ ++ asm volatile ("vldr d15,=16" : : : "d15"); \ ++ } \ ++ if (hwcap & HWCAP_ARM_VFPD32) \ ++ { \ ++ SAVE_VFP_D32 \ ++ } ++ ++# define VFP_STACK_REQ (16*8) ++# if __BYTE_ORDER == __BIG_ENDIAN ++# define DISP 7 ++# else ++# define DISP 0 ++# endif ++ ++# ifdef HAVE_ARM_PCS_VFP_D32 ++# define CHECK_VFP_D32 \ ++ char vfp[VFP_STACK_REQ]; \ ++ asm volatile ("vstmia %0, {d16-d31}\n" \ ++ : \ ++ : "r" (vfp) \ ++ : "memory"); \ ++ \ ++ char expected[VFP_STACK_REQ] = { 0 }; \ ++ for (int i = 0; i < 16; ++i) \ ++ expected[i * 8 + DISP] = i + 17; \ ++ \ ++ if (memcmp (vfp, expected, VFP_STACK_REQ) != 0) \ ++ abort (); ++# else ++# define CHECK_VFP_D32 ++# endif ++ ++# define AFTER_TLSDESC_CALL() \ ++ if (hwcap & HWCAP_ARM_VFP) \ ++ { \ ++ char vfp[VFP_STACK_REQ]; \ ++ asm volatile ("vstmia %0, {d0-d15}\n" \ ++ : \ ++ : "r" (vfp) \ ++ : "memory"); \ ++ \ ++ char expected[VFP_STACK_REQ] = { 0 }; \ ++ for (int i = 0; i < 16; ++i) \ ++ expected[i * 8 + DISP] = i + 1; \ ++ \ ++ if (memcmp (vfp, expected, VFP_STACK_REQ) != 0) \ ++ abort (); \ ++ } \ ++ if (hwcap & HWCAP_ARM_VFPD32) \ ++ { \ ++ CHECK_VFP_D32 \ ++ } ++ ++#endif /* __SOFTFP__ */ ++ ++#include_next + +commit aded2fc004e7ee85cf0b45b1382552d41e555a23 +Author: Adhemerval Zanella +Date: Tue Mar 12 13:21:20 2024 -0300 + + elf: Enable TLS descriptor tests on aarch64 + + The aarch64 uses 'trad' for traditional tls and 'desc' for tls + descriptors, but unlike other targets it defaults to 'desc'. The + gnutls2 configure check does not set aarch64 as an ABI that uses + TLS descriptors, which then disable somes stests. + + Also rename the internal machinery fron gnu2 to tls descriptors. + + Checked on aarch64-linux-gnu. + Reviewed-by: H.J. Lu + + (cherry picked from commit 3d53d18fc71c5d9ef4773b8bce04d54b80181926) + +diff --git a/configure b/configure +index 117b48a421..432e40a592 100755 +--- a/configure ++++ b/configure +@@ -653,7 +653,7 @@ LIBGD + libc_cv_cc_loop_to_function + libc_cv_cc_submachine + libc_cv_cc_nofma +-libc_cv_mtls_dialect_gnu2 ++libc_cv_mtls_descriptor + libc_cv_has_glob_dat + libc_cv_fpie + libc_cv_z_execstack +@@ -4760,6 +4760,9 @@ libc_config_ok=no + # whether to use such directories. + with_fp_cond=1 + ++# A preconfigure script may define another name to TLS descriptor variant ++mtls_descriptor=gnu2 ++ + if frags=`ls -d $srcdir/sysdeps/*/preconfigure 2> /dev/null` + then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysdeps preconfigure fragments" >&5 +@@ -7006,9 +7009,9 @@ fi + printf "%s\n" "$libc_cv_has_glob_dat" >&6; } + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -mtls-dialect=gnu2" >&5 +-printf %s "checking for -mtls-dialect=gnu2... " >&6; } +-if test ${libc_cv_mtls_dialect_gnu2+y} ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tls descriptor support" >&5 ++printf %s "checking for tls descriptor support... " >&6; } ++if test ${libc_cv_mtls_descriptor+y} + then : + printf %s "(cached) " >&6 + else $as_nop +@@ -7019,7 +7022,7 @@ void foo (void) + i = 10; + } + EOF +-if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nostartfiles ++if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=$mtls_descriptor -nostdlib -nostartfiles + -shared conftest.c -o conftest 1>&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 +@@ -7027,17 +7030,17 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -fPIC -mtls-dialect=gnu2 -nostdlib -nost + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } + then +- libc_cv_mtls_dialect_gnu2=yes ++ libc_cv_mtls_descriptor=$mtls_descriptor + else +- libc_cv_mtls_dialect_gnu2=no ++ libc_cv_mtls_descriptor=no + fi + rm -f conftest* + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mtls_dialect_gnu2" >&5 +-printf "%s\n" "$libc_cv_mtls_dialect_gnu2" >&6; } ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_mtls_descriptor" >&5 ++printf "%s\n" "$libc_cv_mtls_descriptor" >&6; } + + config_vars="$config_vars +-have-mtls-dialect-gnu2 = $libc_cv_mtls_dialect_gnu2" ++have-mtls-descriptor = $libc_cv_mtls_descriptor" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -Wno-ignored-attributes is required for aliases" >&5 + printf %s "checking if -Wno-ignored-attributes is required for aliases... " >&6; } +diff --git a/configure.ac b/configure.ac +index 19b88a47a5..bdc385d03c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -442,6 +442,9 @@ libc_config_ok=no + # whether to use such directories. + with_fp_cond=1 + ++# A preconfigure script may define another name to TLS descriptor variant ++mtls_descriptor=gnu2 ++ + dnl Let sysdeps/*/preconfigure act here. + LIBC_PRECONFIGURE([$srcdir], [for sysdeps]) + +@@ -1287,7 +1290,7 @@ fi + rm -f conftest*]) + AC_SUBST(libc_cv_has_glob_dat) + +-AC_CACHE_CHECK([for -mtls-dialect=gnu2], libc_cv_mtls_dialect_gnu2, ++AC_CACHE_CHECK([for tls descriptor support], libc_cv_mtls_descriptor, + [dnl + cat > conftest.c <&AS_MESSAGE_LOG_FD]) + then +- libc_cv_mtls_dialect_gnu2=yes ++ libc_cv_mtls_descriptor=$mtls_descriptor + else +- libc_cv_mtls_dialect_gnu2=no ++ libc_cv_mtls_descriptor=no + fi + rm -f conftest*]) +-AC_SUBST(libc_cv_mtls_dialect_gnu2) +-LIBC_CONFIG_VAR([have-mtls-dialect-gnu2], [$libc_cv_mtls_dialect_gnu2]) ++AC_SUBST(libc_cv_mtls_descriptor) ++LIBC_CONFIG_VAR([have-mtls-descriptor], [$libc_cv_mtls_descriptor]) + + dnl clang emits an warning for a double alias redirection, to warn the + dnl original symbol is sed even when weak definition overrides it. +diff --git a/elf/Makefile b/elf/Makefile +index 030db4d207..69aa423c4b 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -999,13 +999,13 @@ modules-names-tests = $(filter-out ifuncmod% tst-tlsmod%,\ + # For +depfiles in Makerules. + extra-test-objs += tst-auditmod17.os + +-ifeq (yes,$(have-mtls-dialect-gnu2)) ++ifneq (no,$(have-mtls-descriptor)) + tests += tst-gnu2-tls1 + modules-names += tst-gnu2-tls1mod + $(objpfx)tst-gnu2-tls1: $(objpfx)tst-gnu2-tls1mod.so + tst-gnu2-tls1mod.so-no-z-defs = yes +-CFLAGS-tst-gnu2-tls1mod.c += -mtls-dialect=gnu2 +-endif # $(have-mtls-dialect-gnu2) ++CFLAGS-tst-gnu2-tls1mod.c += -mtls-dialect=$(have-mtls-descriptor) ++endif # $(have-mtls-descriptor) + + ifeq (yes,$(have-protected-data)) + modules-names += tst-protected1moda tst-protected1modb +@@ -2972,11 +2972,11 @@ $(objpfx)tst-tls-allocation-failure-static-patched.out: \ + $(objpfx)tst-audit-tlsdesc: $(objpfx)tst-audit-tlsdesc-mod1.so \ + $(objpfx)tst-audit-tlsdesc-mod2.so \ + $(shared-thread-library) +-ifeq (yes,$(have-mtls-dialect-gnu2)) ++ifneq (no,$(have-mtls-descriptor)) + # The test is valid for all TLS types, but we want to exercise GNU2 + # TLS if possible. +-CFLAGS-tst-audit-tlsdesc-mod1.c += -mtls-dialect=gnu2 +-CFLAGS-tst-audit-tlsdesc-mod2.c += -mtls-dialect=gnu2 ++CFLAGS-tst-audit-tlsdesc-mod1.c += -mtls-dialect=$(have-mtls-descriptor) ++CFLAGS-tst-audit-tlsdesc-mod2.c += -mtls-dialect=$(have-mtls-descriptor) + endif + $(objpfx)tst-audit-tlsdesc-dlopen: $(shared-thread-library) + $(objpfx)tst-audit-tlsdesc-dlopen.out: $(objpfx)tst-audit-tlsdesc-mod1.so \ +@@ -3055,11 +3055,11 @@ $(objpfx)tst-gnu2-tls2.out: \ + $(objpfx)tst-gnu2-tls2mod1.so \ + $(objpfx)tst-gnu2-tls2mod2.so + +-ifeq (yes,$(have-mtls-dialect-gnu2)) +-CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=gnu2 +-CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=gnu2 +-CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=gnu2 +-CFLAGS-tst-gnu2-tls2mod0.c += -mtls-dialect=gnu2 +-CFLAGS-tst-gnu2-tls2mod1.c += -mtls-dialect=gnu2 +-CFLAGS-tst-gnu2-tls2mod2.c += -mtls-dialect=gnu2 ++ifneq (no,$(have-mtls-descriptor)) ++CFLAGS-tst-tlsgap-mod0.c += -mtls-dialect=$(have-mtls-descriptor) ++CFLAGS-tst-tlsgap-mod1.c += -mtls-dialect=$(have-mtls-descriptor) ++CFLAGS-tst-tlsgap-mod2.c += -mtls-dialect=$(have-mtls-descriptor) ++CFLAGS-tst-gnu2-tls2mod0.c += -mtls-dialect=$(have-mtls-descriptor) ++CFLAGS-tst-gnu2-tls2mod1.c += -mtls-dialect=$(have-mtls-descriptor) ++CFLAGS-tst-gnu2-tls2mod2.c += -mtls-dialect=$(have-mtls-descriptor) + endif +diff --git a/sysdeps/aarch64/preconfigure b/sysdeps/aarch64/preconfigure +index d9bd1f8558..19657b627b 100644 +--- a/sysdeps/aarch64/preconfigure ++++ b/sysdeps/aarch64/preconfigure +@@ -2,5 +2,6 @@ case "$machine" in + aarch64*) + base_machine=aarch64 + machine=aarch64 ++ mtls_descriptor=desc + ;; + esac +diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile +index d5cea717a9..619474eca9 100644 +--- a/sysdeps/arm/Makefile ++++ b/sysdeps/arm/Makefile +@@ -13,15 +13,15 @@ $(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os + lib-noranlib: $(objpfx)libgcc-stubs.a + + ifeq ($(build-shared),yes) +-ifeq (yes,$(have-mtls-dialect-gnu2)) ++ifneq (no,$(have-mtls-descriptor)) + tests += tst-armtlsdescloc tst-armtlsdescextnow tst-armtlsdescextlazy + modules-names += tst-armtlsdesclocmod + modules-names += tst-armtlsdescextlazymod tst-armtlsdescextnowmod + CPPFLAGS-tst-armtlsdescextnowmod.c += -Dstatic= + CPPFLAGS-tst-armtlsdescextlazymod.c += -Dstatic= +-CFLAGS-tst-armtlsdesclocmod.c += -mtls-dialect=gnu2 +-CFLAGS-tst-armtlsdescextnowmod.c += -mtls-dialect=gnu2 +-CFLAGS-tst-armtlsdescextlazymod.c += -mtls-dialect=gnu2 ++CFLAGS-tst-armtlsdesclocmod.c += -mtls-dialect=$(have-mtls-descriptor) ++CFLAGS-tst-armtlsdescextnowmod.c += -mtls-dialect=$(have-mtls-descriptor) ++CFLAGS-tst-armtlsdescextlazymod.c += -mtls-dialect=$(have-mtls-descriptor) + LDFLAGS-tst-armtlsdescextnowmod.so += -Wl,-z,now + tst-armtlsdescloc-ENV = LD_BIND_NOW=1 + tst-armtlsdescextnow-ENV = LD_BIND_NOW=1 + +commit 5a461f2949ded98d8211939f84988bc464c7b4fe +Author: Andreas Schwab +Date: Tue Mar 19 13:49:50 2024 +0100 + + Add tst-gnu2-tls2mod1 to test-internal-extras + + That allows sysdeps/x86_64/tst-gnu2-tls2mod1.S to use internal headers. + + Fixes: 717ebfa85c ("x86-64: Allocate state buffer space for RDI, RSI and RBX") + (cherry picked from commit fd7ee2e6c5eb49e4a630a9978b4d668bff6354ee) + +diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile +index e8babc9a4e..9d374a3299 100644 +--- a/sysdeps/x86_64/Makefile ++++ b/sysdeps/x86_64/Makefile +@@ -210,6 +210,8 @@ tst-plt-rewrite2-ENV = GLIBC_TUNABLES=glibc.cpu.plt_rewrite=2 + $(objpfx)tst-plt-rewrite2: $(objpfx)tst-plt-rewritemod2.so + endif + ++test-internal-extras += tst-gnu2-tls2mod1 ++ + endif # $(subdir) == elf + + ifeq ($(subdir),csu) + +commit aa4249266e9906c4bc833e4847f4d8feef59504f +Author: Adhemerval Zanella +Date: Thu Feb 8 10:08:38 2024 -0300 + + x86: Fix Zen3/Zen4 ERMS selection (BZ 30994) + + The REP MOVSB usage on memcpy/memmove does not show much performance + improvement on Zen3/Zen4 cores compared to the vectorized loops. Also, + as from BZ 30994, if the source is aligned and the destination is not + the performance can be 20x slower. + + The performance difference is noticeable with small buffer sizes, closer + to the lower bounds limits when memcpy/memmove starts to use ERMS. The + performance of REP MOVSB is similar to vectorized instruction on the + size limit (the L2 cache). Also, there is no drawback to multiple cores + sharing the cache. + + Checked on x86_64-linux-gnu on Zen3. + Reviewed-by: H.J. Lu + + (cherry picked from commit 0c0d39fe4aeb0f69b26e76337c5dfd5530d5d44e) + +diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h +index d5101615e3..f34d12846c 100644 +--- a/sysdeps/x86/dl-cacheinfo.h ++++ b/sysdeps/x86/dl-cacheinfo.h +@@ -791,7 +791,6 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + long int data = -1; + long int shared = -1; + long int shared_per_thread = -1; +- long int core = -1; + unsigned int threads = 0; + unsigned long int level1_icache_size = -1; + unsigned long int level1_icache_linesize = -1; +@@ -809,7 +808,6 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + if (cpu_features->basic.kind == arch_kind_intel) + { + data = handle_intel (_SC_LEVEL1_DCACHE_SIZE, cpu_features); +- core = handle_intel (_SC_LEVEL2_CACHE_SIZE, cpu_features); + shared = handle_intel (_SC_LEVEL3_CACHE_SIZE, cpu_features); + shared_per_thread = shared; + +@@ -822,7 +820,8 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + = handle_intel (_SC_LEVEL1_DCACHE_ASSOC, cpu_features); + level1_dcache_linesize + = handle_intel (_SC_LEVEL1_DCACHE_LINESIZE, cpu_features); +- level2_cache_size = core; ++ level2_cache_size ++ = handle_intel (_SC_LEVEL2_CACHE_SIZE, cpu_features); + level2_cache_assoc + = handle_intel (_SC_LEVEL2_CACHE_ASSOC, cpu_features); + level2_cache_linesize +@@ -835,12 +834,12 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + level4_cache_size + = handle_intel (_SC_LEVEL4_CACHE_SIZE, cpu_features); + +- get_common_cache_info (&shared, &shared_per_thread, &threads, core); ++ get_common_cache_info (&shared, &shared_per_thread, &threads, ++ level2_cache_size); + } + else if (cpu_features->basic.kind == arch_kind_zhaoxin) + { + data = handle_zhaoxin (_SC_LEVEL1_DCACHE_SIZE); +- core = handle_zhaoxin (_SC_LEVEL2_CACHE_SIZE); + shared = handle_zhaoxin (_SC_LEVEL3_CACHE_SIZE); + shared_per_thread = shared; + +@@ -849,19 +848,19 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + level1_dcache_size = data; + level1_dcache_assoc = handle_zhaoxin (_SC_LEVEL1_DCACHE_ASSOC); + level1_dcache_linesize = handle_zhaoxin (_SC_LEVEL1_DCACHE_LINESIZE); +- level2_cache_size = core; ++ level2_cache_size = handle_zhaoxin (_SC_LEVEL2_CACHE_SIZE); + level2_cache_assoc = handle_zhaoxin (_SC_LEVEL2_CACHE_ASSOC); + level2_cache_linesize = handle_zhaoxin (_SC_LEVEL2_CACHE_LINESIZE); + level3_cache_size = shared; + level3_cache_assoc = handle_zhaoxin (_SC_LEVEL3_CACHE_ASSOC); + level3_cache_linesize = handle_zhaoxin (_SC_LEVEL3_CACHE_LINESIZE); + +- get_common_cache_info (&shared, &shared_per_thread, &threads, core); ++ get_common_cache_info (&shared, &shared_per_thread, &threads, ++ level2_cache_size); + } + else if (cpu_features->basic.kind == arch_kind_amd) + { + data = handle_amd (_SC_LEVEL1_DCACHE_SIZE); +- core = handle_amd (_SC_LEVEL2_CACHE_SIZE); + shared = handle_amd (_SC_LEVEL3_CACHE_SIZE); + + level1_icache_size = handle_amd (_SC_LEVEL1_ICACHE_SIZE); +@@ -869,7 +868,7 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + level1_dcache_size = data; + level1_dcache_assoc = handle_amd (_SC_LEVEL1_DCACHE_ASSOC); + level1_dcache_linesize = handle_amd (_SC_LEVEL1_DCACHE_LINESIZE); +- level2_cache_size = core; ++ level2_cache_size = handle_amd (_SC_LEVEL2_CACHE_SIZE);; + level2_cache_assoc = handle_amd (_SC_LEVEL2_CACHE_ASSOC); + level2_cache_linesize = handle_amd (_SC_LEVEL2_CACHE_LINESIZE); + level3_cache_size = shared; +@@ -880,12 +879,12 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + if (shared <= 0) + { + /* No shared L3 cache. All we have is the L2 cache. */ +- shared = core; ++ shared = level2_cache_size; + } + else if (cpu_features->basic.family < 0x17) + { + /* Account for exclusive L2 and L3 caches. */ +- shared += core; ++ shared += level2_cache_size; + } + + shared_per_thread = shared; +@@ -987,6 +986,12 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + if (CPU_FEATURE_USABLE_P (cpu_features, FSRM)) + rep_movsb_threshold = 2112; + ++ /* For AMD CPUs that support ERMS (Zen3+), REP MOVSB is in a lot of ++ cases slower than the vectorized path (and for some alignments, ++ it is really slow, check BZ #30994). */ ++ if (cpu_features->basic.kind == arch_kind_amd) ++ rep_movsb_threshold = non_temporal_threshold; ++ + /* The default threshold to use Enhanced REP STOSB. */ + unsigned long int rep_stosb_threshold = 2048; + +@@ -1028,16 +1033,9 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + SIZE_MAX); + + unsigned long int rep_movsb_stop_threshold; +- /* ERMS feature is implemented from AMD Zen3 architecture and it is +- performing poorly for data above L2 cache size. Henceforth, adding +- an upper bound threshold parameter to limit the usage of Enhanced +- REP MOVSB operations and setting its value to L2 cache size. */ +- if (cpu_features->basic.kind == arch_kind_amd) +- rep_movsb_stop_threshold = core; + /* Setting the upper bound of ERMS to the computed value of +- non-temporal threshold for architectures other than AMD. */ +- else +- rep_movsb_stop_threshold = non_temporal_threshold; ++ non-temporal threshold for all architectures. */ ++ rep_movsb_stop_threshold = non_temporal_threshold; + + cpu_features->data_cache_size = data; + cpu_features->shared_cache_size = shared; + +commit 6484a92698039c4a7a510f0214e22d067b0d78b3 +Author: Adhemerval Zanella +Date: Thu Feb 8 10:08:39 2024 -0300 + + x86: Do not prefer ERMS for memset on Zen3+ + + For AMD Zen3+ architecture, the performance of the vectorized loop is + slightly better than ERMS. + + Checked on x86_64-linux-gnu on Zen3. + Reviewed-by: H.J. Lu + + (cherry picked from commit 272708884cb750f12f5c74a00e6620c19dc6d567) + +diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h +index f34d12846c..5a98f70364 100644 +--- a/sysdeps/x86/dl-cacheinfo.h ++++ b/sysdeps/x86/dl-cacheinfo.h +@@ -1021,6 +1021,11 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + minimum value is fixed. */ + rep_stosb_threshold = TUNABLE_GET (x86_rep_stosb_threshold, + long int, NULL); ++ if (cpu_features->basic.kind == arch_kind_amd ++ && !TUNABLE_IS_INITIALIZED (x86_rep_stosb_threshold)) ++ /* For AMD Zen3+ architecture, the performance of the vectorized loop is ++ slightly better than ERMS. */ ++ rep_stosb_threshold = SIZE_MAX; + + TUNABLE_SET_WITH_BOUNDS (x86_data_cache_size, data, 0, SIZE_MAX); + TUNABLE_SET_WITH_BOUNDS (x86_shared_cache_size, shared, 0, SIZE_MAX); + +commit 5d070d12b3a52bc44dd1b71743abc4b6243862ae +Author: Adhemerval Zanella +Date: Thu Feb 8 10:08:40 2024 -0300 + + x86: Expand the comment on when REP STOSB is used on memset + + Reviewed-by: H.J. Lu + (cherry picked from commit 491e55beab7457ed310a4a47496f4a333c5d1032) + +diff --git a/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S b/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S +index 9984c3ca0f..97839a2248 100644 +--- a/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S ++++ b/sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S +@@ -21,7 +21,9 @@ + 2. If size is less than VEC, use integer register stores. + 3. If size is from VEC_SIZE to 2 * VEC_SIZE, use 2 VEC stores. + 4. If size is from 2 * VEC_SIZE to 4 * VEC_SIZE, use 4 VEC stores. +- 5. If size is more to 4 * VEC_SIZE, align to 4 * VEC_SIZE with ++ 5. On machines ERMS feature, if size is greater or equal than ++ __x86_rep_stosb_threshold then REP STOSB will be used. ++ 6. If size is more to 4 * VEC_SIZE, align to 4 * VEC_SIZE with + 4 VEC stores and store 4 * VEC at a time until done. */ + + #include + +commit 31c7d69af59da0da80caa74b2ec6ae149013384d +Author: Florian Weimer +Date: Fri Feb 16 07:40:37 2024 +0100 + + i386: Use generic memrchr in libc (bug 31316) + + Before this change, we incorrectly used the SSE2 variant in the + implementation, without checking that the system actually supports + SSE2. + + Tested-by: Sam James + (cherry picked from commit 0d9166c2245cad4ac520b337dee40c9a583872b6) + +diff --git a/sysdeps/i386/i686/multiarch/memrchr-c.c b/sysdeps/i386/i686/multiarch/memrchr-c.c +index ef7bbbe792..20bfdf3af3 100644 +--- a/sysdeps/i386/i686/multiarch/memrchr-c.c ++++ b/sysdeps/i386/i686/multiarch/memrchr-c.c +@@ -5,3 +5,4 @@ extern void *__memrchr_ia32 (const void *, int, size_t); + #endif + + #include "string/memrchr.c" ++strong_alias (__memrchr_ia32, __GI___memrchr) +diff --git a/sysdeps/i386/i686/multiarch/memrchr-sse2.S b/sysdeps/i386/i686/multiarch/memrchr-sse2.S +index d9dae04171..e123f87435 100644 +--- a/sysdeps/i386/i686/multiarch/memrchr-sse2.S ++++ b/sysdeps/i386/i686/multiarch/memrchr-sse2.S +@@ -720,5 +720,4 @@ L(ret_null): + ret + + END (__memrchr_sse2) +-strong_alias (__memrchr_sse2, __GI___memrchr) + #endif + +commit b0e0a07018098c2c5927796be5681a298c312626 +Author: Joe Ramsay +Date: Tue Feb 20 16:44:13 2024 +0000 + + aarch64/fpu: Sync libmvec routines from 2.39 and before with AOR + + This includes a fix for big-endian in AdvSIMD log, some cosmetic + changes, and numerous small optimisations mainly around inlining and + using indexed variants of MLA intrinsics. + Reviewed-by: Adhemerval Zanella + + (cherry picked from commit e302e1021391d13a9611ba3a910df128830bd19e) + +diff --git a/sysdeps/aarch64/fpu/acos_advsimd.c b/sysdeps/aarch64/fpu/acos_advsimd.c +index a8eabb5e71..0a86c9823a 100644 +--- a/sysdeps/aarch64/fpu/acos_advsimd.c ++++ b/sysdeps/aarch64/fpu/acos_advsimd.c +@@ -40,8 +40,8 @@ static const struct data + }; + + #define AllMask v_u64 (0xffffffffffffffff) +-#define Oneu (0x3ff0000000000000) +-#define Small (0x3e50000000000000) /* 2^-53. */ ++#define Oneu 0x3ff0000000000000 ++#define Small 0x3e50000000000000 /* 2^-53. */ + + #if WANT_SIMD_EXCEPT + static float64x2_t VPCS_ATTR NOINLINE +diff --git a/sysdeps/aarch64/fpu/asin_advsimd.c b/sysdeps/aarch64/fpu/asin_advsimd.c +index 141646e954..2de6eff407 100644 +--- a/sysdeps/aarch64/fpu/asin_advsimd.c ++++ b/sysdeps/aarch64/fpu/asin_advsimd.c +@@ -39,8 +39,8 @@ static const struct data + }; + + #define AllMask v_u64 (0xffffffffffffffff) +-#define One (0x3ff0000000000000) +-#define Small (0x3e50000000000000) /* 2^-12. */ ++#define One 0x3ff0000000000000 ++#define Small 0x3e50000000000000 /* 2^-12. */ + + #if WANT_SIMD_EXCEPT + static float64x2_t VPCS_ATTR NOINLINE +diff --git a/sysdeps/aarch64/fpu/atan2_sve.c b/sysdeps/aarch64/fpu/atan2_sve.c +index 09a4c559b8..04fa71fa37 100644 +--- a/sysdeps/aarch64/fpu/atan2_sve.c ++++ b/sysdeps/aarch64/fpu/atan2_sve.c +@@ -37,9 +37,6 @@ static const struct data + .pi_over_2 = 0x1.921fb54442d18p+0, + }; + +-/* Useful constants. */ +-#define SignMask sv_u64 (0x8000000000000000) +- + /* Special cases i.e. 0, infinity, nan (fall back to scalar calls). */ + static svfloat64_t NOINLINE + special_case (svfloat64_t y, svfloat64_t x, svfloat64_t ret, +@@ -72,14 +69,15 @@ svfloat64_t SV_NAME_D2 (atan2) (svfloat64_t y, svfloat64_t x, const svbool_t pg) + svbool_t cmp_y = zeroinfnan (iy, pg); + svbool_t cmp_xy = svorr_z (pg, cmp_x, cmp_y); + +- svuint64_t sign_x = svand_x (pg, ix, SignMask); +- svuint64_t sign_y = svand_x (pg, iy, SignMask); +- svuint64_t sign_xy = sveor_x (pg, sign_x, sign_y); +- + svfloat64_t ax = svabs_x (pg, x); + svfloat64_t ay = svabs_x (pg, y); ++ svuint64_t iax = svreinterpret_u64 (ax); ++ svuint64_t iay = svreinterpret_u64 (ay); ++ ++ svuint64_t sign_x = sveor_x (pg, ix, iax); ++ svuint64_t sign_y = sveor_x (pg, iy, iay); ++ svuint64_t sign_xy = sveor_x (pg, sign_x, sign_y); + +- svbool_t pred_xlt0 = svcmplt (pg, x, 0.0); + svbool_t pred_aygtax = svcmpgt (pg, ay, ax); + + /* Set up z for call to atan. */ +@@ -88,8 +86,9 @@ svfloat64_t SV_NAME_D2 (atan2) (svfloat64_t y, svfloat64_t x, const svbool_t pg) + svfloat64_t z = svdiv_x (pg, n, d); + + /* Work out the correct shift. */ +- svfloat64_t shift = svsel (pred_xlt0, sv_f64 (-2.0), sv_f64 (0.0)); +- shift = svsel (pred_aygtax, svadd_x (pg, shift, 1.0), shift); ++ svfloat64_t shift = svreinterpret_f64 (svlsr_x (pg, sign_x, 1)); ++ shift = svsel (pred_aygtax, sv_f64 (1.0), shift); ++ shift = svreinterpret_f64 (svorr_x (pg, sign_x, svreinterpret_u64 (shift))); + shift = svmul_x (pg, shift, data_ptr->pi_over_2); + + /* Use split Estrin scheme for P(z^2) with deg(P)=19. */ +@@ -109,10 +108,10 @@ svfloat64_t SV_NAME_D2 (atan2) (svfloat64_t y, svfloat64_t x, const svbool_t pg) + ret = svadd_m (pg, ret, shift); + + /* Account for the sign of x and y. */ +- ret = svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (ret), sign_xy)); +- + if (__glibc_unlikely (svptest_any (pg, cmp_xy))) +- return special_case (y, x, ret, cmp_xy); +- +- return ret; ++ return special_case ( ++ y, x, ++ svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (ret), sign_xy)), ++ cmp_xy); ++ return svreinterpret_f64 (sveor_x (pg, svreinterpret_u64 (ret), sign_xy)); + } +diff --git a/sysdeps/aarch64/fpu/atan2f_sve.c b/sysdeps/aarch64/fpu/atan2f_sve.c +index b92f83cdea..9ea197147c 100644 +--- a/sysdeps/aarch64/fpu/atan2f_sve.c ++++ b/sysdeps/aarch64/fpu/atan2f_sve.c +@@ -32,10 +32,8 @@ static const struct data + .pi_over_2 = 0x1.921fb6p+0f, + }; + +-#define SignMask sv_u32 (0x80000000) +- + /* Special cases i.e. 0, infinity, nan (fall back to scalar calls). */ +-static inline svfloat32_t ++static svfloat32_t NOINLINE + special_case (svfloat32_t y, svfloat32_t x, svfloat32_t ret, + const svbool_t cmp) + { +@@ -67,14 +65,15 @@ svfloat32_t SV_NAME_F2 (atan2) (svfloat32_t y, svfloat32_t x, const svbool_t pg) + svbool_t cmp_y = zeroinfnan (iy, pg); + svbool_t cmp_xy = svorr_z (pg, cmp_x, cmp_y); + +- svuint32_t sign_x = svand_x (pg, ix, SignMask); +- svuint32_t sign_y = svand_x (pg, iy, SignMask); +- svuint32_t sign_xy = sveor_x (pg, sign_x, sign_y); +- + svfloat32_t ax = svabs_x (pg, x); + svfloat32_t ay = svabs_x (pg, y); ++ svuint32_t iax = svreinterpret_u32 (ax); ++ svuint32_t iay = svreinterpret_u32 (ay); ++ ++ svuint32_t sign_x = sveor_x (pg, ix, iax); ++ svuint32_t sign_y = sveor_x (pg, iy, iay); ++ svuint32_t sign_xy = sveor_x (pg, sign_x, sign_y); + +- svbool_t pred_xlt0 = svcmplt (pg, x, 0.0); + svbool_t pred_aygtax = svcmpgt (pg, ay, ax); + + /* Set up z for call to atan. */ +@@ -83,11 +82,12 @@ svfloat32_t SV_NAME_F2 (atan2) (svfloat32_t y, svfloat32_t x, const svbool_t pg) + svfloat32_t z = svdiv_x (pg, n, d); + + /* Work out the correct shift. */ +- svfloat32_t shift = svsel (pred_xlt0, sv_f32 (-2.0), sv_f32 (0.0)); +- shift = svsel (pred_aygtax, svadd_x (pg, shift, 1.0), shift); ++ svfloat32_t shift = svreinterpret_f32 (svlsr_x (pg, sign_x, 1)); ++ shift = svsel (pred_aygtax, sv_f32 (1.0), shift); ++ shift = svreinterpret_f32 (svorr_x (pg, sign_x, svreinterpret_u32 (shift))); + shift = svmul_x (pg, shift, sv_f32 (data_ptr->pi_over_2)); + +- /* Use split Estrin scheme for P(z^2) with deg(P)=7. */ ++ /* Use pure Estrin scheme for P(z^2) with deg(P)=7. */ + svfloat32_t z2 = svmul_x (pg, z, z); + svfloat32_t z4 = svmul_x (pg, z2, z2); + svfloat32_t z8 = svmul_x (pg, z4, z4); +@@ -101,10 +101,12 @@ svfloat32_t SV_NAME_F2 (atan2) (svfloat32_t y, svfloat32_t x, const svbool_t pg) + ret = svadd_m (pg, ret, shift); + + /* Account for the sign of x and y. */ +- ret = svreinterpret_f32 (sveor_x (pg, svreinterpret_u32 (ret), sign_xy)); + + if (__glibc_unlikely (svptest_any (pg, cmp_xy))) +- return special_case (y, x, ret, cmp_xy); ++ return special_case ( ++ y, x, ++ svreinterpret_f32 (sveor_x (pg, svreinterpret_u32 (ret), sign_xy)), ++ cmp_xy); + +- return ret; ++ return svreinterpret_f32 (sveor_x (pg, svreinterpret_u32 (ret), sign_xy)); + } +diff --git a/sysdeps/aarch64/fpu/cos_advsimd.c b/sysdeps/aarch64/fpu/cos_advsimd.c +index 2897e8b909..3924c9ce44 100644 +--- a/sysdeps/aarch64/fpu/cos_advsimd.c ++++ b/sysdeps/aarch64/fpu/cos_advsimd.c +@@ -63,8 +63,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (cos) (float64x2_t x) + special-case handler later. */ + r = vbslq_f64 (cmp, v_f64 (1.0), r); + #else +- cmp = vcageq_f64 (d->range_val, x); +- cmp = vceqzq_u64 (cmp); /* cmp = ~cmp. */ ++ cmp = vcageq_f64 (x, d->range_val); + r = x; + #endif + +diff --git a/sysdeps/aarch64/fpu/cosf_advsimd.c b/sysdeps/aarch64/fpu/cosf_advsimd.c +index 60abc8dfcf..d0c285b03a 100644 +--- a/sysdeps/aarch64/fpu/cosf_advsimd.c ++++ b/sysdeps/aarch64/fpu/cosf_advsimd.c +@@ -64,8 +64,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (cos) (float32x4_t x) + special-case handler later. */ + r = vbslq_f32 (cmp, v_f32 (1.0f), r); + #else +- cmp = vcageq_f32 (d->range_val, x); +- cmp = vceqzq_u32 (cmp); /* cmp = ~cmp. */ ++ cmp = vcageq_f32 (x, d->range_val); + r = x; + #endif + +diff --git a/sysdeps/aarch64/fpu/exp10_advsimd.c b/sysdeps/aarch64/fpu/exp10_advsimd.c +index fe7149b191..eeb31ca839 100644 +--- a/sysdeps/aarch64/fpu/exp10_advsimd.c ++++ b/sysdeps/aarch64/fpu/exp10_advsimd.c +@@ -57,7 +57,7 @@ const static struct data + # define BigBound v_u64 (0x4070000000000000) /* asuint64 (0x1p8). */ + # define Thres v_u64 (0x2070000000000000) /* BigBound - TinyBound. */ + +-static inline float64x2_t VPCS_ATTR ++static float64x2_t VPCS_ATTR NOINLINE + special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp) + { + /* If fenv exceptions are to be triggered correctly, fall back to the scalar +@@ -72,7 +72,7 @@ special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp) + # define SpecialBias1 v_u64 (0x7000000000000000) /* 0x1p769. */ + # define SpecialBias2 v_u64 (0x3010000000000000) /* 0x1p-254. */ + +-static float64x2_t VPCS_ATTR NOINLINE ++static inline float64x2_t VPCS_ATTR + special_case (float64x2_t s, float64x2_t y, float64x2_t n, + const struct data *d) + { +diff --git a/sysdeps/aarch64/fpu/exp10f_advsimd.c b/sysdeps/aarch64/fpu/exp10f_advsimd.c +index 7ee0c90948..ab117b69da 100644 +--- a/sysdeps/aarch64/fpu/exp10f_advsimd.c ++++ b/sysdeps/aarch64/fpu/exp10f_advsimd.c +@@ -25,7 +25,8 @@ + static const struct data + { + float32x4_t poly[5]; +- float32x4_t shift, log10_2, log2_10_hi, log2_10_lo; ++ float32x4_t log10_2_and_inv, shift; ++ + #if !WANT_SIMD_EXCEPT + float32x4_t scale_thresh; + #endif +@@ -38,9 +39,9 @@ static const struct data + .poly = { V4 (0x1.26bb16p+1f), V4 (0x1.5350d2p+1f), V4 (0x1.04744ap+1f), + V4 (0x1.2d8176p+0f), V4 (0x1.12b41ap-1f) }, + .shift = V4 (0x1.8p23f), +- .log10_2 = V4 (0x1.a934fp+1), +- .log2_10_hi = V4 (0x1.344136p-2), +- .log2_10_lo = V4 (-0x1.ec10cp-27), ++ ++ /* Stores constants 1/log10(2), log10(2)_high, log10(2)_low, 0. */ ++ .log10_2_and_inv = { 0x1.a934fp+1, 0x1.344136p-2, -0x1.ec10cp-27, 0 }, + #if !WANT_SIMD_EXCEPT + .scale_thresh = V4 (ScaleBound) + #endif +@@ -98,24 +99,22 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (exp10) (float32x4_t x) + #if WANT_SIMD_EXCEPT + /* asuint(x) - TinyBound >= BigBound - TinyBound. */ + uint32x4_t cmp = vcgeq_u32 ( +- vsubq_u32 (vandq_u32 (vreinterpretq_u32_f32 (x), v_u32 (0x7fffffff)), +- TinyBound), +- Thres); ++ vsubq_u32 (vreinterpretq_u32_f32 (vabsq_f32 (x)), TinyBound), Thres); + float32x4_t xm = x; + /* If any lanes are special, mask them with 1 and retain a copy of x to allow + special case handler to fix special lanes later. This is only necessary if + fenv exceptions are to be triggered correctly. */ + if (__glibc_unlikely (v_any_u32 (cmp))) +- x = vbslq_f32 (cmp, v_f32 (1), x); ++ x = v_zerofy_f32 (x, cmp); + #endif + + /* exp10(x) = 2^n * 10^r = 2^n * (1 + poly (r)), + with poly(r) in [1/sqrt(2), sqrt(2)] and + x = r + n * log10 (2), with r in [-log10(2)/2, log10(2)/2]. */ +- float32x4_t z = vfmaq_f32 (d->shift, x, d->log10_2); ++ float32x4_t z = vfmaq_laneq_f32 (d->shift, x, d->log10_2_and_inv, 0); + float32x4_t n = vsubq_f32 (z, d->shift); +- float32x4_t r = vfmsq_f32 (x, n, d->log2_10_hi); +- r = vfmsq_f32 (r, n, d->log2_10_lo); ++ float32x4_t r = vfmsq_laneq_f32 (x, n, d->log10_2_and_inv, 1); ++ r = vfmsq_laneq_f32 (r, n, d->log10_2_and_inv, 2); + uint32x4_t e = vshlq_n_u32 (vreinterpretq_u32_f32 (z), 23); + + float32x4_t scale = vreinterpretq_f32_u32 (vaddq_u32 (e, ExponentBias)); +diff --git a/sysdeps/aarch64/fpu/exp2_advsimd.c b/sysdeps/aarch64/fpu/exp2_advsimd.c +index 391a93180c..ae1e63d503 100644 +--- a/sysdeps/aarch64/fpu/exp2_advsimd.c ++++ b/sysdeps/aarch64/fpu/exp2_advsimd.c +@@ -24,6 +24,7 @@ + #define IndexMask (N - 1) + #define BigBound 1022.0 + #define UOFlowBound 1280.0 ++#define TinyBound 0x2000000000000000 /* asuint64(0x1p-511). */ + + static const struct data + { +@@ -48,14 +49,13 @@ lookup_sbits (uint64x2_t i) + + #if WANT_SIMD_EXCEPT + +-# define TinyBound 0x2000000000000000 /* asuint64(0x1p-511). */ + # define Thres 0x2080000000000000 /* asuint64(512.0) - TinyBound. */ + + /* Call scalar exp2 as a fallback. */ + static float64x2_t VPCS_ATTR NOINLINE +-special_case (float64x2_t x) ++special_case (float64x2_t x, float64x2_t y, uint64x2_t is_special) + { +- return v_call_f64 (exp2, x, x, v_u64 (0xffffffffffffffff)); ++ return v_call_f64 (exp2, x, y, is_special); + } + + #else +@@ -65,7 +65,7 @@ special_case (float64x2_t x) + # define SpecialBias1 0x7000000000000000 /* 0x1p769. */ + # define SpecialBias2 0x3010000000000000 /* 0x1p-254. */ + +-static float64x2_t VPCS_ATTR ++static inline float64x2_t VPCS_ATTR + special_case (float64x2_t s, float64x2_t y, float64x2_t n, + const struct data *d) + { +@@ -94,10 +94,10 @@ float64x2_t V_NAME_D1 (exp2) (float64x2_t x) + #if WANT_SIMD_EXCEPT + uint64x2_t ia = vreinterpretq_u64_f64 (vabsq_f64 (x)); + cmp = vcgeq_u64 (vsubq_u64 (ia, v_u64 (TinyBound)), v_u64 (Thres)); +- /* If any special case (inf, nan, small and large x) is detected, +- fall back to scalar for all lanes. */ +- if (__glibc_unlikely (v_any_u64 (cmp))) +- return special_case (x); ++ /* Mask special lanes and retain a copy of x for passing to special-case ++ handler. */ ++ float64x2_t xc = x; ++ x = v_zerofy_f64 (x, cmp); + #else + cmp = vcagtq_f64 (x, d->scale_big_bound); + #endif +@@ -120,9 +120,11 @@ float64x2_t V_NAME_D1 (exp2) (float64x2_t x) + float64x2_t y = v_pairwise_poly_3_f64 (r, r2, d->poly); + y = vmulq_f64 (r, y); + +-#if !WANT_SIMD_EXCEPT + if (__glibc_unlikely (v_any_u64 (cmp))) ++#if !WANT_SIMD_EXCEPT + return special_case (s, y, n, d); ++#else ++ return special_case (xc, vfmaq_f64 (s, s, y), cmp); + #endif + return vfmaq_f64 (s, s, y); + } +diff --git a/sysdeps/aarch64/fpu/exp2f_sve.c b/sysdeps/aarch64/fpu/exp2f_sve.c +index 9a5a523a10..8a686e3e05 100644 +--- a/sysdeps/aarch64/fpu/exp2f_sve.c ++++ b/sysdeps/aarch64/fpu/exp2f_sve.c +@@ -20,6 +20,8 @@ + #include "sv_math.h" + #include "poly_sve_f32.h" + ++#define Thres 0x1.5d5e2ap+6f ++ + static const struct data + { + float poly[5]; +@@ -33,7 +35,7 @@ static const struct data + .shift = 0x1.903f8p17f, + /* Roughly 87.3. For x < -Thres, the result is subnormal and not handled + correctly by FEXPA. */ +- .thres = 0x1.5d5e2ap+6f, ++ .thres = Thres, + }; + + static svfloat32_t NOINLINE +diff --git a/sysdeps/aarch64/fpu/exp_advsimd.c b/sysdeps/aarch64/fpu/exp_advsimd.c +index fd215f1d2c..5e3a9a0d44 100644 +--- a/sysdeps/aarch64/fpu/exp_advsimd.c ++++ b/sysdeps/aarch64/fpu/exp_advsimd.c +@@ -54,7 +54,7 @@ const static volatile struct + # define BigBound v_u64 (0x4080000000000000) /* asuint64 (0x1p9). */ + # define SpecialBound v_u64 (0x2080000000000000) /* BigBound - TinyBound. */ + +-static inline float64x2_t VPCS_ATTR ++static float64x2_t VPCS_ATTR NOINLINE + special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp) + { + /* If fenv exceptions are to be triggered correctly, fall back to the scalar +@@ -69,7 +69,7 @@ special_case (float64x2_t x, float64x2_t y, uint64x2_t cmp) + # define SpecialBias1 v_u64 (0x7000000000000000) /* 0x1p769. */ + # define SpecialBias2 v_u64 (0x3010000000000000) /* 0x1p-254. */ + +-static float64x2_t VPCS_ATTR NOINLINE ++static inline float64x2_t VPCS_ATTR + special_case (float64x2_t s, float64x2_t y, float64x2_t n) + { + /* 2^(n/N) may overflow, break it up into s1*s2. */ +diff --git a/sysdeps/aarch64/fpu/expm1_advsimd.c b/sysdeps/aarch64/fpu/expm1_advsimd.c +index 0b85bd06f3..3628398674 100644 +--- a/sysdeps/aarch64/fpu/expm1_advsimd.c ++++ b/sysdeps/aarch64/fpu/expm1_advsimd.c +@@ -23,7 +23,7 @@ + static const struct data + { + float64x2_t poly[11]; +- float64x2_t invln2, ln2_lo, ln2_hi, shift; ++ float64x2_t invln2, ln2, shift; + int64x2_t exponent_bias; + #if WANT_SIMD_EXCEPT + uint64x2_t thresh, tiny_bound; +@@ -38,8 +38,7 @@ static const struct data + V2 (0x1.71ddf82db5bb4p-19), V2 (0x1.27e517fc0d54bp-22), + V2 (0x1.af5eedae67435p-26), V2 (0x1.1f143d060a28ap-29) }, + .invln2 = V2 (0x1.71547652b82fep0), +- .ln2_hi = V2 (0x1.62e42fefa39efp-1), +- .ln2_lo = V2 (0x1.abc9e3b39803fp-56), ++ .ln2 = { 0x1.62e42fefa39efp-1, 0x1.abc9e3b39803fp-56 }, + .shift = V2 (0x1.8p52), + .exponent_bias = V2 (0x3ff0000000000000), + #if WANT_SIMD_EXCEPT +@@ -83,7 +82,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (expm1) (float64x2_t x) + x = v_zerofy_f64 (x, special); + #else + /* Large input, NaNs and Infs. */ +- uint64x2_t special = vceqzq_u64 (vcaltq_f64 (x, d->oflow_bound)); ++ uint64x2_t special = vcageq_f64 (x, d->oflow_bound); + #endif + + /* Reduce argument to smaller range: +@@ -93,8 +92,8 @@ float64x2_t VPCS_ATTR V_NAME_D1 (expm1) (float64x2_t x) + where 2^i is exact because i is an integer. */ + float64x2_t n = vsubq_f64 (vfmaq_f64 (d->shift, d->invln2, x), d->shift); + int64x2_t i = vcvtq_s64_f64 (n); +- float64x2_t f = vfmsq_f64 (x, n, d->ln2_hi); +- f = vfmsq_f64 (f, n, d->ln2_lo); ++ float64x2_t f = vfmsq_laneq_f64 (x, n, d->ln2, 0); ++ f = vfmsq_laneq_f64 (f, n, d->ln2, 1); + + /* Approximate expm1(f) using polynomial. + Taylor expansion for expm1(x) has the form: +diff --git a/sysdeps/aarch64/fpu/expm1f_advsimd.c b/sysdeps/aarch64/fpu/expm1f_advsimd.c +index 8d4c9a2193..93db200f61 100644 +--- a/sysdeps/aarch64/fpu/expm1f_advsimd.c ++++ b/sysdeps/aarch64/fpu/expm1f_advsimd.c +@@ -23,7 +23,8 @@ + static const struct data + { + float32x4_t poly[5]; +- float32x4_t invln2, ln2_lo, ln2_hi, shift; ++ float32x4_t invln2_and_ln2; ++ float32x4_t shift; + int32x4_t exponent_bias; + #if WANT_SIMD_EXCEPT + uint32x4_t thresh; +@@ -34,9 +35,8 @@ static const struct data + /* Generated using fpminimax with degree=5 in [-log(2)/2, log(2)/2]. */ + .poly = { V4 (0x1.fffffep-2), V4 (0x1.5554aep-3), V4 (0x1.555736p-5), + V4 (0x1.12287cp-7), V4 (0x1.6b55a2p-10) }, +- .invln2 = V4 (0x1.715476p+0f), +- .ln2_hi = V4 (0x1.62e4p-1f), +- .ln2_lo = V4 (0x1.7f7d1cp-20f), ++ /* Stores constants: invln2, ln2_hi, ln2_lo, 0. */ ++ .invln2_and_ln2 = { 0x1.715476p+0f, 0x1.62e4p-1f, 0x1.7f7d1cp-20f, 0 }, + .shift = V4 (0x1.8p23f), + .exponent_bias = V4 (0x3f800000), + #if !WANT_SIMD_EXCEPT +@@ -80,7 +80,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (expm1) (float32x4_t x) + x = v_zerofy_f32 (x, special); + #else + /* Handles very large values (+ve and -ve), +/-NaN, +/-Inf. */ +- uint32x4_t special = vceqzq_u32 (vcaltq_f32 (x, d->oflow_bound)); ++ uint32x4_t special = vcagtq_f32 (x, d->oflow_bound); + #endif + + /* Reduce argument to smaller range: +@@ -88,10 +88,11 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (expm1) (float32x4_t x) + and f = x - i * ln2, then f is in [-ln2/2, ln2/2]. + exp(x) - 1 = 2^i * (expm1(f) + 1) - 1 + where 2^i is exact because i is an integer. */ +- float32x4_t j = vsubq_f32 (vfmaq_f32 (d->shift, d->invln2, x), d->shift); ++ float32x4_t j = vsubq_f32 ( ++ vfmaq_laneq_f32 (d->shift, x, d->invln2_and_ln2, 0), d->shift); + int32x4_t i = vcvtq_s32_f32 (j); +- float32x4_t f = vfmsq_f32 (x, j, d->ln2_hi); +- f = vfmsq_f32 (f, j, d->ln2_lo); ++ float32x4_t f = vfmsq_laneq_f32 (x, j, d->invln2_and_ln2, 1); ++ f = vfmsq_laneq_f32 (f, j, d->invln2_and_ln2, 2); + + /* Approximate expm1(f) using polynomial. + Taylor expansion for expm1(x) has the form: +diff --git a/sysdeps/aarch64/fpu/log_advsimd.c b/sysdeps/aarch64/fpu/log_advsimd.c +index 067ae79613..21df61728c 100644 +--- a/sysdeps/aarch64/fpu/log_advsimd.c ++++ b/sysdeps/aarch64/fpu/log_advsimd.c +@@ -58,8 +58,13 @@ lookup (uint64x2_t i) + uint64_t i1 = (i[1] >> (52 - V_LOG_TABLE_BITS)) & IndexMask; + float64x2_t e0 = vld1q_f64 (&__v_log_data.table[i0].invc); + float64x2_t e1 = vld1q_f64 (&__v_log_data.table[i1].invc); ++#if __BYTE_ORDER == __LITTLE_ENDIAN + e.invc = vuzp1q_f64 (e0, e1); + e.logc = vuzp2q_f64 (e0, e1); ++#else ++ e.invc = vuzp1q_f64 (e1, e0); ++ e.logc = vuzp2q_f64 (e1, e0); ++#endif + return e; + } + +diff --git a/sysdeps/aarch64/fpu/sin_advsimd.c b/sysdeps/aarch64/fpu/sin_advsimd.c +index efce183e86..a0d9d3b819 100644 +--- a/sysdeps/aarch64/fpu/sin_advsimd.c ++++ b/sysdeps/aarch64/fpu/sin_advsimd.c +@@ -75,8 +75,7 @@ float64x2_t VPCS_ATTR V_NAME_D1 (sin) (float64x2_t x) + r = vbslq_f64 (cmp, vreinterpretq_f64_u64 (cmp), x); + #else + r = x; +- cmp = vcageq_f64 (d->range_val, x); +- cmp = vceqzq_u64 (cmp); /* cmp = ~cmp. */ ++ cmp = vcageq_f64 (x, d->range_val); + #endif + + /* n = rint(|x|/pi). */ +diff --git a/sysdeps/aarch64/fpu/sinf_advsimd.c b/sysdeps/aarch64/fpu/sinf_advsimd.c +index 60cf3f2ca1..375dfc3331 100644 +--- a/sysdeps/aarch64/fpu/sinf_advsimd.c ++++ b/sysdeps/aarch64/fpu/sinf_advsimd.c +@@ -67,8 +67,7 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (sin) (float32x4_t x) + r = vbslq_f32 (cmp, vreinterpretq_f32_u32 (cmp), x); + #else + r = x; +- cmp = vcageq_f32 (d->range_val, x); +- cmp = vceqzq_u32 (cmp); /* cmp = ~cmp. */ ++ cmp = vcageq_f32 (x, d->range_val); + #endif + + /* n = rint(|x|/pi) */ +diff --git a/sysdeps/aarch64/fpu/tan_advsimd.c b/sysdeps/aarch64/fpu/tan_advsimd.c +index d7e5ba7b1a..0459821ab2 100644 +--- a/sysdeps/aarch64/fpu/tan_advsimd.c ++++ b/sysdeps/aarch64/fpu/tan_advsimd.c +@@ -23,7 +23,7 @@ + static const struct data + { + float64x2_t poly[9]; +- float64x2_t half_pi_hi, half_pi_lo, two_over_pi, shift; ++ float64x2_t half_pi, two_over_pi, shift; + #if !WANT_SIMD_EXCEPT + float64x2_t range_val; + #endif +@@ -34,8 +34,7 @@ static const struct data + V2 (0x1.226e5e5ecdfa3p-7), V2 (0x1.d6c7ddbf87047p-9), + V2 (0x1.7ea75d05b583ep-10), V2 (0x1.289f22964a03cp-11), + V2 (0x1.4e4fd14147622p-12) }, +- .half_pi_hi = V2 (0x1.921fb54442d18p0), +- .half_pi_lo = V2 (0x1.1a62633145c07p-54), ++ .half_pi = { 0x1.921fb54442d18p0, 0x1.1a62633145c07p-54 }, + .two_over_pi = V2 (0x1.45f306dc9c883p-1), + .shift = V2 (0x1.8p52), + #if !WANT_SIMD_EXCEPT +@@ -56,15 +55,15 @@ special_case (float64x2_t x) + + /* Vector approximation for double-precision tan. + Maximum measured error is 3.48 ULP: +- __v_tan(0x1.4457047ef78d8p+20) got -0x1.f6ccd8ecf7dedp+37 +- want -0x1.f6ccd8ecf7deap+37. */ ++ _ZGVnN2v_tan(0x1.4457047ef78d8p+20) got -0x1.f6ccd8ecf7dedp+37 ++ want -0x1.f6ccd8ecf7deap+37. */ + float64x2_t VPCS_ATTR V_NAME_D1 (tan) (float64x2_t x) + { + const struct data *dat = ptr_barrier (&data); +- /* Our argument reduction cannot calculate q with sufficient accuracy for very +- large inputs. Fall back to scalar routine for all lanes if any are too +- large, or Inf/NaN. If fenv exceptions are expected, also fall back for tiny +- input to avoid underflow. */ ++ /* Our argument reduction cannot calculate q with sufficient accuracy for ++ very large inputs. Fall back to scalar routine for all lanes if any are ++ too large, or Inf/NaN. If fenv exceptions are expected, also fall back for ++ tiny input to avoid underflow. */ + #if WANT_SIMD_EXCEPT + uint64x2_t iax = vreinterpretq_u64_f64 (vabsq_f64 (x)); + /* iax - tiny_bound > range_val - tiny_bound. */ +@@ -82,8 +81,8 @@ float64x2_t VPCS_ATTR V_NAME_D1 (tan) (float64x2_t x) + /* Use q to reduce x to r in [-pi/4, pi/4], by: + r = x - q * pi/2, in extended precision. */ + float64x2_t r = x; +- r = vfmsq_f64 (r, q, dat->half_pi_hi); +- r = vfmsq_f64 (r, q, dat->half_pi_lo); ++ r = vfmsq_laneq_f64 (r, q, dat->half_pi, 0); ++ r = vfmsq_laneq_f64 (r, q, dat->half_pi, 1); + /* Further reduce r to [-pi/8, pi/8], to be reconstructed using double angle + formula. */ + r = vmulq_n_f64 (r, 0.5); +@@ -106,14 +105,15 @@ float64x2_t VPCS_ATTR V_NAME_D1 (tan) (float64x2_t x) + and reciprocity around pi/2: + tan(x) = 1 / (tan(pi/2 - x)) + to assemble result using change-of-sign and conditional selection of +- numerator/denominator, dependent on odd/even-ness of q (hence quadrant). */ ++ numerator/denominator, dependent on odd/even-ness of q (hence quadrant). ++ */ + float64x2_t n = vfmaq_f64 (v_f64 (-1), p, p); + float64x2_t d = vaddq_f64 (p, p); + + uint64x2_t no_recip = vtstq_u64 (vreinterpretq_u64_s64 (qi), v_u64 (1)); + + #if !WANT_SIMD_EXCEPT +- uint64x2_t special = vceqzq_u64 (vcaleq_f64 (x, dat->range_val)); ++ uint64x2_t special = vcageq_f64 (x, dat->range_val); + if (__glibc_unlikely (v_any_u64 (special))) + return special_case (x); + #endif +diff --git a/sysdeps/aarch64/fpu/tanf_advsimd.c b/sysdeps/aarch64/fpu/tanf_advsimd.c +index 1f16103f8a..5a7489390a 100644 +--- a/sysdeps/aarch64/fpu/tanf_advsimd.c ++++ b/sysdeps/aarch64/fpu/tanf_advsimd.c +@@ -23,7 +23,8 @@ + static const struct data + { + float32x4_t poly[6]; +- float32x4_t neg_half_pi_1, neg_half_pi_2, neg_half_pi_3, two_over_pi, shift; ++ float32x4_t pi_consts; ++ float32x4_t shift; + #if !WANT_SIMD_EXCEPT + float32x4_t range_val; + #endif +@@ -31,10 +32,9 @@ static const struct data + /* Coefficients generated using FPMinimax. */ + .poly = { V4 (0x1.55555p-2f), V4 (0x1.11166p-3f), V4 (0x1.b88a78p-5f), + V4 (0x1.7b5756p-6f), V4 (0x1.4ef4cep-8f), V4 (0x1.0e1e74p-7f) }, +- .neg_half_pi_1 = V4 (-0x1.921fb6p+0f), +- .neg_half_pi_2 = V4 (0x1.777a5cp-25f), +- .neg_half_pi_3 = V4 (0x1.ee59dap-50f), +- .two_over_pi = V4 (0x1.45f306p-1f), ++ /* Stores constants: (-pi/2)_high, (-pi/2)_mid, (-pi/2)_low, and 2/pi. */ ++ .pi_consts ++ = { -0x1.921fb6p+0f, 0x1.777a5cp-25f, 0x1.ee59dap-50f, 0x1.45f306p-1f }, + .shift = V4 (0x1.8p+23f), + #if !WANT_SIMD_EXCEPT + .range_val = V4 (0x1p15f), +@@ -58,10 +58,11 @@ eval_poly (float32x4_t z, const struct data *d) + { + float32x4_t z2 = vmulq_f32 (z, z); + #if WANT_SIMD_EXCEPT +- /* Tiny z (<= 0x1p-31) will underflow when calculating z^4. If fp exceptions +- are to be triggered correctly, sidestep this by fixing such lanes to 0. */ ++ /* Tiny z (<= 0x1p-31) will underflow when calculating z^4. ++ If fp exceptions are to be triggered correctly, ++ sidestep this by fixing such lanes to 0. */ + uint32x4_t will_uflow +- = vcleq_u32 (vreinterpretq_u32_f32 (vabsq_f32 (z)), TinyBound); ++ = vcleq_u32 (vreinterpretq_u32_f32 (vabsq_f32 (z)), TinyBound); + if (__glibc_unlikely (v_any_u32 (will_uflow))) + z2 = vbslq_f32 (will_uflow, v_f32 (0), z2); + #endif +@@ -94,16 +95,16 @@ float32x4_t VPCS_ATTR NOINLINE V_NAME_F1 (tan) (float32x4_t x) + #endif + + /* n = rint(x/(pi/2)). */ +- float32x4_t q = vfmaq_f32 (d->shift, d->two_over_pi, x); ++ float32x4_t q = vfmaq_laneq_f32 (d->shift, x, d->pi_consts, 3); + float32x4_t n = vsubq_f32 (q, d->shift); + /* Determine if x lives in an interval, where |tan(x)| grows to infinity. */ + uint32x4_t pred_alt = vtstq_u32 (vreinterpretq_u32_f32 (q), v_u32 (1)); + + /* r = x - n * (pi/2) (range reduction into -pi./4 .. pi/4). */ + float32x4_t r; +- r = vfmaq_f32 (x, d->neg_half_pi_1, n); +- r = vfmaq_f32 (r, d->neg_half_pi_2, n); +- r = vfmaq_f32 (r, d->neg_half_pi_3, n); ++ r = vfmaq_laneq_f32 (x, n, d->pi_consts, 0); ++ r = vfmaq_laneq_f32 (r, n, d->pi_consts, 1); ++ r = vfmaq_laneq_f32 (r, n, d->pi_consts, 2); + + /* If x lives in an interval, where |tan(x)| + - is finite, then use a polynomial approximation of the form + +commit 395a89f61e19fa916ae4cc93fc10d81a28ce3039 +Author: Szabolcs Nagy +Date: Wed Mar 13 14:34:14 2024 +0000 + + aarch64: fix check for SVE support in assembler + + Due to GCC bug 110901 -mcpu can override -march setting when compiling + asm code and thus a compiler targetting a specific cpu can fail the + configure check even when binutils gas supports SVE. + + The workaround is that explicit .arch directive overrides both -mcpu + and -march, and since that's what the actual SVE memcpy uses the + configure check should use that too even if the GCC issue is fixed + independently. + + Reviewed-by: Florian Weimer + (cherry picked from commit 73c26018ed0ecd9c807bb363cc2c2ab4aca66a82) + +diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure +old mode 100644 +new mode 100755 +index ca57edce47..9606137e8d +--- a/sysdeps/aarch64/configure ++++ b/sysdeps/aarch64/configure +@@ -325,9 +325,10 @@ then : + printf %s "(cached) " >&6 + else $as_nop + cat > conftest.s <<\EOF +- ptrue p0.b ++ .arch armv8.2-a+sve ++ ptrue p0.b + EOF +-if { ac_try='${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&5' ++if { ac_try='${CC-cc} -c conftest.s 1>&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac +index 27874eceb4..56d12d661d 100644 +--- a/sysdeps/aarch64/configure.ac ++++ b/sysdeps/aarch64/configure.ac +@@ -90,9 +90,10 @@ LIBC_CONFIG_VAR([aarch64-variant-pcs], [$libc_cv_aarch64_variant_pcs]) + # Check if asm support armv8.2-a+sve + AC_CACHE_CHECK([for SVE support in assembler], [libc_cv_aarch64_sve_asm], [dnl + cat > conftest.s <<\EOF +- ptrue p0.b ++ .arch armv8.2-a+sve ++ ptrue p0.b + EOF +-if AC_TRY_COMMAND(${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&AS_MESSAGE_LOG_FD); then ++if AC_TRY_COMMAND(${CC-cc} -c conftest.s 1>&AS_MESSAGE_LOG_FD); then + libc_cv_aarch64_sve_asm=yes + else + libc_cv_aarch64_sve_asm=no + +commit 9d92452c70805a2e2dbbdb2b1ffc34bd86e1c8df +Author: Wilco Dijkstra +Date: Thu Mar 21 16:48:33 2024 +0000 + + AArch64: Check kernel version for SVE ifuncs + + Old Linux kernels disable SVE after every system call. Calling the + SVE-optimized memcpy afterwards will then cause a trap to reenable SVE. + As a result, applications with a high use of syscalls may run slower with + the SVE memcpy. This is true for kernels between 4.15.0 and before 6.2.0, + except for 5.14.0 which was patched. Avoid this by checking the kernel + version and selecting the SVE ifunc on modern kernels. + + Parse the kernel version reported by uname() into a 24-bit kernel.major.minor + value without calling any library functions. If uname() is not supported or + if the version format is not recognized, assume the kernel is modern. + + Tested-by: Florian Weimer + Reviewed-by: Szabolcs Nagy + (cherry picked from commit 2e94e2f5d2bf2de124c8ad7da85463355e54ccb2) + +diff --git a/sysdeps/aarch64/cpu-features.h b/sysdeps/aarch64/cpu-features.h +index 77a782422a..5f2da91ebb 100644 +--- a/sysdeps/aarch64/cpu-features.h ++++ b/sysdeps/aarch64/cpu-features.h +@@ -71,6 +71,7 @@ struct cpu_features + /* Currently, the GLIBC memory tagging tunable only defines 8 bits. */ + uint8_t mte_state; + bool sve; ++ bool prefer_sve_ifuncs; + bool mops; + }; + +diff --git a/sysdeps/aarch64/multiarch/init-arch.h b/sysdeps/aarch64/multiarch/init-arch.h +index c52860efb2..61dc40088f 100644 +--- a/sysdeps/aarch64/multiarch/init-arch.h ++++ b/sysdeps/aarch64/multiarch/init-arch.h +@@ -36,5 +36,7 @@ + MTE_ENABLED (); \ + bool __attribute__((unused)) sve = \ + GLRO(dl_aarch64_cpu_features).sve; \ ++ bool __attribute__((unused)) prefer_sve_ifuncs = \ ++ GLRO(dl_aarch64_cpu_features).prefer_sve_ifuncs; \ + bool __attribute__((unused)) mops = \ + GLRO(dl_aarch64_cpu_features).mops; +diff --git a/sysdeps/aarch64/multiarch/memcpy.c b/sysdeps/aarch64/multiarch/memcpy.c +index d12eccfca5..ce53567dab 100644 +--- a/sysdeps/aarch64/multiarch/memcpy.c ++++ b/sysdeps/aarch64/multiarch/memcpy.c +@@ -47,7 +47,7 @@ select_memcpy_ifunc (void) + { + if (IS_A64FX (midr)) + return __memcpy_a64fx; +- return __memcpy_sve; ++ return prefer_sve_ifuncs ? __memcpy_sve : __memcpy_generic; + } + + if (IS_THUNDERX (midr)) +diff --git a/sysdeps/aarch64/multiarch/memmove.c b/sysdeps/aarch64/multiarch/memmove.c +index 2081eeb4d4..fe95037be3 100644 +--- a/sysdeps/aarch64/multiarch/memmove.c ++++ b/sysdeps/aarch64/multiarch/memmove.c +@@ -47,7 +47,7 @@ select_memmove_ifunc (void) + { + if (IS_A64FX (midr)) + return __memmove_a64fx; +- return __memmove_sve; ++ return prefer_sve_ifuncs ? __memmove_sve : __memmove_generic; + } + + if (IS_THUNDERX (midr)) +diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c +index b1a3f673f0..c0b047bc0d 100644 +--- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c ++++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + + #define DCZID_DZP_MASK (1 << 4) +@@ -62,6 +63,46 @@ get_midr_from_mcpu (const struct tunable_str_t *mcpu) + return UINT64_MAX; + } + ++#if __LINUX_KERNEL_VERSION < 0x060200 ++ ++/* Return true if we prefer using SVE in string ifuncs. Old kernels disable ++ SVE after every system call which results in unnecessary traps if memcpy ++ uses SVE. This is true for kernels between 4.15.0 and before 6.2.0, except ++ for 5.14.0 which was patched. For these versions return false to avoid using ++ SVE ifuncs. ++ Parse the kernel version into a 24-bit kernel.major.minor value without ++ calling any library functions. If uname() is not supported or if the version ++ format is not recognized, assume the kernel is modern and return true. */ ++ ++static inline bool ++prefer_sve_ifuncs (void) ++{ ++ struct utsname buf; ++ const char *p = &buf.release[0]; ++ int kernel = 0; ++ int val; ++ ++ if (__uname (&buf) < 0) ++ return true; ++ ++ for (int shift = 16; shift >= 0; shift -= 8) ++ { ++ for (val = 0; *p >= '0' && *p <= '9'; p++) ++ val = val * 10 + *p - '0'; ++ kernel |= (val & 255) << shift; ++ if (*p++ != '.') ++ break; ++ } ++ ++ if (kernel >= 0x060200 || kernel == 0x050e00) ++ return true; ++ if (kernel >= 0x040f00) ++ return false; ++ return true; ++} ++ ++#endif ++ + static inline void + init_cpu_features (struct cpu_features *cpu_features) + { +@@ -126,6 +167,13 @@ init_cpu_features (struct cpu_features *cpu_features) + /* Check if SVE is supported. */ + cpu_features->sve = GLRO (dl_hwcap) & HWCAP_SVE; + ++ cpu_features->prefer_sve_ifuncs = cpu_features->sve; ++ ++#if __LINUX_KERNEL_VERSION < 0x060200 ++ if (cpu_features->sve) ++ cpu_features->prefer_sve_ifuncs = prefer_sve_ifuncs (); ++#endif ++ + /* Check if MOPS is supported. */ + cpu_features->mops = GLRO (dl_hwcap2) & HWCAP2_MOPS; + } + +commit 9883f4304cfb1558d0f1e6d9f48c4ab0a35355fe +Author: H.J. Lu +Date: Wed Feb 28 09:51:14 2024 -0800 + + x86-64: Don't use SSE resolvers for ISA level 3 or above + + When glibc is built with ISA level 3 or above enabled, SSE resolvers + aren't available and glibc fails to build: + + ld: .../elf/librtld.os: in function `init_cpu_features': + .../elf/../sysdeps/x86/cpu-features.c:1200:(.text+0x1445f): undefined reference to `_dl_runtime_resolve_fxsave' + ld: .../elf/librtld.os: relocation R_X86_64_PC32 against undefined hidden symbol `_dl_runtime_resolve_fxsave' can not be used when making a shared object + /usr/local/bin/ld: final link failed: bad value + + For ISA level 3 or above, don't use _dl_runtime_resolve_fxsave nor + _dl_tlsdesc_dynamic_fxsave. + + This fixes BZ #31429. + Reviewed-by: Noah Goldstein + + (cherry picked from commit befe2d3c4dec8be2cdd01a47132e47bdb7020922) + +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index 6fe1b728c6..b8abe733ab 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -1198,7 +1199,9 @@ no_cpuid: + TUNABLE_CALLBACK (set_x86_shstk)); + #endif + ++#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL + if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) ++#endif + { + if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)) + { +@@ -1219,22 +1222,24 @@ no_cpuid: + #endif + } + } ++#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL + else + { +-#ifdef __x86_64__ ++# ifdef __x86_64__ + GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave; +-# ifdef SHARED ++# ifdef SHARED + GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; +-# endif +-#else +-# ifdef SHARED ++# endif ++# else ++# ifdef SHARED + if (CPU_FEATURE_USABLE_P (cpu_features, FXSR)) + GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; + else + GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave; ++# endif + # endif +-#endif + } ++#endif + + #ifdef SHARED + # ifdef __x86_64__ +diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S +index ea69f5223a..057a10862a 100644 +--- a/sysdeps/x86_64/dl-tlsdesc.S ++++ b/sysdeps/x86_64/dl-tlsdesc.S +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include "tlsdesc.h" + #include "dl-trampoline-save.h" + +@@ -79,12 +80,14 @@ _dl_tlsdesc_undefweak: + .size _dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak + + #ifdef SHARED +-# define USE_FXSAVE +-# define STATE_SAVE_ALIGNMENT 16 +-# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave +-# include "dl-tlsdesc-dynamic.h" +-# undef _dl_tlsdesc_dynamic +-# undef USE_FXSAVE ++# if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL ++# define USE_FXSAVE ++# define STATE_SAVE_ALIGNMENT 16 ++# define _dl_tlsdesc_dynamic _dl_tlsdesc_dynamic_fxsave ++# include "dl-tlsdesc-dynamic.h" ++# undef _dl_tlsdesc_dynamic ++# undef USE_FXSAVE ++# endif + + # define USE_XSAVE + # define STATE_SAVE_ALIGNMENT 64 + +commit 7b92f46f04c6cbce19d19ae1099628431858996c +Author: Sunil K Pandey +Date: Thu Feb 29 17:57:02 2024 -0800 + + x86-64: Simplify minimum ISA check ifdef conditional with if + + Replace minimum ISA check ifdef conditional with if. Since + MINIMUM_X86_ISA_LEVEL and AVX_X86_ISA_LEVEL are compile time constants, + compiler will perform constant folding optimization, getting same + results. + + Reviewed-by: H.J. Lu + (cherry picked from commit b6e3898194bbae78910bbe9cd086937014961e45) + +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index b8abe733ab..3d7c2819d7 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -1199,9 +1199,8 @@ no_cpuid: + TUNABLE_CALLBACK (set_x86_shstk)); + #endif + +-#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL +- if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) +-#endif ++ if (MINIMUM_X86_ISA_LEVEL >= AVX_X86_ISA_LEVEL ++ || (GLRO(dl_x86_cpu_features).xsave_state_size != 0)) + { + if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)) + { +@@ -1222,24 +1221,22 @@ no_cpuid: + #endif + } + } +-#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL + else + { +-# ifdef __x86_64__ ++#ifdef __x86_64__ + GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave; +-# ifdef SHARED ++# ifdef SHARED + GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; +-# endif +-# else +-# ifdef SHARED ++# endif ++#else ++# ifdef SHARED + if (CPU_FEATURE_USABLE_P (cpu_features, FXSR)) + GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; + else + GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave; +-# endif + # endif +- } + #endif ++ } + + #ifdef SHARED + # ifdef __x86_64__ + +commit edb9a76e3008725e9dc035d38a58e849a3bde0f1 +Author: Florian Weimer +Date: Sun Apr 14 08:24:51 2024 +0200 + + powerpc: Fix ld.so address determination for PCREL mode (bug 31640) + + This seems to have stopped working with some GCC 14 versions, + which clobber r2. With other compilers, the kernel-provided + r2 value is still available at this point. + + Reviewed-by: Peter Bergner + (cherry picked from commit 14e56bd4ce15ac2d1cc43f762eb2e6b83fec1afe) + +diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h +index c6682f3445..2b6f5d2b08 100644 +--- a/sysdeps/powerpc/powerpc64/dl-machine.h ++++ b/sysdeps/powerpc/powerpc64/dl-machine.h +@@ -78,6 +78,7 @@ elf_host_tolerates_class (const Elf64_Ehdr *ehdr) + static inline Elf64_Addr + elf_machine_load_address (void) __attribute__ ((const)); + ++#ifndef __PCREL__ + static inline Elf64_Addr + elf_machine_load_address (void) + { +@@ -105,6 +106,24 @@ elf_machine_dynamic (void) + /* Then subtract off the load address offset. */ + return runtime_dynamic - elf_machine_load_address() ; + } ++#else /* __PCREL__ */ ++/* In PCREL mode, r2 may have been clobbered. Rely on relative ++ relocations instead. */ ++ ++static inline ElfW(Addr) ++elf_machine_load_address (void) ++{ ++ extern const ElfW(Ehdr) __ehdr_start attribute_hidden; ++ return (ElfW(Addr)) &__ehdr_start; ++} ++ ++static inline ElfW(Addr) ++elf_machine_dynamic (void) ++{ ++ extern ElfW(Dyn) _DYNAMIC[] attribute_hidden; ++ return (ElfW(Addr)) _DYNAMIC - elf_machine_load_address (); ++} ++#endif /* __PCREL__ */ + + /* The PLT uses Elf64_Rela relocs. */ + #define elf_machine_relplt elf_machine_rela + +commit 04df8652eb1919da18d54b3dcd6db1675993d45d +Author: H.J. Lu +Date: Thu Feb 15 11:19:56 2024 -0800 + + Apply the Makefile sorting fix + + Apply the Makefile sorting fix generated by sort-makefile-lines.py. + + (cherry picked from commit ef7f4b1fef67430a8f3cfc77fa6aada2add851d7) + +diff --git a/sysdeps/loongarch/lp64/multiarch/Makefile b/sysdeps/loongarch/lp64/multiarch/Makefile +index fe863e1ba4..01762ef526 100644 +--- a/sysdeps/loongarch/lp64/multiarch/Makefile ++++ b/sysdeps/loongarch/lp64/multiarch/Makefile +@@ -1,52 +1,52 @@ + ifeq ($(subdir),string) + sysdep_routines += \ +- strlen-aligned \ +- strlen-lsx \ +- strlen-lasx \ +- strnlen-aligned \ +- strnlen-lsx \ +- strnlen-lasx \ ++ memchr-aligned \ ++ memchr-lasx \ ++ memchr-lsx \ ++ memcmp-aligned \ ++ memcmp-lasx \ ++ memcmp-lsx \ ++ memcpy-aligned \ ++ memcpy-unaligned \ ++ memmove-lasx \ ++ memmove-lsx \ ++ memmove-unaligned \ ++ memrchr-generic \ ++ memrchr-lasx \ ++ memrchr-lsx \ ++ memset-aligned \ ++ memset-lasx \ ++ memset-lsx \ ++ memset-unaligned \ ++ rawmemchr-aligned \ ++ rawmemchr-lasx \ ++ rawmemchr-lsx \ ++ stpcpy-aligned \ ++ stpcpy-lasx \ ++ stpcpy-lsx \ ++ stpcpy-unaligned \ + strchr-aligned \ +- strchr-lsx \ + strchr-lasx \ +- strrchr-aligned \ +- strrchr-lsx \ +- strrchr-lasx \ ++ strchr-lsx \ + strchrnul-aligned \ +- strchrnul-lsx \ + strchrnul-lasx \ ++ strchrnul-lsx \ + strcmp-aligned \ + strcmp-lsx \ +- strncmp-aligned \ +- strncmp-lsx \ + strcpy-aligned \ +- strcpy-unaligned \ +- strcpy-lsx \ + strcpy-lasx \ +- stpcpy-aligned \ +- stpcpy-unaligned \ +- stpcpy-lsx \ +- stpcpy-lasx \ +- memcpy-aligned \ +- memcpy-unaligned \ +- memmove-unaligned \ +- memmove-lsx \ +- memmove-lasx \ +- rawmemchr-aligned \ +- rawmemchr-lsx \ +- rawmemchr-lasx \ +- memchr-aligned \ +- memchr-lsx \ +- memchr-lasx \ +- memrchr-generic \ +- memrchr-lsx \ +- memrchr-lasx \ +- memset-aligned \ +- memset-unaligned \ +- memset-lsx \ +- memset-lasx \ +- memcmp-aligned \ +- memcmp-lsx \ +- memcmp-lasx \ ++ strcpy-lsx \ ++ strcpy-unaligned \ ++ strlen-aligned \ ++ strlen-lasx \ ++ strlen-lsx \ ++ strncmp-aligned \ ++ strncmp-lsx \ ++ strnlen-aligned \ ++ strnlen-lasx \ ++ strnlen-lsx \ ++ strrchr-aligned \ ++ strrchr-lasx \ ++ strrchr-lsx \ + # sysdep_routines + endif +diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile +index 992aabe43e..5311b594af 100644 +--- a/sysdeps/x86/Makefile ++++ b/sysdeps/x86/Makefile +@@ -15,18 +15,18 @@ CFLAGS-dl-get-cpu-features.os += $(rtld-early-cflags) + CFLAGS-get-cpuid-feature-leaf.o += $(no-stack-protector) + + tests += \ +- tst-get-cpu-features \ +- tst-get-cpu-features-static \ + tst-cpu-features-cpuinfo \ + tst-cpu-features-cpuinfo-static \ + tst-cpu-features-supports \ + tst-cpu-features-supports-static \ ++ tst-get-cpu-features \ ++ tst-get-cpu-features-static \ + tst-hwcap-tunables \ + # tests + tests-static += \ +- tst-get-cpu-features-static \ + tst-cpu-features-cpuinfo-static \ + tst-cpu-features-supports-static \ ++ tst-get-cpu-features-static \ + # tests-static + ifeq (yes,$(have-ifunc)) + ifeq (yes,$(have-gcc-ifunc)) +diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile +index 9d374a3299..0ede447405 100644 +--- a/sysdeps/x86_64/Makefile ++++ b/sysdeps/x86_64/Makefile +@@ -252,6 +252,10 @@ sysdep-dl-routines += dl-cet + + tests += \ + tst-cet-legacy-1 \ ++ tst-cet-legacy-10 \ ++ tst-cet-legacy-10-static \ ++ tst-cet-legacy-10a \ ++ tst-cet-legacy-10a-static \ + tst-cet-legacy-1a \ + tst-cet-legacy-2 \ + tst-cet-legacy-2a \ +@@ -263,15 +267,11 @@ tests += \ + tst-cet-legacy-8 \ + tst-cet-legacy-9 \ + tst-cet-legacy-9-static \ +- tst-cet-legacy-10 \ +- tst-cet-legacy-10-static \ +- tst-cet-legacy-10a \ +- tst-cet-legacy-10a-static \ + # tests + tests-static += \ +- tst-cet-legacy-9-static \ + tst-cet-legacy-10-static \ + tst-cet-legacy-10a-static \ ++ tst-cet-legacy-9-static \ + # tests-static + tst-cet-legacy-1a-ARGS = -- $(host-test-program-cmd) + +diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile +index ea81753b70..e1a490dd98 100644 +--- a/sysdeps/x86_64/fpu/multiarch/Makefile ++++ b/sysdeps/x86_64/fpu/multiarch/Makefile +@@ -4,10 +4,10 @@ libm-sysdep_routines += \ + s_ceilf-c \ + s_floor-c \ + s_floorf-c \ +- s_rint-c \ +- s_rintf-c \ + s_nearbyint-c \ + s_nearbyintf-c \ ++ s_rint-c \ ++ s_rintf-c \ + s_roundeven-c \ + s_roundevenf-c \ + s_trunc-c \ +@@ -21,10 +21,10 @@ libm-sysdep_routines += \ + s_floorf-sse4_1 \ + s_nearbyint-sse4_1 \ + s_nearbyintf-sse4_1 \ +- s_roundeven-sse4_1 \ +- s_roundevenf-sse4_1 \ + s_rint-sse4_1 \ + s_rintf-sse4_1 \ ++ s_roundeven-sse4_1 \ ++ s_roundevenf-sse4_1 \ + s_trunc-sse4_1 \ + s_truncf-sse4_1 \ + # libm-sysdep_routines +@@ -84,12 +84,12 @@ CFLAGS-s_cosf-fma.c = -mfma -mavx2 + CFLAGS-s_sincosf-fma.c = -mfma -mavx2 + + libm-sysdep_routines += \ ++ e_asin-fma4 \ ++ e_atan2-fma4 \ + e_exp-fma4 \ + e_log-fma4 \ + e_pow-fma4 \ +- e_asin-fma4 \ + s_atan-fma4 \ +- e_atan2-fma4 \ + s_sin-fma4 \ + s_sincos-fma4 \ + s_tan-fma4 \ +@@ -106,10 +106,10 @@ CFLAGS-s_tan-fma4.c = -mfma4 + CFLAGS-s_sincos-fma4.c = -mfma4 + + libm-sysdep_routines += \ ++ e_atan2-avx \ + e_exp-avx \ + e_log-avx \ + s_atan-avx \ +- e_atan2-avx \ + s_sin-avx \ + s_sincos-avx \ + s_tan-avx \ +diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile +index e1e894c963..d3d2270394 100644 +--- a/sysdeps/x86_64/multiarch/Makefile ++++ b/sysdeps/x86_64/multiarch/Makefile +@@ -4,8 +4,8 @@ sysdep_routines += \ + memchr-avx2 \ + memchr-avx2-rtm \ + memchr-evex \ +- memchr-evex512 \ + memchr-evex-rtm \ ++ memchr-evex512 \ + memchr-sse2 \ + memcmp-avx2-movbe \ + memcmp-avx2-movbe-rtm \ +@@ -37,8 +37,8 @@ sysdep_routines += \ + rawmemchr-avx2 \ + rawmemchr-avx2-rtm \ + rawmemchr-evex \ +- rawmemchr-evex512 \ + rawmemchr-evex-rtm \ ++ rawmemchr-evex512 \ + rawmemchr-sse2 \ + stpcpy-avx2 \ + stpcpy-avx2-rtm \ + +commit 423099a03264ea28298f47355d7811b8efe03c97 +Author: Sunil K Pandey +Date: Tue Feb 13 12:23:14 2024 -0800 + + x86_64: Exclude SSE, AVX and FMA4 variants in libm multiarch + + When glibc is built with ISA level 3 or higher by default, the resulting + glibc binaries won't run on SSE or FMA4 processors. Exclude SSE, AVX and + FMA4 variants in libm multiarch when ISA level 3 or higher is enabled by + default. + + When glibc is built with ISA level 2 enabled by default, only keep SSE4.1 + variant. + + Fixes BZ 31335. + + NB: elf/tst-valgrind-smoke test fails with ISA level 4, because valgrind + doesn't support AVX512 instructions: + + https://bugs.kde.org/show_bug.cgi?id=383010 + + Reviewed-by: H.J. Lu + (cherry picked from commit 9f78a7c1d0963282608da836b840f0d5ae1c478e) + +diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure +index 1f4c2d67fd..2a5421bb31 100644 +--- a/sysdeps/x86/configure ++++ b/sysdeps/x86/configure +@@ -98,6 +98,7 @@ printf "%s\n" "$libc_cv_have_x86_lahf_sahf" >&6; } + if test $libc_cv_have_x86_lahf_sahf = yes; then + printf "%s\n" "#define HAVE_X86_LAHF_SAHF 1" >>confdefs.h + ++ ISAFLAG="-DHAVE_X86_LAHF_SAHF" + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MOVBE instruction support" >&5 + printf %s "checking for MOVBE instruction support... " >&6; } +@@ -120,9 +121,41 @@ printf "%s\n" "$libc_cv_have_x86_movbe" >&6; } + if test $libc_cv_have_x86_movbe = yes; then + printf "%s\n" "#define HAVE_X86_MOVBE 1" >>confdefs.h + ++ ISAFLAG="$ISAFLAG -DHAVE_X86_MOVBE" + fi ++ ++ # Check for ISA level support. ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ISA level support" >&5 ++printf %s "checking for ISA level support... " >&6; } ++if test ${libc_cv_have_x86_isa_level+y} ++then : ++ printf %s "(cached) " >&6 ++else $as_nop ++ cat > conftest.c < ++#if MINIMUM_X86_ISA_LEVEL >= 4 ++libc_cv_have_x86_isa_level=4 ++#elif MINIMUM_X86_ISA_LEVEL == 3 ++libc_cv_have_x86_isa_level=3 ++#elif MINIMUM_X86_ISA_LEVEL == 2 ++libc_cv_have_x86_isa_level=2 ++#else ++libc_cv_have_x86_isa_level=baseline ++#endif ++EOF ++ eval `${CC-cc} $CFLAGS $CPPFLAGS $ISAFLAG -I$srcdir -E conftest.c | grep libc_cv_have_x86_isa_level` ++ rm -rf conftest* ++fi ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_have_x86_isa_level" >&5 ++printf "%s\n" "$libc_cv_have_x86_isa_level" >&6; } ++else ++ libc_cv_have_x86_isa_level=baseline + fi + config_vars="$config_vars ++have-x86-isa-level = $libc_cv_have_x86_isa_level" ++config_vars="$config_vars ++x86-isa-level-3-or-above = 3 4" ++config_vars="$config_vars + enable-x86-isa-level = $libc_cv_include_x86_isa_level" + + printf "%s\n" "#define SUPPORT_STATIC_PIE 1" >>confdefs.h +diff --git a/sysdeps/x86/configure.ac b/sysdeps/x86/configure.ac +index 437a50623b..78ff7c8f41 100644 +--- a/sysdeps/x86/configure.ac ++++ b/sysdeps/x86/configure.ac +@@ -72,6 +72,7 @@ if test $libc_cv_include_x86_isa_level = yes; then + fi]) + if test $libc_cv_have_x86_lahf_sahf = yes; then + AC_DEFINE(HAVE_X86_LAHF_SAHF) ++ ISAFLAG="-DHAVE_X86_LAHF_SAHF" + fi + AC_CACHE_CHECK([for MOVBE instruction support], + libc_cv_have_x86_movbe, [dnl +@@ -81,8 +82,31 @@ if test $libc_cv_include_x86_isa_level = yes; then + fi]) + if test $libc_cv_have_x86_movbe = yes; then + AC_DEFINE(HAVE_X86_MOVBE) ++ ISAFLAG="$ISAFLAG -DHAVE_X86_MOVBE" + fi ++ ++ # Check for ISA level support. ++ AC_CACHE_CHECK([for ISA level support], ++ libc_cv_have_x86_isa_level, [dnl ++cat > conftest.c < ++#if MINIMUM_X86_ISA_LEVEL >= 4 ++libc_cv_have_x86_isa_level=4 ++#elif MINIMUM_X86_ISA_LEVEL == 3 ++libc_cv_have_x86_isa_level=3 ++#elif MINIMUM_X86_ISA_LEVEL == 2 ++libc_cv_have_x86_isa_level=2 ++#else ++libc_cv_have_x86_isa_level=baseline ++#endif ++EOF ++ eval `${CC-cc} $CFLAGS $CPPFLAGS $ISAFLAG -I$srcdir -E conftest.c | grep libc_cv_have_x86_isa_level` ++ rm -rf conftest*]) ++else ++ libc_cv_have_x86_isa_level=baseline + fi ++LIBC_CONFIG_VAR([have-x86-isa-level], [$libc_cv_have_x86_isa_level]) ++LIBC_CONFIG_VAR([x86-isa-level-3-or-above], [3 4]) + LIBC_CONFIG_VAR([enable-x86-isa-level], [$libc_cv_include_x86_isa_level]) + + dnl Static PIE is supported. +diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile +index e1a490dd98..6ddd50240c 100644 +--- a/sysdeps/x86_64/fpu/multiarch/Makefile ++++ b/sysdeps/x86_64/fpu/multiarch/Makefile +@@ -1,49 +1,4 @@ + ifeq ($(subdir),math) +-libm-sysdep_routines += \ +- s_ceil-c \ +- s_ceilf-c \ +- s_floor-c \ +- s_floorf-c \ +- s_nearbyint-c \ +- s_nearbyintf-c \ +- s_rint-c \ +- s_rintf-c \ +- s_roundeven-c \ +- s_roundevenf-c \ +- s_trunc-c \ +- s_truncf-c \ +-# libm-sysdep_routines +- +-libm-sysdep_routines += \ +- s_ceil-sse4_1 \ +- s_ceilf-sse4_1 \ +- s_floor-sse4_1 \ +- s_floorf-sse4_1 \ +- s_nearbyint-sse4_1 \ +- s_nearbyintf-sse4_1 \ +- s_rint-sse4_1 \ +- s_rintf-sse4_1 \ +- s_roundeven-sse4_1 \ +- s_roundevenf-sse4_1 \ +- s_trunc-sse4_1 \ +- s_truncf-sse4_1 \ +-# libm-sysdep_routines +- +-libm-sysdep_routines += \ +- e_asin-fma \ +- e_atan2-fma \ +- e_exp-fma \ +- e_log-fma \ +- e_log2-fma \ +- e_pow-fma \ +- s_atan-fma \ +- s_expm1-fma \ +- s_log1p-fma \ +- s_sin-fma \ +- s_sincos-fma \ +- s_tan-fma \ +-# libm-sysdep_routines +- + CFLAGS-e_asin-fma.c = -mfma -mavx2 + CFLAGS-e_atan2-fma.c = -mfma -mavx2 + CFLAGS-e_exp-fma.c = -mfma -mavx2 +@@ -57,23 +12,6 @@ CFLAGS-s_sin-fma.c = -mfma -mavx2 + CFLAGS-s_tan-fma.c = -mfma -mavx2 + CFLAGS-s_sincos-fma.c = -mfma -mavx2 + +-libm-sysdep_routines += \ +- s_cosf-sse2 \ +- s_sincosf-sse2 \ +- s_sinf-sse2 \ +-# libm-sysdep_routines +- +-libm-sysdep_routines += \ +- e_exp2f-fma \ +- e_expf-fma \ +- e_log2f-fma \ +- e_logf-fma \ +- e_powf-fma \ +- s_cosf-fma \ +- s_sincosf-fma \ +- s_sinf-fma \ +-# libm-sysdep_routines +- + CFLAGS-e_exp2f-fma.c = -mfma -mavx2 + CFLAGS-e_expf-fma.c = -mfma -mavx2 + CFLAGS-e_log2f-fma.c = -mfma -mavx2 +@@ -83,17 +21,93 @@ CFLAGS-s_sinf-fma.c = -mfma -mavx2 + CFLAGS-s_cosf-fma.c = -mfma -mavx2 + CFLAGS-s_sincosf-fma.c = -mfma -mavx2 + ++# Check if ISA level is 3 or above. ++ifneq (,$(filter $(have-x86-isa-level),$(x86-isa-level-3-or-above))) + libm-sysdep_routines += \ ++ s_ceil-avx \ ++ s_ceilf-avx \ ++ s_floor-avx \ ++ s_floorf-avx \ ++ s_nearbyint-avx \ ++ s_nearbyintf-avx \ ++ s_rint-avx \ ++ s_rintf-avx \ ++ s_roundeven-avx \ ++ s_roundevenf-avx \ ++ s_trunc-avx \ ++ s_truncf-avx \ ++# libm-sysdep_routines ++else ++libm-sysdep_routines += \ ++ e_asin-fma \ + e_asin-fma4 \ ++ e_atan2-avx \ ++ e_atan2-fma \ + e_atan2-fma4 \ ++ e_exp-avx \ ++ e_exp-fma \ + e_exp-fma4 \ ++ e_exp2f-fma \ ++ e_expf-fma \ ++ e_log-avx \ ++ e_log-fma \ + e_log-fma4 \ ++ e_log2-fma \ ++ e_log2f-fma \ ++ e_logf-fma \ ++ e_pow-fma \ + e_pow-fma4 \ ++ e_powf-fma \ ++ s_atan-avx \ ++ s_atan-fma \ + s_atan-fma4 \ ++ s_ceil-sse4_1 \ ++ s_ceilf-sse4_1 \ ++ s_cosf-fma \ ++ s_cosf-sse2 \ ++ s_expm1-fma \ ++ s_floor-sse4_1 \ ++ s_floorf-sse4_1 \ ++ s_log1p-fma \ ++ s_nearbyint-sse4_1 \ ++ s_nearbyintf-sse4_1 \ ++ s_rint-sse4_1 \ ++ s_rintf-sse4_1 \ ++ s_roundeven-sse4_1 \ ++ s_roundevenf-sse4_1 \ ++ s_sin-avx \ ++ s_sin-fma \ + s_sin-fma4 \ ++ s_sincos-avx \ ++ s_sincos-fma \ + s_sincos-fma4 \ ++ s_sincosf-fma \ ++ s_sincosf-sse2 \ ++ s_sinf-fma \ ++ s_sinf-sse2 \ ++ s_tan-avx \ ++ s_tan-fma \ + s_tan-fma4 \ ++ s_trunc-sse4_1 \ ++ s_truncf-sse4_1 \ + # libm-sysdep_routines ++ifeq ($(have-x86-isa-level),baseline) ++libm-sysdep_routines += \ ++ s_ceil-c \ ++ s_ceilf-c \ ++ s_floor-c \ ++ s_floorf-c \ ++ s_nearbyint-c \ ++ s_nearbyintf-c \ ++ s_rint-c \ ++ s_rintf-c \ ++ s_roundeven-c \ ++ s_roundevenf-c \ ++ s_trunc-c \ ++ s_truncf-c \ ++# libm-sysdep_routines ++endif ++endif + + CFLAGS-e_asin-fma4.c = -mfma4 + CFLAGS-e_atan2-fma4.c = -mfma4 +@@ -105,16 +119,6 @@ CFLAGS-s_sin-fma4.c = -mfma4 + CFLAGS-s_tan-fma4.c = -mfma4 + CFLAGS-s_sincos-fma4.c = -mfma4 + +-libm-sysdep_routines += \ +- e_atan2-avx \ +- e_exp-avx \ +- e_log-avx \ +- s_atan-avx \ +- s_sin-avx \ +- s_sincos-avx \ +- s_tan-avx \ +-# libm-sysdep_routines +- + CFLAGS-e_atan2-avx.c = -msse2avx -DSSE2AVX + CFLAGS-e_exp-avx.c = -msse2avx -DSSE2AVX + CFLAGS-e_log-avx.c = -msse2avx -DSSE2AVX +diff --git a/sysdeps/x86_64/fpu/multiarch/e_asin.c b/sysdeps/x86_64/fpu/multiarch/e_asin.c +index 2eaa6c2c04..d64fca2586 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_asin.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_asin.c +@@ -16,26 +16,29 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include + + extern double __redirect_ieee754_asin (double); + extern double __redirect_ieee754_acos (double); + +-#define SYMBOL_NAME ieee754_asin +-#include "ifunc-fma4.h" ++# define SYMBOL_NAME ieee754_asin ++# include "ifunc-fma4.h" + + libc_ifunc_redirected (__redirect_ieee754_asin, __ieee754_asin, + IFUNC_SELECTOR ()); + libm_alias_finite (__ieee754_asin, __asin) + +-#undef SYMBOL_NAME +-#define SYMBOL_NAME ieee754_acos +-#include "ifunc-fma4.h" ++# undef SYMBOL_NAME ++# define SYMBOL_NAME ieee754_acos ++# include "ifunc-fma4.h" + + libc_ifunc_redirected (__redirect_ieee754_acos, __ieee754_acos, + IFUNC_SELECTOR ()); + libm_alias_finite (__ieee754_acos, __acos) + +-#define __ieee754_acos __ieee754_acos_sse2 +-#define __ieee754_asin __ieee754_asin_sse2 ++# define __ieee754_acos __ieee754_acos_sse2 ++# define __ieee754_asin __ieee754_asin_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/e_atan2.c b/sysdeps/x86_64/fpu/multiarch/e_atan2.c +index 17ee4f3c36..8a86c14ded 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_atan2.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_atan2.c +@@ -16,16 +16,19 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include + + extern double __redirect_ieee754_atan2 (double, double); + +-#define SYMBOL_NAME ieee754_atan2 +-#include "ifunc-avx-fma4.h" ++# define SYMBOL_NAME ieee754_atan2 ++# include "ifunc-avx-fma4.h" + + libc_ifunc_redirected (__redirect_ieee754_atan2, + __ieee754_atan2, IFUNC_SELECTOR ()); + libm_alias_finite (__ieee754_atan2, __atan2) + +-#define __ieee754_atan2 __ieee754_atan2_sse2 ++# define __ieee754_atan2 __ieee754_atan2_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp.c b/sysdeps/x86_64/fpu/multiarch/e_exp.c +index 406b7ebd44..d56329291a 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_exp.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_exp.c +@@ -16,17 +16,20 @@ + License along with the GNU C Library; if not, see + . */ + +-#include +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include ++# include + + extern double __redirect_ieee754_exp (double); + +-#define SYMBOL_NAME ieee754_exp +-#include "ifunc-avx-fma4.h" ++# define SYMBOL_NAME ieee754_exp ++# include "ifunc-avx-fma4.h" + + libc_ifunc_redirected (__redirect_ieee754_exp, __ieee754_exp, + IFUNC_SELECTOR ()); + libm_alias_finite (__ieee754_exp, __exp) + +-#define __exp __ieee754_exp_sse2 ++# define __exp __ieee754_exp_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp2f.c b/sysdeps/x86_64/fpu/multiarch/e_exp2f.c +index 804fd6be85..06fe5028d6 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_exp2f.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_exp2f.c +@@ -16,25 +16,28 @@ + License along with the GNU C Library; if not, see + . */ + +-#include +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include ++# include + + extern float __redirect_exp2f (float); + +-#define SYMBOL_NAME exp2f +-#include "ifunc-fma.h" ++# define SYMBOL_NAME exp2f ++# include "ifunc-fma.h" + + libc_ifunc_redirected (__redirect_exp2f, __exp2f, IFUNC_SELECTOR ()); + +-#ifdef SHARED ++# ifdef SHARED + versioned_symbol (libm, __ieee754_exp2f, exp2f, GLIBC_2_27); + libm_alias_float_other (__exp2, exp2) +-#else ++# else + libm_alias_float (__exp2, exp2) +-#endif ++# endif + + strong_alias (__exp2f, __ieee754_exp2f) + libm_alias_finite (__exp2f, __exp2f) + +-#define __exp2f __exp2f_sse2 ++# define __exp2f __exp2f_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/e_expf.c b/sysdeps/x86_64/fpu/multiarch/e_expf.c +index 4a7e2a5bce..19d767f636 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_expf.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_expf.c +@@ -16,28 +16,31 @@ + License along with the GNU C Library; if not, see + . */ + +-#include +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include ++# include + + extern float __redirect_expf (float); + +-#define SYMBOL_NAME expf +-#include "ifunc-fma.h" ++# define SYMBOL_NAME expf ++# include "ifunc-fma.h" + + libc_ifunc_redirected (__redirect_expf, __expf, IFUNC_SELECTOR ()); + +-#ifdef SHARED ++# ifdef SHARED + __hidden_ver1 (__expf, __GI___expf, __redirect_expf) + __attribute__ ((visibility ("hidden"))); + + versioned_symbol (libm, __ieee754_expf, expf, GLIBC_2_27); + libm_alias_float_other (__exp, exp) +-#else ++# else + libm_alias_float (__exp, exp) +-#endif ++# endif + + strong_alias (__expf, __ieee754_expf) + libm_alias_finite (__expf, __expf) + +-#define __expf __expf_sse2 ++# define __expf __expf_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/e_log.c b/sysdeps/x86_64/fpu/multiarch/e_log.c +index 067fbf58c3..d80c1b1463 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_log.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_log.c +@@ -16,17 +16,20 @@ + License along with the GNU C Library; if not, see + . */ + +-#include +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include ++# include + + extern double __redirect_ieee754_log (double); + +-#define SYMBOL_NAME ieee754_log +-#include "ifunc-avx-fma4.h" ++# define SYMBOL_NAME ieee754_log ++# include "ifunc-avx-fma4.h" + + libc_ifunc_redirected (__redirect_ieee754_log, __ieee754_log, + IFUNC_SELECTOR ()); + libm_alias_finite (__ieee754_log, __log) + +-#define __log __ieee754_log_sse2 ++# define __log __ieee754_log_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/e_log2.c b/sysdeps/x86_64/fpu/multiarch/e_log2.c +index 9c57a2f6cc..9686782c09 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_log2.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_log2.c +@@ -16,28 +16,31 @@ + License along with the GNU C Library; if not, see + . */ + +-#include +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include ++# include + + extern double __redirect_log2 (double); + +-#define SYMBOL_NAME log2 +-#include "ifunc-fma.h" ++# define SYMBOL_NAME log2 ++# include "ifunc-fma.h" + + libc_ifunc_redirected (__redirect_log2, __log2, IFUNC_SELECTOR ()); + +-#ifdef SHARED ++# ifdef SHARED + __hidden_ver1 (__log2, __GI___log2, __redirect_log2) + __attribute__ ((visibility ("hidden"))); + + versioned_symbol (libm, __ieee754_log2, log2, GLIBC_2_29); + libm_alias_double_other (__log2, log2) +-#else ++# else + libm_alias_double (__log2, log2) +-#endif ++# endif + + strong_alias (__log2, __ieee754_log2) + libm_alias_finite (__log2, __log2) + +-#define __log2 __log2_sse2 ++# define __log2 __log2_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/e_log2f.c b/sysdeps/x86_64/fpu/multiarch/e_log2f.c +index 2b45c87f38..8ada46e11e 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_log2f.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_log2f.c +@@ -16,28 +16,31 @@ + License along with the GNU C Library; if not, see + . */ + +-#include +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include ++# include + + extern float __redirect_log2f (float); + +-#define SYMBOL_NAME log2f +-#include "ifunc-fma.h" ++# define SYMBOL_NAME log2f ++# include "ifunc-fma.h" + + libc_ifunc_redirected (__redirect_log2f, __log2f, IFUNC_SELECTOR ()); + +-#ifdef SHARED ++# ifdef SHARED + __hidden_ver1 (__log2f, __GI___log2f, __redirect_log2f) + __attribute__ ((visibility ("hidden"))); + + versioned_symbol (libm, __ieee754_log2f, log2f, GLIBC_2_27); + libm_alias_float_other (__log2, log2) +-#else ++# else + libm_alias_float (__log2, log2) +-#endif ++# endif + + strong_alias (__log2f, __ieee754_log2f) + libm_alias_finite (__log2f, __log2f) + +-#define __log2f __log2f_sse2 ++# define __log2f __log2f_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/e_logf.c b/sysdeps/x86_64/fpu/multiarch/e_logf.c +index 97e23c8fea..a3978d9a8e 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_logf.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_logf.c +@@ -16,28 +16,31 @@ + License along with the GNU C Library; if not, see + . */ + +-#include +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include ++# include + + extern float __redirect_logf (float); + +-#define SYMBOL_NAME logf +-#include "ifunc-fma.h" ++# define SYMBOL_NAME logf ++# include "ifunc-fma.h" + + libc_ifunc_redirected (__redirect_logf, __logf, IFUNC_SELECTOR ()); + +-#ifdef SHARED ++# ifdef SHARED + __hidden_ver1 (__logf, __GI___logf, __redirect_logf) + __attribute__ ((visibility ("hidden"))); + + versioned_symbol (libm, __ieee754_logf, logf, GLIBC_2_27); + libm_alias_float_other (__log, log) +-#else ++# else + libm_alias_float (__log, log) +-#endif ++# endif + + strong_alias (__logf, __ieee754_logf) + libm_alias_finite (__logf, __logf) + +-#define __logf __logf_sse2 ++# define __logf __logf_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/e_pow.c b/sysdeps/x86_64/fpu/multiarch/e_pow.c +index 42618e7112..f8f17aff9f 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_pow.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_pow.c +@@ -16,17 +16,20 @@ + License along with the GNU C Library; if not, see + . */ + +-#include +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include ++# include + + extern double __redirect_ieee754_pow (double, double); + +-#define SYMBOL_NAME ieee754_pow +-#include "ifunc-fma4.h" ++# define SYMBOL_NAME ieee754_pow ++# include "ifunc-fma4.h" + + libc_ifunc_redirected (__redirect_ieee754_pow, + __ieee754_pow, IFUNC_SELECTOR ()); + libm_alias_finite (__ieee754_pow, __pow) + +-#define __pow __ieee754_pow_sse2 ++# define __pow __ieee754_pow_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/e_powf.c b/sysdeps/x86_64/fpu/multiarch/e_powf.c +index 8e6ce13cc1..8b1a4c7d04 100644 +--- a/sysdeps/x86_64/fpu/multiarch/e_powf.c ++++ b/sysdeps/x86_64/fpu/multiarch/e_powf.c +@@ -16,31 +16,34 @@ + License along with the GNU C Library; if not, see + . */ + +-#include +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include ++# include + +-#define powf __redirect_powf +-#define __DECL_SIMD___redirect_powf +-#include +-#undef powf ++# define powf __redirect_powf ++# define __DECL_SIMD___redirect_powf ++# include ++# undef powf + +-#define SYMBOL_NAME powf +-#include "ifunc-fma.h" ++# define SYMBOL_NAME powf ++# include "ifunc-fma.h" + + libc_ifunc_redirected (__redirect_powf, __powf, IFUNC_SELECTOR ()); + +-#ifdef SHARED ++# ifdef SHARED + __hidden_ver1 (__powf, __GI___powf, __redirect_powf) + __attribute__ ((visibility ("hidden"))); + + versioned_symbol (libm, __ieee754_powf, powf, GLIBC_2_27); + libm_alias_float_other (__pow, pow) +-#else ++# else + libm_alias_float (__pow, pow) +-#endif ++# endif + + strong_alias (__powf, __ieee754_powf) + libm_alias_finite (__powf, __powf) + +-#define __powf __powf_sse2 ++# define __powf __powf_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/s_atan.c b/sysdeps/x86_64/fpu/multiarch/s_atan.c +index 71bad096a9..4d2c6ce006 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_atan.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_atan.c +@@ -16,15 +16,18 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include + + extern double __redirect_atan (double); + +-#define SYMBOL_NAME atan +-#include "ifunc-avx-fma4.h" ++# define SYMBOL_NAME atan ++# include "ifunc-avx-fma4.h" + + libc_ifunc_redirected (__redirect_atan, __atan, IFUNC_SELECTOR ()); + libm_alias_double (__atan, atan) + +-#define __atan __atan_sse2 ++# define __atan __atan_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-avx.S b/sysdeps/x86_64/fpu/multiarch/s_ceil-avx.S +new file mode 100644 +index 0000000000..e6c1106753 +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_ceil-avx.S +@@ -0,0 +1,28 @@ ++/* AVX implementation of ceil function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++ .text ++ENTRY(__ceil) ++ vroundsd $10, %xmm0, %xmm0, %xmm0 ++ ret ++END(__ceil) ++ ++libm_alias_double (__ceil, ceil) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S +index 64119011ad..dba756c38f 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S ++++ b/sysdeps/x86_64/fpu/multiarch/s_ceil-sse4_1.S +@@ -17,8 +17,20 @@ + + #include + ++#include ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++# include ++# define __ceil_sse41 __ceil ++ .text ++#else + .section .text.sse4.1,"ax",@progbits ++#endif ++ + ENTRY(__ceil_sse41) + roundsd $10, %xmm0, %xmm0 + ret + END(__ceil_sse41) ++ ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++libm_alias_double (__ceil, ceil) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.c b/sysdeps/x86_64/fpu/multiarch/s_ceil.c +index cc028addee..46c8e91e19 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_ceil.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_ceil.c +@@ -16,17 +16,20 @@ + License along with the GNU C Library; if not, see + . */ + +-#define NO_MATH_REDIRECT +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL ++# define NO_MATH_REDIRECT ++# include + +-#define ceil __redirect_ceil +-#define __ceil __redirect___ceil +-#include +-#undef ceil +-#undef __ceil ++# define ceil __redirect_ceil ++# define __ceil __redirect___ceil ++# include ++# undef ceil ++# undef __ceil + +-#define SYMBOL_NAME ceil +-#include "ifunc-sse4_1.h" ++# define SYMBOL_NAME ceil ++# include "ifunc-sse4_1.h" + + libc_ifunc_redirected (__redirect_ceil, __ceil, IFUNC_SELECTOR ()); + libm_alias_double (__ceil, ceil) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceilf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_ceilf-avx.S +new file mode 100644 +index 0000000000..b4d8ac0455 +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_ceilf-avx.S +@@ -0,0 +1,28 @@ ++/* AVX implementation of ceilf function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++ .text ++ENTRY(__ceilf) ++ vroundss $10, %xmm0, %xmm0, %xmm0 ++ ret ++END(__ceilf) ++ ++libm_alias_float (__ceil, ceil) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S +index dd9a9f6b71..9abc87b91a 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S ++++ b/sysdeps/x86_64/fpu/multiarch/s_ceilf-sse4_1.S +@@ -17,8 +17,20 @@ + + #include + ++#include ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++# include ++# define __ceilf_sse41 __ceilf ++ .text ++#else + .section .text.sse4.1,"ax",@progbits ++#endif ++ + ENTRY(__ceilf_sse41) + roundss $10, %xmm0, %xmm0 + ret + END(__ceilf_sse41) ++ ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++libm_alias_float (__ceil, ceil) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceilf.c b/sysdeps/x86_64/fpu/multiarch/s_ceilf.c +index 97a0ca7d19..bb53108f73 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_ceilf.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_ceilf.c +@@ -16,17 +16,20 @@ + License along with the GNU C Library; if not, see + . */ + +-#define NO_MATH_REDIRECT +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL ++# define NO_MATH_REDIRECT ++# include + +-#define ceilf __redirect_ceilf +-#define __ceilf __redirect___ceilf +-#include +-#undef ceilf +-#undef __ceilf ++# define ceilf __redirect_ceilf ++# define __ceilf __redirect___ceilf ++# include ++# undef ceilf ++# undef __ceilf + +-#define SYMBOL_NAME ceilf +-#include "ifunc-sse4_1.h" ++# define SYMBOL_NAME ceilf ++# include "ifunc-sse4_1.h" + + libc_ifunc_redirected (__redirect_ceilf, __ceilf, IFUNC_SELECTOR ()); + libm_alias_float (__ceil, ceil) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_cosf.c b/sysdeps/x86_64/fpu/multiarch/s_cosf.c +index 2703c576df..8a02e04538 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_cosf.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_cosf.c +@@ -16,13 +16,18 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include + + extern float __redirect_cosf (float); + +-#define SYMBOL_NAME cosf +-#include "ifunc-fma.h" ++# define SYMBOL_NAME cosf ++# include "ifunc-fma.h" + + libc_ifunc_redirected (__redirect_cosf, __cosf, IFUNC_SELECTOR ()); + + libm_alias_float (__cos, cos) ++#else ++# include ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_expm1.c b/sysdeps/x86_64/fpu/multiarch/s_expm1.c +index 8a2d69f9b2..d58ef3d8f5 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_expm1.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_expm1.c +@@ -16,21 +16,24 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include + + extern double __redirect_expm1 (double); + +-#define SYMBOL_NAME expm1 +-#include "ifunc-fma.h" ++# define SYMBOL_NAME expm1 ++# include "ifunc-fma.h" + + libc_ifunc_redirected (__redirect_expm1, __expm1, IFUNC_SELECTOR ()); + libm_alias_double (__expm1, expm1) + +-#define __expm1 __expm1_sse2 ++# define __expm1 __expm1_sse2 + + /* NB: __expm1 may be expanded to __expm1_sse2 in the following + prototypes. */ + extern long double __expm1l (long double); + extern long double __expm1f128 (long double); + ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-avx.S b/sysdeps/x86_64/fpu/multiarch/s_floor-avx.S +new file mode 100644 +index 0000000000..ff74b5a8bf +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_floor-avx.S +@@ -0,0 +1,28 @@ ++/* AVX implementation of floor function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++ .text ++ENTRY(__floor) ++ vroundsd $9, %xmm0, %xmm0, %xmm0 ++ ret ++END(__floor) ++ ++libm_alias_double (__floor, floor) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S +index 2f7521f39f..c9b9b0639b 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S ++++ b/sysdeps/x86_64/fpu/multiarch/s_floor-sse4_1.S +@@ -17,8 +17,20 @@ + + #include + ++#include ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++# include ++# define __floor_sse41 __floor ++ .text ++#else + .section .text.sse4.1,"ax",@progbits ++#endif ++ + ENTRY(__floor_sse41) + roundsd $9, %xmm0, %xmm0 + ret + END(__floor_sse41) ++ ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++libm_alias_double (__floor, floor) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.c b/sysdeps/x86_64/fpu/multiarch/s_floor.c +index 8cebd48e10..2c87dd0056 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_floor.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_floor.c +@@ -16,17 +16,20 @@ + License along with the GNU C Library; if not, see + . */ + +-#define NO_MATH_REDIRECT +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL ++# define NO_MATH_REDIRECT ++# include + +-#define floor __redirect_floor +-#define __floor __redirect___floor +-#include +-#undef floor +-#undef __floor ++# define floor __redirect_floor ++# define __floor __redirect___floor ++# include ++# undef floor ++# undef __floor + +-#define SYMBOL_NAME floor +-#include "ifunc-sse4_1.h" ++# define SYMBOL_NAME floor ++# include "ifunc-sse4_1.h" + + libc_ifunc_redirected (__redirect_floor, __floor, IFUNC_SELECTOR ()); + libm_alias_double (__floor, floor) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_floorf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_floorf-avx.S +new file mode 100644 +index 0000000000..c378baae8e +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_floorf-avx.S +@@ -0,0 +1,28 @@ ++/* AVX implementation of floorf function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++ .text ++ENTRY(__floorf) ++ vroundss $9, %xmm0, %xmm0, %xmm0 ++ ret ++END(__floorf) ++ ++libm_alias_float (__floor, floor) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S +index 5f6020d27d..c2216899db 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S ++++ b/sysdeps/x86_64/fpu/multiarch/s_floorf-sse4_1.S +@@ -17,8 +17,20 @@ + + #include + ++#include ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++# include ++# define __floorf_sse41 __floorf ++ .text ++#else + .section .text.sse4.1,"ax",@progbits ++#endif ++ + ENTRY(__floorf_sse41) + roundss $9, %xmm0, %xmm0 + ret + END(__floorf_sse41) ++ ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++libm_alias_float (__floor, floor) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_floorf.c b/sysdeps/x86_64/fpu/multiarch/s_floorf.c +index a14e18b03c..a277802b6d 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_floorf.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_floorf.c +@@ -16,17 +16,20 @@ + License along with the GNU C Library; if not, see + . */ + +-#define NO_MATH_REDIRECT +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL ++# define NO_MATH_REDIRECT ++# include + +-#define floorf __redirect_floorf +-#define __floorf __redirect___floorf +-#include +-#undef floorf +-#undef __floorf ++# define floorf __redirect_floorf ++# define __floorf __redirect___floorf ++# include ++# undef floorf ++# undef __floorf + +-#define SYMBOL_NAME floorf +-#include "ifunc-sse4_1.h" ++# define SYMBOL_NAME floorf ++# include "ifunc-sse4_1.h" + + libc_ifunc_redirected (__redirect_floorf, __floorf, IFUNC_SELECTOR ()); + libm_alias_float (__floor, floor) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_log1p.c b/sysdeps/x86_64/fpu/multiarch/s_log1p.c +index a8e1a3f21b..3fa1185d81 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_log1p.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_log1p.c +@@ -16,14 +16,17 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include + + extern double __redirect_log1p (double); + +-#define SYMBOL_NAME log1p +-#include "ifunc-fma.h" ++# define SYMBOL_NAME log1p ++# include "ifunc-fma.h" + + libc_ifunc_redirected (__redirect_log1p, __log1p, IFUNC_SELECTOR ()); + +-#define __log1p __log1p_sse2 ++# define __log1p __log1p_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-avx.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-avx.S +new file mode 100644 +index 0000000000..5bfdf73c28 +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-avx.S +@@ -0,0 +1,28 @@ ++/* AVX implementation of nearbyint function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++ .text ++ENTRY(__nearbyint) ++ vroundsd $0xc, %xmm0, %xmm0, %xmm0 ++ ret ++END(__nearbyint) ++ ++libm_alias_double (__nearbyint, nearbyint) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S +index 674f7eb40a..9d84410a1f 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S ++++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-sse4_1.S +@@ -17,8 +17,20 @@ + + #include + ++#include ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++# include ++# define __nearbyint_sse41 __nearbyint ++ .text ++#else + .section .text.sse4.1,"ax",@progbits ++#endif ++ + ENTRY(__nearbyint_sse41) + roundsd $0xc, %xmm0, %xmm0 + ret + END(__nearbyint_sse41) ++ ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++libm_alias_double (__nearbyint, nearbyint) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c b/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c +index 693e42dd4e..057a7ca60f 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyint.c +@@ -16,17 +16,20 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL ++# include + +-#define nearbyint __redirect_nearbyint +-#define __nearbyint __redirect___nearbyint +-#include +-#undef nearbyint +-#undef __nearbyint ++# define nearbyint __redirect_nearbyint ++# define __nearbyint __redirect___nearbyint ++# include ++# undef nearbyint ++# undef __nearbyint + +-#define SYMBOL_NAME nearbyint +-#include "ifunc-sse4_1.h" ++# define SYMBOL_NAME nearbyint ++# include "ifunc-sse4_1.h" + + libc_ifunc_redirected (__redirect_nearbyint, __nearbyint, + IFUNC_SELECTOR ()); + libm_alias_double (__nearbyint, nearbyint) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-avx.S +new file mode 100644 +index 0000000000..1dbaed0324 +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-avx.S +@@ -0,0 +1,28 @@ ++/* AVX implmentation of nearbyintf function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++ .text ++ENTRY(__nearbyintf) ++ vroundss $0xc, %xmm0, %xmm0, %xmm0 ++ ret ++END(__nearbyintf) ++ ++libm_alias_float (__nearbyint, nearbyint) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S +index 5892bd7563..3cf35f92d6 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S ++++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf-sse4_1.S +@@ -17,8 +17,20 @@ + + #include + ++#include ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++# include ++# define __nearbyintf_sse41 __nearbyintf ++ .text ++#else + .section .text.sse4.1,"ax",@progbits ++#endif ++ + ENTRY(__nearbyintf_sse41) + roundss $0xc, %xmm0, %xmm0 + ret + END(__nearbyintf_sse41) ++ ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++libm_alias_float (__nearbyint, nearbyint) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c +index a0ac009f4b..41f374ba72 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyintf.c +@@ -16,17 +16,20 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL ++# include + +-#define nearbyintf __redirect_nearbyintf +-#define __nearbyintf __redirect___nearbyintf +-#include +-#undef nearbyintf +-#undef __nearbyintf ++# define nearbyintf __redirect_nearbyintf ++# define __nearbyintf __redirect___nearbyintf ++# include ++# undef nearbyintf ++# undef __nearbyintf + +-#define SYMBOL_NAME nearbyintf +-#include "ifunc-sse4_1.h" ++# define SYMBOL_NAME nearbyintf ++# include "ifunc-sse4_1.h" + + libc_ifunc_redirected (__redirect_nearbyintf, __nearbyintf, + IFUNC_SELECTOR ()); + libm_alias_float (__nearbyint, nearbyint) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint-avx.S b/sysdeps/x86_64/fpu/multiarch/s_rint-avx.S +new file mode 100644 +index 0000000000..2b403b331f +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_rint-avx.S +@@ -0,0 +1,28 @@ ++/* AVX implementation of rint function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++ .text ++ENTRY(__rint) ++ vroundsd $4, %xmm0, %xmm0, %xmm0 ++ ret ++END(__rint) ++ ++libm_alias_double (__rint, rint) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S +index 405372991b..8cd9cf759f 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S ++++ b/sysdeps/x86_64/fpu/multiarch/s_rint-sse4_1.S +@@ -17,8 +17,20 @@ + + #include + ++#include ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++# include ++# define __rint_sse41 __rint ++ .text ++#else + .section .text.sse4.1,"ax",@progbits ++#endif ++ + ENTRY(__rint_sse41) + roundsd $4, %xmm0, %xmm0 + ret + END(__rint_sse41) ++ ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++libm_alias_double (__rint, rint) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint.c b/sysdeps/x86_64/fpu/multiarch/s_rint.c +index 754c87e004..18623b7d99 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_rint.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_rint.c +@@ -16,17 +16,20 @@ + License along with the GNU C Library; if not, see + . */ + +-#define NO_MATH_REDIRECT +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL ++# define NO_MATH_REDIRECT ++# include + +-#define rint __redirect_rint +-#define __rint __redirect___rint +-#include +-#undef rint +-#undef __rint ++# define rint __redirect_rint ++# define __rint __redirect___rint ++# include ++# undef rint ++# undef __rint + +-#define SYMBOL_NAME rint +-#include "ifunc-sse4_1.h" ++# define SYMBOL_NAME rint ++# include "ifunc-sse4_1.h" + + libc_ifunc_redirected (__redirect_rint, __rint, IFUNC_SELECTOR ()); + libm_alias_double (__rint, rint) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_rintf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_rintf-avx.S +new file mode 100644 +index 0000000000..171c2867f4 +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_rintf-avx.S +@@ -0,0 +1,28 @@ ++/* AVX implementation of rintf function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++ .text ++ENTRY(__rintf) ++ vroundss $4, %xmm0, %xmm0, %xmm0 ++ ret ++END(__rintf) ++ ++libm_alias_float (__rint, rint) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S +index 8ac67ce767..fc1e70f0c9 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S ++++ b/sysdeps/x86_64/fpu/multiarch/s_rintf-sse4_1.S +@@ -17,8 +17,20 @@ + + #include + ++#include ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++# include ++# define __rintf_sse41 __rintf ++ .text ++#else + .section .text.sse4.1,"ax",@progbits ++#endif ++ + ENTRY(__rintf_sse41) + roundss $4, %xmm0, %xmm0 + ret + END(__rintf_sse41) ++ ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++libm_alias_float (__rint, rint) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_rintf.c b/sysdeps/x86_64/fpu/multiarch/s_rintf.c +index e9d6b7a5f2..e275368dec 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_rintf.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_rintf.c +@@ -16,17 +16,20 @@ + License along with the GNU C Library; if not, see + . */ + +-#define NO_MATH_REDIRECT +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL ++# define NO_MATH_REDIRECT ++# include + +-#define rintf __redirect_rintf +-#define __rintf __redirect___rintf +-#include +-#undef rintf +-#undef __rintf ++# define rintf __redirect_rintf ++# define __rintf __redirect___rintf ++# include ++# undef rintf ++# undef __rintf + +-#define SYMBOL_NAME rintf +-#include "ifunc-sse4_1.h" ++# define SYMBOL_NAME rintf ++# include "ifunc-sse4_1.h" + + libc_ifunc_redirected (__redirect_rintf, __rintf, IFUNC_SELECTOR ()); + libm_alias_float (__rint, rint) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundeven-avx.S b/sysdeps/x86_64/fpu/multiarch/s_roundeven-avx.S +new file mode 100644 +index 0000000000..576790355c +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_roundeven-avx.S +@@ -0,0 +1,28 @@ ++/* AVX implementation of roundeven function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++ .text ++ENTRY(__roundeven) ++ vroundsd $8, %xmm0, %xmm0, %xmm0 ++ ret ++END(__roundeven) ++ ++libm_alias_double (__roundeven, roundeven) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S +index 5ef102336b..f00be56c59 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S ++++ b/sysdeps/x86_64/fpu/multiarch/s_roundeven-sse4_1.S +@@ -17,8 +17,20 @@ + + #include + ++#include ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++# include ++# define __roundeven_sse41 __roundeven ++ .text ++#else + .section .text.sse4.1,"ax",@progbits ++#endif ++ + ENTRY(__roundeven_sse41) + roundsd $8, %xmm0, %xmm0 + ret + END(__roundeven_sse41) ++ ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++libm_alias_double (__roundeven, roundeven) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundeven.c b/sysdeps/x86_64/fpu/multiarch/s_roundeven.c +index 8737b32e26..139aad088f 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_roundeven.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_roundeven.c +@@ -16,16 +16,19 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL ++# include + +-#define roundeven __redirect_roundeven +-#define __roundeven __redirect___roundeven +-#include +-#undef roundeven +-#undef __roundeven ++# define roundeven __redirect_roundeven ++# define __roundeven __redirect___roundeven ++# include ++# undef roundeven ++# undef __roundeven + +-#define SYMBOL_NAME roundeven +-#include "ifunc-sse4_1.h" ++# define SYMBOL_NAME roundeven ++# include "ifunc-sse4_1.h" + + libc_ifunc_redirected (__redirect_roundeven, __roundeven, IFUNC_SELECTOR ()); + libm_alias_double (__roundeven, roundeven) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundevenf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-avx.S +new file mode 100644 +index 0000000000..42c359f4cd +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-avx.S +@@ -0,0 +1,28 @@ ++/* AVX implementation of roundevenf function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++ .text ++ENTRY(__roundevenf) ++ vroundss $8, %xmm0, %xmm0, %xmm0 ++ ret ++END(__roundevenf) ++ ++libm_alias_float (__roundeven, roundeven) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S +index 792c90ba07..6b148e4353 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S ++++ b/sysdeps/x86_64/fpu/multiarch/s_roundevenf-sse4_1.S +@@ -17,8 +17,20 @@ + + #include + ++#include ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++# include ++# define __roundevenf_sse41 __roundevenf ++ .text ++#else + .section .text.sse4.1,"ax",@progbits ++#endif ++ + ENTRY(__roundevenf_sse41) + roundss $8, %xmm0, %xmm0 + ret + END(__roundevenf_sse41) ++ ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++libm_alias_float (__roundeven, roundeven) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c b/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c +index e96016a4d5..2fb090075d 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_roundevenf.c +@@ -16,16 +16,19 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL ++# include + +-#define roundevenf __redirect_roundevenf +-#define __roundevenf __redirect___roundevenf +-#include +-#undef roundevenf +-#undef __roundevenf ++# define roundevenf __redirect_roundevenf ++# define __roundevenf __redirect___roundevenf ++# include ++# undef roundevenf ++# undef __roundevenf + +-#define SYMBOL_NAME roundevenf +-#include "ifunc-sse4_1.h" ++# define SYMBOL_NAME roundevenf ++# include "ifunc-sse4_1.h" + + libc_ifunc_redirected (__redirect_roundevenf, __roundevenf, IFUNC_SELECTOR ()); + libm_alias_float (__roundeven, roundeven) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c +index 355cc0092e..21e77943a3 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_sin.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_sin.c +@@ -16,24 +16,27 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include + + extern double __redirect_sin (double); + extern double __redirect_cos (double); + +-#define SYMBOL_NAME sin +-#include "ifunc-avx-fma4.h" ++# define SYMBOL_NAME sin ++# include "ifunc-avx-fma4.h" + + libc_ifunc_redirected (__redirect_sin, __sin, IFUNC_SELECTOR ()); + libm_alias_double (__sin, sin) + +-#undef SYMBOL_NAME +-#define SYMBOL_NAME cos +-#include "ifunc-avx-fma4.h" ++# undef SYMBOL_NAME ++# define SYMBOL_NAME cos ++# include "ifunc-avx-fma4.h" + + libc_ifunc_redirected (__redirect_cos, __cos, IFUNC_SELECTOR ()); + libm_alias_double (__cos, cos) + +-#define __cos __cos_sse2 +-#define __sin __sin_sse2 ++# define __cos __cos_sse2 ++# define __sin __sin_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/s_sincos.c b/sysdeps/x86_64/fpu/multiarch/s_sincos.c +index 70107e999c..b35757f8de 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_sincos.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_sincos.c +@@ -16,15 +16,18 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include + + extern void __redirect_sincos (double, double *, double *); + +-#define SYMBOL_NAME sincos +-#include "ifunc-fma4.h" ++# define SYMBOL_NAME sincos ++# include "ifunc-fma4.h" + + libc_ifunc_redirected (__redirect_sincos, __sincos, IFUNC_SELECTOR ()); + libm_alias_double (__sincos, sincos) + +-#define __sincos __sincos_sse2 ++# define __sincos __sincos_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/s_sincosf.c b/sysdeps/x86_64/fpu/multiarch/s_sincosf.c +index 80bc028451..0ea9b40e84 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_sincosf.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_sincosf.c +@@ -16,13 +16,18 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include + + extern void __redirect_sincosf (float, float *, float *); + +-#define SYMBOL_NAME sincosf +-#include "ifunc-fma.h" ++# define SYMBOL_NAME sincosf ++# include "ifunc-fma.h" + + libc_ifunc_redirected (__redirect_sincosf, __sincosf, IFUNC_SELECTOR ()); + + libm_alias_float (__sincos, sincos) ++#else ++# include ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_sinf.c b/sysdeps/x86_64/fpu/multiarch/s_sinf.c +index a32b9e9550..c61624e3ee 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_sinf.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_sinf.c +@@ -16,13 +16,18 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include + + extern float __redirect_sinf (float); + +-#define SYMBOL_NAME sinf +-#include "ifunc-fma.h" ++# define SYMBOL_NAME sinf ++# include "ifunc-fma.h" + + libc_ifunc_redirected (__redirect_sinf, __sinf, IFUNC_SELECTOR ()); + + libm_alias_float (__sin, sin) ++#else ++# include ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c +index f9a2474a13..125d992ba1 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_tan.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_tan.c +@@ -16,15 +16,18 @@ + License along with the GNU C Library; if not, see + . */ + +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < AVX2_X86_ISA_LEVEL ++# include + + extern double __redirect_tan (double); + +-#define SYMBOL_NAME tan +-#include "ifunc-avx-fma4.h" ++# define SYMBOL_NAME tan ++# include "ifunc-avx-fma4.h" + + libc_ifunc_redirected (__redirect_tan, __tan, IFUNC_SELECTOR ()); + libm_alias_double (__tan, tan) + +-#define __tan __tan_sse2 ++# define __tan __tan_sse2 ++#endif + #include +diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc-avx.S b/sysdeps/x86_64/fpu/multiarch/s_trunc-avx.S +new file mode 100644 +index 0000000000..b3e87e9606 +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_trunc-avx.S +@@ -0,0 +1,28 @@ ++/* AVX implementation of trunc function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++ .text ++ENTRY(__trunc) ++ vroundsd $11, %xmm0, %xmm0, %xmm0 ++ ret ++END(__trunc) ++ ++libm_alias_double (__trunc, trunc) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S +index b496a6ef49..2b79174eed 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S ++++ b/sysdeps/x86_64/fpu/multiarch/s_trunc-sse4_1.S +@@ -18,8 +18,20 @@ + + #include + ++#include ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++# include ++# define __trunc_sse41 __trunc ++ .text ++#else + .section .text.sse4.1,"ax",@progbits ++#endif ++ + ENTRY(__trunc_sse41) + roundsd $11, %xmm0, %xmm0 + ret + END(__trunc_sse41) ++ ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++libm_alias_double (__trunc, trunc) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc.c b/sysdeps/x86_64/fpu/multiarch/s_trunc.c +index 9bc9df8744..ea89c4f85d 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_trunc.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_trunc.c +@@ -16,17 +16,20 @@ + License along with the GNU C Library; if not, see + . */ + +-#define NO_MATH_REDIRECT +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL ++# define NO_MATH_REDIRECT ++# include + +-#define trunc __redirect_trunc +-#define __trunc __redirect___trunc +-#include +-#undef trunc +-#undef __trunc ++# define trunc __redirect_trunc ++# define __trunc __redirect___trunc ++# include ++# undef trunc ++# undef __trunc + +-#define SYMBOL_NAME trunc +-#include "ifunc-sse4_1.h" ++# define SYMBOL_NAME trunc ++# include "ifunc-sse4_1.h" + + libc_ifunc_redirected (__redirect_trunc, __trunc, IFUNC_SELECTOR ()); + libm_alias_double (__trunc, trunc) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_truncf-avx.S b/sysdeps/x86_64/fpu/multiarch/s_truncf-avx.S +new file mode 100644 +index 0000000000..f31ac7d7f7 +--- /dev/null ++++ b/sysdeps/x86_64/fpu/multiarch/s_truncf-avx.S +@@ -0,0 +1,28 @@ ++/* AVX implementation of truncf function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++ .text ++ENTRY(__truncf) ++ vroundss $11, %xmm0, %xmm0, %xmm0 ++ ret ++END(__truncf) ++ ++libm_alias_float (__trunc, trunc) +diff --git a/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S b/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S +index 22e9a83307..60498b2cb2 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S ++++ b/sysdeps/x86_64/fpu/multiarch/s_truncf-sse4_1.S +@@ -18,8 +18,20 @@ + + #include + ++#include ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++# include ++# define __truncf_sse41 __truncf ++ .text ++#else + .section .text.sse4.1,"ax",@progbits ++#endif ++ + ENTRY(__truncf_sse41) + roundss $11, %xmm0, %xmm0 + ret + END(__truncf_sse41) ++ ++#if MINIMUM_X86_ISA_LEVEL == SSE4_1_X86_ISA_LEVEL ++libm_alias_float (__trunc, trunc) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/s_truncf.c b/sysdeps/x86_64/fpu/multiarch/s_truncf.c +index dae01d166a..92435ce39d 100644 +--- a/sysdeps/x86_64/fpu/multiarch/s_truncf.c ++++ b/sysdeps/x86_64/fpu/multiarch/s_truncf.c +@@ -16,17 +16,20 @@ + License along with the GNU C Library; if not, see + . */ + +-#define NO_MATH_REDIRECT +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL < SSE4_1_X86_ISA_LEVEL ++# define NO_MATH_REDIRECT ++# include + +-#define truncf __redirect_truncf +-#define __truncf __redirect___truncf +-#include +-#undef truncf +-#undef __truncf ++# define truncf __redirect_truncf ++# define __truncf __redirect___truncf ++# include ++# undef truncf ++# undef __truncf + +-#define SYMBOL_NAME truncf +-#include "ifunc-sse4_1.h" ++# define SYMBOL_NAME truncf ++# include "ifunc-sse4_1.h" + + libc_ifunc_redirected (__redirect_truncf, __truncf, IFUNC_SELECTOR ()); + libm_alias_float (__trunc, trunc) ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/w_exp.c b/sysdeps/x86_64/fpu/multiarch/w_exp.c +index 27eee98a0a..3584187e0e 100644 +--- a/sysdeps/x86_64/fpu/multiarch/w_exp.c ++++ b/sysdeps/x86_64/fpu/multiarch/w_exp.c +@@ -1 +1,6 @@ +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL >= AVX2_X86_ISA_LEVEL ++# include ++#else ++# include ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/w_log.c b/sysdeps/x86_64/fpu/multiarch/w_log.c +index 9b2b018711..414ca3ca3d 100644 +--- a/sysdeps/x86_64/fpu/multiarch/w_log.c ++++ b/sysdeps/x86_64/fpu/multiarch/w_log.c +@@ -1 +1,6 @@ +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL >= AVX2_X86_ISA_LEVEL ++# include ++#else ++# include ++#endif +diff --git a/sysdeps/x86_64/fpu/multiarch/w_pow.c b/sysdeps/x86_64/fpu/multiarch/w_pow.c +index b50c1988de..d5fcc4f871 100644 +--- a/sysdeps/x86_64/fpu/multiarch/w_pow.c ++++ b/sysdeps/x86_64/fpu/multiarch/w_pow.c +@@ -1 +1,6 @@ +-#include ++#include ++#if MINIMUM_X86_ISA_LEVEL >= AVX2_X86_ISA_LEVEL ++# include ++#else ++# include ++#endif + +commit 31da30f23cddd36db29d5b6a1c7619361b271fb4 +Author: Charles Fol +Date: Thu Mar 28 12:25:38 2024 -0300 + + iconv: ISO-2022-CN-EXT: fix out-of-bound writes when writing escape sequence (CVE-2024-2961) + + ISO-2022-CN-EXT uses escape sequences to indicate character set changes + (as specified by RFC 1922). While the SOdesignation has the expected + bounds checks, neither SS2designation nor SS3designation have its; + allowing a write overflow of 1, 2, or 3 bytes with fixed values: + '$+I', '$+J', '$+K', '$+L', '$+M', or '$*H'. + + Checked on aarch64-linux-gnu. + + Co-authored-by: Adhemerval Zanella + Reviewed-by: Carlos O'Donell + Tested-by: Carlos O'Donell + + (cherry picked from commit f9dc609e06b1136bb0408be9605ce7973a767ada) + +diff --git a/iconvdata/Makefile b/iconvdata/Makefile +index ea019ce5c0..7196a8744b 100644 +--- a/iconvdata/Makefile ++++ b/iconvdata/Makefile +@@ -75,7 +75,8 @@ ifeq (yes,$(build-shared)) + tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \ + tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \ + bug-iconv10 bug-iconv11 bug-iconv12 tst-iconv-big5-hkscs-to-2ucs4 \ +- bug-iconv13 bug-iconv14 bug-iconv15 ++ bug-iconv13 bug-iconv14 bug-iconv15 \ ++ tst-iconv-iso-2022-cn-ext + ifeq ($(have-thread-library),yes) + tests += bug-iconv3 + endif +@@ -330,6 +331,8 @@ $(objpfx)bug-iconv14.out: $(addprefix $(objpfx), $(gconv-modules)) \ + $(addprefix $(objpfx),$(modules.so)) + $(objpfx)bug-iconv15.out: $(addprefix $(objpfx), $(gconv-modules)) \ + $(addprefix $(objpfx),$(modules.so)) ++$(objpfx)tst-iconv-iso-2022-cn-ext.out: $(addprefix $(objpfx), $(gconv-modules)) \ ++ $(addprefix $(objpfx),$(modules.so)) + + $(objpfx)iconv-test.out: run-iconv-test.sh \ + $(addprefix $(objpfx), $(gconv-modules)) \ +diff --git a/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c +index b34c8a36f4..cce29b1969 100644 +--- a/iconvdata/iso-2022-cn-ext.c ++++ b/iconvdata/iso-2022-cn-ext.c +@@ -574,6 +574,12 @@ DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); + { \ + const char *escseq; \ + \ ++ if (outptr + 4 > outend) \ ++ { \ ++ result = __GCONV_FULL_OUTPUT; \ ++ break; \ ++ } \ ++ \ + assert (used == CNS11643_2_set); /* XXX */ \ + escseq = "*H"; \ + *outptr++ = ESC; \ +@@ -587,6 +593,12 @@ DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); + { \ + const char *escseq; \ + \ ++ if (outptr + 4 > outend) \ ++ { \ ++ result = __GCONV_FULL_OUTPUT; \ ++ break; \ ++ } \ ++ \ + assert ((used >> 5) >= 3 && (used >> 5) <= 7); \ + escseq = "+I+J+K+L+M" + ((used >> 5) - 3) * 2; \ + *outptr++ = ESC; \ +diff --git a/iconvdata/tst-iconv-iso-2022-cn-ext.c b/iconvdata/tst-iconv-iso-2022-cn-ext.c +new file mode 100644 +index 0000000000..96a8765fd5 +--- /dev/null ++++ b/iconvdata/tst-iconv-iso-2022-cn-ext.c +@@ -0,0 +1,128 @@ ++/* Verify ISO-2022-CN-EXT does not write out of the bounds. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++/* The test sets up a two memory page buffer with the second page marked ++ PROT_NONE to trigger a fault if the conversion writes beyond the exact ++ expected amount. Then we carry out various conversions and precisely ++ place the start of the output buffer in order to trigger a SIGSEGV if the ++ process writes anywhere between 1 and page sized bytes more (only one ++ PROT_NONE page is setup as a canary) than expected. These tests exercise ++ all three of the cases in ISO-2022-CN-EXT where the converter must switch ++ character sets and may run out of buffer space while doing the ++ operation. */ ++ ++static int ++do_test (void) ++{ ++ iconv_t cd = iconv_open ("ISO-2022-CN-EXT", "UTF-8"); ++ TEST_VERIFY_EXIT (cd != (iconv_t) -1); ++ ++ char *ntf; ++ size_t ntfsize; ++ char *outbufbase; ++ { ++ int pgz = getpagesize (); ++ TEST_VERIFY_EXIT (pgz > 0); ++ ntfsize = 2 * pgz; ++ ++ ntf = xmmap (NULL, ntfsize, PROT_READ | PROT_WRITE, MAP_PRIVATE ++ | MAP_ANONYMOUS, -1); ++ xmprotect (ntf + pgz, pgz, PROT_NONE); ++ ++ outbufbase = ntf + pgz; ++ } ++ ++ /* Check if SOdesignation escape sequence does not trigger an OOB write. */ ++ { ++ char inbuf[] = "\xe4\xba\xa4\xe6\x8d\xa2"; ++ ++ for (int i = 0; i < 9; i++) ++ { ++ char *inp = inbuf; ++ size_t inleft = sizeof (inbuf) - 1; ++ ++ char *outp = outbufbase - i; ++ size_t outleft = i; ++ ++ TEST_VERIFY_EXIT (iconv (cd, &inp, &inleft, &outp, &outleft) ++ == (size_t) -1); ++ TEST_COMPARE (errno, E2BIG); ++ ++ TEST_VERIFY_EXIT (iconv (cd, NULL, NULL, NULL, NULL) == 0); ++ } ++ } ++ ++ /* Same as before for SS2designation. */ ++ { ++ char inbuf[] = "㴽 \xe3\xb4\xbd"; ++ ++ for (int i = 0; i < 14; i++) ++ { ++ char *inp = inbuf; ++ size_t inleft = sizeof (inbuf) - 1; ++ ++ char *outp = outbufbase - i; ++ size_t outleft = i; ++ ++ TEST_VERIFY_EXIT (iconv (cd, &inp, &inleft, &outp, &outleft) ++ == (size_t) -1); ++ TEST_COMPARE (errno, E2BIG); ++ ++ TEST_VERIFY_EXIT (iconv (cd, NULL, NULL, NULL, NULL) == 0); ++ } ++ } ++ ++ /* Same as before for SS3designation. */ ++ { ++ char inbuf[] = "劄 \xe5\x8a\x84"; ++ ++ for (int i = 0; i < 14; i++) ++ { ++ char *inp = inbuf; ++ size_t inleft = sizeof (inbuf) - 1; ++ ++ char *outp = outbufbase - i; ++ size_t outleft = i; ++ ++ TEST_VERIFY_EXIT (iconv (cd, &inp, &inleft, &outp, &outleft) ++ == (size_t) -1); ++ TEST_COMPARE (errno, E2BIG); ++ ++ TEST_VERIFY_EXIT (iconv (cd, NULL, NULL, NULL, NULL) == 0); ++ } ++ } ++ ++ TEST_VERIFY_EXIT (iconv_close (cd) != -1); ++ ++ xmunmap (ntf, ntfsize); ++ ++ return 0; ++} ++ ++#include diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix index 4d6fb5a54b..7418abaa1b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -36,6 +36,7 @@ , withLinuxHeaders ? false , profilingLibraries ? false , withGd ? false +, enableCET ? false , extraBuildInputs ? [] , extraNativeBuildInputs ? [] , ... @@ -43,7 +44,7 @@ let version = "2.39"; - patchSuffix = "-5"; + patchSuffix = "-31"; sha256 = "sha256-93vUfPgXDFc2Wue/hmlsEYrbOxINMlnGTFAtPcHi2SY="; in @@ -59,11 +60,15 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.39/master && git describe - glibc-2.39-5-ge0910f1d32 - $ git show --minimal --reverse glibc-2.39.. > 2.39-master.patch + glibc-2.39-31-g31da30f23c + $ git show --minimal --reverse glibc-2.39.. ':!ADVISORIES' > 2.39-master.patch To compare the archive contents zdiff can be used. $ diff -u 2.39-master.patch ../nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch + + Please note that each commit has changes to the file ADVISORIES excluded since + that conflicts with the directory advisories/ making cross-builds from + hosts with case-insensitive file-systems impossible. */ ./2.39-master.patch @@ -154,9 +159,9 @@ stdenv.mkDerivation ({ # and on aarch64 with binutils 2.30 or later. # https://sourceware.org/glibc/wiki/PortStatus "--enable-static-pie" - ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + ] ++ lib.optionals (enableCET != false) [ # Enable Intel Control-flow Enforcement Technology (CET) support - "--enable-cet" + "--enable-cet${if builtins.isString enableCET then "=${enableCET}" else ""}" ] ++ lib.optionals withLinuxHeaders [ "--enable-kernel=3.10.0" # RHEL 7 and derivatives, seems oldest still supported kernel ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ @@ -208,7 +213,7 @@ stdenv.mkDerivation ({ passthru = { inherit version; minorRelease = version; }; } -// (removeAttrs args [ "withLinuxHeaders" "withGd" "postInstall" "makeFlags" ]) // +// (removeAttrs args [ "withLinuxHeaders" "withGd" "enableCET" "postInstall" "makeFlags" ]) // { src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/default.nix index 3f7331461f..e07c354aa4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/default.nix @@ -2,6 +2,7 @@ , withLinuxHeaders ? true , profilingLibraries ? false , withGd ? false +, enableCET ? if stdenv.hostPlatform.isx86_64 then "permissive" else false , pkgsBuildBuild , libgcc }: @@ -15,7 +16,7 @@ let in (callPackage ./common.nix { inherit stdenv; } { - inherit withLinuxHeaders withGd profilingLibraries; + inherit withLinuxHeaders withGd profilingLibraries enableCET; pname = "glibc" + lib.optionalString withGd "-gd" + lib.optionalString (stdenv.cc.isGNU && libgcc==null) "-nolibgcc"; }).overrideAttrs(previousAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix b/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix index c3c444f407..acace1c6a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.78.1"; + version = "2.80.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9HPyl10mw0CeES7RHtNkBvs4Q/qXXfV1wi1MuEMIX2E="; + hash = "sha256-U5sKKeFalmdsTwWUVBJQVmxcpE2l1Nh6NzL6LQeQnko="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix index 8800070ab6..f9f8a4568a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.66.6"; + version = "2.66.7"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-U1h0JZgYHlNR17+NoHK/k+bdXxeNJ2QNTkYryPFOFS8="; + hash = "sha256-/gLB5fWCWUDYK1a27DGhLAbAXBWDz+Yvk00HY+HlQrM="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix b/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix index 8f20d756c1..b7cca3b156 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix @@ -1,18 +1,38 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection -, vala }: +{ + lib, + stdenv, + fetchurl, + pkg-config, + glib, + zlib, + gnupg, + gpgme, + libidn2, + libunistring, + gobject-introspection, + vala, +}: stdenv.mkDerivation rec { version = "3.2.14"; pname = "gmime"; - src = fetchurl { # https://github.com/jstedfast/gmime/releases + src = fetchurl { + # https://github.com/jstedfast/gmime/releases url = "https://github.com/jstedfast/gmime/releases/download/${version}/gmime-${version}.tar.xz"; sha256 = "sha256-pes91nX3LlRci8HNEhB+Sq0ursGQXre0ATzbH75eIxc="; }; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; - nativeBuildInputs = [ pkg-config gobject-introspection vala ]; + nativeBuildInputs = [ + pkg-config + gobject-introspection + vala + ]; buildInputs = [ zlib gpgme @@ -21,22 +41,34 @@ stdenv.mkDerivation rec { vala # for share/vala/Makefile.vapigen ]; propagatedBuildInputs = [ glib ]; - configureFlags = [ - "--enable-introspection=yes" - "--enable-vala=yes" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ]; + configureFlags = + [ + "--enable-introspection=yes" + "--enable-vala=yes" + ] + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ]; - postPatch = '' - substituteInPlace tests/testsuite.c \ - --replace /bin/rm rm - ''; + postPatch = + '' + substituteInPlace tests/testsuite.c \ + --replace /bin/rm rm + '' + + lib.optionalString stdenv.isDarwin '' + # This specific test fails on darwin for some unknown reason + substituteInPlace tests/test-filters.c \ + --replace-fail 'test_charset_conversion (datadir, "japanese", "utf-8", "iso-2022-jp");' "" + ''; - preConfigure = '' - PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)" - export PKG_CONFIG_VAPIGEN_VAPIGEN - '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp ${if stdenv.hostPlatform.isMusl then ./musl-iconv-detect.h else ./iconv-detect.h} ./iconv-detect.h - ''; + preConfigure = + '' + PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)" + export PKG_CONFIG_VAPIGEN_VAPIGEN + '' + + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp ${ + if stdenv.hostPlatform.isMusl then ./musl-iconv-detect.h else ./iconv-detect.h + } ./iconv-detect.h + ''; nativeCheckInputs = [ gnupg ]; @@ -44,11 +76,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://github.com/jstedfast/gmime/"; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix index aee2056a85..740f7d94f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -7,38 +7,37 @@ , meson , ninja , libxslt -, gtk3 +, gtk4 , enableBackend ? stdenv.isLinux -, webkitgtk_4_1 , json-glib +, libadwaita , librest_1_0 , libxml2 , libsecret , gtk-doc , gobject-introspection , gettext -, icu , glib-networking , libsoup_3 , docbook-xsl-nons , docbook_xml_dtd_412 , gnome -, gcr +, gcr_4 , libkrb5 , gvfs , dbus -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.48.1"; + version = "3.50.1"; outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-PqDHEIS/WVzOXKo3zv8uhT0OyWRLsB/UZDMArblRf4o="; + hash = "sha256-Qu5D/R4pQrn/YQYlLM3INGAoFVCL96OlLAvf/6Vur0A="; }; mesonFlags = [ @@ -46,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dgoabackend=${lib.boolToString enableBackend}" "-Dgtk_doc=${lib.boolToString enableBackend}" "-Dman=${lib.boolToString enableBackend}" - "-Dmedia_server=true" + "-Dwebdav=true" ]; nativeBuildInputs = [ @@ -61,28 +60,24 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ - gcr + gcr_4 glib glib-networking - gtk3 + gtk4 + libadwaita gvfs # OwnCloud, Google Drive - icu json-glib libkrb5 librest_1_0 libxml2 libsecret libsoup_3 - ] ++ lib.optionals enableBackend [ - webkitgtk_4_1 ]; - env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - separateDebugInfo = true; passthru = { @@ -93,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GnomeOnlineAccounts"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-online-accounts"; description = "Single sign-on framework for GNOME"; platforms = platforms.unix; license = licenses.lgpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix index 0db1aa27e7..fcf955fbc1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A collection of GStreamer effects to be used in different GNOME Modules"; - homepage = "https://wiki.gnome.org/Projects/GnomeVideoEffects"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-video-effects"; platforms = platforms.unix; maintainers = teams.gnome.members; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix index e9746271ea..3f832ad5d5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnu-efi"; - version = "3.0.15"; + version = "3.0.18"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2"; - sha256 = "sha256-kxole5xcG6Zf9Rnxg3PEOKJoJfLbeGaxY+ltGxaPIOo="; + hash = "sha256-fyEslu5mVH7u+1MSZ7ZB5Uc9fYUp8L2Mze/TPPdBP1w="; }; buildInputs = [ pciutils ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix index 728d4a82b2..13bdb921ef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -44,6 +44,8 @@ , rsyslog , openconnect , samba + +, gitUpdater }: let @@ -58,11 +60,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.8.4"; + version = "3.8.5"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - hash = "sha256-K+pOFUeU8/ABgPoqXFH+iwBax6Mc1YvUTN+n8268Ops="; + hash = "sha256-ZiaaLP4OHC2r7Ie9u9irZW85bt2aQN0AaXjgA8+lK/w="; }; outputs = [ "bin" "dev" "out" ] @@ -97,12 +99,6 @@ stdenv.mkDerivation rec { sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh - '' + lib.optionalString stdenv.hostPlatform.isStatic '' - # Adapted from https://gitlab.com/gnutls/gnutls/-/commit/d214cd4570fb1559a20e941bb7ceac7df52e96d3 - # Can be removed with 3.8.5+. - sed -i lib/nettle/backport/rsa-sign-tr.c -e \ - '/^#include /i\ - #define nettle_rsa_compute_root_tr _gnutls_nettle_backport_rsa_compute_root_tr' ''; preConfigure = "patchShebangs ."; @@ -153,6 +149,11 @@ stdenv.mkDerivation rec { --replace "-lunistring" "" ''; + + passthru.updateScript = gitUpdater { + url = "https://gitlab.com/gnutls/gnutls.git"; + }; + passthru.tests = { inherit ngtcp2-gnutls curlWithGnuTls ffmpeg emacs qemu knot-resolver samba openconnect; inherit (ocamlPackages) ocamlnet; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix index 3817d8bb9c..23f1e2262d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix @@ -22,6 +22,7 @@ , nixStoreDir ? builtins.storeDir , x11Support ? true , testers +, propagateFullGlib ? true }: # now that gobject-introspection creates large .gir files (eg gtk3 case) @@ -33,10 +34,13 @@ let pp.mako pp.markdown ]; + + # https://discourse.gnome.org/t/dealing-with-glib-and-gobject-introspection-circular-dependency/18701 + glib' = glib.override { withIntrospection = false; }; in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; - version = "1.78.1"; + version = "1.80.1"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -45,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; - sha256 = "vXur2Zr3JY52gZ5Fukprw5lgj+di2D/ePKwDPFCEG7Q="; + hash = "sha256-od98Qk4VvaGrY5wA6QUbmt9c6hqeUS+KYDtTzRmbxtg="; }; patches = [ @@ -92,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ libffi - glib + (if propagateFullGlib then glib else glib') ]; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gom/default.nix index 3cb7e9bd6f..4d48e0c227 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gom/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A GObject to SQLite object mapper"; - homepage = "https://wiki.gnome.org/Projects/Gom"; + homepage = "https://gitlab.gnome.org/GNOME/gom"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix index 9067ef71ca..46c7b188c9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; - homepage = "https://wiki.gnome.org/Projects/GooCanvas"; + homepage = "https://gitlab.gnome.org/Archive/goocanvas"; license = licenses.lgpl2; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/3.x.nix index 8a07f31b81..4058412d83 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/3.x.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; - homepage = "https://wiki.gnome.org/Projects/GooCanvas"; + homepage = "https://gitlab.gnome.org/Archive/goocanvas"; license = licenses.lgpl2; # https://gitlab.gnome.org/GNOME/goocanvas/-/issues/12 maintainers = with maintainers; [ bobby285271 ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/default.nix index 03268fb024..47ff343ffb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; - homepage = "https://wiki.gnome.org/Projects/GooCanvas"; + homepage = "https://gitlab.gnome.org/Archive/goocanvas"; license = licenses.lgpl2; platforms = lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix index 7642080086..ccee4831dc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ bindings for GooCanvas"; - homepage = "https://wiki.gnome.org/Projects/GooCanvas"; + homepage = "https://gitlab.gnome.org/Archive/goocanvasmm"; license = licenses.lgpl2; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix index 88b83a3291..4113ee2f5d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Grilo"; + homepage = "https://gitlab.gnome.org/GNOME/grilo-plugins"; description = "A collection of plugins for the Grilo framework"; maintainers = teams.gnome.members; license = licenses.lgpl21Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix index 49c957cec5..06b524579a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grilo/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Grilo"; + homepage = "https://gitlab.gnome.org/GNOME/grilo"; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; maintainers = teams.gnome.members; license = licenses.lgpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix index 1e8804237b..bf9b58ec4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; license = licenses.asl20; - maintainers = with maintainers; [ lnl7 marsam ]; + maintainers = with maintainers; [ lnl7 ]; homepage = "https://grpc.io/"; platforms = platforms.all; changelog = "https://github.com/grpc/grpc/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index f898f3d3bc..c33011f4b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NlyNBNr3mzjIs9yWJjSaAk+eS+/dMf7edLQvep++CuI="; + hash = "sha256-STpGoRYbY4jVeqcvYyp5zpbELV/70dCwD0luxYdvhXU="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix index 3c7049e92e..e588a7adca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GSound"; + homepage = "https://gitlab.gnome.org/GNOME/gsound"; description = "Small library for playing system sounds"; mainProgram = "gsound-play"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix index f1b8733cf8..13a9e4be04 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A spell-checking library for GTK applications"; mainProgram = "gspell-app1"; - homepage = "https://wiki.gnome.org/Projects/gspell"; + homepage = "https://gitlab.gnome.org/GNOME/gspell"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index bec1cb762c..b94769af76 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -18,13 +18,14 @@ , opencv4 , faad2 , ldacbt +, liblc3 , libass , libkate , lrdf , ladspaH , lcms2 , libnice -, webrtc-audio-processing +, webrtc-audio-processing_1 , lilv , lv2 , serd @@ -44,6 +45,7 @@ , flite , gsm , json-glib +, libajantv2 , libaom , libdc1394 , libde265 @@ -68,6 +70,7 @@ , zbar , wayland-protocols , wildmidi +, svt-av1 , fluidsynth , libva , libvdpau @@ -109,13 +112,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.22.9"; + version = "1.24.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-G8ZdD9X1OjY2Vk79P88xjD7c3sOcQQmlA8H8ggOECh0="; + hash = "sha256-RI4yeHvIK1hsbLL4HJqO9AT+pPd/JVZv4G5Zej9ZE2s="; }; patches = [ @@ -147,10 +150,10 @@ stdenv.mkDerivation rec { json-glib lcms2 ldacbt + liblc3 libass libkate - webrtc-audio-processing # required by webrtcdsp - #webrtc-audio-processing_1 # required by isac + webrtc-audio-processing_1 libbs2b libmodplug openjpeg @@ -192,6 +195,7 @@ stdenv.mkDerivation rec { zxing-cpp usrsctp wildmidi + svt-av1 ] ++ lib.optionals opencvSupport [ opencv4 ] ++ lib.optionals enableZbar [ @@ -217,6 +221,7 @@ stdenv.mkDerivation rec { chromaprint flite + libajantv2 libdrm libgudev sbc @@ -260,6 +265,7 @@ stdenv.mkDerivation rec { "-Damfcodec=disabled" # Windows-only "-Davtp=disabled" "-Ddirectshow=disabled" # Windows-only + "-Dqt6d3d11=disabled" # Windows-only "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" "-Dzbar=${if enableZbar then "enabled" else "disabled"}" "-Dfaac=${if faacSupport then "enabled" else "disabled"}" @@ -287,11 +293,11 @@ stdenv.mkDerivation rec { "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing - "-Disac=disabled" # depends on `webrtc-audio-coding-1` not compatible with 0.3 "-Dgs=disabled" # depends on `google-cloud-cpp` "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing "-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx` "-Dopencv=${if opencvSupport then "enabled" else "disabled"}" # Reduces rebuild size when `config.cudaSupport = true` + "-Daja=disabled" # should pass libajantv2 via aja-sdk-dir instead "-Dmicrodns=${if microdnsSupport then "enabled" else "disabled"}" "-Dbluez=${if bluezSupport then "enabled" else "disabled"}" (lib.mesonEnable "doc" enableDocumentation) @@ -302,8 +308,8 @@ stdenv.mkDerivation rec { "-Dva=disabled" # see comment on `libva` in `buildInputs` ] ++ lib.optionals (!stdenv.isLinux || !guiSupport) [ "-Ddirectfb=disabled" - ] - ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ + "-Daja=disabled" "-Dchromaprint=disabled" "-Dflite=disabled" "-Dkms=disabled" # renders to libdrm output @@ -312,6 +318,7 @@ stdenv.mkDerivation rec { "-Dspandsp=disabled" "-Ddvb=disabled" "-Dfbdev=disabled" + "-Duvcgadget=disabled" # requires gudev "-Duvch264=disabled" # requires gudev "-Dv4l2codecs=disabled" # requires gudev "-Dladspa=disabled" # requires lrdf @@ -319,7 +326,7 @@ stdenv.mkDerivation rec { "-Dqsv=disabled" # Linux (and Windows) x86 only ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ "-Dgl=disabled" - ] ++ lib.optionals (!gst-plugins-base.waylandEnabled) [ + ] ++ lib.optionals (!gst-plugins-base.waylandEnabled || !guiSupport) [ "-Dgtk3=disabled" # Wayland-based GTK sink "-Dwayland=disabled" ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/fix-paths.patch b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/fix-paths.patch index ea832cc9f6..207ed16aa0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/fix-paths.patch @@ -1,24 +1,24 @@ -diff --git a/gst-libs/gst/cuda/gstcudaloader.c b/gst-libs/gst/cuda/gstcudaloader.c -index fffcbefd2b..6f738d3af3 100644 ---- a/gst-libs/gst/cuda/gstcudaloader.c -+++ b/gst-libs/gst/cuda/gstcudaloader.c -@@ -165,6 +165,11 @@ gst_cuda_load_library (void) - return TRUE; +diff --git a/gst-libs/gst/cuda/gstcudaloader.cpp b/gst-libs/gst/cuda/gstcudaloader.cpp +index 11718b8..d4144c1 100644 +--- a/gst-libs/gst/cuda/gstcudaloader.cpp ++++ b/gst-libs/gst/cuda/gstcudaloader.cpp +@@ -229,6 +229,11 @@ gst_cuda_load_library_once_func (void) + "CUDA plugin loader"); module = g_module_open (filename, G_MODULE_BIND_LAZY); + -+ if (module == NULL) { ++ if (module == nullptr) { + module = g_module_open ("@driverLink@/lib/" CUDA_LIBNAME, G_MODULE_BIND_LAZY); + } + - if (module == NULL) { + if (module == nullptr) { GST_WARNING ("Could not open library %s, %s", filename, g_module_error ()); - return FALSE; + return; diff --git a/sys/nvcodec/gstcuvidloader.c b/sys/nvcodec/gstcuvidloader.c -index e957e062e0..004ec2dcd5 100644 +index c51a428..ea0e1b5 100644 --- a/sys/nvcodec/gstcuvidloader.c +++ b/sys/nvcodec/gstcuvidloader.c -@@ -85,6 +85,11 @@ gst_cuvid_load_library (guint api_major_ver, guint api_minor_ver) +@@ -87,6 +87,11 @@ gst_cuvid_load_library (guint api_major_ver, guint api_minor_ver) return TRUE; module = g_module_open (filename, G_MODULE_BIND_LAZY); @@ -31,10 +31,10 @@ index e957e062e0..004ec2dcd5 100644 GST_WARNING ("Could not open library %s, %s", filename, g_module_error ()); return FALSE; diff --git a/sys/nvcodec/gstnvenc.c b/sys/nvcodec/gstnvenc.c -index 106857a954..3bab9989f0 100644 +index c65c85a..57232bb 100644 --- a/sys/nvcodec/gstnvenc.c +++ b/sys/nvcodec/gstnvenc.c -@@ -907,6 +907,11 @@ gst_nvenc_load_library (guint * api_major_ver, guint * api_minor_ver) +@@ -919,6 +919,11 @@ gst_nvenc_load_library (guint * api_major_ver, guint * api_minor_ver) }; module = g_module_open (NVENC_LIBRARY_NAME, G_MODULE_BIND_LAZY); diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index 066ffbc130..72dbef5c6d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -24,6 +24,7 @@ , libXext , libXi , libXv +, libdrm , enableWayland ? stdenv.isLinux , wayland , wayland-protocols @@ -45,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.22.9"; + version = "1.24.2"; outputs = [ "out" "dev" ]; @@ -53,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-+sPg3S2Ok3A4izS/jCG4nV9jvDz8Es1/3I/GwcugMzQ="; + hash = "sha256-KC8cyAZcm2Lragog+56DKPjlKW3yRYtyNtqnKcQa52k="; }; strictDeps = true; @@ -88,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: { tremor pango ] ++ lib.optionals (!stdenv.isDarwin) [ + libdrm libGL libvisual ] ++ lib.optionals stdenv.isDarwin [ @@ -106,6 +108,8 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ gstreamer + ] ++ lib.optionals (!stdenv.isDarwin) [ + libdrm ]; mesonFlags = [ @@ -122,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!enableAlsa) "-Dalsa=disabled" ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled" ++ lib.optionals stdenv.isDarwin [ + "-Ddrm=disabled" "-Dlibvisual=disabled" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index be56527ec4..eb9231155b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -17,6 +17,7 @@ , Cocoa , CoreServices , gobject-introspection +, rustc , testers # Checks meson.is_cross_build(), so even canExecute isn't enough. , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc @@ -24,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.22.9"; + version = "1.24.2"; outputs = [ "bin" @@ -36,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-HnEk00fozcgPCOwdNwwgG+UTACrxECuyDoPFJ5y0jr0="; + hash = "sha256-nK/dI70YDxaBxWzTpoeahJfM8k2m9CKmtvNW+gdKhIE="; }; depsBuildBuild = [ @@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { glib bash-completion gobject-introspection + rustc ] ++ lib.optionals stdenv.isLinux [ libcap # for setcap binary ] ++ lib.optionals enableDocumentation [ @@ -94,7 +96,8 @@ stdenv.mkDerivation (finalAttrs: { gst/parse/gen_grammar.py.in \ gst/parse/gen_lex.py.in \ libs/gst/helpers/ptp_helper_post_install.sh \ - scripts/extract-release-date-from-doap-file.py + scripts/extract-release-date-from-doap-file.py \ + docs/gst-plugins-doc-cache-generator.py ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix index 1bfdf5b24d..4020193e0a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/default.nix @@ -12,6 +12,7 @@ , MediaToolbox , OpenGL , Security +, SystemConfiguration , VideoToolbox , ipu6ep-camera-hal , ipu6epmtl-camera-hal @@ -32,7 +33,7 @@ gst-plugins-viperfx = callPackage ./viperfx { }; - gst-plugins-rs = callPackage ./rs { inherit Security; }; + gst-plugins-rs = callPackage ./rs { inherit Security SystemConfiguration; }; gst-rtsp-server = callPackage ./rtsp-server { }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix index 343f161cc3..5b1d4c8618 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.22.9"; + version = "1.24.2"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-AuKUALROnMYDqmRE3uVya1ftq+9kVebQkh/+1vE4QO4="; + hash = "sha256-/dfDDBqhuweADdmKUeVSEQZWGYNeSIn1yS/oI7hs2PQ="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index adb737bb1b..0838dec0fd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.22.9"; + version = "1.24.2"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-NVOtOALczeDA7xRhiBrNm1W934rfdR3ky1G3+MtQRA0="; + hash = "sha256-cgF3jqXZN0QMU9dDndEqpaxoQGiK8fBJmFInUHS5kHM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index fbb79028bd..1cf3fef79f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -16,7 +16,9 @@ , libavc1394 , libiec61883 , libvpx +, libdrm , speex +, opencore-amr , flac , taglib , libshout @@ -39,6 +41,7 @@ , enableJack ? true, libjack2 , enableX11 ? stdenv.isLinux, xorg , ncurses +, enableWayland ? stdenv.isLinux , wayland , wayland-protocols , libgudev @@ -55,13 +58,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.22.9"; + version = "1.24.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-JpWfz+v/9jfU6gjvQDFrrzG2G7dymCCwaE6ADDoUeLY="; + hash = "sha256-bjR8ctS4sohtiQ/+n2dnqe2wLyAViOjDpXLc0I2YUr0="; }; patches = [ @@ -94,7 +97,7 @@ stdenv.mkDerivation rec { ]) ++ lib.optionals qt6Support (with qt6; [ qtbase qttools - ]) ++ lib.optionals stdenv.isLinux [ + ]) ++ lib.optionals enableWayland [ wayland-protocols ]; @@ -105,6 +108,7 @@ stdenv.mkDerivation rec { libdv libvpx speex + opencore-amr flac taglib cairo @@ -127,6 +131,8 @@ stdenv.mkDerivation rec { xorg.libXext xorg.libXfixes xorg.libXdamage + xorg.libXtst + xorg.libXi ] ++ lib.optionals gtkSupport [ # for gtksink gtk3 @@ -142,12 +148,14 @@ stdenv.mkDerivation rec { ]) ++ lib.optionals stdenv.isDarwin [ Cocoa ] ++ lib.optionals stdenv.isLinux [ + libdrm libGL libv4l libpulseaudio libavc1394 libiec61883 libgudev + ] ++ lib.optionals enableWayland [ wayland ] ++ lib.optionals enableJack [ libjack2 diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index 4d6c5671f0..da74ec243c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { description = "GStreamer Plugin for MIPI camera support through the IPU6/IPU6EP/IPU6SE on Intel Tigerlake/Alderlake/Jasperlake platforms"; homepage = "https://github.com/intel/icamerasrc/tree/icamerasrc_slim_api"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index ae54995a1c..35d0b461d9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.22.9"; + version = "1.24.2"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-GS99J9IcHnxywzmiZHqbDCR/7cYupQKRFfjD4i67h9g="; + hash = "sha256-lig4ZI4Uzop4Miqxb4TH2E2Gpte+u2V0rAXeqEp8fJs="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock index 6a3ecc43d7..52c6518bd5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -61,14 +61,39 @@ dependencies = [ ] [[package]] -name = "aho-corasick" -version = "1.0.3" +name = "ahash" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy 0.7.32", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -86,74 +111,73 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "1.0.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "arbitrary" -version = "0.4.7" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arg_enum_proc_macro" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c29b43ee8654590587cd033b3eca2f9c4f8cdff945ec0e6ee91ceb057d87f3" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] @@ -161,15 +185,25 @@ name = "arrayvec" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-channel" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ - "serde", + "concurrent-queue", + "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.1" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" +checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" dependencies = [ "flate2", "futures-core", @@ -180,13 +214,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] @@ -208,31 +242,31 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] name = "async-tungstenite" -version = "0.23.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" +checksum = "2cca750b12e02c389c1694d35c16539f88b8bbaa5945934fdc1b41a776688589" dependencies = [ "futures-io", "futures-util", @@ -241,14 +275,14 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-native-tls", - "tungstenite 0.20.0", + "tungstenite 0.21.0", ] [[package]] name = "atomic_refcell" -version = "0.1.10" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31" +checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" [[package]] name = "atty" @@ -263,97 +297,74 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "av1-grain" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6ca6f0c18c02c2fbfc119df551b8aeb8a385f6d5980f1475ba0255f1e97f1e" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" dependencies = [ "anyhow", "arrayvec", - "itertools 0.10.5", "log", "nom", "num-rational", - "serde", "v_frame", ] [[package]] name = "aws-config" -version = "0.56.0" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3d533e0263bf453cc80af4c8bcc4d64e2aca293bd16f81633a36f1bf4a97cb" +checksum = "297b64446175a73987cedc3c438d79b2a654d0fff96f65ff530fbe039347644c" dependencies = [ "aws-credential-types", - "aws-http", + "aws-runtime", "aws-sdk-sso", + "aws-sdk-ssooidc", "aws-sdk-sts", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes", "fastrand", "hex", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.28", "ring", - "time 0.3.25", + "time", "tokio", - "tower", "tracing", + "url", "zeroize", ] [[package]] name = "aws-credential-types" -version = "0.56.0" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4834ba01c5ad1ed9740aa222de62190e3c565d11ab7e72cc68314a258994567" +checksum = "fa8587ae17c8e967e4b05a62d495be2fb7701bec52a97f7acfe8a29f938384c8" dependencies = [ "aws-smithy-async", + "aws-smithy-runtime-api", "aws-smithy-types", - "fastrand", - "tokio", - "tracing", "zeroize", ] -[[package]] -name = "aws-http" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72badf9de83cc7d66b21b004f09241836823b8302afb25a24708769e576a8d8f" -dependencies = [ - "aws-credential-types", - "aws-smithy-http", - "aws-smithy-types", - "aws-types", - "bytes", - "http", - "http-body", - "lazy_static", - "percent-encoding", - "pin-project-lite", - "tracing", -] - [[package]] name = "aws-runtime" -version = "0.56.0" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf832f522111225c02547e1e1c28137e840e4b082399d93a236e4b29193a4667" +checksum = "b13dc54b4b49f8288532334bba8f87386a40571c47c37b1304979b556dc613c8" dependencies = [ "aws-credential-types", - "aws-http", "aws-sigv4", "aws-smithy-async", "aws-smithy-eventstream", @@ -361,24 +372,25 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", + "bytes", "fastrand", - "http", + "http 0.2.12", + "http-body 0.4.6", "percent-encoding", + "pin-project-lite", "tracing", "uuid", ] [[package]] name = "aws-sdk-kinesisvideo" -version = "0.29.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d12ca8af73af5453ecde2a4cc3df43eb6d623552bd3899692bfc92c6ddd1463" +checksum = "9c3d7de7e417e5007e6f12e435557b46aaaa1df3fdb51a036bbab99e666376e4" dependencies = [ "aws-credential-types", - "aws-http", "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", "aws-smithy-json", "aws-smithy-runtime", @@ -386,23 +398,21 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", - "regex", - "tokio-stream", + "http 0.2.12", + "once_cell", + "regex-lite", "tracing", ] [[package]] name = "aws-sdk-kinesisvideosignaling" -version = "0.29.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d880336d747d5207a74b656d8a229401142598fa36cab9163ac221946d517d" +checksum = "551e1b19fd1e74614788f842209704f6a588c076e4fd1fbf7ac37a387247fb7f" dependencies = [ "aws-credential-types", - "aws-http", "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", "aws-smithy-json", "aws-smithy-runtime", @@ -410,24 +420,24 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", - "regex", + "http 0.2.12", + "once_cell", + "regex-lite", "tracing", ] [[package]] name = "aws-sdk-s3" -version = "0.29.0" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e30370b61599168d38190ad272bb91842cd81870a6ca035c05dd5726d22832c" +checksum = "bc075ffee2a40cb1590bed35d7ec953589a564e768fa91947c565425cd569269" dependencies = [ + "ahash", "aws-credential-types", - "aws-http", "aws-runtime", "aws-sigv4", "aws-smithy-async", "aws-smithy-checksums", - "aws-smithy-client", "aws-smithy-eventstream", "aws-smithy-http", "aws-smithy-json", @@ -437,27 +447,29 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes", - "http", - "http-body", + "fastrand", + "hex", + "hmac 0.12.1", + "http 0.2.12", + "http-body 0.4.6", + "lru", "once_cell", "percent-encoding", - "regex", - "tokio-stream", + "regex-lite", + "sha2", "tracing", "url", ] [[package]] name = "aws-sdk-sso" -version = "0.29.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f41bf2c28d32dbb9894a8fcfcb148265d034d3f4a170552a47553a09de890895" +checksum = "019a07902c43b03167ea5df0182f0cb63fae89f9a9682c44d18cf2e4a042cb34" dependencies = [ "aws-credential-types", - "aws-http", "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", "aws-smithy-json", "aws-smithy-runtime", @@ -465,23 +477,43 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", - "regex", - "tokio-stream", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04c46ee08a48a7f4eaa4ad201dcc1dd537b49c50859d14d4510e00ad9d3f9af2" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http 0.2.12", + "once_cell", + "regex-lite", "tracing", ] [[package]] name = "aws-sdk-sts" -version = "0.29.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e21aa1a5b0853969a1ef96ccfaa8ff5d57c761549786a4d5f86c1902b2586a" +checksum = "f752ac730125ca6017f72f9db5ec1772c9ecc664f87aa7507a7d81b023c23713" dependencies = [ "aws-credential-types", - "aws-http", "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", "aws-smithy-json", "aws-smithy-query", @@ -490,23 +522,22 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "http", - "regex", + "http 0.2.12", + "once_cell", + "regex-lite", "tracing", ] [[package]] name = "aws-sdk-transcribestreaming" -version = "0.29.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12669c64c03c04e207ff14994791a3a508ae4dc55b0b73f31182171d19b04989" +checksum = "b18fdcacc5e1b61dfc34df6df1dee21e0da0e7564558ace1d0e1905e68e21b0c" dependencies = [ "aws-credential-types", - "aws-http", "aws-runtime", "aws-sigv4", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-eventstream", "aws-smithy-http", "aws-smithy-json", @@ -515,23 +546,22 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", - "hyper", - "regex", + "http 0.2.12", + "hyper 0.14.28", + "once_cell", + "regex-lite", "tracing", ] [[package]] name = "aws-sdk-translate" -version = "0.29.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336147dbb8f9d406dea0bbe5ef057ec4761d4134e7c8eb915db503d7081c6da7" +checksum = "c9929a0172d8358a66308f2bc48cc77a8f87940649b77132f367cafa0a1414be" dependencies = [ "aws-credential-types", - "aws-http", "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", "aws-smithy-json", "aws-smithy-runtime", @@ -540,65 +570,57 @@ dependencies = [ "aws-types", "bytes", "fastrand", - "http", - "regex", - "tokio-stream", - "tracing", -] - -[[package]] -name = "aws-sig-auth" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d861c220cd86e3d3e84b8fabddd6b7c29fbd8234715ebb71e063a64689d66bc0" -dependencies = [ - "aws-credential-types", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-http", - "aws-types", - "http", + "http 0.2.12", + "once_cell", + "regex-lite", "tracing", ] [[package]] name = "aws-sigv4" -version = "0.56.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb40a93429794065f41f0581734fc56a345f6a38d8e2e3c25c7448d930cd132" +checksum = "11d6f29688a4be9895c0ba8bef861ad0c0dac5c15e9618b9b7a6c233990fc263" dependencies = [ + "aws-credential-types", "aws-smithy-eventstream", "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", "bytes", + "crypto-bigint 0.5.5", "form_urlencoded", "hex", "hmac 0.12.1", - "http", + "http 0.2.12", + "http 1.1.0", "once_cell", + "p256", "percent-encoding", - "regex", + "ring", "sha2", - "time 0.3.25", + "subtle", + "time", "tracing", + "zeroize", ] [[package]] name = "aws-smithy-async" -version = "0.56.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee6d17d487c8b579423067718b3580c0908d0f01d7461813f94ec4323bad623" +checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" dependencies = [ "futures-util", "pin-project-lite", "tokio", - "tokio-stream", ] [[package]] name = "aws-smithy-checksums" -version = "0.56.0" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d1849fd5916904513fb0862543b36f8faab43c07984dbc476132b7da1aed056" +checksum = "83fa43bc04a6b2441968faeab56e68da3812f978a670a5db32accbdcafddd12f" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -606,8 +628,8 @@ dependencies = [ "crc32c", "crc32fast", "hex", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "md-5", "pin-project-lite", "sha1", @@ -615,35 +637,11 @@ dependencies = [ "tracing", ] -[[package]] -name = "aws-smithy-client" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbe0a3ad15283cc5f863a68cb6adc8e256e7c109c43c01bdd09be407219a1e9" -dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-types", - "bytes", - "fastrand", - "http", - "http-body", - "hyper", - "hyper-rustls", - "lazy_static", - "pin-project-lite", - "rustls", - "tokio", - "tower", - "tracing", -] - [[package]] name = "aws-smithy-eventstream" -version = "0.56.0" +version = "0.60.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56afef1aa766f512b4970b4c3150b9bf2df8035939723830df4b30267e2d7cb" +checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" dependencies = [ "aws-smithy-types", "bytes", @@ -652,57 +650,39 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.56.0" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34dc313472d727f5ef44fdda93e668ebfe17380c99dee512c403e3ca51863bb9" +checksum = "3f10fa66956f01540051b0aa7ad54574640f748f9839e843442d99b970d3aff9" dependencies = [ "aws-smithy-eventstream", + "aws-smithy-runtime-api", "aws-smithy-types", "bytes", "bytes-utils", "futures-core", - "http", - "http-body", - "hyper", + "http 0.2.12", + "http-body 0.4.6", "once_cell", "percent-encoding", "pin-project-lite", "pin-utils", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "aws-smithy-http-tower" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd50fca5a4ea4ec3771689ee93bf06b32de02a80af01ed93a8f8a4ed90e8483" -dependencies = [ - "aws-smithy-http", - "aws-smithy-types", - "bytes", - "http", - "http-body", - "pin-project-lite", - "tower", "tracing", ] [[package]] name = "aws-smithy-json" -version = "0.56.0" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3591dd7c2fe01ab8025e4847a0a0f6d0c2b2269714688ffb856f9cf6c6d465cf" +checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.56.0" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbabb1145e65dd57ae72d91a2619d3f5fba40b68a5f40ba009c30571dfd60aff" +checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" dependencies = [ "aws-smithy-types", "urlencoding", @@ -710,85 +690,102 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "0.56.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3687fb838d4ad1c883b62eb59115bc9fb02c4f308aac49a7df89627067f6eb0d" +checksum = "c53572b4cd934ee5e8461ad53caa36e9d246aaef42166e3ac539e206a925d330" dependencies = [ "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", "bytes", "fastrand", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "http-body 1.0.0", + "hyper 0.14.28", + "hyper-rustls", "once_cell", "pin-project-lite", "pin-utils", + "rustls", "tokio", "tracing", ] [[package]] name = "aws-smithy-runtime-api" -version = "0.56.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cfbf1e5c2108b41f5ca607cde40dd5109fecc448f5d30c8e614b61f36dce704" +checksum = "ccb2b3a7030dc9a3c9a08ce0b25decea5130e9db19619d4dffbbff34f75fe850" dependencies = [ "aws-smithy-async", - "aws-smithy-http", "aws-smithy-types", "bytes", - "http", + "http 0.2.12", + "http 1.1.0", + "pin-project-lite", "tokio", "tracing", + "zeroize", ] [[package]] name = "aws-smithy-types" -version = "0.56.0" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed0a94eefd845a2a78677f1b72f02fa75802d38f7f59be675add140279aa8bf" +checksum = "abe14dceea1e70101d38fbf2a99e6a34159477c0fb95e68e05c66bd7ae4c3729" dependencies = [ "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http 1.1.0", + "http-body 0.4.6", + "http-body 1.0.0", + "http-body-util", "itoa", "num-integer", + "pin-project-lite", + "pin-utils", "ryu", "serde", - "time 0.3.25", + "time", + "tokio", + "tokio-util", ] [[package]] name = "aws-smithy-xml" -version = "0.56.0" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88052c812f696143ad7ba729c63535209ff0e0f49e31a6d2b1205208ea6ea79" +checksum = "872c68cf019c0e4afc5de7753c4f7288ce4b71663212771bf5e4542eb9346ca9" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "0.56.0" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bceb8cf724ad057ad7f327d0d256d7147b3eac777b39849a26189e003dc9782" +checksum = "0dbf2f3da841a8930f159163175cf6a3d16ddde517c1b0fba7aa776822800f40" dependencies = [ "aws-credential-types", "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-runtime-api", "aws-smithy-types", - "http", + "http 0.2.12", "rustc_version", "tracing", ] [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -799,6 +796,12 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base32" version = "0.4.0" @@ -813,9 +816,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "base64-serde" @@ -823,7 +832,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba368df5de76a5bea49aaf0cf1b39ccfbbef176924d1ba5db3e4135216cbe3c7" dependencies = [ - "base64 0.21.2", + "base64 0.21.7", "serde", ] @@ -837,6 +846,12 @@ dependencies = [ "vsimd", ] +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + [[package]] name = "bincode" version = "1.3.3" @@ -854,15 +869,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitstream-io" -version = "1.7.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82704769cb85a22df2c54d6bdd6a158b7931d256cf3248a07d6ecbe9d58b31d7" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" [[package]] name = "block-buffer" @@ -882,6 +897,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", +] + [[package]] name = "build_const" version = "0.2.2" @@ -890,18 +914,15 @@ checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7" [[package]] name = "built" -version = "0.5.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9c056b9ed43aee5e064b683aa1ec783e19c6acec7559e3ae931b7490472fbe" -dependencies = [ - "cargo-lock", -] +checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "byte-slice-cast" @@ -911,27 +932,27 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[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" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytes-utils" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" dependencies = [ "bytes", "either", @@ -939,44 +960,31 @@ dependencies = [ [[package]] name = "cairo-rs" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.5.0", "cairo-sys-rs", "glib", "libc", - "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ "glib-sys", "libc", "system-deps", ] -[[package]] -name = "cargo-lock" -version = "8.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" -dependencies = [ - "semver", - "serde", - "toml 0.5.11", - "url", -] - [[package]] name = "cc" -version = "1.0.82" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "1fd97381a8cc6493395a5afc4c691c1084b3768db713b73aa215217aa245d153" dependencies = [ "jobserver", "libc", @@ -1000,20 +1008,22 @@ dependencies = [ [[package]] name = "cea708-types" -version = "0.1.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a23ec736ab2aafb861ef6f22c662cbc18c85e73945f86bd9e936a20be7cc958" +checksum = "fd7f33493cb6f19aa19c6e688708f66bf792bc2c75137da2a03c7ebbdf7a44f9" dependencies = [ + "env_logger 0.10.2", + "log", + "muldiv", "once_cell", - "tracing", - "tracing-subscriber", + "thiserror", ] [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", "target-lexicon", @@ -1027,18 +1037,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.52.4", ] [[package]] @@ -1052,20 +1061,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.21" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.21" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstream", "anstyle", @@ -1075,21 +1083,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "claxon" @@ -1125,46 +1133,61 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] [[package]] -name = "cookie" -version = "0.16.2" +name = "const-oid" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "cookie" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "percent-encoding", - "time 0.3.25", + "time", "version_check", ] [[package]] -name = "cookie_store" -version = "0.16.2" +name = "cookie-factory" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" +dependencies = [ + "futures", +] + +[[package]] +name = "cookie_store" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ "cookie", - "idna 0.2.3", + "idna 0.3.0", "log", "publicsuffix", "serde", "serde_derive", "serde_json", - "time 0.3.25", + "time", "url", ] [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -1172,15 +1195,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1196,63 +1219,76 @@ dependencies = [ [[package]] name = "crc32c" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" +checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" dependencies = [ "rustc_version", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crypto-bigint" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ - "cfg-if", + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "rand_core", + "subtle", ] [[package]] @@ -1267,9 +1303,9 @@ dependencies = [ [[package]] name = "crypto-mac" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ "generic-array", "subtle", @@ -1308,9 +1344,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -1318,51 +1354,66 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] name = "dash-mpd" -version = "0.13.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0c74b03285fe95649f588140b6009dc10bc4f747bd774818ed8e9cc6b5cbb6" +checksum = "6cafa2c33eff2857e1a14c38aa9a432aa565a01e77804a541fce7aec3affb8f8" dependencies = [ - "base64 0.21.2", + "base64 0.22.0", "base64-serde", "chrono", "fs-err", "iso8601", - "log", + "lazy_static", "num-traits", "quick-xml", "regex", "serde", + "serde_path_to_error", "serde_with", "thiserror", - "tokio", + "tracing", + "url", "xattr", ] +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "dasp_frame" version = "0.11.0" @@ -1380,36 +1431,47 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "dav1d" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ca43c8e58ee931086b5fd9a4b6a8cc40c1346592246c4fe3d299eca1684c75" +checksum = "96be853ae81fdc81d4fbd921866ba6272147c34f75a8ee5d25781ea0f1bcadc8" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.5.0", "dav1d-sys", ] [[package]] name = "dav1d-sys" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615542bb14c18b795f46aba92258902168218d714090f5fff47e68c9a352ea2d" +checksum = "3a49fd89ad2b234b606f942e8759390fd7176e9b2b50438f516dd232dcc6e58f" dependencies = [ "libc", "system-deps", ] [[package]] -name = "deranged" -version = "0.3.7" +name = "der" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ + "const-oid", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", "serde", ] @@ -1441,12 +1503,12 @@ dependencies = [ [[package]] name = "dssim-core" -version = "3.2.7" +version = "3.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1388544389475fcfd718b35a286af17cb215202af26bf2067d0e1024adbc3fe9" +checksum = "fafad37c1f4f168243f3ac1b4cae0d358c528ac695670100337314e38d54b486" dependencies = [ "imgref", - "itertools 0.11.0", + "itertools 0.12.1", "rayon", "rgb", ] @@ -1463,6 +1525,18 @@ dependencies = [ "smallvec", ] +[[package]] +name = "ecdsa" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +dependencies = [ + "der", + "elliptic-curve", + "rfc6979", + "signature", +] + [[package]] name = "ed25519" version = "1.5.3" @@ -1474,15 +1548,35 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "elliptic-curve" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +dependencies = [ + "base16ct", + "crypto-bigint 0.4.9", + "der", + "digest 0.10.7", + "ff", + "generic-array", + "group", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -1501,9 +1595,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -1520,40 +1614,66 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "event-listener" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ - "cc", - "libc", + "concurrent-queue", + "parking", + "pin-project-lite", ] +[[package]] +name = "event-listener-strategy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +dependencies = [ + "event-listener", + "pin-project-lite", +] + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "rand_core", + "subtle", +] + [[package]] name = "ffv1" version = "0.0.0" @@ -1570,7 +1690,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset 0.9.1", "rustc_version", ] @@ -1582,9 +1702,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1600,15 +1720,14 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", "nanorand", - "pin-project", - "spin 0.9.8", + "spin", ] [[package]] @@ -1634,18 +1753,21 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "fs-err" -version = "2.9.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", +] [[package]] name = "fst" @@ -1655,9 +1777,9 @@ checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1670,9 +1792,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1680,15 +1802,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1697,38 +1819,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1744,20 +1866,19 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ "gdk-pixbuf-sys", "gio", "glib", "libc", - "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ "gio-sys", "glib-sys", @@ -1768,8 +1889,8 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.1" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" +version = "0.8.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1782,8 +1903,8 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.7.1" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" +version = "0.8.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1798,8 +1919,8 @@ dependencies = [ [[package]] name = "gdk4-wayland" -version = "0.7.1" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" +version = "0.8.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084" dependencies = [ "gdk4", "gdk4-wayland-sys", @@ -1810,8 +1931,8 @@ dependencies = [ [[package]] name = "gdk4-wayland-sys" -version = "0.7.1" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" +version = "0.8.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084" dependencies = [ "glib-sys", "libc", @@ -1820,8 +1941,8 @@ dependencies = [ [[package]] name = "gdk4-win32" -version = "0.7.1" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" +version = "0.8.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084" dependencies = [ "gdk4", "gdk4-win32-sys", @@ -1829,15 +1950,13 @@ dependencies = [ "glib", "khronos-egl", "libc", - "system-deps", ] [[package]] name = "gdk4-win32-sys" -version = "0.7.1" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" +version = "0.8.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084" dependencies = [ - "gdk-pixbuf-sys", "gdk4-sys", "glib-sys", "libc", @@ -1846,8 +1965,8 @@ dependencies = [ [[package]] name = "gdk4-x11" -version = "0.7.1" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" +version = "0.8.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084" dependencies = [ "gdk4", "gdk4-x11-sys", @@ -1858,8 +1977,8 @@ dependencies = [ [[package]] name = "gdk4-x11-sys" -version = "0.7.1" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" +version = "0.8.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084" dependencies = [ "gdk4-sys", "glib-sys", @@ -1888,22 +2007,22 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -1911,14 +2030,14 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ "futures-channel", "futures-core", @@ -1927,7 +2046,6 @@ dependencies = [ "gio-sys", "glib", "libc", - "once_cell", "pin-project-lite", "smallvec", "thiserror", @@ -1935,22 +2053,22 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", @@ -1962,28 +2080,26 @@ dependencies = [ "gobject-sys", "libc", "memchr", - "once_cell", "smallvec", "thiserror", ] [[package]] name = "glib-macros" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro-crate", - "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] name = "glib-sys" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ "libc", "system-deps", @@ -1997,8 +2113,8 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ "glib-sys", "libc", @@ -2007,8 +2123,8 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ "glib", "graphene-sys", @@ -2017,8 +2133,8 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ "glib-sys", "libc", @@ -2026,10 +2142,21 @@ dependencies = [ "system-deps", ] +[[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + [[package]] name = "gsk4" -version = "0.7.1" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" +version = "0.8.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084" dependencies = [ "cairo-rs", "gdk4", @@ -2042,8 +2169,8 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.1" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" +version = "0.8.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -2057,7 +2184,7 @@ dependencies = [ [[package]] name = "gst-plugin-audiofx" -version = "0.11.0" +version = "0.12.4" dependencies = [ "anyhow", "atomic_refcell", @@ -2072,13 +2199,14 @@ dependencies = [ "hrtf", "nnnoiseless", "num-traits", + "once_cell", "rayon", "smallvec", ] [[package]] name = "gst-plugin-aws" -version = "0.11.0" +version = "0.12.4" dependencies = [ "async-stream", "aws-config", @@ -2086,14 +2214,11 @@ dependencies = [ "aws-sdk-s3", "aws-sdk-transcribestreaming", "aws-sdk-translate", - "aws-sig-auth", - "aws-smithy-http", - "aws-smithy-types", "aws-types", "base32", "bytes", "chrono", - "env_logger 0.10.0", + "env_logger 0.10.2", "futures", "gio", "gst-plugin-version-helper", @@ -2101,7 +2226,7 @@ dependencies = [ "gstreamer-audio", "gstreamer-base", "gstreamer-check", - "http", + "once_cell", "percent-encoding", "rand", "serde", @@ -2114,7 +2239,7 @@ dependencies = [ [[package]] name = "gst-plugin-cdg" -version = "0.11.0" +version = "0.12.4" dependencies = [ "cdg", "cdg_renderer", @@ -2124,12 +2249,12 @@ dependencies = [ "gstreamer-base", "gstreamer-video", "image", - "muldiv", + "once_cell", ] [[package]] name = "gst-plugin-claxon" -version = "0.11.0" +version = "0.12.4" dependencies = [ "atomic_refcell", "byte-slice-cast", @@ -2143,7 +2268,7 @@ dependencies = [ [[package]] name = "gst-plugin-closedcaption" -version = "0.11.0" +version = "0.12.4" dependencies = [ "anyhow", "atomic_refcell", @@ -2159,6 +2284,7 @@ dependencies = [ "gstreamer-check", "gstreamer-video", "nom", + "once_cell", "pango", "pangocairo", "pretty_assertions", @@ -2170,7 +2296,7 @@ dependencies = [ [[package]] name = "gst-plugin-csound" -version = "0.11.0" +version = "0.12.4" dependencies = [ "byte-slice-cast", "csound", @@ -2179,11 +2305,12 @@ dependencies = [ "gstreamer-audio", "gstreamer-base", "gstreamer-check", + "once_cell", ] [[package]] name = "gst-plugin-dav1d" -version = "0.11.0" +version = "0.12.4" dependencies = [ "dav1d", "gst-plugin-version-helper", @@ -2191,11 +2318,12 @@ dependencies = [ "gstreamer-base", "gstreamer-video", "num_cpus", + "once_cell", ] [[package]] name = "gst-plugin-fallbackswitch" -version = "0.11.0" +version = "0.12.4" dependencies = [ "gio", "gst-plugin-gtk4", @@ -2207,12 +2335,13 @@ dependencies = [ "gstreamer-check", "gstreamer-video", "gtk4", + "once_cell", "parking_lot", ] [[package]] name = "gst-plugin-ffv1" -version = "0.11.0" +version = "0.12.4" dependencies = [ "byte-slice-cast", "ffv1", @@ -2220,21 +2349,23 @@ dependencies = [ "gstreamer", "gstreamer-check", "gstreamer-video", + "once_cell", ] [[package]] name = "gst-plugin-file" -version = "0.11.0" +version = "0.12.4" dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-base", + "once_cell", "url", ] [[package]] name = "gst-plugin-flavors" -version = "0.11.0" +version = "0.12.4" dependencies = [ "byteorder", "flavors", @@ -2242,15 +2373,15 @@ dependencies = [ "gstreamer", "gstreamer-audio", "gstreamer-base", - "muldiv", "nom", "num-rational", + "once_cell", "smallvec", ] [[package]] name = "gst-plugin-fmp4" -version = "0.11.0" +version = "0.12.4" dependencies = [ "anyhow", "chrono", @@ -2264,13 +2395,14 @@ dependencies = [ "gstreamer-pbutils", "gstreamer-video", "m3u8-rs", + "once_cell", "quick-xml", "serde", ] [[package]] name = "gst-plugin-gif" -version = "0.11.0" +version = "0.12.4" dependencies = [ "atomic_refcell", "gif", @@ -2283,8 +2415,9 @@ dependencies = [ [[package]] name = "gst-plugin-gtk4" -version = "0.11.0" +version = "0.12.4" dependencies = [ + "async-channel", "gdk4-wayland", "gdk4-win32", "gdk4-x11", @@ -2297,28 +2430,32 @@ dependencies = [ "gstreamer-gl-x11", "gstreamer-video", "gtk4", - "windows-sys", + "once_cell", + "windows-sys 0.52.0", ] [[package]] name = "gst-plugin-hlssink3" -version = "0.11.0" +version = "0.12.4" dependencies = [ + "anyhow", + "chrono", "gio", - "glib", "gst-plugin-version-helper", "gstreamer", + "gstreamer-app", "gstreamer-audio", - "gstreamer-base", "gstreamer-check", + "gstreamer-pbutils", + "gstreamer-video", "m3u8-rs", "once_cell", - "regex", + "sprintf", ] [[package]] name = "gst-plugin-hsv" -version = "0.11.0" +version = "0.12.4" dependencies = [ "byte-slice-cast", "gst-plugin-version-helper", @@ -2328,22 +2465,42 @@ dependencies = [ "gstreamer-check", "gstreamer-video", "num-traits", + "once_cell", +] + +[[package]] +name = "gst-plugin-inter" +version = "0.12.4" +dependencies = [ + "anyhow", + "futures", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-app", + "gstreamer-check", + "gstreamer-utils", + "once_cell", + "pretty_assertions", + "serial_test", + "tokio", + "tokio-stream", ] [[package]] name = "gst-plugin-json" -version = "0.11.0" +version = "0.12.4" dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", + "once_cell", "serde", "serde_json", ] [[package]] name = "gst-plugin-lewton" -version = "0.11.0" +version = "0.12.4" dependencies = [ "atomic_refcell", "byte-slice-cast", @@ -2352,11 +2509,12 @@ dependencies = [ "gstreamer-audio", "gstreamer-check", "lewton", + "once_cell", ] [[package]] name = "gst-plugin-livesync" -version = "0.11.0" +version = "0.12.4" dependencies = [ "gio", "gst-plugin-gtk4", @@ -2365,14 +2523,14 @@ dependencies = [ "gstreamer-audio", "gstreamer-check", "gtk4", - "muldiv", "num-rational", + "once_cell", "parking_lot", ] [[package]] name = "gst-plugin-mp4" -version = "0.11.0" +version = "0.12.4" dependencies = [ "anyhow", "gst-plugin-version-helper", @@ -2381,17 +2539,20 @@ dependencies = [ "gstreamer-base", "gstreamer-pbutils", "gstreamer-video", + "once_cell", "tempfile", "url", ] [[package]] name = "gst-plugin-ndi" -version = "0.11.0" +version = "0.12.4" dependencies = [ + "anyhow", "atomic_refcell", "byte-slice-cast", "byteorder", + "data-encoding", "glib", "gst-plugin-version-helper", "gstreamer", @@ -2399,11 +2560,15 @@ dependencies = [ "gstreamer-base", "gstreamer-video", "libloading", + "once_cell", + "quick-xml", + "smallvec", + "thiserror", ] [[package]] name = "gst-plugin-onvif" -version = "0.11.0" +version = "0.12.4" dependencies = [ "cairo-rs", "chrono", @@ -2412,6 +2577,7 @@ dependencies = [ "gstreamer-base", "gstreamer-rtp", "gstreamer-video", + "once_cell", "pango", "pangocairo", "xmlparser", @@ -2420,7 +2586,7 @@ dependencies = [ [[package]] name = "gst-plugin-png" -version = "0.11.0" +version = "0.12.4" dependencies = [ "gst-plugin-version-helper", "gstreamer", @@ -2433,70 +2599,103 @@ dependencies = [ [[package]] name = "gst-plugin-raptorq" -version = "0.11.0" +version = "0.12.4" dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-base", "gstreamer-check", "gstreamer-rtp", + "once_cell", "rand", "raptorq", ] [[package]] name = "gst-plugin-rav1e" -version = "0.11.0" +version = "0.12.4" dependencies = [ "atomic_refcell", "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "gstreamer-video", + "once_cell", "rav1e", ] [[package]] name = "gst-plugin-regex" -version = "0.11.0" +version = "0.12.4" dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", + "once_cell", "regex", ] [[package]] name = "gst-plugin-reqwest" -version = "0.11.0" +version = "0.12.4" dependencies = [ + "bytes", "futures", "gst-plugin-version-helper", "gstreamer", "gstreamer-base", - "headers", - "hyper", + "headers 0.4.0", + "http-body-util", + "hyper 1.2.0", "mime", - "reqwest", + "once_cell", + "pin-project-lite", + "reqwest 0.12.3", "tokio", "url", ] [[package]] name = "gst-plugin-rtp" -version = "0.11.0" +version = "0.12.4" dependencies = [ "bitstream-io", - "chrono", "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "gstreamer-rtp", + "once_cell", + "smallvec", + "time", +] + +[[package]] +name = "gst-plugin-rtsp" +version = "0.12.4" +dependencies = [ + "anyhow", + "atomic_refcell", + "data-encoding", + "futures", + "gst-plugin-version-helper", + "gstreamer", + "gstreamer-app", + "gstreamer-net", + "gstreamer-pbutils", + "lru", + "once_cell", + "rtsp-types", + "sdp-types", + "socket2 0.5.6", + "thiserror", + "tokio", + "tokio-stream", + "url", ] [[package]] name = "gst-plugin-sodium" -version = "0.11.0" +version = "0.12.4" dependencies = [ "clap", "gst-plugin-version-helper", @@ -2516,7 +2715,7 @@ dependencies = [ [[package]] name = "gst-plugin-spotify" -version = "0.11.0" +version = "0.12.4" dependencies = [ "anyhow", "futures", @@ -2524,35 +2723,39 @@ dependencies = [ "gstreamer", "gstreamer-base", "librespot", + "once_cell", "tokio", "url", ] [[package]] name = "gst-plugin-textahead" -version = "0.11.0" +version = "0.12.4" dependencies = [ "gst-plugin-version-helper", "gstreamer", + "once_cell", ] [[package]] name = "gst-plugin-textwrap" -version = "0.11.0" +version = "0.12.4" dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "hyphenation", + "once_cell", "textwrap", ] [[package]] name = "gst-plugin-threadshare" -version = "0.11.0" +version = "0.12.4" dependencies = [ "async-task", "cc", + "cfg-if", "clap", "concurrent-queue", "flume", @@ -2565,21 +2768,21 @@ dependencies = [ "gstreamer-check", "gstreamer-net", "gstreamer-rtp", - "libc", "once_cell", "pin-project-lite", "pkg-config", "polling", "rand", + "rustix", "slab", - "socket2 0.5.3", + "socket2 0.5.6", "waker-fn", "winapi", ] [[package]] name = "gst-plugin-togglerecord" -version = "0.11.0" +version = "0.12.4" dependencies = [ "either", "gio", @@ -2590,23 +2793,25 @@ dependencies = [ "gstreamer-check", "gstreamer-video", "gtk4", + "once_cell", "parking_lot", ] [[package]] name = "gst-plugin-tracers" -version = "0.11.0" +version = "0.12.4" dependencies = [ "anyhow", "gst-plugin-version-helper", "gstreamer", + "once_cell", "regex", "signal-hook", ] [[package]] name = "gst-plugin-tutorial" -version = "0.11.0" +version = "0.12.4" dependencies = [ "byte-slice-cast", "gst-plugin-version-helper", @@ -2615,11 +2820,12 @@ dependencies = [ "gstreamer-base", "gstreamer-video", "num-traits", + "once_cell", ] [[package]] name = "gst-plugin-uriplaylistbin" -version = "0.11.0" +version = "0.12.4" dependencies = [ "anyhow", "clap", @@ -2627,20 +2833,22 @@ dependencies = [ "gstreamer", "gstreamer-app", "more-asserts", + "once_cell", "thiserror", "url", ] [[package]] name = "gst-plugin-version-helper" -version = "0.7.5" +version = "0.8.2" dependencies = [ "chrono", + "toml_edit 0.22.9", ] [[package]] name = "gst-plugin-videofx" -version = "0.11.0" +version = "0.12.4" dependencies = [ "atomic_refcell", "cairo-rs", @@ -2654,24 +2862,26 @@ dependencies = [ "gstreamer-video", "image", "image_hasher", + "once_cell", "rgb", ] [[package]] name = "gst-plugin-webp" -version = "0.11.0" +version = "0.12.4" dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "gstreamer-video", "libwebp-sys2", + "once_cell", "pretty_assertions", ] [[package]] name = "gst-plugin-webrtc" -version = "0.11.0" +version = "0.12.4" dependencies = [ "anyhow", "async-recursion", @@ -2680,12 +2890,13 @@ dependencies = [ "aws-credential-types", "aws-sdk-kinesisvideo", "aws-sdk-kinesisvideosignaling", - "aws-sig-auth", + "aws-sigv4", "aws-smithy-http", "aws-smithy-types", "aws-types", "chrono", "clap", + "crossbeam-channel", "data-encoding", "fastrand", "futures", @@ -2693,19 +2904,22 @@ dependencies = [ "gst-plugin-webrtc-signalling-protocol", "gstreamer", "gstreamer-app", + "gstreamer-audio", "gstreamer-base", "gstreamer-rtp", "gstreamer-sdp", "gstreamer-utils", "gstreamer-video", "gstreamer-webrtc", - "http", + "http 1.1.0", "human_bytes", "livekit-api", "livekit-protocol", + "once_cell", "parse_link_header", + "rand", "regex", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "thiserror", @@ -2718,11 +2932,12 @@ dependencies = [ "url", "url-escape", "uuid", + "warp", ] [[package]] name = "gst-plugin-webrtc-signalling" -version = "0.11.0" +version = "0.12.4" dependencies = [ "anyhow", "async-tungstenite", @@ -2744,7 +2959,7 @@ dependencies = [ [[package]] name = "gst-plugin-webrtc-signalling-protocol" -version = "0.11.0" +version = "0.12.4" dependencies = [ "serde", "serde_json", @@ -2752,7 +2967,7 @@ dependencies = [ [[package]] name = "gst-plugin-webrtchttp" -version = "0.11.0" +version = "0.12.4" dependencies = [ "async-recursion", "bytes", @@ -2761,15 +2976,16 @@ dependencies = [ "gstreamer", "gstreamer-sdp", "gstreamer-webrtc", + "once_cell", "parse_link_header", - "reqwest", + "reqwest 0.12.3", "tokio", ] [[package]] name = "gstreamer" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "cfg-if", "futures-channel", @@ -2777,14 +2993,15 @@ dependencies = [ "futures-util", "glib", "gstreamer-sys", - "itertools 0.11.0", + "itertools 0.12.1", "libc", "muldiv", "num-integer", "num-rational", + "once_cell", "option-operations", "paste", - "pretty-hex", + "pin-project-lite", "serde", "serde_bytes", "smallvec", @@ -2793,8 +3010,8 @@ dependencies = [ [[package]] name = "gstreamer-app" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "futures-core", "futures-sink", @@ -2807,8 +3024,8 @@ dependencies = [ [[package]] name = "gstreamer-app-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -2819,8 +3036,8 @@ dependencies = [ [[package]] name = "gstreamer-audio" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "cfg-if", "glib", @@ -2828,12 +3045,15 @@ dependencies = [ "gstreamer-audio-sys", "gstreamer-base", "libc", + "once_cell", + "serde", + "smallvec", ] [[package]] name = "gstreamer-audio-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gobject-sys", @@ -2845,8 +3065,8 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "atomic_refcell", "cfg-if", @@ -2858,8 +3078,8 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gobject-sys", @@ -2870,8 +3090,8 @@ dependencies = [ [[package]] name = "gstreamer-check" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib", "gstreamer", @@ -2880,8 +3100,8 @@ dependencies = [ [[package]] name = "gstreamer-check-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gobject-sys", @@ -2892,8 +3112,8 @@ dependencies = [ [[package]] name = "gstreamer-gl" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib", "gstreamer", @@ -2901,12 +3121,13 @@ dependencies = [ "gstreamer-gl-sys", "gstreamer-video", "libc", + "once_cell", ] [[package]] name = "gstreamer-gl-egl" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib", "gstreamer", @@ -2917,8 +3138,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-egl-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gstreamer-gl-sys", @@ -2928,8 +3149,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gobject-sys", @@ -2942,8 +3163,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-wayland" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib", "gstreamer", @@ -2954,8 +3175,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-wayland-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gstreamer-gl-sys", @@ -2965,8 +3186,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-x11" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib", "gstreamer", @@ -2977,8 +3198,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-x11-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gstreamer-gl-sys", @@ -2988,8 +3209,8 @@ dependencies = [ [[package]] name = "gstreamer-net" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "gio", "glib", @@ -2999,8 +3220,8 @@ dependencies = [ [[package]] name = "gstreamer-net-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "gio-sys", "glib-sys", @@ -3011,8 +3232,8 @@ dependencies = [ [[package]] name = "gstreamer-pbutils" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib", "gstreamer", @@ -3025,8 +3246,8 @@ dependencies = [ [[package]] name = "gstreamer-pbutils-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gobject-sys", @@ -3039,8 +3260,8 @@ dependencies = [ [[package]] name = "gstreamer-rtp" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib", "gstreamer", @@ -3050,8 +3271,8 @@ dependencies = [ [[package]] name = "gstreamer-rtp-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -3062,8 +3283,8 @@ dependencies = [ [[package]] name = "gstreamer-sdp" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib", "gstreamer", @@ -3072,8 +3293,8 @@ dependencies = [ [[package]] name = "gstreamer-sdp-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gstreamer-sys", @@ -3083,8 +3304,8 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gobject-sys", @@ -3094,19 +3315,20 @@ dependencies = [ [[package]] name = "gstreamer-utils" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "gstreamer", "gstreamer-app", "gstreamer-video", + "once_cell", "thiserror", ] [[package]] name = "gstreamer-video" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "cfg-if", "futures-channel", @@ -3115,13 +3337,15 @@ dependencies = [ "gstreamer-base", "gstreamer-video-sys", "libc", + "once_cell", "serde", + "thiserror", ] [[package]] name = "gstreamer-video-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gobject-sys", @@ -3133,8 +3357,8 @@ dependencies = [ [[package]] name = "gstreamer-webrtc" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib", "gstreamer", @@ -3145,8 +3369,8 @@ dependencies = [ [[package]] name = "gstreamer-webrtc-sys" -version = "0.21.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" +version = "0.22.4" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac" dependencies = [ "glib-sys", "gstreamer-sdp-sys", @@ -3157,8 +3381,8 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.1" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" +version = "0.8.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084" dependencies = [ "cairo-rs", "field-offset", @@ -3177,8 +3401,8 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.7.1" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" +version = "0.8.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084" dependencies = [ "anyhow", "proc-macro-crate", @@ -3190,8 +3414,8 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.1" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" +version = "0.8.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -3208,17 +3432,36 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 1.9.3", + "http 0.2.12", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.1.0", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -3233,21 +3476,39 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] [[package]] name = "headers" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.7", "bytes", - "headers-core", - "http", + "headers-core 0.2.0", + "http 0.2.12", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" +dependencies = [ + "base64 0.21.7", + "bytes", + "headers-core 0.3.0", + "http 1.1.0", "httpdate", "mime", "sha1", @@ -3259,7 +3520,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.12", +] + +[[package]] +name = "headers-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" +dependencies = [ + "http 1.1.0", ] [[package]] @@ -3268,6 +3538,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -3279,9 +3555,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -3321,9 +3597,9 @@ dependencies = [ [[package]] name = "hrtf" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73088c4a5d7c9d21ee942a54611696f247c4bafc85e9261bf8c409b6857e75be" +checksum = "0f4de47a84fd55fa33aa5ef337016814fdc869fdad23e7898b5322fa290248e6" dependencies = [ "byteorder", "rubato", @@ -3332,9 +3608,20 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -3343,12 +3630,35 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -3360,15 +3670,15 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "human_bytes" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27e2b089f28ad15597b48d8c0a8fe94eeb1c1cb26ca99b6f66ac9582ae10c5e6" +checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e" [[package]] name = "humantime" @@ -3378,28 +3688,49 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.5.6", "tokio", "tower-service", "tracing", "want", ] +[[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-proxy" version = "0.9.1" @@ -3408,22 +3739,22 @@ checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" dependencies = [ "bytes", "futures", - "headers", - "http", - "hyper", + "headers 0.3.9", + "http 0.2.12", + "hyper 0.14.28", "tokio", "tower-service", ] [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.28", "log", "rustls", "rustls-native-certs", @@ -3438,12 +3769,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.28", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.2.0", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2 0.5.6", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "hyphenation" version = "0.8.4" @@ -3469,16 +3836,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -3496,17 +3863,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.3.0" @@ -3519,9 +3875,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -3539,14 +3895,13 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-rational", "num-traits", ] @@ -3556,7 +3911,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f9e64a8c472ea9f81ac448e3b488fd82dcdfce6434cf880882bf36bfb5c268a" dependencies = [ - "base64 0.21.2", + "base64 0.21.7", "image", "rustdct", "serde", @@ -3565,9 +3920,9 @@ dependencies = [ [[package]] name = "imgref" -version = "1.9.4" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2cf49df1085dcfb171460e4592597b84abe50d900fb83efb6e41b20fefd6c2c" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" [[package]] name = "indexmap" @@ -3582,41 +3937,41 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "serde", ] [[package]] name = "interpolate_name" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b35f4a811037cfdcd44c5db40678464b2d5d248fc1abeeaaa125b370d47f17" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.2", - "rustix", - "windows-sys", + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.52.0", ] [[package]] @@ -3628,15 +3983,6 @@ dependencies = [ "nom", ] -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.11.0" @@ -3647,36 +3993,46 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.9" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonwebtoken" -version = "8.3.0" +version = "9.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" dependencies = [ - "base64 0.21.2", + "base64 0.21.7", + "js-sys", "ring", "serde", "serde_json", @@ -3684,9 +4040,9 @@ dependencies = [ [[package]] name = "khronos-egl" -version = "5.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1382b16c04aeb821453d6215a3c80ba78f24c6595c5aa85653378aabe0c83e3" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", ] @@ -3710,35 +4066,36 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libfuzzer-sys" -version = "0.3.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf184a4b6b274f82a5df6b357da6055d3e82272327bba281c28bbba6f1664ef" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" dependencies = [ "arbitrary", "cc", + "once_cell", ] [[package]] name = "libloading" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-sys", + "windows-targets 0.48.5", ] [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmdns" @@ -3751,10 +4108,10 @@ dependencies = [ "hostname", "if-addrs", "log", - "multimap", + "multimap 0.8.3", "nix", "rand", - "socket2 0.4.9", + "socket2 0.4.10", "thiserror", "tokio", "winapi", @@ -3771,7 +4128,7 @@ dependencies = [ "futures-util", "getopts", "hex", - "hyper", + "hyper 0.14.28", "librespot-audio", "librespot-connect", "librespot-core", @@ -3838,9 +4195,9 @@ dependencies = [ "futures-core", "futures-util", "hmac 0.11.0", - "http", + "http 0.2.12", "httparse", - "hyper", + "hyper 0.14.28", "hyper-proxy", "librespot-protocol", "log", @@ -3876,7 +4233,7 @@ dependencies = [ "form_urlencoded", "futures-core", "hmac 0.11.0", - "hyper", + "hyper 0.14.28", "libmdns", "librespot-core", "log", @@ -3922,7 +4279,7 @@ dependencies = [ "shell-words", "thiserror", "tokio", - "zerocopy", + "zerocopy 0.6.6", ] [[package]] @@ -3950,9 +4307,9 @@ dependencies = [ [[package]] name = "libwebp-sys2" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f9c6964201c51319f16a796dc947a73961646eba49f584187b12de9970d077" +checksum = "0e2ae528b6c8f543825990b24c00cfd8fe64dde126c8288f4972b18e3d558072" dependencies = [ "cc", "cfg-if", @@ -3963,15 +4320,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "livekit-api" -version = "0.1.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d4c5d731bb0da7b313c982ee32300e7caf1ee0595c0d1e57d00f43248c0c47" +checksum = "e20c3fc3de5944ce6b5c8da4084cf828bbae7216671e32e83b767ce61feeb7e0" dependencies = [ "futures-util", "jsonwebtoken", @@ -3979,34 +4336,38 @@ dependencies = [ "log", "parking_lot", "prost", - "reqwest", + "reqwest 0.11.27", + "scopeguard", "serde", - "serde_json", "sha2", "thiserror", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "url", ] [[package]] name = "livekit-protocol" -version = "0.1.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bd731959a8dccc17248499b9952693f593bee4bb79186bf60d180b4097be59" +checksum = "1a1bd23257110be29d024d8d816adff70df18ea1d22ceb1aab6f3ad4aab0d523" dependencies = [ "futures-util", "parking_lot", + "pbjson", + "pbjson-types", "prost", "prost-types", + "serde", + "thiserror", "tokio", ] [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -4014,15 +4375,24 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown 0.14.3", +] [[package]] name = "m3u8-rs" -version = "5.0.4" +version = "5.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d39af8845edca961e3286dcbafeb9e6407d3df6a616ef086847162d46f438d75" +checksum = "0c1d7ba86f7ea62f17f4310c55e93244619ddc7dadfc7e565de1967e4e41e6e7" dependencies = [ "chrono", "nom", @@ -4043,12 +4413,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "maybe-rayon" version = "0.1.1" @@ -4061,18 +4425,19 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest 0.10.7", ] [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" @@ -4085,9 +4450,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -4098,6 +4463,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -4106,9 +4481,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", @@ -4116,13 +4491,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "wasi", + "windows-sys 0.48.0", ] [[package]] @@ -4137,6 +4512,24 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" +[[package]] +name = "multer" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http 0.2.12", + "httparse", + "log", + "memchr", + "mime", + "spin", + "version_check", +] + [[package]] name = "multimap" version = "0.8.3" @@ -4146,6 +4539,12 @@ dependencies = [ "serde", ] +[[package]] +name = "multimap" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" + [[package]] name = "nanorand" version = "0.7.0" @@ -4184,9 +4583,9 @@ dependencies = [ [[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 = "nix" @@ -4239,9 +4638,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -4251,42 +4650,36 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] [[package]] -name = "num-derive" -version = "0.3.3" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-derive" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] @@ -4305,9 +4698,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -4319,15 +4712,15 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "object" -version = "0.31.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -4343,23 +4736,23 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[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" -version = "0.10.56" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -4376,7 +4769,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] @@ -4387,9 +4780,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.91" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -4418,22 +4811,32 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2", +] + [[package]] name = "pango" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ "gio", "glib", "libc", - "once_cell", "pango-sys", ] [[package]] name = "pango-sys" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ "glib-sys", "gobject-sys", @@ -4443,8 +4846,8 @@ dependencies = [ [[package]] name = "pangocairo" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ "cairo-rs", "glib", @@ -4455,8 +4858,8 @@ dependencies = [ [[package]] name = "pangocairo-sys" -version = "0.18.1" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" +version = "0.19.3" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c" dependencies = [ "cairo-sys-rs", "glib-sys", @@ -4465,6 +4868,12 @@ dependencies = [ "system-deps", ] +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + [[package]] name = "parking_lot" version = "0.12.1" @@ -4477,18 +4886,18 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "backtrace", "cfg-if", "libc", "petgraph", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", "thread-id", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -4497,7 +4906,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3687fe9debbbf2a019f381a8bc6b42049b22647449b39af54b3013985c0cf6de" dependencies = [ - "http", + "http 0.2.12", "lazy_static", "regex", "url", @@ -4509,6 +4918,43 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "pbjson" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90" +dependencies = [ + "base64 0.21.7", + "serde", +] + +[[package]] +name = "pbjson-build" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2580e33f2292d34be285c5bc3dba5259542b083cfad6037b6d70345f24dcb735" +dependencies = [ + "heck 0.4.1", + "itertools 0.11.0", + "prost", + "prost-types", +] + +[[package]] +name = "pbjson-types" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12" +dependencies = [ + "bytes", + "chrono", + "pbjson", + "pbjson-build", + "prost", + "prost-build", + "serde", +] + [[package]] name = "pbkdf2" version = "0.8.0" @@ -4521,45 +4967,45 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.2.6", ] [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4568,16 +5014,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pkg-config" -version = "0.3.27" +name = "pkcs8" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "png" -version = "0.17.9" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -4594,32 +5050,31 @@ checksum = "c135f38778ad324d9e9ee68690bac2c1a51f340fdf96ca13e2ab3914eb2e51d8" [[package]] name = "polling" -version = "2.8.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" dependencies = [ - "autocfg", - "bitflags 1.3.2", "cfg-if", "concurrent-queue", - "libc", - "log", + "hermit-abi 0.3.9", "pin-project-lite", - "windows-sys", + "rustix", + "tracing", + "windows-sys 0.52.0", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "pretty-hex" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" - [[package]] name = "pretty_assertions" version = "1.4.0" @@ -4630,6 +5085,16 @@ dependencies = [ "yansi", ] +[[package]] +name = "prettyplease" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +dependencies = [ + "proc-macro2", + "syn 2.0.58", +] + [[package]] name = "primal-check" version = "0.3.3" @@ -4641,9 +5106,9 @@ dependencies = [ [[package]] name = "priority-queue" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61" +checksum = "a0bda9164fe05bc9225752d54aae413343c36f684380005398a6a8fde95fe785" dependencies = [ "autocfg", "indexmap 1.9.3", @@ -4651,12 +5116,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "once_cell", - "toml_edit", + "toml_edit 0.21.1", ] [[package]] @@ -4685,41 +5149,81 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] -name = "prost" -version = "0.11.9" +name = "profiling" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.58", +] + +[[package]] +name = "prost" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" dependencies = [ "bytes", "prost-derive", ] [[package]] -name = "prost-derive" -version = "0.11.9" +name = "prost-build" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1" +dependencies = [ + "bytes", + "heck 0.4.1", + "itertools 0.12.1", + "log", + "multimap 0.10.0", + "once_cell", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 2.0.58", + "tempfile", +] + +[[package]] +name = "prost-derive" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] name = "prost-types" -version = "0.11.9" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" dependencies = [ "prost", ] @@ -4767,9 +5271,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", "serde", @@ -4777,9 +5281,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -4826,15 +5330,15 @@ dependencies = [ [[package]] name = "raptorq" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b020bbf5c89791160a30f0d4706d8ec7aa5718d6a198f6df19c400e4f4470" +checksum = "7cc8cd0bcb2d520fff368264b5a6295e064c60955349517d09b14473afae4856" [[package]] name = "rav1e" -version = "0.6.6" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16c383692a5e7abd9f6d1eddb1a5e0269f859392387883361bb09e5555852ec1" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" dependencies = [ "arbitrary", "arg_enum_proc_macro", @@ -4845,7 +5349,7 @@ dependencies = [ "cc", "cfg-if", "interpolate_name", - "itertools 0.10.5", + "itertools 0.12.1", "libc", "libfuzzer-sys", "log", @@ -4853,14 +5357,13 @@ dependencies = [ "nasm-rs", "new_debug_unreachable", "noop_proc_macro", - "num-derive 0.3.3", + "num-derive", "num-traits", "once_cell", "paste", + "profiling", "rand", "rand_chacha", - "rust_hawktracer", - "rustc_version", "simd_helpers", "system-deps", "thiserror", @@ -4869,9 +5372,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -4879,53 +5382,42 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "realfft" -version = "2.0.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7695c87f31dc3644760f23fb59a3fed47659703abf76cf2d111f03b9e712342" +checksum = "953d9f7e5cdd80963547b456251296efc2626ed4e3cbf36c869d9564e0220571" dependencies = [ "rustfft", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.6", - "regex-syntax 0.7.4", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -4939,15 +5431,21 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.8.3", ] +[[package]] +name = "regex-lite" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + [[package]] name = "regex-syntax" version = "0.6.29" @@ -4956,29 +5454,26 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "async-compression", - "base64 0.21.2", + "base64 0.21.7", "bytes", - "cookie", - "cookie_store", "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -4987,9 +5482,57 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" +dependencies = [ + "async-compression", + "base64 0.22.0", + "bytes", + "cookie", + "cookie_store", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-tls 0.6.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile 2.1.2", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", "tokio-util", @@ -4998,31 +5541,42 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "winreg 0.52.0", +] + +[[package]] +name = "rfc6979" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +dependencies = [ + "crypto-bigint 0.4.9", + "hmac 0.12.1", + "zeroize", ] [[package]] name = "rgb" -version = "0.8.36" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" dependencies = [ "bytemuck", ] [[package]] name = "ring" -version = "0.16.20" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", + "getrandom", "libc", - "once_cell", - "spin 0.5.2", + "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -5038,40 +5592,29 @@ dependencies = [ ] [[package]] -name = "rubato" -version = "0.10.1" +name = "rtsp-types" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610bbefcfef7f43cbe275995b6077b74f34480efce293c30327bf44fdad871ed" +checksum = "6c5c11e0af63f1ac6057f9029f7ddf1c677bade51e449f75be25c8b29f59474c" +dependencies = [ + "cookie-factory", + "nom", + "tinyvec", + "url", +] + +[[package]] +name = "rubato" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6dd52e80cfc21894deadf554a5673002938ae4625f7a283e536f9cf7c17b0d5" dependencies = [ - "log", "num-complex", "num-integer", "num-traits", "realfft", ] -[[package]] -name = "rust_hawktracer" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3480a29b927f66c6e06527be7f49ef4d291a01d694ec1fe85b0de71d6b02ac1" -dependencies = [ - "rust_hawktracer_normal_macro", - "rust_hawktracer_proc_macro", -] - -[[package]] -name = "rust_hawktracer_normal_macro" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a570059949e1dcdc6f35228fa389f54c2c84dfe0c94c05022baacd56eacd2e9" - -[[package]] -name = "rust_hawktracer_proc_macro" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb626abdbed5e93f031baae60d72032f56bc964e11ac2ff65f2ba3ed98d6d3e1" - [[package]] name = "rustc-demangle" version = "0.1.23" @@ -5098,9 +5641,9 @@ dependencies = [ [[package]] name = "rustfft" -version = "6.1.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" +checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" dependencies = [ "num-complex", "num-integer", @@ -5113,22 +5656,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.7" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", @@ -5143,25 +5686,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.2", + "base64 0.21.7", ] [[package]] -name = "rustls-webpki" -version = "0.101.3" +name = "rustls-pemfile" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.0", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", @@ -5169,9 +5728,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -5184,13 +5743,19 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.2.0" @@ -5199,19 +5764,43 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", ] [[package]] -name = "security-framework" -version = "2.9.2" +name = "sdp-types" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "3bc1e17b07a224c21a31b5f7ed74cbbb189d26a0b8cdbfc8b57fa5940c89f086" +dependencies = [ + "bstr", + "fallible-iterator", +] + +[[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -5222,9 +5811,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -5232,47 +5821,44 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" -dependencies = [ - "serde", -] +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.183" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -5280,10 +5866,20 @@ dependencies = [ ] [[package]] -name = "serde_spanned" -version = "0.6.3" +name = "serde_path_to_error" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -5302,31 +5898,57 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.2.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1402f54f9a3b9e2efe71c1cea24e648acce55887983553eeb858cf3115acfd49" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ - "base64 0.21.2", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.0.0", + "indexmap 2.2.6", "serde", + "serde_derive", "serde_json", "serde_with_macros", - "time 0.3.25", + "time", ] [[package]] name = "serde_with_macros" -version = "3.2.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9197f1ad0e3c173a0222d3c4404fb04c3afe87e962bcb327af73e8301fa203c7" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", +] + +[[package]] +name = "serial_test" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" +dependencies = [ + "dashmap", + "futures", + "lazy_static", + "log", + "parking_lot", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -5344,9 +5966,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -5355,9 +5977,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -5375,9 +5997,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -5412,6 +6034,10 @@ name = "signature" version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +dependencies = [ + "digest 0.10.7", + "rand_core", +] [[package]] name = "simd-adler32" @@ -5430,30 +6056,30 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smawk" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -5461,12 +6087,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -5481,12 +6107,6 @@ dependencies = [ "serde", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -5496,6 +6116,22 @@ dependencies = [ "lock_api", ] +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sprintf" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c0cdea5a20a06e7c57f627094e7b1618e5665592cd88f2d45fa4014e348db58" + [[package]] name = "strength_reduce" version = "0.2.4" @@ -5510,9 +6146,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -5527,9 +6163,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -5537,75 +6173,111 @@ dependencies = [ ] [[package]] -name = "system-deps" -version = "6.1.1" +name = "sync_wrapper" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck", + "heck 0.5.0", "pkg-config", - "toml 0.7.6", + "toml", "version-compare", ] [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempfile" -version = "3.7.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "test-log" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9601d162c1d77e62c1ea0bc8116cd1caf143ce3af947536c3c9052a1677fe0c" +checksum = "6159ab4116165c99fc88cce31f99fa2c9dbe08d3691cb38da02fc3b45f357d2b" +dependencies = [ + "test-log-macros", + "tracing-subscriber", +] + +[[package]] +name = "test-log-macros" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba277e77219e9eea169e8508942db1bf5d8a41ff2db9b20aab5a5aadc9fa25d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] name = "test-with" -version = "0.10.0" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea821854cf861c2bd28c19253b5b036fa4a6990745897bdb18a511b787c0187" +checksum = "5a3a0c1b477619de2a1bf72990195561a06f7b68bbf272cea676236ad7cfb9e8" dependencies = [ "proc-macro-error", "proc-macro2", "quote", "regex", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "hyphenation", "smawk", @@ -5615,40 +6287,39 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] name = "thread-id" -version = "4.1.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee93aa2b8331c0fec9091548843f2c90019571814057da3b783f9de09349d73" +checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b" dependencies = [ "libc", - "redox_syscall 0.2.16", "winapi", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -5656,23 +6327,14 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -5680,16 +6342,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -5710,9 +6373,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.30.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -5722,20 +6385,20 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.6", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] @@ -5760,9 +6423,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -5771,23 +6434,35 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.19.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", "native-tls", "tokio", "tokio-native-tls", - "tungstenite 0.19.0", + "tungstenite 0.20.1", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.21.0", ] [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -5799,45 +6474,47 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.22.9", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +dependencies = [ + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.5", ] [[package]] @@ -5870,11 +6547,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -5883,20 +6559,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -5904,20 +6580,20 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -5933,9 +6609,9 @@ dependencies = [ [[package]] name = "transpose" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" +checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e" dependencies = [ "num-integer", "strength_reduce", @@ -5943,20 +6619,20 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.19.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.12", "httparse", "log", "native-tls", @@ -5969,14 +6645,14 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 1.1.0", "httparse", "log", "native-tls", @@ -5989,21 +6665,30 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-linebreak" @@ -6013,33 +6698,33 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", ] @@ -6072,24 +6757,22 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", ] [[package]] name = "v_frame" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85db69f33d00031c1b07f7292e56317d5aa9475bdbd3d27ef18f3633438a697e" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" dependencies = [ - "cfg-if", - "noop_proc_macro", - "num-derive 0.4.0", + "aligned-vec", "num-traits", - "rust_hawktracer", + "wasm-bindgen", ] [[package]] @@ -6123,9 +6806,9 @@ dependencies = [ [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -6141,15 +6824,15 @@ checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -6165,10 +6848,33 @@ dependencies = [ ] [[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" +name = "warp" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "headers 0.3.9", + "http 0.2.12", + "hyper 0.14.28", + "log", + "mime", + "mime_guess", + "multer", + "percent-encoding", + "pin-project", + "scoped-tls", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-tungstenite 0.21.0", + "tokio-util", + "tower-service", + "tracing", +] [[package]] name = "wasi" @@ -6178,9 +6884,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6188,24 +6894,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -6215,9 +6921,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6225,28 +6931,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -6254,9 +6960,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "winapi" @@ -6276,9 +6982,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -6290,12 +6996,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets", + "windows-targets 0.52.4", ] [[package]] @@ -6304,104 +7010,192 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", ] [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "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_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.4" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", ] [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] name = "xml-rs" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xmltree" @@ -6420,27 +7214,47 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.6.3" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b9c234616391070b0b173963ebc65a9195068e7ed3731c6edac2ec45ebe106" +checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" dependencies = [ "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.6.6", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive 0.7.32", ] [[package]] name = "zerocopy-derive" -version = "0.6.3" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f7f3a471f98d0a61c34322fbbfd10c384b07687f680d4119813713f72308d91" +checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.58", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix index eeef11e9a4..d1f1259635 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchFromGitHub , fetchpatch , rustPlatform , meson @@ -23,6 +24,7 @@ , openssl , pango , Security +, SystemConfiguration , gst-plugins-good , nix-update-script # specifies a limited subset of plugins to build (the default `null` means all plugins supported on the stdenv platform) @@ -60,8 +62,8 @@ let raptorq = [ ]; reqwest = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; rtp = [ ]; - webrtc = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - webrtchttp = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + webrtc = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + webrtchttp = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; # text textahead = [ ]; @@ -79,7 +81,19 @@ let # video cdg = [ ]; closedcaption = [ pango ]; - dav1d = [ dav1d ]; + dav1d = [ + # Only dav1d < 1.3 is supported for now. + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1393 + (dav1d.overrideAttrs rec { + version = "1.2.1"; + src = fetchFromGitHub { + owner = "videolan"; + repo = "dav1d"; + rev = version; + hash = "sha256-RrEim3HXXjx2RUU7K3wPH3QbhNTRN9ZX/oAcyE9aV8I="; + }; + }) + ]; ffv1 = [ ]; gif = [ ]; gtk4 = [ gtk4 ]; @@ -126,9 +140,9 @@ in assert lib.assertMsg (invalidPlugins == []) "Invalid gst-plugins-rs plugin${lib.optionalString (lib.length invalidPlugins > 1) "s"}: ${lib.concatStringsSep ", " invalidPlugins}"; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-rs"; - version = "0.11.0+fixup"; + version = "0.12.4"; outputs = [ "out" "dev" ]; @@ -136,8 +150,8 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "gstreamer"; repo = "gst-plugins-rs"; - rev = version; - hash = "sha256-nvDvcY/WyVhcxitcoqgEUT8A1synZqxG2e51ct7Fgss="; + rev = finalAttrs.version; + hash = "sha256-Qnp+e1Vww2kWjDG0x2tcigwDdG67I4xnm8+QrBI+o08="; # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2 postFetch = '' sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g' @@ -162,12 +176,12 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "cairo-rs-0.18.1" = "sha256-k+YIAZXxejbxPQqbUU91qbx2AR98gTrseknLHtNZDEE="; + "cairo-rs-0.19.3" = "sha256-TjVXdnlYEfPLbUx1pC84rCC2MlNecECMK2Yo9XKwz9M="; "color-name-1.1.0" = "sha256-RfMStbe2wX5qjPARHIFHlSDKjzx8DwJ+RjzyltM5K7A="; "ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE="; "flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk="; - "gdk4-0.7.1" = "sha256-UMGmZivVdvmKRAjIGlj6pjDxwfNJyz8/6C0eYH1OOw4="; - "gstreamer-0.21.0" = "sha256-2uilK8wYG8e59fdL3q+kmixc1zw+EBwqvGs/EgfCGhk="; + "gdk4-0.8.1" = "sha256-VPmegFZ/bC8x1vkl3YU208jQ8FCEKLwe6ZDatz4mIvM="; + "gstreamer-0.22.4" = "sha256-r5+wOEhTVztDMEu6t47yJ9HIlbXyjdvswUND4l7kPl8="; }; }; @@ -202,36 +216,26 @@ stdenv.mkDerivation rec { map (plugin: lib.mesonEnable plugin true) selectedPlugins ) ++ [ (lib.mesonOption "sodium-source" "system") + (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) (lib.mesonEnable "doc" enableDocumentation) ]; # turn off all auto plugins since we use a list of plugins we generate mesonAutoFeatures = "disabled"; - doCheck = true; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # csound lib dir must be manually specified for it to build - # webrtc and webrtchttp plugins are the only that need gstreamer-webrtc (from gst-plugins-bad, a heavy set) preConfigure = '' export CARGO_BUILD_JOBS=$NIX_BUILD_CORES patchShebangs dependencies.py '' + lib.optionalString (lib.elem "csound" selectedPlugins) '' export CSOUND_LIB_DIR=${lib.getLib csound}/lib - '' + lib.optionalString (lib.mutuallyExclusive [ "webrtc" "webrtchttp" ] selectedPlugins) '' - sed -i "/\['gstreamer-webrtc-1\.0', 'gst-plugins-bad', 'gstwebrtc_dep', 'gstwebrtc'\]/d" meson.build - '' + lib.optionalString (!gst-plugins-base.glEnabled) '' - sed -i "/\['gstreamer-gl-1\.0', 'gst-plugins-base', 'gst_gl_dep', 'gstgl'\]/d" meson.build ''; - # run tests ourselves to avoid meson timing out by default - checkPhase = '' - runHook preCheck - - meson test --no-rebuild --verbose --timeout-multiplier 12 - - runHook postCheck - ''; + # give meson longer before timing out for tests + mesonCheckFlags = [ "--verbose" "--timeout-multiplier" "12" ]; doInstallCheck = (lib.elem "webp" selectedPlugins) && !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isElf; @@ -243,6 +247,7 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { # use numbered releases rather than gstreamer-* releases + # this matches upstream's recommendation: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/470#note_2202772 extraArgs = [ "--version-regex" "([0-9.]+)" ]; }; @@ -254,4 +259,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ lilyinstarlight ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index b49da94955..cb848efca3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.22.9"; + version = "1.24.2"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-gIrxSPiUBP90hQ+MpScr7Uv+Z/liAjHcRRT9B+sm0KQ="; + hash = "sha256-5MhKeGdefv7zsm6cueLkJzGEIbStnuS1E2767rtrugw="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index d64fcae689..40b6e169c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -15,7 +15,6 @@ , x264 , libintl , lib -, opencore-amr , IOKit , CoreFoundation , DiskArbitration @@ -26,13 +25,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.22.9"; + version = "1.24.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-C/aF1mAVoB3T/BZxtkocissyHdnUq54Fopqxl4KqYjY="; + hash = "sha256-RdqYvxBAyUcv1Z9icSgt4lo3IauFt4qq+BBJSVUPvvU="; }; nativeBuildInputs = [ @@ -49,7 +48,6 @@ stdenv.mkDerivation rec { gst-plugins-base orc libintl - opencore-amr ] ++ lib.optionals enableGplPlugins [ a52dec libcdio diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index 1a63588397..a5cd9cace4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.22.9"; + version = "1.24.2"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-i6INqMTL9bKVPbqQRnLEJ10AU+FSj5f9+OWZQseIPKg="; + hash = "sha256-zFq4yIRD4PW/I9YRC0qsM99Z5K5ib1NtlosWBcx7li8="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/viperfx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/viperfx/default.nix index 83c7d75e98..0f8e8914e2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/viperfx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/viperfx/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , cmake }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-0so4jV56nl3tZHuZpvtyMrpOZ4tNJ59Pyj6zbV5bJ5Y="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; propagatedBuildInputs = [ gst_all_1.gstreamer diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix index 72cefea7e5..b3edf0ba48 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix @@ -8,21 +8,21 @@ , gobject-introspection , glib , gtk3 -, freerdp +, freerdp3 , fuse3 , unstableGitUpdater }: stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "unstable-2023-09-16"; + version = "3.37.1-unstable-2024-03-01"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "62fc62c5ccb7634f0bc87c57a4673877c24c94ed"; - sha256 = "H+ebFWjpmp4Ua22Bd6K3LsxNHqEbtpawnzA5ry8+XFc="; + rev = "11e9fcbee8ca5ec70456dd5b616b2560d7f73adc"; + sha256 = "2e/bAZFRTbBU4ZfgMFHiN9JwVm4qXSRtirPvbC3oT5s="; }; nativeBuildInputs = [ @@ -36,12 +36,14 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - freerdp + freerdp3 fuse3 ]; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; }; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix index f9d41916ec..7dd08878bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Provides integration for GTK applications into the Mac desktop"; license = licenses.lgpl21; - homepage = "https://wiki.gnome.org/Projects/GTK/OSX/Integration"; + homepage = "https://gitlab.gnome.org/GNOME/gtk-mac-integration"; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.darwin; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 4692bbc971..b2b156051b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -264,6 +264,6 @@ stdenv.mkDerivation (finalAttrs: { "gtk+-x11-3.0" ]; platforms = platforms.all; - changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; + changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${finalAttrs.version}/NEWS"; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index 036d1ab0d4..34a5582ffa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -39,10 +39,11 @@ , waylandSupport ? stdenv.isLinux , libGL # experimental and can cause crashes in inspector -, vulkanSupport ? false +, vulkanSupport ? stdenv.isLinux , shaderc , vulkan-loader , vulkan-headers +, libdrm , wayland , wayland-protocols , wayland-scanner @@ -69,7 +70,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.12.5"; + version = "4.14.3"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -81,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "KLNW1ZDuaO9ibi75ggst0hRBSEqaBCpaPwxA6d/E9Pg="; + hash = "sha256-K+XIWL3vEQTTeEjJd5wIk3LI0xUD9u/EuU5TtUb8mkM="; }; depsBuildBuild = [ @@ -116,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { isocodes ] ++ lib.optionals vulkanSupport [ vulkan-headers + libdrm ] ++ [ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad @@ -161,24 +163,21 @@ stdenv.mkDerivation (finalAttrs: { vulkan-loader ] ++ [ # Required for GSettings schemas at runtime. - # Will be picked up by wrapGAppsHook. + # Will be picked up by wrapGAppsHook4. gsettings-desktop-schemas ]; mesonFlags = [ # ../docs/tools/shooter.c:4:10: fatal error: 'cairo-xlib.h' file not found - "-Ddocumentation=${lib.boolToString x11Support}" + (lib.mesonBool "documentation" x11Support) "-Dbuild-tests=false" - "-Dtracker=${if trackerSupport then "enabled" else "disabled"}" - "-Dbroadway-backend=${lib.boolToString broadwaySupport}" - ] ++ lib.optionals vulkanSupport [ - "-Dvulkan=enabled" - ] ++ lib.optionals (!cupsSupport) [ - "-Dprint-cups=disabled" + (lib.mesonEnable "tracker" trackerSupport) + (lib.mesonBool "broadway-backend" broadwaySupport) + (lib.mesonEnable "vulkan" vulkanSupport) + (lib.mesonEnable "print-cups" cupsSupport) + (lib.mesonBool "x11-backend" x11Support) ] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ "-Dmedia-gstreamer=disabled" # requires gstreamer-gl - ] ++ lib.optionals (!x11Support) [ - "-Dx11-backend=false" ]; doCheck = false; # needs X11 @@ -199,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { --replace 'if not meson.is_cross_build()' 'if ${lib.boolToString compileSchemas}' files=( - build-aux/meson/gen-demo-header.py + build-aux/meson/gen-profile-conf.py build-aux/meson/gen-visibility-macros.py demos/gtk-demo/geninclude.py gdk/broadway/gen-c-array.py diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix index fb63d4f00c..19bcb4ad99 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = "https://wiki.gnome.org/Projects/GTK/GtkImageView"; + homepage = "https://gitlab.gnome.org/Archive/gtkimageview"; description = "Image viewer widget for GTK"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix index 21bfdd858c..36ff98d9f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.12.0"; + version = "4.14.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "+8PnYYEjNFwBSO9xq7ZUjUIfUrsiT72jSHW2d9wDLJI="; + hash = "sha256-k1CgREt0TKPcaVhuvRtnB1IJIrbZ9PIyEDzmA6Jx7No="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix index 704a7c3e9c..fb5c72e8b3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + homepage = "https://gitlab.gnome.org/GNOME/gtksourceview"; pkgConfigModules = [ "gtksourceview-3.0" ]; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix index df66d4b9eb..1b427957c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Source code editing widget for GTK"; - homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + homepage = "https://gitlab.gnome.org/GNOME/gtksourceview"; pkgConfigModules = [ "gtksourceview-4" ]; platforms = platforms.unix; license = licenses.lgpl21Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix index ee2d694c18..4b5f52c22b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "5.10.0"; + version = "5.12.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "s4owEMNPWeE7BRdenSDKAqMRBEP+wrHldHQTgBvJwj8="; + hash = "sha256-2vMv9dMVDWOFkX01A6hbngR7oViysDB5MUycAIE/oB8="; }; patches = [ @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - "-Dgtk_doc=true" + "-Ddocumentation=true" ]; doCheck = stdenv.isLinux; @@ -110,10 +110,12 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Source code editing widget for GTK"; - homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + homepage = "https://gitlab.gnome.org/GNOME/gtksourceview"; pkgConfigModules = [ "gtksourceview-5" ]; platforms = platforms.unix; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; + # https://hydra.nixos.org/build/258191535/nixlog/1 + broken = stdenv.isDarwin && stdenv.isx86_64; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gumbo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gumbo/default.nix index 68416ef2ed..118646c619 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gumbo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gumbo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitea { domain = "codeberg.org"; - owner = "grisha"; + owner = "gumbo-parser"; repo = "gumbo-parser"; rev = version; hash = "sha256-d4V4bI08Prmg3U0KGu4yIwpHcvTJT3NAd4lbzdBU/AE="; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C99 HTML parsing algorithm"; - homepage = "https://github.com/google/gumbo-parser"; + homepage = "https://codeberg.org/gumbo-parser/gumbo-parser"; maintainers = [ maintainers.nico202 ]; platforms = with platforms; linux ++ darwin; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix index 7761e3cbd8..44e7c5b5f4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gupnp-dlna/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/GUPnP/"; + homepage = "https://gitlab.gnome.org/GNOME/gupnp-dlna"; description = "Library to ease DLNA-related bits for applications using GUPnP"; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix index 515eeb7de9..27f9174c44 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix @@ -23,7 +23,7 @@ let in stdenv.mkDerivation rec { pname = "gusb"; - version = "0.4.8"; + version = "0.4.9"; outputs = [ "bin" "out" "dev" "devdoc" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libgusb"; rev = "refs/tags/${version}"; - hash = "sha256-xhWx45uOh8Yokd3/32CQ6tsdkgGaYUOvaylrq/jmoP0="; + hash = "sha256-piIPNLc3deToyQaajXFvM+CKh9ni8mb0P3kb+2RoJOs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix index 20278435ce..aba944becf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -29,10 +29,10 @@ , libmtp , gnomeSupport ? false , gnome -, gcr +, gcr_4 , glib-networking , gnome-online-accounts -, wrapGAppsHook +, wrapGAppsHook3 , libimobiledevice , libbluray , libcdio-paranoia @@ -40,17 +40,19 @@ , openssh , libsecret , libgdata +, libmsgraph , python3 +, python3Packages , gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.52.2"; + version = "1.54.0"; src = fetchurl { url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor version}/gvfs-${version}.tar.xz"; - hash = "sha256-pkOs6qBTyqwNjv+aAV9jbkvRuwnP4nhk40fbZ0YOe5E="; + hash = "sha256-9T2B34bC6GzdJRgsLYpmmiI3HoNiPe0bnVQW3Pxt42Y="; }; patches = [ @@ -70,7 +72,7 @@ stdenv.mkDerivation rec { python3 pkg-config gettext - wrapGAppsHook + wrapGAppsHook3 libxslt docbook_xsl docbook_xml_dtd_42 @@ -100,11 +102,12 @@ stdenv.mkDerivation rec { polkit libcdio-paranoia ] ++ lib.optionals gnomeSupport [ - gcr + gcr_4 glib-networking # TLS support gnome-online-accounts libsecret libgdata + libmsgraph ]; mesonFlags = [ @@ -126,6 +129,7 @@ stdenv.mkDerivation rec { "-Dgoa=false" "-Dkeyring=false" "-Dgoogle=false" + "-Donedrive=false" ] ++ lib.optionals (avahi == null) [ "-Ddnssd=false" ] ++ lib.optionals (samba == null) [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/hax11/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hax11/default.nix index 42851f0cf3..fba0a560e9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hax11/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hax11/default.nix @@ -9,7 +9,7 @@ multiStdenv.mkDerivation (finalAttrs: { pname = "hax11"; - version = "unstable-2023-09-25"; + version = "0-unstable-2023-09-25"; src = fetchFromGitHub { owner = "CyberShadow"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix b/third_party/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix index 4f3e74f5d8..f7af4975de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -33,6 +33,13 @@ stdenv.mkDerivation rec { src = ./make-zoneinfo-available.diff; inherit tzdata; }) + # The reported version to cmake's find_package() is 3.0.0, but the actual + # version is 3.0.1. This patch fixes that. + (fetchpatch { + name = "fix-cmake-version.patch"; + url = "https://github.com/HowardHinnant/date/commit/2e19c006e2218447ee31f864191859517603f59f.patch"; + hash = "sha256-SRAWrwv64ap3Qh3RlhwqgS0L2YsrjqVSgw6iH3KlWvk="; + }) ]; # Tweaks to fix undefined variable substitutions diff --git a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index 3f6127502d..78c9ad7fe7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -828,14 +828,14 @@ rec { th_TH = th-th; th-th = mkDict { pname = "hunspell-dict-th-th"; - version = "experimental-2024-02-27"; + version = "experimental-2024-04-15"; dictFileName = "th_TH"; readmeFile = "README.md"; src = fetchFromGitHub { owner = "SyafiqHadzir"; repo = "Hunspell-TH"; - rev = "62d35f9211ca1eb4c367eac2ae57193efe6e88d2"; - sha256 = "sha256-t4m4u+qIgJPrKz58Cu2Q+knYm/+cvrNLzQsiiSRTB1A="; + rev = "419eb32115b936da9c949e35b35c29b8187f6c93"; + sha256 = "sha256-aXjof5dcEoCmep3PtvVkBhcgcd2NtqUpUEu37wsi1Uk="; }; meta = with lib; { description = "Hunspell dictionary for Central Thai (Thailand)"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hyena/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hyena/default.nix index 177f6fe790..0a4e89b3b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hyena/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hyena/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { inherit monoDLLFixer; meta = with lib; { - homepage = "https://wiki.gnome.org/Attic/Hyena"; + homepage = "https://gitlab.gnome.org/Archive/hyena"; description = "A C# library which contains a hodge-podge of random stuff"; longDescription = '' Hyena is a C# library used to make awesome applications. It contains a lot of random things, diff --git a/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix b/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix index 836a7e3c73..3e65e80ef7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPackages, fetchurl, fixDarwinDylibNames, testers }: -{ version, hash, patches ? [], patchFlags ? [] }: +{ version, hash, patches ? [], patchFlags ? [], withStatic ? stdenv.hostPlatform.isStatic }: let # Cross-compiled icu4c requires a build-root of a native compile @@ -36,9 +36,12 @@ let sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; + dontDisableStatic = withStatic; + configureFlags = [ "--disable-debug" ] ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath" - ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-cross-build=${nativeBuildRoot}"; + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-cross-build=${nativeBuildRoot}" + ++ lib.optional withStatic "--enable-static"; enableParallelBuilding = true; @@ -58,7 +61,7 @@ let realAttrs = baseAttrs // { name = pname + "-" + version; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" ] ++ lib.optional withStatic "static"; outputBin = "dev"; # FIXME: This fixes dylib references in the dylibs themselves, but @@ -66,7 +69,10 @@ let nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; # remove dependency on bootstrap-tools in early stdenv build - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString withStatic '' + mkdir -p $static/lib + mv -v lib/*.a $static/lib + '' + lib.optionalString stdenv.isDarwin '' sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc '' + (let replacements = [ @@ -75,6 +81,8 @@ let { from = "\${pkglibdir}/pkgdata.inc"; to = "${placeholder "dev"}/lib/icu/pkgdata.inc"; } # --incpkgdatafile ]; in '' + rm $out/share/icu/${version}/install-sh $out/share/icu/${version}/mkinstalldirs # Avoid having a runtime dependency on bash + substituteInPlace "$dev/bin/icu-config" \ ${lib.concatMapStringsSep " " (r: "--replace '${r.from}' '${r.to}'") replacements} ''); diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 6d21c7bc6e..5c647aaadf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.18"; + version = "22.3.19"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-woEYEgvwf12aWCeYqSiosQAUJErGaEP3q8JER971lys="; + sha256 = "sha256-y35rcAo1CR8HvKD4hCtdMSSPSSnGaUf4l2Tdzbq5fFw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index d81a8c1fe8..6dec37315a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "23.4.3"; + version = "24.2.1"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - hash = "sha256-KVdnCl+jModdDNBtssTnVnq82ZbWovHlaMZ/9/xU8mU="; + hash = "sha256-75NNxcWQUx0Qs7TWZMxu1TMm22/wCsmQPZXKGKFHEh0="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix index 3ec63fd080..ff490414da 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation { description = "HAL for processing of images in userspace"; homepage = "https://github.com/intel/ipu6-camera-hal"; license = licenses.asl20; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/jansson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jansson/default.nix index fbc9a676a8..e868324209 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jansson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jansson/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/akheron/jansson/raw/v${version}/CHANGES"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix index f25f4a552b..0387b5dd9e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "6.8.1"; + version = "6.8.2"; pname = "commons-bcel"; src = fetchurl { url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz"; - hash = "sha256-a7PqcVvS+7tHSU2uXi5gLpl82ZN9hA03VEnCnc5cnRc="; + hash = "sha256-VRCRxy+P3uPW9gWy9xHfJ35muhWCHtXNimRmTfba+04="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix index 4c010829c6..2547090523 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.15.1"; + version = "2.16.1"; pname = "commons-io"; src = fetchurl { url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-nYoYGHetdd3vFryFXLxuvvSUCIs6VZyPwWb8s0h+edg="; + sha256 = "sha256-4+YYSDyCHwUwlw71nAnGy4g9GOl1Z8qr3gHQEyv8EPo="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix index 085efc6e52..f7debe8a7b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "commons-logging"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://apache/commons/logging/binaries/commons-logging-${version}-bin.tar.gz"; - sha256 = "sha256-ij6jOi1Y/iQ/9Ht41nKtmOdZCvf0NmNseFGxBpyq1fg="; + sha256 = "sha256-mM85vfWDc88fNwwflvnRvoh/tb+jDH3o+96RZa9Sp7w="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 1b2bd8a3e8..4498a995a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -1,10 +1,11 @@ { ffmpeg_6-full , fetchFromGitHub +, fetchpatch , lib }: let - version = "6.0.1-5"; + version = "6.0.1-6"; in (ffmpeg_6-full.override { @@ -13,13 +14,19 @@ in owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - hash = "sha256-y/J4iBbqtyyMnTb6R3lTVSOQD8oPo8liyVA5GQ5BvmM="; + hash = "sha256-jy5LPurjuSIMZlzVZcuaqAwAZunbYc9/6aJf+hna0Kw="; }; }).overrideAttrs (old: { pname = "jellyfin-ffmpeg"; # Clobber upstream patches as they don't apply to the Jellyfin fork - patches = []; + patches = [ + (fetchpatch { + name = "fix_build_failure_due_to_libjxl_version_to_new"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/75b1a555a70c178a9166629e43ec2f6250219eb2"; + hash = "sha256-+2kzfPJf5piim+DqEgDuVEEX5HLwRsxq0dWONJ4ACrU="; + }) + ]; configureFlags = old.configureFlags ++ [ "--extra-version=Jellyfin" diff --git a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix index 79075929c6..1f36ccdc05 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; - homepage = "https://wiki.gnome.org/Projects/JsonGlib"; + homepage = "https://gitlab.gnome.org/GNOME/json-glib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = with platforms; unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kddockwidgets/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kddockwidgets/default.nix index 29b7bf9927..a1020fe986 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kddockwidgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kddockwidgets/default.nix @@ -1,24 +1,32 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake , qtbase +, qtdeclarative +, qtquickcontrols2 , qtx11extras +, spdlog +, fmt +, nlohmann_json }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "KDDockWidgets"; - version = "1.7.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "KDAB"; repo = pname; rev = "v${version}"; - sha256 = "sha256-k5Hn9kxq1+tH5kV/ZeD4xzQLDgcY4ACC+guP7YJD4C8="; + sha256 = "sha256-V4BMD1kYyaMlqNBo8otpV5yBt/PICzhBTkEMX9N3lbk="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qtx11extras ]; + buildInputs = [ spdlog fmt nlohmann_json ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtquickcontrols2 qtx11extras ]; + + dontWrapQtApps = true; meta = with lib; { description = "KDAB's Dock Widget Framework for Qt"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix index 02364ba72f..e369b8fbae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kded.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, propagate, wrapGAppsHook, + mkDerivation, lib, propagate, wrapGAppsHook3, extra-cmake-modules, kdoctools, gsettings-desktop-schemas, kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, qtbase, @@ -7,7 +7,7 @@ mkDerivation { pname = "kded"; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 ]; buildInputs = [ gsettings-desktop-schemas kconfig kcoreaddons kcrash kdbusaddons kservice qtbase diff --git a/third_party/nixpkgs/pkgs/development/libraries/lasem/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lasem/default.nix index 80a5fc0e24..c76a695562 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lasem/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lasem/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "SVG and MathML rendering library"; mainProgram = "lasem-render-0.4"; - homepage = "https://wiki.gnome.org/Projects/Lasem"; + homepage = "https://github.com/LasemProject/lasem"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ldutils/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ldutils/default.nix index 0268aa8ce6..157c86ec55 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ldutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ldutils/default.nix @@ -1,41 +1,41 @@ -{ mkDerivation -, lib -, fetchFromGitLab -, qtcharts -, qtsvg -, qmake +{ + mkDerivation, + lib, + fetchFromGitLab, + libsForQt5, + cmake, }: - mkDerivation rec { pname = "ldutils"; - version = "1.10"; + version = "1.15"; src = fetchFromGitLab { owner = "ldutils-projects"; repo = pname; - rev = "v_${version}"; - sha256 = "sha256-fP+tZY+ayaeuxPvywO/639sNE+IwrxaEJ245q9HTOCU="; + rev = "4fc416f694ce888c5bd4c4432a7730bb6260475c"; + #rev = "v_${version}"; + sha256 = "sha256-UMDayvz9RlcR4HVJNn7tN4FKbiKAFRSPaK0osA6OGTI="; }; - buildInputs = [ + buildInputs = with libsForQt5.qt5; [ qtcharts qtsvg ]; nativeBuildInputs = [ - qmake + cmake ]; - qmakeFlags = [ "ldutils.pro" ]; + qmakeFlags = ["ldutils.pro"]; - LDUTILS_LIB=placeholder "out"; - LDUTILS_INCLUDE=placeholder "out"; + LDUTILS_LIB = placeholder "out"; + LDUTILS_INCLUDE = placeholder "out"; meta = with lib; { description = "Headers and link library for other ldutils projects"; homepage = "https://gitlab.com/ldutils-projects/ldutils"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ sohalt ]; + maintainers = with maintainers; [sohalt]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix index 06b528ff8c..80038b7944 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.12"; + version = "1.12.13"; src = fetchFromGitHub { - sha256 = "sha256-V/AMdJ3ldlgBaO8gS0FOqb5tTdRGGW/+3LZq/TKkdog="; + sha256 = "sha256-rfh4JLnLekx9UhyLH6eDJUeItPROmY/Lc6mcWpbGb3s="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix index ba4a86f901..a098a0ea5b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.16.14"; + version = "1.16.15"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-kMXxPfKL7HsQAkdyDGiuSITJ2WtOes8pJ92sWg7JkgM="; + hash = "sha256-J+XIqaV1ThD0RqqcyIkzvTWCkIztjkHzGzUbj0qojJs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix index c540f4bc26..cfac6c97ac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitLab, meson, mesonEmulatorHook, ninja, glib, check, python3, vala, gtk-doc, glibcLocales +{ lib, stdenv, fetchFromGitLab, gitUpdater, meson, mesonEmulatorHook, ninja, glib, check, python3, vala, gtk-doc, glibcLocales , libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: stdenv.mkDerivation rec { pname = "libaccounts-glib"; - version = "1.26"; + version = "1.27"; outputs = [ "out" "dev" "devdoc" "py" ]; src = fetchFromGitLab { owner = "accounts-sso"; repo = "libaccounts-glib"; - rev = version; - sha256 = "sha256-KVKylt+XjLfidsS2KzT7oFXP6rTR528lYAUP8dffu7k="; + rev = "VERSION_${version}"; + sha256 = "sha256-mLhcwp8rhCGSB1K6rTWT0tuiINzgwULwXINfCbgPKEg="; }; nativeBuildInputs = [ @@ -46,11 +46,17 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ + "-Dinstall-py-overrides=true" "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; + passthru.updateScript = gitUpdater { + rev-prefix = "VERSION_"; + }; + meta = with lib; { description = "Library for managing accounts which can be used from GLib applications"; + homepage = "https://gitlab.com/accounts-sso/libaccounts-glib"; platforms = platforms.linux; license = licenses.lgpl21; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index bb520e7c22..1301f9fe92 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.4.4"; + version = "1.5.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; rev = finalAttrs.version; - hash = "sha256-AZP5OH/LIroBeKioe7AIVx0FvFdTpWJ1INdRPZcjmHQ="; + hash = "sha256-uEaBI2jHlMdVprMGRZe/8HszO3nEBUJaJtvJjrMOjE4="; }; depsBuildBuild = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libajantv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libajantv2/default.nix index 89d609b327..278752b187 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libajantv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libajantv2/default.nix @@ -28,6 +28,21 @@ stdenv.mkDerivation rec { pkg-config ]; + postInstall = '' + mkdir -p "$out/lib/pkgconfig" + cat >"$out/lib/pkgconfig/libajantv2.pc" < libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.7.2"; + version = "3.7.4"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-p2JgJ/rvqaQ6yyXSh+ehScUH565ud5bQncl+lOnsWfc="; + hash = "sha256-czNKXHoEn1x4deNErnqp/NZfCglF1CxNoLtZ8tcl394="; }; - patches = [ - # Pull fix for test failure on 32-bit systems: - (fetchpatch { - name = "32-bit-tests-fix.patch"; - url = "https://github.com/libarchive/libarchive/commit/3bd918d92f8c34ba12de9c6604d96f9e262a59fc.patch"; - hash = "sha256-RM3xFM6S2DkM5DJ0kAba8eLzEXuY5/7AaU06maHJ6rM="; - }) - (fetchpatch { - name = "fix-suspicious-commit-from-known-bad-actor.patch"; - url = "https://github.com/libarchive/libarchive/commit/6110e9c82d8ba830c3440f36b990483ceaaea52c.patch"; - hash = "sha256-/j6rJ0xWhtXU0YCu1LOokxxNppy5Of6Q0XyO4U6la7M="; - }) - ]; - outputs = [ "out" "lib" "dev" ]; postPatch = let @@ -70,17 +56,18 @@ stdenv.mkDerivation (finalAttrs: { "cpio/test/test_format_newc.c" ]; removeTest = testPath: '' - substituteInPlace Makefile.am --replace "${testPath}" "" + substituteInPlace Makefile.am --replace-fail "${testPath}" "" rm "${testPath}" ''; in '' - substituteInPlace Makefile.am --replace '/bin/pwd' "$(type -P pwd)" + substituteInPlace Makefile.am --replace-fail '/bin/pwd' "$(type -P pwd)" ${lib.concatStringsSep "\n" (map removeTest skipTestPaths)} ''; nativeBuildInputs = [ autoreconfHook + glibcLocalesUtf8 # test_I test requires an UTF-8 locale pkg-config ]; @@ -107,6 +94,11 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/libarchive/libarchive/issues/1475 doCheck = !stdenv.hostPlatform.isMusl; + preCheck = '' + # Need an UTF-8 locale for test_I test. + export LANG=en_US.UTF-8 + ''; + preFixup = '' sed -i $lib/lib/libarchive.la \ -e 's|-lcrypto|-L${lib.getLib openssl}/lib -lcrypto|' \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbluray/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbluray/default.nix index bc10d06b84..552259ce3b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbluray/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbluray/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, fontconfig, autoreconfHook, DiskArbitration -, withJava ? false, jdk, ant +, withJava ? false, jdk17, ant, stripJavaArchivesHook , withAACS ? false, libaacs , withBDplus ? false, libbdplus , withMetadata ? true, libxml2 @@ -19,23 +19,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook ] - ++ lib.optionals withJava [ ant ]; + ++ lib.optionals withJava [ jdk17 ant stripJavaArchivesHook ]; buildInputs = [ fontconfig ] - ++ lib.optional withJava jdk ++ lib.optional withMetadata libxml2 ++ lib.optional withFonts freetype ++ lib.optional stdenv.isDarwin DiskArbitration; propagatedBuildInputs = lib.optional withAACS libaacs; - NIX_LDFLAGS = lib.optionalString withAACS "-L${libaacs}/lib -laacs" + env.NIX_LDFLAGS = lib.optionalString withAACS "-L${libaacs}/lib -laacs" + lib.optionalString withBDplus " -L${libbdplus}/lib -lbdplus"; - preConfigure = lib.optionalString withJava '' - export JDK_HOME="${jdk.home}" - ''; - configureFlags = lib.optional (!withJava) "--disable-bdjava-jar" ++ lib.optional (!withMetadata) "--without-libxml2" ++ lib.optional (!withFonts) "--without-freetype"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix index 90ffcb01cf..78746cf012 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "http://libcec.pulse-eight.com"; license = lib.licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.titanous ]; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcec/platform.nix b/third_party/nixpkgs/pkgs/development/libraries/libcec/platform.nix index d9594c90b6..ce109cab6d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcec/platform.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcec/platform.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Pulse-Eight/platform"; license = lib.licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.titanous ]; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix index 065d412c91..f49d12e639 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/libchamplain"; + homepage = "https://gitlab.gnome.org/GNOME/libchamplain"; license = licenses.lgpl2Plus; description = "C library providing a ClutterActor to display maps"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix index a41736004e..a5dbf01492 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix @@ -3,20 +3,19 @@ , boost , cmake , fetchFromGitHub -, fetchpatch , eigen , zlib }: stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "7.0.3"; + version = "7.0.4"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-YRK648gJ2UlgeG5GHMjTid1At0lYt7Zqu4/+O5WG/OM="; + hash = "sha256-/dX77KRYmTIj8jxRzQRlpG/ktqDL1jjySux/JqHnE3I="; }; nativeBuildInputs = [ @@ -34,6 +33,11 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; + # cmake requires the existence of this directory when building dssp + postInstall = '' + mkdir -p $out/share/libcifpp + ''; + meta = with lib; { description = "Manipulate mmCIF and PDB files"; homepage = "https://github.com/PDB-REDO/libcifpp"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix index 6161ea7817..8b6722d9cd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcloudproviders/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libcloudproviders/${lib.versions.majorMinor version}/libcloudproviders-${version}.tar.xz"; - sha256 = "O3URCzpP3vTFxaRA5IcB/gVNKuBh0VbIkTa7W6BedLc="; + hash = "sha256-O3URCzpP3vTFxaRA5IcB/gVNKuBh0VbIkTa7W6BedLc="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix index c18e699eaf..b9c3f82558 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix @@ -2,20 +2,22 @@ stdenv.mkDerivation { pname = "libcxxrt"; - version = "unstable-2024-02-05"; + version = "4.0.10-unstable-2024-04-15"; src = fetchFromGitHub { owner = "libcxxrt"; repo = "libcxxrt"; - rev = "bd4fa85d7f772f2ad32146d5681c91612fc93842"; - sha256 = "2F6MmLfKyFl7HzdTb1NDBVHMSRVzVhcib93JVaR58Qw="; + rev = "25541e312f7094e9c90895000d435af520d42418"; + sha256 = "d5uhtlO+28uc2Xnf5trXsy43jgmzBHs2jZhCK57qRM4="; }; nativeBuildInputs = [ cmake ]; + outputs = [ "out" "dev" ]; + installPhase = '' - mkdir -p $out/include $out/lib - cp ../src/cxxabi.h $out/include + mkdir -p $dev/include $out/lib + cp ../src/cxxabi.h $dev/include cp lib/libcxxrt${stdenv.hostPlatform.extensions.library} $out/lib ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix index 9c090399db..62fdba7ba6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.20.2"; + version = "0.21.0"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = "libdatachannel"; rev = "v${version}"; - hash = "sha256-bBSsD845iwCMA7TdMBxzezjNbMaGwvRq6rvY/8NLYRU="; + hash = "sha256-hxXDovJAmuh15jFaxY9aESoTVVJ3u2twsX31U3txans="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix index 38ba2e3b36..1e7bb7d05e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { for those libraries. In other cases, our design isn't quite generic enough to work for everyone. ''; - homepage = "https://wiki.gnome.org/Apps/Builder"; + homepage = "https://gitlab.gnome.org/GNOME/libdazzle"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix index 36bd2f9ef1..26c30227f5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-register"; + preConfigure = '' sed -i 's, -std=gnu99,,g' configure sed -i 's,malloc.h,stdlib.h,g' src-ILU/ilur/ilur.c diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdex/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdex/default.nix index 2837086934..a81cc26695 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdex/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdex/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitLab +, fetchurl , gi-docgen , gobject-introspection , meson @@ -14,16 +14,13 @@ stdenv.mkDerivation rec { pname = "libdex"; - version = "0.4.3"; + version = "0.6.0"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "libdex"; - rev = version; - sha256 = "0GNlgJgAOE3JGwu/6Zsh4sjFapA7nUcGD3lgZZJ0BfQ="; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + hash = "sha256-HojSsAYo5Ya3I7f7pRXM6XUvrxISLN5aPA1biDmYUio="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index 90a169df77..7f706a220a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.16.0"; + version = "3.17.1"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - hash = "sha256-XgObeVQJ2X7hNIelGK55RTtkKvU6D+RkLMc24/PZCzY="; + hash = "sha256-3qDsIAOiWMZDj2zLE+Os7BoeCPeC4JQ6p8jSBd7PdV0="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdovi/Cargo.lock b/third_party/nixpkgs/pkgs/development/libraries/libdovi/Cargo.lock index 417a92d2d1..13d06de98e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdovi/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/libraries/libdovi/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + [[package]] name = "anes" version = "0.1.6" @@ -9,39 +18,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] -name = "anyhow" -version = "1.0.70" +name = "anstyle" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] -name = "atty" -version = "0.2.14" +name = "anyhow" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "bitstream-io" -version = "1.6.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d28070975aaf4ef1fd0bd1f29b739c06c2cdd9972e090617fb6dca3b2cb564e" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" [[package]] name = "bitvec" @@ -57,18 +55,18 @@ dependencies = [ [[package]] name = "bitvec_helpers" -version = "3.1.2" +version = "3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6883bd86b4112b56be19de3a1628de6c4063be7be6e641d484c83069efb4a" +checksum = "c810ea0801e8aabb86ded7f207b0d5a7f23c804cd1b7719aba2b4970899c099a" dependencies = [ "bitstream-io", ] [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "cast" @@ -84,9 +82,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "ciborium" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -95,15 +93,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", @@ -111,55 +109,59 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ - "bitflags", + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstyle", "clap_lex", - "indexmap", - "textwrap", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] [[package]] name = "crc-catalog" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "criterion" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", - "atty", "cast", "ciborium", "clap", "criterion-plot", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", @@ -181,52 +183,40 @@ dependencies = [ "itertools", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "dolby_vision" -version = "3.1.2" +version = "3.3.0" dependencies = [ "anyhow", "bitvec", @@ -241,9 +231,15 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "funty" @@ -253,44 +249,47 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "half" -version = "1.8.2" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "indexmap" -version = "1.9.3" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + [[package]] name = "itertools" version = "0.10.5" @@ -302,73 +301,51 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - [[package]] name = "libc" -version = "0.2.141" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "log" -version = "0.4.17" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] -name = "memoffset" -version = "0.8.0" +name = "memchr" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - [[package]] name = "once_cell" -version = "1.17.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -376,17 +353,11 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - [[package]] name = "plotters" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -397,33 +368,33 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -436,9 +407,9 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rayon" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -446,45 +417,54 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "regex" -version = "1.7.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "roxmltree" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" -dependencies = [ - "xmlparser", -] +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -495,37 +475,31 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - [[package]] name = "serde" -version = "1.0.159" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "indexmap", "itoa", @@ -535,20 +509,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.109" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -561,12 +524,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "tinytemplate" version = "1.2.1" @@ -579,15 +536,15 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -595,9 +552,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -605,24 +562,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -630,63 +587,114 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", ] -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "wyz" @@ -696,9 +704,3 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] - -[[package]] -name = "xmlparser" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdovi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdovi/default.nix index c70a217f6f..38cf72b2ac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdovi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdovi/default.nix @@ -8,12 +8,12 @@ rustPlatform.buildRustPackage rec { pname = "libdovi"; - version = "3.1.2"; + version = "3.3.0"; src = fetchCrate { pname = "dolby_vision"; inherit version; - hash = "sha256-eLmGswgxtmqGc9f8l/9qvwSm+8bi06q+Ryvo7Oyr7s0="; + hash = "sha256-224fX+9klmWVoakU+XM7HrGa4iP4xsBJtn+686cH0qc="; }; cargoLock.lockFile = ./Cargo.lock; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix index 7be484538a..2a76731829 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch2 , autoreconfHook , strace , which @@ -18,14 +17,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-0lrYDW51/KSr809whGwg9FYhzcLRfmoxipIgrK1zFCc="; }; - patches = [ - # Fixes "error: redefinition of 'open'" on musl - (fetchpatch2 { - url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libeatmydata/patches/musl.patch"; - hash = "sha256-MZfTgf2Qn94UpPlYNRM2zK99iKQorKQrlbU5/1WJhJM="; - }) - ]; - postPatch = '' patchShebangs . ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libepc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libepc/default.nix index a2822eae8d..c9a1d09172 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libepc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libepc/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Easy Publish and Consume Library"; - homepage = "https://wiki.gnome.org/Projects/libepc"; + homepage = "https://gitlab.gnome.org/Archive/libepc"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix index f594d64095..40e7ab5324 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/pantoniou/libfyaml"; changelog = "https://github.com/pantoniou/libfyaml/releases/tag/v${finalAttrs.version}"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; pkgConfigModules = [ "libfyaml" ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix index 3f30a443e0..cfdfd7482b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.38"; + version = "1.1.39"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-k5oCwi1KvyRVawH0d4Kp+MCxkymAtl6zVk7DVRXFVMg="; + sha256 = "sha256-O+Fg6NtWdBe0k+XhE/h62C1tvC6Y1BQZWva63sXJDfY="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix index e0d3a7318a..3f7242aedd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgdata/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GData API library"; - homepage = "https://wiki.gnome.org/Projects/libgdata"; + homepage = "https://gitlab.gnome.org/GNOME/libgdata"; maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl21Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix index 7863235e02..0ae1886ebb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgee/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - homepage = "https://wiki.gnome.org/Projects/Libgee"; + homepage = "https://gitlab.gnome.org/GNOME/libgee"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix index 9d16775f62..26b0a9907d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A glib wrapper library around the libgit2 git access library"; - homepage = "https://wiki.gnome.org/Projects/Libgit2-glib"; + homepage = "https://gitlab.gnome.org/GNOME/libgit2-glib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix index acd8b374b5..d96b3505bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libglibutil"; - version = "1.0.76"; + version = "1.0.79"; src = fetchFromGitHub { owner = "sailfishos"; repo = pname; rev = version; - sha256 = "sha256-qp3zcaoLM6G3DZgb2Jic1OhHetraEmYRiGkbQlSBnjs="; + sha256 = "sha256-UJsKjvigZuwDL4DyjUE6fXEecgoHrTE+5pO0hVyCwP4="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/2.0.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/2.0.nix index 03166a423c..bc8da80458 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/2.0.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small library intended for internal use by GNOME Games, but it may be used by others"; - homepage = "https://wiki.gnome.org/Apps/Games"; + homepage = "https://gitlab.gnome.org/GNOME/libgnome-games-support"; license = licenses.lgpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix index e63d7f8fe6..bdbdc10f51 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small library intended for internal use by GNOME Games, but it may be used by others"; - homepage = "https://wiki.gnome.org/Apps/Games"; + homepage = "https://gitlab.gnome.org/GNOME/libgnome-games-support"; license = licenses.lgpl3; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix index f360e29ec2..f31f26539a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgnome-keyring/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { pkgConfigModules = [ "gnome-keyring-1" ]; inherit (glib.meta) platforms maintainers; - homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; + homepage = "https://gitlab.gnome.org/Archive/libgnome-keyring"; license = with lib.licenses; [ gpl2 lgpl2 ]; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix index fc9924b508..a5c278956f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix @@ -8,7 +8,7 @@ , glib , gtk3 , libxklavier -, wrapGAppsHook +, wrapGAppsHook3 , gnome }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 glib gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnt/default.nix index 33ce7fbaa1..3a781a261b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgnt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgnt/default.nix @@ -2,20 +2,24 @@ , gtk-doc, docbook-xsl-nons , glib, ncurses, libxml2 , buildDocs ? true +, mesonEmulatorHook }: stdenv.mkDerivation rec { pname = "libgnt"; - version = "2.14.1"; + version = "2.14.3"; outputs = [ "out" "dev" ] ++ lib.optional buildDocs "devdoc"; src = fetchurl { url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.xz"; - sha256 = "1n2bxg0ignn53c08cp69pj4sdg53kwlqn23rincyjmpr327fdhsy"; + hash = "sha256-V/VFf3KZnQuxoTmjfydG7BtaAsCU8nEKM52LzqQjYSM="; }; - nativeBuildInputs = [ meson ninja pkg-config ] - ++ lib.optionals buildDocs [ gtk-doc docbook-xsl-nons ]; + nativeBuildInputs = [ glib meson ninja pkg-config ] + ++ lib.optionals buildDocs [ gtk-doc docbook-xsl-nons ] + ++ lib.optionals (buildDocs && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; buildInputs = [ glib ncurses libxml2 ]; @@ -23,9 +27,11 @@ stdenv.mkDerivation rec { substituteInPlace meson.build --replace \ "ncurses_sys_prefix = '/usr'" \ "ncurses_sys_prefix = '${lib.getDev ncurses}'" - '' + lib.optionalString (!buildDocs) '' - sed "/^subdir('doc')$/d" -i meson.build ''; + mesonFlags = [ + (lib.mesonBool "doc" buildDocs) + (lib.mesonBool "python2" false) + ]; meta = with lib; { description = "An ncurses toolkit for creating text-mode graphical user interfaces"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix index 8cb978042e..ce0c6e14ed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Glib abstaction to handle feeds in RSS, Atom and other formats"; - homepage = "https://wiki.gnome.org/Projects/Libgrss"; + homepage = "https://gitlab.gnome.org/GNOME/libgrss"; license = licenses.lgpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix index 68e3e42476..99ca086792 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A library that provides GObject bindings for libudev"; - homepage = "https://wiki.gnome.org/Projects/libgudev"; + homepage = "https://gitlab.gnome.org/GNOME/libgudev"; maintainers = [ maintainers.eelco ] ++ teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix index 53c4b5f259..971b234364 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "4.4.0"; + version = "4.4.2"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Nm6Gb/KnCLiUz+qUdbjo/1TLPitHfqcqit4Nq+5fSKQ="; + hash = "sha256-puQntHcK2kiUXzqpBq9xD8gzz/DULfkfGCgwJ0DXlOw="; }; patches = [ @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library to access weather information from online services for numerous locations"; - homepage = "https://wiki.gnome.org/Projects/LibGWeather"; + homepage = "https://gitlab.gnome.org/GNOME/libgweather"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix index 3979391034..041431651c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A GObject based library for handling and rendering XPS documents"; - homepage = "https://wiki.gnome.org/Projects/libgxps"; + homepage = "https://gitlab.gnome.org/GNOME/libgxps"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix index 19dcb4248f..a43ee0986b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-BbSXIpBz/1V/ELMm4HTFBm+HQ6MC1IIKuXvLXNLasIc="; + hash = "sha256-BbSXIpBz/1V/ELMm4HTFBm+HQ6MC1IIKuXvLXNLasIc="; }; depsBuildBuild = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix index 427ad20eca..c35db9e46b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { mainProgram = "hdhomerun_config"; homepage = "https://www.silicondust.com/support/linux"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ sielicki titanous ]; + maintainers = with maintainers; [ sielicki ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix index 9cfe47fcb4..45ca2faf30 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -81,6 +81,14 @@ stdenv.mkDerivation rec { ./respect-env-tzdir.patch ]; + postPatch = '' + # Fix typo in test env setup + # https://github.com/libical/libical/commit/03c02ced21494413920744a400c638b0cb5d493f + substituteInPlace src/test/libical-glib/CMakeLists.txt \ + --replace-fail "''${CMAKE_BINARY_DIR}/src/libical-glib;\$ENV{GI_TYPELIB_PATH}" "''${CMAKE_BINARY_DIR}/src/libical-glib:\$ENV{GI_TYPELIB_PATH}" \ + --replace-fail "''${LIBRARY_OUTPUT_PATH};\$ENV{LD_LIBRARY_PATH}" "''${LIBRARY_OUTPUT_PATH}:\$ENV{LD_LIBRARY_PATH}" + ''; + # Using install check so we do not have to manually set # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables # Musl does not support TZDIR. diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiconv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libiconv/default.nix index ed162d1152..d8339ba086 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libiconv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libiconv/default.nix @@ -63,6 +63,8 @@ stdenv.mkDerivation rec { (lib.enableFeature enableShared "shared") ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; + passthru = { inherit setupHooks; }; + meta = { description = "An iconv(3) implementation"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix index 8d8acfd835..3473a7aa4e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix @@ -62,6 +62,6 @@ rustPlatform.buildRustPackage rec { longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images."; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ma9e marsam ]; + maintainers = with maintainers; [ ma9e ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix index ff9301eb9c..69a6a033fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix @@ -21,21 +21,21 @@ let url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.xz"; hash = "sha256-ut1iwWxjc3h6D9qPCc1FLRL2DVhohW9lHO7PGge6ujI="; }; - dictVer = "20230412"; + dictVer = "20240416"; dict = fetchurl { - url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.xz"; - hash = "sha256-8F/Mr/loeQCqw9mtWoGyCIi1cyAUA/vNm7x5B9npdQc="; + url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.zst"; + hash = "sha256-nCYsv6MGy0w7BVmRt+IrRT4PJn8gzrXZ2eX4++Ty02c="; }; in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - hash = "sha256-PhzJtAGmSkMeXMSe2uR/JKHKlZtL0e3tPDZVoRCvAis="; + hash = "sha256-I8zznZlMz1U2DAVYkvtF1thEYz/tIEbA682y7czK5ck="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libirecovery/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libirecovery/default.nix index c2a8e16e1d..45a4a2b93a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libirecovery/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libirecovery/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "libirecovery"; - version = "1.1.0"; + version = "1.2.0"; outputs = [ "out" "dev" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "libimobiledevice"; repo = pname; rev = version; - hash = "sha256-84xwSOLwPU2Py6X2r6FYESxdc1EuuD6xHEXTUUEdvTE="; + hash = "sha256-3C66oNjIZA6Byf1Y2cVQUSLz6Css1y4xFZuQmo7QxMo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix index 38414e56d7..ab9ff488b3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix @@ -18,6 +18,7 @@ , doxygen , python3 , lcms2 +, enablePlugins ? stdenv.buildPlatform.canExecute stdenv.hostPlatform }: let @@ -26,7 +27,7 @@ in stdenv.mkDerivation rec { pname = "libjxl"; - version = "0.9.1"; + version = "0.10.2"; outputs = [ "out" "dev" ]; @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { owner = "libjxl"; repo = "libjxl"; rev = "v${version}"; - hash = "sha256-n5KNbbw6NQRROEM7Cojla/igRCFNawUq7nfhzJlMlPI="; + hash = "sha256-Ip/5fbzt6OfIrHJajnxEe14ppvX1hJ1FSJUBEE/h5YQ="; # There are various submodules in `third_party/`. fetchSubmodules = true; }; @@ -106,7 +107,7 @@ stdenv.mkDerivation rec { # TODO: Update this package to enable this (overridably via an option): # Viewer tools for evaluation. # "-DJPEGXL_ENABLE_VIEWERS=ON" - + ] ++ lib.optionals enablePlugins [ # Enable plugins, such as: # * the `gdk-pixbuf` one, which allows applications like `eog` to load jpeg-xl files # * the `gimp` one, which allows GIMP to load jpeg-xl files @@ -122,7 +123,7 @@ stdenv.mkDerivation rec { --replace '/usr/bin/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-jxl" ''; - postInstall = '' + postInstall = lib.optionalString enablePlugins '' GDK_PIXBUF_MODULEDIR="$out/${gdk-pixbuf.moduleDir}" \ GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}" \ gdk-pixbuf-query-loaders --update-cache diff --git a/third_party/nixpkgs/pkgs/development/libraries/libkqueue/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libkqueue/default.nix index 5f96353d9d..54b6b2beec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libkqueue/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libkqueue/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mheily/libkqueue"; changelog = "https://github.com/mheily/libkqueue/raw/v${version}/ChangeLog"; license = licenses.bsd2; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libks/default.nix index 0b1135f852..520c8568eb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libks/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libks"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G2ZsTm7qyEhkys+3lcuq1VsKTz3RpfodDekecRRk++w="; + sha256 = "sha256-cSBtNOJfau+7wQ5iUs4hnqSMoo8XYN9opwPfox2ke+E="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix index bcefd8311f..3e1be4ba27 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix @@ -7,7 +7,7 @@ let name = "liblc3"; - version = "1.1.0"; + version = "1.1.1"; in stdenv.mkDerivation { pname = name; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "google"; repo = "liblc3"; rev = "v${version}"; - sha256 = "sha256-pKd9wOrDjKhWX8vTsg6qkE71FQlsC7VM/uq0ss1vsAQ="; + sha256 = "sha256-h9qy04FqlHXp0bOUoP4+WqI0yrM78e56S+DEn3HztYo="; }; outputs = [ "out" "dev" ]; @@ -27,11 +27,14 @@ stdenv.mkDerivation { ninja ]; + # LTO does not work on Darwin: https://github.com/NixOS/nixpkgs/issues/19098 + mesonFlags = lib.optionals stdenv.isDarwin [ "-Db_lto=false" ]; + meta = with lib; { description = "LC3 (Low Complexity Communication Codec) is an efficient low latency audio codec"; homepage = "https://github.com/google/liblc3"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ jansol ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmad/default.nix index b9096fce9e..eee6b4faa5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmad/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmad/default.nix @@ -7,7 +7,6 @@ # for passthru.tests , audacity , mpd -, mpg321 , normalize , ocamlPackages , streamripper @@ -70,7 +69,7 @@ stdenv.mkDerivation rec { preConfigure = "autoconf"; passthru.tests = { - inherit audacity mpd mpg321 normalize streamripper vlc; + inherit audacity mpd normalize streamripper vlc; ocaml-mad = ocamlPackages.mad; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmcfp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmcfp/default.nix index 7a76fabaa4..37d667ffee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmcfp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmcfp/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmcfp"; - version = "1.2.4"; + version = "1.3.3"; src = fetchFromGitHub { owner = "mhekkel"; repo = "libmcfp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Xz7M3TmUHGqiYZbFGSDxsVvg4VhgoVvr9TW03UxdFBw="; + hash = "sha256-hAY560uFrrM3gH3r4ArprWEsK/1w/XXDeyTMIYUv+qY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix index ce16753cf5..93e7eb9933 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv -, substituteAll +{ stdenv +, lib , fetchFromGitHub +, fetchpatch2 , pkg-config , meson , ninja @@ -29,10 +30,15 @@ stdenv.mkDerivation rec { }; patches = [ - # Use proper glib devdoc path. - (substituteAll { - src = ./glib-devdoc.patch; - glib_devdoc = glib.devdoc; + # Adapt to GLib 2.79 documentation + # https://github.com/fedora-modularity/libmodulemd/pull/612 + (fetchpatch2 { + url = "https://github.com/fedora-modularity/libmodulemd/commit/9d2809090cc0cccd7bab67453dc00cf43a289082.patch"; + hash = "sha256-dMtc6GN6lIDjUReFUhEFJ/8wosASo3tLu4ve72BCXQ8="; + }) + (fetchpatch2 { + url = "https://github.com/fedora-modularity/libmodulemd/commit/29c339a31b1c753dcdef041e5c2e0e600e48b59d.patch"; + hash = "sha256-uniHrQdbcXlJk2hq106SgV/E330LfxDc07E4FbOMLr0="; }) ]; @@ -57,6 +63,12 @@ stdenv.mkDerivation rec { "-Dgobject_overrides_dir_py3=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; + postPatch = '' + # Use proper glib devdoc path + substituteInPlace meson.build --replace-fail \ + "glib_docpath = join_paths(glib_prefix," "glib_docpath = join_paths('${lib.getOutput "devdoc" glib}'," + ''; + postFixup = '' # Python overrides depend our own typelibs and other packages mkdir -p "$py/nix-support" @@ -69,6 +81,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fedora-modularity/libmodulemd"; license = licenses.mit; maintainers = with maintainers; [ ]; - platforms = platforms.linux ++ platforms.darwin ; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/glib-devdoc.patch b/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/glib-devdoc.patch deleted file mode 100644 index cde42d8e0b..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/glib-devdoc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index a8b02b4..dd31a76 100644 ---- a/meson.build -+++ b/meson.build -@@ -67,7 +67,7 @@ test = find_program('test') - with_docs = get_option('with_docs') - if with_docs - gtkdoc = dependency('gtk-doc') -- glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') -+ glib_docpath = join_paths('@glib_devdoc@', 'share', 'gtk-doc', 'html') - - ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) - if ret.returncode() != 0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix index 3592c537ac..d247b8b0ef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix @@ -18,15 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libopus"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://downloads.xiph.org/releases/opus/opus-${finalAttrs.version}.tar.gz"; - hash = "sha256-uEYQlZuNQXthGqEqIlZeCjcyCXxjidGQmNhEVD40D4U="; + hash = "sha256-ZcHS94ufL7IAgsOMvkfJUa1YOTRYduRpQWEu6H+afOE="; }; patches = [ - ./fix-pkg-config-paths.patch # Some tests time out easily on slower machines ./test-timeout.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopus/fix-pkg-config-paths.patch b/third_party/nixpkgs/pkgs/development/libraries/libopus/fix-pkg-config-paths.patch deleted file mode 100644 index d54b7f5558..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libopus/fix-pkg-config-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- i/meson.build -+++ w/meson.build -@@ -591,8 +591,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', join_paths(get_option('prefix'))) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', '${prefix}' / get_option('libdir')) -+pkgconf.set('includedir', '${prefix}' / get_option('includedir')) - pkgconf.set('VERSION', opus_version) - pkgconf.set('PC_BUILD', pc_build) - pkgconf.set('LIBM', libm.found() ? '-lm' : '') diff --git a/third_party/nixpkgs/pkgs/development/libraries/liboqs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liboqs/default.nix index 4962f9459d..e703dc3647 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liboqs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liboqs/default.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, openssl -, enableStatic ? stdenv.hostPlatform.isStatic +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + openssl, + enableStatic ? stdenv.hostPlatform.isStatic, }: stdenv.mkDerivation rec { @@ -35,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://openquantumsafe.org"; license = licenses.mit; platforms = platforms.all; - maintainers = []; + maintainers = [ maintainers.sigmanificient ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix index 46c05e6960..e3a4ffb11e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Zscheile Lowlevel (utility) library"; homepage = "https://github.com/fogti/libowlevelzs"; license = licenses.mit; - maintainers = [ maintainers.fogti ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpanel/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpanel/default.nix index 05b863ad20..55faa7e628 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpanel/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpanel/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "libpanel"; - version = "1.4.1"; + version = "1.6.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "mEENAOc0hX7N8zuaIN17D7ONi20x1Dabr8HGc5Krud4="; + hash = "sha256-t3NJSjxpMANFzY4nAnRI0RiRgwJswTeAL4hkF8bqMLY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix index 38e4fe0550..141114f0f3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "2.0.1"; + version = "2.0.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-ndwdUfOGY9pN9SFjBRt7LOo6JCz67p9afhQPB4TIqnc="; + hash = "sha256-8w3/7WPKL0BHe0DhccCjH4DZFCW6Hh5HMg7mQlSA7MM="; }; patches = [ @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A GObject-based plugins engine"; - homepage = "https://wiki.gnome.org/Projects/Libpeas"; + homepage = "https://gitlab.gnome.org/GNOME/libpeas"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpeas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpeas/default.nix index f9d8be93c6..9a94b2aa93 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpeas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpeas/default.nix @@ -13,7 +13,7 @@ , gobject-introspection , python3 , ncurses -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { gettext gi-docgen gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A GObject-based plugins engine"; mainProgram = "peas-demo"; - homepage = "https://wiki.gnome.org/Projects/Libpeas"; + homepage = "https://gitlab.gnome.org/GNOME/libpeas"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix index ad7043e064..46920c977c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpg_query/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/pganalyze/libpg_query/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix index 340cfafee3..28b4ac6600 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix @@ -4,7 +4,6 @@ , darwin , duktape , fetchFromGitHub -, fetchpatch , gi-docgen , gitUpdater , glib @@ -21,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libproxy"; - version = "0.5.3"; + version = "0.5.6"; outputs = [ "out" "dev" "devdoc" ]; @@ -29,18 +28,10 @@ stdenv.mkDerivation (finalAttrs: { owner = "libproxy"; repo = "libproxy"; rev = finalAttrs.version; - hash = "sha256-qdYB6HJkgboS8kkTvTqLy6Z3JYY5SOJsRl6nZM0iuvw="; + hash = "sha256-2uDlKjxzrKlyZKV0BSUDzmLSo2voJKDerbZZkamgNYk="; }; patches = [ - # Minor refactoring. Allows the following patches to apply without rebasing. - (fetchpatch { - url = "https://github.com/libproxy/libproxy/commit/397f4dc72607cc1bb3b584ffd3de49f8ba80491a.patch"; - hash = "sha256-iUMBMpcVOLG+NxEj8Nd7JtKZFmoGXn0t6A2r2ayiteg="; - includes = [ - "src/backend/plugins/config-gnome/config-gnome.c" - ]; - }) ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # Disable schema presence detection, it would fail because it cannot be autopatched, @@ -87,7 +78,11 @@ stdenv.mkDerivation (finalAttrs: { gsettings-desktop-schemas ]); - mesonFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + mesonFlags = [ + # Prevent installing commit hook. + "-Drelease=true" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Dconfig-gnome=false" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 34e34a7eee..a99b27d38d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqalculate"; - version = "5.0.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${finalAttrs.version}"; - hash = "sha256-VhaGgtSU6+7eMY7ksQMpybmt2JBI80Nwgu7PCKrTorA="; + hash = "sha256-cmH92gdQ+fmtOLgx5ibKqLZaQFzx2z+GuXhR62dtftk="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix index 8e798e4a38..fe54cdf3d3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libxml2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libxml2 }: stdenv.mkDerivation rec { pname = "libqb"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZjxC7W4U8T68mZy/OvWj/e4W9pJIj2lVDoEjxXYr/G8="; }; + patches = [ + # add a declaration of fdatasync, missing on darwin https://github.com/ClusterLabs/libqb/pull/496 + (fetchpatch { + url = "https://github.com/ClusterLabs/libqb/commit/255ccb70ee19cc0c82dd13e4fd5838ca5427795f.patch"; + hash = "sha256-6x4B3FM0XSRIeAly8JtMOGOdyunTcbaDzUeBZInXR4U="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix index fe35759da6..cb69770f05 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { # ( https://github.com/IntelRealSense/meta-intel-realsense/issues/20 ) postInstall = '' substituteInPlace $out/lib/cmake/realsense2/realsense2Targets.cmake \ - --replace "\''${_IMPORT_PREFIX}/include" "$dev/include" + --replace-fail "\''${_IMPORT_PREFIX}/include" "$dev/include" '' + lib.optionalString enablePython '' cp ../wrappers/python/pyrealsense2/__init__.py $out/${pythonPackages.python.sitePackages}/pyrealsense2 ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librecast/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librecast/default.nix index 563a77f3a2..045b0bb309 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librecast/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librecast/default.nix @@ -7,14 +7,14 @@ }: stdenv.mkDerivation (finalAttrs: { name = "librecast"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "librecast"; repo = "librecast"; rev = "v${finalAttrs.version}"; - hash = "sha256-NlwYJJn1yewx92y6UKJcj6R2MnPn+XuEiKOmsR2oE3g="; + hash = "sha256-8Qit1KFazVG+2TEmSGXiBNawvpc7Ihr/0mx4KCzBoAY="; }; buildInputs = [ lcrq libsodium ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix index 59bcae1cd8..b2617cb774 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix @@ -116,7 +116,7 @@ in { }; libressl_3_9 = generic { - version = "3.9.1"; - hash = "sha256-baC5VGlffuYrA/ZCAKik8Cr5Nxe2DM4Eq2yN8mLAelE="; + version = "3.9.2"; + hash = "sha256-ewMdrGSlnrbuMwT3/7ddrTOrjJ0nnIR/ksifuEYGj5c="; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/librest/1.0.nix b/third_party/nixpkgs/pkgs/development/libraries/librest/1.0.nix index 1e134f62ba..eff390cb20 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librest/1.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librest/1.0.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Helper library for RESTful services"; - homepage = "https://wiki.gnome.org/Projects/Librest"; + homepage = "https://gitlab.gnome.org/GNOME/librest"; license = licenses.lgpl21Only; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librest/default.nix index 19f7ced598..de0ff52f1e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librest/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Helper library for RESTful services"; - homepage = "https://wiki.gnome.org/Projects/Librest"; + homepage = "https://gitlab.gnome.org/GNOME/librest"; license = licenses.lgpl21Only; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix index acf779f330..4a95915d42 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "librime"; - version = "1.11.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "sha256-yP7YmmeA3k0/NI4XPsC/k2BX4mMnyMJvguiFZIWo8I8="; + sha256 = "sha256-QHuzpitxSYQ4EcBPY1f0R5zl4UFtefu0bFXA76Iv+j0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix index c5788e6903..a682b39bbc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -217,7 +217,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A small library to render SVG images to Cairo surfaces"; - homepage = "https://wiki.gnome.org/Projects/LibRsvg"; + homepage = "https://gitlab.gnome.org/GNOME/librsvg"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; mainProgram = "rsvg-convert"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix index 514b8c0517..10eee1a6bb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch2 , glib , meson , ninja @@ -33,6 +34,14 @@ stdenv.mkDerivation rec { hash = "sha256-Fj0I14O+bUq5qXnOtaT+y8HZZg08NBaMWBMBzVORKyA="; }; + patches = [ + # https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/141 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/libsecret/-/commit/208989323211c756dff690115e5cbde5ef7491ce.patch"; + hash = "sha256-DtRbqyyoMttEYf6B16m9O72Yjurv6rpbnqH7AlrAU4k="; + }) + ]; + depsBuildBuild = [ pkg-config ]; @@ -121,7 +130,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for storing and retrieving passwords and other secrets"; - homepage = "https://wiki.gnome.org/Projects/Libsecret"; + homepage = "https://gitlab.gnome.org/GNOME/libsecret"; license = lib.licenses.lgpl21Plus; mainProgram = "secret-tool"; inherit (glib.meta) platforms maintainers; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsegfault/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsegfault/default.nix index 721570f330..58896c3e2b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsegfault/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsegfault/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "libsegfault"; - version = "unstable-2022-11-13"; + version = "0-unstable-2022-11-13"; src = fetchFromGitHub { owner = "jonathanpoelen"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix index 6306fd2a55..cc6723162a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix @@ -1,37 +1,46 @@ { lib , stdenv -, fetchFromGitLab +, fetchurl +, fetchpatch2 , gi-docgen , meson , ninja , pkg-config , vala , gobject-introspection +, gperf , glib , cairo , sqlite , libsoup_3 , gtk4 , libsysprof-capture +, json-glib +, protobufc , xvfb-run , gnome }: stdenv.mkDerivation rec { pname = "libshumate"; - version = "1.1.3"; + version = "1.2.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "libshumate"; - rev = version; - sha256 = "+h0dKLECtvfsxwD5aRTIgiNI9jG/tortUJYFiYMe60g="; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + hash = "sha256-EQXuB34hR/KgOc3fphb6XLlDiIPdlAQn4RaZ3NZUnBE="; }; + patches = [ + (fetchpatch2 { + # Fix tests https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/236 + url = "https://gitlab.gnome.org/GNOME/libshumate/-/commit/852615b0df2252ea67f4f82e9ace2fc2794467b3.patch"; + hash = "sha256-Ksye3zNNYmzP4O+QFDVODXUkFJOLDVMEZNfGXwbxWhs="; + }) + ]; + depsBuildBuild = [ # required to find native gi-docgen when cross compiling pkg-config @@ -44,6 +53,7 @@ stdenv.mkDerivation rec { pkg-config vala gobject-introspection + gperf ]; buildInputs = [ @@ -53,6 +63,8 @@ stdenv.mkDerivation rec { libsoup_3 gtk4 libsysprof-capture + json-glib + protobufc ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix index 6af948f678..e044037eb7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -13,21 +13,23 @@ , withRpm ? !stdenv.isDarwin , rpm , db +, withConda ? true }: stdenv.mkDerivation rec { - version = "0.7.28"; + version = "0.7.29"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-cL7SDwCzXM2qJQfiu/3nfAiFbcFNn1YXD23Sl3n9nzY="; + hash = "sha256-867sCGFvKib1As9BCiCi6LYVrLUK0pjtM5Bw9Yuu0D8="; }; cmakeFlags = [ "-DENABLE_COMPLEX_DEPS=true" + (lib.cmakeBool "ENABLE_CONDA" withConda) "-DENABLE_LZMA_COMPRESSION=true" "-DENABLE_BZIP2_COMPRESSION=true" "-DENABLE_ZSTD_COMPRESSION=true" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix index 6d1545af40..4d5f30cf0b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTP client/server library for GNOME"; - homepage = "https://wiki.gnome.org/Projects/libsoup"; + homepage = "https://gitlab.gnome.org/GNOME/libsoup"; license = lib.licenses.lgpl2Plus; inherit (glib.meta) maintainers platforms; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix index 11e1a5a40f..e92c59bc2f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTP client/server library for GNOME"; - homepage = "https://wiki.gnome.org/Projects/libsoup"; + homepage = "https://gitlab.gnome.org/GNOME/libsoup"; license = lib.licenses.lgpl2Plus; inherit (glib.meta) maintainers platforms; pkgConfigModules = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsv/default.nix index 9c62799375..4136c64714 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsv/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation rec { pname = "libsv"; @@ -17,7 +22,7 @@ stdenv.mkDerivation rec { description = "Public domain cross-platform semantic versioning in C99"; homepage = "https://github.com/uael/sv"; license = licenses.unlicense; - maintainers = []; + maintainers = [ lib.maintainers.sigmanificient ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/4.5.nix b/third_party/nixpkgs/pkgs/development/libraries/libtiff/4.5.nix deleted file mode 100644 index 3b24c6f1a2..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/4.5.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchpatch - -, autoreconfHook -, pkg-config -, sphinx - -, libdeflate -, libjpeg -, xz -, zlib -}: - -stdenv.mkDerivation rec { - pname = "libtiff"; - version = "4.5.1"; - - src = fetchFromGitLab { - owner = "libtiff"; - repo = "libtiff"; - rev = "v${version}"; - hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E="; - }; - - patches = [ - # cf. https://bugzilla.redhat.com/2224974 - (fetchpatch { - name = "CVE-2023-40745.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/bdf7b2621c62e04d0408391b7d5611502a752cd0.diff"; - hash = "sha256-HdU02YJ1/T3dnCT+yG03tUyAHkgeQt1yjZx/auCQxyw="; - }) - # cf. https://bugzilla.redhat.com/2224971 - (fetchpatch { - name = "CVE-2023-41175.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/965fa243004e012adc533ae8e38db3055f101a7f.diff"; - hash = "sha256-Pvg6JfJWOIaTrfFF0YSREZkS9saTG9IsXnsXtcyKILA="; - }) - # FreeImage needs this patch - ./headers-4.5.patch - # libc++abi 11 has an `#include `, this picks up files name - # `version` in the project's include paths - ./rename-version-4.5.patch - ]; - - postPatch = '' - mv VERSION VERSION.txt - ''; - - outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; - - postFixup = '' - moveToOutput include/tif_config.h $dev_private - moveToOutput include/tif_dir.h $dev_private - moveToOutput include/tif_hash_set.h $dev_private - moveToOutput include/tiffiop.h $dev_private - ''; - - # If you want to change to a different build system, please make - # sure cross-compilation works first! - nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; - - propagatedBuildInputs = [ - libdeflate - libjpeg - xz - zlib - ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = with lib; { - description = "Library and utilities for working with the TIFF image file format"; - homepage = "https://libtiff.gitlab.io/libtiff"; - changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html"; - # XXX not enabled for now to keep hydra builds running, - # but we have to keep an eye on security updates in supported version - #knownVulnerabilities = [ "support for version 4.5 ended in Sept 2023" ]; - maintainers = with maintainers; [ yarny ]; - license = licenses.libtiff; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix index 04b67ff83b..c8871a4ba6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix @@ -28,9 +28,6 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtiff"; version = "4.6.0"; - # if you update this, please consider adding patches and/or - # setting `knownVulnerabilities` in libtiff `4.5.nix` - src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; @@ -93,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library and utilities for working with the TIFF image file format"; homepage = "https://libtiff.gitlab.io/libtiff"; - changelog = "https://libtiff.gitlab.io/libtiff/v${finalAttrs.version}.html"; + changelog = "https://libtiff.gitlab.io/libtiff/releases/v${finalAttrs.version}.html"; license = licenses.libtiff; platforms = platforms.unix ++ platforms.windows; pkgConfigModules = [ "libtiff-4" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/headers-4.5.patch b/third_party/nixpkgs/pkgs/development/libraries/libtiff/headers-4.5.patch deleted file mode 100644 index 49af1abb0a..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/headers-4.5.patch +++ /dev/null @@ -1,16 +0,0 @@ -export private headers for freeimage ---- i/libtiff/Makefile.am -+++ w/libtiff/Makefile.am -@@ -36,8 +36,12 @@ EXTRA_DIST = \ - tiffconf.h.cmake.in - - libtiffinclude_HEADERS = \ -+ tif_config.h \ -+ tif_dir.h \ -+ tif_hash_set.h \ - tiff.h \ - tiffio.h \ -+ tiffiop.h \ - tiffvers.h - - if HAVE_CXX diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/libtiff_t.nix b/third_party/nixpkgs/pkgs/development/libraries/libtiff/libtiff_t.nix new file mode 100644 index 0000000000..37e48f6ea1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libtiff/libtiff_t.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchzip + +, autoreconfHook +, pkg-config +, sphinx + +, libdeflate +, libjpeg +, xz +, zlib +}: + +# This is a fork created by the hylafaxplus developer to +# restore tools dropped by original libtiff in version 4.6.0. + +stdenv.mkDerivation (finalAttrs: { + pname = "libtiff_t"; + version = "4.6.0t"; + + src = fetchzip { + url = "http://www.libtiff.org/downloads/tiff-${finalAttrs.version}.tar.xz"; + hash = "sha256-9ov4w2jw4LtKr82/4jWMAGhc5GEdviJ7bT+y0+U/Ac4="; + }; + + patches = [ + # FreeImage needs this patch + ./headers.patch + # libc++abi 11 has an `#include `, this picks up files name + # `version` in the project's include paths + ./rename-version.patch + ]; + + postPatch = '' + mv VERSION VERSION.txt + ''; + + outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; + + postFixup = '' + moveToOutput include/tif_config.h $dev_private + moveToOutput include/tif_dir.h $dev_private + moveToOutput include/tif_hash_set.h $dev_private + moveToOutput include/tiffiop.h $dev_private + ''; + + # If you want to change to a different build system, please make + # sure cross-compilation works first! + nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; + + # TODO: opengl support (bogus configure detection) + propagatedBuildInputs = [ + libdeflate + libjpeg + xz + zlib + ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = with lib; { + description = "Library and utilities for working with the TIFF image file format (fork containing tools dropped in original libtiff version)"; + homepage = "http://www.libtiff.org"; + changelog = "http://www.libtiff.org/releases/v${finalAttrs.version}.html"; + maintainers = with maintainers; [ yarny ]; + license = licenses.libtiff; + platforms = platforms.unix ++ platforms.windows; + pkgConfigModules = [ "libtiff-4" ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/rename-version-4.5.patch b/third_party/nixpkgs/pkgs/development/libraries/libtiff/rename-version-4.5.patch deleted file mode 100644 index 3e93569d42..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/rename-version-4.5.patch +++ /dev/null @@ -1,21 +0,0 @@ -fix case-insensitive build ---- a/Makefile.am -+++ b/Makefile.am -@@ -34,7 +34,7 @@ docfiles = \ - README.md \ - RELEASE-DATE \ - TODO \ -- VERSION -+ VERSION.txt - - EXTRA_DIST = \ - cmake \ -@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc - - release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) -- (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) -+ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) - (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) - - pkgconfigdir = $(libdir)/pkgconfig diff --git a/third_party/nixpkgs/pkgs/development/libraries/libubox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libubox/default.nix index 09837cd0c1..e48748308b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libubox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libubox/default.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation { done ''; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + "-Wno-error=gnu-folding-constant" + ]); + meta = with lib; { description = "C utility functions for OpenWrt"; homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libucontext/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libucontext/default.nix index 1ce0e443b3..23301648bd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libucontext/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libucontext/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "ucontext implementation featuring glibc-compatible ABI"; license = licenses.isc; platforms = platforms.linux; - maintainers = [ maintainers.yuka ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunique/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libunique/3.x.nix index 780ae7418d..678f685d48 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunique/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunique/3.x.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus dbus-glib gtk3 gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { - homepage = "https://wiki.gnome.org/Attic/LibUnique"; + homepage = "https://gitlab.gnome.org/Archive/unique"; description = "A library for writing single instance applications"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.AndersonTorres ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunique/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunique/default.nix index 13dc13e5e9..f75aed442a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunique/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunique/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = "https://wiki.gnome.org/Attic/LibUnique"; + homepage = "https://gitlab.gnome.org/Archive/unique"; description = "A library for writing single instance applications"; license = lib.licenses.lgpl21; platforms = with lib.platforms; linux ++ darwin; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix index 66f9f076da..5144abc6dc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "A portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; # https://github.com/libunwind/libunwind#libunwind - platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd13" "i686-linux" "loongarch64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd13" "x86_64-linux" "x86_64-solaris" ]; + platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd" "i686-linux" "loongarch64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd" "x86_64-linux" "x86_64-solaris" ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix index 722a1534e9..b1a091d12b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { homepage = "https://lttng.org/urcu"; changelog = "https://github.com/urcu/userspace-rcu/raw/v${version}/ChangeLog"; license = licenses.lgpl21Plus; - platforms = platforms.unix; + # https://git.liburcu.org/?p=userspace-rcu.git;a=blob;f=include/urcu/arch.h + platforms = intersectLists platforms.unix (platforms.x86 ++ platforms.power ++ platforms.s390 ++ platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.m68k ++ platforms.riscv); maintainers = [ maintainers.bjornfor ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix index 9103689546..9114fe5ec4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libusb1/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , autoreconfHook +, doxygen , pkg-config , enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isStatic , udev @@ -11,6 +12,7 @@ , Security , withExamples ? false , withStatic ? false +, withDocs ? stdenv.buildPlatform.canExecute stdenv.hostPlatform }: stdenv.mkDerivation rec { @@ -24,9 +26,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-OtzYxWwiba0jRK9X+4deWWDDTeZWlysEt0qMyGUarDo="; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" ] ++ lib.optionals withDocs [ "doc" ]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ] ++ lib.optionals withDocs [ doxygen ]; propagatedBuildInputs = lib.optional enableUdev udev ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; @@ -40,6 +45,12 @@ stdenv.mkDerivation rec { lib.optional (!enableUdev) "--disable-udev" ++ lib.optional (withExamples) "--enable-examples-build"; + postBuild = lib.optionalString withDocs '' + make -C doc + mkdir -p "$doc/share/doc/libusb" + cp -r doc/api-1.0/* "$doc/share/doc/libusb/" + ''; + preFixup = lib.optionalString enableUdev '' sed 's,-ludev,-L${lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix index 52e1de2032..4099d53f87 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix @@ -11,7 +11,7 @@ , bind , cmake , knot-resolver -, lispPackages +, sbclPackages , luajitPackages , mosquitto , neovim @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { inherit bind cmake knot-resolver mosquitto neovim nodejs; - inherit (lispPackages) cl-libuv; + inherit (sbclPackages) cl-libuv; luajit-libluv = luajitPackages.libluv; luajit-luv = luajitPackages.luv; ocaml-luv = ocamlPackages.luv; @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog"; pkgConfigModules = [ "libuv" ]; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix index e9faec42cd..9b53b7cc13 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -61,5 +61,9 @@ stdenv.mkDerivation (finalAttrs: { "libva-glx" "libva-wayland" "libva-x11" ]; platforms = platforms.unix; + badPlatforms = [ + # Mandatory libva shared library. + lib.systems.inspect.platformPatterns.isStatic + ]; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvgm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvgm/default.nix index 0d7c098255..0b07548d07 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvgm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvgm/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation { pname = "libvgm"; - version = "unstable-2024-01-03"; + version = "0-unstable-2024-04-24"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "223b6f9d629feda1982dc4bbeebd19fa63b987fb"; - hash = "sha256-CrqgDuOsY+Hpp41De6oWJduj8d8ftMUanMEWJKh79rw="; + rev = "1271ab3a0ec1440d2e537ead46165e189671dfd0"; + hash = "sha256-vle9h7+izdpu9fe6LWD06j8oVQIL/lOApPrdjILmPX4="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix index f82c5d18fb..81dacdb493 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -9,6 +9,7 @@ , dnsmasq , docutils , fetchFromGitLab +, fetchpatch , gettext , glib , gnutls @@ -126,6 +127,16 @@ stdenv.mkDerivation rec { patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch + (fetchpatch { + name = "CVE-2024-2494.patch"; + url = "https://gitlab.com/libvirt/libvirt/-/commit/8a3f8d957507c1f8223fdcf25a3ff885b15557f2.patch"; + hash = "sha256-kxSIZ4bPOhN6PpJepoSF+EDTgdmazRWh3a3KSVfm1GU="; + }) + (fetchpatch { + name = "CVE-2024-1441.patch"; + url = "https://gitlab.com/libvirt/libvirt/-/commit/c664015fe3a7bf59db26686e9ed69af011c6ebb8.patch"; + hash = "sha256-Qi/gk7+NPz9s9OpWOnF8XW6A75C9BbVxBTE4KVwalo4="; + }) ] ++ lib.optionals enableZfs [ (substituteAll { src = ./0002-substitute-zfs-and-zpool-commands.patch; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvisual/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvisual/default.nix index 52ea32f758..2a84b4da0e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvisual/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvisual/default.nix @@ -47,6 +47,9 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Remove once "sdl-cross-prereq.patch" patch above is removed. "--disable-lv-tool" + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix index 0c71611e47..9e692fc580 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Netflix/vmaf"; changelog = "https://github.com/Netflix/vmaf/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.bsd2Patent; - maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; + maintainers = [ maintainers.cfsmp3 ]; mainProgram = "vmaf"; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix index 8e9840325b..58c9b7c7f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.10.0"; + version = "2.11.0"; outputs = [ "out" "dev" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - hash = "sha256-mH0aBDXeaz0tZLwNPSWUepHu52DnlvPyQFw3EByIwys="; + hash = "sha256-TQOe954Zos3VpAG5M/O5je9dr8d4gOXIwy4xl3o+e1g="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix index 2605dabf12..2662d4e940 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-UYO2Fmm8nzQR8VBC26wEwWd3qZTD+6MHKcmKBoNcpEE="; + hash = "sha256-OR/VzKNn3mnwjf+G+RkEGAaaKrhVlAu1e2oTRwdsPj8="; }; configureFlags = [ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests = { - inherit freeimage gd graphicsmagick imagemagick imlib2 libjxl opencv vips; + inherit gd graphicsmagick imagemagick imlib2 libjxl opencv vips; inherit (python3.pkgs) pillow imread; haskell-webp = haskellPackages.webp; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix index 0671418839..d71cb70275 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix @@ -28,8 +28,18 @@ stdenv.mkDerivation (finalAttrs: { "--disable-werror" ]; - # fixes: can't build x86_64-w64-mingw32 shared library unless -no-undefined is specified - makeFlags = lib.optionals stdenv.hostPlatform.isWindows [ "LDFLAGS=-no-undefined"] ; + makeFlags = let + lld17Plus = stdenv.cc.bintools.isLLVM + && lib.versionAtLeast stdenv.cc.bintools.version "17"; + in [] + # fixes: can't build x86_64-w64-mingw32 shared library unless -no-undefined is specified + ++ lib.optionals stdenv.hostPlatform.isWindows [ "LDFLAGS+=-no-undefined" ] + + # lld 17 sets `--no-undefined-version` by default and `libxcrypt`'s + # version script unconditionally lists legacy compatibility symbols, even + # when not exported: https://github.com/besser82/libxcrypt/issues/181 + ++ lib.optionals lld17Plus [ "LDFLAGS+=-Wl,--undefined-version" ] + ; nativeBuildInputs = [ perl diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix index 03064a7e7b..67dbb0c4d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix @@ -13,6 +13,7 @@ , libX11 # To enable the "interactive-wayland" subcommand of xkbcli. This is the # wayland equivalent of `xev` on X11. +, xorgserver # for Xvfb in tests , withWaylandTools ? stdenv.isLinux , wayland , wayland-protocols @@ -22,17 +23,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxkbcommon"; - version = "1.5.0"; + version = "1.7.0"; src = fetchurl { url = with finalAttrs; "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "sha256-Vg8RxLu8oQ9JXz7306aqTKYrT4+wtS59RZ0Yom5G4Bc="; + hash = "sha256-ZXgvChCktFWvnGuqtwQOL1N1IMqi7CCSgFzf02hjskc="; }; + patches = [ + # Disable one Xvfb test as it fails for permission checks. + ./disable-x11com.patch + ]; + outputs = [ "out" "dev" "doc" ]; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config bison doxygen ] + nativeBuildInputs = [ meson ninja pkg-config bison doxygen xorgserver ] ++ lib.optional withWaylandTools wayland-scanner; buildInputs = [ xkeyboard_config libxcb libxml2 ] ++ lib.optionals withWaylandTools [ wayland wayland-protocols ]; @@ -42,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" "-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc) "-Dx-locale-root=${libX11.out}/share/X11/locale" + "-Denable-docs=true" "-Denable-wayland=${lib.boolToString withWaylandTools}" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/disable-x11com.patch b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/disable-x11com.patch new file mode 100644 index 0000000000..fb5c8458b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/disable-x11com.patch @@ -0,0 +1,17 @@ +On nixpkgs /tmp/.X11-unix is not compatible with Xvfb requirement and the +test fails. +--- a/meson.build ++++ b/meson.build +@@ -775,12 +775,6 @@ if get_option('enable-x11') + env: test_env, + is_parallel : false, + ) +- test( +- 'x11comp', +- executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep), +- env: test_env, +- is_parallel : false, +- ) + endif + if get_option('enable-xkbregistry') + test( diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix index 3716090a30..6859caff61 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,19 +8,15 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.1.5"; + version = "1.1.7"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - hash = "sha256-fC03LwZIUkEsAs9TN0n2z0iSOGPAtVCeuW5rxC7Ek7Q="; + hash = "sha256-bJ0NMbK9c21YYdcg/TW3ePSDVi5hly6lSW7wXFskI8M="; }; - nativeBuildInputs = [ - python3.pkgs.pytest - ]; - buildInputs = [ minizip zlib @@ -36,6 +32,10 @@ stdenv.mkDerivation rec { doCheck = true; + nativeCheckInputs = [ + python3.pkgs.pytest + ]; + checkTarget = "test"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix index d3f6f311df..c26807a679 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.15"; + version = "0.3.19"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - hash = "sha256-S0wBVhfRa81mAmqpYYAKAyKLnfnVsXJEcGA21i5tdzo="; + hash = "sha256-gXLWHkT+h/wvmmi7PyIx16gbeYznVOT7CwuBgF3bjOY="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch index e9bd27e1ff..b35c8dfc8c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch @@ -15,6 +15,5 @@ @@ -3,4 +3,5 @@ option('introspection', type : 'boolean', value : true, description : 'generate option('tests', type : 'boolean', value : true, description : 'enable tests') option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support') - option('cli', type : 'boolean', value : true, description : 'build and install the xb-tool CLI') - option('zstd', type : 'boolean', value : true, description : 'enable zstd support') +option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') + option('cli', type : 'boolean', value : true, description : 'build and install the xb-tool CLI') diff --git a/third_party/nixpkgs/pkgs/development/libraries/libz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libz/default.nix index 6b3e1dacdc..b9ee7f96b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libz/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libz"; - version = "unstable-2018-03-31"; + version = "1.2.8.2015.12.26-unstable-2018-03-31"; src = fetchFromGitLab { owner = "sortix"; @@ -18,7 +18,9 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; outputDoc = "dev"; # single tiny man3 page - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "libz-"; + }; meta = { homepage = "https://sortix.org/libz/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzapojit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzapojit/default.nix index 8acb5e858d..43f9065dfa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libzapojit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libzapojit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; - homepage = "https://wiki.gnome.org/Projects/Zapojit"; + homepage = "https://gitlab.gnome.org/Archive/libzapojit"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix index 80d3db6d2e..83f15fcc67 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "9.2.0"; + version = "9.2.1"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; rev = "refs/tags/${version}"; - hash = "sha256-WAbNSrgm/lTARD7Ml4vVLChQLNR23vEZtyE4MXnhnB4="; + hash = "sha256-yxEtFsdLTcHFyoIX21nWo6gI7ERDN2/hsUHS/2mTFR4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/llhttp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/llhttp/default.nix index 15b548af70..dfdd8200b5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/llhttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/llhttp/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, testers }: +{ lib, stdenv, fetchFromGitHub, cmake, testers, python3 }: stdenv.mkDerivation (finalAttrs: { pname = "llhttp"; - version = "9.2.0"; + version = "9.2.1"; src = fetchFromGitHub { owner = "nodejs"; repo = "llhttp"; rev = "release/v${finalAttrs.version}"; - hash = "sha256-DX/CuTyvc2OfAVWvlJr6wVHwSuqWmqQt34vM1FEazwE="; + hash = "sha256-cnEp7Ds32bqu3jeUU/rqJOr/VW3KNmJU4pmNNaTpXRs="; }; outputs = [ "out" "dev" ]; @@ -21,8 +21,13 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_STATIC_LIBS=ON" ]; - passthru.tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; + passthru.tests = { + inherit (python3.pkgs) aiohttp; + + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "libllhttp" ]; + }; }; meta = with lib; { @@ -30,8 +35,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://llhttp.org/"; changelog = "https://github.com/nodejs/llhttp/releases/tag/release/v${finalAttrs.version}"; license = licenses.mit; - pkgConfigModules = [ "libllhttp" ]; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.all; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/malcontent/default.nix b/third_party/nixpkgs/pkgs/development/libraries/malcontent/default.nix index 34d1731e8a..f346906ead 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/malcontent/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/malcontent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.11.1"; + version = "0.12.0"; outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = "malcontent"; rev = version; - hash = "sha256-NZwVCnQrEG2gecUjuWe1+cyWFR3OdYJCmj87V14Uwjw="; + hash = "sha256-UK/WVqDMkwIqkTFFjzh7PRCA/Ej8Iyu33FasnAEApRs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix index 1dd85da495..89038628f2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mdk-sdk"; - version = "0.26.0"; + version = "0.27.0"; src = fetchurl { url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz"; - hash = "sha256-DZiipuGXhzrlm49doNeFExApHMDI7ILfOumgXA8useA="; + hash = "sha256-JGYZ+Rodvyo/PkQfuW7xM0aIa3Gql75TwRUU1yZHJJ8="; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix index a544e1b254..d27707d91e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -1,88 +1,118 @@ -{ stdenv, lib, fetchurl, fetchpatch, fetchCrate, buildPackages -, meson, pkg-config, ninja -, intltool, bison, flex, file, python3Packages, wayland-scanner -, expat, libdrm, xorg, wayland, wayland-protocols, openssl -, llvmPackages, libffi, libomxil-bellagio, libva-minimal -, elfutils, libvdpau -, libglvnd, libunwind, lm_sensors -, vulkan-loader, glslang -, galliumDrivers ? - if stdenv.isLinux then - [ - "d3d12" # WSL emulated GPU (aka Dozen) - "kmsro" # special "render only" driver for GPUs without a display controller - "nouveau" # Nvidia - "radeonsi" # new AMD (GCN+) - "r300" # very old AMD - "r600" # less old AMD - "swrast" # software renderer (aka LLVMPipe) - "svga" # VMWare virtualized GPU - "virgl" # QEMU virtualized GPU (aka VirGL) - "zink" # generic OpenGL over Vulkan, experimental - ] ++ lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ - "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) - "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) - "lima" # ARM Mali 4xx - "panfrost" # ARM Mali Midgard and up (T/G series) - "vc4" # Broadcom VC4 (Raspberry Pi 0-3) - ] ++ lib.optionals stdenv.isAarch64 [ - "tegra" # Nvidia Tegra SoCs - "v3d" # Broadcom VC5 (Raspberry Pi 4) - ] ++ lib.optionals stdenv.hostPlatform.isx86 [ - "iris" # new Intel, could work on non-x86 with PCIe cards, but doesn't build as of 22.3.4 - "crocus" # Intel legacy, x86 only - "i915" # Intel extra legacy, x86 only - ] - else [ "auto" ] -, vulkanDrivers ? - if stdenv.isLinux then - [ - "amd" # AMD (aka RADV) - "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) - "nouveau-experimental" # Nouveau (aka NVK) - "swrast" # software renderer (aka Lavapipe) - ] - ++ lib.optionals (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") [ - # QEMU virtualized GPU (aka VirGL) - # Requires ATOMIC_INT_LOCK_FREE == 2. - "virtio" - ] - ++ lib.optionals stdenv.isAarch64 [ - "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) - "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) - "imagination-experimental" # PowerVR Rogue (currently N/A) - "panfrost" # ARM Mali Midgard and up (T/G series) - ] - ++ lib.optionals stdenv.hostPlatform.isx86 [ - "intel" # Intel (aka ANV), could work on non-x86 with PCIe cards, but doesn't build - "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) - ] - else [ "auto" ] -, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] -, vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ "device-select" "overlay" "intel-nullhw" ] # No Vulkan support on Darwin -, OpenGL, Xplugin -, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !valgrind-light.meta.broken, valgrind-light +{ lib +, OpenGL +, Xplugin +, bison +, buildPackages +, directx-headers +, elfutils +, expat +, fetchCrate +, fetchpatch +, fetchurl +, file +, flex +, glslang +, intltool +, jdupes +, libdrm +, libffi +, libglvnd +, libomxil-bellagio +, libunwind +, libva-minimal +, libvdpau +, llvmPackages +, lm_sensors +, meson +, ninja +, openssl +, pkg-config +, python3Packages +, rust-bindgen +, rustPlatform +, rustc +, spirv-llvm-translator +, stdenv +, udev +, valgrind-light +, vulkan-loader +, wayland +, wayland-protocols +, wayland-scanner +, xorg +, zstd +, withValgrind ? + lib.meta.availableOn stdenv.hostPlatform valgrind-light + && !valgrind-light.meta.broken , withLibunwind ? lib.meta.availableOn stdenv.hostPlatform libunwind , enableGalliumNine ? stdenv.isLinux , enableOSMesa ? stdenv.isLinux , enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 , enablePatentEncumberedCodecs ? true -, jdupes -, rustPlatform -, rust-bindgen -, rustc -, spirv-llvm-translator -, zstd -, directx-headers -, udev + +, galliumDrivers ? + if stdenv.isLinux + then [ + "d3d12" # WSL emulated GPU (aka Dozen) + "kmsro" # special "render only" driver for GPUs without a display controller + "nouveau" # Nvidia + "radeonsi" # new AMD (GCN+) + "r300" # very old AMD + "r600" # less old AMD + "swrast" # software renderer (aka LLVMPipe) + "svga" # VMWare virtualized GPU + "virgl" # QEMU virtualized GPU (aka VirGL) + "zink" # generic OpenGL over Vulkan, experimental + ] ++ lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ + "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) + "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) + "lima" # ARM Mali 4xx + "panfrost" # ARM Mali Midgard and up (T/G series) + "vc4" # Broadcom VC4 (Raspberry Pi 0-3) + ] ++ lib.optionals stdenv.isAarch64 [ + "tegra" # Nvidia Tegra SoCs + "v3d" # Broadcom VC5 (Raspberry Pi 4) + ] ++ lib.optionals stdenv.hostPlatform.isx86 [ + "iris" # new Intel, could work on non-x86 with PCIe cards, but doesn't build as of 22.3.4 + "crocus" # Intel legacy, x86 only + "i915" # Intel extra legacy, x86 only + ] + else [ "auto" ] +, vulkanDrivers ? + if stdenv.isLinux + then [ + "amd" # AMD (aka RADV) + "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) + "nouveau-experimental" # Nouveau (aka NVK) + "swrast" # software renderer (aka Lavapipe) + ] ++ lib.optionals (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") [ + # QEMU virtualized GPU (aka VirGL) + # Requires ATOMIC_INT_LOCK_FREE == 2. + "virtio" + ] ++ lib.optionals stdenv.isAarch64 [ + "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) + "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) + "imagination-experimental" # PowerVR Rogue (currently N/A) + "panfrost" # ARM Mali Midgard and up (T/G series) + ] ++ lib.optionals stdenv.hostPlatform.isx86 [ + "intel" # Intel (aka ANV), could work on non-x86 with PCIe cards, but doesn't build + "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) + ] + else [ "auto" ] +, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] +, vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ # No Vulkan support on Darwin + "device-select" + "overlay" + "intel-nullhw" +] }: # When updating this package, please verify at least these build (assuming x86_64-linux): # nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa let - version = "24.0.5"; - hash = "sha256-OMwkXKj6o8adptJof4kGN3AB9jNlNIpizG9/r7HowBg="; + version = "24.0.6"; + hash = "sha256-i3qS2+ZGjBjyODcAE1tf6d6DbN8MyP19uuPHEQI31gQ="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule @@ -106,7 +136,7 @@ let hash = "sha256-VWRCZJO0/DJbNu0/V9TLaqlwMot65YjInWT9VWg57DY="; } { - pname = "syn"; + pname = "syn"; version = "2.0.39"; hash = "sha256-Mjen2L/omhVbhU/+Ao65mogs3BP3fY+Bodab3uU63EI="; } @@ -157,14 +187,20 @@ self = stdenv.mkDerivation { ${copyRustDeps} ''; - outputs = [ "out" "dev" "drivers" ] - ++ lib.optional enableOSMesa "osmesa" - ++ lib.optional stdenv.isLinux "driversdev" - ++ lib.optional enableOpenCL "opencl" + outputs = [ + "out" "dev" "drivers" + ] ++ lib.optionals enableOSMesa [ + "osmesa" + ] ++ lib.optionals stdenv.isLinux [ + "driversdev" + ] ++ lib.optionals enableOpenCL [ + "opencl" + ] ++ lib.optionals haveDozen [ # the Dozen drivers depend on libspirv2dxil, but link it statically, and - # libspirv2dxil itself is pretty chonky, so relocate it to its own output - # in case anything wants to use it at some point - ++ lib.optional haveDozen "spirv2dxil"; + # libspirv2dxil itself is pretty chonky, so relocate it to its own output in + # case anything wants to use it at some point + "spirv2dxil" + ]; # Keep build-ids so drivers can use them for caching, etc. # Also some drivers segfault without this. @@ -181,101 +217,152 @@ self = stdenv.mkDerivation { # Don't build in debug mode # https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/meson.html#L327 - "-Db_ndebug=true" + (lib.mesonBool "b_ndebug" true) - "-Ddri-search-path=${libglvnd.driverLink}/lib/dri" + (lib.mesonOption "dri-search-path" "${libglvnd.driverLink}/lib/dri") - "-Dplatforms=${lib.concatStringsSep "," eglPlatforms}" - "-Dgallium-drivers=${lib.concatStringsSep "," galliumDrivers}" - "-Dvulkan-drivers=${lib.concatStringsSep "," vulkanDrivers}" + (lib.mesonOption "platforms" (lib.concatStringsSep "," eglPlatforms)) + (lib.mesonOption "gallium-drivers" (lib.concatStringsSep "," galliumDrivers)) + (lib.mesonOption "vulkan-drivers" (lib.concatStringsSep "," vulkanDrivers)) - "-Ddri-drivers-path=${placeholder "drivers"}/lib/dri" - "-Dvdpau-libs-path=${placeholder "drivers"}/lib/vdpau" - "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio" - "-Dva-libs-path=${placeholder "drivers"}/lib/dri" - "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d" + (lib.mesonOption "dri-drivers-path" "${placeholder "drivers"}/lib/dri") + (lib.mesonOption "vdpau-libs-path" "${placeholder "drivers"}/lib/vdpau") + (lib.mesonOption "omx-libs-path" "${placeholder "drivers"}/lib/bellagio") + (lib.mesonOption "va-libs-path" "${placeholder "drivers"}/lib/dri") + (lib.mesonOption "d3d-drivers-path" "${placeholder "drivers"}/lib/d3d") - "-Dgallium-nine=${lib.boolToString enableGalliumNine}" # Direct3D in Wine - "-Dosmesa=${lib.boolToString enableOSMesa}" # used by wine - "-Dmicrosoft-clc=disabled" # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) + (lib.mesonBool "gallium-nine" enableGalliumNine) # Direct3D in Wine + (lib.mesonBool "osmesa" enableOSMesa) # used by wine + (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) # To enable non-mesa gbm backends to be found (e.g. Nvidia) - "-Dgbm-backends-path=${libglvnd.driverLink}/lib/gbm:${placeholder "out"}/lib/gbm" + (lib.mesonOption "gbm-backends-path" "${libglvnd.driverLink}/lib/gbm:${placeholder "out"}/lib/gbm") # meson auto_features enables these features, but we do not want them - "-Dandroid-libbacktrace=disabled" - + (lib.mesonEnable "android-libbacktrace" false) ] ++ lib.optionals stdenv.isLinux [ - "-Dglvnd=true" + (lib.mesonBool "glvnd" true) # Enable RT for Intel hardware # https://gitlab.freedesktop.org/mesa/mesa/-/issues/9080 (lib.mesonEnable "intel-clc" (stdenv.buildPlatform == stdenv.hostPlatform)) ] ++ lib.optionals stdenv.isDarwin [ # Disable features that are explicitly unsupported on the platform - "-Dgbm=disabled" - "-Dxlib-lease=disabled" - "-Degl=disabled" - "-Dgallium-vdpau=disabled" - "-Dgallium-va=disabled" - "-Dgallium-xa=disabled" - "-Dlmsensors=disabled" + (lib.mesonEnable "gbm" false) + (lib.mesonEnable "xlib-lease" false) + (lib.mesonEnable "egl" false) + (lib.mesonEnable "gallium-vdpau" false) + (lib.mesonEnable "gallium-va" false) + (lib.mesonEnable "gallium-xa" false) + (lib.mesonEnable "lmsensors" false) ] ++ lib.optionals enableOpenCL [ # Clover, old OpenCL frontend - "-Dgallium-opencl=icd" - "-Dopencl-spirv=true" + (lib.mesonOption "gallium-opencl" "icd") + (lib.mesonBool "opencl-spirv" true) # Rusticl, new OpenCL frontend - "-Dgallium-rusticl=true" - "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" - ] ++ lib.optionals (!withValgrind) [ - "-Dvalgrind=disabled" - ] ++ lib.optionals (!withLibunwind) [ - "-Dlibunwind=disabled" - ] ++ lib.optional enablePatentEncumberedCodecs - "-Dvideo-codecs=all" - ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; + (lib.mesonBool "gallium-rusticl" true) + (lib.mesonOption "clang-libdir" "${llvmPackages.clang-unwrapped.lib}/lib") + ] ++ lib.optionals (!withValgrind) [ + (lib.mesonEnable "valgrind" false) + ] ++ lib.optionals (!withLibunwind) [ + (lib.mesonEnable "libunwind" false) + ] + ++ lib.optionals enablePatentEncumberedCodecs [ + (lib.mesonOption "video-codecs" "all") + ] ++ lib.optionals (vulkanLayers != []) [ + (lib.mesonOption "vulkan-layers" (builtins.concatStringsSep "," vulkanLayers)) + ]; strictDeps = true; buildInputs = with xorg; [ - expat glslang llvmPackages.libllvm libglvnd xorgproto - libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr - libffi libvdpau libXvMC - libpthreadstubs openssl + expat + glslang + libffi + libglvnd + libvdpau + llvmPackages.libllvm + openssl zstd - ] ++ lib.optionals withLibunwind [ + ] ++ (with xorg; [ + libX11 + libXext + libXfixes + libXrandr + libXt + libXvMC + libpthreadstubs + libxcb + libxshmfence + xorgproto + ]) ++ lib.optionals withLibunwind [ libunwind ] ++ [ python3Packages.python # for shebang - ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] - ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev lm_sensors ] - ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ] - ++ lib.optionals enableOpenCL [ llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator ] - ++ lib.optional withValgrind valgrind-light - ++ lib.optional haveZink vulkan-loader - ++ lib.optional haveDozen directx-headers; + ] ++ lib.optionals haveWayland [ + wayland + wayland-protocols + ] ++ lib.optionals stdenv.isLinux [ + libomxil-bellagio + libva-minimal + lm_sensors + udev + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ + elfutils + ] ++ lib.optionals enableOpenCL [ + llvmPackages.libclc + llvmPackages.clang + llvmPackages.clang-unwrapped + spirv-llvm-translator + ] ++ lib.optionals withValgrind [ + valgrind-light + ] ++ lib.optionals haveZink [ + vulkan-loader + ] ++ lib.optionals haveDozen [ + directx-headers + ]; - depsBuildBuild = [ pkg-config ] - # Adding this unconditionally makes x86_64-darwin pick up an older toolchain, as - # we explicitly call Mesa with 11.0 stdenv, but buildPackages is still 10.something, - # and Mesa can't build with that. + depsBuildBuild = [ + pkg-config + ] ++ lib.optionals (!stdenv.isDarwin) [ + # Adding this unconditionally makes x86_64-darwin pick up an older + # toolchain, as we explicitly call Mesa with 11.0 stdenv, but buildPackages + # is still 10.something, and Mesa can't build with that. # FIXME: figure this out, or figure out how to get rid of Mesa on Darwin, # whichever is easier. - ++ lib.optional (!stdenv.isDarwin) buildPackages.stdenv.cc; + buildPackages.stdenv.cc + ]; nativeBuildInputs = [ - meson pkg-config ninja - intltool bison flex file - python3Packages.python python3Packages.mako python3Packages.ply - jdupes glslang - rustc rust-bindgen rustPlatform.bindgenHook - ] ++ lib.optional haveWayland wayland-scanner; + meson + pkg-config + ninja + intltool + bison + flex + file + python3Packages.python + python3Packages.mako + python3Packages.ply + jdupes + glslang + rustc + rust-bindgen + rustPlatform.bindgenHook + ] ++ lib.optionals haveWayland [ + wayland-scanner + ]; - propagatedBuildInputs = with xorg; [ - libXdamage libXxf86vm - ] ++ lib.optional withLibdrm libdrm - ++ lib.optionals stdenv.isDarwin [ OpenGL Xplugin ]; + propagatedBuildInputs = (with xorg; [ + libXdamage + libXxf86vm + ]) ++ lib.optionals withLibdrm [ + libdrm + ] ++ lib.optionals stdenv.isDarwin [ + OpenGL + Xplugin + ]; doCheck = false; @@ -373,9 +460,12 @@ self = stdenv.mkDerivation { ''} ''; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [ - "-UPIPE_SEARCH_DIR" - "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\"" + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.isDarwin [ + "-fno-common" + ] ++ lib.optionals enableOpenCL [ + "-UPIPE_SEARCH_DIR" + "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\"" ]); passthru = { @@ -395,7 +485,7 @@ self = stdenv.mkDerivation { }; }; - meta = with lib; { + meta = { description = "An open source 3D graphics library"; longDescription = '' The Mesa project began as an open-source implementation of the OpenGL @@ -408,9 +498,9 @@ self = stdenv.mkDerivation { ''; homepage = "https://www.mesa3d.org/"; changelog = "https://www.mesa3d.org/relnotes/${version}.html"; - license = licenses.mit; # X11 variant, in most files - platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ primeos vcunat ]; # Help is welcome :) + license = with lib.licenses; [ mit ]; # X11 variant, in most files + platforms = lib.platforms.mesaPlatforms; + maintainers = with lib.maintainers; [ primeos vcunat ]; # Help is welcome :) }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix index e0e1421c47..508d3ae168 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "2.1.2"; + version = "2.1.4"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kYhfufffM4r+ZVgcjnulqFlf1756pirlPysGZnUBzt8="; + sha256 = "sha256-h+JlrIYc3i9RjbmiGLgWVvkP4LyQkTrnUxkCU7SR35k="; }; doCheck = !stdenv.hostPlatform.isStatic; diff --git a/third_party/nixpkgs/pkgs/development/libraries/minilibx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/minilibx/default.nix index 0551993e43..41a422e3a2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/minilibx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/minilibx/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "minilibx"; - version = "unstable-2021-10-30"; + version = "0-unstable-2021-10-30"; src = fetchFromGitHub { owner = "42Paris"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/miniz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/miniz/default.nix index 8592dc5f12..0cb5087c4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/miniz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/miniz/default.nix @@ -1,29 +1,44 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, fetchFromGitHub +, nix-update-script +, stdenv +, testers +, validatePkgConfig +, cmake +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "miniz"; - version = "2.2.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "richgel999"; - repo = pname; - rev = version; - sha256 = "sha256-7hc/yNJh4sD5zGQLeHjowbUtV/1mUDQre1tp9yKMSSY="; + repo = "miniz"; + rev = finalAttrs.version; + hash = "sha256-3J0bkr2Yk+MJXilUqOCHsWzuykySv5B1nepmucvA4hg="; }; + passthru.updateScript = nix-update-script {}; - nativeBuildInputs = [ cmake ]; + strictDeps = true; + nativeBuildInputs = [ cmake validatePkgConfig ]; postFixup = '' - substituteInPlace "$out"/share/pkgconfig/miniz.pc \ - --replace '=''${prefix}//' '=/' \ - --replace '=''${exec_prefix}//' '=/' + substituteInPlace "$out"/lib/pkgconfig/miniz.pc \ + --replace-fail '=''${prefix}//' '=/' \ + --replace-fail '=''${exec_prefix}//' '=/' ''; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + meta = with lib; { description = "Single C source file zlib-replacement library"; homepage = "https://github.com/richgel999/miniz"; license = licenses.mit; maintainers = with maintainers; [ astro ]; platforms = platforms.unix; + pkgConfigModules = [ "miniz" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix index abe368f2ea..672bb36609 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "7.22.0"; + version = "7.24.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - hash = "sha256-vJKpeEdQIWBQRRdDui5ibSZtD8qUlDZBD+UQE+0cQqk="; + hash = "sha256-nQ9uRip6i9+/MziU4gQq1ah712J6f94cFQWTDYRjzyE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/mongoc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mongoc/default.nix index 9f9b4ad6ff..8a344a08fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mongoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.26.2"; + version = "1.27.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-4+PXvWYEy4Bi+qpyp7PvqtsOxJuYhjiHrmwmdn5RiX8="; + hash = "sha256-3+7JfgT1hZHyTiLDqYioI5GJYnqN9crE5CrXOvit0ew="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix index db9c727f8e..02e5876618 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix @@ -20,11 +20,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "sha256-pkpmeBueUxKtBS0yaJ4jJS90WyfuiBisKsDIIJvAuQ4="; + sha256 = "sha256-IzMbIpnyh8NBlyftwt+JItfnq7uf0Kx04DuZZvmtQtc="; }; outputs = [ "out" "doc" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix index 41d174bce7..63a712b088 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msgpack-c"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; rev = "refs/tags/c-${finalAttrs.version}"; - hash = "sha256-TfC37QKwqvHxsLPgsEqJYkb7mpRQekbntbBPV4v4FO8="; + hash = "sha256-BXnK7xNRdZvbSz7tERf/PDJkmxbqAC6trH+h36O/v6k="; }; strictDeps = true; @@ -24,8 +24,9 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DMSGPACK_BUILD_EXAMPLES=OFF" # examples are not installed even if built - ] ++ lib.optional (!finalAttrs.finalPackage.doCheck) "-DMSGPACK_BUILD_TESTS=OFF"; + (lib.cmakeBool "MSGPACK_BUILD_EXAMPLES" false) # examples are not installed even if built + (lib.cmakeBool "MSGPACK_BUILD_TESTS" finalAttrs.finalPackage.doCheck) + ]; checkInputs = [ gtest diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix index 88a6d042cb..f140b9c1ab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20240102"; + version = "20240410"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - hash = "sha256-kk70oLY+2QJOkyYq10whLRMxBuibQMWMOBA9dcbKf/I="; + hash = "sha256-UiaU+LCevrWBxZg5LAimGIJB0CElWBnO6qoadUc3VVM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix index 06eb1b8150..b691f2b10a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, avahi, obs-studio-plugins }: +{ lib, stdenv, fetchurl, avahi, obs-studio-plugins }: let versionJSON = lib.importJSON ./version.json; @@ -15,20 +15,10 @@ stdenv.mkDerivation rec { majorVersion = builtins.head (builtins.splitVersion version); installerName = "Install_NDI_SDK_v${majorVersion}_Linux"; - src = requireFile rec { - name = "${installerName}.tar.gz"; - sha256 = versionJSON.hash; - message = '' - In order to use NDI SDK version ${version}, you need to comply with - NewTek's license and download the appropriate Linux tarball from: - - ${meta.homepage} - - Once you have downloaded the file, please use the following command and - re-run the installation: - - \$ nix-prefetch-url file://\$PWD/${name} - ''; + src = fetchurl { + name = "${pname}-${version}.tar.gz"; + url = "https://downloads.ndi.tv/SDK/NDI_SDK_Linux/${installerName}.tar.gz"; + hash = versionJSON.hash; }; buildInputs = [ avahi ]; @@ -52,6 +42,8 @@ stdenv.mkDerivation rec { if [ -L "$i" ]; then continue; fi patchelf --set-rpath "${avahi}/lib:${stdenv.cc.libc}/lib" "$i" done + rm $out/bin/libndi.so.${majorVersion} + ln -s $out/lib/libndi.so.${version} $out/bin/libndi.so.${majorVersion} mv include examples $out/ mkdir -p $out/share/doc/${pname}-${version} mv licenses $out/share/doc/${pname}-${version}/licenses diff --git a/third_party/nixpkgs/pkgs/development/libraries/ndi/version.json b/third_party/nixpkgs/pkgs/development/libraries/ndi/version.json index 686abdb2c2..1631cd03e8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ndi/version.json +++ b/third_party/nixpkgs/pkgs/development/libraries/ndi/version.json @@ -1 +1 @@ -{"hash": "sha256:4ff4b92f2c5f42d234aa7d142e2de7e9b045c72b46ad5149a459d48efd9218de", "version": "5.6.0"} +{"hash": "sha256:0wh5bqy9xx08wnfah92pgs4f6xn6mwfyhwdzbhf5ghkbw8pc7z0w", "version": "5.6.1"} diff --git a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix index b521569774..d0e060c640 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-C1Rk0KzTvFpwCz8vXvhSqGjYmGyLZxmnzZhPLZiL97M="; + hash = "sha256-3tB1AvwGJJiujZEc5Uc2NSAETop4LFEgiml/v68oheM="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix index c66199a31e..612f8e3845 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${version}"; - hash = "sha256-oP7hO3wCXNPW7877wK+HpGsw7j+U0q4i8aTRVi1v0r0="; + hash = "sha256-E2uosZrmxO3fqwlLuu5e36P70iGj5xUlvhEb+1aSvOA="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix index 8ac5a3b23a..3b3a672e87 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.99"; - hash = "sha256-6JocWJpA+VjEPZOxmD74toyEBLOTzCxSWUzrxPi52bU="; + version = "3.100"; + hash = "sha256-PlMCvSN4DMKY7u/7cr7kArrRve8YIfdycjgpik72bhA="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/nsync/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nsync/default.nix index a984058e9b..b54691a45b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nsync/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nsync/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nsync"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = version; - hash = "sha256-pE9waDI+6LQwbyPJ4zROoF93Vt6+SETxxJ/UxeZE5WE="; + hash = "sha256-5pd2IpnPB7lEmy44OJjcwfE+yUQBS0fZVG18VUe/3C8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 60ef649ec5..876ff8c13c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mVVRpCyT374P1Vql0yPY0e5tNktHNJ8XHoixvxp3b20="; + sha256 = "sha256-ETdHbPI3rZR4026rOT5K9/pjKTZxD5+RioKzUVGMwsA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix index 6749be599a..fa0535ef8e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -112,9 +112,9 @@ let in { ogre_14 = common { - version = "14.2.2"; - hash = "sha256-85hpujmlM3N81mkiA80xx2C4GsdzWkP61bwdfmw1zt8="; - # https://github.com/OGRECave/ogre/blob/v14.2.2/Components/Overlay/CMakeLists.txt + version = "14.2.5"; + hash = "sha256-FldHoMU8akRF6/vjwley9nJOTioE5nQXnTdQqyNlI2M="; + # https://github.com/OGRECave/ogre/blob/v14.2.5/Components/Overlay/CMakeLists.txt imguiVersion = "1.90.4"; imguiHash = "sha256-7+Ay7H97tIO6CUsEyaQv4i9q2FCw98eQUq/KYZyfTAw="; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index 43a7f79504..b311736498 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -15,7 +15,7 @@ , re2 , zlib , microsoft-gsl -, iconv +, libiconv , protobuf_21 , pythonSupport ? true , cudaSupport ? config.cudaSupport @@ -138,7 +138,7 @@ effectiveStdenv.mkDerivation rec { packaging ]) ++ lib.optionals effectiveStdenv.isDarwin [ Foundation - iconv + libiconv ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cccl # cub/cub.cuh libcublas # cublas_v2.h diff --git a/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix b/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix index 0cc752d993..b69efd8664 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openbabel/2.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libxml2 eigen python3 cairo pcre ]; + cmakeFlags = [ "-DCMAKE_CXX_STANDARD=14" ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix index 7209c2d2e2..ea568cdfa5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "3.1.4"; + version = "3.1.11"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "v${version}"; - hash = "sha256-KtsQ25uStmlf7RZLAcabhPMyGbxKxvpR6Vm632+EBvw="; + hash = "sha256-lJaQGkhpKfSSNVbP+NqommagtoWyi8CdauVxEhiI9Bc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix b/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix index e5fe5bd40a..074fdf4222 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix @@ -5,6 +5,7 @@ , imath , libdeflate , pkg-config +, pkgsCross }: stdenv.mkDerivation rec { @@ -45,6 +46,10 @@ stdenv.mkDerivation rec { # https://github.com/AcademySoftwareFoundation/openexr/issues/1400 doCheck = !stdenv.isAarch32; + passthru.tests = { + musl = pkgsCross.musl64.openexr_3; + }; + meta = with lib; { description = "A high dynamic-range (HDR) image file format"; homepage = "https://www.openexr.com"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch b/third_party/nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch index f8fff65ace..f1ceb13d3a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch @@ -1,13 +1,13 @@ diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt -index 44d9185d..8ffcd2b2 100644 +index 25f429da..918f56e9 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt -@@ -4,7 +4,7 @@ - # We require this to get object library link library support and +@@ -5,7 +5,7 @@ # combined python 2 + 3 support --add_subdirectory(IexTest) -+#add_subdirectory(IexTest) - add_subdirectory(OpenEXRCoreTest) - add_subdirectory(OpenEXRTest) - add_subdirectory(OpenEXRUtilTest) + if (OPENEXR_TEST_LIBRARIES) +- add_subdirectory(IexTest) ++ #add_subdirectory(IexTest) + add_subdirectory(OpenEXRCoreTest) + add_subdirectory(OpenEXRTest) + add_subdirectory(OpenEXRUtilTest) diff --git a/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix index e2d9b66004..ad68505ad6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix @@ -3,34 +3,54 @@ config, cudaPackages, cudaSupport ? config.cudaSupport, + darwin, fetchzip, ispc, lib, python3, stdenv, tbb, + xcodebuild, }: -stdenv.mkDerivation rec { +let + stdenv' = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { pname = "openimagedenoise"; version = "2.2.2"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { - url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; + url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${finalAttrs.version}/oidn-${finalAttrs.version}.src.tar.gz"; sha256 = "sha256-ZIrs4oEb+PzdMh2x2BUFXKyu/HBlFb3CJX24ciEHy3Q="; }; patches = lib.optional cudaSupport ./cuda.patch; + postPatch = + '' + substituteInPlace devices/metal/CMakeLists.txt \ + --replace-fail "AppleClang" "Clang" + ''; + nativeBuildInputs = [ cmake python3 ispc - ] ++ lib.optional cudaSupport cudaPackages.cuda_nvcc; + ] ++ lib.optional cudaSupport cudaPackages.cuda_nvcc + ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; buildInputs = [ tbb ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk_11_0.frameworks; + [ + Accelerate + MetalKit + MetalPerformanceShadersGraph + ] + ) ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart cudaPackages.cuda_cccl @@ -50,4 +70,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; changelog = "https://github.com/OpenImageDenoise/oidn/blob/v${version}/CHANGELOG.md"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix index 7e44f2a50e..09c2be979a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, autoreconfHook, pkg-config -, boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib +, darwin, boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreServices + SystemConfiguration + ]); nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index c0b4fe75b6..0e144726cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -237,6 +237,8 @@ let in { # intended version "policy": # - 1.1 as long as some package exists, which does not build without it + # (tracking issue: https://github.com/NixOS/nixpkgs/issues/269713) + # try to remove in 24.05 for the first time, if possible then # - latest 3.x LTS # - latest 3.x non-LTS as preview/for development # @@ -245,7 +247,7 @@ in { # If you do upgrade here, please update in pkgs/top-level/release.nix # the permitted insecure version to ensure it gets cached for our users - # and backport this to stable release (23.05). + # and backport this to stable release (at time of writing this 23.11). openssl_1_1 = common { version = "1.1.1w"; hash = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg="; @@ -259,7 +261,7 @@ in { withDocs = true; extraMeta = { knownVulnerabilities = [ - "OpenSSL 1.1 is reaching its end of life on 2023/09/11 and cannot be supported through the NixOS 23.05 release cycle. https://www.openssl.org/blog/blog/2023/03/28/1.1.1-EOL/" + "OpenSSL 1.1 is reaching its end of life on 2023/09/11 and cannot be supported through the NixOS 23.11 release cycle. https://www.openssl.org/blog/blog/2023/03/28/1.1.1-EOL/" ]; }; }; @@ -309,4 +311,27 @@ in { license = licenses.asl20; }; }; + + openssl_3_3 = common { + version = "3.3.0"; + hash = "sha256-U+ZrBDMipgar8Ah+dpmg4DOjf6E/65dC3zXDozsY+wI="; + + patches = [ + ./3.0/nix-ssl-cert-file.patch + + # openssl will only compile in KTLS if the current kernel supports it. + # This patch disables build-time detection. + ./3.0/openssl-disable-kernel-detection.patch + + (if stdenv.hostPlatform.isDarwin + then ./3.2/use-etc-ssl-certs-darwin.patch + else ./3.2/use-etc-ssl-certs.patch) + ]; + + withDocs = true; + + extraMeta = with lib; { + license = licenses.asl20; + }; + }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/openturns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openturns/default.nix deleted file mode 100644 index a2fa42caea..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/openturns/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, swig -, boost -, spectra -, libxml2 -, tbb -, hmat-oss -, nlopt -, cminpack -, ceres-solver -, dlib -, hdf5 -, primesieve -, pagmo2 -, ipopt -, Accelerate -# tests take an hour to build on a 48-core machine -, runTests ? false -, enablePython ? false -, python3Packages -}: - -stdenv.mkDerivation rec { - pname = "openturns"; - version = "1.22"; - - src = fetchFromGitHub { - owner = "openturns"; - repo = "openturns"; - rev = "v${version}"; - sha256 = "sha256-ku3/mPoa1YJVJB99R/kWlOubIO+OZAiKfPqS/DrtJQk="; - }; - - nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; - buildInputs = [ - swig - boost - spectra - libxml2 - tbb - hmat-oss - nlopt - cminpack - ceres-solver - dlib - hdf5 - primesieve - pagmo2 - ipopt - ] ++ lib.optionals enablePython [ - python3Packages.python - python3Packages.matplotlib - python3Packages.psutil - python3Packages.dill - ] ++ lib.optional stdenv.isDarwin Accelerate; - - cmakeFlags = [ - "-DOPENTURNS_SYSCONFIG_PATH=$out/etc" - "-DCMAKE_UNITY_BUILD=ON" - "-DCMAKE_UNITY_BUILD_BATCH_SIZE=32" - "-DSWIG_COMPILE_FLAGS='-O1'" - "-DUSE_SPHINX=${if enablePython then "ON" else "OFF"}" - "-DBUILD_PYTHON=${if enablePython then "ON" else "OFF"}" - ]; - - doCheck = runTests; - - checkTarget = "tests check"; - - meta = with lib; { - description = "Multivariate probabilistic modeling and uncertainty treatment library"; - license = with licenses; [ lgpl3 gpl3 ]; - homepage = "https://openturns.github.io/www/"; - changelog = "https://github.com/openturns/openturns/raw/v${version}/ChangeLog"; - maintainers = with maintainers; [ gdinh ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix index 5af5a27f34..bbb8aa47a3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openvdb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec buildInputs = [ boost tbb jemalloc c-blosc zlib ]; - cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" ]; + cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" "-DOPENVDB_BUILD_NANOVDB=ON"]; # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer env = lib.optionalAttrs (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" && lib.versionAtLeast tbb.version "2021.8.0") { diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix index a4ce0fe60c..280c1b7ef9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix @@ -17,6 +17,7 @@ # runtime , flatbuffers +, level-zero , libusb1 , libxml2 , ocl-icd @@ -53,14 +54,14 @@ in stdenv.mkDerivation rec { pname = "openvino"; - version = "2024.0.0"; + version = "2024.1.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-Xsrmc1EynkjgPgiQ+ESyVJRJT9Afqyob0/uH+Is4TYA="; + hash = "sha256-OOSxXpLjmhOgKvrSO6SmY7xLhJSzGXT8w/Y4FnfwTqU="; }; outputs = [ @@ -132,6 +133,7 @@ stdenv.mkDerivation rec { buildInputs = [ flatbuffers + level-zero libusb1 libxml2 ocl-icd diff --git a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index c89baab793..ec4c327d78 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.34"; + version = "1.1.36"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-AzqGNFJozmtivj+gXYHPZX2iYginQ2gXbLCImhMH9Jc="; + sha256 = "sha256-Ki2tp8a67AjIMIGDpWWqCnpMmeZpJ8uPezKE2KWrOjA="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix index ab9bfcbc1d..32ee1dced3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -9,7 +9,6 @@ , docbook-xsl-nons , docbook_xml_dtd_43 , gettext -, mesonEmulatorHook , libffi , libintl }: @@ -39,10 +38,6 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_43 gettext - ] ++ lib.optionals - (!stdenv.buildPlatform.canExecute stdenv.hostPlatform - && !stdenv.hostPlatform.isMinGW) [ - mesonEmulatorHook ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix index 3428877370..70408877fe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pango"; - version = "1.51.2"; + version = "1.52.2"; outputs = [ "bin" "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-PbpAfytfwRfhkvMCXwocyO3B/ZuTSxxXiyuXNCE5QVo="; + hash = "sha256-0Adq/gEIKBS4U97smfk0ns5fLOg5CLjlj/c2tB94qWs="; }; depsBuildBuild = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix b/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix index 0e8bbe80dd..fa4148e06a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.50.2"; + version= "2.52.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-G8WrTqMoBEJYDWgxgibas2zu38Moj52DcRz3z6tQqfs="; + hash = "sha256-NKE0EmpkhP8S93Q1jDbsxE0OnfCU4bg3ltl3S7fSSUc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/parson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/parson/default.nix index a1f5c9a728..3ee5c73290 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/parson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/parson/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = "https://github.com/kgabis/parson"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.marsam ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix index 5221915284..e488ebe1f4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchpatch , pcre, windows ? null , variant ? null }: @@ -25,8 +25,17 @@ stdenv.mkDerivation rec { ] ++ lib.optional (variant != null) "--enable-${variant}"; - # https://bugs.exim.org/show_bug.cgi?id=2173 - patches = [ ./stacksize-detection.patch ]; + patches = [ + # https://bugs.exim.org/show_bug.cgi?id=2173 + ./stacksize-detection.patch + + # Fix segfaults & tests on powerpc64 + (fetchpatch { + name = "sljit-ppc-icache-flush.patch"; + url = "https://github.com/void-linux/void-packages/raw/d286e231ee680875ad8e80f90ea62e46f5edd812/srcpkgs/pcre/patches/ppc-icache-flush.patch"; + hash = "sha256-pttmKwihLzKrAV6O4qVLp2pu4NwNJEFS/9Id8/b3nAU="; + }) + ]; preCheck = '' patchShebangs RunGrepTest diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix index 23234c40e3..c30a3c379d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcre2/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "--enable-pcre2-16" "--enable-pcre2-32" # only enable jit on supported platforms which excludes Apple Silicon, see https://github.com/zherczeg/sljit/issues/51 - "--enable-jit=${if stdenv.hostPlatform.isS390x then "no" else "auto"}" + "--enable-jit=${if stdenv.hostPlatform.isS390x || stdenv.hostPlatform.isLoongArch64 then "no" else "auto"}" ] # fix pcre jit in systemd units that set MemoryDenyWriteExecute=true like gitea ++ lib.optional withJitSealloc "--enable-jit-sealloc"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix index 66a3bf5128..3c781689bb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix @@ -60,6 +60,10 @@ stdenv.mkDerivation rec { ''; enableParallelChecking = false; + # None of our currently packaged versions of swig are C++17-friendly + # Use a workaround from https://github.com/swig/swig/issues/1538 + env.CXXFLAGS="-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES"; + meta = with lib; { homepage = "http://fastnlo.hepforge.org"; description = "Fast pQCD calculations for hadron-induced processes"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix index c477f98ae7..4e2d878db0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/nlojet/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { ./nlojet_clang_fix.patch ]; + env.CXXFLAGS="-std=c++11"; + # error: no member named 'finite' in the global namespace; did you mean simply 'finite'? env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix index add7ef6fde..86f0c891b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix @@ -4,7 +4,9 @@ , cmake , boost , eigen +, example-robot-data , collisionSupport ? !stdenv.isDarwin +, jrl-cmakemodules , hpp-fcl , urdfdom , pythonSupport ? false @@ -13,16 +15,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "pinocchio"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-yhrG+MilGJkvwLUNTAgNhDqUWGjPswjrbg38yOLsmHc="; + hash = "sha256-Ks5dvKi5iutjM+iovDOYGx3vsr45JWRqGOXV8+Ko4gg="; }; + # example-robot-data models are used in checks. + # Upstream provide them as git submodule, but we can use our own version instead. + postPatch = '' + rmdir models/example-robot-data + ln -s ${example-robot-data.src} models/example-robot-data + ''; + strictDeps = true; nativeBuildInputs = [ @@ -30,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ + jrl-cmakemodules urdfdom ] ++ lib.optionals (!pythonSupport) [ boost @@ -43,15 +52,13 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.hpp-fcl ]; - cmakeFlags = lib.optionals collisionSupport [ - "-DBUILD_WITH_COLLISION_SUPPORT=ON" - ] ++ lib.optionals pythonSupport [ - "-DBUILD_WITH_LIBPYTHON=ON" + cmakeFlags = [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "BUILD_WITH_LIBPYTHON" pythonSupport) + (lib.cmakeBool "BUILD_WITH_COLLISION_SUPPORT" collisionSupport) ] ++ lib.optionals (pythonSupport && stdenv.isDarwin) [ # AssertionError: '.' != '/tmp/nix-build-pinocchio-2.7.0.drv/sou[84 chars].dae' "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;test-py-bindings_geometry_model_urdf'" - ] ++ lib.optionals (!pythonSupport) [ - "-DBUILD_PYTHON_INTERFACE=OFF" ]; doCheck = true; @@ -60,11 +67,11 @@ stdenv.mkDerivation (finalAttrs: { "pinocchio" ]; - meta = with lib; { + meta = { description = "A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives"; homepage = "https://github.com/stack-of-tasks/pinocchio"; - license = licenses.bsd2; - maintainers = with maintainers; [ nim65s wegank ]; - platforms = platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ nim65s wegank ]; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index f22a86277b..48f2dec6b8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -206,7 +206,7 @@ stdenv.mkDerivation(finalAttrs: { meta = with lib; { description = "Server and user space API to deal with multimedia pipelines"; - changelog = "https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/${version}"; + changelog = "https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/${finalAttrs.version}"; homepage = "https://pipewire.org/"; license = licenses.mit; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix index dc0236a378..2e2ef053a1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.5.1"; + version = "0.5.2"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-l5s7GTKpqGvRs1o14QNXq3kyQsoPwwUmd0TKlBKTAKE="; + hash = "sha256-SXLHQbjh4IygV+925fsPXgj7DFIPQj48oLNKWkUhuK8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/poco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/poco/default.nix index 029767aaa6..097edd0953 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/poco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/poco/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "poco"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "pocoproject"; repo = "poco"; - sha256 = "sha256-GcwkGiui9j9RzMQyEEmqq8dxWzKpv5xWxJgvJpSMdbw="; + sha256 = "sha256-ryBQjzg1DyYd/LBZzjHxq8m/7ZXRSKNNGRkIII0eHK0="; rev = "poco-${version}-release"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix index d238b8137d..2b7ac68497 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix @@ -1,39 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python, qmake, - qtwebengine, qtxmlpatterns, - qttools, unzip }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + python3, + qmake, + qtwebengine, + qtxmlpatterns, + qttools, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "python-qt"; - version = "3.4.2"; + version = "3.5.2"; src = fetchFromGitHub { owner = "MeVisLab"; repo = "pythonqt"; - rev = "v${version}"; - hash = "sha256-xJYOD07ACOKtY3psmfHNSCjm6t0fr8JU9CrL0w5P5G0="; + rev = "v${finalAttrs.version}"; + hash = "sha256-Mpi1pAPS/UuzaBK7I1kI0HlS3dphcKiVXIPuJwdEDXM="; }; - # https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt - postPatch = '' - substituteInPlace build/python.prf \ - --replace "PYTHON_VERSION=2.7" "PYTHON_VERSION=${python.pythonVersion}" - ''; + nativeBuildInputs = [ + qmake + qttools + qtxmlpatterns + qtwebengine + ]; - hardeningDisable = [ "all" ]; - - nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ]; - - buildInputs = [ python ]; + buildInputs = [ python3 ]; qmakeFlags = [ - "PythonQt.pro" - "PYTHON_DIR=${python}" + "PYTHON_DIR=${python3}" + "PYTHON_VERSION=3.${python3.sourceVersion.minor}" ]; dontWrapQtApps = true; - unpackCmd = "unzip $src"; - installPhase = '' mkdir -p $out/include/PythonQt cp -r ./lib $out @@ -42,6 +45,15 @@ stdenv.mkDerivation rec { cp -r ./extensions $out/include/PythonQt ''; + preFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -id \ + $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ + $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib + install_name_tool -id \ + $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ + $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib + ''; + meta = with lib; { description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications"; homepage = "https://pythonqt.sourceforge.net/"; @@ -49,4 +61,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ hlolli ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/qmenumodel/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qmenumodel/default.nix index 7d1384df36..c2b5e61b9d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qmenumodel/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qmenumodel/default.nix @@ -12,6 +12,7 @@ , python3 , qtbase , qtdeclarative +, gobject-introspection }: stdenv.mkDerivation (finalAttrs: { @@ -55,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ dbus dbus-test-runner + gobject-introspection (python3.withPackages (ps: with ps; [ dbus-python pygobject3 diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index 6334217f74..a8885fc564 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -196,6 +196,11 @@ let ./qtwebengine-darwin-checks.patch ]; qtwebkit = [ + (fetchpatch { + name = "qtwebkit-python39-json.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/78360c01c796b6260bf828bc9c8a0ef73c5132fd.patch"; + sha256 = "yCX/UL666BPxjnxT6rIsUrJsPcSWHhZwMFJfuHhbkhk="; + }) (fetchpatch { name = "qtwebkit-bison-3.7-build.patch"; url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; @@ -279,7 +284,11 @@ let qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; qtpim = callPackage ../modules/qtpim.nix {}; qtpositioning = callPackage ../modules/qtpositioning.nix {}; + qtpurchasing = callPackage ../modules/qtpurchasing.nix { + inherit (darwin.apple_sdk_11_0.frameworks) Foundation StoreKit; + }; qtquick1 = null; + qtquick3d = callPackage ../modules/qtquick3d.nix { }; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; qtremoteobjects = callPackage ../modules/qtremoteobjects.nix {}; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix new file mode 100644 index 0000000000..3c1661c7b0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpurchasing.nix @@ -0,0 +1,14 @@ +{ stdenv +, lib +, qtModule +, qtbase +, qtdeclarative +, StoreKit +, Foundation +}: + +qtModule { + pname = "qtpurchasing"; + propagatedBuildInputs = [ qtbase qtdeclarative ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation StoreKit ]; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquick3d.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquick3d.nix new file mode 100644 index 0000000000..1c84856c0c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquick3d.nix @@ -0,0 +1,11 @@ +{ qtModule +, qtbase +, qtdeclarative +, openssl +}: + +qtModule { + pname = "qtquick3d"; + propagatedBuildInputs = [ qtbase qtdeclarative ]; + buildInputs = [ openssl ]; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix index 6604596fe4..c4b8512079 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix @@ -15,10 +15,6 @@ , buildPackages , python3 , config - - # options -, developerBuild ? false -, debug ? false }: let @@ -47,7 +43,6 @@ let qtbase = callPackage ./modules/qtbase.nix { withGtk3 = !stdenv.hostPlatform.isMinGW; inherit (srcs.qtbase) src version; - inherit developerBuild; inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation AppKit Contacts CoreBluetooth EventKit GSS MetalKit; patches = [ @@ -197,7 +192,6 @@ let name = "qmake6-hook"; propagatedBuildInputs = [ qtbase.dev ]; substitutions = { - inherit debug; fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh; }; } ./hooks/qmake-hook.sh) diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh index 8c4ce09644..130e8290a3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh @@ -18,12 +18,6 @@ qmakePrePhase() { "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" ) - if [ -n "@debug@" ]; then - qmakeFlags+=("CONFIG+=debug") - else - qmakeFlags+=("CONFIG+=release") - fi - qmakeFlags+=("${qmakeFlags_orig[@]}") } prePhases+=" qmakePrePhase" diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 9bc68e6cd3..5006d6b655 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -15,20 +15,6 @@ else # Only set up Qt once. . @fix_qt_builtin_paths@ . @fix_qt_module_paths@ - # Disable debug symbols if qtbase was built without debugging. - # This stops -dev paths from leaking into other outputs. - if [ -z "@debug@" ]; then - NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-DQT_NO_DEBUG" - fi - - # Integration with CMake: - # Set the CMake build type corresponding to how qtbase was built. - if [ -n "@debug@" ]; then - cmakeBuildType="Debug" - else - cmakeBuildType="Release" - fi - # Build tools are often confused if QMAKE is unset. export QMAKE=@out@/bin/qmake diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index a14028e125..a327b88991 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -92,13 +92,10 @@ # options , libGLSupported ? stdenv.hostPlatform.isLinux , libGL -, debug ? false -, developerBuild ? false , qttranslations ? null }: let - debugSymbols = debug || developerBuild; isCrossBuild = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; in stdenv.mkDerivation rec { @@ -106,8 +103,6 @@ stdenv.mkDerivation rec { inherit src version; - debug = debugSymbols; - propagatedBuildInputs = [ libxml2 libxslt @@ -195,7 +190,6 @@ stdenv.mkDerivation rec { CoreBluetooth ] ++ lib.optional withGtk3 gtk3 - ++ lib.optional developerBuild gdb ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient ++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql; @@ -266,8 +260,6 @@ stdenv.mkDerivation rec { patchelf --add-rpath "${libmysqlclient}/lib/mariadb" $out/${qtPluginPrefix}/sqldrivers/libqsqlmysql.so ''; - dontStrip = debugSymbols; - dontWrapQtApps = true; setupHook = ../hooks/qtbase-setup-hook.sh; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 4045a55f6d..ba24fbe929 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -37,7 +37,9 @@ qtModule { ++ lib.optionals stdenv.hostPlatform.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; - patches = lib.optionals stdenv.hostPlatform.isMinGW [ + patches = [ + ../patches/fix-qtgui-include-incorrect-case.patch + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ ../patches/qtmultimedia-windows-no-uppercase-libs.patch ../patches/qtmultimedia-windows-resolve-function-name.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch new file mode 100644 index 0000000000..563906fb31 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch @@ -0,0 +1,13 @@ +diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp +index affa52d..b71b461 100644 +--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp ++++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp +@@ -7,7 +7,7 @@ + #include + #include + #include +-#include ++#include + #include "qvideoframe.h" + + #include diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix index 564eb31a71..9007129cec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix @@ -12,20 +12,17 @@ stdenv.mkDerivation rec { pname = "qtkeychain"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; rev = version; - sha256 = "sha256-aRBhg4RwK2jUQWW/OmzNSMUScaFUPdbWbApD37CXPoI="; + sha256 = "sha256-+1WX3ARH+jWeDiaJnX+ZlRMj+l3qvgBwcGKjB9QEJNI="; }; dontWrapQtApps = true; - # HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qtbase` - sandboxProfile = toString qtbase.__propagatedSandboxProfile or null; - cmakeFlags = [ "-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}" "-DQT_TRANSLATIONS_DIR=share/qt/translations" diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 63e02e98ff..a7372dfba2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${finalAttrs.version}"; - hash = "sha256-i+QjVPSzWNPVQmQkB+u/3Wrvqqoz5OIjRdyZKXzxZh4="; + hash = "sha256-cGMS0lEtgd64rjeEfYwJplf9rva0FtpaQMCfxyramE8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/quantlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quantlib/default.nix index 8637ae1dc1..a0ca48b1af 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quantlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quantlib/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "quantlib"; - version = "1.33"; + version = "1.34"; outputs = [ "out" "dev" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "lballabio"; repo = "QuantLib"; rev = "v${version}"; - sha256 = "sha256-j2nRm6ebf5OU6mqmcC7wQf/qlf/K9RmmCAnfT+Au8ZM="; + sha256 = "sha256-qrMaIBiDg7bFtWTDAQgAMtekb/7VrI7Ix+G59mU4WHI="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix index b021b1d930..78dc32fbbf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.4.553"; + version = "1.4.554"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-IrdUGx4b6XRmV6RHODeWukIObwy8XnsxyCKd3rwljJA="; + sha256 = "sha256-/RID+nqjMAEg2jzTBYc/8hz/t+k4TJlks7oCJ5YrjIY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix index 110ecb4907..49dfc94993 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "quictls"; - version = "3.1.4-quic1"; + version = "3.1.5-quic1"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; - rev = "openssl-${finalAttrs.version}"; - hash = "sha256-WOWoY6rmAAUvuWWXPTWsllUkew5ZIULjL1CEg/RRPsE="; + rev = "cb6841b741544bfd8868c1641ce96a934985509e"; + hash = "sha256-oR46jefarUGmBYjjpEvtKFzIOgSXSy58cLdX+P5ocA8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix index 68f2e5e096..880f1706b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidcheck"; - version = "unstable-2023-12-14"; + version = "0-unstable-2023-12-14"; src = fetchFromGitHub { owner = "emil-e"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidyaml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidyaml/default.nix index 6844947927..1275f2fa54 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rapidyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidyaml/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "rapidyaml"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "biojppm"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-1/P6Szgng94UU8cPFAtOKMS+EmiwfW/IJl2UTolDU5s="; + sha256 = "sha256-p9XaMsrOgnEdb0yl52HXhNzz6YxuvTD5GCaq1a+l1bQ="; }; nativeBuildInputs = [ cmake git ]; @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/biojppm/rapidyaml"; license = licenses.mit; maintainers = with maintainers; [ martfont ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix index d1223811c6..9a9e1f634d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "re2"; - version = "2024-03-01"; + version = "2024-05-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-VuI9OsfGTdVywdyVfBrSzXSjbSfevne+YQ2oOz4R3DM="; + hash = "sha256-p4MdHjTk0SQsBPVkEy+EceAN/QTyzBDe7Pd1hJwOs3A="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix index af4fcf3015..eb77106fd2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix @@ -1,28 +1,84 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook }: +{ stdenv, lib, fetchurl, fetchzip, autoreconfHook, writeScript, fetchpatch +, modelUrl ? "", modelHash ? "" # Allow overriding the model URL and hash +}: -stdenv.mkDerivation (rec { +let + modelVersionJSON = lib.importJSON ./model-version.json; + + # Copy from https://gitlab.xiph.org/xiph/rnnoise/-/raw/v${version}/model_version + default_model_version = modelVersionJSON.version; + + # Either use the default model or the one provided by package override + model_url = if (modelUrl == "") then "https://media.xiph.org/rnnoise/models/rnnoise_data-${default_model_version}.tar.gz" else modelUrl; + model_hash = if (modelHash == "") then modelVersionJSON.hash else modelHash; + +in stdenv.mkDerivation (finalAttrs: { pname = "rnnoise"; - version = "2021-01-22"; + version = "0.2"; - src = fetchFromGitHub { - owner = "xiph"; - repo = "rnnoise"; - rev = "1cbdbcf1283499bbb2230a6b0f126eb9b236defd"; - sha256 = "1y0rzgmvy8bf9a431garpm2w177s6ajgf79y5ymw4yb0pik57rwb"; + src = fetchzip { + urls = [ + "https://gitlab.xiph.org/xiph/rnnoise/-/archive/v${finalAttrs.version}/rnnoise-v${finalAttrs.version}.tar.gz" + "https://github.com/xiph/rnnoise/archive/v${finalAttrs.version}.tar.gz" + ]; + hash = "sha256-Qaf+0iOprq7ILRWNRkBjsniByctRa/lFVqiU5ZInF/Q="; }; + patches = [ + # remove when updating + (fetchpatch { + url = "https://github.com/xiph/rnnoise/commit/372f7b4b76cde4ca1ec4605353dd17898a99de38.patch"; + hash = "sha256-Dzikb59hjVxd1XIEj/Je4evxtGORkaNcqE+zxOJMSvs="; + }) + ]; + + model = fetchurl { + url = model_url; + hash = model_hash; + }; + + postPatch = '' + tar xvomf ${finalAttrs.model} + ''; + nativeBuildInputs = [ autoreconfHook ]; postInstall = '' install -Dt $out/bin examples/.libs/rnnoise_demo ''; - meta = with lib; { + passthru.updateScript = writeScript "update-rnnoise.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts nix nix-prefetch findutils moreutils + + prefetch-sri() { + nix-prefetch-url "$1" | xargs nix hash to-sri --type sha256 + } + + res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/xiph/rnnoise/tags?per_page=1")" + + version="$(echo $res | jq '.[0].name | split("v") | .[1]' --raw-output)" + update-source-version ${finalAttrs.pname} "$version" --ignore-same-hash + + model_version=$(curl -sL "https://raw.githubusercontent.com/xiph/rnnoise/v$version/model_version") + model_url="https://media.xiph.org/rnnoise/models/rnnoise_data-$model_version.tar.gz" + model_hash="$(prefetch-sri $model_url)" + + modelJson=pkgs/development/libraries/rnnoise/model-version.json + + jq --arg version "$model_version" \ + --arg hash "$model_hash" \ + '.version = $version | .hash = $hash' \ + "$modelJson" | sponge "$modelJson" + ''; + + meta = { description = "Recurrent neural network for audio noise reduction"; homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; - license = licenses.bsd3; - maintainers = [ maintainers.nh2 ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nh2 ]; mainProgram = "rnnoise_demo"; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rnnoise/model-version.json b/third_party/nixpkgs/pkgs/development/libraries/rnnoise/model-version.json new file mode 100644 index 0000000000..830f8cc360 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rnnoise/model-version.json @@ -0,0 +1,4 @@ +{ + "version": "0b50c45", + "hash": "sha256-SsgcXAiE7EvVkHAmqq4WIJt7ds2df3GvWCCUovmPS0M=" +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/robin-map/default.nix b/third_party/nixpkgs/pkgs/development/libraries/robin-map/default.nix index 41d9c25c52..6a593ec070 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/robin-map/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/robin-map/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "robin-map"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Tessil"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-33oNUvLofFuM5QyRk+Jc6Q7vvWk68c/QqX0oiELoUrw="; + hash = "sha256-dspOWp/8oNR0p5XRnqO7WtPcCx54/y8m1cDho4UBYyc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 6c2aaaa881..c584ef2976 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "8.3.2"; + version = "9.1.1"; src = fetchFromGitHub { owner = "facebook"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg="; + hash = "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rutabaga_gfx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rutabaga_gfx/default.nix index 6875002727..9b8f5bec42 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rutabaga_gfx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rutabaga_gfx/default.nix @@ -54,14 +54,22 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-wuF3Isrp+u5J8jPQoPsIOWYGNKLSNa2pLfvladAWkLs="; }; + CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = + "${stdenv.cc.targetPrefix}cc"; + + postConfigure = '' + cd rutabaga_gfx/ffi + substituteInPlace Makefile --replace-fail pkg-config "$PKG_CONFIG" + ''; + # make install always rebuilds dontBuild = true; - makeFlags = [ "prefix=$(out)" ]; - - preInstall = '' - cd rutabaga_gfx/ffi - ''; + makeFlags = [ + "prefix=$(out)" + "OUT=target/${stdenv.hostPlatform.rust.cargoShortTarget}/release" + ]; meta = with lib; { homepage = "https://crosvm.dev/book/appendix/rutabaga_gfx.html"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index 8ef3df4992..36f1137277 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.4.9"; + version = "1.4.12"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-YH35+kCvPjeBYMMJi7YdAGk/ds3YPm5SSKpoWfbCI3M="; + hash = "sha256-gOCnRuJ1YM+SkrOJ/5TGANl442e7Umh3HK5DFNLJi/A="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix index c15689aa60..fd9e4f4003 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix @@ -1,19 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libminc, netpbm }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libminc, + netpbm, +}: stdenv.mkDerivation rec { pname = "bicpl"; - version = "unstable-2020-10-15"; + version = "unstable-2024-05-14"; - # current master is significantly ahead of most recent release, so use Git version: + # master is not actively maintained, using develop and develop-apple branches src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "a58af912a71a4c62014975b89ef37a8e72de3c9d"; - sha256 = "0iw0pmr8xrifbx5l8a0xidfqbm1v8hwzqrw0lcmimxlzdihyri0g"; + owner = "BIC-MNI"; + repo = pname; + rev = "7e1e791483cf135fe29b8eecd7a360aa892823ae"; + hash = "sha256-SvbtPUfEYp3IGivG+5yFdJF904miyMk+s15zwW7e7b4="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libminc netpbm ]; + buildInputs = [ + libminc + netpbm + ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; @@ -25,6 +35,9 @@ stdenv.mkDerivation rec { description = "Brain Imaging Centre programming library"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = with licenses; [ hpndUc gpl3Plus ]; + license = with licenses; [ + hpndUc + gpl3Plus + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch deleted file mode 100644 index 0f886a8a63..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/avogadro/qtplugins/templatetool/CMakeLists.txt b/avogadro/qtplugins/templatetool/CMakeLists.txt -index 3f68e6dd..822de4e5 100644 ---- a/avogadro/qtplugins/templatetool/CMakeLists.txt -+++ b/avogadro/qtplugins/templatetool/CMakeLists.txt -@@ -24,7 +24,7 @@ avogadro_plugin(TemplateTool - ) - - # Install the fragments --set(_fragments "${AvogadroLibs_SOURCE_DIR}/../fragments") -+set(_fragments "${AvogadroLibs_SOURCE_DIR}/fragments") - - # Look in parallel directory for the molecule fragment repository - if(NOT EXISTS "${_fragments}") diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix index a93b8f32ce..6c4061c4c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, cmake, msgpack } : -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mmtf-cpp"; version = "1.1.0"; src = fetchFromGitHub { owner = "rcsb"; - repo = pname; - rev = "v${version}"; + repo = "mmtf-cpp"; + rev = "v${finalAttrs.version}"; hash = "sha256-8JrNobvekMggS8L/VORKA32DNUdXiDrYMObjd29wQmc="; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "A library of exchange-correlation functionals with arbitrary-order derivatives"; homepage = "https://github.com/rcsb/mmtf-cpp"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.sheepforce ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix index c32379f265..b31de4b84a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix @@ -17,13 +17,13 @@ let blasIntSize = if blas64 then "64" else "32"; in stdenv.mkDerivation rec { pname = "blis"; - version = "0.9.0"; + version = "1.0"; src = fetchFromGitHub { owner = "flame"; repo = "blis"; rev = version; - sha256 = "sha256-1aHIdt5wCDrT1hBPnaUVThwjwDkJQ0G0+tao2iFXYpM="; + sha256 = "sha256-lAo6C34QQvXr3LmcsnTp4+Imi/lKxzcWu3EJkVgLvDI="; }; inherit blas64; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix index a87d107b3a..dfa157d05d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , cmake , gfortran , blas @@ -21,7 +22,13 @@ stdenv.mkDerivation rec { sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs"; }; - patches = [ ./platform.patch ]; + patches = [ + ./platform.patch + (fetchpatch { + url = "https://github.com/clMathLibraries/clBLAS/commit/68ce5f0b824d7cf9d71b09bb235cf219defcc7b4.patch"; + hash = "sha256-XoVcHgJ0kTPysZbM83mUX4/lvXVHKbl7s2Q8WWiUnMs="; + }) + ]; postPatch = '' sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix index a76c2f878b..286a630f4b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix @@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.14.14"; + version = "3.14.16"; src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; rev = "releases/${version}"; - sha256 = "sha256-qMPdJVLIXFePhTA6qRr1Pth/BjJ62cj9y8C1HKQJGDQ="; + sha256 = "sha256-ZuiZZMq7NzOm6CCJgMBgEWs8PEfM3pVr2yOWbS42l8U="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix index cb45787e14..d2f6b1ee8a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://itpp.sourceforge.net/"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/itpp.x86_64-darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix index 47a6249ebd..5b08cfa7dc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -3,6 +3,7 @@ , fetchzip , lib , libcxx +, llvmPackages , addOpenGLRunpath , patchelf @@ -17,11 +18,11 @@ let # this derivation. However, we should ensure on version bumps # that the CUDA toolkit for `passthru.tests` is still # up-to-date. - version = "2.0.0"; + version = "2.3.0"; device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; - libcxx-for-libtorch = if stdenv.hostPlatform.system == "x86_64-darwin" then libcxx else stdenv.cc.cc.lib; + libcxx-for-libtorch = if stdenv.isDarwin then libcxx else stdenv.cc.cc.lib; in stdenv.mkDerivation { inherit version; pname = "libtorch"; @@ -71,6 +72,9 @@ in stdenv.mkDerivation { otool -L $f done for f in $out/lib/*.dylib; do + if otool -L $f | grep "@rpath/libomp.dylib" >& /dev/null; then + install_name_tool -change "@rpath/libomp.dylib" ${llvmPackages.openmp}/lib/libomp.dylib $f + fi install_name_tool -id $out/lib/$(basename $f) $f || true for rpath in $(otool -L $f | grep rpath | awk '{print $1}');do install_name_tool -change $rpath $out/lib/$(basename $rpath) $f @@ -99,6 +103,9 @@ in stdenv.mkDerivation { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; maintainers = with maintainers; [ junjihashimoto ]; - platforms = platforms.unix; + platforms = [ + "aarch64-darwin" + "x86_64-linux" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index 83533d89b1..dd8104ad5f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -1,19 +1,19 @@ -version : builtins.getAttr version { - "2.0.0" = { - x86_64-darwin-cpu = { - name = "libtorch-macos-2.0.0.zip"; - url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-2.0.0.zip"; - hash = "sha256-u6y5IeYoiOC0yQ/k6JCChDs9lXWccLxUorgR8L62lkM="; +version: builtins.getAttr version { + "2.3.0" = { + aarch64-darwin-cpu = { + name = "libtorch-macos-arm64-2.3.0.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-arm64-2.3.0.zip"; + hash = "sha256-l4qY1jbsECN5qm7dWJ2jSvKuQwQ/HI6G6Vq1Kh2rxkM="; }; x86_64-linux-cpu = { - name = "libtorch-cxx11-abi-shared-with-deps-2.0.0-cpu.zip"; - url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.0.0%2Bcpu.zip"; - hash = "sha256-BoZQ2MC1CDVVGfX3SHC3mEpLGWO8XK7AcLcHJXDsXuc="; + name = "libtorch-cxx11-abi-shared-with-deps-2.3.0-cpu.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.3.0%2Bcpu.zip"; + hash = "sha256-dKAk6UusK2eQIcP0oMXh9cnufMpy5Ph4SGPkIPPV6ds="; }; x86_64-linux-cuda = { - name = "libtorch-cxx11-abi-shared-with-deps-2.0.0-cu118.zip"; - url = "https://download.pytorch.org/libtorch/cu118/libtorch-cxx11-abi-shared-with-deps-2.0.0%2Bcu118.zip"; - hash = "sha256-Dpw9kQdA1NI9EOT7JBKwQP4wZT6lizcnKKTQ8WVJCZc="; + name = "libtorch-cxx11-abi-shared-with-deps-2.3.0-cu121.zip"; + url = "https://download.pytorch.org/libtorch/cu121/libtorch-cxx11-abi-shared-with-deps-2.3.0%2Bcu121.zip"; + hash = "sha256-6B+NF6q78I2WKFudn8bK+eNYDi1zQ7mdgv06fZbm2rE="; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/prefetch.sh b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/prefetch.sh index 5c6d60ae8b..2682fe6779 100755 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/prefetch.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/prefetch.sh @@ -6,10 +6,11 @@ set -eou pipefail version=$1 bucket="https://download.pytorch.org/libtorch" -CUDA_VERSION=cu116 +CUDA_VERSION=cu121 url_and_key_list=( - "x86_64-darwin-cpu $bucket/cpu/libtorch-macos-${version}.zip libtorch-macos-${version}.zip" + "aarch64-darwin-cpu $bucket/cpu/libtorch-macos-arm64-${version}.zip libtorch-macos-arm64-${version}.zip" + "x86_64-darwin-cpu $bucket/cpu/libtorch-macos-x86_64-${version}.zip libtorch-macos-x86_64-${version}.zip" "x86_64-linux-cpu $bucket/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip libtorch-cxx11-abi-shared-with-deps-${version}-cpu.zip" "x86_64-linux-cuda $bucket/${CUDA_VERSION}/libtorch-cxx11-abi-shared-with-deps-${version}%2B${CUDA_VERSION}.zip libtorch-cxx11-abi-shared-with-deps-${version}-${CUDA_VERSION}.zip" ) diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index 7ecd6a88d1..842bc3af98 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -142,7 +142,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.26"; + version = "0.3.27"; outputs = [ "out" "dev" ]; @@ -150,9 +150,17 @@ stdenv.mkDerivation rec { owner = "OpenMathLib"; repo = "OpenBLAS"; rev = "v${version}"; - hash = "sha256-AA3+x3SXkcg3g7bROZYLpWAbxnRedmQBZPe+rBJKxJ8="; + hash = "sha256-VKDFSPwHGZMa2DoOXbSKNQRsl07LatMLK1lHVcEep8U="; }; + patches = [ + (fetchpatch { + name = "no-gemm3m-tests-static.patch"; + url = "https://github.com/OpenMathLib/OpenBLAS/commit/48e017de095018c60d83355804a3075658b4970c.patch"; + hash = "sha256-Wa6EE0M1H0efVn26pOKpi0dFGLuPuzmvAzpBLrAYe5k="; + }) + ]; + postPatch = '' # cc1: error: invalid feature modifier 'sve2' in '-march=armv8.5-a+sve+sve2+bf16' substituteInPlace Makefile.arm64 --replace "+sve2+bf16" "" @@ -255,7 +263,7 @@ EOF ''; passthru.tests = { - inherit (python3.pkgs) numpy scipy; + inherit (python3.pkgs) numpy scipy scikit-learn; inherit ceres-solver giac octave opencv; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix index 14befd6d11..53a613522b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "openspecfun"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "openspecfun"; rev = "v${version}"; - sha256 = "sha256-4MPoRMtDTkdvDfhNXKk/80pZjXRNEPcysLNTb5ohxWk="; + sha256 = "sha256-fx9z6bbU2V4x6Pr7/vmlSxkWxZ6qTYuPxnfqKLv08CA="; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix index a6bc5a0862..485c5322ca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "osi"; - version = "0.108.9"; + version = "0.108.10"; src = fetchFromGitHub { owner = "coin-or"; repo = "Osi"; rev = "releases/${version}"; - hash = "sha256-ueIa9CL4K5ygKpkMRvfuWR0emEG6omg65ZKCsConWsw="; + hash = "sha256-rHNGnnDFU9UrszjjkZQkgWCfjjBIQba6vVbK/HLpRsQ="; }; buildInputs = diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch index 6a3c7bee05..f3a34de930 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch @@ -1,12 +1,12 @@ diff --git a/src/snes/tutorials/makefile b/src/snes/tutorials/makefile -index 168febb34b6..71068469066 100644 +index 672a62a..a5fd1c4 100644 --- a/src/snes/tutorials/makefile +++ b/src/snes/tutorials/makefile @@ -13,6 +13,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules # these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed testex5f: ex5f.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \ echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \ else \ @@ -14,7 +14,7 @@ index 168febb34b6..71068469066 100644 ${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm; testex19: ex19.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \ else \ @@ -22,7 +22,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp; testex19_mpi: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \ else \ @@ -30,7 +30,7 @@ index 168febb34b6..71068469066 100644 #use unpreconditioned norm because HYPRE device installations use different AMG parameters runex19_hypre: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre"; \ else \ @@ -38,7 +38,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_hypre_cuda: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/cuda"; \ else \ @@ -46,7 +46,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_hypre_hip: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/hip"; \ else \ @@ -54,7 +54,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_cuda: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -pc_gamg_esteig_ksp_max_it 10 -ksp_monitor -mg_levels_ksp_max_it 3 > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with cuda"; \ else \ @@ -62,7 +62,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_ml: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with ml"; \ else \ @@ -70,7 +70,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_fieldsplit_mumps: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with mumps"; \ else \ @@ -78,7 +78,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_6.tmp runex19_superlu_dist: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19.tmp; \ if (${DIFF} output/ex19_superlu.out ex19.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with superlu_dist"; \ else \ @@ -86,7 +86,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19.tmp runex19_suitesparse: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with suitesparse"; \ else \ @@ -94,7 +94,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex3k_kokkos: ex3k.PETSc -@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\ -+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex3k run successfully with kokkos-kernels"; \ else \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix index b836220efa..410ef47b1b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-Az5QZNnzLYpEE7O+1/VceIT6vykkg8vMuAuN9u8OseM="; + sha256 = "sha256-7YW0ylYQMi6D7YyRQGWRv980skjZ2t//QoZb8rRDHGk="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/snappy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/snappy/default.nix index 004dd38838..869c56ed73 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/snappy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/snappy/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "snappy"; - version = "1.1.10"; + version = "1.2.0"; src = fetchFromGitHub { owner = "google"; repo = "snappy"; rev = version; - hash = "sha256-wYZkKVDXKCugycx/ZYhjV0BjM/NrEM0R6A4WFhs/WPU="; + hash = "sha256-mpEeUoJs+lGlqh1m6Mmr8UnbtQDn/8kfkeQdFwo2rQ0="; }; patches = [ @@ -23,11 +23,6 @@ stdenv.mkDerivation rec { url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=a759aa6fba405cd40025e3f0ab89941d"; sha256 = "sha256-RMuM5yd6zP1eekN/+vfS54EyY4cFbGDVor1E1vj3134="; }) - # Fix -Wsign-compare warning on clang. - (fetchpatch { - url = "https://github.com/google/snappy/commit/27f34a580be4a3becf5f8c0cba13433f53c21337.patch"; - sha256 = "sha256-eq6ueeMAkd2bYmPJcKAZZzd5QlXyeWOrsxFIwR8KOpQ="; - }) ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix index d160a6a5f6..fd7428213f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix @@ -36,7 +36,7 @@ , wayland-protocols , wayland-scanner , zlib -, wrapGAppsHook +, wrapGAppsHook3 , withPolkit ? stdenv.isLinux }: @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { python3.pkgs.pyparsing python3.pkgs.six vala - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ mesonEmulatorHook ] ++ lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index 0a22d41778..b3e89ae954 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.5.6"; + version = "4.5.7"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - hash = "sha256-tfDjl1l1vMWZsxFNEPK9jOrUN260/3k2kX6rVHPCZ0k="; + hash = "sha256-0cPb78CTxrCdDZAY8hyt7Kid5DKszDl1v+6XNKyNrLM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix index d172d75e01..fe39cac8a2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.45.2"; + version = "3.45.3"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-vJBnRC7t8905mJtcXPv/83rmbMnJknTgwwUtxNSo9q4="; + hash = "sha256-soCcpTEkwZxg9Cv2J3NurgEa/cwgW7SCcKXumjgZFTE="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index 94ac07df9d..d988a71e54 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.45.2"; + version = "3.45.3"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-SkWjV3zIr2g8S9TG6Bp8eCxbfV2qBhdeosuXHKcWkbE="; + hash = "sha256-7AyVnkLLXxgEE10FVfjqMr5v8gSOsYG8zTZ8j1PxhdE="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/template-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/template-glib/default.nix index fae25d959d..71960010d5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/template-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/template-glib/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "template-glib"; - version = "3.36.1"; + version = "3.36.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "OxZ6Fzha10WvviD634EGxm0wxb10bVqh2b236AP2pQM="; + hash = "sha256-ACDzpAGIjOdjs6F1CML1jpGXKkg6DFR6/bfMviVhmUg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/the-foundation/default.nix b/third_party/nixpkgs/pkgs/development/libraries/the-foundation/default.nix index 9b0fe4de9e..d3021995ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/the-foundation/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/the-foundation/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "the-foundation"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = "the_Foundation"; rev = "v${finalAttrs.version}"; - hash = "sha256-6bEd8KzOfBse5sQ2zp+cZtEAu8xIl3GqrpxSZ7h/edI="; + hash = "sha256-gyDBK/bF+QxXMnthUfMjeUuRBZk0Xcahm7wOtLGs5kY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix index 694225d9e3..1d57c8164c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tkrzw"; - version = "1.0.27"; + version = "1.0.29"; # TODO: defeat multi-output reference cycles src = fetchurl { url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; - hash = "sha256-DxLtDtscTPR1yzeOENyQPylKo+VxJTswUAE/MieEoXQ="; + hash = "sha256-q6q9b8iaGe2KICrDcRvDsHY9kovDqO7upzo2effn95A="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix index e5cdad0aae..62bcbf0241 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://codeberg.org/dnkl/tllist"; - changelog = "https://codeberg.org/dnkl/tllist/releases/tag/${version}"; + changelog = "https://codeberg.org/dnkl/tllist/releases/tag/${finalAttrs.version}"; description = "C header file only implementation of a typed linked list"; longDescription = '' Most C implementations of linked list are untyped. That is, their data diff --git a/third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix index 871b724029..6598da9a6f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Videos"; + homepage = "https://gitlab.gnome.org/GNOME/totem-pl-parser"; description = "Simple GObject-based library to parse and save a host of playlist formats"; maintainers = teams.gnome.members; license = licenses.lgpl2; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index 628f32a91c..3fa8800abf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl +{ stdenv, lib, fetchFromGitHub , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl , openssl, json_c, curl, libgcrypt , cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "sha256-75yiKVZrR1vcCwKp4tDO4A9JB0KDM0MXPJ1N85kAaRk="; + hash = "sha256-cQdIPQNZzy5CisWw5yifPXC7FqaZxj4VKWpvtPOffE8="; }; outputs = [ "out" "man" "dev" ]; @@ -53,11 +53,6 @@ stdenv.mkDerivation rec { # Do not rely on dynamic loader path # TCTI loader relies on dlopen(), this patch prefixes all calls with the output directory ./no-dynamic-loader-path.patch - (fetchurl { - name = "skip-test-fapi-fix-provisioning-with-template-if-no-certificate-available.patch"; - url = "https://github.com/tpm2-software/tpm2-tss/commit/218c0da8d9f675766b1de502a52e23a3aa52648e.patch"; - sha256 = "sha256-dnl9ZAknCdmvix2TdQvF0fHoYeWp+jfCTg8Uc7h0voA="; - }) ]; postPatch = '' @@ -65,7 +60,7 @@ stdenv.mkDerivation rec { substituteInPlace src/tss2-tcti/tctildr-dl.c \ --replace '@PREFIX@' $out/lib/ substituteInPlace ./test/unit/tctildr-dl.c \ - --replace '@PREFIX@' $out/lib + --replace '@PREFIX@' $out/lib/ substituteInPlace ./bootstrap \ --replace 'git describe --tags --always --dirty' 'echo "${version}"' ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch index 60f8c91bae..fcbfaca299 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch @@ -1,232 +1,503 @@ diff --git a/src/tss2-tcti/tctildr-dl.c b/src/tss2-tcti/tctildr-dl.c -index 622637dc..88fc3d8f 100644 +index d26219d2..92d2b6a3 100644 --- a/src/tss2-tcti/tctildr-dl.c +++ b/src/tss2-tcti/tctildr-dl.c -@@ -92,7 +92,7 @@ handle_from_name(const char *file, - LOG_DEBUG("Could not load TCTI file: \"%s\": %s", file, dlerror()); - } +@@ -88,14 +88,24 @@ handle_from_name(const char *file, + const char *formats[] = { + /* */ + "%s", ++ /* */ ++ "@PREFIX@" "%s", + /* libtss2-tcti-.so.0 */ + FMT_TCTI_PREFIX "%s" FMT_LIB_SUFFIX_0, ++ /* libtss2-tcti-.so.0 */ ++ "@PREFIX@" FMT_TCTI_PREFIX "%s" FMT_LIB_SUFFIX_0, + /* libtss2-tcti-.so */ + FMT_TCTI_PREFIX "%s" FMT_LIB_SUFFIX, ++ /* libtss2-tcti-.so */ ++ "@PREFIX@" FMT_TCTI_PREFIX "%s" FMT_LIB_SUFFIX, + /* libtss2-.so.0 */ + FMT_TSS_PREFIX "%s" FMT_LIB_SUFFIX_0, ++ /* libtss2-.so.0 */ ++ "@PREFIX@" FMT_TSS_PREFIX "%s" FMT_LIB_SUFFIX_0, + /* libtss2-.so */ + FMT_TSS_PREFIX "%s" FMT_LIB_SUFFIX, ++ /* libtss2-.so */ ++ "@PREFIX@" FMT_TSS_PREFIX "%s" FMT_LIB_SUFFIX, + }; -- len = snprintf(NULL, 0, TCTI_NAME_TEMPLATE_0, file); -+ len = snprintf(NULL, 0, "@PREFIX@" TCTI_NAME_TEMPLATE_0, file); - if (len >= PATH_MAX) { - LOG_ERROR("TCTI name truncated in transform."); - return TSS2_TCTI_RC_BAD_VALUE; -@@ -129,6 +129,50 @@ handle_from_name(const char *file, - return TSS2_TCTI_RC_BAD_VALUE; - } - *handle = dlopen(file_xfrm, RTLD_NOW); -+ if (*handle != NULL) { -+ return TSS2_RC_SUCCESS; -+ } else { -+ LOG_DEBUG("Failed to load TCTI for name \"%s\": %s", file, dlerror()); -+ } -+ size = snprintf(file_xfrm, -+ len + 1, -+ "@PREFIX@%s", -+ file); -+ if (size >= len + 1) { -+ LOG_ERROR("TCTI name truncated in transform."); -+ return TSS2_TCTI_RC_BAD_VALUE; -+ } -+ *handle = dlopen(file_xfrm, RTLD_NOW); -+ if (*handle != NULL) { -+ return TSS2_RC_SUCCESS; -+ } else { -+ LOG_DEBUG("Could not load TCTI file: \"%s\": %s", file, dlerror()); -+ } -+ /* 'name' alone didn't work, try libtss2-tcti-.so.0 */ -+ size = snprintf(file_xfrm, -+ len + 1, -+ "@PREFIX@" TCTI_NAME_TEMPLATE_0, -+ file); -+ if (size >= len + 1) { -+ LOG_ERROR("TCTI name truncated in transform."); -+ return TSS2_TCTI_RC_BAD_VALUE; -+ } -+ *handle = dlopen(file_xfrm, RTLD_NOW); -+ if (*handle != NULL) { -+ return TSS2_RC_SUCCESS; -+ } else { -+ LOG_DEBUG("Could not load TCTI file \"%s\": %s", file, dlerror()); -+ } -+ /* libtss2-tcti-.so.0 didn't work, try libtss2-tcti-.so */ -+ size = snprintf(file_xfrm, -+ len + 1, -+ "@PREFIX@" TCTI_NAME_TEMPLATE, -+ file); -+ if (size >= len + 1) { -+ LOG_ERROR("TCTI name truncated in transform."); -+ return TSS2_TCTI_RC_BAD_VALUE; -+ } -+ *handle = dlopen(file_xfrm, RTLD_NOW); - if (*handle == NULL) { - LOG_DEBUG("Failed to load TCTI for name \"%s\": %s", file, dlerror()); - SAFE_FREE(file_xfrm); + if (handle == NULL) { diff --git a/test/unit/tctildr-dl.c b/test/unit/tctildr-dl.c -index 4279baee..6685c811 100644 +index 135e1b14..7d654d1f 100644 --- a/test/unit/tctildr-dl.c +++ b/test/unit/tctildr-dl.c -@@ -229,6 +229,18 @@ test_get_info_default_success (void **state) +@@ -168,6 +168,10 @@ test_handle_from_name_second_dlopen_success (void **state) expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-default.so"); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" TEST_TCTI_TRY_A); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so.0"); -+ expect_value(__wrap_dlopen, flags, RTLD_NOW); -+ will_return(__wrap_dlopen, NULL); -+ -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so"); -+ expect_value(__wrap_dlopen, flags, RTLD_NOW); -+ will_return(__wrap_dlopen, NULL); -+ - expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); + expect_string(__wrap_dlopen, filename, TEST_TCTI_TRY_B); expect_value(__wrap_dlopen, flags, RTLD_NOW); - will_return(__wrap_dlopen, HANDLE); -@@ -261,6 +273,18 @@ test_get_info_default_info_fail (void **state) + will_return(__wrap_dlopen, TEST_HANDLE); +@@ -186,10 +190,18 @@ test_handle_from_name_third_dlopen_success (void **state) expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-default.so"); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" TEST_TCTI_TRY_A); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so.0"); -+ expect_value(__wrap_dlopen, flags, RTLD_NOW); -+ will_return(__wrap_dlopen, NULL); -+ -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so"); -+ expect_value(__wrap_dlopen, flags, RTLD_NOW); -+ will_return(__wrap_dlopen, NULL); -+ - expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); + expect_string(__wrap_dlopen, filename, TEST_TCTI_TRY_B); expect_value(__wrap_dlopen, flags, RTLD_NOW); - will_return(__wrap_dlopen, HANDLE); -@@ -413,6 +437,15 @@ test_tcti_fail_all (void **state) + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" TEST_TCTI_TRY_B); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, TEST_TCTI_TRY_C); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, TEST_HANDLE); +@@ -208,14 +220,26 @@ test_handle_from_name_fourth_dlopen_success (void **state) + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" TEST_TCTI_TRY_A); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, TEST_TCTI_TRY_B); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" TEST_TCTI_TRY_B); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, TEST_TCTI_TRY_C); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" TEST_TCTI_TRY_C); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, TEST_TCTI_TRY_D); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, TEST_HANDLE); +@@ -234,18 +258,34 @@ test_handle_from_name_fifth_dlopen_success (void **state) + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" TEST_TCTI_TRY_A); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, TEST_TCTI_TRY_B); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" TEST_TCTI_TRY_B); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, TEST_TCTI_TRY_C); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" TEST_TCTI_TRY_C); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, TEST_TCTI_TRY_D); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" TEST_TCTI_TRY_D); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, TEST_TCTI_TRY_E); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, TEST_HANDLE); +@@ -281,22 +321,42 @@ test_get_info_default_success (void **state) + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-default.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-default.so.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-default.so.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-default.so.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-default.so"); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-default.so.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so.0"); ++ + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-default.so.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-default.so.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so"); ++ + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-default.so.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-default.so.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, HANDLE); +@@ -321,22 +381,42 @@ test_get_info_default_info_fail (void **state) + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-default.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-default.so.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-default.so.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-default.so.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-default.so.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-default.so.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-default.so.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-default.so.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-default.so.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, HANDLE); +@@ -483,120 +563,225 @@ test_tcti_fail_all (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-default.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-default.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-default.so.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-default.so.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-default.so.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-default.so.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-default.so.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-default.so.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-default.so.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-default.so.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); /* Skip over libtss2-tcti-tabrmd.so */ expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); -@@ -424,6 +457,15 @@ test_tcti_fail_all (void **state) + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-tabrmd.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-tabrmd.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-tabrmd.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-tabrmd.so.0.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-tabrmd.so.0"); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-tabrmd.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-tabrmd.so.0.so.0"); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-tabrmd.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-tabrmd.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-tabrmd.so.0.so"); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-tabrmd.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-tabrmd.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); /* Skip over libtss2-tcti-device.so, /dev/tpmrm0 */ expect_string(__wrap_dlopen, filename, "libtss2-tcti-device.so.0"); -@@ -435,6 +477,15 @@ test_tcti_fail_all (void **state) + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-device.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-device.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-device.so.0"); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-device.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so.0"); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-device.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-device.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so"); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-device.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-device.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); /* Skip over libtss2-tcti-device.so, /dev/tpm0 */ expect_string(__wrap_dlopen, filename, "libtss2-tcti-device.so.0"); -@@ -446,6 +497,15 @@ test_tcti_fail_all (void **state) + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-device.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-device.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-device.so.0"); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-device.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so.0"); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-device.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-device.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so"); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-device.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-device.so.0.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + /* Skip over libtss2-tcti-device.so, /dev/tcm0 */ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-device.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-device.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-device.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-device.so.0.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-device.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-device.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-device.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-device.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); /* Skip over libtss2-tcti-swtpm.so */ expect_string(__wrap_dlopen, filename, "libtss2-tcti-swtpm.so.0"); -@@ -457,6 +517,15 @@ test_tcti_fail_all (void **state) + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-swtpm.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-swtpm.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-swtpm.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-swtpm.so.0.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-swtpm.so.0"); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-swtpm.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-swtpm.so.0.so.0"); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-swtpm.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-swtpm.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-swtpm.so.0.so"); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-swtpm.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-swtpm.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); /* Skip over libtss2-tcti-mssim.so */ expect_string(__wrap_dlopen, filename, "libtss2-tcti-mssim.so.0"); -@@ -468,6 +537,15 @@ test_tcti_fail_all (void **state) + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-mssim.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-mssim.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-mssim.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-mssim.so.0.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-mssim.so.0"); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-libtss2-tcti-mssim.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-mssim.so.0.so.0"); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-mssim.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-mssim.so.0.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-mssim.so.0.so"); + expect_string(__wrap_dlopen, filename, "libtss2-libtss2-tcti-mssim.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-libtss2-tcti-mssim.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); TSS2_RC r; TSS2_TCTI_CONTEXT *tcti; -@@ -496,6 +574,15 @@ test_info_from_name_handle_fail (void **state) +@@ -619,18 +804,33 @@ test_info_from_name_handle_fail (void **state) + expect_string(__wrap_dlopen, filename, "foo"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "foo"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-tcti-foo.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-foo.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); expect_string(__wrap_dlopen, filename, "libtss2-tcti-foo.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/foo"); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-foo.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so.0"); + expect_string(__wrap_dlopen, filename, "libtss2-foo.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-foo.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so"); + expect_string(__wrap_dlopen, filename, "libtss2-foo.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-foo.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); TSS2_RC rc = info_from_name ("foo", &info, &data); assert_int_equal (rc, TSS2_TCTI_RC_NOT_SUPPORTED); -@@ -612,6 +699,15 @@ test_tctildr_get_info_from_name (void **state) +@@ -741,18 +941,33 @@ test_tctildr_get_info_from_name (void **state) + expect_string(__wrap_dlopen, filename, "foo"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "foo"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + expect_string(__wrap_dlopen, filename, "libtss2-tcti-foo.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-foo.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); expect_string(__wrap_dlopen, filename, "libtss2-tcti-foo.so"); expect_value(__wrap_dlopen, flags, RTLD_NOW); will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/foo"); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-tcti-foo.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so.0"); + expect_string(__wrap_dlopen, filename, "libtss2-foo.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-foo.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); -+ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so"); + expect_string(__wrap_dlopen, filename, "libtss2-foo.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@" "libtss2-foo.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index 3abd9bd24b..ad8dd33783 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.6.2"; + version = "3.7.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Ctci89Uywh11fPSI+UKWBnnqj0V5Je+pdlbtTJ6bpP8="; + hash = "sha256-608rKIoMvp5hSHHLAEgnRGHP4cuEZ6yBexAtOHPby6U="; }; nativeBuildInputs = [ @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Tracker"; + homepage = "https://gitlab.gnome.org/GNOME/tracker-miners"; description = "Desktop-neutral user information store, search tool and indexer"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix index 45c5eb1015..67400eaee9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -25,6 +25,7 @@ , libsoup , libsoup_3 , json-glib +, avahi , systemd , dbus , writeText @@ -33,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tracker"; - version = "3.6.0"; + version = "3.7.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Ulks/hm6/9FtvkdHW+fadQ29C2Mz/XrLYPqp2lvEDfI="; + hash = "sha256-3ryqKR5Gr63Bz2olHxfvsCRAqki/9kPXjGESOAfc4A8="; }; strictDeps = true; @@ -75,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: { libsoup_3 libuuid json-glib + avahi libstemmer dbus ] ++ lib.optionals stdenv.isLinux [ @@ -171,7 +173,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Tracker"; + homepage = "https://tracker.gnome.org/"; description = "Desktop-neutral user information store, search tool and indexer"; mainProgram = "tracker3"; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ubus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ubus/default.nix index 2150ed7b0e..662ec1c7b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ubus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ubus/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation { buildInputs = [ libubox libjson ]; nativeBuildInputs = [ cmake ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + "-Wno-error=gnu-folding-constant" + ]); + meta = with lib; { description = "OpenWrt system message/RPC bus"; homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix index 09e10565bb..58dc82e3cb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ucc"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucc"; rev = "v${version}"; - sha256 = "sha256-7Mo9zU0sogGyDdWIfTgUPoR5Z8D722asC2y7sHnKbzs="; + sha256 = "sha256-xcJLYktkxNK2ewWRgm8zH/dMaIoI+9JexuswXi7MpAU="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ucl/default.nix index 048f35868c..d8e05e9374 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ucl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ucl/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348"; }; - # needed to successfully compile with gcc 6 - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c90"; + # needed to successfully compile with gcc 6+ and modern clang versions where + # `-Wimplicit-function-declaration` is otherwise on and errors by default + env.CFLAGS = "-std=c89"; meta = { homepage = "http://www.oberhumer.com/opensource/ucl/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/uclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uclient/default.nix index 63a31c2bfb..7206b6ad98 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uclient/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ mkg20001 ]; mainProgram = "uclient-fetch"; platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix index 35574d7c78..71a1b2a200 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "ucx"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "sha256-VxIxrk9qKM6Ncfczl4p2EhXiLNgPaYTmjhqi6/w2ZNY="; + sha256 = "sha256-dihWwGlQclfa2ke+1V5c6coqfFjjuMyI8QRzNdx33zQ="; }; outputs = [ "out" "doc" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix index 01ab983e1d..dd93f49f59 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "uriparser"; - version = "0.9.7"; + version = "0.9.8"; # Release tarball differs from source tarball src = fetchurl { url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-0n3qDItvb7l5jwfK7e8c2WpuP8XGGJWWd04Zr6fd3tc="; + hash = "sha256-ctG1Wb46GAb3iKPZvjShsGPUKqI4spuk7mM9bv/NM70="; }; nativeBuildInputs = [ cmake ]; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with lib; { + changelog = "https://github.com/uriparser/uriparser/blob/uriparser-${version}/ChangeLog"; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. diff --git a/third_party/nixpkgs/pkgs/development/libraries/ustr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ustr/default.nix deleted file mode 100644 index 598e5e7c76..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/ustr/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "ustr"; - version = "1.0.4"; - - src = fetchurl { - url = "http://www.and.org/ustr/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx"; - }; - - # Fixes bogus warnings that failed libsemanage - patches = [ ./va_args.patch ]; - - # Work around gcc5 switch to gnu11 - env.NIX_CFLAGS_COMPILE = "-std=gnu89"; - - # Fix detection of stdint.h - postPatch = '' - sed -i 's,\(have_stdint_h\)=0,\1=1,g' Makefile - sed -i 's,\(USTR_CONF_HAVE_STDINT_H\) 0,\1 1,g' ustr-import.in - ''; - - preBuild = '' - makeFlagsArray+=("prefix=$out") - makeFlagsArray+=("LDCONFIG=echo") - makeFlagsArray+=("HIDE=") - ''; - - # Remove debug libraries - postInstall = '' - find $out/lib -name \*debug\* -delete - ''; - - meta = with lib; { - homepage = "http://www.and.org/ustr/"; - description = "Micro String API for C language"; - mainProgram = "ustr-import"; - license = licenses.bsd2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix index 6386854344..4bee9d4f31 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation { pname = "ustream-ssl"; - version = "unstable-2023-11-11"; + version = "0-unstable-2024-03-26"; src = fetchgit { url = "https://git.openwrt.org/project/ustream-ssl.git"; - rev = "263b9a97cf7e1e2467319c23832b705fc01190b5"; - hash = "sha256-RLHU6swNbS3DL3QbKnwU4BbD0EFGKCrHHp0hbnoSssw="; + rev = "7621339d7694abef5da5e5353ac440f2d39dcecb"; + hash = "sha256-No0Pk8KbkT7W4Rav7W3rMKEJISbp7RRoRx7t6LPMxlk="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix index be55952fe2..89af6e847a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -22,23 +22,24 @@ , pcre2 , cairo , fribidi -, zlib +, lz4 , icu , systemd , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , nixosTests +, blackbox-terminal }: stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.74.2"; + version = "0.76.1"; outputs = [ "out" "dev" ] ++ lib.optional (gtkVersion != null) "devdoc"; src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-pTX7Kpj+qKJEnNGgLMz1GQEx3d/1LnFa/azj/rU26uc="; + hash = "sha256-CE6D73ZXdCaaSynfl8oi7cNDuaHYFDPTALjLLQh6HsI="; }; patches = [ @@ -48,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"; url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; - sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; + hash = "sha256-FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; }) ]; @@ -71,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { gnutls pango # duplicated with propagatedBuildInputs to support gtkVersion == null pcre2 - zlib + lz4 icu ] ++ lib.optionals systemdSupport [ systemd @@ -97,11 +98,11 @@ stdenv.mkDerivation (finalAttrs: { ]; # error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument] - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-Wno-unused-command-line-argument"; + env.NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.hostPlatform.isMusl "-Wno-unused-command-line-argument" + ++ lib.optional stdenv.cc.isClang "-Wno-cast-function-type-strict"); postPatch = '' patchShebangs perf/* - patchShebangs src/box_drawing_generate.sh patchShebangs src/parser-seq.py patchShebangs src/modes.py ''; @@ -118,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: { }; tests = { inherit (nixosTests.terminal-emulators) gnome-terminal lxterminal mlterm roxterm sakura stupidterm terminator termite xfce4-terminal; + blackbox-terminal = blackbox-terminal.override { sixelSupport = true; }; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index e150c87c15..a260b2b63b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.34"; + version = "1.35"; # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; - hash = "sha256-xZsnys2F9guvTuX4DfXA0Vdg6taiQysAq34uBXTcr+s="; + hash = "sha256-N6JxaigTPcgZNBxWiinSHoy3ITDlwSah/PyfQsI9las="; }; postPatch = lib.optionalString doCheck '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/waylib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/waylib/default.nix index 9aa211ffd3..d8522e1f64 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/waylib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/waylib/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , pkg-config , wayland-scanner @@ -27,6 +28,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-3IdrChuXQyQGhJ/7kTqmkV0PyuSNP53Y0Po01Fc9Qi0="; }; + patches = [ + (fetchpatch { + name = "fix-build-on-qt-6_7.patch"; + url = "https://github.com/vioken/waylib/commit/09875ebedb074089ec57e71cbc8d8011f555be70.patch"; + hash = "sha256-ulXlLxn7TOlXSl4N5mjXCy3PJhxVeyDwbwKeV9J/FSI="; + }) + ]; + postPatch = '' substituteInPlace examples/tinywl/OutputDelegate.qml \ --replace "/usr/share/wallpapers/deepin/desktop.jpg" \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index 30e2a343e2..b7887bce3e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; - # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/v0.3.1/webrtc/rtc_base/system/arch.h + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/v0.3.1/webrtc/typedefs.h # + our patches platforms = intersectLists platforms.unix (platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86); }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix index 7e9fe3fa4a..b400893067 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -53,7 +53,8 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; - platforms = platforms.unix; + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h + platforms = intersectLists platforms.unix (platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86); # BE platforms are unsupported # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/31 badPlatforms = platforms.bigEndian; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix index 1543484868..49db133382 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "wfa2-lib"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "smarco"; repo = "WFA2-lib"; rev = "v${version}"; - hash = "sha256-h4e+f+JkQr3qqaBUDly24ZvKxaEGzeJtMXejh8aD5D0="; + hash = "sha256-vTeSvhSt3PQ/BID6uM1CuXkQipgG7VViDexvAwV4nW8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix index c09ee248d2..19a8ae3d39 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, writeTextFile, cmake, alsa-lib, OpenAL, freepats }: +{ lib, stdenv, fetchFromGitHub, writeTextFile, cmake, alsa-lib, OpenAL, CoreAudioKit, freepats }: let defaultCfgPath = "${placeholder "out"}/etc/wildmidi/wildmidi.cfg"; in stdenv.mkDerivation rec { pname = "wildmidi"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "Mindwerks"; repo = "wildmidi"; rev = "${pname}-${version}"; - sha256 = "sha256-5El8aDpAgjrW0/4lphZEF+Hfv9Xr7J4DMk1b/Tb+0TU="; + sha256 = "sha256-syjs8y75M2ul7whiZxnWMSskRJd0ixFqnep7qsTbiDE="; }; nativeBuildInputs = [ cmake ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.buildPlatform.isLinux [ alsa-lib stdenv.cc.libc/*couldn't find libm*/ ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ - OpenAL + OpenAL CoreAudioKit ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 4dd884b458..f62a4661a9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -125,11 +125,13 @@ rec { }; wlroots_0_17 = generic { - version = "0.17.2"; - hash = "sha256-Of9qykyVnBURc5A2pvCMm7sLbnuuG7OPWLxodQLN2Xg="; + version = "0.17.3"; + hash = "sha256-jth6BKci3sVDC86o+gSHKyDWnibVcNmipm7nn0S6LTg="; + extraNativeBuildInputs = [ + hwdata + ]; extraBuildInputs = [ ffmpeg - hwdata libliftoff libdisplay-info ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix index 0a747c1e86..c928da147e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, wayland-scanner }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "wlr-protocols"; version = "unstable-2022-09-05"; @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.freedesktop.org/wlroots/wlr-protocols"; license = licenses.mit; # See file headers platforms = platforms.linux; - maintainers = with maintainers; [ twitchyliquid64 ]; + maintainers = with maintainers; [ Scrumplex ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 5bba7315f5..3094f253a0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -109,6 +109,8 @@ stdenv.mkDerivation rec { "--disable-monolithic" "--enable-mediactrl" "--with-nanosvg" + "--disable-rpath" + "--enable-repro-build" (if compat28 then "--enable-compat28" else "--disable-compat28") (if compat30 then "--enable-compat30" else "--disable-compat30") ] ++ lib.optional unicode "--enable-unicode" diff --git a/third_party/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix index 0483d27185..1286b5e215 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xcb-imdkit"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "fcitx"; repo = "xcb-imdkit"; rev = version; - sha256 = "sha256-trfKWCMIuYV0XyCcIsNP8LCTc0MYotXvslRvp76YnKU="; + hash = "sha256-ANU3suG62G0M5ZUWaNcwD4ot/EYSK7236zGVQZIjjuE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index 966109fa00..e28ea0da6b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "45.1"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PpyoIQRABfs3vWjr5K0Zb8PQcoNVgUZ6IqSHnax7X90="; + hash = "sha256-fo2WI+nZaonAiXYWgnzUQdzygykn048TXHIlUrEXKqE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index e44ffe1ec1..e1a5128492 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -9,7 +9,7 @@ , gnome , gnome-desktop , glib -, wrapGAppsHook +, wrapGAppsHook3 , gsettings-desktop-schemas , buildPortalsInGnome ? true }: @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index e2d12c2501..d614627a07 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , cinnamon , glib , gsettings-desktop-schemas @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index 626c40f3bb..53a0d3b617 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -20,11 +20,12 @@ , pipewire , gdk-pixbuf , librsvg +, gobject-introspection , python3 , pkg-config , stdenv , runCommand -, wrapGAppsHook +, wrapGAppsHook3 , xmlto , enableGeoLocation ? true }: @@ -69,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 xmlto ]; @@ -97,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeCheckInputs = [ + gobject-introspection python3.pkgs.pytest python3.pkgs.python-dbusmock python3.pkgs.pygobject3 diff --git a/third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix index 6be958d7d2..c9e4c5874a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix @@ -1,12 +1,24 @@ -{ lib, stdenv, fetchurl, xalanc, xercesc, openssl, pkg-config }: +{ + lib, + stdenv, + fetchurl, + pkg-config, + xalanc, + xercesc, + openssl, + darwin, +}: -stdenv.mkDerivation rec { +let + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration; +in +stdenv.mkDerivation (finalAttrs: { pname = "xml-security-c"; version = "2.0.4"; src = fetchurl { - url = "mirror://apache/santuario/c-library/${pname}-${version}.tar.gz"; - sha256 = "sha256-p42mcg9sK6FBANJCYTHg0z6sWi26XMEb3QSXS364kAM="; + url = "mirror://apache/santuario/c-library/xml-security-c-${finalAttrs.version}.tar.gz"; + hash = "sha256-p42mcg9sK6FBANJCYTHg0z6sWi26XMEb3QSXS364kAM="; }; configureFlags = [ @@ -16,7 +28,18 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xalanc xercesc openssl ]; + + buildInputs = + [ + xalanc + xercesc + openssl + ] + ++ lib.optionals stdenv.isDarwin [ + CoreFoundation + CoreServices + SystemConfiguration + ]; meta = { homepage = "https://santuario.apache.org/"; @@ -25,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.jagajaga ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/yyjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/yyjson/default.nix index 60a937b521..e1d42ccce7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/yyjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/yyjson/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ibireme/yyjson"; changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ federicoschonborn ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; }; }) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/.gitattributes b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/.gitattributes deleted file mode 100644 index d885ece18a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -imported.nix linguist-vendored diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/.gitignore b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/.gitignore deleted file mode 100644 index 7936f6a73a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -result -*.sqlite -*.fasl diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/api.md b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/api.md deleted file mode 100644 index f5aed70de7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/api.md +++ /dev/null @@ -1,197 +0,0 @@ -## The API - -This page documents the Nix API of nix-cl. - -## Overview - -The core API functions are `build-asdf-system` and -`lispWithPackagesInternal`. - -They are considered more low-level that the rest of the API, which -builds on top of them to provide a more convenient interface with sane -defaults. - -The higher-level API provides a lot of pre-configured packages, -including all of Quicklisp, and consists of the functions: - -- `lispPackagesFor` -- `lispWithPackages` - -Finally, there are functions that provide pre-defined Lisps, for -people who don't need to customize that: - -- `abclPackages`, `eclPackages`, `cclPackages`, `claspPackages`, `sbclPackages` -- `abclWithPackages`, `eclWithPackages`, `cclWithPackages`, `claspWithPackages`, `sbclWithPackages` - -The following is an attempt to document all of this. - -## Packaging systems - `build-asdf-system` - -Packages are declared using `build-asdf-system`. This function takes -the following arguments and returns a `derivation`. - -#### Required arguments - -##### `pname` -Name of the package/library - -##### `version` -Version of the package/library - -##### `src` -Source of the package/library (`fetchzip`, `fetchgit`, `fetchhg` etc.) - -##### `lisp` -This command must load the provided file (`$buildScript`) then exit -immediately. For example, SBCL's --script flag does just that. - -#### Optional arguments - -##### `patches ? []` - -Patches to apply to the source code before compiling it. This is a -list of files. - -##### `nativeLibs ? []` - -Native libraries, will be appended to the library -path. (`pkgs.openssl` etc.) - -##### `javaLibs ? []` - -Java libraries for ABCL, will be appended to the class path. - -##### `lispLibs ? []` - -Lisp dependencies These must themselves be packages built with -`build-asdf-system` - -##### `systems ? [ pname ]` - -Some libraries have multiple systems under one project, for example, -[cffi] has `cffi-grovel`, `cffi-toolchain` etc. By default, only the -`pname` system is build. - -`.asd's` not listed in `systems` are removed before saving the library -to the Nix store. This prevents ASDF from referring to uncompiled -systems on run time. - -Also useful when the `pname` is different than the system name, such -as when using [reverse domain naming]. (see `jzon` -> -`com.inuoe.jzon`) - -[cffi]: https://cffi.common-lisp.dev/ -[reverse domain naming]: https://en.wikipedia.org/wiki/Reverse_domain_name_notation - -##### `asds ? systems` - -The .asd files that this package provides. By default, same as -`systems`. - -#### Return value - -A `derivation` that, when built, contains the sources and pre-compiled -FASL files (Lisp implementation dependent) alongside any other -artifacts generated during compilation. - -#### Example - -[bordeaux-threads.nix] contains a simple example of packaging -`alexandria` and `bordeaux-threads`. - -[bordeaux-threads.nix]: /examples/bordeaux-threads.nix - -## Building a Lisp with packages: `lispWithPackagesInternal` - -Generators of Lisps configured to be able to `asdf:load-system` -pre-compiled libraries on run-time are built with -`lispWithPackagesInternal`. - -#### Required Arguments - -##### `clpkgs` - -An attribute set of `derivation`s returned by `build-asdf-system` - -#### Return value - -`lispWithPackagesInternal` returns a function that takes one argument: -a function `(lambda (clpkgs) packages)`, that, given a set of -packages, returns a list of package `derivation`s to be included in -the closure. - -#### Example - -The [sbcl-with-bt.nix] example creates a runnable Lisp where the -`bordeaux-threads` defined in the previous section is precompiled and -loadable via `asdf:load-system`: - -[sbcl-with-bt.nix]: /examples/sbcl-with-bt.nix - -## Reusing pre-packaged Lisp libraries: `lispPackagesFor` - -`lispPackagesFor` is a higher level version of -`lispPackagesForInternal`: it only takes one argument - a Lisp command -to use for compiling packages. It then provides a bunch of ready to -use packages. - -#### Required Arguments - -##### `lisp` - -The Lisp command to use in calls to `build-asdf-system` while building -the library-provided Lisp package declarations. - -#### Return value - -A set of packages built with `build-asdf-system`. - -#### Example - -The [abcl-package-set.nix] example generates a set of thousands of packages for ABCL. - -[abcl-package-set.nix]: /examples/abcl-package-set.nix - -## Reusing pre-packaged Lisp libraries, part 2: `lispWithPackages` - -This is simply a helper function to avoid having to call -`lispPackagesFor` if all you want is a Lisp-with-packages wrapper. - -#### Required Arguments - -##### `lisp` - -The Lisp command to pass to `lispPackagesFor` in order for it to -generate a package set. That set is then passed to -`lispWithPackagesInternal`. - -#### Return value - -A Lisp-with-packages function (see sections above). - -#### Example - -The [abcl-with-packages.nix] example creates an `abclWithPackages` function. - -[abcl-with-packages.nix]: /examples/abcl-with-packages.nix - -## Using the default Lisp implementations - -This is the easiest way to get going with `nix-cl` in general. Choose -the CL implementation of interest and a set of libraries, and get a -lisp-with-packages wrapper with those libraries pre-compiled. - -#### `abclPackages`, `eclPackages`, `cclPackages`, `claspPackages`, `sbclPackages` - -Ready to use package sets. - -#### `abclWithPackages`, `eclWithPackages`, `cclWithPackages`, `claspWithPackages`, `sbclWithPackages` - -Ready to use wrapper generators. - -#### Example - -For example, to open a shell with SBCL + hunchentoot + sqlite in PATH: -``` -nix-shell -p 'with import ./. {}; sbclWithPackages (ps: [ ps.hunchentoot ps.sqlite ])' -``` diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/nix-cl.md b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/nix-cl.md deleted file mode 100644 index eb84ed4377..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/nix-cl.md +++ /dev/null @@ -1,98 +0,0 @@ -## Use cases - -This page lists some possible use cases for nix-cl. - -## Pinning down the exact commits of libraries - -Sometimes, a bug is fixed upstream but is not yet available in package -repositories such as Quicklisp or Ultralisp. The users have to wait -for the repository maintainer to update it, or download and compile -the patched sources themselves. - -This is a manual and hard to reproduce process. By leveraging Nix, -users of `nix-cl` can essentially "run their own package repository", -written as Nix code, with all the benefits of that (shareability, -cacheability, reproducibility, version-controllable etc.) - - -## Modifying libraries with patches - -Other times, a bug in a library is not fixed upstream, but you fixed -it yourself. Or, you would like a change to the internals that the -maintainers don't like. - -Sure, you could fork the code or maintain patches manually, but that -becomes hard to manage with a lot of patches. It also doesn't have the -benefits mentioned in the previous section. - -`nix-cl` provides a way of applying version-controlled patches to any -package. - - -## Using libraries not available in repositories - -There are useful and working libraries out there, that are nonetheless -unavailable to users of package managers such as Quicklisp or -Ultralisp. Two real-world examples are [jzon] and [cl-tar]. - -`nix-cl` is not tied to any particular package source: instead, -packages are written as a Nix expression, which can be done manually -or generated/imported. - -This frees the user to have any package they want, and not be -constrained by a central repository. - -## Reproducible environments - -The usual way to develop a project involves several steps, such as: - -1. Installing a Lisp implementation -2. Installing a package manager -3. Installing the chosen libraries - -This is not necessarily reproducible. It's unlikely to come back a -year later and develop the project using the exact same versions of -the dependencies. - -Things can break between attempts at different points in time. The -repository could have updated versions in the meantime. The source -tarballs could become unreachable. - -With `nix-cl` you can have your own binary cache for Lisp libraries -and not be affected by downtime of other central repositories. - -## Testing across CL implementations - -One can manually download different Lisp implementations and run tests -of a package. This works well in most cases, but it is limited in how -you can tweak the software. Some practical examples are: - -- Statically compiling [zlib] into [SBCL] -- Building SBCL with the `--fancy` flag -- Compiling [ECL] as a static library - -These are usually hard to do manually, unless you have the necessary -compilers already configured. These combinations are usually not -available from package managers as well. - -With Nix it's easier, because it will set up the build environment -automatically. It could be useful to, for example: - -- Test against all possible compiler flag combinations -- Libc versions (ECL) -- JDK versions ([ABCL]) - -[zlib]: https://zlib.net -[SBCL]: https://sbcl.org -[ECL]: https://ecl.common-lisp.dev/ -[Ultralisp]: https://ultralisp.org/ -[jzon]: https://github.com/Zulu-Inuoe/jzon -[cl-tar]: https://gitlab.common-lisp.net/cl-tar/cl-tar -[bootstrap tools]: https://github.com/NixOS/nixpkgs/tree/master/pkgs/stdenv/linux/bootstrap-files -[nixpkgs]: https://github.com/NixOS/nixpkgs - -## Windows note - -Note that all of this still only applies to Unix systems - primarily because Nix doesn't work on Windows. - -If you have an idea how to port some of the functionality to Windows, get in touch. diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/quicklisp.md b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/quicklisp.md deleted file mode 100644 index 964cacec9b..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/quicklisp.md +++ /dev/null @@ -1,54 +0,0 @@ -## Importing package definitions from Quicklisp - -This page documents how to import packages from Quicklisp. - -## Nix dumper - -Run: - -``` -$ nix-shell -$ sbcl --script ql-import.lisp -``` - -This command runs a program that dumps a `imported.nix` file -containing Nix expressions for all packages in Quicklisp. They will be -automatically picked up by the `lispPackagesFor` and -`lispWithPackages` API functions. - -It also creates a 'packages.sqlite' file. It's used during the -generation of the 'imported.nix' file and can be safely removed. It -contains the full information of Quicklisp packages, so you can use it -to query the dependency graphs using SQL, if you're interested. - -## Tarball hashes - -The Nix dumper program will re-use hashes from "imported.nix" if it -detects that it's being run for the first time. This saves a lot of -bandwidth by not having to download each tarball again. - -But when upgrading the Quicklisp release URL, this can take a while -because it needs to fetch the source code of each new system to -compute its SHA256 hash. This is because Quicklisp only provides a -SHA1 , and Nix's `builtins.fetchTarball` requires a SHA256. - -Later on, the hashes are cached in `packages.sqlite`, and are reused -in subsequent invocations. Therefore you might want to keep the -'packages.sqlite' file around if you'd like to keep hashes of -historical Quicklisp tarballs, for example for archival purposes. - -## Choosing a Quicklisp release - -Quicklisp release url's are currently hard-coded and can be changed -directly in the source code. See the `import` directory. - -## Native and Java libraries - -At the moment, native and Java libraries need to be added manually to -imported systems in `ql.nix` on an as-needed basis. - -## Dependencies from packages.nix - -Also worth noting is that systems imported from Quicklisp will prefer -packages from `packages.nix` as dependencies, so that custom versions -can be provided or broken versions replaced. diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/quirks.md b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/quirks.md deleted file mode 100644 index 4e6e383d0a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/doc/quirks.md +++ /dev/null @@ -1,5 +0,0 @@ -## Quirks - -- `+` in names are converted to `_plus{_,}`: `cl+ssl`->`cl_plus_ssl`, `alexandria+`->`alexandria_plus` -- `.` to `_dot_`: `iolib.base`->`iolib_dot_base` -- names starting with a number have a `_` prepended (`3d-vectors`->`_3d-vectors`) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/abcl-package-set.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/abcl-package-set.nix deleted file mode 100644 index ffb93e6ba1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/abcl-package-set.nix +++ /dev/null @@ -1,24 +0,0 @@ -# To run this example from a nix repl, run: -# $ nix repl -# nix-repl> abcl-packages = import ./abcl-package-set.nix -# nix-repl> builtins.attrNames abcl-packages -# nix-repl> builtins.length (builtins.attrNames abcl-packages) -# -# The import returns a package set, which you can use for example to -# discover what packages are available in lispWithPackages: -# -# nix-repl> abcl-packages.cl-op -# nix-repl> abcl-packages.cl-opengl -# nix-repl> # cool, we can use cl-opengl -# nix-repl> # some-abcl-with-packages (p: [ p.cl-opengl ]) - - -let - - pkgs = import ../../../../default.nix {}; - - abcl = "${pkgs.abcl}/bin/abcl --batch --load"; - - abcl-packages = pkgs.lispPackages_new.lispPackagesFor abcl; - -in abcl-packages diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/abcl-with-packages.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/abcl-with-packages.nix deleted file mode 100644 index d93bcbd669..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/abcl-with-packages.nix +++ /dev/null @@ -1,23 +0,0 @@ -# To run this example from a nix repl, run: -# $ nix repl -# nix-repl> abcl-with-packages = import ./abcl-with-packages.nix -# nix-repl> :b abcl-with-packages (p: [ p.cffi ]) -# -# The import returns a function, which you can call to get access to -# thousands of libraries, like, cffi. This works in ABCL by closing -# over the JNA dependency: -# -# nix-repl> awp = abcl-with-packages (p: [ p.cffi ]) -# nix-repl> awp.CLASSPATH -# nix-repl> cffi = builtins.head (awp.lispLibs) -# nix-repl> cffi.javaLibs - -let - - pkgs = import ../../../../default.nix {}; - - abcl = "${pkgs.abcl}/bin/abcl --batch --load"; - - abcl-with-packages = pkgs.lispPackages_new.lispWithPackages abcl; - -in abcl-with-packages diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/bordeaux-threads.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/bordeaux-threads.nix deleted file mode 100644 index 31a53b0f94..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/bordeaux-threads.nix +++ /dev/null @@ -1,43 +0,0 @@ -# To run this example from the command line, run this command: -# -# $ nix-build ./bordeaux-threads.nix -# $ ls ./result/ -# -# To run from a nix repl, run: -# $ nix repl -# nix-repl> bt = import ./bordeaux-threads.nix -# nix-repl> :b bt -# -# In the `result` directory you can find .fasl files of the -# bordeaux-threads library: -# -# $ ls -l ./result/src/ - -let - - pkgs = import ../../../../default.nix {}; - - sbcl = "${pkgs.sbcl}/bin/sbcl --script"; - - alexandria = pkgs.lispPackages_new.build-asdf-system { - pname = "alexandria"; - version = "v1.4"; - src = pkgs.fetchzip { - url = "https://gitlab.common-lisp.net/alexandria/alexandria/-/archive/v1.4/alexandria-v1.4.tar.gz"; - sha256 = "0r1adhvf98h0104vq14q7y99h0hsa8wqwqw92h7ghrjxmsvz2z6l"; - }; - lisp = sbcl; - }; - - bordeaux-threads = pkgs.lispPackages_new.build-asdf-system { - pname = "bordeaux-threads"; - version = "0.8.8"; - src = pkgs.fetchzip { - url = "https://github.com/sionescu/bordeaux-threads/archive/v0.8.8.tar.gz"; - sha256 = "19i443fz3488v1pbbr9x24y8h8vlyhny9vj6c9jk5prm702awrp6"; - }; - lisp = sbcl; - lispLibs = [ alexandria ]; - }; - -in bordeaux-threads diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/sbcl-with-bt.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/sbcl-with-bt.nix deleted file mode 100644 index c817a6838d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/sbcl-with-bt.nix +++ /dev/null @@ -1,31 +0,0 @@ -# To run this example from the command line, run this command: -# $ nix-build ./sbcl-with-bt.nix -# $ ls ./result/ -# -# To run from a nix repl, run: -# $ nix repl -# nix-repl> sbcl-bt = import ./sbcl-with-bt.nix -# nix-repl> :b sbcl-bt -# -# In the `result/bin` directory you can find an `sbcl` executable -# that, when started, is able to load the pre-compiled -# bordeaux-threads from the Nix store: -# $ ./result/bin/sbcl -# * (require :asdf) -# * (asdf:load-system :bordeaux-threads) - -let - - pkgs = import ../../../../default.nix {}; - - sbcl = "${pkgs.sbcl}/bin/sbcl --script"; - - bordeaux-threads = import ./bordeaux-threads.nix; - - sbclPackages = { inherit bordeaux-threads; }; - - sbclWithPackages = pkgs.lispPackages_new.lispWithPackagesInternal sbclPackages; - - sbcl-bt = sbclWithPackages (p: [ p.bordeaux-threads ]); - -in sbcl-bt diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/api.lisp b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/api.lisp deleted file mode 100644 index ea5f3bcc19..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/api.lisp +++ /dev/null @@ -1,18 +0,0 @@ -(defpackage org.lispbuilds.nix/api - (:documentation "Public interface of org.lispbuilds.nix") - (:use :cl) - (:export - :import-lisp-packages - :database->nix-expression)) - -(in-package org.lispbuilds.nix/api) - -(defgeneric import-lisp-packages (repository database) - (:documentation - "Import Lisp packages (ASDF systems) from repository (Quicklisp, - Ultralisp etc.) into a package database.")) - -(defgeneric database->nix-expression (database outfile) - (:documentation - "Generate a nix expression from the package database and write it - into outfile.")) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/database/sqlite.lisp b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/database/sqlite.lisp deleted file mode 100644 index 0fd0807fc6..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/database/sqlite.lisp +++ /dev/null @@ -1,162 +0,0 @@ -(defpackage org.lispbuilds.nix/database/sqlite - (:use :cl) - (:import-from :str) - (:import-from :sqlite) - (:import-from :alexandria :read-file-into-string) - (:import-from :arrow-macros :->>) - (:import-from - :org.lispbuilds.nix/util - :replace-regexes) - (:import-from - :org.lispbuilds.nix/nix - :nix-eval - :system-master - :nixify-symbol - :make-pname - :*nix-attrs-depth*) - (:import-from - :org.lispbuilds.nix/api - :database->nix-expression) - (:export :sqlite-database :init-db) - (:local-nicknames - (:json :com.inuoe.jzon))) - -(in-package org.lispbuilds.nix/database/sqlite) - -(defclass sqlite-database () - ((url :initarg :url - :reader database-url - :initform (error "url required")) - (init-file :initarg :init-file - :reader init-file - :initform (error "init file required")))) - -(defun init-db (db init-file) - (let ((statements (->> (read-file-into-string init-file) - (replace-regexes '(".*--.*") '("")) - (substitute #\Space #\Newline) - (str:collapse-whitespaces) - (str:split #\;) - (mapcar #'str:trim) - (remove-if #'str:emptyp)))) - (sqlite:with-transaction db - (dolist (s statements) - (sqlite:execute-non-query db s))))) - - -;; Writing Nix - -(defparameter prelude " -# This file was auto-generated by nix-quicklisp.lisp - -{ runCommand, fetchzip, pkgs, ... }: - -# Ensures that every non-slashy `system` exists in a unique .asd file. -# (Think cl-async-base being declared in cl-async.asd upstream) -# -# This is required because we're building and loading a system called -# `system`, not `asd`, so otherwise `system` would not be loadable -# without building and loading `asd` first. -# -let createAsd = { url, sha256, asd, system }: - let - src = fetchzip { inherit url sha256; }; - in runCommand \"source\" {} '' - mkdir -pv $out - cp -r ${src}/* $out - find $out -name \"${asd}.asd\" | while read f; do mv -fv $f $(dirname $f)/${system}.asd || true; done - ''; - -getAttr = builtins.getAttr; - -in {") - -;; Random compilation errors -(defparameter +broken-packages+ - (list - ;; no dispatch function defined for #\t - "hu.dwim.logger" - "hu.dwim.serializer" - "hu.dwim.quasi-quote" - ;; Tries to write in $HOME - "ubiquitous" - "math" - ;; Upstream bad packaging, multiple systems in clml.blas.asd - "clml.blas.hompack" - ;; Fails on SBCL due to heap exhaustion - "magicl" - ;; Probably missing dependency in QL data - "mcclim-bezier" - ;; Missing dependency on c2ffi cffi extension - "hu.dwim.zlib" - ;; Missing libgvc.so native library - "hu.dwim.graphviz" - ;; These require libRmath.so, but I don't know where to get it from - "cl-random" - "cl-random-tests" - )) - -(defmethod database->nix-expression ((database sqlite-database) outfile) - (sqlite:with-open-database (db (database-url database)) - (with-open-file (f outfile - :direction :output - :if-exists :supersede) - - ;; Fix known problematic packages before dumping the nix file. - (sqlite:execute-non-query db - "create temp table fixed_systems as select * from system_view") - - (sqlite:execute-non-query db - "alter table fixed_systems add column systems") - - (sqlite:execute-non-query db - "update fixed_systems set systems = json_array(name)") - - (sqlite:execute-non-query db - "alter table fixed_systems add column asds") - - (sqlite:execute-non-query db - "update fixed_systems set asds = json_array(name)") - - (format f prelude) - - (dolist (p (sqlite:execute-to-list db "select * from fixed_systems")) - (destructuring-bind (name version asd url sha256 deps systems asds) p - (format f "~% ") - (let ((*nix-attrs-depth* 1)) - (format - f - "~a = ~a;" - (nix-eval `(:symbol ,name)) - (nix-eval - `(:attrs - ("pname" (:string ,(make-pname name))) - ("version" (:string ,version)) - ("asds" (:list - ,@(mapcar (lambda (asd) - `(:string ,(system-master asd))) - (coerce (json:parse asds) 'list)))) - ("src" (:funcall - "createAsd" - (:attrs - ("url" (:string ,url)) - ("sha256" (:string ,sha256)) - ("system" (:string ,(system-master name))) - ("asd" (:string ,asd))))) - ("systems" (:list - ,@(mapcar (lambda (sys) - `(:string ,sys)) - (coerce (json:parse systems) 'list)))) - ("lispLibs" (:list - ,@(mapcar (lambda (dep) - `(:funcall - "getAttr" - (:string ,(nixify-symbol dep)) - (:symbol "pkgs"))) - (remove "asdf" - (str:split-omit-nulls #\, deps) - :test #'string=)))) - ,@(when (or (find #\/ name) - (find name +broken-packages+ :test #'string=)) - '(("meta" (:attrs ("broken" (:symbol "true")))))))))))) - (format f "~%}~%")))) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/init.sql b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/init.sql deleted file mode 100644 index 872d51d598..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/init.sql +++ /dev/null @@ -1,41 +0,0 @@ -CREATE TABLE IF NOT EXISTS sha256 ( - id integer PRIMARY KEY AUTOINCREMENT, - url text UNIQUE, - hash text NOT NULL, - created real DEFAULT (julianday('now')) -); - -CREATE TABLE IF NOT EXISTS system ( - id integer PRIMARY KEY AUTOINCREMENT, - name text NOT NULL, - version text NOT NULL, - asd text NOT NULL, - created real DEFAULT (julianday('now')), - UNIQUE(name, version) -); - -CREATE TABLE IF NOT EXISTS dep ( - system_id integer NOT NULL REFERENCES system(id), - dep_id integer NOT NULL REFERENCES system(id), - PRIMARY KEY (system_id, dep_id) -); - -CREATE TABLE IF NOT EXISTS src ( - sha256_id integer REFERENCES sha256(id), - system_id integer UNIQUE REFERENCES system(id) -); - -DROP VIEW IF EXISTS system_view; -CREATE VIEW IF NOT EXISTS system_view AS - SELECT - sys.name, - sys.version, - sys.asd, - sha.url, - sha.hash, - group_concat((SELECT name FROM system WHERE id = dep.dep_id)) as deps - FROM system sys - JOIN src ON src.system_id = sys.id - JOIN sha256 sha ON sha.id = src.sha256_id - LEFT JOIN dep ON dep.system_id = sys.id - GROUP BY sys.name; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/main.lisp b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/main.lisp deleted file mode 100644 index c36db3731c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/main.lisp +++ /dev/null @@ -1,40 +0,0 @@ -(defpackage org.lispbuilds.nix/main - (:use :common-lisp - :org.lispbuilds.nix/database/sqlite - :org.lispbuilds.nix/repository/quicklisp - :org.lispbuilds.nix/api)) - -(in-package org.lispbuilds.nix/main) - -(defun resource (name type) - (make-pathname - :defaults (asdf:system-source-directory :org.lispbuilds.nix) - :name name - :type type)) - -(defvar *sqlite* - (make-instance - 'sqlite-database - :init-file (resource "init" "sql") - :url "packages.sqlite")) - -(defvar *quicklisp* - (make-instance - 'quicklisp-repository - :dist-url - "https://beta.quicklisp.org/dist/quicklisp/2022-11-07/")) - -(defun run-importers () - (import-lisp-packages *quicklisp* *sqlite*) - (format t "Imported packages from quicklisp to ~A~%" - (truename "packages.sqlite"))) - -(defun gen-nix-file () - (database->nix-expression *sqlite* "imported.nix") - (format t "Dumped nix file to ~a~%" - (truename "imported.nix"))) - -(defun main () - (format t "~%") - (run-importers) - (gen-nix-file)) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/nix.lisp b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/nix.lisp deleted file mode 100644 index c6de5a4c99..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/nix.lisp +++ /dev/null @@ -1,81 +0,0 @@ -(defpackage org.lispbuilds.nix/nix - (:documentation "Utilities for generating Nix code") - (:use :cl) - (:import-from :str) - (:import-from :ppcre) - (:import-from :arrow-macros :->>) - (:import-from :org.lispbuilds.nix/util :replace-regexes) - (:export - :nix-eval - :system-master - :nixify-symbol - :make-pname - :*nix-attrs-depth*)) - -(in-package org.lispbuilds.nix/nix) - -;; Path names are alphanumeric and can include the symbols +-._?= and -;; must not begin with a period. -(defun make-pname (string) - (replace-regexes '("^[.]" "[^a-zA-Z0-9+-._?=]") - '("_" "_") - string)) - -(defun system-master (system) - (first (str:split "/" system))) - -;;;; Nix generation - -(defun nix-eval (exp) - (assert (consp exp)) - (ecase (car exp) - (:string (nix-string (cadr exp))) - (:list (apply #'nix-list (rest exp))) - (:funcall (apply #'nix-funcall (rest exp))) - (:attrs (nix-attrs (cdr exp))) - (:merge (apply #'nix-merge (cdr exp))) - (:symbol (nix-symbol (cadr exp))))) - -(defun nix-string (object) - (format nil "\"~a\"" object)) - -(defun nixify-symbol (string) - (flet ((fix-special-chars (str) - (replace-regexes '("[+]$" "[+][/]" "[+]" "[.]" "[/]") - '("_plus" "_plus/" "_plus_" "_dot_" "_slash_") - str))) - (if (ppcre:scan "^[0-9]" string) - (str:concat "_" (fix-special-chars string)) - (fix-special-chars string)))) - - -(defun nix-symbol (object) - (nixify-symbol (format nil "~a" object))) - -(defun nix-list (&rest things) - (format nil "[ ~{~A~^ ~} ]" (mapcar 'nix-eval things))) -(defvar *nix-attrs-depth* 0) - -(defun nix-attrs (keyvals) - (let ((*nix-attrs-depth* (1+ *nix-attrs-depth*))) - (format - nil - (->> "{~%*depth*~{~{~A = ~A;~}~^~%*depth*~}~%*depth-1*}" - (str:replace-all "*depth*" (str:repeat *nix-attrs-depth* " ")) - (str:replace-all "*depth-1*" (str:repeat (1- *nix-attrs-depth*) " "))) - (mapcar (lambda (keyval) - (let ((key (car keyval)) - (val (cadr keyval))) - (list (nix-symbol key) - (nix-eval val)))) - keyvals)))) - -(defun nix-funcall (fun &rest args) - (format nil "(~a ~{~a~^ ~})" - (nixify-symbol fun) - (mapcar 'nix-eval args))) - -(defun nix-merge (a b) - (format nil "(~a // ~b)" - (nix-eval a) - (nix-eval b))) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/org.lispbuilds.nix.asd b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/org.lispbuilds.nix.asd deleted file mode 100644 index 1a67452312..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/org.lispbuilds.nix.asd +++ /dev/null @@ -1,24 +0,0 @@ -(defsystem org.lispbuilds.nix - :class :package-inferred-system - :description "Utilities for importing ASDF systems into Nix" - :depends-on ( - :alexandria - :str - :cl-ppcre - :sqlite - :dexador - :arrow-macros - :com.inuoe.jzon - :org.lispbuilds.nix/api - :org.lispbuilds.nix/repository/quicklisp - :org.lispbuilds.nix/database/sqlite - )) - - -(register-system-packages - "cl-ppcre" - '(:ppcre)) - -(register-system-packages - "dexador" - '(:dex)) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/repository/quicklisp.lisp b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/repository/quicklisp.lisp deleted file mode 100644 index 3a45e06c3a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/repository/quicklisp.lisp +++ /dev/null @@ -1,199 +0,0 @@ -(defpackage org.lispbuilds.nix/repository/quicklisp - (:use :cl) - (:import-from :dex) - (:import-from :alexandria :read-file-into-string :ensure-list) - (:import-from :arrow-macros :->>) - (:import-from :str) - (:import-from - :org.lispbuilds.nix/database/sqlite - :sqlite-database - :init-db - :database-url - :init-file) - (:import-from - :org.lispbuilds.nix/api - :import-lisp-packages) - (:import-from - :org.lispbuilds.nix/util - :replace-regexes) - (:export :quicklisp-repository) - (:local-nicknames - (:json :com.inuoe.jzon))) - -(in-package org.lispbuilds.nix/repository/quicklisp) - -(defclass quicklisp-repository () - ((dist-url :initarg :dist-url - :reader dist-url - :initform (error "dist url required")))) - -(defun clear-line () - (write-char #\Return *error-output*) - (write-char #\Escape *error-output*) - (write-char #\[ *error-output*) - (write-char #\K *error-output*)) - -(defun status (&rest format-args) - (clear-line) - (apply #'format (list* *error-output* format-args)) - (force-output *error-output*)) - -;; TODO: This should not know about the imported.nix file. -(defun init-tarball-hashes (database) - (status "no packages.sqlite - will pre-fill tarball hashes from ~A to save time~%" - (truename "imported.nix")) - (let* ((lines (uiop:read-file-lines "imported.nix")) - (lines (remove-if-not - (lambda (line) - (let ((trimmed (str:trim-left line))) - (or (str:starts-with-p "url = " trimmed) - (str:starts-with-p "sha256 = " trimmed)))) - lines)) - (lines (mapcar - (lambda (line) - (multiple-value-bind (whole groups) - (ppcre:scan-to-strings "\"\(.*\)\"" line) - (declare (ignore whole)) - (svref groups 0))) - lines))) - (sqlite:with-open-database (db (database-url database)) - (init-db db (init-file database)) - (sqlite:with-transaction db - (loop while lines do - (sqlite:execute-non-query db - "insert or ignore into sha256(url,hash) values (?,?)" - (prog1 (first lines) (setf lines (rest lines))) - (prog1 (first lines) (setf lines (rest lines)))))) - (status "OK, imported ~A hashes into DB.~%" - (sqlite:execute-single db - "select count(*) from sha256"))))) - -(defmethod import-lisp-packages ((repository quicklisp-repository) - (database sqlite-database)) - - ;; If packages.sqlite is missing, we should populate the sha256 - ;; table to speed things up. - (unless (probe-file (database-url database)) - (init-tarball-hashes database)) - - (let* ((db (sqlite:connect (database-url database))) - (systems-url (str:concat (dist-url repository) "systems.txt")) - (releases-url (str:concat (dist-url repository) "releases.txt")) - (systems-lines (rest (butlast (str:split #\Newline (dex:get systems-url))))) - (releases-lines (rest (butlast (str:split #\Newline (dex:get releases-url)))))) - - (flet ((sql-query (sql &rest params) - (apply #'sqlite:execute-to-list (list* db sql params)))) - - ;; Ensure database schema - (init-db db (init-file database)) - - ;; Prepare temporary tables for efficient access - (sql-query "create temp table if not exists quicklisp_system - (project, asd, name unique, deps)") - - (sql-query "create temp table if not exists quicklisp_release - (project unique, url, size, md5, sha1, prefix not null, asds)") - - (sqlite:with-transaction db - (dolist (line systems-lines) - (destructuring-bind (project asd name &rest deps) - (str:words line) - (sql-query - "insert or ignore into quicklisp_system values(?,?,?,?)" - project asd name (json:stringify (coerce deps 'vector)))))) - - (sqlite:with-transaction db - (dolist (line releases-lines) - (destructuring-bind (project url size md5 sha1 prefix &rest asds) - (str:words line) - (sql-query - "insert or ignore into quicklisp_release values(?,?,?,?,?,?,?)" - project url size md5 sha1 prefix (json:stringify (coerce - asds - 'vector)))))) - - (sqlite:with-transaction db - ;; Should these be temp tables, that then get queried by - ;; system name? This looks like it uses a lot of memory. - (let ((systems - (sql-query - "with pkg as ( - select - name, asd, url, deps, - ltrim(replace(prefix, r.project, ''), '-_') as version - from quicklisp_system s, quicklisp_release r - where s.project = r.project - ) - select - name, version, asd, url, - (select json_group_array( - json_array(value, (select version from pkg where name=value)) - ) - from json_each(deps)) as deps - from pkg" - ))) - - ;; First pass: insert system and source tarball informaton. - ;; Can't insert dependency information, because this works - ;; on system ids in the database and they don't exist - ;; yet. Could it be better to just base dependencies on - ;; names? But then ACID is lost. - (dolist (system systems) - (destructuring-bind (name version asd url deps) system - (declare (ignore deps)) - (status "importing system '~a-~a'" name version) - (let ((hash (nix-prefetch-tarball url db))) - (sql-query - "insert or ignore into system(name,version,asd) values (?,?,?)" - name version asd) - (sql-query - "insert or ignore into sha256(url,hash) values (?,?)" - url hash) - (sql-query - "insert or ignore into src values - ((select id from sha256 where url=?), - (select id from system where name=? and version=?))" - url name version)))) - - ;; Second pass: connect the in-database systems with - ;; dependency information - (dolist (system systems) - (destructuring-bind (name version asd url deps) system - (declare (ignore asd url)) - (dolist (dep (coerce (json:parse deps) 'list)) - (destructuring-bind (dep-name dep-version) (coerce dep 'list) - (if (eql dep-version 'NULL) - (warn "Bad data in Quicklisp: ~a has no version" dep-name) - (sql-query - "insert or ignore into dep values - ((select id from system where name=? and version=?), - (select id from system where name=? and version=?))" - name version - dep-name dep-version)))))))))) - - (write-char #\Newline *error-output*)) - -(defun shell-command-to-string (cmd) - ;; Clearing the library path is needed to prevent a bug, where the - ;; called subprocess uses a different glibc than the SBCL process - ;; is. In that case, the call to execve attempts to load the - ;; libraries used by SBCL from LD_LIBRARY_PATH using a different - ;; glibc than they expect, which errors out. - (let ((ld-library-path (uiop:getenv "LD_LIBRARY_PATH"))) - (setf (uiop:getenv "LD_LIBRARY_PATH") "") - (unwind-protect - (uiop:run-program cmd :output '(:string :stripped t)) - (setf (uiop:getenv "LD_LIBRARY_PATH") ld-library-path)))) - -(defun nix-prefetch-tarball (url db) - (restart-case - (compute-sha256 url db) - (try-again () - :report "Try downloading again" - (nix-prefetch-tarball url db)))) - -(defun compute-sha256 (url db) - (or (sqlite:execute-single db "select hash from sha256 where url=?" url) - (let ((sha256 (shell-command-to-string (str:concat "nix-prefetch-url --unpack " url)))) - sha256))) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/util.lisp b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/util.lisp deleted file mode 100644 index 043276305e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/import/util.lisp +++ /dev/null @@ -1,16 +0,0 @@ -(defpackage org.lispbuilds.nix/util - (:use :cl) - (:import-from :ppcre) - (:export - :replace-regexes)) - -(in-package org.lispbuilds.nix/util) - -(defun replace-regexes (from to str) - (assert (= (length from) (length to))) - (if (null from) - str - (replace-regexes - (rest from) - (rest to) - (ppcre:regex-replace-all (first from) str (first to))))) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/imported.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/imported.nix deleted file mode 100644 index a592eb8450..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/imported.nix +++ /dev/null @@ -1,72088 +0,0 @@ - -# This file was auto-generated by nix-quicklisp.lisp - -{ runCommand, fetchzip, pkgs, ... }: - -# Ensures that every non-slashy `system` exists in a unique .asd file. -# (Think cl-async-base being declared in cl-async.asd upstream) -# -# This is required because we're building and loading a system called -# `system`, not `asd`, so otherwise `system` would not be loadable -# without building and loading `asd` first. -# -let createAsd = { url, sha256, asd, system }: - let - src = fetchzip { inherit url sha256; }; - in runCommand "source" {} '' - mkdir -pv $out - cp -r ${src}/* $out - find $out -name "${asd}.asd" | while read f; do mv -fv $f $(dirname $f)/${system}.asd || true; done - ''; - -getAttr = builtins.getAttr; - -in { - _1am = { - pname = "1am"; - version = "20141106-git"; - asds = [ "1am" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/1am/2014-11-06/1am-20141106-git.tgz"; - sha256 = "05ss4nz1jb9kb796295482b62w5cj29msfj8zis33sp2rw2vmv2g"; - system = "1am"; - asd = "1am"; - }); - systems = [ "1am" ]; - lispLibs = [ ]; - }; - _2d-array = { - pname = "2d-array"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "2d-array" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "2d-array"; - asd = "2d-array"; - }); - systems = [ "2d-array" ]; - lispLibs = [ ]; - }; - _2d-array-test = { - pname = "2d-array-test"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "2d-array-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "2d-array-test"; - asd = "2d-array-test"; - }); - systems = [ "2d-array-test" ]; - lispLibs = [ (getAttr "_2d-array" pkgs) (getAttr "scrutiny" pkgs) ]; - }; - _3b-bmfont = { - pname = "3b-bmfont"; - version = "20220331-git"; - asds = [ "3b-bmfont" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3b-bmfont/2022-03-31/3b-bmfont-20220331-git.tgz"; - sha256 = "0v4lcrlpx60ayg0g5b10q2hjh1iaanln4ck0hm1rvjxm39gl2d86"; - system = "3b-bmfont"; - asd = "3b-bmfont"; - }); - systems = [ "3b-bmfont" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - _3b-bmfont_slash_common = { - pname = "3b-bmfont_common"; - version = "20220331-git"; - asds = [ "3b-bmfont" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3b-bmfont/2022-03-31/3b-bmfont-20220331-git.tgz"; - sha256 = "0v4lcrlpx60ayg0g5b10q2hjh1iaanln4ck0hm1rvjxm39gl2d86"; - system = "3b-bmfont"; - asd = "3b-bmfont"; - }); - systems = [ "3b-bmfont/common" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "split-sequence" pkgs) ]; - meta = { - broken = true; - }; - }; - _3b-bmfont_slash_json = { - pname = "3b-bmfont_json"; - version = "20220331-git"; - asds = [ "3b-bmfont" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3b-bmfont/2022-03-31/3b-bmfont-20220331-git.tgz"; - sha256 = "0v4lcrlpx60ayg0g5b10q2hjh1iaanln4ck0hm1rvjxm39gl2d86"; - system = "3b-bmfont"; - asd = "3b-bmfont"; - }); - systems = [ "3b-bmfont/json" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "jsown" pkgs) (getAttr "split-sequence" pkgs) ]; - meta = { - broken = true; - }; - }; - _3b-bmfont_slash_text = { - pname = "3b-bmfont_text"; - version = "20220331-git"; - asds = [ "3b-bmfont" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3b-bmfont/2022-03-31/3b-bmfont-20220331-git.tgz"; - sha256 = "0v4lcrlpx60ayg0g5b10q2hjh1iaanln4ck0hm1rvjxm39gl2d86"; - system = "3b-bmfont"; - asd = "3b-bmfont"; - }); - systems = [ "3b-bmfont/text" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "split-sequence" pkgs) ]; - meta = { - broken = true; - }; - }; - _3b-bmfont_slash_xml = { - pname = "3b-bmfont_xml"; - version = "20220331-git"; - asds = [ "3b-bmfont" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3b-bmfont/2022-03-31/3b-bmfont-20220331-git.tgz"; - sha256 = "0v4lcrlpx60ayg0g5b10q2hjh1iaanln4ck0hm1rvjxm39gl2d86"; - system = "3b-bmfont"; - asd = "3b-bmfont"; - }); - systems = [ "3b-bmfont/xml" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cxml" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "split-sequence" pkgs) ]; - meta = { - broken = true; - }; - }; - _3b-hdr = { - pname = "3b-hdr"; - version = "20200925-git"; - asds = [ "3b-hdr" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3b-hdr/2020-09-25/3b-hdr-20200925-git.tgz"; - sha256 = "0bvpdzz88xjwvqapjnkdr44ds3gh5xl3r6r1c2y7x9d6lnvc38jq"; - system = "3b-hdr"; - asd = "3b-hdr"; - }); - systems = [ "3b-hdr" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "parse-number" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - _3b-hdr_slash_test = { - pname = "3b-hdr_test"; - version = "20200925-git"; - asds = [ "3b-hdr" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3b-hdr/2020-09-25/3b-hdr-20200925-git.tgz"; - sha256 = "0bvpdzz88xjwvqapjnkdr44ds3gh5xl3r6r1c2y7x9d6lnvc38jq"; - system = "3b-hdr"; - asd = "3b-hdr"; - }); - systems = [ "3b-hdr/test" ]; - lispLibs = [ (getAttr "_3b-hdr" pkgs) (getAttr "nibbles" pkgs) (getAttr "parachute" pkgs) ]; - meta = { - broken = true; - }; - }; - _3b-swf = { - pname = "3b-swf"; - version = "20120107-git"; - asds = [ "3b-swf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3b-swf/2012-01-07/3b-swf-20120107-git.tgz"; - sha256 = "1d74045b6zfxjf0as8n5ji14j5cxsdi3qkqkzcdy3i83whbxkcbm"; - system = "3b-swf"; - asd = "3b-swf"; - }); - systems = [ "3b-swf" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "chipz" pkgs) (getAttr "cl-jpeg" pkgs) (getAttr "cxml" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "salza2" pkgs) (getAttr "vecto" pkgs) (getAttr "zpng" pkgs) ]; - }; - _3b-swf-swc = { - pname = "3b-swf-swc"; - version = "20120107-git"; - asds = [ "3b-swf-swc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3b-swf/2012-01-07/3b-swf-20120107-git.tgz"; - sha256 = "1d74045b6zfxjf0as8n5ji14j5cxsdi3qkqkzcdy3i83whbxkcbm"; - system = "3b-swf-swc"; - asd = "3b-swf-swc"; - }); - systems = [ "3b-swf-swc" ]; - lispLibs = [ (getAttr "_3b-swf" pkgs) (getAttr "cxml" pkgs) (getAttr "zip" pkgs) ]; - }; - _3bgl-shader = { - pname = "3bgl-shader"; - version = "20200427-git"; - asds = [ "3bgl-shader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bgl-shader/2020-04-27/3bgl-shader-20200427-git.tgz"; - sha256 = "0ykfylmmpcc1kh617c4zbq26r5nf1kgf7cb426fnffhp31pp2xkw"; - system = "3bgl-shader"; - asd = "3bgl-shader"; - }); - systems = [ "3bgl-shader" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-opengl" pkgs) ]; - }; - _3bgl-shader-example = { - pname = "3bgl-shader-example"; - version = "20200427-git"; - asds = [ "3bgl-shader-example" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bgl-shader/2020-04-27/3bgl-shader-20200427-git.tgz"; - sha256 = "0ykfylmmpcc1kh617c4zbq26r5nf1kgf7cb426fnffhp31pp2xkw"; - system = "3bgl-shader-example"; - asd = "3bgl-shader-example"; - }); - systems = [ "3bgl-shader-example" ]; - lispLibs = [ (getAttr "_3bgl-shader" pkgs) (getAttr "cl-glu" pkgs) (getAttr "cl-glut" pkgs) (getAttr "mathkit" pkgs) ]; - }; - _3bmd = { - pname = "3bmd"; - version = "20220707-git"; - asds = [ "3bmd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2022-07-07/3bmd-20220707-git.tgz"; - sha256 = "14q2csgmxy5ddmmcrp9wqx7dkzk6685zby9qc04yr9y3c1szvdlr"; - system = "3bmd"; - asd = "3bmd"; - }); - systems = [ "3bmd" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "esrap" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - _3bmd-ext-code-blocks = { - pname = "3bmd-ext-code-blocks"; - version = "20220707-git"; - asds = [ "3bmd-ext-code-blocks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2022-07-07/3bmd-20220707-git.tgz"; - sha256 = "14q2csgmxy5ddmmcrp9wqx7dkzk6685zby9qc04yr9y3c1szvdlr"; - system = "3bmd-ext-code-blocks"; - asd = "3bmd-ext-code-blocks"; - }); - systems = [ "3bmd-ext-code-blocks" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "alexandria" pkgs) (getAttr "colorize" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - _3bmd-ext-definition-lists = { - pname = "3bmd-ext-definition-lists"; - version = "20220707-git"; - asds = [ "3bmd-ext-definition-lists" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2022-07-07/3bmd-20220707-git.tgz"; - sha256 = "14q2csgmxy5ddmmcrp9wqx7dkzk6685zby9qc04yr9y3c1szvdlr"; - system = "3bmd-ext-definition-lists"; - asd = "3bmd-ext-definition-lists"; - }); - systems = [ "3bmd-ext-definition-lists" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "alexandria" pkgs) (getAttr "colorize" pkgs) ]; - }; - _3bmd-ext-math = { - pname = "3bmd-ext-math"; - version = "20220707-git"; - asds = [ "3bmd-ext-math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2022-07-07/3bmd-20220707-git.tgz"; - sha256 = "14q2csgmxy5ddmmcrp9wqx7dkzk6685zby9qc04yr9y3c1szvdlr"; - system = "3bmd-ext-math"; - asd = "3bmd-ext-math"; - }); - systems = [ "3bmd-ext-math" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "esrap" pkgs) ]; - }; - _3bmd-ext-tables = { - pname = "3bmd-ext-tables"; - version = "20220707-git"; - asds = [ "3bmd-ext-tables" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2022-07-07/3bmd-20220707-git.tgz"; - sha256 = "14q2csgmxy5ddmmcrp9wqx7dkzk6685zby9qc04yr9y3c1szvdlr"; - system = "3bmd-ext-tables"; - asd = "3bmd-ext-tables"; - }); - systems = [ "3bmd-ext-tables" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) ]; - }; - _3bmd-ext-wiki-links = { - pname = "3bmd-ext-wiki-links"; - version = "20220707-git"; - asds = [ "3bmd-ext-wiki-links" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2022-07-07/3bmd-20220707-git.tgz"; - sha256 = "14q2csgmxy5ddmmcrp9wqx7dkzk6685zby9qc04yr9y3c1szvdlr"; - system = "3bmd-ext-wiki-links"; - asd = "3bmd-ext-wiki-links"; - }); - systems = [ "3bmd-ext-wiki-links" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) ]; - }; - _3bmd-youtube = { - pname = "3bmd-youtube"; - version = "20220707-git"; - asds = [ "3bmd-youtube" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2022-07-07/3bmd-20220707-git.tgz"; - sha256 = "14q2csgmxy5ddmmcrp9wqx7dkzk6685zby9qc04yr9y3c1szvdlr"; - system = "3bmd-youtube"; - asd = "3bmd-youtube"; - }); - systems = [ "3bmd-youtube" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "esrap" pkgs) ]; - }; - _3bmd-youtube-tests = { - pname = "3bmd-youtube-tests"; - version = "20220707-git"; - asds = [ "3bmd-youtube-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bmd/2022-07-07/3bmd-20220707-git.tgz"; - sha256 = "14q2csgmxy5ddmmcrp9wqx7dkzk6685zby9qc04yr9y3c1szvdlr"; - system = "3bmd-youtube-tests"; - asd = "3bmd-youtube-tests"; - }); - systems = [ "3bmd-youtube-tests" ]; - lispLibs = [ (getAttr "_3bmd-youtube" pkgs) (getAttr "fiasco" pkgs) ]; - }; - _3bz = { - pname = "3bz"; - version = "20201220-git"; - asds = [ "3bz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3bz/2020-12-20/3bz-20201220-git.tgz"; - sha256 = "0kvvlvf50jhhw1s510f3clpr1a68632bq6d698yxcrx722igcrg4"; - system = "3bz"; - asd = "3bz"; - }); - systems = [ "3bz" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "mmap" pkgs) (getAttr "nibbles" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - _3d-matrices = { - pname = "3d-matrices"; - version = "20220331-git"; - asds = [ "3d-matrices" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3d-matrices/2022-03-31/3d-matrices-20220331-git.tgz"; - sha256 = "1s8b4zlmqwyplghs73riz1khf0c5sk64w6b12jd599091d5nr6sr"; - system = "3d-matrices"; - asd = "3d-matrices"; - }); - systems = [ "3d-matrices" ]; - lispLibs = [ (getAttr "_3d-vectors" pkgs) (getAttr "documentation-utils" pkgs) ]; - }; - _3d-matrices-test = { - pname = "3d-matrices-test"; - version = "20220331-git"; - asds = [ "3d-matrices-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3d-matrices/2022-03-31/3d-matrices-20220331-git.tgz"; - sha256 = "1s8b4zlmqwyplghs73riz1khf0c5sk64w6b12jd599091d5nr6sr"; - system = "3d-matrices-test"; - asd = "3d-matrices-test"; - }); - systems = [ "3d-matrices-test" ]; - lispLibs = [ (getAttr "_3d-matrices" pkgs) (getAttr "parachute" pkgs) ]; - }; - _3d-quaternions = { - pname = "3d-quaternions"; - version = "20221106-git"; - asds = [ "3d-quaternions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3d-quaternions/2022-11-06/3d-quaternions-20221106-git.tgz"; - sha256 = "1mrq6yhb90mhvxdkg3fx58ci5yj5xlixbbzf1q6p76wyq40qjv76"; - system = "3d-quaternions"; - asd = "3d-quaternions"; - }); - systems = [ "3d-quaternions" ]; - lispLibs = [ (getAttr "_3d-matrices" pkgs) (getAttr "_3d-vectors" pkgs) (getAttr "documentation-utils" pkgs) ]; - }; - _3d-quaternions-test = { - pname = "3d-quaternions-test"; - version = "20221106-git"; - asds = [ "3d-quaternions-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3d-quaternions/2022-11-06/3d-quaternions-20221106-git.tgz"; - sha256 = "1mrq6yhb90mhvxdkg3fx58ci5yj5xlixbbzf1q6p76wyq40qjv76"; - system = "3d-quaternions-test"; - asd = "3d-quaternions-test"; - }); - systems = [ "3d-quaternions-test" ]; - lispLibs = [ (getAttr "_3d-quaternions" pkgs) (getAttr "parachute" pkgs) ]; - }; - _3d-transforms = { - pname = "3d-transforms"; - version = "20220331-git"; - asds = [ "3d-transforms" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3d-transforms/2022-03-31/3d-transforms-20220331-git.tgz"; - sha256 = "1j7rvkj30z303f875l4qa4b79f9ckc0gr83wclmpvsk2gwiqmwwq"; - system = "3d-transforms"; - asd = "3d-transforms"; - }); - systems = [ "3d-transforms" ]; - lispLibs = [ (getAttr "_3d-matrices" pkgs) (getAttr "_3d-quaternions" pkgs) (getAttr "_3d-vectors" pkgs) (getAttr "documentation-utils" pkgs) ]; - }; - _3d-transforms-test = { - pname = "3d-transforms-test"; - version = "20220331-git"; - asds = [ "3d-transforms-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3d-transforms/2022-03-31/3d-transforms-20220331-git.tgz"; - sha256 = "1j7rvkj30z303f875l4qa4b79f9ckc0gr83wclmpvsk2gwiqmwwq"; - system = "3d-transforms-test"; - asd = "3d-transforms-test"; - }); - systems = [ "3d-transforms-test" ]; - lispLibs = [ (getAttr "_3d-transforms" pkgs) (getAttr "parachute" pkgs) ]; - }; - _3d-vectors = { - pname = "3d-vectors"; - version = "20221106-git"; - asds = [ "3d-vectors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3d-vectors/2022-11-06/3d-vectors-20221106-git.tgz"; - sha256 = "0vmf7nycc49ydcy0dfs25cgs655kwjc6jcjvpwxw61jq4gl2fh7x"; - system = "3d-vectors"; - asd = "3d-vectors"; - }); - systems = [ "3d-vectors" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - _3d-vectors-test = { - pname = "3d-vectors-test"; - version = "20221106-git"; - asds = [ "3d-vectors-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/3d-vectors/2022-11-06/3d-vectors-20221106-git.tgz"; - sha256 = "0vmf7nycc49ydcy0dfs25cgs655kwjc6jcjvpwxw61jq4gl2fh7x"; - system = "3d-vectors-test"; - asd = "3d-vectors-test"; - }); - systems = [ "3d-vectors-test" ]; - lispLibs = [ (getAttr "_3d-vectors" pkgs) (getAttr "parachute" pkgs) ]; - }; - _40ants-asdf-system = { - pname = "40ants-asdf-system"; - version = "20221106-git"; - asds = [ "40ants-asdf-system" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/40ants-asdf-system/2022-11-06/40ants-asdf-system-20221106-git.tgz"; - sha256 = "11k1pa1mpcm63n5acqb805266xs8wb4nxm00ac8i8abbp2pflama"; - system = "40ants-asdf-system"; - asd = "40ants-asdf-system"; - }); - systems = [ "40ants-asdf-system" ]; - lispLibs = [ (getAttr "_40ants-doc" pkgs) (getAttr "uiop" pkgs) ]; - }; - _40ants-ci = { - pname = "40ants-ci"; - version = "20221106-git"; - asds = [ "40ants-ci" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ci/2022-11-06/ci-20221106-git.tgz"; - sha256 = "0m735ciq3nkr928d5kfa9x9dv3w0yprj8i0xznih4pzkjvj93f5c"; - system = "40ants-ci"; - asd = "40ants-ci"; - }); - systems = [ "40ants-ci" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "str" pkgs) (getAttr "_40ants-doc" pkgs) (getAttr "docs-config" pkgs) (getAttr "yason" pkgs) ]; - }; - _40ants-ci-test = { - pname = "40ants-ci-test"; - version = "20221106-git"; - asds = [ "40ants-ci-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ci/2022-11-06/ci-20221106-git.tgz"; - sha256 = "0m735ciq3nkr928d5kfa9x9dv3w0yprj8i0xznih4pzkjvj93f5c"; - system = "40ants-ci-test"; - asd = "40ants-ci-test"; - }); - systems = [ "40ants-ci-test" ]; - lispLibs = [ (getAttr "hamcrest" pkgs) (getAttr "rove" pkgs) ]; - }; - _40ants-doc = { - pname = "40ants-doc"; - version = "20221106-git"; - asds = [ "40ants-doc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/doc/2022-11-06/doc-20221106-git.tgz"; - sha256 = "1myf27502i7mkwb9dqywdbwlpprx7zwp4l7a6vc654h6f1zf65xv"; - system = "40ants-doc"; - asd = "40ants-doc"; - }); - systems = [ "40ants-doc" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) (getAttr "pythonic-string-reader" pkgs) (getAttr "uiop" pkgs) ]; - }; - _40ants-doc-full = { - pname = "40ants-doc-full"; - version = "20221106-git"; - asds = [ "40ants-doc-full" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/doc/2022-11-06/doc-20221106-git.tgz"; - sha256 = "1myf27502i7mkwb9dqywdbwlpprx7zwp4l7a6vc654h6f1zf65xv"; - system = "40ants-doc-full"; - asd = "40ants-doc-full"; - }); - systems = [ "40ants-doc-full" ]; - lispLibs = [ ]; - }; - _40ants-doc-test = { - pname = "40ants-doc-test"; - version = "20221106-git"; - asds = [ "40ants-doc-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/doc/2022-11-06/doc-20221106-git.tgz"; - sha256 = "1myf27502i7mkwb9dqywdbwlpprx7zwp4l7a6vc654h6f1zf65xv"; - system = "40ants-doc-test"; - asd = "40ants-doc-test"; - }); - systems = [ "40ants-doc-test" ]; - lispLibs = [ (getAttr "common-doc" pkgs) (getAttr "_40ants-doc" pkgs) (getAttr "rove" pkgs) ]; - }; - a-cl-cairo2-loader = { - pname = "a-cl-cairo2-loader"; - version = "20211020-git"; - asds = [ "a-cl-cairo2-loader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz"; - sha256 = "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q"; - system = "a-cl-cairo2-loader"; - asd = "a-cl-cairo2-loader"; - }); - systems = [ "a-cl-cairo2-loader" ]; - lispLibs = [ (getAttr "cl-cairo2" pkgs) ]; - }; - a-cl-logger = { - pname = "a-cl-logger"; - version = "20220331-git"; - asds = [ "a-cl-logger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz"; - sha256 = "0vhhbnh4akxh0ivqh8r0f2djv2nbf3l9hbbi0b5fdk9bdpziqkb4"; - system = "a-cl-logger"; - asd = "a-cl-logger"; - }); - systems = [ "a-cl-logger" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-json" pkgs) (getAttr "closer-mop" pkgs) (getAttr "exit-hooks" pkgs) (getAttr "iterate" pkgs) (getAttr "local-time" pkgs) (getAttr "osicat" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - a-cl-logger-logstash = { - pname = "a-cl-logger-logstash"; - version = "20220331-git"; - asds = [ "a-cl-logger-logstash" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz"; - sha256 = "0vhhbnh4akxh0ivqh8r0f2djv2nbf3l9hbbi0b5fdk9bdpziqkb4"; - system = "a-cl-logger-logstash"; - asd = "a-cl-logger-logstash"; - }); - systems = [ "a-cl-logger-logstash" ]; - lispLibs = [ (getAttr "a-cl-logger" pkgs) (getAttr "cl-json" pkgs) (getAttr "zmq" pkgs) ]; - }; - a-cl-logger-tests = { - pname = "a-cl-logger-tests"; - version = "20220331-git"; - asds = [ "a-cl-logger-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/a-cl-logger/2022-03-31/a-cl-logger-20220331-git.tgz"; - sha256 = "0vhhbnh4akxh0ivqh8r0f2djv2nbf3l9hbbi0b5fdk9bdpziqkb4"; - system = "a-cl-logger-tests"; - asd = "a-cl-logger"; - }); - systems = [ "a-cl-logger-tests" ]; - lispLibs = [ (getAttr "a-cl-logger" pkgs) (getAttr "lisp-unit2" pkgs) ]; - }; - aabbcc = { - pname = "aabbcc"; - version = "20200427-git"; - asds = [ "aabbcc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "aabbcc"; - asd = "aabbcc"; - }); - systems = [ "aabbcc" ]; - lispLibs = [ (getAttr "quads" pkgs) (getAttr "utility" pkgs) ]; - }; - able = { - pname = "able"; - version = "20171227-git"; - asds = [ "able" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/able/2017-12-27/able-20171227-git.tgz"; - sha256 = "1fbcmr6hy7bwlnsnrml3j4b2jkkj8ddxw27l8hr2z6l3fi3qw4hh"; - system = "able"; - asd = "able"; - }); - systems = [ "able" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "ltk" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - abnf = { - pname = "abnf"; - version = "20200325-git"; - asds = [ "abnf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-abnf/2020-03-25/cl-abnf-20200325-git.tgz"; - sha256 = "0f09nsndxa90acm71zd4qdnp40v705a4sqm04mnv9x76h6dlggmz"; - system = "abnf"; - asd = "abnf"; - }); - systems = [ "abnf" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "esrap" pkgs) ]; - }; - abstract-arrays = { - pname = "abstract-arrays"; - version = "20221106-git"; - asds = [ "abstract-arrays" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/abstract-arrays/2022-11-06/abstract-arrays-20221106-git.tgz"; - sha256 = "0rz09fywsrg23g1l9mm0g4y8bw4hdff67wqs7nj5b352g9l9f0xa"; - system = "abstract-arrays"; - asd = "abstract-arrays"; - }); - systems = [ "abstract-arrays" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "polymorphic-functions" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - abstract-classes = { - pname = "abstract-classes"; - version = "20190307-hg"; - asds = [ "abstract-classes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-abstract-classes/2019-03-07/cl-abstract-classes-20190307-hg.tgz"; - sha256 = "0q03j3ksgn56j9xvs3d3hhasplj3hvg488f4cx1z97nlyqxr5w1d"; - system = "abstract-classes"; - asd = "abstract-classes"; - }); - systems = [ "abstract-classes" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - access = { - pname = "access"; - version = "20220707-git"; - asds = [ "access" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/access/2022-07-07/access-20220707-git.tgz"; - sha256 = "0jgq4xz4pmi7wrgiqvvpkl9k89dhnhsaac68x6mw0w2v7h31vzph"; - system = "access"; - asd = "access"; - }); - systems = [ "access" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) ]; - }; - access_slash_test = { - pname = "access_test"; - version = "20220707-git"; - asds = [ "access" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/access/2022-07-07/access-20220707-git.tgz"; - sha256 = "0jgq4xz4pmi7wrgiqvvpkl9k89dhnhsaac68x6mw0w2v7h31vzph"; - system = "access"; - asd = "access"; - }); - systems = [ "access/test" ]; - lispLibs = [ (getAttr "access" pkgs) (getAttr "lisp-unit2" pkgs) ]; - meta = { - broken = true; - }; - }; - acclimation = { - pname = "acclimation"; - version = "20221106-git"; - asds = [ "acclimation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/acclimation/2022-11-06/acclimation-20221106-git.tgz"; - sha256 = "04bk389p4fddh4vf9apry4a40ryfhcdf5fq23gh1ihvfdpv3b957"; - system = "acclimation"; - asd = "acclimation"; - }); - systems = [ "acclimation" ]; - lispLibs = [ ]; - }; - acclimation-temperature = { - pname = "acclimation-temperature"; - version = "20221106-git"; - asds = [ "acclimation-temperature" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/acclimation/2022-11-06/acclimation-20221106-git.tgz"; - sha256 = "04bk389p4fddh4vf9apry4a40ryfhcdf5fq23gh1ihvfdpv3b957"; - system = "acclimation-temperature"; - asd = "acclimation-temperature"; - }); - systems = [ "acclimation-temperature" ]; - lispLibs = [ ]; - }; - acl-compat = { - pname = "acl-compat"; - version = "20190813-git"; - asds = [ "acl-compat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz"; - sha256 = "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa"; - system = "acl-compat"; - asd = "acl-compat"; - }); - systems = [ "acl-compat" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "ironclad" pkgs) (getAttr "puri" pkgs) ]; - }; - acm-random = { - pname = "acm-random"; - version = "20191007-git"; - asds = [ "acm-random" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz"; - sha256 = "1fb4mnp85jm9s667y4dgz07klhkr9pvi5xbxws28lbb8iip75y2p"; - system = "acm-random"; - asd = "acm-random"; - }); - systems = [ "acm-random" ]; - lispLibs = [ (getAttr "com_dot_google_dot_base" pkgs) (getAttr "random" pkgs) ]; - }; - acm-random-test = { - pname = "acm-random-test"; - version = "20191007-git"; - asds = [ "acm-random-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz"; - sha256 = "1fb4mnp85jm9s667y4dgz07klhkr9pvi5xbxws28lbb8iip75y2p"; - system = "acm-random-test"; - asd = "acm-random-test"; - }); - systems = [ "acm-random-test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "acm-random" pkgs) ]; - }; - action-list = { - pname = "action-list"; - version = "20221106-git"; - asds = [ "action-list" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/action-list/2022-11-06/action-list-20221106-git.tgz"; - sha256 = "0w42wsk077lcv9hw62s8303fj4rpmrrx1xwsv1jachzd9alwnfcl"; - system = "action-list"; - asd = "action-list"; - }); - systems = [ "action-list" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "trivial-extensible-sequences" pkgs) ]; - }; - adhoc = { - pname = "adhoc"; - version = "20220331-git"; - asds = [ "adhoc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/adhoc/2022-03-31/adhoc-20220331-git.tgz"; - sha256 = "1plpxrb41y0hpj9ai6g5cyw6p2v0md3gk35xvryq5mmkxnjfzyzj"; - system = "adhoc"; - asd = "adhoc"; - }); - systems = [ "adhoc" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - adhoc-tests = { - pname = "adhoc-tests"; - version = "20220331-git"; - asds = [ "adhoc-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/adhoc/2022-03-31/adhoc-20220331-git.tgz"; - sha256 = "1plpxrb41y0hpj9ai6g5cyw6p2v0md3gk35xvryq5mmkxnjfzyzj"; - system = "adhoc-tests"; - asd = "adhoc-tests"; - }); - systems = [ "adhoc-tests" ]; - lispLibs = [ (getAttr "adhoc" pkgs) (getAttr "fiveam" pkgs) ]; - }; - adjuvant = { - pname = "adjuvant"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "adjuvant" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "adjuvant"; - asd = "adjuvant"; - }); - systems = [ "adjuvant" ]; - lispLibs = [ ]; - }; - adjuvant-test = { - pname = "adjuvant-test"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "adjuvant-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "adjuvant-test"; - asd = "adjuvant-test"; - }); - systems = [ "adjuvant-test" ]; - lispLibs = [ (getAttr "adjuvant" pkgs) (getAttr "scrutiny" pkgs) ]; - }; - adopt = { - pname = "adopt"; - version = "20220331-hg"; - asds = [ "adopt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/adopt/2022-03-31/adopt-20220331-hg.tgz"; - sha256 = "0lfg12crl68nz0avdyx4j0x0p8vrysr2bl1817iaaa48jp6qp588"; - system = "adopt"; - asd = "adopt"; - }); - systems = [ "adopt" ]; - lispLibs = [ (getAttr "bobbin" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - adopt-subcommands = { - pname = "adopt-subcommands"; - version = "v0.2.2"; - asds = [ "adopt-subcommands" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/adopt-subcommands/2021-05-31/adopt-subcommands-v0.2.2.tgz"; - sha256 = "0q35s3ihhlshakjalq5pgf14x502qnj8jimim8yf7bp1p9sn83h8"; - system = "adopt-subcommands"; - asd = "adopt-subcommands"; - }); - systems = [ "adopt-subcommands" ]; - lispLibs = [ (getAttr "adopt" pkgs) (getAttr "bobbin" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - }; - adopt-subcommands-test = { - pname = "adopt-subcommands-test"; - version = "v0.2.2"; - asds = [ "adopt-subcommands-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/adopt-subcommands/2021-05-31/adopt-subcommands-v0.2.2.tgz"; - sha256 = "0q35s3ihhlshakjalq5pgf14x502qnj8jimim8yf7bp1p9sn83h8"; - system = "adopt-subcommands-test"; - asd = "adopt-subcommands-test"; - }); - systems = [ "adopt-subcommands-test" ]; - lispLibs = [ (getAttr "adopt-subcommands" pkgs) (getAttr "fiveam" pkgs) ]; - }; - adopt_slash_test = { - pname = "adopt_test"; - version = "20220331-hg"; - asds = [ "adopt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/adopt/2022-03-31/adopt-20220331-hg.tgz"; - sha256 = "0lfg12crl68nz0avdyx4j0x0p8vrysr2bl1817iaaa48jp6qp588"; - system = "adopt"; - asd = "adopt"; - }); - systems = [ "adopt/test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "adopt" pkgs) ]; - meta = { - broken = true; - }; - }; - adp = { - pname = "adp"; - version = "20221106-git"; - asds = [ "adp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/adp/2022-11-06/adp-20221106-git.tgz"; - sha256 = "1g6mdcv4kprx111m1glppqd23n12bsca3q6bm0v25hp4qb08l1my"; - system = "adp"; - asd = "adp"; - }); - systems = [ "adp" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "hyperspec" pkgs) ]; - }; - adp_slash_doc = { - pname = "adp_doc"; - version = "20221106-git"; - asds = [ "adp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/adp/2022-11-06/adp-20221106-git.tgz"; - sha256 = "1g6mdcv4kprx111m1glppqd23n12bsca3q6bm0v25hp4qb08l1my"; - system = "adp"; - asd = "adp"; - }); - systems = [ "adp/doc" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "hyperspec" pkgs) ]; - meta = { - broken = true; - }; - }; - adp_slash_github-md = { - pname = "adp_github-md"; - version = "20221106-git"; - asds = [ "adp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/adp/2022-11-06/adp-20221106-git.tgz"; - sha256 = "1g6mdcv4kprx111m1glppqd23n12bsca3q6bm0v25hp4qb08l1my"; - system = "adp"; - asd = "adp"; - }); - systems = [ "adp/github-md" ]; - lispLibs = [ (getAttr "adp" pkgs) ]; - meta = { - broken = true; - }; - }; - advanced = { - pname = "advanced"; - version = "clon-1.0b25"; - asds = [ "advanced" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-clon/2021-04-11/clon-1.0b25.tgz"; - sha256 = "0nj47xl2fwj7z31wiaad8dw97fpq3zpwxlgmpvppawz0z3hgf8d0"; - system = "advanced"; - asd = "advanced"; - }); - systems = [ "advanced" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_clon" pkgs) ]; - }; - advanced-readtable = { - pname = "advanced-readtable"; - version = "20130720-git"; - asds = [ "advanced-readtable" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/advanced-readtable/2013-07-20/advanced-readtable-20130720-git.tgz"; - sha256 = "0dgm3lp9s6792g22swcb085f67q68jsyqj71vicb1wdr9qslvgwm"; - system = "advanced-readtable"; - asd = "advanced-readtable"; - }); - systems = [ "advanced-readtable" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - aether = { - pname = "aether"; - version = "v1.1.0"; - asds = [ "aether" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/aether/2021-12-09/aether-v1.1.0.tgz"; - sha256 = "0q60gc4lsxpvv4g572mnhpzkziq1412k1q0xm4y2d1zigryg30bb"; - system = "aether"; - asd = "aether"; - }); - systems = [ "aether" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-heap" pkgs) (getAttr "global-vars" pkgs) (getAttr "policy-cond" pkgs) ]; - }; - aether-tests = { - pname = "aether-tests"; - version = "v1.1.0"; - asds = [ "aether-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/aether/2021-12-09/aether-v1.1.0.tgz"; - sha256 = "0q60gc4lsxpvv4g572mnhpzkziq1412k1q0xm4y2d1zigryg30bb"; - system = "aether-tests"; - asd = "aether-tests"; - }); - systems = [ "aether-tests" ]; - lispLibs = [ (getAttr "aether" pkgs) (getAttr "fiasco" pkgs) (getAttr "uiop" pkgs) ]; - }; - agnostic-lizard = { - pname = "agnostic-lizard"; - version = "20221106-git"; - asds = [ "agnostic-lizard" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/agnostic-lizard/2022-11-06/agnostic-lizard-20221106-git.tgz"; - sha256 = "13r1pzxkhci0pd8grhvim09lgvaykjyspnj58xq1rp1c017xnpmf"; - system = "agnostic-lizard"; - asd = "agnostic-lizard"; - }); - systems = [ "agnostic-lizard" ]; - lispLibs = [ ]; - }; - agnostic-lizard-debugger-prototype = { - pname = "agnostic-lizard-debugger-prototype"; - version = "20221106-git"; - asds = [ "agnostic-lizard-debugger-prototype" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/agnostic-lizard/2022-11-06/agnostic-lizard-20221106-git.tgz"; - sha256 = "13r1pzxkhci0pd8grhvim09lgvaykjyspnj58xq1rp1c017xnpmf"; - system = "agnostic-lizard-debugger-prototype"; - asd = "agnostic-lizard-debugger-prototype"; - }); - systems = [ "agnostic-lizard-debugger-prototype" ]; - lispLibs = [ (getAttr "agnostic-lizard" pkgs) (getAttr "bordeaux-threads" pkgs) ]; - }; - agutil = { - pname = "agutil"; - version = "20210531-git"; - asds = [ "agutil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/agutil/2021-05-31/agutil-20210531-git.tgz"; - sha256 = "10lccrqkaqq0h1p79gjqsqk1nqa6c25n0w7pj39y2gs14s5qr5q9"; - system = "agutil"; - asd = "agutil"; - }); - systems = [ "agutil" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "optima" pkgs) ]; - }; - ahungry-fleece = { - pname = "ahungry-fleece"; - version = "20200610-git"; - asds = [ "ahungry-fleece" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ahungry-fleece/2020-06-10/ahungry-fleece-20200610-git.tgz"; - sha256 = "1l2rsy5qn5n456cxbd6kj0hpniy5vf35xcixzfj4j7lv00j0c5lz"; - system = "ahungry-fleece"; - asd = "ahungry-fleece"; - }); - systems = [ "ahungry-fleece" ]; - lispLibs = [ (getAttr "archive" pkgs) (getAttr "chipz" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-yaml" pkgs) (getAttr "md5" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - alexa = { - pname = "alexa"; - version = "20180831-git"; - asds = [ "alexa" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/alexa/2018-08-31/alexa-20180831-git.tgz"; - sha256 = "1y9jyz9gfmd02h492kf7v3mmpbhc0yfh4ka2rzd1vczq6fl8qgqv"; - system = "alexa"; - asd = "alexa"; - }); - systems = [ "alexa" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - alexa-tests = { - pname = "alexa-tests"; - version = "20180831-git"; - asds = [ "alexa-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/alexa/2018-08-31/alexa-20180831-git.tgz"; - sha256 = "1y9jyz9gfmd02h492kf7v3mmpbhc0yfh4ka2rzd1vczq6fl8qgqv"; - system = "alexa-tests"; - asd = "alexa-tests"; - }); - systems = [ "alexa-tests" ]; - lispLibs = [ (getAttr "alexa" pkgs) (getAttr "fiasco" pkgs) (getAttr "uiop" pkgs) ]; - }; - alexandria = { - pname = "alexandria"; - version = "20220707-git"; - asds = [ "alexandria" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/alexandria/2022-07-07/alexandria-20220707-git.tgz"; - sha256 = "1l3jb61in7gs3fihlvmcap51ij9s9j4p77n0rwc2c6qd43cv90ah"; - system = "alexandria"; - asd = "alexandria"; - }); - systems = [ "alexandria" ]; - lispLibs = [ ]; - }; - alexandria_plus = { - pname = "alexandria+"; - version = "20221106-git"; - asds = [ "alexandria+" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/alexandria-plus/2022-11-06/alexandria-plus-20221106-git.tgz"; - sha256 = "1w9r19610h599303gqlx2x5n8mmdynss2gyl7xilg5h6v8z3hkfl"; - system = "alexandria+"; - asd = "alexandria+"; - }); - systems = [ "alexandria+" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - alexandria_plus_slash_tests = { - pname = "alexandria+_tests"; - version = "20221106-git"; - asds = [ "alexandria+" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/alexandria-plus/2022-11-06/alexandria-plus-20221106-git.tgz"; - sha256 = "1w9r19610h599303gqlx2x5n8mmdynss2gyl7xilg5h6v8z3hkfl"; - system = "alexandria+"; - asd = "alexandria+"; - }); - systems = [ "alexandria+/tests" ]; - lispLibs = [ (getAttr "alexandria_plus" pkgs) (getAttr "parachute" pkgs) ]; - meta = { - broken = true; - }; - }; - alexandria_slash_tests = { - pname = "alexandria_tests"; - version = "20220707-git"; - asds = [ "alexandria" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/alexandria/2022-07-07/alexandria-20220707-git.tgz"; - sha256 = "1l3jb61in7gs3fihlvmcap51ij9s9j4p77n0rwc2c6qd43cv90ah"; - system = "alexandria"; - asd = "alexandria"; - }); - systems = [ "alexandria/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - meta = { - broken = true; - }; - }; - algebraic-data-library = { - pname = "algebraic-data-library"; - version = "20180831-git"; - asds = [ "algebraic-data-library" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/algebraic-data-library/2018-08-31/algebraic-data-library-20180831-git.tgz"; - sha256 = "0mmakfdwgfjl812ydzbbl81lkv41zfnqhw9ydjk1w63lq8c11cmn"; - system = "algebraic-data-library"; - asd = "algebraic-data-library"; - }); - systems = [ "algebraic-data-library" ]; - lispLibs = [ (getAttr "cl-algebraic-data-type" pkgs) ]; - }; - also-alsa = { - pname = "also-alsa"; - version = "20220707-git"; - asds = [ "also-alsa" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/also-alsa/2022-07-07/also-alsa-20220707-git.tgz"; - sha256 = "1az5agb5gmjjsp3sbpqnw20k46yss1d7d5xymy2mi1al5ksxyqmc"; - system = "also-alsa"; - asd = "also-alsa"; - }); - systems = [ "also-alsa" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - amazon-ecs = { - pname = "amazon-ecs"; - version = "20110418-git"; - asds = [ "amazon-ecs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/amazon-ecs/2011-04-18/amazon-ecs-20110418-git.tgz"; - sha256 = "1gi3ybfkdfqvgmwgf0l77xpp5xgmkbycdpz6kn79vm0iga3kd2mz"; - system = "amazon-ecs"; - asd = "amazon-ecs"; - }); - systems = [ "amazon-ecs" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "ironclad" pkgs) (getAttr "net-telent-date" pkgs) (getAttr "parse-number" pkgs) (getAttr "trivial-http" pkgs) (getAttr "xml-mop" pkgs) ]; - }; - amb = { - pname = "amb"; - version = "20220220-git"; - asds = [ "amb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/amb/2022-02-20/amb-20220220-git.tgz"; - sha256 = "1klh1aakklj1famrff0sccnwlv8238b1q446288aqnqgxxw6pf21"; - system = "amb"; - asd = "amb"; - }); - systems = [ "amb" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - amb_slash_test = { - pname = "amb_test"; - version = "20220220-git"; - asds = [ "amb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/amb/2022-02-20/amb-20220220-git.tgz"; - sha256 = "1klh1aakklj1famrff0sccnwlv8238b1q446288aqnqgxxw6pf21"; - system = "amb"; - asd = "amb"; - }); - systems = [ "amb/test" ]; - lispLibs = [ (getAttr "amb" pkgs) (getAttr "parachute" pkgs) ]; - meta = { - broken = true; - }; - }; - anaphora = { - pname = "anaphora"; - version = "20220220-git"; - asds = [ "anaphora" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/anaphora/2022-02-20/anaphora-20220220-git.tgz"; - sha256 = "1ds5ab0rzkrhfl29xpvmvyxmkdyj9mi19p330pz603lx95njjc0b"; - system = "anaphora"; - asd = "anaphora"; - }); - systems = [ "anaphora" ]; - lispLibs = [ ]; - }; - anaphora_slash_test = { - pname = "anaphora_test"; - version = "20220220-git"; - asds = [ "anaphora" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/anaphora/2022-02-20/anaphora-20220220-git.tgz"; - sha256 = "1ds5ab0rzkrhfl29xpvmvyxmkdyj9mi19p330pz603lx95njjc0b"; - system = "anaphora"; - asd = "anaphora"; - }); - systems = [ "anaphora/test" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "rt" pkgs) ]; - meta = { - broken = true; - }; - }; - anaphoric-variants = { - pname = "anaphoric-variants"; - version = "1.0.1"; - asds = [ "anaphoric-variants" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/anaphoric-variants/2012-10-13/anaphoric-variants-1.0.1.tgz"; - sha256 = "02ms01w09b9bzsdsr0icd3ggyl86kyxk164kf0759k2k9y6kjsp5"; - system = "anaphoric-variants"; - asd = "anaphoric-variants"; - }); - systems = [ "anaphoric-variants" ]; - lispLibs = [ (getAttr "map-bind" pkgs) ]; - }; - anatevka = { - pname = "anatevka"; - version = "v1.0.0"; - asds = [ "anatevka" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/anatevka/2022-11-06/anatevka-v1.0.0.tgz"; - sha256 = "1c8y91nv1jln22j7b82qiad861zfjs9a8nxm18r1dxblszpyygsk"; - system = "anatevka"; - asd = "anatevka"; - }); - systems = [ "anatevka" ]; - lispLibs = [ (getAttr "aether" pkgs) (getAttr "alexandria" pkgs) ]; - }; - anatevka-tests = { - pname = "anatevka-tests"; - version = "v1.0.0"; - asds = [ "anatevka-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/anatevka/2022-11-06/anatevka-v1.0.0.tgz"; - sha256 = "1c8y91nv1jln22j7b82qiad861zfjs9a8nxm18r1dxblszpyygsk"; - system = "anatevka-tests"; - asd = "anatevka-tests"; - }); - systems = [ "anatevka-tests" ]; - lispLibs = [ (getAttr "anatevka" pkgs) (getAttr "closer-mop" pkgs) (getAttr "fiasco" pkgs) (getAttr "uiop" pkgs) ]; - }; - ansi-escape = { - pname = "ansi-escape"; - version = "20221106-git"; - asds = [ "ansi-escape" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2022-11-06/croatoan-20221106-git.tgz"; - sha256 = "0zfwcc40dpj88jvkm45d4snxjfxdsncd5pj10zrbj7lm4awm9b5s"; - system = "ansi-escape"; - asd = "ansi-escape"; - }); - systems = [ "ansi-escape" ]; - lispLibs = [ ]; - }; - ansi-escape-test = { - pname = "ansi-escape-test"; - version = "20221106-git"; - asds = [ "ansi-escape-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2022-11-06/croatoan-20221106-git.tgz"; - sha256 = "0zfwcc40dpj88jvkm45d4snxjfxdsncd5pj10zrbj7lm4awm9b5s"; - system = "ansi-escape-test"; - asd = "ansi-escape-test"; - }); - systems = [ "ansi-escape-test" ]; - lispLibs = [ (getAttr "ansi-escape" pkgs) ]; - }; - antik = { - pname = "antik"; - version = "master-df14cb8c-git"; - asds = [ "antik" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/antik/2019-10-08/antik-master-df14cb8c-git.tgz"; - sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; - system = "antik"; - asd = "antik"; - }); - systems = [ "antik" ]; - lispLibs = [ (getAttr "physical-dimension" pkgs) (getAttr "gsll" pkgs) ]; - }; - antik-base = { - pname = "antik-base"; - version = "master-df14cb8c-git"; - asds = [ "antik-base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/antik/2019-10-08/antik-master-df14cb8c-git.tgz"; - sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; - system = "antik-base"; - asd = "antik-base"; - }); - systems = [ "antik-base" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "iterate" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "named-readtables" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - anypool = { - pname = "anypool"; - version = "20210531-git"; - asds = [ "anypool" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/anypool/2021-05-31/anypool-20210531-git.tgz"; - sha256 = "0dr904m0qb0xf12x0rrhw0ipw3fdqyihwr59l87prqmkv23y7aig"; - system = "anypool"; - asd = "anypool"; - }); - systems = [ "anypool" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-speedy-queue" pkgs) ]; - }; - anypool_slash_middleware = { - pname = "anypool_middleware"; - version = "20210531-git"; - asds = [ "anypool" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/anypool/2021-05-31/anypool-20210531-git.tgz"; - sha256 = "0dr904m0qb0xf12x0rrhw0ipw3fdqyihwr59l87prqmkv23y7aig"; - system = "anypool"; - asd = "anypool"; - }); - systems = [ "anypool/middleware" ]; - lispLibs = [ (getAttr "anypool" pkgs) ]; - meta = { - broken = true; - }; - }; - anypool_slash_tests = { - pname = "anypool_tests"; - version = "20210531-git"; - asds = [ "anypool" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/anypool/2021-05-31/anypool-20210531-git.tgz"; - sha256 = "0dr904m0qb0xf12x0rrhw0ipw3fdqyihwr59l87prqmkv23y7aig"; - system = "anypool"; - asd = "anypool"; - }); - systems = [ "anypool/tests" ]; - lispLibs = [ (getAttr "anypool" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - aplesque = { - pname = "aplesque"; - version = "20220707-git"; - asds = [ "aplesque" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2022-07-07/april-20220707-git.tgz"; - sha256 = "016mfldk98j1kbj8fpqwzhvdkfbmqsfbzjaawnlz9q5pr6srv26r"; - system = "aplesque"; - asd = "aplesque"; - }); - systems = [ "aplesque" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "array-operations" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "lparallel" pkgs) (getAttr "parse-number" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - application = { - pname = "application"; - version = "20200427-git"; - asds = [ "application" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "application"; - asd = "application"; - }); - systems = [ "application" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "deflazy" pkgs) (getAttr "glhelp" pkgs) (getAttr "scratch-buffer" pkgs) (getAttr "window" pkgs) (getAttr "utility" pkgs) ]; - }; - apply-argv = { - pname = "apply-argv"; - version = "20150608-git"; - asds = [ "apply-argv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/apply-argv/2015-06-08/apply-argv-20150608-git.tgz"; - sha256 = "19qj847vyawjgm5iwk96469c0plnxj37948ac1bcd86hgpbm75w0"; - system = "apply-argv"; - asd = "apply-argv"; - }); - systems = [ "apply-argv" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - apply-argv-tests = { - pname = "apply-argv-tests"; - version = "20150608-git"; - asds = [ "apply-argv-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/apply-argv/2015-06-08/apply-argv-20150608-git.tgz"; - sha256 = "19qj847vyawjgm5iwk96469c0plnxj37948ac1bcd86hgpbm75w0"; - system = "apply-argv-tests"; - asd = "apply-argv"; - }); - systems = [ "apply-argv-tests" ]; - lispLibs = [ (getAttr "apply-argv" pkgs) (getAttr "fiveam" pkgs) ]; - }; - april = { - pname = "april"; - version = "20220707-git"; - asds = [ "april" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2022-07-07/april-20220707-git.tgz"; - sha256 = "016mfldk98j1kbj8fpqwzhvdkfbmqsfbzjaawnlz9q5pr6srv26r"; - system = "april"; - asd = "april"; - }); - systems = [ "april" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "aplesque" pkgs) (getAttr "vex" pkgs) (getAttr "array-operations" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-unicode" pkgs) (getAttr "lparallel" pkgs) (getAttr "parse-number" pkgs) (getAttr "prove" pkgs) (getAttr "random-state" pkgs) (getAttr "simple-date-time" pkgs) (getAttr "symbol-munger" pkgs) (getAttr "trivia" pkgs) ]; - }; - april-demo_dot_cnn = { - pname = "april-demo.cnn"; - version = "20220707-git"; - asds = [ "april-demo.cnn" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2022-07-07/april-20220707-git.tgz"; - sha256 = "016mfldk98j1kbj8fpqwzhvdkfbmqsfbzjaawnlz9q5pr6srv26r"; - system = "april-demo.cnn"; - asd = "april-demo.cnn"; - }); - systems = [ "april-demo.cnn" ]; - lispLibs = [ (getAttr "april" pkgs) (getAttr "lisp-binary" pkgs) ]; - }; - april-demo_dot_ncurses = { - pname = "april-demo.ncurses"; - version = "20220707-git"; - asds = [ "april-demo.ncurses" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2022-07-07/april-20220707-git.tgz"; - sha256 = "016mfldk98j1kbj8fpqwzhvdkfbmqsfbzjaawnlz9q5pr6srv26r"; - system = "april-demo.ncurses"; - asd = "april-demo.ncurses"; - }); - systems = [ "april-demo.ncurses" ]; - lispLibs = [ (getAttr "april" pkgs) (getAttr "croatoan" pkgs) (getAttr "lparallel" pkgs) ]; - }; - april-lib_dot_dfns_dot_array = { - pname = "april-lib.dfns.array"; - version = "20220707-git"; - asds = [ "april-lib.dfns.array" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2022-07-07/april-20220707-git.tgz"; - sha256 = "016mfldk98j1kbj8fpqwzhvdkfbmqsfbzjaawnlz9q5pr6srv26r"; - system = "april-lib.dfns.array"; - asd = "april-lib.dfns.array"; - }); - systems = [ "april-lib.dfns.array" ]; - lispLibs = [ (getAttr "april" pkgs) ]; - }; - april-lib_dot_dfns_dot_graph = { - pname = "april-lib.dfns.graph"; - version = "20220707-git"; - asds = [ "april-lib.dfns.graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2022-07-07/april-20220707-git.tgz"; - sha256 = "016mfldk98j1kbj8fpqwzhvdkfbmqsfbzjaawnlz9q5pr6srv26r"; - system = "april-lib.dfns.graph"; - asd = "april-lib.dfns.graph"; - }); - systems = [ "april-lib.dfns.graph" ]; - lispLibs = [ (getAttr "april" pkgs) (getAttr "april-lib_dot_dfns_dot_array" pkgs) ]; - }; - april-lib_dot_dfns_dot_numeric = { - pname = "april-lib.dfns.numeric"; - version = "20220707-git"; - asds = [ "april-lib.dfns.numeric" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2022-07-07/april-20220707-git.tgz"; - sha256 = "016mfldk98j1kbj8fpqwzhvdkfbmqsfbzjaawnlz9q5pr6srv26r"; - system = "april-lib.dfns.numeric"; - asd = "april-lib.dfns.numeric"; - }); - systems = [ "april-lib.dfns.numeric" ]; - lispLibs = [ (getAttr "april" pkgs) ]; - }; - april-lib_dot_dfns_dot_power = { - pname = "april-lib.dfns.power"; - version = "20220707-git"; - asds = [ "april-lib.dfns.power" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2022-07-07/april-20220707-git.tgz"; - sha256 = "016mfldk98j1kbj8fpqwzhvdkfbmqsfbzjaawnlz9q5pr6srv26r"; - system = "april-lib.dfns.power"; - asd = "april-lib.dfns.power"; - }); - systems = [ "april-lib.dfns.power" ]; - lispLibs = [ (getAttr "april" pkgs) (getAttr "april-lib_dot_dfns_dot_array" pkgs) ]; - }; - april-lib_dot_dfns_dot_string = { - pname = "april-lib.dfns.string"; - version = "20220707-git"; - asds = [ "april-lib.dfns.string" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2022-07-07/april-20220707-git.tgz"; - sha256 = "016mfldk98j1kbj8fpqwzhvdkfbmqsfbzjaawnlz9q5pr6srv26r"; - system = "april-lib.dfns.string"; - asd = "april-lib.dfns.string"; - }); - systems = [ "april-lib.dfns.string" ]; - lispLibs = [ (getAttr "april" pkgs) (getAttr "april-lib_dot_dfns_dot_array" pkgs) ]; - }; - april-lib_dot_dfns_dot_tree = { - pname = "april-lib.dfns.tree"; - version = "20220707-git"; - asds = [ "april-lib.dfns.tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2022-07-07/april-20220707-git.tgz"; - sha256 = "016mfldk98j1kbj8fpqwzhvdkfbmqsfbzjaawnlz9q5pr6srv26r"; - system = "april-lib.dfns.tree"; - asd = "april-lib.dfns.tree"; - }); - systems = [ "april-lib.dfns.tree" ]; - lispLibs = [ (getAttr "april" pkgs) (getAttr "april-lib_dot_dfns_dot_array" pkgs) (getAttr "april-lib_dot_dfns_dot_power" pkgs) ]; - }; - arc-compat = { - pname = "arc-compat"; - version = "20220331-git"; - asds = [ "arc-compat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/arc-compat/2022-03-31/arc-compat-20220331-git.tgz"; - sha256 = "0jdab12ywxk82ii9clwrcl9afp08yqzq5mgj099ykmad6m3q02lm"; - system = "arc-compat"; - asd = "arc-compat"; - }); - systems = [ "arc-compat" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-fad" pkgs) (getAttr "fiveam" pkgs) (getAttr "ironclad" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - architecture_dot_builder-protocol = { - pname = "architecture.builder-protocol"; - version = "20221106-git"; - asds = [ "architecture.builder-protocol" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2022-11-06/architecture.builder-protocol-20221106-git.tgz"; - sha256 = "0nv5wmcf7nvh44148cvq6fvz8zjm212rzzn5r3bi72phpywjxc9v"; - system = "architecture.builder-protocol"; - asd = "architecture.builder-protocol"; - }); - systems = [ "architecture.builder-protocol" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - architecture_dot_builder-protocol_dot_inspection = { - pname = "architecture.builder-protocol.inspection"; - version = "20221106-git"; - asds = [ "architecture.builder-protocol.inspection" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2022-11-06/architecture.builder-protocol-20221106-git.tgz"; - sha256 = "0nv5wmcf7nvh44148cvq6fvz8zjm212rzzn5r3bi72phpywjxc9v"; - system = "architecture.builder-protocol.inspection"; - asd = "architecture.builder-protocol.inspection"; - }); - systems = [ "architecture.builder-protocol.inspection" ]; - lispLibs = [ (getAttr "architecture_dot_builder-protocol" pkgs) (getAttr "clouseau" pkgs) ]; - }; - architecture_dot_builder-protocol_dot_json = { - pname = "architecture.builder-protocol.json"; - version = "20221106-git"; - asds = [ "architecture.builder-protocol.json" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2022-11-06/architecture.builder-protocol-20221106-git.tgz"; - sha256 = "0nv5wmcf7nvh44148cvq6fvz8zjm212rzzn5r3bi72phpywjxc9v"; - system = "architecture.builder-protocol.json"; - asd = "architecture.builder-protocol.json"; - }); - systems = [ "architecture.builder-protocol.json" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_builder-protocol" pkgs) (getAttr "cl-json" pkgs) ]; - }; - architecture_dot_builder-protocol_dot_json_slash_test = { - pname = "architecture.builder-protocol.json_test"; - version = "20221106-git"; - asds = [ "architecture.builder-protocol.json" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2022-11-06/architecture.builder-protocol-20221106-git.tgz"; - sha256 = "0nv5wmcf7nvh44148cvq6fvz8zjm212rzzn5r3bi72phpywjxc9v"; - system = "architecture.builder-protocol.json"; - asd = "architecture.builder-protocol.json"; - }); - systems = [ "architecture.builder-protocol.json/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_builder-protocol" pkgs) (getAttr "architecture_dot_builder-protocol_dot_json" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - architecture_dot_builder-protocol_dot_print-tree = { - pname = "architecture.builder-protocol.print-tree"; - version = "20221106-git"; - asds = [ "architecture.builder-protocol.print-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2022-11-06/architecture.builder-protocol-20221106-git.tgz"; - sha256 = "0nv5wmcf7nvh44148cvq6fvz8zjm212rzzn5r3bi72phpywjxc9v"; - system = "architecture.builder-protocol.print-tree"; - asd = "architecture.builder-protocol.print-tree"; - }); - systems = [ "architecture.builder-protocol.print-tree" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_builder-protocol" pkgs) (getAttr "utilities_dot_print-tree" pkgs) ]; - }; - architecture_dot_builder-protocol_dot_print-tree_slash_test = { - pname = "architecture.builder-protocol.print-tree_test"; - version = "20221106-git"; - asds = [ "architecture.builder-protocol.print-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2022-11-06/architecture.builder-protocol-20221106-git.tgz"; - sha256 = "0nv5wmcf7nvh44148cvq6fvz8zjm212rzzn5r3bi72phpywjxc9v"; - system = "architecture.builder-protocol.print-tree"; - asd = "architecture.builder-protocol.print-tree"; - }); - systems = [ "architecture.builder-protocol.print-tree/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_builder-protocol_dot_print-tree" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - architecture_dot_builder-protocol_dot_universal-builder = { - pname = "architecture.builder-protocol.universal-builder"; - version = "20221106-git"; - asds = [ "architecture.builder-protocol.universal-builder" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2022-11-06/architecture.builder-protocol-20221106-git.tgz"; - sha256 = "0nv5wmcf7nvh44148cvq6fvz8zjm212rzzn5r3bi72phpywjxc9v"; - system = "architecture.builder-protocol.universal-builder"; - asd = "architecture.builder-protocol.universal-builder"; - }); - systems = [ "architecture.builder-protocol.universal-builder" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_builder-protocol" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - architecture_dot_builder-protocol_dot_universal-builder_slash_test = { - pname = "architecture.builder-protocol.universal-builder_test"; - version = "20221106-git"; - asds = [ "architecture.builder-protocol.universal-builder" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2022-11-06/architecture.builder-protocol-20221106-git.tgz"; - sha256 = "0nv5wmcf7nvh44148cvq6fvz8zjm212rzzn5r3bi72phpywjxc9v"; - system = "architecture.builder-protocol.universal-builder"; - asd = "architecture.builder-protocol.universal-builder"; - }); - systems = [ "architecture.builder-protocol.universal-builder/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_builder-protocol" pkgs) (getAttr "architecture_dot_builder-protocol_dot_universal-builder" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - architecture_dot_builder-protocol_dot_xpath = { - pname = "architecture.builder-protocol.xpath"; - version = "20221106-git"; - asds = [ "architecture.builder-protocol.xpath" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2022-11-06/architecture.builder-protocol-20221106-git.tgz"; - sha256 = "0nv5wmcf7nvh44148cvq6fvz8zjm212rzzn5r3bi72phpywjxc9v"; - system = "architecture.builder-protocol.xpath"; - asd = "architecture.builder-protocol.xpath"; - }); - systems = [ "architecture.builder-protocol.xpath" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_builder-protocol" pkgs) (getAttr "xpath" pkgs) ]; - }; - architecture_dot_builder-protocol_dot_xpath_slash_test = { - pname = "architecture.builder-protocol.xpath_test"; - version = "20221106-git"; - asds = [ "architecture.builder-protocol.xpath" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2022-11-06/architecture.builder-protocol-20221106-git.tgz"; - sha256 = "0nv5wmcf7nvh44148cvq6fvz8zjm212rzzn5r3bi72phpywjxc9v"; - system = "architecture.builder-protocol.xpath"; - asd = "architecture.builder-protocol.xpath"; - }); - systems = [ "architecture.builder-protocol.xpath/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_builder-protocol_dot_xpath" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - architecture_dot_builder-protocol_slash_test = { - pname = "architecture.builder-protocol_test"; - version = "20221106-git"; - asds = [ "architecture.builder-protocol" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.builder-protocol/2022-11-06/architecture.builder-protocol-20221106-git.tgz"; - sha256 = "0nv5wmcf7nvh44148cvq6fvz8zjm212rzzn5r3bi72phpywjxc9v"; - system = "architecture.builder-protocol"; - asd = "architecture.builder-protocol"; - }); - systems = [ "architecture.builder-protocol/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_builder-protocol" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - architecture_dot_service-provider = { - pname = "architecture.service-provider"; - version = "20191007-git"; - asds = [ "architecture.service-provider" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.service-provider/2019-10-07/architecture.service-provider-20191007-git.tgz"; - sha256 = "0n4a299md5z0wvk6j3my4ii6cs198fqgizz1swic89p1qz5n2fjm"; - system = "architecture.service-provider"; - asd = "architecture.service-provider"; - }); - systems = [ "architecture.service-provider" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "let-plus" pkgs) (getAttr "more-conditions" pkgs) (getAttr "utilities_dot_print-items" pkgs) ]; - }; - architecture_dot_service-provider-and-hooks = { - pname = "architecture.service-provider-and-hooks"; - version = "20191007-git"; - asds = [ "architecture.service-provider-and-hooks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.service-provider/2019-10-07/architecture.service-provider-20191007-git.tgz"; - sha256 = "0n4a299md5z0wvk6j3my4ii6cs198fqgizz1swic89p1qz5n2fjm"; - system = "architecture.service-provider-and-hooks"; - asd = "architecture.service-provider-and-hooks"; - }); - systems = [ "architecture.service-provider-and-hooks" ]; - lispLibs = [ (getAttr "cl-hooks" pkgs) (getAttr "architecture_dot_service-provider" pkgs) ]; - }; - architecture_dot_service-provider-and-hooks_slash_test = { - pname = "architecture.service-provider-and-hooks_test"; - version = "20191007-git"; - asds = [ "architecture.service-provider-and-hooks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.service-provider/2019-10-07/architecture.service-provider-20191007-git.tgz"; - sha256 = "0n4a299md5z0wvk6j3my4ii6cs198fqgizz1swic89p1qz5n2fjm"; - system = "architecture.service-provider-and-hooks"; - asd = "architecture.service-provider-and-hooks"; - }); - systems = [ "architecture.service-provider-and-hooks/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_service-provider" pkgs) (getAttr "architecture_dot_service-provider-and-hooks" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) (getAttr "more-conditions" pkgs) ]; - meta = { - broken = true; - }; - }; - architecture_dot_service-provider_slash_test = { - pname = "architecture.service-provider_test"; - version = "20191007-git"; - asds = [ "architecture.service-provider" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.service-provider/2019-10-07/architecture.service-provider-20191007-git.tgz"; - sha256 = "0n4a299md5z0wvk6j3my4ii6cs198fqgizz1swic89p1qz5n2fjm"; - system = "architecture.service-provider"; - asd = "architecture.service-provider"; - }); - systems = [ "architecture.service-provider/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_service-provider" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) (getAttr "more-conditions" pkgs) ]; - meta = { - broken = true; - }; - }; - archive = { - pname = "archive"; - version = "20160318-git"; - asds = [ "archive" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/archive/2016-03-18/archive-20160318-git.tgz"; - sha256 = "0pvsc9fmybx7rxd0kmzq4shi6hszdpwdc1sfy7jwyfxf8n3hnv4p"; - system = "archive"; - asd = "archive"; - }); - systems = [ "archive" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - arith = { - pname = "arith"; - version = "20170830-git"; - asds = [ "arith" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/paren-test/2017-08-30/paren-test-20170830-git.tgz"; - sha256 = "0b2d3kcv3n4b0dm67pzhxx8wxjsgnb32bw2dsprblc7149gaczdr"; - system = "arith"; - asd = "arith"; - }); - systems = [ "arith" ]; - lispLibs = [ (getAttr "paren-files" pkgs) (getAttr "paren-test" pkgs) (getAttr "parenscript" pkgs) ]; - }; - arithmetic-operators-as-words = { - pname = "arithmetic-operators-as-words"; - version = "20200610-git"; - asds = [ "arithmetic-operators-as-words" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/arithmetic-operators-as-words/2020-06-10/arithmetic-operators-as-words-20200610-git.tgz"; - sha256 = "1bcfkbq3kqns2ng0cdmj81c72j63641pqlskg4xrzkgkh25bhkks"; - system = "arithmetic-operators-as-words"; - asd = "arithmetic-operators-as-words"; - }); - systems = [ "arithmetic-operators-as-words" ]; - lispLibs = [ ]; - }; - arnesi = { - pname = "arnesi"; - version = "20170403-git"; - asds = [ "arnesi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz"; - sha256 = "0jgj2xgd1gq6rf8ia43lkmbrbxnp8rgs053br9azfa25ygk3ikbh"; - system = "arnesi"; - asd = "arnesi"; - }); - systems = [ "arnesi" ]; - lispLibs = [ (getAttr "collectors" pkgs) ]; - }; - arnesi_slash_cl-ppcre-extras = { - pname = "arnesi_cl-ppcre-extras"; - version = "20170403-git"; - asds = [ "arnesi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz"; - sha256 = "0jgj2xgd1gq6rf8ia43lkmbrbxnp8rgs053br9azfa25ygk3ikbh"; - system = "arnesi"; - asd = "arnesi"; - }); - systems = [ "arnesi/cl-ppcre-extras" ]; - lispLibs = [ (getAttr "arnesi" pkgs) (getAttr "cl-ppcre" pkgs) ]; - meta = { - broken = true; - }; - }; - arnesi_slash_slime-extras = { - pname = "arnesi_slime-extras"; - version = "20170403-git"; - asds = [ "arnesi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz"; - sha256 = "0jgj2xgd1gq6rf8ia43lkmbrbxnp8rgs053br9azfa25ygk3ikbh"; - system = "arnesi"; - asd = "arnesi"; - }); - systems = [ "arnesi/slime-extras" ]; - lispLibs = [ (getAttr "arnesi" pkgs) (getAttr "swank" pkgs) ]; - meta = { - broken = true; - }; - }; - array-operations = { - pname = "array-operations"; - version = "1.0.0"; - asds = [ "array-operations" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/array-operations/2022-07-07/array-operations-1.0.0.tgz"; - sha256 = "12rmijvz5gpri5f5vi5j49bngiy2c01f5755rl39kxpv1b886gvy"; - system = "array-operations"; - asd = "array-operations"; - }); - systems = [ "array-operations" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "let-plus" pkgs) ]; - }; - array-operations_slash_tests = { - pname = "array-operations_tests"; - version = "1.0.0"; - asds = [ "array-operations" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/array-operations/2022-07-07/array-operations-1.0.0.tgz"; - sha256 = "12rmijvz5gpri5f5vi5j49bngiy2c01f5755rl39kxpv1b886gvy"; - system = "array-operations"; - asd = "array-operations"; - }); - systems = [ "array-operations/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "array-operations" pkgs) (getAttr "clunit2" pkgs) ]; - meta = { - broken = true; - }; - }; - array-utils = { - pname = "array-utils"; - version = "20221106-git"; - asds = [ "array-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/array-utils/2022-11-06/array-utils-20221106-git.tgz"; - sha256 = "0d7nddak8h2aa82z11vdbd97srk5bdgq41pzmibsz3ymspnndicd"; - system = "array-utils"; - asd = "array-utils"; - }); - systems = [ "array-utils" ]; - lispLibs = [ ]; - }; - array-utils-test = { - pname = "array-utils-test"; - version = "20221106-git"; - asds = [ "array-utils-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/array-utils/2022-11-06/array-utils-20221106-git.tgz"; - sha256 = "0d7nddak8h2aa82z11vdbd97srk5bdgq41pzmibsz3ymspnndicd"; - system = "array-utils-test"; - asd = "array-utils-test"; - }); - systems = [ "array-utils-test" ]; - lispLibs = [ (getAttr "array-utils" pkgs) (getAttr "parachute" pkgs) ]; - }; - arrival = { - pname = "arrival"; - version = "20211209-git"; - asds = [ "arrival" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/arrival/2021-12-09/arrival-20211209-git.tgz"; - sha256 = "1iwdk5fdismw91ln5wdnn8c8xv06fbgiwbvdj2gy2hpp8f3qk00b"; - system = "arrival"; - asd = "arrival"; - }); - systems = [ "arrival" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "log4cl" pkgs) (getAttr "trivia" pkgs) (getAttr "trivia_dot_quasiquote" pkgs) ]; - }; - arrow-macros = { - pname = "arrow-macros"; - version = "20201220-git"; - asds = [ "arrow-macros" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/arrow-macros/2020-12-20/arrow-macros-20201220-git.tgz"; - sha256 = "1b7vldvhn8zx60h010573gmqv2igarpnb6h3pq8qydhwfza0xd4g"; - system = "arrow-macros"; - asd = "arrow-macros"; - }); - systems = [ "arrow-macros" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - arrow-macros-test = { - pname = "arrow-macros-test"; - version = "20201220-git"; - asds = [ "arrow-macros-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/arrow-macros/2020-12-20/arrow-macros-20201220-git.tgz"; - sha256 = "1b7vldvhn8zx60h010573gmqv2igarpnb6h3pq8qydhwfza0xd4g"; - system = "arrow-macros-test"; - asd = "arrow-macros-test"; - }); - systems = [ "arrow-macros-test" ]; - lispLibs = [ (getAttr "arrow-macros" pkgs) (getAttr "fiveam" pkgs) ]; - }; - arrows = { - pname = "arrows"; - version = "20181018-git"; - asds = [ "arrows" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz"; - sha256 = "042k9vkssrqx9nhp14wdzm942zgdxvp35mba0p2syz98i75im2yy"; - system = "arrows"; - asd = "arrows"; - }); - systems = [ "arrows" ]; - lispLibs = [ ]; - }; - arrows_slash_test = { - pname = "arrows_test"; - version = "20181018-git"; - asds = [ "arrows" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz"; - sha256 = "042k9vkssrqx9nhp14wdzm942zgdxvp35mba0p2syz98i75im2yy"; - system = "arrows"; - asd = "arrows"; - }); - systems = [ "arrows/test" ]; - lispLibs = [ (getAttr "arrows" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - meta = { - broken = true; - }; - }; - ascii-strings = { - pname = "ascii-strings"; - version = "20211209-git"; - asds = [ "ascii-strings" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz"; - sha256 = "0zndlkw3qy3vw4px4qv884z6232w8zfaliyc88irjwizdv35wcq9"; - system = "ascii-strings"; - asd = "ascii-strings"; - }); - systems = [ "ascii-strings" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) ]; - }; - asd-generator = { - pname = "asd-generator"; - version = "20190107-git"; - asds = [ "asd-generator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asd-generator/2019-01-07/asd-generator-20190107-git.tgz"; - sha256 = "0yiybl7b9x1f85v0drj0yw9821y3yfhya4n6gycnv5vvx6jp9by4"; - system = "asd-generator"; - asd = "asd-generator"; - }); - systems = [ "asd-generator" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "iterate" pkgs) (getAttr "trivia" pkgs) ]; - }; - asd-generator-test = { - pname = "asd-generator-test"; - version = "20190107-git"; - asds = [ "asd-generator-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asd-generator/2019-01-07/asd-generator-20190107-git.tgz"; - sha256 = "0yiybl7b9x1f85v0drj0yw9821y3yfhya4n6gycnv5vvx6jp9by4"; - system = "asd-generator-test"; - asd = "asd-generator-test"; - }); - systems = [ "asd-generator-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "iterate" pkgs) ]; - }; - asdf = { - pname = "asdf"; - version = "3.3.6"; - asds = [ "asdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uiop/2022-11-06/uiop-3.3.6.tgz"; - sha256 = "080lcdw90j30gg2vv9bnwj21aq08mp1kk4nax3ffkjssnrnjwhmr"; - system = "asdf"; - asd = "uiop"; - }); - systems = [ "asdf" ]; - lispLibs = [ ]; - }; - asdf-dependency-grovel = { - pname = "asdf-dependency-grovel"; - version = "20170403-git"; - asds = [ "asdf-dependency-grovel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asdf-dependency-grovel/2017-04-03/asdf-dependency-grovel-20170403-git.tgz"; - sha256 = "1y4kdqsda4ira4r9dws6kxzzv6mg45q3lkmb2c9mg9q7ksc5glif"; - system = "asdf-dependency-grovel"; - asd = "asdf-dependency-grovel"; - }); - systems = [ "asdf-dependency-grovel" ]; - lispLibs = [ ]; - }; - asdf-driver = { - pname = "asdf-driver"; - version = "3.3.6"; - asds = [ "asdf-driver" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uiop/2022-11-06/uiop-3.3.6.tgz"; - sha256 = "080lcdw90j30gg2vv9bnwj21aq08mp1kk4nax3ffkjssnrnjwhmr"; - system = "asdf-driver"; - asd = "asdf-driver"; - }); - systems = [ "asdf-driver" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - asdf-encodings = { - pname = "asdf-encodings"; - version = "20191007-git"; - asds = [ "asdf-encodings" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asdf-encodings/2019-10-07/asdf-encodings-20191007-git.tgz"; - sha256 = "1yn77nhrz5w2s7nlafxjnk9j8fsrz7ivrm7nbj4r726bwc5knky6"; - system = "asdf-encodings"; - asd = "asdf-encodings"; - }); - systems = [ "asdf-encodings" ]; - lispLibs = [ ]; - }; - asdf-encodings_slash_test = { - pname = "asdf-encodings_test"; - version = "20191007-git"; - asds = [ "asdf-encodings" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asdf-encodings/2019-10-07/asdf-encodings-20191007-git.tgz"; - sha256 = "1yn77nhrz5w2s7nlafxjnk9j8fsrz7ivrm7nbj4r726bwc5knky6"; - system = "asdf-encodings"; - asd = "asdf-encodings"; - }); - systems = [ "asdf-encodings/test" ]; - lispLibs = [ (getAttr "asdf-encodings" pkgs) (getAttr "fare-utils" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - meta = { - broken = true; - }; - }; - asdf-finalizers = { - pname = "asdf-finalizers"; - version = "20221106-git"; - asds = [ "asdf-finalizers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asdf-finalizers/2022-11-06/asdf-finalizers-20221106-git.tgz"; - sha256 = "1w56c9yjjydjshsgqxz57qlp2v3r4ilbisnsgiqphvxnhvd41y0v"; - system = "asdf-finalizers"; - asd = "asdf-finalizers"; - }); - systems = [ "asdf-finalizers" ]; - lispLibs = [ ]; - }; - asdf-linguist = { - pname = "asdf-linguist"; - version = "20150923-git"; - asds = [ "asdf-linguist" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asdf-linguist/2015-09-23/asdf-linguist-20150923-git.tgz"; - sha256 = "14jaqmxxh70f1jf58mxb117951iql2sjxymmbjyqniqwazznbd9a"; - system = "asdf-linguist"; - asd = "asdf-linguist"; - }); - systems = [ "asdf-linguist" ]; - lispLibs = [ (getAttr "inferior-shell" pkgs) (getAttr "parenscript" pkgs) ]; - }; - asdf-manager = { - pname = "asdf-manager"; - version = "20160208-git"; - asds = [ "asdf-manager" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asdf-manager/2016-02-08/asdf-manager-20160208-git.tgz"; - sha256 = "0jw7d0vg13v1l1fwwhsw04n6w3c49vsbmq6vrlrkh95aayc5413w"; - system = "asdf-manager"; - asd = "asdf-manager"; - }); - systems = [ "asdf-manager" ]; - lispLibs = [ (getAttr "trivial-download" pkgs) (getAttr "trivial-extract" pkgs) (getAttr "uiop" pkgs) ]; - }; - asdf-manager-test = { - pname = "asdf-manager-test"; - version = "20160208-git"; - asds = [ "asdf-manager-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asdf-manager/2016-02-08/asdf-manager-20160208-git.tgz"; - sha256 = "0jw7d0vg13v1l1fwwhsw04n6w3c49vsbmq6vrlrkh95aayc5413w"; - system = "asdf-manager-test"; - asd = "asdf-manager-test"; - }); - systems = [ "asdf-manager-test" ]; - lispLibs = [ (getAttr "asdf-manager" pkgs) (getAttr "fiveam" pkgs) ]; - }; - asdf-nst = { - pname = "asdf-nst"; - version = "20210807-git"; - asds = [ "asdf-nst" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; - sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; - system = "asdf-nst"; - asd = "asdf-nst"; - }); - systems = [ "asdf-nst" ]; - lispLibs = [ ]; - }; - asdf-package-system = { - pname = "asdf-package-system"; - version = "20150608-git"; - asds = [ "asdf-package-system" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz"; - sha256 = "1q4qgvbl64c4zdbq91by1la8licdgam7ybnhvg2bixdhq4v693sj"; - system = "asdf-package-system"; - asd = "asdf-package-system"; - }); - systems = [ "asdf-package-system" ]; - lispLibs = [ ]; - }; - asdf-system-connections = { - pname = "asdf-system-connections"; - version = "20170124-git"; - asds = [ "asdf-system-connections" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz"; - sha256 = "06kg0m8bv383qq3r34x0f8hz6p6zxcw02qn7kj960vcnrp5a5b3y"; - system = "asdf-system-connections"; - asd = "asdf-system-connections"; - }); - systems = [ "asdf-system-connections" ]; - lispLibs = [ ]; - }; - asdf-viz = { - pname = "asdf-viz"; - version = "20200610-git"; - asds = [ "asdf-viz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asdf-viz/2020-06-10/asdf-viz-20200610-git.tgz"; - sha256 = "1hj9ac1m2kz8x65n62gd1s2k2x9pip9a85pnmib53qsks3a9sc4z"; - system = "asdf-viz"; - asd = "asdf-viz"; - }); - systems = [ "asdf-viz" ]; - lispLibs = [ (getAttr "cl-dot" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "swank" pkgs) (getAttr "trivia" pkgs) ]; - }; - aserve = { - pname = "aserve"; - version = "20190813-git"; - asds = [ "aserve" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz"; - sha256 = "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa"; - system = "aserve"; - asd = "aserve"; - }); - systems = [ "aserve" ]; - lispLibs = [ (getAttr "acl-compat" pkgs) (getAttr "htmlgen" pkgs) ]; - }; - asn1 = { - pname = "asn1"; - version = "20220331-git"; - asds = [ "asn1" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asn1/2022-03-31/asn1-20220331-git.tgz"; - sha256 = "16gs4xznmg19ii0cg7g2yxrk9ls5vah8ynjj80s99rv8wi3789z1"; - system = "asn1"; - asd = "asn1"; - }); - systems = [ "asn1" ]; - lispLibs = [ (getAttr "fast-io" pkgs) (getAttr "ironclad" pkgs) (getAttr "trivia" pkgs) ]; - }; - asn1_slash_tests = { - pname = "asn1_tests"; - version = "20220331-git"; - asds = [ "asn1" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asn1/2022-03-31/asn1-20220331-git.tgz"; - sha256 = "16gs4xznmg19ii0cg7g2yxrk9ls5vah8ynjj80s99rv8wi3789z1"; - system = "asn1"; - asd = "asn1"; - }); - systems = [ "asn1/tests" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - assert-p = { - pname = "assert-p"; - version = "20200610-git"; - asds = [ "assert-p" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/assert-p/2020-06-10/assert-p-20200610-git.tgz"; - sha256 = "1x24rkqkqiw8zd26swi9rmhfplkmr5scz3bhjwccah9d2s36b1xs"; - system = "assert-p"; - asd = "assert-p"; - }); - systems = [ "assert-p" ]; - lispLibs = [ (getAttr "assertion-error" pkgs) (getAttr "simplet-asdf" pkgs) ]; - }; - assert-p_slash_test = { - pname = "assert-p_test"; - version = "20200610-git"; - asds = [ "assert-p" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/assert-p/2020-06-10/assert-p-20200610-git.tgz"; - sha256 = "1x24rkqkqiw8zd26swi9rmhfplkmr5scz3bhjwccah9d2s36b1xs"; - system = "assert-p"; - asd = "assert-p"; - }); - systems = [ "assert-p/test" ]; - lispLibs = [ (getAttr "assert-p" pkgs) (getAttr "simplet" pkgs) (getAttr "simplet-asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - assertion-error = { - pname = "assertion-error"; - version = "20191227-git"; - asds = [ "assertion-error" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/assertion-error/2019-12-27/assertion-error-20191227-git.tgz"; - sha256 = "0ix23kkakmf4nwx852zsssb831jvajr3qyppqfyks7y1ls617svn"; - system = "assertion-error"; - asd = "assertion-error"; - }); - systems = [ "assertion-error" ]; - lispLibs = [ (getAttr "dissect" pkgs) ]; - }; - assertion-error_slash_test = { - pname = "assertion-error_test"; - version = "20191227-git"; - asds = [ "assertion-error" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/assertion-error/2019-12-27/assertion-error-20191227-git.tgz"; - sha256 = "0ix23kkakmf4nwx852zsssb831jvajr3qyppqfyks7y1ls617svn"; - system = "assertion-error"; - asd = "assertion-error"; - }); - systems = [ "assertion-error/test" ]; - lispLibs = [ (getAttr "assertion-error" pkgs) ]; - meta = { - broken = true; - }; - }; - assoc-utils = { - pname = "assoc-utils"; - version = "20221106-git"; - asds = [ "assoc-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/assoc-utils/2022-11-06/assoc-utils-20221106-git.tgz"; - sha256 = "0mqb5iw4qwga66y7flifb1n0y5hp4gc3x8xfg4cild46x7mjqxws"; - system = "assoc-utils"; - asd = "assoc-utils"; - }); - systems = [ "assoc-utils" ]; - lispLibs = [ ]; - }; - assoc-utils-test = { - pname = "assoc-utils-test"; - version = "20221106-git"; - asds = [ "assoc-utils-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/assoc-utils/2022-11-06/assoc-utils-20221106-git.tgz"; - sha256 = "0mqb5iw4qwga66y7flifb1n0y5hp4gc3x8xfg4cild46x7mjqxws"; - system = "assoc-utils-test"; - asd = "assoc-utils-test"; - }); - systems = [ "assoc-utils-test" ]; - lispLibs = [ (getAttr "assoc-utils" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - asteroids = { - pname = "asteroids"; - version = "20191007-git"; - asds = [ "asteroids" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asteroids/2019-10-07/asteroids-20191007-git.tgz"; - sha256 = "1wdzwpizgy477ny6pxjshj3q25phdxsjfq8cvrbx0x7k5w8fkg50"; - system = "asteroids"; - asd = "asteroids"; - }); - systems = [ "asteroids" ]; - lispLibs = [ (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-gfx" pkgs) (getAttr "lispbuilder-sdl-mixer" pkgs) ]; - }; - astonish = { - pname = "astonish"; - version = "20210124-git"; - asds = [ "astonish" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/astonish/2021-01-24/astonish-20210124-git.tgz"; - sha256 = "14qphx97q4gqcc71figc6r3cgy89rn9c43sh35fzxkln9ydk2pr6"; - system = "astonish"; - asd = "astonish"; - }); - systems = [ "astonish" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "uiop" pkgs) ]; - }; - astonish_slash_tests = { - pname = "astonish_tests"; - version = "20210124-git"; - asds = [ "astonish" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/astonish/2021-01-24/astonish-20210124-git.tgz"; - sha256 = "14qphx97q4gqcc71figc6r3cgy89rn9c43sh35fzxkln9ydk2pr6"; - system = "astonish"; - asd = "astonish"; - }); - systems = [ "astonish/tests" ]; - lispLibs = [ (getAttr "astonish" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - async-process = { - pname = "async-process"; - version = "20210531-git"; - asds = [ "async-process" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/async-process/2021-05-31/async-process-20210531-git.tgz"; - sha256 = "0vlhyj4rrkb1bhl1xjf25d1nv09hzpfl6hwymqkn7h6gr2fdp8m1"; - system = "async-process"; - asd = "async-process"; - }); - systems = [ "async-process" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - atdoc = { - pname = "atdoc"; - version = "20120305-git"; - asds = [ "atdoc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/atdoc/2012-03-05/atdoc-20120305-git.tgz"; - sha256 = "1w54phadjj00sy5qz5n0hmhzyjrx26h9hw06756zdpfbzk4f5il6"; - system = "atdoc"; - asd = "atdoc"; - }); - systems = [ "atdoc" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "cxml" pkgs) (getAttr "swank" pkgs) (getAttr "split-sequence" pkgs) (getAttr "xuriella" pkgs) ]; - }; - atomics = { - pname = "atomics"; - version = "20210630-git"; - asds = [ "atomics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/atomics/2021-06-30/atomics-20210630-git.tgz"; - sha256 = "0mp5jdqq0aamdhgnvw149cqqi3zg7dkkibp25qi4rafw1fnpd40z"; - system = "atomics"; - asd = "atomics"; - }); - systems = [ "atomics" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - atomics-test = { - pname = "atomics-test"; - version = "20210630-git"; - asds = [ "atomics-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/atomics/2021-06-30/atomics-20210630-git.tgz"; - sha256 = "0mp5jdqq0aamdhgnvw149cqqi3zg7dkkibp25qi4rafw1fnpd40z"; - system = "atomics-test"; - asd = "atomics-test"; - }); - systems = [ "atomics-test" ]; - lispLibs = [ (getAttr "atomics" pkgs) (getAttr "parachute" pkgs) ]; - }; - audio-tag = { - pname = "audio-tag"; - version = "20210531-git"; - asds = [ "audio-tag" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/audio-tag/2021-05-31/audio-tag-20210531-git.tgz"; - sha256 = "1k9152wakazr34q4q5x8zzv3mjjkf0n9xdg7c2qqwigwws0ysgzh"; - system = "audio-tag"; - asd = "audio-tag"; - }); - systems = [ "audio-tag" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "osicat" pkgs) ]; - }; - audio-tag_slash_tests = { - pname = "audio-tag_tests"; - version = "20210531-git"; - asds = [ "audio-tag" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/audio-tag/2021-05-31/audio-tag-20210531-git.tgz"; - sha256 = "1k9152wakazr34q4q5x8zzv3mjjkf0n9xdg7c2qqwigwws0ysgzh"; - system = "audio-tag"; - asd = "audio-tag"; - }); - systems = [ "audio-tag/tests" ]; - lispLibs = [ (getAttr "audio-tag" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - authenticated-encryption = { - pname = "authenticated-encryption"; - version = "20181018-git"; - asds = [ "authenticated-encryption" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/authenticated-encryption/2018-10-18/authenticated-encryption-20181018-git.tgz"; - sha256 = "0cvl4g0g59z5dicg7q3f9hhqshz2m0a6l2fzic75c3yv28q8m2vr"; - system = "authenticated-encryption"; - asd = "authenticated-encryption"; - }); - systems = [ "authenticated-encryption" ]; - lispLibs = [ (getAttr "ironclad" pkgs) ]; - }; - authenticated-encryption-test = { - pname = "authenticated-encryption-test"; - version = "20181018-git"; - asds = [ "authenticated-encryption-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/authenticated-encryption/2018-10-18/authenticated-encryption-20181018-git.tgz"; - sha256 = "0cvl4g0g59z5dicg7q3f9hhqshz2m0a6l2fzic75c3yv28q8m2vr"; - system = "authenticated-encryption-test"; - asd = "authenticated-encryption-test"; - }); - systems = [ "authenticated-encryption-test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "authenticated-encryption" pkgs) ]; - }; - auto-restart = { - pname = "auto-restart"; - version = "20221106-git"; - asds = [ "auto-restart" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/auto-restart/2022-11-06/auto-restart-20221106-git.tgz"; - sha256 = "1kzcxq57s3qfshvlp9w2yxs6kiyrvssrl94pa3vdf3x7644swrzi"; - system = "auto-restart"; - asd = "auto-restart"; - }); - systems = [ "auto-restart" ]; - lispLibs = [ (getAttr "iterate" pkgs) ]; - }; - auto-restart_slash_tests = { - pname = "auto-restart_tests"; - version = "20221106-git"; - asds = [ "auto-restart" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/auto-restart/2022-11-06/auto-restart-20221106-git.tgz"; - sha256 = "1kzcxq57s3qfshvlp9w2yxs6kiyrvssrl94pa3vdf3x7644swrzi"; - system = "auto-restart"; - asd = "auto-restart"; - }); - systems = [ "auto-restart/tests" ]; - lispLibs = [ (getAttr "auto-restart" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - autoexport = { - pname = "autoexport"; - version = "20211020-git"; - asds = [ "autoexport" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/autoexport/2021-10-20/autoexport-20211020-git.tgz"; - sha256 = "15kzq4hfsracxapxik3i6sxqqnwl7cb9lisgk9krrsk13d97l844"; - system = "autoexport"; - asd = "autoexport"; - }); - systems = [ "autoexport" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - automaton = { - pname = "automaton"; - version = "20221106-git"; - asds = [ "automaton" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "automaton"; - asd = "automaton"; - }); - systems = [ "automaton" ]; - lispLibs = [ ]; - }; - avatar-api = { - pname = "avatar-api"; - version = "20150608-git"; - asds = [ "avatar-api" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/avatar-api/2015-06-08/avatar-api-20150608-git.tgz"; - sha256 = "026s8m0bl13iqyakfxc6zwacvpj2bxxipms1kl3k9ql99yn8imvr"; - system = "avatar-api"; - asd = "avatar-api"; - }); - systems = [ "avatar-api" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "crypto-shortcuts" pkgs) (getAttr "drakma" pkgs) ]; - }; - avatar-api-test = { - pname = "avatar-api-test"; - version = "20150608-git"; - asds = [ "avatar-api-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/avatar-api/2015-06-08/avatar-api-20150608-git.tgz"; - sha256 = "026s8m0bl13iqyakfxc6zwacvpj2bxxipms1kl3k9ql99yn8imvr"; - system = "avatar-api-test"; - asd = "avatar-api-test"; - }); - systems = [ "avatar-api-test" ]; - lispLibs = [ (getAttr "avatar-api" pkgs) (getAttr "fiveam" pkgs) ]; - }; - avl-tree = { - pname = "avl-tree"; - version = "20220707-git"; - asds = [ "avl-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/avl-tree/2022-07-07/avl-tree-20220707-git.tgz"; - sha256 = "1xvh5rpz0kwzx42jrnh3kgqa87z5kmgd7f3fkkydiqj04hknsj7k"; - system = "avl-tree"; - asd = "avl-tree"; - }); - systems = [ "avl-tree" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) ]; - }; - aws-foundation = { - pname = "aws-foundation"; - version = "20180711-git"; - asds = [ "aws-foundation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/aws-foundation/2018-07-11/aws-foundation-20180711-git.tgz"; - sha256 = "1f5af22qw583frqjhnkf9wcccdkkpjiv0bbnlqqk7fxzm9pqpvhb"; - system = "aws-foundation"; - asd = "aws-foundation"; - }); - systems = [ "aws-foundation" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-json-helper" pkgs) (getAttr "dexador" pkgs) (getAttr "ironclad" pkgs) (getAttr "local-time" pkgs) ]; - }; - aws-sign4 = { - pname = "aws-sign4"; - version = "20201220-git"; - asds = [ "aws-sign4" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz"; - sha256 = "1bwqmy9vlq0ilwhp48y05cdfav9inwv4kai8mjj1a95776xjmjnk"; - system = "aws-sign4"; - asd = "aws-sign4"; - }); - systems = [ "aws-sign4" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "ironclad" pkgs) (getAttr "local-time" pkgs) (getAttr "secret-values" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - aws-sign4-example = { - pname = "aws-sign4-example"; - version = "20201220-git"; - asds = [ "aws-sign4-example" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz"; - sha256 = "1bwqmy9vlq0ilwhp48y05cdfav9inwv4kai8mjj1a95776xjmjnk"; - system = "aws-sign4-example"; - asd = "aws-sign4"; - }); - systems = [ "aws-sign4-example" ]; - lispLibs = [ (getAttr "aws-sign4" pkgs) (getAttr "drakma" pkgs) ]; - }; - aws-sign4-tests = { - pname = "aws-sign4-tests"; - version = "20201220-git"; - asds = [ "aws-sign4-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/aws-sign4/2020-12-20/aws-sign4-20201220-git.tgz"; - sha256 = "1bwqmy9vlq0ilwhp48y05cdfav9inwv4kai8mjj1a95776xjmjnk"; - system = "aws-sign4-tests"; - asd = "aws-sign4"; - }); - systems = [ "aws-sign4-tests" ]; - lispLibs = [ (getAttr "aws-sign4" pkgs) ]; - }; - ayah-captcha = { - pname = "ayah-captcha"; - version = "20180228-git"; - asds = [ "ayah-captcha" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ayah-captcha/2018-02-28/ayah-captcha-20180228-git.tgz"; - sha256 = "1l9zg0hj5cd1yda1nnab7byrgkakh5vn3qcd4lmfidbijk6kiamw"; - system = "ayah-captcha"; - asd = "ayah-captcha"; - }); - systems = [ "ayah-captcha" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "drakma" pkgs) ]; - }; - ayah-captcha-demo = { - pname = "ayah-captcha-demo"; - version = "20180228-git"; - asds = [ "ayah-captcha-demo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ayah-captcha/2018-02-28/ayah-captcha-20180228-git.tgz"; - sha256 = "1l9zg0hj5cd1yda1nnab7byrgkakh5vn3qcd4lmfidbijk6kiamw"; - system = "ayah-captcha-demo"; - asd = "ayah-captcha-demo"; - }); - systems = [ "ayah-captcha-demo" ]; - lispLibs = [ (getAttr "ayah-captcha" pkgs) (getAttr "cl-who" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - babel = { - pname = "babel"; - version = "20200925-git"; - asds = [ "babel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz"; - sha256 = "04frn19mngvsh8bh7fb1rfjm8mqk8bgzx5c43dg7z02nfsxkqqak"; - system = "babel"; - asd = "babel"; - }); - systems = [ "babel" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - babel-streams = { - pname = "babel-streams"; - version = "20200925-git"; - asds = [ "babel-streams" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz"; - sha256 = "04frn19mngvsh8bh7fb1rfjm8mqk8bgzx5c43dg7z02nfsxkqqak"; - system = "babel-streams"; - asd = "babel-streams"; - }); - systems = [ "babel-streams" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - babel-tests = { - pname = "babel-tests"; - version = "20200925-git"; - asds = [ "babel-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz"; - sha256 = "04frn19mngvsh8bh7fb1rfjm8mqk8bgzx5c43dg7z02nfsxkqqak"; - system = "babel-tests"; - asd = "babel-tests"; - }); - systems = [ "babel-tests" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - }; - base = { - pname = "base"; - version = "master-1a957fb2-git"; - asds = [ "base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "base"; - asd = "base"; - }); - systems = [ "base" ]; - lispLibs = [ ]; - }; - base-blobs = { - pname = "base-blobs"; - version = "stable-git"; - asds = [ "base-blobs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/base-blobs/2020-10-16/base-blobs-stable-git.tgz"; - sha256 = "06m8rvczj309wq8by697gvrklhff5mnn5n5sky7i11bnszrxysys"; - system = "base-blobs"; - asd = "base-blobs"; - }); - systems = [ "base-blobs" ]; - lispLibs = [ (getAttr "bodge-blobs-support" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - base64 = { - pname = "base64"; - version = "20181018-git"; - asds = [ "base64" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/base64/2018-10-18/base64-20181018-git.tgz"; - sha256 = "0qkqcrgmcqshcsnzn4pcyk8d1j9c7pks2qf51p1hfybz5shxkqkh"; - system = "base64"; - asd = "base64"; - }); - systems = [ "base64" ]; - lispLibs = [ ]; - }; - basic-binary-ipc = { - pname = "basic-binary-ipc"; - version = "20211209-git"; - asds = [ "basic-binary-ipc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/basic-binary-ipc/2021-12-09/basic-binary-ipc-20211209-git.tgz"; - sha256 = "0bsxy27mnmzr6vys96cs2is57zvk0n9hlif9llnp4q9m2wzycbwm"; - system = "basic-binary-ipc"; - asd = "basic-binary-ipc"; - }); - systems = [ "basic-binary-ipc" ]; - lispLibs = [ (getAttr "cffi-grovel" pkgs) ]; - }; - basic-binary-ipc-tests = { - pname = "basic-binary-ipc-tests"; - version = "20211209-git"; - asds = [ "basic-binary-ipc-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/basic-binary-ipc/2021-12-09/basic-binary-ipc-20211209-git.tgz"; - sha256 = "0bsxy27mnmzr6vys96cs2is57zvk0n9hlif9llnp4q9m2wzycbwm"; - system = "basic-binary-ipc-tests"; - asd = "basic-binary-ipc-tests"; - }); - systems = [ "basic-binary-ipc-tests" ]; - lispLibs = [ (getAttr "basic-binary-ipc" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - bdef = { - pname = "bdef"; - version = "20221106-git"; - asds = [ "bdef" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bdef/2022-11-06/bdef-20221106-git.tgz"; - sha256 = "1zqal3xhbcrbq182h15a5qxpqsxm82400xyq34svzmsrk2nfrh08"; - system = "bdef"; - asd = "bdef"; - }); - systems = [ "bdef" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "eager-future2" pkgs) (getAttr "jsown" pkgs) (getAttr "mutility" pkgs) (getAttr "parse-float" pkgs) ]; - }; - bdef_slash_cl-collider = { - pname = "bdef_cl-collider"; - version = "20221106-git"; - asds = [ "bdef" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bdef/2022-11-06/bdef-20221106-git.tgz"; - sha256 = "1zqal3xhbcrbq182h15a5qxpqsxm82400xyq34svzmsrk2nfrh08"; - system = "bdef"; - asd = "bdef"; - }); - systems = [ "bdef/cl-collider" ]; - lispLibs = [ (getAttr "bdef" pkgs) (getAttr "cl-collider" pkgs) ]; - meta = { - broken = true; - }; - }; - bdef_slash_cl-patterns = { - pname = "bdef_cl-patterns"; - version = "20221106-git"; - asds = [ "bdef" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bdef/2022-11-06/bdef-20221106-git.tgz"; - sha256 = "1zqal3xhbcrbq182h15a5qxpqsxm82400xyq34svzmsrk2nfrh08"; - system = "bdef"; - asd = "bdef"; - }); - systems = [ "bdef/cl-patterns" ]; - lispLibs = [ (getAttr "bdef" pkgs) (getAttr "cl-patterns" pkgs) ]; - meta = { - broken = true; - }; - }; - bdef_slash_tests = { - pname = "bdef_tests"; - version = "20221106-git"; - asds = [ "bdef" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bdef/2022-11-06/bdef-20221106-git.tgz"; - sha256 = "1zqal3xhbcrbq182h15a5qxpqsxm82400xyq34svzmsrk2nfrh08"; - system = "bdef"; - asd = "bdef"; - }); - systems = [ "bdef/tests" ]; - lispLibs = [ (getAttr "bdef" pkgs) (getAttr "cl-patterns" pkgs) (getAttr "fiveam" pkgs) (getAttr "mutility" pkgs) ]; - meta = { - broken = true; - }; - }; - beast = { - pname = "beast"; - version = "20211020-hg"; - asds = [ "beast" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/beast/2021-10-20/beast-20211020-hg.tgz"; - sha256 = "0rb7yxr4clsdbgyjz9d8inxgj7zs0knrngl7gb6b8ky1vyrv12k4"; - system = "beast"; - asd = "beast"; - }); - systems = [ "beast" ]; - lispLibs = [ ]; - }; - beast_slash_test = { - pname = "beast_test"; - version = "20211020-hg"; - asds = [ "beast" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/beast/2021-10-20/beast-20211020-hg.tgz"; - sha256 = "0rb7yxr4clsdbgyjz9d8inxgj7zs0knrngl7gb6b8ky1vyrv12k4"; - system = "beast"; - asd = "beast"; - }); - systems = [ "beast/test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "beast" pkgs) ]; - meta = { - broken = true; - }; - }; - beirc = { - pname = "beirc"; - version = "20150505-git"; - asds = [ "beirc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/beirc/2015-05-05/beirc-20150505-git.tgz"; - sha256 = "1jmxihxln51vxy85r3zx0gfrzs9ng8nmj87j5ws1fg8bwv8b2zc4"; - system = "beirc"; - asd = "beirc"; - }); - systems = [ "beirc" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "cl-irc" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "mcclim" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - bencode = { - pname = "bencode"; - version = "20180228-git"; - asds = [ "bencode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bencode/2018-02-28/cl-bencode-20180228-git.tgz"; - sha256 = "02n9cv5jbgzjwmw11c1a557r62m4i4gmmx38csscbq0cv6vzys1j"; - system = "bencode"; - asd = "bencode"; - }); - systems = [ "bencode" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) ]; - }; - bencode-test = { - pname = "bencode-test"; - version = "20180228-git"; - asds = [ "bencode-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bencode/2018-02-28/cl-bencode-20180228-git.tgz"; - sha256 = "02n9cv5jbgzjwmw11c1a557r62m4i4gmmx38csscbq0cv6vzys1j"; - system = "bencode-test"; - asd = "bencode"; - }); - systems = [ "bencode-test" ]; - lispLibs = [ (getAttr "check-it" pkgs) (getAttr "bencode" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - }; - bermuda = { - pname = "bermuda"; - version = "20150608-git"; - asds = [ "bermuda" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pal/2015-06-08/pal-20150608-git.tgz"; - sha256 = "0kn6jxirrn7wzqymzsi0kx2ivl0nrrcgbl4dm1714s48qw0jwhcw"; - system = "bermuda"; - asd = "bermuda"; - }); - systems = [ "bermuda" ]; - lispLibs = [ (getAttr "pal" pkgs) ]; - }; - bert = { - pname = "bert"; - version = "20141106-git"; - asds = [ "bert" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bert/2014-11-06/cl-bert-20141106-git.tgz"; - sha256 = "18cyk63dmcqqwsld4h65mzscgjsc085ws69z097naqm1r70kkygr"; - system = "bert"; - asd = "bert"; - }); - systems = [ "bert" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "erlang-term" pkgs) ]; - }; - bibtex = { - pname = "bibtex"; - version = "20181210-git"; - asds = [ "bibtex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bibtex/2018-12-10/cl-bibtex-20181210-git.tgz"; - sha256 = "1rb4yf1z0vvl6z4kyj0s81kq1pvxwpvbgiaraqllgj1wpf51m78h"; - system = "bibtex"; - asd = "bibtex"; - }); - systems = [ "bibtex" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) ]; - }; - big-string = { - pname = "big-string"; - version = "20190307-hg"; - asds = [ "big-string" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/big-string/2019-03-07/big-string-20190307-hg.tgz"; - sha256 = "1aqjs2l7wlkkgkz1wlqx3xbnk3iy0sy43kcxqi9a35fg6h223nyy"; - system = "big-string"; - asd = "big-string"; - }); - systems = [ "big-string" ]; - lispLibs = [ ]; - }; - bike = { - pname = "bike"; - version = "20220707-git"; - asds = [ "bike" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bike/2022-07-07/bike-20220707-git.tgz"; - sha256 = "0slzgfi0yw45j238rhjsnw6vh8yvwzzsmz6vmia58fycf8p0vlc4"; - system = "bike"; - asd = "bike"; - }); - systems = [ "bike" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bike-internals" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "named-readtables" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "uiop" pkgs) ]; - }; - bike-examples = { - pname = "bike-examples"; - version = "20220707-git"; - asds = [ "bike-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bike/2022-07-07/bike-20220707-git.tgz"; - sha256 = "0slzgfi0yw45j238rhjsnw6vh8yvwzzsmz6vmia58fycf8p0vlc4"; - system = "bike-examples"; - asd = "bike-examples"; - }); - systems = [ "bike-examples" ]; - lispLibs = [ (getAttr "bike" pkgs) ]; - }; - bike-internals = { - pname = "bike-internals"; - version = "20220707-git"; - asds = [ "bike-internals" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bike/2022-07-07/bike-20220707-git.tgz"; - sha256 = "0slzgfi0yw45j238rhjsnw6vh8yvwzzsmz6vmia58fycf8p0vlc4"; - system = "bike-internals"; - asd = "bike-internals"; - }); - systems = [ "bike-internals" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "uiop" pkgs) ]; - }; - bike-tests = { - pname = "bike-tests"; - version = "20220707-git"; - asds = [ "bike-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bike/2022-07-07/bike-20220707-git.tgz"; - sha256 = "0slzgfi0yw45j238rhjsnw6vh8yvwzzsmz6vmia58fycf8p0vlc4"; - system = "bike-tests"; - asd = "bike-tests"; - }); - systems = [ "bike-tests" ]; - lispLibs = [ (getAttr "bike" pkgs) (getAttr "fiveam" pkgs) ]; - }; - binary-io = { - pname = "binary-io"; - version = "20201016-git"; - asds = [ "binary-io" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binary-io/2020-10-16/binary-io-20201016-git.tgz"; - sha256 = "0gxnl12nydh8aslw78jc4cmq8licj342y2f04jalqb4d9m9jbri2"; - system = "binary-io"; - asd = "binary-io"; - }); - systems = [ "binary-io" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "ieee-floats" pkgs) ]; - }; - binary-io_slash_test = { - pname = "binary-io_test"; - version = "20201016-git"; - asds = [ "binary-io" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binary-io/2020-10-16/binary-io-20201016-git.tgz"; - sha256 = "0gxnl12nydh8aslw78jc4cmq8licj342y2f04jalqb4d9m9jbri2"; - system = "binary-io"; - asd = "binary-io"; - }); - systems = [ "binary-io/test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "binary-io" pkgs) ]; - meta = { - broken = true; - }; - }; - binary-lass = { - pname = "binary-lass"; - version = "20211020-git"; - asds = [ "binary-lass" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lass/2021-10-20/lass-20211020-git.tgz"; - sha256 = "06wds1qzj8s862pmmza1427n7gdpplqplxqnxyqkrr0hgxdl4xbf"; - system = "binary-lass"; - asd = "binary-lass"; - }); - systems = [ "binary-lass" ]; - lispLibs = [ (getAttr "lass" pkgs) ]; - }; - binary-parser = { - pname = "binary-parser"; - version = "20220707-git"; - asds = [ "binary-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binary-parser/2022-07-07/binary-parser-20220707-git.tgz"; - sha256 = "0h94jjid2a5fq5w6n2jx572q7alljmrs84p3xhsjnax3cmzqjr78"; - system = "binary-parser"; - asd = "binary-parser"; - }); - systems = [ "binary-parser" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bitio" pkgs) (getAttr "chipz" pkgs) (getAttr "fast-io" pkgs) ]; - }; - binary-search-tree = { - pname = "binary-search-tree"; - version = "20220707-git"; - asds = [ "binary-search-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binary-search-tree/2022-07-07/binary-search-tree-20220707-git.tgz"; - sha256 = "1k7p5dgziwni5yma7q3sbnr23kk2730vzb7ap6knnazpp0smgclf"; - system = "binary-search-tree"; - asd = "binary-search-tree"; - }); - systems = [ "binary-search-tree" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) ]; - }; - binary-types = { - pname = "binary-types"; - version = "20130615-git"; - asds = [ "binary-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binary-types/2013-06-15/binary-types-20130615-git.tgz"; - sha256 = "1bh65p9vg2kgh4m8q1a4jiyncnp5prdzh0d0l4pzh3jvfhgbm0gh"; - system = "binary-types"; - asd = "binary-types"; - }); - systems = [ "binary-types" ]; - lispLibs = [ ]; - }; - binascii = { - pname = "binascii"; - version = "20150709-git"; - asds = [ "binascii" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binascii/2015-07-09/binascii-20150709-git.tgz"; - sha256 = "000rcdl8qshr7n48zq9bzrc4lkjx4ylb3r3w9x9syhiwfla9j4b7"; - system = "binascii"; - asd = "binascii"; - }); - systems = [ "binascii" ]; - lispLibs = [ ]; - }; - binascii-tests = { - pname = "binascii-tests"; - version = "20150709-git"; - asds = [ "binascii-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binascii/2015-07-09/binascii-20150709-git.tgz"; - sha256 = "000rcdl8qshr7n48zq9bzrc4lkjx4ylb3r3w9x9syhiwfla9j4b7"; - system = "binascii-tests"; - asd = "binascii"; - }); - systems = [ "binascii-tests" ]; - lispLibs = [ (getAttr "binascii" pkgs) ]; - }; - binding-arrows = { - pname = "binding-arrows"; - version = "20210630-git"; - asds = [ "binding-arrows" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binding-arrows/2021-06-30/binding-arrows-20210630-git.tgz"; - sha256 = "0hqikgzic7kjq2n1d924yldfm30qz67cmsk6gghi9cbmxkwdlwp8"; - system = "binding-arrows"; - asd = "binding-arrows"; - }); - systems = [ "binding-arrows" ]; - lispLibs = [ ]; - }; - binding-arrows_slash_test = { - pname = "binding-arrows_test"; - version = "20210630-git"; - asds = [ "binding-arrows" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binding-arrows/2021-06-30/binding-arrows-20210630-git.tgz"; - sha256 = "0hqikgzic7kjq2n1d924yldfm30qz67cmsk6gghi9cbmxkwdlwp8"; - system = "binding-arrows"; - asd = "binding-arrows"; - }); - systems = [ "binding-arrows/test" ]; - lispLibs = [ (getAttr "binding-arrows" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - meta = { - broken = true; - }; - }; - binfix = { - pname = "binfix"; - version = "20190813-git"; - asds = [ "binfix" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binfix/2019-08-13/binfix-20190813-git.tgz"; - sha256 = "07925kj32y7ppwmz62c08gd0s6yp12s6nz1wh0pzh0ccq9nwgzhz"; - system = "binfix"; - asd = "binfix"; - }); - systems = [ "binfix" ]; - lispLibs = [ ]; - }; - binfix_slash_5am = { - pname = "binfix_5am"; - version = "20190813-git"; - asds = [ "binfix" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binfix/2019-08-13/binfix-20190813-git.tgz"; - sha256 = "07925kj32y7ppwmz62c08gd0s6yp12s6nz1wh0pzh0ccq9nwgzhz"; - system = "binfix"; - asd = "binfix"; - }); - systems = [ "binfix/5am" ]; - lispLibs = [ (getAttr "binfix" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - binomial-heap = { - pname = "binomial-heap"; - version = "20130420-git"; - asds = [ "binomial-heap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binomial-heap/2013-04-20/binomial-heap-20130420-git.tgz"; - sha256 = "1d4jrlkdjdppnvqpqkr7i7djpgmrvrbky4pc1pxvqci5jx7xlkk6"; - system = "binomial-heap"; - asd = "binomial-heap"; - }); - systems = [ "binomial-heap" ]; - lispLibs = [ ]; - }; - binpack = { - pname = "binpack"; - version = "20220707-git"; - asds = [ "binpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binpack/2022-07-07/binpack-20220707-git.tgz"; - sha256 = "1pcnsg60pqywd3k72m5pwimq01sm3jyvc1c3rbkij740r7grdxi1"; - system = "binpack"; - asd = "binpack"; - }); - systems = [ "binpack" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - binpack-test = { - pname = "binpack-test"; - version = "20220707-git"; - asds = [ "binpack-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binpack/2022-07-07/binpack-20220707-git.tgz"; - sha256 = "1pcnsg60pqywd3k72m5pwimq01sm3jyvc1c3rbkij740r7grdxi1"; - system = "binpack-test"; - asd = "binpack-test"; - }); - systems = [ "binpack-test" ]; - lispLibs = [ (getAttr "binpack" pkgs) (getAttr "parachute" pkgs) ]; - }; - binpack-test_slash_2 = { - pname = "binpack-test_2"; - version = "20220707-git"; - asds = [ "binpack-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binpack/2022-07-07/binpack-20220707-git.tgz"; - sha256 = "1pcnsg60pqywd3k72m5pwimq01sm3jyvc1c3rbkij740r7grdxi1"; - system = "binpack-test"; - asd = "binpack-test"; - }); - systems = [ "binpack-test/2" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "parachute" pkgs) ]; - meta = { - broken = true; - }; - }; - binpack-test_slash_common = { - pname = "binpack-test_common"; - version = "20220707-git"; - asds = [ "binpack-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binpack/2022-07-07/binpack-20220707-git.tgz"; - sha256 = "1pcnsg60pqywd3k72m5pwimq01sm3jyvc1c3rbkij740r7grdxi1"; - system = "binpack-test"; - asd = "binpack-test"; - }); - systems = [ "binpack-test/common" ]; - lispLibs = [ (getAttr "binpack" pkgs) (getAttr "parachute" pkgs) ]; - meta = { - broken = true; - }; - }; - binpack_slash_2 = { - pname = "binpack_2"; - version = "20220707-git"; - asds = [ "binpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/binpack/2022-07-07/binpack-20220707-git.tgz"; - sha256 = "1pcnsg60pqywd3k72m5pwimq01sm3jyvc1c3rbkij740r7grdxi1"; - system = "binpack"; - asd = "binpack"; - }); - systems = [ "binpack/2" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - meta = { - broken = true; - }; - }; - birch = { - pname = "birch"; - version = "20220220-git"; - asds = [ "birch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/birch/2022-02-20/birch-20220220-git.tgz"; - sha256 = "0b2wh1n9b5r1dyvgg9hhh97plbj4j5anasfbii92s2g8h2ilb4yb"; - system = "birch"; - asd = "birch"; - }); - systems = [ "birch" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "split-sequence" pkgs) (getAttr "usocket" pkgs) ]; - }; - birch_dot_test = { - pname = "birch.test"; - version = "20220220-git"; - asds = [ "birch.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/birch/2022-02-20/birch-20220220-git.tgz"; - sha256 = "0b2wh1n9b5r1dyvgg9hhh97plbj4j5anasfbii92s2g8h2ilb4yb"; - system = "birch.test"; - asd = "birch.test"; - }); - systems = [ "birch.test" ]; - lispLibs = [ (getAttr "birch" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "prove" pkgs) ]; - }; - bit-ops = { - pname = "bit-ops"; - version = "20180228-git"; - asds = [ "bit-ops" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bit-ops/2018-02-28/bit-ops-20180228-git.tgz"; - sha256 = "0rwmm438bgxfl5ab1vnrsxgimxnr3d5kjv9a0yzmlnbg9i2hyhz7"; - system = "bit-ops"; - asd = "bit-ops"; - }); - systems = [ "bit-ops" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "immutable-struct" pkgs) (getAttr "iterate" pkgs) (getAttr "lisp-namespace" pkgs) (getAttr "trivia" pkgs) ]; - }; - bit-ops_dot_test = { - pname = "bit-ops.test"; - version = "20180228-git"; - asds = [ "bit-ops.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bit-ops/2018-02-28/bit-ops-20180228-git.tgz"; - sha256 = "0rwmm438bgxfl5ab1vnrsxgimxnr3d5kjv9a0yzmlnbg9i2hyhz7"; - system = "bit-ops.test"; - asd = "bit-ops.test"; - }); - systems = [ "bit-ops.test" ]; - lispLibs = [ (getAttr "bit-ops" pkgs) (getAttr "fiveam" pkgs) ]; - }; - bit-smasher = { - pname = "bit-smasher"; - version = "20221106-git"; - asds = [ "bit-smasher" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bit-smasher/2022-11-06/bit-smasher-20221106-git.tgz"; - sha256 = "1dad4x9sjq45zz8rys6rflsklmw77631r3k4g248ynmaqkdaqjyd"; - system = "bit-smasher"; - asd = "bit-smasher"; - }); - systems = [ "bit-smasher" ]; - lispLibs = [ (getAttr "cl-base58" pkgs) (getAttr "cl-base64" pkgs) ]; - }; - bit-smasher-test = { - pname = "bit-smasher-test"; - version = "20221106-git"; - asds = [ "bit-smasher-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bit-smasher/2022-11-06/bit-smasher-20221106-git.tgz"; - sha256 = "1dad4x9sjq45zz8rys6rflsklmw77631r3k4g248ynmaqkdaqjyd"; - system = "bit-smasher-test"; - asd = "bit-smasher-test"; - }); - systems = [ "bit-smasher-test" ]; - lispLibs = [ (getAttr "bit-smasher" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - bitfield = { - pname = "bitfield"; - version = "20211230-git"; - asds = [ "bitfield" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bitfield/2021-12-30/bitfield-20211230-git.tgz"; - sha256 = "1137kdj5imc5gj9g6hj4w6ksqnqppgm3knzv7j2f8r5qpfl8rfl2"; - system = "bitfield"; - asd = "bitfield"; - }); - systems = [ "bitfield" ]; - lispLibs = [ ]; - }; - bitfield-schema = { - pname = "bitfield-schema"; - version = "20120107-git"; - asds = [ "bitfield-schema" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bitfield-schema/2012-01-07/bitfield-schema-20120107-git.tgz"; - sha256 = "08xkl7rbfhrx8vj98zj1lmhv6pfg2f5gk14xj7qys7mkj2iv4li6"; - system = "bitfield-schema"; - asd = "bitfield-schema"; - }); - systems = [ "bitfield-schema" ]; - lispLibs = [ (getAttr "iterate" pkgs) ]; - }; - bitio = { - pname = "bitio"; - version = "20220220-git"; - asds = [ "bitio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bitio/2022-02-20/bitio-20220220-git.tgz"; - sha256 = "0z2yn19nxg46j274nxzry255z86p0y3p68s1f2sg7rx9y2nx3rjg"; - system = "bitio"; - asd = "bitio"; - }); - systems = [ "bitio" ]; - lispLibs = [ (getAttr "checkl" pkgs) (getAttr "cl-package-locks" pkgs) (getAttr "fast-io" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - bk-tree = { - pname = "bk-tree"; - version = "20130420-git"; - asds = [ "bk-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bk-tree/2013-04-20/bk-tree-20130420-git.tgz"; - sha256 = "1nrz6fwzvkzvs6ipc5rgas77p5hv5bnaw2in5760v240gg7lxqzz"; - system = "bk-tree"; - asd = "bk-tree"; - }); - systems = [ "bk-tree" ]; - lispLibs = [ ]; - }; - bknr_dot_data_dot_impex = { - pname = "bknr.data.impex"; - version = "20220220-git"; - asds = [ "bknr.data.impex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; - system = "bknr.data.impex"; - asd = "bknr.data.impex"; - }); - systems = [ "bknr.data.impex" ]; - lispLibs = [ (getAttr "bknr_dot_datastore" pkgs) (getAttr "bknr_dot_impex" pkgs) (getAttr "bknr_dot_indices" pkgs) (getAttr "bknr_dot_utils" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "unit-test" pkgs) ]; - }; - bknr_dot_datastore = { - pname = "bknr.datastore"; - version = "20220220-git"; - asds = [ "bknr.datastore" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; - system = "bknr.datastore"; - asd = "bknr.datastore"; - }); - systems = [ "bknr.datastore" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bknr_dot_indices" pkgs) (getAttr "bknr_dot_utils" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "closer-mop" pkgs) (getAttr "trivial-utf-8" pkgs) (getAttr "unit-test" pkgs) (getAttr "yason" pkgs) ]; - }; - bknr_dot_impex = { - pname = "bknr.impex"; - version = "20220220-git"; - asds = [ "bknr.impex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; - system = "bknr.impex"; - asd = "bknr.impex"; - }); - systems = [ "bknr.impex" ]; - lispLibs = [ (getAttr "bknr_dot_indices" pkgs) (getAttr "bknr_dot_utils" pkgs) (getAttr "bknr_dot_xml" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "closer-mop" pkgs) (getAttr "cxml" pkgs) ]; - }; - bknr_dot_indices = { - pname = "bknr.indices"; - version = "20220220-git"; - asds = [ "bknr.indices" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; - system = "bknr.indices"; - asd = "bknr.indices"; - }); - systems = [ "bknr.indices" ]; - lispLibs = [ (getAttr "bknr_dot_skip-list" pkgs) (getAttr "bknr_dot_utils" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - bknr_dot_modules = { - pname = "bknr.modules"; - version = "20140713-git"; - asds = [ "bknr.modules" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; - sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2"; - system = "bknr.modules"; - asd = "bknr.modules"; - }); - systems = [ "bknr.modules" ]; - lispLibs = [ (getAttr "bknr_dot_utils" pkgs) (getAttr "bknr_dot_web" pkgs) (getAttr "cl-gd" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-smtp" pkgs) (getAttr "closer-mop" pkgs) (getAttr "cxml" pkgs) (getAttr "md5" pkgs) (getAttr "parenscript" pkgs) (getAttr "puri" pkgs) (getAttr "stem" pkgs) (getAttr "unit-test" pkgs) ]; - }; - bknr_dot_skip-list = { - pname = "bknr.skip-list"; - version = "20220220-git"; - asds = [ "bknr.skip-list" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; - system = "bknr.skip-list"; - asd = "bknr.skip-list"; - }); - systems = [ "bknr.skip-list" ]; - lispLibs = [ ]; - }; - bknr_dot_skip-list_dot_test = { - pname = "bknr.skip-list.test"; - version = "20220220-git"; - asds = [ "bknr.skip-list.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; - system = "bknr.skip-list.test"; - asd = "bknr.skip-list"; - }); - systems = [ "bknr.skip-list.test" ]; - lispLibs = [ (getAttr "bknr_dot_skip-list" pkgs) (getAttr "unit-test" pkgs) ]; - }; - bknr_dot_utils = { - pname = "bknr.utils"; - version = "20220220-git"; - asds = [ "bknr.utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; - system = "bknr.utils"; - asd = "bknr.utils"; - }); - systems = [ "bknr.utils" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "md5" pkgs) ]; - }; - bknr_dot_web = { - pname = "bknr.web"; - version = "20140713-git"; - asds = [ "bknr.web" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; - sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2"; - system = "bknr.web"; - asd = "bknr.web"; - }); - systems = [ "bknr.web" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bknr_dot_data_dot_impex" pkgs) (getAttr "bknr_dot_datastore" pkgs) (getAttr "bknr_dot_utils" pkgs) (getAttr "bknr_dot_xml" pkgs) (getAttr "cl-gd" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cxml" pkgs) (getAttr "drakma" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "md5" pkgs) (getAttr "parenscript" pkgs) (getAttr "puri" pkgs) (getAttr "unit-test" pkgs) (getAttr "usocket" pkgs) (getAttr "xhtmlgen" pkgs) (getAttr "yason" pkgs) ]; - }; - bknr_dot_xml = { - pname = "bknr.xml"; - version = "20220220-git"; - asds = [ "bknr.xml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bknr-datastore/2022-02-20/bknr-datastore-20220220-git.tgz"; - sha256 = "1vi3w65fnczqvswkm381n6liqfrzjrg40y698qvj7skj28dm5vrm"; - system = "bknr.xml"; - asd = "bknr.xml"; - }); - systems = [ "bknr.xml" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "cxml" pkgs) ]; - }; - black-tie = { - pname = "black-tie"; - version = "20220707-git"; - asds = [ "black-tie" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/black-tie/2022-07-07/black-tie-20220707-git.tgz"; - sha256 = "0a1zczxp4wkqs4cmwc4rnsgwwc2h4zqmg58cjykfzz4jh31fa43a"; - system = "black-tie"; - asd = "black-tie"; - }); - systems = [ "black-tie" ]; - lispLibs = [ ]; - }; - blackbird = { - pname = "blackbird"; - version = "20221106-git"; - asds = [ "blackbird" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/blackbird/2022-11-06/blackbird-20221106-git.tgz"; - sha256 = "1r0f9473akzm6zyj494ma5p39hfkixa8aj17dhcdfa4kmqf9f6al"; - system = "blackbird"; - asd = "blackbird"; - }); - systems = [ "blackbird" ]; - lispLibs = [ (getAttr "vom" pkgs) ]; - }; - blackbird-test = { - pname = "blackbird-test"; - version = "20221106-git"; - asds = [ "blackbird-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/blackbird/2022-11-06/blackbird-20221106-git.tgz"; - sha256 = "1r0f9473akzm6zyj494ma5p39hfkixa8aj17dhcdfa4kmqf9f6al"; - system = "blackbird-test"; - asd = "blackbird-test"; - }); - systems = [ "blackbird-test" ]; - lispLibs = [ (getAttr "blackbird" pkgs) (getAttr "cl-async" pkgs) (getAttr "fiveam" pkgs) ]; - }; - blas = { - pname = "blas"; - version = "20200925-git"; - asds = [ "blas" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "blas"; - asd = "blas"; - }); - systems = [ "blas" ]; - lispLibs = [ (getAttr "blas-complex" pkgs) (getAttr "blas-package" pkgs) (getAttr "blas-real" pkgs) ]; - }; - blas-complex = { - pname = "blas-complex"; - version = "20200925-git"; - asds = [ "blas-complex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "blas-complex"; - asd = "blas-complex"; - }); - systems = [ "blas-complex" ]; - lispLibs = [ (getAttr "blas-real" pkgs) (getAttr "f2cl" pkgs) ]; - }; - blas-hompack = { - pname = "blas-hompack"; - version = "20200925-git"; - asds = [ "blas-hompack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "blas-hompack"; - asd = "blas-hompack"; - }); - systems = [ "blas-hompack" ]; - lispLibs = [ (getAttr "blas-package" pkgs) (getAttr "f2cl" pkgs) ]; - }; - blas-package = { - pname = "blas-package"; - version = "20200925-git"; - asds = [ "blas-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "blas-package"; - asd = "blas-package"; - }); - systems = [ "blas-package" ]; - lispLibs = [ ]; - }; - blas-real = { - pname = "blas-real"; - version = "20200925-git"; - asds = [ "blas-real" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "blas-real"; - asd = "blas-real"; - }); - systems = [ "blas-real" ]; - lispLibs = [ (getAttr "blas-hompack" pkgs) (getAttr "f2cl" pkgs) ]; - }; - blocks-world = { - pname = "blocks-world"; - version = "20120305-git"; - asds = [ "blocks-world" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/atdoc/2012-03-05/atdoc-20120305-git.tgz"; - sha256 = "1w54phadjj00sy5qz5n0hmhzyjrx26h9hw06756zdpfbzk4f5il6"; - system = "blocks-world"; - asd = "blocks-world"; - }); - systems = [ "blocks-world" ]; - lispLibs = [ ]; - }; - bmas = { - pname = "bmas"; - version = "20221106-git"; - asds = [ "bmas" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bmas/2022-11-06/cl-bmas-20221106-git.tgz"; - sha256 = "1z167v5hh4cawms8khpm76q8g0pk1xlkh97gxdbwym0sz27qb81j"; - system = "bmas"; - asd = "bmas"; - }); - systems = [ "bmas" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-autowrap" pkgs) (getAttr "uiop" pkgs) ]; - }; - bmp-test = { - pname = "bmp-test"; - version = "20211020-git"; - asds = [ "bmp-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; - sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4"; - system = "bmp-test"; - asd = "bmp-test"; - }); - systems = [ "bmp-test" ]; - lispLibs = [ (getAttr "png" pkgs) ]; - }; - bnf = { - pname = "bnf"; - version = "20220220-git"; - asds = [ "bnf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bnf/2022-02-20/bnf-20220220-git.tgz"; - sha256 = "1kr6k9qs9bbza591hi1c2mlxqd5yz3nrvyd3cw7139iz1z2m7dbg"; - system = "bnf"; - asd = "bnf"; - }); - systems = [ "bnf" ]; - lispLibs = [ (getAttr "trestrul" pkgs) (getAttr "uiop" pkgs) ]; - }; - bnf_dot_test = { - pname = "bnf.test"; - version = "20220220-git"; - asds = [ "bnf.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bnf/2022-02-20/bnf-20220220-git.tgz"; - sha256 = "1kr6k9qs9bbza591hi1c2mlxqd5yz3nrvyd3cw7139iz1z2m7dbg"; - system = "bnf.test"; - asd = "bnf.test"; - }); - systems = [ "bnf.test" ]; - lispLibs = [ (getAttr "bnf" pkgs) (getAttr "jingoh" pkgs) ]; - }; - bobbin = { - pname = "bobbin"; - version = "20201016-hg"; - asds = [ "bobbin" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bobbin/2020-10-16/bobbin-20201016-hg.tgz"; - sha256 = "1yvx7d0cx5b119r4aays2rck33088bp7spaydnvkc329hfq1ahc2"; - system = "bobbin"; - asd = "bobbin"; - }); - systems = [ "bobbin" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) ]; - }; - bobbin_slash_test = { - pname = "bobbin_test"; - version = "20201016-hg"; - asds = [ "bobbin" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bobbin/2020-10-16/bobbin-20201016-hg.tgz"; - sha256 = "1yvx7d0cx5b119r4aays2rck33088bp7spaydnvkc329hfq1ahc2"; - system = "bobbin"; - asd = "bobbin"; - }); - systems = [ "bobbin/test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "bobbin" pkgs) ]; - meta = { - broken = true; - }; - }; - bodge-blobs-support = { - pname = "bodge-blobs-support"; - version = "stable-git"; - asds = [ "bodge-blobs-support" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-blobs-support/2020-10-16/bodge-blobs-support-stable-git.tgz"; - sha256 = "02nd1x6y1akp1ymv1y4z9ympwbnpd1drwi4f86xbjszxqff6jyj8"; - system = "bodge-blobs-support"; - asd = "bodge-blobs-support"; - }); - systems = [ "bodge-blobs-support" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "trivial-features" pkgs) (getAttr "uiop" pkgs) ]; - }; - bodge-chipmunk = { - pname = "bodge-chipmunk"; - version = "stable-git"; - asds = [ "bodge-chipmunk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-chipmunk/2020-10-16/bodge-chipmunk-stable-git.tgz"; - sha256 = "06zkia7rrhn1961jmayyvdbbbnf2rnr84lbd1x6gq8psfb2rif2f"; - system = "bodge-chipmunk"; - asd = "bodge-chipmunk"; - }); - systems = [ "bodge-chipmunk" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-c-ref" pkgs) (getAttr "claw" pkgs) (getAttr "claw-utils" pkgs) ]; - }; - bodge-chipmunk_slash_example = { - pname = "bodge-chipmunk_example"; - version = "stable-git"; - asds = [ "bodge-chipmunk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-chipmunk/2020-10-16/bodge-chipmunk-stable-git.tgz"; - sha256 = "06zkia7rrhn1961jmayyvdbbbnf2rnr84lbd1x6gq8psfb2rif2f"; - system = "bodge-chipmunk"; - asd = "bodge-chipmunk"; - }); - systems = [ "bodge-chipmunk/example" ]; - lispLibs = [ (getAttr "bodge-chipmunk" pkgs) (getAttr "chipmunk-blob" pkgs) (getAttr "float-features" pkgs) ]; - meta = { - broken = true; - }; - }; - bodge-concurrency = { - pname = "bodge-concurrency"; - version = "stable-git"; - asds = [ "bodge-concurrency" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-concurrency/2020-10-16/bodge-concurrency-stable-git.tgz"; - sha256 = "06v2h7vassp5v50qsqxkmshcrlrzlhqaga4z7lnidfniw7f8d5vd"; - system = "bodge-concurrency"; - asd = "bodge-concurrency"; - }); - systems = [ "bodge-concurrency" ]; - lispLibs = [ (getAttr "bodge-memory" pkgs) (getAttr "bodge-queue" pkgs) (getAttr "bodge-utilities" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-flow" pkgs) (getAttr "cl-muth" pkgs) (getAttr "simple-flow-dispatcher" pkgs) (getAttr "trivial-main-thread" pkgs) ]; - }; - bodge-glad = { - pname = "bodge-glad"; - version = "stable-git"; - asds = [ "bodge-glad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-glad/2020-10-16/bodge-glad-stable-git.tgz"; - sha256 = "0ghrg0z5pj36igp5wpvp1iwnvjbca3wfb60kvirhv3l9ww51jg9g"; - system = "bodge-glad"; - asd = "bodge-glad"; - }); - systems = [ "bodge-glad" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) ]; - }; - bodge-glfw = { - pname = "bodge-glfw"; - version = "stable-git"; - asds = [ "bodge-glfw" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-glfw/2020-10-16/bodge-glfw-stable-git.tgz"; - sha256 = "1xjg75grndl2mbfql1g2qgx810kg6wxrnhxb406m9lisd112i0m8"; - system = "bodge-glfw"; - asd = "bodge-glfw"; - }); - systems = [ "bodge-glfw" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-c-ref" pkgs) (getAttr "claw" pkgs) (getAttr "claw-utils" pkgs) ]; - }; - bodge-glfw_slash_example = { - pname = "bodge-glfw_example"; - version = "stable-git"; - asds = [ "bodge-glfw" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-glfw/2020-10-16/bodge-glfw-stable-git.tgz"; - sha256 = "1xjg75grndl2mbfql1g2qgx810kg6wxrnhxb406m9lisd112i0m8"; - system = "bodge-glfw"; - asd = "bodge-glfw"; - }); - systems = [ "bodge-glfw/example" ]; - lispLibs = [ (getAttr "bodge-glfw" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "claw" pkgs) (getAttr "glfw-blob" pkgs) ]; - meta = { - broken = true; - }; - }; - bodge-heap = { - pname = "bodge-heap"; - version = "stable-git"; - asds = [ "bodge-heap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-heap/2020-10-16/bodge-heap-stable-git.tgz"; - sha256 = "1ngi9ccr9iz93mm3b4hgh2fj39vqpjrpkcfza5vly16z3r7gxca4"; - system = "bodge-heap"; - asd = "bodge-heap"; - }); - systems = [ "bodge-heap" ]; - lispLibs = [ ]; - }; - bodge-heap_slash_tests = { - pname = "bodge-heap_tests"; - version = "stable-git"; - asds = [ "bodge-heap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-heap/2020-10-16/bodge-heap-stable-git.tgz"; - sha256 = "1ngi9ccr9iz93mm3b4hgh2fj39vqpjrpkcfza5vly16z3r7gxca4"; - system = "bodge-heap"; - asd = "bodge-heap"; - }); - systems = [ "bodge-heap/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bodge-heap" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - bodge-host = { - pname = "bodge-host"; - version = "stable-git"; - asds = [ "bodge-host" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-host/2021-12-09/bodge-host-stable-git.tgz"; - sha256 = "0piayirpbh91klrk3pg0g1vxhlk8yxvbr2wv923awdalwy0fn73n"; - system = "bodge-host"; - asd = "bodge-host"; - }); - systems = [ "bodge-host" ]; - lispLibs = [ (getAttr "bodge-concurrency" pkgs) (getAttr "bodge-glfw" pkgs) (getAttr "bodge-libc-essentials" pkgs) (getAttr "bodge-math" pkgs) (getAttr "bodge-utilities" pkgs) (getAttr "cffi-c-ref" pkgs) (getAttr "float-features" pkgs) (getAttr "glfw-blob" pkgs) ]; - }; - bodge-libc-essentials = { - pname = "bodge-libc-essentials"; - version = "stable-git"; - asds = [ "bodge-libc-essentials" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-libc-essentials/2020-10-16/bodge-libc-essentials-stable-git.tgz"; - sha256 = "1nkjhkaap78xk9rkvnnnkchphiz0qwrsfp4jsvcl6mvv3rb4gp2k"; - system = "bodge-libc-essentials"; - asd = "bodge-libc-essentials"; - }); - systems = [ "bodge-libc-essentials" ]; - lispLibs = [ (getAttr "claw" pkgs) ]; - }; - bodge-math = { - pname = "bodge-math"; - version = "stable-git"; - asds = [ "bodge-math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-math/2020-10-16/bodge-math-stable-git.tgz"; - sha256 = "0r3vnl9lywn4ksy34apcv6j825qp7l1naddawr14v4lwacndb80v"; - system = "bodge-math"; - asd = "bodge-math"; - }); - systems = [ "bodge-math" ]; - lispLibs = [ (getAttr "bodge-utilities" pkgs) (getAttr "rtg-math" pkgs) ]; - }; - bodge-memory = { - pname = "bodge-memory"; - version = "stable-git"; - asds = [ "bodge-memory" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-memory/2020-10-16/bodge-memory-stable-git.tgz"; - sha256 = "19fn3dw5z6f2kpar0jx7ysy5zvqjv7yv0ca7njgaam3p891yy2j9"; - system = "bodge-memory"; - asd = "bodge-memory"; - }); - systems = [ "bodge-memory" ]; - lispLibs = [ (getAttr "bodge-utilities" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - bodge-nanovg = { - pname = "bodge-nanovg"; - version = "stable-git"; - asds = [ "bodge-nanovg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-nanovg/2020-10-16/bodge-nanovg-stable-git.tgz"; - sha256 = "0cg4rlsddjrn0ps891n29xnd14xiis20ka5gafbz9npbj6nrc4v1"; - system = "bodge-nanovg"; - asd = "bodge-nanovg"; - }); - systems = [ "bodge-nanovg" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-c-ref" pkgs) (getAttr "claw" pkgs) (getAttr "claw-utils" pkgs) (getAttr "uiop" pkgs) ]; - }; - bodge-nanovg_slash_example = { - pname = "bodge-nanovg_example"; - version = "stable-git"; - asds = [ "bodge-nanovg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-nanovg/2020-10-16/bodge-nanovg-stable-git.tgz"; - sha256 = "0cg4rlsddjrn0ps891n29xnd14xiis20ka5gafbz9npbj6nrc4v1"; - system = "bodge-nanovg"; - asd = "bodge-nanovg"; - }); - systems = [ "bodge-nanovg/example" ]; - lispLibs = [ (getAttr "bodge-glad" pkgs) (getAttr "bodge-glfw" pkgs) (getAttr "bodge-nanovg" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-c-ref" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "claw" pkgs) (getAttr "float-features" pkgs) (getAttr "glad-blob" pkgs) (getAttr "glfw-blob" pkgs) (getAttr "nanovg-blob" pkgs) (getAttr "trivial-main-thread" pkgs) ]; - meta = { - broken = true; - }; - }; - bodge-nuklear = { - pname = "bodge-nuklear"; - version = "stable-git"; - asds = [ "bodge-nuklear" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-nuklear/2020-10-16/bodge-nuklear-stable-git.tgz"; - sha256 = "15q89dz2zi99yyxhb90wyydy24y2lj5xm2mzh1mrw4v8rz9aqhc2"; - system = "bodge-nuklear"; - asd = "bodge-nuklear"; - }); - systems = [ "bodge-nuklear" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-c-ref" pkgs) (getAttr "claw" pkgs) (getAttr "claw-utils" pkgs) ]; - }; - bodge-ode = { - pname = "bodge-ode"; - version = "stable-git"; - asds = [ "bodge-ode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-ode/2020-10-16/bodge-ode-stable-git.tgz"; - sha256 = "1c051ljn5x7ssysia7lil0ykjdnbx8dfkr45ck77plv39acgicbs"; - system = "bodge-ode"; - asd = "bodge-ode"; - }); - systems = [ "bodge-ode" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-c-ref" pkgs) (getAttr "claw" pkgs) (getAttr "claw-utils" pkgs) (getAttr "float-features" pkgs) ]; - }; - bodge-ode_slash_example = { - pname = "bodge-ode_example"; - version = "stable-git"; - asds = [ "bodge-ode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-ode/2020-10-16/bodge-ode-stable-git.tgz"; - sha256 = "1c051ljn5x7ssysia7lil0ykjdnbx8dfkr45ck77plv39acgicbs"; - system = "bodge-ode"; - asd = "bodge-ode"; - }); - systems = [ "bodge-ode/example" ]; - lispLibs = [ (getAttr "bodge-ode" pkgs) (getAttr "cffi-c-ref" pkgs) (getAttr "claw" pkgs) (getAttr "ode-blob" pkgs) ]; - meta = { - broken = true; - }; - }; - bodge-openal = { - pname = "bodge-openal"; - version = "stable-git"; - asds = [ "bodge-openal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-openal/2020-10-16/bodge-openal-stable-git.tgz"; - sha256 = "0051pwifygj1ijv5b39ldmfrka2yrj8rpap04bw3w9cckbkp6bnw"; - system = "bodge-openal"; - asd = "bodge-openal"; - }); - systems = [ "bodge-openal" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "claw" pkgs) (getAttr "claw-utils" pkgs) ]; - }; - bodge-openal_slash_example = { - pname = "bodge-openal_example"; - version = "stable-git"; - asds = [ "bodge-openal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-openal/2020-10-16/bodge-openal-stable-git.tgz"; - sha256 = "0051pwifygj1ijv5b39ldmfrka2yrj8rpap04bw3w9cckbkp6bnw"; - system = "bodge-openal"; - asd = "bodge-openal"; - }); - systems = [ "bodge-openal/example" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bodge-openal" pkgs) (getAttr "cffi-c-ref" pkgs) (getAttr "claw" pkgs) (getAttr "float-features" pkgs) (getAttr "openal-blob" pkgs) (getAttr "static-vectors" pkgs) ]; - meta = { - broken = true; - }; - }; - bodge-queue = { - pname = "bodge-queue"; - version = "stable-git"; - asds = [ "bodge-queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-queue/2020-10-16/bodge-queue-stable-git.tgz"; - sha256 = "0f4252i8pfy5s4v7w1bpjawysn4cw7di405mqsx2h7skv27hvpz6"; - system = "bodge-queue"; - asd = "bodge-queue"; - }); - systems = [ "bodge-queue" ]; - lispLibs = [ ]; - }; - bodge-queue_slash_tests = { - pname = "bodge-queue_tests"; - version = "stable-git"; - asds = [ "bodge-queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-queue/2020-10-16/bodge-queue-stable-git.tgz"; - sha256 = "0f4252i8pfy5s4v7w1bpjawysn4cw7di405mqsx2h7skv27hvpz6"; - system = "bodge-queue"; - asd = "bodge-queue"; - }); - systems = [ "bodge-queue/tests" ]; - lispLibs = [ (getAttr "bodge-queue" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - bodge-sndfile = { - pname = "bodge-sndfile"; - version = "stable-git"; - asds = [ "bodge-sndfile" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-sndfile/2020-10-16/bodge-sndfile-stable-git.tgz"; - sha256 = "0chdasp4zvr5n34x037lhymh90wg5xwbpr5flwj8aw0cw2nlg485"; - system = "bodge-sndfile"; - asd = "bodge-sndfile"; - }); - systems = [ "bodge-sndfile" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bodge-libc-essentials" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-c-ref" pkgs) (getAttr "claw" pkgs) (getAttr "claw-utils" pkgs) (getAttr "static-vectors" pkgs) ]; - }; - bodge-sndfile_slash_example = { - pname = "bodge-sndfile_example"; - version = "stable-git"; - asds = [ "bodge-sndfile" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-sndfile/2020-10-16/bodge-sndfile-stable-git.tgz"; - sha256 = "0chdasp4zvr5n34x037lhymh90wg5xwbpr5flwj8aw0cw2nlg485"; - system = "bodge-sndfile"; - asd = "bodge-sndfile"; - }); - systems = [ "bodge-sndfile/example" ]; - lispLibs = [ (getAttr "bodge-sndfile" pkgs) (getAttr "cffi-c-ref" pkgs) (getAttr "sndfile-blob" pkgs) ]; - meta = { - broken = true; - }; - }; - bodge-utilities = { - pname = "bodge-utilities"; - version = "stable-git"; - asds = [ "bodge-utilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bodge-utilities/2022-07-07/bodge-utilities-stable-git.tgz"; - sha256 = "0jmz7zb5ahg2kfd5nrh9nb7dda5szamjv7iv9skgcvf7rwn8qf0g"; - system = "bodge-utilities"; - asd = "bodge-utilities"; - }); - systems = [ "bodge-utilities" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "claw" pkgs) (getAttr "dissect" pkgs) (getAttr "local-time" pkgs) (getAttr "log4cl" pkgs) (getAttr "split-sequence" pkgs) (getAttr "static-vectors" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "uiop" pkgs) ]; - }; - boondoggle = { - pname = "boondoggle"; - version = "v1.26.0"; - asds = [ "boondoggle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2021-12-09/quilc-v1.26.0.tgz"; - sha256 = "09qp2d6xgq4cmg6nfsdz0gbs3rvz3ln0kawmry6cls14lxnljjrr"; - system = "boondoggle"; - asd = "boondoggle"; - }); - systems = [ "boondoggle" ]; - lispLibs = [ (getAttr "command-line-arguments" pkgs) (getAttr "drakma" pkgs) (getAttr "cl-quil" pkgs) (getAttr "uiop" pkgs) ]; - }; - boondoggle-tests = { - pname = "boondoggle-tests"; - version = "v1.26.0"; - asds = [ "boondoggle-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2021-12-09/quilc-v1.26.0.tgz"; - sha256 = "09qp2d6xgq4cmg6nfsdz0gbs3rvz3ln0kawmry6cls14lxnljjrr"; - system = "boondoggle-tests"; - asd = "boondoggle-tests"; - }); - systems = [ "boondoggle-tests" ]; - lispLibs = [ (getAttr "fiasco" pkgs) (getAttr "boondoggle" pkgs) (getAttr "cl-quil" pkgs) (getAttr "sapaclisp" pkgs) (getAttr "uiop" pkgs) ]; - }; - bordeaux-fft = { - pname = "bordeaux-fft"; - version = "20150608-http"; - asds = [ "bordeaux-fft" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bordeaux-fft/2015-06-08/bordeaux-fft-20150608-http.tgz"; - sha256 = "0kmz0wv34p8wixph5i6vj6p60xa48fflh9aq6kismlb0q4a1amp3"; - system = "bordeaux-fft"; - asd = "bordeaux-fft"; - }); - systems = [ "bordeaux-fft" ]; - lispLibs = [ ]; - }; - bordeaux-threads = { - pname = "bordeaux-threads"; - version = "v0.8.8"; - asds = [ "bordeaux-threads" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bordeaux-threads/2022-07-07/bordeaux-threads-v0.8.8.tgz"; - sha256 = "0h1b177fhwhv75p4jjxjffp334n8jbk93zm33vk78mv44v7jgxdm"; - system = "bordeaux-threads"; - asd = "bordeaux-threads"; - }); - systems = [ "bordeaux-threads" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - bordeaux-threads_slash_test = { - pname = "bordeaux-threads_test"; - version = "v0.8.8"; - asds = [ "bordeaux-threads" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bordeaux-threads/2022-07-07/bordeaux-threads-v0.8.8.tgz"; - sha256 = "0h1b177fhwhv75p4jjxjffp334n8jbk93zm33vk78mv44v7jgxdm"; - system = "bordeaux-threads"; - asd = "bordeaux-threads"; - }); - systems = [ "bordeaux-threads/test" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - bourbaki = { - pname = "bourbaki"; - version = "20110110-http"; - asds = [ "bourbaki" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bourbaki/2011-01-10/bourbaki-20110110-http.tgz"; - sha256 = "0d222kjk1h60467bkjpxglds3gykily5pyrnb45yvx86shkiv4lp"; - system = "bourbaki"; - asd = "bourbaki"; - }); - systems = [ "bourbaki" ]; - lispLibs = [ ]; - }; - bp = { - pname = "bp"; - version = "20221106-git"; - asds = [ "bp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bp/2022-11-06/bp-20221106-git.tgz"; - sha256 = "127gw3pyfx2vxprkbxc821923y6qmv3jd6r824m6zhalfya13w6k"; - system = "bp"; - asd = "bp"; - }); - systems = [ "bp" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "ironclad" pkgs) (getAttr "jsown" pkgs) (getAttr "aserve" pkgs) (getAttr "usocket" pkgs) ]; - }; - bp_slash_tests = { - pname = "bp_tests"; - version = "20221106-git"; - asds = [ "bp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bp/2022-11-06/bp-20221106-git.tgz"; - sha256 = "127gw3pyfx2vxprkbxc821923y6qmv3jd6r824m6zhalfya13w6k"; - system = "bp"; - asd = "bp"; - }); - systems = [ "bp/tests" ]; - lispLibs = [ (getAttr "bp" pkgs) ]; - meta = { - broken = true; - }; - }; - bst = { - pname = "bst"; - version = "20221106-git"; - asds = [ "bst" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bst/2022-11-06/bst-20221106-git.tgz"; - sha256 = "0y052jf3gkqhb7rfx72961kg42dnqhmizk7cxlv87d1jr2906d1d"; - system = "bst"; - asd = "bst"; - }); - systems = [ "bst" ]; - lispLibs = [ ]; - }; - bst_slash_test = { - pname = "bst_test"; - version = "20221106-git"; - asds = [ "bst" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bst/2022-11-06/bst-20221106-git.tgz"; - sha256 = "0y052jf3gkqhb7rfx72961kg42dnqhmizk7cxlv87d1jr2906d1d"; - system = "bst"; - asd = "bst"; - }); - systems = [ "bst/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bst" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - bt-semaphore = { - pname = "bt-semaphore"; - version = "20180711-git"; - asds = [ "bt-semaphore" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bt-semaphore/2018-07-11/bt-semaphore-20180711-git.tgz"; - sha256 = "0rl7yp36225z975hg069pywwlpchwn4086cgxwsi2db5mhghpr7l"; - system = "bt-semaphore"; - asd = "bt-semaphore"; - }); - systems = [ "bt-semaphore" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - bt-semaphore-test = { - pname = "bt-semaphore-test"; - version = "20180711-git"; - asds = [ "bt-semaphore-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bt-semaphore/2018-07-11/bt-semaphore-20180711-git.tgz"; - sha256 = "0rl7yp36225z975hg069pywwlpchwn4086cgxwsi2db5mhghpr7l"; - system = "bt-semaphore-test"; - asd = "bt-semaphore-test"; - }); - systems = [ "bt-semaphore-test" ]; - lispLibs = [ (getAttr "bt-semaphore" pkgs) (getAttr "clunit" pkgs) ]; - }; - btrie = { - pname = "btrie"; - version = "20140713-git"; - asds = [ "btrie" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/btrie/2014-07-13/btrie-20140713-git.tgz"; - sha256 = "0f1rs2zlpi2bcyba951h3cnyz2mfsxr2i6icmqbam5acqjdrmp30"; - system = "btrie"; - asd = "btrie"; - }); - systems = [ "btrie" ]; - lispLibs = [ (getAttr "arnesi" pkgs) (getAttr "lift" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - btrie-tests = { - pname = "btrie-tests"; - version = "20140713-git"; - asds = [ "btrie-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/btrie/2014-07-13/btrie-20140713-git.tgz"; - sha256 = "0f1rs2zlpi2bcyba951h3cnyz2mfsxr2i6icmqbam5acqjdrmp30"; - system = "btrie-tests"; - asd = "btrie"; - }); - systems = [ "btrie-tests" ]; - lispLibs = [ (getAttr "btrie" pkgs) (getAttr "lift" pkgs) (getAttr "metabang-bind" pkgs) ]; - }; - bubble-operator-upwards = { - pname = "bubble-operator-upwards"; - version = "1.0"; - asds = [ "bubble-operator-upwards" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bubble-operator-upwards/2012-11-25/bubble-operator-upwards-1.0.tgz"; - sha256 = "0hni8j17z3aqk67r3my1nkkjafaixvdm3cdmg89hb8hhgv0rm2x7"; - system = "bubble-operator-upwards"; - asd = "bubble-operator-upwards"; - }); - systems = [ "bubble-operator-upwards" ]; - lispLibs = [ ]; - }; - buildapp = { - pname = "buildapp"; - version = "1.5.6"; - asds = [ "buildapp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/buildapp/2015-12-18/buildapp-1.5.6.tgz"; - sha256 = "020ipjfqa3l8skd97cj5kq837wgpj28ygfxnkv64cnjrlbnzh161"; - system = "buildapp"; - asd = "buildapp"; - }); - systems = [ "buildapp" ]; - lispLibs = [ ]; - }; - buildnode = { - pname = "buildnode"; - version = "20170403-git"; - asds = [ "buildnode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; - sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; - system = "buildnode"; - asd = "buildnode"; - }); - systems = [ "buildnode" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closure-html" pkgs) (getAttr "collectors" pkgs) (getAttr "cxml" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "iterate" pkgs) (getAttr "swank" pkgs) (getAttr "split-sequence" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - buildnode-excel = { - pname = "buildnode-excel"; - version = "20170403-git"; - asds = [ "buildnode-excel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; - sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; - system = "buildnode-excel"; - asd = "buildnode-excel"; - }); - systems = [ "buildnode-excel" ]; - lispLibs = [ (getAttr "buildnode" pkgs) ]; - }; - buildnode-html5 = { - pname = "buildnode-html5"; - version = "20170403-git"; - asds = [ "buildnode-html5" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; - sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; - system = "buildnode-html5"; - asd = "buildnode-html5"; - }); - systems = [ "buildnode-html5" ]; - lispLibs = [ (getAttr "buildnode" pkgs) ]; - }; - buildnode-kml = { - pname = "buildnode-kml"; - version = "20170403-git"; - asds = [ "buildnode-kml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; - sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; - system = "buildnode-kml"; - asd = "buildnode-kml"; - }); - systems = [ "buildnode-kml" ]; - lispLibs = [ (getAttr "buildnode" pkgs) ]; - }; - buildnode-test = { - pname = "buildnode-test"; - version = "20170403-git"; - asds = [ "buildnode-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; - sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; - system = "buildnode-test"; - asd = "buildnode"; - }); - systems = [ "buildnode-test" ]; - lispLibs = [ (getAttr "buildnode" pkgs) (getAttr "buildnode-xhtml" pkgs) (getAttr "lisp-unit2" pkgs) ]; - }; - buildnode-xhtml = { - pname = "buildnode-xhtml"; - version = "20170403-git"; - asds = [ "buildnode-xhtml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; - sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; - system = "buildnode-xhtml"; - asd = "buildnode-xhtml"; - }); - systems = [ "buildnode-xhtml" ]; - lispLibs = [ (getAttr "buildnode" pkgs) ]; - }; - buildnode-xul = { - pname = "buildnode-xul"; - version = "20170403-git"; - asds = [ "buildnode-xul" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; - sha256 = "09pd3mkjd278dl1hq30mxh6m2iyyfha4byadyb9drw4n7ncnjggs"; - system = "buildnode-xul"; - asd = "buildnode-xul"; - }); - systems = [ "buildnode-xul" ]; - lispLibs = [ (getAttr "buildnode" pkgs) ]; - }; - burgled-batteries = { - pname = "burgled-batteries"; - version = "20160825-git"; - asds = [ "burgled-batteries" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/burgled-batteries/2016-08-25/burgled-batteries-20160825-git.tgz"; - sha256 = "080ff1yrmfb87pqq1jqr35djjkh3fh8i6cbhv3d1md5qy7hhgdaj"; - system = "burgled-batteries"; - asd = "burgled-batteries"; - }); - systems = [ "burgled-batteries" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-fad" pkgs) (getAttr "parse-declarations-1_dot_0" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - burgled-batteries-tests = { - pname = "burgled-batteries-tests"; - version = "20160825-git"; - asds = [ "burgled-batteries-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/burgled-batteries/2016-08-25/burgled-batteries-20160825-git.tgz"; - sha256 = "080ff1yrmfb87pqq1jqr35djjkh3fh8i6cbhv3d1md5qy7hhgdaj"; - system = "burgled-batteries-tests"; - asd = "burgled-batteries-tests"; - }); - systems = [ "burgled-batteries-tests" ]; - lispLibs = [ (getAttr "burgled-batteries" pkgs) (getAttr "cl-quickcheck" pkgs) (getAttr "lift" pkgs) ]; - }; - burgled-batteries_dot_syntax = { - pname = "burgled-batteries.syntax"; - version = "20210531-git"; - asds = [ "burgled-batteries.syntax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/burgled-batteries.syntax/2021-05-31/burgled-batteries.syntax-20210531-git.tgz"; - sha256 = "1hx8w74cgx1qbk6r2p7lzygjqxs5mzxh7w73zrmdibny64akir9a"; - system = "burgled-batteries.syntax"; - asd = "burgled-batteries.syntax"; - }); - systems = [ "burgled-batteries.syntax" ]; - lispLibs = [ (getAttr "burgled-batteries" pkgs) (getAttr "esrap" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - burgled-batteries_dot_syntax-test = { - pname = "burgled-batteries.syntax-test"; - version = "20210531-git"; - asds = [ "burgled-batteries.syntax-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/burgled-batteries.syntax/2021-05-31/burgled-batteries.syntax-20210531-git.tgz"; - sha256 = "1hx8w74cgx1qbk6r2p7lzygjqxs5mzxh7w73zrmdibny64akir9a"; - system = "burgled-batteries.syntax-test"; - asd = "burgled-batteries.syntax-test"; - }); - systems = [ "burgled-batteries.syntax-test" ]; - lispLibs = [ (getAttr "burgled-batteries_dot_syntax" pkgs) (getAttr "lift" pkgs) ]; - }; - bus = { - pname = "bus"; - version = "master-1a957fb2-git"; - asds = [ "bus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "bus"; - asd = "bus"; - }); - systems = [ "bus" ]; - lispLibs = [ (getAttr "gwl-graphics" pkgs) ]; - }; - bytecurry_dot_asdf-ext = { - pname = "bytecurry.asdf-ext"; - version = "20150505-git"; - asds = [ "bytecurry.asdf-ext" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bytecurry.asdf-ext/2015-05-05/bytecurry.asdf-ext-20150505-git.tgz"; - sha256 = "07w2lz9mq35sgzzvmz9084l1sia40zkhlvfblkpzxfwyzr6cxrxa"; - system = "bytecurry.asdf-ext"; - asd = "bytecurry.asdf-ext"; - }); - systems = [ "bytecurry.asdf-ext" ]; - lispLibs = [ (getAttr "asdf-package-system" pkgs) ]; - }; - bytecurry_dot_mocks = { - pname = "bytecurry.mocks"; - version = "20200325-git"; - asds = [ "bytecurry.mocks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bytecurry.mocks/2020-03-25/bytecurry.mocks-20200325-git.tgz"; - sha256 = "0md2j6iggmfm1v7nzcmz7f0xy2jxrsg77iszpisdzmwnijfy8ks0"; - system = "bytecurry.mocks"; - asd = "bytecurry.mocks"; - }); - systems = [ "bytecurry.mocks" ]; - lispLibs = [ (getAttr "asdf-package-system" pkgs) (getAttr "bytecurry_dot_asdf-ext" pkgs) ]; - }; - bytecurry_dot_mocks_slash_test = { - pname = "bytecurry.mocks_test"; - version = "20200325-git"; - asds = [ "bytecurry.mocks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bytecurry.mocks/2020-03-25/bytecurry.mocks-20200325-git.tgz"; - sha256 = "0md2j6iggmfm1v7nzcmz7f0xy2jxrsg77iszpisdzmwnijfy8ks0"; - system = "bytecurry.mocks"; - asd = "bytecurry.mocks"; - }); - systems = [ "bytecurry.mocks/test" ]; - lispLibs = [ (getAttr "bytecurry_dot_mocks" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - c2ffi-blob = { - pname = "c2ffi-blob"; - version = "stable-git"; - asds = [ "c2ffi-blob" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/c2ffi-blob/2020-10-16/c2ffi-blob-stable-git.tgz"; - sha256 = "1rk89nycdvcb4a50zm3wdmrbz8w5xk4jgvjg2wib1dnslwnwdivc"; - system = "c2ffi-blob"; - asd = "c2ffi-blob"; - }); - systems = [ "c2ffi-blob" ]; - lispLibs = [ (getAttr "claw-support" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - cacau = { - pname = "cacau"; - version = "20200610-git"; - asds = [ "cacau" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; - sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0"; - system = "cacau"; - asd = "cacau"; - }); - systems = [ "cacau" ]; - lispLibs = [ (getAttr "assertion-error" pkgs) (getAttr "eventbus" pkgs) ]; - }; - cacau-asdf = { - pname = "cacau-asdf"; - version = "20200610-git"; - asds = [ "cacau-asdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; - sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0"; - system = "cacau-asdf"; - asd = "cacau-asdf"; - }); - systems = [ "cacau-asdf" ]; - lispLibs = [ ]; - }; - cacau-examples-asdf-integration = { - pname = "cacau-examples-asdf-integration"; - version = "20200610-git"; - asds = [ "cacau-examples-asdf-integration" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; - sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0"; - system = "cacau-examples-asdf-integration"; - asd = "cacau-examples-asdf-integration"; - }); - systems = [ "cacau-examples-asdf-integration" ]; - lispLibs = [ ]; - }; - cacau-examples-asdf-integration-test = { - pname = "cacau-examples-asdf-integration-test"; - version = "20200610-git"; - asds = [ "cacau-examples-asdf-integration-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; - sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0"; - system = "cacau-examples-asdf-integration-test"; - asd = "cacau-examples-asdf-integration-test"; - }); - systems = [ "cacau-examples-asdf-integration-test" ]; - lispLibs = [ (getAttr "assert-p" pkgs) (getAttr "cacau" pkgs) (getAttr "cacau-asdf" pkgs) (getAttr "cacau-examples-asdf-integration" pkgs) ]; - }; - cacau-test = { - pname = "cacau-test"; - version = "20200610-git"; - asds = [ "cacau-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cacau/2020-06-10/cacau-20200610-git.tgz"; - sha256 = "0m8v1xw68cr5ldv045rxgvnhigr4iahh7v6v32z6xlq2sj6r55x0"; - system = "cacau-test"; - asd = "cacau-test"; - }); - systems = [ "cacau-test" ]; - lispLibs = [ (getAttr "assert-p" pkgs) (getAttr "cacau" pkgs) (getAttr "cacau-asdf" pkgs) ]; - }; - cache-while = { - pname = "cache-while"; - version = "20210807-git"; - asds = [ "cache-while" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cache-while/2021-08-07/cache-while-20210807-git.tgz"; - sha256 = "1qil68rfn5irmkb0jk1f6g1zy80wgc3skl8cr4rfgh7ywgm5izx3"; - system = "cache-while"; - asd = "cache-while"; - }); - systems = [ "cache-while" ]; - lispLibs = [ ]; - }; - cacle = { - pname = "cacle"; - version = "20190521-git"; - asds = [ "cacle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cacle/2019-05-21/cacle-20190521-git.tgz"; - sha256 = "0h0dk0sfkfl8g0sbrs76ydb9l4znssqhx8nc5k1sg7zxpni5a4qy"; - system = "cacle"; - asd = "cacle"; - }); - systems = [ "cacle" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - calispel = { - pname = "calispel"; - version = "20170830-git"; - asds = [ "calispel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz"; - sha256 = "08bmf3pi7n5hadpmqqkg65cxcj6kbvm997wcs1f53ml1nb79d9z8"; - system = "calispel"; - asd = "calispel"; - }); - systems = [ "calispel" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "jpl-util" pkgs) (getAttr "jpl-queues" pkgs) ]; - }; - calispel-test = { - pname = "calispel-test"; - version = "20170830-git"; - asds = [ "calispel-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz"; - sha256 = "08bmf3pi7n5hadpmqqkg65cxcj6kbvm997wcs1f53ml1nb79d9z8"; - system = "calispel-test"; - asd = "calispel"; - }); - systems = [ "calispel-test" ]; - lispLibs = [ (getAttr "calispel" pkgs) (getAttr "eager-future2" pkgs) ]; - }; - cambl = { - pname = "cambl"; - version = "20181210-git"; - asds = [ "cambl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz"; - sha256 = "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz"; - system = "cambl"; - asd = "cambl"; - }); - systems = [ "cambl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fprog" pkgs) (getAttr "cl-containers" pkgs) (getAttr "local-time" pkgs) (getAttr "periods" pkgs) ]; - }; - cambl-test = { - pname = "cambl-test"; - version = "20181210-git"; - asds = [ "cambl-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz"; - sha256 = "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz"; - system = "cambl-test"; - asd = "cambl-test"; - }); - systems = [ "cambl-test" ]; - lispLibs = [ (getAttr "cambl" pkgs) (getAttr "uiop" pkgs) (getAttr "xlunit" pkgs) ]; - }; - camera-matrix = { - pname = "camera-matrix"; - version = "20200427-git"; - asds = [ "camera-matrix" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "camera-matrix"; - asd = "camera-matrix"; - }); - systems = [ "camera-matrix" ]; - lispLibs = [ (getAttr "nsb-cga" pkgs) (getAttr "uncommon-lisp" pkgs) ]; - }; - can = { - pname = "can"; - version = "20180328-git"; - asds = [ "can" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/can/2018-03-28/can-20180328-git.tgz"; - sha256 = "0m3lqc56aw46cj2z379a19fh7f1h0vaxn78xpvbxq3bwar46jzqh"; - system = "can"; - asd = "can"; - }); - systems = [ "can" ]; - lispLibs = [ ]; - }; - can-test = { - pname = "can-test"; - version = "20180328-git"; - asds = [ "can-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/can/2018-03-28/can-20180328-git.tgz"; - sha256 = "0m3lqc56aw46cj2z379a19fh7f1h0vaxn78xpvbxq3bwar46jzqh"; - system = "can-test"; - asd = "can-test"; - }); - systems = [ "can-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "can" pkgs) (getAttr "mito" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - canonicalized-initargs = { - pname = "canonicalized-initargs"; - version = "2.0"; - asds = [ "canonicalized-initargs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/canonicalized-initargs/2021-04-11/canonicalized-initargs_2.0.tgz"; - sha256 = "0jmmjw86x9mmlfla4kdmdqf1fjrj0p2fmv1lc4k555mcf67mj2fq"; - system = "canonicalized-initargs"; - asd = "canonicalized-initargs"; - }); - systems = [ "canonicalized-initargs" ]; - lispLibs = [ (getAttr "cesdi" pkgs) (getAttr "closer-mop" pkgs) (getAttr "compatible-metaclasses" pkgs) (getAttr "enhanced-defclass" pkgs) (getAttr "enhanced-typep" pkgs) (getAttr "object-class" pkgs) ]; - }; - canonicalized-initargs_tests = { - pname = "canonicalized-initargs_tests"; - version = "2.0"; - asds = [ "canonicalized-initargs_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/canonicalized-initargs/2021-04-11/canonicalized-initargs_2.0.tgz"; - sha256 = "0jmmjw86x9mmlfla4kdmdqf1fjrj0p2fmv1lc4k555mcf67mj2fq"; - system = "canonicalized-initargs_tests"; - asd = "canonicalized-initargs_tests"; - }); - systems = [ "canonicalized-initargs_tests" ]; - lispLibs = [ (getAttr "canonicalized-initargs" pkgs) (getAttr "enhanced-boolean" pkgs) (getAttr "enhanced-eval-when" pkgs) (getAttr "parachute" pkgs) ]; - }; - capstone = { - pname = "capstone"; - version = "20220331-git"; - asds = [ "capstone" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-capstone/2022-03-31/cl-capstone-20220331-git.tgz"; - sha256 = "1jbhp1sf7mr6yrqkdyjl93m1dl901ka6gkgdj20nv2bgp400ycmp"; - system = "capstone"; - asd = "capstone"; - }); - systems = [ "capstone" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "gt" pkgs) (getAttr "static-vectors" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - capstone_slash_raw = { - pname = "capstone_raw"; - version = "20220331-git"; - asds = [ "capstone" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-capstone/2022-03-31/cl-capstone-20220331-git.tgz"; - sha256 = "1jbhp1sf7mr6yrqkdyjl93m1dl901ka6gkgdj20nv2bgp400ycmp"; - system = "capstone"; - asd = "capstone"; - }); - systems = [ "capstone/raw" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "gt" pkgs) (getAttr "static-vectors" pkgs) ]; - meta = { - broken = true; - }; - }; - capstone_slash_raw-test = { - pname = "capstone_raw-test"; - version = "20220331-git"; - asds = [ "capstone" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-capstone/2022-03-31/cl-capstone-20220331-git.tgz"; - sha256 = "1jbhp1sf7mr6yrqkdyjl93m1dl901ka6gkgdj20nv2bgp400ycmp"; - system = "capstone"; - asd = "capstone"; - }); - systems = [ "capstone/raw-test" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "gt" pkgs) (getAttr "static-vectors" pkgs) (getAttr "stefil" pkgs) ]; - meta = { - broken = true; - }; - }; - capstone_slash_test = { - pname = "capstone_test"; - version = "20220331-git"; - asds = [ "capstone" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-capstone/2022-03-31/cl-capstone-20220331-git.tgz"; - sha256 = "1jbhp1sf7mr6yrqkdyjl93m1dl901ka6gkgdj20nv2bgp400ycmp"; - system = "capstone"; - asd = "capstone"; - }); - systems = [ "capstone/test" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "capstone" pkgs) (getAttr "gt" pkgs) (getAttr "static-vectors" pkgs) (getAttr "stefil" pkgs) ]; - meta = { - broken = true; - }; - }; - caramel = { - pname = "caramel"; - version = "20130420-git"; - asds = [ "caramel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/caramel/2013-04-20/caramel-20130420-git.tgz"; - sha256 = "08kyjxd8hyk5xnnq0p0w4aqpvisv278h38pqjkz04a032dn5b87a"; - system = "caramel"; - asd = "caramel"; - }); - systems = [ "caramel" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "buildnode" pkgs) (getAttr "closure-html" pkgs) (getAttr "css-selectors" pkgs) (getAttr "cxml" pkgs) (getAttr "cxml-dom" pkgs) (getAttr "iterate" pkgs) ]; - }; - cardioex = { - pname = "cardioex"; - version = "20211020-git"; - asds = [ "cardioex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cardiogram/2021-10-20/cardiogram-20211020-git.tgz"; - sha256 = "08kqcj3c4vkx5s6ba9m67xh7w7paaavp2ds072crp1x7pjkh4n5i"; - system = "cardioex"; - asd = "cardioex"; - }); - systems = [ "cardioex" ]; - lispLibs = [ (getAttr "cardiogram" pkgs) ]; - }; - cardiogram = { - pname = "cardiogram"; - version = "20211020-git"; - asds = [ "cardiogram" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cardiogram/2021-10-20/cardiogram-20211020-git.tgz"; - sha256 = "08kqcj3c4vkx5s6ba9m67xh7w7paaavp2ds072crp1x7pjkh4n5i"; - system = "cardiogram"; - asd = "cardiogram"; - }); - systems = [ "cardiogram" ]; - lispLibs = [ (getAttr "cl-annot" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - cari3s = { - pname = "cari3s"; - version = "20200325-git"; - asds = [ "cari3s" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cari3s/2020-03-25/cari3s-20200325-git.tgz"; - sha256 = "1adwrlwq48l1g9syi0nnm77x1rxv53x9zdhbr91nqqy8b8sxr674"; - system = "cari3s"; - asd = "cari3s"; - }); - systems = [ "cari3s" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "closer-mop" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "drakma" pkgs) (getAttr "pango-markup" pkgs) (getAttr "usocket" pkgs) (getAttr "yason" pkgs) ]; - }; - carrier = { - pname = "carrier"; - version = "20181210-git"; - asds = [ "carrier" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/carrier/2018-12-10/carrier-20181210-git.tgz"; - sha256 = "1xry7alc9x86y1g5k417vhvlgkwgfrl80zpsyfdwdsz7hrwff41d"; - system = "carrier"; - asd = "carrier"; - }); - systems = [ "carrier" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "blackbird" pkgs) (getAttr "cl-async" pkgs) (getAttr "cl-async-ssl" pkgs) (getAttr "cl-cookie" pkgs) (getAttr "fast-http" pkgs) (getAttr "fast-io" pkgs) (getAttr "quri" pkgs) ]; - }; - cartesian-product-switch = { - pname = "cartesian-product-switch"; - version = "2.0"; - asds = [ "cartesian-product-switch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cartesian-product-switch/2012-09-09/cartesian-product-switch-2.0.tgz"; - sha256 = "18cxslj2753k6h666j0mmzg0h0z9l6ddi24gqls6h5d5svd7l3xk"; - system = "cartesian-product-switch"; - asd = "cartesian-product-switch"; - }); - systems = [ "cartesian-product-switch" ]; - lispLibs = [ (getAttr "map-bind" pkgs) ]; - }; - caveman-middleware-dbimanager = { - pname = "caveman-middleware-dbimanager"; - version = "20221106-git"; - asds = [ "caveman-middleware-dbimanager" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/caveman/2022-11-06/caveman-20221106-git.tgz"; - sha256 = "041i1g78cn6mjv8ba4bylw57f3px2rp5a0jnj17rwkfhfcvc76md"; - system = "caveman-middleware-dbimanager"; - asd = "caveman-middleware-dbimanager"; - }); - systems = [ "caveman-middleware-dbimanager" ]; - lispLibs = [ (getAttr "dbi" pkgs) ]; - }; - caveman2 = { - pname = "caveman2"; - version = "20221106-git"; - asds = [ "caveman2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/caveman/2022-11-06/caveman-20221106-git.tgz"; - sha256 = "041i1g78cn6mjv8ba4bylw57f3px2rp5a0jnj17rwkfhfcvc76md"; - system = "caveman2"; - asd = "caveman2"; - }); - systems = [ "caveman2" ]; - lispLibs = [ (getAttr "dbi" pkgs) (getAttr "cl-project" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "lack-request" pkgs) (getAttr "lack-response" pkgs) (getAttr "myway" pkgs) (getAttr "ningle" pkgs) (getAttr "quri" pkgs) ]; - }; - caveman2-db = { - pname = "caveman2-db"; - version = "20221106-git"; - asds = [ "caveman2-db" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/caveman/2022-11-06/caveman-20221106-git.tgz"; - sha256 = "041i1g78cn6mjv8ba4bylw57f3px2rp5a0jnj17rwkfhfcvc76md"; - system = "caveman2-db"; - asd = "caveman2-db"; - }); - systems = [ "caveman2-db" ]; - lispLibs = [ (getAttr "caveman-middleware-dbimanager" pkgs) (getAttr "dbi" pkgs) (getAttr "sxql" pkgs) ]; - }; - caveman2-test = { - pname = "caveman2-test"; - version = "20221106-git"; - asds = [ "caveman2-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/caveman/2022-11-06/caveman-20221106-git.tgz"; - sha256 = "041i1g78cn6mjv8ba4bylw57f3px2rp5a0jnj17rwkfhfcvc76md"; - system = "caveman2-test"; - asd = "caveman2-test"; - }); - systems = [ "caveman2-test" ]; - lispLibs = [ (getAttr "caveman2" pkgs) (getAttr "dexador" pkgs) (getAttr "lack-component" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "trivial-types" pkgs) (getAttr "uiop" pkgs) (getAttr "usocket" pkgs) ]; - }; - caveman2-widgets = { - pname = "caveman2-widgets"; - version = "20180228-git"; - asds = [ "caveman2-widgets" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/caveman2-widgets/2018-02-28/caveman2-widgets-20180228-git.tgz"; - sha256 = "1rzb868m3f28z1hcr3nzlprgqqq1kwg3qyh24p36fv76b4g96wkq"; - system = "caveman2-widgets"; - asd = "caveman2-widgets"; - }); - systems = [ "caveman2-widgets" ]; - lispLibs = [ (getAttr "caveman2" pkgs) (getAttr "moptilities" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - caveman2-widgets-bootstrap = { - pname = "caveman2-widgets-bootstrap"; - version = "20180228-git"; - asds = [ "caveman2-widgets-bootstrap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/caveman2-widgets-bootstrap/2018-02-28/caveman2-widgets-bootstrap-20180228-git.tgz"; - sha256 = "1xh3x7r7givxxyrkh4ngx098s35qz98gcz7yjyf4dp0psfkk65xj"; - system = "caveman2-widgets-bootstrap"; - asd = "caveman2-widgets-bootstrap"; - }); - systems = [ "caveman2-widgets-bootstrap" ]; - lispLibs = [ (getAttr "caveman2" pkgs) (getAttr "caveman2-widgets" pkgs) ]; - }; - caveman2-widgets-bootstrap-test = { - pname = "caveman2-widgets-bootstrap-test"; - version = "20180228-git"; - asds = [ "caveman2-widgets-bootstrap-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/caveman2-widgets-bootstrap/2018-02-28/caveman2-widgets-bootstrap-20180228-git.tgz"; - sha256 = "1xh3x7r7givxxyrkh4ngx098s35qz98gcz7yjyf4dp0psfkk65xj"; - system = "caveman2-widgets-bootstrap-test"; - asd = "caveman2-widgets-bootstrap-test"; - }); - systems = [ "caveman2-widgets-bootstrap-test" ]; - lispLibs = [ (getAttr "caveman2-widgets-bootstrap" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - caveman2-widgets-test = { - pname = "caveman2-widgets-test"; - version = "20180228-git"; - asds = [ "caveman2-widgets-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/caveman2-widgets/2018-02-28/caveman2-widgets-20180228-git.tgz"; - sha256 = "1rzb868m3f28z1hcr3nzlprgqqq1kwg3qyh24p36fv76b4g96wkq"; - system = "caveman2-widgets-test"; - asd = "caveman2-widgets-test"; - }); - systems = [ "caveman2-widgets-test" ]; - lispLibs = [ (getAttr "caveman2-widgets" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cblas = { - pname = "cblas"; - version = "20221106-git"; - asds = [ "cblas" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cblas/2022-11-06/cl-cblas-20221106-git.tgz"; - sha256 = "1bd2w51r71pgm6sc6m2fms4j1bbnli023j4w3rbxw9cln0g7badp"; - system = "cblas"; - asd = "cblas"; - }); - systems = [ "cblas" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-autowrap" pkgs) (getAttr "uiop" pkgs) ]; - }; - ccl-compat = { - pname = "ccl-compat"; - version = "20171130-git"; - asds = [ "ccl-compat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ccl-compat/2017-11-30/ccl-compat-20171130-git.tgz"; - sha256 = "15402373wprmyx4l7zgpv64vj3c11xvxnnpzqbmq4j6rljpb40da"; - system = "ccl-compat"; - asd = "ccl-compat"; - }); - systems = [ "ccl-compat" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - ccldoc = { - pname = "ccldoc"; - version = "20200427-git"; - asds = [ "ccldoc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ccldoc/2020-04-27/ccldoc-20200427-git.tgz"; - sha256 = "0pxjk07drvxrk65g46lbpz2y0xgxgn04k6yvirl0hk2dry0myinp"; - system = "ccldoc"; - asd = "ccldoc"; - }); - systems = [ "ccldoc" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "ccl-compat" pkgs) (getAttr "cl-who" pkgs) (getAttr "s-xml" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - ccldoc-libraries = { - pname = "ccldoc-libraries"; - version = "20200427-git"; - asds = [ "ccldoc-libraries" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ccldoc/2020-04-27/ccldoc-20200427-git.tgz"; - sha256 = "0pxjk07drvxrk65g46lbpz2y0xgxgn04k6yvirl0hk2dry0myinp"; - system = "ccldoc-libraries"; - asd = "ccldoc-libraries"; - }); - systems = [ "ccldoc-libraries" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "s-xml" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cells = { - pname = "cells"; - version = "20211020-git"; - asds = [ "cells" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cells/2021-10-20/cells-20211020-git.tgz"; - sha256 = "0rkzvwq38lwb1045w54kw020pb9i63hxiawwhqkf8k1inhak3fdk"; - system = "cells"; - asd = "cells"; - }); - systems = [ "cells" ]; - lispLibs = [ (getAttr "utils-kt" pkgs) ]; - }; - cephes = { - pname = "cephes"; - version = "20221106-git"; - asds = [ "cephes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cephes.cl/2022-11-06/cephes.cl-20221106-git.tgz"; - sha256 = "07krprq23i9ncdkdq69lsvzswshhrfmjds4sk1kgicjxhm37l25h"; - system = "cephes"; - asd = "cephes"; - }); - systems = [ "cephes" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cepl = { - pname = "cepl"; - version = "release-quicklisp-d1a10b6c-git"; - asds = [ "cepl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl/2021-02-28/cepl-release-quicklisp-d1a10b6c-git.tgz"; - sha256 = "0izbw2advqm3wailj3dpq6zqfrfirwn14pw5qmqh8i71r51xwmm2"; - system = "cepl"; - asd = "cepl"; - }); - systems = [ "cepl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cepl_dot_build" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "float-features" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) (getAttr "varjo" pkgs) ]; - }; - cepl_dot_build = { - pname = "cepl.build"; - version = "release-quicklisp-d1a10b6c-git"; - asds = [ "cepl.build" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl/2021-02-28/cepl-release-quicklisp-d1a10b6c-git.tgz"; - sha256 = "0izbw2advqm3wailj3dpq6zqfrfirwn14pw5qmqh8i71r51xwmm2"; - system = "cepl.build"; - asd = "cepl.build"; - }); - systems = [ "cepl.build" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cepl_dot_camera = { - pname = "cepl.camera"; - version = "release-quicklisp-1292212a-git"; - asds = [ "cepl.camera" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl.camera/2018-02-28/cepl.camera-release-quicklisp-1292212a-git.tgz"; - sha256 = "0z73f95bxr2vn47g8qrvf9gzy1my25mkg7hl7kpib21yahfpzzvb"; - system = "cepl.camera"; - asd = "cepl.camera"; - }); - systems = [ "cepl.camera" ]; - lispLibs = [ (getAttr "cepl" pkgs) (getAttr "cepl_dot_spaces" pkgs) (getAttr "rtg-math" pkgs) ]; - }; - cepl_dot_devil = { - pname = "cepl.devil"; - version = "release-quicklisp-ea5f8514-git"; - asds = [ "cepl.devil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl.devil/2018-02-28/cepl.devil-release-quicklisp-ea5f8514-git.tgz"; - sha256 = "1b64vfjchkwppcp3j4krwx2x9nj29llisqy1yc9ncbnmi9xs38a0"; - system = "cepl.devil"; - asd = "cepl.devil"; - }); - systems = [ "cepl.devil" ]; - lispLibs = [ (getAttr "cepl" pkgs) (getAttr "cl-devil" pkgs) ]; - }; - cepl_dot_drm-gbm = { - pname = "cepl.drm-gbm"; - version = "20190521-git"; - asds = [ "cepl.drm-gbm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl.drm-gbm/2019-05-21/cepl.drm-gbm-20190521-git.tgz"; - sha256 = "00csd2f6z13rjqipaf02w87phn2xynmzf1jcrrshbibs204m4nmy"; - system = "cepl.drm-gbm"; - asd = "cepl.drm-gbm"; - }); - systems = [ "cepl.drm-gbm" ]; - lispLibs = [ (getAttr "cepl" pkgs) (getAttr "cl-drm" pkgs) (getAttr "cl-egl" pkgs) (getAttr "cl-gbm" pkgs) (getAttr "osicat" pkgs) ]; - }; - cepl_dot_glop = { - pname = "cepl.glop"; - version = "release-quicklisp-8ec09801-git"; - asds = [ "cepl.glop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl.glop/2018-02-28/cepl.glop-release-quicklisp-8ec09801-git.tgz"; - sha256 = "1dq727v2s22yna6ycxxs79pg13b0cyh1lfrk6hsb6vizgiks20jw"; - system = "cepl.glop"; - asd = "cepl.glop"; - }); - systems = [ "cepl.glop" ]; - lispLibs = [ (getAttr "cepl" pkgs) (getAttr "glop" pkgs) ]; - }; - cepl_dot_sdl2 = { - pname = "cepl.sdl2"; - version = "release-quicklisp-6da5a030-git"; - asds = [ "cepl.sdl2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl.sdl2/2018-02-28/cepl.sdl2-release-quicklisp-6da5a030-git.tgz"; - sha256 = "0lz8yxm1g2ch0w779lhrs2xkfciy3iz6viz7cdgyd2824isvinjf"; - system = "cepl.sdl2"; - asd = "cepl.sdl2"; - }); - systems = [ "cepl.sdl2" ]; - lispLibs = [ (getAttr "cepl" pkgs) (getAttr "sdl2" pkgs) ]; - }; - cepl_dot_sdl2-image = { - pname = "cepl.sdl2-image"; - version = "release-quicklisp-94a77649-git"; - asds = [ "cepl.sdl2-image" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl.sdl2-image/2018-02-28/cepl.sdl2-image-release-quicklisp-94a77649-git.tgz"; - sha256 = "16dzjk2q658xr1v9rk2iny70rjhxbgi4lcp59s5mkdfs2k3a2637"; - system = "cepl.sdl2-image"; - asd = "cepl.sdl2-image"; - }); - systems = [ "cepl.sdl2-image" ]; - lispLibs = [ (getAttr "cepl" pkgs) (getAttr "sdl2" pkgs) (getAttr "sdl2-image" pkgs) ]; - }; - cepl_dot_sdl2-ttf = { - pname = "cepl.sdl2-ttf"; - version = "release-quicklisp-11b498a3-git"; - asds = [ "cepl.sdl2-ttf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl.sdl2-ttf/2018-01-31/cepl.sdl2-ttf-release-quicklisp-11b498a3-git.tgz"; - sha256 = "1fxj3rdv2rlyks00h18dpd42xywgnydgyvb1s4d67hjk7fl19a5p"; - system = "cepl.sdl2-ttf"; - asd = "cepl.sdl2-ttf"; - }); - systems = [ "cepl.sdl2-ttf" ]; - lispLibs = [ (getAttr "cepl_dot_sdl2" pkgs) (getAttr "sdl2-ttf" pkgs) (getAttr "rtg-math" pkgs) ]; - }; - cepl_dot_skitter_dot_glop = { - pname = "cepl.skitter.glop"; - version = "release-quicklisp-f52b9240-git"; - asds = [ "cepl.skitter.glop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl.skitter/2018-02-28/cepl.skitter-release-quicklisp-f52b9240-git.tgz"; - sha256 = "1xz53q8klzrd7cr586jd16pypxgpy68vlvfirqhlv6jc7k99sjvs"; - system = "cepl.skitter.glop"; - asd = "cepl.skitter.glop"; - }); - systems = [ "cepl.skitter.glop" ]; - lispLibs = [ (getAttr "cepl_dot_glop" pkgs) (getAttr "skitter_dot_glop" pkgs) ]; - }; - cepl_dot_skitter_dot_sdl2 = { - pname = "cepl.skitter.sdl2"; - version = "release-quicklisp-f52b9240-git"; - asds = [ "cepl.skitter.sdl2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl.skitter/2018-02-28/cepl.skitter-release-quicklisp-f52b9240-git.tgz"; - sha256 = "1xz53q8klzrd7cr586jd16pypxgpy68vlvfirqhlv6jc7k99sjvs"; - system = "cepl.skitter.sdl2"; - asd = "cepl.skitter.sdl2"; - }); - systems = [ "cepl.skitter.sdl2" ]; - lispLibs = [ (getAttr "cepl_dot_sdl2" pkgs) (getAttr "skitter_dot_sdl2" pkgs) ]; - }; - cepl_dot_spaces = { - pname = "cepl.spaces"; - version = "release-quicklisp-c7f83f26-git"; - asds = [ "cepl.spaces" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cepl.spaces/2018-03-28/cepl.spaces-release-quicklisp-c7f83f26-git.tgz"; - sha256 = "0z74ipd4j2spjwl6h625azdczpds3v44iin77q685ldx9rwx3k8y"; - system = "cepl.spaces"; - asd = "cepl.spaces"; - }); - systems = [ "cepl.spaces" ]; - lispLibs = [ (getAttr "cepl" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "fn" pkgs) (getAttr "rtg-math" pkgs) (getAttr "rtg-math_dot_vari" pkgs) (getAttr "varjo" pkgs) ]; - }; - ceramic = { - pname = "ceramic"; - version = "20210807-git"; - asds = [ "ceramic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ceramic/2021-08-07/ceramic-20210807-git.tgz"; - sha256 = "0hd553gj4cwmli45pfwhqpz7sg6kzn31iv8akaxr5ba3hssa1aap"; - system = "ceramic"; - asd = "ceramic"; - }); - systems = [ "ceramic" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "clack-handler-hunchentoot" pkgs) (getAttr "copy-directory" pkgs) (getAttr "electron-tools" pkgs) (getAttr "external-program" pkgs) (getAttr "remote-js" pkgs) (getAttr "trivial-build" pkgs) (getAttr "trivial-compress" pkgs) (getAttr "trivial-download" pkgs) (getAttr "trivial-exe" pkgs) (getAttr "trivial-extract" pkgs) (getAttr "uiop" pkgs) (getAttr "uuid" pkgs) ]; - }; - ceramic-test-app = { - pname = "ceramic-test-app"; - version = "20210807-git"; - asds = [ "ceramic-test-app" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ceramic/2021-08-07/ceramic-20210807-git.tgz"; - sha256 = "0hd553gj4cwmli45pfwhqpz7sg6kzn31iv8akaxr5ba3hssa1aap"; - system = "ceramic-test-app"; - asd = "ceramic-test-app"; - }); - systems = [ "ceramic-test-app" ]; - lispLibs = [ (getAttr "ceramic" pkgs) (getAttr "drakma" pkgs) ]; - }; - cerberus = { - pname = "cerberus"; - version = "20221106-git"; - asds = [ "cerberus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cerberus/2022-11-06/cerberus-20221106-git.tgz"; - sha256 = "04yi0wqykx5v8drdw7ln382gxdklv60mg4aqrxg2j5wlsyacs0kb"; - system = "cerberus"; - asd = "cerberus"; - }); - systems = [ "cerberus" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "glass" pkgs) (getAttr "ironclad" pkgs) (getAttr "nibbles" pkgs) (getAttr "usocket" pkgs) ]; - }; - cerberus-kdc = { - pname = "cerberus-kdc"; - version = "20221106-git"; - asds = [ "cerberus-kdc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cerberus/2022-11-06/cerberus-20221106-git.tgz"; - sha256 = "04yi0wqykx5v8drdw7ln382gxdklv60mg4aqrxg2j5wlsyacs0kb"; - system = "cerberus-kdc"; - asd = "cerberus"; - }); - systems = [ "cerberus-kdc" ]; - lispLibs = [ (getAttr "cerberus" pkgs) (getAttr "frpc" pkgs) (getAttr "pounds" pkgs) ]; - }; - cesdi = { - pname = "cesdi"; - version = "1.0.1"; - asds = [ "cesdi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cesdi/2020-07-15/cesdi_1.0.1.tgz"; - sha256 = "02f2pz5rw79ljkkx1ywh8nkpjj4g3z3s1lyvzqb8krbnx11wl0q9"; - system = "cesdi"; - asd = "cesdi"; - }); - systems = [ "cesdi" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - cesdi_tests = { - pname = "cesdi_tests"; - version = "1.0.1"; - asds = [ "cesdi_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cesdi/2020-07-15/cesdi_1.0.1.tgz"; - sha256 = "02f2pz5rw79ljkkx1ywh8nkpjj4g3z3s1lyvzqb8krbnx11wl0q9"; - system = "cesdi_tests"; - asd = "cesdi_tests"; - }); - systems = [ "cesdi_tests" ]; - lispLibs = [ (getAttr "cesdi" pkgs) (getAttr "parachute" pkgs) ]; - }; - cffi = { - pname = "cffi"; - version = "20221106-git"; - asds = [ "cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2022-11-06/cffi-20221106-git.tgz"; - sha256 = "0199hzvvsflisp79zv6dpyfkm3d91h8f0ds8mkpijd5li5h17206"; - system = "cffi"; - asd = "cffi"; - }); - systems = [ "cffi" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "trivial-features" pkgs) (getAttr "uiop" pkgs) ]; - }; - cffi-c-ref = { - pname = "cffi-c-ref"; - version = "stable-git"; - asds = [ "cffi-c-ref" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi-c-ref/2020-10-16/cffi-c-ref-stable-git.tgz"; - sha256 = "1a3pp6xcisabqir3rp1gvvjfdxcvpm8yr35p38nri9azsinmmc7z"; - system = "cffi-c-ref"; - asd = "cffi-c-ref"; - }); - systems = [ "cffi-c-ref" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) ]; - }; - cffi-c-ref_slash_tests = { - pname = "cffi-c-ref_tests"; - version = "stable-git"; - asds = [ "cffi-c-ref" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi-c-ref/2020-10-16/cffi-c-ref-stable-git.tgz"; - sha256 = "1a3pp6xcisabqir3rp1gvvjfdxcvpm8yr35p38nri9azsinmmc7z"; - system = "cffi-c-ref"; - asd = "cffi-c-ref"; - }); - systems = [ "cffi-c-ref/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bodge-libc-essentials" pkgs) (getAttr "cffi-c-ref" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cffi-examples = { - pname = "cffi-examples"; - version = "20221106-git"; - asds = [ "cffi-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2022-11-06/cffi-20221106-git.tgz"; - sha256 = "0199hzvvsflisp79zv6dpyfkm3d91h8f0ds8mkpijd5li5h17206"; - system = "cffi-examples"; - asd = "cffi-examples"; - }); - systems = [ "cffi-examples" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cffi-grovel = { - pname = "cffi-grovel"; - version = "20221106-git"; - asds = [ "cffi-grovel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2022-11-06/cffi-20221106-git.tgz"; - sha256 = "0199hzvvsflisp79zv6dpyfkm3d91h8f0ds8mkpijd5li5h17206"; - system = "cffi-grovel"; - asd = "cffi-grovel"; - }); - systems = [ "cffi-grovel" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-toolchain" pkgs) ]; - }; - cffi-libffi = { - pname = "cffi-libffi"; - version = "20221106-git"; - asds = [ "cffi-libffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2022-11-06/cffi-20221106-git.tgz"; - sha256 = "0199hzvvsflisp79zv6dpyfkm3d91h8f0ds8mkpijd5li5h17206"; - system = "cffi-libffi"; - asd = "cffi-libffi"; - }); - systems = [ "cffi-libffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - cffi-tests = { - pname = "cffi-tests"; - version = "20221106-git"; - asds = [ "cffi-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2022-11-06/cffi-20221106-git.tgz"; - sha256 = "0199hzvvsflisp79zv6dpyfkm3d91h8f0ds8mkpijd5li5h17206"; - system = "cffi-tests"; - asd = "cffi-tests"; - }); - systems = [ "cffi-tests" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "rt" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - cffi-tests_slash_example = { - pname = "cffi-tests_example"; - version = "20221106-git"; - asds = [ "cffi-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2022-11-06/cffi-20221106-git.tgz"; - sha256 = "0199hzvvsflisp79zv6dpyfkm3d91h8f0ds8mkpijd5li5h17206"; - system = "cffi-tests"; - asd = "cffi-tests"; - }); - systems = [ "cffi-tests/example" ]; - lispLibs = [ (getAttr "cffi-grovel" pkgs) ]; - meta = { - broken = true; - }; - }; - cffi-toolchain = { - pname = "cffi-toolchain"; - version = "20221106-git"; - asds = [ "cffi-toolchain" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2022-11-06/cffi-20221106-git.tgz"; - sha256 = "0199hzvvsflisp79zv6dpyfkm3d91h8f0ds8mkpijd5li5h17206"; - system = "cffi-toolchain"; - asd = "cffi-toolchain"; - }); - systems = [ "cffi-toolchain" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cffi-uffi-compat = { - pname = "cffi-uffi-compat"; - version = "20221106-git"; - asds = [ "cffi-uffi-compat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2022-11-06/cffi-20221106-git.tgz"; - sha256 = "0199hzvvsflisp79zv6dpyfkm3d91h8f0ds8mkpijd5li5h17206"; - system = "cffi-uffi-compat"; - asd = "cffi-uffi-compat"; - }); - systems = [ "cffi-uffi-compat" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cffi_slash_c2ffi = { - pname = "cffi_c2ffi"; - version = "20221106-git"; - asds = [ "cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2022-11-06/cffi-20221106-git.tgz"; - sha256 = "0199hzvvsflisp79zv6dpyfkm3d91h8f0ds8mkpijd5li5h17206"; - system = "cffi"; - asd = "cffi"; - }); - systems = [ "cffi/c2ffi" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) ]; - meta = { - broken = true; - }; - }; - cffi_slash_c2ffi-generator = { - pname = "cffi_c2ffi-generator"; - version = "20221106-git"; - asds = [ "cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cffi/2022-11-06/cffi-20221106-git.tgz"; - sha256 = "0199hzvvsflisp79zv6dpyfkm3d91h8f0ds8mkpijd5li5h17206"; - system = "cffi"; - asd = "cffi"; - }); - systems = [ "cffi/c2ffi-generator" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) ]; - meta = { - broken = true; - }; - }; - chain = { - pname = "chain"; - version = "20211209-git"; - asds = [ "chain" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chain/2021-12-09/chain-20211209-git.tgz"; - sha256 = "0x8b2cbp1xq61fpbk0mqwbksnfynlgai3782rafsywka8rgfhmjh"; - system = "chain"; - asd = "chain"; - }); - systems = [ "chain" ]; - lispLibs = [ (getAttr "metabang-bind" pkgs) ]; - }; - chameleon = { - pname = "chameleon"; - version = "v2.1.1"; - asds = [ "chameleon" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chameleon/2022-02-20/chameleon-v2.1.1.tgz"; - sha256 = "1bqminvhx3hlqzxvy2a105gm9d2dxl5cy6ls5rm9wmkvw7gyza6c"; - system = "chameleon"; - asd = "chameleon"; - }); - systems = [ "chameleon" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - chameleon_slash_tests = { - pname = "chameleon_tests"; - version = "v2.1.1"; - asds = [ "chameleon" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chameleon/2022-02-20/chameleon-v2.1.1.tgz"; - sha256 = "1bqminvhx3hlqzxvy2a105gm9d2dxl5cy6ls5rm9wmkvw7gyza6c"; - system = "chameleon"; - asd = "chameleon"; - }); - systems = [ "chameleon/tests" ]; - lispLibs = [ (getAttr "chameleon" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - chancery = { - pname = "chancery"; - version = "20201016-hg"; - asds = [ "chancery" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chancery/2020-10-16/chancery-20201016-hg.tgz"; - sha256 = "1g0jgrih7q14gizy481j9z2s15pmv6iwymnpddbyqfja9miv61lw"; - system = "chancery"; - asd = "chancery"; - }); - systems = [ "chancery" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - chancery_dot_test = { - pname = "chancery.test"; - version = "20201016-hg"; - asds = [ "chancery.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chancery/2020-10-16/chancery-20201016-hg.tgz"; - sha256 = "1g0jgrih7q14gizy481j9z2s15pmv6iwymnpddbyqfja9miv61lw"; - system = "chancery.test"; - asd = "chancery.test"; - }); - systems = [ "chancery.test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "chancery" pkgs) ]; - }; - changed-stream = { - pname = "changed-stream"; - version = "20130128-git"; - asds = [ "changed-stream" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/changed-stream/2013-01-28/changed-stream-20130128-git.tgz"; - sha256 = "1cll7xclg9jr55swhi3g6z567bxvb9kmljh67091xazcfacz732i"; - system = "changed-stream"; - asd = "changed-stream"; - }); - systems = [ "changed-stream" ]; - lispLibs = [ ]; - }; - changed-stream_dot_test = { - pname = "changed-stream.test"; - version = "20130128-git"; - asds = [ "changed-stream.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/changed-stream/2013-01-28/changed-stream-20130128-git.tgz"; - sha256 = "1cll7xclg9jr55swhi3g6z567bxvb9kmljh67091xazcfacz732i"; - system = "changed-stream.test"; - asd = "changed-stream.test"; - }); - systems = [ "changed-stream.test" ]; - lispLibs = [ (getAttr "changed-stream" pkgs) ]; - }; - chanl = { - pname = "chanl"; - version = "20210411-git"; - asds = [ "chanl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chanl/2021-04-11/chanl-20210411-git.tgz"; - sha256 = "1faljdamw09fp5154i7vhqnipm1awn2q3712ir41j2yh05djhm0y"; - system = "chanl"; - asd = "chanl"; - }); - systems = [ "chanl" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - chanl_slash_examples = { - pname = "chanl_examples"; - version = "20210411-git"; - asds = [ "chanl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chanl/2021-04-11/chanl-20210411-git.tgz"; - sha256 = "1faljdamw09fp5154i7vhqnipm1awn2q3712ir41j2yh05djhm0y"; - system = "chanl"; - asd = "chanl"; - }); - systems = [ "chanl/examples" ]; - lispLibs = [ (getAttr "chanl" pkgs) ]; - meta = { - broken = true; - }; - }; - chanl_slash_tests = { - pname = "chanl_tests"; - version = "20210411-git"; - asds = [ "chanl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chanl/2021-04-11/chanl-20210411-git.tgz"; - sha256 = "1faljdamw09fp5154i7vhqnipm1awn2q3712ir41j2yh05djhm0y"; - system = "chanl"; - asd = "chanl"; - }); - systems = [ "chanl/tests" ]; - lispLibs = [ (getAttr "chanl" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - character-modifier-bits = { - pname = "character-modifier-bits"; - version = "20200427-git"; - asds = [ "character-modifier-bits" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "character-modifier-bits"; - asd = "character-modifier-bits"; - }); - systems = [ "character-modifier-bits" ]; - lispLibs = [ ]; - }; - cheat-js = { - pname = "cheat-js"; - version = "20121013-git"; - asds = [ "cheat-js" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cheat-js/2012-10-13/cheat-js-20121013-git.tgz"; - sha256 = "1h73kx0iii4y4gslz6f8kvf980bnypsras6xj38apm0fcwm93w03"; - system = "cheat-js"; - asd = "cheat-js"; - }); - systems = [ "cheat-js" ]; - lispLibs = [ (getAttr "cl-uglify-js" pkgs) (getAttr "fiveam" pkgs) ]; - }; - check-bnf = { - pname = "check-bnf"; - version = "20220707-git"; - asds = [ "check-bnf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/check-bnf/2022-07-07/check-bnf-20220707-git.tgz"; - sha256 = "1dpp0xzj51a7fg9yw0xsipnsa54xj1axvkk55n0yxq9yv9ih3rb0"; - system = "check-bnf"; - asd = "check-bnf"; - }); - systems = [ "check-bnf" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "matrix-case" pkgs) (getAttr "millet" pkgs) ]; - }; - check-bnf_dot_test = { - pname = "check-bnf.test"; - version = "20220707-git"; - asds = [ "check-bnf.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/check-bnf/2022-07-07/check-bnf-20220707-git.tgz"; - sha256 = "1dpp0xzj51a7fg9yw0xsipnsa54xj1axvkk55n0yxq9yv9ih3rb0"; - system = "check-bnf.test"; - asd = "check-bnf.test"; - }); - systems = [ "check-bnf.test" ]; - lispLibs = [ (getAttr "check-bnf" pkgs) (getAttr "jingoh" pkgs) ]; - }; - check-it = { - pname = "check-it"; - version = "20150709-git"; - asds = [ "check-it" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz"; - sha256 = "1kbjwpniffdpv003igmlz5r0vy65m7wpfnhg54fhwirp1227hgg7"; - system = "check-it"; - asd = "check-it"; - }); - systems = [ "check-it" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "optima" pkgs) ]; - }; - check-it-test = { - pname = "check-it-test"; - version = "20150709-git"; - asds = [ "check-it-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz"; - sha256 = "1kbjwpniffdpv003igmlz5r0vy65m7wpfnhg54fhwirp1227hgg7"; - system = "check-it-test"; - asd = "check-it"; - }); - systems = [ "check-it-test" ]; - lispLibs = [ (getAttr "check-it" pkgs) (getAttr "stefil" pkgs) ]; - }; - checkl = { - pname = "checkl"; - version = "20180328-git"; - asds = [ "checkl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz"; - sha256 = "0bpisihx1gay44xmyr1dmhlwh00j0zzi04rp9fy35i95l2r4xdlx"; - system = "checkl"; - asd = "checkl"; - }); - systems = [ "checkl" ]; - lispLibs = [ (getAttr "marshal" pkgs) ]; - }; - checkl-docs = { - pname = "checkl-docs"; - version = "20180328-git"; - asds = [ "checkl-docs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz"; - sha256 = "0bpisihx1gay44xmyr1dmhlwh00j0zzi04rp9fy35i95l2r4xdlx"; - system = "checkl-docs"; - asd = "checkl-docs"; - }); - systems = [ "checkl-docs" ]; - lispLibs = [ (getAttr "checkl" pkgs) (getAttr "cl-gendoc" pkgs) ]; - }; - checkl-test = { - pname = "checkl-test"; - version = "20180328-git"; - asds = [ "checkl-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/checkl/2018-03-28/checkl-20180328-git.tgz"; - sha256 = "0bpisihx1gay44xmyr1dmhlwh00j0zzi04rp9fy35i95l2r4xdlx"; - system = "checkl-test"; - asd = "checkl-test"; - }); - systems = [ "checkl-test" ]; - lispLibs = [ (getAttr "checkl" pkgs) (getAttr "fiveam" pkgs) ]; - }; - chemical-compounds = { - pname = "chemical-compounds"; - version = "1.0.2"; - asds = [ "chemical-compounds" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chemical-compounds/2011-10-01/chemical-compounds-1.0.2.tgz"; - sha256 = "047z1lab08y4nsb32rnzqfpb6akyhibzjgmmr1bnwrh9pmhv3s2k"; - system = "chemical-compounds"; - asd = "chemical-compounds"; - }); - systems = [ "chemical-compounds" ]; - lispLibs = [ (getAttr "periodic-table" pkgs) ]; - }; - chillax = { - pname = "chillax"; - version = "20150302-git"; - asds = [ "chillax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; - sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1"; - system = "chillax"; - asd = "chillax"; - }); - systems = [ "chillax" ]; - lispLibs = [ (getAttr "chillax_dot_core" pkgs) (getAttr "chillax_dot_yason" pkgs) ]; - }; - chillax_dot_core = { - pname = "chillax.core"; - version = "20150302-git"; - asds = [ "chillax.core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; - sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1"; - system = "chillax.core"; - asd = "chillax.core"; - }); - systems = [ "chillax.core" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "drakma" pkgs) (getAttr "flexi-streams" pkgs) ]; - }; - chillax_dot_jsown = { - pname = "chillax.jsown"; - version = "20150302-git"; - asds = [ "chillax.jsown" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; - sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1"; - system = "chillax.jsown"; - asd = "chillax.jsown"; - }); - systems = [ "chillax.jsown" ]; - lispLibs = [ (getAttr "chillax_dot_core" pkgs) (getAttr "jsown" pkgs) ]; - }; - chillax_dot_view-server = { - pname = "chillax.view-server"; - version = "20150302-git"; - asds = [ "chillax.view-server" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; - sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1"; - system = "chillax.view-server"; - asd = "chillax.view-server"; - }); - systems = [ "chillax.view-server" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "yason" pkgs) ]; - }; - chillax_dot_yason = { - pname = "chillax.yason"; - version = "20150302-git"; - asds = [ "chillax.yason" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chillax/2015-03-02/chillax-20150302-git.tgz"; - sha256 = "1is3qm68wyfi3rmpn8mw0x9861951a2w60snsdippikygm3smzr1"; - system = "chillax.yason"; - asd = "chillax.yason"; - }); - systems = [ "chillax.yason" ]; - lispLibs = [ (getAttr "chillax_dot_core" pkgs) (getAttr "yason" pkgs) ]; - }; - chipmunk-blob = { - pname = "chipmunk-blob"; - version = "stable-git"; - asds = [ "chipmunk-blob" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chipmunk-blob/2020-10-16/chipmunk-blob-stable-git.tgz"; - sha256 = "0kdi1al1cn90hzjfnjhkxp3k5ibp6l73k3m04mkpzkzpjy7jc80d"; - system = "chipmunk-blob"; - asd = "chipmunk-blob"; - }); - systems = [ "chipmunk-blob" ]; - lispLibs = [ (getAttr "bodge-blobs-support" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - chipz = { - pname = "chipz"; - version = "20220220-git"; - asds = [ "chipz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chipz/2022-02-20/chipz-20220220-git.tgz"; - sha256 = "1n4f22i9j8iapjd6yx1z348rggcybvg9h794kx9libjgz4bs371h"; - system = "chipz"; - asd = "chipz"; - }); - systems = [ "chipz" ]; - lispLibs = [ ]; - }; - chirp = { - pname = "chirp"; - version = "20211020-git"; - asds = [ "chirp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chirp/2021-10-20/chirp-20211020-git.tgz"; - sha256 = "0j12qbv6jd7rmk8zmb9pk54406hqk9vn9s83v3fy7amq84kghsvz"; - system = "chirp"; - asd = "chirp"; - }); - systems = [ "chirp" ]; - lispLibs = [ (getAttr "chirp-drakma" pkgs) ]; - }; - chirp-core = { - pname = "chirp-core"; - version = "20211020-git"; - asds = [ "chirp-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chirp/2021-10-20/chirp-20211020-git.tgz"; - sha256 = "0j12qbv6jd7rmk8zmb9pk54406hqk9vn9s83v3fy7amq84kghsvz"; - system = "chirp-core"; - asd = "chirp-core"; - }); - systems = [ "chirp-core" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "ironclad" pkgs) (getAttr "local-time" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uuid" pkgs) (getAttr "yason" pkgs) ]; - }; - chirp-dexador = { - pname = "chirp-dexador"; - version = "20211020-git"; - asds = [ "chirp-dexador" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chirp/2021-10-20/chirp-20211020-git.tgz"; - sha256 = "0j12qbv6jd7rmk8zmb9pk54406hqk9vn9s83v3fy7amq84kghsvz"; - system = "chirp-dexador"; - asd = "chirp-dexador"; - }); - systems = [ "chirp-dexador" ]; - lispLibs = [ (getAttr "chirp-core" pkgs) (getAttr "dexador" pkgs) ]; - }; - chirp-drakma = { - pname = "chirp-drakma"; - version = "20211020-git"; - asds = [ "chirp-drakma" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chirp/2021-10-20/chirp-20211020-git.tgz"; - sha256 = "0j12qbv6jd7rmk8zmb9pk54406hqk9vn9s83v3fy7amq84kghsvz"; - system = "chirp-drakma"; - asd = "chirp-drakma"; - }); - systems = [ "chirp-drakma" ]; - lispLibs = [ (getAttr "chirp-core" pkgs) (getAttr "drakma" pkgs) ]; - }; - chrome-native-messaging = { - pname = "chrome-native-messaging"; - version = "20150302-git"; - asds = [ "chrome-native-messaging" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chrome-native-messaging/2015-03-02/chrome-native-messaging-20150302-git.tgz"; - sha256 = "1fw02w5brpwa0kl7sx5b13fbcfv1ny8rwcj11ayj2q528i2xmpx5"; - system = "chrome-native-messaging"; - asd = "chrome-native-messaging"; - }); - systems = [ "chrome-native-messaging" ]; - lispLibs = [ (getAttr "trivial-utf-8" pkgs) ]; - }; - chronicity = { - pname = "chronicity"; - version = "20190202-git"; - asds = [ "chronicity" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chronicity/2019-02-02/chronicity-20190202-git.tgz"; - sha256 = "1h5dlgvccffd8sqszqwilscysklzfcp374zl48rq14ywgv3rnwhl"; - system = "chronicity"; - asd = "chronicity"; - }); - systems = [ "chronicity" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "local-time" pkgs) ]; - }; - chronicity-test = { - pname = "chronicity-test"; - version = "20190202-git"; - asds = [ "chronicity-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chronicity/2019-02-02/chronicity-20190202-git.tgz"; - sha256 = "1h5dlgvccffd8sqszqwilscysklzfcp374zl48rq14ywgv3rnwhl"; - system = "chronicity-test"; - asd = "chronicity-test"; - }); - systems = [ "chronicity-test" ]; - lispLibs = [ (getAttr "chronicity" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - chtml-matcher = { - pname = "chtml-matcher"; - version = "20111001-git"; - asds = [ "chtml-matcher" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chtml-matcher/2011-10-01/chtml-matcher-20111001-git.tgz"; - sha256 = "1q1ksy2w0c4dcmq8543scl11x4crh1m5w29p1wjpqhxk826jx7fd"; - system = "chtml-matcher"; - asd = "chtml-matcher"; - }); - systems = [ "chtml-matcher" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "stdutils" pkgs) (getAttr "closure-html" pkgs) (getAttr "f-underscore" pkgs) ]; - }; - chunga = { - pname = "chunga"; - version = "20221106-git"; - asds = [ "chunga" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/chunga/2022-11-06/chunga-20221106-git.tgz"; - sha256 = "117qvvfszi4s6zfcxi7mpwx14dpgamir7n124p4whwyam04b0y1b"; - system = "chunga"; - asd = "chunga"; - }); - systems = [ "chunga" ]; - lispLibs = [ (getAttr "trivial-gray-streams" pkgs) ]; - }; - ci-utils = { - pname = "ci-utils"; - version = "20221106-git"; - asds = [ "ci-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ci-utils/2022-11-06/ci-utils-20221106-git.tgz"; - sha256 = "0srypwhcfwmy6ppv724y0vhm0icninv2zzb2f8h1985zch73cqw3"; - system = "ci-utils"; - asd = "ci-utils"; - }); - systems = [ "ci-utils" ]; - lispLibs = [ (getAttr "ci-utils-features" pkgs) ]; - }; - ci-utils-features = { - pname = "ci-utils-features"; - version = "20221106-git"; - asds = [ "ci-utils-features" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ci-utils/2022-11-06/ci-utils-20221106-git.tgz"; - sha256 = "0srypwhcfwmy6ppv724y0vhm0icninv2zzb2f8h1985zch73cqw3"; - system = "ci-utils-features"; - asd = "ci-utils-features"; - }); - systems = [ "ci-utils-features" ]; - lispLibs = [ ]; - }; - ci-utils_slash_coveralls = { - pname = "ci-utils_coveralls"; - version = "20221106-git"; - asds = [ "ci-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ci-utils/2022-11-06/ci-utils-20221106-git.tgz"; - sha256 = "0srypwhcfwmy6ppv724y0vhm0icninv2zzb2f8h1985zch73cqw3"; - system = "ci-utils"; - asd = "ci-utils"; - }); - systems = [ "ci-utils/coveralls" ]; - lispLibs = [ (getAttr "ci-utils" pkgs) (getAttr "ci-utils-features" pkgs) (getAttr "split-sequence" pkgs) ]; - meta = { - broken = true; - }; - }; - ci-utils_slash_test = { - pname = "ci-utils_test"; - version = "20221106-git"; - asds = [ "ci-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ci-utils/2022-11-06/ci-utils-20221106-git.tgz"; - sha256 = "0srypwhcfwmy6ppv724y0vhm0icninv2zzb2f8h1985zch73cqw3"; - system = "ci-utils"; - asd = "ci-utils"; - }); - systems = [ "ci-utils/test" ]; - lispLibs = [ (getAttr "ci-utils" pkgs) (getAttr "ci-utils-features" pkgs) (getAttr "fiveam" pkgs) (getAttr "split-sequence" pkgs) ]; - meta = { - broken = true; - }; - }; - circular-streams = { - pname = "circular-streams"; - version = "20161204-git"; - asds = [ "circular-streams" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz"; - sha256 = "1wpw6d5cciyqcf92f7mvihak52pd5s47kk4qq6f0r2z2as68p5rs"; - system = "circular-streams"; - asd = "circular-streams"; - }); - systems = [ "circular-streams" ]; - lispLibs = [ (getAttr "fast-io" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - circular-streams-test = { - pname = "circular-streams-test"; - version = "20161204-git"; - asds = [ "circular-streams-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz"; - sha256 = "1wpw6d5cciyqcf92f7mvihak52pd5s47kk4qq6f0r2z2as68p5rs"; - system = "circular-streams-test"; - asd = "circular-streams-test"; - }); - systems = [ "circular-streams-test" ]; - lispLibs = [ (getAttr "circular-streams" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "cl-test-more" pkgs) ]; - }; - city-hash = { - pname = "city-hash"; - version = "20200925-git"; - asds = [ "city-hash" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/city-hash/2020-09-25/city-hash-20200925-git.tgz"; - sha256 = "10ksl402aa37sn78hnvlvpqibr66qzpjvf2x4a789gnl411cf44a"; - system = "city-hash"; - asd = "city-hash"; - }); - systems = [ "city-hash" ]; - lispLibs = [ (getAttr "com_dot_google_dot_base" pkgs) (getAttr "nibbles" pkgs) (getAttr "swap-bytes" pkgs) ]; - }; - city-hash-test = { - pname = "city-hash-test"; - version = "20200925-git"; - asds = [ "city-hash-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/city-hash/2020-09-25/city-hash-20200925-git.tgz"; - sha256 = "10ksl402aa37sn78hnvlvpqibr66qzpjvf2x4a789gnl411cf44a"; - system = "city-hash-test"; - asd = "city-hash-test"; - }); - systems = [ "city-hash-test" ]; - lispLibs = [ (getAttr "city-hash" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - }; - ckr-tables = { - pname = "ckr-tables"; - version = "20221106-git"; - asds = [ "ckr-tables" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-critic/2022-11-06/lisp-critic-20221106-git.tgz"; - sha256 = "000vp8jsvpw80by7c7nb5394akfcr6rzzpzw049am67fh5qk89rn"; - system = "ckr-tables"; - asd = "ckr-tables"; - }); - systems = [ "ckr-tables" ]; - lispLibs = [ ]; - }; - cl_plus_ssl = { - pname = "cl+ssl"; - version = "20221106-git"; - asds = [ "cl+ssl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl+ssl/2022-11-06/cl+ssl-20221106-git.tgz"; - sha256 = "19v19mkkwnbd73aim7az8ciahz7x39k6l3f2acxnpps35kqx2ipq"; - system = "cl+ssl"; - asd = "cl+ssl"; - }); - systems = [ "cl+ssl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "uiop" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl_plus_ssl_dot_test = { - pname = "cl+ssl.test"; - version = "20221106-git"; - asds = [ "cl+ssl.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl+ssl/2022-11-06/cl+ssl-20221106-git.tgz"; - sha256 = "19v19mkkwnbd73aim7az8ciahz7x39k6l3f2acxnpps35kqx2ipq"; - system = "cl+ssl.test"; - asd = "cl+ssl.test"; - }); - systems = [ "cl+ssl.test" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-coveralls" pkgs) (getAttr "fiveam" pkgs) (getAttr "trivial-sockets" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl_plus_ssl_slash_config = { - pname = "cl+ssl_config"; - version = "20221106-git"; - asds = [ "cl+ssl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl+ssl/2022-11-06/cl+ssl-20221106-git.tgz"; - sha256 = "19v19mkkwnbd73aim7az8ciahz7x39k6l3f2acxnpps35kqx2ipq"; - system = "cl+ssl"; - asd = "cl+ssl"; - }); - systems = [ "cl+ssl/config" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-6502 = { - pname = "cl-6502"; - version = "20211020-git"; - asds = [ "cl-6502" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-6502/2021-10-20/cl-6502-20211020-git.tgz"; - sha256 = "1mzdx141ad1rf0di09glyibxbizbmhzd9l3cqd7r3cvrvf5gkj49"; - system = "cl-6502"; - asd = "cl-6502"; - }); - systems = [ "cl-6502" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - cl-aa = { - pname = "cl-aa"; - version = "20180228-git"; - asds = [ "cl-aa" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0nckw4zb6s96hll8hrxzvgs2an3bfm0pxcywshbm4bq4rn7niqg4"; - system = "cl-aa"; - asd = "cl-aa"; - }); - systems = [ "cl-aa" ]; - lispLibs = [ ]; - }; - cl-aa-misc = { - pname = "cl-aa-misc"; - version = "20180228-git"; - asds = [ "cl-aa-misc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0nckw4zb6s96hll8hrxzvgs2an3bfm0pxcywshbm4bq4rn7niqg4"; - system = "cl-aa-misc"; - asd = "cl-aa-misc"; - }); - systems = [ "cl-aa-misc" ]; - lispLibs = [ ]; - }; - cl-acronyms = { - pname = "cl-acronyms"; - version = "20150302-git"; - asds = [ "cl-acronyms" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-acronyms/2015-03-02/cl-acronyms-20150302-git.tgz"; - sha256 = "1b827g6n87i81wbqzvmlq0yn41kfa502v5ssbh2wh1b4xznhn8cc"; - system = "cl-acronyms"; - asd = "cl-acronyms"; - }); - systems = [ "cl-acronyms" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-actors = { - pname = "cl-actors"; - version = "20191130-git"; - asds = [ "cl-actors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-lisp-actors/2019-11-30/common-lisp-actors-20191130-git.tgz"; - sha256 = "0snf91yivxq6jcbvm3l6b05lcka7jrzciqd4m841amghfw32clfn"; - system = "cl-actors"; - asd = "cl-actors"; - }); - systems = [ "cl-actors" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - cl-advice = { - pname = "cl-advice"; - version = "20220707-git"; - asds = [ "cl-advice" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-advice/2022-07-07/cl-advice-20220707-git.tgz"; - sha256 = "1cxfdzlgh5vflc8yb9nv5diz6mg7xsc75897qdv9i562773khzaw"; - system = "cl-advice"; - asd = "cl-advice"; - }); - systems = [ "cl-advice" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - cl-advice-tests = { - pname = "cl-advice-tests"; - version = "20220707-git"; - asds = [ "cl-advice-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-advice/2022-07-07/cl-advice-20220707-git.tgz"; - sha256 = "1cxfdzlgh5vflc8yb9nv5diz6mg7xsc75897qdv9i562773khzaw"; - system = "cl-advice-tests"; - asd = "cl-advice-tests"; - }); - systems = [ "cl-advice-tests" ]; - lispLibs = [ (getAttr "cl-advice" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-alc = { - pname = "cl-alc"; - version = "20221106-git"; - asds = [ "cl-alc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz"; - sha256 = "0jmp81mf23ckcm4knnh0q7zpmyls5220imaqbmnl0xvvra10b1zy"; - system = "cl-alc"; - asd = "cl-alc"; - }); - systems = [ "cl-alc" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-openal" pkgs) ]; - }; - cl-algebraic-data-type = { - pname = "cl-algebraic-data-type"; - version = "20191007-git"; - asds = [ "cl-algebraic-data-type" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-algebraic-data-type/2019-10-07/cl-algebraic-data-type-20191007-git.tgz"; - sha256 = "1lnqxcv8pd5z8n0g5p2l0dbljx9pqiv18hxl0vhsh7ldhkrjv2jx"; - system = "cl-algebraic-data-type"; - asd = "cl-algebraic-data-type"; - }); - systems = [ "cl-algebraic-data-type" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "global-vars" pkgs) ]; - }; - cl-all = { - pname = "cl-all"; - version = "20221106-git"; - asds = [ "cl-all" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-all/2022-11-06/cl-all-20221106-git.tgz"; - sha256 = "0rvl5zhza5fz91spk308glsnh50waz0iri8brl1ij74bb30rwlgc"; - system = "cl-all"; - asd = "cl-all"; - }); - systems = [ "cl-all" ]; - lispLibs = [ ]; - }; - cl-alut = { - pname = "cl-alut"; - version = "20221106-git"; - asds = [ "cl-alut" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz"; - sha256 = "0jmp81mf23ckcm4knnh0q7zpmyls5220imaqbmnl0xvvra10b1zy"; - system = "cl-alut"; - asd = "cl-alut"; - }); - systems = [ "cl-alut" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-openal" pkgs) ]; - }; - cl-amqp = { - pname = "cl-amqp"; - version = "v0.4.1"; - asds = [ "cl-amqp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-amqp/2019-10-08/cl-amqp-v0.4.1.tgz"; - sha256 = "1ggd77ckfr54z7z5yi8d04k310x2dhf53qija8dzjhk1r9py20vz"; - system = "cl-amqp"; - asd = "cl-amqp"; - }); - systems = [ "cl-amqp" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "collectors" pkgs) (getAttr "fast-io" pkgs) (getAttr "local-time" pkgs) (getAttr "log4cl" pkgs) (getAttr "nibbles" pkgs) (getAttr "trivial-utf-8" pkgs) (getAttr "wu-decimal" pkgs) ]; - }; - cl-amqp_dot_test = { - pname = "cl-amqp.test"; - version = "v0.4.1"; - asds = [ "cl-amqp.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-amqp/2019-10-08/cl-amqp-v0.4.1.tgz"; - sha256 = "1ggd77ckfr54z7z5yi8d04k310x2dhf53qija8dzjhk1r9py20vz"; - system = "cl-amqp.test"; - asd = "cl-amqp.test"; - }); - systems = [ "cl-amqp.test" ]; - lispLibs = [ (getAttr "cl-amqp" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "log4cl" pkgs) (getAttr "mw-equiv" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-ana = { - pname = "cl-ana"; - version = "20220707-git"; - asds = [ "cl-ana" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana"; - asd = "cl-ana"; - }); - systems = [ "cl-ana" ]; - lispLibs = [ (getAttr "cl-ana_dot_array-utils" pkgs) (getAttr "cl-ana_dot_binary-tree" pkgs) (getAttr "cl-ana_dot_calculus" pkgs) (getAttr "cl-ana_dot_clos-utils" pkgs) (getAttr "cl-ana_dot_columnar-table" pkgs) (getAttr "cl-ana_dot_csv-table" pkgs) (getAttr "cl-ana_dot_error-propogation" pkgs) (getAttr "cl-ana_dot_file-utils" pkgs) (getAttr "cl-ana_dot_fitting" pkgs) (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_hash-table-utils" pkgs) (getAttr "cl-ana_dot_hdf-table" pkgs) (getAttr "cl-ana_dot_histogram" pkgs) (getAttr "cl-ana_dot_int-char" pkgs) (getAttr "cl-ana_dot_linear-algebra" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_lorentz" pkgs) (getAttr "cl-ana_dot_makeres" pkgs) (getAttr "cl-ana_dot_makeres-block" pkgs) (getAttr "cl-ana_dot_makeres-branch" pkgs) (getAttr "cl-ana_dot_makeres-graphviz" pkgs) (getAttr "cl-ana_dot_makeres-macro" pkgs) (getAttr "cl-ana_dot_makeres-progress" pkgs) (getAttr "cl-ana_dot_makeres-table" pkgs) (getAttr "cl-ana_dot_makeres-utils" pkgs) (getAttr "cl-ana_dot_map" pkgs) (getAttr "cl-ana_dot_math-functions" pkgs) (getAttr "cl-ana_dot_ntuple-table" pkgs) (getAttr "cl-ana_dot_package-utils" pkgs) (getAttr "cl-ana_dot_pathname-utils" pkgs) (getAttr "cl-ana_dot_plotting" pkgs) (getAttr "cl-ana_dot_quantity" pkgs) (getAttr "cl-ana_dot_reusable-table" pkgs) (getAttr "cl-ana_dot_serialization" pkgs) (getAttr "cl-ana_dot_spline" pkgs) (getAttr "cl-ana_dot_statistical-learning" pkgs) (getAttr "cl-ana_dot_statistics" pkgs) (getAttr "cl-ana_dot_table" pkgs) (getAttr "cl-ana_dot_table-utils" pkgs) (getAttr "cl-ana_dot_table-viewing" pkgs) (getAttr "cl-ana_dot_tensor" pkgs) ]; - }; - cl-ana_dot_array-utils = { - pname = "cl-ana.array-utils"; - version = "20220707-git"; - asds = [ "cl-ana.array-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.array-utils"; - asd = "cl-ana.array-utils"; - }); - systems = [ "cl-ana.array-utils" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-ana_dot_binary-tree = { - pname = "cl-ana.binary-tree"; - version = "20220707-git"; - asds = [ "cl-ana.binary-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.binary-tree"; - asd = "cl-ana.binary-tree"; - }); - systems = [ "cl-ana.binary-tree" ]; - lispLibs = [ (getAttr "cl-ana_dot_functional-utils" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) ]; - }; - cl-ana_dot_calculus = { - pname = "cl-ana.calculus"; - version = "20220707-git"; - asds = [ "cl-ana.calculus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.calculus"; - asd = "cl-ana.calculus"; - }); - systems = [ "cl-ana.calculus" ]; - lispLibs = [ (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_linear-algebra" pkgs) ]; - }; - cl-ana_dot_clos-utils = { - pname = "cl-ana.clos-utils"; - version = "20220707-git"; - asds = [ "cl-ana.clos-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.clos-utils"; - asd = "cl-ana.clos-utils"; - }); - systems = [ "cl-ana.clos-utils" ]; - lispLibs = [ (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_symbol-utils" pkgs) (getAttr "cl-ana_dot_tensor" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - cl-ana_dot_columnar-table = { - pname = "cl-ana.columnar-table"; - version = "20220707-git"; - asds = [ "cl-ana.columnar-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.columnar-table"; - asd = "cl-ana.columnar-table"; - }); - systems = [ "cl-ana.columnar-table" ]; - lispLibs = [ (getAttr "cl-ana_dot_reusable-table" pkgs) (getAttr "cl-ana_dot_table" pkgs) ]; - }; - cl-ana_dot_csv-table = { - pname = "cl-ana.csv-table"; - version = "20220707-git"; - asds = [ "cl-ana.csv-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.csv-table"; - asd = "cl-ana.csv-table"; - }); - systems = [ "cl-ana.csv-table" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "antik" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_table" pkgs) (getAttr "cl-csv" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-ana_dot_error-propogation = { - pname = "cl-ana.error-propogation"; - version = "20220707-git"; - asds = [ "cl-ana.error-propogation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.error-propogation"; - asd = "cl-ana.error-propogation"; - }); - systems = [ "cl-ana.error-propogation" ]; - lispLibs = [ (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_math-functions" pkgs) ]; - }; - cl-ana_dot_file-utils = { - pname = "cl-ana.file-utils"; - version = "20220707-git"; - asds = [ "cl-ana.file-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.file-utils"; - asd = "cl-ana.file-utils"; - }); - systems = [ "cl-ana.file-utils" ]; - lispLibs = [ (getAttr "external-program" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-ana_dot_fitting = { - pname = "cl-ana.fitting"; - version = "20220707-git"; - asds = [ "cl-ana.fitting" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.fitting"; - asd = "cl-ana.fitting"; - }); - systems = [ "cl-ana.fitting" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_error-propogation" pkgs) (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_map" pkgs) (getAttr "cl-ana_dot_math-functions" pkgs) (getAttr "gsll" pkgs) ]; - }; - cl-ana_dot_functional-utils = { - pname = "cl-ana.functional-utils"; - version = "20220707-git"; - asds = [ "cl-ana.functional-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.functional-utils"; - asd = "cl-ana.functional-utils"; - }); - systems = [ "cl-ana.functional-utils" ]; - lispLibs = [ ]; - }; - cl-ana_dot_generic-math = { - pname = "cl-ana.generic-math"; - version = "20220707-git"; - asds = [ "cl-ana.generic-math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.generic-math"; - asd = "cl-ana.generic-math"; - }); - systems = [ "cl-ana.generic-math" ]; - lispLibs = [ (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_package-utils" pkgs) ]; - }; - cl-ana_dot_gnuplot-interface = { - pname = "cl-ana.gnuplot-interface"; - version = "20220707-git"; - asds = [ "cl-ana.gnuplot-interface" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.gnuplot-interface"; - asd = "cl-ana.gnuplot-interface"; - }); - systems = [ "cl-ana.gnuplot-interface" ]; - lispLibs = [ (getAttr "external-program" pkgs) ]; - }; - cl-ana_dot_gsl-cffi = { - pname = "cl-ana.gsl-cffi"; - version = "20220707-git"; - asds = [ "cl-ana.gsl-cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.gsl-cffi"; - asd = "cl-ana.gsl-cffi"; - }); - systems = [ "cl-ana.gsl-cffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-ana_dot_hash-table-utils = { - pname = "cl-ana.hash-table-utils"; - version = "20220707-git"; - asds = [ "cl-ana.hash-table-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.hash-table-utils"; - asd = "cl-ana.hash-table-utils"; - }); - systems = [ "cl-ana.hash-table-utils" ]; - lispLibs = [ ]; - }; - cl-ana_dot_hdf-cffi = { - pname = "cl-ana.hdf-cffi"; - version = "20220707-git"; - asds = [ "cl-ana.hdf-cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.hdf-cffi"; - asd = "cl-ana.hdf-cffi"; - }); - systems = [ "cl-ana.hdf-cffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - cl-ana_dot_hdf-table = { - pname = "cl-ana.hdf-table"; - version = "20220707-git"; - asds = [ "cl-ana.hdf-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.hdf-table"; - asd = "cl-ana.hdf-table"; - }); - systems = [ "cl-ana.hdf-table" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_binary-tree" pkgs) (getAttr "cl-ana_dot_hdf-typespec" pkgs) (getAttr "cl-ana_dot_hdf-utils" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_memoization" pkgs) (getAttr "cl-ana_dot_table" pkgs) (getAttr "cl-ana_dot_typed-table" pkgs) (getAttr "cl-ana_dot_typespec" pkgs) ]; - }; - cl-ana_dot_hdf-typespec = { - pname = "cl-ana.hdf-typespec"; - version = "20220707-git"; - asds = [ "cl-ana.hdf-typespec" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.hdf-typespec"; - asd = "cl-ana.hdf-typespec"; - }); - systems = [ "cl-ana.hdf-typespec" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ana_dot_hdf-cffi" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_memoization" pkgs) (getAttr "cl-ana_dot_string-utils" pkgs) (getAttr "cl-ana_dot_symbol-utils" pkgs) (getAttr "cl-ana_dot_typespec" pkgs) ]; - }; - cl-ana_dot_hdf-utils = { - pname = "cl-ana.hdf-utils"; - version = "20220707-git"; - asds = [ "cl-ana.hdf-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.hdf-utils"; - asd = "cl-ana.hdf-utils"; - }); - systems = [ "cl-ana.hdf-utils" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ana_dot_hdf-cffi" pkgs) (getAttr "cl-ana_dot_hdf-typespec" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_memoization" pkgs) (getAttr "cl-ana_dot_pathname-utils" pkgs) (getAttr "cl-ana_dot_string-utils" pkgs) (getAttr "cl-ana_dot_typespec" pkgs) ]; - }; - cl-ana_dot_histogram = { - pname = "cl-ana.histogram"; - version = "20220707-git"; - asds = [ "cl-ana.histogram" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.histogram"; - asd = "cl-ana.histogram"; - }); - systems = [ "cl-ana.histogram" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_binary-tree" pkgs) (getAttr "cl-ana_dot_clos-utils" pkgs) (getAttr "cl-ana_dot_fitting" pkgs) (getAttr "cl-ana_dot_functional-utils" pkgs) (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_hash-table-utils" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_map" pkgs) (getAttr "cl-ana_dot_symbol-utils" pkgs) (getAttr "cl-ana_dot_tensor" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-ana_dot_int-char = { - pname = "cl-ana.int-char"; - version = "20220707-git"; - asds = [ "cl-ana.int-char" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.int-char"; - asd = "cl-ana.int-char"; - }); - systems = [ "cl-ana.int-char" ]; - lispLibs = [ ]; - }; - cl-ana_dot_linear-algebra = { - pname = "cl-ana.linear-algebra"; - version = "20220707-git"; - asds = [ "cl-ana.linear-algebra" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.linear-algebra"; - asd = "cl-ana.linear-algebra"; - }); - systems = [ "cl-ana.linear-algebra" ]; - lispLibs = [ (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_math-functions" pkgs) (getAttr "cl-ana_dot_tensor" pkgs) (getAttr "gsll" pkgs) ]; - }; - cl-ana_dot_list-utils = { - pname = "cl-ana.list-utils"; - version = "20220707-git"; - asds = [ "cl-ana.list-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.list-utils"; - asd = "cl-ana.list-utils"; - }); - systems = [ "cl-ana.list-utils" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_functional-utils" pkgs) (getAttr "cl-ana_dot_string-utils" pkgs) ]; - }; - cl-ana_dot_lorentz = { - pname = "cl-ana.lorentz"; - version = "20220707-git"; - asds = [ "cl-ana.lorentz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.lorentz"; - asd = "cl-ana.lorentz"; - }); - systems = [ "cl-ana.lorentz" ]; - lispLibs = [ (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_linear-algebra" pkgs) (getAttr "cl-ana_dot_tensor" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-ana_dot_macro-utils = { - pname = "cl-ana.macro-utils"; - version = "20220707-git"; - asds = [ "cl-ana.macro-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.macro-utils"; - asd = "cl-ana.macro-utils"; - }); - systems = [ "cl-ana.macro-utils" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_string-utils" pkgs) (getAttr "cl-ana_dot_symbol-utils" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-ana_dot_makeres = { - pname = "cl-ana.makeres"; - version = "20220707-git"; - asds = [ "cl-ana.makeres" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.makeres"; - asd = "cl-ana.makeres"; - }); - systems = [ "cl-ana.makeres" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_error-propogation" pkgs) (getAttr "cl-ana_dot_file-utils" pkgs) (getAttr "cl-ana_dot_functional-utils" pkgs) (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_hash-table-utils" pkgs) (getAttr "cl-ana_dot_hdf-utils" pkgs) (getAttr "cl-ana_dot_histogram" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_map" pkgs) (getAttr "cl-ana_dot_memoization" pkgs) (getAttr "cl-ana_dot_pathname-utils" pkgs) (getAttr "cl-ana_dot_plotting" pkgs) (getAttr "cl-ana_dot_reusable-table" pkgs) (getAttr "cl-ana_dot_serialization" pkgs) (getAttr "cl-ana_dot_string-utils" pkgs) (getAttr "cl-ana_dot_symbol-utils" pkgs) (getAttr "cl-ana_dot_table" pkgs) (getAttr "cl-fad" pkgs) (getAttr "external-program" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-ana_dot_makeres-block = { - pname = "cl-ana.makeres-block"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-block" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.makeres-block"; - asd = "cl-ana.makeres-block"; - }); - systems = [ "cl-ana.makeres-block" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_makeres" pkgs) ]; - }; - cl-ana_dot_makeres-branch = { - pname = "cl-ana.makeres-branch"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-branch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.makeres-branch"; - asd = "cl-ana.makeres-branch"; - }); - systems = [ "cl-ana.makeres-branch" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_hash-table-utils" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_makeres" pkgs) (getAttr "cl-ana_dot_map" pkgs) ]; - }; - cl-ana_dot_makeres-graphviz = { - pname = "cl-ana.makeres-graphviz"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-graphviz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.makeres-graphviz"; - asd = "cl-ana.makeres-graphviz"; - }); - systems = [ "cl-ana.makeres-graphviz" ]; - lispLibs = [ (getAttr "cl-ana_dot_makeres" pkgs) (getAttr "external-program" pkgs) ]; - }; - cl-ana_dot_makeres-macro = { - pname = "cl-ana.makeres-macro"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-macro" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.makeres-macro"; - asd = "cl-ana.makeres-macro"; - }); - systems = [ "cl-ana.makeres-macro" ]; - lispLibs = [ (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_makeres" pkgs) ]; - }; - cl-ana_dot_makeres-progress = { - pname = "cl-ana.makeres-progress"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-progress" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.makeres-progress"; - asd = "cl-ana.makeres-progress"; - }); - systems = [ "cl-ana.makeres-progress" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_makeres" pkgs) ]; - }; - cl-ana_dot_makeres-table = { - pname = "cl-ana.makeres-table"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.makeres-table"; - asd = "cl-ana.makeres-table"; - }); - systems = [ "cl-ana.makeres-table" ]; - lispLibs = [ (getAttr "cl-ana_dot_csv-table" pkgs) (getAttr "cl-ana_dot_hash-table-utils" pkgs) (getAttr "cl-ana_dot_hdf-table" pkgs) (getAttr "cl-ana_dot_hdf-utils" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_makeres" pkgs) (getAttr "cl-ana_dot_makeres-macro" pkgs) (getAttr "cl-ana_dot_memoization" pkgs) (getAttr "cl-ana_dot_ntuple-table" pkgs) (getAttr "cl-ana_dot_reusable-table" pkgs) (getAttr "cl-ana_dot_string-utils" pkgs) (getAttr "cl-ana_dot_table" pkgs) ]; - }; - cl-ana_dot_makeres-utils = { - pname = "cl-ana.makeres-utils"; - version = "20220707-git"; - asds = [ "cl-ana.makeres-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.makeres-utils"; - asd = "cl-ana.makeres-utils"; - }); - systems = [ "cl-ana.makeres-utils" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_file-utils" pkgs) (getAttr "cl-ana_dot_fitting" pkgs) (getAttr "cl-ana_dot_functional-utils" pkgs) (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_histogram" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_makeres" pkgs) (getAttr "cl-ana_dot_map" pkgs) (getAttr "cl-ana_dot_pathname-utils" pkgs) (getAttr "cl-ana_dot_plotting" pkgs) (getAttr "cl-ana_dot_reusable-table" pkgs) (getAttr "cl-ana_dot_string-utils" pkgs) (getAttr "cl-ana_dot_symbol-utils" pkgs) (getAttr "cl-ana_dot_table" pkgs) ]; - }; - cl-ana_dot_map = { - pname = "cl-ana.map"; - version = "20220707-git"; - asds = [ "cl-ana.map" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.map"; - asd = "cl-ana.map"; - }); - systems = [ "cl-ana.map" ]; - lispLibs = [ (getAttr "cl-ana_dot_hash-table-utils" pkgs) ]; - }; - cl-ana_dot_math-functions = { - pname = "cl-ana.math-functions"; - version = "20220707-git"; - asds = [ "cl-ana.math-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.math-functions"; - asd = "cl-ana.math-functions"; - }); - systems = [ "cl-ana.math-functions" ]; - lispLibs = [ (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "gsll" pkgs) ]; - }; - cl-ana_dot_memoization = { - pname = "cl-ana.memoization"; - version = "20220707-git"; - asds = [ "cl-ana.memoization" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.memoization"; - asd = "cl-ana.memoization"; - }); - systems = [ "cl-ana.memoization" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-ana_dot_ntuple-table = { - pname = "cl-ana.ntuple-table"; - version = "20220707-git"; - asds = [ "cl-ana.ntuple-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.ntuple-table"; - asd = "cl-ana.ntuple-table"; - }); - systems = [ "cl-ana.ntuple-table" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ana_dot_gsl-cffi" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_table" pkgs) (getAttr "cl-ana_dot_typed-table" pkgs) (getAttr "cl-ana_dot_typespec" pkgs) (getAttr "gsll" pkgs) ]; - }; - cl-ana_dot_package-utils = { - pname = "cl-ana.package-utils"; - version = "20220707-git"; - asds = [ "cl-ana.package-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.package-utils"; - asd = "cl-ana.package-utils"; - }); - systems = [ "cl-ana.package-utils" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-ana_dot_pathname-utils = { - pname = "cl-ana.pathname-utils"; - version = "20220707-git"; - asds = [ "cl-ana.pathname-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.pathname-utils"; - asd = "cl-ana.pathname-utils"; - }); - systems = [ "cl-ana.pathname-utils" ]; - lispLibs = [ ]; - }; - cl-ana_dot_plotting = { - pname = "cl-ana.plotting"; - version = "20220707-git"; - asds = [ "cl-ana.plotting" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.plotting"; - asd = "cl-ana.plotting"; - }); - systems = [ "cl-ana.plotting" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_error-propogation" pkgs) (getAttr "cl-ana_dot_functional-utils" pkgs) (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_gnuplot-interface" pkgs) (getAttr "cl-ana_dot_histogram" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_map" pkgs) (getAttr "cl-ana_dot_math-functions" pkgs) (getAttr "cl-ana_dot_pathname-utils" pkgs) (getAttr "cl-ana_dot_string-utils" pkgs) (getAttr "cl-ana_dot_tensor" pkgs) (getAttr "external-program" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-ana_dot_quantity = { - pname = "cl-ana.quantity"; - version = "20220707-git"; - asds = [ "cl-ana.quantity" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.quantity"; - asd = "cl-ana.quantity"; - }); - systems = [ "cl-ana.quantity" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_error-propogation" pkgs) (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_math-functions" pkgs) (getAttr "cl-ana_dot_symbol-utils" pkgs) ]; - }; - cl-ana_dot_reusable-table = { - pname = "cl-ana.reusable-table"; - version = "20220707-git"; - asds = [ "cl-ana.reusable-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.reusable-table"; - asd = "cl-ana.reusable-table"; - }); - systems = [ "cl-ana.reusable-table" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_table" pkgs) ]; - }; - cl-ana_dot_serialization = { - pname = "cl-ana.serialization"; - version = "20220707-git"; - asds = [ "cl-ana.serialization" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.serialization"; - asd = "cl-ana.serialization"; - }); - systems = [ "cl-ana.serialization" ]; - lispLibs = [ (getAttr "cl-ana_dot_error-propogation" pkgs) (getAttr "cl-ana_dot_hdf-table" pkgs) (getAttr "cl-ana_dot_hdf-utils" pkgs) (getAttr "cl-ana_dot_histogram" pkgs) (getAttr "cl-ana_dot_int-char" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_typespec" pkgs) ]; - }; - cl-ana_dot_spline = { - pname = "cl-ana.spline"; - version = "20220707-git"; - asds = [ "cl-ana.spline" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.spline"; - asd = "cl-ana.spline"; - }); - systems = [ "cl-ana.spline" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-ana_dot_fitting" pkgs) (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_math-functions" pkgs) (getAttr "cl-ana_dot_tensor" pkgs) (getAttr "gsll" pkgs) ]; - }; - cl-ana_dot_statistical-learning = { - pname = "cl-ana.statistical-learning"; - version = "20220707-git"; - asds = [ "cl-ana.statistical-learning" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.statistical-learning"; - asd = "cl-ana.statistical-learning"; - }); - systems = [ "cl-ana.statistical-learning" ]; - lispLibs = [ (getAttr "cl-ana_dot_functional-utils" pkgs) (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_histogram" pkgs) (getAttr "cl-ana_dot_linear-algebra" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_map" pkgs) (getAttr "cl-ana_dot_math-functions" pkgs) (getAttr "cl-ana_dot_statistics" pkgs) ]; - }; - cl-ana_dot_statistics = { - pname = "cl-ana.statistics"; - version = "20220707-git"; - asds = [ "cl-ana.statistics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.statistics"; - asd = "cl-ana.statistics"; - }); - systems = [ "cl-ana.statistics" ]; - lispLibs = [ (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_histogram" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_map" pkgs) (getAttr "cl-ana_dot_math-functions" pkgs) ]; - }; - cl-ana_dot_string-utils = { - pname = "cl-ana.string-utils"; - version = "20220707-git"; - asds = [ "cl-ana.string-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.string-utils"; - asd = "cl-ana.string-utils"; - }); - systems = [ "cl-ana.string-utils" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) ]; - }; - cl-ana_dot_symbol-utils = { - pname = "cl-ana.symbol-utils"; - version = "20220707-git"; - asds = [ "cl-ana.symbol-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.symbol-utils"; - asd = "cl-ana.symbol-utils"; - }); - systems = [ "cl-ana.symbol-utils" ]; - lispLibs = [ (getAttr "cl-ana_dot_list-utils" pkgs) ]; - }; - cl-ana_dot_table = { - pname = "cl-ana.table"; - version = "20220707-git"; - asds = [ "cl-ana.table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.table"; - asd = "cl-ana.table"; - }); - systems = [ "cl-ana.table" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_functional-utils" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_string-utils" pkgs) (getAttr "cl-ana_dot_symbol-utils" pkgs) ]; - }; - cl-ana_dot_table-utils = { - pname = "cl-ana.table-utils"; - version = "20220707-git"; - asds = [ "cl-ana.table-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.table-utils"; - asd = "cl-ana.table-utils"; - }); - systems = [ "cl-ana.table-utils" ]; - lispLibs = [ (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_hash-table-utils" pkgs) (getAttr "cl-ana_dot_statistics" pkgs) (getAttr "cl-ana_dot_string-utils" pkgs) (getAttr "cl-ana_dot_symbol-utils" pkgs) (getAttr "cl-ana_dot_table" pkgs) ]; - }; - cl-ana_dot_table-viewing = { - pname = "cl-ana.table-viewing"; - version = "20220707-git"; - asds = [ "cl-ana.table-viewing" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.table-viewing"; - asd = "cl-ana.table-viewing"; - }); - systems = [ "cl-ana.table-viewing" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_histogram" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_plotting" pkgs) (getAttr "cl-ana_dot_string-utils" pkgs) (getAttr "cl-ana_dot_table" pkgs) ]; - }; - cl-ana_dot_tensor = { - pname = "cl-ana.tensor"; - version = "20220707-git"; - asds = [ "cl-ana.tensor" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.tensor"; - asd = "cl-ana.tensor"; - }); - systems = [ "cl-ana.tensor" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_generic-math" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_macro-utils" pkgs) (getAttr "cl-ana_dot_symbol-utils" pkgs) ]; - }; - cl-ana_dot_typed-table = { - pname = "cl-ana.typed-table"; - version = "20220707-git"; - asds = [ "cl-ana.typed-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.typed-table"; - asd = "cl-ana.typed-table"; - }); - systems = [ "cl-ana.typed-table" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_string-utils" pkgs) (getAttr "cl-ana_dot_symbol-utils" pkgs) (getAttr "cl-ana_dot_table" pkgs) (getAttr "cl-ana_dot_typespec" pkgs) ]; - }; - cl-ana_dot_typespec = { - pname = "cl-ana.typespec"; - version = "20220707-git"; - asds = [ "cl-ana.typespec" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ana/2022-07-07/cl-ana-20220707-git.tgz"; - sha256 = "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"; - system = "cl-ana.typespec"; - asd = "cl-ana.typespec"; - }); - systems = [ "cl-ana.typespec" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ana_dot_int-char" pkgs) (getAttr "cl-ana_dot_list-utils" pkgs) (getAttr "cl-ana_dot_memoization" pkgs) (getAttr "cl-ana_dot_string-utils" pkgs) (getAttr "cl-ana_dot_symbol-utils" pkgs) (getAttr "cl-ana_dot_tensor" pkgs) ]; - }; - cl-android = { - pname = "cl-android"; - version = "20150804-git"; - asds = [ "cl-android" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sl4a/2015-08-04/cl-sl4a-20150804-git.tgz"; - sha256 = "0lqla60apkc8xfiyi43w18dldf0m8z5q290wv3d89qf0n9gwk3cr"; - system = "cl-android"; - asd = "cl-android"; - }); - systems = [ "cl-android" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-annot = { - pname = "cl-annot"; - version = "20150608-git"; - asds = [ "cl-annot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz"; - sha256 = "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n"; - system = "cl-annot"; - asd = "cl-annot"; - }); - systems = [ "cl-annot" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-annot-prove = { - pname = "cl-annot-prove"; - version = "20150923-git"; - asds = [ "cl-annot-prove" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-annot-prove/2015-09-23/cl-annot-prove-20150923-git.tgz"; - sha256 = "000nlxxs1id1pccp3y5s9xnm76fc5r87q0bxmjrpklxwwf5y8wwy"; - system = "cl-annot-prove"; - asd = "cl-annot-prove"; - }); - systems = [ "cl-annot-prove" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-syntax" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "prove" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - cl-annot-prove-test = { - pname = "cl-annot-prove-test"; - version = "20150923-git"; - asds = [ "cl-annot-prove-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-annot-prove/2015-09-23/cl-annot-prove-20150923-git.tgz"; - sha256 = "000nlxxs1id1pccp3y5s9xnm76fc5r87q0bxmjrpklxwwf5y8wwy"; - system = "cl-annot-prove-test"; - asd = "cl-annot-prove-test"; - }); - systems = [ "cl-annot-prove-test" ]; - lispLibs = [ (getAttr "cl-annot-prove" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-annot-revisit = { - pname = "cl-annot-revisit"; - version = "20221106-git"; - asds = [ "cl-annot-revisit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz"; - sha256 = "0jlllgq14bi1rddzlmq9wfs4vb24apgqz17wfd79kjjcmnzzjp4m"; - system = "cl-annot-revisit"; - asd = "cl-annot-revisit"; - }); - systems = [ "cl-annot-revisit" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - cl-annot-revisit-compat = { - pname = "cl-annot-revisit-compat"; - version = "20221106-git"; - asds = [ "cl-annot-revisit-compat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz"; - sha256 = "0jlllgq14bi1rddzlmq9wfs4vb24apgqz17wfd79kjjcmnzzjp4m"; - system = "cl-annot-revisit-compat"; - asd = "cl-annot-revisit-compat"; - }); - systems = [ "cl-annot-revisit-compat" ]; - lispLibs = [ (getAttr "cl-annot-revisit" pkgs) ]; - }; - cl-annot-revisit-test = { - pname = "cl-annot-revisit-test"; - version = "20221106-git"; - asds = [ "cl-annot-revisit-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-annot-revisit/2022-11-06/cl-annot-revisit-20221106-git.tgz"; - sha256 = "0jlllgq14bi1rddzlmq9wfs4vb24apgqz17wfd79kjjcmnzzjp4m"; - system = "cl-annot-revisit-test"; - asd = "cl-annot-revisit-test"; - }); - systems = [ "cl-annot-revisit-test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "cl-annot-revisit" pkgs) (getAttr "cl-annot-revisit-compat" pkgs) (getAttr "trivial-macroexpand-all" pkgs) ]; - }; - cl-anonfun = { - pname = "cl-anonfun"; - version = "20111203-git"; - asds = [ "cl-anonfun" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz"; - sha256 = "086x2vjvasdy9bhikvdzx34nrq008c0sfkq3ncv0i9mhfk5xwp2j"; - system = "cl-anonfun"; - asd = "cl-anonfun"; - }); - systems = [ "cl-anonfun" ]; - lispLibs = [ ]; - }; - cl-ansi-term = { - pname = "cl-ansi-term"; - version = "20211020-git"; - asds = [ "cl-ansi-term" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ansi-term/2021-10-20/cl-ansi-term-20211020-git.tgz"; - sha256 = "1wz8xx1dk5v1v5cvfh4a5cf5mdrn8lnz8mpf55c34inb0bxjlx87"; - system = "cl-ansi-term"; - asd = "cl-ansi-term"; - }); - systems = [ "cl-ansi-term" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "str" pkgs) ]; - }; - cl-ansi-text = { - pname = "cl-ansi-text"; - version = "20211020-git"; - asds = [ "cl-ansi-text" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz"; - sha256 = "0nk7ajqfa937w1iy3zy86jjbw8yffm05cqs4wxkgl97v6kmmya14"; - system = "cl-ansi-text"; - asd = "cl-ansi-text"; - }); - systems = [ "cl-ansi-text" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-colors2" pkgs) ]; - }; - cl-ansi-text_dot_test = { - pname = "cl-ansi-text.test"; - version = "20211020-git"; - asds = [ "cl-ansi-text.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz"; - sha256 = "0nk7ajqfa937w1iy3zy86jjbw8yffm05cqs4wxkgl97v6kmmya14"; - system = "cl-ansi-text.test"; - asd = "cl-ansi-text.test"; - }); - systems = [ "cl-ansi-text.test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ansi-text" pkgs) (getAttr "cl-colors2" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-apertium-stream = { - pname = "cl-apertium-stream"; - version = "20220331-git"; - asds = [ "cl-apertium-stream" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-apertium-stream-parser/2022-03-31/cl-apertium-stream-parser-20220331-git.tgz"; - sha256 = "1pyr6xppfly84y5662swgh43jchd56n1dwmdm6kr10gllms7lica"; - system = "cl-apertium-stream"; - asd = "cl-apertium-stream"; - }); - systems = [ "cl-apertium-stream" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "esrap" pkgs) ]; - }; - cl-apple-plist = { - pname = "cl-apple-plist"; - version = "20111105-git"; - asds = [ "cl-apple-plist" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-apple-plist/2011-11-05/cl-apple-plist-20111105-git.tgz"; - sha256 = "104j5lvvp7apdx59kbwc6kpa8b82y20w03627ml91lpbqk9bq63f"; - system = "cl-apple-plist"; - asd = "cl-apple-plist"; - }); - systems = [ "cl-apple-plist" ]; - lispLibs = [ (getAttr "html-encode" pkgs) ]; - }; - cl-arff-parser = { - pname = "cl-arff-parser"; - version = "20130421-git"; - asds = [ "cl-arff-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-arff-parser/2013-04-21/cl-arff-parser-20130421-git.tgz"; - sha256 = "0rn76r48b2y2richfy3si4r8kbwkvm7q15g34sxi0fkfmx15z4jx"; - system = "cl-arff-parser"; - asd = "cl-arff-parser"; - }); - systems = [ "cl-arff-parser" ]; - lispLibs = [ ]; - }; - cl-argparse = { - pname = "cl-argparse"; - version = "20210531-git"; - asds = [ "cl-argparse" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-argparse/2021-05-31/cl-argparse-20210531-git.tgz"; - sha256 = "05vy2iaqr7yiaw0ykzwm0ml0mil5qagy87b8hqx4vvb3lq1qpn14"; - system = "cl-argparse"; - asd = "cl-argparse"; - }); - systems = [ "cl-argparse" ]; - lispLibs = [ ]; - }; - cl-aristid = { - pname = "cl-aristid"; - version = "20200925-git"; - asds = [ "cl-aristid" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-aristid/2020-09-25/cl-aristid-20200925-git.tgz"; - sha256 = "0k573k3wydy6dd5pmvqdxmlwk0n5kq2wsk86syddhqyjgx2jmw98"; - system = "cl-aristid"; - asd = "cl-aristid"; - }); - systems = [ "cl-aristid" ]; - lispLibs = [ (getAttr "cl-colors" pkgs) (getAttr "cl-svg" pkgs) ]; - }; - cl-arxiv-api = { - pname = "cl-arxiv-api"; - version = "20170403-git"; - asds = [ "cl-arxiv-api" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-arxiv-api/2017-04-03/cl-arxiv-api-20170403-git.tgz"; - sha256 = "1id95gszqxmmjydv1vjv2vyxz0svqvnx74bmgy63xnajb4kfnpq3"; - system = "cl-arxiv-api"; - asd = "cl-arxiv-api"; - }); - systems = [ "cl-arxiv-api" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cxml" pkgs) (getAttr "iterate" pkgs) (getAttr "trivial-http" pkgs) ]; - }; - cl-ascii-art = { - pname = "cl-ascii-art"; - version = "20171019-git"; - asds = [ "cl-ascii-art" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ascii-art/2017-10-19/cl-ascii-art-20171019-git.tgz"; - sha256 = "03d3bd8m7dd2l4170vky8y8ini3giqhjpd06rlswz287mkvzq8aa"; - system = "cl-ascii-art"; - asd = "cl-ascii-art"; - }); - systems = [ "cl-ascii-art" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ansi-text" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "inferior-shell" pkgs) (getAttr "iterate" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-ascii-table = { - pname = "cl-ascii-table"; - version = "20200610-git"; - asds = [ "cl-ascii-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ascii-table/2020-06-10/cl-ascii-table-20200610-git.tgz"; - sha256 = "1nclyypd2p06hyfydcv16m9lbj1xmrpmf00wp8mfyhwimv021zlp"; - system = "cl-ascii-table"; - asd = "cl-ascii-table"; - }); - systems = [ "cl-ascii-table" ]; - lispLibs = [ ]; - }; - cl-association-rules = { - pname = "cl-association-rules"; - version = "20170403-git"; - asds = [ "cl-association-rules" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-association-rules/2017-04-03/cl-association-rules-20170403-git.tgz"; - sha256 = "1d4sg9j30ydk1m17byacww8l2x9ggb82iay507g08ij0jxdky86z"; - system = "cl-association-rules"; - asd = "cl-association-rules"; - }); - systems = [ "cl-association-rules" ]; - lispLibs = [ ]; - }; - cl-association-rules-tests = { - pname = "cl-association-rules-tests"; - version = "20170403-git"; - asds = [ "cl-association-rules-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-association-rules/2017-04-03/cl-association-rules-20170403-git.tgz"; - sha256 = "1d4sg9j30ydk1m17byacww8l2x9ggb82iay507g08ij0jxdky86z"; - system = "cl-association-rules-tests"; - asd = "cl-association-rules"; - }); - systems = [ "cl-association-rules-tests" ]; - lispLibs = [ (getAttr "cl-association-rules" pkgs) (getAttr "prove" pkgs) ]; - }; - cl-async = { - pname = "cl-async"; - version = "20221106-git"; - asds = [ "cl-async" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2022-11-06/cl-async-20221106-git.tgz"; - sha256 = "1xl5dfq91dqx57hclq3m8kcndbfv5bbb4kissggmmmmrlnkd32cn"; - system = "cl-async"; - asd = "cl-async"; - }); - systems = [ "cl-async" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-async-base" pkgs) (getAttr "cl-async-util" pkgs) (getAttr "cl-libuv" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "static-vectors" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-async-await = { - pname = "cl-async-await"; - version = "20201016-git"; - asds = [ "cl-async-await" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async-await/2020-10-16/cl-async-await-20201016-git.tgz"; - sha256 = "1slhn9z4hljvad3hd8jmvw4q4m6310s04yh3212wvbfar8q0yasj"; - system = "cl-async-await"; - asd = "cl-async-await"; - }); - systems = [ "cl-async-await" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "simple-actors" pkgs) ]; - }; - cl-async-base = { - pname = "cl-async-base"; - version = "20221106-git"; - asds = [ "cl-async-base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2022-11-06/cl-async-20221106-git.tgz"; - sha256 = "1xl5dfq91dqx57hclq3m8kcndbfv5bbb4kissggmmmmrlnkd32cn"; - system = "cl-async-base"; - asd = "cl-async"; - }); - systems = [ "cl-async-base" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-libuv" pkgs) ]; - }; - cl-async-future = { - pname = "cl-async-future"; - version = "20150113-git"; - asds = [ "cl-async-future" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async-future/2015-01-13/cl-async-future-20150113-git.tgz"; - sha256 = "0z0sc7qlzzxk99f4l26zp6rai9kv0kj0f599sxai5s44p17zbbvh"; - system = "cl-async-future"; - asd = "cl-async-future"; - }); - systems = [ "cl-async-future" ]; - lispLibs = [ (getAttr "blackbird" pkgs) ]; - }; - cl-async-repl = { - pname = "cl-async-repl"; - version = "20221106-git"; - asds = [ "cl-async-repl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2022-11-06/cl-async-20221106-git.tgz"; - sha256 = "1xl5dfq91dqx57hclq3m8kcndbfv5bbb4kissggmmmmrlnkd32cn"; - system = "cl-async-repl"; - asd = "cl-async-repl"; - }); - systems = [ "cl-async-repl" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-async" pkgs) ]; - }; - cl-async-ssl = { - pname = "cl-async-ssl"; - version = "20221106-git"; - asds = [ "cl-async-ssl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2022-11-06/cl-async-20221106-git.tgz"; - sha256 = "1xl5dfq91dqx57hclq3m8kcndbfv5bbb4kissggmmmmrlnkd32cn"; - system = "cl-async-ssl"; - asd = "cl-async-ssl"; - }); - systems = [ "cl-async-ssl" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-async" pkgs) (getAttr "vom" pkgs) ]; - }; - cl-async-test = { - pname = "cl-async-test"; - version = "20221106-git"; - asds = [ "cl-async-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2022-11-06/cl-async-20221106-git.tgz"; - sha256 = "1xl5dfq91dqx57hclq3m8kcndbfv5bbb4kissggmmmmrlnkd32cn"; - system = "cl-async-test"; - asd = "cl-async-test"; - }); - systems = [ "cl-async-test" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-async" pkgs) (getAttr "cl-async-ssl" pkgs) (getAttr "fiveam" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "ironclad" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-async-util = { - pname = "cl-async-util"; - version = "20221106-git"; - asds = [ "cl-async-util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-async/2022-11-06/cl-async-20221106-git.tgz"; - sha256 = "1xl5dfq91dqx57hclq3m8kcndbfv5bbb4kissggmmmmrlnkd32cn"; - system = "cl-async-util"; - asd = "cl-async"; - }); - systems = [ "cl-async-util" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-async-base" pkgs) (getAttr "cl-libuv" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "fast-io" pkgs) (getAttr "vom" pkgs) ]; - }; - cl-aubio = { - pname = "cl-aubio"; - version = "20200427-git"; - asds = [ "cl-aubio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-aubio/2020-04-27/cl-aubio-20200427-git.tgz"; - sha256 = "1xyflxy46z4487dbnizhv058y2mdka9iyikl097m60w42blidpn3"; - system = "cl-aubio"; - asd = "cl-aubio"; - }); - systems = [ "cl-aubio" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - cl-aubio_slash_examples = { - pname = "cl-aubio_examples"; - version = "20200427-git"; - asds = [ "cl-aubio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-aubio/2020-04-27/cl-aubio-20200427-git.tgz"; - sha256 = "1xyflxy46z4487dbnizhv058y2mdka9iyikl097m60w42blidpn3"; - system = "cl-aubio"; - asd = "cl-aubio"; - }); - systems = [ "cl-aubio/examples" ]; - lispLibs = [ (getAttr "cl-aubio" pkgs) (getAttr "vgplot" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-aubio_slash_tests = { - pname = "cl-aubio_tests"; - version = "20200427-git"; - asds = [ "cl-aubio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-aubio/2020-04-27/cl-aubio-20200427-git.tgz"; - sha256 = "1xyflxy46z4487dbnizhv058y2mdka9iyikl097m60w42blidpn3"; - system = "cl-aubio"; - asd = "cl-aubio"; - }); - systems = [ "cl-aubio/tests" ]; - lispLibs = [ (getAttr "cl-aubio" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-authorize-net = { - pname = "cl-authorize-net"; - version = "20150113-git"; - asds = [ "cl-authorize-net" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz"; - sha256 = "1qq9r7q50k7jw6sv65aqi9xalaw8m6aqsbb0cgpjxv8wdhy934cr"; - system = "cl-authorize-net"; - asd = "cl-authorize-net"; - }); - systems = [ "cl-authorize-net" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-creditcard" pkgs) (getAttr "drakma" pkgs) (getAttr "split-sequence" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - cl-authorize-net-tests = { - pname = "cl-authorize-net-tests"; - version = "20150113-git"; - asds = [ "cl-authorize-net-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz"; - sha256 = "1qq9r7q50k7jw6sv65aqi9xalaw8m6aqsbb0cgpjxv8wdhy934cr"; - system = "cl-authorize-net-tests"; - asd = "cl-authorize-net"; - }); - systems = [ "cl-authorize-net-tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-authorize-net" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - cl-autorepo = { - pname = "cl-autorepo"; - version = "20180711-git"; - asds = [ "cl-autorepo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-autorepo/2018-07-11/cl-autorepo-20180711-git.tgz"; - sha256 = "01hpg3r3493mri44kxp8sjy8i5kfvjklmnksvm0727i6bhpf8cz9"; - system = "cl-autorepo"; - asd = "cl-autorepo"; - }); - systems = [ "cl-autorepo" ]; - lispLibs = [ ]; - }; - cl-autowrap = { - pname = "cl-autowrap"; - version = "20221106-git"; - asds = [ "cl-autowrap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-autowrap/2022-11-06/cl-autowrap-20221106-git.tgz"; - sha256 = "0pbabpmg61bflx6kxllqvhbvxqwjsik3nnynqdhgzzkgzk6jlixv"; - system = "cl-autowrap"; - asd = "cl-autowrap"; - }); - systems = [ "cl-autowrap" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "defpackage-plus" pkgs) (getAttr "trivial-features" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-autowrap-test = { - pname = "cl-autowrap-test"; - version = "20221106-git"; - asds = [ "cl-autowrap-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-autowrap/2022-11-06/cl-autowrap-20221106-git.tgz"; - sha256 = "0pbabpmg61bflx6kxllqvhbvxqwjsik3nnynqdhgzzkgzk6jlixv"; - system = "cl-autowrap-test"; - asd = "cl-autowrap-test"; - }); - systems = [ "cl-autowrap-test" ]; - lispLibs = [ (getAttr "cl-autowrap" pkgs) ]; - }; - cl-autowrap_slash_libffi = { - pname = "cl-autowrap_libffi"; - version = "20221106-git"; - asds = [ "cl-autowrap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-autowrap/2022-11-06/cl-autowrap-20221106-git.tgz"; - sha256 = "0pbabpmg61bflx6kxllqvhbvxqwjsik3nnynqdhgzzkgzk6jlixv"; - system = "cl-autowrap"; - asd = "cl-autowrap"; - }); - systems = [ "cl-autowrap/libffi" ]; - lispLibs = [ (getAttr "cl-autowrap" pkgs) (getAttr "cl-plus-c" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-azure = { - pname = "cl-azure"; - version = "20160825-git"; - asds = [ "cl-azure" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-azure/2016-08-25/cl-azure-20160825-git.tgz"; - sha256 = "19sgzbvgs1f1h3qhx11xhpia2x3n8x729h9fsqkc7fap0ak1h31d"; - system = "cl-azure"; - asd = "cl-azure"; - }); - systems = [ "cl-azure" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cxml" pkgs) (getAttr "drakma" pkgs) (getAttr "ironclad" pkgs) (getAttr "puri" pkgs) (getAttr "rt" pkgs) ]; - }; - cl-base16 = { - pname = "cl-base16"; - version = "20200925-git"; - asds = [ "cl-base16" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-base16/2020-09-25/cl-base16-20200925-git.tgz"; - sha256 = "0m7ndmk4xhizn3q3ywjvw8sg4pfgp6lrd0wac5d1bf7wbw6afh5q"; - system = "cl-base16"; - asd = "cl-base16"; - }); - systems = [ "cl-base16" ]; - lispLibs = [ (getAttr "cl-mustache" pkgs) (getAttr "cl-slug" pkgs) (getAttr "cl-yaml" pkgs) (getAttr "trivial-shell" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-base32 = { - pname = "cl-base32"; - version = "20130420-git"; - asds = [ "cl-base32" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-base32/2013-04-20/cl-base32-20130420-git.tgz"; - sha256 = "17jrng8jb05d64ggyd11hp308c2fl5drvf9g175blgrkkl8l4mf8"; - system = "cl-base32"; - asd = "cl-base32"; - }); - systems = [ "cl-base32" ]; - lispLibs = [ ]; - }; - cl-base32-tests = { - pname = "cl-base32-tests"; - version = "20130420-git"; - asds = [ "cl-base32-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-base32/2013-04-20/cl-base32-20130420-git.tgz"; - sha256 = "17jrng8jb05d64ggyd11hp308c2fl5drvf9g175blgrkkl8l4mf8"; - system = "cl-base32-tests"; - asd = "cl-base32"; - }); - systems = [ "cl-base32-tests" ]; - lispLibs = [ (getAttr "cl-base32" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - cl-base58 = { - pname = "cl-base58"; - version = "20150113-git"; - asds = [ "cl-base58" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-base58/2015-01-13/cl-base58-20150113-git.tgz"; - sha256 = "01wiiyz1jzxx3zhxi2hpq5n8hv28g1mn0adk793vwjzh4v5bi5zz"; - system = "cl-base58"; - asd = "cl-base58"; - }); - systems = [ "cl-base58" ]; - lispLibs = [ ]; - }; - cl-base58-test = { - pname = "cl-base58-test"; - version = "20150113-git"; - asds = [ "cl-base58-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-base58/2015-01-13/cl-base58-20150113-git.tgz"; - sha256 = "01wiiyz1jzxx3zhxi2hpq5n8hv28g1mn0adk793vwjzh4v5bi5zz"; - system = "cl-base58-test"; - asd = "cl-base58-test"; - }); - systems = [ "cl-base58-test" ]; - lispLibs = [ (getAttr "cl-base58" pkgs) (getAttr "cl-test-more" pkgs) ]; - }; - cl-base64 = { - pname = "cl-base64"; - version = "20201016-git"; - asds = [ "cl-base64" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz"; - sha256 = "12jj54h0fs6n237cvnp8v6hn0imfksammq22ys6pi0gwz2w47rbj"; - system = "cl-base64"; - asd = "cl-base64"; - }); - systems = [ "cl-base64" ]; - lispLibs = [ ]; - }; - cl-base64_slash_test = { - pname = "cl-base64_test"; - version = "20201016-git"; - asds = [ "cl-base64" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz"; - sha256 = "12jj54h0fs6n237cvnp8v6hn0imfksammq22ys6pi0gwz2w47rbj"; - system = "cl-base64"; - asd = "cl-base64"; - }); - systems = [ "cl-base64/test" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "kmrcl" pkgs) (getAttr "ptester" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-bayesnet = { - pname = "cl-bayesnet"; - version = "20130420-git"; - asds = [ "cl-bayesnet" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bayesnet/2013-04-20/cl-bayesnet-20130420-git.tgz"; - sha256 = "02as2isvgm89qpyj49ccs1cg4fl9iswxi26w4j0svsha0q1dh5m8"; - system = "cl-bayesnet"; - asd = "cl-bayesnet"; - }); - systems = [ "cl-bayesnet" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "s-xml" pkgs) (getAttr "trivial-shell" pkgs) ]; - }; - cl-bcrypt = { - pname = "cl-bcrypt"; - version = "20200925-git"; - asds = [ "cl-bcrypt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bcrypt/2020-09-25/cl-bcrypt-20200925-git.tgz"; - sha256 = "0hx9pzn5l1jx09j4pnsvd99byhz7izfn78i2aqr3hvq9indfjlxy"; - system = "cl-bcrypt"; - asd = "cl-bcrypt"; - }); - systems = [ "cl-bcrypt" ]; - lispLibs = [ (getAttr "binascii" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "ironclad" pkgs) ]; - }; - cl-bcrypt_dot_test = { - pname = "cl-bcrypt.test"; - version = "20200925-git"; - asds = [ "cl-bcrypt.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bcrypt/2020-09-25/cl-bcrypt-20200925-git.tgz"; - sha256 = "0hx9pzn5l1jx09j4pnsvd99byhz7izfn78i2aqr3hvq9indfjlxy"; - system = "cl-bcrypt.test"; - asd = "cl-bcrypt.test"; - }); - systems = [ "cl-bcrypt.test" ]; - lispLibs = [ (getAttr "cl-bcrypt" pkgs) (getAttr "rove" pkgs) ]; - }; - cl-beanstalk = { - pname = "cl-beanstalk"; - version = "20220707-git"; - asds = [ "cl-beanstalk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-beanstalk/2022-07-07/cl-beanstalk-20220707-git.tgz"; - sha256 = "0vca8dw2l765m7g7xcpzi80m8f3145hhshh8ym602336fhiz61q1"; - system = "cl-beanstalk"; - asd = "cl-beanstalk"; - }); - systems = [ "cl-beanstalk" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "split-sequence" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-bip39 = { - pname = "cl-bip39"; - version = "20180711-git"; - asds = [ "cl-bip39" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bip39/2018-07-11/cl-bip39-20180711-git.tgz"; - sha256 = "04h4lhppvavvqknp11gaj4ka2wpn9i883w1w27llblkg2vnn0816"; - system = "cl-bip39"; - asd = "cl-bip39"; - }); - systems = [ "cl-bip39" ]; - lispLibs = [ (getAttr "ironclad" pkgs) (getAttr "secure-random" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - cl-bloggy = { - pname = "cl-bloggy"; - version = "20211020-git"; - asds = [ "cl-bloggy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bloggy/2021-10-20/cl-bloggy-20211020-git.tgz"; - sha256 = "1clz2a0s3g3jbsrpypb4byb432l0yb4658riqs6ckin57c4bzxc8"; - system = "cl-bloggy"; - asd = "cl-bloggy"; - }); - systems = [ "cl-bloggy" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "str" pkgs) (getAttr "closer-mop" pkgs) (getAttr "do-urlencode" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "lass" pkgs) (getAttr "local-time" pkgs) (getAttr "lorem-ipsum" pkgs) (getAttr "spinneret" pkgs) (getAttr "xml-emitter" pkgs) ]; - }; - cl-bloom = { - pname = "cl-bloom"; - version = "20180228-git"; - asds = [ "cl-bloom" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bloom/2018-02-28/cl-bloom-20180228-git.tgz"; - sha256 = "1ircc5sa0a2xlx0fca0is6inwrk311hbj8jx6r4sas5pfv78k4am"; - system = "cl-bloom"; - asd = "cl-bloom"; - }); - systems = [ "cl-bloom" ]; - lispLibs = [ (getAttr "cl-murmurhash" pkgs) (getAttr "static-vectors" pkgs) ]; - }; - cl-bloom-filter = { - pname = "cl-bloom-filter"; - version = "20221106-git"; - asds = [ "cl-bloom-filter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bloom-filter/2022-11-06/cl-bloom-filter-20221106-git.tgz"; - sha256 = "1s9m617fh3krh2klc2nx7jf89nk43cvvrnvqrhvw9jprw7gqanvq"; - system = "cl-bloom-filter"; - asd = "cl-bloom-filter"; - }); - systems = [ "cl-bloom-filter" ]; - lispLibs = [ ]; - }; - cl-bloom-filter_slash_tests = { - pname = "cl-bloom-filter_tests"; - version = "20221106-git"; - asds = [ "cl-bloom-filter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bloom-filter/2022-11-06/cl-bloom-filter-20221106-git.tgz"; - sha256 = "1s9m617fh3krh2klc2nx7jf89nk43cvvrnvqrhvw9jprw7gqanvq"; - system = "cl-bloom-filter"; - asd = "cl-bloom-filter"; - }); - systems = [ "cl-bloom-filter/tests" ]; - lispLibs = [ (getAttr "cl-bloom-filter" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-bnf = { - pname = "cl-bnf"; - version = "20200925-git"; - asds = [ "cl-bnf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bnf/2020-09-25/cl-bnf-20200925-git.tgz"; - sha256 = "0z8qcywbyr1fdx122vpp0sdqywaqcwy2393ygqqznm5j3jv5dxii"; - system = "cl-bnf"; - asd = "cl-bnf"; - }); - systems = [ "cl-bnf" ]; - lispLibs = [ ]; - }; - cl-bnf-examples = { - pname = "cl-bnf-examples"; - version = "20200925-git"; - asds = [ "cl-bnf-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bnf/2020-09-25/cl-bnf-20200925-git.tgz"; - sha256 = "0z8qcywbyr1fdx122vpp0sdqywaqcwy2393ygqqznm5j3jv5dxii"; - system = "cl-bnf-examples"; - asd = "cl-bnf-examples"; - }); - systems = [ "cl-bnf-examples" ]; - lispLibs = [ (getAttr "cl-bnf" pkgs) ]; - }; - cl-bnf-tests = { - pname = "cl-bnf-tests"; - version = "20200925-git"; - asds = [ "cl-bnf-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bnf/2020-09-25/cl-bnf-20200925-git.tgz"; - sha256 = "0z8qcywbyr1fdx122vpp0sdqywaqcwy2393ygqqznm5j3jv5dxii"; - system = "cl-bnf-tests"; - asd = "cl-bnf-tests"; - }); - systems = [ "cl-bnf-tests" ]; - lispLibs = [ (getAttr "cl-bnf" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-bootstrap = { - pname = "cl-bootstrap"; - version = "20180831-git"; - asds = [ "cl-bootstrap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz"; - sha256 = "0pk7wx4arsljxlnbx1hzcgxwsvhdp3gn22wv43xls2jv1rdi2xry"; - system = "cl-bootstrap"; - asd = "cl-bootstrap"; - }); - systems = [ "cl-bootstrap" ]; - lispLibs = [ (getAttr "cl-who" pkgs) (getAttr "parenscript" pkgs) ]; - }; - cl-bootstrap-demo = { - pname = "cl-bootstrap-demo"; - version = "20180831-git"; - asds = [ "cl-bootstrap-demo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz"; - sha256 = "0pk7wx4arsljxlnbx1hzcgxwsvhdp3gn22wv43xls2jv1rdi2xry"; - system = "cl-bootstrap-demo"; - asd = "cl-bootstrap-demo"; - }); - systems = [ "cl-bootstrap-demo" ]; - lispLibs = [ (getAttr "cl-bootstrap" pkgs) (getAttr "cl-who" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "parenscript" pkgs) ]; - }; - cl-bootstrap-test = { - pname = "cl-bootstrap-test"; - version = "20180831-git"; - asds = [ "cl-bootstrap-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bootstrap/2018-08-31/cl-bootstrap-20180831-git.tgz"; - sha256 = "0pk7wx4arsljxlnbx1hzcgxwsvhdp3gn22wv43xls2jv1rdi2xry"; - system = "cl-bootstrap-test"; - asd = "cl-bootstrap-test"; - }); - systems = [ "cl-bootstrap-test" ]; - lispLibs = [ (getAttr "cl-bootstrap" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-bplustree = { - pname = "cl-bplustree"; - version = "20180328-git"; - asds = [ "cl-bplustree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bplustree/2018-03-28/cl-bplustree-20180328-git.tgz"; - sha256 = "1d9pm9fi9bhh73bhcgig0wq5i4fvc4551kxvny3di6x6yr7j2kbl"; - system = "cl-bplustree"; - asd = "cl-bplustree"; - }); - systems = [ "cl-bplustree" ]; - lispLibs = [ ]; - }; - cl-bplustree-test = { - pname = "cl-bplustree-test"; - version = "20180328-git"; - asds = [ "cl-bplustree-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bplustree/2018-03-28/cl-bplustree-20180328-git.tgz"; - sha256 = "1d9pm9fi9bhh73bhcgig0wq5i4fvc4551kxvny3di6x6yr7j2kbl"; - system = "cl-bplustree-test"; - asd = "cl-bplustree"; - }); - systems = [ "cl-bplustree-test" ]; - lispLibs = [ (getAttr "cl-bplustree" pkgs) ]; - }; - cl-bson = { - pname = "cl-bson"; - version = "20170403-git"; - asds = [ "cl-bson" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bson/2017-04-03/cl-bson-20170403-git.tgz"; - sha256 = "107mx5kvqw7f7q9mw3qa120gz1z153fwv8jmn5qi2sbfnglkz2gy"; - system = "cl-bson"; - asd = "cl-bson"; - }); - systems = [ "cl-bson" ]; - lispLibs = [ (getAttr "arrow-macros" pkgs) (getAttr "babel" pkgs) (getAttr "cl-intbytes" pkgs) (getAttr "fast-io" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "let-over-lambda" pkgs) (getAttr "local-time" pkgs) (getAttr "named-readtables" pkgs) (getAttr "rutils" pkgs) (getAttr "trivial-shell" pkgs) ]; - }; - cl-bson-test = { - pname = "cl-bson-test"; - version = "20170403-git"; - asds = [ "cl-bson-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bson/2017-04-03/cl-bson-20170403-git.tgz"; - sha256 = "107mx5kvqw7f7q9mw3qa120gz1z153fwv8jmn5qi2sbfnglkz2gy"; - system = "cl-bson-test"; - asd = "cl-bson-test"; - }); - systems = [ "cl-bson-test" ]; - lispLibs = [ (getAttr "cl-bson" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-buchberger = { - pname = "cl-buchberger"; - version = "20201016-git"; - asds = [ "cl-buchberger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-buchberger/2020-10-16/cl-buchberger-20201016-git.tgz"; - sha256 = "105kwri3hjla1cydc323y8dfi4cjg0g4hxjzdh13inmvxwcf049w"; - system = "cl-buchberger"; - asd = "cl-buchberger"; - }); - systems = [ "cl-buchberger" ]; - lispLibs = [ ]; - }; - cl-bus = { - pname = "cl-bus"; - version = "20211209-git"; - asds = [ "cl-bus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-bus/2021-12-09/cl-bus-20211209-git.tgz"; - sha256 = "1galzqm1qv2slibn3awfyxnmlslxmzw09a8fidmbdy1r0ppp5r7z"; - system = "cl-bus"; - asd = "cl-bus"; - }); - systems = [ "cl-bus" ]; - lispLibs = [ ]; - }; - cl-ca = { - pname = "cl-ca"; - version = "20161204-git"; - asds = [ "cl-ca" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ca/2016-12-04/cl-ca-20161204-git.tgz"; - sha256 = "0kpwpxw3c8q7b2ajyj9rzhs1r1h6kipdm9qjkgsn0sqrmx9acfnz"; - system = "cl-ca"; - asd = "cl-ca"; - }); - systems = [ "cl-ca" ]; - lispLibs = [ ]; - }; - cl-cache-tables = { - pname = "cl-cache-tables"; - version = "20171019-git"; - asds = [ "cl-cache-tables" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cache-tables/2017-10-19/cl-cache-tables-20171019-git.tgz"; - sha256 = "008m7v39mq2475y1f4if5iazb15rm02g22id4q4qgig1zx2vfpg1"; - system = "cl-cache-tables"; - asd = "cl-cache-tables"; - }); - systems = [ "cl-cache-tables" ]; - lispLibs = [ ]; - }; - cl-cache-tables-tests = { - pname = "cl-cache-tables-tests"; - version = "20171019-git"; - asds = [ "cl-cache-tables-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cache-tables/2017-10-19/cl-cache-tables-20171019-git.tgz"; - sha256 = "008m7v39mq2475y1f4if5iazb15rm02g22id4q4qgig1zx2vfpg1"; - system = "cl-cache-tables-tests"; - asd = "cl-cache-tables"; - }); - systems = [ "cl-cache-tables-tests" ]; - lispLibs = [ (getAttr "cl-cache-tables" pkgs) (getAttr "prove" pkgs) ]; - }; - cl-cairo2 = { - pname = "cl-cairo2"; - version = "20211020-git"; - asds = [ "cl-cairo2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz"; - sha256 = "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q"; - system = "cl-cairo2"; - asd = "cl-cairo2"; - }); - systems = [ "cl-cairo2" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-colors" pkgs) (getAttr "cl-utilities" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-cairo2-demos = { - pname = "cl-cairo2-demos"; - version = "20211020-git"; - asds = [ "cl-cairo2-demos" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz"; - sha256 = "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q"; - system = "cl-cairo2-demos"; - asd = "cl-cairo2-demos"; - }); - systems = [ "cl-cairo2-demos" ]; - lispLibs = [ (getAttr "cl-cairo2" pkgs) ]; - }; - cl-cairo2-xlib = { - pname = "cl-cairo2-xlib"; - version = "20211020-git"; - asds = [ "cl-cairo2-xlib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cairo2/2021-10-20/cl-cairo2-20211020-git.tgz"; - sha256 = "0cpfgyxw6pz7y033dlya8c4vjmkpw127zdq3a9xclp9q8jbdlb7q"; - system = "cl-cairo2-xlib"; - asd = "cl-cairo2-xlib"; - }); - systems = [ "cl-cairo2-xlib" ]; - lispLibs = [ (getAttr "cl-cairo2" pkgs) (getAttr "cl-freetype2" pkgs) ]; - }; - cl-case-control = { - pname = "cl-case-control"; - version = "20141106-git"; - asds = [ "cl-case-control" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-case-control/2014-11-06/cl-case-control-20141106-git.tgz"; - sha256 = "0510m1dfz4abw3s7w0axr1b1nsmi72avr850r0sn6p2pq091pc71"; - system = "cl-case-control"; - asd = "cl-case-control"; - }); - systems = [ "cl-case-control" ]; - lispLibs = [ (getAttr "trivial-types" pkgs) ]; - }; - cl-catmull-rom-spline = { - pname = "cl-catmull-rom-spline"; - version = "20220220-git"; - asds = [ "cl-catmull-rom-spline" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-catmull-rom-spline/2022-02-20/cl-catmull-rom-spline-20220220-git.tgz"; - sha256 = "0702swja11zpfdx04l0901ipvi0acg17mk9ryvhibnbzq70npyjs"; - system = "cl-catmull-rom-spline"; - asd = "cl-catmull-rom-spline"; - }); - systems = [ "cl-catmull-rom-spline" ]; - lispLibs = [ ]; - }; - cl-catmull-rom-spline_slash_example = { - pname = "cl-catmull-rom-spline_example"; - version = "20220220-git"; - asds = [ "cl-catmull-rom-spline" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-catmull-rom-spline/2022-02-20/cl-catmull-rom-spline-20220220-git.tgz"; - sha256 = "0702swja11zpfdx04l0901ipvi0acg17mk9ryvhibnbzq70npyjs"; - system = "cl-catmull-rom-spline"; - asd = "cl-catmull-rom-spline"; - }); - systems = [ "cl-catmull-rom-spline/example" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-catmull-rom-spline" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-gfx" pkgs) (getAttr "lispbuilder-sdl-ttf" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-catmull-rom-spline_slash_test = { - pname = "cl-catmull-rom-spline_test"; - version = "20220220-git"; - asds = [ "cl-catmull-rom-spline" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-catmull-rom-spline/2022-02-20/cl-catmull-rom-spline-20220220-git.tgz"; - sha256 = "0702swja11zpfdx04l0901ipvi0acg17mk9ryvhibnbzq70npyjs"; - system = "cl-catmull-rom-spline"; - asd = "cl-catmull-rom-spline"; - }); - systems = [ "cl-catmull-rom-spline/test" ]; - lispLibs = [ (getAttr "arrow-macros" pkgs) (getAttr "cl-catmull-rom-spline" pkgs) (getAttr "fiveam" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-cerf = { - pname = "cl-cerf"; - version = "20210531-git"; - asds = [ "cl-cerf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cerf/2021-05-31/cl-cerf-20210531-git.tgz"; - sha256 = "0n1b6ig1d0dqkjn06iqsk0m4y7j7msi2gcq7niivcwc4s0ry0ljn"; - system = "cl-cerf"; - asd = "cl-cerf"; - }); - systems = [ "cl-cerf" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) ]; - }; - cl-cffi-gtk = { - pname = "cl-cffi-gtk"; - version = "20201220-git"; - asds = [ "cl-cffi-gtk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "1rcxv8abpvfbfvrq27h48rbhsvmp26cq7b27pcp8205mxvkdzam5"; - system = "cl-cffi-gtk"; - asd = "cl-cffi-gtk"; - }); - systems = [ "cl-cffi-gtk" ]; - lispLibs = [ (getAttr "cl-cffi-gtk-cairo" pkgs) (getAttr "cl-cffi-gtk-gdk" pkgs) (getAttr "cl-cffi-gtk-gdk-pixbuf" pkgs) (getAttr "cl-cffi-gtk-gio" pkgs) (getAttr "cl-cffi-gtk-glib" pkgs) (getAttr "cl-cffi-gtk-gobject" pkgs) (getAttr "cl-cffi-gtk-pango" pkgs) ]; - }; - cl-cffi-gtk-cairo = { - pname = "cl-cffi-gtk-cairo"; - version = "20201220-git"; - asds = [ "cl-cffi-gtk-cairo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "1rcxv8abpvfbfvrq27h48rbhsvmp26cq7b27pcp8205mxvkdzam5"; - system = "cl-cffi-gtk-cairo"; - asd = "cl-cffi-gtk-cairo"; - }); - systems = [ "cl-cffi-gtk-cairo" ]; - lispLibs = [ (getAttr "cl-cffi-gtk-glib" pkgs) ]; - }; - cl-cffi-gtk-demo-cairo = { - pname = "cl-cffi-gtk-demo-cairo"; - version = "20201220-git"; - asds = [ "cl-cffi-gtk-demo-cairo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "1rcxv8abpvfbfvrq27h48rbhsvmp26cq7b27pcp8205mxvkdzam5"; - system = "cl-cffi-gtk-demo-cairo"; - asd = "cl-cffi-gtk-demo-cairo"; - }); - systems = [ "cl-cffi-gtk-demo-cairo" ]; - lispLibs = [ (getAttr "cl-cffi-gtk" pkgs) ]; - }; - cl-cffi-gtk-demo-glib = { - pname = "cl-cffi-gtk-demo-glib"; - version = "20201220-git"; - asds = [ "cl-cffi-gtk-demo-glib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "1rcxv8abpvfbfvrq27h48rbhsvmp26cq7b27pcp8205mxvkdzam5"; - system = "cl-cffi-gtk-demo-glib"; - asd = "cl-cffi-gtk-demo-glib"; - }); - systems = [ "cl-cffi-gtk-demo-glib" ]; - lispLibs = [ (getAttr "cl-cffi-gtk" pkgs) ]; - }; - cl-cffi-gtk-demo-gobject = { - pname = "cl-cffi-gtk-demo-gobject"; - version = "20201220-git"; - asds = [ "cl-cffi-gtk-demo-gobject" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "1rcxv8abpvfbfvrq27h48rbhsvmp26cq7b27pcp8205mxvkdzam5"; - system = "cl-cffi-gtk-demo-gobject"; - asd = "cl-cffi-gtk-demo-gobject"; - }); - systems = [ "cl-cffi-gtk-demo-gobject" ]; - lispLibs = [ (getAttr "cl-cffi-gtk-gobject" pkgs) ]; - }; - cl-cffi-gtk-example-gtk = { - pname = "cl-cffi-gtk-example-gtk"; - version = "20201220-git"; - asds = [ "cl-cffi-gtk-example-gtk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "1rcxv8abpvfbfvrq27h48rbhsvmp26cq7b27pcp8205mxvkdzam5"; - system = "cl-cffi-gtk-example-gtk"; - asd = "cl-cffi-gtk-example-gtk"; - }); - systems = [ "cl-cffi-gtk-example-gtk" ]; - lispLibs = [ (getAttr "cl-cffi-gtk" pkgs) ]; - }; - cl-cffi-gtk-gdk = { - pname = "cl-cffi-gtk-gdk"; - version = "20201220-git"; - asds = [ "cl-cffi-gtk-gdk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "1rcxv8abpvfbfvrq27h48rbhsvmp26cq7b27pcp8205mxvkdzam5"; - system = "cl-cffi-gtk-gdk"; - asd = "cl-cffi-gtk-gdk"; - }); - systems = [ "cl-cffi-gtk-gdk" ]; - lispLibs = [ (getAttr "cl-cffi-gtk-cairo" pkgs) (getAttr "cl-cffi-gtk-gdk-pixbuf" pkgs) (getAttr "cl-cffi-gtk-gio" pkgs) (getAttr "cl-cffi-gtk-glib" pkgs) (getAttr "cl-cffi-gtk-gobject" pkgs) (getAttr "cl-cffi-gtk-pango" pkgs) ]; - }; - cl-cffi-gtk-gdk-pixbuf = { - pname = "cl-cffi-gtk-gdk-pixbuf"; - version = "20201220-git"; - asds = [ "cl-cffi-gtk-gdk-pixbuf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "1rcxv8abpvfbfvrq27h48rbhsvmp26cq7b27pcp8205mxvkdzam5"; - system = "cl-cffi-gtk-gdk-pixbuf"; - asd = "cl-cffi-gtk-gdk-pixbuf"; - }); - systems = [ "cl-cffi-gtk-gdk-pixbuf" ]; - lispLibs = [ (getAttr "cl-cffi-gtk-glib" pkgs) (getAttr "cl-cffi-gtk-gobject" pkgs) ]; - }; - cl-cffi-gtk-gio = { - pname = "cl-cffi-gtk-gio"; - version = "20201220-git"; - asds = [ "cl-cffi-gtk-gio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "1rcxv8abpvfbfvrq27h48rbhsvmp26cq7b27pcp8205mxvkdzam5"; - system = "cl-cffi-gtk-gio"; - asd = "cl-cffi-gtk-gio"; - }); - systems = [ "cl-cffi-gtk-gio" ]; - lispLibs = [ (getAttr "cl-cffi-gtk-glib" pkgs) (getAttr "cl-cffi-gtk-gobject" pkgs) ]; - }; - cl-cffi-gtk-glib = { - pname = "cl-cffi-gtk-glib"; - version = "20201220-git"; - asds = [ "cl-cffi-gtk-glib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "1rcxv8abpvfbfvrq27h48rbhsvmp26cq7b27pcp8205mxvkdzam5"; - system = "cl-cffi-gtk-glib"; - asd = "cl-cffi-gtk-glib"; - }); - systems = [ "cl-cffi-gtk-glib" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "iterate" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - cl-cffi-gtk-gobject = { - pname = "cl-cffi-gtk-gobject"; - version = "20201220-git"; - asds = [ "cl-cffi-gtk-gobject" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "1rcxv8abpvfbfvrq27h48rbhsvmp26cq7b27pcp8205mxvkdzam5"; - system = "cl-cffi-gtk-gobject"; - asd = "cl-cffi-gtk-gobject"; - }); - systems = [ "cl-cffi-gtk-gobject" ]; - lispLibs = [ (getAttr "cl-cffi-gtk-glib" pkgs) (getAttr "closer-mop" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-cffi-gtk-opengl-demo = { - pname = "cl-cffi-gtk-opengl-demo"; - version = "20201220-git"; - asds = [ "cl-cffi-gtk-opengl-demo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "1rcxv8abpvfbfvrq27h48rbhsvmp26cq7b27pcp8205mxvkdzam5"; - system = "cl-cffi-gtk-opengl-demo"; - asd = "cl-cffi-gtk-opengl-demo"; - }); - systems = [ "cl-cffi-gtk-opengl-demo" ]; - lispLibs = [ (getAttr "cl-cffi-gtk" pkgs) (getAttr "cl-opengl" pkgs) ]; - }; - cl-cffi-gtk-pango = { - pname = "cl-cffi-gtk-pango"; - version = "20201220-git"; - asds = [ "cl-cffi-gtk-pango" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "1rcxv8abpvfbfvrq27h48rbhsvmp26cq7b27pcp8205mxvkdzam5"; - system = "cl-cffi-gtk-pango"; - asd = "cl-cffi-gtk-pango"; - }); - systems = [ "cl-cffi-gtk-pango" ]; - lispLibs = [ (getAttr "cl-cffi-gtk-cairo" pkgs) (getAttr "cl-cffi-gtk-glib" pkgs) (getAttr "cl-cffi-gtk-gobject" pkgs) ]; - }; - cl-change-case = { - pname = "cl-change-case"; - version = "20210411-git"; - asds = [ "cl-change-case" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-change-case/2021-04-11/cl-change-case-20210411-git.tgz"; - sha256 = "027qvcx261g0gwjvwn2n4w0biw1xq3c5s41smbb3ppxszyax82dx"; - system = "cl-change-case"; - asd = "cl-change-case"; - }); - systems = [ "cl-change-case" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-ppcre-unicode" pkgs) ]; - }; - cl-change-case_slash_test = { - pname = "cl-change-case_test"; - version = "20210411-git"; - asds = [ "cl-change-case" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-change-case/2021-04-11/cl-change-case-20210411-git.tgz"; - sha256 = "027qvcx261g0gwjvwn2n4w0biw1xq3c5s41smbb3ppxszyax82dx"; - system = "cl-change-case"; - asd = "cl-change-case"; - }); - systems = [ "cl-change-case/test" ]; - lispLibs = [ (getAttr "cl-change-case" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-charms = { - pname = "cl-charms"; - version = "20221106-git"; - asds = [ "cl-charms" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-charms/2022-11-06/cl-charms-20221106-git.tgz"; - sha256 = "1xi2q3xl756wyallfbyfp2v0zvf8mhfkwb59y11ny9jj5cdhgwdh"; - system = "cl-charms"; - asd = "cl-charms"; - }); - systems = [ "cl-charms" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - cl-charms-paint = { - pname = "cl-charms-paint"; - version = "20221106-git"; - asds = [ "cl-charms-paint" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-charms/2022-11-06/cl-charms-20221106-git.tgz"; - sha256 = "1xi2q3xl756wyallfbyfp2v0zvf8mhfkwb59y11ny9jj5cdhgwdh"; - system = "cl-charms-paint"; - asd = "cl-charms-paint"; - }); - systems = [ "cl-charms-paint" ]; - lispLibs = [ (getAttr "cl-charms" pkgs) ]; - }; - cl-charms-timer = { - pname = "cl-charms-timer"; - version = "20221106-git"; - asds = [ "cl-charms-timer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-charms/2022-11-06/cl-charms-20221106-git.tgz"; - sha256 = "1xi2q3xl756wyallfbyfp2v0zvf8mhfkwb59y11ny9jj5cdhgwdh"; - system = "cl-charms-timer"; - asd = "cl-charms-timer"; - }); - systems = [ "cl-charms-timer" ]; - lispLibs = [ (getAttr "cl-charms" pkgs) ]; - }; - cl-cheshire-cat = { - pname = "cl-cheshire-cat"; - version = "20121125-git"; - asds = [ "cl-cheshire-cat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cheshire-cat/2012-11-25/cl-cheshire-cat-20121125-git.tgz"; - sha256 = "1kgm1pa2c4r90nfs38x7fsw730nw13z7p6f11rv67hdjcydh2f11"; - system = "cl-cheshire-cat"; - asd = "cl-cheshire-cat"; - }); - systems = [ "cl-cheshire-cat" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-store" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "split-sequence" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-clblas = { - pname = "cl-clblas"; - version = "20181018-git"; - asds = [ "cl-clblas" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-clblas/2018-10-18/cl-clblas-20181018-git.tgz"; - sha256 = "0cn4hvywaw97ccnj2wxjf20lh7h7n5fs6rq6kgjyfs9cxcixmvrj"; - system = "cl-clblas"; - asd = "cl-clblas"; - }); - systems = [ "cl-clblas" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-clblas-test = { - pname = "cl-clblas-test"; - version = "20181018-git"; - asds = [ "cl-clblas-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-clblas/2018-10-18/cl-clblas-20181018-git.tgz"; - sha256 = "0cn4hvywaw97ccnj2wxjf20lh7h7n5fs6rq6kgjyfs9cxcixmvrj"; - system = "cl-clblas-test"; - asd = "cl-clblas-test"; - }); - systems = [ "cl-clblas-test" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-clblas" pkgs) (getAttr "cl-oclapi" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-cli = { - pname = "cl-cli"; - version = "20151218-git"; - asds = [ "cl-cli" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz"; - sha256 = "0zlifq55r78vfdlqf8jy6rkny73438f1i9cp9a8vybmila5dij3q"; - system = "cl-cli"; - asd = "cl-cli"; - }); - systems = [ "cl-cli" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) ]; - }; - cl-clsparse = { - pname = "cl-clsparse"; - version = "20190813-git"; - asds = [ "cl-clsparse" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-clsparse/2019-08-13/cl-clsparse-20190813-git.tgz"; - sha256 = "0cmmwx2ka1jp5711x21knw3zi6kcpkpcs39dm62w82s97bv794gz"; - system = "cl-clsparse"; - asd = "cl-clsparse"; - }); - systems = [ "cl-clsparse" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) ]; - }; - cl-cognito = { - pname = "cl-cognito"; - version = "20181210-git"; - asds = [ "cl-cognito" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cognito/2018-12-10/cl-cognito-20181210-git.tgz"; - sha256 = "0zy4yg4zggvxwbvkjkd89d2ps236kz6pvz90zn6gzq812wnidsd3"; - system = "cl-cognito"; - asd = "cl-cognito"; - }); - systems = [ "cl-cognito" ]; - lispLibs = [ (getAttr "aws-foundation" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-json-helper" pkgs) (getAttr "ironclad" pkgs) (getAttr "local-time" pkgs) ]; - }; - cl-coinpayments = { - pname = "cl-coinpayments"; - version = "20210807-git"; - asds = [ "cl-coinpayments" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-coinpayments/2021-08-07/cl-coinpayments-20210807-git.tgz"; - sha256 = "1vgsh95vjqqg0a6lqg1ivs36yjx6ck8cqhsmlr5l3ldfd8yr65q7"; - system = "cl-coinpayments"; - asd = "cl-coinpayments"; - }); - systems = [ "cl-coinpayments" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "str" pkgs) (getAttr "closer-mop" pkgs) (getAttr "dexador" pkgs) (getAttr "ironclad" pkgs) (getAttr "jonathan" pkgs) ]; - }; - cl-collider = { - pname = "cl-collider"; - version = "20221106-git"; - asds = [ "cl-collider" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-collider/2022-11-06/cl-collider-20221106-git.tgz"; - sha256 = "03z11hcjvbawkli0bw90h4za7vvpm9pk7rh9gi6m2k7wwq2rsxk5"; - system = "cl-collider"; - asd = "cl-collider"; - }); - systems = [ "cl-collider" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "sc-osc" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "named-readtables" pkgs) (getAttr "pileup" pkgs) (getAttr "simple-inferiors" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-colors = { - pname = "cl-colors"; - version = "20180328-git"; - asds = [ "cl-colors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz"; - sha256 = "0l446lday4hybsm9bq3jli97fvv8jb1d33abg79vbylpwjmf3y9a"; - system = "cl-colors"; - asd = "cl-colors"; - }); - systems = [ "cl-colors" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "let-plus" pkgs) ]; - }; - cl-colors-tests = { - pname = "cl-colors-tests"; - version = "20180328-git"; - asds = [ "cl-colors-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz"; - sha256 = "0l446lday4hybsm9bq3jli97fvv8jb1d33abg79vbylpwjmf3y9a"; - system = "cl-colors-tests"; - asd = "cl-colors"; - }); - systems = [ "cl-colors-tests" ]; - lispLibs = [ (getAttr "cl-colors" pkgs) (getAttr "lift" pkgs) ]; - }; - cl-colors2 = { - pname = "cl-colors2"; - version = "20211020-git"; - asds = [ "cl-colors2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-colors2/2021-10-20/cl-colors2-20211020-git.tgz"; - sha256 = "0cpphlsscr1ks4fmji913xi9k3wcm2ndjb5923yjwx93ld1vfyhr"; - system = "cl-colors2"; - asd = "cl-colors2"; - }); - systems = [ "cl-colors2" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - cl-colors2_slash_tests = { - pname = "cl-colors2_tests"; - version = "20211020-git"; - asds = [ "cl-colors2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-colors2/2021-10-20/cl-colors2-20211020-git.tgz"; - sha256 = "0cpphlsscr1ks4fmji913xi9k3wcm2ndjb5923yjwx93ld1vfyhr"; - system = "cl-colors2"; - asd = "cl-colors2"; - }); - systems = [ "cl-colors2/tests" ]; - lispLibs = [ (getAttr "cl-colors2" pkgs) (getAttr "clunit2" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-conllu = { - pname = "cl-conllu"; - version = "20211209-git"; - asds = [ "cl-conllu" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-conllu/2021-12-09/cl-conllu-20211209-git.tgz"; - sha256 = "0n69k0apifnirs2g3rfdsxiwy6dimd9qqxaqywaingvbd7yn42jn"; - system = "cl-conllu"; - asd = "cl-conllu"; - }); - systems = [ "cl-conllu" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-log" pkgs) (getAttr "cl-markup" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "wilbur" pkgs) (getAttr "lispbuilder-lexer" pkgs) (getAttr "optima_dot_ppcre" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uuid" pkgs) (getAttr "xmls" pkgs) (getAttr "yason" pkgs) ]; - }; - cl-conspack = { - pname = "cl-conspack"; - version = "20170403-git"; - asds = [ "cl-conspack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-conspack/2017-04-03/cl-conspack-20170403-git.tgz"; - sha256 = "0b7qzvsrpvnw12hqhjmz0b02sigj0kdjy55j4k7xzmj8684cs8bx"; - system = "cl-conspack"; - asd = "cl-conspack"; - }); - systems = [ "cl-conspack" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "fast-io" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - cl-conspack-test = { - pname = "cl-conspack-test"; - version = "20170403-git"; - asds = [ "cl-conspack-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-conspack/2017-04-03/cl-conspack-20170403-git.tgz"; - sha256 = "0b7qzvsrpvnw12hqhjmz0b02sigj0kdjy55j4k7xzmj8684cs8bx"; - system = "cl-conspack-test"; - asd = "cl-conspack-test"; - }); - systems = [ "cl-conspack-test" ]; - lispLibs = [ (getAttr "checkl" pkgs) (getAttr "cl-conspack" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-cont = { - pname = "cl-cont"; - version = "20110219-darcs"; - asds = [ "cl-cont" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cont/2011-02-19/cl-cont-20110219-darcs.tgz"; - sha256 = "1zf8zvb0i6jm3hhfks4w74hibm6avgc6f9s1qwgjrn2bcik8lrvz"; - system = "cl-cont"; - asd = "cl-cont"; - }); - systems = [ "cl-cont" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - cl-cont-test = { - pname = "cl-cont-test"; - version = "20110219-darcs"; - asds = [ "cl-cont-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cont/2011-02-19/cl-cont-20110219-darcs.tgz"; - sha256 = "1zf8zvb0i6jm3hhfks4w74hibm6avgc6f9s1qwgjrn2bcik8lrvz"; - system = "cl-cont-test"; - asd = "cl-cont-test"; - }); - systems = [ "cl-cont-test" ]; - lispLibs = [ (getAttr "cl-cont" pkgs) (getAttr "rt" pkgs) ]; - }; - cl-containers = { - pname = "cl-containers"; - version = "20200427-git"; - asds = [ "cl-containers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz"; - sha256 = "18s6jfq11n8nv9k4biz32pm1s7y9zl054ry1gmdbcf39nisy377y"; - system = "cl-containers"; - asd = "cl-containers"; - }); - systems = [ "cl-containers" ]; - lispLibs = [ (getAttr "asdf-system-connections" pkgs) (getAttr "metatilities-base" pkgs) ]; - }; - cl-containers-test = { - pname = "cl-containers-test"; - version = "20200427-git"; - asds = [ "cl-containers-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz"; - sha256 = "18s6jfq11n8nv9k4biz32pm1s7y9zl054ry1gmdbcf39nisy377y"; - system = "cl-containers-test"; - asd = "cl-containers-test"; - }); - systems = [ "cl-containers-test" ]; - lispLibs = [ (getAttr "cl-containers" pkgs) (getAttr "lift" pkgs) ]; - }; - cl-containers_slash_with-moptilities = { - pname = "cl-containers_with-moptilities"; - version = "20200427-git"; - asds = [ "cl-containers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz"; - sha256 = "18s6jfq11n8nv9k4biz32pm1s7y9zl054ry1gmdbcf39nisy377y"; - system = "cl-containers"; - asd = "cl-containers"; - }); - systems = [ "cl-containers/with-moptilities" ]; - lispLibs = [ (getAttr "cl-containers" pkgs) (getAttr "moptilities" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-containers_slash_with-utilities = { - pname = "cl-containers_with-utilities"; - version = "20200427-git"; - asds = [ "cl-containers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz"; - sha256 = "18s6jfq11n8nv9k4biz32pm1s7y9zl054ry1gmdbcf39nisy377y"; - system = "cl-containers"; - asd = "cl-containers"; - }); - systems = [ "cl-containers/with-utilities" ]; - lispLibs = [ (getAttr "cl-containers" pkgs) (getAttr "metatilities-base" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-cookie = { - pname = "cl-cookie"; - version = "20220707-git"; - asds = [ "cl-cookie" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cookie/2022-07-07/cl-cookie-20220707-git.tgz"; - sha256 = "07hqamcdpdxmx2j7prawgl6cdr13b2jbrhrrhfik5n00ah4yw524"; - system = "cl-cookie"; - asd = "cl-cookie"; - }); - systems = [ "cl-cookie" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "local-time" pkgs) (getAttr "proc-parse" pkgs) (getAttr "quri" pkgs) ]; - }; - cl-cookie-test = { - pname = "cl-cookie-test"; - version = "20220707-git"; - asds = [ "cl-cookie-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cookie/2022-07-07/cl-cookie-20220707-git.tgz"; - sha256 = "07hqamcdpdxmx2j7prawgl6cdr13b2jbrhrrhfik5n00ah4yw524"; - system = "cl-cookie-test"; - asd = "cl-cookie-test"; - }); - systems = [ "cl-cookie-test" ]; - lispLibs = [ (getAttr "cl-cookie" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-coroutine = { - pname = "cl-coroutine"; - version = "20160929-git"; - asds = [ "cl-coroutine" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-coroutine/2016-09-29/cl-coroutine-20160929-git.tgz"; - sha256 = "1cqdhdjxffgfs116l1swjlsmcbly0xgcgrckvaajd566idj9yj4l"; - system = "cl-coroutine"; - asd = "cl-coroutine"; - }); - systems = [ "cl-coroutine" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-cont" pkgs) ]; - }; - cl-coroutine-test = { - pname = "cl-coroutine-test"; - version = "20160929-git"; - asds = [ "cl-coroutine-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-coroutine/2016-09-29/cl-coroutine-20160929-git.tgz"; - sha256 = "1cqdhdjxffgfs116l1swjlsmcbly0xgcgrckvaajd566idj9yj4l"; - system = "cl-coroutine-test"; - asd = "cl-coroutine-test"; - }); - systems = [ "cl-coroutine-test" ]; - lispLibs = [ (getAttr "cl-coroutine" pkgs) (getAttr "cl-test-more" pkgs) ]; - }; - cl-coveralls = { - pname = "cl-coveralls"; - version = "20210411-git"; - asds = [ "cl-coveralls" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-coveralls/2021-04-11/cl-coveralls-20210411-git.tgz"; - sha256 = "1n4jks92827xbi2zzy6gsx3r2gl97difl04da9wz94n9rjj3bcz0"; - system = "cl-coveralls"; - asd = "cl-coveralls"; - }); - systems = [ "cl-coveralls" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "dexador" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "ironclad" pkgs) (getAttr "jonathan" pkgs) (getAttr "lquery" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-coveralls-test = { - pname = "cl-coveralls-test"; - version = "20210411-git"; - asds = [ "cl-coveralls-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-coveralls/2021-04-11/cl-coveralls-20210411-git.tgz"; - sha256 = "1n4jks92827xbi2zzy6gsx3r2gl97difl04da9wz94n9rjj3bcz0"; - system = "cl-coveralls-test"; - asd = "cl-coveralls-test"; - }); - systems = [ "cl-coveralls-test" ]; - lispLibs = [ (getAttr "cl-coveralls" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-covid19 = { - pname = "cl-covid19"; - version = "20220331-git"; - asds = [ "cl-covid19" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-covid19/2022-03-31/cl-covid19-20220331-git.tgz"; - sha256 = "0nxdharz29nrdylrwnhgdayfsfwm0vd5g487mi4i5lly8q0i9vl0"; - system = "cl-covid19"; - asd = "cl-covid19"; - }); - systems = [ "cl-covid19" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ascii-table" pkgs) (getAttr "cl-csv" pkgs) (getAttr "cl-migratum" pkgs) (getAttr "cl-migratum_dot_driver_dot_dbi" pkgs) (getAttr "cl-migratum_dot_provider_dot_local-path" pkgs) (getAttr "dexador" pkgs) (getAttr "djula" pkgs) (getAttr "jonathan" pkgs) (getAttr "quri" pkgs) (getAttr "tmpdir" pkgs) ]; - }; - cl-cpu-affinity = { - pname = "cl-cpu-affinity"; - version = "20210411-git"; - asds = [ "cl-cpu-affinity" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; - system = "cl-cpu-affinity"; - asd = "cl-cpu-affinity"; - }); - systems = [ "cl-cpu-affinity" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-cpus = { - pname = "cl-cpus"; - version = "20180430-git"; - asds = [ "cl-cpus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cpus/2018-04-30/cl-cpus-20180430-git.tgz"; - sha256 = "0sdaff9hpsx7bpkkkqavmxmrrlc2d61gmqjjgn8xchncng4a0rf8"; - system = "cl-cpus"; - asd = "cl-cpus"; - }); - systems = [ "cl-cpus" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-cram = { - pname = "cl-cram"; - version = "20220707-git"; - asds = [ "cl-cram" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cram/2022-07-07/cl-cram-20220707-git.tgz"; - sha256 = "1j2a3jw01dyyc8wp4y1rhwafsl7l0sq78r4gh846f57wflcbvxvk"; - system = "cl-cram"; - asd = "cl-cram"; - }); - systems = [ "cl-cram" ]; - lispLibs = [ ]; - }; - cl-crc64 = { - pname = "cl-crc64"; - version = "20140713-git"; - asds = [ "cl-crc64" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-crc64/2014-07-13/cl-crc64-20140713-git.tgz"; - sha256 = "1cqky5ps28r49z6ib4vjwfjpq3ml81p2ayf0nqppf2lc4vf3kb20"; - system = "cl-crc64"; - asd = "cl-crc64"; - }); - systems = [ "cl-crc64" ]; - lispLibs = [ ]; - }; - cl-creditcard = { - pname = "cl-creditcard"; - version = "20150113-git"; - asds = [ "cl-creditcard" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-creditcard/2015-01-13/cl-creditcard-20150113-git.tgz"; - sha256 = "1qq9r7q50k7jw6sv65aqi9xalaw8m6aqsbb0cgpjxv8wdhy934cr"; - system = "cl-creditcard"; - asd = "cl-creditcard"; - }); - systems = [ "cl-creditcard" ]; - lispLibs = [ (getAttr "iterate" pkgs) ]; - }; - cl-cron = { - pname = "cl-cron"; - version = "20221106-git"; - asds = [ "cl-cron" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cron/2022-11-06/cl-cron-20221106-git.tgz"; - sha256 = "1yl7ajy8b2mf5i9f8x3458s4y00rkkpy70xbzz3fi08l9rp2sp3z"; - system = "cl-cron"; - asd = "cl-cron"; - }); - systems = [ "cl-cron" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - cl-css = { - pname = "cl-css"; - version = "20140914-git"; - asds = [ "cl-css" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz"; - sha256 = "1lc42zi2sw11fl2589sc19nr5sd2p0wy7wgvgwaggxa5f3ajhsmd"; - system = "cl-css"; - asd = "cl-css"; - }); - systems = [ "cl-css" ]; - lispLibs = [ ]; - }; - cl-csv = { - pname = "cl-csv"; - version = "20201016-git"; - asds = [ "cl-csv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz"; - sha256 = "0gcmlbwx5m3kwgk12qi80w08ak8fgdnvyia429fz6gnxmhg0k54x"; - system = "cl-csv"; - asd = "cl-csv"; - }); - systems = [ "cl-csv" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-csv-clsql = { - pname = "cl-csv-clsql"; - version = "20201016-git"; - asds = [ "cl-csv-clsql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz"; - sha256 = "0gcmlbwx5m3kwgk12qi80w08ak8fgdnvyia429fz6gnxmhg0k54x"; - system = "cl-csv-clsql"; - asd = "cl-csv-clsql"; - }); - systems = [ "cl-csv-clsql" ]; - lispLibs = [ (getAttr "cl-csv" pkgs) (getAttr "clsql-helper" pkgs) (getAttr "data-table-clsql" pkgs) ]; - }; - cl-csv-data-table = { - pname = "cl-csv-data-table"; - version = "20201016-git"; - asds = [ "cl-csv-data-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz"; - sha256 = "0gcmlbwx5m3kwgk12qi80w08ak8fgdnvyia429fz6gnxmhg0k54x"; - system = "cl-csv-data-table"; - asd = "cl-csv-data-table"; - }); - systems = [ "cl-csv-data-table" ]; - lispLibs = [ (getAttr "cl-csv" pkgs) (getAttr "data-table" pkgs) ]; - }; - cl-csv_slash_speed-test = { - pname = "cl-csv_speed-test"; - version = "20201016-git"; - asds = [ "cl-csv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz"; - sha256 = "0gcmlbwx5m3kwgk12qi80w08ak8fgdnvyia429fz6gnxmhg0k54x"; - system = "cl-csv"; - asd = "cl-csv"; - }); - systems = [ "cl-csv/speed-test" ]; - lispLibs = [ (getAttr "cl-csv" pkgs) (getAttr "lisp-unit2" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-csv_slash_test = { - pname = "cl-csv_test"; - version = "20201016-git"; - asds = [ "cl-csv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz"; - sha256 = "0gcmlbwx5m3kwgk12qi80w08ak8fgdnvyia429fz6gnxmhg0k54x"; - system = "cl-csv"; - asd = "cl-csv"; - }); - systems = [ "cl-csv/test" ]; - lispLibs = [ (getAttr "cl-csv" pkgs) (getAttr "lisp-unit2" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-cuda = { - pname = "cl-cuda"; - version = "20210807-git"; - asds = [ "cl-cuda" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; - sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg"; - system = "cl-cuda"; - asd = "cl-cuda"; - }); - systems = [ "cl-cuda" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-pattern" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-reexport" pkgs) (getAttr "external-program" pkgs) (getAttr "osicat" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-cuda-examples = { - pname = "cl-cuda-examples"; - version = "20210807-git"; - asds = [ "cl-cuda-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; - sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg"; - system = "cl-cuda-examples"; - asd = "cl-cuda-examples"; - }); - systems = [ "cl-cuda-examples" ]; - lispLibs = [ (getAttr "cl-cuda" pkgs) (getAttr "imago" pkgs) ]; - }; - cl-cuda-interop = { - pname = "cl-cuda-interop"; - version = "20210807-git"; - asds = [ "cl-cuda-interop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; - sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg"; - system = "cl-cuda-interop"; - asd = "cl-cuda-interop"; - }); - systems = [ "cl-cuda-interop" ]; - lispLibs = [ (getAttr "cl-cuda" pkgs) (getAttr "cl-glu" pkgs) (getAttr "cl-glut" pkgs) (getAttr "cl-opengl" pkgs) ]; - }; - cl-cuda-interop-examples = { - pname = "cl-cuda-interop-examples"; - version = "20210807-git"; - asds = [ "cl-cuda-interop-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; - sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg"; - system = "cl-cuda-interop-examples"; - asd = "cl-cuda-interop-examples"; - }); - systems = [ "cl-cuda-interop-examples" ]; - lispLibs = [ (getAttr "cl-cuda-interop" pkgs) ]; - }; - cl-cuda-misc = { - pname = "cl-cuda-misc"; - version = "20210807-git"; - asds = [ "cl-cuda-misc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; - sha256 = "019m2khbiadm0yxfhbbfsidnmxq9spn3hn8r6vx4cw3i22jin0hg"; - system = "cl-cuda-misc"; - asd = "cl-cuda-misc"; - }); - systems = [ "cl-cuda-misc" ]; - lispLibs = [ (getAttr "cl-emb" pkgs) (getAttr "local-time" pkgs) ]; - }; - cl-custom-hash-table = { - pname = "cl-custom-hash-table"; - version = "20201220-git"; - asds = [ "cl-custom-hash-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-custom-hash-table/2020-12-20/cl-custom-hash-table-20201220-git.tgz"; - sha256 = "1lyp3lhqq3p2n04agaar5v50ai3vd6zvi6yq4phw3fcl2jzdjhk3"; - system = "cl-custom-hash-table"; - asd = "cl-custom-hash-table"; - }); - systems = [ "cl-custom-hash-table" ]; - lispLibs = [ ]; - }; - cl-custom-hash-table-test = { - pname = "cl-custom-hash-table-test"; - version = "20201220-git"; - asds = [ "cl-custom-hash-table-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-custom-hash-table/2020-12-20/cl-custom-hash-table-20201220-git.tgz"; - sha256 = "1lyp3lhqq3p2n04agaar5v50ai3vd6zvi6yq4phw3fcl2jzdjhk3"; - system = "cl-custom-hash-table-test"; - asd = "cl-custom-hash-table-test"; - }); - systems = [ "cl-custom-hash-table-test" ]; - lispLibs = [ (getAttr "cl-custom-hash-table" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - }; - cl-darksky = { - pname = "cl-darksky"; - version = "20180711-git"; - asds = [ "cl-darksky" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-darksky/2018-07-11/cl-darksky-20180711-git.tgz"; - sha256 = "049rziv10z0ygvm0fi98jlxdd5xcqf9gp6ah7jwn9bcxwg5y0wcf"; - system = "cl-darksky"; - asd = "cl-darksky"; - }); - systems = [ "cl-darksky" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "dexador" pkgs) (getAttr "jonathan" pkgs) ]; - }; - cl-darksky-test = { - pname = "cl-darksky-test"; - version = "20180711-git"; - asds = [ "cl-darksky-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-darksky/2018-07-11/cl-darksky-20180711-git.tgz"; - sha256 = "049rziv10z0ygvm0fi98jlxdd5xcqf9gp6ah7jwn9bcxwg5y0wcf"; - system = "cl-darksky-test"; - asd = "cl-darksky-test"; - }); - systems = [ "cl-darksky-test" ]; - lispLibs = [ (getAttr "cl-darksky" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-data-frame = { - pname = "cl-data-frame"; - version = "20210531-git"; - asds = [ "cl-data-frame" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-data-frame/2021-05-31/cl-data-frame-20210531-git.tgz"; - sha256 = "04x5xqf7kyvpm1qdmklp3hgpifl86nw5rjr0qd7r5d4lz6vh9da9"; - system = "cl-data-frame"; - asd = "cl-data-frame"; - }); - systems = [ "cl-data-frame" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "array-operations" pkgs) (getAttr "cl-num-utils" pkgs) (getAttr "cl-slice" pkgs) (getAttr "let-plus" pkgs) ]; - }; - cl-data-frame-tests = { - pname = "cl-data-frame-tests"; - version = "20210531-git"; - asds = [ "cl-data-frame-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-data-frame/2021-05-31/cl-data-frame-20210531-git.tgz"; - sha256 = "04x5xqf7kyvpm1qdmklp3hgpifl86nw5rjr0qd7r5d4lz6vh9da9"; - system = "cl-data-frame-tests"; - asd = "cl-data-frame"; - }); - systems = [ "cl-data-frame-tests" ]; - lispLibs = [ (getAttr "cl-data-frame" pkgs) (getAttr "clunit" pkgs) ]; - }; - cl-data-structures = { - pname = "cl-data-structures"; - version = "20221106-git"; - asds = [ "cl-data-structures" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-data-structures/2022-11-06/cl-data-structures-20221106-git.tgz"; - sha256 = "04m537pdkjcpr1fhkmdvn0bh77ilwqa2sf43s6gv52s63drfws3l"; - system = "cl-data-structures"; - asd = "cl-data-structures"; - }); - systems = [ "cl-data-structures" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "documentation-utils-extensions" pkgs) (getAttr "flexichain" pkgs) (getAttr "iterate" pkgs) (getAttr "lparallel" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "more-conditions" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-data-structures-tests = { - pname = "cl-data-structures-tests"; - version = "20221106-git"; - asds = [ "cl-data-structures-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-data-structures/2022-11-06/cl-data-structures-20221106-git.tgz"; - sha256 = "04m537pdkjcpr1fhkmdvn0bh77ilwqa2sf43s6gv52s63drfws3l"; - system = "cl-data-structures-tests"; - asd = "cl-data-structures-tests"; - }); - systems = [ "cl-data-structures-tests" ]; - lispLibs = [ (getAttr "cl-data-structures" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-date-time-parser = { - pname = "cl-date-time-parser"; - version = "20140713-git"; - asds = [ "cl-date-time-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-date-time-parser/2014-07-13/cl-date-time-parser-20140713-git.tgz"; - sha256 = "0dswpbbb57jm609xxfah25dxxhjzc7qh5lr1a1ffkpms84l0r7m5"; - system = "cl-date-time-parser"; - asd = "cl-date-time-parser"; - }); - systems = [ "cl-date-time-parser" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "local-time" pkgs) (getAttr "parse-float" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-dbi = { - pname = "cl-dbi"; - version = "20211020-git"; - asds = [ "cl-dbi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz"; - sha256 = "0f8z7an8ssg8mdf9k781r4ygdppv798v6f08ibgpd8mv8a6491fg"; - system = "cl-dbi"; - asd = "cl-dbi"; - }); - systems = [ "cl-dbi" ]; - lispLibs = [ (getAttr "dbi" pkgs) ]; - }; - cl-debug-print = { - pname = "cl-debug-print"; - version = "20210807-git"; - asds = [ "cl-debug-print" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz"; - sha256 = "1cm5nybmv0pq9s4lrwhd01rjj1wlcj1sjcrcakabi7w7b5zw4cyh"; - system = "cl-debug-print"; - asd = "cl-debug-print"; - }); - systems = [ "cl-debug-print" ]; - lispLibs = [ (getAttr "cl-syntax" pkgs) ]; - }; - cl-debug-print-test = { - pname = "cl-debug-print-test"; - version = "20210807-git"; - asds = [ "cl-debug-print-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz"; - sha256 = "1cm5nybmv0pq9s4lrwhd01rjj1wlcj1sjcrcakabi7w7b5zw4cyh"; - system = "cl-debug-print-test"; - asd = "cl-debug-print-test"; - }); - systems = [ "cl-debug-print-test" ]; - lispLibs = [ (getAttr "cl-debug-print" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-dejavu = { - pname = "cl-dejavu"; - version = "20210124-git"; - asds = [ "cl-dejavu" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dejavu/2021-01-24/cl-dejavu-20210124-git.tgz"; - sha256 = "1lbxiq21bxj8r11c58cqskgn8gnl2p8q1ydkhdsv7i7xnhv2y7r0"; - system = "cl-dejavu"; - asd = "cl-dejavu"; - }); - systems = [ "cl-dejavu" ]; - lispLibs = [ ]; - }; - cl-devil = { - pname = "cl-devil"; - version = "20150302-git"; - asds = [ "cl-devil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz"; - sha256 = "1qdjb7xwzjkv99s8q0834lfdq4ch5j2ymrmqsvwzhg47ys17pvvf"; - system = "cl-devil"; - asd = "cl-devil"; - }); - systems = [ "cl-devil" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) ]; - }; - cl-diceware = { - pname = "cl-diceware"; - version = "20150923-git"; - asds = [ "cl-diceware" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-diceware/2015-09-23/cl-diceware-20150923-git.tgz"; - sha256 = "0560ji51ksp8kngn2pyi41vw9zlnwiqj64ici43lzjx0qgv5v84l"; - system = "cl-diceware"; - asd = "cl-diceware"; - }); - systems = [ "cl-diceware" ]; - lispLibs = [ ]; - }; - cl-difflib = { - pname = "cl-difflib"; - version = "20130128-git"; - asds = [ "cl-difflib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz"; - sha256 = "08if0abhqg191xcz9s7xv8faqq51nswzp8hw423fkqjzr24pmq48"; - system = "cl-difflib"; - asd = "cl-difflib"; - }); - systems = [ "cl-difflib" ]; - lispLibs = [ ]; - }; - cl-difflib-tests = { - pname = "cl-difflib-tests"; - version = "20130128-git"; - asds = [ "cl-difflib-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz"; - sha256 = "08if0abhqg191xcz9s7xv8faqq51nswzp8hw423fkqjzr24pmq48"; - system = "cl-difflib-tests"; - asd = "cl-difflib-tests"; - }); - systems = [ "cl-difflib-tests" ]; - lispLibs = [ (getAttr "cl-difflib" pkgs) ]; - }; - cl-digraph = { - pname = "cl-digraph"; - version = "20211020-hg"; - asds = [ "cl-digraph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-digraph/2021-10-20/cl-digraph-20211020-hg.tgz"; - sha256 = "1xzfrk86bp5k1d2kh4npnhmm8v4jy9dh0g0d2qcbz3n43j606zdp"; - system = "cl-digraph"; - asd = "cl-digraph"; - }); - systems = [ "cl-digraph" ]; - lispLibs = [ ]; - }; - cl-digraph_dot_dot = { - pname = "cl-digraph.dot"; - version = "20211020-hg"; - asds = [ "cl-digraph.dot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-digraph/2021-10-20/cl-digraph-20211020-hg.tgz"; - sha256 = "1xzfrk86bp5k1d2kh4npnhmm8v4jy9dh0g0d2qcbz3n43j606zdp"; - system = "cl-digraph.dot"; - asd = "cl-digraph.dot"; - }); - systems = [ "cl-digraph.dot" ]; - lispLibs = [ (getAttr "cl-digraph" pkgs) (getAttr "cl-dot" pkgs) ]; - }; - cl-digraph_dot_test = { - pname = "cl-digraph.test"; - version = "20211020-hg"; - asds = [ "cl-digraph.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-digraph/2021-10-20/cl-digraph-20211020-hg.tgz"; - sha256 = "1xzfrk86bp5k1d2kh4npnhmm8v4jy9dh0g0d2qcbz3n43j606zdp"; - system = "cl-digraph.test"; - asd = "cl-digraph.test"; - }); - systems = [ "cl-digraph.test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "alexandria" pkgs) (getAttr "cl-digraph" pkgs) ]; - }; - cl-diskspace = { - pname = "cl-diskspace"; - version = "20220331-git"; - asds = [ "cl-diskspace" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-diskspace/2022-03-31/cl-diskspace-20220331-git.tgz"; - sha256 = "0l19hxqw6b8i5i1jdbr45k1xib9axcwdagsp3y8wkb35g6wwc0s7"; - system = "cl-diskspace"; - asd = "cl-diskspace"; - }); - systems = [ "cl-diskspace" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-disque = { - pname = "cl-disque"; - version = "20171227-git"; - asds = [ "cl-disque" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-disque/2017-12-27/cl-disque-20171227-git.tgz"; - sha256 = "0z26ls9vzlq43fwn307nb7xvqck5h3l9yygf93b0filki83krg3s"; - system = "cl-disque"; - asd = "cl-disque"; - }); - systems = [ "cl-disque" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "rutils" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-disque-test = { - pname = "cl-disque-test"; - version = "20171227-git"; - asds = [ "cl-disque-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-disque/2017-12-27/cl-disque-20171227-git.tgz"; - sha256 = "0z26ls9vzlq43fwn307nb7xvqck5h3l9yygf93b0filki83krg3s"; - system = "cl-disque-test"; - asd = "cl-disque-test"; - }); - systems = [ "cl-disque-test" ]; - lispLibs = [ (getAttr "cl-disque" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-djula-svg = { - pname = "cl-djula-svg"; - version = "20221106-git"; - asds = [ "cl-djula-svg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-djula-svg/2022-11-06/cl-djula-svg-20221106-git.tgz"; - sha256 = "1jxgngr51ars234by4vnczfqmkwi2iy94sdxnj3pkjrdximy5any"; - system = "cl-djula-svg"; - asd = "cl-djula-svg"; - }); - systems = [ "cl-djula-svg" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "xmls" pkgs) ]; - }; - cl-djula-svg_slash_tests = { - pname = "cl-djula-svg_tests"; - version = "20221106-git"; - asds = [ "cl-djula-svg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-djula-svg/2022-11-06/cl-djula-svg-20221106-git.tgz"; - sha256 = "1jxgngr51ars234by4vnczfqmkwi2iy94sdxnj3pkjrdximy5any"; - system = "cl-djula-svg"; - asd = "cl-djula-svg"; - }); - systems = [ "cl-djula-svg/tests" ]; - lispLibs = [ (getAttr "cl-djula-svg" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-djula-tailwind = { - pname = "cl-djula-tailwind"; - version = "20221106-git"; - asds = [ "cl-djula-tailwind" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-djula-tailwind/2022-11-06/cl-djula-tailwind-20221106-git.tgz"; - sha256 = "059mfgh53gpj74rgr7b61fnm24bwx8hdrw15mjk687y9sna3avda"; - system = "cl-djula-tailwind"; - asd = "cl-djula-tailwind"; - }); - systems = [ "cl-djula-tailwind" ]; - lispLibs = [ (getAttr "cl-css" pkgs) (getAttr "cl-minify-css" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "djula" pkgs) ]; - }; - cl-djula-tailwind_slash_tests = { - pname = "cl-djula-tailwind_tests"; - version = "20221106-git"; - asds = [ "cl-djula-tailwind" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-djula-tailwind/2022-11-06/cl-djula-tailwind-20221106-git.tgz"; - sha256 = "059mfgh53gpj74rgr7b61fnm24bwx8hdrw15mjk687y9sna3avda"; - system = "cl-djula-tailwind"; - asd = "cl-djula-tailwind"; - }); - systems = [ "cl-djula-tailwind/tests" ]; - lispLibs = [ (getAttr "cl-djula-tailwind" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-dot = { - pname = "cl-dot"; - version = "20220707-git"; - asds = [ "cl-dot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dot/2022-07-07/cl-dot-20220707-git.tgz"; - sha256 = "0mcvzqfcg5rzr8rz8aa2yr2jl3ifflaksvps08zj71hbhiacqpxa"; - system = "cl-dot"; - asd = "cl-dot"; - }); - systems = [ "cl-dot" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - cl-dotenv = { - pname = "cl-dotenv"; - version = "20181018-git"; - asds = [ "cl-dotenv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dotenv/2018-10-18/cl-dotenv-20181018-git.tgz"; - sha256 = "0cdbk886aizsnqqs3z4jfn8nyrnxj4yb3y00av49xc4h83h6xn53"; - system = "cl-dotenv"; - asd = "cl-dotenv"; - }); - systems = [ "cl-dotenv" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "serapeum" pkgs) ]; - }; - cl-dotenv-test = { - pname = "cl-dotenv-test"; - version = "20181018-git"; - asds = [ "cl-dotenv-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dotenv/2018-10-18/cl-dotenv-20181018-git.tgz"; - sha256 = "0cdbk886aizsnqqs3z4jfn8nyrnxj4yb3y00av49xc4h83h6xn53"; - system = "cl-dotenv-test"; - asd = "cl-dotenv-test"; - }); - systems = [ "cl-dotenv-test" ]; - lispLibs = [ (getAttr "cl-dotenv" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-drawille = { - pname = "cl-drawille"; - version = "20210807-git"; - asds = [ "cl-drawille" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-drawille/2021-08-07/cl-drawille-20210807-git.tgz"; - sha256 = "0wmiz0c7h2zsfj7inzzn8jivnfsc94rq8pczfi44h36n2jg6hdys"; - system = "cl-drawille"; - asd = "cl-drawille"; - }); - systems = [ "cl-drawille" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "osicat" pkgs) ]; - }; - cl-drawille_slash_examples = { - pname = "cl-drawille_examples"; - version = "20210807-git"; - asds = [ "cl-drawille" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-drawille/2021-08-07/cl-drawille-20210807-git.tgz"; - sha256 = "0wmiz0c7h2zsfj7inzzn8jivnfsc94rq8pczfi44h36n2jg6hdys"; - system = "cl-drawille"; - asd = "cl-drawille"; - }); - systems = [ "cl-drawille/examples" ]; - lispLibs = [ (getAttr "cl-drawille" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-drawille_slash_examples-animations = { - pname = "cl-drawille_examples-animations"; - version = "20210807-git"; - asds = [ "cl-drawille" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-drawille/2021-08-07/cl-drawille-20210807-git.tgz"; - sha256 = "0wmiz0c7h2zsfj7inzzn8jivnfsc94rq8pczfi44h36n2jg6hdys"; - system = "cl-drawille"; - asd = "cl-drawille"; - }); - systems = [ "cl-drawille/examples-animations" ]; - lispLibs = [ (getAttr "cl-charms" pkgs) (getAttr "cl-drawille" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-drm = { - pname = "cl-drm"; - version = "20161204-git"; - asds = [ "cl-drm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-drm/2016-12-04/cl-drm-20161204-git.tgz"; - sha256 = "018jsdi9hs71x14mq18k08hwrgdvvbc2yqbqww6gara0bg9cl3l6"; - system = "cl-drm"; - asd = "cl-drm"; - }); - systems = [ "cl-drm" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-dropbox = { - pname = "cl-dropbox"; - version = "20150608-git"; - asds = [ "cl-dropbox" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dropbox/2015-06-08/cl-dropbox-20150608-git.tgz"; - sha256 = "09giwr1wlz42flrpy71gv60p53nixjk9jaj4lirgf59dkh718f9x"; - system = "cl-dropbox"; - asd = "cl-dropbox"; - }); - systems = [ "cl-dropbox" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "cl-oauth" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) ]; - }; - cl-dsl = { - pname = "cl-dsl"; - version = "20130720-git"; - asds = [ "cl-dsl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dsl/2013-07-20/cl-dsl-20130720-git.tgz"; - sha256 = "1bj5yp20r8z6gi6rpf88kpy4i06c8i2d3cg5sjlq7d1ninkb4gg4"; - system = "cl-dsl"; - asd = "cl-dsl"; - }); - systems = [ "cl-dsl" ]; - lispLibs = [ ]; - }; - cl-dsl-tests = { - pname = "cl-dsl-tests"; - version = "20130720-git"; - asds = [ "cl-dsl-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dsl/2013-07-20/cl-dsl-20130720-git.tgz"; - sha256 = "1bj5yp20r8z6gi6rpf88kpy4i06c8i2d3cg5sjlq7d1ninkb4gg4"; - system = "cl-dsl-tests"; - asd = "cl-dsl"; - }); - systems = [ "cl-dsl-tests" ]; - lispLibs = [ (getAttr "cl-dsl" pkgs) (getAttr "eos" pkgs) ]; - }; - cl-durian = { - pname = "cl-durian"; - version = "20150608-git"; - asds = [ "cl-durian" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-durian/2015-06-08/cl-durian-20150608-git.tgz"; - sha256 = "0s89gr5gwwkyirrv7l5fzk9ws7fhy087c3myksblsh00z1xcrvng"; - system = "cl-durian"; - asd = "cl-durian"; - }); - systems = [ "cl-durian" ]; - lispLibs = [ ]; - }; - cl-earley-parser = { - pname = "cl-earley-parser"; - version = "20211020-git"; - asds = [ "cl-earley-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-earley-parser/2021-10-20/cl-earley-parser-20211020-git.tgz"; - sha256 = "1pkry3ynxn2y3nf13lc3zjqgf4hx43d9zb0w0m34s51xd4xp2h1x"; - system = "cl-earley-parser"; - asd = "cl-earley-parser"; - }); - systems = [ "cl-earley-parser" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) ]; - }; - cl-ecma-48 = { - pname = "cl-ecma-48"; - version = "20200218-http"; - asds = [ "cl-ecma-48" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ecma-48/2020-02-18/cl-ecma-48-20200218-http.tgz"; - sha256 = "1y3srzahci25qp959b87m82d1i1i8jmq039yp9nf0hifxyhw6dgy"; - system = "cl-ecma-48"; - asd = "cl-ecma-48"; - }); - systems = [ "cl-ecma-48" ]; - lispLibs = [ ]; - }; - cl-egl = { - pname = "cl-egl"; - version = "20190521-git"; - asds = [ "cl-egl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-egl/2019-05-21/cl-egl-20190521-git.tgz"; - sha256 = "19shhzmdc9f1128slc9m4ns6zraka99awqgb4dkrwzgv7w3miqfl"; - system = "cl-egl"; - asd = "cl-egl"; - }); - systems = [ "cl-egl" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-elastic = { - pname = "cl-elastic"; - version = "20200218-git"; - asds = [ "cl-elastic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-elastic/2020-02-18/cl-elastic-20200218-git.tgz"; - sha256 = "107ha226n3mxzvm0cp8kvgybcv4rr0b4lwik4f4j7lrhz6xvnncq"; - system = "cl-elastic"; - asd = "cl-elastic"; - }); - systems = [ "cl-elastic" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "named-readtables" pkgs) (getAttr "yason" pkgs) ]; - }; - cl-elastic-test = { - pname = "cl-elastic-test"; - version = "20200218-git"; - asds = [ "cl-elastic-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-elastic/2020-02-18/cl-elastic-20200218-git.tgz"; - sha256 = "107ha226n3mxzvm0cp8kvgybcv4rr0b4lwik4f4j7lrhz6xvnncq"; - system = "cl-elastic-test"; - asd = "cl-elastic-test"; - }); - systems = [ "cl-elastic-test" ]; - lispLibs = [ (getAttr "cl-elastic" pkgs) (getAttr "named-readtables" pkgs) (getAttr "parachute" pkgs) ]; - }; - cl-emacs-if = { - pname = "cl-emacs-if"; - version = "20120305-git"; - asds = [ "cl-emacs-if" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-emacs-if/2012-03-05/cl-emacs-if-20120305-git.tgz"; - sha256 = "0br3jvihq24ymqjn2r2qnl3l099r329bsqh18nmkk3yw3kclrcfv"; - system = "cl-emacs-if"; - asd = "cl-emacs-if"; - }); - systems = [ "cl-emacs-if" ]; - lispLibs = [ ]; - }; - cl-emb = { - pname = "cl-emb"; - version = "20190521-git"; - asds = [ "cl-emb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz"; - sha256 = "1xcm31n7afh5316lwz8iqbjx7kn5lw0l11arg8mhdmkx42aj4gkk"; - system = "cl-emb"; - asd = "cl-emb"; - }); - systems = [ "cl-emb" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - cl-emoji = { - pname = "cl-emoji"; - version = "20200218-git"; - asds = [ "cl-emoji" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-emoji/2020-02-18/cl-emoji-20200218-git.tgz"; - sha256 = "1v91kzx42qyjm936frvfsr0cgnj9g197x78xlda6x7x6xri2r9gm"; - system = "cl-emoji"; - asd = "cl-emoji"; - }); - systems = [ "cl-emoji" ]; - lispLibs = [ ]; - }; - cl-emoji-test = { - pname = "cl-emoji-test"; - version = "20200218-git"; - asds = [ "cl-emoji-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-emoji/2020-02-18/cl-emoji-20200218-git.tgz"; - sha256 = "1v91kzx42qyjm936frvfsr0cgnj9g197x78xlda6x7x6xri2r9gm"; - system = "cl-emoji-test"; - asd = "cl-emoji-test"; - }); - systems = [ "cl-emoji-test" ]; - lispLibs = [ (getAttr "cl-emoji" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-env = { - pname = "cl-env"; - version = "20180430-git"; - asds = [ "cl-env" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-env/2018-04-30/cl-env-20180430-git.tgz"; - sha256 = "1r0d004gr1za9ib53jhxkx315wd4av0ar2063dcvs9g4nahk2d07"; - system = "cl-env"; - asd = "cl-env"; - }); - systems = [ "cl-env" ]; - lispLibs = [ ]; - }; - cl-env_slash_test = { - pname = "cl-env_test"; - version = "20180430-git"; - asds = [ "cl-env" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-env/2018-04-30/cl-env-20180430-git.tgz"; - sha256 = "1r0d004gr1za9ib53jhxkx315wd4av0ar2063dcvs9g4nahk2d07"; - system = "cl-env"; - asd = "cl-env"; - }); - systems = [ "cl-env/test" ]; - lispLibs = [ (getAttr "cl-env" pkgs) (getAttr "lisp-unit" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-environments = { - pname = "cl-environments"; - version = "20211020-git"; - asds = [ "cl-environments" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-environments/2021-10-20/cl-environments-20211020-git.tgz"; - sha256 = "0k3f1sldd6nwphz80vc4k28z9g56rylln4admag628cyswx4qz99"; - system = "cl-environments"; - asd = "cl-environments"; - }); - systems = [ "cl-environments" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "collectors" pkgs) (getAttr "optima" pkgs) (getAttr "parse-declarations-1_dot_0" pkgs) ]; - }; - cl-environments_slash_test = { - pname = "cl-environments_test"; - version = "20211020-git"; - asds = [ "cl-environments" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-environments/2021-10-20/cl-environments-20211020-git.tgz"; - sha256 = "0k3f1sldd6nwphz80vc4k28z9g56rylln4admag628cyswx4qz99"; - system = "cl-environments"; - asd = "cl-environments"; - }); - systems = [ "cl-environments/test" ]; - lispLibs = [ (getAttr "cl-environments" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-epoch = { - pname = "cl-epoch"; - version = "20181210-git"; - asds = [ "cl-epoch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-epoch/2018-12-10/cl-epoch-20181210-git.tgz"; - sha256 = "091p6j5l85afzcm3m9myxzr8j3hiwh0iyj8w0sgld85n2ykbbird"; - system = "cl-epoch"; - asd = "cl-epoch"; - }); - systems = [ "cl-epoch" ]; - lispLibs = [ ]; - }; - cl-etcd = { - pname = "cl-etcd"; - version = "20220707-git"; - asds = [ "cl-etcd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-etcd/2022-07-07/cl-etcd-20220707-git.tgz"; - sha256 = "0g4lkmzddg5hbdxc407w5y7z71p1swrifih9hf3g9jx3hbj3ci37"; - system = "cl-etcd"; - asd = "cl-etcd"; - }); - systems = [ "cl-etcd" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "async-process" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "str" pkgs) (getAttr "drakma" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-events = { - pname = "cl-events"; - version = "20160318-git"; - asds = [ "cl-events" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-events/2016-03-18/cl-events-20160318-git.tgz"; - sha256 = "1r847q1bwblnb2395dsydylr9nxgjx7gdwc9dx1051zhvi9in36g"; - system = "cl-events"; - asd = "cl-events"; - }); - systems = [ "cl-events" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "blackbird" pkgs) (getAttr "iterate" pkgs) (getAttr "log4cl" pkgs) (getAttr "lparallel" pkgs) ]; - }; - cl-events_dot_test = { - pname = "cl-events.test"; - version = "20160318-git"; - asds = [ "cl-events.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-events/2016-03-18/cl-events-20160318-git.tgz"; - sha256 = "1r847q1bwblnb2395dsydylr9nxgjx7gdwc9dx1051zhvi9in36g"; - system = "cl-events.test"; - asd = "cl-events.test"; - }); - systems = [ "cl-events.test" ]; - lispLibs = [ (getAttr "cl-events" pkgs) (getAttr "log4cl" pkgs) (getAttr "mw-equiv" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-ewkb = { - pname = "cl-ewkb"; - version = "20110619-git"; - asds = [ "cl-ewkb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ewkb/2011-06-19/cl-ewkb-20110619-git.tgz"; - sha256 = "1mk5j34m9gkwl7c4d464l42gclxlrcpifp2nq41z3fsfl8badn6w"; - system = "cl-ewkb"; - asd = "cl-ewkb"; - }); - systems = [ "cl-ewkb" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "ieee-floats" pkgs) ]; - }; - cl-ewkb-tests = { - pname = "cl-ewkb-tests"; - version = "20110619-git"; - asds = [ "cl-ewkb-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ewkb/2011-06-19/cl-ewkb-20110619-git.tgz"; - sha256 = "1mk5j34m9gkwl7c4d464l42gclxlrcpifp2nq41z3fsfl8badn6w"; - system = "cl-ewkb-tests"; - asd = "cl-ewkb"; - }); - systems = [ "cl-ewkb-tests" ]; - lispLibs = [ (getAttr "cl-ewkb" pkgs) (getAttr "postmodern" pkgs) ]; - }; - cl-factoring = { - pname = "cl-factoring"; - version = "20221106-git"; - asds = [ "cl-factoring" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-factoring/2022-11-06/cl-factoring-20221106-git.tgz"; - sha256 = "0vn3kb8mmi93pr76lx1mbwp7qc2krzb0ayzcrffwq2aw2q201fhd"; - system = "cl-factoring"; - asd = "cl-factoring"; - }); - systems = [ "cl-factoring" ]; - lispLibs = [ (getAttr "cl-primality" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-fad = { - pname = "cl-fad"; - version = "20220220-git"; - asds = [ "cl-fad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fad/2022-02-20/cl-fad-20220220-git.tgz"; - sha256 = "0a1xqldrq170lflnns3xp6swpnvsvllf5vq0h7sz8jqh4riqlny6"; - system = "cl-fad"; - asd = "cl-fad"; - }); - systems = [ "cl-fad" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) ]; - }; - cl-fad_slash_test = { - pname = "cl-fad_test"; - version = "20220220-git"; - asds = [ "cl-fad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fad/2022-02-20/cl-fad-20220220-git.tgz"; - sha256 = "0a1xqldrq170lflnns3xp6swpnvsvllf5vq0h7sz8jqh4riqlny6"; - system = "cl-fad"; - asd = "cl-fad"; - }); - systems = [ "cl-fad/test" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "unit-test" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-fam = { - pname = "cl-fam"; - version = "20121125-git"; - asds = [ "cl-fam" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fam/2012-11-25/cl-fam-20121125-git.tgz"; - sha256 = "1imv87imhxvigghx3l28kbsldz6hpqd32280wjwffqwvadhx0gng"; - system = "cl-fam"; - asd = "cl-fam"; - }); - systems = [ "cl-fam" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-fastcgi = { - pname = "cl-fastcgi"; - version = "20210124-git"; - asds = [ "cl-fastcgi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fastcgi/2021-01-24/cl-fastcgi-20210124-git.tgz"; - sha256 = "0xgmhx766q4nmrvn5z7ag3ikpr9phlh8ypi8b14azshq9lqbq0m7"; - system = "cl-fastcgi"; - asd = "cl-fastcgi"; - }); - systems = [ "cl-fastcgi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-fbclient = { - pname = "cl-fbclient"; - version = "20140113-git"; - asds = [ "cl-fbclient" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fbclient/2014-01-13/cl-fbclient-20140113-git.tgz"; - sha256 = "1q2dwizrjnal3fdcdgim4kdq0dma71p3s8w6i8bjkg4fs49k5p9j"; - system = "cl-fbclient"; - asd = "cl-fbclient"; - }); - systems = [ "cl-fbclient" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-feedparser = { - pname = "cl-feedparser"; - version = "20211020-git"; - asds = [ "cl-feedparser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-feedparser/2021-10-20/cl-feedparser-20211020-git.tgz"; - sha256 = "1g84w89c04d1r734bmrrmy0kazm8d5di85434byf319dq8zma29v"; - system = "cl-feedparser"; - asd = "cl-feedparser"; - }); - systems = [ "cl-feedparser" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "asdf-package-system" pkgs) (getAttr "cl-html5-parser" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "fset" pkgs) (getAttr "fxml" pkgs) (getAttr "local-time" pkgs) (getAttr "net-telent-date" pkgs) (getAttr "plump" pkgs) (getAttr "quri" pkgs) (getAttr "serapeum" pkgs) ]; - }; - cl-feedparser-tests = { - pname = "cl-feedparser-tests"; - version = "20211020-git"; - asds = [ "cl-feedparser-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-feedparser/2021-10-20/cl-feedparser-20211020-git.tgz"; - sha256 = "1g84w89c04d1r734bmrrmy0kazm8d5di85434byf319dq8zma29v"; - system = "cl-feedparser-tests"; - asd = "cl-feedparser-tests"; - }); - systems = [ "cl-feedparser-tests" ]; - lispLibs = [ (getAttr "cl-feedparser" pkgs) (getAttr "fiveam" pkgs) (getAttr "fxml" pkgs) (getAttr "local-time" pkgs) ]; - }; - cl-feedparser_slash_test = { - pname = "cl-feedparser_test"; - version = "20211020-git"; - asds = [ "cl-feedparser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-feedparser/2021-10-20/cl-feedparser-20211020-git.tgz"; - sha256 = "1g84w89c04d1r734bmrrmy0kazm8d5di85434byf319dq8zma29v"; - system = "cl-feedparser"; - asd = "cl-feedparser"; - }); - systems = [ "cl-feedparser/test" ]; - lispLibs = [ (getAttr "cl-feedparser" pkgs) (getAttr "fiveam" pkgs) (getAttr "fxml" pkgs) (getAttr "local-time" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-fix = { - pname = "cl-fix"; - version = "20220220-git"; - asds = [ "cl-fix" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fix/2022-02-20/cl-fix-20220220-git.tgz"; - sha256 = "19mfvv4d88nw8x0zmqdpaa98cc6w19ksi4ayxkkzgd7i6azknm8n"; - system = "cl-fix"; - asd = "cl-fix"; - }); - systems = [ "cl-fix" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "arrow-macros" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "local-time" pkgs) (getAttr "log4cl" pkgs) (getAttr "parse-number" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-fix_slash_fix44 = { - pname = "cl-fix_fix44"; - version = "20220220-git"; - asds = [ "cl-fix" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fix/2022-02-20/cl-fix-20220220-git.tgz"; - sha256 = "19mfvv4d88nw8x0zmqdpaa98cc6w19ksi4ayxkkzgd7i6azknm8n"; - system = "cl-fix"; - asd = "cl-fix"; - }); - systems = [ "cl-fix/fix44" ]; - lispLibs = [ (getAttr "cl-fix" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-fix_slash_test = { - pname = "cl-fix_test"; - version = "20220220-git"; - asds = [ "cl-fix" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fix/2022-02-20/cl-fix-20220220-git.tgz"; - sha256 = "19mfvv4d88nw8x0zmqdpaa98cc6w19ksi4ayxkkzgd7i6azknm8n"; - system = "cl-fix"; - asd = "cl-fix"; - }); - systems = [ "cl-fix/test" ]; - lispLibs = [ (getAttr "cl-fix" pkgs) (getAttr "fiveam" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-fixtures = { - pname = "cl-fixtures"; - version = "20200325-git"; - asds = [ "cl-fixtures" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fixtures/2020-03-25/cl-fixtures-20200325-git.tgz"; - sha256 = "01z8brw32lv8lqn6r9srwrna5gkd4cyncpbpg6pc0khgdxzpzaag"; - system = "cl-fixtures"; - asd = "cl-fixtures"; - }); - systems = [ "cl-fixtures" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-fixtures-test = { - pname = "cl-fixtures-test"; - version = "20200325-git"; - asds = [ "cl-fixtures-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fixtures/2020-03-25/cl-fixtures-20200325-git.tgz"; - sha256 = "01z8brw32lv8lqn6r9srwrna5gkd4cyncpbpg6pc0khgdxzpzaag"; - system = "cl-fixtures-test"; - asd = "cl-fixtures-test"; - }); - systems = [ "cl-fixtures-test" ]; - lispLibs = [ (getAttr "cl-fixtures" pkgs) (getAttr "incf-cl" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "rutils" pkgs) ]; - }; - cl-flac = { - pname = "cl-flac"; - version = "20190710-git"; - asds = [ "cl-flac" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-flac/2019-07-10/cl-flac-20190710-git.tgz"; - sha256 = "1dgr5xqf175hzq3sxpbixxia2k2g3rz0pn6msch4dnvk7a1naqlc"; - system = "cl-flac"; - asd = "cl-flac"; - }); - systems = [ "cl-flac" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-flow = { - pname = "cl-flow"; - version = "stable-git"; - asds = [ "cl-flow" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-flow/2022-07-07/cl-flow-stable-git.tgz"; - sha256 = "0mh9g0zj2kwnsq31zg4af5k9jvfbwp28zx02f0r1jlg2rha87vlg"; - system = "cl-flow"; - asd = "cl-flow"; - }); - systems = [ "cl-flow" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-muth" pkgs) ]; - }; - cl-flow_slash_tests = { - pname = "cl-flow_tests"; - version = "stable-git"; - asds = [ "cl-flow" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-flow/2022-07-07/cl-flow-stable-git.tgz"; - sha256 = "0mh9g0zj2kwnsq31zg4af5k9jvfbwp28zx02f0r1jlg2rha87vlg"; - system = "cl-flow"; - asd = "cl-flow"; - }); - systems = [ "cl-flow/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-flow" pkgs) (getAttr "cl-muth" pkgs) (getAttr "fiveam" pkgs) (getAttr "simple-flow-dispatcher" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-flowd = { - pname = "cl-flowd"; - version = "20140713-git"; - asds = [ "cl-flowd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-flowd/2014-07-13/cl-flowd-20140713-git.tgz"; - sha256 = "0qppiqgy4fgvkm519bqjrw1mfp90q8fs1spvawf24d1nzslf51pj"; - system = "cl-flowd"; - asd = "cl-flowd"; - }); - systems = [ "cl-flowd" ]; - lispLibs = [ (getAttr "cl-annot" pkgs) ]; - }; - cl-fluent-logger = { - pname = "cl-fluent-logger"; - version = "20211020-git"; - asds = [ "cl-fluent-logger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fluent-logger/2021-10-20/cl-fluent-logger-20211020-git.tgz"; - sha256 = "14q7ymdg3hsri2z2c8fb1syqgdlk8b288v4gw645dbaxfpava2qq"; - system = "cl-fluent-logger"; - asd = "cl-fluent-logger"; - }); - systems = [ "cl-fluent-logger" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-messagepack" pkgs) (getAttr "jonathan" pkgs) (getAttr "local-time" pkgs) (getAttr "pack" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-fluiddb = { - pname = "cl-fluiddb"; - version = "20130312-git"; - asds = [ "cl-fluiddb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz"; - sha256 = "0npkkp2w88f6vb9pckjp4q4d4idx9p2s4s4imljs2vfym2j3w0wb"; - system = "cl-fluiddb"; - asd = "cl-fluiddb"; - }); - systems = [ "cl-fluiddb" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-json" pkgs) (getAttr "drakma" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-fluiddb-test = { - pname = "cl-fluiddb-test"; - version = "20130312-git"; - asds = [ "cl-fluiddb-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz"; - sha256 = "0npkkp2w88f6vb9pckjp4q4d4idx9p2s4s4imljs2vfym2j3w0wb"; - system = "cl-fluiddb-test"; - asd = "cl-fluiddb-test"; - }); - systems = [ "cl-fluiddb-test" ]; - lispLibs = [ (getAttr "cl-fluiddb" pkgs) (getAttr "lift" pkgs) ]; - }; - cl-fluidinfo = { - pname = "cl-fluidinfo"; - version = "20130312-git"; - asds = [ "cl-fluidinfo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fluidinfo/2013-03-12/cl-fluidinfo-20130312-git.tgz"; - sha256 = "0npkkp2w88f6vb9pckjp4q4d4idx9p2s4s4imljs2vfym2j3w0wb"; - system = "cl-fluidinfo"; - asd = "cl-fluidinfo"; - }); - systems = [ "cl-fluidinfo" ]; - lispLibs = [ (getAttr "cl-fluiddb" pkgs) ]; - }; - cl-fond = { - pname = "cl-fond"; - version = "20191130-git"; - asds = [ "cl-fond" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fond/2019-11-30/cl-fond-20191130-git.tgz"; - sha256 = "03ygcw1azb44bhdsqcq99xi4ci0by76ap5jf5l2d1vfxq04v8grq"; - system = "cl-fond"; - asd = "cl-fond"; - }); - systems = [ "cl-fond" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-form-types = { - pname = "cl-form-types"; - version = "20221106-git"; - asds = [ "cl-form-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-form-types/2022-11-06/cl-form-types-20221106-git.tgz"; - sha256 = "063yylsdy9zp3gr3l1mw0rbhfy853m1x4yv3s8y3qwmxsxdfjs10"; - system = "cl-form-types"; - asd = "cl-form-types"; - }); - systems = [ "cl-form-types" ]; - lispLibs = [ (getAttr "agutil" pkgs) (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "arrows" pkgs) (getAttr "cl-environments" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "optima" pkgs) ]; - }; - cl-form-types_slash_test = { - pname = "cl-form-types_test"; - version = "20221106-git"; - asds = [ "cl-form-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-form-types/2022-11-06/cl-form-types-20221106-git.tgz"; - sha256 = "063yylsdy9zp3gr3l1mw0rbhfy853m1x4yv3s8y3qwmxsxdfjs10"; - system = "cl-form-types"; - asd = "cl-form-types"; - }); - systems = [ "cl-form-types/test" ]; - lispLibs = [ (getAttr "cl-form-types" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-forms = { - pname = "cl-forms"; - version = "20221106-git"; - asds = [ "cl-forms" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2022-11-06/cl-forms-20221106-git.tgz"; - sha256 = "11vcmi96x93npdga9hmpbhxi260bccgrllz6bzd0spkzazr3q0ap"; - system = "cl-forms"; - asd = "cl-forms"; - }); - systems = [ "cl-forms" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "clavier" pkgs) (getAttr "fmt" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "ironclad" pkgs) (getAttr "uuid" pkgs) ]; - }; - cl-forms_dot_demo = { - pname = "cl-forms.demo"; - version = "20221106-git"; - asds = [ "cl-forms.demo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2022-11-06/cl-forms-20221106-git.tgz"; - sha256 = "11vcmi96x93npdga9hmpbhxi260bccgrllz6bzd0spkzazr3q0ap"; - system = "cl-forms.demo"; - asd = "cl-forms.demo"; - }); - systems = [ "cl-forms.demo" ]; - lispLibs = [ (getAttr "cl-css" pkgs) (getAttr "cl-forms" pkgs) (getAttr "cl-forms_dot_djula" pkgs) (getAttr "cl-forms_dot_test" pkgs) (getAttr "cl-forms_dot_who" pkgs) (getAttr "cl-forms_dot_who_dot_bootstrap" pkgs) (getAttr "cl-who" pkgs) (getAttr "djula" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - cl-forms_dot_djula = { - pname = "cl-forms.djula"; - version = "20221106-git"; - asds = [ "cl-forms.djula" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2022-11-06/cl-forms-20221106-git.tgz"; - sha256 = "11vcmi96x93npdga9hmpbhxi260bccgrllz6bzd0spkzazr3q0ap"; - system = "cl-forms.djula"; - asd = "cl-forms.djula"; - }); - systems = [ "cl-forms.djula" ]; - lispLibs = [ (getAttr "cl-forms" pkgs) (getAttr "cl-forms_dot_who" pkgs) (getAttr "djula" pkgs) ]; - }; - cl-forms_dot_peppol = { - pname = "cl-forms.peppol"; - version = "20221106-git"; - asds = [ "cl-forms.peppol" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2022-11-06/cl-forms-20221106-git.tgz"; - sha256 = "11vcmi96x93npdga9hmpbhxi260bccgrllz6bzd0spkzazr3q0ap"; - system = "cl-forms.peppol"; - asd = "cl-forms.peppol"; - }); - systems = [ "cl-forms.peppol" ]; - lispLibs = [ (getAttr "cl-forms" pkgs) (getAttr "peppol" pkgs) ]; - }; - cl-forms_dot_test = { - pname = "cl-forms.test"; - version = "20221106-git"; - asds = [ "cl-forms.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2022-11-06/cl-forms-20221106-git.tgz"; - sha256 = "11vcmi96x93npdga9hmpbhxi260bccgrllz6bzd0spkzazr3q0ap"; - system = "cl-forms.test"; - asd = "cl-forms.test"; - }); - systems = [ "cl-forms.test" ]; - lispLibs = [ (getAttr "cl-forms" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-forms_dot_who = { - pname = "cl-forms.who"; - version = "20221106-git"; - asds = [ "cl-forms.who" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2022-11-06/cl-forms-20221106-git.tgz"; - sha256 = "11vcmi96x93npdga9hmpbhxi260bccgrllz6bzd0spkzazr3q0ap"; - system = "cl-forms.who"; - asd = "cl-forms.who"; - }); - systems = [ "cl-forms.who" ]; - lispLibs = [ (getAttr "cl-forms" pkgs) (getAttr "cl-who" pkgs) ]; - }; - cl-forms_dot_who_dot_bootstrap = { - pname = "cl-forms.who.bootstrap"; - version = "20221106-git"; - asds = [ "cl-forms.who.bootstrap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-forms/2022-11-06/cl-forms-20221106-git.tgz"; - sha256 = "11vcmi96x93npdga9hmpbhxi260bccgrllz6bzd0spkzazr3q0ap"; - system = "cl-forms.who.bootstrap"; - asd = "cl-forms.who.bootstrap"; - }); - systems = [ "cl-forms.who.bootstrap" ]; - lispLibs = [ (getAttr "cl-forms_dot_who" pkgs) ]; - }; - cl-freeimage = { - pname = "cl-freeimage"; - version = "20170403-git"; - asds = [ "cl-freeimage" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-freeimage/2017-04-03/cl-freeimage-20170403-git.tgz"; - sha256 = "1333i8sh670nkb0c35xp511xjlafn5zh8a6gk3wnh19gffvj63hq"; - system = "cl-freeimage"; - asd = "cl-freeimage"; - }); - systems = [ "cl-freeimage" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-freetype2 = { - pname = "cl-freetype2"; - version = "20220707-git"; - asds = [ "cl-freetype2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-freetype2/2022-07-07/cl-freetype2-20220707-git.tgz"; - sha256 = "1nhq3qslja0bcgpbmzfycqhd4vw1l58zh4ia15m1h6535qxliy0q"; - system = "cl-freetype2"; - asd = "cl-freetype2"; - }); - systems = [ "cl-freetype2" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-freetype2-tests = { - pname = "cl-freetype2-tests"; - version = "20220707-git"; - asds = [ "cl-freetype2-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-freetype2/2022-07-07/cl-freetype2-20220707-git.tgz"; - sha256 = "1nhq3qslja0bcgpbmzfycqhd4vw1l58zh4ia15m1h6535qxliy0q"; - system = "cl-freetype2-tests"; - asd = "cl-freetype2-tests"; - }); - systems = [ "cl-freetype2-tests" ]; - lispLibs = [ (getAttr "cl-freetype2" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-fsnotify = { - pname = "cl-fsnotify"; - version = "20150302-git"; - asds = [ "cl-fsnotify" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fsnotify/2015-03-02/cl-fsnotify-20150302-git.tgz"; - sha256 = "0693ga1xqcvi89j3aw0lmyi3a1yl3hrfwli2jiwxv0mgpcaxz0yr"; - system = "cl-fsnotify"; - asd = "cl-fsnotify"; - }); - systems = [ "cl-fsnotify" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - cl-ftp = { - pname = "cl-ftp"; - version = "20150608-http"; - asds = [ "cl-ftp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ftp/2015-06-08/cl-ftp-20150608-http.tgz"; - sha256 = "1m955rjpaynybzmb9q631mll764hm06lydvhra50mfjj75ynwsvw"; - system = "cl-ftp"; - asd = "cl-ftp"; - }); - systems = [ "cl-ftp" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-fuse = { - pname = "cl-fuse"; - version = "20200925-git"; - asds = [ "cl-fuse" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz"; - sha256 = "1qxvf8ybn0v1hiaz11k1h47y0dksj8ah9v8jdfrjp9ad1rrrnxqs"; - system = "cl-fuse"; - asd = "cl-fuse"; - }); - systems = [ "cl-fuse" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-utilities" pkgs) (getAttr "iterate" pkgs) (getAttr "trivial-backtrace" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - cl-fuse-meta-fs = { - pname = "cl-fuse-meta-fs"; - version = "20190710-git"; - asds = [ "cl-fuse-meta-fs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz"; - sha256 = "1wbi7lvczfn09qb72rg1bps9w51mz42dwa7lyjl2hp8lbwc2a5a9"; - system = "cl-fuse-meta-fs"; - asd = "cl-fuse-meta-fs"; - }); - systems = [ "cl-fuse-meta-fs" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-fuse" pkgs) (getAttr "iterate" pkgs) (getAttr "pcall" pkgs) ]; - }; - cl-fuzz = { - pname = "cl-fuzz"; - version = "20181018-git"; - asds = [ "cl-fuzz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fuzz/2018-10-18/cl-fuzz-20181018-git.tgz"; - sha256 = "1zvlh0nh4iip75p6dblx5kajqaa3hhv6mdjbx9cids8491r388rz"; - system = "cl-fuzz"; - asd = "cl-fuzz"; - }); - systems = [ "cl-fuzz" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-fxml = { - pname = "cl-fxml"; - version = "20220331-git"; - asds = [ "cl-fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-fxml/2022-03-31/cl-fxml-20220331-git.tgz"; - sha256 = "0i5w3z0rgyi42rlhvf92k95w6bajf3m1x9g4zprwf602kp7abr3c"; - system = "cl-fxml"; - asd = "cl-fxml"; - }); - systems = [ "cl-fxml" ]; - lispLibs = [ (getAttr "agnostic-lizard" pkgs) (getAttr "alexandria" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - cl-gamepad = { - pname = "cl-gamepad"; - version = "20221106-git"; - asds = [ "cl-gamepad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gamepad/2022-11-06/cl-gamepad-20221106-git.tgz"; - sha256 = "00rd483p063wf8m18mpgbk09fxass2zfc6vmkx0c26f690g6a14z"; - system = "cl-gamepad"; - asd = "cl-gamepad"; - }); - systems = [ "cl-gamepad" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - cl-gap-buffer = { - pname = "cl-gap-buffer"; - version = "20190307-hg"; - asds = [ "cl-gap-buffer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gap-buffer/2019-03-07/cl-gap-buffer-20190307-hg.tgz"; - sha256 = "0n46vbjsqva0ik5m4bh9k9vzzvixw755vql2bagq0sdxchmri2gw"; - system = "cl-gap-buffer"; - asd = "cl-gap-buffer"; - }); - systems = [ "cl-gap-buffer" ]; - lispLibs = [ ]; - }; - cl-gbm = { - pname = "cl-gbm"; - version = "20180430-git"; - asds = [ "cl-gbm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gbm/2018-04-30/cl-gbm-20180430-git.tgz"; - sha256 = "14bshi7q1hhyag8va9javjjn5cnhmwyjlw8vvvb4fyzfspz3kpdx"; - system = "cl-gbm"; - asd = "cl-gbm"; - }); - systems = [ "cl-gbm" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-gcrypt = { - pname = "cl-gcrypt"; - version = "20211209-git"; - asds = [ "cl-gcrypt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gcrypt/2021-12-09/cl-gcrypt-20211209-git.tgz"; - sha256 = "1f4gx5ssirr4f3n68i2da6ad7hbhgsk18zv0gfqy3q635zai0z3w"; - system = "cl-gcrypt"; - asd = "cl-gcrypt"; - }); - systems = [ "cl-gcrypt" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-gcrypt-test = { - pname = "cl-gcrypt-test"; - version = "20211209-git"; - asds = [ "cl-gcrypt-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gcrypt/2021-12-09/cl-gcrypt-20211209-git.tgz"; - sha256 = "1f4gx5ssirr4f3n68i2da6ad7hbhgsk18zv0gfqy3q635zai0z3w"; - system = "cl-gcrypt-test"; - asd = "cl-gcrypt-test"; - }); - systems = [ "cl-gcrypt-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-gcrypt" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-gd = { - pname = "cl-gd"; - version = "20201220-git"; - asds = [ "cl-gd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gd/2020-12-20/cl-gd-20201220-git.tgz"; - sha256 = "1wa6nv5bdf0v38hzr6cfadkk6mhvvnj9lpl9igcxygdjbnn2a3y6"; - system = "cl-gd"; - asd = "cl-gd"; - }); - systems = [ "cl-gd" ]; - lispLibs = [ (getAttr "uffi" pkgs) ]; - }; - cl-gd-test = { - pname = "cl-gd-test"; - version = "20201220-git"; - asds = [ "cl-gd-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gd/2020-12-20/cl-gd-20201220-git.tgz"; - sha256 = "1wa6nv5bdf0v38hzr6cfadkk6mhvvnj9lpl9igcxygdjbnn2a3y6"; - system = "cl-gd-test"; - asd = "cl-gd-test"; - }); - systems = [ "cl-gd-test" ]; - lispLibs = [ (getAttr "cl-gd" pkgs) ]; - }; - cl-gdata = { - pname = "cl-gdata"; - version = "20171130-git"; - asds = [ "cl-gdata" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gdata/2017-11-30/cl-gdata-20171130-git.tgz"; - sha256 = "0x2sq03nacjbq7p9baxlhr7bb0xg7v1ljq7qj1b3xrd4rbcibxi9"; - system = "cl-gdata"; - asd = "cl-gdata"; - }); - systems = [ "cl-gdata" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "cxml" pkgs) (getAttr "drakma" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "gzip-stream" pkgs) (getAttr "local-time" pkgs) (getAttr "parse-number" pkgs) (getAttr "xpath" pkgs) (getAttr "split-sequence" pkgs) (getAttr "string-case" pkgs) (getAttr "trivial-utf-8" pkgs) (getAttr "url-rewrite" pkgs) ]; - }; - cl-gearman = { - pname = "cl-gearman"; - version = "20211020-git"; - asds = [ "cl-gearman" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gearman/2021-10-20/cl-gearman-20211020-git.tgz"; - sha256 = "0cnkpqn43p55xlhdi8bws2ssa1ahvzbgggh3pam0zbqma2m525j6"; - system = "cl-gearman"; - asd = "cl-gearman"; - }); - systems = [ "cl-gearman" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "split-sequence" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-gearman-test = { - pname = "cl-gearman-test"; - version = "20211020-git"; - asds = [ "cl-gearman-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gearman/2021-10-20/cl-gearman-20211020-git.tgz"; - sha256 = "0cnkpqn43p55xlhdi8bws2ssa1ahvzbgggh3pam0zbqma2m525j6"; - system = "cl-gearman-test"; - asd = "cl-gearman-test"; - }); - systems = [ "cl-gearman-test" ]; - lispLibs = [ (getAttr "cl-gearman" pkgs) (getAttr "cl-test-more" pkgs) ]; - }; - cl-gendoc = { - pname = "cl-gendoc"; - version = "20180831-git"; - asds = [ "cl-gendoc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gendoc/2018-08-31/cl-gendoc-20180831-git.tgz"; - sha256 = "19f8fmz2hj332kh3y3fbil2dchpckdsqci6ljhadymd8p2h6w4ws"; - system = "cl-gendoc"; - asd = "cl-gendoc"; - }); - systems = [ "cl-gendoc" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "_3bmd-ext-code-blocks" pkgs) (getAttr "cl-who" pkgs) ]; - }; - cl-gendoc-docs = { - pname = "cl-gendoc-docs"; - version = "20180831-git"; - asds = [ "cl-gendoc-docs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gendoc/2018-08-31/cl-gendoc-20180831-git.tgz"; - sha256 = "19f8fmz2hj332kh3y3fbil2dchpckdsqci6ljhadymd8p2h6w4ws"; - system = "cl-gendoc-docs"; - asd = "cl-gendoc"; - }); - systems = [ "cl-gendoc-docs" ]; - lispLibs = [ (getAttr "cl-gendoc" pkgs) ]; - }; - cl-gene-searcher = { - pname = "cl-gene-searcher"; - version = "20111001-git"; - asds = [ "cl-gene-searcher" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gene-searcher/2011-10-01/cl-gene-searcher-20111001-git.tgz"; - sha256 = "0n8p6yk600h7m050bjxazmcxdrcfrkcklrcj8ncflyshm72qv1yk"; - system = "cl-gene-searcher"; - asd = "cl-gene-searcher"; - }); - systems = [ "cl-gene-searcher" ]; - lispLibs = [ (getAttr "clsql-sqlite3" pkgs) ]; - }; - cl-generator = { - pname = "cl-generator"; - version = "20221106-git"; - asds = [ "cl-generator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-generator/2022-11-06/cl-generator-20221106-git.tgz"; - sha256 = "0aa5prw6f4fqw9j8m6kvdb3h3lqyvi15dd1l6437p9408mmyxk30"; - system = "cl-generator"; - asd = "cl-generator"; - }); - systems = [ "cl-generator" ]; - lispLibs = [ (getAttr "cl-cont" pkgs) ]; - }; - cl-generator-test = { - pname = "cl-generator-test"; - version = "20221106-git"; - asds = [ "cl-generator-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-generator/2022-11-06/cl-generator-20221106-git.tgz"; - sha256 = "0aa5prw6f4fqw9j8m6kvdb3h3lqyvi15dd1l6437p9408mmyxk30"; - system = "cl-generator-test"; - asd = "cl-generator-test"; - }); - systems = [ "cl-generator-test" ]; - lispLibs = [ (getAttr "cl-generator" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - cl-geocode = { - pname = "cl-geocode"; - version = "20190813-git"; - asds = [ "cl-geocode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-geocode/2019-08-13/cl-geocode-20190813-git.tgz"; - sha256 = "17z0v29rrhsfjikg4sn9ynxckh5i3ahjn7c8qs381n1p9fbd668l"; - system = "cl-geocode"; - asd = "cl-geocode"; - }); - systems = [ "cl-geocode" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "acl-compat" pkgs) (getAttr "aserve" pkgs) ]; - }; - cl-geoip = { - pname = "cl-geoip"; - version = "20130615-git"; - asds = [ "cl-geoip" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-geoip/2013-06-15/cl-geoip-20130615-git.tgz"; - sha256 = "0ys8wysppx06j3s0dc9lc9zjizr1fmj388fiigyn1wrdyyka41y2"; - system = "cl-geoip"; - asd = "cl-geoip"; - }); - systems = [ "cl-geoip" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-geometry = { - pname = "cl-geometry"; - version = "20160531-git"; - asds = [ "cl-geometry" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz"; - sha256 = "188xrd8plvc34gz7q01zmkdrzxbpwzln103l5dl78pa4a6vzz34h"; - system = "cl-geometry"; - asd = "cl-geometry"; - }); - systems = [ "cl-geometry" ]; - lispLibs = [ (getAttr "iterate" pkgs) (getAttr "trees" pkgs) ]; - }; - cl-geometry-tests = { - pname = "cl-geometry-tests"; - version = "20160531-git"; - asds = [ "cl-geometry-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz"; - sha256 = "188xrd8plvc34gz7q01zmkdrzxbpwzln103l5dl78pa4a6vzz34h"; - system = "cl-geometry-tests"; - asd = "cl-geometry-tests"; - }); - systems = [ "cl-geometry-tests" ]; - lispLibs = [ (getAttr "cl-geometry" pkgs) (getAttr "iterate" pkgs) (getAttr "vecto" pkgs) ]; - }; - cl-geos = { - pname = "cl-geos"; - version = "20180711-git"; - asds = [ "cl-geos" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-geos/2018-07-11/cl-geos-20180711-git.tgz"; - sha256 = "0igq2c1p82pbkyc7zg90fm3lbsmhwnfmb3q8jc8baklb958555ck"; - system = "cl-geos"; - asd = "cl-geos"; - }); - systems = [ "cl-geos" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "uiop" pkgs) (getAttr "xarray" pkgs) ]; - }; - cl-geos_slash_test = { - pname = "cl-geos_test"; - version = "20180711-git"; - asds = [ "cl-geos" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-geos/2018-07-11/cl-geos-20180711-git.tgz"; - sha256 = "0igq2c1p82pbkyc7zg90fm3lbsmhwnfmb3q8jc8baklb958555ck"; - system = "cl-geos"; - asd = "cl-geos"; - }); - systems = [ "cl-geos/test" ]; - lispLibs = [ (getAttr "cl-geos" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-getopt = { - pname = "cl-getopt"; - version = "20211209-git"; - asds = [ "cl-getopt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-getopt/2021-12-09/cl-getopt-20211209-git.tgz"; - sha256 = "16qkpg2qln7q9j5614py00zwsnmxcy3xcmhb4m8f0w0zbnpvkjxl"; - system = "cl-getopt"; - asd = "cl-getopt"; - }); - systems = [ "cl-getopt" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - cl-getx = { - pname = "cl-getx"; - version = "20200925-git"; - asds = [ "cl-getx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-getx/2020-09-25/cl-getx-20200925-git.tgz"; - sha256 = "07gi346vqrhnbkdk4l6g06z4shhnx7f4l44jgayzfdd0xkv02brv"; - system = "cl-getx"; - asd = "cl-getx"; - }); - systems = [ "cl-getx" ]; - lispLibs = [ ]; - }; - cl-gimei = { - pname = "cl-gimei"; - version = "20211020-git"; - asds = [ "cl-gimei" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gimei/2021-10-20/cl-gimei-20211020-git.tgz"; - sha256 = "1405qbqrrrmanmg2dl7yfdj8z4vcsj1silpsa7i1y00pd18xgk8q"; - system = "cl-gimei"; - asd = "cl-gimei"; - }); - systems = [ "cl-gimei" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-yaml" pkgs) ]; - }; - cl-gimei_slash_test = { - pname = "cl-gimei_test"; - version = "20211020-git"; - asds = [ "cl-gimei" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gimei/2021-10-20/cl-gimei-20211020-git.tgz"; - sha256 = "1405qbqrrrmanmg2dl7yfdj8z4vcsj1silpsa7i1y00pd18xgk8q"; - system = "cl-gimei"; - asd = "cl-gimei"; - }); - systems = [ "cl-gimei/test" ]; - lispLibs = [ (getAttr "cl-gimei" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-gists = { - pname = "cl-gists"; - version = "20180228-git"; - asds = [ "cl-gists" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gists/2018-02-28/cl-gists-20180228-git.tgz"; - sha256 = "1ipwapb71ls0gy4prg1j9x5ki4frf6l1f9iphjnsis7kdpbm2mi7"; - system = "cl-gists"; - asd = "cl-gists"; - }); - systems = [ "cl-gists" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-syntax" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "dexador" pkgs) (getAttr "jonathan" pkgs) (getAttr "local-time" pkgs) (getAttr "quri" pkgs) (getAttr "trivial-types" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-gists-test = { - pname = "cl-gists-test"; - version = "20180228-git"; - asds = [ "cl-gists-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gists/2018-02-28/cl-gists-20180228-git.tgz"; - sha256 = "1ipwapb71ls0gy4prg1j9x5ki4frf6l1f9iphjnsis7kdpbm2mi7"; - system = "cl-gists-test"; - asd = "cl-gists-test"; - }); - systems = [ "cl-gists-test" ]; - lispLibs = [ (getAttr "cl-gists" pkgs) (getAttr "closer-mop" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-git = { - pname = "cl-git"; - version = "20221106-git"; - asds = [ "cl-git" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-git/2022-11-06/cl-git-20221106-git.tgz"; - sha256 = "0pk8pnsndkp3mcxknbq41crdv75djz5s4f40i1j9xkl6a39q0arf"; - system = "cl-git"; - asd = "cl-git"; - }); - systems = [ "cl-git" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-fad" pkgs) (getAttr "closer-mop" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "local-time" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-git_slash_tests = { - pname = "cl-git_tests"; - version = "20221106-git"; - asds = [ "cl-git" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-git/2022-11-06/cl-git-20221106-git.tgz"; - sha256 = "0pk8pnsndkp3mcxknbq41crdv75djz5s4f40i1j9xkl6a39q0arf"; - system = "cl-git"; - asd = "cl-git"; - }); - systems = [ "cl-git/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-git" pkgs) (getAttr "fiveam" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "inferior-shell" pkgs) (getAttr "local-time" pkgs) (getAttr "unix-options" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-github-v3 = { - pname = "cl-github-v3"; - version = "20191227-git"; - asds = [ "cl-github-v3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-github-v3/2019-12-27/cl-github-v3-20191227-git.tgz"; - sha256 = "1xwfw6y3vm7236rd6pdmb5akk63gpzhllx99mv4r7ia3yyf9d4f8"; - system = "cl-github-v3"; - asd = "cl-github-v3"; - }); - systems = [ "cl-github-v3" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "yason" pkgs) ]; - }; - cl-glfw = { - pname = "cl-glfw"; - version = "20150302-git"; - asds = [ "cl-glfw" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw"; - asd = "cl-glfw"; - }); - systems = [ "cl-glfw" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-glfw-types" pkgs) ]; - }; - cl-glfw-ftgl = { - pname = "cl-glfw-ftgl"; - version = "20150302-git"; - asds = [ "cl-glfw-ftgl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-ftgl"; - asd = "cl-glfw-ftgl"; - }); - systems = [ "cl-glfw-ftgl" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-glfw-glu = { - pname = "cl-glfw-glu"; - version = "20150302-git"; - asds = [ "cl-glfw-glu" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-glu"; - asd = "cl-glfw-glu"; - }); - systems = [ "cl-glfw-glu" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-glfw-types" pkgs) ]; - }; - cl-glfw-opengl-3dfx_multisample = { - pname = "cl-glfw-opengl-3dfx_multisample"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-3dfx_multisample" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-3dfx_multisample"; - asd = "cl-glfw-opengl-3dfx_multisample"; - }); - systems = [ "cl-glfw-opengl-3dfx_multisample" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-3dfx_tbuffer = { - pname = "cl-glfw-opengl-3dfx_tbuffer"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-3dfx_tbuffer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-3dfx_tbuffer"; - asd = "cl-glfw-opengl-3dfx_tbuffer"; - }); - systems = [ "cl-glfw-opengl-3dfx_tbuffer" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-3dfx_texture_compression_fxt1 = { - pname = "cl-glfw-opengl-3dfx_texture_compression_fxt1"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-3dfx_texture_compression_fxt1" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-3dfx_texture_compression_fxt1"; - asd = "cl-glfw-opengl-3dfx_texture_compression_fxt1"; - }); - systems = [ "cl-glfw-opengl-3dfx_texture_compression_fxt1" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-amd_blend_minmax_factor = { - pname = "cl-glfw-opengl-amd_blend_minmax_factor"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-amd_blend_minmax_factor" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-amd_blend_minmax_factor"; - asd = "cl-glfw-opengl-amd_blend_minmax_factor"; - }); - systems = [ "cl-glfw-opengl-amd_blend_minmax_factor" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-amd_depth_clamp_separate = { - pname = "cl-glfw-opengl-amd_depth_clamp_separate"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-amd_depth_clamp_separate" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-amd_depth_clamp_separate"; - asd = "cl-glfw-opengl-amd_depth_clamp_separate"; - }); - systems = [ "cl-glfw-opengl-amd_depth_clamp_separate" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-amd_draw_buffers_blend = { - pname = "cl-glfw-opengl-amd_draw_buffers_blend"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-amd_draw_buffers_blend" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-amd_draw_buffers_blend"; - asd = "cl-glfw-opengl-amd_draw_buffers_blend"; - }); - systems = [ "cl-glfw-opengl-amd_draw_buffers_blend" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-amd_multi_draw_indirect = { - pname = "cl-glfw-opengl-amd_multi_draw_indirect"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-amd_multi_draw_indirect" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-amd_multi_draw_indirect"; - asd = "cl-glfw-opengl-amd_multi_draw_indirect"; - }); - systems = [ "cl-glfw-opengl-amd_multi_draw_indirect" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-amd_name_gen_delete = { - pname = "cl-glfw-opengl-amd_name_gen_delete"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-amd_name_gen_delete" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-amd_name_gen_delete"; - asd = "cl-glfw-opengl-amd_name_gen_delete"; - }); - systems = [ "cl-glfw-opengl-amd_name_gen_delete" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-amd_performance_monitor = { - pname = "cl-glfw-opengl-amd_performance_monitor"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-amd_performance_monitor" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-amd_performance_monitor"; - asd = "cl-glfw-opengl-amd_performance_monitor"; - }); - systems = [ "cl-glfw-opengl-amd_performance_monitor" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-amd_sample_positions = { - pname = "cl-glfw-opengl-amd_sample_positions"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-amd_sample_positions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-amd_sample_positions"; - asd = "cl-glfw-opengl-amd_sample_positions"; - }); - systems = [ "cl-glfw-opengl-amd_sample_positions" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-amd_seamless_cubemap_per_texture = { - pname = "cl-glfw-opengl-amd_seamless_cubemap_per_texture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-amd_seamless_cubemap_per_texture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-amd_seamless_cubemap_per_texture"; - asd = "cl-glfw-opengl-amd_seamless_cubemap_per_texture"; - }); - systems = [ "cl-glfw-opengl-amd_seamless_cubemap_per_texture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-amd_vertex_shader_tesselator = { - pname = "cl-glfw-opengl-amd_vertex_shader_tesselator"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-amd_vertex_shader_tesselator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-amd_vertex_shader_tesselator"; - asd = "cl-glfw-opengl-amd_vertex_shader_tesselator"; - }); - systems = [ "cl-glfw-opengl-amd_vertex_shader_tesselator" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_aux_depth_stencil = { - pname = "cl-glfw-opengl-apple_aux_depth_stencil"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_aux_depth_stencil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_aux_depth_stencil"; - asd = "cl-glfw-opengl-apple_aux_depth_stencil"; - }); - systems = [ "cl-glfw-opengl-apple_aux_depth_stencil" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_client_storage = { - pname = "cl-glfw-opengl-apple_client_storage"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_client_storage" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_client_storage"; - asd = "cl-glfw-opengl-apple_client_storage"; - }); - systems = [ "cl-glfw-opengl-apple_client_storage" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_element_array = { - pname = "cl-glfw-opengl-apple_element_array"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_element_array" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_element_array"; - asd = "cl-glfw-opengl-apple_element_array"; - }); - systems = [ "cl-glfw-opengl-apple_element_array" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_fence = { - pname = "cl-glfw-opengl-apple_fence"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_fence" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_fence"; - asd = "cl-glfw-opengl-apple_fence"; - }); - systems = [ "cl-glfw-opengl-apple_fence" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_float_pixels = { - pname = "cl-glfw-opengl-apple_float_pixels"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_float_pixels" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_float_pixels"; - asd = "cl-glfw-opengl-apple_float_pixels"; - }); - systems = [ "cl-glfw-opengl-apple_float_pixels" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_flush_buffer_range = { - pname = "cl-glfw-opengl-apple_flush_buffer_range"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_flush_buffer_range" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_flush_buffer_range"; - asd = "cl-glfw-opengl-apple_flush_buffer_range"; - }); - systems = [ "cl-glfw-opengl-apple_flush_buffer_range" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_object_purgeable = { - pname = "cl-glfw-opengl-apple_object_purgeable"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_object_purgeable" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_object_purgeable"; - asd = "cl-glfw-opengl-apple_object_purgeable"; - }); - systems = [ "cl-glfw-opengl-apple_object_purgeable" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_rgb_422 = { - pname = "cl-glfw-opengl-apple_rgb_422"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_rgb_422" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_rgb_422"; - asd = "cl-glfw-opengl-apple_rgb_422"; - }); - systems = [ "cl-glfw-opengl-apple_rgb_422" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_row_bytes = { - pname = "cl-glfw-opengl-apple_row_bytes"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_row_bytes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_row_bytes"; - asd = "cl-glfw-opengl-apple_row_bytes"; - }); - systems = [ "cl-glfw-opengl-apple_row_bytes" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_specular_vector = { - pname = "cl-glfw-opengl-apple_specular_vector"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_specular_vector" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_specular_vector"; - asd = "cl-glfw-opengl-apple_specular_vector"; - }); - systems = [ "cl-glfw-opengl-apple_specular_vector" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_texture_range = { - pname = "cl-glfw-opengl-apple_texture_range"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_texture_range" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_texture_range"; - asd = "cl-glfw-opengl-apple_texture_range"; - }); - systems = [ "cl-glfw-opengl-apple_texture_range" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_transform_hint = { - pname = "cl-glfw-opengl-apple_transform_hint"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_transform_hint" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_transform_hint"; - asd = "cl-glfw-opengl-apple_transform_hint"; - }); - systems = [ "cl-glfw-opengl-apple_transform_hint" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_vertex_array_object = { - pname = "cl-glfw-opengl-apple_vertex_array_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_vertex_array_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_vertex_array_object"; - asd = "cl-glfw-opengl-apple_vertex_array_object"; - }); - systems = [ "cl-glfw-opengl-apple_vertex_array_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_vertex_array_range = { - pname = "cl-glfw-opengl-apple_vertex_array_range"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_vertex_array_range" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_vertex_array_range"; - asd = "cl-glfw-opengl-apple_vertex_array_range"; - }); - systems = [ "cl-glfw-opengl-apple_vertex_array_range" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_vertex_program_evaluators = { - pname = "cl-glfw-opengl-apple_vertex_program_evaluators"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_vertex_program_evaluators" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_vertex_program_evaluators"; - asd = "cl-glfw-opengl-apple_vertex_program_evaluators"; - }); - systems = [ "cl-glfw-opengl-apple_vertex_program_evaluators" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-apple_ycbcr_422 = { - pname = "cl-glfw-opengl-apple_ycbcr_422"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-apple_ycbcr_422" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-apple_ycbcr_422"; - asd = "cl-glfw-opengl-apple_ycbcr_422"; - }); - systems = [ "cl-glfw-opengl-apple_ycbcr_422" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_blend_func_extended = { - pname = "cl-glfw-opengl-arb_blend_func_extended"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_blend_func_extended" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_blend_func_extended"; - asd = "cl-glfw-opengl-arb_blend_func_extended"; - }); - systems = [ "cl-glfw-opengl-arb_blend_func_extended" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_color_buffer_float = { - pname = "cl-glfw-opengl-arb_color_buffer_float"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_color_buffer_float" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_color_buffer_float"; - asd = "cl-glfw-opengl-arb_color_buffer_float"; - }); - systems = [ "cl-glfw-opengl-arb_color_buffer_float" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_copy_buffer = { - pname = "cl-glfw-opengl-arb_copy_buffer"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_copy_buffer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_copy_buffer"; - asd = "cl-glfw-opengl-arb_copy_buffer"; - }); - systems = [ "cl-glfw-opengl-arb_copy_buffer" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_depth_buffer_float = { - pname = "cl-glfw-opengl-arb_depth_buffer_float"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_depth_buffer_float" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_depth_buffer_float"; - asd = "cl-glfw-opengl-arb_depth_buffer_float"; - }); - systems = [ "cl-glfw-opengl-arb_depth_buffer_float" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_depth_clamp = { - pname = "cl-glfw-opengl-arb_depth_clamp"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_depth_clamp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_depth_clamp"; - asd = "cl-glfw-opengl-arb_depth_clamp"; - }); - systems = [ "cl-glfw-opengl-arb_depth_clamp" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_depth_texture = { - pname = "cl-glfw-opengl-arb_depth_texture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_depth_texture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_depth_texture"; - asd = "cl-glfw-opengl-arb_depth_texture"; - }); - systems = [ "cl-glfw-opengl-arb_depth_texture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_draw_buffers = { - pname = "cl-glfw-opengl-arb_draw_buffers"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_draw_buffers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_draw_buffers"; - asd = "cl-glfw-opengl-arb_draw_buffers"; - }); - systems = [ "cl-glfw-opengl-arb_draw_buffers" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_draw_buffers_blend = { - pname = "cl-glfw-opengl-arb_draw_buffers_blend"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_draw_buffers_blend" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_draw_buffers_blend"; - asd = "cl-glfw-opengl-arb_draw_buffers_blend"; - }); - systems = [ "cl-glfw-opengl-arb_draw_buffers_blend" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_draw_elements_base_vertex = { - pname = "cl-glfw-opengl-arb_draw_elements_base_vertex"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_draw_elements_base_vertex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_draw_elements_base_vertex"; - asd = "cl-glfw-opengl-arb_draw_elements_base_vertex"; - }); - systems = [ "cl-glfw-opengl-arb_draw_elements_base_vertex" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_draw_indirect = { - pname = "cl-glfw-opengl-arb_draw_indirect"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_draw_indirect" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_draw_indirect"; - asd = "cl-glfw-opengl-arb_draw_indirect"; - }); - systems = [ "cl-glfw-opengl-arb_draw_indirect" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_draw_instanced = { - pname = "cl-glfw-opengl-arb_draw_instanced"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_draw_instanced" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_draw_instanced"; - asd = "cl-glfw-opengl-arb_draw_instanced"; - }); - systems = [ "cl-glfw-opengl-arb_draw_instanced" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_es2_compatibility = { - pname = "cl-glfw-opengl-arb_es2_compatibility"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_es2_compatibility" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_es2_compatibility"; - asd = "cl-glfw-opengl-arb_es2_compatibility"; - }); - systems = [ "cl-glfw-opengl-arb_es2_compatibility" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_fragment_program = { - pname = "cl-glfw-opengl-arb_fragment_program"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_fragment_program" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_fragment_program"; - asd = "cl-glfw-opengl-arb_fragment_program"; - }); - systems = [ "cl-glfw-opengl-arb_fragment_program" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_fragment_shader = { - pname = "cl-glfw-opengl-arb_fragment_shader"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_fragment_shader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_fragment_shader"; - asd = "cl-glfw-opengl-arb_fragment_shader"; - }); - systems = [ "cl-glfw-opengl-arb_fragment_shader" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_framebuffer_object = { - pname = "cl-glfw-opengl-arb_framebuffer_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_framebuffer_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_framebuffer_object"; - asd = "cl-glfw-opengl-arb_framebuffer_object"; - }); - systems = [ "cl-glfw-opengl-arb_framebuffer_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_framebuffer_object_deprecated = { - pname = "cl-glfw-opengl-arb_framebuffer_object_deprecated"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_framebuffer_object_deprecated" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_framebuffer_object_deprecated"; - asd = "cl-glfw-opengl-arb_framebuffer_object_deprecated"; - }); - systems = [ "cl-glfw-opengl-arb_framebuffer_object_deprecated" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_framebuffer_srgb = { - pname = "cl-glfw-opengl-arb_framebuffer_srgb"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_framebuffer_srgb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_framebuffer_srgb"; - asd = "cl-glfw-opengl-arb_framebuffer_srgb"; - }); - systems = [ "cl-glfw-opengl-arb_framebuffer_srgb" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_geometry_shader4 = { - pname = "cl-glfw-opengl-arb_geometry_shader4"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_geometry_shader4" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_geometry_shader4"; - asd = "cl-glfw-opengl-arb_geometry_shader4"; - }); - systems = [ "cl-glfw-opengl-arb_geometry_shader4" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_get_program_binary = { - pname = "cl-glfw-opengl-arb_get_program_binary"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_get_program_binary" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_get_program_binary"; - asd = "cl-glfw-opengl-arb_get_program_binary"; - }); - systems = [ "cl-glfw-opengl-arb_get_program_binary" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_gpu_shader5 = { - pname = "cl-glfw-opengl-arb_gpu_shader5"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_gpu_shader5" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_gpu_shader5"; - asd = "cl-glfw-opengl-arb_gpu_shader5"; - }); - systems = [ "cl-glfw-opengl-arb_gpu_shader5" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_gpu_shader_fp64 = { - pname = "cl-glfw-opengl-arb_gpu_shader_fp64"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_gpu_shader_fp64" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_gpu_shader_fp64"; - asd = "cl-glfw-opengl-arb_gpu_shader_fp64"; - }); - systems = [ "cl-glfw-opengl-arb_gpu_shader_fp64" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_half_float_pixel = { - pname = "cl-glfw-opengl-arb_half_float_pixel"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_half_float_pixel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_half_float_pixel"; - asd = "cl-glfw-opengl-arb_half_float_pixel"; - }); - systems = [ "cl-glfw-opengl-arb_half_float_pixel" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_half_float_vertex = { - pname = "cl-glfw-opengl-arb_half_float_vertex"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_half_float_vertex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_half_float_vertex"; - asd = "cl-glfw-opengl-arb_half_float_vertex"; - }); - systems = [ "cl-glfw-opengl-arb_half_float_vertex" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_imaging = { - pname = "cl-glfw-opengl-arb_imaging"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_imaging" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_imaging"; - asd = "cl-glfw-opengl-arb_imaging"; - }); - systems = [ "cl-glfw-opengl-arb_imaging" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_imaging_deprecated = { - pname = "cl-glfw-opengl-arb_imaging_deprecated"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_imaging_deprecated" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_imaging_deprecated"; - asd = "cl-glfw-opengl-arb_imaging_deprecated"; - }); - systems = [ "cl-glfw-opengl-arb_imaging_deprecated" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_instanced_arrays = { - pname = "cl-glfw-opengl-arb_instanced_arrays"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_instanced_arrays" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_instanced_arrays"; - asd = "cl-glfw-opengl-arb_instanced_arrays"; - }); - systems = [ "cl-glfw-opengl-arb_instanced_arrays" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_map_buffer_range = { - pname = "cl-glfw-opengl-arb_map_buffer_range"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_map_buffer_range" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_map_buffer_range"; - asd = "cl-glfw-opengl-arb_map_buffer_range"; - }); - systems = [ "cl-glfw-opengl-arb_map_buffer_range" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_matrix_palette = { - pname = "cl-glfw-opengl-arb_matrix_palette"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_matrix_palette" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_matrix_palette"; - asd = "cl-glfw-opengl-arb_matrix_palette"; - }); - systems = [ "cl-glfw-opengl-arb_matrix_palette" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_multisample = { - pname = "cl-glfw-opengl-arb_multisample"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_multisample" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_multisample"; - asd = "cl-glfw-opengl-arb_multisample"; - }); - systems = [ "cl-glfw-opengl-arb_multisample" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_multitexture = { - pname = "cl-glfw-opengl-arb_multitexture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_multitexture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_multitexture"; - asd = "cl-glfw-opengl-arb_multitexture"; - }); - systems = [ "cl-glfw-opengl-arb_multitexture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_occlusion_query = { - pname = "cl-glfw-opengl-arb_occlusion_query"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_occlusion_query" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_occlusion_query"; - asd = "cl-glfw-opengl-arb_occlusion_query"; - }); - systems = [ "cl-glfw-opengl-arb_occlusion_query" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_occlusion_query2 = { - pname = "cl-glfw-opengl-arb_occlusion_query2"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_occlusion_query2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_occlusion_query2"; - asd = "cl-glfw-opengl-arb_occlusion_query2"; - }); - systems = [ "cl-glfw-opengl-arb_occlusion_query2" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_pixel_buffer_object = { - pname = "cl-glfw-opengl-arb_pixel_buffer_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_pixel_buffer_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_pixel_buffer_object"; - asd = "cl-glfw-opengl-arb_pixel_buffer_object"; - }); - systems = [ "cl-glfw-opengl-arb_pixel_buffer_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_point_parameters = { - pname = "cl-glfw-opengl-arb_point_parameters"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_point_parameters" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_point_parameters"; - asd = "cl-glfw-opengl-arb_point_parameters"; - }); - systems = [ "cl-glfw-opengl-arb_point_parameters" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_point_sprite = { - pname = "cl-glfw-opengl-arb_point_sprite"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_point_sprite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_point_sprite"; - asd = "cl-glfw-opengl-arb_point_sprite"; - }); - systems = [ "cl-glfw-opengl-arb_point_sprite" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_provoking_vertex = { - pname = "cl-glfw-opengl-arb_provoking_vertex"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_provoking_vertex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_provoking_vertex"; - asd = "cl-glfw-opengl-arb_provoking_vertex"; - }); - systems = [ "cl-glfw-opengl-arb_provoking_vertex" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_robustness = { - pname = "cl-glfw-opengl-arb_robustness"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_robustness" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_robustness"; - asd = "cl-glfw-opengl-arb_robustness"; - }); - systems = [ "cl-glfw-opengl-arb_robustness" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_sample_shading = { - pname = "cl-glfw-opengl-arb_sample_shading"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_sample_shading" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_sample_shading"; - asd = "cl-glfw-opengl-arb_sample_shading"; - }); - systems = [ "cl-glfw-opengl-arb_sample_shading" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_sampler_objects = { - pname = "cl-glfw-opengl-arb_sampler_objects"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_sampler_objects" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_sampler_objects"; - asd = "cl-glfw-opengl-arb_sampler_objects"; - }); - systems = [ "cl-glfw-opengl-arb_sampler_objects" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_seamless_cube_map = { - pname = "cl-glfw-opengl-arb_seamless_cube_map"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_seamless_cube_map" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_seamless_cube_map"; - asd = "cl-glfw-opengl-arb_seamless_cube_map"; - }); - systems = [ "cl-glfw-opengl-arb_seamless_cube_map" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_separate_shader_objects = { - pname = "cl-glfw-opengl-arb_separate_shader_objects"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_separate_shader_objects" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_separate_shader_objects"; - asd = "cl-glfw-opengl-arb_separate_shader_objects"; - }); - systems = [ "cl-glfw-opengl-arb_separate_shader_objects" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_shader_objects = { - pname = "cl-glfw-opengl-arb_shader_objects"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_shader_objects" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_shader_objects"; - asd = "cl-glfw-opengl-arb_shader_objects"; - }); - systems = [ "cl-glfw-opengl-arb_shader_objects" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_shader_subroutine = { - pname = "cl-glfw-opengl-arb_shader_subroutine"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_shader_subroutine" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_shader_subroutine"; - asd = "cl-glfw-opengl-arb_shader_subroutine"; - }); - systems = [ "cl-glfw-opengl-arb_shader_subroutine" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_shading_language_100 = { - pname = "cl-glfw-opengl-arb_shading_language_100"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_shading_language_100" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_shading_language_100"; - asd = "cl-glfw-opengl-arb_shading_language_100"; - }); - systems = [ "cl-glfw-opengl-arb_shading_language_100" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_shading_language_include = { - pname = "cl-glfw-opengl-arb_shading_language_include"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_shading_language_include" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_shading_language_include"; - asd = "cl-glfw-opengl-arb_shading_language_include"; - }); - systems = [ "cl-glfw-opengl-arb_shading_language_include" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_shadow = { - pname = "cl-glfw-opengl-arb_shadow"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_shadow" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_shadow"; - asd = "cl-glfw-opengl-arb_shadow"; - }); - systems = [ "cl-glfw-opengl-arb_shadow" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_shadow_ambient = { - pname = "cl-glfw-opengl-arb_shadow_ambient"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_shadow_ambient" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_shadow_ambient"; - asd = "cl-glfw-opengl-arb_shadow_ambient"; - }); - systems = [ "cl-glfw-opengl-arb_shadow_ambient" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_tessellation_shader = { - pname = "cl-glfw-opengl-arb_tessellation_shader"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_tessellation_shader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_tessellation_shader"; - asd = "cl-glfw-opengl-arb_tessellation_shader"; - }); - systems = [ "cl-glfw-opengl-arb_tessellation_shader" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_border_clamp = { - pname = "cl-glfw-opengl-arb_texture_border_clamp"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_border_clamp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_border_clamp"; - asd = "cl-glfw-opengl-arb_texture_border_clamp"; - }); - systems = [ "cl-glfw-opengl-arb_texture_border_clamp" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_buffer_object = { - pname = "cl-glfw-opengl-arb_texture_buffer_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_buffer_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_buffer_object"; - asd = "cl-glfw-opengl-arb_texture_buffer_object"; - }); - systems = [ "cl-glfw-opengl-arb_texture_buffer_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_buffer_object_rgb32 = { - pname = "cl-glfw-opengl-arb_texture_buffer_object_rgb32"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_buffer_object_rgb32" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_buffer_object_rgb32"; - asd = "cl-glfw-opengl-arb_texture_buffer_object_rgb32"; - }); - systems = [ "cl-glfw-opengl-arb_texture_buffer_object_rgb32" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_compression = { - pname = "cl-glfw-opengl-arb_texture_compression"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_compression" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_compression"; - asd = "cl-glfw-opengl-arb_texture_compression"; - }); - systems = [ "cl-glfw-opengl-arb_texture_compression" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_compression_bptc = { - pname = "cl-glfw-opengl-arb_texture_compression_bptc"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_compression_bptc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_compression_bptc"; - asd = "cl-glfw-opengl-arb_texture_compression_bptc"; - }); - systems = [ "cl-glfw-opengl-arb_texture_compression_bptc" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_compression_rgtc = { - pname = "cl-glfw-opengl-arb_texture_compression_rgtc"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_compression_rgtc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_compression_rgtc"; - asd = "cl-glfw-opengl-arb_texture_compression_rgtc"; - }); - systems = [ "cl-glfw-opengl-arb_texture_compression_rgtc" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_cube_map = { - pname = "cl-glfw-opengl-arb_texture_cube_map"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_cube_map" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_cube_map"; - asd = "cl-glfw-opengl-arb_texture_cube_map"; - }); - systems = [ "cl-glfw-opengl-arb_texture_cube_map" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_cube_map_array = { - pname = "cl-glfw-opengl-arb_texture_cube_map_array"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_cube_map_array" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_cube_map_array"; - asd = "cl-glfw-opengl-arb_texture_cube_map_array"; - }); - systems = [ "cl-glfw-opengl-arb_texture_cube_map_array" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_env_combine = { - pname = "cl-glfw-opengl-arb_texture_env_combine"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_env_combine" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_env_combine"; - asd = "cl-glfw-opengl-arb_texture_env_combine"; - }); - systems = [ "cl-glfw-opengl-arb_texture_env_combine" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_env_dot3 = { - pname = "cl-glfw-opengl-arb_texture_env_dot3"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_env_dot3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_env_dot3"; - asd = "cl-glfw-opengl-arb_texture_env_dot3"; - }); - systems = [ "cl-glfw-opengl-arb_texture_env_dot3" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_float = { - pname = "cl-glfw-opengl-arb_texture_float"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_float" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_float"; - asd = "cl-glfw-opengl-arb_texture_float"; - }); - systems = [ "cl-glfw-opengl-arb_texture_float" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_gather = { - pname = "cl-glfw-opengl-arb_texture_gather"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_gather" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_gather"; - asd = "cl-glfw-opengl-arb_texture_gather"; - }); - systems = [ "cl-glfw-opengl-arb_texture_gather" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_mirrored_repeat = { - pname = "cl-glfw-opengl-arb_texture_mirrored_repeat"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_mirrored_repeat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_mirrored_repeat"; - asd = "cl-glfw-opengl-arb_texture_mirrored_repeat"; - }); - systems = [ "cl-glfw-opengl-arb_texture_mirrored_repeat" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_multisample = { - pname = "cl-glfw-opengl-arb_texture_multisample"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_multisample" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_multisample"; - asd = "cl-glfw-opengl-arb_texture_multisample"; - }); - systems = [ "cl-glfw-opengl-arb_texture_multisample" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_rectangle = { - pname = "cl-glfw-opengl-arb_texture_rectangle"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_rectangle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_rectangle"; - asd = "cl-glfw-opengl-arb_texture_rectangle"; - }); - systems = [ "cl-glfw-opengl-arb_texture_rectangle" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_rg = { - pname = "cl-glfw-opengl-arb_texture_rg"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_rg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_rg"; - asd = "cl-glfw-opengl-arb_texture_rg"; - }); - systems = [ "cl-glfw-opengl-arb_texture_rg" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_rgb10_a2ui = { - pname = "cl-glfw-opengl-arb_texture_rgb10_a2ui"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_rgb10_a2ui" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_rgb10_a2ui"; - asd = "cl-glfw-opengl-arb_texture_rgb10_a2ui"; - }); - systems = [ "cl-glfw-opengl-arb_texture_rgb10_a2ui" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_texture_swizzle = { - pname = "cl-glfw-opengl-arb_texture_swizzle"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_texture_swizzle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_texture_swizzle"; - asd = "cl-glfw-opengl-arb_texture_swizzle"; - }); - systems = [ "cl-glfw-opengl-arb_texture_swizzle" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_timer_query = { - pname = "cl-glfw-opengl-arb_timer_query"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_timer_query" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_timer_query"; - asd = "cl-glfw-opengl-arb_timer_query"; - }); - systems = [ "cl-glfw-opengl-arb_timer_query" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_transform_feedback2 = { - pname = "cl-glfw-opengl-arb_transform_feedback2"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_transform_feedback2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_transform_feedback2"; - asd = "cl-glfw-opengl-arb_transform_feedback2"; - }); - systems = [ "cl-glfw-opengl-arb_transform_feedback2" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_transpose_matrix = { - pname = "cl-glfw-opengl-arb_transpose_matrix"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_transpose_matrix" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_transpose_matrix"; - asd = "cl-glfw-opengl-arb_transpose_matrix"; - }); - systems = [ "cl-glfw-opengl-arb_transpose_matrix" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_uniform_buffer_object = { - pname = "cl-glfw-opengl-arb_uniform_buffer_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_uniform_buffer_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_uniform_buffer_object"; - asd = "cl-glfw-opengl-arb_uniform_buffer_object"; - }); - systems = [ "cl-glfw-opengl-arb_uniform_buffer_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_vertex_array_bgra = { - pname = "cl-glfw-opengl-arb_vertex_array_bgra"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_vertex_array_bgra" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_vertex_array_bgra"; - asd = "cl-glfw-opengl-arb_vertex_array_bgra"; - }); - systems = [ "cl-glfw-opengl-arb_vertex_array_bgra" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_vertex_array_object = { - pname = "cl-glfw-opengl-arb_vertex_array_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_vertex_array_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_vertex_array_object"; - asd = "cl-glfw-opengl-arb_vertex_array_object"; - }); - systems = [ "cl-glfw-opengl-arb_vertex_array_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_vertex_attrib_64bit = { - pname = "cl-glfw-opengl-arb_vertex_attrib_64bit"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_vertex_attrib_64bit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_vertex_attrib_64bit"; - asd = "cl-glfw-opengl-arb_vertex_attrib_64bit"; - }); - systems = [ "cl-glfw-opengl-arb_vertex_attrib_64bit" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_vertex_blend = { - pname = "cl-glfw-opengl-arb_vertex_blend"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_vertex_blend" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_vertex_blend"; - asd = "cl-glfw-opengl-arb_vertex_blend"; - }); - systems = [ "cl-glfw-opengl-arb_vertex_blend" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_vertex_buffer_object = { - pname = "cl-glfw-opengl-arb_vertex_buffer_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_vertex_buffer_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_vertex_buffer_object"; - asd = "cl-glfw-opengl-arb_vertex_buffer_object"; - }); - systems = [ "cl-glfw-opengl-arb_vertex_buffer_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_vertex_program = { - pname = "cl-glfw-opengl-arb_vertex_program"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_vertex_program" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_vertex_program"; - asd = "cl-glfw-opengl-arb_vertex_program"; - }); - systems = [ "cl-glfw-opengl-arb_vertex_program" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_vertex_shader = { - pname = "cl-glfw-opengl-arb_vertex_shader"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_vertex_shader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_vertex_shader"; - asd = "cl-glfw-opengl-arb_vertex_shader"; - }); - systems = [ "cl-glfw-opengl-arb_vertex_shader" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_vertex_type_2_10_10_10_rev = { - pname = "cl-glfw-opengl-arb_vertex_type_2_10_10_10_rev"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_vertex_type_2_10_10_10_rev" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_vertex_type_2_10_10_10_rev"; - asd = "cl-glfw-opengl-arb_vertex_type_2_10_10_10_rev"; - }); - systems = [ "cl-glfw-opengl-arb_vertex_type_2_10_10_10_rev" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_viewport_array = { - pname = "cl-glfw-opengl-arb_viewport_array"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_viewport_array" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_viewport_array"; - asd = "cl-glfw-opengl-arb_viewport_array"; - }); - systems = [ "cl-glfw-opengl-arb_viewport_array" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-arb_window_pos = { - pname = "cl-glfw-opengl-arb_window_pos"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-arb_window_pos" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-arb_window_pos"; - asd = "cl-glfw-opengl-arb_window_pos"; - }); - systems = [ "cl-glfw-opengl-arb_window_pos" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_draw_buffers = { - pname = "cl-glfw-opengl-ati_draw_buffers"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_draw_buffers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_draw_buffers"; - asd = "cl-glfw-opengl-ati_draw_buffers"; - }); - systems = [ "cl-glfw-opengl-ati_draw_buffers" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_element_array = { - pname = "cl-glfw-opengl-ati_element_array"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_element_array" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_element_array"; - asd = "cl-glfw-opengl-ati_element_array"; - }); - systems = [ "cl-glfw-opengl-ati_element_array" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_envmap_bumpmap = { - pname = "cl-glfw-opengl-ati_envmap_bumpmap"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_envmap_bumpmap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_envmap_bumpmap"; - asd = "cl-glfw-opengl-ati_envmap_bumpmap"; - }); - systems = [ "cl-glfw-opengl-ati_envmap_bumpmap" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_fragment_shader = { - pname = "cl-glfw-opengl-ati_fragment_shader"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_fragment_shader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_fragment_shader"; - asd = "cl-glfw-opengl-ati_fragment_shader"; - }); - systems = [ "cl-glfw-opengl-ati_fragment_shader" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_map_object_buffer = { - pname = "cl-glfw-opengl-ati_map_object_buffer"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_map_object_buffer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_map_object_buffer"; - asd = "cl-glfw-opengl-ati_map_object_buffer"; - }); - systems = [ "cl-glfw-opengl-ati_map_object_buffer" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_meminfo = { - pname = "cl-glfw-opengl-ati_meminfo"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_meminfo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_meminfo"; - asd = "cl-glfw-opengl-ati_meminfo"; - }); - systems = [ "cl-glfw-opengl-ati_meminfo" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_pixel_format_float = { - pname = "cl-glfw-opengl-ati_pixel_format_float"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_pixel_format_float" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_pixel_format_float"; - asd = "cl-glfw-opengl-ati_pixel_format_float"; - }); - systems = [ "cl-glfw-opengl-ati_pixel_format_float" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_pn_triangles = { - pname = "cl-glfw-opengl-ati_pn_triangles"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_pn_triangles" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_pn_triangles"; - asd = "cl-glfw-opengl-ati_pn_triangles"; - }); - systems = [ "cl-glfw-opengl-ati_pn_triangles" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_separate_stencil = { - pname = "cl-glfw-opengl-ati_separate_stencil"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_separate_stencil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_separate_stencil"; - asd = "cl-glfw-opengl-ati_separate_stencil"; - }); - systems = [ "cl-glfw-opengl-ati_separate_stencil" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_text_fragment_shader = { - pname = "cl-glfw-opengl-ati_text_fragment_shader"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_text_fragment_shader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_text_fragment_shader"; - asd = "cl-glfw-opengl-ati_text_fragment_shader"; - }); - systems = [ "cl-glfw-opengl-ati_text_fragment_shader" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_texture_env_combine3 = { - pname = "cl-glfw-opengl-ati_texture_env_combine3"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_texture_env_combine3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_texture_env_combine3"; - asd = "cl-glfw-opengl-ati_texture_env_combine3"; - }); - systems = [ "cl-glfw-opengl-ati_texture_env_combine3" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_texture_float = { - pname = "cl-glfw-opengl-ati_texture_float"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_texture_float" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_texture_float"; - asd = "cl-glfw-opengl-ati_texture_float"; - }); - systems = [ "cl-glfw-opengl-ati_texture_float" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_texture_mirror_once = { - pname = "cl-glfw-opengl-ati_texture_mirror_once"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_texture_mirror_once" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_texture_mirror_once"; - asd = "cl-glfw-opengl-ati_texture_mirror_once"; - }); - systems = [ "cl-glfw-opengl-ati_texture_mirror_once" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_vertex_array_object = { - pname = "cl-glfw-opengl-ati_vertex_array_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_vertex_array_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_vertex_array_object"; - asd = "cl-glfw-opengl-ati_vertex_array_object"; - }); - systems = [ "cl-glfw-opengl-ati_vertex_array_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_vertex_attrib_array_object = { - pname = "cl-glfw-opengl-ati_vertex_attrib_array_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_vertex_attrib_array_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_vertex_attrib_array_object"; - asd = "cl-glfw-opengl-ati_vertex_attrib_array_object"; - }); - systems = [ "cl-glfw-opengl-ati_vertex_attrib_array_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ati_vertex_streams = { - pname = "cl-glfw-opengl-ati_vertex_streams"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ati_vertex_streams" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ati_vertex_streams"; - asd = "cl-glfw-opengl-ati_vertex_streams"; - }); - systems = [ "cl-glfw-opengl-ati_vertex_streams" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-core = { - pname = "cl-glfw-opengl-core"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-core"; - asd = "cl-glfw-opengl-core"; - }); - systems = [ "cl-glfw-opengl-core" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-glfw-types" pkgs) ]; - }; - cl-glfw-opengl-ext_422_pixels = { - pname = "cl-glfw-opengl-ext_422_pixels"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_422_pixels" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_422_pixels"; - asd = "cl-glfw-opengl-ext_422_pixels"; - }); - systems = [ "cl-glfw-opengl-ext_422_pixels" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_abgr = { - pname = "cl-glfw-opengl-ext_abgr"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_abgr" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_abgr"; - asd = "cl-glfw-opengl-ext_abgr"; - }); - systems = [ "cl-glfw-opengl-ext_abgr" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_bgra = { - pname = "cl-glfw-opengl-ext_bgra"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_bgra" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_bgra"; - asd = "cl-glfw-opengl-ext_bgra"; - }); - systems = [ "cl-glfw-opengl-ext_bgra" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_bindable_uniform = { - pname = "cl-glfw-opengl-ext_bindable_uniform"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_bindable_uniform" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_bindable_uniform"; - asd = "cl-glfw-opengl-ext_bindable_uniform"; - }); - systems = [ "cl-glfw-opengl-ext_bindable_uniform" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_blend_color = { - pname = "cl-glfw-opengl-ext_blend_color"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_blend_color" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_blend_color"; - asd = "cl-glfw-opengl-ext_blend_color"; - }); - systems = [ "cl-glfw-opengl-ext_blend_color" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_blend_equation_separate = { - pname = "cl-glfw-opengl-ext_blend_equation_separate"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_blend_equation_separate" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_blend_equation_separate"; - asd = "cl-glfw-opengl-ext_blend_equation_separate"; - }); - systems = [ "cl-glfw-opengl-ext_blend_equation_separate" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_blend_func_separate = { - pname = "cl-glfw-opengl-ext_blend_func_separate"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_blend_func_separate" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_blend_func_separate"; - asd = "cl-glfw-opengl-ext_blend_func_separate"; - }); - systems = [ "cl-glfw-opengl-ext_blend_func_separate" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_blend_minmax = { - pname = "cl-glfw-opengl-ext_blend_minmax"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_blend_minmax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_blend_minmax"; - asd = "cl-glfw-opengl-ext_blend_minmax"; - }); - systems = [ "cl-glfw-opengl-ext_blend_minmax" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_blend_subtract = { - pname = "cl-glfw-opengl-ext_blend_subtract"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_blend_subtract" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_blend_subtract"; - asd = "cl-glfw-opengl-ext_blend_subtract"; - }); - systems = [ "cl-glfw-opengl-ext_blend_subtract" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_clip_volume_hint = { - pname = "cl-glfw-opengl-ext_clip_volume_hint"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_clip_volume_hint" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_clip_volume_hint"; - asd = "cl-glfw-opengl-ext_clip_volume_hint"; - }); - systems = [ "cl-glfw-opengl-ext_clip_volume_hint" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_cmyka = { - pname = "cl-glfw-opengl-ext_cmyka"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_cmyka" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_cmyka"; - asd = "cl-glfw-opengl-ext_cmyka"; - }); - systems = [ "cl-glfw-opengl-ext_cmyka" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_color_subtable = { - pname = "cl-glfw-opengl-ext_color_subtable"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_color_subtable" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_color_subtable"; - asd = "cl-glfw-opengl-ext_color_subtable"; - }); - systems = [ "cl-glfw-opengl-ext_color_subtable" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_compiled_vertex_array = { - pname = "cl-glfw-opengl-ext_compiled_vertex_array"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_compiled_vertex_array" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_compiled_vertex_array"; - asd = "cl-glfw-opengl-ext_compiled_vertex_array"; - }); - systems = [ "cl-glfw-opengl-ext_compiled_vertex_array" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_convolution = { - pname = "cl-glfw-opengl-ext_convolution"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_convolution" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_convolution"; - asd = "cl-glfw-opengl-ext_convolution"; - }); - systems = [ "cl-glfw-opengl-ext_convolution" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_coordinate_frame = { - pname = "cl-glfw-opengl-ext_coordinate_frame"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_coordinate_frame" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_coordinate_frame"; - asd = "cl-glfw-opengl-ext_coordinate_frame"; - }); - systems = [ "cl-glfw-opengl-ext_coordinate_frame" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_copy_texture = { - pname = "cl-glfw-opengl-ext_copy_texture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_copy_texture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_copy_texture"; - asd = "cl-glfw-opengl-ext_copy_texture"; - }); - systems = [ "cl-glfw-opengl-ext_copy_texture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_cull_vertex = { - pname = "cl-glfw-opengl-ext_cull_vertex"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_cull_vertex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_cull_vertex"; - asd = "cl-glfw-opengl-ext_cull_vertex"; - }); - systems = [ "cl-glfw-opengl-ext_cull_vertex" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_depth_bounds_test = { - pname = "cl-glfw-opengl-ext_depth_bounds_test"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_depth_bounds_test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_depth_bounds_test"; - asd = "cl-glfw-opengl-ext_depth_bounds_test"; - }); - systems = [ "cl-glfw-opengl-ext_depth_bounds_test" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_direct_state_access = { - pname = "cl-glfw-opengl-ext_direct_state_access"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_direct_state_access" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_direct_state_access"; - asd = "cl-glfw-opengl-ext_direct_state_access"; - }); - systems = [ "cl-glfw-opengl-ext_direct_state_access" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_draw_buffers2 = { - pname = "cl-glfw-opengl-ext_draw_buffers2"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_draw_buffers2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_draw_buffers2"; - asd = "cl-glfw-opengl-ext_draw_buffers2"; - }); - systems = [ "cl-glfw-opengl-ext_draw_buffers2" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_draw_instanced = { - pname = "cl-glfw-opengl-ext_draw_instanced"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_draw_instanced" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_draw_instanced"; - asd = "cl-glfw-opengl-ext_draw_instanced"; - }); - systems = [ "cl-glfw-opengl-ext_draw_instanced" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_draw_range_elements = { - pname = "cl-glfw-opengl-ext_draw_range_elements"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_draw_range_elements" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_draw_range_elements"; - asd = "cl-glfw-opengl-ext_draw_range_elements"; - }); - systems = [ "cl-glfw-opengl-ext_draw_range_elements" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_fog_coord = { - pname = "cl-glfw-opengl-ext_fog_coord"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_fog_coord" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_fog_coord"; - asd = "cl-glfw-opengl-ext_fog_coord"; - }); - systems = [ "cl-glfw-opengl-ext_fog_coord" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_framebuffer_blit = { - pname = "cl-glfw-opengl-ext_framebuffer_blit"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_framebuffer_blit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_framebuffer_blit"; - asd = "cl-glfw-opengl-ext_framebuffer_blit"; - }); - systems = [ "cl-glfw-opengl-ext_framebuffer_blit" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_framebuffer_multisample = { - pname = "cl-glfw-opengl-ext_framebuffer_multisample"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_framebuffer_multisample" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_framebuffer_multisample"; - asd = "cl-glfw-opengl-ext_framebuffer_multisample"; - }); - systems = [ "cl-glfw-opengl-ext_framebuffer_multisample" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_framebuffer_object = { - pname = "cl-glfw-opengl-ext_framebuffer_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_framebuffer_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_framebuffer_object"; - asd = "cl-glfw-opengl-ext_framebuffer_object"; - }); - systems = [ "cl-glfw-opengl-ext_framebuffer_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_framebuffer_srgb = { - pname = "cl-glfw-opengl-ext_framebuffer_srgb"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_framebuffer_srgb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_framebuffer_srgb"; - asd = "cl-glfw-opengl-ext_framebuffer_srgb"; - }); - systems = [ "cl-glfw-opengl-ext_framebuffer_srgb" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_geometry_shader4 = { - pname = "cl-glfw-opengl-ext_geometry_shader4"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_geometry_shader4" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_geometry_shader4"; - asd = "cl-glfw-opengl-ext_geometry_shader4"; - }); - systems = [ "cl-glfw-opengl-ext_geometry_shader4" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_gpu_program_parameters = { - pname = "cl-glfw-opengl-ext_gpu_program_parameters"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_gpu_program_parameters" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_gpu_program_parameters"; - asd = "cl-glfw-opengl-ext_gpu_program_parameters"; - }); - systems = [ "cl-glfw-opengl-ext_gpu_program_parameters" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_gpu_shader4 = { - pname = "cl-glfw-opengl-ext_gpu_shader4"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_gpu_shader4" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_gpu_shader4"; - asd = "cl-glfw-opengl-ext_gpu_shader4"; - }); - systems = [ "cl-glfw-opengl-ext_gpu_shader4" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_histogram = { - pname = "cl-glfw-opengl-ext_histogram"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_histogram" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_histogram"; - asd = "cl-glfw-opengl-ext_histogram"; - }); - systems = [ "cl-glfw-opengl-ext_histogram" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_index_array_formats = { - pname = "cl-glfw-opengl-ext_index_array_formats"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_index_array_formats" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_index_array_formats"; - asd = "cl-glfw-opengl-ext_index_array_formats"; - }); - systems = [ "cl-glfw-opengl-ext_index_array_formats" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_index_func = { - pname = "cl-glfw-opengl-ext_index_func"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_index_func" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_index_func"; - asd = "cl-glfw-opengl-ext_index_func"; - }); - systems = [ "cl-glfw-opengl-ext_index_func" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_index_material = { - pname = "cl-glfw-opengl-ext_index_material"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_index_material" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_index_material"; - asd = "cl-glfw-opengl-ext_index_material"; - }); - systems = [ "cl-glfw-opengl-ext_index_material" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_light_texture = { - pname = "cl-glfw-opengl-ext_light_texture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_light_texture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_light_texture"; - asd = "cl-glfw-opengl-ext_light_texture"; - }); - systems = [ "cl-glfw-opengl-ext_light_texture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_multi_draw_arrays = { - pname = "cl-glfw-opengl-ext_multi_draw_arrays"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_multi_draw_arrays" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_multi_draw_arrays"; - asd = "cl-glfw-opengl-ext_multi_draw_arrays"; - }); - systems = [ "cl-glfw-opengl-ext_multi_draw_arrays" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_multisample = { - pname = "cl-glfw-opengl-ext_multisample"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_multisample" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_multisample"; - asd = "cl-glfw-opengl-ext_multisample"; - }); - systems = [ "cl-glfw-opengl-ext_multisample" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_packed_depth_stencil = { - pname = "cl-glfw-opengl-ext_packed_depth_stencil"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_packed_depth_stencil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_packed_depth_stencil"; - asd = "cl-glfw-opengl-ext_packed_depth_stencil"; - }); - systems = [ "cl-glfw-opengl-ext_packed_depth_stencil" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_packed_float = { - pname = "cl-glfw-opengl-ext_packed_float"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_packed_float" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_packed_float"; - asd = "cl-glfw-opengl-ext_packed_float"; - }); - systems = [ "cl-glfw-opengl-ext_packed_float" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_packed_pixels = { - pname = "cl-glfw-opengl-ext_packed_pixels"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_packed_pixels" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_packed_pixels"; - asd = "cl-glfw-opengl-ext_packed_pixels"; - }); - systems = [ "cl-glfw-opengl-ext_packed_pixels" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_paletted_texture = { - pname = "cl-glfw-opengl-ext_paletted_texture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_paletted_texture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_paletted_texture"; - asd = "cl-glfw-opengl-ext_paletted_texture"; - }); - systems = [ "cl-glfw-opengl-ext_paletted_texture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_pixel_buffer_object = { - pname = "cl-glfw-opengl-ext_pixel_buffer_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_pixel_buffer_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_pixel_buffer_object"; - asd = "cl-glfw-opengl-ext_pixel_buffer_object"; - }); - systems = [ "cl-glfw-opengl-ext_pixel_buffer_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_pixel_transform = { - pname = "cl-glfw-opengl-ext_pixel_transform"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_pixel_transform" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_pixel_transform"; - asd = "cl-glfw-opengl-ext_pixel_transform"; - }); - systems = [ "cl-glfw-opengl-ext_pixel_transform" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_point_parameters = { - pname = "cl-glfw-opengl-ext_point_parameters"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_point_parameters" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_point_parameters"; - asd = "cl-glfw-opengl-ext_point_parameters"; - }); - systems = [ "cl-glfw-opengl-ext_point_parameters" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_polygon_offset = { - pname = "cl-glfw-opengl-ext_polygon_offset"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_polygon_offset" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_polygon_offset"; - asd = "cl-glfw-opengl-ext_polygon_offset"; - }); - systems = [ "cl-glfw-opengl-ext_polygon_offset" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_provoking_vertex = { - pname = "cl-glfw-opengl-ext_provoking_vertex"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_provoking_vertex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_provoking_vertex"; - asd = "cl-glfw-opengl-ext_provoking_vertex"; - }); - systems = [ "cl-glfw-opengl-ext_provoking_vertex" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_secondary_color = { - pname = "cl-glfw-opengl-ext_secondary_color"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_secondary_color" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_secondary_color"; - asd = "cl-glfw-opengl-ext_secondary_color"; - }); - systems = [ "cl-glfw-opengl-ext_secondary_color" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_separate_shader_objects = { - pname = "cl-glfw-opengl-ext_separate_shader_objects"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_separate_shader_objects" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_separate_shader_objects"; - asd = "cl-glfw-opengl-ext_separate_shader_objects"; - }); - systems = [ "cl-glfw-opengl-ext_separate_shader_objects" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_separate_specular_color = { - pname = "cl-glfw-opengl-ext_separate_specular_color"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_separate_specular_color" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_separate_specular_color"; - asd = "cl-glfw-opengl-ext_separate_specular_color"; - }); - systems = [ "cl-glfw-opengl-ext_separate_specular_color" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_shader_image_load_store = { - pname = "cl-glfw-opengl-ext_shader_image_load_store"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_shader_image_load_store" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_shader_image_load_store"; - asd = "cl-glfw-opengl-ext_shader_image_load_store"; - }); - systems = [ "cl-glfw-opengl-ext_shader_image_load_store" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_stencil_clear_tag = { - pname = "cl-glfw-opengl-ext_stencil_clear_tag"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_stencil_clear_tag" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_stencil_clear_tag"; - asd = "cl-glfw-opengl-ext_stencil_clear_tag"; - }); - systems = [ "cl-glfw-opengl-ext_stencil_clear_tag" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_stencil_two_side = { - pname = "cl-glfw-opengl-ext_stencil_two_side"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_stencil_two_side" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_stencil_two_side"; - asd = "cl-glfw-opengl-ext_stencil_two_side"; - }); - systems = [ "cl-glfw-opengl-ext_stencil_two_side" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_stencil_wrap = { - pname = "cl-glfw-opengl-ext_stencil_wrap"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_stencil_wrap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_stencil_wrap"; - asd = "cl-glfw-opengl-ext_stencil_wrap"; - }); - systems = [ "cl-glfw-opengl-ext_stencil_wrap" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_subtexture = { - pname = "cl-glfw-opengl-ext_subtexture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_subtexture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_subtexture"; - asd = "cl-glfw-opengl-ext_subtexture"; - }); - systems = [ "cl-glfw-opengl-ext_subtexture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture = { - pname = "cl-glfw-opengl-ext_texture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture"; - asd = "cl-glfw-opengl-ext_texture"; - }); - systems = [ "cl-glfw-opengl-ext_texture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture3d = { - pname = "cl-glfw-opengl-ext_texture3d"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture3d" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture3d"; - asd = "cl-glfw-opengl-ext_texture3d"; - }); - systems = [ "cl-glfw-opengl-ext_texture3d" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_array = { - pname = "cl-glfw-opengl-ext_texture_array"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_array" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_array"; - asd = "cl-glfw-opengl-ext_texture_array"; - }); - systems = [ "cl-glfw-opengl-ext_texture_array" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_buffer_object = { - pname = "cl-glfw-opengl-ext_texture_buffer_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_buffer_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_buffer_object"; - asd = "cl-glfw-opengl-ext_texture_buffer_object"; - }); - systems = [ "cl-glfw-opengl-ext_texture_buffer_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_compression_latc = { - pname = "cl-glfw-opengl-ext_texture_compression_latc"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_compression_latc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_compression_latc"; - asd = "cl-glfw-opengl-ext_texture_compression_latc"; - }); - systems = [ "cl-glfw-opengl-ext_texture_compression_latc" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_compression_rgtc = { - pname = "cl-glfw-opengl-ext_texture_compression_rgtc"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_compression_rgtc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_compression_rgtc"; - asd = "cl-glfw-opengl-ext_texture_compression_rgtc"; - }); - systems = [ "cl-glfw-opengl-ext_texture_compression_rgtc" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_compression_s3tc = { - pname = "cl-glfw-opengl-ext_texture_compression_s3tc"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_compression_s3tc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_compression_s3tc"; - asd = "cl-glfw-opengl-ext_texture_compression_s3tc"; - }); - systems = [ "cl-glfw-opengl-ext_texture_compression_s3tc" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_cube_map = { - pname = "cl-glfw-opengl-ext_texture_cube_map"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_cube_map" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_cube_map"; - asd = "cl-glfw-opengl-ext_texture_cube_map"; - }); - systems = [ "cl-glfw-opengl-ext_texture_cube_map" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_env_combine = { - pname = "cl-glfw-opengl-ext_texture_env_combine"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_env_combine" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_env_combine"; - asd = "cl-glfw-opengl-ext_texture_env_combine"; - }); - systems = [ "cl-glfw-opengl-ext_texture_env_combine" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_env_dot3 = { - pname = "cl-glfw-opengl-ext_texture_env_dot3"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_env_dot3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_env_dot3"; - asd = "cl-glfw-opengl-ext_texture_env_dot3"; - }); - systems = [ "cl-glfw-opengl-ext_texture_env_dot3" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_filter_anisotropic = { - pname = "cl-glfw-opengl-ext_texture_filter_anisotropic"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_filter_anisotropic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_filter_anisotropic"; - asd = "cl-glfw-opengl-ext_texture_filter_anisotropic"; - }); - systems = [ "cl-glfw-opengl-ext_texture_filter_anisotropic" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_integer = { - pname = "cl-glfw-opengl-ext_texture_integer"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_integer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_integer"; - asd = "cl-glfw-opengl-ext_texture_integer"; - }); - systems = [ "cl-glfw-opengl-ext_texture_integer" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_lod_bias = { - pname = "cl-glfw-opengl-ext_texture_lod_bias"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_lod_bias" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_lod_bias"; - asd = "cl-glfw-opengl-ext_texture_lod_bias"; - }); - systems = [ "cl-glfw-opengl-ext_texture_lod_bias" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_mirror_clamp = { - pname = "cl-glfw-opengl-ext_texture_mirror_clamp"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_mirror_clamp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_mirror_clamp"; - asd = "cl-glfw-opengl-ext_texture_mirror_clamp"; - }); - systems = [ "cl-glfw-opengl-ext_texture_mirror_clamp" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_object = { - pname = "cl-glfw-opengl-ext_texture_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_object"; - asd = "cl-glfw-opengl-ext_texture_object"; - }); - systems = [ "cl-glfw-opengl-ext_texture_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_perturb_normal = { - pname = "cl-glfw-opengl-ext_texture_perturb_normal"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_perturb_normal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_perturb_normal"; - asd = "cl-glfw-opengl-ext_texture_perturb_normal"; - }); - systems = [ "cl-glfw-opengl-ext_texture_perturb_normal" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_shared_exponent = { - pname = "cl-glfw-opengl-ext_texture_shared_exponent"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_shared_exponent" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_shared_exponent"; - asd = "cl-glfw-opengl-ext_texture_shared_exponent"; - }); - systems = [ "cl-glfw-opengl-ext_texture_shared_exponent" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_snorm = { - pname = "cl-glfw-opengl-ext_texture_snorm"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_snorm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_snorm"; - asd = "cl-glfw-opengl-ext_texture_snorm"; - }); - systems = [ "cl-glfw-opengl-ext_texture_snorm" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_srgb = { - pname = "cl-glfw-opengl-ext_texture_srgb"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_srgb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_srgb"; - asd = "cl-glfw-opengl-ext_texture_srgb"; - }); - systems = [ "cl-glfw-opengl-ext_texture_srgb" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_srgb_decode = { - pname = "cl-glfw-opengl-ext_texture_srgb_decode"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_srgb_decode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_srgb_decode"; - asd = "cl-glfw-opengl-ext_texture_srgb_decode"; - }); - systems = [ "cl-glfw-opengl-ext_texture_srgb_decode" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_texture_swizzle = { - pname = "cl-glfw-opengl-ext_texture_swizzle"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_texture_swizzle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_texture_swizzle"; - asd = "cl-glfw-opengl-ext_texture_swizzle"; - }); - systems = [ "cl-glfw-opengl-ext_texture_swizzle" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_timer_query = { - pname = "cl-glfw-opengl-ext_timer_query"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_timer_query" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_timer_query"; - asd = "cl-glfw-opengl-ext_timer_query"; - }); - systems = [ "cl-glfw-opengl-ext_timer_query" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_transform_feedback = { - pname = "cl-glfw-opengl-ext_transform_feedback"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_transform_feedback" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_transform_feedback"; - asd = "cl-glfw-opengl-ext_transform_feedback"; - }); - systems = [ "cl-glfw-opengl-ext_transform_feedback" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_vertex_array = { - pname = "cl-glfw-opengl-ext_vertex_array"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_vertex_array" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_vertex_array"; - asd = "cl-glfw-opengl-ext_vertex_array"; - }); - systems = [ "cl-glfw-opengl-ext_vertex_array" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_vertex_array_bgra = { - pname = "cl-glfw-opengl-ext_vertex_array_bgra"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_vertex_array_bgra" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_vertex_array_bgra"; - asd = "cl-glfw-opengl-ext_vertex_array_bgra"; - }); - systems = [ "cl-glfw-opengl-ext_vertex_array_bgra" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_vertex_attrib_64bit = { - pname = "cl-glfw-opengl-ext_vertex_attrib_64bit"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_vertex_attrib_64bit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_vertex_attrib_64bit"; - asd = "cl-glfw-opengl-ext_vertex_attrib_64bit"; - }); - systems = [ "cl-glfw-opengl-ext_vertex_attrib_64bit" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_vertex_shader = { - pname = "cl-glfw-opengl-ext_vertex_shader"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_vertex_shader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_vertex_shader"; - asd = "cl-glfw-opengl-ext_vertex_shader"; - }); - systems = [ "cl-glfw-opengl-ext_vertex_shader" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ext_vertex_weighting = { - pname = "cl-glfw-opengl-ext_vertex_weighting"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ext_vertex_weighting" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ext_vertex_weighting"; - asd = "cl-glfw-opengl-ext_vertex_weighting"; - }); - systems = [ "cl-glfw-opengl-ext_vertex_weighting" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-gremedy_frame_terminator = { - pname = "cl-glfw-opengl-gremedy_frame_terminator"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-gremedy_frame_terminator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-gremedy_frame_terminator"; - asd = "cl-glfw-opengl-gremedy_frame_terminator"; - }); - systems = [ "cl-glfw-opengl-gremedy_frame_terminator" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-gremedy_string_marker = { - pname = "cl-glfw-opengl-gremedy_string_marker"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-gremedy_string_marker" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-gremedy_string_marker"; - asd = "cl-glfw-opengl-gremedy_string_marker"; - }); - systems = [ "cl-glfw-opengl-gremedy_string_marker" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-hp_convolution_border_modes = { - pname = "cl-glfw-opengl-hp_convolution_border_modes"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-hp_convolution_border_modes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-hp_convolution_border_modes"; - asd = "cl-glfw-opengl-hp_convolution_border_modes"; - }); - systems = [ "cl-glfw-opengl-hp_convolution_border_modes" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-hp_image_transform = { - pname = "cl-glfw-opengl-hp_image_transform"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-hp_image_transform" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-hp_image_transform"; - asd = "cl-glfw-opengl-hp_image_transform"; - }); - systems = [ "cl-glfw-opengl-hp_image_transform" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-hp_occlusion_test = { - pname = "cl-glfw-opengl-hp_occlusion_test"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-hp_occlusion_test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-hp_occlusion_test"; - asd = "cl-glfw-opengl-hp_occlusion_test"; - }); - systems = [ "cl-glfw-opengl-hp_occlusion_test" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-hp_texture_lighting = { - pname = "cl-glfw-opengl-hp_texture_lighting"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-hp_texture_lighting" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-hp_texture_lighting"; - asd = "cl-glfw-opengl-hp_texture_lighting"; - }); - systems = [ "cl-glfw-opengl-hp_texture_lighting" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ibm_cull_vertex = { - pname = "cl-glfw-opengl-ibm_cull_vertex"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ibm_cull_vertex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ibm_cull_vertex"; - asd = "cl-glfw-opengl-ibm_cull_vertex"; - }); - systems = [ "cl-glfw-opengl-ibm_cull_vertex" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ibm_multimode_draw_arrays = { - pname = "cl-glfw-opengl-ibm_multimode_draw_arrays"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ibm_multimode_draw_arrays" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ibm_multimode_draw_arrays"; - asd = "cl-glfw-opengl-ibm_multimode_draw_arrays"; - }); - systems = [ "cl-glfw-opengl-ibm_multimode_draw_arrays" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ibm_rasterpos_clip = { - pname = "cl-glfw-opengl-ibm_rasterpos_clip"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ibm_rasterpos_clip" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ibm_rasterpos_clip"; - asd = "cl-glfw-opengl-ibm_rasterpos_clip"; - }); - systems = [ "cl-glfw-opengl-ibm_rasterpos_clip" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ibm_texture_mirrored_repeat = { - pname = "cl-glfw-opengl-ibm_texture_mirrored_repeat"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ibm_texture_mirrored_repeat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ibm_texture_mirrored_repeat"; - asd = "cl-glfw-opengl-ibm_texture_mirrored_repeat"; - }); - systems = [ "cl-glfw-opengl-ibm_texture_mirrored_repeat" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ibm_vertex_array_lists = { - pname = "cl-glfw-opengl-ibm_vertex_array_lists"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ibm_vertex_array_lists" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ibm_vertex_array_lists"; - asd = "cl-glfw-opengl-ibm_vertex_array_lists"; - }); - systems = [ "cl-glfw-opengl-ibm_vertex_array_lists" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ingr_blend_func_separate = { - pname = "cl-glfw-opengl-ingr_blend_func_separate"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ingr_blend_func_separate" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ingr_blend_func_separate"; - asd = "cl-glfw-opengl-ingr_blend_func_separate"; - }); - systems = [ "cl-glfw-opengl-ingr_blend_func_separate" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ingr_color_clamp = { - pname = "cl-glfw-opengl-ingr_color_clamp"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ingr_color_clamp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ingr_color_clamp"; - asd = "cl-glfw-opengl-ingr_color_clamp"; - }); - systems = [ "cl-glfw-opengl-ingr_color_clamp" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-ingr_interlace_read = { - pname = "cl-glfw-opengl-ingr_interlace_read"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-ingr_interlace_read" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-ingr_interlace_read"; - asd = "cl-glfw-opengl-ingr_interlace_read"; - }); - systems = [ "cl-glfw-opengl-ingr_interlace_read" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-intel_parallel_arrays = { - pname = "cl-glfw-opengl-intel_parallel_arrays"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-intel_parallel_arrays" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-intel_parallel_arrays"; - asd = "cl-glfw-opengl-intel_parallel_arrays"; - }); - systems = [ "cl-glfw-opengl-intel_parallel_arrays" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-mesa_pack_invert = { - pname = "cl-glfw-opengl-mesa_pack_invert"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-mesa_pack_invert" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-mesa_pack_invert"; - asd = "cl-glfw-opengl-mesa_pack_invert"; - }); - systems = [ "cl-glfw-opengl-mesa_pack_invert" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-mesa_packed_depth_stencil = { - pname = "cl-glfw-opengl-mesa_packed_depth_stencil"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-mesa_packed_depth_stencil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-mesa_packed_depth_stencil"; - asd = "cl-glfw-opengl-mesa_packed_depth_stencil"; - }); - systems = [ "cl-glfw-opengl-mesa_packed_depth_stencil" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-mesa_program_debug = { - pname = "cl-glfw-opengl-mesa_program_debug"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-mesa_program_debug" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-mesa_program_debug"; - asd = "cl-glfw-opengl-mesa_program_debug"; - }); - systems = [ "cl-glfw-opengl-mesa_program_debug" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-mesa_resize_buffers = { - pname = "cl-glfw-opengl-mesa_resize_buffers"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-mesa_resize_buffers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-mesa_resize_buffers"; - asd = "cl-glfw-opengl-mesa_resize_buffers"; - }); - systems = [ "cl-glfw-opengl-mesa_resize_buffers" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-mesa_shader_debug = { - pname = "cl-glfw-opengl-mesa_shader_debug"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-mesa_shader_debug" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-mesa_shader_debug"; - asd = "cl-glfw-opengl-mesa_shader_debug"; - }); - systems = [ "cl-glfw-opengl-mesa_shader_debug" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-mesa_trace = { - pname = "cl-glfw-opengl-mesa_trace"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-mesa_trace" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-mesa_trace"; - asd = "cl-glfw-opengl-mesa_trace"; - }); - systems = [ "cl-glfw-opengl-mesa_trace" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-mesa_window_pos = { - pname = "cl-glfw-opengl-mesa_window_pos"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-mesa_window_pos" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-mesa_window_pos"; - asd = "cl-glfw-opengl-mesa_window_pos"; - }); - systems = [ "cl-glfw-opengl-mesa_window_pos" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-mesa_ycbcr_texture = { - pname = "cl-glfw-opengl-mesa_ycbcr_texture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-mesa_ycbcr_texture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-mesa_ycbcr_texture"; - asd = "cl-glfw-opengl-mesa_ycbcr_texture"; - }); - systems = [ "cl-glfw-opengl-mesa_ycbcr_texture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-mesax_texture_stack = { - pname = "cl-glfw-opengl-mesax_texture_stack"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-mesax_texture_stack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-mesax_texture_stack"; - asd = "cl-glfw-opengl-mesax_texture_stack"; - }); - systems = [ "cl-glfw-opengl-mesax_texture_stack" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_conditional_render = { - pname = "cl-glfw-opengl-nv_conditional_render"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_conditional_render" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_conditional_render"; - asd = "cl-glfw-opengl-nv_conditional_render"; - }); - systems = [ "cl-glfw-opengl-nv_conditional_render" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_copy_depth_to_color = { - pname = "cl-glfw-opengl-nv_copy_depth_to_color"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_copy_depth_to_color" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_copy_depth_to_color"; - asd = "cl-glfw-opengl-nv_copy_depth_to_color"; - }); - systems = [ "cl-glfw-opengl-nv_copy_depth_to_color" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_copy_image = { - pname = "cl-glfw-opengl-nv_copy_image"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_copy_image" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_copy_image"; - asd = "cl-glfw-opengl-nv_copy_image"; - }); - systems = [ "cl-glfw-opengl-nv_copy_image" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_depth_buffer_float = { - pname = "cl-glfw-opengl-nv_depth_buffer_float"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_depth_buffer_float" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_depth_buffer_float"; - asd = "cl-glfw-opengl-nv_depth_buffer_float"; - }); - systems = [ "cl-glfw-opengl-nv_depth_buffer_float" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_depth_clamp = { - pname = "cl-glfw-opengl-nv_depth_clamp"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_depth_clamp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_depth_clamp"; - asd = "cl-glfw-opengl-nv_depth_clamp"; - }); - systems = [ "cl-glfw-opengl-nv_depth_clamp" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_evaluators = { - pname = "cl-glfw-opengl-nv_evaluators"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_evaluators" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_evaluators"; - asd = "cl-glfw-opengl-nv_evaluators"; - }); - systems = [ "cl-glfw-opengl-nv_evaluators" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_explicit_multisample = { - pname = "cl-glfw-opengl-nv_explicit_multisample"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_explicit_multisample" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_explicit_multisample"; - asd = "cl-glfw-opengl-nv_explicit_multisample"; - }); - systems = [ "cl-glfw-opengl-nv_explicit_multisample" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_fence = { - pname = "cl-glfw-opengl-nv_fence"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_fence" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_fence"; - asd = "cl-glfw-opengl-nv_fence"; - }); - systems = [ "cl-glfw-opengl-nv_fence" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_float_buffer = { - pname = "cl-glfw-opengl-nv_float_buffer"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_float_buffer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_float_buffer"; - asd = "cl-glfw-opengl-nv_float_buffer"; - }); - systems = [ "cl-glfw-opengl-nv_float_buffer" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_fog_distance = { - pname = "cl-glfw-opengl-nv_fog_distance"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_fog_distance" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_fog_distance"; - asd = "cl-glfw-opengl-nv_fog_distance"; - }); - systems = [ "cl-glfw-opengl-nv_fog_distance" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_fragment_program = { - pname = "cl-glfw-opengl-nv_fragment_program"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_fragment_program" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_fragment_program"; - asd = "cl-glfw-opengl-nv_fragment_program"; - }); - systems = [ "cl-glfw-opengl-nv_fragment_program" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_fragment_program2 = { - pname = "cl-glfw-opengl-nv_fragment_program2"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_fragment_program2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_fragment_program2"; - asd = "cl-glfw-opengl-nv_fragment_program2"; - }); - systems = [ "cl-glfw-opengl-nv_fragment_program2" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_framebuffer_multisample_coverage = { - pname = "cl-glfw-opengl-nv_framebuffer_multisample_coverage"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_framebuffer_multisample_coverage" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_framebuffer_multisample_coverage"; - asd = "cl-glfw-opengl-nv_framebuffer_multisample_coverage"; - }); - systems = [ "cl-glfw-opengl-nv_framebuffer_multisample_coverage" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_geometry_program4 = { - pname = "cl-glfw-opengl-nv_geometry_program4"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_geometry_program4" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_geometry_program4"; - asd = "cl-glfw-opengl-nv_geometry_program4"; - }); - systems = [ "cl-glfw-opengl-nv_geometry_program4" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_gpu_program4 = { - pname = "cl-glfw-opengl-nv_gpu_program4"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_gpu_program4" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_gpu_program4"; - asd = "cl-glfw-opengl-nv_gpu_program4"; - }); - systems = [ "cl-glfw-opengl-nv_gpu_program4" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_gpu_program5 = { - pname = "cl-glfw-opengl-nv_gpu_program5"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_gpu_program5" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_gpu_program5"; - asd = "cl-glfw-opengl-nv_gpu_program5"; - }); - systems = [ "cl-glfw-opengl-nv_gpu_program5" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_gpu_shader5 = { - pname = "cl-glfw-opengl-nv_gpu_shader5"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_gpu_shader5" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_gpu_shader5"; - asd = "cl-glfw-opengl-nv_gpu_shader5"; - }); - systems = [ "cl-glfw-opengl-nv_gpu_shader5" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_half_float = { - pname = "cl-glfw-opengl-nv_half_float"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_half_float" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_half_float"; - asd = "cl-glfw-opengl-nv_half_float"; - }); - systems = [ "cl-glfw-opengl-nv_half_float" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_light_max_exponent = { - pname = "cl-glfw-opengl-nv_light_max_exponent"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_light_max_exponent" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_light_max_exponent"; - asd = "cl-glfw-opengl-nv_light_max_exponent"; - }); - systems = [ "cl-glfw-opengl-nv_light_max_exponent" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_multisample_coverage = { - pname = "cl-glfw-opengl-nv_multisample_coverage"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_multisample_coverage" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_multisample_coverage"; - asd = "cl-glfw-opengl-nv_multisample_coverage"; - }); - systems = [ "cl-glfw-opengl-nv_multisample_coverage" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_multisample_filter_hint = { - pname = "cl-glfw-opengl-nv_multisample_filter_hint"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_multisample_filter_hint" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_multisample_filter_hint"; - asd = "cl-glfw-opengl-nv_multisample_filter_hint"; - }); - systems = [ "cl-glfw-opengl-nv_multisample_filter_hint" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_occlusion_query = { - pname = "cl-glfw-opengl-nv_occlusion_query"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_occlusion_query" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_occlusion_query"; - asd = "cl-glfw-opengl-nv_occlusion_query"; - }); - systems = [ "cl-glfw-opengl-nv_occlusion_query" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_packed_depth_stencil = { - pname = "cl-glfw-opengl-nv_packed_depth_stencil"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_packed_depth_stencil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_packed_depth_stencil"; - asd = "cl-glfw-opengl-nv_packed_depth_stencil"; - }); - systems = [ "cl-glfw-opengl-nv_packed_depth_stencil" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_parameter_buffer_object = { - pname = "cl-glfw-opengl-nv_parameter_buffer_object"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_parameter_buffer_object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_parameter_buffer_object"; - asd = "cl-glfw-opengl-nv_parameter_buffer_object"; - }); - systems = [ "cl-glfw-opengl-nv_parameter_buffer_object" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_pixel_data_range = { - pname = "cl-glfw-opengl-nv_pixel_data_range"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_pixel_data_range" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_pixel_data_range"; - asd = "cl-glfw-opengl-nv_pixel_data_range"; - }); - systems = [ "cl-glfw-opengl-nv_pixel_data_range" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_point_sprite = { - pname = "cl-glfw-opengl-nv_point_sprite"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_point_sprite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_point_sprite"; - asd = "cl-glfw-opengl-nv_point_sprite"; - }); - systems = [ "cl-glfw-opengl-nv_point_sprite" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_present_video = { - pname = "cl-glfw-opengl-nv_present_video"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_present_video" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_present_video"; - asd = "cl-glfw-opengl-nv_present_video"; - }); - systems = [ "cl-glfw-opengl-nv_present_video" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_primitive_restart = { - pname = "cl-glfw-opengl-nv_primitive_restart"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_primitive_restart" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_primitive_restart"; - asd = "cl-glfw-opengl-nv_primitive_restart"; - }); - systems = [ "cl-glfw-opengl-nv_primitive_restart" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_register_combiners = { - pname = "cl-glfw-opengl-nv_register_combiners"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_register_combiners" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_register_combiners"; - asd = "cl-glfw-opengl-nv_register_combiners"; - }); - systems = [ "cl-glfw-opengl-nv_register_combiners" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_register_combiners2 = { - pname = "cl-glfw-opengl-nv_register_combiners2"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_register_combiners2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_register_combiners2"; - asd = "cl-glfw-opengl-nv_register_combiners2"; - }); - systems = [ "cl-glfw-opengl-nv_register_combiners2" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_shader_buffer_load = { - pname = "cl-glfw-opengl-nv_shader_buffer_load"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_shader_buffer_load" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_shader_buffer_load"; - asd = "cl-glfw-opengl-nv_shader_buffer_load"; - }); - systems = [ "cl-glfw-opengl-nv_shader_buffer_load" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_shader_buffer_store = { - pname = "cl-glfw-opengl-nv_shader_buffer_store"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_shader_buffer_store" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_shader_buffer_store"; - asd = "cl-glfw-opengl-nv_shader_buffer_store"; - }); - systems = [ "cl-glfw-opengl-nv_shader_buffer_store" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_tessellation_program5 = { - pname = "cl-glfw-opengl-nv_tessellation_program5"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_tessellation_program5" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_tessellation_program5"; - asd = "cl-glfw-opengl-nv_tessellation_program5"; - }); - systems = [ "cl-glfw-opengl-nv_tessellation_program5" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_texgen_emboss = { - pname = "cl-glfw-opengl-nv_texgen_emboss"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_texgen_emboss" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_texgen_emboss"; - asd = "cl-glfw-opengl-nv_texgen_emboss"; - }); - systems = [ "cl-glfw-opengl-nv_texgen_emboss" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_texgen_reflection = { - pname = "cl-glfw-opengl-nv_texgen_reflection"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_texgen_reflection" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_texgen_reflection"; - asd = "cl-glfw-opengl-nv_texgen_reflection"; - }); - systems = [ "cl-glfw-opengl-nv_texgen_reflection" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_texture_barrier = { - pname = "cl-glfw-opengl-nv_texture_barrier"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_texture_barrier" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_texture_barrier"; - asd = "cl-glfw-opengl-nv_texture_barrier"; - }); - systems = [ "cl-glfw-opengl-nv_texture_barrier" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_texture_env_combine4 = { - pname = "cl-glfw-opengl-nv_texture_env_combine4"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_texture_env_combine4" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_texture_env_combine4"; - asd = "cl-glfw-opengl-nv_texture_env_combine4"; - }); - systems = [ "cl-glfw-opengl-nv_texture_env_combine4" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_texture_expand_normal = { - pname = "cl-glfw-opengl-nv_texture_expand_normal"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_texture_expand_normal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_texture_expand_normal"; - asd = "cl-glfw-opengl-nv_texture_expand_normal"; - }); - systems = [ "cl-glfw-opengl-nv_texture_expand_normal" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_texture_multisample = { - pname = "cl-glfw-opengl-nv_texture_multisample"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_texture_multisample" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_texture_multisample"; - asd = "cl-glfw-opengl-nv_texture_multisample"; - }); - systems = [ "cl-glfw-opengl-nv_texture_multisample" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_texture_rectangle = { - pname = "cl-glfw-opengl-nv_texture_rectangle"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_texture_rectangle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_texture_rectangle"; - asd = "cl-glfw-opengl-nv_texture_rectangle"; - }); - systems = [ "cl-glfw-opengl-nv_texture_rectangle" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_texture_shader = { - pname = "cl-glfw-opengl-nv_texture_shader"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_texture_shader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_texture_shader"; - asd = "cl-glfw-opengl-nv_texture_shader"; - }); - systems = [ "cl-glfw-opengl-nv_texture_shader" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_texture_shader2 = { - pname = "cl-glfw-opengl-nv_texture_shader2"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_texture_shader2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_texture_shader2"; - asd = "cl-glfw-opengl-nv_texture_shader2"; - }); - systems = [ "cl-glfw-opengl-nv_texture_shader2" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_texture_shader3 = { - pname = "cl-glfw-opengl-nv_texture_shader3"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_texture_shader3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_texture_shader3"; - asd = "cl-glfw-opengl-nv_texture_shader3"; - }); - systems = [ "cl-glfw-opengl-nv_texture_shader3" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_transform_feedback = { - pname = "cl-glfw-opengl-nv_transform_feedback"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_transform_feedback" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_transform_feedback"; - asd = "cl-glfw-opengl-nv_transform_feedback"; - }); - systems = [ "cl-glfw-opengl-nv_transform_feedback" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_transform_feedback2 = { - pname = "cl-glfw-opengl-nv_transform_feedback2"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_transform_feedback2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_transform_feedback2"; - asd = "cl-glfw-opengl-nv_transform_feedback2"; - }); - systems = [ "cl-glfw-opengl-nv_transform_feedback2" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_vertex_array_range = { - pname = "cl-glfw-opengl-nv_vertex_array_range"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_vertex_array_range" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_vertex_array_range"; - asd = "cl-glfw-opengl-nv_vertex_array_range"; - }); - systems = [ "cl-glfw-opengl-nv_vertex_array_range" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_vertex_array_range2 = { - pname = "cl-glfw-opengl-nv_vertex_array_range2"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_vertex_array_range2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_vertex_array_range2"; - asd = "cl-glfw-opengl-nv_vertex_array_range2"; - }); - systems = [ "cl-glfw-opengl-nv_vertex_array_range2" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_vertex_attrib_integer_64bit = { - pname = "cl-glfw-opengl-nv_vertex_attrib_integer_64bit"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_vertex_attrib_integer_64bit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_vertex_attrib_integer_64bit"; - asd = "cl-glfw-opengl-nv_vertex_attrib_integer_64bit"; - }); - systems = [ "cl-glfw-opengl-nv_vertex_attrib_integer_64bit" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_vertex_buffer_unified_memory = { - pname = "cl-glfw-opengl-nv_vertex_buffer_unified_memory"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_vertex_buffer_unified_memory" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_vertex_buffer_unified_memory"; - asd = "cl-glfw-opengl-nv_vertex_buffer_unified_memory"; - }); - systems = [ "cl-glfw-opengl-nv_vertex_buffer_unified_memory" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_vertex_program = { - pname = "cl-glfw-opengl-nv_vertex_program"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_vertex_program" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_vertex_program"; - asd = "cl-glfw-opengl-nv_vertex_program"; - }); - systems = [ "cl-glfw-opengl-nv_vertex_program" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_vertex_program2_option = { - pname = "cl-glfw-opengl-nv_vertex_program2_option"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_vertex_program2_option" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_vertex_program2_option"; - asd = "cl-glfw-opengl-nv_vertex_program2_option"; - }); - systems = [ "cl-glfw-opengl-nv_vertex_program2_option" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_vertex_program3 = { - pname = "cl-glfw-opengl-nv_vertex_program3"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_vertex_program3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_vertex_program3"; - asd = "cl-glfw-opengl-nv_vertex_program3"; - }); - systems = [ "cl-glfw-opengl-nv_vertex_program3" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-nv_vertex_program4 = { - pname = "cl-glfw-opengl-nv_vertex_program4"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-nv_vertex_program4" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-nv_vertex_program4"; - asd = "cl-glfw-opengl-nv_vertex_program4"; - }); - systems = [ "cl-glfw-opengl-nv_vertex_program4" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-oes_read_format = { - pname = "cl-glfw-opengl-oes_read_format"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-oes_read_format" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-oes_read_format"; - asd = "cl-glfw-opengl-oes_read_format"; - }); - systems = [ "cl-glfw-opengl-oes_read_format" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-oml_interlace = { - pname = "cl-glfw-opengl-oml_interlace"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-oml_interlace" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-oml_interlace"; - asd = "cl-glfw-opengl-oml_interlace"; - }); - systems = [ "cl-glfw-opengl-oml_interlace" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-oml_resample = { - pname = "cl-glfw-opengl-oml_resample"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-oml_resample" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-oml_resample"; - asd = "cl-glfw-opengl-oml_resample"; - }); - systems = [ "cl-glfw-opengl-oml_resample" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-oml_subsample = { - pname = "cl-glfw-opengl-oml_subsample"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-oml_subsample" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-oml_subsample"; - asd = "cl-glfw-opengl-oml_subsample"; - }); - systems = [ "cl-glfw-opengl-oml_subsample" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-pgi_misc_hints = { - pname = "cl-glfw-opengl-pgi_misc_hints"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-pgi_misc_hints" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-pgi_misc_hints"; - asd = "cl-glfw-opengl-pgi_misc_hints"; - }); - systems = [ "cl-glfw-opengl-pgi_misc_hints" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-pgi_vertex_hints = { - pname = "cl-glfw-opengl-pgi_vertex_hints"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-pgi_vertex_hints" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-pgi_vertex_hints"; - asd = "cl-glfw-opengl-pgi_vertex_hints"; - }); - systems = [ "cl-glfw-opengl-pgi_vertex_hints" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-rend_screen_coordinates = { - pname = "cl-glfw-opengl-rend_screen_coordinates"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-rend_screen_coordinates" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-rend_screen_coordinates"; - asd = "cl-glfw-opengl-rend_screen_coordinates"; - }); - systems = [ "cl-glfw-opengl-rend_screen_coordinates" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-s3_s3tc = { - pname = "cl-glfw-opengl-s3_s3tc"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-s3_s3tc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-s3_s3tc"; - asd = "cl-glfw-opengl-s3_s3tc"; - }); - systems = [ "cl-glfw-opengl-s3_s3tc" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgi_color_table = { - pname = "cl-glfw-opengl-sgi_color_table"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgi_color_table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgi_color_table"; - asd = "cl-glfw-opengl-sgi_color_table"; - }); - systems = [ "cl-glfw-opengl-sgi_color_table" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgi_depth_pass_instrument = { - pname = "cl-glfw-opengl-sgi_depth_pass_instrument"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgi_depth_pass_instrument" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgi_depth_pass_instrument"; - asd = "cl-glfw-opengl-sgi_depth_pass_instrument"; - }); - systems = [ "cl-glfw-opengl-sgi_depth_pass_instrument" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgis_detail_texture = { - pname = "cl-glfw-opengl-sgis_detail_texture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgis_detail_texture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgis_detail_texture"; - asd = "cl-glfw-opengl-sgis_detail_texture"; - }); - systems = [ "cl-glfw-opengl-sgis_detail_texture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgis_fog_function = { - pname = "cl-glfw-opengl-sgis_fog_function"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgis_fog_function" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgis_fog_function"; - asd = "cl-glfw-opengl-sgis_fog_function"; - }); - systems = [ "cl-glfw-opengl-sgis_fog_function" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgis_multisample = { - pname = "cl-glfw-opengl-sgis_multisample"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgis_multisample" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgis_multisample"; - asd = "cl-glfw-opengl-sgis_multisample"; - }); - systems = [ "cl-glfw-opengl-sgis_multisample" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgis_pixel_texture = { - pname = "cl-glfw-opengl-sgis_pixel_texture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgis_pixel_texture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgis_pixel_texture"; - asd = "cl-glfw-opengl-sgis_pixel_texture"; - }); - systems = [ "cl-glfw-opengl-sgis_pixel_texture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgis_point_parameters = { - pname = "cl-glfw-opengl-sgis_point_parameters"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgis_point_parameters" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgis_point_parameters"; - asd = "cl-glfw-opengl-sgis_point_parameters"; - }); - systems = [ "cl-glfw-opengl-sgis_point_parameters" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgis_sharpen_texture = { - pname = "cl-glfw-opengl-sgis_sharpen_texture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgis_sharpen_texture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgis_sharpen_texture"; - asd = "cl-glfw-opengl-sgis_sharpen_texture"; - }); - systems = [ "cl-glfw-opengl-sgis_sharpen_texture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgis_texture4d = { - pname = "cl-glfw-opengl-sgis_texture4d"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgis_texture4d" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgis_texture4d"; - asd = "cl-glfw-opengl-sgis_texture4d"; - }); - systems = [ "cl-glfw-opengl-sgis_texture4d" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgis_texture_color_mask = { - pname = "cl-glfw-opengl-sgis_texture_color_mask"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgis_texture_color_mask" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgis_texture_color_mask"; - asd = "cl-glfw-opengl-sgis_texture_color_mask"; - }); - systems = [ "cl-glfw-opengl-sgis_texture_color_mask" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgis_texture_filter4 = { - pname = "cl-glfw-opengl-sgis_texture_filter4"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgis_texture_filter4" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgis_texture_filter4"; - asd = "cl-glfw-opengl-sgis_texture_filter4"; - }); - systems = [ "cl-glfw-opengl-sgis_texture_filter4" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgis_texture_select = { - pname = "cl-glfw-opengl-sgis_texture_select"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgis_texture_select" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgis_texture_select"; - asd = "cl-glfw-opengl-sgis_texture_select"; - }); - systems = [ "cl-glfw-opengl-sgis_texture_select" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_async = { - pname = "cl-glfw-opengl-sgix_async"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_async" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_async"; - asd = "cl-glfw-opengl-sgix_async"; - }); - systems = [ "cl-glfw-opengl-sgix_async" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_depth_texture = { - pname = "cl-glfw-opengl-sgix_depth_texture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_depth_texture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_depth_texture"; - asd = "cl-glfw-opengl-sgix_depth_texture"; - }); - systems = [ "cl-glfw-opengl-sgix_depth_texture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_flush_raster = { - pname = "cl-glfw-opengl-sgix_flush_raster"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_flush_raster" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_flush_raster"; - asd = "cl-glfw-opengl-sgix_flush_raster"; - }); - systems = [ "cl-glfw-opengl-sgix_flush_raster" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_fog_scale = { - pname = "cl-glfw-opengl-sgix_fog_scale"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_fog_scale" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_fog_scale"; - asd = "cl-glfw-opengl-sgix_fog_scale"; - }); - systems = [ "cl-glfw-opengl-sgix_fog_scale" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_fragment_lighting = { - pname = "cl-glfw-opengl-sgix_fragment_lighting"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_fragment_lighting" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_fragment_lighting"; - asd = "cl-glfw-opengl-sgix_fragment_lighting"; - }); - systems = [ "cl-glfw-opengl-sgix_fragment_lighting" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_framezoom = { - pname = "cl-glfw-opengl-sgix_framezoom"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_framezoom" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_framezoom"; - asd = "cl-glfw-opengl-sgix_framezoom"; - }); - systems = [ "cl-glfw-opengl-sgix_framezoom" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_igloo_interface = { - pname = "cl-glfw-opengl-sgix_igloo_interface"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_igloo_interface" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_igloo_interface"; - asd = "cl-glfw-opengl-sgix_igloo_interface"; - }); - systems = [ "cl-glfw-opengl-sgix_igloo_interface" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_instruments = { - pname = "cl-glfw-opengl-sgix_instruments"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_instruments" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_instruments"; - asd = "cl-glfw-opengl-sgix_instruments"; - }); - systems = [ "cl-glfw-opengl-sgix_instruments" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_line_quality_hint = { - pname = "cl-glfw-opengl-sgix_line_quality_hint"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_line_quality_hint" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_line_quality_hint"; - asd = "cl-glfw-opengl-sgix_line_quality_hint"; - }); - systems = [ "cl-glfw-opengl-sgix_line_quality_hint" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_list_priority = { - pname = "cl-glfw-opengl-sgix_list_priority"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_list_priority" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_list_priority"; - asd = "cl-glfw-opengl-sgix_list_priority"; - }); - systems = [ "cl-glfw-opengl-sgix_list_priority" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_pixel_texture = { - pname = "cl-glfw-opengl-sgix_pixel_texture"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_pixel_texture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_pixel_texture"; - asd = "cl-glfw-opengl-sgix_pixel_texture"; - }); - systems = [ "cl-glfw-opengl-sgix_pixel_texture" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_polynomial_ffd = { - pname = "cl-glfw-opengl-sgix_polynomial_ffd"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_polynomial_ffd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_polynomial_ffd"; - asd = "cl-glfw-opengl-sgix_polynomial_ffd"; - }); - systems = [ "cl-glfw-opengl-sgix_polynomial_ffd" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_reference_plane = { - pname = "cl-glfw-opengl-sgix_reference_plane"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_reference_plane" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_reference_plane"; - asd = "cl-glfw-opengl-sgix_reference_plane"; - }); - systems = [ "cl-glfw-opengl-sgix_reference_plane" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_resample = { - pname = "cl-glfw-opengl-sgix_resample"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_resample" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_resample"; - asd = "cl-glfw-opengl-sgix_resample"; - }); - systems = [ "cl-glfw-opengl-sgix_resample" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_scalebias_hint = { - pname = "cl-glfw-opengl-sgix_scalebias_hint"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_scalebias_hint" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_scalebias_hint"; - asd = "cl-glfw-opengl-sgix_scalebias_hint"; - }); - systems = [ "cl-glfw-opengl-sgix_scalebias_hint" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_shadow = { - pname = "cl-glfw-opengl-sgix_shadow"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_shadow" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_shadow"; - asd = "cl-glfw-opengl-sgix_shadow"; - }); - systems = [ "cl-glfw-opengl-sgix_shadow" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_shadow_ambient = { - pname = "cl-glfw-opengl-sgix_shadow_ambient"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_shadow_ambient" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_shadow_ambient"; - asd = "cl-glfw-opengl-sgix_shadow_ambient"; - }); - systems = [ "cl-glfw-opengl-sgix_shadow_ambient" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_slim = { - pname = "cl-glfw-opengl-sgix_slim"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_slim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_slim"; - asd = "cl-glfw-opengl-sgix_slim"; - }); - systems = [ "cl-glfw-opengl-sgix_slim" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_sprite = { - pname = "cl-glfw-opengl-sgix_sprite"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_sprite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_sprite"; - asd = "cl-glfw-opengl-sgix_sprite"; - }); - systems = [ "cl-glfw-opengl-sgix_sprite" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_tag_sample_buffer = { - pname = "cl-glfw-opengl-sgix_tag_sample_buffer"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_tag_sample_buffer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_tag_sample_buffer"; - asd = "cl-glfw-opengl-sgix_tag_sample_buffer"; - }); - systems = [ "cl-glfw-opengl-sgix_tag_sample_buffer" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_texture_coordinate_clamp = { - pname = "cl-glfw-opengl-sgix_texture_coordinate_clamp"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_texture_coordinate_clamp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_texture_coordinate_clamp"; - asd = "cl-glfw-opengl-sgix_texture_coordinate_clamp"; - }); - systems = [ "cl-glfw-opengl-sgix_texture_coordinate_clamp" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_texture_lod_bias = { - pname = "cl-glfw-opengl-sgix_texture_lod_bias"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_texture_lod_bias" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_texture_lod_bias"; - asd = "cl-glfw-opengl-sgix_texture_lod_bias"; - }); - systems = [ "cl-glfw-opengl-sgix_texture_lod_bias" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_texture_multi_buffer = { - pname = "cl-glfw-opengl-sgix_texture_multi_buffer"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_texture_multi_buffer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_texture_multi_buffer"; - asd = "cl-glfw-opengl-sgix_texture_multi_buffer"; - }); - systems = [ "cl-glfw-opengl-sgix_texture_multi_buffer" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sgix_ycrcba = { - pname = "cl-glfw-opengl-sgix_ycrcba"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sgix_ycrcba" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sgix_ycrcba"; - asd = "cl-glfw-opengl-sgix_ycrcba"; - }); - systems = [ "cl-glfw-opengl-sgix_ycrcba" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sun_convolution_border_modes = { - pname = "cl-glfw-opengl-sun_convolution_border_modes"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sun_convolution_border_modes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sun_convolution_border_modes"; - asd = "cl-glfw-opengl-sun_convolution_border_modes"; - }); - systems = [ "cl-glfw-opengl-sun_convolution_border_modes" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sun_global_alpha = { - pname = "cl-glfw-opengl-sun_global_alpha"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sun_global_alpha" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sun_global_alpha"; - asd = "cl-glfw-opengl-sun_global_alpha"; - }); - systems = [ "cl-glfw-opengl-sun_global_alpha" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sun_mesh_array = { - pname = "cl-glfw-opengl-sun_mesh_array"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sun_mesh_array" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sun_mesh_array"; - asd = "cl-glfw-opengl-sun_mesh_array"; - }); - systems = [ "cl-glfw-opengl-sun_mesh_array" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sun_slice_accum = { - pname = "cl-glfw-opengl-sun_slice_accum"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sun_slice_accum" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sun_slice_accum"; - asd = "cl-glfw-opengl-sun_slice_accum"; - }); - systems = [ "cl-glfw-opengl-sun_slice_accum" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sun_triangle_list = { - pname = "cl-glfw-opengl-sun_triangle_list"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sun_triangle_list" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sun_triangle_list"; - asd = "cl-glfw-opengl-sun_triangle_list"; - }); - systems = [ "cl-glfw-opengl-sun_triangle_list" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sun_vertex = { - pname = "cl-glfw-opengl-sun_vertex"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sun_vertex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sun_vertex"; - asd = "cl-glfw-opengl-sun_vertex"; - }); - systems = [ "cl-glfw-opengl-sun_vertex" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-sunx_constant_data = { - pname = "cl-glfw-opengl-sunx_constant_data"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-sunx_constant_data" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-sunx_constant_data"; - asd = "cl-glfw-opengl-sunx_constant_data"; - }); - systems = [ "cl-glfw-opengl-sunx_constant_data" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-version_1_0 = { - pname = "cl-glfw-opengl-version_1_0"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-version_1_0" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-version_1_0"; - asd = "cl-glfw-opengl-version_1_0"; - }); - systems = [ "cl-glfw-opengl-version_1_0" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-version_1_1 = { - pname = "cl-glfw-opengl-version_1_1"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-version_1_1" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-version_1_1"; - asd = "cl-glfw-opengl-version_1_1"; - }); - systems = [ "cl-glfw-opengl-version_1_1" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-version_1_2 = { - pname = "cl-glfw-opengl-version_1_2"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-version_1_2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-version_1_2"; - asd = "cl-glfw-opengl-version_1_2"; - }); - systems = [ "cl-glfw-opengl-version_1_2" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-version_1_3 = { - pname = "cl-glfw-opengl-version_1_3"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-version_1_3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-version_1_3"; - asd = "cl-glfw-opengl-version_1_3"; - }); - systems = [ "cl-glfw-opengl-version_1_3" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-version_1_4 = { - pname = "cl-glfw-opengl-version_1_4"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-version_1_4" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-version_1_4"; - asd = "cl-glfw-opengl-version_1_4"; - }); - systems = [ "cl-glfw-opengl-version_1_4" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-version_1_5 = { - pname = "cl-glfw-opengl-version_1_5"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-version_1_5" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-version_1_5"; - asd = "cl-glfw-opengl-version_1_5"; - }); - systems = [ "cl-glfw-opengl-version_1_5" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-version_2_0 = { - pname = "cl-glfw-opengl-version_2_0"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-version_2_0" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-version_2_0"; - asd = "cl-glfw-opengl-version_2_0"; - }); - systems = [ "cl-glfw-opengl-version_2_0" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-version_2_1 = { - pname = "cl-glfw-opengl-version_2_1"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-version_2_1" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-version_2_1"; - asd = "cl-glfw-opengl-version_2_1"; - }); - systems = [ "cl-glfw-opengl-version_2_1" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-win_phong_shading = { - pname = "cl-glfw-opengl-win_phong_shading"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-win_phong_shading" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-win_phong_shading"; - asd = "cl-glfw-opengl-win_phong_shading"; - }); - systems = [ "cl-glfw-opengl-win_phong_shading" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-opengl-win_specular_fog = { - pname = "cl-glfw-opengl-win_specular_fog"; - version = "20150302-git"; - asds = [ "cl-glfw-opengl-win_specular_fog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-opengl-win_specular_fog"; - asd = "cl-glfw-opengl-win_specular_fog"; - }); - systems = [ "cl-glfw-opengl-win_specular_fog" ]; - lispLibs = [ (getAttr "cl-glfw-opengl-core" pkgs) ]; - }; - cl-glfw-types = { - pname = "cl-glfw-types"; - version = "20150302-git"; - asds = [ "cl-glfw-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw/2015-03-02/cl-glfw-20150302-git.tgz"; - sha256 = "07zgrvv480h1xid1f50vj61d1xcrick2dqw04swac4137w9rwpj6"; - system = "cl-glfw-types"; - asd = "cl-glfw-types"; - }); - systems = [ "cl-glfw-types" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-glfw3 = { - pname = "cl-glfw3"; - version = "20210531-git"; - asds = [ "cl-glfw3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw3/2021-05-31/cl-glfw3-20210531-git.tgz"; - sha256 = "1wzr43nckdx4rlgxzhm1r4kfc264q969mc43y0js9ramh7l8gba5"; - system = "cl-glfw3"; - asd = "cl-glfw3"; - }); - systems = [ "cl-glfw3" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) ]; - }; - cl-glfw3-examples = { - pname = "cl-glfw3-examples"; - version = "20210531-git"; - asds = [ "cl-glfw3-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glfw3/2021-05-31/cl-glfw3-20210531-git.tgz"; - sha256 = "1wzr43nckdx4rlgxzhm1r4kfc264q969mc43y0js9ramh7l8gba5"; - system = "cl-glfw3-examples"; - asd = "cl-glfw3-examples"; - }); - systems = [ "cl-glfw3-examples" ]; - lispLibs = [ (getAttr "cl-glfw3" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "trivial-main-thread" pkgs) ]; - }; - cl-glib = { - pname = "cl-glib"; - version = "20221106-git"; - asds = [ "cl-glib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glib/2022-11-06/cl-glib-20221106-git.tgz"; - sha256 = "189w4flgjr6asqlb2zzm0c6b1ngdws4dkhq4ap458h5al33sxphg"; - system = "cl-glib"; - asd = "cl-glib"; - }); - systems = [ "cl-glib" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-gobject-introspection-wrapper" pkgs) ]; - }; - cl-glib_dot_gio = { - pname = "cl-glib.gio"; - version = "20221106-git"; - asds = [ "cl-glib.gio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glib/2022-11-06/cl-glib-20221106-git.tgz"; - sha256 = "189w4flgjr6asqlb2zzm0c6b1ngdws4dkhq4ap458h5al33sxphg"; - system = "cl-glib.gio"; - asd = "cl-glib.gio"; - }); - systems = [ "cl-glib.gio" ]; - lispLibs = [ (getAttr "cl-gobject-introspection-wrapper" pkgs) ]; - }; - cl-glib_dot_gobject = { - pname = "cl-glib.gobject"; - version = "20221106-git"; - asds = [ "cl-glib.gobject" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-glib/2022-11-06/cl-glib-20221106-git.tgz"; - sha256 = "189w4flgjr6asqlb2zzm0c6b1ngdws4dkhq4ap458h5al33sxphg"; - system = "cl-glib.gobject"; - asd = "cl-glib.gobject"; - }); - systems = [ "cl-glib.gobject" ]; - lispLibs = [ (getAttr "cl-gobject-introspection-wrapper" pkgs) ]; - }; - cl-gltf = { - pname = "cl-gltf"; - version = "20220331-git"; - asds = [ "cl-gltf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gltf/2022-03-31/cl-gltf-20220331-git.tgz"; - sha256 = "1v5ki3bjd2sa9apna26faagqwf92bx54815zvsn5nq6dhckrz4mw"; - system = "cl-gltf"; - asd = "cl-gltf"; - }); - systems = [ "cl-gltf" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "mmap" pkgs) (getAttr "nibbles" pkgs) (getAttr "qbase64" pkgs) (getAttr "shasht" pkgs) (getAttr "static-vectors" pkgs) (getAttr "trivial-extensible-sequences" pkgs) ]; - }; - cl-glu = { - pname = "cl-glu"; - version = "20191130-git"; - asds = [ "cl-glu" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opengl/2019-11-30/cl-opengl-20191130-git.tgz"; - sha256 = "0mhqmll09f079pnd6mgswz9nvr6h5n27d4q7zpmm2igf1v460id7"; - system = "cl-glu"; - asd = "cl-glu"; - }); - systems = [ "cl-glu" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-opengl" pkgs) ]; - }; - cl-glut = { - pname = "cl-glut"; - version = "20191130-git"; - asds = [ "cl-glut" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opengl/2019-11-30/cl-opengl-20191130-git.tgz"; - sha256 = "0mhqmll09f079pnd6mgswz9nvr6h5n27d4q7zpmm2igf1v460id7"; - system = "cl-glut"; - asd = "cl-glut"; - }); - systems = [ "cl-glut" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-opengl" pkgs) ]; - }; - cl-glut-examples = { - pname = "cl-glut-examples"; - version = "20191130-git"; - asds = [ "cl-glut-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opengl/2019-11-30/cl-opengl-20191130-git.tgz"; - sha256 = "0mhqmll09f079pnd6mgswz9nvr6h5n27d4q7zpmm2igf1v460id7"; - system = "cl-glut-examples"; - asd = "cl-glut-examples"; - }); - systems = [ "cl-glut-examples" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-glu" pkgs) (getAttr "cl-glut" pkgs) (getAttr "cl-opengl" pkgs) ]; - }; - cl-gobject-introspection = { - pname = "cl-gobject-introspection"; - version = "20210124-git"; - asds = [ "cl-gobject-introspection" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2021-01-24/cl-gobject-introspection-20210124-git.tgz"; - sha256 = "0dz0r73pq7yhz2iq2jnkq977awx2zws2qfxdcy33329sys1ii32p"; - system = "cl-gobject-introspection"; - asd = "cl-gobject-introspection"; - }); - systems = [ "cl-gobject-introspection" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "iterate" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-gobject-introspection-test = { - pname = "cl-gobject-introspection-test"; - version = "20210124-git"; - asds = [ "cl-gobject-introspection-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2021-01-24/cl-gobject-introspection-20210124-git.tgz"; - sha256 = "0dz0r73pq7yhz2iq2jnkq977awx2zws2qfxdcy33329sys1ii32p"; - system = "cl-gobject-introspection-test"; - asd = "cl-gobject-introspection-test"; - }); - systems = [ "cl-gobject-introspection-test" ]; - lispLibs = [ (getAttr "cl-gobject-introspection" pkgs) (getAttr "fiveam" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-gobject-introspection-wrapper = { - pname = "cl-gobject-introspection-wrapper"; - version = "20221106-git"; - asds = [ "cl-gobject-introspection-wrapper" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gobject-introspection-wrapper/2022-11-06/cl-gobject-introspection-wrapper-20221106-git.tgz"; - sha256 = "1bxb0cs8b92ixigw1lmza8dm75hhc6qdcdkmz6rk77aq7zsp25w4"; - system = "cl-gobject-introspection-wrapper"; - asd = "cl-gobject-introspection-wrapper"; - }); - systems = [ "cl-gobject-introspection-wrapper" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-gobject-introspection" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - cl-gopher = { - pname = "cl-gopher"; - version = "20220331-git"; - asds = [ "cl-gopher" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gopher/2022-03-31/cl-gopher-20220331-git.tgz"; - sha256 = "1ky4s33m5d0wvdaqji12pxr93qqfl5x62zjp3m4ihbdj0ws3yw2f"; - system = "cl-gopher"; - asd = "cl-gopher"; - }); - systems = [ "cl-gopher" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "drakma" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "quri" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-gpio = { - pname = "cl-gpio"; - version = "20211209-git"; - asds = [ "cl-gpio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gpio/2021-12-09/cl-gpio-20211209-git.tgz"; - sha256 = "0kc8vi0rb9c3952p3qmc3c23pdb6yfg21bbrg4jrgdar0k0ldz5a"; - system = "cl-gpio"; - asd = "cl-gpio"; - }); - systems = [ "cl-gpio" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) ]; - }; - cl-graph = { - pname = "cl-graph"; - version = "20171227-git"; - asds = [ "cl-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-graph/2017-12-27/cl-graph-20171227-git.tgz"; - sha256 = "1748rj52f2jmd5jvsy9jwhn0zf73sjzjhwhnljvq6yi2kdqr30kl"; - system = "cl-graph"; - asd = "cl-graph"; - }); - systems = [ "cl-graph" ]; - lispLibs = [ (getAttr "asdf-system-connections" pkgs) (getAttr "cl-containers" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "metatilities-base" pkgs) ]; - }; - cl-graph_plus_hu_dot_dwim_dot_graphviz = { - pname = "cl-graph+hu.dwim.graphviz"; - version = "20171227-git"; - asds = [ "cl-graph+hu.dwim.graphviz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-graph/2017-12-27/cl-graph-20171227-git.tgz"; - sha256 = "1748rj52f2jmd5jvsy9jwhn0zf73sjzjhwhnljvq6yi2kdqr30kl"; - system = "cl-graph+hu.dwim.graphviz"; - asd = "cl-graph+hu.dwim.graphviz"; - }); - systems = [ "cl-graph+hu.dwim.graphviz" ]; - lispLibs = [ (getAttr "cl-graph" pkgs) (getAttr "hu_dot_dwim_dot_graphviz" pkgs) ]; - }; - cl-graph_slash_with-cl-mathstats = { - pname = "cl-graph_with-cl-mathstats"; - version = "20171227-git"; - asds = [ "cl-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-graph/2017-12-27/cl-graph-20171227-git.tgz"; - sha256 = "1748rj52f2jmd5jvsy9jwhn0zf73sjzjhwhnljvq6yi2kdqr30kl"; - system = "cl-graph"; - asd = "cl-graph"; - }); - systems = [ "cl-graph/with-cl-mathstats" ]; - lispLibs = [ (getAttr "cl-graph" pkgs) (getAttr "cl-mathstats" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-graph_slash_with-dynamic-classes = { - pname = "cl-graph_with-dynamic-classes"; - version = "20171227-git"; - asds = [ "cl-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-graph/2017-12-27/cl-graph-20171227-git.tgz"; - sha256 = "1748rj52f2jmd5jvsy9jwhn0zf73sjzjhwhnljvq6yi2kdqr30kl"; - system = "cl-graph"; - asd = "cl-graph"; - }); - systems = [ "cl-graph/with-dynamic-classes" ]; - lispLibs = [ (getAttr "cl-graph" pkgs) (getAttr "dynamic-classes" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-graph_slash_with-metacopy = { - pname = "cl-graph_with-metacopy"; - version = "20171227-git"; - asds = [ "cl-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-graph/2017-12-27/cl-graph-20171227-git.tgz"; - sha256 = "1748rj52f2jmd5jvsy9jwhn0zf73sjzjhwhnljvq6yi2kdqr30kl"; - system = "cl-graph"; - asd = "cl-graph"; - }); - systems = [ "cl-graph/with-metacopy" ]; - lispLibs = [ (getAttr "cl-graph" pkgs) (getAttr "metacopy" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-graph_slash_with-moptilities = { - pname = "cl-graph_with-moptilities"; - version = "20171227-git"; - asds = [ "cl-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-graph/2017-12-27/cl-graph-20171227-git.tgz"; - sha256 = "1748rj52f2jmd5jvsy9jwhn0zf73sjzjhwhnljvq6yi2kdqr30kl"; - system = "cl-graph"; - asd = "cl-graph"; - }); - systems = [ "cl-graph/with-moptilities" ]; - lispLibs = [ (getAttr "cl-graph" pkgs) (getAttr "moptilities" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-grip = { - pname = "cl-grip"; - version = "20211020-git"; - asds = [ "cl-grip" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-grip/2021-10-20/cl-grip-20211020-git.tgz"; - sha256 = "1qplxq5082wai2blmq29a852jv5kdzwc8n9qlv0kqysjppph0hqz"; - system = "cl-grip"; - asd = "cl-grip"; - }); - systems = [ "cl-grip" ]; - lispLibs = [ (getAttr "cl-strings" pkgs) (getAttr "local-time" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - cl-grnm = { - pname = "cl-grnm"; - version = "20180131-git"; - asds = [ "cl-grnm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-grnm/2018-01-31/cl-grnm-20180131-git.tgz"; - sha256 = "1hb5n37n3x2ylrghcqsia2g9a6f5wg24l659jiz4ncpi5bsv4m3s"; - system = "cl-grnm"; - asd = "cl-grnm"; - }); - systems = [ "cl-grnm" ]; - lispLibs = [ ]; - }; - cl-growl = { - pname = "cl-growl"; - version = "20161208-git"; - asds = [ "cl-growl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-growl/2016-12-08/cl-growl-20161208-git.tgz"; - sha256 = "1qgj3sq22dznwxj1b3rw0099fsf6wgfbc63r376pab74kdnji3n6"; - system = "cl-growl"; - asd = "cl-growl"; - }); - systems = [ "cl-growl" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "ironclad" pkgs) (getAttr "trivial-utf-8" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-gss = { - pname = "cl-gss"; - version = "20180228-git"; - asds = [ "cl-gss" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gss/2018-02-28/cl-gss-20180228-git.tgz"; - sha256 = "0zhxxn3zarird255s9i56bz0fm6dkv00mn8bbsjrhskg3wpcg4pb"; - system = "cl-gss"; - asd = "cl-gss"; - }); - systems = [ "cl-gss" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - cl-gtk2-gdk = { - pname = "cl-gtk2-gdk"; - version = "20211020-git"; - asds = [ "cl-gtk2-gdk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz"; - sha256 = "1lnrwd7s47cmksllim56mcg9l5m6jrwv6f0q1hq5lr8xpi5ix9vx"; - system = "cl-gtk2-gdk"; - asd = "cl-gtk2-gdk"; - }); - systems = [ "cl-gtk2-gdk" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-gtk2-glib" pkgs) (getAttr "cl-gtk2-pango" pkgs) ]; - }; - cl-gtk2-glib = { - pname = "cl-gtk2-glib"; - version = "20211020-git"; - asds = [ "cl-gtk2-glib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz"; - sha256 = "1lnrwd7s47cmksllim56mcg9l5m6jrwv6f0q1hq5lr8xpi5ix9vx"; - system = "cl-gtk2-glib"; - asd = "cl-gtk2-glib"; - }); - systems = [ "cl-gtk2-glib" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-gtk2-pango = { - pname = "cl-gtk2-pango"; - version = "20211020-git"; - asds = [ "cl-gtk2-pango" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gtk2/2021-10-20/cl-gtk2-20211020-git.tgz"; - sha256 = "1lnrwd7s47cmksllim56mcg9l5m6jrwv6f0q1hq5lr8xpi5ix9vx"; - system = "cl-gtk2-pango"; - asd = "cl-gtk2-pango"; - }); - systems = [ "cl-gtk2-pango" ]; - lispLibs = [ (getAttr "cl-gtk2-glib" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-haml = { - pname = "cl-haml"; - version = "20180228-git"; - asds = [ "cl-haml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-haml/2018-02-28/cl-haml-20180228-git.tgz"; - sha256 = "017qr3509ha2680h3c8ip5rqyfaz7v9hfjmx0pg1wrjqw8vyjyb5"; - system = "cl-haml"; - asd = "cl-haml"; - }); - systems = [ "cl-haml" ]; - lispLibs = [ (getAttr "cl-who" pkgs) ]; - }; - cl-haml-test = { - pname = "cl-haml-test"; - version = "20180228-git"; - asds = [ "cl-haml-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-haml/2018-02-28/cl-haml-20180228-git.tgz"; - sha256 = "017qr3509ha2680h3c8ip5rqyfaz7v9hfjmx0pg1wrjqw8vyjyb5"; - system = "cl-haml-test"; - asd = "cl-haml"; - }); - systems = [ "cl-haml-test" ]; - lispLibs = [ (getAttr "cl-haml" pkgs) (getAttr "cl-test-more" pkgs) ]; - }; - cl-hamt = { - pname = "cl-hamt"; - version = "20200325-git"; - asds = [ "cl-hamt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz"; - sha256 = "1ycbd73ykfj5j9sdhlzamyv18qbjj6xqf7fhm4fa0nsyr6sr3rf5"; - system = "cl-hamt"; - asd = "cl-hamt"; - }); - systems = [ "cl-hamt" ]; - lispLibs = [ (getAttr "cl-murmurhash" pkgs) ]; - }; - cl-hamt-examples = { - pname = "cl-hamt-examples"; - version = "20200325-git"; - asds = [ "cl-hamt-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz"; - sha256 = "1ycbd73ykfj5j9sdhlzamyv18qbjj6xqf7fhm4fa0nsyr6sr3rf5"; - system = "cl-hamt-examples"; - asd = "cl-hamt-examples"; - }); - systems = [ "cl-hamt-examples" ]; - lispLibs = [ (getAttr "cl-hamt" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) ]; - }; - cl-hamt-test = { - pname = "cl-hamt-test"; - version = "20200325-git"; - asds = [ "cl-hamt-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-hamt/2020-03-25/cl-hamt-20200325-git.tgz"; - sha256 = "1ycbd73ykfj5j9sdhlzamyv18qbjj6xqf7fhm4fa0nsyr6sr3rf5"; - system = "cl-hamt-test"; - asd = "cl-hamt-test"; - }); - systems = [ "cl-hamt-test" ]; - lispLibs = [ (getAttr "cl-hamt" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-hash-table-destructuring = { - pname = "cl-hash-table-destructuring"; - version = "20160531-git"; - asds = [ "cl-hash-table-destructuring" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-hash-table-destructuring/2016-05-31/cl-hash-table-destructuring-20160531-git.tgz"; - sha256 = "0za8jlqfvsilmnidk429509vbdd18w7ykcycni411pjpz0lxrh1v"; - system = "cl-hash-table-destructuring"; - asd = "cl-hash-table-destructuring"; - }); - systems = [ "cl-hash-table-destructuring" ]; - lispLibs = [ (getAttr "prove-asdf" pkgs) ]; - }; - cl-hash-table-destructuring-test = { - pname = "cl-hash-table-destructuring-test"; - version = "20160531-git"; - asds = [ "cl-hash-table-destructuring-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-hash-table-destructuring/2016-05-31/cl-hash-table-destructuring-20160531-git.tgz"; - sha256 = "0za8jlqfvsilmnidk429509vbdd18w7ykcycni411pjpz0lxrh1v"; - system = "cl-hash-table-destructuring-test"; - asd = "cl-hash-table-destructuring"; - }); - systems = [ "cl-hash-table-destructuring-test" ]; - lispLibs = [ (getAttr "cl-hash-table-destructuring" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-hash-util = { - pname = "cl-hash-util"; - version = "20190107-git"; - asds = [ "cl-hash-util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-hash-util/2019-01-07/cl-hash-util-20190107-git.tgz"; - sha256 = "0dnd0405d81w25cqq4g8gk2r5wm03cis965c1pmb2f5p4ifwq87a"; - system = "cl-hash-util"; - asd = "cl-hash-util"; - }); - systems = [ "cl-hash-util" ]; - lispLibs = [ ]; - }; - cl-hash-util-test = { - pname = "cl-hash-util-test"; - version = "20190107-git"; - asds = [ "cl-hash-util-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-hash-util/2019-01-07/cl-hash-util-20190107-git.tgz"; - sha256 = "0dnd0405d81w25cqq4g8gk2r5wm03cis965c1pmb2f5p4ifwq87a"; - system = "cl-hash-util-test"; - asd = "cl-hash-util-test"; - }); - systems = [ "cl-hash-util-test" ]; - lispLibs = [ (getAttr "cl-hash-util" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-heap = { - pname = "cl-heap"; - version = "0.1.6"; - asds = [ "cl-heap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz"; - sha256 = "01bss182x9i167lfv0lr8ylavk2m42s84vz6629kspgjhczm52w7"; - system = "cl-heap"; - asd = "cl-heap"; - }); - systems = [ "cl-heap" ]; - lispLibs = [ ]; - }; - cl-heap-tests = { - pname = "cl-heap-tests"; - version = "0.1.6"; - asds = [ "cl-heap-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz"; - sha256 = "01bss182x9i167lfv0lr8ylavk2m42s84vz6629kspgjhczm52w7"; - system = "cl-heap-tests"; - asd = "cl-heap-tests"; - }); - systems = [ "cl-heap-tests" ]; - lispLibs = [ (getAttr "cl-heap" pkgs) (getAttr "xlunit" pkgs) ]; - }; - cl-heredoc = { - pname = "cl-heredoc"; - version = "20220707-git"; - asds = [ "cl-heredoc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-heredoc/2022-07-07/cl-heredoc-20220707-git.tgz"; - sha256 = "0hj9y6drd93nwcbmwwhnc30flm48ppw4rhfgfyqfc02fq2wnc83z"; - system = "cl-heredoc"; - asd = "cl-heredoc"; - }); - systems = [ "cl-heredoc" ]; - lispLibs = [ ]; - }; - cl-heredoc-test = { - pname = "cl-heredoc-test"; - version = "20220707-git"; - asds = [ "cl-heredoc-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-heredoc/2022-07-07/cl-heredoc-20220707-git.tgz"; - sha256 = "0hj9y6drd93nwcbmwwhnc30flm48ppw4rhfgfyqfc02fq2wnc83z"; - system = "cl-heredoc-test"; - asd = "cl-heredoc-test"; - }); - systems = [ "cl-heredoc-test" ]; - lispLibs = [ (getAttr "cl-heredoc" pkgs) (getAttr "stefil" pkgs) ]; - }; - cl-hooks = { - pname = "cl-hooks"; - version = "20181210-git"; - asds = [ "cl-hooks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz"; - sha256 = "0bg3l0a28lw5gqqjp6p6b5nhwqk46sgkb7184w5qbfngw1hk8x9y"; - system = "cl-hooks"; - asd = "cl-hooks"; - }); - systems = [ "cl-hooks" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "let-plus" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-hooks_slash_test = { - pname = "cl-hooks_test"; - version = "20181210-git"; - asds = [ "cl-hooks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz"; - sha256 = "0bg3l0a28lw5gqqjp6p6b5nhwqk46sgkb7184w5qbfngw1hk8x9y"; - system = "cl-hooks"; - asd = "cl-hooks"; - }); - systems = [ "cl-hooks/test" ]; - lispLibs = [ (getAttr "cl-hooks" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-html-diff = { - pname = "cl-html-diff"; - version = "20130128-git"; - asds = [ "cl-html-diff" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-html-diff/2013-01-28/cl-html-diff-20130128-git.tgz"; - sha256 = "1varnijivzd4jpimn1cz8p5ks713zzha5cgl4vmb0xr8ahravwzb"; - system = "cl-html-diff"; - asd = "cl-html-diff"; - }); - systems = [ "cl-html-diff" ]; - lispLibs = [ (getAttr "cl-difflib" pkgs) ]; - }; - cl-html-parse = { - pname = "cl-html-parse"; - version = "20200925-git"; - asds = [ "cl-html-parse" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz"; - sha256 = "0d78slyqw6zshh72ppmxc85xdnd0jfhaqkzrf1cn7yjxl6h4lp7s"; - system = "cl-html-parse"; - asd = "cl-html-parse"; - }); - systems = [ "cl-html-parse" ]; - lispLibs = [ ]; - }; - cl-html-readme = { - pname = "cl-html-readme"; - version = "quicklisp-current-release-fa304a63-git"; - asds = [ "cl-html-readme" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-html-readme/2021-02-28/cl-html-readme-quicklisp-current-release-fa304a63-git.tgz"; - sha256 = "01z2ykfhg7wx7sz4kp1c6cj9ffbpppnfgfd2jpizd7f5id2wi3cb"; - system = "cl-html-readme"; - asd = "cl-html-readme"; - }); - systems = [ "cl-html-readme" ]; - lispLibs = [ ]; - }; - cl-html-readme_slash_doc = { - pname = "cl-html-readme_doc"; - version = "quicklisp-current-release-fa304a63-git"; - asds = [ "cl-html-readme" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-html-readme/2021-02-28/cl-html-readme-quicklisp-current-release-fa304a63-git.tgz"; - sha256 = "01z2ykfhg7wx7sz4kp1c6cj9ffbpppnfgfd2jpizd7f5id2wi3cb"; - system = "cl-html-readme"; - asd = "cl-html-readme"; - }); - systems = [ "cl-html-readme/doc" ]; - lispLibs = [ (getAttr "docparser" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-html-readme_slash_test = { - pname = "cl-html-readme_test"; - version = "quicklisp-current-release-fa304a63-git"; - asds = [ "cl-html-readme" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-html-readme/2021-02-28/cl-html-readme-quicklisp-current-release-fa304a63-git.tgz"; - sha256 = "01z2ykfhg7wx7sz4kp1c6cj9ffbpppnfgfd2jpizd7f5id2wi3cb"; - system = "cl-html-readme"; - asd = "cl-html-readme"; - }); - systems = [ "cl-html-readme/test" ]; - lispLibs = [ (getAttr "lisp-unit" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-html5-parser = { - pname = "cl-html5-parser"; - version = "20190521-git"; - asds = [ "cl-html5-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz"; - sha256 = "04if61wigylsmn996rbfl8ylsd0d9hzdmg7p2wiglncibjzcl5k9"; - system = "cl-html5-parser"; - asd = "cl-html5-parser"; - }); - systems = [ "cl-html5-parser" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "string-case" pkgs) ]; - }; - cl-html5-parser-cxml = { - pname = "cl-html5-parser-cxml"; - version = "20190521-git"; - asds = [ "cl-html5-parser-cxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz"; - sha256 = "04if61wigylsmn996rbfl8ylsd0d9hzdmg7p2wiglncibjzcl5k9"; - system = "cl-html5-parser-cxml"; - asd = "cl-html5-parser-cxml"; - }); - systems = [ "cl-html5-parser-cxml" ]; - lispLibs = [ (getAttr "cl-html5-parser" pkgs) (getAttr "cxml" pkgs) ]; - }; - cl-html5-parser-tests = { - pname = "cl-html5-parser-tests"; - version = "20190521-git"; - asds = [ "cl-html5-parser-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz"; - sha256 = "04if61wigylsmn996rbfl8ylsd0d9hzdmg7p2wiglncibjzcl5k9"; - system = "cl-html5-parser-tests"; - asd = "cl-html5-parser-tests"; - }); - systems = [ "cl-html5-parser-tests" ]; - lispLibs = [ (getAttr "cl-html5-parser" pkgs) (getAttr "json-streams" pkgs) (getAttr "split-sequence" pkgs) (getAttr "stefil" pkgs) ]; - }; - cl-htmlprag = { - pname = "cl-htmlprag"; - version = "20160628-git"; - asds = [ "cl-htmlprag" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-htmlprag/2016-06-28/cl-htmlprag-20160628-git.tgz"; - sha256 = "1akfy9rldx5a2h34vf7y02pj2j7b5anbxja53m41ism4vklgqg1c"; - system = "cl-htmlprag"; - asd = "cl-htmlprag"; - }); - systems = [ "cl-htmlprag" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "optima" pkgs) (getAttr "parse-number" pkgs) ]; - }; - cl-httpsqs = { - pname = "cl-httpsqs"; - version = "20180228-git"; - asds = [ "cl-httpsqs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-httpsqs/2018-02-28/cl-httpsqs-20180228-git.tgz"; - sha256 = "14nhr03lm8012crczjpgsmf0ydipqf3kggayshm7w72vkyf0haj7"; - system = "cl-httpsqs"; - asd = "cl-httpsqs"; - }); - systems = [ "cl-httpsqs" ]; - lispLibs = [ (getAttr "drakma" pkgs) ]; - }; - cl-hue = { - pname = "cl-hue"; - version = "20150113-git"; - asds = [ "cl-hue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-hue/2015-01-13/cl-hue-20150113-git.tgz"; - sha256 = "0d2qv60pih1xmk0zzbdwcsyk8k9abjzilcmhz3jdicinl8jinfr4"; - system = "cl-hue"; - asd = "cl-hue"; - }); - systems = [ "cl-hue" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "drakma" pkgs) (getAttr "yason" pkgs) ]; - }; - cl-i18n = { - pname = "cl-i18n"; - version = "20221106-git"; - asds = [ "cl-i18n" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-i18n/2022-11-06/cl-i18n-20221106-git.tgz"; - sha256 = "0kj1wfvlbi7qwq61b0rcdxa0bmb4sfsnh1bj3n5jxp24sdib73w2"; - system = "cl-i18n"; - asd = "cl-i18n"; - }); - systems = [ "cl-i18n" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-ppcre-unicode" pkgs) ]; - }; - cl-ilu = { - pname = "cl-ilu"; - version = "20150302-git"; - asds = [ "cl-ilu" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz"; - sha256 = "1qdjb7xwzjkv99s8q0834lfdq4ch5j2ymrmqsvwzhg47ys17pvvf"; - system = "cl-ilu"; - asd = "cl-ilu"; - }); - systems = [ "cl-ilu" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-devil" pkgs) ]; - }; - cl-ilut = { - pname = "cl-ilut"; - version = "20150302-git"; - asds = [ "cl-ilut" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-devil/2015-03-02/cl-devil-20150302-git.tgz"; - sha256 = "1qdjb7xwzjkv99s8q0834lfdq4ch5j2ymrmqsvwzhg47ys17pvvf"; - system = "cl-ilut"; - asd = "cl-ilut"; - }); - systems = [ "cl-ilut" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-devil" pkgs) ]; - }; - cl-incognia = { - pname = "cl-incognia"; - version = "20211230-git"; - asds = [ "cl-incognia" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-incognia/2021-12-30/cl-incognia-20211230-git.tgz"; - sha256 = "0c5v7vqh26vg4mzzz7rkq3r29ygj2q4fw6v56pi79bbszyklfs21"; - system = "cl-incognia"; - asd = "cl-incognia"; - }); - systems = [ "cl-incognia" ]; - lispLibs = [ (getAttr "dexador" pkgs) (getAttr "jonathan" pkgs) ]; - }; - cl-incognia_slash_tests = { - pname = "cl-incognia_tests"; - version = "20211230-git"; - asds = [ "cl-incognia" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-incognia/2021-12-30/cl-incognia-20211230-git.tgz"; - sha256 = "0c5v7vqh26vg4mzzz7rkq3r29ygj2q4fw6v56pi79bbszyklfs21"; - system = "cl-incognia"; - asd = "cl-incognia"; - }); - systems = [ "cl-incognia/tests" ]; - lispLibs = [ (getAttr "cl-incognia" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-indentify = { - pname = "cl-indentify"; - version = "20200925-git"; - asds = [ "cl-indentify" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-indentify/2020-09-25/cl-indentify-20200925-git.tgz"; - sha256 = "0ha36bhg474vr76vfhr13szc8cfdj1ickg92k1icz791bqaqg67p"; - system = "cl-indentify"; - asd = "cl-indentify"; - }); - systems = [ "cl-indentify" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-indentify_slash_cli = { - pname = "cl-indentify_cli"; - version = "20200925-git"; - asds = [ "cl-indentify" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-indentify/2020-09-25/cl-indentify-20200925-git.tgz"; - sha256 = "0ha36bhg474vr76vfhr13szc8cfdj1ickg92k1icz791bqaqg67p"; - system = "cl-indentify"; - asd = "cl-indentify"; - }); - systems = [ "cl-indentify/cli" ]; - lispLibs = [ (getAttr "cl-indentify" pkgs) (getAttr "command-line-arguments" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-indentify_slash_tests = { - pname = "cl-indentify_tests"; - version = "20200925-git"; - asds = [ "cl-indentify" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-indentify/2020-09-25/cl-indentify-20200925-git.tgz"; - sha256 = "0ha36bhg474vr76vfhr13szc8cfdj1ickg92k1icz791bqaqg67p"; - system = "cl-indentify"; - asd = "cl-indentify"; - }); - systems = [ "cl-indentify/tests" ]; - lispLibs = [ (getAttr "cl-indentify" pkgs) (getAttr "rove" pkgs) (getAttr "trivial-escapes" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-inflector = { - pname = "cl-inflector"; - version = "20150113-git"; - asds = [ "cl-inflector" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-inflector/2015-01-13/cl-inflector-20150113-git.tgz"; - sha256 = "1xwwlhik1la4fp984qnx2dqq24v012qv4x0y49sngfpwg7n0ya7y"; - system = "cl-inflector"; - asd = "cl-inflector"; - }); - systems = [ "cl-inflector" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - cl-inflector-test = { - pname = "cl-inflector-test"; - version = "20150113-git"; - asds = [ "cl-inflector-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-inflector/2015-01-13/cl-inflector-20150113-git.tgz"; - sha256 = "1xwwlhik1la4fp984qnx2dqq24v012qv4x0y49sngfpwg7n0ya7y"; - system = "cl-inflector-test"; - asd = "cl-inflector"; - }); - systems = [ "cl-inflector-test" ]; - lispLibs = [ (getAttr "cl-inflector" pkgs) (getAttr "lisp-unit2" pkgs) ]; - }; - cl-influxdb = { - pname = "cl-influxdb"; - version = "20180131-git"; - asds = [ "cl-influxdb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-influxdb/2018-01-31/cl-influxdb-20180131-git.tgz"; - sha256 = "0fqnsdw6x79qsvw7l6xp1gxgzcj6jwpa4mn0z2gbbipff4g7k527"; - system = "cl-influxdb"; - asd = "cl-influxdb"; - }); - systems = [ "cl-influxdb" ]; - lispLibs = [ (getAttr "cl-annot" pkgs) (getAttr "cl-json" pkgs) (getAttr "do-urlencode" pkgs) (getAttr "drakma" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-info = { - pname = "cl-info"; - version = "20221106-git"; - asds = [ "cl-info" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-info/2022-11-06/cl-info-20221106-git.tgz"; - sha256 = "1mg58n6qizssm8wqxnxgkrxaabmjzbrfjh9qld69y5z60zrybg1f"; - system = "cl-info"; - asd = "cl-info"; - }); - systems = [ "cl-info" ]; - lispLibs = [ (getAttr "_40ants-doc" pkgs) (getAttr "docs-config" pkgs) ]; - }; - cl-info-test = { - pname = "cl-info-test"; - version = "20221106-git"; - asds = [ "cl-info-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-info/2022-11-06/cl-info-20221106-git.tgz"; - sha256 = "1mg58n6qizssm8wqxnxgkrxaabmjzbrfjh9qld69y5z60zrybg1f"; - system = "cl-info-test"; - asd = "cl-info-test"; - }); - systems = [ "cl-info-test" ]; - lispLibs = [ (getAttr "hamcrest" pkgs) (getAttr "cl-info" pkgs) (getAttr "rove" pkgs) ]; - }; - cl-ini = { - pname = "cl-ini"; - version = "20201220-git"; - asds = [ "cl-ini" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ini/2020-12-20/cl-ini-20201220-git.tgz"; - sha256 = "12vy3gspqn0wmkyz5id1xrgv1scgb16m7pkvmbmi19vlpj2iyq7p"; - system = "cl-ini"; - asd = "cl-ini"; - }); - systems = [ "cl-ini" ]; - lispLibs = [ (getAttr "str" pkgs) ]; - }; - cl-ini-test = { - pname = "cl-ini-test"; - version = "20201220-git"; - asds = [ "cl-ini-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ini/2020-12-20/cl-ini-20201220-git.tgz"; - sha256 = "12vy3gspqn0wmkyz5id1xrgv1scgb16m7pkvmbmi19vlpj2iyq7p"; - system = "cl-ini-test"; - asd = "cl-ini-test"; - }); - systems = [ "cl-ini-test" ]; - lispLibs = [ (getAttr "cl-ini" pkgs) (getAttr "prove" pkgs) ]; - }; - cl-inotify = { - pname = "cl-inotify"; - version = "20220707-git"; - asds = [ "cl-inotify" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-inotify/2022-07-07/cl-inotify-20220707-git.tgz"; - sha256 = "0d3bvp5lqnddzhk1w9yyli03njbkhc8d129a058g0j49kgd47c7v"; - system = "cl-inotify"; - asd = "cl-inotify"; - }); - systems = [ "cl-inotify" ]; - lispLibs = [ (getAttr "binary-types" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "iolib" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_base" pkgs) (getAttr "iolib_dot_conf" pkgs) (getAttr "osicat" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - cl-inotify-tests = { - pname = "cl-inotify-tests"; - version = "20220707-git"; - asds = [ "cl-inotify-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-inotify/2022-07-07/cl-inotify-20220707-git.tgz"; - sha256 = "0d3bvp5lqnddzhk1w9yyli03njbkhc8d129a058g0j49kgd47c7v"; - system = "cl-inotify-tests"; - asd = "cl-inotify-tests"; - }); - systems = [ "cl-inotify-tests" ]; - lispLibs = [ (getAttr "cl-inotify" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-intbytes = { - pname = "cl-intbytes"; - version = "20150923-git"; - asds = [ "cl-intbytes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-intbytes/2015-09-23/cl-intbytes-20150923-git.tgz"; - sha256 = "0chwfda7pi8mrgwj31li7f0x0hr5yrp4csiq8hwkgd4c1ag1z9fx"; - system = "cl-intbytes"; - asd = "cl-intbytes"; - }); - systems = [ "cl-intbytes" ]; - lispLibs = [ (getAttr "fast-io" pkgs) ]; - }; - cl-intbytes-test = { - pname = "cl-intbytes-test"; - version = "20150923-git"; - asds = [ "cl-intbytes-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-intbytes/2015-09-23/cl-intbytes-20150923-git.tgz"; - sha256 = "0chwfda7pi8mrgwj31li7f0x0hr5yrp4csiq8hwkgd4c1ag1z9fx"; - system = "cl-intbytes-test"; - asd = "cl-intbytes-test"; - }); - systems = [ "cl-intbytes-test" ]; - lispLibs = [ (getAttr "cl-intbytes" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-interpol = { - pname = "cl-interpol"; - version = "20221106-git"; - asds = [ "cl-interpol" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-interpol/2022-11-06/cl-interpol-20221106-git.tgz"; - sha256 = "1nkjn8byyfdxhi84rbpqs87bb5m478lvphfgxqqv0q37rn75c946"; - system = "cl-interpol"; - asd = "cl-interpol"; - }); - systems = [ "cl-interpol" ]; - lispLibs = [ (getAttr "cl-unicode" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - cl-interpol_slash_test = { - pname = "cl-interpol_test"; - version = "20221106-git"; - asds = [ "cl-interpol" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-interpol/2022-11-06/cl-interpol-20221106-git.tgz"; - sha256 = "1nkjn8byyfdxhi84rbpqs87bb5m478lvphfgxqqv0q37rn75c946"; - system = "cl-interpol"; - asd = "cl-interpol"; - }); - systems = [ "cl-interpol/test" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "flexi-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-interval = { - pname = "cl-interval"; - version = "20200715-git"; - asds = [ "cl-interval" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-interval/2020-07-15/cl-interval-20200715-git.tgz"; - sha256 = "1425l6xmrqadjqgqb5qasisf14pbr6zpj30bpxfv8hhnxs5njq4p"; - system = "cl-interval"; - asd = "cl-interval"; - }); - systems = [ "cl-interval" ]; - lispLibs = [ ]; - }; - cl-interval-docs = { - pname = "cl-interval-docs"; - version = "20200715-git"; - asds = [ "cl-interval-docs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-interval/2020-07-15/cl-interval-20200715-git.tgz"; - sha256 = "1425l6xmrqadjqgqb5qasisf14pbr6zpj30bpxfv8hhnxs5njq4p"; - system = "cl-interval-docs"; - asd = "cl-interval-docs"; - }); - systems = [ "cl-interval-docs" ]; - lispLibs = [ (getAttr "cl-gendoc" pkgs) (getAttr "cl-interval" pkgs) ]; - }; - cl-ipfs-api2 = { - pname = "cl-ipfs-api2"; - version = "20210630-git"; - asds = [ "cl-ipfs-api2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ipfs-api2/2021-06-30/cl-ipfs-api2-20210630-git.tgz"; - sha256 = "1h0csxk4db1hid793mk5kz3nbjyl7z4ic1zk2wy46k1vz5lnnsph"; - system = "cl-ipfs-api2"; - asd = "cl-ipfs-api2"; - }); - systems = [ "cl-ipfs-api2" ]; - lispLibs = [ (getAttr "arnesi" pkgs) (getAttr "drakma" pkgs) (getAttr "uiop" pkgs) (getAttr "yason" pkgs) ]; - }; - cl-irc = { - pname = "cl-irc"; - version = "0.9.2"; - asds = [ "cl-irc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-irc/2015-09-23/cl-irc-0.9.2.tgz"; - sha256 = "15h3ram8b6vyg4718ad2m92xgilda2x3zmkzbjnijk69kkqsq01r"; - system = "cl-irc"; - asd = "cl-irc"; - }); - systems = [ "cl-irc" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "split-sequence" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-irc-test = { - pname = "cl-irc-test"; - version = "0.9.2"; - asds = [ "cl-irc-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-irc/2015-09-23/cl-irc-0.9.2.tgz"; - sha256 = "15h3ram8b6vyg4718ad2m92xgilda2x3zmkzbjnijk69kkqsq01r"; - system = "cl-irc-test"; - asd = "cl-irc-test"; - }); - systems = [ "cl-irc-test" ]; - lispLibs = [ (getAttr "cl-irc" pkgs) (getAttr "rt" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-irregsexp = { - pname = "cl-irregsexp"; - version = "20160825-git"; - asds = [ "cl-irregsexp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-irregsexp/2016-08-25/cl-irregsexp-20160825-git.tgz"; - sha256 = "09pf3jlqskcs32shbj9q3m0zww5pxyrizbvk2nxiwwnbl1rdb406"; - system = "cl-irregsexp"; - asd = "cl-irregsexp"; - }); - systems = [ "cl-irregsexp" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-isaac = { - pname = "cl-isaac"; - version = "20221106-git"; - asds = [ "cl-isaac" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-isaac/2022-11-06/cl-isaac-20221106-git.tgz"; - sha256 = "0ig1mf8iridfr7vci9gy499194h0hda0xki5s6g0y04g85ibnpw9"; - system = "cl-isaac"; - asd = "cl-isaac"; - }); - systems = [ "cl-isaac" ]; - lispLibs = [ ]; - }; - cl-iterative = { - pname = "cl-iterative"; - version = "20160318-git"; - asds = [ "cl-iterative" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-iterative/2016-03-18/cl-iterative-20160318-git.tgz"; - sha256 = "01h2fs7nq2wivjwh9swsmfdvsdmd7j9dvzgrq0ijbq456zm8vilq"; - system = "cl-iterative"; - asd = "cl-iterative"; - }); - systems = [ "cl-iterative" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "optima" pkgs) ]; - }; - cl-iterative-tests = { - pname = "cl-iterative-tests"; - version = "20160318-git"; - asds = [ "cl-iterative-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-iterative/2016-03-18/cl-iterative-20160318-git.tgz"; - sha256 = "01h2fs7nq2wivjwh9swsmfdvsdmd7j9dvzgrq0ijbq456zm8vilq"; - system = "cl-iterative-tests"; - asd = "cl-iterative-tests"; - }); - systems = [ "cl-iterative-tests" ]; - lispLibs = [ (getAttr "cl-iterative" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-itertools = { - pname = "cl-itertools"; - version = "20160421-git"; - asds = [ "cl-itertools" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-itertools/2016-04-21/cl-itertools-20160421-git.tgz"; - sha256 = "0m1g7nxqnz03bcj46skcr2d50pi3lb4hwizna5d4mvl5hk4zwbxr"; - system = "cl-itertools"; - asd = "cl-itertools"; - }); - systems = [ "cl-itertools" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-coroutine" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-itertools-tests = { - pname = "cl-itertools-tests"; - version = "20160421-git"; - asds = [ "cl-itertools-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-itertools/2016-04-21/cl-itertools-20160421-git.tgz"; - sha256 = "0m1g7nxqnz03bcj46skcr2d50pi3lb4hwizna5d4mvl5hk4zwbxr"; - system = "cl-itertools-tests"; - asd = "cl-itertools"; - }); - systems = [ "cl-itertools-tests" ]; - lispLibs = [ (getAttr "cl-itertools" pkgs) (getAttr "fiveam" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-jpeg = { - pname = "cl-jpeg"; - version = "20170630-git"; - asds = [ "cl-jpeg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz"; - sha256 = "1bkkiqz8fqldlj1wbmrccjsvxcwj98h6s4b6gslr3cg2wmdv5xmy"; - system = "cl-jpeg"; - asd = "cl-jpeg"; - }); - systems = [ "cl-jpeg" ]; - lispLibs = [ ]; - }; - cl-js = { - pname = "cl-js"; - version = "20180131-git"; - asds = [ "cl-js" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/js/2018-01-31/js-20180131-git.tgz"; - sha256 = "0f717358ax5sma53h4hzxx7l00r6ndv2zdpd5rhqv3v7dqqvl8h5"; - system = "cl-js"; - asd = "cl-js"; - }); - systems = [ "cl-js" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "local-time" pkgs) (getAttr "parse-js" pkgs) ]; - }; - cl-json = { - pname = "cl-json"; - version = "20220707-git"; - asds = [ "cl-json" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-json/2022-07-07/cl-json-20220707-git.tgz"; - sha256 = "12vakz47d1i7pywgb9cm2364fzykidc9m7l7b6n9lx0gn2qx9ar5"; - system = "cl-json"; - asd = "cl-json"; - }); - systems = [ "cl-json" ]; - lispLibs = [ ]; - }; - cl-json-helper = { - pname = "cl-json-helper"; - version = "20181210-git"; - asds = [ "cl-json-helper" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-json-helper/2018-12-10/cl-json-helper-20181210-git.tgz"; - sha256 = "1dhv5lh514m7bvl77xjhb4ky7nf4bskgpld7rqg3rq24k4y0c79a"; - system = "cl-json-helper"; - asd = "cl-json-helper"; - }); - systems = [ "cl-json-helper" ]; - lispLibs = [ (getAttr "cl-json" pkgs) ]; - }; - cl-json-pointer = { - pname = "cl-json-pointer"; - version = "20221106-git"; - asds = [ "cl-json-pointer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-json-pointer/2022-11-06/cl-json-pointer-20221106-git.tgz"; - sha256 = "0b7a755wc2ghsd1pv7d32877b21h4nssp41xs017anbmj55czb2h"; - system = "cl-json-pointer"; - asd = "cl-json-pointer"; - }); - systems = [ "cl-json-pointer" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "st-json" pkgs) ]; - }; - cl-json-pointer_slash_core = { - pname = "cl-json-pointer_core"; - version = "20221106-git"; - asds = [ "cl-json-pointer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-json-pointer/2022-11-06/cl-json-pointer-20221106-git.tgz"; - sha256 = "0b7a755wc2ghsd1pv7d32877b21h4nssp41xs017anbmj55czb2h"; - system = "cl-json-pointer"; - asd = "cl-json-pointer"; - }); - systems = [ "cl-json-pointer/core" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-json-pointer_slash_st-json-support = { - pname = "cl-json-pointer_st-json-support"; - version = "20221106-git"; - asds = [ "cl-json-pointer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-json-pointer/2022-11-06/cl-json-pointer-20221106-git.tgz"; - sha256 = "0b7a755wc2ghsd1pv7d32877b21h4nssp41xs017anbmj55czb2h"; - system = "cl-json-pointer"; - asd = "cl-json-pointer"; - }); - systems = [ "cl-json-pointer/st-json-support" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "st-json" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-json-pointer_slash_synonyms = { - pname = "cl-json-pointer_synonyms"; - version = "20221106-git"; - asds = [ "cl-json-pointer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-json-pointer/2022-11-06/cl-json-pointer-20221106-git.tgz"; - sha256 = "0b7a755wc2ghsd1pv7d32877b21h4nssp41xs017anbmj55czb2h"; - system = "cl-json-pointer"; - asd = "cl-json-pointer"; - }); - systems = [ "cl-json-pointer/synonyms" ]; - lispLibs = [ (getAttr "cl-json-pointer" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-json-schema = { - pname = "cl-json-schema"; - version = "20210228-git"; - asds = [ "cl-json-schema" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-json-schema/2021-02-28/cl-json-schema-20210228-git.tgz"; - sha256 = "1c90c9j6d2b02zyyqd07200waqa4saq0svps7vfy5a3lxp9vag9i"; - system = "cl-json-schema"; - asd = "cl-json-schema"; - }); - systems = [ "cl-json-schema" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "trivial-do" pkgs) (getAttr "yason" pkgs) ]; - }; - cl-json-schema-tests = { - pname = "cl-json-schema-tests"; - version = "20210228-git"; - asds = [ "cl-json-schema-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-json-schema/2021-02-28/cl-json-schema-20210228-git.tgz"; - sha256 = "1c90c9j6d2b02zyyqd07200waqa4saq0svps7vfy5a3lxp9vag9i"; - system = "cl-json-schema-tests"; - asd = "cl-json-schema-tests"; - }); - systems = [ "cl-json-schema-tests" ]; - lispLibs = [ (getAttr "cl-json-schema" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "fiasco" pkgs) ]; - }; - cl-json_slash_test = { - pname = "cl-json_test"; - version = "20220707-git"; - asds = [ "cl-json" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-json/2022-07-07/cl-json-20220707-git.tgz"; - sha256 = "12vakz47d1i7pywgb9cm2364fzykidc9m7l7b6n9lx0gn2qx9ar5"; - system = "cl-json"; - asd = "cl-json"; - }); - systems = [ "cl-json/test" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-jsx = { - pname = "cl-jsx"; - version = "20160208-git"; - asds = [ "cl-jsx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-jsx/2016-02-08/cl-jsx-20160208-git.tgz"; - sha256 = "1vkqs65sqnfkfka2p93ibfrgg3wps3qhlcgcd8j40h0bv3phcjp7"; - system = "cl-jsx"; - asd = "cl-jsx"; - }); - systems = [ "cl-jsx" ]; - lispLibs = [ (getAttr "cl-who" pkgs) (getAttr "esrap" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - cl-jsx-test = { - pname = "cl-jsx-test"; - version = "20160208-git"; - asds = [ "cl-jsx-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-jsx/2016-02-08/cl-jsx-20160208-git.tgz"; - sha256 = "1vkqs65sqnfkfka2p93ibfrgg3wps3qhlcgcd8j40h0bv3phcjp7"; - system = "cl-jsx-test"; - asd = "cl-jsx-test"; - }); - systems = [ "cl-jsx-test" ]; - lispLibs = [ (getAttr "cl-jsx" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-junit-xml = { - pname = "cl-junit-xml"; - version = "20150113-git"; - asds = [ "cl-junit-xml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz"; - sha256 = "1ssrcgw5bhfsb5lk7jb8jyz77mj6sg23wc3gmnw747iqvpikwakr"; - system = "cl-junit-xml"; - asd = "cl-junit-xml"; - }); - systems = [ "cl-junit-xml" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cxml" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-junit-xml_dot_lisp-unit = { - pname = "cl-junit-xml.lisp-unit"; - version = "20150113-git"; - asds = [ "cl-junit-xml.lisp-unit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz"; - sha256 = "1ssrcgw5bhfsb5lk7jb8jyz77mj6sg23wc3gmnw747iqvpikwakr"; - system = "cl-junit-xml.lisp-unit"; - asd = "cl-junit-xml.lisp-unit"; - }); - systems = [ "cl-junit-xml.lisp-unit" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-junit-xml" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "iterate" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - cl-junit-xml_dot_lisp-unit2 = { - pname = "cl-junit-xml.lisp-unit2"; - version = "20150113-git"; - asds = [ "cl-junit-xml.lisp-unit2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz"; - sha256 = "1ssrcgw5bhfsb5lk7jb8jyz77mj6sg23wc3gmnw747iqvpikwakr"; - system = "cl-junit-xml.lisp-unit2"; - asd = "cl-junit-xml.lisp-unit2"; - }); - systems = [ "cl-junit-xml.lisp-unit2" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-junit-xml" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "iterate" pkgs) (getAttr "lisp-unit2" pkgs) ]; - }; - cl-junit-xml_dot_test = { - pname = "cl-junit-xml.test"; - version = "20150113-git"; - asds = [ "cl-junit-xml.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-junit-xml/2015-01-13/cl-junit-xml-20150113-git.tgz"; - sha256 = "1ssrcgw5bhfsb5lk7jb8jyz77mj6sg23wc3gmnw747iqvpikwakr"; - system = "cl-junit-xml.test"; - asd = "cl-junit-xml"; - }); - systems = [ "cl-junit-xml.test" ]; - lispLibs = [ (getAttr "cl-junit-xml" pkgs) (getAttr "lisp-unit2" pkgs) ]; - }; - cl-k8055 = { - pname = "cl-k8055"; - version = "20190710-git"; - asds = [ "cl-k8055" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-k8055/2019-07-10/cl-k8055-20190710-git.tgz"; - sha256 = "069j5hrcpcm9vlh2f0myqwggp30inycxn61ivi1ppa97f8f1rrig"; - system = "cl-k8055"; - asd = "cl-k8055"; - }); - systems = [ "cl-k8055" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - cl-kanren = { - pname = "cl-kanren"; - version = "20191007-git"; - asds = [ "cl-kanren" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-kanren/2019-10-07/cl-kanren-20191007-git.tgz"; - sha256 = "1r0qzvs92d7kgl83fx8c27jmsh17agr7jpb1nmmc56phjvq0z7ll"; - system = "cl-kanren"; - asd = "cl-kanren"; - }); - systems = [ "cl-kanren" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-kanren-test = { - pname = "cl-kanren-test"; - version = "20191007-git"; - asds = [ "cl-kanren-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-kanren/2019-10-07/cl-kanren-20191007-git.tgz"; - sha256 = "1r0qzvs92d7kgl83fx8c27jmsh17agr7jpb1nmmc56phjvq0z7ll"; - system = "cl-kanren-test"; - asd = "cl-kanren-test"; - }); - systems = [ "cl-kanren-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-kanren" pkgs) (getAttr "clunit" pkgs) ]; - }; - cl-keycloak = { - pname = "cl-keycloak"; - version = "20190710-git"; - asds = [ "cl-keycloak" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-keycloak/2019-07-10/cl-keycloak-20190710-git.tgz"; - sha256 = "052x10xj951061xa80kp1ziwrr8hskjsr7q2ni1d1ab26rkmhb9q"; - system = "cl-keycloak"; - asd = "cl-keycloak"; - }); - systems = [ "cl-keycloak" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "yason" pkgs) ]; - }; - cl-kraken = { - pname = "cl-kraken"; - version = "20220331-git"; - asds = [ "cl-kraken" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-kraken/2022-03-31/cl-kraken-20220331-git.tgz"; - sha256 = "07a9a7yqii0gsiaf4r6jfz2nb2m8766rv4acqcdjm8zmsllwx7jz"; - system = "cl-kraken"; - asd = "cl-kraken"; - }); - systems = [ "cl-kraken" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "dexador" pkgs) (getAttr "ironclad" pkgs) (getAttr "jsown" pkgs) (getAttr "quri" pkgs) ]; - }; - cl-kraken_slash_tests = { - pname = "cl-kraken_tests"; - version = "20220331-git"; - asds = [ "cl-kraken" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-kraken/2022-03-31/cl-kraken-20220331-git.tgz"; - sha256 = "07a9a7yqii0gsiaf4r6jfz2nb2m8766rv4acqcdjm8zmsllwx7jz"; - system = "cl-kraken"; - asd = "cl-kraken"; - }); - systems = [ "cl-kraken/tests" ]; - lispLibs = [ (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-ksuid = { - pname = "cl-ksuid"; - version = "20170830-git"; - asds = [ "cl-ksuid" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ksuid/2017-08-30/cl-ksuid-20170830-git.tgz"; - sha256 = "142fr8l6aa6wxnjxv04f61hy9504cx9x1r10byhmj475s5pfr6gl"; - system = "cl-ksuid"; - asd = "cl-ksuid"; - }); - systems = [ "cl-ksuid" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "ironclad" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-ksuid-test = { - pname = "cl-ksuid-test"; - version = "20170830-git"; - asds = [ "cl-ksuid-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ksuid/2017-08-30/cl-ksuid-20170830-git.tgz"; - sha256 = "142fr8l6aa6wxnjxv04f61hy9504cx9x1r10byhmj475s5pfr6gl"; - system = "cl-ksuid-test"; - asd = "cl-ksuid"; - }); - systems = [ "cl-ksuid-test" ]; - lispLibs = [ (getAttr "cl-ksuid" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-kyoto-cabinet = { - pname = "cl-kyoto-cabinet"; - version = "20191130-git"; - asds = [ "cl-kyoto-cabinet" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-kyoto-cabinet/2019-11-30/cl-kyoto-cabinet-20191130-git.tgz"; - sha256 = "0ayp87ggayaf8d1dblpv90a87fmgh9vhhcah3ch6jvcw6zzb9lcr"; - system = "cl-kyoto-cabinet"; - asd = "cl-kyoto-cabinet"; - }); - systems = [ "cl-kyoto-cabinet" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-l10n = { - pname = "cl-l10n"; - version = "20211209-git"; - asds = [ "cl-l10n" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-l10n/2021-12-09/cl-l10n-20211209-git.tgz"; - sha256 = "10yknvjcbgc82a6k6yzj2diki2z2s04q5kg642f2gfj2rl3bjyz7"; - system = "cl-l10n"; - asd = "cl-l10n"; - }); - systems = [ "cl-l10n" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-l10n-cldr" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "cxml" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "iterate" pkgs) (getAttr "local-time" pkgs) (getAttr "metabang-bind" pkgs) ]; - }; - cl-l10n-cldr = { - pname = "cl-l10n-cldr"; - version = "20120909-darcs"; - asds = [ "cl-l10n-cldr" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz"; - sha256 = "1mwkjdc51158v9rpdpsc1qzqqs0x8hb9k1k7b0pm8q7dp9rrb53v"; - system = "cl-l10n-cldr"; - asd = "cl-l10n-cldr"; - }); - systems = [ "cl-l10n-cldr" ]; - lispLibs = [ ]; - }; - cl-l10n_slash_test = { - pname = "cl-l10n_test"; - version = "20211209-git"; - asds = [ "cl-l10n" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-l10n/2021-12-09/cl-l10n-20211209-git.tgz"; - sha256 = "10yknvjcbgc82a6k6yzj2diki2z2s04q5kg642f2gfj2rl3bjyz7"; - system = "cl-l10n"; - asd = "cl-l10n"; - }); - systems = [ "cl-l10n/test" ]; - lispLibs = [ (getAttr "cl-l10n" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "parse-number" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-lambdacalc = { - pname = "cl-lambdacalc"; - version = "20220331-git"; - asds = [ "cl-lambdacalc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lambdacalc/2022-03-31/cl-lambdacalc-20220331-git.tgz"; - sha256 = "0k2df6i5zrl9v1qx5cvznkzch1wc100zw5289zbl3vlq545z88gc"; - system = "cl-lambdacalc"; - asd = "cl-lambdacalc"; - }); - systems = [ "cl-lambdacalc" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - cl-lambdacalc-test = { - pname = "cl-lambdacalc-test"; - version = "20220331-git"; - asds = [ "cl-lambdacalc-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lambdacalc/2022-03-31/cl-lambdacalc-20220331-git.tgz"; - sha256 = "0k2df6i5zrl9v1qx5cvznkzch1wc100zw5289zbl3vlq545z88gc"; - system = "cl-lambdacalc-test"; - asd = "cl-lambdacalc-test"; - }); - systems = [ "cl-lambdacalc-test" ]; - lispLibs = [ (getAttr "cl-lambdacalc" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - cl-las = { - pname = "cl-las"; - version = "20221106-git"; - asds = [ "cl-las" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-las/2022-11-06/cl-las-20221106-git.tgz"; - sha256 = "119v5mrvxhz8b3alqj9gzfbzhigdm1n1hmwyylncn5w5dkq3jc9k"; - system = "cl-las"; - asd = "cl-las"; - }); - systems = [ "cl-las" ]; - lispLibs = [ (getAttr "binary-io" pkgs) ]; - }; - cl-lastfm = { - pname = "cl-lastfm"; - version = "0.2.1"; - asds = [ "cl-lastfm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lastfm/2014-07-13/cl-lastfm-0.2.1.tgz"; - sha256 = "0f37b8swgfz57bffcypjhcgzj5dhanssiraahkianj65a6zbindl"; - system = "cl-lastfm"; - asd = "cl-lastfm"; - }); - systems = [ "cl-lastfm" ]; - lispLibs = [ (getAttr "cxml-stp" pkgs) (getAttr "drakma" pkgs) (getAttr "trivial-utf-8" pkgs) (getAttr "url-rewrite" pkgs) ]; - }; - cl-lastfm-test = { - pname = "cl-lastfm-test"; - version = "0.2.1"; - asds = [ "cl-lastfm-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lastfm/2014-07-13/cl-lastfm-0.2.1.tgz"; - sha256 = "0f37b8swgfz57bffcypjhcgzj5dhanssiraahkianj65a6zbindl"; - system = "cl-lastfm-test"; - asd = "cl-lastfm-test"; - }); - systems = [ "cl-lastfm-test" ]; - lispLibs = [ (getAttr "cl-lastfm" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - cl-launch = { - pname = "cl-launch"; - version = "4.1.4.1"; - asds = [ "cl-launch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-launch/2015-10-31/cl-launch-4.1.4.1.tgz"; - sha256 = "041nh1sh9rqdk9c1kr63n3g2pn11i68x9plzyfq36wmyhz2aypnr"; - system = "cl-launch"; - asd = "cl-launch"; - }); - systems = [ "cl-launch" ]; - lispLibs = [ ]; - }; - cl-ledger = { - pname = "cl-ledger"; - version = "20200218-git"; - asds = [ "cl-ledger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ledger/2020-02-18/cl-ledger-20200218-git.tgz"; - sha256 = "1dpxna9s0rgshqbc58h698ihwyk34a3napb8zrm8vbq8aigjrrzs"; - system = "cl-ledger"; - asd = "cl-ledger"; - }); - systems = [ "cl-ledger" ]; - lispLibs = [ (getAttr "cambl" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "local-time" pkgs) (getAttr "periods-series" pkgs) ]; - }; - cl-lex = { - pname = "cl-lex"; - version = "20160929-git"; - asds = [ "cl-lex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lex/2016-09-29/cl-lex-20160929-git.tgz"; - sha256 = "1kg50f76bfpfxcv4dfivq1n9a0xlsra2ajb0vd68lxwgbidgyc2y"; - system = "cl-lex"; - asd = "cl-lex"; - }); - systems = [ "cl-lex" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - cl-lexer = { - pname = "cl-lexer"; - version = "20191007-git"; - asds = [ "cl-lexer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lexer/2019-10-07/cl-lexer-20191007-git.tgz"; - sha256 = "182fnmazfmc3zdp14lvpxlaxrwwsjp8mbjn8sdzywjxcnvlpkdmk"; - system = "cl-lexer"; - asd = "cl-lexer"; - }); - systems = [ "cl-lexer" ]; - lispLibs = [ (getAttr "regex" pkgs) ]; - }; - cl-liballegro = { - pname = "cl-liballegro"; - version = "20221106-git"; - asds = [ "cl-liballegro" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-liballegro/2022-11-06/cl-liballegro-20221106-git.tgz"; - sha256 = "0x2q91s2242gw03w50l227llfb3hrsvjsyhjbc6dqarf1n1y3kw3"; - system = "cl-liballegro"; - asd = "cl-liballegro"; - }); - systems = [ "cl-liballegro" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "float-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-main-thread" pkgs) ]; - }; - cl-liballegro-nuklear = { - pname = "cl-liballegro-nuklear"; - version = "20221106-git"; - asds = [ "cl-liballegro-nuklear" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-liballegro-nuklear/2022-11-06/cl-liballegro-nuklear-20221106-git.tgz"; - sha256 = "196lyp469rdjkpkcqpy4h860nsjqfifrvm798xip93sxzcg9zkba"; - system = "cl-liballegro-nuklear"; - asd = "cl-liballegro-nuklear"; - }); - systems = [ "cl-liballegro-nuklear" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - cl-libevent2 = { - pname = "cl-libevent2"; - version = "20190107-git"; - asds = [ "cl-libevent2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libevent2/2019-01-07/cl-libevent2-20190107-git.tgz"; - sha256 = "18c8cxlh0vmyca7ihj8dz3f1j31h7y0kcis6qr6mpkzyi0k2cf0g"; - system = "cl-libevent2"; - asd = "cl-libevent2"; - }); - systems = [ "cl-libevent2" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-libevent2-ssl = { - pname = "cl-libevent2-ssl"; - version = "20190107-git"; - asds = [ "cl-libevent2-ssl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libevent2/2019-01-07/cl-libevent2-20190107-git.tgz"; - sha256 = "18c8cxlh0vmyca7ihj8dz3f1j31h7y0kcis6qr6mpkzyi0k2cf0g"; - system = "cl-libevent2-ssl"; - asd = "cl-libevent2-ssl"; - }); - systems = [ "cl-libevent2-ssl" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-libevent2" pkgs) ]; - }; - cl-libfarmhash = { - pname = "cl-libfarmhash"; - version = "20161031-git"; - asds = [ "cl-libfarmhash" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libfarmhash/2016-10-31/cl-libfarmhash-20161031-git.tgz"; - sha256 = "1r8rhwh4jdvvby15nzaxikzhd1q8ipsfylqbsq2m9q482vcxs6sb"; - system = "cl-libfarmhash"; - asd = "cl-libfarmhash"; - }); - systems = [ "cl-libfarmhash" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) ]; - }; - cl-libhoedown = { - pname = "cl-libhoedown"; - version = "20161031-git"; - asds = [ "cl-libhoedown" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libhoedown/2016-10-31/cl-libhoedown-20161031-git.tgz"; - sha256 = "1bm8iganj8533m5y46zjvai1fb0dw32hdfx22jjp5k31kyv9d42c"; - system = "cl-libhoedown"; - asd = "cl-libhoedown"; - }); - systems = [ "cl-libhoedown" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-libiio = { - pname = "cl-libiio"; - version = "20191130-git"; - asds = [ "cl-libiio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libiio/2019-11-30/cl-libiio-20191130-git.tgz"; - sha256 = "1z1jslm303c22imhshr92j1mq7g3j81xa5rk5psj3x00papncwmr"; - system = "cl-libiio"; - asd = "cl-libiio"; - }); - systems = [ "cl-libiio" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-libinput = { - pname = "cl-libinput"; - version = "20220707-git"; - asds = [ "cl-libinput" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libinput/2022-07-07/cl-libinput-20220707-git.tgz"; - sha256 = "18c3rl3d2bizbp3607gnn9j50x84f2mkypj9rqbry56i5gcw8zkh"; - system = "cl-libinput"; - asd = "cl-libinput"; - }); - systems = [ "cl-libinput" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "osicat" pkgs) ]; - }; - cl-liblinear = { - pname = "cl-liblinear"; - version = "20211020-git"; - asds = [ "cl-liblinear" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libsvm/2021-10-20/cl-libsvm-20211020-git.tgz"; - sha256 = "0fpcw82hz6bp2hicjhvhxwcj4azprcl911n8q941lk8xcld3pmi0"; - system = "cl-liblinear"; - asd = "cl-liblinear"; - }); - systems = [ "cl-liblinear" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-libpuzzle = { - pname = "cl-libpuzzle"; - version = "20150608-git"; - asds = [ "cl-libpuzzle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libpuzzle/2015-06-08/cl-libpuzzle-20150608-git.tgz"; - sha256 = "0qgpdg4lni4sq6jp23qcd1jldsnrsn4h5b14ddmc8mb7va4qshlp"; - system = "cl-libpuzzle"; - asd = "cl-libpuzzle"; - }); - systems = [ "cl-libpuzzle" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-libpuzzle-test = { - pname = "cl-libpuzzle-test"; - version = "20150608-git"; - asds = [ "cl-libpuzzle-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libpuzzle/2015-06-08/cl-libpuzzle-20150608-git.tgz"; - sha256 = "0qgpdg4lni4sq6jp23qcd1jldsnrsn4h5b14ddmc8mb7va4qshlp"; - system = "cl-libpuzzle-test"; - asd = "cl-libpuzzle-test"; - }); - systems = [ "cl-libpuzzle-test" ]; - lispLibs = [ (getAttr "cl-libpuzzle" pkgs) (getAttr "cl-test-more" pkgs) ]; - }; - cl-libsvm = { - pname = "cl-libsvm"; - version = "20211020-git"; - asds = [ "cl-libsvm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libsvm/2021-10-20/cl-libsvm-20211020-git.tgz"; - sha256 = "0fpcw82hz6bp2hicjhvhxwcj4azprcl911n8q941lk8xcld3pmi0"; - system = "cl-libsvm"; - asd = "cl-libsvm"; - }); - systems = [ "cl-libsvm" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-libsvm-format = { - pname = "cl-libsvm-format"; - version = "20180711-git"; - asds = [ "cl-libsvm-format" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libsvm-format/2018-07-11/cl-libsvm-format-20180711-git.tgz"; - sha256 = "0284aj84xszhkhlivaigf9qj855fxad3mzmv3zfr0qzb5k0nzwrg"; - system = "cl-libsvm-format"; - asd = "cl-libsvm-format"; - }); - systems = [ "cl-libsvm-format" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-libsvm-format-test = { - pname = "cl-libsvm-format-test"; - version = "20180711-git"; - asds = [ "cl-libsvm-format-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libsvm-format/2018-07-11/cl-libsvm-format-20180711-git.tgz"; - sha256 = "0284aj84xszhkhlivaigf9qj855fxad3mzmv3zfr0qzb5k0nzwrg"; - system = "cl-libsvm-format-test"; - asd = "cl-libsvm-format-test"; - }); - systems = [ "cl-libsvm-format-test" ]; - lispLibs = [ (getAttr "cl-libsvm-format" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-libusb = { - pname = "cl-libusb"; - version = "20210228-git"; - asds = [ "cl-libusb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libusb/2021-02-28/cl-libusb-20210228-git.tgz"; - sha256 = "0kyzgcflwb85q58fgn82sp0bipnq5bprg5i4h0h3jxafqqyagbnk"; - system = "cl-libusb"; - asd = "cl-libusb"; - }); - systems = [ "cl-libusb" ]; - lispLibs = [ (getAttr "libusb-ffi" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-libuv = { - pname = "cl-libuv"; - version = "20221106-git"; - asds = [ "cl-libuv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libuv/2022-11-06/cl-libuv-20221106-git.tgz"; - sha256 = "0rdcg0grxmylxf547n1m8qn87zspld7aswz7bvajxjryhfq7hqxh"; - system = "cl-libuv"; - asd = "cl-libuv"; - }); - systems = [ "cl-libuv" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - cl-libuv-config = { - pname = "cl-libuv-config"; - version = "20221106-git"; - asds = [ "cl-libuv-config" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libuv/2022-11-06/cl-libuv-20221106-git.tgz"; - sha256 = "0rdcg0grxmylxf547n1m8qn87zspld7aswz7bvajxjryhfq7hqxh"; - system = "cl-libuv-config"; - asd = "cl-libuv-config"; - }); - systems = [ "cl-libuv-config" ]; - lispLibs = [ (getAttr "cffi-grovel" pkgs) ]; - }; - cl-libxml2 = { - pname = "cl-libxml2"; - version = "20130615-git"; - asds = [ "cl-libxml2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; - sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw"; - system = "cl-libxml2"; - asd = "cl-libxml2"; - }); - systems = [ "cl-libxml2" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "garbage-pools" pkgs) (getAttr "iterate" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "puri" pkgs) ]; - }; - cl-libxml2-test = { - pname = "cl-libxml2-test"; - version = "20130615-git"; - asds = [ "cl-libxml2-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; - sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw"; - system = "cl-libxml2-test"; - asd = "cl-libxml2"; - }); - systems = [ "cl-libxml2-test" ]; - lispLibs = [ (getAttr "cl-libxml2" pkgs) (getAttr "lift" pkgs) ]; - }; - cl-libyaml = { - pname = "cl-libyaml"; - version = "20201220-git"; - asds = [ "cl-libyaml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libyaml/2020-12-20/cl-libyaml-20201220-git.tgz"; - sha256 = "06pvmackyhq03rjmihpx6w63m6cy8wx78ll5xpwwvd85bgrqq817"; - system = "cl-libyaml"; - asd = "cl-libyaml"; - }); - systems = [ "cl-libyaml" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-libyaml-test = { - pname = "cl-libyaml-test"; - version = "20201220-git"; - asds = [ "cl-libyaml-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libyaml/2020-12-20/cl-libyaml-20201220-git.tgz"; - sha256 = "06pvmackyhq03rjmihpx6w63m6cy8wx78ll5xpwwvd85bgrqq817"; - system = "cl-libyaml-test"; - asd = "cl-libyaml-test"; - }); - systems = [ "cl-libyaml-test" ]; - lispLibs = [ (getAttr "cl-libyaml" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-lite = { - pname = "cl-lite"; - version = "master-1a957fb2-git"; - asds = [ "cl-lite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "cl-lite"; - asd = "cl-lite"; - }); - systems = [ "cl-lite" ]; - lispLibs = [ (getAttr "glisp" pkgs) ]; - }; - cl-locale = { - pname = "cl-locale"; - version = "20151031-git"; - asds = [ "cl-locale" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz"; - sha256 = "1rhannhpsw1yg1fpflam483a3w9qb1izgyvmnmiddv3dn4qsmn9p"; - system = "cl-locale"; - asd = "cl-locale"; - }); - systems = [ "cl-locale" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "arnesi" pkgs) (getAttr "cl-annot" pkgs) (getAttr "cl-syntax" pkgs) (getAttr "cl-syntax-annot" pkgs) ]; - }; - cl-locale-syntax = { - pname = "cl-locale-syntax"; - version = "20151031-git"; - asds = [ "cl-locale-syntax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz"; - sha256 = "1rhannhpsw1yg1fpflam483a3w9qb1izgyvmnmiddv3dn4qsmn9p"; - system = "cl-locale-syntax"; - asd = "cl-locale-syntax"; - }); - systems = [ "cl-locale-syntax" ]; - lispLibs = [ (getAttr "cl-locale" pkgs) (getAttr "cl-syntax" pkgs) ]; - }; - cl-locale-test = { - pname = "cl-locale-test"; - version = "20151031-git"; - asds = [ "cl-locale-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz"; - sha256 = "1rhannhpsw1yg1fpflam483a3w9qb1izgyvmnmiddv3dn4qsmn9p"; - system = "cl-locale-test"; - asd = "cl-locale-test"; - }); - systems = [ "cl-locale-test" ]; - lispLibs = [ (getAttr "cl-locale" pkgs) (getAttr "cl-syntax" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-locatives = { - pname = "cl-locatives"; - version = "20190307-hg"; - asds = [ "cl-locatives" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-locatives/2019-03-07/cl-locatives-20190307-hg.tgz"; - sha256 = "0f1fqqdpxbyl1cshmz26g3bgnyi7g6nixfrqjab5sxwihk844yd6"; - system = "cl-locatives"; - asd = "cl-locatives"; - }); - systems = [ "cl-locatives" ]; - lispLibs = [ ]; - }; - cl-log = { - pname = "cl-log"; - version = ".1.0.1"; - asds = [ "cl-log" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz"; - sha256 = "0lfy3sxr2shhv8qpyry9kk9gcwwl6bhfgzv0pczibl70mgraqnys"; - system = "cl-log"; - asd = "cl-log"; - }); - systems = [ "cl-log" ]; - lispLibs = [ ]; - }; - cl-log-test = { - pname = "cl-log-test"; - version = ".1.0.1"; - asds = [ "cl-log-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz"; - sha256 = "0lfy3sxr2shhv8qpyry9kk9gcwwl6bhfgzv0pczibl70mgraqnys"; - system = "cl-log-test"; - asd = "cl-log-test"; - }); - systems = [ "cl-log-test" ]; - lispLibs = [ (getAttr "cl-log" pkgs) (getAttr "eos" pkgs) ]; - }; - cl-logic = { - pname = "cl-logic"; - version = "20141217-git"; - asds = [ "cl-logic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-logic/2014-12-17/cl-logic-20141217-git.tgz"; - sha256 = "17n2wzqali3j6b7pqbydipwlxgwdrj4mdnsgwjdyz32n8jvfyjwh"; - system = "cl-logic"; - asd = "cl-logic"; - }); - systems = [ "cl-logic" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "quine-mccluskey" pkgs) ]; - }; - cl-ltsv = { - pname = "cl-ltsv"; - version = "20140713-git"; - asds = [ "cl-ltsv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ltsv/2014-07-13/cl-ltsv-20140713-git.tgz"; - sha256 = "1bjvnwxyaaw3yrq5hws2fr4qmk5938hdh2np2bqpm4m3b2c94n22"; - system = "cl-ltsv"; - asd = "cl-ltsv"; - }); - systems = [ "cl-ltsv" ]; - lispLibs = [ ]; - }; - cl-ltsv-test = { - pname = "cl-ltsv-test"; - version = "20140713-git"; - asds = [ "cl-ltsv-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ltsv/2014-07-13/cl-ltsv-20140713-git.tgz"; - sha256 = "1bjvnwxyaaw3yrq5hws2fr4qmk5938hdh2np2bqpm4m3b2c94n22"; - system = "cl-ltsv-test"; - asd = "cl-ltsv-test"; - }); - systems = [ "cl-ltsv-test" ]; - lispLibs = [ (getAttr "cl-ltsv" pkgs) (getAttr "cl-test-more" pkgs) ]; - }; - cl-lzma = { - pname = "cl-lzma"; - version = "20191130-git"; - asds = [ "cl-lzma" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lzma/2019-11-30/cl-lzma-20191130-git.tgz"; - sha256 = "17fdinmi2ffdga17slv86van0sp9gkvlmjprfdwak2jzziz6fxx6"; - system = "cl-lzma"; - asd = "cl-lzma"; - }); - systems = [ "cl-lzma" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-autowrap" pkgs) (getAttr "fast-io" pkgs) (getAttr "static-vectors" pkgs) ]; - }; - cl-m4 = { - pname = "cl-m4"; - version = "20130312-git"; - asds = [ "cl-m4" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-m4/2013-03-12/cl-m4-20130312-git.tgz"; - sha256 = "1dqdhxb45j4vqmx38xkq32gsckldca8rxpf2idg4b61wd21c0ci6"; - system = "cl-m4"; - asd = "cl-m4"; - }); - systems = [ "cl-m4" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "external-program" pkgs) (getAttr "graylex" pkgs) ]; - }; - cl-m4-test = { - pname = "cl-m4-test"; - version = "20130312-git"; - asds = [ "cl-m4-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-m4/2013-03-12/cl-m4-20130312-git.tgz"; - sha256 = "1dqdhxb45j4vqmx38xkq32gsckldca8rxpf2idg4b61wd21c0ci6"; - system = "cl-m4-test"; - asd = "cl-m4-test"; - }); - systems = [ "cl-m4-test" ]; - lispLibs = [ (getAttr "cl-heredoc" pkgs) (getAttr "cl-m4" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - }; - cl-mango = { - pname = "cl-mango"; - version = "20200925-git"; - asds = [ "cl-mango" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mango/2020-09-25/cl-mango-20200925-git.tgz"; - sha256 = "0ipa1azakzqigq103m1j2z597bp2i34kx4z1418kp2jn8zwbdz5s"; - system = "cl-mango"; - asd = "cl-mango"; - }); - systems = [ "cl-mango" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "json-mop" pkgs) (getAttr "yason" pkgs) ]; - }; - cl-markdown = { - pname = "cl-markdown"; - version = "20191227-git"; - asds = [ "cl-markdown" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz"; - sha256 = "1wksi765nk8kf5qm2chh7dcn6k562kvc108dzdb9y5iwp97lqqvg"; - system = "cl-markdown"; - asd = "cl-markdown"; - }); - systems = [ "cl-markdown" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "cl-containers" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "dynamic-classes" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "metatilities-base" pkgs) ]; - }; - cl-markdown-comparisons = { - pname = "cl-markdown-comparisons"; - version = "20191227-git"; - asds = [ "cl-markdown-comparisons" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz"; - sha256 = "1wksi765nk8kf5qm2chh7dcn6k562kvc108dzdb9y5iwp97lqqvg"; - system = "cl-markdown-comparisons"; - asd = "cl-markdown-comparisons"; - }); - systems = [ "cl-markdown-comparisons" ]; - lispLibs = [ (getAttr "cl-html-diff" pkgs) (getAttr "cl-markdown" pkgs) (getAttr "html-encode" pkgs) (getAttr "lift" pkgs) (getAttr "lml2" pkgs) (getAttr "trivial-shell" pkgs) ]; - }; - cl-markdown-test = { - pname = "cl-markdown-test"; - version = "20191227-git"; - asds = [ "cl-markdown-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markdown/2019-12-27/cl-markdown-20191227-git.tgz"; - sha256 = "1wksi765nk8kf5qm2chh7dcn6k562kvc108dzdb9y5iwp97lqqvg"; - system = "cl-markdown-test"; - asd = "cl-markdown-test"; - }); - systems = [ "cl-markdown-test" ]; - lispLibs = [ (getAttr "cl-markdown" pkgs) (getAttr "lift" pkgs) (getAttr "trivial-shell" pkgs) ]; - }; - cl-markless = { - pname = "cl-markless"; - version = "20220707-git"; - asds = [ "cl-markless" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2022-07-07/cl-markless-20220707-git.tgz"; - sha256 = "0v1h1sgn180ffhbnld7kwh6s33mls6p0iby4pdh32pj1py7ayw0l"; - system = "cl-markless"; - asd = "cl-markless"; - }); - systems = [ "cl-markless" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "trivial-indent" pkgs) ]; - }; - cl-markless-epub = { - pname = "cl-markless-epub"; - version = "20220707-git"; - asds = [ "cl-markless-epub" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2022-07-07/cl-markless-20220707-git.tgz"; - sha256 = "0v1h1sgn180ffhbnld7kwh6s33mls6p0iby4pdh32pj1py7ayw0l"; - system = "cl-markless-epub"; - asd = "cl-markless-epub"; - }); - systems = [ "cl-markless-epub" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-markless-plump" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "trivial-indent" pkgs) (getAttr "trivial-mimes" pkgs) (getAttr "uiop" pkgs) (getAttr "zip" pkgs) ]; - }; - cl-markless-markdown = { - pname = "cl-markless-markdown"; - version = "20220707-git"; - asds = [ "cl-markless-markdown" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2022-07-07/cl-markless-20220707-git.tgz"; - sha256 = "0v1h1sgn180ffhbnld7kwh6s33mls6p0iby4pdh32pj1py7ayw0l"; - system = "cl-markless-markdown"; - asd = "cl-markless-markdown"; - }); - systems = [ "cl-markless-markdown" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "_3bmd-ext-code-blocks" pkgs) (getAttr "cl-markless" pkgs) ]; - }; - cl-markless-plump = { - pname = "cl-markless-plump"; - version = "20220707-git"; - asds = [ "cl-markless-plump" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2022-07-07/cl-markless-20220707-git.tgz"; - sha256 = "0v1h1sgn180ffhbnld7kwh6s33mls6p0iby4pdh32pj1py7ayw0l"; - system = "cl-markless-plump"; - asd = "cl-markless-plump"; - }); - systems = [ "cl-markless-plump" ]; - lispLibs = [ (getAttr "cl-markless" pkgs) (getAttr "plump-dom" pkgs) ]; - }; - cl-markless-standalone = { - pname = "cl-markless-standalone"; - version = "20220707-git"; - asds = [ "cl-markless-standalone" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2022-07-07/cl-markless-20220707-git.tgz"; - sha256 = "0v1h1sgn180ffhbnld7kwh6s33mls6p0iby4pdh32pj1py7ayw0l"; - system = "cl-markless-standalone"; - asd = "cl-markless-standalone"; - }); - systems = [ "cl-markless-standalone" ]; - lispLibs = [ (getAttr "cl-markless" pkgs) (getAttr "cl-markless-epub" pkgs) (getAttr "cl-markless-markdown" pkgs) (getAttr "cl-markless-plump" pkgs) (getAttr "command-line-arguments" pkgs) ]; - }; - cl-markless-test = { - pname = "cl-markless-test"; - version = "20220707-git"; - asds = [ "cl-markless-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markless/2022-07-07/cl-markless-20220707-git.tgz"; - sha256 = "0v1h1sgn180ffhbnld7kwh6s33mls6p0iby4pdh32pj1py7ayw0l"; - system = "cl-markless-test"; - asd = "cl-markless-test"; - }); - systems = [ "cl-markless-test" ]; - lispLibs = [ (getAttr "cl-markless" pkgs) (getAttr "parachute" pkgs) ]; - }; - cl-marklogic = { - pname = "cl-marklogic"; - version = "20210124-git"; - asds = [ "cl-marklogic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz"; - sha256 = "0baq2ccb88zyr2dqdvpm32lsin4zalv11w48x4xm80cr4kw45fk5"; - system = "cl-marklogic"; - asd = "cl-marklogic"; - }); - systems = [ "cl-marklogic" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "drakma" pkgs) (getAttr "fiveam" pkgs) (getAttr "local-time" pkgs) ]; - }; - cl-markup = { - pname = "cl-markup"; - version = "20131003-git"; - asds = [ "cl-markup" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz"; - sha256 = "10l6k45971dl13fkdmva7zc6i453lmq9j4xax2ci6pjzlc6xjhp7"; - system = "cl-markup"; - asd = "cl-markup"; - }); - systems = [ "cl-markup" ]; - lispLibs = [ ]; - }; - cl-markup-test = { - pname = "cl-markup-test"; - version = "20131003-git"; - asds = [ "cl-markup-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz"; - sha256 = "10l6k45971dl13fkdmva7zc6i453lmq9j4xax2ci6pjzlc6xjhp7"; - system = "cl-markup-test"; - asd = "cl-markup-test"; - }); - systems = [ "cl-markup-test" ]; - lispLibs = [ (getAttr "cl-markup" pkgs) (getAttr "cl-test-more" pkgs) ]; - }; - cl-match = { - pname = "cl-match"; - version = "20121125-git"; - asds = [ "cl-match" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz"; - sha256 = "1qc8gzp7f4phgyi5whkxacrqzdqs0y1hvkf71m8n7l303jly9wjf"; - system = "cl-match"; - asd = "cl-match"; - }); - systems = [ "cl-match" ]; - lispLibs = [ (getAttr "standard-cl" pkgs) ]; - }; - cl-match-test = { - pname = "cl-match-test"; - version = "20121125-git"; - asds = [ "cl-match-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz"; - sha256 = "1qc8gzp7f4phgyi5whkxacrqzdqs0y1hvkf71m8n7l303jly9wjf"; - system = "cl-match-test"; - asd = "cl-match-test"; - }); - systems = [ "cl-match-test" ]; - lispLibs = [ (getAttr "cl-match" pkgs) (getAttr "pcl-unit-test" pkgs) ]; - }; - cl-mathstats = { - pname = "cl-mathstats"; - version = "20220220-git"; - asds = [ "cl-mathstats" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mathstats/2022-02-20/cl-mathstats-20220220-git.tgz"; - sha256 = "0gsjvmkmnxc4hp5z9mkm5vsllywqyg7kx8jgz88vnx47yj3va1s8"; - system = "cl-mathstats"; - asd = "cl-mathstats"; - }); - systems = [ "cl-mathstats" ]; - lispLibs = [ (getAttr "cl-containers" pkgs) (getAttr "metatilities-base" pkgs) ]; - }; - cl-mathstats-test = { - pname = "cl-mathstats-test"; - version = "20220220-git"; - asds = [ "cl-mathstats-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mathstats/2022-02-20/cl-mathstats-20220220-git.tgz"; - sha256 = "0gsjvmkmnxc4hp5z9mkm5vsllywqyg7kx8jgz88vnx47yj3va1s8"; - system = "cl-mathstats-test"; - asd = "cl-mathstats-test"; - }); - systems = [ "cl-mathstats-test" ]; - lispLibs = [ (getAttr "cl-mathstats" pkgs) (getAttr "lift" pkgs) ]; - }; - cl-maxminddb = { - pname = "cl-maxminddb"; - version = "20210630-git"; - asds = [ "cl-maxminddb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-maxminddb/2021-06-30/cl-maxminddb-20210630-git.tgz"; - sha256 = "1mm7cpiygcka39pj4a0rvhayfl4wh0zfjkda60yshq24xmml84pw"; - system = "cl-maxminddb"; - asd = "cl-maxminddb"; - }); - systems = [ "cl-maxminddb" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "iterate" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "mmap" pkgs) ]; - }; - cl-maxsat = { - pname = "cl-maxsat"; - version = "20200218-git"; - asds = [ "cl-maxsat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-maxsat/2020-02-18/cl-maxsat-20200218-git.tgz"; - sha256 = "0qy4hhi8y3wv88x3s88g2hl2cz25cjp26xapd3z4h7lrx7cy786i"; - system = "cl-maxsat"; - asd = "cl-maxsat"; - }); - systems = [ "cl-maxsat" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-sat" pkgs) (getAttr "iterate" pkgs) (getAttr "trivia" pkgs) ]; - }; - cl-maxsat_dot_test = { - pname = "cl-maxsat.test"; - version = "20200218-git"; - asds = [ "cl-maxsat.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-maxsat/2020-02-18/cl-maxsat-20200218-git.tgz"; - sha256 = "0qy4hhi8y3wv88x3s88g2hl2cz25cjp26xapd3z4h7lrx7cy786i"; - system = "cl-maxsat.test"; - asd = "cl-maxsat.test"; - }); - systems = [ "cl-maxsat.test" ]; - lispLibs = [ (getAttr "cl-maxsat" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-mdb = { - pname = "cl-mdb"; - version = "20220707-git"; - asds = [ "cl-mdb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mdb/2022-07-07/cl-mdb-20220707-git.tgz"; - sha256 = "1xkhk39485yv3j9bshnnv74c95asf9704g80wb8vwvwsvqi7ym2a"; - system = "cl-mdb"; - asd = "cl-mdb"; - }); - systems = [ "cl-mdb" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-mecab = { - pname = "cl-mecab"; - version = "20181018-git"; - asds = [ "cl-mecab" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mecab/2018-10-18/cl-mecab-20181018-git.tgz"; - sha256 = "0lfan9p8dsniyp60g6n8awfjvv8lyickc40qdxiry6kmp65636ps"; - system = "cl-mecab"; - asd = "cl-mecab"; - }); - systems = [ "cl-mecab" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-mecab-test = { - pname = "cl-mecab-test"; - version = "20181018-git"; - asds = [ "cl-mecab-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mecab/2018-10-18/cl-mecab-20181018-git.tgz"; - sha256 = "0lfan9p8dsniyp60g6n8awfjvv8lyickc40qdxiry6kmp65636ps"; - system = "cl-mecab-test"; - asd = "cl-mecab-test"; - }); - systems = [ "cl-mecab-test" ]; - lispLibs = [ (getAttr "cl-mecab" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-mechanize = { - pname = "cl-mechanize"; - version = "20180711-git"; - asds = [ "cl-mechanize" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mechanize/2018-07-11/cl-mechanize-20180711-git.tgz"; - sha256 = "0y86sdi2nl3jv6n535cd62jax0mpc0cckrhffaqacbgbdjc875sn"; - system = "cl-mechanize"; - asd = "cl-mechanize"; - }); - systems = [ "cl-mechanize" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "closure-html" pkgs) (getAttr "cxml-stp" pkgs) (getAttr "drakma" pkgs) (getAttr "puri" pkgs) ]; - }; - cl-mediawiki = { - pname = "cl-mediawiki"; - version = "20161204-git"; - asds = [ "cl-mediawiki" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mediawiki/2016-12-04/cl-mediawiki-20161204-git.tgz"; - sha256 = "1wrysj9l64k3xx152yw1arvn1glnx60j730qvj8prm65iid95xgm"; - system = "cl-mediawiki"; - asd = "cl-mediawiki"; - }); - systems = [ "cl-mediawiki" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cxml" pkgs) (getAttr "drakma" pkgs) ]; - }; - cl-mediawiki-test = { - pname = "cl-mediawiki-test"; - version = "20161204-git"; - asds = [ "cl-mediawiki-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mediawiki/2016-12-04/cl-mediawiki-20161204-git.tgz"; - sha256 = "1wrysj9l64k3xx152yw1arvn1glnx60j730qvj8prm65iid95xgm"; - system = "cl-mediawiki-test"; - asd = "cl-mediawiki-test"; - }); - systems = [ "cl-mediawiki-test" ]; - lispLibs = [ (getAttr "cl-mediawiki" pkgs) (getAttr "lisp-unit2" pkgs) ]; - }; - cl-megolm = { - pname = "cl-megolm"; - version = "20211020-git"; - asds = [ "cl-megolm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-megolm/2021-10-20/cl-megolm-20211020-git.tgz"; - sha256 = "1wxri9md61xl6bf9p9pm4hjsyd0mz6nf2lzwzbwsqy808s2w0xw6"; - system = "cl-megolm"; - asd = "cl-megolm"; - }); - systems = [ "cl-megolm" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "str" pkgs) (getAttr "claw-olm" pkgs) (getAttr "ironclad" pkgs) (getAttr "jonathan" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "s-base64" pkgs) ]; - }; - cl-megolm_slash_tests = { - pname = "cl-megolm_tests"; - version = "20211020-git"; - asds = [ "cl-megolm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-megolm/2021-10-20/cl-megolm-20211020-git.tgz"; - sha256 = "1wxri9md61xl6bf9p9pm4hjsyd0mz6nf2lzwzbwsqy808s2w0xw6"; - system = "cl-megolm"; - asd = "cl-megolm"; - }); - systems = [ "cl-megolm/tests" ]; - lispLibs = [ (getAttr "cl-megolm" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "s-base64" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-memcached = { - pname = "cl-memcached"; - version = "20150608-git"; - asds = [ "cl-memcached" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-memcached/2015-06-08/cl-memcached-20150608-git.tgz"; - sha256 = "0g66m0yiazzh0447qbmgxjn4kxjcx9bk2l8cimyzmriz5d0j2q3i"; - system = "cl-memcached"; - asd = "cl-memcached"; - }); - systems = [ "cl-memcached" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "pooler" pkgs) (getAttr "split-sequence" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-messagepack = { - pname = "cl-messagepack"; - version = "20201016-git"; - asds = [ "cl-messagepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-messagepack/2020-10-16/cl-messagepack-20201016-git.tgz"; - sha256 = "0lhw8wz45q9jgh7fn5ihj7ccl3wm2c2x3vb4cijgg6vhbrwlw2qh"; - system = "cl-messagepack"; - asd = "cl-messagepack"; - }); - systems = [ "cl-messagepack" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "closer-mop" pkgs) (getAttr "flexi-streams" pkgs) ]; - }; - cl-messagepack-rpc = { - pname = "cl-messagepack-rpc"; - version = "20171227-git"; - asds = [ "cl-messagepack-rpc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-messagepack-rpc/2017-12-27/cl-messagepack-rpc-20171227-git.tgz"; - sha256 = "02nrnhav28v5vwig9mmmmax59nl0sbjkmdzwakzpj6y1gafiqgy9"; - system = "cl-messagepack-rpc"; - asd = "cl-messagepack-rpc"; - }); - systems = [ "cl-messagepack-rpc" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-async" pkgs) (getAttr "cl-libuv" pkgs) (getAttr "cl-messagepack" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "trivial-backtrace" pkgs) ]; - }; - cl-messagepack-rpc-tests = { - pname = "cl-messagepack-rpc-tests"; - version = "20171227-git"; - asds = [ "cl-messagepack-rpc-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-messagepack-rpc/2017-12-27/cl-messagepack-rpc-20171227-git.tgz"; - sha256 = "02nrnhav28v5vwig9mmmmax59nl0sbjkmdzwakzpj6y1gafiqgy9"; - system = "cl-messagepack-rpc-tests"; - asd = "cl-messagepack-rpc-tests"; - }); - systems = [ "cl-messagepack-rpc-tests" ]; - lispLibs = [ (getAttr "cl-messagepack-rpc" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-messagepack-tests = { - pname = "cl-messagepack-tests"; - version = "20201016-git"; - asds = [ "cl-messagepack-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-messagepack/2020-10-16/cl-messagepack-20201016-git.tgz"; - sha256 = "0lhw8wz45q9jgh7fn5ihj7ccl3wm2c2x3vb4cijgg6vhbrwlw2qh"; - system = "cl-messagepack-tests"; - asd = "cl-messagepack-tests"; - }); - systems = [ "cl-messagepack-tests" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "cl-messagepack" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-migrations = { - pname = "cl-migrations"; - version = "20110110-http"; - asds = [ "cl-migrations" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migrations/2011-01-10/cl-migrations-20110110-http.tgz"; - sha256 = "0mq3ir1kffw921q5a878964ghnrhcrh79p6yxsrb25bzkwpnfx02"; - system = "cl-migrations"; - asd = "cl-migrations"; - }); - systems = [ "cl-migrations" ]; - lispLibs = [ (getAttr "clsql" pkgs) ]; - }; - cl-migratum = { - pname = "cl-migratum"; - version = "20221106-git"; - asds = [ "cl-migratum" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2022-11-06/cl-migratum-20221106-git.tgz"; - sha256 = "1f4lhj168garrncmif4i2zdvg3458ylihw6khayz1m1gyzb8v7fx"; - system = "cl-migratum"; - asd = "cl-migratum"; - }); - systems = [ "cl-migratum" ]; - lispLibs = [ (getAttr "cl-ascii-table" pkgs) (getAttr "cl-reexport" pkgs) (getAttr "local-time" pkgs) (getAttr "log4cl" pkgs) ]; - }; - cl-migratum_dot_cli = { - pname = "cl-migratum.cli"; - version = "20221106-git"; - asds = [ "cl-migratum.cli" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2022-11-06/cl-migratum-20221106-git.tgz"; - sha256 = "1f4lhj168garrncmif4i2zdvg3458ylihw6khayz1m1gyzb8v7fx"; - system = "cl-migratum.cli"; - asd = "cl-migratum.cli"; - }); - systems = [ "cl-migratum.cli" ]; - lispLibs = [ (getAttr "cl-migratum" pkgs) (getAttr "cl-migratum_dot_driver_dot_dbi" pkgs) (getAttr "cl-migratum_dot_driver_dot_rdbms-postgresql" pkgs) (getAttr "cl-migratum_dot_provider_dot_local-path" pkgs) (getAttr "clingon" pkgs) ]; - }; - cl-migratum_dot_driver_dot_dbi = { - pname = "cl-migratum.driver.dbi"; - version = "20221106-git"; - asds = [ "cl-migratum.driver.dbi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2022-11-06/cl-migratum-20221106-git.tgz"; - sha256 = "1f4lhj168garrncmif4i2zdvg3458ylihw6khayz1m1gyzb8v7fx"; - system = "cl-migratum.driver.dbi"; - asd = "cl-migratum.driver.dbi"; - }); - systems = [ "cl-migratum.driver.dbi" ]; - lispLibs = [ (getAttr "cl-dbi" pkgs) (getAttr "cl-migratum" pkgs) (getAttr "cl-migratum_dot_driver_dot_mixins" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "log4cl" pkgs) ]; - }; - cl-migratum_dot_driver_dot_mixins = { - pname = "cl-migratum.driver.mixins"; - version = "20221106-git"; - asds = [ "cl-migratum.driver.mixins" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2022-11-06/cl-migratum-20221106-git.tgz"; - sha256 = "1f4lhj168garrncmif4i2zdvg3458ylihw6khayz1m1gyzb8v7fx"; - system = "cl-migratum.driver.mixins"; - asd = "cl-migratum.driver.mixins"; - }); - systems = [ "cl-migratum.driver.mixins" ]; - lispLibs = [ (getAttr "cl-migratum" pkgs) ]; - }; - cl-migratum_dot_driver_dot_rdbms-postgresql = { - pname = "cl-migratum.driver.rdbms-postgresql"; - version = "20221106-git"; - asds = [ "cl-migratum.driver.rdbms-postgresql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2022-11-06/cl-migratum-20221106-git.tgz"; - sha256 = "1f4lhj168garrncmif4i2zdvg3458ylihw6khayz1m1gyzb8v7fx"; - system = "cl-migratum.driver.rdbms-postgresql"; - asd = "cl-migratum.driver.rdbms-postgresql"; - }); - systems = [ "cl-migratum.driver.rdbms-postgresql" ]; - lispLibs = [ (getAttr "cl-migratum" pkgs) (getAttr "cl-migratum_dot_driver_dot_mixins" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_postgresql" pkgs) (getAttr "log4cl" pkgs) ]; - }; - cl-migratum_dot_provider_dot_local-path = { - pname = "cl-migratum.provider.local-path"; - version = "20221106-git"; - asds = [ "cl-migratum.provider.local-path" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2022-11-06/cl-migratum-20221106-git.tgz"; - sha256 = "1f4lhj168garrncmif4i2zdvg3458ylihw6khayz1m1gyzb8v7fx"; - system = "cl-migratum.provider.local-path"; - asd = "cl-migratum.provider.local-path"; - }); - systems = [ "cl-migratum.provider.local-path" ]; - lispLibs = [ (getAttr "cl-migratum" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "log4cl" pkgs) ]; - }; - cl-migratum_dot_test = { - pname = "cl-migratum.test"; - version = "20221106-git"; - asds = [ "cl-migratum.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-migratum/2022-11-06/cl-migratum-20221106-git.tgz"; - sha256 = "1f4lhj168garrncmif4i2zdvg3458ylihw6khayz1m1gyzb8v7fx"; - system = "cl-migratum.test"; - asd = "cl-migratum.test"; - }); - systems = [ "cl-migratum.test" ]; - lispLibs = [ (getAttr "dbd-sqlite3" pkgs) (getAttr "cl-migratum" pkgs) (getAttr "cl-migratum_dot_driver_dot_dbi" pkgs) (getAttr "cl-migratum_dot_driver_dot_rdbms-postgresql" pkgs) (getAttr "cl-migratum_dot_provider_dot_local-path" pkgs) (getAttr "rove" pkgs) (getAttr "tmpdir" pkgs) ]; - }; - cl-mime = { - pname = "cl-mime"; - version = "20201220-git"; - asds = [ "cl-mime" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mime/2020-12-20/cl-mime-20201220-git.tgz"; - sha256 = "0i2vyc1d4qp36f3c3qfpx9rkp3d2ka80r40wc9lsvhqn1hjxa2gv"; - system = "cl-mime"; - asd = "cl-mime"; - }); - systems = [ "cl-mime" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-qprint" pkgs) ]; - }; - cl-mime-from-string = { - pname = "cl-mime-from-string"; - version = "20200427-git"; - asds = [ "cl-mime-from-string" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mime-from-string/2020-04-27/cl-mime-from-string-20200427-git.tgz"; - sha256 = "1pzhfbv6j3b0vvf4rxxd56v54lh6v7cs16nq2d64cawn6qzmk4bp"; - system = "cl-mime-from-string"; - asd = "cl-mime-from-string"; - }); - systems = [ "cl-mime-from-string" ]; - lispLibs = [ ]; - }; - cl-mime-test = { - pname = "cl-mime-test"; - version = "20201220-git"; - asds = [ "cl-mime-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mime/2020-12-20/cl-mime-20201220-git.tgz"; - sha256 = "0i2vyc1d4qp36f3c3qfpx9rkp3d2ka80r40wc9lsvhqn1hjxa2gv"; - system = "cl-mime-test"; - asd = "cl-mime-test"; - }); - systems = [ "cl-mime-test" ]; - lispLibs = [ (getAttr "cl-mime" pkgs) (getAttr "rove" pkgs) ]; - }; - cl-mimeparse = { - pname = "cl-mimeparse"; - version = "20210531-git"; - asds = [ "cl-mimeparse" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mimeparse/2021-05-31/cl-mimeparse-20210531-git.tgz"; - sha256 = "0gdkpi3620va0a3q56svcn1q9f5w0pqfhx30lnldg8fjnrdfiwkk"; - system = "cl-mimeparse"; - asd = "cl-mimeparse"; - }); - systems = [ "cl-mimeparse" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "parse-number" pkgs) ]; - }; - cl-mimeparse-tests = { - pname = "cl-mimeparse-tests"; - version = "20210531-git"; - asds = [ "cl-mimeparse-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mimeparse/2021-05-31/cl-mimeparse-20210531-git.tgz"; - sha256 = "0gdkpi3620va0a3q56svcn1q9f5w0pqfhx30lnldg8fjnrdfiwkk"; - system = "cl-mimeparse-tests"; - asd = "cl-mimeparse-tests"; - }); - systems = [ "cl-mimeparse-tests" ]; - lispLibs = [ (getAttr "cl-mimeparse" pkgs) (getAttr "rt" pkgs) ]; - }; - cl-minify-css = { - pname = "cl-minify-css"; - version = "20200925-git"; - asds = [ "cl-minify-css" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-minify-css/2020-09-25/cl-minify-css-20200925-git.tgz"; - sha256 = "1wj1mh7qzr8ybqyx7kxnpsmj3d9lylnzmq1qmycdyf2llqkcdxgd"; - system = "cl-minify-css"; - asd = "cl-minify-css"; - }); - systems = [ "cl-minify-css" ]; - lispLibs = [ ]; - }; - cl-minify-css-test = { - pname = "cl-minify-css-test"; - version = "20200925-git"; - asds = [ "cl-minify-css-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-minify-css/2020-09-25/cl-minify-css-20200925-git.tgz"; - sha256 = "1wj1mh7qzr8ybqyx7kxnpsmj3d9lylnzmq1qmycdyf2llqkcdxgd"; - system = "cl-minify-css-test"; - asd = "cl-minify-css-test"; - }); - systems = [ "cl-minify-css-test" ]; - lispLibs = [ (getAttr "assert-p" pkgs) (getAttr "cacau" pkgs) (getAttr "cacau-asdf" pkgs) (getAttr "cl-minify-css" pkgs) ]; - }; - cl-mixed = { - pname = "cl-mixed"; - version = "20221106-git"; - asds = [ "cl-mixed" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed"; - asd = "cl-mixed"; - }); - systems = [ "cl-mixed" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "static-vectors" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - cl-mixed-alsa = { - pname = "cl-mixed-alsa"; - version = "20221106-git"; - asds = [ "cl-mixed-alsa" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-alsa"; - asd = "cl-mixed-alsa"; - }); - systems = [ "cl-mixed-alsa" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-mixed" pkgs) ]; - }; - cl-mixed-coreaudio = { - pname = "cl-mixed-coreaudio"; - version = "20221106-git"; - asds = [ "cl-mixed-coreaudio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-coreaudio"; - asd = "cl-mixed-coreaudio"; - }); - systems = [ "cl-mixed-coreaudio" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-mixed" pkgs) (getAttr "float-features" pkgs) ]; - }; - cl-mixed-examples = { - pname = "cl-mixed-examples"; - version = "20221106-git"; - asds = [ "cl-mixed-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-examples"; - asd = "cl-mixed-examples"; - }); - systems = [ "cl-mixed-examples" ]; - lispLibs = [ (getAttr "cl-mixed" pkgs) (getAttr "cl-mixed-mpg123" pkgs) (getAttr "cl-mixed-out123" pkgs) ]; - }; - cl-mixed-flac = { - pname = "cl-mixed-flac"; - version = "20221106-git"; - asds = [ "cl-mixed-flac" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-flac"; - asd = "cl-mixed-flac"; - }); - systems = [ "cl-mixed-flac" ]; - lispLibs = [ (getAttr "cl-flac" pkgs) (getAttr "cl-mixed" pkgs) ]; - }; - cl-mixed-jack = { - pname = "cl-mixed-jack"; - version = "20221106-git"; - asds = [ "cl-mixed-jack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-jack"; - asd = "cl-mixed-jack"; - }); - systems = [ "cl-mixed-jack" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-mixed" pkgs) ]; - }; - cl-mixed-mpg123 = { - pname = "cl-mixed-mpg123"; - version = "20221106-git"; - asds = [ "cl-mixed-mpg123" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-mpg123"; - asd = "cl-mixed-mpg123"; - }); - systems = [ "cl-mixed-mpg123" ]; - lispLibs = [ (getAttr "cl-mixed" pkgs) (getAttr "cl-mpg123" pkgs) ]; - }; - cl-mixed-mpt = { - pname = "cl-mixed-mpt"; - version = "20221106-git"; - asds = [ "cl-mixed-mpt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-mpt"; - asd = "cl-mixed-mpt"; - }); - systems = [ "cl-mixed-mpt" ]; - lispLibs = [ (getAttr "cl-mixed" pkgs) (getAttr "static-vectors" pkgs) ]; - }; - cl-mixed-oss = { - pname = "cl-mixed-oss"; - version = "20221106-git"; - asds = [ "cl-mixed-oss" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-oss"; - asd = "cl-mixed-oss"; - }); - systems = [ "cl-mixed-oss" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-mixed" pkgs) ]; - }; - cl-mixed-out123 = { - pname = "cl-mixed-out123"; - version = "20221106-git"; - asds = [ "cl-mixed-out123" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-out123"; - asd = "cl-mixed-out123"; - }); - systems = [ "cl-mixed-out123" ]; - lispLibs = [ (getAttr "cl-mixed" pkgs) (getAttr "cl-out123" pkgs) ]; - }; - cl-mixed-pulse = { - pname = "cl-mixed-pulse"; - version = "20221106-git"; - asds = [ "cl-mixed-pulse" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-pulse"; - asd = "cl-mixed-pulse"; - }); - systems = [ "cl-mixed-pulse" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-mixed" pkgs) ]; - }; - cl-mixed-sdl2 = { - pname = "cl-mixed-sdl2"; - version = "20221106-git"; - asds = [ "cl-mixed-sdl2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-sdl2"; - asd = "cl-mixed-sdl2"; - }); - systems = [ "cl-mixed-sdl2" ]; - lispLibs = [ (getAttr "cl-mixed" pkgs) (getAttr "sdl2" pkgs) ]; - }; - cl-mixed-vorbis = { - pname = "cl-mixed-vorbis"; - version = "20221106-git"; - asds = [ "cl-mixed-vorbis" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-vorbis"; - asd = "cl-mixed-vorbis"; - }); - systems = [ "cl-mixed-vorbis" ]; - lispLibs = [ (getAttr "cl-mixed" pkgs) (getAttr "cl-vorbis" pkgs) ]; - }; - cl-mixed-wasapi = { - pname = "cl-mixed-wasapi"; - version = "20221106-git"; - asds = [ "cl-mixed-wasapi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-wasapi"; - asd = "cl-mixed-wasapi"; - }); - systems = [ "cl-mixed-wasapi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-mixed" pkgs) (getAttr "com-on" pkgs) ]; - }; - cl-mixed-wav = { - pname = "cl-mixed-wav"; - version = "20221106-git"; - asds = [ "cl-mixed-wav" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-wav"; - asd = "cl-mixed-wav"; - }); - systems = [ "cl-mixed-wav" ]; - lispLibs = [ (getAttr "cl-mixed" pkgs) ]; - }; - cl-mixed-winmm = { - pname = "cl-mixed-winmm"; - version = "20221106-git"; - asds = [ "cl-mixed-winmm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-winmm"; - asd = "cl-mixed-winmm"; - }); - systems = [ "cl-mixed-winmm" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-mixed" pkgs) ]; - }; - cl-mixed-xaudio2 = { - pname = "cl-mixed-xaudio2"; - version = "20221106-git"; - asds = [ "cl-mixed-xaudio2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mixed/2022-11-06/cl-mixed-20221106-git.tgz"; - sha256 = "0xl3iss8mhxsyjsr6mbbf5x75cg893f2im1hywcj1mq8adsyxcf7"; - system = "cl-mixed-xaudio2"; - asd = "cl-mixed-xaudio2"; - }); - systems = [ "cl-mixed-xaudio2" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-mixed" pkgs) (getAttr "com-on" pkgs) ]; - }; - cl-mock = { - pname = "cl-mock"; - version = "20221106-git"; - asds = [ "cl-mock" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz"; - sha256 = "19641sm3klx9yfk8lr376rfkd26vy72yp1hkpkqcw3q3m1xrf9xp"; - system = "cl-mock"; - asd = "cl-mock"; - }); - systems = [ "cl-mock" ]; - lispLibs = [ (getAttr "cl-mock-basic" pkgs) (getAttr "trivia" pkgs) ]; - }; - cl-mock-basic = { - pname = "cl-mock-basic"; - version = "20221106-git"; - asds = [ "cl-mock-basic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz"; - sha256 = "19641sm3klx9yfk8lr376rfkd26vy72yp1hkpkqcw3q3m1xrf9xp"; - system = "cl-mock-basic"; - asd = "cl-mock-basic"; - }); - systems = [ "cl-mock-basic" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - cl-mock-tests = { - pname = "cl-mock-tests"; - version = "20221106-git"; - asds = [ "cl-mock-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz"; - sha256 = "19641sm3klx9yfk8lr376rfkd26vy72yp1hkpkqcw3q3m1xrf9xp"; - system = "cl-mock-tests"; - asd = "cl-mock-tests"; - }); - systems = [ "cl-mock-tests" ]; - lispLibs = [ (getAttr "cl-mock" pkgs) (getAttr "cl-mock-tests-basic" pkgs) ]; - }; - cl-mock-tests-basic = { - pname = "cl-mock-tests-basic"; - version = "20221106-git"; - asds = [ "cl-mock-tests-basic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mock/2022-11-06/cl-mock-20221106-git.tgz"; - sha256 = "19641sm3klx9yfk8lr376rfkd26vy72yp1hkpkqcw3q3m1xrf9xp"; - system = "cl-mock-tests-basic"; - asd = "cl-mock-tests-basic"; - }); - systems = [ "cl-mock-tests-basic" ]; - lispLibs = [ (getAttr "cl-mock-basic" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-monad-macros = { - pname = "cl-monad-macros"; - version = "20110619-svn"; - asds = [ "cl-monad-macros" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-monad-macros/2011-06-19/cl-monad-macros-20110619-svn.tgz"; - sha256 = "184p018xb07yd04bpscrwrnwv1cdxh9hxggmrnj95lhlr6r97l1z"; - system = "cl-monad-macros"; - asd = "cl-monad-macros"; - }); - systems = [ "cl-monad-macros" ]; - lispLibs = [ ]; - }; - cl-moneris = { - pname = "cl-moneris"; - version = "20110418-git"; - asds = [ "cl-moneris" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-moneris/2011-04-18/cl-moneris-20110418-git.tgz"; - sha256 = "1jvzssjb273ijbdcpxpl6ajh02k4h6l5j4vjxkh69cnrq3dcsvfc"; - system = "cl-moneris"; - asd = "cl-moneris"; - }); - systems = [ "cl-moneris" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "s-xml" pkgs) ]; - }; - cl-moneris-test = { - pname = "cl-moneris-test"; - version = "20110418-git"; - asds = [ "cl-moneris-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-moneris/2011-04-18/cl-moneris-20110418-git.tgz"; - sha256 = "1jvzssjb273ijbdcpxpl6ajh02k4h6l5j4vjxkh69cnrq3dcsvfc"; - system = "cl-moneris-test"; - asd = "cl-moneris-test"; - }); - systems = [ "cl-moneris-test" ]; - lispLibs = [ (getAttr "cl-moneris" pkgs) (getAttr "eos" pkgs) ]; - }; - cl-mongo = { - pname = "cl-mongo"; - version = "20160531-git"; - asds = [ "cl-mongo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mongo/2016-05-31/cl-mongo-20160531-git.tgz"; - sha256 = "1l3kydbxbxhs1z76v6qpwjnabv8wf0mff1pfjkrpjfz6bia1svx6"; - system = "cl-mongo"; - asd = "cl-mongo"; - }); - systems = [ "cl-mongo" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "documentation-template" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "parenscript" pkgs) (getAttr "split-sequence" pkgs) (getAttr "usocket" pkgs) (getAttr "uuid" pkgs) ]; - }; - cl-mongo-id = { - pname = "cl-mongo-id"; - version = "20201220-git"; - asds = [ "cl-mongo-id" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mongo-id/2020-12-20/cl-mongo-id-20201220-git.tgz"; - sha256 = "1bpwmh5970rpr6ayygcgdg96hq2dlrksgpa1vdmy5l6vdbw9xrys"; - system = "cl-mongo-id"; - asd = "cl-mongo-id"; - }); - systems = [ "cl-mongo-id" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "local-time" pkgs) (getAttr "md5" pkgs) (getAttr "secure-random" pkgs) ]; - }; - cl-monitors = { - pname = "cl-monitors"; - version = "20190710-git"; - asds = [ "cl-monitors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-monitors/2019-07-10/cl-monitors-20190710-git.tgz"; - sha256 = "0arwj7san3hsjws1fj3l8iqm92fipw0bfl3gzvvx6sa3cmy3m8vj"; - system = "cl-monitors"; - asd = "cl-monitors"; - }); - systems = [ "cl-monitors" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-mop = { - pname = "cl-mop"; - version = "20150113-git"; - asds = [ "cl-mop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mop/2015-01-13/cl-mop-20150113-git.tgz"; - sha256 = "0wqjbp6jr868a89hklf1ppxkdfbznafrdpriakqiraicvr9kvksg"; - system = "cl-mop"; - asd = "cl-mop"; - }); - systems = [ "cl-mop" ]; - lispLibs = [ ]; - }; - cl-morse = { - pname = "cl-morse"; - version = "v1.0.0"; - asds = [ "cl-morse" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-morse/2022-07-07/cl-morse-v1.0.0.tgz"; - sha256 = "01sh34nhbsx2dsrb2r1vkd4j8lzm9gjd5jfi8a4cs4m3djjwhh5i"; - system = "cl-morse"; - asd = "cl-morse"; - }); - systems = [ "cl-morse" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - cl-morse_slash_tests = { - pname = "cl-morse_tests"; - version = "v1.0.0"; - asds = [ "cl-morse" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-morse/2022-07-07/cl-morse-v1.0.0.tgz"; - sha256 = "01sh34nhbsx2dsrb2r1vkd4j8lzm9gjd5jfi8a4cs4m3djjwhh5i"; - system = "cl-morse"; - asd = "cl-morse"; - }); - systems = [ "cl-morse/tests" ]; - lispLibs = [ (getAttr "cl-morse" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-moss = { - pname = "cl-moss"; - version = "20171019-git"; - asds = [ "cl-moss" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-moss/2017-10-19/cl-moss-20171019-git.tgz"; - sha256 = "1qxzppnyxc8lkhfbbp5m3dbhp4rfkyc2lfrry2448i5w5icrigzd"; - system = "cl-moss"; - asd = "cl-moss"; - }); - systems = [ "cl-moss" ]; - lispLibs = [ (getAttr "usocket" pkgs) ]; - }; - cl-mount-info = { - pname = "cl-mount-info"; - version = "20200218-git"; - asds = [ "cl-mount-info" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mount-info/2020-02-18/cl-mount-info-20200218-git.tgz"; - sha256 = "0vza9gj9q42nzb5v8aj22lmn4aqx9vrddsb5a343nbwfz89hbh9x"; - system = "cl-mount-info"; - asd = "cl-mount-info"; - }); - systems = [ "cl-mount-info" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - cl-mpg123 = { - pname = "cl-mpg123"; - version = "20211209-git"; - asds = [ "cl-mpg123" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpg123/2021-12-09/cl-mpg123-20211209-git.tgz"; - sha256 = "0hw2jpvi85cz9p1ibzycfk84j1l2m3f2hl6mifmmd1xfsajbs6l0"; - system = "cl-mpg123"; - asd = "cl-mpg123"; - }); - systems = [ "cl-mpg123" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-mpg123-example = { - pname = "cl-mpg123-example"; - version = "20211209-git"; - asds = [ "cl-mpg123-example" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpg123/2021-12-09/cl-mpg123-20211209-git.tgz"; - sha256 = "0hw2jpvi85cz9p1ibzycfk84j1l2m3f2hl6mifmmd1xfsajbs6l0"; - system = "cl-mpg123-example"; - asd = "cl-mpg123-example"; - }); - systems = [ "cl-mpg123-example" ]; - lispLibs = [ (getAttr "cl-mpg123" pkgs) (getAttr "cl-out123" pkgs) (getAttr "verbose" pkgs) ]; - }; - cl-mpi = { - pname = "cl-mpi"; - version = "20190710-git"; - asds = [ "cl-mpi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; - sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb"; - system = "cl-mpi"; - asd = "cl-mpi"; - }); - systems = [ "cl-mpi" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-mpi-asdf-integration" pkgs) (getAttr "static-vectors" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-mpi-asdf-integration = { - pname = "cl-mpi-asdf-integration"; - version = "20190710-git"; - asds = [ "cl-mpi-asdf-integration" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; - sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb"; - system = "cl-mpi-asdf-integration"; - asd = "cl-mpi-asdf-integration"; - }); - systems = [ "cl-mpi-asdf-integration" ]; - lispLibs = [ (getAttr "cffi-grovel" pkgs) (getAttr "cffi-toolchain" pkgs) ]; - }; - cl-mpi-examples = { - pname = "cl-mpi-examples"; - version = "20190710-git"; - asds = [ "cl-mpi-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; - sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb"; - system = "cl-mpi-examples"; - asd = "cl-mpi-examples"; - }); - systems = [ "cl-mpi-examples" ]; - lispLibs = [ (getAttr "cl-mpi" pkgs) (getAttr "cl-mpi-asdf-integration" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-mpi-extensions = { - pname = "cl-mpi-extensions"; - version = "20190710-git"; - asds = [ "cl-mpi-extensions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; - sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb"; - system = "cl-mpi-extensions"; - asd = "cl-mpi-extensions"; - }); - systems = [ "cl-mpi-extensions" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-conspack" pkgs) (getAttr "cl-mpi" pkgs) ]; - }; - cl-mpi-test-suite = { - pname = "cl-mpi-test-suite"; - version = "20190710-git"; - asds = [ "cl-mpi-test-suite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mpi/2019-07-10/cl-mpi-20190710-git.tgz"; - sha256 = "1ykwk7acjhzpsjgm2b5svdpyw2qgrh860gkx3n2ckyrgd9l9q6jb"; - system = "cl-mpi-test-suite"; - asd = "cl-mpi-test-suite"; - }); - systems = [ "cl-mpi-test-suite" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-mpi" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-mtgnet = { - pname = "cl-mtgnet"; - version = "20180711-git"; - asds = [ "cl-mtgnet" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz"; - sha256 = "08mwkfa9s51is6npn7al4rn5a65ip2bq0psb1pdvh111h5zqxdrb"; - system = "cl-mtgnet"; - asd = "cl-mtgnet"; - }); - systems = [ "cl-mtgnet" ]; - lispLibs = [ (getAttr "blackbird" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-netstring_plus" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - cl-mtgnet-async = { - pname = "cl-mtgnet-async"; - version = "20180711-git"; - asds = [ "cl-mtgnet-async" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz"; - sha256 = "08mwkfa9s51is6npn7al4rn5a65ip2bq0psb1pdvh111h5zqxdrb"; - system = "cl-mtgnet-async"; - asd = "cl-mtgnet-async"; - }); - systems = [ "cl-mtgnet-async" ]; - lispLibs = [ (getAttr "cl-async" pkgs) (getAttr "cl-mtgnet" pkgs) ]; - }; - cl-mtgnet-sync = { - pname = "cl-mtgnet-sync"; - version = "20180711-git"; - asds = [ "cl-mtgnet-sync" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mtgnet/2018-07-11/cl-mtgnet-20180711-git.tgz"; - sha256 = "08mwkfa9s51is6npn7al4rn5a65ip2bq0psb1pdvh111h5zqxdrb"; - system = "cl-mtgnet-sync"; - asd = "cl-mtgnet-sync"; - }); - systems = [ "cl-mtgnet-sync" ]; - lispLibs = [ (getAttr "cl-mtgnet" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-murmurhash = { - pname = "cl-murmurhash"; - version = "20210630-git"; - asds = [ "cl-murmurhash" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-murmurhash/2021-06-30/cl-murmurhash-20210630-git.tgz"; - sha256 = "0251r0mpjm0y3qsm4lm7ncvrkxvgwc53spdm1p2mpayhvkkqqsws"; - system = "cl-murmurhash"; - asd = "cl-murmurhash"; - }); - systems = [ "cl-murmurhash" ]; - lispLibs = [ (getAttr "babel" pkgs) ]; - }; - cl-murmurhash_slash_test = { - pname = "cl-murmurhash_test"; - version = "20210630-git"; - asds = [ "cl-murmurhash" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-murmurhash/2021-06-30/cl-murmurhash-20210630-git.tgz"; - sha256 = "0251r0mpjm0y3qsm4lm7ncvrkxvgwc53spdm1p2mpayhvkkqqsws"; - system = "cl-murmurhash"; - asd = "cl-murmurhash"; - }); - systems = [ "cl-murmurhash/test" ]; - lispLibs = [ (getAttr "cl-murmurhash" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-mustache = { - pname = "cl-mustache"; - version = "20200325-git"; - asds = [ "cl-mustache" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mustache/2020-03-25/cl-mustache-20200325-git.tgz"; - sha256 = "1wsmr46c56l0chshffk3rbvd7v2jwplmgmkkyr98n5n2qnjcqrc4"; - system = "cl-mustache"; - asd = "cl-mustache"; - }); - systems = [ "cl-mustache" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - cl-mustache-test = { - pname = "cl-mustache-test"; - version = "20200325-git"; - asds = [ "cl-mustache-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mustache/2020-03-25/cl-mustache-20200325-git.tgz"; - sha256 = "1wsmr46c56l0chshffk3rbvd7v2jwplmgmkkyr98n5n2qnjcqrc4"; - system = "cl-mustache-test"; - asd = "cl-mustache-test"; - }); - systems = [ "cl-mustache-test" ]; - lispLibs = [ (getAttr "cl-mustache" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-muth = { - pname = "cl-muth"; - version = "stable-git"; - asds = [ "cl-muth" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-muth/2022-07-07/cl-muth-stable-git.tgz"; - sha256 = "0409arzy51chgi9anj9s2zn0qkx9wnphlbwcdvpamr4b51b60xjz"; - system = "cl-muth"; - asd = "cl-muth"; - }); - systems = [ "cl-muth" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bodge-heap" pkgs) (getAttr "bodge-queue" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - cl-muth_slash_tests = { - pname = "cl-muth_tests"; - version = "stable-git"; - asds = [ "cl-muth" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-muth/2022-07-07/cl-muth-stable-git.tgz"; - sha256 = "0409arzy51chgi9anj9s2zn0qkx9wnphlbwcdvpamr4b51b60xjz"; - system = "cl-muth"; - asd = "cl-muth"; - }); - systems = [ "cl-muth/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-muth" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-mw = { - pname = "cl-mw"; - version = "20150407-git"; - asds = [ "cl-mw" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; - sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; - system = "cl-mw"; - asd = "cl-mw"; - }); - systems = [ "cl-mw" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "hu_dot_dwim_dot_serializer" pkgs) (getAttr "iolib" pkgs) ]; - }; - cl-mw_dot_examples_dot_argument-processing = { - pname = "cl-mw.examples.argument-processing"; - version = "20150407-git"; - asds = [ "cl-mw.examples.argument-processing" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; - sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; - system = "cl-mw.examples.argument-processing"; - asd = "cl-mw.examples.argument-processing"; - }); - systems = [ "cl-mw.examples.argument-processing" ]; - lispLibs = [ (getAttr "cl-mw" pkgs) ]; - }; - cl-mw_dot_examples_dot_hello-world = { - pname = "cl-mw.examples.hello-world"; - version = "20150407-git"; - asds = [ "cl-mw.examples.hello-world" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; - sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; - system = "cl-mw.examples.hello-world"; - asd = "cl-mw.examples.hello-world"; - }); - systems = [ "cl-mw.examples.hello-world" ]; - lispLibs = [ (getAttr "cl-mw" pkgs) ]; - }; - cl-mw_dot_examples_dot_higher-order = { - pname = "cl-mw.examples.higher-order"; - version = "20150407-git"; - asds = [ "cl-mw.examples.higher-order" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; - sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; - system = "cl-mw.examples.higher-order"; - asd = "cl-mw.examples.higher-order"; - }); - systems = [ "cl-mw.examples.higher-order" ]; - lispLibs = [ (getAttr "cl-mw" pkgs) ]; - }; - cl-mw_dot_examples_dot_monte-carlo-pi = { - pname = "cl-mw.examples.monte-carlo-pi"; - version = "20150407-git"; - asds = [ "cl-mw.examples.monte-carlo-pi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; - sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; - system = "cl-mw.examples.monte-carlo-pi"; - asd = "cl-mw.examples.monte-carlo-pi"; - }); - systems = [ "cl-mw.examples.monte-carlo-pi" ]; - lispLibs = [ (getAttr "cl-mw" pkgs) ]; - }; - cl-mw_dot_examples_dot_ping = { - pname = "cl-mw.examples.ping"; - version = "20150407-git"; - asds = [ "cl-mw.examples.ping" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; - sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; - system = "cl-mw.examples.ping"; - asd = "cl-mw.examples.ping"; - }); - systems = [ "cl-mw.examples.ping" ]; - lispLibs = [ (getAttr "cl-mw" pkgs) ]; - }; - cl-mw_dot_examples_dot_with-task-policy = { - pname = "cl-mw.examples.with-task-policy"; - version = "20150407-git"; - asds = [ "cl-mw.examples.with-task-policy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mw/2015-04-07/cl-mw-20150407-git.tgz"; - sha256 = "1bpkpb86hpp7sz9mk19rbdlfcis2npc3a7w6jlph7s8brxl1h1jn"; - system = "cl-mw.examples.with-task-policy"; - asd = "cl-mw.examples.with-task-policy"; - }); - systems = [ "cl-mw.examples.with-task-policy" ]; - lispLibs = [ (getAttr "cl-mw" pkgs) ]; - }; - cl-myriam = { - pname = "cl-myriam"; - version = "20220331-git"; - asds = [ "cl-myriam" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-myriam/2022-03-31/cl-myriam-20220331-git.tgz"; - sha256 = "0vyyyy6yj62id5m1a98rbq3pz7hm74znnawxh4apqhrff37xcs1l"; - system = "cl-myriam"; - asd = "cl-myriam"; - }); - systems = [ "cl-myriam" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-conspack" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "str" pkgs) (getAttr "lparallel" pkgs) (getAttr "pzmq" pkgs) (getAttr "serapeum" pkgs) (getAttr "sha3" pkgs) (getAttr "usocket" pkgs) (getAttr "uuid" pkgs) ]; - }; - cl-mysql = { - pname = "cl-mysql"; - version = "20200610-git"; - asds = [ "cl-mysql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz"; - sha256 = "1jk2571w5zhrmza4mr5z4ia6g7r5hzhp8dsxnpx2ypnla9xpxv5h"; - system = "cl-mysql"; - asd = "cl-mysql"; - }); - systems = [ "cl-mysql" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-mysql-test = { - pname = "cl-mysql-test"; - version = "20200610-git"; - asds = [ "cl-mysql-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz"; - sha256 = "1jk2571w5zhrmza4mr5z4ia6g7r5hzhp8dsxnpx2ypnla9xpxv5h"; - system = "cl-mysql-test"; - asd = "cl-mysql-test"; - }); - systems = [ "cl-mysql-test" ]; - lispLibs = [ (getAttr "cl-mysql" pkgs) (getAttr "stefil" pkgs) ]; - }; - cl-naive-store = { - pname = "cl-naive-store"; - version = "20221106-git"; - asds = [ "cl-naive-store" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2022-11-06/cl-naive-store-20221106-git.tgz"; - sha256 = "0mrk64dzs9v6d2gggz8v2b6ng7f1qzkw9nsdm62qcax63p2v19v8"; - system = "cl-naive-store"; - asd = "cl-naive-store"; - }); - systems = [ "cl-naive-store" ]; - lispLibs = [ (getAttr "cl-naive-store_dot_document-type-defs" pkgs) (getAttr "cl-naive-store_dot_document-types" pkgs) (getAttr "cl-naive-store_dot_naive-core" pkgs) (getAttr "cl-naive-store_dot_naive-documents" pkgs) (getAttr "cl-naive-store_dot_naive-indexed" pkgs) (getAttr "cl-naive-store_dot_naive-merkle" pkgs) ]; - }; - cl-naive-store_dot_document-type-defs = { - pname = "cl-naive-store.document-type-defs"; - version = "20221106-git"; - asds = [ "cl-naive-store.document-type-defs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2022-11-06/cl-naive-store-20221106-git.tgz"; - sha256 = "0mrk64dzs9v6d2gggz8v2b6ng7f1qzkw9nsdm62qcax63p2v19v8"; - system = "cl-naive-store.document-type-defs"; - asd = "cl-naive-store.document-type-defs"; - }); - systems = [ "cl-naive-store.document-type-defs" ]; - lispLibs = [ (getAttr "cl-naive-store_dot_document-types" pkgs) (getAttr "cl-naive-store_dot_naive-core" pkgs) ]; - }; - cl-naive-store_dot_document-types = { - pname = "cl-naive-store.document-types"; - version = "20221106-git"; - asds = [ "cl-naive-store.document-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2022-11-06/cl-naive-store-20221106-git.tgz"; - sha256 = "0mrk64dzs9v6d2gggz8v2b6ng7f1qzkw9nsdm62qcax63p2v19v8"; - system = "cl-naive-store.document-types"; - asd = "cl-naive-store.document-types"; - }); - systems = [ "cl-naive-store.document-types" ]; - lispLibs = [ (getAttr "cl-naive-store_dot_naive-core" pkgs) ]; - }; - cl-naive-store_dot_naive-core = { - pname = "cl-naive-store.naive-core"; - version = "20221106-git"; - asds = [ "cl-naive-store.naive-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2022-11-06/cl-naive-store-20221106-git.tgz"; - sha256 = "0mrk64dzs9v6d2gggz8v2b6ng7f1qzkw9nsdm62qcax63p2v19v8"; - system = "cl-naive-store.naive-core"; - asd = "cl-naive-store.naive-core"; - }); - systems = [ "cl-naive-store.naive-core" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-cpus" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-getx" pkgs) (getAttr "cl-murmurhash" pkgs) (getAttr "ironclad" pkgs) (getAttr "local-time" pkgs) (getAttr "lparallel" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uuid" pkgs) ]; - }; - cl-naive-store_dot_naive-documents = { - pname = "cl-naive-store.naive-documents"; - version = "20221106-git"; - asds = [ "cl-naive-store.naive-documents" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2022-11-06/cl-naive-store-20221106-git.tgz"; - sha256 = "0mrk64dzs9v6d2gggz8v2b6ng7f1qzkw9nsdm62qcax63p2v19v8"; - system = "cl-naive-store.naive-documents"; - asd = "cl-naive-store.naive-documents"; - }); - systems = [ "cl-naive-store.naive-documents" ]; - lispLibs = [ (getAttr "cl-naive-store_dot_document-type-defs" pkgs) (getAttr "cl-naive-store_dot_document-types" pkgs) (getAttr "cl-naive-store_dot_naive-core" pkgs) (getAttr "cl-naive-store_dot_naive-indexed" pkgs) ]; - }; - cl-naive-store_dot_naive-indexed = { - pname = "cl-naive-store.naive-indexed"; - version = "20221106-git"; - asds = [ "cl-naive-store.naive-indexed" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2022-11-06/cl-naive-store-20221106-git.tgz"; - sha256 = "0mrk64dzs9v6d2gggz8v2b6ng7f1qzkw9nsdm62qcax63p2v19v8"; - system = "cl-naive-store.naive-indexed"; - asd = "cl-naive-store.naive-indexed"; - }); - systems = [ "cl-naive-store.naive-indexed" ]; - lispLibs = [ (getAttr "cl-naive-store_dot_naive-core" pkgs) ]; - }; - cl-naive-store_dot_naive-merkle = { - pname = "cl-naive-store.naive-merkle"; - version = "20221106-git"; - asds = [ "cl-naive-store.naive-merkle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2022-11-06/cl-naive-store-20221106-git.tgz"; - sha256 = "0mrk64dzs9v6d2gggz8v2b6ng7f1qzkw9nsdm62qcax63p2v19v8"; - system = "cl-naive-store.naive-merkle"; - asd = "cl-naive-store.naive-merkle"; - }); - systems = [ "cl-naive-store.naive-merkle" ]; - lispLibs = [ (getAttr "cl-naive-store_dot_naive-documents" pkgs) ]; - }; - cl-naive-store_dot_test = { - pname = "cl-naive-store.test"; - version = "20221106-git"; - asds = [ "cl-naive-store.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-naive-store/2022-11-06/cl-naive-store-20221106-git.tgz"; - sha256 = "0mrk64dzs9v6d2gggz8v2b6ng7f1qzkw9nsdm62qcax63p2v19v8"; - system = "cl-naive-store.test"; - asd = "cl-naive-store.test"; - }); - systems = [ "cl-naive-store.test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-naive-store" pkgs) ]; - }; - cl-ncurses = { - pname = "cl-ncurses"; - version = "0.1.4"; - asds = [ "cl-ncurses" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ncurses/2010-10-06/cl-ncurses_0.1.4.tgz"; - sha256 = "1frcap93i4ni3d648rrbnjjpz7p4cxlv57mmzlpxpzchzbcga026"; - system = "cl-ncurses"; - asd = "cl-ncurses"; - }); - systems = [ "cl-ncurses" ]; - lispLibs = [ (getAttr "uffi" pkgs) ]; - }; - cl-neo4j = { - pname = "cl-neo4j"; - version = "release-b8ad637a-git"; - asds = [ "cl-neo4j" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-neo4j/2013-01-28/cl-neo4j-release-b8ad637a-git.tgz"; - sha256 = "061xqjn08aqynfqygk48pwjp1d1mnhcb6fnl4lcfyw261dxsp871"; - system = "cl-neo4j"; - asd = "cl-neo4j"; - }); - systems = [ "cl-neo4j" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "babel" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-neo4j_dot_tests = { - pname = "cl-neo4j.tests"; - version = "release-b8ad637a-git"; - asds = [ "cl-neo4j.tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-neo4j/2013-01-28/cl-neo4j-release-b8ad637a-git.tgz"; - sha256 = "061xqjn08aqynfqygk48pwjp1d1mnhcb6fnl4lcfyw261dxsp871"; - system = "cl-neo4j.tests"; - asd = "cl-neo4j"; - }); - systems = [ "cl-neo4j.tests" ]; - lispLibs = [ (getAttr "cl-neo4j" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-neovim = { - pname = "cl-neovim"; - version = "20190521-git"; - asds = [ "cl-neovim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-neovim/2019-05-21/cl-neovim-20190521-git.tgz"; - sha256 = "06hy30px9cppqzh0c8nkbyysbpw2l247r4g43wfw96rflrdwy6ks"; - system = "cl-neovim"; - asd = "cl-neovim"; - }); - systems = [ "cl-neovim" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-messagepack-rpc" pkgs) (getAttr "form-fiddle" pkgs) (getAttr "split-sequence" pkgs) (getAttr "vom" pkgs) ]; - }; - cl-netpbm = { - pname = "cl-netpbm"; - version = "20201016-hg"; - asds = [ "cl-netpbm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-netpbm/2020-10-16/cl-netpbm-20201016-hg.tgz"; - sha256 = "1xhpyn7nkadvbv8n7sbjyfj9qzr90p66dhq1j9f0jj4lmarp8anp"; - system = "cl-netpbm"; - asd = "cl-netpbm"; - }); - systems = [ "cl-netpbm" ]; - lispLibs = [ ]; - }; - cl-netpbm_slash_test = { - pname = "cl-netpbm_test"; - version = "20201016-hg"; - asds = [ "cl-netpbm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-netpbm/2020-10-16/cl-netpbm-20201016-hg.tgz"; - sha256 = "1xhpyn7nkadvbv8n7sbjyfj9qzr90p66dhq1j9f0jj4lmarp8anp"; - system = "cl-netpbm"; - asd = "cl-netpbm"; - }); - systems = [ "cl-netpbm/test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "cl-netpbm" pkgs) (getAttr "external-program" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-netstring_plus = { - pname = "cl-netstring+"; - version = "20150709-git"; - asds = [ "cl-netstring+" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-netstring-plus/2015-07-09/cl-netstring-plus-20150709-git.tgz"; - sha256 = "03nxhgkab8lsx8mvavd4yny1894yxl5bllvqb12hyjdgg1v8whrr"; - system = "cl-netstring+"; - asd = "cl-netstring+"; - }); - systems = [ "cl-netstring+" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - cl-netstrings = { - pname = "cl-netstrings"; - version = "20121013-git"; - asds = [ "cl-netstrings" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-netstrings/2012-10-13/cl-netstrings-20121013-git.tgz"; - sha256 = "1mprrb8i3fjpmw7w461ib8zrcjwx77sqwaxyqq7i8yqkbhk7p1ql"; - system = "cl-netstrings"; - asd = "cl-netstrings"; - }); - systems = [ "cl-netstrings" ]; - lispLibs = [ (getAttr "arnesi" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-notebook = { - pname = "cl-notebook"; - version = "20201220-git"; - asds = [ "cl-notebook" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-notebook/2020-12-20/cl-notebook-20201220-git.tgz"; - sha256 = "0kg5wdclz9i64gcx27z5bs739hsvjrfl9kf1awi31x4142yxrva8"; - system = "cl-notebook"; - asd = "cl-notebook"; - }); - systems = [ "cl-notebook" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "cl-css" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-who" pkgs) (getAttr "closer-mop" pkgs) (getAttr "fact-base" pkgs) (getAttr "house" pkgs) (getAttr "parenscript" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "qlot" pkgs) (getAttr "quri" pkgs) ]; - }; - cl-notebook_slash_test = { - pname = "cl-notebook_test"; - version = "20201220-git"; - asds = [ "cl-notebook" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-notebook/2020-12-20/cl-notebook-20201220-git.tgz"; - sha256 = "0kg5wdclz9i64gcx27z5bs739hsvjrfl9kf1awi31x4142yxrva8"; - system = "cl-notebook"; - asd = "cl-notebook"; - }); - systems = [ "cl-notebook/test" ]; - lispLibs = [ (getAttr "cl-notebook" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "test-utils" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-ntp-client = { - pname = "cl-ntp-client"; - version = "20210630-git"; - asds = [ "cl-ntp-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ntp-client/2021-06-30/cl-ntp-client-20210630-git.tgz"; - sha256 = "1mc16bvs0l8srnxjcjg4m192rw5waq291zks2jslxmxij0pa28cm"; - system = "cl-ntp-client"; - asd = "cl-ntp-client"; - }); - systems = [ "cl-ntp-client" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-ntriples = { - pname = "cl-ntriples"; - version = "20190307-hg"; - asds = [ "cl-ntriples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ntriples/2019-03-07/cl-ntriples-20190307-hg.tgz"; - sha256 = "0k8q2r2nxkgxp91398gb0iwfy9kd2mn519nxxa3zq831c433l2mq"; - system = "cl-ntriples"; - asd = "cl-ntriples"; - }); - systems = [ "cl-ntriples" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-num-utils = { - pname = "cl-num-utils"; - version = "20210531-git"; - asds = [ "cl-num-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-num-utils/2021-05-31/cl-num-utils-20210531-git.tgz"; - sha256 = "15ihsxxs76xnldmqfsbxybckqjwrxwcpphgghiwzr2mnbqjpdqkh"; - system = "cl-num-utils"; - asd = "cl-num-utils"; - }); - systems = [ "cl-num-utils" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "array-operations" pkgs) (getAttr "cl-slice" pkgs) (getAttr "let-plus" pkgs) ]; - }; - cl-num-utils-tests = { - pname = "cl-num-utils-tests"; - version = "20210531-git"; - asds = [ "cl-num-utils-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-num-utils/2021-05-31/cl-num-utils-20210531-git.tgz"; - sha256 = "15ihsxxs76xnldmqfsbxybckqjwrxwcpphgghiwzr2mnbqjpdqkh"; - system = "cl-num-utils-tests"; - asd = "cl-num-utils"; - }); - systems = [ "cl-num-utils-tests" ]; - lispLibs = [ (getAttr "cl-num-utils" pkgs) (getAttr "clunit" pkgs) ]; - }; - cl-oauth = { - pname = "cl-oauth"; - version = "20150804-git"; - asds = [ "cl-oauth" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-oauth/2015-08-04/cl-oauth-20150804-git.tgz"; - sha256 = "1q4r5i3099684q5x9wqddrm9g88qm16nnra9glvxngywfjc5zzkk"; - system = "cl-oauth"; - asd = "cl-oauth"; - }); - systems = [ "cl-oauth" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "babel" pkgs) (getAttr "cl-base64" pkgs) (getAttr "closer-mop" pkgs) (getAttr "drakma" pkgs) (getAttr "f-underscore" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "ironclad" pkgs) (getAttr "puri" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-oauth_dot_tests = { - pname = "cl-oauth.tests"; - version = "20150804-git"; - asds = [ "cl-oauth.tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-oauth/2015-08-04/cl-oauth-20150804-git.tgz"; - sha256 = "1q4r5i3099684q5x9wqddrm9g88qm16nnra9glvxngywfjc5zzkk"; - system = "cl-oauth.tests"; - asd = "cl-oauth"; - }); - systems = [ "cl-oauth.tests" ]; - lispLibs = [ (getAttr "cl-oauth" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-oclapi = { - pname = "cl-oclapi"; - version = "20180831-git"; - asds = [ "cl-oclapi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-oclapi/2018-08-31/cl-oclapi-20180831-git.tgz"; - sha256 = "0aix5ipw98fsnvg1w7qmrjbwgn70gn7vf5av21xsgblp2sd7w2aw"; - system = "cl-oclapi"; - asd = "cl-oclapi"; - }); - systems = [ "cl-oclapi" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-annot" pkgs) (getAttr "cl-reexport" pkgs) ]; - }; - cl-oclapi-test = { - pname = "cl-oclapi-test"; - version = "20180831-git"; - asds = [ "cl-oclapi-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-oclapi/2018-08-31/cl-oclapi-20180831-git.tgz"; - sha256 = "0aix5ipw98fsnvg1w7qmrjbwgn70gn7vf5av21xsgblp2sd7w2aw"; - system = "cl-oclapi-test"; - asd = "cl-oclapi-test"; - }); - systems = [ "cl-oclapi-test" ]; - lispLibs = [ (getAttr "cl-annot" pkgs) (getAttr "cl-oclapi" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-octet-streams = { - pname = "cl-octet-streams"; - version = "20201220-git"; - asds = [ "cl-octet-streams" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-octet-streams/2020-12-20/cl-octet-streams-20201220-git.tgz"; - sha256 = "1hffh98bv4w5yrchagzwqrc43d2p473pvw7ka4kyyvhrr52dk2f8"; - system = "cl-octet-streams"; - asd = "cl-octet-streams"; - }); - systems = [ "cl-octet-streams" ]; - lispLibs = [ (getAttr "trivial-gray-streams" pkgs) ]; - }; - cl-octet-streams_slash_tests = { - pname = "cl-octet-streams_tests"; - version = "20201220-git"; - asds = [ "cl-octet-streams" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-octet-streams/2020-12-20/cl-octet-streams-20201220-git.tgz"; - sha256 = "1hffh98bv4w5yrchagzwqrc43d2p473pvw7ka4kyyvhrr52dk2f8"; - system = "cl-octet-streams"; - asd = "cl-octet-streams"; - }); - systems = [ "cl-octet-streams/tests" ]; - lispLibs = [ (getAttr "cl-octet-streams" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-ode = { - pname = "cl-ode"; - version = "20160628-git"; - asds = [ "cl-ode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ode/2016-06-28/cl-ode-20160628-git.tgz"; - sha256 = "1pxm2pq0br0rhdfnvs5jqfkxfs8bc9wdqrzwyv83l8n7pax941b0"; - system = "cl-ode"; - asd = "cl-ode"; - }); - systems = [ "cl-ode" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-ohm = { - pname = "cl-ohm"; - version = "20180228-git"; - asds = [ "cl-ohm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ohm/2018-02-28/cl-ohm-20180228-git.tgz"; - sha256 = "00gdfsiba761gk7xw91wfnr9yv84maagf9idh55bk5bs4ws1ymyp"; - system = "cl-ohm"; - asd = "cl-ohm"; - }); - systems = [ "cl-ohm" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-redis" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - cl-ohm_slash_test = { - pname = "cl-ohm_test"; - version = "20180228-git"; - asds = [ "cl-ohm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ohm/2018-02-28/cl-ohm-20180228-git.tgz"; - sha256 = "00gdfsiba761gk7xw91wfnr9yv84maagf9idh55bk5bs4ws1ymyp"; - system = "cl-ohm"; - asd = "cl-ohm"; - }); - systems = [ "cl-ohm/test" ]; - lispLibs = [ (getAttr "cl-ohm" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-oju = { - pname = "cl-oju"; - version = "20221106-git"; - asds = [ "cl-oju" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-oju/2022-11-06/cl-oju-20221106-git.tgz"; - sha256 = "0xj8csalyrcpj1r0k7l0qdqyrm8s3vw60dmg5pgi59lif98l491x"; - system = "cl-oju"; - asd = "cl-oju"; - }); - systems = [ "cl-oju" ]; - lispLibs = [ (getAttr "_1am" pkgs) ]; - }; - cl-oju_slash_test = { - pname = "cl-oju_test"; - version = "20221106-git"; - asds = [ "cl-oju" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-oju/2022-11-06/cl-oju-20221106-git.tgz"; - sha256 = "0xj8csalyrcpj1r0k7l0qdqyrm8s3vw60dmg5pgi59lif98l491x"; - system = "cl-oju"; - asd = "cl-oju"; - }); - systems = [ "cl-oju/test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "cl-oju" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-olefs = { - pname = "cl-olefs"; - version = "20150709-git"; - asds = [ "cl-olefs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-olefs/2015-07-09/cl-olefs-20150709-git.tgz"; - sha256 = "0cqna6zzfrjmsq17yc4wg204kr77riczqjpm1w5cj1mba43zcac7"; - system = "cl-olefs"; - asd = "cl-olefs"; - }); - systems = [ "cl-olefs" ]; - lispLibs = [ ]; - }; - cl-one-time-passwords = { - pname = "cl-one-time-passwords"; - version = "20171019-git"; - asds = [ "cl-one-time-passwords" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-one-time-passwords/2017-10-19/cl-one-time-passwords-20171019-git.tgz"; - sha256 = "1nhq2jij257cfaadh9k421qaisicxpmx3wsc4kivf1psgbrc56lg"; - system = "cl-one-time-passwords"; - asd = "cl-one-time-passwords"; - }); - systems = [ "cl-one-time-passwords" ]; - lispLibs = [ (getAttr "ironclad" pkgs) ]; - }; - cl-one-time-passwords-test = { - pname = "cl-one-time-passwords-test"; - version = "20171019-git"; - asds = [ "cl-one-time-passwords-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-one-time-passwords/2017-10-19/cl-one-time-passwords-20171019-git.tgz"; - sha256 = "1nhq2jij257cfaadh9k421qaisicxpmx3wsc4kivf1psgbrc56lg"; - system = "cl-one-time-passwords-test"; - asd = "cl-one-time-passwords-test"; - }); - systems = [ "cl-one-time-passwords-test" ]; - lispLibs = [ (getAttr "cl-one-time-passwords" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-oneliner = { - pname = "cl-oneliner"; - version = "20131003-git"; - asds = [ "cl-oneliner" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/oneliner/2013-10-03/oneliner-20131003-git.tgz"; - sha256 = "0q9350s0r9yjmfc2360g35qi04b3867gd7hw5ada4176whinmjxb"; - system = "cl-oneliner"; - asd = "cl-oneliner"; - }); - systems = [ "cl-oneliner" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-online-learning = { - pname = "cl-online-learning"; - version = "20220331-git"; - asds = [ "cl-online-learning" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-online-learning/2022-03-31/cl-online-learning-20220331-git.tgz"; - sha256 = "136v9kxcy53qar2j4y38awnw2idnf0lwxqwx7wgak664w3hxs6k8"; - system = "cl-online-learning"; - asd = "cl-online-learning"; - }); - systems = [ "cl-online-learning" ]; - lispLibs = [ (getAttr "cl-libsvm-format" pkgs) (getAttr "cl-store" pkgs) ]; - }; - cl-online-learning-test = { - pname = "cl-online-learning-test"; - version = "20220331-git"; - asds = [ "cl-online-learning-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-online-learning/2022-03-31/cl-online-learning-20220331-git.tgz"; - sha256 = "136v9kxcy53qar2j4y38awnw2idnf0lwxqwx7wgak664w3hxs6k8"; - system = "cl-online-learning-test"; - asd = "cl-online-learning-test"; - }); - systems = [ "cl-online-learning-test" ]; - lispLibs = [ (getAttr "cl-online-learning" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-openal = { - pname = "cl-openal"; - version = "20221106-git"; - asds = [ "cl-openal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz"; - sha256 = "0jmp81mf23ckcm4knnh0q7zpmyls5220imaqbmnl0xvvra10b1zy"; - system = "cl-openal"; - asd = "cl-openal"; - }); - systems = [ "cl-openal" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) ]; - }; - cl-openal-examples = { - pname = "cl-openal-examples"; - version = "20221106-git"; - asds = [ "cl-openal-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-openal/2022-11-06/cl-openal-20221106-git.tgz"; - sha256 = "0jmp81mf23ckcm4knnh0q7zpmyls5220imaqbmnl0xvvra10b1zy"; - system = "cl-openal-examples"; - asd = "cl-openal-examples"; - }); - systems = [ "cl-openal-examples" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-alc" pkgs) (getAttr "cl-alut" pkgs) (getAttr "cl-openal" pkgs) ]; - }; - cl-opencl = { - pname = "cl-opencl"; - version = "20211209-git"; - asds = [ "cl-opencl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opencl/2021-12-09/cl-opencl-20211209-git.tgz"; - sha256 = "1agg6rg7lsbq2jgarx25bwm1nw22jpl20bzhyn4ivygcgzp2mv29"; - system = "cl-opencl"; - asd = "cl-opencl"; - }); - systems = [ "cl-opencl" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - cl-opencl-utils = { - pname = "cl-opencl-utils"; - version = "20211020-git"; - asds = [ "cl-opencl-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opencl-utils/2021-10-20/cl-opencl-utils-20211020-git.tgz"; - sha256 = "15q3n78b57k9hlprwh8wnga7ciq56wmcmimi32486sygl1ccg47n"; - system = "cl-opencl-utils"; - asd = "cl-opencl-utils"; - }); - systems = [ "cl-opencl-utils" ]; - lispLibs = [ (getAttr "cl-opencl" pkgs) ]; - }; - cl-opengl = { - pname = "cl-opengl"; - version = "20191130-git"; - asds = [ "cl-opengl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opengl/2019-11-30/cl-opengl-20191130-git.tgz"; - sha256 = "0mhqmll09f079pnd6mgswz9nvr6h5n27d4q7zpmm2igf1v460id7"; - system = "cl-opengl"; - asd = "cl-opengl"; - }); - systems = [ "cl-opengl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "float-features" pkgs) ]; - }; - cl-opengl_slash_es2 = { - pname = "cl-opengl_es2"; - version = "20191130-git"; - asds = [ "cl-opengl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opengl/2019-11-30/cl-opengl-20191130-git.tgz"; - sha256 = "0mhqmll09f079pnd6mgswz9nvr6h5n27d4q7zpmm2igf1v460id7"; - system = "cl-opengl"; - asd = "cl-opengl"; - }); - systems = [ "cl-opengl/es2" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "float-features" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-openstack-client = { - pname = "cl-openstack-client"; - version = "20191007-git"; - asds = [ "cl-openstack-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-openstack-client/2019-10-07/cl-openstack-client-20191007-git.tgz"; - sha256 = "1sak75i82vn3acg7bxx8vjbw2y35wbq1vkh1yqhs68ksnph6d097"; - system = "cl-openstack-client"; - asd = "cl-openstack-client"; - }); - systems = [ "cl-openstack-client" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-json" pkgs) (getAttr "drakma" pkgs) (getAttr "local-time" pkgs) (getAttr "uri-template" pkgs) ]; - }; - cl-openstack-client-test = { - pname = "cl-openstack-client-test"; - version = "20191007-git"; - asds = [ "cl-openstack-client-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-openstack-client/2019-10-07/cl-openstack-client-20191007-git.tgz"; - sha256 = "1sak75i82vn3acg7bxx8vjbw2y35wbq1vkh1yqhs68ksnph6d097"; - system = "cl-openstack-client-test"; - asd = "cl-openstack-client-test"; - }); - systems = [ "cl-openstack-client-test" ]; - lispLibs = [ (getAttr "chunga" pkgs) (getAttr "cl-openstack-client" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "fiveam" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "local-time" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - cl-opsresearch = { - pname = "cl-opsresearch"; - version = "20170403-git"; - asds = [ "cl-opsresearch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; - sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7"; - system = "cl-opsresearch"; - asd = "cl-opsresearch"; - }); - systems = [ "cl-opsresearch" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-org-mode = { - pname = "cl-org-mode"; - version = "20101207-git"; - asds = [ "cl-org-mode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-org-mode/2010-12-07/cl-org-mode-20101207-git.tgz"; - sha256 = "1fvwl9jlbpd352b5zn2d45mabsim5xvzabwyz1h10hwv4gviymzf"; - system = "cl-org-mode"; - asd = "cl-org-mode"; - }); - systems = [ "cl-org-mode" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - cl-out123 = { - pname = "cl-out123"; - version = "20190710-git"; - asds = [ "cl-out123" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-out123/2019-07-10/cl-out123-20190710-git.tgz"; - sha256 = "0mdwgfax6sq68wvdgjjp78i40ah7wqkpqnvaq8a1c509k7ghdgv1"; - system = "cl-out123"; - asd = "cl-out123"; - }); - systems = [ "cl-out123" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-pack = { - pname = "cl-pack"; - version = "20200427-git"; - asds = [ "cl-pack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pack/2020-04-27/cl-pack-20200427-git.tgz"; - sha256 = "0q7gawy0cwy49m1mxgj0jqnzzckk2ps74ncfaw1pqiqilfyx7np6"; - system = "cl-pack"; - asd = "cl-pack"; - }); - systems = [ "cl-pack" ]; - lispLibs = [ (getAttr "ieee-floats" pkgs) ]; - }; - cl-pack-test = { - pname = "cl-pack-test"; - version = "20200427-git"; - asds = [ "cl-pack-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pack/2020-04-27/cl-pack-20200427-git.tgz"; - sha256 = "0q7gawy0cwy49m1mxgj0jqnzzckk2ps74ncfaw1pqiqilfyx7np6"; - system = "cl-pack-test"; - asd = "cl-pack"; - }); - systems = [ "cl-pack-test" ]; - lispLibs = [ (getAttr "cl-pack" pkgs) ]; - }; - cl-package-locks = { - pname = "cl-package-locks"; - version = "20111203-git"; - asds = [ "cl-package-locks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-package-locks/2011-12-03/cl-package-locks-20111203-git.tgz"; - sha256 = "0g3gfljnvpgd66ccd2sqawlkwqx4a0wsdrg5180va61w869cgxqq"; - system = "cl-package-locks"; - asd = "cl-package-locks"; - }); - systems = [ "cl-package-locks" ]; - lispLibs = [ ]; - }; - cl-pango = { - pname = "cl-pango"; - version = "20170403-git"; - asds = [ "cl-pango" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pango/2017-04-03/cl-pango-20170403-git.tgz"; - sha256 = "0zkn4yn8nkkjr0x1vcy856cvbmnyhdidqz0in8xvd2i93jvw5w0i"; - system = "cl-pango"; - asd = "cl-pango"; - }); - systems = [ "cl-pango" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-cairo2" pkgs) (getAttr "xmls" pkgs) ]; - }; - cl-parallel = { - pname = "cl-parallel"; - version = "20130312-git"; - asds = [ "cl-parallel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-parallel/2013-03-12/cl-parallel-20130312-git.tgz"; - sha256 = "1hmkcbwkj7rx8zg5wf2w06nvbabldpr7hbbg1ycj0fss86s2cx2c"; - system = "cl-parallel"; - asd = "cl-parallel"; - }); - systems = [ "cl-parallel" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - cl-pass = { - pname = "cl-pass"; - version = "20201220-git"; - asds = [ "cl-pass" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pass/2020-12-20/cl-pass-20201220-git.tgz"; - sha256 = "05qx4jrkxqbqi72cxgswbpnifbdvp9mh7apc7566v522899bh0hb"; - system = "cl-pass"; - asd = "cl-pass"; - }); - systems = [ "cl-pass" ]; - lispLibs = [ (getAttr "ironclad" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - cl-pass-test = { - pname = "cl-pass-test"; - version = "20201220-git"; - asds = [ "cl-pass-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pass/2020-12-20/cl-pass-20201220-git.tgz"; - sha256 = "05qx4jrkxqbqi72cxgswbpnifbdvp9mh7apc7566v522899bh0hb"; - system = "cl-pass-test"; - asd = "cl-pass-test"; - }); - systems = [ "cl-pass-test" ]; - lispLibs = [ (getAttr "cl-pass" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-paths = { - pname = "cl-paths"; - version = "20180228-git"; - asds = [ "cl-paths" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0nckw4zb6s96hll8hrxzvgs2an3bfm0pxcywshbm4bq4rn7niqg4"; - system = "cl-paths"; - asd = "cl-paths"; - }); - systems = [ "cl-paths" ]; - lispLibs = [ ]; - }; - cl-paths-ttf = { - pname = "cl-paths-ttf"; - version = "20180228-git"; - asds = [ "cl-paths-ttf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0nckw4zb6s96hll8hrxzvgs2an3bfm0pxcywshbm4bq4rn7niqg4"; - system = "cl-paths-ttf"; - asd = "cl-paths-ttf"; - }); - systems = [ "cl-paths-ttf" ]; - lispLibs = [ (getAttr "cl-paths" pkgs) (getAttr "zpb-ttf" pkgs) ]; - }; - cl-pattern = { - pname = "cl-pattern"; - version = "20140713-git"; - asds = [ "cl-pattern" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz"; - sha256 = "0kc1yynn1ysa7bcaazhi1pq8l3hj3jq6p835kh5di7g1imrfkrny"; - system = "cl-pattern"; - asd = "cl-pattern"; - }); - systems = [ "cl-pattern" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-annot" pkgs) (getAttr "cl-syntax" pkgs) (getAttr "cl-syntax-annot" pkgs) ]; - }; - cl-pattern-benchmark = { - pname = "cl-pattern-benchmark"; - version = "20140713-git"; - asds = [ "cl-pattern-benchmark" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz"; - sha256 = "0kc1yynn1ysa7bcaazhi1pq8l3hj3jq6p835kh5di7g1imrfkrny"; - system = "cl-pattern-benchmark"; - asd = "cl-pattern-benchmark"; - }); - systems = [ "cl-pattern-benchmark" ]; - lispLibs = [ (getAttr "cl-pattern" pkgs) ]; - }; - cl-patterns = { - pname = "cl-patterns"; - version = "20221106-git"; - asds = [ "cl-patterns" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-patterns/2022-11-06/cl-patterns-20221106-git.tgz"; - sha256 = "0hgr6f3f3iggbacpkglqykah0xjimnbn21z4fliw3qgzzagz6hbb"; - system = "cl-patterns"; - asd = "cl-patterns"; - }); - systems = [ "cl-patterns" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "dissect" pkgs) (getAttr "local-time" pkgs) (getAttr "mutility" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - cl-patterns_slash_debug = { - pname = "cl-patterns_debug"; - version = "20221106-git"; - asds = [ "cl-patterns" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-patterns/2022-11-06/cl-patterns-20221106-git.tgz"; - sha256 = "0hgr6f3f3iggbacpkglqykah0xjimnbn21z4fliw3qgzzagz6hbb"; - system = "cl-patterns"; - asd = "cl-patterns"; - }); - systems = [ "cl-patterns/debug" ]; - lispLibs = [ (getAttr "cl-patterns" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-patterns_slash_generic-cl = { - pname = "cl-patterns_generic-cl"; - version = "20221106-git"; - asds = [ "cl-patterns" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-patterns/2022-11-06/cl-patterns-20221106-git.tgz"; - sha256 = "0hgr6f3f3iggbacpkglqykah0xjimnbn21z4fliw3qgzzagz6hbb"; - system = "cl-patterns"; - asd = "cl-patterns"; - }); - systems = [ "cl-patterns/generic-cl" ]; - lispLibs = [ (getAttr "cl-patterns" pkgs) (getAttr "generic-cl" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-patterns_slash_midifile = { - pname = "cl-patterns_midifile"; - version = "20221106-git"; - asds = [ "cl-patterns" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-patterns/2022-11-06/cl-patterns-20221106-git.tgz"; - sha256 = "0hgr6f3f3iggbacpkglqykah0xjimnbn21z4fliw3qgzzagz6hbb"; - system = "cl-patterns"; - asd = "cl-patterns"; - }); - systems = [ "cl-patterns/midifile" ]; - lispLibs = [ (getAttr "cl-patterns" pkgs) (getAttr "midi" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-patterns_slash_sugar = { - pname = "cl-patterns_sugar"; - version = "20221106-git"; - asds = [ "cl-patterns" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-patterns/2022-11-06/cl-patterns-20221106-git.tgz"; - sha256 = "0hgr6f3f3iggbacpkglqykah0xjimnbn21z4fliw3qgzzagz6hbb"; - system = "cl-patterns"; - asd = "cl-patterns"; - }); - systems = [ "cl-patterns/sugar" ]; - lispLibs = [ (getAttr "cl-patterns" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-patterns_slash_supercollider = { - pname = "cl-patterns_supercollider"; - version = "20221106-git"; - asds = [ "cl-patterns" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-patterns/2022-11-06/cl-patterns-20221106-git.tgz"; - sha256 = "0hgr6f3f3iggbacpkglqykah0xjimnbn21z4fliw3qgzzagz6hbb"; - system = "cl-patterns"; - asd = "cl-patterns"; - }); - systems = [ "cl-patterns/supercollider" ]; - lispLibs = [ (getAttr "cl-collider" pkgs) (getAttr "cl-patterns" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-patterns_slash_tests = { - pname = "cl-patterns_tests"; - version = "20221106-git"; - asds = [ "cl-patterns" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-patterns/2022-11-06/cl-patterns-20221106-git.tgz"; - sha256 = "0hgr6f3f3iggbacpkglqykah0xjimnbn21z4fliw3qgzzagz6hbb"; - system = "cl-patterns"; - asd = "cl-patterns"; - }); - systems = [ "cl-patterns/tests" ]; - lispLibs = [ (getAttr "cl-org-mode" pkgs) (getAttr "cl-patterns" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "fiveam" pkgs) (getAttr "mutility" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-paymill = { - pname = "cl-paymill"; - version = "20131111-git"; - asds = [ "cl-paymill" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-paymill/2013-11-11/cl-paymill-20131111-git.tgz"; - sha256 = "1dhddmw7gxfxbv1vfqi6nzyh8m5n3b160ch6ianf5sn6apmi92nw"; - system = "cl-paymill"; - asd = "cl-paymill"; - }); - systems = [ "cl-paymill" ]; - lispLibs = [ (getAttr "cl_plus_ssl" pkgs) (getAttr "drakma" pkgs) (getAttr "st-json" pkgs) ]; - }; - cl-paypal = { - pname = "cl-paypal"; - version = "20101006-git"; - asds = [ "cl-paypal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-paypal/2010-10-06/cl-paypal-20101006-git.tgz"; - sha256 = "0cc6zv17klgiyj1mbbrkbvajkr6dwsjv3iilh57vhdqd01lrhnb2"; - system = "cl-paypal"; - asd = "cl-paypal"; - }); - systems = [ "cl-paypal" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - cl-pcg = { - pname = "cl-pcg"; - version = "20201016-hg"; - asds = [ "cl-pcg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pcg/2020-10-16/cl-pcg-20201016-hg.tgz"; - sha256 = "1w2b2y5fgjc6z8akvlmwasj90dnjv55nvb8pghq4xpv43hfy73mp"; - system = "cl-pcg"; - asd = "cl-pcg"; - }); - systems = [ "cl-pcg" ]; - lispLibs = [ ]; - }; - cl-pcg_dot_test = { - pname = "cl-pcg.test"; - version = "20201016-hg"; - asds = [ "cl-pcg.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pcg/2020-10-16/cl-pcg-20201016-hg.tgz"; - sha256 = "1w2b2y5fgjc6z8akvlmwasj90dnjv55nvb8pghq4xpv43hfy73mp"; - system = "cl-pcg.test"; - asd = "cl-pcg.test"; - }); - systems = [ "cl-pcg.test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "cl-pcg" pkgs) ]; - }; - cl-pdf = { - pname = "cl-pdf"; - version = "20221106-git"; - asds = [ "cl-pdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pdf/2022-11-06/cl-pdf-20221106-git.tgz"; - sha256 = "1qk22mxmq2wxj9hc27cn51bwia9llzlxfmhl04l7kvqv9ki4z0j2"; - system = "cl-pdf"; - asd = "cl-pdf"; - }); - systems = [ "cl-pdf" ]; - lispLibs = [ (getAttr "iterate" pkgs) (getAttr "uiop" pkgs) (getAttr "zpb-ttf" pkgs) ]; - }; - cl-pdf-doc = { - pname = "cl-pdf-doc"; - version = "20210531-git"; - asds = [ "cl-pdf-doc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz"; - sha256 = "0fcs5mq0gxfczbrg7ay8r4bf5r4g6blvpdbjkhcl8dapcikyn35h"; - system = "cl-pdf-doc"; - asd = "cl-pdf-doc"; - }); - systems = [ "cl-pdf-doc" ]; - lispLibs = [ (getAttr "cl-pdf" pkgs) (getAttr "cl-typesetting" pkgs) ]; - }; - cl-pdf-parser = { - pname = "cl-pdf-parser"; - version = "20221106-git"; - asds = [ "cl-pdf-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pdf/2022-11-06/cl-pdf-20221106-git.tgz"; - sha256 = "1qk22mxmq2wxj9hc27cn51bwia9llzlxfmhl04l7kvqv9ki4z0j2"; - system = "cl-pdf-parser"; - asd = "cl-pdf-parser"; - }); - systems = [ "cl-pdf-parser" ]; - lispLibs = [ (getAttr "cl-pdf" pkgs) ]; - }; - cl-performance-tuning-helper = { - pname = "cl-performance-tuning-helper"; - version = "20130615-git"; - asds = [ "cl-performance-tuning-helper" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-performance-tuning-helper/2013-06-15/cl-performance-tuning-helper-20130615-git.tgz"; - sha256 = "1j0k319il271grm6hjqq2bazp5l105lazayqsmpsy8lsy4lmy0c3"; - system = "cl-performance-tuning-helper"; - asd = "cl-performance-tuning-helper"; - }); - systems = [ "cl-performance-tuning-helper" ]; - lispLibs = [ ]; - }; - cl-performance-tuning-helper-test = { - pname = "cl-performance-tuning-helper-test"; - version = "20130615-git"; - asds = [ "cl-performance-tuning-helper-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-performance-tuning-helper/2013-06-15/cl-performance-tuning-helper-20130615-git.tgz"; - sha256 = "1j0k319il271grm6hjqq2bazp5l105lazayqsmpsy8lsy4lmy0c3"; - system = "cl-performance-tuning-helper-test"; - asd = "cl-performance-tuning-helper-test"; - }); - systems = [ "cl-performance-tuning-helper-test" ]; - lispLibs = [ (getAttr "cl-performance-tuning-helper" pkgs) (getAttr "rt" pkgs) ]; - }; - cl-permutation = { - pname = "cl-permutation"; - version = "20211209-git"; - asds = [ "cl-permutation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-permutation/2021-12-09/cl-permutation-20211209-git.tgz"; - sha256 = "0i932g0k50y24hxizni6zfya4kcw77yk3b0llivm9g50s7fxj9dk"; - system = "cl-permutation"; - asd = "cl-permutation"; - }); - systems = [ "cl-permutation" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-fft" pkgs) (getAttr "cl-algebraic-data-type" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-permutation-examples = { - pname = "cl-permutation-examples"; - version = "20211209-git"; - asds = [ "cl-permutation-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-permutation/2021-12-09/cl-permutation-20211209-git.tgz"; - sha256 = "0i932g0k50y24hxizni6zfya4kcw77yk3b0llivm9g50s7fxj9dk"; - system = "cl-permutation-examples"; - asd = "cl-permutation-examples"; - }); - systems = [ "cl-permutation-examples" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-permutation" pkgs) ]; - }; - cl-permutation-tests = { - pname = "cl-permutation-tests"; - version = "20211209-git"; - asds = [ "cl-permutation-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-permutation/2021-12-09/cl-permutation-20211209-git.tgz"; - sha256 = "0i932g0k50y24hxizni6zfya4kcw77yk3b0llivm9g50s7fxj9dk"; - system = "cl-permutation-tests"; - asd = "cl-permutation-tests"; - }); - systems = [ "cl-permutation-tests" ]; - lispLibs = [ (getAttr "cl-permutation" pkgs) (getAttr "cl-permutation-examples" pkgs) (getAttr "fiasco" pkgs) ]; - }; - cl-photo = { - pname = "cl-photo"; - version = "20150923-git"; - asds = [ "cl-photo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-photo/2015-09-23/cl-photo-20150923-git.tgz"; - sha256 = "03rzsi1rqvlnw43z7kh5sy1h8gjxc5n0cfryfkkqnhym9q9186mj"; - system = "cl-photo"; - asd = "cl-photo"; - }); - systems = [ "cl-photo" ]; - lispLibs = [ (getAttr "kmrcl" pkgs) ]; - }; - cl-photo-tests = { - pname = "cl-photo-tests"; - version = "20150923-git"; - asds = [ "cl-photo-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-photo/2015-09-23/cl-photo-20150923-git.tgz"; - sha256 = "03rzsi1rqvlnw43z7kh5sy1h8gjxc5n0cfryfkkqnhym9q9186mj"; - system = "cl-photo-tests"; - asd = "cl-photo-tests"; - }); - systems = [ "cl-photo-tests" ]; - lispLibs = [ (getAttr "cl-photo" pkgs) (getAttr "rt" pkgs) ]; - }; - cl-plplot = { - pname = "cl-plplot"; - version = "20180228-git"; - asds = [ "cl-plplot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-plplot/2018-02-28/cl-plplot-20180228-git.tgz"; - sha256 = "0hfgq47ga2r764jfc3ywaz5ynnvp701fjhbw0s4j1mrw4gaf6y6w"; - system = "cl-plplot"; - asd = "cl-plplot"; - }); - systems = [ "cl-plplot" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-plumbing = { - pname = "cl-plumbing"; - version = "20181018-git"; - asds = [ "cl-plumbing" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-plumbing/2018-10-18/cl-plumbing-20181018-git.tgz"; - sha256 = "0bc4qqj0c4hghwx8jm3vg422c3i8livv3vvzfzi0gw79khaqdiyr"; - system = "cl-plumbing"; - asd = "cl-plumbing"; - }); - systems = [ "cl-plumbing" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "iterate" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - cl-plumbing-test = { - pname = "cl-plumbing-test"; - version = "20181018-git"; - asds = [ "cl-plumbing-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-plumbing/2018-10-18/cl-plumbing-20181018-git.tgz"; - sha256 = "0bc4qqj0c4hghwx8jm3vg422c3i8livv3vvzfzi0gw79khaqdiyr"; - system = "cl-plumbing-test"; - asd = "cl-plumbing-test"; - }); - systems = [ "cl-plumbing-test" ]; - lispLibs = [ (getAttr "cl-plumbing" pkgs) (getAttr "iterate" pkgs) (getAttr "stefil" pkgs) ]; - }; - cl-plus-c = { - pname = "cl-plus-c"; - version = "20221106-git"; - asds = [ "cl-plus-c" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-autowrap/2022-11-06/cl-autowrap-20221106-git.tgz"; - sha256 = "0pbabpmg61bflx6kxllqvhbvxqwjsik3nnynqdhgzzkgzk6jlixv"; - system = "cl-plus-c"; - asd = "cl-plus-c"; - }); - systems = [ "cl-plus-c" ]; - lispLibs = [ (getAttr "cl-autowrap" pkgs) ]; - }; - cl-ply = { - pname = "cl-ply"; - version = "20150505-git"; - asds = [ "cl-ply" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ply/2015-05-05/cl-ply-20150505-git.tgz"; - sha256 = "1va3il5ahvziwm6i3f2zy3vchv0qkh1l7jci7gnfam43gf88fl12"; - system = "cl-ply"; - asd = "cl-ply"; - }); - systems = [ "cl-ply" ]; - lispLibs = [ (getAttr "cl-pattern" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - cl-ply-test = { - pname = "cl-ply-test"; - version = "20150505-git"; - asds = [ "cl-ply-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ply/2015-05-05/cl-ply-20150505-git.tgz"; - sha256 = "1va3il5ahvziwm6i3f2zy3vchv0qkh1l7jci7gnfam43gf88fl12"; - system = "cl-ply-test"; - asd = "cl-ply-test"; - }); - systems = [ "cl-ply-test" ]; - lispLibs = [ (getAttr "cl-ply" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-poker-eval = { - pname = "cl-poker-eval"; - version = "20150804-git"; - asds = [ "cl-poker-eval" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-poker-eval/2015-08-04/cl-poker-eval-20150804-git.tgz"; - sha256 = "1w4dsr4j7r3n7p0jbp8ccwwk83wcjjiz1rhhfrqpsd9v263v7kw8"; - system = "cl-poker-eval"; - asd = "cl-poker-eval"; - }); - systems = [ "cl-poker-eval" ]; - lispLibs = [ ]; - }; - cl-pop = { - pname = "cl-pop"; - version = "20110418-http"; - asds = [ "cl-pop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pop/2011-04-18/cl-pop-20110418-http.tgz"; - sha256 = "1g47p9w2pzf7glx92cz859di9pz454xpaq97p76lcvyilxk6q819"; - system = "cl-pop"; - asd = "cl-pop"; - }); - systems = [ "cl-pop" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-portaudio = { - pname = "cl-portaudio"; - version = "20201220-git"; - asds = [ "cl-portaudio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-portaudio/2020-12-20/cl-portaudio-20201220-git.tgz"; - sha256 = "177c6bgf30caj5qpzfnzhbamax7c5zm2p4911mw7fay94vjs7zyb"; - system = "cl-portaudio"; - asd = "cl-portaudio"; - }); - systems = [ "cl-portaudio" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "ffa" pkgs) ]; - }; - cl-portaudio_slash_doc = { - pname = "cl-portaudio_doc"; - version = "20201220-git"; - asds = [ "cl-portaudio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-portaudio/2020-12-20/cl-portaudio-20201220-git.tgz"; - sha256 = "177c6bgf30caj5qpzfnzhbamax7c5zm2p4911mw7fay94vjs7zyb"; - system = "cl-portaudio"; - asd = "cl-portaudio"; - }); - systems = [ "cl-portaudio/doc" ]; - lispLibs = [ (getAttr "atdoc" pkgs) (getAttr "cl-portaudio" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-portaudio_slash_tests = { - pname = "cl-portaudio_tests"; - version = "20201220-git"; - asds = [ "cl-portaudio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-portaudio/2020-12-20/cl-portaudio-20201220-git.tgz"; - sha256 = "177c6bgf30caj5qpzfnzhbamax7c5zm2p4911mw7fay94vjs7zyb"; - system = "cl-portaudio"; - asd = "cl-portaudio"; - }); - systems = [ "cl-portaudio/tests" ]; - lispLibs = [ (getAttr "cl-portaudio" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-postgres = { - pname = "cl-postgres"; - version = "20221106-git"; - asds = [ "cl-postgres" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2022-11-06/postmodern-20221106-git.tgz"; - sha256 = "012ipwi4m5x6jhl7pd9gwvdga5hgp1l08vqdgd28rzy34s2mfv74"; - system = "cl-postgres"; - asd = "cl-postgres"; - }); - systems = [ "cl-postgres" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "ironclad" pkgs) (getAttr "md5" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uax-15" pkgs) ]; - }; - cl-postgres_plus_local-time = { - pname = "cl-postgres+local-time"; - version = "20220707-git"; - asds = [ "cl-postgres+local-time" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/local-time/2022-07-07/local-time-20220707-git.tgz"; - sha256 = "0191fxlvzi3asx145bpdgd325s6wx2gqm5ssa4f72l0smr5av671"; - system = "cl-postgres+local-time"; - asd = "cl-postgres+local-time"; - }); - systems = [ "cl-postgres+local-time" ]; - lispLibs = [ (getAttr "local-time" pkgs) (getAttr "cl-postgres" pkgs) ]; - }; - cl-postgres_plus_local-time-duration = { - pname = "cl-postgres+local-time-duration"; - version = "20180430-git"; - asds = [ "cl-postgres+local-time-duration" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/local-time-duration/2018-04-30/local-time-duration-20180430-git.tgz"; - sha256 = "0f13mg18lv31lclz9jvqyj8d85p1jj1366nlld8m3dxnnwsbbkd6"; - system = "cl-postgres+local-time-duration"; - asd = "cl-postgres+local-time-duration"; - }); - systems = [ "cl-postgres+local-time-duration" ]; - lispLibs = [ (getAttr "local-time-duration" pkgs) (getAttr "cl-postgres" pkgs) ]; - }; - cl-postgres-datetime = { - pname = "cl-postgres-datetime"; - version = "20190521-git"; - asds = [ "cl-postgres-datetime" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-postgres-datetime/2019-05-21/cl-postgres-datetime-20190521-git.tgz"; - sha256 = "1vwv5j1i968927j070bagqx9i114a8phmx7k9ankj9j5zg5dj0l3"; - system = "cl-postgres-datetime"; - asd = "cl-postgres-datetime"; - }); - systems = [ "cl-postgres-datetime" ]; - lispLibs = [ (getAttr "local-time" pkgs) (getAttr "cl-postgres" pkgs) (getAttr "simple-date" pkgs) ]; - }; - cl-postgres-plus-uuid = { - pname = "cl-postgres-plus-uuid"; - version = "20181018-git"; - asds = [ "cl-postgres-plus-uuid" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-postgres-plus-uuid/2018-10-18/cl-postgres-plus-uuid-20181018-git.tgz"; - sha256 = "1iw11v67gpwgpa5dw3d7chjmkc4d7sdwrqvnx0vg0m2qf4j7azmi"; - system = "cl-postgres-plus-uuid"; - asd = "cl-postgres-plus-uuid"; - }); - systems = [ "cl-postgres-plus-uuid" ]; - lispLibs = [ (getAttr "cl-postgres" pkgs) (getAttr "uuid" pkgs) ]; - }; - cl-postgres_slash_simple-date-tests = { - pname = "cl-postgres_simple-date-tests"; - version = "20221106-git"; - asds = [ "cl-postgres" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2022-11-06/postmodern-20221106-git.tgz"; - sha256 = "012ipwi4m5x6jhl7pd9gwvdga5hgp1l08vqdgd28rzy34s2mfv74"; - system = "cl-postgres"; - asd = "cl-postgres"; - }); - systems = [ "cl-postgres/simple-date-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "cl-postgres" pkgs) (getAttr "simple-date" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-postgres_slash_tests = { - pname = "cl-postgres_tests"; - version = "20221106-git"; - asds = [ "cl-postgres" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2022-11-06/postmodern-20221106-git.tgz"; - sha256 = "012ipwi4m5x6jhl7pd9gwvdga5hgp1l08vqdgd28rzy34s2mfv74"; - system = "cl-postgres"; - asd = "cl-postgres"; - }); - systems = [ "cl-postgres/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "cl-postgres" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-ppcre = { - pname = "cl-ppcre"; - version = "20220220-git"; - asds = [ "cl-ppcre" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ppcre/2022-02-20/cl-ppcre-20220220-git.tgz"; - sha256 = "13z548s88xrz2nscq91w3i33ymxacgq3zl62i8d31hqmwr4s45zb"; - system = "cl-ppcre"; - asd = "cl-ppcre"; - }); - systems = [ "cl-ppcre" ]; - lispLibs = [ ]; - }; - cl-ppcre-template = { - pname = "cl-ppcre-template"; - version = "20211230-git"; - asds = [ "cl-ppcre-template" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unification/2021-12-30/cl-unification-20211230-git.tgz"; - sha256 = "1k4ngdn1qycjakwl66kvxk6kjxhkamzq3yfq4qlpc0kd15p7d2xn"; - system = "cl-ppcre-template"; - asd = "cl-ppcre-template"; - }); - systems = [ "cl-ppcre-template" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-unification" pkgs) ]; - }; - cl-ppcre-unicode = { - pname = "cl-ppcre-unicode"; - version = "20220220-git"; - asds = [ "cl-ppcre-unicode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ppcre/2022-02-20/cl-ppcre-20220220-git.tgz"; - sha256 = "13z548s88xrz2nscq91w3i33ymxacgq3zl62i8d31hqmwr4s45zb"; - system = "cl-ppcre-unicode"; - asd = "cl-ppcre-unicode"; - }); - systems = [ "cl-ppcre-unicode" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-unicode" pkgs) ]; - }; - cl-ppcre-unicode_slash_test = { - pname = "cl-ppcre-unicode_test"; - version = "20220220-git"; - asds = [ "cl-ppcre-unicode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ppcre/2022-02-20/cl-ppcre-20220220-git.tgz"; - sha256 = "13z548s88xrz2nscq91w3i33ymxacgq3zl62i8d31hqmwr4s45zb"; - system = "cl-ppcre-unicode"; - asd = "cl-ppcre-unicode"; - }); - systems = [ "cl-ppcre-unicode/test" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-ppcre-unicode" pkgs) (getAttr "flexi-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-ppcre_slash_test = { - pname = "cl-ppcre_test"; - version = "20220220-git"; - asds = [ "cl-ppcre" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ppcre/2022-02-20/cl-ppcre-20220220-git.tgz"; - sha256 = "13z548s88xrz2nscq91w3i33ymxacgq3zl62i8d31hqmwr4s45zb"; - system = "cl-ppcre"; - asd = "cl-ppcre"; - }); - systems = [ "cl-ppcre/test" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-prevalence = { - pname = "cl-prevalence"; - version = "20210531-git"; - asds = [ "cl-prevalence" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prevalence/2021-05-31/cl-prevalence-20210531-git.tgz"; - sha256 = "04bxhbrqgvpjhfffrfkl1x0m975qhnfsvqbankd7p70afw25ris7"; - system = "cl-prevalence"; - asd = "cl-prevalence"; - }); - systems = [ "cl-prevalence" ]; - lispLibs = [ (getAttr "s-sysdeps" pkgs) (getAttr "s-xml" pkgs) ]; - }; - cl-prevalence-test = { - pname = "cl-prevalence-test"; - version = "20210531-git"; - asds = [ "cl-prevalence-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prevalence/2021-05-31/cl-prevalence-20210531-git.tgz"; - sha256 = "04bxhbrqgvpjhfffrfkl1x0m975qhnfsvqbankd7p70afw25ris7"; - system = "cl-prevalence-test"; - asd = "cl-prevalence-test"; - }); - systems = [ "cl-prevalence-test" ]; - lispLibs = [ (getAttr "cl-prevalence" pkgs) (getAttr "find-port" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-primality = { - pname = "cl-primality"; - version = "20150608-git"; - asds = [ "cl-primality" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-primality/2015-06-08/cl-primality-20150608-git.tgz"; - sha256 = "1hvbsd5x7yrrrh7jjq0p8ign3ppzzpacmmz7nps60wgk38q1b618"; - system = "cl-primality"; - asd = "cl-primality"; - }); - systems = [ "cl-primality" ]; - lispLibs = [ (getAttr "iterate" pkgs) ]; - }; - cl-primality-test = { - pname = "cl-primality-test"; - version = "20150608-git"; - asds = [ "cl-primality-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-primality/2015-06-08/cl-primality-20150608-git.tgz"; - sha256 = "1hvbsd5x7yrrrh7jjq0p8ign3ppzzpacmmz7nps60wgk38q1b618"; - system = "cl-primality-test"; - asd = "cl-primality-test"; - }); - systems = [ "cl-primality-test" ]; - lispLibs = [ (getAttr "cl-primality" pkgs) (getAttr "iterate" pkgs) (getAttr "stefil" pkgs) ]; - }; - cl-prime-maker = { - pname = "cl-prime-maker"; - version = "20150302-git"; - asds = [ "cl-prime-maker" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prime-maker/2015-03-02/cl-prime-maker-20150302-git.tgz"; - sha256 = "0hs95zs990aiwspss2dzmjvl18ipvlkx3p9cgmcncqxhgkizds9s"; - system = "cl-prime-maker"; - asd = "cl-prime-maker"; - }); - systems = [ "cl-prime-maker" ]; - lispLibs = [ ]; - }; - cl-progress-bar = { - pname = "cl-progress-bar"; - version = "20211209-git"; - asds = [ "cl-progress-bar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-progress-bar/2021-12-09/cl-progress-bar-20211209-git.tgz"; - sha256 = "1y4kg4qb4bxkqnc84mczx5fhqlr6qbagxwsn93xrilv8lqg8ymiv"; - system = "cl-progress-bar"; - asd = "cl-progress-bar"; - }); - systems = [ "cl-progress-bar" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "documentation-utils-extensions" pkgs) ]; - }; - cl-project = { - pname = "cl-project"; - version = "20200715-git"; - asds = [ "cl-project" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz"; - sha256 = "1rmh6s1ncv8s2yrr14ja9wisgg745sq6xibqwb341ikdicxdp26y"; - system = "cl-project"; - asd = "cl-project"; - }); - systems = [ "cl-project" ]; - lispLibs = [ (getAttr "cl-emb" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "local-time" pkgs) (getAttr "prove" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-project-test = { - pname = "cl-project-test"; - version = "20200715-git"; - asds = [ "cl-project-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz"; - sha256 = "1rmh6s1ncv8s2yrr14ja9wisgg745sq6xibqwb341ikdicxdp26y"; - system = "cl-project-test"; - asd = "cl-project-test"; - }); - systems = [ "cl-project-test" ]; - lispLibs = [ (getAttr "caveman2" pkgs) (getAttr "cl-project" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-prolog2 = { - pname = "cl-prolog2"; - version = "20211209-git"; - asds = [ "cl-prolog2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; - sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; - system = "cl-prolog2"; - asd = "cl-prolog2"; - }); - systems = [ "cl-prolog2" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "external-program" pkgs) (getAttr "trivia" pkgs) (getAttr "trivia_dot_quasiquote" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-prolog2_dot_bprolog = { - pname = "cl-prolog2.bprolog"; - version = "20211209-git"; - asds = [ "cl-prolog2.bprolog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; - sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; - system = "cl-prolog2.bprolog"; - asd = "cl-prolog2.bprolog"; - }); - systems = [ "cl-prolog2.bprolog" ]; - lispLibs = [ (getAttr "cl-prolog2" pkgs) ]; - }; - cl-prolog2_dot_bprolog_dot_test = { - pname = "cl-prolog2.bprolog.test"; - version = "20211209-git"; - asds = [ "cl-prolog2.bprolog.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; - sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; - system = "cl-prolog2.bprolog.test"; - asd = "cl-prolog2.bprolog.test"; - }); - systems = [ "cl-prolog2.bprolog.test" ]; - lispLibs = [ (getAttr "cl-prolog2_dot_bprolog" pkgs) (getAttr "cl-prolog2_dot_test" pkgs) ]; - }; - cl-prolog2_dot_gprolog = { - pname = "cl-prolog2.gprolog"; - version = "20211209-git"; - asds = [ "cl-prolog2.gprolog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; - sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; - system = "cl-prolog2.gprolog"; - asd = "cl-prolog2.gprolog"; - }); - systems = [ "cl-prolog2.gprolog" ]; - lispLibs = [ (getAttr "cl-prolog2" pkgs) ]; - }; - cl-prolog2_dot_gprolog_dot_test = { - pname = "cl-prolog2.gprolog.test"; - version = "20211209-git"; - asds = [ "cl-prolog2.gprolog.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; - sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; - system = "cl-prolog2.gprolog.test"; - asd = "cl-prolog2.gprolog.test"; - }); - systems = [ "cl-prolog2.gprolog.test" ]; - lispLibs = [ (getAttr "cl-prolog2_dot_gprolog" pkgs) (getAttr "cl-prolog2_dot_test" pkgs) ]; - }; - cl-prolog2_dot_swi = { - pname = "cl-prolog2.swi"; - version = "20211209-git"; - asds = [ "cl-prolog2.swi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; - sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; - system = "cl-prolog2.swi"; - asd = "cl-prolog2.swi"; - }); - systems = [ "cl-prolog2.swi" ]; - lispLibs = [ (getAttr "cl-prolog2" pkgs) ]; - }; - cl-prolog2_dot_swi_dot_test = { - pname = "cl-prolog2.swi.test"; - version = "20211209-git"; - asds = [ "cl-prolog2.swi.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; - sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; - system = "cl-prolog2.swi.test"; - asd = "cl-prolog2.swi.test"; - }); - systems = [ "cl-prolog2.swi.test" ]; - lispLibs = [ (getAttr "cl-prolog2_dot_swi" pkgs) (getAttr "cl-prolog2_dot_test" pkgs) ]; - }; - cl-prolog2_dot_test = { - pname = "cl-prolog2.test"; - version = "20211209-git"; - asds = [ "cl-prolog2.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; - sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; - system = "cl-prolog2.test"; - asd = "cl-prolog2.test"; - }); - systems = [ "cl-prolog2.test" ]; - lispLibs = [ (getAttr "cl-prolog2" pkgs) (getAttr "fiveam" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-prolog2_dot_xsb = { - pname = "cl-prolog2.xsb"; - version = "20211209-git"; - asds = [ "cl-prolog2.xsb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; - sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; - system = "cl-prolog2.xsb"; - asd = "cl-prolog2.xsb"; - }); - systems = [ "cl-prolog2.xsb" ]; - lispLibs = [ (getAttr "cl-prolog2" pkgs) ]; - }; - cl-prolog2_dot_xsb_dot_test = { - pname = "cl-prolog2.xsb.test"; - version = "20211209-git"; - asds = [ "cl-prolog2.xsb.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; - sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; - system = "cl-prolog2.xsb.test"; - asd = "cl-prolog2.xsb.test"; - }); - systems = [ "cl-prolog2.xsb.test" ]; - lispLibs = [ (getAttr "cl-prolog2_dot_test" pkgs) (getAttr "cl-prolog2_dot_xsb" pkgs) ]; - }; - cl-prolog2_dot_yap = { - pname = "cl-prolog2.yap"; - version = "20211209-git"; - asds = [ "cl-prolog2.yap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; - sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; - system = "cl-prolog2.yap"; - asd = "cl-prolog2.yap"; - }); - systems = [ "cl-prolog2.yap" ]; - lispLibs = [ (getAttr "cl-prolog2" pkgs) ]; - }; - cl-prolog2_dot_yap_dot_test = { - pname = "cl-prolog2.yap.test"; - version = "20211209-git"; - asds = [ "cl-prolog2.yap.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-prolog2/2021-12-09/cl-prolog2-20211209-git.tgz"; - sha256 = "15xa1i2r72ll6zfhq6gkv0h36kifqjvbsmnycd145vgd0dvh5pgg"; - system = "cl-prolog2.yap.test"; - asd = "cl-prolog2.yap.test"; - }); - systems = [ "cl-prolog2.yap.test" ]; - lispLibs = [ (getAttr "cl-prolog2_dot_test" pkgs) (getAttr "cl-prolog2_dot_yap" pkgs) ]; - }; - cl-protobufs = { - pname = "cl-protobufs"; - version = "20221106-git"; - asds = [ "cl-protobufs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-protobufs/2022-11-06/cl-protobufs-20221106-git.tgz"; - sha256 = "1nlxhz0xisfi8jdhh393ds2asjid4rwjddrbhyijbadaj9gl9jkf"; - system = "cl-protobufs"; - asd = "cl-protobufs"; - }); - systems = [ "cl-protobufs" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-protobufs_dot_asdf" pkgs) (getAttr "closer-mop" pkgs) (getAttr "local-time" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-protobufs_dot_asdf = { - pname = "cl-protobufs.asdf"; - version = "20221106-git"; - asds = [ "cl-protobufs.asdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-protobufs/2022-11-06/cl-protobufs-20221106-git.tgz"; - sha256 = "1nlxhz0xisfi8jdhh393ds2asjid4rwjddrbhyijbadaj9gl9jkf"; - system = "cl-protobufs.asdf"; - asd = "cl-protobufs.asdf"; - }); - systems = [ "cl-protobufs.asdf" ]; - lispLibs = [ ]; - }; - cl-protobufs_slash_tests = { - pname = "cl-protobufs_tests"; - version = "20221106-git"; - asds = [ "cl-protobufs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-protobufs/2022-11-06/cl-protobufs-20221106-git.tgz"; - sha256 = "1nlxhz0xisfi8jdhh393ds2asjid4rwjddrbhyijbadaj9gl9jkf"; - system = "cl-protobufs"; - asd = "cl-protobufs"; - }); - systems = [ "cl-protobufs/tests" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-protobufs" pkgs) (getAttr "cl-protobufs_dot_asdf" pkgs) (getAttr "clunit2" pkgs) (getAttr "trivial-benchmark" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-pslib = { - pname = "cl-pslib"; - version = "20201016-git"; - asds = [ "cl-pslib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pslib/2020-10-16/cl-pslib-20201016-git.tgz"; - sha256 = "1l3ig57lrqdbm3kd9kbch3y3az8kryc9bqn896vz3a3w3rnwcv5a"; - system = "cl-pslib"; - asd = "cl-pslib"; - }); - systems = [ "cl-pslib" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-colors2" pkgs) (getAttr "cl-ppcre-unicode" pkgs) ]; - }; - cl-pslib-barcode = { - pname = "cl-pslib-barcode"; - version = "20200218-git"; - asds = [ "cl-pslib-barcode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pslib-barcode/2020-02-18/cl-pslib-barcode-20200218-git.tgz"; - sha256 = "10hmvjx03m54xyrjdw92kfpcvch0by0c8lwj899rbgxwfjsbwc49"; - system = "cl-pslib-barcode"; - asd = "cl-pslib-barcode"; - }); - systems = [ "cl-pslib-barcode" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-colors2" pkgs) (getAttr "cl-ppcre-unicode" pkgs) (getAttr "cl-pslib" pkgs) ]; - }; - cl-punch = { - pname = "cl-punch"; - version = "20190107-git"; - asds = [ "cl-punch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-punch/2019-01-07/cl-punch-20190107-git.tgz"; - sha256 = "1sjgwn6c77n8pgs0rrw70xfl18rps6a0dlf2chfsbgk8shz6qyl2"; - system = "cl-punch"; - asd = "cl-punch"; - }); - systems = [ "cl-punch" ]; - lispLibs = [ (getAttr "cl-syntax" pkgs) ]; - }; - cl-punch-test = { - pname = "cl-punch-test"; - version = "20190107-git"; - asds = [ "cl-punch-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-punch/2019-01-07/cl-punch-20190107-git.tgz"; - sha256 = "1sjgwn6c77n8pgs0rrw70xfl18rps6a0dlf2chfsbgk8shz6qyl2"; - system = "cl-punch-test"; - asd = "cl-punch-test"; - }); - systems = [ "cl-punch-test" ]; - lispLibs = [ (getAttr "cl-punch" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-qprint = { - pname = "cl-qprint"; - version = "20150804-git"; - asds = [ "cl-qprint" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz"; - sha256 = "099h0rrdzxnlmn8avi72mg2dl0kccp7w01b2p9nwyy4b8yr32cir"; - system = "cl-qprint"; - asd = "cl-qprint"; - }); - systems = [ "cl-qprint" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) ]; - }; - cl-qrencode = { - pname = "cl-qrencode"; - version = "20191007-git"; - asds = [ "cl-qrencode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-qrencode/2019-10-07/cl-qrencode-20191007-git.tgz"; - sha256 = "1l5k131dchbf6cj8a8xqa731790p01p3qa1kdy2wa9dawy3ymkxr"; - system = "cl-qrencode"; - asd = "cl-qrencode"; - }); - systems = [ "cl-qrencode" ]; - lispLibs = [ (getAttr "zpng" pkgs) ]; - }; - cl-qrencode-test = { - pname = "cl-qrencode-test"; - version = "20191007-git"; - asds = [ "cl-qrencode-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-qrencode/2019-10-07/cl-qrencode-20191007-git.tgz"; - sha256 = "1l5k131dchbf6cj8a8xqa731790p01p3qa1kdy2wa9dawy3ymkxr"; - system = "cl-qrencode-test"; - asd = "cl-qrencode-test"; - }); - systems = [ "cl-qrencode-test" ]; - lispLibs = [ (getAttr "cl-qrencode" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - cl-quickcheck = { - pname = "cl-quickcheck"; - version = "20200610-git"; - asds = [ "cl-quickcheck" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-quickcheck/2020-06-10/cl-quickcheck-20200610-git.tgz"; - sha256 = "0cfyxbdhklvdk3qdzyxxaq9q6cxnsvqjfi86nay1vc7h6ziysb60"; - system = "cl-quickcheck"; - asd = "cl-quickcheck"; - }); - systems = [ "cl-quickcheck" ]; - lispLibs = [ ]; - }; - cl-quil = { - pname = "cl-quil"; - version = "v1.26.0"; - asds = [ "cl-quil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2021-12-09/quilc-v1.26.0.tgz"; - sha256 = "09qp2d6xgq4cmg6nfsdz0gbs3rvz3ln0kawmry6cls14lxnljjrr"; - system = "cl-quil"; - asd = "cl-quil"; - }); - systems = [ "cl-quil" ]; - lispLibs = [ (getAttr "alexa" pkgs) (getAttr "alexandria" pkgs) (getAttr "abstract-classes" pkgs) (getAttr "singleton-classes" pkgs) (getAttr "cl-algebraic-data-type" pkgs) (getAttr "cl-grnm" pkgs) (getAttr "cl-heap" pkgs) (getAttr "cl-permutation" pkgs) (getAttr "yacc" pkgs) (getAttr "closer-mop" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "global-vars" pkgs) (getAttr "magicl" pkgs) (getAttr "optima" pkgs) (getAttr "parse-float" pkgs) (getAttr "queues_dot_priority-queue" pkgs) (getAttr "salza2" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "uiop" pkgs) (getAttr "yason" pkgs) ]; - }; - cl-quil-benchmarking = { - pname = "cl-quil-benchmarking"; - version = "v1.26.0"; - asds = [ "cl-quil-benchmarking" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2021-12-09/quilc-v1.26.0.tgz"; - sha256 = "09qp2d6xgq4cmg6nfsdz0gbs3rvz3ln0kawmry6cls14lxnljjrr"; - system = "cl-quil-benchmarking"; - asd = "cl-quil-benchmarking"; - }); - systems = [ "cl-quil-benchmarking" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "metering" pkgs) (getAttr "cl-quil" pkgs) (getAttr "qvm-app" pkgs) (getAttr "trivial-benchmark" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-quil-tests = { - pname = "cl-quil-tests"; - version = "v1.26.0"; - asds = [ "cl-quil-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2021-12-09/quilc-v1.26.0.tgz"; - sha256 = "09qp2d6xgq4cmg6nfsdz0gbs3rvz3ln0kawmry6cls14lxnljjrr"; - system = "cl-quil-tests"; - asd = "cl-quil-tests"; - }); - systems = [ "cl-quil-tests" ]; - lispLibs = [ (getAttr "alexa" pkgs) (getAttr "alexandria" pkgs) (getAttr "cl-permutation" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "yacc" pkgs) (getAttr "fiasco" pkgs) (getAttr "magicl" pkgs) (getAttr "cl-quil" pkgs) (getAttr "qvm" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-quil_slash_quilec = { - pname = "cl-quil_quilec"; - version = "v1.26.0"; - asds = [ "cl-quil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2021-12-09/quilc-v1.26.0.tgz"; - sha256 = "09qp2d6xgq4cmg6nfsdz0gbs3rvz3ln0kawmry6cls14lxnljjrr"; - system = "cl-quil"; - asd = "cl-quil"; - }); - systems = [ "cl-quil/quilec" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "magicl" pkgs) (getAttr "cl-quil" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-quil_slash_quilec-tests = { - pname = "cl-quil_quilec-tests"; - version = "v1.26.0"; - asds = [ "cl-quil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2021-12-09/quilc-v1.26.0.tgz"; - sha256 = "09qp2d6xgq4cmg6nfsdz0gbs3rvz3ln0kawmry6cls14lxnljjrr"; - system = "cl-quil"; - asd = "cl-quil"; - }); - systems = [ "cl-quil/quilec-tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiasco" pkgs) (getAttr "magicl" pkgs) (getAttr "cl-quil" pkgs) (getAttr "qvm" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-quil_slash_quilt = { - pname = "cl-quil_quilt"; - version = "v1.26.0"; - asds = [ "cl-quil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2021-12-09/quilc-v1.26.0.tgz"; - sha256 = "09qp2d6xgq4cmg6nfsdz0gbs3rvz3ln0kawmry6cls14lxnljjrr"; - system = "cl-quil"; - asd = "cl-quil"; - }); - systems = [ "cl-quil/quilt" ]; - lispLibs = [ (getAttr "cl-quil" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-quil_slash_quilt-tests = { - pname = "cl-quil_quilt-tests"; - version = "v1.26.0"; - asds = [ "cl-quil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2021-12-09/quilc-v1.26.0.tgz"; - sha256 = "09qp2d6xgq4cmg6nfsdz0gbs3rvz3ln0kawmry6cls14lxnljjrr"; - system = "cl-quil"; - asd = "cl-quil"; - }); - systems = [ "cl-quil/quilt-tests" ]; - lispLibs = [ (getAttr "cl-quil" pkgs) (getAttr "cl-quil-tests" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-quil_slash_tools = { - pname = "cl-quil_tools"; - version = "v1.26.0"; - asds = [ "cl-quil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2021-12-09/quilc-v1.26.0.tgz"; - sha256 = "09qp2d6xgq4cmg6nfsdz0gbs3rvz3ln0kawmry6cls14lxnljjrr"; - system = "cl-quil"; - asd = "cl-quil"; - }); - systems = [ "cl-quil/tools" ]; - lispLibs = [ (getAttr "common-lisp-jupyter" pkgs) (getAttr "cl-quil" pkgs) (getAttr "swank" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-quil_slash_tools-tests = { - pname = "cl-quil_tools-tests"; - version = "v1.26.0"; - asds = [ "cl-quil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2021-12-09/quilc-v1.26.0.tgz"; - sha256 = "09qp2d6xgq4cmg6nfsdz0gbs3rvz3ln0kawmry6cls14lxnljjrr"; - system = "cl-quil"; - asd = "cl-quil"; - }); - systems = [ "cl-quil/tools-tests" ]; - lispLibs = [ (getAttr "common-lisp-jupyter" pkgs) (getAttr "cl-quil" pkgs) (getAttr "cl-quil-tests" pkgs) (getAttr "swank" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-rabbit = { - pname = "cl-rabbit"; - version = "20210411-git"; - asds = [ "cl-rabbit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rabbit/2021-04-11/cl-rabbit-20210411-git.tgz"; - sha256 = "1q1mhqxqvxbr6ak7j0ym6mjhhq6r0pqk1l7az9hfajmqmw3xfija"; - system = "cl-rabbit"; - asd = "cl-rabbit"; - }); - systems = [ "cl-rabbit" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - cl-rabbit-tests = { - pname = "cl-rabbit-tests"; - version = "20210411-git"; - asds = [ "cl-rabbit-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rabbit/2021-04-11/cl-rabbit-20210411-git.tgz"; - sha256 = "1q1mhqxqvxbr6ak7j0ym6mjhhq6r0pqk1l7az9hfajmqmw3xfija"; - system = "cl-rabbit-tests"; - asd = "cl-rabbit-tests"; - }); - systems = [ "cl-rabbit-tests" ]; - lispLibs = [ (getAttr "cl-rabbit" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-randist = { - pname = "cl-randist"; - version = "20221106-git"; - asds = [ "cl-randist" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-randist/2022-11-06/cl-randist-20221106-git.tgz"; - sha256 = "1r0d76n5zjqg5fb2ypqx5i1wg4hsg5g0c126ylqb28wdaf2yjz5a"; - system = "cl-randist"; - asd = "cl-randist"; - }); - systems = [ "cl-randist" ]; - lispLibs = [ ]; - }; - cl-random = { - pname = "cl-random"; - version = "20180328-git"; - asds = [ "cl-random" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-random/2018-03-28/cl-random-20180328-git.tgz"; - sha256 = "0jn80xphyvyp2v72acr6b8a2f6dw06myr5vrjfl14brsvks7wr89"; - system = "cl-random"; - asd = "cl-random"; - }); - systems = [ "cl-random" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "array-operations" pkgs) (getAttr "cl-num-utils" pkgs) (getAttr "cl-rmath" pkgs) (getAttr "cl-slice" pkgs) (getAttr "gsll" pkgs) (getAttr "let-plus" pkgs) (getAttr "lla" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-random-forest = { - pname = "cl-random-forest"; - version = "20221106-git"; - asds = [ "cl-random-forest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-random-forest/2022-11-06/cl-random-forest-20221106-git.tgz"; - sha256 = "0jn5f3s1zvjql35c4m67lqc0vjr7sm7kzf8w4jfbfabcnxf3y6jx"; - system = "cl-random-forest"; - asd = "cl-random-forest"; - }); - systems = [ "cl-random-forest" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-libsvm-format" pkgs) (getAttr "cl-online-learning" pkgs) (getAttr "lparallel" pkgs) ]; - }; - cl-random-forest-test = { - pname = "cl-random-forest-test"; - version = "20221106-git"; - asds = [ "cl-random-forest-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-random-forest/2022-11-06/cl-random-forest-20221106-git.tgz"; - sha256 = "0jn5f3s1zvjql35c4m67lqc0vjr7sm7kzf8w4jfbfabcnxf3y6jx"; - system = "cl-random-forest-test"; - asd = "cl-random-forest-test"; - }); - systems = [ "cl-random-forest-test" ]; - lispLibs = [ (getAttr "cl-random-forest" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-random-tests = { - pname = "cl-random-tests"; - version = "20180328-git"; - asds = [ "cl-random-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-random/2018-03-28/cl-random-20180328-git.tgz"; - sha256 = "0jn80xphyvyp2v72acr6b8a2f6dw06myr5vrjfl14brsvks7wr89"; - system = "cl-random-tests"; - asd = "cl-random"; - }); - systems = [ "cl-random-tests" ]; - lispLibs = [ (getAttr "cl-random" pkgs) (getAttr "clunit" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-rdfxml = { - pname = "cl-rdfxml"; - version = "20140713-git"; - asds = [ "cl-rdfxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rdfxml/2014-07-13/cl-rdfxml-20140713-git.tgz"; - sha256 = "09v76qg6l3y1llapnkfqrfgib67h7lpkzrdmfimwk49bi80iii8v"; - system = "cl-rdfxml"; - asd = "cl-rdfxml"; - }); - systems = [ "cl-rdfxml" ]; - lispLibs = [ (getAttr "cxml" pkgs) (getAttr "puri" pkgs) ]; - }; - cl-rdkafka = { - pname = "cl-rdkafka"; - version = "20201220-git"; - asds = [ "cl-rdkafka" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rdkafka/2020-12-20/cl-rdkafka-20201220-git.tgz"; - sha256 = "1hqgxqn3qxs2kzr1c7rrg0ixk2sxv9796wmcjmbqlnld03nikk6f"; - system = "cl-rdkafka"; - asd = "cl-rdkafka"; - }); - systems = [ "cl-rdkafka" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "lparallel" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-rdkafka_slash_test = { - pname = "cl-rdkafka_test"; - version = "20201220-git"; - asds = [ "cl-rdkafka" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rdkafka/2020-12-20/cl-rdkafka-20201220-git.tgz"; - sha256 = "1hqgxqn3qxs2kzr1c7rrg0ixk2sxv9796wmcjmbqlnld03nikk6f"; - system = "cl-rdkafka"; - asd = "cl-rdkafka"; - }); - systems = [ "cl-rdkafka/test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "babel" pkgs) (getAttr "cl-rdkafka" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-readline = { - pname = "cl-readline"; - version = "20220707-git"; - asds = [ "cl-readline" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-readline/2022-07-07/cl-readline-20220707-git.tgz"; - sha256 = "0bxvfd7hmj9yvcar3f3kd1cxxx4pqzri6sa28bp9w9bm25g4ddhf"; - system = "cl-readline"; - asd = "cl-readline"; - }); - systems = [ "cl-readline" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) ]; - }; - cl-recaptcha = { - pname = "cl-recaptcha"; - version = "20150608-git"; - asds = [ "cl-recaptcha" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-recaptcha/2015-06-08/cl-recaptcha-20150608-git.tgz"; - sha256 = "09qdmzbhc5hikay31mbsfd7dps72rm4gcdbbi0b6gkb6qbia6m71"; - system = "cl-recaptcha"; - asd = "cl-recaptcha"; - }); - systems = [ "cl-recaptcha" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "jsown" pkgs) ]; - }; - cl-redis = { - pname = "cl-redis"; - version = "20200925-git"; - asds = [ "cl-redis" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-redis/2020-09-25/cl-redis-20200925-git.tgz"; - sha256 = "0x5ahxb5cx37biyn3cjycshhm1rr9p5cf1a9l5hd1n1xjxm2f8vi"; - system = "cl-redis"; - asd = "cl-redis"; - }); - systems = [ "cl-redis" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "rutils" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-redis-test = { - pname = "cl-redis-test"; - version = "20200925-git"; - asds = [ "cl-redis-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-redis/2020-09-25/cl-redis-20200925-git.tgz"; - sha256 = "0x5ahxb5cx37biyn3cjycshhm1rr9p5cf1a9l5hd1n1xjxm2f8vi"; - system = "cl-redis-test"; - asd = "cl-redis"; - }); - systems = [ "cl-redis-test" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-redis" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "should-test" pkgs) ]; - }; - cl-reexport = { - pname = "cl-reexport"; - version = "20210228-git"; - asds = [ "cl-reexport" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz"; - sha256 = "02la6z3ickhmh2m87ymm2ijh9nkn7l6slskj99l8a1rhps394qqc"; - system = "cl-reexport"; - asd = "cl-reexport"; - }); - systems = [ "cl-reexport" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-reexport-test = { - pname = "cl-reexport-test"; - version = "20210228-git"; - asds = [ "cl-reexport-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz"; - sha256 = "02la6z3ickhmh2m87ymm2ijh9nkn7l6slskj99l8a1rhps394qqc"; - system = "cl-reexport-test"; - asd = "cl-reexport-test"; - }); - systems = [ "cl-reexport-test" ]; - lispLibs = [ (getAttr "cl-reexport" pkgs) (getAttr "prove" pkgs) ]; - }; - cl-renderdoc = { - pname = "cl-renderdoc"; - version = "20200925-git"; - asds = [ "cl-renderdoc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-renderdoc/2020-09-25/cl-renderdoc-20200925-git.tgz"; - sha256 = "0rrcp4y1f07x8h0ikvf5ncc3pbqj6vaciblab9qghmgdglnn7akx"; - system = "cl-renderdoc"; - asd = "cl-renderdoc"; - }); - systems = [ "cl-renderdoc" ]; - lispLibs = [ (getAttr "cl-autowrap" pkgs) ]; - }; - cl-replica = { - pname = "cl-replica"; - version = "20221106-git"; - asds = [ "cl-replica" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-replica/2022-11-06/cl-replica-20221106-git.tgz"; - sha256 = "1kp50xw1v0kfa8g4g2vmg5rfhpyr9phqk0rs4s36f6nwfpsasw7w"; - system = "cl-replica"; - asd = "cl-replica"; - }); - systems = [ "cl-replica" ]; - lispLibs = [ ]; - }; - cl-replica_slash_test = { - pname = "cl-replica_test"; - version = "20221106-git"; - asds = [ "cl-replica" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-replica/2022-11-06/cl-replica-20221106-git.tgz"; - sha256 = "1kp50xw1v0kfa8g4g2vmg5rfhpyr9phqk0rs4s36f6nwfpsasw7w"; - system = "cl-replica"; - asd = "cl-replica"; - }); - systems = [ "cl-replica/test" ]; - lispLibs = [ (getAttr "cl-replica" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-rethinkdb = { - pname = "cl-rethinkdb"; - version = "20160825-git"; - asds = [ "cl-rethinkdb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rethinkdb/2016-08-25/cl-rethinkdb-20160825-git.tgz"; - sha256 = "0sps1p203gn7i123w96pj5ggpncmkngkfdb6zfnm5yjq544sjjf7"; - system = "cl-rethinkdb"; - asd = "cl-rethinkdb"; - }); - systems = [ "cl-rethinkdb" ]; - lispLibs = [ (getAttr "blackbird" pkgs) (getAttr "cl-async" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-hash-util" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "event-glue" pkgs) (getAttr "fast-io" pkgs) (getAttr "jonathan" pkgs) (getAttr "local-time" pkgs) (getAttr "vom" pkgs) ]; - }; - cl-rethinkdb-test = { - pname = "cl-rethinkdb-test"; - version = "20160825-git"; - asds = [ "cl-rethinkdb-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rethinkdb/2016-08-25/cl-rethinkdb-20160825-git.tgz"; - sha256 = "0sps1p203gn7i123w96pj5ggpncmkngkfdb6zfnm5yjq544sjjf7"; - system = "cl-rethinkdb-test"; - asd = "cl-rethinkdb-test"; - }); - systems = [ "cl-rethinkdb-test" ]; - lispLibs = [ (getAttr "blackbird" pkgs) (getAttr "cl-async" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-rethinkdb" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-rfc2047 = { - pname = "cl-rfc2047"; - version = "20150804-git"; - asds = [ "cl-rfc2047" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rfc2047/2015-08-04/cl-rfc2047-20150804-git.tgz"; - sha256 = "1kh48p5i7lmv1hcdsddlcjavhai9gi54jndnbpm9r55a6ladi8gv"; - system = "cl-rfc2047"; - asd = "cl-rfc2047"; - }); - systems = [ "cl-rfc2047" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-base64" pkgs) ]; - }; - cl-rfc2047-test = { - pname = "cl-rfc2047-test"; - version = "20150804-git"; - asds = [ "cl-rfc2047-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rfc2047/2015-08-04/cl-rfc2047-20150804-git.tgz"; - sha256 = "1kh48p5i7lmv1hcdsddlcjavhai9gi54jndnbpm9r55a6ladi8gv"; - system = "cl-rfc2047-test"; - asd = "cl-rfc2047-test"; - }); - systems = [ "cl-rfc2047-test" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-rfc2047" pkgs) (getAttr "lift" pkgs) ]; - }; - cl-rfc4251 = { - pname = "cl-rfc4251"; - version = "20210531-git"; - asds = [ "cl-rfc4251" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rfc4251/2021-05-31/cl-rfc4251-20210531-git.tgz"; - sha256 = "0n5aq88qnn19ng3av1h5npp2c43rl7zl8ccrz2rg0s2r57wvyjd3"; - system = "cl-rfc4251"; - asd = "cl-rfc4251"; - }); - systems = [ "cl-rfc4251" ]; - lispLibs = [ (getAttr "trivial-gray-streams" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-rfc4251_dot_test = { - pname = "cl-rfc4251.test"; - version = "20210531-git"; - asds = [ "cl-rfc4251.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rfc4251/2021-05-31/cl-rfc4251-20210531-git.tgz"; - sha256 = "0n5aq88qnn19ng3av1h5npp2c43rl7zl8ccrz2rg0s2r57wvyjd3"; - system = "cl-rfc4251.test"; - asd = "cl-rfc4251.test"; - }); - systems = [ "cl-rfc4251.test" ]; - lispLibs = [ (getAttr "cl-rfc4251" pkgs) (getAttr "rove" pkgs) ]; - }; - cl-riff = { - pname = "cl-riff"; - version = "20220707-git"; - asds = [ "cl-riff" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-riff/2022-07-07/cl-riff-20220707-git.tgz"; - sha256 = "0b2j6yw3xkv6611snn7cy56vmnjfgi58wyvfr9lx82xkakd9rw3z"; - system = "cl-riff"; - asd = "cl-riff"; - }); - systems = [ "cl-riff" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-rlimit = { - pname = "cl-rlimit"; - version = "20150608-git"; - asds = [ "cl-rlimit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rlimit/2015-06-08/cl-rlimit-20150608-git.tgz"; - sha256 = "19p02r380qhs76qlcb3jp4lm4nsnpy7zch01fdiwn7l7xgxkzxh0"; - system = "cl-rlimit"; - asd = "cl-rlimit"; - }); - systems = [ "cl-rlimit" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - cl-rmath = { - pname = "cl-rmath"; - version = "20180328-git"; - asds = [ "cl-rmath" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rmath/2018-03-28/cl-rmath-20180328-git.tgz"; - sha256 = "1ld8vbpy10paymx2hn0mcgd21i7cjhdrayln1jx0kayqxm12mmk4"; - system = "cl-rmath"; - asd = "cl-rmath"; - }); - systems = [ "cl-rmath" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-robdd = { - pname = "cl-robdd"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "cl-robdd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "cl-robdd"; - asd = "cl-robdd"; - }); - systems = [ "cl-robdd" ]; - lispLibs = [ (getAttr "adjuvant" pkgs) ]; - }; - cl-robdd-analysis = { - pname = "cl-robdd-analysis"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "cl-robdd-analysis" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "cl-robdd-analysis"; - asd = "cl-robdd-analysis"; - }); - systems = [ "cl-robdd-analysis" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "adjuvant" pkgs) (getAttr "cl-robdd" pkgs) ]; - }; - cl-robdd-analysis-test = { - pname = "cl-robdd-analysis-test"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "cl-robdd-analysis-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "cl-robdd-analysis-test"; - asd = "cl-robdd-analysis-test"; - }); - systems = [ "cl-robdd-analysis-test" ]; - lispLibs = [ (getAttr "adjuvant" pkgs) (getAttr "cl-robdd-analysis" pkgs) (getAttr "scrutiny" pkgs) ]; - }; - cl-robdd-test = { - pname = "cl-robdd-test"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "cl-robdd-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "cl-robdd-test"; - asd = "cl-robdd-test"; - }); - systems = [ "cl-robdd-test" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "adjuvant" pkgs) (getAttr "cl-robdd" pkgs) (getAttr "scrutiny" pkgs) ]; - }; - cl-rrd = { - pname = "cl-rrd"; - version = "20130128-git"; - asds = [ "cl-rrd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rrd/2013-01-28/cl-rrd-20130128-git.tgz"; - sha256 = "0a7fs46q41qzi6k8q9lvxryn2m90vamcsw7vl9kcjivyckjqrsm2"; - system = "cl-rrd"; - asd = "cl-rrd"; - }); - systems = [ "cl-rrd" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-rrt = { - pname = "cl-rrt"; - version = "20200925-git"; - asds = [ "cl-rrt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz"; - sha256 = "0lf1dvw5j9awy7ic1i4j5wd7657a170ywxihinmsdn4bwd4fynv0"; - system = "cl-rrt"; - asd = "cl-rrt"; - }); - systems = [ "cl-rrt" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-rrt_dot_benchmark = { - pname = "cl-rrt.benchmark"; - version = "20200925-git"; - asds = [ "cl-rrt.benchmark" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz"; - sha256 = "0lf1dvw5j9awy7ic1i4j5wd7657a170ywxihinmsdn4bwd4fynv0"; - system = "cl-rrt.benchmark"; - asd = "cl-rrt.benchmark"; - }); - systems = [ "cl-rrt.benchmark" ]; - lispLibs = [ (getAttr "cl-rrt" pkgs) (getAttr "cl-rrt_dot_rtree" pkgs) (getAttr "cl-rrt_dot_test" pkgs) (getAttr "fiveam" pkgs) (getAttr "vecto" pkgs) ]; - }; - cl-rrt_dot_rtree = { - pname = "cl-rrt.rtree"; - version = "20200925-git"; - asds = [ "cl-rrt.rtree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz"; - sha256 = "0lf1dvw5j9awy7ic1i4j5wd7657a170ywxihinmsdn4bwd4fynv0"; - system = "cl-rrt.rtree"; - asd = "cl-rrt.rtree"; - }); - systems = [ "cl-rrt.rtree" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "cl-rrt" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "iterate" pkgs) (getAttr "spatial-trees" pkgs) (getAttr "spatial-trees_dot_nns" pkgs) (getAttr "trivia" pkgs) ]; - }; - cl-rrt_dot_test = { - pname = "cl-rrt.test"; - version = "20200925-git"; - asds = [ "cl-rrt.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rrt/2020-09-25/cl-rrt-20200925-git.tgz"; - sha256 = "0lf1dvw5j9awy7ic1i4j5wd7657a170ywxihinmsdn4bwd4fynv0"; - system = "cl-rrt.test"; - asd = "cl-rrt.test"; - }); - systems = [ "cl-rrt.test" ]; - lispLibs = [ (getAttr "cl-rrt" pkgs) (getAttr "cl-rrt_dot_rtree" pkgs) (getAttr "fiveam" pkgs) (getAttr "vecto" pkgs) ]; - }; - cl-rsvg2 = { - pname = "cl-rsvg2"; - version = "20200925-git"; - asds = [ "cl-rsvg2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz"; - sha256 = "1amq4q27lj0nzffvwmqrkg8v9pdcf0281zzrvxl9w6vdm9qy1v3n"; - system = "cl-rsvg2"; - asd = "cl-rsvg2"; - }); - systems = [ "cl-rsvg2" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-cairo2" pkgs) (getAttr "cl-gtk2-glib" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - cl-rsvg2-pixbuf = { - pname = "cl-rsvg2-pixbuf"; - version = "20200925-git"; - asds = [ "cl-rsvg2-pixbuf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz"; - sha256 = "1amq4q27lj0nzffvwmqrkg8v9pdcf0281zzrvxl9w6vdm9qy1v3n"; - system = "cl-rsvg2-pixbuf"; - asd = "cl-rsvg2-pixbuf"; - }); - systems = [ "cl-rsvg2-pixbuf" ]; - lispLibs = [ (getAttr "cl-gtk2-gdk" pkgs) (getAttr "cl-rsvg2" pkgs) ]; - }; - cl-rsvg2-test = { - pname = "cl-rsvg2-test"; - version = "20200925-git"; - asds = [ "cl-rsvg2-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rsvg2/2020-09-25/cl-rsvg2-20200925-git.tgz"; - sha256 = "1amq4q27lj0nzffvwmqrkg8v9pdcf0281zzrvxl9w6vdm9qy1v3n"; - system = "cl-rsvg2-test"; - asd = "cl-rsvg2-test"; - }); - systems = [ "cl-rsvg2-test" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-rsvg2" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-rules = { - pname = "cl-rules"; - version = "20190710-git"; - asds = [ "cl-rules" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rules/2019-07-10/cl-rules-20190710-git.tgz"; - sha256 = "0jidck62n0jkfqwrpqjn43zmjb3jlfaxxhn2lsyfwy2740i8ppr1"; - system = "cl-rules"; - asd = "cl-rules"; - }); - systems = [ "cl-rules" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-yaml" pkgs) ]; - }; - cl-rules-test = { - pname = "cl-rules-test"; - version = "20190710-git"; - asds = [ "cl-rules-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rules/2019-07-10/cl-rules-20190710-git.tgz"; - sha256 = "0jidck62n0jkfqwrpqjn43zmjb3jlfaxxhn2lsyfwy2740i8ppr1"; - system = "cl-rules-test"; - asd = "cl-rules-test"; - }); - systems = [ "cl-rules-test" ]; - lispLibs = [ (getAttr "cl-rules" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-s3 = { - pname = "cl-s3"; - version = "20130128-git"; - asds = [ "cl-s3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-s3/2013-01-28/cl-s3-20130128-git.tgz"; - sha256 = "1lbvf7phkm5vjk013p484rh4vh33i58jlqq3z4cv2yxqcw6r639d"; - system = "cl-s3"; - asd = "cl-s3"; - }); - systems = [ "cl-s3" ]; - lispLibs = [ (getAttr "ironclad" pkgs) (getAttr "s-base64" pkgs) (getAttr "s-http-client" pkgs) (getAttr "s-utils" pkgs) (getAttr "s-xml" pkgs) ]; - }; - cl-sam = { - pname = "cl-sam"; - version = "20150608-git"; - asds = [ "cl-sam" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sam/2015-06-08/cl-sam-20150608-git.tgz"; - sha256 = "0frrxz70jin4sa5n087zm4ikckf1zdjqqpjq3llrv46753c62fc6"; - system = "cl-sam"; - asd = "cl-sam"; - }); - systems = [ "cl-sam" ]; - lispLibs = [ (getAttr "deoxybyte-gzip" pkgs) (getAttr "deoxybyte-systems" pkgs) (getAttr "deoxybyte-unix" pkgs) ]; - }; - cl-sam-test = { - pname = "cl-sam-test"; - version = "20150608-git"; - asds = [ "cl-sam-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sam/2015-06-08/cl-sam-20150608-git.tgz"; - sha256 = "0frrxz70jin4sa5n087zm4ikckf1zdjqqpjq3llrv46753c62fc6"; - system = "cl-sam-test"; - asd = "cl-sam-test"; - }); - systems = [ "cl-sam-test" ]; - lispLibs = [ (getAttr "cl-sam" pkgs) (getAttr "deoxybyte-io" pkgs) (getAttr "lift" pkgs) ]; - }; - cl-sandbox = { - pname = "cl-sandbox"; - version = "20180131-git"; - asds = [ "cl-sandbox" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sandbox/2018-01-31/cl-sandbox-20180131-git.tgz"; - sha256 = "053zxy3zi5jvlbg8zxlf922sxb32mq34zvwfhgpj4rcmgvgmqnxv"; - system = "cl-sandbox"; - asd = "cl-sandbox"; - }); - systems = [ "cl-sandbox" ]; - lispLibs = [ ]; - }; - cl-sandbox_slash_tests = { - pname = "cl-sandbox_tests"; - version = "20180131-git"; - asds = [ "cl-sandbox" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sandbox/2018-01-31/cl-sandbox-20180131-git.tgz"; - sha256 = "053zxy3zi5jvlbg8zxlf922sxb32mq34zvwfhgpj4rcmgvgmqnxv"; - system = "cl-sandbox"; - asd = "cl-sandbox"; - }); - systems = [ "cl-sandbox/tests" ]; - lispLibs = [ (getAttr "cl-sandbox" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-sasl = { - pname = "cl-sasl"; - version = "v0.3.2"; - asds = [ "cl-sasl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sasl/2019-05-21/cl-sasl-v0.3.2.tgz"; - sha256 = "0a05q8rls2hn46rbbk6w5km9kqvhsj365zlw6hp32724xy2nd98w"; - system = "cl-sasl"; - asd = "cl-sasl"; - }); - systems = [ "cl-sasl" ]; - lispLibs = [ (getAttr "ironclad" pkgs) ]; - }; - cl-sat = { - pname = "cl-sat"; - version = "20220707-git"; - asds = [ "cl-sat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat/2022-07-07/cl-sat-20220707-git.tgz"; - sha256 = "1fcvxpmja757vyyhcpb00g150dyx90jsg9z8s596vy1nb0z81f49"; - system = "cl-sat"; - asd = "cl-sat"; - }); - systems = [ "cl-sat" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - cl-sat_dot_glucose = { - pname = "cl-sat.glucose"; - version = "20220331-git"; - asds = [ "cl-sat.glucose" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat.glucose/2022-03-31/cl-sat.glucose-20220331-git.tgz"; - sha256 = "11hbhsjzw3xzz6i6niisk5h271kg52y3y77sl6ljnszfgp9xjfxy"; - system = "cl-sat.glucose"; - asd = "cl-sat.glucose"; - }); - systems = [ "cl-sat.glucose" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-sat" pkgs) (getAttr "iterate" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-package-manager" pkgs) ]; - }; - cl-sat_dot_glucose_dot_test = { - pname = "cl-sat.glucose.test"; - version = "20220331-git"; - asds = [ "cl-sat.glucose.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat.glucose/2022-03-31/cl-sat.glucose-20220331-git.tgz"; - sha256 = "11hbhsjzw3xzz6i6niisk5h271kg52y3y77sl6ljnszfgp9xjfxy"; - system = "cl-sat.glucose.test"; - asd = "cl-sat.glucose.test"; - }); - systems = [ "cl-sat.glucose.test" ]; - lispLibs = [ (getAttr "cl-sat_dot_glucose" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-sat_dot_minisat = { - pname = "cl-sat.minisat"; - version = "20220331-git"; - asds = [ "cl-sat.minisat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat.minisat/2022-03-31/cl-sat.minisat-20220331-git.tgz"; - sha256 = "1jrpsdalz9wd3aipfvigimzgzrlb6fylw9cxf1vhhmii46yg9mdr"; - system = "cl-sat.minisat"; - asd = "cl-sat.minisat"; - }); - systems = [ "cl-sat.minisat" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-sat" pkgs) (getAttr "iterate" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-package-manager" pkgs) ]; - }; - cl-sat_dot_minisat_dot_test = { - pname = "cl-sat.minisat.test"; - version = "20220331-git"; - asds = [ "cl-sat.minisat.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat.minisat/2022-03-31/cl-sat.minisat-20220331-git.tgz"; - sha256 = "1jrpsdalz9wd3aipfvigimzgzrlb6fylw9cxf1vhhmii46yg9mdr"; - system = "cl-sat.minisat.test"; - asd = "cl-sat.minisat.test"; - }); - systems = [ "cl-sat.minisat.test" ]; - lispLibs = [ (getAttr "cl-sat_dot_minisat" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-sat_dot_test = { - pname = "cl-sat.test"; - version = "20220707-git"; - asds = [ "cl-sat.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sat/2022-07-07/cl-sat-20220707-git.tgz"; - sha256 = "1fcvxpmja757vyyhcpb00g150dyx90jsg9z8s596vy1nb0z81f49"; - system = "cl-sat.test"; - asd = "cl-sat.test"; - }); - systems = [ "cl-sat.test" ]; - lispLibs = [ (getAttr "cl-sat" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-scram = { - pname = "cl-scram"; - version = "20150923-git"; - asds = [ "cl-scram" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-scram/2015-09-23/cl-scram-20150923-git.tgz"; - sha256 = "1absr9h9z79f1fbs4g33y2rc9jsqjs7vd2l5sl8dvqq4fyx8v6g0"; - system = "cl-scram"; - asd = "cl-scram"; - }); - systems = [ "cl-scram" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "cl-sasl" pkgs) (getAttr "ironclad" pkgs) (getAttr "secure-random" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-scribd = { - pname = "cl-scribd"; - version = "20130312-git"; - asds = [ "cl-scribd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-scribd/2013-03-12/cl-scribd-20130312-git.tgz"; - sha256 = "0r4ah3f1ndi66bm1mir3ldl31sfbmav0kdfpb16f1n9931452mry"; - system = "cl-scribd"; - asd = "cl-scribd"; - }); - systems = [ "cl-scribd" ]; - lispLibs = [ (getAttr "cxml" pkgs) (getAttr "drakma" pkgs) (getAttr "ironclad" pkgs) ]; - }; - cl-scripting = { - pname = "cl-scripting"; - version = "20211020-git"; - asds = [ "cl-scripting" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-scripting/2021-10-20/cl-scripting-20211020-git.tgz"; - sha256 = "1xi8klkn4fhmcrnhxzxvl0rj68dc7az6l2hc10560g9jvblcmmpp"; - system = "cl-scripting"; - asd = "cl-scripting"; - }); - systems = [ "cl-scripting" ]; - lispLibs = [ (getAttr "cl-launch" pkgs) (getAttr "fare-utils" pkgs) ]; - }; - cl-scripting_slash_test = { - pname = "cl-scripting_test"; - version = "20211020-git"; - asds = [ "cl-scripting" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-scripting/2021-10-20/cl-scripting-20211020-git.tgz"; - sha256 = "1xi8klkn4fhmcrnhxzxvl0rj68dc7az6l2hc10560g9jvblcmmpp"; - system = "cl-scripting"; - asd = "cl-scripting"; - }); - systems = [ "cl-scripting/test" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - cl-scrobbler = { - pname = "cl-scrobbler"; - version = "20111105-git"; - asds = [ "cl-scrobbler" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-scrobbler/2011-11-05/cl-scrobbler-20111105-git.tgz"; - sha256 = "0cd0zfmhxf5chcg7hncavfjr8m06cjbiyqylk76z8mprdsv1n062"; - system = "cl-scrobbler"; - asd = "cl-scrobbler"; - }); - systems = [ "cl-scrobbler" ]; - lispLibs = [ (getAttr "arnesi" pkgs) (getAttr "cl-store" pkgs) (getAttr "drakma" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "md5" pkgs) (getAttr "st-json" pkgs) ]; - }; - cl-scrobbler-tests = { - pname = "cl-scrobbler-tests"; - version = "20111105-git"; - asds = [ "cl-scrobbler-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-scrobbler/2011-11-05/cl-scrobbler-20111105-git.tgz"; - sha256 = "0cd0zfmhxf5chcg7hncavfjr8m06cjbiyqylk76z8mprdsv1n062"; - system = "cl-scrobbler-tests"; - asd = "cl-scrobbler"; - }); - systems = [ "cl-scrobbler-tests" ]; - lispLibs = [ (getAttr "cl-scrobbler" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-scsu = { - pname = "cl-scsu"; - version = "20221106-git"; - asds = [ "cl-scsu" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-scsu/2022-11-06/cl-scsu-20221106-git.tgz"; - sha256 = "0jiqyayflyyrdks4yl894vzw2bkxkd87w4sy4n6ikjz450xk3yxf"; - system = "cl-scsu"; - asd = "cl-scsu"; - }); - systems = [ "cl-scsu" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-scsu-test = { - pname = "cl-scsu-test"; - version = "20221106-git"; - asds = [ "cl-scsu-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-scsu/2022-11-06/cl-scsu-20221106-git.tgz"; - sha256 = "0jiqyayflyyrdks4yl894vzw2bkxkd87w4sy4n6ikjz450xk3yxf"; - system = "cl-scsu-test"; - asd = "cl-scsu-test"; - }); - systems = [ "cl-scsu-test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "alexandria" pkgs) (getAttr "cl-scsu" pkgs) ]; - }; - cl-selenium = { - pname = "cl-selenium"; - version = "20180328-git"; - asds = [ "cl-selenium" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-selenium-webdriver/2018-03-28/cl-selenium-webdriver-20180328-git.tgz"; - sha256 = "0216vqg1ax5gcqahclii7ifqpc92rbi86rfcf1qn8bdahmfjccbb"; - system = "cl-selenium"; - asd = "cl-selenium"; - }); - systems = [ "cl-selenium" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-json" pkgs) (getAttr "dexador" pkgs) (getAttr "quri" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-selenium-test = { - pname = "cl-selenium-test"; - version = "20180328-git"; - asds = [ "cl-selenium-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-selenium-webdriver/2018-03-28/cl-selenium-webdriver-20180328-git.tgz"; - sha256 = "0216vqg1ax5gcqahclii7ifqpc92rbi86rfcf1qn8bdahmfjccbb"; - system = "cl-selenium-test"; - asd = "cl-selenium-test"; - }); - systems = [ "cl-selenium-test" ]; - lispLibs = [ (getAttr "cl-selenium" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-semver = { - pname = "cl-semver"; - version = "20221106-git"; - asds = [ "cl-semver" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-semver/2022-11-06/cl-semver-20221106-git.tgz"; - sha256 = "17ghn3s5pbiahkm2i8fh460ykx7n9c4jpjazrw45ixmx832agzbz"; - system = "cl-semver"; - asd = "cl-semver"; - }); - systems = [ "cl-semver" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "esrap" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - cl-semver-test = { - pname = "cl-semver-test"; - version = "20221106-git"; - asds = [ "cl-semver-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-semver/2022-11-06/cl-semver-20221106-git.tgz"; - sha256 = "17ghn3s5pbiahkm2i8fh460ykx7n9c4jpjazrw45ixmx832agzbz"; - system = "cl-semver-test"; - asd = "cl-semver-test"; - }); - systems = [ "cl-semver-test" ]; - lispLibs = [ (getAttr "cl-semver" pkgs) (getAttr "stefil" pkgs) ]; - }; - cl-sentiment = { - pname = "cl-sentiment"; - version = "20130128-git"; - asds = [ "cl-sentiment" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sentiment/2013-01-28/cl-sentiment-20130128-git.tgz"; - sha256 = "18jx6ivbzcg9bsmp1pmlqvzr4kfxzll75b4viz1hrkq78nsnpp5v"; - system = "cl-sentiment"; - asd = "cl-sentiment"; - }); - systems = [ "cl-sentiment" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "rt" pkgs) ]; - }; - cl-ses4 = { - pname = "cl-ses4"; - version = "20221106-git"; - asds = [ "cl-ses4" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ses4/2022-11-06/cl-ses4-20221106-git.tgz"; - sha256 = "1n31k81i19hx26h9wcz39fsciq92hbblnbd15krblx9g877a1598"; - system = "cl-ses4"; - asd = "cl-ses4"; - }); - systems = [ "cl-ses4" ]; - lispLibs = [ (getAttr "arrow-macros" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "dexador" pkgs) (getAttr "ironclad" pkgs) (getAttr "local-time" pkgs) (getAttr "quickapp" pkgs) (getAttr "quri" pkgs) ]; - }; - cl-ses4_slash_test = { - pname = "cl-ses4_test"; - version = "20221106-git"; - asds = [ "cl-ses4" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ses4/2022-11-06/cl-ses4-20221106-git.tgz"; - sha256 = "1n31k81i19hx26h9wcz39fsciq92hbblnbd15krblx9g877a1598"; - system = "cl-ses4"; - asd = "cl-ses4"; - }); - systems = [ "cl-ses4/test" ]; - lispLibs = [ (getAttr "cl-ses4" pkgs) (getAttr "fiveam" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-setlocale = { - pname = "cl-setlocale"; - version = "20201220-git"; - asds = [ "cl-setlocale" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-setlocale/2020-12-20/cl-setlocale-20201220-git.tgz"; - sha256 = "0g1b89yj6n42ayf2074krk3h9yvglqxn54a6i3sxgpsqww2ll2a1"; - system = "cl-setlocale"; - asd = "cl-setlocale"; - }); - systems = [ "cl-setlocale" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - cl-setlocale_slash_tests = { - pname = "cl-setlocale_tests"; - version = "20201220-git"; - asds = [ "cl-setlocale" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-setlocale/2020-12-20/cl-setlocale-20201220-git.tgz"; - sha256 = "0g1b89yj6n42ayf2074krk3h9yvglqxn54a6i3sxgpsqww2ll2a1"; - system = "cl-setlocale"; - asd = "cl-setlocale"; - }); - systems = [ "cl-setlocale/tests" ]; - lispLibs = [ (getAttr "cl-setlocale" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-sha1 = { - pname = "cl-sha1"; - version = "20210807-git"; - asds = [ "cl-sha1" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sha1/2021-08-07/cl-sha1-20210807-git.tgz"; - sha256 = "16hczcr7ghah0p9fi29ddrw5c4zbb2d4765iigfx7yrgk5z5jb8p"; - system = "cl-sha1"; - asd = "cl-sha1"; - }); - systems = [ "cl-sha1" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) ]; - }; - cl-shellwords = { - pname = "cl-shellwords"; - version = "20150923-git"; - asds = [ "cl-shellwords" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-shellwords/2015-09-23/cl-shellwords-20150923-git.tgz"; - sha256 = "0im8cni1ig5zaha9gbmma7zk1xxa4xajvzfgalvl2f0fhvksl4pn"; - system = "cl-shellwords"; - asd = "cl-shellwords"; - }); - systems = [ "cl-shellwords" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - cl-shellwords-test = { - pname = "cl-shellwords-test"; - version = "20150923-git"; - asds = [ "cl-shellwords-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-shellwords/2015-09-23/cl-shellwords-20150923-git.tgz"; - sha256 = "0im8cni1ig5zaha9gbmma7zk1xxa4xajvzfgalvl2f0fhvksl4pn"; - system = "cl-shellwords-test"; - asd = "cl-shellwords-test"; - }); - systems = [ "cl-shellwords-test" ]; - lispLibs = [ (getAttr "cl-shellwords" pkgs) (getAttr "prove" pkgs) ]; - }; - cl-simple-concurrent-jobs = { - pname = "cl-simple-concurrent-jobs"; - version = "20150505-git"; - asds = [ "cl-simple-concurrent-jobs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-simple-concurrent-jobs/2015-05-05/cl-simple-concurrent-jobs-20150505-git.tgz"; - sha256 = "0mv7svsil58h8v8kq9965bpbradmhfpyrmi61dbzp5mbw8c5mrwj"; - system = "cl-simple-concurrent-jobs"; - asd = "cl-simple-concurrent-jobs"; - }); - systems = [ "cl-simple-concurrent-jobs" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "chanl" pkgs) ]; - }; - cl-simple-table = { - pname = "cl-simple-table"; - version = "20130312-git"; - asds = [ "cl-simple-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-simple-table/2013-03-12/cl-simple-table-20130312-git.tgz"; - sha256 = "1pnczi5hbqlyxxvzlpy6vc58qc9hh9mdm5rgq304bp3v2qajh0b7"; - system = "cl-simple-table"; - asd = "cl-simple-table"; - }); - systems = [ "cl-simple-table" ]; - lispLibs = [ ]; - }; - cl-singleton-mixin = { - pname = "cl-singleton-mixin"; - version = "20150505-git"; - asds = [ "cl-singleton-mixin" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-singleton-mixin/2015-05-05/cl-singleton-mixin-20150505-git.tgz"; - sha256 = "10dvwzx1kw9ac163i6sc8yfg3hpkn0dlq4hf6qipb46b4mcib01s"; - system = "cl-singleton-mixin"; - asd = "cl-singleton-mixin"; - }); - systems = [ "cl-singleton-mixin" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "metap" pkgs) ]; - }; - cl-singleton-mixin-test = { - pname = "cl-singleton-mixin-test"; - version = "20150505-git"; - asds = [ "cl-singleton-mixin-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-singleton-mixin/2015-05-05/cl-singleton-mixin-20150505-git.tgz"; - sha256 = "10dvwzx1kw9ac163i6sc8yfg3hpkn0dlq4hf6qipb46b4mcib01s"; - system = "cl-singleton-mixin-test"; - asd = "cl-singleton-mixin-test"; - }); - systems = [ "cl-singleton-mixin-test" ]; - lispLibs = [ (getAttr "cl-singleton-mixin" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-skip-list = { - pname = "cl-skip-list"; - version = "20220707-git"; - asds = [ "cl-skip-list" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-skip-list/2022-07-07/cl-skip-list-20220707-git.tgz"; - sha256 = "1k3hbi9n1yzky3hjcg48jkkkp2jx5vm7bsywhnyyb1z6hz5phakd"; - system = "cl-skip-list"; - asd = "cl-skip-list"; - }); - systems = [ "cl-skip-list" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-skkserv = { - pname = "cl-skkserv"; - version = "20201220-git"; - asds = [ "cl-skkserv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-skkserv/2020-12-20/cl-skkserv-20201220-git.tgz"; - sha256 = "1khbfsvf70dyrrkbwcblzd6bkgx1z6k9ras57inmv2lqqr93m5l4"; - system = "cl-skkserv"; - asd = "cl-skkserv"; - }); - systems = [ "cl-skkserv" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "esrap" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "jp-numeral" pkgs) (getAttr "named-readtables" pkgs) (getAttr "papyrus" pkgs) (getAttr "yason" pkgs) ]; - }; - cl-skkserv_slash_cli = { - pname = "cl-skkserv_cli"; - version = "20201220-git"; - asds = [ "cl-skkserv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-skkserv/2020-12-20/cl-skkserv-20201220-git.tgz"; - sha256 = "1khbfsvf70dyrrkbwcblzd6bkgx1z6k9ras57inmv2lqqr93m5l4"; - system = "cl-skkserv"; - asd = "cl-skkserv"; - }); - systems = [ "cl-skkserv/cli" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-skkserv" pkgs) (getAttr "daemon" pkgs) (getAttr "unix-opts" pkgs) (getAttr "usocket" pkgs) (getAttr "usocket-server" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-skkserv_slash_core = { - pname = "cl-skkserv_core"; - version = "20201220-git"; - asds = [ "cl-skkserv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-skkserv/2020-12-20/cl-skkserv-20201220-git.tgz"; - sha256 = "1khbfsvf70dyrrkbwcblzd6bkgx1z6k9ras57inmv2lqqr93m5l4"; - system = "cl-skkserv"; - asd = "cl-skkserv"; - }); - systems = [ "cl-skkserv/core" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "esrap" pkgs) (getAttr "named-readtables" pkgs) (getAttr "papyrus" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-skkserv_slash_google-ime = { - pname = "cl-skkserv_google-ime"; - version = "20201220-git"; - asds = [ "cl-skkserv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-skkserv/2020-12-20/cl-skkserv-20201220-git.tgz"; - sha256 = "1khbfsvf70dyrrkbwcblzd6bkgx1z6k9ras57inmv2lqqr93m5l4"; - system = "cl-skkserv"; - asd = "cl-skkserv"; - }); - systems = [ "cl-skkserv/google-ime" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "drakma" pkgs) (getAttr "esrap" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "named-readtables" pkgs) (getAttr "papyrus" pkgs) (getAttr "yason" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-skkserv_slash_mixed = { - pname = "cl-skkserv_mixed"; - version = "20201220-git"; - asds = [ "cl-skkserv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-skkserv/2020-12-20/cl-skkserv-20201220-git.tgz"; - sha256 = "1khbfsvf70dyrrkbwcblzd6bkgx1z6k9ras57inmv2lqqr93m5l4"; - system = "cl-skkserv"; - asd = "cl-skkserv"; - }); - systems = [ "cl-skkserv/mixed" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "esrap" pkgs) (getAttr "named-readtables" pkgs) (getAttr "papyrus" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-skkserv_slash_skk = { - pname = "cl-skkserv_skk"; - version = "20201220-git"; - asds = [ "cl-skkserv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-skkserv/2020-12-20/cl-skkserv-20201220-git.tgz"; - sha256 = "1khbfsvf70dyrrkbwcblzd6bkgx1z6k9ras57inmv2lqqr93m5l4"; - system = "cl-skkserv"; - asd = "cl-skkserv"; - }); - systems = [ "cl-skkserv/skk" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "esrap" pkgs) (getAttr "jp-numeral" pkgs) (getAttr "named-readtables" pkgs) (getAttr "papyrus" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-skkserv_slash_tests = { - pname = "cl-skkserv_tests"; - version = "20201220-git"; - asds = [ "cl-skkserv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-skkserv/2020-12-20/cl-skkserv-20201220-git.tgz"; - sha256 = "1khbfsvf70dyrrkbwcblzd6bkgx1z6k9ras57inmv2lqqr93m5l4"; - system = "cl-skkserv"; - asd = "cl-skkserv"; - }); - systems = [ "cl-skkserv/tests" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "cl-skkserv" pkgs) (getAttr "flexi-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-slice = { - pname = "cl-slice"; - version = "20210531-git"; - asds = [ "cl-slice" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz"; - sha256 = "1ybznf4y5lda6bn163jcvj281qzhm24dfcwhbgxmm5n6f27gdccl"; - system = "cl-slice"; - asd = "cl-slice"; - }); - systems = [ "cl-slice" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "let-plus" pkgs) ]; - }; - cl-slice-tests = { - pname = "cl-slice-tests"; - version = "20210531-git"; - asds = [ "cl-slice-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz"; - sha256 = "1ybznf4y5lda6bn163jcvj281qzhm24dfcwhbgxmm5n6f27gdccl"; - system = "cl-slice-tests"; - asd = "cl-slice"; - }); - systems = [ "cl-slice-tests" ]; - lispLibs = [ (getAttr "cl-slice" pkgs) (getAttr "clunit" pkgs) ]; - }; - cl-slp = { - pname = "cl-slp"; - version = "20140826-git"; - asds = [ "cl-slp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-slp/2014-08-26/cl-slp-20140826-git.tgz"; - sha256 = "10wfrw6r6w646lzx0nasnfvjpy63icxl8qm4888dpcjc57y1cd1w"; - system = "cl-slp"; - asd = "cl-slp"; - }); - systems = [ "cl-slp" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-slug = { - pname = "cl-slug"; - version = "20180228-git"; - asds = [ "cl-slug" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-slug/2018-02-28/cl-slug-20180228-git.tgz"; - sha256 = "1asdq6xllmsvfw5fky9wblqcx9isac9jrrlkfl7vyxcq1wxrnflx"; - system = "cl-slug"; - asd = "cl-slug"; - }); - systems = [ "cl-slug" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - cl-slug-test = { - pname = "cl-slug-test"; - version = "20180228-git"; - asds = [ "cl-slug-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-slug/2018-02-28/cl-slug-20180228-git.tgz"; - sha256 = "1asdq6xllmsvfw5fky9wblqcx9isac9jrrlkfl7vyxcq1wxrnflx"; - system = "cl-slug-test"; - asd = "cl-slug-test"; - }); - systems = [ "cl-slug-test" ]; - lispLibs = [ (getAttr "cl-slug" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-smt-lib = { - pname = "cl-smt-lib"; - version = "20220331-git"; - asds = [ "cl-smt-lib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-smt-lib/2022-03-31/cl-smt-lib-20220331-git.tgz"; - sha256 = "09xqpmzd8rmp4dkj6mzwlwnhqk266abqvskz9dm6mr3cnf2r774z"; - system = "cl-smt-lib"; - asd = "cl-smt-lib"; - }); - systems = [ "cl-smt-lib" ]; - lispLibs = [ (getAttr "asdf-package-system" pkgs) (getAttr "named-readtables" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - cl-smtp = { - pname = "cl-smtp"; - version = "20210228-git"; - asds = [ "cl-smtp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-smtp/2021-02-28/cl-smtp-20210228-git.tgz"; - sha256 = "0vjjfapcrdc5671jz2d24h8zvpz7skq1x6pi9fvw6ls5sgms6fr0"; - system = "cl-smtp"; - asd = "cl-smtp"; - }); - systems = [ "cl-smtp" ]; - lispLibs = [ (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-base64" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-soil = { - pname = "cl-soil"; - version = "release-quicklisp-f27087ce-git"; - asds = [ "cl-soil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-soil/2018-08-31/cl-soil-release-quicklisp-f27087ce-git.tgz"; - sha256 = "0mnz5yaw3kc14ja9g4j7dxh96kd82ifj25gy0dil7kqjd08lwcq9"; - system = "cl-soil"; - asd = "cl-soil"; - }); - systems = [ "cl-soil" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "documentation-utils" pkgs) ]; - }; - cl-soloud = { - pname = "cl-soloud"; - version = "20190710-git"; - asds = [ "cl-soloud" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-soloud/2019-07-10/cl-soloud-20190710-git.tgz"; - sha256 = "1scdnhf052sa77zd4f250mxdqjjny2jcigwhgccrp1gldcs0ks37"; - system = "cl-soloud"; - asd = "cl-soloud"; - }); - systems = [ "cl-soloud" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-mpg123" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-indent" pkgs) ]; - }; - cl-sophia = { - pname = "cl-sophia"; - version = "20150608-git"; - asds = [ "cl-sophia" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sophia/2015-06-08/cl-sophia-20150608-git.tgz"; - sha256 = "1x027mr7lg5fs0d82n5mshnd19kan76y3zb9yxbcnq222l4j8j00"; - system = "cl-sophia"; - asd = "cl-sophia"; - }); - systems = [ "cl-sophia" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-fad" pkgs) ]; - }; - cl-sophia-test = { - pname = "cl-sophia-test"; - version = "20150608-git"; - asds = [ "cl-sophia-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sophia/2015-06-08/cl-sophia-20150608-git.tgz"; - sha256 = "1x027mr7lg5fs0d82n5mshnd19kan76y3zb9yxbcnq222l4j8j00"; - system = "cl-sophia-test"; - asd = "cl-sophia"; - }); - systems = [ "cl-sophia-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-sophia" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - cl-spark = { - pname = "cl-spark"; - version = "20150709-git"; - asds = [ "cl-spark" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-spark/2015-07-09/cl-spark-20150709-git.tgz"; - sha256 = "0my1fsgi2rjaqkpk934f2bjy63pmnj7faza3fzvnk6k3l66y19nk"; - system = "cl-spark"; - asd = "cl-spark"; - }); - systems = [ "cl-spark" ]; - lispLibs = [ ]; - }; - cl-spark-test = { - pname = "cl-spark-test"; - version = "20150709-git"; - asds = [ "cl-spark-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-spark/2015-07-09/cl-spark-20150709-git.tgz"; - sha256 = "0my1fsgi2rjaqkpk934f2bjy63pmnj7faza3fzvnk6k3l66y19nk"; - system = "cl-spark-test"; - asd = "cl-spark-test"; - }); - systems = [ "cl-spark-test" ]; - lispLibs = [ (getAttr "cl-spark" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-sparql = { - pname = "cl-sparql"; - version = "20220331-git"; - asds = [ "cl-sparql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sparql/2022-03-31/cl-sparql-20220331-git.tgz"; - sha256 = "1fjp5a25yly3l3pg07gzhz8q830fcaz0dwspigw8v90sx4insz0p"; - system = "cl-sparql"; - asd = "cl-sparql"; - }); - systems = [ "cl-sparql" ]; - lispLibs = [ (getAttr "parser-combinators" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "puri" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-sparql-tests = { - pname = "cl-sparql-tests"; - version = "20220331-git"; - asds = [ "cl-sparql-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sparql/2022-03-31/cl-sparql-20220331-git.tgz"; - sha256 = "1fjp5a25yly3l3pg07gzhz8q830fcaz0dwspigw8v90sx4insz0p"; - system = "cl-sparql-tests"; - asd = "cl-sparql-tests"; - }); - systems = [ "cl-sparql-tests" ]; - lispLibs = [ (getAttr "cl-sparql" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-speedy-queue = { - pname = "cl-speedy-queue"; - version = "20150302-git"; - asds = [ "cl-speedy-queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-speedy-queue/2015-03-02/cl-speedy-queue-20150302-git.tgz"; - sha256 = "0czhnvxn9lvbjz9h1lb7y18nqrsq3drq5icd3lqdaa07362alriq"; - system = "cl-speedy-queue"; - asd = "cl-speedy-queue"; - }); - systems = [ "cl-speedy-queue" ]; - lispLibs = [ ]; - }; - cl-spidev = { - pname = "cl-spidev"; - version = "20190710-git"; - asds = [ "cl-spidev" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-spidev/2019-07-10/cl-spidev-20190710-git.tgz"; - sha256 = "1kif1ygpm7z7bymg86h305171vnp5jsqyq4dz8h3fbi1rzjnqfcy"; - system = "cl-spidev"; - asd = "cl-spidev"; - }); - systems = [ "cl-spidev" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-ssdb = { - pname = "cl-ssdb"; - version = "20210124-git"; - asds = [ "cl-ssdb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ssdb/2021-01-24/cl-ssdb-20210124-git.tgz"; - sha256 = "05l0wg4a1kxgggmg1nalq811by76lja0gpa2c4i999h74bf4n3dc"; - system = "cl-ssdb"; - asd = "cl-ssdb"; - }); - systems = [ "cl-ssdb" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "parse-number" pkgs) (getAttr "rutils" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-ssdb-test = { - pname = "cl-ssdb-test"; - version = "20210124-git"; - asds = [ "cl-ssdb-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ssdb/2021-01-24/cl-ssdb-20210124-git.tgz"; - sha256 = "05l0wg4a1kxgggmg1nalq811by76lja0gpa2c4i999h74bf4n3dc"; - system = "cl-ssdb-test"; - asd = "cl-ssdb-test"; - }); - systems = [ "cl-ssdb-test" ]; - lispLibs = [ (getAttr "cl-ssdb" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-ssh-keys = { - pname = "cl-ssh-keys"; - version = "20210531-git"; - asds = [ "cl-ssh-keys" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ssh-keys/2021-05-31/cl-ssh-keys-20210531-git.tgz"; - sha256 = "0v5m1mbd8v4lpz3zqzy228431vvyyqcj4968ajyfzpxdl2lsb6nv"; - system = "cl-ssh-keys"; - asd = "cl-ssh-keys"; - }); - systems = [ "cl-ssh-keys" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "binascii" pkgs) (getAttr "cl-rfc4251" pkgs) (getAttr "ironclad" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-ssh-keys_dot_test = { - pname = "cl-ssh-keys.test"; - version = "20210531-git"; - asds = [ "cl-ssh-keys.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ssh-keys/2021-05-31/cl-ssh-keys-20210531-git.tgz"; - sha256 = "0v5m1mbd8v4lpz3zqzy228431vvyyqcj4968ajyfzpxdl2lsb6nv"; - system = "cl-ssh-keys.test"; - asd = "cl-ssh-keys.test"; - }); - systems = [ "cl-ssh-keys.test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ssh-keys" pkgs) (getAttr "rove" pkgs) ]; - }; - cl-statsd = { - pname = "cl-statsd"; - version = "20170124-git"; - asds = [ "cl-statsd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-statsd/2017-01-24/cl-statsd-20170124-git.tgz"; - sha256 = "1l2sxbzhp7wwalxn8k0k1gis9c9w462fygfw4ps0s1bnhgbvr6qb"; - system = "cl-statsd"; - asd = "cl-statsd"; - }); - systems = [ "cl-statsd" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "local-time" pkgs) (getAttr "log4cl" pkgs) (getAttr "safe-queue" pkgs) (getAttr "trivial-utf-8" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-statsd_dot_test = { - pname = "cl-statsd.test"; - version = "20170124-git"; - asds = [ "cl-statsd.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-statsd/2017-01-24/cl-statsd-20170124-git.tgz"; - sha256 = "1l2sxbzhp7wwalxn8k0k1gis9c9w462fygfw4ps0s1bnhgbvr6qb"; - system = "cl-statsd.test"; - asd = "cl-statsd.test"; - }); - systems = [ "cl-statsd.test" ]; - lispLibs = [ (getAttr "cl-statsd" pkgs) (getAttr "log4cl" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-steamworks = { - pname = "cl-steamworks"; - version = "20221106-git"; - asds = [ "cl-steamworks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-steamworks/2022-11-06/cl-steamworks-20221106-git.tgz"; - sha256 = "0vmr40fylqd3k2mbds823pxz5aprh76bc604y7cf8y7md30r1azn"; - system = "cl-steamworks"; - asd = "cl-steamworks"; - }); - systems = [ "cl-steamworks" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "float-features" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - cl-steamworks-generator = { - pname = "cl-steamworks-generator"; - version = "20221106-git"; - asds = [ "cl-steamworks-generator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-steamworks/2022-11-06/cl-steamworks-20221106-git.tgz"; - sha256 = "0vmr40fylqd3k2mbds823pxz5aprh76bc604y7cf8y7md30r1azn"; - system = "cl-steamworks-generator"; - asd = "cl-steamworks-generator"; - }); - systems = [ "cl-steamworks-generator" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "parse-number" pkgs) (getAttr "pathname-utils" pkgs) (getAttr "yason" pkgs) ]; - }; - cl-stomp = { - pname = "cl-stomp"; - version = "20200925-git"; - asds = [ "cl-stomp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-stomp/2020-09-25/cl-stomp-20200925-git.tgz"; - sha256 = "180y0x53ghsvz6n0bz67aw69p962bsslarikk89rf41kcv998xvw"; - system = "cl-stomp"; - asd = "cl-stomp"; - }); - systems = [ "cl-stomp" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-stopwatch = { - pname = "cl-stopwatch"; - version = "20190307-hg"; - asds = [ "cl-stopwatch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-stopwatch/2019-03-07/cl-stopwatch-20190307-hg.tgz"; - sha256 = "02yi97q09sy9ypnvxp0l1m9b5w2pdcvbfd16y0kj069b8nlcwm8d"; - system = "cl-stopwatch"; - asd = "cl-stopwatch"; - }); - systems = [ "cl-stopwatch" ]; - lispLibs = [ ]; - }; - cl-store = { - pname = "cl-store"; - version = "20200925-git"; - asds = [ "cl-store" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz"; - sha256 = "0b1cw495121wjz4ayndir52a5hf3fnvi99syla60mninvx7q7krl"; - system = "cl-store"; - asd = "cl-store"; - }); - systems = [ "cl-store" ]; - lispLibs = [ ]; - }; - cl-store-tests = { - pname = "cl-store-tests"; - version = "20200925-git"; - asds = [ "cl-store-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz"; - sha256 = "0b1cw495121wjz4ayndir52a5hf3fnvi99syla60mninvx7q7krl"; - system = "cl-store-tests"; - asd = "cl-store"; - }); - systems = [ "cl-store-tests" ]; - lispLibs = [ (getAttr "cl-store" pkgs) (getAttr "rt" pkgs) ]; - }; - cl-stream = { - pname = "cl-stream"; - version = "20190521-git"; - asds = [ "cl-stream" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-stream/2019-05-21/cl-stream-20190521-git.tgz"; - sha256 = "1r2spbcx3ifz51yq2pxkdb1n2k5fvyg3pz3w42mnw99pq78cbasv"; - system = "cl-stream"; - asd = "cl-stream"; - }); - systems = [ "cl-stream" ]; - lispLibs = [ ]; - }; - cl-strftime = { - pname = "cl-strftime"; - version = "20160318-git"; - asds = [ "cl-strftime" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-strftime/2016-03-18/cl-strftime-20160318-git.tgz"; - sha256 = "00c8hq7vzgb89ab3q7mrp60x743kiqmsk1g51ynhxlqhph2bnslf"; - system = "cl-strftime"; - asd = "cl-strftime"; - }); - systems = [ "cl-strftime" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "local-time" pkgs) (getAttr "serapeum" pkgs) ]; - }; - cl-strftime_slash_tests = { - pname = "cl-strftime_tests"; - version = "20160318-git"; - asds = [ "cl-strftime" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-strftime/2016-03-18/cl-strftime-20160318-git.tgz"; - sha256 = "00c8hq7vzgb89ab3q7mrp60x743kiqmsk1g51ynhxlqhph2bnslf"; - system = "cl-strftime"; - asd = "cl-strftime"; - }); - systems = [ "cl-strftime/tests" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-strftime" pkgs) (getAttr "fiveam" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-string-complete = { - pname = "cl-string-complete"; - version = "20190307-hg"; - asds = [ "cl-string-complete" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-string-complete/2019-03-07/cl-string-complete-20190307-hg.tgz"; - sha256 = "0qycrs5d2cll62gs14qg3kwzfpnjgckrmigckgjav2ll3dghxjx6"; - system = "cl-string-complete"; - asd = "cl-string-complete"; - }); - systems = [ "cl-string-complete" ]; - lispLibs = [ ]; - }; - cl-string-generator = { - pname = "cl-string-generator"; - version = "20210630-git"; - asds = [ "cl-string-generator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-string-generator/2021-06-30/cl-string-generator-20210630-git.tgz"; - sha256 = "0zm6lyzd205lw30fdvnhrrlv9fylpfqksqxl32zvj9vzcn8qc1vi"; - system = "cl-string-generator"; - asd = "cl-string-generator"; - }); - systems = [ "cl-string-generator" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - cl-string-generator_slash_tests = { - pname = "cl-string-generator_tests"; - version = "20210630-git"; - asds = [ "cl-string-generator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-string-generator/2021-06-30/cl-string-generator-20210630-git.tgz"; - sha256 = "0zm6lyzd205lw30fdvnhrrlv9fylpfqksqxl32zvj9vzcn8qc1vi"; - system = "cl-string-generator"; - asd = "cl-string-generator"; - }); - systems = [ "cl-string-generator/tests" ]; - lispLibs = [ (getAttr "cl-string-generator" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-string-match = { - pname = "cl-string-match"; - version = "20211209-git"; - asds = [ "cl-string-match" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz"; - sha256 = "0zndlkw3qy3vw4px4qv884z6232w8zfaliyc88irjwizdv35wcq9"; - system = "cl-string-match"; - asd = "cl-string-match"; - }); - systems = [ "cl-string-match" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "ascii-strings" pkgs) (getAttr "yacc" pkgs) (getAttr "iterate" pkgs) (getAttr "jpl-queues" pkgs) (getAttr "mgl-pax" pkgs) ]; - }; - cl-string-match-test = { - pname = "cl-string-match-test"; - version = "20211209-git"; - asds = [ "cl-string-match-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz"; - sha256 = "0zndlkw3qy3vw4px4qv884z6232w8zfaliyc88irjwizdv35wcq9"; - system = "cl-string-match-test"; - asd = "cl-string-match-test"; - }); - systems = [ "cl-string-match-test" ]; - lispLibs = [ (getAttr "ascii-strings" pkgs) (getAttr "cl-string-match" pkgs) (getAttr "simple-scanf" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - cl-strings = { - pname = "cl-strings"; - version = "20210411-git"; - asds = [ "cl-strings" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-strings/2021-04-11/cl-strings-20210411-git.tgz"; - sha256 = "1j8hs54fn0wsf5zfzhhgiva47n9hsmfa74iinahz6nmcs8iy75aj"; - system = "cl-strings"; - asd = "cl-strings"; - }); - systems = [ "cl-strings" ]; - lispLibs = [ ]; - }; - cl-strings-tests = { - pname = "cl-strings-tests"; - version = "20210411-git"; - asds = [ "cl-strings-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-strings/2021-04-11/cl-strings-20210411-git.tgz"; - sha256 = "1j8hs54fn0wsf5zfzhhgiva47n9hsmfa74iinahz6nmcs8iy75aj"; - system = "cl-strings-tests"; - asd = "cl-strings"; - }); - systems = [ "cl-strings-tests" ]; - lispLibs = [ (getAttr "cl-strings" pkgs) (getAttr "prove" pkgs) ]; - }; - cl-svg = { - pname = "cl-svg"; - version = "20180228-git"; - asds = [ "cl-svg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-svg/2018-02-28/cl-svg-20180228-git.tgz"; - sha256 = "11rmzimy6j7ln7q5y1h2kw1225rsfb6fpn89qjcq7h5lc8fay0wz"; - system = "cl-svg"; - asd = "cl-svg"; - }); - systems = [ "cl-svg" ]; - lispLibs = [ ]; - }; - cl-svm = { - pname = "cl-svm"; - version = "20110418-git"; - asds = [ "cl-svm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-svm/2011-04-18/cl-svm-20110418-git.tgz"; - sha256 = "03d070k3bl5c0b2f6bzig5gkhlj074v74f7kg8hh3znrbmwji2wv"; - system = "cl-svm"; - asd = "cl-svm"; - }); - systems = [ "cl-svm" ]; - lispLibs = [ ]; - }; - cl-swagger = { - pname = "cl-swagger"; - version = "20180831-git"; - asds = [ "cl-swagger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-swagger-codegen/2018-08-31/cl-swagger-codegen-20180831-git.tgz"; - sha256 = "1lkp69n7wscyf2az3h2bmxmvzzppdfxcq5s0m607b1f7nfmxzjsq"; - system = "cl-swagger"; - asd = "cl-swagger"; - }); - systems = [ "cl-swagger" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "cl-mustache" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) ]; - }; - cl-sxml = { - pname = "cl-sxml"; - version = "20200325-git"; - asds = [ "cl-sxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sxml/2020-03-25/cl-sxml-20200325-git.tgz"; - sha256 = "1105s9whidq1lf0lli2wdhcfcs5gwzxa0h1x3izx4mp2p7psvciz"; - system = "cl-sxml"; - asd = "cl-sxml"; - }); - systems = [ "cl-sxml" ]; - lispLibs = [ (getAttr "cxml" pkgs) ]; - }; - cl-sxml-test = { - pname = "cl-sxml-test"; - version = "20200325-git"; - asds = [ "cl-sxml-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sxml/2020-03-25/cl-sxml-20200325-git.tgz"; - sha256 = "1105s9whidq1lf0lli2wdhcfcs5gwzxa0h1x3izx4mp2p7psvciz"; - system = "cl-sxml-test"; - asd = "cl-sxml"; - }); - systems = [ "cl-sxml-test" ]; - lispLibs = [ (getAttr "cl-sxml" pkgs) (getAttr "fiveam" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-syntax = { - pname = "cl-syntax"; - version = "20150407-git"; - asds = [ "cl-syntax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; - sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; - system = "cl-syntax"; - asd = "cl-syntax"; - }); - systems = [ "cl-syntax" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - cl-syntax-annot = { - pname = "cl-syntax-annot"; - version = "20150407-git"; - asds = [ "cl-syntax-annot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; - sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; - system = "cl-syntax-annot"; - asd = "cl-syntax-annot"; - }); - systems = [ "cl-syntax-annot" ]; - lispLibs = [ (getAttr "cl-annot" pkgs) (getAttr "cl-syntax" pkgs) ]; - }; - cl-syntax-anonfun = { - pname = "cl-syntax-anonfun"; - version = "20150407-git"; - asds = [ "cl-syntax-anonfun" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; - sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; - system = "cl-syntax-anonfun"; - asd = "cl-syntax-anonfun"; - }); - systems = [ "cl-syntax-anonfun" ]; - lispLibs = [ (getAttr "cl-anonfun" pkgs) (getAttr "cl-syntax" pkgs) ]; - }; - cl-syntax-clsql = { - pname = "cl-syntax-clsql"; - version = "20150407-git"; - asds = [ "cl-syntax-clsql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; - sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; - system = "cl-syntax-clsql"; - asd = "cl-syntax-clsql"; - }); - systems = [ "cl-syntax-clsql" ]; - lispLibs = [ (getAttr "cl-syntax" pkgs) (getAttr "clsql" pkgs) ]; - }; - cl-syntax-debug-print = { - pname = "cl-syntax-debug-print"; - version = "20210807-git"; - asds = [ "cl-syntax-debug-print" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-debug-print/2021-08-07/cl-debug-print-20210807-git.tgz"; - sha256 = "1cm5nybmv0pq9s4lrwhd01rjj1wlcj1sjcrcakabi7w7b5zw4cyh"; - system = "cl-syntax-debug-print"; - asd = "cl-syntax-debug-print"; - }); - systems = [ "cl-syntax-debug-print" ]; - lispLibs = [ (getAttr "cl-debug-print" pkgs) (getAttr "cl-syntax" pkgs) ]; - }; - cl-syntax-fare-quasiquote = { - pname = "cl-syntax-fare-quasiquote"; - version = "20150407-git"; - asds = [ "cl-syntax-fare-quasiquote" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; - sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; - system = "cl-syntax-fare-quasiquote"; - asd = "cl-syntax-fare-quasiquote"; - }); - systems = [ "cl-syntax-fare-quasiquote" ]; - lispLibs = [ (getAttr "cl-syntax" pkgs) (getAttr "fare-quasiquote" pkgs) ]; - }; - cl-syntax-interpol = { - pname = "cl-syntax-interpol"; - version = "20150407-git"; - asds = [ "cl-syntax-interpol" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; - sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; - system = "cl-syntax-interpol"; - asd = "cl-syntax-interpol"; - }); - systems = [ "cl-syntax-interpol" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "cl-syntax" pkgs) ]; - }; - cl-syntax-lsx = { - pname = "cl-syntax-lsx"; - version = "20220220-git"; - asds = [ "cl-syntax-lsx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lsx/2022-02-20/lsx-20220220-git.tgz"; - sha256 = "1pdq6csr8pkzcq2zkhhm6wkp9zxx2aypjd16rcw4q43mff09y041"; - system = "cl-syntax-lsx"; - asd = "cl-syntax-lsx"; - }); - systems = [ "cl-syntax-lsx" ]; - lispLibs = [ (getAttr "cl-syntax" pkgs) (getAttr "lsx" pkgs) ]; - }; - cl-syntax-markup = { - pname = "cl-syntax-markup"; - version = "20150407-git"; - asds = [ "cl-syntax-markup" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; - sha256 = "17ran8xp77asagl31xv8w819wafh6whwfc9p6dgx22ca537gyl4y"; - system = "cl-syntax-markup"; - asd = "cl-syntax-markup"; - }); - systems = [ "cl-syntax-markup" ]; - lispLibs = [ (getAttr "cl-markup" pkgs) (getAttr "cl-syntax" pkgs) ]; - }; - cl-syslog = { - pname = "cl-syslog"; - version = "20190202-git"; - asds = [ "cl-syslog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-syslog/2019-02-02/cl-syslog-20190202-git.tgz"; - sha256 = "1qcz55jiqwk91b01hsahxnha884f6zf2883j2m51sqph0mvj69mh"; - system = "cl-syslog"; - asd = "cl-syslog"; - }); - systems = [ "cl-syslog" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "global-vars" pkgs) (getAttr "local-time" pkgs) (getAttr "split-sequence" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-table = { - pname = "cl-table"; - version = "20130128-git"; - asds = [ "cl-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-table/2013-01-28/cl-table-20130128-git.tgz"; - sha256 = "0c7bdnpi473grayycdcdh4q8fi137i3c80k05k87pvjdrl1qnkpn"; - system = "cl-table"; - asd = "cl-table"; - }); - systems = [ "cl-table" ]; - lispLibs = [ (getAttr "iterate" pkgs) ]; - }; - cl-tasukete = { - pname = "cl-tasukete"; - version = "20180228-git"; - asds = [ "cl-tasukete" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tasukete/2018-02-28/cl-tasukete-20180228-git.tgz"; - sha256 = "0i8ibg2a33mb32vr2b70psb5dvh47r52lfhkh84rxzmcsk6ww230"; - system = "cl-tasukete"; - asd = "cl-tasukete"; - }); - systems = [ "cl-tasukete" ]; - lispLibs = [ (getAttr "cl-annot" pkgs) (getAttr "cl-gists" pkgs) (getAttr "dissect" pkgs) (getAttr "jonathan" pkgs) (getAttr "local-time" pkgs) ]; - }; - cl-tasukete-test = { - pname = "cl-tasukete-test"; - version = "20180228-git"; - asds = [ "cl-tasukete-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tasukete/2018-02-28/cl-tasukete-20180228-git.tgz"; - sha256 = "0i8ibg2a33mb32vr2b70psb5dvh47r52lfhkh84rxzmcsk6ww230"; - system = "cl-tasukete-test"; - asd = "cl-tasukete-test"; - }); - systems = [ "cl-tasukete-test" ]; - lispLibs = [ (getAttr "cl-tasukete" pkgs) (getAttr "dissect" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-telebot = { - pname = "cl-telebot"; - version = "20211020-git"; - asds = [ "cl-telebot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-telebot/2021-10-20/cl-telebot-20211020-git.tgz"; - sha256 = "0nl002l4f3x6843s6h5w2iz2hganxb369k8c2hbbgqq7plb4mdf1"; - system = "cl-telebot"; - asd = "cl-telebot"; - }); - systems = [ "cl-telebot" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "dexador" pkgs) (getAttr "jonathan" pkgs) ]; - }; - cl-telegram-bot = { - pname = "cl-telegram-bot"; - version = "20221106-git"; - asds = [ "cl-telegram-bot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-telegram-bot/2022-11-06/cl-telegram-bot-20221106-git.tgz"; - sha256 = "1pvwkr2bai0l7n8mqrbcl35mlv7kic1wsd41zavmljx0fj14bwj6"; - system = "cl-telegram-bot"; - asd = "cl-telegram-bot"; - }); - systems = [ "cl-telegram-bot" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "arrows" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-strings" pkgs) (getAttr "closer-mop" pkgs) (getAttr "dexador" pkgs) (getAttr "jonathan" pkgs) (getAttr "kebab" pkgs) (getAttr "log4cl" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivial-backtrace" pkgs) ]; - }; - cl-template = { - pname = "cl-template"; - version = "20130615-git"; - asds = [ "cl-template" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-template/2013-06-15/cl-template-20130615-git.tgz"; - sha256 = "1rhg023a2nxsk5x6abd6i0a8sh36aj0bgsh80w60m3b7xlsva2x2"; - system = "cl-template"; - asd = "cl-template"; - }); - systems = [ "cl-template" ]; - lispLibs = [ ]; - }; - cl-template-tests = { - pname = "cl-template-tests"; - version = "20130615-git"; - asds = [ "cl-template-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-template/2013-06-15/cl-template-20130615-git.tgz"; - sha256 = "1rhg023a2nxsk5x6abd6i0a8sh36aj0bgsh80w60m3b7xlsva2x2"; - system = "cl-template-tests"; - asd = "cl-template"; - }); - systems = [ "cl-template-tests" ]; - lispLibs = [ (getAttr "cl-template" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-termbox = { - pname = "cl-termbox"; - version = "20211020-git"; - asds = [ "cl-termbox" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-termbox/2021-10-20/cl-termbox-20211020-git.tgz"; - sha256 = "1igmq64zndkgchmzggp34jrmxa81dqlhz2il8qizrpfw5a39cpld"; - system = "cl-termbox"; - asd = "cl-termbox"; - }); - systems = [ "cl-termbox" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-tesseract = { - pname = "cl-tesseract"; - version = "20171130-git"; - asds = [ "cl-tesseract" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tesseract/2017-11-30/cl-tesseract-20171130-git.tgz"; - sha256 = "086627k8whbj60bpw9r3jrdifr4bigqpnp9hxsi7r6702gixz50x"; - system = "cl-tesseract"; - asd = "cl-tesseract"; - }); - systems = [ "cl-tesseract" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-test-more = { - pname = "cl-test-more"; - version = "20200218-git"; - asds = [ "cl-test-more" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; - sha256 = "0ca6ha3zhmckq3ad9lxm6sbg4i0hg3m81xhan4dkxd3x9898jzpc"; - system = "cl-test-more"; - asd = "cl-test-more"; - }); - systems = [ "cl-test-more" ]; - lispLibs = [ (getAttr "prove" pkgs) ]; - }; - cl-tetris3d = { - pname = "cl-tetris3d"; - version = "20181210-git"; - asds = [ "cl-tetris3d" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tetris3d/2018-12-10/cl-tetris3d-20181210-git.tgz"; - sha256 = "09n7344is2vfbp32cd22ynk14h4vqs4xw3plbhga8q25ghhx5y9p"; - system = "cl-tetris3d"; - asd = "cl-tetris3d"; - }); - systems = [ "cl-tetris3d" ]; - lispLibs = [ (getAttr "cl-glu" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "iterate" pkgs) (getAttr "lispbuilder-sdl" pkgs) ]; - }; - cl-textmagic = { - pname = "cl-textmagic"; - version = "20151218-git"; - asds = [ "cl-textmagic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-textmagic/2015-12-18/cl-textmagic-20151218-git.tgz"; - sha256 = "0xw6g1r5vxmnbz3kxf2q6s9dr9l2aacyri1wchzw4jx5wlcnkshw"; - system = "cl-textmagic"; - asd = "cl-textmagic"; - }); - systems = [ "cl-textmagic" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "dexador" pkgs) ]; - }; - cl-textmagic-test = { - pname = "cl-textmagic-test"; - version = "20151218-git"; - asds = [ "cl-textmagic-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-textmagic/2015-12-18/cl-textmagic-20151218-git.tgz"; - sha256 = "0xw6g1r5vxmnbz3kxf2q6s9dr9l2aacyri1wchzw4jx5wlcnkshw"; - system = "cl-textmagic-test"; - asd = "cl-textmagic-test"; - }); - systems = [ "cl-textmagic-test" ]; - lispLibs = [ (getAttr "cl-textmagic" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-tga = { - pname = "cl-tga"; - version = "20160318-git"; - asds = [ "cl-tga" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tga/2016-03-18/cl-tga-20160318-git.tgz"; - sha256 = "03k3npmn0xd3fd2m7vwxph82av2xrfb150imqrinlzqmzvz1v1br"; - system = "cl-tga"; - asd = "cl-tga"; - }); - systems = [ "cl-tga" ]; - lispLibs = [ ]; - }; - cl-threadpool = { - pname = "cl-threadpool"; - version = "quickload-current-release-86ef8a6b-git"; - asds = [ "cl-threadpool" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-threadpool/2021-02-28/cl-threadpool-quickload-current-release-86ef8a6b-git.tgz"; - sha256 = "0yg09fpzqbmga1vx0p956vx6fyjmrgczb108fr0djswfn1mdiq3j"; - system = "cl-threadpool"; - asd = "cl-threadpool"; - }); - systems = [ "cl-threadpool" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "queues_dot_simple-cqueue" pkgs) ]; - }; - cl-threadpool_slash_doc = { - pname = "cl-threadpool_doc"; - version = "quickload-current-release-86ef8a6b-git"; - asds = [ "cl-threadpool" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-threadpool/2021-02-28/cl-threadpool-quickload-current-release-86ef8a6b-git.tgz"; - sha256 = "0yg09fpzqbmga1vx0p956vx6fyjmrgczb108fr0djswfn1mdiq3j"; - system = "cl-threadpool"; - asd = "cl-threadpool"; - }); - systems = [ "cl-threadpool/doc" ]; - lispLibs = [ (getAttr "cl-html-readme" pkgs) (getAttr "cl-threadpool" pkgs) (getAttr "docparser" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-threadpool_slash_test = { - pname = "cl-threadpool_test"; - version = "quickload-current-release-86ef8a6b-git"; - asds = [ "cl-threadpool" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-threadpool/2021-02-28/cl-threadpool-quickload-current-release-86ef8a6b-git.tgz"; - sha256 = "0yg09fpzqbmga1vx0p956vx6fyjmrgczb108fr0djswfn1mdiq3j"; - system = "cl-threadpool"; - asd = "cl-threadpool"; - }); - systems = [ "cl-threadpool/test" ]; - lispLibs = [ (getAttr "cl-threadpool" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "verbose" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-tidy = { - pname = "cl-tidy"; - version = "20170830-git"; - asds = [ "cl-tidy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tidy/2017-08-30/cl-tidy-20170830-git.tgz"; - sha256 = "13j0jgf6czb24148w2wxfwlji6vnc49qvyr5wzq5ps55b27ddlz6"; - system = "cl-tidy"; - asd = "cl-tidy"; - }); - systems = [ "cl-tidy" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-tiled = { - pname = "cl-tiled"; - version = "20210531-git"; - asds = [ "cl-tiled" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tiled/2021-05-31/cl-tiled-20210531-git.tgz"; - sha256 = "1xknfdrlghrdvsx4xclvj43irwf26np5ndpmnkwnsrhfbj8ypk48"; - system = "cl-tiled"; - asd = "cl-tiled"; - }); - systems = [ "cl-tiled" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "chipz" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-json" pkgs) (getAttr "nibbles" pkgs) (getAttr "parse-float" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) (getAttr "xmls" pkgs) ]; - }; - cl-tk = { - pname = "cl-tk"; - version = "20150608-git"; - asds = [ "cl-tk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tk/2015-06-08/cl-tk-20150608-git.tgz"; - sha256 = "0fm4q4pkzbyxr6227vavvy4lm7rfw214lp2dylgzjzcp6f5r4n7w"; - system = "cl-tk"; - asd = "cl-tk"; - }); - systems = [ "cl-tk" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-tld = { - pname = "cl-tld"; - version = "20220220-git"; - asds = [ "cl-tld" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tld/2022-02-20/cl-tld-20220220-git.tgz"; - sha256 = "1xm471p92in5g4fcxgqshwgr2d7937jw7jv6j473slwkxjvx8dp6"; - system = "cl-tld"; - asd = "cl-tld"; - }); - systems = [ "cl-tld" ]; - lispLibs = [ ]; - }; - cl-tls = { - pname = "cl-tls"; - version = "20221106-git"; - asds = [ "cl-tls" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tls/2022-11-06/cl-tls-20221106-git.tgz"; - sha256 = "1j6gwv21ibkk6xd1xxm54wgwp09dzqg60b8z72hivpnq8gwm0ba7"; - system = "cl-tls"; - asd = "cl-tls"; - }); - systems = [ "cl-tls" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-base64" pkgs) (getAttr "fast-io" pkgs) (getAttr "ironclad" pkgs) ]; - }; - cl-tokyo-cabinet = { - pname = "cl-tokyo-cabinet"; - version = "20160825-git"; - asds = [ "cl-tokyo-cabinet" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tokyo-cabinet/2016-08-25/cl-tokyo-cabinet-20160825-git.tgz"; - sha256 = "07961in8fa09bjnpwkdn0w6dj37nppzmgg50kf8khspnjh1sjsr2"; - system = "cl-tokyo-cabinet"; - asd = "cl-tokyo-cabinet"; - }); - systems = [ "cl-tokyo-cabinet" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "deoxybyte-systems" pkgs) ]; - }; - cl-tokyo-cabinet-test = { - pname = "cl-tokyo-cabinet-test"; - version = "20160825-git"; - asds = [ "cl-tokyo-cabinet-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tokyo-cabinet/2016-08-25/cl-tokyo-cabinet-20160825-git.tgz"; - sha256 = "07961in8fa09bjnpwkdn0w6dj37nppzmgg50kf8khspnjh1sjsr2"; - system = "cl-tokyo-cabinet-test"; - asd = "cl-tokyo-cabinet-test"; - }); - systems = [ "cl-tokyo-cabinet-test" ]; - lispLibs = [ (getAttr "cl-tokyo-cabinet" pkgs) (getAttr "deoxybyte-io" pkgs) (getAttr "deoxybyte-utilities" pkgs) (getAttr "lift" pkgs) ]; - }; - cl-toml = { - pname = "cl-toml"; - version = "20191130-git"; - asds = [ "cl-toml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-toml/2019-11-30/cl-toml-20191130-git.tgz"; - sha256 = "1g5i60i78s0ms608fyc6sgaaqr6jdsln75n26lmfbcaqw2g1q9dk"; - system = "cl-toml"; - asd = "cl-toml"; - }); - systems = [ "cl-toml" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "esrap" pkgs) (getAttr "local-time" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - cl-toml-test = { - pname = "cl-toml-test"; - version = "20191130-git"; - asds = [ "cl-toml-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-toml/2019-11-30/cl-toml-20191130-git.tgz"; - sha256 = "1g5i60i78s0ms608fyc6sgaaqr6jdsln75n26lmfbcaqw2g1q9dk"; - system = "cl-toml-test"; - asd = "cl-toml-test"; - }); - systems = [ "cl-toml-test" ]; - lispLibs = [ (getAttr "cl-toml" pkgs) (getAttr "prove" pkgs) ]; - }; - cl-transmission = { - pname = "cl-transmission"; - version = "20200325-git"; - asds = [ "cl-transmission" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-transmission/2020-03-25/cl-transmission-20200325-git.tgz"; - sha256 = "0sg3f2jqs2z3mvscjhc43hkd34vlcc4c8hq8rhh5w1gjg19z57hb"; - system = "cl-transmission"; - asd = "cl-transmission"; - }); - systems = [ "cl-transmission" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "jonathan" pkgs) (getAttr "named-readtables" pkgs) (getAttr "rutils" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-transmission-test = { - pname = "cl-transmission-test"; - version = "20200325-git"; - asds = [ "cl-transmission-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-transmission/2020-03-25/cl-transmission-20200325-git.tgz"; - sha256 = "0sg3f2jqs2z3mvscjhc43hkd34vlcc4c8hq8rhh5w1gjg19z57hb"; - system = "cl-transmission-test"; - asd = "cl-transmission-test"; - }); - systems = [ "cl-transmission-test" ]; - lispLibs = [ (getAttr "cl-transmission" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-trie = { - pname = "cl-trie"; - version = "20180228-git"; - asds = [ "cl-trie" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-trie/2018-02-28/cl-trie-20180228-git.tgz"; - sha256 = "0ffd67xndmzp7lg2car25swaldi3nvcswnshgb2595gac591qjh6"; - system = "cl-trie"; - asd = "cl-trie"; - }); - systems = [ "cl-trie" ]; - lispLibs = [ ]; - }; - cl-trie-examples = { - pname = "cl-trie-examples"; - version = "20180228-git"; - asds = [ "cl-trie-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-trie/2018-02-28/cl-trie-20180228-git.tgz"; - sha256 = "0ffd67xndmzp7lg2car25swaldi3nvcswnshgb2595gac591qjh6"; - system = "cl-trie-examples"; - asd = "cl-trie-examples"; - }); - systems = [ "cl-trie-examples" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-trie" pkgs) ]; - }; - cl-trie_slash_tests = { - pname = "cl-trie_tests"; - version = "20180228-git"; - asds = [ "cl-trie" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-trie/2018-02-28/cl-trie-20180228-git.tgz"; - sha256 = "0ffd67xndmzp7lg2car25swaldi3nvcswnshgb2595gac591qjh6"; - system = "cl-trie"; - asd = "cl-trie"; - }); - systems = [ "cl-trie/tests" ]; - lispLibs = [ (getAttr "cl-trie" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-tui = { - pname = "cl-tui"; - version = "20200427-git"; - asds = [ "cl-tui" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tui/2020-04-27/cl-tui-20200427-git.tgz"; - sha256 = "1s0z7sjb3p1fxypc2x9fl0y094qa1a2iqjbn5him4hs8z7xm5kz8"; - system = "cl-tui"; - asd = "cl-tui"; - }); - systems = [ "cl-tui" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "cl-charms" pkgs) (getAttr "cl-containers" pkgs) (getAttr "osicat" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - cl-tulip-graph = { - pname = "cl-tulip-graph"; - version = "20130615-git"; - asds = [ "cl-tulip-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tulip-graph/2013-06-15/cl-tulip-graph-20130615-git.tgz"; - sha256 = "0zmmwqabbyzdikn8x0xqrj192wr5w87l828nwandqg59af2isxav"; - system = "cl-tulip-graph"; - asd = "cl-tulip-graph"; - }); - systems = [ "cl-tulip-graph" ]; - lispLibs = [ ]; - }; - cl-tuples = { - pname = "cl-tuples"; - version = "20140713-git"; - asds = [ "cl-tuples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tuples/2014-07-13/cl-tuples-20140713-git.tgz"; - sha256 = "060xmr03y8n0mnf4x4fnrirljcjk1jcir7jsjq4w9d5vzq3aqm9m"; - system = "cl-tuples"; - asd = "cl-tuples"; - }); - systems = [ "cl-tuples" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-twit-repl = { - pname = "cl-twit-repl"; - version = "20180228-git"; - asds = [ "cl-twit-repl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz"; - sha256 = "07l86c63ssahpz3s9f7d99mbzmh60askkpdrhjrdbzd1vxlwkhcr"; - system = "cl-twit-repl"; - asd = "cl-twit-repl"; - }); - systems = [ "cl-twit-repl" ]; - lispLibs = [ (getAttr "cl-twitter" pkgs) ]; - }; - cl-twitter = { - pname = "cl-twitter"; - version = "20180228-git"; - asds = [ "cl-twitter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz"; - sha256 = "07l86c63ssahpz3s9f7d99mbzmh60askkpdrhjrdbzd1vxlwkhcr"; - system = "cl-twitter"; - asd = "cl-twitter"; - }); - systems = [ "cl-twitter" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-oauth" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "drakma" pkgs) (getAttr "trivial-http" pkgs) (getAttr "url-rewrite" pkgs) ]; - }; - cl-typesetting = { - pname = "cl-typesetting"; - version = "20210531-git"; - asds = [ "cl-typesetting" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz"; - sha256 = "0fcs5mq0gxfczbrg7ay8r4bf5r4g6blvpdbjkhcl8dapcikyn35h"; - system = "cl-typesetting"; - asd = "cl-typesetting"; - }); - systems = [ "cl-typesetting" ]; - lispLibs = [ (getAttr "cl-pdf" pkgs) ]; - }; - cl-uglify-js = { - pname = "cl-uglify-js"; - version = "20150709-git"; - asds = [ "cl-uglify-js" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-uglify-js/2015-07-09/cl-uglify-js-20150709-git.tgz"; - sha256 = "0k39y3c93jgxpr7gwz7w0d8yknn1fdnxrjhd03057lvk5w8js27a"; - system = "cl-uglify-js"; - asd = "cl-uglify-js"; - }); - systems = [ "cl-uglify-js" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-ppcre-unicode" pkgs) (getAttr "iterate" pkgs) (getAttr "parse-js" pkgs) (getAttr "parse-number" pkgs) ]; - }; - cl-unicode = { - pname = "cl-unicode"; - version = "20210228-git"; - asds = [ "cl-unicode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unicode/2021-02-28/cl-unicode-20210228-git.tgz"; - sha256 = "1a9gbzvi5gj3z9gcia1rgmnk0dzgc82vz47bgnfvhn4q0c7mvk31"; - system = "cl-unicode"; - asd = "cl-unicode"; - }); - systems = [ "cl-unicode" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - cl-unicode_slash_base = { - pname = "cl-unicode_base"; - version = "20210228-git"; - asds = [ "cl-unicode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unicode/2021-02-28/cl-unicode-20210228-git.tgz"; - sha256 = "1a9gbzvi5gj3z9gcia1rgmnk0dzgc82vz47bgnfvhn4q0c7mvk31"; - system = "cl-unicode"; - asd = "cl-unicode"; - }); - systems = [ "cl-unicode/base" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-unicode_slash_build = { - pname = "cl-unicode_build"; - version = "20210228-git"; - asds = [ "cl-unicode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unicode/2021-02-28/cl-unicode-20210228-git.tgz"; - sha256 = "1a9gbzvi5gj3z9gcia1rgmnk0dzgc82vz47bgnfvhn4q0c7mvk31"; - system = "cl-unicode"; - asd = "cl-unicode"; - }); - systems = [ "cl-unicode/build" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-unicode_slash_test = { - pname = "cl-unicode_test"; - version = "20210228-git"; - asds = [ "cl-unicode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unicode/2021-02-28/cl-unicode-20210228-git.tgz"; - sha256 = "1a9gbzvi5gj3z9gcia1rgmnk0dzgc82vz47bgnfvhn4q0c7mvk31"; - system = "cl-unicode"; - asd = "cl-unicode"; - }); - systems = [ "cl-unicode/test" ]; - lispLibs = [ (getAttr "cl-unicode" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-unification = { - pname = "cl-unification"; - version = "20211230-git"; - asds = [ "cl-unification" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unification/2021-12-30/cl-unification-20211230-git.tgz"; - sha256 = "1k4ngdn1qycjakwl66kvxk6kjxhkamzq3yfq4qlpc0kd15p7d2xn"; - system = "cl-unification"; - asd = "cl-unification"; - }); - systems = [ "cl-unification" ]; - lispLibs = [ ]; - }; - cl-unification-lib = { - pname = "cl-unification-lib"; - version = "20211230-git"; - asds = [ "cl-unification-lib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unification/2021-12-30/cl-unification-20211230-git.tgz"; - sha256 = "1k4ngdn1qycjakwl66kvxk6kjxhkamzq3yfq4qlpc0kd15p7d2xn"; - system = "cl-unification-lib"; - asd = "cl-unification-lib"; - }); - systems = [ "cl-unification-lib" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-unification" pkgs) ]; - }; - cl-unification-test = { - pname = "cl-unification-test"; - version = "20211230-git"; - asds = [ "cl-unification-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unification/2021-12-30/cl-unification-20211230-git.tgz"; - sha256 = "1k4ngdn1qycjakwl66kvxk6kjxhkamzq3yfq4qlpc0kd15p7d2xn"; - system = "cl-unification-test"; - asd = "cl-unification-test"; - }); - systems = [ "cl-unification-test" ]; - lispLibs = [ (getAttr "cl-unification" pkgs) (getAttr "ptester" pkgs) ]; - }; - cl-union-find = { - pname = "cl-union-find"; - version = "20221106-git"; - asds = [ "cl-union-find" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-union-find/2022-11-06/cl-union-find-20221106-git.tgz"; - sha256 = "14xciva5v3c4zi4vzp1vfhs82a2654yhkfyllr3b0cr7x36jdm7y"; - system = "cl-union-find"; - asd = "cl-union-find"; - }); - systems = [ "cl-union-find" ]; - lispLibs = [ ]; - }; - cl-utilities = { - pname = "cl-utilities"; - version = "1.2.4"; - asds = [ "cl-utilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz"; - sha256 = "1dmbkdr8xm2jw5yx1makqbf1ypqbm0hpkd7zyknxv3cblvz0a87w"; - system = "cl-utilities"; - asd = "cl-utilities"; - }); - systems = [ "cl-utilities" ]; - lispLibs = [ ]; - }; - cl-variates = { - pname = "cl-variates"; - version = "20180131-darcs"; - asds = [ "cl-variates" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-variates/2018-01-31/cl-variates-20180131-darcs.tgz"; - sha256 = "02pd02isfxrn3h8h5kh369rwy17hfjkmd7j24pcihfskamgcqgfx"; - system = "cl-variates"; - asd = "cl-variates"; - }); - systems = [ "cl-variates" ]; - lispLibs = [ (getAttr "asdf-system-connections" pkgs) ]; - }; - cl-vectors = { - pname = "cl-vectors"; - version = "20180228-git"; - asds = [ "cl-vectors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0nckw4zb6s96hll8hrxzvgs2an3bfm0pxcywshbm4bq4rn7niqg4"; - system = "cl-vectors"; - asd = "cl-vectors"; - }); - systems = [ "cl-vectors" ]; - lispLibs = [ (getAttr "cl-aa" pkgs) (getAttr "cl-paths" pkgs) ]; - }; - cl-vhdl = { - pname = "cl-vhdl"; - version = "20160421-git"; - asds = [ "cl-vhdl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vhdl/2016-04-21/cl-vhdl-20160421-git.tgz"; - sha256 = "0i2780ljak8kcqa2zm24dk2fk771m2mvmnbq4xd4vvx9z87lbnvi"; - system = "cl-vhdl"; - asd = "cl-vhdl"; - }); - systems = [ "cl-vhdl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-itertools" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "esrap-liquid" pkgs) (getAttr "iterate" pkgs) ]; - }; - cl-vhdl-tests = { - pname = "cl-vhdl-tests"; - version = "20160421-git"; - asds = [ "cl-vhdl-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vhdl/2016-04-21/cl-vhdl-20160421-git.tgz"; - sha256 = "0i2780ljak8kcqa2zm24dk2fk771m2mvmnbq4xd4vvx9z87lbnvi"; - system = "cl-vhdl-tests"; - asd = "cl-vhdl"; - }); - systems = [ "cl-vhdl-tests" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "cl-vhdl" pkgs) (getAttr "fare-quasiquote-optima" pkgs) (getAttr "fiveam" pkgs) (getAttr "optima" pkgs) ]; - }; - cl-video = { - pname = "cl-video"; - version = "20180228-git"; - asds = [ "cl-video" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; - sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr"; - system = "cl-video"; - asd = "cl-video"; - }); - systems = [ "cl-video" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - cl-video-avi = { - pname = "cl-video-avi"; - version = "20180228-git"; - asds = [ "cl-video-avi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; - sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr"; - system = "cl-video-avi"; - asd = "cl-video-avi"; - }); - systems = [ "cl-video-avi" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-jpeg" pkgs) (getAttr "cl-riff" pkgs) (getAttr "cl-video" pkgs) (getAttr "flexi-streams" pkgs) ]; - }; - cl-video-gif = { - pname = "cl-video-gif"; - version = "20180228-git"; - asds = [ "cl-video-gif" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; - sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr"; - system = "cl-video-gif"; - asd = "cl-video-gif"; - }); - systems = [ "cl-video-gif" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-video" pkgs) (getAttr "skippy" pkgs) ]; - }; - cl-video-player = { - pname = "cl-video-player"; - version = "20180228-git"; - asds = [ "cl-video-player" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; - sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr"; - system = "cl-video-player"; - asd = "cl-video-player"; - }); - systems = [ "cl-video-player" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-portaudio" pkgs) (getAttr "cl-video-avi" pkgs) (getAttr "cl-video-gif" pkgs) (getAttr "cl-video-wav" pkgs) (getAttr "clx" pkgs) ]; - }; - cl-video-wav = { - pname = "cl-video-wav"; - version = "20180228-git"; - asds = [ "cl-video-wav" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-video/2018-02-28/cl-video-20180228-git.tgz"; - sha256 = "1azldcp6r0j1kw6rczicmnv4m0d7rq4m5axz48ny6r2qybha80lr"; - system = "cl-video-wav"; - asd = "cl-video-wav"; - }); - systems = [ "cl-video-wav" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-riff" pkgs) (getAttr "cl-video" pkgs) (getAttr "flexi-streams" pkgs) ]; - }; - cl-virtualbox = { - pname = "cl-virtualbox"; - version = "20180831-git"; - asds = [ "cl-virtualbox" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-virtualbox/2018-08-31/cl-virtualbox-20180831-git.tgz"; - sha256 = "1jzn8jjn9yn9vgnn1r6h0iyxb6j17wm8lmf9j5hk4yqwdzb2nidv"; - system = "cl-virtualbox"; - asd = "cl-virtualbox"; - }); - systems = [ "cl-virtualbox" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "uiop" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-vorbis = { - pname = "cl-vorbis"; - version = "20220707-git"; - asds = [ "cl-vorbis" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-vorbis/2022-07-07/cl-vorbis-20220707-git.tgz"; - sha256 = "1pq06aclyc6nqkdrch91vxgm19sdpvlzlcd76nsn5y7n8dsxgrbr"; - system = "cl-vorbis"; - asd = "cl-vorbis"; - }); - systems = [ "cl-vorbis" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "static-vectors" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cl-voxelize = { - pname = "cl-voxelize"; - version = "20150709-git"; - asds = [ "cl-voxelize" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz"; - sha256 = "1sim8n175dgy0i0dxi1vsqzgjx07lgsnrgn3bizzka58ni5y8xdm"; - system = "cl-voxelize"; - asd = "cl-voxelize"; - }); - systems = [ "cl-voxelize" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - cl-voxelize-examples = { - pname = "cl-voxelize-examples"; - version = "20150709-git"; - asds = [ "cl-voxelize-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz"; - sha256 = "1sim8n175dgy0i0dxi1vsqzgjx07lgsnrgn3bizzka58ni5y8xdm"; - system = "cl-voxelize-examples"; - asd = "cl-voxelize-examples"; - }); - systems = [ "cl-voxelize-examples" ]; - lispLibs = [ (getAttr "cl-ply" pkgs) (getAttr "cl-voxelize" pkgs) ]; - }; - cl-voxelize-test = { - pname = "cl-voxelize-test"; - version = "20150709-git"; - asds = [ "cl-voxelize-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-voxelize/2015-07-09/cl-voxelize-20150709-git.tgz"; - sha256 = "1sim8n175dgy0i0dxi1vsqzgjx07lgsnrgn3bizzka58ni5y8xdm"; - system = "cl-voxelize-test"; - asd = "cl-voxelize-test"; - }); - systems = [ "cl-voxelize-test" ]; - lispLibs = [ (getAttr "cl-voxelize" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-wadler-pprint = { - pname = "cl-wadler-pprint"; - version = "20191007-git"; - asds = [ "cl-wadler-pprint" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wadler-pprint/2019-10-07/cl-wadler-pprint-20191007-git.tgz"; - sha256 = "0y5jxk7yiw8wng7hg91cwibh6d2hf1sv2mzqhkds6l4myhzxb4jr"; - system = "cl-wadler-pprint"; - asd = "cl-wadler-pprint"; - }); - systems = [ "cl-wadler-pprint" ]; - lispLibs = [ ]; - }; - cl-wadler-pprint_slash_test = { - pname = "cl-wadler-pprint_test"; - version = "20191007-git"; - asds = [ "cl-wadler-pprint" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wadler-pprint/2019-10-07/cl-wadler-pprint-20191007-git.tgz"; - sha256 = "0y5jxk7yiw8wng7hg91cwibh6d2hf1sv2mzqhkds6l4myhzxb4jr"; - system = "cl-wadler-pprint"; - asd = "cl-wadler-pprint"; - }); - systems = [ "cl-wadler-pprint/test" ]; - lispLibs = [ (getAttr "cl-wadler-pprint" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-wav = { - pname = "cl-wav"; - version = "20221106-git"; - asds = [ "cl-wav" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wav/2022-11-06/cl-wav-20221106-git.tgz"; - sha256 = "1nf4zw72v0c9fl8mr4si5cr2xz753ydzv19mfzy5dqqx0k1g7wyl"; - system = "cl-wav"; - asd = "cl-wav"; - }); - systems = [ "cl-wav" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-riff" pkgs) ]; - }; - cl-wave-file-writer = { - pname = "cl-wave-file-writer"; - version = "quickload-current-release-42cde6cf-git"; - asds = [ "cl-wave-file-writer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wave-file-writer/2021-10-20/cl-wave-file-writer-quickload-current-release-42cde6cf-git.tgz"; - sha256 = "0mxzp6rm7ah86vp1xj67q43al71k62x407m5vmbldvyb6pmx37fp"; - system = "cl-wave-file-writer"; - asd = "cl-wave-file-writer"; - }); - systems = [ "cl-wave-file-writer" ]; - lispLibs = [ ]; - }; - cl-wave-file-writer_slash_doc = { - pname = "cl-wave-file-writer_doc"; - version = "quickload-current-release-42cde6cf-git"; - asds = [ "cl-wave-file-writer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wave-file-writer/2021-10-20/cl-wave-file-writer-quickload-current-release-42cde6cf-git.tgz"; - sha256 = "0mxzp6rm7ah86vp1xj67q43al71k62x407m5vmbldvyb6pmx37fp"; - system = "cl-wave-file-writer"; - asd = "cl-wave-file-writer"; - }); - systems = [ "cl-wave-file-writer/doc" ]; - lispLibs = [ (getAttr "cl-html-readme" pkgs) (getAttr "cl-wave-file-writer" pkgs) (getAttr "docparser" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-wavelets = { - pname = "cl-wavelets"; - version = "20220707-git"; - asds = [ "cl-wavelets" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wavelets/2022-07-07/cl-wavelets-20220707-git.tgz"; - sha256 = "0z4r01d5mv4rachz5rr5zvnv94q7ka17138vcpsb05sz00vv03ba"; - system = "cl-wavelets"; - asd = "cl-wavelets"; - }); - systems = [ "cl-wavelets" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "serapeum" pkgs) ]; - }; - cl-wavelets_slash_examples = { - pname = "cl-wavelets_examples"; - version = "20220707-git"; - asds = [ "cl-wavelets" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wavelets/2022-07-07/cl-wavelets-20220707-git.tgz"; - sha256 = "0z4r01d5mv4rachz5rr5zvnv94q7ka17138vcpsb05sz00vv03ba"; - system = "cl-wavelets"; - asd = "cl-wavelets"; - }); - systems = [ "cl-wavelets/examples" ]; - lispLibs = [ (getAttr "cl-jpeg" pkgs) (getAttr "cl-wavelets" pkgs) (getAttr "easy-audio" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-wavelets_slash_tests = { - pname = "cl-wavelets_tests"; - version = "20220707-git"; - asds = [ "cl-wavelets" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wavelets/2022-07-07/cl-wavelets-20220707-git.tgz"; - sha256 = "0z4r01d5mv4rachz5rr5zvnv94q7ka17138vcpsb05sz00vv03ba"; - system = "cl-wavelets"; - asd = "cl-wavelets"; - }); - systems = [ "cl-wavelets/tests" ]; - lispLibs = [ (getAttr "cl-wavelets" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-wayland = { - pname = "cl-wayland"; - version = "20190307-git"; - asds = [ "cl-wayland" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wayland/2019-03-07/cl-wayland-20190307-git.tgz"; - sha256 = "1axdkdm5d2bvj674jq6ylwhfwbzzs7yjj6f04c519qbdq9sknbcn"; - system = "cl-wayland"; - asd = "cl-wayland"; - }); - systems = [ "cl-wayland" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - cl-weather-jp = { - pname = "cl-weather-jp"; - version = "20160208-git"; - asds = [ "cl-weather-jp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-weather-jp/2016-02-08/cl-weather-jp-20160208-git.tgz"; - sha256 = "15bp7gdk7ck9xs9lx2rrzqw6awlk6nz03cqy14wv2lvy3j84dc01"; - system = "cl-weather-jp"; - asd = "cl-weather-jp"; - }); - systems = [ "cl-weather-jp" ]; - lispLibs = [ (getAttr "clss" pkgs) (getAttr "dexador" pkgs) (getAttr "function-cache" pkgs) (getAttr "jonathan" pkgs) (getAttr "plump" pkgs) ]; - }; - cl-weather-jp-test = { - pname = "cl-weather-jp-test"; - version = "20160208-git"; - asds = [ "cl-weather-jp-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-weather-jp/2016-02-08/cl-weather-jp-20160208-git.tgz"; - sha256 = "15bp7gdk7ck9xs9lx2rrzqw6awlk6nz03cqy14wv2lvy3j84dc01"; - system = "cl-weather-jp-test"; - asd = "cl-weather-jp-test"; - }); - systems = [ "cl-weather-jp-test" ]; - lispLibs = [ (getAttr "cl-weather-jp" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-webdav = { - pname = "cl-webdav"; - version = "20170830-git"; - asds = [ "cl-webdav" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-webdav/2017-08-30/cl-webdav-20170830-git.tgz"; - sha256 = "1cmzv763k4s5blfhx2p8s7q9gk20p8mj9p34dngydc14d2acrxmg"; - system = "cl-webdav"; - asd = "cl-webdav"; - }); - systems = [ "cl-webdav" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "cxml" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - cl-webdriver-client = { - pname = "cl-webdriver-client"; - version = "20211230-git"; - asds = [ "cl-webdriver-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-webdriver-client/2021-12-30/cl-webdriver-client-20211230-git.tgz"; - sha256 = "12ackxk5glsi2dg7kjn6gr1c6r6xnmd23hwsbb9fghwjl23cqlri"; - system = "cl-webdriver-client"; - asd = "cl-webdriver-client"; - }); - systems = [ "cl-webdriver-client" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "assoc-utils" pkgs) (getAttr "cl-json" pkgs) (getAttr "dexador" pkgs) (getAttr "quri" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - cl-webdriver-client-test = { - pname = "cl-webdriver-client-test"; - version = "20211230-git"; - asds = [ "cl-webdriver-client-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-webdriver-client/2021-12-30/cl-webdriver-client-20211230-git.tgz"; - sha256 = "12ackxk5glsi2dg7kjn6gr1c6r6xnmd23hwsbb9fghwjl23cqlri"; - system = "cl-webdriver-client-test"; - asd = "cl-webdriver-client-test"; - }); - systems = [ "cl-webdriver-client-test" ]; - lispLibs = [ (getAttr "cl-webdriver-client" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cl-webkit2 = { - pname = "cl-webkit2"; - version = "20221106-git"; - asds = [ "cl-webkit2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-webkit/2022-11-06/cl-webkit-20221106-git.tgz"; - sha256 = "13f6s7zwnx0nvllizij4vziph8pz28xkqzfyyis1dzz7cxksf6fy"; - system = "cl-webkit2"; - asd = "cl-webkit2"; - }); - systems = [ "cl-webkit2" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-cffi-gtk" pkgs) ]; - }; - cl-who = { - pname = "cl-who"; - version = "20220331-git"; - asds = [ "cl-who" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-who/2022-03-31/cl-who-20220331-git.tgz"; - sha256 = "1rdvs113q6d46cblwhsv1vmm31p952wyzkyibqix0ypadpczlgp5"; - system = "cl-who"; - asd = "cl-who"; - }); - systems = [ "cl-who" ]; - lispLibs = [ ]; - }; - cl-who-test = { - pname = "cl-who-test"; - version = "20220331-git"; - asds = [ "cl-who-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-who/2022-03-31/cl-who-20220331-git.tgz"; - sha256 = "1rdvs113q6d46cblwhsv1vmm31p952wyzkyibqix0ypadpczlgp5"; - system = "cl-who-test"; - asd = "cl-who"; - }); - systems = [ "cl-who-test" ]; - lispLibs = [ (getAttr "cl-who" pkgs) (getAttr "flexi-streams" pkgs) ]; - }; - cl-why = { - pname = "cl-why"; - version = "20180228-git"; - asds = [ "cl-why" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-why/2018-02-28/cl-why-20180228-git.tgz"; - sha256 = "01xm7gj1wwd7i3r49jfdm96gwl7nvrn0h6q22kpzrb8zs48wj947"; - system = "cl-why"; - asd = "cl-why"; - }); - systems = [ "cl-why" ]; - lispLibs = [ ]; - }; - cl-why-test = { - pname = "cl-why-test"; - version = "20180228-git"; - asds = [ "cl-why-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-why/2018-02-28/cl-why-20180228-git.tgz"; - sha256 = "01xm7gj1wwd7i3r49jfdm96gwl7nvrn0h6q22kpzrb8zs48wj947"; - system = "cl-why-test"; - asd = "cl-why"; - }); - systems = [ "cl-why-test" ]; - lispLibs = [ (getAttr "cl-why" pkgs) (getAttr "flexi-streams" pkgs) ]; - }; - cl-with = { - pname = "cl-with"; - version = "20211020-git"; - asds = [ "cl-with" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-with/2021-10-20/cl-with-20211020-git.tgz"; - sha256 = "1x4laq7zi12xb28rfrh8hcy92pkfvjxsp2nn6jkmrhfynky5180w"; - system = "cl-with"; - asd = "cl-with"; - }); - systems = [ "cl-with" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - cl-wol_dot_cli = { - pname = "cl-wol.cli"; - version = "20220331-git"; - asds = [ "cl-wol.cli" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wol/2022-03-31/cl-wol-20220331-git.tgz"; - sha256 = "0pcg1gix6qf5c545l86swbpnjmgb0yxkwb0s52da2jnpbg6f8pkk"; - system = "cl-wol.cli"; - asd = "cl-wol.cli"; - }); - systems = [ "cl-wol.cli" ]; - lispLibs = [ (getAttr "cl-ascii-table" pkgs) (getAttr "cl-migratum" pkgs) (getAttr "cl-migratum_dot_driver_dot_dbi" pkgs) (getAttr "cl-migratum_dot_provider_dot_local-path" pkgs) (getAttr "cl-wol_dot_core" pkgs) (getAttr "clingon" pkgs) ]; - }; - cl-wol_dot_core = { - pname = "cl-wol.core"; - version = "20220331-git"; - asds = [ "cl-wol.core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wol/2022-03-31/cl-wol-20220331-git.tgz"; - sha256 = "0pcg1gix6qf5c545l86swbpnjmgb0yxkwb0s52da2jnpbg6f8pkk"; - system = "cl-wol.core"; - asd = "cl-wol.core"; - }); - systems = [ "cl-wol.core" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-wol_dot_test = { - pname = "cl-wol.test"; - version = "20220331-git"; - asds = [ "cl-wol.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wol/2022-03-31/cl-wol-20220331-git.tgz"; - sha256 = "0pcg1gix6qf5c545l86swbpnjmgb0yxkwb0s52da2jnpbg6f8pkk"; - system = "cl-wol.test"; - asd = "cl-wol.test"; - }); - systems = [ "cl-wol.test" ]; - lispLibs = [ (getAttr "cl-wol_dot_core" pkgs) (getAttr "rove" pkgs) ]; - }; - cl-wordcut = { - pname = "cl-wordcut"; - version = "20160421-git"; - asds = [ "cl-wordcut" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wordcut/2016-04-21/cl-wordcut-20160421-git.tgz"; - sha256 = "1b8b3b1rgk0y87l54325ilcly8rq9qxalcsmw6rk8q6dq13lgv78"; - system = "cl-wordcut"; - asd = "cl-wordcut"; - }); - systems = [ "cl-wordcut" ]; - lispLibs = [ ]; - }; - cl-wordcut_slash_test = { - pname = "cl-wordcut_test"; - version = "20160421-git"; - asds = [ "cl-wordcut" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-wordcut/2016-04-21/cl-wordcut-20160421-git.tgz"; - sha256 = "1b8b3b1rgk0y87l54325ilcly8rq9qxalcsmw6rk8q6dq13lgv78"; - system = "cl-wordcut"; - asd = "cl-wordcut"; - }); - systems = [ "cl-wordcut/test" ]; - lispLibs = [ (getAttr "cl-wordcut" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - cl-xdg = { - pname = "cl-xdg"; - version = "20170124-git"; - asds = [ "cl-xdg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-xdg/2017-01-24/cl-xdg-20170124-git.tgz"; - sha256 = "078hgsab0gl6s96wq09ibq5alzyyqh6wwc3yjs44fv18561p5jgc"; - system = "cl-xdg"; - asd = "cl-xdg"; - }); - systems = [ "cl-xdg" ]; - lispLibs = [ (getAttr "cl-sxml" pkgs) (getAttr "cl-xmlspam" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "parse-number" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-xdg-test = { - pname = "cl-xdg-test"; - version = "20170124-git"; - asds = [ "cl-xdg-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-xdg/2017-01-24/cl-xdg-20170124-git.tgz"; - sha256 = "078hgsab0gl6s96wq09ibq5alzyyqh6wwc3yjs44fv18561p5jgc"; - system = "cl-xdg-test"; - asd = "cl-xdg"; - }); - systems = [ "cl-xdg-test" ]; - lispLibs = [ (getAttr "cl-xdg" pkgs) (getAttr "fiveam" pkgs) (getAttr "uiop" pkgs) ]; - }; - cl-xkb = { - pname = "cl-xkb"; - version = "20221106-git"; - asds = [ "cl-xkb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-xkb/2022-11-06/cl-xkb-20221106-git.tgz"; - sha256 = "08c4c4cfwq9yk09pfqir7nxyv8qbb97m0yrzind8vdlxy1lbgxgz"; - system = "cl-xkb"; - asd = "cl-xkb"; - }); - systems = [ "cl-xkb" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - cl-xkeysym = { - pname = "cl-xkeysym"; - version = "20140914-git"; - asds = [ "cl-xkeysym" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-xkeysym/2014-09-14/cl-xkeysym-20140914-git.tgz"; - sha256 = "0yxijl6xb5apb6v6qm8g3kfdr90slgg6vsnx4d1ps9z4zhrjlc6c"; - system = "cl-xkeysym"; - asd = "cl-xkeysym"; - }); - systems = [ "cl-xkeysym" ]; - lispLibs = [ ]; - }; - cl-xmlspam = { - pname = "cl-xmlspam"; - version = "20101006-http"; - asds = [ "cl-xmlspam" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz"; - sha256 = "03jw57889b60nsqgb13vrf5q1g2fasah7qv7knjlx2w4mc1ci7ks"; - system = "cl-xmlspam"; - asd = "cl-xmlspam"; - }); - systems = [ "cl-xmlspam" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cxml" pkgs) ]; - }; - cl-xmpp = { - pname = "cl-xmpp"; - version = "0.8.1"; - asds = [ "cl-xmpp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz"; - sha256 = "1kzzq1y0625zlg83ppcpb0aqzvqbga9x3gm826grmy4rf5jrhz5f"; - system = "cl-xmpp"; - asd = "cl-xmpp"; - }); - systems = [ "cl-xmpp" ]; - lispLibs = [ (getAttr "cxml" pkgs) (getAttr "ironclad" pkgs) (getAttr "usocket" pkgs) ]; - }; - cl-xmpp-sasl = { - pname = "cl-xmpp-sasl"; - version = "0.8.1"; - asds = [ "cl-xmpp-sasl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz"; - sha256 = "1kzzq1y0625zlg83ppcpb0aqzvqbga9x3gm826grmy4rf5jrhz5f"; - system = "cl-xmpp-sasl"; - asd = "cl-xmpp-sasl"; - }); - systems = [ "cl-xmpp-sasl" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "cl-sasl" pkgs) (getAttr "cl-xmpp" pkgs) ]; - }; - cl-xmpp-tls = { - pname = "cl-xmpp-tls"; - version = "0.8.1"; - asds = [ "cl-xmpp-tls" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-xmpp/2010-10-06/cl-xmpp-0.8.1.tgz"; - sha256 = "1kzzq1y0625zlg83ppcpb0aqzvqbga9x3gm826grmy4rf5jrhz5f"; - system = "cl-xmpp-tls"; - asd = "cl-xmpp-tls"; - }); - systems = [ "cl-xmpp-tls" ]; - lispLibs = [ (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-xmpp-sasl" pkgs) ]; - }; - cl-xul = { - pname = "cl-xul"; - version = "20160318-git"; - asds = [ "cl-xul" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-xul/2016-03-18/cl-xul-20160318-git.tgz"; - sha256 = "0ldny4bjfndrkyqcq6klqxvqkpb0lhcqlj52y89ybl9w7dkl2d9p"; - system = "cl-xul"; - asd = "cl-xul"; - }); - systems = [ "cl-xul" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-json" pkgs) (getAttr "closer-mop" pkgs) (getAttr "clws" pkgs) (getAttr "cxml" pkgs) (getAttr "log5" pkgs) (getAttr "md5" pkgs) (getAttr "parenscript" pkgs) ]; - }; - cl-xul-test = { - pname = "cl-xul-test"; - version = "20160318-git"; - asds = [ "cl-xul-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-xul/2016-03-18/cl-xul-20160318-git.tgz"; - sha256 = "0ldny4bjfndrkyqcq6klqxvqkpb0lhcqlj52y89ybl9w7dkl2d9p"; - system = "cl-xul-test"; - asd = "cl-xul-test"; - }); - systems = [ "cl-xul-test" ]; - lispLibs = [ (getAttr "cl-xul" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-yaclyaml = { - pname = "cl-yaclyaml"; - version = "20160825-git"; - asds = [ "cl-yaclyaml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-yaclyaml/2016-08-25/cl-yaclyaml-20160825-git.tgz"; - sha256 = "1clfhz4ii2p11yc3bm23ib4rx0rfxsh18ddc2br82i7mbwks3pll"; - system = "cl-yaclyaml"; - asd = "cl-yaclyaml"; - }); - systems = [ "cl-yaclyaml" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "esrap-liquid" pkgs) (getAttr "iterate" pkgs) (getAttr "parse-number" pkgs) (getAttr "cl-test-more" pkgs) (getAttr "rutils" pkgs) ]; - }; - cl-yaclyaml-tests = { - pname = "cl-yaclyaml-tests"; - version = "20160825-git"; - asds = [ "cl-yaclyaml-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-yaclyaml/2016-08-25/cl-yaclyaml-20160825-git.tgz"; - sha256 = "1clfhz4ii2p11yc3bm23ib4rx0rfxsh18ddc2br82i7mbwks3pll"; - system = "cl-yaclyaml-tests"; - asd = "cl-yaclyaml"; - }); - systems = [ "cl-yaclyaml-tests" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "cl-yaclyaml" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cl-yahoo-finance = { - pname = "cl-yahoo-finance"; - version = "20130312-git"; - asds = [ "cl-yahoo-finance" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-yahoo-finance/2013-03-12/cl-yahoo-finance-20130312-git.tgz"; - sha256 = "1qhs4j00iw1w81lx0vmyiayzqyvixaxc5j2rc89qlr1gx12mqadl"; - system = "cl-yahoo-finance"; - asd = "cl-yahoo-finance"; - }); - systems = [ "cl-yahoo-finance" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-csv" pkgs) (getAttr "drakma" pkgs) (getAttr "url-rewrite" pkgs) (getAttr "yason" pkgs) ]; - }; - cl-yaml = { - pname = "cl-yaml"; - version = "20221106-git"; - asds = [ "cl-yaml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-yaml/2022-11-06/cl-yaml-20221106-git.tgz"; - sha256 = "053fvrrd0p2xx4zxbz4kg9469895ypwsbjfd3nwpi7lwcll2bir5"; - system = "cl-yaml"; - asd = "cl-yaml"; - }); - systems = [ "cl-yaml" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-libyaml" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "parse-number" pkgs) ]; - }; - cl-yaml-test = { - pname = "cl-yaml-test"; - version = "20221106-git"; - asds = [ "cl-yaml-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-yaml/2022-11-06/cl-yaml-20221106-git.tgz"; - sha256 = "053fvrrd0p2xx4zxbz4kg9469895ypwsbjfd3nwpi7lwcll2bir5"; - system = "cl-yaml-test"; - asd = "cl-yaml-test"; - }); - systems = [ "cl-yaml-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-yaml" pkgs) (getAttr "fiveam" pkgs) (getAttr "generic-comparability" pkgs) (getAttr "trivial-benchmark" pkgs) (getAttr "yason" pkgs) ]; - }; - cl-yesql = { - pname = "cl-yesql"; - version = "20211020-git"; - asds = [ "cl-yesql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-yesql/2021-10-20/cl-yesql-20211020-git.tgz"; - sha256 = "0bg133kprbssv0z4ir2hkhf72fbmnz9v9861ncs1isqaby2d4xlj"; - system = "cl-yesql"; - asd = "cl-yesql"; - }); - systems = [ "cl-yesql" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "asdf-package-system" pkgs) (getAttr "esrap" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivia" pkgs) (getAttr "vernacular" pkgs) ]; - }; - cl-zipper = { - pname = "cl-zipper"; - version = "20200610-git"; - asds = [ "cl-zipper" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-zipper/2020-06-10/cl-zipper-20200610-git.tgz"; - sha256 = "1zcfy97l40ynbldxpx8nad81jlrfp0k2vic10wbkrqdfkr696xkg"; - system = "cl-zipper"; - asd = "cl-zipper"; - }); - systems = [ "cl-zipper" ]; - lispLibs = [ (getAttr "prove-asdf" pkgs) ]; - }; - cl-zipper-test = { - pname = "cl-zipper-test"; - version = "20200610-git"; - asds = [ "cl-zipper-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-zipper/2020-06-10/cl-zipper-20200610-git.tgz"; - sha256 = "1zcfy97l40ynbldxpx8nad81jlrfp0k2vic10wbkrqdfkr696xkg"; - system = "cl-zipper-test"; - asd = "cl-zipper"; - }); - systems = [ "cl-zipper-test" ]; - lispLibs = [ (getAttr "cl-zipper" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "test-utils" pkgs) ]; - }; - cl4store = { - pname = "cl4store"; - version = "20200325-git"; - asds = [ "cl4store" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl4store/2020-03-25/cl4store-20200325-git.tgz"; - sha256 = "0qajxwlvmb5vd9qynnl0n62bcl1xhin49xk0p44v6pig8q2jzc26"; - system = "cl4store"; - asd = "cl4store"; - }); - systems = [ "cl4store" ]; - lispLibs = [ (getAttr "cl-rdfxml" pkgs) (getAttr "cl-sparql" pkgs) (getAttr "drakma" pkgs) (getAttr "log5" pkgs) ]; - }; - clache = { - pname = "clache"; - version = "20171130-git"; - asds = [ "clache" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clache/2017-11-30/clache-20171130-git.tgz"; - sha256 = "0wxg004bsay58vr6xr6mlk7wj415qmvisqxvpnjsg6glfwca86ys"; - system = "clache"; - asd = "clache"; - }); - systems = [ "clache" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-annot" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-store" pkgs) (getAttr "cl-syntax" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "ironclad" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - clache-test = { - pname = "clache-test"; - version = "20171130-git"; - asds = [ "clache-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clache/2017-11-30/clache-20171130-git.tgz"; - sha256 = "0wxg004bsay58vr6xr6mlk7wj415qmvisqxvpnjsg6glfwca86ys"; - system = "clache-test"; - asd = "clache-test"; - }); - systems = [ "clache-test" ]; - lispLibs = [ (getAttr "clache" pkgs) (getAttr "cl-test-more" pkgs) ]; - }; - clack = { - pname = "clack"; - version = "20221106-git"; - asds = [ "clack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2022-11-06/clack-20221106-git.tgz"; - sha256 = "1vg61xfgch7lqm15kz8yr5qhqz2507qg88iqpa52mddwg91yamny"; - system = "clack"; - asd = "clack"; - }); - systems = [ "clack" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "lack" pkgs) (getAttr "lack-middleware-backtrace" pkgs) (getAttr "lack-util" pkgs) (getAttr "swank" pkgs) (getAttr "uiop" pkgs) (getAttr "usocket" pkgs) ]; - }; - clack-errors = { - pname = "clack-errors"; - version = "20190813-git"; - asds = [ "clack-errors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz"; - sha256 = "0z6jyn37phnpq02l5wml8z0593g8ps95c0c2lzkhi3is2wcj9cpf"; - system = "clack-errors"; - asd = "clack-errors"; - }); - systems = [ "clack-errors" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "clack" pkgs) (getAttr "closer-mop" pkgs) (getAttr "djula" pkgs) (getAttr "local-time" pkgs) (getAttr "trivial-backtrace" pkgs) ]; - }; - clack-errors-demo = { - pname = "clack-errors-demo"; - version = "20190813-git"; - asds = [ "clack-errors-demo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz"; - sha256 = "0z6jyn37phnpq02l5wml8z0593g8ps95c0c2lzkhi3is2wcj9cpf"; - system = "clack-errors-demo"; - asd = "clack-errors-demo"; - }); - systems = [ "clack-errors-demo" ]; - lispLibs = [ (getAttr "cl-markup" pkgs) (getAttr "clack-errors" pkgs) ]; - }; - clack-errors-test = { - pname = "clack-errors-test"; - version = "20190813-git"; - asds = [ "clack-errors-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz"; - sha256 = "0z6jyn37phnpq02l5wml8z0593g8ps95c0c2lzkhi3is2wcj9cpf"; - system = "clack-errors-test"; - asd = "clack-errors-test"; - }); - systems = [ "clack-errors-test" ]; - lispLibs = [ (getAttr "clack" pkgs) (getAttr "clack-errors" pkgs) (getAttr "drakma" pkgs) (getAttr "fiveam" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - clack-handler-fcgi = { - pname = "clack-handler-fcgi"; - version = "20221106-git"; - asds = [ "clack-handler-fcgi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2022-11-06/clack-20221106-git.tgz"; - sha256 = "1vg61xfgch7lqm15kz8yr5qhqz2507qg88iqpa52mddwg91yamny"; - system = "clack-handler-fcgi"; - asd = "clack-handler-fcgi"; - }); - systems = [ "clack-handler-fcgi" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fastcgi" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "quri" pkgs) (getAttr "usocket" pkgs) ]; - }; - clack-handler-hunchentoot = { - pname = "clack-handler-hunchentoot"; - version = "20221106-git"; - asds = [ "clack-handler-hunchentoot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2022-11-06/clack-20221106-git.tgz"; - sha256 = "1vg61xfgch7lqm15kz8yr5qhqz2507qg88iqpa52mddwg91yamny"; - system = "clack-handler-hunchentoot"; - asd = "clack-handler-hunchentoot"; - }); - systems = [ "clack-handler-hunchentoot" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "clack-socket" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - clack-handler-toot = { - pname = "clack-handler-toot"; - version = "20221106-git"; - asds = [ "clack-handler-toot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2022-11-06/clack-20221106-git.tgz"; - sha256 = "1vg61xfgch7lqm15kz8yr5qhqz2507qg88iqpa52mddwg91yamny"; - system = "clack-handler-toot"; - asd = "clack-handler-toot"; - }); - systems = [ "clack-handler-toot" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "split-sequence" pkgs) (getAttr "toot" pkgs) ]; - }; - clack-handler-woo = { - pname = "clack-handler-woo"; - version = "20220707-git"; - asds = [ "clack-handler-woo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/woo/2022-07-07/woo-20220707-git.tgz"; - sha256 = "0ar7w2nfxhxirlcxxq4j1v4cnmvfkw3ip4i53b853g0pfb84m3kz"; - system = "clack-handler-woo"; - asd = "clack-handler-woo"; - }); - systems = [ "clack-handler-woo" ]; - lispLibs = [ (getAttr "woo" pkgs) ]; - }; - clack-handler-wookie = { - pname = "clack-handler-wookie"; - version = "20221106-git"; - asds = [ "clack-handler-wookie" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2022-11-06/clack-20221106-git.tgz"; - sha256 = "1vg61xfgch7lqm15kz8yr5qhqz2507qg88iqpa52mddwg91yamny"; - system = "clack-handler-wookie"; - asd = "clack-handler-wookie"; - }); - systems = [ "clack-handler-wookie" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-async" pkgs) (getAttr "clack-socket" pkgs) (getAttr "fast-http" pkgs) (getAttr "fast-io" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "quri" pkgs) (getAttr "split-sequence" pkgs) (getAttr "wookie" pkgs) ]; - }; - clack-pretend = { - pname = "clack-pretend"; - version = "20210630-git"; - asds = [ "clack-pretend" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack-pretend/2021-06-30/clack-pretend-20210630-git.tgz"; - sha256 = "1fhbznnrfkg9n3ql97h4adaqf968gn7i9xpggb4zzszc8gwiyasg"; - system = "clack-pretend"; - asd = "clack-pretend"; - }); - systems = [ "clack-pretend" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "circular-streams" pkgs) (getAttr "cl-hash-util" pkgs) (getAttr "clack" pkgs) (getAttr "lack-request" pkgs) ]; - }; - clack-socket = { - pname = "clack-socket"; - version = "20221106-git"; - asds = [ "clack-socket" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2022-11-06/clack-20221106-git.tgz"; - sha256 = "1vg61xfgch7lqm15kz8yr5qhqz2507qg88iqpa52mddwg91yamny"; - system = "clack-socket"; - asd = "clack-socket"; - }); - systems = [ "clack-socket" ]; - lispLibs = [ ]; - }; - clack-static-asset-djula-helpers = { - pname = "clack-static-asset-djula-helpers"; - version = "20211209-git"; - asds = [ "clack-static-asset-djula-helpers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz"; - sha256 = "0fk288812sdm012knqx4qqdhggdqbfgd0zfb6mc06xig20wj02hc"; - system = "clack-static-asset-djula-helpers"; - asd = "clack-static-asset-djula-helpers"; - }); - systems = [ "clack-static-asset-djula-helpers" ]; - lispLibs = [ (getAttr "clack-static-asset-middleware" pkgs) (getAttr "djula" pkgs) ]; - }; - clack-static-asset-middleware = { - pname = "clack-static-asset-middleware"; - version = "20211209-git"; - asds = [ "clack-static-asset-middleware" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz"; - sha256 = "0fk288812sdm012knqx4qqdhggdqbfgd0zfb6mc06xig20wj02hc"; - system = "clack-static-asset-middleware"; - asd = "clack-static-asset-middleware"; - }); - systems = [ "clack-static-asset-middleware" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "ironclad" pkgs) (getAttr "local-time" pkgs) (getAttr "trivial-mimes" pkgs) (getAttr "uiop" pkgs) ]; - }; - clack-static-asset-middleware-test = { - pname = "clack-static-asset-middleware-test"; - version = "20211209-git"; - asds = [ "clack-static-asset-middleware-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack-static-asset-middleware/2021-12-09/clack-static-asset-middleware-20211209-git.tgz"; - sha256 = "0fk288812sdm012knqx4qqdhggdqbfgd0zfb6mc06xig20wj02hc"; - system = "clack-static-asset-middleware-test"; - asd = "clack-static-asset-middleware-test"; - }); - systems = [ "clack-static-asset-middleware-test" ]; - lispLibs = [ (getAttr "clack-static-asset-djula-helpers" pkgs) (getAttr "clack-static-asset-middleware" pkgs) (getAttr "lack-test" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - clack-test = { - pname = "clack-test"; - version = "20221106-git"; - asds = [ "clack-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2022-11-06/clack-20221106-git.tgz"; - sha256 = "1vg61xfgch7lqm15kz8yr5qhqz2507qg88iqpa52mddwg91yamny"; - system = "clack-test"; - asd = "clack-test"; - }); - systems = [ "clack-test" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "clack" pkgs) (getAttr "clack-handler-hunchentoot" pkgs) (getAttr "dexador" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "http-body" pkgs) (getAttr "ironclad" pkgs) (getAttr "rove" pkgs) (getAttr "usocket" pkgs) ]; - }; - clad = { - pname = "clad"; - version = "20211230-git"; - asds = [ "clad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clad/2021-12-30/clad-20211230-git.tgz"; - sha256 = "0g8d1nk3vwz2yhh9wh89khhps165v4zhy1lj30y589ynr1ziwpdz"; - system = "clad"; - asd = "clad"; - }); - systems = [ "clad" ]; - lispLibs = [ ]; - }; - clam = { - pname = "clam"; - version = "20220707-git"; - asds = [ "clam" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluster/2022-07-07/cluster-20220707-git.tgz"; - sha256 = "1cb3v32ix5qiz4f1xgk6as0032xcnc7922m78ykpni0y2gpfp2c7"; - system = "clam"; - asd = "clam"; - }); - systems = [ "clam" ]; - lispLibs = [ ]; - }; - class-options = { - pname = "class-options"; - version = "1.0.1"; - asds = [ "class-options" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/class-options/2020-10-16/class-options_1.0.1.tgz"; - sha256 = "1dkgr1vbrsra44jznzz2bvdf8nlpdrrkjcqrfs8aa7axksda3bqk"; - system = "class-options"; - asd = "class-options"; - }); - systems = [ "class-options" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - class-options_tests = { - pname = "class-options_tests"; - version = "1.0.1"; - asds = [ "class-options_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/class-options/2020-10-16/class-options_1.0.1.tgz"; - sha256 = "1dkgr1vbrsra44jznzz2bvdf8nlpdrrkjcqrfs8aa7axksda3bqk"; - system = "class-options_tests"; - asd = "class-options_tests"; - }); - systems = [ "class-options_tests" ]; - lispLibs = [ (getAttr "class-options" pkgs) (getAttr "closer-mop" pkgs) (getAttr "enhanced-boolean" pkgs) (getAttr "parachute" pkgs) ]; - }; - classimp = { - pname = "classimp"; - version = "20200325-git"; - asds = [ "classimp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/classimp/2020-03-25/classimp-20200325-git.tgz"; - sha256 = "0pbnz6cf1zb2ayk4kbw0gphjb8nflnjns2rwhv86jz0kf0z1hqha"; - system = "classimp"; - asd = "classimp"; - }); - systems = [ "classimp" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - classimp-samples = { - pname = "classimp-samples"; - version = "20200325-git"; - asds = [ "classimp-samples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/classimp/2020-03-25/classimp-20200325-git.tgz"; - sha256 = "0pbnz6cf1zb2ayk4kbw0gphjb8nflnjns2rwhv86jz0kf0z1hqha"; - system = "classimp-samples"; - asd = "classimp-samples"; - }); - systems = [ "classimp-samples" ]; - lispLibs = [ (getAttr "cl-ilut" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-glu" pkgs) (getAttr "cl-glut" pkgs) (getAttr "classimp" pkgs) ]; - }; - classowary = { - pname = "classowary"; - version = "20191007-git"; - asds = [ "classowary" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/classowary/2019-10-07/classowary-20191007-git.tgz"; - sha256 = "099vmnl3lny427c1vzqrxc2mi57lv944cwn0z9hb0fndlr30alkh"; - system = "classowary"; - asd = "classowary"; - }); - systems = [ "classowary" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - classowary-test = { - pname = "classowary-test"; - version = "20191007-git"; - asds = [ "classowary-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/classowary/2019-10-07/classowary-20191007-git.tgz"; - sha256 = "099vmnl3lny427c1vzqrxc2mi57lv944cwn0z9hb0fndlr30alkh"; - system = "classowary-test"; - asd = "classowary-test"; - }); - systems = [ "classowary-test" ]; - lispLibs = [ (getAttr "classowary" pkgs) (getAttr "parachute" pkgs) ]; - }; - clast = { - pname = "clast"; - version = "20211230-git"; - asds = [ "clast" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clast/2021-12-30/clast-20211230-git.tgz"; - sha256 = "1ayr1hq2vv1g1sfxws78hai86za5b68wpfg2lk0bazfzsbfm6nvs"; - system = "clast"; - asd = "clast"; - }); - systems = [ "clast" ]; - lispLibs = [ ]; - }; - clast_slash_tests = { - pname = "clast_tests"; - version = "20211230-git"; - asds = [ "clast" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clast/2021-12-30/clast-20211230-git.tgz"; - sha256 = "1ayr1hq2vv1g1sfxws78hai86za5b68wpfg2lk0bazfzsbfm6nvs"; - system = "clast"; - asd = "clast"; - }); - systems = [ "clast/tests" ]; - lispLibs = [ (getAttr "clast" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - clath = { - pname = "clath"; - version = "20210531-git"; - asds = [ "clath" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clath/2021-05-31/clath-20210531-git.tgz"; - sha256 = "1mdp6qnjlh698bbsqp3z0p3j9npfnrgbzinbld1fyscrlwaz8k27"; - system = "clath"; - asd = "clath"; - }); - systems = [ "clath" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-hash-util" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-who" pkgs) (getAttr "clack" pkgs) (getAttr "drakma" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "ironclad" pkgs) (getAttr "jose" pkgs) (getAttr "ningle" pkgs) (getAttr "north" pkgs) (getAttr "ubiquitous" pkgs) ]; - }; - clavatar = { - pname = "clavatar"; - version = "20121013-git"; - asds = [ "clavatar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clavatar/2012-10-13/clavatar-20121013-git.tgz"; - sha256 = "07r58d4dk5nr3aimrryzbf3jw6580b5gkkbpw74ax4nmm8hz6v5y"; - system = "clavatar"; - asd = "clavatar"; - }); - systems = [ "clavatar" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "drakma" pkgs) (getAttr "iolib" pkgs) (getAttr "ironclad" pkgs) ]; - }; - clavier = { - pname = "clavier"; - version = "20210531-git"; - asds = [ "clavier" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clavier/2021-05-31/clavier-20210531-git.tgz"; - sha256 = "0734xia2hf7lqkm59gjhyvpsp0vl50djyhy4llwwbzbwwdkdihw4"; - system = "clavier"; - asd = "clavier"; - }); - systems = [ "clavier" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "chronicity" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - clavier_dot_test = { - pname = "clavier.test"; - version = "20210531-git"; - asds = [ "clavier.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clavier/2021-05-31/clavier-20210531-git.tgz"; - sha256 = "0734xia2hf7lqkm59gjhyvpsp0vl50djyhy4llwwbzbwwdkdihw4"; - system = "clavier.test"; - asd = "clavier.test"; - }); - systems = [ "clavier.test" ]; - lispLibs = [ (getAttr "clavier" pkgs) (getAttr "stefil" pkgs) ]; - }; - claw = { - pname = "claw"; - version = "stable-git"; - asds = [ "claw" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/claw/2020-10-16/claw-stable-git.tgz"; - sha256 = "146yv0hc4hmk72562ssj2d41143pp84dcbd1h7f4nx1c7hf2bb0d"; - system = "claw"; - asd = "claw"; - }); - systems = [ "claw" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "claw-support" pkgs) (getAttr "local-time" pkgs) (getAttr "trivial-features" pkgs) (getAttr "uiop" pkgs) ]; - }; - claw-olm = { - pname = "claw-olm"; - version = "20210531-git"; - asds = [ "claw-olm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/claw-olm/2021-05-31/claw-olm-20210531-git.tgz"; - sha256 = "04r6d8infhcc7vz95asrvlpc0wzkzq1blaza74nd62alakr6mmrr"; - system = "claw-olm"; - asd = "claw-olm"; - }); - systems = [ "claw-olm" ]; - lispLibs = [ (getAttr "claw-olm-bindings" pkgs) ]; - }; - claw-olm-bindings = { - pname = "claw-olm-bindings"; - version = "20210531-git"; - asds = [ "claw-olm-bindings" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/claw-olm/2021-05-31/claw-olm-20210531-git.tgz"; - sha256 = "04r6d8infhcc7vz95asrvlpc0wzkzq1blaza74nd62alakr6mmrr"; - system = "claw-olm-bindings"; - asd = "claw-olm-bindings"; - }); - systems = [ "claw-olm-bindings" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "trivial-features" pkgs) (getAttr "uiop" pkgs) ]; - }; - claw-support = { - pname = "claw-support"; - version = "stable-git"; - asds = [ "claw-support" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/claw-support/2020-10-16/claw-support-stable-git.tgz"; - sha256 = "1my2ka7h72ipx5n3b465g6kjkasrhsvhqlijwcg6dhlzs5yygl23"; - system = "claw-support"; - asd = "claw-support"; - }); - systems = [ "claw-support" ]; - lispLibs = [ ]; - }; - claw-utils = { - pname = "claw-utils"; - version = "stable-git"; - asds = [ "claw-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/claw-utils/2020-10-16/claw-utils-stable-git.tgz"; - sha256 = "01df3kyf2qs3czi332dnz2s35x2j0fq46vgmsw7wjrrvnqc22mk5"; - system = "claw-utils"; - asd = "claw-utils"; - }); - systems = [ "claw-utils" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "claw" pkgs) ]; - }; - claw_slash_cffi = { - pname = "claw_cffi"; - version = "stable-git"; - asds = [ "claw" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/claw/2020-10-16/claw-stable-git.tgz"; - sha256 = "146yv0hc4hmk72562ssj2d41143pp84dcbd1h7f4nx1c7hf2bb0d"; - system = "claw"; - asd = "claw"; - }); - systems = [ "claw/cffi" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "claw-support" pkgs) (getAttr "local-time" pkgs) (getAttr "trivial-features" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - claw_slash_spec = { - pname = "claw_spec"; - version = "stable-git"; - asds = [ "claw" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/claw/2020-10-16/claw-stable-git.tgz"; - sha256 = "146yv0hc4hmk72562ssj2d41143pp84dcbd1h7f4nx1c7hf2bb0d"; - system = "claw"; - asd = "claw"; - }); - systems = [ "claw/spec" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "claw-support" pkgs) (getAttr "local-time" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - claw_slash_util = { - pname = "claw_util"; - version = "stable-git"; - asds = [ "claw" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/claw/2020-10-16/claw-stable-git.tgz"; - sha256 = "146yv0hc4hmk72562ssj2d41143pp84dcbd1h7f4nx1c7hf2bb0d"; - system = "claw"; - asd = "claw"; - }); - systems = [ "claw/util" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "local-time" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - claw_slash_wrapper = { - pname = "claw_wrapper"; - version = "stable-git"; - asds = [ "claw" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/claw/2020-10-16/claw-stable-git.tgz"; - sha256 = "146yv0hc4hmk72562ssj2d41143pp84dcbd1h7f4nx1c7hf2bb0d"; - system = "claw"; - asd = "claw"; - }); - systems = [ "claw/wrapper" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "claw-support" pkgs) (getAttr "local-time" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - clawk = { - pname = "clawk"; - version = "20200925-git"; - asds = [ "clawk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clawk/2020-09-25/clawk-20200925-git.tgz"; - sha256 = "1ph3xjqilvinvgr9q3w47zxqyz1sqnq030nlx7kgkkv8j3bnqk7a"; - system = "clawk"; - asd = "clawk"; - }); - systems = [ "clawk" ]; - lispLibs = [ (getAttr "regex" pkgs) ]; - }; - claxy = { - pname = "claxy"; - version = "20220220-git"; - asds = [ "claxy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/claxy/2022-02-20/claxy-20220220-git.tgz"; - sha256 = "1n6zbsfp0zkndw7r3nar8srjj1wmfgngia3p7z756mmsvp1l68va"; - system = "claxy"; - asd = "claxy"; - }); - systems = [ "claxy" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "dexador" pkgs) ]; - }; - clazy = { - pname = "clazy"; - version = "20211230-git"; - asds = [ "clazy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clazy/2021-12-30/clazy-20211230-git.tgz"; - sha256 = "1zvkfi7ddhlyckfwx47ays6gf1r0dq9ma86lvplzy58brvk920ds"; - system = "clazy"; - asd = "clazy"; - }); - systems = [ "clazy" ]; - lispLibs = [ ]; - }; - clem = { - pname = "clem"; - version = "20210807-git"; - asds = [ "clem" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz"; - sha256 = "0vmsgxdpxrqkx3xp9n8b0fwkzk1r2dwcwjlc8yy5w2m2sighh2rk"; - system = "clem"; - asd = "clem"; - }); - systems = [ "clem" ]; - lispLibs = [ ]; - }; - clem-benchmark = { - pname = "clem-benchmark"; - version = "20210807-git"; - asds = [ "clem-benchmark" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz"; - sha256 = "0vmsgxdpxrqkx3xp9n8b0fwkzk1r2dwcwjlc8yy5w2m2sighh2rk"; - system = "clem-benchmark"; - asd = "clem-benchmark"; - }); - systems = [ "clem-benchmark" ]; - lispLibs = [ (getAttr "clem" pkgs) ]; - }; - clem-test = { - pname = "clem-test"; - version = "20210807-git"; - asds = [ "clem-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clem/2021-08-07/clem-20210807-git.tgz"; - sha256 = "0vmsgxdpxrqkx3xp9n8b0fwkzk1r2dwcwjlc8yy5w2m2sighh2rk"; - system = "clem-test"; - asd = "clem-test"; - }); - systems = [ "clem-test" ]; - lispLibs = [ (getAttr "clem" pkgs) ]; - }; - cleric = { - pname = "cleric"; - version = "20220220-git"; - asds = [ "cleric" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cleric/2022-02-20/cleric-20220220-git.tgz"; - sha256 = "0a0xqr0bpp0v62f8d13yflz3vz6j4fa9icgc134ajaqxcfa7k0vp"; - system = "cleric"; - asd = "cleric"; - }); - systems = [ "cleric" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "epmd" pkgs) (getAttr "erlang-term" pkgs) (getAttr "md5" pkgs) (getAttr "com_dot_gigamonkeys_dot_binary-data" pkgs) (getAttr "usocket" pkgs) ]; - }; - cleric-test = { - pname = "cleric-test"; - version = "20220220-git"; - asds = [ "cleric-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cleric/2022-02-20/cleric-20220220-git.tgz"; - sha256 = "0a0xqr0bpp0v62f8d13yflz3vz6j4fa9icgc134ajaqxcfa7k0vp"; - system = "cleric-test"; - asd = "cleric-test"; - }); - systems = [ "cleric-test" ]; - lispLibs = [ (getAttr "erlang-term-test" pkgs) (getAttr "cleric" pkgs) (getAttr "fiveam" pkgs) (getAttr "flexi-streams" pkgs) ]; - }; - clerk = { - pname = "clerk"; - version = "20220220-git"; - asds = [ "clerk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clerk/2022-02-20/clerk-20220220-git.tgz"; - sha256 = "0x9rzdylgl6ingkg6g47wh7pb6k30mnl718y8ql1pg0vfd5y1hml"; - system = "clerk"; - asd = "clerk"; - }); - systems = [ "clerk" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - clerk-test = { - pname = "clerk-test"; - version = "20220220-git"; - asds = [ "clerk-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clerk/2022-02-20/clerk-20220220-git.tgz"; - sha256 = "0x9rzdylgl6ingkg6g47wh7pb6k30mnl718y8ql1pg0vfd5y1hml"; - system = "clerk-test"; - asd = "clerk"; - }); - systems = [ "clerk-test" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - clesh = { - pname = "clesh"; - version = "20201220-git"; - asds = [ "clesh" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clesh/2020-12-20/clesh-20201220-git.tgz"; - sha256 = "012ry02djnqyvvs61wbbqj3saz621w2l9gczrywdxhi5p4ycx318"; - system = "clesh"; - asd = "clesh"; - }); - systems = [ "clesh" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) (getAttr "trivial-shell" pkgs) ]; - }; - clesh-tests = { - pname = "clesh-tests"; - version = "20201220-git"; - asds = [ "clesh-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clesh/2020-12-20/clesh-20201220-git.tgz"; - sha256 = "012ry02djnqyvvs61wbbqj3saz621w2l9gczrywdxhi5p4ycx318"; - system = "clesh-tests"; - asd = "clesh-tests"; - }); - systems = [ "clesh-tests" ]; - lispLibs = [ (getAttr "clesh" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - cletris = { - pname = "cletris"; - version = "20211020-git"; - asds = [ "cletris" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz"; - sha256 = "0k7j0jg4dc6q7p7h3vin3hs0f7q8d7yarg2mw0c3hng19r4q9p8v"; - system = "cletris"; - asd = "cletris"; - }); - systems = [ "cletris" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "pal" pkgs) ]; - }; - cletris-network = { - pname = "cletris-network"; - version = "20211020-git"; - asds = [ "cletris-network" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz"; - sha256 = "0k7j0jg4dc6q7p7h3vin3hs0f7q8d7yarg2mw0c3hng19r4q9p8v"; - system = "cletris-network"; - asd = "cletris-network"; - }); - systems = [ "cletris-network" ]; - lispLibs = [ (getAttr "cl-log" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cletris" pkgs) (getAttr "usocket" pkgs) ]; - }; - cletris-test = { - pname = "cletris-test"; - version = "20211020-git"; - asds = [ "cletris-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cletris/2021-10-20/cletris-20211020-git.tgz"; - sha256 = "0k7j0jg4dc6q7p7h3vin3hs0f7q8d7yarg2mw0c3hng19r4q9p8v"; - system = "cletris-test"; - asd = "cletris-test"; - }); - systems = [ "cletris-test" ]; - lispLibs = [ (getAttr "cletris" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - clfswm = { - pname = "clfswm"; - version = "20161204-git"; - asds = [ "clfswm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz"; - sha256 = "1r84cpcs74avkjw18ckz3r3836xhky2fcf5ypbfmajpjzxwn5dzc"; - system = "clfswm"; - asd = "clfswm"; - }); - systems = [ "clfswm" ]; - lispLibs = [ (getAttr "clx" pkgs) ]; - }; - clgplot = { - pname = "clgplot"; - version = "20221106-git"; - asds = [ "clgplot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clgplot/2022-11-06/clgplot-20221106-git.tgz"; - sha256 = "0qhhbdwahpn9ass9am9fdpvcnfpi4jrss60kip6jkkzgir9iyz0p"; - system = "clgplot"; - asd = "clgplot"; - }); - systems = [ "clgplot" ]; - lispLibs = [ (getAttr "iterate" pkgs) (getAttr "uiop" pkgs) ]; - }; - clgplot-test = { - pname = "clgplot-test"; - version = "20221106-git"; - asds = [ "clgplot-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clgplot/2022-11-06/clgplot-20221106-git.tgz"; - sha256 = "0qhhbdwahpn9ass9am9fdpvcnfpi4jrss60kip6jkkzgir9iyz0p"; - system = "clgplot-test"; - asd = "clgplot-test"; - }); - systems = [ "clgplot-test" ]; - lispLibs = [ (getAttr "clgplot" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - clhs = { - pname = "clhs"; - version = "0.6.3"; - asds = [ "clhs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clhs/2015-04-07/clhs-0.6.3.tgz"; - sha256 = "1jffq2w9yql4cvxy2g5c2v402014306qklp4xhddjjlfvs30sfjd"; - system = "clhs"; - asd = "clhs"; - }); - systems = [ "clhs" ]; - lispLibs = [ ]; - }; - cli-parser = { - pname = "cli-parser"; - version = "20150608-git"; - asds = [ "cli-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cli-parser/2015-06-08/cl-cli-parser-20150608-git.tgz"; - sha256 = "0gnpakzakkb2j67v2wh4q87k6mmrv0c0fg56m4vx88kgpxp7f90f"; - system = "cli-parser"; - asd = "cli-parser"; - }); - systems = [ "cli-parser" ]; - lispLibs = [ ]; - }; - clickr = { - pname = "clickr"; - version = "20140713-git"; - asds = [ "clickr" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clickr/2014-07-13/clickr-20140713-git.tgz"; - sha256 = "0sykp4aaxjf8xcyiqyqs6967f0fna8ahjqi7ij5z79fd530sxz2s"; - system = "clickr"; - asd = "clickr"; - }); - systems = [ "clickr" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "md5" pkgs) (getAttr "s-xml" pkgs) (getAttr "s-xml-rpc" pkgs) (getAttr "trivial-http" pkgs) ]; - }; - clim = { - pname = "clim"; - version = "20221106-git"; - asds = [ "clim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim"; - asd = "clim"; - }); - systems = [ "clim" ]; - lispLibs = [ (getAttr "clim-core" pkgs) (getAttr "drei-mcclim" pkgs) ]; - }; - clim-core = { - pname = "clim-core"; - version = "20221106-git"; - asds = [ "clim-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-core"; - asd = "clim-core"; - }); - systems = [ "clim-core" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "spatial-trees" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - clim-core_slash_frames = { - pname = "clim-core_frames"; - version = "20221106-git"; - asds = [ "clim-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-core"; - asd = "clim-core"; - }); - systems = [ "clim-core/frames" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "spatial-trees" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - clim-core_slash_silex = { - pname = "clim-core_silex"; - version = "20221106-git"; - asds = [ "clim-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-core"; - asd = "clim-core"; - }); - systems = [ "clim-core/silex" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "spatial-trees" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - clim-core_slash_system = { - pname = "clim-core_system"; - version = "20221106-git"; - asds = [ "clim-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-core"; - asd = "clim-core"; - }); - systems = [ "clim-core/system" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - clim-debugger = { - pname = "clim-debugger"; - version = "20221106-git"; - asds = [ "clim-debugger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-debugger"; - asd = "clim-debugger"; - }); - systems = [ "clim-debugger" ]; - lispLibs = [ (getAttr "clouseau" pkgs) (getAttr "mcclim" pkgs) (getAttr "slim" pkgs) (getAttr "swank" pkgs) ]; - }; - clim-examples = { - pname = "clim-examples"; - version = "20221106-git"; - asds = [ "clim-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-examples"; - asd = "clim-examples"; - }); - systems = [ "clim-examples" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "clim" pkgs) (getAttr "mcclim" pkgs) (getAttr "mcclim-bezier" pkgs) (getAttr "mcclim-raster-image" pkgs) (getAttr "mcclim-svg" pkgs) ]; - }; - clim-examples_slash_superapp = { - pname = "clim-examples_superapp"; - version = "20221106-git"; - asds = [ "clim-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-examples"; - asd = "clim-examples"; - }); - systems = [ "clim-examples/superapp" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "mcclim" pkgs) ]; - meta = { - broken = true; - }; - }; - clim-lisp = { - pname = "clim-lisp"; - version = "20221106-git"; - asds = [ "clim-lisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-lisp"; - asd = "clim-lisp"; - }); - systems = [ "clim-lisp" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - clim-listener = { - pname = "clim-listener"; - version = "20221106-git"; - asds = [ "clim-listener" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-listener"; - asd = "clim-listener"; - }); - systems = [ "clim-listener" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "clim-debugger" pkgs) (getAttr "mcclim" pkgs) (getAttr "uiop" pkgs) ]; - }; - clim-pdf = { - pname = "clim-pdf"; - version = "20221106-git"; - asds = [ "clim-pdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-pdf"; - asd = "clim-pdf"; - }); - systems = [ "clim-pdf" ]; - lispLibs = [ (getAttr "cl-pdf" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "clim" pkgs) (getAttr "clim-postscript" pkgs) (getAttr "clim-postscript-font" pkgs) ]; - }; - clim-pdf_slash_test = { - pname = "clim-pdf_test"; - version = "20221106-git"; - asds = [ "clim-pdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-pdf"; - asd = "clim-pdf"; - }); - systems = [ "clim-pdf/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "clim-pdf" pkgs) (getAttr "mcclim" pkgs) ]; - meta = { - broken = true; - }; - }; - clim-postscript = { - pname = "clim-postscript"; - version = "20221106-git"; - asds = [ "clim-postscript" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-postscript"; - asd = "clim-postscript"; - }); - systems = [ "clim-postscript" ]; - lispLibs = [ (getAttr "clim" pkgs) (getAttr "clim-postscript-font" pkgs) ]; - }; - clim-postscript-font = { - pname = "clim-postscript-font"; - version = "20221106-git"; - asds = [ "clim-postscript-font" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-postscript-font"; - asd = "clim-postscript-font"; - }); - systems = [ "clim-postscript-font" ]; - lispLibs = [ (getAttr "clim" pkgs) (getAttr "mcclim-backend-common" pkgs) ]; - }; - clim-postscript_slash_test = { - pname = "clim-postscript_test"; - version = "20221106-git"; - asds = [ "clim-postscript" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clim-postscript"; - asd = "clim-postscript"; - }); - systems = [ "clim-postscript/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "clim-postscript" pkgs) (getAttr "mcclim" pkgs) ]; - meta = { - broken = true; - }; - }; - clim-widgets = { - pname = "clim-widgets"; - version = "20200715-git"; - asds = [ "clim-widgets" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clim-widgets/2020-07-15/clim-widgets-20200715-git.tgz"; - sha256 = "0cpr8xn5a33sy75d06b95cfd3b1h9m5iixgg5h4isavpx3aglmy2"; - system = "clim-widgets"; - asd = "clim-widgets"; - }); - systems = [ "clim-widgets" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "closer-mop" pkgs) (getAttr "local-time" pkgs) (getAttr "manifest" pkgs) (getAttr "mcclim" pkgs) (getAttr "nsort" pkgs) (getAttr "perlre" pkgs) (getAttr "simple-date-time" pkgs) ]; - }; - climacs = { - pname = "climacs"; - version = "20200925-git"; - asds = [ "climacs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/climacs/2020-09-25/climacs-20200925-git.tgz"; - sha256 = "0mv8l994fvh8pg8065wwb813nmygv0p5d6pbidhbw6aj7qbmhkhy"; - system = "climacs"; - asd = "climacs"; - }); - systems = [ "climacs" ]; - lispLibs = [ (getAttr "flexichain" pkgs) (getAttr "mcclim" pkgs) ]; - }; - climc = { - pname = "climc"; - version = "20221106-git"; - asds = [ "climc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/climc/2022-11-06/climc-20221106-git.tgz"; - sha256 = "0a05l6yzgnnijk6868r1mz13md28lbmm7hnfiz19aflndj7602cf"; - system = "climc"; - asd = "climc"; - }); - systems = [ "climc" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-xmpp-tls" pkgs) (getAttr "mcclim" pkgs) ]; - }; - climc-test = { - pname = "climc-test"; - version = "20221106-git"; - asds = [ "climc-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/climc/2022-11-06/climc-20221106-git.tgz"; - sha256 = "0a05l6yzgnnijk6868r1mz13md28lbmm7hnfiz19aflndj7602cf"; - system = "climc-test"; - asd = "climc-test"; - }); - systems = [ "climc-test" ]; - lispLibs = [ (getAttr "climc" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - climon = { - pname = "climon"; - version = "20220220-git"; - asds = [ "climon" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/climon/2022-02-20/climon-20220220-git.tgz"; - sha256 = "00bdxpzgvmf5yg785xc9454nv7x5n314kywjd0f12mbvrgklb818"; - system = "climon"; - asd = "climon"; - }); - systems = [ "climon" ]; - lispLibs = [ (getAttr "pal" pkgs) ]; - }; - climon-test = { - pname = "climon-test"; - version = "20220220-git"; - asds = [ "climon-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/climon/2022-02-20/climon-20220220-git.tgz"; - sha256 = "00bdxpzgvmf5yg785xc9454nv7x5n314kywjd0f12mbvrgklb818"; - system = "climon-test"; - asd = "climon-test"; - }); - systems = [ "climon-test" ]; - lispLibs = [ (getAttr "climon" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - clinch = { - pname = "clinch"; - version = "20180228-git"; - asds = [ "clinch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; - sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik"; - system = "clinch"; - asd = "clinch"; - }); - systems = [ "clinch" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "sdl2" pkgs) (getAttr "rtg-math" pkgs) (getAttr "swank" pkgs) (getAttr "trivial-channels" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - clinch-cairo = { - pname = "clinch-cairo"; - version = "20180228-git"; - asds = [ "clinch-cairo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; - sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik"; - system = "clinch-cairo"; - asd = "clinch-cairo"; - }); - systems = [ "clinch-cairo" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-cairo2" pkgs) (getAttr "clinch" pkgs) ]; - }; - clinch-classimp = { - pname = "clinch-classimp"; - version = "20180228-git"; - asds = [ "clinch-classimp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; - sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik"; - system = "clinch-classimp"; - asd = "clinch-classimp"; - }); - systems = [ "clinch-classimp" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "classimp" pkgs) (getAttr "clinch" pkgs) ]; - }; - clinch-freeimage = { - pname = "clinch-freeimage"; - version = "20180228-git"; - asds = [ "clinch-freeimage" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; - sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik"; - system = "clinch-freeimage"; - asd = "clinch-freeimage"; - }); - systems = [ "clinch-freeimage" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-freeimage" pkgs) (getAttr "clinch" pkgs) ]; - }; - clinch-pango = { - pname = "clinch-pango"; - version = "20180228-git"; - asds = [ "clinch-pango" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clinch/2018-02-28/clinch-20180228-git.tgz"; - sha256 = "0hrj3kdxnazffrax3jmr6pgfahpj94lg43lczha6xpayhl49bqik"; - system = "clinch-pango"; - asd = "clinch-pango"; - }); - systems = [ "clinch-pango" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-cairo2" pkgs) (getAttr "cl-pango" pkgs) (getAttr "clinch" pkgs) (getAttr "clinch-cairo" pkgs) (getAttr "xmls" pkgs) ]; - }; - clinenoise = { - pname = "clinenoise"; - version = "20200427-git"; - asds = [ "clinenoise" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clinenoise/2020-04-27/clinenoise-20200427-git.tgz"; - sha256 = "0ydlirfk4dbpqqjwwph99v5swcrhd8v9g8q24fvs35wn2vm08lh1"; - system = "clinenoise"; - asd = "clinenoise"; - }); - systems = [ "clinenoise" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - clingon = { - pname = "clingon"; - version = "20221106-git"; - asds = [ "clingon" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clingon/2022-11-06/clingon-20221106-git.tgz"; - sha256 = "1v47c7pgmvpp3wn52waj55vy6804lsswxv7sbjlpfnd67na91vn7"; - system = "clingon"; - asd = "clingon"; - }); - systems = [ "clingon" ]; - lispLibs = [ (getAttr "bobbin" pkgs) (getAttr "cl-reexport" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) (getAttr "with-user-abort" pkgs) ]; - }; - clingon_dot_demo = { - pname = "clingon.demo"; - version = "20221106-git"; - asds = [ "clingon.demo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clingon/2022-11-06/clingon-20221106-git.tgz"; - sha256 = "1v47c7pgmvpp3wn52waj55vy6804lsswxv7sbjlpfnd67na91vn7"; - system = "clingon.demo"; - asd = "clingon.demo"; - }); - systems = [ "clingon.demo" ]; - lispLibs = [ (getAttr "clingon" pkgs) ]; - }; - clingon_dot_intro = { - pname = "clingon.intro"; - version = "20221106-git"; - asds = [ "clingon.intro" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clingon/2022-11-06/clingon-20221106-git.tgz"; - sha256 = "1v47c7pgmvpp3wn52waj55vy6804lsswxv7sbjlpfnd67na91vn7"; - system = "clingon.intro"; - asd = "clingon.intro"; - }); - systems = [ "clingon.intro" ]; - lispLibs = [ (getAttr "clingon" pkgs) ]; - }; - clingon_dot_test = { - pname = "clingon.test"; - version = "20221106-git"; - asds = [ "clingon.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clingon/2022-11-06/clingon-20221106-git.tgz"; - sha256 = "1v47c7pgmvpp3wn52waj55vy6804lsswxv7sbjlpfnd67na91vn7"; - system = "clingon.test"; - asd = "clingon.test"; - }); - systems = [ "clingon.test" ]; - lispLibs = [ (getAttr "clingon" pkgs) (getAttr "rove" pkgs) ]; - }; - clip = { - pname = "clip"; - version = "20211209-git"; - asds = [ "clip" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clip/2021-12-09/clip-20211209-git.tgz"; - sha256 = "1a3cfvyg0rlzqg872h4abdssh1wbh5v72cj1mbasmxacsiiysvrs"; - system = "clip"; - asd = "clip"; - }); - systems = [ "clip" ]; - lispLibs = [ (getAttr "array-utils" pkgs) (getAttr "lquery" pkgs) ]; - }; - clipper = { - pname = "clipper"; - version = "20150923-git"; - asds = [ "clipper" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clipper/2015-09-23/clipper-20150923-git.tgz"; - sha256 = "0xx1z7xjy2qkb6hx4bjjxcpv180lynpxrmx0741zk0qcxf32y56n"; - system = "clipper"; - asd = "clipper"; - }); - systems = [ "clipper" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "closer-mop" pkgs) (getAttr "dexador" pkgs) (getAttr "fast-io" pkgs) (getAttr "opticl" pkgs) (getAttr "quri" pkgs) (getAttr "split-sequence" pkgs) (getAttr "zs3" pkgs) ]; - }; - clipper-test = { - pname = "clipper-test"; - version = "20150923-git"; - asds = [ "clipper-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clipper/2015-09-23/clipper-20150923-git.tgz"; - sha256 = "0xx1z7xjy2qkb6hx4bjjxcpv180lynpxrmx0741zk0qcxf32y56n"; - system = "clipper-test"; - asd = "clipper-test"; - }); - systems = [ "clipper-test" ]; - lispLibs = [ (getAttr "clipper" pkgs) (getAttr "integral" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - clite = { - pname = "clite"; - version = "20130615-git"; - asds = [ "clite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clite/2013-06-15/clite-20130615-git.tgz"; - sha256 = "0q73vzm55i7m6in9i3fwwaqxvwm3pr7mm7gh7qsvfya61248ynrz"; - system = "clite"; - asd = "clite"; - }); - systems = [ "clite" ]; - lispLibs = [ ]; - }; - clj = { - pname = "clj"; - version = "20201220-git"; - asds = [ "clj" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clj/2020-12-20/clj-20201220-git.tgz"; - sha256 = "0yic6w2n09w3v2r1dlg9a7z59j9rapj4hpz8whcxlw6zs4wrwib2"; - system = "clj"; - asd = "clj"; - }); - systems = [ "clj" ]; - lispLibs = [ (getAttr "agnostic-lizard" pkgs) (getAttr "arrow-macros" pkgs) (getAttr "cl-hamt" pkgs) (getAttr "local-package-aliases" pkgs) (getAttr "named-readtables" pkgs) (getAttr "optima" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "test-utils" pkgs) ]; - }; - clj-con = { - pname = "clj-con"; - version = "20210807-git"; - asds = [ "clj-con" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clj-con/2021-08-07/clj-con-20210807-git.tgz"; - sha256 = "0b996cfvl8nnjf2mh8ki4gdzrr4hhnhbmlgacw74hmfb6nqjb466"; - system = "clj-con"; - asd = "clj-con"; - }); - systems = [ "clj-con" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - clj-con-test = { - pname = "clj-con-test"; - version = "20210807-git"; - asds = [ "clj-con-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clj-con/2021-08-07/clj-con-20210807-git.tgz"; - sha256 = "0b996cfvl8nnjf2mh8ki4gdzrr4hhnhbmlgacw74hmfb6nqjb466"; - system = "clj-con-test"; - asd = "clj-con-test"; - }); - systems = [ "clj-con-test" ]; - lispLibs = [ (getAttr "clj-con" pkgs) (getAttr "fiveam" pkgs) ]; - }; - clj-re = { - pname = "clj-re"; - version = "20221106-git"; - asds = [ "clj-re" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clj-re/2022-11-06/clj-re-20221106-git.tgz"; - sha256 = "1ybcf687hybq2n9vag9i90mdx3cqajdj63q7vryxamp39zmgqks6"; - system = "clj-re"; - asd = "clj-re"; - }); - systems = [ "clj-re" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - clj-re-test = { - pname = "clj-re-test"; - version = "20221106-git"; - asds = [ "clj-re-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clj-re/2022-11-06/clj-re-20221106-git.tgz"; - sha256 = "1ybcf687hybq2n9vag9i90mdx3cqajdj63q7vryxamp39zmgqks6"; - system = "clj-re-test"; - asd = "clj-re-test"; - }); - systems = [ "clj-re-test" ]; - lispLibs = [ (getAttr "clj-re" pkgs) (getAttr "fiveam" pkgs) ]; - }; - clj_slash_test = { - pname = "clj_test"; - version = "20201220-git"; - asds = [ "clj" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clj/2020-12-20/clj-20201220-git.tgz"; - sha256 = "0yic6w2n09w3v2r1dlg9a7z59j9rapj4hpz8whcxlw6zs4wrwib2"; - system = "clj"; - asd = "clj"; - }); - systems = [ "clj/test" ]; - lispLibs = [ (getAttr "clj" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "test-utils" pkgs) ]; - meta = { - broken = true; - }; - }; - clml = { - pname = "clml"; - version = "20220220-git"; - asds = [ "clml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml"; - asd = "clml"; - }); - systems = [ "clml" ]; - lispLibs = [ (getAttr "clml_dot_association-rule" pkgs) (getAttr "clml_dot_blas" pkgs) (getAttr "clml_dot_classifiers" pkgs) (getAttr "clml_dot_clustering" pkgs) (getAttr "clml_dot_data" pkgs) (getAttr "clml_dot_decision-tree" pkgs) (getAttr "clml_dot_graph" pkgs) (getAttr "clml_dot_hjs" pkgs) (getAttr "clml_dot_lapack" pkgs) (getAttr "clml_dot_nearest-search" pkgs) (getAttr "clml_dot_nonparametric" pkgs) (getAttr "clml_dot_numeric" pkgs) (getAttr "clml_dot_pca" pkgs) (getAttr "clml_dot_som" pkgs) (getAttr "clml_dot_statistics" pkgs) (getAttr "clml_dot_svm" pkgs) (getAttr "clml_dot_text" pkgs) (getAttr "clml_dot_time-series" pkgs) (getAttr "clml_dot_utility" pkgs) ]; - }; - clml_dot_association-rule = { - pname = "clml.association-rule"; - version = "20220220-git"; - asds = [ "clml.association-rule" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.association-rule"; - asd = "clml.association-rule"; - }); - systems = [ "clml.association-rule" ]; - lispLibs = [ (getAttr "clml_dot_hjs" pkgs) ]; - }; - clml_dot_blas = { - pname = "clml.blas"; - version = "20220220-git"; - asds = [ "clml.blas" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.blas"; - asd = "clml.blas"; - }); - systems = [ "clml.blas" ]; - lispLibs = [ (getAttr "clml_dot_blas_dot_complex" pkgs) (getAttr "clml_dot_blas_dot_hompack" pkgs) (getAttr "clml_dot_blas_dot_real" pkgs) ]; - }; - clml_dot_blas_dot_complex = { - pname = "clml.blas.complex"; - version = "20220220-git"; - asds = [ "clml.blas.complex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.blas.complex"; - asd = "clml.blas"; - }); - systems = [ "clml.blas.complex" ]; - lispLibs = [ (getAttr "f2cl-lib" pkgs) ]; - }; - clml_dot_blas_dot_hompack = { - pname = "clml.blas.hompack"; - version = "20220220-git"; - asds = [ "clml.blas.hompack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.blas.hompack"; - asd = "clml.blas"; - }); - systems = [ "clml.blas.hompack" ]; - lispLibs = [ (getAttr "f2cl-lib" pkgs) ]; - meta = { - broken = true; - }; - }; - clml_dot_blas_dot_real = { - pname = "clml.blas.real"; - version = "20220220-git"; - asds = [ "clml.blas.real" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.blas.real"; - asd = "clml.blas"; - }); - systems = [ "clml.blas.real" ]; - lispLibs = [ (getAttr "f2cl-lib" pkgs) ]; - }; - clml_dot_classifiers = { - pname = "clml.classifiers"; - version = "20220220-git"; - asds = [ "clml.classifiers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.classifiers"; - asd = "clml.classifiers"; - }); - systems = [ "clml.classifiers" ]; - lispLibs = [ (getAttr "clml_dot_clustering" pkgs) (getAttr "clml_dot_hjs" pkgs) (getAttr "clml_dot_svm" pkgs) ]; - }; - clml_dot_clustering = { - pname = "clml.clustering"; - version = "20220220-git"; - asds = [ "clml.clustering" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.clustering"; - asd = "clml.clustering"; - }); - systems = [ "clml.clustering" ]; - lispLibs = [ (getAttr "clml_dot_blas" pkgs) (getAttr "clml_dot_hjs" pkgs) (getAttr "clml_dot_nearest-search" pkgs) (getAttr "iterate" pkgs) ]; - }; - clml_dot_data = { - pname = "clml.data"; - version = "20220220-git"; - asds = [ "clml.data" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.data"; - asd = "clml.data"; - }); - systems = [ "clml.data" ]; - lispLibs = [ (getAttr "clml_dot_data_dot_r-datasets" pkgs) ]; - }; - clml_dot_data_dot_r-datasets = { - pname = "clml.data.r-datasets"; - version = "20220220-git"; - asds = [ "clml.data.r-datasets" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.data.r-datasets"; - asd = "clml.data.r-datasets"; - }); - systems = [ "clml.data.r-datasets" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "clml_dot_hjs" pkgs) (getAttr "clml_dot_utility" pkgs) (getAttr "drakma" pkgs) ]; - }; - clml_dot_decision-tree = { - pname = "clml.decision-tree"; - version = "20220220-git"; - asds = [ "clml.decision-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.decision-tree"; - asd = "clml.decision-tree"; - }); - systems = [ "clml.decision-tree" ]; - lispLibs = [ (getAttr "clml_dot_hjs" pkgs) (getAttr "lparallel" pkgs) ]; - }; - clml_dot_docs = { - pname = "clml.docs"; - version = "20220220-git"; - asds = [ "clml.docs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.docs"; - asd = "clml.docs"; - }); - systems = [ "clml.docs" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "clml" pkgs) (getAttr "clod" pkgs) (getAttr "iterate" pkgs) ]; - }; - clml_dot_graph = { - pname = "clml.graph"; - version = "20220220-git"; - asds = [ "clml.graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.graph"; - asd = "clml.graph"; - }); - systems = [ "clml.graph" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "clml_dot_hjs" pkgs) (getAttr "clml_dot_statistics" pkgs) (getAttr "clml_dot_time-series" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - clml_dot_hjs = { - pname = "clml.hjs"; - version = "20220220-git"; - asds = [ "clml.hjs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.hjs"; - asd = "clml.hjs"; - }); - systems = [ "clml.hjs" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "clml_dot_blas" pkgs) (getAttr "clml_dot_lapack" pkgs) (getAttr "clml_dot_statistics" pkgs) (getAttr "clml_dot_utility" pkgs) (getAttr "future" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "iterate" pkgs) ]; - }; - clml_dot_lapack = { - pname = "clml.lapack"; - version = "20220220-git"; - asds = [ "clml.lapack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.lapack"; - asd = "clml.lapack"; - }); - systems = [ "clml.lapack" ]; - lispLibs = [ (getAttr "clml_dot_blas" pkgs) (getAttr "clml_dot_lapack-real" pkgs) (getAttr "f2cl-lib" pkgs) ]; - }; - clml_dot_lapack-real = { - pname = "clml.lapack-real"; - version = "20220220-git"; - asds = [ "clml.lapack-real" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.lapack-real"; - asd = "clml.lapack"; - }); - systems = [ "clml.lapack-real" ]; - lispLibs = [ (getAttr "clml_dot_blas" pkgs) (getAttr "f2cl-lib" pkgs) ]; - }; - clml_dot_nearest-search = { - pname = "clml.nearest-search"; - version = "20220220-git"; - asds = [ "clml.nearest-search" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.nearest-search"; - asd = "clml.nearest-search"; - }); - systems = [ "clml.nearest-search" ]; - lispLibs = [ (getAttr "clml_dot_hjs" pkgs) (getAttr "clml_dot_nonparametric" pkgs) (getAttr "clml_dot_pca" pkgs) ]; - }; - clml_dot_nonparametric = { - pname = "clml.nonparametric"; - version = "20220220-git"; - asds = [ "clml.nonparametric" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.nonparametric"; - asd = "clml.nonparametric"; - }); - systems = [ "clml.nonparametric" ]; - lispLibs = [ (getAttr "clml_dot_hjs" pkgs) ]; - }; - clml_dot_numeric = { - pname = "clml.numeric"; - version = "20220220-git"; - asds = [ "clml.numeric" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.numeric"; - asd = "clml.numeric"; - }); - systems = [ "clml.numeric" ]; - lispLibs = [ (getAttr "clml_dot_hjs" pkgs) ]; - }; - clml_dot_pca = { - pname = "clml.pca"; - version = "20220220-git"; - asds = [ "clml.pca" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.pca"; - asd = "clml.pca"; - }); - systems = [ "clml.pca" ]; - lispLibs = [ (getAttr "clml_dot_decision-tree" pkgs) (getAttr "clml_dot_hjs" pkgs) ]; - }; - clml_dot_pca_dot_examples = { - pname = "clml.pca.examples"; - version = "20220220-git"; - asds = [ "clml.pca.examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.pca.examples"; - asd = "clml.pca"; - }); - systems = [ "clml.pca.examples" ]; - lispLibs = [ (getAttr "clml_dot_hjs" pkgs) (getAttr "clml_dot_pca" pkgs) ]; - }; - clml_dot_som = { - pname = "clml.som"; - version = "20220220-git"; - asds = [ "clml.som" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.som"; - asd = "clml.som"; - }); - systems = [ "clml.som" ]; - lispLibs = [ (getAttr "clml_dot_hjs" pkgs) (getAttr "clml_dot_statistics" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - clml_dot_som_dot_example = { - pname = "clml.som.example"; - version = "20220220-git"; - asds = [ "clml.som.example" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.som.example"; - asd = "clml.som"; - }); - systems = [ "clml.som.example" ]; - lispLibs = [ (getAttr "clml_dot_hjs" pkgs) (getAttr "clml_dot_som" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - clml_dot_statistics = { - pname = "clml.statistics"; - version = "20220220-git"; - asds = [ "clml.statistics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.statistics"; - asd = "clml.statistics"; - }); - systems = [ "clml.statistics" ]; - lispLibs = [ (getAttr "clml_dot_statistics_dot_rand" pkgs) ]; - }; - clml_dot_statistics_dot_rand = { - pname = "clml.statistics.rand"; - version = "20220220-git"; - asds = [ "clml.statistics.rand" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.statistics.rand"; - asd = "clml.statistics.rand"; - }); - systems = [ "clml.statistics.rand" ]; - lispLibs = [ ]; - }; - clml_dot_svm = { - pname = "clml.svm"; - version = "20220220-git"; - asds = [ "clml.svm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.svm"; - asd = "clml.svm"; - }); - systems = [ "clml.svm" ]; - lispLibs = [ (getAttr "clml_dot_decision-tree" pkgs) (getAttr "clml_dot_hjs" pkgs) (getAttr "future" pkgs) (getAttr "lparallel" pkgs) ]; - }; - clml_dot_svm_dot_examples = { - pname = "clml.svm.examples"; - version = "20220220-git"; - asds = [ "clml.svm.examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.svm.examples"; - asd = "clml.svm"; - }); - systems = [ "clml.svm.examples" ]; - lispLibs = [ (getAttr "clml_dot_hjs" pkgs) (getAttr "clml_dot_svm" pkgs) ]; - }; - clml_dot_test = { - pname = "clml.test"; - version = "20220220-git"; - asds = [ "clml.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.test"; - asd = "clml.test"; - }); - systems = [ "clml.test" ]; - lispLibs = [ (getAttr "clml" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - clml_dot_text = { - pname = "clml.text"; - version = "20220220-git"; - asds = [ "clml.text" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.text"; - asd = "clml.text"; - }); - systems = [ "clml.text" ]; - lispLibs = [ (getAttr "clml_dot_hjs" pkgs) (getAttr "clml_dot_nonparametric" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - clml_dot_time-series = { - pname = "clml.time-series"; - version = "20220220-git"; - asds = [ "clml.time-series" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.time-series"; - asd = "clml.time-series"; - }); - systems = [ "clml.time-series" ]; - lispLibs = [ (getAttr "array-operations" pkgs) (getAttr "clml_dot_hjs" pkgs) (getAttr "clml_dot_numeric" pkgs) (getAttr "iterate" pkgs) (getAttr "uiop" pkgs) ]; - }; - clml_dot_utility = { - pname = "clml.utility"; - version = "20220220-git"; - asds = [ "clml.utility" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "clml.utility"; - asd = "clml.utility"; - }); - systems = [ "clml.utility" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "iterate" pkgs) (getAttr "parse-number" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - clnuplot = { - pname = "clnuplot"; - version = "20130128-darcs"; - asds = [ "clnuplot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clnuplot/2013-01-28/clnuplot-20130128-darcs.tgz"; - sha256 = "0yfaay5idv9lq4ilafj305sg349c960n3q400kdayr0gda6pqlqr"; - system = "clnuplot"; - asd = "clnuplot"; - }); - systems = [ "clnuplot" ]; - lispLibs = [ (getAttr "cl-containers" pkgs) (getAttr "cl-mathstats" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "trivial-shell" pkgs) ]; - }; - clobber = { - pname = "clobber"; - version = "20221106-git"; - asds = [ "clobber" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clobber/2022-11-06/clobber-20221106-git.tgz"; - sha256 = "0pqzfn2wqbzzwlwc3l84iv3i3wa9zfgnh14mq67h9qkib8wjzx3n"; - system = "clobber"; - asd = "clobber"; - }); - systems = [ "clobber" ]; - lispLibs = [ ]; - }; - clod = { - pname = "clod"; - version = "20190307-hg"; - asds = [ "clod" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clod/2019-03-07/clod-20190307-hg.tgz"; - sha256 = "0sdlr6jlqnbiyf06648zhq8dpni3zy0n5rwjcrvm4hw7vcy8vhy1"; - system = "clod"; - asd = "clod"; - }); - systems = [ "clod" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) ]; - }; - clods-export = { - pname = "clods-export"; - version = "20210411-git"; - asds = [ "clods-export" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clods-export/2021-04-11/clods-export-20210411-git.tgz"; - sha256 = "1bbzrl855qjs88ni548filghb2y8fvklkik22amwzi6dbzvq48qx"; - system = "clods-export"; - asd = "clods-export"; - }); - systems = [ "clods-export" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cxml" pkgs) (getAttr "iterate" pkgs) (getAttr "local-time" pkgs) (getAttr "zip" pkgs) ]; - }; - clog = { - pname = "clog"; - version = "20221106-git"; - asds = [ "clog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog/2022-11-06/clog-20221106-git.tgz"; - sha256 = "135mj69shjayml9xfwg3sccfw5r901lzmf5vj5crnp9wywjfzywx"; - system = "clog"; - asd = "clog"; - }); - systems = [ "clog" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "atomics" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-dbi" pkgs) (getAttr "cl-isaac" pkgs) (getAttr "cl-pass" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "sqlite" pkgs) (getAttr "cl-template" pkgs) (getAttr "clack" pkgs) (getAttr "closer-mop" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "lack-middleware-static" pkgs) (getAttr "lack-request" pkgs) (getAttr "lack-util-writer-stream" pkgs) (getAttr "mgl-pax" pkgs) (getAttr "parse-float" pkgs) (getAttr "quri" pkgs) (getAttr "trivial-open-browser" pkgs) (getAttr "websocket-driver" pkgs) ]; - }; - clog-ace = { - pname = "clog-ace"; - version = "20221106-git"; - asds = [ "clog-ace" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog-ace/2022-11-06/clog-ace-20221106-git.tgz"; - sha256 = "0hci7qwbnjnjiy4jr6pkn3h4l9j80mypa4fi60adsz4fqm09yr41"; - system = "clog-ace"; - asd = "clog-ace"; - }); - systems = [ "clog-ace" ]; - lispLibs = [ (getAttr "clog" pkgs) ]; - }; - clog-ace_slash_tools = { - pname = "clog-ace_tools"; - version = "20221106-git"; - asds = [ "clog-ace" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog-ace/2022-11-06/clog-ace-20221106-git.tgz"; - sha256 = "0hci7qwbnjnjiy4jr6pkn3h4l9j80mypa4fi60adsz4fqm09yr41"; - system = "clog-ace"; - asd = "clog-ace"; - }); - systems = [ "clog-ace/tools" ]; - lispLibs = [ (getAttr "clog" pkgs) (getAttr "clog-ace" pkgs) ]; - meta = { - broken = true; - }; - }; - clog-plotly = { - pname = "clog-plotly"; - version = "20221106-git"; - asds = [ "clog-plotly" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog-plotly/2022-11-06/clog-plotly-20221106-git.tgz"; - sha256 = "0jzpd41vchn6ag93kfrl8gd3ckds9rq6jpy34dlla6y5s2mbjbif"; - system = "clog-plotly"; - asd = "clog-plotly"; - }); - systems = [ "clog-plotly" ]; - lispLibs = [ (getAttr "clog" pkgs) ]; - }; - clog-plotly_slash_tools = { - pname = "clog-plotly_tools"; - version = "20221106-git"; - asds = [ "clog-plotly" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog-plotly/2022-11-06/clog-plotly-20221106-git.tgz"; - sha256 = "0jzpd41vchn6ag93kfrl8gd3ckds9rq6jpy34dlla6y5s2mbjbif"; - system = "clog-plotly"; - asd = "clog-plotly"; - }); - systems = [ "clog-plotly/tools" ]; - lispLibs = [ (getAttr "clog" pkgs) (getAttr "clog-plotly" pkgs) ]; - meta = { - broken = true; - }; - }; - clog-terminal = { - pname = "clog-terminal"; - version = "20221106-git"; - asds = [ "clog-terminal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog-terminal/2022-11-06/clog-terminal-20221106-git.tgz"; - sha256 = "1ma7x3q4gak0ndwgbpnc1par3zcc6b02mpzwrgqmyi1251868rrq"; - system = "clog-terminal"; - asd = "clog-terminal"; - }); - systems = [ "clog-terminal" ]; - lispLibs = [ (getAttr "clog" pkgs) ]; - }; - clog-terminal_slash_tools = { - pname = "clog-terminal_tools"; - version = "20221106-git"; - asds = [ "clog-terminal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog-terminal/2022-11-06/clog-terminal-20221106-git.tgz"; - sha256 = "1ma7x3q4gak0ndwgbpnc1par3zcc6b02mpzwrgqmyi1251868rrq"; - system = "clog-terminal"; - asd = "clog-terminal"; - }); - systems = [ "clog-terminal/tools" ]; - lispLibs = [ (getAttr "clog" pkgs) (getAttr "clog-terminal" pkgs) ]; - meta = { - broken = true; - }; - }; - clog_slash_docs = { - pname = "clog_docs"; - version = "20221106-git"; - asds = [ "clog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog/2022-11-06/clog-20221106-git.tgz"; - sha256 = "135mj69shjayml9xfwg3sccfw5r901lzmf5vj5crnp9wywjfzywx"; - system = "clog"; - asd = "clog"; - }); - systems = [ "clog/docs" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "clog" pkgs) (getAttr "colorize" pkgs) ]; - meta = { - broken = true; - }; - }; - clog_slash_tools = { - pname = "clog_tools"; - version = "20221106-git"; - asds = [ "clog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog/2022-11-06/clog-20221106-git.tgz"; - sha256 = "135mj69shjayml9xfwg3sccfw5r901lzmf5vj5crnp9wywjfzywx"; - system = "clog"; - asd = "clog"; - }); - systems = [ "clog/tools" ]; - lispLibs = [ (getAttr "clog" pkgs) (getAttr "clog-ace" pkgs) (getAttr "clog-terminal" pkgs) (getAttr "definitions" pkgs) (getAttr "s-base64" pkgs) (getAttr "swank" pkgs) ]; - meta = { - broken = true; - }; - }; - clonsigna = { - pname = "clonsigna"; - version = "20120909-git"; - asds = [ "clonsigna" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clonsigna/2012-09-09/clonsigna-20120909-git.tgz"; - sha256 = "052vdch0q07sx3j615qgw8z536fmqz8fm3qv7f298ql3wcskrj7j"; - system = "clonsigna"; - asd = "clonsigna"; - }); - systems = [ "clonsigna" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "iolib" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - clop = { - pname = "clop"; - version = "v1.0.1"; - asds = [ "clop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clop/2022-02-20/clop-v1.0.1.tgz"; - sha256 = "1q7rlizr8gcbfz4a9660gdbw7d2zbld18akjpibg54j7jh5kb8gc"; - system = "clop"; - asd = "clop"; - }); - systems = [ "clop" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "str" pkgs) (getAttr "esrap" pkgs) (getAttr "local-time" pkgs) (getAttr "parse-number" pkgs) ]; - }; - clop-tests = { - pname = "clop-tests"; - version = "v1.0.1"; - asds = [ "clop-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clop/2022-02-20/clop-v1.0.1.tgz"; - sha256 = "1q7rlizr8gcbfz4a9660gdbw7d2zbld18akjpibg54j7jh5kb8gc"; - system = "clop-tests"; - asd = "clop"; - }); - systems = [ "clop-tests" ]; - lispLibs = [ (getAttr "clop" pkgs) (getAttr "fiveam" pkgs) ]; - }; - clos-diff = { - pname = "clos-diff"; - version = "20150608-git"; - asds = [ "clos-diff" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clos-diff/2015-06-08/clos-diff-20150608-git.tgz"; - sha256 = "0y6chxzqwwwkrrmxxb74wwci6i4ck6i3fq36w9gl03qbrksfyjkz"; - system = "clos-diff"; - asd = "clos-diff"; - }); - systems = [ "clos-diff" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - clos-fixtures = { - pname = "clos-fixtures"; - version = "20160825-git"; - asds = [ "clos-fixtures" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clos-fixtures/2016-08-25/clos-fixtures-20160825-git.tgz"; - sha256 = "1a3yvqszdwnsnk5hr4zrdpaqxb8vlxpl2nhxjl0j97fnmfaiqjhk"; - system = "clos-fixtures"; - asd = "clos-fixtures"; - }); - systems = [ "clos-fixtures" ]; - lispLibs = [ ]; - }; - clos-fixtures-test = { - pname = "clos-fixtures-test"; - version = "20160825-git"; - asds = [ "clos-fixtures-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clos-fixtures/2016-08-25/clos-fixtures-20160825-git.tgz"; - sha256 = "1a3yvqszdwnsnk5hr4zrdpaqxb8vlxpl2nhxjl0j97fnmfaiqjhk"; - system = "clos-fixtures-test"; - asd = "clos-fixtures-test"; - }); - systems = [ "clos-fixtures-test" ]; - lispLibs = [ (getAttr "clos-fixtures" pkgs) (getAttr "fiveam" pkgs) ]; - }; - closer-mop = { - pname = "closer-mop"; - version = "20221106-git"; - asds = [ "closer-mop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/closer-mop/2022-11-06/closer-mop-20221106-git.tgz"; - sha256 = "15bn0v1cvv725smq66ra9yvc7b0jysrmgkalibqzngzmr3mlzqd4"; - system = "closer-mop"; - asd = "closer-mop"; - }); - systems = [ "closer-mop" ]; - lispLibs = [ ]; - }; - closure-common = { - pname = "closure-common"; - version = "20181018-git"; - asds = [ "closure-common" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz"; - sha256 = "0k5r2qxn122pxi301ijir3nayi9sg4d7yiy276l36qmzwhp4mg5n"; - system = "closure-common"; - asd = "closure-common"; - }); - systems = [ "closure-common" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - closure-html = { - pname = "closure-html"; - version = "20180711-git"; - asds = [ "closure-html" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz"; - sha256 = "105vm29qnxh6zj3rh4jwpm8dyp3b9bsva64c8a78cr270p28d032"; - system = "closure-html"; - asd = "closure-html"; - }); - systems = [ "closure-html" ]; - lispLibs = [ (getAttr "closure-common" pkgs) (getAttr "flexi-streams" pkgs) ]; - }; - closure-template = { - pname = "closure-template"; - version = "20150804-git"; - asds = [ "closure-template" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-closure-template/2015-08-04/cl-closure-template-20150804-git.tgz"; - sha256 = "16h0fs6bjjd4n9pbkwcprpgyj26vsw2akk3q08m7xmsmqi05dppv"; - system = "closure-template"; - asd = "closure-template"; - }); - systems = [ "closure-template" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "closer-mop" pkgs) (getAttr "esrap" pkgs) (getAttr "iterate" pkgs) (getAttr "parse-number" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - closure-template-test = { - pname = "closure-template-test"; - version = "20150804-git"; - asds = [ "closure-template-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-closure-template/2015-08-04/cl-closure-template-20150804-git.tgz"; - sha256 = "16h0fs6bjjd4n9pbkwcprpgyj26vsw2akk3q08m7xmsmqi05dppv"; - system = "closure-template-test"; - asd = "closure-template"; - }); - systems = [ "closure-template-test" ]; - lispLibs = [ (getAttr "closure-template" pkgs) (getAttr "lift" pkgs) ]; - }; - clouchdb = { - pname = "clouchdb"; - version = "0.0.16"; - asds = [ "clouchdb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clouchdb/2012-04-07/clouchdb_0.0.16.tgz"; - sha256 = "1zfk4wkz0k5gbfznnbds0gcpc2y08p47rq7mhchf27v6rqg4kd7d"; - system = "clouchdb"; - asd = "clouchdb"; - }); - systems = [ "clouchdb" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "drakma" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "parenscript" pkgs) (getAttr "s-base64" pkgs) ]; - }; - clouchdb-examples = { - pname = "clouchdb-examples"; - version = "0.0.16"; - asds = [ "clouchdb-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clouchdb/2012-04-07/clouchdb_0.0.16.tgz"; - sha256 = "1zfk4wkz0k5gbfznnbds0gcpc2y08p47rq7mhchf27v6rqg4kd7d"; - system = "clouchdb-examples"; - asd = "clouchdb-examples"; - }); - systems = [ "clouchdb-examples" ]; - lispLibs = [ (getAttr "clouchdb" pkgs) (getAttr "parenscript" pkgs) ]; - }; - clouseau = { - pname = "clouseau"; - version = "20221106-git"; - asds = [ "clouseau" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clouseau"; - asd = "clouseau"; - }); - systems = [ "clouseau" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "mcclim" pkgs) ]; - }; - clouseau_slash_test = { - pname = "clouseau_test"; - version = "20221106-git"; - asds = [ "clouseau" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "clouseau"; - asd = "clouseau"; - }); - systems = [ "clouseau/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "clouseau" pkgs) ]; - meta = { - broken = true; - }; - }; - clpython = { - pname = "clpython"; - version = "20220331-git"; - asds = [ "clpython" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-python/2022-03-31/cl-python-20220331-git.tgz"; - sha256 = "1liskpyfd8rbqn45xbymwvh4vic05pyvvf3hnq2ybyixwnkan9i9"; - system = "clpython"; - asd = "clpython"; - }); - systems = [ "clpython" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "yacc" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - clpython_slash_basic = { - pname = "clpython_basic"; - version = "20220331-git"; - asds = [ "clpython" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-python/2022-03-31/cl-python-20220331-git.tgz"; - sha256 = "1liskpyfd8rbqn45xbymwvh4vic05pyvvf3hnq2ybyixwnkan9i9"; - system = "clpython"; - asd = "clpython"; - }); - systems = [ "clpython/basic" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - meta = { - broken = true; - }; - }; - clpython_slash_compiler = { - pname = "clpython_compiler"; - version = "20220331-git"; - asds = [ "clpython" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-python/2022-03-31/cl-python-20220331-git.tgz"; - sha256 = "1liskpyfd8rbqn45xbymwvh4vic05pyvvf3hnq2ybyixwnkan9i9"; - system = "clpython"; - asd = "clpython"; - }); - systems = [ "clpython/compiler" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "yacc" pkgs) (getAttr "closer-mop" pkgs) ]; - meta = { - broken = true; - }; - }; - clpython_slash_contrib = { - pname = "clpython_contrib"; - version = "20220331-git"; - asds = [ "clpython" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-python/2022-03-31/cl-python-20220331-git.tgz"; - sha256 = "1liskpyfd8rbqn45xbymwvh4vic05pyvvf3hnq2ybyixwnkan9i9"; - system = "clpython"; - asd = "clpython"; - }); - systems = [ "clpython/contrib" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "yacc" pkgs) (getAttr "closer-mop" pkgs) ]; - meta = { - broken = true; - }; - }; - clpython_slash_lib = { - pname = "clpython_lib"; - version = "20220331-git"; - asds = [ "clpython" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-python/2022-03-31/cl-python-20220331-git.tgz"; - sha256 = "1liskpyfd8rbqn45xbymwvh4vic05pyvvf3hnq2ybyixwnkan9i9"; - system = "clpython"; - asd = "clpython"; - }); - systems = [ "clpython/lib" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "yacc" pkgs) (getAttr "closer-mop" pkgs) ]; - meta = { - broken = true; - }; - }; - clpython_slash_parser = { - pname = "clpython_parser"; - version = "20220331-git"; - asds = [ "clpython" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-python/2022-03-31/cl-python-20220331-git.tgz"; - sha256 = "1liskpyfd8rbqn45xbymwvh4vic05pyvvf3hnq2ybyixwnkan9i9"; - system = "clpython"; - asd = "clpython"; - }); - systems = [ "clpython/parser" ]; - lispLibs = [ (getAttr "yacc" pkgs) (getAttr "closer-mop" pkgs) ]; - meta = { - broken = true; - }; - }; - clpython_slash_runtime = { - pname = "clpython_runtime"; - version = "20220331-git"; - asds = [ "clpython" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-python/2022-03-31/cl-python-20220331-git.tgz"; - sha256 = "1liskpyfd8rbqn45xbymwvh4vic05pyvvf3hnq2ybyixwnkan9i9"; - system = "clpython"; - asd = "clpython"; - }); - systems = [ "clpython/runtime" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "closer-mop" pkgs) ]; - meta = { - broken = true; - }; - }; - clpython_slash_test = { - pname = "clpython_test"; - version = "20220331-git"; - asds = [ "clpython" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-python/2022-03-31/cl-python-20220331-git.tgz"; - sha256 = "1liskpyfd8rbqn45xbymwvh4vic05pyvvf3hnq2ybyixwnkan9i9"; - system = "clpython"; - asd = "clpython"; - }); - systems = [ "clpython/test" ]; - lispLibs = [ (getAttr "clpython" pkgs) (getAttr "ptester" pkgs) ]; - meta = { - broken = true; - }; - }; - clsql = { - pname = "clsql"; - version = "20221106-git"; - asds = [ "clsql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; - sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; - system = "clsql"; - asd = "clsql"; - }); - systems = [ "clsql" ]; - lispLibs = [ (getAttr "uffi" pkgs) ]; - }; - clsql-aodbc = { - pname = "clsql-aodbc"; - version = "20221106-git"; - asds = [ "clsql-aodbc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; - sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; - system = "clsql-aodbc"; - asd = "clsql-aodbc"; - }); - systems = [ "clsql-aodbc" ]; - lispLibs = [ ]; - }; - clsql-cffi = { - pname = "clsql-cffi"; - version = "20221106-git"; - asds = [ "clsql-cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; - sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; - system = "clsql-cffi"; - asd = "clsql-cffi"; - }); - systems = [ "clsql-cffi" ]; - lispLibs = [ (getAttr "clsql" pkgs) ]; - }; - clsql-fluid = { - pname = "clsql-fluid"; - version = "20170830-git"; - asds = [ "clsql-fluid" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql-fluid/2017-08-30/clsql-fluid-20170830-git.tgz"; - sha256 = "0i7x1xbh83wfr3k4ddsdy57yf0nqfhdxcbwv1na1ina6m5javg11"; - system = "clsql-fluid"; - asd = "clsql-fluid"; - }); - systems = [ "clsql-fluid" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "clsql" pkgs) ]; - }; - clsql-helper = { - pname = "clsql-helper"; - version = "20180131-git"; - asds = [ "clsql-helper" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz"; - sha256 = "0yc6m8yh0gcark98wvjjwdq3xxy308x15pb7fzha6svxa06hf27g"; - system = "clsql-helper"; - asd = "clsql-helper"; - }); - systems = [ "clsql-helper" ]; - lispLibs = [ (getAttr "access" pkgs) (getAttr "alexandria" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "clsql" pkgs) (getAttr "collectors" pkgs) (getAttr "iterate" pkgs) (getAttr "md5" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - clsql-helper-slot-coercer = { - pname = "clsql-helper-slot-coercer"; - version = "20180131-git"; - asds = [ "clsql-helper-slot-coercer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz"; - sha256 = "0yc6m8yh0gcark98wvjjwdq3xxy308x15pb7fzha6svxa06hf27g"; - system = "clsql-helper-slot-coercer"; - asd = "clsql-helper-slot-coercer"; - }); - systems = [ "clsql-helper-slot-coercer" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "clsql-helper" pkgs) ]; - }; - clsql-helper-slot-coercer-test = { - pname = "clsql-helper-slot-coercer-test"; - version = "20180131-git"; - asds = [ "clsql-helper-slot-coercer-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz"; - sha256 = "0yc6m8yh0gcark98wvjjwdq3xxy308x15pb7fzha6svxa06hf27g"; - system = "clsql-helper-slot-coercer-test"; - asd = "clsql-helper-slot-coercer"; - }); - systems = [ "clsql-helper-slot-coercer-test" ]; - lispLibs = [ (getAttr "clsql-helper-slot-coercer" pkgs) (getAttr "lisp-unit2" pkgs) ]; - }; - clsql-helper-test = { - pname = "clsql-helper-test"; - version = "20180131-git"; - asds = [ "clsql-helper-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql-helper/2018-01-31/clsql-helper-20180131-git.tgz"; - sha256 = "0yc6m8yh0gcark98wvjjwdq3xxy308x15pb7fzha6svxa06hf27g"; - system = "clsql-helper-test"; - asd = "clsql-helper"; - }); - systems = [ "clsql-helper-test" ]; - lispLibs = [ (getAttr "clsql-tests" pkgs) (getAttr "clsql-helper" pkgs) (getAttr "lisp-unit2" pkgs) ]; - }; - clsql-local-time = { - pname = "clsql-local-time"; - version = "20201016-git"; - asds = [ "clsql-local-time" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql-local-time/2020-10-16/clsql-local-time-20201016-git.tgz"; - sha256 = "1ipv6ij1md5mw44cbif31hiccrric3302rhssj8f7kg3s8n6mphv"; - system = "clsql-local-time"; - asd = "clsql-local-time"; - }); - systems = [ "clsql-local-time" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "local-time" pkgs) ]; - }; - clsql-mysql = { - pname = "clsql-mysql"; - version = "20221106-git"; - asds = [ "clsql-mysql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; - sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; - system = "clsql-mysql"; - asd = "clsql-mysql"; - }); - systems = [ "clsql-mysql" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "clsql-uffi" pkgs) (getAttr "uffi" pkgs) ]; - }; - clsql-odbc = { - pname = "clsql-odbc"; - version = "20221106-git"; - asds = [ "clsql-odbc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; - sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; - system = "clsql-odbc"; - asd = "clsql-odbc"; - }); - systems = [ "clsql-odbc" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "clsql-uffi" pkgs) ]; - }; - clsql-orm = { - pname = "clsql-orm"; - version = "20160208-git"; - asds = [ "clsql-orm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql-orm/2016-02-08/clsql-orm-20160208-git.tgz"; - sha256 = "1y9604k0mj8h03p85l5nrjkihr3yfj5fp910db9f4ksd1ln2qkka"; - system = "clsql-orm"; - asd = "clsql-orm"; - }); - systems = [ "clsql-orm" ]; - lispLibs = [ (getAttr "cl-inflector" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "clsql" pkgs) (getAttr "iterate" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - clsql-postgresql = { - pname = "clsql-postgresql"; - version = "20221106-git"; - asds = [ "clsql-postgresql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; - sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; - system = "clsql-postgresql"; - asd = "clsql-postgresql"; - }); - systems = [ "clsql-postgresql" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "clsql-uffi" pkgs) ]; - }; - clsql-postgresql-socket = { - pname = "clsql-postgresql-socket"; - version = "20221106-git"; - asds = [ "clsql-postgresql-socket" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; - sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; - system = "clsql-postgresql-socket"; - asd = "clsql-postgresql-socket"; - }); - systems = [ "clsql-postgresql-socket" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "md5" pkgs) (getAttr "uffi" pkgs) ]; - }; - clsql-postgresql-socket3 = { - pname = "clsql-postgresql-socket3"; - version = "20221106-git"; - asds = [ "clsql-postgresql-socket3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; - sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; - system = "clsql-postgresql-socket3"; - asd = "clsql-postgresql-socket3"; - }); - systems = [ "clsql-postgresql-socket3" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "md5" pkgs) (getAttr "cl-postgres" pkgs) ]; - }; - clsql-sqlite = { - pname = "clsql-sqlite"; - version = "20221106-git"; - asds = [ "clsql-sqlite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; - sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; - system = "clsql-sqlite"; - asd = "clsql-sqlite"; - }); - systems = [ "clsql-sqlite" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "clsql-uffi" pkgs) ]; - }; - clsql-sqlite3 = { - pname = "clsql-sqlite3"; - version = "20221106-git"; - asds = [ "clsql-sqlite3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; - sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; - system = "clsql-sqlite3"; - asd = "clsql-sqlite3"; - }); - systems = [ "clsql-sqlite3" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "clsql-uffi" pkgs) ]; - }; - clsql-tests = { - pname = "clsql-tests"; - version = "20221106-git"; - asds = [ "clsql-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; - sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; - system = "clsql-tests"; - asd = "clsql-tests"; - }); - systems = [ "clsql-tests" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "rt" pkgs) (getAttr "uffi" pkgs) ]; - }; - clsql-uffi = { - pname = "clsql-uffi"; - version = "20221106-git"; - asds = [ "clsql-uffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clsql/2022-11-06/clsql-20221106-git.tgz"; - sha256 = "15kxrjv88ai9nvzxswa6rp8dbd1ad3816r4c5zb8xynsd8i5vpz0"; - system = "clsql-uffi"; - asd = "clsql-uffi"; - }); - systems = [ "clsql-uffi" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "uffi" pkgs) ]; - }; - clss = { - pname = "clss"; - version = "20221106-git"; - asds = [ "clss" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clss/2022-11-06/clss-20221106-git.tgz"; - sha256 = "1033dchpanhcgxl5qfhr80aw9adbp9bvllhzvvy5p9mrfnidd1fv"; - system = "clss"; - asd = "clss"; - }); - systems = [ "clss" ]; - lispLibs = [ (getAttr "array-utils" pkgs) (getAttr "plump" pkgs) ]; - }; - cltcl = { - pname = "cltcl"; - version = "20161204-git"; - asds = [ "cltcl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cltcl/2016-12-04/cltcl-20161204-git.tgz"; - sha256 = "18b7fa7m9h9xfhnkxa6r3xzj86p1fvq0mh5q8vdrdv3vxfyc2l68"; - system = "cltcl"; - asd = "cltcl"; - }); - systems = [ "cltcl" ]; - lispLibs = [ ]; - }; - cluffer = { - pname = "cluffer"; - version = "20221106-git"; - asds = [ "cluffer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2022-11-06/cluffer-20221106-git.tgz"; - sha256 = "0z85s26gsgclql5p6iwklnddrv3l8i0pc41ircqp1zxhzdyf5jsx"; - system = "cluffer"; - asd = "cluffer"; - }); - systems = [ "cluffer" ]; - lispLibs = [ (getAttr "cluffer-base" pkgs) (getAttr "cluffer-simple-buffer" pkgs) (getAttr "cluffer-simple-line" pkgs) (getAttr "cluffer-standard-buffer" pkgs) (getAttr "cluffer-standard-line" pkgs) ]; - }; - cluffer-base = { - pname = "cluffer-base"; - version = "20221106-git"; - asds = [ "cluffer-base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2022-11-06/cluffer-20221106-git.tgz"; - sha256 = "0z85s26gsgclql5p6iwklnddrv3l8i0pc41ircqp1zxhzdyf5jsx"; - system = "cluffer-base"; - asd = "cluffer-base"; - }); - systems = [ "cluffer-base" ]; - lispLibs = [ (getAttr "acclimation" pkgs) ]; - }; - cluffer-simple-buffer = { - pname = "cluffer-simple-buffer"; - version = "20221106-git"; - asds = [ "cluffer-simple-buffer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2022-11-06/cluffer-20221106-git.tgz"; - sha256 = "0z85s26gsgclql5p6iwklnddrv3l8i0pc41ircqp1zxhzdyf5jsx"; - system = "cluffer-simple-buffer"; - asd = "cluffer-simple-buffer"; - }); - systems = [ "cluffer-simple-buffer" ]; - lispLibs = [ (getAttr "cluffer-base" pkgs) ]; - }; - cluffer-simple-line = { - pname = "cluffer-simple-line"; - version = "20221106-git"; - asds = [ "cluffer-simple-line" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2022-11-06/cluffer-20221106-git.tgz"; - sha256 = "0z85s26gsgclql5p6iwklnddrv3l8i0pc41ircqp1zxhzdyf5jsx"; - system = "cluffer-simple-line"; - asd = "cluffer-simple-line"; - }); - systems = [ "cluffer-simple-line" ]; - lispLibs = [ (getAttr "cluffer-base" pkgs) ]; - }; - cluffer-standard-buffer = { - pname = "cluffer-standard-buffer"; - version = "20221106-git"; - asds = [ "cluffer-standard-buffer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2022-11-06/cluffer-20221106-git.tgz"; - sha256 = "0z85s26gsgclql5p6iwklnddrv3l8i0pc41ircqp1zxhzdyf5jsx"; - system = "cluffer-standard-buffer"; - asd = "cluffer-standard-buffer"; - }); - systems = [ "cluffer-standard-buffer" ]; - lispLibs = [ (getAttr "cluffer-base" pkgs) (getAttr "clump" pkgs) ]; - }; - cluffer-standard-line = { - pname = "cluffer-standard-line"; - version = "20221106-git"; - asds = [ "cluffer-standard-line" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2022-11-06/cluffer-20221106-git.tgz"; - sha256 = "0z85s26gsgclql5p6iwklnddrv3l8i0pc41ircqp1zxhzdyf5jsx"; - system = "cluffer-standard-line"; - asd = "cluffer-standard-line"; - }); - systems = [ "cluffer-standard-line" ]; - lispLibs = [ (getAttr "cluffer-base" pkgs) ]; - }; - cluffer-test = { - pname = "cluffer-test"; - version = "20221106-git"; - asds = [ "cluffer-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cluffer/2022-11-06/cluffer-20221106-git.tgz"; - sha256 = "0z85s26gsgclql5p6iwklnddrv3l8i0pc41ircqp1zxhzdyf5jsx"; - system = "cluffer-test"; - asd = "cluffer-test"; - }); - systems = [ "cluffer-test" ]; - lispLibs = [ (getAttr "cluffer" pkgs) ]; - }; - clump = { - pname = "clump"; - version = "20160825-git"; - asds = [ "clump" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; - sha256 = "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh"; - system = "clump"; - asd = "clump"; - }); - systems = [ "clump" ]; - lispLibs = [ (getAttr "clump-2-3-tree" pkgs) (getAttr "clump-binary-tree" pkgs) ]; - }; - clump-2-3-tree = { - pname = "clump-2-3-tree"; - version = "20160825-git"; - asds = [ "clump-2-3-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; - sha256 = "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh"; - system = "clump-2-3-tree"; - asd = "clump-2-3-tree"; - }); - systems = [ "clump-2-3-tree" ]; - lispLibs = [ (getAttr "acclimation" pkgs) ]; - }; - clump-binary-tree = { - pname = "clump-binary-tree"; - version = "20160825-git"; - asds = [ "clump-binary-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; - sha256 = "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh"; - system = "clump-binary-tree"; - asd = "clump-binary-tree"; - }); - systems = [ "clump-binary-tree" ]; - lispLibs = [ (getAttr "acclimation" pkgs) ]; - }; - clump-test = { - pname = "clump-test"; - version = "20160825-git"; - asds = [ "clump-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; - sha256 = "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh"; - system = "clump-test"; - asd = "clump-test"; - }); - systems = [ "clump-test" ]; - lispLibs = [ (getAttr "clump" pkgs) ]; - }; - clunit = { - pname = "clunit"; - version = "20171019-git"; - asds = [ "clunit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz"; - sha256 = "1idf2xnqzlhi8rbrqmzpmb3i1l6pbdzhhajkmhwbp6qjkmxa4h85"; - system = "clunit"; - asd = "clunit"; - }); - systems = [ "clunit" ]; - lispLibs = [ ]; - }; - clunit2 = { - pname = "clunit2"; - version = "20221106-git"; - asds = [ "clunit2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clunit2/2022-11-06/clunit2-20221106-git.tgz"; - sha256 = "094bg5r8dslcapkg1kakay5axnqal9nhq8z1cfmhmjsbrvz9vyz4"; - system = "clunit2"; - asd = "clunit2"; - }); - systems = [ "clunit2" ]; - lispLibs = [ ]; - }; - clustered-intset = { - pname = "clustered-intset"; - version = "20220707-git"; - asds = [ "clustered-intset" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clustered-intset/2022-07-07/clustered-intset-20220707-git.tgz"; - sha256 = "035s2gn59l8389b0ypnb4qna7zplz9rxk05aw88qf8g4b7wyba1h"; - system = "clustered-intset"; - asd = "clustered-intset"; - }); - systems = [ "clustered-intset" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - clustered-intset-test = { - pname = "clustered-intset-test"; - version = "20220707-git"; - asds = [ "clustered-intset-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clustered-intset/2022-07-07/clustered-intset-20220707-git.tgz"; - sha256 = "035s2gn59l8389b0ypnb4qna7zplz9rxk05aw88qf8g4b7wyba1h"; - system = "clustered-intset-test"; - asd = "clustered-intset-test"; - }); - systems = [ "clustered-intset-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "clustered-intset" pkgs) (getAttr "fiveam" pkgs) ]; - }; - clusters = { - pname = "clusters"; - version = "20220331-git"; - asds = [ "clusters" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clusters/2022-03-31/clusters-20220331-git.tgz"; - sha256 = "1x78ihrrah0rrb2ddxmxqcqpkswdvb3f0via56bkf1f3f5kqmsb8"; - system = "clusters"; - asd = "clusters"; - }); - systems = [ "clusters" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-data-structures" pkgs) (getAttr "documentation-utils-extensions" pkgs) (getAttr "iterate" pkgs) (getAttr "lparallel" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "serapeum" pkgs) ]; - }; - clusters-tests = { - pname = "clusters-tests"; - version = "20220331-git"; - asds = [ "clusters-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clusters/2022-03-31/clusters-20220331-git.tgz"; - sha256 = "1x78ihrrah0rrb2ddxmxqcqpkswdvb3f0via56bkf1f3f5kqmsb8"; - system = "clusters-tests"; - asd = "clusters-tests"; - }); - systems = [ "clusters-tests" ]; - lispLibs = [ (getAttr "clusters" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - clutter = { - pname = "clutter"; - version = "v1.0.0"; - asds = [ "clutter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clutter/2021-10-20/clutter-v1.0.0.tgz"; - sha256 = "1q9mg4d0nja9ypm13i24wymhjwziw6n7r7p1dzw6xc5zhavqsni7"; - system = "clutter"; - asd = "clutter"; - }); - systems = [ "clutter" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "doplus" pkgs) ]; - }; - clutter_slash_tests = { - pname = "clutter_tests"; - version = "v1.0.0"; - asds = [ "clutter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clutter/2021-10-20/clutter-v1.0.0.tgz"; - sha256 = "1q9mg4d0nja9ypm13i24wymhjwziw6n7r7p1dzw6xc5zhavqsni7"; - system = "clutter"; - asd = "clutter"; - }); - systems = [ "clutter/tests" ]; - lispLibs = [ (getAttr "clutter" pkgs) (getAttr "dissect" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - clweb = { - pname = "clweb"; - version = "20201220-git"; - asds = [ "clweb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clweb/2020-12-20/clweb-20201220-git.tgz"; - sha256 = "0hqyrglgsgal5s8f0n247hg0hqlw6l6w1r5i8lzf0a0xvcz49f48"; - system = "clweb"; - asd = "clweb"; - }); - systems = [ "clweb" ]; - lispLibs = [ ]; - }; - clweb_slash_tests = { - pname = "clweb_tests"; - version = "20201220-git"; - asds = [ "clweb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clweb/2020-12-20/clweb-20201220-git.tgz"; - sha256 = "0hqyrglgsgal5s8f0n247hg0hqlw6l6w1r5i8lzf0a0xvcz49f48"; - system = "clweb"; - asd = "clweb"; - }); - systems = [ "clweb/tests" ]; - lispLibs = [ (getAttr "clweb" pkgs) ]; - meta = { - broken = true; - }; - }; - clws = { - pname = "clws"; - version = "20130813-git"; - asds = [ "clws" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clws/2013-08-13/clws-20130813-git.tgz"; - sha256 = "1svj025zwsbkb0hrbz1nj0x306hkhy9xinq0x1qdflc9vg169dh6"; - system = "clws"; - asd = "clws"; - }); - systems = [ "clws" ]; - lispLibs = [ (getAttr "chunga" pkgs) (getAttr "cl-base64" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "iolib" pkgs) (getAttr "ironclad" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - clx = { - pname = "clx"; - version = "20221106-git"; - asds = [ "clx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clx/2022-11-06/clx-20221106-git.tgz"; - sha256 = "0vjc8ii6zajqfxp0vbj5fkq125ky042w59bmkp3zvi5pwsh3y2hf"; - system = "clx"; - asd = "clx"; - }); - systems = [ "clx" ]; - lispLibs = [ ]; - }; - clx_slash_test = { - pname = "clx_test"; - version = "20221106-git"; - asds = [ "clx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clx/2022-11-06/clx-20221106-git.tgz"; - sha256 = "0vjc8ii6zajqfxp0vbj5fkq125ky042w59bmkp3zvi5pwsh3y2hf"; - system = "clx"; - asd = "clx"; - }); - systems = [ "clx/test" ]; - lispLibs = [ (getAttr "clx" pkgs) (getAttr "fiasco" pkgs) ]; - meta = { - broken = true; - }; - }; - cmake-parser = { - pname = "cmake-parser"; - version = "20180831-git"; - asds = [ "cmake-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cmake-parser/2018-08-31/cmake-parser-20180831-git.tgz"; - sha256 = "1sb5pwxhg7k41202kvxj1b60c5pxnl0mfbqdz53xayddngn2brgl"; - system = "cmake-parser"; - asd = "cmake-parser"; - }); - systems = [ "cmake-parser" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "esrap" pkgs) ]; - }; - cmd = { - pname = "cmd"; - version = "20221106-git"; - asds = [ "cmd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cmd/2022-11-06/cmd-20221106-git.tgz"; - sha256 = "0y3ma71fwihn9km8jx2cdm8z2yk5zd6kk8bigp4wvrx8hll0ajxi"; - system = "cmd"; - asd = "cmd"; - }); - systems = [ "cmd" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "shlex" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cmu-infix = { - pname = "cmu-infix"; - version = "20180228-git"; - asds = [ "cmu-infix" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cmu-infix/2018-02-28/cmu-infix-20180228-git.tgz"; - sha256 = "0macs398088cfif1dkjrpmidk515sjl7ld96f9ys5cpzx8sc5gib"; - system = "cmu-infix"; - asd = "cmu-infix"; - }); - systems = [ "cmu-infix" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - cmu-infix-tests = { - pname = "cmu-infix-tests"; - version = "20180228-git"; - asds = [ "cmu-infix-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cmu-infix/2018-02-28/cmu-infix-20180228-git.tgz"; - sha256 = "0macs398088cfif1dkjrpmidk515sjl7ld96f9ys5cpzx8sc5gib"; - system = "cmu-infix-tests"; - asd = "cmu-infix-tests"; - }); - systems = [ "cmu-infix-tests" ]; - lispLibs = [ (getAttr "cmu-infix" pkgs) (getAttr "fiasco" pkgs) (getAttr "uiop" pkgs) ]; - }; - cocoahelper = { - pname = "cocoahelper"; - version = "20210807-git"; - asds = [ "cocoahelper" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "cocoahelper"; - asd = "cocoahelper"; - }); - systems = [ "cocoahelper" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl-binaries" pkgs) ]; - }; - codata-recommended-values = { - pname = "codata-recommended-values"; - version = "20200218-git"; - asds = [ "codata-recommended-values" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/codata-recommended-values/2020-02-18/codata-recommended-values-20200218-git.tgz"; - sha256 = "0gm27bkq4ma9kc3adnbzyhchky38halb77qc30ll2097ahwy735p"; - system = "codata-recommended-values"; - asd = "codata-recommended-values"; - }); - systems = [ "codata-recommended-values" ]; - lispLibs = [ ]; - }; - codex = { - pname = "codex"; - version = "20181210-git"; - asds = [ "codex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/codex/2018-12-10/codex-20181210-git.tgz"; - sha256 = "1fyx11h6khh1987x0linfnkl5416yfpxzkcn6g7v5ga18rv41566"; - system = "codex"; - asd = "codex"; - }); - systems = [ "codex" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-slug" pkgs) (getAttr "codex-templates" pkgs) (getAttr "common-doc" pkgs) (getAttr "common-doc-contrib" pkgs) (getAttr "docparser" pkgs) (getAttr "pandocl" pkgs) ]; - }; - codex-templates = { - pname = "codex-templates"; - version = "20181210-git"; - asds = [ "codex-templates" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/codex/2018-12-10/codex-20181210-git.tgz"; - sha256 = "1fyx11h6khh1987x0linfnkl5416yfpxzkcn6g7v5ga18rv41566"; - system = "codex-templates"; - asd = "codex-templates"; - }); - systems = [ "codex-templates" ]; - lispLibs = [ (getAttr "common-html" pkgs) (getAttr "djula" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - coleslaw = { - pname = "coleslaw"; - version = "20221106-git"; - asds = [ "coleslaw" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/coleslaw/2022-11-06/coleslaw-20221106-git.tgz"; - sha256 = "1w21a272q4x7nlr4kbmwwvkjvb4hpnw869byvy47vv361y7pimws"; - system = "coleslaw"; - asd = "coleslaw"; - }); - systems = [ "coleslaw" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "_3bmd-ext-code-blocks" pkgs) (getAttr "alexandria" pkgs) (getAttr "closure-template" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-unicode" pkgs) (getAttr "closer-mop" pkgs) (getAttr "inferior-shell" pkgs) (getAttr "local-time" pkgs) (getAttr "uiop" pkgs) ]; - }; - coleslaw-cli = { - pname = "coleslaw-cli"; - version = "20221106-git"; - asds = [ "coleslaw-cli" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/coleslaw/2022-11-06/coleslaw-20221106-git.tgz"; - sha256 = "1w21a272q4x7nlr4kbmwwvkjvb4hpnw869byvy47vv361y7pimws"; - system = "coleslaw-cli"; - asd = "coleslaw-cli"; - }); - systems = [ "coleslaw-cli" ]; - lispLibs = [ (getAttr "clack" pkgs) (getAttr "coleslaw" pkgs) (getAttr "trivia" pkgs) (getAttr "uiop" pkgs) ]; - }; - coleslaw-test = { - pname = "coleslaw-test"; - version = "20221106-git"; - asds = [ "coleslaw-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/coleslaw/2022-11-06/coleslaw-20221106-git.tgz"; - sha256 = "1w21a272q4x7nlr4kbmwwvkjvb4hpnw869byvy47vv361y7pimws"; - system = "coleslaw-test"; - asd = "coleslaw-test"; - }); - systems = [ "coleslaw-test" ]; - lispLibs = [ (getAttr "coleslaw" pkgs) (getAttr "coleslaw-cli" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - collectors = { - pname = "collectors"; - version = "20220220-git"; - asds = [ "collectors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/collectors/2022-02-20/collectors-20220220-git.tgz"; - sha256 = "1mxcq7wq2jwbjd39afihpd46qkaidq76prgjbzpkv5749wf2spib"; - system = "collectors"; - asd = "collectors"; - }); - systems = [ "collectors" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - collectors_slash_test = { - pname = "collectors_test"; - version = "20220220-git"; - asds = [ "collectors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/collectors/2022-02-20/collectors-20220220-git.tgz"; - sha256 = "1mxcq7wq2jwbjd39afihpd46qkaidq76prgjbzpkv5749wf2spib"; - system = "collectors"; - asd = "collectors"; - }); - systems = [ "collectors/test" ]; - lispLibs = [ (getAttr "collectors" pkgs) (getAttr "lisp-unit2" pkgs) ]; - meta = { - broken = true; - }; - }; - colleen = { - pname = "colleen"; - version = "20181018-git"; - asds = [ "colleen" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/colleen/2018-10-18/colleen-20181018-git.tgz"; - sha256 = "1cm7vlqsnrbln5jmihdw8m7x1fqm2insdj4f5qasdm32iy6d8bj4"; - system = "colleen"; - asd = "colleen"; - }); - systems = [ "colleen" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "trivial-arguments" pkgs) (getAttr "universal-config" pkgs) (getAttr "usocket" pkgs) (getAttr "uuid" pkgs) (getAttr "verbose" pkgs) ]; - }; - colliflower = { - pname = "colliflower"; - version = "20211020-git"; - asds = [ "colliflower" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; - sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r"; - system = "colliflower"; - asd = "colliflower"; - }); - systems = [ "colliflower" ]; - lispLibs = [ (getAttr "asdf-package-system" pkgs) (getAttr "garten" pkgs) (getAttr "liter" pkgs) (getAttr "silo" pkgs) ]; - }; - colliflower-fset = { - pname = "colliflower-fset"; - version = "20211020-git"; - asds = [ "colliflower-fset" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; - sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r"; - system = "colliflower-fset"; - asd = "colliflower-fset"; - }); - systems = [ "colliflower-fset" ]; - lispLibs = [ (getAttr "colliflower" pkgs) (getAttr "fset" pkgs) ]; - }; - colliflower-test = { - pname = "colliflower-test"; - version = "20211020-git"; - asds = [ "colliflower-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; - sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r"; - system = "colliflower-test"; - asd = "colliflower-test"; - }); - systems = [ "colliflower-test" ]; - lispLibs = [ (getAttr "colliflower" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - colnew = { - pname = "colnew"; - version = "20200925-git"; - asds = [ "colnew" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "colnew"; - asd = "colnew"; - }); - systems = [ "colnew" ]; - lispLibs = [ (getAttr "f2cl" pkgs) ]; - }; - colnew_slash_test-1 = { - pname = "colnew_test-1"; - version = "20200925-git"; - asds = [ "colnew" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "colnew"; - asd = "colnew"; - }); - systems = [ "colnew/test-1" ]; - lispLibs = [ (getAttr "colnew" pkgs) ]; - meta = { - broken = true; - }; - }; - colnew_slash_test-2 = { - pname = "colnew_test-2"; - version = "20200925-git"; - asds = [ "colnew" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "colnew"; - asd = "colnew"; - }); - systems = [ "colnew/test-2" ]; - lispLibs = [ (getAttr "colnew" pkgs) ]; - meta = { - broken = true; - }; - }; - colnew_slash_test-3 = { - pname = "colnew_test-3"; - version = "20200925-git"; - asds = [ "colnew" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "colnew"; - asd = "colnew"; - }); - systems = [ "colnew/test-3" ]; - lispLibs = [ (getAttr "colnew" pkgs) ]; - meta = { - broken = true; - }; - }; - colored = { - pname = "colored"; - version = "20211020-git"; - asds = [ "colored" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/colored/2021-10-20/colored-20211020-git.tgz"; - sha256 = "0mpg91r6yfb9xqccd4r8z3hl2qzjhdj6daswb1cinrm8ffxrvy5k"; - system = "colored"; - asd = "colored"; - }); - systems = [ "colored" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - colored-test = { - pname = "colored-test"; - version = "20211020-git"; - asds = [ "colored-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/colored/2021-10-20/colored-20211020-git.tgz"; - sha256 = "0mpg91r6yfb9xqccd4r8z3hl2qzjhdj6daswb1cinrm8ffxrvy5k"; - system = "colored-test"; - asd = "colored-test"; - }); - systems = [ "colored-test" ]; - lispLibs = [ (getAttr "colored" pkgs) (getAttr "parachute" pkgs) ]; - }; - colorize = { - pname = "colorize"; - version = "20180228-git"; - asds = [ "colorize" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz"; - sha256 = "1pdg4kiaczmr3ivffhirp7m3lbr1q27rn7dhaay0vwghmi31zcw9"; - system = "colorize"; - asd = "colorize"; - }); - systems = [ "colorize" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "html-encode" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - com-on = { - pname = "com-on"; - version = "20220331-git"; - asds = [ "com-on" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/com-on/2022-03-31/com-on-20220331-git.tgz"; - sha256 = "0wrqnmwbqn7krsg2yp1rjpjpkmp9mh7dp0djq086mybnd7s6n05j"; - system = "com-on"; - asd = "com-on"; - }); - systems = [ "com-on" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) ]; - }; - com-on-test = { - pname = "com-on-test"; - version = "20220331-git"; - asds = [ "com-on-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/com-on/2022-03-31/com-on-20220331-git.tgz"; - sha256 = "0wrqnmwbqn7krsg2yp1rjpjpkmp9mh7dp0djq086mybnd7s6n05j"; - system = "com-on-test"; - asd = "com-on-test"; - }); - systems = [ "com-on-test" ]; - lispLibs = [ (getAttr "com-on" pkgs) (getAttr "parachute" pkgs) ]; - }; - com_dot_clearly-useful_dot_generic-collection-interface = { - pname = "com.clearly-useful.generic-collection-interface"; - version = "20190710-git"; - asds = [ "com.clearly-useful.generic-collection-interface" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/com.clearly-useful.generic-collection-interface/2019-07-10/com.clearly-useful.generic-collection-interface-20190710-git.tgz"; - sha256 = "1yfxwqgvrb1nwryymsl4s3h1lr8yskb9c76lxqy3mw5l0vwvl5zl"; - system = "com.clearly-useful.generic-collection-interface"; - asd = "com.clearly-useful.generic-collection-interface"; - }); - systems = [ "com.clearly-useful.generic-collection-interface" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "com_dot_clearly-useful_dot_protocols" pkgs) (getAttr "lparallel" pkgs) ]; - }; - com_dot_clearly-useful_dot_generic-collection-interface_dot_test = { - pname = "com.clearly-useful.generic-collection-interface.test"; - version = "20190710-git"; - asds = [ "com.clearly-useful.generic-collection-interface.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/com.clearly-useful.generic-collection-interface/2019-07-10/com.clearly-useful.generic-collection-interface-20190710-git.tgz"; - sha256 = "1yfxwqgvrb1nwryymsl4s3h1lr8yskb9c76lxqy3mw5l0vwvl5zl"; - system = "com.clearly-useful.generic-collection-interface.test"; - asd = "com.clearly-useful.generic-collection-interface.test"; - }); - systems = [ "com.clearly-useful.generic-collection-interface.test" ]; - lispLibs = [ (getAttr "com_dot_clearly-useful_dot_generic-collection-interface" pkgs) ]; - }; - com_dot_clearly-useful_dot_iterate_plus = { - pname = "com.clearly-useful.iterate+"; - version = "20121013-git"; - asds = [ "com.clearly-useful.iterate+" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/com.clearly-useful.iterate-plus/2012-10-13/com.clearly-useful.iterate-plus-20121013-git.tgz"; - sha256 = "0fpymg6p9zglkclfn035agcs5k83fakad7dj2612v5p1snzzcika"; - system = "com.clearly-useful.iterate+"; - asd = "com.clearly-useful.iterate+"; - }); - systems = [ "com.clearly-useful.iterate+" ]; - lispLibs = [ (getAttr "com_dot_clearly-useful_dot_generic-collection-interface" pkgs) (getAttr "com_dot_clearly-useful_dot_iterator-protocol" pkgs) (getAttr "com_dot_clearly-useful_dot_protocols" pkgs) (getAttr "iterate" pkgs) ]; - }; - com_dot_clearly-useful_dot_iterator-protocol = { - pname = "com.clearly-useful.iterator-protocol"; - version = "20130312-git"; - asds = [ "com.clearly-useful.iterator-protocol" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/com.clearly-useful.iterator-protocol/2013-03-12/com.clearly-useful.iterator-protocol-20130312-git.tgz"; - sha256 = "1wgksgpck6na1ygdnln5n1y8rj2kylg3lpbkyrhdka2cgsqiqs4a"; - system = "com.clearly-useful.iterator-protocol"; - asd = "com.clearly-useful.iterator-protocol"; - }); - systems = [ "com.clearly-useful.iterator-protocol" ]; - lispLibs = [ (getAttr "com_dot_clearly-useful_dot_generic-collection-interface" pkgs) (getAttr "com_dot_clearly-useful_dot_protocols" pkgs) ]; - }; - com_dot_clearly-useful_dot_protocols = { - pname = "com.clearly-useful.protocols"; - version = "20130312-git"; - asds = [ "com.clearly-useful.protocols" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/com.clearly-useful.protocols/2013-03-12/com.clearly-useful.protocols-20130312-git.tgz"; - sha256 = "0az9rs98chjj2fdmpapqkv4sgfs84n9s7vvngcl05hcbsldm0xvn"; - system = "com.clearly-useful.protocols"; - asd = "com.clearly-useful.protocols"; - }); - systems = [ "com.clearly-useful.protocols" ]; - lispLibs = [ (getAttr "iterate" pkgs) ]; - }; - com_dot_dvlsoft_dot_rcfiles = { - pname = "com.dvlsoft.rcfiles"; - version = "20111203-http"; - asds = [ "com.dvlsoft.rcfiles" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rcfiles/2011-12-03/cl-rcfiles-20111203-http.tgz"; - sha256 = "06ahp9jaim216k7vbya1kp8iy5yb1i7axwrsjx7gwhl2b2q63r0a"; - system = "com.dvlsoft.rcfiles"; - asd = "com.dvlsoft.rcfiles"; - }); - systems = [ "com.dvlsoft.rcfiles" ]; - lispLibs = [ ]; - }; - com_dot_elbeno_dot_curve = { - pname = "com.elbeno.curve"; - version = "20130128-git"; - asds = [ "com.elbeno.curve" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/curve/2013-01-28/curve-20130128-git.tgz"; - sha256 = "0223sxrdixjg0bmy76a9kiv7g4zjkqxs92x6kys5dnaywx7mjb6j"; - system = "com.elbeno.curve"; - asd = "com.elbeno.curve"; - }); - systems = [ "com.elbeno.curve" ]; - lispLibs = [ (getAttr "vecto" pkgs) (getAttr "com_dot_elbeno_dot_vector" pkgs) ]; - }; - com_dot_elbeno_dot_vector = { - pname = "com.elbeno.vector"; - version = "20130128-git"; - asds = [ "com.elbeno.vector" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vector/2013-01-28/vector-20130128-git.tgz"; - sha256 = "04czvqycn9j2hzbjmrp9fgqlgns5l7vbb73dgv3zqmiwzdb66qr5"; - system = "com.elbeno.vector"; - asd = "com.elbeno.vector"; - }); - systems = [ "com.elbeno.vector" ]; - lispLibs = [ ]; - }; - com_dot_gigamonkeys_dot_binary-data = { - pname = "com.gigamonkeys.binary-data"; - version = "20111203-git"; - asds = [ "com.gigamonkeys.binary-data" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-binary-data/2011-12-03/monkeylib-binary-data-20111203-git.tgz"; - sha256 = "072v417vmcnvmyh8ddq9vmwwrizm7zwz9dpzi14qy9nsw8q649zw"; - system = "com.gigamonkeys.binary-data"; - asd = "com.gigamonkeys.binary-data"; - }); - systems = [ "com.gigamonkeys.binary-data" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - com_dot_gigamonkeys_dot_json = { - pname = "com.gigamonkeys.json"; - version = "20180228-git"; - asds = [ "com.gigamonkeys.json" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-json/2018-02-28/monkeylib-json-20180228-git.tgz"; - sha256 = "188717pmyhpgwg9ncc1fbqvbvw5fikbfhvchsy9gg4haxhdgpzsn"; - system = "com.gigamonkeys.json"; - asd = "com.gigamonkeys.json"; - }); - systems = [ "com.gigamonkeys.json" ]; - lispLibs = [ (getAttr "com_dot_gigamonkeys_dot_parser" pkgs) (getAttr "com_dot_gigamonkeys_dot_utilities" pkgs) ]; - }; - com_dot_gigamonkeys_dot_macro-utilities = { - pname = "com.gigamonkeys.macro-utilities"; - version = "20111203-git"; - asds = [ "com.gigamonkeys.macro-utilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-macro-utilities/2011-12-03/monkeylib-macro-utilities-20111203-git.tgz"; - sha256 = "0l3m44zlzrvyn6fyvxslga8cppp4mh8dkgqzy297nnm0vnij5r8w"; - system = "com.gigamonkeys.macro-utilities"; - asd = "com.gigamonkeys.macro-utilities"; - }); - systems = [ "com.gigamonkeys.macro-utilities" ]; - lispLibs = [ ]; - }; - com_dot_gigamonkeys_dot_markup = { - pname = "com.gigamonkeys.markup"; - version = "20120909-git"; - asds = [ "com.gigamonkeys.markup" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-markup/2012-09-09/monkeylib-markup-20120909-git.tgz"; - sha256 = "049zqgnprvddn2zp1a8g862m3ikll3a3lpi1k2vimjmx1bkc0vs0"; - system = "com.gigamonkeys.markup"; - asd = "com.gigamonkeys.markup"; - }); - systems = [ "com.gigamonkeys.markup" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "com_dot_gigamonkeys_dot_pathnames" pkgs) (getAttr "com_dot_gigamonkeys_dot_utilities" pkgs) ]; - }; - com_dot_gigamonkeys_dot_parser = { - pname = "com.gigamonkeys.parser"; - version = "20120208-git"; - asds = [ "com.gigamonkeys.parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-parser/2012-02-08/monkeylib-parser-20120208-git.tgz"; - sha256 = "1xvzrih813311p48bzlm0z0592lx6iss3m36vz55qsw4sr397ncd"; - system = "com.gigamonkeys.parser"; - asd = "com.gigamonkeys.parser"; - }); - systems = [ "com.gigamonkeys.parser" ]; - lispLibs = [ (getAttr "com_dot_gigamonkeys_dot_macro-utilities" pkgs) (getAttr "com_dot_gigamonkeys_dot_utilities" pkgs) ]; - }; - com_dot_gigamonkeys_dot_pathnames = { - pname = "com.gigamonkeys.pathnames"; - version = "20120208-git"; - asds = [ "com.gigamonkeys.pathnames" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-pathnames/2012-02-08/monkeylib-pathnames-20120208-git.tgz"; - sha256 = "108cc39g7razng316df4d47zzpj2zr576wzwwrpggdkm4q599gvk"; - system = "com.gigamonkeys.pathnames"; - asd = "com.gigamonkeys.pathnames"; - }); - systems = [ "com.gigamonkeys.pathnames" ]; - lispLibs = [ ]; - }; - com_dot_gigamonkeys_dot_prose-diff = { - pname = "com.gigamonkeys.prose-diff"; - version = "20140713-git"; - asds = [ "com.gigamonkeys.prose-diff" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-prose-diff/2014-07-13/monkeylib-prose-diff-20140713-git.tgz"; - sha256 = "1zwaa8qmpbdpdg8zzk3as73i55c54k9m694gx4bla1xxli5f8ijc"; - system = "com.gigamonkeys.prose-diff"; - asd = "com.gigamonkeys.prose-diff"; - }); - systems = [ "com.gigamonkeys.prose-diff" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "com_dot_gigamonkeys_dot_macro-utilities" pkgs) (getAttr "com_dot_gigamonkeys_dot_markup" pkgs) (getAttr "monkeylib-markup-html" pkgs) (getAttr "com_dot_gigamonkeys_dot_pathnames" pkgs) (getAttr "com_dot_gigamonkeys_dot_utilities" pkgs) ]; - }; - com_dot_gigamonkeys_dot_test-framework = { - pname = "com.gigamonkeys.test-framework"; - version = "20101207-git"; - asds = [ "com.gigamonkeys.test-framework" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-test-framework/2010-12-07/monkeylib-test-framework-20101207-git.tgz"; - sha256 = "1d6b8zg0vnbqxxsbbjr3b4r46d8whj84h9yqnqw3ii0bwr8hn82v"; - system = "com.gigamonkeys.test-framework"; - asd = "com.gigamonkeys.test-framework"; - }); - systems = [ "com.gigamonkeys.test-framework" ]; - lispLibs = [ (getAttr "com_dot_gigamonkeys_dot_macro-utilities" pkgs) ]; - }; - com_dot_gigamonkeys_dot_utilities = { - pname = "com.gigamonkeys.utilities"; - version = "20170403-git"; - asds = [ "com.gigamonkeys.utilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-utilities/2017-04-03/monkeylib-utilities-20170403-git.tgz"; - sha256 = "0d0h1y43mn6r8s4g9gbr02d09565p0gig21jfnk7zf1dl6rnvkvm"; - system = "com.gigamonkeys.utilities"; - asd = "com.gigamonkeys.utilities"; - }); - systems = [ "com.gigamonkeys.utilities" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - com_dot_google_dot_base = { - pname = "com.google.base"; - version = "20200925-git"; - asds = [ "com.google.base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/com.google.base/2020-09-25/com.google.base-20200925-git.tgz"; - sha256 = "1drc341sqmrmyvdgqpdy066f0z0ia0kl3ppq0rlxznlxhn17x3xj"; - system = "com.google.base"; - asd = "com.google.base"; - }); - systems = [ "com.google.base" ]; - lispLibs = [ ]; - }; - com_dot_google_dot_base_slash_test = { - pname = "com.google.base_test"; - version = "20200925-git"; - asds = [ "com.google.base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/com.google.base/2020-09-25/com.google.base-20200925-git.tgz"; - sha256 = "1drc341sqmrmyvdgqpdy066f0z0ia0kl3ppq0rlxznlxhn17x3xj"; - system = "com.google.base"; - asd = "com.google.base"; - }); - systems = [ "com.google.base/test" ]; - lispLibs = [ (getAttr "com_dot_google_dot_base" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - meta = { - broken = true; - }; - }; - com_dot_google_dot_flag = { - pname = "com.google.flag"; - version = "20201220-git"; - asds = [ "com.google.flag" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-gflags/2020-12-20/lisp-gflags-20201220-git.tgz"; - sha256 = "06p70v1wv0ynr6ng6vr6krc5773xphvkv2nfxvnschc1bzqhds5k"; - system = "com.google.flag"; - asd = "com.google.flag"; - }); - systems = [ "com.google.flag" ]; - lispLibs = [ (getAttr "com_dot_google_dot_base" pkgs) ]; - }; - com_dot_google_dot_flag_slash_test = { - pname = "com.google.flag_test"; - version = "20201220-git"; - asds = [ "com.google.flag" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-gflags/2020-12-20/lisp-gflags-20201220-git.tgz"; - sha256 = "06p70v1wv0ynr6ng6vr6krc5773xphvkv2nfxvnschc1bzqhds5k"; - system = "com.google.flag"; - asd = "com.google.flag"; - }); - systems = [ "com.google.flag/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "com_dot_google_dot_flag" pkgs) ]; - meta = { - broken = true; - }; - }; - command-line-arguments = { - pname = "command-line-arguments"; - version = "20210807-git"; - asds = [ "command-line-arguments" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/command-line-arguments/2021-08-07/command-line-arguments-20210807-git.tgz"; - sha256 = "1wbb83b559nfv65rsxz3jrixic9gndk2whj40hhwb0s13rf5a62y"; - system = "command-line-arguments"; - asd = "command-line-arguments"; - }); - systems = [ "command-line-arguments" ]; - lispLibs = [ ]; - }; - command-line-arguments_slash_test = { - pname = "command-line-arguments_test"; - version = "20210807-git"; - asds = [ "command-line-arguments" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/command-line-arguments/2021-08-07/command-line-arguments-20210807-git.tgz"; - sha256 = "1wbb83b559nfv65rsxz3jrixic9gndk2whj40hhwb0s13rf5a62y"; - system = "command-line-arguments"; - asd = "command-line-arguments"; - }); - systems = [ "command-line-arguments/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "command-line-arguments" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - meta = { - broken = true; - }; - }; - common-doc = { - pname = "common-doc"; - version = "20220707-git"; - asds = [ "common-doc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2022-07-07/common-doc-20220707-git.tgz"; - sha256 = "03skibhp2145ismpy50jjzp1z4v368b4dkd5w8lab3ii9b6x8jpm"; - system = "common-doc"; - asd = "common-doc"; - }); - systems = [ "common-doc" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "closer-mop" pkgs) (getAttr "local-time" pkgs) (getAttr "quri" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - common-doc-contrib = { - pname = "common-doc-contrib"; - version = "20220707-git"; - asds = [ "common-doc-contrib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2022-07-07/common-doc-20220707-git.tgz"; - sha256 = "03skibhp2145ismpy50jjzp1z4v368b4dkd5w8lab3ii9b6x8jpm"; - system = "common-doc-contrib"; - asd = "common-doc-contrib"; - }); - systems = [ "common-doc-contrib" ]; - lispLibs = [ (getAttr "common-doc-gnuplot" pkgs) (getAttr "common-doc-graphviz" pkgs) (getAttr "common-doc-include" pkgs) (getAttr "common-doc-split-paragraphs" pkgs) (getAttr "common-doc-tex" pkgs) ]; - }; - common-doc-gnuplot = { - pname = "common-doc-gnuplot"; - version = "20220707-git"; - asds = [ "common-doc-gnuplot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2022-07-07/common-doc-20220707-git.tgz"; - sha256 = "03skibhp2145ismpy50jjzp1z4v368b4dkd5w8lab3ii9b6x8jpm"; - system = "common-doc-gnuplot"; - asd = "common-doc-gnuplot"; - }); - systems = [ "common-doc-gnuplot" ]; - lispLibs = [ (getAttr "common-doc" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - common-doc-graphviz = { - pname = "common-doc-graphviz"; - version = "20220707-git"; - asds = [ "common-doc-graphviz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2022-07-07/common-doc-20220707-git.tgz"; - sha256 = "03skibhp2145ismpy50jjzp1z4v368b4dkd5w8lab3ii9b6x8jpm"; - system = "common-doc-graphviz"; - asd = "common-doc-graphviz"; - }); - systems = [ "common-doc-graphviz" ]; - lispLibs = [ (getAttr "common-doc" pkgs) (getAttr "trivial-shell" pkgs) ]; - }; - common-doc-include = { - pname = "common-doc-include"; - version = "20220707-git"; - asds = [ "common-doc-include" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2022-07-07/common-doc-20220707-git.tgz"; - sha256 = "03skibhp2145ismpy50jjzp1z4v368b4dkd5w8lab3ii9b6x8jpm"; - system = "common-doc-include"; - asd = "common-doc-include"; - }); - systems = [ "common-doc-include" ]; - lispLibs = [ (getAttr "common-doc" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - common-doc-plump = { - pname = "common-doc-plump"; - version = "20160421-git"; - asds = [ "common-doc-plump" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-doc-plump/2016-04-21/common-doc-plump-20160421-git.tgz"; - sha256 = "08h7m4c599rf2kz4wkpbj05441ax0vb3bd88a7dw5x57djf765r6"; - system = "common-doc-plump"; - asd = "common-doc-plump"; - }); - systems = [ "common-doc-plump" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "cl-markup" pkgs) (getAttr "common-doc" pkgs) (getAttr "common-doc-split-paragraphs" pkgs) (getAttr "plump" pkgs) ]; - }; - common-doc-plump-test = { - pname = "common-doc-plump-test"; - version = "20160421-git"; - asds = [ "common-doc-plump-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-doc-plump/2016-04-21/common-doc-plump-20160421-git.tgz"; - sha256 = "08h7m4c599rf2kz4wkpbj05441ax0vb3bd88a7dw5x57djf765r6"; - system = "common-doc-plump-test"; - asd = "common-doc-plump-test"; - }); - systems = [ "common-doc-plump-test" ]; - lispLibs = [ (getAttr "common-doc-plump" pkgs) (getAttr "fiveam" pkgs) ]; - }; - common-doc-split-paragraphs = { - pname = "common-doc-split-paragraphs"; - version = "20220707-git"; - asds = [ "common-doc-split-paragraphs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2022-07-07/common-doc-20220707-git.tgz"; - sha256 = "03skibhp2145ismpy50jjzp1z4v368b4dkd5w8lab3ii9b6x8jpm"; - system = "common-doc-split-paragraphs"; - asd = "common-doc-split-paragraphs"; - }); - systems = [ "common-doc-split-paragraphs" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "common-doc" pkgs) ]; - }; - common-doc-test = { - pname = "common-doc-test"; - version = "20220707-git"; - asds = [ "common-doc-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2022-07-07/common-doc-20220707-git.tgz"; - sha256 = "03skibhp2145ismpy50jjzp1z4v368b4dkd5w8lab3ii9b6x8jpm"; - system = "common-doc-test"; - asd = "common-doc-test"; - }); - systems = [ "common-doc-test" ]; - lispLibs = [ (getAttr "common-doc" pkgs) (getAttr "common-doc-contrib" pkgs) (getAttr "fiveam" pkgs) ]; - }; - common-doc-tex = { - pname = "common-doc-tex"; - version = "20220707-git"; - asds = [ "common-doc-tex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-doc/2022-07-07/common-doc-20220707-git.tgz"; - sha256 = "03skibhp2145ismpy50jjzp1z4v368b4dkd5w8lab3ii9b6x8jpm"; - system = "common-doc-tex"; - asd = "common-doc-tex"; - }); - systems = [ "common-doc-tex" ]; - lispLibs = [ (getAttr "common-doc" pkgs) ]; - }; - common-html = { - pname = "common-html"; - version = "20210807-git"; - asds = [ "common-html" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-html/2021-08-07/common-html-20210807-git.tgz"; - sha256 = "1i11w4l95nybz5ibnaxrnrkfhch2s9wynqrg6kx6sl6y47khq1xz"; - system = "common-html"; - asd = "common-html"; - }); - systems = [ "common-html" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "common-doc" pkgs) (getAttr "plump" pkgs) ]; - }; - common-html-test = { - pname = "common-html-test"; - version = "20210807-git"; - asds = [ "common-html-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-html/2021-08-07/common-html-20210807-git.tgz"; - sha256 = "1i11w4l95nybz5ibnaxrnrkfhch2s9wynqrg6kx6sl6y47khq1xz"; - system = "common-html-test"; - asd = "common-html-test"; - }); - systems = [ "common-html-test" ]; - lispLibs = [ (getAttr "common-html" pkgs) (getAttr "fiveam" pkgs) ]; - }; - common-lisp-jupyter = { - pname = "common-lisp-jupyter"; - version = "20221106-git"; - asds = [ "common-lisp-jupyter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/common-lisp-jupyter/2022-11-06/common-lisp-jupyter-20221106-git.tgz"; - sha256 = "1zpmvjlwgvr49ha997kkwwix444x5kvaawlxq4iknzs0mqgnwczs"; - system = "common-lisp-jupyter"; - asd = "common-lisp-jupyter"; - }); - systems = [ "common-lisp-jupyter" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-indentify" pkgs) (getAttr "closer-mop" pkgs) (getAttr "dissect" pkgs) (getAttr "eclector" pkgs) (getAttr "ironclad" pkgs) (getAttr "multilang-documentation" pkgs) (getAttr "puri" pkgs) (getAttr "pzmq" pkgs) (getAttr "shasht" pkgs) (getAttr "static-vectors" pkgs) (getAttr "trivial-do" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "trivial-mimes" pkgs) ]; - }; - commondoc-markdown = { - pname = "commondoc-markdown"; - version = "20221106-git"; - asds = [ "commondoc-markdown" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/commondoc-markdown/2022-11-06/commondoc-markdown-20221106-git.tgz"; - sha256 = "10mkr80jx1gpdpmhy3rzq813wnn5rsqkwcvmsdwr4d0iwk1hm48g"; - system = "commondoc-markdown"; - asd = "commondoc-markdown"; - }); - systems = [ "commondoc-markdown" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "_3bmd-ext-code-blocks" pkgs) (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "str" pkgs) (getAttr "common-doc" pkgs) (getAttr "common-html" pkgs) (getAttr "esrap" pkgs) (getAttr "ironclad" pkgs) (getAttr "quri" pkgs) (getAttr "uiop" pkgs) ]; - }; - commondoc-markdown-docs = { - pname = "commondoc-markdown-docs"; - version = "20221106-git"; - asds = [ "commondoc-markdown-docs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/commondoc-markdown/2022-11-06/commondoc-markdown-20221106-git.tgz"; - sha256 = "10mkr80jx1gpdpmhy3rzq813wnn5rsqkwcvmsdwr4d0iwk1hm48g"; - system = "commondoc-markdown-docs"; - asd = "commondoc-markdown-docs"; - }); - systems = [ "commondoc-markdown-docs" ]; - lispLibs = [ (getAttr "_40ants-doc" pkgs) (getAttr "docs-config" pkgs) (getAttr "named-readtables" pkgs) (getAttr "pythonic-string-reader" pkgs) ]; - }; - commondoc-markdown-test = { - pname = "commondoc-markdown-test"; - version = "20221106-git"; - asds = [ "commondoc-markdown-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/commondoc-markdown/2022-11-06/commondoc-markdown-20221106-git.tgz"; - sha256 = "10mkr80jx1gpdpmhy3rzq813wnn5rsqkwcvmsdwr4d0iwk1hm48g"; - system = "commondoc-markdown-test"; - asd = "commondoc-markdown-test"; - }); - systems = [ "commondoc-markdown-test" ]; - lispLibs = [ (getAttr "hamcrest" pkgs) (getAttr "common-doc" pkgs) (getAttr "commondoc-markdown" pkgs) (getAttr "rove" pkgs) ]; - }; - commonqt = { - pname = "commonqt"; - version = "20210531-git"; - asds = [ "commonqt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "commonqt"; - asd = "commonqt"; - }); - systems = [ "commonqt" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "smokebase" pkgs) ]; - }; - comp-set = { - pname = "comp-set"; - version = "20210807-git"; - asds = [ "comp-set" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; - sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; - system = "comp-set"; - asd = "comp-set"; - }); - systems = [ "comp-set" ]; - lispLibs = [ ]; - }; - compatible-metaclasses = { - pname = "compatible-metaclasses"; - version = "1.0"; - asds = [ "compatible-metaclasses" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/compatible-metaclasses/2020-09-25/compatible-metaclasses_1.0.tgz"; - sha256 = "17cf74j400cl6sjslfhkv13lir85k705v63mx3dd4y6dl5hvsdh6"; - system = "compatible-metaclasses"; - asd = "compatible-metaclasses"; - }); - systems = [ "compatible-metaclasses" ]; - lispLibs = [ (getAttr "class-options" pkgs) (getAttr "closer-mop" pkgs) (getAttr "enhanced-find-class" pkgs) ]; - }; - compatible-metaclasses_tests = { - pname = "compatible-metaclasses_tests"; - version = "1.0"; - asds = [ "compatible-metaclasses_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/compatible-metaclasses/2020-09-25/compatible-metaclasses_1.0.tgz"; - sha256 = "17cf74j400cl6sjslfhkv13lir85k705v63mx3dd4y6dl5hvsdh6"; - system = "compatible-metaclasses_tests"; - asd = "compatible-metaclasses_tests"; - }); - systems = [ "compatible-metaclasses_tests" ]; - lispLibs = [ (getAttr "compatible-metaclasses" pkgs) (getAttr "parachute" pkgs) ]; - }; - compiler-macro-notes = { - pname = "compiler-macro-notes"; - version = "v0.2.1"; - asds = [ "compiler-macro-notes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/compiler-macro-notes/2022-11-06/compiler-macro-notes-v0.2.1.tgz"; - sha256 = "13zzygv0j0a6xacwir4yllpan8j9zh68n9kgkpppg1br8x8s78pk"; - system = "compiler-macro-notes"; - asd = "compiler-macro-notes"; - }); - systems = [ "compiler-macro-notes" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-environments" pkgs) ]; - }; - computable-reals = { - pname = "computable-reals"; - version = "20210411-git"; - asds = [ "computable-reals" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/computable-reals/2021-04-11/computable-reals-20210411-git.tgz"; - sha256 = "0f12axi53x14l12dgf4a1lfq3p1fx7fh7sjfc0db3lk88ph9qfwl"; - system = "computable-reals"; - asd = "computable-reals"; - }); - systems = [ "computable-reals" ]; - lispLibs = [ ]; - }; - concrete-syntax-tree = { - pname = "concrete-syntax-tree"; - version = "20211020-git"; - asds = [ "concrete-syntax-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2021-10-20/concrete-syntax-tree-20211020-git.tgz"; - sha256 = "169ibaz1vv7pphib28443zzk3hf1mrcarhzfm8hnbdbk529cnxyi"; - system = "concrete-syntax-tree"; - asd = "concrete-syntax-tree"; - }); - systems = [ "concrete-syntax-tree" ]; - lispLibs = [ (getAttr "concrete-syntax-tree-base" pkgs) (getAttr "concrete-syntax-tree-lambda-list" pkgs) ]; - }; - concrete-syntax-tree-base = { - pname = "concrete-syntax-tree-base"; - version = "20211020-git"; - asds = [ "concrete-syntax-tree-base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2021-10-20/concrete-syntax-tree-20211020-git.tgz"; - sha256 = "169ibaz1vv7pphib28443zzk3hf1mrcarhzfm8hnbdbk529cnxyi"; - system = "concrete-syntax-tree-base"; - asd = "concrete-syntax-tree-base"; - }); - systems = [ "concrete-syntax-tree-base" ]; - lispLibs = [ (getAttr "acclimation" pkgs) ]; - }; - concrete-syntax-tree-destructuring = { - pname = "concrete-syntax-tree-destructuring"; - version = "20211020-git"; - asds = [ "concrete-syntax-tree-destructuring" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2021-10-20/concrete-syntax-tree-20211020-git.tgz"; - sha256 = "169ibaz1vv7pphib28443zzk3hf1mrcarhzfm8hnbdbk529cnxyi"; - system = "concrete-syntax-tree-destructuring"; - asd = "concrete-syntax-tree-destructuring"; - }); - systems = [ "concrete-syntax-tree-destructuring" ]; - lispLibs = [ (getAttr "concrete-syntax-tree-lambda-list" pkgs) ]; - }; - concrete-syntax-tree-lambda-list = { - pname = "concrete-syntax-tree-lambda-list"; - version = "20211020-git"; - asds = [ "concrete-syntax-tree-lambda-list" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2021-10-20/concrete-syntax-tree-20211020-git.tgz"; - sha256 = "169ibaz1vv7pphib28443zzk3hf1mrcarhzfm8hnbdbk529cnxyi"; - system = "concrete-syntax-tree-lambda-list"; - asd = "concrete-syntax-tree-lambda-list"; - }); - systems = [ "concrete-syntax-tree-lambda-list" ]; - lispLibs = [ (getAttr "concrete-syntax-tree-base" pkgs) ]; - }; - concrete-syntax-tree-lambda-list-test = { - pname = "concrete-syntax-tree-lambda-list-test"; - version = "20211020-git"; - asds = [ "concrete-syntax-tree-lambda-list-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2021-10-20/concrete-syntax-tree-20211020-git.tgz"; - sha256 = "169ibaz1vv7pphib28443zzk3hf1mrcarhzfm8hnbdbk529cnxyi"; - system = "concrete-syntax-tree-lambda-list-test"; - asd = "concrete-syntax-tree-lambda-list-test"; - }); - systems = [ "concrete-syntax-tree-lambda-list-test" ]; - lispLibs = [ (getAttr "concrete-syntax-tree-lambda-list" pkgs) ]; - }; - concrete-syntax-tree-source-info = { - pname = "concrete-syntax-tree-source-info"; - version = "20211020-git"; - asds = [ "concrete-syntax-tree-source-info" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2021-10-20/concrete-syntax-tree-20211020-git.tgz"; - sha256 = "169ibaz1vv7pphib28443zzk3hf1mrcarhzfm8hnbdbk529cnxyi"; - system = "concrete-syntax-tree-source-info"; - asd = "concrete-syntax-tree-source-info"; - }); - systems = [ "concrete-syntax-tree-source-info" ]; - lispLibs = [ ]; - }; - concrete-syntax-tree_slash_test = { - pname = "concrete-syntax-tree_test"; - version = "20211020-git"; - asds = [ "concrete-syntax-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/concrete-syntax-tree/2021-10-20/concrete-syntax-tree-20211020-git.tgz"; - sha256 = "169ibaz1vv7pphib28443zzk3hf1mrcarhzfm8hnbdbk529cnxyi"; - system = "concrete-syntax-tree"; - asd = "concrete-syntax-tree"; - }); - systems = [ "concrete-syntax-tree/test" ]; - lispLibs = [ (getAttr "concrete-syntax-tree" pkgs) ]; - meta = { - broken = true; - }; - }; - conditional-commands = { - pname = "conditional-commands"; - version = "20221106-git"; - asds = [ "conditional-commands" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "conditional-commands"; - asd = "conditional-commands"; - }); - systems = [ "conditional-commands" ]; - lispLibs = [ (getAttr "clim" pkgs) ]; - }; - conf = { - pname = "conf"; - version = "20191227-git"; - asds = [ "conf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/conf/2019-12-27/conf-20191227-git.tgz"; - sha256 = "0mif91gb6yqg2qrzd2p6n83w9injikm5gggzv2mgxkiyzmr5gnay"; - system = "conf"; - asd = "conf"; - }); - systems = [ "conf" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) ]; - }; - conf_slash_test = { - pname = "conf_test"; - version = "20191227-git"; - asds = [ "conf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/conf/2019-12-27/conf-20191227-git.tgz"; - sha256 = "0mif91gb6yqg2qrzd2p6n83w9injikm5gggzv2mgxkiyzmr5gnay"; - system = "conf"; - asd = "conf"; - }); - systems = [ "conf/test" ]; - lispLibs = [ (getAttr "conf" pkgs) ]; - meta = { - broken = true; - }; - }; - configuration_dot_options = { - pname = "configuration.options"; - version = "20210531-git"; - asds = [ "configuration.options" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options"; - asd = "configuration.options"; - }); - systems = [ "configuration.options" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-hooks" pkgs) (getAttr "architecture_dot_service-provider" pkgs) (getAttr "esrap" pkgs) (getAttr "let-plus" pkgs) (getAttr "log4cl" pkgs) (getAttr "more-conditions" pkgs) (getAttr "split-sequence" pkgs) (getAttr "utilities_dot_print-items" pkgs) (getAttr "utilities_dot_print-tree" pkgs) ]; - }; - configuration_dot_options-and-mop = { - pname = "configuration.options-and-mop"; - version = "20210531-git"; - asds = [ "configuration.options-and-mop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options-and-mop"; - asd = "configuration.options-and-mop"; - }); - systems = [ "configuration.options-and-mop" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "configuration_dot_options" pkgs) (getAttr "let-plus" pkgs) ]; - }; - configuration_dot_options-and-mop_slash_test = { - pname = "configuration.options-and-mop_test"; - version = "20210531-git"; - asds = [ "configuration.options-and-mop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options-and-mop"; - asd = "configuration.options-and-mop"; - }); - systems = [ "configuration.options-and-mop/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "configuration_dot_options" pkgs) (getAttr "configuration_dot_options-and-mop" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) ]; - meta = { - broken = true; - }; - }; - configuration_dot_options-and-puri = { - pname = "configuration.options-and-puri"; - version = "20210531-git"; - asds = [ "configuration.options-and-puri" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options-and-puri"; - asd = "configuration.options-and-puri"; - }); - systems = [ "configuration.options-and-puri" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "configuration_dot_options" pkgs) (getAttr "let-plus" pkgs) (getAttr "puri" pkgs) ]; - }; - configuration_dot_options-and-puri_slash_test = { - pname = "configuration.options-and-puri_test"; - version = "20210531-git"; - asds = [ "configuration.options-and-puri" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options-and-puri"; - asd = "configuration.options-and-puri"; - }); - systems = [ "configuration.options-and-puri/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "configuration_dot_options" pkgs) (getAttr "configuration_dot_options-and-puri" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) ]; - meta = { - broken = true; - }; - }; - configuration_dot_options-and-quri = { - pname = "configuration.options-and-quri"; - version = "20210531-git"; - asds = [ "configuration.options-and-quri" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options-and-quri"; - asd = "configuration.options-and-quri"; - }); - systems = [ "configuration.options-and-quri" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "configuration_dot_options" pkgs) (getAttr "let-plus" pkgs) (getAttr "quri" pkgs) ]; - }; - configuration_dot_options-and-quri_slash_test = { - pname = "configuration.options-and-quri_test"; - version = "20210531-git"; - asds = [ "configuration.options-and-quri" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options-and-quri"; - asd = "configuration.options-and-quri"; - }); - systems = [ "configuration.options-and-quri/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "configuration_dot_options" pkgs) (getAttr "configuration_dot_options-and-quri" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) ]; - meta = { - broken = true; - }; - }; - configuration_dot_options-and-service-provider = { - pname = "configuration.options-and-service-provider"; - version = "20210531-git"; - asds = [ "configuration.options-and-service-provider" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options-and-service-provider"; - asd = "configuration.options-and-service-provider"; - }); - systems = [ "configuration.options-and-service-provider" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_service-provider" pkgs) (getAttr "architecture_dot_service-provider-and-hooks" pkgs) (getAttr "configuration_dot_options" pkgs) (getAttr "configuration_dot_options-and-mop" pkgs) (getAttr "let-plus" pkgs) (getAttr "log4cl" pkgs) ]; - }; - configuration_dot_options-and-service-provider_slash_test = { - pname = "configuration.options-and-service-provider_test"; - version = "20210531-git"; - asds = [ "configuration.options-and-service-provider" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options-and-service-provider"; - asd = "configuration.options-and-service-provider"; - }); - systems = [ "configuration.options-and-service-provider/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_service-provider" pkgs) (getAttr "configuration_dot_options" pkgs) (getAttr "configuration_dot_options-and-service-provider" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) ]; - meta = { - broken = true; - }; - }; - configuration_dot_options-syntax-ini = { - pname = "configuration.options-syntax-ini"; - version = "20210531-git"; - asds = [ "configuration.options-syntax-ini" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options-syntax-ini"; - asd = "configuration.options-syntax-ini"; - }); - systems = [ "configuration.options-syntax-ini" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "configuration_dot_options" pkgs) (getAttr "let-plus" pkgs) (getAttr "parser_dot_ini" pkgs) ]; - }; - configuration_dot_options-syntax-ini_slash_test = { - pname = "configuration.options-syntax-ini_test"; - version = "20210531-git"; - asds = [ "configuration.options-syntax-ini" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options-syntax-ini"; - asd = "configuration.options-syntax-ini"; - }); - systems = [ "configuration.options-syntax-ini/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "configuration_dot_options" pkgs) (getAttr "configuration_dot_options-syntax-ini" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) ]; - meta = { - broken = true; - }; - }; - configuration_dot_options-syntax-xml = { - pname = "configuration.options-syntax-xml"; - version = "20210531-git"; - asds = [ "configuration.options-syntax-xml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options-syntax-xml"; - asd = "configuration.options-syntax-xml"; - }); - systems = [ "configuration.options-syntax-xml" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "configuration_dot_options" pkgs) (getAttr "let-plus" pkgs) (getAttr "xml_dot_location" pkgs) ]; - }; - configuration_dot_options-syntax-xml_slash_test = { - pname = "configuration.options-syntax-xml_test"; - version = "20210531-git"; - asds = [ "configuration.options-syntax-xml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options-syntax-xml"; - asd = "configuration.options-syntax-xml"; - }); - systems = [ "configuration.options-syntax-xml/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "configuration_dot_options" pkgs) (getAttr "configuration_dot_options-syntax-xml" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) ]; - meta = { - broken = true; - }; - }; - configuration_dot_options_slash_test = { - pname = "configuration.options_test"; - version = "20210531-git"; - asds = [ "configuration.options" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/configuration.options/2021-05-31/configuration.options-20210531-git.tgz"; - sha256 = "1wh07llx4k66wwabxajdc6cy0sdxbrydxi51gs7hrsyrp9gvym9g"; - system = "configuration.options"; - asd = "configuration.options"; - }); - systems = [ "configuration.options/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "configuration_dot_options" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) ]; - meta = { - broken = true; - }; - }; - conium = { - pname = "conium"; - version = "20210630-git"; - asds = [ "conium" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/conium/2021-06-30/conium-20210630-git.tgz"; - sha256 = "0y31za8xr8734p2pf8mrw1jd1fksh2d4y1p12wwjyn8hxxsvsx1w"; - system = "conium"; - asd = "conium"; - }); - systems = [ "conium" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - consfigurator = { - pname = "consfigurator"; - version = "v1.1.1"; - asds = [ "consfigurator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/consfigurator/2022-11-06/consfigurator-v1.1.1.tgz"; - sha256 = "12k3billjgkdk9yr0a2dv2jkrggi9kgm7nncvlz5m22y3sh7f5kh"; - system = "consfigurator"; - asd = "consfigurator"; - }); - systems = [ "consfigurator" ]; - lispLibs = [ (getAttr "agnostic-lizard" pkgs) (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "babel" pkgs) (getAttr "babel-streams" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-heredoc" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "named-readtables" pkgs) (getAttr "osicat" pkgs) (getAttr "trivial-backtrace" pkgs) ]; - }; - consfigurator_slash_tests = { - pname = "consfigurator_tests"; - version = "v1.1.1"; - asds = [ "consfigurator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/consfigurator/2022-11-06/consfigurator-v1.1.1.tgz"; - sha256 = "12k3billjgkdk9yr0a2dv2jkrggi9kgm7nncvlz5m22y3sh7f5kh"; - system = "consfigurator"; - asd = "consfigurator"; - }); - systems = [ "consfigurator/tests" ]; - lispLibs = [ (getAttr "consfigurator" pkgs) ]; - meta = { - broken = true; - }; - }; - consix = { - pname = "consix"; - version = "20201220-git"; - asds = [ "consix" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/consix/2020-12-20/consix-20201220-git.tgz"; - sha256 = "0zpcaxgq9jx0baj5sid8rnzq8ygsmd8yzb0x37nkaiwa67x5jjck"; - system = "consix"; - asd = "consix"; - }); - systems = [ "consix" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-glu" pkgs) (getAttr "cl-glut" pkgs) (getAttr "cl-opengl" pkgs) ]; - }; - constantfold = { - pname = "constantfold"; - version = "20191227-git"; - asds = [ "constantfold" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/constantfold/2019-12-27/constantfold-20191227-git.tgz"; - sha256 = "153h0569z6bff1qbad0bdssplwwny75l7ilqwcfqfdvzsxf9jh06"; - system = "constantfold"; - asd = "constantfold"; - }); - systems = [ "constantfold" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "lisp-namespace" pkgs) (getAttr "trivia" pkgs) ]; - }; - constantfold_dot_test = { - pname = "constantfold.test"; - version = "20191227-git"; - asds = [ "constantfold.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/constantfold/2019-12-27/constantfold-20191227-git.tgz"; - sha256 = "153h0569z6bff1qbad0bdssplwwny75l7ilqwcfqfdvzsxf9jh06"; - system = "constantfold.test"; - asd = "constantfold.test"; - }); - systems = [ "constantfold.test" ]; - lispLibs = [ (getAttr "constantfold" pkgs) (getAttr "fiveam" pkgs) ]; - }; - context-lite = { - pname = "context-lite"; - version = "20220331-git"; - asds = [ "context-lite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/context-lite/2022-03-31/context-lite-20220331-git.tgz"; - sha256 = "16hmid3adimn10c0y4p6hg7n42al2qgsy7wxlpargk0xbn4h3km4"; - system = "context-lite"; - asd = "context-lite"; - }); - systems = [ "context-lite" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - context-lite_slash_test = { - pname = "context-lite_test"; - version = "20220331-git"; - asds = [ "context-lite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/context-lite/2022-03-31/context-lite-20220331-git.tgz"; - sha256 = "16hmid3adimn10c0y4p6hg7n42al2qgsy7wxlpargk0xbn4h3km4"; - system = "context-lite"; - asd = "context-lite"; - }); - systems = [ "context-lite/test" ]; - lispLibs = [ (getAttr "context-lite" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - contextl = { - pname = "contextl"; - version = "20211230-git"; - asds = [ "contextl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/contextl/2021-12-30/contextl-20211230-git.tgz"; - sha256 = "0apgznz4g6lpmd86lq7w0xddfjgnirk83ig7p0j6i93xadhy9wh0"; - system = "contextl"; - asd = "contextl"; - }); - systems = [ "contextl" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "lw-compat" pkgs) ]; - }; - control = { - pname = "control"; - version = "20200427-git"; - asds = [ "control" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "control"; - asd = "control"; - }); - systems = [ "control" ]; - lispLibs = [ (getAttr "character-modifier-bits" pkgs) (getAttr "window" pkgs) (getAttr "utility" pkgs) ]; - }; - convolution-kernel = { - pname = "convolution-kernel"; - version = "20220707-git"; - asds = [ "convolution-kernel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/convolution-kernel/2022-07-07/convolution-kernel-20220707-git.tgz"; - sha256 = "0r2mgwl75fxcc019mxg3s32mkx6fhi8fcy5rzz1jba1wrcw380z3"; - system = "convolution-kernel"; - asd = "convolution-kernel"; - }); - systems = [ "convolution-kernel" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) (getAttr "tile-grid" pkgs) ]; - }; - copy-directory = { - pname = "copy-directory"; - version = "20160628-git"; - asds = [ "copy-directory" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/copy-directory/2016-06-28/copy-directory-20160628-git.tgz"; - sha256 = "19wvzb046lcyifhx26ydzf7ngfa52n64nyx76k3lh02x7ahhpc93"; - system = "copy-directory"; - asd = "copy-directory"; - }); - systems = [ "copy-directory" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "uiop" pkgs) (getAttr "which" pkgs) ]; - }; - copy-directory-test = { - pname = "copy-directory-test"; - version = "20160628-git"; - asds = [ "copy-directory-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/copy-directory/2016-06-28/copy-directory-20160628-git.tgz"; - sha256 = "19wvzb046lcyifhx26ydzf7ngfa52n64nyx76k3lh02x7ahhpc93"; - system = "copy-directory-test"; - asd = "copy-directory-test"; - }); - systems = [ "copy-directory-test" ]; - lispLibs = [ (getAttr "copy-directory" pkgs) (getAttr "fiveam" pkgs) ]; - }; - core-reader = { - pname = "core-reader"; - version = "20220707-git"; - asds = [ "core-reader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/core-reader/2022-07-07/core-reader-20220707-git.tgz"; - sha256 = "1f2cm44r3pnahgx1b3c3psf6myaliwsrvfcgz8c9ydqi5qlx49gb"; - system = "core-reader"; - asd = "core-reader"; - }); - systems = [ "core-reader" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - core-reader_dot_test = { - pname = "core-reader.test"; - version = "20220707-git"; - asds = [ "core-reader.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/core-reader/2022-07-07/core-reader-20220707-git.tgz"; - sha256 = "1f2cm44r3pnahgx1b3c3psf6myaliwsrvfcgz8c9ydqi5qlx49gb"; - system = "core-reader.test"; - asd = "core-reader.test"; - }); - systems = [ "core-reader.test" ]; - lispLibs = [ (getAttr "core-reader" pkgs) (getAttr "jingoh" pkgs) ]; - }; - cover = { - pname = "cover"; - version = "20210228-git"; - asds = [ "cover" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cover/2021-02-28/cover-20210228-git.tgz"; - sha256 = "1dm28xvpnkv6lyq76k6hjw37vn6zvwhn9kp7xgk5zk2i37d63b77"; - system = "cover"; - asd = "cover"; - }); - systems = [ "cover" ]; - lispLibs = [ ]; - }; - cover_slash_tests = { - pname = "cover_tests"; - version = "20210228-git"; - asds = [ "cover" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cover/2021-02-28/cover-20210228-git.tgz"; - sha256 = "1dm28xvpnkv6lyq76k6hjw37vn6zvwhn9kp7xgk5zk2i37d63b77"; - system = "cover"; - asd = "cover"; - }); - systems = [ "cover/tests" ]; - lispLibs = [ (getAttr "cover" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - cqlcl = { - pname = "cqlcl"; - version = "20141106-git"; - asds = [ "cqlcl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cqlcl/2014-11-06/cqlcl-20141106-git.tgz"; - sha256 = "0ppdsrrf2hz0s4y02a2p5mgms92znrj7hz7x9j6azppfkal25zid"; - system = "cqlcl"; - asd = "cqlcl"; - }); - systems = [ "cqlcl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "fiveam" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "lparallel" pkgs) (getAttr "pooler" pkgs) (getAttr "split-sequence" pkgs) (getAttr "usocket" pkgs) (getAttr "uuid" pkgs) ]; - }; - cqlcl-test = { - pname = "cqlcl-test"; - version = "20141106-git"; - asds = [ "cqlcl-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cqlcl/2014-11-06/cqlcl-20141106-git.tgz"; - sha256 = "0ppdsrrf2hz0s4y02a2p5mgms92znrj7hz7x9j6azppfkal25zid"; - system = "cqlcl-test"; - asd = "cqlcl"; - }); - systems = [ "cqlcl-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cqlcl" pkgs) (getAttr "fiveam" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "uuid" pkgs) ]; - }; - crane = { - pname = "crane"; - version = "20160208-git"; - asds = [ "crane" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/crane/2016-02-08/crane-20160208-git.tgz"; - sha256 = "1wai4h7vz5i0ld1fnnbcmpz5d67dmykyxx0ay0fkclkwvpj7gh5n"; - system = "crane"; - asd = "crane"; - }); - systems = [ "crane" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "dbi" pkgs) (getAttr "cl-fad" pkgs) (getAttr "clos-fixtures" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "local-time" pkgs) (getAttr "sxql" pkgs) (getAttr "uiop" pkgs) ]; - }; - crane-test = { - pname = "crane-test"; - version = "20160208-git"; - asds = [ "crane-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/crane/2016-02-08/crane-20160208-git.tgz"; - sha256 = "1wai4h7vz5i0ld1fnnbcmpz5d67dmykyxx0ay0fkclkwvpj7gh5n"; - system = "crane-test"; - asd = "crane-test"; - }); - systems = [ "crane-test" ]; - lispLibs = [ (getAttr "crane" pkgs) (getAttr "fiveam" pkgs) ]; - }; - cricket = { - pname = "cricket"; - version = "20220707-git"; - asds = [ "cricket" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cricket/2022-07-07/cricket-20220707-git.tgz"; - sha256 = "0wdpzdmalbnfjmd9s7yalris4i1vvc2klnhfl8g0h2ahq0mqv9p9"; - system = "cricket"; - asd = "cricket"; - }); - systems = [ "cricket" ]; - lispLibs = [ (getAttr "arrow-macros" pkgs) (getAttr "cl-cpus" pkgs) (getAttr "lparallel" pkgs) (getAttr "mfiano-utils" pkgs) (getAttr "seedable-rng" pkgs) (getAttr "uiop" pkgs) (getAttr "zpng" pkgs) ]; - }; - cricket_dot_test = { - pname = "cricket.test"; - version = "20220707-git"; - asds = [ "cricket.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cricket/2022-07-07/cricket-20220707-git.tgz"; - sha256 = "0wdpzdmalbnfjmd9s7yalris4i1vvc2klnhfl8g0h2ahq0mqv9p9"; - system = "cricket.test"; - asd = "cricket.test"; - }); - systems = [ "cricket.test" ]; - lispLibs = [ (getAttr "cricket" pkgs) (getAttr "mfiano-utils" pkgs) (getAttr "pngload" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - croatoan = { - pname = "croatoan"; - version = "20221106-git"; - asds = [ "croatoan" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2022-11-06/croatoan-20221106-git.tgz"; - sha256 = "0zfwcc40dpj88jvkm45d4snxjfxdsncd5pj10zrbj7lm4awm9b5s"; - system = "croatoan"; - asd = "croatoan"; - }); - systems = [ "croatoan" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "croatoan-ncurses" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - croatoan-ncurses = { - pname = "croatoan-ncurses"; - version = "20221106-git"; - asds = [ "croatoan-ncurses" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2022-11-06/croatoan-20221106-git.tgz"; - sha256 = "0zfwcc40dpj88jvkm45d4snxjfxdsncd5pj10zrbj7lm4awm9b5s"; - system = "croatoan-ncurses"; - asd = "croatoan-ncurses"; - }); - systems = [ "croatoan-ncurses" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - croatoan-test = { - pname = "croatoan-test"; - version = "20221106-git"; - asds = [ "croatoan-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/croatoan/2022-11-06/croatoan-20221106-git.tgz"; - sha256 = "0zfwcc40dpj88jvkm45d4snxjfxdsncd5pj10zrbj7lm4awm9b5s"; - system = "croatoan-test"; - asd = "croatoan-test"; - }); - systems = [ "croatoan-test" ]; - lispLibs = [ (getAttr "croatoan" pkgs) ]; - }; - crud = { - pname = "crud"; - version = "20200427-git"; - asds = [ "crud" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "crud"; - asd = "crud"; - }); - systems = [ "crud" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "base64" pkgs) (getAttr "sqlite" pkgs) (getAttr "lparallel" pkgs) (getAttr "sucle-serialize" pkgs) (getAttr "uiop" pkgs) ]; - }; - crypt = { - pname = "crypt"; - version = "20120520-git"; - asds = [ "crypt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-crypt/2012-05-20/cl-crypt-20120520-git.tgz"; - sha256 = "02fc3aqfbbwjpz79a4mwffv33pnmmknpkmd1r8v9mkn9a6c1ssmh"; - system = "crypt"; - asd = "crypt"; - }); - systems = [ "crypt" ]; - lispLibs = [ ]; - }; - crypto-shortcuts = { - pname = "crypto-shortcuts"; - version = "20201016-git"; - asds = [ "crypto-shortcuts" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/crypto-shortcuts/2020-10-16/crypto-shortcuts-20201016-git.tgz"; - sha256 = "0c0m0ar04jn7qf2v8c4sivamlzki03r13rnxy8b3n27rh9r6hgin"; - system = "crypto-shortcuts"; - asd = "crypto-shortcuts"; - }); - systems = [ "crypto-shortcuts" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "ironclad" pkgs) ]; - }; - cserial-port = { - pname = "cserial-port"; - version = "20211230-git"; - asds = [ "cserial-port" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cserial-port/2021-12-30/cserial-port-20211230-git.tgz"; - sha256 = "05fvzl0pd6d3pbzp6rpgv1ad8hawcy34rm88p1jf8066fl6lxikp"; - system = "cserial-port"; - asd = "cserial-port"; - }); - systems = [ "cserial-port" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "osicat" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - css-lite = { - pname = "css-lite"; - version = "20221106-git"; - asds = [ "css-lite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/css-lite/2022-11-06/css-lite-20221106-git.tgz"; - sha256 = "1klfpiqbg8gg10s2dmladaq06ard5v92lzk3ck2d1nbbl3rk4m1l"; - system = "css-lite"; - asd = "css-lite"; - }); - systems = [ "css-lite" ]; - lispLibs = [ ]; - }; - css-lite_slash_test = { - pname = "css-lite_test"; - version = "20221106-git"; - asds = [ "css-lite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/css-lite/2022-11-06/css-lite-20221106-git.tgz"; - sha256 = "1klfpiqbg8gg10s2dmladaq06ard5v92lzk3ck2d1nbbl3rk4m1l"; - system = "css-lite"; - asd = "css-lite"; - }); - systems = [ "css-lite/test" ]; - lispLibs = [ (getAttr "css-lite" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - css-selectors = { - pname = "css-selectors"; - version = "20160628-git"; - asds = [ "css-selectors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; - sha256 = "0x0a5jq4kdw8zrkljmhijcbvjj09iyrwwgryc6kvzl5g7wzg2xr6"; - system = "css-selectors"; - asd = "css-selectors"; - }); - systems = [ "css-selectors" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "buildnode" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "yacc" pkgs) (getAttr "cxml" pkgs) (getAttr "iterate" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - css-selectors-simple-tree = { - pname = "css-selectors-simple-tree"; - version = "20160628-git"; - asds = [ "css-selectors-simple-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; - sha256 = "0x0a5jq4kdw8zrkljmhijcbvjj09iyrwwgryc6kvzl5g7wzg2xr6"; - system = "css-selectors-simple-tree"; - asd = "css-selectors-simple-tree"; - }); - systems = [ "css-selectors-simple-tree" ]; - lispLibs = [ (getAttr "cl-html5-parser" pkgs) (getAttr "css-selectors" pkgs) ]; - }; - css-selectors-stp = { - pname = "css-selectors-stp"; - version = "20160628-git"; - asds = [ "css-selectors-stp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; - sha256 = "0x0a5jq4kdw8zrkljmhijcbvjj09iyrwwgryc6kvzl5g7wzg2xr6"; - system = "css-selectors-stp"; - asd = "css-selectors-stp"; - }); - systems = [ "css-selectors-stp" ]; - lispLibs = [ (getAttr "css-selectors" pkgs) (getAttr "cxml-stp" pkgs) ]; - }; - css-selectors-test = { - pname = "css-selectors-test"; - version = "20160628-git"; - asds = [ "css-selectors-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; - sha256 = "0x0a5jq4kdw8zrkljmhijcbvjj09iyrwwgryc6kvzl5g7wzg2xr6"; - system = "css-selectors-test"; - asd = "css-selectors"; - }); - systems = [ "css-selectors-test" ]; - lispLibs = [ (getAttr "buildnode-xhtml" pkgs) (getAttr "css-selectors" pkgs) (getAttr "lisp-unit2" pkgs) ]; - }; - csv = { - pname = "csv"; - version = "20190710-git"; - asds = [ "csv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/csv/2019-07-10/csv-20190710-git.tgz"; - sha256 = "0jykv91w7anisac2aip38vnj7ywi567rcp4n8nv3lz5qb7g1dpy4"; - system = "csv"; - asd = "csv"; - }); - systems = [ "csv" ]; - lispLibs = [ ]; - }; - csv-parser = { - pname = "csv-parser"; - version = "20140713-git"; - asds = [ "csv-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/csv-parser/2014-07-13/csv-parser-20140713-git.tgz"; - sha256 = "0pcp709dwxi3p2vrmx5qiy571pybfs1hpv9z8g4i1ig2l4mc3djh"; - system = "csv-parser"; - asd = "csv-parser"; - }); - systems = [ "csv-parser" ]; - lispLibs = [ ]; - }; - ctype = { - pname = "ctype"; - version = "20220707-git"; - asds = [ "ctype" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ctype/2022-07-07/ctype-20220707-git.tgz"; - sha256 = "05smc81ml9rbcbzdhqg2mi9drnjsipq62r5q7f7qql8hbx01vl9i"; - system = "ctype"; - asd = "ctype"; - }); - systems = [ "ctype" ]; - lispLibs = [ ]; - }; - ctype-tfun = { - pname = "ctype-tfun"; - version = "20220707-git"; - asds = [ "ctype-tfun" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ctype/2022-07-07/ctype-20220707-git.tgz"; - sha256 = "05smc81ml9rbcbzdhqg2mi9drnjsipq62r5q7f7qql8hbx01vl9i"; - system = "ctype-tfun"; - asd = "ctype-tfun"; - }); - systems = [ "ctype-tfun" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "ctype" pkgs) ]; - }; - cubic-bezier = { - pname = "cubic-bezier"; - version = "20220707-git"; - asds = [ "cubic-bezier" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cubic-bezier/2022-07-07/cubic-bezier-20220707-git.tgz"; - sha256 = "08byf1pw2s5sz97bk0sp2a6gdx5dkankbbg14azafd1k0vfh7vcr"; - system = "cubic-bezier"; - asd = "cubic-bezier"; - }); - systems = [ "cubic-bezier" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) (getAttr "origin" pkgs) ]; - }; - cue-parser = { - pname = "cue-parser"; - version = "20180228-git"; - asds = [ "cue-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cue-parser/2018-02-28/cue-parser-20180228-git.tgz"; - sha256 = "1zl3a02b68yywchd1aldls07b4qgrf08xpb4xiaaw8njk2qa0lz1"; - system = "cue-parser"; - asd = "cue-parser"; - }); - systems = [ "cue-parser" ]; - lispLibs = [ (getAttr "esrap" pkgs) (getAttr "flexi-streams" pkgs) ]; - }; - curly = { - pname = "curly"; - version = "20120407-git"; - asds = [ "curly" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/curly/2012-04-07/curly-20120407-git.tgz"; - sha256 = "04gpkq6hd7wvvny0p3lgn87bfalswqc67sbg4p35j52w51mqd8vf"; - system = "curly"; - asd = "curly"; - }); - systems = [ "curly" ]; - lispLibs = [ ]; - }; - curly_dot_test = { - pname = "curly.test"; - version = "20120407-git"; - asds = [ "curly.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/curly/2012-04-07/curly-20120407-git.tgz"; - sha256 = "04gpkq6hd7wvvny0p3lgn87bfalswqc67sbg4p35j52w51mqd8vf"; - system = "curly.test"; - asd = "curly"; - }); - systems = [ "curly.test" ]; - lispLibs = [ (getAttr "curly" pkgs) (getAttr "fiveam" pkgs) ]; - }; - curry-compose-reader-macros = { - pname = "curry-compose-reader-macros"; - version = "20201220-git"; - asds = [ "curry-compose-reader-macros" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/curry-compose-reader-macros/2020-12-20/curry-compose-reader-macros-20201220-git.tgz"; - sha256 = "0j4qfwpw4ykf5npiln54w7jcnj46p7xf9d4p3jpx4a67fdkrlxd1"; - system = "curry-compose-reader-macros"; - asd = "curry-compose-reader-macros"; - }); - systems = [ "curry-compose-reader-macros" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - curry-compose-reader-macros_slash_test = { - pname = "curry-compose-reader-macros_test"; - version = "20201220-git"; - asds = [ "curry-compose-reader-macros" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/curry-compose-reader-macros/2020-12-20/curry-compose-reader-macros-20201220-git.tgz"; - sha256 = "0j4qfwpw4ykf5npiln54w7jcnj46p7xf9d4p3jpx4a67fdkrlxd1"; - system = "curry-compose-reader-macros"; - asd = "curry-compose-reader-macros"; - }); - systems = [ "curry-compose-reader-macros/test" ]; - lispLibs = [ (getAttr "curry-compose-reader-macros" pkgs) ]; - meta = { - broken = true; - }; - }; - cxml = { - pname = "cxml"; - version = "20200610-git"; - asds = [ "cxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; - sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51"; - system = "cxml"; - asd = "cxml"; - }); - systems = [ "cxml" ]; - lispLibs = [ (getAttr "closure-common" pkgs) (getAttr "puri" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - cxml-dom = { - pname = "cxml-dom"; - version = "20200610-git"; - asds = [ "cxml-dom" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; - sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51"; - system = "cxml-dom"; - asd = "cxml-dom"; - }); - systems = [ "cxml-dom" ]; - lispLibs = [ (getAttr "closure-common" pkgs) (getAttr "puri" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - cxml-klacks = { - pname = "cxml-klacks"; - version = "20200610-git"; - asds = [ "cxml-klacks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; - sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51"; - system = "cxml-klacks"; - asd = "cxml-klacks"; - }); - systems = [ "cxml-klacks" ]; - lispLibs = [ (getAttr "closure-common" pkgs) (getAttr "puri" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - cxml-rng = { - pname = "cxml-rng"; - version = "20190710-git"; - asds = [ "cxml-rng" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cxml-rng/2019-07-10/cxml-rng-20190710-git.tgz"; - sha256 = "0pjb5268spiwq6b0cly8nfajr6rsh2wf6si646bzzjrxbgs51sxa"; - system = "cxml-rng"; - asd = "cxml-rng"; - }); - systems = [ "cxml-rng" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "yacc" pkgs) (getAttr "cxml" pkgs) (getAttr "parse-number" pkgs) ]; - }; - cxml-rpc = { - pname = "cxml-rpc"; - version = "20121013-git"; - asds = [ "cxml-rpc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cxml-rpc/2012-10-13/cxml-rpc-20121013-git.tgz"; - sha256 = "1ihd8rg0shy7nykqcbvvx5px7sw8wr1nwz70jdrh6ibq74yr8flh"; - system = "cxml-rpc"; - asd = "cxml-rpc"; - }); - systems = [ "cxml-rpc" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "cxml" pkgs) (getAttr "drakma" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "parse-number" pkgs) ]; - }; - cxml-stp = { - pname = "cxml-stp"; - version = "20200325-git"; - asds = [ "cxml-stp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz"; - sha256 = "01yfxxvb144i2mlp06fxx410mf3phxz5qaqvk90pp4dzdl883knv"; - system = "cxml-stp"; - asd = "cxml-stp"; - }); - systems = [ "cxml-stp" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cxml" pkgs) (getAttr "xpath" pkgs) ]; - }; - cxml-stp_slash_test = { - pname = "cxml-stp_test"; - version = "20200325-git"; - asds = [ "cxml-stp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz"; - sha256 = "01yfxxvb144i2mlp06fxx410mf3phxz5qaqvk90pp4dzdl883knv"; - system = "cxml-stp"; - asd = "cxml-stp"; - }); - systems = [ "cxml-stp/test" ]; - lispLibs = [ (getAttr "cxml" pkgs) (getAttr "cxml-stp" pkgs) (getAttr "xpath" pkgs) (getAttr "rt" pkgs) ]; - meta = { - broken = true; - }; - }; - cxml-test = { - pname = "cxml-test"; - version = "20200610-git"; - asds = [ "cxml-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; - sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51"; - system = "cxml-test"; - asd = "cxml-test"; - }); - systems = [ "cxml-test" ]; - lispLibs = [ (getAttr "closure-common" pkgs) (getAttr "puri" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - cxml_slash_dom = { - pname = "cxml_dom"; - version = "20200610-git"; - asds = [ "cxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; - sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51"; - system = "cxml"; - asd = "cxml"; - }); - systems = [ "cxml/dom" ]; - lispLibs = [ (getAttr "closure-common" pkgs) (getAttr "puri" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - cxml_slash_klacks = { - pname = "cxml_klacks"; - version = "20200610-git"; - asds = [ "cxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; - sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51"; - system = "cxml"; - asd = "cxml"; - }); - systems = [ "cxml/klacks" ]; - lispLibs = [ (getAttr "closure-common" pkgs) (getAttr "puri" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - cxml_slash_test = { - pname = "cxml_test"; - version = "20200610-git"; - asds = [ "cxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; - sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51"; - system = "cxml"; - asd = "cxml"; - }); - systems = [ "cxml/test" ]; - lispLibs = [ (getAttr "closure-common" pkgs) (getAttr "puri" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - cxml_slash_xml = { - pname = "cxml_xml"; - version = "20200610-git"; - asds = [ "cxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; - sha256 = "18fls3bx7vmnxfa6qara8fxp316d8kb3izar0kysvqg6l0a45a51"; - system = "cxml"; - asd = "cxml"; - }); - systems = [ "cxml/xml" ]; - lispLibs = [ (getAttr "closure-common" pkgs) (getAttr "puri" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - cxx = { - pname = "cxx"; - version = "20210411-git"; - asds = [ "cxx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cxx/2021-04-11/cl-cxx-20210411-git.tgz"; - sha256 = "0hvb5n1s00f8q3bnj8g28fj2k3s8qz1fn0ls77pd3w69fg5wqdsy"; - system = "cxx"; - asd = "cxx"; - }); - systems = [ "cxx" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - cxx-jit = { - pname = "cxx-jit"; - version = "20220331-git"; - asds = [ "cxx-jit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cxx-jit/2022-03-31/cl-cxx-jit-20220331-git.tgz"; - sha256 = "0mbi5r4b4jbk50yy4pv7ngsjj50579f9c362dzh0sbrxk8vd3gkp"; - system = "cxx-jit"; - asd = "cxx-jit"; - }); - systems = [ "cxx-jit" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "uiop" pkgs) ]; - }; - cxx-test = { - pname = "cxx-test"; - version = "20210411-git"; - asds = [ "cxx-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-cxx/2021-04-11/cl-cxx-20210411-git.tgz"; - sha256 = "0hvb5n1s00f8q3bnj8g28fj2k3s8qz1fn0ls77pd3w69fg5wqdsy"; - system = "cxx-test"; - asd = "cxx-test"; - }); - systems = [ "cxx-test" ]; - lispLibs = [ (getAttr "cxx" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - cytoscape-clj = { - pname = "cytoscape-clj"; - version = "20221106-git"; - asds = [ "cytoscape-clj" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cytoscape-clj/2022-11-06/cytoscape-clj-20221106-git.tgz"; - sha256 = "0212c9aw2qpcijz2sglabbn51h93ljw1l3sj4kbff724xgc96ijh"; - system = "cytoscape-clj"; - asd = "cytoscape-clj"; - }); - systems = [ "cytoscape-clj" ]; - lispLibs = [ (getAttr "common-lisp-jupyter" pkgs) ]; - }; - daemon = { - pname = "daemon"; - version = "20170403-git"; - asds = [ "daemon" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/daemon/2017-04-03/daemon-20170403-git.tgz"; - sha256 = "1kdxfnhh9fz34j8qs7pn7mwjz3v33q4v9nh0hqkyzraq5xs2j3f4"; - system = "daemon"; - asd = "daemon"; - }); - systems = [ "daemon" ]; - lispLibs = [ (getAttr "trivial-features" pkgs) ]; - }; - damn-fast-priority-queue = { - pname = "damn-fast-priority-queue"; - version = "20221106-git"; - asds = [ "damn-fast-priority-queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2022-11-06/damn-fast-priority-queue-20221106-git.tgz"; - sha256 = "14917b1z7ag3a7f88p4fk4649iy07kn9vpq6bszdxcp1irnc5a13"; - system = "damn-fast-priority-queue"; - asd = "damn-fast-priority-queue"; - }); - systems = [ "damn-fast-priority-queue" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - damn-fast-priority-queue_slash_test = { - pname = "damn-fast-priority-queue_test"; - version = "20221106-git"; - asds = [ "damn-fast-priority-queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2022-11-06/damn-fast-priority-queue-20221106-git.tgz"; - sha256 = "14917b1z7ag3a7f88p4fk4649iy07kn9vpq6bszdxcp1irnc5a13"; - system = "damn-fast-priority-queue"; - asd = "damn-fast-priority-queue"; - }); - systems = [ "damn-fast-priority-queue/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "damn-fast-priority-queue" pkgs) ]; - meta = { - broken = true; - }; - }; - damn-fast-stable-priority-queue = { - pname = "damn-fast-stable-priority-queue"; - version = "20221106-git"; - asds = [ "damn-fast-stable-priority-queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2022-11-06/damn-fast-priority-queue-20221106-git.tgz"; - sha256 = "14917b1z7ag3a7f88p4fk4649iy07kn9vpq6bszdxcp1irnc5a13"; - system = "damn-fast-stable-priority-queue"; - asd = "damn-fast-stable-priority-queue"; - }); - systems = [ "damn-fast-stable-priority-queue" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - damn-fast-stable-priority-queue_slash_test = { - pname = "damn-fast-stable-priority-queue_test"; - version = "20221106-git"; - asds = [ "damn-fast-stable-priority-queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2022-11-06/damn-fast-priority-queue-20221106-git.tgz"; - sha256 = "14917b1z7ag3a7f88p4fk4649iy07kn9vpq6bszdxcp1irnc5a13"; - system = "damn-fast-stable-priority-queue"; - asd = "damn-fast-stable-priority-queue"; - }); - systems = [ "damn-fast-stable-priority-queue/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "damn-fast-stable-priority-queue" pkgs) ]; - meta = { - broken = true; - }; - }; - darts_dot_lib_dot_email-address = { - pname = "darts.lib.email-address"; - version = "quicklisp-release-48464635-git"; - asds = [ "darts.lib.email-address" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartsclemailaddress/2016-04-21/dartsclemailaddress-quicklisp-release-48464635-git.tgz"; - sha256 = "15155nqi9q7ilaf14p4yi4iga8203rl7fn9v2iaxcfm18gsvqcjd"; - system = "darts.lib.email-address"; - asd = "darts.lib.email-address"; - }); - systems = [ "darts.lib.email-address" ]; - lispLibs = [ ]; - }; - darts_dot_lib_dot_email-address-test = { - pname = "darts.lib.email-address-test"; - version = "quicklisp-release-48464635-git"; - asds = [ "darts.lib.email-address-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartsclemailaddress/2016-04-21/dartsclemailaddress-quicklisp-release-48464635-git.tgz"; - sha256 = "15155nqi9q7ilaf14p4yi4iga8203rl7fn9v2iaxcfm18gsvqcjd"; - system = "darts.lib.email-address-test"; - asd = "darts.lib.email-address-test"; - }); - systems = [ "darts.lib.email-address-test" ]; - lispLibs = [ (getAttr "darts_dot_lib_dot_email-address" pkgs) (getAttr "stefil" pkgs) ]; - }; - darts_dot_lib_dot_hashtree-test = { - pname = "darts.lib.hashtree-test"; - version = "20211230-git"; - asds = [ "darts.lib.hashtree-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartsclhashtree/2021-12-30/dartsclhashtree-20211230-git.tgz"; - sha256 = "17h3s6n9l1vwllcig7g385qxcrp6f68zjcb2rygs8nhs5g7iqryc"; - system = "darts.lib.hashtree-test"; - asd = "darts.lib.hashtree-test"; - }); - systems = [ "darts.lib.hashtree-test" ]; - lispLibs = [ (getAttr "darts_dot_lib_dot_hashtrie" pkgs) (getAttr "darts_dot_lib_dot_wbtree" pkgs) (getAttr "stefil" pkgs) ]; - }; - darts_dot_lib_dot_hashtrie = { - pname = "darts.lib.hashtrie"; - version = "20211230-git"; - asds = [ "darts.lib.hashtrie" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartsclhashtree/2021-12-30/dartsclhashtree-20211230-git.tgz"; - sha256 = "17h3s6n9l1vwllcig7g385qxcrp6f68zjcb2rygs8nhs5g7iqryc"; - system = "darts.lib.hashtrie"; - asd = "darts.lib.hashtrie"; - }); - systems = [ "darts.lib.hashtrie" ]; - lispLibs = [ ]; - }; - darts_dot_lib_dot_message-pack = { - pname = "darts.lib.message-pack"; - version = "20200325-git"; - asds = [ "darts.lib.message-pack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartsclmessagepack/2020-03-25/dartsclmessagepack-20200325-git.tgz"; - sha256 = "0i9jnvq6dp5zya1ijj3z7s10803jk8rb4nrjrzcgcfhkczd5si6y"; - system = "darts.lib.message-pack"; - asd = "darts.lib.message-pack"; - }); - systems = [ "darts.lib.message-pack" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "ieee-floats" pkgs) ]; - }; - darts_dot_lib_dot_message-pack-test = { - pname = "darts.lib.message-pack-test"; - version = "20200325-git"; - asds = [ "darts.lib.message-pack-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartsclmessagepack/2020-03-25/dartsclmessagepack-20200325-git.tgz"; - sha256 = "0i9jnvq6dp5zya1ijj3z7s10803jk8rb4nrjrzcgcfhkczd5si6y"; - system = "darts.lib.message-pack-test"; - asd = "darts.lib.message-pack-test"; - }); - systems = [ "darts.lib.message-pack-test" ]; - lispLibs = [ (getAttr "darts_dot_lib_dot_message-pack" pkgs) (getAttr "stefil" pkgs) (getAttr "trivial-octet-streams" pkgs) ]; - }; - darts_dot_lib_dot_sequence-metrics = { - pname = "darts.lib.sequence-metrics"; - version = "20130312-git"; - asds = [ "darts.lib.sequence-metrics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartsclsequencemetrics/2013-03-12/dartsclsequencemetrics-20130312-git.tgz"; - sha256 = "1x99gj5dfgiaraawx1nd157g5ajygfxz47cz8jgi1fh52fp1p969"; - system = "darts.lib.sequence-metrics"; - asd = "darts.lib.sequence-metrics"; - }); - systems = [ "darts.lib.sequence-metrics" ]; - lispLibs = [ ]; - }; - darts_dot_lib_dot_tools = { - pname = "darts.lib.tools"; - version = "20201220-git"; - asds = [ "darts.lib.tools" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartscltools/2020-12-20/dartscltools-20201220-git.tgz"; - sha256 = "0mbz7ak03qsw41fgybdw4mbibr656y9xl9bfgr2rmkdkgxbicys9"; - system = "darts.lib.tools"; - asd = "darts.lib.tools"; - }); - systems = [ "darts.lib.tools" ]; - lispLibs = [ (getAttr "atomics" pkgs) ]; - }; - darts_dot_lib_dot_tools_dot_test = { - pname = "darts.lib.tools.test"; - version = "20201220-git"; - asds = [ "darts.lib.tools.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartscltools/2020-12-20/dartscltools-20201220-git.tgz"; - sha256 = "0mbz7ak03qsw41fgybdw4mbibr656y9xl9bfgr2rmkdkgxbicys9"; - system = "darts.lib.tools.test"; - asd = "darts.lib.tools.test"; - }); - systems = [ "darts.lib.tools.test" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "darts_dot_lib_dot_tools" pkgs) (getAttr "fiveam" pkgs) ]; - }; - darts_dot_lib_dot_uuid = { - pname = "darts.lib.uuid"; - version = "20210807-git"; - asds = [ "darts.lib.uuid" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartscluuid/2021-08-07/dartscluuid-20210807-git.tgz"; - sha256 = "068lsbjnx4bkhz7s2022jsh8zsvqak98s8hcy1rs10bgi36hrrkh"; - system = "darts.lib.uuid"; - asd = "darts.lib.uuid"; - }); - systems = [ "darts.lib.uuid" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "ironclad" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - darts_dot_lib_dot_uuid-test = { - pname = "darts.lib.uuid-test"; - version = "20210807-git"; - asds = [ "darts.lib.uuid-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartscluuid/2021-08-07/dartscluuid-20210807-git.tgz"; - sha256 = "068lsbjnx4bkhz7s2022jsh8zsvqak98s8hcy1rs10bgi36hrrkh"; - system = "darts.lib.uuid-test"; - asd = "darts.lib.uuid-test"; - }); - systems = [ "darts.lib.uuid-test" ]; - lispLibs = [ (getAttr "darts_dot_lib_dot_uuid" pkgs) (getAttr "stefil" pkgs) ]; - }; - darts_dot_lib_dot_wbtree = { - pname = "darts.lib.wbtree"; - version = "20211230-git"; - asds = [ "darts.lib.wbtree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dartsclhashtree/2021-12-30/dartsclhashtree-20211230-git.tgz"; - sha256 = "17h3s6n9l1vwllcig7g385qxcrp6f68zjcb2rygs8nhs5g7iqryc"; - system = "darts.lib.wbtree"; - asd = "darts.lib.wbtree"; - }); - systems = [ "darts.lib.wbtree" ]; - lispLibs = [ ]; - }; - data-format-validation = { - pname = "data-format-validation"; - version = "20140713-git"; - asds = [ "data-format-validation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-data-format-validation/2014-07-13/cl-data-format-validation-20140713-git.tgz"; - sha256 = "0zmk47xmicyqvp1impn8kgh5373ysmx3gfpqcvbi9r31qsir2nqa"; - system = "data-format-validation"; - asd = "data-format-validation"; - }); - systems = [ "data-format-validation" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - data-frame = { - pname = "data-frame"; - version = "20221106-git"; - asds = [ "data-frame" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/data-frame/2022-11-06/data-frame-20221106-git.tgz"; - sha256 = "0bs1jh66bml25bj1lxdzz8cjhj3g060yyd5ggqsnsr4l2j0zyszv"; - system = "data-frame"; - asd = "data-frame"; - }); - systems = [ "data-frame" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "alexandria_plus" pkgs) (getAttr "anaphora" pkgs) (getAttr "array-operations" pkgs) (getAttr "duologue" pkgs) (getAttr "let-plus" pkgs) (getAttr "num-utils" pkgs) (getAttr "select" pkgs) (getAttr "statistics" pkgs) ]; - }; - data-frame_slash_tests = { - pname = "data-frame_tests"; - version = "20221106-git"; - asds = [ "data-frame" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/data-frame/2022-11-06/data-frame-20221106-git.tgz"; - sha256 = "0bs1jh66bml25bj1lxdzz8cjhj3g060yyd5ggqsnsr4l2j0zyszv"; - system = "data-frame"; - asd = "data-frame"; - }); - systems = [ "data-frame/tests" ]; - lispLibs = [ (getAttr "clunit2" pkgs) (getAttr "data-frame" pkgs) ]; - meta = { - broken = true; - }; - }; - data-lens = { - pname = "data-lens"; - version = "20221106-git"; - asds = [ "data-lens" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/data-lens/2022-11-06/data-lens-20221106-git.tgz"; - sha256 = "08h8i1y0mzhwh0nb70y448zv12plgzwbbr32hsw2vzjbas31rv02"; - system = "data-lens"; - asd = "data-lens"; - }); - systems = [ "data-lens" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - data-lens_slash_beta_slash_transducers = { - pname = "data-lens_beta_transducers"; - version = "20221106-git"; - asds = [ "data-lens" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/data-lens/2022-11-06/data-lens-20221106-git.tgz"; - sha256 = "08h8i1y0mzhwh0nb70y448zv12plgzwbbr32hsw2vzjbas31rv02"; - system = "data-lens"; - asd = "data-lens"; - }); - systems = [ "data-lens/beta/transducers" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "data-lens" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - data-lens_slash_test = { - pname = "data-lens_test"; - version = "20221106-git"; - asds = [ "data-lens" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/data-lens/2022-11-06/data-lens-20221106-git.tgz"; - sha256 = "08h8i1y0mzhwh0nb70y448zv12plgzwbbr32hsw2vzjbas31rv02"; - system = "data-lens"; - asd = "data-lens"; - }); - systems = [ "data-lens/test" ]; - lispLibs = [ (getAttr "data-lens" pkgs) (getAttr "fiveam" pkgs) (getAttr "serapeum" pkgs) (getAttr "string-case" pkgs) ]; - meta = { - broken = true; - }; - }; - data-lens_slash_transducers_slash_test = { - pname = "data-lens_transducers_test"; - version = "20221106-git"; - asds = [ "data-lens" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/data-lens/2022-11-06/data-lens-20221106-git.tgz"; - sha256 = "08h8i1y0mzhwh0nb70y448zv12plgzwbbr32hsw2vzjbas31rv02"; - system = "data-lens"; - asd = "data-lens"; - }); - systems = [ "data-lens/transducers/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "data-lens" pkgs) (getAttr "fiveam" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - data-sift = { - pname = "data-sift"; - version = "20130128-git"; - asds = [ "data-sift" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/data-sift/2013-01-28/data-sift-20130128-git.tgz"; - sha256 = "1v7gf0x4ibjzp0c56n9m77hxdgwcm9356zlk5n4l3fx4i0hj6146"; - system = "data-sift"; - asd = "data-sift"; - }); - systems = [ "data-sift" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "parse-number" pkgs) (getAttr "puri" pkgs) ]; - }; - data-sift-test = { - pname = "data-sift-test"; - version = "20130128-git"; - asds = [ "data-sift-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/data-sift/2013-01-28/data-sift-20130128-git.tgz"; - sha256 = "1v7gf0x4ibjzp0c56n9m77hxdgwcm9356zlk5n4l3fx4i0hj6146"; - system = "data-sift-test"; - asd = "data-sift"; - }); - systems = [ "data-sift-test" ]; - lispLibs = [ (getAttr "data-sift" pkgs) (getAttr "lift" pkgs) ]; - }; - data-table = { - pname = "data-table"; - version = "20221106-git"; - asds = [ "data-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/data-table/2022-11-06/data-table-20221106-git.tgz"; - sha256 = "0pin7hjsniz1ls3mrsjz6jqvlbbws8s4g7a0ks00dnwdm8nca6l3"; - system = "data-table"; - asd = "data-table"; - }); - systems = [ "data-table" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "iterate" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - data-table-clsql = { - pname = "data-table-clsql"; - version = "20221106-git"; - asds = [ "data-table-clsql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/data-table/2022-11-06/data-table-20221106-git.tgz"; - sha256 = "0pin7hjsniz1ls3mrsjz6jqvlbbws8s4g7a0ks00dnwdm8nca6l3"; - system = "data-table-clsql"; - asd = "data-table-clsql"; - }); - systems = [ "data-table-clsql" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "clsql-helper" pkgs) (getAttr "collectors" pkgs) (getAttr "data-table" pkgs) (getAttr "iterate" pkgs) ]; - }; - data-table-test = { - pname = "data-table-test"; - version = "20221106-git"; - asds = [ "data-table-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/data-table/2022-11-06/data-table-20221106-git.tgz"; - sha256 = "0pin7hjsniz1ls3mrsjz6jqvlbbws8s4g7a0ks00dnwdm8nca6l3"; - system = "data-table-test"; - asd = "data-table"; - }); - systems = [ "data-table-test" ]; - lispLibs = [ (getAttr "data-table" pkgs) (getAttr "lisp-unit2" pkgs) ]; - }; - database-migrations = { - pname = "database-migrations"; - version = "20180831-git"; - asds = [ "database-migrations" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/database-migrations/2018-08-31/database-migrations-20180831-git.tgz"; - sha256 = "1rina8j4hh06zc18sxl55r2gsq6x17sn1mjaihdvjyqa7f95s8rp"; - system = "database-migrations"; - asd = "database-migrations"; - }); - systems = [ "database-migrations" ]; - lispLibs = [ (getAttr "postmodern" pkgs) ]; - }; - datafly = { - pname = "datafly"; - version = "20200325-git"; - asds = [ "datafly" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/datafly/2020-03-25/datafly-20200325-git.tgz"; - sha256 = "16b78kzmglp2a4nxlxxl7rpf5zaibsgagn0p3c56fsxvx0c4hszv"; - system = "datafly"; - asd = "datafly"; - }); - systems = [ "datafly" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "dbi" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "closer-mop" pkgs) (getAttr "function-cache" pkgs) (getAttr "iterate" pkgs) (getAttr "jonathan" pkgs) (getAttr "kebab" pkgs) (getAttr "local-time" pkgs) (getAttr "log4cl" pkgs) (getAttr "optima" pkgs) (getAttr "sxql" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - datafly-test = { - pname = "datafly-test"; - version = "20200325-git"; - asds = [ "datafly-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/datafly/2020-03-25/datafly-20200325-git.tgz"; - sha256 = "16b78kzmglp2a4nxlxxl7rpf5zaibsgagn0p3c56fsxvx0c4hszv"; - system = "datafly-test"; - asd = "datafly-test"; - }); - systems = [ "datafly-test" ]; - lispLibs = [ (getAttr "datafly" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "sxql" pkgs) ]; - }; - dataloader = { - pname = "dataloader"; - version = "20210531-git"; - asds = [ "dataloader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dataloader/2021-05-31/dataloader-20210531-git.tgz"; - sha256 = "1a7nap2yp0jjd9r3xpkj0a6z0m3gshz73abm8kfza4kf31ipzyik"; - system = "dataloader"; - asd = "dataloader"; - }); - systems = [ "dataloader" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-csv" pkgs) (getAttr "cl-jpeg" pkgs) (getAttr "png" pkgs) (getAttr "cl-wav" pkgs) (getAttr "iterate" pkgs) (getAttr "magicffi" pkgs) (getAttr "numcl" pkgs) (getAttr "numpy-file-format" pkgs) (getAttr "retrospectiff" pkgs) (getAttr "trivia" pkgs) ]; - }; - dataloader_dot_test = { - pname = "dataloader.test"; - version = "20210531-git"; - asds = [ "dataloader.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dataloader/2021-05-31/dataloader-20210531-git.tgz"; - sha256 = "1a7nap2yp0jjd9r3xpkj0a6z0m3gshz73abm8kfza4kf31ipzyik"; - system = "dataloader.test"; - asd = "dataloader.test"; - }); - systems = [ "dataloader.test" ]; - lispLibs = [ (getAttr "dataloader" pkgs) (getAttr "fiveam" pkgs) ]; - }; - datamuse = { - pname = "datamuse"; - version = "20221106-git"; - asds = [ "datamuse" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/datamuse/2022-11-06/datamuse-20221106-git.tgz"; - sha256 = "1x37rjf2gyvlq6jlflw628g299qdgzb0bwiv3qxk0nv22an50rp0"; - system = "datamuse"; - asd = "datamuse"; - }); - systems = [ "datamuse" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "drakma" pkgs) (getAttr "yason" pkgs) ]; - }; - date-calc = { - pname = "date-calc"; - version = "20191227-git"; - asds = [ "date-calc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/date-calc/2019-12-27/date-calc-20191227-git.tgz"; - sha256 = "09wmjp3ypxigcmx4mvc0yjnj56wkjjchhssdmklbaswy5mi7xc9s"; - system = "date-calc"; - asd = "date-calc"; - }); - systems = [ "date-calc" ]; - lispLibs = [ ]; - }; - date-calc_slash_test = { - pname = "date-calc_test"; - version = "20191227-git"; - asds = [ "date-calc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/date-calc/2019-12-27/date-calc-20191227-git.tgz"; - sha256 = "09wmjp3ypxigcmx4mvc0yjnj56wkjjchhssdmklbaswy5mi7xc9s"; - system = "date-calc"; - asd = "date-calc"; - }); - systems = [ "date-calc/test" ]; - lispLibs = [ (getAttr "date-calc" pkgs) (getAttr "fiveam" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - datum-comments = { - pname = "datum-comments"; - version = "20210228-git"; - asds = [ "datum-comments" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/datum-comments/2021-02-28/datum-comments-20210228-git.tgz"; - sha256 = "07zzlhphcmwimp4pjckhnbjbn127lcpafi7j0l74137dz9pimjik"; - system = "datum-comments"; - asd = "datum-comments"; - }); - systems = [ "datum-comments" ]; - lispLibs = [ ]; - }; - datum-comments_slash_test = { - pname = "datum-comments_test"; - version = "20210228-git"; - asds = [ "datum-comments" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/datum-comments/2021-02-28/datum-comments-20210228-git.tgz"; - sha256 = "07zzlhphcmwimp4pjckhnbjbn127lcpafi7j0l74137dz9pimjik"; - system = "datum-comments"; - asd = "datum-comments"; - }); - systems = [ "datum-comments/test" ]; - lispLibs = [ (getAttr "datum-comments" pkgs) ]; - meta = { - broken = true; - }; - }; - db3 = { - pname = "db3"; - version = "20200218-git"; - asds = [ "db3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-db3/2020-02-18/cl-db3-20200218-git.tgz"; - sha256 = "1i7j0mlri6kbklcx1lsm464s8kmyhhij5c4xh4aybrw8m4ixn1s5"; - system = "db3"; - asd = "db3"; - }); - systems = [ "db3" ]; - lispLibs = [ ]; - }; - dbd-mysql = { - pname = "dbd-mysql"; - version = "20211020-git"; - asds = [ "dbd-mysql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz"; - sha256 = "0f8z7an8ssg8mdf9k781r4ygdppv798v6f08ibgpd8mv8a6491fg"; - system = "dbd-mysql"; - asd = "dbd-mysql"; - }); - systems = [ "dbd-mysql" ]; - lispLibs = [ (getAttr "dbi" pkgs) (getAttr "cl-mysql" pkgs) ]; - }; - dbd-postgres = { - pname = "dbd-postgres"; - version = "20211020-git"; - asds = [ "dbd-postgres" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz"; - sha256 = "0f8z7an8ssg8mdf9k781r4ygdppv798v6f08ibgpd8mv8a6491fg"; - system = "dbd-postgres"; - asd = "dbd-postgres"; - }); - systems = [ "dbd-postgres" ]; - lispLibs = [ (getAttr "dbi" pkgs) (getAttr "cl-postgres" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - dbd-sqlite3 = { - pname = "dbd-sqlite3"; - version = "20211020-git"; - asds = [ "dbd-sqlite3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz"; - sha256 = "0f8z7an8ssg8mdf9k781r4ygdppv798v6f08ibgpd8mv8a6491fg"; - system = "dbd-sqlite3"; - asd = "dbd-sqlite3"; - }); - systems = [ "dbd-sqlite3" ]; - lispLibs = [ (getAttr "dbi" pkgs) (getAttr "sqlite" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - dbi = { - pname = "dbi"; - version = "20211020-git"; - asds = [ "dbi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz"; - sha256 = "0f8z7an8ssg8mdf9k781r4ygdppv798v6f08ibgpd8mv8a6491fg"; - system = "dbi"; - asd = "dbi"; - }); - systems = [ "dbi" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - dbi-test = { - pname = "dbi-test"; - version = "20211020-git"; - asds = [ "dbi-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz"; - sha256 = "0f8z7an8ssg8mdf9k781r4ygdppv798v6f08ibgpd8mv8a6491fg"; - system = "dbi-test"; - asd = "dbi-test"; - }); - systems = [ "dbi-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "dbi" pkgs) (getAttr "rove" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - dbi_slash_test = { - pname = "dbi_test"; - version = "20211020-git"; - asds = [ "dbi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz"; - sha256 = "0f8z7an8ssg8mdf9k781r4ygdppv798v6f08ibgpd8mv8a6491fg"; - system = "dbi"; - asd = "dbi"; - }); - systems = [ "dbi/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "dbd-mysql" pkgs) (getAttr "dbd-postgres" pkgs) (getAttr "dbd-sqlite3" pkgs) (getAttr "dbi" pkgs) (getAttr "dbi-test" pkgs) (getAttr "closer-mop" pkgs) (getAttr "rove" pkgs) (getAttr "trivial-types" pkgs) ]; - meta = { - broken = true; - }; - }; - dbus = { - pname = "dbus"; - version = "20211020-git"; - asds = [ "dbus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dbus/2021-10-20/dbus-20211020-git.tgz"; - sha256 = "1gw5414q7r6yi2bm1wk2fhqnvhxzc5c6812z3qh67c9dyizcjy2a"; - system = "dbus"; - asd = "dbus"; - }); - systems = [ "dbus" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "asdf-package-system" pkgs) (getAttr "babel" pkgs) (getAttr "cl-xmlspam" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "iolib" pkgs) (getAttr "ironclad" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - dct = { - pname = "dct"; - version = "20220331-git"; - asds = [ "dct" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dct/2022-03-31/cl-dct-20220331-git.tgz"; - sha256 = "1rzq4vdhvr454668a3xf56mha061d27ymsgawmxikgk86wi8biin"; - system = "dct"; - asd = "dct"; - }); - systems = [ "dct" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - dct-test = { - pname = "dct-test"; - version = "20220331-git"; - asds = [ "dct-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-dct/2022-03-31/cl-dct-20220331-git.tgz"; - sha256 = "1rzq4vdhvr454668a3xf56mha061d27ymsgawmxikgk86wi8biin"; - system = "dct-test"; - asd = "dct-test"; - }); - systems = [ "dct-test" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-coveralls" pkgs) (getAttr "dct" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - ddo = { - pname = "ddo"; - version = "20210411-git"; - asds = [ "ddo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; - system = "ddo"; - asd = "ddo"; - }); - systems = [ "ddo" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-mpi" pkgs) (getAttr "cl-mpi-extensions" pkgs) (getAttr "femlisp-basic" pkgs) (getAttr "femlisp-dictionary" pkgs) (getAttr "femlisp-parallel" pkgs) (getAttr "lfarm-admin" pkgs) (getAttr "lfarm-client" pkgs) (getAttr "lfarm-server" pkgs) (getAttr "trees" pkgs) (getAttr "uiop" pkgs) ]; - }; - de-mock-racy = { - pname = "de-mock-racy"; - version = "20221106-git"; - asds = [ "de-mock-racy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/de-mock-racy/2022-11-06/de-mock-racy-20221106-git.tgz"; - sha256 = "02rkg1i5r8fgyhaipb0mkz543c8r81kqmwmmvywnnw8hpyvav2xb"; - system = "de-mock-racy"; - asd = "de-mock-racy"; - }); - systems = [ "de-mock-racy" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - dealii-tutorial = { - pname = "dealii-tutorial"; - version = "20210411-git"; - asds = [ "dealii-tutorial" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; - system = "dealii-tutorial"; - asd = "dealii-tutorial"; - }); - systems = [ "dealii-tutorial" ]; - lispLibs = [ (getAttr "femlisp" pkgs) ]; - }; - decimals = { - pname = "decimals"; - version = "20211209-git"; - asds = [ "decimals" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-decimals/2021-12-09/cl-decimals-20211209-git.tgz"; - sha256 = "0wn5hq1pwd3wpjqqhpjzarcdk1q6416g8y447iaf55j5nbhlmbn6"; - system = "decimals"; - asd = "decimals"; - }); - systems = [ "decimals" ]; - lispLibs = [ ]; - }; - deeds = { - pname = "deeds"; - version = "20200715-git"; - asds = [ "deeds" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deeds/2020-07-15/deeds-20200715-git.tgz"; - sha256 = "062cnb2dwli6pw3zvv46jfxyxdzcbzwsck5pa6nw03qf1j1hyg3k"; - system = "deeds"; - asd = "deeds"; - }); - systems = [ "deeds" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "form-fiddle" pkgs) (getAttr "lambda-fiddle" pkgs) ]; - }; - defclass-std = { - pname = "defclass-std"; - version = "20201220-git"; - asds = [ "defclass-std" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defclass-std/2020-12-20/defclass-std-20201220-git.tgz"; - sha256 = "1c0ymb49wd205lzxmnmsrpqyv0pn61snn2xvsbk5iis135r4fr18"; - system = "defclass-std"; - asd = "defclass-std"; - }); - systems = [ "defclass-std" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) ]; - }; - defclass-std-test = { - pname = "defclass-std-test"; - version = "20201220-git"; - asds = [ "defclass-std-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defclass-std/2020-12-20/defclass-std-20201220-git.tgz"; - sha256 = "1c0ymb49wd205lzxmnmsrpqyv0pn61snn2xvsbk5iis135r4fr18"; - system = "defclass-std-test"; - asd = "defclass-std-test"; - }); - systems = [ "defclass-std-test" ]; - lispLibs = [ (getAttr "defclass-std" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - defconfig = { - pname = "defconfig"; - version = "20211209-git"; - asds = [ "defconfig" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defconfig/2021-12-09/defconfig-20211209-git.tgz"; - sha256 = "1gvgni43fxknj800k2k7jhgayzqqqp3s321sw4qmsjxpv479hcqy"; - system = "defconfig"; - asd = "defconfig"; - }); - systems = [ "defconfig" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "trivial-cltl2" pkgs) ]; - }; - defconfig_slash_tests = { - pname = "defconfig_tests"; - version = "20211209-git"; - asds = [ "defconfig" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defconfig/2021-12-09/defconfig-20211209-git.tgz"; - sha256 = "1gvgni43fxknj800k2k7jhgayzqqqp3s321sw4qmsjxpv479hcqy"; - system = "defconfig"; - asd = "defconfig"; - }); - systems = [ "defconfig/tests" ]; - lispLibs = [ (getAttr "defconfig" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - defenum = { - pname = "defenum"; - version = "20211230-git"; - asds = [ "defenum" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defenum/2021-12-30/defenum-20211230-git.tgz"; - sha256 = "1pya5xqr2y8zfsv7a6k0q3s6fhz7shx8b3fxll111jq56150ls98"; - system = "defenum"; - asd = "defenum"; - }); - systems = [ "defenum" ]; - lispLibs = [ ]; - }; - deferred = { - pname = "deferred"; - version = "20190710-git"; - asds = [ "deferred" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deferred/2019-07-10/deferred-20190710-git.tgz"; - sha256 = "1pcbzvambkqacs4pcww7wc9g7jjv0x7a8iwbk2b16l8x0rc0izx5"; - system = "deferred"; - asd = "deferred"; - }); - systems = [ "deferred" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - define-json-expander = { - pname = "define-json-expander"; - version = "20140713-git"; - asds = [ "define-json-expander" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/define-json-expander/2014-07-13/define-json-expander-20140713-git.tgz"; - sha256 = "193mhjcy1qnfd7r7zia3qs8p7gllvq6s0b2wcqmkh0y17aw8brkh"; - system = "define-json-expander"; - asd = "define-json-expander"; - }); - systems = [ "define-json-expander" ]; - lispLibs = [ ]; - }; - definer = { - pname = "definer"; - version = "20211230-git"; - asds = [ "definer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/definer/2021-12-30/definer-20211230-git.tgz"; - sha256 = "0wgg6c9la1asq7hpyacyi8l3fb80hnpscygsxsg0yjk2s2h5gsk7"; - system = "definer"; - asd = "definer"; - }); - systems = [ "definer" ]; - lispLibs = [ ]; - }; - definitions = { - pname = "definitions"; - version = "20210531-git"; - asds = [ "definitions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/definitions/2021-05-31/definitions-20210531-git.tgz"; - sha256 = "16dh9iy3v344xj4qllsp47007px3yx26fxxh9gh2cvs8dqgk3kch"; - system = "definitions"; - asd = "definitions"; - }); - systems = [ "definitions" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - definitions-systems = { - pname = "definitions-systems"; - version = "2.0.1"; - asds = [ "definitions-systems" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/definitions-systems/2021-04-11/definitions-systems_2.0.1.tgz"; - sha256 = "009392mj0qdq4jy0dw5r41schnygwj286759yvyg7xja30a0psfq"; - system = "definitions-systems"; - asd = "definitions-systems"; - }); - systems = [ "definitions-systems" ]; - lispLibs = [ (getAttr "canonicalized-initargs" pkgs) (getAttr "enhanced-defclass" pkgs) (getAttr "enhanced-find-class" pkgs) (getAttr "shared-preferences" pkgs) ]; - }; - definitions-systems_tests = { - pname = "definitions-systems_tests"; - version = "2.0.1"; - asds = [ "definitions-systems_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/definitions-systems/2021-04-11/definitions-systems_2.0.1.tgz"; - sha256 = "009392mj0qdq4jy0dw5r41schnygwj286759yvyg7xja30a0psfq"; - system = "definitions-systems_tests"; - asd = "definitions-systems_tests"; - }); - systems = [ "definitions-systems_tests" ]; - lispLibs = [ (getAttr "definitions-systems" pkgs) (getAttr "parachute" pkgs) ]; - }; - deflate = { - pname = "deflate"; - version = "20200218-git"; - asds = [ "deflate" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deflate/2020-02-18/deflate-20200218-git.tgz"; - sha256 = "1jpdjnxh6cw2d8hk70r2sxn92is52s9b855irvwkdd777fdciids"; - system = "deflate"; - asd = "deflate"; - }); - systems = [ "deflate" ]; - lispLibs = [ ]; - }; - deflazy = { - pname = "deflazy"; - version = "20200427-git"; - asds = [ "deflazy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "deflazy"; - asd = "deflazy"; - }); - systems = [ "deflazy" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "uncommon-lisp" pkgs) (getAttr "utility" pkgs) ]; - }; - defmain = { - pname = "defmain"; - version = "20221106-git"; - asds = [ "defmain" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defmain/2022-11-06/defmain-20221106-git.tgz"; - sha256 = "08mmb0rgbipmjhmpvr1889n1665309pwsa16qsrsbmgnmmaznw6a"; - system = "defmain"; - asd = "defmain"; - }); - systems = [ "defmain" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "net_dot_didierverna_dot_clon_dot_core" pkgs) (getAttr "cl-inflector" pkgs) (getAttr "cl-strings" pkgs) (getAttr "_40ants-doc" pkgs) (getAttr "docs-config" pkgs) (getAttr "named-readtables" pkgs) (getAttr "pythonic-string-reader" pkgs) (getAttr "uiop" pkgs) ]; - }; - defmain-test = { - pname = "defmain-test"; - version = "20221106-git"; - asds = [ "defmain-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defmain/2022-11-06/defmain-20221106-git.tgz"; - sha256 = "08mmb0rgbipmjhmpvr1889n1665309pwsa16qsrsbmgnmmaznw6a"; - system = "defmain-test"; - asd = "defmain-test"; - }); - systems = [ "defmain-test" ]; - lispLibs = [ (getAttr "hamcrest" pkgs) (getAttr "defmain" pkgs) (getAttr "rove" pkgs) ]; - }; - defmemo = { - pname = "defmemo"; - version = "20120407-git"; - asds = [ "defmemo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defmemo/2012-04-07/defmemo-20120407-git.tgz"; - sha256 = "0rkvnjfb6fajzfzislz6z372bqpkj6wfbf0sxmzhhigni4wnil27"; - system = "defmemo"; - asd = "defmemo"; - }); - systems = [ "defmemo" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - defmemo-test = { - pname = "defmemo-test"; - version = "20120407-git"; - asds = [ "defmemo-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defmemo/2012-04-07/defmemo-20120407-git.tgz"; - sha256 = "0rkvnjfb6fajzfzislz6z372bqpkj6wfbf0sxmzhhigni4wnil27"; - system = "defmemo-test"; - asd = "defmemo"; - }); - systems = [ "defmemo-test" ]; - lispLibs = [ (getAttr "defmemo" pkgs) ]; - }; - defpackage-plus = { - pname = "defpackage-plus"; - version = "20180131-git"; - asds = [ "defpackage-plus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defpackage-plus/2018-01-31/defpackage-plus-20180131-git.tgz"; - sha256 = "0lzljvf343xb6mlh6lni2i27hpm5qd376522mk6hr2pa20vd6rdq"; - system = "defpackage-plus"; - asd = "defpackage-plus"; - }); - systems = [ "defpackage-plus" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - defrec = { - pname = "defrec"; - version = "20190307-hg"; - asds = [ "defrec" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defrec/2019-03-07/defrec-20190307-hg.tgz"; - sha256 = "1hk70y79wpdp16586yl550xh0zmybxhr25x2y2d9in65ghaz6fk0"; - system = "defrec"; - asd = "defrec"; - }); - systems = [ "defrec" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - defrest = { - pname = "defrest"; - version = "20210531-git"; - asds = [ "defrest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defrest/2021-05-31/defrest-20210531-git.tgz"; - sha256 = "14pap344a0549mb7p79jf87ibfxmymk0hf9i7galcfi4s8nqq45g"; - system = "defrest"; - asd = "defrest"; - }); - systems = [ "defrest" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "quri" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - defrest_dot_test = { - pname = "defrest.test"; - version = "20210531-git"; - asds = [ "defrest.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defrest/2021-05-31/defrest-20210531-git.tgz"; - sha256 = "14pap344a0549mb7p79jf87ibfxmymk0hf9i7galcfi4s8nqq45g"; - system = "defrest.test"; - asd = "defrest"; - }); - systems = [ "defrest.test" ]; - lispLibs = [ (getAttr "defrest" pkgs) (getAttr "drakma" pkgs) (getAttr "fiveam" pkgs) ]; - }; - defstar = { - pname = "defstar"; - version = "20140713-git"; - asds = [ "defstar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defstar/2014-07-13/defstar-20140713-git.tgz"; - sha256 = "0n6m3aqvdfnsrhlhqjcy72d1i55lbkjg13ij5c7vw003p1n78wxi"; - system = "defstar"; - asd = "defstar"; - }); - systems = [ "defstar" ]; - lispLibs = [ ]; - }; - defsystem-compatibility = { - pname = "defsystem-compatibility"; - version = "20101006-darcs"; - asds = [ "defsystem-compatibility" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defsystem-compatibility/2010-10-06/defsystem-compatibility-20101006-darcs.tgz"; - sha256 = "0bw0c69zyika19rvzl8xplwrqsgznhnlbj40fcszfw0vxh2czj0f"; - system = "defsystem-compatibility"; - asd = "defsystem-compatibility"; - }); - systems = [ "defsystem-compatibility" ]; - lispLibs = [ (getAttr "metatilities-base" pkgs) ]; - }; - defsystem-compatibility-test = { - pname = "defsystem-compatibility-test"; - version = "20101006-darcs"; - asds = [ "defsystem-compatibility-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defsystem-compatibility/2010-10-06/defsystem-compatibility-20101006-darcs.tgz"; - sha256 = "0bw0c69zyika19rvzl8xplwrqsgznhnlbj40fcszfw0vxh2czj0f"; - system = "defsystem-compatibility-test"; - asd = "defsystem-compatibility-test"; - }); - systems = [ "defsystem-compatibility-test" ]; - lispLibs = [ (getAttr "defsystem-compatibility" pkgs) (getAttr "lift" pkgs) ]; - }; - defvariant = { - pname = "defvariant"; - version = "20140713-git"; - asds = [ "defvariant" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/defvariant/2014-07-13/defvariant-20140713-git.tgz"; - sha256 = "0rma557l2irjyzrswcd7329iic2pjxw0jgk3m2inag39l6wyqsr1"; - system = "defvariant"; - asd = "defvariant"; - }); - systems = [ "defvariant" ]; - lispLibs = [ ]; - }; - delorean = { - pname = "delorean"; - version = "20130615-git"; - asds = [ "delorean" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/delorean/2013-06-15/delorean-20130615-git.tgz"; - sha256 = "0q11wqdlvis91i996mar72icw07yf7mwmsnlmsbsya9kaqj7n3cd"; - system = "delorean"; - asd = "delorean"; - }); - systems = [ "delorean" ]; - lispLibs = [ (getAttr "local-time" pkgs) ]; - }; - delorean-test = { - pname = "delorean-test"; - version = "20130615-git"; - asds = [ "delorean-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/delorean/2013-06-15/delorean-20130615-git.tgz"; - sha256 = "0q11wqdlvis91i996mar72icw07yf7mwmsnlmsbsya9kaqj7n3cd"; - system = "delorean-test"; - asd = "delorean"; - }); - systems = [ "delorean-test" ]; - lispLibs = [ (getAttr "delorean" pkgs) (getAttr "fiveam" pkgs) ]; - }; - delta-debug = { - pname = "delta-debug"; - version = "20180831-git"; - asds = [ "delta-debug" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/delta-debug/2018-08-31/delta-debug-20180831-git.tgz"; - sha256 = "0dm33v8ipkpr23mjb9s6z2c7gmxwjbd5khc7c1vangba18nzm7ir"; - system = "delta-debug"; - asd = "delta-debug"; - }); - systems = [ "delta-debug" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "curry-compose-reader-macros" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - delta-debug_slash_delta = { - pname = "delta-debug_delta"; - version = "20180831-git"; - asds = [ "delta-debug" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/delta-debug/2018-08-31/delta-debug-20180831-git.tgz"; - sha256 = "0dm33v8ipkpr23mjb9s6z2c7gmxwjbd5khc7c1vangba18nzm7ir"; - system = "delta-debug"; - asd = "delta-debug"; - }); - systems = [ "delta-debug/delta" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "curry-compose-reader-macros" pkgs) (getAttr "delta-debug" pkgs) (getAttr "diff" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-shell" pkgs) ]; - meta = { - broken = true; - }; - }; - delta-debug_slash_test = { - pname = "delta-debug_test"; - version = "20180831-git"; - asds = [ "delta-debug" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/delta-debug/2018-08-31/delta-debug-20180831-git.tgz"; - sha256 = "0dm33v8ipkpr23mjb9s6z2c7gmxwjbd5khc7c1vangba18nzm7ir"; - system = "delta-debug"; - asd = "delta-debug"; - }); - systems = [ "delta-debug/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "curry-compose-reader-macros" pkgs) (getAttr "delta-debug" pkgs) (getAttr "stefil" pkgs) ]; - meta = { - broken = true; - }; - }; - dendrite = { - pname = "dendrite"; - version = "release-quicklisp-409b1061-git"; - asds = [ "dendrite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz"; - sha256 = "1fsi77w2yamis2707f1hx09pmyjaxqpzl8s0h182vpz159lkxdy5"; - system = "dendrite"; - asd = "dendrite"; - }); - systems = [ "dendrite" ]; - lispLibs = [ (getAttr "dendrite_dot_micro-l-system" pkgs) (getAttr "dendrite_dot_primitives" pkgs) ]; - }; - dendrite_dot_micro-l-system = { - pname = "dendrite.micro-l-system"; - version = "release-quicklisp-409b1061-git"; - asds = [ "dendrite.micro-l-system" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz"; - sha256 = "1fsi77w2yamis2707f1hx09pmyjaxqpzl8s0h182vpz159lkxdy5"; - system = "dendrite.micro-l-system"; - asd = "dendrite.micro-l-system"; - }); - systems = [ "dendrite.micro-l-system" ]; - lispLibs = [ ]; - }; - dendrite_dot_primitives = { - pname = "dendrite.primitives"; - version = "release-quicklisp-409b1061-git"; - asds = [ "dendrite.primitives" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dendrite/2017-10-23/dendrite-release-quicklisp-409b1061-git.tgz"; - sha256 = "1fsi77w2yamis2707f1hx09pmyjaxqpzl8s0h182vpz159lkxdy5"; - system = "dendrite.primitives"; - asd = "dendrite.primitives"; - }); - systems = [ "dendrite.primitives" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "rtg-math" pkgs) ]; - }; - dense-arrays = { - pname = "dense-arrays"; - version = "20221106-git"; - asds = [ "dense-arrays" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dense-arrays/2022-11-06/dense-arrays-20221106-git.tgz"; - sha256 = "1601pv6ml5hljax3w5s480avrb4vrmzm8z2853kfd41mpzgk9nri"; - system = "dense-arrays"; - asd = "dense-arrays"; - }); - systems = [ "dense-arrays" ]; - lispLibs = [ (getAttr "abstract-arrays" pkgs) (getAttr "alexandria" pkgs) (getAttr "cl-form-types" pkgs) (getAttr "closer-mop" pkgs) (getAttr "compiler-macro-notes" pkgs) (getAttr "fiveam" pkgs) (getAttr "iterate" pkgs) (getAttr "polymorphic-functions" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-types" pkgs) (getAttr "uiop" pkgs) ]; - }; - dense-arrays_plus_cuda = { - pname = "dense-arrays+cuda"; - version = "20221106-git"; - asds = [ "dense-arrays+cuda" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dense-arrays/2022-11-06/dense-arrays-20221106-git.tgz"; - sha256 = "1601pv6ml5hljax3w5s480avrb4vrmzm8z2853kfd41mpzgk9nri"; - system = "dense-arrays+cuda"; - asd = "dense-arrays+cuda"; - }); - systems = [ "dense-arrays+cuda" ]; - lispLibs = [ (getAttr "cl-cuda" pkgs) (getAttr "dense-arrays" pkgs) ]; - }; - dense-arrays_plus_magicl = { - pname = "dense-arrays+magicl"; - version = "20221106-git"; - asds = [ "dense-arrays+magicl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dense-arrays/2022-11-06/dense-arrays-20221106-git.tgz"; - sha256 = "1601pv6ml5hljax3w5s480avrb4vrmzm8z2853kfd41mpzgk9nri"; - system = "dense-arrays+magicl"; - asd = "dense-arrays+magicl"; - }); - systems = [ "dense-arrays+magicl" ]; - lispLibs = [ (getAttr "dense-arrays" pkgs) (getAttr "magicl" pkgs) ]; - }; - dense-arrays_plus_static-vectors = { - pname = "dense-arrays+static-vectors"; - version = "20221106-git"; - asds = [ "dense-arrays+static-vectors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dense-arrays/2022-11-06/dense-arrays-20221106-git.tgz"; - sha256 = "1601pv6ml5hljax3w5s480avrb4vrmzm8z2853kfd41mpzgk9nri"; - system = "dense-arrays+static-vectors"; - asd = "dense-arrays+static-vectors"; - }); - systems = [ "dense-arrays+static-vectors" ]; - lispLibs = [ (getAttr "dense-arrays" pkgs) (getAttr "static-vectors" pkgs) ]; - }; - dense-arrays-plus = { - pname = "dense-arrays-plus"; - version = "20221106-git"; - asds = [ "dense-arrays-plus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dense-arrays/2022-11-06/dense-arrays-20221106-git.tgz"; - sha256 = "1601pv6ml5hljax3w5s480avrb4vrmzm8z2853kfd41mpzgk9nri"; - system = "dense-arrays-plus"; - asd = "dense-arrays-plus"; - }); - systems = [ "dense-arrays-plus" ]; - lispLibs = [ (getAttr "dense-arrays_plus_static-vectors" pkgs) (getAttr "dense-arrays-plus-lite" pkgs) (getAttr "fiveam" pkgs) (getAttr "generic-cl" pkgs) (getAttr "py4cl2" pkgs) (getAttr "reader" pkgs) ]; - }; - dense-arrays-plus-lite = { - pname = "dense-arrays-plus-lite"; - version = "20221106-git"; - asds = [ "dense-arrays-plus-lite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dense-arrays/2022-11-06/dense-arrays-20221106-git.tgz"; - sha256 = "1601pv6ml5hljax3w5s480avrb4vrmzm8z2853kfd41mpzgk9nri"; - system = "dense-arrays-plus-lite"; - asd = "dense-arrays-plus-lite"; - }); - systems = [ "dense-arrays-plus-lite" ]; - lispLibs = [ (getAttr "dense-arrays" pkgs) (getAttr "trivial-coerce" pkgs) (getAttr "uiop" pkgs) ]; - }; - dense-numericals = { - pname = "dense-numericals"; - version = "2022.09.0"; - asds = [ "dense-numericals" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/numericals/2022-11-06/numericals-2022.09.0.tgz"; - sha256 = "0hfyd045yq7pr4sh9xgqag67yrvnfia1h8ycnxss244zrziabyci"; - system = "dense-numericals"; - asd = "dense-numericals"; - }); - systems = [ "dense-numericals" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-autowrap" pkgs) (getAttr "bmas" pkgs) (getAttr "dense-arrays_plus_static-vectors" pkgs) (getAttr "dense-arrays-plus-lite" pkgs) (getAttr "fiveam" pkgs) (getAttr "iterate" pkgs) (getAttr "lparallel" pkgs) (getAttr "magicl" pkgs) (getAttr "numericals_dot_common" pkgs) (getAttr "policy-cond" pkgs) (getAttr "polymorphic-functions" pkgs) (getAttr "swank" pkgs) (getAttr "trivial-coerce" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) (getAttr "uiop" pkgs) ]; - }; - deoxybyte-gzip = { - pname = "deoxybyte-gzip"; - version = "20140113-git"; - asds = [ "deoxybyte-gzip" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-gzip/2014-01-13/deoxybyte-gzip-20140113-git.tgz"; - sha256 = "0ccci902nxqhdlskw3pghcjg0vgl10xlh16cb5b631j3n2ajfa16"; - system = "deoxybyte-gzip"; - asd = "deoxybyte-gzip"; - }); - systems = [ "deoxybyte-gzip" ]; - lispLibs = [ (getAttr "deoxybyte-io" pkgs) (getAttr "deoxybyte-systems" pkgs) (getAttr "deoxybyte-unix" pkgs) ]; - }; - deoxybyte-gzip-test = { - pname = "deoxybyte-gzip-test"; - version = "20140113-git"; - asds = [ "deoxybyte-gzip-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-gzip/2014-01-13/deoxybyte-gzip-20140113-git.tgz"; - sha256 = "0ccci902nxqhdlskw3pghcjg0vgl10xlh16cb5b631j3n2ajfa16"; - system = "deoxybyte-gzip-test"; - asd = "deoxybyte-gzip-test"; - }); - systems = [ "deoxybyte-gzip-test" ]; - lispLibs = [ (getAttr "deoxybyte-gzip" pkgs) (getAttr "lift" pkgs) ]; - }; - deoxybyte-io = { - pname = "deoxybyte-io"; - version = "20140113-git"; - asds = [ "deoxybyte-io" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-io/2014-01-13/deoxybyte-io-20140113-git.tgz"; - sha256 = "0pjx96g50yqhdk0l1y970hc22fc1bl8ppyklhp62l41b4fb7hbbv"; - system = "deoxybyte-io"; - asd = "deoxybyte-io"; - }); - systems = [ "deoxybyte-io" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "deoxybyte-systems" pkgs) (getAttr "deoxybyte-utilities" pkgs) (getAttr "getopt" pkgs) ]; - }; - deoxybyte-io-test = { - pname = "deoxybyte-io-test"; - version = "20140113-git"; - asds = [ "deoxybyte-io-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-io/2014-01-13/deoxybyte-io-20140113-git.tgz"; - sha256 = "0pjx96g50yqhdk0l1y970hc22fc1bl8ppyklhp62l41b4fb7hbbv"; - system = "deoxybyte-io-test"; - asd = "deoxybyte-io-test"; - }); - systems = [ "deoxybyte-io-test" ]; - lispLibs = [ (getAttr "deoxybyte-io" pkgs) (getAttr "lift" pkgs) ]; - }; - deoxybyte-systems = { - pname = "deoxybyte-systems"; - version = "20140113-git"; - asds = [ "deoxybyte-systems" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-systems/2014-01-13/deoxybyte-systems-20140113-git.tgz"; - sha256 = "0sbzl0ngz85mvkghcy8y94hk34v5hvi41b111mb76f2jvdq9jjr8"; - system = "deoxybyte-systems"; - asd = "deoxybyte-systems"; - }); - systems = [ "deoxybyte-systems" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) ]; - }; - deoxybyte-unix = { - pname = "deoxybyte-unix"; - version = "20140113-git"; - asds = [ "deoxybyte-unix" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-unix/2014-01-13/deoxybyte-unix-20140113-git.tgz"; - sha256 = "016lgb8vcnn7qwhndan1d61wbb10xmsczqp7h2kkfnhlvkr484qf"; - system = "deoxybyte-unix"; - asd = "deoxybyte-unix"; - }); - systems = [ "deoxybyte-unix" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "deoxybyte-io" pkgs) (getAttr "deoxybyte-systems" pkgs) ]; - }; - deoxybyte-unix-test = { - pname = "deoxybyte-unix-test"; - version = "20140113-git"; - asds = [ "deoxybyte-unix-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-unix/2014-01-13/deoxybyte-unix-20140113-git.tgz"; - sha256 = "016lgb8vcnn7qwhndan1d61wbb10xmsczqp7h2kkfnhlvkr484qf"; - system = "deoxybyte-unix-test"; - asd = "deoxybyte-unix-test"; - }); - systems = [ "deoxybyte-unix-test" ]; - lispLibs = [ (getAttr "deoxybyte-unix" pkgs) (getAttr "lift" pkgs) ]; - }; - deoxybyte-utilities = { - pname = "deoxybyte-utilities"; - version = "20140113-git"; - asds = [ "deoxybyte-utilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-utilities/2014-01-13/deoxybyte-utilities-20140113-git.tgz"; - sha256 = "054mvn27d9xdsal87avyxzphgv6pk96a0c1icpkldqczlmzl9j0g"; - system = "deoxybyte-utilities"; - asd = "deoxybyte-utilities"; - }); - systems = [ "deoxybyte-utilities" ]; - lispLibs = [ (getAttr "deoxybyte-systems" pkgs) ]; - }; - deoxybyte-utilities-test = { - pname = "deoxybyte-utilities-test"; - version = "20140113-git"; - asds = [ "deoxybyte-utilities-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deoxybyte-utilities/2014-01-13/deoxybyte-utilities-20140113-git.tgz"; - sha256 = "054mvn27d9xdsal87avyxzphgv6pk96a0c1icpkldqczlmzl9j0g"; - system = "deoxybyte-utilities-test"; - asd = "deoxybyte-utilities-test"; - }); - systems = [ "deoxybyte-utilities-test" ]; - lispLibs = [ (getAttr "deoxybyte-utilities" pkgs) (getAttr "lift" pkgs) ]; - }; - deploy = { - pname = "deploy"; - version = "20220707-git"; - asds = [ "deploy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deploy/2022-07-07/deploy-20220707-git.tgz"; - sha256 = "0d5bf92pkm33m9l3hhyqingr0dmjc7603wjpjgjibm4k53pg84mb"; - system = "deploy"; - asd = "deploy"; - }); - systems = [ "deploy" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - deploy-test = { - pname = "deploy-test"; - version = "20220707-git"; - asds = [ "deploy-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/deploy/2022-07-07/deploy-20220707-git.tgz"; - sha256 = "0d5bf92pkm33m9l3hhyqingr0dmjc7603wjpjgjibm4k53pg84mb"; - system = "deploy-test"; - asd = "deploy-test"; - }); - systems = [ "deploy-test" ]; - lispLibs = [ (getAttr "cl-mpg123" pkgs) (getAttr "cl-out123" pkgs) (getAttr "deploy" pkgs) ]; - }; - depot = { - pname = "depot"; - version = "20221106-git"; - asds = [ "depot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/depot/2022-11-06/depot-20221106-git.tgz"; - sha256 = "09q1zd74xyc86gl3l4slfv84xld9cq8i4r7n4wpzs674qvzsadbb"; - system = "depot"; - asd = "depot"; - }); - systems = [ "depot" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - depot-in-memory = { - pname = "depot-in-memory"; - version = "20221106-git"; - asds = [ "depot-in-memory" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/depot/2022-11-06/depot-20221106-git.tgz"; - sha256 = "09q1zd74xyc86gl3l4slfv84xld9cq8i4r7n4wpzs674qvzsadbb"; - system = "depot-in-memory"; - asd = "depot-in-memory"; - }); - systems = [ "depot-in-memory" ]; - lispLibs = [ (getAttr "atomics" pkgs) (getAttr "depot" pkgs) ]; - }; - depot-test = { - pname = "depot-test"; - version = "20221106-git"; - asds = [ "depot-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/depot/2022-11-06/depot-20221106-git.tgz"; - sha256 = "09q1zd74xyc86gl3l4slfv84xld9cq8i4r7n4wpzs674qvzsadbb"; - system = "depot-test"; - asd = "depot-test"; - }); - systems = [ "depot-test" ]; - lispLibs = [ (getAttr "depot" pkgs) (getAttr "depot-in-memory" pkgs) (getAttr "depot-zip" pkgs) (getAttr "parachute" pkgs) ]; - }; - depot-virtual = { - pname = "depot-virtual"; - version = "20221106-git"; - asds = [ "depot-virtual" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/depot/2022-11-06/depot-20221106-git.tgz"; - sha256 = "09q1zd74xyc86gl3l4slfv84xld9cq8i4r7n4wpzs674qvzsadbb"; - system = "depot-virtual"; - asd = "depot-virtual"; - }); - systems = [ "depot-virtual" ]; - lispLibs = [ (getAttr "depot" pkgs) ]; - }; - depot-zip = { - pname = "depot-zip"; - version = "20221106-git"; - asds = [ "depot-zip" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/depot/2022-11-06/depot-20221106-git.tgz"; - sha256 = "09q1zd74xyc86gl3l4slfv84xld9cq8i4r7n4wpzs674qvzsadbb"; - system = "depot-zip"; - asd = "depot-zip"; - }); - systems = [ "depot-zip" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "depot" pkgs) (getAttr "zippy" pkgs) ]; - }; - descriptions = { - pname = "descriptions"; - version = "20150302-git"; - asds = [ "descriptions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz"; - sha256 = "0h44gxilwmzk8cbxb81047cjndksvf8vw2s3pcy2diw9aqiacg7f"; - system = "descriptions"; - asd = "descriptions"; - }); - systems = [ "descriptions" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "closer-mop" pkgs) (getAttr "sheeple" pkgs) ]; - }; - descriptions-test = { - pname = "descriptions-test"; - version = "20150302-git"; - asds = [ "descriptions-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz"; - sha256 = "0h44gxilwmzk8cbxb81047cjndksvf8vw2s3pcy2diw9aqiacg7f"; - system = "descriptions-test"; - asd = "descriptions-test"; - }); - systems = [ "descriptions-test" ]; - lispLibs = [ (getAttr "descriptions" pkgs) (getAttr "descriptions_dot_serialization" pkgs) (getAttr "descriptions_dot_validation" pkgs) (getAttr "stefil" pkgs) ]; - }; - descriptions_dot_serialization = { - pname = "descriptions.serialization"; - version = "20150302-git"; - asds = [ "descriptions.serialization" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz"; - sha256 = "0h44gxilwmzk8cbxb81047cjndksvf8vw2s3pcy2diw9aqiacg7f"; - system = "descriptions.serialization"; - asd = "descriptions.serialization"; - }); - systems = [ "descriptions.serialization" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "descriptions" pkgs) ]; - }; - descriptions_dot_validation = { - pname = "descriptions.validation"; - version = "20150302-git"; - asds = [ "descriptions.validation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/descriptions/2015-03-02/descriptions-20150302-git.tgz"; - sha256 = "0h44gxilwmzk8cbxb81047cjndksvf8vw2s3pcy2diw9aqiacg7f"; - system = "descriptions.validation"; - asd = "descriptions.validation"; - }); - systems = [ "descriptions.validation" ]; - lispLibs = [ (getAttr "clavier" pkgs) (getAttr "descriptions" pkgs) ]; - }; - destructuring-bind-star = { - pname = "destructuring-bind-star"; - version = "20200610-git"; - asds = [ "destructuring-bind-star" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/destructuring-bind-star/2020-06-10/destructuring-bind-star-20200610-git.tgz"; - sha256 = "1j1xnhvb6pm9q291aawbrcwp8bgbmiij9a53gifxhr4kp934ciz2"; - system = "destructuring-bind-star"; - asd = "destructuring-bind-star"; - }); - systems = [ "destructuring-bind-star" ]; - lispLibs = [ ]; - }; - destructuring-bind-star_slash_test = { - pname = "destructuring-bind-star_test"; - version = "20200610-git"; - asds = [ "destructuring-bind-star" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/destructuring-bind-star/2020-06-10/destructuring-bind-star-20200610-git.tgz"; - sha256 = "1j1xnhvb6pm9q291aawbrcwp8bgbmiij9a53gifxhr4kp934ciz2"; - system = "destructuring-bind-star"; - asd = "destructuring-bind-star"; - }); - systems = [ "destructuring-bind-star/test" ]; - lispLibs = [ (getAttr "destructuring-bind-star" pkgs) ]; - meta = { - broken = true; - }; - }; - dexador = { - pname = "dexador"; - version = "20221106-git"; - asds = [ "dexador" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dexador/2022-11-06/dexador-20221106-git.tgz"; - sha256 = "1kz1k122zgxzsvvdv467ydgggw2k16b6b3krv0gjrf6hc8v8qby9"; - system = "dexador"; - asd = "dexador"; - }); - systems = [ "dexador" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "chipz" pkgs) (getAttr "chunga" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-cookie" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "fast-http" pkgs) (getAttr "fast-io" pkgs) (getAttr "quri" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "trivial-mimes" pkgs) (getAttr "uiop" pkgs) (getAttr "usocket" pkgs) ]; - }; - dexador-test = { - pname = "dexador-test"; - version = "20221106-git"; - asds = [ "dexador-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dexador/2022-11-06/dexador-20221106-git.tgz"; - sha256 = "1kz1k122zgxzsvvdv467ydgggw2k16b6b3krv0gjrf6hc8v8qby9"; - system = "dexador-test"; - asd = "dexador-test"; - }); - systems = [ "dexador-test" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-cookie" pkgs) (getAttr "clack-test" pkgs) (getAttr "dexador" pkgs) (getAttr "lack-request" pkgs) (getAttr "rove" pkgs) ]; - }; - dfio = { - pname = "dfio"; - version = "20221106-git"; - asds = [ "dfio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dfio/2022-11-06/dfio-20221106-git.tgz"; - sha256 = "1p53r7773939jnap518xp4b4wfvc1kbrz9jp6yd40xq0jpf9pbqg"; - system = "dfio"; - asd = "dfio"; - }); - systems = [ "dfio" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "data-frame" pkgs) (getAttr "dexador" pkgs) (getAttr "fare-csv" pkgs) (getAttr "let-plus" pkgs) ]; - }; - dfio_slash_tests = { - pname = "dfio_tests"; - version = "20221106-git"; - asds = [ "dfio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dfio/2022-11-06/dfio-20221106-git.tgz"; - sha256 = "1p53r7773939jnap518xp4b4wfvc1kbrz9jp6yd40xq0jpf9pbqg"; - system = "dfio"; - asd = "dfio"; - }); - systems = [ "dfio/tests" ]; - lispLibs = [ (getAttr "clunit2" pkgs) (getAttr "dfio" pkgs) ]; - meta = { - broken = true; - }; - }; - diff = { - pname = "diff"; - version = "20130813-git"; - asds = [ "diff" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/diff/2013-08-13/diff-20130813-git.tgz"; - sha256 = "1giafck8qfvb688kx5bn9g32rfc12jjywg8vdav36aqbd6lxf5z5"; - system = "diff"; - asd = "diff"; - }); - systems = [ "diff" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - diff-match-patch = { - pname = "diff-match-patch"; - version = "20210531-git"; - asds = [ "diff-match-patch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/diff-match-patch/2021-05-31/diff-match-patch-20210531-git.tgz"; - sha256 = "0wxz2q9sd2v8fg521f7bzv6wi3za7saz2j2snsnw2p1kcsj6zqa4"; - system = "diff-match-patch"; - asd = "diff-match-patch"; - }); - systems = [ "diff-match-patch" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "iterate" pkgs) ]; - }; - diff-match-patch_slash_test = { - pname = "diff-match-patch_test"; - version = "20210531-git"; - asds = [ "diff-match-patch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/diff-match-patch/2021-05-31/diff-match-patch-20210531-git.tgz"; - sha256 = "0wxz2q9sd2v8fg521f7bzv6wi3za7saz2j2snsnw2p1kcsj6zqa4"; - system = "diff-match-patch"; - asd = "diff-match-patch"; - }); - systems = [ "diff-match-patch/test" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "diff-match-patch" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - dirt = { - pname = "dirt"; - version = "release-quicklisp-0d13ebc2-git"; - asds = [ "dirt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dirt/2017-10-19/dirt-release-quicklisp-0d13ebc2-git.tgz"; - sha256 = "1lqxfdzn9rh7rzsq97d4hp6fl4g9fs6s0n2pvf460d6ri6p40xna"; - system = "dirt"; - asd = "dirt"; - }); - systems = [ "dirt" ]; - lispLibs = [ (getAttr "cepl" pkgs) (getAttr "cl-soil" pkgs) ]; - }; - dispatch = { - pname = "dispatch"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "dispatch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "dispatch"; - asd = "dispatch"; - }); - systems = [ "dispatch" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "adjuvant" pkgs) ]; - }; - dispatch-test = { - pname = "dispatch-test"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "dispatch-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "dispatch-test"; - asd = "dispatch-test"; - }); - systems = [ "dispatch-test" ]; - lispLibs = [ (getAttr "dispatch" pkgs) (getAttr "scrutiny" pkgs) ]; - }; - disposable = { - pname = "disposable"; - version = "20160208-git"; - asds = [ "disposable" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/disposable/2016-02-08/disposable-20160208-git.tgz"; - sha256 = "18synnlg4b8203rgww644dj7ghb4m1j33lb4zm64850vqy5b3pz7"; - system = "disposable"; - asd = "disposable"; - }); - systems = [ "disposable" ]; - lispLibs = [ ]; - }; - dissect = { - pname = "dissect"; - version = "20221106-git"; - asds = [ "dissect" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dissect/2022-11-06/dissect-20221106-git.tgz"; - sha256 = "10daj37ivvkcghlhl3c4nlg6rf8y968b0zy5qa2fmk8iqd7l67d7"; - system = "dissect"; - asd = "dissect"; - }); - systems = [ "dissect" ]; - lispLibs = [ ]; - }; - distributions = { - pname = "distributions"; - version = "20221106-git"; - asds = [ "distributions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/distributions/2022-11-06/distributions-20221106-git.tgz"; - sha256 = "1fkzigd0s0s0mvszgmv04yc8jp9gm4812445hfh6kpz6cjy5zpsk"; - system = "distributions"; - asd = "distributions"; - }); - systems = [ "distributions" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "array-operations" pkgs) (getAttr "cephes" pkgs) (getAttr "float-features" pkgs) (getAttr "let-plus" pkgs) (getAttr "num-utils" pkgs) (getAttr "special-functions" pkgs) ]; - }; - djula = { - pname = "djula"; - version = "20220707-git"; - asds = [ "djula" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/djula/2022-07-07/djula-20220707-git.tgz"; - sha256 = "1qqp8gmhjps2q7mdyiac6isw0hhz1rk7fx2w6imkrvbw860md2r6"; - system = "djula"; - asd = "djula"; - }); - systems = [ "djula" ]; - lispLibs = [ (getAttr "access" pkgs) (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-locale" pkgs) (getAttr "parser-combinators" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-slice" pkgs) (getAttr "closer-mop" pkgs) (getAttr "gettext" pkgs) (getAttr "iterate" pkgs) (getAttr "local-time" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-backtrace" pkgs) ]; - }; - djula-demo = { - pname = "djula-demo"; - version = "20220707-git"; - asds = [ "djula-demo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/djula/2022-07-07/djula-20220707-git.tgz"; - sha256 = "1qqp8gmhjps2q7mdyiac6isw0hhz1rk7fx2w6imkrvbw860md2r6"; - system = "djula-demo"; - asd = "djula-demo"; - }); - systems = [ "djula-demo" ]; - lispLibs = [ (getAttr "djula" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - djula-test = { - pname = "djula-test"; - version = "20220707-git"; - asds = [ "djula-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/djula/2022-07-07/djula-20220707-git.tgz"; - sha256 = "1qqp8gmhjps2q7mdyiac6isw0hhz1rk7fx2w6imkrvbw860md2r6"; - system = "djula-test"; - asd = "djula-test"; - }); - systems = [ "djula-test" ]; - lispLibs = [ (getAttr "djula" pkgs) (getAttr "fiveam" pkgs) ]; - }; - dlist = { - pname = "dlist"; - version = "20121125-git"; - asds = [ "dlist" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dlist/2012-11-25/dlist-20121125-git.tgz"; - sha256 = "1ycgjmbxpj0bj95xg0x7m30yz8y73s7mnqs0dzam00rkf8g00h89"; - system = "dlist"; - asd = "dlist"; - }); - systems = [ "dlist" ]; - lispLibs = [ ]; - }; - dlist-test = { - pname = "dlist-test"; - version = "20121125-git"; - asds = [ "dlist-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dlist/2012-11-25/dlist-20121125-git.tgz"; - sha256 = "1ycgjmbxpj0bj95xg0x7m30yz8y73s7mnqs0dzam00rkf8g00h89"; - system = "dlist-test"; - asd = "dlist"; - }); - systems = [ "dlist-test" ]; - lispLibs = [ (getAttr "dlist" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - dml = { - pname = "dml"; - version = "20181018-git"; - asds = [ "dml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dml/2018-10-18/dml-20181018-git.tgz"; - sha256 = "0bah55srq9n743szcnsq2szhy69ckmwk3gx6xm3g3f6i0hj5gz1r"; - system = "dml"; - asd = "dml"; - }); - systems = [ "dml" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-cairo2" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "donuts" pkgs) ]; - }; - dns-client = { - pname = "dns-client"; - version = "20211020-git"; - asds = [ "dns-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dns-client/2021-10-20/dns-client-20211020-git.tgz"; - sha256 = "1b6g2wvydwmv1k68favjyq4gfalfxfyl5i0hyh640wdaz2rfvi4n"; - system = "dns-client"; - asd = "dns-client"; - }); - systems = [ "dns-client" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "usocket" pkgs) ]; - }; - do-urlencode = { - pname = "do-urlencode"; - version = "20181018-git"; - asds = [ "do-urlencode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz"; - sha256 = "0k2i3d4k9cpci235mwfm0c5a4yqfkijr716bjv7cdlpzx88lazm9"; - system = "do-urlencode"; - asd = "do-urlencode"; - }); - systems = [ "do-urlencode" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) ]; - }; - docbrowser = { - pname = "docbrowser"; - version = "20200610-git"; - asds = [ "docbrowser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/docbrowser/2020-06-10/docbrowser-20200610-git.tgz"; - sha256 = "0k7gkyciqfbwdmvip2s8h4k21a63h45bj3qydq3jbvkhaq4gj9x1"; - system = "docbrowser"; - asd = "docbrowser"; - }); - systems = [ "docbrowser" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-json" pkgs) (getAttr "yacc" pkgs) (getAttr "closer-mop" pkgs) (getAttr "colorize" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "parse-number" pkgs) (getAttr "swank" pkgs) (getAttr "split-sequence" pkgs) (getAttr "string-case" pkgs) ]; - }; - docparser = { - pname = "docparser"; - version = "20221106-git"; - asds = [ "docparser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/docparser/2022-11-06/docparser-20221106-git.tgz"; - sha256 = "0b8ipv14h8f46kf6hqmcgp3yxry9xww7957iwkzq8n1i0biq74y1"; - system = "docparser"; - asd = "docparser"; - }); - systems = [ "docparser" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "cffi" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - docparser-test = { - pname = "docparser-test"; - version = "20221106-git"; - asds = [ "docparser-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/docparser/2022-11-06/docparser-20221106-git.tgz"; - sha256 = "0b8ipv14h8f46kf6hqmcgp3yxry9xww7957iwkzq8n1i0biq74y1"; - system = "docparser-test"; - asd = "docparser-test"; - }); - systems = [ "docparser-test" ]; - lispLibs = [ (getAttr "docparser" pkgs) (getAttr "docparser-test-system" pkgs) (getAttr "fiveam" pkgs) ]; - }; - docparser-test-system = { - pname = "docparser-test-system"; - version = "20221106-git"; - asds = [ "docparser-test-system" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/docparser/2022-11-06/docparser-20221106-git.tgz"; - sha256 = "0b8ipv14h8f46kf6hqmcgp3yxry9xww7957iwkzq8n1i0biq74y1"; - system = "docparser-test-system"; - asd = "docparser-test-system"; - }); - systems = [ "docparser-test-system" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - docs-builder = { - pname = "docs-builder"; - version = "20221106-git"; - asds = [ "docs-builder" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/docs-builder/2022-11-06/docs-builder-20221106-git.tgz"; - sha256 = "1xqhknz74a43sk0cax7m7h5bzax6yriqczyvpzx2z3nbhq8knr9k"; - system = "docs-builder"; - asd = "docs-builder"; - }); - systems = [ "docs-builder" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "_40ants-doc" pkgs) (getAttr "docs-config" pkgs) (getAttr "log4cl" pkgs) (getAttr "uiop" pkgs) ]; - }; - docs-config = { - pname = "docs-config"; - version = "20221106-git"; - asds = [ "docs-config" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/docs-builder/2022-11-06/docs-builder-20221106-git.tgz"; - sha256 = "1xqhknz74a43sk0cax7m7h5bzax6yriqczyvpzx2z3nbhq8knr9k"; - system = "docs-config"; - asd = "docs-config"; - }); - systems = [ "docs-config" ]; - lispLibs = [ ]; - }; - documentation-template = { - pname = "documentation-template"; - version = "0.4.4"; - asds = [ "documentation-template" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/documentation-template/2014-12-17/documentation-template-0.4.4.tgz"; - sha256 = "0pfcg38ws0syhg2l15nwslfyj175dq1dvjip64nx02knw26zj56y"; - system = "documentation-template"; - asd = "documentation-template"; - }); - systems = [ "documentation-template" ]; - lispLibs = [ (getAttr "cl-who" pkgs) ]; - }; - documentation-utils = { - pname = "documentation-utils"; - version = "20190710-git"; - asds = [ "documentation-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz"; - sha256 = "098qhkqskmmrh4wix34mawf7p5c87yql28r51r75yjxj577k5idq"; - system = "documentation-utils"; - asd = "documentation-utils"; - }); - systems = [ "documentation-utils" ]; - lispLibs = [ (getAttr "trivial-indent" pkgs) ]; - }; - documentation-utils-extensions = { - pname = "documentation-utils-extensions"; - version = "20220707-git"; - asds = [ "documentation-utils-extensions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/documentation-utils-extensions/2022-07-07/documentation-utils-extensions-20220707-git.tgz"; - sha256 = "1bv8y1hbn6fivvsanaci19k47vfdchj3argz92az3izmar9ybp4f"; - system = "documentation-utils-extensions"; - asd = "documentation-utils-extensions"; - }); - systems = [ "documentation-utils-extensions" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - docutils = { - pname = "docutils"; - version = "20130128-git"; - asds = [ "docutils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-docutils/2013-01-28/cl-docutils-20130128-git.tgz"; - sha256 = "132bxlj0jlhiabi29mygmkcbbgyb5s1yz1xdfhm3pgrf9f8605gg"; - system = "docutils"; - asd = "docutils"; - }); - systems = [ "docutils" ]; - lispLibs = [ (getAttr "data-format-validation" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - dom = { - pname = "dom"; - version = "master-1a957fb2-git"; - asds = [ "dom" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "dom"; - asd = "dom"; - }); - systems = [ "dom" ]; - lispLibs = [ (getAttr "cl-who" pkgs) (getAttr "yadd" pkgs) ]; - }; - donuts = { - pname = "donuts"; - version = "20120703-git"; - asds = [ "donuts" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/donuts/2012-07-03/donuts-20120703-git.tgz"; - sha256 = "1arjlwic0gk28ja1ql5k1r3v0pqzg42ds8vzq9266hq5lp06q3ii"; - system = "donuts"; - asd = "donuts"; - }); - systems = [ "donuts" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "trivial-shell" pkgs) ]; - }; - doplus = { - pname = "doplus"; - version = "v1.1.0"; - asds = [ "doplus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/doplus/2021-10-20/doplus-v1.1.0.tgz"; - sha256 = "1yvda9psw9m08d3bzdb8a2drvhrnr07a0rhza5ibk30v1dkwfw7c"; - system = "doplus"; - asd = "doplus"; - }); - systems = [ "doplus" ]; - lispLibs = [ (getAttr "parse-declarations-1_dot_0" pkgs) ]; - }; - doplus-fset = { - pname = "doplus-fset"; - version = "v1.1.0"; - asds = [ "doplus-fset" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/doplus/2021-10-20/doplus-v1.1.0.tgz"; - sha256 = "1yvda9psw9m08d3bzdb8a2drvhrnr07a0rhza5ibk30v1dkwfw7c"; - system = "doplus-fset"; - asd = "doplus-fset"; - }); - systems = [ "doplus-fset" ]; - lispLibs = [ (getAttr "doplus" pkgs) (getAttr "fset" pkgs) ]; - }; - dotenv = { - pname = "dotenv"; - version = "20211209-git"; - asds = [ "dotenv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dotenv/2021-12-09/dotenv-20211209-git.tgz"; - sha256 = "0g19svpxy2169rym532gjwsg1zybinpc99mjsy6im4n6zdd57hzh"; - system = "dotenv"; - asd = "dotenv"; - }); - systems = [ "dotenv" ]; - lispLibs = [ (getAttr "str" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - dotenv-test = { - pname = "dotenv-test"; - version = "20211209-git"; - asds = [ "dotenv-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dotenv/2021-12-09/dotenv-20211209-git.tgz"; - sha256 = "0g19svpxy2169rym532gjwsg1zybinpc99mjsy6im4n6zdd57hzh"; - system = "dotenv-test"; - asd = "dotenv"; - }); - systems = [ "dotenv-test" ]; - lispLibs = [ (getAttr "dotenv" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - doubly-linked-list = { - pname = "doubly-linked-list"; - version = "20220707-git"; - asds = [ "doubly-linked-list" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/doubly-linked-list/2022-07-07/doubly-linked-list-20220707-git.tgz"; - sha256 = "073r1zyp0slzzvcyj7ibjs85bss1iqh42zn5dvkjd6ls78v2bn9f"; - system = "doubly-linked-list"; - asd = "doubly-linked-list"; - }); - systems = [ "doubly-linked-list" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) ]; - }; - drakma = { - pname = "drakma"; - version = "v2.0.9"; - asds = [ "drakma" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/drakma/2022-07-07/drakma-v2.0.9.tgz"; - sha256 = "1y5rf9rr8drqwmh0r6k0wb80h4qwwc2jmikfzxn5mrgs860fvamh"; - system = "drakma"; - asd = "drakma"; - }); - systems = [ "drakma" ]; - lispLibs = [ (getAttr "chipz" pkgs) (getAttr "chunga" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "puri" pkgs) (getAttr "usocket" pkgs) ]; - }; - drakma-async = { - pname = "drakma-async"; - version = "20210807-git"; - asds = [ "drakma-async" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/drakma-async/2021-08-07/drakma-async-20210807-git.tgz"; - sha256 = "19cd4xrcx3mz86sl0326x5lcrh9jizrwzi6p7pd856nrmx7ynf4w"; - system = "drakma-async"; - asd = "drakma-async"; - }); - systems = [ "drakma-async" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-async-ssl" pkgs) (getAttr "cl-async-future" pkgs) (getAttr "drakma" pkgs) (getAttr "fast-http" pkgs) (getAttr "fast-io" pkgs) (getAttr "flexi-streams" pkgs) ]; - }; - drakma-test = { - pname = "drakma-test"; - version = "v2.0.9"; - asds = [ "drakma-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/drakma/2022-07-07/drakma-v2.0.9.tgz"; - sha256 = "1y5rf9rr8drqwmh0r6k0wb80h4qwwc2jmikfzxn5mrgs860fvamh"; - system = "drakma-test"; - asd = "drakma-test"; - }); - systems = [ "drakma-test" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "fiveam" pkgs) ]; - }; - draw-cons-tree = { - pname = "draw-cons-tree"; - version = "20131003-git"; - asds = [ "draw-cons-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/draw-cons-tree/2013-10-03/draw-cons-tree-20131003-git.tgz"; - sha256 = "0w2khl1f51zcjvmq47h55ldfgjzi03gnmsdgd61ar3m11dp0k769"; - system = "draw-cons-tree"; - asd = "draw-cons-tree"; - }); - systems = [ "draw-cons-tree" ]; - lispLibs = [ ]; - }; - drei-mcclim = { - pname = "drei-mcclim"; - version = "20221106-git"; - asds = [ "drei-mcclim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "drei-mcclim"; - asd = "drei-mcclim"; - }); - systems = [ "drei-mcclim" ]; - lispLibs = [ (getAttr "flexichain" pkgs) (getAttr "automaton" pkgs) (getAttr "clim-core" pkgs) (getAttr "esa-mcclim" pkgs) (getAttr "persistent" pkgs) (getAttr "swank" pkgs) ]; - }; - drei-mcclim_slash_test = { - pname = "drei-mcclim_test"; - version = "20221106-git"; - asds = [ "drei-mcclim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "drei-mcclim"; - asd = "drei-mcclim"; - }); - systems = [ "drei-mcclim/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "automaton" pkgs) (getAttr "drei-mcclim" pkgs) ]; - meta = { - broken = true; - }; - }; - dso-lex = { - pname = "dso-lex"; - version = "0.3.2"; - asds = [ "dso-lex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dso-lex/2011-01-10/dso-lex-0.3.2.tgz"; - sha256 = "09vx0dsfaj1c5ivfkx9zl9s2yxmqpdc2v41fhpq75anq9ffr6qyr"; - system = "dso-lex"; - asd = "dso-lex"; - }); - systems = [ "dso-lex" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "dso-util" pkgs) ]; - }; - dso-util = { - pname = "dso-util"; - version = "0.1.2"; - asds = [ "dso-util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dso-util/2011-01-10/dso-util-0.1.2.tgz"; - sha256 = "12w1rxxk2hi6k7ng9kqf2yb1kff78bshdfl7bwv6fz8im8vq13b3"; - system = "dso-util"; - asd = "dso-util"; - }); - systems = [ "dso-util" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - dufy = { - pname = "dufy"; - version = "20210531-git"; - asds = [ "dufy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dufy/2021-05-31/dufy-20210531-git.tgz"; - sha256 = "10qyrc5xkivwm6xmcfls1alad83ck7b2yyxbnhgc2vmnrk6j1012"; - system = "dufy"; - asd = "dufy"; - }); - systems = [ "dufy" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - dufy_slash_core = { - pname = "dufy_core"; - version = "20210531-git"; - asds = [ "dufy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dufy/2021-05-31/dufy-20210531-git.tgz"; - sha256 = "10qyrc5xkivwm6xmcfls1alad83ck7b2yyxbnhgc2vmnrk6j1012"; - system = "dufy"; - asd = "dufy"; - }); - systems = [ "dufy/core" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - meta = { - broken = true; - }; - }; - dufy_slash_examples = { - pname = "dufy_examples"; - version = "20210531-git"; - asds = [ "dufy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dufy/2021-05-31/dufy-20210531-git.tgz"; - sha256 = "10qyrc5xkivwm6xmcfls1alad83ck7b2yyxbnhgc2vmnrk6j1012"; - system = "dufy"; - asd = "dufy"; - }); - systems = [ "dufy/examples" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "dufy" pkgs) (getAttr "iterate" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "lparallel" pkgs) ]; - meta = { - broken = true; - }; - }; - dufy_slash_extra-data = { - pname = "dufy_extra-data"; - version = "20210531-git"; - asds = [ "dufy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dufy/2021-05-31/dufy-20210531-git.tgz"; - sha256 = "10qyrc5xkivwm6xmcfls1alad83ck7b2yyxbnhgc2vmnrk6j1012"; - system = "dufy"; - asd = "dufy"; - }); - systems = [ "dufy/extra-data" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - meta = { - broken = true; - }; - }; - dufy_slash_hsluv = { - pname = "dufy_hsluv"; - version = "20210531-git"; - asds = [ "dufy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dufy/2021-05-31/dufy-20210531-git.tgz"; - sha256 = "10qyrc5xkivwm6xmcfls1alad83ck7b2yyxbnhgc2vmnrk6j1012"; - system = "dufy"; - asd = "dufy"; - }); - systems = [ "dufy/hsluv" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - meta = { - broken = true; - }; - }; - dufy_slash_internal = { - pname = "dufy_internal"; - version = "20210531-git"; - asds = [ "dufy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dufy/2021-05-31/dufy-20210531-git.tgz"; - sha256 = "10qyrc5xkivwm6xmcfls1alad83ck7b2yyxbnhgc2vmnrk6j1012"; - system = "dufy"; - asd = "dufy"; - }); - systems = [ "dufy/internal" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - meta = { - broken = true; - }; - }; - dufy_slash_munsell = { - pname = "dufy_munsell"; - version = "20210531-git"; - asds = [ "dufy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dufy/2021-05-31/dufy-20210531-git.tgz"; - sha256 = "10qyrc5xkivwm6xmcfls1alad83ck7b2yyxbnhgc2vmnrk6j1012"; - system = "dufy"; - asd = "dufy"; - }); - systems = [ "dufy/munsell" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) ]; - meta = { - broken = true; - }; - }; - dufy_slash_test = { - pname = "dufy_test"; - version = "20210531-git"; - asds = [ "dufy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dufy/2021-05-31/dufy-20210531-git.tgz"; - sha256 = "10qyrc5xkivwm6xmcfls1alad83ck7b2yyxbnhgc2vmnrk6j1012"; - system = "dufy"; - asd = "dufy"; - }); - systems = [ "dufy/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-csv" pkgs) (getAttr "dufy" pkgs) (getAttr "fiveam" pkgs) (getAttr "parse-float" pkgs) ]; - meta = { - broken = true; - }; - }; - dungen = { - pname = "dungen"; - version = "20220707-git"; - asds = [ "dungen" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dungen/2022-07-07/dungen-20220707-git.tgz"; - sha256 = "1yvkch227g0yawv2682ysdv9q2g5yyyxjvfpx3hijl0mm0awgxv5"; - system = "dungen"; - asd = "dungen"; - }); - systems = [ "dungen" ]; - lispLibs = [ (getAttr "graph" pkgs) (getAttr "mfiano-utils" pkgs) (getAttr "seedable-rng" pkgs) ]; - }; - duologue = { - pname = "duologue"; - version = "20220707-git"; - asds = [ "duologue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/duologue/2022-07-07/duologue-20220707-git.tgz"; - sha256 = "03ypcdz4gl8i82ivvnzc5ng4m9b8rkifyl13ik2grlcl5x2wq7ih"; - system = "duologue"; - asd = "duologue"; - }); - systems = [ "duologue" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "chronicity" pkgs) (getAttr "cl-ansi-text" pkgs) (getAttr "cl-fad" pkgs) (getAttr "clavier" pkgs) ]; - }; - duologue-readline = { - pname = "duologue-readline"; - version = "20220707-git"; - asds = [ "duologue-readline" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/duologue/2022-07-07/duologue-20220707-git.tgz"; - sha256 = "03ypcdz4gl8i82ivvnzc5ng4m9b8rkifyl13ik2grlcl5x2wq7ih"; - system = "duologue-readline"; - asd = "duologue-readline"; - }); - systems = [ "duologue-readline" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "chronicity" pkgs) (getAttr "cl-ansi-text" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-readline" pkgs) (getAttr "clavier" pkgs) (getAttr "drakma" pkgs) ]; - }; - dweet = { - pname = "dweet"; - version = "20141217-git"; - asds = [ "dweet" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dweet/2014-12-17/dweet-20141217-git.tgz"; - sha256 = "1i3ab3igvdy6fhq3zlx1vaswhvm9dlp6fagzxbrqhqj6jsbhiwv7"; - system = "dweet"; - asd = "dweet"; - }); - systems = [ "dweet" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "drakma" pkgs) (getAttr "com_dot_gigamonkeys_dot_json" pkgs) ]; - }; - dynamic-array = { - pname = "dynamic-array"; - version = "20220707-git"; - asds = [ "dynamic-array" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dynamic-array/2022-07-07/dynamic-array-20220707-git.tgz"; - sha256 = "02kg1m5xscg521074nasx3f04784jbm0x61a7skixbdprpg6hhnh"; - system = "dynamic-array"; - asd = "dynamic-array"; - }); - systems = [ "dynamic-array" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) ]; - }; - dynamic-classes = { - pname = "dynamic-classes"; - version = "20130128-git"; - asds = [ "dynamic-classes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz"; - sha256 = "0sawgz6xhsq156jcq5j9px0njs4y3sq1ypccl59zyvz31bxyaaxj"; - system = "dynamic-classes"; - asd = "dynamic-classes"; - }); - systems = [ "dynamic-classes" ]; - lispLibs = [ (getAttr "metatilities-base" pkgs) ]; - }; - dynamic-classes-test = { - pname = "dynamic-classes-test"; - version = "20130128-git"; - asds = [ "dynamic-classes-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz"; - sha256 = "0sawgz6xhsq156jcq5j9px0njs4y3sq1ypccl59zyvz31bxyaaxj"; - system = "dynamic-classes-test"; - asd = "dynamic-classes-test"; - }); - systems = [ "dynamic-classes-test" ]; - lispLibs = [ (getAttr "dynamic-classes" pkgs) (getAttr "lift" pkgs) ]; - }; - dynamic-collect = { - pname = "dynamic-collect"; - version = "20190307-hg"; - asds = [ "dynamic-collect" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dynamic-collect/2019-03-07/dynamic-collect-20190307-hg.tgz"; - sha256 = "00h90k4zj1qv1da6q5qq6ma8ivykpzmz5mb869a6jay08jly83c4"; - system = "dynamic-collect"; - asd = "dynamic-collect"; - }); - systems = [ "dynamic-collect" ]; - lispLibs = [ ]; - }; - dynamic-mixins = { - pname = "dynamic-mixins"; - version = "20181018-git"; - asds = [ "dynamic-mixins" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dynamic-mixins/2018-10-18/dynamic-mixins-20181018-git.tgz"; - sha256 = "00g3s509ysh2jp1qwsgb5bwl6qvhzcljwjz3z4mspbcak51484zj"; - system = "dynamic-mixins"; - asd = "dynamic-mixins"; - }); - systems = [ "dynamic-mixins" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - dynamic-wind = { - pname = "dynamic-wind"; - version = "20211230-git"; - asds = [ "dynamic-wind" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/contextl/2021-12-30/contextl-20211230-git.tgz"; - sha256 = "0apgznz4g6lpmd86lq7w0xddfjgnirk83ig7p0j6i93xadhy9wh0"; - system = "dynamic-wind"; - asd = "dynamic-wind"; - }); - systems = [ "dynamic-wind" ]; - lispLibs = [ (getAttr "lw-compat" pkgs) ]; - }; - eager-future = { - pname = "eager-future"; - version = "20101006-darcs"; - asds = [ "eager-future" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eager-future/2010-10-06/eager-future-20101006-darcs.tgz"; - sha256 = "0l7khqfqfchk7j24fk7rwagwanjargxsrzr6g1h4ainqjajd91jl"; - system = "eager-future"; - asd = "eager-future"; - }); - systems = [ "eager-future" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - eager-future_dot_test = { - pname = "eager-future.test"; - version = "20101006-darcs"; - asds = [ "eager-future.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eager-future/2010-10-06/eager-future-20101006-darcs.tgz"; - sha256 = "0l7khqfqfchk7j24fk7rwagwanjargxsrzr6g1h4ainqjajd91jl"; - system = "eager-future.test"; - asd = "eager-future"; - }); - systems = [ "eager-future.test" ]; - lispLibs = [ (getAttr "eager-future" pkgs) (getAttr "fiveam" pkgs) ]; - }; - eager-future2 = { - pname = "eager-future2"; - version = "20191130-git"; - asds = [ "eager-future2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz"; - sha256 = "1qs1bv3m0ki8l5czhsflxcryh22r9d9g9a3a3b0cr0pl954q5rld"; - system = "eager-future2"; - asd = "eager-future2"; - }); - systems = [ "eager-future2" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - easing = { - pname = "easing"; - version = "20180228-git"; - asds = [ "easing" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz"; - sha256 = "0750cs5kij8hi53960lzih57xrf92fj23i3hxzhqzcyla4wi4jv5"; - system = "easing"; - asd = "easing"; - }); - systems = [ "easing" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - easing-demo = { - pname = "easing-demo"; - version = "20180228-git"; - asds = [ "easing-demo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz"; - sha256 = "0750cs5kij8hi53960lzih57xrf92fj23i3hxzhqzcyla4wi4jv5"; - system = "easing-demo"; - asd = "easing-demo"; - }); - systems = [ "easing-demo" ]; - lispLibs = [ (getAttr "easing" pkgs) (getAttr "sketch" pkgs) ]; - }; - easing-test = { - pname = "easing-test"; - version = "20180228-git"; - asds = [ "easing-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easing/2018-02-28/easing-20180228-git.tgz"; - sha256 = "0750cs5kij8hi53960lzih57xrf92fj23i3hxzhqzcyla4wi4jv5"; - system = "easing-test"; - asd = "easing-test"; - }); - systems = [ "easing-test" ]; - lispLibs = [ (getAttr "easing" pkgs) (getAttr "fiveam" pkgs) ]; - }; - easter-gauss = { - pname = "easter-gauss"; - version = "20220707-git"; - asds = [ "easter-gauss" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easter-gauss/2022-07-07/easter-gauss-20220707-git.tgz"; - sha256 = "0y3fihv00k6lxmx4pfkhg4nynpffdpvlz9b14s2bl880vj9cxjsw"; - system = "easter-gauss"; - asd = "easter-gauss"; - }); - systems = [ "easter-gauss" ]; - lispLibs = [ (getAttr "local-time" pkgs) ]; - }; - easter-gauss_slash_tests = { - pname = "easter-gauss_tests"; - version = "20220707-git"; - asds = [ "easter-gauss" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easter-gauss/2022-07-07/easter-gauss-20220707-git.tgz"; - sha256 = "0y3fihv00k6lxmx4pfkhg4nynpffdpvlz9b14s2bl880vj9cxjsw"; - system = "easter-gauss"; - asd = "easter-gauss"; - }); - systems = [ "easter-gauss/tests" ]; - lispLibs = [ (getAttr "clunit2" pkgs) (getAttr "easter-gauss" pkgs) ]; - meta = { - broken = true; - }; - }; - easy-audio = { - pname = "easy-audio"; - version = "20220707-git"; - asds = [ "easy-audio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-audio/2022-07-07/easy-audio-20220707-git.tgz"; - sha256 = "157h1d5r403wyjvyv02gzd67xf01spsgx044j4a4nx2cziqr7w6k"; - system = "easy-audio"; - asd = "easy-audio"; - }); - systems = [ "easy-audio" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "nibbles-streams" pkgs) (getAttr "serapeum" pkgs) ]; - }; - easy-audio_slash_ape = { - pname = "easy-audio_ape"; - version = "20220707-git"; - asds = [ "easy-audio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-audio/2022-07-07/easy-audio-20220707-git.tgz"; - sha256 = "157h1d5r403wyjvyv02gzd67xf01spsgx044j4a4nx2cziqr7w6k"; - system = "easy-audio"; - asd = "easy-audio"; - }); - systems = [ "easy-audio/ape" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - easy-audio_slash_bitreader = { - pname = "easy-audio_bitreader"; - version = "20220707-git"; - asds = [ "easy-audio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-audio/2022-07-07/easy-audio-20220707-git.tgz"; - sha256 = "157h1d5r403wyjvyv02gzd67xf01spsgx044j4a4nx2cziqr7w6k"; - system = "easy-audio"; - asd = "easy-audio"; - }); - systems = [ "easy-audio/bitreader" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - easy-audio_slash_core = { - pname = "easy-audio_core"; - version = "20220707-git"; - asds = [ "easy-audio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-audio/2022-07-07/easy-audio-20220707-git.tgz"; - sha256 = "157h1d5r403wyjvyv02gzd67xf01spsgx044j4a4nx2cziqr7w6k"; - system = "easy-audio"; - asd = "easy-audio"; - }); - systems = [ "easy-audio/core" ]; - lispLibs = [ (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - easy-audio_slash_examples = { - pname = "easy-audio_examples"; - version = "20220707-git"; - asds = [ "easy-audio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-audio/2022-07-07/easy-audio-20220707-git.tgz"; - sha256 = "157h1d5r403wyjvyv02gzd67xf01spsgx044j4a4nx2cziqr7w6k"; - system = "easy-audio"; - asd = "easy-audio"; - }); - systems = [ "easy-audio/examples" ]; - lispLibs = [ (getAttr "easy-audio" pkgs) ]; - meta = { - broken = true; - }; - }; - easy-audio_slash_general-decoders = { - pname = "easy-audio_general-decoders"; - version = "20220707-git"; - asds = [ "easy-audio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-audio/2022-07-07/easy-audio-20220707-git.tgz"; - sha256 = "157h1d5r403wyjvyv02gzd67xf01spsgx044j4a4nx2cziqr7w6k"; - system = "easy-audio"; - asd = "easy-audio"; - }); - systems = [ "easy-audio/general-decoders" ]; - lispLibs = [ (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - easy-audio_slash_ogg = { - pname = "easy-audio_ogg"; - version = "20220707-git"; - asds = [ "easy-audio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-audio/2022-07-07/easy-audio-20220707-git.tgz"; - sha256 = "157h1d5r403wyjvyv02gzd67xf01spsgx044j4a4nx2cziqr7w6k"; - system = "easy-audio"; - asd = "easy-audio"; - }); - systems = [ "easy-audio/ogg" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - easy-audio_slash_tests = { - pname = "easy-audio_tests"; - version = "20220707-git"; - asds = [ "easy-audio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-audio/2022-07-07/easy-audio-20220707-git.tgz"; - sha256 = "157h1d5r403wyjvyv02gzd67xf01spsgx044j4a4nx2cziqr7w6k"; - system = "easy-audio"; - asd = "easy-audio"; - }); - systems = [ "easy-audio/tests" ]; - lispLibs = [ (getAttr "easy-audio" pkgs) (getAttr "fiveam" pkgs) (getAttr "md5" pkgs) ]; - meta = { - broken = true; - }; - }; - easy-audio_slash_wav = { - pname = "easy-audio_wav"; - version = "20220707-git"; - asds = [ "easy-audio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-audio/2022-07-07/easy-audio-20220707-git.tgz"; - sha256 = "157h1d5r403wyjvyv02gzd67xf01spsgx044j4a4nx2cziqr7w6k"; - system = "easy-audio"; - asd = "easy-audio"; - }); - systems = [ "easy-audio/wav" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "nibbles-streams" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - easy-audio_slash_wv = { - pname = "easy-audio_wv"; - version = "20220707-git"; - asds = [ "easy-audio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-audio/2022-07-07/easy-audio-20220707-git.tgz"; - sha256 = "157h1d5r403wyjvyv02gzd67xf01spsgx044j4a4nx2cziqr7w6k"; - system = "easy-audio"; - asd = "easy-audio"; - }); - systems = [ "easy-audio/wv" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - easy-bind = { - pname = "easy-bind"; - version = "20190202-git"; - asds = [ "easy-bind" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-bind/2019-02-02/easy-bind-20190202-git.tgz"; - sha256 = "0z7mqm7vnk8jcsmawlyhzg81v2bmgdbxmx3jkf2m74170q78jhkl"; - system = "easy-bind"; - asd = "easy-bind"; - }); - systems = [ "easy-bind" ]; - lispLibs = [ ]; - }; - easy-macros = { - pname = "easy-macros"; - version = "20221106-git"; - asds = [ "easy-macros" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-macros/2022-11-06/easy-macros-20221106-git.tgz"; - sha256 = "0mashvad1ssh2kmr0wxgas13vxs6dsfb6b1q69cpxmpmx6sc067g"; - system = "easy-macros"; - asd = "easy-macros"; - }); - systems = [ "easy-macros" ]; - lispLibs = [ ]; - }; - easy-macros_slash_tests = { - pname = "easy-macros_tests"; - version = "20221106-git"; - asds = [ "easy-macros" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-macros/2022-11-06/easy-macros-20221106-git.tgz"; - sha256 = "0mashvad1ssh2kmr0wxgas13vxs6dsfb6b1q69cpxmpmx6sc067g"; - system = "easy-macros"; - asd = "easy-macros"; - }); - systems = [ "easy-macros/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "easy-macros" pkgs) (getAttr "fiveam" pkgs) (getAttr "fiveam-matchers" pkgs) ]; - meta = { - broken = true; - }; - }; - easy-routes = { - pname = "easy-routes"; - version = "20220707-git"; - asds = [ "easy-routes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-routes/2022-07-07/easy-routes-20220707-git.tgz"; - sha256 = "13h3xij5zlviag10y8qjw100i8mjncca10hf08bf30m195wrshmm"; - system = "easy-routes"; - asd = "easy-routes"; - }); - systems = [ "easy-routes" ]; - lispLibs = [ (getAttr "routes" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - easy-routes_plus_djula = { - pname = "easy-routes+djula"; - version = "20220707-git"; - asds = [ "easy-routes+djula" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-routes/2022-07-07/easy-routes-20220707-git.tgz"; - sha256 = "13h3xij5zlviag10y8qjw100i8mjncca10hf08bf30m195wrshmm"; - system = "easy-routes+djula"; - asd = "easy-routes+djula"; - }); - systems = [ "easy-routes+djula" ]; - lispLibs = [ (getAttr "djula" pkgs) (getAttr "easy-routes" pkgs) ]; - }; - easy-routes_plus_errors = { - pname = "easy-routes+errors"; - version = "20220707-git"; - asds = [ "easy-routes+errors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/easy-routes/2022-07-07/easy-routes-20220707-git.tgz"; - sha256 = "13h3xij5zlviag10y8qjw100i8mjncca10hf08bf30m195wrshmm"; - system = "easy-routes+errors"; - asd = "easy-routes+errors"; - }); - systems = [ "easy-routes+errors" ]; - lispLibs = [ (getAttr "easy-routes" pkgs) (getAttr "hunchentoot-errors" pkgs) ]; - }; - eazy-documentation = { - pname = "eazy-documentation"; - version = "20210411-git"; - asds = [ "eazy-documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eazy-documentation/2021-04-11/eazy-documentation-20210411-git.tgz"; - sha256 = "0wqd6jih98ab8qpajmcmbj0cwa3g6jjbr7v0wp5gqn1wllwn70ix"; - system = "eazy-documentation"; - asd = "eazy-documentation"; - }); - systems = [ "eazy-documentation" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-who" pkgs) (getAttr "common-doc" pkgs) (getAttr "common-doc-split-paragraphs" pkgs) (getAttr "common-html" pkgs) (getAttr "iterate" pkgs) (getAttr "trivia" pkgs) (getAttr "trivia_dot_ppcre" pkgs) ]; - }; - eazy-gnuplot = { - pname = "eazy-gnuplot"; - version = "20220331-git"; - asds = [ "eazy-gnuplot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eazy-gnuplot/2022-03-31/eazy-gnuplot-20220331-git.tgz"; - sha256 = "0mpkx1z52riahydzvqv7kk15p0pv2k7k5a7j65fg571kcxmssx8s"; - system = "eazy-gnuplot"; - asd = "eazy-gnuplot"; - }); - systems = [ "eazy-gnuplot" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "trivia" pkgs) (getAttr "uiop" pkgs) ]; - }; - eazy-gnuplot_dot_test = { - pname = "eazy-gnuplot.test"; - version = "20220331-git"; - asds = [ "eazy-gnuplot.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eazy-gnuplot/2022-03-31/eazy-gnuplot-20220331-git.tgz"; - sha256 = "0mpkx1z52riahydzvqv7kk15p0pv2k7k5a7j65fg571kcxmssx8s"; - system = "eazy-gnuplot.test"; - asd = "eazy-gnuplot.test"; - }); - systems = [ "eazy-gnuplot.test" ]; - lispLibs = [ (getAttr "eazy-gnuplot" pkgs) (getAttr "fiveam" pkgs) ]; - }; - eazy-process = { - pname = "eazy-process"; - version = "20200925-git"; - asds = [ "eazy-process" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eazy-process/2020-09-25/eazy-process-20200925-git.tgz"; - sha256 = "1fvc613jg3b0kra664lbyyzvig7sm1xzaawack28c5m61yiwakiw"; - system = "eazy-process"; - asd = "eazy-process"; - }); - systems = [ "eazy-process" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-rlimit" pkgs) (getAttr "iolib" pkgs) (getAttr "iterate" pkgs) (getAttr "trivia" pkgs) (getAttr "trivia_dot_ppcre" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - eazy-process_dot_test = { - pname = "eazy-process.test"; - version = "20200925-git"; - asds = [ "eazy-process.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eazy-process/2020-09-25/eazy-process-20200925-git.tgz"; - sha256 = "1fvc613jg3b0kra664lbyyzvig7sm1xzaawack28c5m61yiwakiw"; - system = "eazy-process.test"; - asd = "eazy-process.test"; - }); - systems = [ "eazy-process.test" ]; - lispLibs = [ (getAttr "eazy-process" pkgs) (getAttr "fiveam" pkgs) ]; - }; - eazy-project = { - pname = "eazy-project"; - version = "20190710-git"; - asds = [ "eazy-project" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz"; - sha256 = "1dfzvsvzdwcfvynvik9kwhgil9m08jx8r0vwqj7l1m2d9zm4db3b"; - system = "eazy-project"; - asd = "eazy-project"; - }); - systems = [ "eazy-project" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-emb" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-syntax" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "iterate" pkgs) (getAttr "lisp-namespace" pkgs) (getAttr "local-time" pkgs) (getAttr "trivia" pkgs) ]; - }; - eazy-project_dot_autoload = { - pname = "eazy-project.autoload"; - version = "20190710-git"; - asds = [ "eazy-project.autoload" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz"; - sha256 = "1dfzvsvzdwcfvynvik9kwhgil9m08jx8r0vwqj7l1m2d9zm4db3b"; - system = "eazy-project.autoload"; - asd = "eazy-project.autoload"; - }); - systems = [ "eazy-project.autoload" ]; - lispLibs = [ (getAttr "eazy-project" pkgs) ]; - }; - eazy-project_dot_test = { - pname = "eazy-project.test"; - version = "20190710-git"; - asds = [ "eazy-project.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eazy-project/2019-07-10/eazy-project-20190710-git.tgz"; - sha256 = "1dfzvsvzdwcfvynvik9kwhgil9m08jx8r0vwqj7l1m2d9zm4db3b"; - system = "eazy-project.test"; - asd = "eazy-project.test"; - }); - systems = [ "eazy-project.test" ]; - lispLibs = [ (getAttr "eazy-project" pkgs) (getAttr "fiveam" pkgs) ]; - }; - ec2 = { - pname = "ec2"; - version = "20120909-git"; - asds = [ "ec2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ec2/2012-09-09/ec2-20120909-git.tgz"; - sha256 = "1z9yv1b8ckyvla80rha7amfhhy57kylkscf504rpfx8994fnfbsy"; - system = "ec2"; - asd = "ec2"; - }); - systems = [ "ec2" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "ironclad" pkgs) (getAttr "s-base64" pkgs) (getAttr "s-xml" pkgs) ]; - }; - ec2-price-finder = { - pname = "ec2-price-finder"; - version = "20210531-git"; - asds = [ "ec2-price-finder" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ec2-price-finder/2021-05-31/ec2-price-finder-20210531-git.tgz"; - sha256 = "1511py79fj0xpzzjlfk6fchp6lmikvhy42s3p6s85fbq4dyj4mpj"; - system = "ec2-price-finder"; - asd = "ec2-price-finder"; - }); - systems = [ "ec2-price-finder" ]; - lispLibs = [ (getAttr "easy-routes" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "lass" pkgs) (getAttr "local-time" pkgs) (getAttr "parse-float" pkgs) (getAttr "read-csv" pkgs) (getAttr "spinneret" pkgs) (getAttr "wu-decimal" pkgs) ]; - }; - ecclesia = { - pname = "ecclesia"; - version = "20201220-git"; - asds = [ "ecclesia" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ecclesia/2020-12-20/ecclesia-20201220-git.tgz"; - sha256 = "0xxs2hfvqprici6z57wx2z6rjc1f0f5mg0xxls7b8nglzx4saslm"; - system = "ecclesia"; - asd = "ecclesia"; - }); - systems = [ "ecclesia" ]; - lispLibs = [ (getAttr "acclimation" pkgs) ]; - }; - eclecticse_dot_iso-8601-date = { - pname = "eclecticse.iso-8601-date"; - version = "20190107-git"; - asds = [ "eclecticse.iso-8601-date" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iso-8601-date/2019-01-07/iso-8601-date-20190107-git.tgz"; - sha256 = "12d6jyznglm13sb04xh5l0d0bwi4y449wdyifvfy7r03qy8wypdx"; - system = "eclecticse.iso-8601-date"; - asd = "eclecticse.iso-8601-date"; - }); - systems = [ "eclecticse.iso-8601-date" ]; - lispLibs = [ (getAttr "local-time" pkgs) ]; - }; - eclecticse_dot_omer = { - pname = "eclecticse.omer"; - version = "20210411-git"; - asds = [ "eclecticse.omer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/omer-count/2021-04-11/omer-count-20210411-git.tgz"; - sha256 = "1rvg7rfalvi28x3jkknfdyf4y7zjrqdx073iqi2gin4amin6n7jv"; - system = "eclecticse.omer"; - asd = "eclecticse.omer"; - }); - systems = [ "eclecticse.omer" ]; - lispLibs = [ (getAttr "local-time" pkgs) ]; - }; - eclecticse_dot_slk-581 = { - pname = "eclecticse.slk-581"; - version = "20190107-git"; - asds = [ "eclecticse.slk-581" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/slk-581/2019-01-07/slk-581-20190107-git.tgz"; - sha256 = "1pxyr1gi4ppnfld399wiypqqkgm3bqd9kpizpwgll2fd10yh2qmf"; - system = "eclecticse.slk-581"; - asd = "eclecticse.slk-581"; - }); - systems = [ "eclecticse.slk-581" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - eclector = { - pname = "eclector"; - version = "20221106-git"; - asds = [ "eclector" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eclector/2022-11-06/eclector-20221106-git.tgz"; - sha256 = "087f3z0j13fc9brb6390qsbw79lr7fhgfdc0hcrib2h5idv406xz"; - system = "eclector"; - asd = "eclector"; - }); - systems = [ "eclector" ]; - lispLibs = [ (getAttr "acclimation" pkgs) (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - eclector-concrete-syntax-tree = { - pname = "eclector-concrete-syntax-tree"; - version = "20221106-git"; - asds = [ "eclector-concrete-syntax-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eclector/2022-11-06/eclector-20221106-git.tgz"; - sha256 = "087f3z0j13fc9brb6390qsbw79lr7fhgfdc0hcrib2h5idv406xz"; - system = "eclector-concrete-syntax-tree"; - asd = "eclector-concrete-syntax-tree"; - }); - systems = [ "eclector-concrete-syntax-tree" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "concrete-syntax-tree" pkgs) (getAttr "eclector" pkgs) ]; - }; - eclector-concrete-syntax-tree_slash_test = { - pname = "eclector-concrete-syntax-tree_test"; - version = "20221106-git"; - asds = [ "eclector-concrete-syntax-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eclector/2022-11-06/eclector-20221106-git.tgz"; - sha256 = "087f3z0j13fc9brb6390qsbw79lr7fhgfdc0hcrib2h5idv406xz"; - system = "eclector-concrete-syntax-tree"; - asd = "eclector-concrete-syntax-tree"; - }); - systems = [ "eclector-concrete-syntax-tree/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "eclector" pkgs) (getAttr "eclector-concrete-syntax-tree" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - eclector_slash_test = { - pname = "eclector_test"; - version = "20221106-git"; - asds = [ "eclector" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eclector/2022-11-06/eclector-20221106-git.tgz"; - sha256 = "087f3z0j13fc9brb6390qsbw79lr7fhgfdc0hcrib2h5idv406xz"; - system = "eclector"; - asd = "eclector"; - }); - systems = [ "eclector/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "eclector" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - eco = { - pname = "eco"; - version = "20190813-git"; - asds = [ "eco" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eco/2019-08-13/eco-20190813-git.tgz"; - sha256 = "13fsv9v7fhf05p7j1hrfy2sg813wmgsp9aw4ng4cpzdss24zvf7q"; - system = "eco"; - asd = "eco"; - }); - systems = [ "eco" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-who" pkgs) (getAttr "esrap" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - eco-test = { - pname = "eco-test"; - version = "20190813-git"; - asds = [ "eco-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eco/2019-08-13/eco-20190813-git.tgz"; - sha256 = "13fsv9v7fhf05p7j1hrfy2sg813wmgsp9aw4ng4cpzdss24zvf7q"; - system = "eco-test"; - asd = "eco-test"; - }); - systems = [ "eco-test" ]; - lispLibs = [ (getAttr "eco" pkgs) (getAttr "fiveam" pkgs) ]; - }; - edit-distance = { - pname = "edit-distance"; - version = "20220331-git"; - asds = [ "edit-distance" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-editdistance/2022-03-31/cl-editdistance-20220331-git.tgz"; - sha256 = "0nzbgq69wak18vwpk0fp68x8shdxq5vy70213dc2r0hwfzzc10v9"; - system = "edit-distance"; - asd = "edit-distance"; - }); - systems = [ "edit-distance" ]; - lispLibs = [ ]; - }; - edit-distance-test = { - pname = "edit-distance-test"; - version = "20220331-git"; - asds = [ "edit-distance-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-editdistance/2022-03-31/cl-editdistance-20220331-git.tgz"; - sha256 = "0nzbgq69wak18vwpk0fp68x8shdxq5vy70213dc2r0hwfzzc10v9"; - system = "edit-distance-test"; - asd = "edit-distance-test"; - }); - systems = [ "edit-distance-test" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-coveralls" pkgs) (getAttr "edit-distance" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - elb-log = { - pname = "elb-log"; - version = "20150923-git"; - asds = [ "elb-log" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/elb-log/2015-09-23/elb-log-20150923-git.tgz"; - sha256 = "1d0vkmkjr6d96j7cggw5frj50jf14brbm63is41zwfkfl9r4i6bp"; - system = "elb-log"; - asd = "elb-log"; - }); - systems = [ "elb-log" ]; - lispLibs = [ (getAttr "cl-annot-prove" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-syntax" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "cl-syntax-interpol" pkgs) (getAttr "local-time" pkgs) (getAttr "zs3" pkgs) ]; - }; - elb-log-test = { - pname = "elb-log-test"; - version = "20150923-git"; - asds = [ "elb-log-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/elb-log/2015-09-23/elb-log-20150923-git.tgz"; - sha256 = "1d0vkmkjr6d96j7cggw5frj50jf14brbm63is41zwfkfl9r4i6bp"; - system = "elb-log-test"; - asd = "elb-log-test"; - }); - systems = [ "elb-log-test" ]; - lispLibs = [ (getAttr "elb-log" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - electron-tools = { - pname = "electron-tools"; - version = "20160421-git"; - asds = [ "electron-tools" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/electron-tools/2016-04-21/electron-tools-20160421-git.tgz"; - sha256 = "0fr16gsbn87vyyjpn2gndhpjg7yzsn4j7skyn0py252cvdk5ygf7"; - system = "electron-tools"; - asd = "electron-tools"; - }); - systems = [ "electron-tools" ]; - lispLibs = [ (getAttr "osicat" pkgs) (getAttr "trivial-download" pkgs) (getAttr "trivial-exe" pkgs) (getAttr "trivial-extract" pkgs) (getAttr "uiop" pkgs) ]; - }; - electron-tools-test = { - pname = "electron-tools-test"; - version = "20160421-git"; - asds = [ "electron-tools-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/electron-tools/2016-04-21/electron-tools-20160421-git.tgz"; - sha256 = "0fr16gsbn87vyyjpn2gndhpjg7yzsn4j7skyn0py252cvdk5ygf7"; - system = "electron-tools-test"; - asd = "electron-tools-test"; - }); - systems = [ "electron-tools-test" ]; - lispLibs = [ (getAttr "electron-tools" pkgs) (getAttr "fiveam" pkgs) (getAttr "trivial-extract" pkgs) ]; - }; - elf = { - pname = "elf"; - version = "20190710-git"; - asds = [ "elf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/elf/2019-07-10/elf-20190710-git.tgz"; - sha256 = "0rd1qcczr2gx76fmxia0kix0p5b49myc9fndibkvwc94cxg085gk"; - system = "elf"; - asd = "elf"; - }); - systems = [ "elf" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "com_dot_gigamonkeys_dot_binary-data" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-shell" pkgs) ]; - }; - elf_slash_test = { - pname = "elf_test"; - version = "20190710-git"; - asds = [ "elf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/elf/2019-07-10/elf-20190710-git.tgz"; - sha256 = "0rd1qcczr2gx76fmxia0kix0p5b49myc9fndibkvwc94cxg085gk"; - system = "elf"; - asd = "elf"; - }); - systems = [ "elf/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "elf" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "stefil" pkgs) (getAttr "trivial-timeout" pkgs) ]; - meta = { - broken = true; - }; - }; - enchant = { - pname = "enchant"; - version = "20211209-git"; - asds = [ "enchant" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-enchant/2021-12-09/cl-enchant-20211209-git.tgz"; - sha256 = "1d0b8743g4y75jl69rq75m8csa5af2fwlxkfvs2p06rsx9dljh79"; - system = "enchant"; - asd = "enchant"; - }); - systems = [ "enchant" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - enchant-autoload = { - pname = "enchant-autoload"; - version = "20211209-git"; - asds = [ "enchant-autoload" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-enchant/2021-12-09/cl-enchant-20211209-git.tgz"; - sha256 = "1d0b8743g4y75jl69rq75m8csa5af2fwlxkfvs2p06rsx9dljh79"; - system = "enchant-autoload"; - asd = "enchant-autoload"; - }); - systems = [ "enchant-autoload" ]; - lispLibs = [ (getAttr "enchant" pkgs) ]; - }; - enhanced-boolean = { - pname = "enhanced-boolean"; - version = "1.0"; - asds = [ "enhanced-boolean" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-boolean/2020-03-25/enhanced-boolean_1.0.tgz"; - sha256 = "17l18lz07fk2kg835vs6c3189d230n1rm9vghk3ls4i356gbq0gy"; - system = "enhanced-boolean"; - asd = "enhanced-boolean"; - }); - systems = [ "enhanced-boolean" ]; - lispLibs = [ ]; - }; - enhanced-boolean_tests = { - pname = "enhanced-boolean_tests"; - version = "1.0"; - asds = [ "enhanced-boolean_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-boolean/2020-03-25/enhanced-boolean_1.0.tgz"; - sha256 = "17l18lz07fk2kg835vs6c3189d230n1rm9vghk3ls4i356gbq0gy"; - system = "enhanced-boolean_tests"; - asd = "enhanced-boolean_tests"; - }); - systems = [ "enhanced-boolean_tests" ]; - lispLibs = [ (getAttr "enhanced-boolean" pkgs) (getAttr "parachute" pkgs) ]; - }; - enhanced-defclass = { - pname = "enhanced-defclass"; - version = "2.1"; - asds = [ "enhanced-defclass" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-defclass/2021-04-11/enhanced-defclass_2.1.tgz"; - sha256 = "142s5c3pl3x7xdawzsj8pdxiqp4wh6fcajf4la5msvnxgf66d8wg"; - system = "enhanced-defclass"; - asd = "enhanced-defclass"; - }); - systems = [ "enhanced-defclass" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "compatible-metaclasses" pkgs) (getAttr "enhanced-eval-when" pkgs) (getAttr "enhanced-find-class" pkgs) (getAttr "evaled-when" pkgs) (getAttr "shared-preferences" pkgs) (getAttr "simple-guess" pkgs) ]; - }; - enhanced-defclass_tests = { - pname = "enhanced-defclass_tests"; - version = "2.1"; - asds = [ "enhanced-defclass_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-defclass/2021-04-11/enhanced-defclass_2.1.tgz"; - sha256 = "142s5c3pl3x7xdawzsj8pdxiqp4wh6fcajf4la5msvnxgf66d8wg"; - system = "enhanced-defclass_tests"; - asd = "enhanced-defclass_tests"; - }); - systems = [ "enhanced-defclass_tests" ]; - lispLibs = [ (getAttr "enhanced-defclass" pkgs) (getAttr "parachute" pkgs) ]; - }; - enhanced-eval-when = { - pname = "enhanced-eval-when"; - version = "1.0"; - asds = [ "enhanced-eval-when" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-eval-when/2012-11-25/enhanced-eval-when-1.0.tgz"; - sha256 = "1ws1v297plcbqmcvckg7vqzzgnrwfyx5kd7281r1wrhc26998rx2"; - system = "enhanced-eval-when"; - asd = "enhanced-eval-when"; - }); - systems = [ "enhanced-eval-when" ]; - lispLibs = [ ]; - }; - enhanced-find-class = { - pname = "enhanced-find-class"; - version = "1.0"; - asds = [ "enhanced-find-class" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-find-class/2020-09-25/enhanced-find-class_1.0.tgz"; - sha256 = "1pf1mxb238zrmvgm9s0456s1x0m317ls23ls1d987riw69y3w9vx"; - system = "enhanced-find-class"; - asd = "enhanced-find-class"; - }); - systems = [ "enhanced-find-class" ]; - lispLibs = [ ]; - }; - enhanced-find-class_tests = { - pname = "enhanced-find-class_tests"; - version = "1.0"; - asds = [ "enhanced-find-class_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-find-class/2020-09-25/enhanced-find-class_1.0.tgz"; - sha256 = "1pf1mxb238zrmvgm9s0456s1x0m317ls23ls1d987riw69y3w9vx"; - system = "enhanced-find-class_tests"; - asd = "enhanced-find-class_tests"; - }); - systems = [ "enhanced-find-class_tests" ]; - lispLibs = [ (getAttr "enhanced-find-class" pkgs) (getAttr "parachute" pkgs) ]; - }; - enhanced-multiple-value-bind = { - pname = "enhanced-multiple-value-bind"; - version = "1.0.1"; - asds = [ "enhanced-multiple-value-bind" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-multiple-value-bind/2012-11-25/enhanced-multiple-value-bind-1.0.1.tgz"; - sha256 = "1hv0g60klqzgl8vdppksrr1z5wayijx5jnmxzk5ivj884d8l2i5n"; - system = "enhanced-multiple-value-bind"; - asd = "enhanced-multiple-value-bind"; - }); - systems = [ "enhanced-multiple-value-bind" ]; - lispLibs = [ ]; - }; - enhanced-typep = { - pname = "enhanced-typep"; - version = "1.0"; - asds = [ "enhanced-typep" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-typep/2020-10-16/enhanced-typep_1.0.tgz"; - sha256 = "0b22gddkbxnhmi71wa2h51495737lrvsqxnri7g1qdsl1hraml21"; - system = "enhanced-typep"; - asd = "enhanced-typep"; - }); - systems = [ "enhanced-typep" ]; - lispLibs = [ ]; - }; - enhanced-typep_tests = { - pname = "enhanced-typep_tests"; - version = "1.0"; - asds = [ "enhanced-typep_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/enhanced-typep/2020-10-16/enhanced-typep_1.0.tgz"; - sha256 = "0b22gddkbxnhmi71wa2h51495737lrvsqxnri7g1qdsl1hraml21"; - system = "enhanced-typep_tests"; - asd = "enhanced-typep_tests"; - }); - systems = [ "enhanced-typep_tests" ]; - lispLibs = [ (getAttr "enhanced-boolean" pkgs) (getAttr "enhanced-typep" pkgs) (getAttr "parachute" pkgs) ]; - }; - enumerations = { - pname = "enumerations"; - version = "20211230-git"; - asds = [ "enumerations" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-enumeration/2021-12-30/cl-enumeration-20211230-git.tgz"; - sha256 = "04y7xizlhhsw5ajhcslkk8rzp1knvmfybf1x5x88njsssw984d73"; - system = "enumerations"; - asd = "enumerations"; - }); - systems = [ "enumerations" ]; - lispLibs = [ ]; - }; - envy = { - pname = "envy"; - version = "20220331-git"; - asds = [ "envy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/envy/2022-03-31/envy-20220331-git.tgz"; - sha256 = "1r0wgimd7z57x8cv69sw76w3y5l70hq50882a9nq5l4v64lg55fq"; - system = "envy"; - asd = "envy"; - }); - systems = [ "envy" ]; - lispLibs = [ ]; - }; - envy-test = { - pname = "envy-test"; - version = "20220331-git"; - asds = [ "envy-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/envy/2022-03-31/envy-20220331-git.tgz"; - sha256 = "1r0wgimd7z57x8cv69sw76w3y5l70hq50882a9nq5l4v64lg55fq"; - system = "envy-test"; - asd = "envy-test"; - }); - systems = [ "envy-test" ]; - lispLibs = [ (getAttr "envy" pkgs) (getAttr "osicat" pkgs) (getAttr "prove" pkgs) ]; - }; - eos = { - pname = "eos"; - version = "20200925-git"; - asds = [ "eos" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eos/2020-09-25/eos-20200925-git.tgz"; - sha256 = "1afllvmlnx97yzz404gycl3pa3kwx427k3hrbf37rpmjlv47knhk"; - system = "eos"; - asd = "eos"; - }); - systems = [ "eos" ]; - lispLibs = [ ]; - }; - eos-tests = { - pname = "eos-tests"; - version = "20200925-git"; - asds = [ "eos-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eos/2020-09-25/eos-20200925-git.tgz"; - sha256 = "1afllvmlnx97yzz404gycl3pa3kwx427k3hrbf37rpmjlv47knhk"; - system = "eos-tests"; - asd = "eos"; - }); - systems = [ "eos-tests" ]; - lispLibs = [ (getAttr "eos" pkgs) ]; - }; - epigraph = { - pname = "epigraph"; - version = "20200325-git"; - asds = [ "epigraph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/epigraph/2020-03-25/epigraph-20200325-git.tgz"; - sha256 = "0gqiv23grdiz6pfly7mqyfmq4c6nwcamlvgsnixn8qi9md7b9d64"; - system = "epigraph"; - asd = "epigraph"; - }); - systems = [ "epigraph" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - epigraph-test = { - pname = "epigraph-test"; - version = "20200325-git"; - asds = [ "epigraph-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/epigraph/2020-03-25/epigraph-20200325-git.tgz"; - sha256 = "0gqiv23grdiz6pfly7mqyfmq4c6nwcamlvgsnixn8qi9md7b9d64"; - system = "epigraph-test"; - asd = "epigraph"; - }); - systems = [ "epigraph-test" ]; - lispLibs = [ (getAttr "epigraph" pkgs) (getAttr "fiveam" pkgs) ]; - }; - epmd = { - pname = "epmd"; - version = "20140211-git"; - asds = [ "epmd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-epmd/2014-02-11/cl-epmd-20140211-git.tgz"; - sha256 = "1334856x7jqhv52wlab6wxmfqslj21pmryx3lwmlsn7c3ypwz4rw"; - system = "epmd"; - asd = "epmd"; - }); - systems = [ "epmd" ]; - lispLibs = [ (getAttr "com_dot_gigamonkeys_dot_binary-data" pkgs) (getAttr "usocket" pkgs) ]; - }; - epmd-test = { - pname = "epmd-test"; - version = "20140211-git"; - asds = [ "epmd-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-epmd/2014-02-11/cl-epmd-20140211-git.tgz"; - sha256 = "1334856x7jqhv52wlab6wxmfqslj21pmryx3lwmlsn7c3ypwz4rw"; - system = "epmd-test"; - asd = "epmd-test"; - }); - systems = [ "epmd-test" ]; - lispLibs = [ (getAttr "epmd" pkgs) (getAttr "fiveam" pkgs) (getAttr "flexi-streams" pkgs) ]; - }; - equals = { - pname = "equals"; - version = "20140826-git"; - asds = [ "equals" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/equals/2014-08-26/equals-20140826-git.tgz"; - sha256 = "0z80z2xb7vlwfgx4sfmj1yba8gs6cgwb86iqrby25h4h34w7kj1w"; - system = "equals"; - asd = "equals"; - }); - systems = [ "equals" ]; - lispLibs = [ ]; - }; - erjoalgo-webutil = { - pname = "erjoalgo-webutil"; - version = "20220707-git"; - asds = [ "erjoalgo-webutil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/erjoalgo-webutil/2022-07-07/erjoalgo-webutil-20220707-git.tgz"; - sha256 = "1bfs540yx12fhsrs6xdcjssr2hc7hn1y2i1m8hqdfni13ax9j3v8"; - system = "erjoalgo-webutil"; - asd = "erjoalgo-webutil"; - }); - systems = [ "erjoalgo-webutil" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "fiasco" pkgs) (getAttr "gzip-stream" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "vom" pkgs) ]; - }; - erlang-term = { - pname = "erlang-term"; - version = "20220220-git"; - asds = [ "erlang-term" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-erlang-term/2022-02-20/cl-erlang-term-20220220-git.tgz"; - sha256 = "1rmnbirbvwmik3j0xkkn90kzx90klrwx7hmscl0ywcbaprm71wkv"; - system = "erlang-term"; - asd = "erlang-term"; - }); - systems = [ "erlang-term" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "nibbles" pkgs) (getAttr "zlib" pkgs) ]; - }; - erlang-term-test = { - pname = "erlang-term-test"; - version = "20220220-git"; - asds = [ "erlang-term-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-erlang-term/2022-02-20/cl-erlang-term-20220220-git.tgz"; - sha256 = "1rmnbirbvwmik3j0xkkn90kzx90klrwx7hmscl0ywcbaprm71wkv"; - system = "erlang-term-test"; - asd = "erlang-term-test"; - }); - systems = [ "erlang-term-test" ]; - lispLibs = [ (getAttr "erlang-term" pkgs) (getAttr "fiveam" pkgs) (getAttr "nibbles" pkgs) ]; - }; - ernestine = { - pname = "ernestine"; - version = "20220220-git"; - asds = [ "ernestine" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ernestine/2022-02-20/ernestine-20220220-git.tgz"; - sha256 = "1gl8pjp44j01nfw9dzk1qdl6njnqcaccp5czcr5rq47l1aicrymn"; - system = "ernestine"; - asd = "ernestine"; - }); - systems = [ "ernestine" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-prevalence" pkgs) (getAttr "drakma" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - ernestine-tests = { - pname = "ernestine-tests"; - version = "20220220-git"; - asds = [ "ernestine-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ernestine/2022-02-20/ernestine-20220220-git.tgz"; - sha256 = "1gl8pjp44j01nfw9dzk1qdl6njnqcaccp5czcr5rq47l1aicrymn"; - system = "ernestine-tests"; - asd = "ernestine-tests"; - }); - systems = [ "ernestine-tests" ]; - lispLibs = [ (getAttr "ernestine" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - erudite = { - pname = "erudite"; - version = "20221106-git"; - asds = [ "erudite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/erudite/2022-11-06/erudite-20221106-git.tgz"; - sha256 = "0za0wrblmk2kclc3wvlvsjf5mkri5ndhgc5ppc9p4zac3fd7p67n"; - system = "erudite"; - asd = "erudite"; - }); - systems = [ "erudite" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-template" pkgs) (getAttr "log4cl" pkgs) (getAttr "split-sequence" pkgs) (getAttr "swank-client" pkgs) ]; - }; - erudite-test = { - pname = "erudite-test"; - version = "20221106-git"; - asds = [ "erudite-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/erudite/2022-11-06/erudite-20221106-git.tgz"; - sha256 = "0za0wrblmk2kclc3wvlvsjf5mkri5ndhgc5ppc9p4zac3fd7p67n"; - system = "erudite-test"; - asd = "erudite-test"; - }); - systems = [ "erudite-test" ]; - lispLibs = [ (getAttr "erudite" pkgs) (getAttr "fiveam" pkgs) ]; - }; - esa-mcclim = { - pname = "esa-mcclim"; - version = "20221106-git"; - asds = [ "esa-mcclim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "esa-mcclim"; - asd = "esa-mcclim"; - }); - systems = [ "esa-mcclim" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "clim-core" pkgs) ]; - }; - escalator = { - pname = "escalator"; - version = "20200427-git"; - asds = [ "escalator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/escalator/2020-04-27/escalator-20200427-git.tgz"; - sha256 = "136n4k983f90cqj6na17ff2fvk9rv4ma8l5y66q7lkbb69idipla"; - system = "escalator"; - asd = "escalator"; - }); - systems = [ "escalator" ]; - lispLibs = [ (getAttr "iterate" pkgs) ]; - }; - escalator-bench = { - pname = "escalator-bench"; - version = "20200427-git"; - asds = [ "escalator-bench" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/escalator/2020-04-27/escalator-20200427-git.tgz"; - sha256 = "136n4k983f90cqj6na17ff2fvk9rv4ma8l5y66q7lkbb69idipla"; - system = "escalator-bench"; - asd = "escalator-bench"; - }); - systems = [ "escalator-bench" ]; - lispLibs = [ (getAttr "escalator" pkgs) (getAttr "iterate" pkgs) ]; - }; - esrap = { - pname = "esrap"; - version = "20220331-git"; - asds = [ "esrap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/esrap/2022-03-31/esrap-20220331-git.tgz"; - sha256 = "1in8a2ygfv7asw2h386sja7222b49ivzvdfc416d0sv74i7s4h8b"; - system = "esrap"; - asd = "esrap"; - }); - systems = [ "esrap" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "trivial-with-current-source-form" pkgs) ]; - }; - esrap-liquid = { - pname = "esrap-liquid"; - version = "20161031-git"; - asds = [ "esrap-liquid" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/esrap-liquid/2016-10-31/esrap-liquid-20161031-git.tgz"; - sha256 = "0agsi8qx6v3c7r6ri5rp78vdb570pdgkvw80va3045crl61mkjzs"; - system = "esrap-liquid"; - asd = "esrap-liquid"; - }); - systems = [ "esrap-liquid" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "iterate" pkgs) ]; - }; - esrap-liquid-tests = { - pname = "esrap-liquid-tests"; - version = "20161031-git"; - asds = [ "esrap-liquid-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/esrap-liquid/2016-10-31/esrap-liquid-20161031-git.tgz"; - sha256 = "0agsi8qx6v3c7r6ri5rp78vdb570pdgkvw80va3045crl61mkjzs"; - system = "esrap-liquid-tests"; - asd = "esrap-liquid"; - }); - systems = [ "esrap-liquid-tests" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "esrap-liquid" pkgs) (getAttr "fiveam" pkgs) ]; - }; - esrap-peg = { - pname = "esrap-peg"; - version = "20191007-git"; - asds = [ "esrap-peg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz"; - sha256 = "0540i7whx1w0n9fdakwk8rnn511xga9xfvczq9y1jcgz1hh42w53"; - system = "esrap-peg"; - asd = "esrap-peg"; - }); - systems = [ "esrap-peg" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-unification" pkgs) (getAttr "esrap" pkgs) (getAttr "iterate" pkgs) ]; - }; - esrap_slash_tests = { - pname = "esrap_tests"; - version = "20220331-git"; - asds = [ "esrap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/esrap/2022-03-31/esrap-20220331-git.tgz"; - sha256 = "1in8a2ygfv7asw2h386sja7222b49ivzvdfc416d0sv74i7s4h8b"; - system = "esrap"; - asd = "esrap"; - }); - systems = [ "esrap/tests" ]; - lispLibs = [ (getAttr "esrap" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - etcd-test = { - pname = "etcd-test"; - version = "20220707-git"; - asds = [ "etcd-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-etcd/2022-07-07/cl-etcd-20220707-git.tgz"; - sha256 = "0g4lkmzddg5hbdxc407w5y7z71p1swrifih9hf3g9jx3hbj3ci37"; - system = "etcd-test"; - asd = "etcd-test"; - }); - systems = [ "etcd-test" ]; - lispLibs = [ (getAttr "cl-etcd" pkgs) (getAttr "cl-toml" pkgs) ]; - }; - ev = { - pname = "ev"; - version = "20150923-git"; - asds = [ "ev" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ev/2015-09-23/cl-ev-20150923-git.tgz"; - sha256 = "0qnkzkw9mn4w6b0q9y207z8ddnd5a2gn42q55yycp2qrvvv47lhp"; - system = "ev"; - asd = "ev"; - }); - systems = [ "ev" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - evaled-when = { - pname = "evaled-when"; - version = "1.0"; - asds = [ "evaled-when" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/evaled-when/2020-09-25/evaled-when_1.0.tgz"; - sha256 = "0482s89nb5jyyg5wmb010p914pgq6ls8z5s12hdw7wrpy675kdkh"; - system = "evaled-when"; - asd = "evaled-when"; - }); - systems = [ "evaled-when" ]; - lispLibs = [ (getAttr "trivial-cltl2" pkgs) ]; - }; - evaled-when_tests = { - pname = "evaled-when_tests"; - version = "1.0"; - asds = [ "evaled-when_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/evaled-when/2020-09-25/evaled-when_1.0.tgz"; - sha256 = "0482s89nb5jyyg5wmb010p914pgq6ls8z5s12hdw7wrpy675kdkh"; - system = "evaled-when_tests"; - asd = "evaled-when_tests"; - }); - systems = [ "evaled-when_tests" ]; - lispLibs = [ (getAttr "enhanced-boolean" pkgs) (getAttr "evaled-when" pkgs) (getAttr "parachute" pkgs) ]; - }; - event-emitter = { - pname = "event-emitter"; - version = "20220331-git"; - asds = [ "event-emitter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/event-emitter/2022-03-31/event-emitter-20220331-git.tgz"; - sha256 = "1v1mhwypc08hiz14kg6vp4xzkhlicw29vxgawz8m5ydxl2ranwc0"; - system = "event-emitter"; - asd = "event-emitter"; - }); - systems = [ "event-emitter" ]; - lispLibs = [ ]; - }; - event-emitter-test = { - pname = "event-emitter-test"; - version = "20220331-git"; - asds = [ "event-emitter-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/event-emitter/2022-03-31/event-emitter-20220331-git.tgz"; - sha256 = "1v1mhwypc08hiz14kg6vp4xzkhlicw29vxgawz8m5ydxl2ranwc0"; - system = "event-emitter-test"; - asd = "event-emitter-test"; - }); - systems = [ "event-emitter-test" ]; - lispLibs = [ (getAttr "event-emitter" pkgs) (getAttr "prove" pkgs) ]; - }; - event-glue = { - pname = "event-glue"; - version = "20150608-git"; - asds = [ "event-glue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/event-glue/2015-06-08/event-glue-20150608-git.tgz"; - sha256 = "1cmxdx5nawzqafz9b6nswp20d3zlaks44ln4n6bf5jxji9n3vany"; - system = "event-glue"; - asd = "event-glue"; - }); - systems = [ "event-glue" ]; - lispLibs = [ ]; - }; - event-glue-test = { - pname = "event-glue-test"; - version = "20150608-git"; - asds = [ "event-glue-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/event-glue/2015-06-08/event-glue-20150608-git.tgz"; - sha256 = "1cmxdx5nawzqafz9b6nswp20d3zlaks44ln4n6bf5jxji9n3vany"; - system = "event-glue-test"; - asd = "event-glue-test"; - }); - systems = [ "event-glue-test" ]; - lispLibs = [ (getAttr "event-glue" pkgs) (getAttr "fiveam" pkgs) ]; - }; - eventbus = { - pname = "eventbus"; - version = "20191227-git"; - asds = [ "eventbus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eventbus/2019-12-27/eventbus-20191227-git.tgz"; - sha256 = "0slqx3zq6sbz3rg4g79j8y25sx4405y6ff3x6l5v8v4v42m1s0p2"; - system = "eventbus"; - asd = "eventbus"; - }); - systems = [ "eventbus" ]; - lispLibs = [ (getAttr "simplet-asdf" pkgs) ]; - }; - eventbus_slash_test = { - pname = "eventbus_test"; - version = "20191227-git"; - asds = [ "eventbus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eventbus/2019-12-27/eventbus-20191227-git.tgz"; - sha256 = "0slqx3zq6sbz3rg4g79j8y25sx4405y6ff3x6l5v8v4v42m1s0p2"; - system = "eventbus"; - asd = "eventbus"; - }); - systems = [ "eventbus/test" ]; - lispLibs = [ (getAttr "eventbus" pkgs) (getAttr "simplet" pkgs) (getAttr "simplet-asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - eventfd = { - pname = "eventfd"; - version = "20171130-git"; - asds = [ "eventfd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eventfd/2017-11-30/eventfd-20171130-git.tgz"; - sha256 = "1zwg043vqzk665k9dxgxhik20wgkl204anjna94zg6037m33vdiw"; - system = "eventfd"; - asd = "eventfd"; - }); - systems = [ "eventfd" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "iolib" pkgs) ]; - }; - everblocking-stream = { - pname = "everblocking-stream"; - version = "20181018-git"; - asds = [ "everblocking-stream" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/everblocking-stream/2018-10-18/everblocking-stream-20181018-git.tgz"; - sha256 = "1xvfsx2ldwcprlynikn1rikxh3lfdyzl2p72glzvgh20sm93p1rz"; - system = "everblocking-stream"; - asd = "everblocking-stream"; - }); - systems = [ "everblocking-stream" ]; - lispLibs = [ (getAttr "trivial-gray-streams" pkgs) ]; - }; - evol = { - pname = "evol"; - version = "20101006-git"; - asds = [ "evol" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/evol/2010-10-06/evol-20101006-git.tgz"; - sha256 = "1hp6wygj44llkscqq721xg4a7j5faqjcfc646lvkia5xg81zbf65"; - system = "evol"; - asd = "evol"; - }); - systems = [ "evol" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "external-program" pkgs) (getAttr "patron" pkgs) (getAttr "unix-options" pkgs) ]; - }; - evol-test = { - pname = "evol-test"; - version = "20101006-git"; - asds = [ "evol-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/evol/2010-10-06/evol-20101006-git.tgz"; - sha256 = "1hp6wygj44llkscqq721xg4a7j5faqjcfc646lvkia5xg81zbf65"; - system = "evol-test"; - asd = "evol-test"; - }); - systems = [ "evol-test" ]; - lispLibs = [ (getAttr "evol" pkgs) (getAttr "stefil" pkgs) ]; - }; - example-bot = { - pname = "example-bot"; - version = "20200925-git"; - asds = [ "example-bot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispcord/2020-09-25/lispcord-20200925-git.tgz"; - sha256 = "1bkvsbnbv21q8xz8z2nmczznd0sllr57l3sc2wm5cjn6h3qg1sgh"; - system = "example-bot"; - asd = "example-bot"; - }); - systems = [ "example-bot" ]; - lispLibs = [ (getAttr "lispcord" pkgs) ]; - }; - exit-hooks = { - pname = "exit-hooks"; - version = "20170403-git"; - asds = [ "exit-hooks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/exit-hooks/2017-04-03/exit-hooks-20170403-git.tgz"; - sha256 = "00rk0pr2cy3hy6giblh166b7yrg06d5lanipjcqv508gkfb0vi47"; - system = "exit-hooks"; - asd = "exit-hooks"; - }); - systems = [ "exit-hooks" ]; - lispLibs = [ ]; - }; - exponential-backoff = { - pname = "exponential-backoff"; - version = "20150113-git"; - asds = [ "exponential-backoff" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/exponential-backoff/2015-01-13/exponential-backoff-20150113-git.tgz"; - sha256 = "1389hm9hxv85s0125ja4js1bvh8ay4dsy9q1gaynjv27ynik6gmv"; - system = "exponential-backoff"; - asd = "exponential-backoff"; - }); - systems = [ "exponential-backoff" ]; - lispLibs = [ ]; - }; - exscribe = { - pname = "exscribe"; - version = "20200925-git"; - asds = [ "exscribe" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/exscribe/2020-09-25/exscribe-20200925-git.tgz"; - sha256 = "02vsavasr5nbhrk86b7d8xpr6sm8cyrg3vs2pbpkls2iypffyd2h"; - system = "exscribe"; - asd = "exscribe"; - }); - systems = [ "exscribe" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fare-memoization" pkgs) (getAttr "fare-scripts" pkgs) (getAttr "fare-utils" pkgs) (getAttr "quri" pkgs) (getAttr "scribble" pkgs) (getAttr "trivia_dot_quasiquote" pkgs) ]; - }; - exscribe_slash_typeset = { - pname = "exscribe_typeset"; - version = "20200925-git"; - asds = [ "exscribe" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/exscribe/2020-09-25/exscribe-20200925-git.tgz"; - sha256 = "02vsavasr5nbhrk86b7d8xpr6sm8cyrg3vs2pbpkls2iypffyd2h"; - system = "exscribe"; - asd = "exscribe"; - }); - systems = [ "exscribe/typeset" ]; - lispLibs = [ (getAttr "cl-typesetting" pkgs) (getAttr "exscribe" pkgs) ]; - meta = { - broken = true; - }; - }; - ext-blog = { - pname = "ext-blog"; - version = "20160825-git"; - asds = [ "ext-blog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ext-blog/2016-08-25/ext-blog-20160825-git.tgz"; - sha256 = "10qnl3p994wg12c0cn6xgkgmwfip0fk0sjyqyy0j5bdrp32gr5wg"; - system = "ext-blog"; - asd = "ext-blog"; - }); - systems = [ "ext-blog" ]; - lispLibs = [ (getAttr "closure-template" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-store" pkgs) (getAttr "image" pkgs) (getAttr "kl-verify" pkgs) (getAttr "local-time" pkgs) (getAttr "restas" pkgs) (getAttr "restas_dot_file-publisher" pkgs) (getAttr "s-xml-rpc" pkgs) ]; - }; - extended-reals = { - pname = "extended-reals"; - version = "20180328-git"; - asds = [ "extended-reals" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/extended-reals/2018-03-28/extended-reals-20180328-git.tgz"; - sha256 = "0vq191win5sq37mrwjhvi463jqh1mkwbsa0hja69syq789pgaxmb"; - system = "extended-reals"; - asd = "extended-reals"; - }); - systems = [ "extended-reals" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - extensible-compound-types = { - pname = "extensible-compound-types"; - version = "20221106-git"; - asds = [ "extensible-compound-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/extensible-compound-types/2022-11-06/extensible-compound-types-20221106-git.tgz"; - sha256 = "02why0lajvf4iccw7xhcpsn7956i731xavq2mmyv4plwhd71rczc"; - system = "extensible-compound-types"; - asd = "extensible-compound-types"; - }); - systems = [ "extensible-compound-types" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-environments" pkgs) (getAttr "compiler-macro-notes" pkgs) (getAttr "fiveam" pkgs) (getAttr "in-nomine" pkgs) (getAttr "optima" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - extensible-compound-types-cl = { - pname = "extensible-compound-types-cl"; - version = "20221106-git"; - asds = [ "extensible-compound-types-cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/extensible-compound-types/2022-11-06/extensible-compound-types-20221106-git.tgz"; - sha256 = "02why0lajvf4iccw7xhcpsn7956i731xavq2mmyv4plwhd71rczc"; - system = "extensible-compound-types-cl"; - asd = "extensible-compound-types-cl"; - }); - systems = [ "extensible-compound-types-cl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-form-types" pkgs) (getAttr "extensible-compound-types" pkgs) (getAttr "fiveam" pkgs) ]; - }; - extensible-compound-types-cl_slash_specializable-structs = { - pname = "extensible-compound-types-cl_specializable-structs"; - version = "20221106-git"; - asds = [ "extensible-compound-types-cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/extensible-compound-types/2022-11-06/extensible-compound-types-20221106-git.tgz"; - sha256 = "02why0lajvf4iccw7xhcpsn7956i731xavq2mmyv4plwhd71rczc"; - system = "extensible-compound-types-cl"; - asd = "extensible-compound-types-cl"; - }); - systems = [ "extensible-compound-types-cl/specializable-structs" ]; - lispLibs = [ (getAttr "cl-form-types" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "extensible-compound-types-cl" pkgs) (getAttr "fiveam" pkgs) (getAttr "polymorphic-functions" pkgs) ]; - meta = { - broken = true; - }; - }; - extensible-sequences = { - pname = "extensible-sequences"; - version = "20130813-darcs"; - asds = [ "extensible-sequences" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz"; - sha256 = "12flvy6hysqw0fa2jfkxrgphlk6b25hg2w2dxm1ylax0gw9fh1l5"; - system = "extensible-sequences"; - asd = "extensible-sequences"; - }); - systems = [ "extensible-sequences" ]; - lispLibs = [ (getAttr "sequence-iterators" pkgs) ]; - }; - external-program = { - pname = "external-program"; - version = "20190307-git"; - asds = [ "external-program" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz"; - sha256 = "0vww1x3yilb3bjwg6k184vaj4vxyxw4vralhnlm6lk4xac67kc9z"; - system = "external-program"; - asd = "external-program"; - }); - systems = [ "external-program" ]; - lispLibs = [ (getAttr "trivial-features" pkgs) ]; - }; - external-program-test = { - pname = "external-program-test"; - version = "20190307-git"; - asds = [ "external-program-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz"; - sha256 = "0vww1x3yilb3bjwg6k184vaj4vxyxw4vralhnlm6lk4xac67kc9z"; - system = "external-program-test"; - asd = "external-program"; - }); - systems = [ "external-program-test" ]; - lispLibs = [ (getAttr "external-program" pkgs) (getAttr "fiveam" pkgs) ]; - }; - external-symbol-not-found = { - pname = "external-symbol-not-found"; - version = "20220220-git"; - asds = [ "external-symbol-not-found" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/external-symbol-not-found/2022-02-20/external-symbol-not-found-20220220-git.tgz"; - sha256 = "1wlz36y1dka4409ngvp583jafwb9z8y6ghmyb84wn9spj66kghz8"; - system = "external-symbol-not-found"; - asd = "external-symbol-not-found"; - }); - systems = [ "external-symbol-not-found" ]; - lispLibs = [ ]; - }; - f-underscore = { - pname = "f-underscore"; - version = "20101006-darcs"; - asds = [ "f-underscore" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f-underscore/2010-10-06/f-underscore-20101006-darcs.tgz"; - sha256 = "0mqvb2rxa08y07lj6smp8gf1ig32802fxq7mw5a283f2nkrinnb5"; - system = "f-underscore"; - asd = "f-underscore"; - }); - systems = [ "f-underscore" ]; - lispLibs = [ ]; - }; - f2cl = { - pname = "f2cl"; - version = "20200925-git"; - asds = [ "f2cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "f2cl"; - asd = "f2cl"; - }); - systems = [ "f2cl" ]; - lispLibs = [ (getAttr "f2cl-asdf" pkgs) ]; - }; - f2cl-asdf = { - pname = "f2cl-asdf"; - version = "20200925-git"; - asds = [ "f2cl-asdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "f2cl-asdf"; - asd = "f2cl-asdf"; - }); - systems = [ "f2cl-asdf" ]; - lispLibs = [ ]; - }; - f2cl-lib = { - pname = "f2cl-lib"; - version = "20220220-git"; - asds = [ "f2cl-lib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "f2cl-lib"; - asd = "f2cl-lib"; - }); - systems = [ "f2cl-lib" ]; - lispLibs = [ ]; - }; - fact-base = { - pname = "fact-base"; - version = "20180328-git"; - asds = [ "fact-base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fact-base/2018-03-28/fact-base-20180328-git.tgz"; - sha256 = "14i0vqqxszabhas0z9dfxhvnbsxl4iic77m4i76w7iznmrcma2ar"; - system = "fact-base"; - asd = "fact-base"; - }); - systems = [ "fact-base" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "local-time" pkgs) (getAttr "optima" pkgs) ]; - }; - factory-alien = { - pname = "factory-alien"; - version = "20220707-git"; - asds = [ "factory-alien" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/factory-alien/2022-07-07/factory-alien-20220707-git.tgz"; - sha256 = "0c59d8faxim39vs0mmy7fxbl721w4vph0ndqwfj7wh6wwqcl5kvm"; - system = "factory-alien"; - asd = "factory-alien"; - }); - systems = [ "factory-alien" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - factory-alien_slash_postmodern = { - pname = "factory-alien_postmodern"; - version = "20220707-git"; - asds = [ "factory-alien" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/factory-alien/2022-07-07/factory-alien-20220707-git.tgz"; - sha256 = "0c59d8faxim39vs0mmy7fxbl721w4vph0ndqwfj7wh6wwqcl5kvm"; - system = "factory-alien"; - asd = "factory-alien"; - }); - systems = [ "factory-alien/postmodern" ]; - lispLibs = [ (getAttr "factory-alien" pkgs) (getAttr "postmodern" pkgs) ]; - meta = { - broken = true; - }; - }; - factory-alien_slash_test = { - pname = "factory-alien_test"; - version = "20220707-git"; - asds = [ "factory-alien" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/factory-alien/2022-07-07/factory-alien-20220707-git.tgz"; - sha256 = "0c59d8faxim39vs0mmy7fxbl721w4vph0ndqwfj7wh6wwqcl5kvm"; - system = "factory-alien"; - asd = "factory-alien"; - }); - systems = [ "factory-alien/test" ]; - lispLibs = [ (getAttr "factory-alien" pkgs) (getAttr "parachute" pkgs) ]; - meta = { - broken = true; - }; - }; - facts = { - pname = "facts"; - version = "20221106-git"; - asds = [ "facts" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-facts/2022-11-06/cl-facts-20221106-git.tgz"; - sha256 = "09z1vwzjm7hlb529jl3hcjnfd11gh128lmdg51im7ar4jv4746iw"; - system = "facts"; - asd = "facts"; - }); - systems = [ "facts" ]; - lispLibs = [ (getAttr "lessp" pkgs) (getAttr "rollback" pkgs) (getAttr "local-time" pkgs) ]; - }; - fakenil = { - pname = "fakenil"; - version = "1.0"; - asds = [ "fakenil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fakenil/2020-03-25/fakenil_1.0.tgz"; - sha256 = "0ipqax3sgcs1dsgxz8d2pmfg324k6l35pn0nz89w5jl02fia61l3"; - system = "fakenil"; - asd = "fakenil"; - }); - systems = [ "fakenil" ]; - lispLibs = [ ]; - }; - fakenil_tests = { - pname = "fakenil_tests"; - version = "1.0"; - asds = [ "fakenil_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fakenil/2020-03-25/fakenil_1.0.tgz"; - sha256 = "0ipqax3sgcs1dsgxz8d2pmfg324k6l35pn0nz89w5jl02fia61l3"; - system = "fakenil_tests"; - asd = "fakenil_tests"; - }); - systems = [ "fakenil_tests" ]; - lispLibs = [ (getAttr "fakenil" pkgs) (getAttr "parachute" pkgs) ]; - }; - fare-csv = { - pname = "fare-csv"; - version = "20171227-git"; - asds = [ "fare-csv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz"; - sha256 = "07y15zm2x28crfjjpcngqqmzzrm2fgj5k8hd1l39qii44wc4rm4b"; - system = "fare-csv"; - asd = "fare-csv"; - }); - systems = [ "fare-csv" ]; - lispLibs = [ ]; - }; - fare-memoization = { - pname = "fare-memoization"; - version = "20180430-git"; - asds = [ "fare-memoization" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fare-memoization/2018-04-30/fare-memoization-20180430-git.tgz"; - sha256 = "1blmrb4c9gsxj87scz74z1s8w9d1w2r48fyxj0y1sw3vr6bsbb8f"; - system = "fare-memoization"; - asd = "fare-memoization"; - }); - systems = [ "fare-memoization" ]; - lispLibs = [ ]; - }; - fare-memoization_slash_test = { - pname = "fare-memoization_test"; - version = "20180430-git"; - asds = [ "fare-memoization" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fare-memoization/2018-04-30/fare-memoization-20180430-git.tgz"; - sha256 = "1blmrb4c9gsxj87scz74z1s8w9d1w2r48fyxj0y1sw3vr6bsbb8f"; - system = "fare-memoization"; - asd = "fare-memoization"; - }); - systems = [ "fare-memoization/test" ]; - lispLibs = [ (getAttr "fare-memoization" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - meta = { - broken = true; - }; - }; - fare-mop = { - pname = "fare-mop"; - version = "20151218-git"; - asds = [ "fare-mop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz"; - sha256 = "0maxs8392953fhnaa6zwnm2mdbhxjxipp4g4rvypm06ixr6pyv1c"; - system = "fare-mop"; - asd = "fare-mop"; - }); - systems = [ "fare-mop" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "fare-utils" pkgs) ]; - }; - fare-quasiquote = { - pname = "fare-quasiquote"; - version = "20200925-git"; - asds = [ "fare-quasiquote" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; - sha256 = "034mw3x0jv6q5nxqq8sz77c44dc115x6y52bnzk31qclib88zl7n"; - system = "fare-quasiquote"; - asd = "fare-quasiquote"; - }); - systems = [ "fare-quasiquote" ]; - lispLibs = [ (getAttr "fare-utils" pkgs) ]; - }; - fare-quasiquote-extras = { - pname = "fare-quasiquote-extras"; - version = "20200925-git"; - asds = [ "fare-quasiquote-extras" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; - sha256 = "034mw3x0jv6q5nxqq8sz77c44dc115x6y52bnzk31qclib88zl7n"; - system = "fare-quasiquote-extras"; - asd = "fare-quasiquote-extras"; - }); - systems = [ "fare-quasiquote-extras" ]; - lispLibs = [ (getAttr "fare-quasiquote-optima" pkgs) (getAttr "fare-quasiquote-readtable" pkgs) ]; - }; - fare-quasiquote-optima = { - pname = "fare-quasiquote-optima"; - version = "20200925-git"; - asds = [ "fare-quasiquote-optima" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; - sha256 = "034mw3x0jv6q5nxqq8sz77c44dc115x6y52bnzk31qclib88zl7n"; - system = "fare-quasiquote-optima"; - asd = "fare-quasiquote-optima"; - }); - systems = [ "fare-quasiquote-optima" ]; - lispLibs = [ (getAttr "trivia_dot_quasiquote" pkgs) ]; - }; - fare-quasiquote-readtable = { - pname = "fare-quasiquote-readtable"; - version = "20200925-git"; - asds = [ "fare-quasiquote-readtable" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; - sha256 = "034mw3x0jv6q5nxqq8sz77c44dc115x6y52bnzk31qclib88zl7n"; - system = "fare-quasiquote-readtable"; - asd = "fare-quasiquote-readtable"; - }); - systems = [ "fare-quasiquote-readtable" ]; - lispLibs = [ (getAttr "fare-quasiquote" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - fare-scripts = { - pname = "fare-scripts"; - version = "20211230-git"; - asds = [ "fare-scripts" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fare-scripts/2021-12-30/fare-scripts-20211230-git.tgz"; - sha256 = "0i4giia6z2ys9fp5h0ff6r7d74ysynjqar7s9cv5zsiw871rqa1j"; - system = "fare-scripts"; - asd = "fare-scripts"; - }); - systems = [ "fare-scripts" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "binascii" pkgs) (getAttr "cl-launch" pkgs) (getAttr "cl-mime" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-scripting" pkgs) (getAttr "cl-unicode" pkgs) (getAttr "command-line-arguments" pkgs) (getAttr "fare-utils" pkgs) (getAttr "inferior-shell" pkgs) (getAttr "optima" pkgs) (getAttr "optima_dot_ppcre" pkgs) (getAttr "swank" pkgs) ]; - }; - fare-utils = { - pname = "fare-utils"; - version = "20170124-git"; - asds = [ "fare-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz"; - sha256 = "01wsr1aap3jdzhn4hrqjbhsjx6qci9dbd3gh4gayv1p49rbg8aqr"; - system = "fare-utils"; - asd = "fare-utils"; - }); - systems = [ "fare-utils" ]; - lispLibs = [ ]; - }; - fare-utils-test = { - pname = "fare-utils-test"; - version = "20170124-git"; - asds = [ "fare-utils-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz"; - sha256 = "01wsr1aap3jdzhn4hrqjbhsjx6qci9dbd3gh4gayv1p49rbg8aqr"; - system = "fare-utils-test"; - asd = "fare-utils-test"; - }); - systems = [ "fare-utils-test" ]; - lispLibs = [ (getAttr "fare-utils" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - }; - fast-generic-functions = { - pname = "fast-generic-functions"; - version = "20220220-git"; - asds = [ "fast-generic-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fast-generic-functions/2022-02-20/fast-generic-functions-20220220-git.tgz"; - sha256 = "16hf9bi2p5s77p3m3aqsihcd9iicqjhhxxpsarjv93c41qs54yad"; - system = "fast-generic-functions"; - asd = "fast-generic-functions"; - }); - systems = [ "fast-generic-functions" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "sealable-metaobjects" pkgs) (getAttr "trivial-macroexpand-all" pkgs) ]; - }; - fast-http = { - pname = "fast-http"; - version = "20191007-git"; - asds = [ "fast-http" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz"; - sha256 = "0al2g7g219jjljsf7b23pbilpgacxy5as5gs2nqf76b5qni396mi"; - system = "fast-http"; - asd = "fast-http"; - }); - systems = [ "fast-http" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-utilities" pkgs) (getAttr "proc-parse" pkgs) (getAttr "smart-buffer" pkgs) (getAttr "xsubseq" pkgs) ]; - }; - fast-http-test = { - pname = "fast-http-test"; - version = "20191007-git"; - asds = [ "fast-http-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz"; - sha256 = "0al2g7g219jjljsf7b23pbilpgacxy5as5gs2nqf76b5qni396mi"; - system = "fast-http-test"; - asd = "fast-http-test"; - }); - systems = [ "fast-http-test" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-syntax-interpol" pkgs) (getAttr "fast-http" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "xsubseq" pkgs) ]; - }; - fast-io = { - pname = "fast-io"; - version = "20221106-git"; - asds = [ "fast-io" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fast-io/2022-11-06/fast-io-20221106-git.tgz"; - sha256 = "0wh02yagbqahy9z6787jz5ggpagvr18qd0z13wvwq1vjf8xd2530"; - system = "fast-io"; - asd = "fast-io"; - }); - systems = [ "fast-io" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "static-vectors" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - fast-io-test = { - pname = "fast-io-test"; - version = "20221106-git"; - asds = [ "fast-io-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fast-io/2022-11-06/fast-io-20221106-git.tgz"; - sha256 = "0wh02yagbqahy9z6787jz5ggpagvr18qd0z13wvwq1vjf8xd2530"; - system = "fast-io-test"; - asd = "fast-io-test"; - }); - systems = [ "fast-io-test" ]; - lispLibs = [ (getAttr "checkl" pkgs) (getAttr "fast-io" pkgs) (getAttr "fiveam" pkgs) ]; - }; - fast-websocket = { - pname = "fast-websocket"; - version = "20220707-git"; - asds = [ "fast-websocket" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fast-websocket/2022-07-07/fast-websocket-20220707-git.tgz"; - sha256 = "1j7v00gbkzx4mq2v8y44jm4jx321hgrv9igfw23cvzzlyd3dzp6y"; - system = "fast-websocket"; - asd = "fast-websocket"; - }); - systems = [ "fast-websocket" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "fast-io" pkgs) ]; - }; - fast-websocket-test = { - pname = "fast-websocket-test"; - version = "20220707-git"; - asds = [ "fast-websocket-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fast-websocket/2022-07-07/fast-websocket-20220707-git.tgz"; - sha256 = "1j7v00gbkzx4mq2v8y44jm4jx321hgrv9igfw23cvzzlyd3dzp6y"; - system = "fast-websocket-test"; - asd = "fast-websocket-test"; - }); - systems = [ "fast-websocket-test" ]; - lispLibs = [ (getAttr "fast-io" pkgs) (getAttr "fast-websocket" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - feeder = { - pname = "feeder"; - version = "20210228-git"; - asds = [ "feeder" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/feeder/2021-02-28/feeder-20210228-git.tgz"; - sha256 = "1dpbzhycg50snl3j01c8dh8gdvhfhz0hnfl54xy55a3wbr3m6rp7"; - system = "feeder"; - asd = "feeder"; - }); - systems = [ "feeder" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "local-time" pkgs) (getAttr "plump" pkgs) ]; - }; - femlisp = { - pname = "femlisp"; - version = "20210411-git"; - asds = [ "femlisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; - system = "femlisp"; - asd = "femlisp"; - }); - systems = [ "femlisp" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "femlisp-basic" pkgs) (getAttr "femlisp-dictionary" pkgs) (getAttr "femlisp-matlisp" pkgs) (getAttr "femlisp-parallel" pkgs) (getAttr "infix" pkgs) (getAttr "flexi-streams" pkgs) ]; - }; - femlisp-basic = { - pname = "femlisp-basic"; - version = "20210411-git"; - asds = [ "femlisp-basic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; - system = "femlisp-basic"; - asd = "femlisp-basic"; - }); - systems = [ "femlisp-basic" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "fiveam" pkgs) ]; - }; - femlisp-dictionary = { - pname = "femlisp-dictionary"; - version = "20210411-git"; - asds = [ "femlisp-dictionary" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; - system = "femlisp-dictionary"; - asd = "femlisp-dictionary"; - }); - systems = [ "femlisp-dictionary" ]; - lispLibs = [ (getAttr "femlisp-basic" pkgs) (getAttr "femlisp-parallel" pkgs) (getAttr "trees" pkgs) ]; - }; - femlisp-matlisp = { - pname = "femlisp-matlisp"; - version = "20210411-git"; - asds = [ "femlisp-matlisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; - system = "femlisp-matlisp"; - asd = "femlisp-matlisp"; - }); - systems = [ "femlisp-matlisp" ]; - lispLibs = [ (getAttr "femlisp-basic" pkgs) (getAttr "femlisp-dictionary" pkgs) (getAttr "femlisp-parallel" pkgs) ]; - }; - femlisp-parallel = { - pname = "femlisp-parallel"; - version = "20210411-git"; - asds = [ "femlisp-parallel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; - system = "femlisp-parallel"; - asd = "femlisp-parallel"; - }); - systems = [ "femlisp-parallel" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-cpu-affinity" pkgs) (getAttr "femlisp-basic" pkgs) (getAttr "lparallel" pkgs) ]; - }; - femlisp-picture = { - pname = "femlisp-picture"; - version = "20210411-git"; - asds = [ "femlisp-picture" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; - system = "femlisp-picture"; - asd = "femlisp-picture"; - }); - systems = [ "femlisp-picture" ]; - lispLibs = [ (getAttr "cl-gd" pkgs) (getAttr "femlisp" pkgs) ]; - }; - ffa = { - pname = "ffa"; - version = "20101006-git"; - asds = [ "ffa" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ffa/2010-10-06/ffa-20101006-git.tgz"; - sha256 = "0l7kqcjp3sn1129hpwq6zhjqc0ydx9gc53z7k13i38x3z1asap7a"; - system = "ffa"; - asd = "ffa"; - }); - systems = [ "ffa" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-utilities" pkgs) (getAttr "iterate" pkgs) (getAttr "metabang-bind" pkgs) ]; - }; - fft = { - pname = "fft"; - version = "20180711-git"; - asds = [ "fft" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fft/2018-07-11/fft-20180711-git.tgz"; - sha256 = "0ymnfplap2cncw49mhq7crapgxphfwsvqdgrcckpgsvw6qsymasd"; - system = "fft"; - asd = "fft"; - }); - systems = [ "fft" ]; - lispLibs = [ ]; - }; - fftpack5 = { - pname = "fftpack5"; - version = "20200925-git"; - asds = [ "fftpack5" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fftpack5"; - asd = "fftpack5"; - }); - systems = [ "fftpack5" ]; - lispLibs = [ (getAttr "f2cl" pkgs) ]; - }; - fftpack5-double = { - pname = "fftpack5-double"; - version = "20200925-git"; - asds = [ "fftpack5-double" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fftpack5-double"; - asd = "fftpack5-double"; - }); - systems = [ "fftpack5-double" ]; - lispLibs = [ (getAttr "f2cl" pkgs) ]; - }; - fiasco = { - pname = "fiasco"; - version = "20200610-git"; - asds = [ "fiasco" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz"; - sha256 = "1k8i2kq57201bvy3zfpsxld530hd104dgbglxigqb6i408c1a7aw"; - system = "fiasco"; - asd = "fiasco"; - }); - systems = [ "fiasco" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - fiasco-self-tests = { - pname = "fiasco-self-tests"; - version = "20200610-git"; - asds = [ "fiasco-self-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz"; - sha256 = "1k8i2kq57201bvy3zfpsxld530hd104dgbglxigqb6i408c1a7aw"; - system = "fiasco-self-tests"; - asd = "fiasco"; - }); - systems = [ "fiasco-self-tests" ]; - lispLibs = [ (getAttr "fiasco" pkgs) ]; - }; - file-attributes = { - pname = "file-attributes"; - version = "20210807-git"; - asds = [ "file-attributes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/file-attributes/2021-08-07/file-attributes-20210807-git.tgz"; - sha256 = "0wvdhwpav9kmpdr79v4i33jabzcp95k5mbz7jljkpxzfblzias77"; - system = "file-attributes"; - asd = "file-attributes"; - }); - systems = [ "file-attributes" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - file-local-variable = { - pname = "file-local-variable"; - version = "20160318-git"; - asds = [ "file-local-variable" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/file-local-variable/2016-03-18/file-local-variable-20160318-git.tgz"; - sha256 = "1jsjd0g41mg76wlqjxliyrfz8fk7ihi06nq2zizmk9np0pmwsxl9"; - system = "file-local-variable"; - asd = "file-local-variable"; - }); - systems = [ "file-local-variable" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "trivia" pkgs) ]; - }; - file-local-variable_dot_test = { - pname = "file-local-variable.test"; - version = "20160318-git"; - asds = [ "file-local-variable.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/file-local-variable/2016-03-18/file-local-variable-20160318-git.tgz"; - sha256 = "1jsjd0g41mg76wlqjxliyrfz8fk7ihi06nq2zizmk9np0pmwsxl9"; - system = "file-local-variable.test"; - asd = "file-local-variable.test"; - }); - systems = [ "file-local-variable.test" ]; - lispLibs = [ (getAttr "file-local-variable" pkgs) (getAttr "fiveam" pkgs) ]; - }; - file-notify = { - pname = "file-notify"; - version = "20220707-git"; - asds = [ "file-notify" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/file-notify/2022-07-07/file-notify-20220707-git.tgz"; - sha256 = "0788d98rqm1krl8nbfh8qshvyf6g336i9bqrdhkx06cfvbh0wcny"; - system = "file-notify"; - asd = "file-notify"; - }); - systems = [ "file-notify" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - file-select = { - pname = "file-select"; - version = "20220331-git"; - asds = [ "file-select" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/file-select/2022-03-31/file-select-20220331-git.tgz"; - sha256 = "02xi77z6ra2kpj9gkg8kwxidhgwpalbq38hc1f806jfckidpblr3"; - system = "file-select"; - asd = "file-select"; - }); - systems = [ "file-select" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "float-features" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - file-types = { - pname = "file-types"; - version = "20160929-git"; - asds = [ "file-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/file-types/2016-09-29/file-types-20160929-git.tgz"; - sha256 = "09l67gzjwx7kx237grm709dsj9rkmmm8s3ya6irmcw8nh587inbs"; - system = "file-types"; - asd = "file-types"; - }); - systems = [ "file-types" ]; - lispLibs = [ ]; - }; - filesystem-utils = { - pname = "filesystem-utils"; - version = "20221106-git"; - asds = [ "filesystem-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/filesystem-utils/2022-11-06/filesystem-utils-20221106-git.tgz"; - sha256 = "1lnfy1zxiixdjmy5xy4wb7xq2n6srwxiyv8ghbjb5x4hsxn5m2j7"; - system = "filesystem-utils"; - asd = "filesystem-utils"; - }); - systems = [ "filesystem-utils" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "pathname-utils" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - filesystem-utils-test = { - pname = "filesystem-utils-test"; - version = "20221106-git"; - asds = [ "filesystem-utils-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/filesystem-utils/2022-11-06/filesystem-utils-20221106-git.tgz"; - sha256 = "1lnfy1zxiixdjmy5xy4wb7xq2n6srwxiyv8ghbjb5x4hsxn5m2j7"; - system = "filesystem-utils-test"; - asd = "filesystem-utils-test"; - }); - systems = [ "filesystem-utils-test" ]; - lispLibs = [ (getAttr "filesystem-utils" pkgs) (getAttr "parachute" pkgs) ]; - }; - filter-maker = { - pname = "filter-maker"; - version = "20221106-git"; - asds = [ "filter-maker" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/filter-maker/2022-11-06/filter-maker-20221106-git.tgz"; - sha256 = "00algyghniqsvjy5vwx39fd98nd7x4w944ahy981jlh33lzc2qmn"; - system = "filter-maker"; - asd = "filter-maker"; - }); - systems = [ "filter-maker" ]; - lispLibs = [ (getAttr "mcclim" pkgs) ]; - }; - filtered-functions = { - pname = "filtered-functions"; - version = "20160318-git"; - asds = [ "filtered-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/filtered-functions/2016-03-18/filtered-functions-20160318-git.tgz"; - sha256 = "0m13k8pl0gfll8ss83c0z3gax7zrrw2i4s26451jfbka1xr4fgy9"; - system = "filtered-functions"; - asd = "filtered-functions"; - }); - systems = [ "filtered-functions" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - find-port = { - pname = "find-port"; - version = "20190710-git"; - asds = [ "find-port" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/find-port/2019-07-10/find-port-20190710-git.tgz"; - sha256 = "1fw6q7d2bxxb7fqk548ylq8mx4sz95yc0q5h0rwd0mnqjrbwbari"; - system = "find-port"; - asd = "find-port"; - }); - systems = [ "find-port" ]; - lispLibs = [ (getAttr "usocket" pkgs) ]; - }; - find-port-test = { - pname = "find-port-test"; - version = "20190710-git"; - asds = [ "find-port-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/find-port/2019-07-10/find-port-20190710-git.tgz"; - sha256 = "1fw6q7d2bxxb7fqk548ylq8mx4sz95yc0q5h0rwd0mnqjrbwbari"; - system = "find-port-test"; - asd = "find-port-test"; - }); - systems = [ "find-port-test" ]; - lispLibs = [ (getAttr "find-port" pkgs) (getAttr "fiveam" pkgs) ]; - }; - finite-state-machine = { - pname = "finite-state-machine"; - version = "20200218-git"; - asds = [ "finite-state-machine" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-simple-fsm/2020-02-18/cl-simple-fsm-20200218-git.tgz"; - sha256 = "1w07df7kakjq3r1v5c4gnavp08ngpn2ni85cggnnsqzc27hly07b"; - system = "finite-state-machine"; - asd = "finite-state-machine"; - }); - systems = [ "finite-state-machine" ]; - lispLibs = [ ]; - }; - firephp = { - pname = "firephp"; - version = "20160531-git"; - asds = [ "firephp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/firephp/2016-05-31/firephp-20160531-git.tgz"; - sha256 = "1j98z73c21xcjp4f8qvmv37y9zlsnwxx88nnxc3r1ngvxv23dlgh"; - system = "firephp"; - asd = "firephp"; - }); - systems = [ "firephp" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - firephp-tests = { - pname = "firephp-tests"; - version = "20160531-git"; - asds = [ "firephp-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/firephp/2016-05-31/firephp-20160531-git.tgz"; - sha256 = "1j98z73c21xcjp4f8qvmv37y9zlsnwxx88nnxc3r1ngvxv23dlgh"; - system = "firephp-tests"; - asd = "firephp-tests"; - }); - systems = [ "firephp-tests" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "firephp" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - first-time-value = { - pname = "first-time-value"; - version = "1.0.1"; - asds = [ "first-time-value" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/first-time-value/2018-12-10/first-time-value-1.0.1.tgz"; - sha256 = "155mqhnw1307b18a8bv8jhqp20qv83b409mlr61m45nq3sivxxp2"; - system = "first-time-value"; - asd = "first-time-value"; - }); - systems = [ "first-time-value" ]; - lispLibs = [ ]; - }; - first-time-value_tests = { - pname = "first-time-value_tests"; - version = "1.0.1"; - asds = [ "first-time-value_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/first-time-value/2018-12-10/first-time-value-1.0.1.tgz"; - sha256 = "155mqhnw1307b18a8bv8jhqp20qv83b409mlr61m45nq3sivxxp2"; - system = "first-time-value_tests"; - asd = "first-time-value_tests"; - }); - systems = [ "first-time-value_tests" ]; - lispLibs = [ (getAttr "first-time-value" pkgs) (getAttr "parachute" pkgs) ]; - }; - fishpack = { - pname = "fishpack"; - version = "20200925-git"; - asds = [ "fishpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fishpack"; - asd = "fishpack"; - }); - systems = [ "fishpack" ]; - lispLibs = [ (getAttr "f2cl" pkgs) ]; - }; - fishpack_slash_test-hstcrt = { - pname = "fishpack_test-hstcrt"; - version = "20200925-git"; - asds = [ "fishpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fishpack"; - asd = "fishpack"; - }); - systems = [ "fishpack/test-hstcrt" ]; - lispLibs = [ (getAttr "fishpack" pkgs) ]; - meta = { - broken = true; - }; - }; - fishpack_slash_test-hstcsp = { - pname = "fishpack_test-hstcsp"; - version = "20200925-git"; - asds = [ "fishpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fishpack"; - asd = "fishpack"; - }); - systems = [ "fishpack/test-hstcsp" ]; - lispLibs = [ (getAttr "fishpack" pkgs) ]; - meta = { - broken = true; - }; - }; - fishpack_slash_test-hstcyl = { - pname = "fishpack_test-hstcyl"; - version = "20200925-git"; - asds = [ "fishpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fishpack"; - asd = "fishpack"; - }); - systems = [ "fishpack/test-hstcyl" ]; - lispLibs = [ (getAttr "fishpack" pkgs) ]; - meta = { - broken = true; - }; - }; - fishpack_slash_test-hstplr = { - pname = "fishpack_test-hstplr"; - version = "20200925-git"; - asds = [ "fishpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fishpack"; - asd = "fishpack"; - }); - systems = [ "fishpack/test-hstplr" ]; - lispLibs = [ (getAttr "fishpack" pkgs) ]; - meta = { - broken = true; - }; - }; - fishpack_slash_test-hstssp = { - pname = "fishpack_test-hstssp"; - version = "20200925-git"; - asds = [ "fishpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fishpack"; - asd = "fishpack"; - }); - systems = [ "fishpack/test-hstssp" ]; - lispLibs = [ (getAttr "fishpack" pkgs) ]; - meta = { - broken = true; - }; - }; - fishpack_slash_test-hwscrt = { - pname = "fishpack_test-hwscrt"; - version = "20200925-git"; - asds = [ "fishpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fishpack"; - asd = "fishpack"; - }); - systems = [ "fishpack/test-hwscrt" ]; - lispLibs = [ (getAttr "fishpack" pkgs) ]; - meta = { - broken = true; - }; - }; - fishpack_slash_test-hwscsp = { - pname = "fishpack_test-hwscsp"; - version = "20200925-git"; - asds = [ "fishpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fishpack"; - asd = "fishpack"; - }); - systems = [ "fishpack/test-hwscsp" ]; - lispLibs = [ (getAttr "fishpack" pkgs) ]; - meta = { - broken = true; - }; - }; - fishpack_slash_test-hwscyl = { - pname = "fishpack_test-hwscyl"; - version = "20200925-git"; - asds = [ "fishpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fishpack"; - asd = "fishpack"; - }); - systems = [ "fishpack/test-hwscyl" ]; - lispLibs = [ (getAttr "fishpack" pkgs) ]; - meta = { - broken = true; - }; - }; - fishpack_slash_test-hwsplr = { - pname = "fishpack_test-hwsplr"; - version = "20200925-git"; - asds = [ "fishpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fishpack"; - asd = "fishpack"; - }); - systems = [ "fishpack/test-hwsplr" ]; - lispLibs = [ (getAttr "fishpack" pkgs) ]; - meta = { - broken = true; - }; - }; - fishpack_slash_test-hwsssp = { - pname = "fishpack_test-hwsssp"; - version = "20200925-git"; - asds = [ "fishpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fishpack"; - asd = "fishpack"; - }); - systems = [ "fishpack/test-hwsssp" ]; - lispLibs = [ (getAttr "fishpack" pkgs) ]; - meta = { - broken = true; - }; - }; - fishpack_slash_test-sepx4 = { - pname = "fishpack_test-sepx4"; - version = "20200925-git"; - asds = [ "fishpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "fishpack"; - asd = "fishpack"; - }); - systems = [ "fishpack/test-sepx4" ]; - lispLibs = [ (getAttr "fishpack" pkgs) ]; - meta = { - broken = true; - }; - }; - fiveam = { - pname = "fiveam"; - version = "20220331-git"; - asds = [ "fiveam" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fiveam/2022-03-31/fiveam-20220331-git.tgz"; - sha256 = "085kmrafhmhawjri76l5sc2g8xg8v4fn4xsfzbdgv2q5ffzxxd82"; - system = "fiveam"; - asd = "fiveam"; - }); - systems = [ "fiveam" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "net_dot_didierverna_dot_asdf-flv" pkgs) (getAttr "trivial-backtrace" pkgs) ]; - }; - fiveam-asdf = { - pname = "fiveam-asdf"; - version = "20221106-git"; - asds = [ "fiveam-asdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fiveam-asdf/2022-11-06/fiveam-asdf-20221106-git.tgz"; - sha256 = "18dhyznwl56lpp289dwg9xm9qwwv5062yawfaj6h1b2jwybqfrq7"; - system = "fiveam-asdf"; - asd = "fiveam-asdf"; - }); - systems = [ "fiveam-asdf" ]; - lispLibs = [ ]; - }; - fiveam-matchers = { - pname = "fiveam-matchers"; - version = "20221106-git"; - asds = [ "fiveam-matchers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fiveam-matchers/2022-11-06/fiveam-matchers-20221106-git.tgz"; - sha256 = "1l2pzr71y7x7qwwnqxirz567linxzdbjnsdlis2inxbpm1gssdc6"; - system = "fiveam-matchers"; - asd = "fiveam-matchers"; - }); - systems = [ "fiveam-matchers" ]; - lispLibs = [ (getAttr "str" pkgs) (getAttr "fiveam" pkgs) ]; - }; - fiveam-matchers_slash_tests = { - pname = "fiveam-matchers_tests"; - version = "20221106-git"; - asds = [ "fiveam-matchers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fiveam-matchers/2022-11-06/fiveam-matchers-20221106-git.tgz"; - sha256 = "1l2pzr71y7x7qwwnqxirz567linxzdbjnsdlis2inxbpm1gssdc6"; - system = "fiveam-matchers"; - asd = "fiveam-matchers"; - }); - systems = [ "fiveam-matchers/tests" ]; - lispLibs = [ (getAttr "fiveam-matchers" pkgs) ]; - meta = { - broken = true; - }; - }; - fiveam_slash_test = { - pname = "fiveam_test"; - version = "20220331-git"; - asds = [ "fiveam" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fiveam/2022-03-31/fiveam-20220331-git.tgz"; - sha256 = "085kmrafhmhawjri76l5sc2g8xg8v4fn4xsfzbdgv2q5ffzxxd82"; - system = "fiveam"; - asd = "fiveam"; - }); - systems = [ "fiveam/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - fixed = { - pname = "fixed"; - version = "20170124-git"; - asds = [ "fixed" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fixed/2017-01-24/fixed-20170124-git.tgz"; - sha256 = "0bx8802fmlml5k5xhcm4g5r6c7ambij4gb0b37xljjn3wxgs83dc"; - system = "fixed"; - asd = "fixed"; - }); - systems = [ "fixed" ]; - lispLibs = [ ]; - }; - fixed_slash_real-time = { - pname = "fixed_real-time"; - version = "20170124-git"; - asds = [ "fixed" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fixed/2017-01-24/fixed-20170124-git.tgz"; - sha256 = "0bx8802fmlml5k5xhcm4g5r6c7ambij4gb0b37xljjn3wxgs83dc"; - system = "fixed"; - asd = "fixed"; - }); - systems = [ "fixed/real-time" ]; - lispLibs = [ (getAttr "fixed" pkgs) ]; - meta = { - broken = true; - }; - }; - fixed_slash_test = { - pname = "fixed_test"; - version = "20170124-git"; - asds = [ "fixed" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fixed/2017-01-24/fixed-20170124-git.tgz"; - sha256 = "0bx8802fmlml5k5xhcm4g5r6c7ambij4gb0b37xljjn3wxgs83dc"; - system = "fixed"; - asd = "fixed"; - }); - systems = [ "fixed/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "fixed" pkgs) ]; - meta = { - broken = true; - }; - }; - flac = { - pname = "flac"; - version = "20151218-git"; - asds = [ "flac" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; - system = "flac"; - asd = "flac"; - }); - systems = [ "flac" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - flac-metadata = { - pname = "flac-metadata"; - version = "20220707-git"; - asds = [ "flac-metadata" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/flac-metadata/2022-07-07/flac-metadata-20220707-git.tgz"; - sha256 = "1p515ym8rwrz3mybig83z41jrbrviikp3yyqgn9qzzjcrx7x1zsg"; - system = "flac-metadata"; - asd = "flac-metadata"; - }); - systems = [ "flac-metadata" ]; - lispLibs = [ (getAttr "binary-parser" pkgs) (getAttr "mfiano-utils" pkgs) ]; - }; - flare = { - pname = "flare"; - version = "20221106-git"; - asds = [ "flare" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/flare/2022-11-06/flare-20221106-git.tgz"; - sha256 = "12scbnjqkyvaqmawfvih42vxp9nydlqh08nif9glv7nlav6dgvlp"; - system = "flare"; - asd = "flare"; - }); - systems = [ "flare" ]; - lispLibs = [ (getAttr "_3d-vectors" pkgs) (getAttr "array-utils" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "for" pkgs) (getAttr "lambda-fiddle" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - flare-viewer = { - pname = "flare-viewer"; - version = "20221106-git"; - asds = [ "flare-viewer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/flare/2022-11-06/flare-20221106-git.tgz"; - sha256 = "12scbnjqkyvaqmawfvih42vxp9nydlqh08nif9glv7nlav6dgvlp"; - system = "flare-viewer"; - asd = "flare-viewer"; - }); - systems = [ "flare-viewer" ]; - lispLibs = [ (getAttr "cl-opengl" pkgs) (getAttr "flare" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtopengl" pkgs) (getAttr "qtools" pkgs) (getAttr "verbose" pkgs) ]; - }; - flat-tree = { - pname = "flat-tree"; - version = "20190813-git"; - asds = [ "flat-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-flat-tree/2019-08-13/cl-flat-tree-20190813-git.tgz"; - sha256 = "05nw1j0rr0vgz6shkjv87yn2mp0b4s7v5gxxcqcn1qi7fgbn55z7"; - system = "flat-tree"; - asd = "flat-tree"; - }); - systems = [ "flat-tree" ]; - lispLibs = [ ]; - }; - flexi-streams = { - pname = "flexi-streams"; - version = "20220220-git"; - asds = [ "flexi-streams" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/flexi-streams/2022-02-20/flexi-streams-20220220-git.tgz"; - sha256 = "04azqvz11s8dngy49bjl19hrfn0ip1b7m0szm4hlppq364msil7b"; - system = "flexi-streams"; - asd = "flexi-streams"; - }); - systems = [ "flexi-streams" ]; - lispLibs = [ (getAttr "trivial-gray-streams" pkgs) ]; - }; - flexi-streams-test = { - pname = "flexi-streams-test"; - version = "20220220-git"; - asds = [ "flexi-streams-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/flexi-streams/2022-02-20/flexi-streams-20220220-git.tgz"; - sha256 = "04azqvz11s8dngy49bjl19hrfn0ip1b7m0szm4hlppq364msil7b"; - system = "flexi-streams-test"; - asd = "flexi-streams-test"; - }); - systems = [ "flexi-streams-test" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) ]; - }; - flexichain = { - pname = "flexichain"; - version = "20201220-git"; - asds = [ "flexichain" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/flexichain/2020-12-20/flexichain-20201220-git.tgz"; - sha256 = "1ivkffnkc1iqmpl1p1rgyfbbgjmjcid4iszvdql1jjz324lq94g6"; - system = "flexichain"; - asd = "flexichain"; - }); - systems = [ "flexichain" ]; - lispLibs = [ (getAttr "trivial-garbage" pkgs) ]; - }; - flexichain-doc = { - pname = "flexichain-doc"; - version = "20201220-git"; - asds = [ "flexichain-doc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/flexichain/2020-12-20/flexichain-20201220-git.tgz"; - sha256 = "1ivkffnkc1iqmpl1p1rgyfbbgjmjcid4iszvdql1jjz324lq94g6"; - system = "flexichain-doc"; - asd = "flexichain-doc"; - }); - systems = [ "flexichain-doc" ]; - lispLibs = [ ]; - }; - float-features = { - pname = "float-features"; - version = "20221106-git"; - asds = [ "float-features" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/float-features/2022-11-06/float-features-20221106-git.tgz"; - sha256 = "0d1n9zricjqbyxlalwwdsrhrz1cbg1wlhyr66v6rad84gscx1v29"; - system = "float-features"; - asd = "float-features"; - }); - systems = [ "float-features" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - float-features-tests = { - pname = "float-features-tests"; - version = "20221106-git"; - asds = [ "float-features-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/float-features/2022-11-06/float-features-20221106-git.tgz"; - sha256 = "0d1n9zricjqbyxlalwwdsrhrz1cbg1wlhyr66v6rad84gscx1v29"; - system = "float-features-tests"; - asd = "float-features-tests"; - }); - systems = [ "float-features-tests" ]; - lispLibs = [ (getAttr "float-features" pkgs) (getAttr "parachute" pkgs) ]; - }; - floating-point = { - pname = "floating-point"; - version = "20141106-git"; - asds = [ "floating-point" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/floating-point/2014-11-06/floating-point-20141106-git.tgz"; - sha256 = "1bqslmykg04innaqlp369pyjh61isj8xgv2h6pm95gsrxnf6wf7s"; - system = "floating-point"; - asd = "floating-point"; - }); - systems = [ "floating-point" ]; - lispLibs = [ ]; - }; - floating-point-contractions = { - pname = "floating-point-contractions"; - version = "20201220-git"; - asds = [ "floating-point-contractions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/floating-point-contractions/2020-12-20/floating-point-contractions-20201220-git.tgz"; - sha256 = "0mr8bnc7hn0ii0cmlfnlwc14zkgbgdf099x5crrf9cp9wda4p082"; - system = "floating-point-contractions"; - asd = "floating-point-contractions"; - }); - systems = [ "floating-point-contractions" ]; - lispLibs = [ ]; - }; - floating-point-test = { - pname = "floating-point-test"; - version = "20141106-git"; - asds = [ "floating-point-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/floating-point/2014-11-06/floating-point-20141106-git.tgz"; - sha256 = "1bqslmykg04innaqlp369pyjh61isj8xgv2h6pm95gsrxnf6wf7s"; - system = "floating-point-test"; - asd = "floating-point-test"; - }); - systems = [ "floating-point-test" ]; - lispLibs = [ (getAttr "floating-point" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - flow = { - pname = "flow"; - version = "20200610-git"; - asds = [ "flow" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz"; - sha256 = "0ysw1kwiqlf8kzllhnz8v3q40dmvwf83fzq8bfkbmwy5hfjh3pxp"; - system = "flow"; - asd = "flow"; - }); - systems = [ "flow" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "documentation-utils" pkgs) ]; - }; - flow-visualizer = { - pname = "flow-visualizer"; - version = "20200610-git"; - asds = [ "flow-visualizer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz"; - sha256 = "0ysw1kwiqlf8kzllhnz8v3q40dmvwf83fzq8bfkbmwy5hfjh3pxp"; - system = "flow-visualizer"; - asd = "flow-visualizer"; - }); - systems = [ "flow-visualizer" ]; - lispLibs = [ (getAttr "flow" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtools" pkgs) ]; - }; - flute = { - pname = "flute"; - version = "20180831-git"; - asds = [ "flute" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/flute/2018-08-31/flute-20180831-git.tgz"; - sha256 = "0q8jhp040cvpppyn820mm6a550yfxyr1lar298x13c42mm807f4f"; - system = "flute"; - asd = "flute"; - }); - systems = [ "flute" ]; - lispLibs = [ (getAttr "assoc-utils" pkgs) (getAttr "let-over-lambda" pkgs) ]; - }; - flute-test = { - pname = "flute-test"; - version = "20180831-git"; - asds = [ "flute-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/flute/2018-08-31/flute-20180831-git.tgz"; - sha256 = "0q8jhp040cvpppyn820mm6a550yfxyr1lar298x13c42mm807f4f"; - system = "flute-test"; - asd = "flute-test"; - }); - systems = [ "flute-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "flute" pkgs) ]; - }; - fmarshal = { - pname = "fmarshal"; - version = "20130720-git"; - asds = [ "fmarshal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/marshal/2013-07-20/marshal-20130720-git.tgz"; - sha256 = "1c0hcf7i9kzgbmayhmcjg0kv5966yqlimvj67gl4mzvwhbdkc2nf"; - system = "fmarshal"; - asd = "fmarshal"; - }); - systems = [ "fmarshal" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - fmarshal-test = { - pname = "fmarshal-test"; - version = "20130720-git"; - asds = [ "fmarshal-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/marshal/2013-07-20/marshal-20130720-git.tgz"; - sha256 = "1c0hcf7i9kzgbmayhmcjg0kv5966yqlimvj67gl4mzvwhbdkc2nf"; - system = "fmarshal-test"; - asd = "fmarshal-test"; - }); - systems = [ "fmarshal-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "fmarshal" pkgs) ]; - }; - fmt = { - pname = "fmt"; - version = "20220331-git"; - asds = [ "fmt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz"; - sha256 = "078y5yig5fw0jcsjjabaq7dlyxsd10w5k80ywx6gbm0j88al3fzp"; - system = "fmt"; - asd = "fmt"; - }); - systems = [ "fmt" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - fmt-test = { - pname = "fmt-test"; - version = "20220331-git"; - asds = [ "fmt-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz"; - sha256 = "078y5yig5fw0jcsjjabaq7dlyxsd10w5k80ywx6gbm0j88al3fzp"; - system = "fmt-test"; - asd = "fmt-test"; - }); - systems = [ "fmt-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "fmt" pkgs) ]; - }; - fmt-time = { - pname = "fmt-time"; - version = "20220331-git"; - asds = [ "fmt-time" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fmt/2022-03-31/fmt-20220331-git.tgz"; - sha256 = "078y5yig5fw0jcsjjabaq7dlyxsd10w5k80ywx6gbm0j88al3fzp"; - system = "fmt-time"; - asd = "fmt-time"; - }); - systems = [ "fmt-time" ]; - lispLibs = [ (getAttr "fmt" pkgs) (getAttr "local-time" pkgs) ]; - }; - fn = { - pname = "fn"; - version = "20171019-git"; - asds = [ "fn" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fn/2017-10-19/fn-20171019-git.tgz"; - sha256 = "0yyp9z6iwx476whz0n1rpjznjyqqhlylhzwpgg5xx92lxmskl752"; - system = "fn"; - asd = "fn"; - }); - systems = [ "fn" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - fof = { - pname = "fof"; - version = "20211230-git"; - asds = [ "fof" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fof/2021-12-30/fof-20211230-git.tgz"; - sha256 = "0ipy51q2fw03xk9rqcyzbq2b9c32npc1gl3c53rdjywpak7zwwg6"; - system = "fof"; - asd = "fof"; - }); - systems = [ "fof" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "str" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "local-time" pkgs) (getAttr "magicffi" pkgs) (getAttr "named-readtables" pkgs) (getAttr "osicat" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) ]; - }; - fof_slash_mf = { - pname = "fof_mf"; - version = "20211230-git"; - asds = [ "fof" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fof/2021-12-30/fof-20211230-git.tgz"; - sha256 = "0ipy51q2fw03xk9rqcyzbq2b9c32npc1gl3c53rdjywpak7zwwg6"; - system = "fof"; - asd = "fof"; - }); - systems = [ "fof/mf" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - folio = { - pname = "folio"; - version = "20130128-git"; - asds = [ "folio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; - sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64"; - system = "folio"; - asd = "folio"; - }); - systems = [ "folio" ]; - lispLibs = [ (getAttr "folio_dot_as" pkgs) (getAttr "folio_dot_boxes" pkgs) (getAttr "folio_dot_collections" pkgs) (getAttr "folio_dot_functions" pkgs) ]; - }; - folio_dot_as = { - pname = "folio.as"; - version = "20130128-git"; - asds = [ "folio.as" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; - sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64"; - system = "folio.as"; - asd = "folio.as"; - }); - systems = [ "folio.as" ]; - lispLibs = [ ]; - }; - folio_dot_boxes = { - pname = "folio.boxes"; - version = "20130128-git"; - asds = [ "folio.boxes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; - sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64"; - system = "folio.boxes"; - asd = "folio.boxes"; - }); - systems = [ "folio.boxes" ]; - lispLibs = [ ]; - }; - folio_dot_collections = { - pname = "folio.collections"; - version = "20130128-git"; - asds = [ "folio.collections" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; - sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64"; - system = "folio.collections"; - asd = "folio.collections"; - }); - systems = [ "folio.collections" ]; - lispLibs = [ (getAttr "folio_dot_as" pkgs) (getAttr "folio_dot_functions" pkgs) (getAttr "fset" pkgs) ]; - }; - folio_dot_functions = { - pname = "folio.functions"; - version = "20130128-git"; - asds = [ "folio.functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio/2013-01-28/folio-20130128-git.tgz"; - sha256 = "061kryjclnkp60r8vhcpzy9q0k755p1jc1vp4vj13k7piwr1bj64"; - system = "folio.functions"; - asd = "folio.functions"; - }); - systems = [ "folio.functions" ]; - lispLibs = [ ]; - }; - folio2 = { - pname = "folio2"; - version = "20191007-git"; - asds = [ "folio2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2"; - asd = "folio2"; - }); - systems = [ "folio2" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "folio2-as" pkgs) (getAttr "folio2-as-syntax" pkgs) (getAttr "folio2-boxes" pkgs) (getAttr "folio2-functions" pkgs) (getAttr "folio2-functions-syntax" pkgs) (getAttr "folio2-make" pkgs) (getAttr "folio2-maps" pkgs) (getAttr "folio2-maps-syntax" pkgs) (getAttr "folio2-pairs" pkgs) (getAttr "folio2-sequences" pkgs) (getAttr "folio2-sequences-syntax" pkgs) (getAttr "folio2-series" pkgs) (getAttr "folio2-taps" pkgs) (getAttr "fset" pkgs) (getAttr "series" pkgs) ]; - }; - folio2-as = { - pname = "folio2-as"; - version = "20191007-git"; - asds = [ "folio2-as" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-as"; - asd = "folio2-as"; - }); - systems = [ "folio2-as" ]; - lispLibs = [ ]; - }; - folio2-as-syntax = { - pname = "folio2-as-syntax"; - version = "20191007-git"; - asds = [ "folio2-as-syntax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-as-syntax"; - asd = "folio2-as-syntax"; - }); - systems = [ "folio2-as-syntax" ]; - lispLibs = [ (getAttr "folio2-as" pkgs) ]; - }; - folio2-as-tests = { - pname = "folio2-as-tests"; - version = "20191007-git"; - asds = [ "folio2-as-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-as-tests"; - asd = "folio2-as-tests"; - }); - systems = [ "folio2-as-tests" ]; - lispLibs = [ (getAttr "folio2-as" pkgs) (getAttr "folio2-as-syntax" pkgs) (getAttr "lift" pkgs) ]; - }; - folio2-boxes = { - pname = "folio2-boxes"; - version = "20191007-git"; - asds = [ "folio2-boxes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-boxes"; - asd = "folio2-boxes"; - }); - systems = [ "folio2-boxes" ]; - lispLibs = [ (getAttr "folio2-as" pkgs) (getAttr "folio2-make" pkgs) ]; - }; - folio2-boxes-tests = { - pname = "folio2-boxes-tests"; - version = "20191007-git"; - asds = [ "folio2-boxes-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-boxes-tests"; - asd = "folio2-boxes-tests"; - }); - systems = [ "folio2-boxes-tests" ]; - lispLibs = [ (getAttr "folio2-boxes" pkgs) (getAttr "lift" pkgs) ]; - }; - folio2-functions = { - pname = "folio2-functions"; - version = "20191007-git"; - asds = [ "folio2-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-functions"; - asd = "folio2-functions"; - }); - systems = [ "folio2-functions" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "folio2-as" pkgs) (getAttr "folio2-make" pkgs) ]; - }; - folio2-functions-syntax = { - pname = "folio2-functions-syntax"; - version = "20191007-git"; - asds = [ "folio2-functions-syntax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-functions-syntax"; - asd = "folio2-functions-syntax"; - }); - systems = [ "folio2-functions-syntax" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "folio2-functions" pkgs) ]; - }; - folio2-functions-tests = { - pname = "folio2-functions-tests"; - version = "20191007-git"; - asds = [ "folio2-functions-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-functions-tests"; - asd = "folio2-functions-tests"; - }); - systems = [ "folio2-functions-tests" ]; - lispLibs = [ (getAttr "folio2-functions" pkgs) (getAttr "folio2-functions-syntax" pkgs) (getAttr "lift" pkgs) ]; - }; - folio2-make = { - pname = "folio2-make"; - version = "20191007-git"; - asds = [ "folio2-make" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-make"; - asd = "folio2-make"; - }); - systems = [ "folio2-make" ]; - lispLibs = [ ]; - }; - folio2-make-tests = { - pname = "folio2-make-tests"; - version = "20191007-git"; - asds = [ "folio2-make-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-make-tests"; - asd = "folio2-make-tests"; - }); - systems = [ "folio2-make-tests" ]; - lispLibs = [ (getAttr "folio2-make" pkgs) (getAttr "lift" pkgs) ]; - }; - folio2-maps = { - pname = "folio2-maps"; - version = "20191007-git"; - asds = [ "folio2-maps" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-maps"; - asd = "folio2-maps"; - }); - systems = [ "folio2-maps" ]; - lispLibs = [ (getAttr "folio2-as" pkgs) (getAttr "folio2-make" pkgs) (getAttr "fset" pkgs) ]; - }; - folio2-maps-syntax = { - pname = "folio2-maps-syntax"; - version = "20191007-git"; - asds = [ "folio2-maps-syntax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-maps-syntax"; - asd = "folio2-maps-syntax"; - }); - systems = [ "folio2-maps-syntax" ]; - lispLibs = [ (getAttr "folio2-maps" pkgs) ]; - }; - folio2-maps-tests = { - pname = "folio2-maps-tests"; - version = "20191007-git"; - asds = [ "folio2-maps-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-maps-tests"; - asd = "folio2-maps-tests"; - }); - systems = [ "folio2-maps-tests" ]; - lispLibs = [ (getAttr "folio2-maps" pkgs) (getAttr "folio2-maps-syntax" pkgs) (getAttr "lift" pkgs) ]; - }; - folio2-pairs = { - pname = "folio2-pairs"; - version = "20191007-git"; - asds = [ "folio2-pairs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-pairs"; - asd = "folio2-pairs"; - }); - systems = [ "folio2-pairs" ]; - lispLibs = [ (getAttr "folio2-as" pkgs) (getAttr "folio2-make" pkgs) ]; - }; - folio2-pairs-tests = { - pname = "folio2-pairs-tests"; - version = "20191007-git"; - asds = [ "folio2-pairs-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-pairs-tests"; - asd = "folio2-pairs-tests"; - }); - systems = [ "folio2-pairs-tests" ]; - lispLibs = [ (getAttr "folio2-pairs" pkgs) (getAttr "lift" pkgs) ]; - }; - folio2-sequences = { - pname = "folio2-sequences"; - version = "20191007-git"; - asds = [ "folio2-sequences" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-sequences"; - asd = "folio2-sequences"; - }); - systems = [ "folio2-sequences" ]; - lispLibs = [ (getAttr "folio2-as" pkgs) (getAttr "folio2-make" pkgs) (getAttr "folio2-pairs" pkgs) (getAttr "fset" pkgs) (getAttr "series" pkgs) ]; - }; - folio2-sequences-syntax = { - pname = "folio2-sequences-syntax"; - version = "20191007-git"; - asds = [ "folio2-sequences-syntax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-sequences-syntax"; - asd = "folio2-sequences-syntax"; - }); - systems = [ "folio2-sequences-syntax" ]; - lispLibs = [ (getAttr "folio2-sequences" pkgs) ]; - }; - folio2-sequences-tests = { - pname = "folio2-sequences-tests"; - version = "20191007-git"; - asds = [ "folio2-sequences-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-sequences-tests"; - asd = "folio2-sequences-tests"; - }); - systems = [ "folio2-sequences-tests" ]; - lispLibs = [ (getAttr "folio2-sequences" pkgs) (getAttr "folio2-sequences-syntax" pkgs) (getAttr "lift" pkgs) ]; - }; - folio2-series = { - pname = "folio2-series"; - version = "20191007-git"; - asds = [ "folio2-series" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-series"; - asd = "folio2-series"; - }); - systems = [ "folio2-series" ]; - lispLibs = [ (getAttr "folio2-as" pkgs) (getAttr "folio2-make" pkgs) (getAttr "folio2-pairs" pkgs) (getAttr "folio2-sequences" pkgs) (getAttr "fset" pkgs) (getAttr "series" pkgs) ]; - }; - folio2-series-tests = { - pname = "folio2-series-tests"; - version = "20191007-git"; - asds = [ "folio2-series-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-series-tests"; - asd = "folio2-series-tests"; - }); - systems = [ "folio2-series-tests" ]; - lispLibs = [ (getAttr "folio2-series" pkgs) (getAttr "lift" pkgs) ]; - }; - folio2-taps = { - pname = "folio2-taps"; - version = "20191007-git"; - asds = [ "folio2-taps" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-taps"; - asd = "folio2-taps"; - }); - systems = [ "folio2-taps" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "folio2-as" pkgs) (getAttr "folio2-make" pkgs) (getAttr "folio2-maps" pkgs) (getAttr "folio2-pairs" pkgs) (getAttr "folio2-sequences" pkgs) (getAttr "folio2-series" pkgs) (getAttr "fset" pkgs) ]; - }; - folio2-taps-tests = { - pname = "folio2-taps-tests"; - version = "20191007-git"; - asds = [ "folio2-taps-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-taps-tests"; - asd = "folio2-taps-tests"; - }); - systems = [ "folio2-taps-tests" ]; - lispLibs = [ (getAttr "folio2-taps" pkgs) (getAttr "lift" pkgs) ]; - }; - folio2-tests = { - pname = "folio2-tests"; - version = "20191007-git"; - asds = [ "folio2-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/folio2/2019-10-07/folio2-20191007-git.tgz"; - sha256 = "0h214bhbxk229p4pyb6cb85gx6jvhzk2brbzhwhixprznilz6shd"; - system = "folio2-tests"; - asd = "folio2-tests"; - }); - systems = [ "folio2-tests" ]; - lispLibs = [ (getAttr "folio2" pkgs) ]; - }; - font-discovery = { - pname = "font-discovery"; - version = "20221106-git"; - asds = [ "font-discovery" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/font-discovery/2022-11-06/font-discovery-20221106-git.tgz"; - sha256 = "1p9wkwc23rnif8vcjaj5ih1fmr5g57sidqjlz08qw6k0z4f6bia1"; - system = "font-discovery"; - asd = "font-discovery"; - }); - systems = [ "font-discovery" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-indent" pkgs) ]; - }; - foo-wild = { - pname = "foo-wild"; - version = "20210531-git"; - asds = [ "foo-wild" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wild-package-inferred-system/2021-05-31/wild-package-inferred-system-20210531-git.tgz"; - sha256 = "0sp3j3i83aqyq9bl3djs490nilryi9sh1wjbcqd9z94d9wfbfz80"; - system = "foo-wild"; - asd = "foo-wild"; - }); - systems = [ "foo-wild" ]; - lispLibs = [ (getAttr "wild-package-inferred-system" pkgs) ]; - }; - for = { - pname = "for"; - version = "20221106-git"; - asds = [ "for" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/for/2022-11-06/for-20221106-git.tgz"; - sha256 = "1abh18767wivawcqgg8ac2hi8ss57k2fnn2y0y9b5ymk7aqw1c0m"; - system = "for"; - asd = "for"; - }); - systems = [ "for" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "form-fiddle" pkgs) (getAttr "lambda-fiddle" pkgs) ]; - }; - foreign-array = { - pname = "foreign-array"; - version = "master-df14cb8c-git"; - asds = [ "foreign-array" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/antik/2019-10-08/antik-master-df14cb8c-git.tgz"; - sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; - system = "foreign-array"; - asd = "foreign-array"; - }); - systems = [ "foreign-array" ]; - lispLibs = [ (getAttr "antik-base" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "static-vectors" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - fork-future = { - pname = "fork-future"; - version = "20220220-git"; - asds = [ "fork-future" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "fork-future"; - asd = "fork-future"; - }); - systems = [ "fork-future" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-store" pkgs) ]; - }; - form-fiddle = { - pname = "form-fiddle"; - version = "20190710-git"; - asds = [ "form-fiddle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz"; - sha256 = "041iznc9mpfyrl0sv5893ys9pbb2pvbn9g3clarqi7gsfj483jln"; - system = "form-fiddle"; - asd = "form-fiddle"; - }); - systems = [ "form-fiddle" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - format-string-builder = { - pname = "format-string-builder"; - version = "20170124-git"; - asds = [ "format-string-builder" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/format-string-builder/2017-01-24/format-string-builder-20170124-git.tgz"; - sha256 = "1266w5wynfhamxdf8ms2236m202f6982fd9ph8fs98nqccq2pcac"; - system = "format-string-builder"; - asd = "format-string-builder"; - }); - systems = [ "format-string-builder" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "serapeum" pkgs) ]; - }; - formlets = { - pname = "formlets"; - version = "20161204-git"; - asds = [ "formlets" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/formlets/2016-12-04/formlets-20161204-git.tgz"; - sha256 = "0r2afi5lwzxfb8xylx9cs44wqhla4b50k21nzg2dxn7z8m6yspfn"; - system = "formlets"; - asd = "formlets"; - }); - systems = [ "formlets" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-who" pkgs) (getAttr "drakma" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - formlets-test = { - pname = "formlets-test"; - version = "20161204-git"; - asds = [ "formlets-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/formlets/2016-12-04/formlets-20161204-git.tgz"; - sha256 = "0r2afi5lwzxfb8xylx9cs44wqhla4b50k21nzg2dxn7z8m6yspfn"; - system = "formlets-test"; - asd = "formlets-test"; - }); - systems = [ "formlets-test" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-who" pkgs) (getAttr "drakma" pkgs) (getAttr "formlets" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - fprog = { - pname = "fprog"; - version = "20181210-git"; - asds = [ "fprog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cambl/2018-12-10/cambl-20181210-git.tgz"; - sha256 = "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz"; - system = "fprog"; - asd = "fprog"; - }); - systems = [ "fprog" ]; - lispLibs = [ ]; - }; - fps-independent-timestep = { - pname = "fps-independent-timestep"; - version = "20200427-git"; - asds = [ "fps-independent-timestep" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "fps-independent-timestep"; - asd = "fps-independent-timestep"; - }); - systems = [ "fps-independent-timestep" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "local-time" pkgs) ]; - }; - fred = { - pname = "fred"; - version = "20150923-git"; - asds = [ "fred" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fred/2015-09-23/fred-20150923-git.tgz"; - sha256 = "0qn2rd67haz4pvvv4yp2yvbvjhficv8xjm7ijg0r34gxllm6i373"; - system = "fred"; - asd = "fred"; - }); - systems = [ "fred" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "s-xml" pkgs) ]; - }; - freebsd-ffi = { - pname = "freebsd-ffi"; - version = "20220707-git"; - asds = [ "freebsd-ffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/freebsd-ffi/2022-07-07/freebsd-ffi-20220707-git.tgz"; - sha256 = "0mhbkigxmkjn5pdn58pn80d1wv49zd4vq0i59pnj6wir1fnr7mva"; - system = "freebsd-ffi"; - asd = "freebsd-ffi"; - }); - systems = [ "freebsd-ffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "mfiano-utils" pkgs) ]; - }; - freebsd-sysctl = { - pname = "freebsd-sysctl"; - version = "20210228-git"; - asds = [ "freebsd-sysctl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/freebsd-sysctl/2021-02-28/freebsd-sysctl-20210228-git.tgz"; - sha256 = "1gzqiqz0pi273ia2q61bhr908ymbl8cll5v2h8lkicr9pff37g91"; - system = "freebsd-sysctl"; - asd = "freebsd-sysctl"; - }); - systems = [ "freebsd-sysctl" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - freebsd-sysctl_slash_tests = { - pname = "freebsd-sysctl_tests"; - version = "20210228-git"; - asds = [ "freebsd-sysctl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/freebsd-sysctl/2021-02-28/freebsd-sysctl-20210228-git.tgz"; - sha256 = "1gzqiqz0pi273ia2q61bhr908ymbl8cll5v2h8lkicr9pff37g91"; - system = "freebsd-sysctl"; - asd = "freebsd-sysctl"; - }); - systems = [ "freebsd-sysctl/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "freebsd-sysctl" pkgs) ]; - meta = { - broken = true; - }; - }; - freesound = { - pname = "freesound"; - version = "20210411-git"; - asds = [ "freesound" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/freesound/2021-04-11/freesound-20210411-git.tgz"; - sha256 = "1nsmbz7qx9wn86860zlnw75sdgpr8qfzgqfbwxggc3zr7p83kric"; - system = "freesound"; - asd = "freesound"; - }); - systems = [ "freesound" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "dexador" pkgs) (getAttr "trivial-open-browser" pkgs) (getAttr "yason" pkgs) ]; - }; - fresnel = { - pname = "fresnel"; - version = "20220707-git"; - asds = [ "fresnel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fresnel/2022-07-07/fresnel-20220707-git.tgz"; - sha256 = "005bm16x00m409jccjq36xd7319pbwhqvqvk0v2mwpi6znrq4l0c"; - system = "fresnel"; - asd = "fresnel"; - }); - systems = [ "fresnel" ]; - lispLibs = [ (getAttr "gt" pkgs) (getAttr "fare-quasiquote-extras" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) ]; - }; - fresnel_slash_readtable = { - pname = "fresnel_readtable"; - version = "20220707-git"; - asds = [ "fresnel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fresnel/2022-07-07/fresnel-20220707-git.tgz"; - sha256 = "005bm16x00m409jccjq36xd7319pbwhqvqvk0v2mwpi6znrq4l0c"; - system = "fresnel"; - asd = "fresnel"; - }); - systems = [ "fresnel/readtable" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "gt" pkgs) (getAttr "fare-quasiquote-extras" pkgs) ]; - meta = { - broken = true; - }; - }; - froute = { - pname = "froute"; - version = "20180711-git"; - asds = [ "froute" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/froute/2018-07-11/froute-20180711-git.tgz"; - sha256 = "1q7xzgn7g5ky1d8m121r8hskcg4gqpripr791k03y7dz5vkfj14x"; - system = "froute"; - asd = "froute"; - }); - systems = [ "froute" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - froute_slash_hunchentoot = { - pname = "froute_hunchentoot"; - version = "20180711-git"; - asds = [ "froute" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/froute/2018-07-11/froute-20180711-git.tgz"; - sha256 = "1q7xzgn7g5ky1d8m121r8hskcg4gqpripr791k03y7dz5vkfj14x"; - system = "froute"; - asd = "froute"; - }); - systems = [ "froute/hunchentoot" ]; - lispLibs = [ (getAttr "froute" pkgs) (getAttr "hunchentoot" pkgs) ]; - meta = { - broken = true; - }; - }; - froute_slash_test = { - pname = "froute_test"; - version = "20180711-git"; - asds = [ "froute" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/froute/2018-07-11/froute-20180711-git.tgz"; - sha256 = "1q7xzgn7g5ky1d8m121r8hskcg4gqpripr791k03y7dz5vkfj14x"; - system = "froute"; - asd = "froute"; - }); - systems = [ "froute/test" ]; - lispLibs = [ (getAttr "froute" pkgs) (getAttr "lisp-unit" pkgs) ]; - meta = { - broken = true; - }; - }; - frpc = { - pname = "frpc"; - version = "20151031-git"; - asds = [ "frpc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; - sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r"; - system = "frpc"; - asd = "frpc"; - }); - systems = [ "frpc" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "glass" pkgs) (getAttr "nibbles" pkgs) (getAttr "pounds" pkgs) (getAttr "usocket" pkgs) ]; - }; - frpc-des = { - pname = "frpc-des"; - version = "20151031-git"; - asds = [ "frpc-des" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; - sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r"; - system = "frpc-des"; - asd = "frpc"; - }); - systems = [ "frpc-des" ]; - lispLibs = [ (getAttr "frpc" pkgs) (getAttr "ironclad" pkgs) ]; - }; - frpc-gss = { - pname = "frpc-gss"; - version = "20151031-git"; - asds = [ "frpc-gss" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; - sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r"; - system = "frpc-gss"; - asd = "frpc"; - }); - systems = [ "frpc-gss" ]; - lispLibs = [ (getAttr "cerberus" pkgs) (getAttr "frpc" pkgs) ]; - }; - frpcgen = { - pname = "frpcgen"; - version = "20151031-git"; - asds = [ "frpcgen" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/frpc/2015-10-31/frpc-20151031-git.tgz"; - sha256 = "0yac1q79kw1w1qd7zjgg912n780v318n2drzdimlv5n3bwd6pm2r"; - system = "frpcgen"; - asd = "frpcgen"; - }); - systems = [ "frpcgen" ]; - lispLibs = [ (getAttr "cl-lex" pkgs) (getAttr "yacc" pkgs) (getAttr "frpc" pkgs) ]; - }; - fs-watcher = { - pname = "fs-watcher"; - version = "20171130-git"; - asds = [ "fs-watcher" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fs-watcher/2017-11-30/fs-watcher-20171130-git.tgz"; - sha256 = "0fr2wb39609z4afk4w21vwnwi4g050x4gag2ykdx6hn9m65cp9db"; - system = "fs-watcher"; - asd = "fs-watcher"; - }); - systems = [ "fs-watcher" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "com_dot_gigamonkeys_dot_pathnames" pkgs) ]; - }; - fset = { - pname = "fset"; - version = "20200925-git"; - asds = [ "fset" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz"; - sha256 = "15285aacb0dlhvbrkc11yffp5x2zd1jvm77zz7rrpbdwqbafp8sy"; - system = "fset"; - asd = "fset"; - }); - systems = [ "fset" ]; - lispLibs = [ (getAttr "misc-extensions" pkgs) (getAttr "mt19937" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - fset_slash_test = { - pname = "fset_test"; - version = "20200925-git"; - asds = [ "fset" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz"; - sha256 = "15285aacb0dlhvbrkc11yffp5x2zd1jvm77zz7rrpbdwqbafp8sy"; - system = "fset"; - asd = "fset"; - }); - systems = [ "fset/test" ]; - lispLibs = [ (getAttr "fset" pkgs) ]; - meta = { - broken = true; - }; - }; - fsocket = { - pname = "fsocket"; - version = "20211230-git"; - asds = [ "fsocket" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fsocket/2021-12-30/fsocket-20211230-git.tgz"; - sha256 = "18h3s4bv3243xbp0qdywn9kmqvx8zh9cscc9f6sfyxrz6xhymw6p"; - system = "fsocket"; - asd = "fsocket"; - }); - systems = [ "fsocket" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - fsvd = { - pname = "fsvd"; - version = "20131211-git"; - asds = [ "fsvd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fsvd/2013-12-11/fsvd-20131211-git.tgz"; - sha256 = "1m22g9x18ixjh5nylm56l5p67ryx9dbd3g6lyzvwk9nayjmqn7x5"; - system = "fsvd"; - asd = "fsvd"; - }); - systems = [ "fsvd" ]; - lispLibs = [ ]; - }; - ftp = { - pname = "ftp"; - version = "20150608-http"; - asds = [ "ftp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ftp/2015-06-08/cl-ftp-20150608-http.tgz"; - sha256 = "1m955rjpaynybzmb9q631mll764hm06lydvhra50mfjj75ynwsvw"; - system = "ftp"; - asd = "ftp"; - }); - systems = [ "ftp" ]; - lispLibs = [ (getAttr "cl-ftp" pkgs) ]; - }; - fucc-generator = { - pname = "fucc-generator"; - version = "v0.2.2"; - asds = [ "fucc-generator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fucc/2020-04-27/fucc-v0.2.2.tgz"; - sha256 = "10wznxw6yhkyh943xnm694innj13xdlmkx13pr8xwc6zdbdyb32k"; - system = "fucc-generator"; - asd = "fucc-generator"; - }); - systems = [ "fucc-generator" ]; - lispLibs = [ (getAttr "fucc-parser" pkgs) ]; - }; - fucc-parser = { - pname = "fucc-parser"; - version = "v0.2.2"; - asds = [ "fucc-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fucc/2020-04-27/fucc-v0.2.2.tgz"; - sha256 = "10wznxw6yhkyh943xnm694innj13xdlmkx13pr8xwc6zdbdyb32k"; - system = "fucc-parser"; - asd = "fucc-parser"; - }); - systems = [ "fucc-parser" ]; - lispLibs = [ ]; - }; - function-cache = { - pname = "function-cache"; - version = "20181210-git"; - asds = [ "function-cache" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/function-cache/2018-12-10/function-cache-20181210-git.tgz"; - sha256 = "000vmd3f5rx5hs9nvphfric0gkzaadns31c6mxaslpv0k7pkrmc6"; - system = "function-cache"; - asd = "function-cache"; - }); - systems = [ "function-cache" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - function-cache-clsql = { - pname = "function-cache-clsql"; - version = "20181210-git"; - asds = [ "function-cache-clsql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/function-cache/2018-12-10/function-cache-20181210-git.tgz"; - sha256 = "000vmd3f5rx5hs9nvphfric0gkzaadns31c6mxaslpv0k7pkrmc6"; - system = "function-cache-clsql"; - asd = "function-cache-clsql"; - }); - systems = [ "function-cache-clsql" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "clsql-helper" pkgs) (getAttr "function-cache" pkgs) ]; - }; - function-cache_slash_test = { - pname = "function-cache_test"; - version = "20181210-git"; - asds = [ "function-cache" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/function-cache/2018-12-10/function-cache-20181210-git.tgz"; - sha256 = "000vmd3f5rx5hs9nvphfric0gkzaadns31c6mxaslpv0k7pkrmc6"; - system = "function-cache"; - asd = "function-cache"; - }); - systems = [ "function-cache/test" ]; - lispLibs = [ (getAttr "function-cache" pkgs) (getAttr "lisp-unit2" pkgs) ]; - meta = { - broken = true; - }; - }; - functional-geometry = { - pname = "functional-geometry"; - version = "20221106-git"; - asds = [ "functional-geometry" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "functional-geometry"; - asd = "functional-geometry"; - }); - systems = [ "functional-geometry" ]; - lispLibs = [ (getAttr "clim-listener" pkgs) ]; - }; - functional-trees = { - pname = "functional-trees"; - version = "20221106-git"; - asds = [ "functional-trees" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/functional-trees/2022-11-06/functional-trees-20221106-git.tgz"; - sha256 = "1fr3684219i9glgx06qfzqh0lp5y0d9786hv3g18dljhfp21vaqy"; - system = "functional-trees"; - asd = "functional-trees"; - }); - systems = [ "functional-trees" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "asdf-package-system" pkgs) (getAttr "cl-store" pkgs) (getAttr "closer-mop" pkgs) (getAttr "fset" pkgs) (getAttr "iterate" pkgs) (getAttr "serapeum" pkgs) ]; - }; - funds = { - pname = "funds"; - version = "20211020-git"; - asds = [ "funds" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/funds/2021-10-20/funds-20211020-git.tgz"; - sha256 = "13y1jhvnpzrs9daz6f3z67w6h2y21ggb10j3j4vnc5p3m8i7ps4p"; - system = "funds"; - asd = "funds"; - }); - systems = [ "funds" ]; - lispLibs = [ ]; - }; - future = { - pname = "future"; - version = "20220220-git"; - asds = [ "future" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clml/2022-02-20/clml-20220220-git.tgz"; - sha256 = "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"; - system = "future"; - asd = "future"; - }); - systems = [ "future" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - fuzzy-match = { - pname = "fuzzy-match"; - version = "20210124-git"; - asds = [ "fuzzy-match" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fuzzy-match/2021-01-24/fuzzy-match-20210124-git.tgz"; - sha256 = "1lawndmzkl6f9sviy7ngn2s3xkc4akp8l505kvpslaz6qq0ayyqv"; - system = "fuzzy-match"; - asd = "fuzzy-match"; - }); - systems = [ "fuzzy-match" ]; - lispLibs = [ (getAttr "str" pkgs) (getAttr "mk-string-metrics" pkgs) ]; - }; - fxml = { - pname = "fxml"; - version = "20210228-git"; - asds = [ "fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; - system = "fxml"; - asd = "fxml"; - }); - systems = [ "fxml" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "named-readtables" pkgs) (getAttr "quri" pkgs) (getAttr "serapeum" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - fxml_slash_css-selectors = { - pname = "fxml_css-selectors"; - version = "20210228-git"; - asds = [ "fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; - system = "fxml"; - asd = "fxml"; - }); - systems = [ "fxml/css-selectors" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "css-selectors" pkgs) (getAttr "fxml" pkgs) (getAttr "xpath" pkgs) ]; - meta = { - broken = true; - }; - }; - fxml_slash_cxml = { - pname = "fxml_cxml"; - version = "20210228-git"; - asds = [ "fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; - system = "fxml"; - asd = "fxml"; - }); - systems = [ "fxml/cxml" ]; - lispLibs = [ (getAttr "cxml" pkgs) (getAttr "fxml" pkgs) ]; - meta = { - broken = true; - }; - }; - fxml_slash_dom = { - pname = "fxml_dom"; - version = "20210228-git"; - asds = [ "fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; - system = "fxml"; - asd = "fxml"; - }); - systems = [ "fxml/dom" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "named-readtables" pkgs) (getAttr "quri" pkgs) (getAttr "serapeum" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - fxml_slash_html5 = { - pname = "fxml_html5"; - version = "20210228-git"; - asds = [ "fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; - system = "fxml"; - asd = "fxml"; - }); - systems = [ "fxml/html5" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-html5-parser" pkgs) (getAttr "fset" pkgs) (getAttr "fxml" pkgs) (getAttr "xpath" pkgs) (getAttr "quri" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - fxml_slash_klacks = { - pname = "fxml_klacks"; - version = "20210228-git"; - asds = [ "fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; - system = "fxml"; - asd = "fxml"; - }); - systems = [ "fxml/klacks" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "named-readtables" pkgs) (getAttr "quri" pkgs) (getAttr "serapeum" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - fxml_slash_runes = { - pname = "fxml_runes"; - version = "20210228-git"; - asds = [ "fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; - system = "fxml"; - asd = "fxml"; - }); - systems = [ "fxml/runes" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "named-readtables" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - fxml_slash_sanitize = { - pname = "fxml_sanitize"; - version = "20210228-git"; - asds = [ "fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; - system = "fxml"; - asd = "fxml"; - }); - systems = [ "fxml/sanitize" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fxml" pkgs) (getAttr "quri" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - fxml_slash_sanitize_slash_test = { - pname = "fxml_sanitize_test"; - version = "20210228-git"; - asds = [ "fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; - system = "fxml"; - asd = "fxml"; - }); - systems = [ "fxml/sanitize/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-html5-parser" pkgs) (getAttr "fiveam" pkgs) (getAttr "fset" pkgs) (getAttr "fxml" pkgs) (getAttr "xpath" pkgs) (getAttr "quri" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - fxml_slash_stp = { - pname = "fxml_stp"; - version = "20210228-git"; - asds = [ "fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; - system = "fxml"; - asd = "fxml"; - }); - systems = [ "fxml/stp" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fxml" pkgs) (getAttr "xpath" pkgs) ]; - meta = { - broken = true; - }; - }; - fxml_slash_test = { - pname = "fxml_test"; - version = "20210228-git"; - asds = [ "fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; - system = "fxml"; - asd = "fxml"; - }); - systems = [ "fxml/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cxml" pkgs) (getAttr "cxml-rng" pkgs) (getAttr "fiveam" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "fxml" pkgs) (getAttr "named-readtables" pkgs) (getAttr "xpath" pkgs) (getAttr "quri" pkgs) (getAttr "serapeum" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - fxml_slash_xml = { - pname = "fxml_xml"; - version = "20210228-git"; - asds = [ "fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; - system = "fxml"; - asd = "fxml"; - }); - systems = [ "fxml/xml" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "named-readtables" pkgs) (getAttr "quri" pkgs) (getAttr "serapeum" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - fxml_slash_xpath = { - pname = "fxml_xpath"; - version = "20210228-git"; - asds = [ "fxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fxml/2021-02-28/fxml-20210228-git.tgz"; - sha256 = "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm"; - system = "fxml"; - asd = "fxml"; - }); - systems = [ "fxml/xpath" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fxml" pkgs) (getAttr "xpath" pkgs) ]; - meta = { - broken = true; - }; - }; - gadgets = { - pname = "gadgets"; - version = "20220220-git"; - asds = [ "gadgets" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gadgets/2022-02-20/gadgets-20220220-git.tgz"; - sha256 = "0g06wb3dciri2q93x2dcf58x5r8gq2kb86fgd2w4pr5r1wxwd1sm"; - system = "gadgets"; - asd = "gadgets"; - }); - systems = [ "gadgets" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-hash-util" pkgs) (getAttr "cl-utilities" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - }; - garbage-pools = { - pname = "garbage-pools"; - version = "20210124-git"; - asds = [ "garbage-pools" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/garbage-pools/2021-01-24/garbage-pools-20210124-git.tgz"; - sha256 = "04jqwr6j138him6wc4nrwjzm4lvyj5j31xqab02nkf8h9hmsf5v1"; - system = "garbage-pools"; - asd = "garbage-pools"; - }); - systems = [ "garbage-pools" ]; - lispLibs = [ ]; - }; - garbage-pools-test = { - pname = "garbage-pools-test"; - version = "20210124-git"; - asds = [ "garbage-pools-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/garbage-pools/2021-01-24/garbage-pools-20210124-git.tgz"; - sha256 = "04jqwr6j138him6wc4nrwjzm4lvyj5j31xqab02nkf8h9hmsf5v1"; - system = "garbage-pools-test"; - asd = "garbage-pools-test"; - }); - systems = [ "garbage-pools-test" ]; - lispLibs = [ (getAttr "garbage-pools" pkgs) (getAttr "lift" pkgs) ]; - }; - garten = { - pname = "garten"; - version = "20211020-git"; - asds = [ "garten" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; - sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r"; - system = "garten"; - asd = "garten"; - }); - systems = [ "garten" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "serapeum" pkgs) ]; - }; - gcm = { - pname = "gcm"; - version = "20141217-git"; - asds = [ "gcm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gcm/2014-12-17/gcm-20141217-git.tgz"; - sha256 = "1xnm1cj417d9syb634zi9w90c2191gxjrixa724s4h3hvj70y0ff"; - system = "gcm"; - asd = "gcm"; - }); - systems = [ "gcm" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "drakma" pkgs) (getAttr "com_dot_gigamonkeys_dot_json" pkgs) ]; - }; - geco = { - pname = "geco"; - version = "20210228-git"; - asds = [ "geco" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/geco/2021-02-28/geco-20210228-git.tgz"; - sha256 = "1ncaf9ab7jz59zmga0p97blsjjb1m6db0qih57wipfhqdb5ylz17"; - system = "geco"; - asd = "geco"; - }); - systems = [ "geco" ]; - lispLibs = [ ]; - }; - gendl = { - pname = "gendl"; - version = "master-1a957fb2-git"; - asds = [ "gendl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "gendl"; - asd = "gendl"; - }); - systems = [ "gendl" ]; - lispLibs = [ (getAttr "cl-lite" pkgs) (getAttr "geysr" pkgs) (getAttr "gwl-graphics" pkgs) (getAttr "robot" pkgs) (getAttr "yadd" pkgs) ]; - }; - gendl-asdf = { - pname = "gendl-asdf"; - version = "master-1a957fb2-git"; - asds = [ "gendl-asdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "gendl-asdf"; - asd = "gendl-asdf"; - }); - systems = [ "gendl-asdf" ]; - lispLibs = [ ]; - }; - general-accumulator = { - pname = "general-accumulator"; - version = "20211209-git"; - asds = [ "general-accumulator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-general-accumulator/2021-12-09/cl-general-accumulator-20211209-git.tgz"; - sha256 = "14ybsk1ahgya67clspacqij1lvs5bzv07rdq60nhgqsbc6s56j9g"; - system = "general-accumulator"; - asd = "general-accumulator"; - }); - systems = [ "general-accumulator" ]; - lispLibs = [ ]; - }; - generalized-reference = { - pname = "generalized-reference"; - version = "20220707-git"; - asds = [ "generalized-reference" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generalized-reference/2022-07-07/generalized-reference-20220707-git.tgz"; - sha256 = "0q1cm52lijn4p6bjzx2yr2kwy729lcj3f6lsanbnbjw56xgp4cpb"; - system = "generalized-reference"; - asd = "generalized-reference"; - }); - systems = [ "generalized-reference" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "serapeum" pkgs) (getAttr "series" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - generators = { - pname = "generators"; - version = "20130615-git"; - asds = [ "generators" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generators/2013-06-15/generators-20130615-git.tgz"; - sha256 = "1y8jlvv5c3av2ww33rwm2kh9sxmhfykhz235b33fbjpdxpx1r9bs"; - system = "generators"; - asd = "generators"; - }); - systems = [ "generators" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-cont" pkgs) (getAttr "iterate" pkgs) ]; - }; - generic-cl = { - pname = "generic-cl"; - version = "20211020-git"; - asds = [ "generic-cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl"; - asd = "generic-cl"; - }); - systems = [ "generic-cl" ]; - lispLibs = [ (getAttr "agutil" pkgs) (getAttr "generic-cl_dot_arithmetic" pkgs) (getAttr "generic-cl_dot_collector" pkgs) (getAttr "generic-cl_dot_comparison" pkgs) (getAttr "generic-cl_dot_container" pkgs) (getAttr "generic-cl_dot_iterator" pkgs) (getAttr "generic-cl_dot_lazy-seq" pkgs) (getAttr "generic-cl_dot_map" pkgs) (getAttr "generic-cl_dot_math" pkgs) (getAttr "generic-cl_dot_object" pkgs) (getAttr "generic-cl_dot_sequence" pkgs) (getAttr "generic-cl_dot_set" pkgs) ]; - }; - generic-cl_dot_arithmetic = { - pname = "generic-cl.arithmetic"; - version = "20211020-git"; - asds = [ "generic-cl.arithmetic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.arithmetic"; - asd = "generic-cl.arithmetic"; - }); - systems = [ "generic-cl.arithmetic" ]; - lispLibs = [ (getAttr "generic-cl_dot_comparison" pkgs) (getAttr "generic-cl_dot_internal" pkgs) (getAttr "static-dispatch" pkgs) (getAttr "trivia" pkgs) ]; - }; - generic-cl_dot_collector = { - pname = "generic-cl.collector"; - version = "20211020-git"; - asds = [ "generic-cl.collector" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.collector"; - asd = "generic-cl.collector"; - }); - systems = [ "generic-cl.collector" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "arrows" pkgs) (getAttr "generic-cl_dot_iterator" pkgs) (getAttr "generic-cl_dot_object" pkgs) (getAttr "static-dispatch" pkgs) ]; - }; - generic-cl_dot_comparison = { - pname = "generic-cl.comparison"; - version = "20211020-git"; - asds = [ "generic-cl.comparison" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.comparison"; - asd = "generic-cl.comparison"; - }); - systems = [ "generic-cl.comparison" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "generic-cl_dot_internal" pkgs) (getAttr "static-dispatch" pkgs) ]; - }; - generic-cl_dot_container = { - pname = "generic-cl.container"; - version = "20211020-git"; - asds = [ "generic-cl.container" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.container"; - asd = "generic-cl.container"; - }); - systems = [ "generic-cl.container" ]; - lispLibs = [ (getAttr "generic-cl_dot_object" pkgs) (getAttr "static-dispatch" pkgs) ]; - }; - generic-cl_dot_internal = { - pname = "generic-cl.internal"; - version = "20211020-git"; - asds = [ "generic-cl.internal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.internal"; - asd = "generic-cl.internal"; - }); - systems = [ "generic-cl.internal" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-form-types" pkgs) (getAttr "static-dispatch" pkgs) (getAttr "trivia" pkgs) ]; - }; - generic-cl_dot_iterator = { - pname = "generic-cl.iterator"; - version = "20211020-git"; - asds = [ "generic-cl.iterator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.iterator"; - asd = "generic-cl.iterator"; - }); - systems = [ "generic-cl.iterator" ]; - lispLibs = [ (getAttr "agutil" pkgs) (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "arrows" pkgs) (getAttr "cl-form-types" pkgs) (getAttr "generic-cl_dot_container" pkgs) (getAttr "generic-cl_dot_internal" pkgs) (getAttr "generic-cl_dot_object" pkgs) (getAttr "parse-declarations-1_dot_0" pkgs) (getAttr "static-dispatch" pkgs) (getAttr "trivia" pkgs) ]; - }; - generic-cl_dot_lazy-seq = { - pname = "generic-cl.lazy-seq"; - version = "20211020-git"; - asds = [ "generic-cl.lazy-seq" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.lazy-seq"; - asd = "generic-cl.lazy-seq"; - }); - systems = [ "generic-cl.lazy-seq" ]; - lispLibs = [ (getAttr "agutil" pkgs) (getAttr "arrows" pkgs) (getAttr "cl-custom-hash-table" pkgs) (getAttr "generic-cl_dot_collector" pkgs) (getAttr "generic-cl_dot_comparison" pkgs) (getAttr "generic-cl_dot_container" pkgs) (getAttr "generic-cl_dot_iterator" pkgs) (getAttr "generic-cl_dot_map" pkgs) (getAttr "generic-cl_dot_object" pkgs) (getAttr "generic-cl_dot_sequence" pkgs) (getAttr "static-dispatch" pkgs) (getAttr "trivia" pkgs) ]; - }; - generic-cl_dot_map = { - pname = "generic-cl.map"; - version = "20211020-git"; - asds = [ "generic-cl.map" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.map"; - asd = "generic-cl.map"; - }); - systems = [ "generic-cl.map" ]; - lispLibs = [ (getAttr "agutil" pkgs) (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "arrows" pkgs) (getAttr "cl-custom-hash-table" pkgs) (getAttr "generic-cl_dot_collector" pkgs) (getAttr "generic-cl_dot_comparison" pkgs) (getAttr "generic-cl_dot_container" pkgs) (getAttr "generic-cl_dot_internal" pkgs) (getAttr "generic-cl_dot_iterator" pkgs) (getAttr "generic-cl_dot_object" pkgs) (getAttr "static-dispatch" pkgs) (getAttr "trivia" pkgs) ]; - }; - generic-cl_dot_math = { - pname = "generic-cl.math"; - version = "20211020-git"; - asds = [ "generic-cl.math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.math"; - asd = "generic-cl.math"; - }); - systems = [ "generic-cl.math" ]; - lispLibs = [ (getAttr "agutil" pkgs) (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "arrows" pkgs) (getAttr "generic-cl_dot_arithmetic" pkgs) (getAttr "static-dispatch" pkgs) (getAttr "trivia" pkgs) ]; - }; - generic-cl_dot_object = { - pname = "generic-cl.object"; - version = "20211020-git"; - asds = [ "generic-cl.object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.object"; - asd = "generic-cl.object"; - }); - systems = [ "generic-cl.object" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "arrows" pkgs) (getAttr "generic-cl_dot_comparison" pkgs) (getAttr "static-dispatch" pkgs) ]; - }; - generic-cl_dot_sequence = { - pname = "generic-cl.sequence"; - version = "20211020-git"; - asds = [ "generic-cl.sequence" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.sequence"; - asd = "generic-cl.sequence"; - }); - systems = [ "generic-cl.sequence" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "arrows" pkgs) (getAttr "cl-custom-hash-table" pkgs) (getAttr "cl-form-types" pkgs) (getAttr "generic-cl_dot_collector" pkgs) (getAttr "generic-cl_dot_comparison" pkgs) (getAttr "generic-cl_dot_container" pkgs) (getAttr "generic-cl_dot_internal" pkgs) (getAttr "generic-cl_dot_iterator" pkgs) (getAttr "generic-cl_dot_map" pkgs) (getAttr "generic-cl_dot_object" pkgs) (getAttr "static-dispatch" pkgs) ]; - }; - generic-cl_dot_set = { - pname = "generic-cl.set"; - version = "20211020-git"; - asds = [ "generic-cl.set" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.set"; - asd = "generic-cl.set"; - }); - systems = [ "generic-cl.set" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "generic-cl_dot_arithmetic" pkgs) (getAttr "generic-cl_dot_collector" pkgs) (getAttr "generic-cl_dot_comparison" pkgs) (getAttr "generic-cl_dot_container" pkgs) (getAttr "generic-cl_dot_iterator" pkgs) (getAttr "generic-cl_dot_map" pkgs) (getAttr "generic-cl_dot_object" pkgs) (getAttr "generic-cl_dot_sequence" pkgs) (getAttr "static-dispatch" pkgs) ]; - }; - generic-cl_dot_util = { - pname = "generic-cl.util"; - version = "20211020-git"; - asds = [ "generic-cl.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.util"; - asd = "generic-cl.util"; - }); - systems = [ "generic-cl.util" ]; - lispLibs = [ (getAttr "generic-cl" pkgs) ]; - }; - generic-cl_dot_util_slash_test = { - pname = "generic-cl.util_test"; - version = "20211020-git"; - asds = [ "generic-cl.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl.util"; - asd = "generic-cl.util"; - }); - systems = [ "generic-cl.util/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "arrows" pkgs) (getAttr "fiveam" pkgs) (getAttr "generic-cl_dot_util" pkgs) ]; - meta = { - broken = true; - }; - }; - generic-cl_slash_test = { - pname = "generic-cl_test"; - version = "20211020-git"; - asds = [ "generic-cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0glvig5jsyc4735n9sz6adp48lpfcdajhbmgggmxq8pb9j2cab7q"; - system = "generic-cl"; - asd = "generic-cl"; - }); - systems = [ "generic-cl/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "generic-cl" pkgs) ]; - meta = { - broken = true; - }; - }; - generic-comparability = { - pname = "generic-comparability"; - version = "20180131-git"; - asds = [ "generic-comparability" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-comparability/2018-01-31/generic-comparability-20180131-git.tgz"; - sha256 = "01ma0cwirxarwwmdwflnh8kmysmr2smh5kyvzhb2074ljxg8yq2p"; - system = "generic-comparability"; - asd = "generic-comparability"; - }); - systems = [ "generic-comparability" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - generic-comparability-test = { - pname = "generic-comparability-test"; - version = "20180131-git"; - asds = [ "generic-comparability-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-comparability/2018-01-31/generic-comparability-20180131-git.tgz"; - sha256 = "01ma0cwirxarwwmdwflnh8kmysmr2smh5kyvzhb2074ljxg8yq2p"; - system = "generic-comparability-test"; - asd = "generic-comparability"; - }); - systems = [ "generic-comparability-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiveam" pkgs) (getAttr "generic-comparability" pkgs) ]; - }; - generic-sequences = { - pname = "generic-sequences"; - version = "20150709-git"; - asds = [ "generic-sequences" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; - sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3"; - system = "generic-sequences"; - asd = "generic-sequences"; - }); - systems = [ "generic-sequences" ]; - lispLibs = [ ]; - }; - generic-sequences-cont = { - pname = "generic-sequences-cont"; - version = "20150709-git"; - asds = [ "generic-sequences-cont" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; - sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3"; - system = "generic-sequences-cont"; - asd = "generic-sequences-cont"; - }); - systems = [ "generic-sequences-cont" ]; - lispLibs = [ (getAttr "cl-cont" pkgs) (getAttr "generic-sequences" pkgs) ]; - }; - generic-sequences-iterate = { - pname = "generic-sequences-iterate"; - version = "20150709-git"; - asds = [ "generic-sequences-iterate" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; - sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3"; - system = "generic-sequences-iterate"; - asd = "generic-sequences-iterate"; - }); - systems = [ "generic-sequences-iterate" ]; - lispLibs = [ (getAttr "generic-sequences" pkgs) (getAttr "iterate" pkgs) ]; - }; - generic-sequences-stream = { - pname = "generic-sequences-stream"; - version = "20150709-git"; - asds = [ "generic-sequences-stream" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; - sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3"; - system = "generic-sequences-stream"; - asd = "generic-sequences-stream"; - }); - systems = [ "generic-sequences-stream" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "generic-sequences" pkgs) ]; - }; - generic-sequences-test = { - pname = "generic-sequences-test"; - version = "20150709-git"; - asds = [ "generic-sequences-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/generic-sequences/2015-07-09/generic-sequences-20150709-git.tgz"; - sha256 = "09kr0x4kx634rhslal6z2isnbs7v8rn5ic3pvxa3w1mm37lxx7h3"; - system = "generic-sequences-test"; - asd = "generic-sequences-test"; - }); - systems = [ "generic-sequences-test" ]; - lispLibs = [ (getAttr "generic-sequences" pkgs) (getAttr "generic-sequences-cont" pkgs) (getAttr "generic-sequences-iterate" pkgs) (getAttr "generic-sequences-stream" pkgs) ]; - }; - geneva = { - pname = "geneva"; - version = "20161204-git"; - asds = [ "geneva" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; - sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; - system = "geneva"; - asd = "geneva"; - }); - systems = [ "geneva" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - geneva-cl = { - pname = "geneva-cl"; - version = "20161204-git"; - asds = [ "geneva-cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; - sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; - system = "geneva-cl"; - asd = "geneva-cl"; - }); - systems = [ "geneva-cl" ]; - lispLibs = [ (getAttr "geneva" pkgs) (getAttr "geneva-mk2" pkgs) (getAttr "named-readtables" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-documentation" pkgs) ]; - }; - geneva-html = { - pname = "geneva-html"; - version = "20161204-git"; - asds = [ "geneva-html" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; - sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; - system = "geneva-html"; - asd = "geneva-html"; - }); - systems = [ "geneva-html" ]; - lispLibs = [ (getAttr "file-types" pkgs) (getAttr "geneva" pkgs) (getAttr "macro-html" pkgs) ]; - }; - geneva-latex = { - pname = "geneva-latex"; - version = "20161204-git"; - asds = [ "geneva-latex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; - sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; - system = "geneva-latex"; - asd = "geneva-latex"; - }); - systems = [ "geneva-latex" ]; - lispLibs = [ (getAttr "geneva" pkgs) (getAttr "geneva-tex" pkgs) (getAttr "named-readtables" pkgs) (getAttr "texp" pkgs) ]; - }; - geneva-mk2 = { - pname = "geneva-mk2"; - version = "20161204-git"; - asds = [ "geneva-mk2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; - sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; - system = "geneva-mk2"; - asd = "geneva-mk2"; - }); - systems = [ "geneva-mk2" ]; - lispLibs = [ (getAttr "geneva" pkgs) (getAttr "maxpc" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - geneva-plain-text = { - pname = "geneva-plain-text"; - version = "20161204-git"; - asds = [ "geneva-plain-text" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; - sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; - system = "geneva-plain-text"; - asd = "geneva-plain-text"; - }); - systems = [ "geneva-plain-text" ]; - lispLibs = [ (getAttr "geneva" pkgs) (getAttr "geneva-mk2" pkgs) ]; - }; - geneva-tex = { - pname = "geneva-tex"; - version = "20161204-git"; - asds = [ "geneva-tex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; - sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; - system = "geneva-tex"; - asd = "geneva-tex"; - }); - systems = [ "geneva-tex" ]; - lispLibs = [ (getAttr "file-types" pkgs) (getAttr "geneva" pkgs) (getAttr "named-readtables" pkgs) (getAttr "texp" pkgs) ]; - }; - genhash = { - pname = "genhash"; - version = "20181210-git"; - asds = [ "genhash" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/genhash/2018-12-10/genhash-20181210-git.tgz"; - sha256 = "1jnk1fix1zydhy0kn3cvlp6dy0241x7v8ahq001nlr6v152z1cwk"; - system = "genhash"; - asd = "genhash"; - }); - systems = [ "genhash" ]; - lispLibs = [ ]; - }; - geodesic = { - pname = "geodesic"; - version = "20220331-git"; - asds = [ "geodesic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/geodesic/2022-03-31/geodesic-20220331-git.tgz"; - sha256 = "1cmdxy495jipasf142bc6x0w2r75ymkx5x5nlg6j9br3sf6v1x2k"; - system = "geodesic"; - asd = "geodesic"; - }); - systems = [ "geodesic" ]; - lispLibs = [ ]; - }; - geodesic_slash_test = { - pname = "geodesic_test"; - version = "20220331-git"; - asds = [ "geodesic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/geodesic/2022-03-31/geodesic-20220331-git.tgz"; - sha256 = "1cmdxy495jipasf142bc6x0w2r75ymkx5x5nlg6j9br3sf6v1x2k"; - system = "geodesic"; - asd = "geodesic"; - }); - systems = [ "geodesic/test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "geodesic" pkgs) (getAttr "parse-number" pkgs) (getAttr "split-sequence" pkgs) ]; - meta = { - broken = true; - }; - }; - geom-base = { - pname = "geom-base"; - version = "master-1a957fb2-git"; - asds = [ "geom-base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "geom-base"; - asd = "geom-base"; - }); - systems = [ "geom-base" ]; - lispLibs = [ (getAttr "cl-pdf" pkgs) (getAttr "cl-typesetting" pkgs) (getAttr "cl-who" pkgs) (getAttr "base" pkgs) ]; - }; - geowkt = { - pname = "geowkt"; - version = "20200610-git"; - asds = [ "geowkt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/geowkt/2020-06-10/geowkt-20200610-git.tgz"; - sha256 = "02l8cb2k10j7k6fvhk9dpqmkxs6vb5w5nh3159w7drprvjqhfrjw"; - system = "geowkt"; - asd = "geowkt"; - }); - systems = [ "geowkt" ]; - lispLibs = [ ]; - }; - geowkt-update = { - pname = "geowkt-update"; - version = "20200610-git"; - asds = [ "geowkt-update" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/geowkt/2020-06-10/geowkt-20200610-git.tgz"; - sha256 = "02l8cb2k10j7k6fvhk9dpqmkxs6vb5w5nh3159w7drprvjqhfrjw"; - system = "geowkt-update"; - asd = "geowkt-update"; - }); - systems = [ "geowkt-update" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "parse-number" pkgs) ]; - }; - getopt = { - pname = "getopt"; - version = "20150923-git"; - asds = [ "getopt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/getopt/2015-09-23/getopt-20150923-git.tgz"; - sha256 = "1liwzghx2swws84xlxnq756gbass0s916a9sq5mjfnlg3scbwcs3"; - system = "getopt"; - asd = "getopt"; - }); - systems = [ "getopt" ]; - lispLibs = [ ]; - }; - getopt-tests = { - pname = "getopt-tests"; - version = "20150923-git"; - asds = [ "getopt-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/getopt/2015-09-23/getopt-20150923-git.tgz"; - sha256 = "1liwzghx2swws84xlxnq756gbass0s916a9sq5mjfnlg3scbwcs3"; - system = "getopt-tests"; - asd = "getopt"; - }); - systems = [ "getopt-tests" ]; - lispLibs = [ (getAttr "getopt" pkgs) (getAttr "ptester" pkgs) ]; - }; - gettext = { - pname = "gettext"; - version = "20171130-git"; - asds = [ "gettext" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz"; - sha256 = "1pzhamgni6k5hi6bbvlb3dm659pcllrrr3vhhn3rpjn238zxg5ar"; - system = "gettext"; - asd = "gettext"; - }); - systems = [ "gettext" ]; - lispLibs = [ (getAttr "yacc" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - gettext-example = { - pname = "gettext-example"; - version = "20171130-git"; - asds = [ "gettext-example" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz"; - sha256 = "1pzhamgni6k5hi6bbvlb3dm659pcllrrr3vhhn3rpjn238zxg5ar"; - system = "gettext-example"; - asd = "gettext-example"; - }); - systems = [ "gettext-example" ]; - lispLibs = [ (getAttr "gettext" pkgs) ]; - }; - gettext-tests = { - pname = "gettext-tests"; - version = "20171130-git"; - asds = [ "gettext-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz"; - sha256 = "1pzhamgni6k5hi6bbvlb3dm659pcllrrr3vhhn3rpjn238zxg5ar"; - system = "gettext-tests"; - asd = "gettext-tests"; - }); - systems = [ "gettext-tests" ]; - lispLibs = [ (getAttr "gettext" pkgs) (getAttr "stefil" pkgs) ]; - }; - geysr = { - pname = "geysr"; - version = "master-1a957fb2-git"; - asds = [ "geysr" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "geysr"; - asd = "geysr"; - }); - systems = [ "geysr" ]; - lispLibs = [ (getAttr "gendl-asdf" pkgs) (getAttr "gwl-graphics" pkgs) ]; - }; - gfxmath = { - pname = "gfxmath"; - version = "20220707-git"; - asds = [ "gfxmath" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gfxmath/2022-07-07/gfxmath-20220707-git.tgz"; - sha256 = "0qln95n5s9hkng1sv01icjqqwqpg2h635p177xw4j5cvb4bx7x96"; - system = "gfxmath"; - asd = "gfxmath"; - }); - systems = [ "gfxmath" ]; - lispLibs = [ (getAttr "str" pkgs) (getAttr "mfiano-utils" pkgs) ]; - }; - gfxmath_dot_test = { - pname = "gfxmath.test"; - version = "20220707-git"; - asds = [ "gfxmath.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gfxmath/2022-07-07/gfxmath-20220707-git.tgz"; - sha256 = "0qln95n5s9hkng1sv01icjqqwqpg2h635p177xw4j5cvb4bx7x96"; - system = "gfxmath.test"; - asd = "gfxmath.test"; - }); - systems = [ "gfxmath.test" ]; - lispLibs = [ (getAttr "gfxmath" pkgs) (getAttr "mfiano-utils" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - git-file-history = { - pname = "git-file-history"; - version = "20160825-git"; - asds = [ "git-file-history" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/git-file-history/2016-08-25/git-file-history-20160825-git.tgz"; - sha256 = "00kdawcy3mhljv04xpx5n7l2s21qdpbm8i9avjdqbxvfc5j05bq8"; - system = "git-file-history"; - asd = "git-file-history"; - }); - systems = [ "git-file-history" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "legit" pkgs) (getAttr "local-time" pkgs) (getAttr "uiop" pkgs) ]; - }; - git-file-history-test = { - pname = "git-file-history-test"; - version = "20160825-git"; - asds = [ "git-file-history-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/git-file-history/2016-08-25/git-file-history-20160825-git.tgz"; - sha256 = "00kdawcy3mhljv04xpx5n7l2s21qdpbm8i9avjdqbxvfc5j05bq8"; - system = "git-file-history-test"; - asd = "git-file-history-test"; - }); - systems = [ "git-file-history-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "git-file-history" pkgs) ]; - }; - github-api-cl = { - pname = "github-api-cl"; - version = "20221106-git"; - asds = [ "github-api-cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/github-api-cl/2022-11-06/github-api-cl-20221106-git.tgz"; - sha256 = "1f7hgncmi7d5chvlixhigysx68bchdcr2hh54iwlpfk8p3an7gwz"; - system = "github-api-cl"; - asd = "github-api-cl"; - }); - systems = [ "github-api-cl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-base64" pkgs) (getAttr "str" pkgs) (getAttr "clack" pkgs) (getAttr "dexador" pkgs) (getAttr "trivial-features" pkgs) (getAttr "woo" pkgs) (getAttr "yason" pkgs) ]; - }; - github-api-cl_slash_tests = { - pname = "github-api-cl_tests"; - version = "20221106-git"; - asds = [ "github-api-cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/github-api-cl/2022-11-06/github-api-cl-20221106-git.tgz"; - sha256 = "1f7hgncmi7d5chvlixhigysx68bchdcr2hh54iwlpfk8p3an7gwz"; - system = "github-api-cl"; - asd = "github-api-cl"; - }); - systems = [ "github-api-cl/tests" ]; - lispLibs = [ (getAttr "github-api-cl" pkgs) (getAttr "lisp-unit" pkgs) ]; - meta = { - broken = true; - }; - }; - github-gist-api-cl = { - pname = "github-gist-api-cl"; - version = "20221106-git"; - asds = [ "github-gist-api-cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/github-api-cl/2022-11-06/github-api-cl-20221106-git.tgz"; - sha256 = "1f7hgncmi7d5chvlixhigysx68bchdcr2hh54iwlpfk8p3an7gwz"; - system = "github-gist-api-cl"; - asd = "github-gist-api-cl"; - }); - systems = [ "github-gist-api-cl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-base64" pkgs) (getAttr "str" pkgs) (getAttr "clack" pkgs) (getAttr "dexador" pkgs) (getAttr "github-api-cl" pkgs) (getAttr "trivial-features" pkgs) (getAttr "woo" pkgs) (getAttr "yason" pkgs) ]; - }; - glacier = { - pname = "glacier"; - version = "20211209-git"; - asds = [ "glacier" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glacier/2021-12-09/glacier-20211209-git.tgz"; - sha256 = "05x7sl5ybfqss18zxml1gzj0iynyf09xsxikm84i21nh39vqyx38"; - system = "glacier"; - asd = "glacier"; - }); - systems = [ "glacier" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "str" pkgs) (getAttr "dexador" pkgs) (getAttr "simple-config" pkgs) (getAttr "tooter" pkgs) (getAttr "websocket-driver" pkgs) ]; - }; - glad-blob = { - pname = "glad-blob"; - version = "stable-git"; - asds = [ "glad-blob" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glad-blob/2020-10-16/glad-blob-stable-git.tgz"; - sha256 = "19vp7nyf4kxhczi8i2w47lvipk1i4psrxlpk4nvbdh97vc12k5a7"; - system = "glad-blob"; - asd = "glad-blob"; - }); - systems = [ "glad-blob" ]; - lispLibs = [ (getAttr "bodge-blobs-support" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - glass = { - pname = "glass"; - version = "20150709-git"; - asds = [ "glass" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glass/2015-07-09/glass-20150709-git.tgz"; - sha256 = "1xwr6mj25m0z1qhp30hafbbhrfj34dfidy320x5m3lij13vbyb1p"; - system = "glass"; - asd = "glass"; - }); - systems = [ "glass" ]; - lispLibs = [ ]; - }; - glaw = { - pname = "glaw"; - version = "20180228-git"; - asds = [ "glaw" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz"; - sha256 = "06i9g80hkqgwk5h306wkdpcpv7n229n1ig1hy6697l35v8c4mzmp"; - system = "glaw"; - asd = "glaw"; - }); - systems = [ "glaw" ]; - lispLibs = [ (getAttr "cl-alc" pkgs) (getAttr "cl-openal" pkgs) (getAttr "cl-opengl" pkgs) ]; - }; - glaw-examples = { - pname = "glaw-examples"; - version = "20180228-git"; - asds = [ "glaw-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz"; - sha256 = "06i9g80hkqgwk5h306wkdpcpv7n229n1ig1hy6697l35v8c4mzmp"; - system = "glaw-examples"; - asd = "glaw-examples"; - }); - systems = [ "glaw-examples" ]; - lispLibs = [ (getAttr "glaw" pkgs) (getAttr "glaw-imago" pkgs) (getAttr "glop" pkgs) ]; - }; - glaw-imago = { - pname = "glaw-imago"; - version = "20180228-git"; - asds = [ "glaw-imago" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz"; - sha256 = "06i9g80hkqgwk5h306wkdpcpv7n229n1ig1hy6697l35v8c4mzmp"; - system = "glaw-imago"; - asd = "glaw-imago"; - }); - systems = [ "glaw-imago" ]; - lispLibs = [ (getAttr "glaw" pkgs) (getAttr "imago" pkgs) ]; - }; - glaw-sdl = { - pname = "glaw-sdl"; - version = "20180228-git"; - asds = [ "glaw-sdl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glaw/2018-02-28/glaw-20180228-git.tgz"; - sha256 = "06i9g80hkqgwk5h306wkdpcpv7n229n1ig1hy6697l35v8c4mzmp"; - system = "glaw-sdl"; - asd = "glaw-sdl"; - }); - systems = [ "glaw-sdl" ]; - lispLibs = [ (getAttr "glaw" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-image" pkgs) ]; - }; - glfw-blob = { - pname = "glfw-blob"; - version = "stable-git"; - asds = [ "glfw-blob" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glfw-blob/2020-10-16/glfw-blob-stable-git.tgz"; - sha256 = "0j953vqsyswipgyhc39swsgwgaqb53wvs80izraknlsp379hzabs"; - system = "glfw-blob"; - asd = "glfw-blob"; - }); - systems = [ "glfw-blob" ]; - lispLibs = [ (getAttr "bodge-blobs-support" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - glhelp = { - pname = "glhelp"; - version = "20200427-git"; - asds = [ "glhelp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "glhelp"; - asd = "glhelp"; - }); - systems = [ "glhelp" ]; - lispLibs = [ (getAttr "cl-opengl" pkgs) (getAttr "glsl-toolkit" pkgs) (getAttr "split-sequence" pkgs) (getAttr "deflazy" pkgs) (getAttr "uncommon-lisp" pkgs) ]; - }; - glisp = { - pname = "glisp"; - version = "master-1a957fb2-git"; - asds = [ "glisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "glisp"; - asd = "glisp"; - }); - systems = [ "glisp" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "base" pkgs) (getAttr "uiop" pkgs) ]; - }; - glisph = { - pname = "glisph"; - version = "20170403-git"; - asds = [ "glisph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glisph/2017-04-03/glisph-20170403-git.tgz"; - sha256 = "097d6kjk4rndpqn181k9nyr2bps4gf3shq5x2fy1swvks3pvys91"; - system = "glisph"; - asd = "glisph"; - }); - systems = [ "glisph" ]; - lispLibs = [ (getAttr "cl-annot" pkgs) (getAttr "cl-glu" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "cl-reexport" pkgs) (getAttr "zpb-ttf" pkgs) ]; - }; - glisph-test = { - pname = "glisph-test"; - version = "20170403-git"; - asds = [ "glisph-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glisph/2017-04-03/glisph-20170403-git.tgz"; - sha256 = "097d6kjk4rndpqn181k9nyr2bps4gf3shq5x2fy1swvks3pvys91"; - system = "glisph-test"; - asd = "glisph-test"; - }); - systems = [ "glisph-test" ]; - lispLibs = [ (getAttr "cl-glut" pkgs) (getAttr "glisph" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - glkit = { - pname = "glkit"; - version = "20201016-git"; - asds = [ "glkit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glkit/2020-10-16/glkit-20201016-git.tgz"; - sha256 = "1x3y5jcr1f0v9sgn3y5b7b8fhgd6vv37nz73016gdwh511idi8jn"; - system = "glkit"; - asd = "glkit"; - }); - systems = [ "glkit" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "defpackage-plus" pkgs) (getAttr "mathkit" pkgs) (getAttr "static-vectors" pkgs) ]; - }; - glkit-examples = { - pname = "glkit-examples"; - version = "20201016-git"; - asds = [ "glkit-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glkit/2020-10-16/glkit-20201016-git.tgz"; - sha256 = "1x3y5jcr1f0v9sgn3y5b7b8fhgd6vv37nz73016gdwh511idi8jn"; - system = "glkit-examples"; - asd = "glkit-examples"; - }); - systems = [ "glkit-examples" ]; - lispLibs = [ (getAttr "glkit" pkgs) (getAttr "sdl2kit-examples" pkgs) ]; - }; - global-vars = { - pname = "global-vars"; - version = "20141106-git"; - asds = [ "global-vars" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz"; - sha256 = "06m3xc8l3pgsapl8fvsi9wf6y46zs75cp9zn7zh6dc65v4s5wz3d"; - system = "global-vars"; - asd = "global-vars"; - }); - systems = [ "global-vars" ]; - lispLibs = [ ]; - }; - global-vars-test = { - pname = "global-vars-test"; - version = "20141106-git"; - asds = [ "global-vars-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz"; - sha256 = "06m3xc8l3pgsapl8fvsi9wf6y46zs75cp9zn7zh6dc65v4s5wz3d"; - system = "global-vars-test"; - asd = "global-vars-test"; - }); - systems = [ "global-vars-test" ]; - lispLibs = [ (getAttr "global-vars" pkgs) ]; - }; - glop = { - pname = "glop"; - version = "20171019-git"; - asds = [ "glop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glop/2017-10-19/glop-20171019-git.tgz"; - sha256 = "1nm35kvigflfjlmsa8zwdajc61f02fh4sq08jv0wnqylhx8yg2bv"; - system = "glop"; - asd = "glop"; - }); - systems = [ "glop" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - glop-test = { - pname = "glop-test"; - version = "20171019-git"; - asds = [ "glop-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glop/2017-10-19/glop-20171019-git.tgz"; - sha256 = "1nm35kvigflfjlmsa8zwdajc61f02fh4sq08jv0wnqylhx8yg2bv"; - system = "glop-test"; - asd = "glop-test"; - }); - systems = [ "glop-test" ]; - lispLibs = [ (getAttr "cl-glu" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "glop" pkgs) ]; - }; - glsl-docs = { - pname = "glsl-docs"; - version = "release-quicklisp-f04476f7-git"; - asds = [ "glsl-docs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; - sha256 = "01ipspr22fgfj3w8wq2y81lzrjc4vpfiwnr3dqhjlpzzra46am8c"; - system = "glsl-docs"; - asd = "glsl-docs"; - }); - systems = [ "glsl-docs" ]; - lispLibs = [ (getAttr "glsl-symbols" pkgs) ]; - }; - glsl-metadata = { - pname = "glsl-metadata"; - version = "20220707-git"; - asds = [ "glsl-metadata" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glsl-metadata/2022-07-07/glsl-metadata-20220707-git.tgz"; - sha256 = "1d60x2j889xfg83hwni745p9i3m7ikrgl7l2z17x7y753ky344p2"; - system = "glsl-metadata"; - asd = "glsl-metadata"; - }); - systems = [ "glsl-metadata" ]; - lispLibs = [ ]; - }; - glsl-packing = { - pname = "glsl-packing"; - version = "20180131-git"; - asds = [ "glsl-packing" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glsl-packing/2018-01-31/glsl-packing-20180131-git.tgz"; - sha256 = "0k2f1771wd9kdrcasldy1r00k5bdgi9fd07in52zmjggc0i7dd80"; - system = "glsl-packing"; - asd = "glsl-packing"; - }); - systems = [ "glsl-packing" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - glsl-spec = { - pname = "glsl-spec"; - version = "release-quicklisp-f04476f7-git"; - asds = [ "glsl-spec" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; - sha256 = "01ipspr22fgfj3w8wq2y81lzrjc4vpfiwnr3dqhjlpzzra46am8c"; - system = "glsl-spec"; - asd = "glsl-spec"; - }); - systems = [ "glsl-spec" ]; - lispLibs = [ ]; - }; - glsl-symbols = { - pname = "glsl-symbols"; - version = "release-quicklisp-f04476f7-git"; - asds = [ "glsl-symbols" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; - sha256 = "01ipspr22fgfj3w8wq2y81lzrjc4vpfiwnr3dqhjlpzzra46am8c"; - system = "glsl-symbols"; - asd = "glsl-symbols"; - }); - systems = [ "glsl-symbols" ]; - lispLibs = [ ]; - }; - glsl-toolkit = { - pname = "glsl-toolkit"; - version = "20220707-git"; - asds = [ "glsl-toolkit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glsl-toolkit/2022-07-07/glsl-toolkit-20220707-git.tgz"; - sha256 = "0vrk8nqijqdi1rwf85rhd93yj7q8qkxnigxn3bw0cbrzvzrks9rl"; - system = "glsl-toolkit"; - asd = "glsl-toolkit"; - }); - systems = [ "glsl-toolkit" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "parse-float" pkgs) (getAttr "trivial-indent" pkgs) ]; - }; - glu-tessellate = { - pname = "glu-tessellate"; - version = "20150608-git"; - asds = [ "glu-tessellate" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glu-tessellate/2015-06-08/glu-tessellate-20150608-git.tgz"; - sha256 = "1iwnvk341pidxdsjb2c730k6a7nr1knd5ir0v83y6jhsf78r9krh"; - system = "glu-tessellate"; - asd = "glu-tessellate"; - }); - systems = [ "glu-tessellate" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - glyphs = { - pname = "glyphs"; - version = "20180711-git"; - asds = [ "glyphs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glyphs/2018-07-11/glyphs-20180711-git.tgz"; - sha256 = "17kai1anbkk5dj5sbrsin2fc019cmcbglb900db60v38myj0y0wf"; - system = "glyphs"; - asd = "glyphs"; - }); - systems = [ "glyphs" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "named-readtables" pkgs) (getAttr "parenscript" pkgs) ]; - }; - glyphs-test = { - pname = "glyphs-test"; - version = "20180711-git"; - asds = [ "glyphs-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/glyphs/2018-07-11/glyphs-20180711-git.tgz"; - sha256 = "17kai1anbkk5dj5sbrsin2fc019cmcbglb900db60v38myj0y0wf"; - system = "glyphs-test"; - asd = "glyphs-test"; - }); - systems = [ "glyphs-test" ]; - lispLibs = [ (getAttr "glyphs" pkgs) (getAttr "stefil" pkgs) ]; - }; - gooptest = { - pname = "gooptest"; - version = "20200925-git"; - asds = [ "gooptest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gooptest/2020-09-25/gooptest-20200925-git.tgz"; - sha256 = "1g9q4frlc79xkmz74ybs954rc5kmfwjsn4xi64aig1fh5wjni5xs"; - system = "gooptest"; - asd = "gooptest"; - }); - systems = [ "gooptest" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-autowrap" pkgs) (getAttr "cl-plus-c" pkgs) (getAttr "uiop" pkgs) ]; - }; - gooptest_slash_examples = { - pname = "gooptest_examples"; - version = "20200925-git"; - asds = [ "gooptest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gooptest/2020-09-25/gooptest-20200925-git.tgz"; - sha256 = "1g9q4frlc79xkmz74ybs954rc5kmfwjsn4xi64aig1fh5wjni5xs"; - system = "gooptest"; - asd = "gooptest"; - }); - systems = [ "gooptest/examples" ]; - lispLibs = [ (getAttr "gooptest" pkgs) ]; - meta = { - broken = true; - }; - }; - graph = { - pname = "graph"; - version = "20220331-git"; - asds = [ "graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/graph/2022-03-31/graph-20220331-git.tgz"; - sha256 = "0m76vb0mk7rlbv9xhnix001gxik9f7vy9lspradcvzbk1rfxyyf7"; - system = "graph"; - asd = "graph"; - }); - systems = [ "graph" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "asdf-package-system" pkgs) (getAttr "curry-compose-reader-macros" pkgs) (getAttr "damn-fast-priority-queue" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - graphs = { - pname = "graphs"; - version = "master-1a957fb2-git"; - asds = [ "graphs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "graphs"; - asd = "graphs"; - }); - systems = [ "graphs" ]; - lispLibs = [ (getAttr "gwl-graphics" pkgs) ]; - }; - gravatar = { - pname = "gravatar"; - version = "20110320-git"; - asds = [ "gravatar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gravatar/2011-03-20/cl-gravatar-20110320-git.tgz"; - sha256 = "1r9fq1zaywlhpxr3s3wgajhxf1kgwsgsql0a7ccfgsbwkgy2qzfs"; - system = "gravatar"; - asd = "gravatar"; - }); - systems = [ "gravatar" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-json" pkgs) (getAttr "drakma" pkgs) (getAttr "md5" pkgs) (getAttr "puri" pkgs) ]; - }; - graylex = { - pname = "graylex"; - version = "20110522-git"; - asds = [ "graylex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/graylex/2011-05-22/graylex-20110522-git.tgz"; - sha256 = "0s1mpz6cpx3fywznxc8kzkhbb4fpmzyjpfgc85lnxqmri8wy6xqy"; - system = "graylex"; - asd = "graylex"; - }); - systems = [ "graylex" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - graylex-m4-example = { - pname = "graylex-m4-example"; - version = "20110522-git"; - asds = [ "graylex-m4-example" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/graylex/2011-05-22/graylex-20110522-git.tgz"; - sha256 = "0s1mpz6cpx3fywznxc8kzkhbb4fpmzyjpfgc85lnxqmri8wy6xqy"; - system = "graylex-m4-example"; - asd = "graylex-m4-example"; - }); - systems = [ "graylex-m4-example" ]; - lispLibs = [ (getAttr "cl-heredoc" pkgs) (getAttr "graylex" pkgs) ]; - }; - graylog = { - pname = "graylog"; - version = "20180430-git"; - asds = [ "graylog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-graylog/2018-04-30/cl-graylog-20180430-git.tgz"; - sha256 = "1bj1v6vwz8w78h0bkjv5614gq50jdpjix88rbn3nvh81cfjvsqdg"; - system = "graylog"; - asd = "graylog"; - }); - systems = [ "graylog" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-json" pkgs) (getAttr "local-time" pkgs) (getAttr "salza2" pkgs) (getAttr "trivial-backtrace" pkgs) (getAttr "usocket" pkgs) ]; - }; - graylog-log5 = { - pname = "graylog-log5"; - version = "20180430-git"; - asds = [ "graylog-log5" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-graylog/2018-04-30/cl-graylog-20180430-git.tgz"; - sha256 = "1bj1v6vwz8w78h0bkjv5614gq50jdpjix88rbn3nvh81cfjvsqdg"; - system = "graylog-log5"; - asd = "graylog-log5"; - }); - systems = [ "graylog-log5" ]; - lispLibs = [ (getAttr "graylog" pkgs) (getAttr "log5" pkgs) ]; - }; - green-threads = { - pname = "green-threads"; - version = "20141217-git"; - asds = [ "green-threads" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/green-threads/2014-12-17/green-threads-20141217-git.tgz"; - sha256 = "1czw7nr0dwfps76h8hjvglk1wdh53yqbfbvv30whwbgqx33iippz"; - system = "green-threads"; - asd = "green-threads"; - }); - systems = [ "green-threads" ]; - lispLibs = [ (getAttr "cl-async-future" pkgs) (getAttr "cl-cont" pkgs) ]; - }; - grid-formation = { - pname = "grid-formation"; - version = "20220707-git"; - asds = [ "grid-formation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/grid-formation/2022-07-07/grid-formation-20220707-git.tgz"; - sha256 = "0s5picmkn7gn98k23axadbc0mlzlrbadi1ln85gpqp17k3cmd54m"; - system = "grid-formation"; - asd = "grid-formation"; - }); - systems = [ "grid-formation" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) (getAttr "origin" pkgs) ]; - }; - group-by = { - pname = "group-by"; - version = "20140211-git"; - asds = [ "group-by" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/group-by/2014-02-11/group-by-20140211-git.tgz"; - sha256 = "1p1qprb57fjd6sj8ws6c7y40ab38mym65wni8xivdy89i3d63dz4"; - system = "group-by"; - asd = "group-by"; - }); - systems = [ "group-by" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) ]; - }; - group-by-test = { - pname = "group-by-test"; - version = "20140211-git"; - asds = [ "group-by-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/group-by/2014-02-11/group-by-20140211-git.tgz"; - sha256 = "1p1qprb57fjd6sj8ws6c7y40ab38mym65wni8xivdy89i3d63dz4"; - system = "group-by-test"; - asd = "group-by"; - }); - systems = [ "group-by-test" ]; - lispLibs = [ (getAttr "group-by" pkgs) (getAttr "lisp-unit2" pkgs) ]; - }; - groupby = { - pname = "groupby"; - version = "20170830-git"; - asds = [ "groupby" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-groupby/2017-08-30/cl-groupby-20170830-git.tgz"; - sha256 = "1ra4zi9ifrhxxsj4svg1iqqzzsv9aqqa76pswygp7g084x6kn5km"; - system = "groupby"; - asd = "groupby"; - }); - systems = [ "groupby" ]; - lispLibs = [ ]; - }; - grovel-locally = { - pname = "grovel-locally"; - version = "20180228-git"; - asds = [ "grovel-locally" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/grovel-locally/2018-02-28/grovel-locally-20180228-git.tgz"; - sha256 = "07q7zjgv3d1f35zwxpzcz020z0gcqi6m2l2szw99bsqk5hn93szl"; - system = "grovel-locally"; - asd = "grovel-locally"; - }); - systems = [ "grovel-locally" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "with-cached-reader-conditionals" pkgs) ]; - }; - gsll = { - pname = "gsll"; - version = "quicklisp-eeeda841-git"; - asds = [ "gsll" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gsll/2018-08-31/gsll-quicklisp-eeeda841-git.tgz"; - sha256 = "0zsjvi1f62hjgfjk4wqg13d4r53bli9nglkwnd31qrygn8pmzlhi"; - system = "gsll"; - asd = "gsll"; - }); - systems = [ "gsll" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "foreign-array" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - gt = { - pname = "gt"; - version = "20221106-git"; - asds = [ "gt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-utils/2022-11-06/cl-utils-20221106-git.tgz"; - sha256 = "1znzwnapsjl3fijwyrp7gd8q2wbdgvqyx3fad5sqawkgz4qnlq1n"; - system = "gt"; - asd = "gt"; - }); - systems = [ "gt" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "asdf-package-system" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "curry-compose-reader-macros" pkgs) (getAttr "fset" pkgs) (getAttr "functional-trees" pkgs) (getAttr "iterate" pkgs) (getAttr "misc-extensions" pkgs) (getAttr "named-readtables" pkgs) (getAttr "serapeum" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivia" pkgs) (getAttr "trivia_dot_ppcre" pkgs) ]; - }; - gtirb = { - pname = "gtirb"; - version = "quicklisp-dd18337d-git"; - asds = [ "gtirb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz"; - sha256 = "0dpchsshnlh3jb9rg1zdf63mr5l33vhjdxgxx2vqg0nh1sh41zn1"; - system = "gtirb"; - asd = "gtirb"; - }); - systems = [ "gtirb" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "asdf-package-system" pkgs) (getAttr "cl-intbytes" pkgs) (getAttr "cl-interval" pkgs) (getAttr "curry-compose-reader-macros" pkgs) (getAttr "graph" pkgs) (getAttr "proto" pkgs) (getAttr "named-readtables" pkgs) (getAttr "protobuf" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - gtirb-capstone = { - pname = "gtirb-capstone"; - version = "20221106-git"; - asds = [ "gtirb-capstone" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gtirb-capstone/2022-11-06/gtirb-capstone-20221106-git.tgz"; - sha256 = "15h1x74f7w1b4634cab958vanqx4z3lgpi5fvmcpjdp945iv2ybc"; - system = "gtirb-capstone"; - asd = "gtirb-capstone"; - }); - systems = [ "gtirb-capstone" ]; - lispLibs = [ (getAttr "asdf-package-system" pkgs) (getAttr "capstone" pkgs) (getAttr "gt" pkgs) (getAttr "graph" pkgs) (getAttr "gtirb" pkgs) (getAttr "keystone" pkgs) (getAttr "stefil" pkgs) ]; - }; - gtirb-functions = { - pname = "gtirb-functions"; - version = "20221106-git"; - asds = [ "gtirb-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gtirb-functions/2022-11-06/gtirb-functions-20221106-git.tgz"; - sha256 = "1wf4i4c687krh3b1p14y3v6k8356b0m7a4dng7309vbs2kagw5ri"; - system = "gtirb-functions"; - asd = "gtirb-functions"; - }); - systems = [ "gtirb-functions" ]; - lispLibs = [ (getAttr "asdf-package-system" pkgs) (getAttr "gt" pkgs) (getAttr "graph" pkgs) (getAttr "gtirb" pkgs) (getAttr "stefil" pkgs) ]; - }; - gtirb_slash_run-dot = { - pname = "gtirb_run-dot"; - version = "quicklisp-dd18337d-git"; - asds = [ "gtirb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz"; - sha256 = "0dpchsshnlh3jb9rg1zdf63mr5l33vhjdxgxx2vqg0nh1sh41zn1"; - system = "gtirb"; - asd = "gtirb"; - }); - systems = [ "gtirb/run-dot" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - gtirb_slash_run-update = { - pname = "gtirb_run-update"; - version = "quicklisp-dd18337d-git"; - asds = [ "gtirb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz"; - sha256 = "0dpchsshnlh3jb9rg1zdf63mr5l33vhjdxgxx2vqg0nh1sh41zn1"; - system = "gtirb"; - asd = "gtirb"; - }); - systems = [ "gtirb/run-update" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - gtk-tagged-streams = { - pname = "gtk-tagged-streams"; - version = "quicklisp-d1c2b827-git"; - asds = [ "gtk-tagged-streams" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gtk-tagged-streams/2018-02-28/gtk-tagged-streams-quicklisp-d1c2b827-git.tgz"; - sha256 = "0ciw4ydcb8clsqb338hxpzncj2m59i6scnqlgbwkznm5i9dxvkyd"; - system = "gtk-tagged-streams"; - asd = "gtk-tagged-streams"; - }); - systems = [ "gtk-tagged-streams" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-cffi-gtk" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - gtwiwtg = { - pname = "gtwiwtg"; - version = "20221106-git"; - asds = [ "gtwiwtg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gtwiwtg/2022-11-06/gtwiwtg-20221106-git.tgz"; - sha256 = "07wzaizp9jr6x8yvivk3iak2q7yh1ps0mj5mrd6i7y2f614gl8ll"; - system = "gtwiwtg"; - asd = "gtwiwtg"; - }); - systems = [ "gtwiwtg" ]; - lispLibs = [ (getAttr "testiere" pkgs) ]; - }; - gtwiwtg-test = { - pname = "gtwiwtg-test"; - version = "20221106-git"; - asds = [ "gtwiwtg-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gtwiwtg/2022-11-06/gtwiwtg-20221106-git.tgz"; - sha256 = "07wzaizp9jr6x8yvivk3iak2q7yh1ps0mj5mrd6i7y2f614gl8ll"; - system = "gtwiwtg-test"; - asd = "gtwiwtg-test"; - }); - systems = [ "gtwiwtg-test" ]; - lispLibs = [ (getAttr "gtwiwtg" pkgs) ]; - }; - gtype = { - pname = "gtype"; - version = "20200610-git"; - asds = [ "gtype" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gtype/2020-06-10/gtype-20200610-git.tgz"; - sha256 = "0hbkfdw00v7bsa6zbric34p5w6hfwxycccg8wc2faq0cxhsvpv9h"; - system = "gtype"; - asd = "gtype"; - }); - systems = [ "gtype" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-cltl2" pkgs) (getAttr "trivialib_dot_type-unify" pkgs) (getAttr "type-r" pkgs) ]; - }; - gtype_dot_test = { - pname = "gtype.test"; - version = "20200610-git"; - asds = [ "gtype.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gtype/2020-06-10/gtype-20200610-git.tgz"; - sha256 = "0hbkfdw00v7bsa6zbric34p5w6hfwxycccg8wc2faq0cxhsvpv9h"; - system = "gtype.test"; - asd = "gtype.test"; - }); - systems = [ "gtype.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "gtype" pkgs) ]; - }; - gute = { - pname = "gute"; - version = "20221106-git"; - asds = [ "gute" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gute/2022-11-06/gute-20221106-git.tgz"; - sha256 = "1d1m4qaygvmkglwdqlnhkvwq0wrig13h97w8ansfkyig359vpzy0"; - system = "gute"; - asd = "gute"; - }); - systems = [ "gute" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-mathstats" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-strings" pkgs) (getAttr "conium" pkgs) ]; - }; - gute_slash_tests = { - pname = "gute_tests"; - version = "20221106-git"; - asds = [ "gute" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gute/2022-11-06/gute-20221106-git.tgz"; - sha256 = "1d1m4qaygvmkglwdqlnhkvwq0wrig13h97w8ansfkyig359vpzy0"; - system = "gute"; - asd = "gute"; - }); - systems = [ "gute/tests" ]; - lispLibs = [ (getAttr "gute" pkgs) (getAttr "lisp-unit" pkgs) ]; - meta = { - broken = true; - }; - }; - gwl = { - pname = "gwl"; - version = "master-1a957fb2-git"; - asds = [ "gwl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "gwl"; - asd = "gwl"; - }); - systems = [ "gwl" ]; - lispLibs = [ (getAttr "zaserve" pkgs) (getAttr "cl-html-parse" pkgs) (getAttr "cl-markdown" pkgs) (getAttr "cl-who" pkgs) (getAttr "glisp" pkgs) (getAttr "yason" pkgs) ]; - }; - gwl-graphics = { - pname = "gwl-graphics"; - version = "master-1a957fb2-git"; - asds = [ "gwl-graphics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "gwl-graphics"; - asd = "gwl-graphics"; - }); - systems = [ "gwl-graphics" ]; - lispLibs = [ (getAttr "geom-base" pkgs) (getAttr "gwl" pkgs) ]; - }; - gzip-stream = { - pname = "gzip-stream"; - version = "0.2.8"; - asds = [ "gzip-stream" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gzip-stream/2010-10-06/gzip-stream_0.2.8.tgz"; - sha256 = "1m2x685mk9zp8vq45r4gf6mlbzmzr79mvdxibw1fqzv7r1bqrwrs"; - system = "gzip-stream"; - asd = "gzip-stream"; - }); - systems = [ "gzip-stream" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "salza2" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - halftone = { - pname = "halftone"; - version = "20190710-git"; - asds = [ "halftone" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/halftone/2019-07-10/halftone-20190710-git.tgz"; - sha256 = "0j0fn6c6y5z9cq662cvyzc6pyxj228gb1k67gmpnpq5cy1bdbnxa"; - system = "halftone"; - asd = "halftone"; - }); - systems = [ "halftone" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtopengl" pkgs) (getAttr "qtools" pkgs) (getAttr "simple-tasks" pkgs) (getAttr "uiop" pkgs) (getAttr "verbose" pkgs) ]; - }; - hamcrest = { - pname = "hamcrest"; - version = "20220220-git"; - asds = [ "hamcrest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-hamcrest/2022-02-20/cl-hamcrest-20220220-git.tgz"; - sha256 = "1s49wh5cycswsnjd6vvyw72a7a112b2mm9z07jr17l5w4gad7ggh"; - system = "hamcrest"; - asd = "hamcrest"; - }); - systems = [ "hamcrest" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "iterate" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - harmony = { - pname = "harmony"; - version = "20221106-git"; - asds = [ "harmony" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/harmony/2022-11-06/harmony-20221106-git.tgz"; - sha256 = "1s8msnlscsa1138l1vrld9rwl1ib56caxkc4hr938wbihqg9gigs"; - system = "harmony"; - asd = "harmony"; - }); - systems = [ "harmony" ]; - lispLibs = [ (getAttr "atomics" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-mixed" pkgs) (getAttr "cl-mixed-alsa" pkgs) (getAttr "cl-mixed-pulse" pkgs) (getAttr "stealth-mixin" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - hash-set = { - pname = "hash-set"; - version = "20211230-git"; - asds = [ "hash-set" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hash-set/2021-12-30/hash-set-20211230-git.tgz"; - sha256 = "0a966y9yfarhmki4wwzg371ziaygnp13yc6r13w9zz327fkhz8na"; - system = "hash-set"; - asd = "hash-set"; - }); - systems = [ "hash-set" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - hash-set-tests = { - pname = "hash-set-tests"; - version = "20211230-git"; - asds = [ "hash-set-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hash-set/2021-12-30/hash-set-20211230-git.tgz"; - sha256 = "0a966y9yfarhmki4wwzg371ziaygnp13yc6r13w9zz327fkhz8na"; - system = "hash-set-tests"; - asd = "hash-set-tests"; - }); - systems = [ "hash-set-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "hash-set" pkgs) ]; - }; - hash-table-ext = { - pname = "hash-table-ext"; - version = "20211020-git"; - asds = [ "hash-table-ext" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hash-table-ext/2021-10-20/hash-table-ext-20211020-git.tgz"; - sha256 = "00pafnjy5w9yhbzzdvgg4wwb8yicjjshgzxnn0by3d9qknxc7539"; - system = "hash-table-ext"; - asd = "hash-table-ext"; - }); - systems = [ "hash-table-ext" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) ]; - }; - hash-table-ext_dot_test = { - pname = "hash-table-ext.test"; - version = "20211020-git"; - asds = [ "hash-table-ext.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hash-table-ext/2021-10-20/hash-table-ext-20211020-git.tgz"; - sha256 = "00pafnjy5w9yhbzzdvgg4wwb8yicjjshgzxnn0by3d9qknxc7539"; - system = "hash-table-ext.test"; - asd = "hash-table-ext.test"; - }); - systems = [ "hash-table-ext.test" ]; - lispLibs = [ (getAttr "hash-table-ext" pkgs) (getAttr "jingoh" pkgs) ]; - }; - hashtrie = { - pname = "hashtrie"; - version = "20211020-git"; - asds = [ "hashtrie" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hashtrie/2021-10-20/hashtrie-20211020-git.tgz"; - sha256 = "04crw4nlp7s2ljjmaqzy74xjzi0l8dn2yp8pdlaniklyq6y6n43j"; - system = "hashtrie"; - asd = "hashtrie"; - }); - systems = [ "hashtrie" ]; - lispLibs = [ ]; - }; - hashtrie-tests = { - pname = "hashtrie-tests"; - version = "20211020-git"; - asds = [ "hashtrie-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hashtrie/2021-10-20/hashtrie-20211020-git.tgz"; - sha256 = "04crw4nlp7s2ljjmaqzy74xjzi0l8dn2yp8pdlaniklyq6y6n43j"; - system = "hashtrie-tests"; - asd = "hashtrie-tests"; - }); - systems = [ "hashtrie-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "hashtrie" pkgs) ]; - }; - hdf5-cffi = { - pname = "hdf5-cffi"; - version = "20180228-git"; - asds = [ "hdf5-cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz"; - sha256 = "0vda3075423xz83qky998lpac5b04dwfv7bwgh9jq8cs5v0zrxjf"; - system = "hdf5-cffi"; - asd = "hdf5-cffi"; - }); - systems = [ "hdf5-cffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - hdf5-cffi_dot_examples = { - pname = "hdf5-cffi.examples"; - version = "20180228-git"; - asds = [ "hdf5-cffi.examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz"; - sha256 = "0vda3075423xz83qky998lpac5b04dwfv7bwgh9jq8cs5v0zrxjf"; - system = "hdf5-cffi.examples"; - asd = "hdf5-cffi.examples"; - }); - systems = [ "hdf5-cffi.examples" ]; - lispLibs = [ (getAttr "hdf5-cffi" pkgs) ]; - }; - hdf5-cffi_dot_test = { - pname = "hdf5-cffi.test"; - version = "20180228-git"; - asds = [ "hdf5-cffi.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hdf5-cffi/2018-02-28/hdf5-cffi-20180228-git.tgz"; - sha256 = "0vda3075423xz83qky998lpac5b04dwfv7bwgh9jq8cs5v0zrxjf"; - system = "hdf5-cffi.test"; - asd = "hdf5-cffi.test"; - }); - systems = [ "hdf5-cffi.test" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "fiveam" pkgs) (getAttr "hdf5-cffi" pkgs) (getAttr "hdf5-cffi_dot_examples" pkgs) ]; - }; - heap = { - pname = "heap"; - version = "20181018-git"; - asds = [ "heap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/heap/2018-10-18/heap-20181018-git.tgz"; - sha256 = "0jkgazjnjip7y41zd8rpy89ymh75yimk1q24qbddcisq5rzdl52k"; - system = "heap"; - asd = "heap"; - }); - systems = [ "heap" ]; - lispLibs = [ ]; - }; - helambdap = { - pname = "helambdap"; - version = "20220220-git"; - asds = [ "helambdap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/helambdap/2022-02-20/helambdap-20220220-git.tgz"; - sha256 = "1c195x0i99ay666w3nhjqknq95aybavbgws66f6zimza3dp5q4iq"; - system = "helambdap"; - asd = "helambdap"; - }); - systems = [ "helambdap" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "clad" pkgs) (getAttr "split-sequence" pkgs) (getAttr "xhtmlambda" pkgs) ]; - }; - hello-builder = { - pname = "hello-builder"; - version = "20221106-git"; - asds = [ "hello-builder" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog/2022-11-06/clog-20221106-git.tgz"; - sha256 = "135mj69shjayml9xfwg3sccfw5r901lzmf5vj5crnp9wywjfzywx"; - system = "hello-builder"; - asd = "hello-builder"; - }); - systems = [ "hello-builder" ]; - lispLibs = [ (getAttr "clog" pkgs) ]; - }; - hello-clog = { - pname = "hello-clog"; - version = "20221106-git"; - asds = [ "hello-clog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clog/2022-11-06/clog-20221106-git.tgz"; - sha256 = "135mj69shjayml9xfwg3sccfw5r901lzmf5vj5crnp9wywjfzywx"; - system = "hello-clog"; - asd = "hello-clog"; - }); - systems = [ "hello-clog" ]; - lispLibs = [ (getAttr "clog" pkgs) ]; - }; - hermetic = { - pname = "hermetic"; - version = "20191007-git"; - asds = [ "hermetic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hermetic/2019-10-07/hermetic-20191007-git.tgz"; - sha256 = "1sndxkkj45sqr13xw9kvnhj25an96q4la70ni3w468yrcbf782pi"; - system = "hermetic"; - asd = "hermetic"; - }); - systems = [ "hermetic" ]; - lispLibs = [ (getAttr "cl-pass" pkgs) (getAttr "clack" pkgs) ]; - }; - herodotus = { - pname = "herodotus"; - version = "20220331-git"; - asds = [ "herodotus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/herodotus/2022-03-31/herodotus-20220331-git.tgz"; - sha256 = "085r6b8fydac2a939r80vlavs1ij5ij5li5xnl5q8qvn9dl4rr5k"; - system = "herodotus"; - asd = "herodotus"; - }); - systems = [ "herodotus" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "yason" pkgs) ]; - }; - herodotus_slash_tests = { - pname = "herodotus_tests"; - version = "20220331-git"; - asds = [ "herodotus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/herodotus/2022-03-31/herodotus-20220331-git.tgz"; - sha256 = "085r6b8fydac2a939r80vlavs1ij5ij5li5xnl5q8qvn9dl4rr5k"; - system = "herodotus"; - asd = "herodotus"; - }); - systems = [ "herodotus/tests" ]; - lispLibs = [ (getAttr "herodotus" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - hh-aws = { - pname = "hh-aws"; - version = "20150804-git"; - asds = [ "hh-aws" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hh-aws/2015-08-04/hh-aws-20150804-git.tgz"; - sha256 = "02kfq7krn8788iphzcxnf0da88sy30gxpj1acgy9fl2n8qc03qdp"; - system = "hh-aws"; - asd = "hh-aws"; - }); - systems = [ "hh-aws" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "drakma" pkgs) (getAttr "ironclad" pkgs) (getAttr "puri" pkgs) (getAttr "s-xml" pkgs) ]; - }; - hh-aws-tests = { - pname = "hh-aws-tests"; - version = "20150804-git"; - asds = [ "hh-aws-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hh-aws/2015-08-04/hh-aws-20150804-git.tgz"; - sha256 = "02kfq7krn8788iphzcxnf0da88sy30gxpj1acgy9fl2n8qc03qdp"; - system = "hh-aws-tests"; - asd = "hh-aws"; - }); - systems = [ "hh-aws-tests" ]; - lispLibs = [ (getAttr "hh-aws" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "uuid" pkgs) ]; - }; - hh-redblack = { - pname = "hh-redblack"; - version = "20151031-git"; - asds = [ "hh-redblack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hh-redblack/2015-10-31/hh-redblack-20151031-git.tgz"; - sha256 = "1klr78m4g60c82dnxksb7710jjj35rnfl4gl3dx3nrx0nb04bam6"; - system = "hh-redblack"; - asd = "hh-redblack"; - }); - systems = [ "hh-redblack" ]; - lispLibs = [ ]; - }; - hh-redblack-tests = { - pname = "hh-redblack-tests"; - version = "20151031-git"; - asds = [ "hh-redblack-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hh-redblack/2015-10-31/hh-redblack-20151031-git.tgz"; - sha256 = "1klr78m4g60c82dnxksb7710jjj35rnfl4gl3dx3nrx0nb04bam6"; - system = "hh-redblack-tests"; - asd = "hh-redblack"; - }); - systems = [ "hh-redblack-tests" ]; - lispLibs = [ (getAttr "hh-redblack" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - hh-web = { - pname = "hh-web"; - version = "20141106-git"; - asds = [ "hh-web" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hh-web/2014-11-06/hh-web-20141106-git.tgz"; - sha256 = "1i3jyifayczm9b7rvw3fafiisxvjq87xd9z0hdf957qc2albsq87"; - system = "hh-web"; - asd = "hh-web"; - }); - systems = [ "hh-web" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "ironclad" pkgs) (getAttr "local-time" pkgs) (getAttr "log5" pkgs) (getAttr "parenscript" pkgs) (getAttr "trivial-backtrace" pkgs) (getAttr "uuid" pkgs) (getAttr "vecto" pkgs) ]; - }; - hl7-client = { - pname = "hl7-client"; - version = "20150407-git"; - asds = [ "hl7-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hl7-client/2015-04-07/hl7-client-20150407-git.tgz"; - sha256 = "0hq5ip6f1hbdiydml5f1z7qsjaq1v3a3g4y5a87jaif027pwhd89"; - system = "hl7-client"; - asd = "hl7-client"; - }); - systems = [ "hl7-client" ]; - lispLibs = [ (getAttr "usocket" pkgs) ]; - }; - hl7-parser = { - pname = "hl7-parser"; - version = "20160531-git"; - asds = [ "hl7-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hl7-parser/2016-05-31/hl7-parser-20160531-git.tgz"; - sha256 = "1lcyvk3vap73d23s6pk8p1ficqhl2gs84nan6d0yy0hx8c4gip0x"; - system = "hl7-parser"; - asd = "hl7-parser"; - }); - systems = [ "hl7-parser" ]; - lispLibs = [ ]; - }; - hompack = { - pname = "hompack"; - version = "20200925-git"; - asds = [ "hompack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "hompack"; - asd = "hompack"; - }); - systems = [ "hompack" ]; - lispLibs = [ (getAttr "blas-hompack" pkgs) (getAttr "f2cl" pkgs) ]; - }; - hompack_slash_test-mainf = { - pname = "hompack_test-mainf"; - version = "20200925-git"; - asds = [ "hompack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "hompack"; - asd = "hompack"; - }); - systems = [ "hompack/test-mainf" ]; - lispLibs = [ (getAttr "hompack" pkgs) ]; - meta = { - broken = true; - }; - }; - hompack_slash_test-mainp = { - pname = "hompack_test-mainp"; - version = "20200925-git"; - asds = [ "hompack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "hompack"; - asd = "hompack"; - }); - systems = [ "hompack/test-mainp" ]; - lispLibs = [ (getAttr "hompack" pkgs) ]; - meta = { - broken = true; - }; - }; - hompack_slash_test-mains = { - pname = "hompack_test-mains"; - version = "20200925-git"; - asds = [ "hompack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "hompack"; - asd = "hompack"; - }); - systems = [ "hompack/test-mains" ]; - lispLibs = [ (getAttr "hompack" pkgs) ]; - meta = { - broken = true; - }; - }; - horner = { - pname = "horner"; - version = "20191130-git"; - asds = [ "horner" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/horner/2019-11-30/horner-20191130-git.tgz"; - sha256 = "05afvf7sxn1db7xxw7qmys1dwbgsx53iw4w556r277da6bpyacr9"; - system = "horner"; - asd = "horner"; - }); - systems = [ "horner" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "infix-math" pkgs) (getAttr "serapeum" pkgs) ]; - }; - horse-html = { - pname = "horse-html"; - version = "20191007-git"; - asds = [ "horse-html" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/horse-html/2019-10-07/horse-html-20191007-git.tgz"; - sha256 = "0g6cs38123ajf1hvv056df9d8gy5ajarg0f5gywzhmmf0rhr9br5"; - system = "horse-html"; - asd = "horse-html"; - }); - systems = [ "horse-html" ]; - lispLibs = [ (getAttr "parenscript" pkgs) ]; - }; - horse-html_slash_tests = { - pname = "horse-html_tests"; - version = "20191007-git"; - asds = [ "horse-html" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/horse-html/2019-10-07/horse-html-20191007-git.tgz"; - sha256 = "0g6cs38123ajf1hvv056df9d8gy5ajarg0f5gywzhmmf0rhr9br5"; - system = "horse-html"; - asd = "horse-html"; - }); - systems = [ "horse-html/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "horse-html" pkgs) ]; - meta = { - broken = true; - }; - }; - house = { - pname = "house"; - version = "20210124-git"; - asds = [ "house" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/house/2021-01-24/house-20210124-git.tgz"; - sha256 = "1x3dprg5j5rhbf8r1nr6py6g8wgfb9zysbqbjdcyh91szg7w80mb"; - system = "house"; - asd = "house"; - }); - systems = [ "house" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "optima" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "quri" pkgs) (getAttr "session-token" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-features" pkgs) (getAttr "usocket" pkgs) ]; - }; - house_slash_test = { - pname = "house_test"; - version = "20210124-git"; - asds = [ "house" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/house/2021-01-24/house-20210124-git.tgz"; - sha256 = "1x3dprg5j5rhbf8r1nr6py6g8wgfb9zysbqbjdcyh91szg7w80mb"; - system = "house"; - asd = "house"; - }); - systems = [ "house/test" ]; - lispLibs = [ (getAttr "house" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "test-utils" pkgs) ]; - meta = { - broken = true; - }; - }; - ht-simple-ajax = { - pname = "ht-simple-ajax"; - version = "20130421-git"; - asds = [ "ht-simple-ajax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ht-simple-ajax/2013-04-21/ht-simple-ajax-20130421-git.tgz"; - sha256 = "1l87c0arjzyrp3g6ay189fjkqmy81b7i35rfrcs9b269n7d4iis4"; - system = "ht-simple-ajax"; - asd = "ht-simple-ajax"; - }); - systems = [ "ht-simple-ajax" ]; - lispLibs = [ (getAttr "hunchentoot" pkgs) ]; - }; - html-encode = { - pname = "html-encode"; - version = "1.2"; - asds = [ "html-encode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz"; - sha256 = "1ydgb5xnbj1qbvzn7x32dm38gpqg5h0pjxc31f8df3j8sar843db"; - system = "html-encode"; - asd = "html-encode"; - }); - systems = [ "html-encode" ]; - lispLibs = [ ]; - }; - html-entities = { - pname = "html-entities"; - version = "20171019-git"; - asds = [ "html-entities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/html-entities/2017-10-19/html-entities-20171019-git.tgz"; - sha256 = "1b2yl6lf6vis17y4n5s505p7ica96bdafcl6vydy1hg50fy33nfr"; - system = "html-entities"; - asd = "html-entities"; - }); - systems = [ "html-entities" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - html-entities-tests = { - pname = "html-entities-tests"; - version = "20171019-git"; - asds = [ "html-entities-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/html-entities/2017-10-19/html-entities-20171019-git.tgz"; - sha256 = "1b2yl6lf6vis17y4n5s505p7ica96bdafcl6vydy1hg50fy33nfr"; - system = "html-entities-tests"; - asd = "html-entities"; - }); - systems = [ "html-entities-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "html-entities" pkgs) ]; - }; - html-match = { - pname = "html-match"; - version = "20140713-git"; - asds = [ "html-match" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; - sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2"; - system = "html-match"; - asd = "html-match"; - }); - systems = [ "html-match" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "unit-test" pkgs) ]; - }; - html-match_dot_test = { - pname = "html-match.test"; - version = "20140713-git"; - asds = [ "html-match.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; - sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2"; - system = "html-match.test"; - asd = "html-match"; - }); - systems = [ "html-match.test" ]; - lispLibs = [ (getAttr "html-match" pkgs) (getAttr "unit-test" pkgs) ]; - }; - html-template = { - pname = "html-template"; - version = "20171227-git"; - asds = [ "html-template" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/html-template/2017-12-27/html-template-20171227-git.tgz"; - sha256 = "0g700zlyjjba17nbmw1adspw7r9s0321xhayfiqh0drg20zixaf7"; - system = "html-template"; - asd = "html-template"; - }); - systems = [ "html-template" ]; - lispLibs = [ ]; - }; - htmlgen = { - pname = "htmlgen"; - version = "20190813-git"; - asds = [ "htmlgen" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz"; - sha256 = "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa"; - system = "htmlgen"; - asd = "htmlgen"; - }); - systems = [ "htmlgen" ]; - lispLibs = [ (getAttr "acl-compat" pkgs) ]; - }; - http-body = { - pname = "http-body"; - version = "20190813-git"; - asds = [ "http-body" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz"; - sha256 = "0kcg43l5674drzid9cj938q0ki5z25glx296rl239dm7yfmxlzz2"; - system = "http-body"; - asd = "http-body"; - }); - systems = [ "http-body" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-utilities" pkgs) (getAttr "fast-http" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "jonathan" pkgs) (getAttr "quri" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - http-body-test = { - pname = "http-body-test"; - version = "20190813-git"; - asds = [ "http-body-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz"; - sha256 = "0kcg43l5674drzid9cj938q0ki5z25glx296rl239dm7yfmxlzz2"; - system = "http-body-test"; - asd = "http-body-test"; - }); - systems = [ "http-body-test" ]; - lispLibs = [ (getAttr "assoc-utils" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "http-body" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - http-get-cache = { - pname = "http-get-cache"; - version = "20180228-git"; - asds = [ "http-get-cache" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/http-get-cache/2018-02-28/http-get-cache-20180228-git.tgz"; - sha256 = "03bw4zf4hlxyrqm5mq53z0qksb9jbrcc5nv90y7qry83kxic2cgv"; - system = "http-get-cache"; - asd = "http-get-cache"; - }); - systems = [ "http-get-cache" ]; - lispLibs = [ (getAttr "drakma" pkgs) ]; - }; - http-parse = { - pname = "http-parse"; - version = "20150608-git"; - asds = [ "http-parse" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/http-parse/2015-06-08/http-parse-20150608-git.tgz"; - sha256 = "1plycsx2kch2l143s56hvi5dqx51n5bvp7vazmphqj5skmnw4576"; - system = "http-parse"; - asd = "http-parse"; - }); - systems = [ "http-parse" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - http-parse-test = { - pname = "http-parse-test"; - version = "20150608-git"; - asds = [ "http-parse-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/http-parse/2015-06-08/http-parse-20150608-git.tgz"; - sha256 = "1plycsx2kch2l143s56hvi5dqx51n5bvp7vazmphqj5skmnw4576"; - system = "http-parse-test"; - asd = "http-parse-test"; - }); - systems = [ "http-parse-test" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "eos" pkgs) (getAttr "http-parse" pkgs) ]; - }; - http2 = { - pname = "http2"; - version = "20221106-git"; - asds = [ "http2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/http2/2022-11-06/http2-20221106-git.tgz"; - sha256 = "0503pbp43slwhg3n9d3x16qbiqmwc1vvlgl2fkxv85nl4ygrkl4f"; - system = "http2"; - asd = "http2"; - }); - systems = [ "http2" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - http2_slash_all = { - pname = "http2_all"; - version = "20221106-git"; - asds = [ "http2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/http2/2022-11-06/http2-20221106-git.tgz"; - sha256 = "0503pbp43slwhg3n9d3x16qbiqmwc1vvlgl2fkxv85nl4ygrkl4f"; - system = "http2"; - asd = "http2"; - }); - systems = [ "http2/all" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-who" pkgs) (getAttr "fiasco" pkgs) (getAttr "gzip-stream" pkgs) (getAttr "http2" pkgs) (getAttr "parenscript" pkgs) (getAttr "puri" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - http2_slash_client = { - pname = "http2_client"; - version = "20221106-git"; - asds = [ "http2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/http2/2022-11-06/http2-20221106-git.tgz"; - sha256 = "0503pbp43slwhg3n9d3x16qbiqmwc1vvlgl2fkxv85nl4ygrkl4f"; - system = "http2"; - asd = "http2"; - }); - systems = [ "http2/client" ]; - lispLibs = [ (getAttr "cl_plus_ssl" pkgs) (getAttr "gzip-stream" pkgs) (getAttr "http2" pkgs) (getAttr "puri" pkgs) ]; - meta = { - broken = true; - }; - }; - http2_slash_server = { - pname = "http2_server"; - version = "20221106-git"; - asds = [ "http2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/http2/2022-11-06/http2-20221106-git.tgz"; - sha256 = "0503pbp43slwhg3n9d3x16qbiqmwc1vvlgl2fkxv85nl4ygrkl4f"; - system = "http2"; - asd = "http2"; - }); - systems = [ "http2/server" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-who" pkgs) (getAttr "http2" pkgs) (getAttr "parenscript" pkgs) (getAttr "puri" pkgs) ]; - meta = { - broken = true; - }; - }; - http2_slash_test = { - pname = "http2_test"; - version = "20221106-git"; - asds = [ "http2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/http2/2022-11-06/http2-20221106-git.tgz"; - sha256 = "0503pbp43slwhg3n9d3x16qbiqmwc1vvlgl2fkxv85nl4ygrkl4f"; - system = "http2"; - asd = "http2"; - }); - systems = [ "http2/test" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-who" pkgs) (getAttr "fiasco" pkgs) (getAttr "gzip-stream" pkgs) (getAttr "http2" pkgs) (getAttr "parenscript" pkgs) (getAttr "puri" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - http2_slash_tls = { - pname = "http2_tls"; - version = "20221106-git"; - asds = [ "http2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/http2/2022-11-06/http2-20221106-git.tgz"; - sha256 = "0503pbp43slwhg3n9d3x16qbiqmwc1vvlgl2fkxv85nl4ygrkl4f"; - system = "http2"; - asd = "http2"; - }); - systems = [ "http2/tls" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "http2" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_asdf = { - pname = "hu.dwim.asdf"; - version = "stable-git"; - asds = [ "hu.dwim.asdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.asdf/2021-12-30/hu.dwim.asdf-stable-git.tgz"; - sha256 = "0zfwdsvcywvwzkn0a80ghi5kn1hs4iwinvi17ld58gyskf15frx9"; - system = "hu.dwim.asdf"; - asd = "hu.dwim.asdf"; - }); - systems = [ "hu.dwim.asdf" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - hu_dot_dwim_dot_asdf_dot_documentation = { - pname = "hu.dwim.asdf.documentation"; - version = "stable-git"; - asds = [ "hu.dwim.asdf.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.asdf/2021-12-30/hu.dwim.asdf-stable-git.tgz"; - sha256 = "0zfwdsvcywvwzkn0a80ghi5kn1hs4iwinvi17ld58gyskf15frx9"; - system = "hu.dwim.asdf.documentation"; - asd = "hu.dwim.asdf.documentation"; - }); - systems = [ "hu.dwim.asdf.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) ]; - }; - hu_dot_dwim_dot_bluez = { - pname = "hu.dwim.bluez"; - version = "stable-git"; - asds = [ "hu.dwim.bluez" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.bluez/2021-02-28/hu.dwim.bluez-stable-git.tgz"; - sha256 = "0gjh3bgmdz4aabdavbd5m27r273hna47vs388r4m7l2xnd3b3j55"; - system = "hu.dwim.bluez"; - asd = "hu.dwim.bluez"; - }); - systems = [ "hu.dwim.bluez" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) ]; - }; - hu_dot_dwim_dot_bluez_slash_fancy = { - pname = "hu.dwim.bluez_fancy"; - version = "stable-git"; - asds = [ "hu.dwim.bluez" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.bluez/2021-02-28/hu.dwim.bluez-stable-git.tgz"; - sha256 = "0gjh3bgmdz4aabdavbd5m27r273hna47vs388r4m7l2xnd3b3j55"; - system = "hu.dwim.bluez"; - asd = "hu.dwim.bluez"; - }); - systems = [ "hu.dwim.bluez/fancy" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_bluez" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_common = { - pname = "hu.dwim.common"; - version = "20150709-darcs"; - asds = [ "hu.dwim.common" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.common/2015-07-09/hu.dwim.common-20150709-darcs.tgz"; - sha256 = "0mkhq6bqysdy09gswgxm1s50xrq7gimdyqiq84xk8vpyp2hv6hqq"; - system = "hu.dwim.common"; - asd = "hu.dwim.common"; - }); - systems = [ "hu.dwim.common" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "closer-mop" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common-lisp" pkgs) (getAttr "iterate" pkgs) (getAttr "metabang-bind" pkgs) ]; - }; - hu_dot_dwim_dot_common-lisp = { - pname = "hu.dwim.common-lisp"; - version = "stable-git"; - asds = [ "hu.dwim.common-lisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.common-lisp/2021-02-28/hu.dwim.common-lisp-stable-git.tgz"; - sha256 = "06zkdw3scnaw0d4nmsgkv7pi7sw00dikdgfgsqmbqfbz2yrsdabk"; - system = "hu.dwim.common-lisp"; - asd = "hu.dwim.common-lisp"; - }); - systems = [ "hu.dwim.common-lisp" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) ]; - }; - hu_dot_dwim_dot_common-lisp_dot_documentation = { - pname = "hu.dwim.common-lisp.documentation"; - version = "stable-git"; - asds = [ "hu.dwim.common-lisp.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.common-lisp/2021-02-28/hu.dwim.common-lisp-stable-git.tgz"; - sha256 = "06zkdw3scnaw0d4nmsgkv7pi7sw00dikdgfgsqmbqfbz2yrsdabk"; - system = "hu.dwim.common-lisp.documentation"; - asd = "hu.dwim.common-lisp.documentation"; - }); - systems = [ "hu.dwim.common-lisp.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common-lisp" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) ]; - }; - hu_dot_dwim_dot_common_dot_documentation = { - pname = "hu.dwim.common.documentation"; - version = "20150709-darcs"; - asds = [ "hu.dwim.common.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.common/2015-07-09/hu.dwim.common-20150709-darcs.tgz"; - sha256 = "0mkhq6bqysdy09gswgxm1s50xrq7gimdyqiq84xk8vpyp2hv6hqq"; - system = "hu.dwim.common.documentation"; - asd = "hu.dwim.common.documentation"; - }); - systems = [ "hu.dwim.common.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) ]; - }; - hu_dot_dwim_dot_computed-class = { - pname = "hu.dwim.computed-class"; - version = "20200427-darcs"; - asds = [ "hu.dwim.computed-class" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; - sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; - system = "hu.dwim.computed-class"; - asd = "hu.dwim.computed-class"; - }); - systems = [ "hu.dwim.computed-class" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - }; - hu_dot_dwim_dot_computed-class_plus_hu_dot_dwim_dot_logger = { - pname = "hu.dwim.computed-class+hu.dwim.logger"; - version = "20200427-darcs"; - asds = [ "hu.dwim.computed-class+hu.dwim.logger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; - sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; - system = "hu.dwim.computed-class+hu.dwim.logger"; - asd = "hu.dwim.computed-class+hu.dwim.logger"; - }); - systems = [ "hu.dwim.computed-class+hu.dwim.logger" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_computed-class" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) ]; - }; - hu_dot_dwim_dot_computed-class_plus_swank = { - pname = "hu.dwim.computed-class+swank"; - version = "20200427-darcs"; - asds = [ "hu.dwim.computed-class+swank" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; - sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; - system = "hu.dwim.computed-class+swank"; - asd = "hu.dwim.computed-class+swank"; - }); - systems = [ "hu.dwim.computed-class+swank" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_computed-class" pkgs) (getAttr "swank" pkgs) ]; - }; - hu_dot_dwim_dot_computed-class_dot_documentation = { - pname = "hu.dwim.computed-class.documentation"; - version = "20200427-darcs"; - asds = [ "hu.dwim.computed-class.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; - sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; - system = "hu.dwim.computed-class.documentation"; - asd = "hu.dwim.computed-class.documentation"; - }); - systems = [ "hu.dwim.computed-class.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_computed-class_dot_test" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) ]; - }; - hu_dot_dwim_dot_computed-class_dot_test = { - pname = "hu.dwim.computed-class.test"; - version = "20200427-darcs"; - asds = [ "hu.dwim.computed-class.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.computed-class/2020-04-27/hu.dwim.computed-class-20200427-darcs.tgz"; - sha256 = "1frr37g79x08pm7vkpyhnmzbbcgzxvz3vldm8skknpi790vxbpr1"; - system = "hu.dwim.computed-class.test"; - asd = "hu.dwim.computed-class.test"; - }); - systems = [ "hu.dwim.computed-class.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_computed-class_plus_hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def" pkgs) ]; - }; - hu_dot_dwim_dot_debug = { - pname = "hu.dwim.debug"; - version = "20190107-darcs"; - asds = [ "hu.dwim.debug" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz"; - sha256 = "0ad606bmrif82fyikb2hgwzh3y6nlrlsprb5yi86qwa2a2fvak4b"; - system = "hu.dwim.debug"; - asd = "hu.dwim.debug"; - }); - systems = [ "hu.dwim.debug" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_swank" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) (getAttr "swank" pkgs) ]; - }; - hu_dot_dwim_dot_debug_dot_documentation = { - pname = "hu.dwim.debug.documentation"; - version = "20190107-darcs"; - asds = [ "hu.dwim.debug.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz"; - sha256 = "0ad606bmrif82fyikb2hgwzh3y6nlrlsprb5yi86qwa2a2fvak4b"; - system = "hu.dwim.debug.documentation"; - asd = "hu.dwim.debug.documentation"; - }); - systems = [ "hu.dwim.debug.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_debug_dot_test" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) ]; - }; - hu_dot_dwim_dot_debug_dot_test = { - pname = "hu.dwim.debug.test"; - version = "20190107-darcs"; - asds = [ "hu.dwim.debug.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.debug/2019-01-07/hu.dwim.debug-20190107-darcs.tgz"; - sha256 = "0ad606bmrif82fyikb2hgwzh3y6nlrlsprb5yi86qwa2a2fvak4b"; - system = "hu.dwim.debug.test"; - asd = "hu.dwim.debug.test"; - }); - systems = [ "hu.dwim.debug.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_debug" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) ]; - }; - hu_dot_dwim_dot_def = { - pname = "hu.dwim.def"; - version = "stable-git"; - asds = [ "hu.dwim.def" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; - sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; - system = "hu.dwim.def"; - asd = "hu.dwim.def"; - }); - systems = [ "hu.dwim.def" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "iterate" pkgs) (getAttr "metabang-bind" pkgs) ]; - }; - hu_dot_dwim_dot_def_plus_cl-l10n = { - pname = "hu.dwim.def+cl-l10n"; - version = "stable-git"; - asds = [ "hu.dwim.def+cl-l10n" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; - sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; - system = "hu.dwim.def+cl-l10n"; - asd = "hu.dwim.def+cl-l10n"; - }); - systems = [ "hu.dwim.def+cl-l10n" ]; - lispLibs = [ (getAttr "cl-l10n" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) ]; - }; - hu_dot_dwim_dot_def_plus_contextl = { - pname = "hu.dwim.def+contextl"; - version = "stable-git"; - asds = [ "hu.dwim.def+contextl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; - sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; - system = "hu.dwim.def+contextl"; - asd = "hu.dwim.def+contextl"; - }); - systems = [ "hu.dwim.def+contextl" ]; - lispLibs = [ (getAttr "contextl" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) ]; - }; - hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common = { - pname = "hu.dwim.def+hu.dwim.common"; - version = "stable-git"; - asds = [ "hu.dwim.def+hu.dwim.common" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; - sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; - system = "hu.dwim.def+hu.dwim.common"; - asd = "hu.dwim.def+hu.dwim.common"; - }); - systems = [ "hu.dwim.def+hu.dwim.common" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) ]; - }; - hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_delico = { - pname = "hu.dwim.def+hu.dwim.delico"; - version = "stable-git"; - asds = [ "hu.dwim.def+hu.dwim.delico" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; - sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; - system = "hu.dwim.def+hu.dwim.delico"; - asd = "hu.dwim.def+hu.dwim.delico"; - }); - systems = [ "hu.dwim.def+hu.dwim.delico" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_delico" pkgs) ]; - }; - hu_dot_dwim_dot_def_plus_swank = { - pname = "hu.dwim.def+swank"; - version = "stable-git"; - asds = [ "hu.dwim.def+swank" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; - sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; - system = "hu.dwim.def+swank"; - asd = "hu.dwim.def+swank"; - }); - systems = [ "hu.dwim.def+swank" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "swank" pkgs) ]; - }; - hu_dot_dwim_dot_def_slash_documentation = { - pname = "hu.dwim.def_documentation"; - version = "stable-git"; - asds = [ "hu.dwim.def" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; - sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; - system = "hu.dwim.def"; - asd = "hu.dwim.def"; - }); - systems = [ "hu.dwim.def/documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "optima" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_def_slash_namespace = { - pname = "hu.dwim.def_namespace"; - version = "stable-git"; - asds = [ "hu.dwim.def" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; - sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; - system = "hu.dwim.def"; - asd = "hu.dwim.def"; - }); - systems = [ "hu.dwim.def/namespace" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_def_slash_test = { - pname = "hu.dwim.def_test"; - version = "stable-git"; - asds = [ "hu.dwim.def" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2021-12-30/hu.dwim.def-stable-git.tgz"; - sha256 = "1scjj9g2bn58l8i1g1brdqzrajy4bb63dqkwlcydcvk36iskpyab"; - system = "hu.dwim.def"; - asd = "hu.dwim.def"; - }); - systems = [ "hu.dwim.def/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "optima" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_defclass-star = { - pname = "hu.dwim.defclass-star"; - version = "stable-git"; - asds = [ "hu.dwim.defclass-star" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; - sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; - system = "hu.dwim.defclass-star"; - asd = "hu.dwim.defclass-star"; - }); - systems = [ "hu.dwim.defclass-star" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) ]; - }; - hu_dot_dwim_dot_defclass-star_plus_contextl = { - pname = "hu.dwim.defclass-star+contextl"; - version = "stable-git"; - asds = [ "hu.dwim.defclass-star+contextl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; - sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; - system = "hu.dwim.defclass-star+contextl"; - asd = "hu.dwim.defclass-star+contextl"; - }); - systems = [ "hu.dwim.defclass-star+contextl" ]; - lispLibs = [ (getAttr "contextl" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) ]; - }; - hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def = { - pname = "hu.dwim.defclass-star+hu.dwim.def"; - version = "stable-git"; - asds = [ "hu.dwim.defclass-star+hu.dwim.def" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; - sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; - system = "hu.dwim.defclass-star+hu.dwim.def"; - asd = "hu.dwim.defclass-star+hu.dwim.def"; - }); - systems = [ "hu.dwim.defclass-star+hu.dwim.def" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) ]; - }; - hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def_plus_contextl = { - pname = "hu.dwim.defclass-star+hu.dwim.def+contextl"; - version = "stable-git"; - asds = [ "hu.dwim.defclass-star+hu.dwim.def+contextl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; - sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; - system = "hu.dwim.defclass-star+hu.dwim.def+contextl"; - asd = "hu.dwim.defclass-star+hu.dwim.def+contextl"; - }); - systems = [ "hu.dwim.defclass-star+hu.dwim.def+contextl" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_contextl" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) ]; - }; - hu_dot_dwim_dot_defclass-star_plus_swank = { - pname = "hu.dwim.defclass-star+swank"; - version = "stable-git"; - asds = [ "hu.dwim.defclass-star+swank" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; - sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; - system = "hu.dwim.defclass-star+swank"; - asd = "hu.dwim.defclass-star+swank"; - }); - systems = [ "hu.dwim.defclass-star+swank" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "swank" pkgs) ]; - }; - hu_dot_dwim_dot_defclass-star_slash_documentation = { - pname = "hu.dwim.defclass-star_documentation"; - version = "stable-git"; - asds = [ "hu.dwim.defclass-star" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; - sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; - system = "hu.dwim.defclass-star"; - asd = "hu.dwim.defclass-star"; - }); - systems = [ "hu.dwim.defclass-star/documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_defclass-star_slash_test = { - pname = "hu.dwim.defclass-star_test"; - version = "stable-git"; - asds = [ "hu.dwim.defclass-star" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-30/hu.dwim.defclass-star-stable-git.tgz"; - sha256 = "1lbmsn9s7v88w934r8rp4d59vsj1jg8p2cz9g5kl1n9vff5sxxw2"; - system = "hu.dwim.defclass-star"; - asd = "hu.dwim.defclass-star"; - }); - systems = [ "hu.dwim.defclass-star/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_delico = { - pname = "hu.dwim.delico"; - version = "20200925-darcs"; - asds = [ "hu.dwim.delico" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.delico/2020-09-25/hu.dwim.delico-20200925-darcs.tgz"; - sha256 = "12n5cddg7vd3y4dqjcf4wayxwj905ja8jh90ixvrhgnvs559lbnl"; - system = "hu.dwim.delico"; - asd = "hu.dwim.delico"; - }); - systems = [ "hu.dwim.delico" ]; - lispLibs = [ (getAttr "contextl" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) ]; - }; - hu_dot_dwim_dot_delico_slash_documentation = { - pname = "hu.dwim.delico_documentation"; - version = "20200925-darcs"; - asds = [ "hu.dwim.delico" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.delico/2020-09-25/hu.dwim.delico-20200925-darcs.tgz"; - sha256 = "12n5cddg7vd3y4dqjcf4wayxwj905ja8jh90ixvrhgnvs559lbnl"; - system = "hu.dwim.delico"; - asd = "hu.dwim.delico"; - }); - systems = [ "hu.dwim.delico/documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_delico" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_delico_slash_test = { - pname = "hu.dwim.delico_test"; - version = "20200925-darcs"; - asds = [ "hu.dwim.delico" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.delico/2020-09-25/hu.dwim.delico-20200925-darcs.tgz"; - sha256 = "12n5cddg7vd3y4dqjcf4wayxwj905ja8jh90ixvrhgnvs559lbnl"; - system = "hu.dwim.delico"; - asd = "hu.dwim.delico"; - }); - systems = [ "hu.dwim.delico/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_delico" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_graphviz = { - pname = "hu.dwim.graphviz"; - version = "stable-git"; - asds = [ "hu.dwim.graphviz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz"; - sha256 = "0cz5g7d6817ajypp876k9m65sxxlf42x4bg04ya73aqci5s1vjwy"; - system = "hu.dwim.graphviz"; - asd = "hu.dwim.graphviz"; - }); - systems = [ "hu.dwim.graphviz" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "metabang-bind" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_graphviz_dot_documentation = { - pname = "hu.dwim.graphviz.documentation"; - version = "stable-git"; - asds = [ "hu.dwim.graphviz.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz"; - sha256 = "0cz5g7d6817ajypp876k9m65sxxlf42x4bg04ya73aqci5s1vjwy"; - system = "hu.dwim.graphviz.documentation"; - asd = "hu.dwim.graphviz.documentation"; - }); - systems = [ "hu.dwim.graphviz.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_graphviz_dot_test" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) ]; - }; - hu_dot_dwim_dot_graphviz_dot_test = { - pname = "hu.dwim.graphviz.test"; - version = "stable-git"; - asds = [ "hu.dwim.graphviz.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.graphviz/2021-12-30/hu.dwim.graphviz-stable-git.tgz"; - sha256 = "0cz5g7d6817ajypp876k9m65sxxlf42x4bg04ya73aqci5s1vjwy"; - system = "hu.dwim.graphviz.test"; - asd = "hu.dwim.graphviz.test"; - }); - systems = [ "hu.dwim.graphviz.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_graphviz" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) ]; - }; - hu_dot_dwim_dot_logger = { - pname = "hu.dwim.logger"; - version = "stable-git"; - asds = [ "hu.dwim.logger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; - sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; - system = "hu.dwim.logger"; - asd = "hu.dwim.logger"; - }); - systems = [ "hu.dwim.logger" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "local-time" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_logger_plus_iolib = { - pname = "hu.dwim.logger+iolib"; - version = "stable-git"; - asds = [ "hu.dwim.logger+iolib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; - sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; - system = "hu.dwim.logger+iolib"; - asd = "hu.dwim.logger+iolib"; - }); - systems = [ "hu.dwim.logger+iolib" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_util_plus_iolib" pkgs) ]; - }; - hu_dot_dwim_dot_logger_plus_swank = { - pname = "hu.dwim.logger+swank"; - version = "stable-git"; - asds = [ "hu.dwim.logger+swank" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; - sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; - system = "hu.dwim.logger+swank"; - asd = "hu.dwim.logger+swank"; - }); - systems = [ "hu.dwim.logger+swank" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "swank" pkgs) ]; - }; - hu_dot_dwim_dot_logger_dot_documentation = { - pname = "hu.dwim.logger.documentation"; - version = "stable-git"; - asds = [ "hu.dwim.logger.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; - sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; - system = "hu.dwim.logger.documentation"; - asd = "hu.dwim.logger.documentation"; - }); - systems = [ "hu.dwim.logger.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_logger_dot_test" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) ]; - }; - hu_dot_dwim_dot_logger_dot_test = { - pname = "hu.dwim.logger.test"; - version = "stable-git"; - asds = [ "hu.dwim.logger.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.logger/2021-12-30/hu.dwim.logger-stable-git.tgz"; - sha256 = "17b7m86pggg85lczww7nvswz0nj9qg1fxwv1l9wn31jfcf061h74"; - system = "hu.dwim.logger.test"; - asd = "hu.dwim.logger.test"; - }); - systems = [ "hu.dwim.logger.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) ]; - }; - hu_dot_dwim_dot_partial-eval = { - pname = "hu.dwim.partial-eval"; - version = "20171130-darcs"; - asds = [ "hu.dwim.partial-eval" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.partial-eval/2017-11-30/hu.dwim.partial-eval-20171130-darcs.tgz"; - sha256 = "1zsh1rk9rcxkrqavhx2slpczii23y51fn66n68vsw5d97g9k6gzz"; - system = "hu.dwim.partial-eval"; - asd = "hu.dwim.partial-eval"; - }); - systems = [ "hu.dwim.partial-eval" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def_plus_contextl" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) (getAttr "swank" pkgs) ]; - }; - hu_dot_dwim_dot_partial-eval_dot_documentation = { - pname = "hu.dwim.partial-eval.documentation"; - version = "20171130-darcs"; - asds = [ "hu.dwim.partial-eval.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.partial-eval/2017-11-30/hu.dwim.partial-eval-20171130-darcs.tgz"; - sha256 = "1zsh1rk9rcxkrqavhx2slpczii23y51fn66n68vsw5d97g9k6gzz"; - system = "hu.dwim.partial-eval.documentation"; - asd = "hu.dwim.partial-eval.documentation"; - }); - systems = [ "hu.dwim.partial-eval.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_partial-eval_dot_test" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) ]; - }; - hu_dot_dwim_dot_partial-eval_dot_test = { - pname = "hu.dwim.partial-eval.test"; - version = "20171130-darcs"; - asds = [ "hu.dwim.partial-eval.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.partial-eval/2017-11-30/hu.dwim.partial-eval-20171130-darcs.tgz"; - sha256 = "1zsh1rk9rcxkrqavhx2slpczii23y51fn66n68vsw5d97g9k6gzz"; - system = "hu.dwim.partial-eval.test"; - asd = "hu.dwim.partial-eval.test"; - }); - systems = [ "hu.dwim.partial-eval.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_partial-eval" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - }; - hu_dot_dwim_dot_perec = { - pname = "hu.dwim.perec"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec"; - asd = "hu.dwim.perec"; - }); - systems = [ "hu.dwim.perec" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-containers" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "contextl" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_computed-class" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_contextl" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_delico" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_rdbms" pkgs) (getAttr "hu_dot_dwim_dot_serializer" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) (getAttr "ironclad" pkgs) (getAttr "local-time" pkgs) (getAttr "metacopy-with-contextl" pkgs) (getAttr "parse-number" pkgs) ]; - }; - hu_dot_dwim_dot_perec_plus_hu_dot_dwim_dot_quasi-quote_dot_xml = { - pname = "hu.dwim.perec+hu.dwim.quasi-quote.xml"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec+hu.dwim.quasi-quote.xml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec+hu.dwim.quasi-quote.xml"; - asd = "hu.dwim.perec+hu.dwim.quasi-quote.xml"; - }); - systems = [ "hu.dwim.perec+hu.dwim.quasi-quote.xml" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec" pkgs) (getAttr "hu_dot_dwim_dot_quasi-quote_dot_xml" pkgs) ]; - }; - hu_dot_dwim_dot_perec_plus_iolib = { - pname = "hu.dwim.perec+iolib"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec+iolib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec+iolib"; - asd = "hu.dwim.perec+iolib"; - }); - systems = [ "hu.dwim.perec+iolib" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec" pkgs) (getAttr "iolib" pkgs) ]; - }; - hu_dot_dwim_dot_perec_plus_swank = { - pname = "hu.dwim.perec+swank"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec+swank" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec+swank"; - asd = "hu.dwim.perec+swank"; - }); - systems = [ "hu.dwim.perec+swank" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec" pkgs) (getAttr "swank" pkgs) ]; - }; - hu_dot_dwim_dot_perec_dot_all = { - pname = "hu.dwim.perec.all"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.all" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec.all"; - asd = "hu.dwim.perec.all"; - }); - systems = [ "hu.dwim.perec.all" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_oracle" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_postgresql" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_sqlite" pkgs) ]; - }; - hu_dot_dwim_dot_perec_dot_all_dot_test = { - pname = "hu.dwim.perec.all.test"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.all.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec.all.test"; - asd = "hu.dwim.perec.all.test"; - }); - systems = [ "hu.dwim.perec.all.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_oracle_dot_test" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_postgresql_dot_test" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_sqlite_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_perec_dot_documentation = { - pname = "hu.dwim.perec.documentation"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec.documentation"; - asd = "hu.dwim.perec.documentation"; - }); - systems = [ "hu.dwim.perec.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_all_dot_test" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) ]; - }; - hu_dot_dwim_dot_perec_dot_oracle = { - pname = "hu.dwim.perec.oracle"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.oracle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec.oracle"; - asd = "hu.dwim.perec.oracle"; - }); - systems = [ "hu.dwim.perec.oracle" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_oracle" pkgs) ]; - }; - hu_dot_dwim_dot_perec_dot_oracle_dot_test = { - pname = "hu.dwim.perec.oracle.test"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.oracle.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec.oracle.test"; - asd = "hu.dwim.perec.oracle.test"; - }); - systems = [ "hu.dwim.perec.oracle.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_oracle" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_perec_dot_postgresql = { - pname = "hu.dwim.perec.postgresql"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.postgresql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec.postgresql"; - asd = "hu.dwim.perec.postgresql"; - }); - systems = [ "hu.dwim.perec.postgresql" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_postgresql" pkgs) ]; - }; - hu_dot_dwim_dot_perec_dot_postgresql_dot_test = { - pname = "hu.dwim.perec.postgresql.test"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.postgresql.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec.postgresql.test"; - asd = "hu.dwim.perec.postgresql.test"; - }); - systems = [ "hu.dwim.perec.postgresql.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_postgresql" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_perec_dot_sqlite = { - pname = "hu.dwim.perec.sqlite"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.sqlite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec.sqlite"; - asd = "hu.dwim.perec.sqlite"; - }); - systems = [ "hu.dwim.perec.sqlite" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_sqlite" pkgs) ]; - }; - hu_dot_dwim_dot_perec_dot_sqlite_dot_test = { - pname = "hu.dwim.perec.sqlite.test"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.sqlite.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec.sqlite.test"; - asd = "hu.dwim.perec.sqlite.test"; - }); - systems = [ "hu.dwim.perec.sqlite.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_sqlite" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_perec_dot_test = { - pname = "hu.dwim.perec.test"; - version = "20211209-darcs"; - asds = [ "hu.dwim.perec.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.perec/2021-12-09/hu.dwim.perec-20211209-darcs.tgz"; - sha256 = "1m313l0j7jnmw6dlivmxjhcncjwsrzi5zy5g3g3ggzij3fjf9nnz"; - system = "hu.dwim.perec.test"; - asd = "hu.dwim.perec.test"; - }); - systems = [ "hu.dwim.perec.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec_plus_hu_dot_dwim_dot_quasi-quote_dot_xml" pkgs) (getAttr "hu_dot_dwim_dot_perec_plus_iolib" pkgs) (getAttr "hu_dot_dwim_dot_perec_plus_swank" pkgs) (getAttr "hu_dot_dwim_dot_util_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_presentation = { - pname = "hu.dwim.presentation"; - version = "20211230-darcs"; - asds = [ "hu.dwim.presentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; - sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp"; - system = "hu.dwim.presentation"; - asd = "hu.dwim.presentation"; - }); - systems = [ "hu.dwim.presentation" ]; - lispLibs = [ (getAttr "cl-graph_plus_hu_dot_dwim_dot_graphviz" pkgs) (getAttr "contextl" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_contextl" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_web-server_dot_application" pkgs) (getAttr "iolib" pkgs) (getAttr "moptilities" pkgs) ]; - }; - hu_dot_dwim_dot_presentation_plus_cl-graph_plus_cl-typesetting = { - pname = "hu.dwim.presentation+cl-graph+cl-typesetting"; - version = "20211230-darcs"; - asds = [ "hu.dwim.presentation+cl-graph+cl-typesetting" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; - sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp"; - system = "hu.dwim.presentation+cl-graph+cl-typesetting"; - asd = "hu.dwim.presentation+cl-graph+cl-typesetting"; - }); - systems = [ "hu.dwim.presentation+cl-graph+cl-typesetting" ]; - lispLibs = [ (getAttr "cl-graph" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_presentation_plus_cl-typesetting" pkgs) ]; - }; - hu_dot_dwim_dot_presentation_plus_cl-typesetting = { - pname = "hu.dwim.presentation+cl-typesetting"; - version = "20211230-darcs"; - asds = [ "hu.dwim.presentation+cl-typesetting" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; - sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp"; - system = "hu.dwim.presentation+cl-typesetting"; - asd = "hu.dwim.presentation+cl-typesetting"; - }); - systems = [ "hu.dwim.presentation+cl-typesetting" ]; - lispLibs = [ (getAttr "cl-typesetting" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) ]; - }; - hu_dot_dwim_dot_presentation_plus_hu_dot_dwim_dot_stefil = { - pname = "hu.dwim.presentation+hu.dwim.stefil"; - version = "20211230-darcs"; - asds = [ "hu.dwim.presentation+hu.dwim.stefil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; - sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp"; - system = "hu.dwim.presentation+hu.dwim.stefil"; - asd = "hu.dwim.presentation+hu.dwim.stefil"; - }); - systems = [ "hu.dwim.presentation+hu.dwim.stefil" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - }; - hu_dot_dwim_dot_presentation_plus_hu_dot_dwim_dot_web-server = { - pname = "hu.dwim.presentation+hu.dwim.web-server"; - version = "20211230-darcs"; - asds = [ "hu.dwim.presentation+hu.dwim.web-server" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.presentation/2021-12-30/hu.dwim.presentation-20211230-darcs.tgz"; - sha256 = "06y08z2pa3ra8hwn46n4kygf6vhq68nh73x4gzh4skx379hb4fgp"; - system = "hu.dwim.presentation+hu.dwim.web-server"; - asd = "hu.dwim.presentation+hu.dwim.web-server"; - }); - systems = [ "hu.dwim.presentation+hu.dwim.web-server" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) (getAttr "hu_dot_dwim_dot_web-server" pkgs) ]; - }; - hu_dot_dwim_dot_quasi-quote = { - pname = "hu.dwim.quasi-quote"; - version = "stable-git"; - asds = [ "hu.dwim.quasi-quote" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; - sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; - system = "hu.dwim.quasi-quote"; - asd = "hu.dwim.quasi-quote"; - }); - systems = [ "hu.dwim.quasi-quote" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "babel-streams" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_quasi-quote_dot_css = { - pname = "hu.dwim.quasi-quote.css"; - version = "stable-git"; - asds = [ "hu.dwim.quasi-quote.css" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; - sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; - system = "hu.dwim.quasi-quote.css"; - asd = "hu.dwim.quasi-quote.css"; - }); - systems = [ "hu.dwim.quasi-quote.css" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_quasi-quote" pkgs) ]; - }; - hu_dot_dwim_dot_quasi-quote_dot_js = { - pname = "hu.dwim.quasi-quote.js"; - version = "stable-git"; - asds = [ "hu.dwim.quasi-quote.js" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; - sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; - system = "hu.dwim.quasi-quote.js"; - asd = "hu.dwim.quasi-quote.js"; - }); - systems = [ "hu.dwim.quasi-quote.js" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_quasi-quote" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) ]; - }; - hu_dot_dwim_dot_quasi-quote_dot_pdf = { - pname = "hu.dwim.quasi-quote.pdf"; - version = "stable-git"; - asds = [ "hu.dwim.quasi-quote.pdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; - sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; - system = "hu.dwim.quasi-quote.pdf"; - asd = "hu.dwim.quasi-quote.pdf"; - }); - systems = [ "hu.dwim.quasi-quote.pdf" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_quasi-quote" pkgs) ]; - }; - hu_dot_dwim_dot_quasi-quote_dot_xml = { - pname = "hu.dwim.quasi-quote.xml"; - version = "stable-git"; - asds = [ "hu.dwim.quasi-quote.xml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; - sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; - system = "hu.dwim.quasi-quote.xml"; - asd = "hu.dwim.quasi-quote.xml"; - }); - systems = [ "hu.dwim.quasi-quote.xml" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_quasi-quote" pkgs) ]; - }; - hu_dot_dwim_dot_quasi-quote_dot_xml_plus_cxml = { - pname = "hu.dwim.quasi-quote.xml+cxml"; - version = "stable-git"; - asds = [ "hu.dwim.quasi-quote.xml+cxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; - sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; - system = "hu.dwim.quasi-quote.xml+cxml"; - asd = "hu.dwim.quasi-quote.xml+cxml"; - }); - systems = [ "hu.dwim.quasi-quote.xml+cxml" ]; - lispLibs = [ (getAttr "cxml" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_quasi-quote_dot_xml" pkgs) ]; - }; - hu_dot_dwim_dot_quasi-quote_dot_xml_plus_hu_dot_dwim_dot_quasi-quote_dot_js = { - pname = "hu.dwim.quasi-quote.xml+hu.dwim.quasi-quote.js"; - version = "stable-git"; - asds = [ "hu.dwim.quasi-quote.xml+hu.dwim.quasi-quote.js" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.quasi-quote/2022-07-07/hu.dwim.quasi-quote-stable-git.tgz"; - sha256 = "1bawkv7ppn6yay1dd6vvmf9bz2400jvks1w8bqmslv8facfhbprm"; - system = "hu.dwim.quasi-quote.xml+hu.dwim.quasi-quote.js"; - asd = "hu.dwim.quasi-quote.xml+hu.dwim.quasi-quote.js"; - }); - systems = [ "hu.dwim.quasi-quote.xml+hu.dwim.quasi-quote.js" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_quasi-quote_dot_js" pkgs) (getAttr "hu_dot_dwim_dot_quasi-quote_dot_xml" pkgs) ]; - }; - hu_dot_dwim_dot_rdbms = { - pname = "hu.dwim.rdbms"; - version = "20201016-darcs"; - asds = [ "hu.dwim.rdbms" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; - sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; - system = "hu.dwim.rdbms"; - asd = "hu.dwim.rdbms"; - }); - systems = [ "hu.dwim.rdbms" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) (getAttr "ironclad" pkgs) (getAttr "local-time" pkgs) ]; - }; - hu_dot_dwim_dot_rdbms_dot_all = { - pname = "hu.dwim.rdbms.all"; - version = "20201016-darcs"; - asds = [ "hu.dwim.rdbms.all" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; - sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; - system = "hu.dwim.rdbms.all"; - asd = "hu.dwim.rdbms.all"; - }); - systems = [ "hu.dwim.rdbms.all" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_oracle" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_postgresql" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_sqlite" pkgs) ]; - }; - hu_dot_dwim_dot_rdbms_dot_all_dot_test = { - pname = "hu.dwim.rdbms.all.test"; - version = "20201016-darcs"; - asds = [ "hu.dwim.rdbms.all.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; - sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; - system = "hu.dwim.rdbms.all.test"; - asd = "hu.dwim.rdbms.all.test"; - }); - systems = [ "hu.dwim.rdbms.all.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_oracle_dot_test" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_postgresql_dot_test" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_sqlite_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_rdbms_dot_documentation = { - pname = "hu.dwim.rdbms.documentation"; - version = "20201016-darcs"; - asds = [ "hu.dwim.rdbms.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; - sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; - system = "hu.dwim.rdbms.documentation"; - asd = "hu.dwim.rdbms.documentation"; - }); - systems = [ "hu.dwim.rdbms.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_all_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_rdbms_dot_oracle = { - pname = "hu.dwim.rdbms.oracle"; - version = "20201016-darcs"; - asds = [ "hu.dwim.rdbms.oracle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; - sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; - system = "hu.dwim.rdbms.oracle"; - asd = "hu.dwim.rdbms.oracle"; - }); - systems = [ "hu.dwim.rdbms.oracle" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_rdbms" pkgs) ]; - }; - hu_dot_dwim_dot_rdbms_dot_oracle_dot_test = { - pname = "hu.dwim.rdbms.oracle.test"; - version = "20201016-darcs"; - asds = [ "hu.dwim.rdbms.oracle.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; - sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; - system = "hu.dwim.rdbms.oracle.test"; - asd = "hu.dwim.rdbms.oracle.test"; - }); - systems = [ "hu.dwim.rdbms.oracle.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_oracle" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_rdbms_dot_postgresql = { - pname = "hu.dwim.rdbms.postgresql"; - version = "20201016-darcs"; - asds = [ "hu.dwim.rdbms.postgresql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; - sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; - system = "hu.dwim.rdbms.postgresql"; - asd = "hu.dwim.rdbms.postgresql"; - }); - systems = [ "hu.dwim.rdbms.postgresql" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_rdbms" pkgs) (getAttr "cl-postgres_plus_local-time" pkgs) ]; - }; - hu_dot_dwim_dot_rdbms_dot_postgresql_dot_test = { - pname = "hu.dwim.rdbms.postgresql.test"; - version = "20201016-darcs"; - asds = [ "hu.dwim.rdbms.postgresql.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; - sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; - system = "hu.dwim.rdbms.postgresql.test"; - asd = "hu.dwim.rdbms.postgresql.test"; - }); - systems = [ "hu.dwim.rdbms.postgresql.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_postgresql" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_rdbms_dot_sqlite = { - pname = "hu.dwim.rdbms.sqlite"; - version = "20201016-darcs"; - asds = [ "hu.dwim.rdbms.sqlite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; - sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; - system = "hu.dwim.rdbms.sqlite"; - asd = "hu.dwim.rdbms.sqlite"; - }); - systems = [ "hu.dwim.rdbms.sqlite" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_rdbms" pkgs) ]; - }; - hu_dot_dwim_dot_rdbms_dot_sqlite_dot_test = { - pname = "hu.dwim.rdbms.sqlite.test"; - version = "20201016-darcs"; - asds = [ "hu.dwim.rdbms.sqlite.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; - sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; - system = "hu.dwim.rdbms.sqlite.test"; - asd = "hu.dwim.rdbms.sqlite.test"; - }); - systems = [ "hu.dwim.rdbms.sqlite.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_sqlite" pkgs) (getAttr "hu_dot_dwim_dot_rdbms_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_rdbms_dot_test = { - pname = "hu.dwim.rdbms.test"; - version = "20201016-darcs"; - asds = [ "hu.dwim.rdbms.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.rdbms/2020-10-16/hu.dwim.rdbms-20201016-darcs.tgz"; - sha256 = "1rklr82ibwmfffijmpy8mlm6vnylykajzk7r1g0mn28si3map3av"; - system = "hu.dwim.rdbms.test"; - asd = "hu.dwim.rdbms.test"; - }); - systems = [ "hu.dwim.rdbms.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_rdbms" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) ]; - }; - hu_dot_dwim_dot_reiterate = { - pname = "hu.dwim.reiterate"; - version = "stable-git"; - asds = [ "hu.dwim.reiterate" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.reiterate/2021-12-30/hu.dwim.reiterate-stable-git.tgz"; - sha256 = "0h6cgg385ivgc6942xal09c7n9vmy6gn4y3zz4zafc1qyl5jwyv9"; - system = "hu.dwim.reiterate"; - asd = "hu.dwim.reiterate"; - }); - systems = [ "hu.dwim.reiterate" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common-lisp" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "metabang-bind" pkgs) ]; - }; - hu_dot_dwim_dot_reiterate_plus_hu_dot_dwim_dot_logger = { - pname = "hu.dwim.reiterate+hu.dwim.logger"; - version = "stable-git"; - asds = [ "hu.dwim.reiterate+hu.dwim.logger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.reiterate/2021-12-30/hu.dwim.reiterate-stable-git.tgz"; - sha256 = "0h6cgg385ivgc6942xal09c7n9vmy6gn4y3zz4zafc1qyl5jwyv9"; - system = "hu.dwim.reiterate+hu.dwim.logger"; - asd = "hu.dwim.reiterate+hu.dwim.logger"; - }); - systems = [ "hu.dwim.reiterate+hu.dwim.logger" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_reiterate" pkgs) ]; - }; - hu_dot_dwim_dot_sdl = { - pname = "hu.dwim.sdl"; - version = "stable-git"; - asds = [ "hu.dwim.sdl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.sdl/2022-07-07/hu.dwim.sdl-stable-git.tgz"; - sha256 = "175kha5f7kvis2nlxbzrybswbr62lgmjh691ajwl5i9y7andqhq2"; - system = "hu.dwim.sdl"; - asd = "hu.dwim.sdl"; - }); - systems = [ "hu.dwim.sdl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) ]; - }; - hu_dot_dwim_dot_sdl_slash_fancy = { - pname = "hu.dwim.sdl_fancy"; - version = "stable-git"; - asds = [ "hu.dwim.sdl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.sdl/2022-07-07/hu.dwim.sdl-stable-git.tgz"; - sha256 = "175kha5f7kvis2nlxbzrybswbr62lgmjh691ajwl5i9y7andqhq2"; - system = "hu.dwim.sdl"; - asd = "hu.dwim.sdl"; - }); - systems = [ "hu.dwim.sdl/fancy" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_sdl" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_sdl_slash_gfx = { - pname = "hu.dwim.sdl_gfx"; - version = "stable-git"; - asds = [ "hu.dwim.sdl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.sdl/2022-07-07/hu.dwim.sdl-stable-git.tgz"; - sha256 = "175kha5f7kvis2nlxbzrybswbr62lgmjh691ajwl5i9y7andqhq2"; - system = "hu.dwim.sdl"; - asd = "hu.dwim.sdl"; - }); - systems = [ "hu.dwim.sdl/gfx" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "hu_dot_dwim_dot_sdl" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_sdl_slash_image = { - pname = "hu.dwim.sdl_image"; - version = "stable-git"; - asds = [ "hu.dwim.sdl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.sdl/2022-07-07/hu.dwim.sdl-stable-git.tgz"; - sha256 = "175kha5f7kvis2nlxbzrybswbr62lgmjh691ajwl5i9y7andqhq2"; - system = "hu.dwim.sdl"; - asd = "hu.dwim.sdl"; - }); - systems = [ "hu.dwim.sdl/image" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "hu_dot_dwim_dot_sdl" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_sdl_slash_ttf = { - pname = "hu.dwim.sdl_ttf"; - version = "stable-git"; - asds = [ "hu.dwim.sdl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.sdl/2022-07-07/hu.dwim.sdl-stable-git.tgz"; - sha256 = "175kha5f7kvis2nlxbzrybswbr62lgmjh691ajwl5i9y7andqhq2"; - system = "hu.dwim.sdl"; - asd = "hu.dwim.sdl"; - }); - systems = [ "hu.dwim.sdl/ttf" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "hu_dot_dwim_dot_sdl" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_serializer = { - pname = "hu.dwim.serializer"; - version = "20161204-darcs"; - asds = [ "hu.dwim.serializer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz"; - sha256 = "1c4zl2ql4w7nw8vrcrhhq45c5yhbcp4z5qpp1yxjpd3002q2lbh2"; - system = "hu.dwim.serializer"; - asd = "hu.dwim.serializer"; - }); - systems = [ "hu.dwim.serializer" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_serializer_dot_documentation = { - pname = "hu.dwim.serializer.documentation"; - version = "20161204-darcs"; - asds = [ "hu.dwim.serializer.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz"; - sha256 = "1c4zl2ql4w7nw8vrcrhhq45c5yhbcp4z5qpp1yxjpd3002q2lbh2"; - system = "hu.dwim.serializer.documentation"; - asd = "hu.dwim.serializer.documentation"; - }); - systems = [ "hu.dwim.serializer.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) (getAttr "hu_dot_dwim_dot_serializer_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_serializer_dot_test = { - pname = "hu.dwim.serializer.test"; - version = "20161204-darcs"; - asds = [ "hu.dwim.serializer.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.serializer/2016-12-04/hu.dwim.serializer-20161204-darcs.tgz"; - sha256 = "1c4zl2ql4w7nw8vrcrhhq45c5yhbcp4z5qpp1yxjpd3002q2lbh2"; - system = "hu.dwim.serializer.test"; - asd = "hu.dwim.serializer.test"; - }); - systems = [ "hu.dwim.serializer.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_serializer" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) ]; - }; - hu_dot_dwim_dot_stefil = { - pname = "hu.dwim.stefil"; - version = "stable-git"; - asds = [ "hu.dwim.stefil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz"; - sha256 = "0sra6psvrlpx9w7xjikm6ph2qlmgi9lr1kagpsiafxq4dnqlxjsx"; - system = "hu.dwim.stefil"; - asd = "hu.dwim.stefil"; - }); - systems = [ "hu.dwim.stefil" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def = { - pname = "hu.dwim.stefil+hu.dwim.def"; - version = "stable-git"; - asds = [ "hu.dwim.stefil+hu.dwim.def" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz"; - sha256 = "0sra6psvrlpx9w7xjikm6ph2qlmgi9lr1kagpsiafxq4dnqlxjsx"; - system = "hu.dwim.stefil+hu.dwim.def"; - asd = "hu.dwim.stefil+hu.dwim.def"; - }); - systems = [ "hu.dwim.stefil+hu.dwim.def" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - }; - hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank = { - pname = "hu.dwim.stefil+hu.dwim.def+swank"; - version = "stable-git"; - asds = [ "hu.dwim.stefil+hu.dwim.def+swank" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz"; - sha256 = "0sra6psvrlpx9w7xjikm6ph2qlmgi9lr1kagpsiafxq4dnqlxjsx"; - system = "hu.dwim.stefil+hu.dwim.def+swank"; - asd = "hu.dwim.stefil+hu.dwim.def+swank"; - }); - systems = [ "hu.dwim.stefil+hu.dwim.def+swank" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_swank" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_swank" pkgs) ]; - }; - hu_dot_dwim_dot_stefil_plus_swank = { - pname = "hu.dwim.stefil+swank"; - version = "stable-git"; - asds = [ "hu.dwim.stefil+swank" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz"; - sha256 = "0sra6psvrlpx9w7xjikm6ph2qlmgi9lr1kagpsiafxq4dnqlxjsx"; - system = "hu.dwim.stefil+swank"; - asd = "hu.dwim.stefil+swank"; - }); - systems = [ "hu.dwim.stefil+swank" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "swank" pkgs) ]; - }; - hu_dot_dwim_dot_stefil_slash_test = { - pname = "hu.dwim.stefil_test"; - version = "stable-git"; - asds = [ "hu.dwim.stefil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2021-12-30/hu.dwim.stefil-stable-git.tgz"; - sha256 = "0sra6psvrlpx9w7xjikm6ph2qlmgi9lr1kagpsiafxq4dnqlxjsx"; - system = "hu.dwim.stefil"; - asd = "hu.dwim.stefil"; - }); - systems = [ "hu.dwim.stefil/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_syntax-sugar = { - pname = "hu.dwim.syntax-sugar"; - version = "20161204-darcs"; - asds = [ "hu.dwim.syntax-sugar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2016-12-04/hu.dwim.syntax-sugar-20161204-darcs.tgz"; - sha256 = "0hj74g9jsqcqprvxk9hkx4ykhxxdv6s7x82acjz12xyjvvqpx7zc"; - system = "hu.dwim.syntax-sugar"; - asd = "hu.dwim.syntax-sugar"; - }); - systems = [ "hu.dwim.syntax-sugar" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) ]; - }; - hu_dot_dwim_dot_syntax-sugar_dot_documentation = { - pname = "hu.dwim.syntax-sugar.documentation"; - version = "20161204-darcs"; - asds = [ "hu.dwim.syntax-sugar.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2016-12-04/hu.dwim.syntax-sugar-20161204-darcs.tgz"; - sha256 = "0hj74g9jsqcqprvxk9hkx4ykhxxdv6s7x82acjz12xyjvvqpx7zc"; - system = "hu.dwim.syntax-sugar.documentation"; - asd = "hu.dwim.syntax-sugar.documentation"; - }); - systems = [ "hu.dwim.syntax-sugar.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_syntax-sugar_dot_test = { - pname = "hu.dwim.syntax-sugar.test"; - version = "20161204-darcs"; - asds = [ "hu.dwim.syntax-sugar.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2016-12-04/hu.dwim.syntax-sugar-20161204-darcs.tgz"; - sha256 = "0hj74g9jsqcqprvxk9hkx4ykhxxdv6s7x82acjz12xyjvvqpx7zc"; - system = "hu.dwim.syntax-sugar.test"; - asd = "hu.dwim.syntax-sugar.test"; - }); - systems = [ "hu.dwim.syntax-sugar.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) ]; - }; - hu_dot_dwim_dot_syntax-sugar_slash_lambda-with-bang-args = { - pname = "hu.dwim.syntax-sugar_lambda-with-bang-args"; - version = "20161204-darcs"; - asds = [ "hu.dwim.syntax-sugar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2016-12-04/hu.dwim.syntax-sugar-20161204-darcs.tgz"; - sha256 = "0hj74g9jsqcqprvxk9hkx4ykhxxdv6s7x82acjz12xyjvvqpx7zc"; - system = "hu.dwim.syntax-sugar"; - asd = "hu.dwim.syntax-sugar"; - }); - systems = [ "hu.dwim.syntax-sugar/lambda-with-bang-args" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_syntax-sugar_slash_unicode = { - pname = "hu.dwim.syntax-sugar_unicode"; - version = "20161204-darcs"; - asds = [ "hu.dwim.syntax-sugar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.syntax-sugar/2016-12-04/hu.dwim.syntax-sugar-20161204-darcs.tgz"; - sha256 = "0hj74g9jsqcqprvxk9hkx4ykhxxdv6s7x82acjz12xyjvvqpx7zc"; - system = "hu.dwim.syntax-sugar"; - asd = "hu.dwim.syntax-sugar"; - }); - systems = [ "hu.dwim.syntax-sugar/unicode" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_uri = { - pname = "hu.dwim.uri"; - version = "20180228-darcs"; - asds = [ "hu.dwim.uri" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.uri/2018-02-28/hu.dwim.uri-20180228-darcs.tgz"; - sha256 = "0wvai7djmbry0b0j8vhzw3s8m30ghs2sml29gw6snh1pynh3c2ir"; - system = "hu.dwim.uri"; - asd = "hu.dwim.uri"; - }); - systems = [ "hu.dwim.uri" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "iolib" pkgs) ]; - }; - hu_dot_dwim_dot_uri_dot_test = { - pname = "hu.dwim.uri.test"; - version = "20180228-darcs"; - asds = [ "hu.dwim.uri.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.uri/2018-02-28/hu.dwim.uri-20180228-darcs.tgz"; - sha256 = "0wvai7djmbry0b0j8vhzw3s8m30ghs2sml29gw6snh1pynh3c2ir"; - system = "hu.dwim.uri.test"; - asd = "hu.dwim.uri.test"; - }); - systems = [ "hu.dwim.uri.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) (getAttr "hu_dot_dwim_dot_uri" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - }; - hu_dot_dwim_dot_util = { - pname = "hu.dwim.util"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) ]; - }; - hu_dot_dwim_dot_util_plus_iolib = { - pname = "hu.dwim.util+iolib"; - version = "stable-git"; - asds = [ "hu.dwim.util+iolib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util+iolib"; - asd = "hu.dwim.util+iolib"; - }); - systems = [ "hu.dwim.util+iolib" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "iolib" pkgs) ]; - }; - hu_dot_dwim_dot_util_dot_documentation = { - pname = "hu.dwim.util.documentation"; - version = "stable-git"; - asds = [ "hu.dwim.util.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util.documentation"; - asd = "hu.dwim.util.documentation"; - }); - systems = [ "hu.dwim.util.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) ]; - }; - hu_dot_dwim_dot_util_dot_test = { - pname = "hu.dwim.util.test"; - version = "stable-git"; - asds = [ "hu.dwim.util.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util.test"; - asd = "hu.dwim.util.test"; - }); - systems = [ "hu.dwim.util.test" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "babel-streams" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-l10n" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "command-line-arguments" pkgs) (getAttr "cxml" pkgs) (getAttr "drakma" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_delico" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_postgresql" pkgs) (getAttr "hu_dot_dwim_dot_quasi-quote_dot_xml" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_util_plus_iolib" pkgs) (getAttr "hu_dot_dwim_dot_web-server_dot_application" pkgs) (getAttr "iolib" pkgs) (getAttr "swank" pkgs) (getAttr "uiop" pkgs) ]; - }; - hu_dot_dwim_dot_util_slash_authorization = { - pname = "hu.dwim.util_authorization"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/authorization" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_partial-eval" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_command-line = { - pname = "hu.dwim.util_command-line"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/command-line" ]; - lispLibs = [ (getAttr "command-line-arguments" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_error-handling = { - pname = "hu.dwim.util_error-handling"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/error-handling" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_error-handling_plus_swank = { - pname = "hu.dwim.util_error-handling+swank"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/error-handling+swank" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "swank" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_finite-state-machine = { - pname = "hu.dwim.util_finite-state-machine"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/finite-state-machine" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_flexml = { - pname = "hu.dwim.util_flexml"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/flexml" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cxml" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_i18n = { - pname = "hu.dwim.util_i18n"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/i18n" ]; - lispLibs = [ (getAttr "cl-l10n" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_linear-mapping = { - pname = "hu.dwim.util_linear-mapping"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/linear-mapping" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_mop = { - pname = "hu.dwim.util_mop"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/mop" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_production = { - pname = "hu.dwim.util_production"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/production" ]; - lispLibs = [ (getAttr "command-line-arguments" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_perec_dot_postgresql" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_util_plus_iolib" pkgs) (getAttr "hu_dot_dwim_dot_web-server_dot_application" pkgs) (getAttr "iolib" pkgs) (getAttr "swank" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_soap = { - pname = "hu.dwim.util_soap"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/soap" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "babel-streams" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cxml" pkgs) (getAttr "drakma" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_quasi-quote_dot_xml" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_source = { - pname = "hu.dwim.util_source"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/source" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "swank" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_standard-process = { - pname = "hu.dwim.util_standard-process"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/standard-process" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_delico" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_temporary-files = { - pname = "hu.dwim.util_temporary-files"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/temporary-files" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_util_plus_iolib" pkgs) (getAttr "iolib" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_threads = { - pname = "hu.dwim.util_threads"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/threads" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_util_slash_worker-group = { - pname = "hu.dwim.util_worker-group"; - version = "stable-git"; - asds = [ "hu.dwim.util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.util/2021-12-30/hu.dwim.util-stable-git.tgz"; - sha256 = "01f0kvvaa94zkz5zzfaf8cbiihlp0l6627q3hmc0k154j3mdarmi"; - system = "hu.dwim.util"; - asd = "hu.dwim.util"; - }); - systems = [ "hu.dwim.util/worker-group" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_walker = { - pname = "hu.dwim.walker"; - version = "stable-git"; - asds = [ "hu.dwim.walker" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.walker/2022-07-07/hu.dwim.walker-stable-git.tgz"; - sha256 = "0sw7z5iml82sklxjy1wr42mbp2qqml49ci36d6xsckar0sqsc8vr"; - system = "hu.dwim.walker"; - asd = "hu.dwim.walker"; - }); - systems = [ "hu.dwim.walker" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "closer-mop" pkgs) (getAttr "contextl" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_contextl" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "metabang-bind" pkgs) ]; - }; - hu_dot_dwim_dot_walker_slash_documentation = { - pname = "hu.dwim.walker_documentation"; - version = "stable-git"; - asds = [ "hu.dwim.walker" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.walker/2022-07-07/hu.dwim.walker-stable-git.tgz"; - sha256 = "0sw7z5iml82sklxjy1wr42mbp2qqml49ci36d6xsckar0sqsc8vr"; - system = "hu.dwim.walker"; - asd = "hu.dwim.walker"; - }); - systems = [ "hu.dwim.walker/documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_swank" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_walker_slash_test = { - pname = "hu.dwim.walker_test"; - version = "stable-git"; - asds = [ "hu.dwim.walker" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.walker/2022-07-07/hu.dwim.walker-stable-git.tgz"; - sha256 = "0sw7z5iml82sklxjy1wr42mbp2qqml49ci36d6xsckar0sqsc8vr"; - system = "hu.dwim.walker"; - asd = "hu.dwim.walker"; - }); - systems = [ "hu.dwim.walker/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_swank" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_web-server = { - pname = "hu.dwim.web-server"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; - sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; - system = "hu.dwim.web-server"; - asd = "hu.dwim.web-server"; - }); - systems = [ "hu.dwim.web-server" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "babel-streams" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_computed-class" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_cl-l10n" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_contextl" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_delico" pkgs) (getAttr "hu_dot_dwim_dot_logger_plus_iolib" pkgs) (getAttr "hu_dot_dwim_dot_quasi-quote_dot_xml_plus_hu_dot_dwim_dot_quasi-quote_dot_js" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_uri" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_zlib" pkgs) (getAttr "iolib" pkgs) (getAttr "local-time" pkgs) (getAttr "parse-number" pkgs) (getAttr "rfc2109" pkgs) (getAttr "rfc2388-binary" pkgs) (getAttr "swank" pkgs) ]; - }; - hu_dot_dwim_dot_web-server_plus_swank = { - pname = "hu.dwim.web-server+swank"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server+swank" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; - sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; - system = "hu.dwim.web-server+swank"; - asd = "hu.dwim.web-server+swank"; - }); - systems = [ "hu.dwim.web-server+swank" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_swank" pkgs) (getAttr "hu_dot_dwim_dot_web-server" pkgs) ]; - }; - hu_dot_dwim_dot_web-server_dot_application = { - pname = "hu.dwim.web-server.application"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server.application" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; - sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; - system = "hu.dwim.web-server.application"; - asd = "hu.dwim.web-server.application"; - }); - systems = [ "hu.dwim.web-server.application" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_web-server" pkgs) ]; - }; - hu_dot_dwim_dot_web-server_dot_application_plus_hu_dot_dwim_dot_perec = { - pname = "hu.dwim.web-server.application+hu.dwim.perec"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server.application+hu.dwim.perec" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; - sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; - system = "hu.dwim.web-server.application+hu.dwim.perec"; - asd = "hu.dwim.web-server.application+hu.dwim.perec"; - }); - systems = [ "hu.dwim.web-server.application+hu.dwim.perec" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_perec" pkgs) (getAttr "hu_dot_dwim_dot_web-server_dot_application" pkgs) ]; - }; - hu_dot_dwim_dot_web-server_dot_application_dot_test = { - pname = "hu.dwim.web-server.application.test"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server.application.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; - sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; - system = "hu.dwim.web-server.application.test"; - asd = "hu.dwim.web-server.application.test"; - }); - systems = [ "hu.dwim.web-server.application.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_web-server_dot_application" pkgs) (getAttr "hu_dot_dwim_dot_web-server_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_web-server_dot_documentation = { - pname = "hu.dwim.web-server.documentation"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server.documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; - sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; - system = "hu.dwim.web-server.documentation"; - asd = "hu.dwim.web-server.documentation"; - }); - systems = [ "hu.dwim.web-server.documentation" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_presentation" pkgs) (getAttr "hu_dot_dwim_dot_web-server_dot_test" pkgs) ]; - }; - hu_dot_dwim_dot_web-server_dot_test = { - pname = "hu.dwim.web-server.test"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; - sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; - system = "hu.dwim.web-server.test"; - asd = "hu.dwim.web-server.test"; - }); - systems = [ "hu.dwim.web-server.test" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_computed-class_plus_hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) (getAttr "hu_dot_dwim_dot_web-server" pkgs) (getAttr "hu_dot_dwim_dot_web-server_plus_swank" pkgs) ]; - }; - hu_dot_dwim_dot_web-server_dot_websocket = { - pname = "hu.dwim.web-server.websocket"; - version = "20220707-darcs"; - asds = [ "hu.dwim.web-server.websocket" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.web-server/2022-07-07/hu.dwim.web-server-20220707-darcs.tgz"; - sha256 = "0kz8v5qlyj96rjvqic031f6c405zrpsyqnlkh2mvlsmc7rqg2zjf"; - system = "hu.dwim.web-server.websocket"; - asd = "hu.dwim.web-server.websocket"; - }); - systems = [ "hu.dwim.web-server.websocket" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_web-server" pkgs) (getAttr "ironclad" pkgs) ]; - }; - hu_dot_dwim_dot_zlib = { - pname = "hu.dwim.zlib"; - version = "stable-git"; - asds = [ "hu.dwim.zlib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.zlib/2022-07-07/hu.dwim.zlib-stable-git.tgz"; - sha256 = "1yrsbl6rmsp6sdaj9yzwx1bpbs529akndxnpplafw31195khnxm1"; - system = "hu.dwim.zlib"; - asd = "hu.dwim.zlib"; - }); - systems = [ "hu.dwim.zlib" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_zlib_slash_fancy = { - pname = "hu.dwim.zlib_fancy"; - version = "stable-git"; - asds = [ "hu.dwim.zlib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.zlib/2022-07-07/hu.dwim.zlib-stable-git.tgz"; - sha256 = "1yrsbl6rmsp6sdaj9yzwx1bpbs529akndxnpplafw31195khnxm1"; - system = "hu.dwim.zlib"; - asd = "hu.dwim.zlib"; - }); - systems = [ "hu.dwim.zlib/fancy" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_def_plus_hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_zlib" pkgs) ]; - meta = { - broken = true; - }; - }; - hu_dot_dwim_dot_zlib_slash_test = { - pname = "hu.dwim.zlib_test"; - version = "stable-git"; - asds = [ "hu.dwim.zlib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hu.dwim.zlib/2022-07-07/hu.dwim.zlib-stable-git.tgz"; - sha256 = "1yrsbl6rmsp6sdaj9yzwx1bpbs529akndxnpplafw31195khnxm1"; - system = "hu.dwim.zlib"; - asd = "hu.dwim.zlib"; - }); - systems = [ "hu.dwim.zlib/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "hu_dot_dwim_dot_zlib" pkgs) ]; - meta = { - broken = true; - }; - }; - huffman = { - pname = "huffman"; - version = "20181018-git"; - asds = [ "huffman" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/huffman/2018-10-18/huffman-20181018-git.tgz"; - sha256 = "05b3ql5szzi4vsry76i76483mxf9m5i9620hdshykh5rbfiarvcx"; - system = "huffman"; - asd = "huffman"; - }); - systems = [ "huffman" ]; - lispLibs = [ ]; - }; - humbler = { - pname = "humbler"; - version = "20190710-git"; - asds = [ "humbler" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/humbler/2019-07-10/humbler-20190710-git.tgz"; - sha256 = "0s7li33q3ww1ka76v6pdjv5pnvwgs695wj9ciijy9cqxxp2x8vx0"; - system = "humbler"; - asd = "humbler"; - }); - systems = [ "humbler" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "local-time" pkgs) (getAttr "north-core" pkgs) (getAttr "trivial-mimes" pkgs) (getAttr "yason" pkgs) ]; - }; - hunchensocket = { - pname = "hunchensocket"; - version = "20221106-git"; - asds = [ "hunchensocket" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchensocket/2022-11-06/hunchensocket-20221106-git.tgz"; - sha256 = "1vhd009lwl62l1czmhsalblxmyz4x9v3nspjflpajwm1db5rnd7h"; - system = "hunchensocket"; - asd = "hunchensocket"; - }); - systems = [ "hunchensocket" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "chunga" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-fad" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "sha1" pkgs) (getAttr "trivial-backtrace" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - hunchensocket-tests = { - pname = "hunchensocket-tests"; - version = "20221106-git"; - asds = [ "hunchensocket-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchensocket/2022-11-06/hunchensocket-20221106-git.tgz"; - sha256 = "1vhd009lwl62l1czmhsalblxmyz4x9v3nspjflpajwm1db5rnd7h"; - system = "hunchensocket-tests"; - asd = "hunchensocket"; - }); - systems = [ "hunchensocket-tests" ]; - lispLibs = [ (getAttr "fiasco" pkgs) (getAttr "hunchensocket" pkgs) ]; - }; - hunchentools = { - pname = "hunchentools"; - version = "20161204-git"; - asds = [ "hunchentools" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchentools/2016-12-04/hunchentools-20161204-git.tgz"; - sha256 = "12r1ml1xxhyz646nnxqzixfisljjaracwp9jhwl3wb285qbmai4b"; - system = "hunchentools"; - asd = "hunchentools"; - }); - systems = [ "hunchentools" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "ironclad" pkgs) ]; - }; - hunchentoot = { - pname = "hunchentoot"; - version = "v1.3.0"; - asds = [ "hunchentoot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz"; - sha256 = "1z0m45lp6rv59g69l44gj3q3d2bmjlhqzpii0vgkniam21dcimy9"; - system = "hunchentoot"; - asd = "hunchentoot"; - }); - systems = [ "hunchentoot" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "chunga" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "md5" pkgs) (getAttr "rfc2388" pkgs) (getAttr "trivial-backtrace" pkgs) (getAttr "usocket" pkgs) ]; - }; - hunchentoot-auth = { - pname = "hunchentoot-auth"; - version = "20140113-git"; - asds = [ "hunchentoot-auth" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot-auth/2014-01-13/hunchentoot-auth-20140113-git.tgz"; - sha256 = "1bc70lh2jvk6gqmhczgv0indxk6j5whxbh7gylrlbv16041sdkbj"; - system = "hunchentoot-auth"; - asd = "hunchentoot-auth"; - }); - systems = [ "hunchentoot-auth" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-store" pkgs) (getAttr "cl-who" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - hunchentoot-cgi = { - pname = "hunchentoot-cgi"; - version = "20140211-git"; - asds = [ "hunchentoot-cgi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot-cgi/2014-02-11/hunchentoot-cgi-20140211-git.tgz"; - sha256 = "0al6qfs6661avhywsqxh3nwyhl1d1gip3yx57b8siczjarpgpawc"; - system = "hunchentoot-cgi"; - asd = "hunchentoot-cgi"; - }); - systems = [ "hunchentoot-cgi" ]; - lispLibs = [ (getAttr "hunchentoot" pkgs) (getAttr "puri" pkgs) ]; - }; - hunchentoot-dev = { - pname = "hunchentoot-dev"; - version = "v1.3.0"; - asds = [ "hunchentoot-dev" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz"; - sha256 = "1z0m45lp6rv59g69l44gj3q3d2bmjlhqzpii0vgkniam21dcimy9"; - system = "hunchentoot-dev"; - asd = "hunchentoot"; - }); - systems = [ "hunchentoot-dev" ]; - lispLibs = [ (getAttr "cxml-stp" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "hunchentoot-test" pkgs) (getAttr "xpath" pkgs) (getAttr "swank" pkgs) ]; - }; - hunchentoot-errors = { - pname = "hunchentoot-errors"; - version = "20221106-git"; - asds = [ "hunchentoot-errors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot-errors/2022-11-06/hunchentoot-errors-20221106-git.tgz"; - sha256 = "1wv4p1wyz40kk9z4dabyk4xqlv78zq3inhvaqnwrhxww2w2cim5z"; - system = "hunchentoot-errors"; - asd = "hunchentoot-errors"; - }); - systems = [ "hunchentoot-errors" ]; - lispLibs = [ (getAttr "cl-mimeparse" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "parse-number" pkgs) (getAttr "string-case" pkgs) ]; - }; - hunchentoot-multi-acceptor = { - pname = "hunchentoot-multi-acceptor"; - version = "20220331-git"; - asds = [ "hunchentoot-multi-acceptor" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot-multi-acceptor/2022-03-31/hunchentoot-multi-acceptor-20220331-git.tgz"; - sha256 = "0m42dw8x0bp03n4hx4ppf45gjg14igf69z4rn7dslch6km58mrha"; - system = "hunchentoot-multi-acceptor"; - asd = "hunchentoot-multi-acceptor"; - }); - systems = [ "hunchentoot-multi-acceptor" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "str" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "usocket" pkgs) ]; - }; - hunchentoot-single-signon = { - pname = "hunchentoot-single-signon"; - version = "20131111-git"; - asds = [ "hunchentoot-single-signon" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot-single-signon/2013-11-11/hunchentoot-single-signon-20131111-git.tgz"; - sha256 = "0dh16k4105isqwnkl52m55m6cbl7g8wmcrym8175r2zr6qcbghq8"; - system = "hunchentoot-single-signon"; - asd = "hunchentoot-single-signon"; - }); - systems = [ "hunchentoot-single-signon" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "cl-gss" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - hunchentoot-test = { - pname = "hunchentoot-test"; - version = "v1.3.0"; - asds = [ "hunchentoot-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz"; - sha256 = "1z0m45lp6rv59g69l44gj3q3d2bmjlhqzpii0vgkniam21dcimy9"; - system = "hunchentoot-test"; - asd = "hunchentoot"; - }); - systems = [ "hunchentoot-test" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-who" pkgs) (getAttr "drakma" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - hyperluminal-mem = { - pname = "hyperluminal-mem"; - version = "20210630-git"; - asds = [ "hyperluminal-mem" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hyperluminal-mem/2021-06-30/hyperluminal-mem-20210630-git.tgz"; - sha256 = "0qp00g43v518j0wccqnpglkrpikagnn9naphb29wbil6k7y9y7r9"; - system = "hyperluminal-mem"; - asd = "hyperluminal-mem"; - }); - systems = [ "hyperluminal-mem" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "osicat" pkgs) (getAttr "stmx" pkgs) (getAttr "swap-bytes" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - hyperluminal-mem-test = { - pname = "hyperluminal-mem-test"; - version = "20210630-git"; - asds = [ "hyperluminal-mem-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hyperluminal-mem/2021-06-30/hyperluminal-mem-20210630-git.tgz"; - sha256 = "0qp00g43v518j0wccqnpglkrpikagnn9naphb29wbil6k7y9y7r9"; - system = "hyperluminal-mem-test"; - asd = "hyperluminal-mem-test"; - }); - systems = [ "hyperluminal-mem-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "hyperluminal-mem" pkgs) (getAttr "log4cl" pkgs) ]; - }; - hyperobject = { - pname = "hyperobject"; - version = "20201016-git"; - asds = [ "hyperobject" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hyperobject/2020-10-16/hyperobject-20201016-git.tgz"; - sha256 = "1ggqlvwcd52c2d4k8csy7qciaq7lyldi0rpk3b9x4rw4gllcch8n"; - system = "hyperobject"; - asd = "hyperobject"; - }); - systems = [ "hyperobject" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "kmrcl" pkgs) ]; - }; - hyperobject_slash_test = { - pname = "hyperobject_test"; - version = "20201016-git"; - asds = [ "hyperobject" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hyperobject/2020-10-16/hyperobject-20201016-git.tgz"; - sha256 = "1ggqlvwcd52c2d4k8csy7qciaq7lyldi0rpk3b9x4rw4gllcch8n"; - system = "hyperobject"; - asd = "hyperobject"; - }); - systems = [ "hyperobject/test" ]; - lispLibs = [ (getAttr "hyperobject" pkgs) (getAttr "rt" pkgs) ]; - meta = { - broken = true; - }; - }; - hyperspec = { - pname = "hyperspec"; - version = "20181210-git"; - asds = [ "hyperspec" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hyperspec/2018-12-10/hyperspec-20181210-git.tgz"; - sha256 = "0zh1dq2451xw7yiycdr2mrcjx6rgnqnm8c8l9zhhn7hnf51b4x5l"; - system = "hyperspec"; - asd = "hyperspec"; - }); - systems = [ "hyperspec" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - ia-hash-table = { - pname = "ia-hash-table"; - version = "20160318-git"; - asds = [ "ia-hash-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ia-hash-table/2016-03-18/ia-hash-table-20160318-git.tgz"; - sha256 = "11wnwjxa528yyjnfsvw315hyvq3lc996dwx83isdg4hlirj3amy4"; - system = "ia-hash-table"; - asd = "ia-hash-table"; - }); - systems = [ "ia-hash-table" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - ia-hash-table_dot_test = { - pname = "ia-hash-table.test"; - version = "20160318-git"; - asds = [ "ia-hash-table.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ia-hash-table/2016-03-18/ia-hash-table-20160318-git.tgz"; - sha256 = "11wnwjxa528yyjnfsvw315hyvq3lc996dwx83isdg4hlirj3amy4"; - system = "ia-hash-table.test"; - asd = "ia-hash-table.test"; - }); - systems = [ "ia-hash-table.test" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "ia-hash-table" pkgs) (getAttr "log4cl" pkgs) (getAttr "mw-equiv" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - iclendar = { - pname = "iclendar"; - version = "20190710-git"; - asds = [ "iclendar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iclendar/2019-07-10/iclendar-20190710-git.tgz"; - sha256 = "0nyfpv433mvxx61jg7nyj6qc89jr70dmlrkgd94056waddii6h6c"; - system = "iclendar"; - asd = "iclendar"; - }); - systems = [ "iclendar" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "closer-mop" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - iconv = { - pname = "iconv"; - version = "20171227-git"; - asds = [ "iconv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-iconv/2017-12-27/cl-iconv-20171227-git.tgz"; - sha256 = "1lpw95c02inifhdh9kkab9q92i5w9zd788dww1wly2p0a6kyx9wg"; - system = "iconv"; - asd = "iconv"; - }); - systems = [ "iconv" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - id3v2 = { - pname = "id3v2"; - version = "20160208-git"; - asds = [ "id3v2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/id3v2/2016-02-08/id3v2-20160208-git.tgz"; - sha256 = "0x017dfh9m80b8ml2vsgdcfs4kv7p06yzmwdilf1k8nfsilwpfra"; - system = "id3v2"; - asd = "id3v2"; - }); - systems = [ "id3v2" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - id3v2-test = { - pname = "id3v2-test"; - version = "20160208-git"; - asds = [ "id3v2-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/id3v2/2016-02-08/id3v2-20160208-git.tgz"; - sha256 = "0x017dfh9m80b8ml2vsgdcfs4kv7p06yzmwdilf1k8nfsilwpfra"; - system = "id3v2-test"; - asd = "id3v2-test"; - }); - systems = [ "id3v2-test" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "id3v2" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - identifier-pool = { - pname = "identifier-pool"; - version = "20220707-git"; - asds = [ "identifier-pool" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/identifier-pool/2022-07-07/identifier-pool-20220707-git.tgz"; - sha256 = "01fs960s02nf8m3a5v95r12magq9rvgcc3awcppqa7c8yg7qdc55"; - system = "identifier-pool"; - asd = "identifier-pool"; - }); - systems = [ "identifier-pool" ]; - lispLibs = [ (getAttr "dynamic-array" pkgs) (getAttr "mfiano-utils" pkgs) ]; - }; - idna = { - pname = "idna"; - version = "20120107-git"; - asds = [ "idna" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz"; - sha256 = "00nbr3mffxhlq14gg9d16pa6691s4qh35inyw76v906s77khm5a2"; - system = "idna"; - asd = "idna"; - }); - systems = [ "idna" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) ]; - }; - ieee-floats = { - pname = "ieee-floats"; - version = "20220220-git"; - asds = [ "ieee-floats" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ieee-floats/2022-02-20/ieee-floats-20220220-git.tgz"; - sha256 = "0qp2dxq9jzndjfmc8nh0fvcwrrxjm7f012biczipifjckp9gxw7d"; - system = "ieee-floats"; - asd = "ieee-floats"; - }); - systems = [ "ieee-floats" ]; - lispLibs = [ ]; - }; - ieee-floats_slash_tests = { - pname = "ieee-floats_tests"; - version = "20220220-git"; - asds = [ "ieee-floats" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ieee-floats/2022-02-20/ieee-floats-20220220-git.tgz"; - sha256 = "0qp2dxq9jzndjfmc8nh0fvcwrrxjm7f012biczipifjckp9gxw7d"; - system = "ieee-floats"; - asd = "ieee-floats"; - }); - systems = [ "ieee-floats/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "ieee-floats" pkgs) ]; - meta = { - broken = true; - }; - }; - illogical-pathnames = { - pname = "illogical-pathnames"; - version = "20160825-git"; - asds = [ "illogical-pathnames" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/illogical-pathnames/2016-08-25/illogical-pathnames-20160825-git.tgz"; - sha256 = "1yjs1lzgak1d3hz2q6sbac98vqgdxp0dz72fskpz73vrbp6h6da5"; - system = "illogical-pathnames"; - asd = "illogical-pathnames"; - }); - systems = [ "illogical-pathnames" ]; - lispLibs = [ ]; - }; - illusion = { - pname = "illusion"; - version = "20180831-git"; - asds = [ "illusion" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/illusion/2018-08-31/illusion-20180831-git.tgz"; - sha256 = "05wik6q8hlhm7szzymkljfigcp7z35j6rz2ihsmng1y6zq9crk7z"; - system = "illusion"; - asd = "illusion"; - }); - systems = [ "illusion" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "let-over-lambda" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - illusion-test = { - pname = "illusion-test"; - version = "20180831-git"; - asds = [ "illusion-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/illusion/2018-08-31/illusion-20180831-git.tgz"; - sha256 = "05wik6q8hlhm7szzymkljfigcp7z35j6rz2ihsmng1y6zq9crk7z"; - system = "illusion-test"; - asd = "illusion-test"; - }); - systems = [ "illusion-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "illusion" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - image = { - pname = "image"; - version = "20120107-git"; - asds = [ "image" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/image/2012-01-07/image-20120107-git.tgz"; - sha256 = "04by1snzw2kpw208fdi2azxbq5y2q2r6x8zkdh7jk43amkr18f5k"; - system = "image"; - asd = "image"; - }); - systems = [ "image" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "gzip-stream" pkgs) (getAttr "skippy" pkgs) (getAttr "zpng" pkgs) ]; - }; - image-test = { - pname = "image-test"; - version = "20211020-git"; - asds = [ "image-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; - sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4"; - system = "image-test"; - asd = "image-test"; - }); - systems = [ "image-test" ]; - lispLibs = [ (getAttr "png" pkgs) ]; - }; - image-utility = { - pname = "image-utility"; - version = "20200427-git"; - asds = [ "image-utility" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "image-utility"; - asd = "image-utility"; - }); - systems = [ "image-utility" ]; - lispLibs = [ (getAttr "opticl" pkgs) ]; - }; - imago = { - pname = "imago"; - version = "20221106-git"; - asds = [ "imago" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/imago/2022-11-06/imago-20221106-git.tgz"; - sha256 = "1s2adbz84ibp8j4f4zxb0c45qcrih4cdl44z1z379rvj8wqmy1gn"; - system = "imago"; - asd = "imago"; - }); - systems = [ "imago" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "array-operations" pkgs) (getAttr "cl-jpeg" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "zlib" pkgs) ]; - }; - imago_slash_bit-io = { - pname = "imago_bit-io"; - version = "20221106-git"; - asds = [ "imago" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/imago/2022-11-06/imago-20221106-git.tgz"; - sha256 = "1s2adbz84ibp8j4f4zxb0c45qcrih4cdl44z1z379rvj8wqmy1gn"; - system = "imago"; - asd = "imago"; - }); - systems = [ "imago/bit-io" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - imago_slash_jpeg-turbo = { - pname = "imago_jpeg-turbo"; - version = "20221106-git"; - asds = [ "imago" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/imago/2022-11-06/imago-20221106-git.tgz"; - sha256 = "1s2adbz84ibp8j4f4zxb0c45qcrih4cdl44z1z379rvj8wqmy1gn"; - system = "imago"; - asd = "imago"; - }); - systems = [ "imago/jpeg-turbo" ]; - lispLibs = [ (getAttr "imago" pkgs) (getAttr "jpeg-turbo" pkgs) ]; - meta = { - broken = true; - }; - }; - imago_slash_jupyter = { - pname = "imago_jupyter"; - version = "20221106-git"; - asds = [ "imago" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/imago/2022-11-06/imago-20221106-git.tgz"; - sha256 = "1s2adbz84ibp8j4f4zxb0c45qcrih4cdl44z1z379rvj8wqmy1gn"; - system = "imago"; - asd = "imago"; - }); - systems = [ "imago/jupyter" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "common-lisp-jupyter" pkgs) (getAttr "imago" pkgs) (getAttr "jpeg-turbo" pkgs) ]; - meta = { - broken = true; - }; - }; - imago_slash_pngload = { - pname = "imago_pngload"; - version = "20221106-git"; - asds = [ "imago" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/imago/2022-11-06/imago-20221106-git.tgz"; - sha256 = "1s2adbz84ibp8j4f4zxb0c45qcrih4cdl44z1z379rvj8wqmy1gn"; - system = "imago"; - asd = "imago"; - }); - systems = [ "imago/pngload" ]; - lispLibs = [ (getAttr "imago" pkgs) (getAttr "pngload" pkgs) ]; - meta = { - broken = true; - }; - }; - imago_slash_tests = { - pname = "imago_tests"; - version = "20221106-git"; - asds = [ "imago" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/imago/2022-11-06/imago-20221106-git.tgz"; - sha256 = "1s2adbz84ibp8j4f4zxb0c45qcrih4cdl44z1z379rvj8wqmy1gn"; - system = "imago"; - asd = "imago"; - }); - systems = [ "imago/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "imago" pkgs) ]; - meta = { - broken = true; - }; - }; - immutable-struct = { - pname = "immutable-struct"; - version = "20150709-git"; - asds = [ "immutable-struct" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/immutable-struct/2015-07-09/immutable-struct-20150709-git.tgz"; - sha256 = "02868d21hcc0kc3jw8afx23kj6iy1vyf2pddn8yqfrkpldhd0rv9"; - system = "immutable-struct"; - asd = "immutable-struct"; - }); - systems = [ "immutable-struct" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "trivia" pkgs) ]; - }; - in-nomine = { - pname = "in-nomine"; - version = "20221106-git"; - asds = [ "in-nomine" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/in-nomine/2022-11-06/in-nomine-20221106-git.tgz"; - sha256 = "1r28c3c7bbk91fk4w80x2mm0n3czkavip9qfbvgyd19mlarkdwv5"; - system = "in-nomine"; - asd = "in-nomine"; - }); - systems = [ "in-nomine" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - in-nomine_slash_test = { - pname = "in-nomine_test"; - version = "20221106-git"; - asds = [ "in-nomine" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/in-nomine/2022-11-06/in-nomine-20221106-git.tgz"; - sha256 = "1r28c3c7bbk91fk4w80x2mm0n3czkavip9qfbvgyd19mlarkdwv5"; - system = "in-nomine"; - asd = "in-nomine"; - }); - systems = [ "in-nomine/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "fiveam" pkgs) (getAttr "in-nomine" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "lisp-namespace" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - incf-cl = { - pname = "incf-cl"; - version = "20190710-git"; - asds = [ "incf-cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/incf-cl/2019-07-10/incf-cl-20190710-git.tgz"; - sha256 = "1yvwb57dzccvd2lw2h3mwxgbi8ml3cgkyy8kl8hwhd4s8c016ibb"; - system = "incf-cl"; - asd = "incf-cl"; - }); - systems = [ "incf-cl" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - incf-cl_slash_tests = { - pname = "incf-cl_tests"; - version = "20190710-git"; - asds = [ "incf-cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/incf-cl/2019-07-10/incf-cl-20190710-git.tgz"; - sha256 = "1yvwb57dzccvd2lw2h3mwxgbi8ml3cgkyy8kl8hwhd4s8c016ibb"; - system = "incf-cl"; - asd = "incf-cl"; - }); - systems = [ "incf-cl/tests" ]; - lispLibs = [ (getAttr "fiasco" pkgs) (getAttr "incf-cl" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - incognito-keywords = { - pname = "incognito-keywords"; - version = "1.1"; - asds = [ "incognito-keywords" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/incognito-keywords/2013-01-28/incognito-keywords-1.1.tgz"; - sha256 = "1ignvz8v7bq8z9x22skzp1xsna2bxqcw22zh5sp9v2ndbjhqri5c"; - system = "incognito-keywords"; - asd = "incognito-keywords"; - }); - systems = [ "incognito-keywords" ]; - lispLibs = [ (getAttr "enhanced-eval-when" pkgs) (getAttr "map-bind" pkgs) ]; - }; - incongruent-methods = { - pname = "incongruent-methods"; - version = "20130312-git"; - asds = [ "incongruent-methods" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/incongruent-methods/2013-03-12/incongruent-methods-20130312-git.tgz"; - sha256 = "15xfbpnqymbkk92vbirvccxcphyvjmxcw02yv1zs6c78aaf4ms9z"; - system = "incongruent-methods"; - asd = "incongruent-methods"; - }); - systems = [ "incongruent-methods" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - inferior-shell = { - pname = "inferior-shell"; - version = "20200925-git"; - asds = [ "inferior-shell" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz"; - sha256 = "02qx37zzk5j4xmwh77k2qa2wvnzvaj6qml5dh2q7b6b1ljvgcj4m"; - system = "inferior-shell"; - asd = "inferior-shell"; - }); - systems = [ "inferior-shell" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fare-mop" pkgs) (getAttr "fare-quasiquote-extras" pkgs) (getAttr "fare-utils" pkgs) (getAttr "trivia" pkgs) (getAttr "trivia_dot_quasiquote" pkgs) ]; - }; - inferior-shell_slash_test = { - pname = "inferior-shell_test"; - version = "20200925-git"; - asds = [ "inferior-shell" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz"; - sha256 = "02qx37zzk5j4xmwh77k2qa2wvnzvaj6qml5dh2q7b6b1ljvgcj4m"; - system = "inferior-shell"; - asd = "inferior-shell"; - }); - systems = [ "inferior-shell/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "inferior-shell" pkgs) ]; - meta = { - broken = true; - }; - }; - infix = { - pname = "infix"; - version = "20210411-git"; - asds = [ "infix" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; - system = "infix"; - asd = "infix"; - }); - systems = [ "infix" ]; - lispLibs = [ ]; - }; - infix-dollar-reader = { - pname = "infix-dollar-reader"; - version = "20121013-git"; - asds = [ "infix-dollar-reader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/infix-dollar-reader/2012-10-13/infix-dollar-reader-20121013-git.tgz"; - sha256 = "11sf4kqcw8s0zcjz1qpbhkn33rizvq5ijl6xp59q9wadvkd0wx0w"; - system = "infix-dollar-reader"; - asd = "infix-dollar-reader"; - }); - systems = [ "infix-dollar-reader" ]; - lispLibs = [ (getAttr "cl-syntax" pkgs) ]; - }; - infix-dollar-reader-test = { - pname = "infix-dollar-reader-test"; - version = "20121013-git"; - asds = [ "infix-dollar-reader-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/infix-dollar-reader/2012-10-13/infix-dollar-reader-20121013-git.tgz"; - sha256 = "11sf4kqcw8s0zcjz1qpbhkn33rizvq5ijl6xp59q9wadvkd0wx0w"; - system = "infix-dollar-reader-test"; - asd = "infix-dollar-reader-test"; - }); - systems = [ "infix-dollar-reader-test" ]; - lispLibs = [ (getAttr "infix-dollar-reader" pkgs) (getAttr "rt" pkgs) ]; - }; - infix-math = { - pname = "infix-math"; - version = "20211020-git"; - asds = [ "infix-math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/infix-math/2021-10-20/infix-math-20211020-git.tgz"; - sha256 = "1h6p254xl793wfq3qla5y95k6zimy477f8brblx6ran3rg3bydbg"; - system = "infix-math"; - asd = "infix-math"; - }); - systems = [ "infix-math" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "asdf-package-system" pkgs) (getAttr "parse-number" pkgs) (getAttr "serapeum" pkgs) (getAttr "wu-decimal" pkgs) ]; - }; - infix-reader = { - pname = "infix-reader"; - version = "20221106-git"; - asds = [ "infix-reader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/infix-reader/2022-11-06/infix-reader-20221106-git.tgz"; - sha256 = "16b6cw4w80p3yxsv0pqaiq0ay1v3jswlav2mlfsmhawpvhxsmb7z"; - system = "infix-reader"; - asd = "infix-reader"; - }); - systems = [ "infix-reader" ]; - lispLibs = [ ]; - }; - inheriting-readers = { - pname = "inheriting-readers"; - version = "1.0.1"; - asds = [ "inheriting-readers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inheriting-readers/2021-01-24/inheriting-readers_1.0.1.tgz"; - sha256 = "0km3mq6vx1q9qv6j3r4sqqcsdbnb5jar66bl0mzzpaacfvzbx68p"; - system = "inheriting-readers"; - asd = "inheriting-readers"; - }); - systems = [ "inheriting-readers" ]; - lispLibs = [ (getAttr "class-options" pkgs) (getAttr "closer-mop" pkgs) (getAttr "compatible-metaclasses" pkgs) ]; - }; - inheriting-readers_tests = { - pname = "inheriting-readers_tests"; - version = "1.0.1"; - asds = [ "inheriting-readers_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inheriting-readers/2021-01-24/inheriting-readers_1.0.1.tgz"; - sha256 = "0km3mq6vx1q9qv6j3r4sqqcsdbnb5jar66bl0mzzpaacfvzbx68p"; - system = "inheriting-readers_tests"; - asd = "inheriting-readers_tests"; - }); - systems = [ "inheriting-readers_tests" ]; - lispLibs = [ (getAttr "compatible-metaclasses" pkgs) (getAttr "inheriting-readers" pkgs) (getAttr "parachute" pkgs) ]; - }; - injection = { - pname = "injection"; - version = "20160531-git"; - asds = [ "injection" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/injection/2016-05-31/injection-20160531-git.tgz"; - sha256 = "12f838ikgyl7gzh2dnqh54hfa8rncbkk266bsibmbbqxz0cn2da7"; - system = "injection"; - asd = "injection"; - }); - systems = [ "injection" ]; - lispLibs = [ (getAttr "cl-yaml" pkgs) ]; - }; - injection-test = { - pname = "injection-test"; - version = "20160531-git"; - asds = [ "injection-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/injection/2016-05-31/injection-20160531-git.tgz"; - sha256 = "12f838ikgyl7gzh2dnqh54hfa8rncbkk266bsibmbbqxz0cn2da7"; - system = "injection-test"; - asd = "injection-test"; - }); - systems = [ "injection-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "injection" pkgs) ]; - }; - inkwell = { - pname = "inkwell"; - version = "20190710-git"; - asds = [ "inkwell" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inkwell/2019-07-10/inkwell-20190710-git.tgz"; - sha256 = "0wzd2j7wdi4dxrmvwk47h988l107ajvw3z609f0dg5vh6wad8pnk"; - system = "inkwell"; - asd = "inkwell"; - }); - systems = [ "inkwell" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "drakma" pkgs) (getAttr "local-time" pkgs) (getAttr "yason" pkgs) ]; - }; - inlined-generic-function = { - pname = "inlined-generic-function"; - version = "20190521-git"; - asds = [ "inlined-generic-function" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inlined-generic-function/2019-05-21/inlined-generic-function-20190521-git.tgz"; - sha256 = "0kj9p99m9hwx4lx95npfln5dc5ip884f8agjc6h4y0rhnpj7r8gk"; - system = "inlined-generic-function"; - asd = "inlined-generic-function"; - }); - systems = [ "inlined-generic-function" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "iterate" pkgs) (getAttr "trivia" pkgs) ]; - }; - inlined-generic-function_dot_test = { - pname = "inlined-generic-function.test"; - version = "20190521-git"; - asds = [ "inlined-generic-function.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inlined-generic-function/2019-05-21/inlined-generic-function-20190521-git.tgz"; - sha256 = "0kj9p99m9hwx4lx95npfln5dc5ip884f8agjc6h4y0rhnpj7r8gk"; - system = "inlined-generic-function.test"; - asd = "inlined-generic-function.test"; - }); - systems = [ "inlined-generic-function.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "inlined-generic-function" pkgs) ]; - }; - inner-conditional = { - pname = "inner-conditional"; - version = "20200925-git"; - asds = [ "inner-conditional" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inner-conditional/2020-09-25/inner-conditional-20200925-git.tgz"; - sha256 = "08vaq29l2bhv4n1c6zb3syddwpad66rghfy71fqidjvbag0ji71k"; - system = "inner-conditional"; - asd = "inner-conditional"; - }); - systems = [ "inner-conditional" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "iterate" pkgs) (getAttr "trivia" pkgs) ]; - }; - inner-conditional-test = { - pname = "inner-conditional-test"; - version = "20200925-git"; - asds = [ "inner-conditional-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inner-conditional/2020-09-25/inner-conditional-20200925-git.tgz"; - sha256 = "08vaq29l2bhv4n1c6zb3syddwpad66rghfy71fqidjvbag0ji71k"; - system = "inner-conditional-test"; - asd = "inner-conditional-test"; - }); - systems = [ "inner-conditional-test" ]; - lispLibs = [ (getAttr "inner-conditional" pkgs) (getAttr "cl-test-more" pkgs) ]; - }; - inotify = { - pname = "inotify"; - version = "20150608-git"; - asds = [ "inotify" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inotify/2015-06-08/inotify-20150608-git.tgz"; - sha256 = "0jill05wsa7xbnkycc1ik1a05slv2h34fpyap2rxbnxvfjvyzw98"; - system = "inotify"; - asd = "inotify"; - }); - systems = [ "inotify" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "iolib" pkgs) ]; - }; - input-event-codes = { - pname = "input-event-codes"; - version = "20221106-git"; - asds = [ "input-event-codes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/input-event-codes/2022-11-06/input-event-codes-20221106-git.tgz"; - sha256 = "1m96m9ia4frcn2xqaw4mfspjjzwl8gyj4k4rv0lq28va4s6mkgii"; - system = "input-event-codes"; - asd = "input-event-codes"; - }); - systems = [ "input-event-codes" ]; - lispLibs = [ (getAttr "trivial-features" pkgs) ]; - }; - input-event-codes_slash_test = { - pname = "input-event-codes_test"; - version = "20221106-git"; - asds = [ "input-event-codes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/input-event-codes/2022-11-06/input-event-codes-20221106-git.tgz"; - sha256 = "1m96m9ia4frcn2xqaw4mfspjjzwl8gyj4k4rv0lq28va4s6mkgii"; - system = "input-event-codes"; - asd = "input-event-codes"; - }); - systems = [ "input-event-codes/test" ]; - lispLibs = [ (getAttr "input-event-codes" pkgs) (getAttr "parachute" pkgs) ]; - meta = { - broken = true; - }; - }; - inquisitor = { - pname = "inquisitor"; - version = "20190521-git"; - asds = [ "inquisitor" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz"; - sha256 = "08rkmqnwlq6v84wcz9yp31j5lxrsy33kv3dh7n3ccsg4kc54slzw"; - system = "inquisitor"; - asd = "inquisitor"; - }); - systems = [ "inquisitor" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) ]; - }; - inquisitor-flexi = { - pname = "inquisitor-flexi"; - version = "20190521-git"; - asds = [ "inquisitor-flexi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz"; - sha256 = "08rkmqnwlq6v84wcz9yp31j5lxrsy33kv3dh7n3ccsg4kc54slzw"; - system = "inquisitor-flexi"; - asd = "inquisitor-flexi"; - }); - systems = [ "inquisitor-flexi" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "inquisitor" pkgs) ]; - }; - inquisitor-flexi-test = { - pname = "inquisitor-flexi-test"; - version = "20190521-git"; - asds = [ "inquisitor-flexi-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz"; - sha256 = "08rkmqnwlq6v84wcz9yp31j5lxrsy33kv3dh7n3ccsg4kc54slzw"; - system = "inquisitor-flexi-test"; - asd = "inquisitor-flexi-test"; - }); - systems = [ "inquisitor-flexi-test" ]; - lispLibs = [ (getAttr "inquisitor-flexi" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - inquisitor-test = { - pname = "inquisitor-test"; - version = "20190521-git"; - asds = [ "inquisitor-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/inquisitor/2019-05-21/inquisitor-20190521-git.tgz"; - sha256 = "08rkmqnwlq6v84wcz9yp31j5lxrsy33kv3dh7n3ccsg4kc54slzw"; - system = "inquisitor-test"; - asd = "inquisitor-test"; - }); - systems = [ "inquisitor-test" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "inquisitor" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - instance-tracking = { - pname = "instance-tracking"; - version = "20221106-git"; - asds = [ "instance-tracking" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/instance-tracking/2022-11-06/instance-tracking-20221106-git.tgz"; - sha256 = "0bbxvl14ahws30x5dgjhilhybjgn1jfcbxwr8ji1ls31zf88fphr"; - system = "instance-tracking"; - asd = "instance-tracking"; - }); - systems = [ "instance-tracking" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - integral = { - pname = "integral"; - version = "20200325-git"; - asds = [ "integral" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/integral/2020-03-25/integral-20200325-git.tgz"; - sha256 = "17a9wg7n3f81fsi5mlsdxain1fw7ggfniipfrb9sr1ajff6lx9gs"; - system = "integral"; - asd = "integral"; - }); - systems = [ "integral" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "dbi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "clos-fixtures" pkgs) (getAttr "closer-mop" pkgs) (getAttr "group-by" pkgs) (getAttr "iterate" pkgs) (getAttr "split-sequence" pkgs) (getAttr "sxql" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - integral-rest = { - pname = "integral-rest"; - version = "20150923-git"; - asds = [ "integral-rest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/integral-rest/2015-09-23/integral-rest-20150923-git.tgz"; - sha256 = "0187d9i7acw2v1hhy7wcz0vk90ji7cdgpaikb7admvzq0nnbzrmm"; - system = "integral-rest"; - asd = "integral-rest"; - }); - systems = [ "integral-rest" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-inflector" pkgs) (getAttr "closer-mop" pkgs) (getAttr "integral" pkgs) (getAttr "jonathan" pkgs) (getAttr "map-set" pkgs) (getAttr "ningle" pkgs) ]; - }; - integral-rest-test = { - pname = "integral-rest-test"; - version = "20150923-git"; - asds = [ "integral-rest-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/integral-rest/2015-09-23/integral-rest-20150923-git.tgz"; - sha256 = "0187d9i7acw2v1hhy7wcz0vk90ji7cdgpaikb7admvzq0nnbzrmm"; - system = "integral-rest-test"; - asd = "integral-rest-test"; - }); - systems = [ "integral-rest-test" ]; - lispLibs = [ (getAttr "integral" pkgs) (getAttr "integral-rest" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - integral-test = { - pname = "integral-test"; - version = "20200325-git"; - asds = [ "integral-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/integral/2020-03-25/integral-20200325-git.tgz"; - sha256 = "17a9wg7n3f81fsi5mlsdxain1fw7ggfniipfrb9sr1ajff6lx9gs"; - system = "integral-test"; - asd = "integral-test"; - }); - systems = [ "integral-test" ]; - lispLibs = [ (getAttr "integral" pkgs) (getAttr "local-time" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - }; - intel-hex = { - pname = "intel-hex"; - version = "20160318-git"; - asds = [ "intel-hex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/intel-hex/2016-03-18/intel-hex-20160318-git.tgz"; - sha256 = "0sz51qw262nh6ziwpy1kgv257nj56rp42s0g6g2rx3xv1ijdy395"; - system = "intel-hex"; - asd = "intel-hex"; - }); - systems = [ "intel-hex" ]; - lispLibs = [ ]; - }; - intel-hex-test = { - pname = "intel-hex-test"; - version = "20160318-git"; - asds = [ "intel-hex-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/intel-hex/2016-03-18/intel-hex-20160318-git.tgz"; - sha256 = "0sz51qw262nh6ziwpy1kgv257nj56rp42s0g6g2rx3xv1ijdy395"; - system = "intel-hex-test"; - asd = "intel-hex-test"; - }); - systems = [ "intel-hex-test" ]; - lispLibs = [ (getAttr "intel-hex" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - intercom = { - pname = "intercom"; - version = "20130615-git"; - asds = [ "intercom" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/intercom/2013-06-15/intercom-20130615-git.tgz"; - sha256 = "017klgjsza4cxdxms4hxgrfrwjshkcr2yyxnhg14zs9w0vjwkikl"; - system = "intercom"; - asd = "intercom"; - }); - systems = [ "intercom" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "jsown" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - intercom-examples = { - pname = "intercom-examples"; - version = "20130615-git"; - asds = [ "intercom-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/intercom/2013-06-15/intercom-20130615-git.tgz"; - sha256 = "017klgjsza4cxdxms4hxgrfrwjshkcr2yyxnhg14zs9w0vjwkikl"; - system = "intercom-examples"; - asd = "intercom-examples"; - }); - systems = [ "intercom-examples" ]; - lispLibs = [ (getAttr "intercom" pkgs) (getAttr "jsown" pkgs) ]; - }; - interface = { - pname = "interface"; - version = "20190307-hg"; - asds = [ "interface" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/interface/2019-03-07/interface-20190307-hg.tgz"; - sha256 = "0q3pg1zn8rnyllvb4yh9dm38m4paw9glsnby61j6pyyb0ngywyf7"; - system = "interface"; - asd = "interface"; - }); - systems = [ "interface" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "global-vars" pkgs) ]; - }; - interfaces-test-implementation = { - pname = "interfaces-test-implementation"; - version = "20210630-git"; - asds = [ "interfaces-test-implementation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/modularize-interfaces/2021-06-30/modularize-interfaces-20210630-git.tgz"; - sha256 = "1jl11ffkrah3553wzysmxanhrzv3rnzi5x11ll626baf69im0v7x"; - system = "interfaces-test-implementation"; - asd = "interfaces-test-implementation"; - }); - systems = [ "interfaces-test-implementation" ]; - lispLibs = [ (getAttr "modularize" pkgs) (getAttr "modularize-interfaces" pkgs) ]; - }; - introspect-environment = { - pname = "introspect-environment"; - version = "20220220-git"; - asds = [ "introspect-environment" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/introspect-environment/2022-02-20/introspect-environment-20220220-git.tgz"; - sha256 = "1p48jnr1im47529w0ciyar4hfwbivqi57zgllkmfrav09ffigk9s"; - system = "introspect-environment"; - asd = "introspect-environment"; - }); - systems = [ "introspect-environment" ]; - lispLibs = [ ]; - }; - introspect-environment-test = { - pname = "introspect-environment-test"; - version = "20220220-git"; - asds = [ "introspect-environment-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/introspect-environment/2022-02-20/introspect-environment-20220220-git.tgz"; - sha256 = "1p48jnr1im47529w0ciyar4hfwbivqi57zgllkmfrav09ffigk9s"; - system = "introspect-environment-test"; - asd = "introspect-environment-test"; - }); - systems = [ "introspect-environment-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "introspect-environment" pkgs) ]; - }; - iolib = { - pname = "iolib"; - version = "v0.8.4"; - asds = [ "iolib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib"; - asd = "iolib"; - }); - systems = [ "iolib" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "idna" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_base" pkgs) (getAttr "iolib_dot_conf" pkgs) (getAttr "swap-bytes" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - iolib_dot_asdf = { - pname = "iolib.asdf"; - version = "v0.8.4"; - asds = [ "iolib.asdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib.asdf"; - asd = "iolib.asdf"; - }); - systems = [ "iolib.asdf" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - iolib_dot_base = { - pname = "iolib.base"; - version = "v0.8.4"; - asds = [ "iolib.base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib.base"; - asd = "iolib.base"; - }); - systems = [ "iolib.base" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_common-lisp" pkgs) (getAttr "iolib_dot_conf" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - iolib_dot_common-lisp = { - pname = "iolib.common-lisp"; - version = "v0.8.4"; - asds = [ "iolib.common-lisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib.common-lisp"; - asd = "iolib.common-lisp"; - }); - systems = [ "iolib.common-lisp" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_conf" pkgs) ]; - }; - iolib_dot_conf = { - pname = "iolib.conf"; - version = "v0.8.4"; - asds = [ "iolib.conf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib.conf"; - asd = "iolib.conf"; - }); - systems = [ "iolib.conf" ]; - lispLibs = [ (getAttr "iolib_dot_asdf" pkgs) ]; - }; - iolib_dot_examples = { - pname = "iolib.examples"; - version = "v0.8.4"; - asds = [ "iolib.examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib.examples"; - asd = "iolib.examples"; - }); - systems = [ "iolib.examples" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "iolib" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_base" pkgs) (getAttr "iolib_dot_conf" pkgs) ]; - }; - iolib_slash_multiplex = { - pname = "iolib_multiplex"; - version = "v0.8.4"; - asds = [ "iolib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib"; - asd = "iolib"; - }); - systems = [ "iolib/multiplex" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_base" pkgs) (getAttr "iolib_dot_conf" pkgs) (getAttr "trivial-features" pkgs) ]; - meta = { - broken = true; - }; - }; - iolib_slash_os = { - pname = "iolib_os"; - version = "v0.8.4"; - asds = [ "iolib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib"; - asd = "iolib"; - }); - systems = [ "iolib/os" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_base" pkgs) (getAttr "iolib_dot_conf" pkgs) (getAttr "trivial-features" pkgs) ]; - meta = { - broken = true; - }; - }; - iolib_slash_pathnames = { - pname = "iolib_pathnames"; - version = "v0.8.4"; - asds = [ "iolib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib"; - asd = "iolib"; - }); - systems = [ "iolib/pathnames" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_base" pkgs) (getAttr "iolib_dot_conf" pkgs) (getAttr "trivial-features" pkgs) ]; - meta = { - broken = true; - }; - }; - iolib_slash_sockets = { - pname = "iolib_sockets"; - version = "v0.8.4"; - asds = [ "iolib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib"; - asd = "iolib"; - }); - systems = [ "iolib/sockets" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "idna" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_base" pkgs) (getAttr "iolib_dot_conf" pkgs) (getAttr "swap-bytes" pkgs) (getAttr "trivial-features" pkgs) ]; - meta = { - broken = true; - }; - }; - iolib_slash_streams = { - pname = "iolib_streams"; - version = "v0.8.4"; - asds = [ "iolib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib"; - asd = "iolib"; - }); - systems = [ "iolib/streams" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_base" pkgs) (getAttr "iolib_dot_conf" pkgs) (getAttr "trivial-features" pkgs) ]; - meta = { - broken = true; - }; - }; - iolib_slash_syscalls = { - pname = "iolib_syscalls"; - version = "v0.8.4"; - asds = [ "iolib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib"; - asd = "iolib"; - }); - systems = [ "iolib/syscalls" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_base" pkgs) (getAttr "iolib_dot_conf" pkgs) (getAttr "trivial-features" pkgs) ]; - meta = { - broken = true; - }; - }; - iolib_slash_tests = { - pname = "iolib_tests"; - version = "v0.8.4"; - asds = [ "iolib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib"; - asd = "iolib"; - }); - systems = [ "iolib/tests" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "fiveam" pkgs) (getAttr "iolib" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_base" pkgs) (getAttr "iolib_dot_conf" pkgs) (getAttr "trivial-features" pkgs) ]; - meta = { - broken = true; - }; - }; - iolib_slash_trivial-sockets = { - pname = "iolib_trivial-sockets"; - version = "v0.8.4"; - asds = [ "iolib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib"; - asd = "iolib"; - }); - systems = [ "iolib/trivial-sockets" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "idna" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_base" pkgs) (getAttr "iolib_dot_conf" pkgs) (getAttr "swap-bytes" pkgs) (getAttr "trivial-features" pkgs) ]; - meta = { - broken = true; - }; - }; - iolib_slash_zstreams = { - pname = "iolib_zstreams"; - version = "v0.8.4"; - asds = [ "iolib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "1f43jqqqwp9n7xksqxw91myapsdbc2dxck6nd6flakbnp9haylyq"; - system = "iolib"; - asd = "iolib"; - }); - systems = [ "iolib/zstreams" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "iolib_dot_asdf" pkgs) (getAttr "iolib_dot_base" pkgs) (getAttr "iolib_dot_conf" pkgs) (getAttr "trivial-features" pkgs) ]; - meta = { - broken = true; - }; - }; - ip-interfaces = { - pname = "ip-interfaces"; - version = "0.2.1"; - asds = [ "ip-interfaces" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ip-interfaces/2018-12-10/ip-interfaces-0.2.1.tgz"; - sha256 = "035sc4li0qz4lzjn555h8r2qkhc8a65zglk30f1b3pi9p44g91mw"; - system = "ip-interfaces"; - asd = "ip-interfaces"; - }); - systems = [ "ip-interfaces" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - ip-interfaces-test = { - pname = "ip-interfaces-test"; - version = "0.2.1"; - asds = [ "ip-interfaces-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ip-interfaces/2018-12-10/ip-interfaces-0.2.1.tgz"; - sha256 = "035sc4li0qz4lzjn555h8r2qkhc8a65zglk30f1b3pi9p44g91mw"; - system = "ip-interfaces-test"; - asd = "ip-interfaces-test"; - }); - systems = [ "ip-interfaces-test" ]; - lispLibs = [ (getAttr "ip-interfaces" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - irc-logger = { - pname = "irc-logger"; - version = "20150923-git"; - asds = [ "irc-logger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/irc-logger/2015-09-23/irc-logger-20150923-git.tgz"; - sha256 = "1ylq8qnf29dij7133p19cmmmw3i7w6azncsdvpd4j0k1fqp14bq7"; - system = "irc-logger"; - asd = "irc-logger"; - }); - systems = [ "irc-logger" ]; - lispLibs = [ (getAttr "cl-irc" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - ironclad = { - pname = "ironclad"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - ironclad-text = { - pname = "ironclad-text"; - version = "v0.58"; - asds = [ "ironclad-text" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad-text"; - asd = "ironclad-text"; - }); - systems = [ "ironclad-text" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "ironclad" pkgs) ]; - }; - ironclad_slash_aead_slash_eax = { - pname = "ironclad_aead_eax"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/aead/eax" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_aead_slash_etm = { - pname = "ironclad_aead_etm"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/aead/etm" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_aead_slash_gcm = { - pname = "ironclad_aead_gcm"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/aead/gcm" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_aeads = { - pname = "ironclad_aeads"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/aeads" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_aes = { - pname = "ironclad_cipher_aes"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/aes" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_arcfour = { - pname = "ironclad_cipher_arcfour"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/arcfour" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_aria = { - pname = "ironclad_cipher_aria"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/aria" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_blowfish = { - pname = "ironclad_cipher_blowfish"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/blowfish" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_camellia = { - pname = "ironclad_cipher_camellia"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/camellia" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_cast5 = { - pname = "ironclad_cipher_cast5"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/cast5" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_chacha = { - pname = "ironclad_cipher_chacha"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/chacha" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_des = { - pname = "ironclad_cipher_des"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/des" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_idea = { - pname = "ironclad_cipher_idea"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/idea" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_kalyna = { - pname = "ironclad_cipher_kalyna"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/kalyna" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_keystream = { - pname = "ironclad_cipher_keystream"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/keystream" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_kuznyechik = { - pname = "ironclad_cipher_kuznyechik"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/kuznyechik" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_misty1 = { - pname = "ironclad_cipher_misty1"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/misty1" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_rc2 = { - pname = "ironclad_cipher_rc2"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/rc2" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_rc5 = { - pname = "ironclad_cipher_rc5"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/rc5" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_rc6 = { - pname = "ironclad_cipher_rc6"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/rc6" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_salsa20 = { - pname = "ironclad_cipher_salsa20"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/salsa20" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_seed = { - pname = "ironclad_cipher_seed"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/seed" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_serpent = { - pname = "ironclad_cipher_serpent"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/serpent" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_sm4 = { - pname = "ironclad_cipher_sm4"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/sm4" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_sosemanuk = { - pname = "ironclad_cipher_sosemanuk"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/sosemanuk" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_square = { - pname = "ironclad_cipher_square"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/square" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_tea = { - pname = "ironclad_cipher_tea"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/tea" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_threefish = { - pname = "ironclad_cipher_threefish"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/threefish" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_twofish = { - pname = "ironclad_cipher_twofish"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/twofish" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_xchacha = { - pname = "ironclad_cipher_xchacha"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/xchacha" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_xor = { - pname = "ironclad_cipher_xor"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/xor" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_xsalsa20 = { - pname = "ironclad_cipher_xsalsa20"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/xsalsa20" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_cipher_slash_xtea = { - pname = "ironclad_cipher_xtea"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/cipher/xtea" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_ciphers = { - pname = "ironclad_ciphers"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/ciphers" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_core = { - pname = "ironclad_core"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/core" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_adler32 = { - pname = "ironclad_digest_adler32"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/adler32" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_blake2 = { - pname = "ironclad_digest_blake2"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/blake2" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_blake2s = { - pname = "ironclad_digest_blake2s"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/blake2s" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_crc24 = { - pname = "ironclad_digest_crc24"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/crc24" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_crc32 = { - pname = "ironclad_digest_crc32"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/crc32" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_groestl = { - pname = "ironclad_digest_groestl"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/groestl" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_jh = { - pname = "ironclad_digest_jh"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/jh" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_kupyna = { - pname = "ironclad_digest_kupyna"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/kupyna" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_md2 = { - pname = "ironclad_digest_md2"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/md2" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_md4 = { - pname = "ironclad_digest_md4"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/md4" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_md5 = { - pname = "ironclad_digest_md5"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/md5" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_ripemd-128 = { - pname = "ironclad_digest_ripemd-128"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/ripemd-128" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_ripemd-160 = { - pname = "ironclad_digest_ripemd-160"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/ripemd-160" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_sha1 = { - pname = "ironclad_digest_sha1"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/sha1" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_sha256 = { - pname = "ironclad_digest_sha256"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/sha256" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_sha3 = { - pname = "ironclad_digest_sha3"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/sha3" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_sha512 = { - pname = "ironclad_digest_sha512"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/sha512" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_skein = { - pname = "ironclad_digest_skein"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/skein" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_sm3 = { - pname = "ironclad_digest_sm3"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/sm3" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_streebog = { - pname = "ironclad_digest_streebog"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/streebog" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_tiger = { - pname = "ironclad_digest_tiger"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/tiger" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_tree-hash = { - pname = "ironclad_digest_tree-hash"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/tree-hash" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digest_slash_whirlpool = { - pname = "ironclad_digest_whirlpool"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digest/whirlpool" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_digests = { - pname = "ironclad_digests"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/digests" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_kdf_slash_argon2 = { - pname = "ironclad_kdf_argon2"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/kdf/argon2" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_kdf_slash_bcrypt = { - pname = "ironclad_kdf_bcrypt"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/kdf/bcrypt" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_kdf_slash_hmac = { - pname = "ironclad_kdf_hmac"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/kdf/hmac" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_kdf_slash_password-hash = { - pname = "ironclad_kdf_password-hash"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/kdf/password-hash" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_kdf_slash_pkcs5 = { - pname = "ironclad_kdf_pkcs5"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/kdf/pkcs5" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_kdf_slash_scrypt = { - pname = "ironclad_kdf_scrypt"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/kdf/scrypt" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_kdfs = { - pname = "ironclad_kdfs"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/kdfs" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_mac_slash_blake2-mac = { - pname = "ironclad_mac_blake2-mac"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/mac/blake2-mac" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_mac_slash_blake2s-mac = { - pname = "ironclad_mac_blake2s-mac"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/mac/blake2s-mac" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_mac_slash_cmac = { - pname = "ironclad_mac_cmac"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/mac/cmac" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_mac_slash_gmac = { - pname = "ironclad_mac_gmac"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/mac/gmac" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_mac_slash_hmac = { - pname = "ironclad_mac_hmac"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/mac/hmac" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_mac_slash_poly1305 = { - pname = "ironclad_mac_poly1305"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/mac/poly1305" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_mac_slash_siphash = { - pname = "ironclad_mac_siphash"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/mac/siphash" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_mac_slash_skein-mac = { - pname = "ironclad_mac_skein-mac"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/mac/skein-mac" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_macs = { - pname = "ironclad_macs"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/macs" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_prng_slash_fortuna = { - pname = "ironclad_prng_fortuna"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/prng/fortuna" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_prngs = { - pname = "ironclad_prngs"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/prngs" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_public-key_slash_curve25519 = { - pname = "ironclad_public-key_curve25519"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/public-key/curve25519" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_public-key_slash_curve448 = { - pname = "ironclad_public-key_curve448"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/public-key/curve448" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_public-key_slash_dsa = { - pname = "ironclad_public-key_dsa"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/public-key/dsa" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_public-key_slash_ed25519 = { - pname = "ironclad_public-key_ed25519"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/public-key/ed25519" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_public-key_slash_ed448 = { - pname = "ironclad_public-key_ed448"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/public-key/ed448" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_public-key_slash_elgamal = { - pname = "ironclad_public-key_elgamal"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/public-key/elgamal" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_public-key_slash_rsa = { - pname = "ironclad_public-key_rsa"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/public-key/rsa" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_public-key_slash_secp256k1 = { - pname = "ironclad_public-key_secp256k1"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/public-key/secp256k1" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_public-key_slash_secp256r1 = { - pname = "ironclad_public-key_secp256r1"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/public-key/secp256r1" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_public-key_slash_secp384r1 = { - pname = "ironclad_public-key_secp384r1"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/public-key/secp384r1" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_public-key_slash_secp521r1 = { - pname = "ironclad_public-key_secp521r1"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/public-key/secp521r1" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_public-keys = { - pname = "ironclad_public-keys"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/public-keys" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - ironclad_slash_tests = { - pname = "ironclad_tests"; - version = "v0.58"; - asds = [ "ironclad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ironclad/2022-11-06/ironclad-v0.58.tgz"; - sha256 = "17plga14y1425g7midysj49x12kssqa77l43cr3sm9976zpya8i8"; - system = "ironclad"; - asd = "ironclad"; - }); - systems = [ "ironclad/tests" ]; - lispLibs = [ (getAttr "ironclad" pkgs) (getAttr "rt" pkgs) ]; - meta = { - broken = true; - }; - }; - isolated = { - pname = "isolated"; - version = "20200218-git"; - asds = [ "isolated" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-isolated/2020-02-18/cl-isolated-20200218-git.tgz"; - sha256 = "01wbis4dw2cy7d2yh30rwvmlx3dr5s9dx8hs19xhjpznjbqfyksi"; - system = "isolated"; - asd = "isolated"; - }); - systems = [ "isolated" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - issr = { - pname = "issr"; - version = "20211020-git"; - asds = [ "issr" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/hunchenissr/2021-10-20/hunchenissr-20211020-git.tgz"; - sha256 = "1dfm7zdvyj14my8giznq1vsy20nj7my71y7a657slhf6v2cap5vs"; - system = "issr"; - asd = "issr"; - }); - systems = [ "issr" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-base64" pkgs) (getAttr "str" pkgs) (getAttr "yxorp" pkgs) (getAttr "do-urlencode" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "jonathan" pkgs) (getAttr "plump" pkgs) (getAttr "portal" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - issr-core = { - pname = "issr-core"; - version = "20210228-git"; - asds = [ "issr-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/core/2021-02-28/core-20210228-git.tgz"; - sha256 = "1bajb09crzadkirdpd6jrpcc55irjd4sxzavygr25l85pafyhniw"; - system = "issr-core"; - asd = "issr-core"; - }); - systems = [ "issr-core" ]; - lispLibs = [ (getAttr "str" pkgs) (getAttr "global-vars" pkgs) (getAttr "plump" pkgs) (getAttr "tailrec" pkgs) ]; - }; - iterate = { - pname = "iterate"; - version = "release-b0f9a9c6-git"; - asds = [ "iterate" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iterate/2021-05-31/iterate-release-b0f9a9c6-git.tgz"; - sha256 = "09xq2mdr97hagjrjpc47mp8l9wfp697aa9qaqmsy0yskayzg6xsc"; - system = "iterate"; - asd = "iterate"; - }); - systems = [ "iterate" ]; - lispLibs = [ ]; - }; - iterate-clsql = { - pname = "iterate-clsql"; - version = "20130312-http"; - asds = [ "iterate-clsql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iterate-clsql/2013-03-12/iterate-clsql-20130312-http.tgz"; - sha256 = "0adfs31zin5kkg9z5kyzykf8gmcgr600vvi4mjx7nixybh326h3h"; - system = "iterate-clsql"; - asd = "iterate-clsql"; - }); - systems = [ "iterate-clsql" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "iterate" pkgs) ]; - }; - iterate_slash_tests = { - pname = "iterate_tests"; - version = "release-b0f9a9c6-git"; - asds = [ "iterate" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/iterate/2021-05-31/iterate-release-b0f9a9c6-git.tgz"; - sha256 = "09xq2mdr97hagjrjpc47mp8l9wfp697aa9qaqmsy0yskayzg6xsc"; - system = "iterate"; - asd = "iterate"; - }); - systems = [ "iterate/tests" ]; - lispLibs = [ (getAttr "iterate" pkgs) ]; - meta = { - broken = true; - }; - }; - ixf = { - pname = "ixf"; - version = "20180228-git"; - asds = [ "ixf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-ixf/2018-02-28/cl-ixf-20180228-git.tgz"; - sha256 = "1wjdnf4vr9z7lcfc49kl43g6l2i23q9n81siy494k17d766cdvqa"; - system = "ixf"; - asd = "ixf"; - }); - systems = [ "ixf" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "local-time" pkgs) (getAttr "md5" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - jenkins_dot_api = { - pname = "jenkins.api"; - version = "20130312-git"; - asds = [ "jenkins.api" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jenkins/2013-03-12/jenkins-20130312-git.tgz"; - sha256 = "1kis95k3fwlaq2jbpia0wps4gq461w6p57dxlbvb0c6a5dgh4dwf"; - system = "jenkins.api"; - asd = "jenkins.api"; - }); - systems = [ "jenkins.api" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "drakma" pkgs) (getAttr "iterate" pkgs) (getAttr "let-plus" pkgs) (getAttr "more-conditions" pkgs) (getAttr "puri" pkgs) (getAttr "split-sequence" pkgs) (getAttr "xml_dot_location" pkgs) ]; - }; - jingoh = { - pname = "jingoh"; - version = "20220707-git"; - asds = [ "jingoh" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh"; - asd = "jingoh"; - }); - systems = [ "jingoh" ]; - lispLibs = [ (getAttr "jingoh_dot_examiner" pkgs) (getAttr "jingoh_dot_org" pkgs) (getAttr "jingoh_dot_reader" pkgs) (getAttr "jingoh_dot_tester" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - jingoh_dot_documentizer = { - pname = "jingoh.documentizer"; - version = "20220707-git"; - asds = [ "jingoh.documentizer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.documentizer"; - asd = "jingoh.documentizer"; - }); - systems = [ "jingoh.documentizer" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "_3bmd-ext-code-blocks" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "eclector" pkgs) (getAttr "read-as-string" pkgs) (getAttr "uiop" pkgs) ]; - }; - jingoh_dot_documentizer_dot_test = { - pname = "jingoh.documentizer.test"; - version = "20220707-git"; - asds = [ "jingoh.documentizer.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.documentizer.test"; - asd = "jingoh.documentizer.test"; - }); - systems = [ "jingoh.documentizer.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) ]; - }; - jingoh_dot_examiner = { - pname = "jingoh.examiner"; - version = "20220707-git"; - asds = [ "jingoh.examiner" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.examiner"; - asd = "jingoh.examiner"; - }); - systems = [ "jingoh.examiner" ]; - lispLibs = [ (getAttr "cl-ansi-text" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "jingoh_dot_org" pkgs) (getAttr "jingoh_dot_tester" pkgs) ]; - }; - jingoh_dot_examiner_dot_test = { - pname = "jingoh.examiner.test"; - version = "20220707-git"; - asds = [ "jingoh.examiner.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.examiner.test"; - asd = "jingoh.examiner.test"; - }); - systems = [ "jingoh.examiner.test" ]; - lispLibs = [ (getAttr "cl-ansi-text" pkgs) (getAttr "jingoh" pkgs) (getAttr "jingoh_dot_examiner" pkgs) ]; - }; - jingoh_dot_generator = { - pname = "jingoh.generator"; - version = "20220707-git"; - asds = [ "jingoh.generator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.generator"; - asd = "jingoh.generator"; - }); - systems = [ "jingoh.generator" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-unification" pkgs) (getAttr "closer-mop" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "lambda-fiddle" pkgs) (getAttr "millet" pkgs) (getAttr "named-readtables" pkgs) (getAttr "prompt-for" pkgs) (getAttr "trivial-cltl2" pkgs) (getAttr "uiop" pkgs) ]; - }; - jingoh_dot_generator_dot_test = { - pname = "jingoh.generator.test"; - version = "20220707-git"; - asds = [ "jingoh.generator.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.generator.test"; - asd = "jingoh.generator.test"; - }); - systems = [ "jingoh.generator.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "jingoh_dot_generator" pkgs) ]; - }; - jingoh_dot_org = { - pname = "jingoh.org"; - version = "20220707-git"; - asds = [ "jingoh.org" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.org"; - asd = "jingoh.org"; - }); - systems = [ "jingoh.org" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "check-bnf" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) ]; - }; - jingoh_dot_org_dot_test = { - pname = "jingoh.org.test"; - version = "20220707-git"; - asds = [ "jingoh.org.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.org.test"; - asd = "jingoh.org.test"; - }); - systems = [ "jingoh.org.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "jingoh_dot_org" pkgs) ]; - }; - jingoh_dot_parallel = { - pname = "jingoh.parallel"; - version = "20220707-git"; - asds = [ "jingoh.parallel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.parallel"; - asd = "jingoh.parallel"; - }); - systems = [ "jingoh.parallel" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-cpus" pkgs) (getAttr "jingoh" pkgs) (getAttr "lparallel" pkgs) ]; - }; - jingoh_dot_parallel_dot_test = { - pname = "jingoh.parallel.test"; - version = "20220707-git"; - asds = [ "jingoh.parallel.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.parallel.test"; - asd = "jingoh.parallel.test"; - }); - systems = [ "jingoh.parallel.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "jingoh_dot_parallel" pkgs) ]; - }; - jingoh_dot_reader = { - pname = "jingoh.reader"; - version = "20220707-git"; - asds = [ "jingoh.reader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.reader"; - asd = "jingoh.reader"; - }); - systems = [ "jingoh.reader" ]; - lispLibs = [ (getAttr "eclector" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "jingoh_dot_tester" pkgs) (getAttr "named-readtables" pkgs) (getAttr "uiop" pkgs) ]; - }; - jingoh_dot_reader_dot_test = { - pname = "jingoh.reader.test"; - version = "20220707-git"; - asds = [ "jingoh.reader.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.reader.test"; - asd = "jingoh.reader.test"; - }); - systems = [ "jingoh.reader.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "jingoh_dot_reader" pkgs) ]; - }; - jingoh_dot_tester = { - pname = "jingoh.tester"; - version = "20220707-git"; - asds = [ "jingoh.tester" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.tester"; - asd = "jingoh.tester"; - }); - systems = [ "jingoh.tester" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "check-bnf" pkgs) (getAttr "cl-ansi-text" pkgs) (getAttr "cl-colors2" pkgs) (getAttr "closer-mop" pkgs) (getAttr "fuzzy-match" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "jingoh_dot_org" pkgs) (getAttr "structure-ext" pkgs) (getAttr "uiop" pkgs) (getAttr "vivid-colors" pkgs) (getAttr "vivid-diff" pkgs) ]; - }; - jingoh_dot_tester_dot_test = { - pname = "jingoh.tester.test"; - version = "20220707-git"; - asds = [ "jingoh.tester.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh.tester.test"; - asd = "jingoh.tester.test"; - }); - systems = [ "jingoh.tester.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "jingoh_dot_tester" pkgs) ]; - }; - jingoh_slash_test = { - pname = "jingoh_test"; - version = "20220707-git"; - asds = [ "jingoh" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jingoh/2022-07-07/jingoh-20220707-git.tgz"; - sha256 = "02wcamw47grg5rz5spn6vl441dk1m82rdrbk6nln69nazj2af76r"; - system = "jingoh"; - asd = "jingoh"; - }); - systems = [ "jingoh/test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "named-readtables" pkgs) ]; - meta = { - broken = true; - }; - }; - jonathan = { - pname = "jonathan"; - version = "20200925-git"; - asds = [ "jonathan" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz"; - sha256 = "1l4sfxfmijibsvkbszikzslw1yy8z52ml9may1w2s0ay7lg7rsng"; - system = "jonathan"; - asd = "jonathan"; - }); - systems = [ "jonathan" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-annot" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-syntax" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "fast-io" pkgs) (getAttr "proc-parse" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - jonathan-test = { - pname = "jonathan-test"; - version = "20200925-git"; - asds = [ "jonathan-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz"; - sha256 = "1l4sfxfmijibsvkbszikzslw1yy8z52ml9may1w2s0ay7lg7rsng"; - system = "jonathan-test"; - asd = "jonathan-test"; - }); - systems = [ "jonathan-test" ]; - lispLibs = [ (getAttr "jonathan" pkgs) (getAttr "legion" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - jose = { - pname = "jose"; - version = "20220331-git"; - asds = [ "jose" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jose/2022-03-31/jose-20220331-git.tgz"; - sha256 = "154n6jx2f5psgzwz6k5ia6zxdjynnnbyxalxfhmm11s3rx028461"; - system = "jose"; - asd = "jose"; - }); - systems = [ "jose" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "assoc-utils" pkgs) (getAttr "cl-base64" pkgs) (getAttr "ironclad" pkgs) (getAttr "jonathan" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - journal = { - pname = "journal"; - version = "20220331-git"; - asds = [ "journal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/journal/2022-03-31/journal-20220331-git.tgz"; - sha256 = "1yp7wcyx38vadpyxi73vn1cb0drnsbfh40hvd45whyrng761xqdm"; - system = "journal"; - asd = "journal"; - }); - systems = [ "journal" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "local-time" pkgs) (getAttr "mgl-pax" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - journal_slash_test = { - pname = "journal_test"; - version = "20220331-git"; - asds = [ "journal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/journal/2022-03-31/journal-20220331-git.tgz"; - sha256 = "1yp7wcyx38vadpyxi73vn1cb0drnsbfh40hvd45whyrng761xqdm"; - system = "journal"; - asd = "journal"; - }); - systems = [ "journal/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "journal" pkgs) (getAttr "try" pkgs) ]; - meta = { - broken = true; - }; - }; - jp-numeral = { - pname = "jp-numeral"; - version = "20221106-git"; - asds = [ "jp-numeral" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jp-numeral/2022-11-06/jp-numeral-20221106-git.tgz"; - sha256 = "1xqvah6mjd8lb2n19wzsn29q6az9kx1c48js3yj0ij73kjncby30"; - system = "jp-numeral"; - asd = "jp-numeral"; - }); - systems = [ "jp-numeral" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) ]; - }; - jp-numeral-test = { - pname = "jp-numeral-test"; - version = "20221106-git"; - asds = [ "jp-numeral-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jp-numeral/2022-11-06/jp-numeral-20221106-git.tgz"; - sha256 = "1xqvah6mjd8lb2n19wzsn29q6az9kx1c48js3yj0ij73kjncby30"; - system = "jp-numeral-test"; - asd = "jp-numeral-test"; - }); - systems = [ "jp-numeral-test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "alexandria" pkgs) (getAttr "jp-numeral" pkgs) ]; - }; - jpeg-turbo = { - pname = "jpeg-turbo"; - version = "20201220-git"; - asds = [ "jpeg-turbo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jpeg-turbo/2020-12-20/jpeg-turbo-20201220-git.tgz"; - sha256 = "1andd1ibbk3224idnpsnrn96flr5d1wm9ja3di57fs04wn577sag"; - system = "jpeg-turbo"; - asd = "jpeg-turbo"; - }); - systems = [ "jpeg-turbo" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - jpeg-turbo_slash_tests = { - pname = "jpeg-turbo_tests"; - version = "20201220-git"; - asds = [ "jpeg-turbo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jpeg-turbo/2020-12-20/jpeg-turbo-20201220-git.tgz"; - sha256 = "1andd1ibbk3224idnpsnrn96flr5d1wm9ja3di57fs04wn577sag"; - system = "jpeg-turbo"; - asd = "jpeg-turbo"; - }); - systems = [ "jpeg-turbo/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "jpeg-turbo" pkgs) ]; - meta = { - broken = true; - }; - }; - jpl-queues = { - pname = "jpl-queues"; - version = "0.1"; - asds = [ "jpl-queues" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jpl-queues/2010-10-06/jpl-queues-0.1.tgz"; - sha256 = "1xgddsfa1gr0cjmdlc304j3msxi8w2fyk9i497x56kmkif7pkj88"; - system = "jpl-queues"; - asd = "jpl-queues"; - }); - systems = [ "jpl-queues" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "jpl-util" pkgs) ]; - }; - jpl-util = { - pname = "jpl-util"; - version = "20151031-git"; - asds = [ "jpl-util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-jpl-util/2015-10-31/cl-jpl-util-20151031-git.tgz"; - sha256 = "0nc0rk9n8grkg3045xsw34whmcmddn2sfrxki4268g7kpgz0d2yz"; - system = "jpl-util"; - asd = "jpl-util"; - }); - systems = [ "jpl-util" ]; - lispLibs = [ ]; - }; - js-parser = { - pname = "js-parser"; - version = "20150407-git"; - asds = [ "js-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/js-parser/2015-04-07/js-parser-20150407-git.tgz"; - sha256 = "0hqw515vyhrv1as5sfn3l792ddjps85zbzpblr2cjyq9dmdrg89a"; - system = "js-parser"; - asd = "js-parser"; - }); - systems = [ "js-parser" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - js-parser-tests = { - pname = "js-parser-tests"; - version = "20150407-git"; - asds = [ "js-parser-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/js-parser/2015-04-07/js-parser-20150407-git.tgz"; - sha256 = "0hqw515vyhrv1as5sfn3l792ddjps85zbzpblr2cjyq9dmdrg89a"; - system = "js-parser-tests"; - asd = "js-parser-tests"; - }); - systems = [ "js-parser-tests" ]; - lispLibs = [ (getAttr "js-parser" pkgs) ]; - }; - json-lib = { - pname = "json-lib"; - version = "20221106-git"; - asds = [ "json-lib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/json-lib/2022-11-06/json-lib-20221106-git.tgz"; - sha256 = "0a9f70niknjnggpn200idvyx77578qjn07qvbs0rknly31b98bh2"; - system = "json-lib"; - asd = "json-lib"; - }); - systems = [ "json-lib" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-fad" pkgs) (getAttr "str" pkgs) (getAttr "parse-float" pkgs) ]; - }; - json-mop = { - pname = "json-mop"; - version = "20210411-git"; - asds = [ "json-mop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/json-mop/2021-04-11/json-mop-20210411-git.tgz"; - sha256 = "1d4k1l415iwssn8qyy3qjcfk3cclz6rzq750dgbiisys8ffmgpgp"; - system = "json-mop"; - asd = "json-mop"; - }); - systems = [ "json-mop" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "closer-mop" pkgs) (getAttr "yason" pkgs) ]; - }; - json-mop-tests = { - pname = "json-mop-tests"; - version = "20210411-git"; - asds = [ "json-mop-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/json-mop/2021-04-11/json-mop-20210411-git.tgz"; - sha256 = "1d4k1l415iwssn8qyy3qjcfk3cclz6rzq750dgbiisys8ffmgpgp"; - system = "json-mop-tests"; - asd = "json-mop-tests"; - }); - systems = [ "json-mop-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "json-mop" pkgs) ]; - }; - json-responses = { - pname = "json-responses"; - version = "20190307-hg"; - asds = [ "json-responses" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/json-responses/2019-03-07/json-responses-20190307-hg.tgz"; - sha256 = "0f1hrs3rhi6qn0r8qd3fbsknn417b8v8b4s4989yfwfvnf922g05"; - system = "json-responses"; - asd = "json-responses"; - }); - systems = [ "json-responses" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - json-responses-test = { - pname = "json-responses-test"; - version = "20190307-hg"; - asds = [ "json-responses-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/json-responses/2019-03-07/json-responses-20190307-hg.tgz"; - sha256 = "0f1hrs3rhi6qn0r8qd3fbsknn417b8v8b4s4989yfwfvnf922g05"; - system = "json-responses-test"; - asd = "json-responses"; - }); - systems = [ "json-responses-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "json-responses" pkgs) ]; - }; - json-schema = { - pname = "json-schema"; - version = "20221106-git"; - asds = [ "json-schema" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/json-schema/2022-11-06/json-schema-20221106-git.tgz"; - sha256 = "11rgnj14p8x059zx8hs02jji1p69v8kix783vf557zpcbydrw2mn"; - system = "json-schema"; - asd = "json-schema"; - }); - systems = [ "json-schema" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "arrows" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "str" pkgs) (getAttr "dexador" pkgs) (getAttr "function-cache" pkgs) (getAttr "local-time" pkgs) (getAttr "local-time-duration" pkgs) (getAttr "quri" pkgs) (getAttr "sanity-clause" pkgs) (getAttr "st-json" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - json-schema_slash_json-schema-test-suite = { - pname = "json-schema_json-schema-test-suite"; - version = "20221106-git"; - asds = [ "json-schema" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/json-schema/2022-11-06/json-schema-20221106-git.tgz"; - sha256 = "11rgnj14p8x059zx8hs02jji1p69v8kix783vf557zpcbydrw2mn"; - system = "json-schema"; - asd = "json-schema"; - }); - systems = [ "json-schema/json-schema-test-suite" ]; - lispLibs = [ (getAttr "json-schema" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - json-schema_slash_test = { - pname = "json-schema_test"; - version = "20221106-git"; - asds = [ "json-schema" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/json-schema/2022-11-06/json-schema-20221106-git.tgz"; - sha256 = "11rgnj14p8x059zx8hs02jji1p69v8kix783vf557zpcbydrw2mn"; - system = "json-schema"; - asd = "json-schema"; - }); - systems = [ "json-schema/test" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - json-schema_slash_unit-tests = { - pname = "json-schema_unit-tests"; - version = "20221106-git"; - asds = [ "json-schema" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/json-schema/2022-11-06/json-schema-20221106-git.tgz"; - sha256 = "11rgnj14p8x059zx8hs02jji1p69v8kix783vf557zpcbydrw2mn"; - system = "json-schema"; - asd = "json-schema"; - }); - systems = [ "json-schema/unit-tests" ]; - lispLibs = [ (getAttr "json-schema" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - json-streams = { - pname = "json-streams"; - version = "20171019-git"; - asds = [ "json-streams" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/json-streams/2017-10-19/json-streams-20171019-git.tgz"; - sha256 = "0cia3721im04q73dfkd688d8splgpz03qa4h8s3r39kar4w3xll2"; - system = "json-streams"; - asd = "json-streams"; - }); - systems = [ "json-streams" ]; - lispLibs = [ ]; - }; - json-streams-tests = { - pname = "json-streams-tests"; - version = "20171019-git"; - asds = [ "json-streams-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/json-streams/2017-10-19/json-streams-20171019-git.tgz"; - sha256 = "0cia3721im04q73dfkd688d8splgpz03qa4h8s3r39kar4w3xll2"; - system = "json-streams-tests"; - asd = "json-streams-tests"; - }); - systems = [ "json-streams-tests" ]; - lispLibs = [ (getAttr "cl-quickcheck" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "json-streams" pkgs) ]; - }; - jsonrpc = { - pname = "jsonrpc"; - version = "20221106-git"; - asds = [ "jsonrpc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jsonrpc/2022-11-06/jsonrpc-20221106-git.tgz"; - sha256 = "0g8g9mak6sl27cbf6rrw9pwk2qxx03ijzihhqmcrrr33y9zkdqkk"; - system = "jsonrpc"; - asd = "jsonrpc"; - }); - systems = [ "jsonrpc" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "chanl" pkgs) (getAttr "dissect" pkgs) (getAttr "event-emitter" pkgs) (getAttr "usocket" pkgs) (getAttr "vom" pkgs) (getAttr "yason" pkgs) ]; - }; - jsown = { - pname = "jsown"; - version = "20200218-git"; - asds = [ "jsown" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jsown/2020-02-18/jsown-20200218-git.tgz"; - sha256 = "0gadvmf1d9bq35s61z76psrsnzwwk12svi66jigf491hv48wigw7"; - system = "jsown"; - asd = "jsown"; - }); - systems = [ "jsown" ]; - lispLibs = [ ]; - }; - jsown-tests = { - pname = "jsown-tests"; - version = "20200218-git"; - asds = [ "jsown-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jsown/2020-02-18/jsown-20200218-git.tgz"; - sha256 = "0gadvmf1d9bq35s61z76psrsnzwwk12svi66jigf491hv48wigw7"; - system = "jsown-tests"; - asd = "jsown-tests"; - }); - systems = [ "jsown-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "jsown" pkgs) ]; - }; - jsown-utils = { - pname = "jsown-utils"; - version = "20220707-git"; - asds = [ "jsown-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jsown-utils/2022-07-07/jsown-utils-20220707-git.tgz"; - sha256 = "046a18fywkim0jbnpls5zqdv65j1kwl268p4dbdd2dxgx050fwak"; - system = "jsown-utils"; - asd = "jsown-utils"; - }); - systems = [ "jsown-utils" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "jsown" pkgs) ]; - }; - just-getopt-parser = { - pname = "just-getopt-parser"; - version = "20211209-git"; - asds = [ "just-getopt-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-just-getopt-parser/2021-12-09/cl-just-getopt-parser-20211209-git.tgz"; - sha256 = "0ngh8b51ngh3bqacl40j6wwiinhwxswsy02d9k7qlzv9sbjxay4s"; - system = "just-getopt-parser"; - asd = "just-getopt-parser"; - }); - systems = [ "just-getopt-parser" ]; - lispLibs = [ ]; - }; - jwacs = { - pname = "jwacs"; - version = "20180228-git"; - asds = [ "jwacs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jwacs/2018-02-28/jwacs-20180228-git.tgz"; - sha256 = "1wzln3bjjmdv040i339dsm48a1sc2cnwhh4z066x2wkl5ka7j5b2"; - system = "jwacs"; - asd = "jwacs"; - }); - systems = [ "jwacs" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - jwacs-tests = { - pname = "jwacs-tests"; - version = "20180228-git"; - asds = [ "jwacs-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/jwacs/2018-02-28/jwacs-20180228-git.tgz"; - sha256 = "1wzln3bjjmdv040i339dsm48a1sc2cnwhh4z066x2wkl5ka7j5b2"; - system = "jwacs-tests"; - asd = "jwacs-tests"; - }); - systems = [ "jwacs-tests" ]; - lispLibs = [ (getAttr "jwacs" pkgs) ]; - }; - kanren-trs = { - pname = "kanren-trs"; - version = "20120305-svn"; - asds = [ "kanren-trs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-kanren-trs/2012-03-05/cl-kanren-trs-20120305-svn.tgz"; - sha256 = "1r9xyickdkkqcaa7abvks4hqwjb7s95lcrym026c1w6ciibiypr7"; - system = "kanren-trs"; - asd = "kanren-trs"; - }); - systems = [ "kanren-trs" ]; - lispLibs = [ ]; - }; - kanren-trs-test = { - pname = "kanren-trs-test"; - version = "20120305-svn"; - asds = [ "kanren-trs-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-kanren-trs/2012-03-05/cl-kanren-trs-20120305-svn.tgz"; - sha256 = "1r9xyickdkkqcaa7abvks4hqwjb7s95lcrym026c1w6ciibiypr7"; - system = "kanren-trs-test"; - asd = "kanren-trs-test"; - }); - systems = [ "kanren-trs-test" ]; - lispLibs = [ (getAttr "kanren-trs" pkgs) ]; - }; - kaputt = { - pname = "kaputt"; - version = "20221106-git"; - asds = [ "kaputt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-kaputt/2022-11-06/cl-kaputt-20221106-git.tgz"; - sha256 = "1jd9lmdzkjm6mawsxczg6czyv7zbmaplq0ikmda0ysh4aq3apnnj"; - system = "kaputt"; - asd = "kaputt"; - }); - systems = [ "kaputt" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - kaputt_slash_example = { - pname = "kaputt_example"; - version = "20221106-git"; - asds = [ "kaputt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-kaputt/2022-11-06/cl-kaputt-20221106-git.tgz"; - sha256 = "1jd9lmdzkjm6mawsxczg6czyv7zbmaplq0ikmda0ysh4aq3apnnj"; - system = "kaputt"; - asd = "kaputt"; - }); - systems = [ "kaputt/example" ]; - lispLibs = [ (getAttr "kaputt" pkgs) ]; - meta = { - broken = true; - }; - }; - kaputt_slash_testsuite = { - pname = "kaputt_testsuite"; - version = "20221106-git"; - asds = [ "kaputt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-kaputt/2022-11-06/cl-kaputt-20221106-git.tgz"; - sha256 = "1jd9lmdzkjm6mawsxczg6czyv7zbmaplq0ikmda0ysh4aq3apnnj"; - system = "kaputt"; - asd = "kaputt"; - }); - systems = [ "kaputt/testsuite" ]; - lispLibs = [ (getAttr "kaputt" pkgs) ]; - meta = { - broken = true; - }; - }; - kebab = { - pname = "kebab"; - version = "20150608-git"; - asds = [ "kebab" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/kebab/2015-06-08/kebab-20150608-git.tgz"; - sha256 = "0j5haabnvj0vz0rx9mwyfsb3qzpga9nickbjw8xs6vypkdzlqv1b"; - system = "kebab"; - asd = "kebab"; - }); - systems = [ "kebab" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - kebab-test = { - pname = "kebab-test"; - version = "20150608-git"; - asds = [ "kebab-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/kebab/2015-06-08/kebab-20150608-git.tgz"; - sha256 = "0j5haabnvj0vz0rx9mwyfsb3qzpga9nickbjw8xs6vypkdzlqv1b"; - system = "kebab-test"; - asd = "kebab-test"; - }); - systems = [ "kebab-test" ]; - lispLibs = [ (getAttr "kebab" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - kekule-clj = { - pname = "kekule-clj"; - version = "20221106-git"; - asds = [ "kekule-clj" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/kekule-clj/2022-11-06/kekule-clj-20221106-git.tgz"; - sha256 = "12bwymk9vh9bdyi85pfgi79815g0vdlj37y85zld13f9cnf4kl3v"; - system = "kekule-clj"; - asd = "kekule-clj"; - }); - systems = [ "kekule-clj" ]; - lispLibs = [ (getAttr "common-lisp-jupyter" pkgs) ]; - }; - kenzo = { - pname = "kenzo"; - version = "20200325-git"; - asds = [ "kenzo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/kenzo/2020-03-25/kenzo-20200325-git.tgz"; - sha256 = "0dg70p5pxvx2ksr66z3p2nkxxwkjd852pkckr15j6cwfaji9fr8r"; - system = "kenzo"; - asd = "kenzo"; - }); - systems = [ "kenzo" ]; - lispLibs = [ ]; - }; - kenzo-test = { - pname = "kenzo-test"; - version = "20200325-git"; - asds = [ "kenzo-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/kenzo/2020-03-25/kenzo-20200325-git.tgz"; - sha256 = "0dg70p5pxvx2ksr66z3p2nkxxwkjd852pkckr15j6cwfaji9fr8r"; - system = "kenzo-test"; - asd = "kenzo-test"; - }); - systems = [ "kenzo-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "kenzo" pkgs) ]; - }; - keystone = { - pname = "keystone"; - version = "20200427-git"; - asds = [ "keystone" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/keystone/2020-04-27/keystone-20200427-git.tgz"; - sha256 = "04fczbkihf87qyp9f1sv45h69xrvdmcmxkv4m868q8zqw6z48hlj"; - system = "keystone"; - asd = "keystone"; - }); - systems = [ "keystone" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "gt" pkgs) (getAttr "static-vectors" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - keystone_slash_raw = { - pname = "keystone_raw"; - version = "20200427-git"; - asds = [ "keystone" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/keystone/2020-04-27/keystone-20200427-git.tgz"; - sha256 = "04fczbkihf87qyp9f1sv45h69xrvdmcmxkv4m868q8zqw6z48hlj"; - system = "keystone"; - asd = "keystone"; - }); - systems = [ "keystone/raw" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "gt" pkgs) (getAttr "static-vectors" pkgs) ]; - meta = { - broken = true; - }; - }; - keystone_slash_raw-test = { - pname = "keystone_raw-test"; - version = "20200427-git"; - asds = [ "keystone" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/keystone/2020-04-27/keystone-20200427-git.tgz"; - sha256 = "04fczbkihf87qyp9f1sv45h69xrvdmcmxkv4m868q8zqw6z48hlj"; - system = "keystone"; - asd = "keystone"; - }); - systems = [ "keystone/raw-test" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "gt" pkgs) (getAttr "static-vectors" pkgs) (getAttr "stefil" pkgs) ]; - meta = { - broken = true; - }; - }; - keystone_slash_test = { - pname = "keystone_test"; - version = "20200427-git"; - asds = [ "keystone" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/keystone/2020-04-27/keystone-20200427-git.tgz"; - sha256 = "04fczbkihf87qyp9f1sv45h69xrvdmcmxkv4m868q8zqw6z48hlj"; - system = "keystone"; - asd = "keystone"; - }); - systems = [ "keystone/test" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "gt" pkgs) (getAttr "keystone" pkgs) (getAttr "static-vectors" pkgs) (getAttr "stefil" pkgs) ]; - meta = { - broken = true; - }; - }; - kl-verify = { - pname = "kl-verify"; - version = "20120909-git"; - asds = [ "kl-verify" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/kl-verify/2012-09-09/kl-verify-20120909-git.tgz"; - sha256 = "1m5jyvvfb24idw0xzi92diyrygmq638dwxg0sl247yyvmwsqb8yj"; - system = "kl-verify"; - asd = "kl-verify"; - }); - systems = [ "kl-verify" ]; - lispLibs = [ (getAttr "image" pkgs) ]; - }; - km = { - pname = "km"; - version = "2-5-33"; - asds = [ "km" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/km/2011-05-22/km-2-5-33.tgz"; - sha256 = "0vl4g7vg20l14xc1b5g1d0scak6ck5028q5s5c75pr8fp15m7wyb"; - system = "km"; - asd = "km"; - }); - systems = [ "km" ]; - lispLibs = [ ]; - }; - kmrcl = { - pname = "kmrcl"; - version = "20201016-git"; - asds = [ "kmrcl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz"; - sha256 = "06gx04mah5nc8w78s0j8628divbf1s5w7af8w7pvzb2d5mgvrbd2"; - system = "kmrcl"; - asd = "kmrcl"; - }); - systems = [ "kmrcl" ]; - lispLibs = [ ]; - }; - kmrcl_slash_test = { - pname = "kmrcl_test"; - version = "20201016-git"; - asds = [ "kmrcl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz"; - sha256 = "06gx04mah5nc8w78s0j8628divbf1s5w7af8w7pvzb2d5mgvrbd2"; - system = "kmrcl"; - asd = "kmrcl"; - }); - systems = [ "kmrcl/test" ]; - lispLibs = [ (getAttr "kmrcl" pkgs) (getAttr "rt" pkgs) ]; - meta = { - broken = true; - }; - }; - l-math = { - pname = "l-math"; - version = "20190307-git"; - asds = [ "l-math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/l-math/2019-03-07/l-math-20190307-git.tgz"; - sha256 = "12nhj1hrvgvmichrjf46fi0f1lzrjajw7k9i1f6qycnnqw45qan1"; - system = "l-math"; - asd = "l-math"; - }); - systems = [ "l-math" ]; - lispLibs = [ ]; - }; - l-system = { - pname = "l-system"; - version = "20180228-git"; - asds = [ "l-system" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/l-system/2018-02-28/l-system-20180228-git.tgz"; - sha256 = "1zvd90s7y936bx7sirc38vs8r2rs62064ndj06ahrc38vagv4qwd"; - system = "l-system"; - asd = "l-system"; - }); - systems = [ "l-system" ]; - lispLibs = [ (getAttr "iterate" pkgs) ]; - }; - l-system-examples = { - pname = "l-system-examples"; - version = "20180228-git"; - asds = [ "l-system-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/l-system/2018-02-28/l-system-20180228-git.tgz"; - sha256 = "1zvd90s7y936bx7sirc38vs8r2rs62064ndj06ahrc38vagv4qwd"; - system = "l-system-examples"; - asd = "l-system-examples"; - }); - systems = [ "l-system-examples" ]; - lispLibs = [ (getAttr "l-system" pkgs) ]; - }; - laap = { - pname = "laap"; - version = "20170830-git"; - asds = [ "laap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/laap/2017-08-30/laap-20170830-git.tgz"; - sha256 = "0rzjdi4qcv2l99mk4bk94xlpfx1mav0kvd7crpax7dx4dfwkq8k5"; - system = "laap"; - asd = "laap"; - }); - systems = [ "laap" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-base32" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "uiop" pkgs) ]; - }; - lack = { - pname = "lack"; - version = "20221106-git"; - asds = [ "lack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack"; - asd = "lack"; - }); - systems = [ "lack" ]; - lispLibs = [ (getAttr "lack-component" pkgs) (getAttr "lack-util" pkgs) ]; - }; - lack-app-directory = { - pname = "lack-app-directory"; - version = "20221106-git"; - asds = [ "lack-app-directory" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-app-directory"; - asd = "lack-app-directory"; - }); - systems = [ "lack-app-directory" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "lack-app-file" pkgs) (getAttr "quri" pkgs) (getAttr "trivial-mimes" pkgs) (getAttr "trivial-rfc-1123" pkgs) ]; - }; - lack-app-file = { - pname = "lack-app-file"; - version = "20221106-git"; - asds = [ "lack-app-file" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-app-file"; - asd = "lack-app-file"; - }); - systems = [ "lack-app-file" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "lack-component" pkgs) (getAttr "trivial-mimes" pkgs) (getAttr "trivial-rfc-1123" pkgs) ]; - }; - lack-component = { - pname = "lack-component"; - version = "20221106-git"; - asds = [ "lack-component" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-component"; - asd = "lack-component"; - }); - systems = [ "lack-component" ]; - lispLibs = [ ]; - }; - lack-middleware-accesslog = { - pname = "lack-middleware-accesslog"; - version = "20221106-git"; - asds = [ "lack-middleware-accesslog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-middleware-accesslog"; - asd = "lack-middleware-accesslog"; - }); - systems = [ "lack-middleware-accesslog" ]; - lispLibs = [ (getAttr "lack-util" pkgs) (getAttr "local-time" pkgs) ]; - }; - lack-middleware-anypool = { - pname = "lack-middleware-anypool"; - version = "20210531-git"; - asds = [ "lack-middleware-anypool" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/anypool/2021-05-31/anypool-20210531-git.tgz"; - sha256 = "0dr904m0qb0xf12x0rrhw0ipw3fdqyihwr59l87prqmkv23y7aig"; - system = "lack-middleware-anypool"; - asd = "lack-middleware-anypool"; - }); - systems = [ "lack-middleware-anypool" ]; - lispLibs = [ (getAttr "anypool" pkgs) ]; - }; - lack-middleware-auth-basic = { - pname = "lack-middleware-auth-basic"; - version = "20221106-git"; - asds = [ "lack-middleware-auth-basic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-middleware-auth-basic"; - asd = "lack-middleware-auth-basic"; - }); - systems = [ "lack-middleware-auth-basic" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - lack-middleware-backtrace = { - pname = "lack-middleware-backtrace"; - version = "20221106-git"; - asds = [ "lack-middleware-backtrace" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-middleware-backtrace"; - asd = "lack-middleware-backtrace"; - }); - systems = [ "lack-middleware-backtrace" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - lack-middleware-clack-errors = { - pname = "lack-middleware-clack-errors"; - version = "20190813-git"; - asds = [ "lack-middleware-clack-errors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack-errors/2019-08-13/clack-errors-20190813-git.tgz"; - sha256 = "0z6jyn37phnpq02l5wml8z0593g8ps95c0c2lzkhi3is2wcj9cpf"; - system = "lack-middleware-clack-errors"; - asd = "lack-middleware-clack-errors"; - }); - systems = [ "lack-middleware-clack-errors" ]; - lispLibs = [ (getAttr "clack-errors" pkgs) ]; - }; - lack-middleware-csrf = { - pname = "lack-middleware-csrf"; - version = "20221106-git"; - asds = [ "lack-middleware-csrf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-middleware-csrf"; - asd = "lack-middleware-csrf"; - }); - systems = [ "lack-middleware-csrf" ]; - lispLibs = [ (getAttr "lack-request" pkgs) (getAttr "lack-util" pkgs) ]; - }; - lack-middleware-mito = { - pname = "lack-middleware-mito"; - version = "20221106-git"; - asds = [ "lack-middleware-mito" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mito/2022-11-06/mito-20221106-git.tgz"; - sha256 = "1wm0kmlg8b7l74s1kxs2yxrv07c6fhfb7yn3018pjh1y28i5cx7n"; - system = "lack-middleware-mito"; - asd = "lack-middleware-mito"; - }); - systems = [ "lack-middleware-mito" ]; - lispLibs = [ (getAttr "dbi" pkgs) (getAttr "mito-core" pkgs) ]; - }; - lack-middleware-mount = { - pname = "lack-middleware-mount"; - version = "20221106-git"; - asds = [ "lack-middleware-mount" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-middleware-mount"; - asd = "lack-middleware-mount"; - }); - systems = [ "lack-middleware-mount" ]; - lispLibs = [ (getAttr "lack-component" pkgs) ]; - }; - lack-middleware-session = { - pname = "lack-middleware-session"; - version = "20221106-git"; - asds = [ "lack-middleware-session" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-middleware-session"; - asd = "lack-middleware-session"; - }); - systems = [ "lack-middleware-session" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "lack-request" pkgs) (getAttr "lack-response" pkgs) (getAttr "lack-util" pkgs) ]; - }; - lack-middleware-static = { - pname = "lack-middleware-static"; - version = "20221106-git"; - asds = [ "lack-middleware-static" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-middleware-static"; - asd = "lack-middleware-static"; - }); - systems = [ "lack-middleware-static" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "lack-app-file" pkgs) (getAttr "lack-component" pkgs) ]; - }; - lack-request = { - pname = "lack-request"; - version = "20221106-git"; - asds = [ "lack-request" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-request"; - asd = "lack-request"; - }); - systems = [ "lack-request" ]; - lispLibs = [ (getAttr "circular-streams" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "http-body" pkgs) (getAttr "quri" pkgs) ]; - }; - lack-response = { - pname = "lack-response"; - version = "20221106-git"; - asds = [ "lack-response" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-response"; - asd = "lack-response"; - }); - systems = [ "lack-response" ]; - lispLibs = [ (getAttr "local-time" pkgs) (getAttr "quri" pkgs) ]; - }; - lack-session-store-dbi = { - pname = "lack-session-store-dbi"; - version = "20221106-git"; - asds = [ "lack-session-store-dbi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-session-store-dbi"; - asd = "lack-session-store-dbi"; - }); - systems = [ "lack-session-store-dbi" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "dbi" pkgs) (getAttr "marshal" pkgs) (getAttr "lack-middleware-session" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - lack-session-store-redis = { - pname = "lack-session-store-redis"; - version = "20221106-git"; - asds = [ "lack-session-store-redis" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-session-store-redis"; - asd = "lack-session-store-redis"; - }); - systems = [ "lack-session-store-redis" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "marshal" pkgs) (getAttr "cl-redis" pkgs) (getAttr "lack-middleware-session" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - lack-test = { - pname = "lack-test"; - version = "20221106-git"; - asds = [ "lack-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-test"; - asd = "lack-test"; - }); - systems = [ "lack-test" ]; - lispLibs = [ (getAttr "cl-cookie" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "lack" pkgs) (getAttr "quri" pkgs) ]; - }; - lack-util = { - pname = "lack-util"; - version = "20221106-git"; - asds = [ "lack-util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-util"; - asd = "lack-util"; - }); - systems = [ "lack-util" ]; - lispLibs = [ (getAttr "cl-isaac" pkgs) ]; - }; - lack-util-writer-stream = { - pname = "lack-util-writer-stream"; - version = "20221106-git"; - asds = [ "lack-util-writer-stream" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "lack-util-writer-stream"; - asd = "lack-util-writer-stream"; - }); - systems = [ "lack-util-writer-stream" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - lake = { - pname = "lake"; - version = "20220220-git"; - asds = [ "lake" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz"; - sha256 = "1g6rr4d5vjx487ym5qjlnw5sd6rwx6l4zx1l9mj0j30lpm1k4il0"; - system = "lake"; - asd = "lake"; - }); - systems = [ "lake" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-syntax" pkgs) (getAttr "cl-syntax-interpol" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - lake-cli = { - pname = "lake-cli"; - version = "20220220-git"; - asds = [ "lake-cli" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz"; - sha256 = "1g6rr4d5vjx487ym5qjlnw5sd6rwx6l4zx1l9mj0j30lpm1k4il0"; - system = "lake-cli"; - asd = "lake-cli"; - }); - systems = [ "lake-cli" ]; - lispLibs = [ (getAttr "deploy" pkgs) (getAttr "lake" pkgs) ]; - }; - lake-test = { - pname = "lake-test"; - version = "20220220-git"; - asds = [ "lake-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lake/2022-02-20/lake-20220220-git.tgz"; - sha256 = "1g6rr4d5vjx487ym5qjlnw5sd6rwx6l4zx1l9mj0j30lpm1k4il0"; - system = "lake-test"; - asd = "lake-test"; - }); - systems = [ "lake-test" ]; - lispLibs = [ (getAttr "lake" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - lambda-fiddle = { - pname = "lambda-fiddle"; - version = "20211020-git"; - asds = [ "lambda-fiddle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lambda-fiddle/2021-10-20/lambda-fiddle-20211020-git.tgz"; - sha256 = "1z4s1sqkvll6rpzc40yqbyzmbn7h8lxkhinvis3c7anaar78bjs7"; - system = "lambda-fiddle"; - asd = "lambda-fiddle"; - }); - systems = [ "lambda-fiddle" ]; - lispLibs = [ ]; - }; - lambda-reader = { - pname = "lambda-reader"; - version = "20170124-git"; - asds = [ "lambda-reader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lambda-reader/2017-01-24/lambda-reader-20170124-git.tgz"; - sha256 = "0s73nrnvr0d2ql1gabcasmfnckzq0f2qs9317hv2mrrh0q1giq1w"; - system = "lambda-reader"; - asd = "lambda-reader"; - }); - systems = [ "lambda-reader" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - lambda-reader-8bit = { - pname = "lambda-reader-8bit"; - version = "20170124-git"; - asds = [ "lambda-reader-8bit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lambda-reader/2017-01-24/lambda-reader-20170124-git.tgz"; - sha256 = "0s73nrnvr0d2ql1gabcasmfnckzq0f2qs9317hv2mrrh0q1giq1w"; - system = "lambda-reader-8bit"; - asd = "lambda-reader-8bit"; - }); - systems = [ "lambda-reader-8bit" ]; - lispLibs = [ (getAttr "asdf-encodings" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - lambdalite = { - pname = "lambdalite"; - version = "20141217-git"; - asds = [ "lambdalite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lambdalite/2014-12-17/lambdalite-20141217-git.tgz"; - sha256 = "0bvhix74afak5bpaa4x3p1b7gskpvzvw78aqkml9d40gpd1ky8lh"; - system = "lambdalite"; - asd = "lambdalite"; - }); - systems = [ "lambdalite" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "wu-sugar" pkgs) ]; - }; - language-codes = { - pname = "language-codes"; - version = "20210531-git"; - asds = [ "language-codes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/language-codes/2021-05-31/language-codes-20210531-git.tgz"; - sha256 = "0bkx5bjfaxlrxkr1yh85xbr5n39g3m9006vy1gh6wybvh95d1xwy"; - system = "language-codes"; - asd = "language-codes"; - }); - systems = [ "language-codes" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - langutils = { - pname = "langutils"; - version = "20121125-git"; - asds = [ "langutils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-langutils/2012-11-25/cl-langutils-20121125-git.tgz"; - sha256 = "15y9x5wkg3fqndc04w2sc650fnwimxp4gjgpv9xvvdm9x4v433x6"; - system = "langutils"; - asd = "langutils"; - }); - systems = [ "langutils" ]; - lispLibs = [ (getAttr "stdutils" pkgs) (getAttr "s-xml-rpc" pkgs) ]; - }; - lapack = { - pname = "lapack"; - version = "20200925-git"; - asds = [ "lapack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "lapack"; - asd = "lapack"; - }); - systems = [ "lapack" ]; - lispLibs = [ (getAttr "blas-complex" pkgs) (getAttr "blas-package" pkgs) (getAttr "blas-real" pkgs) (getAttr "f2cl" pkgs) ]; - }; - lapack_slash_complex = { - pname = "lapack_complex"; - version = "20200925-git"; - asds = [ "lapack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "lapack"; - asd = "lapack"; - }); - systems = [ "lapack/complex" ]; - lispLibs = [ (getAttr "blas-complex" pkgs) (getAttr "blas-package" pkgs) (getAttr "blas-real" pkgs) ]; - meta = { - broken = true; - }; - }; - lapack_slash_package = { - pname = "lapack_package"; - version = "20200925-git"; - asds = [ "lapack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "lapack"; - asd = "lapack"; - }); - systems = [ "lapack/package" ]; - lispLibs = [ (getAttr "blas-package" pkgs) ]; - meta = { - broken = true; - }; - }; - lapack_slash_real = { - pname = "lapack_real"; - version = "20200925-git"; - asds = [ "lapack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "lapack"; - asd = "lapack"; - }); - systems = [ "lapack/real" ]; - lispLibs = [ (getAttr "blas-package" pkgs) (getAttr "blas-real" pkgs) ]; - meta = { - broken = true; - }; - }; - lapack_slash_tests = { - pname = "lapack_tests"; - version = "20200925-git"; - asds = [ "lapack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "lapack"; - asd = "lapack"; - }); - systems = [ "lapack/tests" ]; - lispLibs = [ (getAttr "lapack" pkgs) (getAttr "rt" pkgs) ]; - meta = { - broken = true; - }; - }; - lass = { - pname = "lass"; - version = "20211020-git"; - asds = [ "lass" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lass/2021-10-20/lass-20211020-git.tgz"; - sha256 = "06wds1qzj8s862pmmza1427n7gdpplqplxqnxyqkrr0hgxdl4xbf"; - system = "lass"; - asd = "lass"; - }); - systems = [ "lass" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "trivial-indent" pkgs) (getAttr "trivial-mimes" pkgs) ]; - }; - lass-flexbox = { - pname = "lass-flexbox"; - version = "20160208-git"; - asds = [ "lass-flexbox" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lass-flexbox/2016-02-08/lass-flexbox-20160208-git.tgz"; - sha256 = "143rkff1ybi3b07qyzndxxndp7j4nw1biyp51rkl0yvsk85kj1jp"; - system = "lass-flexbox"; - asd = "lass-flexbox"; - }); - systems = [ "lass-flexbox" ]; - lispLibs = [ (getAttr "lass" pkgs) ]; - }; - lass-flexbox-test = { - pname = "lass-flexbox-test"; - version = "20160208-git"; - asds = [ "lass-flexbox-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lass-flexbox/2016-02-08/lass-flexbox-20160208-git.tgz"; - sha256 = "143rkff1ybi3b07qyzndxxndp7j4nw1biyp51rkl0yvsk85kj1jp"; - system = "lass-flexbox-test"; - asd = "lass-flexbox-test"; - }); - systems = [ "lass-flexbox-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "lass-flexbox" pkgs) ]; - }; - lassie = { - pname = "lassie"; - version = "20140713-git"; - asds = [ "lassie" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lassie/2014-07-13/lassie-20140713-git.tgz"; - sha256 = "06ps25422ymp9n35745xhg3qsclfli52b7mxhw58wwz9q1v1n0rn"; - system = "lassie"; - asd = "lassie"; - }); - systems = [ "lassie" ]; - lispLibs = [ (getAttr "fsvd" pkgs) ]; - }; - lastfm = { - pname = "lastfm"; - version = "20191007-git"; - asds = [ "lastfm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lastfm/2019-10-07/lastfm-20191007-git.tgz"; - sha256 = "1crg82fyzkm9a0czsf5vq6nwndg6gy7zqb2glbp3yaw6p2hrwkp4"; - system = "lastfm"; - asd = "lastfm"; - }); - systems = [ "lastfm" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "defmemo" pkgs) (getAttr "drakma" pkgs) (getAttr "generators" pkgs) (getAttr "ironclad" pkgs) (getAttr "lquery" pkgs) (getAttr "plump" pkgs) (getAttr "trivial-open-browser" pkgs) ]; - }; - latex-table = { - pname = "latex-table"; - version = "20180328-git"; - asds = [ "latex-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/latex-table/2018-03-28/latex-table-20180328-git.tgz"; - sha256 = "04qqr62pdi7qs9p74a4a014l6sl6bk6hrlb7b7pknxx5c15xvcgv"; - system = "latex-table"; - asd = "latex-table"; - }); - systems = [ "latex-table" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "array-operations" pkgs) (getAttr "let-plus" pkgs) ]; - }; - latter-day-paypal = { - pname = "latter-day-paypal"; - version = "20221106-git"; - asds = [ "latter-day-paypal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/latter-day-paypal/2022-11-06/latter-day-paypal-20221106-git.tgz"; - sha256 = "0a4xji2ymmr7s4gq0gc3bhbf62gwfs93ymmpvgsmb0afcsi5099q"; - system = "latter-day-paypal"; - asd = "latter-day-paypal"; - }); - systems = [ "latter-day-paypal" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "str" pkgs) (getAttr "cl-tls" pkgs) (getAttr "closer-mop" pkgs) (getAttr "dexador" pkgs) (getAttr "do-urlencode" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "ironclad" pkgs) (getAttr "jonathan" pkgs) (getAttr "local-time" pkgs) (getAttr "ningle" pkgs) (getAttr "quri" pkgs) ]; - }; - lazy = { - pname = "lazy"; - version = "20200925-git"; - asds = [ "lazy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lazy/2020-09-25/lazy-20200925-git.tgz"; - sha256 = "0m099rwr7k17v984n4jnq4hadf19vza5qilxdyrr43scxbbrmw1n"; - system = "lazy"; - asd = "lazy"; - }); - systems = [ "lazy" ]; - lispLibs = [ ]; - }; - ledger = { - pname = "ledger"; - version = "master-1a957fb2-git"; - asds = [ "ledger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "ledger"; - asd = "ledger"; - }); - systems = [ "ledger" ]; - lispLibs = [ (getAttr "gwl" pkgs) ]; - }; - leech = { - pname = "leech"; - version = "20140713-git"; - asds = [ "leech" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/bknr-web/2014-07-13/bknr-web-20140713-git.tgz"; - sha256 = "1m73z0hv7qsc9yddrg8zs7n3zmn9h64v4d62239wrvfnmzqk75x2"; - system = "leech"; - asd = "leech"; - }); - systems = [ "leech" ]; - lispLibs = [ (getAttr "aserve" pkgs) (getAttr "unit-test" pkgs) ]; - }; - legion = { - pname = "legion"; - version = "20211020-git"; - asds = [ "legion" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/legion/2021-10-20/legion-20211020-git.tgz"; - sha256 = "0583pw0mf8bd4dj42w2xrlzcwfkl8q28n1bh8dpxxfg93crx4si6"; - system = "legion"; - asd = "legion"; - }); - systems = [ "legion" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-speedy-queue" pkgs) (getAttr "vom" pkgs) ]; - }; - legion-test = { - pname = "legion-test"; - version = "20211020-git"; - asds = [ "legion-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/legion/2021-10-20/legion-20211020-git.tgz"; - sha256 = "0583pw0mf8bd4dj42w2xrlzcwfkl8q28n1bh8dpxxfg93crx4si6"; - system = "legion-test"; - asd = "legion-test"; - }); - systems = [ "legion-test" ]; - lispLibs = [ (getAttr "legion" pkgs) (getAttr "local-time" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - legit = { - pname = "legit"; - version = "20211020-git"; - asds = [ "legit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/legit/2021-10-20/legit-20211020-git.tgz"; - sha256 = "0crr7ya7dg15di7glk3w9sgf6j8dmny347gynmxxrdvjj9pa906m"; - system = "legit"; - asd = "legit"; - }); - systems = [ "legit" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "lambda-fiddle" pkgs) (getAttr "simple-inferiors" pkgs) (getAttr "uiop" pkgs) ]; - }; - lem-opengl = { - pname = "lem-opengl"; - version = "20200427-git"; - asds = [ "lem-opengl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "lem-opengl"; - asd = "lem-opengl"; - }); - systems = [ "lem-opengl" ]; - lispLibs = [ (getAttr "livesupport" pkgs) (getAttr "minilem" pkgs) (getAttr "application" pkgs) (getAttr "control" pkgs) (getAttr "ncurses-clone-for-lem" pkgs) (getAttr "sucle" pkgs) (getAttr "uncommon-lisp" pkgs) (getAttr "trivial-clipboard" pkgs) (getAttr "utility" pkgs) ]; - }; - lense = { - pname = "lense"; - version = "20201220-git"; - asds = [ "lense" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lense/2020-12-20/lense-20201220-git.tgz"; - sha256 = "0j11m93an38d1cl6b1kaaj5azhkn64wpiiprlj2c4cjfzrc32ffv"; - system = "lense"; - asd = "lense"; - }); - systems = [ "lense" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "documentation-utils-extensions" pkgs) ]; - }; - lessp = { - pname = "lessp"; - version = "20221106-git"; - asds = [ "lessp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lessp/2022-11-06/cl-lessp-20221106-git.tgz"; - sha256 = "0i3ia14dzqwjpygd0zn785ff5vqnnmkn75psfpyx0ni3jr71lkq9"; - system = "lessp"; - asd = "lessp"; - }); - systems = [ "lessp" ]; - lispLibs = [ ]; - }; - let-over-lambda = { - pname = "let-over-lambda"; - version = "20220331-git"; - asds = [ "let-over-lambda" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/let-over-lambda/2022-03-31/let-over-lambda-20220331-git.tgz"; - sha256 = "0kq94jsk6frjwnx8wqnsvss91vmyjs9g9iv603d8fiip0szkwdnn"; - system = "let-over-lambda"; - asd = "let-over-lambda"; - }); - systems = [ "let-over-lambda" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - let-over-lambda-test = { - pname = "let-over-lambda-test"; - version = "20220331-git"; - asds = [ "let-over-lambda-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/let-over-lambda/2022-03-31/let-over-lambda-20220331-git.tgz"; - sha256 = "0kq94jsk6frjwnx8wqnsvss91vmyjs9g9iv603d8fiip0szkwdnn"; - system = "let-over-lambda-test"; - asd = "let-over-lambda-test"; - }); - systems = [ "let-over-lambda-test" ]; - lispLibs = [ (getAttr "let-over-lambda" pkgs) (getAttr "named-readtables" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - let-plus = { - pname = "let-plus"; - version = "20191130-git"; - asds = [ "let-plus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz"; - sha256 = "00c0nq6l4zb692rzsc9aliqzj3avrssfyz4bhxzl7f1jsz3m29jb"; - system = "let-plus"; - asd = "let-plus"; - }); - systems = [ "let-plus" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) ]; - }; - let-plus_slash_tests = { - pname = "let-plus_tests"; - version = "20191130-git"; - asds = [ "let-plus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz"; - sha256 = "00c0nq6l4zb692rzsc9aliqzj3avrssfyz4bhxzl7f1jsz3m29jb"; - system = "let-plus"; - asd = "let-plus"; - }); - systems = [ "let-plus/tests" ]; - lispLibs = [ (getAttr "let-plus" pkgs) (getAttr "lift" pkgs) ]; - meta = { - broken = true; - }; - }; - letrec = { - pname = "letrec"; - version = "20190307-hg"; - asds = [ "letrec" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/letrec/2019-03-07/letrec-20190307-hg.tgz"; - sha256 = "0cs2p1kv443dxd6vf908gblgdd2amcvjd1i1fq2cq9ip61dg9vnk"; - system = "letrec"; - asd = "letrec"; - }); - systems = [ "letrec" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - lev = { - pname = "lev"; - version = "20150505-git"; - asds = [ "lev" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz"; - sha256 = "14lfnrvfyg2nnvlwck896p6vgarzc6g4kijmvhi2d8wra7gxzifh"; - system = "lev"; - asd = "lev"; - }); - systems = [ "lev" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - leveldb = { - pname = "leveldb"; - version = "20160531-git"; - asds = [ "leveldb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/leveldb/2016-05-31/leveldb-20160531-git.tgz"; - sha256 = "03i4qr3g8ga2vpc8qbnipan3i7y4809i036wppkkixcsbckslckv"; - system = "leveldb"; - asd = "leveldb"; - }); - systems = [ "leveldb" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - levenshtein = { - pname = "levenshtein"; - version = "1.0"; - asds = [ "levenshtein" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/levenshtein/2010-10-06/levenshtein-1.0.tgz"; - sha256 = "0b4hdv55qcjlh3ixy3fglvb90ggmm79nl02nxkly2ls6cd7rbf5i"; - system = "levenshtein"; - asd = "levenshtein"; - }); - systems = [ "levenshtein" ]; - lispLibs = [ ]; - }; - lfarm-admin = { - pname = "lfarm-admin"; - version = "20150608-git"; - asds = [ "lfarm-admin" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; - sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; - system = "lfarm-admin"; - asd = "lfarm-admin"; - }); - systems = [ "lfarm-admin" ]; - lispLibs = [ (getAttr "lfarm-common" pkgs) (getAttr "usocket" pkgs) ]; - }; - lfarm-client = { - pname = "lfarm-client"; - version = "20150608-git"; - asds = [ "lfarm-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; - sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; - system = "lfarm-client"; - asd = "lfarm-client"; - }); - systems = [ "lfarm-client" ]; - lispLibs = [ (getAttr "lfarm-common" pkgs) (getAttr "lparallel" pkgs) (getAttr "usocket" pkgs) ]; - }; - lfarm-common = { - pname = "lfarm-common"; - version = "20150608-git"; - asds = [ "lfarm-common" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; - sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; - system = "lfarm-common"; - asd = "lfarm-common"; - }); - systems = [ "lfarm-common" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-store" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "usocket" pkgs) ]; - }; - lfarm-gss = { - pname = "lfarm-gss"; - version = "20150608-git"; - asds = [ "lfarm-gss" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; - sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; - system = "lfarm-gss"; - asd = "lfarm-gss"; - }); - systems = [ "lfarm-gss" ]; - lispLibs = [ (getAttr "cl-gss" pkgs) (getAttr "lfarm-common" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - lfarm-launcher = { - pname = "lfarm-launcher"; - version = "20150608-git"; - asds = [ "lfarm-launcher" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; - sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; - system = "lfarm-launcher"; - asd = "lfarm-launcher"; - }); - systems = [ "lfarm-launcher" ]; - lispLibs = [ (getAttr "external-program" pkgs) (getAttr "lfarm-admin" pkgs) (getAttr "lfarm-server" pkgs) ]; - }; - lfarm-server = { - pname = "lfarm-server"; - version = "20150608-git"; - asds = [ "lfarm-server" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; - sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; - system = "lfarm-server"; - asd = "lfarm-server"; - }); - systems = [ "lfarm-server" ]; - lispLibs = [ (getAttr "lfarm-common" pkgs) (getAttr "usocket" pkgs) ]; - }; - lfarm-ssl = { - pname = "lfarm-ssl"; - version = "20150608-git"; - asds = [ "lfarm-ssl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; - sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; - system = "lfarm-ssl"; - asd = "lfarm-ssl"; - }); - systems = [ "lfarm-ssl" ]; - lispLibs = [ (getAttr "cl_plus_ssl" pkgs) (getAttr "lfarm-common" pkgs) ]; - }; - lfarm-test = { - pname = "lfarm-test"; - version = "20150608-git"; - asds = [ "lfarm-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; - sha256 = "10kfhfx26wmaa3hk3vc7hc2fzk0rl2xdjwk8ld36x6ivvd48jlkv"; - system = "lfarm-test"; - asd = "lfarm-test"; - }); - systems = [ "lfarm-test" ]; - lispLibs = [ (getAttr "lfarm-admin" pkgs) (getAttr "lfarm-client" pkgs) (getAttr "lfarm-launcher" pkgs) (getAttr "lfarm-server" pkgs) ]; - }; - lhstats = { - pname = "lhstats"; - version = "20120107-git"; - asds = [ "lhstats" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lhstats/2012-01-07/lhstats-20120107-git.tgz"; - sha256 = "1x8h37vm9yd0a2g7qzili673n1c3a9rzawq27rxyzjrggv9wdnlz"; - system = "lhstats"; - asd = "lhstats"; - }); - systems = [ "lhstats" ]; - lispLibs = [ ]; - }; - lib-helper = { - pname = "lib-helper"; - version = "20221106-git"; - asds = [ "lib-helper" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lib-helper/2022-11-06/cl-lib-helper-20221106-git.tgz"; - sha256 = "1ml1zy65z2yckh2fa0sdjk1iqhbzzb3xf6ccj63n5ff986jr797k"; - system = "lib-helper"; - asd = "lib-helper"; - }); - systems = [ "lib-helper" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-containers" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) ]; - }; - lib-helper-test-system = { - pname = "lib-helper-test-system"; - version = "20221106-git"; - asds = [ "lib-helper-test-system" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lib-helper/2022-11-06/cl-lib-helper-20221106-git.tgz"; - sha256 = "1ml1zy65z2yckh2fa0sdjk1iqhbzzb3xf6ccj63n5ff986jr797k"; - system = "lib-helper-test-system"; - asd = "lib-helper-test-system"; - }); - systems = [ "lib-helper-test-system" ]; - lispLibs = [ ]; - }; - lib-helper_slash_test = { - pname = "lib-helper_test"; - version = "20221106-git"; - asds = [ "lib-helper" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lib-helper/2022-11-06/cl-lib-helper-20221106-git.tgz"; - sha256 = "1ml1zy65z2yckh2fa0sdjk1iqhbzzb3xf6ccj63n5ff986jr797k"; - system = "lib-helper"; - asd = "lib-helper"; - }); - systems = [ "lib-helper/test" ]; - lispLibs = [ (getAttr "lib-helper" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - liblmdb = { - pname = "liblmdb"; - version = "20170830-git"; - asds = [ "liblmdb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/liblmdb/2017-08-30/liblmdb-20170830-git.tgz"; - sha256 = "0484245fcbqza40n377qhsr2v838cih6pziav5vlnml1y0cgv62b"; - system = "liblmdb"; - asd = "liblmdb"; - }); - systems = [ "liblmdb" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - libssh2 = { - pname = "libssh2"; - version = "20160531-git"; - asds = [ "libssh2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libssh2/2016-05-31/cl-libssh2-20160531-git.tgz"; - sha256 = "1f2zq30zli0gnawclpasxsajpn20cpyy9d3q9zpqyw1sfrsn0hmk"; - system = "libssh2"; - asd = "libssh2"; - }); - systems = [ "libssh2" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-fad" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "usocket" pkgs) ]; - }; - libssh2_dot_test = { - pname = "libssh2.test"; - version = "20160531-git"; - asds = [ "libssh2.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libssh2/2016-05-31/cl-libssh2-20160531-git.tgz"; - sha256 = "1f2zq30zli0gnawclpasxsajpn20cpyy9d3q9zpqyw1sfrsn0hmk"; - system = "libssh2.test"; - asd = "libssh2.test"; - }); - systems = [ "libssh2.test" ]; - lispLibs = [ (getAttr "libssh2" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) ]; - }; - libusb-ffi = { - pname = "libusb-ffi"; - version = "20210228-git"; - asds = [ "libusb-ffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libusb/2021-02-28/cl-libusb-20210228-git.tgz"; - sha256 = "0kyzgcflwb85q58fgn82sp0bipnq5bprg5i4h0h3jxafqqyagbnk"; - system = "libusb-ffi"; - asd = "libusb-ffi"; - }); - systems = [ "libusb-ffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "static-vectors" pkgs) ]; - }; - lichat-ldap = { - pname = "lichat-ldap"; - version = "20190710-git"; - asds = [ "lichat-ldap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lichat-ldap/2019-07-10/lichat-ldap-20190710-git.tgz"; - sha256 = "03x60jmgx4s2pkzrgl1j70xrvycfi4yj21nzi64cd0pdprqa88d5"; - system = "lichat-ldap"; - asd = "lichat-ldap"; - }); - systems = [ "lichat-ldap" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "lichat-serverlib" pkgs) (getAttr "trivial-ldap" pkgs) ]; - }; - lichat-protocol = { - pname = "lichat-protocol"; - version = "20220707-git"; - asds = [ "lichat-protocol" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lichat-protocol/2022-07-07/lichat-protocol-20220707-git.tgz"; - sha256 = "0as5fcafgga8b1gbis4wxk2w8xv5l4sjy04y3m25gqc5my59falv"; - system = "lichat-protocol"; - asd = "lichat-protocol"; - }); - systems = [ "lichat-protocol" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) ]; - }; - lichat-serverlib = { - pname = "lichat-serverlib"; - version = "20220220-git"; - asds = [ "lichat-serverlib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lichat-serverlib/2022-02-20/lichat-serverlib-20220220-git.tgz"; - sha256 = "122nar4wbjck33nnzfnhzghssarrzrcwddr8i04ynws3v5y1rsdv"; - system = "lichat-serverlib"; - asd = "lichat-serverlib"; - }); - systems = [ "lichat-serverlib" ]; - lispLibs = [ (getAttr "crypto-shortcuts" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "lichat-protocol" pkgs) (getAttr "trivial-mimes" pkgs) ]; - }; - lichat-tcp-client = { - pname = "lichat-tcp-client"; - version = "20220707-git"; - asds = [ "lichat-tcp-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lichat-tcp-client/2022-07-07/lichat-tcp-client-20220707-git.tgz"; - sha256 = "02693m5qkpsx8mwpik57basgzsf750phvzxf7sjdm6vp84iszg3r"; - system = "lichat-tcp-client"; - asd = "lichat-tcp-client"; - }); - systems = [ "lichat-tcp-client" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "lichat-protocol" pkgs) (getAttr "usocket" pkgs) (getAttr "verbose" pkgs) ]; - }; - lichat-tcp-server = { - pname = "lichat-tcp-server"; - version = "20220220-git"; - asds = [ "lichat-tcp-server" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lichat-tcp-server/2022-02-20/lichat-tcp-server-20220220-git.tgz"; - sha256 = "06cnp06q522s7ya39ngk5sr6m5wrz0ajzi41hf7in0drx7n3dddz"; - system = "lichat-tcp-server"; - asd = "lichat-tcp-server"; - }); - systems = [ "lichat-tcp-server" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "lichat-protocol" pkgs) (getAttr "lichat-serverlib" pkgs) (getAttr "usocket" pkgs) (getAttr "verbose" pkgs) ]; - }; - lichat-ws-server = { - pname = "lichat-ws-server"; - version = "20220220-git"; - asds = [ "lichat-ws-server" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lichat-ws-server/2022-02-20/lichat-ws-server-20220220-git.tgz"; - sha256 = "0ylppkd0k41sa7xqk6n9q7i1hbmzlzyvaz3b5x46icjaidrwkm4j"; - system = "lichat-ws-server"; - asd = "lichat-ws-server"; - }); - systems = [ "lichat-ws-server" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "hunchensocket" pkgs) (getAttr "lichat-protocol" pkgs) (getAttr "lichat-serverlib" pkgs) (getAttr "verbose" pkgs) ]; - }; - lift = { - pname = "lift"; - version = "20221106-git"; - asds = [ "lift" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lift/2022-11-06/lift-20221106-git.tgz"; - sha256 = "1513n46fkqw8rnvz69s7xnwj476qm8ibdlwsr63qj9yh0mib0q6x"; - system = "lift"; - asd = "lift"; - }); - systems = [ "lift" ]; - lispLibs = [ ]; - }; - lift-documentation = { - pname = "lift-documentation"; - version = "20221106-git"; - asds = [ "lift-documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lift/2022-11-06/lift-20221106-git.tgz"; - sha256 = "1513n46fkqw8rnvz69s7xnwj476qm8ibdlwsr63qj9yh0mib0q6x"; - system = "lift-documentation"; - asd = "lift-documentation"; - }); - systems = [ "lift-documentation" ]; - lispLibs = [ (getAttr "lift" pkgs) ]; - }; - lift-test = { - pname = "lift-test"; - version = "20221106-git"; - asds = [ "lift-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lift/2022-11-06/lift-20221106-git.tgz"; - sha256 = "1513n46fkqw8rnvz69s7xnwj476qm8ibdlwsr63qj9yh0mib0q6x"; - system = "lift-test"; - asd = "lift-test"; - }); - systems = [ "lift-test" ]; - lispLibs = [ (getAttr "lift" pkgs) ]; - }; - lil = { - pname = "lil"; - version = "20211230-git"; - asds = [ "lil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-interface-library/2021-12-30/lisp-interface-library-20211230-git.tgz"; - sha256 = "0cd6109pzz9b4z0r0b7ibmmaph802ddpzfkk416snfn1mkrdn0gn"; - system = "lil"; - asd = "lil"; - }); - systems = [ "lil" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "fare-memoization" pkgs) (getAttr "fare-utils" pkgs) ]; - }; - lil_slash_test = { - pname = "lil_test"; - version = "20211230-git"; - asds = [ "lil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-interface-library/2021-12-30/lisp-interface-library-20211230-git.tgz"; - sha256 = "0cd6109pzz9b4z0r0b7ibmmaph802ddpzfkk416snfn1mkrdn0gn"; - system = "lil"; - asd = "lil"; - }); - systems = [ "lil/test" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - lila = { - pname = "lila"; - version = "20191007-git"; - asds = [ "lila" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lila/2019-10-07/lila-20191007-git.tgz"; - sha256 = "0n29ipbcxh4fm8f1vpaywv02iaayqqk61zsfk051ksjfl5kyqypq"; - system = "lila"; - asd = "lila"; - }); - systems = [ "lila" ]; - lispLibs = [ ]; - }; - lime = { - pname = "lime"; - version = "20151218-git"; - asds = [ "lime" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lime/2015-12-18/lime-20151218-git.tgz"; - sha256 = "0g8spvpsl2cddn8ldmx90fwgh0gghjsbb3zspa0r9f2k7sb6gcgr"; - system = "lime"; - asd = "lime"; - }); - systems = [ "lime" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "swank-protocol" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - lime-example = { - pname = "lime-example"; - version = "20151218-git"; - asds = [ "lime-example" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lime/2015-12-18/lime-20151218-git.tgz"; - sha256 = "0g8spvpsl2cddn8ldmx90fwgh0gghjsbb3zspa0r9f2k7sb6gcgr"; - system = "lime-example"; - asd = "lime-example"; - }); - systems = [ "lime-example" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "lime" pkgs) ]; - }; - lime-test = { - pname = "lime-test"; - version = "20151218-git"; - asds = [ "lime-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lime/2015-12-18/lime-20151218-git.tgz"; - sha256 = "0g8spvpsl2cddn8ldmx90fwgh0gghjsbb3zspa0r9f2k7sb6gcgr"; - system = "lime-test"; - asd = "lime-test"; - }); - systems = [ "lime-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "external-program" pkgs) (getAttr "fiveam" pkgs) (getAttr "lime" pkgs) ]; - }; - linear-programming = { - pname = "linear-programming"; - version = "20221106-git"; - asds = [ "linear-programming" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/linear-programming/2022-11-06/linear-programming-20221106-git.tgz"; - sha256 = "03lpyywz1q5ky18ivfpqvzmi11h3daqznj6lh73vij9wjlms7yxk"; - system = "linear-programming"; - asd = "linear-programming"; - }); - systems = [ "linear-programming" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) ]; - }; - linear-programming-glpk = { - pname = "linear-programming-glpk"; - version = "20221106-git"; - asds = [ "linear-programming-glpk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/linear-programming-glpk/2022-11-06/linear-programming-glpk-20221106-git.tgz"; - sha256 = "0vm4qgjvw5k3v62h78j6802dm075aif06hbjw600m3hybn84rs3l"; - system = "linear-programming-glpk"; - asd = "linear-programming-glpk"; - }); - systems = [ "linear-programming-glpk" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "linear-programming" pkgs) ]; - }; - linear-programming-glpk_slash_test = { - pname = "linear-programming-glpk_test"; - version = "20221106-git"; - asds = [ "linear-programming-glpk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/linear-programming-glpk/2022-11-06/linear-programming-glpk-20221106-git.tgz"; - sha256 = "0vm4qgjvw5k3v62h78j6802dm075aif06hbjw600m3hybn84rs3l"; - system = "linear-programming-glpk"; - asd = "linear-programming-glpk"; - }); - systems = [ "linear-programming-glpk/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "linear-programming-glpk" pkgs) ]; - meta = { - broken = true; - }; - }; - linear-programming-test = { - pname = "linear-programming-test"; - version = "20221106-git"; - asds = [ "linear-programming-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/linear-programming/2022-11-06/linear-programming-20221106-git.tgz"; - sha256 = "03lpyywz1q5ky18ivfpqvzmi11h3daqznj6lh73vij9wjlms7yxk"; - system = "linear-programming-test"; - asd = "linear-programming-test"; - }); - systems = [ "linear-programming-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "iterate" pkgs) (getAttr "linear-programming" pkgs) ]; - }; - linedit = { - pname = "linedit"; - version = "20180430-git"; - asds = [ "linedit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/linedit/2018-04-30/linedit-20180430-git.tgz"; - sha256 = "0hhh7xn6q12rviayfihg1ym6x6csa0pdjgb88ykqbrz2rs3pgpz5"; - system = "linedit"; - asd = "linedit"; - }); - systems = [ "linedit" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "osicat" pkgs) (getAttr "terminfo" pkgs) ]; - }; - lineva = { - pname = "lineva"; - version = "20221106-git"; - asds = [ "lineva" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lineva/2022-11-06/lineva-20221106-git.tgz"; - sha256 = "193v40llsi51b4zk93fyrg5ll2309waw7ibl4z75bbw73kc4f2wx"; - system = "lineva"; - asd = "lineva"; - }); - systems = [ "lineva" ]; - lispLibs = [ ]; - }; - lineva_slash_test = { - pname = "lineva_test"; - version = "20221106-git"; - asds = [ "lineva" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lineva/2022-11-06/lineva-20221106-git.tgz"; - sha256 = "193v40llsi51b4zk93fyrg5ll2309waw7ibl4z75bbw73kc4f2wx"; - system = "lineva"; - asd = "lineva"; - }); - systems = [ "lineva/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "lineva" pkgs) ]; - meta = { - broken = true; - }; - }; - linewise-template = { - pname = "linewise-template"; - version = "20160208-git"; - asds = [ "linewise-template" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/linewise-template/2016-02-08/linewise-template-20160208-git.tgz"; - sha256 = "06mbg1mq0a5xg3pgn5jml3cbzn8r8aw1p2mq26ml03gsrbiqc7m4"; - system = "linewise-template"; - asd = "linewise-template"; - }); - systems = [ "linewise-template" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - linux-packaging = { - pname = "linux-packaging"; - version = "20211020-git"; - asds = [ "linux-packaging" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/linux-packaging/2021-10-20/linux-packaging-20211020-git.tgz"; - sha256 = "0hmahs2slfs1bznn6zdljc5yjlg16ml795rcxnmafq7941lgqjs5"; - system = "linux-packaging"; - asd = "linux-packaging"; - }); - systems = [ "linux-packaging" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cffi-toolchain" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "wild-package-inferred-system" pkgs) ]; - }; - linux-packaging-tests = { - pname = "linux-packaging-tests"; - version = "20211020-git"; - asds = [ "linux-packaging-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/linux-packaging/2021-10-20/linux-packaging-20211020-git.tgz"; - sha256 = "0hmahs2slfs1bznn6zdljc5yjlg16ml795rcxnmafq7941lgqjs5"; - system = "linux-packaging-tests"; - asd = "linux-packaging-tests"; - }); - systems = [ "linux-packaging-tests" ]; - lispLibs = [ (getAttr "sqlite" pkgs) (getAttr "linux-packaging" pkgs) (getAttr "osicat" pkgs) (getAttr "wild-package-inferred-system" pkgs) ]; - }; - linux-packaging-tests_slash_deb = { - pname = "linux-packaging-tests_deb"; - version = "20211020-git"; - asds = [ "linux-packaging-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/linux-packaging/2021-10-20/linux-packaging-20211020-git.tgz"; - sha256 = "0hmahs2slfs1bznn6zdljc5yjlg16ml795rcxnmafq7941lgqjs5"; - system = "linux-packaging-tests"; - asd = "linux-packaging-tests"; - }); - systems = [ "linux-packaging-tests/deb" ]; - lispLibs = [ (getAttr "linux-packaging" pkgs) (getAttr "linux-packaging-tests" pkgs) ]; - meta = { - broken = true; - }; - }; - linux-packaging-tests_slash_pacman = { - pname = "linux-packaging-tests_pacman"; - version = "20211020-git"; - asds = [ "linux-packaging-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/linux-packaging/2021-10-20/linux-packaging-20211020-git.tgz"; - sha256 = "0hmahs2slfs1bznn6zdljc5yjlg16ml795rcxnmafq7941lgqjs5"; - system = "linux-packaging-tests"; - asd = "linux-packaging-tests"; - }); - systems = [ "linux-packaging-tests/pacman" ]; - lispLibs = [ (getAttr "linux-packaging" pkgs) (getAttr "linux-packaging-tests" pkgs) ]; - meta = { - broken = true; - }; - }; - linux-packaging-tests_slash_rpm = { - pname = "linux-packaging-tests_rpm"; - version = "20211020-git"; - asds = [ "linux-packaging-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/linux-packaging/2021-10-20/linux-packaging-20211020-git.tgz"; - sha256 = "0hmahs2slfs1bznn6zdljc5yjlg16ml795rcxnmafq7941lgqjs5"; - system = "linux-packaging-tests"; - asd = "linux-packaging-tests"; - }); - systems = [ "linux-packaging-tests/rpm" ]; - lispLibs = [ (getAttr "linux-packaging" pkgs) (getAttr "linux-packaging-tests" pkgs) ]; - meta = { - broken = true; - }; - }; - lionchat = { - pname = "lionchat"; - version = "20220220-git"; - asds = [ "lionchat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lionchat/2022-02-20/lionchat-20220220-git.tgz"; - sha256 = "1kr8n39nlxpqlk1y7y2p09172701w1k5w1cpffb7bbl41gvkihxf"; - system = "lionchat"; - asd = "lionchat"; - }); - systems = [ "lionchat" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "lichat-tcp-client" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtsvg" pkgs) (getAttr "qtools" pkgs) (getAttr "qtools-ui-listing" pkgs) (getAttr "qtools-ui-notification" pkgs) (getAttr "qtools-ui-options" pkgs) (getAttr "qtools-ui-repl" pkgs) (getAttr "trivial-arguments" pkgs) (getAttr "ubiquitous" pkgs) (getAttr "verbose" pkgs) ]; - }; - lisa = { - pname = "lisa"; - version = "20120407-git"; - asds = [ "lisa" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisa/2012-04-07/lisa-20120407-git.tgz"; - sha256 = "12mpwxpczfq2hridjspbg51121hngbcnji37fhlr0vv4dqrg1z15"; - system = "lisa"; - asd = "lisa"; - }); - systems = [ "lisa" ]; - lispLibs = [ ]; - }; - lisp-binary = { - pname = "lisp-binary"; - version = "20221106-git"; - asds = [ "lisp-binary" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-binary/2022-11-06/lisp-binary-20221106-git.tgz"; - sha256 = "0vn1kjvcch9ky50rq1axg5hixf3zkbb46as99g0aks1b7y250a17"; - system = "lisp-binary"; - asd = "lisp-binary"; - }); - systems = [ "lisp-binary" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "closer-mop" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "moptilities" pkgs) (getAttr "quasiquote-2_dot_0" pkgs) ]; - }; - lisp-binary-test = { - pname = "lisp-binary-test"; - version = "20221106-git"; - asds = [ "lisp-binary-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-binary/2022-11-06/lisp-binary-20221106-git.tgz"; - sha256 = "0vn1kjvcch9ky50rq1axg5hixf3zkbb46as99g0aks1b7y250a17"; - system = "lisp-binary-test"; - asd = "lisp-binary-test"; - }); - systems = [ "lisp-binary-test" ]; - lispLibs = [ (getAttr "lisp-binary" pkgs) ]; - }; - lisp-chat = { - pname = "lisp-chat"; - version = "20210228-git"; - asds = [ "lisp-chat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-chat/2021-02-28/lisp-chat-20210228-git.tgz"; - sha256 = "0gh78lb6m2790j5z64qij6v1s5yr501idbppg2ccyayl4f8bdpzi"; - system = "lisp-chat"; - asd = "lisp-chat"; - }); - systems = [ "lisp-chat" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-readline" pkgs) (getAttr "usocket" pkgs) ]; - }; - lisp-chat_slash_client = { - pname = "lisp-chat_client"; - version = "20210228-git"; - asds = [ "lisp-chat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-chat/2021-02-28/lisp-chat-20210228-git.tgz"; - sha256 = "0gh78lb6m2790j5z64qij6v1s5yr501idbppg2ccyayl4f8bdpzi"; - system = "lisp-chat"; - asd = "lisp-chat"; - }); - systems = [ "lisp-chat/client" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-readline" pkgs) (getAttr "usocket" pkgs) ]; - meta = { - broken = true; - }; - }; - lisp-chat_slash_server = { - pname = "lisp-chat_server"; - version = "20210228-git"; - asds = [ "lisp-chat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-chat/2021-02-28/lisp-chat-20210228-git.tgz"; - sha256 = "0gh78lb6m2790j5z64qij6v1s5yr501idbppg2ccyayl4f8bdpzi"; - system = "lisp-chat"; - asd = "lisp-chat"; - }); - systems = [ "lisp-chat/server" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "usocket" pkgs) ]; - meta = { - broken = true; - }; - }; - lisp-critic = { - pname = "lisp-critic"; - version = "20221106-git"; - asds = [ "lisp-critic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-critic/2022-11-06/lisp-critic-20221106-git.tgz"; - sha256 = "000vp8jsvpw80by7c7nb5394akfcr6rzzpzw049am67fh5qk89rn"; - system = "lisp-critic"; - asd = "lisp-critic"; - }); - systems = [ "lisp-critic" ]; - lispLibs = [ (getAttr "ckr-tables" pkgs) ]; - }; - lisp-executable = { - pname = "lisp-executable"; - version = "20180831-git"; - asds = [ "lisp-executable" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz"; - sha256 = "1309f7w0hks3agkhcn8nwm83yssdfrr9b5bjqkjg3rrhxs86c0z7"; - system = "lisp-executable"; - asd = "lisp-executable"; - }); - systems = [ "lisp-executable" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - lisp-executable-example = { - pname = "lisp-executable-example"; - version = "20180831-git"; - asds = [ "lisp-executable-example" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz"; - sha256 = "1309f7w0hks3agkhcn8nwm83yssdfrr9b5bjqkjg3rrhxs86c0z7"; - system = "lisp-executable-example"; - asd = "lisp-executable-example"; - }); - systems = [ "lisp-executable-example" ]; - lispLibs = [ (getAttr "lisp-executable" pkgs) ]; - }; - lisp-executable-tests = { - pname = "lisp-executable-tests"; - version = "20180831-git"; - asds = [ "lisp-executable-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-executable/2018-08-31/lisp-executable-20180831-git.tgz"; - sha256 = "1309f7w0hks3agkhcn8nwm83yssdfrr9b5bjqkjg3rrhxs86c0z7"; - system = "lisp-executable-tests"; - asd = "lisp-executable-tests"; - }); - systems = [ "lisp-executable-tests" ]; - lispLibs = [ (getAttr "lisp-executable" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - lisp-interface-library = { - pname = "lisp-interface-library"; - version = "20211230-git"; - asds = [ "lisp-interface-library" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-interface-library/2021-12-30/lisp-interface-library-20211230-git.tgz"; - sha256 = "0cd6109pzz9b4z0r0b7ibmmaph802ddpzfkk416snfn1mkrdn0gn"; - system = "lisp-interface-library"; - asd = "lisp-interface-library"; - }); - systems = [ "lisp-interface-library" ]; - lispLibs = [ (getAttr "lil" pkgs) ]; - }; - lisp-invocation = { - pname = "lisp-invocation"; - version = "20180228-git"; - asds = [ "lisp-invocation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-invocation/2018-02-28/lisp-invocation-20180228-git.tgz"; - sha256 = "1qwvczjd5w6mrkz7ip3gl46f72dnxgngdc5bla35l2g7br96kzsl"; - system = "lisp-invocation"; - asd = "lisp-invocation"; - }); - systems = [ "lisp-invocation" ]; - lispLibs = [ ]; - }; - lisp-invocation_slash_all = { - pname = "lisp-invocation_all"; - version = "20180228-git"; - asds = [ "lisp-invocation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-invocation/2018-02-28/lisp-invocation-20180228-git.tgz"; - sha256 = "1qwvczjd5w6mrkz7ip3gl46f72dnxgngdc5bla35l2g7br96kzsl"; - system = "lisp-invocation"; - asd = "lisp-invocation"; - }); - systems = [ "lisp-invocation/all" ]; - lispLibs = [ (getAttr "lisp-invocation" pkgs) ]; - meta = { - broken = true; - }; - }; - lisp-namespace = { - pname = "lisp-namespace"; - version = "20221106-git"; - asds = [ "lisp-namespace" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-namespace/2022-11-06/lisp-namespace-20221106-git.tgz"; - sha256 = "1p5db9mab4whapy1pl38ajw5fkrrdw266n05mnhf4xx2fb9sbx6p"; - system = "lisp-namespace"; - asd = "lisp-namespace"; - }); - systems = [ "lisp-namespace" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - lisp-namespace_dot_test = { - pname = "lisp-namespace.test"; - version = "20221106-git"; - asds = [ "lisp-namespace.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-namespace/2022-11-06/lisp-namespace-20221106-git.tgz"; - sha256 = "1p5db9mab4whapy1pl38ajw5fkrrdw266n05mnhf4xx2fb9sbx6p"; - system = "lisp-namespace.test"; - asd = "lisp-namespace.test"; - }); - systems = [ "lisp-namespace.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "lisp-namespace" pkgs) (getAttr "uiop" pkgs) ]; - }; - lisp-preprocessor = { - pname = "lisp-preprocessor"; - version = "20200715-git"; - asds = [ "lisp-preprocessor" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-preprocessor/2020-07-15/lisp-preprocessor-20200715-git.tgz"; - sha256 = "0v0qhawcvgbxk06nfwyvcqwmqvzn2svq80l2rb12myr0znschhpi"; - system = "lisp-preprocessor"; - asd = "lisp-preprocessor"; - }); - systems = [ "lisp-preprocessor" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - lisp-preprocessor-tests = { - pname = "lisp-preprocessor-tests"; - version = "20200715-git"; - asds = [ "lisp-preprocessor-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-preprocessor/2020-07-15/lisp-preprocessor-20200715-git.tgz"; - sha256 = "0v0qhawcvgbxk06nfwyvcqwmqvzn2svq80l2rb12myr0znschhpi"; - system = "lisp-preprocessor-tests"; - asd = "lisp-preprocessor"; - }); - systems = [ "lisp-preprocessor-tests" ]; - lispLibs = [ (getAttr "lisp-preprocessor" pkgs) (getAttr "rove" pkgs) ]; - }; - lisp-stat = { - pname = "lisp-stat"; - version = "20221106-git"; - asds = [ "lisp-stat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-stat/2022-11-06/lisp-stat-20221106-git.tgz"; - sha256 = "0qwlxrbwj884mr67sf6aj0zwrndv33aiiid4bqrkji41kjhqfcz5"; - system = "lisp-stat"; - asd = "lisp-stat"; - }); - systems = [ "lisp-stat" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "alexandria_plus" pkgs) (getAttr "array-operations" pkgs) (getAttr "org_dot_tfeb_dot_conduit-packages" pkgs) (getAttr "data-frame" pkgs) (getAttr "dexador" pkgs) (getAttr "dfio" pkgs) (getAttr "distributions" pkgs) (getAttr "num-utils" pkgs) (getAttr "select" pkgs) (getAttr "statistics" pkgs) ]; - }; - lisp-types = { - pname = "lisp-types"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "lisp-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "lisp-types"; - asd = "lisp-types"; - }); - systems = [ "lisp-types" ]; - lispLibs = [ (getAttr "adjuvant" pkgs) (getAttr "cl-robdd" pkgs) (getAttr "dispatch" pkgs) ]; - }; - lisp-types-analysis = { - pname = "lisp-types-analysis"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "lisp-types-analysis" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "lisp-types-analysis"; - asd = "lisp-types-analysis"; - }); - systems = [ "lisp-types-analysis" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "adjuvant" pkgs) (getAttr "cl-robdd" pkgs) (getAttr "cl-robdd-analysis" pkgs) (getAttr "lisp-types" pkgs) (getAttr "scrutiny" pkgs) ]; - }; - lisp-types-test = { - pname = "lisp-types-test"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "lisp-types-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "lisp-types-test"; - asd = "lisp-types-test"; - }); - systems = [ "lisp-types-test" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "adjuvant" pkgs) (getAttr "lisp-types" pkgs) (getAttr "lisp-types-analysis" pkgs) (getAttr "scrutiny" pkgs) ]; - }; - lisp-unit = { - pname = "lisp-unit"; - version = "20170124-git"; - asds = [ "lisp-unit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-unit/2017-01-24/lisp-unit-20170124-git.tgz"; - sha256 = "0p6gdmgr7p383nvd66c9y9fp2bjk4jx1lpa5p09g43hr9y9pp9ry"; - system = "lisp-unit"; - asd = "lisp-unit"; - }); - systems = [ "lisp-unit" ]; - lispLibs = [ ]; - }; - lisp-unit2 = { - pname = "lisp-unit2"; - version = "20221106-git"; - asds = [ "lisp-unit2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-unit2/2022-11-06/lisp-unit2-20221106-git.tgz"; - sha256 = "0jm0vfdj9w65r43an9sy90ddpi8ra1rh9vswaq6bhnzzmsrrbjyq"; - system = "lisp-unit2"; - asd = "lisp-unit2"; - }); - systems = [ "lisp-unit2" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "iterate" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - lisp-unit2_slash_tests = { - pname = "lisp-unit2_tests"; - version = "20221106-git"; - asds = [ "lisp-unit2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-unit2/2022-11-06/lisp-unit2-20221106-git.tgz"; - sha256 = "0jm0vfdj9w65r43an9sy90ddpi8ra1rh9vswaq6bhnzzmsrrbjyq"; - system = "lisp-unit2"; - asd = "lisp-unit2"; - }); - systems = [ "lisp-unit2/tests" ]; - lispLibs = [ (getAttr "lisp-unit2" pkgs) ]; - meta = { - broken = true; - }; - }; - lispbuilder-lexer = { - pname = "lispbuilder-lexer"; - version = "20210807-git"; - asds = [ "lispbuilder-lexer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-lexer"; - asd = "lispbuilder-lexer"; - }); - systems = [ "lispbuilder-lexer" ]; - lispLibs = [ (getAttr "lispbuilder-regex" pkgs) ]; - }; - lispbuilder-net = { - pname = "lispbuilder-net"; - version = "20210807-git"; - asds = [ "lispbuilder-net" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-net"; - asd = "lispbuilder-net"; - }); - systems = [ "lispbuilder-net" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-net-cffi" pkgs) ]; - }; - lispbuilder-net-cffi = { - pname = "lispbuilder-net-cffi"; - version = "20210807-git"; - asds = [ "lispbuilder-net-cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-net-cffi"; - asd = "lispbuilder-net-cffi"; - }); - systems = [ "lispbuilder-net-cffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - lispbuilder-opengl-1-1 = { - pname = "lispbuilder-opengl-1-1"; - version = "20210807-git"; - asds = [ "lispbuilder-opengl-1-1" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-opengl-1-1"; - asd = "lispbuilder-opengl-1-1"; - }); - systems = [ "lispbuilder-opengl-1-1" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - lispbuilder-opengl-examples = { - pname = "lispbuilder-opengl-examples"; - version = "20210807-git"; - asds = [ "lispbuilder-opengl-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-opengl-examples"; - asd = "lispbuilder-opengl-examples"; - }); - systems = [ "lispbuilder-opengl-examples" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-opengl-1-1" pkgs) (getAttr "lispbuilder-sdl" pkgs) ]; - }; - lispbuilder-regex = { - pname = "lispbuilder-regex"; - version = "20210807-git"; - asds = [ "lispbuilder-regex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-regex"; - asd = "lispbuilder-regex"; - }); - systems = [ "lispbuilder-regex" ]; - lispLibs = [ ]; - }; - lispbuilder-sdl = { - pname = "lispbuilder-sdl"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl"; - asd = "lispbuilder-sdl"; - }); - systems = [ "lispbuilder-sdl" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl-assets" pkgs) (getAttr "lispbuilder-sdl-base" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - lispbuilder-sdl-assets = { - pname = "lispbuilder-sdl-assets"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-assets" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-assets"; - asd = "lispbuilder-sdl-assets"; - }); - systems = [ "lispbuilder-sdl-assets" ]; - lispLibs = [ ]; - }; - lispbuilder-sdl-base = { - pname = "lispbuilder-sdl-base"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-base"; - asd = "lispbuilder-sdl-base"; - }); - systems = [ "lispbuilder-sdl-base" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl-cffi" pkgs) ]; - }; - lispbuilder-sdl-binaries = { - pname = "lispbuilder-sdl-binaries"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-binaries" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-binaries"; - asd = "lispbuilder-sdl-binaries"; - }); - systems = [ "lispbuilder-sdl-binaries" ]; - lispLibs = [ ]; - }; - lispbuilder-sdl-cffi = { - pname = "lispbuilder-sdl-cffi"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-cffi"; - asd = "lispbuilder-sdl-cffi"; - }); - systems = [ "lispbuilder-sdl-cffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl-binaries" pkgs) ]; - }; - lispbuilder-sdl-cl-vectors = { - pname = "lispbuilder-sdl-cl-vectors"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-cl-vectors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-cl-vectors"; - asd = "lispbuilder-sdl-cl-vectors"; - }); - systems = [ "lispbuilder-sdl-cl-vectors" ]; - lispLibs = [ (getAttr "cl-aa-misc" pkgs) (getAttr "cl-paths-ttf" pkgs) (getAttr "cl-vectors" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "zpb-ttf" pkgs) ]; - }; - lispbuilder-sdl-cl-vectors-examples = { - pname = "lispbuilder-sdl-cl-vectors-examples"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-cl-vectors-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-cl-vectors-examples"; - asd = "lispbuilder-sdl-cl-vectors-examples"; - }); - systems = [ "lispbuilder-sdl-cl-vectors-examples" ]; - lispLibs = [ (getAttr "lispbuilder-sdl-cl-vectors" pkgs) ]; - }; - lispbuilder-sdl-examples = { - pname = "lispbuilder-sdl-examples"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-examples"; - asd = "lispbuilder-sdl-examples"; - }); - systems = [ "lispbuilder-sdl-examples" ]; - lispLibs = [ (getAttr "lispbuilder-sdl" pkgs) ]; - }; - lispbuilder-sdl-gfx = { - pname = "lispbuilder-sdl-gfx"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-gfx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-gfx"; - asd = "lispbuilder-sdl-gfx"; - }); - systems = [ "lispbuilder-sdl-gfx" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-gfx-cffi" pkgs) ]; - }; - lispbuilder-sdl-gfx-binaries = { - pname = "lispbuilder-sdl-gfx-binaries"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-gfx-binaries" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-gfx-binaries"; - asd = "lispbuilder-sdl-gfx-binaries"; - }); - systems = [ "lispbuilder-sdl-gfx-binaries" ]; - lispLibs = [ ]; - }; - lispbuilder-sdl-gfx-cffi = { - pname = "lispbuilder-sdl-gfx-cffi"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-gfx-cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-gfx-cffi"; - asd = "lispbuilder-sdl-gfx-cffi"; - }); - systems = [ "lispbuilder-sdl-gfx-cffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl" pkgs) ]; - }; - lispbuilder-sdl-gfx-examples = { - pname = "lispbuilder-sdl-gfx-examples"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-gfx-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-gfx-examples"; - asd = "lispbuilder-sdl-gfx-examples"; - }); - systems = [ "lispbuilder-sdl-gfx-examples" ]; - lispLibs = [ (getAttr "lispbuilder-sdl-gfx" pkgs) ]; - }; - lispbuilder-sdl-image = { - pname = "lispbuilder-sdl-image"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-image" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-image"; - asd = "lispbuilder-sdl-image"; - }); - systems = [ "lispbuilder-sdl-image" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-image-cffi" pkgs) ]; - }; - lispbuilder-sdl-image-binaries = { - pname = "lispbuilder-sdl-image-binaries"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-image-binaries" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-image-binaries"; - asd = "lispbuilder-sdl-image-binaries"; - }); - systems = [ "lispbuilder-sdl-image-binaries" ]; - lispLibs = [ ]; - }; - lispbuilder-sdl-image-cffi = { - pname = "lispbuilder-sdl-image-cffi"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-image-cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-image-cffi"; - asd = "lispbuilder-sdl-image-cffi"; - }); - systems = [ "lispbuilder-sdl-image-cffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-image-binaries" pkgs) ]; - }; - lispbuilder-sdl-image-examples = { - pname = "lispbuilder-sdl-image-examples"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-image-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-image-examples"; - asd = "lispbuilder-sdl-image-examples"; - }); - systems = [ "lispbuilder-sdl-image-examples" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-image" pkgs) ]; - }; - lispbuilder-sdl-mixer = { - pname = "lispbuilder-sdl-mixer"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-mixer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-mixer"; - asd = "lispbuilder-sdl-mixer"; - }); - systems = [ "lispbuilder-sdl-mixer" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-mixer-cffi" pkgs) ]; - }; - lispbuilder-sdl-mixer-binaries = { - pname = "lispbuilder-sdl-mixer-binaries"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-mixer-binaries" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-mixer-binaries"; - asd = "lispbuilder-sdl-mixer-binaries"; - }); - systems = [ "lispbuilder-sdl-mixer-binaries" ]; - lispLibs = [ ]; - }; - lispbuilder-sdl-mixer-cffi = { - pname = "lispbuilder-sdl-mixer-cffi"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-mixer-cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-mixer-cffi"; - asd = "lispbuilder-sdl-mixer-cffi"; - }); - systems = [ "lispbuilder-sdl-mixer-cffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-mixer-binaries" pkgs) ]; - }; - lispbuilder-sdl-mixer-examples = { - pname = "lispbuilder-sdl-mixer-examples"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-mixer-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-mixer-examples"; - asd = "lispbuilder-sdl-mixer-examples"; - }); - systems = [ "lispbuilder-sdl-mixer-examples" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-mixer" pkgs) ]; - }; - lispbuilder-sdl-ttf = { - pname = "lispbuilder-sdl-ttf"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-ttf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-ttf"; - asd = "lispbuilder-sdl-ttf"; - }); - systems = [ "lispbuilder-sdl-ttf" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-ttf-cffi" pkgs) ]; - }; - lispbuilder-sdl-ttf-binaries = { - pname = "lispbuilder-sdl-ttf-binaries"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-ttf-binaries" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-ttf-binaries"; - asd = "lispbuilder-sdl-ttf-binaries"; - }); - systems = [ "lispbuilder-sdl-ttf-binaries" ]; - lispLibs = [ ]; - }; - lispbuilder-sdl-ttf-cffi = { - pname = "lispbuilder-sdl-ttf-cffi"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-ttf-cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-ttf-cffi"; - asd = "lispbuilder-sdl-ttf-cffi"; - }); - systems = [ "lispbuilder-sdl-ttf-cffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-ttf-binaries" pkgs) ]; - }; - lispbuilder-sdl-ttf-examples = { - pname = "lispbuilder-sdl-ttf-examples"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-ttf-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-ttf-examples"; - asd = "lispbuilder-sdl-ttf-examples"; - }); - systems = [ "lispbuilder-sdl-ttf-examples" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-ttf" pkgs) ]; - }; - lispbuilder-sdl-vecto = { - pname = "lispbuilder-sdl-vecto"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-vecto" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-vecto"; - asd = "lispbuilder-sdl-vecto"; - }); - systems = [ "lispbuilder-sdl-vecto" ]; - lispLibs = [ (getAttr "lispbuilder-sdl" pkgs) (getAttr "lispbuilder-sdl-cl-vectors" pkgs) (getAttr "vecto" pkgs) ]; - }; - lispbuilder-sdl-vecto-examples = { - pname = "lispbuilder-sdl-vecto-examples"; - version = "20210807-git"; - asds = [ "lispbuilder-sdl-vecto-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-sdl-vecto-examples"; - asd = "lispbuilder-sdl-vecto-examples"; - }); - systems = [ "lispbuilder-sdl-vecto-examples" ]; - lispLibs = [ (getAttr "lispbuilder-sdl-vecto" pkgs) ]; - }; - lispbuilder-windows = { - pname = "lispbuilder-windows"; - version = "20210807-git"; - asds = [ "lispbuilder-windows" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-windows"; - asd = "lispbuilder-windows"; - }); - systems = [ "lispbuilder-windows" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - lispbuilder-yacc = { - pname = "lispbuilder-yacc"; - version = "20210807-git"; - asds = [ "lispbuilder-yacc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispbuilder/2021-08-07/lispbuilder-20210807-git.tgz"; - sha256 = "0ssm72ss4k6gjkm7nq225miisip6kvhmnnycvxn8x1z20qld03iq"; - system = "lispbuilder-yacc"; - asd = "lispbuilder-yacc"; - }); - systems = [ "lispbuilder-yacc" ]; - lispLibs = [ ]; - }; - lispcord = { - pname = "lispcord"; - version = "20200925-git"; - asds = [ "lispcord" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispcord/2020-09-25/lispcord-20200925-git.tgz"; - sha256 = "1bkvsbnbv21q8xz8z2nmczznd0sllr57l3sc2wm5cjn6h3qg1sgh"; - system = "lispcord"; - asd = "lispcord"; - }); - systems = [ "lispcord" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "drakma" pkgs) (getAttr "jonathan" pkgs) (getAttr "split-sequence" pkgs) (getAttr "verbose" pkgs) (getAttr "websocket-driver-client" pkgs) ]; - }; - lispqr = { - pname = "lispqr"; - version = "20210630-git"; - asds = [ "lispqr" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lispqr/2021-06-30/lispqr-20210630-git.tgz"; - sha256 = "06v1xpw5r4nxll286frhkc3ysvr50m904d33marnjmiax41y8qkc"; - system = "lispqr"; - asd = "lispqr"; - }); - systems = [ "lispqr" ]; - lispLibs = [ (getAttr "zpng" pkgs) ]; - }; - list-named-class = { - pname = "list-named-class"; - version = "20200325-git"; - asds = [ "list-named-class" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/list-named-class/2020-03-25/list-named-class-20200325-git.tgz"; - sha256 = "1bdi9q9wvfj66jji3n9hpjrj9271ial2awsb0xw80bmy6wqbg8kq"; - system = "list-named-class"; - asd = "list-named-class"; - }); - systems = [ "list-named-class" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - list-named-class_slash_protest = { - pname = "list-named-class_protest"; - version = "20200325-git"; - asds = [ "list-named-class" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/list-named-class/2020-03-25/list-named-class-20200325-git.tgz"; - sha256 = "1bdi9q9wvfj66jji3n9hpjrj9271ial2awsb0xw80bmy6wqbg8kq"; - system = "list-named-class"; - asd = "list-named-class"; - }); - systems = [ "list-named-class/protest" ]; - lispLibs = [ (getAttr "list-named-class" pkgs) (getAttr "protest" pkgs) ]; - meta = { - broken = true; - }; - }; - list-named-class_slash_test = { - pname = "list-named-class_test"; - version = "20200325-git"; - asds = [ "list-named-class" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/list-named-class/2020-03-25/list-named-class-20200325-git.tgz"; - sha256 = "1bdi9q9wvfj66jji3n9hpjrj9271ial2awsb0xw80bmy6wqbg8kq"; - system = "list-named-class"; - asd = "list-named-class"; - }); - systems = [ "list-named-class/test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "list-named-class" pkgs) ]; - meta = { - broken = true; - }; - }; - list-of = { - pname = "list-of"; - version = "20221106-git"; - asds = [ "list-of" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asdf-finalizers/2022-11-06/asdf-finalizers-20221106-git.tgz"; - sha256 = "1w56c9yjjydjshsgqxz57qlp2v3r4ilbisnsgiqphvxnhvd41y0v"; - system = "list-of"; - asd = "list-of"; - }); - systems = [ "list-of" ]; - lispLibs = [ (getAttr "asdf-finalizers" pkgs) ]; - }; - listoflist = { - pname = "listoflist"; - version = "20140826-git"; - asds = [ "listoflist" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/listoflist/2014-08-26/listoflist-20140826-git.tgz"; - sha256 = "02bj2ldn7sfjbbn9zd66lwysymrv3f6g4q9hwsjbcg4fkpbk6qk3"; - system = "listoflist"; - asd = "listoflist"; - }); - systems = [ "listoflist" ]; - lispLibs = [ (getAttr "clunit" pkgs) (getAttr "xarray" pkgs) ]; - }; - listopia = { - pname = "listopia"; - version = "20210411-git"; - asds = [ "listopia" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/listopia/2021-04-11/listopia-20210411-git.tgz"; - sha256 = "0jd3mdv0ia8mfgdbpndzm3rdgc6nn9d9xpjzqjx582qhbnc0yji0"; - system = "listopia"; - asd = "listopia"; - }); - systems = [ "listopia" ]; - lispLibs = [ ]; - }; - listopia-bench = { - pname = "listopia-bench"; - version = "20210411-git"; - asds = [ "listopia-bench" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/listopia/2021-04-11/listopia-20210411-git.tgz"; - sha256 = "0jd3mdv0ia8mfgdbpndzm3rdgc6nn9d9xpjzqjx582qhbnc0yji0"; - system = "listopia-bench"; - asd = "listopia-bench"; - }); - systems = [ "listopia-bench" ]; - lispLibs = [ (getAttr "listopia" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "trivial-benchmark" pkgs) ]; - }; - listopia_slash_tests = { - pname = "listopia_tests"; - version = "20210411-git"; - asds = [ "listopia" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/listopia/2021-04-11/listopia-20210411-git.tgz"; - sha256 = "0jd3mdv0ia8mfgdbpndzm3rdgc6nn9d9xpjzqjx582qhbnc0yji0"; - system = "listopia"; - asd = "listopia"; - }); - systems = [ "listopia/tests" ]; - lispLibs = [ (getAttr "listopia" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - liter = { - pname = "liter"; - version = "20211020-git"; - asds = [ "liter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; - sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r"; - system = "liter"; - asd = "liter"; - }); - systems = [ "liter" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "serapeum" pkgs) ]; - }; - literate-demo = { - pname = "literate-demo"; - version = "20221106-git"; - asds = [ "literate-demo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/literate-lisp/2022-11-06/literate-lisp-20221106-git.tgz"; - sha256 = "18lp0bwi4ws7d2xm0lf0jxlvajrxpfyp0z0zamgs97swz5rb8qpk"; - system = "literate-demo"; - asd = "literate-demo"; - }); - systems = [ "literate-demo" ]; - lispLibs = [ (getAttr "iterate" pkgs) (getAttr "literate-lisp" pkgs) ]; - }; - literate-lisp = { - pname = "literate-lisp"; - version = "20221106-git"; - asds = [ "literate-lisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/literate-lisp/2022-11-06/literate-lisp-20221106-git.tgz"; - sha256 = "18lp0bwi4ws7d2xm0lf0jxlvajrxpfyp0z0zamgs97swz5rb8qpk"; - system = "literate-lisp"; - asd = "literate-lisp"; - }); - systems = [ "literate-lisp" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "iterate" pkgs) ]; - }; - litterae = { - pname = "litterae"; - version = "20200715-git"; - asds = [ "litterae" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/litterae/2020-07-15/litterae-20200715-git.tgz"; - sha256 = "05q6apkcxacis4llq8xjp468yg5v6za0ispcy5wqsb44ic0vhmsl"; - system = "litterae"; - asd = "litterae"; - }); - systems = [ "litterae" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "_3bmd-ext-code-blocks" pkgs) (getAttr "str" pkgs) (getAttr "cl-yaml" pkgs) (getAttr "docparser" pkgs) (getAttr "lsx" pkgs) ]; - }; - litterae-test-system = { - pname = "litterae-test-system"; - version = "20200715-git"; - asds = [ "litterae-test-system" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/litterae/2020-07-15/litterae-20200715-git.tgz"; - sha256 = "05q6apkcxacis4llq8xjp468yg5v6za0ispcy5wqsb44ic0vhmsl"; - system = "litterae-test-system"; - asd = "litterae-test-system"; - }); - systems = [ "litterae-test-system" ]; - lispLibs = [ ]; - }; - litterae_slash_tests = { - pname = "litterae_tests"; - version = "20200715-git"; - asds = [ "litterae" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/litterae/2020-07-15/litterae-20200715-git.tgz"; - sha256 = "05q6apkcxacis4llq8xjp468yg5v6za0ispcy5wqsb44ic0vhmsl"; - system = "litterae"; - asd = "litterae"; - }); - systems = [ "litterae/tests" ]; - lispLibs = [ (getAttr "litterae" pkgs) (getAttr "litterae-test-system" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - livesupport = { - pname = "livesupport"; - version = "release-quicklisp-71e6e412-git"; - asds = [ "livesupport" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/livesupport/2019-05-21/livesupport-release-quicklisp-71e6e412-git.tgz"; - sha256 = "1rvnl0mncylbx63608pz5llss7y92j7z3ydambk9mcnjg2mjaapg"; - system = "livesupport"; - asd = "livesupport"; - }); - systems = [ "livesupport" ]; - lispLibs = [ ]; - }; - lla = { - pname = "lla"; - version = "20180328-git"; - asds = [ "lla" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lla/2018-03-28/lla-20180328-git.tgz"; - sha256 = "0n9vc7dnyjbbsv1n7rd8sylwda5fsdf8f890g4nachanyx0xps9k"; - system = "lla"; - asd = "lla"; - }); - systems = [ "lla" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-num-utils" pkgs) (getAttr "cl-slice" pkgs) (getAttr "let-plus" pkgs) ]; - }; - lla-tests = { - pname = "lla-tests"; - version = "20180328-git"; - asds = [ "lla-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lla/2018-03-28/lla-20180328-git.tgz"; - sha256 = "0n9vc7dnyjbbsv1n7rd8sylwda5fsdf8f890g4nachanyx0xps9k"; - system = "lla-tests"; - asd = "lla"; - }); - systems = [ "lla-tests" ]; - lispLibs = [ (getAttr "clunit" pkgs) (getAttr "lla" pkgs) ]; - }; - lmdb = { - pname = "lmdb"; - version = "20220220-git"; - asds = [ "lmdb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lmdb/2022-02-20/lmdb-20220220-git.tgz"; - sha256 = "0akvimmvd4kcx6gh1j1dzvcclhc0jc4hc9vkh3ldgzb8wyf4vl8q"; - system = "lmdb"; - asd = "lmdb"; - }); - systems = [ "lmdb" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-reexport" pkgs) (getAttr "mgl-pax" pkgs) (getAttr "osicat" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - lmdb_slash_test = { - pname = "lmdb_test"; - version = "20220220-git"; - asds = [ "lmdb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lmdb/2022-02-20/lmdb-20220220-git.tgz"; - sha256 = "0akvimmvd4kcx6gh1j1dzvcclhc0jc4hc9vkh3ldgzb8wyf4vl8q"; - system = "lmdb"; - asd = "lmdb"; - }); - systems = [ "lmdb/test" ]; - lispLibs = [ (getAttr "lmdb" pkgs) (getAttr "try" pkgs) ]; - meta = { - broken = true; - }; - }; - lml = { - pname = "lml"; - version = "20150923-git"; - asds = [ "lml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lml/2015-09-23/lml-20150923-git.tgz"; - sha256 = "1s8v9p08vwl08y6ssxn4l088zz57d6fr13lzdz93i9jb8w8884wk"; - system = "lml"; - asd = "lml"; - }); - systems = [ "lml" ]; - lispLibs = [ ]; - }; - lml-tests = { - pname = "lml-tests"; - version = "20150923-git"; - asds = [ "lml-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lml/2015-09-23/lml-20150923-git.tgz"; - sha256 = "1s8v9p08vwl08y6ssxn4l088zz57d6fr13lzdz93i9jb8w8884wk"; - system = "lml-tests"; - asd = "lml-tests"; - }); - systems = [ "lml-tests" ]; - lispLibs = [ (getAttr "lml" pkgs) (getAttr "rt" pkgs) ]; - }; - lml2 = { - pname = "lml2"; - version = "20150923-git"; - asds = [ "lml2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lml2/2015-09-23/lml2-20150923-git.tgz"; - sha256 = "0v4d30x5zq1asp4r91nrzljpk2pm1plr0jns7a5wrf1n9fay57a6"; - system = "lml2"; - asd = "lml2"; - }); - systems = [ "lml2" ]; - lispLibs = [ (getAttr "kmrcl" pkgs) ]; - }; - lml2-tests = { - pname = "lml2-tests"; - version = "20150923-git"; - asds = [ "lml2-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lml2/2015-09-23/lml2-20150923-git.tgz"; - sha256 = "0v4d30x5zq1asp4r91nrzljpk2pm1plr0jns7a5wrf1n9fay57a6"; - system = "lml2-tests"; - asd = "lml2-tests"; - }); - systems = [ "lml2-tests" ]; - lispLibs = [ (getAttr "lml2" pkgs) (getAttr "rt" pkgs) ]; - }; - local-package-aliases = { - pname = "local-package-aliases"; - version = "20201220-git"; - asds = [ "local-package-aliases" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/local-package-aliases/2020-12-20/local-package-aliases-20201220-git.tgz"; - sha256 = "01knnxnximj2qyg8lhv0ijw69hfwqbfbmgvfjwnm7jbdgcp9wxnr"; - system = "local-package-aliases"; - asd = "local-package-aliases"; - }); - systems = [ "local-package-aliases" ]; - lispLibs = [ ]; - }; - local-time = { - pname = "local-time"; - version = "20220707-git"; - asds = [ "local-time" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/local-time/2022-07-07/local-time-20220707-git.tgz"; - sha256 = "0191fxlvzi3asx145bpdgd325s6wx2gqm5ssa4f72l0smr5av671"; - system = "local-time"; - asd = "local-time"; - }); - systems = [ "local-time" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - local-time-duration = { - pname = "local-time-duration"; - version = "20180430-git"; - asds = [ "local-time-duration" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/local-time-duration/2018-04-30/local-time-duration-20180430-git.tgz"; - sha256 = "0f13mg18lv31lclz9jvqyj8d85p1jj1366nlld8m3dxnnwsbbkd6"; - system = "local-time-duration"; - asd = "local-time-duration"; - }); - systems = [ "local-time-duration" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "esrap" pkgs) (getAttr "local-time" pkgs) ]; - }; - local-time_slash_test = { - pname = "local-time_test"; - version = "20220707-git"; - asds = [ "local-time" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/local-time/2022-07-07/local-time-20220707-git.tgz"; - sha256 = "0191fxlvzi3asx145bpdgd325s6wx2gqm5ssa4f72l0smr5av671"; - system = "local-time"; - asd = "local-time"; - }); - systems = [ "local-time/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "local-time" pkgs) ]; - meta = { - broken = true; - }; - }; - log4cl = { - pname = "log4cl"; - version = "20211209-git"; - asds = [ "log4cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/log4cl/2021-12-09/log4cl-20211209-git.tgz"; - sha256 = "0mjkw4w3ksxvn87jqdnailqy2h6sziwmp4gf73jym45x9l5zahi5"; - system = "log4cl"; - asd = "log4cl"; - }); - systems = [ "log4cl" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - log4cl-examples = { - pname = "log4cl-examples"; - version = "20211209-git"; - asds = [ "log4cl-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/log4cl/2021-12-09/log4cl-20211209-git.tgz"; - sha256 = "0mjkw4w3ksxvn87jqdnailqy2h6sziwmp4gf73jym45x9l5zahi5"; - system = "log4cl-examples"; - asd = "log4cl-examples"; - }); - systems = [ "log4cl-examples" ]; - lispLibs = [ (getAttr "log4cl" pkgs) (getAttr "swank" pkgs) ]; - }; - log4cl-extras = { - pname = "log4cl-extras"; - version = "20221106-git"; - asds = [ "log4cl-extras" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/log4cl-extras/2022-11-06/log4cl-extras-20221106-git.tgz"; - sha256 = "1dsvfzavrb2if285shjcb7hjh3sjpb9fmarj6y6sjgip2zxsjg9s"; - system = "log4cl-extras"; - asd = "log4cl-extras"; - }); - systems = [ "log4cl-extras" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-strings" pkgs) (getAttr "dissect" pkgs) (getAttr "_40ants-doc" pkgs) (getAttr "global-vars" pkgs) (getAttr "jonathan" pkgs) (getAttr "local-time" pkgs) (getAttr "log4cl" pkgs) (getAttr "named-readtables" pkgs) (getAttr "pythonic-string-reader" pkgs) (getAttr "with-output-to-stream" pkgs) ]; - }; - log4cl-extras-test = { - pname = "log4cl-extras-test"; - version = "20221106-git"; - asds = [ "log4cl-extras-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/log4cl-extras/2022-11-06/log4cl-extras-20221106-git.tgz"; - sha256 = "1dsvfzavrb2if285shjcb7hjh3sjpb9fmarj6y6sjgip2zxsjg9s"; - system = "log4cl-extras-test"; - asd = "log4cl-extras-test"; - }); - systems = [ "log4cl-extras-test" ]; - lispLibs = [ (getAttr "hamcrest" pkgs) (getAttr "jonathan" pkgs) (getAttr "rove" pkgs) (getAttr "secret-values" pkgs) ]; - }; - log4cl_dot_log4slime = { - pname = "log4cl.log4slime"; - version = "20211209-git"; - asds = [ "log4cl.log4slime" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/log4cl/2021-12-09/log4cl-20211209-git.tgz"; - sha256 = "0mjkw4w3ksxvn87jqdnailqy2h6sziwmp4gf73jym45x9l5zahi5"; - system = "log4cl.log4slime"; - asd = "log4cl.log4slime"; - }); - systems = [ "log4cl.log4slime" ]; - lispLibs = [ (getAttr "log4cl" pkgs) (getAttr "swank" pkgs) ]; - }; - log4cl_dot_log4sly = { - pname = "log4cl.log4sly"; - version = "20211209-git"; - asds = [ "log4cl.log4sly" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/log4cl/2021-12-09/log4cl-20211209-git.tgz"; - sha256 = "0mjkw4w3ksxvn87jqdnailqy2h6sziwmp4gf73jym45x9l5zahi5"; - system = "log4cl.log4sly"; - asd = "log4cl.log4sly"; - }); - systems = [ "log4cl.log4sly" ]; - lispLibs = [ (getAttr "log4cl" pkgs) (getAttr "slynk" pkgs) ]; - }; - log4cl_slash_syslog = { - pname = "log4cl_syslog"; - version = "20211209-git"; - asds = [ "log4cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/log4cl/2021-12-09/log4cl-20211209-git.tgz"; - sha256 = "0mjkw4w3ksxvn87jqdnailqy2h6sziwmp4gf73jym45x9l5zahi5"; - system = "log4cl"; - asd = "log4cl"; - }); - systems = [ "log4cl/syslog" ]; - lispLibs = [ (getAttr "log4cl" pkgs) ]; - meta = { - broken = true; - }; - }; - log4cl_slash_test = { - pname = "log4cl_test"; - version = "20211209-git"; - asds = [ "log4cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/log4cl/2021-12-09/log4cl-20211209-git.tgz"; - sha256 = "0mjkw4w3ksxvn87jqdnailqy2h6sziwmp4gf73jym45x9l5zahi5"; - system = "log4cl"; - asd = "log4cl"; - }); - systems = [ "log4cl/test" ]; - lispLibs = [ (getAttr "log4cl" pkgs) (getAttr "stefil" pkgs) ]; - meta = { - broken = true; - }; - }; - log5 = { - pname = "log5"; - version = "20110619-git"; - asds = [ "log5" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/log5/2011-06-19/log5-20110619-git.tgz"; - sha256 = "0f7qhhphijwk6a4hq18gpgifld7hwwpma6md845hgjmpvyqvrw2g"; - system = "log5"; - asd = "log5"; - }); - systems = [ "log5" ]; - lispLibs = [ ]; - }; - lorem-ipsum = { - pname = "lorem-ipsum"; - version = "20181018-git"; - asds = [ "lorem-ipsum" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lorem-ipsum/2018-10-18/lorem-ipsum-20181018-git.tgz"; - sha256 = "1530qq0bk3xr25m77q96pbi1idnxdkax8cwmvq4ch03rfjy34j7n"; - system = "lorem-ipsum"; - asd = "lorem-ipsum"; - }); - systems = [ "lorem-ipsum" ]; - lispLibs = [ ]; - }; - lowlight = { - pname = "lowlight"; - version = "20131211-git"; - asds = [ "lowlight" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz"; - sha256 = "1i27hdac7aqb27rn5cslpf5lwvkrfz52b6rf7zqq0fi42zmvgb4p"; - system = "lowlight"; - asd = "lowlight"; - }); - systems = [ "lowlight" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-who" pkgs) (getAttr "yacc" pkgs) (getAttr "graylex" pkgs) (getAttr "spinneret" pkgs) ]; - }; - lowlight_dot_doc = { - pname = "lowlight.doc"; - version = "20131211-git"; - asds = [ "lowlight.doc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz"; - sha256 = "1i27hdac7aqb27rn5cslpf5lwvkrfz52b6rf7zqq0fi42zmvgb4p"; - system = "lowlight.doc"; - asd = "lowlight.doc"; - }); - systems = [ "lowlight.doc" ]; - lispLibs = [ (getAttr "cl-gendoc" pkgs) (getAttr "lowlight" pkgs) (getAttr "lowlight_dot_tests" pkgs) ]; - }; - lowlight_dot_old = { - pname = "lowlight.old"; - version = "20131211-git"; - asds = [ "lowlight.old" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz"; - sha256 = "1i27hdac7aqb27rn5cslpf5lwvkrfz52b6rf7zqq0fi42zmvgb4p"; - system = "lowlight.old"; - asd = "lowlight.old"; - }); - systems = [ "lowlight.old" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-who" pkgs) (getAttr "spinneret" pkgs) ]; - }; - lowlight_dot_tests = { - pname = "lowlight.tests"; - version = "20131211-git"; - asds = [ "lowlight.tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lowlight/2013-12-11/lowlight-20131211-git.tgz"; - sha256 = "1i27hdac7aqb27rn5cslpf5lwvkrfz52b6rf7zqq0fi42zmvgb4p"; - system = "lowlight.tests"; - asd = "lowlight.tests"; - }); - systems = [ "lowlight.tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "lowlight" pkgs) ]; - }; - lparallel = { - pname = "lparallel"; - version = "20160825-git"; - asds = [ "lparallel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz"; - sha256 = "0g0aylrbbrqsz0ahmwhvnk4cmc2931fllbpcfgzsprwnqqd7vwq9"; - system = "lparallel"; - asd = "lparallel"; - }); - systems = [ "lparallel" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) ]; - }; - lparallel-bench = { - pname = "lparallel-bench"; - version = "20160825-git"; - asds = [ "lparallel-bench" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz"; - sha256 = "0g0aylrbbrqsz0ahmwhvnk4cmc2931fllbpcfgzsprwnqqd7vwq9"; - system = "lparallel-bench"; - asd = "lparallel-bench"; - }); - systems = [ "lparallel-bench" ]; - lispLibs = [ (getAttr "lparallel" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - lparallel-test = { - pname = "lparallel-test"; - version = "20160825-git"; - asds = [ "lparallel-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz"; - sha256 = "0g0aylrbbrqsz0ahmwhvnk4cmc2931fllbpcfgzsprwnqqd7vwq9"; - system = "lparallel-test"; - asd = "lparallel-test"; - }); - systems = [ "lparallel-test" ]; - lispLibs = [ (getAttr "lparallel" pkgs) ]; - }; - lquery = { - pname = "lquery"; - version = "20201220-git"; - asds = [ "lquery" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lquery/2020-12-20/lquery-20201220-git.tgz"; - sha256 = "1bnp643bb203iqiarbm6i21vh9g301zh3gspv01m2jhdqi5lvmjz"; - system = "lquery"; - asd = "lquery"; - }); - systems = [ "lquery" ]; - lispLibs = [ (getAttr "array-utils" pkgs) (getAttr "clss" pkgs) (getAttr "form-fiddle" pkgs) (getAttr "plump" pkgs) ]; - }; - lquery-test = { - pname = "lquery-test"; - version = "20201220-git"; - asds = [ "lquery-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lquery/2020-12-20/lquery-20201220-git.tgz"; - sha256 = "1bnp643bb203iqiarbm6i21vh9g301zh3gspv01m2jhdqi5lvmjz"; - system = "lquery-test"; - asd = "lquery-test"; - }); - systems = [ "lquery-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "lquery" pkgs) ]; - }; - lracer = { - pname = "lracer"; - version = "20190710-git"; - asds = [ "lracer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/racer/2019-07-10/racer-20190710-git.tgz"; - sha256 = "120x046c6vcrj70vb6ryf04mwbr8c6a15llb68x7h1siij8vwgvk"; - system = "lracer"; - asd = "lracer"; - }); - systems = [ "lracer" ]; - lispLibs = [ ]; - }; - lredis = { - pname = "lredis"; - version = "20141106-git"; - asds = [ "lredis" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lredis/2014-11-06/lredis-20141106-git.tgz"; - sha256 = "08srvlys0fyslfpmhc740cana7fkxm2kc7mxds4083wgxw3prhf2"; - system = "lredis"; - asd = "lredis"; - }); - systems = [ "lredis" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "babel-streams" pkgs) (getAttr "usocket" pkgs) ]; - }; - lsx = { - pname = "lsx"; - version = "20220220-git"; - asds = [ "lsx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lsx/2022-02-20/lsx-20220220-git.tgz"; - sha256 = "1pdq6csr8pkzcq2zkhhm6wkp9zxx2aypjd16rcw4q43mff09y041"; - system = "lsx"; - asd = "lsx"; - }); - systems = [ "lsx" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - lsx_slash_tests = { - pname = "lsx_tests"; - version = "20220220-git"; - asds = [ "lsx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lsx/2022-02-20/lsx-20220220-git.tgz"; - sha256 = "1pdq6csr8pkzcq2zkhhm6wkp9zxx2aypjd16rcw4q43mff09y041"; - system = "lsx"; - asd = "lsx"; - }); - systems = [ "lsx/tests" ]; - lispLibs = [ (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - ltk = { - pname = "ltk"; - version = "20221106-git"; - asds = [ "ltk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz"; - sha256 = "0vqmdq3k235hd8d9cg0ipv0kw28aiydvr9j1igfnrs1ns9sm79va"; - system = "ltk"; - asd = "ltk"; - }); - systems = [ "ltk" ]; - lispLibs = [ ]; - }; - ltk-mw = { - pname = "ltk-mw"; - version = "20221106-git"; - asds = [ "ltk-mw" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz"; - sha256 = "0vqmdq3k235hd8d9cg0ipv0kw28aiydvr9j1igfnrs1ns9sm79va"; - system = "ltk-mw"; - asd = "ltk-mw"; - }); - systems = [ "ltk-mw" ]; - lispLibs = [ (getAttr "ltk" pkgs) ]; - }; - ltk-remote = { - pname = "ltk-remote"; - version = "20221106-git"; - asds = [ "ltk-remote" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ltk/2022-11-06/ltk-20221106-git.tgz"; - sha256 = "0vqmdq3k235hd8d9cg0ipv0kw28aiydvr9j1igfnrs1ns9sm79va"; - system = "ltk-remote"; - asd = "ltk-remote"; - }); - systems = [ "ltk-remote" ]; - lispLibs = [ (getAttr "ltk" pkgs) ]; - }; - lucene-in-action-tests = { - pname = "lucene-in-action-tests"; - version = "20180228-git"; - asds = [ "lucene-in-action-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz"; - sha256 = "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c"; - system = "lucene-in-action-tests"; - asd = "lucene-in-action-tests"; - }); - systems = [ "lucene-in-action-tests" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "montezuma" pkgs) ]; - }; - luckless = { - pname = "luckless"; - version = "20221106-git"; - asds = [ "luckless" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/luckless/2022-11-06/luckless-20221106-git.tgz"; - sha256 = "0mychj1rfx4hzpgbp9x09qn2y4jhjgfdi5d973mcvaqmcmby6b9p"; - system = "luckless"; - asd = "luckless"; - }); - systems = [ "luckless" ]; - lispLibs = [ (getAttr "atomics" pkgs) (getAttr "documentation-utils" pkgs) ]; - }; - luckless-test = { - pname = "luckless-test"; - version = "20221106-git"; - asds = [ "luckless-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/luckless/2022-11-06/luckless-20221106-git.tgz"; - sha256 = "0mychj1rfx4hzpgbp9x09qn2y4jhjgfdi5d973mcvaqmcmby6b9p"; - system = "luckless-test"; - asd = "luckless-test"; - }); - systems = [ "luckless-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "luckless" pkgs) (getAttr "parachute" pkgs) ]; - }; - lunamech-matrix-api = { - pname = "lunamech-matrix-api"; - version = "20221106-git"; - asds = [ "lunamech-matrix-api" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lunamech-matrix-api/2022-11-06/lunamech-matrix-api-20221106-git.tgz"; - sha256 = "0dsfm2z4pnf9xc1c8rqj3h0k7r7y5gv5mqlizczndsm2d0s5sh4d"; - system = "lunamech-matrix-api"; - asd = "lunamech-matrix-api"; - }); - systems = [ "lunamech-matrix-api" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "str" pkgs) (getAttr "closer-mop" pkgs) (getAttr "dexador" pkgs) (getAttr "do-urlencode" pkgs) (getAttr "drakma" pkgs) (getAttr "jonathan" pkgs) (getAttr "plump" pkgs) (getAttr "quri" pkgs) (getAttr "reader" pkgs) (getAttr "shasht" pkgs) ]; - }; - lw-compat = { - pname = "lw-compat"; - version = "20160318-git"; - asds = [ "lw-compat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lw-compat/2016-03-18/lw-compat-20160318-git.tgz"; - sha256 = "131rq5k2mlv9bfhmafiv6nfsivl4cxx13d9wr06v5jrqnckh4aav"; - system = "lw-compat"; - asd = "lw-compat"; - }); - systems = [ "lw-compat" ]; - lispLibs = [ ]; - }; - lyrics = { - pname = "lyrics"; - version = "20210807-git"; - asds = [ "lyrics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lyrics/2021-08-07/lyrics-20210807-git.tgz"; - sha256 = "1xdhl53i9pim2mbviwqahlkgfsja7ihyvvrwz8q22ljv6bnb6011"; - system = "lyrics"; - asd = "lyrics"; - }); - systems = [ "lyrics" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "sqlite" pkgs) (getAttr "defmemo" pkgs) (getAttr "drakma" pkgs) (getAttr "lquery" pkgs) (getAttr "plump" pkgs) ]; - }; - lzlib = { - pname = "lzlib"; - version = "20221106-git"; - asds = [ "lzlib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lzlib/2022-11-06/cl-lzlib-20221106-git.tgz"; - sha256 = "1dxzlkay7aqcs65h2f7j7rl4sdjija60dshlahzyllfw174p9d3m"; - system = "lzlib"; - asd = "lzlib"; - }); - systems = [ "lzlib" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-octet-streams" pkgs) (getAttr "lparallel" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - lzlib-tests = { - pname = "lzlib-tests"; - version = "20221106-git"; - asds = [ "lzlib-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-lzlib/2022-11-06/cl-lzlib-20221106-git.tgz"; - sha256 = "1dxzlkay7aqcs65h2f7j7rl4sdjija60dshlahzyllfw174p9d3m"; - system = "lzlib-tests"; - asd = "lzlib-tests"; - }); - systems = [ "lzlib-tests" ]; - lispLibs = [ (getAttr "lzlib" pkgs) (getAttr "cl-octet-streams" pkgs) (getAttr "fiveam" pkgs) (getAttr "uiop" pkgs) ]; - }; - macro-html = { - pname = "macro-html"; - version = "20151218-git"; - asds = [ "macro-html" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/macro-html/2015-12-18/macro-html-20151218-git.tgz"; - sha256 = "05gzgijz8r3dw3ilz7d5i0g0mbcyv9k8w2dgvw7n478njp1gfj4b"; - system = "macro-html"; - asd = "macro-html"; - }); - systems = [ "macro-html" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - macro-level = { - pname = "macro-level"; - version = "1.0.1"; - asds = [ "macro-level" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/macro-level/2012-10-13/macro-level-1.0.1.tgz"; - sha256 = "14wncx6rrlkylm4cn7y8h4pmnvrcfj920nlldsspg5kvysb09g4i"; - system = "macro-level"; - asd = "macro-level"; - }); - systems = [ "macro-level" ]; - lispLibs = [ ]; - }; - macrodynamics = { - pname = "macrodynamics"; - version = "20180228-git"; - asds = [ "macrodynamics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/macrodynamics/2018-02-28/macrodynamics-20180228-git.tgz"; - sha256 = "1ysgin8lzd4fdl5c63v3ga9v6lzk3gyl1h8jhl0ar6wyhd3023l4"; - system = "macrodynamics"; - asd = "macrodynamics"; - }); - systems = [ "macrodynamics" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - macrodynamics_slash_test = { - pname = "macrodynamics_test"; - version = "20180228-git"; - asds = [ "macrodynamics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/macrodynamics/2018-02-28/macrodynamics-20180228-git.tgz"; - sha256 = "1ysgin8lzd4fdl5c63v3ga9v6lzk3gyl1h8jhl0ar6wyhd3023l4"; - system = "macrodynamics"; - asd = "macrodynamics"; - }); - systems = [ "macrodynamics/test" ]; - lispLibs = [ (getAttr "check-it" pkgs) (getAttr "fiasco" pkgs) (getAttr "macrodynamics" pkgs) ]; - meta = { - broken = true; - }; - }; - macroexpand-dammit = { - pname = "macroexpand-dammit"; - version = "20131111-http"; - asds = [ "macroexpand-dammit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/macroexpand-dammit/2013-11-11/macroexpand-dammit-20131111-http.tgz"; - sha256 = "10avpq3qffrc51hrfjwp3vi5vv9b1aip1dnwncnlc3yd498b3pfl"; - system = "macroexpand-dammit"; - asd = "macroexpand-dammit"; - }); - systems = [ "macroexpand-dammit" ]; - lispLibs = [ ]; - }; - madeira-port = { - pname = "madeira-port"; - version = "20150709-git"; - asds = [ "madeira-port" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/madeira-port/2015-07-09/madeira-port-20150709-git.tgz"; - sha256 = "0zl6i11vm1akr0382zh582v3vkxjwmabsnfjcfgrp2wbkq4mvdgq"; - system = "madeira-port"; - asd = "madeira-port"; - }); - systems = [ "madeira-port" ]; - lispLibs = [ ]; - }; - madeira-port-tests = { - pname = "madeira-port-tests"; - version = "20150709-git"; - asds = [ "madeira-port-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/madeira-port/2015-07-09/madeira-port-20150709-git.tgz"; - sha256 = "0zl6i11vm1akr0382zh582v3vkxjwmabsnfjcfgrp2wbkq4mvdgq"; - system = "madeira-port-tests"; - asd = "madeira-port"; - }); - systems = [ "madeira-port-tests" ]; - lispLibs = [ (getAttr "eos" pkgs) (getAttr "madeira-port" pkgs) ]; - }; - magic-ed = { - pname = "magic-ed"; - version = "20200325-git"; - asds = [ "magic-ed" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/magic-ed/2020-03-25/magic-ed-20200325-git.tgz"; - sha256 = "1j6il4lif0dy6hqiz6n91yl8dvii9pk1i9vz0faq5mnr42mr7i5f"; - system = "magic-ed"; - asd = "magic-ed"; - }); - systems = [ "magic-ed" ]; - lispLibs = [ ]; - }; - magicffi = { - pname = "magicffi"; - version = "20210531-git"; - asds = [ "magicffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicffi/2021-05-31/magicffi-20210531-git.tgz"; - sha256 = "0l2b2irpb19b9pyxbmkxi4i5y6crx8nk7qrbihsdqahlkrwsk1il"; - system = "magicffi"; - asd = "magicffi"; - }); - systems = [ "magicffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - magicffi_slash_test = { - pname = "magicffi_test"; - version = "20210531-git"; - asds = [ "magicffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicffi/2021-05-31/magicffi-20210531-git.tgz"; - sha256 = "0l2b2irpb19b9pyxbmkxi4i5y6crx8nk7qrbihsdqahlkrwsk1il"; - system = "magicffi"; - asd = "magicffi"; - }); - systems = [ "magicffi/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "magicffi" pkgs) ]; - meta = { - broken = true; - }; - }; - magicl = { - pname = "magicl"; - version = "v0.9.1"; - asds = [ "magicl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; - system = "magicl"; - asd = "magicl"; - }); - systems = [ "magicl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "abstract-classes" pkgs) (getAttr "interface" pkgs) (getAttr "policy-cond" pkgs) ]; - meta = { - broken = true; - }; - }; - magicl-examples = { - pname = "magicl-examples"; - version = "v0.9.1"; - asds = [ "magicl-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; - system = "magicl-examples"; - asd = "magicl-examples"; - }); - systems = [ "magicl-examples" ]; - lispLibs = [ (getAttr "magicl" pkgs) ]; - }; - magicl-gen = { - pname = "magicl-gen"; - version = "v0.9.1"; - asds = [ "magicl-gen" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; - system = "magicl-gen"; - asd = "magicl-gen"; - }); - systems = [ "magicl-gen" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "abstract-classes" pkgs) ]; - }; - magicl-tests = { - pname = "magicl-tests"; - version = "v0.9.1"; - asds = [ "magicl-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; - system = "magicl-tests"; - asd = "magicl-tests"; - }); - systems = [ "magicl-tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiasco" pkgs) (getAttr "magicl" pkgs) (getAttr "magicl-examples" pkgs) (getAttr "uiop" pkgs) ]; - }; - magicl-transcendental = { - pname = "magicl-transcendental"; - version = "v0.9.1"; - asds = [ "magicl-transcendental" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; - system = "magicl-transcendental"; - asd = "magicl-transcendental"; - }); - systems = [ "magicl-transcendental" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "abstract-classes" pkgs) (getAttr "interface" pkgs) (getAttr "policy-cond" pkgs) ]; - }; - magicl_slash_core = { - pname = "magicl_core"; - version = "v0.9.1"; - asds = [ "magicl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; - system = "magicl"; - asd = "magicl"; - }); - systems = [ "magicl/core" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "abstract-classes" pkgs) (getAttr "interface" pkgs) (getAttr "policy-cond" pkgs) ]; - meta = { - broken = true; - }; - }; - magicl_slash_ext = { - pname = "magicl_ext"; - version = "v0.9.1"; - asds = [ "magicl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; - system = "magicl"; - asd = "magicl"; - }); - systems = [ "magicl/ext" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) ]; - meta = { - broken = true; - }; - }; - magicl_slash_ext-blas = { - pname = "magicl_ext-blas"; - version = "v0.9.1"; - asds = [ "magicl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; - system = "magicl"; - asd = "magicl"; - }); - systems = [ "magicl/ext-blas" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "abstract-classes" pkgs) (getAttr "interface" pkgs) (getAttr "policy-cond" pkgs) ]; - meta = { - broken = true; - }; - }; - magicl_slash_ext-expokit = { - pname = "magicl_ext-expokit"; - version = "v0.9.1"; - asds = [ "magicl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; - system = "magicl"; - asd = "magicl"; - }); - systems = [ "magicl/ext-expokit" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "abstract-classes" pkgs) (getAttr "interface" pkgs) (getAttr "policy-cond" pkgs) ]; - meta = { - broken = true; - }; - }; - magicl_slash_ext-lapack = { - pname = "magicl_ext-lapack"; - version = "v0.9.1"; - asds = [ "magicl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/magicl/2021-04-11/magicl-v0.9.1.tgz"; - sha256 = "0x9p55qin399jhr5md88nij8fv78b64xjhww7ys364pkjnx8ak9v"; - system = "magicl"; - asd = "magicl"; - }); - systems = [ "magicl/ext-lapack" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "abstract-classes" pkgs) (getAttr "interface" pkgs) (getAttr "policy-cond" pkgs) ]; - meta = { - broken = true; - }; - }; - maiden = { - pname = "maiden"; - version = "20220707-git"; - asds = [ "maiden" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden"; - asd = "maiden"; - }); - systems = [ "maiden" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "deeds" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "form-fiddle" pkgs) (getAttr "lambda-fiddle" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-indent" pkgs) (getAttr "uuid" pkgs) (getAttr "verbose" pkgs) ]; - }; - maiden-accounts = { - pname = "maiden-accounts"; - version = "20220707-git"; - asds = [ "maiden-accounts" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-accounts"; - asd = "maiden-accounts"; - }); - systems = [ "maiden-accounts" ]; - lispLibs = [ (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-activatable = { - pname = "maiden-activatable"; - version = "20220707-git"; - asds = [ "maiden-activatable" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-activatable"; - asd = "maiden-activatable"; - }); - systems = [ "maiden-activatable" ]; - lispLibs = [ (getAttr "maiden" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-api-access = { - pname = "maiden-api-access"; - version = "20220707-git"; - asds = [ "maiden-api-access" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-api-access"; - asd = "maiden-api-access"; - }); - systems = [ "maiden-api-access" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "jsown" pkgs) (getAttr "maiden" pkgs) (getAttr "plump" pkgs) ]; - }; - maiden-blocker = { - pname = "maiden-blocker"; - version = "20220707-git"; - asds = [ "maiden-blocker" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-blocker"; - asd = "maiden-blocker"; - }); - systems = [ "maiden-blocker" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-channel-relay = { - pname = "maiden-channel-relay"; - version = "20220707-git"; - asds = [ "maiden-channel-relay" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-channel-relay"; - asd = "maiden-channel-relay"; - }); - systems = [ "maiden-channel-relay" ]; - lispLibs = [ (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-chatlog = { - pname = "maiden-chatlog"; - version = "20220707-git"; - asds = [ "maiden-chatlog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-chatlog"; - asd = "maiden-chatlog"; - }); - systems = [ "maiden-chatlog" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) (getAttr "postmodern" pkgs) ]; - }; - maiden-client-entities = { - pname = "maiden-client-entities"; - version = "20220707-git"; - asds = [ "maiden-client-entities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-client-entities"; - asd = "maiden-client-entities"; - }); - systems = [ "maiden-client-entities" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "maiden" pkgs) ]; - }; - maiden-commands = { - pname = "maiden-commands"; - version = "20220707-git"; - asds = [ "maiden-commands" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-commands"; - asd = "maiden-commands"; - }); - systems = [ "maiden-commands" ]; - lispLibs = [ (getAttr "lambda-fiddle" pkgs) (getAttr "maiden" pkgs) (getAttr "maiden-client-entities" pkgs) ]; - }; - maiden-core-manager = { - pname = "maiden-core-manager"; - version = "20220707-git"; - asds = [ "maiden-core-manager" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-core-manager"; - asd = "maiden-core-manager"; - }); - systems = [ "maiden-core-manager" ]; - lispLibs = [ (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-counter = { - pname = "maiden-counter"; - version = "20220707-git"; - asds = [ "maiden-counter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-counter"; - asd = "maiden-counter"; - }); - systems = [ "maiden-counter" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "maiden-activatable" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-crimes = { - pname = "maiden-crimes"; - version = "20220707-git"; - asds = [ "maiden-crimes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-crimes"; - asd = "maiden-crimes"; - }); - systems = [ "maiden-crimes" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "maiden-api-access" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-dictionary = { - pname = "maiden-dictionary"; - version = "20220707-git"; - asds = [ "maiden-dictionary" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-dictionary"; - asd = "maiden-dictionary"; - }); - systems = [ "maiden-dictionary" ]; - lispLibs = [ (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) (getAttr "oxenfurt" pkgs) ]; - }; - maiden-emoticon = { - pname = "maiden-emoticon"; - version = "20220707-git"; - asds = [ "maiden-emoticon" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-emoticon"; - asd = "maiden-emoticon"; - }); - systems = [ "maiden-emoticon" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "maiden-activatable" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-help = { - pname = "maiden-help"; - version = "20220707-git"; - asds = [ "maiden-help" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-help"; - asd = "maiden-help"; - }); - systems = [ "maiden-help" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) ]; - }; - maiden-irc = { - pname = "maiden-irc"; - version = "20220707-git"; - asds = [ "maiden-irc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-irc"; - asd = "maiden-irc"; - }); - systems = [ "maiden-irc" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "form-fiddle" pkgs) (getAttr "lambda-fiddle" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-networking" pkgs) ]; - }; - maiden-lastfm = { - pname = "maiden-lastfm"; - version = "20220707-git"; - asds = [ "maiden-lastfm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-lastfm"; - asd = "maiden-lastfm"; - }); - systems = [ "maiden-lastfm" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "maiden-api-access" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-lichat = { - pname = "maiden-lichat"; - version = "20220707-git"; - asds = [ "maiden-lichat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-lichat"; - asd = "maiden-lichat"; - }); - systems = [ "maiden-lichat" ]; - lispLibs = [ (getAttr "lichat-protocol" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-networking" pkgs) ]; - }; - maiden-location = { - pname = "maiden-location"; - version = "20220707-git"; - asds = [ "maiden-location" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-location"; - asd = "maiden-location"; - }); - systems = [ "maiden-location" ]; - lispLibs = [ (getAttr "maiden-api-access" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-lookup = { - pname = "maiden-lookup"; - version = "20220707-git"; - asds = [ "maiden-lookup" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-lookup"; - asd = "maiden-lookup"; - }); - systems = [ "maiden-lookup" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "lquery" pkgs) (getAttr "maiden-api-access" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) ]; - }; - maiden-markov = { - pname = "maiden-markov"; - version = "20220707-git"; - asds = [ "maiden-markov" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-markov"; - asd = "maiden-markov"; - }); - systems = [ "maiden-markov" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "fast-io" pkgs) (getAttr "maiden-activatable" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) (getAttr "parse-number" pkgs) ]; - }; - maiden-medals = { - pname = "maiden-medals"; - version = "20220707-git"; - asds = [ "maiden-medals" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-medals"; - asd = "maiden-medals"; - }); - systems = [ "maiden-medals" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "maiden-accounts" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-networking = { - pname = "maiden-networking"; - version = "20220707-git"; - asds = [ "maiden-networking" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-networking"; - asd = "maiden-networking"; - }); - systems = [ "maiden-networking" ]; - lispLibs = [ (getAttr "cl_plus_ssl" pkgs) (getAttr "maiden" pkgs) (getAttr "usocket" pkgs) ]; - }; - maiden-notify = { - pname = "maiden-notify"; - version = "20220707-git"; - asds = [ "maiden-notify" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-notify"; - asd = "maiden-notify"; - }); - systems = [ "maiden-notify" ]; - lispLibs = [ (getAttr "maiden-accounts" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-permissions = { - pname = "maiden-permissions"; - version = "20220707-git"; - asds = [ "maiden-permissions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-permissions"; - asd = "maiden-permissions"; - }); - systems = [ "maiden-permissions" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-relay = { - pname = "maiden-relay"; - version = "20220707-git"; - asds = [ "maiden-relay" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-relay"; - asd = "maiden-relay"; - }); - systems = [ "maiden-relay" ]; - lispLibs = [ (getAttr "maiden-networking" pkgs) (getAttr "maiden-serialize" pkgs) ]; - }; - maiden-serialize = { - pname = "maiden-serialize"; - version = "20220707-git"; - asds = [ "maiden-serialize" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-serialize"; - asd = "maiden-serialize"; - }); - systems = [ "maiden-serialize" ]; - lispLibs = [ (getAttr "cl-store" pkgs) (getAttr "gzip-stream" pkgs) (getAttr "maiden" pkgs) ]; - }; - maiden-silly = { - pname = "maiden-silly"; - version = "20220707-git"; - asds = [ "maiden-silly" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-silly"; - asd = "maiden-silly"; - }); - systems = [ "maiden-silly" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "lquery" pkgs) (getAttr "maiden-activatable" pkgs) (getAttr "maiden-api-access" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) ]; - }; - maiden-storage = { - pname = "maiden-storage"; - version = "20220707-git"; - asds = [ "maiden-storage" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-storage"; - asd = "maiden-storage"; - }); - systems = [ "maiden-storage" ]; - lispLibs = [ (getAttr "maiden" pkgs) (getAttr "pathname-utils" pkgs) (getAttr "ubiquitous-concurrent" pkgs) ]; - }; - maiden-talk = { - pname = "maiden-talk"; - version = "20220707-git"; - asds = [ "maiden-talk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-talk"; - asd = "maiden-talk"; - }); - systems = [ "maiden-talk" ]; - lispLibs = [ (getAttr "array-utils" pkgs) (getAttr "cl-mixed-mpg123" pkgs) (getAttr "drakma" pkgs) (getAttr "harmony" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - maiden-throttle = { - pname = "maiden-throttle"; - version = "20220707-git"; - asds = [ "maiden-throttle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-throttle"; - asd = "maiden-throttle"; - }); - systems = [ "maiden-throttle" ]; - lispLibs = [ (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-time = { - pname = "maiden-time"; - version = "20220707-git"; - asds = [ "maiden-time" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-time"; - asd = "maiden-time"; - }); - systems = [ "maiden-time" ]; - lispLibs = [ (getAttr "maiden-api-access" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-location" pkgs) ]; - }; - maiden-trivia = { - pname = "maiden-trivia"; - version = "20220707-git"; - asds = [ "maiden-trivia" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-trivia"; - asd = "maiden-trivia"; - }); - systems = [ "maiden-trivia" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maiden-twitter = { - pname = "maiden-twitter"; - version = "20220707-git"; - asds = [ "maiden-twitter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-twitter"; - asd = "maiden-twitter"; - }); - systems = [ "maiden-twitter" ]; - lispLibs = [ (getAttr "chirp" pkgs) (getAttr "maiden-client-entities" pkgs) ]; - }; - maiden-urlinfo = { - pname = "maiden-urlinfo"; - version = "20220707-git"; - asds = [ "maiden-urlinfo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-urlinfo"; - asd = "maiden-urlinfo"; - }); - systems = [ "maiden-urlinfo" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "maiden-activatable" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "plump" pkgs) ]; - }; - maiden-vote = { - pname = "maiden-vote"; - version = "20220707-git"; - asds = [ "maiden-vote" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-vote"; - asd = "maiden-vote"; - }); - systems = [ "maiden-vote" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) ]; - }; - maiden-weather = { - pname = "maiden-weather"; - version = "20220707-git"; - asds = [ "maiden-weather" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maiden/2022-07-07/maiden-20220707-git.tgz"; - sha256 = "04ds7b1vnrg040q5gvnmsyaf3dm3gs81770flvhdn19kj3197hwj"; - system = "maiden-weather"; - asd = "maiden-weather"; - }); - systems = [ "maiden-weather" ]; - lispLibs = [ (getAttr "local-time" pkgs) (getAttr "maiden-api-access" pkgs) (getAttr "maiden-client-entities" pkgs) (getAttr "maiden-commands" pkgs) (getAttr "maiden-location" pkgs) (getAttr "maiden-storage" pkgs) ]; - }; - maidenhead = { - pname = "maidenhead"; - version = "20220331-git"; - asds = [ "maidenhead" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maidenhead/2022-03-31/maidenhead-20220331-git.tgz"; - sha256 = "0bkw31jibx4sh2086jgsw4rvaz3i1dmycbwp203rjj78x7wz9743"; - system = "maidenhead"; - asd = "maidenhead"; - }); - systems = [ "maidenhead" ]; - lispLibs = [ ]; - }; - maidenhead_slash_tests = { - pname = "maidenhead_tests"; - version = "20220331-git"; - asds = [ "maidenhead" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maidenhead/2022-03-31/maidenhead-20220331-git.tgz"; - sha256 = "0bkw31jibx4sh2086jgsw4rvaz3i1dmycbwp203rjj78x7wz9743"; - system = "maidenhead"; - asd = "maidenhead"; - }); - systems = [ "maidenhead/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "maidenhead" pkgs) ]; - meta = { - broken = true; - }; - }; - mailbox = { - pname = "mailbox"; - version = "20131003-git"; - asds = [ "mailbox" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mailbox/2013-10-03/mailbox-20131003-git.tgz"; - sha256 = "1qgkcss8m2q29kr9d040dnjmzl17vb7zzvlz5ry3z3zgbdwgj1sy"; - system = "mailbox"; - asd = "mailbox"; - }); - systems = [ "mailbox" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - mailgun = { - pname = "mailgun"; - version = "20220707-git"; - asds = [ "mailgun" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mailgun/2022-07-07/mailgun-20220707-git.tgz"; - sha256 = "1wadkm5r2hmyz40m4kwg5rv4g4dwn3h2d8l2mn9dncg5qy37x2vl"; - system = "mailgun"; - asd = "mailgun"; - }); - systems = [ "mailgun" ]; - lispLibs = [ (getAttr "dexador" pkgs) (getAttr "log4cl" pkgs) (getAttr "secret-values" pkgs) (getAttr "spinneret" pkgs) ]; - }; - make-hash = { - pname = "make-hash"; - version = "20130615-git"; - asds = [ "make-hash" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/make-hash/2013-06-15/make-hash-20130615-git.tgz"; - sha256 = "1qa4mcmb3pv44py0j129dd8hjx09c2akpnds53b69151mgwv5qz8"; - system = "make-hash"; - asd = "make-hash"; - }); - systems = [ "make-hash" ]; - lispLibs = [ ]; - }; - make-hash-tests = { - pname = "make-hash-tests"; - version = "20130615-git"; - asds = [ "make-hash-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/make-hash/2013-06-15/make-hash-20130615-git.tgz"; - sha256 = "1qa4mcmb3pv44py0j129dd8hjx09c2akpnds53b69151mgwv5qz8"; - system = "make-hash-tests"; - asd = "make-hash-tests"; - }); - systems = [ "make-hash-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "make-hash" pkgs) ]; - }; - manifest = { - pname = "manifest"; - version = "20120208-git"; - asds = [ "manifest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/manifest/2012-02-08/manifest-20120208-git.tgz"; - sha256 = "0dswslnskskdbsln6vi7w8cbypw001d81xaxkfn4g7m15m9pzkgf"; - system = "manifest"; - asd = "manifest"; - }); - systems = [ "manifest" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "monkeylib-html" pkgs) (getAttr "puri" pkgs) (getAttr "split-sequence" pkgs) (getAttr "toot" pkgs) ]; - }; - map-bind = { - pname = "map-bind"; - version = "20120811-git"; - asds = [ "map-bind" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/map-bind/2012-08-11/map-bind-20120811-git.tgz"; - sha256 = "06z02c0ypfrd789glbidnhf95839hardd7nr3i95l1adm8pas30f"; - system = "map-bind"; - asd = "map-bind"; - }); - systems = [ "map-bind" ]; - lispLibs = [ ]; - }; - map-set = { - pname = "map-set"; - version = "20190307-hg"; - asds = [ "map-set" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz"; - sha256 = "0fikz2s0pw5dfbs91j8y7iy3908gknhxy9047mp23jxv1f54jzdh"; - system = "map-set"; - asd = "map-set"; - }); - systems = [ "map-set" ]; - lispLibs = [ ]; - }; - marching-cubes = { - pname = "marching-cubes"; - version = "20150709-git"; - asds = [ "marching-cubes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz"; - sha256 = "013wyr4g82b2gk0j5jbkkshg9lal2m34px37blyclf6kr5sk6azh"; - system = "marching-cubes"; - asd = "marching-cubes"; - }); - systems = [ "marching-cubes" ]; - lispLibs = [ ]; - }; - marching-cubes-example = { - pname = "marching-cubes-example"; - version = "20150709-git"; - asds = [ "marching-cubes-example" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz"; - sha256 = "013wyr4g82b2gk0j5jbkkshg9lal2m34px37blyclf6kr5sk6azh"; - system = "marching-cubes-example"; - asd = "marching-cubes-example"; - }); - systems = [ "marching-cubes-example" ]; - lispLibs = [ (getAttr "marching-cubes" pkgs) ]; - }; - marching-cubes-test = { - pname = "marching-cubes-test"; - version = "20150709-git"; - asds = [ "marching-cubes-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/marching-cubes/2015-07-09/marching-cubes-20150709-git.tgz"; - sha256 = "013wyr4g82b2gk0j5jbkkshg9lal2m34px37blyclf6kr5sk6azh"; - system = "marching-cubes-test"; - asd = "marching-cubes-test"; - }); - systems = [ "marching-cubes-test" ]; - lispLibs = [ (getAttr "marching-cubes" pkgs) (getAttr "cl-test-more" pkgs) ]; - }; - markdown_dot_cl = { - pname = "markdown.cl"; - version = "20210228-git"; - asds = [ "markdown.cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/markdown.cl/2021-02-28/markdown.cl-20210228-git.tgz"; - sha256 = "00yxg67skx3navq7fdsjy0wds16n9n12bhdzv08f43bgbwali7v8"; - system = "markdown.cl"; - asd = "markdown.cl"; - }); - systems = [ "markdown.cl" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "split-sequence" pkgs) (getAttr "xmls" pkgs) ]; - }; - markdown_dot_cl-test = { - pname = "markdown.cl-test"; - version = "20210228-git"; - asds = [ "markdown.cl-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/markdown.cl/2021-02-28/markdown.cl-20210228-git.tgz"; - sha256 = "00yxg67skx3navq7fdsjy0wds16n9n12bhdzv08f43bgbwali7v8"; - system = "markdown.cl-test"; - asd = "markdown.cl-test"; - }); - systems = [ "markdown.cl-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "markdown_dot_cl" pkgs) (getAttr "xmls" pkgs) ]; - }; - markup = { - pname = "markup"; - version = "20221106-git"; - asds = [ "markup" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/markup/2022-11-06/markup-20221106-git.tgz"; - sha256 = "1ds9nbc6828kiilfjq47nwqms4lmps8hwd5kk8iwydpl5x1j43wx"; - system = "markup"; - asd = "markup"; - }); - systems = [ "markup" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "str" pkgs) (getAttr "named-readtables" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - markup_dot_test = { - pname = "markup.test"; - version = "20221106-git"; - asds = [ "markup.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/markup/2022-11-06/markup-20221106-git.tgz"; - sha256 = "1ds9nbc6828kiilfjq47nwqms4lmps8hwd5kk8iwydpl5x1j43wx"; - system = "markup.test"; - asd = "markup.test"; - }); - systems = [ "markup.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "markup" pkgs) ]; - }; - marshal = { - pname = "marshal"; - version = "20221106-git"; - asds = [ "marshal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-marshal/2022-11-06/cl-marshal-20221106-git.tgz"; - sha256 = "0pclq0q43f3nlb2np957i10ysmky32qlz78an3hf2adg8if776ys"; - system = "marshal"; - asd = "marshal"; - }); - systems = [ "marshal" ]; - lispLibs = [ ]; - }; - marshal-tests = { - pname = "marshal-tests"; - version = "20221106-git"; - asds = [ "marshal-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-marshal/2022-11-06/cl-marshal-20221106-git.tgz"; - sha256 = "0pclq0q43f3nlb2np957i10ysmky32qlz78an3hf2adg8if776ys"; - system = "marshal-tests"; - asd = "marshal-tests"; - }); - systems = [ "marshal-tests" ]; - lispLibs = [ (getAttr "marshal" pkgs) (getAttr "xlunit" pkgs) ]; - }; - math = { - pname = "math"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math" ]; - lispLibs = [ (getAttr "cl-utilities" pkgs) (getAttr "font-discovery" pkgs) (getAttr "gsll" pkgs) (getAttr "vgplot" pkgs) ]; - meta = { - broken = true; - }; - }; - math_slash_appr = { - pname = "math_appr"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/appr" ]; - lispLibs = [ (getAttr "cl-utilities" pkgs) ]; - meta = { - broken = true; - }; - }; - math_slash_coord = { - pname = "math_coord"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/coord" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - math_slash_core = { - pname = "math_core"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/core" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - math_slash_docs = { - pname = "math_docs"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/docs" ]; - lispLibs = [ (getAttr "codex" pkgs) (getAttr "math" pkgs) (getAttr "mnas-package" pkgs) ]; - meta = { - broken = true; - }; - }; - math_slash_equation = { - pname = "math_equation"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/equation" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - math_slash_geom = { - pname = "math_geom"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/geom" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - math_slash_gnuplot = { - pname = "math_gnuplot"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/gnuplot" ]; - lispLibs = [ (getAttr "font-discovery" pkgs) (getAttr "vgplot" pkgs) ]; - meta = { - broken = true; - }; - }; - math_slash_half-div = { - pname = "math_half-div"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/half-div" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - math_slash_ls-gauss = { - pname = "math_ls-gauss"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/ls-gauss" ]; - lispLibs = [ (getAttr "cl-utilities" pkgs) ]; - meta = { - broken = true; - }; - }; - math_slash_ls-gsll = { - pname = "math_ls-gsll"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/ls-gsll" ]; - lispLibs = [ (getAttr "cl-utilities" pkgs) (getAttr "gsll" pkgs) ]; - meta = { - broken = true; - }; - }; - math_slash_matr = { - pname = "math_matr"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/matr" ]; - lispLibs = [ (getAttr "cl-utilities" pkgs) ]; - meta = { - broken = true; - }; - }; - math_slash_rnd = { - pname = "math_rnd"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/rnd" ]; - lispLibs = [ (getAttr "cl-utilities" pkgs) ]; - meta = { - broken = true; - }; - }; - math_slash_series = { - pname = "math_series"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/series" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - math_slash_smooth = { - pname = "math_smooth"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/smooth" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - math_slash_stat = { - pname = "math_stat"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/stat" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - math_slash_tests = { - pname = "math_tests"; - version = "20221106-git"; - asds = [ "math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/math/2022-11-06/math-20221106-git.tgz"; - sha256 = "1xafh94y5q840fzlcvxw9p4ahgm9c4bwsm3fyrmm7n3j05xsgfml"; - system = "math"; - asd = "math"; - }); - systems = [ "math/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "math" pkgs) ]; - meta = { - broken = true; - }; - }; - mathkit = { - pname = "mathkit"; - version = "20160208-git"; - asds = [ "mathkit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mathkit/2016-02-08/mathkit-20160208-git.tgz"; - sha256 = "174y6ndmf52h8sml87qjfl48llmynvdizzk2h0mr85zbaysx73i3"; - system = "mathkit"; - asd = "mathkit"; - }); - systems = [ "mathkit" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - matrix-case = { - pname = "matrix-case"; - version = "20211020-git"; - asds = [ "matrix-case" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/matrix-case/2021-10-20/matrix-case-20211020-git.tgz"; - sha256 = "17k7x7wcl78xw4ajd38gva2dw7snsm9jppbnnl4by2s0grsqg50a"; - system = "matrix-case"; - asd = "matrix-case"; - }); - systems = [ "matrix-case" ]; - lispLibs = [ (getAttr "jingoh_dot_documentizer" pkgs) ]; - }; - matrix-case_dot_test = { - pname = "matrix-case.test"; - version = "20211020-git"; - asds = [ "matrix-case.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/matrix-case/2021-10-20/matrix-case-20211020-git.tgz"; - sha256 = "17k7x7wcl78xw4ajd38gva2dw7snsm9jppbnnl4by2s0grsqg50a"; - system = "matrix-case.test"; - asd = "matrix-case.test"; - }); - systems = [ "matrix-case.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "matrix-case" pkgs) ]; - }; - maxpc = { - pname = "maxpc"; - version = "20200427-git"; - asds = [ "maxpc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maxpc/2020-04-27/maxpc-20200427-git.tgz"; - sha256 = "15wrjbr2js6j67c1dd4p2qxj49q9iqv1lhb7cwdcwpn79crr39gf"; - system = "maxpc"; - asd = "maxpc"; - }); - systems = [ "maxpc" ]; - lispLibs = [ ]; - }; - maxpc-apache = { - pname = "maxpc-apache"; - version = "20220707-git"; - asds = [ "maxpc-apache" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2022-07-07/april-20220707-git.tgz"; - sha256 = "016mfldk98j1kbj8fpqwzhvdkfbmqsfbzjaawnlz9q5pr6srv26r"; - system = "maxpc-apache"; - asd = "maxpc-apache"; - }); - systems = [ "maxpc-apache" ]; - lispLibs = [ ]; - }; - maxpc-test = { - pname = "maxpc-test"; - version = "20200427-git"; - asds = [ "maxpc-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/maxpc/2020-04-27/maxpc-20200427-git.tgz"; - sha256 = "15wrjbr2js6j67c1dd4p2qxj49q9iqv1lhb7cwdcwpn79crr39gf"; - system = "maxpc-test"; - asd = "maxpc-test"; - }); - systems = [ "maxpc-test" ]; - lispLibs = [ (getAttr "maxpc" pkgs) ]; - }; - mbe = { - pname = "mbe"; - version = "20200218-git"; - asds = [ "mbe" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mbe/2020-02-18/mbe-20200218-git.tgz"; - sha256 = "1wlhlddfv0jbqliqlvhxkmmj9pfym0f9qlvjjmlrkvx6fxpv0450"; - system = "mbe"; - asd = "mbe"; - }); - systems = [ "mbe" ]; - lispLibs = [ ]; - }; - mcase = { - pname = "mcase"; - version = "20211020-git"; - asds = [ "mcase" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcase/2021-10-20/mcase-20211020-git.tgz"; - sha256 = "1k0agm57xbzlskdi8cgsg2z9lsamm4jl6fw7687z3bw1s2dbsm59"; - system = "mcase"; - asd = "mcase"; - }); - systems = [ "mcase" ]; - lispLibs = [ (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "millet" pkgs) ]; - }; - mcase_dot_test = { - pname = "mcase.test"; - version = "20211020-git"; - asds = [ "mcase.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcase/2021-10-20/mcase-20211020-git.tgz"; - sha256 = "1k0agm57xbzlskdi8cgsg2z9lsamm4jl6fw7687z3bw1s2dbsm59"; - system = "mcase.test"; - asd = "mcase.test"; - }); - systems = [ "mcase.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "mcase" pkgs) ]; - }; - mcclim = { - pname = "mcclim"; - version = "20221106-git"; - asds = [ "mcclim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim"; - asd = "mcclim"; - }); - systems = [ "mcclim" ]; - lispLibs = [ (getAttr "clim" pkgs) (getAttr "clim-pdf" pkgs) (getAttr "clim-postscript" pkgs) (getAttr "conditional-commands" pkgs) (getAttr "mcclim-bezier" pkgs) (getAttr "mcclim-bitmaps" pkgs) (getAttr "mcclim-clx" pkgs) (getAttr "mcclim-clx-fb" pkgs) (getAttr "mcclim-franz" pkgs) (getAttr "mcclim-null" pkgs) ]; - }; - mcclim-backend-common = { - pname = "mcclim-backend-common"; - version = "20221106-git"; - asds = [ "mcclim-backend-common" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-backend-common"; - asd = "mcclim-backend-common"; - }); - systems = [ "mcclim-backend-common" ]; - lispLibs = [ (getAttr "clim" pkgs) ]; - }; - mcclim-bezier = { - pname = "mcclim-bezier"; - version = "20221106-git"; - asds = [ "mcclim-bezier" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-bezier"; - asd = "mcclim-bezier"; - }); - systems = [ "mcclim-bezier" ]; - lispLibs = [ (getAttr "flexichain" pkgs) (getAttr "clim" pkgs) (getAttr "clim-pdf" pkgs) (getAttr "clim-postscript" pkgs) (getAttr "mcclim-clx" pkgs) (getAttr "mcclim-null" pkgs) (getAttr "mcclim-render" pkgs) ]; - meta = { - broken = true; - }; - }; - mcclim-bezier_slash_clx = { - pname = "mcclim-bezier_clx"; - version = "20221106-git"; - asds = [ "mcclim-bezier" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-bezier"; - asd = "mcclim-bezier"; - }); - systems = [ "mcclim-bezier/clx" ]; - lispLibs = [ (getAttr "flexichain" pkgs) (getAttr "clim" pkgs) (getAttr "clim-pdf" pkgs) (getAttr "clim-postscript" pkgs) (getAttr "mcclim-clx" pkgs) (getAttr "mcclim-null" pkgs) (getAttr "mcclim-render" pkgs) ]; - meta = { - broken = true; - }; - }; - mcclim-bezier_slash_core = { - pname = "mcclim-bezier_core"; - version = "20221106-git"; - asds = [ "mcclim-bezier" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-bezier"; - asd = "mcclim-bezier"; - }); - systems = [ "mcclim-bezier/core" ]; - lispLibs = [ (getAttr "flexichain" pkgs) (getAttr "clim" pkgs) (getAttr "clim-pdf" pkgs) (getAttr "clim-postscript" pkgs) (getAttr "mcclim-null" pkgs) (getAttr "mcclim-render" pkgs) ]; - meta = { - broken = true; - }; - }; - mcclim-bitmaps = { - pname = "mcclim-bitmaps"; - version = "20221106-git"; - asds = [ "mcclim-bitmaps" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-bitmaps"; - asd = "mcclim-bitmaps"; - }); - systems = [ "mcclim-bitmaps" ]; - lispLibs = [ (getAttr "clim" pkgs) (getAttr "opticl" pkgs) ]; - }; - mcclim-clx = { - pname = "mcclim-clx"; - version = "20221106-git"; - asds = [ "mcclim-clx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-clx"; - asd = "mcclim-clx"; - }); - systems = [ "mcclim-clx" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-dejavu" pkgs) (getAttr "cl-unicode" pkgs) (getAttr "cl-aa" pkgs) (getAttr "cl-paths-ttf" pkgs) (getAttr "cl-vectors" pkgs) (getAttr "clx" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "clim" pkgs) (getAttr "mcclim-backend-common" pkgs) (getAttr "zpb-ttf" pkgs) ]; - }; - mcclim-clx-fb = { - pname = "mcclim-clx-fb"; - version = "20221106-git"; - asds = [ "mcclim-clx-fb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-clx-fb"; - asd = "mcclim-clx-fb"; - }); - systems = [ "mcclim-clx-fb" ]; - lispLibs = [ (getAttr "mcclim-backend-common" pkgs) (getAttr "mcclim-clx" pkgs) (getAttr "mcclim-render" pkgs) ]; - }; - mcclim-fontconfig = { - pname = "mcclim-fontconfig"; - version = "20221106-git"; - asds = [ "mcclim-fontconfig" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-fontconfig"; - asd = "mcclim-fontconfig"; - }); - systems = [ "mcclim-fontconfig" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - mcclim-fonts = { - pname = "mcclim-fonts"; - version = "20221106-git"; - asds = [ "mcclim-fonts" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-fonts"; - asd = "mcclim-fonts"; - }); - systems = [ "mcclim-fonts" ]; - lispLibs = [ (getAttr "clim" pkgs) ]; - }; - mcclim-fonts_slash_truetype = { - pname = "mcclim-fonts_truetype"; - version = "20221106-git"; - asds = [ "mcclim-fonts" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-fonts"; - asd = "mcclim-fonts"; - }); - systems = [ "mcclim-fonts/truetype" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-dejavu" pkgs) (getAttr "cl-aa" pkgs) (getAttr "cl-paths-ttf" pkgs) (getAttr "cl-vectors" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "clim" pkgs) (getAttr "zpb-ttf" pkgs) ]; - meta = { - broken = true; - }; - }; - mcclim-franz = { - pname = "mcclim-franz"; - version = "20221106-git"; - asds = [ "mcclim-franz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-franz"; - asd = "mcclim-franz"; - }); - systems = [ "mcclim-franz" ]; - lispLibs = [ (getAttr "clim" pkgs) ]; - }; - mcclim-harfbuzz = { - pname = "mcclim-harfbuzz"; - version = "20221106-git"; - asds = [ "mcclim-harfbuzz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-harfbuzz"; - asd = "mcclim-harfbuzz"; - }); - systems = [ "mcclim-harfbuzz" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - mcclim-layouts = { - pname = "mcclim-layouts"; - version = "20221106-git"; - asds = [ "mcclim-layouts" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-layouts"; - asd = "mcclim-layouts"; - }); - systems = [ "mcclim-layouts" ]; - lispLibs = [ ]; - }; - mcclim-layouts_slash_tab = { - pname = "mcclim-layouts_tab"; - version = "20221106-git"; - asds = [ "mcclim-layouts" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-layouts"; - asd = "mcclim-layouts"; - }); - systems = [ "mcclim-layouts/tab" ]; - lispLibs = [ (getAttr "clim" pkgs) ]; - meta = { - broken = true; - }; - }; - mcclim-null = { - pname = "mcclim-null"; - version = "20221106-git"; - asds = [ "mcclim-null" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-null"; - asd = "mcclim-null"; - }); - systems = [ "mcclim-null" ]; - lispLibs = [ (getAttr "clim" pkgs) ]; - }; - mcclim-raster-image = { - pname = "mcclim-raster-image"; - version = "20221106-git"; - asds = [ "mcclim-raster-image" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-raster-image"; - asd = "mcclim-raster-image"; - }); - systems = [ "mcclim-raster-image" ]; - lispLibs = [ (getAttr "clim" pkgs) (getAttr "mcclim-backend-common" pkgs) (getAttr "mcclim-render" pkgs) ]; - }; - mcclim-raster-image_slash_test = { - pname = "mcclim-raster-image_test"; - version = "20221106-git"; - asds = [ "mcclim-raster-image" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-raster-image"; - asd = "mcclim-raster-image"; - }); - systems = [ "mcclim-raster-image/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "mcclim" pkgs) (getAttr "mcclim-raster-image" pkgs) ]; - meta = { - broken = true; - }; - }; - mcclim-render = { - pname = "mcclim-render"; - version = "20221106-git"; - asds = [ "mcclim-render" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-render"; - asd = "mcclim-render"; - }); - systems = [ "mcclim-render" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-dejavu" pkgs) (getAttr "cl-aa" pkgs) (getAttr "cl-paths-ttf" pkgs) (getAttr "cl-vectors" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "clim" pkgs) (getAttr "mcclim-backend-common" pkgs) (getAttr "zpb-ttf" pkgs) ]; - }; - mcclim-svg = { - pname = "mcclim-svg"; - version = "20221106-git"; - asds = [ "mcclim-svg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-svg"; - asd = "mcclim-svg"; - }); - systems = [ "mcclim-svg" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-dejavu" pkgs) (getAttr "cl-aa" pkgs) (getAttr "cl-paths-ttf" pkgs) (getAttr "cl-vectors" pkgs) (getAttr "cl-who" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "clim" pkgs) (getAttr "mcclim" pkgs) (getAttr "mcclim-bitmaps" pkgs) (getAttr "zpb-ttf" pkgs) ]; - }; - mcclim-tooltips = { - pname = "mcclim-tooltips"; - version = "20221106-git"; - asds = [ "mcclim-tooltips" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-tooltips"; - asd = "mcclim-tooltips"; - }); - systems = [ "mcclim-tooltips" ]; - lispLibs = [ (getAttr "clim" pkgs) ]; - }; - mcclim-tree-with-cross-edges = { - pname = "mcclim-tree-with-cross-edges"; - version = "20221106-git"; - asds = [ "mcclim-tree-with-cross-edges" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim-tree-with-cross-edges"; - asd = "mcclim-tree-with-cross-edges"; - }); - systems = [ "mcclim-tree-with-cross-edges" ]; - lispLibs = [ (getAttr "mcclim" pkgs) ]; - }; - mcclim_slash_extensions = { - pname = "mcclim_extensions"; - version = "20221106-git"; - asds = [ "mcclim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim"; - asd = "mcclim"; - }); - systems = [ "mcclim/extensions" ]; - lispLibs = [ (getAttr "clim" pkgs) (getAttr "clim-pdf" pkgs) (getAttr "clim-postscript" pkgs) (getAttr "conditional-commands" pkgs) (getAttr "mcclim-bezier" pkgs) (getAttr "mcclim-bitmaps" pkgs) (getAttr "mcclim-franz" pkgs) ]; - meta = { - broken = true; - }; - }; - mcclim_slash_looks = { - pname = "mcclim_looks"; - version = "20221106-git"; - asds = [ "mcclim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim"; - asd = "mcclim"; - }); - systems = [ "mcclim/looks" ]; - lispLibs = [ (getAttr "clim" pkgs) (getAttr "mcclim-clx" pkgs) (getAttr "mcclim-clx-fb" pkgs) (getAttr "mcclim-null" pkgs) ]; - meta = { - broken = true; - }; - }; - mcclim_slash_test = { - pname = "mcclim_test"; - version = "20221106-git"; - asds = [ "mcclim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim"; - asd = "mcclim"; - }); - systems = [ "mcclim/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "mcclim" pkgs) ]; - meta = { - broken = true; - }; - }; - mcclim_slash_test-util = { - pname = "mcclim_test-util"; - version = "20221106-git"; - asds = [ "mcclim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "mcclim"; - asd = "mcclim"; - }); - systems = [ "mcclim/test-util" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "mcclim" pkgs) ]; - meta = { - broken = true; - }; - }; - md5 = { - pname = "md5"; - version = "20210630-git"; - asds = [ "md5" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/md5/2021-06-30/md5-20210630-git.tgz"; - sha256 = "1g20np6rhn3y08z8mlmlk721mw2207s52v2pwp4smm3lz25sx3q5"; - system = "md5"; - asd = "md5"; - }); - systems = [ "md5" ]; - lispLibs = [ ]; - }; - media-types = { - pname = "media-types"; - version = "20220331-git"; - asds = [ "media-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/media-types/2022-03-31/media-types-20220331-git.tgz"; - sha256 = "07ly7jr0ff2ks4gyjpq2jyj9gm47frllal5is3iqhc4xrmpyzrqc"; - system = "media-types"; - asd = "media-types"; - }); - systems = [ "media-types" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "serapeum" pkgs) ]; - }; - media-types_slash_tests = { - pname = "media-types_tests"; - version = "20220331-git"; - asds = [ "media-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/media-types/2022-03-31/media-types-20220331-git.tgz"; - sha256 = "07ly7jr0ff2ks4gyjpq2jyj9gm47frllal5is3iqhc4xrmpyzrqc"; - system = "media-types"; - asd = "media-types"; - }); - systems = [ "media-types/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "media-types" pkgs) ]; - meta = { - broken = true; - }; - }; - mel-base = { - pname = "mel-base"; - version = "20180228-git"; - asds = [ "mel-base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mel-base/2018-02-28/mel-base-20180228-git.tgz"; - sha256 = "1dvhmlkxasww3kb7xnwqlmdvi31w2awjrbkgk5d0hsfzqmyhhjh0"; - system = "mel-base"; - asd = "mel-base"; - }); - systems = [ "mel-base" ]; - lispLibs = [ (getAttr "cl_plus_ssl" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "usocket" pkgs) ]; - }; - memoize = { - pname = "memoize"; - version = "20140826-http"; - asds = [ "memoize" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/memoize/2014-08-26/memoize-20140826-http.tgz"; - sha256 = "1f1plqy9xdv40235b7kkm63gsgssk8l81azhfniy8j9yww39gihf"; - system = "memoize"; - asd = "memoize"; - }); - systems = [ "memoize" ]; - lispLibs = [ ]; - }; - message-oo = { - pname = "message-oo"; - version = "20130615-git"; - asds = [ "message-oo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/message-oo/2013-06-15/message-oo-20130615-git.tgz"; - sha256 = "164yypzhr6pxb84x47s9vjl97imbq5r8sxan22101q0y1jn3dznp"; - system = "message-oo"; - asd = "message-oo"; - }); - systems = [ "message-oo" ]; - lispLibs = [ ]; - }; - messagebox = { - pname = "messagebox"; - version = "20211020-git"; - asds = [ "messagebox" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/messagebox/2021-10-20/messagebox-20211020-git.tgz"; - sha256 = "17gbsqsz1nf09qhhhm5rpkmvkgf1pv6cyxrbmlplr3abvr4cqfh4"; - system = "messagebox"; - asd = "messagebox"; - }); - systems = [ "messagebox" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) (getAttr "uiop" pkgs) ]; - }; - meta = { - pname = "meta"; - version = "20150608-git"; - asds = [ "meta" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/meta/2015-06-08/meta-20150608-git.tgz"; - sha256 = "08s53zj3mcx82kszp1bg2vsb4kydvkc70kj4hpq9h1l5a1wh44cy"; - system = "meta"; - asd = "meta"; - }); - systems = [ "meta" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - meta-sexp = { - pname = "meta-sexp"; - version = "20201016-git"; - asds = [ "meta-sexp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/meta-sexp/2020-10-16/meta-sexp-20201016-git.tgz"; - sha256 = "14z4xglybsj4pdaifhjvnki0vm0wg985x00n94djc0fdcclczv1c"; - system = "meta-sexp"; - asd = "meta-sexp"; - }); - systems = [ "meta-sexp" ]; - lispLibs = [ ]; - }; - metabang-bind = { - pname = "metabang-bind"; - version = "20200218-git"; - asds = [ "metabang-bind" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz"; - sha256 = "0681lp2j084w3dx02ah1vm5pk83cp5k090anwdlrjaxd1j4kbpbr"; - system = "metabang-bind"; - asd = "metabang-bind"; - }); - systems = [ "metabang-bind" ]; - lispLibs = [ ]; - }; - metabang-bind-test = { - pname = "metabang-bind-test"; - version = "20200218-git"; - asds = [ "metabang-bind-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz"; - sha256 = "0681lp2j084w3dx02ah1vm5pk83cp5k090anwdlrjaxd1j4kbpbr"; - system = "metabang-bind-test"; - asd = "metabang-bind-test"; - }); - systems = [ "metabang-bind-test" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "metabang-bind" pkgs) ]; - }; - metacopy = { - pname = "metacopy"; - version = "20170403-darcs"; - asds = [ "metacopy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metacopy/2017-04-03/metacopy-20170403-darcs.tgz"; - sha256 = "1xwvc18l5fc33ffqa6jz5g0qz6mpabia81bcmqf3sz24apkpr49x"; - system = "metacopy"; - asd = "metacopy"; - }); - systems = [ "metacopy" ]; - lispLibs = [ (getAttr "moptilities" pkgs) ]; - }; - metacopy-with-contextl = { - pname = "metacopy-with-contextl"; - version = "20170403-darcs"; - asds = [ "metacopy-with-contextl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metacopy/2017-04-03/metacopy-20170403-darcs.tgz"; - sha256 = "1xwvc18l5fc33ffqa6jz5g0qz6mpabia81bcmqf3sz24apkpr49x"; - system = "metacopy-with-contextl"; - asd = "metacopy-with-contextl"; - }); - systems = [ "metacopy-with-contextl" ]; - lispLibs = [ (getAttr "contextl" pkgs) (getAttr "metacopy" pkgs) ]; - }; - metacopy-with-contextl_slash_test = { - pname = "metacopy-with-contextl_test"; - version = "20170403-darcs"; - asds = [ "metacopy-with-contextl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metacopy/2017-04-03/metacopy-20170403-darcs.tgz"; - sha256 = "1xwvc18l5fc33ffqa6jz5g0qz6mpabia81bcmqf3sz24apkpr49x"; - system = "metacopy-with-contextl"; - asd = "metacopy-with-contextl"; - }); - systems = [ "metacopy-with-contextl/test" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "metacopy" pkgs) (getAttr "metacopy-with-contextl" pkgs) ]; - meta = { - broken = true; - }; - }; - metacopy_slash_test = { - pname = "metacopy_test"; - version = "20170403-darcs"; - asds = [ "metacopy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metacopy/2017-04-03/metacopy-20170403-darcs.tgz"; - sha256 = "1xwvc18l5fc33ffqa6jz5g0qz6mpabia81bcmqf3sz24apkpr49x"; - system = "metacopy"; - asd = "metacopy"; - }); - systems = [ "metacopy/test" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "metacopy" pkgs) ]; - meta = { - broken = true; - }; - }; - metalock = { - pname = "metalock"; - version = "20200925-git"; - asds = [ "metalock" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metalock/2020-09-25/metalock-20200925-git.tgz"; - sha256 = "0z2vk0s694zhnkai593q42vln5a6ykm8pilyikc4qp9aw9r43lc5"; - system = "metalock"; - asd = "metalock"; - }); - systems = [ "metalock" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - metap = { - pname = "metap"; - version = "20150505-git"; - asds = [ "metap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metap/2015-05-05/metap-20150505-git.tgz"; - sha256 = "0drqyjscl0lmhgplld6annmlqma83q76xkxnahcq4ksnhpbsz9wx"; - system = "metap"; - asd = "metap"; - }); - systems = [ "metap" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - metap-test = { - pname = "metap-test"; - version = "20150505-git"; - asds = [ "metap-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metap/2015-05-05/metap-20150505-git.tgz"; - sha256 = "0drqyjscl0lmhgplld6annmlqma83q76xkxnahcq4ksnhpbsz9wx"; - system = "metap-test"; - asd = "metap-test"; - }); - systems = [ "metap-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "metap" pkgs) ]; - }; - metatilities = { - pname = "metatilities"; - version = "20180228-git"; - asds = [ "metatilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metatilities/2018-02-28/metatilities-20180228-git.tgz"; - sha256 = "0vqhndnhrv40ixkj5lslr0h2fy79609gi0wgbqzcz82vkyx9d6vd"; - system = "metatilities"; - asd = "metatilities"; - }); - systems = [ "metatilities" ]; - lispLibs = [ (getAttr "asdf-system-connections" pkgs) (getAttr "cl-containers" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "metatilities-base" pkgs) (getAttr "moptilities" pkgs) ]; - }; - metatilities-base = { - pname = "metatilities-base"; - version = "20191227-git"; - asds = [ "metatilities-base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz"; - sha256 = "069rk5ncwvjnnzvvky6xiriynl72yzvjpnzl6jw9jf3b8na14zrk"; - system = "metatilities-base"; - asd = "metatilities-base"; - }); - systems = [ "metatilities-base" ]; - lispLibs = [ ]; - }; - metatilities-base-test = { - pname = "metatilities-base-test"; - version = "20191227-git"; - asds = [ "metatilities-base-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz"; - sha256 = "069rk5ncwvjnnzvvky6xiriynl72yzvjpnzl6jw9jf3b8na14zrk"; - system = "metatilities-base-test"; - asd = "metatilities-base-test"; - }); - systems = [ "metatilities-base-test" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "metatilities-base" pkgs) ]; - }; - metatilities-test = { - pname = "metatilities-test"; - version = "20180228-git"; - asds = [ "metatilities-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metatilities/2018-02-28/metatilities-20180228-git.tgz"; - sha256 = "0vqhndnhrv40ixkj5lslr0h2fy79609gi0wgbqzcz82vkyx9d6vd"; - system = "metatilities-test"; - asd = "metatilities-test"; - }); - systems = [ "metatilities-test" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "metatilities" pkgs) ]; - }; - metatilities_slash_with-lift = { - pname = "metatilities_with-lift"; - version = "20180228-git"; - asds = [ "metatilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metatilities/2018-02-28/metatilities-20180228-git.tgz"; - sha256 = "0vqhndnhrv40ixkj5lslr0h2fy79609gi0wgbqzcz82vkyx9d6vd"; - system = "metatilities"; - asd = "metatilities"; - }); - systems = [ "metatilities/with-lift" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "metatilities-base" pkgs) ]; - meta = { - broken = true; - }; - }; - metering = { - pname = "metering"; - version = "20200218-git"; - asds = [ "metering" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metering/2020-02-18/metering-20200218-git.tgz"; - sha256 = "0jx3ypk8m815yp7208xkcxkvila847mvna25a2p22ihnj0ms9rn1"; - system = "metering"; - asd = "metering"; - }); - systems = [ "metering" ]; - lispLibs = [ ]; - }; - metering_slash_test = { - pname = "metering_test"; - version = "20200218-git"; - asds = [ "metering" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/metering/2020-02-18/metering-20200218-git.tgz"; - sha256 = "0jx3ypk8m815yp7208xkcxkvila847mvna25a2p22ihnj0ms9rn1"; - system = "metering"; - asd = "metering"; - }); - systems = [ "metering/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "metering" pkgs) ]; - meta = { - broken = true; - }; - }; - method-combination-utilities = { - pname = "method-combination-utilities"; - version = "20141106-git"; - asds = [ "method-combination-utilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/method-combination-utilities/2014-11-06/method-combination-utilities-20141106-git.tgz"; - sha256 = "1lgc515j87lbb48mjys0j6p8bxzifzjw5g8i825lsdmajmwj3vis"; - system = "method-combination-utilities"; - asd = "method-combination-utilities"; - }); - systems = [ "method-combination-utilities" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - method-combination-utilities_dot_tests = { - pname = "method-combination-utilities.tests"; - version = "20141106-git"; - asds = [ "method-combination-utilities.tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/method-combination-utilities/2014-11-06/method-combination-utilities-20141106-git.tgz"; - sha256 = "1lgc515j87lbb48mjys0j6p8bxzifzjw5g8i825lsdmajmwj3vis"; - system = "method-combination-utilities.tests"; - asd = "method-combination-utilities"; - }); - systems = [ "method-combination-utilities.tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "method-combination-utilities" pkgs) ]; - }; - method-hooks = { - pname = "method-hooks"; - version = "20200925-git"; - asds = [ "method-hooks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/method-hooks/2020-09-25/method-hooks-20200925-git.tgz"; - sha256 = "0kzijk02wjzms3hihmn6n6p9r6awkrsqlkghf6ixzf6400fiy212"; - system = "method-hooks"; - asd = "method-hooks"; - }); - systems = [ "method-hooks" ]; - lispLibs = [ ]; - }; - method-hooks-test = { - pname = "method-hooks-test"; - version = "20200925-git"; - asds = [ "method-hooks-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/method-hooks/2020-09-25/method-hooks-20200925-git.tgz"; - sha256 = "0kzijk02wjzms3hihmn6n6p9r6awkrsqlkghf6ixzf6400fiy212"; - system = "method-hooks-test"; - asd = "method-hooks-test"; - }); - systems = [ "method-hooks-test" ]; - lispLibs = [ (getAttr "method-hooks" pkgs) (getAttr "parachute" pkgs) (getAttr "uiop" pkgs) ]; - }; - method-versions = { - pname = "method-versions"; - version = "0.1.2011.05.18"; - asds = [ "method-versions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/method-versions/2011-05-22/method-versions_0.1.2011.05.18.tgz"; - sha256 = "119x3dbjry25issq2m8xcacknd1y9mcnla5rhqzcsrj58zsmwmwf"; - system = "method-versions"; - asd = "method-versions"; - }); - systems = [ "method-versions" ]; - lispLibs = [ ]; - }; - mexpr = { - pname = "mexpr"; - version = "20150709-git"; - asds = [ "mexpr" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mexpr/2015-07-09/mexpr-20150709-git.tgz"; - sha256 = "0ri9cp7vhnn9sah1lhvxn523c342n0q4v0xzi6fzlfvpj84jfzqk"; - system = "mexpr"; - asd = "mexpr"; - }); - systems = [ "mexpr" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-syntax" pkgs) ]; - }; - mexpr-tests = { - pname = "mexpr-tests"; - version = "20150709-git"; - asds = [ "mexpr-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mexpr/2015-07-09/mexpr-20150709-git.tgz"; - sha256 = "0ri9cp7vhnn9sah1lhvxn523c342n0q4v0xzi6fzlfvpj84jfzqk"; - system = "mexpr-tests"; - asd = "mexpr-tests"; - }); - systems = [ "mexpr-tests" ]; - lispLibs = [ (getAttr "mexpr" pkgs) (getAttr "named-readtables" pkgs) (getAttr "should-test" pkgs) ]; - }; - mfiano-utils = { - pname = "mfiano-utils"; - version = "20220707-git"; - asds = [ "mfiano-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mfiano-utils/2022-07-07/mfiano-utils-20220707-git.tgz"; - sha256 = "1n67myg56p9jskbxxsn4pwc7yj7cgx04f3nc8drxnsnkdfxbn30x"; - system = "mfiano-utils"; - asd = "mfiano-utils"; - }); - systems = [ "mfiano-utils" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "serapeum" pkgs) (getAttr "uiop" pkgs) ]; - }; - mgl = { - pname = "mgl"; - version = "20220220-git"; - asds = [ "mgl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl/2022-02-20/mgl-20220220-git.tgz"; - sha256 = "0ssrqn55hsq14db4zpsn1fw7kljj5jgkby6il5rynjipb8sgbvh5"; - system = "mgl"; - asd = "mgl"; - }); - systems = [ "mgl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "array-operations" pkgs) (getAttr "cl-reexport" pkgs) (getAttr "closer-mop" pkgs) (getAttr "lla" pkgs) (getAttr "mgl-gnuplot" pkgs) (getAttr "mgl-mat" pkgs) (getAttr "mgl-pax" pkgs) (getAttr "named-readtables" pkgs) (getAttr "pythonic-string-reader" pkgs) (getAttr "swank" pkgs) ]; - }; - mgl-example = { - pname = "mgl-example"; - version = "20220220-git"; - asds = [ "mgl-example" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl/2022-02-20/mgl-20220220-git.tgz"; - sha256 = "0ssrqn55hsq14db4zpsn1fw7kljj5jgkby6il5rynjipb8sgbvh5"; - system = "mgl-example"; - asd = "mgl-example"; - }); - systems = [ "mgl-example" ]; - lispLibs = [ (getAttr "mgl" pkgs) ]; - }; - mgl-gnuplot = { - pname = "mgl-gnuplot"; - version = "20220220-git"; - asds = [ "mgl-gnuplot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl/2022-02-20/mgl-20220220-git.tgz"; - sha256 = "0ssrqn55hsq14db4zpsn1fw7kljj5jgkby6il5rynjipb8sgbvh5"; - system = "mgl-gnuplot"; - asd = "mgl-gnuplot"; - }); - systems = [ "mgl-gnuplot" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "external-program" pkgs) ]; - }; - mgl-mat = { - pname = "mgl-mat"; - version = "20220220-git"; - asds = [ "mgl-mat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-mat/2022-02-20/mgl-mat-20220220-git.tgz"; - sha256 = "04is8hmrwx4ghzz0ydnn8mhxxblv5lgs1hxzfkzbj07c95kzwi7k"; - system = "mgl-mat"; - asd = "mgl-mat"; - }); - systems = [ "mgl-mat" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-cuda" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "lla" pkgs) (getAttr "mgl-pax" pkgs) (getAttr "static-vectors" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - mgl-mat_slash_test = { - pname = "mgl-mat_test"; - version = "20220220-git"; - asds = [ "mgl-mat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-mat/2022-02-20/mgl-mat-20220220-git.tgz"; - sha256 = "04is8hmrwx4ghzz0ydnn8mhxxblv5lgs1hxzfkzbj07c95kzwi7k"; - system = "mgl-mat"; - asd = "mgl-mat"; - }); - systems = [ "mgl-mat/test" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "mgl-mat" pkgs) ]; - meta = { - broken = true; - }; - }; - mgl-pax = { - pname = "mgl-pax"; - version = "20220331-git"; - asds = [ "mgl-pax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2022-03-31/mgl-pax-20220331-git.tgz"; - sha256 = "1vpbn0l5mycxa7hqiwbqqlcfm906pgphzyk34s1x3alwl7vkgf5c"; - system = "mgl-pax"; - asd = "mgl-pax"; - }); - systems = [ "mgl-pax" ]; - lispLibs = [ (getAttr "mgl-pax_dot_asdf" pkgs) (getAttr "named-readtables" pkgs) (getAttr "pythonic-string-reader" pkgs) ]; - }; - mgl-pax_dot_asdf = { - pname = "mgl-pax.asdf"; - version = "20220331-git"; - asds = [ "mgl-pax.asdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2022-03-31/mgl-pax-20220331-git.tgz"; - sha256 = "1vpbn0l5mycxa7hqiwbqqlcfm906pgphzyk34s1x3alwl7vkgf5c"; - system = "mgl-pax.asdf"; - asd = "mgl-pax.asdf"; - }); - systems = [ "mgl-pax.asdf" ]; - lispLibs = [ ]; - }; - mgl-pax_slash_document = { - pname = "mgl-pax_document"; - version = "20220331-git"; - asds = [ "mgl-pax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2022-03-31/mgl-pax-20220331-git.tgz"; - sha256 = "1vpbn0l5mycxa7hqiwbqqlcfm906pgphzyk34s1x3alwl7vkgf5c"; - system = "mgl-pax"; - asd = "mgl-pax"; - }); - systems = [ "mgl-pax/document" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "_3bmd-ext-code-blocks" pkgs) (getAttr "alexandria" pkgs) (getAttr "colorize" pkgs) (getAttr "md5" pkgs) (getAttr "mgl-pax" pkgs) (getAttr "mgl-pax_dot_asdf" pkgs) (getAttr "swank" pkgs) ]; - meta = { - broken = true; - }; - }; - mgl-pax_slash_full = { - pname = "mgl-pax_full"; - version = "20220331-git"; - asds = [ "mgl-pax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2022-03-31/mgl-pax-20220331-git.tgz"; - sha256 = "1vpbn0l5mycxa7hqiwbqqlcfm906pgphzyk34s1x3alwl7vkgf5c"; - system = "mgl-pax"; - asd = "mgl-pax"; - }); - systems = [ "mgl-pax/full" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "_3bmd-ext-code-blocks" pkgs) (getAttr "alexandria" pkgs) (getAttr "colorize" pkgs) (getAttr "md5" pkgs) (getAttr "mgl-pax" pkgs) (getAttr "mgl-pax_dot_asdf" pkgs) (getAttr "swank" pkgs) ]; - meta = { - broken = true; - }; - }; - mgl-pax_slash_navigate = { - pname = "mgl-pax_navigate"; - version = "20220331-git"; - asds = [ "mgl-pax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2022-03-31/mgl-pax-20220331-git.tgz"; - sha256 = "1vpbn0l5mycxa7hqiwbqqlcfm906pgphzyk34s1x3alwl7vkgf5c"; - system = "mgl-pax"; - asd = "mgl-pax"; - }); - systems = [ "mgl-pax/navigate" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "mgl-pax" pkgs) (getAttr "mgl-pax_dot_asdf" pkgs) (getAttr "swank" pkgs) ]; - meta = { - broken = true; - }; - }; - mgl-pax_slash_test = { - pname = "mgl-pax_test"; - version = "20220331-git"; - asds = [ "mgl-pax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2022-03-31/mgl-pax-20220331-git.tgz"; - sha256 = "1vpbn0l5mycxa7hqiwbqqlcfm906pgphzyk34s1x3alwl7vkgf5c"; - system = "mgl-pax"; - asd = "mgl-pax"; - }); - systems = [ "mgl-pax/test" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "_3bmd-ext-code-blocks" pkgs) (getAttr "alexandria" pkgs) (getAttr "colorize" pkgs) (getAttr "md5" pkgs) (getAttr "mgl-pax" pkgs) (getAttr "mgl-pax_dot_asdf" pkgs) (getAttr "swank" pkgs) (getAttr "try" pkgs) ]; - meta = { - broken = true; - }; - }; - mgl-pax_slash_test-extension = { - pname = "mgl-pax_test-extension"; - version = "20220331-git"; - asds = [ "mgl-pax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2022-03-31/mgl-pax-20220331-git.tgz"; - sha256 = "1vpbn0l5mycxa7hqiwbqqlcfm906pgphzyk34s1x3alwl7vkgf5c"; - system = "mgl-pax"; - asd = "mgl-pax"; - }); - systems = [ "mgl-pax/test-extension" ]; - lispLibs = [ (getAttr "mgl-pax" pkgs) (getAttr "mgl-pax_dot_asdf" pkgs) (getAttr "try" pkgs) ]; - meta = { - broken = true; - }; - }; - mgl-pax_slash_transcribe = { - pname = "mgl-pax_transcribe"; - version = "20220331-git"; - asds = [ "mgl-pax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl-pax/2022-03-31/mgl-pax-20220331-git.tgz"; - sha256 = "1vpbn0l5mycxa7hqiwbqqlcfm906pgphzyk34s1x3alwl7vkgf5c"; - system = "mgl-pax"; - asd = "mgl-pax"; - }); - systems = [ "mgl-pax/transcribe" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "mgl-pax" pkgs) (getAttr "mgl-pax_dot_asdf" pkgs) (getAttr "swank" pkgs) ]; - meta = { - broken = true; - }; - }; - mgl_slash_test = { - pname = "mgl_test"; - version = "20220220-git"; - asds = [ "mgl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgl/2022-02-20/mgl-20220220-git.tgz"; - sha256 = "0ssrqn55hsq14db4zpsn1fw7kljj5jgkby6il5rynjipb8sgbvh5"; - system = "mgl"; - asd = "mgl"; - }); - systems = [ "mgl/test" ]; - lispLibs = [ (getAttr "mgl" pkgs) (getAttr "mgl-mat" pkgs) ]; - meta = { - broken = true; - }; - }; - mgrs = { - pname = "mgrs"; - version = "20220331-git"; - asds = [ "mgrs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgrs/2022-03-31/mgrs-20220331-git.tgz"; - sha256 = "1n4kd734qjj7mrcg0q28hml3npam1rm067iwljwc87zshnxh5gmn"; - system = "mgrs"; - asd = "mgrs"; - }); - systems = [ "mgrs" ]; - lispLibs = [ (getAttr "utm-ups" pkgs) ]; - }; - mgrs_slash_tests = { - pname = "mgrs_tests"; - version = "20220331-git"; - asds = [ "mgrs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mgrs/2022-03-31/mgrs-20220331-git.tgz"; - sha256 = "1n4kd734qjj7mrcg0q28hml3npam1rm067iwljwc87zshnxh5gmn"; - system = "mgrs"; - asd = "mgrs"; - }); - systems = [ "mgrs/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "mgrs" pkgs) ]; - meta = { - broken = true; - }; - }; - micmac = { - pname = "micmac"; - version = "20220220-git"; - asds = [ "micmac" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/micmac/2022-02-20/micmac-20220220-git.tgz"; - sha256 = "0c7k5j0br8mfrf7hgaihs6w5nma5ydi0rn5mplgjq3pc04k29krq"; - system = "micmac"; - asd = "micmac"; - }); - systems = [ "micmac" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "mgl-pax" pkgs) ]; - }; - micmac_slash_test = { - pname = "micmac_test"; - version = "20220220-git"; - asds = [ "micmac" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/micmac/2022-02-20/micmac-20220220-git.tgz"; - sha256 = "0c7k5j0br8mfrf7hgaihs6w5nma5ydi0rn5mplgjq3pc04k29krq"; - system = "micmac"; - asd = "micmac"; - }); - systems = [ "micmac/test" ]; - lispLibs = [ (getAttr "micmac" pkgs) ]; - meta = { - broken = true; - }; - }; - midi = { - pname = "midi"; - version = "20070618"; - asds = [ "midi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/midi/2010-10-06/midi-20070618.tgz"; - sha256 = "06hb6vm4dckhr1ln5jn3b31x1yampkl5fl0lfbg9zyazli7fgl87"; - system = "midi"; - asd = "midi"; - }); - systems = [ "midi" ]; - lispLibs = [ ]; - }; - millet = { - pname = "millet"; - version = "20211209-git"; - asds = [ "millet" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/millet/2021-12-09/millet-20211209-git.tgz"; - sha256 = "1jdqyr1f9a6083k7n88rwc6mjmgccj6za50ybl1dlnxqvqj2pw80"; - system = "millet"; - asd = "millet"; - }); - systems = [ "millet" ]; - lispLibs = [ (getAttr "jingoh_dot_documentizer" pkgs) ]; - }; - millet_dot_test = { - pname = "millet.test"; - version = "20211209-git"; - asds = [ "millet.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/millet/2021-12-09/millet-20211209-git.tgz"; - sha256 = "1jdqyr1f9a6083k7n88rwc6mjmgccj6za50ybl1dlnxqvqj2pw80"; - system = "millet.test"; - asd = "millet.test"; - }); - systems = [ "millet.test" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "jingoh" pkgs) (getAttr "millet" pkgs) ]; - }; - minheap = { - pname = "minheap"; - version = "20160628-git"; - asds = [ "minheap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/minheap/2016-06-28/minheap-20160628-git.tgz"; - sha256 = "03v0dqxg4kmwvfrlrkq8bmfcv70k9n9f48p9p3z8kmfbc4p3f1vd"; - system = "minheap"; - asd = "minheap"; - }); - systems = [ "minheap" ]; - lispLibs = [ ]; - }; - minheap-tests = { - pname = "minheap-tests"; - version = "20160628-git"; - asds = [ "minheap-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/minheap/2016-06-28/minheap-20160628-git.tgz"; - sha256 = "03v0dqxg4kmwvfrlrkq8bmfcv70k9n9f48p9p3z8kmfbc4p3f1vd"; - system = "minheap-tests"; - asd = "minheap-tests"; - }); - systems = [ "minheap-tests" ]; - lispLibs = [ (getAttr "lisp-unit" pkgs) (getAttr "minheap" pkgs) ]; - }; - mini-cas = { - pname = "mini-cas"; - version = "20150923-git"; - asds = [ "mini-cas" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mini-cas/2015-09-23/mini-cas-20150923-git.tgz"; - sha256 = "1y9a111877lkpssi651q684mj052vp6qr9pz5gl47s6swiqvqp24"; - system = "mini-cas"; - asd = "mini-cas"; - }); - systems = [ "mini-cas" ]; - lispLibs = [ ]; - }; - minilem = { - pname = "minilem"; - version = "20200218-git"; - asds = [ "minilem" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/minilem/2020-02-18/minilem-20200218-git.tgz"; - sha256 = "1hpcgj8k5m11nk1pfd479hrbh15dcas7z1s8w877rqmlf69ga4cp"; - system = "minilem"; - asd = "minilem"; - }); - systems = [ "minilem" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "esrap" pkgs) (getAttr "inquisitor" pkgs) (getAttr "iterate" pkgs) (getAttr "log4cl" pkgs) (getAttr "optima" pkgs) (getAttr "swank" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "trivial-types" pkgs) (getAttr "uiop" pkgs) (getAttr "usocket" pkgs) (getAttr "yason" pkgs) ]; - }; - minpack = { - pname = "minpack"; - version = "20200925-git"; - asds = [ "minpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "minpack"; - asd = "minpack"; - }); - systems = [ "minpack" ]; - lispLibs = [ (getAttr "f2cl" pkgs) ]; - }; - minpack_slash_test-hybrd = { - pname = "minpack_test-hybrd"; - version = "20200925-git"; - asds = [ "minpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "minpack"; - asd = "minpack"; - }); - systems = [ "minpack/test-hybrd" ]; - lispLibs = [ (getAttr "minpack" pkgs) ]; - meta = { - broken = true; - }; - }; - minpack_slash_test-lmdif = { - pname = "minpack_test-lmdif"; - version = "20200925-git"; - asds = [ "minpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "minpack"; - asd = "minpack"; - }); - systems = [ "minpack/test-lmdif" ]; - lispLibs = [ (getAttr "minpack" pkgs) ]; - meta = { - broken = true; - }; - }; - misc-extensions = { - pname = "misc-extensions"; - version = "20150608-git"; - asds = [ "misc-extensions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz"; - sha256 = "0gz5f4p70qzilnxsnf5lih2n9m4wjcw8hlw4w8mpn9jyhyppyyv0"; - system = "misc-extensions"; - asd = "misc-extensions"; - }); - systems = [ "misc-extensions" ]; - lispLibs = [ ]; - }; - mito = { - pname = "mito"; - version = "20221106-git"; - asds = [ "mito" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mito/2022-11-06/mito-20221106-git.tgz"; - sha256 = "1wm0kmlg8b7l74s1kxs2yxrv07c6fhfb7yn3018pjh1y28i5cx7n"; - system = "mito"; - asd = "mito"; - }); - systems = [ "mito" ]; - lispLibs = [ (getAttr "cl-reexport" pkgs) (getAttr "lack-middleware-mito" pkgs) (getAttr "mito-core" pkgs) (getAttr "mito-migration" pkgs) ]; - }; - mito-auth = { - pname = "mito-auth"; - version = "20171019-git"; - asds = [ "mito-auth" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mito-auth/2017-10-19/mito-auth-20171019-git.tgz"; - sha256 = "1q1yxjpnshzmia34a68dlscjadzynzyzz14sr4mkkkjyg5dhkazi"; - system = "mito-auth"; - asd = "mito-auth"; - }); - systems = [ "mito-auth" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "ironclad" pkgs) (getAttr "mito" pkgs) ]; - }; - mito-core = { - pname = "mito-core"; - version = "20221106-git"; - asds = [ "mito-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mito/2022-11-06/mito-20221106-git.tgz"; - sha256 = "1wm0kmlg8b7l74s1kxs2yxrv07c6fhfb7yn3018pjh1y28i5cx7n"; - system = "mito-core"; - asd = "mito-core"; - }); - systems = [ "mito-core" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "dbi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-reexport" pkgs) (getAttr "closer-mop" pkgs) (getAttr "dissect" pkgs) (getAttr "local-time" pkgs) (getAttr "sxql" pkgs) (getAttr "trivia" pkgs) (getAttr "uuid" pkgs) ]; - }; - mito-migration = { - pname = "mito-migration"; - version = "20221106-git"; - asds = [ "mito-migration" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mito/2022-11-06/mito-20221106-git.tgz"; - sha256 = "1wm0kmlg8b7l74s1kxs2yxrv07c6fhfb7yn3018pjh1y28i5cx7n"; - system = "mito-migration"; - asd = "mito-migration"; - }); - systems = [ "mito-migration" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "chipz" pkgs) (getAttr "dbi" pkgs) (getAttr "cl-reexport" pkgs) (getAttr "closer-mop" pkgs) (getAttr "esrap" pkgs) (getAttr "mito-core" pkgs) (getAttr "sxql" pkgs) (getAttr "uiop" pkgs) ]; - }; - mito-test = { - pname = "mito-test"; - version = "20221106-git"; - asds = [ "mito-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mito/2022-11-06/mito-20221106-git.tgz"; - sha256 = "1wm0kmlg8b7l74s1kxs2yxrv07c6fhfb7yn3018pjh1y28i5cx7n"; - system = "mito-test"; - asd = "mito-test"; - }); - systems = [ "mito-test" ]; - lispLibs = [ (getAttr "mito" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - mixalot = { - pname = "mixalot"; - version = "20151218-git"; - asds = [ "mixalot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; - system = "mixalot"; - asd = "mixalot"; - }); - systems = [ "mixalot" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) ]; - }; - mixalot-flac = { - pname = "mixalot-flac"; - version = "20151218-git"; - asds = [ "mixalot-flac" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; - system = "mixalot-flac"; - asd = "mixalot-flac"; - }); - systems = [ "mixalot-flac" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "flac" pkgs) (getAttr "mixalot" pkgs) ]; - }; - mixalot-mp3 = { - pname = "mixalot-mp3"; - version = "20151218-git"; - asds = [ "mixalot-mp3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; - system = "mixalot-mp3"; - asd = "mixalot-mp3"; - }); - systems = [ "mixalot-mp3" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "mixalot" pkgs) (getAttr "mpg123-ffi" pkgs) ]; - }; - mixalot-vorbis = { - pname = "mixalot-vorbis"; - version = "20151218-git"; - asds = [ "mixalot-vorbis" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; - system = "mixalot-vorbis"; - asd = "mixalot-vorbis"; - }); - systems = [ "mixalot-vorbis" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "mixalot" pkgs) (getAttr "vorbisfile-ffi" pkgs) ]; - }; - mk-defsystem = { - pname = "mk-defsystem"; - version = "20220220-git"; - asds = [ "mk-defsystem" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mk-defsystem/2022-02-20/mk-defsystem-20220220-git.tgz"; - sha256 = "1j83cx0dm12hjy54xfvv22ij13yp2z14qr73yxnkg0awvw6i2rnx"; - system = "mk-defsystem"; - asd = "mk-defsystem"; - }); - systems = [ "mk-defsystem" ]; - lispLibs = [ ]; - }; - mk-string-metrics = { - pname = "mk-string-metrics"; - version = "20180131-git"; - asds = [ "mk-string-metrics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz"; - sha256 = "0c50hjpylhkh5phcxxcwqdzpa94vk5pq1j7c6x0d3wfpb2yx0wkd"; - system = "mk-string-metrics"; - asd = "mk-string-metrics"; - }); - systems = [ "mk-string-metrics" ]; - lispLibs = [ ]; - }; - mk-string-metrics-tests = { - pname = "mk-string-metrics-tests"; - version = "20180131-git"; - asds = [ "mk-string-metrics-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz"; - sha256 = "0c50hjpylhkh5phcxxcwqdzpa94vk5pq1j7c6x0d3wfpb2yx0wkd"; - system = "mk-string-metrics-tests"; - asd = "mk-string-metrics-tests"; - }); - systems = [ "mk-string-metrics-tests" ]; - lispLibs = [ (getAttr "mk-string-metrics" pkgs) ]; - }; - ml-dsl = { - pname = "ml-dsl"; - version = "20210124-git"; - asds = [ "ml-dsl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz"; - sha256 = "0baq2ccb88zyr2dqdvpm32lsin4zalv11w48x4xm80cr4kw45fk5"; - system = "ml-dsl"; - asd = "ml-dsl"; - }); - systems = [ "ml-dsl" ]; - lispLibs = [ (getAttr "cl-marklogic" pkgs) ]; - }; - ml-optimizer = { - pname = "ml-optimizer"; - version = "20210124-git"; - asds = [ "ml-optimizer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz"; - sha256 = "0baq2ccb88zyr2dqdvpm32lsin4zalv11w48x4xm80cr4kw45fk5"; - system = "ml-optimizer"; - asd = "ml-optimizer"; - }); - systems = [ "ml-optimizer" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "cl-marklogic" pkgs) (getAttr "cl-opsresearch" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - ml-test = { - pname = "ml-test"; - version = "20210124-git"; - asds = [ "ml-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-marklogic/2021-01-24/cl-marklogic-20210124-git.tgz"; - sha256 = "0baq2ccb88zyr2dqdvpm32lsin4zalv11w48x4xm80cr4kw45fk5"; - system = "ml-test"; - asd = "ml-test"; - }); - systems = [ "ml-test" ]; - lispLibs = [ (getAttr "cl-marklogic" pkgs) (getAttr "ml-optimizer" pkgs) (getAttr "fiveam" pkgs) ]; - }; - mlep = { - pname = "mlep"; - version = "20180430-git"; - asds = [ "mlep" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mlep/2018-04-30/cl-mlep-20180430-git.tgz"; - sha256 = "1y49fgc5py34b8r6908pxij73qxrl6yxjwx1pxigpnkbdf6a92lk"; - system = "mlep"; - asd = "mlep"; - }); - systems = [ "mlep" ]; - lispLibs = [ ]; - }; - mlep-add = { - pname = "mlep-add"; - version = "20180430-git"; - asds = [ "mlep-add" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mlep/2018-04-30/cl-mlep-20180430-git.tgz"; - sha256 = "1y49fgc5py34b8r6908pxij73qxrl6yxjwx1pxigpnkbdf6a92lk"; - system = "mlep-add"; - asd = "mlep-add"; - }); - systems = [ "mlep-add" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "mlep" pkgs) (getAttr "cl-num-utils" pkgs) (getAttr "lla" pkgs) ]; - }; - mmap = { - pname = "mmap"; - version = "20220707-git"; - asds = [ "mmap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mmap/2022-07-07/mmap-20220707-git.tgz"; - sha256 = "0gsmhpj83p9hiy4r0z2jzr6psypzgk06sfzwwqxv72k6hxm241gz"; - system = "mmap"; - asd = "mmap"; - }); - systems = [ "mmap" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - mmap-test = { - pname = "mmap-test"; - version = "20220707-git"; - asds = [ "mmap-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mmap/2022-07-07/mmap-20220707-git.tgz"; - sha256 = "0gsmhpj83p9hiy4r0z2jzr6psypzgk06sfzwwqxv72k6hxm241gz"; - system = "mmap-test"; - asd = "mmap-test"; - }); - systems = [ "mmap-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "mmap" pkgs) (getAttr "parachute" pkgs) ]; - }; - mnas-graph = { - pname = "mnas-graph"; - version = "20221106-git"; - asds = [ "mnas-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-graph/2022-11-06/mnas-graph-20221106-git.tgz"; - sha256 = "0lhq9m8js55jlzmc2jiwk2q8nzlnarsh5cpjrnl2gznxaxmml0wi"; - system = "mnas-graph"; - asd = "mnas-graph"; - }); - systems = [ "mnas-graph" ]; - lispLibs = [ (getAttr "mnas-hash-table" pkgs) (getAttr "mnas-string" pkgs) ]; - }; - mnas-graph_slash_alg = { - pname = "mnas-graph_alg"; - version = "20221106-git"; - asds = [ "mnas-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-graph/2022-11-06/mnas-graph-20221106-git.tgz"; - sha256 = "0lhq9m8js55jlzmc2jiwk2q8nzlnarsh5cpjrnl2gznxaxmml0wi"; - system = "mnas-graph"; - asd = "mnas-graph"; - }); - systems = [ "mnas-graph/alg" ]; - lispLibs = [ (getAttr "mnas-hash-table" pkgs) (getAttr "mnas-string" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-graph_slash_core = { - pname = "mnas-graph_core"; - version = "20221106-git"; - asds = [ "mnas-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-graph/2022-11-06/mnas-graph-20221106-git.tgz"; - sha256 = "0lhq9m8js55jlzmc2jiwk2q8nzlnarsh5cpjrnl2gznxaxmml0wi"; - system = "mnas-graph"; - asd = "mnas-graph"; - }); - systems = [ "mnas-graph/core" ]; - lispLibs = [ (getAttr "mnas-hash-table" pkgs) (getAttr "mnas-string" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-graph_slash_demos = { - pname = "mnas-graph_demos"; - version = "20221106-git"; - asds = [ "mnas-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-graph/2022-11-06/mnas-graph-20221106-git.tgz"; - sha256 = "0lhq9m8js55jlzmc2jiwk2q8nzlnarsh5cpjrnl2gznxaxmml0wi"; - system = "mnas-graph"; - asd = "mnas-graph"; - }); - systems = [ "mnas-graph/demos" ]; - lispLibs = [ (getAttr "mnas-hash-table" pkgs) (getAttr "mnas-string" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-graph_slash_docs = { - pname = "mnas-graph_docs"; - version = "20221106-git"; - asds = [ "mnas-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-graph/2022-11-06/mnas-graph-20221106-git.tgz"; - sha256 = "0lhq9m8js55jlzmc2jiwk2q8nzlnarsh5cpjrnl2gznxaxmml0wi"; - system = "mnas-graph"; - asd = "mnas-graph"; - }); - systems = [ "mnas-graph/docs" ]; - lispLibs = [ (getAttr "codex" pkgs) (getAttr "mnas-graph" pkgs) (getAttr "mnas-package" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-graph_slash_filter = { - pname = "mnas-graph_filter"; - version = "20221106-git"; - asds = [ "mnas-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-graph/2022-11-06/mnas-graph-20221106-git.tgz"; - sha256 = "0lhq9m8js55jlzmc2jiwk2q8nzlnarsh5cpjrnl2gznxaxmml0wi"; - system = "mnas-graph"; - asd = "mnas-graph"; - }); - systems = [ "mnas-graph/filter" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - mnas-graph_slash_printer-viewer = { - pname = "mnas-graph_printer-viewer"; - version = "20221106-git"; - asds = [ "mnas-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-graph/2022-11-06/mnas-graph-20221106-git.tgz"; - sha256 = "0lhq9m8js55jlzmc2jiwk2q8nzlnarsh5cpjrnl2gznxaxmml0wi"; - system = "mnas-graph"; - asd = "mnas-graph"; - }); - systems = [ "mnas-graph/printer-viewer" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - mnas-graph_slash_sample = { - pname = "mnas-graph_sample"; - version = "20221106-git"; - asds = [ "mnas-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-graph/2022-11-06/mnas-graph-20221106-git.tgz"; - sha256 = "0lhq9m8js55jlzmc2jiwk2q8nzlnarsh5cpjrnl2gznxaxmml0wi"; - system = "mnas-graph"; - asd = "mnas-graph"; - }); - systems = [ "mnas-graph/sample" ]; - lispLibs = [ (getAttr "mnas-hash-table" pkgs) (getAttr "mnas-string" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-graph_slash_tests = { - pname = "mnas-graph_tests"; - version = "20221106-git"; - asds = [ "mnas-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-graph/2022-11-06/mnas-graph-20221106-git.tgz"; - sha256 = "0lhq9m8js55jlzmc2jiwk2q8nzlnarsh5cpjrnl2gznxaxmml0wi"; - system = "mnas-graph"; - asd = "mnas-graph"; - }); - systems = [ "mnas-graph/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "mnas-graph" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-graph_slash_view = { - pname = "mnas-graph_view"; - version = "20221106-git"; - asds = [ "mnas-graph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-graph/2022-11-06/mnas-graph-20221106-git.tgz"; - sha256 = "0lhq9m8js55jlzmc2jiwk2q8nzlnarsh5cpjrnl2gznxaxmml0wi"; - system = "mnas-graph"; - asd = "mnas-graph"; - }); - systems = [ "mnas-graph/view" ]; - lispLibs = [ (getAttr "mnas-hash-table" pkgs) (getAttr "mnas-string" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-hash-table = { - pname = "mnas-hash-table"; - version = "20220707-git"; - asds = [ "mnas-hash-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-hash-table/2022-07-07/mnas-hash-table-20220707-git.tgz"; - sha256 = "0wgv04zi4dx5d7cmmwkkzf5qf7ik3rlmnxnivkp9ya98gz2lr0rv"; - system = "mnas-hash-table"; - asd = "mnas-hash-table"; - }); - systems = [ "mnas-hash-table" ]; - lispLibs = [ ]; - }; - mnas-hash-table_slash_docs = { - pname = "mnas-hash-table_docs"; - version = "20220707-git"; - asds = [ "mnas-hash-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-hash-table/2022-07-07/mnas-hash-table-20220707-git.tgz"; - sha256 = "0wgv04zi4dx5d7cmmwkkzf5qf7ik3rlmnxnivkp9ya98gz2lr0rv"; - system = "mnas-hash-table"; - asd = "mnas-hash-table"; - }); - systems = [ "mnas-hash-table/docs" ]; - lispLibs = [ (getAttr "codex" pkgs) (getAttr "mnas-hash-table" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-hash-table_slash_tests = { - pname = "mnas-hash-table_tests"; - version = "20220707-git"; - asds = [ "mnas-hash-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-hash-table/2022-07-07/mnas-hash-table-20220707-git.tgz"; - sha256 = "0wgv04zi4dx5d7cmmwkkzf5qf7ik3rlmnxnivkp9ya98gz2lr0rv"; - system = "mnas-hash-table"; - asd = "mnas-hash-table"; - }); - systems = [ "mnas-hash-table/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "mnas-hash-table" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-package = { - pname = "mnas-package"; - version = "20221106-git"; - asds = [ "mnas-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-package/2022-11-06/mnas-package-20221106-git.tgz"; - sha256 = "1x5csk262qghdg1a6vjsn8khqjkm7rpmzn5mpp0hkid88gdi9acj"; - system = "mnas-package"; - asd = "mnas-package"; - }); - systems = [ "mnas-package" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "inferior-shell" pkgs) (getAttr "mnas-graph" pkgs) (getAttr "mnas-string" pkgs) (getAttr "slynk" pkgs) ]; - }; - mnas-package_slash_doc = { - pname = "mnas-package_doc"; - version = "20221106-git"; - asds = [ "mnas-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-package/2022-11-06/mnas-package-20221106-git.tgz"; - sha256 = "1x5csk262qghdg1a6vjsn8khqjkm7rpmzn5mpp0hkid88gdi9acj"; - system = "mnas-package"; - asd = "mnas-package"; - }); - systems = [ "mnas-package/doc" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-package_slash_docs = { - pname = "mnas-package_docs"; - version = "20221106-git"; - asds = [ "mnas-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-package/2022-11-06/mnas-package-20221106-git.tgz"; - sha256 = "1x5csk262qghdg1a6vjsn8khqjkm7rpmzn5mpp0hkid88gdi9acj"; - system = "mnas-package"; - asd = "mnas-package"; - }); - systems = [ "mnas-package/docs" ]; - lispLibs = [ (getAttr "codex" pkgs) (getAttr "mnas-package" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-package_slash_example = { - pname = "mnas-package_example"; - version = "20221106-git"; - asds = [ "mnas-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-package/2022-11-06/mnas-package-20221106-git.tgz"; - sha256 = "1x5csk262qghdg1a6vjsn8khqjkm7rpmzn5mpp0hkid88gdi9acj"; - system = "mnas-package"; - asd = "mnas-package"; - }); - systems = [ "mnas-package/example" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - mnas-package_slash_make = { - pname = "mnas-package_make"; - version = "20221106-git"; - asds = [ "mnas-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-package/2022-11-06/mnas-package-20221106-git.tgz"; - sha256 = "1x5csk262qghdg1a6vjsn8khqjkm7rpmzn5mpp0hkid88gdi9acj"; - system = "mnas-package"; - asd = "mnas-package"; - }); - systems = [ "mnas-package/make" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "mnas-graph" pkgs) (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-package_slash_obj = { - pname = "mnas-package_obj"; - version = "20221106-git"; - asds = [ "mnas-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-package/2022-11-06/mnas-package-20221106-git.tgz"; - sha256 = "1x5csk262qghdg1a6vjsn8khqjkm7rpmzn5mpp0hkid88gdi9acj"; - system = "mnas-package"; - asd = "mnas-package"; - }); - systems = [ "mnas-package/obj" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-package_slash_pkg = { - pname = "mnas-package_pkg"; - version = "20221106-git"; - asds = [ "mnas-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-package/2022-11-06/mnas-package-20221106-git.tgz"; - sha256 = "1x5csk262qghdg1a6vjsn8khqjkm7rpmzn5mpp0hkid88gdi9acj"; - system = "mnas-package"; - asd = "mnas-package"; - }); - systems = [ "mnas-package/pkg" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-package_slash_sec = { - pname = "mnas-package_sec"; - version = "20221106-git"; - asds = [ "mnas-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-package/2022-11-06/mnas-package-20221106-git.tgz"; - sha256 = "1x5csk262qghdg1a6vjsn8khqjkm7rpmzn5mpp0hkid88gdi9acj"; - system = "mnas-package"; - asd = "mnas-package"; - }); - systems = [ "mnas-package/sec" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "mnas-graph" pkgs) (getAttr "mnas-string" pkgs) (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-package_slash_sys = { - pname = "mnas-package_sys"; - version = "20221106-git"; - asds = [ "mnas-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-package/2022-11-06/mnas-package-20221106-git.tgz"; - sha256 = "1x5csk262qghdg1a6vjsn8khqjkm7rpmzn5mpp0hkid88gdi9acj"; - system = "mnas-package"; - asd = "mnas-package"; - }); - systems = [ "mnas-package/sys" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-package_slash_tests = { - pname = "mnas-package_tests"; - version = "20221106-git"; - asds = [ "mnas-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-package/2022-11-06/mnas-package-20221106-git.tgz"; - sha256 = "1x5csk262qghdg1a6vjsn8khqjkm7rpmzn5mpp0hkid88gdi9acj"; - system = "mnas-package"; - asd = "mnas-package"; - }); - systems = [ "mnas-package/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "mnas-package" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-package_slash_view = { - pname = "mnas-package_view"; - version = "20221106-git"; - asds = [ "mnas-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-package/2022-11-06/mnas-package-20221106-git.tgz"; - sha256 = "1x5csk262qghdg1a6vjsn8khqjkm7rpmzn5mpp0hkid88gdi9acj"; - system = "mnas-package"; - asd = "mnas-package"; - }); - systems = [ "mnas-package/view" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "mnas-graph" pkgs) (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-path = { - pname = "mnas-path"; - version = "20220707-git"; - asds = [ "mnas-path" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-path/2022-07-07/mnas-path-20220707-git.tgz"; - sha256 = "07lhn8ak3dmr48l1kaf4xbxmrz33p8bvs1fz8z3jvjywz23zl0cs"; - system = "mnas-path"; - asd = "mnas-path"; - }); - systems = [ "mnas-path" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) ]; - }; - mnas-path_slash_docs = { - pname = "mnas-path_docs"; - version = "20220707-git"; - asds = [ "mnas-path" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-path/2022-07-07/mnas-path-20220707-git.tgz"; - sha256 = "07lhn8ak3dmr48l1kaf4xbxmrz33p8bvs1fz8z3jvjywz23zl0cs"; - system = "mnas-path"; - asd = "mnas-path"; - }); - systems = [ "mnas-path/docs" ]; - lispLibs = [ (getAttr "codex" pkgs) (getAttr "mnas-package" pkgs) (getAttr "mnas-path" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-string = { - pname = "mnas-string"; - version = "20220707-git"; - asds = [ "mnas-string" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-string/2022-07-07/mnas-string-20220707-git.tgz"; - sha256 = "1aqcgig7ydaw8ckmh5kpplrjqf25xmx9sa2k2p21p64sii7gnyfn"; - system = "mnas-string"; - asd = "mnas-string"; - }); - systems = [ "mnas-string" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - mnas-string_slash_core = { - pname = "mnas-string_core"; - version = "20220707-git"; - asds = [ "mnas-string" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-string/2022-07-07/mnas-string-20220707-git.tgz"; - sha256 = "1aqcgig7ydaw8ckmh5kpplrjqf25xmx9sa2k2p21p64sii7gnyfn"; - system = "mnas-string"; - asd = "mnas-string"; - }); - systems = [ "mnas-string/core" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-string_slash_db = { - pname = "mnas-string_db"; - version = "20220707-git"; - asds = [ "mnas-string" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-string/2022-07-07/mnas-string-20220707-git.tgz"; - sha256 = "1aqcgig7ydaw8ckmh5kpplrjqf25xmx9sa2k2p21p64sii7gnyfn"; - system = "mnas-string"; - asd = "mnas-string"; - }); - systems = [ "mnas-string/db" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-string_slash_docs = { - pname = "mnas-string_docs"; - version = "20220707-git"; - asds = [ "mnas-string" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-string/2022-07-07/mnas-string-20220707-git.tgz"; - sha256 = "1aqcgig7ydaw8ckmh5kpplrjqf25xmx9sa2k2p21p64sii7gnyfn"; - system = "mnas-string"; - asd = "mnas-string"; - }); - systems = [ "mnas-string/docs" ]; - lispLibs = [ (getAttr "codex" pkgs) (getAttr "mnas-package" pkgs) (getAttr "mnas-string" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-string_slash_parse = { - pname = "mnas-string_parse"; - version = "20220707-git"; - asds = [ "mnas-string" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-string/2022-07-07/mnas-string-20220707-git.tgz"; - sha256 = "1aqcgig7ydaw8ckmh5kpplrjqf25xmx9sa2k2p21p64sii7gnyfn"; - system = "mnas-string"; - asd = "mnas-string"; - }); - systems = [ "mnas-string/parse" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-string_slash_print = { - pname = "mnas-string_print"; - version = "20220707-git"; - asds = [ "mnas-string" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-string/2022-07-07/mnas-string-20220707-git.tgz"; - sha256 = "1aqcgig7ydaw8ckmh5kpplrjqf25xmx9sa2k2p21p64sii7gnyfn"; - system = "mnas-string"; - asd = "mnas-string"; - }); - systems = [ "mnas-string/print" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - mnas-string_slash_tests = { - pname = "mnas-string_tests"; - version = "20220707-git"; - asds = [ "mnas-string" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-string/2022-07-07/mnas-string-20220707-git.tgz"; - sha256 = "1aqcgig7ydaw8ckmh5kpplrjqf25xmx9sa2k2p21p64sii7gnyfn"; - system = "mnas-string"; - asd = "mnas-string"; - }); - systems = [ "mnas-string/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "mnas-string" pkgs) ]; - meta = { - broken = true; - }; - }; - mnas-string_slash_translit = { - pname = "mnas-string_translit"; - version = "20220707-git"; - asds = [ "mnas-string" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mnas-string/2022-07-07/mnas-string-20220707-git.tgz"; - sha256 = "1aqcgig7ydaw8ckmh5kpplrjqf25xmx9sa2k2p21p64sii7gnyfn"; - system = "mnas-string"; - asd = "mnas-string"; - }); - systems = [ "mnas-string/translit" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - mnst-relay = { - pname = "mnst-relay"; - version = "20210807-git"; - asds = [ "mnst-relay" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; - sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; - system = "mnst-relay"; - asd = "mnst-relay"; - }); - systems = [ "mnst-relay" ]; - lispLibs = [ (getAttr "asdf-nst" pkgs) (getAttr "nst" pkgs) (getAttr "nst-selftest-utils" pkgs) ]; - }; - mockingbird = { - pname = "mockingbird"; - version = "20211020-git"; - asds = [ "mockingbird" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mockingbird/2021-10-20/mockingbird-20211020-git.tgz"; - sha256 = "1n1mxl2qk7g63z92d943ysn12axw0bx5dvw0cmm3cs1hjpx5rdly"; - system = "mockingbird"; - asd = "mockingbird"; - }); - systems = [ "mockingbird" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "fare-utils" pkgs) (getAttr "trivial-arguments" pkgs) ]; - }; - mockingbird-test = { - pname = "mockingbird-test"; - version = "20211020-git"; - asds = [ "mockingbird-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mockingbird/2021-10-20/mockingbird-20211020-git.tgz"; - sha256 = "1n1mxl2qk7g63z92d943ysn12axw0bx5dvw0cmm3cs1hjpx5rdly"; - system = "mockingbird-test"; - asd = "mockingbird-test"; - }); - systems = [ "mockingbird-test" ]; - lispLibs = [ (getAttr "mockingbird" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - modest-config = { - pname = "modest-config"; - version = "20180228-git"; - asds = [ "modest-config" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/modest-config/2018-02-28/modest-config-20180228-git.tgz"; - sha256 = "0ali9lvg7ngzmpgaxmbc4adp4djznavbywiig8x94c2xwicvjh83"; - system = "modest-config"; - asd = "modest-config"; - }); - systems = [ "modest-config" ]; - lispLibs = [ ]; - }; - modest-config-test = { - pname = "modest-config-test"; - version = "20180228-git"; - asds = [ "modest-config-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/modest-config/2018-02-28/modest-config-20180228-git.tgz"; - sha256 = "0ali9lvg7ngzmpgaxmbc4adp4djznavbywiig8x94c2xwicvjh83"; - system = "modest-config-test"; - asd = "modest-config-test"; - }); - systems = [ "modest-config-test" ]; - lispLibs = [ (getAttr "modest-config" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - modf = { - pname = "modf"; - version = "20200925-git"; - asds = [ "modf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/modf/2020-09-25/modf-20200925-git.tgz"; - sha256 = "1aap7ldy7lv942khp026pgndgdzfkkqa9xcq1ykinrmflrgdazay"; - system = "modf"; - asd = "modf"; - }); - systems = [ "modf" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) ]; - }; - modf-fset = { - pname = "modf-fset"; - version = "20150608-git"; - asds = [ "modf-fset" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/modf-fset/2015-06-08/modf-fset-20150608-git.tgz"; - sha256 = "0xdlwsw3b31l9c6db7rgvikn42ncqk98s45zcq116f51ph3dr95y"; - system = "modf-fset"; - asd = "modf-fset"; - }); - systems = [ "modf-fset" ]; - lispLibs = [ (getAttr "fset" pkgs) (getAttr "modf" pkgs) ]; - }; - modf-fset-test = { - pname = "modf-fset-test"; - version = "20150608-git"; - asds = [ "modf-fset-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/modf-fset/2015-06-08/modf-fset-20150608-git.tgz"; - sha256 = "0xdlwsw3b31l9c6db7rgvikn42ncqk98s45zcq116f51ph3dr95y"; - system = "modf-fset-test"; - asd = "modf-fset-test"; - }); - systems = [ "modf-fset-test" ]; - lispLibs = [ (getAttr "modf" pkgs) (getAttr "modf-fset" pkgs) (getAttr "stefil" pkgs) ]; - }; - modf-test = { - pname = "modf-test"; - version = "20200925-git"; - asds = [ "modf-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/modf/2020-09-25/modf-20200925-git.tgz"; - sha256 = "1aap7ldy7lv942khp026pgndgdzfkkqa9xcq1ykinrmflrgdazay"; - system = "modf-test"; - asd = "modf-test"; - }); - systems = [ "modf-test" ]; - lispLibs = [ (getAttr "iterate" pkgs) (getAttr "modf" pkgs) (getAttr "stefil" pkgs) ]; - }; - modlisp = { - pname = "modlisp"; - version = "20150923-git"; - asds = [ "modlisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-modlisp/2015-09-23/cl-modlisp-20150923-git.tgz"; - sha256 = "14gfhhy8blyrhpb1jk17bq4vazgwmzgcx3misw48ja77x17bl1zf"; - system = "modlisp"; - asd = "modlisp"; - }); - systems = [ "modlisp" ]; - lispLibs = [ (getAttr "kmrcl" pkgs) ]; - }; - modularize = { - pname = "modularize"; - version = "20200427-git"; - asds = [ "modularize" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/modularize/2020-04-27/modularize-20200427-git.tgz"; - sha256 = "1zys29rfkb649rkgl3snxhajk8d5yf7ryxkrwy020kwdh7zdsg7d"; - system = "modularize"; - asd = "modularize"; - }); - systems = [ "modularize" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) ]; - }; - modularize-hooks = { - pname = "modularize-hooks"; - version = "20190710-git"; - asds = [ "modularize-hooks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/modularize-hooks/2019-07-10/modularize-hooks-20190710-git.tgz"; - sha256 = "12kjvin8hxidwkzfb7inqv5b6g5qzcssnj9wc497v2ixc56fqdz7"; - system = "modularize-hooks"; - asd = "modularize-hooks"; - }); - systems = [ "modularize-hooks" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "lambda-fiddle" pkgs) (getAttr "modularize" pkgs) (getAttr "trivial-arguments" pkgs) ]; - }; - modularize-interfaces = { - pname = "modularize-interfaces"; - version = "20210630-git"; - asds = [ "modularize-interfaces" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/modularize-interfaces/2021-06-30/modularize-interfaces-20210630-git.tgz"; - sha256 = "1jl11ffkrah3553wzysmxanhrzv3rnzi5x11ll626baf69im0v7x"; - system = "modularize-interfaces"; - asd = "modularize-interfaces"; - }); - systems = [ "modularize-interfaces" ]; - lispLibs = [ (getAttr "lambda-fiddle" pkgs) (getAttr "modularize" pkgs) (getAttr "trivial-arguments" pkgs) (getAttr "trivial-indent" pkgs) ]; - }; - modularize-test-module = { - pname = "modularize-test-module"; - version = "20200427-git"; - asds = [ "modularize-test-module" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/modularize/2020-04-27/modularize-20200427-git.tgz"; - sha256 = "1zys29rfkb649rkgl3snxhajk8d5yf7ryxkrwy020kwdh7zdsg7d"; - system = "modularize-test-module"; - asd = "modularize-test-module"; - }); - systems = [ "modularize-test-module" ]; - lispLibs = [ (getAttr "modularize" pkgs) ]; - }; - moira = { - pname = "moira"; - version = "20171130-git"; - asds = [ "moira" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/moira/2017-11-30/moira-20171130-git.tgz"; - sha256 = "0r6hvq8j04y1i85f8jwhhafylgfrkg8c1z5746nsbv0v0348sf5h"; - system = "moira"; - asd = "moira"; - }); - systems = [ "moira" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "osicat" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - monkeylib-html = { - pname = "monkeylib-html"; - version = "20180228-git"; - asds = [ "monkeylib-html" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-html/2018-02-28/monkeylib-html-20180228-git.tgz"; - sha256 = "11a778ynyb8mhiy9fkpyg2x1p53hi1i9mry9gfin2r28mjgwj096"; - system = "monkeylib-html"; - asd = "monkeylib-html"; - }); - systems = [ "monkeylib-html" ]; - lispLibs = [ (getAttr "com_dot_gigamonkeys_dot_macro-utilities" pkgs) (getAttr "com_dot_gigamonkeys_dot_pathnames" pkgs) (getAttr "com_dot_gigamonkeys_dot_test-framework" pkgs) (getAttr "monkeylib-text-languages" pkgs) (getAttr "monkeylib-text-output" pkgs) (getAttr "com_dot_gigamonkeys_dot_utilities" pkgs) ]; - }; - monkeylib-markup-html = { - pname = "monkeylib-markup-html"; - version = "20120208-git"; - asds = [ "monkeylib-markup-html" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-markup-html/2012-02-08/monkeylib-markup-html-20120208-git.tgz"; - sha256 = "1kwnlb7dka9bqyc8a06lbsap8j83kdayk4m9a1m3mazjgaxlpv2a"; - system = "monkeylib-markup-html"; - asd = "monkeylib-markup-html"; - }); - systems = [ "monkeylib-markup-html" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "monkeylib-html" pkgs) (getAttr "com_dot_gigamonkeys_dot_macro-utilities" pkgs) (getAttr "com_dot_gigamonkeys_dot_markup" pkgs) (getAttr "com_dot_gigamonkeys_dot_utilities" pkgs) ]; - }; - monkeylib-text-languages = { - pname = "monkeylib-text-languages"; - version = "20111203-git"; - asds = [ "monkeylib-text-languages" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-text-languages/2011-12-03/monkeylib-text-languages-20111203-git.tgz"; - sha256 = "1f6hb3r2s5phz5z4rv3llyfi30vbxlq9qpipsq9vppmw51fvdsdk"; - system = "monkeylib-text-languages"; - asd = "monkeylib-text-languages"; - }); - systems = [ "monkeylib-text-languages" ]; - lispLibs = [ (getAttr "com_dot_gigamonkeys_dot_macro-utilities" pkgs) (getAttr "monkeylib-text-output" pkgs) ]; - }; - monkeylib-text-output = { - pname = "monkeylib-text-output"; - version = "20111203-git"; - asds = [ "monkeylib-text-output" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monkeylib-text-output/2011-12-03/monkeylib-text-output-20111203-git.tgz"; - sha256 = "0lygfxap2ppxxi0sbz8lig1h878ad84jwbp3c895r7h9svjh1ffm"; - system = "monkeylib-text-output"; - asd = "monkeylib-text-output"; - }); - systems = [ "monkeylib-text-output" ]; - lispLibs = [ (getAttr "com_dot_gigamonkeys_dot_macro-utilities" pkgs) (getAttr "com_dot_gigamonkeys_dot_pathnames" pkgs) (getAttr "com_dot_gigamonkeys_dot_test-framework" pkgs) (getAttr "com_dot_gigamonkeys_dot_utilities" pkgs) ]; - }; - monomyth = { - pname = "monomyth"; - version = "20211230-git"; - asds = [ "monomyth" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monomyth/2021-12-30/monomyth-20211230-git.tgz"; - sha256 = "162g6fr7r2qdvfxhjgvq70p0grbvlllxih8g753jby2zcazb6syy"; - system = "monomyth"; - asd = "monomyth"; - }); - systems = [ "monomyth" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-algebraic-data-type" pkgs) (getAttr "cl-rabbit" pkgs) (getAttr "cl-store" pkgs) (getAttr "clack" pkgs) (getAttr "closer-mop" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "fset" pkgs) (getAttr "iterate" pkgs) (getAttr "jonathan" pkgs) (getAttr "ningle" pkgs) (getAttr "optima" pkgs) (getAttr "pzmq" pkgs) (getAttr "rutils" pkgs) (getAttr "stmx" pkgs) (getAttr "trivia" pkgs) (getAttr "uuid" pkgs) (getAttr "verbose" pkgs) (getAttr "woo" pkgs) ]; - }; - monomyth_slash_basic-example-master = { - pname = "monomyth_basic-example-master"; - version = "20211230-git"; - asds = [ "monomyth" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monomyth/2021-12-30/monomyth-20211230-git.tgz"; - sha256 = "162g6fr7r2qdvfxhjgvq70p0grbvlllxih8g753jby2zcazb6syy"; - system = "monomyth"; - asd = "monomyth"; - }); - systems = [ "monomyth/basic-example-master" ]; - lispLibs = [ (getAttr "monomyth" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - monomyth_slash_basic-example-worker = { - pname = "monomyth_basic-example-worker"; - version = "20211230-git"; - asds = [ "monomyth" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monomyth/2021-12-30/monomyth-20211230-git.tgz"; - sha256 = "162g6fr7r2qdvfxhjgvq70p0grbvlllxih8g753jby2zcazb6syy"; - system = "monomyth"; - asd = "monomyth"; - }); - systems = [ "monomyth/basic-example-worker" ]; - lispLibs = [ (getAttr "monomyth" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - monomyth_slash_tests = { - pname = "monomyth_tests"; - version = "20211230-git"; - asds = [ "monomyth" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/monomyth/2021-12-30/monomyth-20211230-git.tgz"; - sha256 = "162g6fr7r2qdvfxhjgvq70p0grbvlllxih8g753jby2zcazb6syy"; - system = "monomyth"; - asd = "monomyth"; - }); - systems = [ "monomyth/tests" ]; - lispLibs = [ (getAttr "cl-mock" pkgs) (getAttr "dexador" pkgs) (getAttr "lparallel" pkgs) (getAttr "monomyth" pkgs) (getAttr "quri" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - montezuma = { - pname = "montezuma"; - version = "20180228-git"; - asds = [ "montezuma" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz"; - sha256 = "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c"; - system = "montezuma"; - asd = "montezuma"; - }); - systems = [ "montezuma" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - montezuma-indexfiles = { - pname = "montezuma-indexfiles"; - version = "20180228-git"; - asds = [ "montezuma-indexfiles" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz"; - sha256 = "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c"; - system = "montezuma-indexfiles"; - asd = "montezuma-indexfiles"; - }); - systems = [ "montezuma-indexfiles" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "montezuma" pkgs) ]; - }; - montezuma-tests = { - pname = "montezuma-tests"; - version = "20180228-git"; - asds = [ "montezuma-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/montezuma/2018-02-28/montezuma-20180228-git.tgz"; - sha256 = "0svmvsbsirydk3c1spzfvj8qmkzcs9i69anpfvk1843i62wb7x2c"; - system = "montezuma-tests"; - asd = "montezuma"; - }); - systems = [ "montezuma-tests" ]; - lispLibs = [ (getAttr "montezuma" pkgs) (getAttr "trivial-timeout" pkgs) ]; - }; - moptilities = { - pname = "moptilities"; - version = "20170403-git"; - asds = [ "moptilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz"; - sha256 = "1q12bqjbj47lx98yim1kfnnhgfhkl80102fkgp9pdqxg0fp6g5fc"; - system = "moptilities"; - asd = "moptilities"; - }); - systems = [ "moptilities" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - moptilities-test = { - pname = "moptilities-test"; - version = "20170403-git"; - asds = [ "moptilities-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz"; - sha256 = "1q12bqjbj47lx98yim1kfnnhgfhkl80102fkgp9pdqxg0fp6g5fc"; - system = "moptilities-test"; - asd = "moptilities-test"; - }); - systems = [ "moptilities-test" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "moptilities" pkgs) ]; - }; - more-cffi = { - pname = "more-cffi"; - version = "20221106-git"; - asds = [ "more-cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/more-cffi/2022-11-06/more-cffi-20221106-git.tgz"; - sha256 = "0bnpz5c1c6paifdy2krrw2plz1w2rb90mghhip8154amwzgacm35"; - system = "more-cffi"; - asd = "more-cffi"; - }); - systems = [ "more-cffi" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "iterate" pkgs) ]; - }; - more-conditions = { - pname = "more-conditions"; - version = "20180831-git"; - asds = [ "more-conditions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz"; - sha256 = "1n0xbz0yiqn9dxf0ycm57wqvsr4gh2q4hs5fskjbv87c47d7l7zr"; - system = "more-conditions"; - asd = "more-conditions"; - }); - systems = [ "more-conditions" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - more-conditions_slash_test = { - pname = "more-conditions_test"; - version = "20180831-git"; - asds = [ "more-conditions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz"; - sha256 = "1n0xbz0yiqn9dxf0ycm57wqvsr4gh2q4hs5fskjbv87c47d7l7zr"; - system = "more-conditions"; - asd = "more-conditions"; - }); - systems = [ "more-conditions/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) (getAttr "more-conditions" pkgs) ]; - meta = { - broken = true; - }; - }; - mp3-duration = { - pname = "mp3-duration"; - version = "20160208-git"; - asds = [ "mp3-duration" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mp3-duration/2016-02-08/mp3-duration-20160208-git.tgz"; - sha256 = "1mhn9g1kz2yan178m2adg0pz3dx2nmg7hq4gfmfz7lrlsxm08bs7"; - system = "mp3-duration"; - asd = "mp3-duration"; - }); - systems = [ "mp3-duration" ]; - lispLibs = [ ]; - }; - mp3-duration-test = { - pname = "mp3-duration-test"; - version = "20160208-git"; - asds = [ "mp3-duration-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mp3-duration/2016-02-08/mp3-duration-20160208-git.tgz"; - sha256 = "1mhn9g1kz2yan178m2adg0pz3dx2nmg7hq4gfmfz7lrlsxm08bs7"; - system = "mp3-duration-test"; - asd = "mp3-duration-test"; - }); - systems = [ "mp3-duration-test" ]; - lispLibs = [ (getAttr "mp3-duration" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - mpc = { - pname = "mpc"; - version = "20160929-git"; - asds = [ "mpc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mpc/2016-09-29/mpc-20160929-git.tgz"; - sha256 = "1nig0v91m4ybcr19s50xijwv488qlma0b36zy6cric2y8wgclmsx"; - system = "mpc"; - asd = "mpc"; - }); - systems = [ "mpc" ]; - lispLibs = [ ]; - }; - mpg123-ffi = { - pname = "mpg123-ffi"; - version = "20151218-git"; - asds = [ "mpg123-ffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; - system = "mpg123-ffi"; - asd = "mpg123-ffi"; - }); - systems = [ "mpg123-ffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - mra-wavelet-plot = { - pname = "mra-wavelet-plot"; - version = "20181210-git"; - asds = [ "mra-wavelet-plot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mra-wavelet-plot/2018-12-10/mra-wavelet-plot-20181210-git.tgz"; - sha256 = "0d6sdgj1zvkliga9drsqnj4l748vbcwwz744ayq5nnvp5fvhnc29"; - system = "mra-wavelet-plot"; - asd = "mra-wavelet-plot"; - }); - systems = [ "mra-wavelet-plot" ]; - lispLibs = [ ]; - }; - mssql = { - pname = "mssql"; - version = "20210124-git"; - asds = [ "mssql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-mssql/2021-01-24/cl-mssql-20210124-git.tgz"; - sha256 = "09i50adppgc1ybm3ka9vbindhwa2x29f9n3n0jkrryymdhb8zknm"; - system = "mssql"; - asd = "mssql"; - }); - systems = [ "mssql" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "garbage-pools" pkgs) (getAttr "iterate" pkgs) (getAttr "parse-number" pkgs) ]; - }; - mstrings = { - pname = "mstrings"; - version = "20220707-git"; - asds = [ "mstrings" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mstrings/2022-07-07/mstrings-20220707-git.tgz"; - sha256 = "0s1zqwnv9agvlp79gh7y06rmly56v8nm1l594rry9gzwvvx1jj1k"; - system = "mstrings"; - asd = "mstrings"; - }); - systems = [ "mstrings" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - mstrings_slash_test = { - pname = "mstrings_test"; - version = "20220707-git"; - asds = [ "mstrings" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mstrings/2022-07-07/mstrings-20220707-git.tgz"; - sha256 = "0s1zqwnv9agvlp79gh7y06rmly56v8nm1l594rry9gzwvvx1jj1k"; - system = "mstrings"; - asd = "mstrings"; - }); - systems = [ "mstrings/test" ]; - lispLibs = [ (getAttr "cl-syntax" pkgs) (getAttr "mstrings" pkgs) (getAttr "parachute" pkgs) ]; - meta = { - broken = true; - }; - }; - mt19937 = { - pname = "mt19937"; - version = "1.1.1"; - asds = [ "mt19937" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz"; - sha256 = "0h02ssnncc760b68ipm0sbrzrbnllp6fqabvw98w43af08s36xlg"; - system = "mt19937"; - asd = "mt19937"; - }); - systems = [ "mt19937" ]; - lispLibs = [ ]; - }; - mtif = { - pname = "mtif"; - version = "20171130-git"; - asds = [ "mtif" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mtif/2017-11-30/mtif-20171130-git.tgz"; - sha256 = "0fzlf0xawv579i4jp5l994d7m220py5j169klaj0l43frgxb4n7y"; - system = "mtif"; - asd = "mtif"; - }); - systems = [ "mtif" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - mtlisp = { - pname = "mtlisp"; - version = "20130615-git"; - asds = [ "mtlisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mtlisp/2013-06-15/mtlisp-20130615-git.tgz"; - sha256 = "0qpbhiy2z2q7mf4lf2lpj66a13xj7bj0c584d1i7zi156s2hcnvs"; - system = "mtlisp"; - asd = "mtlisp"; - }); - systems = [ "mtlisp" ]; - lispLibs = [ (getAttr "acl-compat" pkgs) ]; - }; - multilang-documentation = { - pname = "multilang-documentation"; - version = "20190710-git"; - asds = [ "multilang-documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/multilang-documentation/2019-07-10/multilang-documentation-20190710-git.tgz"; - sha256 = "13y5jskx8n2b7kimpfarr8v777w3b7zj5swg1b99nj3hk0843ixw"; - system = "multilang-documentation"; - asd = "multilang-documentation"; - }); - systems = [ "multilang-documentation" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "language-codes" pkgs) (getAttr "system-locale" pkgs) ]; - }; - multilang-documentation-utils = { - pname = "multilang-documentation-utils"; - version = "20190710-git"; - asds = [ "multilang-documentation-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz"; - sha256 = "098qhkqskmmrh4wix34mawf7p5c87yql28r51r75yjxj577k5idq"; - system = "multilang-documentation-utils"; - asd = "multilang-documentation-utils"; - }); - systems = [ "multilang-documentation-utils" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "multilang-documentation" pkgs) ]; - }; - multiple-value-variants = { - pname = "multiple-value-variants"; - version = "1.0.1"; - asds = [ "multiple-value-variants" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/multiple-value-variants/2014-08-26/multiple-value-variants-1.0.1.tgz"; - sha256 = "0kb7bkgg2iri89ph2lcgfk57pf8h4r6471sn2jcyp5sz13g4f6yw"; - system = "multiple-value-variants"; - asd = "multiple-value-variants"; - }); - systems = [ "multiple-value-variants" ]; - lispLibs = [ (getAttr "enhanced-multiple-value-bind" pkgs) (getAttr "map-bind" pkgs) (getAttr "positional-lambda" pkgs) ]; - }; - multiposter = { - pname = "multiposter"; - version = "20221106-git"; - asds = [ "multiposter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/multiposter/2022-11-06/multiposter-20221106-git.tgz"; - sha256 = "0c6ji1hg2i5gk60kijcyml2gvi23qyzr1byy08hjyvybajwwzza2"; - system = "multiposter"; - asd = "multiposter"; - }); - systems = [ "multiposter" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "documentation-utils" pkgs) ]; - }; - multiposter-git = { - pname = "multiposter-git"; - version = "20221106-git"; - asds = [ "multiposter-git" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/multiposter/2022-11-06/multiposter-20221106-git.tgz"; - sha256 = "0c6ji1hg2i5gk60kijcyml2gvi23qyzr1byy08hjyvybajwwzza2"; - system = "multiposter-git"; - asd = "multiposter-git"; - }); - systems = [ "multiposter-git" ]; - lispLibs = [ (getAttr "legit" pkgs) (getAttr "multiposter" pkgs) ]; - }; - multiposter-lichat = { - pname = "multiposter-lichat"; - version = "20221106-git"; - asds = [ "multiposter-lichat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/multiposter/2022-11-06/multiposter-20221106-git.tgz"; - sha256 = "0c6ji1hg2i5gk60kijcyml2gvi23qyzr1byy08hjyvybajwwzza2"; - system = "multiposter-lichat"; - asd = "multiposter-lichat"; - }); - systems = [ "multiposter-lichat" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "lichat-tcp-client" pkgs) (getAttr "multiposter" pkgs) (getAttr "trivial-mimes" pkgs) ]; - }; - multiposter-mastodon = { - pname = "multiposter-mastodon"; - version = "20221106-git"; - asds = [ "multiposter-mastodon" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/multiposter/2022-11-06/multiposter-20221106-git.tgz"; - sha256 = "0c6ji1hg2i5gk60kijcyml2gvi23qyzr1byy08hjyvybajwwzza2"; - system = "multiposter-mastodon"; - asd = "multiposter-mastodon"; - }); - systems = [ "multiposter-mastodon" ]; - lispLibs = [ (getAttr "multiposter" pkgs) (getAttr "tooter" pkgs) ]; - }; - multiposter-studio = { - pname = "multiposter-studio"; - version = "20221106-git"; - asds = [ "multiposter-studio" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/multiposter/2022-11-06/multiposter-20221106-git.tgz"; - sha256 = "0c6ji1hg2i5gk60kijcyml2gvi23qyzr1byy08hjyvybajwwzza2"; - system = "multiposter-studio"; - asd = "multiposter-studio"; - }); - systems = [ "multiposter-studio" ]; - lispLibs = [ (getAttr "multiposter" pkgs) (getAttr "north-dexador" pkgs) (getAttr "studio-client" pkgs) ]; - }; - multiposter-tumblr = { - pname = "multiposter-tumblr"; - version = "20221106-git"; - asds = [ "multiposter-tumblr" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/multiposter/2022-11-06/multiposter-20221106-git.tgz"; - sha256 = "0c6ji1hg2i5gk60kijcyml2gvi23qyzr1byy08hjyvybajwwzza2"; - system = "multiposter-tumblr"; - asd = "multiposter-tumblr"; - }); - systems = [ "multiposter-tumblr" ]; - lispLibs = [ (getAttr "humbler" pkgs) (getAttr "multiposter" pkgs) (getAttr "north-dexador" pkgs) ]; - }; - multiposter-twitter = { - pname = "multiposter-twitter"; - version = "20221106-git"; - asds = [ "multiposter-twitter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/multiposter/2022-11-06/multiposter-20221106-git.tgz"; - sha256 = "0c6ji1hg2i5gk60kijcyml2gvi23qyzr1byy08hjyvybajwwzza2"; - system = "multiposter-twitter"; - asd = "multiposter-twitter"; - }); - systems = [ "multiposter-twitter" ]; - lispLibs = [ (getAttr "chirp" pkgs) (getAttr "multiposter" pkgs) ]; - }; - multival-plist = { - pname = "multival-plist"; - version = "20120305-git"; - asds = [ "multival-plist" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/multival-plist/2012-03-05/multival-plist-20120305-git.tgz"; - sha256 = "0cfca0qvngbvs9v4z8qpzr6wsjvf01jzaszagmasa4zkvmjycx1b"; - system = "multival-plist"; - asd = "multival-plist"; - }); - systems = [ "multival-plist" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-annot" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - multival-plist-test = { - pname = "multival-plist-test"; - version = "20120305-git"; - asds = [ "multival-plist-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/multival-plist/2012-03-05/multival-plist-20120305-git.tgz"; - sha256 = "0cfca0qvngbvs9v4z8qpzr6wsjvf01jzaszagmasa4zkvmjycx1b"; - system = "multival-plist-test"; - asd = "multival-plist-test"; - }); - systems = [ "multival-plist-test" ]; - lispLibs = [ (getAttr "multival-plist" pkgs) (getAttr "cl-test-more" pkgs) ]; - }; - music-spelling = { - pname = "music-spelling"; - version = "20221106-git"; - asds = [ "music-spelling" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/music-spelling/2022-11-06/music-spelling-20221106-git.tgz"; - sha256 = "1416np95bm2ikpcp17mlhdp9prw2skyznc6xcf0gh0yss59vigkl"; - system = "music-spelling"; - asd = "music-spelling"; - }); - systems = [ "music-spelling" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - mutility = { - pname = "mutility"; - version = "20221106-git"; - asds = [ "mutility" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mutility/2022-11-06/mutility-20221106-git.tgz"; - sha256 = "1kih8maw1wx97x9ciwy16bj0s392ninj4rdb22j4ad07sq0cv56k"; - system = "mutility"; - asd = "mutility"; - }); - systems = [ "mutility" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "local-time" pkgs) ]; - }; - mutility_slash_files = { - pname = "mutility_files"; - version = "20221106-git"; - asds = [ "mutility" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mutility/2022-11-06/mutility-20221106-git.tgz"; - sha256 = "1kih8maw1wx97x9ciwy16bj0s392ninj4rdb22j4ad07sq0cv56k"; - system = "mutility"; - asd = "mutility"; - }); - systems = [ "mutility/files" ]; - lispLibs = [ (getAttr "mutility" pkgs) ]; - meta = { - broken = true; - }; - }; - mutility_slash_loopy = { - pname = "mutility_loopy"; - version = "20221106-git"; - asds = [ "mutility" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mutility/2022-11-06/mutility-20221106-git.tgz"; - sha256 = "1kih8maw1wx97x9ciwy16bj0s392ninj4rdb22j4ad07sq0cv56k"; - system = "mutility"; - asd = "mutility"; - }); - systems = [ "mutility/loopy" ]; - lispLibs = [ (getAttr "mutility" pkgs) (getAttr "trivial-do" pkgs) ]; - meta = { - broken = true; - }; - }; - mutility_slash_most = { - pname = "mutility_most"; - version = "20221106-git"; - asds = [ "mutility" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mutility/2022-11-06/mutility-20221106-git.tgz"; - sha256 = "1kih8maw1wx97x9ciwy16bj0s392ninj4rdb22j4ad07sq0cv56k"; - system = "mutility"; - asd = "mutility"; - }); - systems = [ "mutility/most" ]; - lispLibs = [ (getAttr "mutility" pkgs) (getAttr "trivial-do" pkgs) ]; - meta = { - broken = true; - }; - }; - mutility_slash_test-helpers = { - pname = "mutility_test-helpers"; - version = "20221106-git"; - asds = [ "mutility" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mutility/2022-11-06/mutility-20221106-git.tgz"; - sha256 = "1kih8maw1wx97x9ciwy16bj0s392ninj4rdb22j4ad07sq0cv56k"; - system = "mutility"; - asd = "mutility"; - }); - systems = [ "mutility/test-helpers" ]; - lispLibs = [ (getAttr "mutility" pkgs) ]; - meta = { - broken = true; - }; - }; - mutility_slash_tests = { - pname = "mutility_tests"; - version = "20221106-git"; - asds = [ "mutility" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mutility/2022-11-06/mutility-20221106-git.tgz"; - sha256 = "1kih8maw1wx97x9ciwy16bj0s392ninj4rdb22j4ad07sq0cv56k"; - system = "mutility"; - asd = "mutility"; - }); - systems = [ "mutility/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-patterns" pkgs) (getAttr "fiveam" pkgs) (getAttr "mutility" pkgs) (getAttr "trivial-do" pkgs) ]; - meta = { - broken = true; - }; - }; - mw-equiv = { - pname = "mw-equiv"; - version = "0.1.3"; - asds = [ "mw-equiv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mw-equiv/2010-10-06/mw-equiv-0.1.3.tgz"; - sha256 = "1fl90wp0jp7l90mps53fq0kzb28f10qfr739527h03xwqccyylad"; - system = "mw-equiv"; - asd = "mw-equiv"; - }); - systems = [ "mw-equiv" ]; - lispLibs = [ ]; - }; - mystic = { - pname = "mystic"; - version = "20160208-git"; - asds = [ "mystic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2016-02-08/mystic-20160208-git.tgz"; - sha256 = "1lqy2ijzpyamm15212z0xc5647fcbajs5argajgx33brz83afb5w"; - system = "mystic"; - asd = "mystic"; - }); - systems = [ "mystic" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "cl-mustache" pkgs) (getAttr "local-time" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - mystic-file-mixin = { - pname = "mystic-file-mixin"; - version = "20160208-git"; - asds = [ "mystic-file-mixin" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2016-02-08/mystic-20160208-git.tgz"; - sha256 = "1lqy2ijzpyamm15212z0xc5647fcbajs5argajgx33brz83afb5w"; - system = "mystic-file-mixin"; - asd = "mystic-file-mixin"; - }); - systems = [ "mystic-file-mixin" ]; - lispLibs = [ (getAttr "mystic" pkgs) ]; - }; - mystic-fiveam-mixin = { - pname = "mystic-fiveam-mixin"; - version = "20160208-git"; - asds = [ "mystic-fiveam-mixin" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2016-02-08/mystic-20160208-git.tgz"; - sha256 = "1lqy2ijzpyamm15212z0xc5647fcbajs5argajgx33brz83afb5w"; - system = "mystic-fiveam-mixin"; - asd = "mystic-fiveam-mixin"; - }); - systems = [ "mystic-fiveam-mixin" ]; - lispLibs = [ (getAttr "mystic" pkgs) (getAttr "mystic-file-mixin" pkgs) ]; - }; - mystic-gitignore-mixin = { - pname = "mystic-gitignore-mixin"; - version = "20160208-git"; - asds = [ "mystic-gitignore-mixin" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2016-02-08/mystic-20160208-git.tgz"; - sha256 = "1lqy2ijzpyamm15212z0xc5647fcbajs5argajgx33brz83afb5w"; - system = "mystic-gitignore-mixin"; - asd = "mystic-gitignore-mixin"; - }); - systems = [ "mystic-gitignore-mixin" ]; - lispLibs = [ (getAttr "mystic" pkgs) (getAttr "mystic-file-mixin" pkgs) ]; - }; - mystic-library-template = { - pname = "mystic-library-template"; - version = "20160208-git"; - asds = [ "mystic-library-template" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2016-02-08/mystic-20160208-git.tgz"; - sha256 = "1lqy2ijzpyamm15212z0xc5647fcbajs5argajgx33brz83afb5w"; - system = "mystic-library-template"; - asd = "mystic-library-template"; - }); - systems = [ "mystic-library-template" ]; - lispLibs = [ (getAttr "mystic" pkgs) (getAttr "mystic-fiveam-mixin" pkgs) (getAttr "mystic-gitignore-mixin" pkgs) (getAttr "mystic-readme-mixin" pkgs) (getAttr "mystic-travis-mixin" pkgs) ]; - }; - mystic-readme-mixin = { - pname = "mystic-readme-mixin"; - version = "20160208-git"; - asds = [ "mystic-readme-mixin" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2016-02-08/mystic-20160208-git.tgz"; - sha256 = "1lqy2ijzpyamm15212z0xc5647fcbajs5argajgx33brz83afb5w"; - system = "mystic-readme-mixin"; - asd = "mystic-readme-mixin"; - }); - systems = [ "mystic-readme-mixin" ]; - lispLibs = [ (getAttr "mystic" pkgs) (getAttr "mystic-file-mixin" pkgs) ]; - }; - mystic-test = { - pname = "mystic-test"; - version = "20160208-git"; - asds = [ "mystic-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2016-02-08/mystic-20160208-git.tgz"; - sha256 = "1lqy2ijzpyamm15212z0xc5647fcbajs5argajgx33brz83afb5w"; - system = "mystic-test"; - asd = "mystic-test"; - }); - systems = [ "mystic-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "mystic" pkgs) (getAttr "mystic-library-template" pkgs) ]; - }; - mystic-travis-mixin = { - pname = "mystic-travis-mixin"; - version = "20160208-git"; - asds = [ "mystic-travis-mixin" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mystic/2016-02-08/mystic-20160208-git.tgz"; - sha256 = "1lqy2ijzpyamm15212z0xc5647fcbajs5argajgx33brz83afb5w"; - system = "mystic-travis-mixin"; - asd = "mystic-travis-mixin"; - }); - systems = [ "mystic-travis-mixin" ]; - lispLibs = [ (getAttr "mystic" pkgs) (getAttr "mystic-file-mixin" pkgs) ]; - }; - myway = { - pname = "myway"; - version = "20221106-git"; - asds = [ "myway" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/myway/2022-11-06/myway-20221106-git.tgz"; - sha256 = "0xac8xpbcvq457f2jzzkf46mh5ganf1k2ix8sg61hqqmld5z4dag"; - system = "myway"; - asd = "myway"; - }); - systems = [ "myway" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-utilities" pkgs) (getAttr "map-set" pkgs) (getAttr "quri" pkgs) ]; - }; - myway-test = { - pname = "myway-test"; - version = "20221106-git"; - asds = [ "myway-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/myway/2022-11-06/myway-20221106-git.tgz"; - sha256 = "0xac8xpbcvq457f2jzzkf46mh5ganf1k2ix8sg61hqqmld5z4dag"; - system = "myway-test"; - asd = "myway-test"; - }); - systems = [ "myway-test" ]; - lispLibs = [ (getAttr "myway" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - myweb = { - pname = "myweb"; - version = "20150608-git"; - asds = [ "myweb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/myweb/2015-06-08/myweb-20150608-git.tgz"; - sha256 = "0yncx40mfw7yxbm5hli9hr3aw4x1lf1912adyvylldfjfh2yxcjy"; - system = "myweb"; - asd = "myweb"; - }); - systems = [ "myweb" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-log" pkgs) (getAttr "local-time" pkgs) (getAttr "trivial-utf-8" pkgs) (getAttr "usocket" pkgs) ]; - }; - nail = { - pname = "nail"; - version = "20221106-git"; - asds = [ "nail" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nail/2022-11-06/nail-20221106-git.tgz"; - sha256 = "0w6184qaaf6v8p55h088igr8b6snyfxn5hpynjhdbyh7sj8xdm9y"; - system = "nail"; - asd = "nail"; - }); - systems = [ "nail" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cl-reexport" pkgs) (getAttr "eazy-gnuplot" pkgs) ]; - }; - named-closure = { - pname = "named-closure"; - version = "20220220-git"; - asds = [ "named-closure" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/named-closure/2022-02-20/named-closure-20220220-git.tgz"; - sha256 = "1ppkl739fp4wypdqbav9i6y65rcxcj4zslrmbx96z3xx0sinv245"; - system = "named-closure"; - asd = "named-closure"; - }); - systems = [ "named-closure" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "hu_dot_dwim_dot_walker" pkgs) ]; - }; - named-read-macros = { - pname = "named-read-macros"; - version = "20210228-git"; - asds = [ "named-read-macros" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/named-read-macros/2021-02-28/named-read-macros-20210228-git.tgz"; - sha256 = "0bgqy43h06nq2p9avqix2k15ab306sghrz2pkr17pli87q0qkxhi"; - system = "named-read-macros"; - asd = "named-read-macros"; - }); - systems = [ "named-read-macros" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - named-read-macros-test = { - pname = "named-read-macros-test"; - version = "20210228-git"; - asds = [ "named-read-macros-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/named-read-macros/2021-02-28/named-read-macros-20210228-git.tgz"; - sha256 = "0bgqy43h06nq2p9avqix2k15ab306sghrz2pkr17pli87q0qkxhi"; - system = "named-read-macros-test"; - asd = "named-read-macros-test"; - }); - systems = [ "named-read-macros-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "named-read-macros" pkgs) (getAttr "uiop" pkgs) ]; - }; - named-readtables = { - pname = "named-readtables"; - version = "20220331-git"; - asds = [ "named-readtables" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/named-readtables/2022-03-31/named-readtables-20220331-git.tgz"; - sha256 = "0gfgxywzbmavy0kpnxav11vz10qfzxwwrpgqaak9sgzg17g8x5yv"; - system = "named-readtables"; - asd = "named-readtables"; - }); - systems = [ "named-readtables" ]; - lispLibs = [ ]; - }; - named-readtables_slash_doc = { - pname = "named-readtables_doc"; - version = "20220331-git"; - asds = [ "named-readtables" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/named-readtables/2022-03-31/named-readtables-20220331-git.tgz"; - sha256 = "0gfgxywzbmavy0kpnxav11vz10qfzxwwrpgqaak9sgzg17g8x5yv"; - system = "named-readtables"; - asd = "named-readtables"; - }); - systems = [ "named-readtables/doc" ]; - lispLibs = [ (getAttr "mgl-pax" pkgs) (getAttr "named-readtables" pkgs) ]; - meta = { - broken = true; - }; - }; - named-readtables_slash_test = { - pname = "named-readtables_test"; - version = "20220331-git"; - asds = [ "named-readtables" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/named-readtables/2022-03-31/named-readtables-20220331-git.tgz"; - sha256 = "0gfgxywzbmavy0kpnxav11vz10qfzxwwrpgqaak9sgzg17g8x5yv"; - system = "named-readtables"; - asd = "named-readtables"; - }); - systems = [ "named-readtables/test" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) (getAttr "try" pkgs) ]; - meta = { - broken = true; - }; - }; - nanovg-blob = { - pname = "nanovg-blob"; - version = "stable-git"; - asds = [ "nanovg-blob" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nanovg-blob/2020-10-16/nanovg-blob-stable-git.tgz"; - sha256 = "1q80inrlfcqqqc912jcskfn667jgq6lcw0jvhk270x5qpj8z2pfj"; - system = "nanovg-blob"; - asd = "nanovg-blob"; - }); - systems = [ "nanovg-blob" ]; - lispLibs = [ (getAttr "bodge-blobs-support" pkgs) (getAttr "glad-blob" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - napa-fft3 = { - pname = "napa-fft3"; - version = "20151218-git"; - asds = [ "napa-fft3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/napa-fft3/2015-12-18/napa-fft3-20151218-git.tgz"; - sha256 = "1hxjf599xgwm28gbryy7q96j9ys6hfszmv0qxpr5698hxnhknscp"; - system = "napa-fft3"; - asd = "napa-fft3"; - }); - systems = [ "napa-fft3" ]; - lispLibs = [ ]; - }; - narrowed-types = { - pname = "narrowed-types"; - version = "20180228-git"; - asds = [ "narrowed-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/narrowed-types/2018-02-28/narrowed-types-20180228-git.tgz"; - sha256 = "03v4jgdysapj3ndg2qij7liqc6n9zb07r5j4k1jhmhpml86jxg4g"; - system = "narrowed-types"; - asd = "narrowed-types"; - }); - systems = [ "narrowed-types" ]; - lispLibs = [ ]; - }; - narrowed-types-test = { - pname = "narrowed-types-test"; - version = "20180228-git"; - asds = [ "narrowed-types-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/narrowed-types/2018-02-28/narrowed-types-20180228-git.tgz"; - sha256 = "03v4jgdysapj3ndg2qij7liqc6n9zb07r5j4k1jhmhpml86jxg4g"; - system = "narrowed-types-test"; - asd = "narrowed-types-test"; - }); - systems = [ "narrowed-types-test" ]; - lispLibs = [ (getAttr "narrowed-types" pkgs) (getAttr "rt" pkgs) ]; - }; - nbd = { - pname = "nbd"; - version = "20211020-git"; - asds = [ "nbd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nbd/2021-10-20/nbd-20211020-git.tgz"; - sha256 = "1p9dpyvlpjm32a2ymhps782dp5pjya5bnky6sb20gf4zyw6r826n"; - system = "nbd"; - asd = "nbd"; - }); - systems = [ "nbd" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "lisp-binary" pkgs) (getAttr "wild-package-inferred-system" pkgs) ]; - }; - nbd_slash_simple-in-memory = { - pname = "nbd_simple-in-memory"; - version = "20211020-git"; - asds = [ "nbd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nbd/2021-10-20/nbd-20211020-git.tgz"; - sha256 = "1p9dpyvlpjm32a2ymhps782dp5pjya5bnky6sb20gf4zyw6r826n"; - system = "nbd"; - asd = "nbd"; - }); - systems = [ "nbd/simple-in-memory" ]; - lispLibs = [ (getAttr "nbd" pkgs) (getAttr "wild-package-inferred-system" pkgs) ]; - meta = { - broken = true; - }; - }; - ncurses-clone-for-lem = { - pname = "ncurses-clone-for-lem"; - version = "20200427-git"; - asds = [ "ncurses-clone-for-lem" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "ncurses-clone-for-lem"; - asd = "ncurses-clone-for-lem"; - }); - systems = [ "ncurses-clone-for-lem" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "lparallel" pkgs) (getAttr "application" pkgs) (getAttr "nsb-cga" pkgs) (getAttr "text-subsystem" pkgs) (getAttr "utility" pkgs) ]; - }; - ndebug = { - pname = "ndebug"; - version = "20221106-git"; - asds = [ "ndebug" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ndebug/2022-11-06/ndebug-20221106-git.tgz"; - sha256 = "0xqy0spn4s7jryzhx0bjnha7bir71wr9vbns8v7dmmj83s3hm7js"; - system = "ndebug"; - asd = "ndebug"; - }); - systems = [ "ndebug" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "dissect" pkgs) (getAttr "trivial-custom-debugger" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - ndebug_slash_tests = { - pname = "ndebug_tests"; - version = "20221106-git"; - asds = [ "ndebug" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ndebug/2022-11-06/ndebug-20221106-git.tgz"; - sha256 = "0xqy0spn4s7jryzhx0bjnha7bir71wr9vbns8v7dmmj83s3hm7js"; - system = "ndebug"; - asd = "ndebug"; - }); - systems = [ "ndebug/tests" ]; - lispLibs = [ (getAttr "lisp-unit2" pkgs) (getAttr "ndebug" pkgs) ]; - meta = { - broken = true; - }; - }; - ndfa = { - pname = "ndfa"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "ndfa" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "ndfa"; - asd = "ndfa"; - }); - systems = [ "ndfa" ]; - lispLibs = [ (getAttr "adjuvant" pkgs) ]; - }; - ndfa-test = { - pname = "ndfa-test"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "ndfa-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "ndfa-test"; - asd = "ndfa-test"; - }); - systems = [ "ndfa-test" ]; - lispLibs = [ (getAttr "adjuvant" pkgs) (getAttr "ndfa" pkgs) (getAttr "scrutiny" pkgs) ]; - }; - neo4cl = { - pname = "neo4cl"; - version = "20220707-git"; - asds = [ "neo4cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/neo4cl/2022-07-07/neo4cl-20220707-git.tgz"; - sha256 = "196c32gh6kq0iqjc4z9sq1hiad77rp6zyrn5fbkmhw1qnznn5p9n"; - system = "neo4cl"; - asd = "neo4cl"; - }); - systems = [ "neo4cl" ]; - lispLibs = [ (getAttr "ieee-floats" pkgs) (getAttr "trivial-utf-8" pkgs) (getAttr "usocket" pkgs) ]; - }; - neo4cl-test = { - pname = "neo4cl-test"; - version = "20220707-git"; - asds = [ "neo4cl-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/neo4cl/2022-07-07/neo4cl-20220707-git.tgz"; - sha256 = "196c32gh6kq0iqjc4z9sq1hiad77rp6zyrn5fbkmhw1qnznn5p9n"; - system = "neo4cl-test"; - asd = "neo4cl-test"; - }); - systems = [ "neo4cl-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "neo4cl" pkgs) ]; - }; - net-telent-date = { - pname = "net-telent-date"; - version = "0.42"; - asds = [ "net-telent-date" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz"; - sha256 = "0vgibf76hy3zy39pix367xnvpwxiqsxvv6w0gqdxprd5ljpb7g2j"; - system = "net-telent-date"; - asd = "net-telent-date"; - }); - systems = [ "net-telent-date" ]; - lispLibs = [ ]; - }; - net_dot_didierverna_dot_asdf-flv = { - pname = "net.didierverna.asdf-flv"; - version = "version-2.1"; - asds = [ "net.didierverna.asdf-flv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz"; - sha256 = "10094avq2whg8j5dnvla5wzqk5h36bx74lxbdbhdchv0wvn5x0g4"; - system = "net.didierverna.asdf-flv"; - asd = "net.didierverna.asdf-flv"; - }); - systems = [ "net.didierverna.asdf-flv" ]; - lispLibs = [ ]; - }; - net_dot_didierverna_dot_clon = { - pname = "net.didierverna.clon"; - version = "clon-1.0b25"; - asds = [ "net.didierverna.clon" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-clon/2021-04-11/clon-1.0b25.tgz"; - sha256 = "0nj47xl2fwj7z31wiaad8dw97fpq3zpwxlgmpvppawz0z3hgf8d0"; - system = "net.didierverna.clon"; - asd = "net.didierverna.clon"; - }); - systems = [ "net.didierverna.clon" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_clon_dot_core" pkgs) (getAttr "net_dot_didierverna_dot_clon_dot_setup" pkgs) ]; - }; - net_dot_didierverna_dot_clon_dot_core = { - pname = "net.didierverna.clon.core"; - version = "clon-1.0b25"; - asds = [ "net.didierverna.clon.core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-clon/2021-04-11/clon-1.0b25.tgz"; - sha256 = "0nj47xl2fwj7z31wiaad8dw97fpq3zpwxlgmpvppawz0z3hgf8d0"; - system = "net.didierverna.clon.core"; - asd = "net.didierverna.clon.core"; - }); - systems = [ "net.didierverna.clon.core" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_clon_dot_setup" pkgs) ]; - }; - net_dot_didierverna_dot_clon_dot_setup = { - pname = "net.didierverna.clon.setup"; - version = "clon-1.0b25"; - asds = [ "net.didierverna.clon.setup" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-clon/2021-04-11/clon-1.0b25.tgz"; - sha256 = "0nj47xl2fwj7z31wiaad8dw97fpq3zpwxlgmpvppawz0z3hgf8d0"; - system = "net.didierverna.clon.setup"; - asd = "net.didierverna.clon.setup"; - }); - systems = [ "net.didierverna.clon.setup" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - net_dot_didierverna_dot_clon_dot_setup_slash_termio = { - pname = "net.didierverna.clon.setup_termio"; - version = "clon-1.0b25"; - asds = [ "net.didierverna.clon.setup" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-clon/2021-04-11/clon-1.0b25.tgz"; - sha256 = "0nj47xl2fwj7z31wiaad8dw97fpq3zpwxlgmpvppawz0z3hgf8d0"; - system = "net.didierverna.clon.setup"; - asd = "net.didierverna.clon.setup"; - }); - systems = [ "net.didierverna.clon.setup/termio" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_clon_dot_setup" pkgs) ]; - meta = { - broken = true; - }; - }; - net_dot_didierverna_dot_declt = { - pname = "net.didierverna.declt"; - version = "4.0b2"; - asds = [ "net.didierverna.declt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/declt/2022-07-07/declt-4.0b2.tgz"; - sha256 = "1xkbf1xqrkmr8na09b0spmrznsx2ml10i9q026zv9mpbsc7gh0i6"; - system = "net.didierverna.declt"; - asd = "net.didierverna.declt"; - }); - systems = [ "net.didierverna.declt" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_declt_dot_core" pkgs) (getAttr "net_dot_didierverna_dot_declt_dot_setup" pkgs) ]; - }; - net_dot_didierverna_dot_declt_dot_assess = { - pname = "net.didierverna.declt.assess"; - version = "4.0b2"; - asds = [ "net.didierverna.declt.assess" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/declt/2022-07-07/declt-4.0b2.tgz"; - sha256 = "1xkbf1xqrkmr8na09b0spmrznsx2ml10i9q026zv9mpbsc7gh0i6"; - system = "net.didierverna.declt.assess"; - asd = "net.didierverna.declt.assess"; - }); - systems = [ "net.didierverna.declt.assess" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_declt_dot_setup" pkgs) ]; - }; - net_dot_didierverna_dot_declt_dot_core = { - pname = "net.didierverna.declt.core"; - version = "4.0b2"; - asds = [ "net.didierverna.declt.core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/declt/2022-07-07/declt-4.0b2.tgz"; - sha256 = "1xkbf1xqrkmr8na09b0spmrznsx2ml10i9q026zv9mpbsc7gh0i6"; - system = "net.didierverna.declt.core"; - asd = "net.didierverna.declt.core"; - }); - systems = [ "net.didierverna.declt.core" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_declt_dot_assess" pkgs) (getAttr "net_dot_didierverna_dot_declt_dot_setup" pkgs) ]; - }; - net_dot_didierverna_dot_declt_dot_setup = { - pname = "net.didierverna.declt.setup"; - version = "4.0b2"; - asds = [ "net.didierverna.declt.setup" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/declt/2022-07-07/declt-4.0b2.tgz"; - sha256 = "1xkbf1xqrkmr8na09b0spmrznsx2ml10i9q026zv9mpbsc7gh0i6"; - system = "net.didierverna.declt.setup"; - asd = "net.didierverna.declt.setup"; - }); - systems = [ "net.didierverna.declt.setup" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - net_dot_didierverna_dot_focus = { - pname = "net.didierverna.focus"; - version = "20170403-git"; - asds = [ "net.didierverna.focus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; - sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc"; - system = "net.didierverna.focus"; - asd = "net.didierverna.focus"; - }); - systems = [ "net.didierverna.focus" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_focus_dot_core" pkgs) (getAttr "net_dot_didierverna_dot_focus_dot_flv" pkgs) (getAttr "net_dot_didierverna_dot_focus_dot_setup" pkgs) ]; - }; - net_dot_didierverna_dot_focus_dot_core = { - pname = "net.didierverna.focus.core"; - version = "20170403-git"; - asds = [ "net.didierverna.focus.core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; - sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc"; - system = "net.didierverna.focus.core"; - asd = "net.didierverna.focus.core"; - }); - systems = [ "net.didierverna.focus.core" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_focus_dot_setup" pkgs) ]; - }; - net_dot_didierverna_dot_focus_dot_demos_dot_quotation = { - pname = "net.didierverna.focus.demos.quotation"; - version = "20170403-git"; - asds = [ "net.didierverna.focus.demos.quotation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; - sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc"; - system = "net.didierverna.focus.demos.quotation"; - asd = "net.didierverna.focus.demos.quotation"; - }); - systems = [ "net.didierverna.focus.demos.quotation" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_focus_dot_flv" pkgs) ]; - }; - net_dot_didierverna_dot_focus_dot_flv = { - pname = "net.didierverna.focus.flv"; - version = "20170403-git"; - asds = [ "net.didierverna.focus.flv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; - sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc"; - system = "net.didierverna.focus.flv"; - asd = "net.didierverna.focus.flv"; - }); - systems = [ "net.didierverna.focus.flv" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_asdf-flv" pkgs) (getAttr "net_dot_didierverna_dot_focus_dot_core" pkgs) (getAttr "net_dot_didierverna_dot_focus_dot_setup" pkgs) ]; - }; - net_dot_didierverna_dot_focus_dot_setup = { - pname = "net.didierverna.focus.setup"; - version = "20170403-git"; - asds = [ "net.didierverna.focus.setup" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; - sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc"; - system = "net.didierverna.focus.setup"; - asd = "net.didierverna.focus.setup"; - }); - systems = [ "net.didierverna.focus.setup" ]; - lispLibs = [ ]; - }; - net_dot_didierverna_dot_focus_dot_setup_slash_flv = { - pname = "net.didierverna.focus.setup_flv"; - version = "20170403-git"; - asds = [ "net.didierverna.focus.setup" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/focus/2017-04-03/focus-20170403-git.tgz"; - sha256 = "0b7nxqlkfi7irdmhsbp15r63c8fcg8q0ahmwmq5cmkf8ffq8dspc"; - system = "net.didierverna.focus.setup"; - asd = "net.didierverna.focus.setup"; - }); - systems = [ "net.didierverna.focus.setup/flv" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_focus_dot_setup" pkgs) ]; - meta = { - broken = true; - }; - }; - net_dot_didierverna_dot_tfm = { - pname = "net.didierverna.tfm"; - version = "20210411-git"; - asds = [ "net.didierverna.tfm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfm/2021-04-11/tfm-20210411-git.tgz"; - sha256 = "1wwphg315zq9213vhi5l8fyrfyzasym3rwf34dxfc5cyhsf0wbi6"; - system = "net.didierverna.tfm"; - asd = "net.didierverna.tfm"; - }); - systems = [ "net.didierverna.tfm" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_tfm_dot_core" pkgs) ]; - }; - net_dot_didierverna_dot_tfm_dot_core = { - pname = "net.didierverna.tfm.core"; - version = "20210411-git"; - asds = [ "net.didierverna.tfm.core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfm/2021-04-11/tfm-20210411-git.tgz"; - sha256 = "1wwphg315zq9213vhi5l8fyrfyzasym3rwf34dxfc5cyhsf0wbi6"; - system = "net.didierverna.tfm.core"; - asd = "net.didierverna.tfm.core"; - }); - systems = [ "net.didierverna.tfm.core" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_tfm_dot_setup" pkgs) ]; - }; - net_dot_didierverna_dot_tfm_dot_setup = { - pname = "net.didierverna.tfm.setup"; - version = "20210411-git"; - asds = [ "net.didierverna.tfm.setup" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfm/2021-04-11/tfm-20210411-git.tgz"; - sha256 = "1wwphg315zq9213vhi5l8fyrfyzasym3rwf34dxfc5cyhsf0wbi6"; - system = "net.didierverna.tfm.setup"; - asd = "net.didierverna.tfm.setup"; - }); - systems = [ "net.didierverna.tfm.setup" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - net_dot_scipolis_dot_graphs = { - pname = "net.scipolis.graphs"; - version = "20210411-git"; - asds = [ "net.scipolis.graphs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/femlisp/2021-04-11/femlisp-20210411-git.tgz"; - sha256 = "08l2x1jq3vfhh8m14wijd8c78n589cy5hd2py2jfj3yfiqyipasa"; - system = "net.scipolis.graphs"; - asd = "net.scipolis.graphs"; - }); - systems = [ "net.scipolis.graphs" ]; - lispLibs = [ (getAttr "femlisp-basic" pkgs) ]; - }; - network-addresses = { - pname = "network-addresses"; - version = "20160628-git"; - asds = [ "network-addresses" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/network-addresses/2016-06-28/network-addresses-20160628-git.tgz"; - sha256 = "0zkyfdvfy9pz08vrgz40qpnqx0y7vf92aarp9dq2wipimnwy8df2"; - system = "network-addresses"; - asd = "network-addresses"; - }); - systems = [ "network-addresses" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - network-addresses-test = { - pname = "network-addresses-test"; - version = "20160628-git"; - asds = [ "network-addresses-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/network-addresses/2016-06-28/network-addresses-20160628-git.tgz"; - sha256 = "0zkyfdvfy9pz08vrgz40qpnqx0y7vf92aarp9dq2wipimnwy8df2"; - system = "network-addresses-test"; - asd = "network-addresses-test"; - }); - systems = [ "network-addresses-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "network-addresses" pkgs) ]; - }; - neural-classifier = { - pname = "neural-classifier"; - version = "20221106-git"; - asds = [ "neural-classifier" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/neural-classifier/2022-11-06/neural-classifier-20221106-git.tgz"; - sha256 = "1d23q1k3i2kbjcrvp0qml2nmmdcr12lrmga3qdrgrvsbdcqarn3c"; - system = "neural-classifier"; - asd = "neural-classifier"; - }); - systems = [ "neural-classifier" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "magicl" pkgs) (getAttr "snakes" pkgs) ]; - }; - neural-classifier_slash_mnist = { - pname = "neural-classifier_mnist"; - version = "20221106-git"; - asds = [ "neural-classifier" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/neural-classifier/2022-11-06/neural-classifier-20221106-git.tgz"; - sha256 = "1d23q1k3i2kbjcrvp0qml2nmmdcr12lrmga3qdrgrvsbdcqarn3c"; - system = "neural-classifier"; - asd = "neural-classifier"; - }); - systems = [ "neural-classifier/mnist" ]; - lispLibs = [ (getAttr "neural-classifier" pkgs) (getAttr "nibbles" pkgs) ]; - meta = { - broken = true; - }; - }; - neural-classifier_slash_tests = { - pname = "neural-classifier_tests"; - version = "20221106-git"; - asds = [ "neural-classifier" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/neural-classifier/2022-11-06/neural-classifier-20221106-git.tgz"; - sha256 = "1d23q1k3i2kbjcrvp0qml2nmmdcr12lrmga3qdrgrvsbdcqarn3c"; - system = "neural-classifier"; - asd = "neural-classifier"; - }); - systems = [ "neural-classifier/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "neural-classifier" pkgs) (getAttr "nibbles" pkgs) ]; - meta = { - broken = true; - }; - }; - new-op = { - pname = "new-op"; - version = "20211230-git"; - asds = [ "new-op" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/new-op/2021-12-30/new-op-20211230-git.tgz"; - sha256 = "10336s6nly62jg08f6mvybg54c797znhxkr3wiaphpxn4i24vaql"; - system = "new-op"; - asd = "new-op"; - }); - systems = [ "new-op" ]; - lispLibs = [ ]; - }; - nfiles = { - pname = "nfiles"; - version = "20221106-git"; - asds = [ "nfiles" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nfiles/2022-11-06/nfiles-20221106-git.tgz"; - sha256 = "088biha7554794vlz0n9h1b4xwfs6k2rfkh034km3lirn73z5vwp"; - system = "nfiles"; - asd = "nfiles"; - }); - systems = [ "nfiles" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "quri" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - nfiles_slash_tests = { - pname = "nfiles_tests"; - version = "20221106-git"; - asds = [ "nfiles" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nfiles/2022-11-06/nfiles-20221106-git.tgz"; - sha256 = "088biha7554794vlz0n9h1b4xwfs6k2rfkh034km3lirn73z5vwp"; - system = "nfiles"; - asd = "nfiles"; - }); - systems = [ "nfiles/tests" ]; - lispLibs = [ (getAttr "lisp-unit2" pkgs) (getAttr "nfiles" pkgs) ]; - meta = { - broken = true; - }; - }; - nhooks = { - pname = "nhooks"; - version = "20221106-git"; - asds = [ "nhooks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nhooks/2022-11-06/nhooks-20221106-git.tgz"; - sha256 = "0dy1jvsrifqck4zhw93s5nhl2ana5yinqr7sqgn0j9r9ic1pw5rj"; - system = "nhooks"; - asd = "nhooks"; - }); - systems = [ "nhooks" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "serapeum" pkgs) ]; - }; - nibbles = { - pname = "nibbles"; - version = "20220331-git"; - asds = [ "nibbles" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nibbles/2022-03-31/nibbles-20220331-git.tgz"; - sha256 = "1idnscdw39zfk4h11x0jm6yjbj7i7l1wl75pd7p4iygc6zcwdi6l"; - system = "nibbles"; - asd = "nibbles"; - }); - systems = [ "nibbles" ]; - lispLibs = [ ]; - }; - nibbles-streams = { - pname = "nibbles-streams"; - version = "20220707-git"; - asds = [ "nibbles-streams" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nibbles-streams/2022-07-07/nibbles-streams-20220707-git.tgz"; - sha256 = "0c5q5rywdrpldmga9kmjfvy3nxba3rbinnrpz93qw921jgb77war"; - system = "nibbles-streams"; - asd = "nibbles-streams"; - }); - systems = [ "nibbles-streams" ]; - lispLibs = [ (getAttr "nibbles" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - nibbles-streams_slash_tests = { - pname = "nibbles-streams_tests"; - version = "20220707-git"; - asds = [ "nibbles-streams" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nibbles-streams/2022-07-07/nibbles-streams-20220707-git.tgz"; - sha256 = "0c5q5rywdrpldmga9kmjfvy3nxba3rbinnrpz93qw921jgb77war"; - system = "nibbles-streams"; - asd = "nibbles-streams"; - }); - systems = [ "nibbles-streams/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "nibbles-streams" pkgs) ]; - meta = { - broken = true; - }; - }; - nibbles_slash_tests = { - pname = "nibbles_tests"; - version = "20220331-git"; - asds = [ "nibbles" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nibbles/2022-03-31/nibbles-20220331-git.tgz"; - sha256 = "1idnscdw39zfk4h11x0jm6yjbj7i7l1wl75pd7p4iygc6zcwdi6l"; - system = "nibbles"; - asd = "nibbles"; - }); - systems = [ "nibbles/tests" ]; - lispLibs = [ (getAttr "nibbles" pkgs) (getAttr "rt" pkgs) ]; - meta = { - broken = true; - }; - }; - nineveh = { - pname = "nineveh"; - version = "release-quicklisp-0a10a846-git"; - asds = [ "nineveh" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nineveh/2019-10-07/nineveh-release-quicklisp-0a10a846-git.tgz"; - sha256 = "0bpdgqc9iz37240ypirpi489pnqpb92i94snyhjbh87i50y4br2l"; - system = "nineveh"; - asd = "nineveh"; - }); - systems = [ "nineveh" ]; - lispLibs = [ (getAttr "cepl" pkgs) (getAttr "cl-soil" pkgs) (getAttr "dendrite_dot_primitives" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "easing" pkgs) (getAttr "livesupport" pkgs) (getAttr "rtg-math_dot_vari" pkgs) (getAttr "with-setf" pkgs) ]; - }; - ningle = { - pname = "ningle"; - version = "20211230-git"; - asds = [ "ningle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ningle/2021-12-30/ningle-20211230-git.tgz"; - sha256 = "0s9nn8ml1j4839rycvdjcbsynkqnhxw1zmrgpjz48smscwdf1f8p"; - system = "ningle"; - asd = "ningle"; - }); - systems = [ "ningle" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "lack-component" pkgs) (getAttr "lack-request" pkgs) (getAttr "lack-response" pkgs) (getAttr "myway" pkgs) ]; - }; - ningle-test = { - pname = "ningle-test"; - version = "20211230-git"; - asds = [ "ningle-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ningle/2021-12-30/ningle-20211230-git.tgz"; - sha256 = "0s9nn8ml1j4839rycvdjcbsynkqnhxw1zmrgpjz48smscwdf1f8p"; - system = "ningle-test"; - asd = "ningle-test"; - }); - systems = [ "ningle-test" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "clack-test" pkgs) (getAttr "drakma" pkgs) (getAttr "ningle" pkgs) (getAttr "prove" pkgs) (getAttr "yason" pkgs) ]; - }; - nkeymaps = { - pname = "nkeymaps"; - version = "20221106-git"; - asds = [ "nkeymaps" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nkeymaps/2022-11-06/nkeymaps-20221106-git.tgz"; - sha256 = "1drq8pdg850z9fmlwyhxxn0k5d438h0i758f5gxzl5xw3x03rb1k"; - system = "nkeymaps"; - asd = "nkeymaps"; - }); - systems = [ "nkeymaps" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fset" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) (getAttr "uiop" pkgs) ]; - }; - nkeymaps_slash_tests = { - pname = "nkeymaps_tests"; - version = "20221106-git"; - asds = [ "nkeymaps" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nkeymaps/2022-11-06/nkeymaps-20221106-git.tgz"; - sha256 = "1drq8pdg850z9fmlwyhxxn0k5d438h0i758f5gxzl5xw3x03rb1k"; - system = "nkeymaps"; - asd = "nkeymaps"; - }); - systems = [ "nkeymaps/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fset" pkgs) (getAttr "lisp-unit2" pkgs) (getAttr "nkeymaps" pkgs) ]; - meta = { - broken = true; - }; - }; - nlopt = { - pname = "nlopt"; - version = "20220707-git"; - asds = [ "nlopt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nlopt/2022-07-07/nlopt-20220707-git.tgz"; - sha256 = "01zw4yx38kc8x3by0m3dw5j87hwb180ggp4njfnzi1qjq1fdczp5"; - system = "nlopt"; - asd = "nlopt"; - }); - systems = [ "nlopt" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - nodgui = { - pname = "nodgui"; - version = "20221106-git"; - asds = [ "nodgui" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nodgui/2022-11-06/nodgui-20221106-git.tgz"; - sha256 = "0h03w7jrf0zj9px9kgk2nqydb5w9qhdjirjgp978vc8v41hz8ciy"; - system = "nodgui"; - asd = "nodgui"; - }); - systems = [ "nodgui" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-colors2" pkgs) (getAttr "cl-jpeg" pkgs) (getAttr "cl-lex" pkgs) (getAttr "cl-ppcre-unicode" pkgs) (getAttr "cl-unicode" pkgs) (getAttr "yacc" pkgs) (getAttr "clunit2" pkgs) (getAttr "named-readtables" pkgs) (getAttr "parse-number" pkgs) ]; - }; - north = { - pname = "north"; - version = "20210411-git"; - asds = [ "north" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/north/2021-04-11/north-20210411-git.tgz"; - sha256 = "1gaa3vcl6fg13kjslrmwgi7736zhi9haza2ghfnz90x5g65qd9l1"; - system = "north"; - asd = "north"; - }); - systems = [ "north" ]; - lispLibs = [ (getAttr "north-drakma" pkgs) ]; - }; - north-core = { - pname = "north-core"; - version = "20210411-git"; - asds = [ "north-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/north/2021-04-11/north-20210411-git.tgz"; - sha256 = "1gaa3vcl6fg13kjslrmwgi7736zhi9haza2ghfnz90x5g65qd9l1"; - system = "north-core"; - asd = "north-core"; - }); - systems = [ "north-core" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "crypto-shortcuts" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "uuid" pkgs) ]; - }; - north-dexador = { - pname = "north-dexador"; - version = "20210411-git"; - asds = [ "north-dexador" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/north/2021-04-11/north-20210411-git.tgz"; - sha256 = "1gaa3vcl6fg13kjslrmwgi7736zhi9haza2ghfnz90x5g65qd9l1"; - system = "north-dexador"; - asd = "north-dexador"; - }); - systems = [ "north-dexador" ]; - lispLibs = [ (getAttr "dexador" pkgs) (getAttr "north-core" pkgs) ]; - }; - north-drakma = { - pname = "north-drakma"; - version = "20210411-git"; - asds = [ "north-drakma" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/north/2021-04-11/north-20210411-git.tgz"; - sha256 = "1gaa3vcl6fg13kjslrmwgi7736zhi9haza2ghfnz90x5g65qd9l1"; - system = "north-drakma"; - asd = "north-drakma"; - }); - systems = [ "north-drakma" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "north-core" pkgs) ]; - }; - north-example = { - pname = "north-example"; - version = "20210411-git"; - asds = [ "north-example" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/north/2021-04-11/north-20210411-git.tgz"; - sha256 = "1gaa3vcl6fg13kjslrmwgi7736zhi9haza2ghfnz90x5g65qd9l1"; - system = "north-example"; - asd = "north-example"; - }); - systems = [ "north-example" ]; - lispLibs = [ (getAttr "clip" pkgs) (getAttr "drakma" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "north" pkgs) ]; - }; - nsb-cga = { - pname = "nsb-cga"; - version = "20200427-git"; - asds = [ "nsb-cga" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "nsb-cga"; - asd = "nsb-cga"; - }); - systems = [ "nsb-cga" ]; - lispLibs = [ (getAttr "cl-reexport" pkgs) ]; - }; - nsort = { - pname = "nsort"; - version = "20150505-git"; - asds = [ "nsort" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nsort/2015-05-05/nsort-20150505-git.tgz"; - sha256 = "1q58slg8pl390av8pv16xb8g9qibgy3pm6vyl1fw75mx37yqkyd3"; - system = "nsort"; - asd = "nsort"; - }); - systems = [ "nsort" ]; - lispLibs = [ (getAttr "prove" pkgs) ]; - }; - nst = { - pname = "nst"; - version = "20210807-git"; - asds = [ "nst" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; - sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; - system = "nst"; - asd = "nst"; - }); - systems = [ "nst" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "org-sampler" pkgs) ]; - }; - nst-manual-tests = { - pname = "nst-manual-tests"; - version = "20210807-git"; - asds = [ "nst-manual-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; - sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; - system = "nst-manual-tests"; - asd = "nst-manual-tests"; - }); - systems = [ "nst-manual-tests" ]; - lispLibs = [ (getAttr "asdf-nst" pkgs) (getAttr "nst" pkgs) (getAttr "nst-selftest-utils" pkgs) ]; - }; - nst-meta-tests = { - pname = "nst-meta-tests"; - version = "20210807-git"; - asds = [ "nst-meta-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; - sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; - system = "nst-meta-tests"; - asd = "nst-meta-tests"; - }); - systems = [ "nst-meta-tests" ]; - lispLibs = [ (getAttr "asdf-nst" pkgs) (getAttr "nst" pkgs) (getAttr "nst-selftest-utils" pkgs) ]; - }; - nst-mop-utils = { - pname = "nst-mop-utils"; - version = "20210807-git"; - asds = [ "nst-mop-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; - sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; - system = "nst-mop-utils"; - asd = "nst-mop-utils"; - }); - systems = [ "nst-mop-utils" ]; - lispLibs = [ (getAttr "nst" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - nst-selftest-utils = { - pname = "nst-selftest-utils"; - version = "20210807-git"; - asds = [ "nst-selftest-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; - sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; - system = "nst-selftest-utils"; - asd = "nst-selftest-utils"; - }); - systems = [ "nst-selftest-utils" ]; - lispLibs = [ (getAttr "nst" pkgs) ]; - }; - nst-simple-tests = { - pname = "nst-simple-tests"; - version = "20210807-git"; - asds = [ "nst-simple-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; - sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; - system = "nst-simple-tests"; - asd = "nst-simple-tests"; - }); - systems = [ "nst-simple-tests" ]; - lispLibs = [ (getAttr "asdf-nst" pkgs) (getAttr "nst" pkgs) (getAttr "nst-selftest-utils" pkgs) ]; - }; - nst-test = { - pname = "nst-test"; - version = "20210807-git"; - asds = [ "nst-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; - sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; - system = "nst-test"; - asd = "nst-test"; - }); - systems = [ "nst-test" ]; - lispLibs = [ (getAttr "asdf-nst" pkgs) (getAttr "nst" pkgs) (getAttr "nst-meta-tests" pkgs) (getAttr "nst-simple-tests" pkgs) ]; - }; - nst-test-jenkins = { - pname = "nst-test-jenkins"; - version = "20210807-git"; - asds = [ "nst-test-jenkins" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-nst/2021-08-07/cl-nst-20210807-git.tgz"; - sha256 = "1hf3r6pqbnd9vsd1i24qmz928kia72hdgmiafiwb6jw1hmj3r6ga"; - system = "nst-test-jenkins"; - asd = "nst-test-jenkins"; - }); - systems = [ "nst-test-jenkins" ]; - lispLibs = [ (getAttr "asdf-nst" pkgs) (getAttr "nst" pkgs) (getAttr "nst-test" pkgs) ]; - }; - nuclblog = { - pname = "nuclblog"; - version = "20140826-git"; - asds = [ "nuclblog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nuclblog/2014-08-26/nuclblog-20140826-git.tgz"; - sha256 = "03ngrxas65l7h9ykyy100arm0imvnrxxyyf809l8iqqv87b3k1hz"; - system = "nuclblog"; - asd = "nuclblog"; - }); - systems = [ "nuclblog" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-markdown" pkgs) (getAttr "cl-store" pkgs) (getAttr "cl-who" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "hunchentoot-auth" pkgs) (getAttr "md5" pkgs) ]; - }; - nuklear-blob = { - pname = "nuklear-blob"; - version = "stable-git"; - asds = [ "nuklear-blob" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nuklear-blob/2020-10-16/nuklear-blob-stable-git.tgz"; - sha256 = "1qqx08sd74ix027p6w35yr0ycp72swy1zzps015hwkiwxsawkncm"; - system = "nuklear-blob"; - asd = "nuklear-blob"; - }); - systems = [ "nuklear-blob" ]; - lispLibs = [ (getAttr "bodge-blobs-support" pkgs) (getAttr "glad-blob" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - nuklear-renderer-blob = { - pname = "nuklear-renderer-blob"; - version = "stable-git"; - asds = [ "nuklear-renderer-blob" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nuklear-renderer-blob/2020-10-16/nuklear-renderer-blob-stable-git.tgz"; - sha256 = "0f73ns9dq02v7ixpbnvrfgp52cjdvmbbbhhfwjyv0ywxx30mrdq4"; - system = "nuklear-renderer-blob"; - asd = "nuklear-renderer-blob"; - }); - systems = [ "nuklear-renderer-blob" ]; - lispLibs = [ (getAttr "bodge-blobs-support" pkgs) (getAttr "glad-blob" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - null-package = { - pname = "null-package"; - version = "20220707-git"; - asds = [ "null-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/null-package/2022-07-07/null-package-20220707-git.tgz"; - sha256 = "1ildain46gw0nfnxdwfvasr5vg1fs93afni3k65sl5imc82g910f"; - system = "null-package"; - asd = "null-package"; - }); - systems = [ "null-package" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "core-reader" pkgs) (getAttr "named-readtables" pkgs) (getAttr "read-as-string" pkgs) ]; - }; - null-package_dot_test = { - pname = "null-package.test"; - version = "20220707-git"; - asds = [ "null-package.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/null-package/2022-07-07/null-package-20220707-git.tgz"; - sha256 = "1ildain46gw0nfnxdwfvasr5vg1fs93afni3k65sl5imc82g910f"; - system = "null-package.test"; - asd = "null-package.test"; - }); - systems = [ "null-package.test" ]; - lispLibs = [ (getAttr "bnf" pkgs) (getAttr "jingoh" pkgs) (getAttr "null-package" pkgs) ]; - }; - num-utils = { - pname = "num-utils"; - version = "20221106-git"; - asds = [ "num-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/numerical-utilities/2022-11-06/numerical-utilities-20221106-git.tgz"; - sha256 = "1dwz8zxhqzi31qp863zj1cn1lgljny14snycb9nk871qs121kmsd"; - system = "num-utils"; - asd = "num-utils"; - }); - systems = [ "num-utils" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "alexandria_plus" pkgs) (getAttr "anaphora" pkgs) (getAttr "array-operations" pkgs) (getAttr "let-plus" pkgs) (getAttr "select" pkgs) ]; - }; - num-utils_slash_tests = { - pname = "num-utils_tests"; - version = "20221106-git"; - asds = [ "num-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/numerical-utilities/2022-11-06/numerical-utilities-20221106-git.tgz"; - sha256 = "1dwz8zxhqzi31qp863zj1cn1lgljny14snycb9nk871qs121kmsd"; - system = "num-utils"; - asd = "num-utils"; - }); - systems = [ "num-utils/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "num-utils" pkgs) (getAttr "select" pkgs) ]; - meta = { - broken = true; - }; - }; - numcl = { - pname = "numcl"; - version = "20221106-git"; - asds = [ "numcl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/numcl/2022-11-06/numcl-20221106-git.tgz"; - sha256 = "1x0j4vx5w3rn18pssfwys3ghfxr2lkkrv37y47144kr890jrcad9"; - system = "numcl"; - asd = "numcl"; - }); - systems = [ "numcl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-randist" pkgs) (getAttr "constantfold" pkgs) (getAttr "float-features" pkgs) (getAttr "function-cache" pkgs) (getAttr "gtype" pkgs) (getAttr "iterate" pkgs) (getAttr "lisp-namespace" pkgs) (getAttr "specialized-function" pkgs) (getAttr "trivia" pkgs) (getAttr "type-r" pkgs) ]; - }; - numcl_dot_test = { - pname = "numcl.test"; - version = "20221106-git"; - asds = [ "numcl.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/numcl/2022-11-06/numcl-20221106-git.tgz"; - sha256 = "1x0j4vx5w3rn18pssfwys3ghfxr2lkkrv37y47144kr890jrcad9"; - system = "numcl.test"; - asd = "numcl.test"; - }); - systems = [ "numcl.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "numcl" pkgs) ]; - }; - numericals = { - pname = "numericals"; - version = "2022.09.0"; - asds = [ "numericals" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/numericals/2022-11-06/numericals-2022.09.0.tgz"; - sha256 = "0hfyd045yq7pr4sh9xgqag67yrvnfia1h8ycnxss244zrziabyci"; - system = "numericals"; - asd = "numericals"; - }); - systems = [ "numericals" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "bmas" pkgs) (getAttr "cl-form-types" pkgs) (getAttr "compiler-macro-notes" pkgs) (getAttr "ctype" pkgs) (getAttr "fiveam" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "iterate" pkgs) (getAttr "lparallel" pkgs) (getAttr "magicl" pkgs) (getAttr "numericals_dot_common" pkgs) (getAttr "policy-cond" pkgs) (getAttr "polymorphic-functions" pkgs) (getAttr "swank" pkgs) (getAttr "specialized-function" pkgs) (getAttr "trivial-coerce" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - numericals_dot_common = { - pname = "numericals.common"; - version = "2022.09.0"; - asds = [ "numericals.common" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/numericals/2022-11-06/numericals-2022.09.0.tgz"; - sha256 = "0hfyd045yq7pr4sh9xgqag67yrvnfia1h8ycnxss244zrziabyci"; - system = "numericals.common"; - asd = "numericals.common"; - }); - systems = [ "numericals.common" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiveam" pkgs) ]; - }; - numericals_slash_benchmarks = { - pname = "numericals_benchmarks"; - version = "2022.09.0"; - asds = [ "numericals" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/numericals/2022-11-06/numericals-2022.09.0.tgz"; - sha256 = "0hfyd045yq7pr4sh9xgqag67yrvnfia1h8ycnxss244zrziabyci"; - system = "numericals"; - asd = "numericals"; - }); - systems = [ "numericals/benchmarks" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ascii-table" pkgs) (getAttr "fiveam" pkgs) (getAttr "jsown-utils" pkgs) (getAttr "numericals" pkgs) (getAttr "py4cl2" pkgs) ]; - meta = { - broken = true; - }; - }; - numpy-file-format = { - pname = "numpy-file-format"; - version = "20210124-git"; - asds = [ "numpy-file-format" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/numpy-file-format/2021-01-24/numpy-file-format-20210124-git.tgz"; - sha256 = "0j7jjcf6k3anvgpm4nf81g6gbhff44v0v9rai7kwm2bm3abzsjfd"; - system = "numpy-file-format"; - asd = "numpy-file-format"; - }); - systems = [ "numpy-file-format" ]; - lispLibs = [ (getAttr "ieee-floats" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - numpy-file-format_slash_tests = { - pname = "numpy-file-format_tests"; - version = "20210124-git"; - asds = [ "numpy-file-format" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/numpy-file-format/2021-01-24/numpy-file-format-20210124-git.tgz"; - sha256 = "0j7jjcf6k3anvgpm4nf81g6gbhff44v0v9rai7kwm2bm3abzsjfd"; - system = "numpy-file-format"; - asd = "numpy-file-format"; - }); - systems = [ "numpy-file-format/tests" ]; - lispLibs = [ (getAttr "numpy-file-format" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - nxt = { - pname = "nxt"; - version = "20150608-git"; - asds = [ "nxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-nxt/2015-06-08/cl-nxt-20150608-git.tgz"; - sha256 = "1r9004ra140i9v2pmxnjv86dix4040jr0rgww2zwk370zxys7h2g"; - system = "nxt"; - asd = "nxt"; - }); - systems = [ "nxt" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "static-vectors" pkgs) ]; - }; - nxt-proxy = { - pname = "nxt-proxy"; - version = "20150608-git"; - asds = [ "nxt-proxy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-nxt/2015-06-08/cl-nxt-20150608-git.tgz"; - sha256 = "1r9004ra140i9v2pmxnjv86dix4040jr0rgww2zwk370zxys7h2g"; - system = "nxt-proxy"; - asd = "nxt-proxy"; - }); - systems = [ "nxt-proxy" ]; - lispLibs = [ (getAttr "nxt" pkgs) (getAttr "usocket" pkgs) ]; - }; - nyaml = { - pname = "nyaml"; - version = "20211230-git"; - asds = [ "nyaml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyaml/2021-12-30/nyaml-20211230-git.tgz"; - sha256 = "1gdsxhgqx9ynzrxwjidgljlkmz35wx83r6gwslxgg4v0g4vix9da"; - system = "nyaml"; - asd = "nyaml"; - }); - systems = [ "nyaml" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "esrap" pkgs) (getAttr "fare-quasiquote" pkgs) (getAttr "fare-quasiquote-extras" pkgs) (getAttr "parse-number" pkgs) (getAttr "trivia" pkgs) ]; - }; - nyaml_slash_test = { - pname = "nyaml_test"; - version = "20211230-git"; - asds = [ "nyaml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyaml/2021-12-30/nyaml-20211230-git.tgz"; - sha256 = "1gdsxhgqx9ynzrxwjidgljlkmz35wx83r6gwslxgg4v0g4vix9da"; - system = "nyaml"; - asd = "nyaml"; - }); - systems = [ "nyaml/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "esrap" pkgs) (getAttr "nyaml" pkgs) (getAttr "parachute" pkgs) (getAttr "split-sequence" pkgs) (getAttr "yason" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt = { - pname = "nyxt"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "calispel" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-containers" pkgs) (getAttr "cl-css" pkgs) (getAttr "cl-custom-hash-table" pkgs) (getAttr "enchant" pkgs) (getAttr "cl-gopher" pkgs) (getAttr "cl-html-diff" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-ppcre-unicode" pkgs) (getAttr "cl-prevalence" pkgs) (getAttr "cl-qrencode" pkgs) (getAttr "str" pkgs) (getAttr "cl-tld" pkgs) (getAttr "closer-mop" pkgs) (getAttr "clss" pkgs) (getAttr "cluffer" pkgs) (getAttr "dexador" pkgs) (getAttr "dissect" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "iolib" pkgs) (getAttr "local-time" pkgs) (getAttr "log4cl" pkgs) (getAttr "lparallel" pkgs) (getAttr "moptilities" pkgs) (getAttr "ndebug" pkgs) (getAttr "nfiles" pkgs) (getAttr "nhooks" pkgs) (getAttr "nkeymaps" pkgs) (getAttr "nyxt-asdf" pkgs) (getAttr "ospm" pkgs) (getAttr "parenscript" pkgs) (getAttr "phos" pkgs) (getAttr "plump" pkgs) (getAttr "py-configparser" pkgs) (getAttr "quri" pkgs) (getAttr "serapeum" pkgs) (getAttr "swank" pkgs) (getAttr "slynk" pkgs) (getAttr "spinneret" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-clipboard" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) (getAttr "trivial-types" pkgs) (getAttr "uiop" pkgs) (getAttr "unix-opts" pkgs) ]; - }; - nyxt-asdf = { - pname = "nyxt-asdf"; - version = "20221106-git"; - asds = [ "nyxt-asdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt-asdf"; - asd = "nyxt-asdf"; - }); - systems = [ "nyxt-asdf" ]; - lispLibs = [ ]; - }; - nyxt-ubuntu-package = { - pname = "nyxt-ubuntu-package"; - version = "20221106-git"; - asds = [ "nyxt-ubuntu-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt-ubuntu-package"; - asd = "nyxt-ubuntu-package"; - }); - systems = [ "nyxt-ubuntu-package" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-cffi-gtk" pkgs) (getAttr "cl-gobject-introspection" pkgs) (getAttr "cl-webkit2" pkgs) (getAttr "linux-packaging" pkgs) (getAttr "nyxt" pkgs) (getAttr "nyxt-asdf" pkgs) (getAttr "wild-package-inferred-system" pkgs) ]; - }; - nyxt_slash_analysis = { - pname = "nyxt_analysis"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/analysis" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "str" pkgs) (getAttr "nyxt-asdf" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_analysis_slash_tests = { - pname = "nyxt_analysis_tests"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/analysis/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "str" pkgs) (getAttr "nyxt-asdf" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_application_slash_tests = { - pname = "nyxt_application_tests"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/application/tests" ]; - lispLibs = [ (getAttr "nyxt" pkgs) (getAttr "nyxt-asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_benchmark = { - pname = "nyxt_benchmark"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/benchmark" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "nyxt" pkgs) (getAttr "nyxt-asdf" pkgs) (getAttr "trivial-benchmark" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_class-star = { - pname = "nyxt_class-star"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/class-star" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "moptilities" pkgs) (getAttr "nyxt-asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_clean-fasls = { - pname = "nyxt_clean-fasls"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/clean-fasls" ]; - lispLibs = [ (getAttr "swank" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_documentation = { - pname = "nyxt_documentation"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/documentation" ]; - lispLibs = [ (getAttr "nyxt" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_download-manager = { - pname = "nyxt_download-manager"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/download-manager" ]; - lispLibs = [ (getAttr "calispel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "str" pkgs) (getAttr "dexador" pkgs) (getAttr "log4cl" pkgs) (getAttr "nyxt-asdf" pkgs) (getAttr "quri" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_gi-gtk = { - pname = "nyxt_gi-gtk"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/gi-gtk" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-cffi-gtk" pkgs) (getAttr "cl-gobject-introspection" pkgs) (getAttr "cl-webkit2" pkgs) (getAttr "nyxt" pkgs) (getAttr "nyxt-asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_gi-gtk-application = { - pname = "nyxt_gi-gtk-application"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/gi-gtk-application" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-cffi-gtk" pkgs) (getAttr "cl-gobject-introspection" pkgs) (getAttr "cl-webkit2" pkgs) (getAttr "nyxt" pkgs) (getAttr "nyxt-asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_gi-gtk_slash_tests = { - pname = "nyxt_gi-gtk_tests"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/gi-gtk/tests" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-cffi-gtk" pkgs) (getAttr "cl-gobject-introspection" pkgs) (getAttr "cl-webkit2" pkgs) (getAttr "nyxt" pkgs) (getAttr "nyxt-asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_gtk = { - pname = "nyxt_gtk"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/gtk" ]; - lispLibs = [ (getAttr "cl-cffi-gtk" pkgs) (getAttr "cl-webkit2" pkgs) (getAttr "nyxt" pkgs) (getAttr "nyxt-asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_gtk-application = { - pname = "nyxt_gtk-application"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/gtk-application" ]; - lispLibs = [ (getAttr "cl-cffi-gtk" pkgs) (getAttr "cl-webkit2" pkgs) (getAttr "nyxt" pkgs) (getAttr "nyxt-asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_history-tree = { - pname = "nyxt_history-tree"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/history-tree" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-custom-hash-table" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "local-time" pkgs) (getAttr "moptilities" pkgs) (getAttr "nyxt-asdf" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_history-tree_slash_tests = { - pname = "nyxt_history-tree_tests"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/history-tree/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-custom-hash-table" pkgs) (getAttr "str" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "local-time" pkgs) (getAttr "moptilities" pkgs) (getAttr "nyxt-asdf" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_password-manager = { - pname = "nyxt_password-manager"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/password-manager" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "str" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "moptilities" pkgs) (getAttr "nyxt-asdf" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivial-clipboard" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_prompter = { - pname = "nyxt_prompter"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/prompter" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "calispel" pkgs) (getAttr "cl-containers" pkgs) (getAttr "str" pkgs) (getAttr "closer-mop" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "lparallel" pkgs) (getAttr "moptilities" pkgs) (getAttr "nyxt-asdf" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_prompter_slash_tests = { - pname = "nyxt_prompter_tests"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/prompter/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "calispel" pkgs) (getAttr "cl-containers" pkgs) (getAttr "str" pkgs) (getAttr "closer-mop" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "lparallel" pkgs) (getAttr "moptilities" pkgs) (getAttr "nyxt-asdf" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivial-package-local-nicknames" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_submodules = { - pname = "nyxt_submodules"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/submodules" ]; - lispLibs = [ (getAttr "nyxt-asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_tests = { - pname = "nyxt_tests"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/tests" ]; - lispLibs = [ (getAttr "nyxt" pkgs) (getAttr "nyxt-asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_text-buffer = { - pname = "nyxt_text-buffer"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/text-buffer" ]; - lispLibs = [ (getAttr "cluffer" pkgs) (getAttr "nyxt-asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_theme = { - pname = "nyxt_theme"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/theme" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-css" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "moptilities" pkgs) (getAttr "nyxt-asdf" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_theme_slash_tests = { - pname = "nyxt_theme_tests"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/theme/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-css" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "moptilities" pkgs) (getAttr "nyxt-asdf" pkgs) (getAttr "serapeum" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_user-interface = { - pname = "nyxt_user-interface"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/user-interface" ]; - lispLibs = [ (getAttr "nyxt-asdf" pkgs) (getAttr "spinneret" pkgs) ]; - meta = { - broken = true; - }; - }; - nyxt_slash_version = { - pname = "nyxt_version"; - version = "20221106-git"; - asds = [ "nyxt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/nyxt/2022-11-06/nyxt-20221106-git.tgz"; - sha256 = "1rxj8gp4a30r0yfcqgysnrnamwzkp25lyqmkjmp1lyzp1jg2kzar"; - system = "nyxt"; - asd = "nyxt"; - }); - systems = [ "nyxt/version" ]; - lispLibs = [ (getAttr "nyxt" pkgs) ]; - meta = { - broken = true; - }; - }; - object-class = { - pname = "object-class"; - version = "1.0"; - asds = [ "object-class" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/object-class/2020-09-25/object-class_1.0.tgz"; - sha256 = "0qagmd2mxbr8b60l0y3jccj0maxjchds96p935pd3q805ry50683"; - system = "object-class"; - asd = "object-class"; - }); - systems = [ "object-class" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "compatible-metaclasses" pkgs) (getAttr "enhanced-find-class" pkgs) ]; - }; - object-class_tests = { - pname = "object-class_tests"; - version = "1.0"; - asds = [ "object-class_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/object-class/2020-09-25/object-class_1.0.tgz"; - sha256 = "0qagmd2mxbr8b60l0y3jccj0maxjchds96p935pd3q805ry50683"; - system = "object-class_tests"; - asd = "object-class_tests"; - }); - systems = [ "object-class_tests" ]; - lispLibs = [ (getAttr "compatible-metaclasses" pkgs) (getAttr "object-class" pkgs) (getAttr "parachute" pkgs) ]; - }; - oclcl = { - pname = "oclcl"; - version = "20190521-git"; - asds = [ "oclcl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz"; - sha256 = "1ccyrv4fknpln5askl8cpnwbp28sikrs6i3dwzm86jwhv272zc8q"; - system = "oclcl"; - asd = "oclcl"; - }); - systems = [ "oclcl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-pattern" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-reexport" pkgs) (getAttr "external-program" pkgs) (getAttr "lisp-namespace" pkgs) (getAttr "osicat" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - oclcl-examples = { - pname = "oclcl-examples"; - version = "20190521-git"; - asds = [ "oclcl-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz"; - sha256 = "1ccyrv4fknpln5askl8cpnwbp28sikrs6i3dwzm86jwhv272zc8q"; - system = "oclcl-examples"; - asd = "oclcl-examples"; - }); - systems = [ "oclcl-examples" ]; - lispLibs = [ (getAttr "cl-oclapi" pkgs) (getAttr "imago" pkgs) (getAttr "oclcl" pkgs) ]; - }; - oclcl-test = { - pname = "oclcl-test"; - version = "20190521-git"; - asds = [ "oclcl-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/oclcl/2019-05-21/oclcl-20190521-git.tgz"; - sha256 = "1ccyrv4fknpln5askl8cpnwbp28sikrs6i3dwzm86jwhv272zc8q"; - system = "oclcl-test"; - asd = "oclcl-test"; - }); - systems = [ "oclcl-test" ]; - lispLibs = [ (getAttr "arrow-macros" pkgs) (getAttr "oclcl" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - ode-blob = { - pname = "ode-blob"; - version = "stable-git"; - asds = [ "ode-blob" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ode-blob/2020-10-16/ode-blob-stable-git.tgz"; - sha256 = "1l2zq27zmivmr6h66kadbh3isnbdmkxvc7wq16wwmsvq23bhpss6"; - system = "ode-blob"; - asd = "ode-blob"; - }); - systems = [ "ode-blob" ]; - lispLibs = [ (getAttr "base-blobs" pkgs) (getAttr "bodge-blobs-support" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - odepack = { - pname = "odepack"; - version = "20200925-git"; - asds = [ "odepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "odepack"; - asd = "odepack"; - }); - systems = [ "odepack" ]; - lispLibs = [ (getAttr "f2cl" pkgs) ]; - }; - odepack_slash_blas-util = { - pname = "odepack_blas-util"; - version = "20200925-git"; - asds = [ "odepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "odepack"; - asd = "odepack"; - }); - systems = [ "odepack/blas-util" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - odepack_slash_lsoda = { - pname = "odepack_lsoda"; - version = "20200925-git"; - asds = [ "odepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "odepack"; - asd = "odepack"; - }); - systems = [ "odepack/lsoda" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - odepack_slash_lsoda-demo = { - pname = "odepack_lsoda-demo"; - version = "20200925-git"; - asds = [ "odepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "odepack"; - asd = "odepack"; - }); - systems = [ "odepack/lsoda-demo" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - odepack_slash_lsodar = { - pname = "odepack_lsodar"; - version = "20200925-git"; - asds = [ "odepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "odepack"; - asd = "odepack"; - }); - systems = [ "odepack/lsodar" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - odepack_slash_lsodar-demo = { - pname = "odepack_lsodar-demo"; - version = "20200925-git"; - asds = [ "odepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "odepack"; - asd = "odepack"; - }); - systems = [ "odepack/lsodar-demo" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - odepack_slash_lsode = { - pname = "odepack_lsode"; - version = "20200925-git"; - asds = [ "odepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "odepack"; - asd = "odepack"; - }); - systems = [ "odepack/lsode" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - odepack_slash_lsode-demo = { - pname = "odepack_lsode-demo"; - version = "20200925-git"; - asds = [ "odepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "odepack"; - asd = "odepack"; - }); - systems = [ "odepack/lsode-demo" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - odepack_slash_lsodi-demo = { - pname = "odepack_lsodi-demo"; - version = "20200925-git"; - asds = [ "odepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "odepack"; - asd = "odepack"; - }); - systems = [ "odepack/lsodi-demo" ]; - lispLibs = [ (getAttr "odepack" pkgs) ]; - meta = { - broken = true; - }; - }; - odepack_slash_lsodkr-demo = { - pname = "odepack_lsodkr-demo"; - version = "20200925-git"; - asds = [ "odepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "odepack"; - asd = "odepack"; - }); - systems = [ "odepack/lsodkr-demo" ]; - lispLibs = [ (getAttr "odepack" pkgs) ]; - meta = { - broken = true; - }; - }; - odepack_slash_lsodpk-demo = { - pname = "odepack_lsodpk-demo"; - version = "20200925-git"; - asds = [ "odepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "odepack"; - asd = "odepack"; - }); - systems = [ "odepack/lsodpk-demo" ]; - lispLibs = [ (getAttr "odepack" pkgs) ]; - meta = { - broken = true; - }; - }; - odepack_slash_lsoibt-demo = { - pname = "odepack_lsoibt-demo"; - version = "20200925-git"; - asds = [ "odepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "odepack"; - asd = "odepack"; - }); - systems = [ "odepack/lsoibt-demo" ]; - lispLibs = [ (getAttr "odepack" pkgs) ]; - meta = { - broken = true; - }; - }; - odepack_slash_package = { - pname = "odepack_package"; - version = "20200925-git"; - asds = [ "odepack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "odepack"; - asd = "odepack"; - }); - systems = [ "odepack/package" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - odesk = { - pname = "odesk"; - version = "20150608-git"; - asds = [ "odesk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-odesk/2015-06-08/cl-odesk-20150608-git.tgz"; - sha256 = "1j5pjq4aw83m1in0l7ljn7jq4ixckg91p4h0lwf420xks3lhi4ka"; - system = "odesk"; - asd = "odesk"; - }); - systems = [ "odesk" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "iterate" pkgs) (getAttr "md5" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - oe-encode = { - pname = "oe-encode"; - version = "20150804-git"; - asds = [ "oe-encode" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/oe-encode/2015-08-04/oe-encode-20150804-git.tgz"; - sha256 = "18hd97509vpg04gaf8lzjr2jfyj3w4ql1ydb5202p2r9k4qpvnj9"; - system = "oe-encode"; - asd = "oe-encode"; - }); - systems = [ "oe-encode" ]; - lispLibs = [ (getAttr "babel" pkgs) ]; - }; - oe-encode-test = { - pname = "oe-encode-test"; - version = "20150804-git"; - asds = [ "oe-encode-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/oe-encode/2015-08-04/oe-encode-20150804-git.tgz"; - sha256 = "18hd97509vpg04gaf8lzjr2jfyj3w4ql1ydb5202p2r9k4qpvnj9"; - system = "oe-encode-test"; - asd = "oe-encode"; - }); - systems = [ "oe-encode-test" ]; - lispLibs = [ (getAttr "clunit" pkgs) (getAttr "oe-encode" pkgs) ]; - }; - olc = { - pname = "olc"; - version = "20220331-git"; - asds = [ "olc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/olc/2022-03-31/olc-20220331-git.tgz"; - sha256 = "02r6w9kfa6v4a12y2azmyjkxbn54r1y18c6a024vq4y6zp20fqnz"; - system = "olc"; - asd = "olc"; - }); - systems = [ "olc" ]; - lispLibs = [ ]; - }; - olc_slash_tests = { - pname = "olc_tests"; - version = "20220331-git"; - asds = [ "olc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/olc/2022-03-31/olc-20220331-git.tgz"; - sha256 = "02r6w9kfa6v4a12y2azmyjkxbn54r1y18c6a024vq4y6zp20fqnz"; - system = "olc"; - asd = "olc"; - }); - systems = [ "olc/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "olc" pkgs) ]; - meta = { - broken = true; - }; - }; - omg = { - pname = "omg"; - version = "20221106-git"; - asds = [ "omg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/omglib/2022-11-06/omglib-20221106-git.tgz"; - sha256 = "0bdzs6ba5bk50512116af4dglfaw1sylcixay2b4f9iw9wddhb7f"; - system = "omg"; - asd = "omg"; - }); - systems = [ "omg" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-jpeg" pkgs) (getAttr "clack" pkgs) (getAttr "find-port" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "inferior-shell" pkgs) (getAttr "media-types" pkgs) (getAttr "osicat" pkgs) (getAttr "pngload" pkgs) (getAttr "skippy" pkgs) (getAttr "swank" pkgs) (getAttr "trivial-utf-8" pkgs) (getAttr "uiop" pkgs) (getAttr "usocket" pkgs) (getAttr "websocket-driver-server" pkgs) ]; - }; - one-more-re-nightmare = { - pname = "one-more-re-nightmare"; - version = "20221106-git"; - asds = [ "one-more-re-nightmare" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/one-more-re-nightmare/2022-11-06/one-more-re-nightmare-20221106-git.tgz"; - sha256 = "0vc0lxvn3anjb63hr26r1l18aw5nbj80w9ja3a32fip6nbwfsrfv"; - system = "one-more-re-nightmare"; - asd = "one-more-re-nightmare"; - }); - systems = [ "one-more-re-nightmare" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "dynamic-mixins" pkgs) (getAttr "esrap" pkgs) (getAttr "stealth-mixin" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-indent" pkgs) ]; - }; - one-more-re-nightmare-simd = { - pname = "one-more-re-nightmare-simd"; - version = "20221106-git"; - asds = [ "one-more-re-nightmare-simd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/one-more-re-nightmare/2022-11-06/one-more-re-nightmare-20221106-git.tgz"; - sha256 = "0vc0lxvn3anjb63hr26r1l18aw5nbj80w9ja3a32fip6nbwfsrfv"; - system = "one-more-re-nightmare-simd"; - asd = "one-more-re-nightmare-simd"; - }); - systems = [ "one-more-re-nightmare-simd" ]; - lispLibs = [ (getAttr "one-more-re-nightmare" pkgs) ]; - }; - one-more-re-nightmare-tests = { - pname = "one-more-re-nightmare-tests"; - version = "20221106-git"; - asds = [ "one-more-re-nightmare-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/one-more-re-nightmare/2022-11-06/one-more-re-nightmare-20221106-git.tgz"; - sha256 = "0vc0lxvn3anjb63hr26r1l18aw5nbj80w9ja3a32fip6nbwfsrfv"; - system = "one-more-re-nightmare-tests"; - asd = "one-more-re-nightmare-tests"; - }); - systems = [ "one-more-re-nightmare-tests" ]; - lispLibs = [ (getAttr "lparallel" pkgs) (getAttr "one-more-re-nightmare" pkgs) (getAttr "parachute" pkgs) ]; - }; - ook = { - pname = "ook"; - version = "20211230-git"; - asds = [ "ook" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ook/2021-12-30/ook-20211230-git.tgz"; - sha256 = "1pa6iak7z5c9260nakipkhb2z9x5gbmyyq4wrhmg7xrrxla67was"; - system = "ook"; - asd = "ook"; - }); - systems = [ "ook" ]; - lispLibs = [ ]; - }; - oook = { - pname = "oook"; - version = "20171130-git"; - asds = [ "oook" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/oook/2017-11-30/oook-20171130-git.tgz"; - sha256 = "0vxw160kbb2b624lc2aqvrx91xnmfhwz8nrzjvmbk5m55q1s4hxr"; - system = "oook"; - asd = "oook"; - }); - systems = [ "oook" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "cl-inflector" pkgs) (getAttr "closer-mop" pkgs) (getAttr "clsql" pkgs) (getAttr "jonathan" pkgs) (getAttr "parse-number" pkgs) (getAttr "semantic-spinneret" pkgs) (getAttr "spinneret" pkgs) ]; - }; - open-geneva = { - pname = "open-geneva"; - version = "20161204-git"; - asds = [ "open-geneva" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/geneva/2016-12-04/geneva-20161204-git.tgz"; - sha256 = "1pw18xkbndqssx6iix8a8zcw8bgjh88jxxxrklkgkghk04bmqxw3"; - system = "open-geneva"; - asd = "open-geneva"; - }); - systems = [ "open-geneva" ]; - lispLibs = [ (getAttr "geneva" pkgs) (getAttr "geneva-cl" pkgs) (getAttr "geneva-html" pkgs) (getAttr "geneva-latex" pkgs) (getAttr "geneva-mk2" pkgs) (getAttr "geneva-plain-text" pkgs) (getAttr "geneva-tex" pkgs) ]; - }; - open-location-code = { - pname = "open-location-code"; - version = "20220331-git"; - asds = [ "open-location-code" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/open-location-code/2022-03-31/open-location-code-20220331-git.tgz"; - sha256 = "1ii8aj9kxxikgafsycy2ngrs9f2zdvmzrhggq7z5cgmi1h0fqg1z"; - system = "open-location-code"; - asd = "open-location-code"; - }); - systems = [ "open-location-code" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) ]; - }; - open-vrp = { - pname = "open-vrp"; - version = "20140914-git"; - asds = [ "open-vrp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/open-vrp/2014-09-14/open-vrp-20140914-git.tgz"; - sha256 = "04k0kp18gpr4cfpsck7pjizawwswh372df4pvm5v87brm6xdw1fr"; - system = "open-vrp"; - asd = "open-vrp"; - }); - systems = [ "open-vrp" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiveam" pkgs) (getAttr "open-vrp-lib" pkgs) (getAttr "vecto" pkgs) ]; - }; - open-vrp-lib = { - pname = "open-vrp-lib"; - version = "20140914-git"; - asds = [ "open-vrp-lib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/open-vrp/2014-09-14/open-vrp-20140914-git.tgz"; - sha256 = "04k0kp18gpr4cfpsck7pjizawwswh372df4pvm5v87brm6xdw1fr"; - system = "open-vrp-lib"; - asd = "open-vrp-lib"; - }); - systems = [ "open-vrp-lib" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "fiveam" pkgs) (getAttr "vecto" pkgs) ]; - }; - openal-blob = { - pname = "openal-blob"; - version = "stable-git"; - asds = [ "openal-blob" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/openal-blob/2020-10-16/openal-blob-stable-git.tgz"; - sha256 = "0bspdqb0xbvwvi6xkn88n4jswpds8fzbgj44ygm7mi6lpwp7lmv2"; - system = "openal-blob"; - asd = "openal-blob"; - }); - systems = [ "openal-blob" ]; - lispLibs = [ (getAttr "base-blobs" pkgs) (getAttr "bodge-blobs-support" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - openapi-parser = { - pname = "openapi-parser"; - version = "20210630-git"; - asds = [ "openapi-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-openapi-parser/2021-06-30/cl-openapi-parser-20210630-git.tgz"; - sha256 = "0s1h4pfjfl7rkxyc27p2w7f3s88fn133nj0wqbh897h5jz13rkmg"; - system = "openapi-parser"; - asd = "openapi-parser"; - }); - systems = [ "openapi-parser" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-change-case" pkgs) (getAttr "cl-package-locks" pkgs) (getAttr "str" pkgs) (getAttr "cl-yaml" pkgs) (getAttr "closer-mop" pkgs) (getAttr "esrap" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - openapi-parser-tests = { - pname = "openapi-parser-tests"; - version = "20210630-git"; - asds = [ "openapi-parser-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-openapi-parser/2021-06-30/cl-openapi-parser-20210630-git.tgz"; - sha256 = "0s1h4pfjfl7rkxyc27p2w7f3s88fn133nj0wqbh897h5jz13rkmg"; - system = "openapi-parser-tests"; - asd = "openapi-parser"; - }); - systems = [ "openapi-parser-tests" ]; - lispLibs = [ (getAttr "openapi-parser" pkgs) (getAttr "rove" pkgs) ]; - }; - openid-key = { - pname = "openid-key"; - version = "20181210-git"; - asds = [ "openid-key" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/openid-key/2018-12-10/openid-key-20181210-git.tgz"; - sha256 = "0ja1g4f8nrcn965376j7lnhha9krx4wjqxrg6vc57k7rmkhkzm1z"; - system = "openid-key"; - asd = "openid-key"; - }); - systems = [ "openid-key" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "dexador" pkgs) (getAttr "ironclad" pkgs) (getAttr "jonathan" pkgs) (getAttr "local-time" pkgs) (getAttr "quri" pkgs) (getAttr "trivial-rfc-1123" pkgs) ]; - }; - openid-key-test = { - pname = "openid-key-test"; - version = "20181210-git"; - asds = [ "openid-key-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/openid-key/2018-12-10/openid-key-20181210-git.tgz"; - sha256 = "0ja1g4f8nrcn965376j7lnhha9krx4wjqxrg6vc57k7rmkhkzm1z"; - system = "openid-key-test"; - asd = "openid-key-test"; - }); - systems = [ "openid-key-test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "openid-key" pkgs) ]; - }; - ops-test = { - pname = "ops-test"; - version = "20211020-git"; - asds = [ "ops-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; - sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4"; - system = "ops-test"; - asd = "ops-test"; - }); - systems = [ "ops-test" ]; - lispLibs = [ (getAttr "png" pkgs) ]; - }; - ops5 = { - pname = "ops5"; - version = "20200218-git"; - asds = [ "ops5" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ops5/2020-02-18/ops5-20200218-git.tgz"; - sha256 = "1q2mrza40qvhny06f4ks2dghyk8a7pjjsi3vj83b9if7fmyj152a"; - system = "ops5"; - asd = "ops5"; - }); - systems = [ "ops5" ]; - lispLibs = [ ]; - }; - opticl = { - pname = "opticl"; - version = "20220220-git"; - asds = [ "opticl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/opticl/2022-02-20/opticl-20220220-git.tgz"; - sha256 = "1jx9n78d4lf53iz24yid34l92zrpqxfihv6049ixcy0xigf7j4ac"; - system = "opticl"; - asd = "opticl"; - }); - systems = [ "opticl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-jpeg" pkgs) (getAttr "cl-tga" pkgs) (getAttr "opticl-core" pkgs) (getAttr "pngload" pkgs) (getAttr "retrospectiff" pkgs) (getAttr "skippy" pkgs) (getAttr "zpng" pkgs) ]; - }; - opticl-core = { - pname = "opticl-core"; - version = "20171019-git"; - asds = [ "opticl-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/opticl-core/2017-10-19/opticl-core-20171019-git.tgz"; - sha256 = "0458bllabcdjghfrqx6aki49c9qmvfmkk8jl75cfpi7q0i12kh95"; - system = "opticl-core"; - asd = "opticl-core"; - }); - systems = [ "opticl-core" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - opticl-doc = { - pname = "opticl-doc"; - version = "20220220-git"; - asds = [ "opticl-doc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/opticl/2022-02-20/opticl-20220220-git.tgz"; - sha256 = "1jx9n78d4lf53iz24yid34l92zrpqxfihv6049ixcy0xigf7j4ac"; - system = "opticl-doc"; - asd = "opticl-doc"; - }); - systems = [ "opticl-doc" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-containers" pkgs) (getAttr "cl-markdown" pkgs) (getAttr "opticl" pkgs) ]; - }; - opticl_slash_test = { - pname = "opticl_test"; - version = "20220220-git"; - asds = [ "opticl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/opticl/2022-02-20/opticl-20220220-git.tgz"; - sha256 = "1jx9n78d4lf53iz24yid34l92zrpqxfihv6049ixcy0xigf7j4ac"; - system = "opticl"; - asd = "opticl"; - }); - systems = [ "opticl/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "opticl" pkgs) ]; - meta = { - broken = true; - }; - }; - optima = { - pname = "optima"; - version = "20150709-git"; - asds = [ "optima" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz"; - sha256 = "1yw4ymq7ms89342kkvb3aqxgv0w38m9kd8ikdqxxzyybnkjhndal"; - system = "optima"; - asd = "optima"; - }); - systems = [ "optima" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) ]; - }; - optima_dot_ppcre = { - pname = "optima.ppcre"; - version = "20150709-git"; - asds = [ "optima.ppcre" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz"; - sha256 = "1yw4ymq7ms89342kkvb3aqxgv0w38m9kd8ikdqxxzyybnkjhndal"; - system = "optima.ppcre"; - asd = "optima.ppcre"; - }); - systems = [ "optima.ppcre" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "optima" pkgs) ]; - }; - optima_dot_test = { - pname = "optima.test"; - version = "20150709-git"; - asds = [ "optima.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz"; - sha256 = "1yw4ymq7ms89342kkvb3aqxgv0w38m9kd8ikdqxxzyybnkjhndal"; - system = "optima.test"; - asd = "optima.test"; - }); - systems = [ "optima.test" ]; - lispLibs = [ (getAttr "eos" pkgs) (getAttr "optima" pkgs) (getAttr "optima_dot_ppcre" pkgs) ]; - }; - or-cluster = { - pname = "or-cluster"; - version = "20170403-git"; - asds = [ "or-cluster" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; - sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7"; - system = "or-cluster"; - asd = "or-cluster"; - }); - systems = [ "or-cluster" ]; - lispLibs = [ (getAttr "cl-opsresearch" pkgs) (getAttr "drakma" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - or-fann = { - pname = "or-fann"; - version = "20170403-git"; - asds = [ "or-fann" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; - sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7"; - system = "or-fann"; - asd = "or-fann"; - }); - systems = [ "or-fann" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-opsresearch" pkgs) ]; - }; - or-glpk = { - pname = "or-glpk"; - version = "20170403-git"; - asds = [ "or-glpk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; - sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7"; - system = "or-glpk"; - asd = "or-glpk"; - }); - systems = [ "or-glpk" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-opsresearch" pkgs) ]; - }; - or-gsl = { - pname = "or-gsl"; - version = "20170403-git"; - asds = [ "or-gsl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; - sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7"; - system = "or-gsl"; - asd = "or-gsl"; - }); - systems = [ "or-gsl" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-opsresearch" pkgs) ]; - }; - or-test = { - pname = "or-test"; - version = "20170403-git"; - asds = [ "or-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-opsresearch/2017-04-03/cl-opsresearch-20170403-git.tgz"; - sha256 = "1fipw6qjggswzcg8ifwx5qnhnc7mmi53s6h14l0vzj6afa5rdpm7"; - system = "or-test"; - asd = "or-test"; - }); - systems = [ "or-test" ]; - lispLibs = [ (getAttr "cl-opsresearch" pkgs) (getAttr "or-fann" pkgs) (getAttr "or-glpk" pkgs) (getAttr "or-gsl" pkgs) (getAttr "fiveam" pkgs) ]; - }; - org-davep-dict = { - pname = "org-davep-dict"; - version = "20190521-git"; - asds = [ "org-davep-dict" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/org-davep-dict/2019-05-21/org-davep-dict-20190521-git.tgz"; - sha256 = "09dryqlprssrw0jpcg2313cc1hmlsasxvp1rs5z7axhasc16kl31"; - system = "org-davep-dict"; - asd = "org-davep-dict"; - }); - systems = [ "org-davep-dict" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "acl-compat" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - org-davep-dictrepl = { - pname = "org-davep-dictrepl"; - version = "20190521-git"; - asds = [ "org-davep-dictrepl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/org-davep-dictrepl/2019-05-21/org-davep-dictrepl-20190521-git.tgz"; - sha256 = "1s461asil8cxsbcpyxsw3g7phdn5c3mwv6wswp86hsxiga5hi327"; - system = "org-davep-dictrepl"; - asd = "org-davep-dictrepl"; - }); - systems = [ "org-davep-dictrepl" ]; - lispLibs = [ (getAttr "org-davep-dict" pkgs) ]; - }; - org-sampler = { - pname = "org-sampler"; - version = "0.2.0"; - asds = [ "org-sampler" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/org-sampler/2016-03-18/org-sampler-0.2.0.tgz"; - sha256 = "1j2i24x9afxp6s5gyqlvy11c0lq9rzhmdj1bf0qpxcaa4znj48c3"; - system = "org-sampler"; - asd = "org-sampler"; - }); - systems = [ "org-sampler" ]; - lispLibs = [ (getAttr "iterate" pkgs) ]; - }; - org_dot_melusina_dot_confidence = { - pname = "org.melusina.confidence"; - version = "20221106-git"; - asds = [ "org.melusina.confidence" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-confidence/2022-11-06/cl-confidence-20221106-git.tgz"; - sha256 = "17xb8k53ncpp7h8b5g9y56cg5imrczxx8zpr5xkslrvlsb551i1q"; - system = "org.melusina.confidence"; - asd = "org.melusina.confidence"; - }); - systems = [ "org.melusina.confidence" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - org_dot_melusina_dot_confidence_slash_testsuite = { - pname = "org.melusina.confidence_testsuite"; - version = "20221106-git"; - asds = [ "org.melusina.confidence" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-confidence/2022-11-06/cl-confidence-20221106-git.tgz"; - sha256 = "17xb8k53ncpp7h8b5g9y56cg5imrczxx8zpr5xkslrvlsb551i1q"; - system = "org.melusina.confidence"; - asd = "org.melusina.confidence"; - }); - systems = [ "org.melusina.confidence/testsuite" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "org_dot_melusina_dot_confidence" pkgs) ]; - meta = { - broken = true; - }; - }; - org_dot_melusina_dot_rashell = { - pname = "org.melusina.rashell"; - version = "20220707-git"; - asds = [ "org.melusina.rashell" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rashell/2022-07-07/cl-rashell-20220707-git.tgz"; - sha256 = "1g99ymyl61sn62rn9sq9cznx67ydz34dvm2x5b0ljd6p503j1wp9"; - system = "org.melusina.rashell"; - asd = "org.melusina.rashell"; - }); - systems = [ "org.melusina.rashell" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "parse-float" pkgs) ]; - }; - org_dot_melusina_dot_rashell_slash_testsuite = { - pname = "org.melusina.rashell_testsuite"; - version = "20220707-git"; - asds = [ "org.melusina.rashell" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rashell/2022-07-07/cl-rashell-20220707-git.tgz"; - sha256 = "1g99ymyl61sn62rn9sq9cznx67ydz34dvm2x5b0ljd6p503j1wp9"; - system = "org.melusina.rashell"; - asd = "org.melusina.rashell"; - }); - systems = [ "org.melusina.rashell/testsuite" ]; - lispLibs = [ (getAttr "org_dot_melusina_dot_confidence" pkgs) (getAttr "org_dot_melusina_dot_rashell" pkgs) ]; - meta = { - broken = true; - }; - }; - org_dot_tfeb_dot_conduit-packages = { - pname = "org.tfeb.conduit-packages"; - version = "20221106-git"; - asds = [ "org.tfeb.conduit-packages" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/conduit-packages/2022-11-06/conduit-packages-20221106-git.tgz"; - sha256 = "16mqbwwgpx4k462cnh59j184530dcsr1cbps0jjh0v0yfamyvnqk"; - system = "org.tfeb.conduit-packages"; - asd = "org.tfeb.conduit-packages"; - }); - systems = [ "org.tfeb.conduit-packages" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_dsm = { - pname = "org.tfeb.dsm"; - version = "20221106-git"; - asds = [ "org.tfeb.dsm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dsm/2022-11-06/dsm-20221106-git.tgz"; - sha256 = "0xxlv8l7fa5mp8qfvh94ndjm4rz89xjs0xj4sni30f2vnzqsyfij"; - system = "org.tfeb.dsm"; - asd = "org.tfeb.dsm"; - }); - systems = [ "org.tfeb.dsm" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_collecting" pkgs) (getAttr "org_dot_tfeb_dot_hax_dot_iterate" pkgs) (getAttr "org_dot_tfeb_dot_hax_dot_simple-loops" pkgs) (getAttr "org_dot_tfeb_dot_hax_dot_spam" pkgs) (getAttr "org_dot_tfeb_dot_hax_dot_utilities" pkgs) (getAttr "org_dot_tfeb_dot_tools_dot_require-module" pkgs) ]; - }; - org_dot_tfeb_dot_dsm_slash_bench = { - pname = "org.tfeb.dsm_bench"; - version = "20221106-git"; - asds = [ "org.tfeb.dsm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dsm/2022-11-06/dsm-20221106-git.tgz"; - sha256 = "0xxlv8l7fa5mp8qfvh94ndjm4rz89xjs0xj4sni30f2vnzqsyfij"; - system = "org.tfeb.dsm"; - asd = "org.tfeb.dsm"; - }); - systems = [ "org.tfeb.dsm/bench" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_dsm" pkgs) ]; - meta = { - broken = true; - }; - }; - org_dot_tfeb_dot_dsm_slash_test = { - pname = "org.tfeb.dsm_test"; - version = "20221106-git"; - asds = [ "org.tfeb.dsm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/dsm/2022-11-06/dsm-20221106-git.tgz"; - sha256 = "0xxlv8l7fa5mp8qfvh94ndjm4rz89xjs0xj4sni30f2vnzqsyfij"; - system = "org.tfeb.dsm"; - asd = "org.tfeb.dsm"; - }); - systems = [ "org.tfeb.dsm/test" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_dsm" pkgs) (getAttr "parachute" pkgs) ]; - meta = { - broken = true; - }; - }; - org_dot_tfeb_dot_hax = { - pname = "org.tfeb.hax"; - version = "20221106-git"; - asds = [ "org.tfeb.hax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax"; - asd = "org.tfeb.hax"; - }); - systems = [ "org.tfeb.hax" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - org_dot_tfeb_dot_hax_dot_abstract-classes = { - pname = "org.tfeb.hax.abstract-classes"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.abstract-classes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.abstract-classes"; - asd = "org.tfeb.hax.abstract-classes"; - }); - systems = [ "org.tfeb.hax.abstract-classes" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - org_dot_tfeb_dot_hax_dot_binding = { - pname = "org.tfeb.hax.binding"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.binding" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.binding"; - asd = "org.tfeb.hax.binding"; - }); - systems = [ "org.tfeb.hax.binding" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_collecting" pkgs) (getAttr "org_dot_tfeb_dot_hax_dot_iterate" pkgs) ]; - }; - org_dot_tfeb_dot_hax_dot_collecting = { - pname = "org.tfeb.hax.collecting"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.collecting" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.collecting"; - asd = "org.tfeb.hax.collecting"; - }); - systems = [ "org.tfeb.hax.collecting" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_hax_dot_comment-form = { - pname = "org.tfeb.hax.comment-form"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.comment-form" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.comment-form"; - asd = "org.tfeb.hax.comment-form"; - }); - systems = [ "org.tfeb.hax.comment-form" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_hax_dot_cs-forms = { - pname = "org.tfeb.hax.cs-forms"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.cs-forms" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.cs-forms"; - asd = "org.tfeb.hax.cs-forms"; - }); - systems = [ "org.tfeb.hax.cs-forms" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_hax_dot_define-functions = { - pname = "org.tfeb.hax.define-functions"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.define-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.define-functions"; - asd = "org.tfeb.hax.define-functions"; - }); - systems = [ "org.tfeb.hax.define-functions" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_hax_dot_dynamic-state = { - pname = "org.tfeb.hax.dynamic-state"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.dynamic-state" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.dynamic-state"; - asd = "org.tfeb.hax.dynamic-state"; - }); - systems = [ "org.tfeb.hax.dynamic-state" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_hax_dot_iterate = { - pname = "org.tfeb.hax.iterate"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.iterate" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.iterate"; - asd = "org.tfeb.hax.iterate"; - }); - systems = [ "org.tfeb.hax.iterate" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_hax_dot_memoize = { - pname = "org.tfeb.hax.memoize"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.memoize" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.memoize"; - asd = "org.tfeb.hax.memoize"; - }); - systems = [ "org.tfeb.hax.memoize" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_hax_dot_metatronic = { - pname = "org.tfeb.hax.metatronic"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.metatronic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.metatronic"; - asd = "org.tfeb.hax.metatronic"; - }); - systems = [ "org.tfeb.hax.metatronic" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_utilities" pkgs) ]; - }; - org_dot_tfeb_dot_hax_dot_object-accessors = { - pname = "org.tfeb.hax.object-accessors"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.object-accessors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.object-accessors"; - asd = "org.tfeb.hax.object-accessors"; - }); - systems = [ "org.tfeb.hax.object-accessors" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_hax_dot_read-package = { - pname = "org.tfeb.hax.read-package"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.read-package" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.read-package"; - asd = "org.tfeb.hax.read-package"; - }); - systems = [ "org.tfeb.hax.read-package" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_hax_dot_simple-loops = { - pname = "org.tfeb.hax.simple-loops"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.simple-loops" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.simple-loops"; - asd = "org.tfeb.hax.simple-loops"; - }); - systems = [ "org.tfeb.hax.simple-loops" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_collecting" pkgs) (getAttr "org_dot_tfeb_dot_hax_dot_iterate" pkgs) (getAttr "org_dot_tfeb_dot_hax_dot_utilities" pkgs) ]; - }; - org_dot_tfeb_dot_hax_dot_singleton-classes = { - pname = "org.tfeb.hax.singleton-classes"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.singleton-classes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.singleton-classes"; - asd = "org.tfeb.hax.singleton-classes"; - }); - systems = [ "org.tfeb.hax.singleton-classes" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - org_dot_tfeb_dot_hax_dot_slog = { - pname = "org.tfeb.hax.slog"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.slog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.slog"; - asd = "org.tfeb.hax.slog"; - }); - systems = [ "org.tfeb.hax.slog" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_collecting" pkgs) (getAttr "org_dot_tfeb_dot_hax_dot_metatronic" pkgs) (getAttr "org_dot_tfeb_dot_hax_dot_simple-loops" pkgs) (getAttr "org_dot_tfeb_dot_hax_dot_spam" pkgs) ]; - }; - org_dot_tfeb_dot_hax_dot_spam = { - pname = "org.tfeb.hax.spam"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.spam" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.spam"; - asd = "org.tfeb.hax.spam"; - }); - systems = [ "org.tfeb.hax.spam" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_simple-loops" pkgs) ]; - }; - org_dot_tfeb_dot_hax_dot_stringtable = { - pname = "org.tfeb.hax.stringtable"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.stringtable" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.stringtable"; - asd = "org.tfeb.hax.stringtable"; - }); - systems = [ "org.tfeb.hax.stringtable" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_collecting" pkgs) (getAttr "org_dot_tfeb_dot_hax_dot_iterate" pkgs) ]; - }; - org_dot_tfeb_dot_hax_dot_trace-macroexpand = { - pname = "org.tfeb.hax.trace-macroexpand"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.trace-macroexpand" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.trace-macroexpand"; - asd = "org.tfeb.hax.trace-macroexpand"; - }); - systems = [ "org.tfeb.hax.trace-macroexpand" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_hax_dot_utilities = { - pname = "org.tfeb.hax.utilities"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.utilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.utilities"; - asd = "org.tfeb.hax.utilities"; - }); - systems = [ "org.tfeb.hax.utilities" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_hax_dot_collecting" pkgs) (getAttr "org_dot_tfeb_dot_hax_dot_iterate" pkgs) ]; - }; - org_dot_tfeb_dot_hax_dot_wrapping-standard = { - pname = "org.tfeb.hax.wrapping-standard"; - version = "20221106-git"; - asds = [ "org.tfeb.hax.wrapping-standard" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax.wrapping-standard"; - asd = "org.tfeb.hax.wrapping-standard"; - }); - systems = [ "org.tfeb.hax.wrapping-standard" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_hax_slash_test = { - pname = "org.tfeb.hax_test"; - version = "20221106-git"; - asds = [ "org.tfeb.hax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-hax/2022-11-06/tfeb-lisp-hax-20221106-git.tgz"; - sha256 = "0l36jlril1ypx1866dmsk7czlc61rj2i9yn97qaapwxbqhf7ypxp"; - system = "org.tfeb.hax"; - asd = "org.tfeb.hax"; - }); - systems = [ "org.tfeb.hax/test" ]; - lispLibs = [ (getAttr "parachute" pkgs) (getAttr "org_dot_tfeb_dot_hax" pkgs) ]; - meta = { - broken = true; - }; - }; - org_dot_tfeb_dot_tools = { - pname = "org.tfeb.tools"; - version = "20221106-git"; - asds = [ "org.tfeb.tools" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2022-11-06/tfeb-lisp-tools-20221106-git.tgz"; - sha256 = "0c2fsp6faha741h5ppdm69vhvrwk1lzxlng030jxl1gam846h7c0"; - system = "org.tfeb.tools"; - asd = "org.tfeb.tools"; - }); - systems = [ "org.tfeb.tools" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_tools_dot_asdf-module-sysdcls = { - pname = "org.tfeb.tools.asdf-module-sysdcls"; - version = "20221106-git"; - asds = [ "org.tfeb.tools.asdf-module-sysdcls" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2022-11-06/tfeb-lisp-tools-20221106-git.tgz"; - sha256 = "0c2fsp6faha741h5ppdm69vhvrwk1lzxlng030jxl1gam846h7c0"; - system = "org.tfeb.tools.asdf-module-sysdcls"; - asd = "org.tfeb.tools.asdf-module-sysdcls"; - }); - systems = [ "org.tfeb.tools.asdf-module-sysdcls" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_tools_dot_build-modules = { - pname = "org.tfeb.tools.build-modules"; - version = "20221106-git"; - asds = [ "org.tfeb.tools.build-modules" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2022-11-06/tfeb-lisp-tools-20221106-git.tgz"; - sha256 = "0c2fsp6faha741h5ppdm69vhvrwk1lzxlng030jxl1gam846h7c0"; - system = "org.tfeb.tools.build-modules"; - asd = "org.tfeb.tools.build-modules"; - }); - systems = [ "org.tfeb.tools.build-modules" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_tools_dot_require-module" pkgs) ]; - }; - org_dot_tfeb_dot_tools_dot_deprecations = { - pname = "org.tfeb.tools.deprecations"; - version = "20221106-git"; - asds = [ "org.tfeb.tools.deprecations" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2022-11-06/tfeb-lisp-tools-20221106-git.tgz"; - sha256 = "0c2fsp6faha741h5ppdm69vhvrwk1lzxlng030jxl1gam846h7c0"; - system = "org.tfeb.tools.deprecations"; - asd = "org.tfeb.tools.deprecations"; - }); - systems = [ "org.tfeb.tools.deprecations" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_tools_dot_feature-expressions = { - pname = "org.tfeb.tools.feature-expressions"; - version = "20221106-git"; - asds = [ "org.tfeb.tools.feature-expressions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2022-11-06/tfeb-lisp-tools-20221106-git.tgz"; - sha256 = "0c2fsp6faha741h5ppdm69vhvrwk1lzxlng030jxl1gam846h7c0"; - system = "org.tfeb.tools.feature-expressions"; - asd = "org.tfeb.tools.feature-expressions"; - }); - systems = [ "org.tfeb.tools.feature-expressions" ]; - lispLibs = [ ]; - }; - org_dot_tfeb_dot_tools_dot_install-providers = { - pname = "org.tfeb.tools.install-providers"; - version = "20221106-git"; - asds = [ "org.tfeb.tools.install-providers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2022-11-06/tfeb-lisp-tools-20221106-git.tgz"; - sha256 = "0c2fsp6faha741h5ppdm69vhvrwk1lzxlng030jxl1gam846h7c0"; - system = "org.tfeb.tools.install-providers"; - asd = "org.tfeb.tools.install-providers"; - }); - systems = [ "org.tfeb.tools.install-providers" ]; - lispLibs = [ (getAttr "org_dot_tfeb_dot_tools_dot_require-module" pkgs) ]; - }; - org_dot_tfeb_dot_tools_dot_require-module = { - pname = "org.tfeb.tools.require-module"; - version = "20221106-git"; - asds = [ "org.tfeb.tools.require-module" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tfeb-lisp-tools/2022-11-06/tfeb-lisp-tools-20221106-git.tgz"; - sha256 = "0c2fsp6faha741h5ppdm69vhvrwk1lzxlng030jxl1gam846h7c0"; - system = "org.tfeb.tools.require-module"; - asd = "org.tfeb.tools.require-module"; - }); - systems = [ "org.tfeb.tools.require-module" ]; - lispLibs = [ ]; - }; - origin = { - pname = "origin"; - version = "20220707-git"; - asds = [ "origin" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/origin/2022-07-07/origin-20220707-git.tgz"; - sha256 = "01b5rn83w85fnd92x5jgan2a092y7ir420r55p2b0a98xpvb4a71"; - system = "origin"; - asd = "origin"; - }); - systems = [ "origin" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) ]; - }; - origin_dot_test = { - pname = "origin.test"; - version = "20220707-git"; - asds = [ "origin.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/origin/2022-07-07/origin-20220707-git.tgz"; - sha256 = "01b5rn83w85fnd92x5jgan2a092y7ir420r55p2b0a98xpvb4a71"; - system = "origin.test"; - asd = "origin.test"; - }); - systems = [ "origin.test" ]; - lispLibs = [ (getAttr "origin" pkgs) (getAttr "parachute" pkgs) ]; - }; - orizuru-orm = { - pname = "orizuru-orm"; - version = "20210228-git"; - asds = [ "orizuru-orm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/orizuru-orm/2021-02-28/orizuru-orm-20210228-git.tgz"; - sha256 = "0hx1qny188a1h40ns63sr291bw7fc0nmgic3mka3gnar8l6karbr"; - system = "orizuru-orm"; - asd = "orizuru-orm"; - }); - systems = [ "orizuru-orm" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "dbi" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre-unicode" pkgs) (getAttr "clos-fixtures" pkgs) (getAttr "closer-mop" pkgs) (getAttr "clunit2" pkgs) (getAttr "iterate" pkgs) (getAttr "local-time" pkgs) (getAttr "sxql" pkgs) (getAttr "uiop" pkgs) ]; - }; - osc = { - pname = "osc"; - version = "20221106-git"; - asds = [ "osc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/osc/2022-11-06/osc-20221106-git.tgz"; - sha256 = "05whbssv32f25vy2krklgg73k8yw9ck99pdha436kpkimr2rpqrf"; - system = "osc"; - asd = "osc"; - }); - systems = [ "osc" ]; - lispLibs = [ (getAttr "usocket" pkgs) ]; - }; - osicat = { - pname = "osicat"; - version = "20221106-git"; - asds = [ "osicat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/osicat/2022-11-06/osicat-20221106-git.tgz"; - sha256 = "1gxjy11g6k78m3kx3l06v8pqcjdjq51x713f8dapm7hi1c00nzvg"; - system = "osicat"; - asd = "osicat"; - }); - systems = [ "osicat" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - osicat_slash_tests = { - pname = "osicat_tests"; - version = "20221106-git"; - asds = [ "osicat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/osicat/2022-11-06/osicat-20221106-git.tgz"; - sha256 = "1gxjy11g6k78m3kx3l06v8pqcjdjq51x713f8dapm7hi1c00nzvg"; - system = "osicat"; - asd = "osicat"; - }); - systems = [ "osicat/tests" ]; - lispLibs = [ (getAttr "osicat" pkgs) (getAttr "rt" pkgs) ]; - meta = { - broken = true; - }; - }; - osmpbf = { - pname = "osmpbf"; - version = "20210630-git"; - asds = [ "osmpbf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/osmpbf/2021-06-30/osmpbf-20210630-git.tgz"; - sha256 = "0kx5g52l8mk5400gkjds0xfllqxdyxa203a0hgpxjm86r0ppym8v"; - system = "osmpbf"; - asd = "osmpbf"; - }); - systems = [ "osmpbf" ]; - lispLibs = [ (getAttr "chipz" pkgs) (getAttr "com_dot_google_dot_base" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "nibbles" pkgs) (getAttr "protobuf" pkgs) ]; - }; - ospm = { - pname = "ospm"; - version = "20221106-git"; - asds = [ "ospm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ospm/2022-11-06/ospm-20221106-git.tgz"; - sha256 = "0ixx6y20q4kcvm60lp3wca5q1nhnpakdw5avz4mlj6mm8m4z526g"; - system = "ospm"; - asd = "ospm"; - }); - systems = [ "ospm" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "calispel" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "local-time" pkgs) (getAttr "moptilities" pkgs) (getAttr "named-readtables" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivia" pkgs) ]; - }; - ospm_slash_tests = { - pname = "ospm_tests"; - version = "20221106-git"; - asds = [ "ospm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ospm/2022-11-06/ospm-20221106-git.tgz"; - sha256 = "0ixx6y20q4kcvm60lp3wca5q1nhnpakdw5avz4mlj6mm8m4z526g"; - system = "ospm"; - asd = "ospm"; - }); - systems = [ "ospm/tests" ]; - lispLibs = [ (getAttr "lisp-unit2" pkgs) (getAttr "ospm" pkgs) ]; - meta = { - broken = true; - }; - }; - overlord = { - pname = "overlord"; - version = "20221106-git"; - asds = [ "overlord" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/overlord/2022-11-06/overlord-20221106-git.tgz"; - sha256 = "02f3nhqg42z5i1fqz998vcn31vn27z3gvwqhh8m5cxkj1c5l4zxz"; - system = "overlord"; - asd = "overlord"; - }); - systems = [ "overlord" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "bit-smasher" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-murmurhash" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-strftime" pkgs) (getAttr "cmd" pkgs) (getAttr "exit-hooks" pkgs) (getAttr "fset" pkgs) (getAttr "global-vars" pkgs) (getAttr "local-time" pkgs) (getAttr "lparallel" pkgs) (getAttr "named-readtables" pkgs) (getAttr "quickproject" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-file-size" pkgs) ]; - }; - oxenfurt = { - pname = "oxenfurt"; - version = "20190710-git"; - asds = [ "oxenfurt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/oxenfurt/2019-07-10/oxenfurt-20190710-git.tgz"; - sha256 = "0cd3z3b79q641cnpxva749isxfyk52y6s06l7iqx1lsl06yp19j3"; - system = "oxenfurt"; - asd = "oxenfurt"; - }); - systems = [ "oxenfurt" ]; - lispLibs = [ (getAttr "oxenfurt-dexador" pkgs) ]; - }; - oxenfurt-core = { - pname = "oxenfurt-core"; - version = "20190710-git"; - asds = [ "oxenfurt-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/oxenfurt/2019-07-10/oxenfurt-20190710-git.tgz"; - sha256 = "0cd3z3b79q641cnpxva749isxfyk52y6s06l7iqx1lsl06yp19j3"; - system = "oxenfurt-core"; - asd = "oxenfurt-core"; - }); - systems = [ "oxenfurt-core" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "yason" pkgs) ]; - }; - oxenfurt-dexador = { - pname = "oxenfurt-dexador"; - version = "20190710-git"; - asds = [ "oxenfurt-dexador" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/oxenfurt/2019-07-10/oxenfurt-20190710-git.tgz"; - sha256 = "0cd3z3b79q641cnpxva749isxfyk52y6s06l7iqx1lsl06yp19j3"; - system = "oxenfurt-dexador"; - asd = "oxenfurt-dexador"; - }); - systems = [ "oxenfurt-dexador" ]; - lispLibs = [ (getAttr "dexador" pkgs) (getAttr "oxenfurt-core" pkgs) ]; - }; - oxenfurt-drakma = { - pname = "oxenfurt-drakma"; - version = "20190710-git"; - asds = [ "oxenfurt-drakma" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/oxenfurt/2019-07-10/oxenfurt-20190710-git.tgz"; - sha256 = "0cd3z3b79q641cnpxva749isxfyk52y6s06l7iqx1lsl06yp19j3"; - system = "oxenfurt-drakma"; - asd = "oxenfurt-drakma"; - }); - systems = [ "oxenfurt-drakma" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "oxenfurt-core" pkgs) ]; - }; - pack = { - pname = "pack"; - version = "20110619-git"; - asds = [ "pack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pack/2011-06-19/pack-20110619-git.tgz"; - sha256 = "1b3qi04v1wj9nig0mx591sl4phqcalwdl0vsnf4kqp4d2qx2czi1"; - system = "pack"; - asd = "pack"; - }); - systems = [ "pack" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "ieee-floats" pkgs) ]; - }; - package-renaming = { - pname = "package-renaming"; - version = "20120407-git"; - asds = [ "package-renaming" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/package-renaming/2012-04-07/package-renaming-20120407-git.tgz"; - sha256 = "15kgd15r9bib8wfnn3hmv42rlifr4ph3rv2mji5i9d5ixhyqqwgq"; - system = "package-renaming"; - asd = "package-renaming"; - }); - systems = [ "package-renaming" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - package-renaming-test = { - pname = "package-renaming-test"; - version = "20120407-git"; - asds = [ "package-renaming-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/package-renaming/2012-04-07/package-renaming-20120407-git.tgz"; - sha256 = "15kgd15r9bib8wfnn3hmv42rlifr4ph3rv2mji5i9d5ixhyqqwgq"; - system = "package-renaming-test"; - asd = "package-renaming-test"; - }); - systems = [ "package-renaming-test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "package-renaming" pkgs) ]; - }; - packet = { - pname = "packet"; - version = "20150302-git"; - asds = [ "packet" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/packet/2015-03-02/packet-20150302-git.tgz"; - sha256 = "1vcmxwrliwczz161nz3ysx9cbfia4cmlqgnjgrx5016lp394pnx1"; - system = "packet"; - asd = "packet"; - }); - systems = [ "packet" ]; - lispLibs = [ (getAttr "ieee-floats" pkgs) ]; - }; - packet-crafting = { - pname = "packet-crafting"; - version = "20200610-git"; - asds = [ "packet-crafting" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/packet-crafting/2020-06-10/packet-crafting-20200610-git.tgz"; - sha256 = "1ivnvkbqckqf5hm6khffc2wkbjl64fn03w9i0kypkb0mrazxdpdq"; - system = "packet-crafting"; - asd = "packet-crafting"; - }); - systems = [ "packet-crafting" ]; - lispLibs = [ (getAttr "lisp-binary" pkgs) ]; - }; - packet-crafting_slash_tests = { - pname = "packet-crafting_tests"; - version = "20200610-git"; - asds = [ "packet-crafting" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/packet-crafting/2020-06-10/packet-crafting-20200610-git.tgz"; - sha256 = "1ivnvkbqckqf5hm6khffc2wkbjl64fn03w9i0kypkb0mrazxdpdq"; - system = "packet-crafting"; - asd = "packet-crafting"; - }); - systems = [ "packet-crafting/tests" ]; - lispLibs = [ (getAttr "packet-crafting" pkgs) (getAttr "rove" pkgs) ]; - meta = { - broken = true; - }; - }; - paiprolog = { - pname = "paiprolog"; - version = "20180228-git"; - asds = [ "paiprolog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/paiprolog/2018-02-28/paiprolog-20180228-git.tgz"; - sha256 = "1nxz01i6f8s920gm69r2kwjdpq9pli8b2ayqwijhzgjwi0r4jj9r"; - system = "paiprolog"; - asd = "paiprolog"; - }); - systems = [ "paiprolog" ]; - lispLibs = [ ]; - }; - pal = { - pname = "pal"; - version = "20150608-git"; - asds = [ "pal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pal/2015-06-08/pal-20150608-git.tgz"; - sha256 = "0kn6jxirrn7wzqymzsi0kx2ivl0nrrcgbl4dm1714s48qw0jwhcw"; - system = "pal"; - asd = "pal"; - }); - systems = [ "pal" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - pandocl = { - pname = "pandocl"; - version = "20150923-git"; - asds = [ "pandocl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pandocl/2015-09-23/pandocl-20150923-git.tgz"; - sha256 = "1fmlpx5m7ivdkqss1fa3xqbpcwzqrpyyx2nny12aqxn8f13vpvmg"; - system = "pandocl"; - asd = "pandocl"; - }); - systems = [ "pandocl" ]; - lispLibs = [ (getAttr "common-doc" pkgs) (getAttr "common-doc-contrib" pkgs) (getAttr "common-html" pkgs) (getAttr "parenml" pkgs) (getAttr "scriba" pkgs) (getAttr "thorn" pkgs) (getAttr "vertex" pkgs) ]; - }; - pango-markup = { - pname = "pango-markup"; - version = "20200325-git"; - asds = [ "pango-markup" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pango-markup/2020-03-25/pango-markup-20200325-git.tgz"; - sha256 = "0m1hc6lasbzjz5gc5mk9hqmmxgq7mpc9q94fmni109yncpqawxvr"; - system = "pango-markup"; - asd = "pango-markup"; - }); - systems = [ "pango-markup" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - papyrus = { - pname = "papyrus"; - version = "20221106-git"; - asds = [ "papyrus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/papyrus/2022-11-06/papyrus-20221106-git.tgz"; - sha256 = "0swpsxir553cs2pj6xz8cgyr3y9fh88hiv527ssa8cm7qkxcbbg9"; - system = "papyrus"; - asd = "papyrus"; - }); - systems = [ "papyrus" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - parachute = { - pname = "parachute"; - version = "20221106-git"; - asds = [ "parachute" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parachute/2022-11-06/parachute-20221106-git.tgz"; - sha256 = "0cppp1sp9xqkgxgkwidhqzlsj03ywnar7z9mzwcliww8y0kv5555"; - system = "parachute"; - asd = "parachute"; - }); - systems = [ "parachute" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "form-fiddle" pkgs) (getAttr "trivial-custom-debugger" pkgs) ]; - }; - parachute-fiveam = { - pname = "parachute-fiveam"; - version = "20221106-git"; - asds = [ "parachute-fiveam" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parachute/2022-11-06/parachute-20221106-git.tgz"; - sha256 = "0cppp1sp9xqkgxgkwidhqzlsj03ywnar7z9mzwcliww8y0kv5555"; - system = "parachute-fiveam"; - asd = "parachute-fiveam"; - }); - systems = [ "parachute-fiveam" ]; - lispLibs = [ (getAttr "parachute" pkgs) ]; - }; - parachute-lisp-unit = { - pname = "parachute-lisp-unit"; - version = "20221106-git"; - asds = [ "parachute-lisp-unit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parachute/2022-11-06/parachute-20221106-git.tgz"; - sha256 = "0cppp1sp9xqkgxgkwidhqzlsj03ywnar7z9mzwcliww8y0kv5555"; - system = "parachute-lisp-unit"; - asd = "parachute-lisp-unit"; - }); - systems = [ "parachute-lisp-unit" ]; - lispLibs = [ (getAttr "parachute" pkgs) ]; - }; - parachute-prove = { - pname = "parachute-prove"; - version = "20221106-git"; - asds = [ "parachute-prove" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parachute/2022-11-06/parachute-20221106-git.tgz"; - sha256 = "0cppp1sp9xqkgxgkwidhqzlsj03ywnar7z9mzwcliww8y0kv5555"; - system = "parachute-prove"; - asd = "parachute-prove"; - }); - systems = [ "parachute-prove" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "parachute" pkgs) ]; - }; - parameterized-function = { - pname = "parameterized-function"; - version = "20190307-hg"; - asds = [ "parameterized-function" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parameterized-function/2019-03-07/parameterized-function-20190307-hg.tgz"; - sha256 = "0iwnvfrhwprki8d6r0j4649daakjlc2jsh8xcpqdfa2nx563fylw"; - system = "parameterized-function"; - asd = "parameterized-function"; - }); - systems = [ "parameterized-function" ]; - lispLibs = [ (getAttr "interface" pkgs) ]; - }; - paren-files = { - pname = "paren-files"; - version = "20110418-git"; - asds = [ "paren-files" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/paren-files/2011-04-18/paren-files-20110418-git.tgz"; - sha256 = "19lwzvdn9gpn28x6ismkwzs49vr4cbc6drsivkmll3dxb950wgw9"; - system = "paren-files"; - asd = "paren-files"; - }); - systems = [ "paren-files" ]; - lispLibs = [ (getAttr "parenscript" pkgs) ]; - }; - paren-test = { - pname = "paren-test"; - version = "20170830-git"; - asds = [ "paren-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/paren-test/2017-08-30/paren-test-20170830-git.tgz"; - sha256 = "0b2d3kcv3n4b0dm67pzhxx8wxjsgnb32bw2dsprblc7149gaczdr"; - system = "paren-test"; - asd = "paren-test"; - }); - systems = [ "paren-test" ]; - lispLibs = [ (getAttr "paren-files" pkgs) (getAttr "parenscript" pkgs) (getAttr "trivial-shell" pkgs) ]; - }; - paren-util = { - pname = "paren-util"; - version = "20110418-git"; - asds = [ "paren-util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/paren-util/2011-04-18/paren-util-20110418-git.tgz"; - sha256 = "0jn7sgndhpn9ndn3xfmsp03alj2qksqz6p1c5h6x8hvi46caqvpy"; - system = "paren-util"; - asd = "paren-util"; - }); - systems = [ "paren-util" ]; - lispLibs = [ (getAttr "paren-files" pkgs) (getAttr "parenscript" pkgs) ]; - }; - paren6 = { - pname = "paren6"; - version = "20220331-git"; - asds = [ "paren6" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/paren6/2022-03-31/paren6-20220331-git.tgz"; - sha256 = "0m7z7zkc1vrwmp68f3yx0mdsb0j45dmw3iddnbvf94dpv8aywwpx"; - system = "paren6"; - asd = "paren6"; - }); - systems = [ "paren6" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "parenscript" pkgs) ]; - }; - parenml = { - pname = "parenml"; - version = "20150923-git"; - asds = [ "parenml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parenml/2015-09-23/parenml-20150923-git.tgz"; - sha256 = "0g6s5phinpcfhixgsfqniwxd3kd4bwh78s90ixs2fwk3qjhh9zsb"; - system = "parenml"; - asd = "parenml"; - }); - systems = [ "parenml" ]; - lispLibs = [ (getAttr "common-doc-plump" pkgs) (getAttr "esrap" pkgs) (getAttr "plump" pkgs) ]; - }; - parenml-test = { - pname = "parenml-test"; - version = "20150923-git"; - asds = [ "parenml-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parenml/2015-09-23/parenml-20150923-git.tgz"; - sha256 = "0g6s5phinpcfhixgsfqniwxd3kd4bwh78s90ixs2fwk3qjhh9zsb"; - system = "parenml-test"; - asd = "parenml-test"; - }); - systems = [ "parenml-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "parenml" pkgs) ]; - }; - parenscript = { - pname = "parenscript"; - version = "Parenscript-2.7.1"; - asds = [ "parenscript" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz"; - sha256 = "0vg9b9j5psil5iba1d9k6vfxl5rn133qvy750dny20qkp9mf3a13"; - system = "parenscript"; - asd = "parenscript"; - }); - systems = [ "parenscript" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - parenscript-classic = { - pname = "parenscript-classic"; - version = "20111203-darcs"; - asds = [ "parenscript-classic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parenscript-classic/2011-12-03/parenscript-classic-20111203-darcs.tgz"; - sha256 = "19zsiyjlz938la2dd39cy6lwh95m10j4nx8837xm6qk8rz5f8dgy"; - system = "parenscript-classic"; - asd = "parenscript-classic"; - }); - systems = [ "parenscript-classic" ]; - lispLibs = [ ]; - }; - parenscript_dot_tests = { - pname = "parenscript.tests"; - version = "Parenscript-2.7.1"; - asds = [ "parenscript.tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz"; - sha256 = "0vg9b9j5psil5iba1d9k6vfxl5rn133qvy750dny20qkp9mf3a13"; - system = "parenscript.tests"; - asd = "parenscript.tests"; - }); - systems = [ "parenscript.tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "cl-js" pkgs) (getAttr "parenscript" pkgs) ]; - }; - parse = { - pname = "parse"; - version = "20200925-git"; - asds = [ "parse" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parse/2020-09-25/parse-20200925-git.tgz"; - sha256 = "0l18yabyh7jizm5lgvra0jxi8s1cfwghidi6ix1pyixjkdbjlmvy"; - system = "parse"; - asd = "parse"; - }); - systems = [ "parse" ]; - lispLibs = [ ]; - }; - parse-declarations-1_dot_0 = { - pname = "parse-declarations-1.0"; - version = "20101006-darcs"; - asds = [ "parse-declarations-1.0" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz"; - sha256 = "04l3s180wxq6xyhgd77mbd03a1w1m0j9snag961g2f9dd77w6q1r"; - system = "parse-declarations-1.0"; - asd = "parse-declarations-1.0"; - }); - systems = [ "parse-declarations-1.0" ]; - lispLibs = [ ]; - }; - parse-float = { - pname = "parse-float"; - version = "20200218-git"; - asds = [ "parse-float" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz"; - sha256 = "0jd2spawc3v8vzqf8ky4cngl45jm65fhkrdf20mf6dcbn3mzpkmr"; - system = "parse-float"; - asd = "parse-float"; - }); - systems = [ "parse-float" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - parse-float-tests = { - pname = "parse-float-tests"; - version = "20200218-git"; - asds = [ "parse-float-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz"; - sha256 = "0jd2spawc3v8vzqf8ky4cngl45jm65fhkrdf20mf6dcbn3mzpkmr"; - system = "parse-float-tests"; - asd = "parse-float"; - }); - systems = [ "parse-float-tests" ]; - lispLibs = [ (getAttr "lisp-unit" pkgs) (getAttr "parse-float" pkgs) ]; - }; - parse-front-matter = { - pname = "parse-front-matter"; - version = "20160825-git"; - asds = [ "parse-front-matter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parse-front-matter/2016-08-25/parse-front-matter-20160825-git.tgz"; - sha256 = "1yzadrjwycvyzlzb0mixxmwi5bjzkjwylnv3aslnr1j14q44vq58"; - system = "parse-front-matter"; - asd = "parse-front-matter"; - }); - systems = [ "parse-front-matter" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - parse-front-matter-test = { - pname = "parse-front-matter-test"; - version = "20160825-git"; - asds = [ "parse-front-matter-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parse-front-matter/2016-08-25/parse-front-matter-20160825-git.tgz"; - sha256 = "1yzadrjwycvyzlzb0mixxmwi5bjzkjwylnv3aslnr1j14q44vq58"; - system = "parse-front-matter-test"; - asd = "parse-front-matter-test"; - }); - systems = [ "parse-front-matter-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "parse-front-matter" pkgs) ]; - }; - parse-js = { - pname = "parse-js"; - version = "20160421-git"; - asds = [ "parse-js" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parse-js/2016-04-21/parse-js-20160421-git.tgz"; - sha256 = "1wddrnr5kiya5s3gp4cdq6crbfy9fqcz7fr44p81502sj3bvdv39"; - system = "parse-js"; - asd = "parse-js"; - }); - systems = [ "parse-js" ]; - lispLibs = [ ]; - }; - parse-number = { - pname = "parse-number"; - version = "v1.7"; - asds = [ "parse-number" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz"; - sha256 = "0sk06ib1bhqv9y39vwnnw44vmbc4b0kvqm37xxmkxd4dwchq82d7"; - system = "parse-number"; - asd = "parse-number"; - }); - systems = [ "parse-number" ]; - lispLibs = [ ]; - }; - parse-number-range = { - pname = "parse-number-range"; - version = "1.0"; - asds = [ "parse-number-range" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parse-number-range/2012-11-25/parse-number-range-1.0.tgz"; - sha256 = "176j9rabpqdkxd7b1cdy3dk8b8x05bdk0ypnxg2i41zbp9ww2f8d"; - system = "parse-number-range"; - asd = "parse-number-range"; - }); - systems = [ "parse-number-range" ]; - lispLibs = [ (getAttr "cartesian-product-switch" pkgs) (getAttr "enhanced-multiple-value-bind" pkgs) (getAttr "map-bind" pkgs) ]; - }; - parse-number_slash_tests = { - pname = "parse-number_tests"; - version = "v1.7"; - asds = [ "parse-number" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz"; - sha256 = "0sk06ib1bhqv9y39vwnnw44vmbc4b0kvqm37xxmkxd4dwchq82d7"; - system = "parse-number"; - asd = "parse-number"; - }); - systems = [ "parse-number/tests" ]; - lispLibs = [ (getAttr "parse-number" pkgs) ]; - meta = { - broken = true; - }; - }; - parse-rgb = { - pname = "parse-rgb"; - version = "20201220-git"; - asds = [ "parse-rgb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tcod/2020-12-20/cl-tcod-20201220-git.tgz"; - sha256 = "145h0dhxm1idblcld456cv7k00vi6p0zyn5rxkky5y4gk85ws8l5"; - system = "parse-rgb"; - asd = "parse-rgb"; - }); - systems = [ "parse-rgb" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "tcod" pkgs) ]; - }; - parseltongue = { - pname = "parseltongue"; - version = "20130312-git"; - asds = [ "parseltongue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parseltongue/2013-03-12/parseltongue-20130312-git.tgz"; - sha256 = "1cjy7p0snms604zp6x0jlm4v9divqc5r38ns737hffj9q6pi1nlx"; - system = "parseltongue"; - asd = "parseltongue"; - }); - systems = [ "parseltongue" ]; - lispLibs = [ (getAttr "lisp-unit" pkgs) ]; - }; - parseq = { - pname = "parseq"; - version = "20210531-git"; - asds = [ "parseq" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parseq/2021-05-31/parseq-20210531-git.tgz"; - sha256 = "0yv9wdziiwv6yqbaiabijd4lcyg8djrml0qbg22jfixkxyqxhxqw"; - system = "parseq"; - asd = "parseq"; - }); - systems = [ "parseq" ]; - lispLibs = [ ]; - }; - parseq_slash_test = { - pname = "parseq_test"; - version = "20210531-git"; - asds = [ "parseq" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parseq/2021-05-31/parseq-20210531-git.tgz"; - sha256 = "0yv9wdziiwv6yqbaiabijd4lcyg8djrml0qbg22jfixkxyqxhxqw"; - system = "parseq"; - asd = "parseq"; - }); - systems = [ "parseq/test" ]; - lispLibs = [ (getAttr "parseq" pkgs) ]; - meta = { - broken = true; - }; - }; - parser-combinators = { - pname = "parser-combinators"; - version = "20131111-git"; - asds = [ "parser-combinators" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; - sha256 = "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8"; - system = "parser-combinators"; - asd = "parser-combinators"; - }); - systems = [ "parser-combinators" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) ]; - }; - parser-combinators-cl-ppcre = { - pname = "parser-combinators-cl-ppcre"; - version = "20131111-git"; - asds = [ "parser-combinators-cl-ppcre" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; - sha256 = "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8"; - system = "parser-combinators-cl-ppcre"; - asd = "parser-combinators-cl-ppcre"; - }); - systems = [ "parser-combinators-cl-ppcre" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "parser-combinators" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "iterate" pkgs) ]; - }; - parser-combinators-debug = { - pname = "parser-combinators-debug"; - version = "20131111-git"; - asds = [ "parser-combinators-debug" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; - sha256 = "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8"; - system = "parser-combinators-debug"; - asd = "parser-combinators-debug"; - }); - systems = [ "parser-combinators-debug" ]; - lispLibs = [ (getAttr "cl-containers" pkgs) (getAttr "parser-combinators" pkgs) ]; - }; - parser-combinators-tests = { - pname = "parser-combinators-tests"; - version = "20131111-git"; - asds = [ "parser-combinators-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; - sha256 = "1k49vha5xm2cklayzpqwg73n4v93xwsbs5in6342pkkiimnidhs8"; - system = "parser-combinators-tests"; - asd = "parser-combinators-tests"; - }); - systems = [ "parser-combinators-tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "parser-combinators" pkgs) (getAttr "infix" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "iterate" pkgs) ]; - }; - parser_dot_common-rules = { - pname = "parser.common-rules"; - version = "20200715-git"; - asds = [ "parser.common-rules" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz"; - sha256 = "138ygj0qp58jl4h79szg3i2gnwzywwc48qn1gj6dw113wasrnkwa"; - system = "parser.common-rules"; - asd = "parser.common-rules"; - }); - systems = [ "parser.common-rules" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "esrap" pkgs) (getAttr "let-plus" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - parser_dot_common-rules_dot_operators = { - pname = "parser.common-rules.operators"; - version = "20200715-git"; - asds = [ "parser.common-rules.operators" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz"; - sha256 = "138ygj0qp58jl4h79szg3i2gnwzywwc48qn1gj6dw113wasrnkwa"; - system = "parser.common-rules.operators"; - asd = "parser.common-rules.operators"; - }); - systems = [ "parser.common-rules.operators" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_builder-protocol" pkgs) (getAttr "esrap" pkgs) (getAttr "let-plus" pkgs) (getAttr "parser_dot_common-rules" pkgs) ]; - }; - parser_dot_common-rules_dot_operators_slash_test = { - pname = "parser.common-rules.operators_test"; - version = "20200715-git"; - asds = [ "parser.common-rules.operators" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz"; - sha256 = "138ygj0qp58jl4h79szg3i2gnwzywwc48qn1gj6dw113wasrnkwa"; - system = "parser.common-rules.operators"; - asd = "parser.common-rules.operators"; - }); - systems = [ "parser.common-rules.operators/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) (getAttr "parser_dot_common-rules" pkgs) (getAttr "parser_dot_common-rules_dot_operators" pkgs) ]; - meta = { - broken = true; - }; - }; - parser_dot_common-rules_slash_test = { - pname = "parser.common-rules_test"; - version = "20200715-git"; - asds = [ "parser.common-rules" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz"; - sha256 = "138ygj0qp58jl4h79szg3i2gnwzywwc48qn1gj6dw113wasrnkwa"; - system = "parser.common-rules"; - asd = "parser.common-rules"; - }); - systems = [ "parser.common-rules/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) (getAttr "parser_dot_common-rules" pkgs) ]; - meta = { - broken = true; - }; - }; - parser_dot_ini = { - pname = "parser.ini"; - version = "20181018-git"; - asds = [ "parser.ini" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parser.ini/2018-10-18/parser.ini-20181018-git.tgz"; - sha256 = "0ri4c7877i9val67z5sm8nfhz04p9l6brajx2fkavs8556l1wm1d"; - system = "parser.ini"; - asd = "parser.ini"; - }); - systems = [ "parser.ini" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "architecture_dot_builder-protocol" pkgs) (getAttr "esrap" pkgs) (getAttr "let-plus" pkgs) (getAttr "more-conditions" pkgs) (getAttr "parser_dot_common-rules" pkgs) ]; - }; - parser_dot_ini_slash_test = { - pname = "parser.ini_test"; - version = "20181018-git"; - asds = [ "parser.ini" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parser.ini/2018-10-18/parser.ini-20181018-git.tgz"; - sha256 = "0ri4c7877i9val67z5sm8nfhz04p9l6brajx2fkavs8556l1wm1d"; - system = "parser.ini"; - asd = "parser.ini"; - }); - systems = [ "parser.ini/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) (getAttr "parser_dot_ini" pkgs) ]; - meta = { - broken = true; - }; - }; - parsnip = { - pname = "parsnip"; - version = "20220331-git"; - asds = [ "parsnip" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parsnip/2022-03-31/parsnip-20220331-git.tgz"; - sha256 = "0gl7z8kn37qiz0vab89wawn78iczii7iqw43jy2ls7nw0l5jv13w"; - system = "parsnip"; - asd = "parsnip"; - }); - systems = [ "parsnip" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - parsnip_slash_examples = { - pname = "parsnip_examples"; - version = "20220331-git"; - asds = [ "parsnip" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parsnip/2022-03-31/parsnip-20220331-git.tgz"; - sha256 = "0gl7z8kn37qiz0vab89wawn78iczii7iqw43jy2ls7nw0l5jv13w"; - system = "parsnip"; - asd = "parsnip"; - }); - systems = [ "parsnip/examples" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "parsnip" pkgs) ]; - meta = { - broken = true; - }; - }; - parsnip_slash_test = { - pname = "parsnip_test"; - version = "20220331-git"; - asds = [ "parsnip" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/parsnip/2022-03-31/parsnip-20220331-git.tgz"; - sha256 = "0gl7z8kn37qiz0vab89wawn78iczii7iqw43jy2ls7nw0l5jv13w"; - system = "parsnip"; - asd = "parsnip"; - }); - systems = [ "parsnip/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "parachute" pkgs) (getAttr "parsnip" pkgs) ]; - meta = { - broken = true; - }; - }; - patchwork = { - pname = "patchwork"; - version = "20220707-git"; - asds = [ "patchwork" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/patchwork/2022-07-07/patchwork-20220707-git.tgz"; - sha256 = "08d08hslcs69509wj56mlklv1cz5lq2rz0sl870zcxyn4j1nnf3f"; - system = "patchwork"; - asd = "patchwork"; - }); - systems = [ "patchwork" ]; - lispLibs = [ (getAttr "binpack" pkgs) (getAttr "mfiano-utils" pkgs) (getAttr "opticl" pkgs) (getAttr "uiop" pkgs) ]; - }; - path-parse = { - pname = "path-parse"; - version = "20160421-git"; - asds = [ "path-parse" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/path-parse/2016-04-21/path-parse-20160421-git.tgz"; - sha256 = "10mxm6q62cfpv3hw2w8k968ba8a1xglqdkwlkqs4l4nby3b11aaq"; - system = "path-parse"; - asd = "path-parse"; - }); - systems = [ "path-parse" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - }; - path-parse-test = { - pname = "path-parse-test"; - version = "20160421-git"; - asds = [ "path-parse-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/path-parse/2016-04-21/path-parse-20160421-git.tgz"; - sha256 = "10mxm6q62cfpv3hw2w8k968ba8a1xglqdkwlkqs4l4nby3b11aaq"; - system = "path-parse-test"; - asd = "path-parse-test"; - }); - systems = [ "path-parse-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "path-parse" pkgs) ]; - }; - path-string = { - pname = "path-string"; - version = "20160825-git"; - asds = [ "path-string" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/path-string/2016-08-25/path-string-20160825-git.tgz"; - sha256 = "0hs36kf4njxafxrngs1m1sh9c7b9wv7sa8n316dq4icx3kf3v6yp"; - system = "path-string"; - asd = "path-string"; - }); - systems = [ "path-string" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - }; - path-string-test = { - pname = "path-string-test"; - version = "20160825-git"; - asds = [ "path-string-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/path-string/2016-08-25/path-string-20160825-git.tgz"; - sha256 = "0hs36kf4njxafxrngs1m1sh9c7b9wv7sa8n316dq4icx3kf3v6yp"; - system = "path-string-test"; - asd = "path-string-test"; - }); - systems = [ "path-string-test" ]; - lispLibs = [ (getAttr "path-string" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - pathname-utils = { - pname = "pathname-utils"; - version = "20221106-git"; - asds = [ "pathname-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pathname-utils/2022-11-06/pathname-utils-20221106-git.tgz"; - sha256 = "1c1g2piiw01gcawgxlp7c4jaqls3kcjh9q8smwrvnvnr2g3hbn98"; - system = "pathname-utils"; - asd = "pathname-utils"; - }); - systems = [ "pathname-utils" ]; - lispLibs = [ (getAttr "trivial-features" pkgs) ]; - }; - pathname-utils-test = { - pname = "pathname-utils-test"; - version = "20221106-git"; - asds = [ "pathname-utils-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pathname-utils/2022-11-06/pathname-utils-20221106-git.tgz"; - sha256 = "1c1g2piiw01gcawgxlp7c4jaqls3kcjh9q8smwrvnvnr2g3hbn98"; - system = "pathname-utils-test"; - asd = "pathname-utils-test"; - }); - systems = [ "pathname-utils-test" ]; - lispLibs = [ (getAttr "parachute" pkgs) (getAttr "pathname-utils" pkgs) ]; - }; - patron = { - pname = "patron"; - version = "20130420-git"; - asds = [ "patron" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/patron/2013-04-20/patron-20130420-git.tgz"; - sha256 = "0i2vlwspnssjxdnq7dsrb98q3y8c8drd0a11nxn9808q76sqzsqc"; - system = "patron"; - asd = "patron"; - }); - systems = [ "patron" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - pcall = { - pname = "pcall"; - version = "0.3"; - asds = [ "pcall" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; - sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps"; - system = "pcall"; - asd = "pcall"; - }); - systems = [ "pcall" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "pcall-queue" pkgs) ]; - }; - pcall-queue = { - pname = "pcall-queue"; - version = "0.3"; - asds = [ "pcall-queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; - sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps"; - system = "pcall-queue"; - asd = "pcall-queue"; - }); - systems = [ "pcall-queue" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - pcall-tests = { - pname = "pcall-tests"; - version = "0.3"; - asds = [ "pcall-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; - sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps"; - system = "pcall-tests"; - asd = "pcall"; - }); - systems = [ "pcall-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "pcall" pkgs) ]; - }; - pcl-binary-data = { - pname = "pcl-binary-data"; - version = "20180430-git"; - asds = [ "pcl-binary-data" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; - sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; - system = "pcl-binary-data"; - asd = "pcl-binary-data"; - }); - systems = [ "pcl-binary-data" ]; - lispLibs = [ (getAttr "pcl-macro-utilities" pkgs) ]; - }; - pcl-html = { - pname = "pcl-html"; - version = "20180430-git"; - asds = [ "pcl-html" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; - sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; - system = "pcl-html"; - asd = "pcl-html"; - }); - systems = [ "pcl-html" ]; - lispLibs = [ (getAttr "pcl-macro-utilities" pkgs) ]; - }; - pcl-id3v2 = { - pname = "pcl-id3v2"; - version = "20180430-git"; - asds = [ "pcl-id3v2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; - sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; - system = "pcl-id3v2"; - asd = "pcl-id3v2"; - }); - systems = [ "pcl-id3v2" ]; - lispLibs = [ (getAttr "pcl-binary-data" pkgs) (getAttr "pcl-pathnames" pkgs) ]; - }; - pcl-macro-utilities = { - pname = "pcl-macro-utilities"; - version = "20180430-git"; - asds = [ "pcl-macro-utilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; - sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; - system = "pcl-macro-utilities"; - asd = "pcl-macro-utilities"; - }); - systems = [ "pcl-macro-utilities" ]; - lispLibs = [ ]; - }; - pcl-mp3-browser = { - pname = "pcl-mp3-browser"; - version = "20180430-git"; - asds = [ "pcl-mp3-browser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; - sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; - system = "pcl-mp3-browser"; - asd = "pcl-mp3-browser"; - }); - systems = [ "pcl-mp3-browser" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "pcl-html" pkgs) (getAttr "pcl-id3v2" pkgs) (getAttr "pcl-mp3-database" pkgs) (getAttr "pcl-shoutcast" pkgs) (getAttr "pcl-url-function" pkgs) ]; - }; - pcl-mp3-database = { - pname = "pcl-mp3-database"; - version = "20180430-git"; - asds = [ "pcl-mp3-database" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; - sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; - system = "pcl-mp3-database"; - asd = "pcl-mp3-database"; - }); - systems = [ "pcl-mp3-database" ]; - lispLibs = [ (getAttr "pcl-id3v2" pkgs) (getAttr "pcl-macro-utilities" pkgs) (getAttr "pcl-pathnames" pkgs) ]; - }; - pcl-pathnames = { - pname = "pcl-pathnames"; - version = "20180430-git"; - asds = [ "pcl-pathnames" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; - sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; - system = "pcl-pathnames"; - asd = "pcl-pathnames"; - }); - systems = [ "pcl-pathnames" ]; - lispLibs = [ ]; - }; - pcl-shoutcast = { - pname = "pcl-shoutcast"; - version = "20180430-git"; - asds = [ "pcl-shoutcast" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; - sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; - system = "pcl-shoutcast"; - asd = "pcl-shoutcast"; - }); - systems = [ "pcl-shoutcast" ]; - lispLibs = [ (getAttr "pcl-html" pkgs) (getAttr "pcl-id3v2" pkgs) (getAttr "pcl-macro-utilities" pkgs) (getAttr "pcl-mp3-database" pkgs) (getAttr "pcl-pathnames" pkgs) (getAttr "pcl-url-function" pkgs) ]; - }; - pcl-simple-database = { - pname = "pcl-simple-database"; - version = "20180430-git"; - asds = [ "pcl-simple-database" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; - sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; - system = "pcl-simple-database"; - asd = "pcl-simple-database"; - }); - systems = [ "pcl-simple-database" ]; - lispLibs = [ ]; - }; - pcl-spam = { - pname = "pcl-spam"; - version = "20180430-git"; - asds = [ "pcl-spam" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; - sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; - system = "pcl-spam"; - asd = "pcl-spam"; - }); - systems = [ "pcl-spam" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "pcl-pathnames" pkgs) (getAttr "pcl-test-framework" pkgs) ]; - }; - pcl-test-framework = { - pname = "pcl-test-framework"; - version = "20180430-git"; - asds = [ "pcl-test-framework" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; - sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; - system = "pcl-test-framework"; - asd = "pcl-test-framework"; - }); - systems = [ "pcl-test-framework" ]; - lispLibs = [ (getAttr "pcl-macro-utilities" pkgs) ]; - }; - pcl-unit-test = { - pname = "pcl-unit-test"; - version = "20121125-git"; - asds = [ "pcl-unit-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz"; - sha256 = "1qc8gzp7f4phgyi5whkxacrqzdqs0y1hvkf71m8n7l303jly9wjf"; - system = "pcl-unit-test"; - asd = "pcl-unit-test"; - }); - systems = [ "pcl-unit-test" ]; - lispLibs = [ (getAttr "standard-cl" pkgs) ]; - }; - pcl-url-function = { - pname = "pcl-url-function"; - version = "20180430-git"; - asds = [ "pcl-url-function" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; - sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; - system = "pcl-url-function"; - asd = "pcl-url-function"; - }); - systems = [ "pcl-url-function" ]; - lispLibs = [ (getAttr "aserve" pkgs) (getAttr "pcl-html" pkgs) (getAttr "pcl-macro-utilities" pkgs) ]; - }; - peppol = { - pname = "peppol"; - version = "20201016-git"; - asds = [ "peppol" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-peppol/2020-10-16/cl-peppol-20201016-git.tgz"; - sha256 = "02wc6h1fiaqzf14py2kwsvx0dmb22wdkd54pl0ixnmivj436ln99"; - system = "peppol"; - asd = "peppol"; - }); - systems = [ "peppol" ]; - lispLibs = [ (getAttr "cxml" pkgs) (getAttr "xpath" pkgs) ]; - }; - percent-encoding = { - pname = "percent-encoding"; - version = "20121013-git"; - asds = [ "percent-encoding" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/percent-encoding/2012-10-13/percent-encoding-20121013-git.tgz"; - sha256 = "0q1lh3sa6mkjr5gcdkgimkpc29rgf9cjhv90f61h8ridj28grq0h"; - system = "percent-encoding"; - asd = "percent-encoding"; - }); - systems = [ "percent-encoding" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "babel" pkgs) ]; - }; - percent-encoding-test = { - pname = "percent-encoding-test"; - version = "20121013-git"; - asds = [ "percent-encoding-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/percent-encoding/2012-10-13/percent-encoding-20121013-git.tgz"; - sha256 = "0q1lh3sa6mkjr5gcdkgimkpc29rgf9cjhv90f61h8ridj28grq0h"; - system = "percent-encoding-test"; - asd = "percent-encoding"; - }); - systems = [ "percent-encoding-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "percent-encoding" pkgs) ]; - }; - perceptual-hashes = { - pname = "perceptual-hashes"; - version = "20220707-git"; - asds = [ "perceptual-hashes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/perceptual-hashes/2022-07-07/perceptual-hashes-20220707-git.tgz"; - sha256 = "1hg2vxi4avmjwscgab7wqf3c4d60x933lac4d86fmfk0wgl5nzzd"; - system = "perceptual-hashes"; - asd = "perceptual-hashes"; - }); - systems = [ "perceptual-hashes" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "array-operations" pkgs) (getAttr "imago" pkgs) (getAttr "serapeum" pkgs) ]; - }; - perceptual-hashes_slash_tests = { - pname = "perceptual-hashes_tests"; - version = "20220707-git"; - asds = [ "perceptual-hashes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/perceptual-hashes/2022-07-07/perceptual-hashes-20220707-git.tgz"; - sha256 = "1hg2vxi4avmjwscgab7wqf3c4d60x933lac4d86fmfk0wgl5nzzd"; - system = "perceptual-hashes"; - asd = "perceptual-hashes"; - }); - systems = [ "perceptual-hashes/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "perceptual-hashes" pkgs) ]; - meta = { - broken = true; - }; - }; - periodic-table = { - pname = "periodic-table"; - version = "1.0"; - asds = [ "periodic-table" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/periodic-table/2011-10-01/periodic-table-1.0.tgz"; - sha256 = "147j9kn0afsvlz09vdjmvw5si08ix3dyypg21vrc5xvn9nsalrxx"; - system = "periodic-table"; - asd = "periodic-table"; - }); - systems = [ "periodic-table" ]; - lispLibs = [ ]; - }; - periods = { - pname = "periods"; - version = "20221106-git"; - asds = [ "periods" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/periods/2022-11-06/periods-20221106-git.tgz"; - sha256 = "0ynhdmlzb499mlm7c7zy6vgw8vglkkf14zr0v40jcl1sgq3236ry"; - system = "periods"; - asd = "periods"; - }); - systems = [ "periods" ]; - lispLibs = [ (getAttr "local-time" pkgs) ]; - }; - periods-series = { - pname = "periods-series"; - version = "20221106-git"; - asds = [ "periods-series" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/periods/2022-11-06/periods-20221106-git.tgz"; - sha256 = "0ynhdmlzb499mlm7c7zy6vgw8vglkkf14zr0v40jcl1sgq3236ry"; - system = "periods-series"; - asd = "periods-series"; - }); - systems = [ "periods-series" ]; - lispLibs = [ (getAttr "periods" pkgs) (getAttr "series" pkgs) ]; - }; - perlre = { - pname = "perlre"; - version = "20200715-git"; - asds = [ "perlre" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/perlre/2020-07-15/perlre-20200715-git.tgz"; - sha256 = "1izhrn1xd0mi2nl0p6930ln3nb4wp3y5ngg81wy5g5s4vqy2h54a"; - system = "perlre"; - asd = "perlre"; - }); - systems = [ "perlre" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "let-over-lambda" pkgs) (getAttr "prove" pkgs) (getAttr "trivia" pkgs) (getAttr "trivia_dot_ppcre" pkgs) ]; - }; - pero = { - pname = "pero"; - version = "20221106-git"; - asds = [ "pero" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pero/2022-11-06/pero-20221106-git.tgz"; - sha256 = "0hpv2vn42210niw6hs4z17w0c565nzln2xzapw7jhm1xjl633vbc"; - system = "pero"; - asd = "pero"; - }); - systems = [ "pero" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "local-time" pkgs) ]; - }; - persistent = { - pname = "persistent"; - version = "20221106-git"; - asds = [ "persistent" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "persistent"; - asd = "persistent"; - }); - systems = [ "persistent" ]; - lispLibs = [ ]; - }; - persistent-tables = { - pname = "persistent-tables"; - version = "20120208-git"; - asds = [ "persistent-tables" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/persistent-tables/2012-02-08/persistent-tables-20120208-git.tgz"; - sha256 = "0klfjza85mgj2z42x2lhcqy9q66avac7zw0cpbmwwng3m7679hpa"; - system = "persistent-tables"; - asd = "persistent-tables"; - }); - systems = [ "persistent-tables" ]; - lispLibs = [ (getAttr "lisp-unit" pkgs) (getAttr "random-access-lists" pkgs) ]; - }; - persistent-variables = { - pname = "persistent-variables"; - version = "20130312-git"; - asds = [ "persistent-variables" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/persistent-variables/2013-03-12/persistent-variables-20130312-git.tgz"; - sha256 = "0r72cbjkb5q4sn109svlcsvrwgvwdsn5c63rv5cpaf3jrfv1z8xn"; - system = "persistent-variables"; - asd = "persistent-variables"; - }); - systems = [ "persistent-variables" ]; - lispLibs = [ ]; - }; - persistent-variables_dot_test = { - pname = "persistent-variables.test"; - version = "20130312-git"; - asds = [ "persistent-variables.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/persistent-variables/2013-03-12/persistent-variables-20130312-git.tgz"; - sha256 = "0r72cbjkb5q4sn109svlcsvrwgvwdsn5c63rv5cpaf3jrfv1z8xn"; - system = "persistent-variables.test"; - asd = "persistent-variables"; - }); - systems = [ "persistent-variables.test" ]; - lispLibs = [ (getAttr "persistent-variables" pkgs) ]; - }; - petalisp = { - pname = "petalisp"; - version = "20221106-git"; - asds = [ "petalisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2022-11-06/petalisp-20221106-git.tgz"; - sha256 = "0wd9p8rdalil1qqzpagx920jwrr3i6c8bf9svah88i6vdvh21x63"; - system = "petalisp"; - asd = "petalisp"; - }); - systems = [ "petalisp" ]; - lispLibs = [ (getAttr "petalisp_dot_api" pkgs) ]; - }; - petalisp_dot_api = { - pname = "petalisp.api"; - version = "20221106-git"; - asds = [ "petalisp.api" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2022-11-06/petalisp-20221106-git.tgz"; - sha256 = "0wd9p8rdalil1qqzpagx920jwrr3i6c8bf9svah88i6vdvh21x63"; - system = "petalisp.api"; - asd = "petalisp.api"; - }); - systems = [ "petalisp.api" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "petalisp_dot_core" pkgs) (getAttr "petalisp_dot_utilities" pkgs) (getAttr "petalisp_dot_xmas-backend" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-macroexpand-all" pkgs) ]; - }; - petalisp_dot_core = { - pname = "petalisp.core"; - version = "20221106-git"; - asds = [ "petalisp.core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2022-11-06/petalisp-20221106-git.tgz"; - sha256 = "0wd9p8rdalil1qqzpagx920jwrr3i6c8bf9svah88i6vdvh21x63"; - system = "petalisp.core"; - asd = "petalisp.core"; - }); - systems = [ "petalisp.core" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "lparallel" pkgs) (getAttr "petalisp_dot_type-inference" pkgs) (getAttr "petalisp_dot_utilities" pkgs) (getAttr "trivia" pkgs) ]; - }; - petalisp_dot_examples = { - pname = "petalisp.examples"; - version = "20221106-git"; - asds = [ "petalisp.examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2022-11-06/petalisp-20221106-git.tgz"; - sha256 = "0wd9p8rdalil1qqzpagx920jwrr3i6c8bf9svah88i6vdvh21x63"; - system = "petalisp.examples"; - asd = "petalisp.examples"; - }); - systems = [ "petalisp.examples" ]; - lispLibs = [ (getAttr "numpy-file-format" pkgs) (getAttr "petalisp" pkgs) ]; - }; - petalisp_dot_graphviz = { - pname = "petalisp.graphviz"; - version = "20221106-git"; - asds = [ "petalisp.graphviz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2022-11-06/petalisp-20221106-git.tgz"; - sha256 = "0wd9p8rdalil1qqzpagx920jwrr3i6c8bf9svah88i6vdvh21x63"; - system = "petalisp.graphviz"; - asd = "petalisp.graphviz"; - }); - systems = [ "petalisp.graphviz" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-dot" pkgs) (getAttr "petalisp" pkgs) (getAttr "petalisp_dot_core" pkgs) (getAttr "petalisp_dot_ir" pkgs) (getAttr "petalisp_dot_utilities" pkgs) (getAttr "trivial-features" pkgs) (getAttr "uiop" pkgs) ]; - }; - petalisp_dot_ir = { - pname = "petalisp.ir"; - version = "20221106-git"; - asds = [ "petalisp.ir" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2022-11-06/petalisp-20221106-git.tgz"; - sha256 = "0wd9p8rdalil1qqzpagx920jwrr3i6c8bf9svah88i6vdvh21x63"; - system = "petalisp.ir"; - asd = "petalisp.ir"; - }); - systems = [ "petalisp.ir" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "petalisp_dot_core" pkgs) (getAttr "petalisp_dot_utilities" pkgs) (getAttr "priority-queue" pkgs) (getAttr "split-sequence" pkgs) (getAttr "ucons" pkgs) ]; - }; - petalisp_dot_test-suite = { - pname = "petalisp.test-suite"; - version = "20221106-git"; - asds = [ "petalisp.test-suite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2022-11-06/petalisp-20221106-git.tgz"; - sha256 = "0wd9p8rdalil1qqzpagx920jwrr3i6c8bf9svah88i6vdvh21x63"; - system = "petalisp.test-suite"; - asd = "petalisp.test-suite"; - }); - systems = [ "petalisp.test-suite" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "petalisp" pkgs) (getAttr "petalisp_dot_examples" pkgs) (getAttr "petalisp_dot_graphviz" pkgs) (getAttr "petalisp_dot_xmas-backend" pkgs) ]; - }; - petalisp_dot_type-inference = { - pname = "petalisp.type-inference"; - version = "20221106-git"; - asds = [ "petalisp.type-inference" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2022-11-06/petalisp-20221106-git.tgz"; - sha256 = "0wd9p8rdalil1qqzpagx920jwrr3i6c8bf9svah88i6vdvh21x63"; - system = "petalisp.type-inference"; - asd = "petalisp.type-inference"; - }); - systems = [ "petalisp.type-inference" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-arguments" pkgs) ]; - }; - petalisp_dot_utilities = { - pname = "petalisp.utilities"; - version = "20221106-git"; - asds = [ "petalisp.utilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2022-11-06/petalisp-20221106-git.tgz"; - sha256 = "0wd9p8rdalil1qqzpagx920jwrr3i6c8bf9svah88i6vdvh21x63"; - system = "petalisp.utilities"; - asd = "petalisp.utilities"; - }); - systems = [ "petalisp.utilities" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "atomics" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "queues_dot_priority-queue" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - petalisp_dot_xmas-backend = { - pname = "petalisp.xmas-backend"; - version = "20221106-git"; - asds = [ "petalisp.xmas-backend" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petalisp/2022-11-06/petalisp-20221106-git.tgz"; - sha256 = "0wd9p8rdalil1qqzpagx920jwrr3i6c8bf9svah88i6vdvh21x63"; - system = "petalisp.xmas-backend"; - asd = "petalisp.xmas-backend"; - }); - systems = [ "petalisp.xmas-backend" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "atomics" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "lparallel" pkgs) (getAttr "petalisp_dot_core" pkgs) (getAttr "petalisp_dot_ir" pkgs) (getAttr "petalisp_dot_type-inference" pkgs) (getAttr "petalisp_dot_utilities" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - petit_dot_package-utils = { - pname = "petit.package-utils"; - version = "20140826-git"; - asds = [ "petit.package-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petit.package-utils/2014-08-26/petit.package-utils-20140826-git.tgz"; - sha256 = "0jj4c1jpcqfy9mrlxhjmq4ypwlzk84h09i8nr34wjwh6z7idhpyv"; - system = "petit.package-utils"; - asd = "petit.package-utils"; - }); - systems = [ "petit.package-utils" ]; - lispLibs = [ ]; - }; - petit_dot_string-utils = { - pname = "petit.string-utils"; - version = "20141106-git"; - asds = [ "petit.string-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petit.string-utils/2014-11-06/petit.string-utils-20141106-git.tgz"; - sha256 = "04kqdj69x53wzvpp54zp6767186in24p8yrr82wdg2bwzw4qh4yl"; - system = "petit.string-utils"; - asd = "petit.string-utils"; - }); - systems = [ "petit.string-utils" ]; - lispLibs = [ ]; - }; - petit_dot_string-utils-test = { - pname = "petit.string-utils-test"; - version = "20141106-git"; - asds = [ "petit.string-utils-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petit.string-utils/2014-11-06/petit.string-utils-20141106-git.tgz"; - sha256 = "04kqdj69x53wzvpp54zp6767186in24p8yrr82wdg2bwzw4qh4yl"; - system = "petit.string-utils-test"; - asd = "petit.string-utils-test"; - }); - systems = [ "petit.string-utils-test" ]; - lispLibs = [ (getAttr "petit_dot_string-utils" pkgs) (getAttr "rt" pkgs) ]; - }; - petri = { - pname = "petri"; - version = "20200427-git"; - asds = [ "petri" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petri/2020-04-27/petri-20200427-git.tgz"; - sha256 = "1y78s3jndyxll46zq7s5is9pwv8f6jr2npjkcpd48ik7xkj2269b"; - system = "petri"; - asd = "petri"; - }); - systems = [ "petri" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "phoe-toolbox" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - petri_slash_graph = { - pname = "petri_graph"; - version = "20200427-git"; - asds = [ "petri" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petri/2020-04-27/petri-20200427-git.tgz"; - sha256 = "1y78s3jndyxll46zq7s5is9pwv8f6jr2npjkcpd48ik7xkj2269b"; - system = "petri"; - asd = "petri"; - }); - systems = [ "petri/graph" ]; - lispLibs = [ (getAttr "cl-dot" pkgs) (getAttr "petri" pkgs) ]; - meta = { - broken = true; - }; - }; - petri_slash_test = { - pname = "petri_test"; - version = "20200427-git"; - asds = [ "petri" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petri/2020-04-27/petri-20200427-git.tgz"; - sha256 = "1y78s3jndyxll46zq7s5is9pwv8f6jr2npjkcpd48ik7xkj2269b"; - system = "petri"; - asd = "petri"; - }); - systems = [ "petri/test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "lparallel" pkgs) (getAttr "petri" pkgs) (getAttr "trivial-backtrace" pkgs) ]; - meta = { - broken = true; - }; - }; - petri_slash_threaded = { - pname = "petri_threaded"; - version = "20200427-git"; - asds = [ "petri" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/petri/2020-04-27/petri-20200427-git.tgz"; - sha256 = "1y78s3jndyxll46zq7s5is9pwv8f6jr2npjkcpd48ik7xkj2269b"; - system = "petri"; - asd = "petri"; - }); - systems = [ "petri/threaded" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "lparallel" pkgs) (getAttr "petri" pkgs) (getAttr "trivial-backtrace" pkgs) ]; - meta = { - broken = true; - }; - }; - pettomato-deque = { - pname = "pettomato-deque"; - version = "20120107-git"; - asds = [ "pettomato-deque" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pettomato-deque/2012-01-07/pettomato-deque-20120107-git.tgz"; - sha256 = "07ai4fa64cg6shfvnx9xk7pscbsz64ys80482zz2fb9q0rba80b7"; - system = "pettomato-deque"; - asd = "pettomato-deque"; - }); - systems = [ "pettomato-deque" ]; - lispLibs = [ ]; - }; - pettomato-deque-tests = { - pname = "pettomato-deque-tests"; - version = "20120107-git"; - asds = [ "pettomato-deque-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pettomato-deque/2012-01-07/pettomato-deque-20120107-git.tgz"; - sha256 = "07ai4fa64cg6shfvnx9xk7pscbsz64ys80482zz2fb9q0rba80b7"; - system = "pettomato-deque-tests"; - asd = "pettomato-deque-tests"; - }); - systems = [ "pettomato-deque-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "pettomato-deque" pkgs) ]; - }; - pettomato-indexed-priority-queue = { - pname = "pettomato-indexed-priority-queue"; - version = "20120909-git"; - asds = [ "pettomato-indexed-priority-queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pettomato-indexed-priority-queue/2012-09-09/pettomato-indexed-priority-queue-20120909-git.tgz"; - sha256 = "14i36qbdnif28xcbxdbr5abzmzxr7vzv64n1aix0f6khxg99pylz"; - system = "pettomato-indexed-priority-queue"; - asd = "pettomato-indexed-priority-queue"; - }); - systems = [ "pettomato-indexed-priority-queue" ]; - lispLibs = [ ]; - }; - pettomato-indexed-priority-queue-tests = { - pname = "pettomato-indexed-priority-queue-tests"; - version = "20120909-git"; - asds = [ "pettomato-indexed-priority-queue-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pettomato-indexed-priority-queue/2012-09-09/pettomato-indexed-priority-queue-20120909-git.tgz"; - sha256 = "14i36qbdnif28xcbxdbr5abzmzxr7vzv64n1aix0f6khxg99pylz"; - system = "pettomato-indexed-priority-queue-tests"; - asd = "pettomato-indexed-priority-queue-tests"; - }); - systems = [ "pettomato-indexed-priority-queue-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "pettomato-indexed-priority-queue" pkgs) ]; - }; - pfft = { - pname = "pfft"; - version = "20180711-git"; - asds = [ "pfft" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/fft/2018-07-11/fft-20180711-git.tgz"; - sha256 = "0ymnfplap2cncw49mhq7crapgxphfwsvqdgrcckpgsvw6qsymasd"; - system = "pfft"; - asd = "pfft"; - }); - systems = [ "pfft" ]; - lispLibs = [ (getAttr "fft" pkgs) (getAttr "pcall" pkgs) ]; - }; - pg = { - pname = "pg"; - version = "20150608-git"; - asds = [ "pg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pg/2015-06-08/pg-20150608-git.tgz"; - sha256 = "1c7axd2yxw9lxf7l5djrnfkp197mmr88qpigy2cjgim8vxab4n2l"; - system = "pg"; - asd = "pg"; - }); - systems = [ "pg" ]; - lispLibs = [ ]; - }; - pgloader = { - pname = "pgloader"; - version = "v3.6.9"; - asds = [ "pgloader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pgloader/2022-11-06/pgloader-v3.6.9.tgz"; - sha256 = "03kp3ms2sjz4gwb94xs404mi63fnv1bq00hyqxyvc9csmicxzawn"; - system = "pgloader"; - asd = "pgloader"; - }); - systems = [ "pgloader" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-csv" pkgs) (getAttr "db3" pkgs) (getAttr "cl-fad" pkgs) (getAttr "ixf" pkgs) (getAttr "cl-log" pkgs) (getAttr "cl-markdown" pkgs) (getAttr "mssql" pkgs) (getAttr "cl-mustache" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "sqlite" pkgs) (getAttr "closer-mop" pkgs) (getAttr "command-line-arguments" pkgs) (getAttr "drakma" pkgs) (getAttr "esrap" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "local-time" pkgs) (getAttr "lparallel" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "cl-postgres" pkgs) (getAttr "postmodern" pkgs) (getAttr "simple-date" pkgs) (getAttr "py-configparser" pkgs) (getAttr "qmynd" pkgs) (getAttr "quri" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-backtrace" pkgs) (getAttr "uiop" pkgs) (getAttr "usocket" pkgs) (getAttr "uuid" pkgs) (getAttr "yason" pkgs) (getAttr "zs3" pkgs) ]; - }; - phoe-toolbox = { - pname = "phoe-toolbox"; - version = "20210124-git"; - asds = [ "phoe-toolbox" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/phoe-toolbox/2021-01-24/phoe-toolbox-20210124-git.tgz"; - sha256 = "0bzbgs4lkhw93y1cwrs9kp5yiyz8sg4885cnvi83dzzbla9b74kv"; - system = "phoe-toolbox"; - asd = "phoe-toolbox"; - }); - systems = [ "phoe-toolbox" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "trivial-indent" pkgs) ]; - }; - phoe-toolbox_slash_bag = { - pname = "phoe-toolbox_bag"; - version = "20210124-git"; - asds = [ "phoe-toolbox" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/phoe-toolbox/2021-01-24/phoe-toolbox-20210124-git.tgz"; - sha256 = "0bzbgs4lkhw93y1cwrs9kp5yiyz8sg4885cnvi83dzzbla9b74kv"; - system = "phoe-toolbox"; - asd = "phoe-toolbox"; - }); - systems = [ "phoe-toolbox/bag" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - meta = { - broken = true; - }; - }; - phonon = { - pname = "phonon"; - version = "20210531-git"; - asds = [ "phonon" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "phonon"; - asd = "phonon"; - }); - systems = [ "phonon" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtdbus" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtxml" pkgs) ]; - }; - phos = { - pname = "phos"; - version = "20220220-git"; - asds = [ "phos" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/phos/2022-02-20/phos-20220220-git.tgz"; - sha256 = "1zwci86rkbaiix0w2gd5q6nr8v2vv945pkvwp0j240iyzd4hfxr3"; - system = "phos"; - asd = "phos"; - }); - systems = [ "phos" ]; - lispLibs = [ (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "quri" pkgs) (getAttr "trivia" pkgs) (getAttr "usocket" pkgs) ]; - }; - phos_slash_nodgui = { - pname = "phos_nodgui"; - version = "20220220-git"; - asds = [ "phos" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/phos/2022-02-20/phos-20220220-git.tgz"; - sha256 = "1zwci86rkbaiix0w2gd5q6nr8v2vv945pkvwp0j240iyzd4hfxr3"; - system = "phos"; - asd = "phos"; - }); - systems = [ "phos/nodgui" ]; - lispLibs = [ (getAttr "nodgui" pkgs) (getAttr "phos" pkgs) ]; - meta = { - broken = true; - }; - }; - phos_slash_test = { - pname = "phos_test"; - version = "20220220-git"; - asds = [ "phos" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/phos/2022-02-20/phos-20220220-git.tgz"; - sha256 = "1zwci86rkbaiix0w2gd5q6nr8v2vv945pkvwp0j240iyzd4hfxr3"; - system = "phos"; - asd = "phos"; - }); - systems = [ "phos/test" ]; - lispLibs = [ (getAttr "clunit2" pkgs) (getAttr "phos" pkgs) ]; - meta = { - broken = true; - }; - }; - physical-dimension = { - pname = "physical-dimension"; - version = "master-df14cb8c-git"; - asds = [ "physical-dimension" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/antik/2019-10-08/antik-master-df14cb8c-git.tgz"; - sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; - system = "physical-dimension"; - asd = "physical-dimension"; - }); - systems = [ "physical-dimension" ]; - lispLibs = [ (getAttr "foreign-array" pkgs) (getAttr "fare-utils" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - physical-quantities = { - pname = "physical-quantities"; - version = "20211020-git"; - asds = [ "physical-quantities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/physical-quantities/2021-10-20/physical-quantities-20211020-git.tgz"; - sha256 = "0mb2s94s6fhw5vfa89naalw7ld11sdsszlqpz0c65dvpfyfmmdmh"; - system = "physical-quantities"; - asd = "physical-quantities"; - }); - systems = [ "physical-quantities" ]; - lispLibs = [ (getAttr "parseq" pkgs) ]; - }; - physical-quantities_slash_test = { - pname = "physical-quantities_test"; - version = "20211020-git"; - asds = [ "physical-quantities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/physical-quantities/2021-10-20/physical-quantities-20211020-git.tgz"; - sha256 = "0mb2s94s6fhw5vfa89naalw7ld11sdsszlqpz0c65dvpfyfmmdmh"; - system = "physical-quantities"; - asd = "physical-quantities"; - }); - systems = [ "physical-quantities/test" ]; - lispLibs = [ (getAttr "physical-quantities" pkgs) ]; - meta = { - broken = true; - }; - }; - picl = { - pname = "picl"; - version = "20210124-git"; - asds = [ "picl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/picl/2021-01-24/picl-20210124-git.tgz"; - sha256 = "14jwx7hv6h563ppvxicdkrqx0cxlz15im9a4grd9yvwdfxl70l4c"; - system = "picl"; - asd = "picl"; - }); - systems = [ "picl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "defclass-std" pkgs) ]; - }; - picl_slash_iterate = { - pname = "picl_iterate"; - version = "20210124-git"; - asds = [ "picl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/picl/2021-01-24/picl-20210124-git.tgz"; - sha256 = "14jwx7hv6h563ppvxicdkrqx0cxlz15im9a4grd9yvwdfxl70l4c"; - system = "picl"; - asd = "picl"; - }); - systems = [ "picl/iterate" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "picl" pkgs) ]; - meta = { - broken = true; - }; - }; - picl_slash_tests = { - pname = "picl_tests"; - version = "20210124-git"; - asds = [ "picl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/picl/2021-01-24/picl-20210124-git.tgz"; - sha256 = "14jwx7hv6h563ppvxicdkrqx0cxlz15im9a4grd9yvwdfxl70l4c"; - system = "picl"; - asd = "picl"; - }); - systems = [ "picl/tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiveam" pkgs) (getAttr "generic-cl" pkgs) (getAttr "iterate" pkgs) (getAttr "picl" pkgs) ]; - meta = { - broken = true; - }; - }; - piggyback-parameters = { - pname = "piggyback-parameters"; - version = "20200610-git"; - asds = [ "piggyback-parameters" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/piggyback-parameters/2020-06-10/piggyback-parameters-20200610-git.tgz"; - sha256 = "1187bgnz9pvs8xdxapqhrm4yqzwlp368ijmc5szm8r8q3zrb219n"; - system = "piggyback-parameters"; - asd = "piggyback-parameters"; - }); - systems = [ "piggyback-parameters" ]; - lispLibs = [ (getAttr "trivial-hashtable-serialize" pkgs) (getAttr "trivial-json-codec" pkgs) (getAttr "trivial-pooled-database" pkgs) ]; - }; - piggyback-parameters_slash_test = { - pname = "piggyback-parameters_test"; - version = "20200610-git"; - asds = [ "piggyback-parameters" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/piggyback-parameters/2020-06-10/piggyback-parameters-20200610-git.tgz"; - sha256 = "1187bgnz9pvs8xdxapqhrm4yqzwlp368ijmc5szm8r8q3zrb219n"; - system = "piggyback-parameters"; - asd = "piggyback-parameters"; - }); - systems = [ "piggyback-parameters/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "piggyback-parameters" pkgs) ]; - meta = { - broken = true; - }; - }; - pileup = { - pname = "pileup"; - version = "20150709-git"; - asds = [ "pileup" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pileup/2015-07-09/pileup-20150709-git.tgz"; - sha256 = "01gvshpxil0ggjgfmgcymbgmpsfaxy6aggm0bywkn40rck3038vb"; - system = "pileup"; - asd = "pileup"; - }); - systems = [ "pileup" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - pileup-tests = { - pname = "pileup-tests"; - version = "20150709-git"; - asds = [ "pileup-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pileup/2015-07-09/pileup-20150709-git.tgz"; - sha256 = "01gvshpxil0ggjgfmgcymbgmpsfaxy6aggm0bywkn40rck3038vb"; - system = "pileup-tests"; - asd = "pileup"; - }); - systems = [ "pileup-tests" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "pileup" pkgs) ]; - }; - pipes = { - pname = "pipes"; - version = "20150923-git"; - asds = [ "pipes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pipes/2015-09-23/pipes-20150923-git.tgz"; - sha256 = "17qcxalbdip20nkbwiv3kpdjjsy0g1y9s4a0zv38ch47bdl9yxpc"; - system = "pipes"; - asd = "pipes"; - }); - systems = [ "pipes" ]; - lispLibs = [ ]; - }; - piping = { - pname = "piping"; - version = "20221106-git"; - asds = [ "piping" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/piping/2022-11-06/piping-20221106-git.tgz"; - sha256 = "0kmjpa3wjinsfiik50n2c9b5g9n39qf7p2piy4237xddx2a0300r"; - system = "piping"; - asd = "piping"; - }); - systems = [ "piping" ]; - lispLibs = [ ]; - }; - pithy-xml = { - pname = "pithy-xml"; - version = "20101006-git"; - asds = [ "pithy-xml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pithy-xml/2010-10-06/pithy-xml-20101006-git.tgz"; - sha256 = "05zw5adiw7jgvi9w9c661s4r49fidpcxn6m7azmn0pzc936dg17h"; - system = "pithy-xml"; - asd = "pithy-xml"; - }); - systems = [ "pithy-xml" ]; - lispLibs = [ ]; - }; - pixman = { - pname = "pixman"; - version = "20170830-git"; - asds = [ "pixman" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-pixman/2017-08-30/cl-pixman-20170830-git.tgz"; - sha256 = "068hh7cv6f2wqwd8092wqh3rgdix6sa319qpm648mss8jfnjjbgj"; - system = "pixman"; - asd = "pixman"; - }); - systems = [ "pixman" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - pjlink = { - pname = "pjlink"; - version = "20220331-git"; - asds = [ "pjlink" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pjlink/2022-03-31/pjlink-20220331-git.tgz"; - sha256 = "1rsmg0x7fd32na36x9ahj6vji3xs6ckg5pyng8nf33fmdj8dscbc"; - system = "pjlink"; - asd = "pjlink"; - }); - systems = [ "pjlink" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "ip-interfaces" pkgs) (getAttr "md5" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "usocket" pkgs) ]; - }; - pk-serialize = { - pname = "pk-serialize"; - version = "20221106-git"; - asds = [ "pk-serialize" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pk-serialize/2022-11-06/pk-serialize-20221106-git.tgz"; - sha256 = "1fi9xxdlg2z9dnqb2sc7wg37aqzqjz43h2l1wxa5zvk73qqzapyn"; - system = "pk-serialize"; - asd = "pk-serialize"; - }); - systems = [ "pk-serialize" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - pkg-doc = { - pname = "pkg-doc"; - version = "20200925-git"; - asds = [ "pkg-doc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pkg-doc/2020-09-25/pkg-doc-20200925-git.tgz"; - sha256 = "1y4dcc0q3iizgvavnkl8q4bjxq0dngvqw5dhrf9bxf4d3q3vrbd4"; - system = "pkg-doc"; - asd = "pkg-doc"; - }); - systems = [ "pkg-doc" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "stdutils" pkgs) (getAttr "clim-widgets" pkgs) (getAttr "manifest" pkgs) (getAttr "nsort" pkgs) (getAttr "repl-utilities" pkgs) ]; - }; - place-modifiers = { - pname = "place-modifiers"; - version = "2.1"; - asds = [ "place-modifiers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/place-modifiers/2012-11-25/place-modifiers-2.1.tgz"; - sha256 = "13nd911h6i7gks78l30bzdqzygcqh47946jwaf50ak2iraagknvf"; - system = "place-modifiers"; - asd = "place-modifiers"; - }); - systems = [ "place-modifiers" ]; - lispLibs = [ (getAttr "cartesian-product-switch" pkgs) (getAttr "map-bind" pkgs) ]; - }; - place-utils = { - pname = "place-utils"; - version = "0.2"; - asds = [ "place-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/place-utils/2018-10-18/place-utils-0.2.tgz"; - sha256 = "1riaxxafn2xbyy6776yqns1bhz5jnzzpd177wb5xzvwlxiix6yf9"; - system = "place-utils"; - asd = "place-utils"; - }); - systems = [ "place-utils" ]; - lispLibs = [ ]; - }; - plain-odbc = { - pname = "plain-odbc"; - version = "20191130-git"; - asds = [ "plain-odbc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plain-odbc/2019-11-30/plain-odbc-20191130-git.tgz"; - sha256 = "1ca5v50bffycl0dlwydm385cgacbxvwfphi2gjy2ni573czy1lgb"; - system = "plain-odbc"; - asd = "plain-odbc"; - }); - systems = [ "plain-odbc" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) ]; - }; - planks = { - pname = "planks"; - version = "20110522-git"; - asds = [ "planks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/planks/2011-05-22/planks-20110522-git.tgz"; - sha256 = "1y7cg9xb75j1yslbxsmw0fyg738f4d28lnlm7w7hzgc51fc7875k"; - system = "planks"; - asd = "planks"; - }); - systems = [ "planks" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "ironclad" pkgs) (getAttr "rucksack" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - plokami = { - pname = "plokami"; - version = "20200218-git"; - asds = [ "plokami" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plokami/2020-02-18/plokami-20200218-git.tgz"; - sha256 = "1k78lpbaqqa2gnwi9k0y646md4s9xnijm774knl11p05r83w5ycb"; - system = "plokami"; - asd = "plokami"; - }); - systems = [ "plokami" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "uiop" pkgs) ]; - }; - plot = { - pname = "plot"; - version = "20221106-git"; - asds = [ "plot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plot/2022-11-06/plot-20221106-git.tgz"; - sha256 = "1fwp31jn9a0hla9yv44havgldmjf3hi2dgpm3j3h770d8wypy5vv"; - system = "plot"; - asd = "plot"; - }); - systems = [ "plot" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "alexandria_plus" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "data-frame" pkgs) ]; - }; - plot_slash_text = { - pname = "plot_text"; - version = "20221106-git"; - asds = [ "plot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plot/2022-11-06/plot-20221106-git.tgz"; - sha256 = "1fwp31jn9a0hla9yv44havgldmjf3hi2dgpm3j3h770d8wypy5vv"; - system = "plot"; - asd = "plot"; - }); - systems = [ "plot/text" ]; - lispLibs = [ (getAttr "cl-spark" pkgs) (getAttr "iterate" pkgs) (getAttr "num-utils" pkgs) (getAttr "select" pkgs) ]; - meta = { - broken = true; - }; - }; - plot_slash_vega = { - pname = "plot_vega"; - version = "20221106-git"; - asds = [ "plot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plot/2022-11-06/plot-20221106-git.tgz"; - sha256 = "1fwp31jn9a0hla9yv44havgldmjf3hi2dgpm3j3h770d8wypy5vv"; - system = "plot"; - asd = "plot"; - }); - systems = [ "plot/vega" ]; - lispLibs = [ (getAttr "cl-who" pkgs) (getAttr "dfio" pkgs) (getAttr "duologue" pkgs) (getAttr "lass" pkgs) (getAttr "let-plus" pkgs) (getAttr "lisp-stat" pkgs) (getAttr "local-time" pkgs) (getAttr "parenscript" pkgs) (getAttr "plot" pkgs) (getAttr "quri" pkgs) (getAttr "yason" pkgs) ]; - meta = { - broken = true; - }; - }; - plplot-examples = { - pname = "plplot-examples"; - version = "20180228-git"; - asds = [ "plplot-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-plplot/2018-02-28/cl-plplot-20180228-git.tgz"; - sha256 = "0hfgq47ga2r764jfc3ywaz5ynnvp701fjhbw0s4j1mrw4gaf6y6w"; - system = "plplot-examples"; - asd = "cl-plplot"; - }); - systems = [ "plplot-examples" ]; - lispLibs = [ (getAttr "cl-plplot" pkgs) (getAttr "png" pkgs) ]; - }; - pludeck = { - pname = "pludeck"; - version = "20180831-git"; - asds = [ "pludeck" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pludeck/2018-08-31/pludeck-20180831-git.tgz"; - sha256 = "0p6v7fxs48fxr76kvkh6z2mjjyz3vf2rp698jq1fl6p3hihbgl0m"; - system = "pludeck"; - asd = "pludeck"; - }); - systems = [ "pludeck" ]; - lispLibs = [ (getAttr "plump" pkgs) ]; - }; - plump = { - pname = "plump"; - version = "20221106-git"; - asds = [ "plump" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plump/2022-11-06/plump-20221106-git.tgz"; - sha256 = "1ndj8bs690fpwpz1xjkgfj9kdlrpvbv2qid4h7viynlpldqgbqnq"; - system = "plump"; - asd = "plump"; - }); - systems = [ "plump" ]; - lispLibs = [ (getAttr "array-utils" pkgs) (getAttr "documentation-utils" pkgs) ]; - }; - plump-bundle = { - pname = "plump-bundle"; - version = "20190710-git"; - asds = [ "plump-bundle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plump-bundle/2019-07-10/plump-bundle-20190710-git.tgz"; - sha256 = "1r9k4fh9vqszvsdsa101m1nqn3wmnb89cis2sj2asbssrmcllgn3"; - system = "plump-bundle"; - asd = "plump-bundle"; - }); - systems = [ "plump-bundle" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "closer-mop" pkgs) (getAttr "fast-io" pkgs) (getAttr "plump-dom" pkgs) ]; - }; - plump-dom = { - pname = "plump-dom"; - version = "20221106-git"; - asds = [ "plump-dom" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plump/2022-11-06/plump-20221106-git.tgz"; - sha256 = "1ndj8bs690fpwpz1xjkgfj9kdlrpvbv2qid4h7viynlpldqgbqnq"; - system = "plump-dom"; - asd = "plump-dom"; - }); - systems = [ "plump-dom" ]; - lispLibs = [ (getAttr "plump" pkgs) ]; - }; - plump-lexer = { - pname = "plump-lexer"; - version = "20221106-git"; - asds = [ "plump-lexer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plump/2022-11-06/plump-20221106-git.tgz"; - sha256 = "1ndj8bs690fpwpz1xjkgfj9kdlrpvbv2qid4h7viynlpldqgbqnq"; - system = "plump-lexer"; - asd = "plump-lexer"; - }); - systems = [ "plump-lexer" ]; - lispLibs = [ (getAttr "plump" pkgs) ]; - }; - plump-parser = { - pname = "plump-parser"; - version = "20221106-git"; - asds = [ "plump-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plump/2022-11-06/plump-20221106-git.tgz"; - sha256 = "1ndj8bs690fpwpz1xjkgfj9kdlrpvbv2qid4h7viynlpldqgbqnq"; - system = "plump-parser"; - asd = "plump-parser"; - }); - systems = [ "plump-parser" ]; - lispLibs = [ (getAttr "plump" pkgs) ]; - }; - plump-sexp = { - pname = "plump-sexp"; - version = "20210531-git"; - asds = [ "plump-sexp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plump-sexp/2021-05-31/plump-sexp-20210531-git.tgz"; - sha256 = "0zm9h0assjb8766z2v6l1k1s60y90y6f8smrl1dczwqlvc8xyln5"; - system = "plump-sexp"; - asd = "plump-sexp"; - }); - systems = [ "plump-sexp" ]; - lispLibs = [ (getAttr "plump" pkgs) ]; - }; - plump-tex = { - pname = "plump-tex"; - version = "20210531-git"; - asds = [ "plump-tex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plump-tex/2021-05-31/plump-tex-20210531-git.tgz"; - sha256 = "1qjiyw0kh8i2rd8rdznfz9vnvklcf9iffdbm8xvp3z1086frzfms"; - system = "plump-tex"; - asd = "plump-tex"; - }); - systems = [ "plump-tex" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "plump" pkgs) ]; - }; - plump-tex-test = { - pname = "plump-tex-test"; - version = "20210531-git"; - asds = [ "plump-tex-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plump-tex/2021-05-31/plump-tex-20210531-git.tgz"; - sha256 = "1qjiyw0kh8i2rd8rdznfz9vnvklcf9iffdbm8xvp3z1086frzfms"; - system = "plump-tex-test"; - asd = "plump-tex-test"; - }); - systems = [ "plump-tex-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "plump-tex" pkgs) ]; - }; - png = { - pname = "png"; - version = "20211020-git"; - asds = [ "png" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; - sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4"; - system = "png"; - asd = "png"; - }); - systems = [ "png" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - png-read = { - pname = "png-read"; - version = "20170830-git"; - asds = [ "png-read" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/png-read/2017-08-30/png-read-20170830-git.tgz"; - sha256 = "0vyczbcwskrygrf1hgrsnk0jil8skmvf1kiaalw5jps4fjrfdkw0"; - system = "png-read"; - asd = "png-read"; - }); - systems = [ "png-read" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "chipz" pkgs) (getAttr "iterate" pkgs) ]; - }; - png-test = { - pname = "png-test"; - version = "20211020-git"; - asds = [ "png-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-png/2021-10-20/cl-png-20211020-git.tgz"; - sha256 = "17xcb9ps5vf3if61blmx7cpfrz3gsw7jk8d5zv3f4cq8jrriqdx4"; - system = "png-test"; - asd = "png-test"; - }); - systems = [ "png-test" ]; - lispLibs = [ (getAttr "png" pkgs) ]; - }; - pngload = { - pname = "pngload"; - version = "20220707-git"; - asds = [ "pngload" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pngload/2022-07-07/pngload-20220707-git.tgz"; - sha256 = "1qnd2pz6ckdm5nnf4ipli3zgiyisfqjyf1aiy7iigijv4018lrlx"; - system = "pngload"; - asd = "pngload"; - }); - systems = [ "pngload" ]; - lispLibs = [ (getAttr "_3bz" pkgs) (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "mmap" pkgs) (getAttr "parse-float" pkgs) (getAttr "static-vectors" pkgs) (getAttr "swap-bytes" pkgs) (getAttr "uiop" pkgs) (getAttr "zpb-exif" pkgs) ]; - }; - pngload_dot_test = { - pname = "pngload.test"; - version = "20220707-git"; - asds = [ "pngload.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pngload/2022-07-07/pngload-20220707-git.tgz"; - sha256 = "1qnd2pz6ckdm5nnf4ipli3zgiyisfqjyf1aiy7iigijv4018lrlx"; - system = "pngload.test"; - asd = "pngload.test"; - }); - systems = [ "pngload.test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "local-time" pkgs) (getAttr "opticl" pkgs) (getAttr "png-read" pkgs) (getAttr "pngload" pkgs) (getAttr "uiop" pkgs) ]; - }; - poler = { - pname = "poler"; - version = "20181210-git"; - asds = [ "poler" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/poler/2018-12-10/poler-20181210-git.tgz"; - sha256 = "1lcyjxmz5vm5is1kgxqjvpkllywvbsj6wqx5v2ac0py5vqws1l8z"; - system = "poler"; - asd = "poler"; - }); - systems = [ "poler" ]; - lispLibs = [ ]; - }; - poler-test = { - pname = "poler-test"; - version = "20181210-git"; - asds = [ "poler-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/poler/2018-12-10/poler-20181210-git.tgz"; - sha256 = "1lcyjxmz5vm5is1kgxqjvpkllywvbsj6wqx5v2ac0py5vqws1l8z"; - system = "poler-test"; - asd = "poler-test"; - }); - systems = [ "poler-test" ]; - lispLibs = [ (getAttr "poler" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - policy-cond = { - pname = "policy-cond"; - version = "20200427-git"; - asds = [ "policy-cond" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/policy-cond/2020-04-27/policy-cond-20200427-git.tgz"; - sha256 = "0xj2a6lcg7i7g4038sc4f641din6m8vdiha8c5afz9fik80bshxk"; - system = "policy-cond"; - asd = "policy-cond"; - }); - systems = [ "policy-cond" ]; - lispLibs = [ ]; - }; - polisher = { - pname = "polisher"; - version = "20211230-git"; - asds = [ "polisher" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/polisher/2021-12-30/polisher-20211230-git.tgz"; - sha256 = "1i63kgk4vfisiyrfqdz0wc8ldvfh9jpkivsasgdhc97cad095ln0"; - system = "polisher"; - asd = "polisher"; - }); - systems = [ "polisher" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - polisher_dot_test = { - pname = "polisher.test"; - version = "20211230-git"; - asds = [ "polisher.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/polisher/2021-12-30/polisher-20211230-git.tgz"; - sha256 = "1i63kgk4vfisiyrfqdz0wc8ldvfh9jpkivsasgdhc97cad095ln0"; - system = "polisher.test"; - asd = "polisher.test"; - }); - systems = [ "polisher.test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "polisher" pkgs) ]; - }; - polymorphic-functions = { - pname = "polymorphic-functions"; - version = "20221106-git"; - asds = [ "polymorphic-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/polymorphic-functions/2022-11-06/polymorphic-functions-20221106-git.tgz"; - sha256 = "04bb7iiwq16hkn78r2qrfqwxldqrkdspfdfyvymcbp9w5jy67nlw"; - system = "polymorphic-functions"; - asd = "polymorphic-functions"; - }); - systems = [ "polymorphic-functions" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-form-types" pkgs) (getAttr "closer-mop" pkgs) (getAttr "compiler-macro-notes" pkgs) (getAttr "ctype" pkgs) (getAttr "fiveam" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "optima" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - polymorphic-functions_slash_swank = { - pname = "polymorphic-functions_swank"; - version = "20221106-git"; - asds = [ "polymorphic-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/polymorphic-functions/2022-11-06/polymorphic-functions-20221106-git.tgz"; - sha256 = "04bb7iiwq16hkn78r2qrfqwxldqrkdspfdfyvymcbp9w5jy67nlw"; - system = "polymorphic-functions"; - asd = "polymorphic-functions"; - }); - systems = [ "polymorphic-functions/swank" ]; - lispLibs = [ (getAttr "polymorphic-functions" pkgs) (getAttr "swank" pkgs) ]; - meta = { - broken = true; - }; - }; - pooler = { - pname = "pooler"; - version = "20150608-git"; - asds = [ "pooler" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pooler/2015-06-08/pooler-20150608-git.tgz"; - sha256 = "18vdl06cckk07m7r477qzcz24j3sid1agfa69fp91jna5aqi46kb"; - system = "pooler"; - asd = "pooler"; - }); - systems = [ "pooler" ]; - lispLibs = [ ]; - }; - portable-condition-system = { - pname = "portable-condition-system"; - version = "20210807-git"; - asds = [ "portable-condition-system" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/portable-condition-system/2021-08-07/portable-condition-system-20210807-git.tgz"; - sha256 = "099lb9f4bavj95wik99wla5rf6fk1gdw9pvn0cqlaf0wf20csd3h"; - system = "portable-condition-system"; - asd = "portable-condition-system"; - }); - systems = [ "portable-condition-system" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - portable-condition-system_dot_integration = { - pname = "portable-condition-system.integration"; - version = "20210807-git"; - asds = [ "portable-condition-system.integration" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/portable-condition-system/2021-08-07/portable-condition-system-20210807-git.tgz"; - sha256 = "099lb9f4bavj95wik99wla5rf6fk1gdw9pvn0cqlaf0wf20csd3h"; - system = "portable-condition-system.integration"; - asd = "portable-condition-system.integration"; - }); - systems = [ "portable-condition-system.integration" ]; - lispLibs = [ (getAttr "portable-condition-system" pkgs) (getAttr "trivial-custom-debugger" pkgs) ]; - }; - portable-condition-system_dot_integration_slash_test = { - pname = "portable-condition-system.integration_test"; - version = "20210807-git"; - asds = [ "portable-condition-system.integration" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/portable-condition-system/2021-08-07/portable-condition-system-20210807-git.tgz"; - sha256 = "099lb9f4bavj95wik99wla5rf6fk1gdw9pvn0cqlaf0wf20csd3h"; - system = "portable-condition-system.integration"; - asd = "portable-condition-system.integration"; - }); - systems = [ "portable-condition-system.integration/test" ]; - lispLibs = [ (getAttr "portable-condition-system_dot_integration" pkgs) ]; - meta = { - broken = true; - }; - }; - portable-condition-system_slash_test = { - pname = "portable-condition-system_test"; - version = "20210807-git"; - asds = [ "portable-condition-system" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/portable-condition-system/2021-08-07/portable-condition-system-20210807-git.tgz"; - sha256 = "099lb9f4bavj95wik99wla5rf6fk1gdw9pvn0cqlaf0wf20csd3h"; - system = "portable-condition-system"; - asd = "portable-condition-system"; - }); - systems = [ "portable-condition-system/test" ]; - lispLibs = [ (getAttr "portable-condition-system" pkgs) ]; - meta = { - broken = true; - }; - }; - portable-threads = { - pname = "portable-threads"; - version = "20210531-git"; - asds = [ "portable-threads" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/portable-threads/2021-05-31/portable-threads-20210531-git.tgz"; - sha256 = "05y00mlvwlfas4jj50qas2v2rxa0hyc9834lpnbh61a3g8sz0d1f"; - system = "portable-threads"; - asd = "portable-threads"; - }); - systems = [ "portable-threads" ]; - lispLibs = [ ]; - }; - portable-threads_slash_test = { - pname = "portable-threads_test"; - version = "20210531-git"; - asds = [ "portable-threads" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/portable-threads/2021-05-31/portable-threads-20210531-git.tgz"; - sha256 = "05y00mlvwlfas4jj50qas2v2rxa0hyc9834lpnbh61a3g8sz0d1f"; - system = "portable-threads"; - asd = "portable-threads"; - }); - systems = [ "portable-threads/test" ]; - lispLibs = [ (getAttr "portable-threads" pkgs) ]; - meta = { - broken = true; - }; - }; - portal = { - pname = "portal"; - version = "20211209-git"; - asds = [ "portal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/portal/2021-12-09/portal-20211209-git.tgz"; - sha256 = "1012jc068qdd8df6mmbn8vmmqlniqm5j2jbyrraw3yz8c13c8280"; - system = "portal"; - asd = "portal"; - }); - systems = [ "portal" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "arrows" pkgs) (getAttr "cl-base64" pkgs) (getAttr "str" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "global-vars" pkgs) (getAttr "ironclad" pkgs) (getAttr "parse-float" pkgs) (getAttr "usocket-server" pkgs) ]; - }; - portmanteau = { - pname = "portmanteau"; - version = "20181018-git"; - asds = [ "portmanteau" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-portmanteau/2018-10-18/cl-portmanteau-20181018-git.tgz"; - sha256 = "0430yixy722zkiljc6kh68hx2pyf2pbylgyp7n4qnnky86c0z0ip"; - system = "portmanteau"; - asd = "portmanteau"; - }); - systems = [ "portmanteau" ]; - lispLibs = [ (getAttr "vom" pkgs) ]; - }; - portmanteau-tests = { - pname = "portmanteau-tests"; - version = "20181018-git"; - asds = [ "portmanteau-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-portmanteau/2018-10-18/cl-portmanteau-20181018-git.tgz"; - sha256 = "0430yixy722zkiljc6kh68hx2pyf2pbylgyp7n4qnnky86c0z0ip"; - system = "portmanteau-tests"; - asd = "portmanteau-tests"; - }); - systems = [ "portmanteau-tests" ]; - lispLibs = [ (getAttr "portmanteau" pkgs) (getAttr "fiveam" pkgs) ]; - }; - positional-lambda = { - pname = "positional-lambda"; - version = "2.0"; - asds = [ "positional-lambda" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/positional-lambda/2012-10-13/positional-lambda-2.0.tgz"; - sha256 = "00jbr42czv7piza5sm5hmmls7xnhq1pnzl09j6c28xrknr61cj8r"; - system = "positional-lambda"; - asd = "positional-lambda"; - }); - systems = [ "positional-lambda" ]; - lispLibs = [ (getAttr "map-bind" pkgs) ]; - }; - posix-shm = { - pname = "posix-shm"; - version = "20221106-git"; - asds = [ "posix-shm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/posix-shm/2022-11-06/posix-shm-20221106-git.tgz"; - sha256 = "057qm9db502a86q60rsp5g7f8n4a997iwsfcid41gqadyd9rcjjz"; - system = "posix-shm"; - asd = "posix-shm"; - }); - systems = [ "posix-shm" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - posix-shm_slash_ffi = { - pname = "posix-shm_ffi"; - version = "20221106-git"; - asds = [ "posix-shm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/posix-shm/2022-11-06/posix-shm-20221106-git.tgz"; - sha256 = "057qm9db502a86q60rsp5g7f8n4a997iwsfcid41gqadyd9rcjjz"; - system = "posix-shm"; - asd = "posix-shm"; - }); - systems = [ "posix-shm/ffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - meta = { - broken = true; - }; - }; - posix-shm_slash_test = { - pname = "posix-shm_test"; - version = "20221106-git"; - asds = [ "posix-shm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/posix-shm/2022-11-06/posix-shm-20221106-git.tgz"; - sha256 = "057qm9db502a86q60rsp5g7f8n4a997iwsfcid41gqadyd9rcjjz"; - system = "posix-shm"; - asd = "posix-shm"; - }); - systems = [ "posix-shm/test" ]; - lispLibs = [ (getAttr "osicat" pkgs) (getAttr "parachute" pkgs) (getAttr "posix-shm" pkgs) ]; - meta = { - broken = true; - }; - }; - postmodern = { - pname = "postmodern"; - version = "20221106-git"; - asds = [ "postmodern" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2022-11-06/postmodern-20221106-git.tgz"; - sha256 = "012ipwi4m5x6jhl7pd9gwvdga5hgp1l08vqdgd28rzy34s2mfv74"; - system = "postmodern"; - asd = "postmodern"; - }); - systems = [ "postmodern" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "global-vars" pkgs) (getAttr "cl-postgres" pkgs) (getAttr "s-sql" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - }; - postmodern-localtime = { - pname = "postmodern-localtime"; - version = "20200610-git"; - asds = [ "postmodern-localtime" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern-localtime/2020-06-10/postmodern-localtime-20200610-git.tgz"; - sha256 = "0kiswbdr3vsl7xfs43h0w9c2s6fm6ammff6mpab6zba7rdmfg6d3"; - system = "postmodern-localtime"; - asd = "postmodern-localtime"; - }); - systems = [ "postmodern-localtime" ]; - lispLibs = [ (getAttr "local-time" pkgs) (getAttr "cl-postgres" pkgs) (getAttr "postmodern" pkgs) ]; - }; - postmodern_slash_tests = { - pname = "postmodern_tests"; - version = "20221106-git"; - asds = [ "postmodern" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2022-11-06/postmodern-20221106-git.tgz"; - sha256 = "012ipwi4m5x6jhl7pd9gwvdga5hgp1l08vqdgd28rzy34s2mfv74"; - system = "postmodern"; - asd = "postmodern"; - }); - systems = [ "postmodern/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "cl-postgres_plus_local-time" pkgs) (getAttr "local-time" pkgs) (getAttr "cl-postgres" pkgs) (getAttr "postmodern" pkgs) (getAttr "s-sql" pkgs) (getAttr "simple-date" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - postmodernity = { - pname = "postmodernity"; - version = "20170124-git"; - asds = [ "postmodernity" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodernity/2017-01-24/postmodernity-20170124-git.tgz"; - sha256 = "06mwlp79dgzsgfhgbhvqk4691nm52v3lqm99y72dm7pm4gmc2m9m"; - system = "postmodernity"; - asd = "postmodernity"; - }); - systems = [ "postmodernity" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "postmodern" pkgs) ]; - }; - postoffice = { - pname = "postoffice"; - version = "20120909-git"; - asds = [ "postoffice" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postoffice/2012-09-09/postoffice-20120909-git.tgz"; - sha256 = "041k8nc969xyjdmbn6348pra3v5jb1sw4mrnxmamv0flngyv12fg"; - system = "postoffice"; - asd = "postoffice"; - }); - systems = [ "postoffice" ]; - lispLibs = [ (getAttr "acl-compat" pkgs) ]; - }; - pounds = { - pname = "pounds"; - version = "20160208-git"; - asds = [ "pounds" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pounds/2016-02-08/pounds-20160208-git.tgz"; - sha256 = "17hz0ywzfirmlwkrd9zrbl07ihhm03zhzqrz3rkmh1j9v95sy2kl"; - system = "pounds"; - asd = "pounds"; - }); - systems = [ "pounds" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "nibbles" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - pp-toml = { - pname = "pp-toml"; - version = "20221106-git"; - asds = [ "pp-toml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pp-toml/2022-11-06/pp-toml-20221106-git.tgz"; - sha256 = "136d7jzz7l2ck9wwld0ac46jmpm94lvja6m50sy73s232slka2hg"; - system = "pp-toml"; - asd = "pp-toml"; - }); - systems = [ "pp-toml" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "esrap" pkgs) (getAttr "generic-comparability" pkgs) (getAttr "local-time" pkgs) (getAttr "parse-number" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - pp-toml-tests = { - pname = "pp-toml-tests"; - version = "20221106-git"; - asds = [ "pp-toml-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pp-toml/2022-11-06/pp-toml-20221106-git.tgz"; - sha256 = "136d7jzz7l2ck9wwld0ac46jmpm94lvja6m50sy73s232slka2hg"; - system = "pp-toml-tests"; - asd = "pp-toml-tests"; - }); - systems = [ "pp-toml-tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "esrap" pkgs) (getAttr "fiveam" pkgs) (getAttr "generic-comparability" pkgs) (getAttr "local-time" pkgs) (getAttr "parse-number" pkgs) (getAttr "pp-toml" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - ppath = { - pname = "ppath"; - version = "20180711-git"; - asds = [ "ppath" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ppath/2018-07-11/ppath-20180711-git.tgz"; - sha256 = "1c46q9lmzqv14z80d3fwdawgn3pn4922x31fyqvsvbcjm4hd16fb"; - system = "ppath"; - asd = "ppath"; - }); - systems = [ "ppath" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "osicat" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-features" pkgs) (getAttr "uiop" pkgs) ]; - }; - ppath-test = { - pname = "ppath-test"; - version = "20180711-git"; - asds = [ "ppath-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ppath/2018-07-11/ppath-20180711-git.tgz"; - sha256 = "1c46q9lmzqv14z80d3fwdawgn3pn4922x31fyqvsvbcjm4hd16fb"; - system = "ppath-test"; - asd = "ppath-test"; - }); - systems = [ "ppath-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fad" pkgs) (getAttr "ppath" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - practical-cl = { - pname = "practical-cl"; - version = "20180430-git"; - asds = [ "practical-cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/practical-cl/2018-04-30/practical-cl-20180430-git.tgz"; - sha256 = "0bjwnnxkqw0cf2p1fyx9ihy6hgsxhljm4bns2blvgv63s3j1znd9"; - system = "practical-cl"; - asd = "practical-cl"; - }); - systems = [ "practical-cl" ]; - lispLibs = [ (getAttr "pcl-binary-data" pkgs) (getAttr "pcl-html" pkgs) (getAttr "pcl-id3v2" pkgs) (getAttr "pcl-macro-utilities" pkgs) (getAttr "pcl-mp3-browser" pkgs) (getAttr "pcl-mp3-database" pkgs) (getAttr "pcl-pathnames" pkgs) (getAttr "pcl-shoutcast" pkgs) (getAttr "pcl-simple-database" pkgs) (getAttr "pcl-spam" pkgs) (getAttr "pcl-test-framework" pkgs) (getAttr "pcl-url-function" pkgs) ]; - }; - prbs = { - pname = "prbs"; - version = "20180228-git"; - asds = [ "prbs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prbs/2018-02-28/prbs-20180228-git.tgz"; - sha256 = "0qbvbmxa66b367z9px4nyxqb21b9w2hr82rw7hfq5aynmwfk3fzi"; - system = "prbs"; - asd = "prbs"; - }); - systems = [ "prbs" ]; - lispLibs = [ ]; - }; - prbs-docs = { - pname = "prbs-docs"; - version = "20180228-git"; - asds = [ "prbs-docs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prbs/2018-02-28/prbs-20180228-git.tgz"; - sha256 = "0qbvbmxa66b367z9px4nyxqb21b9w2hr82rw7hfq5aynmwfk3fzi"; - system = "prbs-docs"; - asd = "prbs-docs"; - }); - systems = [ "prbs-docs" ]; - lispLibs = [ (getAttr "cl-gendoc" pkgs) (getAttr "prbs" pkgs) ]; - }; - pretty-function = { - pname = "pretty-function"; - version = "20130615-git"; - asds = [ "pretty-function" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pretty-function/2013-06-15/pretty-function-20130615-git.tgz"; - sha256 = "1hzfjwsp6r5nki6h8kry8k2bgj19mrp0jbq7jhsz3kz6y4ll0hb5"; - system = "pretty-function"; - asd = "pretty-function"; - }); - systems = [ "pretty-function" ]; - lispLibs = [ ]; - }; - primecount = { - pname = "primecount"; - version = "20200325-git"; - asds = [ "primecount" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/primecount/2020-03-25/primecount-20200325-git.tgz"; - sha256 = "1fw855qp82b887azww7z3yhd2zafaxjnzyff1ldf2wa6mb4f0dj8"; - system = "primecount"; - asd = "primecount"; - }); - systems = [ "primecount" ]; - lispLibs = [ ]; - }; - print-html = { - pname = "print-html"; - version = "20181018-git"; - asds = [ "print-html" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/print-html/2018-10-18/print-html-20181018-git.tgz"; - sha256 = "1ihr2yy6fvli3awrkfn4v8pm41wab5wsj30v84rr75v4p5irqmz8"; - system = "print-html"; - asd = "print-html"; - }); - systems = [ "print-html" ]; - lispLibs = [ ]; - }; - print-licenses = { - pname = "print-licenses"; - version = "20220707-git"; - asds = [ "print-licenses" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/print-licenses/2022-07-07/print-licenses-20220707-git.tgz"; - sha256 = "1rwzsckcb2yzg7yvzg4ypw3352agfxr7h49j8kynvs17zzbi0w07"; - system = "print-licenses"; - asd = "print-licenses"; - }); - systems = [ "print-licenses" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) ]; - }; - printv = { - pname = "printv"; - version = "20211230-git"; - asds = [ "printv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/printv/2021-12-30/printv-20211230-git.tgz"; - sha256 = "07agyzkwp3w2r4d2anrmr8h00yngpr5dq9mjd3m4kzhn1jcmilfb"; - system = "printv"; - asd = "printv"; - }); - systems = [ "printv" ]; - lispLibs = [ ]; - }; - priority-queue = { - pname = "priority-queue"; - version = "20150709-git"; - asds = [ "priority-queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/priority-queue/2015-07-09/priority-queue-20150709-git.tgz"; - sha256 = "0y5a1fid8xzzl58hfdj64n8mrzq0kr06a0lnmdjpgi0czc3x0jcy"; - system = "priority-queue"; - asd = "priority-queue"; - }); - systems = [ "priority-queue" ]; - lispLibs = [ ]; - }; - priority-queue-benchmark = { - pname = "priority-queue-benchmark"; - version = "20221106-git"; - asds = [ "priority-queue-benchmark" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/damn-fast-priority-queue/2022-11-06/damn-fast-priority-queue-20221106-git.tgz"; - sha256 = "14917b1z7ag3a7f88p4fk4649iy07kn9vpq6bszdxcp1irnc5a13"; - system = "priority-queue-benchmark"; - asd = "priority-queue-benchmark"; - }); - systems = [ "priority-queue-benchmark" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bodge-heap" pkgs) (getAttr "cl-heap" pkgs) (getAttr "damn-fast-priority-queue" pkgs) (getAttr "damn-fast-stable-priority-queue" pkgs) (getAttr "heap" pkgs) (getAttr "minheap" pkgs) (getAttr "pettomato-indexed-priority-queue" pkgs) (getAttr "pileup" pkgs) (getAttr "priority-queue" pkgs) (getAttr "queues_dot_priority-queue" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - proc-parse = { - pname = "proc-parse"; - version = "20190813-git"; - asds = [ "proc-parse" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz"; - sha256 = "07vbj26bfq4ywlcmamsqyac29rsdsa8lamjqx1ycla1bcvgmi4w2"; - system = "proc-parse"; - asd = "proc-parse"; - }); - systems = [ "proc-parse" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) ]; - }; - proc-parse-test = { - pname = "proc-parse-test"; - version = "20190813-git"; - asds = [ "proc-parse-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz"; - sha256 = "07vbj26bfq4ywlcmamsqyac29rsdsa8lamjqx1ycla1bcvgmi4w2"; - system = "proc-parse-test"; - asd = "proc-parse-test"; - }); - systems = [ "proc-parse-test" ]; - lispLibs = [ (getAttr "proc-parse" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - projectured_dot_document = { - pname = "projectured.document"; - version = "quicklisp-c3a60e76-git"; - asds = [ "projectured.document" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; - sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; - system = "projectured.document"; - asd = "projectured.document"; - }); - systems = [ "projectured.document" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "parse-number" pkgs) (getAttr "projectured_dot_editor" pkgs) (getAttr "s-xml" pkgs) ]; - }; - projectured_dot_editor = { - pname = "projectured.editor"; - version = "quicklisp-c3a60e76-git"; - asds = [ "projectured.editor" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; - sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; - system = "projectured.editor"; - asd = "projectured.editor"; - }); - systems = [ "projectured.editor" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_common" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "hu_dot_dwim_dot_defclass-star" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_serializer" pkgs) (getAttr "hu_dot_dwim_dot_syntax-sugar" pkgs) (getAttr "hu_dot_dwim_dot_util" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - projectured_dot_executable = { - pname = "projectured.executable"; - version = "quicklisp-c3a60e76-git"; - asds = [ "projectured.executable" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; - sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; - system = "projectured.executable"; - asd = "projectured.executable"; - }); - systems = [ "projectured.executable" ]; - lispLibs = [ (getAttr "command-line-arguments" pkgs) (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "projectured_dot_sdl" pkgs) ]; - }; - projectured_dot_projection = { - pname = "projectured.projection"; - version = "quicklisp-c3a60e76-git"; - asds = [ "projectured.projection" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; - sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; - system = "projectured.projection"; - asd = "projectured.projection"; - }); - systems = [ "projectured.projection" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "projectured_dot_document" pkgs) (getAttr "projectured_dot_editor" pkgs) ]; - }; - projectured_dot_sdl = { - pname = "projectured.sdl"; - version = "quicklisp-c3a60e76-git"; - asds = [ "projectured.sdl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; - sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; - system = "projectured.sdl"; - asd = "projectured.sdl"; - }); - systems = [ "projectured.sdl" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_sdl" pkgs) (getAttr "projectured_dot_document" pkgs) (getAttr "projectured_dot_editor" pkgs) (getAttr "projectured_dot_projection" pkgs) ]; - }; - projectured_dot_sdl_dot_test = { - pname = "projectured.sdl.test"; - version = "quicklisp-c3a60e76-git"; - asds = [ "projectured.sdl.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; - sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; - system = "projectured.sdl.test"; - asd = "projectured.sdl.test"; - }); - systems = [ "projectured.sdl.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "projectured_dot_sdl" pkgs) (getAttr "projectured_dot_test" pkgs) ]; - }; - projectured_dot_swank = { - pname = "projectured.swank"; - version = "quicklisp-c3a60e76-git"; - asds = [ "projectured.swank" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; - sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; - system = "projectured.swank"; - asd = "projectured.swank"; - }); - systems = [ "projectured.swank" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "projectured_dot_editor" pkgs) (getAttr "swank" pkgs) ]; - }; - projectured_dot_test = { - pname = "projectured.test"; - version = "quicklisp-c3a60e76-git"; - asds = [ "projectured.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/projectured/2017-12-27/projectured-quicklisp-c3a60e76-git.tgz"; - sha256 = "1gbsqaw571xgh2glg4386545b5sqjgbaiqa3x4j1gr70kirbzydn"; - system = "projectured.test"; - asd = "projectured.test"; - }); - systems = [ "projectured.test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_asdf" pkgs) (getAttr "hu_dot_dwim_dot_logger" pkgs) (getAttr "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" pkgs) (getAttr "projectured_dot_document" pkgs) (getAttr "projectured_dot_editor" pkgs) (getAttr "projectured_dot_projection" pkgs) (getAttr "projectured_dot_swank" pkgs) ]; - }; - prometheus = { - pname = "prometheus"; - version = "20201220-git"; - asds = [ "prometheus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus"; - asd = "prometheus"; - }); - systems = [ "prometheus" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "local-time" pkgs) (getAttr "quantile-estimator" pkgs) ]; - }; - prometheus_dot_collectors_dot_process = { - pname = "prometheus.collectors.process"; - version = "20201220-git"; - asds = [ "prometheus.collectors.process" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.collectors.process"; - asd = "prometheus.collectors.process"; - }); - systems = [ "prometheus.collectors.process" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-fad" pkgs) (getAttr "prometheus" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - prometheus_dot_collectors_dot_process_dot_test = { - pname = "prometheus.collectors.process.test"; - version = "20201220-git"; - asds = [ "prometheus.collectors.process.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.collectors.process.test"; - asd = "prometheus.collectors.process.test"; - }); - systems = [ "prometheus.collectors.process.test" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "log4cl" pkgs) (getAttr "mw-equiv" pkgs) (getAttr "prometheus_dot_collectors_dot_process" pkgs) (getAttr "prometheus_dot_test_dot_support" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - prometheus_dot_collectors_dot_sbcl = { - pname = "prometheus.collectors.sbcl"; - version = "20201220-git"; - asds = [ "prometheus.collectors.sbcl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.collectors.sbcl"; - asd = "prometheus.collectors.sbcl"; - }); - systems = [ "prometheus.collectors.sbcl" ]; - lispLibs = [ (getAttr "prometheus" pkgs) ]; - }; - prometheus_dot_collectors_dot_sbcl_dot_test = { - pname = "prometheus.collectors.sbcl.test"; - version = "20201220-git"; - asds = [ "prometheus.collectors.sbcl.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.collectors.sbcl.test"; - asd = "prometheus.collectors.sbcl.test"; - }); - systems = [ "prometheus.collectors.sbcl.test" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "log4cl" pkgs) (getAttr "mw-equiv" pkgs) (getAttr "prometheus_dot_collectors_dot_sbcl" pkgs) (getAttr "prometheus_dot_test_dot_support" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - prometheus_dot_examples = { - pname = "prometheus.examples"; - version = "20201220-git"; - asds = [ "prometheus.examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.examples"; - asd = "prometheus.examples"; - }); - systems = [ "prometheus.examples" ]; - lispLibs = [ (getAttr "prometheus" pkgs) (getAttr "prometheus_dot_collectors_dot_process" pkgs) (getAttr "prometheus_dot_collectors_dot_sbcl" pkgs) (getAttr "prometheus_dot_exposers_dot_hunchentoot" pkgs) (getAttr "prometheus_dot_formats_dot_text" pkgs) ]; - }; - prometheus_dot_exposers_dot_hunchentoot = { - pname = "prometheus.exposers.hunchentoot"; - version = "20201220-git"; - asds = [ "prometheus.exposers.hunchentoot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.exposers.hunchentoot"; - asd = "prometheus.exposers.hunchentoot"; - }); - systems = [ "prometheus.exposers.hunchentoot" ]; - lispLibs = [ (getAttr "hunchentoot" pkgs) (getAttr "prometheus" pkgs) (getAttr "prometheus_dot_formats_dot_text" pkgs) (getAttr "salza2" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - prometheus_dot_exposers_dot_hunchentoot_dot_test = { - pname = "prometheus.exposers.hunchentoot.test"; - version = "20201220-git"; - asds = [ "prometheus.exposers.hunchentoot.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.exposers.hunchentoot.test"; - asd = "prometheus.exposers.hunchentoot.test"; - }); - systems = [ "prometheus.exposers.hunchentoot.test" ]; - lispLibs = [ (getAttr "chipz" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "drakma" pkgs) (getAttr "log4cl" pkgs) (getAttr "mw-equiv" pkgs) (getAttr "prometheus_dot_exposers_dot_hunchentoot" pkgs) (getAttr "prometheus_dot_formats_dot_text" pkgs) (getAttr "prometheus_dot_test_dot_support" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - prometheus_dot_formats_dot_text = { - pname = "prometheus.formats.text"; - version = "20201220-git"; - asds = [ "prometheus.formats.text" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.formats.text"; - asd = "prometheus.formats.text"; - }); - systems = [ "prometheus.formats.text" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "prometheus" pkgs) ]; - }; - prometheus_dot_formats_dot_text_dot_test = { - pname = "prometheus.formats.text.test"; - version = "20201220-git"; - asds = [ "prometheus.formats.text.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.formats.text.test"; - asd = "prometheus.formats.text.test"; - }); - systems = [ "prometheus.formats.text.test" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "log4cl" pkgs) (getAttr "mw-equiv" pkgs) (getAttr "prometheus_dot_formats_dot_text" pkgs) (getAttr "prometheus_dot_test_dot_support" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - prometheus_dot_pushgateway = { - pname = "prometheus.pushgateway"; - version = "20201220-git"; - asds = [ "prometheus.pushgateway" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.pushgateway"; - asd = "prometheus.pushgateway"; - }); - systems = [ "prometheus.pushgateway" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "prometheus" pkgs) (getAttr "prometheus_dot_formats_dot_text" pkgs) ]; - }; - prometheus_dot_pushgateway_dot_test = { - pname = "prometheus.pushgateway.test"; - version = "20201220-git"; - asds = [ "prometheus.pushgateway.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.pushgateway.test"; - asd = "prometheus.pushgateway.test"; - }); - systems = [ "prometheus.pushgateway.test" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "log4cl" pkgs) (getAttr "mw-equiv" pkgs) (getAttr "prometheus_dot_pushgateway" pkgs) (getAttr "prometheus_dot_test_dot_support" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - prometheus_dot_test = { - pname = "prometheus.test"; - version = "20201220-git"; - asds = [ "prometheus.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.test"; - asd = "prometheus.test"; - }); - systems = [ "prometheus.test" ]; - lispLibs = [ (getAttr "cl-interpol" pkgs) (getAttr "log4cl" pkgs) (getAttr "mw-equiv" pkgs) (getAttr "prometheus" pkgs) (getAttr "prometheus_dot_test_dot_support" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - prometheus_dot_test_dot_all = { - pname = "prometheus.test.all"; - version = "20201220-git"; - asds = [ "prometheus.test.all" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.test.all"; - asd = "prometheus.test.all"; - }); - systems = [ "prometheus.test.all" ]; - lispLibs = [ (getAttr "cl-coveralls" pkgs) (getAttr "prometheus_dot_collectors_dot_process_dot_test" pkgs) (getAttr "prometheus_dot_collectors_dot_sbcl_dot_test" pkgs) (getAttr "prometheus_dot_exposers_dot_hunchentoot_dot_test" pkgs) (getAttr "prometheus_dot_formats_dot_text_dot_test" pkgs) (getAttr "prometheus_dot_pushgateway_dot_test" pkgs) (getAttr "prometheus_dot_test" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - prometheus_dot_test_dot_support = { - pname = "prometheus.test.support"; - version = "20201220-git"; - asds = [ "prometheus.test.support" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prometheus.cl/2020-12-20/prometheus.cl-20201220-git.tgz"; - sha256 = "15ab4c7yfm83nmfvaq5kbsqrgx558k292szm9frfda7nlycfnmyp"; - system = "prometheus.test.support"; - asd = "prometheus.test.support"; - }); - systems = [ "prometheus.test.support" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "prometheus" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - promise = { - pname = "promise"; - version = "20211230-git"; - asds = [ "promise" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/promise/2021-12-30/promise-20211230-git.tgz"; - sha256 = "1wzp4pda8nddvnh1isnr8z0q3czjghy0dhhd15690ph69jyjb22s"; - system = "promise"; - asd = "promise"; - }); - systems = [ "promise" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - promise-test = { - pname = "promise-test"; - version = "20211230-git"; - asds = [ "promise-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/promise/2021-12-30/promise-20211230-git.tgz"; - sha256 = "1wzp4pda8nddvnh1isnr8z0q3czjghy0dhhd15690ph69jyjb22s"; - system = "promise-test"; - asd = "promise-test"; - }); - systems = [ "promise-test" ]; - lispLibs = [ (getAttr "parachute" pkgs) (getAttr "promise" pkgs) ]; - }; - prompt-for = { - pname = "prompt-for"; - version = "20220707-git"; - asds = [ "prompt-for" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prompt-for/2022-07-07/prompt-for-20220707-git.tgz"; - sha256 = "1zjc96ryyzsr5519s7yji40askqyymjrbdwx3r2r7bv146siqs5m"; - system = "prompt-for"; - asd = "prompt-for"; - }); - systems = [ "prompt-for" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - prompt-for_dot_test = { - pname = "prompt-for.test"; - version = "20220707-git"; - asds = [ "prompt-for.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prompt-for/2022-07-07/prompt-for-20220707-git.tgz"; - sha256 = "1zjc96ryyzsr5519s7yji40askqyymjrbdwx3r2r7bv146siqs5m"; - system = "prompt-for.test"; - asd = "prompt-for.test"; - }); - systems = [ "prompt-for.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "prompt-for" pkgs) ]; - }; - protest = { - pname = "protest"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "moptilities" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - protest_slash_1am = { - pname = "protest_1am"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest/1am" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "named-readtables" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - protest_slash_base = { - pname = "protest_base"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest/base" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - protest_slash_common = { - pname = "protest_common"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest/common" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "moptilities" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - protest_slash_common_slash_addressed = { - pname = "protest_common_addressed"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest/common/addressed" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "moptilities" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - protest_slash_common_slash_date = { - pname = "protest_common_date"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest/common/date" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "moptilities" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - protest_slash_common_slash_handling = { - pname = "protest_common_handling"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest/common/handling" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "moptilities" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - protest_slash_common_slash_killable = { - pname = "protest_common_killable"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest/common/killable" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "moptilities" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - protest_slash_common_slash_named = { - pname = "protest_common_named"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest/common/named" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "moptilities" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - protest_slash_ftype = { - pname = "protest_ftype"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest/ftype" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - meta = { - broken = true; - }; - }; - protest_slash_parachute = { - pname = "protest_parachute"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest/parachute" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "named-readtables" pkgs) (getAttr "parachute" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - protest_slash_protocol = { - pname = "protest_protocol"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest/protocol" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "moptilities" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - protest_slash_test = { - pname = "protest_test"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest/test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "named-readtables" pkgs) (getAttr "protest" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - protest_slash_test-case = { - pname = "protest_test-case"; - version = "20201220-git"; - asds = [ "protest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protest/2020-12-20/protest-20201220-git.tgz"; - sha256 = "0q7vk7ji4mjd0xfp18sim5daqzgb3k7mmbm93vvwz18bdwy6cj9h"; - system = "protest"; - asd = "protest"; - }); - systems = [ "protest/test-case" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - proto = { - pname = "proto"; - version = "quicklisp-dd18337d-git"; - asds = [ "proto" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz"; - sha256 = "0dpchsshnlh3jb9rg1zdf63mr5l33vhjdxgxx2vqg0nh1sh41zn1"; - system = "proto"; - asd = "gtirb"; - }); - systems = [ "proto" ]; - lispLibs = [ (getAttr "protobuf" pkgs) ]; - }; - proto-v0 = { - pname = "proto-v0"; - version = "quicklisp-dd18337d-git"; - asds = [ "proto-v0" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gtirb/2021-10-20/gtirb-quicklisp-dd18337d-git.tgz"; - sha256 = "0dpchsshnlh3jb9rg1zdf63mr5l33vhjdxgxx2vqg0nh1sh41zn1"; - system = "proto-v0"; - asd = "gtirb"; - }); - systems = [ "proto-v0" ]; - lispLibs = [ (getAttr "protobuf" pkgs) ]; - }; - protobuf = { - pname = "protobuf"; - version = "20220331-git"; - asds = [ "protobuf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protobuf/2022-03-31/protobuf-20220331-git.tgz"; - sha256 = "011jhbda4q77hjc4v2dyx3pc54zdq7m496qgrrv69ksy901lss4s"; - system = "protobuf"; - asd = "protobuf"; - }); - systems = [ "protobuf" ]; - lispLibs = [ (getAttr "com_dot_google_dot_base" pkgs) (getAttr "varint" pkgs) ]; - }; - protobuf-conformance = { - pname = "protobuf-conformance"; - version = "20220331-git"; - asds = [ "protobuf-conformance" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protobuf/2022-03-31/protobuf-20220331-git.tgz"; - sha256 = "011jhbda4q77hjc4v2dyx3pc54zdq7m496qgrrv69ksy901lss4s"; - system = "protobuf-conformance"; - asd = "protobuf-conformance"; - }); - systems = [ "protobuf-conformance" ]; - lispLibs = [ (getAttr "com_dot_google_dot_base" pkgs) (getAttr "nibbles" pkgs) (getAttr "protobuf" pkgs) ]; - }; - prove = { - pname = "prove"; - version = "20200218-git"; - asds = [ "prove" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; - sha256 = "0ca6ha3zhmckq3ad9lxm6sbg4i0hg3m81xhan4dkxd3x9898jzpc"; - system = "prove"; - asd = "prove"; - }); - systems = [ "prove" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ansi-text" pkgs) (getAttr "cl-colors" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "uiop" pkgs) ]; - }; - prove-asdf = { - pname = "prove-asdf"; - version = "20200218-git"; - asds = [ "prove-asdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; - sha256 = "0ca6ha3zhmckq3ad9lxm6sbg4i0hg3m81xhan4dkxd3x9898jzpc"; - system = "prove-asdf"; - asd = "prove-asdf"; - }); - systems = [ "prove-asdf" ]; - lispLibs = [ ]; - }; - prove-test = { - pname = "prove-test"; - version = "20200218-git"; - asds = [ "prove-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; - sha256 = "0ca6ha3zhmckq3ad9lxm6sbg4i0hg3m81xhan4dkxd3x9898jzpc"; - system = "prove-test"; - asd = "prove-test"; - }); - systems = [ "prove-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - pseudonyms = { - pname = "pseudonyms"; - version = "20200325-git"; - asds = [ "pseudonyms" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pseudonyms/2020-03-25/pseudonyms-20200325-git.tgz"; - sha256 = "0ph7l130hr8gz88gw8i15zbsbq96519srfhzgm6zzkw85vab1ysn"; - system = "pseudonyms"; - asd = "pseudonyms"; - }); - systems = [ "pseudonyms" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - psgraph = { - pname = "psgraph"; - version = "1.2"; - asds = [ "psgraph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/psgraph/2010-10-06/psgraph-1.2.tgz"; - sha256 = "19x1lvzfj2c2h83y5bng6jsp2300qfvd25mmf157qiss15al22vs"; - system = "psgraph"; - asd = "psgraph"; - }); - systems = [ "psgraph" ]; - lispLibs = [ ]; - }; - psychiq = { - pname = "psychiq"; - version = "20200925-git"; - asds = [ "psychiq" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/psychiq/2020-09-25/psychiq-20200925-git.tgz"; - sha256 = "1g8m0nglhqn5zf79hcdx3kafa0y9h3f4yqvjn7diddimqckf0fw6"; - system = "psychiq"; - asd = "psychiq"; - }); - systems = [ "psychiq" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-redis" pkgs) (getAttr "cl-reexport" pkgs) (getAttr "dissect" pkgs) (getAttr "jonathan" pkgs) (getAttr "local-time" pkgs) (getAttr "uiop" pkgs) (getAttr "vom" pkgs) ]; - }; - psychiq-test = { - pname = "psychiq-test"; - version = "20200925-git"; - asds = [ "psychiq-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/psychiq/2020-09-25/psychiq-20200925-git.tgz"; - sha256 = "1g8m0nglhqn5zf79hcdx3kafa0y9h3f4yqvjn7diddimqckf0fw6"; - system = "psychiq-test"; - asd = "psychiq-test"; - }); - systems = [ "psychiq-test" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "psychiq" pkgs) ]; - }; - ptester = { - pname = "ptester"; - version = "20160929-git"; - asds = [ "ptester" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz"; - sha256 = "1l0lfl7cdnr2qf4zh38hi4llxg22c49zkm639bdkmvlkzwj3ndwf"; - system = "ptester"; - asd = "ptester"; - }); - systems = [ "ptester" ]; - lispLibs = [ ]; - }; - purgatory = { - pname = "purgatory"; - version = "20220707-git"; - asds = [ "purgatory" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/purgatory/2022-07-07/purgatory-20220707-git.tgz"; - sha256 = "0iy2jdgrwqrq9cph7bwf79d8l4zdsgcd9sfcn0lclzai2v0yizp9"; - system = "purgatory"; - asd = "purgatory"; - }); - systems = [ "purgatory" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "uiop" pkgs) (getAttr "usocket" pkgs) ]; - }; - purgatory-tests = { - pname = "purgatory-tests"; - version = "20220707-git"; - asds = [ "purgatory-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/purgatory/2022-07-07/purgatory-20220707-git.tgz"; - sha256 = "0iy2jdgrwqrq9cph7bwf79d8l4zdsgcd9sfcn0lclzai2v0yizp9"; - system = "purgatory-tests"; - asd = "purgatory-tests"; - }); - systems = [ "purgatory-tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "clunit2" pkgs) (getAttr "purgatory" pkgs) (getAttr "uiop" pkgs) (getAttr "usocket" pkgs) ]; - }; - puri = { - pname = "puri"; - version = "20201016-git"; - asds = [ "puri" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz"; - sha256 = "0gq2rsr0aihs0z20v4zqvmdl4szq53b52rh97pvnmwrlbn4mapmd"; - system = "puri"; - asd = "puri"; - }); - systems = [ "puri" ]; - lispLibs = [ ]; - }; - puri_slash_test = { - pname = "puri_test"; - version = "20201016-git"; - asds = [ "puri" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz"; - sha256 = "0gq2rsr0aihs0z20v4zqvmdl4szq53b52rh97pvnmwrlbn4mapmd"; - system = "puri"; - asd = "puri"; - }); - systems = [ "puri/test" ]; - lispLibs = [ (getAttr "ptester" pkgs) (getAttr "puri" pkgs) ]; - meta = { - broken = true; - }; - }; - purl = { - pname = "purl"; - version = "20160929-git"; - asds = [ "purl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/purl/2016-09-29/purl-20160929-git.tgz"; - sha256 = "1fw3ip4b7n3q6kimh683apg381p7y4w6s4mb8mmv9n3dw0p0sdww"; - system = "purl"; - asd = "purl"; - }); - systems = [ "purl" ]; - lispLibs = [ (getAttr "maxpc" pkgs) (getAttr "percent-encoding" pkgs) (getAttr "uiop" pkgs) ]; - }; - pvars = { - pname = "pvars"; - version = "20210228-git"; - asds = [ "pvars" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pvars/2021-02-28/pvars-20210228-git.tgz"; - sha256 = "1x9mmz53sj0mgd288pa65x963mrd27sw47a8vbggsc4ykwacqf1d"; - system = "pvars"; - asd = "pvars"; - }); - systems = [ "pvars" ]; - lispLibs = [ (getAttr "cl-store" pkgs) (getAttr "global-vars" pkgs) ]; - }; - py-configparser = { - pname = "py-configparser"; - version = "20170830-svn"; - asds = [ "py-configparser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/py-configparser/2017-08-30/py-configparser-20170830-svn.tgz"; - sha256 = "1mpzhrys1b1mp1kp2xvryl6v01gfqfccb1zdiib49nf4bms4irvw"; - system = "py-configparser"; - asd = "py-configparser"; - }); - systems = [ "py-configparser" ]; - lispLibs = [ (getAttr "parse-number" pkgs) ]; - }; - py4cl = { - pname = "py4cl"; - version = "20220707-git"; - asds = [ "py4cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/py4cl/2022-07-07/py4cl-20220707-git.tgz"; - sha256 = "14pps4r9dx9wx36vwv0r45g0fw1z6739bqacqmzwmyvdilxip977"; - system = "py4cl"; - asd = "py4cl"; - }); - systems = [ "py4cl" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "numpy-file-format" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "uiop" pkgs) ]; - }; - py4cl2 = { - pname = "py4cl2"; - version = "v2.9.0"; - asds = [ "py4cl2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/py4cl2/2021-12-09/py4cl2-v2.9.0.tgz"; - sha256 = "00f1nyvjy43fcx5gxbhx0ya0srq8r0g3gqxrqhk4605kqchqfz7s"; - system = "py4cl2"; - asd = "py4cl2"; - }); - systems = [ "py4cl2" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-json" pkgs) (getAttr "iterate" pkgs) (getAttr "numpy-file-format" pkgs) (getAttr "parse-number" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "uiop" pkgs) ]; - }; - pythonic-string-reader = { - pname = "pythonic-string-reader"; - version = "20180711-git"; - asds = [ "pythonic-string-reader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz"; - sha256 = "1b5iryqw8xsh36swckmz8rrngmc39k92si33fgy5pml3n9l5rq3j"; - system = "pythonic-string-reader"; - asd = "pythonic-string-reader"; - }); - systems = [ "pythonic-string-reader" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - pzmq = { - pname = "pzmq"; - version = "20210531-git"; - asds = [ "pzmq" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz"; - sha256 = "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05"; - system = "pzmq"; - asd = "pzmq"; - }); - systems = [ "pzmq" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - pzmq-compat = { - pname = "pzmq-compat"; - version = "20210531-git"; - asds = [ "pzmq-compat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz"; - sha256 = "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05"; - system = "pzmq-compat"; - asd = "pzmq"; - }); - systems = [ "pzmq-compat" ]; - lispLibs = [ (getAttr "pzmq" pkgs) ]; - }; - pzmq-examples = { - pname = "pzmq-examples"; - version = "20210531-git"; - asds = [ "pzmq-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz"; - sha256 = "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05"; - system = "pzmq-examples"; - asd = "pzmq"; - }); - systems = [ "pzmq-examples" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "iterate" pkgs) (getAttr "local-time" pkgs) (getAttr "pzmq" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - pzmq-test = { - pname = "pzmq-test"; - version = "20210531-git"; - asds = [ "pzmq-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/pzmq/2021-05-31/pzmq-20210531-git.tgz"; - sha256 = "19mdhxhzzghlmff1fic4chg5iz0psglkim09z6dgpijm26biny05"; - system = "pzmq-test"; - asd = "pzmq"; - }); - systems = [ "pzmq-test" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) (getAttr "pzmq" pkgs) ]; - }; - q_plus = { - pname = "q+"; - version = "20200427-git"; - asds = [ "q+" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2020-04-27/qtools-20200427-git.tgz"; - sha256 = "13c9syk1l3a9xwpii0j82g0fkgnbxx8yabjjjczmr0l29hykhd4v"; - system = "q+"; - asd = "q+"; - }); - systems = [ "q+" ]; - lispLibs = [ (getAttr "qtools" pkgs) ]; - }; - qbase64 = { - pname = "qbase64"; - version = "20220220-git"; - asds = [ "qbase64" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qbase64/2022-02-20/qbase64-20220220-git.tgz"; - sha256 = "06daqqfdd51wkx0pyxgz7zq4ibzsqsgn3qs04jabx67gyybgnmjm"; - system = "qbase64"; - asd = "qbase64"; - }); - systems = [ "qbase64" ]; - lispLibs = [ (getAttr "metabang-bind" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - qbase64_slash_test = { - pname = "qbase64_test"; - version = "20220220-git"; - asds = [ "qbase64" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qbase64/2022-02-20/qbase64-20220220-git.tgz"; - sha256 = "06daqqfdd51wkx0pyxgz7zq4ibzsqsgn3qs04jabx67gyybgnmjm"; - system = "qbase64"; - asd = "qbase64"; - }); - systems = [ "qbase64/test" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "fiveam" pkgs) (getAttr "qbase64" pkgs) ]; - meta = { - broken = true; - }; - }; - qbook = { - pname = "qbook"; - version = "20130312-darcs"; - asds = [ "qbook" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qbook/2013-03-12/qbook-20130312-darcs.tgz"; - sha256 = "0l5hc2v73416jpwc2nsnj03z85fisirgm4av2anvlpv5m1291p6g"; - system = "qbook"; - asd = "qbook"; - }); - systems = [ "qbook" ]; - lispLibs = [ (getAttr "arnesi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "iterate" pkgs) (getAttr "yaclml" pkgs) ]; - }; - qimageblitz = { - pname = "qimageblitz"; - version = "20210531-git"; - asds = [ "qimageblitz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qimageblitz"; - asd = "qimageblitz"; - }); - systems = [ "qimageblitz" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) ]; - }; - ql-checkout = { - pname = "ql-checkout"; - version = "20190521-git"; - asds = [ "ql-checkout" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ql-checkout/2019-05-21/ql-checkout-20190521-git.tgz"; - sha256 = "1zp3wa7g1wn7sypfsla7510ywvldqavlmv90pncanwpwn79klyhw"; - system = "ql-checkout"; - asd = "ql-checkout"; - }); - systems = [ "ql-checkout" ]; - lispLibs = [ ]; - }; - qlot = { - pname = "qlot"; - version = "20220331-git"; - asds = [ "qlot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qlot/2022-03-31/qlot-20220331-git.tgz"; - sha256 = "18dzrjy66a4xrzm4ap7kvzbi0xvp2s2nm0l04jjwy7vgizbw29y1"; - system = "qlot"; - asd = "qlot"; - }); - systems = [ "qlot" ]; - lispLibs = [ ]; - }; - qlot_slash_command = { - pname = "qlot_command"; - version = "20220331-git"; - asds = [ "qlot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qlot/2022-03-31/qlot-20220331-git.tgz"; - sha256 = "18dzrjy66a4xrzm4ap7kvzbi0xvp2s2nm0l04jjwy7vgizbw29y1"; - system = "qlot"; - asd = "qlot"; - }); - systems = [ "qlot/command" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - qmynd = { - pname = "qmynd"; - version = "20190710-git"; - asds = [ "qmynd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qmynd/2019-07-10/qmynd-20190710-git.tgz"; - sha256 = "06gw5wxcpdclb6a5i5k9lbmdlyqsp182czrm9bm1cpklzbj0ihrl"; - system = "qmynd"; - asd = "qmynd"; - }); - systems = [ "qmynd" ]; - lispLibs = [ (getAttr "list-of" pkgs) (getAttr "babel" pkgs) (getAttr "chipz" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "ironclad" pkgs) (getAttr "salza2" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "usocket" pkgs) ]; - }; - qmynd-test = { - pname = "qmynd-test"; - version = "20190710-git"; - asds = [ "qmynd-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qmynd/2019-07-10/qmynd-20190710-git.tgz"; - sha256 = "06gw5wxcpdclb6a5i5k9lbmdlyqsp182czrm9bm1cpklzbj0ihrl"; - system = "qmynd-test"; - asd = "qmynd-test"; - }); - systems = [ "qmynd-test" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "qmynd" pkgs) ]; - }; - qoi = { - pname = "qoi"; - version = "20220707-git"; - asds = [ "qoi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qoi/2022-07-07/qoi-20220707-git.tgz"; - sha256 = "12j762h599cc9qpdpcmxiddixm168sxd2i60mbyka8x6dab64mla"; - system = "qoi"; - asd = "qoi"; - }); - systems = [ "qoi" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - qsci = { - pname = "qsci"; - version = "20210531-git"; - asds = [ "qsci" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qsci"; - asd = "qsci"; - }); - systems = [ "qsci" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) ]; - }; - qt = { - pname = "qt"; - version = "20200925-git"; - asds = [ "qt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/commonqt/2020-09-25/commonqt-20200925-git.tgz"; - sha256 = "1s66z48plfwiq4qhf6whpvnjy4n7r9zhipri7lc8k67x817k020q"; - system = "qt"; - asd = "qt"; - }); - systems = [ "qt" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "named-readtables" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - qt_plus_libs = { - pname = "qt+libs"; - version = "20200925-git"; - asds = [ "qt+libs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/commonqt/2020-09-25/commonqt-20200925-git.tgz"; - sha256 = "1s66z48plfwiq4qhf6whpvnjy4n7r9zhipri7lc8k67x817k020q"; - system = "qt+libs"; - asd = "qt+libs"; - }); - systems = [ "qt+libs" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "named-readtables" pkgs) (getAttr "qt-libs" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - qt-lib-generator = { - pname = "qt-lib-generator"; - version = "20210531-git"; - asds = [ "qt-lib-generator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qt-lib-generator"; - asd = "qt-lib-generator"; - }); - systems = [ "qt-lib-generator" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "pathname-utils" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - qt-libs = { - pname = "qt-libs"; - version = "20210531-git"; - asds = [ "qt-libs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qt-libs"; - asd = "qt-libs"; - }); - systems = [ "qt-libs" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "qt-lib-generator" pkgs) ]; - }; - qt-repl = { - pname = "qt-repl"; - version = "20200925-git"; - asds = [ "qt-repl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/commonqt/2020-09-25/commonqt-20200925-git.tgz"; - sha256 = "1s66z48plfwiq4qhf6whpvnjy4n7r9zhipri7lc8k67x817k020q"; - system = "qt-repl"; - asd = "qt-repl"; - }); - systems = [ "qt-repl" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "qt" pkgs) ]; - }; - qt-test = { - pname = "qt-test"; - version = "20200925-git"; - asds = [ "qt-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/commonqt/2020-09-25/commonqt-20200925-git.tgz"; - sha256 = "1s66z48plfwiq4qhf6whpvnjy4n7r9zhipri7lc8k67x817k020q"; - system = "qt-test"; - asd = "qt-test"; - }); - systems = [ "qt-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "qt" pkgs) (getAttr "iterate" pkgs) (getAttr "rt" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - qt-tutorial = { - pname = "qt-tutorial"; - version = "20200925-git"; - asds = [ "qt-tutorial" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/commonqt/2020-09-25/commonqt-20200925-git.tgz"; - sha256 = "1s66z48plfwiq4qhf6whpvnjy4n7r9zhipri7lc8k67x817k020q"; - system = "qt-tutorial"; - asd = "qt-tutorial"; - }); - systems = [ "qt-tutorial" ]; - lispLibs = [ (getAttr "qt" pkgs) ]; - }; - qt3support = { - pname = "qt3support"; - version = "20210531-git"; - asds = [ "qt3support" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qt3support"; - asd = "qt3support"; - }); - systems = [ "qt3support" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtnetwork" pkgs) (getAttr "qtsql" pkgs) (getAttr "qtxml" pkgs) ]; - }; - qtcore = { - pname = "qtcore"; - version = "20210531-git"; - asds = [ "qtcore" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qtcore"; - asd = "qtcore"; - }); - systems = [ "qtcore" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "commonqt" pkgs) (getAttr "qt-libs" pkgs) ]; - }; - qtdbus = { - pname = "qtdbus"; - version = "20210531-git"; - asds = [ "qtdbus" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qtdbus"; - asd = "qtdbus"; - }); - systems = [ "qtdbus" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtxml" pkgs) ]; - }; - qtdeclarative = { - pname = "qtdeclarative"; - version = "20210531-git"; - asds = [ "qtdeclarative" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qtdeclarative"; - asd = "qtdeclarative"; - }); - systems = [ "qtdeclarative" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtnetwork" pkgs) (getAttr "qtscript" pkgs) (getAttr "qtsql" pkgs) (getAttr "qtxmlpatterns" pkgs) ]; - }; - qtgui = { - pname = "qtgui"; - version = "20210531-git"; - asds = [ "qtgui" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qtgui"; - asd = "qtgui"; - }); - systems = [ "qtgui" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) ]; - }; - qthelp = { - pname = "qthelp"; - version = "20210531-git"; - asds = [ "qthelp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qthelp"; - asd = "qthelp"; - }); - systems = [ "qthelp" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtnetwork" pkgs) (getAttr "qtsql" pkgs) ]; - }; - qtnetwork = { - pname = "qtnetwork"; - version = "20210531-git"; - asds = [ "qtnetwork" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qtnetwork"; - asd = "qtnetwork"; - }); - systems = [ "qtnetwork" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) ]; - }; - qtools = { - pname = "qtools"; - version = "20200427-git"; - asds = [ "qtools" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2020-04-27/qtools-20200427-git.tgz"; - sha256 = "13c9syk1l3a9xwpii0j82g0fkgnbxx8yabjjjczmr0l29hykhd4v"; - system = "qtools"; - asd = "qtools"; - }); - systems = [ "qtools" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "qt_plus_libs" pkgs) (getAttr "deploy" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "form-fiddle" pkgs) (getAttr "named-readtables" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-indent" pkgs) (getAttr "trivial-main-thread" pkgs) ]; - }; - qtools-evaluator = { - pname = "qtools-evaluator"; - version = "20200427-git"; - asds = [ "qtools-evaluator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2020-04-27/qtools-20200427-git.tgz"; - sha256 = "13c9syk1l3a9xwpii0j82g0fkgnbxx8yabjjjczmr0l29hykhd4v"; - system = "qtools-evaluator"; - asd = "qtools-evaluator"; - }); - systems = [ "qtools-evaluator" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtools" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - qtools-game = { - pname = "qtools-game"; - version = "20200427-git"; - asds = [ "qtools-game" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2020-04-27/qtools-20200427-git.tgz"; - sha256 = "13c9syk1l3a9xwpii0j82g0fkgnbxx8yabjjjczmr0l29hykhd4v"; - system = "qtools-game"; - asd = "qtools-game"; - }); - systems = [ "qtools-game" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtopengl" pkgs) (getAttr "qtools" pkgs) ]; - }; - qtools-helloworld = { - pname = "qtools-helloworld"; - version = "20200427-git"; - asds = [ "qtools-helloworld" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2020-04-27/qtools-20200427-git.tgz"; - sha256 = "13c9syk1l3a9xwpii0j82g0fkgnbxx8yabjjjczmr0l29hykhd4v"; - system = "qtools-helloworld"; - asd = "qtools-helloworld"; - }); - systems = [ "qtools-helloworld" ]; - lispLibs = [ (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtools" pkgs) ]; - }; - qtools-melody = { - pname = "qtools-melody"; - version = "20200427-git"; - asds = [ "qtools-melody" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2020-04-27/qtools-20200427-git.tgz"; - sha256 = "13c9syk1l3a9xwpii0j82g0fkgnbxx8yabjjjczmr0l29hykhd4v"; - system = "qtools-melody"; - asd = "qtools-melody"; - }); - systems = [ "qtools-melody" ]; - lispLibs = [ (getAttr "phonon" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtools" pkgs) ]; - }; - qtools-opengl = { - pname = "qtools-opengl"; - version = "20200427-git"; - asds = [ "qtools-opengl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2020-04-27/qtools-20200427-git.tgz"; - sha256 = "13c9syk1l3a9xwpii0j82g0fkgnbxx8yabjjjczmr0l29hykhd4v"; - system = "qtools-opengl"; - asd = "qtools-opengl"; - }); - systems = [ "qtools-opengl" ]; - lispLibs = [ (getAttr "cl-opengl" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtopengl" pkgs) (getAttr "qtools" pkgs) ]; - }; - qtools-titter = { - pname = "qtools-titter"; - version = "20200427-git"; - asds = [ "qtools-titter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools/2020-04-27/qtools-20200427-git.tgz"; - sha256 = "13c9syk1l3a9xwpii0j82g0fkgnbxx8yabjjjczmr0l29hykhd4v"; - system = "qtools-titter"; - asd = "qtools-titter"; - }); - systems = [ "qtools-titter" ]; - lispLibs = [ (getAttr "chirp" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtools" pkgs) ]; - }; - qtools-ui = { - pname = "qtools-ui"; - version = "20200218-git"; - asds = [ "qtools-ui" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui"; - asd = "qtools-ui"; - }); - systems = [ "qtools-ui" ]; - lispLibs = [ (getAttr "qtools-ui-auto-resizing-textedit" pkgs) (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-cell" pkgs) (getAttr "qtools-ui-color-history" pkgs) (getAttr "qtools-ui-color-picker" pkgs) (getAttr "qtools-ui-color-sliders" pkgs) (getAttr "qtools-ui-color-triangle" pkgs) (getAttr "qtools-ui-compass" pkgs) (getAttr "qtools-ui-container" pkgs) (getAttr "qtools-ui-debugger" pkgs) (getAttr "qtools-ui-dialog" pkgs) (getAttr "qtools-ui-dictionary" pkgs) (getAttr "qtools-ui-drag-and-drop" pkgs) (getAttr "qtools-ui-fixed-qtextedit" pkgs) (getAttr "qtools-ui-flow-layout" pkgs) (getAttr "qtools-ui-helpers" pkgs) (getAttr "qtools-ui-imagetools" pkgs) (getAttr "qtools-ui-keychord-editor" pkgs) (getAttr "qtools-ui-layout" pkgs) (getAttr "qtools-ui-listing" pkgs) (getAttr "qtools-ui-notification" pkgs) (getAttr "qtools-ui-options" pkgs) (getAttr "qtools-ui-panels" pkgs) (getAttr "qtools-ui-placeholder-text-edit" pkgs) (getAttr "qtools-ui-plot" pkgs) (getAttr "qtools-ui-repl" pkgs) (getAttr "qtools-ui-slider" pkgs) (getAttr "qtools-ui-spellchecked-text-edit" pkgs) (getAttr "qtools-ui-splitter" pkgs) ]; - }; - qtools-ui-auto-resizing-textedit = { - pname = "qtools-ui-auto-resizing-textedit"; - version = "20200218-git"; - asds = [ "qtools-ui-auto-resizing-textedit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-auto-resizing-textedit"; - asd = "qtools-ui-auto-resizing-textedit"; - }); - systems = [ "qtools-ui-auto-resizing-textedit" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-fixed-qtextedit" pkgs) ]; - }; - qtools-ui-base = { - pname = "qtools-ui-base"; - version = "20200218-git"; - asds = [ "qtools-ui-base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-base"; - asd = "qtools-ui-base"; - }); - systems = [ "qtools-ui-base" ]; - lispLibs = [ (getAttr "array-utils" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtools" pkgs) ]; - }; - qtools-ui-bytearray = { - pname = "qtools-ui-bytearray"; - version = "20200218-git"; - asds = [ "qtools-ui-bytearray" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-bytearray"; - asd = "qtools-ui-bytearray"; - }); - systems = [ "qtools-ui-bytearray" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) ]; - }; - qtools-ui-cell = { - pname = "qtools-ui-cell"; - version = "20200218-git"; - asds = [ "qtools-ui-cell" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-cell"; - asd = "qtools-ui-cell"; - }); - systems = [ "qtools-ui-cell" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-helpers" pkgs) (getAttr "qtools-ui-layout" pkgs) ]; - }; - qtools-ui-color-history = { - pname = "qtools-ui-color-history"; - version = "20200218-git"; - asds = [ "qtools-ui-color-history" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-color-history"; - asd = "qtools-ui-color-history"; - }); - systems = [ "qtools-ui-color-history" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-flow-layout" pkgs) (getAttr "qtools-ui-helpers" pkgs) ]; - }; - qtools-ui-color-picker = { - pname = "qtools-ui-color-picker"; - version = "20200218-git"; - asds = [ "qtools-ui-color-picker" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-color-picker"; - asd = "qtools-ui-color-picker"; - }); - systems = [ "qtools-ui-color-picker" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-color-history" pkgs) (getAttr "qtools-ui-color-sliders" pkgs) (getAttr "qtools-ui-color-triangle" pkgs) (getAttr "qtools-ui-dialog" pkgs) (getAttr "qtools-ui-helpers" pkgs) ]; - }; - qtools-ui-color-sliders = { - pname = "qtools-ui-color-sliders"; - version = "20200218-git"; - asds = [ "qtools-ui-color-sliders" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-color-sliders"; - asd = "qtools-ui-color-sliders"; - }); - systems = [ "qtools-ui-color-sliders" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-helpers" pkgs) ]; - }; - qtools-ui-color-triangle = { - pname = "qtools-ui-color-triangle"; - version = "20200218-git"; - asds = [ "qtools-ui-color-triangle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-color-triangle"; - asd = "qtools-ui-color-triangle"; - }); - systems = [ "qtools-ui-color-triangle" ]; - lispLibs = [ (getAttr "cl-opengl" pkgs) (getAttr "qtopengl" pkgs) (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-helpers" pkgs) ]; - }; - qtools-ui-compass = { - pname = "qtools-ui-compass"; - version = "20200218-git"; - asds = [ "qtools-ui-compass" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-compass"; - asd = "qtools-ui-compass"; - }); - systems = [ "qtools-ui-compass" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-layout" pkgs) ]; - }; - qtools-ui-container = { - pname = "qtools-ui-container"; - version = "20200218-git"; - asds = [ "qtools-ui-container" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-container"; - asd = "qtools-ui-container"; - }); - systems = [ "qtools-ui-container" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-layout" pkgs) ]; - }; - qtools-ui-debugger = { - pname = "qtools-ui-debugger"; - version = "20200218-git"; - asds = [ "qtools-ui-debugger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-debugger"; - asd = "qtools-ui-debugger"; - }); - systems = [ "qtools-ui-debugger" ]; - lispLibs = [ (getAttr "dissect" pkgs) (getAttr "qtools-ui-base" pkgs) ]; - }; - qtools-ui-dialog = { - pname = "qtools-ui-dialog"; - version = "20200218-git"; - asds = [ "qtools-ui-dialog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-dialog"; - asd = "qtools-ui-dialog"; - }); - systems = [ "qtools-ui-dialog" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-helpers" pkgs) ]; - }; - qtools-ui-dictionary = { - pname = "qtools-ui-dictionary"; - version = "20200218-git"; - asds = [ "qtools-ui-dictionary" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-dictionary"; - asd = "qtools-ui-dictionary"; - }); - systems = [ "qtools-ui-dictionary" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-fixed-qtextedit" pkgs) (getAttr "qtools-ui-helpers" pkgs) (getAttr "wordnet" pkgs) ]; - }; - qtools-ui-drag-and-drop = { - pname = "qtools-ui-drag-and-drop"; - version = "20200218-git"; - asds = [ "qtools-ui-drag-and-drop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-drag-and-drop"; - asd = "qtools-ui-drag-and-drop"; - }); - systems = [ "qtools-ui-drag-and-drop" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-helpers" pkgs) ]; - }; - qtools-ui-executable = { - pname = "qtools-ui-executable"; - version = "20200218-git"; - asds = [ "qtools-ui-executable" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-executable"; - asd = "qtools-ui-executable"; - }); - systems = [ "qtools-ui-executable" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "qtools-ui-base" pkgs) ]; - }; - qtools-ui-fixed-qtextedit = { - pname = "qtools-ui-fixed-qtextedit"; - version = "20200218-git"; - asds = [ "qtools-ui-fixed-qtextedit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-fixed-qtextedit"; - asd = "qtools-ui-fixed-qtextedit"; - }); - systems = [ "qtools-ui-fixed-qtextedit" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) ]; - }; - qtools-ui-flow-layout = { - pname = "qtools-ui-flow-layout"; - version = "20200218-git"; - asds = [ "qtools-ui-flow-layout" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-flow-layout"; - asd = "qtools-ui-flow-layout"; - }); - systems = [ "qtools-ui-flow-layout" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-container" pkgs) ]; - }; - qtools-ui-helpers = { - pname = "qtools-ui-helpers"; - version = "20200218-git"; - asds = [ "qtools-ui-helpers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-helpers"; - asd = "qtools-ui-helpers"; - }); - systems = [ "qtools-ui-helpers" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-layout" pkgs) ]; - }; - qtools-ui-imagetools = { - pname = "qtools-ui-imagetools"; - version = "20200218-git"; - asds = [ "qtools-ui-imagetools" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-imagetools"; - asd = "qtools-ui-imagetools"; - }); - systems = [ "qtools-ui-imagetools" ]; - lispLibs = [ (getAttr "qimageblitz" pkgs) (getAttr "qtools-ui-base" pkgs) ]; - }; - qtools-ui-keychord-editor = { - pname = "qtools-ui-keychord-editor"; - version = "20200218-git"; - asds = [ "qtools-ui-keychord-editor" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-keychord-editor"; - asd = "qtools-ui-keychord-editor"; - }); - systems = [ "qtools-ui-keychord-editor" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) ]; - }; - qtools-ui-layout = { - pname = "qtools-ui-layout"; - version = "20200218-git"; - asds = [ "qtools-ui-layout" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-layout"; - asd = "qtools-ui-layout"; - }); - systems = [ "qtools-ui-layout" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) ]; - }; - qtools-ui-listing = { - pname = "qtools-ui-listing"; - version = "20200218-git"; - asds = [ "qtools-ui-listing" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-listing"; - asd = "qtools-ui-listing"; - }); - systems = [ "qtools-ui-listing" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-cell" pkgs) (getAttr "qtools-ui-container" pkgs) ]; - }; - qtools-ui-notification = { - pname = "qtools-ui-notification"; - version = "20200218-git"; - asds = [ "qtools-ui-notification" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-notification"; - asd = "qtools-ui-notification"; - }); - systems = [ "qtools-ui-notification" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) ]; - }; - qtools-ui-options = { - pname = "qtools-ui-options"; - version = "20200218-git"; - asds = [ "qtools-ui-options" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-options"; - asd = "qtools-ui-options"; - }); - systems = [ "qtools-ui-options" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-color-picker" pkgs) (getAttr "qtools-ui-color-triangle" pkgs) (getAttr "qtools-ui-helpers" pkgs) (getAttr "qtools-ui-listing" pkgs) (getAttr "qtools-ui-slider" pkgs) ]; - }; - qtools-ui-panels = { - pname = "qtools-ui-panels"; - version = "20200218-git"; - asds = [ "qtools-ui-panels" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-panels"; - asd = "qtools-ui-panels"; - }); - systems = [ "qtools-ui-panels" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-compass" pkgs) (getAttr "qtools-ui-helpers" pkgs) (getAttr "qtools-ui-splitter" pkgs) ]; - }; - qtools-ui-placeholder-text-edit = { - pname = "qtools-ui-placeholder-text-edit"; - version = "20200218-git"; - asds = [ "qtools-ui-placeholder-text-edit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-placeholder-text-edit"; - asd = "qtools-ui-placeholder-text-edit"; - }); - systems = [ "qtools-ui-placeholder-text-edit" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-fixed-qtextedit" pkgs) ]; - }; - qtools-ui-plot = { - pname = "qtools-ui-plot"; - version = "20200218-git"; - asds = [ "qtools-ui-plot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-plot"; - asd = "qtools-ui-plot"; - }); - systems = [ "qtools-ui-plot" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-helpers" pkgs) ]; - }; - qtools-ui-progress-bar = { - pname = "qtools-ui-progress-bar"; - version = "20200218-git"; - asds = [ "qtools-ui-progress-bar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-progress-bar"; - asd = "qtools-ui-progress-bar"; - }); - systems = [ "qtools-ui-progress-bar" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) ]; - }; - qtools-ui-repl = { - pname = "qtools-ui-repl"; - version = "20200218-git"; - asds = [ "qtools-ui-repl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-repl"; - asd = "qtools-ui-repl"; - }); - systems = [ "qtools-ui-repl" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "qtools-ui-base" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - qtools-ui-slider = { - pname = "qtools-ui-slider"; - version = "20200218-git"; - asds = [ "qtools-ui-slider" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-slider"; - asd = "qtools-ui-slider"; - }); - systems = [ "qtools-ui-slider" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-helpers" pkgs) ]; - }; - qtools-ui-spellchecked-text-edit = { - pname = "qtools-ui-spellchecked-text-edit"; - version = "20200218-git"; - asds = [ "qtools-ui-spellchecked-text-edit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-spellchecked-text-edit"; - asd = "qtools-ui-spellchecked-text-edit"; - }); - systems = [ "qtools-ui-spellchecked-text-edit" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-fixed-qtextedit" pkgs) (getAttr "qtools-ui-helpers" pkgs) (getAttr "spell" pkgs) ]; - }; - qtools-ui-splitter = { - pname = "qtools-ui-splitter"; - version = "20200218-git"; - asds = [ "qtools-ui-splitter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-splitter"; - asd = "qtools-ui-splitter"; - }); - systems = [ "qtools-ui-splitter" ]; - lispLibs = [ (getAttr "qtools-ui-base" pkgs) (getAttr "qtools-ui-container" pkgs) (getAttr "qtools-ui-helpers" pkgs) ]; - }; - qtools-ui-svgtools = { - pname = "qtools-ui-svgtools"; - version = "20200218-git"; - asds = [ "qtools-ui-svgtools" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qtools-ui/2020-02-18/qtools-ui-20200218-git.tgz"; - sha256 = "0zlygq42mi2ngk8q7a36k2rp6ydb98gryfxvcbg3dijg34i70f2z"; - system = "qtools-ui-svgtools"; - asd = "qtools-ui-svgtools"; - }); - systems = [ "qtools-ui-svgtools" ]; - lispLibs = [ (getAttr "qtsvg" pkgs) (getAttr "qtools-ui-base" pkgs) ]; - }; - qtopengl = { - pname = "qtopengl"; - version = "20210531-git"; - asds = [ "qtopengl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qtopengl"; - asd = "qtopengl"; - }); - systems = [ "qtopengl" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) ]; - }; - qtscript = { - pname = "qtscript"; - version = "20210531-git"; - asds = [ "qtscript" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qtscript"; - asd = "qtscript"; - }); - systems = [ "qtscript" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) ]; - }; - qtsql = { - pname = "qtsql"; - version = "20210531-git"; - asds = [ "qtsql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qtsql"; - asd = "qtsql"; - }); - systems = [ "qtsql" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) ]; - }; - qtsvg = { - pname = "qtsvg"; - version = "20210531-git"; - asds = [ "qtsvg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qtsvg"; - asd = "qtsvg"; - }); - systems = [ "qtsvg" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) ]; - }; - qttest = { - pname = "qttest"; - version = "20210531-git"; - asds = [ "qttest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qttest"; - asd = "qttest"; - }); - systems = [ "qttest" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) ]; - }; - qtuitools = { - pname = "qtuitools"; - version = "20210531-git"; - asds = [ "qtuitools" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qtuitools"; - asd = "qtuitools"; - }); - systems = [ "qtuitools" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) ]; - }; - qtwebkit = { - pname = "qtwebkit"; - version = "20210531-git"; - asds = [ "qtwebkit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qtwebkit"; - asd = "qtwebkit"; - }); - systems = [ "qtwebkit" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtnetwork" pkgs) ]; - }; - qtxml = { - pname = "qtxml"; - version = "20210531-git"; - asds = [ "qtxml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qtxml"; - asd = "qtxml"; - }); - systems = [ "qtxml" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) ]; - }; - qtxmlpatterns = { - pname = "qtxmlpatterns"; - version = "20210531-git"; - asds = [ "qtxmlpatterns" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qtxmlpatterns"; - asd = "qtxmlpatterns"; - }); - systems = [ "qtxmlpatterns" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtnetwork" pkgs) ]; - }; - quad-tree = { - pname = "quad-tree"; - version = "20220707-git"; - asds = [ "quad-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quad-tree/2022-07-07/quad-tree-20220707-git.tgz"; - sha256 = "1pg43zw75dbqxs8vca3fynqfvza59v1fmwh9m4x0jrnw7ysgkl6j"; - system = "quad-tree"; - asd = "quad-tree"; - }); - systems = [ "quad-tree" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) (getAttr "origin" pkgs) ]; - }; - quadpack = { - pname = "quadpack"; - version = "20200925-git"; - asds = [ "quadpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "quadpack"; - asd = "quadpack"; - }); - systems = [ "quadpack" ]; - lispLibs = [ (getAttr "f2cl" pkgs) ]; - }; - quadpack_slash_mach-par = { - pname = "quadpack_mach-par"; - version = "20200925-git"; - asds = [ "quadpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "quadpack"; - asd = "quadpack"; - }); - systems = [ "quadpack/mach-par" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - quadpack_slash_tests = { - pname = "quadpack_tests"; - version = "20200925-git"; - asds = [ "quadpack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "quadpack"; - asd = "quadpack"; - }); - systems = [ "quadpack/tests" ]; - lispLibs = [ (getAttr "quadpack" pkgs) (getAttr "rt" pkgs) ]; - meta = { - broken = true; - }; - }; - quads = { - pname = "quads"; - version = "20200427-git"; - asds = [ "quads" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "quads"; - asd = "quads"; - }); - systems = [ "quads" ]; - lispLibs = [ (getAttr "utility" pkgs) ]; - }; - quadtree = { - pname = "quadtree"; - version = "20150709-git"; - asds = [ "quadtree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quadtree/2015-07-09/quadtree-20150709-git.tgz"; - sha256 = "0590f0sbv4qg590d2bb7ypncg3wn5xjapi24w78mnzr9bdnhh4vx"; - system = "quadtree"; - asd = "quadtree"; - }); - systems = [ "quadtree" ]; - lispLibs = [ ]; - }; - quadtree-test = { - pname = "quadtree-test"; - version = "20150709-git"; - asds = [ "quadtree-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quadtree/2015-07-09/quadtree-20150709-git.tgz"; - sha256 = "0590f0sbv4qg590d2bb7ypncg3wn5xjapi24w78mnzr9bdnhh4vx"; - system = "quadtree-test"; - asd = "quadtree-test"; - }); - systems = [ "quadtree-test" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "quadtree" pkgs) ]; - }; - quantile-estimator = { - pname = "quantile-estimator"; - version = "20160825-git"; - asds = [ "quantile-estimator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quantile-estimator.cl/2016-08-25/quantile-estimator.cl-20160825-git.tgz"; - sha256 = "1rrazbl0gbsymynlxp7ild6wvwp6csmdig4hwrp3wjvqhdl8j3mj"; - system = "quantile-estimator"; - asd = "quantile-estimator"; - }); - systems = [ "quantile-estimator" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - quantile-estimator_dot_test = { - pname = "quantile-estimator.test"; - version = "20160825-git"; - asds = [ "quantile-estimator.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quantile-estimator.cl/2016-08-25/quantile-estimator.cl-20160825-git.tgz"; - sha256 = "1rrazbl0gbsymynlxp7ild6wvwp6csmdig4hwrp3wjvqhdl8j3mj"; - system = "quantile-estimator.test"; - asd = "quantile-estimator.test"; - }); - systems = [ "quantile-estimator.test" ]; - lispLibs = [ (getAttr "log4cl" pkgs) (getAttr "mw-equiv" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "quantile-estimator" pkgs) ]; - }; - quasiquote-2_dot_0 = { - pname = "quasiquote-2.0"; - version = "20150505-git"; - asds = [ "quasiquote-2.0" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz"; - sha256 = "1g0s3aplrgmdjj8k1wrx3dkqdsl4lka2nmgdng0rcd93xp11q6hn"; - system = "quasiquote-2.0"; - asd = "quasiquote-2.0"; - }); - systems = [ "quasiquote-2.0" ]; - lispLibs = [ (getAttr "iterate" pkgs) ]; - }; - quasiquote-2_dot_0-tests = { - pname = "quasiquote-2.0-tests"; - version = "20150505-git"; - asds = [ "quasiquote-2.0-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz"; - sha256 = "1g0s3aplrgmdjj8k1wrx3dkqdsl4lka2nmgdng0rcd93xp11q6hn"; - system = "quasiquote-2.0-tests"; - asd = "quasiquote-2.0"; - }); - systems = [ "quasiquote-2.0-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "quasiquote-2_dot_0" pkgs) ]; - }; - queen = { - pname = "queen"; - version = "20160929-git"; - asds = [ "queen" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/queen.lisp/2016-09-29/queen.lisp-20160929-git.tgz"; - sha256 = "187mlbhxxhgj7cx3j9vzv3a26mxnibwbp5hcbn92wzw7m04w0mln"; - system = "queen"; - asd = "queen"; - }); - systems = [ "queen" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "cl-ppcre-unicode" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - query-fs = { - pname = "query-fs"; - version = "20221106-git"; - asds = [ "query-fs" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/query-fs/2022-11-06/query-fs-20221106-git.tgz"; - sha256 = "010ljk1p8r5rm6b5fpznk9m241362fwy3qk8xdx836ncs8pzzyqf"; - system = "query-fs"; - asd = "query-fs"; - }); - systems = [ "query-fs" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-fuse" pkgs) (getAttr "cl-fuse-meta-fs" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "command-line-arguments" pkgs) (getAttr "iterate" pkgs) (getAttr "trivial-backtrace" pkgs) ]; - }; - query-repl = { - pname = "query-repl"; - version = "20220331-git"; - asds = [ "query-repl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/query-repl/2022-03-31/query-repl-20220331-git.tgz"; - sha256 = "0gzrr1k7071hdmd64i5lqmg62i3yqim7nmcc9r94sry47bkp16v2"; - system = "query-repl"; - asd = "query-repl"; - }); - systems = [ "query-repl" ]; - lispLibs = [ (getAttr "check-bnf" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "uiop" pkgs) ]; - }; - query-repl_dot_test = { - pname = "query-repl.test"; - version = "20220331-git"; - asds = [ "query-repl.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/query-repl/2022-03-31/query-repl-20220331-git.tgz"; - sha256 = "0gzrr1k7071hdmd64i5lqmg62i3yqim7nmcc9r94sry47bkp16v2"; - system = "query-repl.test"; - asd = "query-repl.test"; - }); - systems = [ "query-repl.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "query-repl" pkgs) ]; - }; - queues = { - pname = "queues"; - version = "20170124-git"; - asds = [ "queues" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; - sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv"; - system = "queues"; - asd = "queues"; - }); - systems = [ "queues" ]; - lispLibs = [ ]; - }; - queues_dot_priority-cqueue = { - pname = "queues.priority-cqueue"; - version = "20170124-git"; - asds = [ "queues.priority-cqueue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; - sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv"; - system = "queues.priority-cqueue"; - asd = "queues.priority-cqueue"; - }); - systems = [ "queues.priority-cqueue" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "queues" pkgs) (getAttr "queues_dot_priority-queue" pkgs) ]; - }; - queues_dot_priority-queue = { - pname = "queues.priority-queue"; - version = "20170124-git"; - asds = [ "queues.priority-queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; - sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv"; - system = "queues.priority-queue"; - asd = "queues.priority-queue"; - }); - systems = [ "queues.priority-queue" ]; - lispLibs = [ (getAttr "queues" pkgs) ]; - }; - queues_dot_simple-cqueue = { - pname = "queues.simple-cqueue"; - version = "20170124-git"; - asds = [ "queues.simple-cqueue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; - sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv"; - system = "queues.simple-cqueue"; - asd = "queues.simple-cqueue"; - }); - systems = [ "queues.simple-cqueue" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "queues" pkgs) (getAttr "queues_dot_simple-queue" pkgs) ]; - }; - queues_dot_simple-queue = { - pname = "queues.simple-queue"; - version = "20170124-git"; - asds = [ "queues.simple-queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/queues/2017-01-24/queues-20170124-git.tgz"; - sha256 = "0wdhfnzi4v6d97pggzj2aw55si94w4327br94jrmyvwf351wqjvv"; - system = "queues.simple-queue"; - asd = "queues.simple-queue"; - }); - systems = [ "queues.simple-queue" ]; - lispLibs = [ (getAttr "queues" pkgs) ]; - }; - quick-patch = { - pname = "quick-patch"; - version = "20221106-git"; - asds = [ "quick-patch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quick-patch/2022-11-06/quick-patch-20221106-git.tgz"; - sha256 = "1v56f630ld1kkfx9f20hqbqfxyv7cpqrs2zp324m2h6rnfs5xl19"; - system = "quick-patch"; - asd = "quick-patch"; - }); - systems = [ "quick-patch" ]; - lispLibs = [ ]; - }; - quick-patch_slash_tests = { - pname = "quick-patch_tests"; - version = "20221106-git"; - asds = [ "quick-patch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quick-patch/2022-11-06/quick-patch-20221106-git.tgz"; - sha256 = "1v56f630ld1kkfx9f20hqbqfxyv7cpqrs2zp324m2h6rnfs5xl19"; - system = "quick-patch"; - asd = "quick-patch"; - }); - systems = [ "quick-patch/tests" ]; - lispLibs = [ (getAttr "cl-mock" pkgs) (getAttr "str" pkgs) (getAttr "fiveam" pkgs) (getAttr "quick-patch" pkgs) (getAttr "tmpdir" pkgs) ]; - meta = { - broken = true; - }; - }; - quickapp = { - pname = "quickapp"; - version = "20160825-git"; - asds = [ "quickapp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quickapp/2016-08-25/quickapp-20160825-git.tgz"; - sha256 = "0rhhxwggbh9sf3c4c9fv39c5imy48416mwf0dkhqpnm8x55xbw22"; - system = "quickapp"; - asd = "quickapp"; - }); - systems = [ "quickapp" ]; - lispLibs = [ ]; - }; - quicklisp-slime-helper = { - pname = "quicklisp-slime-helper"; - version = "20150709-git"; - asds = [ "quicklisp-slime-helper" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quicklisp-slime-helper/2015-07-09/quicklisp-slime-helper-20150709-git.tgz"; - sha256 = "14b1zg26h75pnhj3ic0h9i5jbmwf8wjp91scbcg1ra9fyhh73pa6"; - system = "quicklisp-slime-helper"; - asd = "quicklisp-slime-helper"; - }); - systems = [ "quicklisp-slime-helper" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "swank" pkgs) ]; - }; - quicklisp-stats = { - pname = "quicklisp-stats"; - version = "20210411-git"; - asds = [ "quicklisp-stats" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quicklisp-stats/2021-04-11/quicklisp-stats-20210411-git.tgz"; - sha256 = "0v8dgmlgd283n1g486q4sj2mghgdvgywg2nqp43nnrfc04mkvgc0"; - system = "quicklisp-stats"; - asd = "quicklisp-stats"; - }); - systems = [ "quicklisp-stats" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "drakma" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - quickproject = { - pname = "quickproject"; - version = "1.4.1"; - asds = [ "quickproject" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quickproject/2019-12-27/quickproject-1.4.1.tgz"; - sha256 = "1szs8p2wr1yr9mjmj3h3557l6wxzzga0iszimb68z0hb1jj3lva6"; - system = "quickproject"; - asd = "quickproject"; - }); - systems = [ "quickproject" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "html-template" pkgs) ]; - }; - quicksearch = { - pname = "quicksearch"; - version = "20171019-git"; - asds = [ "quicksearch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quicksearch/2017-10-19/quicksearch-20171019-git.tgz"; - sha256 = "16k19zjkhh7r64vjq371k5jwjs7cdfjz83flh561n4h4v1z89fps"; - system = "quicksearch"; - asd = "quicksearch"; - }); - systems = [ "quicksearch" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "do-urlencode" pkgs) (getAttr "drakma" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "html-entities" pkgs) (getAttr "iterate" pkgs) (getAttr "yason" pkgs) ]; - }; - quickutil = { - pname = "quickutil"; - version = "20210807-git"; - asds = [ "quickutil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; - sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz"; - system = "quickutil"; - asd = "quickutil"; - }); - systems = [ "quickutil" ]; - lispLibs = [ (getAttr "quickutil-client" pkgs) ]; - }; - quickutil-client = { - pname = "quickutil-client"; - version = "20210807-git"; - asds = [ "quickutil-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; - sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz"; - system = "quickutil-client"; - asd = "quickutil-client"; - }); - systems = [ "quickutil-client" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "quickutil-client-management" pkgs) (getAttr "quickutil-utilities" pkgs) ]; - }; - quickutil-client-management = { - pname = "quickutil-client-management"; - version = "20210807-git"; - asds = [ "quickutil-client-management" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; - sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz"; - system = "quickutil-client-management"; - asd = "quickutil-client-management"; - }); - systems = [ "quickutil-client-management" ]; - lispLibs = [ (getAttr "trivial-garbage" pkgs) ]; - }; - quickutil-server = { - pname = "quickutil-server"; - version = "20210807-git"; - asds = [ "quickutil-server" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; - sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz"; - system = "quickutil-server"; - asd = "quickutil-server"; - }); - systems = [ "quickutil-server" ]; - lispLibs = [ (getAttr "assoc-utils" pkgs) (getAttr "closure-template" pkgs) (getAttr "dbi" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-markdown" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-syntax" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "clack" pkgs) (getAttr "lack" pkgs) (getAttr "lack-component" pkgs) (getAttr "lack-middleware-csrf" pkgs) (getAttr "lack-request" pkgs) (getAttr "lack-response" pkgs) (getAttr "ningle" pkgs) (getAttr "quickutil-utilities" pkgs) (getAttr "trivial-shell" pkgs) (getAttr "yason" pkgs) ]; - }; - quickutil-utilities = { - pname = "quickutil-utilities"; - version = "20210807-git"; - asds = [ "quickutil-utilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; - sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz"; - system = "quickutil-utilities"; - asd = "quickutil-utilities"; - }); - systems = [ "quickutil-utilities" ]; - lispLibs = [ (getAttr "cl-heredoc" pkgs) ]; - }; - quickutil-utilities-test = { - pname = "quickutil-utilities-test"; - version = "20210807-git"; - asds = [ "quickutil-utilities-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quickutil/2021-08-07/quickutil-20210807-git.tgz"; - sha256 = "0d4xrgsh5pj4cgj1mqsdyi4xvq04jyb2m4c3sdx94jsx3r83hldz"; - system = "quickutil-utilities-test"; - asd = "quickutil-utilities-test"; - }); - systems = [ "quickutil-utilities-test" ]; - lispLibs = [ (getAttr "quickutil-client" pkgs) (getAttr "quickutil-server" pkgs) ]; - }; - quilc = { - pname = "quilc"; - version = "v1.26.0"; - asds = [ "quilc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2021-12-09/quilc-v1.26.0.tgz"; - sha256 = "09qp2d6xgq4cmg6nfsdz0gbs3rvz3ln0kawmry6cls14lxnljjrr"; - system = "quilc"; - asd = "quilc"; - }); - systems = [ "quilc" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-syslog" pkgs) (getAttr "command-line-arguments" pkgs) (getAttr "drakma" pkgs) (getAttr "magicl" pkgs) (getAttr "cl-quil" pkgs) (getAttr "cl-quil-benchmarking" pkgs) (getAttr "rpcq" pkgs) (getAttr "swank" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-features" pkgs) (getAttr "uiop" pkgs) (getAttr "yason" pkgs) ]; - }; - quilc-tests = { - pname = "quilc-tests"; - version = "v1.26.0"; - asds = [ "quilc-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quilc/2021-12-09/quilc-v1.26.0.tgz"; - sha256 = "09qp2d6xgq4cmg6nfsdz0gbs3rvz3ln0kawmry6cls14lxnljjrr"; - system = "quilc-tests"; - asd = "quilc-tests"; - }); - systems = [ "quilc-tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "fiasco" pkgs) (getAttr "quilc" pkgs) (getAttr "uiop" pkgs) (getAttr "uuid" pkgs) ]; - }; - quine-mccluskey = { - pname = "quine-mccluskey"; - version = "20141217-git"; - asds = [ "quine-mccluskey" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-logic/2014-12-17/cl-logic-20141217-git.tgz"; - sha256 = "17n2wzqali3j6b7pqbydipwlxgwdrj4mdnsgwjdyz32n8jvfyjwh"; - system = "quine-mccluskey"; - asd = "cl-logic"; - }); - systems = [ "quine-mccluskey" ]; - lispLibs = [ ]; - }; - quri = { - pname = "quri"; - version = "20221106-git"; - asds = [ "quri" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quri/2022-11-06/quri-20221106-git.tgz"; - sha256 = "1crzgavvzsjp3xsddp4a5kd3ay0bn4scs839f0hk2yp482mg9jcx"; - system = "quri"; - asd = "quri"; - }); - systems = [ "quri" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cl-utilities" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - quri-test = { - pname = "quri-test"; - version = "20221106-git"; - asds = [ "quri-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quri/2022-11-06/quri-20221106-git.tgz"; - sha256 = "1crzgavvzsjp3xsddp4a5kd3ay0bn4scs839f0hk2yp482mg9jcx"; - system = "quri-test"; - asd = "quri-test"; - }); - systems = [ "quri-test" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "quri" pkgs) ]; - }; - quux-hunchentoot = { - pname = "quux-hunchentoot"; - version = "20211230-git"; - asds = [ "quux-hunchentoot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quux-hunchentoot/2021-12-30/quux-hunchentoot-20211230-git.tgz"; - sha256 = "0v0x4hzzfm835blqbp00vmj74gaq8wyldrnfj0x5s6zfl64w135y"; - system = "quux-hunchentoot"; - asd = "quux-hunchentoot"; - }); - systems = [ "quux-hunchentoot" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "lil" pkgs) (getAttr "lparallel" pkgs) (getAttr "trivia" pkgs) ]; - }; - quux-time = { - pname = "quux-time"; - version = "20150407-git"; - asds = [ "quux-time" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/quux-time/2015-04-07/quux-time-20150407-git.tgz"; - sha256 = "0hsa2n1j0abhw8na9fql47rq1rxpf2vkwg2mbb1c3ax56r8dsh0v"; - system = "quux-time"; - asd = "quux-time"; - }); - systems = [ "quux-time" ]; - lispLibs = [ ]; - }; - qvm = { - pname = "qvm"; - version = "v1.17.2"; - asds = [ "qvm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2021-06-30/qvm-v1.17.2.tgz"; - sha256 = "1cvmkqfcy7rv5jlim4kh4dvqhd3jk6mw1kwrphaqghjymrf72yp8"; - system = "qvm"; - asd = "qvm"; - }); - systems = [ "qvm" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "abstract-classes" pkgs) (getAttr "global-vars" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "lparallel" pkgs) (getAttr "magicl" pkgs) (getAttr "mt19937" pkgs) (getAttr "cl-quil" pkgs) (getAttr "static-vectors" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - qvm-app = { - pname = "qvm-app"; - version = "v1.17.2"; - asds = [ "qvm-app" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2021-06-30/qvm-v1.17.2.tgz"; - sha256 = "1cvmkqfcy7rv5jlim4kh4dvqhd3jk6mw1kwrphaqghjymrf72yp8"; - system = "qvm-app"; - asd = "qvm-app"; - }); - systems = [ "qvm-app" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-syslog" pkgs) (getAttr "command-line-arguments" pkgs) (getAttr "drakma" pkgs) (getAttr "global-vars" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "cl-quil" pkgs) (getAttr "qvm" pkgs) (getAttr "qvm-benchmarks" pkgs) (getAttr "swank" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "uiop" pkgs) (getAttr "yason" pkgs) ]; - }; - qvm-app-ng = { - pname = "qvm-app-ng"; - version = "v1.17.2"; - asds = [ "qvm-app-ng" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2021-06-30/qvm-v1.17.2.tgz"; - sha256 = "1cvmkqfcy7rv5jlim4kh4dvqhd3jk6mw1kwrphaqghjymrf72yp8"; - system = "qvm-app-ng"; - asd = "qvm-app-ng"; - }); - systems = [ "qvm-app-ng" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-algebraic-data-type" pkgs) (getAttr "cl-syslog" pkgs) (getAttr "command-line-arguments" pkgs) (getAttr "global-vars" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "cl-quil" pkgs) (getAttr "qvm" pkgs) (getAttr "trivial-features" pkgs) (getAttr "uiop" pkgs) (getAttr "uuid" pkgs) (getAttr "yason" pkgs) ]; - }; - qvm-app-ng-tests = { - pname = "qvm-app-ng-tests"; - version = "v1.17.2"; - asds = [ "qvm-app-ng-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2021-06-30/qvm-v1.17.2.tgz"; - sha256 = "1cvmkqfcy7rv5jlim4kh4dvqhd3jk6mw1kwrphaqghjymrf72yp8"; - system = "qvm-app-ng-tests"; - asd = "qvm-app-ng-tests"; - }); - systems = [ "qvm-app-ng-tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "drakma" pkgs) (getAttr "fiasco" pkgs) (getAttr "lparallel" pkgs) (getAttr "qvm-app-ng" pkgs) (getAttr "uiop" pkgs) (getAttr "yason" pkgs) ]; - }; - qvm-app-tests = { - pname = "qvm-app-tests"; - version = "v1.17.2"; - asds = [ "qvm-app-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2021-06-30/qvm-v1.17.2.tgz"; - sha256 = "1cvmkqfcy7rv5jlim4kh4dvqhd3jk6mw1kwrphaqghjymrf72yp8"; - system = "qvm-app-tests"; - asd = "qvm-app-tests"; - }); - systems = [ "qvm-app-tests" ]; - lispLibs = [ (getAttr "fiasco" pkgs) (getAttr "qvm-app" pkgs) (getAttr "uiop" pkgs) ]; - }; - qvm-benchmarks = { - pname = "qvm-benchmarks"; - version = "v1.17.2"; - asds = [ "qvm-benchmarks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2021-06-30/qvm-v1.17.2.tgz"; - sha256 = "1cvmkqfcy7rv5jlim4kh4dvqhd3jk6mw1kwrphaqghjymrf72yp8"; - system = "qvm-benchmarks"; - asd = "qvm-benchmarks"; - }); - systems = [ "qvm-benchmarks" ]; - lispLibs = [ (getAttr "cl-quil" pkgs) (getAttr "qvm" pkgs) (getAttr "trivial-benchmark" pkgs) (getAttr "yason" pkgs) ]; - }; - qvm-examples = { - pname = "qvm-examples"; - version = "v1.17.2"; - asds = [ "qvm-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2021-06-30/qvm-v1.17.2.tgz"; - sha256 = "1cvmkqfcy7rv5jlim4kh4dvqhd3jk6mw1kwrphaqghjymrf72yp8"; - system = "qvm-examples"; - asd = "qvm-examples"; - }); - systems = [ "qvm-examples" ]; - lispLibs = [ (getAttr "cl-grnm" pkgs) (getAttr "cl-quil" pkgs) (getAttr "qvm" pkgs) (getAttr "qvm-app" pkgs) ]; - }; - qvm-tests = { - pname = "qvm-tests"; - version = "v1.17.2"; - asds = [ "qvm-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qvm/2021-06-30/qvm-v1.17.2.tgz"; - sha256 = "1cvmkqfcy7rv5jlim4kh4dvqhd3jk6mw1kwrphaqghjymrf72yp8"; - system = "qvm-tests"; - asd = "qvm-tests"; - }); - systems = [ "qvm-tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "fiasco" pkgs) (getAttr "cl-quil" pkgs) (getAttr "qvm" pkgs) (getAttr "qvm-examples" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - qwt = { - pname = "qwt"; - version = "20210531-git"; - asds = [ "qwt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "qwt"; - asd = "qwt"; - }); - systems = [ "qwt" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) ]; - }; - racer = { - pname = "racer"; - version = "20190710-git"; - asds = [ "racer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/racer/2019-07-10/racer-20190710-git.tgz"; - sha256 = "120x046c6vcrj70vb6ryf04mwbr8c6a15llb68x7h1siij8vwgvk"; - system = "racer"; - asd = "racer"; - }); - systems = [ "racer" ]; - lispLibs = [ (getAttr "deflate" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "aserve" pkgs) ]; - }; - rail = { - pname = "rail"; - version = "20171227-git"; - asds = [ "rail" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rail/2017-12-27/cl-rail-20171227-git.tgz"; - sha256 = "0vxbxyfl5lw7na8iki1cjp0cd31z2bnxcpdv0x25hq0vch1cb5rj"; - system = "rail"; - asd = "rail"; - }); - systems = [ "rail" ]; - lispLibs = [ ]; - }; - rail-test = { - pname = "rail-test"; - version = "20171227-git"; - asds = [ "rail-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rail/2017-12-27/cl-rail-20171227-git.tgz"; - sha256 = "0vxbxyfl5lw7na8iki1cjp0cd31z2bnxcpdv0x25hq0vch1cb5rj"; - system = "rail-test"; - asd = "rail"; - }); - systems = [ "rail-test" ]; - lispLibs = [ (getAttr "rail" pkgs) (getAttr "fiasco" pkgs) ]; - }; - random = { - pname = "random"; - version = "20191007-git"; - asds = [ "random" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz"; - sha256 = "1fb4mnp85jm9s667y4dgz07klhkr9pvi5xbxws28lbb8iip75y2p"; - system = "random"; - asd = "random"; - }); - systems = [ "random" ]; - lispLibs = [ (getAttr "com_dot_google_dot_base" pkgs) ]; - }; - random-access-lists = { - pname = "random-access-lists"; - version = "20120208-git"; - asds = [ "random-access-lists" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/random-access-lists/2012-02-08/random-access-lists-20120208-git.tgz"; - sha256 = "0wslxxdmmr25hvmcyscph1bjlknm3nzh5g79cif22was1z411m5c"; - system = "random-access-lists"; - asd = "random-access-lists"; - }); - systems = [ "random-access-lists" ]; - lispLibs = [ (getAttr "lisp-unit" pkgs) ]; - }; - random-sample = { - pname = "random-sample"; - version = "20211230-git"; - asds = [ "random-sample" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/random-sample/2021-12-30/random-sample-20211230-git.tgz"; - sha256 = "0nhgca6wf754wbg91h40gx7xq22rawg2pn6l7h02wv1jxac4q6nh"; - system = "random-sample"; - asd = "random-sample"; - }); - systems = [ "random-sample" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "infix-math" pkgs) (getAttr "named-readtables" pkgs) (getAttr "serapeum" pkgs) ]; - }; - random-state = { - pname = "random-state"; - version = "20221106-git"; - asds = [ "random-state" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/random-state/2022-11-06/random-state-20221106-git.tgz"; - sha256 = "07qmlzkn0s7qrz06ycsr1idj58w0mjhr30mjwsj7wblmmczilq69"; - system = "random-state"; - asd = "random-state"; - }); - systems = [ "random-state" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - random-state-viewer = { - pname = "random-state-viewer"; - version = "20221106-git"; - asds = [ "random-state-viewer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/random-state/2022-11-06/random-state-20221106-git.tgz"; - sha256 = "07qmlzkn0s7qrz06ycsr1idj58w0mjhr30mjwsj7wblmmczilq69"; - system = "random-state-viewer"; - asd = "random-state-viewer"; - }); - systems = [ "random-state-viewer" ]; - lispLibs = [ (getAttr "qtcore" pkgs) (getAttr "qtgui" pkgs) (getAttr "qtools" pkgs) (getAttr "random-state" pkgs) ]; - }; - random-test = { - pname = "random-test"; - version = "20191007-git"; - asds = [ "random-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/random/2019-10-07/random-20191007-git.tgz"; - sha256 = "1fb4mnp85jm9s667y4dgz07klhkr9pvi5xbxws28lbb8iip75y2p"; - system = "random-test"; - asd = "random-test"; - }); - systems = [ "random-test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "random" pkgs) ]; - }; - random-uuid = { - pname = "random-uuid"; - version = "20220707-git"; - asds = [ "random-uuid" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/random-uuid/2022-07-07/random-uuid-20220707-git.tgz"; - sha256 = "09yfi16gh12qg4pi13gbr5n881q5zvw7acq27a6sbqbkny35a6wj"; - system = "random-uuid"; - asd = "random-uuid"; - }); - systems = [ "random-uuid" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) (getAttr "seedable-rng" pkgs) ]; - }; - rate-monotonic = { - pname = "rate-monotonic"; - version = "20200325-git"; - asds = [ "rate-monotonic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rate-monotonic/2020-03-25/rate-monotonic-20200325-git.tgz"; - sha256 = "0v9m704zy3834whldx2fbs8x92hp7hlrzdlcxm1rd17wqpv7pvrv"; - system = "rate-monotonic"; - asd = "rate-monotonic"; - }); - systems = [ "rate-monotonic" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "timer-wheel" pkgs) ]; - }; - rate-monotonic_dot_examples = { - pname = "rate-monotonic.examples"; - version = "20200325-git"; - asds = [ "rate-monotonic.examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rate-monotonic/2020-03-25/rate-monotonic-20200325-git.tgz"; - sha256 = "0v9m704zy3834whldx2fbs8x92hp7hlrzdlcxm1rd17wqpv7pvrv"; - system = "rate-monotonic.examples"; - asd = "rate-monotonic.examples"; - }); - systems = [ "rate-monotonic.examples" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "rate-monotonic" pkgs) ]; - }; - ratify = { - pname = "ratify"; - version = "20191007-git"; - asds = [ "ratify" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ratify/2019-10-07/ratify-20191007-git.tgz"; - sha256 = "0lhz3g85sc8ral59bs6g32f9nvxvbz126wchr8c3f5jj95xhngma"; - system = "ratify"; - asd = "ratify"; - }); - systems = [ "ratify" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "local-time" pkgs) (getAttr "parse-float" pkgs) ]; - }; - ratmath = { - pname = "ratmath"; - version = "20200218-git"; - asds = [ "ratmath" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ratmath/2020-02-18/ratmath-20200218-git.tgz"; - sha256 = "1p5rl1bam8qjsgscn7gwk2w55hdjawfgjikka59lwb6ia13v4rj9"; - system = "ratmath"; - asd = "ratmath"; - }); - systems = [ "ratmath" ]; - lispLibs = [ ]; - }; - rcl = { - pname = "rcl"; - version = "20201220-http"; - asds = [ "rcl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rcl/2020-12-20/rcl-20201220-http.tgz"; - sha256 = "1s6cvqs0s7fxh63zwc5zj7ryrffmv780rscm7aq3alzb9njwmg14"; - system = "rcl"; - asd = "rcl"; - }); - systems = [ "rcl" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "named-readtables" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "simple-tasks" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - rcl_slash_prove = { - pname = "rcl_prove"; - version = "20201220-http"; - asds = [ "rcl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rcl/2020-12-20/rcl-20201220-http.tgz"; - sha256 = "1s6cvqs0s7fxh63zwc5zj7ryrffmv780rscm7aq3alzb9njwmg14"; - system = "rcl"; - asd = "rcl"; - }); - systems = [ "rcl/prove" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "rcl" pkgs) ]; - meta = { - broken = true; - }; - }; - rcl_slash_test = { - pname = "rcl_test"; - version = "20201220-http"; - asds = [ "rcl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rcl/2020-12-20/rcl-20201220-http.tgz"; - sha256 = "1s6cvqs0s7fxh63zwc5zj7ryrffmv780rscm7aq3alzb9njwmg14"; - system = "rcl"; - asd = "rcl"; - }); - systems = [ "rcl/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "rcl" pkgs) ]; - meta = { - broken = true; - }; - }; - re = { - pname = "re"; - version = "20210630-git"; - asds = [ "re" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/re/2021-06-30/re-20210630-git.tgz"; - sha256 = "15q4zvvzkxf1j0wxw0b1kz4d03js9cbgv82ndl8z6riz40kbffdp"; - system = "re"; - asd = "re"; - }); - systems = [ "re" ]; - lispLibs = [ (getAttr "parse" pkgs) ]; - }; - read-as-string = { - pname = "read-as-string"; - version = "20220707-git"; - asds = [ "read-as-string" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/read-as-string/2022-07-07/read-as-string-20220707-git.tgz"; - sha256 = "08dnnqmbadsrbsqr4n1x7rf0p46j9al0hw6la0z3jclp604dd0k3"; - system = "read-as-string"; - asd = "read-as-string"; - }); - systems = [ "read-as-string" ]; - lispLibs = [ (getAttr "core-reader" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - read-as-string_dot_test = { - pname = "read-as-string.test"; - version = "20220707-git"; - asds = [ "read-as-string.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/read-as-string/2022-07-07/read-as-string-20220707-git.tgz"; - sha256 = "08dnnqmbadsrbsqr4n1x7rf0p46j9al0hw6la0z3jclp604dd0k3"; - system = "read-as-string.test"; - asd = "read-as-string.test"; - }); - systems = [ "read-as-string.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "read-as-string" pkgs) ]; - }; - read-csv = { - pname = "read-csv"; - version = "20181018-git"; - asds = [ "read-csv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/read-csv/2018-10-18/read-csv-20181018-git.tgz"; - sha256 = "1wr6n8z7jm611xf2jwp3pw03qzq76440cmb75495l5p907lmrbcs"; - system = "read-csv"; - asd = "read-csv"; - }); - systems = [ "read-csv" ]; - lispLibs = [ ]; - }; - read-csv_dot_test = { - pname = "read-csv.test"; - version = "20181018-git"; - asds = [ "read-csv.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/read-csv/2018-10-18/read-csv-20181018-git.tgz"; - sha256 = "1wr6n8z7jm611xf2jwp3pw03qzq76440cmb75495l5p907lmrbcs"; - system = "read-csv.test"; - asd = "read-csv"; - }); - systems = [ "read-csv.test" ]; - lispLibs = [ (getAttr "read-csv" pkgs) ]; - }; - read-number = { - pname = "read-number"; - version = "20220331-git"; - asds = [ "read-number" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/read-number/2022-03-31/read-number-20220331-git.tgz"; - sha256 = "1g8l7l02w77iy2dhw88vnmz05a38vyrlx5ri4yc5l8k3dkfc5q64"; - system = "read-number"; - asd = "read-number"; - }); - systems = [ "read-number" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - reader = { - pname = "reader"; - version = "v0.10.0"; - asds = [ "reader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/reader/2020-12-20/reader-v0.10.0.tgz"; - sha256 = "0pbv6w0d8d4qmfkdsz2rk21bp1las9r7pyvpmd95qjz7kpxrirl7"; - system = "reader"; - asd = "reader"; - }); - systems = [ "reader" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiveam" pkgs) (getAttr "hash-set" pkgs) (getAttr "iterate" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-types" pkgs) (getAttr "uiop" pkgs) ]; - }; - reader_plus_swank = { - pname = "reader+swank"; - version = "v0.10.0"; - asds = [ "reader+swank" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/reader/2020-12-20/reader-v0.10.0.tgz"; - sha256 = "0pbv6w0d8d4qmfkdsz2rk21bp1las9r7pyvpmd95qjz7kpxrirl7"; - system = "reader+swank"; - asd = "reader+swank"; - }); - systems = [ "reader+swank" ]; - lispLibs = [ (getAttr "reader" pkgs) (getAttr "swank" pkgs) ]; - }; - reader-interception = { - pname = "reader-interception"; - version = "20150608-git"; - asds = [ "reader-interception" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/reader-interception/2015-06-08/reader-interception-20150608-git.tgz"; - sha256 = "1f6xblayqb9q01qclvqx2gllqxm0qk8rmlp38rz433vgjxbq79y0"; - system = "reader-interception"; - asd = "reader-interception"; - }); - systems = [ "reader-interception" ]; - lispLibs = [ ]; - }; - reader-interception-test = { - pname = "reader-interception-test"; - version = "20150608-git"; - asds = [ "reader-interception-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/reader-interception/2015-06-08/reader-interception-20150608-git.tgz"; - sha256 = "1f6xblayqb9q01qclvqx2gllqxm0qk8rmlp38rz433vgjxbq79y0"; - system = "reader-interception-test"; - asd = "reader-interception-test"; - }); - systems = [ "reader-interception-test" ]; - lispLibs = [ (getAttr "fare-utils" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "reader-interception" pkgs) ]; - }; - rectangle-packing = { - pname = "rectangle-packing"; - version = "20130615-git"; - asds = [ "rectangle-packing" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rectangle-packing/2013-06-15/rectangle-packing-20130615-git.tgz"; - sha256 = "1m31qbgkrgbp753mr012hpzjfddwmfzvazaadp3s6wd34vmbbv01"; - system = "rectangle-packing"; - asd = "rectangle-packing"; - }); - systems = [ "rectangle-packing" ]; - lispLibs = [ ]; - }; - recur = { - pname = "recur"; - version = "20190307-hg"; - asds = [ "recur" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/recur/2019-03-07/recur-20190307-hg.tgz"; - sha256 = "1m19f0m0kn9pk2i6vhd6fwz9bjm6kqp24p5kxmicdr9vn29jihhn"; - system = "recur"; - asd = "recur"; - }); - systems = [ "recur" ]; - lispLibs = [ ]; - }; - recursive-regex = { - pname = "recursive-regex"; - version = "20120407-git"; - asds = [ "recursive-regex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/recursive-regex/2012-04-07/recursive-regex-20120407-git.tgz"; - sha256 = "1alsfqfa85dwms7i3xrbp6ahlqk9a3sl8d4llxy1ydb0rlb09l4r"; - system = "recursive-regex"; - asd = "recursive-regex"; - }); - systems = [ "recursive-regex" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "iterate" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - recursive-regex-test = { - pname = "recursive-regex-test"; - version = "20120407-git"; - asds = [ "recursive-regex-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/recursive-regex/2012-04-07/recursive-regex-20120407-git.tgz"; - sha256 = "1alsfqfa85dwms7i3xrbp6ahlqk9a3sl8d4llxy1ydb0rlb09l4r"; - system = "recursive-regex-test"; - asd = "recursive-regex"; - }); - systems = [ "recursive-regex-test" ]; - lispLibs = [ (getAttr "lisp-unit" pkgs) (getAttr "recursive-regex" pkgs) ]; - }; - recursive-restart = { - pname = "recursive-restart"; - version = "20161031-git"; - asds = [ "recursive-restart" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/recursive-restart/2016-10-31/recursive-restart-20161031-git.tgz"; - sha256 = "0lgw95bnzw99avrb7vcg02fbw3y5mazfgnkim8gsazfjliaj21m7"; - system = "recursive-restart"; - asd = "recursive-restart"; - }); - systems = [ "recursive-restart" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - red-black-tree = { - pname = "red-black-tree"; - version = "20220707-git"; - asds = [ "red-black-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/red-black-tree/2022-07-07/red-black-tree-20220707-git.tgz"; - sha256 = "0dbl6y4l7k30a13d6rfdfby6p27li5b17nvz7xgyajxl9q5zz5kk"; - system = "red-black-tree"; - asd = "red-black-tree"; - }); - systems = [ "red-black-tree" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) ]; - }; - redirect-stream = { - pname = "redirect-stream"; - version = "20190710-git"; - asds = [ "redirect-stream" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/redirect-stream/2019-07-10/redirect-stream-20190710-git.tgz"; - sha256 = "1l1mwkk3pxbahx2m2v9yw19na45sjdxfy1dv59if738x5mvaqb05"; - system = "redirect-stream"; - asd = "redirect-stream"; - }); - systems = [ "redirect-stream" ]; - lispLibs = [ (getAttr "trivial-gray-streams" pkgs) ]; - }; - regex = { - pname = "regex"; - version = "20120909-git"; - asds = [ "regex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regex/2012-09-09/regex-20120909-git.tgz"; - sha256 = "0wq5wlafrxv13wg28hg5b10sc48b88swsvznpy2zg7x37m4nmm6a"; - system = "regex"; - asd = "regex"; - }); - systems = [ "regex" ]; - lispLibs = [ ]; - }; - regression = { - pname = "regression"; - version = "master-1a957fb2-git"; - asds = [ "regression" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "regression"; - asd = "regression"; - }); - systems = [ "regression" ]; - lispLibs = [ (getAttr "surf" pkgs) (getAttr "tasty" pkgs) (getAttr "lift" pkgs) ]; - }; - remote-js = { - pname = "remote-js"; - version = "20190710-git"; - asds = [ "remote-js" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/remote-js/2019-07-10/remote-js-20190710-git.tgz"; - sha256 = "1z8apvfng8i7x4dsnz9da4y2l9mr7jykm19lmq3070qra7r3lby6"; - system = "remote-js"; - asd = "remote-js"; - }); - systems = [ "remote-js" ]; - lispLibs = [ (getAttr "cl-markup" pkgs) (getAttr "find-port" pkgs) (getAttr "trivial-ws" pkgs) ]; - }; - remote-js-test = { - pname = "remote-js-test"; - version = "20190710-git"; - asds = [ "remote-js-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/remote-js/2019-07-10/remote-js-20190710-git.tgz"; - sha256 = "1z8apvfng8i7x4dsnz9da4y2l9mr7jykm19lmq3070qra7r3lby6"; - system = "remote-js-test"; - asd = "remote-js-test"; - }); - systems = [ "remote-js-test" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "fiveam" pkgs) (getAttr "remote-js" pkgs) (getAttr "trivial-open-browser" pkgs) ]; - }; - repl-utilities = { - pname = "repl-utilities"; - version = "20210228-git"; - asds = [ "repl-utilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/repl-utilities/2021-02-28/repl-utilities-20210228-git.tgz"; - sha256 = "1hh56pq5nw3l4b83dzlyss69f06r038byj2cnjwvci4hfjhdfcc3"; - system = "repl-utilities"; - asd = "repl-utilities"; - }); - systems = [ "repl-utilities" ]; - lispLibs = [ ]; - }; - replic = { - pname = "replic"; - version = "20221106-git"; - asds = [ "replic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/replic/2022-11-06/replic-20221106-git.tgz"; - sha256 = "02i4h06b1jb461k1bdb3qbmpbxvj4g4yi664p15dcwr9pjqjpg2w"; - system = "replic"; - asd = "replic"; - }); - systems = [ "replic" ]; - lispLibs = [ (getAttr "cl-ansi-text" pkgs) (getAttr "cl-readline" pkgs) (getAttr "shlex" pkgs) (getAttr "str" pkgs) (getAttr "py-configparser" pkgs) (getAttr "unix-opts" pkgs) ]; - }; - replic-test = { - pname = "replic-test"; - version = "20221106-git"; - asds = [ "replic-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/replic/2022-11-06/replic-20221106-git.tgz"; - sha256 = "02i4h06b1jb461k1bdb3qbmpbxvj4g4yi664p15dcwr9pjqjpg2w"; - system = "replic-test"; - asd = "replic-test"; - }); - systems = [ "replic-test" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "replic" pkgs) ]; - }; - research = { - pname = "research"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "research" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "research"; - asd = "research"; - }); - systems = [ "research" ]; - lispLibs = [ (getAttr "_2d-array-test" pkgs) (getAttr "adjuvant" pkgs) (getAttr "adjuvant-test" pkgs) (getAttr "dispatch-test" pkgs) (getAttr "ndfa-test" pkgs) (getAttr "rte-regexp-test" pkgs) (getAttr "rte-test" pkgs) (getAttr "scrutiny" pkgs) (getAttr "scrutiny-test" pkgs) ]; - }; - resignal-bind = { - pname = "resignal-bind"; - version = "20211020-git"; - asds = [ "resignal-bind" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/resignal-bind/2021-10-20/resignal-bind-20211020-git.tgz"; - sha256 = "109b5bf2h3yqax87r16dsbnb0xdd9kqi0zdisy0wja1h622yrxhc"; - system = "resignal-bind"; - asd = "resignal-bind"; - }); - systems = [ "resignal-bind" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) ]; - }; - resignal-bind_dot_test = { - pname = "resignal-bind.test"; - version = "20211020-git"; - asds = [ "resignal-bind.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/resignal-bind/2021-10-20/resignal-bind-20211020-git.tgz"; - sha256 = "109b5bf2h3yqax87r16dsbnb0xdd9kqi0zdisy0wja1h622yrxhc"; - system = "resignal-bind.test"; - asd = "resignal-bind.test"; - }); - systems = [ "resignal-bind.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "resignal-bind" pkgs) ]; - }; - restas = { - pname = "restas"; - version = "20191008-git"; - asds = [ "restas" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/restas/2019-10-08/restas-20191008-git.tgz"; - sha256 = "00ng6jik1lwjw3bbxhijy8s0ml24lgm73liwrr01gcsb0r6wrjjn"; - system = "restas"; - asd = "restas"; - }); - systems = [ "restas" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "routes" pkgs) (getAttr "data-sift" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - restas-directory-publisher = { - pname = "restas-directory-publisher"; - version = "20130128-git"; - asds = [ "restas-directory-publisher" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/restas-directory-publisher/2013-01-28/restas-directory-publisher-20130128-git.tgz"; - sha256 = "1ra4bxsg9v507zrqjx78ak3797clagl6n62d3bx0aghrnkal1gmp"; - system = "restas-directory-publisher"; - asd = "restas-directory-publisher"; - }); - systems = [ "restas-directory-publisher" ]; - lispLibs = [ (getAttr "closure-template" pkgs) (getAttr "local-time" pkgs) (getAttr "restas" pkgs) ]; - }; - restas-doc = { - pname = "restas-doc"; - version = "20191008-git"; - asds = [ "restas-doc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/restas/2019-10-08/restas-20191008-git.tgz"; - sha256 = "00ng6jik1lwjw3bbxhijy8s0ml24lgm73liwrr01gcsb0r6wrjjn"; - system = "restas-doc"; - asd = "restas-doc"; - }); - systems = [ "restas-doc" ]; - lispLibs = [ (getAttr "sphinx" pkgs) (getAttr "restas" pkgs) (getAttr "restas-directory-publisher" pkgs) ]; - }; - restas_dot_file-publisher = { - pname = "restas.file-publisher"; - version = "20120107-git"; - asds = [ "restas.file-publisher" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/restas.file-publisher/2012-01-07/restas.file-publisher-20120107-git.tgz"; - sha256 = "12h291as21ziqb1l6p2p4hy429z6zznacp1gn0m2vah7f811q75l"; - system = "restas.file-publisher"; - asd = "restas.file-publisher"; - }); - systems = [ "restas.file-publisher" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "restas" pkgs) ]; - }; - restful = { - pname = "restful"; - version = "20150608-git"; - asds = [ "restful" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/restful/2015-06-08/restful-20150608-git.tgz"; - sha256 = "1imcpd9zm1dbb1675pf3g3d6w9vyxk07g7r33174qdw470j8ml5n"; - system = "restful"; - asd = "restful"; - }); - systems = [ "restful" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "jonathan" pkgs) ]; - }; - restful-test = { - pname = "restful-test"; - version = "20150608-git"; - asds = [ "restful-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/restful/2015-06-08/restful-20150608-git.tgz"; - sha256 = "1imcpd9zm1dbb1675pf3g3d6w9vyxk07g7r33174qdw470j8ml5n"; - system = "restful-test"; - asd = "restful-test"; - }); - systems = [ "restful-test" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "restful" pkgs) ]; - }; - restricted-functions = { - pname = "restricted-functions"; - version = "20190521-git"; - asds = [ "restricted-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/restricted-functions/2019-05-21/restricted-functions-20190521-git.tgz"; - sha256 = "092k7bp6n8kppf2wdqf1kf1h8lrww6k1dcxp05dby779b8c6kfz4"; - system = "restricted-functions"; - asd = "restricted-functions"; - }); - systems = [ "restricted-functions" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "simplified-types" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-arguments" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - retrospectiff = { - pname = "retrospectiff"; - version = "20211209-git"; - asds = [ "retrospectiff" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/retrospectiff/2021-12-09/retrospectiff-20211209-git.tgz"; - sha256 = "1vfcbfzhkm2wkxnjg7y6gg93wlib9cqpbdbhyqcm5kc7170ci3vz"; - system = "retrospectiff"; - asd = "retrospectiff"; - }); - systems = [ "retrospectiff" ]; - lispLibs = [ (getAttr "cl-jpeg" pkgs) (getAttr "deflate" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "com_dot_gigamonkeys_dot_binary-data" pkgs) (getAttr "opticl-core" pkgs) ]; - }; - retrospectiff_slash_test = { - pname = "retrospectiff_test"; - version = "20211209-git"; - asds = [ "retrospectiff" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/retrospectiff/2021-12-09/retrospectiff-20211209-git.tgz"; - sha256 = "1vfcbfzhkm2wkxnjg7y6gg93wlib9cqpbdbhyqcm5kc7170ci3vz"; - system = "retrospectiff"; - asd = "retrospectiff"; - }); - systems = [ "retrospectiff/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "retrospectiff" pkgs) ]; - meta = { - broken = true; - }; - }; - reversi = { - pname = "reversi"; - version = "20201016-git"; - asds = [ "reversi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/reversi/2020-10-16/reversi-20201016-git.tgz"; - sha256 = "1vwjk207hvn5skazmkrcifkv4ia9nm5312rj0fr3w5423dr56swx"; - system = "reversi"; - asd = "reversi"; - }); - systems = [ "reversi" ]; - lispLibs = [ ]; - }; - rfc2109 = { - pname = "rfc2109"; - version = "20151218-darcs"; - asds = [ "rfc2109" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rfc2109/2015-12-18/rfc2109-20151218-darcs.tgz"; - sha256 = "1y767qjv5jxyfqzp0zpw96yz95mb8hhpjj9dn2i6b92r0z2vr42d"; - system = "rfc2109"; - asd = "rfc2109"; - }); - systems = [ "rfc2109" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) ]; - }; - rfc2109_slash_test = { - pname = "rfc2109_test"; - version = "20151218-darcs"; - asds = [ "rfc2109" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rfc2109/2015-12-18/rfc2109-20151218-darcs.tgz"; - sha256 = "1y767qjv5jxyfqzp0zpw96yz95mb8hhpjj9dn2i6b92r0z2vr42d"; - system = "rfc2109"; - asd = "rfc2109"; - }); - systems = [ "rfc2109/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "split-sequence" pkgs) ]; - meta = { - broken = true; - }; - }; - rfc2388 = { - pname = "rfc2388"; - version = "20180831-git"; - asds = [ "rfc2388" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz"; - sha256 = "0phh5n3clhl9ji8jaxrajidn22d3f0aq87mlbfkkxlnx2pnw694k"; - system = "rfc2388"; - asd = "rfc2388"; - }); - systems = [ "rfc2388" ]; - lispLibs = [ ]; - }; - rfc2388-binary = { - pname = "rfc2388-binary"; - version = "20170124-darcs"; - asds = [ "rfc2388-binary" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rfc2388-binary/2017-01-24/rfc2388-binary-20170124-darcs.tgz"; - sha256 = "1ddjhd9vqramg93963d4py9a2hqpy1fr1ly517r3bpjx7a5mffwk"; - system = "rfc2388-binary"; - asd = "rfc2388-binary"; - }); - systems = [ "rfc2388-binary" ]; - lispLibs = [ ]; - }; - rlc = { - pname = "rlc"; - version = "20150923-git"; - asds = [ "rlc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rlc/2015-09-23/rlc-20150923-git.tgz"; - sha256 = "1c37as5x45yizs76s7115a0w3fgas80bjb8xzq7yylpmxq44s2rk"; - system = "rlc"; - asd = "rlc"; - }); - systems = [ "rlc" ]; - lispLibs = [ (getAttr "kmrcl" pkgs) ]; - }; - roan = { - pname = "roan"; - version = "20201220-git"; - asds = [ "roan" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/roan/2020-12-20/roan-20201220-git.tgz"; - sha256 = "032znprz03x4apzssb5vzs55cfdfyvca56bcrwxwm9dgkh3cnh7z"; - system = "roan"; - asd = "roan"; - }); - systems = [ "roan" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "asdf-encodings" pkgs) (getAttr "binascii" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "iterate" pkgs) (getAttr "local-time" pkgs) (getAttr "named-readtables" pkgs) (getAttr "plump" pkgs) (getAttr "uuid" pkgs) (getAttr "zip" pkgs) ]; - }; - roan_slash_doc = { - pname = "roan_doc"; - version = "20201220-git"; - asds = [ "roan" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/roan/2020-12-20/roan-20201220-git.tgz"; - sha256 = "032znprz03x4apzssb5vzs55cfdfyvca56bcrwxwm9dgkh3cnh7z"; - system = "roan"; - asd = "roan"; - }); - systems = [ "roan/doc" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "asdf-encodings" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "iterate" pkgs) (getAttr "roan" pkgs) (getAttr "trivial-documentation" pkgs) ]; - meta = { - broken = true; - }; - }; - roan_slash_test = { - pname = "roan_test"; - version = "20201220-git"; - asds = [ "roan" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/roan/2020-12-20/roan-20201220-git.tgz"; - sha256 = "032znprz03x4apzssb5vzs55cfdfyvca56bcrwxwm9dgkh3cnh7z"; - system = "roan"; - asd = "roan"; - }); - systems = [ "roan/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "asdf-encodings" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "iterate" pkgs) (getAttr "lisp-unit2" pkgs) (getAttr "roan" pkgs) ]; - meta = { - broken = true; - }; - }; - robot = { - pname = "robot"; - version = "master-1a957fb2-git"; - asds = [ "robot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "robot"; - asd = "robot"; - }); - systems = [ "robot" ]; - lispLibs = [ (getAttr "gwl-graphics" pkgs) ]; - }; - rock = { - pname = "rock"; - version = "20150608-git"; - asds = [ "rock" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz"; - sha256 = "1ckvxswinv25vzwmyrr6k7m9cx99kl04b4543mlxad9688np91y8"; - system = "rock"; - asd = "rock"; - }); - systems = [ "rock" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "trivial-download" pkgs) (getAttr "trivial-extract" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - rock-test = { - pname = "rock-test"; - version = "20150608-git"; - asds = [ "rock-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz"; - sha256 = "1ckvxswinv25vzwmyrr6k7m9cx99kl04b4543mlxad9688np91y8"; - system = "rock-test"; - asd = "rock-test"; - }); - systems = [ "rock-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "rock" pkgs) ]; - }; - rock-web = { - pname = "rock-web"; - version = "20150608-git"; - asds = [ "rock-web" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rock/2015-06-08/rock-20150608-git.tgz"; - sha256 = "1ckvxswinv25vzwmyrr6k7m9cx99kl04b4543mlxad9688np91y8"; - system = "rock-web"; - asd = "rock-web"; - }); - systems = [ "rock-web" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "_3bmd-ext-code-blocks" pkgs) (getAttr "_3bmd-ext-definition-lists" pkgs) (getAttr "cl-markup" pkgs) (getAttr "lass" pkgs) (getAttr "rock" pkgs) ]; - }; - rollback = { - pname = "rollback"; - version = "20221106-git"; - asds = [ "rollback" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rollback/2022-11-06/cl-rollback-20221106-git.tgz"; - sha256 = "12dpxsbm2al633y87i8p784k2dn4bbskz6sl40v9f5ljjmjqjzxf"; - system = "rollback"; - asd = "rollback"; - }); - systems = [ "rollback" ]; - lispLibs = [ ]; - }; - romreader = { - pname = "romreader"; - version = "20140713-git"; - asds = [ "romreader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/romreader/2014-07-13/romreader-20140713-git.tgz"; - sha256 = "1k3fnh48vy5wdbqif4hmflmxc3xnihyi1222cldcjvxl294yk6xx"; - system = "romreader"; - asd = "romreader"; - }); - systems = [ "romreader" ]; - lispLibs = [ ]; - }; - routes = { - pname = "routes"; - version = "20170124-git"; - asds = [ "routes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-routes/2017-01-24/cl-routes-20170124-git.tgz"; - sha256 = "1zpk3cp2v8hm50ppjl10yxr437vv4552r8hylvizglzrq2ibsbr1"; - system = "routes"; - asd = "routes"; - }); - systems = [ "routes" ]; - lispLibs = [ (getAttr "iterate" pkgs) (getAttr "puri" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - routes-test = { - pname = "routes-test"; - version = "20170124-git"; - asds = [ "routes-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-routes/2017-01-24/cl-routes-20170124-git.tgz"; - sha256 = "1zpk3cp2v8hm50ppjl10yxr437vv4552r8hylvizglzrq2ibsbr1"; - system = "routes-test"; - asd = "routes"; - }); - systems = [ "routes-test" ]; - lispLibs = [ (getAttr "routes" pkgs) (getAttr "lift" pkgs) ]; - }; - rove = { - pname = "rove"; - version = "20220331-git"; - asds = [ "rove" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rove/2022-03-31/rove-20220331-git.tgz"; - sha256 = "00j96yll6w7xcsscrirxmb99xspdj71922hfjlb9jl44j4kiknya"; - system = "rove"; - asd = "rove"; - }); - systems = [ "rove" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "dissect" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - rovers-problem-translator = { - pname = "rovers-problem-translator"; - version = "20221106-git"; - asds = [ "rovers-problem-translator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2022-11-06/shop3-20221106-git.tgz"; - sha256 = "18fqx41qyd74q0y1niav05wsrjd6wcn6sa6imx0ykyw6libq33z3"; - system = "rovers-problem-translator"; - asd = "rovers-problem-translator"; - }); - systems = [ "rovers-problem-translator" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "shop3" pkgs) ]; - }; - rpcq = { - pname = "rpcq"; - version = "v3.10.0"; - asds = [ "rpcq" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rpcq/2022-07-07/rpcq-v3.10.0.tgz"; - sha256 = "1bvppxlacvp0pfdbpn7ls1zxd127jacl225ds7lph5s8f8cyvf17"; - system = "rpcq"; - asd = "rpcq"; - }); - systems = [ "rpcq" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-messagepack" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-syslog" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "local-time" pkgs) (getAttr "parse-float" pkgs) (getAttr "pzmq" pkgs) (getAttr "trivial-backtrace" pkgs) (getAttr "uuid" pkgs) (getAttr "yason" pkgs) ]; - }; - rpcq-tests = { - pname = "rpcq-tests"; - version = "v3.10.0"; - asds = [ "rpcq-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rpcq/2022-07-07/rpcq-v3.10.0.tgz"; - sha256 = "1bvppxlacvp0pfdbpn7ls1zxd127jacl225ds7lph5s8f8cyvf17"; - system = "rpcq-tests"; - asd = "rpcq-tests"; - }); - systems = [ "rpcq-tests" ]; - lispLibs = [ (getAttr "cl-messagepack" pkgs) (getAttr "cl-syslog" pkgs) (getAttr "fiasco" pkgs) (getAttr "rpcq" pkgs) (getAttr "uiop" pkgs) ]; - }; - rpm = { - pname = "rpm"; - version = "20160421-git"; - asds = [ "rpm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rpm/2016-04-21/rpm-20160421-git.tgz"; - sha256 = "0qn4vw3pvjm0maksl57mwikcmv7calzlblp5s01ixrn3nrgxmd9k"; - system = "rpm"; - asd = "rpm"; - }); - systems = [ "rpm" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "fare-utils" pkgs) (getAttr "inferior-shell" pkgs) (getAttr "lambda-reader" pkgs) ]; - }; - rs-colors = { - pname = "rs-colors"; - version = "20220331-git"; - asds = [ "rs-colors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; - sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; - system = "rs-colors"; - asd = "rs-colors"; - }); - systems = [ "rs-colors" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "read-number" pkgs) (getAttr "rs-colors-internal" pkgs) ]; - }; - rs-colors-html = { - pname = "rs-colors-html"; - version = "20220331-git"; - asds = [ "rs-colors-html" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; - sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; - system = "rs-colors-html"; - asd = "rs-colors-html"; - }); - systems = [ "rs-colors-html" ]; - lispLibs = [ (getAttr "rs-colors" pkgs) ]; - }; - rs-colors-internal = { - pname = "rs-colors-internal"; - version = "20220331-git"; - asds = [ "rs-colors-internal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; - sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; - system = "rs-colors-internal"; - asd = "rs-colors-internal"; - }); - systems = [ "rs-colors-internal" ]; - lispLibs = [ (getAttr "iterate" pkgs) ]; - }; - rs-colors-material-io = { - pname = "rs-colors-material-io"; - version = "20220331-git"; - asds = [ "rs-colors-material-io" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; - sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; - system = "rs-colors-material-io"; - asd = "rs-colors-material-io"; - }); - systems = [ "rs-colors-material-io" ]; - lispLibs = [ (getAttr "rs-colors" pkgs) ]; - }; - rs-colors-ral = { - pname = "rs-colors-ral"; - version = "20220331-git"; - asds = [ "rs-colors-ral" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; - sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; - system = "rs-colors-ral"; - asd = "rs-colors-ral"; - }); - systems = [ "rs-colors-ral" ]; - lispLibs = [ (getAttr "rs-colors" pkgs) ]; - }; - rs-colors-ral-design = { - pname = "rs-colors-ral-design"; - version = "20220331-git"; - asds = [ "rs-colors-ral-design" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; - sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; - system = "rs-colors-ral-design"; - asd = "rs-colors-ral-design"; - }); - systems = [ "rs-colors-ral-design" ]; - lispLibs = [ (getAttr "rs-colors" pkgs) ]; - }; - rs-colors-svg = { - pname = "rs-colors-svg"; - version = "20220331-git"; - asds = [ "rs-colors-svg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; - sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; - system = "rs-colors-svg"; - asd = "rs-colors-svg"; - }); - systems = [ "rs-colors-svg" ]; - lispLibs = [ (getAttr "rs-colors" pkgs) ]; - }; - rs-colors-tango = { - pname = "rs-colors-tango"; - version = "20220331-git"; - asds = [ "rs-colors-tango" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; - sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; - system = "rs-colors-tango"; - asd = "rs-colors-tango"; - }); - systems = [ "rs-colors-tango" ]; - lispLibs = [ (getAttr "rs-colors" pkgs) ]; - }; - rs-colors-x11 = { - pname = "rs-colors-x11"; - version = "20220331-git"; - asds = [ "rs-colors-x11" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rs-colors/2022-03-31/rs-colors-20220331-git.tgz"; - sha256 = "06akjly9s4pfix39yca8n3dpazbby09wc8cj0fsfvkg61lvacic5"; - system = "rs-colors-x11"; - asd = "rs-colors-x11"; - }); - systems = [ "rs-colors-x11" ]; - lispLibs = [ (getAttr "rs-colors" pkgs) ]; - }; - rss = { - pname = "rss"; - version = "20201016-git"; - asds = [ "rss" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-rss/2020-10-16/cl-rss-20201016-git.tgz"; - sha256 = "0wv3j13fj73gigriw5r9vi920hz05ld7zllsvbxdxvmyfy9k1kly"; - system = "rss"; - asd = "rss"; - }); - systems = [ "rss" ]; - lispLibs = [ (getAttr "kmrcl" pkgs) (getAttr "aserve" pkgs) (getAttr "xmls" pkgs) ]; - }; - rt = { - pname = "rt"; - version = "20101006-git"; - asds = [ "rt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz"; - sha256 = "13si2rrxaagbr0bkvg6sqicxxpyshabx6ad6byc9n2ik5ysna69b"; - system = "rt"; - asd = "rt"; - }); - systems = [ "rt" ]; - lispLibs = [ ]; - }; - rt-events = { - pname = "rt-events"; - version = "20160318-git"; - asds = [ "rt-events" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rt-events/2016-03-18/rt-events-20160318-git.tgz"; - sha256 = "17wqhczsi4mq00fp5hfc38b9ijdiaqjh7cvxhy714qqz3f5mxzdw"; - system = "rt-events"; - asd = "rt-events"; - }); - systems = [ "rt-events" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - rt-events_dot_examples = { - pname = "rt-events.examples"; - version = "20160318-git"; - asds = [ "rt-events.examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rt-events/2016-03-18/rt-events-20160318-git.tgz"; - sha256 = "17wqhczsi4mq00fp5hfc38b9ijdiaqjh7cvxhy714qqz3f5mxzdw"; - system = "rt-events.examples"; - asd = "rt-events.examples"; - }); - systems = [ "rt-events.examples" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "rt-events" pkgs) ]; - }; - rte = { - pname = "rte"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "rte" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "rte"; - asd = "rte"; - }); - systems = [ "rte" ]; - lispLibs = [ (getAttr "adjuvant" pkgs) (getAttr "lisp-types" pkgs) (getAttr "ndfa" pkgs) ]; - }; - rte-regexp = { - pname = "rte-regexp"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "rte-regexp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "rte-regexp"; - asd = "rte-regexp"; - }); - systems = [ "rte-regexp" ]; - lispLibs = [ (getAttr "yacc" pkgs) (getAttr "adjuvant" pkgs) (getAttr "rte" pkgs) ]; - }; - rte-regexp-test = { - pname = "rte-regexp-test"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "rte-regexp-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "rte-regexp-test"; - asd = "rte-regexp-test"; - }); - systems = [ "rte-regexp-test" ]; - lispLibs = [ (getAttr "adjuvant" pkgs) (getAttr "rte" pkgs) (getAttr "rte-regexp" pkgs) (getAttr "scrutiny" pkgs) ]; - }; - rte-test = { - pname = "rte-test"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "rte-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "rte-test"; - asd = "rte-test"; - }); - systems = [ "rte-test" ]; - lispLibs = [ (getAttr "_2d-array" pkgs) (getAttr "_2d-array-test" pkgs) (getAttr "adjuvant" pkgs) (getAttr "lisp-types-test" pkgs) (getAttr "ndfa-test" pkgs) (getAttr "rte" pkgs) (getAttr "rte-regexp-test" pkgs) (getAttr "scrutiny" pkgs) ]; - }; - rtg-math = { - pname = "rtg-math"; - version = "release-quicklisp-29fc5b3d-git"; - asds = [ "rtg-math" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rtg-math/2019-10-07/rtg-math-release-quicklisp-29fc5b3d-git.tgz"; - sha256 = "0bhxxnv7ldkkb18zdxyz2rj2a3iawzq2kcp7cn5i91iby7n0082x"; - system = "rtg-math"; - asd = "rtg-math"; - }); - systems = [ "rtg-math" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "glsl-symbols" pkgs) ]; - }; - rtg-math_dot_vari = { - pname = "rtg-math.vari"; - version = "release-quicklisp-29fc5b3d-git"; - asds = [ "rtg-math.vari" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rtg-math/2019-10-07/rtg-math-release-quicklisp-29fc5b3d-git.tgz"; - sha256 = "0bhxxnv7ldkkb18zdxyz2rj2a3iawzq2kcp7cn5i91iby7n0082x"; - system = "rtg-math.vari"; - asd = "rtg-math.vari"; - }); - systems = [ "rtg-math.vari" ]; - lispLibs = [ (getAttr "glsl-symbols" pkgs) (getAttr "rtg-math" pkgs) (getAttr "varjo" pkgs) ]; - }; - rucksack = { - pname = "rucksack"; - version = "20150608-git"; - asds = [ "rucksack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rucksack/2015-06-08/rucksack-20150608-git.tgz"; - sha256 = "0d6lvhc18i0brh75vp3n974ssx52b42rvwd24llhnphlnhryxh86"; - system = "rucksack"; - asd = "rucksack"; - }); - systems = [ "rucksack" ]; - lispLibs = [ ]; - }; - rucksack-test = { - pname = "rucksack-test"; - version = "20150608-git"; - asds = [ "rucksack-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rucksack/2015-06-08/rucksack-20150608-git.tgz"; - sha256 = "0d6lvhc18i0brh75vp3n974ssx52b42rvwd24llhnphlnhryxh86"; - system = "rucksack-test"; - asd = "rucksack-test"; - }); - systems = [ "rucksack-test" ]; - lispLibs = [ (getAttr "rucksack" pkgs) ]; - }; - rutils = { - pname = "rutils"; - version = "20221106-git"; - asds = [ "rutils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz"; - sha256 = "108l64k7qhbhmgp0wa4krm23wakyfc41wzyl2fgc9k59gf47axhq"; - system = "rutils"; - asd = "rutils"; - }); - systems = [ "rutils" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - rutils-test = { - pname = "rutils-test"; - version = "20221106-git"; - asds = [ "rutils-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz"; - sha256 = "108l64k7qhbhmgp0wa4krm23wakyfc41wzyl2fgc9k59gf47axhq"; - system = "rutils-test"; - asd = "rutils-test"; - }); - systems = [ "rutils-test" ]; - lispLibs = [ (getAttr "rutils" pkgs) (getAttr "should-test" pkgs) ]; - }; - rutilsx = { - pname = "rutilsx"; - version = "20221106-git"; - asds = [ "rutilsx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/rutils/2022-11-06/rutils-20221106-git.tgz"; - sha256 = "108l64k7qhbhmgp0wa4krm23wakyfc41wzyl2fgc9k59gf47axhq"; - system = "rutilsx"; - asd = "rutilsx"; - }); - systems = [ "rutilsx" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "named-readtables" pkgs) (getAttr "rutils" pkgs) ]; - }; - ryeboy = { - pname = "ryeboy"; - version = "20201016-git"; - asds = [ "ryeboy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ryeboy/2020-10-16/ryeboy-20201016-git.tgz"; - sha256 = "0div6m6861damksxdxcycpdyyjn50bjsxfdkksm34w6162zdjcla"; - system = "ryeboy"; - asd = "ryeboy"; - }); - systems = [ "ryeboy" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "com_dot_google_dot_base" pkgs) (getAttr "protobuf" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "usocket" pkgs) ]; - }; - ryeboy_slash_test = { - pname = "ryeboy_test"; - version = "20201016-git"; - asds = [ "ryeboy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ryeboy/2020-10-16/ryeboy-20201016-git.tgz"; - sha256 = "0div6m6861damksxdxcycpdyyjn50bjsxfdkksm34w6162zdjcla"; - system = "ryeboy"; - asd = "ryeboy"; - }); - systems = [ "ryeboy/test" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "ryeboy" pkgs) ]; - meta = { - broken = true; - }; - }; - s-base64 = { - pname = "s-base64"; - version = "20130128-git"; - asds = [ "s-base64" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/s-base64/2013-01-28/s-base64-20130128-git.tgz"; - sha256 = "0zrr8zhnkdy97c5g54605nhjlf7fly79ylr1yf6wwyssia04cagg"; - system = "s-base64"; - asd = "s-base64"; - }); - systems = [ "s-base64" ]; - lispLibs = [ ]; - }; - s-dot2 = { - pname = "s-dot2"; - version = "20181018-git"; - asds = [ "s-dot2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/s-dot2/2018-10-18/s-dot2-20181018-git.tgz"; - sha256 = "0q8293fhdb1i2mgmck5611z92p71g9fcarrm87nsr6s21w29hzrz"; - system = "s-dot2"; - asd = "s-dot2"; - }); - systems = [ "s-dot2" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - s-graphviz = { - pname = "s-graphviz"; - version = "20201220-git"; - asds = [ "s-graphviz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/s-graphviz/2020-12-20/s-graphviz-20201220-git.tgz"; - sha256 = "1841xwci6y1gfhg15464wrlnw8xgsh1mwbg4yy2y7di02q4fbma2"; - system = "s-graphviz"; - asd = "s-graphviz"; - }); - systems = [ "s-graphviz" ]; - lispLibs = [ (getAttr "iterate" pkgs) (getAttr "literate-lisp" pkgs) ]; - }; - s-http-client = { - pname = "s-http-client"; - version = "20200427-git"; - asds = [ "s-http-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/s-http-client/2020-04-27/s-http-client-20200427-git.tgz"; - sha256 = "1fb2901h91rgfxz3cm1lb2dnd84m1fr745nd2kswd1mj2xz94zn8"; - system = "s-http-client"; - asd = "s-http-client"; - }); - systems = [ "s-http-client" ]; - lispLibs = [ (getAttr "chipz" pkgs) (getAttr "puri" pkgs) (getAttr "s-base64" pkgs) (getAttr "s-sysdeps" pkgs) (getAttr "s-utils" pkgs) ]; - }; - s-http-server = { - pname = "s-http-server"; - version = "20200427-git"; - asds = [ "s-http-server" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/s-http-server/2020-04-27/s-http-server-20200427-git.tgz"; - sha256 = "025mvnqhxx2c092aam3s4fk9v0p65hzdw39y4lamm0bdralda4bk"; - system = "s-http-server"; - asd = "s-http-server"; - }); - systems = [ "s-http-server" ]; - lispLibs = [ (getAttr "puri" pkgs) (getAttr "s-base64" pkgs) (getAttr "s-sysdeps" pkgs) (getAttr "s-utils" pkgs) (getAttr "salza2" pkgs) ]; - }; - s-sql = { - pname = "s-sql"; - version = "20221106-git"; - asds = [ "s-sql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2022-11-06/postmodern-20221106-git.tgz"; - sha256 = "012ipwi4m5x6jhl7pd9gwvdga5hgp1l08vqdgd28rzy34s2mfv74"; - system = "s-sql"; - asd = "s-sql"; - }); - systems = [ "s-sql" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-postgres" pkgs) ]; - }; - s-sql_slash_tests = { - pname = "s-sql_tests"; - version = "20221106-git"; - asds = [ "s-sql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2022-11-06/postmodern-20221106-git.tgz"; - sha256 = "012ipwi4m5x6jhl7pd9gwvdga5hgp1l08vqdgd28rzy34s2mfv74"; - system = "s-sql"; - asd = "s-sql"; - }); - systems = [ "s-sql/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "cl-postgres" pkgs) (getAttr "postmodern" pkgs) (getAttr "s-sql" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - s-sysdeps = { - pname = "s-sysdeps"; - version = "20210228-git"; - asds = [ "s-sysdeps" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/s-sysdeps/2021-02-28/s-sysdeps-20210228-git.tgz"; - sha256 = "0rp81iq0rgl48qdwbmfy89glga81hmry2lp8adjbr5h5ybr92b4n"; - system = "s-sysdeps"; - asd = "s-sysdeps"; - }); - systems = [ "s-sysdeps" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "usocket" pkgs) (getAttr "usocket-server" pkgs) ]; - }; - s-utils = { - pname = "s-utils"; - version = "20200427-git"; - asds = [ "s-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/s-utils/2020-04-27/s-utils-20200427-git.tgz"; - sha256 = "0xggbcvjmj4sdqcs6vaccryqp2piaqxkc0ygkczrd5m14bwrmlp6"; - system = "s-utils"; - asd = "s-utils"; - }); - systems = [ "s-utils" ]; - lispLibs = [ ]; - }; - s-xml = { - pname = "s-xml"; - version = "20150608-git"; - asds = [ "s-xml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz"; - sha256 = "1zsf5zrlf47g5cp70kb9b8d4v88315g633q5jcdx22csw7sd7if1"; - system = "s-xml"; - asd = "s-xml"; - }); - systems = [ "s-xml" ]; - lispLibs = [ ]; - }; - s-xml-rpc = { - pname = "s-xml-rpc"; - version = "20190521-git"; - asds = [ "s-xml-rpc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/s-xml-rpc/2019-05-21/s-xml-rpc-20190521-git.tgz"; - sha256 = "0z42awkz124xphkahw0mhg1pk029l2799rhyy51387ndd6gbqscx"; - system = "s-xml-rpc"; - asd = "s-xml-rpc"; - }); - systems = [ "s-xml-rpc" ]; - lispLibs = [ (getAttr "s-xml" pkgs) ]; - }; - s-xml_dot_examples = { - pname = "s-xml.examples"; - version = "20150608-git"; - asds = [ "s-xml.examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz"; - sha256 = "1zsf5zrlf47g5cp70kb9b8d4v88315g633q5jcdx22csw7sd7if1"; - system = "s-xml.examples"; - asd = "s-xml"; - }); - systems = [ "s-xml.examples" ]; - lispLibs = [ (getAttr "s-xml" pkgs) ]; - }; - s-xml_dot_test = { - pname = "s-xml.test"; - version = "20150608-git"; - asds = [ "s-xml.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz"; - sha256 = "1zsf5zrlf47g5cp70kb9b8d4v88315g633q5jcdx22csw7sd7if1"; - system = "s-xml.test"; - asd = "s-xml"; - }); - systems = [ "s-xml.test" ]; - lispLibs = [ (getAttr "s-xml" pkgs) ]; - }; - safe-queue = { - pname = "safe-queue"; - version = "20200325-git"; - asds = [ "safe-queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/safe-queue/2020-03-25/safe-queue-20200325-git.tgz"; - sha256 = "1agvp8y2k5c6w35kly6d9a7hi1y6csn4k0hqqdv7i87lgjdi7vrq"; - system = "safe-queue"; - asd = "safe-queue"; - }); - systems = [ "safe-queue" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) ]; - }; - safe-read = { - pname = "safe-read"; - version = "20220220-git"; - asds = [ "safe-read" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/safe-read/2022-02-20/safe-read-20220220-git.tgz"; - sha256 = "1r9k8danfnqgpbn2vb90n6wdc6jd92h1ig565yplrbh6232lhi26"; - system = "safe-read"; - asd = "safe-read"; - }); - systems = [ "safe-read" ]; - lispLibs = [ (getAttr "local-time" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - safe-read_slash_test = { - pname = "safe-read_test"; - version = "20220220-git"; - asds = [ "safe-read" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/safe-read/2022-02-20/safe-read-20220220-git.tgz"; - sha256 = "1r9k8danfnqgpbn2vb90n6wdc6jd92h1ig565yplrbh6232lhi26"; - system = "safe-read"; - asd = "safe-read"; - }); - systems = [ "safe-read/test" ]; - lispLibs = [ (getAttr "safe-read" pkgs) ]; - meta = { - broken = true; - }; - }; - safety-params = { - pname = "safety-params"; - version = "20190202-git"; - asds = [ "safety-params" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/safety-params/2019-02-02/safety-params-20190202-git.tgz"; - sha256 = "1y69b9aw3vsnsk0vdjyxw011j0lgc5gdwv6ay6vzfipa9gzi92ki"; - system = "safety-params"; - asd = "safety-params"; - }); - systems = [ "safety-params" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "parse-number" pkgs) ]; - }; - safety-params_slash_tests = { - pname = "safety-params_tests"; - version = "20190202-git"; - asds = [ "safety-params" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/safety-params/2019-02-02/safety-params-20190202-git.tgz"; - sha256 = "1y69b9aw3vsnsk0vdjyxw011j0lgc5gdwv6ay6vzfipa9gzi92ki"; - system = "safety-params"; - asd = "safety-params"; - }); - systems = [ "safety-params/tests" ]; - lispLibs = [ (getAttr "rove" pkgs) (getAttr "safety-params" pkgs) ]; - meta = { - broken = true; - }; - }; - salza2 = { - pname = "salza2"; - version = "2.1"; - asds = [ "salza2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/salza2/2021-10-20/salza2-2.1.tgz"; - sha256 = "1p48lxdibnps5rpyh5cmnk0vc77bmmxb32qdzfz93zadr8wwas10"; - system = "salza2"; - asd = "salza2"; - }); - systems = [ "salza2" ]; - lispLibs = [ (getAttr "trivial-gray-streams" pkgs) ]; - }; - salza2_slash_test = { - pname = "salza2_test"; - version = "2.1"; - asds = [ "salza2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/salza2/2021-10-20/salza2-2.1.tgz"; - sha256 = "1p48lxdibnps5rpyh5cmnk0vc77bmmxb32qdzfz93zadr8wwas10"; - system = "salza2"; - asd = "salza2"; - }); - systems = [ "salza2/test" ]; - lispLibs = [ (getAttr "chipz" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "parachute" pkgs) (getAttr "salza2" pkgs) ]; - meta = { - broken = true; - }; - }; - sandalphon_dot_lambda-list = { - pname = "sandalphon.lambda-list"; - version = "20180711-git"; - asds = [ "sandalphon.lambda-list" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sandalphon.lambda-list/2018-07-11/sandalphon.lambda-list-20180711-git.tgz"; - sha256 = "1iihs05cwy4xyms2vl3fjc9xpivyxb2mpmb60nylxrkvlm0l7v7h"; - system = "sandalphon.lambda-list"; - asd = "sandalphon.lambda-list"; - }); - systems = [ "sandalphon.lambda-list" ]; - lispLibs = [ ]; - }; - sane = { - pname = "sane"; - version = "20150608-git"; - asds = [ "sane" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sane/2015-06-08/cl-sane-20150608-git.tgz"; - sha256 = "1fyih96byyccw1rk7sm5qapqb3lwy7p65sxvxpfkc0cxziixf90w"; - system = "sane"; - asd = "sane"; - }); - systems = [ "sane" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "iterate" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - sanitize = { - pname = "sanitize"; - version = "20130720-git"; - asds = [ "sanitize" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sanitize/2013-07-20/cl-sanitize-20130720-git.tgz"; - sha256 = "101qqgi53scz3aaca57yg5wk9ana2axpwssmgrcb5c2ip5a2lwi3"; - system = "sanitize"; - asd = "sanitize"; - }); - systems = [ "sanitize" ]; - lispLibs = [ (getAttr "cl-libxml2" pkgs) ]; - }; - sanitize-test = { - pname = "sanitize-test"; - version = "20130720-git"; - asds = [ "sanitize-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sanitize/2013-07-20/cl-sanitize-20130720-git.tgz"; - sha256 = "101qqgi53scz3aaca57yg5wk9ana2axpwssmgrcb5c2ip5a2lwi3"; - system = "sanitize-test"; - asd = "sanitize"; - }); - systems = [ "sanitize-test" ]; - lispLibs = [ (getAttr "sanitize" pkgs) (getAttr "eos" pkgs) ]; - }; - sanity-clause = { - pname = "sanity-clause"; - version = "20210807-git"; - asds = [ "sanity-clause" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sanity-clause/2021-08-07/sanity-clause-20210807-git.tgz"; - sha256 = "0dzh00zpaqv48pn0xhbibiy33j8fwd2scsy5i466c9x9mcbhjz4f"; - system = "sanity-clause"; - asd = "sanity-clause"; - }); - systems = [ "sanity-clause" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "arrows" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "str" pkgs) (getAttr "closer-mop" pkgs) (getAttr "local-time" pkgs) (getAttr "parse-float" pkgs) (getAttr "quri" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - sanity-clause_slash_test = { - pname = "sanity-clause_test"; - version = "20210807-git"; - asds = [ "sanity-clause" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sanity-clause/2021-08-07/sanity-clause-20210807-git.tgz"; - sha256 = "0dzh00zpaqv48pn0xhbibiy33j8fwd2scsy5i466c9x9mcbhjz4f"; - system = "sanity-clause"; - asd = "sanity-clause"; - }); - systems = [ "sanity-clause/test" ]; - lispLibs = [ (getAttr "rove" pkgs) (getAttr "sanity-clause" pkgs) ]; - meta = { - broken = true; - }; - }; - sapaclisp = { - pname = "sapaclisp"; - version = "1.0a"; - asds = [ "sapaclisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sapaclisp/2012-05-20/sapaclisp-1.0a.tgz"; - sha256 = "1bgqvwvjq8g5wrmp5r1dn1v99hgin9gihwkihz455n9dn90l3pyq"; - system = "sapaclisp"; - asd = "sapaclisp"; - }); - systems = [ "sapaclisp" ]; - lispLibs = [ ]; - }; - sb-cga = { - pname = "sb-cga"; - version = "20210531-git"; - asds = [ "sb-cga" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sb-cga/2021-05-31/sb-cga-20210531-git.tgz"; - sha256 = "1y54qlwfrhch9aghk7nsbdx7x2qsvgsws1g2k631l9dsgdakw4w8"; - system = "sb-cga"; - asd = "sb-cga"; - }); - systems = [ "sb-cga" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - sb-fastcgi = { - pname = "sb-fastcgi"; - version = "20210124-git"; - asds = [ "sb-fastcgi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sb-fastcgi/2021-01-24/sb-fastcgi-20210124-git.tgz"; - sha256 = "15arl39xq0wp9marrgf36grv7z5w2z4zaigllypx96b3kbmw6qb5"; - system = "sb-fastcgi"; - asd = "sb-fastcgi"; - }); - systems = [ "sb-fastcgi" ]; - lispLibs = [ ]; - }; - sb-vector-io = { - pname = "sb-vector-io"; - version = "20110829-git"; - asds = [ "sb-vector-io" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sb-vector-io/2011-08-29/sb-vector-io-20110829-git.tgz"; - sha256 = "0pwc0nxhv8ba33i8z2f1y7r7ldik4a4xrqrb69dvvasz838k6r22"; - system = "sb-vector-io"; - asd = "sb-vector-io"; - }); - systems = [ "sb-vector-io" ]; - lispLibs = [ ]; - }; - sc-extensions = { - pname = "sc-extensions"; - version = "20220707-git"; - asds = [ "sc-extensions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sc-extensions/2022-07-07/sc-extensions-20220707-git.tgz"; - sha256 = "1rkya76fnf694fmyzgh40xpzshzadrr21w5xmrrfwzmv8psp24fa"; - system = "sc-extensions"; - asd = "sc-extensions"; - }); - systems = [ "sc-extensions" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-collider" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - sc-osc = { - pname = "sc-osc"; - version = "20221106-git"; - asds = [ "sc-osc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-collider/2022-11-06/cl-collider-20221106-git.tgz"; - sha256 = "03z11hcjvbawkli0bw90h4za7vvpm9pk7rh9gi6m2k7wwq2rsxk5"; - system = "sc-osc"; - asd = "sc-osc"; - }); - systems = [ "sc-osc" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "osc" pkgs) (getAttr "usocket" pkgs) ]; - }; - schannel = { - pname = "schannel"; - version = "20211230-git"; - asds = [ "schannel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/schannel/2021-12-30/schannel-20211230-git.tgz"; - sha256 = "1f7dncrjsswrr8wrm7qzxdvrmzg3n2ap607ad74mnfd806rwldnw"; - system = "schannel"; - asd = "schannel"; - }); - systems = [ "schannel" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - scheduler = { - pname = "scheduler"; - version = "20220707-git"; - asds = [ "scheduler" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/scheduler/2022-07-07/scheduler-20220707-git.tgz"; - sha256 = "1xsxzb294r0qxhj34m3a9ya9y054c4l01r0ccvsp134dp71yzkzd"; - system = "scheduler"; - asd = "scheduler"; - }); - systems = [ "scheduler" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "local-time" pkgs) (getAttr "optima" pkgs) (getAttr "optima_dot_ppcre" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - scheduler_slash_tests = { - pname = "scheduler_tests"; - version = "20220707-git"; - asds = [ "scheduler" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/scheduler/2022-07-07/scheduler-20220707-git.tgz"; - sha256 = "1xsxzb294r0qxhj34m3a9ya9y054c4l01r0ccvsp134dp71yzkzd"; - system = "scheduler"; - asd = "scheduler"; - }); - systems = [ "scheduler/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "local-time" pkgs) (getAttr "scheduler" pkgs) ]; - meta = { - broken = true; - }; - }; - science-data = { - pname = "science-data"; - version = "master-df14cb8c-git"; - asds = [ "science-data" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/antik/2019-10-08/antik-master-df14cb8c-git.tgz"; - sha256 = "1n08cx4n51z8v4bxyak166lp495xda3x7llfxcdpxndxqxcammr0"; - system = "science-data"; - asd = "science-data"; - }); - systems = [ "science-data" ]; - lispLibs = [ (getAttr "physical-dimension" pkgs) (getAttr "drakma" pkgs) ]; - }; - scigraph = { - pname = "scigraph"; - version = "20221106-git"; - asds = [ "scigraph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "scigraph"; - asd = "scigraph"; - }); - systems = [ "scigraph" ]; - lispLibs = [ (getAttr "mcclim" pkgs) ]; - }; - scigraph_slash_dwim = { - pname = "scigraph_dwim"; - version = "20221106-git"; - asds = [ "scigraph" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "scigraph"; - asd = "scigraph"; - }); - systems = [ "scigraph/dwim" ]; - lispLibs = [ (getAttr "mcclim" pkgs) ]; - meta = { - broken = true; - }; - }; - scratch-buffer = { - pname = "scratch-buffer"; - version = "20200427-git"; - asds = [ "scratch-buffer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "scratch-buffer"; - asd = "scratch-buffer"; - }); - systems = [ "scratch-buffer" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "utility" pkgs) ]; - }; - screamer = { - pname = "screamer"; - version = "20210807-git"; - asds = [ "screamer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/screamer/2021-08-07/screamer-20210807-git.tgz"; - sha256 = "0913wmy0fpf6shvbz40ay9gnjhgyjglf661d1p5ld2glkw1ky8hm"; - system = "screamer"; - asd = "screamer"; - }); - systems = [ "screamer" ]; - lispLibs = [ ]; - }; - screamer-tests = { - pname = "screamer-tests"; - version = "20210807-git"; - asds = [ "screamer-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/screamer/2021-08-07/screamer-20210807-git.tgz"; - sha256 = "0913wmy0fpf6shvbz40ay9gnjhgyjglf661d1p5ld2glkw1ky8hm"; - system = "screamer-tests"; - asd = "screamer-tests"; - }); - systems = [ "screamer-tests" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "iterate" pkgs) (getAttr "screamer" pkgs) ]; - }; - scriba = { - pname = "scriba"; - version = "20220707-git"; - asds = [ "scriba" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/scriba/2022-07-07/scriba-20220707-git.tgz"; - sha256 = "1n32bxf3b1cgb7y4015y3vahjgnbw59pi6d08by78pnpa2nx43sa"; - system = "scriba"; - asd = "scriba"; - }); - systems = [ "scriba" ]; - lispLibs = [ (getAttr "common-doc-plump" pkgs) (getAttr "esrap" pkgs) (getAttr "plump-sexp" pkgs) ]; - }; - scriba-test = { - pname = "scriba-test"; - version = "20220707-git"; - asds = [ "scriba-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/scriba/2022-07-07/scriba-20220707-git.tgz"; - sha256 = "1n32bxf3b1cgb7y4015y3vahjgnbw59pi6d08by78pnpa2nx43sa"; - system = "scriba-test"; - asd = "scriba-test"; - }); - systems = [ "scriba-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "scriba" pkgs) ]; - }; - scribble = { - pname = "scribble"; - version = "20160628-git"; - asds = [ "scribble" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/scribble/2016-06-28/scribble-20160628-git.tgz"; - sha256 = "056qi6vw9bk19s42mapyg55mimhhvhlwgny080v9mhv4fhnqi196"; - system = "scribble"; - asd = "scribble"; - }); - systems = [ "scribble" ]; - lispLibs = [ (getAttr "fare-memoization" pkgs) (getAttr "fare-quasiquote-readtable" pkgs) (getAttr "fare-utils" pkgs) (getAttr "meta" pkgs) ]; - }; - scribble_slash_test = { - pname = "scribble_test"; - version = "20160628-git"; - asds = [ "scribble" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/scribble/2016-06-28/scribble-20160628-git.tgz"; - sha256 = "056qi6vw9bk19s42mapyg55mimhhvhlwgny080v9mhv4fhnqi196"; - system = "scribble"; - asd = "scribble"; - }); - systems = [ "scribble/test" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "scribble" pkgs) ]; - meta = { - broken = true; - }; - }; - scriptl = { - pname = "scriptl"; - version = "20180228-git"; - asds = [ "scriptl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz"; - sha256 = "1q0d64syglfdjrzx2x7hlvznljpfwr9scn7rliigbm5z326lygg4"; - system = "scriptl"; - asd = "scriptl"; - }); - systems = [ "scriptl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "defpackage-plus" pkgs) (getAttr "iolib" pkgs) (getAttr "osicat" pkgs) (getAttr "trivial-backtrace" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - scriptl-examples = { - pname = "scriptl-examples"; - version = "20180228-git"; - asds = [ "scriptl-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz"; - sha256 = "1q0d64syglfdjrzx2x7hlvznljpfwr9scn7rliigbm5z326lygg4"; - system = "scriptl-examples"; - asd = "scriptl-examples"; - }); - systems = [ "scriptl-examples" ]; - lispLibs = [ (getAttr "scriptl" pkgs) (getAttr "unix-options" pkgs) ]; - }; - scriptl-util = { - pname = "scriptl-util"; - version = "20180228-git"; - asds = [ "scriptl-util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/scriptl/2018-02-28/scriptl-20180228-git.tgz"; - sha256 = "1q0d64syglfdjrzx2x7hlvznljpfwr9scn7rliigbm5z326lygg4"; - system = "scriptl-util"; - asd = "scriptl-util"; - }); - systems = [ "scriptl-util" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "scriptl" pkgs) ]; - }; - scrutiny = { - pname = "scrutiny"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "scrutiny" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "scrutiny"; - asd = "scrutiny"; - }); - systems = [ "scrutiny" ]; - lispLibs = [ (getAttr "adjuvant" pkgs) ]; - }; - scrutiny-test = { - pname = "scrutiny-test"; - version = "export-to-quicklisp-502a46e2-git"; - asds = [ "scrutiny-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/regular-type-expression/2020-02-18/regular-type-expression-export-to-quicklisp-502a46e2-git.tgz"; - sha256 = "1im07p7sbbhdjx9v8fx3v1xdqx1085lra6fsb4sh2bssw7m5xfxi"; - system = "scrutiny-test"; - asd = "scrutiny-test"; - }); - systems = [ "scrutiny-test" ]; - lispLibs = [ (getAttr "scrutiny" pkgs) ]; - }; - sdl2 = { - pname = "sdl2"; - version = "20220707-git"; - asds = [ "sdl2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2/2022-07-07/cl-sdl2-20220707-git.tgz"; - sha256 = "0kh4k9622aykgz2n3kmqcr9lhk2qh3sw7k70sqksfpz891w5y97j"; - system = "sdl2"; - asd = "sdl2"; - }); - systems = [ "sdl2" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-autowrap" pkgs) (getAttr "cl-plus-c" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "trivial-channels" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - sdl2-game-controller-db = { - pname = "sdl2-game-controller-db"; - version = "release-quicklisp-335d2b68-git"; - asds = [ "sdl2-game-controller-db" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sdl2-game-controller-db/2018-02-28/sdl2-game-controller-db-release-quicklisp-335d2b68-git.tgz"; - sha256 = "0yf4ygndmacs0pf3ws5197k51c4fdximvxcmvn56bqmsvil56kcd"; - system = "sdl2-game-controller-db"; - asd = "sdl2-game-controller-db"; - }); - systems = [ "sdl2-game-controller-db" ]; - lispLibs = [ (getAttr "sdl2" pkgs) ]; - }; - sdl2-image = { - pname = "sdl2-image"; - version = "20190202-git"; - asds = [ "sdl2-image" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2-image/2019-02-02/cl-sdl2-image-20190202-git.tgz"; - sha256 = "1nr7mdl125q32m15m8rdlza5kwi7m0birh1cq846pyy6zl1sjms7"; - system = "sdl2-image"; - asd = "sdl2-image"; - }); - systems = [ "sdl2-image" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-autowrap" pkgs) (getAttr "sdl2" pkgs) (getAttr "defpackage-plus" pkgs) ]; - }; - sdl2-mixer = { - pname = "sdl2-mixer"; - version = "20211020-git"; - asds = [ "sdl2-mixer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2-mixer/2021-10-20/cl-sdl2-mixer-20211020-git.tgz"; - sha256 = "0g6ywb3gqr0rif4z6kkz6m8vyv8nrr5wr1w9sc6d3zypbbnqgbp6"; - system = "sdl2-mixer"; - asd = "sdl2-mixer"; - }); - systems = [ "sdl2-mixer" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-autowrap" pkgs) (getAttr "sdl2" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - sdl2-ttf = { - pname = "sdl2-ttf"; - version = "20200925-git"; - asds = [ "sdl2-ttf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2-ttf/2020-09-25/cl-sdl2-ttf-20200925-git.tgz"; - sha256 = "15mvb7hr5l284s56gbf1xyb9v5xv95b2043zaysswhn5x20ylcnb"; - system = "sdl2-ttf"; - asd = "sdl2-ttf"; - }); - systems = [ "sdl2-ttf" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "cl-autowrap" pkgs) (getAttr "sdl2" pkgs) (getAttr "defpackage-plus" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - sdl2-ttf-examples = { - pname = "sdl2-ttf-examples"; - version = "20200925-git"; - asds = [ "sdl2-ttf-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2-ttf/2020-09-25/cl-sdl2-ttf-20200925-git.tgz"; - sha256 = "15mvb7hr5l284s56gbf1xyb9v5xv95b2043zaysswhn5x20ylcnb"; - system = "sdl2-ttf-examples"; - asd = "sdl2-ttf-examples"; - }); - systems = [ "sdl2-ttf-examples" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "sdl2" pkgs) (getAttr "sdl2-ttf" pkgs) (getAttr "mathkit" pkgs) ]; - }; - sdl2_slash_examples = { - pname = "sdl2_examples"; - version = "20220707-git"; - asds = [ "sdl2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sdl2/2022-07-07/cl-sdl2-20220707-git.tgz"; - sha256 = "0kh4k9622aykgz2n3kmqcr9lhk2qh3sw7k70sqksfpz891w5y97j"; - system = "sdl2"; - asd = "sdl2"; - }); - systems = [ "sdl2/examples" ]; - lispLibs = [ (getAttr "cl-opengl" pkgs) (getAttr "sdl2" pkgs) ]; - meta = { - broken = true; - }; - }; - sdl2kit = { - pname = "sdl2kit"; - version = "20171130-git"; - asds = [ "sdl2kit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sdl2kit/2017-11-30/sdl2kit-20171130-git.tgz"; - sha256 = "10ymmxqsvdn7ndda9k2qcixj75l7namgqdxc5y2w3v5r1313fy2d"; - system = "sdl2kit"; - asd = "sdl2kit"; - }); - systems = [ "sdl2kit" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "sdl2" pkgs) (getAttr "defpackage-plus" pkgs) ]; - }; - sdl2kit-examples = { - pname = "sdl2kit-examples"; - version = "20171130-git"; - asds = [ "sdl2kit-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sdl2kit/2017-11-30/sdl2kit-20171130-git.tgz"; - sha256 = "10ymmxqsvdn7ndda9k2qcixj75l7namgqdxc5y2w3v5r1313fy2d"; - system = "sdl2kit-examples"; - asd = "sdl2kit-examples"; - }); - systems = [ "sdl2kit-examples" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "defpackage-plus" pkgs) (getAttr "glkit" pkgs) (getAttr "mathkit" pkgs) (getAttr "sdl2kit" pkgs) ]; - }; - sealable-metaobjects = { - pname = "sealable-metaobjects"; - version = "20200610-git"; - asds = [ "sealable-metaobjects" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sealable-metaobjects/2020-06-10/sealable-metaobjects-20200610-git.tgz"; - sha256 = "0hz1ivlpfhnk1w2cw4q2i000j2dc7maay06ndzziyywg7li6zf2p"; - system = "sealable-metaobjects"; - asd = "sealable-metaobjects"; - }); - systems = [ "sealable-metaobjects" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - secp256k1 = { - pname = "secp256k1"; - version = "20220707-git"; - asds = [ "secp256k1" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-secp256k1/2022-07-07/cl-secp256k1-20220707-git.tgz"; - sha256 = "0lg84jkwwp95nnk865yfhg16z0d04wk3dzf5yilkfm2yxnmjnv85"; - system = "secp256k1"; - asd = "secp256k1"; - }); - systems = [ "secp256k1" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - secp256k1_slash_test = { - pname = "secp256k1_test"; - version = "20220707-git"; - asds = [ "secp256k1" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-secp256k1/2022-07-07/cl-secp256k1-20220707-git.tgz"; - sha256 = "0lg84jkwwp95nnk865yfhg16z0d04wk3dzf5yilkfm2yxnmjnv85"; - system = "secp256k1"; - asd = "secp256k1"; - }); - systems = [ "secp256k1/test" ]; - lispLibs = [ (getAttr "secp256k1" pkgs) (getAttr "ironclad" pkgs) (getAttr "parachute" pkgs) (getAttr "trivial-benchmark" pkgs) ]; - meta = { - broken = true; - }; - }; - secret-values = { - pname = "secret-values"; - version = "20201220-git"; - asds = [ "secret-values" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/secret-values/2020-12-20/secret-values-20201220-git.tgz"; - sha256 = "07ph49s27gvjzx60yy094bb9ddwiys34r8cx5l837i34nm2fn3nh"; - system = "secret-values"; - asd = "secret-values"; - }); - systems = [ "secret-values" ]; - lispLibs = [ ]; - }; - secure-random = { - pname = "secure-random"; - version = "20160208-git"; - asds = [ "secure-random" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/secure-random/2016-02-08/secure-random-20160208-git.tgz"; - sha256 = "09cnclnivkc87ja3z12ihcm02vkwp0cflcfa6hpjlbd5m75hvgsd"; - system = "secure-random"; - asd = "secure-random"; - }); - systems = [ "secure-random" ]; - lispLibs = [ (getAttr "cl_plus_ssl" pkgs) ]; - }; - seedable-rng = { - pname = "seedable-rng"; - version = "20220707-git"; - asds = [ "seedable-rng" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/seedable-rng/2022-07-07/seedable-rng-20220707-git.tgz"; - sha256 = "1pr2flvrj32m055apwn5f2cddki2ws5xldmj2v367iyry3lz2vm1"; - system = "seedable-rng"; - asd = "seedable-rng"; - }); - systems = [ "seedable-rng" ]; - lispLibs = [ (getAttr "cl-pcg" pkgs) (getAttr "ironclad" pkgs) (getAttr "mfiano-utils" pkgs) ]; - }; - select = { - pname = "select"; - version = "20221106-git"; - asds = [ "select" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/select/2022-11-06/select-20221106-git.tgz"; - sha256 = "0bhpvfqp7n33pia4y62qi31bx86gjl2nxjy529rfawac57c9rxv3"; - system = "select"; - asd = "select"; - }); - systems = [ "select" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "let-plus" pkgs) ]; - }; - select-file = { - pname = "select-file"; - version = "20200427-git"; - asds = [ "select-file" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/select-file/2020-04-27/select-file-20200427-git.tgz"; - sha256 = "1v89k5vvn1a3gdhlwbb4wxggzzr1ic7iqzvrrxgsh90fr129rmzq"; - system = "select-file"; - asd = "select-file"; - }); - systems = [ "select-file" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "mcclim" pkgs) ]; - }; - select_slash_tests = { - pname = "select_tests"; - version = "20221106-git"; - asds = [ "select" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/select/2022-11-06/select-20221106-git.tgz"; - sha256 = "0bhpvfqp7n33pia4y62qi31bx86gjl2nxjy529rfawac57c9rxv3"; - system = "select"; - asd = "select"; - }); - systems = [ "select/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "select" pkgs) ]; - meta = { - broken = true; - }; - }; - selenium = { - pname = "selenium"; - version = "20160531-git"; - asds = [ "selenium" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-selenium/2016-05-31/cl-selenium-20160531-git.tgz"; - sha256 = "1wx3343gkmyb25vbbpv6g5d1m2c5qxrkq7hsz1v2fcchgdgvwgxl"; - system = "selenium"; - asd = "selenium"; - }); - systems = [ "selenium" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "cxml" pkgs) (getAttr "drakma" pkgs) (getAttr "puri" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - semantic-spinneret = { - pname = "semantic-spinneret"; - version = "20170830-git"; - asds = [ "semantic-spinneret" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/semantic-spinneret/2017-08-30/semantic-spinneret-20170830-git.tgz"; - sha256 = "0ghd4lwwcbcidj70j26hj9vic1nqrj78ksrqlxj29q61bnji05ix"; - system = "semantic-spinneret"; - asd = "semantic-spinneret"; - }); - systems = [ "semantic-spinneret" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "spinneret" pkgs) ]; - }; - sendgrid = { - pname = "sendgrid"; - version = "20221106-git"; - asds = [ "sendgrid" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sendgrid/2022-11-06/cl-sendgrid-20221106-git.tgz"; - sha256 = "0safsw9if83mv76y8fiaaa3a6akn7icqc6fmmacfypy3vkykr8i9"; - system = "sendgrid"; - asd = "sendgrid"; - }); - systems = [ "sendgrid" ]; - lispLibs = [ (getAttr "dexador" pkgs) (getAttr "jonathan" pkgs) ]; - }; - sento = { - pname = "sento"; - version = "20221106-git"; - asds = [ "sento" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gserver/2022-11-06/cl-gserver-20221106-git.tgz"; - sha256 = "1a6bx0bmkli6nddd1pxqzjqjvkz2nkf7v3pn4d9bjv42xkch5hqc"; - system = "sento"; - asd = "sento"; - }); - systems = [ "sento" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "atomics" pkgs) (getAttr "binding-arrows" pkgs) (getAttr "blackbird" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-speedy-queue" pkgs) (getAttr "str" pkgs) (getAttr "log4cl" pkgs) (getAttr "lparallel" pkgs) (getAttr "timer-wheel" pkgs) ]; - }; - sento_slash_docs = { - pname = "sento_docs"; - version = "20221106-git"; - asds = [ "sento" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gserver/2022-11-06/cl-gserver-20221106-git.tgz"; - sha256 = "1a6bx0bmkli6nddd1pxqzjqjvkz2nkf7v3pn4d9bjv42xkch5hqc"; - system = "sento"; - asd = "sento"; - }); - systems = [ "sento/docs" ]; - lispLibs = [ (getAttr "sento" pkgs) (getAttr "mgl-pax" pkgs) ]; - meta = { - broken = true; - }; - }; - sento_slash_tests = { - pname = "sento_tests"; - version = "20221106-git"; - asds = [ "sento" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-gserver/2022-11-06/cl-gserver-20221106-git.tgz"; - sha256 = "1a6bx0bmkli6nddd1pxqzjqjvkz2nkf7v3pn4d9bjv42xkch5hqc"; - system = "sento"; - asd = "sento"; - }); - systems = [ "sento/tests" ]; - lispLibs = [ (getAttr "sento" pkgs) (getAttr "cl-mock" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - sentry-client = { - pname = "sentry-client"; - version = "20221106-git"; - asds = [ "sentry-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sentry-client/2022-11-06/cl-sentry-client-20221106-git.tgz"; - sha256 = "10zynv31xhyknl991w85r0g1vyyghxg6bg7rd9bhny84p006fb38"; - system = "sentry-client"; - asd = "sentry-client"; - }); - systems = [ "sentry-client" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "local-time" pkgs) (getAttr "trivial-backtrace" pkgs) (getAttr "uuid" pkgs) ]; - }; - sentry-client_dot_async = { - pname = "sentry-client.async"; - version = "20221106-git"; - asds = [ "sentry-client.async" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sentry-client/2022-11-06/cl-sentry-client-20221106-git.tgz"; - sha256 = "10zynv31xhyknl991w85r0g1vyyghxg6bg7rd9bhny84p006fb38"; - system = "sentry-client.async"; - asd = "sentry-client.async"; - }); - systems = [ "sentry-client.async" ]; - lispLibs = [ (getAttr "sentry-client" pkgs) (getAttr "simple-tasks" pkgs) ]; - }; - sentry-client_dot_hunchentoot = { - pname = "sentry-client.hunchentoot"; - version = "20221106-git"; - asds = [ "sentry-client.hunchentoot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sentry-client/2022-11-06/cl-sentry-client-20221106-git.tgz"; - sha256 = "10zynv31xhyknl991w85r0g1vyyghxg6bg7rd9bhny84p006fb38"; - system = "sentry-client.hunchentoot"; - asd = "sentry-client.hunchentoot"; - }); - systems = [ "sentry-client.hunchentoot" ]; - lispLibs = [ (getAttr "sentry-client" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - sequence-iterators = { - pname = "sequence-iterators"; - version = "20130813-darcs"; - asds = [ "sequence-iterators" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz"; - sha256 = "12flvy6hysqw0fa2jfkxrgphlk6b25hg2w2dxm1ylax0gw9fh1l5"; - system = "sequence-iterators"; - asd = "sequence-iterators"; - }); - systems = [ "sequence-iterators" ]; - lispLibs = [ (getAttr "parse-declarations-1_dot_0" pkgs) ]; - }; - sequence-iterators-test = { - pname = "sequence-iterators-test"; - version = "20130813-darcs"; - asds = [ "sequence-iterators-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sequence-iterators/2013-08-13/sequence-iterators-20130813-darcs.tgz"; - sha256 = "12flvy6hysqw0fa2jfkxrgphlk6b25hg2w2dxm1ylax0gw9fh1l5"; - system = "sequence-iterators-test"; - asd = "sequence-iterators"; - }); - systems = [ "sequence-iterators-test" ]; - lispLibs = [ (getAttr "sequence-iterators" pkgs) ]; - }; - serapeum = { - pname = "serapeum"; - version = "20221106-git"; - asds = [ "serapeum" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/serapeum/2022-11-06/serapeum-20221106-git.tgz"; - sha256 = "0gz70hwlsyawmm7j85yjg449hpy57w5jdd7rkal6lhmmfnl0nsbp"; - system = "serapeum"; - asd = "serapeum"; - }); - systems = [ "serapeum" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "global-vars" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "parse-declarations-1_dot_0" pkgs) (getAttr "parse-number" pkgs) (getAttr "split-sequence" pkgs) (getAttr "string-case" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-cltl2" pkgs) (getAttr "trivial-file-size" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-macroexpand-all" pkgs) ]; - }; - serapeum_slash_docs = { - pname = "serapeum_docs"; - version = "20221106-git"; - asds = [ "serapeum" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/serapeum/2022-11-06/serapeum-20221106-git.tgz"; - sha256 = "0gz70hwlsyawmm7j85yjg449hpy57w5jdd7rkal6lhmmfnl0nsbp"; - system = "serapeum"; - asd = "serapeum"; - }); - systems = [ "serapeum/docs" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "serapeum" pkgs) (getAttr "swank" pkgs) ]; - meta = { - broken = true; - }; - }; - serializable-object = { - pname = "serializable-object"; - version = "20191227-git"; - asds = [ "serializable-object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/serializable-object/2019-12-27/serializable-object-20191227-git.tgz"; - sha256 = "0978ljw998ypryiiqmb1s11ymwg4h5qz9bv7ig1i29wf5s14s2i0"; - system = "serializable-object"; - asd = "serializable-object"; - }); - systems = [ "serializable-object" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - serializable-object_dot_test = { - pname = "serializable-object.test"; - version = "20191227-git"; - asds = [ "serializable-object.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/serializable-object/2019-12-27/serializable-object-20191227-git.tgz"; - sha256 = "0978ljw998ypryiiqmb1s11ymwg4h5qz9bv7ig1i29wf5s14s2i0"; - system = "serializable-object.test"; - asd = "serializable-object.test"; - }); - systems = [ "serializable-object.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "serializable-object" pkgs) ]; - }; - series = { - pname = "series"; - version = "20131111-git"; - asds = [ "series" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/series/2013-11-11/series-20131111-git.tgz"; - sha256 = "07hk2lhfx42zk018pxqvn4gs77vd4n4g8m4xxbqaxgca76mifwfw"; - system = "series"; - asd = "series"; - }); - systems = [ "series" ]; - lispLibs = [ ]; - }; - series-tests = { - pname = "series-tests"; - version = "20131111-git"; - asds = [ "series-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/series/2013-11-11/series-20131111-git.tgz"; - sha256 = "07hk2lhfx42zk018pxqvn4gs77vd4n4g8m4xxbqaxgca76mifwfw"; - system = "series-tests"; - asd = "series"; - }); - systems = [ "series-tests" ]; - lispLibs = [ (getAttr "series" pkgs) ]; - }; - session-token = { - pname = "session-token"; - version = "20141106-git"; - asds = [ "session-token" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/session-token/2014-11-06/session-token-20141106-git.tgz"; - sha256 = "1yb6m8nbh4gaskplrd2bwsnpkq6dl9dkvbjmvhzls6vh4lp6cc2z"; - system = "session-token"; - asd = "session-token"; - }); - systems = [ "session-token" ]; - lispLibs = [ (getAttr "cl-isaac" pkgs) ]; - }; - setup-cffi = { - pname = "setup-cffi"; - version = "master-1a957fb2-git"; - asds = [ "setup-cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "setup-cffi"; - asd = "setup-cffi"; - }); - systems = [ "setup-cffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - sexml = { - pname = "sexml"; - version = "20140713-git"; - asds = [ "sexml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sexml/2014-07-13/sexml-20140713-git.tgz"; - sha256 = "1s7isk9v7qh03sf60zw32kaa1rgvdh24bsc37q173r282m8plbk3"; - system = "sexml"; - asd = "sexml"; - }); - systems = [ "sexml" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "contextl" pkgs) (getAttr "cxml" pkgs) (getAttr "macroexpand-dammit" pkgs) ]; - }; - sexml-objects = { - pname = "sexml-objects"; - version = "20140713-git"; - asds = [ "sexml-objects" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sexml/2014-07-13/sexml-20140713-git.tgz"; - sha256 = "1s7isk9v7qh03sf60zw32kaa1rgvdh24bsc37q173r282m8plbk3"; - system = "sexml-objects"; - asd = "sexml-objects"; - }); - systems = [ "sexml-objects" ]; - lispLibs = [ (getAttr "sexml" pkgs) ]; - }; - sha1 = { - pname = "sha1"; - version = "20211020-git"; - asds = [ "sha1" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sha1/2021-10-20/sha1-20211020-git.tgz"; - sha256 = "1cfn0j5yfwqkwr2dm73wr9hz8dmws3ngxlbk9886ahxkg544qx4z"; - system = "sha1"; - asd = "sha1"; - }); - systems = [ "sha1" ]; - lispLibs = [ ]; - }; - sha3 = { - pname = "sha3"; - version = "20180228-git"; - asds = [ "sha3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sha3/2018-02-28/sha3-20180228-git.tgz"; - sha256 = "112pwx8jzraxn0xqssmjlgd7j4sbl19vz6l8ansdq1zd69dryzy6"; - system = "sha3"; - asd = "sha3"; - }); - systems = [ "sha3" ]; - lispLibs = [ ]; - }; - shadchen = { - pname = "shadchen"; - version = "20131003-git"; - asds = [ "shadchen" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shadchen/2013-10-03/shadchen-20131003-git.tgz"; - sha256 = "0731hrpzf9pn1hyvs9wl0w3mnv13mr9ky3jx3dc4baj4nmjyb1k6"; - system = "shadchen"; - asd = "shadchen"; - }); - systems = [ "shadchen" ]; - lispLibs = [ ]; - }; - shadow = { - pname = "shadow"; - version = "20220707-git"; - asds = [ "shadow" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shadow/2022-07-07/shadow-20220707-git.tgz"; - sha256 = "1lw98ir9381kmmranaa111f8jh47adsx0v4hzlw3qkf2xjcfah3l"; - system = "shadow"; - asd = "shadow"; - }); - systems = [ "shadow" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "glsl-packing" pkgs) (getAttr "mfiano-utils" pkgs) (getAttr "static-vectors" pkgs) (getAttr "varjo" pkgs) ]; - }; - shared-preferences = { - pname = "shared-preferences"; - version = "1.1.1"; - asds = [ "shared-preferences" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shared-preferences/2021-02-28/shared-preferences_1.1.1.tgz"; - sha256 = "12m4kaba2lxndkjw30a6y2rq16fflh5016lp74l7pf3v0y3j1ydf"; - system = "shared-preferences"; - asd = "shared-preferences"; - }); - systems = [ "shared-preferences" ]; - lispLibs = [ (getAttr "inheriting-readers" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - shared-preferences_tests = { - pname = "shared-preferences_tests"; - version = "1.1.1"; - asds = [ "shared-preferences_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shared-preferences/2021-02-28/shared-preferences_1.1.1.tgz"; - sha256 = "12m4kaba2lxndkjw30a6y2rq16fflh5016lp74l7pf3v0y3j1ydf"; - system = "shared-preferences_tests"; - asd = "shared-preferences_tests"; - }); - systems = [ "shared-preferences_tests" ]; - lispLibs = [ (getAttr "parachute" pkgs) (getAttr "shared-preferences" pkgs) ]; - }; - shasht = { - pname = "shasht"; - version = "20221106-git"; - asds = [ "shasht" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shasht/2022-11-06/shasht-20221106-git.tgz"; - sha256 = "1xpspksfkhk95wjirrqfrqm7sc1wyr2pjw7z25i0qz02rg479hlg"; - system = "shasht"; - asd = "shasht"; - }); - systems = [ "shasht" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "trivial-do" pkgs) ]; - }; - shasht_slash_test = { - pname = "shasht_test"; - version = "20221106-git"; - asds = [ "shasht" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shasht/2022-11-06/shasht-20221106-git.tgz"; - sha256 = "1xpspksfkhk95wjirrqfrqm7sc1wyr2pjw7z25i0qz02rg479hlg"; - system = "shasht"; - asd = "shasht"; - }); - systems = [ "shasht/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "parachute" pkgs) (getAttr "shasht" pkgs) ]; - meta = { - broken = true; - }; - }; - sheeple = { - pname = "sheeple"; - version = "20210124-git"; - asds = [ "sheeple" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sheeple/2021-01-24/sheeple-20210124-git.tgz"; - sha256 = "13k6xm8a29xxkrwgc5j3bk2wr9skg4bzdnc4krrzgcdmx4gbcca3"; - system = "sheeple"; - asd = "sheeple"; - }); - systems = [ "sheeple" ]; - lispLibs = [ ]; - }; - sheeple-tests = { - pname = "sheeple-tests"; - version = "20210124-git"; - asds = [ "sheeple-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sheeple/2021-01-24/sheeple-20210124-git.tgz"; - sha256 = "13k6xm8a29xxkrwgc5j3bk2wr9skg4bzdnc4krrzgcdmx4gbcca3"; - system = "sheeple-tests"; - asd = "sheeple"; - }); - systems = [ "sheeple-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "sheeple" pkgs) ]; - }; - shellpool = { - pname = "shellpool"; - version = "20200925-git"; - asds = [ "shellpool" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shellpool/2020-09-25/shellpool-20200925-git.tgz"; - sha256 = "1bpv58i2l2a3ayk3jvi2wwd90gjczp0qk24bj82775qp8miw9vz0"; - system = "shellpool"; - asd = "shellpool"; - }); - systems = [ "shellpool" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "bt-semaphore" pkgs) (getAttr "cl-fad" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - shelly = { - pname = "shelly"; - version = "20141106-git"; - asds = [ "shelly" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shelly/2014-11-06/shelly-20141106-git.tgz"; - sha256 = "07whfcd2ygq07lw73bqby74cqbp2bx0rnyx7c0v7s16y9xfqxw7b"; - system = "shelly"; - asd = "shelly"; - }); - systems = [ "shelly" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-fad" pkgs) (getAttr "local-time" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-signal" pkgs) (getAttr "uiop" pkgs) ]; - }; - shelly-test = { - pname = "shelly-test"; - version = "20141106-git"; - asds = [ "shelly-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shelly/2014-11-06/shelly-20141106-git.tgz"; - sha256 = "07whfcd2ygq07lw73bqby74cqbp2bx0rnyx7c0v7s16y9xfqxw7b"; - system = "shelly-test"; - asd = "shelly-test"; - }); - systems = [ "shelly-test" ]; - lispLibs = [ (getAttr "cl-test-more" pkgs) (getAttr "shelly" pkgs) ]; - }; - shlex = { - pname = "shlex"; - version = "20210411-git"; - asds = [ "shlex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-shlex/2021-04-11/cl-shlex-20210411-git.tgz"; - sha256 = "16ag48sswgimr1fzr582vhym4s03idpd4lkydw5s58lv80ibpim8"; - system = "shlex"; - asd = "shlex"; - }); - systems = [ "shlex" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-unicode" pkgs) (getAttr "serapeum" pkgs) ]; - }; - shlex_slash_test = { - pname = "shlex_test"; - version = "20210411-git"; - asds = [ "shlex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-shlex/2021-04-11/cl-shlex-20210411-git.tgz"; - sha256 = "16ag48sswgimr1fzr582vhym4s03idpd4lkydw5s58lv80ibpim8"; - system = "shlex"; - asd = "shlex"; - }); - systems = [ "shlex/test" ]; - lispLibs = [ (getAttr "shlex" pkgs) (getAttr "fiveam" pkgs) ]; - meta = { - broken = true; - }; - }; - shop3 = { - pname = "shop3"; - version = "20221106-git"; - asds = [ "shop3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2022-11-06/shop3-20221106-git.tgz"; - sha256 = "18fqx41qyd74q0y1niav05wsrjd6wcn6sa6imx0ykyw6libq33z3"; - system = "shop3"; - asd = "shop3"; - }); - systems = [ "shop3" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiveam-asdf" pkgs) (getAttr "iterate" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - shop3-thmpr-api = { - pname = "shop3-thmpr-api"; - version = "20221106-git"; - asds = [ "shop3-thmpr-api" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2022-11-06/shop3-20221106-git.tgz"; - sha256 = "18fqx41qyd74q0y1niav05wsrjd6wcn6sa6imx0ykyw6libq33z3"; - system = "shop3-thmpr-api"; - asd = "shop3-thmpr-api"; - }); - systems = [ "shop3-thmpr-api" ]; - lispLibs = [ (getAttr "shop3" pkgs) ]; - }; - shop3_slash_common = { - pname = "shop3_common"; - version = "20221106-git"; - asds = [ "shop3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2022-11-06/shop3-20221106-git.tgz"; - sha256 = "18fqx41qyd74q0y1niav05wsrjd6wcn6sa6imx0ykyw6libq33z3"; - system = "shop3"; - asd = "shop3"; - }); - systems = [ "shop3/common" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) ]; - meta = { - broken = true; - }; - }; - shop3_slash_openstacks = { - pname = "shop3_openstacks"; - version = "20221106-git"; - asds = [ "shop3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2022-11-06/shop3-20221106-git.tgz"; - sha256 = "18fqx41qyd74q0y1niav05wsrjd6wcn6sa6imx0ykyw6libq33z3"; - system = "shop3"; - asd = "shop3"; - }); - systems = [ "shop3/openstacks" ]; - lispLibs = [ (getAttr "shop3" pkgs) ]; - meta = { - broken = true; - }; - }; - shop3_slash_plan-grapher = { - pname = "shop3_plan-grapher"; - version = "20221106-git"; - asds = [ "shop3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2022-11-06/shop3-20221106-git.tgz"; - sha256 = "18fqx41qyd74q0y1niav05wsrjd6wcn6sa6imx0ykyw6libq33z3"; - system = "shop3"; - asd = "shop3"; - }); - systems = [ "shop3/plan-grapher" ]; - lispLibs = [ (getAttr "cl-dot" pkgs) (getAttr "shop3" pkgs) ]; - meta = { - broken = true; - }; - }; - shop3_slash_rovers = { - pname = "shop3_rovers"; - version = "20221106-git"; - asds = [ "shop3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2022-11-06/shop3-20221106-git.tgz"; - sha256 = "18fqx41qyd74q0y1niav05wsrjd6wcn6sa6imx0ykyw6libq33z3"; - system = "shop3"; - asd = "shop3"; - }); - systems = [ "shop3/rovers" ]; - lispLibs = [ (getAttr "shop3" pkgs) ]; - meta = { - broken = true; - }; - }; - shop3_slash_test-unifier = { - pname = "shop3_test-unifier"; - version = "20221106-git"; - asds = [ "shop3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2022-11-06/shop3-20221106-git.tgz"; - sha256 = "18fqx41qyd74q0y1niav05wsrjd6wcn6sa6imx0ykyw6libq33z3"; - system = "shop3"; - asd = "shop3"; - }); - systems = [ "shop3/test-unifier" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiveam-asdf" pkgs) ]; - meta = { - broken = true; - }; - }; - shop3_slash_theorem-prover = { - pname = "shop3_theorem-prover"; - version = "20221106-git"; - asds = [ "shop3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2022-11-06/shop3-20221106-git.tgz"; - sha256 = "18fqx41qyd74q0y1niav05wsrjd6wcn6sa6imx0ykyw6libq33z3"; - system = "shop3"; - asd = "shop3"; - }); - systems = [ "shop3/theorem-prover" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) ]; - meta = { - broken = true; - }; - }; - shop3_slash_unifier = { - pname = "shop3_unifier"; - version = "20221106-git"; - asds = [ "shop3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shop3/2022-11-06/shop3-20221106-git.tgz"; - sha256 = "18fqx41qyd74q0y1niav05wsrjd6wcn6sa6imx0ykyw6libq33z3"; - system = "shop3"; - asd = "shop3"; - }); - systems = [ "shop3/unifier" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - should-test = { - pname = "should-test"; - version = "20191007-git"; - asds = [ "should-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/should-test/2019-10-07/should-test-20191007-git.tgz"; - sha256 = "1fqqa7lhf28qg60ji9libkylkcy747x576qpjn1y7c945j2fxmnm"; - system = "should-test"; - asd = "should-test"; - }); - systems = [ "should-test" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "local-time" pkgs) (getAttr "osicat" pkgs) (getAttr "rutils" pkgs) ]; - }; - shuffletron = { - pname = "shuffletron"; - version = "20181018-git"; - asds = [ "shuffletron" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/shuffletron/2018-10-18/shuffletron-20181018-git.tgz"; - sha256 = "10626wp2xdk0wxj0kl49m9gyb2bp6f0vp67563mw6zrzfs7ynpkb"; - system = "shuffletron"; - asd = "shuffletron"; - }); - systems = [ "shuffletron" ]; - lispLibs = [ (getAttr "mixalot" pkgs) (getAttr "mixalot-flac" pkgs) (getAttr "mixalot-mp3" pkgs) (getAttr "mixalot-vorbis" pkgs) (getAttr "osicat" pkgs) ]; - }; - silo = { - pname = "silo"; - version = "20211020-git"; - asds = [ "silo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/colliflower/2021-10-20/colliflower-20211020-git.tgz"; - sha256 = "1fzn9s7wm7wmffrdm21lpvry9jb320456cmmprn976a533lp704r"; - system = "silo"; - asd = "silo"; - }); - systems = [ "silo" ]; - lispLibs = [ ]; - }; - simple = { - pname = "simple"; - version = "clon-1.0b25"; - asds = [ "simple" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-clon/2021-04-11/clon-1.0b25.tgz"; - sha256 = "0nj47xl2fwj7z31wiaad8dw97fpq3zpwxlgmpvppawz0z3hgf8d0"; - system = "simple"; - asd = "simple"; - }); - systems = [ "simple" ]; - lispLibs = [ (getAttr "net_dot_didierverna_dot_clon" pkgs) ]; - }; - simple-actors = { - pname = "simple-actors"; - version = "20200925-git"; - asds = [ "simple-actors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-actors/2020-09-25/simple-actors-20200925-git.tgz"; - sha256 = "1q843l1bh0xipp535gwm7713gpp04cycvq0i8yz54b6ym3dzkql4"; - system = "simple-actors"; - asd = "simple-actors"; - }); - systems = [ "simple-actors" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - simple-config = { - pname = "simple-config"; - version = "20220707-git"; - asds = [ "simple-config" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-config/2022-07-07/simple-config-20220707-git.tgz"; - sha256 = "006a0nn2p6ilvzbk2qj081nb832aa39sna1lzh5r5lscmlasdh50"; - system = "simple-config"; - asd = "simple-config"; - }); - systems = [ "simple-config" ]; - lispLibs = [ (getAttr "str" pkgs) (getAttr "uiop" pkgs) ]; - }; - simple-config-test = { - pname = "simple-config-test"; - version = "20220707-git"; - asds = [ "simple-config-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-config/2022-07-07/simple-config-20220707-git.tgz"; - sha256 = "006a0nn2p6ilvzbk2qj081nb832aa39sna1lzh5r5lscmlasdh50"; - system = "simple-config-test"; - asd = "simple-config-test"; - }); - systems = [ "simple-config-test" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "simple-config" pkgs) ]; - }; - simple-currency = { - pname = "simple-currency"; - version = "20171130-git"; - asds = [ "simple-currency" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-currency/2017-11-30/simple-currency-20171130-git.tgz"; - sha256 = "1qrxaj5v25165vyjp2fmasasjri2cn53y6ckv3rlv04skifvnq2s"; - system = "simple-currency"; - asd = "simple-currency"; - }); - systems = [ "simple-currency" ]; - lispLibs = [ (getAttr "cl-store" pkgs) (getAttr "dexador" pkgs) (getAttr "plump" pkgs) (getAttr "simple-date" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - simple-date = { - pname = "simple-date"; - version = "20221106-git"; - asds = [ "simple-date" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2022-11-06/postmodern-20221106-git.tgz"; - sha256 = "012ipwi4m5x6jhl7pd9gwvdga5hgp1l08vqdgd28rzy34s2mfv74"; - system = "simple-date"; - asd = "simple-date"; - }); - systems = [ "simple-date" ]; - lispLibs = [ ]; - }; - simple-date-time = { - pname = "simple-date-time"; - version = "20160421-git"; - asds = [ "simple-date-time" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz"; - sha256 = "06iwf13gcdyqhkzfkcsfdl8iqbdl44cx01c3fjsmhl0v1pp8h2m4"; - system = "simple-date-time"; - asd = "simple-date-time"; - }); - systems = [ "simple-date-time" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - simple-date_slash_postgres-glue = { - pname = "simple-date_postgres-glue"; - version = "20221106-git"; - asds = [ "simple-date" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2022-11-06/postmodern-20221106-git.tgz"; - sha256 = "012ipwi4m5x6jhl7pd9gwvdga5hgp1l08vqdgd28rzy34s2mfv74"; - system = "simple-date"; - asd = "simple-date"; - }); - systems = [ "simple-date/postgres-glue" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "cl-postgres" pkgs) (getAttr "simple-date" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - simple-date_slash_tests = { - pname = "simple-date_tests"; - version = "20221106-git"; - asds = [ "simple-date" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/postmodern/2022-11-06/postmodern-20221106-git.tgz"; - sha256 = "012ipwi4m5x6jhl7pd9gwvdga5hgp1l08vqdgd28rzy34s2mfv74"; - system = "simple-date"; - asd = "simple-date"; - }); - systems = [ "simple-date/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "simple-date" pkgs) ]; - meta = { - broken = true; - }; - }; - simple-finalizer = { - pname = "simple-finalizer"; - version = "20101006-git"; - asds = [ "simple-finalizer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-finalizer/2010-10-06/simple-finalizer-20101006-git.tgz"; - sha256 = "1qdm48zjlkbygz9ip006xwpas59fhijrswv1k7pzvhdwl04vkq65"; - system = "simple-finalizer"; - asd = "simple-finalizer"; - }); - systems = [ "simple-finalizer" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - simple-flow-dispatcher = { - pname = "simple-flow-dispatcher"; - version = "stable-git"; - asds = [ "simple-flow-dispatcher" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-flow-dispatcher/2020-10-16/simple-flow-dispatcher-stable-git.tgz"; - sha256 = "11k16svq4mgf0pagrs4drvf57hawffghv9g96b1n071nqyk2ald2"; - system = "simple-flow-dispatcher"; - asd = "simple-flow-dispatcher"; - }); - systems = [ "simple-flow-dispatcher" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bodge-queue" pkgs) (getAttr "cl-muth" pkgs) ]; - }; - simple-guess = { - pname = "simple-guess"; - version = "1.0"; - asds = [ "simple-guess" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-guess/2020-09-25/simple-guess_1.0.tgz"; - sha256 = "11v3wxj3k036r0kazn69vi580qm593ir1yf7j5d737j4rb382682"; - system = "simple-guess"; - asd = "simple-guess"; - }); - systems = [ "simple-guess" ]; - lispLibs = [ ]; - }; - simple-guess_tests = { - pname = "simple-guess_tests"; - version = "1.0"; - asds = [ "simple-guess_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-guess/2020-09-25/simple-guess_1.0.tgz"; - sha256 = "11v3wxj3k036r0kazn69vi580qm593ir1yf7j5d737j4rb382682"; - system = "simple-guess_tests"; - asd = "simple-guess_tests"; - }); - systems = [ "simple-guess_tests" ]; - lispLibs = [ (getAttr "fakenil" pkgs) (getAttr "parachute" pkgs) (getAttr "simple-guess" pkgs) ]; - }; - simple-inferiors = { - pname = "simple-inferiors"; - version = "20200325-git"; - asds = [ "simple-inferiors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-inferiors/2020-03-25/simple-inferiors-20200325-git.tgz"; - sha256 = "08vsvqv3768bwb2y8mwxbw5wyqzzwqr7rd004r6gafdgf9p9mcx3"; - system = "simple-inferiors"; - asd = "simple-inferiors"; - }); - systems = [ "simple-inferiors" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "uiop" pkgs) ]; - }; - simple-neural-network = { - pname = "simple-neural-network"; - version = "20221106-git"; - asds = [ "simple-neural-network" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-neural-network/2022-11-06/simple-neural-network-20221106-git.tgz"; - sha256 = "14bxgxqmn6n9yyv3xnh1km47b5l85brhddks43zsxhc8i0q3qgqg"; - system = "simple-neural-network"; - asd = "simple-neural-network"; - }); - systems = [ "simple-neural-network" ]; - lispLibs = [ (getAttr "cl-store" pkgs) (getAttr "lparallel" pkgs) ]; - }; - simple-neural-network_slash_test = { - pname = "simple-neural-network_test"; - version = "20221106-git"; - asds = [ "simple-neural-network" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-neural-network/2022-11-06/simple-neural-network-20221106-git.tgz"; - sha256 = "14bxgxqmn6n9yyv3xnh1km47b5l85brhddks43zsxhc8i0q3qgqg"; - system = "simple-neural-network"; - asd = "simple-neural-network"; - }); - systems = [ "simple-neural-network/test" ]; - lispLibs = [ (getAttr "chipz" pkgs) (getAttr "fiveam" pkgs) (getAttr "simple-neural-network" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - simple-parallel-tasks = { - pname = "simple-parallel-tasks"; - version = "20201220-git"; - asds = [ "simple-parallel-tasks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-parallel-tasks/2020-12-20/simple-parallel-tasks-20201220-git.tgz"; - sha256 = "0gvbpyff4siifp3cp86cpr9ksmakn66fx21f3h0hpn647zl07nj7"; - system = "simple-parallel-tasks"; - asd = "simple-parallel-tasks"; - }); - systems = [ "simple-parallel-tasks" ]; - lispLibs = [ (getAttr "chanl" pkgs) ]; - }; - simple-parallel-tasks-tests = { - pname = "simple-parallel-tasks-tests"; - version = "20201220-git"; - asds = [ "simple-parallel-tasks-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-parallel-tasks/2020-12-20/simple-parallel-tasks-20201220-git.tgz"; - sha256 = "0gvbpyff4siifp3cp86cpr9ksmakn66fx21f3h0hpn647zl07nj7"; - system = "simple-parallel-tasks-tests"; - asd = "simple-parallel-tasks-tests"; - }); - systems = [ "simple-parallel-tasks-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "simple-parallel-tasks" pkgs) ]; - }; - simple-rgb = { - pname = "simple-rgb"; - version = "20190521-git"; - asds = [ "simple-rgb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-rgb/2019-05-21/simple-rgb-20190521-git.tgz"; - sha256 = "0ggv0h2n4mvwnggjr1b40gw667gnyykzki2zadaczi38ydzyzlp1"; - system = "simple-rgb"; - asd = "simple-rgb"; - }); - systems = [ "simple-rgb" ]; - lispLibs = [ ]; - }; - simple-routes = { - pname = "simple-routes"; - version = "20180228-git"; - asds = [ "simple-routes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz"; - sha256 = "0zkjl69zf1ynmqmvwccdbip3wxfyi7xplivv70qwxzd27mc0kh3k"; - system = "simple-routes"; - asd = "simple-routes"; - }); - systems = [ "simple-routes" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - simple-scanf = { - pname = "simple-scanf"; - version = "20211209-git"; - asds = [ "simple-scanf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-string-match/2021-12-09/cl-string-match-20211209-git.tgz"; - sha256 = "0zndlkw3qy3vw4px4qv884z6232w8zfaliyc88irjwizdv35wcq9"; - system = "simple-scanf"; - asd = "simple-scanf"; - }); - systems = [ "simple-scanf" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "parse-float" pkgs) (getAttr "proc-parse" pkgs) ]; - }; - simple-tasks = { - pname = "simple-tasks"; - version = "20190710-git"; - asds = [ "simple-tasks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz"; - sha256 = "1ls1pij7dvb65g4nam7nvik1218jvfk5iplr48vy290fw3lq7v98"; - system = "simple-tasks"; - asd = "simple-tasks"; - }); - systems = [ "simple-tasks" ]; - lispLibs = [ (getAttr "array-utils" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "dissect" pkgs) ]; - }; - simpleroutes-demo = { - pname = "simpleroutes-demo"; - version = "20180228-git"; - asds = [ "simpleroutes-demo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz"; - sha256 = "0zkjl69zf1ynmqmvwccdbip3wxfyi7xplivv70qwxzd27mc0kh3k"; - system = "simpleroutes-demo"; - asd = "simple-routes"; - }); - systems = [ "simpleroutes-demo" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-who" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "simple-routes" pkgs) ]; - }; - simpleroutes-test = { - pname = "simpleroutes-test"; - version = "20180228-git"; - asds = [ "simpleroutes-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simple-routes/2018-02-28/simple-routes-20180228-git.tgz"; - sha256 = "0zkjl69zf1ynmqmvwccdbip3wxfyi7xplivv70qwxzd27mc0kh3k"; - system = "simpleroutes-test"; - asd = "simple-routes"; - }); - systems = [ "simpleroutes-test" ]; - lispLibs = [ (getAttr "simple-routes" pkgs) ]; - }; - simplet = { - pname = "simplet"; - version = "20191227-git"; - asds = [ "simplet" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simplet/2019-12-27/simplet-20191227-git.tgz"; - sha256 = "1scsalzbwxk6z48b61zq532c02l36yr3vl2jdy0xjm2diycq6jgs"; - system = "simplet"; - asd = "simplet"; - }); - systems = [ "simplet" ]; - lispLibs = [ ]; - }; - simplet-asdf = { - pname = "simplet-asdf"; - version = "20191227-git"; - asds = [ "simplet-asdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simplet/2019-12-27/simplet-20191227-git.tgz"; - sha256 = "1scsalzbwxk6z48b61zq532c02l36yr3vl2jdy0xjm2diycq6jgs"; - system = "simplet-asdf"; - asd = "simplet-asdf"; - }); - systems = [ "simplet-asdf" ]; - lispLibs = [ ]; - }; - simplet_slash_test = { - pname = "simplet_test"; - version = "20191227-git"; - asds = [ "simplet" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simplet/2019-12-27/simplet-20191227-git.tgz"; - sha256 = "1scsalzbwxk6z48b61zq532c02l36yr3vl2jdy0xjm2diycq6jgs"; - system = "simplet"; - asd = "simplet"; - }); - systems = [ "simplet/test" ]; - lispLibs = [ (getAttr "simplet" pkgs) ]; - meta = { - broken = true; - }; - }; - simplified-types = { - pname = "simplified-types"; - version = "20190813-git"; - asds = [ "simplified-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simplified-types/2019-08-13/simplified-types-20190813-git.tgz"; - sha256 = "1hdwmn5lz717aj6qdqmfmr3cbjl8l3giwn0fb5ca9pj83cx7fg8y"; - system = "simplified-types"; - asd = "simplified-types"; - }); - systems = [ "simplified-types" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "trivia" pkgs) ]; - }; - simplified-types-test-suite = { - pname = "simplified-types-test-suite"; - version = "20190813-git"; - asds = [ "simplified-types-test-suite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simplified-types/2019-08-13/simplified-types-20190813-git.tgz"; - sha256 = "1hdwmn5lz717aj6qdqmfmr3cbjl8l3giwn0fb5ca9pj83cx7fg8y"; - system = "simplified-types-test-suite"; - asd = "simplified-types-test-suite"; - }); - systems = [ "simplified-types-test-suite" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "simplified-types" pkgs) ]; - }; - simpsamp = { - pname = "simpsamp"; - version = "0.1"; - asds = [ "simpsamp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/simpsamp/2010-10-06/simpsamp-0.1.tgz"; - sha256 = "0i85andjaz16lh4wwpdvd5kgg7lsfp206g7kniy16gs78xjy5jlc"; - system = "simpsamp"; - asd = "simpsamp"; - }); - systems = [ "simpsamp" ]; - lispLibs = [ (getAttr "jpl-util" pkgs) ]; - }; - single-threaded-ccl = { - pname = "single-threaded-ccl"; - version = "20150608-git"; - asds = [ "single-threaded-ccl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/single-threaded-ccl/2015-06-08/single-threaded-ccl-20150608-git.tgz"; - sha256 = "0d8cf8x77b3f7qh2cr3fnkc6i7dm7pwlnldmv9k4q033rmmhnfxb"; - system = "single-threaded-ccl"; - asd = "single-threaded-ccl"; - }); - systems = [ "single-threaded-ccl" ]; - lispLibs = [ ]; - }; - singleton-classes = { - pname = "singleton-classes"; - version = "20190307-hg"; - asds = [ "singleton-classes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-abstract-classes/2019-03-07/cl-abstract-classes-20190307-hg.tgz"; - sha256 = "0q03j3ksgn56j9xvs3d3hhasplj3hvg488f4cx1z97nlyqxr5w1d"; - system = "singleton-classes"; - asd = "singleton-classes"; - }); - systems = [ "singleton-classes" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - sip-hash = { - pname = "sip-hash"; - version = "20200610-git"; - asds = [ "sip-hash" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sip-hash/2020-06-10/sip-hash-20200610-git.tgz"; - sha256 = "0cd6g37lxd5i5fyg9my4jja27ki5agbpr9d635rcwpf32yhc4sh9"; - system = "sip-hash"; - asd = "sip-hash"; - }); - systems = [ "sip-hash" ]; - lispLibs = [ (getAttr "com_dot_google_dot_base" pkgs) (getAttr "nibbles" pkgs) ]; - }; - sip-hash_slash_test = { - pname = "sip-hash_test"; - version = "20200610-git"; - asds = [ "sip-hash" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sip-hash/2020-06-10/sip-hash-20200610-git.tgz"; - sha256 = "0cd6g37lxd5i5fyg9my4jja27ki5agbpr9d635rcwpf32yhc4sh9"; - system = "sip-hash"; - asd = "sip-hash"; - }); - systems = [ "sip-hash/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "sip-hash" pkgs) ]; - meta = { - broken = true; - }; - }; - skeleton = { - pname = "skeleton"; - version = "20200610-git"; - asds = [ "skeleton" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ahungry-fleece/2020-06-10/ahungry-fleece-20200610-git.tgz"; - sha256 = "1l2rsy5qn5n456cxbd6kj0hpniy5vf35xcixzfj4j7lv00j0c5lz"; - system = "skeleton"; - asd = "skeleton"; - }); - systems = [ "skeleton" ]; - lispLibs = [ (getAttr "ahungry-fleece" pkgs) ]; - }; - skeleton-creator = { - pname = "skeleton-creator"; - version = "20191227-git"; - asds = [ "skeleton-creator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/skeleton-creator/2019-12-27/skeleton-creator-20191227-git.tgz"; - sha256 = "1yj8w9lpb2jzyf02zg65ngmjfsakzc7k1kcw90w52gk14hv1lk6s"; - system = "skeleton-creator"; - asd = "skeleton-creator"; - }); - systems = [ "skeleton-creator" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "conf" pkgs) (getAttr "simplet-asdf" pkgs) ]; - }; - skeleton-creator_slash_test = { - pname = "skeleton-creator_test"; - version = "20191227-git"; - asds = [ "skeleton-creator" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/skeleton-creator/2019-12-27/skeleton-creator-20191227-git.tgz"; - sha256 = "1yj8w9lpb2jzyf02zg65ngmjfsakzc7k1kcw90w52gk14hv1lk6s"; - system = "skeleton-creator"; - asd = "skeleton-creator"; - }); - systems = [ "skeleton-creator/test" ]; - lispLibs = [ (getAttr "simplet" pkgs) (getAttr "simplet-asdf" pkgs) (getAttr "skeleton-creator" pkgs) ]; - meta = { - broken = true; - }; - }; - sketch = { - pname = "sketch"; - version = "20221106-git"; - asds = [ "sketch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sketch/2022-11-06/sketch-20221106-git.tgz"; - sha256 = "0vlnfl2gbcraw2kdwmlj55j5pnz8cskaq4ygw0p6dwy20x25264b"; - system = "sketch"; - asd = "sketch"; - }); - systems = [ "sketch" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-geometry" pkgs) (getAttr "sdl2-image" pkgs) (getAttr "sdl2-ttf" pkgs) (getAttr "glkit" pkgs) (getAttr "mathkit" pkgs) (getAttr "md5" pkgs) (getAttr "sdl2kit" pkgs) (getAttr "split-sequence" pkgs) (getAttr "static-vectors" pkgs) ]; - }; - sketch-examples = { - pname = "sketch-examples"; - version = "20221106-git"; - asds = [ "sketch-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sketch/2022-11-06/sketch-20221106-git.tgz"; - sha256 = "0vlnfl2gbcraw2kdwmlj55j5pnz8cskaq4ygw0p6dwy20x25264b"; - system = "sketch-examples"; - asd = "sketch-examples"; - }); - systems = [ "sketch-examples" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "sketch" pkgs) ]; - }; - skippy = { - pname = "skippy"; - version = "1.3.12"; - asds = [ "skippy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/skippy/2015-04-07/skippy-1.3.12.tgz"; - sha256 = "1n8925qz19w00qc67z3hc97fpmfhi0r54dd50fzqm24vhyb7qwc2"; - system = "skippy"; - asd = "skippy"; - }); - systems = [ "skippy" ]; - lispLibs = [ ]; - }; - skippy-renderer = { - pname = "skippy-renderer"; - version = "20221106-git"; - asds = [ "skippy-renderer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/skippy-renderer/2022-11-06/skippy-renderer-20221106-git.tgz"; - sha256 = "0x9zv8zchxn48axl5rwfnywg9kb9m0pz3gwjk7gpg9m574jw8x0c"; - system = "skippy-renderer"; - asd = "skippy-renderer"; - }); - systems = [ "skippy-renderer" ]; - lispLibs = [ (getAttr "skippy" pkgs) ]; - }; - skitter = { - pname = "skitter"; - version = "release-quicklisp-620772ae-git"; - asds = [ "skitter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz"; - sha256 = "1rixcav388fnal9v139kvagjfc60sbwd8ikbmd48lppq2nq5anwl"; - system = "skitter"; - asd = "skitter"; - }); - systems = [ "skitter" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "rtg-math" pkgs) (getAttr "structy-defclass" pkgs) ]; - }; - skitter_dot_glop = { - pname = "skitter.glop"; - version = "release-quicklisp-620772ae-git"; - asds = [ "skitter.glop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz"; - sha256 = "1rixcav388fnal9v139kvagjfc60sbwd8ikbmd48lppq2nq5anwl"; - system = "skitter.glop"; - asd = "skitter.glop"; - }); - systems = [ "skitter.glop" ]; - lispLibs = [ (getAttr "glop" pkgs) (getAttr "skitter" pkgs) ]; - }; - skitter_dot_sdl2 = { - pname = "skitter.sdl2"; - version = "release-quicklisp-620772ae-git"; - asds = [ "skitter.sdl2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/skitter/2018-02-28/skitter-release-quicklisp-620772ae-git.tgz"; - sha256 = "1rixcav388fnal9v139kvagjfc60sbwd8ikbmd48lppq2nq5anwl"; - system = "skitter.sdl2"; - asd = "skitter.sdl2"; - }); - systems = [ "skitter.sdl2" ]; - lispLibs = [ (getAttr "sdl2" pkgs) (getAttr "skitter" pkgs) ]; - }; - slack-client = { - pname = "slack-client"; - version = "20160825-git"; - asds = [ "slack-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/slack-client/2016-08-25/slack-client-20160825-git.tgz"; - sha256 = "1yl2wqhx1h2kw3s5dkkq5c4hk1r7679yzq41j2j2bscbl3xk3jp9"; - system = "slack-client"; - asd = "slack-client"; - }); - systems = [ "slack-client" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "blackbird" pkgs) (getAttr "cl-async" pkgs) (getAttr "drakma-async" pkgs) (getAttr "event-glue" pkgs) (getAttr "jonathan" pkgs) (getAttr "safe-queue" pkgs) (getAttr "websocket-driver" pkgs) ]; - }; - slack-client-test = { - pname = "slack-client-test"; - version = "20160825-git"; - asds = [ "slack-client-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/slack-client/2016-08-25/slack-client-20160825-git.tgz"; - sha256 = "1yl2wqhx1h2kw3s5dkkq5c4hk1r7679yzq41j2j2bscbl3xk3jp9"; - system = "slack-client-test"; - asd = "slack-client-test"; - }); - systems = [ "slack-client-test" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "slack-client" pkgs) ]; - }; - slim = { - pname = "slim"; - version = "20221106-git"; - asds = [ "slim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mcclim/2022-11-06/mcclim-20221106-git.tgz"; - sha256 = "0hz6vz4c0xv8bjx02hf3rbnp66c7ifx2ld4y6nxdz6i70wyhwbdf"; - system = "slim"; - asd = "slim"; - }); - systems = [ "slim" ]; - lispLibs = [ (getAttr "mcclim" pkgs) ]; - }; - slite = { - pname = "slite"; - version = "20221106-git"; - asds = [ "slite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/slite/2022-11-06/slite-20221106-git.tgz"; - sha256 = "1l9b3dvmi0hf38ir3sx6005hpaqm1dc3x02hcprn4x6fik5l0zdk"; - system = "slite"; - asd = "slite"; - }); - systems = [ "slite" ]; - lispLibs = [ (getAttr "str" pkgs) (getAttr "fiveam" pkgs) ]; - }; - slite_slash_lisp-unit2 = { - pname = "slite_lisp-unit2"; - version = "20221106-git"; - asds = [ "slite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/slite/2022-11-06/slite-20221106-git.tgz"; - sha256 = "1l9b3dvmi0hf38ir3sx6005hpaqm1dc3x02hcprn4x6fik5l0zdk"; - system = "slite"; - asd = "slite"; - }); - systems = [ "slite/lisp-unit2" ]; - lispLibs = [ (getAttr "lisp-unit2" pkgs) (getAttr "slite" pkgs) ]; - meta = { - broken = true; - }; - }; - slite_slash_parachute = { - pname = "slite_parachute"; - version = "20221106-git"; - asds = [ "slite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/slite/2022-11-06/slite-20221106-git.tgz"; - sha256 = "1l9b3dvmi0hf38ir3sx6005hpaqm1dc3x02hcprn4x6fik5l0zdk"; - system = "slite"; - asd = "slite"; - }); - systems = [ "slite/parachute" ]; - lispLibs = [ (getAttr "parachute" pkgs) (getAttr "slite" pkgs) ]; - meta = { - broken = true; - }; - }; - slite_slash_tests = { - pname = "slite_tests"; - version = "20221106-git"; - asds = [ "slite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/slite/2022-11-06/slite-20221106-git.tgz"; - sha256 = "1l9b3dvmi0hf38ir3sx6005hpaqm1dc3x02hcprn4x6fik5l0zdk"; - system = "slite"; - asd = "slite"; - }); - systems = [ "slite/tests" ]; - lispLibs = [ (getAttr "lisp-unit2" pkgs) (getAttr "parachute" pkgs) (getAttr "slite" pkgs) ]; - meta = { - broken = true; - }; - }; - slot-extra-options = { - pname = "slot-extra-options"; - version = "20210411-git"; - asds = [ "slot-extra-options" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/slot-extra-options/2021-04-11/slot-extra-options-20210411-git.tgz"; - sha256 = "1b2swhjjs0w1034cy045q8l3ndmci7rjawka39q23vncy6d90497"; - system = "slot-extra-options"; - asd = "slot-extra-options"; - }); - systems = [ "slot-extra-options" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "serapeum" pkgs) ]; - }; - slot-extra-options-tests = { - pname = "slot-extra-options-tests"; - version = "20210411-git"; - asds = [ "slot-extra-options-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/slot-extra-options/2021-04-11/slot-extra-options-20210411-git.tgz"; - sha256 = "1b2swhjjs0w1034cy045q8l3ndmci7rjawka39q23vncy6d90497"; - system = "slot-extra-options-tests"; - asd = "slot-extra-options-tests"; - }); - systems = [ "slot-extra-options-tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "parachute" pkgs) (getAttr "serapeum" pkgs) (getAttr "slot-extra-options" pkgs) ]; - }; - slot-map = { - pname = "slot-map"; - version = "20220707-git"; - asds = [ "slot-map" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/slot-map/2022-07-07/slot-map-20220707-git.tgz"; - sha256 = "1z9qprjqj3pwqf469bxj0fvvjni1ncap6g7w5q9gmv5hnf2a4yjb"; - system = "slot-map"; - asd = "slot-map"; - }); - systems = [ "slot-map" ]; - lispLibs = [ (getAttr "dynamic-array" pkgs) (getAttr "mfiano-utils" pkgs) ]; - }; - slynk = { - pname = "slynk"; - version = "20221106-git"; - asds = [ "slynk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sly/2022-11-06/sly-20221106-git.tgz"; - sha256 = "081rpyvzxma5ms2am9mpkwbigbhqbgkxgrclj1fhccv5xpp163wp"; - system = "slynk"; - asd = "slynk"; - }); - systems = [ "slynk" ]; - lispLibs = [ ]; - }; - slynk_slash_arglists = { - pname = "slynk_arglists"; - version = "20221106-git"; - asds = [ "slynk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sly/2022-11-06/sly-20221106-git.tgz"; - sha256 = "081rpyvzxma5ms2am9mpkwbigbhqbgkxgrclj1fhccv5xpp163wp"; - system = "slynk"; - asd = "slynk"; - }); - systems = [ "slynk/arglists" ]; - lispLibs = [ (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - slynk_slash_fancy-inspector = { - pname = "slynk_fancy-inspector"; - version = "20221106-git"; - asds = [ "slynk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sly/2022-11-06/sly-20221106-git.tgz"; - sha256 = "081rpyvzxma5ms2am9mpkwbigbhqbgkxgrclj1fhccv5xpp163wp"; - system = "slynk"; - asd = "slynk"; - }); - systems = [ "slynk/fancy-inspector" ]; - lispLibs = [ (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - slynk_slash_indentation = { - pname = "slynk_indentation"; - version = "20221106-git"; - asds = [ "slynk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sly/2022-11-06/sly-20221106-git.tgz"; - sha256 = "081rpyvzxma5ms2am9mpkwbigbhqbgkxgrclj1fhccv5xpp163wp"; - system = "slynk"; - asd = "slynk"; - }); - systems = [ "slynk/indentation" ]; - lispLibs = [ (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - slynk_slash_mrepl = { - pname = "slynk_mrepl"; - version = "20221106-git"; - asds = [ "slynk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sly/2022-11-06/sly-20221106-git.tgz"; - sha256 = "081rpyvzxma5ms2am9mpkwbigbhqbgkxgrclj1fhccv5xpp163wp"; - system = "slynk"; - asd = "slynk"; - }); - systems = [ "slynk/mrepl" ]; - lispLibs = [ (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - slynk_slash_package-fu = { - pname = "slynk_package-fu"; - version = "20221106-git"; - asds = [ "slynk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sly/2022-11-06/sly-20221106-git.tgz"; - sha256 = "081rpyvzxma5ms2am9mpkwbigbhqbgkxgrclj1fhccv5xpp163wp"; - system = "slynk"; - asd = "slynk"; - }); - systems = [ "slynk/package-fu" ]; - lispLibs = [ (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - slynk_slash_profiler = { - pname = "slynk_profiler"; - version = "20221106-git"; - asds = [ "slynk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sly/2022-11-06/sly-20221106-git.tgz"; - sha256 = "081rpyvzxma5ms2am9mpkwbigbhqbgkxgrclj1fhccv5xpp163wp"; - system = "slynk"; - asd = "slynk"; - }); - systems = [ "slynk/profiler" ]; - lispLibs = [ (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - slynk_slash_retro = { - pname = "slynk_retro"; - version = "20221106-git"; - asds = [ "slynk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sly/2022-11-06/sly-20221106-git.tgz"; - sha256 = "081rpyvzxma5ms2am9mpkwbigbhqbgkxgrclj1fhccv5xpp163wp"; - system = "slynk"; - asd = "slynk"; - }); - systems = [ "slynk/retro" ]; - lispLibs = [ (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - slynk_slash_stickers = { - pname = "slynk_stickers"; - version = "20221106-git"; - asds = [ "slynk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sly/2022-11-06/sly-20221106-git.tgz"; - sha256 = "081rpyvzxma5ms2am9mpkwbigbhqbgkxgrclj1fhccv5xpp163wp"; - system = "slynk"; - asd = "slynk"; - }); - systems = [ "slynk/stickers" ]; - lispLibs = [ (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - slynk_slash_trace-dialog = { - pname = "slynk_trace-dialog"; - version = "20221106-git"; - asds = [ "slynk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sly/2022-11-06/sly-20221106-git.tgz"; - sha256 = "081rpyvzxma5ms2am9mpkwbigbhqbgkxgrclj1fhccv5xpp163wp"; - system = "slynk"; - asd = "slynk"; - }); - systems = [ "slynk/trace-dialog" ]; - lispLibs = [ (getAttr "slynk" pkgs) ]; - meta = { - broken = true; - }; - }; - smackjack = { - pname = "smackjack"; - version = "20180228-git"; - asds = [ "smackjack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/smackjack/2018-02-28/smackjack-20180228-git.tgz"; - sha256 = "1n2x7qij2ci70axd2xn295qqgqrvbfbpvv2438lhwd8qa92dhk8b"; - system = "smackjack"; - asd = "smackjack"; - }); - systems = [ "smackjack" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-containers" pkgs) (getAttr "cl-json" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "parenscript" pkgs) ]; - }; - smackjack-demo = { - pname = "smackjack-demo"; - version = "20180228-git"; - asds = [ "smackjack-demo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/smackjack/2018-02-28/smackjack-20180228-git.tgz"; - sha256 = "1n2x7qij2ci70axd2xn295qqgqrvbfbpvv2438lhwd8qa92dhk8b"; - system = "smackjack-demo"; - asd = "smackjack-demo"; - }); - systems = [ "smackjack-demo" ]; - lispLibs = [ (getAttr "cl-containers" pkgs) (getAttr "cl-who" pkgs) (getAttr "local-time" pkgs) (getAttr "smackjack" pkgs) ]; - }; - smart-buffer = { - pname = "smart-buffer"; - version = "20211020-git"; - asds = [ "smart-buffer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz"; - sha256 = "1r9y61a791m7aqgg2ixs86lc63y78w7n6dwipakcpjzscqmprppr"; - system = "smart-buffer"; - asd = "smart-buffer"; - }); - systems = [ "smart-buffer" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "uiop" pkgs) (getAttr "xsubseq" pkgs) ]; - }; - smart-buffer-test = { - pname = "smart-buffer-test"; - version = "20211020-git"; - asds = [ "smart-buffer-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz"; - sha256 = "1r9y61a791m7aqgg2ixs86lc63y78w7n6dwipakcpjzscqmprppr"; - system = "smart-buffer-test"; - asd = "smart-buffer-test"; - }); - systems = [ "smart-buffer-test" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "smart-buffer" pkgs) ]; - }; - smokebase = { - pname = "smokebase"; - version = "20210531-git"; - asds = [ "smokebase" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/qt-libs/2021-05-31/qt-libs-20210531-git.tgz"; - sha256 = "0why7cssadw20jg382k6mg2lgk5b3b3nwyyvjafaz90h0ljf0b9w"; - system = "smokebase"; - asd = "smokebase"; - }); - systems = [ "smokebase" ]; - lispLibs = [ (getAttr "qt_plus_libs" pkgs) (getAttr "qt-libs" pkgs) ]; - }; - smug = { - pname = "smug"; - version = "20211230-git"; - asds = [ "smug" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/smug/2021-12-30/smug-20211230-git.tgz"; - sha256 = "13gzkj9skya2ziwclk041v7sif392ydbvhvikhg2raa3qjcxb3rq"; - system = "smug"; - asd = "smug"; - }); - systems = [ "smug" ]; - lispLibs = [ (getAttr "asdf-package-system" pkgs) ]; - }; - snakes = { - pname = "snakes"; - version = "20221106-git"; - asds = [ "snakes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snakes/2022-11-06/snakes-20221106-git.tgz"; - sha256 = "17fqkw256c2iacy5g37sv9h0mbrmb3fg2s9sd83gj9clrg5r4wkl"; - system = "snakes"; - asd = "snakes"; - }); - systems = [ "snakes" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-cont" pkgs) (getAttr "cl-utilities" pkgs) (getAttr "closer-mop" pkgs) (getAttr "fiveam" pkgs) (getAttr "iterate" pkgs) ]; - }; - snappy = { - pname = "snappy"; - version = "20211209-git"; - asds = [ "snappy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snappy/2021-12-09/snappy-20211209-git.tgz"; - sha256 = "1g0d8icbqmahywqczb8pimr63970dil6mnlxkv3y9ng31dg0npy6"; - system = "snappy"; - asd = "snappy"; - }); - systems = [ "snappy" ]; - lispLibs = [ (getAttr "com_dot_google_dot_base" pkgs) (getAttr "nibbles" pkgs) (getAttr "varint" pkgs) ]; - }; - snappy_slash_test = { - pname = "snappy_test"; - version = "20211209-git"; - asds = [ "snappy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snappy/2021-12-09/snappy-20211209-git.tgz"; - sha256 = "1g0d8icbqmahywqczb8pimr63970dil6mnlxkv3y9ng31dg0npy6"; - system = "snappy"; - asd = "snappy"; - }); - systems = [ "snappy/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "nibbles" pkgs) (getAttr "acm-random" pkgs) (getAttr "snappy" pkgs) ]; - meta = { - broken = true; - }; - }; - snark = { - pname = "snark"; - version = "20160421-git"; - asds = [ "snark" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark"; - asd = "snark"; - }); - systems = [ "snark" ]; - lispLibs = [ (getAttr "snark-implementation" pkgs) ]; - }; - snark-agenda = { - pname = "snark-agenda"; - version = "20160421-git"; - asds = [ "snark-agenda" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark-agenda"; - asd = "snark-agenda"; - }); - systems = [ "snark-agenda" ]; - lispLibs = [ (getAttr "snark-auxiliary-packages" pkgs) (getAttr "snark-deque" pkgs) (getAttr "snark-lisp" pkgs) (getAttr "snark-sparse-array" pkgs) ]; - }; - snark-auxiliary-packages = { - pname = "snark-auxiliary-packages"; - version = "20160421-git"; - asds = [ "snark-auxiliary-packages" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark-auxiliary-packages"; - asd = "snark-auxiliary-packages"; - }); - systems = [ "snark-auxiliary-packages" ]; - lispLibs = [ ]; - }; - snark-deque = { - pname = "snark-deque"; - version = "20160421-git"; - asds = [ "snark-deque" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark-deque"; - asd = "snark-deque"; - }); - systems = [ "snark-deque" ]; - lispLibs = [ (getAttr "snark-auxiliary-packages" pkgs) (getAttr "snark-lisp" pkgs) ]; - }; - snark-dpll = { - pname = "snark-dpll"; - version = "20160421-git"; - asds = [ "snark-dpll" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark-dpll"; - asd = "snark-dpll"; - }); - systems = [ "snark-dpll" ]; - lispLibs = [ (getAttr "snark-auxiliary-packages" pkgs) (getAttr "snark-lisp" pkgs) ]; - }; - snark-examples = { - pname = "snark-examples"; - version = "20160421-git"; - asds = [ "snark-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark-examples"; - asd = "snark-examples"; - }); - systems = [ "snark-examples" ]; - lispLibs = [ (getAttr "snark" pkgs) ]; - }; - snark-feature = { - pname = "snark-feature"; - version = "20160421-git"; - asds = [ "snark-feature" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark-feature"; - asd = "snark-feature"; - }); - systems = [ "snark-feature" ]; - lispLibs = [ (getAttr "snark-auxiliary-packages" pkgs) (getAttr "snark-lisp" pkgs) ]; - }; - snark-implementation = { - pname = "snark-implementation"; - version = "20160421-git"; - asds = [ "snark-implementation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark-implementation"; - asd = "snark-implementation"; - }); - systems = [ "snark-implementation" ]; - lispLibs = [ (getAttr "snark-agenda" pkgs) (getAttr "snark-auxiliary-packages" pkgs) (getAttr "snark-deque" pkgs) (getAttr "snark-dpll" pkgs) (getAttr "snark-feature" pkgs) (getAttr "snark-infix-reader" pkgs) (getAttr "snark-lisp" pkgs) (getAttr "snark-numbering" pkgs) (getAttr "snark-pkg" pkgs) (getAttr "snark-sparse-array" pkgs) ]; - }; - snark-infix-reader = { - pname = "snark-infix-reader"; - version = "20160421-git"; - asds = [ "snark-infix-reader" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark-infix-reader"; - asd = "snark-infix-reader"; - }); - systems = [ "snark-infix-reader" ]; - lispLibs = [ (getAttr "snark-auxiliary-packages" pkgs) (getAttr "snark-lisp" pkgs) ]; - }; - snark-lisp = { - pname = "snark-lisp"; - version = "20160421-git"; - asds = [ "snark-lisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark-lisp"; - asd = "snark-lisp"; - }); - systems = [ "snark-lisp" ]; - lispLibs = [ (getAttr "snark-auxiliary-packages" pkgs) ]; - }; - snark-loads = { - pname = "snark-loads"; - version = "20160421-git"; - asds = [ "snark-loads" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark-loads"; - asd = "snark-loads"; - }); - systems = [ "snark-loads" ]; - lispLibs = [ ]; - }; - snark-numbering = { - pname = "snark-numbering"; - version = "20160421-git"; - asds = [ "snark-numbering" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark-numbering"; - asd = "snark-numbering"; - }); - systems = [ "snark-numbering" ]; - lispLibs = [ (getAttr "snark-auxiliary-packages" pkgs) (getAttr "snark-lisp" pkgs) (getAttr "snark-sparse-array" pkgs) ]; - }; - snark-pkg = { - pname = "snark-pkg"; - version = "20160421-git"; - asds = [ "snark-pkg" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark-pkg"; - asd = "snark-pkg"; - }); - systems = [ "snark-pkg" ]; - lispLibs = [ (getAttr "snark-dpll" pkgs) ]; - }; - snark-sparse-array = { - pname = "snark-sparse-array"; - version = "20160421-git"; - asds = [ "snark-sparse-array" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snark/2016-04-21/snark-20160421-git.tgz"; - sha256 = "0zsqaqkl9s626nk5h41z00kssjnzhbsra68zfflryp5j3gy9vgm5"; - system = "snark-sparse-array"; - asd = "snark-sparse-array"; - }); - systems = [ "snark-sparse-array" ]; - lispLibs = [ (getAttr "snark-auxiliary-packages" pkgs) (getAttr "snark-lisp" pkgs) ]; - }; - sndfile-blob = { - pname = "sndfile-blob"; - version = "stable-git"; - asds = [ "sndfile-blob" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sndfile-blob/2020-10-16/sndfile-blob-stable-git.tgz"; - sha256 = "1csbm2cgj76smia59044vx8698w9dy223cmwv8l4i8kb95m1i3l0"; - system = "sndfile-blob"; - asd = "sndfile-blob"; - }); - systems = [ "sndfile-blob" ]; - lispLibs = [ (getAttr "bodge-blobs-support" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - snmp = { - pname = "snmp"; - version = "6.1"; - asds = [ "snmp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz"; - sha256 = "0qpy6jfp0v9i80gli1gf98sj0h67x9g5a8bqxrsxnqyi3h59di5s"; - system = "snmp"; - asd = "snmp"; - }); - systems = [ "snmp" ]; - lispLibs = [ (getAttr "ieee-floats" pkgs) (getAttr "ironclad" pkgs) (getAttr "portable-threads" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "usocket" pkgs) ]; - }; - snmp-server = { - pname = "snmp-server"; - version = "6.1"; - asds = [ "snmp-server" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz"; - sha256 = "0qpy6jfp0v9i80gli1gf98sj0h67x9g5a8bqxrsxnqyi3h59di5s"; - system = "snmp-server"; - asd = "snmp-server"; - }); - systems = [ "snmp-server" ]; - lispLibs = [ (getAttr "snmp" pkgs) (getAttr "usocket-server" pkgs) ]; - }; - snmp-test = { - pname = "snmp-test"; - version = "6.1"; - asds = [ "snmp-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz"; - sha256 = "0qpy6jfp0v9i80gli1gf98sj0h67x9g5a8bqxrsxnqyi3h59di5s"; - system = "snmp-test"; - asd = "snmp-test"; - }); - systems = [ "snmp-test" ]; - lispLibs = [ (getAttr "snmp" pkgs) (getAttr "snmp-server" pkgs) ]; - }; - snmp-ui = { - pname = "snmp-ui"; - version = "6.1"; - asds = [ "snmp-ui" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snmp/2016-10-31/snmp-6.1.tgz"; - sha256 = "0qpy6jfp0v9i80gli1gf98sj0h67x9g5a8bqxrsxnqyi3h59di5s"; - system = "snmp-ui"; - asd = "snmp-ui"; - }); - systems = [ "snmp-ui" ]; - lispLibs = [ (getAttr "snmp" pkgs) ]; - }; - snooze = { - pname = "snooze"; - version = "20210807-git"; - asds = [ "snooze" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snooze/2021-08-07/snooze-20210807-git.tgz"; - sha256 = "0y6n5k6yw6183kf00m4wa9fksad9qjy4i5qr027ys48mgw8d23fj"; - system = "snooze"; - asd = "snooze"; - }); - systems = [ "snooze" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "parse-float" pkgs) (getAttr "quri" pkgs) (getAttr "rfc2388" pkgs) (getAttr "uiop" pkgs) ]; - }; - snooze-demo = { - pname = "snooze-demo"; - version = "20210807-git"; - asds = [ "snooze-demo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snooze/2021-08-07/snooze-20210807-git.tgz"; - sha256 = "0y6n5k6yw6183kf00m4wa9fksad9qjy4i5qr027ys48mgw8d23fj"; - system = "snooze-demo"; - asd = "snooze"; - }); - systems = [ "snooze-demo" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-css" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-who" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "local-time" pkgs) (getAttr "local-time-duration" pkgs) (getAttr "snooze" pkgs) ]; - }; - snooze-tests = { - pname = "snooze-tests"; - version = "20210807-git"; - asds = [ "snooze-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/snooze/2021-08-07/snooze-20210807-git.tgz"; - sha256 = "0y6n5k6yw6183kf00m4wa9fksad9qjy4i5qr027ys48mgw8d23fj"; - system = "snooze-tests"; - asd = "snooze"; - }); - systems = [ "snooze-tests" ]; - lispLibs = [ (getAttr "fiasco" pkgs) (getAttr "snooze" pkgs) ]; - }; - softdrink = { - pname = "softdrink"; - version = "20200427-git"; - asds = [ "softdrink" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/softdrink/2020-04-27/softdrink-20200427-git.tgz"; - sha256 = "1b0by4ymvk120aaq0viqqjqnbk91g00cd7bipnrb75nfb4ahi2s9"; - system = "softdrink"; - asd = "softdrink"; - }); - systems = [ "softdrink" ]; - lispLibs = [ (getAttr "lass" pkgs) (getAttr "lquery" pkgs) ]; - }; - software-evolution-library = { - pname = "software-evolution-library"; - version = "20221106-git"; - asds = [ "software-evolution-library" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sel/2022-11-06/sel-20221106-git.tgz"; - sha256 = "10bb8xb9zq0nbigc2119vhp5spa7y3r180h46qzf13jrnwy5qaj7"; - system = "software-evolution-library"; - asd = "software-evolution-library"; - }); - systems = [ "software-evolution-library" ]; - lispLibs = [ (getAttr "asdf-package-system" pkgs) (getAttr "atomics" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "gt" pkgs) (getAttr "deploy" pkgs) ]; - }; - software-evolution-library_slash_deploy-tree-sitter-interface = { - pname = "software-evolution-library_deploy-tree-sitter-interface"; - version = "20221106-git"; - asds = [ "software-evolution-library" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sel/2022-11-06/sel-20221106-git.tgz"; - sha256 = "10bb8xb9zq0nbigc2119vhp5spa7y3r180h46qzf13jrnwy5qaj7"; - system = "software-evolution-library"; - asd = "software-evolution-library"; - }); - systems = [ "software-evolution-library/deploy-tree-sitter-interface" ]; - lispLibs = [ (getAttr "deploy" pkgs) ]; - meta = { - broken = true; - }; - }; - software-evolution-library_slash_run-dump-store = { - pname = "software-evolution-library_run-dump-store"; - version = "20221106-git"; - asds = [ "software-evolution-library" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sel/2022-11-06/sel-20221106-git.tgz"; - sha256 = "10bb8xb9zq0nbigc2119vhp5spa7y3r180h46qzf13jrnwy5qaj7"; - system = "software-evolution-library"; - asd = "software-evolution-library"; - }); - systems = [ "software-evolution-library/run-dump-store" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - software-evolution-library_slash_run-rest-server = { - pname = "software-evolution-library_run-rest-server"; - version = "20221106-git"; - asds = [ "software-evolution-library" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sel/2022-11-06/sel-20221106-git.tgz"; - sha256 = "10bb8xb9zq0nbigc2119vhp5spa7y3r180h46qzf13jrnwy5qaj7"; - system = "software-evolution-library"; - asd = "software-evolution-library"; - }); - systems = [ "software-evolution-library/run-rest-server" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - software-evolution-library_slash_run-test-parse = { - pname = "software-evolution-library_run-test-parse"; - version = "20221106-git"; - asds = [ "software-evolution-library" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sel/2022-11-06/sel-20221106-git.tgz"; - sha256 = "10bb8xb9zq0nbigc2119vhp5spa7y3r180h46qzf13jrnwy5qaj7"; - system = "software-evolution-library"; - asd = "software-evolution-library"; - }); - systems = [ "software-evolution-library/run-test-parse" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - software-evolution-library_slash_run-tree-sitter-interface = { - pname = "software-evolution-library_run-tree-sitter-interface"; - version = "20221106-git"; - asds = [ "software-evolution-library" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sel/2022-11-06/sel-20221106-git.tgz"; - sha256 = "10bb8xb9zq0nbigc2119vhp5spa7y3r180h46qzf13jrnwy5qaj7"; - system = "software-evolution-library"; - asd = "software-evolution-library"; - }); - systems = [ "software-evolution-library/run-tree-sitter-interface" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - software-evolution-library_slash_run-tree-sitter-py-generator = { - pname = "software-evolution-library_run-tree-sitter-py-generator"; - version = "20221106-git"; - asds = [ "software-evolution-library" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sel/2022-11-06/sel-20221106-git.tgz"; - sha256 = "10bb8xb9zq0nbigc2119vhp5spa7y3r180h46qzf13jrnwy5qaj7"; - system = "software-evolution-library"; - asd = "software-evolution-library"; - }); - systems = [ "software-evolution-library/run-tree-sitter-py-generator" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - software-evolution-library_slash_terminal = { - pname = "software-evolution-library_terminal"; - version = "20221106-git"; - asds = [ "software-evolution-library" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sel/2022-11-06/sel-20221106-git.tgz"; - sha256 = "10bb8xb9zq0nbigc2119vhp5spa7y3r180h46qzf13jrnwy5qaj7"; - system = "software-evolution-library"; - asd = "software-evolution-library"; - }); - systems = [ "software-evolution-library/terminal" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-interpol" pkgs) (getAttr "gt" pkgs) ]; - meta = { - broken = true; - }; - }; - software-evolution-library_slash_utility_slash_fare-qq = { - pname = "software-evolution-library_utility_fare-qq"; - version = "20221106-git"; - asds = [ "software-evolution-library" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sel/2022-11-06/sel-20221106-git.tgz"; - sha256 = "10bb8xb9zq0nbigc2119vhp5spa7y3r180h46qzf13jrnwy5qaj7"; - system = "software-evolution-library"; - asd = "software-evolution-library"; - }); - systems = [ "software-evolution-library/utility/fare-qq" ]; - lispLibs = [ (getAttr "fare-quasiquote-extras" pkgs) ]; - meta = { - broken = true; - }; - }; - solid-engine = { - pname = "solid-engine"; - version = "20190521-git"; - asds = [ "solid-engine" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/solid-engine/2019-05-21/solid-engine-20190521-git.tgz"; - sha256 = "1pxrgxfqz8br258jy35qyimsrz544fg9k7lw2jshkj4jr2pswsv0"; - system = "solid-engine"; - asd = "solid-engine"; - }); - systems = [ "solid-engine" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - soundex = { - pname = "soundex"; - version = "1.0"; - asds = [ "soundex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/soundex/2010-10-06/soundex-1.0.tgz"; - sha256 = "00ar2x7ja35337v6gwa4h2b8w7gf7dwx5mdfz91dqay43kx1pjsi"; - system = "soundex"; - asd = "soundex"; - }); - systems = [ "soundex" ]; - lispLibs = [ ]; - }; - south = { - pname = "south"; - version = "20190710-git"; - asds = [ "south" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/south/2019-07-10/south-20190710-git.tgz"; - sha256 = "09fyqxsflc107f3g2mzh81wnr3lzbaaz2jj5js0q6rpyaq2yc39p"; - system = "south"; - asd = "south"; - }); - systems = [ "south" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "ironclad" pkgs) (getAttr "uuid" pkgs) ]; - }; - sparse-set = { - pname = "sparse-set"; - version = "20220707-git"; - asds = [ "sparse-set" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sparse-set/2022-07-07/sparse-set-20220707-git.tgz"; - sha256 = "0czms03lrvg20hw3sz7wzzkl1z0vm0ndb3dmbvwsjd7m89fag793"; - system = "sparse-set"; - asd = "sparse-set"; - }); - systems = [ "sparse-set" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) ]; - }; - spatial-trees = { - pname = "spatial-trees"; - version = "20140826-git"; - asds = [ "spatial-trees" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz"; - sha256 = "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa"; - system = "spatial-trees"; - asd = "spatial-trees"; - }); - systems = [ "spatial-trees" ]; - lispLibs = [ ]; - }; - spatial-trees_dot_nns = { - pname = "spatial-trees.nns"; - version = "20140826-git"; - asds = [ "spatial-trees.nns" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz"; - sha256 = "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa"; - system = "spatial-trees.nns"; - asd = "spatial-trees.nns"; - }); - systems = [ "spatial-trees.nns" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "optima" pkgs) (getAttr "spatial-trees" pkgs) ]; - }; - spatial-trees_dot_nns_dot_test = { - pname = "spatial-trees.nns.test"; - version = "20140826-git"; - asds = [ "spatial-trees.nns.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz"; - sha256 = "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa"; - system = "spatial-trees.nns.test"; - asd = "spatial-trees.nns.test"; - }); - systems = [ "spatial-trees.nns.test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiveam" pkgs) (getAttr "iterate" pkgs) (getAttr "optima" pkgs) (getAttr "spatial-trees" pkgs) (getAttr "spatial-trees_dot_nns" pkgs) ]; - }; - spatial-trees_dot_test = { - pname = "spatial-trees.test"; - version = "20140826-git"; - asds = [ "spatial-trees.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/spatial-trees/2014-08-26/spatial-trees-20140826-git.tgz"; - sha256 = "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa"; - system = "spatial-trees.test"; - asd = "spatial-trees.test"; - }); - systems = [ "spatial-trees.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "spatial-trees" pkgs) ]; - }; - special-functions = { - pname = "special-functions"; - version = "20221106-git"; - asds = [ "special-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/special-functions/2022-11-06/special-functions-20221106-git.tgz"; - sha256 = "092szffy7zfxgrvfck11wnj8l0mgcym13yiafj01ad02lbj1fnnv"; - system = "special-functions"; - asd = "special-functions"; - }); - systems = [ "special-functions" ]; - lispLibs = [ (getAttr "alexandria_plus" pkgs) (getAttr "float-features" pkgs) (getAttr "let-plus" pkgs) (getAttr "num-utils" pkgs) ]; - }; - special-functions_slash_tests = { - pname = "special-functions_tests"; - version = "20221106-git"; - asds = [ "special-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/special-functions/2022-11-06/special-functions-20221106-git.tgz"; - sha256 = "092szffy7zfxgrvfck11wnj8l0mgcym13yiafj01ad02lbj1fnnv"; - system = "special-functions"; - asd = "special-functions"; - }); - systems = [ "special-functions/tests" ]; - lispLibs = [ (getAttr "cl-variates" pkgs) (getAttr "fiveam" pkgs) (getAttr "select" pkgs) (getAttr "special-functions" pkgs) ]; - meta = { - broken = true; - }; - }; - specialization-store = { - pname = "specialization-store"; - version = "v0.0.5"; - asds = [ "specialization-store" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz"; - sha256 = "03q0szyz8ygqmg10q4j97dy7gfr9icxay9s8bgs883yncbk42y6c"; - system = "specialization-store"; - asd = "specialization-store"; - }); - systems = [ "specialization-store" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "specialization-store-features" pkgs) ]; - }; - specialization-store-features = { - pname = "specialization-store-features"; - version = "v0.0.5"; - asds = [ "specialization-store-features" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz"; - sha256 = "03q0szyz8ygqmg10q4j97dy7gfr9icxay9s8bgs883yncbk42y6c"; - system = "specialization-store-features"; - asd = "specialization-store-features"; - }); - systems = [ "specialization-store-features" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "introspect-environment" pkgs) ]; - }; - specialization-store-tests = { - pname = "specialization-store-tests"; - version = "v0.0.5"; - asds = [ "specialization-store-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/specialization-store/2020-06-10/specialization-store-v0.0.5.tgz"; - sha256 = "03q0szyz8ygqmg10q4j97dy7gfr9icxay9s8bgs883yncbk42y6c"; - system = "specialization-store-tests"; - asd = "specialization-store-tests"; - }); - systems = [ "specialization-store-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "specialization-store" pkgs) ]; - }; - specialized-function = { - pname = "specialized-function"; - version = "20210531-git"; - asds = [ "specialized-function" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/specialized-function/2021-05-31/specialized-function-20210531-git.tgz"; - sha256 = "19hfgc83b7as630r1w9r8yl0v6xq3dn01vcrl0bd4pza5hgjn4la"; - system = "specialized-function"; - asd = "specialized-function"; - }); - systems = [ "specialized-function" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "lisp-namespace" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-cltl2" pkgs) (getAttr "type-r" pkgs) ]; - }; - specialized-function_dot_test = { - pname = "specialized-function.test"; - version = "20210531-git"; - asds = [ "specialized-function.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/specialized-function/2021-05-31/specialized-function-20210531-git.tgz"; - sha256 = "19hfgc83b7as630r1w9r8yl0v6xq3dn01vcrl0bd4pza5hgjn4la"; - system = "specialized-function.test"; - asd = "specialized-function.test"; - }); - systems = [ "specialized-function.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "specialized-function" pkgs) ]; - }; - speechless = { - pname = "speechless"; - version = "20221106-git"; - asds = [ "speechless" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/speechless/2022-11-06/speechless-20221106-git.tgz"; - sha256 = "1mq4q0caxvbjj2vs024z2mcsm7r0wd7kw0j2fd6ak9a96cz23jai"; - system = "speechless"; - asd = "speechless"; - }); - systems = [ "speechless" ]; - lispLibs = [ (getAttr "cl-markless" pkgs) (getAttr "documentation-utils" pkgs) ]; - }; - spell = { - pname = "spell"; - version = "20190307-git"; - asds = [ "spell" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/spell/2019-03-07/spell-20190307-git.tgz"; - sha256 = "1ifhx5q0iz80i9zwgcpv3w7xpp92ar9grz25008wnqzaayhfl020"; - system = "spell"; - asd = "spell"; - }); - systems = [ "spell" ]; - lispLibs = [ ]; - }; - spell_slash_simple = { - pname = "spell_simple"; - version = "20190307-git"; - asds = [ "spell" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/spell/2019-03-07/spell-20190307-git.tgz"; - sha256 = "1ifhx5q0iz80i9zwgcpv3w7xpp92ar9grz25008wnqzaayhfl020"; - system = "spell"; - asd = "spell"; - }); - systems = [ "spell/simple" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - spellcheck = { - pname = "spellcheck"; - version = "20131003-git"; - asds = [ "spellcheck" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/spellcheck/2013-10-03/spellcheck-20131003-git.tgz"; - sha256 = "0a0r1dgh7y06s7j9mzxrryri8fhajzjsrrsh3i6vv65vq5zzxlka"; - system = "spellcheck"; - asd = "spellcheck"; - }); - systems = [ "spellcheck" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - sphinx = { - pname = "sphinx"; - version = "20110619-git"; - asds = [ "sphinx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sphinx/2011-06-19/cl-sphinx-20110619-git.tgz"; - sha256 = "0z1ksxz1gh12ly6lbc77l0d5f380s81vx44qakm2dl1398lgb7x1"; - system = "sphinx"; - asd = "sphinx"; - }); - systems = [ "sphinx" ]; - lispLibs = [ (getAttr "closure-template" pkgs) (getAttr "docutils" pkgs) (getAttr "cl-fad" pkgs) (getAttr "colorize" pkgs) ]; - }; - spinneret = { - pname = "spinneret"; - version = "20221106-git"; - asds = [ "spinneret" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/spinneret/2022-11-06/spinneret-20221106-git.tgz"; - sha256 = "0v3rqv0ka97zmhpvwiqixb0sxn7fp5b2jancvhffp846mqbskn6k"; - system = "spinneret"; - asd = "spinneret"; - }); - systems = [ "spinneret" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "global-vars" pkgs) (getAttr "parenscript" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - spinneret_slash_cl-markdown = { - pname = "spinneret_cl-markdown"; - version = "20221106-git"; - asds = [ "spinneret" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/spinneret/2022-11-06/spinneret-20221106-git.tgz"; - sha256 = "0v3rqv0ka97zmhpvwiqixb0sxn7fp5b2jancvhffp846mqbskn6k"; - system = "spinneret"; - asd = "spinneret"; - }); - systems = [ "spinneret/cl-markdown" ]; - lispLibs = [ (getAttr "cl-markdown" pkgs) (getAttr "spinneret" pkgs) ]; - meta = { - broken = true; - }; - }; - spinneret_slash_ps = { - pname = "spinneret_ps"; - version = "20221106-git"; - asds = [ "spinneret" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/spinneret/2022-11-06/spinneret-20221106-git.tgz"; - sha256 = "0v3rqv0ka97zmhpvwiqixb0sxn7fp5b2jancvhffp846mqbskn6k"; - system = "spinneret"; - asd = "spinneret"; - }); - systems = [ "spinneret/ps" ]; - lispLibs = [ (getAttr "parenscript" pkgs) (getAttr "spinneret" pkgs) ]; - meta = { - broken = true; - }; - }; - spinneret_slash_tests = { - pname = "spinneret_tests"; - version = "20221106-git"; - asds = [ "spinneret" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/spinneret/2022-11-06/spinneret-20221106-git.tgz"; - sha256 = "0v3rqv0ka97zmhpvwiqixb0sxn7fp5b2jancvhffp846mqbskn6k"; - system = "spinneret"; - asd = "spinneret"; - }); - systems = [ "spinneret/tests" ]; - lispLibs = [ (getAttr "cl-markdown" pkgs) (getAttr "fiveam" pkgs) (getAttr "parenscript" pkgs) (getAttr "serapeum" pkgs) (getAttr "spinneret" pkgs) ]; - meta = { - broken = true; - }; - }; - split-sequence = { - pname = "split-sequence"; - version = "v2.0.1"; - asds = [ "split-sequence" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/split-sequence/2021-05-31/split-sequence-v2.0.1.tgz"; - sha256 = "172k7iv775kwism6304p6z7mqpjvipl57nq1bgvmbk445943fmhq"; - system = "split-sequence"; - asd = "split-sequence"; - }); - systems = [ "split-sequence" ]; - lispLibs = [ ]; - }; - split-sequence_slash_tests = { - pname = "split-sequence_tests"; - version = "v2.0.1"; - asds = [ "split-sequence" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/split-sequence/2021-05-31/split-sequence-v2.0.1.tgz"; - sha256 = "172k7iv775kwism6304p6z7mqpjvipl57nq1bgvmbk445943fmhq"; - system = "split-sequence"; - asd = "split-sequence"; - }); - systems = [ "split-sequence/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "split-sequence" pkgs) ]; - meta = { - broken = true; - }; - }; - sqlite = { - pname = "sqlite"; - version = "20190813-git"; - asds = [ "sqlite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz"; - sha256 = "08iv7b4m0hh7qx2cvq4f510nrgdld0vicnvmqsh9w0fgrcgmyg4k"; - system = "sqlite"; - asd = "sqlite"; - }); - systems = [ "sqlite" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "iterate" pkgs) ]; - }; - srfi-1 = { - pname = "srfi-1"; - version = "20200218-git"; - asds = [ "srfi-1" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/srfi-1/2020-02-18/srfi-1-20200218-git.tgz"; - sha256 = "00r2ikf1ck1zz3mx3jgk3plf3ibfhhrr8sc8hzr6ix34sbfvdadg"; - system = "srfi-1"; - asd = "srfi-1"; - }); - systems = [ "srfi-1" ]; - lispLibs = [ ]; - }; - srfi-1_dot_test = { - pname = "srfi-1.test"; - version = "20200218-git"; - asds = [ "srfi-1.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/srfi-1/2020-02-18/srfi-1-20200218-git.tgz"; - sha256 = "00r2ikf1ck1zz3mx3jgk3plf3ibfhhrr8sc8hzr6ix34sbfvdadg"; - system = "srfi-1.test"; - asd = "srfi-1"; - }); - systems = [ "srfi-1.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "srfi-1" pkgs) ]; - }; - srfi-23 = { - pname = "srfi-23"; - version = "20200218-git"; - asds = [ "srfi-23" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/srfi-23/2020-02-18/srfi-23-20200218-git.tgz"; - sha256 = "0hgq2bdpdjp550kk9xlrxh82n45ldb42j2zzhkndmffh4rp9hd13"; - system = "srfi-23"; - asd = "srfi-23"; - }); - systems = [ "srfi-23" ]; - lispLibs = [ ]; - }; - srfi-6 = { - pname = "srfi-6"; - version = "20200218-git"; - asds = [ "srfi-6" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/srfi-6/2020-02-18/srfi-6-20200218-git.tgz"; - sha256 = "1m9316r75haig84fhcrfm69gq0zfh5xqwqw8wsccc6z6vpz7pfwm"; - system = "srfi-6"; - asd = "srfi-6"; - }); - systems = [ "srfi-6" ]; - lispLibs = [ ]; - }; - srfi-98 = { - pname = "srfi-98"; - version = "20200218-git"; - asds = [ "srfi-98" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/srfi-98/2020-02-18/srfi-98-20200218-git.tgz"; - sha256 = "0qqa7c6nas85n8mdpmk996jh12xm0nf63nhj1chi9qkwgm924fj3"; - system = "srfi-98"; - asd = "srfi-98"; - }); - systems = [ "srfi-98" ]; - lispLibs = [ ]; - }; - srfi-98_dot_test = { - pname = "srfi-98.test"; - version = "20200218-git"; - asds = [ "srfi-98.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/srfi-98/2020-02-18/srfi-98-20200218-git.tgz"; - sha256 = "0qqa7c6nas85n8mdpmk996jh12xm0nf63nhj1chi9qkwgm924fj3"; - system = "srfi-98.test"; - asd = "srfi-98"; - }); - systems = [ "srfi-98.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "srfi-98" pkgs) ]; - }; - sse-client = { - pname = "sse-client"; - version = "20210807-git"; - asds = [ "sse-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; - sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl"; - system = "sse-client"; - asd = "sse-client"; - }); - systems = [ "sse-client" ]; - lispLibs = [ ]; - }; - sse-client-test = { - pname = "sse-client-test"; - version = "20210807-git"; - asds = [ "sse-client-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; - sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl"; - system = "sse-client-test"; - asd = "sse-client-test"; - }); - systems = [ "sse-client-test" ]; - lispLibs = [ (getAttr "sse-client" pkgs) (getAttr "fiveam" pkgs) (getAttr "trivial-escapes" pkgs) ]; - }; - sse-demo = { - pname = "sse-demo"; - version = "20210807-git"; - asds = [ "sse-demo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; - sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl"; - system = "sse-demo"; - asd = "sse-demo"; - }); - systems = [ "sse-demo" ]; - lispLibs = [ (getAttr "sse-server" pkgs) (getAttr "easy-routes" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "hunchentoot" pkgs) ]; - }; - sse-server = { - pname = "sse-server"; - version = "20210807-git"; - asds = [ "sse-server" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; - sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl"; - system = "sse-server"; - asd = "sse-server"; - }); - systems = [ "sse-server" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "trivial-escapes" pkgs) ]; - }; - sse-server-test = { - pname = "sse-server-test"; - version = "20210807-git"; - asds = [ "sse-server-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sse/2021-08-07/cl-sse-20210807-git.tgz"; - sha256 = "1by7xx397fyplxrydhfjm7nkxb6gmqh0h5f0rp4kh5dx45gk59gl"; - system = "sse-server-test"; - asd = "sse-server-test"; - }); - systems = [ "sse-server-test" ]; - lispLibs = [ (getAttr "sse-server" pkgs) (getAttr "fiveam" pkgs) (getAttr "trivial-escapes" pkgs) ]; - }; - st-json = { - pname = "st-json"; - version = "20210630-git"; - asds = [ "st-json" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/st-json/2021-06-30/st-json-20210630-git.tgz"; - sha256 = "06qrhr5iw73k96lai2x9w52l6gnmlxy7fsr0r35gz6nz1f71x7gx"; - system = "st-json"; - asd = "st-json"; - }); - systems = [ "st-json" ]; - lispLibs = [ ]; - }; - standard-cl = { - pname = "standard-cl"; - version = "20121125-git"; - asds = [ "standard-cl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-match/2012-11-25/cl-match-20121125-git.tgz"; - sha256 = "1qc8gzp7f4phgyi5whkxacrqzdqs0y1hvkf71m8n7l303jly9wjf"; - system = "standard-cl"; - asd = "standard-cl"; - }); - systems = [ "standard-cl" ]; - lispLibs = [ ]; - }; - staple = { - pname = "staple"; - version = "20221106-git"; - asds = [ "staple" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2022-11-06/staple-20221106-git.tgz"; - sha256 = "0igs9dfc3bkzzz3bkhr5pijy6bf13lhhi4vl12gydjmyhckirkkk"; - system = "staple"; - asd = "staple"; - }); - systems = [ "staple" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "clip" pkgs) (getAttr "definitions" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "language-codes" pkgs) (getAttr "pathname-utils" pkgs) (getAttr "staple-code-parser" pkgs) (getAttr "staple-package-recording" pkgs) ]; - }; - staple-code-parser = { - pname = "staple-code-parser"; - version = "20221106-git"; - asds = [ "staple-code-parser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2022-11-06/staple-20221106-git.tgz"; - sha256 = "0igs9dfc3bkzzz3bkhr5pijy6bf13lhhi4vl12gydjmyhckirkkk"; - system = "staple-code-parser"; - asd = "staple-code-parser"; - }); - systems = [ "staple-code-parser" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "concrete-syntax-tree" pkgs) (getAttr "concrete-syntax-tree-destructuring" pkgs) (getAttr "concrete-syntax-tree-lambda-list" pkgs) (getAttr "definitions" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "eclector" pkgs) (getAttr "eclector-concrete-syntax-tree" pkgs) ]; - }; - staple-markdown = { - pname = "staple-markdown"; - version = "20221106-git"; - asds = [ "staple-markdown" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2022-11-06/staple-20221106-git.tgz"; - sha256 = "0igs9dfc3bkzzz3bkhr5pijy6bf13lhhi4vl12gydjmyhckirkkk"; - system = "staple-markdown"; - asd = "staple-markdown"; - }); - systems = [ "staple-markdown" ]; - lispLibs = [ (getAttr "_3bmd" pkgs) (getAttr "_3bmd-ext-code-blocks" pkgs) (getAttr "staple" pkgs) ]; - }; - staple-markless = { - pname = "staple-markless"; - version = "20221106-git"; - asds = [ "staple-markless" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2022-11-06/staple-20221106-git.tgz"; - sha256 = "0igs9dfc3bkzzz3bkhr5pijy6bf13lhhi4vl12gydjmyhckirkkk"; - system = "staple-markless"; - asd = "staple-markless"; - }); - systems = [ "staple-markless" ]; - lispLibs = [ (getAttr "cl-markless-plump" pkgs) (getAttr "staple" pkgs) ]; - }; - staple-package-recording = { - pname = "staple-package-recording"; - version = "20221106-git"; - asds = [ "staple-package-recording" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2022-11-06/staple-20221106-git.tgz"; - sha256 = "0igs9dfc3bkzzz3bkhr5pijy6bf13lhhi4vl12gydjmyhckirkkk"; - system = "staple-package-recording"; - asd = "staple-package-recording"; - }); - systems = [ "staple-package-recording" ]; - lispLibs = [ ]; - }; - staple-restructured-text = { - pname = "staple-restructured-text"; - version = "20221106-git"; - asds = [ "staple-restructured-text" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2022-11-06/staple-20221106-git.tgz"; - sha256 = "0igs9dfc3bkzzz3bkhr5pijy6bf13lhhi4vl12gydjmyhckirkkk"; - system = "staple-restructured-text"; - asd = "staple-restructured-text"; - }); - systems = [ "staple-restructured-text" ]; - lispLibs = [ (getAttr "docutils" pkgs) (getAttr "staple" pkgs) ]; - }; - staple-server = { - pname = "staple-server"; - version = "20221106-git"; - asds = [ "staple-server" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/staple/2022-11-06/staple-20221106-git.tgz"; - sha256 = "0igs9dfc3bkzzz3bkhr5pijy6bf13lhhi4vl12gydjmyhckirkkk"; - system = "staple-server"; - asd = "staple-server"; - }); - systems = [ "staple-server" ]; - lispLibs = [ (getAttr "dissect" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "staple-markdown" pkgs) (getAttr "staple-markless" pkgs) ]; - }; - stars = { - pname = "stars"; - version = "20180831-git"; - asds = [ "stars" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sprint-stars/2018-08-31/sprint-stars-20180831-git.tgz"; - sha256 = "1pm6wvywfgy0vlb0b2lbybpvhw9xzyn1nlpy0wpcglxxig6mnrgi"; - system = "stars"; - asd = "stars"; - }); - systems = [ "stars" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "drakma" pkgs) (getAttr "xmls" pkgs) ]; - }; - static-dispatch = { - pname = "static-dispatch"; - version = "20211209-git"; - asds = [ "static-dispatch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/static-dispatch/2021-12-09/static-dispatch-20211209-git.tgz"; - sha256 = "1cishp7nckda5hav6c907axdfn1zpmzxpsy6hk7kkb69qn81yn2i"; - system = "static-dispatch"; - asd = "static-dispatch"; - }); - systems = [ "static-dispatch" ]; - lispLibs = [ (getAttr "agutil" pkgs) (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "arrows" pkgs) (getAttr "cl-environments" pkgs) (getAttr "cl-form-types" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "optima" pkgs) ]; - }; - static-dispatch_slash_test = { - pname = "static-dispatch_test"; - version = "20211209-git"; - asds = [ "static-dispatch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/static-dispatch/2021-12-09/static-dispatch-20211209-git.tgz"; - sha256 = "1cishp7nckda5hav6c907axdfn1zpmzxpsy6hk7kkb69qn81yn2i"; - system = "static-dispatch"; - asd = "static-dispatch"; - }); - systems = [ "static-dispatch/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "static-dispatch" pkgs) ]; - meta = { - broken = true; - }; - }; - static-vectors = { - pname = "static-vectors"; - version = "v1.8.9"; - asds = [ "static-vectors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/static-vectors/2021-06-30/static-vectors-v1.8.9.tgz"; - sha256 = "079qa20lhanzsz1qf4iags91n0ziylbjgbcymm5a5qj7yryas4fw"; - system = "static-vectors"; - asd = "static-vectors"; - }); - systems = [ "static-vectors" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - static-vectors_slash_test = { - pname = "static-vectors_test"; - version = "v1.8.9"; - asds = [ "static-vectors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/static-vectors/2021-06-30/static-vectors-v1.8.9.tgz"; - sha256 = "079qa20lhanzsz1qf4iags91n0ziylbjgbcymm5a5qj7yryas4fw"; - system = "static-vectors"; - asd = "static-vectors"; - }); - systems = [ "static-vectors/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "static-vectors" pkgs) ]; - meta = { - broken = true; - }; - }; - statistics = { - pname = "statistics"; - version = "20221106-git"; - asds = [ "statistics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/statistics/2022-11-06/statistics-20221106-git.tgz"; - sha256 = "135dk9fr1bny0hfpkg0g9s7f67gjf9f8ipx01q2is5iqmz24hy94"; - system = "statistics"; - asd = "statistics"; - }); - systems = [ "statistics" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "org_dot_tfeb_dot_conduit-packages" pkgs) (getAttr "distributions" pkgs) (getAttr "let-plus" pkgs) (getAttr "num-utils" pkgs) ]; - }; - statistics_slash_lh = { - pname = "statistics_lh"; - version = "20221106-git"; - asds = [ "statistics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/statistics/2022-11-06/statistics-20221106-git.tgz"; - sha256 = "135dk9fr1bny0hfpkg0g9s7f67gjf9f8ipx01q2is5iqmz24hy94"; - system = "statistics"; - asd = "statistics"; - }); - systems = [ "statistics/lh" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - statistics_slash_tests = { - pname = "statistics_tests"; - version = "20221106-git"; - asds = [ "statistics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/statistics/2022-11-06/statistics-20221106-git.tgz"; - sha256 = "135dk9fr1bny0hfpkg0g9s7f67gjf9f8ipx01q2is5iqmz24hy94"; - system = "statistics"; - asd = "statistics"; - }); - systems = [ "statistics/tests" ]; - lispLibs = [ (getAttr "clunit2" pkgs) (getAttr "num-utils" pkgs) (getAttr "statistics" pkgs) ]; - meta = { - broken = true; - }; - }; - stdutils = { - pname = "stdutils"; - version = "20111001-git"; - asds = [ "stdutils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-stdutils/2011-10-01/cl-stdutils-20111001-git.tgz"; - sha256 = "16vxxphqdq8264x0aanm36x9r6d3ci1gjf4vf46mwl59gcff4wcj"; - system = "stdutils"; - asd = "stdutils"; - }); - systems = [ "stdutils" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - stealth-mixin = { - pname = "stealth-mixin"; - version = "20211020-git"; - asds = [ "stealth-mixin" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stealth-mixin/2021-10-20/stealth-mixin-20211020-git.tgz"; - sha256 = "0ar9cdmbmdnqz1ywpw34n47hlh0vqmb6pl76f5vbfgip3c81xwyi"; - system = "stealth-mixin"; - asd = "stealth-mixin"; - }); - systems = [ "stealth-mixin" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - stefil = { - pname = "stefil"; - version = "20181210-git"; - asds = [ "stefil" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz"; - sha256 = "0bqz64q2szzhf91zyqyssmvrz7da6442rs01808pf3wrdq28bclh"; - system = "stefil"; - asd = "stefil"; - }); - systems = [ "stefil" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "swank" pkgs) ]; - }; - stefil_plus = { - pname = "stefil+"; - version = "20211209-git"; - asds = [ "stefil+" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stefil-/2021-12-09/stefil--20211209-git.tgz"; - sha256 = "039jjhcb3ka6vag39hz5v1bi81x444rqj6rb3np5qbm07dh1aij0"; - system = "stefil+"; - asd = "stefil+"; - }); - systems = [ "stefil+" ]; - lispLibs = [ (getAttr "asdf-package-system" pkgs) (getAttr "gt" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "stefil" pkgs) ]; - }; - stefil-test = { - pname = "stefil-test"; - version = "20181210-git"; - asds = [ "stefil-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz"; - sha256 = "0bqz64q2szzhf91zyqyssmvrz7da6442rs01808pf3wrdq28bclh"; - system = "stefil-test"; - asd = "stefil"; - }); - systems = [ "stefil-test" ]; - lispLibs = [ (getAttr "stefil" pkgs) ]; - }; - stem = { - pname = "stem"; - version = "20150608-git"; - asds = [ "stem" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stem/2015-06-08/stem-20150608-git.tgz"; - sha256 = "0a2kr09c3qcwg16n8rm15qgy5p9l6z4m72jray0846hqbnji77mp"; - system = "stem"; - asd = "stem"; - }); - systems = [ "stem" ]; - lispLibs = [ ]; - }; - stepster = { - pname = "stepster"; - version = "20221106-git"; - asds = [ "stepster" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stepster/2022-11-06/stepster-20221106-git.tgz"; - sha256 = "1891b5n4b5pnms90q7d3iaaxdw11fzd4b97mgawx2mh5kmwjvl47"; - system = "stepster"; - asd = "stepster"; - }); - systems = [ "stepster" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-reexport" pkgs) (getAttr "clss" pkgs) (getAttr "dexador" pkgs) (getAttr "jonathan" pkgs) (getAttr "plump" pkgs) ]; - }; - stl = { - pname = "stl"; - version = "20171019-git"; - asds = [ "stl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stl/2017-10-19/stl-20171019-git.tgz"; - sha256 = "12v11bsarlnx5k930gx116wbgv41kwm45ysdikq3am4x3lqsjz2n"; - system = "stl"; - asd = "stl"; - }); - systems = [ "stl" ]; - lispLibs = [ (getAttr "_3d-vectors" pkgs) ]; - }; - stmx = { - pname = "stmx"; - version = "stable-49eef1d5-git"; - asds = [ "stmx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stmx/2020-12-20/stmx-stable-49eef1d5-git.tgz"; - sha256 = "0pqh8yp3aqyk1sx3y8zinhrimq9rzizn7v5vsqfgj84xcv3qgybr"; - system = "stmx"; - asd = "stmx"; - }); - systems = [ "stmx" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "closer-mop" pkgs) (getAttr "log4cl" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - stmx_dot_test = { - pname = "stmx.test"; - version = "stable-49eef1d5-git"; - asds = [ "stmx.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stmx/2020-12-20/stmx-stable-49eef1d5-git.tgz"; - sha256 = "0pqh8yp3aqyk1sx3y8zinhrimq9rzizn7v5vsqfgj84xcv3qgybr"; - system = "stmx.test"; - asd = "stmx.test"; - }); - systems = [ "stmx.test" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "fiveam" pkgs) (getAttr "log4cl" pkgs) (getAttr "stmx" pkgs) ]; - }; - str = { - pname = "str"; - version = "20221106-git"; - asds = [ "str" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-str/2022-11-06/cl-str-20221106-git.tgz"; - sha256 = "072im185fmm01ddkfx920g1nm8z2ndw24drf808kn32dw51wjjda"; - system = "str"; - asd = "str"; - }); - systems = [ "str" ]; - lispLibs = [ (getAttr "cl-change-case" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-ppcre-unicode" pkgs) ]; - }; - str_dot_test = { - pname = "str.test"; - version = "20221106-git"; - asds = [ "str.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-str/2022-11-06/cl-str-20221106-git.tgz"; - sha256 = "072im185fmm01ddkfx920g1nm8z2ndw24drf808kn32dw51wjjda"; - system = "str.test"; - asd = "str.test"; - }); - systems = [ "str.test" ]; - lispLibs = [ (getAttr "str" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - strict-function = { - pname = "strict-function"; - version = "20211020-git"; - asds = [ "strict-function" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/strict-function/2021-10-20/strict-function-20211020-git.tgz"; - sha256 = "176l5024qa72my7wiag0w6mmwys1q4yk6b4n944378qbqr2zpq2a"; - system = "strict-function"; - asd = "strict-function"; - }); - systems = [ "strict-function" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "trivia" pkgs) ]; - }; - strict-function_slash_test = { - pname = "strict-function_test"; - version = "20211020-git"; - asds = [ "strict-function" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/strict-function/2021-10-20/strict-function-20211020-git.tgz"; - sha256 = "176l5024qa72my7wiag0w6mmwys1q4yk6b4n944378qbqr2zpq2a"; - system = "strict-function"; - asd = "strict-function"; - }); - systems = [ "strict-function/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "rove" pkgs) (getAttr "strict-function" pkgs) ]; - meta = { - broken = true; - }; - }; - string-case = { - pname = "string-case"; - version = "20180711-git"; - asds = [ "string-case" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz"; - sha256 = "1n5i3yh0h5s636rcnwn7jwqy3rjflikra04lymimhpcshhjsk0md"; - system = "string-case"; - asd = "string-case"; - }); - systems = [ "string-case" ]; - lispLibs = [ ]; - }; - string-escape = { - pname = "string-escape"; - version = "20150407-http"; - asds = [ "string-escape" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/string-escape/2015-04-07/string-escape-20150407-http.tgz"; - sha256 = "0r7b699332hy3qj17jax9jdhq4jx6rbw5xf0j43bwg79wddk0rq3"; - system = "string-escape"; - asd = "string-escape"; - }); - systems = [ "string-escape" ]; - lispLibs = [ ]; - }; - stripe = { - pname = "stripe"; - version = "20220707-git"; - asds = [ "stripe" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stripe/2022-07-07/stripe-20220707-git.tgz"; - sha256 = "1n9lv9yixzampf986vkspspr7mrvpsz2l5h919agc52hkv9wg2f7"; - system = "stripe"; - asd = "stripe"; - }); - systems = [ "stripe" ]; - lispLibs = [ (getAttr "dexador" pkgs) (getAttr "local-time" pkgs) (getAttr "mfiano-utils" pkgs) (getAttr "yason" pkgs) ]; - }; - stripe-against-the-modern-world = { - pname = "stripe-against-the-modern-world"; - version = "20221106-git"; - asds = [ "stripe-against-the-modern-world" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stripe-against-the-modern-world/2022-11-06/stripe-against-the-modern-world-20221106-git.tgz"; - sha256 = "1qp714y7b7vfdafirlphk02gixa4jffs0xgcy96fncxs6r2zq3q9"; - system = "stripe-against-the-modern-world"; - asd = "stripe-against-the-modern-world"; - }); - systems = [ "stripe-against-the-modern-world" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "str" pkgs) (getAttr "closer-mop" pkgs) (getAttr "dexador" pkgs) (getAttr "do-urlencode" pkgs) (getAttr "ironclad" pkgs) (getAttr "jonathan" pkgs) (getAttr "local-time" pkgs) (getAttr "ningle" pkgs) ]; - }; - structure-ext = { - pname = "structure-ext"; - version = "20211209-git"; - asds = [ "structure-ext" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; - sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; - system = "structure-ext"; - asd = "structure-ext"; - }); - systems = [ "structure-ext" ]; - lispLibs = [ (getAttr "structure-ext_dot_as-class" pkgs) (getAttr "structure-ext_dot_left-arrow-accessors" pkgs) (getAttr "structure-ext_dot_make-instance" pkgs) ]; - }; - structure-ext_dot_as-class = { - pname = "structure-ext.as-class"; - version = "20211209-git"; - asds = [ "structure-ext.as-class" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; - sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; - system = "structure-ext.as-class"; - asd = "structure-ext.as-class"; - }); - systems = [ "structure-ext.as-class" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "lambda-fiddle" pkgs) (getAttr "uiop" pkgs) ]; - }; - structure-ext_dot_as-class_dot_test = { - pname = "structure-ext.as-class.test"; - version = "20211209-git"; - asds = [ "structure-ext.as-class.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; - sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; - system = "structure-ext.as-class.test"; - asd = "structure-ext.as-class.test"; - }); - systems = [ "structure-ext.as-class.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "structure-ext_dot_as-class" pkgs) ]; - }; - structure-ext_dot_left-arrow-accessors = { - pname = "structure-ext.left-arrow-accessors"; - version = "20211209-git"; - asds = [ "structure-ext.left-arrow-accessors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; - sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; - system = "structure-ext.left-arrow-accessors"; - asd = "structure-ext.left-arrow-accessors"; - }); - systems = [ "structure-ext.left-arrow-accessors" ]; - lispLibs = [ (getAttr "jingoh_dot_documentizer" pkgs) ]; - }; - structure-ext_dot_left-arrow-accessors_dot_test = { - pname = "structure-ext.left-arrow-accessors.test"; - version = "20211209-git"; - asds = [ "structure-ext.left-arrow-accessors.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; - sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; - system = "structure-ext.left-arrow-accessors.test"; - asd = "structure-ext.left-arrow-accessors.test"; - }); - systems = [ "structure-ext.left-arrow-accessors.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "structure-ext_dot_left-arrow-accessors" pkgs) ]; - }; - structure-ext_dot_make-instance = { - pname = "structure-ext.make-instance"; - version = "20211209-git"; - asds = [ "structure-ext.make-instance" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; - sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; - system = "structure-ext.make-instance"; - asd = "structure-ext.make-instance"; - }); - systems = [ "structure-ext.make-instance" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) ]; - }; - structure-ext_dot_make-instance_dot_test = { - pname = "structure-ext.make-instance.test"; - version = "20211209-git"; - asds = [ "structure-ext.make-instance.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/structure-ext/2021-12-09/structure-ext-20211209-git.tgz"; - sha256 = "1qhny1m0r2s9bkhr9z7psczykknmb62c32bwav4hgqm96rna1pkq"; - system = "structure-ext.make-instance.test"; - asd = "structure-ext.make-instance.test"; - }); - systems = [ "structure-ext.make-instance.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "structure-ext_dot_make-instance" pkgs) ]; - }; - structy-defclass = { - pname = "structy-defclass"; - version = "20170630-git"; - asds = [ "structy-defclass" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/structy-defclass/2017-06-30/structy-defclass-20170630-git.tgz"; - sha256 = "0fdlj45xzyghmg65dvs7ww7dxji84iid2y6rh9j77aip7v0l5q63"; - system = "structy-defclass"; - asd = "structy-defclass"; - }); - systems = [ "structy-defclass" ]; - lispLibs = [ ]; - }; - studio-client = { - pname = "studio-client"; - version = "20210228-git"; - asds = [ "studio-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/studio-client/2021-02-28/studio-client-20210228-git.tgz"; - sha256 = "0rlvp1pm1ryjwnc4zl92p0nh53iy9hqrim13pi9mjcrdaqfi5qsk"; - system = "studio-client"; - asd = "studio-client"; - }); - systems = [ "studio-client" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "north-core" pkgs) (getAttr "yason" pkgs) ]; - }; - stumpwm = { - pname = "stumpwm"; - version = "20221106-git"; - asds = [ "stumpwm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stumpwm/2022-11-06/stumpwm-20221106-git.tgz"; - sha256 = "0gvr136fv5zs61017gns3kbkz00837n0b52fif9vany5fslx3aj2"; - system = "stumpwm"; - asd = "stumpwm"; - }); - systems = [ "stumpwm" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "clx" pkgs) (getAttr "dynamic-mixins" pkgs) ]; - }; - stumpwm-dynamic-float = { - pname = "stumpwm-dynamic-float"; - version = "20221106-git"; - asds = [ "stumpwm-dynamic-float" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stumpwm-dynamic-float/2022-11-06/stumpwm-dynamic-float-20221106-git.tgz"; - sha256 = "13m9864vfj4b5b0hlvp7jrb96368rxr5ydjsdqldky10yad7icxf"; - system = "stumpwm-dynamic-float"; - asd = "stumpwm-dynamic-float"; - }); - systems = [ "stumpwm-dynamic-float" ]; - lispLibs = [ (getAttr "stumpwm" pkgs) ]; - }; - stumpwm-sndioctl = { - pname = "stumpwm-sndioctl"; - version = "20210531-git"; - asds = [ "stumpwm-sndioctl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stumpwm-sndioctl/2021-05-31/stumpwm-sndioctl-20210531-git.tgz"; - sha256 = "1q4w4grim7izvw01k95wh7bbaaq0hz2ljjhn47nyd7pzrk9dabpv"; - system = "stumpwm-sndioctl"; - asd = "stumpwm-sndioctl"; - }); - systems = [ "stumpwm-sndioctl" ]; - lispLibs = [ (getAttr "stumpwm" pkgs) ]; - }; - stumpwm-tests = { - pname = "stumpwm-tests"; - version = "20221106-git"; - asds = [ "stumpwm-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stumpwm/2022-11-06/stumpwm-20221106-git.tgz"; - sha256 = "0gvr136fv5zs61017gns3kbkz00837n0b52fif9vany5fslx3aj2"; - system = "stumpwm-tests"; - asd = "stumpwm-tests"; - }); - systems = [ "stumpwm-tests" ]; - lispLibs = [ (getAttr "fiasco" pkgs) (getAttr "stumpwm" pkgs) ]; - }; - stumpwm_slash_build = { - pname = "stumpwm_build"; - version = "20221106-git"; - asds = [ "stumpwm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/stumpwm/2022-11-06/stumpwm-20221106-git.tgz"; - sha256 = "0gvr136fv5zs61017gns3kbkz00837n0b52fif9vany5fslx3aj2"; - system = "stumpwm"; - asd = "stumpwm"; - }); - systems = [ "stumpwm/build" ]; - lispLibs = [ (getAttr "stumpwm" pkgs) ]; - meta = { - broken = true; - }; - }; - sucle = { - pname = "sucle"; - version = "20200427-git"; - asds = [ "sucle" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "sucle"; - asd = "sucle"; - }); - systems = [ "sucle" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "black-tie" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "livesupport" pkgs) (getAttr "aabbcc" pkgs) (getAttr "application" pkgs) (getAttr "camera-matrix" pkgs) (getAttr "control" pkgs) (getAttr "crud" pkgs) (getAttr "fps-independent-timestep" pkgs) (getAttr "glhelp" pkgs) (getAttr "image-utility" pkgs) (getAttr "ncurses-clone-for-lem" pkgs) (getAttr "nsb-cga" pkgs) (getAttr "quads" pkgs) (getAttr "scratch-buffer" pkgs) (getAttr "sucle-multiprocessing" pkgs) (getAttr "sucle-temp" pkgs) (getAttr "text-subsystem" pkgs) (getAttr "uncommon-lisp" pkgs) (getAttr "utility" pkgs) ]; - }; - sucle-multiprocessing = { - pname = "sucle-multiprocessing"; - version = "20200427-git"; - asds = [ "sucle-multiprocessing" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "sucle-multiprocessing"; - asd = "sucle-multiprocessing"; - }); - systems = [ "sucle-multiprocessing" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-cpus" pkgs) (getAttr "lparallel" pkgs) (getAttr "uncommon-lisp" pkgs) (getAttr "utility" pkgs) ]; - }; - sucle-serialize = { - pname = "sucle-serialize"; - version = "20200427-git"; - asds = [ "sucle-serialize" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "sucle-serialize"; - asd = "sucle-serialize"; - }); - systems = [ "sucle-serialize" ]; - lispLibs = [ (getAttr "chipz" pkgs) (getAttr "cl-conspack" pkgs) (getAttr "salza2" pkgs) ]; - }; - sucle-temp = { - pname = "sucle-temp"; - version = "20200427-git"; - asds = [ "sucle-temp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "sucle-temp"; - asd = "sucle-temp"; - }); - systems = [ "sucle-temp" ]; - lispLibs = [ ]; - }; - sucle-test = { - pname = "sucle-test"; - version = "20200427-git"; - asds = [ "sucle-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "sucle-test"; - asd = "sucle-test"; - }); - systems = [ "sucle-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-opengl" pkgs) (getAttr "aabbcc" pkgs) (getAttr "application" pkgs) (getAttr "camera-matrix" pkgs) (getAttr "character-modifier-bits" pkgs) (getAttr "control" pkgs) (getAttr "deflazy" pkgs) (getAttr "fps-independent-timestep" pkgs) (getAttr "image-utility" pkgs) (getAttr "ncurses-clone-for-lem" pkgs) (getAttr "nsb-cga" pkgs) (getAttr "quads" pkgs) (getAttr "scratch-buffer" pkgs) (getAttr "sucle" pkgs) (getAttr "sucle-multiprocessing" pkgs) (getAttr "sucle-serialize" pkgs) (getAttr "text-subsystem" pkgs) (getAttr "uncommon-lisp" pkgs) (getAttr "window" pkgs) ]; - }; - surf = { - pname = "surf"; - version = "master-1a957fb2-git"; - asds = [ "surf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "surf"; - asd = "surf"; - }); - systems = [ "surf" ]; - lispLibs = [ (getAttr "geom-base" pkgs) ]; - }; - swank = { - pname = "swank"; - version = "v2.27"; - asds = [ "swank" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/slime/2022-02-20/slime-v2.27.tgz"; - sha256 = "0wrq7s39lwca9wi01fj0wa2z6n0yyrv17c471kdkxxqppl4whi8m"; - system = "swank"; - asd = "swank"; - }); - systems = [ "swank" ]; - lispLibs = [ ]; - }; - swank-client = { - pname = "swank-client"; - version = "20201220-git"; - asds = [ "swank-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/swank-client/2020-12-20/swank-client-20201220-git.tgz"; - sha256 = "1rcm6fnp5v73wxsi04chdvy76jivf5ib4ghqc3qs85zy4hswcdlv"; - system = "swank-client"; - asd = "swank-client"; - }); - systems = [ "swank-client" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "com_dot_google_dot_base" pkgs) (getAttr "swank" pkgs) (getAttr "usocket" pkgs) ]; - }; - swank-client_slash_test = { - pname = "swank-client_test"; - version = "20201220-git"; - asds = [ "swank-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/swank-client/2020-12-20/swank-client-20201220-git.tgz"; - sha256 = "1rcm6fnp5v73wxsi04chdvy76jivf5ib4ghqc3qs85zy4hswcdlv"; - system = "swank-client"; - asd = "swank-client"; - }); - systems = [ "swank-client/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "swank-client" pkgs) ]; - meta = { - broken = true; - }; - }; - swank-crew = { - pname = "swank-crew"; - version = "20200610-git"; - asds = [ "swank-crew" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/swank-crew/2020-06-10/swank-crew-20200610-git.tgz"; - sha256 = "0gfdkq4c1zzgkpxinfws9k9n6igisj6lmzz6n195m3g4kahx1nq4"; - system = "swank-crew"; - asd = "swank-crew"; - }); - systems = [ "swank-crew" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "com_dot_google_dot_base" pkgs) (getAttr "swank-client" pkgs) ]; - }; - swank-crew_slash_test = { - pname = "swank-crew_test"; - version = "20200610-git"; - asds = [ "swank-crew" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/swank-crew/2020-06-10/swank-crew-20200610-git.tgz"; - sha256 = "0gfdkq4c1zzgkpxinfws9k9n6igisj6lmzz6n195m3g4kahx1nq4"; - system = "swank-crew"; - asd = "swank-crew"; - }); - systems = [ "swank-crew/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "swank-crew" pkgs) ]; - meta = { - broken = true; - }; - }; - swank-protocol = { - pname = "swank-protocol"; - version = "20211020-git"; - asds = [ "swank-protocol" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/swank-protocol/2021-10-20/swank-protocol-20211020-git.tgz"; - sha256 = "1c6cbkvcy3k56pkq5nlnj5m0zwkgbbrhfs1igwkr89xal2a4fz56"; - system = "swank-protocol"; - asd = "swank-protocol"; - }); - systems = [ "swank-protocol" ]; - lispLibs = [ (getAttr "swank" pkgs) (getAttr "usocket" pkgs) ]; - }; - swank_dot_live = { - pname = "swank.live"; - version = "20160208-git"; - asds = [ "swank.live" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/swank.live/2016-02-08/swank.live-20160208-git.tgz"; - sha256 = "0p7jyf07symfan6lmbhd3r42kf5vrsbmmh9li0n1kky8rd6fhgls"; - system = "swank.live"; - asd = "swank.live"; - }); - systems = [ "swank.live" ]; - lispLibs = [ (getAttr "swank" pkgs) ]; - }; - swap-bytes = { - pname = "swap-bytes"; - version = "v1.2"; - asds = [ "swap-bytes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz"; - sha256 = "1hw1v1lw26rifyznpnj1csphha9jgzwpiic16ni3pvs6hcsni9rz"; - system = "swap-bytes"; - asd = "swap-bytes"; - }); - systems = [ "swap-bytes" ]; - lispLibs = [ (getAttr "trivial-features" pkgs) ]; - }; - swap-bytes_slash_test = { - pname = "swap-bytes_test"; - version = "v1.2"; - asds = [ "swap-bytes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz"; - sha256 = "1hw1v1lw26rifyznpnj1csphha9jgzwpiic16ni3pvs6hcsni9rz"; - system = "swap-bytes"; - asd = "swap-bytes"; - }); - systems = [ "swap-bytes/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "swap-bytes" pkgs) ]; - meta = { - broken = true; - }; - }; - sxql = { - pname = "sxql"; - version = "20210630-git"; - asds = [ "sxql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sxql/2021-06-30/sxql-20210630-git.tgz"; - sha256 = "011an993amy8q3gl4hyqrgnc93cgny3cv9gbp679rrmyyp8zmywr"; - system = "sxql"; - asd = "sxql"; - }); - systems = [ "sxql" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-package-locks" pkgs) (getAttr "cl-syntax-annot" pkgs) (getAttr "iterate" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - sxql-composer = { - pname = "sxql-composer"; - version = "20200325-git"; - asds = [ "sxql-composer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sxql-composer/2020-03-25/sxql-composer-20200325-git.tgz"; - sha256 = "1agkrj3ymskzc3c7pxbrj123d1kygjqcls145m0ap3i07q96hh1r"; - system = "sxql-composer"; - asd = "sxql-composer"; - }); - systems = [ "sxql-composer" ]; - lispLibs = [ (getAttr "sxql" pkgs) ]; - }; - sxql-test = { - pname = "sxql-test"; - version = "20210630-git"; - asds = [ "sxql-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sxql/2021-06-30/sxql-20210630-git.tgz"; - sha256 = "011an993amy8q3gl4hyqrgnc93cgny3cv9gbp679rrmyyp8zmywr"; - system = "sxql-test"; - asd = "sxql-test"; - }); - systems = [ "sxql-test" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "sxql" pkgs) ]; - }; - sycamore = { - pname = "sycamore"; - version = "20211020-git"; - asds = [ "sycamore" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sycamore/2021-10-20/sycamore-20211020-git.tgz"; - sha256 = "0icw7fba1ch51w24f4sinvy4xg3zc7zif0aqcjfrzxj14x108hai"; - system = "sycamore"; - asd = "sycamore"; - }); - systems = [ "sycamore" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-fuzz" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - symbol-munger = { - pname = "symbol-munger"; - version = "20220220-git"; - asds = [ "symbol-munger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/symbol-munger/2022-02-20/symbol-munger-20220220-git.tgz"; - sha256 = "16fshnxp9212503z1vjlmx5pafv14bzpihn486x1ljakqjigfnfz"; - system = "symbol-munger"; - asd = "symbol-munger"; - }); - systems = [ "symbol-munger" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) ]; - }; - symbol-munger_slash_test = { - pname = "symbol-munger_test"; - version = "20220220-git"; - asds = [ "symbol-munger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/symbol-munger/2022-02-20/symbol-munger-20220220-git.tgz"; - sha256 = "16fshnxp9212503z1vjlmx5pafv14bzpihn486x1ljakqjigfnfz"; - system = "symbol-munger"; - asd = "symbol-munger"; - }); - systems = [ "symbol-munger/test" ]; - lispLibs = [ (getAttr "lisp-unit2" pkgs) (getAttr "symbol-munger" pkgs) ]; - meta = { - broken = true; - }; - }; - symbol-namespaces = { - pname = "symbol-namespaces"; - version = "1.0"; - asds = [ "symbol-namespaces" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/symbol-namespaces/2013-01-28/symbol-namespaces-1.0.tgz"; - sha256 = "0rw4ndhg669rkpjmv5n0zh69bzar60zn3bb4vs5ijgvxyl5f7xp1"; - system = "symbol-namespaces"; - asd = "symbol-namespaces"; - }); - systems = [ "symbol-namespaces" ]; - lispLibs = [ (getAttr "map-bind" pkgs) ]; - }; - synonyms = { - pname = "synonyms"; - version = "20190307-hg"; - asds = [ "synonyms" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/synonyms/2019-03-07/synonyms-20190307-hg.tgz"; - sha256 = "11vlyal1pmr1mylnzjcffzvsnvhq0d3pnhm8dd158na9b7ingcrc"; - system = "synonyms"; - asd = "synonyms"; - }); - systems = [ "synonyms" ]; - lispLibs = [ ]; - }; - sysexits = { - pname = "sysexits"; - version = "20220707-git"; - asds = [ "sysexits" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-sysexits/2022-07-07/cl-sysexits-20220707-git.tgz"; - sha256 = "1khkj0qqvmgylnvl32sks8v3iabasbcr9sj9zl89xh3rajc67z73"; - system = "sysexits"; - asd = "sysexits"; - }); - systems = [ "sysexits" ]; - lispLibs = [ ]; - }; - system-locale = { - pname = "system-locale"; - version = "20200610-git"; - asds = [ "system-locale" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/system-locale/2020-06-10/system-locale-20200610-git.tgz"; - sha256 = "00p5c053kmgq4ks6l9mxsqz6g3bjcybvkvj0bh3r90qgpkaawm1p"; - system = "system-locale"; - asd = "system-locale"; - }); - systems = [ "system-locale" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - t-clack-handler-fcgi = { - pname = "t-clack-handler-fcgi"; - version = "20221106-git"; - asds = [ "t-clack-handler-fcgi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2022-11-06/clack-20221106-git.tgz"; - sha256 = "1vg61xfgch7lqm15kz8yr5qhqz2507qg88iqpa52mddwg91yamny"; - system = "t-clack-handler-fcgi"; - asd = "t-clack-handler-fcgi"; - }); - systems = [ "t-clack-handler-fcgi" ]; - lispLibs = [ (getAttr "clack-test" pkgs) ]; - }; - t-clack-handler-hunchentoot = { - pname = "t-clack-handler-hunchentoot"; - version = "20221106-git"; - asds = [ "t-clack-handler-hunchentoot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2022-11-06/clack-20221106-git.tgz"; - sha256 = "1vg61xfgch7lqm15kz8yr5qhqz2507qg88iqpa52mddwg91yamny"; - system = "t-clack-handler-hunchentoot"; - asd = "t-clack-handler-hunchentoot"; - }); - systems = [ "t-clack-handler-hunchentoot" ]; - lispLibs = [ (getAttr "clack-handler-hunchentoot" pkgs) (getAttr "clack-test" pkgs) ]; - }; - t-clack-handler-toot = { - pname = "t-clack-handler-toot"; - version = "20221106-git"; - asds = [ "t-clack-handler-toot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2022-11-06/clack-20221106-git.tgz"; - sha256 = "1vg61xfgch7lqm15kz8yr5qhqz2507qg88iqpa52mddwg91yamny"; - system = "t-clack-handler-toot"; - asd = "t-clack-handler-toot"; - }); - systems = [ "t-clack-handler-toot" ]; - lispLibs = [ (getAttr "clack-handler-toot" pkgs) (getAttr "clack-test" pkgs) ]; - }; - t-clack-handler-wookie = { - pname = "t-clack-handler-wookie"; - version = "20221106-git"; - asds = [ "t-clack-handler-wookie" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clack/2022-11-06/clack-20221106-git.tgz"; - sha256 = "1vg61xfgch7lqm15kz8yr5qhqz2507qg88iqpa52mddwg91yamny"; - system = "t-clack-handler-wookie"; - asd = "t-clack-handler-wookie"; - }); - systems = [ "t-clack-handler-wookie" ]; - lispLibs = [ (getAttr "clack-test" pkgs) ]; - }; - t-lack = { - pname = "t-lack"; - version = "20221106-git"; - asds = [ "t-lack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "t-lack"; - asd = "t-lack"; - }); - systems = [ "t-lack" ]; - lispLibs = [ (getAttr "clack" pkgs) (getAttr "lack" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - t-lack-component = { - pname = "t-lack-component"; - version = "20221106-git"; - asds = [ "t-lack-component" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "t-lack-component"; - asd = "t-lack-component"; - }); - systems = [ "t-lack-component" ]; - lispLibs = [ (getAttr "lack-component" pkgs) (getAttr "lack-test" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - t-lack-middleware-accesslog = { - pname = "t-lack-middleware-accesslog"; - version = "20221106-git"; - asds = [ "t-lack-middleware-accesslog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "t-lack-middleware-accesslog"; - asd = "t-lack-middleware-accesslog"; - }); - systems = [ "t-lack-middleware-accesslog" ]; - lispLibs = [ (getAttr "lack" pkgs) (getAttr "lack-test" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - t-lack-middleware-auth-basic = { - pname = "t-lack-middleware-auth-basic"; - version = "20221106-git"; - asds = [ "t-lack-middleware-auth-basic" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "t-lack-middleware-auth-basic"; - asd = "t-lack-middleware-auth-basic"; - }); - systems = [ "t-lack-middleware-auth-basic" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-base64" pkgs) (getAttr "lack" pkgs) (getAttr "lack-middleware-auth-basic" pkgs) (getAttr "lack-test" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - t-lack-middleware-backtrace = { - pname = "t-lack-middleware-backtrace"; - version = "20221106-git"; - asds = [ "t-lack-middleware-backtrace" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "t-lack-middleware-backtrace"; - asd = "t-lack-middleware-backtrace"; - }); - systems = [ "t-lack-middleware-backtrace" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "lack" pkgs) (getAttr "lack-test" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - t-lack-middleware-csrf = { - pname = "t-lack-middleware-csrf"; - version = "20221106-git"; - asds = [ "t-lack-middleware-csrf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "t-lack-middleware-csrf"; - asd = "t-lack-middleware-csrf"; - }); - systems = [ "t-lack-middleware-csrf" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "lack" pkgs) (getAttr "lack-middleware-csrf" pkgs) (getAttr "lack-request" pkgs) (getAttr "lack-test" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - t-lack-middleware-mount = { - pname = "t-lack-middleware-mount"; - version = "20221106-git"; - asds = [ "t-lack-middleware-mount" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "t-lack-middleware-mount"; - asd = "t-lack-middleware-mount"; - }); - systems = [ "t-lack-middleware-mount" ]; - lispLibs = [ (getAttr "lack" pkgs) (getAttr "lack-component" pkgs) (getAttr "lack-middleware-mount" pkgs) (getAttr "lack-test" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - t-lack-middleware-session = { - pname = "t-lack-middleware-session"; - version = "20221106-git"; - asds = [ "t-lack-middleware-session" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "t-lack-middleware-session"; - asd = "t-lack-middleware-session"; - }); - systems = [ "t-lack-middleware-session" ]; - lispLibs = [ (getAttr "cl-cookie" pkgs) (getAttr "lack" pkgs) (getAttr "lack-middleware-session" pkgs) (getAttr "lack-test" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - t-lack-middleware-static = { - pname = "t-lack-middleware-static"; - version = "20221106-git"; - asds = [ "t-lack-middleware-static" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "t-lack-middleware-static"; - asd = "t-lack-middleware-static"; - }); - systems = [ "t-lack-middleware-static" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "lack" pkgs) (getAttr "lack-test" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - t-lack-request = { - pname = "t-lack-request"; - version = "20221106-git"; - asds = [ "t-lack-request" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "t-lack-request"; - asd = "t-lack-request"; - }); - systems = [ "t-lack-request" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "clack-test" pkgs) (getAttr "dexador" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "lack-request" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - t-lack-session-store-dbi = { - pname = "t-lack-session-store-dbi"; - version = "20221106-git"; - asds = [ "t-lack-session-store-dbi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "t-lack-session-store-dbi"; - asd = "t-lack-session-store-dbi"; - }); - systems = [ "t-lack-session-store-dbi" ]; - lispLibs = [ (getAttr "dbi" pkgs) (getAttr "sqlite" pkgs) (getAttr "lack" pkgs) (getAttr "lack-session-store-dbi" pkgs) (getAttr "lack-test" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - t-lack-session-store-redis = { - pname = "t-lack-session-store-redis"; - version = "20221106-git"; - asds = [ "t-lack-session-store-redis" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "t-lack-session-store-redis"; - asd = "t-lack-session-store-redis"; - }); - systems = [ "t-lack-session-store-redis" ]; - lispLibs = [ (getAttr "lack" pkgs) (getAttr "lack-session-store-redis" pkgs) (getAttr "lack-test" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - t-lack-util = { - pname = "t-lack-util"; - version = "20221106-git"; - asds = [ "t-lack-util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lack/2022-11-06/lack-20221106-git.tgz"; - sha256 = "0yx5z4xr1pcd2g36f1jhyyaisr2p1ys1a9d7hxyigj31lq1dl9jw"; - system = "t-lack-util"; - asd = "t-lack-util"; - }); - systems = [ "t-lack-util" ]; - lispLibs = [ (getAttr "lack-test" pkgs) (getAttr "lack-util" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - ta2 = { - pname = "ta2"; - version = "master-1a957fb2-git"; - asds = [ "ta2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "ta2"; - asd = "ta2"; - }); - systems = [ "ta2" ]; - lispLibs = [ (getAttr "gwl-graphics" pkgs) ]; - }; - tagger = { - pname = "tagger"; - version = "20200715-git"; - asds = [ "tagger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tagger/2020-07-15/tagger-20200715-git.tgz"; - sha256 = "1mxkr5hx8p4rxc7vajgrpl49zh018wyspvww5fg50164if0n7j2q"; - system = "tagger"; - asd = "tagger"; - }); - systems = [ "tagger" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - taglib = { - pname = "taglib"; - version = "20210411-git"; - asds = [ "taglib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/taglib/2021-04-11/taglib-20210411-git.tgz"; - sha256 = "13291kb95hwb2nbkjscjb2abn5l267cjwspaqsmr3bsdvvf0033b"; - system = "taglib"; - asd = "taglib"; - }); - systems = [ "taglib" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "optima" pkgs) (getAttr "optima_dot_ppcre" pkgs) ]; - }; - taglib-tests = { - pname = "taglib-tests"; - version = "20210411-git"; - asds = [ "taglib-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/taglib/2021-04-11/taglib-20210411-git.tgz"; - sha256 = "13291kb95hwb2nbkjscjb2abn5l267cjwspaqsmr3bsdvvf0033b"; - system = "taglib-tests"; - asd = "taglib-tests"; - }); - systems = [ "taglib-tests" ]; - lispLibs = [ (getAttr "chanl" pkgs) (getAttr "cl-fad" pkgs) (getAttr "taglib" pkgs) ]; - }; - tailrec = { - pname = "tailrec"; - version = "20210807-git"; - asds = [ "tailrec" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tailrec/2021-08-07/tailrec-20210807-git.tgz"; - sha256 = "1h8m2npdzd2cpnl75pvv4yvvfwxa7kl6qvalc9s0y4yws0kaih3i"; - system = "tailrec"; - asd = "tailrec"; - }); - systems = [ "tailrec" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "trivial-macroexpand-all" pkgs) (getAttr "trivial-with-current-source-form" pkgs) ]; - }; - talcl = { - pname = "talcl"; - version = "20180228-git"; - asds = [ "talcl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz"; - sha256 = "18pm3vz82dwcckhp4lkwjv8431hkdj3ghxb4v5qdjsyw2jm56v1p"; - system = "talcl"; - asd = "talcl"; - }); - systems = [ "talcl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "buildnode" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cxml" pkgs) (getAttr "iterate" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - talcl-examples = { - pname = "talcl-examples"; - version = "20180228-git"; - asds = [ "talcl-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz"; - sha256 = "18pm3vz82dwcckhp4lkwjv8431hkdj3ghxb4v5qdjsyw2jm56v1p"; - system = "talcl-examples"; - asd = "talcl"; - }); - systems = [ "talcl-examples" ]; - lispLibs = [ (getAttr "buildnode-xhtml" pkgs) (getAttr "talcl" pkgs) ]; - }; - talcl-speed-tests = { - pname = "talcl-speed-tests"; - version = "20180228-git"; - asds = [ "talcl-speed-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz"; - sha256 = "18pm3vz82dwcckhp4lkwjv8431hkdj3ghxb4v5qdjsyw2jm56v1p"; - system = "talcl-speed-tests"; - asd = "talcl"; - }); - systems = [ "talcl-speed-tests" ]; - lispLibs = [ (getAttr "buildnode-xhtml" pkgs) (getAttr "lisp-unit2" pkgs) (getAttr "talcl" pkgs) (getAttr "talcl-examples" pkgs) ]; - }; - talcl-test = { - pname = "talcl-test"; - version = "20180228-git"; - asds = [ "talcl-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/talcl/2018-02-28/talcl-20180228-git.tgz"; - sha256 = "18pm3vz82dwcckhp4lkwjv8431hkdj3ghxb4v5qdjsyw2jm56v1p"; - system = "talcl-test"; - asd = "talcl"; - }); - systems = [ "talcl-test" ]; - lispLibs = [ (getAttr "buildnode-xhtml" pkgs) (getAttr "lisp-unit2" pkgs) (getAttr "talcl" pkgs) ]; - }; - tap-unit-test = { - pname = "tap-unit-test"; - version = "20171227-git"; - asds = [ "tap-unit-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tap-unit-test/2017-12-27/tap-unit-test-20171227-git.tgz"; - sha256 = "1fzsnpng7y4sghasl29sjicbs4v6m5mgfj8wf2izhhcn1hbhr694"; - system = "tap-unit-test"; - asd = "tap-unit-test"; - }); - systems = [ "tap-unit-test" ]; - lispLibs = [ ]; - }; - tar = { - pname = "tar"; - version = "20220220-git"; - asds = [ "tar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar/2022-02-20/cl-tar-20220220-git.tgz"; - sha256 = "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"; - system = "tar"; - asd = "tar"; - }); - systems = [ "tar" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "tar-file" pkgs) (getAttr "_40ants-doc" pkgs) (getAttr "local-time" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - }; - tar-file = { - pname = "tar-file"; - version = "20220220-git"; - asds = [ "tar-file" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar-file/2022-02-20/cl-tar-file-20220220-git.tgz"; - sha256 = "0i8j05fkgdqy4c4pqj0c68sh4s3klpx9kc5wp73qwzrl3xqd2svy"; - system = "tar-file"; - asd = "tar-file"; - }); - systems = [ "tar-file" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "chipz" pkgs) (getAttr "_40ants-doc" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "salza2" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "uiop" pkgs) ]; - }; - tar-file_slash_test = { - pname = "tar-file_test"; - version = "20220220-git"; - asds = [ "tar-file" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar-file/2022-02-20/cl-tar-file-20220220-git.tgz"; - sha256 = "0i8j05fkgdqy4c4pqj0c68sh4s3klpx9kc5wp73qwzrl3xqd2svy"; - system = "tar-file"; - asd = "tar-file"; - }); - systems = [ "tar-file/test" ]; - lispLibs = [ (getAttr "tar-file" pkgs) (getAttr "parachute" pkgs) ]; - meta = { - broken = true; - }; - }; - tar_slash_common-extract = { - pname = "tar_common-extract"; - version = "20220220-git"; - asds = [ "tar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar/2022-02-20/cl-tar-20220220-git.tgz"; - sha256 = "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"; - system = "tar"; - asd = "tar"; - }); - systems = [ "tar/common-extract" ]; - lispLibs = [ (getAttr "tar" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - tar_slash_create = { - pname = "tar_create"; - version = "20220220-git"; - asds = [ "tar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar/2022-02-20/cl-tar-20220220-git.tgz"; - sha256 = "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"; - system = "tar"; - asd = "tar"; - }); - systems = [ "tar/create" ]; - lispLibs = [ (getAttr "tar" pkgs) (getAttr "local-time" pkgs) (getAttr "osicat" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - tar_slash_create-test = { - pname = "tar_create-test"; - version = "20220220-git"; - asds = [ "tar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar/2022-02-20/cl-tar-20220220-git.tgz"; - sha256 = "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"; - system = "tar"; - asd = "tar"; - }); - systems = [ "tar/create-test" ]; - lispLibs = [ (getAttr "tar" pkgs) (getAttr "local-time" pkgs) (getAttr "osicat" pkgs) (getAttr "parachute" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - tar_slash_docs = { - pname = "tar_docs"; - version = "20220220-git"; - asds = [ "tar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar/2022-02-20/cl-tar-20220220-git.tgz"; - sha256 = "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"; - system = "tar"; - asd = "tar"; - }); - systems = [ "tar/docs" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "tar" pkgs) (getAttr "_40ants-doc" pkgs) (getAttr "local-time" pkgs) (getAttr "osicat" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - tar_slash_extract = { - pname = "tar_extract"; - version = "20220220-git"; - asds = [ "tar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar/2022-02-20/cl-tar-20220220-git.tgz"; - sha256 = "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"; - system = "tar"; - asd = "tar"; - }); - systems = [ "tar/extract" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "tar" pkgs) (getAttr "local-time" pkgs) (getAttr "osicat" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - tar_slash_extract-test = { - pname = "tar_extract-test"; - version = "20220220-git"; - asds = [ "tar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar/2022-02-20/cl-tar-20220220-git.tgz"; - sha256 = "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"; - system = "tar"; - asd = "tar"; - }); - systems = [ "tar/extract-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "tar" pkgs) (getAttr "local-time" pkgs) (getAttr "osicat" pkgs) (getAttr "parachute" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - tar_slash_simple-extract = { - pname = "tar_simple-extract"; - version = "20220220-git"; - asds = [ "tar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar/2022-02-20/cl-tar-20220220-git.tgz"; - sha256 = "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"; - system = "tar"; - asd = "tar"; - }); - systems = [ "tar/simple-extract" ]; - lispLibs = [ (getAttr "tar" pkgs) (getAttr "local-time" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - tar_slash_simple-extract-test = { - pname = "tar_simple-extract-test"; - version = "20220220-git"; - asds = [ "tar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar/2022-02-20/cl-tar-20220220-git.tgz"; - sha256 = "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"; - system = "tar"; - asd = "tar"; - }); - systems = [ "tar/simple-extract-test" ]; - lispLibs = [ (getAttr "tar" pkgs) (getAttr "local-time" pkgs) (getAttr "osicat" pkgs) (getAttr "parachute" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uiop" pkgs) ]; - meta = { - broken = true; - }; - }; - tar_slash_test = { - pname = "tar_test"; - version = "20220220-git"; - asds = [ "tar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tar/2022-02-20/cl-tar-20220220-git.tgz"; - sha256 = "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"; - system = "tar"; - asd = "tar"; - }); - systems = [ "tar/test" ]; - lispLibs = [ (getAttr "tar" pkgs) (getAttr "parachute" pkgs) ]; - meta = { - broken = true; - }; - }; - targa = { - pname = "targa"; - version = "20181018-git"; - asds = [ "targa" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/targa/2018-10-18/targa-20181018-git.tgz"; - sha256 = "0fslb2alp4pfmp8md2q89xh8n43r8awwf343wfvkywwqdnls2zws"; - system = "targa"; - asd = "targa"; - }); - systems = [ "targa" ]; - lispLibs = [ ]; - }; - tasty = { - pname = "tasty"; - version = "master-1a957fb2-git"; - asds = [ "tasty" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "tasty"; - asd = "tasty"; - }); - systems = [ "tasty" ]; - lispLibs = [ (getAttr "gwl-graphics" pkgs) (getAttr "tree" pkgs) ]; - }; - tclcs-code = { - pname = "tclcs-code"; - version = "20210124-git"; - asds = [ "tclcs-code" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tclcs-code/2021-01-24/tclcs-code-20210124-git.tgz"; - sha256 = "0p0g8shy284sj9ncq27zn8yj7xsrdcg2aiy2q783l6sl2ip6nfxa"; - system = "tclcs-code"; - asd = "tclcs-code"; - }); - systems = [ "tclcs-code" ]; - lispLibs = [ (getAttr "trivial-custom-debugger" pkgs) ]; - }; - tcod = { - pname = "tcod"; - version = "20201220-git"; - asds = [ "tcod" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-tcod/2020-12-20/cl-tcod-20201220-git.tgz"; - sha256 = "145h0dhxm1idblcld456cv7k00vi6p0zyn5rxkky5y4gk85ws8l5"; - system = "tcod"; - asd = "tcod"; - }); - systems = [ "tcod" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "defstar" pkgs) ]; - }; - teddy = { - pname = "teddy"; - version = "20211020-git"; - asds = [ "teddy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/teddy/2021-10-20/teddy-20211020-git.tgz"; - sha256 = "108cdxckzpdixi975rr2q1kkga6jngwj7j3nhfss9pzqcsf9w9ks"; - system = "teddy"; - asd = "teddy"; - }); - systems = [ "teddy" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "asdf-finalizers" pkgs) (getAttr "list-of" pkgs) (getAttr "cl-ascii-table" pkgs) (getAttr "eazy-gnuplot" pkgs) (getAttr "hu_dot_dwim_dot_def" pkgs) (getAttr "lhstats" pkgs) (getAttr "rutils" pkgs) (getAttr "simplified-types" pkgs) ]; - }; - teepeedee2 = { - pname = "teepeedee2"; - version = "20200218-git"; - asds = [ "teepeedee2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/teepeedee2/2020-02-18/teepeedee2-20200218-git.tgz"; - sha256 = "1dz5rf5rfcbgab99nprr1pv2x44f74jgcpgxr575z021k4pby5s5"; - system = "teepeedee2"; - asd = "teepeedee2"; - }); - systems = [ "teepeedee2" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-cont" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-irregsexp" pkgs) (getAttr "iterate" pkgs) (getAttr "parenscript" pkgs) (getAttr "trivial-backtrace" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - teepeedee2-test = { - pname = "teepeedee2-test"; - version = "20200218-git"; - asds = [ "teepeedee2-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/teepeedee2/2020-02-18/teepeedee2-20200218-git.tgz"; - sha256 = "1dz5rf5rfcbgab99nprr1pv2x44f74jgcpgxr575z021k4pby5s5"; - system = "teepeedee2-test"; - asd = "teepeedee2-test"; - }); - systems = [ "teepeedee2-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "teepeedee2" pkgs) ]; - }; - telnetlib = { - pname = "telnetlib"; - version = "20141217-git"; - asds = [ "telnetlib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/telnetlib/2014-12-17/telnetlib-20141217-git.tgz"; - sha256 = "1gdf6i352qkmp27nqbv6qfi7sqn5wjzdaffh6ls1y5jznqh3nb0h"; - system = "telnetlib"; - asd = "telnetlib"; - }); - systems = [ "telnetlib" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - template = { - pname = "template"; - version = "20190307-hg"; - asds = [ "template" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/template/2019-03-07/template-20190307-hg.tgz"; - sha256 = "10sibwhisablzv03844bhs5qifqnysz2zw1gmnzcx4pszq16c1k1"; - system = "template"; - asd = "template"; - }); - systems = [ "template" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "parameterized-function" pkgs) ]; - }; - template-function = { - pname = "template-function"; - version = "v0.0.1-git"; - asds = [ "template-function" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/template-function/2017-11-30/template-function-v0.0.1-git.tgz"; - sha256 = "1nq782cdi9vr3hgqqyzvvng2sbyc09biggwq4zp7k1vmqnm6qdaf"; - system = "template-function"; - asd = "template-function"; - }); - systems = [ "template-function" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "specialization-store" pkgs) ]; - }; - template-function-tests = { - pname = "template-function-tests"; - version = "v0.0.1-git"; - asds = [ "template-function-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/template-function/2017-11-30/template-function-v0.0.1-git.tgz"; - sha256 = "1nq782cdi9vr3hgqqyzvvng2sbyc09biggwq4zp7k1vmqnm6qdaf"; - system = "template-function-tests"; - asd = "template-function-tests"; - }); - systems = [ "template-function-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "template-function" pkgs) ]; - }; - temporal-functions = { - pname = "temporal-functions"; - version = "20171019-git"; - asds = [ "temporal-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/temporal-functions/2017-10-19/temporal-functions-20171019-git.tgz"; - sha256 = "03cbgw949g68n72nqp0nmjq9nx0kfz5zs6kpk0pwchy3i8bwf22j"; - system = "temporal-functions"; - asd = "temporal-functions"; - }); - systems = [ "temporal-functions" ]; - lispLibs = [ (getAttr "fn" pkgs) ]; - }; - temporary-file = { - pname = "temporary-file"; - version = "20150608-git"; - asds = [ "temporary-file" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/temporary-file/2015-06-08/temporary-file-20150608-git.tgz"; - sha256 = "0m38lncj6bmj7gwq8vp7l0gwzmk7pfasl4samzgl2fah8hzb064a"; - system = "temporary-file"; - asd = "temporary-file"; - }); - systems = [ "temporary-file" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "unit-test" pkgs) ]; - }; - ten = { - pname = "ten"; - version = "20220220-git"; - asds = [ "ten" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ten/2022-02-20/ten-20220220-git.tgz"; - sha256 = "0fsd3nlqffqgd2qxh320n1lv0812byiyk0wg3ssg46vvwqwpl98s"; - system = "ten"; - asd = "ten"; - }); - systems = [ "ten" ]; - lispLibs = [ (getAttr "access" pkgs) (getAttr "cl-who" pkgs) (getAttr "esrap" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - ten_dot_examples = { - pname = "ten.examples"; - version = "20220220-git"; - asds = [ "ten.examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ten/2022-02-20/ten-20220220-git.tgz"; - sha256 = "0fsd3nlqffqgd2qxh320n1lv0812byiyk0wg3ssg46vvwqwpl98s"; - system = "ten.examples"; - asd = "ten.examples"; - }); - systems = [ "ten.examples" ]; - lispLibs = [ (getAttr "ten" pkgs) ]; - }; - ten_dot_i18n_dot_cl-locale = { - pname = "ten.i18n.cl-locale"; - version = "20220220-git"; - asds = [ "ten.i18n.cl-locale" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ten/2022-02-20/ten-20220220-git.tgz"; - sha256 = "0fsd3nlqffqgd2qxh320n1lv0812byiyk0wg3ssg46vvwqwpl98s"; - system = "ten.i18n.cl-locale"; - asd = "ten.i18n.cl-locale"; - }); - systems = [ "ten.i18n.cl-locale" ]; - lispLibs = [ (getAttr "cl-locale" pkgs) (getAttr "ten" pkgs) ]; - }; - ten_dot_i18n_dot_gettext = { - pname = "ten.i18n.gettext"; - version = "20220220-git"; - asds = [ "ten.i18n.gettext" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ten/2022-02-20/ten-20220220-git.tgz"; - sha256 = "0fsd3nlqffqgd2qxh320n1lv0812byiyk0wg3ssg46vvwqwpl98s"; - system = "ten.i18n.gettext"; - asd = "ten.i18n.gettext"; - }); - systems = [ "ten.i18n.gettext" ]; - lispLibs = [ (getAttr "gettext" pkgs) (getAttr "ten" pkgs) ]; - }; - ten_dot_tests = { - pname = "ten.tests"; - version = "20220220-git"; - asds = [ "ten.tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ten/2022-02-20/ten-20220220-git.tgz"; - sha256 = "0fsd3nlqffqgd2qxh320n1lv0812byiyk0wg3ssg46vvwqwpl98s"; - system = "ten.tests"; - asd = "ten.tests"; - }); - systems = [ "ten.tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "ten" pkgs) (getAttr "ten_dot_examples" pkgs) ]; - }; - terminfo = { - pname = "terminfo"; - version = "20210124-git"; - asds = [ "terminfo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/terminfo/2021-01-24/terminfo-20210124-git.tgz"; - sha256 = "1nmin9rr6f75xdhxysba66xa1dh62fh27w9ad1cvmj0062armf6b"; - system = "terminfo"; - asd = "terminfo"; - }); - systems = [ "terminfo" ]; - lispLibs = [ ]; - }; - terrable = { - pname = "terrable"; - version = "20190710-git"; - asds = [ "terrable" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/terrable/2019-07-10/terrable-20190710-git.tgz"; - sha256 = "0pnqflgz410zydc1ivwnd8hcl24bgr7x12yjzr7g4lq3ibc8y97b"; - system = "terrable"; - asd = "terrable"; - }); - systems = [ "terrable" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) (getAttr "fast-io" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "static-vectors" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - tesseract-capi = { - pname = "tesseract-capi"; - version = "20201220-git"; - asds = [ "tesseract-capi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tesseract-capi/2020-12-20/tesseract-capi-20201220-git.tgz"; - sha256 = "1g8afgzbvfk80gi05nbwp9cmmrsqm5knhqi04v1cx556vrbp6ks1"; - system = "tesseract-capi"; - asd = "tesseract-capi"; - }); - systems = [ "tesseract-capi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - test-gadgets = { - pname = "test-gadgets"; - version = "20220220-git"; - asds = [ "test-gadgets" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gadgets/2022-02-20/gadgets-20220220-git.tgz"; - sha256 = "0g06wb3dciri2q93x2dcf58x5r8gq2kb86fgd2w4pr5r1wxwd1sm"; - system = "test-gadgets"; - asd = "test-gadgets"; - }); - systems = [ "test-gadgets" ]; - lispLibs = [ (getAttr "gadgets" pkgs) (getAttr "prove" pkgs) ]; - }; - test-paren6 = { - pname = "test-paren6"; - version = "20220331-git"; - asds = [ "test-paren6" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/paren6/2022-03-31/paren6-20220331-git.tgz"; - sha256 = "0m7z7zkc1vrwmp68f3yx0mdsb0j45dmw3iddnbvf94dpv8aywwpx"; - system = "test-paren6"; - asd = "test-paren6"; - }); - systems = [ "test-paren6" ]; - lispLibs = [ (getAttr "external-program" pkgs) (getAttr "paren6" pkgs) (getAttr "parenscript" pkgs) ]; - }; - test-serial-system = { - pname = "test-serial-system"; - version = "20170403-git"; - asds = [ "test-serial-system" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/asdf-dependency-grovel/2017-04-03/asdf-dependency-grovel-20170403-git.tgz"; - sha256 = "1y4kdqsda4ira4r9dws6kxzzv6mg45q3lkmb2c9mg9q7ksc5glif"; - system = "test-serial-system"; - asd = "test-serial-system"; - }); - systems = [ "test-serial-system" ]; - lispLibs = [ ]; - }; - test-utils = { - pname = "test-utils"; - version = "20200610-git"; - asds = [ "test-utils" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/test-utils/2020-06-10/test-utils-20200610-git.tgz"; - sha256 = "036a8wvs37lnsf9dy3c810qk54963v7hnxx0zas25b50ikcmiqm5"; - system = "test-utils"; - asd = "test-utils"; - }); - systems = [ "test-utils" ]; - lispLibs = [ (getAttr "agnostic-lizard" pkgs) (getAttr "alexandria" pkgs) (getAttr "cl-quickcheck" pkgs) (getAttr "prove" pkgs) ]; - }; - test_dot_eager-future2 = { - pname = "test.eager-future2"; - version = "20191130-git"; - asds = [ "test.eager-future2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz"; - sha256 = "1qs1bv3m0ki8l5czhsflxcryh22r9d9g9a3a3b0cr0pl954q5rld"; - system = "test.eager-future2"; - asd = "test.eager-future2"; - }); - systems = [ "test.eager-future2" ]; - lispLibs = [ (getAttr "eager-future2" pkgs) (getAttr "eos" pkgs) ]; - }; - test_dot_vas-string-metrics = { - pname = "test.vas-string-metrics"; - version = "20211209-git"; - asds = [ "test.vas-string-metrics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vas-string-metrics/2021-12-09/vas-string-metrics-20211209-git.tgz"; - sha256 = "1yvkwc939dckv070nlgqfj5ys9ii2rm32m5wfx7qxdjrb4n19sx9"; - system = "test.vas-string-metrics"; - asd = "test.vas-string-metrics"; - }); - systems = [ "test.vas-string-metrics" ]; - lispLibs = [ (getAttr "vas-string-metrics" pkgs) ]; - }; - testbild = { - pname = "testbild"; - version = "20101207-git"; - asds = [ "testbild" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/testbild/2010-12-07/testbild-20101207-git.tgz"; - sha256 = "024b6rlgljcjazwg302zkdmkpxs2hirjg7g39ypppz81ns2v65sw"; - system = "testbild"; - asd = "testbild"; - }); - systems = [ "testbild" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "graylex" pkgs) ]; - }; - testbild-test = { - pname = "testbild-test"; - version = "20101207-git"; - asds = [ "testbild-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/testbild/2010-12-07/testbild-20101207-git.tgz"; - sha256 = "024b6rlgljcjazwg302zkdmkpxs2hirjg7g39ypppz81ns2v65sw"; - system = "testbild-test"; - asd = "testbild-test"; - }); - systems = [ "testbild-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-heredoc" pkgs) (getAttr "testbild" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - testiere = { - pname = "testiere"; - version = "20221106-git"; - asds = [ "testiere" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/testiere/2022-11-06/testiere-20221106-git.tgz"; - sha256 = "0q9kw18fkj9sskijy348rxfnri2pcfwxkw3mjsqkp9i2ih285hgp"; - system = "testiere"; - asd = "testiere"; - }); - systems = [ "testiere" ]; - lispLibs = [ (getAttr "trivia" pkgs) ]; - }; - texp = { - pname = "texp"; - version = "20151218-git"; - asds = [ "texp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/texp/2015-12-18/texp-20151218-git.tgz"; - sha256 = "1sbll7jwmzd86hg0zva8r7db2565nnliasv2x6rkrm9xl97q0kg5"; - system = "texp"; - asd = "texp"; - }); - systems = [ "texp" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - text-query = { - pname = "text-query"; - version = "1.1"; - asds = [ "text-query" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/text-query/2011-11-05/text-query-1.1.tgz"; - sha256 = "082xqpfchmg2752m1lw78q6c0z3walzsmqk8gl6qnj6bdwbhf4dm"; - system = "text-query"; - asd = "text-query"; - }); - systems = [ "text-query" ]; - lispLibs = [ ]; - }; - text-subsystem = { - pname = "text-subsystem"; - version = "20200427-git"; - asds = [ "text-subsystem" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "text-subsystem"; - asd = "text-subsystem"; - }); - systems = [ "text-subsystem" ]; - lispLibs = [ (getAttr "application" pkgs) (getAttr "deflazy" pkgs) (getAttr "image-utility" pkgs) (getAttr "nsb-cga" pkgs) (getAttr "quads" pkgs) (getAttr "sucle-temp" pkgs) (getAttr "utility" pkgs) ]; - }; - text-subsystem-generate-font = { - pname = "text-subsystem-generate-font"; - version = "20200427-git"; - asds = [ "text-subsystem-generate-font" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "text-subsystem-generate-font"; - asd = "text-subsystem-generate-font"; - }); - systems = [ "text-subsystem-generate-font" ]; - lispLibs = [ (getAttr "cl-freetype2" pkgs) (getAttr "opticl" pkgs) (getAttr "utility" pkgs) ]; - }; - textery = { - pname = "textery"; - version = "20201220-git"; - asds = [ "textery" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/textery/2020-12-20/textery-20201220-git.tgz"; - sha256 = "0v8zk1s18fi462qwvjbci8nikgs5wqjpl97ckfk0spvhybrdgwcc"; - system = "textery"; - asd = "textery"; - }); - systems = [ "textery" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "str" pkgs) (getAttr "uiop" pkgs) ]; - }; - the-cost-of-nothing = { - pname = "the-cost-of-nothing"; - version = "20191130-git"; - asds = [ "the-cost-of-nothing" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/the-cost-of-nothing/2019-11-30/the-cost-of-nothing-20191130-git.tgz"; - sha256 = "1ccrglyr1wnnfp218w1qj7yfl4yzlxkki3hqaifi5axgbi5dmmh8"; - system = "the-cost-of-nothing"; - asd = "the-cost-of-nothing"; - }); - systems = [ "the-cost-of-nothing" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "local-time" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - thnappy = { - pname = "thnappy"; - version = "20180831-git"; - asds = [ "thnappy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/thnappy/2018-08-31/thnappy-20180831-git.tgz"; - sha256 = "0p03w2mcc655gm9x3rpgixhap9l56imjyblkwv05rk6mjx7wfnrp"; - system = "thnappy"; - asd = "thnappy"; - }); - systems = [ "thnappy" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - thorn = { - pname = "thorn"; - version = "20150608-git"; - asds = [ "thorn" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz"; - sha256 = "1d4w5358yxgccna91pxz9526w932j5ig17gp19zysjxvca57hqy7"; - system = "thorn"; - asd = "thorn"; - }); - systems = [ "thorn" ]; - lispLibs = [ (getAttr "common-doc" pkgs) ]; - }; - thorn-doc = { - pname = "thorn-doc"; - version = "20150608-git"; - asds = [ "thorn-doc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz"; - sha256 = "1d4w5358yxgccna91pxz9526w932j5ig17gp19zysjxvca57hqy7"; - system = "thorn-doc"; - asd = "thorn-doc"; - }); - systems = [ "thorn-doc" ]; - lispLibs = [ (getAttr "thorn" pkgs) ]; - }; - thorn-test = { - pname = "thorn-test"; - version = "20150608-git"; - asds = [ "thorn-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/thorn/2015-06-08/thorn-20150608-git.tgz"; - sha256 = "1d4w5358yxgccna91pxz9526w932j5ig17gp19zysjxvca57hqy7"; - system = "thorn-test"; - asd = "thorn-test"; - }); - systems = [ "thorn-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "thorn" pkgs) (getAttr "thorn-doc" pkgs) ]; - }; - thread-pool = { - pname = "thread-pool"; - version = "20120107-git"; - asds = [ "thread-pool" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/thread-pool/2012-01-07/thread-pool-20120107-git.tgz"; - sha256 = "0wi9l0m660332w9pnc3w08m5hlsry9s0cgc3rznb5kyap68iv847"; - system = "thread-pool"; - asd = "thread-pool"; - }); - systems = [ "thread-pool" ]; - lispLibs = [ (getAttr "arnesi" pkgs) (getAttr "bordeaux-threads" pkgs) ]; - }; - thread_dot_comm_dot_rendezvous = { - pname = "thread.comm.rendezvous"; - version = "20121013-git"; - asds = [ "thread.comm.rendezvous" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/thread.comm.rendezvous/2012-10-13/thread.comm.rendezvous-20121013-git.tgz"; - sha256 = "16crdy09zm20iclgln1vj0psd8ifz4rqb6g9255p0d2rkjk2rgfx"; - system = "thread.comm.rendezvous"; - asd = "thread.comm.rendezvous"; - }); - systems = [ "thread.comm.rendezvous" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-annot" pkgs) ]; - }; - thread_dot_comm_dot_rendezvous_dot_test = { - pname = "thread.comm.rendezvous.test"; - version = "20121013-git"; - asds = [ "thread.comm.rendezvous.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/thread.comm.rendezvous/2012-10-13/thread.comm.rendezvous-20121013-git.tgz"; - sha256 = "16crdy09zm20iclgln1vj0psd8ifz4rqb6g9255p0d2rkjk2rgfx"; - system = "thread.comm.rendezvous.test"; - asd = "thread.comm.rendezvous.test"; - }); - systems = [ "thread.comm.rendezvous.test" ]; - lispLibs = [ (getAttr "cl-test-more" pkgs) (getAttr "thread_dot_comm_dot_rendezvous" pkgs) ]; - }; - tile-grid = { - pname = "tile-grid"; - version = "20220707-git"; - asds = [ "tile-grid" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tile-grid/2022-07-07/tile-grid-20220707-git.tgz"; - sha256 = "10sqiqspiljnk4i1v4w0dkr640cgf9nvkgmkaww3smmhyjsd9270"; - system = "tile-grid"; - asd = "tile-grid"; - }); - systems = [ "tile-grid" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) ]; - }; - time-interval = { - pname = "time-interval"; - version = "20190202-git"; - asds = [ "time-interval" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/time-interval/2019-02-02/time-interval-20190202-git.tgz"; - sha256 = "0dydlg42bwcd7sr57v8hhrd86n80d5cb5r6r2id0zyqbrijabdw5"; - system = "time-interval"; - asd = "time-interval"; - }); - systems = [ "time-interval" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "local-time" pkgs) ]; - }; - timer-wheel = { - pname = "timer-wheel"; - version = "20180228-git"; - asds = [ "timer-wheel" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/timer-wheel/2018-02-28/timer-wheel-20180228-git.tgz"; - sha256 = "12pc1dpnkwj43n1sdqhg8n8h0mb16zcx4wxly85b7bqf00s962bc"; - system = "timer-wheel"; - asd = "timer-wheel"; - }); - systems = [ "timer-wheel" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - timer-wheel_dot_examples = { - pname = "timer-wheel.examples"; - version = "20180228-git"; - asds = [ "timer-wheel.examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/timer-wheel/2018-02-28/timer-wheel-20180228-git.tgz"; - sha256 = "12pc1dpnkwj43n1sdqhg8n8h0mb16zcx4wxly85b7bqf00s962bc"; - system = "timer-wheel.examples"; - asd = "timer-wheel.examples"; - }); - systems = [ "timer-wheel.examples" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "timer-wheel" pkgs) ]; - }; - tinaa = { - pname = "tinaa"; - version = "20171227-git"; - asds = [ "tinaa" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tinaa/2017-12-27/tinaa-20171227-git.tgz"; - sha256 = "10r1ypxphs5h7xxkl7v7r9pi2wdz1ik948mp63006hn44j7s1sa1"; - system = "tinaa"; - asd = "tinaa"; - }); - systems = [ "tinaa" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "asdf-system-connections" pkgs) (getAttr "cl-containers" pkgs) (getAttr "cl-graph" pkgs) (getAttr "defsystem-compatibility" pkgs) (getAttr "dynamic-classes" pkgs) (getAttr "lml2" pkgs) (getAttr "metatilities" pkgs) (getAttr "trivial-shell" pkgs) ]; - }; - tinaa-test = { - pname = "tinaa-test"; - version = "20171227-git"; - asds = [ "tinaa-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tinaa/2017-12-27/tinaa-20171227-git.tgz"; - sha256 = "10r1ypxphs5h7xxkl7v7r9pi2wdz1ik948mp63006hn44j7s1sa1"; - system = "tinaa-test"; - asd = "tinaa-test"; - }); - systems = [ "tinaa-test" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "tinaa" pkgs) ]; - }; - tinaa_slash_with-cl-markdown = { - pname = "tinaa_with-cl-markdown"; - version = "20171227-git"; - asds = [ "tinaa" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tinaa/2017-12-27/tinaa-20171227-git.tgz"; - sha256 = "10r1ypxphs5h7xxkl7v7r9pi2wdz1ik948mp63006hn44j7s1sa1"; - system = "tinaa"; - asd = "tinaa"; - }); - systems = [ "tinaa/with-cl-markdown" ]; - lispLibs = [ (getAttr "cl-markdown" pkgs) (getAttr "tinaa" pkgs) ]; - meta = { - broken = true; - }; - }; - tiny-routes = { - pname = "tiny-routes"; - version = "20220331-git"; - asds = [ "tiny-routes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tiny-routes/2022-03-31/tiny-routes-20220331-git.tgz"; - sha256 = "1210j7wd9rgh95p8ccwrz5axvganag14wg10giwmj236p08869ww"; - system = "tiny-routes"; - asd = "tiny-routes"; - }); - systems = [ "tiny-routes" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "uiop" pkgs) ]; - }; - tiny-routes_slash_test = { - pname = "tiny-routes_test"; - version = "20220331-git"; - asds = [ "tiny-routes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tiny-routes/2022-03-31/tiny-routes-20220331-git.tgz"; - sha256 = "1210j7wd9rgh95p8ccwrz5axvganag14wg10giwmj236p08869ww"; - system = "tiny-routes"; - asd = "tiny-routes"; - }); - systems = [ "tiny-routes/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "tiny-routes" pkgs) ]; - meta = { - broken = true; - }; - }; - tm = { - pname = "tm"; - version = "v0.8"; - asds = [ "tm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tm/2018-02-28/tm-v0.8.tgz"; - sha256 = "0lhqg5jpkzni1vzni0nnw7jb8ick1pbp04gfij2iczbi82qsw8x1"; - system = "tm"; - asd = "tm"; - }); - systems = [ "tm" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "local-time" pkgs) ]; - }; - tmpdir = { - pname = "tmpdir"; - version = "20200218-git"; - asds = [ "tmpdir" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tmpdir/2020-02-18/tmpdir-20200218-git.tgz"; - sha256 = "11yshmg2wyd75ywwfybklm131d5rdw246pg35a6ksndiq3w5n4k8"; - system = "tmpdir"; - asd = "tmpdir"; - }); - systems = [ "tmpdir" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) ]; - }; - tmpdir_dot_tests = { - pname = "tmpdir.tests"; - version = "20200218-git"; - asds = [ "tmpdir.tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tmpdir/2020-02-18/tmpdir-20200218-git.tgz"; - sha256 = "11yshmg2wyd75ywwfybklm131d5rdw246pg35a6ksndiq3w5n4k8"; - system = "tmpdir.tests"; - asd = "tmpdir.tests"; - }); - systems = [ "tmpdir.tests" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "fiveam" pkgs) (getAttr "osicat" pkgs) (getAttr "tmpdir" pkgs) ]; - }; - toadstool = { - pname = "toadstool"; - version = "20130615-git"; - asds = [ "toadstool" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/toadstool/2013-06-15/toadstool-20130615-git.tgz"; - sha256 = "0njb1mdzk0247h87db90zv7bk40mw54pq8sj35l1dwa30d5yhi6r"; - system = "toadstool"; - asd = "toadstool"; - }); - systems = [ "toadstool" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - toadstool-tests = { - pname = "toadstool-tests"; - version = "20130615-git"; - asds = [ "toadstool-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/toadstool/2013-06-15/toadstool-20130615-git.tgz"; - sha256 = "0njb1mdzk0247h87db90zv7bk40mw54pq8sj35l1dwa30d5yhi6r"; - system = "toadstool-tests"; - asd = "toadstool-tests"; - }); - systems = [ "toadstool-tests" ]; - lispLibs = [ (getAttr "stefil" pkgs) (getAttr "toadstool" pkgs) ]; - }; - toms419 = { - pname = "toms419"; - version = "20200925-git"; - asds = [ "toms419" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "toms419"; - asd = "toms419"; - }); - systems = [ "toms419" ]; - lispLibs = [ (getAttr "f2cl" pkgs) ]; - }; - toms419_slash_test = { - pname = "toms419_test"; - version = "20200925-git"; - asds = [ "toms419" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "toms419"; - asd = "toms419"; - }); - systems = [ "toms419/test" ]; - lispLibs = [ (getAttr "toms419" pkgs) ]; - meta = { - broken = true; - }; - }; - toms715 = { - pname = "toms715"; - version = "20200925-git"; - asds = [ "toms715" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "toms715"; - asd = "toms715"; - }); - systems = [ "toms715" ]; - lispLibs = [ (getAttr "f2cl" pkgs) ]; - }; - toms715_slash_tests = { - pname = "toms715_tests"; - version = "20200925-git"; - asds = [ "toms715" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "toms715"; - asd = "toms715"; - }); - systems = [ "toms715/tests" ]; - lispLibs = [ (getAttr "toms715" pkgs) ]; - meta = { - broken = true; - }; - }; - toms717 = { - pname = "toms717"; - version = "20200925-git"; - asds = [ "toms717" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "toms717"; - asd = "toms717"; - }); - systems = [ "toms717" ]; - lispLibs = [ (getAttr "f2cl" pkgs) ]; - }; - toms717_slash_tests = { - pname = "toms717_tests"; - version = "20200925-git"; - asds = [ "toms717" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/f2cl/2020-09-25/f2cl-20200925-git.tgz"; - sha256 = "0kq1lrz0sg4kj64w0ysihnfwi65pami362fs2mvpyf1yhgxmq08y"; - system = "toms717"; - asd = "toms717"; - }); - systems = [ "toms717/tests" ]; - lispLibs = [ (getAttr "toms717" pkgs) ]; - meta = { - broken = true; - }; - }; - toot = { - pname = "toot"; - version = "20121125-git"; - asds = [ "toot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/toot/2012-11-25/toot-20121125-git.tgz"; - sha256 = "1235qhkjrg1mmy6kx1vhsqvgjjgc7hk2sjssapv7xr43m71n6ivx"; - system = "toot"; - asd = "toot"; - }); - systems = [ "toot" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "chunga" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "md5" pkgs) (getAttr "puri" pkgs) (getAttr "trivial-backtrace" pkgs) (getAttr "usocket" pkgs) ]; - }; - tooter = { - pname = "tooter"; - version = "20220220-git"; - asds = [ "tooter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tooter/2022-02-20/tooter-20220220-git.tgz"; - sha256 = "02gy1hyirz5w7ik7rjqxxl8dfp1m2b135sxw6qmn1lak29ap8c5c"; - system = "tooter"; - asd = "tooter"; - }); - systems = [ "tooter" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "drakma" pkgs) (getAttr "yason" pkgs) ]; - }; - torrents = { - pname = "torrents"; - version = "20221106-git"; - asds = [ "torrents" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-torrents/2022-11-06/cl-torrents-20221106-git.tgz"; - sha256 = "1icz98icnisz8cz669adin5x68y3ybcajy69yrma1djgd3v7inl5"; - system = "torrents"; - asd = "torrents"; - }); - systems = [ "torrents" ]; - lispLibs = [ (getAttr "access" pkgs) (getAttr "cl-ansi-text" pkgs) (getAttr "cl-readline" pkgs) (getAttr "str" pkgs) (getAttr "cl-transmission" pkgs) (getAttr "clache" pkgs) (getAttr "dexador" pkgs) (getAttr "jonathan" pkgs) (getAttr "log4cl" pkgs) (getAttr "lparallel" pkgs) (getAttr "lquery" pkgs) (getAttr "mockingbird" pkgs) (getAttr "parse-float" pkgs) (getAttr "plump" pkgs) (getAttr "py-configparser" pkgs) (getAttr "replic" pkgs) (getAttr "unix-opts" pkgs) (getAttr "x_dot_let-star" pkgs) ]; - }; - torrents-test = { - pname = "torrents-test"; - version = "20221106-git"; - asds = [ "torrents-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-torrents/2022-11-06/cl-torrents-20221106-git.tgz"; - sha256 = "1icz98icnisz8cz669adin5x68y3ybcajy69yrma1djgd3v7inl5"; - system = "torrents-test"; - asd = "torrents-test"; - }); - systems = [ "torrents-test" ]; - lispLibs = [ (getAttr "torrents" pkgs) (getAttr "mockingbird" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - torrents_slash_tk = { - pname = "torrents_tk"; - version = "20221106-git"; - asds = [ "torrents" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-torrents/2022-11-06/cl-torrents-20221106-git.tgz"; - sha256 = "1icz98icnisz8cz669adin5x68y3ybcajy69yrma1djgd3v7inl5"; - system = "torrents"; - asd = "torrents"; - }); - systems = [ "torrents/tk" ]; - lispLibs = [ (getAttr "torrents" pkgs) (getAttr "nodgui" pkgs) ]; - meta = { - broken = true; - }; - }; - towers = { - pname = "towers"; - version = "20141217-git"; - asds = [ "towers" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/towers/2014-12-17/towers-20141217-git.tgz"; - sha256 = "0r89z1hfb7kmj0a4qm7ih599hlin8rhxk6pb7nnvsdjgn436dkga"; - system = "towers"; - asd = "towers"; - }); - systems = [ "towers" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-glu" pkgs) (getAttr "cl-glut" pkgs) (getAttr "cl-opengl" pkgs) ]; - }; - trace-db = { - pname = "trace-db"; - version = "20221106-git"; - asds = [ "trace-db" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trace-db/2022-11-06/trace-db-20221106-git.tgz"; - sha256 = "0263y0nks377hkm6cx9017hyyw9vd4mvmnhpdfi724knljm6pllk"; - system = "trace-db"; - asd = "trace-db"; - }); - systems = [ "trace-db" ]; - lispLibs = [ (getAttr "asdf-package-system" pkgs) ]; - }; - track-best = { - pname = "track-best"; - version = "20220220-git"; - asds = [ "track-best" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/track-best/2022-02-20/track-best-20220220-git.tgz"; - sha256 = "1f59bn57y1mdq18l1ji5q8yazv73g85y1mns2xzwbmx8sgxsa6pq"; - system = "track-best"; - asd = "track-best"; - }); - systems = [ "track-best" ]; - lispLibs = [ ]; - }; - track-best_slash_tests = { - pname = "track-best_tests"; - version = "20220220-git"; - asds = [ "track-best" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/track-best/2022-02-20/track-best-20220220-git.tgz"; - sha256 = "1f59bn57y1mdq18l1ji5q8yazv73g85y1mns2xzwbmx8sgxsa6pq"; - system = "track-best"; - asd = "track-best"; - }); - systems = [ "track-best/tests" ]; - lispLibs = [ (getAttr "nst" pkgs) (getAttr "track-best" pkgs) ]; - meta = { - broken = true; - }; - }; - trainable-object = { - pname = "trainable-object"; - version = "20191227-git"; - asds = [ "trainable-object" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trainable-object/2019-12-27/trainable-object-20191227-git.tgz"; - sha256 = "06hfv039xx5vwm3qpm4kwlzlxc4zxlfcpxnbbq8x12a32ngqykwm"; - system = "trainable-object"; - asd = "trainable-object"; - }); - systems = [ "trainable-object" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "serializable-object" pkgs) ]; - }; - trainable-object_dot_test = { - pname = "trainable-object.test"; - version = "20191227-git"; - asds = [ "trainable-object.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trainable-object/2019-12-27/trainable-object-20191227-git.tgz"; - sha256 = "06hfv039xx5vwm3qpm4kwlzlxc4zxlfcpxnbbq8x12a32ngqykwm"; - system = "trainable-object.test"; - asd = "trainable-object.test"; - }); - systems = [ "trainable-object.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trainable-object" pkgs) ]; - }; - translate = { - pname = "translate"; - version = "20180228-git"; - asds = [ "translate" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/translate/2018-02-28/translate-20180228-git.tgz"; - sha256 = "07bvdmj8x77k8pw24yhfp1xv9h40n5w717vgj3wmq703159kyjia"; - system = "translate"; - asd = "translate"; - }); - systems = [ "translate" ]; - lispLibs = [ ]; - }; - translate-client = { - pname = "translate-client"; - version = "20180228-git"; - asds = [ "translate-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/translate-client/2018-02-28/translate-client-20180228-git.tgz"; - sha256 = "0mjzzahy5wrycik37dirwnvcd5bj5xm20cnw6cmzh0ncvb442mdx"; - system = "translate-client"; - asd = "translate-client"; - }); - systems = [ "translate-client" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "assoc-utils" pkgs) (getAttr "dexador" pkgs) (getAttr "quri" pkgs) (getAttr "yason" pkgs) ]; - }; - translate_slash_test = { - pname = "translate_test"; - version = "20180228-git"; - asds = [ "translate" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/translate/2018-02-28/translate-20180228-git.tgz"; - sha256 = "07bvdmj8x77k8pw24yhfp1xv9h40n5w717vgj3wmq703159kyjia"; - system = "translate"; - asd = "translate"; - }); - systems = [ "translate/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "translate" pkgs) ]; - meta = { - broken = true; - }; - }; - translators = { - pname = "translators"; - version = "master-1a957fb2-git"; - asds = [ "translators" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "translators"; - asd = "translators"; - }); - systems = [ "translators" ]; - lispLibs = [ (getAttr "gwl" pkgs) ]; - }; - transparent-wrap = { - pname = "transparent-wrap"; - version = "20200925-git"; - asds = [ "transparent-wrap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/transparent-wrap/2020-09-25/transparent-wrap-20200925-git.tgz"; - sha256 = "0ghva34ksdvczfwpjdaf97bkjxrp35fjqkxamyqf7fbadh4wmfqj"; - system = "transparent-wrap"; - asd = "transparent-wrap"; - }); - systems = [ "transparent-wrap" ]; - lispLibs = [ (getAttr "fare-quasiquote-extras" pkgs) (getAttr "named-readtables" pkgs) (getAttr "optima" pkgs) (getAttr "trivial-arguments" pkgs) ]; - }; - tree = { - pname = "tree"; - version = "master-1a957fb2-git"; - asds = [ "tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "tree"; - asd = "tree"; - }); - systems = [ "tree" ]; - lispLibs = [ (getAttr "gwl-graphics" pkgs) ]; - }; - tree-search = { - pname = "tree-search"; - version = "0.0.1"; - asds = [ "tree-search" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tree-search/2020-12-20/tree-search-0.0.1.tgz"; - sha256 = "10qgd5yj3n2w4j6wsq1xly0hnpdi1bhhzpia4s1gpkywhglw84zq"; - system = "tree-search"; - asd = "tree-search"; - }); - systems = [ "tree-search" ]; - lispLibs = [ ]; - }; - tree-search_slash_test = { - pname = "tree-search_test"; - version = "0.0.1"; - asds = [ "tree-search" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tree-search/2020-12-20/tree-search-0.0.1.tgz"; - sha256 = "10qgd5yj3n2w4j6wsq1xly0hnpdi1bhhzpia4s1gpkywhglw84zq"; - system = "tree-search"; - asd = "tree-search"; - }); - systems = [ "tree-search/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "tree-search" pkgs) ]; - meta = { - broken = true; - }; - }; - treedb = { - pname = "treedb"; - version = "20160825-git"; - asds = [ "treedb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz"; - sha256 = "02xsm4han0m0vj1j2ly2a6ncjcv7z8p3lcpkyj27xygag2vlchbq"; - system = "treedb"; - asd = "treedb"; - }); - systems = [ "treedb" ]; - lispLibs = [ (getAttr "cl-json" pkgs) ]; - }; - treedb_dot_doc = { - pname = "treedb.doc"; - version = "20160825-git"; - asds = [ "treedb.doc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz"; - sha256 = "02xsm4han0m0vj1j2ly2a6ncjcv7z8p3lcpkyj27xygag2vlchbq"; - system = "treedb.doc"; - asd = "treedb.doc"; - }); - systems = [ "treedb.doc" ]; - lispLibs = [ (getAttr "cl-gendoc" pkgs) (getAttr "treedb" pkgs) (getAttr "treedb_dot_tests" pkgs) ]; - }; - treedb_dot_tests = { - pname = "treedb.tests"; - version = "20160825-git"; - asds = [ "treedb.tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/treedb/2016-08-25/treedb-20160825-git.tgz"; - sha256 = "02xsm4han0m0vj1j2ly2a6ncjcv7z8p3lcpkyj27xygag2vlchbq"; - system = "treedb.tests"; - asd = "treedb.tests"; - }); - systems = [ "treedb.tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "treedb" pkgs) ]; - }; - trees = { - pname = "trees"; - version = "20180131-git"; - asds = [ "trees" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trees/2018-01-31/trees-20180131-git.tgz"; - sha256 = "1xvydf3qc17rd7ia8sffxcpclgm3l0iyhx8k72ddk59v3pg5is4k"; - system = "trees"; - asd = "trees"; - }); - systems = [ "trees" ]; - lispLibs = [ ]; - }; - trees-tests = { - pname = "trees-tests"; - version = "20180131-git"; - asds = [ "trees-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trees/2018-01-31/trees-20180131-git.tgz"; - sha256 = "1xvydf3qc17rd7ia8sffxcpclgm3l0iyhx8k72ddk59v3pg5is4k"; - system = "trees-tests"; - asd = "trees"; - }); - systems = [ "trees-tests" ]; - lispLibs = [ (getAttr "trees" pkgs) ]; - }; - trestrul = { - pname = "trestrul"; - version = "20211020-git"; - asds = [ "trestrul" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trestrul/2021-10-20/trestrul-20211020-git.tgz"; - sha256 = "12bghcfnfxq8l4a1jzh6vx4yna9da1xvp0b7kfdcfylnyga9ivy6"; - system = "trestrul"; - asd = "trestrul"; - }); - systems = [ "trestrul" ]; - lispLibs = [ (getAttr "jingoh_dot_documentizer" pkgs) ]; - }; - trestrul_dot_test = { - pname = "trestrul.test"; - version = "20211020-git"; - asds = [ "trestrul.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trestrul/2021-10-20/trestrul-20211020-git.tgz"; - sha256 = "12bghcfnfxq8l4a1jzh6vx4yna9da1xvp0b7kfdcfylnyga9ivy6"; - system = "trestrul.test"; - asd = "trestrul.test"; - }); - systems = [ "trestrul.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "trestrul" pkgs) ]; - }; - trivia = { - pname = "trivia"; - version = "20220707-git"; - asds = [ "trivia" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2022-07-07/trivia-20220707-git.tgz"; - sha256 = "0w0qnl7j833b054fm47xnlx283rd6rzxf2sl672r91h081jk9ahv"; - system = "trivia"; - asd = "trivia"; - }); - systems = [ "trivia" ]; - lispLibs = [ (getAttr "trivia_dot_balland2006" pkgs) ]; - }; - trivia_dot_balland2006 = { - pname = "trivia.balland2006"; - version = "20220707-git"; - asds = [ "trivia.balland2006" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2022-07-07/trivia-20220707-git.tgz"; - sha256 = "0w0qnl7j833b054fm47xnlx283rd6rzxf2sl672r91h081jk9ahv"; - system = "trivia.balland2006"; - asd = "trivia.balland2006"; - }); - systems = [ "trivia.balland2006" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) (getAttr "trivia_dot_trivial" pkgs) (getAttr "type-i" pkgs) ]; - }; - trivia_dot_benchmark = { - pname = "trivia.benchmark"; - version = "20220707-git"; - asds = [ "trivia.benchmark" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2022-07-07/trivia-20220707-git.tgz"; - sha256 = "0w0qnl7j833b054fm47xnlx283rd6rzxf2sl672r91h081jk9ahv"; - system = "trivia.benchmark"; - asd = "trivia.benchmark"; - }); - systems = [ "trivia.benchmark" ]; - lispLibs = [ (getAttr "iterate" pkgs) (getAttr "optima" pkgs) (getAttr "trivia" pkgs) (getAttr "trivia_dot_balland2006" pkgs) ]; - }; - trivia_dot_benchmark_slash_run = { - pname = "trivia.benchmark_run"; - version = "20220707-git"; - asds = [ "trivia.benchmark" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2022-07-07/trivia-20220707-git.tgz"; - sha256 = "0w0qnl7j833b054fm47xnlx283rd6rzxf2sl672r91h081jk9ahv"; - system = "trivia.benchmark"; - asd = "trivia.benchmark"; - }); - systems = [ "trivia.benchmark/run" ]; - lispLibs = [ (getAttr "trivia_dot_benchmark" pkgs) ]; - meta = { - broken = true; - }; - }; - trivia_dot_cffi = { - pname = "trivia.cffi"; - version = "20220707-git"; - asds = [ "trivia.cffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2022-07-07/trivia-20220707-git.tgz"; - sha256 = "0w0qnl7j833b054fm47xnlx283rd6rzxf2sl672r91h081jk9ahv"; - system = "trivia.cffi"; - asd = "trivia.cffi"; - }); - systems = [ "trivia.cffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "trivia_dot_trivial" pkgs) ]; - }; - trivia_dot_fset = { - pname = "trivia.fset"; - version = "20220707-git"; - asds = [ "trivia.fset" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2022-07-07/trivia-20220707-git.tgz"; - sha256 = "0w0qnl7j833b054fm47xnlx283rd6rzxf2sl672r91h081jk9ahv"; - system = "trivia.fset"; - asd = "trivia.fset"; - }); - systems = [ "trivia.fset" ]; - lispLibs = [ (getAttr "fset" pkgs) (getAttr "trivia_dot_trivial" pkgs) ]; - }; - trivia_dot_level0 = { - pname = "trivia.level0"; - version = "20220707-git"; - asds = [ "trivia.level0" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2022-07-07/trivia-20220707-git.tgz"; - sha256 = "0w0qnl7j833b054fm47xnlx283rd6rzxf2sl672r91h081jk9ahv"; - system = "trivia.level0"; - asd = "trivia.level0"; - }); - systems = [ "trivia.level0" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - trivia_dot_level1 = { - pname = "trivia.level1"; - version = "20220707-git"; - asds = [ "trivia.level1" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2022-07-07/trivia-20220707-git.tgz"; - sha256 = "0w0qnl7j833b054fm47xnlx283rd6rzxf2sl672r91h081jk9ahv"; - system = "trivia.level1"; - asd = "trivia.level1"; - }); - systems = [ "trivia.level1" ]; - lispLibs = [ (getAttr "trivia_dot_level0" pkgs) ]; - }; - trivia_dot_level2 = { - pname = "trivia.level2"; - version = "20220707-git"; - asds = [ "trivia.level2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2022-07-07/trivia-20220707-git.tgz"; - sha256 = "0w0qnl7j833b054fm47xnlx283rd6rzxf2sl672r91h081jk9ahv"; - system = "trivia.level2"; - asd = "trivia.level2"; - }); - systems = [ "trivia.level2" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "lisp-namespace" pkgs) (getAttr "trivia_dot_level1" pkgs) (getAttr "trivial-cltl2" pkgs) ]; - }; - trivia_dot_ppcre = { - pname = "trivia.ppcre"; - version = "20220707-git"; - asds = [ "trivia.ppcre" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2022-07-07/trivia-20220707-git.tgz"; - sha256 = "0w0qnl7j833b054fm47xnlx283rd6rzxf2sl672r91h081jk9ahv"; - system = "trivia.ppcre"; - asd = "trivia.ppcre"; - }); - systems = [ "trivia.ppcre" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "trivia_dot_trivial" pkgs) ]; - }; - trivia_dot_quasiquote = { - pname = "trivia.quasiquote"; - version = "20220707-git"; - asds = [ "trivia.quasiquote" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2022-07-07/trivia-20220707-git.tgz"; - sha256 = "0w0qnl7j833b054fm47xnlx283rd6rzxf2sl672r91h081jk9ahv"; - system = "trivia.quasiquote"; - asd = "trivia.quasiquote"; - }); - systems = [ "trivia.quasiquote" ]; - lispLibs = [ (getAttr "fare-quasiquote-readtable" pkgs) (getAttr "trivia_dot_trivial" pkgs) ]; - }; - trivia_dot_test = { - pname = "trivia.test"; - version = "20220707-git"; - asds = [ "trivia.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2022-07-07/trivia-20220707-git.tgz"; - sha256 = "0w0qnl7j833b054fm47xnlx283rd6rzxf2sl672r91h081jk9ahv"; - system = "trivia.test"; - asd = "trivia.test"; - }); - systems = [ "trivia.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "optima" pkgs) (getAttr "trivia" pkgs) (getAttr "trivia_dot_cffi" pkgs) (getAttr "trivia_dot_fset" pkgs) (getAttr "trivia_dot_ppcre" pkgs) (getAttr "trivia_dot_quasiquote" pkgs) ]; - }; - trivia_dot_trivial = { - pname = "trivia.trivial"; - version = "20220707-git"; - asds = [ "trivia.trivial" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivia/2022-07-07/trivia-20220707-git.tgz"; - sha256 = "0w0qnl7j833b054fm47xnlx283rd6rzxf2sl672r91h081jk9ahv"; - system = "trivia.trivial"; - asd = "trivia.trivial"; - }); - systems = [ "trivia.trivial" ]; - lispLibs = [ (getAttr "trivia_dot_level2" pkgs) ]; - }; - trivial-arguments = { - pname = "trivial-arguments"; - version = "20200925-git"; - asds = [ "trivial-arguments" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-arguments/2020-09-25/trivial-arguments-20200925-git.tgz"; - sha256 = "02vaqfavhj8jqxnr68nnzvzshm8jbgcy6m9lvyv4daa6f7ihqf88"; - system = "trivial-arguments"; - asd = "trivial-arguments"; - }); - systems = [ "trivial-arguments" ]; - lispLibs = [ ]; - }; - trivial-backtrace = { - pname = "trivial-backtrace"; - version = "20200610-git"; - asds = [ "trivial-backtrace" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz"; - sha256 = "1mbaqiwj5034iw6jzw30jyhwzp1pvhnz1zcy0lns0z5j2h9ldapw"; - system = "trivial-backtrace"; - asd = "trivial-backtrace"; - }); - systems = [ "trivial-backtrace" ]; - lispLibs = [ ]; - }; - trivial-backtrace-test = { - pname = "trivial-backtrace-test"; - version = "20200610-git"; - asds = [ "trivial-backtrace-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz"; - sha256 = "1mbaqiwj5034iw6jzw30jyhwzp1pvhnz1zcy0lns0z5j2h9ldapw"; - system = "trivial-backtrace-test"; - asd = "trivial-backtrace-test"; - }); - systems = [ "trivial-backtrace-test" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "trivial-backtrace" pkgs) ]; - }; - trivial-battery = { - pname = "trivial-battery"; - version = "20211020-git"; - asds = [ "trivial-battery" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-battery/2021-10-20/trivial-battery-20211020-git.tgz"; - sha256 = "12ni2502v9gjszhjsh0aai08cm64gl8g815xghdjhcf7y34ffl2b"; - system = "trivial-battery"; - asd = "trivial-battery"; - }); - systems = [ "trivial-battery" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) ]; - }; - trivial-benchmark = { - pname = "trivial-benchmark"; - version = "20220707-git"; - asds = [ "trivial-benchmark" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-benchmark/2022-07-07/trivial-benchmark-20220707-git.tgz"; - sha256 = "1n8p3gjkv1fx8qfjykjvzf1b02mpv1d5s58583c1vyvc5ikjm389"; - system = "trivial-benchmark"; - asd = "trivial-benchmark"; - }); - systems = [ "trivial-benchmark" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - trivial-bit-streams = { - pname = "trivial-bit-streams"; - version = "20190710-git"; - asds = [ "trivial-bit-streams" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-bit-streams/2019-07-10/trivial-bit-streams-20190710-git.tgz"; - sha256 = "01xcs069934pzm8gi1xkwgd4lw37ams30i6rcgrlw8gnx4zc4zc9"; - system = "trivial-bit-streams"; - asd = "trivial-bit-streams"; - }); - systems = [ "trivial-bit-streams" ]; - lispLibs = [ (getAttr "trivial-gray-streams" pkgs) ]; - }; - trivial-bit-streams-tests = { - pname = "trivial-bit-streams-tests"; - version = "20190710-git"; - asds = [ "trivial-bit-streams-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-bit-streams/2019-07-10/trivial-bit-streams-20190710-git.tgz"; - sha256 = "01xcs069934pzm8gi1xkwgd4lw37ams30i6rcgrlw8gnx4zc4zc9"; - system = "trivial-bit-streams-tests"; - asd = "trivial-bit-streams-tests"; - }); - systems = [ "trivial-bit-streams-tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "trivial-bit-streams" pkgs) ]; - }; - trivial-build = { - pname = "trivial-build"; - version = "20151218-git"; - asds = [ "trivial-build" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-build/2015-12-18/trivial-build-20151218-git.tgz"; - sha256 = "10h1igvryaqz6f72i57ppifysnw8swnss9395sijnk595icja7q0"; - system = "trivial-build"; - asd = "trivial-build"; - }); - systems = [ "trivial-build" ]; - lispLibs = [ (getAttr "lisp-invocation" pkgs) (getAttr "trivial-exe" pkgs) ]; - }; - trivial-build-test = { - pname = "trivial-build-test"; - version = "20151218-git"; - asds = [ "trivial-build-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-build/2015-12-18/trivial-build-20151218-git.tgz"; - sha256 = "10h1igvryaqz6f72i57ppifysnw8swnss9395sijnk595icja7q0"; - system = "trivial-build-test"; - asd = "trivial-build-test"; - }); - systems = [ "trivial-build-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-build" pkgs) ]; - }; - trivial-channels = { - pname = "trivial-channels"; - version = "20160421-git"; - asds = [ "trivial-channels" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-channels/2016-04-21/trivial-channels-20160421-git.tgz"; - sha256 = "04wnxcgk40x8p0gxnz9arv1a5wasdqrdxa8c4p5v7r2mycfps6jj"; - system = "trivial-channels"; - asd = "trivial-channels"; - }); - systems = [ "trivial-channels" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "trivial-timeout" pkgs) ]; - }; - trivial-clipboard = { - pname = "trivial-clipboard"; - version = "20221106-git"; - asds = [ "trivial-clipboard" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-clipboard/2022-11-06/trivial-clipboard-20221106-git.tgz"; - sha256 = "0l198m1gg2ixc43lqjq1ffd80s1sjxhqf1w83qqa1cn51rra2jp8"; - system = "trivial-clipboard"; - asd = "trivial-clipboard"; - }); - systems = [ "trivial-clipboard" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - trivial-clipboard-test = { - pname = "trivial-clipboard-test"; - version = "20221106-git"; - asds = [ "trivial-clipboard-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-clipboard/2022-11-06/trivial-clipboard-20221106-git.tgz"; - sha256 = "0l198m1gg2ixc43lqjq1ffd80s1sjxhqf1w83qqa1cn51rra2jp8"; - system = "trivial-clipboard-test"; - asd = "trivial-clipboard-test"; - }); - systems = [ "trivial-clipboard-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-clipboard" pkgs) ]; - }; - trivial-cltl2 = { - pname = "trivial-cltl2"; - version = "20211230-git"; - asds = [ "trivial-cltl2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-cltl2/2021-12-30/trivial-cltl2-20211230-git.tgz"; - sha256 = "0xx5vr0dp623m111zbfdk6x7l4jgd4wwyp6iarbj6ijq514wi3a3"; - system = "trivial-cltl2"; - asd = "trivial-cltl2"; - }); - systems = [ "trivial-cltl2" ]; - lispLibs = [ ]; - }; - trivial-coerce = { - pname = "trivial-coerce"; - version = "20220707-git"; - asds = [ "trivial-coerce" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-coerce/2022-07-07/trivial-coerce-20220707-git.tgz"; - sha256 = "0nn8ib6j0w0mhbwl0hqi3n7svpfi1if56m9cslhslq2gs2w7qn58"; - system = "trivial-coerce"; - asd = "trivial-coerce"; - }); - systems = [ "trivial-coerce" ]; - lispLibs = [ (getAttr "ctype" pkgs) (getAttr "polymorphic-functions" pkgs) (getAttr "trivial-types" pkgs) ]; - }; - trivial-coerce_slash_tests = { - pname = "trivial-coerce_tests"; - version = "20220707-git"; - asds = [ "trivial-coerce" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-coerce/2022-07-07/trivial-coerce-20220707-git.tgz"; - sha256 = "0nn8ib6j0w0mhbwl0hqi3n7svpfi1if56m9cslhslq2gs2w7qn58"; - system = "trivial-coerce"; - asd = "trivial-coerce"; - }); - systems = [ "trivial-coerce/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-coerce" pkgs) ]; - meta = { - broken = true; - }; - }; - trivial-compress = { - pname = "trivial-compress"; - version = "20201220-git"; - asds = [ "trivial-compress" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-compress/2020-12-20/trivial-compress-20201220-git.tgz"; - sha256 = "1pbaz0phvzi27dgnfknscak1h27bsi16gys23kchg8y8zbm0z0g7"; - system = "trivial-compress"; - asd = "trivial-compress"; - }); - systems = [ "trivial-compress" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "archive" pkgs) (getAttr "uiop" pkgs) (getAttr "which" pkgs) (getAttr "zip" pkgs) ]; - }; - trivial-compress-test = { - pname = "trivial-compress-test"; - version = "20201220-git"; - asds = [ "trivial-compress-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-compress/2020-12-20/trivial-compress-20201220-git.tgz"; - sha256 = "1pbaz0phvzi27dgnfknscak1h27bsi16gys23kchg8y8zbm0z0g7"; - system = "trivial-compress-test"; - asd = "trivial-compress-test"; - }); - systems = [ "trivial-compress-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-compress" pkgs) ]; - }; - trivial-continuation = { - pname = "trivial-continuation"; - version = "20191007-git"; - asds = [ "trivial-continuation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-continuation/2019-10-07/trivial-continuation-20191007-git.tgz"; - sha256 = "1j8d8q86r60qr9pi5p3q7rqn16xpzbzygs0i9b8sn3qyxnnz5037"; - system = "trivial-continuation"; - asd = "trivial-continuation"; - }); - systems = [ "trivial-continuation" ]; - lispLibs = [ (getAttr "log4cl" pkgs) (getAttr "trivial-utilities" pkgs) ]; - }; - trivial-continuation_slash_test = { - pname = "trivial-continuation_test"; - version = "20191007-git"; - asds = [ "trivial-continuation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-continuation/2019-10-07/trivial-continuation-20191007-git.tgz"; - sha256 = "1j8d8q86r60qr9pi5p3q7rqn16xpzbzygs0i9b8sn3qyxnnz5037"; - system = "trivial-continuation"; - asd = "trivial-continuation"; - }); - systems = [ "trivial-continuation/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-continuation" pkgs) ]; - meta = { - broken = true; - }; - }; - trivial-coverage = { - pname = "trivial-coverage"; - version = "20200218-git"; - asds = [ "trivial-coverage" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-coverage/2020-02-18/trivial-coverage-20200218-git.tgz"; - sha256 = "1ak4mjcvzdjsjjh7j89zlnwgaamfrspxmjh2i9kg67kqn36prbsp"; - system = "trivial-coverage"; - asd = "trivial-coverage"; - }); - systems = [ "trivial-coverage" ]; - lispLibs = [ (getAttr "lquery" pkgs) ]; - }; - trivial-custom-debugger = { - pname = "trivial-custom-debugger"; - version = "20200925-git"; - asds = [ "trivial-custom-debugger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-custom-debugger/2020-09-25/trivial-custom-debugger-20200925-git.tgz"; - sha256 = "1iri5wsp9sc1f5q934cj87zd79r5dc8fda0gl7x1pz95v0wx28yk"; - system = "trivial-custom-debugger"; - asd = "trivial-custom-debugger"; - }); - systems = [ "trivial-custom-debugger" ]; - lispLibs = [ ]; - }; - trivial-custom-debugger_slash_test = { - pname = "trivial-custom-debugger_test"; - version = "20200925-git"; - asds = [ "trivial-custom-debugger" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-custom-debugger/2020-09-25/trivial-custom-debugger-20200925-git.tgz"; - sha256 = "1iri5wsp9sc1f5q934cj87zd79r5dc8fda0gl7x1pz95v0wx28yk"; - system = "trivial-custom-debugger"; - asd = "trivial-custom-debugger"; - }); - systems = [ "trivial-custom-debugger/test" ]; - lispLibs = [ (getAttr "parachute" pkgs) (getAttr "trivial-custom-debugger" pkgs) ]; - meta = { - broken = true; - }; - }; - trivial-debug-console = { - pname = "trivial-debug-console"; - version = "20150407-git"; - asds = [ "trivial-debug-console" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-debug-console/2015-04-07/trivial-debug-console-20150407-git.tgz"; - sha256 = "07r42k57vldg01hfwjhkic2hsy84c2s5zj7pl60xjl960i0lqnam"; - system = "trivial-debug-console"; - asd = "trivial-debug-console"; - }); - systems = [ "trivial-debug-console" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - trivial-do = { - pname = "trivial-do"; - version = "20220331-git"; - asds = [ "trivial-do" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-do/2022-03-31/trivial-do-20220331-git.tgz"; - sha256 = "0vql7am4zyg6zav3l6n6q3qgdxlnchdxpgdxp8lr9sm7jra7sdsf"; - system = "trivial-do"; - asd = "trivial-do"; - }); - systems = [ "trivial-do" ]; - lispLibs = [ ]; - }; - trivial-documentation = { - pname = "trivial-documentation"; - version = "20161204-git"; - asds = [ "trivial-documentation" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-documentation/2016-12-04/trivial-documentation-20161204-git.tgz"; - sha256 = "0y90zi6kaw7226xc089dl47677fz594a5ck1ld8yggk9ww7cdaav"; - system = "trivial-documentation"; - asd = "trivial-documentation"; - }); - systems = [ "trivial-documentation" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - trivial-documentation-test = { - pname = "trivial-documentation-test"; - version = "20161204-git"; - asds = [ "trivial-documentation-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-documentation/2016-12-04/trivial-documentation-20161204-git.tgz"; - sha256 = "0y90zi6kaw7226xc089dl47677fz594a5ck1ld8yggk9ww7cdaav"; - system = "trivial-documentation-test"; - asd = "trivial-documentation-test"; - }); - systems = [ "trivial-documentation-test" ]; - lispLibs = [ (getAttr "trivial-documentation" pkgs) ]; - }; - trivial-download = { - pname = "trivial-download"; - version = "20200925-git"; - asds = [ "trivial-download" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-download/2020-09-25/trivial-download-20200925-git.tgz"; - sha256 = "06f46zr3gp3wlm2kgxna24qd2gpr1v89x9fynh1x5vrw6c6hqjcv"; - system = "trivial-download"; - asd = "trivial-download"; - }); - systems = [ "trivial-download" ]; - lispLibs = [ (getAttr "drakma" pkgs) ]; - }; - trivial-dump-core = { - pname = "trivial-dump-core"; - version = "20170227-git"; - asds = [ "trivial-dump-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-dump-core/2017-02-27/trivial-dump-core-20170227-git.tgz"; - sha256 = "08lnp84gbf3yd3gpnbjbl8jm9p42j3m4hf2f355l7lylb8kabxn8"; - system = "trivial-dump-core"; - asd = "trivial-dump-core"; - }); - systems = [ "trivial-dump-core" ]; - lispLibs = [ ]; - }; - trivial-ed-functions = { - pname = "trivial-ed-functions"; - version = "20210807-git"; - asds = [ "trivial-ed-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ed-functions/2021-08-07/trivial-ed-functions-20210807-git.tgz"; - sha256 = "05r8n4jjcg2lci5qrjwqz913wivckgk01ivjg1barpnm0nr29qn1"; - system = "trivial-ed-functions"; - asd = "trivial-ed-functions"; - }); - systems = [ "trivial-ed-functions" ]; - lispLibs = [ ]; - }; - trivial-ed-functions_slash_test = { - pname = "trivial-ed-functions_test"; - version = "20210807-git"; - asds = [ "trivial-ed-functions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ed-functions/2021-08-07/trivial-ed-functions-20210807-git.tgz"; - sha256 = "05r8n4jjcg2lci5qrjwqz913wivckgk01ivjg1barpnm0nr29qn1"; - system = "trivial-ed-functions"; - asd = "trivial-ed-functions"; - }); - systems = [ "trivial-ed-functions/test" ]; - lispLibs = [ (getAttr "parachute" pkgs) (getAttr "trivial-ed-functions" pkgs) ]; - meta = { - broken = true; - }; - }; - trivial-escapes = { - pname = "trivial-escapes"; - version = "20180228-git"; - asds = [ "trivial-escapes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-escapes/2018-02-28/trivial-escapes-20180228-git.tgz"; - sha256 = "0v6h8lk17iqv1qkxgqjyzn8gi6v0hvq2vmfbb01md3zjvjqxn6lr"; - system = "trivial-escapes"; - asd = "trivial-escapes"; - }); - systems = [ "trivial-escapes" ]; - lispLibs = [ (getAttr "named-readtables" pkgs) ]; - }; - trivial-escapes-test = { - pname = "trivial-escapes-test"; - version = "20180228-git"; - asds = [ "trivial-escapes-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-escapes/2018-02-28/trivial-escapes-20180228-git.tgz"; - sha256 = "0v6h8lk17iqv1qkxgqjyzn8gi6v0hvq2vmfbb01md3zjvjqxn6lr"; - system = "trivial-escapes-test"; - asd = "trivial-escapes-test"; - }); - systems = [ "trivial-escapes-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-escapes" pkgs) (getAttr "uiop" pkgs) ]; - }; - trivial-exe = { - pname = "trivial-exe"; - version = "20151218-git"; - asds = [ "trivial-exe" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-exe/2015-12-18/trivial-exe-20151218-git.tgz"; - sha256 = "1ryn7gh3n057czj3hwq6lx7h25ipfjxsvddywpm2ngfdwywaqzvc"; - system = "trivial-exe"; - asd = "trivial-exe"; - }); - systems = [ "trivial-exe" ]; - lispLibs = [ (getAttr "osicat" pkgs) (getAttr "uiop" pkgs) ]; - }; - trivial-exe-test = { - pname = "trivial-exe-test"; - version = "20151218-git"; - asds = [ "trivial-exe-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-exe/2015-12-18/trivial-exe-20151218-git.tgz"; - sha256 = "1ryn7gh3n057czj3hwq6lx7h25ipfjxsvddywpm2ngfdwywaqzvc"; - system = "trivial-exe-test"; - asd = "trivial-exe-test"; - }); - systems = [ "trivial-exe-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-exe" pkgs) ]; - }; - trivial-extensible-sequences = { - pname = "trivial-extensible-sequences"; - version = "20221106-git"; - asds = [ "trivial-extensible-sequences" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-extensible-sequences/2022-11-06/trivial-extensible-sequences-20221106-git.tgz"; - sha256 = "0352psdd8j0phjycr6ldckwspyal4jcf0f2fizi6fwdp7nvadng7"; - system = "trivial-extensible-sequences"; - asd = "trivial-extensible-sequences"; - }); - systems = [ "trivial-extensible-sequences" ]; - lispLibs = [ ]; - }; - trivial-extract = { - pname = "trivial-extract"; - version = "20160421-git"; - asds = [ "trivial-extract" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-extract/2016-04-21/trivial-extract-20160421-git.tgz"; - sha256 = "0083x71f4x6b64wd8ywgaiqi0ygmdhl5rv101jcv44l3l61839sx"; - system = "trivial-extract"; - asd = "trivial-extract"; - }); - systems = [ "trivial-extract" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "archive" pkgs) (getAttr "cl-fad" pkgs) (getAttr "deflate" pkgs) (getAttr "uiop" pkgs) (getAttr "which" pkgs) (getAttr "zip" pkgs) ]; - }; - trivial-extract-test = { - pname = "trivial-extract-test"; - version = "20160421-git"; - asds = [ "trivial-extract-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-extract/2016-04-21/trivial-extract-20160421-git.tgz"; - sha256 = "0083x71f4x6b64wd8ywgaiqi0ygmdhl5rv101jcv44l3l61839sx"; - system = "trivial-extract-test"; - asd = "trivial-extract-test"; - }); - systems = [ "trivial-extract-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-extract" pkgs) ]; - }; - trivial-features = { - pname = "trivial-features"; - version = "20211209-git"; - asds = [ "trivial-features" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-features/2021-12-09/trivial-features-20211209-git.tgz"; - sha256 = "0v3kvkz91zmc1y71xg0w08dwljrjngv375m14rypxi65ym1kabmk"; - system = "trivial-features"; - asd = "trivial-features"; - }); - systems = [ "trivial-features" ]; - lispLibs = [ ]; - }; - trivial-features-tests = { - pname = "trivial-features-tests"; - version = "20211209-git"; - asds = [ "trivial-features-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-features/2021-12-09/trivial-features-20211209-git.tgz"; - sha256 = "0v3kvkz91zmc1y71xg0w08dwljrjngv375m14rypxi65ym1kabmk"; - system = "trivial-features-tests"; - asd = "trivial-features-tests"; - }); - systems = [ "trivial-features-tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "rt" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - trivial-file-size = { - pname = "trivial-file-size"; - version = "20221106-git"; - asds = [ "trivial-file-size" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-file-size/2022-11-06/trivial-file-size-20221106-git.tgz"; - sha256 = "0ji5j3zgshmfgxwg2yh599r47zaivzky646zk12jg48sb3i7q8fw"; - system = "trivial-file-size"; - asd = "trivial-file-size"; - }); - systems = [ "trivial-file-size" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - trivial-file-size_slash_tests = { - pname = "trivial-file-size_tests"; - version = "20221106-git"; - asds = [ "trivial-file-size" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-file-size/2022-11-06/trivial-file-size-20221106-git.tgz"; - sha256 = "0ji5j3zgshmfgxwg2yh599r47zaivzky646zk12jg48sb3i7q8fw"; - system = "trivial-file-size"; - asd = "trivial-file-size"; - }); - systems = [ "trivial-file-size/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-file-size" pkgs) ]; - meta = { - broken = true; - }; - }; - trivial-garbage = { - pname = "trivial-garbage"; - version = "20211230-git"; - asds = [ "trivial-garbage" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-garbage/2021-12-30/trivial-garbage-20211230-git.tgz"; - sha256 = "1kmx5kdl4zfa8cfdjyi75z43fqzxvywavwg1s8fl5zxpflfdj8h8"; - system = "trivial-garbage"; - asd = "trivial-garbage"; - }); - systems = [ "trivial-garbage" ]; - lispLibs = [ ]; - }; - trivial-garbage_slash_tests = { - pname = "trivial-garbage_tests"; - version = "20211230-git"; - asds = [ "trivial-garbage" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-garbage/2021-12-30/trivial-garbage-20211230-git.tgz"; - sha256 = "1kmx5kdl4zfa8cfdjyi75z43fqzxvywavwg1s8fl5zxpflfdj8h8"; - system = "trivial-garbage"; - asd = "trivial-garbage"; - }); - systems = [ "trivial-garbage/tests" ]; - lispLibs = [ (getAttr "rt" pkgs) (getAttr "trivial-garbage" pkgs) ]; - meta = { - broken = true; - }; - }; - trivial-gray-streams = { - pname = "trivial-gray-streams"; - version = "20210124-git"; - asds = [ "trivial-gray-streams" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2021-01-24/trivial-gray-streams-20210124-git.tgz"; - sha256 = "1hipqwwd5ylskybd173rvlsk7ds4w4nq1cmh9952ivm6dgh7pwzn"; - system = "trivial-gray-streams"; - asd = "trivial-gray-streams"; - }); - systems = [ "trivial-gray-streams" ]; - lispLibs = [ ]; - }; - trivial-gray-streams-test = { - pname = "trivial-gray-streams-test"; - version = "20210124-git"; - asds = [ "trivial-gray-streams-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2021-01-24/trivial-gray-streams-20210124-git.tgz"; - sha256 = "1hipqwwd5ylskybd173rvlsk7ds4w4nq1cmh9952ivm6dgh7pwzn"; - system = "trivial-gray-streams-test"; - asd = "trivial-gray-streams-test"; - }); - systems = [ "trivial-gray-streams-test" ]; - lispLibs = [ (getAttr "trivial-gray-streams" pkgs) ]; - }; - trivial-hashtable-serialize = { - pname = "trivial-hashtable-serialize"; - version = "20191007-git"; - asds = [ "trivial-hashtable-serialize" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-hashtable-serialize/2019-10-07/trivial-hashtable-serialize-20191007-git.tgz"; - sha256 = "06xdci47h6rpfkmrf7p9kd217jbkmkmf90ygqcmkkgf3sv5623bh"; - system = "trivial-hashtable-serialize"; - asd = "trivial-hashtable-serialize"; - }); - systems = [ "trivial-hashtable-serialize" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) ]; - }; - trivial-http = { - pname = "trivial-http"; - version = "20110219-http"; - asds = [ "trivial-http" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-http/2011-02-19/trivial-http-20110219-http.tgz"; - sha256 = "06mrh2bjzhfdzi48dnq0bhl2cac4v41aqck53rfm4rnsygcjsn78"; - system = "trivial-http"; - asd = "trivial-http"; - }); - systems = [ "trivial-http" ]; - lispLibs = [ (getAttr "usocket" pkgs) ]; - }; - trivial-http-test = { - pname = "trivial-http-test"; - version = "20110219-http"; - asds = [ "trivial-http-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-http/2011-02-19/trivial-http-20110219-http.tgz"; - sha256 = "06mrh2bjzhfdzi48dnq0bhl2cac4v41aqck53rfm4rnsygcjsn78"; - system = "trivial-http-test"; - asd = "trivial-http-test"; - }); - systems = [ "trivial-http-test" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "trivial-http" pkgs) ]; - }; - trivial-indent = { - pname = "trivial-indent"; - version = "20210531-git"; - asds = [ "trivial-indent" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-indent/2021-05-31/trivial-indent-20210531-git.tgz"; - sha256 = "0j8ip54v0w49hi8y3cd52r4ayy3fz8zqsm6jl88xwa6v3lh05rhv"; - system = "trivial-indent"; - asd = "trivial-indent"; - }); - systems = [ "trivial-indent" ]; - lispLibs = [ ]; - }; - trivial-inspector-hook = { - pname = "trivial-inspector-hook"; - version = "20210807-git"; - asds = [ "trivial-inspector-hook" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-inspector-hook/2021-08-07/trivial-inspector-hook-20210807-git.tgz"; - sha256 = "0h9m1ps5sqgrr171czj6rq84wpy2xvggfzspvy667xsldv4xi0c2"; - system = "trivial-inspector-hook"; - asd = "trivial-inspector-hook"; - }); - systems = [ "trivial-inspector-hook" ]; - lispLibs = [ ]; - }; - trivial-irc = { - pname = "trivial-irc"; - version = "20171019-git"; - asds = [ "trivial-irc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-irc/2017-10-19/trivial-irc-20171019-git.tgz"; - sha256 = "0jjgx6ld2gcr0w0g5k62dr0rl6202ydih6ylmypv6m5jmrarcbza"; - system = "trivial-irc"; - asd = "trivial-irc"; - }); - systems = [ "trivial-irc" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "split-sequence" pkgs) (getAttr "usocket" pkgs) ]; - }; - trivial-irc-echobot = { - pname = "trivial-irc-echobot"; - version = "20171019-git"; - asds = [ "trivial-irc-echobot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-irc/2017-10-19/trivial-irc-20171019-git.tgz"; - sha256 = "0jjgx6ld2gcr0w0g5k62dr0rl6202ydih6ylmypv6m5jmrarcbza"; - system = "trivial-irc-echobot"; - asd = "trivial-irc-echobot"; - }); - systems = [ "trivial-irc-echobot" ]; - lispLibs = [ (getAttr "trivial-irc" pkgs) ]; - }; - trivial-json-codec = { - pname = "trivial-json-codec"; - version = "20220707-git"; - asds = [ "trivial-json-codec" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-json-codec/2022-07-07/trivial-json-codec-20220707-git.tgz"; - sha256 = "1k0nnsn3nsb83gzmkrf81zqz6ydn21gzfq96r2d5690v5zkrg1kg"; - system = "trivial-json-codec"; - asd = "trivial-json-codec"; - }); - systems = [ "trivial-json-codec" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "log4cl" pkgs) (getAttr "parse-number" pkgs) (getAttr "trivial-utilities" pkgs) ]; - }; - trivial-jumptables = { - pname = "trivial-jumptables"; - version = "1.1"; - asds = [ "trivial-jumptables" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-jumptables/2019-11-30/trivial-jumptables_1.1.tgz"; - sha256 = "10ih84hkscj0l4ki3s196d9b85iil8f56ps5r8ng222i0lln1ni9"; - system = "trivial-jumptables"; - asd = "trivial-jumptables"; - }); - systems = [ "trivial-jumptables" ]; - lispLibs = [ ]; - }; - trivial-jumptables_tests = { - pname = "trivial-jumptables_tests"; - version = "1.1"; - asds = [ "trivial-jumptables_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-jumptables/2019-11-30/trivial-jumptables_1.1.tgz"; - sha256 = "10ih84hkscj0l4ki3s196d9b85iil8f56ps5r8ng222i0lln1ni9"; - system = "trivial-jumptables_tests"; - asd = "trivial-jumptables_tests"; - }); - systems = [ "trivial-jumptables_tests" ]; - lispLibs = [ (getAttr "bubble-operator-upwards" pkgs) (getAttr "parachute" pkgs) (getAttr "trivial-jumptables" pkgs) ]; - }; - trivial-lazy = { - pname = "trivial-lazy"; - version = "20150709-git"; - asds = [ "trivial-lazy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-lazy/2015-07-09/trivial-lazy-20150709-git.tgz"; - sha256 = "0fnsz2kdb0v5cz4xl5a2c1szcif7jmnkxhbzvk6lrhzjccgyhjc7"; - system = "trivial-lazy"; - asd = "trivial-lazy"; - }); - systems = [ "trivial-lazy" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - trivial-ldap = { - pname = "trivial-ldap"; - version = "20180711-git"; - asds = [ "trivial-ldap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ldap/2018-07-11/trivial-ldap-20180711-git.tgz"; - sha256 = "1zaa4wnk5y5ff211pkg6dl27j4pjwh56hq0246slxsdxv6kvp1z9"; - system = "trivial-ldap"; - asd = "trivial-ldap"; - }); - systems = [ "trivial-ldap" ]; - lispLibs = [ (getAttr "cl_plus_ssl" pkgs) (getAttr "yacc" pkgs) (getAttr "usocket" pkgs) ]; - }; - trivial-left-pad = { - pname = "trivial-left-pad"; - version = "20190813-git"; - asds = [ "trivial-left-pad" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-left-pad/2019-08-13/trivial-left-pad-20190813-git.tgz"; - sha256 = "0q68j0x0x3z8rl577jsl3y0s3x5xiqv54sla6kds43q7821qfnwk"; - system = "trivial-left-pad"; - asd = "trivial-left-pad"; - }); - systems = [ "trivial-left-pad" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "prove-asdf" pkgs) ]; - }; - trivial-left-pad-test = { - pname = "trivial-left-pad-test"; - version = "20190813-git"; - asds = [ "trivial-left-pad-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-left-pad/2019-08-13/trivial-left-pad-20190813-git.tgz"; - sha256 = "0q68j0x0x3z8rl577jsl3y0s3x5xiqv54sla6kds43q7821qfnwk"; - system = "trivial-left-pad-test"; - asd = "trivial-left-pad"; - }); - systems = [ "trivial-left-pad-test" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "trivial-left-pad" pkgs) ]; - }; - trivial-macroexpand-all = { - pname = "trivial-macroexpand-all"; - version = "20171023-git"; - asds = [ "trivial-macroexpand-all" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz"; - sha256 = "191hnn4b5j4i3crydmlzbm231kj0h7l8zj6mzj69r1npbzkas4bd"; - system = "trivial-macroexpand-all"; - asd = "trivial-macroexpand-all"; - }); - systems = [ "trivial-macroexpand-all" ]; - lispLibs = [ ]; - }; - trivial-main-thread = { - pname = "trivial-main-thread"; - version = "20190710-git"; - asds = [ "trivial-main-thread" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz"; - sha256 = "0bw1887i7396lqg75qvmgjfzz4xbiq9w5dp8wxdgrcsm0qwlraw7"; - system = "trivial-main-thread"; - asd = "trivial-main-thread"; - }); - systems = [ "trivial-main-thread" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "simple-tasks" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - trivial-method-combinations = { - pname = "trivial-method-combinations"; - version = "20191130-git"; - asds = [ "trivial-method-combinations" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-method-combinations/2019-11-30/trivial-method-combinations-20191130-git.tgz"; - sha256 = "0w9w8bj835sfp797rdm7b5crpnz0xrz2q5vgbzm2p9n9jskxnxnv"; - system = "trivial-method-combinations"; - asd = "trivial-method-combinations"; - }); - systems = [ "trivial-method-combinations" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) ]; - }; - trivial-mimes = { - pname = "trivial-mimes"; - version = "20221106-git"; - asds = [ "trivial-mimes" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-mimes/2022-11-06/trivial-mimes-20221106-git.tgz"; - sha256 = "0dv76zsf701wapm0sw0hj074v8wjiynn700ri2sgkf5zbdwrza7h"; - system = "trivial-mimes"; - asd = "trivial-mimes"; - }); - systems = [ "trivial-mimes" ]; - lispLibs = [ ]; - }; - trivial-mmap = { - pname = "trivial-mmap"; - version = "20210124-git"; - asds = [ "trivial-mmap" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-mmap/2021-01-24/trivial-mmap-20210124-git.tgz"; - sha256 = "1ckhd7b0ll9xcmwdh42g0v38grk2acs3kv66k1gwh539f99kzcps"; - system = "trivial-mmap"; - asd = "trivial-mmap"; - }); - systems = [ "trivial-mmap" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "osicat" pkgs) ]; - }; - trivial-monitored-thread = { - pname = "trivial-monitored-thread"; - version = "20220707-git"; - asds = [ "trivial-monitored-thread" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-monitored-thread/2022-07-07/trivial-monitored-thread-20220707-git.tgz"; - sha256 = "1vmhc5id0qk5yh8az4j1znqc73r18pygmrnfxmwwndh1a9yf98z4"; - system = "trivial-monitored-thread"; - asd = "trivial-monitored-thread"; - }); - systems = [ "trivial-monitored-thread" ]; - lispLibs = [ (getAttr "iterate" pkgs) (getAttr "log4cl" pkgs) (getAttr "trivial-utilities" pkgs) ]; - }; - trivial-monitored-thread_slash_test = { - pname = "trivial-monitored-thread_test"; - version = "20220707-git"; - asds = [ "trivial-monitored-thread" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-monitored-thread/2022-07-07/trivial-monitored-thread-20220707-git.tgz"; - sha256 = "1vmhc5id0qk5yh8az4j1znqc73r18pygmrnfxmwwndh1a9yf98z4"; - system = "trivial-monitored-thread"; - asd = "trivial-monitored-thread"; - }); - systems = [ "trivial-monitored-thread/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-monitored-thread" pkgs) ]; - meta = { - broken = true; - }; - }; - trivial-msi = { - pname = "trivial-msi"; - version = "20160208-git"; - asds = [ "trivial-msi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-msi/2016-02-08/trivial-msi-20160208-git.tgz"; - sha256 = "1mbpwnsvv30gf7z8m96kv8933s6csg4q0frx03vazp4ckplwff8w"; - system = "trivial-msi"; - asd = "trivial-msi"; - }); - systems = [ "trivial-msi" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - trivial-msi-test = { - pname = "trivial-msi-test"; - version = "20160208-git"; - asds = [ "trivial-msi-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-msi/2016-02-08/trivial-msi-20160208-git.tgz"; - sha256 = "1mbpwnsvv30gf7z8m96kv8933s6csg4q0frx03vazp4ckplwff8w"; - system = "trivial-msi-test"; - asd = "trivial-msi-test"; - }); - systems = [ "trivial-msi-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-msi" pkgs) ]; - }; - trivial-nntp = { - pname = "trivial-nntp"; - version = "20161204-git"; - asds = [ "trivial-nntp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-nntp/2016-12-04/trivial-nntp-20161204-git.tgz"; - sha256 = "0ywwrjx4vaz117zaxqhk2b4xrb75cw1ac5xir9zhvgzkyl6wf867"; - system = "trivial-nntp"; - asd = "trivial-nntp"; - }); - systems = [ "trivial-nntp" ]; - lispLibs = [ (getAttr "cl_plus_ssl" pkgs) (getAttr "usocket" pkgs) ]; - }; - trivial-object-lock = { - pname = "trivial-object-lock"; - version = "20220707-git"; - asds = [ "trivial-object-lock" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-object-lock/2022-07-07/trivial-object-lock-20220707-git.tgz"; - sha256 = "18xwwgvshib4l2bs6m16mk0kzdp40482yf7v72nzk13v0bgnw91s"; - system = "trivial-object-lock"; - asd = "trivial-object-lock"; - }); - systems = [ "trivial-object-lock" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "iterate" pkgs) (getAttr "log4cl" pkgs) (getAttr "trivial-utilities" pkgs) ]; - }; - trivial-object-lock_slash_test = { - pname = "trivial-object-lock_test"; - version = "20220707-git"; - asds = [ "trivial-object-lock" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-object-lock/2022-07-07/trivial-object-lock-20220707-git.tgz"; - sha256 = "18xwwgvshib4l2bs6m16mk0kzdp40482yf7v72nzk13v0bgnw91s"; - system = "trivial-object-lock"; - asd = "trivial-object-lock"; - }); - systems = [ "trivial-object-lock/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-object-lock" pkgs) ]; - meta = { - broken = true; - }; - }; - trivial-octet-streams = { - pname = "trivial-octet-streams"; - version = "20130128-git"; - asds = [ "trivial-octet-streams" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-octet-streams/2013-01-28/trivial-octet-streams-20130128-git.tgz"; - sha256 = "0ysnsarlzynb7jf4b63b6kkxjancxc66jwmn0sb3vxyh87siiv6n"; - system = "trivial-octet-streams"; - asd = "trivial-octet-streams"; - }); - systems = [ "trivial-octet-streams" ]; - lispLibs = [ ]; - }; - trivial-open-browser = { - pname = "trivial-open-browser"; - version = "20160825-git"; - asds = [ "trivial-open-browser" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-open-browser/2016-08-25/trivial-open-browser-20160825-git.tgz"; - sha256 = "0ixay1piq420i6adx642qhw45l6ik7rvgk52lyz27dvx5f8yqsdb"; - system = "trivial-open-browser"; - asd = "trivial-open-browser"; - }); - systems = [ "trivial-open-browser" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - trivial-openstack = { - pname = "trivial-openstack"; - version = "20160628-git"; - asds = [ "trivial-openstack" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-openstack/2016-06-28/trivial-openstack-20160628-git.tgz"; - sha256 = "0sdc6rhjqv1i7wknn44jg5xxnz70087bhfslh0izggny9d9s015i"; - system = "trivial-openstack"; - asd = "trivial-openstack"; - }); - systems = [ "trivial-openstack" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "drakma" pkgs) (getAttr "local-time" pkgs) (getAttr "st-json" pkgs) ]; - }; - trivial-openstack-test = { - pname = "trivial-openstack-test"; - version = "20160628-git"; - asds = [ "trivial-openstack-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-openstack/2016-06-28/trivial-openstack-20160628-git.tgz"; - sha256 = "0sdc6rhjqv1i7wknn44jg5xxnz70087bhfslh0izggny9d9s015i"; - system = "trivial-openstack-test"; - asd = "trivial-openstack-test"; - }); - systems = [ "trivial-openstack-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "local-time" pkgs) (getAttr "st-json" pkgs) (getAttr "trivial-openstack" pkgs) (getAttr "uri-template" pkgs) ]; - }; - trivial-package-local-nicknames = { - pname = "trivial-package-local-nicknames"; - version = "20220220-git"; - asds = [ "trivial-package-local-nicknames" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2022-02-20/trivial-package-local-nicknames-20220220-git.tgz"; - sha256 = "0p80s474czfqh7phd4qq5yjcy8q2160vxmn8pi6qlkqgdd7ix37r"; - system = "trivial-package-local-nicknames"; - asd = "trivial-package-local-nicknames"; - }); - systems = [ "trivial-package-local-nicknames" ]; - lispLibs = [ ]; - }; - trivial-package-locks = { - pname = "trivial-package-locks"; - version = "20211230-git"; - asds = [ "trivial-package-locks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-package-locks/2021-12-30/trivial-package-locks-20211230-git.tgz"; - sha256 = "15wnz095mc4hvgrb5dipdvlkm3gl17f3ip333c61cn00f5lc4pq6"; - system = "trivial-package-locks"; - asd = "trivial-package-locks"; - }); - systems = [ "trivial-package-locks" ]; - lispLibs = [ ]; - }; - trivial-package-locks_slash_test = { - pname = "trivial-package-locks_test"; - version = "20211230-git"; - asds = [ "trivial-package-locks" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-package-locks/2021-12-30/trivial-package-locks-20211230-git.tgz"; - sha256 = "15wnz095mc4hvgrb5dipdvlkm3gl17f3ip333c61cn00f5lc4pq6"; - system = "trivial-package-locks"; - asd = "trivial-package-locks"; - }); - systems = [ "trivial-package-locks/test" ]; - lispLibs = [ (getAttr "parachute" pkgs) (getAttr "trivial-package-locks" pkgs) ]; - meta = { - broken = true; - }; - }; - trivial-package-manager = { - pname = "trivial-package-manager"; - version = "20171227-git"; - asds = [ "trivial-package-manager" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-package-manager/2017-12-27/trivial-package-manager-20171227-git.tgz"; - sha256 = "0v61x4wzamilnjyq35ki46zl9443fslv9slwqwlazfknnbp3vcq8"; - system = "trivial-package-manager"; - asd = "trivial-package-manager"; - }); - systems = [ "trivial-package-manager" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-open-browser" pkgs) ]; - }; - trivial-package-manager_dot_test = { - pname = "trivial-package-manager.test"; - version = "20171227-git"; - asds = [ "trivial-package-manager.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-package-manager/2017-12-27/trivial-package-manager-20171227-git.tgz"; - sha256 = "0v61x4wzamilnjyq35ki46zl9443fslv9slwqwlazfknnbp3vcq8"; - system = "trivial-package-manager.test"; - asd = "trivial-package-manager.test"; - }); - systems = [ "trivial-package-manager.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-package-manager" pkgs) ]; - }; - trivial-pooled-database = { - pname = "trivial-pooled-database"; - version = "20201220-git"; - asds = [ "trivial-pooled-database" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-pooled-database/2020-12-20/trivial-pooled-database-20201220-git.tgz"; - sha256 = "0a7c8bjl13k37b83lksklcw9sch570wgqv58cgs0dw9jcmsihqmx"; - system = "trivial-pooled-database"; - asd = "trivial-pooled-database"; - }); - systems = [ "trivial-pooled-database" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-dbi" pkgs) (getAttr "iterate" pkgs) (getAttr "log4cl" pkgs) (getAttr "parse-number" pkgs) (getAttr "trivial-object-lock" pkgs) (getAttr "trivial-utilities" pkgs) ]; - }; - trivial-project = { - pname = "trivial-project"; - version = "quicklisp-9e3fe231-git"; - asds = [ "trivial-project" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-project/2017-08-30/trivial-project-quicklisp-9e3fe231-git.tgz"; - sha256 = "1s5h0fgs0rq00j492xln716w9i52v90rnfcr0idjzyimicx7hk22"; - system = "trivial-project"; - asd = "trivial-project"; - }); - systems = [ "trivial-project" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - trivial-raw-io = { - pname = "trivial-raw-io"; - version = "20141217-git"; - asds = [ "trivial-raw-io" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-raw-io/2014-12-17/trivial-raw-io-20141217-git.tgz"; - sha256 = "19290zw2b64k78wr62gv30pp7cmqg07q85vfwjknaffjdd73xwi1"; - system = "trivial-raw-io"; - asd = "trivial-raw-io"; - }); - systems = [ "trivial-raw-io" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - trivial-renamer = { - pname = "trivial-renamer"; - version = "quicklisp-1282597d-git"; - asds = [ "trivial-renamer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-renamer/2017-08-30/trivial-renamer-quicklisp-1282597d-git.tgz"; - sha256 = "1nlgsayx4iw6gskg0d5vc823p0lmh414k9jiccvcsk1r17684mp8"; - system = "trivial-renamer"; - asd = "trivial-renamer"; - }); - systems = [ "trivial-renamer" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - trivial-rfc-1123 = { - pname = "trivial-rfc-1123"; - version = "20220707-git"; - asds = [ "trivial-rfc-1123" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-rfc-1123/2022-07-07/trivial-rfc-1123-20220707-git.tgz"; - sha256 = "1w4ywpj10fnp7cya62dzlxlg8nyk4lppn2pnmfixsndwr4ib1h6x"; - system = "trivial-rfc-1123"; - asd = "trivial-rfc-1123"; - }); - systems = [ "trivial-rfc-1123" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) ]; - }; - trivial-sanitize = { - pname = "trivial-sanitize"; - version = "20221106-git"; - asds = [ "trivial-sanitize" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-sanitize/2022-11-06/trivial-sanitize-20221106-git.tgz"; - sha256 = "1pv36ywkqcck1vrxdwhlwjw80qkzbr6aqwyrghfng6qfc90r05f6"; - system = "trivial-sanitize"; - asd = "trivial-sanitize"; - }); - systems = [ "trivial-sanitize" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-html5-parser" pkgs) (getAttr "cl-ppcre-unicode" pkgs) (getAttr "uiop" pkgs) ]; - }; - trivial-sanitize-tests = { - pname = "trivial-sanitize-tests"; - version = "20221106-git"; - asds = [ "trivial-sanitize-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-sanitize/2022-11-06/trivial-sanitize-20221106-git.tgz"; - sha256 = "1pv36ywkqcck1vrxdwhlwjw80qkzbr6aqwyrghfng6qfc90r05f6"; - system = "trivial-sanitize-tests"; - asd = "trivial-sanitize-tests"; - }); - systems = [ "trivial-sanitize-tests" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "clunit2" pkgs) (getAttr "trivial-sanitize" pkgs) (getAttr "uiop" pkgs) ]; - }; - trivial-shell = { - pname = "trivial-shell"; - version = "20180228-git"; - asds = [ "trivial-shell" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-shell/2018-02-28/trivial-shell-20180228-git.tgz"; - sha256 = "08mpkl5ij5sjfsyn8pq2kvsvpvyvr7ha1r8g1224fa667b8k2q85"; - system = "trivial-shell"; - asd = "trivial-shell"; - }); - systems = [ "trivial-shell" ]; - lispLibs = [ ]; - }; - trivial-shell-test = { - pname = "trivial-shell-test"; - version = "20180228-git"; - asds = [ "trivial-shell-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-shell/2018-02-28/trivial-shell-20180228-git.tgz"; - sha256 = "08mpkl5ij5sjfsyn8pq2kvsvpvyvr7ha1r8g1224fa667b8k2q85"; - system = "trivial-shell-test"; - asd = "trivial-shell-test"; - }); - systems = [ "trivial-shell-test" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "trivial-shell" pkgs) ]; - }; - trivial-signal = { - pname = "trivial-signal"; - version = "20190710-git"; - asds = [ "trivial-signal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-signal/2019-07-10/trivial-signal-20190710-git.tgz"; - sha256 = "13rh1jwh786xg235rkgqbdqga4b9jwn99zlxm0wr73rs2a5ga8ad"; - system = "trivial-signal"; - asd = "trivial-signal"; - }); - systems = [ "trivial-signal" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - trivial-sockets = { - pname = "trivial-sockets"; - version = "20190107-git"; - asds = [ "trivial-sockets" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-sockets/2019-01-07/trivial-sockets-20190107-git.tgz"; - sha256 = "0xj9x5z3psxqap9c29qz1xswx5fiqxyzd35kmbw2g6z08cgb7nd0"; - system = "trivial-sockets"; - asd = "trivial-sockets"; - }); - systems = [ "trivial-sockets" ]; - lispLibs = [ ]; - }; - trivial-ssh = { - pname = "trivial-ssh"; - version = "20191130-git"; - asds = [ "trivial-ssh" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz"; - sha256 = "1hjd8bhbymq4s2jglid5i9m2b19cnf6c793gvkh6mawcjd37vjmb"; - system = "trivial-ssh"; - asd = "trivial-ssh"; - }); - systems = [ "trivial-ssh" ]; - lispLibs = [ (getAttr "trivial-ssh-libssh2" pkgs) ]; - }; - trivial-ssh-libssh2 = { - pname = "trivial-ssh-libssh2"; - version = "20191130-git"; - asds = [ "trivial-ssh-libssh2" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz"; - sha256 = "1hjd8bhbymq4s2jglid5i9m2b19cnf6c793gvkh6mawcjd37vjmb"; - system = "trivial-ssh-libssh2"; - asd = "trivial-ssh-libssh2"; - }); - systems = [ "trivial-ssh-libssh2" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-fad" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "usocket" pkgs) ]; - }; - trivial-ssh-test = { - pname = "trivial-ssh-test"; - version = "20191130-git"; - asds = [ "trivial-ssh-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ssh/2019-11-30/trivial-ssh-20191130-git.tgz"; - sha256 = "1hjd8bhbymq4s2jglid5i9m2b19cnf6c793gvkh6mawcjd37vjmb"; - system = "trivial-ssh-test"; - asd = "trivial-ssh-test"; - }); - systems = [ "trivial-ssh-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-ssh" pkgs) ]; - }; - trivial-string-template = { - pname = "trivial-string-template"; - version = "20201220-git"; - asds = [ "trivial-string-template" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-string-template/2020-12-20/trivial-string-template-20201220-git.tgz"; - sha256 = "1g3hm2xkskzq3dgygxbny0f5wqcyv8f7wkdh473jkya9lq7c3jph"; - system = "trivial-string-template"; - asd = "trivial-string-template"; - }); - systems = [ "trivial-string-template" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "proc-parse" pkgs) ]; - }; - trivial-string-template-test = { - pname = "trivial-string-template-test"; - version = "20201220-git"; - asds = [ "trivial-string-template-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-string-template/2020-12-20/trivial-string-template-20201220-git.tgz"; - sha256 = "1g3hm2xkskzq3dgygxbny0f5wqcyv8f7wkdh473jkya9lq7c3jph"; - system = "trivial-string-template-test"; - asd = "trivial-string-template-test"; - }); - systems = [ "trivial-string-template-test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "trivial-string-template" pkgs) ]; - }; - trivial-tco = { - pname = "trivial-tco"; - version = "20131003-git"; - asds = [ "trivial-tco" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-tco/2013-10-03/trivial-tco-20131003-git.tgz"; - sha256 = "0j6mkchrk6bzkpdkrahagip9lxxr8rx3qj4547wg8bdqr7mm2nmi"; - system = "trivial-tco"; - asd = "trivial-tco"; - }); - systems = [ "trivial-tco" ]; - lispLibs = [ ]; - }; - trivial-tco-test = { - pname = "trivial-tco-test"; - version = "20131003-git"; - asds = [ "trivial-tco-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-tco/2013-10-03/trivial-tco-20131003-git.tgz"; - sha256 = "0j6mkchrk6bzkpdkrahagip9lxxr8rx3qj4547wg8bdqr7mm2nmi"; - system = "trivial-tco-test"; - asd = "trivial-tco-test"; - }); - systems = [ "trivial-tco-test" ]; - lispLibs = [ (getAttr "clunit" pkgs) (getAttr "trivial-tco" pkgs) ]; - }; - trivial-thumbnail = { - pname = "trivial-thumbnail"; - version = "20190710-git"; - asds = [ "trivial-thumbnail" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-thumbnail/2019-07-10/trivial-thumbnail-20190710-git.tgz"; - sha256 = "0d1jdfab1wrc3xfzhdbq7bgjwc78qb6gs1llyjsj4cq04yhlc57a"; - system = "trivial-thumbnail"; - asd = "trivial-thumbnail"; - }); - systems = [ "trivial-thumbnail" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - trivial-timeout = { - pname = "trivial-timeout"; - version = "20211209-git"; - asds = [ "trivial-timeout" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-timeout/2021-12-09/trivial-timeout-20211209-git.tgz"; - sha256 = "0nzsb4pbk1ia49v50dmbsdc6svmiy1k9zqr9ri1nkfy01zhdvg07"; - system = "trivial-timeout"; - asd = "trivial-timeout"; - }); - systems = [ "trivial-timeout" ]; - lispLibs = [ ]; - }; - trivial-timer = { - pname = "trivial-timer"; - version = "20210531-git"; - asds = [ "trivial-timer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-timer/2021-05-31/trivial-timer-20210531-git.tgz"; - sha256 = "1b8pnw613h1dngzmv3qglmfrl1jdjbxrsbqnh7rfdj0lnv43h1il"; - system = "trivial-timer"; - asd = "trivial-timer"; - }); - systems = [ "trivial-timer" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "chanl" pkgs) (getAttr "iterate" pkgs) (getAttr "log4cl" pkgs) (getAttr "trivial-utilities" pkgs) ]; - }; - trivial-timer_slash_test = { - pname = "trivial-timer_test"; - version = "20210531-git"; - asds = [ "trivial-timer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-timer/2021-05-31/trivial-timer-20210531-git.tgz"; - sha256 = "1b8pnw613h1dngzmv3qglmfrl1jdjbxrsbqnh7rfdj0lnv43h1il"; - system = "trivial-timer"; - asd = "trivial-timer"; - }); - systems = [ "trivial-timer/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-timer" pkgs) ]; - meta = { - broken = true; - }; - }; - trivial-types = { - pname = "trivial-types"; - version = "20120407-git"; - asds = [ "trivial-types" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz"; - sha256 = "1s4cp9bdlbn8447q7w7f1wkgwrbvfzp20mgs307l5pxvdslin341"; - system = "trivial-types"; - asd = "trivial-types"; - }); - systems = [ "trivial-types" ]; - lispLibs = [ ]; - }; - trivial-update = { - pname = "trivial-update"; - version = "20180131-git"; - asds = [ "trivial-update" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-update/2018-01-31/trivial-update-20180131-git.tgz"; - sha256 = "0dpijh9alljk0jmnkp37hfliylscs7xwvlmjkfshizmyh0qjjxir"; - system = "trivial-update"; - asd = "trivial-update"; - }); - systems = [ "trivial-update" ]; - lispLibs = [ ]; - }; - trivial-utf-8 = { - pname = "trivial-utf-8"; - version = "20220220-git"; - asds = [ "trivial-utf-8" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-utf-8/2022-02-20/trivial-utf-8-20220220-git.tgz"; - sha256 = "0gzgbyzbbhny5y1lq2x82vfy4b4p1snq1sy9lj82hdq7lkyj03ss"; - system = "trivial-utf-8"; - asd = "trivial-utf-8"; - }); - systems = [ "trivial-utf-8" ]; - lispLibs = [ ]; - }; - trivial-utf-8_slash_doc = { - pname = "trivial-utf-8_doc"; - version = "20220220-git"; - asds = [ "trivial-utf-8" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-utf-8/2022-02-20/trivial-utf-8-20220220-git.tgz"; - sha256 = "0gzgbyzbbhny5y1lq2x82vfy4b4p1snq1sy9lj82hdq7lkyj03ss"; - system = "trivial-utf-8"; - asd = "trivial-utf-8"; - }); - systems = [ "trivial-utf-8/doc" ]; - lispLibs = [ (getAttr "mgl-pax" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - meta = { - broken = true; - }; - }; - trivial-utf-8_slash_tests = { - pname = "trivial-utf-8_tests"; - version = "20220220-git"; - asds = [ "trivial-utf-8" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-utf-8/2022-02-20/trivial-utf-8-20220220-git.tgz"; - sha256 = "0gzgbyzbbhny5y1lq2x82vfy4b4p1snq1sy9lj82hdq7lkyj03ss"; - system = "trivial-utf-8"; - asd = "trivial-utf-8"; - }); - systems = [ "trivial-utf-8/tests" ]; - lispLibs = [ (getAttr "trivial-utf-8" pkgs) ]; - meta = { - broken = true; - }; - }; - trivial-utilities = { - pname = "trivial-utilities"; - version = "20220707-git"; - asds = [ "trivial-utilities" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-utilities/2022-07-07/trivial-utilities-20220707-git.tgz"; - sha256 = "0k1xmn5f5dik7scadw0vyy67mik4ypnfqbhlv2vsg9afxzbpx2dz"; - system = "trivial-utilities"; - asd = "trivial-utilities"; - }); - systems = [ "trivial-utilities" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) ]; - }; - trivial-variable-bindings = { - pname = "trivial-variable-bindings"; - version = "20191007-git"; - asds = [ "trivial-variable-bindings" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-variable-bindings/2019-10-07/trivial-variable-bindings-20191007-git.tgz"; - sha256 = "08lx5m1bspxsnv572zma1hxk3yfyk9fkmi5cvcr5riannyimdqgy"; - system = "trivial-variable-bindings"; - asd = "trivial-variable-bindings"; - }); - systems = [ "trivial-variable-bindings" ]; - lispLibs = [ (getAttr "iterate" pkgs) (getAttr "trivial-utilities" pkgs) ]; - }; - trivial-variable-bindings_slash_test = { - pname = "trivial-variable-bindings_test"; - version = "20191007-git"; - asds = [ "trivial-variable-bindings" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-variable-bindings/2019-10-07/trivial-variable-bindings-20191007-git.tgz"; - sha256 = "08lx5m1bspxsnv572zma1hxk3yfyk9fkmi5cvcr5riannyimdqgy"; - system = "trivial-variable-bindings"; - asd = "trivial-variable-bindings"; - }); - systems = [ "trivial-variable-bindings/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivial-variable-bindings" pkgs) ]; - meta = { - broken = true; - }; - }; - trivial-wish = { - pname = "trivial-wish"; - version = "quicklisp-910afeea-git"; - asds = [ "trivial-wish" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-wish/2017-06-30/trivial-wish-quicklisp-910afeea-git.tgz"; - sha256 = "1ydb9vsanrv6slbddhxc38pq5s88k0rzgqnwabw5cgc8cp5gqvyp"; - system = "trivial-wish"; - asd = "trivial-wish"; - }); - systems = [ "trivial-wish" ]; - lispLibs = [ ]; - }; - trivial-with = { - pname = "trivial-with"; - version = "quicklisp-2fd8ca54-git"; - asds = [ "trivial-with" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-with/2017-08-30/trivial-with-quicklisp-2fd8ca54-git.tgz"; - sha256 = "1h880j9k7piq6y5a6sywn1r43h439dd6vfymqvhgnbx458wy69sq"; - system = "trivial-with"; - asd = "trivial-with"; - }); - systems = [ "trivial-with" ]; - lispLibs = [ ]; - }; - trivial-with-current-source-form = { - pname = "trivial-with-current-source-form"; - version = "20211020-git"; - asds = [ "trivial-with-current-source-form" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-with-current-source-form/2021-10-20/trivial-with-current-source-form-20211020-git.tgz"; - sha256 = "1114iibrds8rvwn4zrqnmvm8mvbgdzbrka53dxs1q61ajv44x8i0"; - system = "trivial-with-current-source-form"; - asd = "trivial-with-current-source-form"; - }); - systems = [ "trivial-with-current-source-form" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - trivial-ws = { - pname = "trivial-ws"; - version = "20180131-git"; - asds = [ "trivial-ws" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz"; - sha256 = "0qmsf0dhmyhjgqjzdgj2yb1nkrijwp4p1j411613i45xjc2zd6m7"; - system = "trivial-ws"; - asd = "trivial-ws"; - }); - systems = [ "trivial-ws" ]; - lispLibs = [ (getAttr "hunchensocket" pkgs) ]; - }; - trivial-ws-client = { - pname = "trivial-ws-client"; - version = "20180131-git"; - asds = [ "trivial-ws-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz"; - sha256 = "0qmsf0dhmyhjgqjzdgj2yb1nkrijwp4p1j411613i45xjc2zd6m7"; - system = "trivial-ws-client"; - asd = "trivial-ws-client"; - }); - systems = [ "trivial-ws-client" ]; - lispLibs = [ (getAttr "cl-async" pkgs) (getAttr "websocket-driver" pkgs) ]; - }; - trivial-ws-test = { - pname = "trivial-ws-test"; - version = "20180131-git"; - asds = [ "trivial-ws-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-ws/2018-01-31/trivial-ws-20180131-git.tgz"; - sha256 = "0qmsf0dhmyhjgqjzdgj2yb1nkrijwp4p1j411613i45xjc2zd6m7"; - system = "trivial-ws-test"; - asd = "trivial-ws-test"; - }); - systems = [ "trivial-ws-test" ]; - lispLibs = [ (getAttr "find-port" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "trivial-ws" pkgs) (getAttr "trivial-ws-client" pkgs) ]; - }; - trivial-yenc = { - pname = "trivial-yenc"; - version = "20161204-git"; - asds = [ "trivial-yenc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivial-yenc/2016-12-04/trivial-yenc-20161204-git.tgz"; - sha256 = "0jsqwixgikdinc1rq22c4dh9kgg6z0kvw9rh9sbssbmxv99sb5bf"; - system = "trivial-yenc"; - asd = "trivial-yenc"; - }); - systems = [ "trivial-yenc" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) ]; - }; - trivialib_dot_bdd = { - pname = "trivialib.bdd"; - version = "20211209-git"; - asds = [ "trivialib.bdd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivialib.bdd/2021-12-09/trivialib.bdd-20211209-git.tgz"; - sha256 = "1iqpcihpm6glr0afi35z6qifj0ppl7s4h1k94fn6lqpv2js6lzbr"; - system = "trivialib.bdd"; - asd = "trivialib.bdd"; - }); - systems = [ "trivialib.bdd" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "immutable-struct" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - trivialib_dot_bdd_dot_test = { - pname = "trivialib.bdd.test"; - version = "20211209-git"; - asds = [ "trivialib.bdd.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivialib.bdd/2021-12-09/trivialib.bdd-20211209-git.tgz"; - sha256 = "1iqpcihpm6glr0afi35z6qifj0ppl7s4h1k94fn6lqpv2js6lzbr"; - system = "trivialib.bdd.test"; - asd = "trivialib.bdd.test"; - }); - systems = [ "trivialib.bdd.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivialib_dot_bdd" pkgs) ]; - }; - trivialib_dot_type-unify = { - pname = "trivialib.type-unify"; - version = "20200325-git"; - asds = [ "trivialib.type-unify" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivialib.type-unify/2020-03-25/trivialib.type-unify-20200325-git.tgz"; - sha256 = "0b5ck9ldn1w3imgpxyh164bypy28kvjzkwlcyyfsc0h1njnm5jmy"; - system = "trivialib.type-unify"; - asd = "trivialib.type-unify"; - }); - systems = [ "trivialib.type-unify" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "trivia" pkgs) (getAttr "type-r" pkgs) ]; - }; - trivialib_dot_type-unify_dot_test = { - pname = "trivialib.type-unify.test"; - version = "20200325-git"; - asds = [ "trivialib.type-unify.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trivialib.type-unify/2020-03-25/trivialib.type-unify-20200325-git.tgz"; - sha256 = "0b5ck9ldn1w3imgpxyh164bypy28kvjzkwlcyyfsc0h1njnm5jmy"; - system = "trivialib.type-unify.test"; - asd = "trivialib.type-unify.test"; - }); - systems = [ "trivialib.type-unify.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "trivialib_dot_type-unify" pkgs) ]; - }; - trucler = { - pname = "trucler"; - version = "20220707-git"; - asds = [ "trucler" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trucler/2022-07-07/trucler-20220707-git.tgz"; - sha256 = "0ra1phwy0vn4xrm5i1dvq9205m6s9fl0sr0rpiz3xjykxyl9mzms"; - system = "trucler"; - asd = "trucler"; - }); - systems = [ "trucler" ]; - lispLibs = [ (getAttr "trucler-base" pkgs) (getAttr "trucler-native" pkgs) ]; - }; - trucler-base = { - pname = "trucler-base"; - version = "20220707-git"; - asds = [ "trucler-base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trucler/2022-07-07/trucler-20220707-git.tgz"; - sha256 = "0ra1phwy0vn4xrm5i1dvq9205m6s9fl0sr0rpiz3xjykxyl9mzms"; - system = "trucler-base"; - asd = "trucler-base"; - }); - systems = [ "trucler-base" ]; - lispLibs = [ (getAttr "acclimation" pkgs) ]; - }; - trucler-native = { - pname = "trucler-native"; - version = "20220707-git"; - asds = [ "trucler-native" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trucler/2022-07-07/trucler-20220707-git.tgz"; - sha256 = "0ra1phwy0vn4xrm5i1dvq9205m6s9fl0sr0rpiz3xjykxyl9mzms"; - system = "trucler-native"; - asd = "trucler-native"; - }); - systems = [ "trucler-native" ]; - lispLibs = [ (getAttr "trucler-base" pkgs) ]; - }; - trucler-native-test = { - pname = "trucler-native-test"; - version = "20220707-git"; - asds = [ "trucler-native-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trucler/2022-07-07/trucler-20220707-git.tgz"; - sha256 = "0ra1phwy0vn4xrm5i1dvq9205m6s9fl0sr0rpiz3xjykxyl9mzms"; - system = "trucler-native-test"; - asd = "trucler-native-test"; - }); - systems = [ "trucler-native-test" ]; - lispLibs = [ (getAttr "trucler-base" pkgs) (getAttr "trucler-native" pkgs) ]; - }; - trucler-reference = { - pname = "trucler-reference"; - version = "20220707-git"; - asds = [ "trucler-reference" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/trucler/2022-07-07/trucler-20220707-git.tgz"; - sha256 = "0ra1phwy0vn4xrm5i1dvq9205m6s9fl0sr0rpiz3xjykxyl9mzms"; - system = "trucler-reference"; - asd = "trucler-reference"; - }); - systems = [ "trucler-reference" ]; - lispLibs = [ (getAttr "trucler-base" pkgs) ]; - }; - truetype-clx = { - pname = "truetype-clx"; - version = "20200218-git"; - asds = [ "truetype-clx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/truetype-clx/2020-02-18/truetype-clx-20200218-git.tgz"; - sha256 = "1k46xa0nclj0mpd7khnlpam6q5hgnp23jixryhvv96gx47swhddr"; - system = "truetype-clx"; - asd = "truetype-clx"; - }); - systems = [ "truetype-clx" ]; - lispLibs = [ (getAttr "cl-aa" pkgs) (getAttr "cl-paths-ttf" pkgs) (getAttr "cl-vectors" pkgs) (getAttr "zpb-ttf" pkgs) ]; - }; - try = { - pname = "try"; - version = "20220331-git"; - asds = [ "try" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/try/2022-03-31/try-20220331-git.tgz"; - sha256 = "03dm2i2y4wiyzz9d25zdxm6gdglnvwali0ylp0rfwpk6wf29sj09"; - system = "try"; - asd = "try"; - }); - systems = [ "try" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "mgl-pax" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "try_dot_asdf" pkgs) (getAttr "uiop" pkgs) ]; - }; - try_dot_asdf = { - pname = "try.asdf"; - version = "20220331-git"; - asds = [ "try.asdf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/try/2022-03-31/try-20220331-git.tgz"; - sha256 = "03dm2i2y4wiyzz9d25zdxm6gdglnvwali0ylp0rfwpk6wf29sj09"; - system = "try.asdf"; - asd = "try.asdf"; - }); - systems = [ "try.asdf" ]; - lispLibs = [ ]; - }; - try_slash_doc = { - pname = "try_doc"; - version = "20220331-git"; - asds = [ "try" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/try/2022-03-31/try-20220331-git.tgz"; - sha256 = "03dm2i2y4wiyzz9d25zdxm6gdglnvwali0ylp0rfwpk6wf29sj09"; - system = "try"; - asd = "try"; - }); - systems = [ "try/doc" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "try" pkgs) ]; - meta = { - broken = true; - }; - }; - try_slash_test = { - pname = "try_test"; - version = "20220331-git"; - asds = [ "try" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/try/2022-03-31/try-20220331-git.tgz"; - sha256 = "03dm2i2y4wiyzz9d25zdxm6gdglnvwali0ylp0rfwpk6wf29sj09"; - system = "try"; - asd = "try"; - }); - systems = [ "try/test" ]; - lispLibs = [ (getAttr "try" pkgs) ]; - meta = { - broken = true; - }; - }; - tsqueue = { - pname = "tsqueue"; - version = "20221106-git"; - asds = [ "tsqueue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/tsqueue/2022-11-06/tsqueue-20221106-git.tgz"; - sha256 = "1ifq53b95a1sdpgx1hlz31pjbh0z6izh3wrgsiqvzgkbiyxq513q"; - system = "tsqueue"; - asd = "tsqueue"; - }); - systems = [ "tsqueue" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - ttt = { - pname = "ttt"; - version = "20220707-git"; - asds = [ "ttt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ttt/2022-07-07/ttt-20220707-git.tgz"; - sha256 = "0g6p8gpl8hl427mfrrf8824zq6wmkj11v1xq7pyv7v0b5cwp5ccv"; - system = "ttt"; - asd = "ttt"; - }); - systems = [ "ttt" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) ]; - }; - ttt_slash_tests = { - pname = "ttt_tests"; - version = "20220707-git"; - asds = [ "ttt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ttt/2022-07-07/ttt-20220707-git.tgz"; - sha256 = "0g6p8gpl8hl427mfrrf8824zq6wmkj11v1xq7pyv7v0b5cwp5ccv"; - system = "ttt"; - asd = "ttt"; - }); - systems = [ "ttt/tests" ]; - lispLibs = [ (getAttr "lisp-unit" pkgs) (getAttr "ttt" pkgs) ]; - meta = { - broken = true; - }; - }; - twfy = { - pname = "twfy"; - version = "20130420-git"; - asds = [ "twfy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/twfy/2013-04-20/twfy-20130420-git.tgz"; - sha256 = "1srns5ayg7q8dzviizgm7j767dxbbyzh2ca8a5wdz3bc0qmwrsbs"; - system = "twfy"; - asd = "twfy"; - }); - systems = [ "twfy" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "drakma" pkgs) ]; - }; - twitter-mongodb-driver = { - pname = "twitter-mongodb-driver"; - version = "20180228-git"; - asds = [ "twitter-mongodb-driver" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-twitter/2018-02-28/cl-twitter-20180228-git.tgz"; - sha256 = "07l86c63ssahpz3s9f7d99mbzmh60askkpdrhjrdbzd1vxlwkhcr"; - system = "twitter-mongodb-driver"; - asd = "twitter-mongodb-driver"; - }); - systems = [ "twitter-mongodb-driver" ]; - lispLibs = [ (getAttr "cl-mongo" pkgs) (getAttr "cl-twitter" pkgs) ]; - }; - type-i = { - pname = "type-i"; - version = "20220707-git"; - asds = [ "type-i" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/type-i/2022-07-07/type-i-20220707-git.tgz"; - sha256 = "16d43cnrhj6313ka59ac6klwfq8hjabhvk9f9046pqd2mpyzcq50"; - system = "type-i"; - asd = "type-i"; - }); - systems = [ "type-i" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "lisp-namespace" pkgs) (getAttr "trivia_dot_trivial" pkgs) ]; - }; - type-i_dot_test = { - pname = "type-i.test"; - version = "20220707-git"; - asds = [ "type-i.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/type-i/2022-07-07/type-i-20220707-git.tgz"; - sha256 = "16d43cnrhj6313ka59ac6klwfq8hjabhvk9f9046pqd2mpyzcq50"; - system = "type-i.test"; - asd = "type-i.test"; - }); - systems = [ "type-i.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "type-i" pkgs) ]; - }; - type-r = { - pname = "type-r"; - version = "20191227-git"; - asds = [ "type-r" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/type-r/2019-12-27/type-r-20191227-git.tgz"; - sha256 = "1arsxc2539rg8vbrdirz4xxj1b06mc6g6rqndz7a02g127qvk2sm"; - system = "type-r"; - asd = "type-r"; - }); - systems = [ "type-r" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "trivia" pkgs) ]; - }; - type-r_dot_test = { - pname = "type-r.test"; - version = "20191227-git"; - asds = [ "type-r.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/type-r/2019-12-27/type-r-20191227-git.tgz"; - sha256 = "1arsxc2539rg8vbrdirz4xxj1b06mc6g6rqndz7a02g127qvk2sm"; - system = "type-r.test"; - asd = "type-r.test"; - }); - systems = [ "type-r.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "type-r" pkgs) ]; - }; - typo = { - pname = "typo"; - version = "20221106-git"; - asds = [ "typo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/typo/2022-11-06/typo-20221106-git.tgz"; - sha256 = "08cmkjl3f77rfhxbjyd6f3kinhzak30mdfphnpf73sh1vw4v0vym"; - system = "typo"; - asd = "typo"; - }); - systems = [ "typo" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "introspect-environment" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-arguments" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - typo_dot_test-suite = { - pname = "typo.test-suite"; - version = "20221106-git"; - asds = [ "typo.test-suite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/typo/2022-11-06/typo-20221106-git.tgz"; - sha256 = "08cmkjl3f77rfhxbjyd6f3kinhzak30mdfphnpf73sh1vw4v0vym"; - system = "typo.test-suite"; - asd = "typo.test-suite"; - }); - systems = [ "typo.test-suite" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "typo" pkgs) ]; - }; - uax-14 = { - pname = "uax-14"; - version = "20200925-git"; - asds = [ "uax-14" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uax-14/2020-09-25/uax-14-20200925-git.tgz"; - sha256 = "1sb2s58k01yjaggaq8i7kbyfsh6mzyqbiz1vm59smxn9qqwd8apm"; - system = "uax-14"; - asd = "uax-14"; - }); - systems = [ "uax-14" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - uax-14-test = { - pname = "uax-14-test"; - version = "20200925-git"; - asds = [ "uax-14-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uax-14/2020-09-25/uax-14-20200925-git.tgz"; - sha256 = "1sb2s58k01yjaggaq8i7kbyfsh6mzyqbiz1vm59smxn9qqwd8apm"; - system = "uax-14-test"; - asd = "uax-14-test"; - }); - systems = [ "uax-14-test" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "parachute" pkgs) (getAttr "uax-14" pkgs) ]; - }; - uax-15 = { - pname = "uax-15"; - version = "20221106-git"; - asds = [ "uax-15" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uax-15/2022-11-06/uax-15-20221106-git.tgz"; - sha256 = "0kkr3sw3hqsb8ciyn8dzb1cfz260fk1y39vydc98gsfrn6nqh3vw"; - system = "uax-15"; - asd = "uax-15"; - }); - systems = [ "uax-15" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - uax-15_slash_tests = { - pname = "uax-15_tests"; - version = "20221106-git"; - asds = [ "uax-15" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uax-15/2022-11-06/uax-15-20221106-git.tgz"; - sha256 = "0kkr3sw3hqsb8ciyn8dzb1cfz260fk1y39vydc98gsfrn6nqh3vw"; - system = "uax-15"; - asd = "uax-15"; - }); - systems = [ "uax-15/tests" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "parachute" pkgs) (getAttr "split-sequence" pkgs) (getAttr "uax-15" pkgs) ]; - meta = { - broken = true; - }; - }; - uax-9 = { - pname = "uax-9"; - version = "20191007-git"; - asds = [ "uax-9" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uax-9/2019-10-07/uax-9-20191007-git.tgz"; - sha256 = "0z9wfvrs5xpqw059igqdlhrvg1g87bvsxyvgwrx59dvr16v6f0h7"; - system = "uax-9"; - asd = "uax-9"; - }); - systems = [ "uax-9" ]; - lispLibs = [ (getAttr "documentation-utils" pkgs) ]; - }; - uax-9-test = { - pname = "uax-9-test"; - version = "20191007-git"; - asds = [ "uax-9-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uax-9/2019-10-07/uax-9-20191007-git.tgz"; - sha256 = "0z9wfvrs5xpqw059igqdlhrvg1g87bvsxyvgwrx59dvr16v6f0h7"; - system = "uax-9-test"; - asd = "uax-9-test"; - }); - systems = [ "uax-9-test" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "parachute" pkgs) (getAttr "uax-9" pkgs) ]; - }; - ubiquitous = { - pname = "ubiquitous"; - version = "20190710-git"; - asds = [ "ubiquitous" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ubiquitous/2019-07-10/ubiquitous-20190710-git.tgz"; - sha256 = "1xlkaqmjcpkiv2xl2s2pvvrv976dlc846wm16s1lj62iy1315i49"; - system = "ubiquitous"; - asd = "ubiquitous"; - }); - systems = [ "ubiquitous" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - ubiquitous-concurrent = { - pname = "ubiquitous-concurrent"; - version = "20190710-git"; - asds = [ "ubiquitous-concurrent" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ubiquitous/2019-07-10/ubiquitous-20190710-git.tgz"; - sha256 = "1xlkaqmjcpkiv2xl2s2pvvrv976dlc846wm16s1lj62iy1315i49"; - system = "ubiquitous-concurrent"; - asd = "ubiquitous-concurrent"; - }); - systems = [ "ubiquitous-concurrent" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "ubiquitous" pkgs) ]; - }; - ucons = { - pname = "ucons"; - version = "20210228-git"; - asds = [ "ucons" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ucons/2021-02-28/ucons-20210228-git.tgz"; - sha256 = "17aj47pdjiywnf33hl46p27za2q0pq5ar3fpqxaqskggxrfxmijl"; - system = "ucons"; - asd = "ucons"; - }); - systems = [ "ucons" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "atomics" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "named-readtables" pkgs) (getAttr "trivia" pkgs) ]; - }; - ucw = { - pname = "ucw"; - version = "20160208-darcs"; - asds = [ "ucw" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; - sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z"; - system = "ucw"; - asd = "ucw"; - }); - systems = [ "ucw" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "ucw-core" pkgs) ]; - }; - ucw-core = { - pname = "ucw-core"; - version = "20160208-darcs"; - asds = [ "ucw-core" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; - sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z"; - system = "ucw-core"; - asd = "ucw-core"; - }); - systems = [ "ucw-core" ]; - lispLibs = [ (getAttr "arnesi" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-fad" pkgs) (getAttr "closer-mop" pkgs) (getAttr "iterate" pkgs) (getAttr "local-time" pkgs) (getAttr "net-telent-date" pkgs) (getAttr "rfc2109" pkgs) (getAttr "swank" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "usocket" pkgs) (getAttr "yaclml" pkgs) ]; - }; - ucw-core_dot_test = { - pname = "ucw-core.test"; - version = "20160208-darcs"; - asds = [ "ucw-core.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; - sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z"; - system = "ucw-core.test"; - asd = "ucw-core"; - }); - systems = [ "ucw-core.test" ]; - lispLibs = [ (getAttr "arnesi" pkgs) (getAttr "cxml" pkgs) (getAttr "drakma" pkgs) (getAttr "iterate" pkgs) (getAttr "stefil" pkgs) (getAttr "ucw-core" pkgs) ]; - }; - ucw_dot_examples = { - pname = "ucw.examples"; - version = "20160208-darcs"; - asds = [ "ucw.examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; - sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z"; - system = "ucw.examples"; - asd = "ucw"; - }); - systems = [ "ucw.examples" ]; - lispLibs = [ (getAttr "ucw" pkgs) ]; - }; - ucw_dot_httpd = { - pname = "ucw.httpd"; - version = "20160208-darcs"; - asds = [ "ucw.httpd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; - sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z"; - system = "ucw.httpd"; - asd = "ucw-core"; - }); - systems = [ "ucw.httpd" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "puri" pkgs) (getAttr "rfc2388-binary" pkgs) (getAttr "ucw-core" pkgs) ]; - }; - ucw_dot_manual-examples = { - pname = "ucw.manual-examples"; - version = "20160208-darcs"; - asds = [ "ucw.manual-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ucw/2016-02-08/ucw-20160208-darcs.tgz"; - sha256 = "0wd7816zr53bw9z9a48cx1khj15d1jii5wzgqns1c5x70brgy89z"; - system = "ucw.manual-examples"; - asd = "ucw"; - }); - systems = [ "ucw.manual-examples" ]; - lispLibs = [ (getAttr "ucw" pkgs) ]; - }; - uffi = { - pname = "uffi"; - version = "20180228-git"; - asds = [ "uffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz"; - sha256 = "0ywly04k8vir39ld7ids80yjn34y3y3mlpky1pr1fh9p8q412a85"; - system = "uffi"; - asd = "uffi"; - }); - systems = [ "uffi" ]; - lispLibs = [ ]; - }; - uffi-tests = { - pname = "uffi-tests"; - version = "20180228-git"; - asds = [ "uffi-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz"; - sha256 = "0ywly04k8vir39ld7ids80yjn34y3y3mlpky1pr1fh9p8q412a85"; - system = "uffi-tests"; - asd = "uffi-tests"; - }); - systems = [ "uffi-tests" ]; - lispLibs = [ (getAttr "uffi" pkgs) ]; - }; - ufo = { - pname = "ufo"; - version = "20210807-git"; - asds = [ "ufo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ufo/2021-08-07/ufo-20210807-git.tgz"; - sha256 = "0bbq4pjnbmf1zpmh11jlriv0qnvrhw1xxnjj2y35gk75rr8rvizy"; - system = "ufo"; - asd = "ufo"; - }); - systems = [ "ufo" ]; - lispLibs = [ (getAttr "uiop" pkgs) ]; - }; - ufo-test = { - pname = "ufo-test"; - version = "20210807-git"; - asds = [ "ufo-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ufo/2021-08-07/ufo-20210807-git.tgz"; - sha256 = "0bbq4pjnbmf1zpmh11jlriv0qnvrhw1xxnjj2y35gk75rr8rvizy"; - system = "ufo-test"; - asd = "ufo-test"; - }); - systems = [ "ufo-test" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "ufo" pkgs) ]; - }; - ugly-tiny-infix-macro = { - pname = "ugly-tiny-infix-macro"; - version = "20160825-git"; - asds = [ "ugly-tiny-infix-macro" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ugly-tiny-infix-macro/2016-08-25/ugly-tiny-infix-macro-20160825-git.tgz"; - sha256 = "15bbnr3kzy3p35skm6bkyyl5ck4d264am0zyjsix5k58d9fli3ii"; - system = "ugly-tiny-infix-macro"; - asd = "ugly-tiny-infix-macro"; - }); - systems = [ "ugly-tiny-infix-macro" ]; - lispLibs = [ ]; - }; - uiop = { - pname = "uiop"; - version = "3.3.6"; - asds = [ "uiop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uiop/2022-11-06/uiop-3.3.6.tgz"; - sha256 = "080lcdw90j30gg2vv9bnwj21aq08mp1kk4nax3ffkjssnrnjwhmr"; - system = "uiop"; - asd = "uiop"; - }); - systems = [ "uiop" ]; - lispLibs = [ ]; - }; - umbra = { - pname = "umbra"; - version = "20220707-git"; - asds = [ "umbra" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/umbra/2022-07-07/umbra-20220707-git.tgz"; - sha256 = "125bsf69gzdy0r6jh6fz8000rqww1rji354x0yrgmkz9x3mvz4k4"; - system = "umbra"; - asd = "umbra"; - }); - systems = [ "umbra" ]; - lispLibs = [ (getAttr "mfiano-utils" pkgs) (getAttr "shadow" pkgs) (getAttr "varjo" pkgs) ]; - }; - umlisp = { - pname = "umlisp"; - version = "20210411-git"; - asds = [ "umlisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/umlisp/2021-04-11/umlisp-20210411-git.tgz"; - sha256 = "1yyyn1qka4iw3hwii7i8k939dbwvhn543m8qclk2ajggkdky4mqb"; - system = "umlisp"; - asd = "umlisp"; - }); - systems = [ "umlisp" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "clsql-mysql" pkgs) (getAttr "hyperobject" pkgs) (getAttr "kmrcl" pkgs) ]; - }; - umlisp-orf = { - pname = "umlisp-orf"; - version = "20150923-git"; - asds = [ "umlisp-orf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/umlisp-orf/2015-09-23/umlisp-orf-20150923-git.tgz"; - sha256 = "187i9rcj3rymi8hmlvglvig7yqandzzx57x0rzr4yfv8sgnb82qx"; - system = "umlisp-orf"; - asd = "umlisp-orf"; - }); - systems = [ "umlisp-orf" ]; - lispLibs = [ (getAttr "clsql" pkgs) (getAttr "clsql-postgresql-socket" pkgs) (getAttr "hyperobject" pkgs) (getAttr "kmrcl" pkgs) ]; - }; - umlisp-tests = { - pname = "umlisp-tests"; - version = "20210411-git"; - asds = [ "umlisp-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/umlisp/2021-04-11/umlisp-20210411-git.tgz"; - sha256 = "1yyyn1qka4iw3hwii7i8k939dbwvhn543m8qclk2ajggkdky4mqb"; - system = "umlisp-tests"; - asd = "umlisp-tests"; - }); - systems = [ "umlisp-tests" ]; - lispLibs = [ (getAttr "rt" pkgs) (getAttr "umlisp" pkgs) ]; - }; - uncommon-lisp = { - pname = "uncommon-lisp"; - version = "20200427-git"; - asds = [ "uncommon-lisp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "uncommon-lisp"; - asd = "uncommon-lisp"; - }); - systems = [ "uncommon-lisp" ]; - lispLibs = [ (getAttr "structy-defclass" pkgs) ]; - }; - uncursed = { - pname = "uncursed"; - version = "20220220-git"; - asds = [ "uncursed" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uncursed/2022-02-20/uncursed-20220220-git.tgz"; - sha256 = "1hydiwh12851rrm12y0a6pb2jml2cjdk8wxvz4c00d2xwraqc6mr"; - system = "uncursed"; - asd = "uncursed"; - }); - systems = [ "uncursed" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cl-setlocale" pkgs) (getAttr "terminfo" pkgs) ]; - }; - uncursed-examples = { - pname = "uncursed-examples"; - version = "20220220-git"; - asds = [ "uncursed-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uncursed/2022-02-20/uncursed-20220220-git.tgz"; - sha256 = "1hydiwh12851rrm12y0a6pb2jml2cjdk8wxvz4c00d2xwraqc6mr"; - system = "uncursed-examples"; - asd = "uncursed-examples"; - }); - systems = [ "uncursed-examples" ]; - lispLibs = [ (getAttr "cffi-grovel" pkgs) (getAttr "uncursed" pkgs) ]; - }; - unicly = { - pname = "unicly"; - version = "20210124-git"; - asds = [ "unicly" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/unicly/2021-01-24/unicly-20210124-git.tgz"; - sha256 = "1f29zc1gmnsmb84hbsvacg02bqfiq2mv9wgr0hhf3bjbji5jh5zb"; - system = "unicly"; - asd = "unicly"; - }); - systems = [ "unicly" ]; - lispLibs = [ (getAttr "ironclad" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - unifgram = { - pname = "unifgram"; - version = "20180228-git"; - asds = [ "unifgram" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/paiprolog/2018-02-28/paiprolog-20180228-git.tgz"; - sha256 = "1nxz01i6f8s920gm69r2kwjdpq9pli8b2ayqwijhzgjwi0r4jj9r"; - system = "unifgram"; - asd = "unifgram"; - }); - systems = [ "unifgram" ]; - lispLibs = [ (getAttr "paiprolog" pkgs) ]; - }; - unit-formulas = { - pname = "unit-formulas"; - version = "20180711-git"; - asds = [ "unit-formulas" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/unit-formula/2018-07-11/unit-formula-20180711-git.tgz"; - sha256 = "1j9zcnyj2ik7f2130pkfwr2bhh5ldlgc83n1024w0dy95ksl1f20"; - system = "unit-formulas"; - asd = "unit-formulas"; - }); - systems = [ "unit-formulas" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "iterate" pkgs) ]; - }; - unit-test = { - pname = "unit-test"; - version = "20120520-git"; - asds = [ "unit-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz"; - sha256 = "11hpksz56iqkv7jw25p2a8r3n9dj922fyarn16d98589g6hdskj9"; - system = "unit-test"; - asd = "unit-test"; - }); - systems = [ "unit-test" ]; - lispLibs = [ ]; - }; - universal-config = { - pname = "universal-config"; - version = "20180430-git"; - asds = [ "universal-config" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/universal-config/2018-04-30/universal-config-20180430-git.tgz"; - sha256 = "17sjd37jwsi47yhsj9qsnfyhyrlhlxdrxa4szklwjh489hf01hd0"; - system = "universal-config"; - asd = "universal-config"; - }); - systems = [ "universal-config" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "parse-float" pkgs) ]; - }; - unix-options = { - pname = "unix-options"; - version = "20151031-git"; - asds = [ "unix-options" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz"; - sha256 = "17q7irrbmaja7gj86h01ali9n9p782jxisgkb1r2q5ajf4lr1rsv"; - system = "unix-options"; - asd = "unix-options"; - }); - systems = [ "unix-options" ]; - lispLibs = [ ]; - }; - unix-opts = { - pname = "unix-opts"; - version = "20210124-git"; - asds = [ "unix-opts" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/unix-opts/2021-01-24/unix-opts-20210124-git.tgz"; - sha256 = "16mcqpzwrz808p9n3wwl99ckg3hg7yihw08y1i4l7c92aldbkasq"; - system = "unix-opts"; - asd = "unix-opts"; - }); - systems = [ "unix-opts" ]; - lispLibs = [ ]; - }; - unix-opts_slash_tests = { - pname = "unix-opts_tests"; - version = "20210124-git"; - asds = [ "unix-opts" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/unix-opts/2021-01-24/unix-opts-20210124-git.tgz"; - sha256 = "16mcqpzwrz808p9n3wwl99ckg3hg7yihw08y1i4l7c92aldbkasq"; - system = "unix-opts"; - asd = "unix-opts"; - }); - systems = [ "unix-opts/tests" ]; - lispLibs = [ (getAttr "unix-opts" pkgs) ]; - meta = { - broken = true; - }; - }; - unix-sockets = { - pname = "unix-sockets"; - version = "20221106-git"; - asds = [ "unix-sockets" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unix-sockets/2022-11-06/cl-unix-sockets-20221106-git.tgz"; - sha256 = "1kbayll54228mmikw22isqv1p99i3bznvy0l661rjjhq2r2al8cb"; - system = "unix-sockets"; - asd = "unix-sockets"; - }); - systems = [ "unix-sockets" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "log4cl" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "uffi" pkgs) ]; - }; - unix-sockets_dot_tests = { - pname = "unix-sockets.tests"; - version = "20221106-git"; - asds = [ "unix-sockets.tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-unix-sockets/2022-11-06/cl-unix-sockets-20221106-git.tgz"; - sha256 = "1kbayll54228mmikw22isqv1p99i3bznvy0l661rjjhq2r2al8cb"; - system = "unix-sockets.tests"; - asd = "unix-sockets.tests"; - }); - systems = [ "unix-sockets.tests" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "unix-sockets" pkgs) (getAttr "fiveam" pkgs) (getAttr "tmpdir" pkgs) (getAttr "trivial-timeout" pkgs) ]; - }; - uri-template = { - pname = "uri-template"; - version = "1.3.1"; - asds = [ "uri-template" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uri-template/2019-08-13/uri-template-1.3.1.tgz"; - sha256 = "06n5kmjax64kv57ng5g2030a67z131i4wm53npg9zq2xlj9sprd8"; - system = "uri-template"; - asd = "uri-template"; - }); - systems = [ "uri-template" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "named-readtables" pkgs) ]; - }; - uri-template_dot_test = { - pname = "uri-template.test"; - version = "1.3.1"; - asds = [ "uri-template.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uri-template/2019-08-13/uri-template-1.3.1.tgz"; - sha256 = "06n5kmjax64kv57ng5g2030a67z131i4wm53npg9zq2xlj9sprd8"; - system = "uri-template.test"; - asd = "uri-template.test"; - }); - systems = [ "uri-template.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "uri-template" pkgs) ]; - }; - url-rewrite = { - pname = "url-rewrite"; - version = "20171227-git"; - asds = [ "url-rewrite" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/url-rewrite/2017-12-27/url-rewrite-20171227-git.tgz"; - sha256 = "0d3awcb938ajiylyfnbqsc7nndy6csx0qz1bcyr4f0p862w3xbqf"; - system = "url-rewrite"; - asd = "url-rewrite"; - }); - systems = [ "url-rewrite" ]; - lispLibs = [ ]; - }; - userial = { - pname = "userial"; - version = "0.8.2011.06.02"; - asds = [ "userial" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/userial/2011-06-19/userial_0.8.2011.06.02.tgz"; - sha256 = "08f8hc1f81gyn4br9p732p8r2gl6cvccd4yzc9ydz4i0ijclpp2m"; - system = "userial"; - asd = "userial"; - }); - systems = [ "userial" ]; - lispLibs = [ (getAttr "contextl" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - userial-tests = { - pname = "userial-tests"; - version = "0.8.2011.06.02"; - asds = [ "userial-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/userial/2011-06-19/userial_0.8.2011.06.02.tgz"; - sha256 = "08f8hc1f81gyn4br9p732p8r2gl6cvccd4yzc9ydz4i0ijclpp2m"; - system = "userial-tests"; - asd = "userial-tests"; - }); - systems = [ "userial-tests" ]; - lispLibs = [ (getAttr "nst" pkgs) (getAttr "userial" pkgs) ]; - }; - usocket = { - pname = "usocket"; - version = "0.8.5"; - asds = [ "usocket" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/usocket/2022-11-06/usocket-0.8.5.tgz"; - sha256 = "1pn5mf4d9g3b7h0vfx0mh7rlrydfbk8q35pg4ip6prf4zyg70wba"; - system = "usocket"; - asd = "usocket"; - }); - systems = [ "usocket" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) ]; - }; - usocket-server = { - pname = "usocket-server"; - version = "0.8.5"; - asds = [ "usocket-server" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/usocket/2022-11-06/usocket-0.8.5.tgz"; - sha256 = "1pn5mf4d9g3b7h0vfx0mh7rlrydfbk8q35pg4ip6prf4zyg70wba"; - system = "usocket-server"; - asd = "usocket-server"; - }); - systems = [ "usocket-server" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "usocket" pkgs) ]; - }; - usocket-test = { - pname = "usocket-test"; - version = "0.8.5"; - asds = [ "usocket-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/usocket/2022-11-06/usocket-0.8.5.tgz"; - sha256 = "1pn5mf4d9g3b7h0vfx0mh7rlrydfbk8q35pg4ip6prf4zyg70wba"; - system = "usocket-test"; - asd = "usocket-test"; - }); - systems = [ "usocket-test" ]; - lispLibs = [ (getAttr "rt" pkgs) (getAttr "usocket-server" pkgs) ]; - }; - utilities_dot_binary-dump = { - pname = "utilities.binary-dump"; - version = "20181210-git"; - asds = [ "utilities.binary-dump" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/utilities.binary-dump/2018-12-10/utilities.binary-dump-20181210-git.tgz"; - sha256 = "1l20r1782bskyy50ca6vsyxrvbxlgfq4nm33wl8as761dcjpj4d4"; - system = "utilities.binary-dump"; - asd = "utilities.binary-dump"; - }); - systems = [ "utilities.binary-dump" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "let-plus" pkgs) (getAttr "nibbles" pkgs) ]; - }; - utilities_dot_binary-dump_slash_test = { - pname = "utilities.binary-dump_test"; - version = "20181210-git"; - asds = [ "utilities.binary-dump" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/utilities.binary-dump/2018-12-10/utilities.binary-dump-20181210-git.tgz"; - sha256 = "1l20r1782bskyy50ca6vsyxrvbxlgfq4nm33wl8as761dcjpj4d4"; - system = "utilities.binary-dump"; - asd = "utilities.binary-dump"; - }); - systems = [ "utilities.binary-dump/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiveam" pkgs) (getAttr "let-plus" pkgs) (getAttr "nibbles" pkgs) (getAttr "split-sequence" pkgs) (getAttr "utilities_dot_binary-dump" pkgs) ]; - meta = { - broken = true; - }; - }; - utilities_dot_print-items = { - pname = "utilities.print-items"; - version = "20221106-git"; - asds = [ "utilities.print-items" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/utilities.print-items/2022-11-06/utilities.print-items-20221106-git.tgz"; - sha256 = "0qn0w7cyl76c3ssipqsx4ngb1641ajfkaihnb31w374zrzbns8wi"; - system = "utilities.print-items"; - asd = "utilities.print-items"; - }); - systems = [ "utilities.print-items" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - utilities_dot_print-items_slash_test = { - pname = "utilities.print-items_test"; - version = "20221106-git"; - asds = [ "utilities.print-items" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/utilities.print-items/2022-11-06/utilities.print-items-20221106-git.tgz"; - sha256 = "0qn0w7cyl76c3ssipqsx4ngb1641ajfkaihnb31w374zrzbns8wi"; - system = "utilities.print-items"; - asd = "utilities.print-items"; - }); - systems = [ "utilities.print-items/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "utilities_dot_print-items" pkgs) ]; - meta = { - broken = true; - }; - }; - utilities_dot_print-tree = { - pname = "utilities.print-tree"; - version = "20221106-git"; - asds = [ "utilities.print-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/utilities.print-tree/2022-11-06/utilities.print-tree-20221106-git.tgz"; - sha256 = "0i7371qvlnwjcybh3c2ac88xz39vjdynhgxwz4acjbcnsw0jqsls"; - system = "utilities.print-tree"; - asd = "utilities.print-tree"; - }); - systems = [ "utilities.print-tree" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "uiop" pkgs) ]; - }; - utilities_dot_print-tree_slash_test = { - pname = "utilities.print-tree_test"; - version = "20221106-git"; - asds = [ "utilities.print-tree" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/utilities.print-tree/2022-11-06/utilities.print-tree-20221106-git.tgz"; - sha256 = "0i7371qvlnwjcybh3c2ac88xz39vjdynhgxwz4acjbcnsw0jqsls"; - system = "utilities.print-tree"; - asd = "utilities.print-tree"; - }); - systems = [ "utilities.print-tree/test" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "fiveam" pkgs) (getAttr "uiop" pkgs) (getAttr "utilities_dot_print-tree" pkgs) ]; - meta = { - broken = true; - }; - }; - utility = { - pname = "utility"; - version = "20190202-git"; - asds = [ "utility" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/utility/2019-02-02/utility-20190202-git.tgz"; - sha256 = "0nc83kxp2c0wy5ai7dm6w4anx5266j99pxzr0c7fxgllc7d0g1qd"; - system = "utility"; - asd = "utility"; - }); - systems = [ "utility" ]; - lispLibs = [ ]; - }; - utility-arguments = { - pname = "utility-arguments"; - version = "20161204-git"; - asds = [ "utility-arguments" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/utility-arguments/2016-12-04/utility-arguments-20161204-git.tgz"; - sha256 = "0dzbzzrla9709zl5dqdfw02mxa3rvcpca466qrcprgs3hnxdvgwb"; - system = "utility-arguments"; - asd = "utility-arguments"; - }); - systems = [ "utility-arguments" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - utils-kt = { - pname = "utils-kt"; - version = "20200218-git"; - asds = [ "utils-kt" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/utils-kt/2020-02-18/utils-kt-20200218-git.tgz"; - sha256 = "016x3w034brz02z9mrsrkhk2djizg3yqsvhl9k62xqcnpy3b87dn"; - system = "utils-kt"; - asd = "utils-kt"; - }); - systems = [ "utils-kt" ]; - lispLibs = [ ]; - }; - utm = { - pname = "utm"; - version = "20200218-git"; - asds = [ "utm" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/utm/2020-02-18/utm-20200218-git.tgz"; - sha256 = "1a5dp5fls26ppc6fnvd941nfvk2qs72grl0a3pycq7vzw6580v01"; - system = "utm"; - asd = "utm"; - }); - systems = [ "utm" ]; - lispLibs = [ ]; - }; - utm-ups = { - pname = "utm-ups"; - version = "20210228-git"; - asds = [ "utm-ups" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/utm-ups/2021-02-28/utm-ups-20210228-git.tgz"; - sha256 = "1rvyh0srgd81kvbzmq4ysd9y6c0qdwh23naqxc9asw1vh7fq08x1"; - system = "utm-ups"; - asd = "utm-ups"; - }); - systems = [ "utm-ups" ]; - lispLibs = [ ]; - }; - utm-ups_slash_tests = { - pname = "utm-ups_tests"; - version = "20210228-git"; - asds = [ "utm-ups" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/utm-ups/2021-02-28/utm-ups-20210228-git.tgz"; - sha256 = "1rvyh0srgd81kvbzmq4ysd9y6c0qdwh23naqxc9asw1vh7fq08x1"; - system = "utm-ups"; - asd = "utm-ups"; - }); - systems = [ "utm-ups/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "utm-ups" pkgs) ]; - meta = { - broken = true; - }; - }; - utm_dot_test = { - pname = "utm.test"; - version = "20200218-git"; - asds = [ "utm.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/utm/2020-02-18/utm-20200218-git.tgz"; - sha256 = "1a5dp5fls26ppc6fnvd941nfvk2qs72grl0a3pycq7vzw6580v01"; - system = "utm.test"; - asd = "utm.test"; - }); - systems = [ "utm.test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "utm" pkgs) ]; - }; - uuid = { - pname = "uuid"; - version = "20200715-git"; - asds = [ "uuid" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz"; - sha256 = "1ncwhyw0zggwpkzjsw7d4pkrlldi34xvb69c0bzxmyz2krg8rpx0"; - system = "uuid"; - asd = "uuid"; - }); - systems = [ "uuid" ]; - lispLibs = [ (getAttr "ironclad" pkgs) (getAttr "trivial-utf-8" pkgs) ]; - }; - validate-list = { - pname = "validate-list"; - version = "20210411-git"; - asds = [ "validate-list" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/validate-list/2021-04-11/validate-list-20210411-git.tgz"; - sha256 = "1rb7glqvlaz84cfd2wjk49si9jh4ffysmva5007gjhqfhr9z23lj"; - system = "validate-list"; - asd = "validate-list"; - }); - systems = [ "validate-list" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "arithmetic-operators-as-words" pkgs) (getAttr "lisp-unit" pkgs) ]; - }; - validate-list_slash_tests = { - pname = "validate-list_tests"; - version = "20210411-git"; - asds = [ "validate-list" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/validate-list/2021-04-11/validate-list-20210411-git.tgz"; - sha256 = "1rb7glqvlaz84cfd2wjk49si9jh4ffysmva5007gjhqfhr9z23lj"; - system = "validate-list"; - asd = "validate-list"; - }); - systems = [ "validate-list/tests" ]; - lispLibs = [ (getAttr "lisp-unit" pkgs) (getAttr "validate-list" pkgs) ]; - meta = { - broken = true; - }; - }; - varint = { - pname = "varint"; - version = "20220331-git"; - asds = [ "varint" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protobuf/2022-03-31/protobuf-20220331-git.tgz"; - sha256 = "011jhbda4q77hjc4v2dyx3pc54zdq7m496qgrrv69ksy901lss4s"; - system = "varint"; - asd = "varint"; - }); - systems = [ "varint" ]; - lispLibs = [ (getAttr "com_dot_google_dot_base" pkgs) (getAttr "nibbles" pkgs) ]; - }; - varint_slash_test = { - pname = "varint_test"; - version = "20220331-git"; - asds = [ "varint" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/protobuf/2022-03-31/protobuf-20220331-git.tgz"; - sha256 = "011jhbda4q77hjc4v2dyx3pc54zdq7m496qgrrv69ksy901lss4s"; - system = "varint"; - asd = "varint"; - }); - systems = [ "varint/test" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_stefil" pkgs) (getAttr "varint" pkgs) ]; - meta = { - broken = true; - }; - }; - varjo = { - pname = "varjo"; - version = "release-quicklisp-92f9c75b-git"; - asds = [ "varjo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz"; - sha256 = "0gga4wq74qxql4zxh8zq1ab2xnsz8ygdaf8wxy7w15vv4czgamr9"; - system = "varjo"; - asd = "varjo"; - }); - systems = [ "varjo" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "fn" pkgs) (getAttr "glsl-docs" pkgs) (getAttr "glsl-spec" pkgs) (getAttr "glsl-symbols" pkgs) (getAttr "named-readtables" pkgs) (getAttr "parse-float" pkgs) (getAttr "uiop" pkgs) (getAttr "vas-string-metrics" pkgs) ]; - }; - varjo_dot_import = { - pname = "varjo.import"; - version = "release-quicklisp-92f9c75b-git"; - asds = [ "varjo.import" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz"; - sha256 = "0gga4wq74qxql4zxh8zq1ab2xnsz8ygdaf8wxy7w15vv4czgamr9"; - system = "varjo.import"; - asd = "varjo.import"; - }); - systems = [ "varjo.import" ]; - lispLibs = [ (getAttr "fare-quasiquote-extras" pkgs) (getAttr "glsl-toolkit" pkgs) (getAttr "rtg-math_dot_vari" pkgs) (getAttr "split-sequence" pkgs) (getAttr "varjo" pkgs) ]; - }; - varjo_dot_tests = { - pname = "varjo.tests"; - version = "release-quicklisp-92f9c75b-git"; - asds = [ "varjo.tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz"; - sha256 = "0gga4wq74qxql4zxh8zq1ab2xnsz8ygdaf8wxy7w15vv4czgamr9"; - system = "varjo.tests"; - asd = "varjo.tests"; - }); - systems = [ "varjo.tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "rtg-math_dot_vari" pkgs) (getAttr "varjo" pkgs) ]; - }; - vas-string-metrics = { - pname = "vas-string-metrics"; - version = "20211209-git"; - asds = [ "vas-string-metrics" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vas-string-metrics/2021-12-09/vas-string-metrics-20211209-git.tgz"; - sha256 = "1yvkwc939dckv070nlgqfj5ys9ii2rm32m5wfx7qxdjrb4n19sx9"; - system = "vas-string-metrics"; - asd = "vas-string-metrics"; - }); - systems = [ "vas-string-metrics" ]; - lispLibs = [ ]; - }; - vecto = { - pname = "vecto"; - version = "1.6"; - asds = [ "vecto" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vecto/2021-12-30/vecto-1.6.tgz"; - sha256 = "1s3ii9absili7yiv89byjikxcxlbagsvcxdwkxgsm1rahgggyk5x"; - system = "vecto"; - asd = "vecto"; - }); - systems = [ "vecto" ]; - lispLibs = [ (getAttr "cl-vectors" pkgs) (getAttr "zpb-ttf" pkgs) (getAttr "zpng" pkgs) ]; - }; - vectometry = { - pname = "vectometry"; - version = "1.6"; - asds = [ "vectometry" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vecto/2021-12-30/vecto-1.6.tgz"; - sha256 = "1s3ii9absili7yiv89byjikxcxlbagsvcxdwkxgsm1rahgggyk5x"; - system = "vectometry"; - asd = "vectometry"; - }); - systems = [ "vectometry" ]; - lispLibs = [ (getAttr "vecto" pkgs) ]; - }; - vectors = { - pname = "vectors"; - version = "20171227-git"; - asds = [ "vectors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vectors/2017-12-27/vectors-20171227-git.tgz"; - sha256 = "1sflb1wz6fcszdbqrcfh52bp5ch6wbizzp7jx97ni8lrqq2r6cqy"; - system = "vectors"; - asd = "vectors"; - }); - systems = [ "vectors" ]; - lispLibs = [ ]; - }; - vellum = { - pname = "vellum"; - version = "20221106-git"; - asds = [ "vellum" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vellum/2022-11-06/vellum-20221106-git.tgz"; - sha256 = "0yp47awrfgk148fd6hpgwicm2r9673is655j9xaiiasfx42m3fir"; - system = "vellum"; - asd = "vellum"; - }); - systems = [ "vellum" ]; - lispLibs = [ (getAttr "agnostic-lizard" pkgs) (getAttr "alexandria" pkgs) (getAttr "cl-data-structures" pkgs) (getAttr "closer-mop" pkgs) (getAttr "documentation-utils-extensions" pkgs) (getAttr "iterate" pkgs) (getAttr "lparallel" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "serapeum" pkgs) ]; - }; - vellum-binary = { - pname = "vellum-binary"; - version = "20221106-git"; - asds = [ "vellum-binary" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vellum-binary/2022-11-06/vellum-binary-20221106-git.tgz"; - sha256 = "1981mrzcfgda81j14xkqx8n2rir1kk01r7px1s9yjf1f2g2d4zdg"; - system = "vellum-binary"; - asd = "vellum-binary"; - }); - systems = [ "vellum-binary" ]; - lispLibs = [ (getAttr "chipz" pkgs) (getAttr "cl-conspack" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "nibbles" pkgs) (getAttr "salza2" pkgs) (getAttr "vellum" pkgs) ]; - }; - vellum-clim = { - pname = "vellum-clim"; - version = "20210531-git"; - asds = [ "vellum-clim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vellum-clim/2021-05-31/vellum-clim-20210531-git.tgz"; - sha256 = "06g1pw0r60yd13hzbjrbpa1p0pnlwkqfn06ipk1gs0kc76gf2im5"; - system = "vellum-clim"; - asd = "vellum-clim"; - }); - systems = [ "vellum-clim" ]; - lispLibs = [ (getAttr "iterate" pkgs) (getAttr "mcclim" pkgs) (getAttr "vellum" pkgs) ]; - }; - vellum-csv = { - pname = "vellum-csv"; - version = "20220707-git"; - asds = [ "vellum-csv" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vellum-csv/2022-07-07/vellum-csv-20220707-git.tgz"; - sha256 = "1spx6hig55056k32s0fysfwqjnwkfr8j63v6zmfv84x2v90ppclj"; - system = "vellum-csv"; - asd = "vellum-csv"; - }); - systems = [ "vellum-csv" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "documentation-utils-extensions" pkgs) (getAttr "iterate" pkgs) (getAttr "parse-float" pkgs) (getAttr "serapeum" pkgs) (getAttr "uiop" pkgs) (getAttr "vellum" pkgs) ]; - }; - vellum-csv-tests = { - pname = "vellum-csv-tests"; - version = "20220707-git"; - asds = [ "vellum-csv-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vellum-csv/2022-07-07/vellum-csv-20220707-git.tgz"; - sha256 = "1spx6hig55056k32s0fysfwqjnwkfr8j63v6zmfv84x2v90ppclj"; - system = "vellum-csv-tests"; - asd = "vellum-csv-tests"; - }); - systems = [ "vellum-csv-tests" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "vellum-csv" pkgs) ]; - }; - vellum-postmodern = { - pname = "vellum-postmodern"; - version = "20221106-git"; - asds = [ "vellum-postmodern" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vellum-postmodern/2022-11-06/vellum-postmodern-20221106-git.tgz"; - sha256 = "0nw2lwk32n16vfvzrihb7683fb38qq01aiacaw00402vzgjiskx6"; - system = "vellum-postmodern"; - asd = "vellum-postmodern"; - }); - systems = [ "vellum-postmodern" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "documentation-utils-extensions" pkgs) (getAttr "iterate" pkgs) (getAttr "cl-postgres" pkgs) (getAttr "postmodern" pkgs) (getAttr "s-sql" pkgs) (getAttr "serapeum" pkgs) (getAttr "vellum" pkgs) ]; - }; - vellum-tests = { - pname = "vellum-tests"; - version = "20221106-git"; - asds = [ "vellum-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vellum/2022-11-06/vellum-20221106-git.tgz"; - sha256 = "0yp47awrfgk148fd6hpgwicm2r9673is655j9xaiiasfx42m3fir"; - system = "vellum-tests"; - asd = "vellum-tests"; - }); - systems = [ "vellum-tests" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "vellum" pkgs) ]; - }; - veq = { - pname = "veq"; - version = "20220707-git"; - asds = [ "veq" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-veq/2022-07-07/cl-veq-20220707-git.tgz"; - sha256 = "0smykplq5914xax1cp9cibvmjn5l5vipbm95f6wc8g0laysmqmkc"; - system = "veq"; - asd = "veq"; - }); - systems = [ "veq" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "str" pkgs) (getAttr "prove" pkgs) ]; - }; - veq_slash_tests = { - pname = "veq_tests"; - version = "20220707-git"; - asds = [ "veq" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-veq/2022-07-07/cl-veq-20220707-git.tgz"; - sha256 = "0smykplq5914xax1cp9cibvmjn5l5vipbm95f6wc8g0laysmqmkc"; - system = "veq"; - asd = "veq"; - }); - systems = [ "veq/tests" ]; - lispLibs = [ (getAttr "veq" pkgs) (getAttr "prove" pkgs) ]; - meta = { - broken = true; - }; - }; - verbose = { - pname = "verbose"; - version = "20201220-git"; - asds = [ "verbose" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/verbose/2020-12-20/verbose-20201220-git.tgz"; - sha256 = "0r51ydj5v7afi2jrlscbhxprv13d9vzg5316g1yzwaxc1kzsdsw6"; - system = "verbose"; - asd = "verbose"; - }); - systems = [ "verbose" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "dissect" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "local-time" pkgs) (getAttr "piping" pkgs) ]; - }; - verlet = { - pname = "verlet"; - version = "20211209-git"; - asds = [ "verlet" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/verlet/2021-12-09/verlet-20211209-git.tgz"; - sha256 = "0n6wgjwwbrr13ldwa4y59n2ixn47rr0ad7n3jbb58635z6ahfvd4"; - system = "verlet"; - asd = "verlet"; - }); - systems = [ "verlet" ]; - lispLibs = [ (getAttr "chain" pkgs) (getAttr "fset" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "mgl-pax" pkgs) (getAttr "rtg-math" pkgs) ]; - }; - vernacular = { - pname = "vernacular"; - version = "20211020-git"; - asds = [ "vernacular" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vernacular/2021-10-20/vernacular-20211020-git.tgz"; - sha256 = "19vzn28hw4is4sgmvzqin18ds89s0pai21vcm0ky10vmfv6wg745"; - system = "vernacular"; - asd = "vernacular"; - }); - systems = [ "vernacular" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "local-time" pkgs) (getAttr "named-readtables" pkgs) (getAttr "overlord" pkgs) (getAttr "serapeum" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "trivial-macroexpand-all" pkgs) ]; - }; - verrazano = { - pname = "verrazano"; - version = "20120909-darcs"; - asds = [ "verrazano" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/verrazano/2012-09-09/verrazano-20120909-darcs.tgz"; - sha256 = "0d7qv5jwv5p1r64g4rfqb844b5fh71p82b5983gjz0a5p391p270"; - system = "verrazano"; - asd = "verrazano"; - }); - systems = [ "verrazano" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "closer-mop" pkgs) (getAttr "cxml" pkgs) (getAttr "iterate" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "parse-number" pkgs) (getAttr "trivial-shell" pkgs) ]; - }; - verrazano-runtime = { - pname = "verrazano-runtime"; - version = "20120909-darcs"; - asds = [ "verrazano-runtime" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/verrazano/2012-09-09/verrazano-20120909-darcs.tgz"; - sha256 = "0d7qv5jwv5p1r64g4rfqb844b5fh71p82b5983gjz0a5p391p270"; - system = "verrazano-runtime"; - asd = "verrazano-runtime"; - }); - systems = [ "verrazano-runtime" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - vertex = { - pname = "vertex"; - version = "20150608-git"; - asds = [ "vertex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vertex/2015-06-08/vertex-20150608-git.tgz"; - sha256 = "0g3ck1kvp6x9874ffizjz3fsd35a3m4hcr2x5gq9fdql680ic4k2"; - system = "vertex"; - asd = "vertex"; - }); - systems = [ "vertex" ]; - lispLibs = [ (getAttr "common-doc" pkgs) (getAttr "common-doc-plump" pkgs) (getAttr "plump-tex" pkgs) ]; - }; - vertex-test = { - pname = "vertex-test"; - version = "20150608-git"; - asds = [ "vertex-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vertex/2015-06-08/vertex-20150608-git.tgz"; - sha256 = "0g3ck1kvp6x9874ffizjz3fsd35a3m4hcr2x5gq9fdql680ic4k2"; - system = "vertex-test"; - asd = "vertex-test"; - }); - systems = [ "vertex-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "vertex" pkgs) ]; - }; - vex = { - pname = "vex"; - version = "20220707-git"; - asds = [ "vex" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/april/2022-07-07/april-20220707-git.tgz"; - sha256 = "016mfldk98j1kbj8fpqwzhvdkfbmqsfbzjaawnlz9q5pr6srv26r"; - system = "vex"; - asd = "vex"; - }); - systems = [ "vex" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "maxpc-apache" pkgs) (getAttr "array-operations" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "prove" pkgs) (getAttr "symbol-munger" pkgs) ]; - }; - vgplot = { - pname = "vgplot"; - version = "20220707-git"; - asds = [ "vgplot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vgplot/2022-07-07/vgplot-20220707-git.tgz"; - sha256 = "1vc5fd787xa8831wjbmwrpg17f9isi5k8dmb85fsysz47plbvi1y"; - system = "vgplot"; - asd = "vgplot"; - }); - systems = [ "vgplot" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "ltk" pkgs) ]; - }; - vgplot_slash_test = { - pname = "vgplot_test"; - version = "20220707-git"; - asds = [ "vgplot" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vgplot/2022-07-07/vgplot-20220707-git.tgz"; - sha256 = "1vc5fd787xa8831wjbmwrpg17f9isi5k8dmb85fsysz47plbvi1y"; - system = "vgplot"; - asd = "vgplot"; - }); - systems = [ "vgplot/test" ]; - lispLibs = [ (getAttr "lisp-unit" pkgs) (getAttr "vgplot" pkgs) ]; - meta = { - broken = true; - }; - }; - vivid-colors = { - pname = "vivid-colors"; - version = "20220707-git"; - asds = [ "vivid-colors" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; - sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; - system = "vivid-colors"; - asd = "vivid-colors"; - }); - systems = [ "vivid-colors" ]; - lispLibs = [ (getAttr "cl-colors2" pkgs) (getAttr "closer-mop" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "lambda-fiddle" pkgs) (getAttr "millet" pkgs) (getAttr "vivid-colors_dot_content" pkgs) (getAttr "vivid-colors_dot_dispatch" pkgs) (getAttr "vivid-colors_dot_stream" pkgs) ]; - }; - vivid-colors_dot_content = { - pname = "vivid-colors.content"; - version = "20220707-git"; - asds = [ "vivid-colors.content" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; - sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; - system = "vivid-colors.content"; - asd = "vivid-colors.content"; - }); - systems = [ "vivid-colors.content" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ansi-text" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "mcase" pkgs) (getAttr "vivid-colors_dot_queue" pkgs) (getAttr "vivid-colors_dot_shared" pkgs) ]; - }; - vivid-colors_dot_content_dot_test = { - pname = "vivid-colors.content.test"; - version = "20220707-git"; - asds = [ "vivid-colors.content.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; - sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; - system = "vivid-colors.content.test"; - asd = "vivid-colors.content.test"; - }); - systems = [ "vivid-colors.content.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "vivid-colors_dot_content" pkgs) ]; - }; - vivid-colors_dot_dispatch = { - pname = "vivid-colors.dispatch"; - version = "20220707-git"; - asds = [ "vivid-colors.dispatch" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; - sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; - system = "vivid-colors.dispatch"; - asd = "vivid-colors.dispatch"; - }); - systems = [ "vivid-colors.dispatch" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "millet" pkgs) ]; - }; - vivid-colors_dot_dispatch_dot_test = { - pname = "vivid-colors.dispatch.test"; - version = "20220707-git"; - asds = [ "vivid-colors.dispatch.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; - sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; - system = "vivid-colors.dispatch.test"; - asd = "vivid-colors.dispatch.test"; - }); - systems = [ "vivid-colors.dispatch.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "vivid-colors_dot_dispatch" pkgs) ]; - }; - vivid-colors_dot_queue = { - pname = "vivid-colors.queue"; - version = "20220707-git"; - asds = [ "vivid-colors.queue" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; - sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; - system = "vivid-colors.queue"; - asd = "vivid-colors.queue"; - }); - systems = [ "vivid-colors.queue" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "millet" pkgs) ]; - }; - vivid-colors_dot_queue_dot_test = { - pname = "vivid-colors.queue.test"; - version = "20220707-git"; - asds = [ "vivid-colors.queue.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; - sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; - system = "vivid-colors.queue.test"; - asd = "vivid-colors.queue.test"; - }); - systems = [ "vivid-colors.queue.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "vivid-colors_dot_queue" pkgs) ]; - }; - vivid-colors_dot_shared = { - pname = "vivid-colors.shared"; - version = "20220707-git"; - asds = [ "vivid-colors.shared" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; - sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; - system = "vivid-colors.shared"; - asd = "vivid-colors.shared"; - }); - systems = [ "vivid-colors.shared" ]; - lispLibs = [ (getAttr "jingoh_dot_documentizer" pkgs) ]; - }; - vivid-colors_dot_shared_dot_test = { - pname = "vivid-colors.shared.test"; - version = "20220707-git"; - asds = [ "vivid-colors.shared.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; - sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; - system = "vivid-colors.shared.test"; - asd = "vivid-colors.shared.test"; - }); - systems = [ "vivid-colors.shared.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "vivid-colors_dot_shared" pkgs) ]; - }; - vivid-colors_dot_stream = { - pname = "vivid-colors.stream"; - version = "20220707-git"; - asds = [ "vivid-colors.stream" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; - sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; - system = "vivid-colors.stream"; - asd = "vivid-colors.stream"; - }); - systems = [ "vivid-colors.stream" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ansi-text" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "trivial-gray-streams" pkgs) (getAttr "vivid-colors_dot_content" pkgs) (getAttr "vivid-colors_dot_dispatch" pkgs) (getAttr "vivid-colors_dot_shared" pkgs) ]; - }; - vivid-colors_dot_stream_dot_test = { - pname = "vivid-colors.stream.test"; - version = "20220707-git"; - asds = [ "vivid-colors.stream.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; - sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; - system = "vivid-colors.stream.test"; - asd = "vivid-colors.stream.test"; - }); - systems = [ "vivid-colors.stream.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "vivid-colors_dot_stream" pkgs) ]; - }; - vivid-colors_dot_test = { - pname = "vivid-colors.test"; - version = "20220707-git"; - asds = [ "vivid-colors.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-colors/2022-07-07/vivid-colors-20220707-git.tgz"; - sha256 = "0a1q1dgfgd7kqdziw80z1hhyp7l0mrd768lq68jva7vdv1r049ww"; - system = "vivid-colors.test"; - asd = "vivid-colors.test"; - }); - systems = [ "vivid-colors.test" ]; - lispLibs = [ (getAttr "jingoh" pkgs) (getAttr "vivid-colors" pkgs) ]; - }; - vivid-diff = { - pname = "vivid-diff"; - version = "20220707-git"; - asds = [ "vivid-diff" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-diff/2022-07-07/vivid-diff-20220707-git.tgz"; - sha256 = "195hqx304x4na56qpiblz30ahp1qj55kan50mkr0xyjhcx75nsdk"; - system = "vivid-diff"; - asd = "vivid-diff"; - }); - systems = [ "vivid-diff" ]; - lispLibs = [ (getAttr "cl-colors2" pkgs) (getAttr "closer-mop" pkgs) (getAttr "jingoh_dot_documentizer" pkgs) (getAttr "matrix-case" pkgs) (getAttr "vivid-colors" pkgs) ]; - }; - vivid-diff_dot_test = { - pname = "vivid-diff.test"; - version = "20220707-git"; - asds = [ "vivid-diff.test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vivid-diff/2022-07-07/vivid-diff-20220707-git.tgz"; - sha256 = "195hqx304x4na56qpiblz30ahp1qj55kan50mkr0xyjhcx75nsdk"; - system = "vivid-diff.test"; - asd = "vivid-diff.test"; - }); - systems = [ "vivid-diff.test" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "jingoh" pkgs) (getAttr "vivid-diff" pkgs) ]; - }; - vk = { - pname = "vk"; - version = "20221106-git"; - asds = [ "vk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vk/2022-11-06/vk-20221106-git.tgz"; - sha256 = "1a0bx15gjjzhgfp0y3lxp13binfvw4qm6pfwig45ii8lrwjwnlql"; - system = "vk"; - asd = "vk"; - }); - systems = [ "vk" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cffi" pkgs) (getAttr "rove" pkgs) ]; - }; - vk_slash_tests = { - pname = "vk_tests"; - version = "20221106-git"; - asds = [ "vk" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vk/2022-11-06/vk-20221106-git.tgz"; - sha256 = "1a0bx15gjjzhgfp0y3lxp13binfvw4qm6pfwig45ii8lrwjwnlql"; - system = "vk"; - asd = "vk"; - }); - systems = [ "vk/tests" ]; - lispLibs = [ (getAttr "rove" pkgs) (getAttr "vk" pkgs) ]; - meta = { - broken = true; - }; - }; - voipms = { - pname = "voipms"; - version = "20220707-git"; - asds = [ "voipms" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-voipms/2022-07-07/cl-voipms-20220707-git.tgz"; - sha256 = "08ghirkmia8jn03r6z1025v321ygc2xalrwsqfvl3xy377xxrd3d"; - system = "voipms"; - asd = "voipms"; - }); - systems = [ "voipms" ]; - lispLibs = [ (getAttr "erjoalgo-webutil" pkgs) (getAttr "local-time" pkgs) ]; - }; - vom = { - pname = "vom"; - version = "20160825-git"; - asds = [ "vom" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz"; - sha256 = "0536kppj76ax4lrxhv42npkfjsmx45km2g439vf9jmw3apinz9cy"; - system = "vom"; - asd = "vom"; - }); - systems = [ "vom" ]; - lispLibs = [ ]; - }; - vom-json = { - pname = "vom-json"; - version = "20200610-git"; - asds = [ "vom-json" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vom-json/2020-06-10/vom-json-20200610-git.tgz"; - sha256 = "14b39kqbjpibh545gh9mb6w5g0kz7fhd5zxfmlf9a0fpdbwhw41c"; - system = "vom-json"; - asd = "vom-json"; - }); - systems = [ "vom-json" ]; - lispLibs = [ (getAttr "jonathan" pkgs) (getAttr "local-time" pkgs) (getAttr "vom" pkgs) ]; - }; - vom-json_slash_test = { - pname = "vom-json_test"; - version = "20200610-git"; - asds = [ "vom-json" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vom-json/2020-06-10/vom-json-20200610-git.tgz"; - sha256 = "14b39kqbjpibh545gh9mb6w5g0kz7fhd5zxfmlf9a0fpdbwhw41c"; - system = "vom-json"; - asd = "vom-json"; - }); - systems = [ "vom-json/test" ]; - lispLibs = [ (getAttr "rove" pkgs) (getAttr "vom-json" pkgs) ]; - meta = { - broken = true; - }; - }; - vorbisfile-ffi = { - pname = "vorbisfile-ffi"; - version = "20151218-git"; - asds = [ "vorbisfile-ffi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/mixalot/2015-12-18/mixalot-20151218-git.tgz"; - sha256 = "0kqx933k8kly4yhzvspizzki556s1lfd4zafap42jcsqqhr4i5q9"; - system = "vorbisfile-ffi"; - asd = "vorbisfile-ffi"; - }); - systems = [ "vorbisfile-ffi" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) ]; - }; - vp-trees = { - pname = "vp-trees"; - version = "20201220-git"; - asds = [ "vp-trees" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vp-trees/2020-12-20/vp-trees-20201220-git.tgz"; - sha256 = "1y78l7ijbwb8j79mm95axclfxgvnhg7mawi6jkwy27q2vyhvhlip"; - system = "vp-trees"; - asd = "vp-trees"; - }); - systems = [ "vp-trees" ]; - lispLibs = [ ]; - }; - vp-trees_slash_tests = { - pname = "vp-trees_tests"; - version = "20201220-git"; - asds = [ "vp-trees" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/vp-trees/2020-12-20/vp-trees-20201220-git.tgz"; - sha256 = "1y78l7ijbwb8j79mm95axclfxgvnhg7mawi6jkwy27q2vyhvhlip"; - system = "vp-trees"; - asd = "vp-trees"; - }); - systems = [ "vp-trees/tests" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "vp-trees" pkgs) ]; - meta = { - broken = true; - }; - }; - wallstreetflets = { - pname = "wallstreetflets"; - version = "20211209-git"; - asds = [ "wallstreetflets" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wallstreetflets/2021-12-09/wallstreetflets-20211209-git.tgz"; - sha256 = "0d9anws4gk16an1kl4kads6lhm8a4mpiwxg74i3235d5874gbdj5"; - system = "wallstreetflets"; - asd = "wallstreetflets"; - }); - systems = [ "wallstreetflets" ]; - lispLibs = [ (getAttr "dexador" pkgs) (getAttr "lquery" pkgs) (getAttr "parse-number" pkgs) ]; - }; - wasm-encoder = { - pname = "wasm-encoder"; - version = "20210630-git"; - asds = [ "wasm-encoder" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wasm-encoder/2021-06-30/wasm-encoder-20210630-git.tgz"; - sha256 = "1h094d8www9ydg96fjj17pi0lb63ikgyp5237cl6n3rmg4jpy9w6"; - system = "wasm-encoder"; - asd = "wasm-encoder"; - }); - systems = [ "wasm-encoder" ]; - lispLibs = [ (getAttr "agutil" pkgs) (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "generic-cl" pkgs) (getAttr "ieee-floats" pkgs) (getAttr "trivia" pkgs) ]; - }; - wasm-encoder_slash_test = { - pname = "wasm-encoder_test"; - version = "20210630-git"; - asds = [ "wasm-encoder" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wasm-encoder/2021-06-30/wasm-encoder-20210630-git.tgz"; - sha256 = "1h094d8www9ydg96fjj17pi0lb63ikgyp5237cl6n3rmg4jpy9w6"; - system = "wasm-encoder"; - asd = "wasm-encoder"; - }); - systems = [ "wasm-encoder/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "wasm-encoder" pkgs) ]; - meta = { - broken = true; - }; - }; - water = { - pname = "water"; - version = "20190107-git"; - asds = [ "water" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/water/2019-01-07/water-20190107-git.tgz"; - sha256 = "0w9b6mh10rfv7rg1zq28pivad6435i9h839km6nlbhq9xmx0g27s"; - system = "water"; - asd = "water"; - }); - systems = [ "water" ]; - lispLibs = [ (getAttr "parenscript" pkgs) ]; - }; - wayflan = { - pname = "wayflan"; - version = "20221106-git"; - asds = [ "wayflan" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wayflan/2022-11-06/wayflan-20221106-git.tgz"; - sha256 = "0d5m3w7312h9c9drrcilvf1k9cwrsksgrp1lggwiiyx810pw4jfj"; - system = "wayflan"; - asd = "wayflan"; - }); - systems = [ "wayflan" ]; - lispLibs = [ (getAttr "cffi-grovel" pkgs) (getAttr "wayflan-client" pkgs) ]; - }; - wayflan-client = { - pname = "wayflan-client"; - version = "20221106-git"; - asds = [ "wayflan-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wayflan/2022-11-06/wayflan-20221106-git.tgz"; - sha256 = "0d5m3w7312h9c9drrcilvf1k9cwrsksgrp1lggwiiyx810pw4jfj"; - system = "wayflan-client"; - asd = "wayflan-client"; - }); - systems = [ "wayflan-client" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "closer-mop" pkgs) (getAttr "plump" pkgs) ]; - }; - wayflan-client_slash_examples = { - pname = "wayflan-client_examples"; - version = "20221106-git"; - asds = [ "wayflan-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wayflan/2022-11-06/wayflan-20221106-git.tgz"; - sha256 = "0d5m3w7312h9c9drrcilvf1k9cwrsksgrp1lggwiiyx810pw4jfj"; - system = "wayflan-client"; - asd = "wayflan-client"; - }); - systems = [ "wayflan-client/examples" ]; - lispLibs = [ (getAttr "cl-cairo2" pkgs) (getAttr "cl-colors" pkgs) (getAttr "cl-pango" pkgs) (getAttr "cl-xkb" pkgs) (getAttr "input-event-codes" pkgs) (getAttr "posix-shm" pkgs) (getAttr "wayflan-client" pkgs) ]; - meta = { - broken = true; - }; - }; - wayflan_slash_common = { - pname = "wayflan_common"; - version = "20221106-git"; - asds = [ "wayflan" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wayflan/2022-11-06/wayflan-20221106-git.tgz"; - sha256 = "0d5m3w7312h9c9drrcilvf1k9cwrsksgrp1lggwiiyx810pw4jfj"; - system = "wayflan"; - asd = "wayflan"; - }); - systems = [ "wayflan/common" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "plump" pkgs) ]; - meta = { - broken = true; - }; - }; - wayflan_slash_test = { - pname = "wayflan_test"; - version = "20221106-git"; - asds = [ "wayflan" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wayflan/2022-11-06/wayflan-20221106-git.tgz"; - sha256 = "0d5m3w7312h9c9drrcilvf1k9cwrsksgrp1lggwiiyx810pw4jfj"; - system = "wayflan"; - asd = "wayflan"; - }); - systems = [ "wayflan/test" ]; - lispLibs = [ (getAttr "parachute" pkgs) (getAttr "wayflan" pkgs) ]; - meta = { - broken = true; - }; - }; - webactions = { - pname = "webactions"; - version = "20190813-git"; - asds = [ "webactions" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/portableaserve/2019-08-13/portableaserve-20190813-git.tgz"; - sha256 = "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa"; - system = "webactions"; - asd = "webactions"; - }); - systems = [ "webactions" ]; - lispLibs = [ (getAttr "acl-compat" pkgs) (getAttr "aserve" pkgs) (getAttr "htmlgen" pkgs) ]; - }; - webapi = { - pname = "webapi"; - version = "20211020-git"; - asds = [ "webapi" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/webapi/2021-10-20/webapi-20211020-git.tgz"; - sha256 = "1bh2zp9gjdjk6zn5wwnv13qsav5b73hxd3lkph471jh0d1z9w0l7"; - system = "webapi"; - asd = "webapi"; - }); - systems = [ "webapi" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "dexador" pkgs) (getAttr "kebab" pkgs) (getAttr "quri" pkgs) (getAttr "st-json" pkgs) ]; - }; - weblocks-clsql = { - pname = "weblocks-clsql"; - version = "20211020-git"; - asds = [ "weblocks-clsql" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; - sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya"; - system = "weblocks-clsql"; - asd = "weblocks-clsql"; - }); - systems = [ "weblocks-clsql" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "clsql" pkgs) (getAttr "clsql-fluid" pkgs) (getAttr "metatilities" pkgs) (getAttr "weblocks-util" pkgs) (getAttr "weblocks-stores" pkgs) ]; - }; - weblocks-memory = { - pname = "weblocks-memory"; - version = "20211020-git"; - asds = [ "weblocks-memory" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; - sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya"; - system = "weblocks-memory"; - asd = "weblocks-memory"; - }); - systems = [ "weblocks-memory" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "metatilities" pkgs) (getAttr "weblocks-stores" pkgs) ]; - }; - weblocks-montezuma = { - pname = "weblocks-montezuma"; - version = "20211020-git"; - asds = [ "weblocks-montezuma" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; - sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya"; - system = "weblocks-montezuma"; - asd = "weblocks-montezuma"; - }); - systems = [ "weblocks-montezuma" ]; - lispLibs = [ (getAttr "montezuma" pkgs) (getAttr "weblocks-stores" pkgs) ]; - }; - weblocks-perec = { - pname = "weblocks-perec"; - version = "20211020-git"; - asds = [ "weblocks-perec" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; - sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya"; - system = "weblocks-perec"; - asd = "weblocks-perec"; - }); - systems = [ "weblocks-perec" ]; - lispLibs = [ (getAttr "hu_dot_dwim_dot_perec" pkgs) (getAttr "weblocks-stores" pkgs) ]; - }; - weblocks-prevalence = { - pname = "weblocks-prevalence"; - version = "20211020-git"; - asds = [ "weblocks-prevalence" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; - sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya"; - system = "weblocks-prevalence"; - asd = "weblocks-prevalence"; - }); - systems = [ "weblocks-prevalence" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-prevalence" pkgs) (getAttr "metatilities" pkgs) (getAttr "weblocks-memory" pkgs) (getAttr "weblocks-stores" pkgs) ]; - }; - weblocks-scripts = { - pname = "weblocks-scripts"; - version = "20211020-git"; - asds = [ "weblocks-scripts" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/weblocks/2021-10-20/weblocks-20211020-git.tgz"; - sha256 = "1hilpzm1p3hrp2hxghjr9y8sy5a9bgk96n8kc8bphvn7dvlbm78j"; - system = "weblocks-scripts"; - asd = "weblocks-scripts"; - }); - systems = [ "weblocks-scripts" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) ]; - }; - weblocks-stores = { - pname = "weblocks-stores"; - version = "20211020-git"; - asds = [ "weblocks-stores" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/weblocks-stores/2021-10-20/weblocks-stores-20211020-git.tgz"; - sha256 = "1k44dad18fkp80xjm04fiy6bciirs71ljvm8a2rb33xndrbxiiya"; - system = "weblocks-stores"; - asd = "weblocks-stores"; - }); - systems = [ "weblocks-stores" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "metatilities" pkgs) (getAttr "weblocks-util" pkgs) ]; - }; - weblocks-util = { - pname = "weblocks-util"; - version = "20211020-git"; - asds = [ "weblocks-util" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/weblocks/2021-10-20/weblocks-20211020-git.tgz"; - sha256 = "1hilpzm1p3hrp2hxghjr9y8sy5a9bgk96n8kc8bphvn7dvlbm78j"; - system = "weblocks-util"; - asd = "weblocks-util"; - }); - systems = [ "weblocks-util" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-cont" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-json" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-who" pkgs) (getAttr "closer-mop" pkgs) (getAttr "f-underscore" pkgs) (getAttr "html-template" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "ironclad" pkgs) (getAttr "metatilities" pkgs) (getAttr "optima" pkgs) (getAttr "parenscript" pkgs) (getAttr "parse-number" pkgs) (getAttr "pretty-function" pkgs) (getAttr "puri" pkgs) (getAttr "salza2" pkgs) (getAttr "trivial-backtrace" pkgs) (getAttr "trivial-timeout" pkgs) ]; - }; - websocket-driver = { - pname = "websocket-driver"; - version = "20220331-git"; - asds = [ "websocket-driver" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/websocket-driver/2022-03-31/websocket-driver-20220331-git.tgz"; - sha256 = "183jb9m4y5drc4i9l3c03q0sx8rlqn2d2290c7whl4r3dnginnnf"; - system = "websocket-driver"; - asd = "websocket-driver"; - }); - systems = [ "websocket-driver" ]; - lispLibs = [ (getAttr "websocket-driver-client" pkgs) (getAttr "websocket-driver-server" pkgs) ]; - }; - websocket-driver-base = { - pname = "websocket-driver-base"; - version = "20220331-git"; - asds = [ "websocket-driver-base" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/websocket-driver/2022-03-31/websocket-driver-20220331-git.tgz"; - sha256 = "183jb9m4y5drc4i9l3c03q0sx8rlqn2d2290c7whl4r3dnginnnf"; - system = "websocket-driver-base"; - asd = "websocket-driver-base"; - }); - systems = [ "websocket-driver-base" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-base64" pkgs) (getAttr "event-emitter" pkgs) (getAttr "fast-io" pkgs) (getAttr "fast-websocket" pkgs) (getAttr "sha1" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - websocket-driver-client = { - pname = "websocket-driver-client"; - version = "20220331-git"; - asds = [ "websocket-driver-client" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/websocket-driver/2022-03-31/websocket-driver-20220331-git.tgz"; - sha256 = "183jb9m4y5drc4i9l3c03q0sx8rlqn2d2290c7whl4r3dnginnnf"; - system = "websocket-driver-client"; - asd = "websocket-driver-client"; - }); - systems = [ "websocket-driver-client" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-base64" pkgs) (getAttr "fast-http" pkgs) (getAttr "fast-io" pkgs) (getAttr "fast-websocket" pkgs) (getAttr "quri" pkgs) (getAttr "usocket" pkgs) (getAttr "websocket-driver-base" pkgs) ]; - }; - websocket-driver-server = { - pname = "websocket-driver-server"; - version = "20220331-git"; - asds = [ "websocket-driver-server" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/websocket-driver/2022-03-31/websocket-driver-20220331-git.tgz"; - sha256 = "183jb9m4y5drc4i9l3c03q0sx8rlqn2d2290c7whl4r3dnginnnf"; - system = "websocket-driver-server"; - asd = "websocket-driver-server"; - }); - systems = [ "websocket-driver-server" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "clack-socket" pkgs) (getAttr "fast-io" pkgs) (getAttr "fast-websocket" pkgs) (getAttr "websocket-driver-base" pkgs) ]; - }; - weft = { - pname = "weft"; - version = "20180228-git"; - asds = [ "weft" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/weft/2018-02-28/weft-20180228-git.tgz"; - sha256 = "1ia38xcpp9g4v6sij99lyl9b8p59ysg2cj9k92nb683f8pzv9pl3"; - system = "weft"; - asd = "weft"; - }); - systems = [ "weft" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "log4cl" pkgs) (getAttr "trivial-timeout" pkgs) (getAttr "usocket" pkgs) ]; - }; - westbrook = { - pname = "westbrook"; - version = "20180131-git"; - asds = [ "westbrook" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/westbrook/2018-01-31/westbrook-20180131-git.tgz"; - sha256 = "08qs5lpg34d1mn6warrrq1wimyqqrjb8jih62g1pbysgni4ihm2v"; - system = "westbrook"; - asd = "westbrook"; - }); - systems = [ "westbrook" ]; - lispLibs = [ (getAttr "cxml" pkgs) ]; - }; - westbrook-tests = { - pname = "westbrook-tests"; - version = "20180131-git"; - asds = [ "westbrook-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/westbrook/2018-01-31/westbrook-20180131-git.tgz"; - sha256 = "08qs5lpg34d1mn6warrrq1wimyqqrjb8jih62g1pbysgni4ihm2v"; - system = "westbrook-tests"; - asd = "westbrook-tests"; - }); - systems = [ "westbrook-tests" ]; - lispLibs = [ (getAttr "fiasco" pkgs) (getAttr "westbrook" pkgs) ]; - }; - what3words = { - pname = "what3words"; - version = "20161204-git"; - asds = [ "what3words" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/what3words/2016-12-04/what3words-20161204-git.tgz"; - sha256 = "0nlrpi8phrf2mpgbw9bj9w4vksqb0baj542bhnq39sjalc8bj73r"; - system = "what3words"; - asd = "what3words"; - }); - systems = [ "what3words" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "drakma" pkgs) (getAttr "jsown" pkgs) ]; - }; - which = { - pname = "which"; - version = "20160421-git"; - asds = [ "which" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/which/2016-04-21/which-20160421-git.tgz"; - sha256 = "127pm9h4rm4w9aadw5yvamnfzhk2rr69kchx10rf9k7sk7izqqfk"; - system = "which"; - asd = "which"; - }); - systems = [ "which" ]; - lispLibs = [ (getAttr "cl-fad" pkgs) (getAttr "path-parse" pkgs) (getAttr "uiop" pkgs) ]; - }; - which-test = { - pname = "which-test"; - version = "20160421-git"; - asds = [ "which-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/which/2016-04-21/which-20160421-git.tgz"; - sha256 = "127pm9h4rm4w9aadw5yvamnfzhk2rr69kchx10rf9k7sk7izqqfk"; - system = "which-test"; - asd = "which-test"; - }); - systems = [ "which-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "which" pkgs) ]; - }; - whirlog = { - pname = "whirlog"; - version = "20211020-git"; - asds = [ "whirlog" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/whirlog/2021-10-20/whirlog-20211020-git.tgz"; - sha256 = "0sf1kc8ln1gszzrz3qh3bx11k42lpccrv6kp2ihlrg3d6lsa6i26"; - system = "whirlog"; - asd = "whirlog"; - }); - systems = [ "whirlog" ]; - lispLibs = [ ]; - }; - whofields = { - pname = "whofields"; - version = "20211020-git"; - asds = [ "whofields" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/whofields/2021-10-20/whofields-20211020-git.tgz"; - sha256 = "1scpzzfdw5g7qsayhznjyzns8lxx4fvv2jxd0vr9vnxad3vm977x"; - system = "whofields"; - asd = "whofields"; - }); - systems = [ "whofields" ]; - lispLibs = [ (getAttr "asdf-package-system" pkgs) (getAttr "cl-who" pkgs) ]; - }; - whofields_slash_test = { - pname = "whofields_test"; - version = "20211020-git"; - asds = [ "whofields" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/whofields/2021-10-20/whofields-20211020-git.tgz"; - sha256 = "1scpzzfdw5g7qsayhznjyzns8lxx4fvv2jxd0vr9vnxad3vm977x"; - system = "whofields"; - asd = "whofields"; - }); - systems = [ "whofields/test" ]; - lispLibs = [ ]; - meta = { - broken = true; - }; - }; - wilbur = { - pname = "wilbur"; - version = "20181210-git"; - asds = [ "wilbur" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/de.setf.wilbur/2018-12-10/de.setf.wilbur-20181210-git.tgz"; - sha256 = "0w4qssyarim4v64vv7jmspmyba7xghx9bkalyyhvccf6zrf7b2v7"; - system = "wilbur"; - asd = "wilbur"; - }); - systems = [ "wilbur" ]; - lispLibs = [ (getAttr "usocket" pkgs) ]; - }; - wild-package-inferred-system = { - pname = "wild-package-inferred-system"; - version = "20210531-git"; - asds = [ "wild-package-inferred-system" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wild-package-inferred-system/2021-05-31/wild-package-inferred-system-20210531-git.tgz"; - sha256 = "0sp3j3i83aqyq9bl3djs490nilryi9sh1wjbcqd9z94d9wfbfz80"; - system = "wild-package-inferred-system"; - asd = "wild-package-inferred-system"; - }); - systems = [ "wild-package-inferred-system" ]; - lispLibs = [ ]; - }; - wild-package-inferred-system_slash_test = { - pname = "wild-package-inferred-system_test"; - version = "20210531-git"; - asds = [ "wild-package-inferred-system" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wild-package-inferred-system/2021-05-31/wild-package-inferred-system-20210531-git.tgz"; - sha256 = "0sp3j3i83aqyq9bl3djs490nilryi9sh1wjbcqd9z94d9wfbfz80"; - system = "wild-package-inferred-system"; - asd = "wild-package-inferred-system"; - }); - systems = [ "wild-package-inferred-system/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "wild-package-inferred-system" pkgs) ]; - meta = { - broken = true; - }; - }; - window = { - pname = "window"; - version = "20200427-git"; - asds = [ "window" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/sucle/2020-04-27/sucle-20200427-git.tgz"; - sha256 = "033akkn9zxc6qdgycgxgybx3v23638245xrx29x2cbwnvg3i1q34"; - system = "window"; - asd = "window"; - }); - systems = [ "window" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bodge-glfw" pkgs) (getAttr "cffi" pkgs) (getAttr "trivial-features" pkgs) (getAttr "utility" pkgs) ]; - }; - winhttp = { - pname = "winhttp"; - version = "20200610-git"; - asds = [ "winhttp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/winhttp/2020-06-10/winhttp-20200610-git.tgz"; - sha256 = "121mpn14kfj86bp4qlc69a139ffrsvgiisa7rax9mvbj361s8dna"; - system = "winhttp"; - asd = "winhttp"; - }); - systems = [ "winhttp" ]; - lispLibs = [ (getAttr "cffi" pkgs) ]; - }; - winlock = { - pname = "winlock"; - version = "20191130-git"; - asds = [ "winlock" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/winlock/2019-11-30/winlock-20191130-git.tgz"; - sha256 = "0sgjq1cjbmshnh2zwyqws7rkr93zkjl0rrzyf04542gb1grj0vd8"; - system = "winlock"; - asd = "winlock"; - }); - systems = [ "winlock" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "named-readtables" pkgs) (getAttr "serapeum" pkgs) ]; - }; - winlock_slash_test = { - pname = "winlock_test"; - version = "20191130-git"; - asds = [ "winlock" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/winlock/2019-11-30/winlock-20191130-git.tgz"; - sha256 = "0sgjq1cjbmshnh2zwyqws7rkr93zkjl0rrzyf04542gb1grj0vd8"; - system = "winlock"; - asd = "winlock"; - }); - systems = [ "winlock/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "winlock" pkgs) ]; - meta = { - broken = true; - }; - }; - wire-world = { - pname = "wire-world"; - version = "master-1a957fb2-git"; - asds = [ "wire-world" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "wire-world"; - asd = "wire-world"; - }); - systems = [ "wire-world" ]; - lispLibs = [ (getAttr "gwl-graphics" pkgs) ]; - }; - with-branching = { - pname = "with-branching"; - version = "20220220-git"; - asds = [ "with-branching" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-branching/2022-02-20/with-branching-20220220-git.tgz"; - sha256 = "0jaaz2b1k6pbh9hyvvsxp8dn18gqjz24kgri9wazqxyn0n05jpl9"; - system = "with-branching"; - asd = "with-branching"; - }); - systems = [ "with-branching" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "trivial-indent" pkgs) ]; - }; - with-branching_slash_dangerous = { - pname = "with-branching_dangerous"; - version = "20220220-git"; - asds = [ "with-branching" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-branching/2022-02-20/with-branching-20220220-git.tgz"; - sha256 = "0jaaz2b1k6pbh9hyvvsxp8dn18gqjz24kgri9wazqxyn0n05jpl9"; - system = "with-branching"; - asd = "with-branching"; - }); - systems = [ "with-branching/dangerous" ]; - lispLibs = [ (getAttr "with-branching" pkgs) ]; - meta = { - broken = true; - }; - }; - with-branching_slash_test = { - pname = "with-branching_test"; - version = "20220220-git"; - asds = [ "with-branching" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-branching/2022-02-20/with-branching-20220220-git.tgz"; - sha256 = "0jaaz2b1k6pbh9hyvvsxp8dn18gqjz24kgri9wazqxyn0n05jpl9"; - system = "with-branching"; - asd = "with-branching"; - }); - systems = [ "with-branching/test" ]; - lispLibs = [ (getAttr "agnostic-lizard" pkgs) (getAttr "with-branching" pkgs) ]; - meta = { - broken = true; - }; - }; - with-c-syntax = { - pname = "with-c-syntax"; - version = "20221106-git"; - asds = [ "with-c-syntax" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-c-syntax/2022-11-06/with-c-syntax-20221106-git.tgz"; - sha256 = "12gdwdyxyl9xm8n04qvmvyc1s06dkckb87i6hdysal5lsf1gwc41"; - system = "with-c-syntax"; - asd = "with-c-syntax"; - }); - systems = [ "with-c-syntax" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "yacc" pkgs) (getAttr "float-features" pkgs) (getAttr "floating-point-contractions" pkgs) (getAttr "named-readtables" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - with-c-syntax-test = { - pname = "with-c-syntax-test"; - version = "20221106-git"; - asds = [ "with-c-syntax-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-c-syntax/2022-11-06/with-c-syntax-20221106-git.tgz"; - sha256 = "12gdwdyxyl9xm8n04qvmvyc1s06dkckb87i6hdysal5lsf1gwc41"; - system = "with-c-syntax-test"; - asd = "with-c-syntax-test"; - }); - systems = [ "with-c-syntax-test" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "floating-point" pkgs) (getAttr "trivial-cltl2" pkgs) (getAttr "with-c-syntax" pkgs) ]; - }; - with-cached-reader-conditionals = { - pname = "with-cached-reader-conditionals"; - version = "20170630-git"; - asds = [ "with-cached-reader-conditionals" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-cached-reader-conditionals/2017-06-30/with-cached-reader-conditionals-20170630-git.tgz"; - sha256 = "0n7a089d0wb13l1nsdh3xlgwxwlqynkbjl8fg2x56h52a5i9gkv4"; - system = "with-cached-reader-conditionals"; - asd = "with-cached-reader-conditionals"; - }); - systems = [ "with-cached-reader-conditionals" ]; - lispLibs = [ ]; - }; - with-contexts = { - pname = "with-contexts"; - version = "20220220-git"; - asds = [ "with-contexts" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-contexts/2022-02-20/with-contexts-20220220-git.tgz"; - sha256 = "0lbv20cfvi4xl0akw092j6ms30daj9y1rh0gb1qlginry0nh8a24"; - system = "with-contexts"; - asd = "with-contexts"; - }); - systems = [ "with-contexts" ]; - lispLibs = [ ]; - }; - with-output-to-stream = { - pname = "with-output-to-stream"; - version = "1.0"; - asds = [ "with-output-to-stream" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-output-to-stream/2019-10-07/with-output-to-stream_1.0.tgz"; - sha256 = "0pv9kccjbxkgcv7wbcfpnzas9pq0n2rs2aq9kdnqkx55k12366sm"; - system = "with-output-to-stream"; - asd = "with-output-to-stream"; - }); - systems = [ "with-output-to-stream" ]; - lispLibs = [ ]; - }; - with-output-to-stream_tests = { - pname = "with-output-to-stream_tests"; - version = "1.0"; - asds = [ "with-output-to-stream_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-output-to-stream/2019-10-07/with-output-to-stream_1.0.tgz"; - sha256 = "0pv9kccjbxkgcv7wbcfpnzas9pq0n2rs2aq9kdnqkx55k12366sm"; - system = "with-output-to-stream_tests"; - asd = "with-output-to-stream_tests"; - }); - systems = [ "with-output-to-stream_tests" ]; - lispLibs = [ (getAttr "parachute" pkgs) (getAttr "with-output-to-stream" pkgs) ]; - }; - with-setf = { - pname = "with-setf"; - version = "release-quicklisp-df3eed9d-git"; - asds = [ "with-setf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-setf/2018-02-28/with-setf-release-quicklisp-df3eed9d-git.tgz"; - sha256 = "090v39kdxk4py3axjrjjac2pn1p0109q14hvl818pik479xr4inz"; - system = "with-setf"; - asd = "with-setf"; - }); - systems = [ "with-setf" ]; - lispLibs = [ ]; - }; - with-shadowed-bindings = { - pname = "with-shadowed-bindings"; - version = "1.0"; - asds = [ "with-shadowed-bindings" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-shadowed-bindings/2019-01-07/with-shadowed-bindings-1.0.tgz"; - sha256 = "0kxy86a21v4fm4xwd44c6kpdadgkcj8iv6a68xavhirhjhngcwy5"; - system = "with-shadowed-bindings"; - asd = "with-shadowed-bindings"; - }); - systems = [ "with-shadowed-bindings" ]; - lispLibs = [ (getAttr "map-bind" pkgs) ]; - }; - with-shadowed-bindings_tests = { - pname = "with-shadowed-bindings_tests"; - version = "1.0"; - asds = [ "with-shadowed-bindings_tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-shadowed-bindings/2019-01-07/with-shadowed-bindings-1.0.tgz"; - sha256 = "0kxy86a21v4fm4xwd44c6kpdadgkcj8iv6a68xavhirhjhngcwy5"; - system = "with-shadowed-bindings_tests"; - asd = "with-shadowed-bindings_tests"; - }); - systems = [ "with-shadowed-bindings_tests" ]; - lispLibs = [ (getAttr "parachute" pkgs) (getAttr "with-shadowed-bindings" pkgs) ]; - }; - with-user-abort = { - pname = "with-user-abort"; - version = "20210411-git"; - asds = [ "with-user-abort" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/with-user-abort/2021-04-11/with-user-abort-20210411-git.tgz"; - sha256 = "0k1xxfvncdw4fx8nncis1ma128bqq05zky1mrzak5rjbivzjm8j1"; - system = "with-user-abort"; - asd = "with-user-abort"; - }); - systems = [ "with-user-abort" ]; - lispLibs = [ ]; - }; - woo = { - pname = "woo"; - version = "20220707-git"; - asds = [ "woo" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/woo/2022-07-07/woo-20220707-git.tgz"; - sha256 = "0ar7w2nfxhxirlcxxq4j1v4cnmvfkw3ip4i53b853g0pfb84m3kz"; - system = "woo"; - asd = "woo"; - }); - systems = [ "woo" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "clack-socket" pkgs) (getAttr "fast-http" pkgs) (getAttr "fast-io" pkgs) (getAttr "lev" pkgs) (getAttr "quri" pkgs) (getAttr "smart-buffer" pkgs) (getAttr "static-vectors" pkgs) (getAttr "swap-bytes" pkgs) (getAttr "trivial-mimes" pkgs) (getAttr "trivial-utf-8" pkgs) (getAttr "vom" pkgs) ]; - }; - woo-test = { - pname = "woo-test"; - version = "20220707-git"; - asds = [ "woo-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/woo/2022-07-07/woo-20220707-git.tgz"; - sha256 = "0ar7w2nfxhxirlcxxq4j1v4cnmvfkw3ip4i53b853g0pfb84m3kz"; - system = "woo-test"; - asd = "woo-test"; - }); - systems = [ "woo-test" ]; - lispLibs = [ (getAttr "clack-test" pkgs) (getAttr "rove" pkgs) (getAttr "woo" pkgs) ]; - }; - wookie = { - pname = "wookie"; - version = "20191130-git"; - asds = [ "wookie" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz"; - sha256 = "17py6z5dk0y5ww99nsr69ksa4v9cqwwqqk90sv096dsh9va2b689"; - system = "wookie"; - asd = "wookie"; - }); - systems = [ "wookie" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "blackbird" pkgs) (getAttr "chunga" pkgs) (getAttr "cl-async" pkgs) (getAttr "cl-async-ssl" pkgs) (getAttr "cl-fad" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "do-urlencode" pkgs) (getAttr "fast-http" pkgs) (getAttr "fast-io" pkgs) (getAttr "quri" pkgs) (getAttr "vom" pkgs) ]; - }; - wordnet = { - pname = "wordnet"; - version = "20220220-git"; - asds = [ "wordnet" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wordnet/2022-02-20/wordnet-20220220-git.tgz"; - sha256 = "07p60k295fsfcp0gmkqhrxd68hb38aqva8f4k8xk8bqqxxf42vkq"; - system = "wordnet"; - asd = "wordnet"; - }); - systems = [ "wordnet" ]; - lispLibs = [ (getAttr "split-sequence" pkgs) ]; - }; - workout-timer = { - pname = "workout-timer"; - version = "20220707-git"; - asds = [ "workout-timer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/workout-timer/2022-07-07/workout-timer-20220707-git.tgz"; - sha256 = "0ibgynwivyxynfa4y9h8mqk0y5qkn97ii0xwfh0py0697hq74xp3"; - system = "workout-timer"; - asd = "workout-timer"; - }); - systems = [ "workout-timer" ]; - lispLibs = [ (getAttr "cffi-toolchain" pkgs) (getAttr "command-line-arguments" pkgs) (getAttr "local-time" pkgs) (getAttr "mixalot" pkgs) (getAttr "mixalot-vorbis" pkgs) (getAttr "vorbisfile-ffi" pkgs) ]; - }; - workout-timer_slash_static = { - pname = "workout-timer_static"; - version = "20220707-git"; - asds = [ "workout-timer" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/workout-timer/2022-07-07/workout-timer-20220707-git.tgz"; - sha256 = "0ibgynwivyxynfa4y9h8mqk0y5qkn97ii0xwfh0py0697hq74xp3"; - system = "workout-timer"; - asd = "workout-timer"; - }); - systems = [ "workout-timer/static" ]; - lispLibs = [ (getAttr "cffi-toolchain" pkgs) (getAttr "workout-timer" pkgs) ]; - meta = { - broken = true; - }; - }; - wu-decimal = { - pname = "wu-decimal"; - version = "20130128-git"; - asds = [ "wu-decimal" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wu-decimal/2013-01-28/wu-decimal-20130128-git.tgz"; - sha256 = "1p7na4hic7297amwm4idfwkyx664ny8cdssncyra37pmv4wzp8dm"; - system = "wu-decimal"; - asd = "wu-decimal"; - }); - systems = [ "wu-decimal" ]; - lispLibs = [ ]; - }; - wu-sugar = { - pname = "wu-sugar"; - version = "20160825-git"; - asds = [ "wu-sugar" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wu-sugar/2016-08-25/wu-sugar-20160825-git.tgz"; - sha256 = "0ypn5195krfd1rva5myla8j7n2ilfs5gxh81flx7v0mr4r70fayl"; - system = "wu-sugar"; - asd = "wu-sugar"; - }); - systems = [ "wu-sugar" ]; - lispLibs = [ ]; - }; - wuwei = { - pname = "wuwei"; - version = "20221106-git"; - asds = [ "wuwei" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wuwei/2022-11-06/wuwei-20221106-git.tgz"; - sha256 = "1k5yhxdqcx250kd56qgbch5z0hvjpjwch38c3949nf790pmrhl8f"; - system = "wuwei"; - asd = "wuwei"; - }); - systems = [ "wuwei" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "drakma" pkgs) (getAttr "ironclad" pkgs) (getAttr "mtlisp" pkgs) (getAttr "aserve" pkgs) ]; - }; - wuwei-examples = { - pname = "wuwei-examples"; - version = "20221106-git"; - asds = [ "wuwei-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/wuwei/2022-11-06/wuwei-20221106-git.tgz"; - sha256 = "1k5yhxdqcx250kd56qgbch5z0hvjpjwch38c3949nf790pmrhl8f"; - system = "wuwei-examples"; - asd = "wuwei"; - }); - systems = [ "wuwei-examples" ]; - lispLibs = [ (getAttr "drakma" pkgs) (getAttr "wuwei" pkgs) ]; - }; - x_dot_let-star = { - pname = "x.let-star"; - version = "20200325-git"; - asds = [ "x.let-star" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/x.let-star/2020-03-25/x.let-star-20200325-git.tgz"; - sha256 = "0qk0rpqzb7vaivggsqch06nmdjzp6b31a88w40y3864clajpcrnr"; - system = "x.let-star"; - asd = "x.let-star"; - }); - systems = [ "x.let-star" ]; - lispLibs = [ ]; - }; - xarray = { - pname = "xarray"; - version = "20140113-git"; - asds = [ "xarray" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xarray/2014-01-13/xarray-20140113-git.tgz"; - sha256 = "031h1bvy9s6qas2160dgf7gc0y6inrhpzp8j3wrb6fjxkb0524yl"; - system = "xarray"; - asd = "xarray"; - }); - systems = [ "xarray" ]; - lispLibs = [ (getAttr "anaphora" pkgs) (getAttr "cl-utilities" pkgs) (getAttr "iterate" pkgs) (getAttr "metabang-bind" pkgs) ]; - }; - xarray-test = { - pname = "xarray-test"; - version = "20140113-git"; - asds = [ "xarray-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xarray/2014-01-13/xarray-20140113-git.tgz"; - sha256 = "031h1bvy9s6qas2160dgf7gc0y6inrhpzp8j3wrb6fjxkb0524yl"; - system = "xarray-test"; - asd = "xarray-test"; - }); - systems = [ "xarray-test" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "xarray" pkgs) ]; - }; - xcat = { - pname = "xcat"; - version = "20200925-git"; - asds = [ "xcat" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xcat/2020-09-25/xcat-20200925-git.tgz"; - sha256 = "1v8mcz8bidcbfl587b5lm07l91xan6z1y3zikjkyzagiigd4byvi"; - system = "xcat"; - asd = "xcat"; - }); - systems = [ "xcat" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "log4cl" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "usocket-server" pkgs) ]; - }; - xecto = { - pname = "xecto"; - version = "20151218-git"; - asds = [ "xecto" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xecto/2015-12-18/xecto-20151218-git.tgz"; - sha256 = "1m81cl02k28v9sgscl8qhig735x5qybhw69szs6bkkqml7hbl12q"; - system = "xecto"; - asd = "xecto"; - }); - systems = [ "xecto" ]; - lispLibs = [ ]; - }; - xembed = { - pname = "xembed"; - version = "20191130-git"; - asds = [ "xembed" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz"; - sha256 = "1abx4v36ycmfjdwpjk4hh8058ya8whwia7ds9vd96q2qsrs57f12"; - system = "xembed"; - asd = "xembed"; - }); - systems = [ "xembed" ]; - lispLibs = [ (getAttr "clx" pkgs) ]; - }; - xfactory = { - pname = "xfactory"; - version = "20130615-git"; - asds = [ "xfactory" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; - sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw"; - system = "xfactory"; - asd = "xfactory"; - }); - systems = [ "xfactory" ]; - lispLibs = [ (getAttr "cl-libxml2" pkgs) ]; - }; - xfactory-test = { - pname = "xfactory-test"; - version = "20130615-git"; - asds = [ "xfactory-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; - sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw"; - system = "xfactory-test"; - asd = "xfactory"; - }); - systems = [ "xfactory-test" ]; - lispLibs = [ (getAttr "xfactory" pkgs) (getAttr "lift" pkgs) ]; - }; - xhtmlambda = { - pname = "xhtmlambda"; - version = "20220220-git"; - asds = [ "xhtmlambda" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xhtmlambda/2022-02-20/xhtmlambda-20220220-git.tgz"; - sha256 = "1ca1fkycdblvm26a5vnxgg6anfqsq0kfjm1libr0yw4r59ds0mx1"; - system = "xhtmlambda"; - asd = "xhtmlambda"; - }); - systems = [ "xhtmlambda" ]; - lispLibs = [ (getAttr "cl-unicode" pkgs) ]; - }; - xhtmlgen = { - pname = "xhtmlgen"; - version = "20170124-git"; - asds = [ "xhtmlgen" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xhtmlgen/2017-01-24/xhtmlgen-20170124-git.tgz"; - sha256 = "0br4pqhl7y7rd95l9xx2p96gds3dh4pgk9v038wbshl2dnhjv82k"; - system = "xhtmlgen"; - asd = "xhtmlgen"; - }); - systems = [ "xhtmlgen" ]; - lispLibs = [ (getAttr "cxml" pkgs) ]; - }; - xhtmlgen-test = { - pname = "xhtmlgen-test"; - version = "20170124-git"; - asds = [ "xhtmlgen-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xhtmlgen/2017-01-24/xhtmlgen-20170124-git.tgz"; - sha256 = "0br4pqhl7y7rd95l9xx2p96gds3dh4pgk9v038wbshl2dnhjv82k"; - system = "xhtmlgen-test"; - asd = "xhtmlgen"; - }); - systems = [ "xhtmlgen-test" ]; - lispLibs = [ (getAttr "rt" pkgs) (getAttr "xhtmlgen" pkgs) ]; - }; - xkeyboard = { - pname = "xkeyboard"; - version = "20120811-git"; - asds = [ "xkeyboard" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz"; - sha256 = "1nxky9wsmm7nmwz372jgb4iy0ywlm22jw0vl8yi0k9slsfklvcqi"; - system = "xkeyboard"; - asd = "xkeyboard"; - }); - systems = [ "xkeyboard" ]; - lispLibs = [ (getAttr "clx" pkgs) ]; - }; - xkeyboard-test = { - pname = "xkeyboard-test"; - version = "20120811-git"; - asds = [ "xkeyboard-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz"; - sha256 = "1nxky9wsmm7nmwz372jgb4iy0ywlm22jw0vl8yi0k9slsfklvcqi"; - system = "xkeyboard-test"; - asd = "xkeyboard"; - }); - systems = [ "xkeyboard-test" ]; - lispLibs = [ (getAttr "xkeyboard" pkgs) ]; - }; - xlsx = { - pname = "xlsx"; - version = "20180711-git"; - asds = [ "xlsx" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xlsx/2018-07-11/xlsx-20180711-git.tgz"; - sha256 = "15vw5zl13jg9b1rla7w2wv6ss93mijrnn9fzsh0fakgvfikqq1n6"; - system = "xlsx"; - asd = "xlsx"; - }); - systems = [ "xlsx" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "xmls" pkgs) (getAttr "zip" pkgs) ]; - }; - xlunit = { - pname = "xlunit"; - version = "20150923-git"; - asds = [ "xlunit" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xlunit/2015-09-23/xlunit-20150923-git.tgz"; - sha256 = "0argfmp9nghs4sihyj3f8ch9qfib2b7ll07v5m9ziajgzsfl5xw3"; - system = "xlunit"; - asd = "xlunit"; - }); - systems = [ "xlunit" ]; - lispLibs = [ ]; - }; - xlunit-tests = { - pname = "xlunit-tests"; - version = "20150923-git"; - asds = [ "xlunit-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xlunit/2015-09-23/xlunit-20150923-git.tgz"; - sha256 = "0argfmp9nghs4sihyj3f8ch9qfib2b7ll07v5m9ziajgzsfl5xw3"; - system = "xlunit-tests"; - asd = "xlunit"; - }); - systems = [ "xlunit-tests" ]; - lispLibs = [ (getAttr "xlunit" pkgs) ]; - }; - xml-emitter = { - pname = "xml-emitter"; - version = "20221106-git"; - asds = [ "xml-emitter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xml-emitter/2022-11-06/xml-emitter-20221106-git.tgz"; - sha256 = "0yvcrzqz14kx90i6sm7kpi8l8hy61a1yjj0a8wvgryjbgp6abqvc"; - system = "xml-emitter"; - asd = "xml-emitter"; - }); - systems = [ "xml-emitter" ]; - lispLibs = [ (getAttr "cl-utilities" pkgs) ]; - }; - xml-emitter_slash_tests = { - pname = "xml-emitter_tests"; - version = "20221106-git"; - asds = [ "xml-emitter" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xml-emitter/2022-11-06/xml-emitter-20221106-git.tgz"; - sha256 = "0yvcrzqz14kx90i6sm7kpi8l8hy61a1yjj0a8wvgryjbgp6abqvc"; - system = "xml-emitter"; - asd = "xml-emitter"; - }); - systems = [ "xml-emitter/tests" ]; - lispLibs = [ (getAttr "_1am" pkgs) (getAttr "xml-emitter" pkgs) ]; - meta = { - broken = true; - }; - }; - xml-mop = { - pname = "xml-mop"; - version = "20110418-git"; - asds = [ "xml-mop" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xml-mop/2011-04-18/xml-mop-20110418-git.tgz"; - sha256 = "1vfa3h5dghnpc7qbqqm80mm1ri6x7x5r528kvkwzngghrbxyhgjr"; - system = "xml-mop"; - asd = "xml-mop"; - }); - systems = [ "xml-mop" ]; - lispLibs = [ (getAttr "closer-mop" pkgs) (getAttr "s-xml" pkgs) ]; - }; - xml-render = { - pname = "xml-render"; - version = "20210531-git"; - asds = [ "xml-render" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz"; - sha256 = "0fcs5mq0gxfczbrg7ay8r4bf5r4g6blvpdbjkhcl8dapcikyn35h"; - system = "xml-render"; - asd = "xml-render"; - }); - systems = [ "xml-render" ]; - lispLibs = [ (getAttr "cl-typesetting" pkgs) (getAttr "xmls" pkgs) ]; - }; - xml_dot_location = { - pname = "xml.location"; - version = "20200325-git"; - asds = [ "xml.location" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz"; - sha256 = "0ajl03k7krns6b0z3ykmngq3i77yd2j85z3h76drlc9whxvm2kii"; - system = "xml.location"; - asd = "xml.location"; - }); - systems = [ "xml.location" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "closer-mop" pkgs) (getAttr "cxml-stp" pkgs) (getAttr "iterate" pkgs) (getAttr "let-plus" pkgs) (getAttr "more-conditions" pkgs) (getAttr "xpath" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - xml_dot_location-and-local-time = { - pname = "xml.location-and-local-time"; - version = "20200325-git"; - asds = [ "xml.location-and-local-time" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz"; - sha256 = "0ajl03k7krns6b0z3ykmngq3i77yd2j85z3h76drlc9whxvm2kii"; - system = "xml.location-and-local-time"; - asd = "xml.location-and-local-time"; - }); - systems = [ "xml.location-and-local-time" ]; - lispLibs = [ (getAttr "local-time" pkgs) (getAttr "xml_dot_location" pkgs) ]; - }; - xml_dot_location_slash_test = { - pname = "xml.location_test"; - version = "20200325-git"; - asds = [ "xml.location" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz"; - sha256 = "0ajl03k7krns6b0z3ykmngq3i77yd2j85z3h76drlc9whxvm2kii"; - system = "xml.location"; - asd = "xml.location"; - }); - systems = [ "xml.location/test" ]; - lispLibs = [ (getAttr "lift" pkgs) (getAttr "xml_dot_location" pkgs) ]; - meta = { - broken = true; - }; - }; - xmls = { - pname = "xmls"; - version = "release-c6ca1b39-git"; - asds = [ "xmls" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xmls/2022-07-07/xmls-release-c6ca1b39-git.tgz"; - sha256 = "050c9z0xq8wagga2mbdhjm0j1530m4rz942sll4w6pxr0s6fmg3g"; - system = "xmls"; - asd = "xmls"; - }); - systems = [ "xmls" ]; - lispLibs = [ ]; - }; - xmls_slash_octets = { - pname = "xmls_octets"; - version = "release-c6ca1b39-git"; - asds = [ "xmls" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xmls/2022-07-07/xmls-release-c6ca1b39-git.tgz"; - sha256 = "050c9z0xq8wagga2mbdhjm0j1530m4rz942sll4w6pxr0s6fmg3g"; - system = "xmls"; - asd = "xmls"; - }); - systems = [ "xmls/octets" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "xmls" pkgs) ]; - meta = { - broken = true; - }; - }; - xmls_slash_test = { - pname = "xmls_test"; - version = "release-c6ca1b39-git"; - asds = [ "xmls" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xmls/2022-07-07/xmls-release-c6ca1b39-git.tgz"; - sha256 = "050c9z0xq8wagga2mbdhjm0j1530m4rz942sll4w6pxr0s6fmg3g"; - system = "xmls"; - asd = "xmls"; - }); - systems = [ "xmls/test" ]; - lispLibs = [ (getAttr "xmls" pkgs) ]; - meta = { - broken = true; - }; - }; - xmls_slash_unit-test = { - pname = "xmls_unit-test"; - version = "release-c6ca1b39-git"; - asds = [ "xmls" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xmls/2022-07-07/xmls-release-c6ca1b39-git.tgz"; - sha256 = "050c9z0xq8wagga2mbdhjm0j1530m4rz942sll4w6pxr0s6fmg3g"; - system = "xmls"; - asd = "xmls"; - }); - systems = [ "xmls/unit-test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "xmls" pkgs) ]; - meta = { - broken = true; - }; - }; - xoverlay = { - pname = "xoverlay"; - version = "20130615-git"; - asds = [ "xoverlay" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-libxml2/2013-06-15/cl-libxml2-20130615-git.tgz"; - sha256 = "09049c13cfp5sc6x9lrw762jd7a9qkfq5jgngqgrzn4kn9qscarw"; - system = "xoverlay"; - asd = "xoverlay"; - }); - systems = [ "xoverlay" ]; - lispLibs = [ (getAttr "cl-libxml2" pkgs) ]; - }; - xpath = { - pname = "xpath"; - version = "20190521-git"; - asds = [ "xpath" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz"; - sha256 = "1fb03fgnzrvh22lw1jdg04pmyja5fib5n42rzwp5mhr829yvxkvp"; - system = "xpath"; - asd = "xpath"; - }); - systems = [ "xpath" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "yacc" pkgs) (getAttr "cxml" pkgs) (getAttr "parse-number" pkgs) ]; - }; - xpath_slash_test = { - pname = "xpath_test"; - version = "20190521-git"; - asds = [ "xpath" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz"; - sha256 = "1fb03fgnzrvh22lw1jdg04pmyja5fib5n42rzwp5mhr829yvxkvp"; - system = "xpath"; - asd = "xpath"; - }); - systems = [ "xpath/test" ]; - lispLibs = [ (getAttr "xpath" pkgs) ]; - meta = { - broken = true; - }; - }; - xptest = { - pname = "xptest"; - version = "20150923-git"; - asds = [ "xptest" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xptest/2015-09-23/xptest-20150923-git.tgz"; - sha256 = "02jwncq5d60l77gf87ahabzg6k6c878gfc4x1mf6ld97rj5lzp3b"; - system = "xptest"; - asd = "xptest"; - }); - systems = [ "xptest" ]; - lispLibs = [ ]; - }; - xsubseq = { - pname = "xsubseq"; - version = "20170830-git"; - asds = [ "xsubseq" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz"; - sha256 = "1xz79q0p2mclf3sqjiwf6izdpb6xrsr350bv4mlmdlm6rg5r99px"; - system = "xsubseq"; - asd = "xsubseq"; - }); - systems = [ "xsubseq" ]; - lispLibs = [ ]; - }; - xsubseq-test = { - pname = "xsubseq-test"; - version = "20170830-git"; - asds = [ "xsubseq-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz"; - sha256 = "1xz79q0p2mclf3sqjiwf6izdpb6xrsr350bv4mlmdlm6rg5r99px"; - system = "xsubseq-test"; - asd = "xsubseq-test"; - }); - systems = [ "xsubseq-test" ]; - lispLibs = [ (getAttr "prove" pkgs) (getAttr "prove-asdf" pkgs) (getAttr "xsubseq" pkgs) ]; - }; - xuriella = { - pname = "xuriella"; - version = "20120305-git"; - asds = [ "xuriella" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/xuriella/2012-03-05/xuriella-20120305-git.tgz"; - sha256 = "0wz98bfvr7h7g0r7dy815brq5sz3x40281hp0qk801q17aa4qhqh"; - system = "xuriella"; - asd = "xuriella"; - }); - systems = [ "xuriella" ]; - lispLibs = [ (getAttr "closure-html" pkgs) (getAttr "cxml" pkgs) (getAttr "cxml-stp" pkgs) (getAttr "xpath" pkgs) (getAttr "split-sequence" pkgs) ]; - }; - yacc = { - pname = "yacc"; - version = "20101006-darcs"; - asds = [ "yacc" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz"; - sha256 = "16946pzf8vvadnyfayvj8rbh4zjzw90h0azz2qk1mxrvhh5wklib"; - system = "yacc"; - asd = "yacc"; - }); - systems = [ "yacc" ]; - lispLibs = [ ]; - }; - yaclml = { - pname = "yaclml"; - version = "20180131-git"; - asds = [ "yaclml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/yaclml/2018-01-31/yaclml-20180131-git.tgz"; - sha256 = "0wq6clk4qwbdaf0hcfjz4vg27nyf6ng0rrip1ay4rlkb03hdnssq"; - system = "yaclml"; - asd = "yaclml"; - }); - systems = [ "yaclml" ]; - lispLibs = [ (getAttr "arnesi" pkgs) (getAttr "iterate" pkgs) ]; - }; - yaclml_slash_test = { - pname = "yaclml_test"; - version = "20180131-git"; - asds = [ "yaclml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/yaclml/2018-01-31/yaclml-20180131-git.tgz"; - sha256 = "0wq6clk4qwbdaf0hcfjz4vg27nyf6ng0rrip1ay4rlkb03hdnssq"; - system = "yaclml"; - asd = "yaclml"; - }); - systems = [ "yaclml/test" ]; - lispLibs = [ (getAttr "fiveam" pkgs) (getAttr "yaclml" pkgs) ]; - meta = { - broken = true; - }; - }; - yadd = { - pname = "yadd"; - version = "master-1a957fb2-git"; - asds = [ "yadd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/gendl/2022-07-07/gendl-master-1a957fb2-git.tgz"; - sha256 = "0j47qnvvfx3vnh3pll6rkya5m142hi93bd5jk65rv43vbc94sv30"; - system = "yadd"; - asd = "yadd"; - }); - systems = [ "yadd" ]; - lispLibs = [ (getAttr "cl-html-parse" pkgs) (getAttr "gwl-graphics" pkgs) ]; - }; - yah = { - pname = "yah"; - version = "20221106-git"; - asds = [ "yah" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/yah/2022-11-06/yah-20221106-git.tgz"; - sha256 = "1bxz8b7fb15yzipkpkaxgqr8yj4kqnbrzjf52zx0s3z1h7fg1vfd"; - system = "yah"; - asd = "yah"; - }); - systems = [ "yah" ]; - lispLibs = [ (getAttr "mgl-pax" pkgs) ]; - }; - yason = { - pname = "yason"; - version = "20221106-git"; - asds = [ "yason" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/yason/2022-11-06/yason-20221106-git.tgz"; - sha256 = "04h4jhk1z1r9q0vmhwc93x8gbikmsk1jblvpbghwvgrjbvns0vbc"; - system = "yason"; - asd = "yason"; - }); - systems = [ "yason" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - youtube = { - pname = "youtube"; - version = "20191227-git"; - asds = [ "youtube" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/youtube/2019-12-27/youtube-20191227-git.tgz"; - sha256 = "0rqbyxgb9v3m8rwx2agaz7cq83w9k8gy5wl5wbw0rfg7r88ah5z0"; - system = "youtube"; - asd = "youtube"; - }); - systems = [ "youtube" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "yason" pkgs) ]; - }; - yxorp = { - pname = "yxorp"; - version = "20221106-git"; - asds = [ "yxorp" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-yxorp/2022-11-06/cl-yxorp-20221106-git.tgz"; - sha256 = "0k93xmfpp5j1hr7jwvrxhi7v1h759y5b8kfxfygs0dv2p2801k6y"; - system = "yxorp"; - asd = "yxorp"; - }); - systems = [ "yxorp" ]; - lispLibs = [ (getAttr "binding-arrows" pkgs) (getAttr "chipz" pkgs) (getAttr "chunga" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "str" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "rutils" pkgs) (getAttr "salza2" pkgs) (getAttr "smart-buffer" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "usocket" pkgs) (getAttr "usocket-server" pkgs) ]; - }; - zacl = { - pname = "zacl"; - version = "20210807-git"; - asds = [ "zacl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zacl/2021-08-07/zacl-20210807-git.tgz"; - sha256 = "1lvc8hljvd3ngx7l8j8yffyvdfjhsph13qqhxyzlx1g8wgk145mn"; - system = "zacl"; - asd = "zacl"; - }); - systems = [ "zacl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "cl_plus_ssl" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "cl-store" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "local-time" pkgs) (getAttr "md5" pkgs) (getAttr "queues_dot_simple-queue" pkgs) (getAttr "quri" pkgs) (getAttr "split-sequence" pkgs) (getAttr "trivial-backtrace" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "uiop" pkgs) (getAttr "usocket" pkgs) ]; - }; - zaserve = { - pname = "zaserve"; - version = "20211209-git"; - asds = [ "zaserve" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/aserve/2021-12-09/aserve-20211209-git.tgz"; - sha256 = "06bm9j873xwidvqn6n838b0gvsqs486z5k210l1i0vv8zc4lznxv"; - system = "zaserve"; - asd = "zaserve"; - }); - systems = [ "zaserve" ]; - lispLibs = [ (getAttr "zacl" pkgs) ]; - }; - zaws = { - pname = "zaws"; - version = "20150407-git"; - asds = [ "zaws" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zaws/2015-04-07/zaws-20150407-git.tgz"; - sha256 = "1iwjyqzm4b44in7i53z5lp8n4gzsi27ch02ql6y2vxbmq3sqffaw"; - system = "zaws"; - asd = "zaws"; - }); - systems = [ "zaws" ]; - lispLibs = [ (getAttr "cl-base64" pkgs) (getAttr "drakma" pkgs) (getAttr "flexi-streams" pkgs) (getAttr "ironclad" pkgs) ]; - }; - zaws-xml = { - pname = "zaws-xml"; - version = "20150407-git"; - asds = [ "zaws-xml" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zaws/2015-04-07/zaws-20150407-git.tgz"; - sha256 = "1iwjyqzm4b44in7i53z5lp8n4gzsi27ch02ql6y2vxbmq3sqffaw"; - system = "zaws-xml"; - asd = "zaws-xml"; - }); - systems = [ "zaws-xml" ]; - lispLibs = [ (getAttr "cxml" pkgs) ]; - }; - zbucium = { - pname = "zbucium"; - version = "20190710-git"; - asds = [ "zbucium" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zbucium/2019-07-10/zbucium-20190710-git.tgz"; - sha256 = "112qx8lwcsaipnnypv2jr57lwhlgzb5n53wgck3r66b8vjjb91gy"; - system = "zbucium"; - asd = "zbucium"; - }); - systems = [ "zbucium" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "bordeaux-threads" pkgs) (getAttr "drakma" pkgs) (getAttr "fare-memoization" pkgs) (getAttr "generators" pkgs) (getAttr "lastfm" pkgs) (getAttr "local-time" pkgs) (getAttr "lquery" pkgs) (getAttr "lyrics" pkgs) (getAttr "plump" pkgs) (getAttr "yason" pkgs) (getAttr "youtube" pkgs) ]; - }; - zcdb = { - pname = "zcdb"; - version = "1.0.4"; - asds = [ "zcdb" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zcdb/2015-04-07/zcdb-1.0.4.tgz"; - sha256 = "1g83hqivh40xrpifm9v1vx92h13g5kzn12fjrlk57fyl1qwjqdi7"; - system = "zcdb"; - asd = "zcdb"; - }); - systems = [ "zcdb" ]; - lispLibs = [ ]; - }; - zenekindarl = { - pname = "zenekindarl"; - version = "20171130-git"; - asds = [ "zenekindarl" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zenekindarl/2017-11-30/zenekindarl-20171130-git.tgz"; - sha256 = "104y98j8fjj4wry55mhgv3g6358h5n1qcbhpn19b27b8cs8gqwib"; - system = "zenekindarl"; - asd = "zenekindarl"; - }); - systems = [ "zenekindarl" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "anaphora" pkgs) (getAttr "babel" pkgs) (getAttr "cl-annot" pkgs) (getAttr "cl-ppcre" pkgs) (getAttr "fast-io" pkgs) (getAttr "html-encode" pkgs) (getAttr "maxpc" pkgs) (getAttr "optima" pkgs) ]; - }; - zenekindarl-test = { - pname = "zenekindarl-test"; - version = "20171130-git"; - asds = [ "zenekindarl-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zenekindarl/2017-11-30/zenekindarl-20171130-git.tgz"; - sha256 = "104y98j8fjj4wry55mhgv3g6358h5n1qcbhpn19b27b8cs8gqwib"; - system = "zenekindarl-test"; - asd = "zenekindarl-test"; - }); - systems = [ "zenekindarl-test" ]; - lispLibs = [ (getAttr "flexi-streams" pkgs) (getAttr "prove" pkgs) (getAttr "zenekindarl" pkgs) ]; - }; - zeromq = { - pname = "zeromq"; - version = "20160318-git"; - asds = [ "zeromq" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-zmq/2016-03-18/cl-zmq-20160318-git.tgz"; - sha256 = "0g19ych3n57qdd42m0bcdcrq8c1p0fqzz07xrxl0s0g8bms3a3ga"; - system = "zeromq"; - asd = "zeromq"; - }); - systems = [ "zeromq" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "trivial-garbage" pkgs) ]; - }; - zeromq_dot_tests = { - pname = "zeromq.tests"; - version = "20160318-git"; - asds = [ "zeromq.tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-zmq/2016-03-18/cl-zmq-20160318-git.tgz"; - sha256 = "0g19ych3n57qdd42m0bcdcrq8c1p0fqzz07xrxl0s0g8bms3a3ga"; - system = "zeromq.tests"; - asd = "zeromq"; - }); - systems = [ "zeromq.tests" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "zeromq" pkgs) (getAttr "fiveam" pkgs) ]; - }; - zip = { - pname = "zip"; - version = "20150608-git"; - asds = [ "zip" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zip/2015-06-08/zip-20150608-git.tgz"; - sha256 = "0s08a6fq182fzsbfyvihqbdllq6gxcwkvphxnrd9wwz65dhg5y66"; - system = "zip"; - asd = "zip"; - }); - systems = [ "zip" ]; - lispLibs = [ (getAttr "babel" pkgs) (getAttr "cl-fad" pkgs) (getAttr "salza2" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - zippy = { - pname = "zippy"; - version = "20221106-git"; - asds = [ "zippy" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zippy/2022-11-06/zippy-20221106-git.tgz"; - sha256 = "16v2h95cqnp9gnbr4llicydsf47r5gwchf4slh9gq2flvq78p0x1"; - system = "zippy"; - asd = "zippy"; - }); - systems = [ "zippy" ]; - lispLibs = [ (getAttr "_3bz" pkgs) (getAttr "alexandria" pkgs) (getAttr "babel" pkgs) (getAttr "documentation-utils" pkgs) (getAttr "file-attributes" pkgs) (getAttr "nibbles" pkgs) (getAttr "pathname-utils" pkgs) (getAttr "salza2" pkgs) ]; - }; - zippy-dwim = { - pname = "zippy-dwim"; - version = "20221106-git"; - asds = [ "zippy-dwim" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zippy/2022-11-06/zippy-20221106-git.tgz"; - sha256 = "16v2h95cqnp9gnbr4llicydsf47r5gwchf4slh9gq2flvq78p0x1"; - system = "zippy-dwim"; - asd = "zippy-dwim"; - }); - systems = [ "zippy-dwim" ]; - lispLibs = [ (getAttr "deploy" pkgs) (getAttr "zippy" pkgs) ]; - }; - ziz = { - pname = "ziz"; - version = "20191007-git"; - asds = [ "ziz" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/ziz/2019-10-07/ziz-20191007-git.tgz"; - sha256 = "1rh6ixkyyj7y9jkw046m4ilmr8a12ylzm0a7sm8mjybdpkh6bk30"; - system = "ziz"; - asd = "ziz"; - }); - systems = [ "ziz" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "hunchentoot" pkgs) (getAttr "ironclad" pkgs) (getAttr "trivial-file-size" pkgs) ]; - }; - zlib = { - pname = "zlib"; - version = "20170403-git"; - asds = [ "zlib" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zlib/2017-04-03/zlib-20170403-git.tgz"; - sha256 = "1gz771h2q3xhw1yxpwki5zr9mqysa818vn21501w6fsi8wlmlffa"; - system = "zlib"; - asd = "zlib"; - }); - systems = [ "zlib" ]; - lispLibs = [ ]; - }; - zmq = { - pname = "zmq"; - version = "20200218-git"; - asds = [ "zmq" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz"; - sha256 = "01aavmnn2lbsaq957p1qll21hmhvhkrqhq3kazmz88sc40x1n0ld"; - system = "zmq"; - asd = "zmq"; - }); - systems = [ "zmq" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "trivial-features" pkgs) ]; - }; - zmq-examples = { - pname = "zmq-examples"; - version = "20200218-git"; - asds = [ "zmq-examples" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz"; - sha256 = "01aavmnn2lbsaq957p1qll21hmhvhkrqhq3kazmz88sc40x1n0ld"; - system = "zmq-examples"; - asd = "zmq-examples"; - }); - systems = [ "zmq-examples" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "zmq" pkgs) ]; - }; - zmq-test = { - pname = "zmq-test"; - version = "20200218-git"; - asds = [ "zmq-test" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/lisp-zmq/2020-02-18/lisp-zmq-20200218-git.tgz"; - sha256 = "01aavmnn2lbsaq957p1qll21hmhvhkrqhq3kazmz88sc40x1n0ld"; - system = "zmq-test"; - asd = "zmq-test"; - }); - systems = [ "zmq-test" ]; - lispLibs = [ (getAttr "bordeaux-threads" pkgs) (getAttr "fiveam" pkgs) (getAttr "zmq" pkgs) ]; - }; - zpb-exif = { - pname = "zpb-exif"; - version = "release-1.2.5"; - asds = [ "zpb-exif" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zpb-exif/2021-01-24/zpb-exif-release-1.2.5.tgz"; - sha256 = "0h1n36lfl8xn8rfyl5jxz9m8zlg0if2avmryas79f684yczrvdnd"; - system = "zpb-exif"; - asd = "zpb-exif"; - }); - systems = [ "zpb-exif" ]; - lispLibs = [ ]; - }; - zpb-ttf = { - pname = "zpb-ttf"; - version = "release-1.0.4"; - asds = [ "zpb-ttf" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zpb-ttf/2021-01-24/zpb-ttf-release-1.0.4.tgz"; - sha256 = "1ziwlfys15m95hh5c54g3xv78vjxadd6qi9zf9kvd2bv70qsixqk"; - system = "zpb-ttf"; - asd = "zpb-ttf"; - }); - systems = [ "zpb-ttf" ]; - lispLibs = [ ]; - }; - zpng = { - pname = "zpng"; - version = "1.2.2"; - asds = [ "zpng" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zpng/2015-04-07/zpng-1.2.2.tgz"; - sha256 = "0b3ag3jhl3z7kdls3ahdsdxsfhhw5qrizk769984f4wkxhb69rcm"; - system = "zpng"; - asd = "zpng"; - }); - systems = [ "zpng" ]; - lispLibs = [ (getAttr "salza2" pkgs) ]; - }; - zs3 = { - pname = "zs3"; - version = "1.3.3"; - asds = [ "zs3" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zs3/2019-10-07/zs3-1.3.3.tgz"; - sha256 = "186v95wgsj2hkxdw2jl9x1w4fddjclp7arp0rrd9vf5ly8h8sbf3"; - system = "zs3"; - asd = "zs3"; - }); - systems = [ "zs3" ]; - lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "cl-base64" pkgs) (getAttr "cxml" pkgs) (getAttr "drakma" pkgs) (getAttr "ironclad" pkgs) (getAttr "puri" pkgs) ]; - }; - zsort = { - pname = "zsort"; - version = "20120520-git"; - asds = [ "zsort" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/zsort/2012-05-20/zsort-20120520-git.tgz"; - sha256 = "1vyklyh99712zsll4qi0m4mm8yb1nz04403vl8i57bjv5p5max49"; - system = "zsort"; - asd = "zsort"; - }); - systems = [ "zsort" ]; - lispLibs = [ (getAttr "alexandria" pkgs) ]; - }; - zstd = { - pname = "zstd"; - version = "20221106-git"; - asds = [ "zstd" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-zstd/2022-11-06/cl-zstd-20221106-git.tgz"; - sha256 = "1wg8r1fhvhlm9kmqisivs2zjdwx235qr0l4d7n0qjpz4fj75aj07"; - system = "zstd"; - asd = "zstd"; - }); - systems = [ "zstd" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cl-octet-streams" pkgs) (getAttr "trivial-gray-streams" pkgs) ]; - }; - zstd-tests = { - pname = "zstd-tests"; - version = "20221106-git"; - asds = [ "zstd-tests" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-zstd/2022-11-06/cl-zstd-20221106-git.tgz"; - sha256 = "1wg8r1fhvhlm9kmqisivs2zjdwx235qr0l4d7n0qjpz4fj75aj07"; - system = "zstd-tests"; - asd = "zstd-tests"; - }); - systems = [ "zstd-tests" ]; - lispLibs = [ (getAttr "cl-octet-streams" pkgs) (getAttr "zstd" pkgs) (getAttr "fiveam" pkgs) (getAttr "uiop" pkgs) ]; - }; - zyre = { - pname = "zyre"; - version = "20200925-git"; - asds = [ "zyre" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-zyre/2020-09-25/cl-zyre-20200925-git.tgz"; - sha256 = "1pfb176k655hxksyrans5j43ridvpkl8q8h6d37zgi2z4iiz15wv"; - system = "zyre"; - asd = "zyre"; - }); - systems = [ "zyre" ]; - lispLibs = [ (getAttr "cffi" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "trivia" pkgs) (getAttr "trivial-garbage" pkgs) (getAttr "uiop" pkgs) ]; - }; - zyre_slash_tock-client = { - pname = "zyre_tock-client"; - version = "20200925-git"; - asds = [ "zyre" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-zyre/2020-09-25/cl-zyre-20200925-git.tgz"; - sha256 = "1pfb176k655hxksyrans5j43ridvpkl8q8h6d37zgi2z4iiz15wv"; - system = "zyre"; - asd = "zyre"; - }); - systems = [ "zyre/tock-client" ]; - lispLibs = [ (getAttr "zyre" pkgs) (getAttr "local-time" pkgs) (getAttr "local-time-duration" pkgs) ]; - meta = { - broken = true; - }; - }; - zyre_slash_tock-server = { - pname = "zyre_tock-server"; - version = "20200925-git"; - asds = [ "zyre" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-zyre/2020-09-25/cl-zyre-20200925-git.tgz"; - sha256 = "1pfb176k655hxksyrans5j43ridvpkl8q8h6d37zgi2z4iiz15wv"; - system = "zyre"; - asd = "zyre"; - }); - systems = [ "zyre/tock-server" ]; - lispLibs = [ (getAttr "zyre" pkgs) (getAttr "local-time" pkgs) (getAttr "local-time-duration" pkgs) ]; - meta = { - broken = true; - }; - }; - zyre_slash_zpinger = { - pname = "zyre_zpinger"; - version = "20200925-git"; - asds = [ "zyre" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-zyre/2020-09-25/cl-zyre-20200925-git.tgz"; - sha256 = "1pfb176k655hxksyrans5j43ridvpkl8q8h6d37zgi2z4iiz15wv"; - system = "zyre"; - asd = "zyre"; - }); - systems = [ "zyre/zpinger" ]; - lispLibs = [ (getAttr "cl-ppcre" pkgs) (getAttr "zyre" pkgs) (getAttr "log4cl" pkgs) ]; - meta = { - broken = true; - }; - }; - zyre_slash_zyredir = { - pname = "zyre_zyredir"; - version = "20200925-git"; - asds = [ "zyre" ]; - src = (createAsd { - url = "http://beta.quicklisp.org/archive/cl-zyre/2020-09-25/cl-zyre-20200925-git.tgz"; - sha256 = "1pfb176k655hxksyrans5j43ridvpkl8q8h6d37zgi2z4iiz15wv"; - system = "zyre"; - asd = "zyre"; - }); - systems = [ "zyre/zyredir" ]; - lispLibs = [ (getAttr "cl-json" pkgs) (getAttr "zyre" pkgs) ]; - meta = { - broken = true; - }; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/lisp-packages.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/lisp-packages.nix deleted file mode 100644 index 4c2d1aa1da..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/lisp-packages.nix +++ /dev/null @@ -1,418 +0,0 @@ -# TODO: -# - faster build by using lisp with preloaded asdf? -# - dont include java libs unless abcl? -# - dont use build-asdf-system to build lispWithPackages? -# - make the lisp packages overridable? (e.g. buildInputs glibc->musl) -# - build asdf with nix and use that instead of one shipped with impls -# (e.g. to fix build with clisp - does anyone use clisp?) -# - claspPackages ? (gotta package clasp with nix first) -# - hard one: remove unrelated sources ( of systems not being built) -# - figure out a less awkward way to patch sources -# (have to build from src directly for SLIME to work, so can't just patch sources in place) - -{ pkgs, lib, stdenv, ... }: - - -let - - inherit (lib) - length - filter - foldl - unique - id - concat - concatMap - mutuallyExclusive - findFirst - remove - setAttr - getAttr - hasAttr - attrNames - attrValues - filterAttrs - mapAttrs - splitString - concatStringsSep - concatMapStringsSep - replaceStrings - removeSuffix - hasInfix - optionalString - makeBinPath - makeLibraryPath - makeSearchPath - recurseIntoAttrs - dontRecurseIntoAttrs - ; - - inherit (builtins) - head - tail - elem - split - storeDir; - - # Returns a flattened dependency tree without duplicates - # This is probably causing performance problems... - flattenedDeps = lispLibs: - let - toSet = list: builtins.listToAttrs (map (d: { name = d.pname; value = d; }) list); - toList = attrValues; - walk = acc: node: - if length node.lispLibs == 0 - then acc - else builtins.foldl' walk (acc // toSet node.lispLibs) node.lispLibs; - in toList (walk {} { inherit lispLibs; }); - - # Stolen from python-packages.nix - # Actually no idea how this works - makeOverridableLispPackage = f: origArgs: - let - ff = f origArgs; - overrideWith = newArgs: origArgs // (if pkgs.lib.isFunction newArgs then newArgs origArgs else newArgs); - in - if builtins.isAttrs ff then (ff // { - overrideLispAttrs = newArgs: makeOverridableLispPackage f (overrideWith newArgs); - }) - else if builtins.isFunction ff then { - overrideLispAttrs = newArgs: makeOverridableLispPackage f (overrideWith newArgs); - __functor = self: ff; - } - else ff; - - # - # Wrapper around stdenv.mkDerivation for building ASDF systems. - # - build-asdf-system = - (makeOverridableLispPackage ( - { pname, - version, - src ? null, - patches ? [], - - # Native libraries, will be appended to the library path - nativeLibs ? [], - - # Java libraries for ABCL, will be appended to the class path - javaLibs ? [], - - # Lisp dependencies - # these should be packages built with `build-asdf-system` - lispLibs ? [], - - # Lisp command to run buildScript - lisp, - - # Some libraries have multiple systems under one project, for - # example, cffi has cffi-grovel, cffi-toolchain etc. By - # default, only the `pname` system is build. - # - # .asd's not listed in `systems` are removed in - # installPhase. This prevents asdf from referring to uncompiled - # systems on run time. - # - # Also useful when the pname is differrent than the system name, - # such as when using reverse domain naming. - systems ? [ pname ], - - # The .asd files that this package provides - asds ? systems, - - # Other args to mkDerivation - ... - } @ args: - - let - - # A little slow for big dependency graphs. - # How to make it faster? - # Maybe do it in the buildScript in Common Lisp or Bash, instead - # of here with Nix? - libsFlat = flattenedDeps lispLibs; - - in stdenv.mkDerivation (rec { - inherit pname version nativeLibs javaLibs lispLibs lisp systems asds; - - # When src is null, we are building a lispWithPackages and only - # want to make use of the dependency environment variables - # generated by build-asdf-system - dontUnpack = src == null; - - - # TODO: Do the propagation like for lisp, native and java like this: - # https://github.com/teu5us/nix-lisp-overlay/blob/e30dafafa5c1b9a5b0ccc9aaaef9d285d9f0c46b/pkgs/development/lisp-modules/setup-hook.sh - # Then remove the "echo >> nix-drvs" from buildScript - - # Tell asdf where to find system definitions of lisp dependencies. - # - # The "//" ending is important as it makes asdf recurse into - # subdirectories when searching for .asd's. This is to support - # projects where .asd's aren't in the root directory. - CL_SOURCE_REGISTRY = makeSearchPath "/" libsFlat; - - # Tell lisp where to find native dependencies - # - # Normally generated from lispLibs, but LD_LIBRARY_PATH as a - # derivation attr itself can be used as an extension point when - # the libs are not in a '/lib' subdirectory - LD_LIBRARY_PATH = - let - libs = concatMap (x: x.nativeLibs) libsFlat; - paths = filter (x: x != "") (map (x: x.LD_LIBRARY_PATH) libsFlat); - path = - makeLibraryPath libs - + optionalString (length paths != 0) ":" - + concatStringsSep ":" paths; - in concatStringsSep ":" (unique (splitString ":" path)); - - # Java libraries For ABCL - CLASSPATH = makeSearchPath "share/java/*" (concatMap (x: x.javaLibs) libsFlat); - - # Portable script to build the systems. - # - # `lisp` must evaluate this file then exit immediately. For - # example, SBCL's --script flag does just that. - # - # NOTE: - # Every other library worked fine with asdf:compile-system in - # buildScript. - # - # cl-syslog, for some reason, signals that CL-SYSLOG::VALID-SD-ID-P - # is undefined with compile-system, but works perfectly with - # load-system. Strange. - buildScript = pkgs.writeText "build-${pname}.lisp" '' - (require :asdf) - (dolist (s '(${concatStringsSep " " systems})) - (asdf:load-system s)) - ''; - - buildPhase = optionalString (src != null) '' - # In addition to lisp dependencies, make asdf see the .asd's - # of the systems being built - # - # *Append* src since `lispLibs` can provide .asd's that are - # also in `src` but are not in `systems` (that is, the .asd's - # that will be deleted in installPhase). We don't want to - # rebuild them, but to load them from lispLibs. - # - # NOTE: It's important to read files from `src` instead of - # from pwd to get go-to-definition working with SLIME - export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$src// - - # Similiarily for native deps - export LD_LIBRARY_PATH=${makeLibraryPath nativeLibs}:$LD_LIBRARY_PATH - export CLASSPATH=${makeSearchPath "share/java/*" javaLibs}:$CLASSPATH - - # Make asdf compile from `src` to pwd and load `lispLibs` - # from storeDir. Otherwise it could try to recompile lisp deps. - export ASDF_OUTPUT_TRANSLATIONS="$src:$(pwd):${storeDir}:${storeDir}" - - # track lisp dependencies for graph generation - # TODO: Do the propagation like for lisp, native and java like this: - # https://github.com/teu5us/nix-lisp-overlay/blob/e30dafafa5c1b9a5b0ccc9aaaef9d285d9f0c46b/pkgs/development/lisp-modules/setup-hook.sh - # Then remove the "echo >> nix-drvs" from buildScript - echo $lispLibs >> __nix-drvs - - - # Finally, compile the systems - ${lisp} $buildScript - ''; - - # Copy compiled files to store - # - # Make sure to include '$' in regex to prevent skipping - # stuff like 'iolib.asdf.asd' for system 'iolib.asd' - # - # Same with '/': `local-time.asd` for system `cl-postgres+local-time.asd` - installPhase = - let - mkSystemsRegex = systems: - concatMapStringsSep "\\|" (replaceStrings ["." "+"] ["[.]" "[+]"]) systems; - in - '' - mkdir -pv $out - cp -r * $out - - # Remove all .asd files except for those in `systems`. - find $out -name "*.asd" \ - | grep -v "/\(${mkSystemsRegex systems}\)\.asd$" \ - | xargs rm -fv || true - ''; - - # Not sure if it's needed, but caused problems with SBCL - # save-lisp-and-die binaries in the past - dontStrip = true; - dontFixup = true; - - } // (args // { - src = if builtins.length (args.patches or []) > 0 - then pkgs.applyPatches { inherit (args) src patches; } - else args.src; - patches = []; - - # make sure that propagated build-inputs from lispLibs are propagated - propagatedBuildInputs = lib.unique - (builtins.concatLists - (lib.catAttrs "propagatedBuildInputs" - (builtins.concatLists [[args] lispLibs nativeLibs javaLibs]))); - })))); - - # Build the set of lisp packages using `lisp` - # These packages are defined manually for one reason or another: - # - The library is not in quicklisp - # - The library that is in quicklisp is broken - # - Special build procedure such as cl-unicode, asdf - # - # These Probably could be done even in ql.nix - # - Want to pin a specific commit - # - Want to apply custom patches - # - # They can use the auto-imported quicklisp packages as dependencies, - # but some of those don't work out of the box. - # - # E.g if a QL package depends on cl-unicode it won't build out of - # the box. The dependency has to be rewritten using the manually - # fixed cl-unicode. - # - # This is done by generating a 'fixed' set of Quicklisp packages by - # calling quicklispPackagesFor with the right `fixup`. - commonLispPackagesFor = lisp: - let - build-asdf-system' = body: build-asdf-system (body // { inherit lisp; }); - in import ./packages.nix { - inherit pkgs; - inherit lisp; - inherit quicklispPackagesFor; - inherit fixupFor; - build-asdf-system = build-asdf-system'; - }; - - # Build the set of packages imported from quicklisp using `lisp` - quicklispPackagesFor = { lisp, fixup ? lib.id, build ? build-asdf-system }: - let - build-asdf-system' = body: build (body // { - inherit lisp; - }); - in import ./ql.nix { - inherit pkgs; - inherit fixup; - build-asdf-system = build-asdf-system'; - }; - - # Rewrite deps of pkg to use manually defined packages - # - # The purpose of manual packages is to customize one package, but - # then it has to be propagated everywhere for it to make sense and - # have consistency in the package tree. - fixupFor = manualPackages: qlPkg: - assert (lib.isAttrs qlPkg && !lib.isDerivation qlPkg); - let - # Make it possible to reuse generated attrs without recursing into oblivion - packages = (lib.filterAttrs (n: v: n != qlPkg.pname) manualPackages); - substituteLib = pkg: - if lib.hasAttr pkg.pname packages - then packages.${pkg.pname} - else pkg; - pkg = substituteLib qlPkg; - in pkg // { lispLibs = map substituteLib pkg.lispLibs; }; - - makeAttrName = str: - removeSuffix - "_" - (replaceStrings - ["+" "." "/"] - ["_plus_" "_dot_" "_slash_"] - str); - - oldMakeWrapper = pkgs.runCommand "make-wrapper.sh" {} '' - substitute ${./old-make-wrapper.sh} $out \ - --replace @shell@ ${pkgs.bash}/bin/bash - ''; - - # Creates a lisp wrapper with `packages` installed - # - # `packages` is a function that takes `clpkgs` - a set of lisp - # packages - as argument and returns the list of packages to be - # installed - lispWithPackagesInternal = clpkgs: packages: - # FIXME just use flattenedDeps instead - (build-asdf-system rec { - lisp = (head (lib.attrValues clpkgs)).lisp; - # See dontUnpack in build-asdf-system - src = null; - pname = baseNameOf (head (split " " lisp)); - version = "with-packages"; - lispLibs = packages clpkgs; - systems = []; - }).overrideAttrs(o: { - installPhase = '' - # The recent version of makeWrapper causes breakage. For more info see - # https://github.com/Uthar/nix-cl/issues/2 - source ${oldMakeWrapper} - - mkdir -pv $out/bin - makeWrapper \ - ${head (split " " o.lisp)} \ - $out/bin/${baseNameOf (head (split " " o.lisp))} \ - --prefix CL_SOURCE_REGISTRY : "${o.CL_SOURCE_REGISTRY}" \ - --prefix ASDF_OUTPUT_TRANSLATIONS : ${concatStringsSep "::" (flattenedDeps o.lispLibs)}: \ - --prefix LD_LIBRARY_PATH : "${o.LD_LIBRARY_PATH}" \ - --prefix LD_LIBRARY_PATH : "${makeLibraryPath o.nativeLibs}" \ - --prefix CLASSPATH : "${o.CLASSPATH}" \ - --prefix CLASSPATH : "${makeSearchPath "share/java/*" o.javaLibs}" \ - --prefix PATH : "${makeBinPath (o.buildInputs or [])}" \ - --prefix PATH : "${makeBinPath (o.propagatedBuildInputs or [])}" - ''; - }); - - lispWithPackages = lisp: - let - packages = lispPackagesFor lisp; - in lispWithPackagesInternal packages; - - lispPackagesFor = lisp: - let - packages = commonLispPackagesFor lisp; - qlPackages = quicklispPackagesFor { - inherit lisp; - fixup = fixupFor packages; - }; - in qlPackages // packages; - - commonLispPackages = rec { - inherit - build-asdf-system - lispWithPackagesInternal - lispPackagesFor - lispWithPackages; - - # TODO: uncomment clasp when clasp 1.0.0 is packaged - - # There's got to be a better way than this... - # The problem was that with --load everywhere, some - # implementations didn't exit with 0 on compilation failure - # Maybe a handler-case in buildScript? - sbcl = "${pkgs.sbcl}/bin/sbcl --script"; - ecl = "${pkgs.ecl}/bin/ecl --shell"; - abcl = ''${pkgs.abcl}/bin/abcl --batch --eval "(load \"$buildScript\")"''; - ccl = ''${pkgs.ccl}/bin/ccl --batch --eval "(load \"$buildScript\")" --''; - # clasp = ''${pkgs.clasp}/bin/clasp --non-interactive --quit --load''; - - # Manually defined packages shadow the ones imported from quicklisp - - sbclPackages = recurseIntoAttrs (lispPackagesFor sbcl); - eclPackages = dontRecurseIntoAttrs (lispPackagesFor ecl); - abclPackages = dontRecurseIntoAttrs (lispPackagesFor abcl); - cclPackages = dontRecurseIntoAttrs (lispPackagesFor ccl); - # claspPackages = lispPackagesFor clasp; - - sbclWithPackages = lispWithPackages sbcl; - eclWithPackages = lispWithPackages ecl; - abclWithPackages = lispWithPackages abcl; - cclWithPackages = lispWithPackages ccl; - # claspWithPackages = lispWithPackages clasp; - }; - -in commonLispPackages diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/old-make-wrapper.sh b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/old-make-wrapper.sh deleted file mode 100644 index 903e17c3b2..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/old-make-wrapper.sh +++ /dev/null @@ -1,155 +0,0 @@ -# Assert that FILE exists and is executable -# -# assertExecutable FILE -assertExecutable() { - local file="$1" - [[ -f "$file" && -x "$file" ]] || \ - die "Cannot wrap '$file' because it is not an executable file" -} - -# construct an executable file that wraps the actual executable -# makeWrapper EXECUTABLE OUT_PATH ARGS - -# ARGS: -# --argv0 NAME : set name of executed process to NAME -# (otherwise it’s called …-wrapped) -# --set VAR VAL : add VAR with value VAL to the executable’s -# environment -# --set-default VAR VAL : like --set, but only adds VAR if not already set in -# the environment -# --unset VAR : remove VAR from the environment -# --run COMMAND : run command before the executable -# --add-flags FLAGS : add FLAGS to invocation of executable - -# --prefix ENV SEP VAL : suffix/prefix ENV with VAL, separated by SEP -# --suffix -# --prefix-each ENV SEP VALS : like --prefix, but VALS is a list -# --suffix-each ENV SEP VALS : like --suffix, but VALS is a list -# --prefix-contents ENV SEP FILES : like --suffix-each, but contents of FILES -# are read first and used as VALS -# --suffix-contents -makeWrapper() { - local original="$1" - local wrapper="$2" - local params varName value command separator n fileNames - local argv0 flagsBefore flags - - assertExecutable "$original" - - mkdir -p "$(dirname "$wrapper")" - - echo "#! @shell@ -e" > "$wrapper" - - params=("$@") - for ((n = 2; n < ${#params[*]}; n += 1)); do - p="${params[$n]}" - - if [[ "$p" == "--set" ]]; then - varName="${params[$((n + 1))]}" - value="${params[$((n + 2))]}" - n=$((n + 2)) - echo "export $varName=${value@Q}" >> "$wrapper" - elif [[ "$p" == "--set-default" ]]; then - varName="${params[$((n + 1))]}" - value="${params[$((n + 2))]}" - n=$((n + 2)) - echo "export $varName=\${$varName-${value@Q}}" >> "$wrapper" - elif [[ "$p" == "--unset" ]]; then - varName="${params[$((n + 1))]}" - n=$((n + 1)) - echo "unset $varName" >> "$wrapper" - elif [[ "$p" == "--run" ]]; then - command="${params[$((n + 1))]}" - n=$((n + 1)) - echo "$command" >> "$wrapper" - elif [[ ("$p" == "--suffix") || ("$p" == "--prefix") ]]; then - varName="${params[$((n + 1))]}" - separator="${params[$((n + 2))]}" - value="${params[$((n + 3))]}" - n=$((n + 3)) - if test -n "$value"; then - if test "$p" = "--suffix"; then - echo "export $varName=\$$varName\${$varName:+${separator@Q}}${value@Q}" >> "$wrapper" - else - echo "export $varName=${value@Q}\${$varName:+${separator@Q}}\$$varName" >> "$wrapper" - fi - fi - elif [[ "$p" == "--prefix-each" ]]; then - varName="${params[$((n + 1))]}" - separator="${params[$((n + 2))]}" - values="${params[$((n + 3))]}" - n=$((n + 3)) - for value in $values; do - echo "export $varName=${value@Q}\${$varName:+${separator@Q}}\$$varName" >> "$wrapper" - done - elif [[ "$p" == "--suffix-each" ]]; then - varName="${params[$((n + 1))]}" - separator="${params[$((n + 2))]}" - values="${params[$((n + 3))]}" - n=$((n + 3)) - for value in $values; do - echo "export $varName=\$$varName\${$varName:+$separator}${value@Q}" >> "$wrapper" - done - elif [[ ("$p" == "--suffix-contents") || ("$p" == "--prefix-contents") ]]; then - varName="${params[$((n + 1))]}" - separator="${params[$((n + 2))]}" - fileNames="${params[$((n + 3))]}" - n=$((n + 3)) - for fileName in $fileNames; do - contents="$(cat "$fileName")" - if test "$p" = "--suffix-contents"; then - echo "export $varName=\$$varName\${$varName:+$separator}${contents@Q}" >> "$wrapper" - else - echo "export $varName=${contents@Q}\${$varName:+$separator}\$$varName" >> "$wrapper" - fi - done - elif [[ "$p" == "--add-flags" ]]; then - flags="${params[$((n + 1))]}" - n=$((n + 1)) - flagsBefore="$flagsBefore $flags" - elif [[ "$p" == "--argv0" ]]; then - argv0="${params[$((n + 1))]}" - n=$((n + 1)) - else - die "makeWrapper doesn't understand the arg $p" - fi - done - - echo exec ${argv0:+-a \"$argv0\"} \""$original"\" \ - "$flagsBefore" '"$@"' >> "$wrapper" - - chmod +x "$wrapper" -} - -addSuffix() { - suffix="$1" - shift - for name in "$@"; do - echo "$name$suffix" - done -} - -filterExisting() { - for fn in "$@"; do - if test -e "$fn"; then - echo "$fn" - fi - done -} - -# Syntax: wrapProgram -wrapProgram() { - local prog="$1" - local hidden - - assertExecutable "$prog" - - hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped - while [ -e "$hidden" ]; do - hidden="${hidden}_" - done - mv "$prog" "$hidden" - # Silence warning about unexpanded $0: - # shellcheck disable=SC2016 - makeWrapper "$hidden" "$prog" --argv0 '$0' "${@:2}" -} diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/packages.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/packages.nix deleted file mode 100644 index 1c65a369f0..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/packages.nix +++ /dev/null @@ -1,336 +0,0 @@ -{ build-asdf-system, lisp, quicklispPackagesFor, fixupFor, pkgs, ... }: - -let - - inherit (pkgs.lib) - head - makeLibraryPath - makeSearchPath - setAttr - hasAttr - optionals - hasSuffix - splitString - ; - - # Used by builds that would otherwise attempt to write into storeDir. - # - # Will run build two times, keeping all files created during the - # first run, exept the FASL's. Then using that directory tree as the - # source of the second run. - # - # E.g. cl-unicode creating .txt files during compilation - build-with-compile-into-pwd = args: - let - build = (build-asdf-system (args // { version = args.version + "-build"; })) - .overrideAttrs(o: { - buildPhase = with builtins; '' - mkdir __fasls - export LD_LIBRARY_PATH=${makeLibraryPath o.nativeLibs}:$LD_LIBRARY_PATH - export CLASSPATH=${makeSearchPath "share/java/*" o.javaLibs}:$CLASSPATH - export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$(pwd)// - export ASDF_OUTPUT_TRANSLATIONS="$(pwd):$(pwd)/__fasls:${storeDir}:${storeDir}" - ${o.lisp} ${o.buildScript} - ''; - installPhase = '' - mkdir -pv $out - rm -rf __fasls - cp -r * $out - ''; - }); - in build-asdf-system (args // { - # Patches are already applied in `build` - patches = []; - src = build; - }); - - # A little hacky - isJVM = hasSuffix "abcl" (head (splitString " " lisp)); - - # Makes it so packages imported from Quicklisp can be re-used as - # lispLibs ofpackages in this file. - ql = quicklispPackagesFor { inherit lisp; fixup = fixupFor packages; }; - - packages = rec { - - asdf = build-with-compile-into-pwd { - pname = "asdf"; - version = "3.3.5.3"; - src = pkgs.fetchzip { - url = "https://gitlab.common-lisp.net/asdf/asdf/-/archive/3.3.5.3/asdf-3.3.5.3.tar.gz"; - sha256 = "0aw200awhg58smmbdmz80bayzmbm1a6547gv0wmc8yv89gjqldbv"; - }; - systems = [ "asdf" "uiop" ]; - }; - - uiop = asdf.overrideLispAttrs(o: { - pname = "uiop"; - }); - - cffi = let - jna = pkgs.fetchMavenArtifact { - groupId = "net.java.dev.jna"; - artifactId = "jna"; - version = "5.9.0"; - sha256 = "0qbis8acv04fi902qzak1mbagqaxcsv2zyp7b8y4shs5nj0cgz7a"; - }; - in build-asdf-system { - src = pkgs.fetchzip { - url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz"; - sha256 = "17ryim4xilb1rzxydfr7595dnhqkk02lmrbkqrkvi9091shi4cj3"; - }; - version = "0.24.1"; - pname = "cffi"; - lispLibs = with ql; [ - alexandria - babel - trivial-features - ]; - javaLibs = optionals isJVM [ jna ]; - }; - - cffi-libffi = ql.cffi-libffi.overrideLispAttrs (o: { - src = pkgs.fetchzip { - url = "https://github.com/cffi/cffi/archive/3f842b92ef808900bf20dae92c2d74232c2f6d3a.tar.gz"; - sha256 = "1jilvmbbfrmb23j07lwmkbffc6r35wnvas5s4zjc84i856ccclm2"; - }; - patches = [ ./patches/cffi-libffi-darwin-ffi-h.patch ]; - }); - - cl-unicode = build-with-compile-into-pwd { - pname = "cl-unicode"; - version = "0.1.6"; - src = pkgs.fetchzip { - url = "https://github.com/edicl/cl-unicode/archive/refs/tags/v0.1.6.tar.gz"; - sha256 = "0ykx2s9lqfl74p1px0ik3l2izd1fc9jd1b4ra68s5x34rvjy0hza"; - }; - systems = [ "cl-unicode" ]; - lispLibs = with ql; [ - cl-ppcre - flexi-streams - ]; - }; - - jzon = build-asdf-system { - src = pkgs.fetchzip { - url = "https://github.com/Zulu-Inuoe/jzon/archive/6b201d4208ac3f9721c461105b282c94139bed29.tar.gz"; - sha256 = "01d4a78pjb1amx5amdb966qwwk9vblysm1li94n3g26mxy5zc2k3"; - }; - version = "0.0.0-20210905-6b201d4208"; - pname = "jzon"; - lispLibs = [ - ql.closer-mop - ]; - systems = [ "com.inuoe.jzon" ]; - }; - - cl-notify = build-asdf-system { - pname = "cl-notify"; - version = "20080904-138ca7038"; - src = pkgs.fetchzip { - url = "https://repo.or.cz/cl-notify.git/snapshot/138ca703861f4a1fbccbed557f92cf4d213668a1.tar.gz"; - sha256 = "0k6ns6fzvjcbpsqgx85r4g5m25fvrdw9481i9vyabwym9q8bbqwx"; - }; - lispLibs = [ - cffi - ]; - nativeLibs = [ - pkgs.libnotify - ]; - }; - - cl-liballegro-nuklear = build-with-compile-into-pwd { - inherit (ql.cl-liballegro-nuklear) pname version src; - nativeBuildInputs = [ pkgs.allegro5 ]; - nativeLibs = [ pkgs.allegro5 ]; - lispLibs = ql.cl-liballegro-nuklear.lispLibs ++ [ ql.cl-liballegro ]; - patches = [ ./patches/cl-liballegro-nuklear-missing-dll.patch ]; - }; - - - tuple = build-asdf-system { - pname = "tuple"; - version = "b74bd067d"; - src = pkgs.fetchzip { - url = "https://fossil.galkowski.xyz/tuple/tarball/b74bd067d4533ac0/tuple.tar.gz"; - sha256 = "0dk356vkv6kwwcmc3j08x7143549m94rd66rpkzq8zkb31cg2va8"; - }; - }; - - cl-tar-file = build-asdf-system { - pname = "cl-tar-file"; - version = "v0.2.1"; - src = pkgs.fetchzip { - url = let - rev = "0c10bc82f14702c97a26dc25ce075b5d3a2347d1"; - in "https://gitlab.common-lisp.net/cl-tar/cl-tar-file/-/archive/${rev}/cl-tar-file-${rev}.tar.gz"; - sha256 = "0i8j05fkgdqy4c4pqj0c68sh4s3klpx9kc5wp73qwzrl3xqd2svy"; - }; - lispLibs = with ql; [ - alexandria - babel - trivial-gray-streams - _40ants-doc - salza2 - chipz - flexi-streams - parachute - ]; - systems = [ "tar-file" "tar-file/test" ]; - }; - - cl-tar = build-asdf-system { - pname = "cl-tar"; - version = "v0.2.1"; - src = pkgs.fetchzip { - url = let - rev = "7c6e07a10c93d9e311f087b5f6328cddd481669a"; - in "https://gitlab.common-lisp.net/cl-tar/cl-tar/-/archive/${rev}/cl-tar-${rev}.tar.gz"; - sha256 = "0wp23cs3i6a89dibifiz6559la5nk58d1n17xvbxq4nrl8cqsllf"; - }; - lispLibs = with ql; [ - alexandria - babel - local-time - split-sequence - _40ants-doc - parachute - osicat - ] ++ [ cl-tar-file ]; - systems = [ - "tar" - "tar/common-extract" - "tar/simple-extract" - "tar/extract" - "tar/create" - "tar/docs" - "tar/test" - "tar/create-test" - "tar/extract-test" - "tar/simple-extract-test" - ]; - }; - - lessp = build-asdf-system { - pname = "lessp"; - version = "0.2-f8a9e4664"; - src = pkgs.fetchzip { - url = "https://github.com/facts-db/cl-lessp/archive/632217602b85b679e8d420654a0aa39e798ca3b5.tar.gz"; - sha256 = "0i3ia14dzqwjpygd0zn785ff5vqnnmkn75psfpyx0ni3jr71lkq9"; - }; - }; - - rollback = build-asdf-system { - pname = "rollback"; - version = "0.1-5d3f21fda"; - src = pkgs.fetchzip { - url = "https://github.com/facts-db/cl-rollback/archive/5d3f21fda8f04f35c5e9d20ee3b87db767915d15.tar.gz"; - sha256 = "12dpxsbm2al633y87i8p784k2dn4bbskz6sl40v9f5ljjmjqjzxf"; - }; - }; - - facts = build-asdf-system { - pname = "facts"; - version = "0.1-632217602"; - src = pkgs.fetchzip { - url = "https://github.com/facts-db/cl-lessp/archive/632217602b85b679e8d420654a0aa39e798ca3b5.tar.gz"; - sha256 = "09z1vwzjm7hlb529jl3hcjnfd11gh128lmdg51im7ar4jv4746iw"; - }; - lispLibs = [ lessp rollback ] ++ [ ql.local-time ]; - }; - - - cl-fuse = build-with-compile-into-pwd { - inherit (ql.cl-fuse) pname version src lispLibs; - nativeBuildInputs = [ pkgs.fuse ]; - nativeLibs = [ pkgs.fuse ]; - }; - - cl-containers = build-asdf-system { - inherit (ql.cl-containers) pname version src; - lispLibs = ql.cl-containers.lispLibs ++ [ ql.moptilities ]; - systems = [ "cl-containers" "cl-containers/with-moptilities" ]; - }; - - swank = build-with-compile-into-pwd { - inherit (ql.swank) pname version src lispLibs; - patches = [ ./patches/swank-pure-paths.patch ]; - postConfigure = '' - substituteAllInPlace swank-loader.lisp - ''; - }; - - clx-truetype = build-asdf-system { - pname = "clx-truetype"; - version = "20160825-git"; - src = pkgs.fetchzip { - url = "http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz"; - sha256 = "079hyp92cjkdfn6bhkxsrwnibiqbz4y4af6nl31lzw6nm91j5j37"; - }; - lispLibs = with ql; [ - alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf - cl-store cl-vectors clx trivial-features zpb-ttf - ]; - }; - - mathkit = build-asdf-system { - inherit (ql.mathkit) pname version src asds lisp; - lispLibs = ql.mathkit.lispLibs ++ [ ql.sb-cga ]; - }; - - nyxt-gtk = build-asdf-system { - inherit (ql.nyxt) pname lisp; - version = "2.2.4"; - - lispLibs = ql.nyxt.lispLibs ++ (with ql; [ - cl-cffi-gtk cl-webkit2 mk-string-metrics - ]); - - src = pkgs.fetchzip { - url = "https://github.com/atlas-engineer/nyxt/archive/2.2.4.tar.gz"; - sha256 = "12l7ir3q29v06jx0zng5cvlbmap7p709ka3ik6x29lw334qshm9b"; - }; - - nativeBuildInputs = [ pkgs.makeWrapper ]; - buildInputs = [ - # needed for GSETTINGS_SCHEMAS_PATH - pkgs.gsettings-desktop-schemas pkgs.glib pkgs.gtk3 - - # needed for XDG_ICON_DIRS - pkgs.gnome.adwaita-icon-theme - ]; - - buildScript = pkgs.writeText "build-nyxt.lisp" '' - (require :asdf) - (asdf:load-system :nyxt/gtk-application) - (sb-ext:save-lisp-and-die "nyxt" :executable t - #+sb-core-compression :compression - #+sb-core-compression t - :toplevel #'nyxt:entry-point) - ''; - - # Run with WEBKIT_FORCE_SANDBOX=0 if getting a runtime error in webkitgtk-2.34.4 - installPhase = ql.nyxt.installPhase + '' - rm -v $out/nyxt - mkdir -p $out/bin - cp -v nyxt $out/bin - wrapProgram $out/bin/nyxt \ - --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH \ - --prefix XDG_DATA_DIRS : $XDG_ICON_DIRS \ - --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ - --prefix GIO_EXTRA_MODULES ":" ${pkgs.dconf.lib}/lib/gio/modules/ \ - --prefix GIO_EXTRA_MODULES ":" ${pkgs.glib-networking}/lib/gio/modules/ - ''; - }; - - nyxt = nyxt-gtk; - - ltk = ql.ltk.overrideLispAttrs (o: { - src = pkgs.fetchzip { - url = "https://github.com/uthar/ltk/archive/f19162e76d6c7c2f51bd289b811d9ba20dd6555e.tar.gz"; - sha256 = "0mzikv4abq9yqlj6dsji1wh34mjizr5prv6mvzzj29z1485fh1bj"; - }; - version = "f19162e76"; - }); - }; -in packages diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cffi-libffi-darwin-ffi-h.patch b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cffi-libffi-darwin-ffi-h.patch deleted file mode 100644 index 15c4a45887..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cffi-libffi-darwin-ffi-h.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/libffi/libffi-types.lisp -+++ b/libffi/libffi-types.lisp -@@ -43,9 +43,6 @@ - - (pkg-config-cflags "libffi" :optional t) - --#+darwin --(include "ffi/ffi.h") --#-darwin - (include "ffi.h") - - (cenum status - -Diff finished. Sun Nov 13 00:23:10 2022 \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cl-freetype2-fix-grovel-includes.patch b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cl-freetype2-fix-grovel-includes.patch deleted file mode 100644 index 5260f0c058..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cl-freetype2-fix-grovel-includes.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/ffi/grovel/grovel-freetype.h -+++ b/src/ffi/grovel/grovel-freetype.h -@@ -2,7 +2,7 @@ - #include - #include FT_FREETYPE_H - --#include --#include --#include --#include -+#include -+#include -+#include -+#include - -Diff finished. Mon Nov 14 22:41:57 2022 diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cl-liballegro-nuklear-missing-dll.patch b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cl-liballegro-nuklear-missing-dll.patch deleted file mode 100644 index b5bde523eb..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cl-liballegro-nuklear-missing-dll.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix system not loading due to: - -Unhandled CFFI:LOAD-FOREIGN-LIBRARY-ERROR - Unable to load foreign library (LIBALLEGRO-NUKLEAR). - Error opening shared object "/build/source/src/liballegro_nuklear.so": - /build/source/src/liballegro_nuklear.so: undefined symbol: al_draw_ellipse. ---- a/cl-liballegro-nuklear.asd -+++ b/cl-liballegro-nuklear.asd -@@ -12,7 +12,7 @@ - :description "CFFI wrapper for the Nuklear IM GUI library with liballegro backend, to be used with cl-liballegro." - :author "Andrew Kravchuk " - :license "MIT" -- :depends-on (:cffi :cffi-libffi :trivial-features) -+ :depends-on (:cl-liballegro :cffi :cffi-libffi :trivial-features) - :pathname "src" - :serial t - :components ((:makefile "Makefile") diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cl-sat.glucose-binary-from-PATH-if-present.patch b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cl-sat.glucose-binary-from-PATH-if-present.patch deleted file mode 100644 index 6a0d2d0766..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/cl-sat.glucose-binary-from-PATH-if-present.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2040fcab5a7be2f28add46a1412bef62ac5ccf11 Mon Sep 17 00:00:00 2001 -From: Maximilian Marx -Date: Thu, 24 Nov 2022 20:00:33 +0100 -Subject: [PATCH] Use glucose binary from PATH if present - ---- - src/package.lisp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/package.lisp b/src/package.lisp -index b6e26ac..bdb2581 100644 ---- a/src/package.lisp -+++ b/src/package.lisp -@@ -13,7 +13,9 @@ - (defvar *glucose-home* (asdf:system-relative-pathname :cl-sat.glucose "glucose-syrup/")) - - (defun glucose-binary (&optional (*glucose-home* *glucose-home*)) -- (merge-pathnames "simp/glucose_static" *glucose-home*)) -+ (if (trivial-package-manager:which "glucose") -+ "glucose" -+ (merge-pathnames "simp/glucose_static" *glucose-home*))) - - (defmethod solve ((input pathname) (solver (eql :glucose)) &rest options &key debug &allow-other-keys) - (remf options :debug) --- -2.36.2 - diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/magicl-dont-build-fortran-twice.patch b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/magicl-dont-build-fortran-twice.patch deleted file mode 100644 index f63b6949b1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/magicl-dont-build-fortran-twice.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/magicl.asd -+++ b/magicl.asd -@@ -143,6 +143,7 @@ - (shared-object (make-pathname :type #+darwin "dylib" #-darwin "so" - :name "libexpokit" - :defaults fortran-file))) -+ (unless (probe-file (nn shared-object)) - (uiop:run-program - (list "gfortran" "-fPIC" "-std=legacy" - "-c" -@@ -155,7 +156,7 @@ - (nn object-file) - #+darwin "-lblas" - #+darwin "-llapack")) -- (delete-file object-file)))) -+ (delete-file object-file))))) - - - (asdf:defsystem #:magicl/ext-expokit - -Diff finished. Mon Oct 10 22:03:54 2022 diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/swank-pure-paths.patch b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/swank-pure-paths.patch deleted file mode 100644 index 0b9a40ab0e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/swank-pure-paths.patch +++ /dev/null @@ -1,28 +0,0 @@ -Prevent swank from attempting write into storeDir ---- a/swank-loader.lisp -+++ b/swank-loader.lisp -@@ -162,7 +162,7 @@ - ,(unique-dir-name))) - (user-homedir-pathname))) - --(defvar *fasl-directory* (default-fasl-dir) -+(defvar *fasl-directory* #P"@out@/fasl/" - "The directory where fasl files should be placed.") - - (defun binary-pathname (src-pathname binary-dir) -@@ -284,12 +284,7 @@ - (contrib-dir src-dir)))) - - (defun delete-stale-contrib-fasl-files (swank-files contrib-files fasl-dir) -- (let ((newest (reduce #'max (mapcar #'file-write-date swank-files)))) -- (dolist (src contrib-files) -- (let ((fasl (binary-pathname src fasl-dir))) -- (when (and (probe-file fasl) -- (<= (file-write-date fasl) newest)) -- (delete-file fasl)))))) -+ (declare (ignore swank-files contrib-files fasl-dir))) - - (defun compile-contribs (&key (src-dir (contrib-dir *source-directory*)) - (fasl-dir (contrib-dir *fasl-directory*)) - -Diff finished. Sat Jan 22 23:57:27 2022 \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/ql-import.lisp b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/ql-import.lisp deleted file mode 100644 index 630090f91d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/ql-import.lisp +++ /dev/null @@ -1,6 +0,0 @@ - -(require :asdf) -(pushnew (truename "./import") asdf:*central-registry*) -(asdf:load-system :org.lispbuilds.nix) -(load "./import/main.lisp") -(org.lispbuilds.nix/main::main) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/ql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/ql.nix deleted file mode 100644 index da76d8dd57..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/ql.nix +++ /dev/null @@ -1,239 +0,0 @@ -{ pkgs, build-asdf-system, fixup ? pkgs.lib.id, ... }: - -with pkgs; -with lib; -with lib.lists; -with lib.strings; - -let - - # FIXME: automatically add nativeLibs based on conditions signalled - - # Try to keep this list sorted - extras = { - cffi-libffi = pkg: { - nativeBuildInputs = [ libffi ]; - nativeLibs = [ libffi ]; - }; - "cl+ssl" = pkg: { - nativeLibs = [ openssl_1_1 ]; - }; - "cl-ana.hdf-cffi" = pkg: { - nativeBuildInputs = [ pkgs.hdf5 ]; - nativeLibs = [ pkgs.hdf5 ]; - NIX_LDFLAGS = [ "-lhdf5" ]; - }; - cl-async-ssl = pkg: { - nativeLibs = [ openssl_1_1 ]; - }; - cl-cffi-gtk-glib = pkg: { - nativeLibs = [ glib ]; - }; - cl-cffi-gtk-cairo = pkg: { - nativeLibs = [ cairo ]; - }; - cl-cffi-gtk-gdk = pkg: { - nativeLibs = [ gtk3 ]; - }; - cl-cffi-gtk-gdk-pixbuf = pkg: { - nativeLibs = [ gdk-pixbuf ]; - }; - cl-cffi-gtk-pango = pkg: { - nativeLibs = [ pango ]; - }; - cl-cairo2 = pkg: { - nativeLibs = [ cairo ]; - }; - cl-cairo2-xlib = pkg: { - nativeLibs = [ gtk2-x11 ]; - }; - cl-devil = pkg: { - nativeBuildInputs = [ pkgs.libdevil ]; - nativeLibs = [ pkgs.libdevil ]; - }; - cl-freeimage = pkg: { - nativeLibs = [ freeimage ]; - }; - cl-freetype2 = pkg: { - nativeLibs = [ freetype ]; - nativeBuildInputs = [ freetype ]; - patches = [ ./patches/cl-freetype2-fix-grovel-includes.patch ]; - }; - cl-glfw = pkg: { - nativeLibs = [ glfw ]; - }; - cl-glfw-opengl-core = pkg: { - nativeLibs = [ libGL ]; - }; - cl-glfw3 = pkg: { - nativeLibs = [ glfw ]; - }; - cl-glu = pkg: { - nativeLibs = [ libGLU ]; - }; - cl-glut = pkg: { - nativeLibs = [ freeglut ]; - }; - cl-gobject-introspection = pkg: { - nativeLibs = [ glib gobject-introspection ]; - }; - cl-gtk2-gdk = pkg: { - nativeLibs = [ gtk2-x11 ]; - }; - cl-gtk2-glib = pkg: { - nativeLibs = [ glib ]; - }; - cl-gtk2-pango = pkg: { - nativeLibs = [ pango ]; - }; - cl-liballegro = pkg: { - # build doesnt fail without this, but fails on runtime - # weird... - nativeLibs = [ allegro5 ]; - }; - cl-libuv = pkg: { - nativeBuildInputs = [ libuv ]; - nativeLibs = [ libuv ]; - }; - cl-libxml2 = pkg: { - nativeLibs = [ pkgs.libxml2 ]; - }; - cl-libyaml = pkg: { - nativeLibs = [ pkgs.libyaml ]; - }; - cl-mysql = pkg: { - nativeLibs = [ mariadb.client ]; - }; - cl-ode = pkg: { - nativeLibs = let - ode' = ode.overrideAttrs (o: { - configureFlags = [ - "--enable-shared" - "--enable-double-precision" - ]; - }); - in [ ode' ]; - }; - cl-opengl = pkg: { - nativeLibs = [ libGL ]; - }; - cl-pango = pkg: { - nativeLibs = [ pango ]; - }; - cl-rabbit = pkg: { - nativeBuildInputs = [ rabbitmq-c ]; - nativeLibs = [ rabbitmq-c ]; - }; - cl-rdkafka = pkg: { - nativeBuildInputs = [ rdkafka ]; - nativeLibs = [ rdkafka ]; - }; - cl-readline = pkg: { - nativeLibs = [ pkgs.readline ]; - }; - cl-rsvg2 = pkg: { - nativeLibs = [ librsvg ]; - }; - "cl-sat.glucose" = pkg: { - propagatedBuildInputs = [ pkgs.glucose ]; - patches = [ ./patches/cl-sat.glucose-binary-from-PATH-if-present.patch ]; - - }; - "cl-sat.minisat" = pkg: { - propagatedBuildInputs = [ pkgs.minisat ]; - }; - cl-webkit2 = pkg: { - nativeLibs = [ webkitgtk ]; - }; - classimp = pkg: { - nativeLibs = [ assimp ]; - meta.broken = true; # Requires assimp ≤ 5.0.x. - }; - clsql-postgresql = pkg: { - nativeLibs = [ postgresql.lib ]; - }; - clsql-sqlite3 = pkg: { - nativeLibs = [ sqlite ]; - }; - dbd-mysql = pkg: { - nativeLibs = [ mariadb.client ]; - }; - gsll = pkg: { - nativeBuildInputs = [ pkgs.gsl ]; - nativeLibs = [ pkgs.gsl ]; - }; - iolib = pkg: { - nativeBuildInputs = [ libfixposix ]; - nativeLibs = [ libfixposix ]; - systems = [ "iolib" "iolib/os" "iolib/pathnames" ]; - }; - lev = pkg: { - nativeLibs = [ libev ]; - }; - lispbuilder-sdl-cffi = pkg: { - nativeLibs = [ SDL ]; - }; - lla = pkg: { - nativeLibs = [ openblas ]; - }; - mssql = pkg: { - nativeLibs = [ freetds ]; - }; - osicat = pkg: { - LD_LIBRARY_PATH = "${pkg}/posix/"; - }; - png = pkg: { - nativeBuildInputs = [ pkgs.libpng ]; - nativeLibs = [ pkgs.libpng ]; - }; - pzmq = pkg: { - nativeBuildInputs = [ pkgs.zeromq ]; - nativeLibs = [ pkgs.zeromq ]; - }; - pzmq-compat = pkg: { - nativeBuildInputs = [ pkgs.zeromq ]; - nativeLibs = [ pkgs.zeromq ]; - }; - pzmq-examples = pkg: { - nativeBuildInputs = [ pkgs.zeromq ]; - nativeLibs = [ pkgs.zeromq ]; - }; - pzmq-test = pkg: { - nativeBuildInputs = [ pkgs.zeromq ]; - nativeLibs = [ pkgs.zeromq ]; - }; - sdl2 = pkg: { - nativeLibs = [ SDL2 ]; - }; - sqlite = pkg: { - nativeLibs = [ sqlite ]; - }; - trivial-package-manager = pkg: { - propagatedBuildInputs = [ pkgs.which ]; - }; - trivial-ssh-libssh2 = pkg: { - nativeLibs = [ libssh2 ]; - }; - zmq = pkg: { - nativeBuildInputs = [ pkgs.zeromq ]; - nativeLibs = [ pkgs.zeromq ]; - }; - }; - - qlpkgs = - lib.optionalAttrs (builtins.pathExists ./imported.nix) - (import ./imported.nix { inherit (pkgs) runCommand fetchzip; pkgs = builtQlpkgs; }); - - builtQlpkgs = mapAttrs (n: v: build v) qlpkgs; - - build = pkg: - let - builtPkg = build-asdf-system pkg; - withExtras = pkg // - (optionalAttrs - (hasAttr pkg.pname extras) - (extras.${pkg.pname} builtPkg)); - fixedUp = fixup withExtras; - in build-asdf-system fixedUp; - -in builtQlpkgs diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/readme.md b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/readme.md deleted file mode 100644 index d5be749233..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/readme.md +++ /dev/null @@ -1,34 +0,0 @@ -# lisp-modules - -Utilities for packaging ASDF systems using Nix. - -## Quick start - -#### Build an ASDF system: - -``` -nix-build ./examples/bordeaux-threads.nix -ls result/src -``` - -#### Build an `sbclWithPackages`: - -``` -nix-build ./examples/sbcl-with-bt.nix -result/bin/sbcl -``` - -#### Re-import Quicklisp packages: - -``` -nix-shell --run 'sbcl --script ql-import.lisp' -``` - -#### Test build of packages -``` -(cd test; sbcl --script test.lisp ccl) -``` - -## Documentation - -See `doc` directory. diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/shell.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/shell.nix deleted file mode 100644 index ecca6a5608..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/shell.nix +++ /dev/null @@ -1,7 +0,0 @@ -with import ../../../default.nix {}; -mkShell { - nativeBuildInputs = [ - (lispPackages_new.sbclWithPackages - (ps: with ps; [ alexandria str dexador cl-ppcre sqlite arrow-macros jzon ])) - ]; -} diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/test/lispPackagesToTest.txt b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/test/lispPackagesToTest.txt deleted file mode 100644 index 940d3b65f3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/test/lispPackagesToTest.txt +++ /dev/null @@ -1,395 +0,0 @@ -_1am -_3bmd -_3bmd-ext-code-blocks -access -acclimation -agutil -alexandria -anaphora -arnesi -array-operations -array-utils -arrows -asdf -asdf-package-system -asdf-system-connections -babel -binomial-heap -binpack -blackbird -bordeaux-threads -buildnode -buildnode-xhtml -calispel -cffi -cffi-grovel -cffi-toolchain -cffi-uffi-compat -chanl -check-it -chipz -chunga -circular-streams -cl-aa -cl-annot -cl-anonfun -cl-ansi-text -cl-async -cl-async-base -cl-async-repl -cl-async-ssl -cl-async-util -cl-base64 -cl-cffi-gtk -cl-cffi-gtk-cairo -cl-cffi-gtk-gdk -cl-cffi-gtk-gdk-pixbuf -cl-cffi-gtk-gio -cl-cffi-gtk-glib -cl-cffi-gtk-gobject -cl-cffi-gtk-pango -cl-change-case -cl-cli -cl-colors -cl-colors2 -cl-containers -cl-cookie -cl-css -cl-csv -cl-cuda -cl-custom-hash-table -cl-dbi -cl-difflib -cl-digraph -cl-dot -cl-emb -cl-environments -cl-fad -cl-form-types -cl-fuse -cl-fuse-meta-fs -cl-fuzz -cl-geometry -cl-gobject-introspection -cl-heap -cl-hooks -cl-html-diff -cl-html-parse -cl-html5-parser -cl-interpol -cl-jpeg -cl-json -cl-l10n -cl-l10n-cldr -cl-libuv -cl-locale -cl-markup -cl-mustache -cl-mysql -cl-num-utils -cl-paths -cl-paths-ttf -cl-pattern -cl-pdf -cl-postgres -cl-postgres_plus_local-time -cl-postgres_slash_tests -cl-ppcre -cl-ppcre-template -cl-ppcre-test -cl-ppcre-unicode -cl-prevalence -cl-protobufs -cl-qprint -cl-qrencode -cl-reexport -cl-shellwords -cl-slice -cl-smt-lib -cl-smtp -cl-speedy-queue -cl-store -cl-svg -cl-syntax -cl-syntax-annot -cl-syntax-anonfun -cl-syntax-markup -cl-syslog -cl-test-more -cl-typesetting -cl-unicode -cl-unification -cl-utilities -cl-vectors -cl-webkit2 -cl-who -cl-xmlspam -cl_plus_ssl -clack -clack-socket -classowary -clfswm -closer-mop -closure-common -closure-html -clsql -clsql-postgresql -clsql-postgresql-socket -clsql-sqlite3 -clsql-uffi -clss -cluffer -clump -clump-2-3-tree -clump-binary-tree -clunit -clunit2 -clx -clx-truetype -collectors -colorize -command-line-arguments -css-lite -css-selectors -css-selectors-simple-tree -css-selectors-stp -cxml -cxml-stp -cxml_slash_test -data-table -dbd-mysql -dbd-postgres -dbd-sqlite3 -dbi -dbi-test -dbus -defclass-std -dexador -dissect -djula -do-urlencode -documentation-utils -drakma -eager-future2 -enchant -esrap -esrap-peg -external-program -fare-csv -fare-mop -fare-quasiquote -fare-quasiquote-extras -fare-quasiquote-optima -fare-quasiquote-readtable -fare-utils -fast-http -fast-io -fiasco -file-attributes -fiveam -flexi-streams -float-features -flow -fn -form-fiddle -fset -generic-cl -generic-cl_dot_arithmetic -generic-cl_dot_collector -generic-cl_dot_comparison -generic-cl_dot_container -generic-cl_dot_internal -generic-cl_dot_iterator -generic-cl_dot_lazy-seq -generic-cl_dot_map -generic-cl_dot_math -generic-cl_dot_object -generic-cl_dot_sequence -generic-cl_dot_set -gettext -global-vars -glsl-docs -glsl-spec -glsl-symbols -heap -html-encode -http-body -hu_dot_dwim_dot_asdf -hu_dot_dwim_dot_common -hu_dot_dwim_dot_common-lisp -hu_dot_dwim_dot_def -hu_dot_dwim_dot_def_plus_swank -hu_dot_dwim_dot_defclass-star -hu_dot_dwim_dot_stefil -hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def -hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank -hu_dot_dwim_dot_stefil_plus_swank -hunchensocket -hunchentoot -idna -ieee-floats -inferior-shell -introspect-environment -iolib -iolib_dot_asdf -iolib_dot_base -iolib_dot_common-lisp -iolib_dot_conf -ironclad -iterate -jonathan -jpl-queues -jpl-util -jsown -kmrcl -lack -lack-component -lack-middleware-backtrace -lack-util -lambda-fiddle -legit -let-plus -lev -lfarm-client -lfarm-common -lfarm-server -lfarm-ssl -lift -lisp-binary -lisp-namespace -lisp-unit -lisp-unit2 -lla -local-time -log4cl -lparallel -lquery -marshal -md5 -metabang-bind -metatilities-base -mgl -mgl-mat -mgl-pax -minheap -misc-extensions -mk-string-metrics -mmap -moptilities -more-conditions -mt19937 -named-readtables -nbd -net-telent-date -net_dot_didierverna_dot_asdf-flv -nibbles -nyxt -optima -osicat -parachute -parenscript -parse-declarations-1_dot_0 -parse-float -parse-number -parseq -parser-combinators -parser_dot_common-rules -pcall -pcall-queue -physical-quantities -plump -postmodern -proc-parse -prove -prove-asdf -ptester -puri -pythonic-string-reader -quasiquote-2_dot_0 -query-fs -quri -rfc2388 -rove -rt -s-sql -s-sql_slash_tests -s-sysdeps -s-xml -salza2 -serapeum -simple-date -simple-date-time -simple-date_slash_postgres-glue -simple-inferiors -simple-tasks -slynk -smart-buffer -smug -spinneret -split-sequence -sqlite -static-dispatch -static-vectors -stefil -str -string-case -stumpwm -swank -swap-bytes -sycamore -symbol-munger -trees -trivia -trivia_dot_balland2006 -trivia_dot_level0 -trivia_dot_level1 -trivia_dot_level2 -trivia_dot_quasiquote -trivia_dot_trivial -trivial-arguments -trivial-backtrace -trivial-clipboard -trivial-cltl2 -trivial-features -trivial-file-size -trivial-garbage -trivial-gray-streams -trivial-indent -trivial-macroexpand-all -trivial-main-thread -trivial-mimes -trivial-package-local-nicknames -trivial-shell -trivial-types -trivial-utf-8 -trivial-with-current-source-form -type-i -uax-15 -uffi -uiop -unit-test -unix-options -unix-opts -usocket -usocket-server -utilities_dot_print-items -utilities_dot_print-tree -uuid -varjo -vas-string-metrics -vecto -vom -wild-package-inferred-system -woo -wookie -xembed -xkeyboard -xml_dot_location -xmls -xpath -xpath_slash_test -xsubseq -yacc -yason -zpb-ttf -zpng diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/test/test.lisp b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/test/test.lisp deleted file mode 100755 index c9b5dc9383..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/test/test.lisp +++ /dev/null @@ -1,94 +0,0 @@ -#!/usr/bin/env -S sbcl --script - -(require :uiop) - -;; prevent glibc hell -(setf (uiop:getenv "LD_LIBRARY_PATH") "") - -(defparameter packages (uiop:read-file-lines "./lispPackagesToTest.txt")) - -(defparameter lisp (or (cadr sb-ext:*posix-argv*) "sbcl")) - -(defparameter nix-build "nix-build -E 'with import ../../../../default.nix {}; lispPackages_new.~aPackages.~a'") - -(defparameter cpu-count - (length - (remove-if-not - (lambda (line) - (uiop:string-prefix-p "processor" line)) - (uiop:read-file-lines "/proc/cpuinfo")))) - -(defparameter sem (sb-thread:make-semaphore :count cpu-count)) - -(defparameter statuses (make-hash-table :synchronized t)) - -(defparameter log-lock (sb-thread:make-mutex)) - -(format *error-output* "Testing ~a on ~a cores~%" lisp cpu-count) - -(defun clear-line () - (write-char #\Return *error-output*) - (write-char #\Escape *error-output*) - (write-char #\[ *error-output*) - (write-char #\K *error-output*)) - -(declaim (type fixnum errors)) -(defglobal errors 0) - -(defmacro when-let (bindings &rest body) - (reduce - (lambda (expansion form) - (destructuring-bind (var test) form - (let ((testsym (gensym (symbol-name var)))) - `(let ((,testsym ,test)) - (when ,testsym - (let ((,var ,testsym)) - ,expansion)))))) - (reverse bindings) - :initial-value `(progn ,@body))) - -(dolist (pkg packages) - (sb-thread:wait-on-semaphore sem) - (sb-thread:make-thread - (lambda () - (handler-case - (unwind-protect - (multiple-value-bind (out err code) - (uiop:run-program - (format nil nix-build lisp pkg) - :error-output '(:string :stripped t) - :ignore-error-status t) - (declare (ignorable err)) - (setf (gethash pkg statuses) code) - (when-let ((pos (search "LOAD-FOREIGN-LIBRARY-ERROR" err :test #'string=)) - (lines (uiop:split-string (subseq err pos) :separator '(#\Newline)))) - (setf (gethash pkg statuses) - (fourth lines))) - (sb-thread:with-mutex (log-lock) - (clear-line) - (format *error-output* "[~a/~a] ~[OK~:;ERROR~] ~a~[~:;~%~]" - (hash-table-count statuses) - (length packages) - code - pkg - code) - (force-output *error-output*)) - (unless (zerop code) - (sb-ext:atomic-incf errors))) - (sb-thread:signal-semaphore sem)) - (error (e) - (format t "~a~%" e) - (sb-ext:quit :recklessly-p t :unix-status 1)))))) - -(sb-thread:wait-on-semaphore sem :n cpu-count) - -(format t "~%Done (~a/~a)." - (- (length packages) errors) - (length packages)) - -(when (plusp errors) - (format t "~%~%~a Errors: " errors) - (maphash (lambda (k v) - (unless (and (numberp v) (zerop v)) - (format t "~% ~a: ~a" k v))) - statuses)) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/README.txt b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/README.txt deleted file mode 100644 index c16d02594e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/README.txt +++ /dev/null @@ -1,30 +0,0 @@ -Want to add a package? There are 3 simple steps! -1. Add the needed system names to quicklisp-to-nix-systems.txt. -2. cd ; nix-shell --pure --run 'quicklisp-to-nix .' - You might want to specify also the --cacheSystemInfoDir and --cacheFaslDir - parameters to preserve some data between runs. For example, it is very - useful when you add new packages with native dependencies and fail to - specify the native dependencies correctly the first time. - (Might be nice to ensure the cache directories exist) -3. Add native libraries and whatever else is needed to quicklisp-to-nix-overrides.nix. - If libraries are needed during package analysis then add them to shell.nix, too. -4. Sometimes there are problems with loading implementation-provided systems. - In this case you might need to add more systems in the implementation's (so - SBCL's) entry into *implementation-systems* in quicklisp-to-nix/system-info.lisp - -To update to a more recent quicklisp dist modify -lispPackages.quicklisp to have a more recent distinfo. - -quicklisp-to-nix-system-info is responsible for installing a quicklisp -package into an isolated environment and figuring out which packages -are required by that system. It also extracts other information that -is readily available once the system is loaded. The information -produced by this program is fed into quicklisp-to-nix. You usually -don't need to run this program unless you're trying to understand why -quicklisp-to-nix failed to handle a system. The technique used by -quicklisp-to-nix-system-info is described in its source. - -quicklisp-to-nix is responsible for reading -quicklisp-to-nix-systems.txt, running quicklisp-to-nix-system-info, -and generating the nix packages associated with the closure of -quicklisp systems. diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/asdf/2.26.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/asdf/2.26.nix deleted file mode 100644 index dbf81bb76a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/asdf/2.26.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, texinfo, texLive, perl }: - -stdenv.mkDerivation rec { - pname = "asdf"; - version = "2.26"; - - src = fetchurl { - url = "http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz"; - sha256 = "sha256-tuUuIlZcS+a0izXeJl3Ckp+/PYAWkZ0+Cw7blwkh9+M="; - }; - - strictDeps = true; - nativeBuildInputs = [ - texinfo - texLive - perl - ]; - - buildPhase = '' - make asdf.lisp - mkdir build - ln -s ../asdf.lisp build - ''; - installPhase = '' - mkdir -p "$out"/lib/common-lisp/asdf/ - mkdir -p "$out"/share/doc/asdf/ - cp -r ./* "$out"/lib/common-lisp/asdf/ - cp -r doc/* "$out"/share/doc/asdf/ - ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} - ''; - - meta = with lib; { - description = "Standard software-system definition library for Common Lisp"; - license = licenses.mit; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/asdf/3.1.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/asdf/3.1.nix deleted file mode 100644 index cda5d46131..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/asdf/3.1.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, texinfo, texLive, perl }: - -stdenv.mkDerivation rec { - pname = "asdf"; - version = "3.1.7"; - - src = fetchurl { - url = "http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz"; - sha256 = "sha256-+P+FLM1mr2KRdj7bfhWq4ync86bJS/uE0Jm/E/e4HL0="; - }; - - strictDeps = true; - nativeBuildInputs = [ - texinfo - texLive - perl - ]; - - buildPhase = '' - make build/asdf.lisp - make -C doc asdf.info asdf.html - ''; - installPhase = '' - mkdir -p "$out"/lib/common-lisp/asdf/ - mkdir -p "$out"/share/doc/asdf/ - cp -r ./* "$out"/lib/common-lisp/asdf/ - cp -r doc/* "$out"/share/doc/asdf/ - ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} - ''; - - meta = with lib; { - description = "Standard software-system definition library for Common Lisp"; - license = licenses.mit; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/asdf/default.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/asdf/default.nix deleted file mode 100644 index 78d49a9178..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/asdf/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, texinfo, texLive, perl }: - -stdenv.mkDerivation rec { - pname = "asdf"; - version = "3.3.4"; - - src = fetchurl { - url = "http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz"; - sha256 = "sha256-/k7cmN0ymZUgpP4K+IWfhq85TkzfPjTR4QdUgV9n1x4="; - }; - - strictDeps = true; - nativeBuildInputs = [ - texinfo - texLive - perl - ]; - - buildPhase = '' - make build/asdf.lisp - make -C doc asdf.info asdf.html - ''; - installPhase = '' - mkdir -p "$out"/lib/common-lisp/asdf/ - mkdir -p "$out"/share/doc/asdf/ - cp -r ./* "$out"/lib/common-lisp/asdf/ - cp -r doc/* "$out"/share/doc/asdf/ - ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} - ''; - - meta = with lib; { - description = "Standard software-system definition library for Common Lisp"; - license = licenses.mit; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/build-with-lisp.sh b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/build-with-lisp.sh deleted file mode 100755 index 13965f14c5..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/build-with-lisp.sh +++ /dev/null @@ -1,67 +0,0 @@ -#! /bin/sh -# Part of NixPkgs package collection -# This script can be used at your option under the same license as NixPkgs or -# under MIT/X11 license - -lisp="$1" -systems="$2" -target="$3" -code="$4" - -NIX_LISP_SKIP_CODE=1 NIX_LISP_COMMAND="$lisp" source "$(dirname "$0")/cl-wrapper.sh" - -NIX_LISP_BUILD_CODE= - -case "$NIX_LISP" in - sbcl) - NIX_LISP_BUILD_CODE="(progn - (let* - ((old-fn (symbol-function 'sb-alien::dlopen-or-lose ))) - (sb-ext:with-unlocked-packages (:sb-sys :sb-alien) - (defun sb-alien::dlopen-or-lose (&rest args) - (or - (ignore-errors (progn (apply old-fn args))) - (and - args - (loop - with try = nil - with obj = (first args) - with original-namestring = (sb-alien::shared-object-namestring obj) - for path in (list $(echo "$NIX_LISP_LD_LIBRARY_PATH" | sed -e 's/:/" "/g; s/^/"/; s/$/"/')) - for target := (format nil \"~a/~a\" path original-namestring) - when (ignore-errors - (progn - (setf (sb-alien::shared-object-namestring obj) target) - (setf try (apply old-fn args)) - t)) do - (progn (return try)) - finally (progn (setf (sb-alien::shared-object-namestring obj) original-namestring) - (return (apply old-fn args))) - ) - ) - ) - ) - ) - ) - (sb-ext:save-lisp-and-die \"$target\" - :toplevel (lambda () - (setf common-lisp:*standard-input* (sb-sys::make-fd-stream 0 :input t :buffering :line)) - (setf common-lisp:*standard-output* (sb-sys::make-fd-stream 1 :output t :buffering :line)) - (setf uiop/image:*command-line-arguments* (cdr sb-ext:*posix-argv*)) - $code) - :executable t :save-runtime-options t :purify t))" - systems=":sb-posix $systems" - ;; - ecl) - NIX_LISP_BUILD_CODE="()" - ;; - clisp) - NIX_LISP_BUILD_CODE="(ext:saveinitmem \"$target\" :norc t :init-function (lambda () $code (ext:bye)) :script nil :executable 0)" - ;; -esac - -"$lisp" \ - "$NIX_LISP_EXEC_CODE" "(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")" \ - "$NIX_LISP_EXEC_CODE" "(mapcar 'asdf:load-system (list $systems))" \ - "$NIX_LISP_EXEC_CODE" "$NIX_LISP_BUILD_CODE" \ - "$NIX_LISP_EXEC_CODE" "(quit)" diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/cl-wrapper.sh b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/cl-wrapper.sh deleted file mode 100755 index d6fec46b44..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/cl-wrapper.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!@bash@/bin/bash -# Part of NixPkgs package collection -# This script can be used at your option under the same license as NixPkgs or -# under MIT/X11 license - -eval "$NIX_LISP_PREHOOK" - -NIX_LISP_COMMAND="$1" -shift - -if [ -z "$NIX_LISP" ]; then - while [ -h "${NIX_LISP_COMMAND}" ]; do - NIX_LISP_COMMAND="$(readlink -n "${NIX_LISP_COMMAND}")" - done - NIX_LISP="${NIX_LISP_COMMAND##*/}" -fi - -export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS - -test -n "$NIX_LISP_LD_LIBRARY_PATH" && - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$NIX_LISP_LD_LIBRARY_PATH" - -declare -a NIX_LISP_FINAL_PARAMETERS; - -case "$NIX_LISP" in - sbcl) - NIX_LISP_LOAD_FILE="--load" - NIX_LISP_EXEC_CODE="--eval" - NIX_LISP_QUIT="(quit)" - NIX_LISP_NODEBUG='--non-interactive' - NIX_LISP_FINAL_PARAMETERS= - NIX_LISP_FASL_TYPE="fasl" - ;; - ecl) - NIX_LISP_LOAD_FILE="-load" - NIX_LISP_EXEC_CODE="-eval" - NIX_LISP_QUIT="(quit)" - NIX_LISP_NODEBUG='--nodebug' - NIX_LISP_FINAL_PARAMETERS= - NIX_LISP_FASL_TYPE="fas" - ;; - clisp) - NIX_LISP_LOAD_FILE="-c -l" - NIX_LISP_EXEC_CODE="-x" - NIX_LISP_QUIT="(quit)" - NIX_LISP_NODEBUG='-on-error exit' - NIX_LISP_FINAL_PARAMETERS="-repl" - NIX_LISP_FASL_TYPE="fas" - ;; - lx86cl64) - NIX_LISP_LOAD_FILE="-l" - NIX_LISP_EXEC_CODE="-e" - NIX_LISP_QUIT="(quit)" - NIX_LISP_NODEBUG='-b' - NIX_LISP_FINAL_PARAMETERS= - NIX_LISP_FASL_TYPE="lx64fsl" - ;; - lx86cl) - NIX_LISP_LOAD_FILE="-l" - NIX_LISP_EXEC_CODE="-e" - NIX_LISP_QUIT="(quit)" - NIX_LISP_NODEBUG='-b' - NIX_LISP_FINAL_PARAMETERS= - NIX_LISP_FASL_TYPE="lx32fsl" - ;; - abcl) - NIX_LISP_LOAD_FILE="--load" - NIX_LISP_EXEC_CODE="--eval" - NIX_LISP_QUIT="(quit)" - NIX_LISP_NODEBUG='' - NIX_LISP_FINAL_PARAMETERS= - NIX_LISP_FASL_TYPE="abcl" - ;; -esac - -NIX_LISP_ASDF_REGISTRY_CODE=" - (progn - (setf asdf:*source-registry-parameter* - '(:source-registry - $(for p in $NIX_LISP_ASDF_PATHS; do - echo "(:tree \"$p\")" - done) - :inherit-configuration)) - (asdf:initialize-source-registry) - ) -" - -NIX_LISP_ASDF="${NIX_LISP_ASDF:-@out@}" - -nix_lisp_run_single_form(){ - NIX_LISP_FINAL_PARAMETERS=("$NIX_LISP_EXEC_CODE" "$1" - "$NIX_LISP_EXEC_CODE" "$NIX_LISP_QUIT" $NIX_LISP_NODEBUG) -} - -nix_lisp_build_system(){ - NIX_LISP_FINAL_PARAMETERS=( - "$NIX_LISP_EXEC_CODE" "(progn - (asdf:load-system :$1) - (loop for s in (list $(for i in $3; do echo ":$i"; done)) do (asdf:load-system s)))" - "$NIX_LISP_EXEC_CODE" "(progn - (setf (asdf/system:component-entry-point (asdf:find-system :$1)) ${2:-nil}) - #+cffi(setf cffi:*foreign-library-directories* - (cffi::explode-path-environment-variable \"NIX_LISP_LD_LIBRARY_PATH\")) - #+sbcl(loop - with libpath := (uiop:split-string (uiop:getenv \"NIX_LISP_LD_LIBRARY_PATH\") - :separator \":\") - for l in sb-alien::*shared-objects* - for ns := (sb-alien::shared-object-namestring l) - do (format *error-output* \"Searching alien object ~s in ~s~%\" - ns libpath) - do (and (> (length ns) 0) (not (equal (elt ns 0) \"/\")) - (let* - ((prefix (find-if (lambda (s) (probe-file (format nil \"~a/~a\" s ns))) libpath)) - (fullpath (and prefix (format nil \"~a/~a\" prefix ns)))) - (when fullpath - (format *error-output* \"Found: ~s~%\" fullpath) - (setf - (sb-alien::shared-object-namestring l) fullpath - (sb-alien::shared-object-pathname l) (probe-file fullpath))))) - ) - $4 - (asdf:perform (quote asdf:program-op) :$1) - )") -} - -eval "$NIX_LISP_PRELAUNCH_HOOK" - -if [ -z "$NIX_LISP_SKIP_CODE" ]; then - "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \ - $NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.$NIX_LISP_FASL_TYPE\")"}" \ - $NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \ - ${NIX_LISP_FINAL_PARAMETERS[*]:+"${NIX_LISP_FINAL_PARAMETERS[@]}"} \ - "$@" -fi diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/common-lisp.sh b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/common-lisp.sh deleted file mode 100755 index 88948e3253..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/common-lisp.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!@bash@/bin/bash - -source "@out@"/bin/cl-wrapper.sh "${NIX_LISP_COMMAND:-$(@ls@ "@lisp@/bin"/* | @head@ -n 1)}" "$@" diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/default.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/default.nix deleted file mode 100644 index 83f3347bdf..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{lib, stdenv, asdf, which, bash, lisp ? null}: -stdenv.mkDerivation { - name = "cl-wrapper-script"; - - buildPhase=""; - - installPhase='' - mkdir -p "$out"/bin - export head="$(which head)" - export ls="$(which ls)" - substituteAll ${./common-lisp.sh} "$out"/bin/common-lisp.sh - substituteAll "${./build-with-lisp.sh}" "$out/bin/build-with-lisp.sh" - substituteAll "${./cl-wrapper.sh}" "$out/bin/cl-wrapper.sh" - patchShebangs "$out/bin" - chmod a+x "$out"/bin/* - - substituteAll "${./setup-hook.sh}" "setup-hook-parsed" - addEnvHooks(){ true; }; - source setup-hook-parsed - setLisp "${lisp}" - echo "$NIX_LISP" - - mkdir -p "$out/lib/common-lisp/" - cp -r "${asdf}/lib/common-lisp"/* "$out/lib/common-lisp/" - chmod u+rw -R "$out/lib/common-lisp/" - - NIX_LISP_PRELAUNCH_HOOK=' - NIX_LISP_FASL_TYPE=lisp - nix_lisp_run_single_form "(progn - (uiop/lisp-build:compile-file* \"'"$out"'/lib/common-lisp/asdf/build/asdf.lisp\") - (asdf:load-system :uiop :force :all) - (asdf:load-system :asdf :force :all) - (ignore-errors (asdf:load-system :uiop/version :force :all)) - )"' \ - "$out/bin/common-lisp.sh" - ''; - - buildInputs = [which]; - - inherit asdf lisp bash; - stdenv_shell = stdenv.shell; - - setupHook = ./setup-hook.sh; - - dontUnpack = true; - - ASDF_OUTPUT_TRANSLATIONS="${builtins.storeDir}/:${builtins.storeDir}"; - - passthru = { - inherit lisp; - }; - - meta = { - description = "Script used to wrap Common Lisp implementations"; - maintainers = [lib.maintainers.raskin]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/setup-hook.sh b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/setup-hook.sh deleted file mode 100644 index 5cb238b297..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/clwrapper/setup-hook.sh +++ /dev/null @@ -1,39 +0,0 @@ -NIX_LISP_ASDF="@out@" - -CL_SOURCE_REGISTRY="${CL_SOURCE_REGISTRY:+$CL_SOURCE_REGISTRY:}@out@/lib/common-lisp/asdf/" - -addASDFPaths () { - for j in "$1"/lib/common-lisp-settings/*-path-config.sh; do - source "$j" - done -} - -setLisp () { - if [ -z "${NIX_LISP_COMMAND:-}" ]; then - for j in "$1"/bin/*; do - case "$(basename "$j")" in - sbcl) NIX_LISP_COMMAND="$j" ;; - ecl) NIX_LISP_COMMAND="$j" ;; - clisp) NIX_LISP_COMMAND="$j" ;; - lx86cl) NIX_LISP_COMMAND="$j" ;; - lx86cl64) NIX_LISP_COMMAND="$j" ;; - esac - done - fi - if [ -n "${NIX_LISP_COMMAND:-}" ] && [ -z "${NIX_LISP:-}" ]; then - NIX_LISP="${NIX_LISP_COMMAND##*/}" - fi -} - -collectNixLispLDLP () { - if echo "$1/lib"/lib*.{so,dylib}* | grep . > /dev/null; then - export NIX_LISP_LD_LIBRARY_PATH="${NIX_LISP_LD_LIBRARY_PATH-}${NIX_LISP_LD_LIBRARY_PATH:+:}$1/lib" - fi -} - -export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF - -addEnvHooks "$targetOffset" addASDFPaths setLisp collectNixLispLDLP - -mkdir -p "$HOME"/.cache/common-lisp || HOME="$TMP/.temp-${USER:-nixbld}-home" -mkdir -p "$HOME"/.cache/common-lisp diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/define-package.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/define-package.nix deleted file mode 100644 index b787e87950..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/define-package.nix +++ /dev/null @@ -1,120 +0,0 @@ -args @ {lib, stdenv, clwrapper, baseName, packageName ? baseName - , parasites ? [] - , buildSystems ? ([packageName] ++ parasites) - , version ? "latest" - , src, description, deps, buildInputs ? [], meta ? {}, overrides?(x: {}) - , propagatedBuildInputs ? [] - , asdFilesToKeep ? [(builtins.concatStringsSep "" [packageName ".asd"])]}: -let - deployConfigScript = '' - outhash="$out" - outhash="''${outhash##*/}" - outhash="''${outhash%%-*}" - config_script="$out"/lib/common-lisp-settings/${args.baseName}-shell-config.sh - path_config_script="$out"/lib/common-lisp-settings/${args.baseName}-path-config.sh - store_translation="$(dirname "$out"):$(dirname "$out")" - mkdir -p "$(dirname "$config_script")" - touch "$config_script" - touch "$path_config_script" - chmod a+x "$config_script" - chmod a+x "$path_config_script" - echo "if test -z \"\''${_''${outhash}_NIX_LISP_CONFIG:-}\"; then export _''${outhash}_NIX_LISP_CONFIG=1; " >> "$config_script" - echo "export NIX_CFLAGS_COMPILE='$NIX_CFLAGS_COMPILE'\"\''${NIX_CFLAGS_COMPILE:+ \$NIX_CFLAGS_COMPILE}\"" >> "$config_script" - echo "export NIX_LDFLAGS='$NIX_LDFLAGS'\"\''${NIX_LDFLAGS:+ \$NIX_LDFLAGS}\"" >> "$config_script" - echo "export NIX_LISP_COMMAND='$NIX_LISP_COMMAND'" >> "$config_script" - echo "export NIX_LISP_ASDF='$NIX_LISP_ASDF'" >> "$config_script" - set | grep NIX_CC_WRAPPER_ | sed -e 's@^NIX_CC_WRAPPER@export &@' >> "$config_script" - echo "export PATH=\"\''${PATH:+\$PATH:}$PATH\"" >> "$config_script" - echo "echo \"\$ASDF_OUTPUT_TRANSLATIONS\" | grep -E '(^|:)$store_translation(:|\$)' >/dev/null || export ASDF_OUTPUT_TRANSLATIONS=\"\''${ASDF_OUTPUT_TRANSLATIONS:+\$ASDF_OUTPUT_TRANSLATIONS:}\"'$store_translation'" >> "$config_script" - echo "source '$path_config_script'" >> "$config_script" - echo "fi" >> "$config_script" - echo "if test -z \"\''${_''${outhash}_NIX_LISP_PATH_CONFIG:-}\"; then export _''${outhash}_NIX_LISP_PATH_CONFIG=1; " >> "$path_config_script" - echo "NIX_LISP_ASDF_PATHS=\"$( echo "\''${NIX_LISP_ASDF_PATHS:-}"; echo "$NIX_LISP_ASDF_PATHS"; echo "$out/lib/common-lisp/${args.baseName}" )\"" >> "$path_config_script" - echo "export NIX_LISP_ASDF_PATHS=\$((tr ' ' '\n' | sort | uniq | tr '\n' ' ') <<< \$NIX_LISP_ASDF_PATHS)" >> $path_config_script - - test -n "$LD_LIBRARY_PATH" && - echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$path_config_script" - test -n "$NIX_LISP_LD_LIBRARY_PATH" && - echo "export NIX_LISP_LD_LIBRARY_PATH=\"\''${NIX_LISP_LD_LIBRARY_PATH:-}\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$(echo "$NIX_LISP_LD_LIBRARY_PATH" | tr -d '\n' | tr : '\n' | sort | uniq | tr '\n' ':' | sed -e 's/:$//')'" >> "$path_config_script" - echo "fi" >> "$path_config_script" - ''; - deployLaunchScript = '' - launch_script="$out"/bin/${args.baseName}-lisp-launcher.sh - mkdir -p "$(dirname "$launch_script")" - touch "$launch_script" - chmod a+x "$launch_script" - echo "#! ${stdenv.shell}" >> "$launch_script" - echo "source '$config_script'" >> "$launch_script" - echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" && export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" - echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" - ''; - moveAsdFiles = '' - find $out/lib/common-lisp/ -name '*.asd' | while read ASD_FILE; do - KEEP_THIS_ASD=0 - for ALLOWED_ASD in $asdFilesToKeep; do - ALLOWED_ASD="/$ALLOWED_ASD" - ALLOWED_ASD_LENGTH=${"$"}{#ALLOWED_ASD} - ASD_FILE_LENGTH=${"$"}{#ASD_FILE} - ASD_FILE_SUFFIX_INDEX=$(expr "$ASD_FILE_LENGTH" - "$ALLOWED_ASD_LENGTH") - ASD_FILE_SUFFIX_INDEX=$(expr "$ASD_FILE_SUFFIX_INDEX" + 1) - echo $ALLOWED_ASD $ASD_FILE $ASD_FILE_SUFFIX_INDEX $(expr substr "$ASD_FILE" "$ASD_FILE_SUFFIX_INDEX" "$ASD_FILE_LENGTH") - if [ "$(expr substr "$ASD_FILE" "$ASD_FILE_SUFFIX_INDEX" "$ASD_FILE_LENGTH")" == "$ALLOWED_ASD" ]; then - KEEP_THIS_ASD=1 - break - fi - done - if [ "$KEEP_THIS_ASD" == 0 ]; then - mv "$ASD_FILE"{,.sibling} - fi - done - ''; -basePackage = { - name = "lisp-${baseName}-${version}"; - inherit src; - - dontBuild = true; - - inherit deployConfigScript deployLaunchScript; - inherit asdFilesToKeep moveAsdFiles; - installPhase = '' - eval "$preInstall" - - mkdir -p "$out"/share/doc/${args.baseName}; - mkdir -p "$out"/lib/common-lisp/${args.baseName}; - cp -r . "$out"/lib/common-lisp/${args.baseName}; - cp -rf doc/* LICENCE LICENSE COPYING README README.html README.md readme.html "$out"/share/doc/${args.baseName} || true - - ${deployConfigScript} - ${deployLaunchScript} - ${moveAsdFiles} - - env -i \ - NIX_LISP="$NIX_LISP" \ - NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn - ${lib.concatMapStrings (system: '' - (asdf:compile-system :${system}) - (asdf:load-system :${system}) - (asdf:operate (quote asdf::compile-bundle-op) :${system}) - (ignore-errors (asdf:operate (quote asdf::deploy-asd-op) :${system})) -'') buildSystems} - )"' \ - "$out/bin/${args.baseName}-lisp-launcher.sh" - - eval "$postInstall" - ''; - propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp clwrapper.asdf] - ++ (args.propagatedBuildInputs or []); - buildInputs = buildInputs; - dontStrip=true; - - ASDF_OUTPUT_TRANSLATIONS="${builtins.storeDir}/:${builtins.storeDir}"; - - noAuditTmpDir = true; - - meta = { - inherit description version; - } // meta; -}; -package = basePackage // (overrides basePackage); -in -stdenv.mkDerivation package diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/asdf-description.sh b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/asdf-description.sh deleted file mode 100755 index bdb5981bf4..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/asdf-description.sh +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh - -[ -z "$NIX_QUICKLISP_DIR" ] && { - export NIX_QUICKLISP_DIR="$(mktemp -d --tmpdir nix-quicklisp.XXXXXX)" -} - -[ -f "$NIX_QUICKLISP_DIR/setup.lisp" ] || { - "$(dirname "$0")/quicklisp-beta-env.sh" "$NIX_QUICKLISP_DIR" &> /dev/null < /dev/null -} - -name="$1" - -sbcl --noinform --load "$NIX_QUICKLISP_DIR"/setup.lisp --eval "(ql:quickload :$name)" \ - --eval "(format t \"~a~%\" (or (asdf::system-description (asdf::find-system \"$name\")) \"\"))" \ - --eval '(quit)' --script | - tee /dev/stderr | tail -n 1 diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/barebones-quicklisp-expression.sh b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/barebones-quicklisp-expression.sh deleted file mode 100755 index 7959d1146f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/barebones-quicklisp-expression.sh +++ /dev/null @@ -1,174 +0,0 @@ -#! /bin/sh - -name="$1" - -[ -z "$NIX_LISP_PACKAGES_DEFINED_LIST" ] && export NIX_LISP_PACKAGES_DEFINED_LIST="$(mktemp)" - -if [ -n "$NIX_LISP_UPDATE_PACKAGE" ] || [ -n "$NIX_LISP_UPDATE_PACKAGES" ]; then - export NIX_LISP_UPDATE_PACKAGE= -else - nix-instantiate "$(dirname "$0")"/../../../../ -A "lispPackages.$name" > /dev/null && exit -fi -grep "^$name\$" "$NIX_LISP_PACKAGES_DEFINED_LIST" > /dev/null && exit - -echo "$name" >> "$NIX_LISP_PACKAGES_DEFINED_LIST" - -[ -z "$NIX_QUICKLISP_DIR" ] && { - export NIX_QUICKLISP_DIR="$(mktemp -d --tmpdir nix-quicklisp.XXXXXX)" -} - -[ -f "$NIX_QUICKLISP_DIR/setup.lisp" ] || { - "$(dirname "$0")/quicklisp-beta-env.sh" "$NIX_QUICKLISP_DIR" &> /dev/null < /dev/null -} - -description="$("$(dirname "$0")/asdf-description.sh" "$name")" -[ -z "$description" ] && { - description="$(curl -L https://github.com/quicklisp/quicklisp-projects/raw/master/"$name"/description.txt)" - [ "$(echo "$description" | wc -l)" -gt 10 ] && description="" -} - -dependencies="$("$(dirname "$0")/quicklisp-dependencies.sh" "$name" | xargs)" -ql_src="$(curl -L https://github.com/quicklisp/quicklisp-projects/raw/master/"$name"/source.txt)" -ql_src_type="${ql_src%% *}" -url="${ql_src##* }" - -[ "$ql_src_type" = "kmr-git" ] && { - ql_src_type=git - url="http://git.kpe.io/$url.git" - export NIX_PREFETCH_GIT_DEEP_CLONE=1 -} - -[ "$ql_src_type" = ediware-http ] && { - ql_src_type=github - url="edicl/$url"; -} - -[ "$ql_src_type" = xach-http ] && { - ql_src_type=github - url="xach/$url"; -} - -[ "$ql_src_type" = github ] && { - ql_src_type=git - url="https://github.com/$url"; - version="$("$(dirname "$0")/urls-from-page.sh" "$url/releases/" | grep /tag/ | head -n 1 | xargs -l1 basename)" - rev="refs/tags/$version"; -} - -[ "$ql_src_type" = git ] && { - fetcher="pkgs.fetchgit" - ( [ "${url#git://github.com/}" != "$url" ] || - [ "${url#https://github.com/}" != "$url" ] - ) && { - url="${url/git:/https:}" - url="${url%.git}" - [ -z "$rev" ] && rev=$("$(dirname "$0")/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename) - hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | grep . | tail -n 1) - [ -z "$version" ] && version="git-$(date +%Y%m%d)"; - } - [ "${url#git://common-lisp.net/}" != "$url" ] && { - http_repo_url="$url" - http_repo_url="${http_repo_url/git:/http:}" - http_repo_url="${http_repo_url/\/projects\// /r/projects/}" - http_repo_head="$http_repo_url/refs/heads/master" - echo "$http_repo_head" >&2 - [ -z "$rev" ] && rev=$(curl -L "$http_repo_head"); - hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev") - [ -z "$version" ] && version="git-$(date +%Y%m%d)"; - } - [ "${url#http://git.b9.com/}" != "$url" ] && { - http_repo_url="$url" - http_repo_url="${http_repo_url/git:/http:}" - http_repo_head="$http_repo_url/refs/heads/master" - echo "$http_repo_head" >&2 - rev=$(curl -L "$http_repo_head"); - hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | tail -n 1) - version="git-$(date +%Y%m%d)"; - } - [ "${url#http://common-lisp.net/}" != "$url" ] && { - http_repo_url="$url" - http_repo_url="${http_repo_url/git:/http:}" - http_repo_head="$http_repo_url/refs/heads/master" - echo "$http_repo_head" >&2 - rev=$(curl -L "$http_repo_head"); - hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | tail -n 1) - version="git-$(date +%Y%m%d)"; - } -} - -[ "$ql_src_type" = cvs ] && { - fetcher="pkgs.fetchcvs" - date="$(date -d yesterday +%Y-%m-%d)" - version="cvs-$date" - module="${module:-$name}" - hash=$(USE_DATE=1 "$(dirname "$0")/../../../build-support/fetchcvs/nix-prefetch-cvs" "$url" "$module" "$date") - cvsRoot="$url" - unset url -} - -[ "$ql_src_type" = clnet-darcs ] && { - ql_src_type=darcs - url="http://common-lisp.net/project/$url/darcs/$url/" -} - -[ "$ql_src_type" = darcs ] && { - fetcher="pkgs.fetchdarcs" - [ -z "$version" ] && - version="$(curl "$url/_darcs/inventory" | grep '\[TAG ' | tail -n 1 | sed -e 's/.* //')" - [ -z "$version" ] && - version="$(curl "$url/_darcs/hashed_inventory" | grep '\[TAG ' | tail -n 1 | sed -e 's/.* //')" - rev="$version"; - hash=$(echo " - with (import {}); - fetchdarcs { - url=''$url''; - rev=''$version''; - sha256=''0000000000000000000000000000000000000000000000000000000000000000''; - }" | nix-instantiate - | tail -n 1 | - xargs nix-store -r 2>&1 | tee /dev/stderr | grep 'instead has' | tail -n 1 | - sed -e 's/.* instead has .//;s/[^0-9a-z].*//') -} - -[ "$ql_src_type" = froydware-http ] && { - dirurl="http://method-combination.net/lisp/files/"; - url="$("$(dirname "$0")/urls-from-page.sh" "$dirurl" | - grep "/${url}_" | grep -v "[.]asc\$" | tail -n 1)" - ql_src_type=http -} - -[ "$ql_src_type" = http ] && { - fetcher="pkgs.fetchurl"; - version="$(echo "$url" | sed -re 's@.*[-_]([0-9.]+)[-._].*@\1@')" - hash="$(nix-prefetch-url "$url" | grep . | tail -n 1)" -} - -[ "$ql_src_type" = https ] && { - fetcher="pkgs.fetchurl"; - version="$(echo "$url" | sed -re 's@.*[-_]([0-9.]+)[-._].*@\1@')" - hash="$(nix-prefetch-url "$url" | grep . | tail -n 1)" -} - -if [ "$ql_src" = '{"error":"Not Found"}' ]; then - echo "# $name: not found" -else -cat << EOF | grep -Ev '^[ ]+$' - - $name = buildLispPackage rec { - baseName = "$name"; - version = "${version:-\${Set me //}"; - description = "$description"; - deps = [$dependencies]; - # Source type: $ql_src_type - src = ${fetcher:-pkgs.fetchurl} { - ${url:+url = ''$url'';} - sha256 = "${hash:-0000000000000000000000000000000000000000000000000000000000000000}"; - ${rev:+rev = ''$rev'';} - ${date:+date = ''$date'';} - ${module:+module = ''$module'';} - ${cvsRoot:+cvsRoot = ''$cvsRoot'';} - }; - }; -EOF -fi - -for i in $dependencies; do "$0" "$i"; done diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/quicklisp-beta-env.sh b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/quicklisp-beta-env.sh deleted file mode 100755 index 32fbbe4bb2..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/quicklisp-beta-env.sh +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh - -WORK_DIR=$(mktemp -d "/tmp/ql-venv-XXXXXX") -mkdir -p "${1:-.}" -TARGET="$(cd "${1:-.}"; pwd)" - -curl http://beta.quicklisp.org/quicklisp.lisp > "$WORK_DIR/ql.lisp" - -sbcl --noinform \ - --load "$WORK_DIR/ql.lisp" \ - --eval "(quicklisp-quickstart:install :path \"$TARGET/\")" \ - --eval "(cl-user::quit)" \ - --script - - -rm -rf "$WORK_DIR" diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/quicklisp-dependencies.sh b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/quicklisp-dependencies.sh deleted file mode 100755 index 24efbdd3e1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/quicklisp-dependencies.sh +++ /dev/null @@ -1,11 +0,0 @@ -#! /bin/sh - -[ -z "$NIX_QUICKLISP_DIR" ] && { - export NIX_QUICKLISP_DIR="$(mktemp -d --tmpdir nix-quicklisp.XXXXXX)" -} - -[ -f "$NIX_QUICKLISP_DIR/setup.lisp" ] || { - "$(dirname "$0")/quicklisp-beta-env.sh" "$NIX_QUICKLISP_DIR" &> /dev/null < /dev/null -} - -sbcl --noinform --eval "(with-output-to-string (*standard-output*) (load \"$NIX_QUICKLISP_DIR/setup.lisp\"))" --eval "(with-output-to-string (*standard-output*) (with-output-to-string (*error-output*) (with-output-to-string (*trace-output*) (ql:quickload :$1))))" --eval "(format t \"~{~a~%~}\" (mapcar 'ql::name (mapcar 'car (cdr (ql::dependency-tree \"$1\")))))" --eval '(quit)' --script diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/urls-from-page.sh b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/urls-from-page.sh deleted file mode 100755 index 26724d122a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/from-quicklisp/urls-from-page.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh - -url="$1" -protocol="${url%%:*}" -path="${url#$protocol://}" -server="${path%%/*}" -basepath="${path%/*}" -relpath="${path#$server}" - -echo "URL: $url" >&2 - -curl -A 'text/html; text/xhtml; text/xml; */*' -L -k "$url" | sed -re 's/^/-/;s/[^a-zA-Z][hH][rR][eE][fF]=("([^"]*)"|'\''([^'\'']*)'\''|([^"'\'' <>&]+)[ <>&])/\n+\2\3\4\n-/g' | \ - sed -e '/^-/d; s/^[+]//; /^#/d;'"s/^\\//$protocol:\\/\\/$server\\//g" | \ - sed -re 's`^[^:]*$`'"$protocol://$basepath/&\`" diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/lisp-packages.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/lisp-packages.nix deleted file mode 100644 index 6688ebcc52..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/lisp-packages.nix +++ /dev/null @@ -1,272 +0,0 @@ -{lib, stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}: -let lispPackages = rec { - inherit lib pkgs clwrapper stdenv; - nixLib = pkgs.lib; - callPackage = nixLib.callPackageWith lispPackages; - - buildLispPackage = callPackage ./define-package.nix; - - quicklisp = buildLispPackage rec { - baseName = "quicklisp"; - version = "2021-02-13"; - - buildSystems = []; - - description = "The Common Lisp package manager"; - deps = []; - src = pkgs.fetchFromGitHub { - owner = "quicklisp"; - repo = "quicklisp-client"; - rev = "version-${version}"; - sha256 = "sha256-1HLVPhl8aBaeG8dRLxBh0j0X/0wqFeNYK1CEfiELToA="; - }; - overrides = x: rec { - inherit clwrapper; - quicklispdist = pkgs.fetchurl { - # Will usually be replaced with a fresh version anyway, but needs to be - # a valid distinfo.txt - url = "http://beta.quicklisp.org/dist/quicklisp/2021-12-09/distinfo.txt"; - sha256 = "sha256:0gc4cv73nl7xkfwvmkmfhfx6yqf876nfm2v24v6fky9n24sh4y6w"; - }; - buildPhase = "true; "; - postInstall = '' - substituteAll ${./quicklisp.sh} "$out"/bin/quicklisp - chmod a+x "$out"/bin/quicklisp - cp "${quicklispdist}" "$out/lib/common-lisp/quicklisp/quicklisp-distinfo.txt" - ''; - }; - }; - - quicklisp-to-nix-system-info = stdenv.mkDerivation { - pname = "quicklisp-to-nix-system-info"; - version = "1.0.0"; - src = ./quicklisp-to-nix; - nativeBuildInputs = [sbcl]; - buildInputs = [ - lispPackages.quicklisp coreutils - ]; - touch = coreutils; - nix-prefetch-url = nix; - inherit quicklisp; - buildPhase = '' - ${sbcl}/bin/sbcl --eval '(load #P"${asdf}/lib/common-lisp/asdf/build/asdf.lisp")' --load $src/system-info.lisp --eval '(ql-to-nix-system-info::dump-image)' - ''; - installPhase = '' - mkdir -p $out/bin - cp quicklisp-to-nix-system-info $out/bin - ''; - dontStrip = true; - }; - - quicklisp-to-nix = stdenv.mkDerivation { - pname = "quicklisp-to-nix"; - version = "1.0.0"; - src = ./quicklisp-to-nix; - buildDependencies = [sbcl quicklisp-to-nix-system-info]; - buildInputs = with pkgs.lispPackages; [md5 cl-emb alexandria external-program]; - touch = coreutils; - nix-prefetch-url = nix; - inherit quicklisp; - deps = []; - system-info = quicklisp-to-nix-system-info; - buildPhase = '' - ${clwrapper}/bin/cl-wrapper.sh "${sbcl}/bin/sbcl" --eval '(load #P"${asdf}/lib/common-lisp/asdf/build/asdf.lisp")' --load $src/ql-to-nix.lisp --eval '(ql-to-nix::dump-image)' - ''; - installPhase = '' - mkdir -p $out/bin - cp quicklisp-to-nix $out/bin - ''; - dontStrip = true; - }; - - clx-truetype = buildLispPackage rec { - baseName = "clx-truetype"; - version = "20160825-git"; - - buildSystems = [ "clx-truetype" ]; - parasites = [ "clx-truetype-test" ]; - - description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension."; - deps = with pkgs.lispPackages; [ - alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf cl-store - cl-vectors clx trivial-features zpb-ttf - ]; - src = pkgs.fetchurl { - url = "http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz"; - sha256 = "0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67"; - }; - - packageName = "clx-truetype"; - - asdFilesToKeep = ["clx-truetype.asd"]; - }; - cluffer = buildLispPackage rec { - baseName = "cluffer"; - version = "2018-09-24"; - - buildSystems = [ "cluffer-base" "cluffer-simple-buffer" "cluffer-simple-line" "cluffer-standard-buffer" "cluffer-standard-line" "cluffer" ]; - parasites = [ "cluffer-test" ]; - - description = "General purpose text-editor buffer"; - deps = with pkgs.lispPackages; [ - acclimation clump - ]; - src = pkgs.fetchFromGitHub { - owner = "robert-strandh"; - repo = "cluffer"; - rev = "4aad29c276a58a593064e79972ee4d77cae0af4a"; - sha256 = "1bcg13g7qb3dr8z50aihdjqa6miz5ivlc9wsj2csgv1km1mak2kj"; - # date = 2018-09-24T04:45:36+02:00; - }; - - packageName = "cluffer"; - - asdFilesToKeep = [ "cluffer.asd" "cluffer-base.asd" "cluffer-simple-buffer.asd" "cluffer-simple-line.asd" "cluffer-standard-buffer.asd" "cluffer-standard-line.asd" ]; - }; - nyxt = pkgs.lispPackages.buildLispPackage rec { - baseName = "nyxt"; - version = "2.2.4"; - - description = "Browser"; - - overrides = x: { - postInstall = '' - echo "Building nyxt binary" - ( - source "$out/lib/common-lisp-settings"/*-shell-config.sh - cd "$out/lib/common-lisp"/*/ - makeFlags="''${makeFlags:-}" - make LISP=common-lisp.sh NYXT_INTERNAL_QUICKLISP=false PREFIX="$out" $makeFlags all - make LISP=common-lisp.sh NYXT_INTERNAL_QUICKLISP=false PREFIX="$out" $makeFlags install - cp nyxt "$out/bin/nyxt" - ) - NIX_LISP_PRELAUNCH_HOOK=' - nix_lisp_build_system nyxt/gtk-application \ - "(asdf/system:component-entry-point (asdf:find-system :nyxt/gtk-application))" \ - "" "(format *error-output* \"Alien objects:~%~s~%\" sb-alien::*shared-objects*)" - ' "$out/bin/nyxt-lisp-launcher.sh" - cp "$out/lib/common-lisp/nyxt/nyxt" "$out/bin/" - ''; - - # Prevent nyxt from trying to obtain dependencies as submodules - makeFlags = [ "NYXT_SUBMODULES=false" ] ++ x.buildFlags or []; - - patches = x.patches or [] ++ [ - # Work around crash when opening _any_ URL - # https://github.com/atlas-engineer/nyxt/issues/1781 - # https://github.com/NixOS/nixpkgs/issues/158005 - (pkgs.fetchpatch { - name = "nyxt-webkit-disable-sandbox.patch"; - url = "https://github.com/atlas-engineer/nyxt/commit/48ac0d8727f1ca1428188a1ab2c05b7be5f6cc51.patch"; - sha256 = "0570mcfn5wmjha6jmfdgglp0w5b7rpfnv3flzn77clgbknwbxi0m"; - }) - ]; - }; - - deps = with pkgs.lispPackages; [ - alexandria - bordeaux-threads - calispel - cl-css - cl-json - cl-markup - cl-ppcre - cl-ppcre-unicode - cl-prevalence - closer-mop - cl-containers - cl-qrencode - clss - cluffer - moptilities - dexador - enchant - file-attributes - iolib - local-time - log4cl - lparallel - mk-string-metrics - osicat - parenscript - quri - serapeum - spinneret - str - plump - swank - trivia - trivial-clipboard - trivial-features - trivial-garbage - trivial-package-local-nicknames - trivial-types - unix-opts - cl-html-diff - hu_dot_dwim_dot_defclass-star - cl-custom-hash-table - fset - cl-cffi-gtk - cl-webkit2 - cl-gobject-introspection - ]; - src = pkgs.fetchFromGitHub { - owner = "atlas-engineer"; - repo = "nyxt"; - rev = version; - sha256 = "12l7ir3q29v06jx0zng5cvlbmap7p709ka3ik6x29lw334qshm9b"; - }; - - packageName = "nyxt"; - - propagatedBuildInputs = [ - pkgs.libressl.out - pkgs.webkitgtk - pkgs.sbcl - ]; - }; - - mgl = buildLispPackage rec { - baseName = "mgl"; - version = "2021-10-07"; - description = "MGL is a machine learning library for backpropagation neural networks, boltzmann machines, gaussian processes and more"; - deps = with pkgs.lispPackages; [ - alexandria closer-mop array-operations lla cl-reexport mgl-mat mgl-pax - named-readtables pythonic-string-reader - ]; - src = pkgs.fetchFromGitHub { - owner = "melisgl"; - repo = "mgl"; - rev = "e697791a9bcad3b6e7b3845246a2aa55238cfef7"; - sha256 = "sha256:09sf7nq7nmf9q7bh3a5ygl2i2n0nhrx5fk2kv5ili0ckv7g9x72s"; - # date = 2021-10-18T14:15+02:00 - }; - buildSystems = [ "mgl" "mgl/test" ]; - packageName = "mgl"; - parasites = [ "mgl/test" ]; - asdFilesToKeep = [ "mgl.asd" "mgl-example.asd" "gnuplot/mgl-gnuplot.asd" "visuals/mgl-visuals.asd" ]; - }; - - mgl-mat = buildLispPackage rec { - baseName = "mgl-mat"; - version = "2021-10-11"; - description = "Multi-dimensional arrays with FFI/CUDA support"; - deps = with pkgs.lispPackages; [ - alexandria bordeaux-threads cffi cffi-grovel cl-cuda flexi-streams ieee-floats - lla mgl-pax static-vectors trivial-garbage cl-fad - ]; - src = pkgs.fetchFromGitHub { - owner = "melisgl"; - repo = "mgl-mat"; - rev = "3710858bc876b1b86e50f1db2abe719e92d810e7"; - sha256 = "sha256:1aa2382mi55rp8pd31dz4d94yhfzh30vkggcvmvdfrr4ngffj0dx"; - # date = 2021-10-18T14:15+02:00 - }; - packageName = "mgl-mat"; - buildSystems = [ "mgl-mat" "mgl-mat/test" ]; - parasites = [ "mgl-mat/test" ]; - asdFilesToKeep = [ "mgl-mat.asd" ]; - }; - -}; -in lispPackages diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/openssl-lib-marked.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/openssl-lib-marked.nix deleted file mode 100644 index 186ef14b40..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/openssl-lib-marked.nix +++ /dev/null @@ -1,18 +0,0 @@ -with import ../../../default.nix {}; -runCommand "openssl-lib-marked" {} '' - mkdir -p "$out/lib" - for lib in ssl crypto; do - version="${lib.getVersion openssl}" - ln -s "${lib.getLib openssl}/lib/lib$lib.so" "$out/lib/lib$lib.so.$version" - version="$(echo "$version" | sed -re 's/[a-z]+$//')" - while test -n "$version"; do - ln -sfT "${lib.getLib openssl}/lib/lib$lib.so" "$out/lib/lib$lib.so.$version" - nextversion="''${version%.*}" - if test "$version" = "$nextversion"; then - version= - else - version="$nextversion" - fi - done - done -'' diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/_1am.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/_1am.nix deleted file mode 100644 index 338c9640c3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/_1am.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "_1am"; - version = "20141106-git"; - - description = "A minimal testing framework."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/1am/2014-11-06/1am-20141106-git.tgz"; - sha256 = "0vnnqd4fiq9z34i1k9gqczg3j6xllwba1f6nx0b82sgsdccmsly6"; - }; - - packageName = "1am"; - - asdFilesToKeep = ["1am.asd"]; - overrides = x: x; -} -/* (SYSTEM 1am DESCRIPTION A minimal testing framework. SHA256 - 0vnnqd4fiq9z34i1k9gqczg3j6xllwba1f6nx0b82sgsdccmsly6 URL - http://beta.quicklisp.org/archive/1am/2014-11-06/1am-20141106-git.tgz MD5 - c5e83c329157518e3ebfeef63e4ac269 NAME 1am FILENAME _1am DEPS NIL - DEPENDENCIES NIL VERSION 20141106-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix deleted file mode 100644 index c8855a7f24..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix +++ /dev/null @@ -1,39 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "_3bmd-ext-code-blocks"; - version = "3bmd-20210411-git"; - - description = "extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma"; - - deps = [ args."_3bmd" args."alexandria" args."colorize" args."esrap" args."html-encode" args."split-sequence" args."trivial-with-current-source-form" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz"; - sha256 = "1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp"; - }; - - packageName = "3bmd-ext-code-blocks"; - - asdFilesToKeep = ["3bmd-ext-code-blocks.asd"]; - overrides = x: x; -} -/* (SYSTEM 3bmd-ext-code-blocks DESCRIPTION - extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma - SHA256 1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp URL - http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz MD5 - 09f9290aa1708aeb469fb5154ab1a397 NAME 3bmd-ext-code-blocks FILENAME - _3bmd-ext-code-blocks DEPS - ((NAME 3bmd FILENAME _3bmd) (NAME alexandria FILENAME alexandria) - (NAME colorize FILENAME colorize) (NAME esrap FILENAME esrap) - (NAME html-encode FILENAME html-encode) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-with-current-source-form FILENAME - trivial-with-current-source-form)) - DEPENDENCIES - (3bmd alexandria colorize esrap html-encode split-sequence - trivial-with-current-source-form) - VERSION 3bmd-20210411-git SIBLINGS - (3bmd-ext-definition-lists 3bmd-ext-math 3bmd-ext-tables - 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube 3bmd) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/_3bmd.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/_3bmd.nix deleted file mode 100644 index 630316bc85..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/_3bmd.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "_3bmd"; - version = "20210411-git"; - - description = "markdown processor in CL using esrap parser."; - - deps = [ args."alexandria" args."esrap" args."split-sequence" args."trivial-with-current-source-form" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz"; - sha256 = "1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp"; - }; - - packageName = "3bmd"; - - asdFilesToKeep = ["3bmd.asd"]; - overrides = x: x; -} -/* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256 - 1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp URL - http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz MD5 - 09f9290aa1708aeb469fb5154ab1a397 NAME 3bmd FILENAME _3bmd DEPS - ((NAME alexandria FILENAME alexandria) (NAME esrap FILENAME esrap) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-with-current-source-form FILENAME - trivial-with-current-source-form)) - DEPENDENCIES - (alexandria esrap split-sequence trivial-with-current-source-form) VERSION - 20210411-git SIBLINGS - (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-math - 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/access.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/access.nix deleted file mode 100644 index 755d12b968..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/access.nix +++ /dev/null @@ -1,40 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "access"; - version = "20210124-git"; - - parasites = [ "access-test" ]; - - description = "A library providing functions that unify data-structure access for Common Lisp: - access and (setf access)"; - - deps = [ args."alexandria" args."anaphora" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/access/2021-01-24/access-20210124-git.tgz"; - sha256 = "1n4j15v1ikspchcbb0bn15kk3lh78f6bxk56cs4arimm8bisyqlq"; - }; - - packageName = "access"; - - asdFilesToKeep = ["access.asd"]; - overrides = x: x; -} -/* (SYSTEM access DESCRIPTION - A library providing functions that unify data-structure access for Common Lisp: - access and (setf access) - SHA256 1n4j15v1ikspchcbb0bn15kk3lh78f6bxk56cs4arimm8bisyqlq URL - http://beta.quicklisp.org/archive/access/2021-01-24/access-20210124-git.tgz - MD5 d2d7d9826cbfb3de568d05a4d6bacdbe NAME access FILENAME access DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-unicode FILENAME cl-unicode) - (NAME closer-mop FILENAME closer-mop) - (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) - (NAME named-readtables FILENAME named-readtables)) - DEPENDENCIES - (alexandria anaphora cl-interpol cl-ppcre cl-unicode closer-mop - flexi-streams iterate lisp-unit2 named-readtables) - VERSION 20210124-git SIBLINGS NIL PARASITES (access-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/acclimation.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/acclimation.nix deleted file mode 100644 index a4b7f1cd14..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/acclimation.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "acclimation"; - version = "20200925-git"; - - description = "Library supporting internationalization"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz"; - sha256 = "11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw"; - }; - - packageName = "acclimation"; - - asdFilesToKeep = ["acclimation.asd"]; - overrides = x: x; -} -/* (SYSTEM acclimation DESCRIPTION Library supporting internationalization - SHA256 11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw URL - http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz - MD5 8ce10864baef6fb0e11c78e2ee0b0ddb NAME acclimation FILENAME acclimation - DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS - (acclimation-temperature) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/agutil.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/agutil.nix deleted file mode 100644 index 86e195044e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/agutil.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "agutil"; - version = "20210531-git"; - - description = "A collection of utility functions not found in other utility libraries."; - - deps = [ args."alexandria" args."closer-mop" args."optima" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/agutil/2021-05-31/agutil-20210531-git.tgz"; - sha256 = "01shs4qbr0bzmx9134cm84zbh8whbi2s5xngapd2fl8ag1rda9q1"; - }; - - packageName = "agutil"; - - asdFilesToKeep = ["agutil.asd"]; - overrides = x: x; -} -/* (SYSTEM agutil DESCRIPTION - A collection of utility functions not found in other utility libraries. - SHA256 01shs4qbr0bzmx9134cm84zbh8whbi2s5xngapd2fl8ag1rda9q1 URL - http://beta.quicklisp.org/archive/agutil/2021-05-31/agutil-20210531-git.tgz - MD5 99de7cd320ae2696c1707ca5b55cf40a NAME agutil FILENAME agutil DEPS - ((NAME alexandria FILENAME alexandria) - (NAME closer-mop FILENAME closer-mop) (NAME optima FILENAME optima)) - DEPENDENCIES (alexandria closer-mop optima) VERSION 20210531-git SIBLINGS - NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/alexandria.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/alexandria.nix deleted file mode 100644 index 91fadede82..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/alexandria.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "alexandria"; - version = "20211209-git"; - - description = "Alexandria is a collection of portable public domain utilities."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/alexandria/2021-12-09/alexandria-20211209-git.tgz"; - sha256 = "13xyajg5n3ad3x2hrmzni1w87b0wc41wn7manbvc3dc5n55afxk0"; - }; - - packageName = "alexandria"; - - asdFilesToKeep = ["alexandria.asd"]; - overrides = x: x; -} -/* (SYSTEM alexandria DESCRIPTION - Alexandria is a collection of portable public domain utilities. SHA256 - 13xyajg5n3ad3x2hrmzni1w87b0wc41wn7manbvc3dc5n55afxk0 URL - http://beta.quicklisp.org/archive/alexandria/2021-12-09/alexandria-20211209-git.tgz - MD5 4f578a956567ea0d6c99c2babd1752f3 NAME alexandria FILENAME alexandria - DEPS NIL DEPENDENCIES NIL VERSION 20211209-git SIBLINGS (alexandria-tests) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/anaphora.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/anaphora.nix deleted file mode 100644 index 32091d66e8..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/anaphora.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "anaphora"; - version = "20211209-git"; - - parasites = [ "anaphora/test" ]; - - description = "The Anaphoric Macro Package from Hell"; - - deps = [ args."rt" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/anaphora/2021-12-09/anaphora-20211209-git.tgz"; - sha256 = "1pi166qwf3zwswhgq8c4r84rl5d6lnn0rkb3cdf5afyxmminsadg"; - }; - - packageName = "anaphora"; - - asdFilesToKeep = ["anaphora.asd"]; - overrides = x: x; -} -/* (SYSTEM anaphora DESCRIPTION The Anaphoric Macro Package from Hell SHA256 - 1pi166qwf3zwswhgq8c4r84rl5d6lnn0rkb3cdf5afyxmminsadg URL - http://beta.quicklisp.org/archive/anaphora/2021-12-09/anaphora-20211209-git.tgz - MD5 81827cd43d29293e967916bb11c4df88 NAME anaphora FILENAME anaphora DEPS - ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20211209-git SIBLINGS NIL - PARASITES (anaphora/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/arnesi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/arnesi.nix deleted file mode 100644 index 58ad0deb2a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/arnesi.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "arnesi"; - version = "20170403-git"; - - parasites = [ "arnesi/cl-ppcre-extras" "arnesi/slime-extras" ]; - - description = "A bag-of-tools utilities library used to aid in implementing the bese.it toolkit"; - - deps = [ args."alexandria" args."cl-ppcre" args."closer-mop" args."collectors" args."iterate" args."swank" args."symbol-munger" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz"; - sha256 = "01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4"; - }; - - packageName = "arnesi"; - - asdFilesToKeep = ["arnesi.asd"]; - overrides = x: x; -} -/* (SYSTEM arnesi DESCRIPTION - A bag-of-tools utilities library used to aid in implementing the bese.it toolkit - SHA256 01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4 URL - http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz - MD5 bbb34e1a646b2cc489766690c741d964 NAME arnesi FILENAME arnesi DEPS - ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) (NAME iterate FILENAME iterate) - (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)) - DEPENDENCIES - (alexandria cl-ppcre closer-mop collectors iterate swank symbol-munger) - VERSION 20170403-git SIBLINGS NIL PARASITES - (arnesi/cl-ppcre-extras arnesi/slime-extras)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/array-operations.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/array-operations.nix deleted file mode 100644 index 28c1a9e843..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/array-operations.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "array-operations"; - version = "20210411-git"; - - parasites = [ "array-operations/tests" ]; - - description = "Simple array operations library for Common Lisp."; - - deps = [ args."alexandria" args."anaphora" args."clunit2" args."let-plus" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/array-operations/2021-04-11/array-operations-20210411-git.tgz"; - sha256 = "0l6wxd3a1xdcmcsc93prq8ymainfsy15imiwnaik1i9g94fcbjz8"; - }; - - packageName = "array-operations"; - - asdFilesToKeep = ["array-operations.asd"]; - overrides = x: x; -} -/* (SYSTEM array-operations DESCRIPTION - Simple array operations library for Common Lisp. SHA256 - 0l6wxd3a1xdcmcsc93prq8ymainfsy15imiwnaik1i9g94fcbjz8 URL - http://beta.quicklisp.org/archive/array-operations/2021-04-11/array-operations-20210411-git.tgz - MD5 902c6034c006bc6ca88ef59e7ff2b1aa NAME array-operations FILENAME - array-operations DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME clunit2 FILENAME clunit2) (NAME let-plus FILENAME let-plus)) - DEPENDENCIES (alexandria anaphora clunit2 let-plus) VERSION 20210411-git - SIBLINGS NIL PARASITES (array-operations/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/array-utils.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/array-utils.nix deleted file mode 100644 index d9c4ef608b..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/array-utils.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "array-utils"; - version = "20201220-git"; - - description = "A few utilities for working with arrays."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/array-utils/2020-12-20/array-utils-20201220-git.tgz"; - sha256 = "11y6k8gzzcj00jyccg2k9nh6rvivcvh23z4yzjfly7adygd3n717"; - }; - - packageName = "array-utils"; - - asdFilesToKeep = ["array-utils.asd"]; - overrides = x: x; -} -/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. - SHA256 11y6k8gzzcj00jyccg2k9nh6rvivcvh23z4yzjfly7adygd3n717 URL - http://beta.quicklisp.org/archive/array-utils/2020-12-20/array-utils-20201220-git.tgz - MD5 d6ed906f28c46b2ab0335ec1fc05f8af NAME array-utils FILENAME array-utils - DEPS NIL DEPENDENCIES NIL VERSION 20201220-git SIBLINGS (array-utils-test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/arrows.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/arrows.nix deleted file mode 100644 index 13076ff26e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/arrows.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "arrows"; - version = "20181018-git"; - - parasites = [ "arrows/test" ]; - - description = "Implements -> and ->> from Clojure, as well as several expansions on the -idea."; - - deps = [ args."hu_dot_dwim_dot_stefil" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz"; - sha256 = "1b13pnn71z1dv1cwysh6p5jfgjsp3q8ivsdxfspl1hg1nh9mqa7r"; - }; - - packageName = "arrows"; - - asdFilesToKeep = ["arrows.asd"]; - overrides = x: x; -} -/* (SYSTEM arrows DESCRIPTION - Implements -> and ->> from Clojure, as well as several expansions on the -idea. - SHA256 1b13pnn71z1dv1cwysh6p5jfgjsp3q8ivsdxfspl1hg1nh9mqa7r URL - http://beta.quicklisp.org/archive/arrows/2018-10-18/arrows-20181018-git.tgz - MD5 c60b5d79680de19baad018a0fe87bc48 NAME arrows FILENAME arrows DEPS - ((NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil)) DEPENDENCIES - (hu.dwim.stefil) VERSION 20181018-git SIBLINGS NIL PARASITES (arrows/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/asdf-package-system.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/asdf-package-system.nix deleted file mode 100644 index 58f810fe04..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/asdf-package-system.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "asdf-package-system"; - version = "20150608-git"; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz"; - sha256 = "17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29"; - }; - - packageName = "asdf-package-system"; - - asdFilesToKeep = ["asdf-package-system.asd"]; - overrides = x: x; -} -/* (SYSTEM asdf-package-system DESCRIPTION System lacks description SHA256 - 17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29 URL - http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz - MD5 9eee9d811aec4894843ac1d8ae6cbccd NAME asdf-package-system FILENAME - asdf-package-system DEPS NIL DEPENDENCIES NIL VERSION 20150608-git SIBLINGS - NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/asdf-system-connections.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/asdf-system-connections.nix deleted file mode 100644 index e60b893d8c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/asdf-system-connections.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "asdf-system-connections"; - version = "20170124-git"; - - description = "Allows for ASDF system to be connected so that auto-loading may occur."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz"; - sha256 = "0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq"; - }; - - packageName = "asdf-system-connections"; - - asdFilesToKeep = ["asdf-system-connections.asd"]; - overrides = x: x; -} -/* (SYSTEM asdf-system-connections DESCRIPTION - Allows for ASDF system to be connected so that auto-loading may occur. - SHA256 0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq URL - http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz - MD5 23bdbb69c433568e3e15ed705b803992 NAME asdf-system-connections FILENAME - asdf-system-connections DEPS NIL DEPENDENCIES NIL VERSION 20170124-git - SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/babel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/babel.nix deleted file mode 100644 index 3a54403213..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/babel.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "babel"; - version = "20200925-git"; - - description = "Babel, a charset conversion library."; - - deps = [ args."alexandria" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz"; - sha256 = "1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi"; - }; - - packageName = "babel"; - - asdFilesToKeep = ["babel.asd"]; - overrides = x: x; -} -/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 - 1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi URL - http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz - MD5 7f64d3be80bcba19d9caeaede5dea6d8 NAME babel FILENAME babel DEPS - ((NAME alexandria FILENAME alexandria) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria trivial-features) VERSION 20200925-git SIBLINGS - (babel-streams babel-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/binomial-heap.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/binomial-heap.nix deleted file mode 100644 index a72da04ad7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/binomial-heap.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "binomial-heap"; - version = "20130420-git"; - - description = "A compact binomial heap implementation."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/binomial-heap/2013-04-20/binomial-heap-20130420-git.tgz"; - sha256 = "0fl062psd0jn94raip46lq342xmsq0xgrql6v5f9j9w0ps0dg2ap"; - }; - - packageName = "binomial-heap"; - - asdFilesToKeep = ["binomial-heap.asd"]; - overrides = x: x; -} -/* (SYSTEM binomial-heap DESCRIPTION A compact binomial heap implementation. - SHA256 0fl062psd0jn94raip46lq342xmsq0xgrql6v5f9j9w0ps0dg2ap URL - http://beta.quicklisp.org/archive/binomial-heap/2013-04-20/binomial-heap-20130420-git.tgz - MD5 ca40cb01b88a3fe902cc4cc25fb2d242 NAME binomial-heap FILENAME - binomial-heap DEPS NIL DEPENDENCIES NIL VERSION 20130420-git SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/binpack.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/binpack.nix deleted file mode 100644 index 1e7cf06581..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/binpack.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "binpack"; - version = "20201220-git"; - - parasites = [ "binpack/2" ]; - - description = "Rectangle packer for sprite/texture atlases"; - - deps = [ args."alexandria" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/binpack/2020-12-20/binpack-20201220-git.tgz"; - sha256 = "1kyl19kjsii2nrbf229c5fb3bjw7r25736f991g2j8vig991imwm"; - }; - - packageName = "binpack"; - - asdFilesToKeep = ["binpack.asd"]; - overrides = x: x; -} -/* (SYSTEM binpack DESCRIPTION Rectangle packer for sprite/texture atlases - SHA256 1kyl19kjsii2nrbf229c5fb3bjw7r25736f991g2j8vig991imwm URL - http://beta.quicklisp.org/archive/binpack/2020-12-20/binpack-20201220-git.tgz - MD5 1ac4eaa76586091edb77111ea033f316 NAME binpack FILENAME binpack DEPS - ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION - 20201220-git SIBLINGS (binpack-test) PARASITES (binpack/2)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/blackbird.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/blackbird.nix deleted file mode 100644 index a5457c46b1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/blackbird.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "blackbird"; - version = "20160531-git"; - - description = "A promise implementation for Common Lisp."; - - deps = [ args."vom" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz"; - sha256 = "0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9"; - }; - - packageName = "blackbird"; - - asdFilesToKeep = ["blackbird.asd"]; - overrides = x: x; -} -/* (SYSTEM blackbird DESCRIPTION A promise implementation for Common Lisp. - SHA256 0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9 URL - http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz - MD5 5cb13dc06a0eae8dcba14714d2b5365d NAME blackbird FILENAME blackbird DEPS - ((NAME vom FILENAME vom)) DEPENDENCIES (vom) VERSION 20160531-git SIBLINGS - (blackbird-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/bordeaux-threads.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/bordeaux-threads.nix deleted file mode 100644 index d9947891ae..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/bordeaux-threads.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "bordeaux-threads"; - version = "v0.8.8"; - - parasites = [ "bordeaux-threads/test" ]; - - description = "Bordeaux Threads makes writing portable multi-threaded apps simple."; - - deps = [ args."alexandria" args."fiveam" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz"; - sha256 = "1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp"; - }; - - packageName = "bordeaux-threads"; - - asdFilesToKeep = ["bordeaux-threads.asd"]; - overrides = x: x; -} -/* (SYSTEM bordeaux-threads DESCRIPTION - Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256 - 1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp URL - http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz - MD5 1922316721bcaa10142ed07c31b178e5 NAME bordeaux-threads FILENAME - bordeaux-threads DEPS - ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION v0.8.8 SIBLINGS NIL PARASITES - (bordeaux-threads/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/buildnode-xhtml.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/buildnode-xhtml.nix deleted file mode 100644 index d342871f4d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/buildnode-xhtml.nix +++ /dev/null @@ -1,49 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "buildnode-xhtml"; - version = "buildnode-20170403-git"; - - description = "Tool for building up an xml dom of an excel spreadsheet nicely."; - - deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; - sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6"; - }; - - packageName = "buildnode-xhtml"; - - asdFilesToKeep = ["buildnode-xhtml.asd"]; - overrides = x: x; -} -/* (SYSTEM buildnode-xhtml DESCRIPTION - Tool for building up an xml dom of an excel spreadsheet nicely. SHA256 - 1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6 URL - http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz - MD5 b917f0d6c20489febbef0d5b954c350d NAME buildnode-xhtml FILENAME - buildnode-xhtml DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME buildnode FILENAME buildnode) - (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-unicode FILENAME cl-unicode) - (NAME closer-mop FILENAME closer-mop) - (NAME closure-common FILENAME closure-common) - (NAME closure-html FILENAME closure-html) - (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) - (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) - (NAME named-readtables FILENAME named-readtables) - (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) - (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES - (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop - closure-common closure-html collectors cxml flexi-streams iterate - named-readtables puri split-sequence swank symbol-munger trivial-features - trivial-gray-streams) - VERSION buildnode-20170403-git SIBLINGS - (buildnode-excel buildnode-html5 buildnode-kml buildnode-xul buildnode) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/buildnode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/buildnode.nix deleted file mode 100644 index f8a8ca8bfb..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/buildnode.nix +++ /dev/null @@ -1,50 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "buildnode"; - version = "20170403-git"; - - parasites = [ "buildnode-test" ]; - - description = "Tool for building up an xml dom nicely."; - - deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz"; - sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6"; - }; - - packageName = "buildnode"; - - asdFilesToKeep = ["buildnode.asd"]; - overrides = x: x; -} -/* (SYSTEM buildnode DESCRIPTION Tool for building up an xml dom nicely. SHA256 - 1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6 URL - http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz - MD5 b917f0d6c20489febbef0d5b954c350d NAME buildnode FILENAME buildnode DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME buildnode-xhtml FILENAME buildnode-xhtml) - (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-unicode FILENAME cl-unicode) - (NAME closer-mop FILENAME closer-mop) - (NAME closure-common FILENAME closure-common) - (NAME closure-html FILENAME closure-html) - (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) - (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) - (NAME named-readtables FILENAME named-readtables) - (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) - (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES - (alexandria babel buildnode-xhtml cl-interpol cl-ppcre cl-unicode - closer-mop closure-common closure-html collectors cxml flexi-streams - iterate lisp-unit2 named-readtables puri split-sequence swank - symbol-munger trivial-features trivial-gray-streams) - VERSION 20170403-git SIBLINGS - (buildnode-excel buildnode-html5 buildnode-kml buildnode-xhtml - buildnode-xul) - PARASITES (buildnode-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/calispel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/calispel.nix deleted file mode 100644 index d970f413be..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/calispel.nix +++ /dev/null @@ -1,36 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "calispel"; - version = "20170830-git"; - - parasites = [ "calispel-test" ]; - - description = "Thread-safe message-passing channels, in the style of -the occam programming language."; - - deps = [ args."alexandria" args."bordeaux-threads" args."eager-future2" args."jpl-queues" args."jpl-util" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz"; - sha256 = "0qwmzmyh63jlw5bdv4wf458n1dz9k77gd5b4ix1kd6xrzx247k7i"; - }; - - packageName = "calispel"; - - asdFilesToKeep = ["calispel.asd"]; - overrides = x: x; -} -/* (SYSTEM calispel DESCRIPTION - Thread-safe message-passing channels, in the style of -the occam programming language. - SHA256 0qwmzmyh63jlw5bdv4wf458n1dz9k77gd5b4ix1kd6xrzx247k7i URL - http://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz - MD5 1fba6e4b2055f5d1f0a78387e29552b1 NAME calispel FILENAME calispel DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME eager-future2 FILENAME eager-future2) - (NAME jpl-queues FILENAME jpl-queues) (NAME jpl-util FILENAME jpl-util)) - DEPENDENCIES - (alexandria bordeaux-threads eager-future2 jpl-queues jpl-util) VERSION - 20170830-git SIBLINGS NIL PARASITES (calispel-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi-grovel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi-grovel.nix deleted file mode 100644 index b33f95934f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi-grovel.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cffi-grovel"; - version = "cffi_0.24.1"; - - description = "The CFFI Groveller"; - - deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz"; - sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh"; - }; - - packageName = "cffi-grovel"; - - asdFilesToKeep = ["cffi-grovel.asd"]; - overrides = x: x; -} -/* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 - 1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL - http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5 - c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi-grovel FILENAME cffi-grovel DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi cffi-toolchain trivial-features) - VERSION cffi_0.24.1 SIBLINGS - (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi-toolchain.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi-toolchain.nix deleted file mode 100644 index e109904cda..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi-toolchain.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cffi-toolchain"; - version = "cffi_0.24.1"; - - description = "The CFFI toolchain"; - - deps = [ args."alexandria" args."asdf" args."babel" args."cffi" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz"; - sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh"; - }; - - packageName = "cffi-toolchain"; - - asdFilesToKeep = ["cffi-toolchain.asd"]; - overrides = x: x; -} -/* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256 - 1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL - http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5 - c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi-toolchain FILENAME - cffi-toolchain DEPS - ((NAME alexandria FILENAME alexandria) (NAME asdf FILENAME asdf) - (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria asdf babel cffi trivial-features) VERSION - cffi_0.24.1 SIBLINGS - (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi-uffi-compat.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi-uffi-compat.nix deleted file mode 100644 index 822b7a8116..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi-uffi-compat.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cffi-uffi-compat"; - version = "cffi_0.24.1"; - - description = "UFFI Compatibility Layer for CFFI"; - - deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz"; - sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh"; - }; - - packageName = "cffi-uffi-compat"; - - asdFilesToKeep = ["cffi-uffi-compat.asd"]; - overrides = x: x; -} -/* (SYSTEM cffi-uffi-compat DESCRIPTION UFFI Compatibility Layer for CFFI - SHA256 1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL - http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5 - c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi-uffi-compat FILENAME - cffi-uffi-compat DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.24.1 - SIBLINGS - (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi.nix deleted file mode 100644 index 0738ea5909..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cffi.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cffi"; - version = "cffi_0.24.1"; - - parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ]; - - description = "The Common Foreign Function Interface"; - - deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz"; - sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh"; - }; - - packageName = "cffi"; - - asdFilesToKeep = ["cffi.asd"]; - overrides = x: x; -} -/* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 - 1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL - http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5 - c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi FILENAME cffi DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME trivial-features FILENAME trivial-features) - (NAME uiop FILENAME uiop)) - DEPENDENCIES (alexandria babel cl-json cl-ppcre trivial-features uiop) - VERSION cffi_0.24.1 SIBLINGS - (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain - cffi-uffi-compat) - PARASITES (cffi/c2ffi cffi/c2ffi-generator)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/chanl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/chanl.nix deleted file mode 100644 index 8e32a0b1ab..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/chanl.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "chanl"; - version = "20210411-git"; - - parasites = [ "chanl/examples" "chanl/tests" ]; - - description = "Communicating Sequential Process support for Common Lisp"; - - deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/chanl/2021-04-11/chanl-20210411-git.tgz"; - sha256 = "1c1yiw616q5hv6vzyg1y4kg68v94p37s5jrq387rwadfnnf46rgi"; - }; - - packageName = "chanl"; - - asdFilesToKeep = ["chanl.asd"]; - overrides = x: x; -} -/* (SYSTEM chanl DESCRIPTION - Communicating Sequential Process support for Common Lisp SHA256 - 1c1yiw616q5hv6vzyg1y4kg68v94p37s5jrq387rwadfnnf46rgi URL - http://beta.quicklisp.org/archive/chanl/2021-04-11/chanl-20210411-git.tgz - MD5 efaa5705b5feaa718290d25a95e2a684 NAME chanl FILENAME chanl DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria bordeaux-threads fiveam) VERSION 20210411-git - SIBLINGS NIL PARASITES (chanl/examples chanl/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/check-it.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/check-it.nix deleted file mode 100644 index 989cb5a75c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/check-it.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "check-it"; - version = "20150709-git"; - - parasites = [ "check-it-test" ]; - - description = "A randomized property-based testing tool for Common Lisp."; - - deps = [ args."alexandria" args."closer-mop" args."optima" args."stefil" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz"; - sha256 = "1bx3ndkkl3w7clkqplhy6c2sz46pcp5w76j610gynzv7scz72iw2"; - }; - - packageName = "check-it"; - - asdFilesToKeep = ["check-it.asd"]; - overrides = x: x; -} -/* (SYSTEM check-it DESCRIPTION - A randomized property-based testing tool for Common Lisp. SHA256 - 1bx3ndkkl3w7clkqplhy6c2sz46pcp5w76j610gynzv7scz72iw2 URL - http://beta.quicklisp.org/archive/check-it/2015-07-09/check-it-20150709-git.tgz - MD5 0baae55e5a9c8c884202cbc51e634c42 NAME check-it FILENAME check-it DEPS - ((NAME alexandria FILENAME alexandria) - (NAME closer-mop FILENAME closer-mop) (NAME optima FILENAME optima) - (NAME stefil FILENAME stefil)) - DEPENDENCIES (alexandria closer-mop optima stefil) VERSION 20150709-git - SIBLINGS NIL PARASITES (check-it-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/chipz.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/chipz.nix deleted file mode 100644 index a9438deca7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/chipz.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "chipz"; - version = "20210807-git"; - - description = "A library for decompressing deflate, zlib, and gzip data"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/chipz/2021-08-07/chipz-20210807-git.tgz"; - sha256 = "0g7xhh4yq9azjq7gnszaq2kbxima2q30apb3rrglc1ign973hr8x"; - }; - - packageName = "chipz"; - - asdFilesToKeep = ["chipz.asd"]; - overrides = x: x; -} -/* (SYSTEM chipz DESCRIPTION - A library for decompressing deflate, zlib, and gzip data SHA256 - 0g7xhh4yq9azjq7gnszaq2kbxima2q30apb3rrglc1ign973hr8x URL - http://beta.quicklisp.org/archive/chipz/2021-08-07/chipz-20210807-git.tgz - MD5 11438e3bc60c39294c337cb232ae8040 NAME chipz FILENAME chipz DEPS NIL - DEPENDENCIES NIL VERSION 20210807-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/chunga.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/chunga.nix deleted file mode 100644 index 6c52cc5f9f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/chunga.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "chunga"; - version = "20200427-git"; - - description = "System lacks description"; - - deps = [ args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz"; - sha256 = "0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk"; - }; - - packageName = "chunga"; - - asdFilesToKeep = ["chunga.asd"]; - overrides = x: x; -} -/* (SYSTEM chunga DESCRIPTION System lacks description SHA256 - 0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk URL - http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz - MD5 ec31aa63a1b594a197ad45e5e65c4cc4 NAME chunga FILENAME chunga DEPS - ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 20200427-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/circular-streams.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/circular-streams.nix deleted file mode 100644 index d6b31a6609..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/circular-streams.nix +++ /dev/null @@ -1,37 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "circular-streams"; - version = "20161204-git"; - - description = "Circularly readable streams for Common Lisp"; - - deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz"; - sha256 = "1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128"; - }; - - packageName = "circular-streams"; - - asdFilesToKeep = ["circular-streams.asd"]; - overrides = x: x; -} -/* (SYSTEM circular-streams DESCRIPTION - Circularly readable streams for Common Lisp SHA256 - 1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128 URL - http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz - MD5 2383f3b82fa3335d9106e1354a678db8 NAME circular-streams FILENAME - circular-streams DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME fast-io FILENAME fast-io) - (NAME static-vectors FILENAME static-vectors) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES - (alexandria babel cffi cffi-grovel cffi-toolchain fast-io static-vectors - trivial-features trivial-gray-streams) - VERSION 20161204-git SIBLINGS (circular-streams-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-aa.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-aa.nix deleted file mode 100644 index 01364e97ed..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-aa.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-aa"; - version = "cl-vectors-20180228-git"; - - description = "cl-aa: polygon rasterizer"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; - }; - - packageName = "cl-aa"; - - asdFilesToKeep = ["cl-aa.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 - 0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly URL - http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz - MD5 9d9629786d4f2c19c15cc6cd3049c343 NAME cl-aa FILENAME cl-aa DEPS NIL - DEPENDENCIES NIL VERSION cl-vectors-20180228-git SIBLINGS - (cl-aa-misc cl-paths-ttf cl-paths cl-vectors) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-annot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-annot.nix deleted file mode 100644 index e6d317b598..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-annot.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-annot"; - version = "20150608-git"; - - description = "Python-like Annotation Syntax for Common Lisp"; - - deps = [ args."alexandria" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz"; - sha256 = "0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3"; - }; - - packageName = "cl-annot"; - - asdFilesToKeep = ["cl-annot.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-annot DESCRIPTION Python-like Annotation Syntax for Common Lisp - SHA256 0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3 URL - http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz - MD5 35d8f79311bda4dd86002d11edcd0a21 NAME cl-annot FILENAME cl-annot DEPS - ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION - 20150608-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-anonfun.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-anonfun.nix deleted file mode 100644 index d2dd93228f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-anonfun.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-anonfun"; - version = "20111203-git"; - - description = "Anonymous function helpers for Common Lisp"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz"; - sha256 = "16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m"; - }; - - packageName = "cl-anonfun"; - - asdFilesToKeep = ["cl-anonfun.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-anonfun DESCRIPTION Anonymous function helpers for Common Lisp - SHA256 16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m URL - http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz - MD5 915bda1a7653d42090f8d20a1ad85d0b NAME cl-anonfun FILENAME cl-anonfun - DEPS NIL DEPENDENCIES NIL VERSION 20111203-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ansi-text.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ansi-text.nix deleted file mode 100644 index ad02d8c1ba..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ansi-text.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-ansi-text"; - version = "20211020-git"; - - description = "ANSI control string characters, focused on color"; - - deps = [ args."alexandria" args."cl-colors2" args."cl-ppcre" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz"; - sha256 = "1lmxmdf4sm7apkczp0y07rlsayc5adyv2i85r6p7s60w6sianjr6"; - }; - - packageName = "cl-ansi-text"; - - asdFilesToKeep = ["cl-ansi-text.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-ansi-text DESCRIPTION - ANSI control string characters, focused on color SHA256 - 1lmxmdf4sm7apkczp0y07rlsayc5adyv2i85r6p7s60w6sianjr6 URL - http://beta.quicklisp.org/archive/cl-ansi-text/2021-10-20/cl-ansi-text-20211020-git.tgz - MD5 5411766beeb4180218b449454b67837f NAME cl-ansi-text FILENAME - cl-ansi-text DEPS - ((NAME alexandria FILENAME alexandria) - (NAME cl-colors2 FILENAME cl-colors2) (NAME cl-ppcre FILENAME cl-ppcre)) - DEPENDENCIES (alexandria cl-colors2 cl-ppcre) VERSION 20211020-git SIBLINGS - (cl-ansi-text.test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ascii-table.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ascii-table.nix deleted file mode 100644 index aae1b84875..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ascii-table.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-ascii-table"; - version = "20200610-git"; - - description = "Common Lisp library to present tabular data in ascii-art table."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-ascii-table/2020-06-10/cl-ascii-table-20200610-git.tgz"; - sha256 = "00395cbmjwlywyks3zd4mqp0w7yyms61ywp06knv1gbf847vy7yi"; - }; - - packageName = "cl-ascii-table"; - - asdFilesToKeep = ["cl-ascii-table.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-ascii-table DESCRIPTION - Common Lisp library to present tabular data in ascii-art table. SHA256 - 00395cbmjwlywyks3zd4mqp0w7yyms61ywp06knv1gbf847vy7yi URL - http://beta.quicklisp.org/archive/cl-ascii-table/2020-06-10/cl-ascii-table-20200610-git.tgz - MD5 6f2eaaae3fb03ba719d77ed3ffaeaf4f NAME cl-ascii-table FILENAME - cl-ascii-table DEPS NIL DEPENDENCIES NIL VERSION 20200610-git SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-async-repl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-async-repl.nix deleted file mode 100644 index c250b53675..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-async-repl.nix +++ /dev/null @@ -1,44 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-async-repl"; - version = "cl-async-20211020-git"; - - description = "REPL integration for CL-ASYNC."; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-async/2021-10-20/cl-async-20211020-git.tgz"; - sha256 = "1b3bwqvzw2pc83m4x8vbbxyriq58g0j3738mzq68v689zl071dl0"; - }; - - packageName = "cl-async-repl"; - - asdFilesToKeep = ["cl-async-repl.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 - 1b3bwqvzw2pc83m4x8vbbxyriq58g0j3738mzq68v689zl071dl0 URL - http://beta.quicklisp.org/archive/cl-async/2021-10-20/cl-async-20211020-git.tgz - MD5 0e0cd11758e93a91b39ad726fb1051cc NAME cl-async-repl FILENAME - cl-async-repl DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME cl-async FILENAME cl-async) - (NAME cl-async-base FILENAME cl-async-base) - (NAME cl-async-util FILENAME cl-async-util) - (NAME cl-libuv FILENAME cl-libuv) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME fast-io FILENAME fast-io) - (NAME static-vectors FILENAME static-vectors) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME vom FILENAME vom)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async - cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors - trivial-features trivial-gray-streams vom) - VERSION cl-async-20211020-git SIBLINGS - (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-async-ssl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-async-ssl.nix deleted file mode 100644 index 14430f5369..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-async-ssl.nix +++ /dev/null @@ -1,45 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-async-ssl"; - version = "cl-async-20211020-git"; - - description = "SSL Wrapper around cl-async socket implementation."; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-async/2021-10-20/cl-async-20211020-git.tgz"; - sha256 = "1b3bwqvzw2pc83m4x8vbbxyriq58g0j3738mzq68v689zl071dl0"; - }; - - packageName = "cl-async-ssl"; - - asdFilesToKeep = ["cl-async-ssl.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-async-ssl DESCRIPTION - SSL Wrapper around cl-async socket implementation. SHA256 - 1b3bwqvzw2pc83m4x8vbbxyriq58g0j3738mzq68v689zl071dl0 URL - http://beta.quicklisp.org/archive/cl-async/2021-10-20/cl-async-20211020-git.tgz - MD5 0e0cd11758e93a91b39ad726fb1051cc NAME cl-async-ssl FILENAME - cl-async-ssl DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME cl-async FILENAME cl-async) - (NAME cl-async-base FILENAME cl-async-base) - (NAME cl-async-util FILENAME cl-async-util) - (NAME cl-libuv FILENAME cl-libuv) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME fast-io FILENAME fast-io) - (NAME static-vectors FILENAME static-vectors) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME vom FILENAME vom)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async - cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors - trivial-features trivial-gray-streams vom) - VERSION cl-async-20211020-git SIBLINGS - (cl-async-repl cl-async-test cl-async) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-async.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-async.nix deleted file mode 100644 index ff57643ed5..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-async.nix +++ /dev/null @@ -1,42 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-async"; - version = "20211020-git"; - - parasites = [ "cl-async-base" "cl-async-util" ]; - - description = "Asynchronous operations for Common Lisp."; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-async/2021-10-20/cl-async-20211020-git.tgz"; - sha256 = "1b3bwqvzw2pc83m4x8vbbxyriq58g0j3738mzq68v689zl071dl0"; - }; - - packageName = "cl-async"; - - asdFilesToKeep = ["cl-async.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 - 1b3bwqvzw2pc83m4x8vbbxyriq58g0j3738mzq68v689zl071dl0 URL - http://beta.quicklisp.org/archive/cl-async/2021-10-20/cl-async-20211020-git.tgz - MD5 0e0cd11758e93a91b39ad726fb1051cc NAME cl-async FILENAME cl-async DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME cl-libuv FILENAME cl-libuv) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME fast-io FILENAME fast-io) - (NAME static-vectors FILENAME static-vectors) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME uiop FILENAME uiop) (NAME vom FILENAME vom)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv - cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop - vom) - VERSION 20211020-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) - PARASITES (cl-async-base cl-async-util)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-base64.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-base64.nix deleted file mode 100644 index 9216c4d8a2..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-base64.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-base64"; - version = "20201016-git"; - - parasites = [ "cl-base64/test" ]; - - description = "Base64 encoding and decoding with URI support."; - - deps = [ args."kmrcl" args."ptester" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz"; - sha256 = "1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z"; - }; - - packageName = "cl-base64"; - - asdFilesToKeep = ["cl-base64.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-base64 DESCRIPTION Base64 encoding and decoding with URI support. - SHA256 1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z URL - http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz - MD5 f556f7c61f785c84abdc1beb63c906ae NAME cl-base64 FILENAME cl-base64 DEPS - ((NAME kmrcl FILENAME kmrcl) (NAME ptester FILENAME ptester)) DEPENDENCIES - (kmrcl ptester) VERSION 20201016-git SIBLINGS NIL PARASITES - (cl-base64/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix deleted file mode 100644 index 9a7f3e1549..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix +++ /dev/null @@ -1,40 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-cffi-gtk-cairo"; - version = "cl-cffi-gtk-20201220-git"; - - description = "A Lisp binding to Cairo"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."iterate" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; - }; - - packageName = "cl-cffi-gtk-cairo"; - - asdFilesToKeep = ["cl-cffi-gtk-cairo.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-cffi-gtk-cairo DESCRIPTION A Lisp binding to Cairo SHA256 - 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL - http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz - MD5 954beac0970a46263153c2863ad1cb5f NAME cl-cffi-gtk-cairo FILENAME - cl-cffi-gtk-cairo DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) - (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) - (NAME iterate FILENAME iterate) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cl-cffi-gtk-glib iterate - trivial-features) - VERSION cl-cffi-gtk-20201220-git SIBLINGS - (cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib cl-cffi-gtk-demo-gobject - cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo cl-cffi-gtk-gdk-pixbuf - cl-cffi-gtk-gdk cl-cffi-gtk-gio cl-cffi-gtk-glib cl-cffi-gtk-gobject - cl-cffi-gtk cl-cffi-gtk-pango) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix deleted file mode 100644 index 52a7742e0a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix +++ /dev/null @@ -1,42 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-cffi-gtk-gdk-pixbuf"; - version = "cl-cffi-gtk-20201220-git"; - - description = "A Lisp binding to GDK Pixbuf 2"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; - }; - - packageName = "cl-cffi-gtk-gdk-pixbuf"; - - asdFilesToKeep = ["cl-cffi-gtk-gdk-pixbuf.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-cffi-gtk-gdk-pixbuf DESCRIPTION A Lisp binding to GDK Pixbuf 2 - SHA256 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL - http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz - MD5 954beac0970a46263153c2863ad1cb5f NAME cl-cffi-gtk-gdk-pixbuf FILENAME - cl-cffi-gtk-gdk-pixbuf DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) - (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) - (NAME cl-cffi-gtk-gobject FILENAME cl-cffi-gtk-gobject) - (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cl-cffi-gtk-glib - cl-cffi-gtk-gobject closer-mop iterate trivial-features trivial-garbage) - VERSION cl-cffi-gtk-20201220-git SIBLINGS - (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib - cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo - cl-cffi-gtk-gdk cl-cffi-gtk-gio cl-cffi-gtk-glib cl-cffi-gtk-gobject - cl-cffi-gtk cl-cffi-gtk-pango) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix deleted file mode 100644 index 17d24dcaf1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix +++ /dev/null @@ -1,48 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-cffi-gtk-gdk"; - version = "cl-cffi-gtk-20201220-git"; - - description = "A Lisp binding to GDK 3"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; - }; - - packageName = "cl-cffi-gtk-gdk"; - - asdFilesToKeep = ["cl-cffi-gtk-gdk.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-cffi-gtk-gdk DESCRIPTION A Lisp binding to GDK 3 SHA256 - 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL - http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz - MD5 954beac0970a46263153c2863ad1cb5f NAME cl-cffi-gtk-gdk FILENAME - cl-cffi-gtk-gdk DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) - (NAME cl-cffi-gtk-cairo FILENAME cl-cffi-gtk-cairo) - (NAME cl-cffi-gtk-gdk-pixbuf FILENAME cl-cffi-gtk-gdk-pixbuf) - (NAME cl-cffi-gtk-gio FILENAME cl-cffi-gtk-gio) - (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) - (NAME cl-cffi-gtk-gobject FILENAME cl-cffi-gtk-gobject) - (NAME cl-cffi-gtk-pango FILENAME cl-cffi-gtk-pango) - (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cl-cffi-gtk-cairo - cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gio cl-cffi-gtk-glib - cl-cffi-gtk-gobject cl-cffi-gtk-pango closer-mop iterate trivial-features - trivial-garbage) - VERSION cl-cffi-gtk-20201220-git SIBLINGS - (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib - cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo - cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gio cl-cffi-gtk-glib - cl-cffi-gtk-gobject cl-cffi-gtk cl-cffi-gtk-pango) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix deleted file mode 100644 index 8cfda7f850..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix +++ /dev/null @@ -1,42 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-cffi-gtk-gio"; - version = "cl-cffi-gtk-20201220-git"; - - description = "A Lisp binding to GIO 2"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; - }; - - packageName = "cl-cffi-gtk-gio"; - - asdFilesToKeep = ["cl-cffi-gtk-gio.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-cffi-gtk-gio DESCRIPTION A Lisp binding to GIO 2 SHA256 - 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL - http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz - MD5 954beac0970a46263153c2863ad1cb5f NAME cl-cffi-gtk-gio FILENAME - cl-cffi-gtk-gio DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) - (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) - (NAME cl-cffi-gtk-gobject FILENAME cl-cffi-gtk-gobject) - (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cl-cffi-gtk-glib - cl-cffi-gtk-gobject closer-mop iterate trivial-features trivial-garbage) - VERSION cl-cffi-gtk-20201220-git SIBLINGS - (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib - cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo - cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gdk cl-cffi-gtk-glib - cl-cffi-gtk-gobject cl-cffi-gtk cl-cffi-gtk-pango) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix deleted file mode 100644 index 6187ba1545..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix +++ /dev/null @@ -1,37 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-cffi-gtk-glib"; - version = "cl-cffi-gtk-20201220-git"; - - description = "A Lisp binding to GLib 2"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."iterate" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; - }; - - packageName = "cl-cffi-gtk-glib"; - - asdFilesToKeep = ["cl-cffi-gtk-glib.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-cffi-gtk-glib DESCRIPTION A Lisp binding to GLib 2 SHA256 - 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL - http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz - MD5 954beac0970a46263153c2863ad1cb5f NAME cl-cffi-gtk-glib FILENAME - cl-cffi-gtk-glib DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi iterate trivial-features) VERSION - cl-cffi-gtk-20201220-git SIBLINGS - (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib - cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo - cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gdk cl-cffi-gtk-gio cl-cffi-gtk-gobject - cl-cffi-gtk cl-cffi-gtk-pango) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix deleted file mode 100644 index 8f027fc2a0..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix +++ /dev/null @@ -1,41 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-cffi-gtk-gobject"; - version = "cl-cffi-gtk-20201220-git"; - - description = "A Lisp binding GObject 2"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; - }; - - packageName = "cl-cffi-gtk-gobject"; - - asdFilesToKeep = ["cl-cffi-gtk-gobject.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-cffi-gtk-gobject DESCRIPTION A Lisp binding GObject 2 SHA256 - 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL - http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz - MD5 954beac0970a46263153c2863ad1cb5f NAME cl-cffi-gtk-gobject FILENAME - cl-cffi-gtk-gobject DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) - (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) - (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cl-cffi-gtk-glib closer-mop iterate - trivial-features trivial-garbage) - VERSION cl-cffi-gtk-20201220-git SIBLINGS - (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib - cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo - cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gdk cl-cffi-gtk-gio cl-cffi-gtk-glib - cl-cffi-gtk cl-cffi-gtk-pango) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix deleted file mode 100644 index b4466fe7b4..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix +++ /dev/null @@ -1,43 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-cffi-gtk-pango"; - version = "cl-cffi-gtk-20201220-git"; - - description = "A Lisp binding to Pango"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; - }; - - packageName = "cl-cffi-gtk-pango"; - - asdFilesToKeep = ["cl-cffi-gtk-pango.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-cffi-gtk-pango DESCRIPTION A Lisp binding to Pango SHA256 - 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL - http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz - MD5 954beac0970a46263153c2863ad1cb5f NAME cl-cffi-gtk-pango FILENAME - cl-cffi-gtk-pango DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) - (NAME cl-cffi-gtk-cairo FILENAME cl-cffi-gtk-cairo) - (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) - (NAME cl-cffi-gtk-gobject FILENAME cl-cffi-gtk-gobject) - (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cl-cffi-gtk-cairo cl-cffi-gtk-glib - cl-cffi-gtk-gobject closer-mop iterate trivial-features trivial-garbage) - VERSION cl-cffi-gtk-20201220-git SIBLINGS - (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib - cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo - cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gdk cl-cffi-gtk-gio cl-cffi-gtk-glib - cl-cffi-gtk-gobject cl-cffi-gtk) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk.nix deleted file mode 100644 index 1daeedb326..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cffi-gtk.nix +++ /dev/null @@ -1,49 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-cffi-gtk"; - version = "20201220-git"; - - description = "A Lisp binding to GTK 3"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz"; - sha256 = "15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1"; - }; - - packageName = "cl-cffi-gtk"; - - asdFilesToKeep = ["cl-cffi-gtk.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-cffi-gtk DESCRIPTION A Lisp binding to GTK 3 SHA256 - 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL - http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz - MD5 954beac0970a46263153c2863ad1cb5f NAME cl-cffi-gtk FILENAME cl-cffi-gtk - DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) - (NAME cl-cffi-gtk-cairo FILENAME cl-cffi-gtk-cairo) - (NAME cl-cffi-gtk-gdk FILENAME cl-cffi-gtk-gdk) - (NAME cl-cffi-gtk-gdk-pixbuf FILENAME cl-cffi-gtk-gdk-pixbuf) - (NAME cl-cffi-gtk-gio FILENAME cl-cffi-gtk-gio) - (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) - (NAME cl-cffi-gtk-gobject FILENAME cl-cffi-gtk-gobject) - (NAME cl-cffi-gtk-pango FILENAME cl-cffi-gtk-pango) - (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cl-cffi-gtk-cairo cl-cffi-gtk-gdk - cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gio cl-cffi-gtk-glib - cl-cffi-gtk-gobject cl-cffi-gtk-pango closer-mop iterate trivial-features - trivial-garbage) - VERSION 20201220-git SIBLINGS - (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib - cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo - cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gdk cl-cffi-gtk-gio cl-cffi-gtk-glib - cl-cffi-gtk-gobject cl-cffi-gtk-pango) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-change-case.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-change-case.nix deleted file mode 100644 index 99ff56f9b1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-change-case.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-change-case"; - version = "20210411-git"; - - parasites = [ "cl-change-case/test" ]; - - description = "Convert strings between camelCase, param-case, PascalCase and more"; - - deps = [ args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."fiveam" args."flexi-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-change-case/2021-04-11/cl-change-case-20210411-git.tgz"; - sha256 = "14s26b907h1nsnwdqbj6j4c9bvc4rc2l8ry2q1j7ibjfzqvhp4mj"; - }; - - packageName = "cl-change-case"; - - asdFilesToKeep = ["cl-change-case.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-change-case DESCRIPTION - Convert strings between camelCase, param-case, PascalCase and more SHA256 - 14s26b907h1nsnwdqbj6j4c9bvc4rc2l8ry2q1j7ibjfzqvhp4mj URL - http://beta.quicklisp.org/archive/cl-change-case/2021-04-11/cl-change-case-20210411-git.tgz - MD5 df72a3d71a6c65e149704688aec859b9 NAME cl-change-case FILENAME - cl-change-case DEPS - ((NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode) - (NAME cl-unicode FILENAME cl-unicode) (NAME fiveam FILENAME fiveam) - (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre cl-ppcre-unicode cl-unicode fiveam flexi-streams) - VERSION 20210411-git SIBLINGS NIL PARASITES (cl-change-case/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cli.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cli.nix deleted file mode 100644 index 1da195bab7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cli.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-cli"; - version = "20151218-git"; - - description = "Command line parser"; - - deps = [ args."split-sequence" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz"; - sha256 = "0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay"; - }; - - packageName = "cl-cli"; - - asdFilesToKeep = ["cl-cli.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-cli DESCRIPTION Command line parser SHA256 - 0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay URL - http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz - MD5 820e5c7dde6800fcfa44b1fbc7a9d62b NAME cl-cli FILENAME cl-cli DEPS - ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES - (split-sequence) VERSION 20151218-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-colors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-colors.nix deleted file mode 100644 index 898ec553aa..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-colors.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-colors"; - version = "20180328-git"; - - parasites = [ "cl-colors-tests" ]; - - description = "Simple color library for Common Lisp"; - - deps = [ args."alexandria" args."anaphora" args."let-plus" args."lift" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz"; - sha256 = "0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a"; - }; - - packageName = "cl-colors"; - - asdFilesToKeep = ["cl-colors.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-colors DESCRIPTION Simple color library for Common Lisp SHA256 - 0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a URL - http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz - MD5 5e59ea59b32a0254df9610a5662ae2ec NAME cl-colors FILENAME cl-colors DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME let-plus FILENAME let-plus) (NAME lift FILENAME lift)) - DEPENDENCIES (alexandria anaphora let-plus lift) VERSION 20180328-git - SIBLINGS NIL PARASITES (cl-colors-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-colors2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-colors2.nix deleted file mode 100644 index b9a55128d9..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-colors2.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-colors2"; - version = "20211020-git"; - - parasites = [ "cl-colors2/tests" ]; - - description = "Simple color library for Common Lisp"; - - deps = [ args."alexandria" args."cl-ppcre" args."clunit2" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-colors2/2021-10-20/cl-colors2-20211020-git.tgz"; - sha256 = "1vkhcyflp173szwnd1xg7hk0h1f3144qzwnsdv6a16rlxjz9h804"; - }; - - packageName = "cl-colors2"; - - asdFilesToKeep = ["cl-colors2.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-colors2 DESCRIPTION Simple color library for Common Lisp SHA256 - 1vkhcyflp173szwnd1xg7hk0h1f3144qzwnsdv6a16rlxjz9h804 URL - http://beta.quicklisp.org/archive/cl-colors2/2021-10-20/cl-colors2-20211020-git.tgz - MD5 13fd422daa03328c909d1578d65f6222 NAME cl-colors2 FILENAME cl-colors2 - DEPS - ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME clunit2 FILENAME clunit2)) - DEPENDENCIES (alexandria cl-ppcre clunit2) VERSION 20211020-git SIBLINGS - NIL PARASITES (cl-colors2/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-containers.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-containers.nix deleted file mode 100644 index 66438b129c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-containers.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-containers"; - version = "20200427-git"; - - parasites = [ "cl-containers/with-moptilities" "cl-containers/with-utilities" ]; - - description = "A generic container library for Common Lisp"; - - deps = [ args."asdf-system-connections" args."metatilities-base" args."moptilities" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz"; - sha256 = "0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy"; - }; - - packageName = "cl-containers"; - - asdFilesToKeep = ["cl-containers.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-containers DESCRIPTION - A generic container library for Common Lisp SHA256 - 0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy URL - http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz - MD5 bb0e03a581e9b617dd166a3f511eaf6a NAME cl-containers FILENAME - cl-containers DEPS - ((NAME asdf-system-connections FILENAME asdf-system-connections) - (NAME metatilities-base FILENAME metatilities-base) - (NAME moptilities FILENAME moptilities)) - DEPENDENCIES (asdf-system-connections metatilities-base moptilities) - VERSION 20200427-git SIBLINGS (cl-containers-test) PARASITES - (cl-containers/with-moptilities cl-containers/with-utilities)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cookie.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cookie.nix deleted file mode 100644 index 2d0916dcff..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cookie.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-cookie"; - version = "20191007-git"; - - description = "HTTP cookie manager"; - - deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."local-time" args."proc-parse" args."quri" args."split-sequence" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz"; - sha256 = "1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh"; - }; - - packageName = "cl-cookie"; - - asdFilesToKeep = ["cl-cookie.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-cookie DESCRIPTION HTTP cookie manager SHA256 - 1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh URL - http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz - MD5 37595a6705fdd77415b859aea90d30bc NAME cl-cookie FILENAME cl-cookie DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-utilities FILENAME cl-utilities) - (NAME local-time FILENAME local-time) - (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria babel cl-ppcre cl-utilities local-time proc-parse quri - split-sequence trivial-features) - VERSION 20191007-git SIBLINGS (cl-cookie-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-css.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-css.nix deleted file mode 100644 index 822ecd994b..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-css.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-css"; - version = "20140914-git"; - - description = "Simple inline CSS generator"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz"; - sha256 = "16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n"; - }; - - packageName = "cl-css"; - - asdFilesToKeep = ["cl-css.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-css DESCRIPTION Simple inline CSS generator SHA256 - 16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n URL - http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz - MD5 a91f5a5d6a751af31d5c4fd8170f6ece NAME cl-css FILENAME cl-css DEPS NIL - DEPENDENCIES NIL VERSION 20140914-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-csv.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-csv.nix deleted file mode 100644 index 3ecd1d679c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-csv.nix +++ /dev/null @@ -1,38 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-csv"; - version = "20201016-git"; - - parasites = [ "cl-csv/speed-test" "cl-csv/test" ]; - - description = "Facilities for reading and writing CSV format files"; - - deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz"; - sha256 = "1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf"; - }; - - packageName = "cl-csv"; - - asdFilesToKeep = ["cl-csv.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-csv DESCRIPTION - Facilities for reading and writing CSV format files SHA256 - 1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf URL - http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz - MD5 3e067784236ab620857fe738dafedb4b NAME cl-csv FILENAME cl-csv DEPS - ((NAME alexandria FILENAME alexandria) - (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-unicode FILENAME cl-unicode) - (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) - (NAME named-readtables FILENAME named-readtables)) - DEPENDENCIES - (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate - lisp-unit2 named-readtables) - VERSION 20201016-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES - (cl-csv/speed-test cl-csv/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cuda.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cuda.nix deleted file mode 100644 index 900baca3d6..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-cuda.nix +++ /dev/null @@ -1,45 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-cuda"; - version = "20210807-git"; - - description = "Cl-cuda is a library to use NVIDIA CUDA in Common Lisp programs."; - - deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-pattern" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."external-program" args."named-readtables" args."osicat" args."split-sequence" args."trivial-features" args."trivial-types" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz"; - sha256 = "0q974qrjxdn7c53frpac0hz9wnxhnf3lf8xngrc8zkphp1windc0"; - }; - - packageName = "cl-cuda"; - - asdFilesToKeep = ["cl-cuda.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-cuda DESCRIPTION - Cl-cuda is a library to use NVIDIA CUDA in Common Lisp programs. SHA256 - 0q974qrjxdn7c53frpac0hz9wnxhnf3lf8xngrc8zkphp1windc0 URL - http://beta.quicklisp.org/archive/cl-cuda/2021-08-07/cl-cuda-20210807-git.tgz - MD5 0502aed4f738192adee742b7757ee8d7 NAME cl-cuda FILENAME cl-cuda DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME cl-annot FILENAME cl-annot) (NAME cl-pattern FILENAME cl-pattern) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport) - (NAME cl-syntax FILENAME cl-syntax) - (NAME cl-syntax-annot FILENAME cl-syntax-annot) - (NAME external-program FILENAME external-program) - (NAME named-readtables FILENAME named-readtables) - (NAME osicat FILENAME osicat) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-types FILENAME trivial-types)) - DEPENDENCIES - (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-pattern - cl-ppcre cl-reexport cl-syntax cl-syntax-annot external-program - named-readtables osicat split-sequence trivial-features trivial-types) - VERSION 20210807-git SIBLINGS - (cl-cuda-examples cl-cuda-interop-examples cl-cuda-interop cl-cuda-misc) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-custom-hash-table.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-custom-hash-table.nix deleted file mode 100644 index 51dfcbf4f0..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-custom-hash-table.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-custom-hash-table"; - version = "20201220-git"; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-custom-hash-table/2020-12-20/cl-custom-hash-table-20201220-git.tgz"; - sha256 = "1id16p7vdcgxzvrgk8h6fqi284hgd8cilbnbgsbrbd70n7nj8jg3"; - }; - - packageName = "cl-custom-hash-table"; - - asdFilesToKeep = ["cl-custom-hash-table.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-custom-hash-table DESCRIPTION System lacks description SHA256 - 1id16p7vdcgxzvrgk8h6fqi284hgd8cilbnbgsbrbd70n7nj8jg3 URL - http://beta.quicklisp.org/archive/cl-custom-hash-table/2020-12-20/cl-custom-hash-table-20201220-git.tgz - MD5 bd0f2f4a8e808911133af19c03e5c511 NAME cl-custom-hash-table FILENAME - cl-custom-hash-table DEPS NIL DEPENDENCIES NIL VERSION 20201220-git - SIBLINGS (cl-custom-hash-table-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-dbi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-dbi.nix deleted file mode 100644 index 9185445b35..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-dbi.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-dbi"; - version = "20211020-git"; - - description = "System lacks description"; - - deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."split-sequence" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz"; - sha256 = "1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr"; - }; - - packageName = "cl-dbi"; - - asdFilesToKeep = ["cl-dbi.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-dbi DESCRIPTION System lacks description SHA256 - 1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr URL - http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz - MD5 565a1f32b2d924ad59876afcdc5cf263 NAME cl-dbi FILENAME cl-dbi DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi) - (NAME split-sequence FILENAME split-sequence)) - DEPENDENCIES (alexandria bordeaux-threads closer-mop dbi split-sequence) - VERSION 20211020-git SIBLINGS - (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-difflib.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-difflib.nix deleted file mode 100644 index aacb9a5353..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-difflib.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-difflib"; - version = "20130128-git"; - - description = "A Lisp library for computing differences between sequences."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz"; - sha256 = "1bgb0nmm93x90c7v1q1ah1v5dfm2anhkim7nh88sg7kg50y4ksm6"; - }; - - packageName = "cl-difflib"; - - asdFilesToKeep = ["cl-difflib.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-difflib DESCRIPTION - A Lisp library for computing differences between sequences. SHA256 - 1bgb0nmm93x90c7v1q1ah1v5dfm2anhkim7nh88sg7kg50y4ksm6 URL - http://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz - MD5 e8a3434843a368373b67d09983d2b809 NAME cl-difflib FILENAME cl-difflib - DEPS NIL DEPENDENCIES NIL VERSION 20130128-git SIBLINGS (cl-difflib-tests) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-digraph.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-digraph.nix deleted file mode 100644 index e1fda552af..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-digraph.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-digraph"; - version = "20211020-hg"; - - description = "Simple directed graphs for Common Lisp."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-digraph/2021-10-20/cl-digraph-20211020-hg.tgz"; - sha256 = "0iqzqy322xywmal7y7vhn1myhdglr78fj89maiwfx6yjppcyd1i1"; - }; - - packageName = "cl-digraph"; - - asdFilesToKeep = ["cl-digraph.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-digraph DESCRIPTION Simple directed graphs for Common Lisp. - SHA256 0iqzqy322xywmal7y7vhn1myhdglr78fj89maiwfx6yjppcyd1i1 URL - http://beta.quicklisp.org/archive/cl-digraph/2021-10-20/cl-digraph-20211020-hg.tgz - MD5 737c3640b4b079ce0ee730525aa8b6de NAME cl-digraph FILENAME cl-digraph - DEPS NIL DEPENDENCIES NIL VERSION 20211020-hg SIBLINGS - (cl-digraph.dot cl-digraph.test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-dot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-dot.nix deleted file mode 100644 index f4f12aed58..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-dot.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-dot"; - version = "20200925-git"; - - description = "Generate Dot Output from Arbitrary Lisp Data"; - - deps = [ args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz"; - sha256 = "01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla"; - }; - - packageName = "cl-dot"; - - asdFilesToKeep = ["cl-dot.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-dot DESCRIPTION Generate Dot Output from Arbitrary Lisp Data - SHA256 01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla URL - http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz - MD5 35c68f431f188d4c1c7604b4b1af220f NAME cl-dot FILENAME cl-dot DEPS - ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) VERSION 20200925-git - SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-emb.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-emb.nix deleted file mode 100644 index 3d2f612dd5..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-emb.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-emb"; - version = "20190521-git"; - - description = "A templating system for Common Lisp"; - - deps = [ args."cl-ppcre" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz"; - sha256 = "1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d"; - }; - - packageName = "cl-emb"; - - asdFilesToKeep = ["cl-emb.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-emb DESCRIPTION A templating system for Common Lisp SHA256 - 1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d URL - http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz - MD5 b27bbe8de2206ab7c461700b58d4d527 NAME cl-emb FILENAME cl-emb DEPS - ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION - 20190521-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-environments.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-environments.nix deleted file mode 100644 index 5638404470..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-environments.nix +++ /dev/null @@ -1,42 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-environments"; - version = "20211020-git"; - - parasites = [ "cl-environments/test" ]; - - description = "Implements the CLTL2 environment access functionality - for implementations which do not provide the - functionality to the programmer."; - - deps = [ args."alexandria" args."anaphora" args."closer-mop" args."collectors" args."fiveam" args."iterate" args."optima" args."parse-declarations-1_dot_0" args."symbol-munger" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-environments/2021-10-20/cl-environments-20211020-git.tgz"; - sha256 = "0aryb40nmmw34xl6h0fp8i43d2x7zlwysim365c171mcyxh3w9lr"; - }; - - packageName = "cl-environments"; - - asdFilesToKeep = ["cl-environments.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-environments DESCRIPTION - Implements the CLTL2 environment access functionality - for implementations which do not provide the - functionality to the programmer. - SHA256 0aryb40nmmw34xl6h0fp8i43d2x7zlwysim365c171mcyxh3w9lr URL - http://beta.quicklisp.org/archive/cl-environments/2021-10-20/cl-environments-20211020-git.tgz - MD5 a796decf21a5b595ff591ffca378994a NAME cl-environments FILENAME - cl-environments DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) (NAME fiveam FILENAME fiveam) - (NAME iterate FILENAME iterate) (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME symbol-munger FILENAME symbol-munger)) - DEPENDENCIES - (alexandria anaphora closer-mop collectors fiveam iterate optima - parse-declarations-1.0 symbol-munger) - VERSION 20211020-git SIBLINGS NIL PARASITES (cl-environments/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fad.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fad.nix deleted file mode 100644 index f5e28c16ce..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fad.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-fad"; - version = "20210124-git"; - - parasites = [ "cl-fad-test" ]; - - description = "Portable pathname library"; - - deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-fad/2021-01-24/cl-fad-20210124-git.tgz"; - sha256 = "17vkvkwg4wpyny5x2nsazgpip5nxxahsjngaxjyrj5z15d4lkrm0"; - }; - - packageName = "cl-fad"; - - asdFilesToKeep = ["cl-fad.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256 - 17vkvkwg4wpyny5x2nsazgpip5nxxahsjngaxjyrj5z15d4lkrm0 URL - http://beta.quicklisp.org/archive/cl-fad/2021-01-24/cl-fad-20210124-git.tgz - MD5 aa8705a0dd8ca1b43d8c76a177efdf74 NAME cl-fad FILENAME cl-fad DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME unit-test FILENAME unit-test)) - DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION - 20210124-git SIBLINGS NIL PARASITES (cl-fad-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-form-types.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-form-types.nix deleted file mode 100644 index 5ffd2e2860..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-form-types.nix +++ /dev/null @@ -1,42 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-form-types"; - version = "20211209-git"; - - parasites = [ "cl-form-types/test" ]; - - description = "Library for determining types of Common Lisp forms."; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."closer-mop" args."collectors" args."fiveam" args."introspect-environment" args."iterate" args."optima" args."parse-declarations-1_dot_0" args."symbol-munger" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-form-types/2021-12-09/cl-form-types-20211209-git.tgz"; - sha256 = "1w1918a9rjw9dp5qpwq3mf0p4yyd2xladnd6sz4zk645y7wxd08i"; - }; - - packageName = "cl-form-types"; - - asdFilesToKeep = ["cl-form-types.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-form-types DESCRIPTION - Library for determining types of Common Lisp forms. SHA256 - 1w1918a9rjw9dp5qpwq3mf0p4yyd2xladnd6sz4zk645y7wxd08i URL - http://beta.quicklisp.org/archive/cl-form-types/2021-12-09/cl-form-types-20211209-git.tgz - MD5 2c128061c2e8a97b70fbf8939708d53e NAME cl-form-types FILENAME - cl-form-types DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-environments FILENAME cl-environments) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) (NAME fiveam FILENAME fiveam) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME symbol-munger FILENAME symbol-munger)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-environments closer-mop collectors - fiveam introspect-environment iterate optima parse-declarations-1.0 - symbol-munger) - VERSION 20211209-git SIBLINGS NIL PARASITES (cl-form-types/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fuse-meta-fs.nix deleted file mode 100644 index 2e76fd28c6..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fuse-meta-fs.nix +++ /dev/null @@ -1,41 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-fuse-meta-fs"; - version = "20190710-git"; - - description = "CFFI bindings to FUSE (Filesystem in user space)"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz"; - sha256 = "1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7"; - }; - - packageName = "cl-fuse-meta-fs"; - - asdFilesToKeep = ["cl-fuse-meta-fs.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-fuse-meta-fs DESCRIPTION - CFFI bindings to FUSE (Filesystem in user space) SHA256 - 1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7 URL - http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz - MD5 461f7023274fb273e6c759e881bdd636 NAME cl-fuse-meta-fs FILENAME - cl-fuse-meta-fs DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME cl-fuse FILENAME cl-fuse) (NAME cl-utilities FILENAME cl-utilities) - (NAME iterate FILENAME iterate) (NAME pcall FILENAME pcall) - (NAME pcall-queue FILENAME pcall-queue) - (NAME trivial-backtrace FILENAME trivial-backtrace) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-utf-8 FILENAME trivial-utf-8)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse - cl-utilities iterate pcall pcall-queue trivial-backtrace trivial-features - trivial-utf-8) - VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fuse.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fuse.nix deleted file mode 100644 index 08c0c8e5c8..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fuse.nix +++ /dev/null @@ -1,36 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-fuse"; - version = "20200925-git"; - - description = "CFFI bindings to FUSE (Filesystem in user space)"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz"; - sha256 = "1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp"; - }; - - packageName = "cl-fuse"; - - asdFilesToKeep = ["cl-fuse.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) - SHA256 1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp URL - http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz - MD5 0342ea914801f40d804629170a435e54 NAME cl-fuse FILENAME cl-fuse DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME cl-utilities FILENAME cl-utilities) (NAME iterate FILENAME iterate) - (NAME trivial-backtrace FILENAME trivial-backtrace) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-utf-8 FILENAME trivial-utf-8)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain - cl-utilities iterate trivial-backtrace trivial-features trivial-utf-8) - VERSION 20200925-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fuzz.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fuzz.nix deleted file mode 100644 index d55859d385..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-fuzz.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-fuzz"; - version = "20181018-git"; - - description = "A Fuzz Testing Framework"; - - deps = [ args."alexandria" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-fuzz/2018-10-18/cl-fuzz-20181018-git.tgz"; - sha256 = "1kxh73lbnhzzpflab1vpxsmg4qia9n42sij0459iksi29kmjxjpz"; - }; - - packageName = "cl-fuzz"; - - asdFilesToKeep = ["cl-fuzz.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-fuzz DESCRIPTION A Fuzz Testing Framework SHA256 - 1kxh73lbnhzzpflab1vpxsmg4qia9n42sij0459iksi29kmjxjpz URL - http://beta.quicklisp.org/archive/cl-fuzz/2018-10-18/cl-fuzz-20181018-git.tgz - MD5 22e715b370ea886bbff1e09db20c4e32 NAME cl-fuzz FILENAME cl-fuzz DEPS - ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION - 20181018-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-geometry.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-geometry.nix deleted file mode 100644 index 3442df57a1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-geometry.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-geometry"; - version = "20160531-git"; - - description = "Library for two dimensional geometry."; - - deps = [ args."iterate" args."trees" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz"; - sha256 = "0v451w2dx9llvd2kgp3m5jn2n8n0xwynxf8zl436cngh63ag6s7p"; - }; - - packageName = "cl-geometry"; - - asdFilesToKeep = ["cl-geometry.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-geometry DESCRIPTION Library for two dimensional geometry. SHA256 - 0v451w2dx9llvd2kgp3m5jn2n8n0xwynxf8zl436cngh63ag6s7p URL - http://beta.quicklisp.org/archive/cl-geometry/2016-05-31/cl-geometry-20160531-git.tgz - MD5 c0aaccbb4e2df6c504e6c1cd15155353 NAME cl-geometry FILENAME cl-geometry - DEPS ((NAME iterate FILENAME iterate) (NAME trees FILENAME trees)) - DEPENDENCIES (iterate trees) VERSION 20160531-git SIBLINGS - (cl-geometry-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-gobject-introspection.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-gobject-introspection.nix deleted file mode 100644 index 15b16ef84c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-gobject-introspection.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-gobject-introspection"; - version = "20210124-git"; - - description = "Binding to GObjectIntrospection"; - - deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" args."trivial-garbage" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2021-01-24/cl-gobject-introspection-20210124-git.tgz"; - sha256 = "1hrc451d9xdp3pfmwalw32r3iqfvw6ccy665kl5560lihwmk59w0"; - }; - - packageName = "cl-gobject-introspection"; - - asdFilesToKeep = ["cl-gobject-introspection.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-gobject-introspection DESCRIPTION Binding to GObjectIntrospection - SHA256 1hrc451d9xdp3pfmwalw32r3iqfvw6ccy665kl5560lihwmk59w0 URL - http://beta.quicklisp.org/archive/cl-gobject-introspection/2021-01-24/cl-gobject-introspection-20210124-git.tgz - MD5 ad760b820c86142c0a1309af29541680 NAME cl-gobject-introspection FILENAME - cl-gobject-introspection DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage)) - DEPENDENCIES - (alexandria babel cffi iterate trivial-features trivial-garbage) VERSION - 20210124-git SIBLINGS (cl-gobject-introspection-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-heap.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-heap.nix deleted file mode 100644 index da66b895bf..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-heap.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-heap"; - version = "0.1.6"; - - description = "An implementation of heap and priority queue data structures."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz"; - sha256 = "163hb07p2nxz126rpq3cj5dyala24n0by5i5786n2qcr1w0bak4i"; - }; - - packageName = "cl-heap"; - - asdFilesToKeep = ["cl-heap.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-heap DESCRIPTION - An implementation of heap and priority queue data structures. SHA256 - 163hb07p2nxz126rpq3cj5dyala24n0by5i5786n2qcr1w0bak4i URL - http://beta.quicklisp.org/archive/cl-heap/2013-03-12/cl-heap-0.1.6.tgz MD5 - a12d71f7bbe22d6acdcc7cf36fb907b0 NAME cl-heap FILENAME cl-heap DEPS NIL - DEPENDENCIES NIL VERSION 0.1.6 SIBLINGS (cl-heap-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-hooks.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-hooks.nix deleted file mode 100644 index 58e7b2d44b..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-hooks.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-hooks"; - version = "architecture.hooks-20181210-git"; - - parasites = [ "cl-hooks/test" ]; - - description = "This system provides the hooks extension point -mechanism (as known, e.g., from GNU Emacs)."; - - deps = [ args."alexandria" args."anaphora" args."closer-mop" args."fiveam" args."let-plus" args."trivial-garbage" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz"; - sha256 = "04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns"; - }; - - packageName = "cl-hooks"; - - asdFilesToKeep = ["cl-hooks.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-hooks DESCRIPTION This system provides the hooks extension point -mechanism (as known, e.g., from GNU Emacs). - SHA256 04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns URL - http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz - MD5 698bdb1309cae19fb8f0e1e425ba4cd9 NAME cl-hooks FILENAME cl-hooks DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam) - (NAME let-plus FILENAME let-plus) - (NAME trivial-garbage FILENAME trivial-garbage)) - DEPENDENCIES - (alexandria anaphora closer-mop fiveam let-plus trivial-garbage) VERSION - architecture.hooks-20181210-git SIBLINGS NIL PARASITES (cl-hooks/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-html-diff.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-html-diff.nix deleted file mode 100644 index ebefee3931..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-html-diff.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-html-diff"; - version = "20130128-git"; - - description = "System lacks description"; - - deps = [ args."cl-difflib" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-html-diff/2013-01-28/cl-html-diff-20130128-git.tgz"; - sha256 = "0dbqfgfl2qmlk91fncjj804md2crvj0bsvkdxfrsybrhn6dmikci"; - }; - - packageName = "cl-html-diff"; - - asdFilesToKeep = ["cl-html-diff.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-html-diff DESCRIPTION System lacks description SHA256 - 0dbqfgfl2qmlk91fncjj804md2crvj0bsvkdxfrsybrhn6dmikci URL - http://beta.quicklisp.org/archive/cl-html-diff/2013-01-28/cl-html-diff-20130128-git.tgz - MD5 70f93e60e968dad9a44ede60856dc343 NAME cl-html-diff FILENAME - cl-html-diff DEPS ((NAME cl-difflib FILENAME cl-difflib)) DEPENDENCIES - (cl-difflib) VERSION 20130128-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-html-parse.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-html-parse.nix deleted file mode 100644 index 3ba840fe83..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-html-parse.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-html-parse"; - version = "20200925-git"; - - description = "HTML Parser"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz"; - sha256 = "14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f"; - }; - - packageName = "cl-html-parse"; - - asdFilesToKeep = ["cl-html-parse.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-html-parse DESCRIPTION HTML Parser SHA256 - 14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f URL - http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz - MD5 3333eedf037a48900c663fceae3e4cfd NAME cl-html-parse FILENAME - cl-html-parse DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-html5-parser.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-html5-parser.nix deleted file mode 100644 index 527d1a4019..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-html5-parser.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-html5-parser"; - version = "20190521-git"; - - description = "A HTML5 parser for Common Lisp"; - - deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz"; - sha256 = "055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p"; - }; - - packageName = "cl-html5-parser"; - - asdFilesToKeep = ["cl-html5-parser.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-html5-parser DESCRIPTION A HTML5 parser for Common Lisp SHA256 - 055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p URL - http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz - MD5 149e5609d0a96c867fac6c22693c5e30 NAME cl-html5-parser FILENAME - cl-html5-parser DEPS - ((NAME cl-ppcre FILENAME cl-ppcre) - (NAME flexi-streams FILENAME flexi-streams) - (NAME string-case FILENAME string-case) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (cl-ppcre flexi-streams string-case trivial-gray-streams) - VERSION 20190521-git SIBLINGS (cl-html5-parser-cxml cl-html5-parser-tests) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-interpol.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-interpol.nix deleted file mode 100644 index fe9fa81b67..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-interpol.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-interpol"; - version = "20201220-git"; - - parasites = [ "cl-interpol-test" ]; - - description = "System lacks description"; - - deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-interpol/2020-12-20/cl-interpol-20201220-git.tgz"; - sha256 = "1q3zxsbl5br08lv481jsqmq8r9yayp44x6icixcxx5sdz6fbcd3d"; - }; - - packageName = "cl-interpol"; - - asdFilesToKeep = ["cl-interpol.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-interpol DESCRIPTION System lacks description SHA256 - 1q3zxsbl5br08lv481jsqmq8r9yayp44x6icixcxx5sdz6fbcd3d URL - http://beta.quicklisp.org/archive/cl-interpol/2020-12-20/cl-interpol-20201220-git.tgz - MD5 d678c521474e1774185b78883396da49 NAME cl-interpol FILENAME cl-interpol - DEPS - ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) - (NAME flexi-streams FILENAME flexi-streams) - (NAME named-readtables FILENAME named-readtables)) - DEPENDENCIES (cl-ppcre cl-unicode flexi-streams named-readtables) VERSION - 20201220-git SIBLINGS NIL PARASITES (cl-interpol-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-jpeg.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-jpeg.nix deleted file mode 100644 index 086ebde359..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-jpeg.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-jpeg"; - version = "20170630-git"; - - description = "A self-contained baseline JPEG codec implementation"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz"; - sha256 = "1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0"; - }; - - packageName = "cl-jpeg"; - - asdFilesToKeep = ["cl-jpeg.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-jpeg DESCRIPTION - A self-contained baseline JPEG codec implementation SHA256 - 1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0 URL - http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz - MD5 b6eb4ca5d893f428b5bbe46cd49f76ad NAME cl-jpeg FILENAME cl-jpeg DEPS NIL - DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-json.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-json.nix deleted file mode 100644 index ab76c8d884..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-json.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-json"; - version = "20141217-git"; - - parasites = [ "cl-json.test" ]; - - description = "JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format."; - - deps = [ args."fiveam" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz"; - sha256 = "00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g"; - }; - - packageName = "cl-json"; - - asdFilesToKeep = ["cl-json.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-json DESCRIPTION - JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format. - SHA256 00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g URL - http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz - MD5 9d873fa462b93c76d90642d8e3fb4881 NAME cl-json FILENAME cl-json DEPS - ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION 20141217-git - SIBLINGS NIL PARASITES (cl-json.test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-l10n-cldr.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-l10n-cldr.nix deleted file mode 100644 index 8ef07f336c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-l10n-cldr.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-l10n-cldr"; - version = "20120909-darcs"; - - description = "The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz"; - sha256 = "03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv"; - }; - - packageName = "cl-l10n-cldr"; - - asdFilesToKeep = ["cl-l10n-cldr.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-l10n-cldr DESCRIPTION - The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way. - SHA256 03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv URL - http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz - MD5 466e776f2f6b931d9863e1fc4d0b514e NAME cl-l10n-cldr FILENAME - cl-l10n-cldr DEPS NIL DEPENDENCIES NIL VERSION 20120909-darcs SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-l10n.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-l10n.nix deleted file mode 100644 index fd0d22547a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-l10n.nix +++ /dev/null @@ -1,43 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-l10n"; - version = "20211209-git"; - - parasites = [ "cl-l10n/test" ]; - - description = "Portable CL Locale Support"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-l10n/2021-12-09/cl-l10n-20211209-git.tgz"; - sha256 = "0l67xg282pim6167g27zcqk4xj51cfpmcbzc8bjg8933w42fdjf4"; - }; - - packageName = "cl-l10n"; - - asdFilesToKeep = ["cl-l10n.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-l10n DESCRIPTION Portable CL Locale Support SHA256 - 0l67xg282pim6167g27zcqk4xj51cfpmcbzc8bjg8933w42fdjf4 URL - http://beta.quicklisp.org/archive/cl-l10n/2021-12-09/cl-l10n-20211209-git.tgz - MD5 e575bb4ff3a6d0bbba5220c631f9c83a NAME cl-l10n FILENAME cl-l10n DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-fad FILENAME cl-fad) (NAME cl-l10n-cldr FILENAME cl-l10n-cldr) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop) - (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) - (NAME flexi-streams FILENAME flexi-streams) - (NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil) - (NAME iterate FILENAME iterate) (NAME local-time FILENAME local-time) - (NAME metabang-bind FILENAME metabang-bind) - (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES - (alexandria babel bordeaux-threads cl-fad cl-l10n-cldr cl-ppcre closer-mop - closure-common cxml flexi-streams hu.dwim.stefil iterate local-time - metabang-bind parse-number puri trivial-features trivial-gray-streams) - VERSION 20211209-git SIBLINGS NIL PARASITES (cl-l10n/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-libuv.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-libuv.nix deleted file mode 100644 index a8d15b0629..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-libuv.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-libuv"; - version = "20200610-git"; - - description = "Low-level libuv bindings for Common Lisp."; - - deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz"; - sha256 = "1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19"; - }; - - packageName = "cl-libuv"; - - asdFilesToKeep = ["cl-libuv.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp. - SHA256 1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19 URL - http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz - MD5 e6b3f8ffa7b8fb642350f09d1afa7f38 NAME cl-libuv FILENAME cl-libuv DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria babel cffi cffi-grovel cffi-toolchain trivial-features) VERSION - 20200610-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-locale.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-locale.nix deleted file mode 100644 index 4c053804ea..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-locale.nix +++ /dev/null @@ -1,38 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-locale"; - version = "20151031-git"; - - description = "Simple i18n library for Common Lisp"; - - deps = [ args."alexandria" args."anaphora" args."arnesi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."collectors" args."iterate" args."named-readtables" args."symbol-munger" args."trivial-types" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz"; - sha256 = "14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg"; - }; - - packageName = "cl-locale"; - - asdFilesToKeep = ["cl-locale.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-locale DESCRIPTION Simple i18n library for Common Lisp SHA256 - 14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg URL - http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz - MD5 7a8fb3678938af6dc5c9fd6431428aff NAME cl-locale FILENAME cl-locale DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME arnesi FILENAME arnesi) (NAME cl-annot FILENAME cl-annot) - (NAME cl-syntax FILENAME cl-syntax) - (NAME cl-syntax-annot FILENAME cl-syntax-annot) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) (NAME iterate FILENAME iterate) - (NAME named-readtables FILENAME named-readtables) - (NAME symbol-munger FILENAME symbol-munger) - (NAME trivial-types FILENAME trivial-types)) - DEPENDENCIES - (alexandria anaphora arnesi cl-annot cl-syntax cl-syntax-annot closer-mop - collectors iterate named-readtables symbol-munger trivial-types) - VERSION 20151031-git SIBLINGS (cl-locale-syntax cl-locale-test) PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-markup.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-markup.nix deleted file mode 100644 index 47d19e5da7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-markup.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-markup"; - version = "20131003-git"; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz"; - sha256 = "1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r"; - }; - - packageName = "cl-markup"; - - asdFilesToKeep = ["cl-markup.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-markup DESCRIPTION System lacks description SHA256 - 1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r URL - http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz - MD5 3ec36b8e15435933f614959032987848 NAME cl-markup FILENAME cl-markup DEPS - NIL DEPENDENCIES NIL VERSION 20131003-git SIBLINGS (cl-markup-test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-mustache.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-mustache.nix deleted file mode 100644 index 1e22ad9dad..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-mustache.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-mustache"; - version = "20200325-git"; - - description = "Mustache Template Renderer"; - - deps = [ args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-mustache/2020-03-25/cl-mustache-20200325-git.tgz"; - sha256 = "1x1rsmgqc39imx4ay3b35dzvzccaqjayz90qv2cylqbbq9sg9arr"; - }; - - packageName = "cl-mustache"; - - asdFilesToKeep = ["cl-mustache.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-mustache DESCRIPTION Mustache Template Renderer SHA256 - 1x1rsmgqc39imx4ay3b35dzvzccaqjayz90qv2cylqbbq9sg9arr URL - http://beta.quicklisp.org/archive/cl-mustache/2020-03-25/cl-mustache-20200325-git.tgz - MD5 52381d17458d88d6a8b760f351bf517d NAME cl-mustache FILENAME cl-mustache - DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) VERSION 20200325-git - SIBLINGS (cl-mustache-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-mysql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-mysql.nix deleted file mode 100644 index 5e496535cc..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-mysql.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-mysql"; - version = "20200610-git"; - - description = "Common Lisp MySQL library bindings"; - - deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz"; - sha256 = "0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w"; - }; - - packageName = "cl-mysql"; - - asdFilesToKeep = ["cl-mysql.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-mysql DESCRIPTION Common Lisp MySQL library bindings SHA256 - 0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w URL - http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz - MD5 05d5ed6b48edbafd258e189d7868822e NAME cl-mysql FILENAME cl-mysql DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20200610-git - SIBLINGS (cl-mysql-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-num-utils.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-num-utils.nix deleted file mode 100644 index 8d0a77d85e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-num-utils.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-num-utils"; - version = "20210531-git"; - - parasites = [ "cl-num-utils-tests" ]; - - description = "Numerical utilities for Common Lisp"; - - deps = [ args."alexandria" args."anaphora" args."array-operations" args."cl-slice" args."clunit" args."let-plus" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-num-utils/2021-05-31/cl-num-utils-20210531-git.tgz"; - sha256 = "1snhwhnrkmavkhwd0dx7a958xdiwcc0a84fj0k5xqj99ksd9hp8x"; - }; - - packageName = "cl-num-utils"; - - asdFilesToKeep = ["cl-num-utils.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-num-utils DESCRIPTION Numerical utilities for Common Lisp SHA256 - 1snhwhnrkmavkhwd0dx7a958xdiwcc0a84fj0k5xqj99ksd9hp8x URL - http://beta.quicklisp.org/archive/cl-num-utils/2021-05-31/cl-num-utils-20210531-git.tgz - MD5 1977251bf552ba82005de0dc2f37d130 NAME cl-num-utils FILENAME - cl-num-utils DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME array-operations FILENAME array-operations) - (NAME cl-slice FILENAME cl-slice) (NAME clunit FILENAME clunit) - (NAME let-plus FILENAME let-plus)) - DEPENDENCIES - (alexandria anaphora array-operations cl-slice clunit let-plus) VERSION - 20210531-git SIBLINGS NIL PARASITES (cl-num-utils-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-paths-ttf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-paths-ttf.nix deleted file mode 100644 index 1a9ddf4cb6..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-paths-ttf.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-paths-ttf"; - version = "cl-vectors-20180228-git"; - - description = "cl-paths-ttf: vectorial paths manipulation"; - - deps = [ args."cl-paths" args."zpb-ttf" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; - }; - - packageName = "cl-paths-ttf"; - - asdFilesToKeep = ["cl-paths-ttf.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation - SHA256 0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly URL - http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz - MD5 9d9629786d4f2c19c15cc6cd3049c343 NAME cl-paths-ttf FILENAME - cl-paths-ttf DEPS - ((NAME cl-paths FILENAME cl-paths) (NAME zpb-ttf FILENAME zpb-ttf)) - DEPENDENCIES (cl-paths zpb-ttf) VERSION cl-vectors-20180228-git SIBLINGS - (cl-aa-misc cl-aa cl-paths cl-vectors) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-paths.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-paths.nix deleted file mode 100644 index b4caabe8b2..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-paths.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-paths"; - version = "cl-vectors-20180228-git"; - - description = "cl-paths: vectorial paths manipulation"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; - }; - - packageName = "cl-paths"; - - asdFilesToKeep = ["cl-paths.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-paths DESCRIPTION cl-paths: vectorial paths manipulation SHA256 - 0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly URL - http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz - MD5 9d9629786d4f2c19c15cc6cd3049c343 NAME cl-paths FILENAME cl-paths DEPS - NIL DEPENDENCIES NIL VERSION cl-vectors-20180228-git SIBLINGS - (cl-aa-misc cl-aa cl-paths-ttf cl-vectors) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-pattern.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-pattern.nix deleted file mode 100644 index c53bd98424..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-pattern.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-pattern"; - version = "20140713-git"; - - description = "System lacks description"; - - deps = [ args."alexandria" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."named-readtables" args."trivial-types" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz"; - sha256 = "08z7jccjcq41i3i5zdsgixqnijgyrb4q7hm7gq8l5xb1sr3kj72v"; - }; - - packageName = "cl-pattern"; - - asdFilesToKeep = ["cl-pattern.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-pattern DESCRIPTION System lacks description SHA256 - 08z7jccjcq41i3i5zdsgixqnijgyrb4q7hm7gq8l5xb1sr3kj72v URL - http://beta.quicklisp.org/archive/cl-pattern/2014-07-13/cl-pattern-20140713-git.tgz - MD5 cf8e74def535c66a358df1ada9d89785 NAME cl-pattern FILENAME cl-pattern - DEPS - ((NAME alexandria FILENAME alexandria) (NAME cl-annot FILENAME cl-annot) - (NAME cl-syntax FILENAME cl-syntax) - (NAME cl-syntax-annot FILENAME cl-syntax-annot) - (NAME named-readtables FILENAME named-readtables) - (NAME trivial-types FILENAME trivial-types)) - DEPENDENCIES - (alexandria cl-annot cl-syntax cl-syntax-annot named-readtables - trivial-types) - VERSION 20140713-git SIBLINGS (cl-pattern-benchmark) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-pdf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-pdf.nix deleted file mode 100644 index 16da7b56b3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-pdf.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-pdf"; - version = "20211020-git"; - - description = "Common Lisp PDF Generation Library"; - - deps = [ args."iterate" args."uiop" args."zpb-ttf" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-pdf/2021-10-20/cl-pdf-20211020-git.tgz"; - sha256 = "0wyh7iv86sqzdn5xj5crrip8iri5a64qzc6cczgbj1gkv65i28bk"; - }; - - packageName = "cl-pdf"; - - asdFilesToKeep = ["cl-pdf.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-pdf DESCRIPTION Common Lisp PDF Generation Library SHA256 - 0wyh7iv86sqzdn5xj5crrip8iri5a64qzc6cczgbj1gkv65i28bk URL - http://beta.quicklisp.org/archive/cl-pdf/2021-10-20/cl-pdf-20211020-git.tgz - MD5 c8a9cfd5d65eae217bd55d786d31dca9 NAME cl-pdf FILENAME cl-pdf DEPS - ((NAME iterate FILENAME iterate) (NAME uiop FILENAME uiop) - (NAME zpb-ttf FILENAME zpb-ttf)) - DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20211020-git SIBLINGS - (cl-pdf-parser) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-postgres.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-postgres.nix deleted file mode 100644 index 5a46814fc2..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-postgres.nix +++ /dev/null @@ -1,41 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-postgres"; - version = "postmodern-20211209-git"; - - parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; - - description = "Low-level client library for PostgreSQL"; - - deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-ppcre" args."fiveam" args."ironclad" args."md5" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."uiop" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/postmodern/2021-12-09/postmodern-20211209-git.tgz"; - sha256 = "1qcbg31mz5r7ibmq2y7r3vqvdwpznxvwdnwd94hfil7pg4j119d6"; - }; - - packageName = "cl-postgres"; - - asdFilesToKeep = ["cl-postgres.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL - SHA256 1qcbg31mz5r7ibmq2y7r3vqvdwpznxvwdnwd94hfil7pg4j119d6 URL - http://beta.quicklisp.org/archive/postmodern/2021-12-09/postmodern-20211209-git.tgz - MD5 6d14c4b5fec085594dc66d520174e0e6 NAME cl-postgres FILENAME cl-postgres - DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-base64 FILENAME cl-base64) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME fiveam FILENAME fiveam) (NAME ironclad FILENAME ironclad) - (NAME md5 FILENAME md5) (NAME simple-date FILENAME simple-date) - (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) - (NAME split-sequence FILENAME split-sequence) - (NAME uax-15 FILENAME uax-15) (NAME uiop FILENAME uiop) - (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria bordeaux-threads cl-base64 cl-ppcre fiveam ironclad md5 - simple-date simple-date/postgres-glue split-sequence uax-15 uiop usocket) - VERSION postmodern-20211209-git SIBLINGS (postmodern s-sql simple-date) - PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-postgres_plus_local-time.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-postgres_plus_local-time.nix deleted file mode 100644 index 3c32a56e37..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-postgres_plus_local-time.nix +++ /dev/null @@ -1,37 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-postgres_plus_local-time"; - version = "local-time-20210124-git"; - - description = "Integration between cl-postgres and local-time"; - - deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-ppcre" args."ironclad" args."local-time" args."md5" args."split-sequence" args."uax-15" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/local-time/2021-01-24/local-time-20210124-git.tgz"; - sha256 = "0bz5z0rd8gfd22bpqkalaijxlrk806zc010cvgd4qjapbrxzjg3s"; - }; - - packageName = "cl-postgres+local-time"; - - asdFilesToKeep = ["cl-postgres+local-time.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-postgres+local-time DESCRIPTION - Integration between cl-postgres and local-time SHA256 - 0bz5z0rd8gfd22bpqkalaijxlrk806zc010cvgd4qjapbrxzjg3s URL - http://beta.quicklisp.org/archive/local-time/2021-01-24/local-time-20210124-git.tgz - MD5 631d67bc84ae838792717b256f2cdbaf NAME cl-postgres+local-time FILENAME - cl-postgres_plus_local-time DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-base64 FILENAME cl-base64) - (NAME cl-postgres FILENAME cl-postgres) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME ironclad FILENAME ironclad) (NAME local-time FILENAME local-time) - (NAME md5 FILENAME md5) (NAME split-sequence FILENAME split-sequence) - (NAME uax-15 FILENAME uax-15) (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria bordeaux-threads cl-base64 cl-postgres cl-ppcre ironclad - local-time md5 split-sequence uax-15 usocket) - VERSION local-time-20210124-git SIBLINGS (local-time) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ppcre-template.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ppcre-template.nix deleted file mode 100644 index a09ba7cdc6..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ppcre-template.nix +++ /dev/null @@ -1,39 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-ppcre-template"; - version = "cl-unification-20200925-git"; - - description = "A system used to conditionally load the CL-PPCRE Template. - -This system is not required and it is handled only if CL-PPCRE is -available. If it is, then the library provides the -REGULAR-EXPRESSION-TEMPLATE."; - - deps = [ args."cl-ppcre" args."cl-unification" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz"; - sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais"; - }; - - packageName = "cl-ppcre-template"; - - asdFilesToKeep = ["cl-ppcre-template.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-ppcre-template DESCRIPTION - A system used to conditionally load the CL-PPCRE Template. - -This system is not required and it is handled only if CL-PPCRE is -available. If it is, then the library provides the -REGULAR-EXPRESSION-TEMPLATE. - SHA256 05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais URL - http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz - MD5 90588d566c2e12dac3530b65384a87ab NAME cl-ppcre-template FILENAME - cl-ppcre-template DEPS - ((NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-unification FILENAME cl-unification)) - DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20200925-git - SIBLINGS (cl-unification-lib cl-unification-test cl-unification) PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ppcre-unicode.nix deleted file mode 100644 index 8277c9ed72..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-ppcre-unicode"; - version = "cl-ppcre-20190521-git"; - - parasites = [ "cl-ppcre-unicode-test" ]; - - description = "Perl-compatible regular expression library (Unicode)"; - - deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz"; - sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx"; - }; - - packageName = "cl-ppcre-unicode"; - - asdFilesToKeep = ["cl-ppcre-unicode.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-ppcre-unicode DESCRIPTION - Perl-compatible regular expression library (Unicode) SHA256 - 0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx URL - http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz - MD5 a980b75c1b386b49bcb28107991eb4ec NAME cl-ppcre-unicode FILENAME - cl-ppcre-unicode DEPS - ((NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-ppcre-test FILENAME cl-ppcre-test) - (NAME cl-unicode FILENAME cl-unicode) - (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION - cl-ppcre-20190521-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ppcre.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ppcre.nix deleted file mode 100644 index 1a2aeadd27..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-ppcre.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-ppcre"; - version = "20190521-git"; - - parasites = [ "cl-ppcre-test" ]; - - description = "Perl-compatible regular expression library"; - - deps = [ args."flexi-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz"; - sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx"; - }; - - packageName = "cl-ppcre"; - - asdFilesToKeep = ["cl-ppcre.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library - SHA256 0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx URL - http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz - MD5 a980b75c1b386b49bcb28107991eb4ec NAME cl-ppcre FILENAME cl-ppcre DEPS - ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams) - VERSION 20190521-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-prevalence.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-prevalence.nix deleted file mode 100644 index 0266eac4e8..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-prevalence.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-prevalence"; - version = "20210531-git"; - - description = "Common Lisp Prevalence Package"; - - deps = [ args."alexandria" args."bordeaux-threads" args."s-sysdeps" args."s-xml" args."split-sequence" args."usocket" args."usocket-server" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-prevalence/2021-05-31/cl-prevalence-20210531-git.tgz"; - sha256 = "1608xbfyr0id1nwf9845yfaqz5jbi60vz6c36h70bnzkm4b55s1w"; - }; - - packageName = "cl-prevalence"; - - asdFilesToKeep = ["cl-prevalence.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-prevalence DESCRIPTION Common Lisp Prevalence Package SHA256 - 1608xbfyr0id1nwf9845yfaqz5jbi60vz6c36h70bnzkm4b55s1w URL - http://beta.quicklisp.org/archive/cl-prevalence/2021-05-31/cl-prevalence-20210531-git.tgz - MD5 4d2ced14365fb45ef97621298fd24501 NAME cl-prevalence FILENAME - cl-prevalence DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME s-sysdeps FILENAME s-sysdeps) (NAME s-xml FILENAME s-xml) - (NAME split-sequence FILENAME split-sequence) - (NAME usocket FILENAME usocket) - (NAME usocket-server FILENAME usocket-server)) - DEPENDENCIES - (alexandria bordeaux-threads s-sysdeps s-xml split-sequence usocket - usocket-server) - VERSION 20210531-git SIBLINGS (cl-prevalence-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-project.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-project.nix deleted file mode 100644 index 72a049c2f0..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-project.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-project"; - version = "20200715-git"; - - description = "Generate a skeleton for modern project"; - - deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-emb" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz"; - sha256 = "044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306"; - }; - - packageName = "cl-project"; - - asdFilesToKeep = ["cl-project.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 - 044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306 URL - http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz - MD5 12b436050ad0106cf292707ae39d8572 NAME cl-project FILENAME cl-project - DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME cl-ansi-text FILENAME cl-ansi-text) - (NAME cl-colors FILENAME cl-colors) (NAME cl-colors2 FILENAME cl-colors2) - (NAME cl-emb FILENAME cl-emb) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time) - (NAME prove FILENAME prove) (NAME uiop FILENAME uiop)) - DEPENDENCIES - (alexandria anaphora cl-ansi-text cl-colors cl-colors2 cl-emb cl-ppcre - let-plus local-time prove uiop) - VERSION 20200715-git SIBLINGS (cl-project-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-protobufs.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-protobufs.nix deleted file mode 100644 index ea1219ae93..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-protobufs.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-protobufs"; - version = "20200325-git"; - - description = "Protobufs for Common Lisp"; - - deps = [ args."alexandria" args."asdf" args."babel" args."closer-mop" args."trivial-features" args."trivial-garbage" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz"; - sha256 = "1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin"; - }; - - packageName = "cl-protobufs"; - - asdFilesToKeep = ["cl-protobufs.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-protobufs DESCRIPTION Protobufs for Common Lisp SHA256 - 1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin URL - http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz - MD5 9fb9af8bd53796b3cf8f358762095899 NAME cl-protobufs FILENAME - cl-protobufs DEPS - ((NAME alexandria FILENAME alexandria) (NAME asdf FILENAME asdf) - (NAME babel FILENAME babel) (NAME closer-mop FILENAME closer-mop) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage)) - DEPENDENCIES - (alexandria asdf babel closer-mop trivial-features trivial-garbage) VERSION - 20200325-git SIBLINGS (cl-protobufs-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-qprint.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-qprint.nix deleted file mode 100644 index ee2b681ae0..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-qprint.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-qprint"; - version = "20150804-git"; - - description = "Encode and decode quoted-printable encoded strings."; - - deps = [ args."flexi-streams" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz"; - sha256 = "042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28"; - }; - - packageName = "cl-qprint"; - - asdFilesToKeep = ["cl-qprint.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-qprint DESCRIPTION - Encode and decode quoted-printable encoded strings. SHA256 - 042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28 URL - http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz - MD5 74376a69e0b078724c94cc268f69e0f7 NAME cl-qprint FILENAME cl-qprint DEPS - ((NAME flexi-streams FILENAME flexi-streams) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (flexi-streams trivial-gray-streams) VERSION 20150804-git - SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-qrencode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-qrencode.nix deleted file mode 100644 index 22a6b64b55..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-qrencode.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-qrencode"; - version = "20191007-git"; - - description = "QR code 2005 encoder in Common Lisp"; - - deps = [ args."salza2" args."trivial-gray-streams" args."zpng" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-qrencode/2019-10-07/cl-qrencode-20191007-git.tgz"; - sha256 = "0jc4bmw498bxkw5imvsj4p49njyybsjhbbvnmykivc38k5nlypz4"; - }; - - packageName = "cl-qrencode"; - - asdFilesToKeep = ["cl-qrencode.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-qrencode DESCRIPTION QR code 2005 encoder in Common Lisp SHA256 - 0jc4bmw498bxkw5imvsj4p49njyybsjhbbvnmykivc38k5nlypz4 URL - http://beta.quicklisp.org/archive/cl-qrencode/2019-10-07/cl-qrencode-20191007-git.tgz - MD5 e94ac1137949ef70dea11ca78431e956 NAME cl-qrencode FILENAME cl-qrencode - DEPS - ((NAME salza2 FILENAME salza2) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME zpng FILENAME zpng)) - DEPENDENCIES (salza2 trivial-gray-streams zpng) VERSION 20191007-git - SIBLINGS (cl-qrencode-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-reexport.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-reexport.nix deleted file mode 100644 index 96d88a1861..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-reexport.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-reexport"; - version = "20210228-git"; - - description = "Reexport external symbols in other packages."; - - deps = [ args."alexandria" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz"; - sha256 = "1ay0ng5nnbq200g4wxs0h7byx24za4yk208nhfsmksahk5qj1qra"; - }; - - packageName = "cl-reexport"; - - asdFilesToKeep = ["cl-reexport.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-reexport DESCRIPTION Reexport external symbols in other packages. - SHA256 1ay0ng5nnbq200g4wxs0h7byx24za4yk208nhfsmksahk5qj1qra URL - http://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz - MD5 e083a9c49fe39d65f1ff7743eebe37c2 NAME cl-reexport FILENAME cl-reexport - DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) - VERSION 20210228-git SIBLINGS (cl-reexport-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-semver.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-semver.nix deleted file mode 100644 index d3eae0bc44..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-semver.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-semver"; - version = "20201220-git"; - - description = "Semantic Version implementation"; - - deps = [ args."alexandria" args."esrap" args."named-readtables" args."trivial-with-current-source-form" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-semver/2020-12-20/cl-semver-20201220-git.tgz"; - sha256 = "02m23kwsz49dh7jq2rgcd1c4asgjj1g7dy321hyr07k5hqmhk92y"; - }; - - packageName = "cl-semver"; - - asdFilesToKeep = ["cl-semver.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-semver DESCRIPTION Semantic Version implementation SHA256 - 02m23kwsz49dh7jq2rgcd1c4asgjj1g7dy321hyr07k5hqmhk92y URL - http://beta.quicklisp.org/archive/cl-semver/2020-12-20/cl-semver-20201220-git.tgz - MD5 7fcc6938d4618687bf1e18ba40d6ac6e NAME cl-semver FILENAME cl-semver DEPS - ((NAME alexandria FILENAME alexandria) (NAME esrap FILENAME esrap) - (NAME named-readtables FILENAME named-readtables) - (NAME trivial-with-current-source-form FILENAME - trivial-with-current-source-form)) - DEPENDENCIES - (alexandria esrap named-readtables trivial-with-current-source-form) - VERSION 20201220-git SIBLINGS (cl-semver-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-shellwords.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-shellwords.nix deleted file mode 100644 index 268c260e1a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-shellwords.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-shellwords"; - version = "20150923-git"; - - description = "Common Lisp port of Ruby's shellwords.rb, for escaping and -splitting strings to be passed to a shell."; - - deps = [ args."cl-ppcre" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-shellwords/2015-09-23/cl-shellwords-20150923-git.tgz"; - sha256 = "1rb0ajpl2lai6bj4x0p3wf0cnf51nnyidhca4lpqp1w1wf1vkcqk"; - }; - - packageName = "cl-shellwords"; - - asdFilesToKeep = ["cl-shellwords.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-shellwords DESCRIPTION - Common Lisp port of Ruby's shellwords.rb, for escaping and -splitting strings to be passed to a shell. - SHA256 1rb0ajpl2lai6bj4x0p3wf0cnf51nnyidhca4lpqp1w1wf1vkcqk URL - http://beta.quicklisp.org/archive/cl-shellwords/2015-09-23/cl-shellwords-20150923-git.tgz - MD5 c2c62c6a2ce4ed2590d60707ead2e084 NAME cl-shellwords FILENAME - cl-shellwords DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES - (cl-ppcre) VERSION 20150923-git SIBLINGS (cl-shellwords-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-slice.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-slice.nix deleted file mode 100644 index 0966abf8e1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-slice.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-slice"; - version = "20210531-git"; - - parasites = [ "cl-slice-tests" ]; - - description = "DSL for array slices in Common Lisp."; - - deps = [ args."alexandria" args."anaphora" args."clunit" args."let-plus" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz"; - sha256 = "1jkm8yrnc0x2nx4bwwk56xda1r5h2aw0q4yfbv8lywaiwj92v7hk"; - }; - - packageName = "cl-slice"; - - asdFilesToKeep = ["cl-slice.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-slice DESCRIPTION DSL for array slices in Common Lisp. SHA256 - 1jkm8yrnc0x2nx4bwwk56xda1r5h2aw0q4yfbv8lywaiwj92v7hk URL - http://beta.quicklisp.org/archive/cl-slice/2021-05-31/cl-slice-20210531-git.tgz - MD5 d7be90ed28b5c316b1f31b4f567bd725 NAME cl-slice FILENAME cl-slice DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME clunit FILENAME clunit) (NAME let-plus FILENAME let-plus)) - DEPENDENCIES (alexandria anaphora clunit let-plus) VERSION 20210531-git - SIBLINGS NIL PARASITES (cl-slice-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-smt-lib.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-smt-lib.nix deleted file mode 100644 index 23a11c5176..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-smt-lib.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-smt-lib"; - version = "20211020-git"; - - description = "SMT object supporting SMT-LIB communication over input and output streams"; - - deps = [ args."asdf-package-system" args."named-readtables" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-smt-lib/2021-10-20/cl-smt-lib-20211020-git.tgz"; - sha256 = "1x2d79xcc0c56cb02axly6c10y6dmvxcpr3f16qry02rpfqys3qm"; - }; - - packageName = "cl-smt-lib"; - - asdFilesToKeep = ["cl-smt-lib.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-smt-lib DESCRIPTION - SMT object supporting SMT-LIB communication over input and output streams - SHA256 1x2d79xcc0c56cb02axly6c10y6dmvxcpr3f16qry02rpfqys3qm URL - http://beta.quicklisp.org/archive/cl-smt-lib/2021-10-20/cl-smt-lib-20211020-git.tgz - MD5 f22b48a87b78fb5b38b35d780d34cd77 NAME cl-smt-lib FILENAME cl-smt-lib - DEPS - ((NAME asdf-package-system FILENAME asdf-package-system) - (NAME named-readtables FILENAME named-readtables) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (asdf-package-system named-readtables trivial-gray-streams) - VERSION 20211020-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-smtp.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-smtp.nix deleted file mode 100644 index 9570254b8d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-smtp.nix +++ /dev/null @@ -1,39 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-smtp"; - version = "20210228-git"; - - description = "Common Lisp smtp client."; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-smtp/2021-02-28/cl-smtp-20210228-git.tgz"; - sha256 = "1x965jyhifx8hss2v6qc6lr54nlckchs712dny376krwkl43jh5g"; - }; - - packageName = "cl-smtp"; - - asdFilesToKeep = ["cl-smtp.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256 - 1x965jyhifx8hss2v6qc6lr54nlckchs712dny376krwkl43jh5g URL - http://beta.quicklisp.org/archive/cl-smtp/2021-02-28/cl-smtp-20210228-git.tgz - MD5 e2f9137807f80514e0433bf2e8522ee5 NAME cl-smtp FILENAME cl-smtp DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl_plus_ssl) - (NAME cl-base64 FILENAME cl-base64) - (NAME flexi-streams FILENAME flexi-streams) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cl+ssl cl-base64 flexi-streams - split-sequence trivial-features trivial-garbage trivial-gray-streams - usocket) - VERSION 20210228-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-speedy-queue.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-speedy-queue.nix deleted file mode 100644 index cb367af21f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-speedy-queue.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-speedy-queue"; - version = "20150302-git"; - - description = "cl-speedy-queue is a portable, non-consing, optimized queue implementation."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-speedy-queue/2015-03-02/cl-speedy-queue-20150302-git.tgz"; - sha256 = "1w83vckk0ldr61vpkwg4i8l2b2yx54cs4ak62j4lxhshax105rqr"; - }; - - packageName = "cl-speedy-queue"; - - asdFilesToKeep = ["cl-speedy-queue.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-speedy-queue DESCRIPTION - cl-speedy-queue is a portable, non-consing, optimized queue implementation. - SHA256 1w83vckk0ldr61vpkwg4i8l2b2yx54cs4ak62j4lxhshax105rqr URL - http://beta.quicklisp.org/archive/cl-speedy-queue/2015-03-02/cl-speedy-queue-20150302-git.tgz - MD5 509d1acf7e4cfcef99127de75b16521f NAME cl-speedy-queue FILENAME - cl-speedy-queue DEPS NIL DEPENDENCIES NIL VERSION 20150302-git SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-store.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-store.nix deleted file mode 100644 index 4e7f5e0f79..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-store.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-store"; - version = "20200925-git"; - - parasites = [ "cl-store-tests" ]; - - description = "Serialization package"; - - deps = [ args."rt" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz"; - sha256 = "0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3"; - }; - - packageName = "cl-store"; - - asdFilesToKeep = ["cl-store.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-store DESCRIPTION Serialization package SHA256 - 0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3 URL - http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz - MD5 828a6f3035c5ef869618f6848c47efd7 NAME cl-store FILENAME cl-store DEPS - ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20200925-git SIBLINGS NIL - PARASITES (cl-store-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-svg.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-svg.nix deleted file mode 100644 index 71ccef4a15..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-svg.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-svg"; - version = "20180228-git"; - - description = "Produce Scalable Vector Graphics (SVG) files"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-svg/2018-02-28/cl-svg-20180228-git.tgz"; - sha256 = "1ir299yg7210y1hwqs0di3gznj8ahsw16kf1n4yhfq78jswkrx48"; - }; - - packageName = "cl-svg"; - - asdFilesToKeep = ["cl-svg.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-svg DESCRIPTION Produce Scalable Vector Graphics (SVG) files - SHA256 1ir299yg7210y1hwqs0di3gznj8ahsw16kf1n4yhfq78jswkrx48 URL - http://beta.quicklisp.org/archive/cl-svg/2018-02-28/cl-svg-20180228-git.tgz - MD5 672145ecadef2259a3833886dbe68617 NAME cl-svg FILENAME cl-svg DEPS NIL - DEPENDENCIES NIL VERSION 20180228-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax-annot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax-annot.nix deleted file mode 100644 index a4f8cce8ba..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax-annot.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-syntax-annot"; - version = "cl-syntax-20150407-git"; - - description = "CL-Syntax Reader Syntax for cl-annot"; - - deps = [ args."alexandria" args."cl-annot" args."cl-syntax" args."named-readtables" args."trivial-types" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; - sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; - }; - - packageName = "cl-syntax-annot"; - - asdFilesToKeep = ["cl-syntax-annot.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-syntax-annot DESCRIPTION CL-Syntax Reader Syntax for cl-annot - SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL - http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz - MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-annot FILENAME - cl-syntax-annot DEPS - ((NAME alexandria FILENAME alexandria) (NAME cl-annot FILENAME cl-annot) - (NAME cl-syntax FILENAME cl-syntax) - (NAME named-readtables FILENAME named-readtables) - (NAME trivial-types FILENAME trivial-types)) - DEPENDENCIES (alexandria cl-annot cl-syntax named-readtables trivial-types) - VERSION cl-syntax-20150407-git SIBLINGS - (cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote - cl-syntax-interpol cl-syntax-markup cl-syntax) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax-anonfun.nix deleted file mode 100644 index c6f1932489..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax-anonfun.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-syntax-anonfun"; - version = "cl-syntax-20150407-git"; - - description = "CL-Syntax Reader Syntax for cl-anonfun"; - - deps = [ args."cl-anonfun" args."cl-syntax" args."named-readtables" args."trivial-types" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; - sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; - }; - - packageName = "cl-syntax-anonfun"; - - asdFilesToKeep = ["cl-syntax-anonfun.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-syntax-anonfun DESCRIPTION CL-Syntax Reader Syntax for cl-anonfun - SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL - http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz - MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-anonfun FILENAME - cl-syntax-anonfun DEPS - ((NAME cl-anonfun FILENAME cl-anonfun) (NAME cl-syntax FILENAME cl-syntax) - (NAME named-readtables FILENAME named-readtables) - (NAME trivial-types FILENAME trivial-types)) - DEPENDENCIES (cl-anonfun cl-syntax named-readtables trivial-types) VERSION - cl-syntax-20150407-git SIBLINGS - (cl-syntax-annot cl-syntax-clsql cl-syntax-fare-quasiquote - cl-syntax-interpol cl-syntax-markup cl-syntax) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax-markup.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax-markup.nix deleted file mode 100644 index ea955ba0bf..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax-markup.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-syntax-markup"; - version = "cl-syntax-20150407-git"; - - description = "CL-Syntax Reader Syntax for CL-Markup"; - - deps = [ args."cl-markup" args."cl-syntax" args."named-readtables" args."trivial-types" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; - sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; - }; - - packageName = "cl-syntax-markup"; - - asdFilesToKeep = ["cl-syntax-markup.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-syntax-markup DESCRIPTION CL-Syntax Reader Syntax for CL-Markup - SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL - http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz - MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-markup FILENAME - cl-syntax-markup DEPS - ((NAME cl-markup FILENAME cl-markup) (NAME cl-syntax FILENAME cl-syntax) - (NAME named-readtables FILENAME named-readtables) - (NAME trivial-types FILENAME trivial-types)) - DEPENDENCIES (cl-markup cl-syntax named-readtables trivial-types) VERSION - cl-syntax-20150407-git SIBLINGS - (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql - cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax.nix deleted file mode 100644 index 6a09c11d14..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syntax.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-syntax"; - version = "20150407-git"; - - description = "Reader Syntax Coventions for Common Lisp and SLIME"; - - deps = [ args."named-readtables" args."trivial-types" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz"; - sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n"; - }; - - packageName = "cl-syntax"; - - asdFilesToKeep = ["cl-syntax.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-syntax DESCRIPTION - Reader Syntax Coventions for Common Lisp and SLIME SHA256 - 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL - http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz - MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax FILENAME cl-syntax DEPS - ((NAME named-readtables FILENAME named-readtables) - (NAME trivial-types FILENAME trivial-types)) - DEPENDENCIES (named-readtables trivial-types) VERSION 20150407-git SIBLINGS - (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql - cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syslog.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syslog.nix deleted file mode 100644 index 695d1722dc..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-syslog.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-syslog"; - version = "20190202-git"; - - description = "Common Lisp syslog interface."; - - deps = [ args."alexandria" args."babel" args."cffi" args."global-vars" args."local-time" args."split-sequence" args."trivial-features" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-syslog/2019-02-02/cl-syslog-20190202-git.tgz"; - sha256 = "1kzz613y9fvx33svlwc65vjaj1cafnxz8icds80ww7il7y6alwgh"; - }; - - packageName = "cl-syslog"; - - asdFilesToKeep = ["cl-syslog.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-syslog DESCRIPTION Common Lisp syslog interface. SHA256 - 1kzz613y9fvx33svlwc65vjaj1cafnxz8icds80ww7il7y6alwgh URL - http://beta.quicklisp.org/archive/cl-syslog/2019-02-02/cl-syslog-20190202-git.tgz - MD5 eafff19eb1f38a36a9535c729d2217fe NAME cl-syslog FILENAME cl-syslog DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME global-vars FILENAME global-vars) - (NAME local-time FILENAME local-time) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features) - (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria babel cffi global-vars local-time split-sequence - trivial-features usocket) - VERSION 20190202-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-test-more.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-test-more.nix deleted file mode 100644 index 78a2abde95..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-test-more.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-test-more"; - version = "prove-20200218-git"; - - description = "System lacks description"; - - deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."prove" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; - sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn"; - }; - - packageName = "cl-test-more"; - - asdFilesToKeep = ["cl-test-more.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-test-more DESCRIPTION System lacks description SHA256 - 1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn URL - http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz - MD5 85780b65e84c17a78d658364b8c4d11b NAME cl-test-more FILENAME - cl-test-more DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME cl-ansi-text FILENAME cl-ansi-text) - (NAME cl-colors FILENAME cl-colors) (NAME cl-colors2 FILENAME cl-colors2) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME let-plus FILENAME let-plus) - (NAME prove FILENAME prove)) - DEPENDENCIES - (alexandria anaphora cl-ansi-text cl-colors cl-colors2 cl-ppcre let-plus - prove) - VERSION prove-20200218-git SIBLINGS (prove-asdf prove-test prove) PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-typesetting.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-typesetting.nix deleted file mode 100644 index 2794c47db9..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-typesetting.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-typesetting"; - version = "20210531-git"; - - description = "Common Lisp Typesetting system"; - - deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz"; - sha256 = "1gv21dsfghf8y2d7f5w5m8fn0q5l7xb8z7qw11wnnnd7msk11dd5"; - }; - - packageName = "cl-typesetting"; - - asdFilesToKeep = ["cl-typesetting.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-typesetting DESCRIPTION Common Lisp Typesetting system SHA256 - 1gv21dsfghf8y2d7f5w5m8fn0q5l7xb8z7qw11wnnnd7msk11dd5 URL - http://beta.quicklisp.org/archive/cl-typesetting/2021-05-31/cl-typesetting-20210531-git.tgz - MD5 849e6fb2c4a33f823c005e4e9abb31b5 NAME cl-typesetting FILENAME - cl-typesetting DEPS - ((NAME cl-pdf FILENAME cl-pdf) (NAME iterate FILENAME iterate) - (NAME zpb-ttf FILENAME zpb-ttf)) - DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20210531-git SIBLINGS - (xml-render cl-pdf-doc) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-unicode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-unicode.nix deleted file mode 100644 index 67209e03f8..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-unicode.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-unicode"; - version = "20210228-git"; - - parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ]; - - description = "Portable Unicode Library"; - - deps = [ args."cl-ppcre" args."flexi-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-unicode/2021-02-28/cl-unicode-20210228-git.tgz"; - sha256 = "0phy5wppb7m78dixrf2vjq8vas4drfd4qg38al6q8ymkl0yfy5js"; - }; - - packageName = "cl-unicode"; - - asdFilesToKeep = ["cl-unicode.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256 - 0phy5wppb7m78dixrf2vjq8vas4drfd4qg38al6q8ymkl0yfy5js URL - http://beta.quicklisp.org/archive/cl-unicode/2021-02-28/cl-unicode-20210228-git.tgz - MD5 5b3bdddde3be5b8427e3fac92495a10b NAME cl-unicode FILENAME cl-unicode - DEPS - ((NAME cl-ppcre FILENAME cl-ppcre) - (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20210228-git SIBLINGS NIL - PARASITES (cl-unicode/base cl-unicode/build cl-unicode/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-unification.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-unification.nix deleted file mode 100644 index 0f84f3400e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-unification.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-unification"; - version = "20200925-git"; - - description = "The CL-UNIFICATION system. - -The system contains the definitions for the 'unification' machinery."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz"; - sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais"; - }; - - packageName = "cl-unification"; - - asdFilesToKeep = ["cl-unification.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system. - -The system contains the definitions for the 'unification' machinery. - SHA256 05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais URL - http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz - MD5 90588d566c2e12dac3530b65384a87ab NAME cl-unification FILENAME - cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS - (cl-unification-lib cl-unification-test cl-ppcre-template) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-utilities.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-utilities.nix deleted file mode 100644 index cfe7a2a9f3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-utilities.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-utilities"; - version = "1.2.4"; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz"; - sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87"; - }; - - packageName = "cl-utilities"; - - asdFilesToKeep = ["cl-utilities.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-utilities DESCRIPTION System lacks description SHA256 - 1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87 URL - http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz - MD5 c3a4ba38b627448d3ed40ce888048940 NAME cl-utilities FILENAME - cl-utilities DEPS NIL DEPENDENCIES NIL VERSION 1.2.4 SIBLINGS NIL PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-vectors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-vectors.nix deleted file mode 100644 index a6fc607c64..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-vectors.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-vectors"; - version = "20180228-git"; - - description = "cl-paths: vectorial paths manipulation"; - - deps = [ args."cl-aa" args."cl-paths" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz"; - sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly"; - }; - - packageName = "cl-vectors"; - - asdFilesToKeep = ["cl-vectors.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 - 0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly URL - http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz - MD5 9d9629786d4f2c19c15cc6cd3049c343 NAME cl-vectors FILENAME cl-vectors - DEPS ((NAME cl-aa FILENAME cl-aa) (NAME cl-paths FILENAME cl-paths)) - DEPENDENCIES (cl-aa cl-paths) VERSION 20180228-git SIBLINGS - (cl-aa-misc cl-aa cl-paths-ttf cl-paths) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-webkit2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-webkit2.nix deleted file mode 100644 index aef004926c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-webkit2.nix +++ /dev/null @@ -1,44 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-webkit2"; - version = "cl-webkit-20211209-git"; - - description = "An FFI binding to WebKit2GTK+"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-webkit/2021-12-09/cl-webkit-20211209-git.tgz"; - sha256 = "1lpzp9rb011zbl8j2jpqhal38slyqq1p6cxxjk51h6mdq7x7z1a0"; - }; - - packageName = "cl-webkit2"; - - asdFilesToKeep = ["cl-webkit2.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-webkit2 DESCRIPTION An FFI binding to WebKit2GTK+ SHA256 - 1lpzp9rb011zbl8j2jpqhal38slyqq1p6cxxjk51h6mdq7x7z1a0 URL - http://beta.quicklisp.org/archive/cl-webkit/2021-12-09/cl-webkit-20211209-git.tgz - MD5 cf710088281b691a91aa29566f50f83a NAME cl-webkit2 FILENAME cl-webkit2 - DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cl-cffi-gtk FILENAME cl-cffi-gtk) - (NAME cl-cffi-gtk-cairo FILENAME cl-cffi-gtk-cairo) - (NAME cl-cffi-gtk-gdk FILENAME cl-cffi-gtk-gdk) - (NAME cl-cffi-gtk-gdk-pixbuf FILENAME cl-cffi-gtk-gdk-pixbuf) - (NAME cl-cffi-gtk-gio FILENAME cl-cffi-gtk-gio) - (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) - (NAME cl-cffi-gtk-gobject FILENAME cl-cffi-gtk-gobject) - (NAME cl-cffi-gtk-pango FILENAME cl-cffi-gtk-pango) - (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cl-cffi-gtk cl-cffi-gtk-cairo - cl-cffi-gtk-gdk cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gio cl-cffi-gtk-glib - cl-cffi-gtk-gobject cl-cffi-gtk-pango closer-mop iterate trivial-features - trivial-garbage) - VERSION cl-webkit-20211209-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-who.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-who.nix deleted file mode 100644 index 3e19170e63..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-who.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-who"; - version = "20190710-git"; - - parasites = [ "cl-who-test" ]; - - description = "(X)HTML generation macros"; - - deps = [ args."flexi-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz"; - sha256 = "0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir"; - }; - - packageName = "cl-who"; - - asdFilesToKeep = ["cl-who.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-who DESCRIPTION (X)HTML generation macros SHA256 - 0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir URL - http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz - MD5 e5bb2856ed62d76528e4cef7b5e701c0 NAME cl-who FILENAME cl-who DEPS - ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams) - VERSION 20190710-git SIBLINGS NIL PARASITES (cl-who-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-xmlspam.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-xmlspam.nix deleted file mode 100644 index ae6b0b336c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl-xmlspam.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl-xmlspam"; - version = "20101006-http"; - - description = "Streaming pattern matching for XML"; - - deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."puri" args."trivial-features" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz"; - sha256 = "1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h"; - }; - - packageName = "cl-xmlspam"; - - asdFilesToKeep = ["cl-xmlspam.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-xmlspam DESCRIPTION Streaming pattern matching for XML SHA256 - 1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h URL - http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz - MD5 6e3a0944e96e17916b1445f4207babb8 NAME cl-xmlspam FILENAME cl-xmlspam - DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cl-ppcre FILENAME cl-ppcre) - (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) - (NAME puri FILENAME puri) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES - (alexandria babel cl-ppcre closure-common cxml puri trivial-features - trivial-gray-streams) - VERSION 20101006-http SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl_plus_ssl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl_plus_ssl.nix deleted file mode 100644 index 3278bc9977..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cl_plus_ssl.nix +++ /dev/null @@ -1,39 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cl_plus_ssl"; - version = "cl+ssl-20211209-git"; - - parasites = [ "cl+ssl/config" ]; - - description = "Common Lisp interface to OpenSSL."; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl+ssl/2021-12-09/cl+ssl-20211209-git.tgz"; - sha256 = "1m1dx4jfqpd2jdica7safq3fig31xyn96a0yslvszbhkyn22r0nb"; - }; - - packageName = "cl+ssl"; - - asdFilesToKeep = ["cl+ssl.asd"]; - overrides = x: x; -} -/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 - 1m1dx4jfqpd2jdica7safq3fig31xyn96a0yslvszbhkyn22r0nb URL - http://beta.quicklisp.org/archive/cl+ssl/2021-12-09/cl+ssl-20211209-git.tgz - MD5 900134876fea38710e6535420ec60864 NAME cl+ssl FILENAME cl_plus_ssl DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME uiop FILENAME uiop) (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi flexi-streams split-sequence - trivial-features trivial-garbage trivial-gray-streams uiop usocket) - VERSION cl+ssl-20211209-git SIBLINGS (cl+ssl.test) PARASITES - (cl+ssl/config)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack-handler-hunchentoot.nix deleted file mode 100644 index 3c18fd9119..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack-handler-hunchentoot.nix +++ /dev/null @@ -1,55 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clack-handler-hunchentoot"; - version = "clack-20210411-git"; - - description = "Clack handler for Hunchentoot."; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz"; - sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf"; - }; - - packageName = "clack-handler-hunchentoot"; - - asdFilesToKeep = ["clack-handler-hunchentoot.asd"]; - overrides = x: x; -} -/* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot. - SHA256 0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL - http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz - MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-handler-hunchentoot - FILENAME clack-handler-hunchentoot DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) - (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME clack-socket FILENAME clack-socket) - (NAME flexi-streams FILENAME flexi-streams) - (NAME hunchentoot FILENAME hunchentoot) (NAME md5 FILENAME md5) - (NAME rfc2388 FILENAME rfc2388) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-backtrace FILENAME trivial-backtrace) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi chunga cl+ssl cl-base64 cl-fad - cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence - trivial-backtrace trivial-features trivial-garbage trivial-gray-streams - usocket) - VERSION clack-20210411-git SIBLINGS - (clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket - clack-test clack-v1-compat clack t-clack-handler-fcgi - t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie - t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql - clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth - clack-middleware-postmodern clack-middleware-rucksack - clack-session-store-dbi t-clack-middleware-auth-basic - t-clack-middleware-csrf) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack-socket.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack-socket.nix deleted file mode 100644 index 3418c76a5d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack-socket.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clack-socket"; - version = "clack-20211209-git"; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2021-12-09/clack-20211209-git.tgz"; - sha256 = "1gp323083ds89cw3vd6w40d4cwx04y0qaqdz4wx2332klhvvdnsd"; - }; - - packageName = "clack-socket"; - - asdFilesToKeep = ["clack-socket.asd"]; - overrides = x: x; -} -/* (SYSTEM clack-socket DESCRIPTION System lacks description SHA256 - 1gp323083ds89cw3vd6w40d4cwx04y0qaqdz4wx2332klhvvdnsd URL - http://beta.quicklisp.org/archive/clack/2021-12-09/clack-20211209-git.tgz - MD5 c223a854a79b257e0489e185abe48e16 NAME clack-socket FILENAME - clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20211209-git SIBLINGS - (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot - clack-handler-wookie clack-test clack t-clack-handler-fcgi - t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack-test.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack-test.nix deleted file mode 100644 index ab2794fbdd..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack-test.nix +++ /dev/null @@ -1,80 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clack-test"; - version = "clack-20210411-git"; - - description = "Testing Clack Applications."; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz"; - sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf"; - }; - - packageName = "clack-test"; - - asdFilesToKeep = ["clack-test.asd"]; - overrides = x: x; -} -/* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256 - 0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL - http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz - MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-test FILENAME clack-test - DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) - (NAME cl-annot FILENAME cl-annot) (NAME cl-base64 FILENAME cl-base64) - (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport) - (NAME cl-syntax FILENAME cl-syntax) - (NAME cl-syntax-annot FILENAME cl-syntax-annot) - (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack) - (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot) - (NAME clack-socket FILENAME clack-socket) (NAME dexador FILENAME dexador) - (NAME dissect FILENAME dissect) (NAME fast-http FILENAME fast-http) - (NAME fast-io FILENAME fast-io) - (NAME flexi-streams FILENAME flexi-streams) - (NAME http-body FILENAME http-body) - (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad) - (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack) - (NAME lack-component FILENAME lack-component) - (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) - (NAME lack-util FILENAME lack-util) (NAME local-time FILENAME local-time) - (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables) - (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) - (NAME rfc2388 FILENAME rfc2388) (NAME rove FILENAME rove) - (NAME smart-buffer FILENAME smart-buffer) - (NAME split-sequence FILENAME split-sequence) - (NAME static-vectors FILENAME static-vectors) - (NAME trivial-backtrace FILENAME trivial-backtrace) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME trivial-mimes FILENAME trivial-mimes) - (NAME trivial-types FILENAME trivial-types) - (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain chipz - chunga cl+ssl cl-annot cl-base64 cl-cookie cl-fad cl-ppcre cl-reexport - cl-syntax cl-syntax-annot cl-utilities clack clack-handler-hunchentoot - clack-socket dexador dissect fast-http fast-io flexi-streams http-body - hunchentoot ironclad jonathan lack lack-component - lack-middleware-backtrace lack-util local-time md5 named-readtables - proc-parse quri rfc2388 rove smart-buffer split-sequence static-vectors - trivial-backtrace trivial-features trivial-garbage trivial-gray-streams - trivial-mimes trivial-types usocket xsubseq) - VERSION clack-20210411-git SIBLINGS - (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot - clack-handler-wookie clack-socket clack-v1-compat clack - t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot - t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic - clack-middleware-clsql clack-middleware-csrf clack-middleware-dbi - clack-middleware-oauth clack-middleware-postmodern - clack-middleware-rucksack clack-session-store-dbi - t-clack-middleware-auth-basic t-clack-middleware-csrf) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack.nix deleted file mode 100644 index 74038d47d8..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clack.nix +++ /dev/null @@ -1,40 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clack"; - version = "20211209-git"; - - description = "Web application environment for Common Lisp"; - - deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."split-sequence" args."uiop" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clack/2021-12-09/clack-20211209-git.tgz"; - sha256 = "1gp323083ds89cw3vd6w40d4cwx04y0qaqdz4wx2332klhvvdnsd"; - }; - - packageName = "clack"; - - asdFilesToKeep = ["clack.asd"]; - overrides = x: x; -} -/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 - 1gp323083ds89cw3vd6w40d4cwx04y0qaqdz4wx2332klhvvdnsd URL - http://beta.quicklisp.org/archive/clack/2021-12-09/clack-20211209-git.tgz - MD5 c223a854a79b257e0489e185abe48e16 NAME clack FILENAME clack DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack) - (NAME lack-component FILENAME lack-component) - (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) - (NAME lack-util FILENAME lack-util) - (NAME split-sequence FILENAME split-sequence) (NAME uiop FILENAME uiop) - (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria bordeaux-threads ironclad lack lack-component - lack-middleware-backtrace lack-util split-sequence uiop usocket) - VERSION 20211209-git SIBLINGS - (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot - clack-handler-wookie clack-socket clack-test t-clack-handler-fcgi - t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/classowary.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/classowary.nix deleted file mode 100644 index 375666d6fc..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/classowary.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "classowary"; - version = "20191007-git"; - - description = "An implementation of the Cassowary linear constraint solver toolkit"; - - deps = [ args."documentation-utils" args."trivial-indent" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/classowary/2019-10-07/classowary-20191007-git.tgz"; - sha256 = "1r3535lgap7218v51k5rn2wlml4mlam3sgjg1lvac1vybiv4c287"; - }; - - packageName = "classowary"; - - asdFilesToKeep = ["classowary.asd"]; - overrides = x: x; -} -/* (SYSTEM classowary DESCRIPTION - An implementation of the Cassowary linear constraint solver toolkit SHA256 - 1r3535lgap7218v51k5rn2wlml4mlam3sgjg1lvac1vybiv4c287 URL - http://beta.quicklisp.org/archive/classowary/2019-10-07/classowary-20191007-git.tgz - MD5 a2587986780a40251b0327686b817cc6 NAME classowary FILENAME classowary - DEPS - ((NAME documentation-utils FILENAME documentation-utils) - (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (documentation-utils trivial-indent) VERSION 20191007-git - SIBLINGS (classowary-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clfswm.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clfswm.nix deleted file mode 100644 index ccd9fe6131..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clfswm.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clfswm"; - version = "20161204-git"; - - description = "CLFSWM: Fullscreen Window Manager"; - - deps = [ args."clx" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz"; - sha256 = "1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73"; - }; - - packageName = "clfswm"; - - asdFilesToKeep = ["clfswm.asd"]; - overrides = x: x; -} -/* (SYSTEM clfswm DESCRIPTION CLFSWM: Fullscreen Window Manager SHA256 - 1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73 URL - http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz - MD5 dc976785ef899837ab0fc50a4ed6b740 NAME clfswm FILENAME clfswm DEPS - ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION 20161204-git SIBLINGS - NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/closer-mop.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/closer-mop.nix deleted file mode 100644 index a6de9070d9..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/closer-mop.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "closer-mop"; - version = "20211209-git"; - - description = "Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/closer-mop/2021-12-09/closer-mop-20211209-git.tgz"; - sha256 = "1zrjsibbph8dz8k0qjawp9c22094rag3aasd4r761m2r482xf5zl"; - }; - - packageName = "closer-mop"; - - asdFilesToKeep = ["closer-mop.asd"]; - overrides = x: x; -} -/* (SYSTEM closer-mop DESCRIPTION - Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 1zrjsibbph8dz8k0qjawp9c22094rag3aasd4r761m2r482xf5zl URL - http://beta.quicklisp.org/archive/closer-mop/2021-12-09/closer-mop-20211209-git.tgz - MD5 0b2a02f6b6a57b5b707df5e1d51950cd NAME closer-mop FILENAME closer-mop - DEPS NIL DEPENDENCIES NIL VERSION 20211209-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/closure-common.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/closure-common.nix deleted file mode 100644 index 6720aa516d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/closure-common.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "closure-common"; - version = "20181018-git"; - - description = "System lacks description"; - - deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz"; - sha256 = "18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn"; - }; - - packageName = "closure-common"; - - asdFilesToKeep = ["closure-common.asd"]; - overrides = x: x; -} -/* (SYSTEM closure-common DESCRIPTION System lacks description SHA256 - 18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn URL - http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz - MD5 b09ee60c258a29f0c107960ec4c04ada NAME closure-common FILENAME - closure-common DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria babel trivial-features trivial-gray-streams) - VERSION 20181018-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/closure-html.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/closure-html.nix deleted file mode 100644 index a0233a31be..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/closure-html.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "closure-html"; - version = "20180711-git"; - - description = "System lacks description"; - - deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz"; - sha256 = "0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq"; - }; - - packageName = "closure-html"; - - asdFilesToKeep = ["closure-html.asd"]; - overrides = x: x; -} -/* (SYSTEM closure-html DESCRIPTION System lacks description SHA256 - 0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq URL - http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz - MD5 461dc8caa65385da5f2d1cd8dd4f965f NAME closure-html FILENAME - closure-html DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME closure-common FILENAME closure-common) - (NAME flexi-streams FILENAME flexi-streams) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES - (alexandria babel closure-common flexi-streams trivial-features - trivial-gray-streams) - VERSION 20180711-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-postgresql-socket.nix deleted file mode 100644 index 9ec7791eec..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-postgresql-socket.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clsql-postgresql-socket"; - version = "clsql-20210228-git"; - - description = "Common Lisp SQL PostgreSQL Socket Driver"; - - deps = [ args."clsql" args."md5" args."uffi" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz"; - sha256 = "0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4"; - }; - - packageName = "clsql-postgresql-socket"; - - asdFilesToKeep = ["clsql-postgresql-socket.asd"]; - overrides = x: x; -} -/* (SYSTEM clsql-postgresql-socket DESCRIPTION - Common Lisp SQL PostgreSQL Socket Driver SHA256 - 0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4 URL - http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz - MD5 d32b2b37e4211f5da61d2e29847a2f12 NAME clsql-postgresql-socket FILENAME - clsql-postgresql-socket DEPS - ((NAME clsql FILENAME clsql) (NAME md5 FILENAME md5) - (NAME uffi FILENAME uffi)) - DEPENDENCIES (clsql md5 uffi) VERSION clsql-20210228-git SIBLINGS - (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket3 - clsql-postgresql clsql-sqlite clsql-sqlite3 clsql-tests clsql-uffi clsql) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-postgresql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-postgresql.nix deleted file mode 100644 index 0c75f8a277..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-postgresql.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clsql-postgresql"; - version = "clsql-20210228-git"; - - description = "Common Lisp PostgreSQL API Driver"; - - deps = [ args."clsql" args."clsql-uffi" args."uffi" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz"; - sha256 = "0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4"; - }; - - packageName = "clsql-postgresql"; - - asdFilesToKeep = ["clsql-postgresql.asd"]; - overrides = x: x; -} -/* (SYSTEM clsql-postgresql DESCRIPTION Common Lisp PostgreSQL API Driver - SHA256 0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4 URL - http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz - MD5 d32b2b37e4211f5da61d2e29847a2f12 NAME clsql-postgresql FILENAME - clsql-postgresql DEPS - ((NAME clsql FILENAME clsql) (NAME clsql-uffi FILENAME clsql-uffi) - (NAME uffi FILENAME uffi)) - DEPENDENCIES (clsql clsql-uffi uffi) VERSION clsql-20210228-git SIBLINGS - (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket - clsql-postgresql-socket3 clsql-sqlite clsql-sqlite3 clsql-tests clsql-uffi - clsql) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-sqlite3.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-sqlite3.nix deleted file mode 100644 index e0f8c6ad35..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-sqlite3.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clsql-sqlite3"; - version = "clsql-20210228-git"; - - description = "Common Lisp Sqlite3 Driver"; - - deps = [ args."clsql" args."clsql-uffi" args."uffi" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz"; - sha256 = "0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4"; - }; - - packageName = "clsql-sqlite3"; - - asdFilesToKeep = ["clsql-sqlite3.asd"]; - overrides = x: x; -} -/* (SYSTEM clsql-sqlite3 DESCRIPTION Common Lisp Sqlite3 Driver SHA256 - 0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4 URL - http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz - MD5 d32b2b37e4211f5da61d2e29847a2f12 NAME clsql-sqlite3 FILENAME - clsql-sqlite3 DEPS - ((NAME clsql FILENAME clsql) (NAME clsql-uffi FILENAME clsql-uffi) - (NAME uffi FILENAME uffi)) - DEPENDENCIES (clsql clsql-uffi uffi) VERSION clsql-20210228-git SIBLINGS - (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket - clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-tests - clsql-uffi clsql) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-uffi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-uffi.nix deleted file mode 100644 index 566ee1a87f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql-uffi.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clsql-uffi"; - version = "clsql-20210228-git"; - - description = "Common UFFI Helper functions for Common Lisp SQL Interface Library"; - - deps = [ args."clsql" args."uffi" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz"; - sha256 = "0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4"; - }; - - packageName = "clsql-uffi"; - - asdFilesToKeep = ["clsql-uffi.asd"]; - overrides = x: x; -} -/* (SYSTEM clsql-uffi DESCRIPTION - Common UFFI Helper functions for Common Lisp SQL Interface Library SHA256 - 0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4 URL - http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz - MD5 d32b2b37e4211f5da61d2e29847a2f12 NAME clsql-uffi FILENAME clsql-uffi - DEPS ((NAME clsql FILENAME clsql) (NAME uffi FILENAME uffi)) DEPENDENCIES - (clsql uffi) VERSION clsql-20210228-git SIBLINGS - (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket - clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3 - clsql-tests clsql) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql.nix deleted file mode 100644 index 282262927f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clsql.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clsql"; - version = "20210228-git"; - - description = "Common Lisp SQL Interface library"; - - deps = [ args."uffi" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz"; - sha256 = "0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4"; - }; - - packageName = "clsql"; - - asdFilesToKeep = ["clsql.asd"]; - overrides = x: x; -} -/* (SYSTEM clsql DESCRIPTION Common Lisp SQL Interface library SHA256 - 0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4 URL - http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz - MD5 d32b2b37e4211f5da61d2e29847a2f12 NAME clsql FILENAME clsql DEPS - ((NAME uffi FILENAME uffi)) DEPENDENCIES (uffi) VERSION 20210228-git - SIBLINGS - (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket - clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3 - clsql-tests clsql-uffi) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clss.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clss.nix deleted file mode 100644 index af74074f08..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clss.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clss"; - version = "20191130-git"; - - description = "A DOM tree searching engine based on CSS selectors."; - - deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz"; - sha256 = "0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka"; - }; - - packageName = "clss"; - - asdFilesToKeep = ["clss.asd"]; - overrides = x: x; -} -/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. - SHA256 0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka URL - http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz MD5 - 9910677b36df00f3046905a9b84122a9 NAME clss FILENAME clss DEPS - ((NAME array-utils FILENAME array-utils) - (NAME documentation-utils FILENAME documentation-utils) - (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION - 20191130-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clump-2-3-tree.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clump-2-3-tree.nix deleted file mode 100644 index 53b4db5dc1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clump-2-3-tree.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clump-2-3-tree"; - version = "clump-20160825-git"; - - description = "System lacks description"; - - deps = [ args."acclimation" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; - sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl"; - }; - - packageName = "clump-2-3-tree"; - - asdFilesToKeep = ["clump-2-3-tree.asd"]; - overrides = x: x; -} -/* (SYSTEM clump-2-3-tree DESCRIPTION System lacks description SHA256 - 1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl URL - http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz - MD5 5132d2800138d435ef69f7e68b025c8f NAME clump-2-3-tree FILENAME - clump-2-3-tree DEPS ((NAME acclimation FILENAME acclimation)) DEPENDENCIES - (acclimation) VERSION clump-20160825-git SIBLINGS - (clump-binary-tree clump-test clump) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clump-binary-tree.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clump-binary-tree.nix deleted file mode 100644 index 2f71fb3eb9..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clump-binary-tree.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clump-binary-tree"; - version = "clump-20160825-git"; - - description = "System lacks description"; - - deps = [ args."acclimation" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; - sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl"; - }; - - packageName = "clump-binary-tree"; - - asdFilesToKeep = ["clump-binary-tree.asd"]; - overrides = x: x; -} -/* (SYSTEM clump-binary-tree DESCRIPTION System lacks description SHA256 - 1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl URL - http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz - MD5 5132d2800138d435ef69f7e68b025c8f NAME clump-binary-tree FILENAME - clump-binary-tree DEPS ((NAME acclimation FILENAME acclimation)) - DEPENDENCIES (acclimation) VERSION clump-20160825-git SIBLINGS - (clump-2-3-tree clump-test clump) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clump.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clump.nix deleted file mode 100644 index 4591b00a78..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clump.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clump"; - version = "20160825-git"; - - description = "Library for operations on different kinds of trees"; - - deps = [ args."acclimation" args."clump-2-3-tree" args."clump-binary-tree" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz"; - sha256 = "1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl"; - }; - - packageName = "clump"; - - asdFilesToKeep = ["clump.asd"]; - overrides = x: x; -} -/* (SYSTEM clump DESCRIPTION Library for operations on different kinds of trees - SHA256 1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl URL - http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz - MD5 5132d2800138d435ef69f7e68b025c8f NAME clump FILENAME clump DEPS - ((NAME acclimation FILENAME acclimation) - (NAME clump-2-3-tree FILENAME clump-2-3-tree) - (NAME clump-binary-tree FILENAME clump-binary-tree)) - DEPENDENCIES (acclimation clump-2-3-tree clump-binary-tree) VERSION - 20160825-git SIBLINGS (clump-2-3-tree clump-binary-tree clump-test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clunit.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clunit.nix deleted file mode 100644 index d5012847ca..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clunit.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clunit"; - version = "20171019-git"; - - description = "CLUnit is a Common Lisp unit testing framework."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz"; - sha256 = "1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5"; - }; - - packageName = "clunit"; - - asdFilesToKeep = ["clunit.asd"]; - overrides = x: x; -} -/* (SYSTEM clunit DESCRIPTION CLUnit is a Common Lisp unit testing framework. - SHA256 1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5 URL - http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz - MD5 389017f2f05a6287078ddacd0471817e NAME clunit FILENAME clunit DEPS NIL - DEPENDENCIES NIL VERSION 20171019-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clunit2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clunit2.nix deleted file mode 100644 index 2c1a1b3923..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clunit2.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clunit2"; - version = "20211020-git"; - - description = "CLUnit is a Common Lisp unit testing framework."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clunit2/2021-10-20/clunit2-20211020-git.tgz"; - sha256 = "0qly5gk1fn0bd0kx6spdhmnsf58gdg19py46w10p5vvs41vvriy3"; - }; - - packageName = "clunit2"; - - asdFilesToKeep = ["clunit2.asd"]; - overrides = x: x; -} -/* (SYSTEM clunit2 DESCRIPTION CLUnit is a Common Lisp unit testing framework. - SHA256 0qly5gk1fn0bd0kx6spdhmnsf58gdg19py46w10p5vvs41vvriy3 URL - http://beta.quicklisp.org/archive/clunit2/2021-10-20/clunit2-20211020-git.tgz - MD5 0ee5b2d53c81e9640d3aa8c904b0b236 NAME clunit2 FILENAME clunit2 DEPS NIL - DEPENDENCIES NIL VERSION 20211020-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clx.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clx.nix deleted file mode 100644 index 7518845bd1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/clx.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "clx"; - version = "20211020-git"; - - parasites = [ "clx/test" ]; - - description = "An implementation of the X Window System protocol in Lisp."; - - deps = [ args."fiasco" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clx/2021-10-20/clx-20211020-git.tgz"; - sha256 = "1mgqcqakbm8s4w2r9831xzhy9lyifcl2b3rhl5p76s5vpnjmp88k"; - }; - - packageName = "clx"; - - asdFilesToKeep = ["clx.asd"]; - overrides = x: x; -} -/* (SYSTEM clx DESCRIPTION - An implementation of the X Window System protocol in Lisp. SHA256 - 1mgqcqakbm8s4w2r9831xzhy9lyifcl2b3rhl5p76s5vpnjmp88k URL - http://beta.quicklisp.org/archive/clx/2021-10-20/clx-20211020-git.tgz MD5 - ac10db96a6426cf462f8d417a7797621 NAME clx FILENAME clx DEPS - ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20211020-git - SIBLINGS NIL PARASITES (clx/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/collectors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/collectors.nix deleted file mode 100644 index a99211953c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/collectors.nix +++ /dev/null @@ -1,36 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "collectors"; - version = "20161204-git"; - - parasites = [ "collectors-test" ]; - - description = "A library providing various collector type macros - pulled from arnesi into its own library and stripped of dependencies"; - - deps = [ args."alexandria" args."closer-mop" args."iterate" args."lisp-unit2" args."symbol-munger" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz"; - sha256 = "0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf"; - }; - - packageName = "collectors"; - - asdFilesToKeep = ["collectors.asd"]; - overrides = x: x; -} -/* (SYSTEM collectors DESCRIPTION - A library providing various collector type macros - pulled from arnesi into its own library and stripped of dependencies - SHA256 0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf URL - http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz - MD5 59c8c885a8e512d4f09e73d3e0c97b1f NAME collectors FILENAME collectors - DEPS - ((NAME alexandria FILENAME alexandria) - (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) - (NAME lisp-unit2 FILENAME lisp-unit2) - (NAME symbol-munger FILENAME symbol-munger)) - DEPENDENCIES (alexandria closer-mop iterate lisp-unit2 symbol-munger) - VERSION 20161204-git SIBLINGS NIL PARASITES (collectors-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/colorize.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/colorize.nix deleted file mode 100644 index b1e1906aa5..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/colorize.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "colorize"; - version = "20180228-git"; - - description = "A Syntax highlighting library"; - - deps = [ args."alexandria" args."html-encode" args."split-sequence" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz"; - sha256 = "1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h"; - }; - - packageName = "colorize"; - - asdFilesToKeep = ["colorize.asd"]; - overrides = x: x; -} -/* (SYSTEM colorize DESCRIPTION A Syntax highlighting library SHA256 - 1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h URL - http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz - MD5 1bc08c8f76b747e4d254669a205dc611 NAME colorize FILENAME colorize DEPS - ((NAME alexandria FILENAME alexandria) - (NAME html-encode FILENAME html-encode) - (NAME split-sequence FILENAME split-sequence)) - DEPENDENCIES (alexandria html-encode split-sequence) VERSION 20180228-git - SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/command-line-arguments.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/command-line-arguments.nix deleted file mode 100644 index 9ace0471ec..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/command-line-arguments.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "command-line-arguments"; - version = "20210807-git"; - - parasites = [ "command-line-arguments/test" ]; - - description = "small library to deal with command-line arguments"; - - deps = [ args."alexandria" args."hu_dot_dwim_dot_stefil" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/command-line-arguments/2021-08-07/command-line-arguments-20210807-git.tgz"; - sha256 = "1ggrzdaw79ls7hk629m31z0pikibqi8x1hyi3fwd0zc8w9k3k6wk"; - }; - - packageName = "command-line-arguments"; - - asdFilesToKeep = ["command-line-arguments.asd"]; - overrides = x: x; -} -/* (SYSTEM command-line-arguments DESCRIPTION - small library to deal with command-line arguments SHA256 - 1ggrzdaw79ls7hk629m31z0pikibqi8x1hyi3fwd0zc8w9k3k6wk URL - http://beta.quicklisp.org/archive/command-line-arguments/2021-08-07/command-line-arguments-20210807-git.tgz - MD5 b50ca36f5b2b19d4322ac5b5969fee22 NAME command-line-arguments FILENAME - command-line-arguments DEPS - ((NAME alexandria FILENAME alexandria) - (NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil)) - DEPENDENCIES (alexandria hu.dwim.stefil) VERSION 20210807-git SIBLINGS NIL - PARASITES (command-line-arguments/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-lite.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-lite.nix deleted file mode 100644 index e29b9910ae..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-lite.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "css-lite"; - version = "20120407-git"; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz"; - sha256 = "1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg"; - }; - - packageName = "css-lite"; - - asdFilesToKeep = ["css-lite.asd"]; - overrides = x: x; -} -/* (SYSTEM css-lite DESCRIPTION System lacks description SHA256 - 1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg URL - http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz - MD5 9b25afb0d2c3f0c32d2303ab1d3f570d NAME css-lite FILENAME css-lite DEPS - NIL DEPENDENCIES NIL VERSION 20120407-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-selectors-simple-tree.nix deleted file mode 100644 index fcd4a6918c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-selectors-simple-tree.nix +++ /dev/null @@ -1,52 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "css-selectors-simple-tree"; - version = "css-selectors-20160628-git"; - - description = "An implementation of css selectors that interacts with cl-html5-parser's simple-tree"; - - deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; - sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b"; - }; - - packageName = "css-selectors-simple-tree"; - - asdFilesToKeep = ["css-selectors-simple-tree.asd"]; - overrides = x: x; -} -/* (SYSTEM css-selectors-simple-tree DESCRIPTION - An implementation of css selectors that interacts with cl-html5-parser's simple-tree - SHA256 0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b URL - http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz - MD5 28537144b89af4ebe28c2eb365d5569f NAME css-selectors-simple-tree - FILENAME css-selectors-simple-tree DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME buildnode FILENAME buildnode) - (NAME cl-html5-parser FILENAME cl-html5-parser) - (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-unicode FILENAME cl-unicode) - (NAME closer-mop FILENAME closer-mop) - (NAME closure-common FILENAME closure-common) - (NAME closure-html FILENAME closure-html) - (NAME collectors FILENAME collectors) - (NAME css-selectors FILENAME css-selectors) (NAME cxml FILENAME cxml) - (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) - (NAME named-readtables FILENAME named-readtables) - (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) - (NAME string-case FILENAME string-case) (NAME swank FILENAME swank) - (NAME symbol-munger FILENAME symbol-munger) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME yacc FILENAME yacc)) - DEPENDENCIES - (alexandria babel buildnode cl-html5-parser cl-interpol cl-ppcre cl-unicode - closer-mop closure-common closure-html collectors css-selectors cxml - flexi-streams iterate named-readtables puri split-sequence string-case - swank symbol-munger trivial-features trivial-gray-streams yacc) - VERSION css-selectors-20160628-git SIBLINGS - (css-selectors-stp css-selectors) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-selectors-stp.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-selectors-stp.nix deleted file mode 100644 index 66917f32d3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-selectors-stp.nix +++ /dev/null @@ -1,52 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "css-selectors-stp"; - version = "css-selectors-20160628-git"; - - description = "An implementation of css selectors that interacts with cxml-stp"; - - deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-stp" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; - sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b"; - }; - - packageName = "css-selectors-stp"; - - asdFilesToKeep = ["css-selectors-stp.asd"]; - overrides = x: x; -} -/* (SYSTEM css-selectors-stp DESCRIPTION - An implementation of css selectors that interacts with cxml-stp SHA256 - 0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b URL - http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz - MD5 28537144b89af4ebe28c2eb365d5569f NAME css-selectors-stp FILENAME - css-selectors-stp DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME buildnode FILENAME buildnode) - (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-unicode FILENAME cl-unicode) - (NAME closer-mop FILENAME closer-mop) - (NAME closure-common FILENAME closure-common) - (NAME closure-html FILENAME closure-html) - (NAME collectors FILENAME collectors) - (NAME css-selectors FILENAME css-selectors) (NAME cxml FILENAME cxml) - (NAME cxml-stp FILENAME cxml-stp) - (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) - (NAME named-readtables FILENAME named-readtables) - (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri) - (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank) - (NAME symbol-munger FILENAME symbol-munger) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc)) - DEPENDENCIES - (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop - closure-common closure-html collectors css-selectors cxml cxml-stp - flexi-streams iterate named-readtables parse-number puri split-sequence - swank symbol-munger trivial-features trivial-gray-streams xpath yacc) - VERSION css-selectors-20160628-git SIBLINGS - (css-selectors-simple-tree css-selectors) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-selectors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-selectors.nix deleted file mode 100644 index ec8434b2e4..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/css-selectors.nix +++ /dev/null @@ -1,51 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "css-selectors"; - version = "20160628-git"; - - parasites = [ "css-selectors-test" ]; - - description = "An implementation of css selectors"; - - deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz"; - sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b"; - }; - - packageName = "css-selectors"; - - asdFilesToKeep = ["css-selectors.asd"]; - overrides = x: x; -} -/* (SYSTEM css-selectors DESCRIPTION An implementation of css selectors SHA256 - 0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b URL - http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz - MD5 28537144b89af4ebe28c2eb365d5569f NAME css-selectors FILENAME - css-selectors DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME buildnode FILENAME buildnode) - (NAME buildnode-xhtml FILENAME buildnode-xhtml) - (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-unicode FILENAME cl-unicode) - (NAME closer-mop FILENAME closer-mop) - (NAME closure-common FILENAME closure-common) - (NAME closure-html FILENAME closure-html) - (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) - (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) - (NAME named-readtables FILENAME named-readtables) - (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) - (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME yacc FILENAME yacc)) - DEPENDENCIES - (alexandria babel buildnode buildnode-xhtml cl-interpol cl-ppcre cl-unicode - closer-mop closure-common closure-html collectors cxml flexi-streams - iterate lisp-unit2 named-readtables puri split-sequence swank - symbol-munger trivial-features trivial-gray-streams yacc) - VERSION 20160628-git SIBLINGS (css-selectors-simple-tree css-selectors-stp) - PARASITES (css-selectors-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cxml-stp.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cxml-stp.nix deleted file mode 100644 index 275eba3450..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cxml-stp.nix +++ /dev/null @@ -1,39 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cxml-stp"; - version = "20200325-git"; - - parasites = [ "cxml-stp/test" ]; - - description = "System lacks description"; - - deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml_slash_test" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz"; - sha256 = "1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n"; - }; - - packageName = "cxml-stp"; - - asdFilesToKeep = ["cxml-stp.asd"]; - overrides = x: x; -} -/* (SYSTEM cxml-stp DESCRIPTION System lacks description SHA256 - 1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n URL - http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz - MD5 5622b4aae55e448473f1ba14fa3a5f4c NAME cxml-stp FILENAME cxml-stp DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cl-ppcre FILENAME cl-ppcre) - (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) - (NAME cxml/test FILENAME cxml_slash_test) - (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri) - (NAME rt FILENAME rt) (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME xpath FILENAME xpath) (NAME xpath/test FILENAME xpath_slash_test) - (NAME yacc FILENAME yacc)) - DEPENDENCIES - (alexandria babel cl-ppcre closure-common cxml cxml/test parse-number puri - rt trivial-features trivial-gray-streams xpath xpath/test yacc) - VERSION 20200325-git SIBLINGS NIL PARASITES (cxml-stp/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cxml.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cxml.nix deleted file mode 100644 index 61c38a8720..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/cxml.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "cxml"; - version = "20200610-git"; - - parasites = [ "cxml/dom" "cxml/klacks" "cxml/test" "cxml/xml" ]; - - description = "Closure XML - a Common Lisp XML parser"; - - deps = [ args."alexandria" args."babel" args."closure-common" args."puri" args."trivial-features" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz"; - sha256 = "0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq"; - }; - - packageName = "cxml"; - - asdFilesToKeep = ["cxml.asd"]; - overrides = x: x; -} -/* (SYSTEM cxml DESCRIPTION Closure XML - a Common Lisp XML parser SHA256 - 0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq URL - http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz MD5 - 0b6f34edb79f7b63cc5855f18d0d66f0 NAME cxml FILENAME cxml DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME closure-common FILENAME closure-common) (NAME puri FILENAME puri) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES - (alexandria babel closure-common puri trivial-features - trivial-gray-streams) - VERSION 20200610-git SIBLINGS (cxml-dom cxml-klacks cxml-test) PARASITES - (cxml/dom cxml/klacks cxml/test cxml/xml)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/data-frame.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/data-frame.nix deleted file mode 100644 index b845e5add6..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/data-frame.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "data-frame"; - version = "20210411-git"; - - parasites = [ "data-frame/tests" ]; - - description = "Data frames for Common Lisp"; - - deps = [ args."alexandria" args."anaphora" args."array-operations" args."clunit" args."let-plus" args."num-utils" args."select" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/data-frame/2021-04-11/data-frame-20210411-git.tgz"; - sha256 = "1ycpbhzkc54x4mvghq6ss6s9ya1zn1s6d0cifh20c3b9kfca1xgv"; - }; - - packageName = "data-frame"; - - asdFilesToKeep = ["data-frame.asd"]; - overrides = x: x; -} -/* (SYSTEM data-frame DESCRIPTION Data frames for Common Lisp SHA256 - 1ycpbhzkc54x4mvghq6ss6s9ya1zn1s6d0cifh20c3b9kfca1xgv URL - http://beta.quicklisp.org/archive/data-frame/2021-04-11/data-frame-20210411-git.tgz - MD5 b376dd3510b55efe93cbcbf8478f94ed NAME data-frame FILENAME data-frame - DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME array-operations FILENAME array-operations) - (NAME clunit FILENAME clunit) (NAME let-plus FILENAME let-plus) - (NAME num-utils FILENAME num-utils) (NAME select FILENAME select)) - DEPENDENCIES - (alexandria anaphora array-operations clunit let-plus num-utils select) - VERSION 20210411-git SIBLINGS NIL PARASITES (data-frame/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/data-table.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/data-table.nix deleted file mode 100644 index 06b101d229..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/data-table.nix +++ /dev/null @@ -1,40 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "data-table"; - version = "20160208-git"; - - parasites = [ "data-table-test" ]; - - description = "A library providing a data-table class, and useful functionality around this"; - - deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."symbol-munger" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/data-table/2016-02-08/data-table-20160208-git.tgz"; - sha256 = "0xzjk3jxx11ziw5348ddalygi84wwwcjcxmqvm5rscgzh012h8gm"; - }; - - packageName = "data-table"; - - asdFilesToKeep = ["data-table.asd"]; - overrides = x: x; -} -/* (SYSTEM data-table DESCRIPTION - A library providing a data-table class, and useful functionality around this - SHA256 0xzjk3jxx11ziw5348ddalygi84wwwcjcxmqvm5rscgzh012h8gm URL - http://beta.quicklisp.org/archive/data-table/2016-02-08/data-table-20160208-git.tgz - MD5 0507150b0fcfdab96e0ef7668d31113c NAME data-table FILENAME data-table - DEPS - ((NAME alexandria FILENAME alexandria) - (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-unicode FILENAME cl-unicode) - (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) - (NAME named-readtables FILENAME named-readtables) - (NAME symbol-munger FILENAME symbol-munger)) - DEPENDENCIES - (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate - lisp-unit2 named-readtables symbol-munger) - VERSION 20160208-git SIBLINGS (data-table-clsql) PARASITES - (data-table-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbd-mysql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbd-mysql.nix deleted file mode 100644 index c3c80c73a0..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbd-mysql.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "dbd-mysql"; - version = "cl-dbi-20211020-git"; - - description = "Database driver for MySQL."; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-mysql" args."closer-mop" args."dbi" args."split-sequence" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz"; - sha256 = "1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr"; - }; - - packageName = "dbd-mysql"; - - asdFilesToKeep = ["dbd-mysql.asd"]; - overrides = x: x; -} -/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 - 1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr URL - http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz - MD5 565a1f32b2d924ad59876afcdc5cf263 NAME dbd-mysql FILENAME dbd-mysql DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cl-mysql FILENAME cl-mysql) - (NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cl-mysql closer-mop dbi - split-sequence trivial-features) - VERSION cl-dbi-20211020-git SIBLINGS - (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbd-postgres.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbd-postgres.nix deleted file mode 100644 index 2ad35f6053..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbd-postgres.nix +++ /dev/null @@ -1,39 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "dbd-postgres"; - version = "cl-dbi-20211020-git"; - - description = "Database driver for PostgreSQL."; - - deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-ppcre" args."closer-mop" args."dbi" args."ironclad" args."md5" args."split-sequence" args."trivial-garbage" args."uax-15" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz"; - sha256 = "1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr"; - }; - - packageName = "dbd-postgres"; - - asdFilesToKeep = ["dbd-postgres.asd"]; - overrides = x: x; -} -/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 - 1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr URL - http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz - MD5 565a1f32b2d924ad59876afcdc5cf263 NAME dbd-postgres FILENAME - dbd-postgres DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-base64 FILENAME cl-base64) - (NAME cl-postgres FILENAME cl-postgres) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi) - (NAME ironclad FILENAME ironclad) (NAME md5 FILENAME md5) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME uax-15 FILENAME uax-15) (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria bordeaux-threads cl-base64 cl-postgres cl-ppcre closer-mop dbi - ironclad md5 split-sequence trivial-garbage uax-15 usocket) - VERSION cl-dbi-20211020-git SIBLINGS - (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbd-sqlite3.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbd-sqlite3.nix deleted file mode 100644 index 05f939e608..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbd-sqlite3.nix +++ /dev/null @@ -1,38 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "dbd-sqlite3"; - version = "cl-dbi-20211020-git"; - - description = "Database driver for SQLite3."; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."closer-mop" args."dbi" args."iterate" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz"; - sha256 = "1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr"; - }; - - packageName = "dbd-sqlite3"; - - asdFilesToKeep = ["dbd-sqlite3.asd"]; - overrides = x: x; -} -/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 - 1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr URL - http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz - MD5 565a1f32b2d924ad59876afcdc5cf263 NAME dbd-sqlite3 FILENAME dbd-sqlite3 - DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME closer-mop FILENAME closer-mop) - (NAME dbi FILENAME dbi) (NAME iterate FILENAME iterate) - (NAME split-sequence FILENAME split-sequence) - (NAME sqlite FILENAME sqlite) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi closer-mop dbi iterate - split-sequence sqlite trivial-features trivial-garbage) - VERSION cl-dbi-20211020-git SIBLINGS - (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbi-test.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbi-test.nix deleted file mode 100644 index 8c06ed915f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbi-test.nix +++ /dev/null @@ -1,36 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "dbi-test"; - version = "cl-dbi-20211020-git"; - - description = "System lacks description"; - - deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."dissect" args."rove" args."split-sequence" args."trivial-gray-streams" args."trivial-types" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz"; - sha256 = "1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr"; - }; - - packageName = "dbi-test"; - - asdFilesToKeep = ["dbi-test.asd"]; - overrides = x: x; -} -/* (SYSTEM dbi-test DESCRIPTION System lacks description SHA256 - 1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr URL - http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz - MD5 565a1f32b2d924ad59876afcdc5cf263 NAME dbi-test FILENAME dbi-test DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi) - (NAME dissect FILENAME dissect) (NAME rove FILENAME rove) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME trivial-types FILENAME trivial-types)) - DEPENDENCIES - (alexandria bordeaux-threads closer-mop dbi dissect rove split-sequence - trivial-gray-streams trivial-types) - VERSION cl-dbi-20211020-git SIBLINGS - (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbi.nix deleted file mode 100644 index 98346b51b9..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbi.nix +++ /dev/null @@ -1,42 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "dbi"; - version = "cl-20211020-git"; - - parasites = [ "dbi/test" ]; - - description = "Database independent interface for Common Lisp"; - - deps = [ args."alexandria" args."bordeaux-threads" args."cl-mysql" args."cl-postgres" args."closer-mop" args."dbd-mysql" args."dbd-postgres" args."dbd-sqlite3" args."dbi-test" args."rove" args."split-sequence" args."sqlite" args."trivial-garbage" args."trivial-types" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz"; - sha256 = "1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr"; - }; - - packageName = "dbi"; - - asdFilesToKeep = ["dbi.asd"]; - overrides = x: x; -} -/* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp - SHA256 1khvf4b2pa9wv8blcwb77byi5nyb8g8bnaq4ml20g674iwgvvvmr URL - http://beta.quicklisp.org/archive/cl-dbi/2021-10-20/cl-dbi-20211020-git.tgz - MD5 565a1f32b2d924ad59876afcdc5cf263 NAME dbi FILENAME dbi DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-mysql FILENAME cl-mysql) (NAME cl-postgres FILENAME cl-postgres) - (NAME closer-mop FILENAME closer-mop) (NAME dbd-mysql FILENAME dbd-mysql) - (NAME dbd-postgres FILENAME dbd-postgres) - (NAME dbd-sqlite3 FILENAME dbd-sqlite3) (NAME dbi-test FILENAME dbi-test) - (NAME rove FILENAME rove) (NAME split-sequence FILENAME split-sequence) - (NAME sqlite FILENAME sqlite) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-types FILENAME trivial-types)) - DEPENDENCIES - (alexandria bordeaux-threads cl-mysql cl-postgres closer-mop dbd-mysql - dbd-postgres dbd-sqlite3 dbi-test rove split-sequence sqlite - trivial-garbage trivial-types) - VERSION cl-20211020-git SIBLINGS - (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES (dbi/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbus.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbus.nix deleted file mode 100644 index a39f498992..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dbus.nix +++ /dev/null @@ -1,51 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "dbus"; - version = "20211020-git"; - - description = "A D-BUS client library for Common Lisp"; - - deps = [ args."alexandria" args."asdf-package-system" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-ppcre" args."cl-xmlspam" args."closure-common" args."cxml" args."flexi-streams" args."idna" args."ieee-floats" args."iolib" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."ironclad" args."puri" args."split-sequence" args."swap-bytes" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/dbus/2021-10-20/dbus-20211020-git.tgz"; - sha256 = "1h0qa609qplq3grjf3n31h1bcdj154ww2dn29mjxlkm76n5asz14"; - }; - - packageName = "dbus"; - - asdFilesToKeep = ["dbus.asd"]; - overrides = x: x; -} -/* (SYSTEM dbus DESCRIPTION A D-BUS client library for Common Lisp SHA256 - 1h0qa609qplq3grjf3n31h1bcdj154ww2dn29mjxlkm76n5asz14 URL - http://beta.quicklisp.org/archive/dbus/2021-10-20/dbus-20211020-git.tgz MD5 - f3fb2ad37c197d99d9c446f556a12bdb NAME dbus FILENAME dbus DEPS - ((NAME alexandria FILENAME alexandria) - (NAME asdf-package-system FILENAME asdf-package-system) - (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-xmlspam FILENAME cl-xmlspam) - (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) - (NAME flexi-streams FILENAME flexi-streams) (NAME idna FILENAME idna) - (NAME ieee-floats FILENAME ieee-floats) (NAME iolib FILENAME iolib) - (NAME iolib.asdf FILENAME iolib_dot_asdf) - (NAME iolib.base FILENAME iolib_dot_base) - (NAME iolib.common-lisp FILENAME iolib_dot_common-lisp) - (NAME iolib.conf FILENAME iolib_dot_conf) - (NAME ironclad FILENAME ironclad) (NAME puri FILENAME puri) - (NAME split-sequence FILENAME split-sequence) - (NAME swap-bytes FILENAME swap-bytes) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES - (alexandria asdf-package-system babel bordeaux-threads cffi cffi-grovel - cffi-toolchain cl-ppcre cl-xmlspam closure-common cxml flexi-streams idna - ieee-floats iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf - ironclad puri split-sequence swap-bytes trivial-features trivial-garbage - trivial-gray-streams) - VERSION 20211020-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/defclass-std.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/defclass-std.nix deleted file mode 100644 index 428d14fa95..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/defclass-std.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "defclass-std"; - version = "20201220-git"; - - description = "A shortcut macro to write DEFCLASS forms quickly."; - - deps = [ args."alexandria" args."anaphora" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/defclass-std/2020-12-20/defclass-std-20201220-git.tgz"; - sha256 = "1ldivz1zmg0yxja43gj0lcgf10k0kj2bhb0576f0xnhy56sya0w3"; - }; - - packageName = "defclass-std"; - - asdFilesToKeep = ["defclass-std.asd"]; - overrides = x: x; -} -/* (SYSTEM defclass-std DESCRIPTION - A shortcut macro to write DEFCLASS forms quickly. SHA256 - 1ldivz1zmg0yxja43gj0lcgf10k0kj2bhb0576f0xnhy56sya0w3 URL - http://beta.quicklisp.org/archive/defclass-std/2020-12-20/defclass-std-20201220-git.tgz - MD5 b7a3bec06318b10818dc3941d407fe65 NAME defclass-std FILENAME - defclass-std DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)) - DEPENDENCIES (alexandria anaphora) VERSION 20201220-git SIBLINGS - (defclass-std-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dexador.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dexador.nix deleted file mode 100644 index 3bbb155768..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dexador.nix +++ /dev/null @@ -1,51 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "dexador"; - version = "20211209-git"; - - description = "Yet another HTTP client for Common Lisp"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-ppcre" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."uiop" args."usocket" args."xsubseq" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/dexador/2021-12-09/dexador-20211209-git.tgz"; - sha256 = "0cknpgz9cbqnaa0wafs7nfqlis8cikfxi11gd5r9md8zm0iw3gi7"; - }; - - packageName = "dexador"; - - asdFilesToKeep = ["dexador.asd"]; - overrides = x: x; -} -/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 - 0cknpgz9cbqnaa0wafs7nfqlis8cikfxi11gd5r9md8zm0iw3gi7 URL - http://beta.quicklisp.org/archive/dexador/2021-12-09/dexador-20211209-git.tgz - MD5 211593b3d20b0be78f8c525a9a1f5cfb NAME dexador FILENAME dexador DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) - (NAME cl-base64 FILENAME cl-base64) (NAME cl-cookie FILENAME cl-cookie) - (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-utilities FILENAME cl-utilities) - (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) - (NAME flexi-streams FILENAME flexi-streams) - (NAME local-time FILENAME local-time) - (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) - (NAME smart-buffer FILENAME smart-buffer) - (NAME split-sequence FILENAME split-sequence) - (NAME static-vectors FILENAME static-vectors) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME trivial-mimes FILENAME trivial-mimes) (NAME uiop FILENAME uiop) - (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain chipz - chunga cl+ssl cl-base64 cl-cookie cl-ppcre cl-utilities fast-http fast-io - flexi-streams local-time proc-parse quri smart-buffer split-sequence - static-vectors trivial-features trivial-garbage trivial-gray-streams - trivial-mimes uiop usocket xsubseq) - VERSION 20211209-git SIBLINGS (dexador-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dfio.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dfio.nix deleted file mode 100644 index 6b6fb2646a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dfio.nix +++ /dev/null @@ -1,39 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "dfio"; - version = "20210411-git"; - - description = "Common Lisp library for reading data from text files (eg CSV)."; - - deps = [ args."alexandria" args."anaphora" args."array-operations" args."cl-csv" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."data-frame" args."flexi-streams" args."iterate" args."let-plus" args."named-readtables" args."num-utils" args."select" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/dfio/2021-04-11/dfio-20210411-git.tgz"; - sha256 = "0r1ljv22mfjlp0khgfbmh9ajp9qmw8lqj2wl6k9abr5cc32vnmi5"; - }; - - packageName = "dfio"; - - asdFilesToKeep = ["dfio.asd"]; - overrides = x: x; -} -/* (SYSTEM dfio DESCRIPTION - Common Lisp library for reading data from text files (eg CSV). SHA256 - 0r1ljv22mfjlp0khgfbmh9ajp9qmw8lqj2wl6k9abr5cc32vnmi5 URL - http://beta.quicklisp.org/archive/dfio/2021-04-11/dfio-20210411-git.tgz MD5 - f8d9923e8c2fb095c7dbc1c9f6b68568 NAME dfio FILENAME dfio DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME array-operations FILENAME array-operations) - (NAME cl-csv FILENAME cl-csv) (NAME cl-interpol FILENAME cl-interpol) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) - (NAME data-frame FILENAME data-frame) - (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) (NAME let-plus FILENAME let-plus) - (NAME named-readtables FILENAME named-readtables) - (NAME num-utils FILENAME num-utils) (NAME select FILENAME select)) - DEPENDENCIES - (alexandria anaphora array-operations cl-csv cl-interpol cl-ppcre - cl-unicode data-frame flexi-streams iterate let-plus named-readtables - num-utils select) - VERSION 20210411-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dissect.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dissect.nix deleted file mode 100644 index aa648cb142..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/dissect.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "dissect"; - version = "20210531-git"; - - description = "A lib for introspecting the call stack and active restarts."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/dissect/2021-05-31/dissect-20210531-git.tgz"; - sha256 = "07f5sk2nvhj5jjrw5k561dfnwbjcaniqi2z7wgdrw8qb9h8kkkzk"; - }; - - packageName = "dissect"; - - asdFilesToKeep = ["dissect.asd"]; - overrides = x: x; -} -/* (SYSTEM dissect DESCRIPTION - A lib for introspecting the call stack and active restarts. SHA256 - 07f5sk2nvhj5jjrw5k561dfnwbjcaniqi2z7wgdrw8qb9h8kkkzk URL - http://beta.quicklisp.org/archive/dissect/2021-05-31/dissect-20210531-git.tgz - MD5 41dfb42dc93aa41d825c167fe173fa89 NAME dissect FILENAME dissect DEPS NIL - DEPENDENCIES NIL VERSION 20210531-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/djula.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/djula.nix deleted file mode 100644 index 4a556f875c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/djula.nix +++ /dev/null @@ -1,54 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "djula"; - version = "20211209-git"; - - description = "An implementation of Django templates for Common Lisp."; - - deps = [ args."access" args."alexandria" args."anaphora" args."arnesi" args."babel" args."cl-annot" args."cl-interpol" args."cl-locale" args."cl-ppcre" args."cl-slice" args."cl-syntax" args."cl-syntax-annot" args."cl-unicode" args."closer-mop" args."collectors" args."flexi-streams" args."gettext" args."iterate" args."let-plus" args."local-time" args."named-readtables" args."parser-combinators" args."split-sequence" args."symbol-munger" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."yacc" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/djula/2021-12-09/djula-20211209-git.tgz"; - sha256 = "0csr3c12wf1qcwwfabgz9rvkramj74l15cwj8c01pmcraly8cya7"; - }; - - packageName = "djula"; - - asdFilesToKeep = ["djula.asd"]; - overrides = x: x; -} -/* (SYSTEM djula DESCRIPTION - An implementation of Django templates for Common Lisp. SHA256 - 0csr3c12wf1qcwwfabgz9rvkramj74l15cwj8c01pmcraly8cya7 URL - http://beta.quicklisp.org/archive/djula/2021-12-09/djula-20211209-git.tgz - MD5 f7cb3581b5eb40c8609e90cdf87a2a06 NAME djula FILENAME djula DEPS - ((NAME access FILENAME access) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arnesi FILENAME arnesi) - (NAME babel FILENAME babel) (NAME cl-annot FILENAME cl-annot) - (NAME cl-interpol FILENAME cl-interpol) - (NAME cl-locale FILENAME cl-locale) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-slice FILENAME cl-slice) (NAME cl-syntax FILENAME cl-syntax) - (NAME cl-syntax-annot FILENAME cl-syntax-annot) - (NAME cl-unicode FILENAME cl-unicode) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) - (NAME flexi-streams FILENAME flexi-streams) - (NAME gettext FILENAME gettext) (NAME iterate FILENAME iterate) - (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time) - (NAME named-readtables FILENAME named-readtables) - (NAME parser-combinators FILENAME parser-combinators) - (NAME split-sequence FILENAME split-sequence) - (NAME symbol-munger FILENAME symbol-munger) - (NAME trivial-backtrace FILENAME trivial-backtrace) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME trivial-types FILENAME trivial-types) (NAME yacc FILENAME yacc)) - DEPENDENCIES - (access alexandria anaphora arnesi babel cl-annot cl-interpol cl-locale - cl-ppcre cl-slice cl-syntax cl-syntax-annot cl-unicode closer-mop - collectors flexi-streams gettext iterate let-plus local-time - named-readtables parser-combinators split-sequence symbol-munger - trivial-backtrace trivial-features trivial-gray-streams trivial-types - yacc) - VERSION 20211209-git SIBLINGS (djula-demo djula-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/do-urlencode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/do-urlencode.nix deleted file mode 100644 index 4b79b85b5c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/do-urlencode.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "do-urlencode"; - version = "20181018-git"; - - description = "Percent Encoding (aka URL Encoding) library"; - - deps = [ args."alexandria" args."babel" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz"; - sha256 = "1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2"; - }; - - packageName = "do-urlencode"; - - asdFilesToKeep = ["do-urlencode.asd"]; - overrides = x: x; -} -/* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library - SHA256 1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2 URL - http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz - MD5 cb6ab78689fe52680ee1b94cd7738b94 NAME do-urlencode FILENAME - do-urlencode DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel trivial-features) VERSION 20181018-git - SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/documentation-utils.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/documentation-utils.nix deleted file mode 100644 index 1bb6460a0f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/documentation-utils.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "documentation-utils"; - version = "20190710-git"; - - description = "A few simple tools to help you with documenting your library."; - - deps = [ args."trivial-indent" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz"; - sha256 = "1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3"; - }; - - packageName = "documentation-utils"; - - asdFilesToKeep = ["documentation-utils.asd"]; - overrides = x: x; -} -/* (SYSTEM documentation-utils DESCRIPTION - A few simple tools to help you with documenting your library. SHA256 - 1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3 URL - http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz - MD5 4f45f511ac55008b8b8aa04f7feaa2d4 NAME documentation-utils FILENAME - documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (trivial-indent) VERSION 20190710-git SIBLINGS - (multilang-documentation-utils) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/drakma.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/drakma.nix deleted file mode 100644 index 5c1b54b13e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/drakma.nix +++ /dev/null @@ -1,40 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "drakma"; - version = "v2.0.8"; - - description = "Full-featured http/https client based on usocket"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/drakma/2021-08-07/drakma-v2.0.8.tgz"; - sha256 = "07rig1649yxs0n03y2dc9is6cp9lxlyzqlhsb8g02ds8g86czdjf"; - }; - - packageName = "drakma"; - - asdFilesToKeep = ["drakma.asd"]; - overrides = x: x; -} -/* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket - SHA256 07rig1649yxs0n03y2dc9is6cp9lxlyzqlhsb8g02ds8g86czdjf URL - http://beta.quicklisp.org/archive/drakma/2021-08-07/drakma-v2.0.8.tgz MD5 - 948225b3183ab3d46b641ccda3c5fc54 NAME drakma FILENAME drakma DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) - (NAME cl-base64 FILENAME cl-base64) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME flexi-streams FILENAME flexi-streams) (NAME puri FILENAME puri) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi chipz chunga cl+ssl cl-base64 - cl-ppcre flexi-streams puri split-sequence trivial-features - trivial-garbage trivial-gray-streams usocket) - VERSION v2.0.8 SIBLINGS (drakma-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/eager-future2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/eager-future2.nix deleted file mode 100644 index 58009dee0d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/eager-future2.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "eager-future2"; - version = "20191130-git"; - - description = "Parallel programming library providing the futures/promises synchronization mechanism"; - - deps = [ args."alexandria" args."bordeaux-threads" args."trivial-garbage" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz"; - sha256 = "01pvgcp6d4hz1arpvsv73m8xnbv8qm2d0qychpxc72d0m71p6ks0"; - }; - - packageName = "eager-future2"; - - asdFilesToKeep = ["eager-future2.asd"]; - overrides = x: x; -} -/* (SYSTEM eager-future2 DESCRIPTION - Parallel programming library providing the futures/promises synchronization mechanism - SHA256 01pvgcp6d4hz1arpvsv73m8xnbv8qm2d0qychpxc72d0m71p6ks0 URL - http://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz - MD5 72298620b0fb2f874d86d887cce4acf0 NAME eager-future2 FILENAME - eager-future2 DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME trivial-garbage FILENAME trivial-garbage)) - DEPENDENCIES (alexandria bordeaux-threads trivial-garbage) VERSION - 20191130-git SIBLINGS (test.eager-future2) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/enchant.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/enchant.nix deleted file mode 100644 index d56865fc3f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/enchant.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "enchant"; - version = "cl-20211209-git"; - - description = "Programming interface for Enchant spell-checker library"; - - deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-enchant/2021-12-09/cl-enchant-20211209-git.tgz"; - sha256 = "1j9qliyxfjfz4bbc6snysccnmmk2d2y8kb613rna239dh5g6c03c"; - }; - - packageName = "enchant"; - - asdFilesToKeep = ["enchant.asd"]; - overrides = x: x; -} -/* (SYSTEM enchant DESCRIPTION - Programming interface for Enchant spell-checker library SHA256 - 1j9qliyxfjfz4bbc6snysccnmmk2d2y8kb613rna239dh5g6c03c URL - http://beta.quicklisp.org/archive/cl-enchant/2021-12-09/cl-enchant-20211209-git.tgz - MD5 c12162b3a7c383815ff77c96aca0c11f NAME enchant FILENAME enchant DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION - cl-20211209-git SIBLINGS (enchant-autoload) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/esrap-peg.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/esrap-peg.nix deleted file mode 100644 index c1c7e31d39..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/esrap-peg.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "esrap-peg"; - version = "20191007-git"; - - description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions"; - - deps = [ args."alexandria" args."cl-unification" args."esrap" args."iterate" args."trivial-with-current-source-form" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz"; - sha256 = "0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis"; - }; - - packageName = "esrap-peg"; - - asdFilesToKeep = ["esrap-peg.asd"]; - overrides = x: x; -} -/* (SYSTEM esrap-peg DESCRIPTION - A wrapper around Esrap to allow generating Esrap grammars from PEG definitions - SHA256 0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis URL - http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz - MD5 48d87d3118febeefc23ca3a8dda36fc0 NAME esrap-peg FILENAME esrap-peg DEPS - ((NAME alexandria FILENAME alexandria) - (NAME cl-unification FILENAME cl-unification) (NAME esrap FILENAME esrap) - (NAME iterate FILENAME iterate) - (NAME trivial-with-current-source-form FILENAME - trivial-with-current-source-form)) - DEPENDENCIES - (alexandria cl-unification esrap iterate trivial-with-current-source-form) - VERSION 20191007-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/esrap.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/esrap.nix deleted file mode 100644 index 933d116b50..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/esrap.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "esrap"; - version = "20211020-git"; - - parasites = [ "esrap/tests" ]; - - description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp."; - - deps = [ args."alexandria" args."fiveam" args."trivial-with-current-source-form" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/esrap/2021-10-20/esrap-20211020-git.tgz"; - sha256 = "06cqvalqsid82an8c4acbf13y65gw8nb4pckm8gv8fknvh4k1x7h"; - }; - - packageName = "esrap"; - - asdFilesToKeep = ["esrap.asd"]; - overrides = x: x; -} -/* (SYSTEM esrap DESCRIPTION - A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 - 06cqvalqsid82an8c4acbf13y65gw8nb4pckm8gv8fknvh4k1x7h URL - http://beta.quicklisp.org/archive/esrap/2021-10-20/esrap-20211020-git.tgz - MD5 9657755b3fe896c1252dc7fdd22320b7 NAME esrap FILENAME esrap DEPS - ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam) - (NAME trivial-with-current-source-form FILENAME - trivial-with-current-source-form)) - DEPENDENCIES (alexandria fiveam trivial-with-current-source-form) VERSION - 20211020-git SIBLINGS NIL PARASITES (esrap/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/external-program.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/external-program.nix deleted file mode 100644 index 4ddd869b73..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/external-program.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "external-program"; - version = "20190307-git"; - - parasites = [ "external-program-test" ]; - - description = "System lacks description"; - - deps = [ args."fiveam" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz"; - sha256 = "1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz"; - }; - - packageName = "external-program"; - - asdFilesToKeep = ["external-program.asd"]; - overrides = x: x; -} -/* (SYSTEM external-program DESCRIPTION System lacks description SHA256 - 1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz URL - http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz - MD5 b30fe104c34059506fd4c493fa79fe1a NAME external-program FILENAME - external-program DEPS - ((NAME fiveam FILENAME fiveam) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (fiveam trivial-features) VERSION 20190307-git SIBLINGS NIL - PARASITES (external-program-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-csv.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-csv.nix deleted file mode 100644 index b9c375a770..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-csv.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "fare-csv"; - version = "20171227-git"; - - description = "Robust CSV parser and printer"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz"; - sha256 = "1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x"; - }; - - packageName = "fare-csv"; - - asdFilesToKeep = ["fare-csv.asd"]; - overrides = x: x; -} -/* (SYSTEM fare-csv DESCRIPTION Robust CSV parser and printer SHA256 - 1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x URL - http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz - MD5 1d73aaac9fcd86cc5ddb72019722bc2a NAME fare-csv FILENAME fare-csv DEPS - NIL DEPENDENCIES NIL VERSION 20171227-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-mop.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-mop.nix deleted file mode 100644 index 34b3ec905b..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-mop.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "fare-mop"; - version = "20151218-git"; - - description = "Utilities using the MOP; notably make informative pretty-printing trivial"; - - deps = [ args."closer-mop" args."fare-utils" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz"; - sha256 = "0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9"; - }; - - packageName = "fare-mop"; - - asdFilesToKeep = ["fare-mop.asd"]; - overrides = x: x; -} -/* (SYSTEM fare-mop DESCRIPTION - Utilities using the MOP; notably make informative pretty-printing trivial - SHA256 0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9 URL - http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz - MD5 4721ff62e2ac2c55079cdd4f2a0f6d4a NAME fare-mop FILENAME fare-mop DEPS - ((NAME closer-mop FILENAME closer-mop) - (NAME fare-utils FILENAME fare-utils)) - DEPENDENCIES (closer-mop fare-utils) VERSION 20151218-git SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote-extras.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote-extras.nix deleted file mode 100644 index 0c114fda8d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote-extras.nix +++ /dev/null @@ -1,47 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "fare-quasiquote-extras"; - version = "fare-quasiquote-20200925-git"; - - description = "fare-quasiquote plus extras"; - - deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; - sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; - }; - - packageName = "fare-quasiquote-extras"; - - asdFilesToKeep = ["fare-quasiquote-extras.asd"]; - overrides = x: x; -} -/* (SYSTEM fare-quasiquote-extras DESCRIPTION fare-quasiquote plus extras - SHA256 0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b URL - http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz - MD5 7af0a97c445d88acacecfc851496adb3 NAME fare-quasiquote-extras FILENAME - fare-quasiquote-extras DEPS - ((NAME alexandria FILENAME alexandria) - (NAME closer-mop FILENAME closer-mop) - (NAME fare-quasiquote FILENAME fare-quasiquote) - (NAME fare-quasiquote-optima FILENAME fare-quasiquote-optima) - (NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable) - (NAME fare-utils FILENAME fare-utils) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME named-readtables FILENAME named-readtables) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.quasiquote FILENAME trivia_dot_quasiquote) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2)) - DEPENDENCIES - (alexandria closer-mop fare-quasiquote fare-quasiquote-optima - fare-quasiquote-readtable fare-utils lisp-namespace named-readtables - trivia.level0 trivia.level1 trivia.level2 trivia.quasiquote trivia.trivial - trivial-cltl2) - VERSION fare-quasiquote-20200925-git SIBLINGS - (fare-quasiquote-optima fare-quasiquote-readtable fare-quasiquote) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote-optima.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote-optima.nix deleted file mode 100644 index d02dd9c1da..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote-optima.nix +++ /dev/null @@ -1,46 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "fare-quasiquote-optima"; - version = "fare-quasiquote-20200925-git"; - - description = "fare-quasiquote extension for optima"; - - deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; - sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; - }; - - packageName = "fare-quasiquote-optima"; - - asdFilesToKeep = ["fare-quasiquote-optima.asd"]; - overrides = x: x; -} -/* (SYSTEM fare-quasiquote-optima DESCRIPTION - fare-quasiquote extension for optima SHA256 - 0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b URL - http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz - MD5 7af0a97c445d88acacecfc851496adb3 NAME fare-quasiquote-optima FILENAME - fare-quasiquote-optima DEPS - ((NAME alexandria FILENAME alexandria) - (NAME closer-mop FILENAME closer-mop) - (NAME fare-quasiquote FILENAME fare-quasiquote) - (NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable) - (NAME fare-utils FILENAME fare-utils) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME named-readtables FILENAME named-readtables) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.quasiquote FILENAME trivia_dot_quasiquote) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2)) - DEPENDENCIES - (alexandria closer-mop fare-quasiquote fare-quasiquote-readtable fare-utils - lisp-namespace named-readtables trivia.level0 trivia.level1 trivia.level2 - trivia.quasiquote trivia.trivial trivial-cltl2) - VERSION fare-quasiquote-20200925-git SIBLINGS - (fare-quasiquote-extras fare-quasiquote-readtable fare-quasiquote) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote-readtable.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote-readtable.nix deleted file mode 100644 index c33a841f16..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote-readtable.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "fare-quasiquote-readtable"; - version = "fare-quasiquote-20200925-git"; - - description = "Using fare-quasiquote with named-readtable"; - - deps = [ args."fare-quasiquote" args."fare-utils" args."named-readtables" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; - sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; - }; - - packageName = "fare-quasiquote-readtable"; - - asdFilesToKeep = ["fare-quasiquote-readtable.asd"]; - overrides = x: x; -} -/* (SYSTEM fare-quasiquote-readtable DESCRIPTION - Using fare-quasiquote with named-readtable SHA256 - 0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b URL - http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz - MD5 7af0a97c445d88acacecfc851496adb3 NAME fare-quasiquote-readtable - FILENAME fare-quasiquote-readtable DEPS - ((NAME fare-quasiquote FILENAME fare-quasiquote) - (NAME fare-utils FILENAME fare-utils) - (NAME named-readtables FILENAME named-readtables)) - DEPENDENCIES (fare-quasiquote fare-utils named-readtables) VERSION - fare-quasiquote-20200925-git SIBLINGS - (fare-quasiquote-extras fare-quasiquote-optima fare-quasiquote) PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote.nix deleted file mode 100644 index d5d65c1d3d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-quasiquote.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "fare-quasiquote"; - version = "20200925-git"; - - description = "Portable, matchable implementation of quasiquote"; - - deps = [ args."fare-utils" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz"; - sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b"; - }; - - packageName = "fare-quasiquote"; - - asdFilesToKeep = ["fare-quasiquote.asd"]; - overrides = x: x; -} -/* (SYSTEM fare-quasiquote DESCRIPTION - Portable, matchable implementation of quasiquote SHA256 - 0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b URL - http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz - MD5 7af0a97c445d88acacecfc851496adb3 NAME fare-quasiquote FILENAME - fare-quasiquote DEPS ((NAME fare-utils FILENAME fare-utils)) DEPENDENCIES - (fare-utils) VERSION 20200925-git SIBLINGS - (fare-quasiquote-extras fare-quasiquote-optima fare-quasiquote-readtable) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-utils.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-utils.nix deleted file mode 100644 index 2c3f15396f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fare-utils.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "fare-utils"; - version = "20170124-git"; - - description = "Basic functions and macros, interfaces, pure and stateful datastructures"; - - deps = [ args."asdf" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz"; - sha256 = "0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq"; - }; - - packageName = "fare-utils"; - - asdFilesToKeep = ["fare-utils.asd"]; - overrides = x: x; -} -/* (SYSTEM fare-utils DESCRIPTION - Basic functions and macros, interfaces, pure and stateful datastructures - SHA256 0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq URL - http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz - MD5 6752362d0c7c03df6576ab2dbe807ee2 NAME fare-utils FILENAME fare-utils - DEPS ((NAME asdf FILENAME asdf)) DEPENDENCIES (asdf) VERSION 20170124-git - SIBLINGS (fare-utils-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fast-http.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fast-http.nix deleted file mode 100644 index 48e4dd7c40..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fast-http.nix +++ /dev/null @@ -1,36 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "fast-http"; - version = "20191007-git"; - - description = "A fast HTTP protocol parser in Common Lisp"; - - deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz"; - sha256 = "00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32"; - }; - - packageName = "fast-http"; - - asdFilesToKeep = ["fast-http.asd"]; - overrides = x: x; -} -/* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp - SHA256 00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32 URL - http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz - MD5 fd43be4dd72fd9bda5a3ecce87104c97 NAME fast-http FILENAME fast-http DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cl-utilities FILENAME cl-utilities) - (NAME flexi-streams FILENAME flexi-streams) - (NAME proc-parse FILENAME proc-parse) - (NAME smart-buffer FILENAME smart-buffer) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME xsubseq FILENAME xsubseq)) - DEPENDENCIES - (alexandria babel cl-utilities flexi-streams proc-parse smart-buffer - trivial-features trivial-gray-streams xsubseq) - VERSION 20191007-git SIBLINGS (fast-http-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fast-io.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fast-io.nix deleted file mode 100644 index 8bb1327d91..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fast-io.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "fast-io"; - version = "20200925-git"; - - description = "Alternative I/O mechanism to a stream or vector"; - - deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz"; - sha256 = "1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975"; - }; - - packageName = "fast-io"; - - asdFilesToKeep = ["fast-io.asd"]; - overrides = x: x; -} -/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector - SHA256 1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975 URL - http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz - MD5 aa948bd29b8733f08e79a60226243117 NAME fast-io FILENAME fast-io DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME static-vectors FILENAME static-vectors) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES - (alexandria babel cffi cffi-grovel cffi-toolchain static-vectors - trivial-features trivial-gray-streams) - VERSION 20200925-git SIBLINGS (fast-io-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fiasco.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fiasco.nix deleted file mode 100644 index 53dbce44e1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fiasco.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "fiasco"; - version = "20200610-git"; - - parasites = [ "fiasco-self-tests" ]; - - description = "A Common Lisp test framework that treasures your failures, logical continuation of Stefil."; - - deps = [ args."alexandria" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz"; - sha256 = "1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4"; - }; - - packageName = "fiasco"; - - asdFilesToKeep = ["fiasco.asd"]; - overrides = x: x; -} -/* (SYSTEM fiasco DESCRIPTION - A Common Lisp test framework that treasures your failures, logical continuation of Stefil. - SHA256 1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4 URL - http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz - MD5 c5a84e4a0a8afe45729cd6e39af772ac NAME fiasco FILENAME fiasco DEPS - ((NAME alexandria FILENAME alexandria) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20200610-git - SIBLINGS NIL PARASITES (fiasco-self-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/file-attributes.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/file-attributes.nix deleted file mode 100644 index e40f756fdd..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/file-attributes.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "file-attributes"; - version = "20210807-git"; - - description = "Access to file attributes (uid, gid, atime, mtime, mod)"; - - deps = [ args."alexandria" args."babel" args."cffi" args."documentation-utils" args."trivial-features" args."trivial-indent" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/file-attributes/2021-08-07/file-attributes-20210807-git.tgz"; - sha256 = "0f2kr886jn83hlsk6a548cd0vdq4f1dsxscnslni0nhlxsbi1gsg"; - }; - - packageName = "file-attributes"; - - asdFilesToKeep = ["file-attributes.asd"]; - overrides = x: x; -} -/* (SYSTEM file-attributes DESCRIPTION - Access to file attributes (uid, gid, atime, mtime, mod) SHA256 - 0f2kr886jn83hlsk6a548cd0vdq4f1dsxscnslni0nhlxsbi1gsg URL - http://beta.quicklisp.org/archive/file-attributes/2021-08-07/file-attributes-20210807-git.tgz - MD5 ba0c3667061d97674f5b1666bcbc8506 NAME file-attributes FILENAME - file-attributes DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) - (NAME documentation-utils FILENAME documentation-utils) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES - (alexandria babel cffi documentation-utils trivial-features trivial-indent) - VERSION 20210807-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fiveam.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fiveam.nix deleted file mode 100644 index b341fdbe2f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fiveam.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "fiveam"; - version = "20211209-git"; - - parasites = [ "fiveam/test" ]; - - description = "A simple regression testing framework"; - - deps = [ args."alexandria" args."net_dot_didierverna_dot_asdf-flv" args."trivial-backtrace" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/fiveam/2021-12-09/fiveam-20211209-git.tgz"; - sha256 = "0kyyr2dlgpzkn2cw9i4fwyip1d1la4cbv8l4b8jz31f5c1p76ab7"; - }; - - packageName = "fiveam"; - - asdFilesToKeep = ["fiveam.asd"]; - overrides = x: x; -} -/* (SYSTEM fiveam DESCRIPTION A simple regression testing framework SHA256 - 0kyyr2dlgpzkn2cw9i4fwyip1d1la4cbv8l4b8jz31f5c1p76ab7 URL - http://beta.quicklisp.org/archive/fiveam/2021-12-09/fiveam-20211209-git.tgz - MD5 10d6a5a19f47ed94cbd9edf1d4c20933 NAME fiveam FILENAME fiveam DEPS - ((NAME alexandria FILENAME alexandria) - (NAME net.didierverna.asdf-flv FILENAME net_dot_didierverna_dot_asdf-flv) - (NAME trivial-backtrace FILENAME trivial-backtrace)) - DEPENDENCIES (alexandria net.didierverna.asdf-flv trivial-backtrace) - VERSION 20211209-git SIBLINGS NIL PARASITES (fiveam/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/flexi-streams.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/flexi-streams.nix deleted file mode 100644 index 1d6ce02108..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/flexi-streams.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "flexi-streams"; - version = "20210807-git"; - - parasites = [ "flexi-streams-test" ]; - - description = "Flexible bivalent streams for Common Lisp"; - - deps = [ args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/flexi-streams/2021-08-07/flexi-streams-20210807-git.tgz"; - sha256 = "1g2cvz0bjigr6lw3gigdwcm1x1w0pcyr3ainnix9wyp1kxc2n2rw"; - }; - - packageName = "flexi-streams"; - - asdFilesToKeep = ["flexi-streams.asd"]; - overrides = x: x; -} -/* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp - SHA256 1g2cvz0bjigr6lw3gigdwcm1x1w0pcyr3ainnix9wyp1kxc2n2rw URL - http://beta.quicklisp.org/archive/flexi-streams/2021-08-07/flexi-streams-20210807-git.tgz - MD5 6c026daab0766c11f5aee9cc3df3394e NAME flexi-streams FILENAME - flexi-streams DEPS - ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 20210807-git SIBLINGS NIL PARASITES - (flexi-streams-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/float-features.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/float-features.nix deleted file mode 100644 index 62001bc69e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/float-features.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "float-features"; - version = "20210228-git"; - - description = "A portability library for IEEE float features not covered by the CL standard."; - - deps = [ args."documentation-utils" args."trivial-indent" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/float-features/2021-02-28/float-features-20210228-git.tgz"; - sha256 = "1giy9qm9bgdfp1mm4d36fcj544kfq68qckmijlrhwbvkpk18hgrd"; - }; - - packageName = "float-features"; - - asdFilesToKeep = ["float-features.asd"]; - overrides = x: x; -} -/* (SYSTEM float-features DESCRIPTION - A portability library for IEEE float features not covered by the CL standard. - SHA256 1giy9qm9bgdfp1mm4d36fcj544kfq68qckmijlrhwbvkpk18hgrd URL - http://beta.quicklisp.org/archive/float-features/2021-02-28/float-features-20210228-git.tgz - MD5 77223b9c85dca49d0f599e51ba95953a NAME float-features FILENAME - float-features DEPS - ((NAME documentation-utils FILENAME documentation-utils) - (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (documentation-utils trivial-indent) VERSION 20210228-git - SIBLINGS (float-features-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/flow.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/flow.nix deleted file mode 100644 index 1adac0993d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/flow.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "flow"; - version = "20200610-git"; - - description = "A flowchart and generalised graph library."; - - deps = [ args."closer-mop" args."documentation-utils" args."trivial-indent" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz"; - sha256 = "1z1krk1iiz7n1mvpnmqnrgfhicpppb45i0jgkqnrds749xjnx194"; - }; - - packageName = "flow"; - - asdFilesToKeep = ["flow.asd"]; - overrides = x: x; -} -/* (SYSTEM flow DESCRIPTION A flowchart and generalised graph library. SHA256 - 1z1krk1iiz7n1mvpnmqnrgfhicpppb45i0jgkqnrds749xjnx194 URL - http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz MD5 - f0767467d5e9bfda6fe5777a26719811 NAME flow FILENAME flow DEPS - ((NAME closer-mop FILENAME closer-mop) - (NAME documentation-utils FILENAME documentation-utils) - (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (closer-mop documentation-utils trivial-indent) VERSION - 20200610-git SIBLINGS (flow-visualizer) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fn.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fn.nix deleted file mode 100644 index 02e054b2f2..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fn.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "fn"; - version = "20171019-git"; - - description = "Some macros for lambda brevity"; - - deps = [ args."named-readtables" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/fn/2017-10-19/fn-20171019-git.tgz"; - sha256 = "0r062ffn31sc7313xlfaa9pwnf2wdkiq4spqlr1lk5r8isvdnzz8"; - }; - - packageName = "fn"; - - asdFilesToKeep = ["fn.asd"]; - overrides = x: x; -} -/* (SYSTEM fn DESCRIPTION Some macros for lambda brevity SHA256 - 0r062ffn31sc7313xlfaa9pwnf2wdkiq4spqlr1lk5r8isvdnzz8 URL - http://beta.quicklisp.org/archive/fn/2017-10-19/fn-20171019-git.tgz MD5 - 0e1cfe5f19ceec8966baa3037772d31e NAME fn FILENAME fn DEPS - ((NAME named-readtables FILENAME named-readtables)) DEPENDENCIES - (named-readtables) VERSION 20171019-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/form-fiddle.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/form-fiddle.nix deleted file mode 100644 index 9f837c3ae2..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/form-fiddle.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "form-fiddle"; - version = "20190710-git"; - - description = "A collection of utilities to destructure lambda forms."; - - deps = [ args."documentation-utils" args."trivial-indent" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz"; - sha256 = "12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl"; - }; - - packageName = "form-fiddle"; - - asdFilesToKeep = ["form-fiddle.asd"]; - overrides = x: x; -} -/* (SYSTEM form-fiddle DESCRIPTION - A collection of utilities to destructure lambda forms. SHA256 - 12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl URL - http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz - MD5 2576065de1e3c95751285fb155f5bcf6 NAME form-fiddle FILENAME form-fiddle - DEPS - ((NAME documentation-utils FILENAME documentation-utils) - (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (documentation-utils trivial-indent) VERSION 20190710-git - SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fset.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fset.nix deleted file mode 100644 index 51f8a1b952..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/fset.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "fset"; - version = "20200925-git"; - - parasites = [ "fset/test" ]; - - description = "A functional set-theoretic collections library. -See: http://www.ergy.com/FSet.html -"; - - deps = [ args."misc-extensions" args."mt19937" args."named-readtables" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz"; - sha256 = "19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv"; - }; - - packageName = "fset"; - - asdFilesToKeep = ["fset.asd"]; - overrides = x: x; -} -/* (SYSTEM fset DESCRIPTION A functional set-theoretic collections library. -See: http://www.ergy.com/FSet.html - - SHA256 19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv URL - http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz MD5 - 481e7207099c061459db68813e7bf70c NAME fset FILENAME fset DEPS - ((NAME misc-extensions FILENAME misc-extensions) - (NAME mt19937 FILENAME mt19937) - (NAME named-readtables FILENAME named-readtables)) - DEPENDENCIES (misc-extensions mt19937 named-readtables) VERSION - 20200925-git SIBLINGS NIL PARASITES (fset/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl.nix deleted file mode 100644 index 62232d4654..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl.nix +++ /dev/null @@ -1,76 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "generic-cl"; - version = "20211020-git"; - - parasites = [ "generic-cl/test" ]; - - description = "Standard Common Lisp functions implemented using generic functions."; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-custom-hash-table" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."fiveam" args."generic-cl_dot_arithmetic" args."generic-cl_dot_collector" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_iterator" args."generic-cl_dot_lazy-seq" args."generic-cl_dot_map" args."generic-cl_dot_math" args."generic-cl_dot_object" args."generic-cl_dot_sequence" args."generic-cl_dot_set" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa"; - }; - - packageName = "generic-cl"; - - asdFilesToKeep = ["generic-cl.asd"]; - overrides = x: x; -} -/* (SYSTEM generic-cl DESCRIPTION - Standard Common Lisp functions implemented using generic functions. SHA256 - 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL - http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz - MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl FILENAME generic-cl - DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-custom-hash-table FILENAME cl-custom-hash-table) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) (NAME fiveam FILENAME fiveam) - (NAME generic-cl.arithmetic FILENAME generic-cl_dot_arithmetic) - (NAME generic-cl.collector FILENAME generic-cl_dot_collector) - (NAME generic-cl.comparison FILENAME generic-cl_dot_comparison) - (NAME generic-cl.container FILENAME generic-cl_dot_container) - (NAME generic-cl.internal FILENAME generic-cl_dot_internal) - (NAME generic-cl.iterator FILENAME generic-cl_dot_iterator) - (NAME generic-cl.lazy-seq FILENAME generic-cl_dot_lazy-seq) - (NAME generic-cl.map FILENAME generic-cl_dot_map) - (NAME generic-cl.math FILENAME generic-cl_dot_math) - (NAME generic-cl.object FILENAME generic-cl_dot_object) - (NAME generic-cl.sequence FILENAME generic-cl_dot_sequence) - (NAME generic-cl.set FILENAME generic-cl_dot_set) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME static-dispatch FILENAME static-dispatch) - (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-custom-hash-table cl-environments - cl-form-types closer-mop collectors fiveam generic-cl.arithmetic - generic-cl.collector generic-cl.comparison generic-cl.container - generic-cl.internal generic-cl.iterator generic-cl.lazy-seq generic-cl.map - generic-cl.math generic-cl.object generic-cl.sequence generic-cl.set - introspect-environment iterate lisp-namespace optima - parse-declarations-1.0 static-dispatch symbol-munger trivia - trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION 20211020-git SIBLINGS - (generic-cl.arithmetic generic-cl.collector generic-cl.comparison - generic-cl.container generic-cl.internal generic-cl.iterator - generic-cl.lazy-seq generic-cl.map generic-cl.math generic-cl.object - generic-cl.sequence generic-cl.set generic-cl.util) - PARASITES (generic-cl/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_arithmetic.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_arithmetic.nix deleted file mode 100644 index a4d00c345c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_arithmetic.nix +++ /dev/null @@ -1,60 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "generic-cl_dot_arithmetic"; - version = "generic-cl-20211020-git"; - - description = "Generic arithmetic function interface"; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_comparison" args."generic-cl_dot_internal" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa"; - }; - - packageName = "generic-cl.arithmetic"; - - asdFilesToKeep = ["generic-cl.arithmetic.asd"]; - overrides = x: x; -} -/* (SYSTEM generic-cl.arithmetic DESCRIPTION - Generic arithmetic function interface SHA256 - 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL - http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz - MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.arithmetic FILENAME - generic-cl_dot_arithmetic DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) - (NAME generic-cl.comparison FILENAME generic-cl_dot_comparison) - (NAME generic-cl.internal FILENAME generic-cl_dot_internal) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME static-dispatch FILENAME static-dispatch) - (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-environments cl-form-types closer-mop - collectors generic-cl.comparison generic-cl.internal - introspect-environment iterate lisp-namespace optima - parse-declarations-1.0 static-dispatch symbol-munger trivia - trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION generic-cl-20211020-git SIBLINGS - (generic-cl generic-cl.collector generic-cl.comparison generic-cl.container - generic-cl.internal generic-cl.iterator generic-cl.lazy-seq generic-cl.map - generic-cl.math generic-cl.object generic-cl.sequence generic-cl.set - generic-cl.util) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_collector.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_collector.nix deleted file mode 100644 index cfbe247641..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_collector.nix +++ /dev/null @@ -1,62 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "generic-cl_dot_collector"; - version = "generic-cl-20211020-git"; - - description = "Generic collector interface"; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_iterator" args."generic-cl_dot_object" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa"; - }; - - packageName = "generic-cl.collector"; - - asdFilesToKeep = ["generic-cl.collector.asd"]; - overrides = x: x; -} -/* (SYSTEM generic-cl.collector DESCRIPTION Generic collector interface SHA256 - 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL - http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz - MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.collector FILENAME - generic-cl_dot_collector DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) - (NAME generic-cl.comparison FILENAME generic-cl_dot_comparison) - (NAME generic-cl.container FILENAME generic-cl_dot_container) - (NAME generic-cl.internal FILENAME generic-cl_dot_internal) - (NAME generic-cl.iterator FILENAME generic-cl_dot_iterator) - (NAME generic-cl.object FILENAME generic-cl_dot_object) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME static-dispatch FILENAME static-dispatch) - (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-environments cl-form-types closer-mop - collectors generic-cl.comparison generic-cl.container generic-cl.internal - generic-cl.iterator generic-cl.object introspect-environment iterate - lisp-namespace optima parse-declarations-1.0 static-dispatch symbol-munger - trivia trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION generic-cl-20211020-git SIBLINGS - (generic-cl.arithmetic generic-cl generic-cl.comparison - generic-cl.container generic-cl.internal generic-cl.iterator - generic-cl.lazy-seq generic-cl.map generic-cl.math generic-cl.object - generic-cl.sequence generic-cl.set generic-cl.util) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_comparison.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_comparison.nix deleted file mode 100644 index b73000b48c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_comparison.nix +++ /dev/null @@ -1,57 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "generic-cl_dot_comparison"; - version = "generic-cl-20211020-git"; - - description = "Generic comparison interface"; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_internal" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa"; - }; - - packageName = "generic-cl.comparison"; - - asdFilesToKeep = ["generic-cl.comparison.asd"]; - overrides = x: x; -} -/* (SYSTEM generic-cl.comparison DESCRIPTION Generic comparison interface - SHA256 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL - http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz - MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.comparison FILENAME - generic-cl_dot_comparison DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) - (NAME generic-cl.internal FILENAME generic-cl_dot_internal) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME static-dispatch FILENAME static-dispatch) - (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-environments cl-form-types closer-mop - collectors generic-cl.internal introspect-environment iterate - lisp-namespace optima parse-declarations-1.0 static-dispatch symbol-munger - trivia trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION generic-cl-20211020-git SIBLINGS - (generic-cl.arithmetic generic-cl generic-cl.collector generic-cl.container - generic-cl.internal generic-cl.iterator generic-cl.lazy-seq generic-cl.map - generic-cl.math generic-cl.object generic-cl.sequence generic-cl.set - generic-cl.util) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_container.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_container.nix deleted file mode 100644 index 9a74523c58..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_container.nix +++ /dev/null @@ -1,60 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "generic-cl_dot_container"; - version = "generic-cl-20211020-git"; - - description = "Generic container interface"; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_comparison" args."generic-cl_dot_internal" args."generic-cl_dot_object" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa"; - }; - - packageName = "generic-cl.container"; - - asdFilesToKeep = ["generic-cl.container.asd"]; - overrides = x: x; -} -/* (SYSTEM generic-cl.container DESCRIPTION Generic container interface SHA256 - 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL - http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz - MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.container FILENAME - generic-cl_dot_container DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) - (NAME generic-cl.comparison FILENAME generic-cl_dot_comparison) - (NAME generic-cl.internal FILENAME generic-cl_dot_internal) - (NAME generic-cl.object FILENAME generic-cl_dot_object) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME static-dispatch FILENAME static-dispatch) - (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-environments cl-form-types closer-mop - collectors generic-cl.comparison generic-cl.internal generic-cl.object - introspect-environment iterate lisp-namespace optima - parse-declarations-1.0 static-dispatch symbol-munger trivia - trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION generic-cl-20211020-git SIBLINGS - (generic-cl.arithmetic generic-cl generic-cl.collector - generic-cl.comparison generic-cl.internal generic-cl.iterator - generic-cl.lazy-seq generic-cl.map generic-cl.math generic-cl.object - generic-cl.sequence generic-cl.set generic-cl.util) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_internal.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_internal.nix deleted file mode 100644 index dd1a3a6e18..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_internal.nix +++ /dev/null @@ -1,57 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "generic-cl_dot_internal"; - version = "generic-cl-20211020-git"; - - description = "Utilities used internally by generic-cl"; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa"; - }; - - packageName = "generic-cl.internal"; - - asdFilesToKeep = ["generic-cl.internal.asd"]; - overrides = x: x; -} -/* (SYSTEM generic-cl.internal DESCRIPTION - Utilities used internally by generic-cl SHA256 - 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL - http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz - MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.internal FILENAME - generic-cl_dot_internal DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME static-dispatch FILENAME static-dispatch) - (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-environments cl-form-types closer-mop - collectors introspect-environment iterate lisp-namespace optima - parse-declarations-1.0 static-dispatch symbol-munger trivia - trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION generic-cl-20211020-git SIBLINGS - (generic-cl.arithmetic generic-cl generic-cl.collector - generic-cl.comparison generic-cl.container generic-cl.iterator - generic-cl.lazy-seq generic-cl.map generic-cl.math generic-cl.object - generic-cl.sequence generic-cl.set generic-cl.util) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_iterator.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_iterator.nix deleted file mode 100644 index 1640b13e8a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_iterator.nix +++ /dev/null @@ -1,61 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "generic-cl_dot_iterator"; - version = "generic-cl-20211020-git"; - - description = "Generic iterator interface"; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_object" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa"; - }; - - packageName = "generic-cl.iterator"; - - asdFilesToKeep = ["generic-cl.iterator.asd"]; - overrides = x: x; -} -/* (SYSTEM generic-cl.iterator DESCRIPTION Generic iterator interface SHA256 - 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL - http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz - MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.iterator FILENAME - generic-cl_dot_iterator DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) - (NAME generic-cl.comparison FILENAME generic-cl_dot_comparison) - (NAME generic-cl.container FILENAME generic-cl_dot_container) - (NAME generic-cl.internal FILENAME generic-cl_dot_internal) - (NAME generic-cl.object FILENAME generic-cl_dot_object) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME static-dispatch FILENAME static-dispatch) - (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-environments cl-form-types closer-mop - collectors generic-cl.comparison generic-cl.container generic-cl.internal - generic-cl.object introspect-environment iterate lisp-namespace optima - parse-declarations-1.0 static-dispatch symbol-munger trivia - trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION generic-cl-20211020-git SIBLINGS - (generic-cl.arithmetic generic-cl generic-cl.collector - generic-cl.comparison generic-cl.container generic-cl.internal - generic-cl.lazy-seq generic-cl.map generic-cl.math generic-cl.object - generic-cl.sequence generic-cl.set generic-cl.util) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_lazy-seq.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_lazy-seq.nix deleted file mode 100644 index 383de5cce3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_lazy-seq.nix +++ /dev/null @@ -1,68 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "generic-cl_dot_lazy-seq"; - version = "generic-cl-20211020-git"; - - description = "Lazy sequences"; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-custom-hash-table" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_collector" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_iterator" args."generic-cl_dot_map" args."generic-cl_dot_object" args."generic-cl_dot_sequence" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa"; - }; - - packageName = "generic-cl.lazy-seq"; - - asdFilesToKeep = ["generic-cl.lazy-seq.asd"]; - overrides = x: x; -} -/* (SYSTEM generic-cl.lazy-seq DESCRIPTION Lazy sequences SHA256 - 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL - http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz - MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.lazy-seq FILENAME - generic-cl_dot_lazy-seq DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-custom-hash-table FILENAME cl-custom-hash-table) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) - (NAME generic-cl.collector FILENAME generic-cl_dot_collector) - (NAME generic-cl.comparison FILENAME generic-cl_dot_comparison) - (NAME generic-cl.container FILENAME generic-cl_dot_container) - (NAME generic-cl.internal FILENAME generic-cl_dot_internal) - (NAME generic-cl.iterator FILENAME generic-cl_dot_iterator) - (NAME generic-cl.map FILENAME generic-cl_dot_map) - (NAME generic-cl.object FILENAME generic-cl_dot_object) - (NAME generic-cl.sequence FILENAME generic-cl_dot_sequence) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME static-dispatch FILENAME static-dispatch) - (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-custom-hash-table cl-environments - cl-form-types closer-mop collectors generic-cl.collector - generic-cl.comparison generic-cl.container generic-cl.internal - generic-cl.iterator generic-cl.map generic-cl.object generic-cl.sequence - introspect-environment iterate lisp-namespace optima - parse-declarations-1.0 static-dispatch symbol-munger trivia - trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION generic-cl-20211020-git SIBLINGS - (generic-cl.arithmetic generic-cl generic-cl.collector - generic-cl.comparison generic-cl.container generic-cl.internal - generic-cl.iterator generic-cl.map generic-cl.math generic-cl.object - generic-cl.sequence generic-cl.set generic-cl.util) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_map.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_map.nix deleted file mode 100644 index d44389239c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_map.nix +++ /dev/null @@ -1,65 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "generic-cl_dot_map"; - version = "generic-cl-20211020-git"; - - description = "Generic map and hash-table interface"; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-custom-hash-table" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_collector" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_iterator" args."generic-cl_dot_object" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa"; - }; - - packageName = "generic-cl.map"; - - asdFilesToKeep = ["generic-cl.map.asd"]; - overrides = x: x; -} -/* (SYSTEM generic-cl.map DESCRIPTION Generic map and hash-table interface - SHA256 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL - http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz - MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.map FILENAME - generic-cl_dot_map DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-custom-hash-table FILENAME cl-custom-hash-table) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) - (NAME generic-cl.collector FILENAME generic-cl_dot_collector) - (NAME generic-cl.comparison FILENAME generic-cl_dot_comparison) - (NAME generic-cl.container FILENAME generic-cl_dot_container) - (NAME generic-cl.internal FILENAME generic-cl_dot_internal) - (NAME generic-cl.iterator FILENAME generic-cl_dot_iterator) - (NAME generic-cl.object FILENAME generic-cl_dot_object) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME static-dispatch FILENAME static-dispatch) - (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-custom-hash-table cl-environments - cl-form-types closer-mop collectors generic-cl.collector - generic-cl.comparison generic-cl.container generic-cl.internal - generic-cl.iterator generic-cl.object introspect-environment iterate - lisp-namespace optima parse-declarations-1.0 static-dispatch symbol-munger - trivia trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION generic-cl-20211020-git SIBLINGS - (generic-cl.arithmetic generic-cl generic-cl.collector - generic-cl.comparison generic-cl.container generic-cl.internal - generic-cl.iterator generic-cl.lazy-seq generic-cl.math generic-cl.object - generic-cl.sequence generic-cl.set generic-cl.util) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_math.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_math.nix deleted file mode 100644 index f834513f08..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_math.nix +++ /dev/null @@ -1,60 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "generic-cl_dot_math"; - version = "generic-cl-20211020-git"; - - description = "Generic math function interface"; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_arithmetic" args."generic-cl_dot_comparison" args."generic-cl_dot_internal" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa"; - }; - - packageName = "generic-cl.math"; - - asdFilesToKeep = ["generic-cl.math.asd"]; - overrides = x: x; -} -/* (SYSTEM generic-cl.math DESCRIPTION Generic math function interface SHA256 - 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL - http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz - MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.math FILENAME - generic-cl_dot_math DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) - (NAME generic-cl.arithmetic FILENAME generic-cl_dot_arithmetic) - (NAME generic-cl.comparison FILENAME generic-cl_dot_comparison) - (NAME generic-cl.internal FILENAME generic-cl_dot_internal) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME static-dispatch FILENAME static-dispatch) - (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-environments cl-form-types closer-mop - collectors generic-cl.arithmetic generic-cl.comparison generic-cl.internal - introspect-environment iterate lisp-namespace optima - parse-declarations-1.0 static-dispatch symbol-munger trivia - trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION generic-cl-20211020-git SIBLINGS - (generic-cl.arithmetic generic-cl generic-cl.collector - generic-cl.comparison generic-cl.container generic-cl.internal - generic-cl.iterator generic-cl.lazy-seq generic-cl.map generic-cl.object - generic-cl.sequence generic-cl.set generic-cl.util) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_object.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_object.nix deleted file mode 100644 index 9899138482..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_object.nix +++ /dev/null @@ -1,60 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "generic-cl_dot_object"; - version = "generic-cl-20211020-git"; - - description = "Generic object copying and type conversion interface"; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_comparison" args."generic-cl_dot_internal" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa"; - }; - - packageName = "generic-cl.object"; - - asdFilesToKeep = ["generic-cl.object.asd"]; - overrides = x: x; -} -/* (SYSTEM generic-cl.object DESCRIPTION - Generic object copying and type conversion interface SHA256 - 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL - http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz - MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.object FILENAME - generic-cl_dot_object DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) - (NAME generic-cl.comparison FILENAME generic-cl_dot_comparison) - (NAME generic-cl.internal FILENAME generic-cl_dot_internal) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME static-dispatch FILENAME static-dispatch) - (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-environments cl-form-types closer-mop - collectors generic-cl.comparison generic-cl.internal - introspect-environment iterate lisp-namespace optima - parse-declarations-1.0 static-dispatch symbol-munger trivia - trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION generic-cl-20211020-git SIBLINGS - (generic-cl.arithmetic generic-cl generic-cl.collector - generic-cl.comparison generic-cl.container generic-cl.internal - generic-cl.iterator generic-cl.lazy-seq generic-cl.map generic-cl.math - generic-cl.sequence generic-cl.set generic-cl.util) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_sequence.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_sequence.nix deleted file mode 100644 index 3aae58b2ff..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_sequence.nix +++ /dev/null @@ -1,67 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "generic-cl_dot_sequence"; - version = "generic-cl-20211020-git"; - - description = "Generic sequence operations"; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-custom-hash-table" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_collector" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_iterator" args."generic-cl_dot_map" args."generic-cl_dot_object" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa"; - }; - - packageName = "generic-cl.sequence"; - - asdFilesToKeep = ["generic-cl.sequence.asd"]; - overrides = x: x; -} -/* (SYSTEM generic-cl.sequence DESCRIPTION Generic sequence operations SHA256 - 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL - http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz - MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.sequence FILENAME - generic-cl_dot_sequence DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-custom-hash-table FILENAME cl-custom-hash-table) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) - (NAME generic-cl.collector FILENAME generic-cl_dot_collector) - (NAME generic-cl.comparison FILENAME generic-cl_dot_comparison) - (NAME generic-cl.container FILENAME generic-cl_dot_container) - (NAME generic-cl.internal FILENAME generic-cl_dot_internal) - (NAME generic-cl.iterator FILENAME generic-cl_dot_iterator) - (NAME generic-cl.map FILENAME generic-cl_dot_map) - (NAME generic-cl.object FILENAME generic-cl_dot_object) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME static-dispatch FILENAME static-dispatch) - (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-custom-hash-table cl-environments - cl-form-types closer-mop collectors generic-cl.collector - generic-cl.comparison generic-cl.container generic-cl.internal - generic-cl.iterator generic-cl.map generic-cl.object - introspect-environment iterate lisp-namespace optima - parse-declarations-1.0 static-dispatch symbol-munger trivia - trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION generic-cl-20211020-git SIBLINGS - (generic-cl.arithmetic generic-cl generic-cl.collector - generic-cl.comparison generic-cl.container generic-cl.internal - generic-cl.iterator generic-cl.lazy-seq generic-cl.map generic-cl.math - generic-cl.object generic-cl.set generic-cl.util) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_set.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_set.nix deleted file mode 100644 index 27b3fdf2f6..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/generic-cl_dot_set.nix +++ /dev/null @@ -1,69 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "generic-cl_dot_set"; - version = "generic-cl-20211020-git"; - - description = "Generic set interface"; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-custom-hash-table" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."generic-cl_dot_arithmetic" args."generic-cl_dot_collector" args."generic-cl_dot_comparison" args."generic-cl_dot_container" args."generic-cl_dot_internal" args."generic-cl_dot_iterator" args."generic-cl_dot_map" args."generic-cl_dot_object" args."generic-cl_dot_sequence" args."introspect-environment" args."iterate" args."lisp-namespace" args."optima" args."parse-declarations-1_dot_0" args."static-dispatch" args."symbol-munger" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz"; - sha256 = "0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa"; - }; - - packageName = "generic-cl.set"; - - asdFilesToKeep = ["generic-cl.set.asd"]; - overrides = x: x; -} -/* (SYSTEM generic-cl.set DESCRIPTION Generic set interface SHA256 - 0jryfmxwqhrarmpbb643b7iv5rlib5pcx4i4jcd6h2rscnrbj8sa URL - http://beta.quicklisp.org/archive/generic-cl/2021-10-20/generic-cl-20211020-git.tgz - MD5 ce42f45dd7c5be44de45ee259a46d7b8 NAME generic-cl.set FILENAME - generic-cl_dot_set DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-custom-hash-table FILENAME cl-custom-hash-table) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) - (NAME generic-cl.arithmetic FILENAME generic-cl_dot_arithmetic) - (NAME generic-cl.collector FILENAME generic-cl_dot_collector) - (NAME generic-cl.comparison FILENAME generic-cl_dot_comparison) - (NAME generic-cl.container FILENAME generic-cl_dot_container) - (NAME generic-cl.internal FILENAME generic-cl_dot_internal) - (NAME generic-cl.iterator FILENAME generic-cl_dot_iterator) - (NAME generic-cl.map FILENAME generic-cl_dot_map) - (NAME generic-cl.object FILENAME generic-cl_dot_object) - (NAME generic-cl.sequence FILENAME generic-cl_dot_sequence) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME static-dispatch FILENAME static-dispatch) - (NAME symbol-munger FILENAME symbol-munger) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-custom-hash-table cl-environments - cl-form-types closer-mop collectors generic-cl.arithmetic - generic-cl.collector generic-cl.comparison generic-cl.container - generic-cl.internal generic-cl.iterator generic-cl.map generic-cl.object - generic-cl.sequence introspect-environment iterate lisp-namespace optima - parse-declarations-1.0 static-dispatch symbol-munger trivia - trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION generic-cl-20211020-git SIBLINGS - (generic-cl.arithmetic generic-cl generic-cl.collector - generic-cl.comparison generic-cl.container generic-cl.internal - generic-cl.iterator generic-cl.lazy-seq generic-cl.map generic-cl.math - generic-cl.object generic-cl.sequence generic-cl.util) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/gettext.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/gettext.nix deleted file mode 100644 index 333bdf77b5..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/gettext.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "gettext"; - version = "20171130-git"; - - description = "An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems."; - - deps = [ args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."yacc" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz"; - sha256 = "0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd"; - }; - - packageName = "gettext"; - - asdFilesToKeep = ["gettext.asd"]; - overrides = x: x; -} -/* (SYSTEM gettext DESCRIPTION - An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems. - SHA256 0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd URL - http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz - MD5 d162cb5310db5011c82ef6343fd280ed NAME gettext FILENAME gettext DEPS - ((NAME flexi-streams FILENAME flexi-streams) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME yacc FILENAME yacc)) - DEPENDENCIES (flexi-streams split-sequence trivial-gray-streams yacc) - VERSION 20171130-git SIBLINGS (gettext-example gettext-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/global-vars.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/global-vars.nix deleted file mode 100644 index 2c7bed4fa7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/global-vars.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "global-vars"; - version = "20141106-git"; - - description = "Define efficient global variables."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz"; - sha256 = "0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j"; - }; - - packageName = "global-vars"; - - asdFilesToKeep = ["global-vars.asd"]; - overrides = x: x; -} -/* (SYSTEM global-vars DESCRIPTION Define efficient global variables. SHA256 - 0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j URL - http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz - MD5 dd3153ee75c972a80450aa00644b2200 NAME global-vars FILENAME global-vars - DEPS NIL DEPENDENCIES NIL VERSION 20141106-git SIBLINGS (global-vars-test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/glsl-docs.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/glsl-docs.nix deleted file mode 100644 index 4679a62c06..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/glsl-docs.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "glsl-docs"; - version = "glsl-spec-release-quicklisp-f04476f7-git"; - - description = "The official docs for all the symbols in glsl-symbols"; - - deps = [ args."glsl-symbols" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; - sha256 = "0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7"; - }; - - packageName = "glsl-docs"; - - asdFilesToKeep = ["glsl-docs.asd"]; - overrides = x: x; -} -/* (SYSTEM glsl-docs DESCRIPTION - The official docs for all the symbols in glsl-symbols SHA256 - 0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7 URL - http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz - MD5 52760939a269acce6b2cba8dbde81ef7 NAME glsl-docs FILENAME glsl-docs DEPS - ((NAME glsl-symbols FILENAME glsl-symbols)) DEPENDENCIES (glsl-symbols) - VERSION glsl-spec-release-quicklisp-f04476f7-git SIBLINGS - (glsl-spec glsl-symbols) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/glsl-spec.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/glsl-spec.nix deleted file mode 100644 index 08150c645f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/glsl-spec.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "glsl-spec"; - version = "release-quicklisp-f04476f7-git"; - - description = "The GLSL Spec as a datastructure"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; - sha256 = "0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7"; - }; - - packageName = "glsl-spec"; - - asdFilesToKeep = ["glsl-spec.asd"]; - overrides = x: x; -} -/* (SYSTEM glsl-spec DESCRIPTION The GLSL Spec as a datastructure SHA256 - 0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7 URL - http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz - MD5 52760939a269acce6b2cba8dbde81ef7 NAME glsl-spec FILENAME glsl-spec DEPS - NIL DEPENDENCIES NIL VERSION release-quicklisp-f04476f7-git SIBLINGS - (glsl-docs glsl-symbols) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/glsl-symbols.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/glsl-symbols.nix deleted file mode 100644 index fd22bfb6ad..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/glsl-symbols.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "glsl-symbols"; - version = "glsl-spec-release-quicklisp-f04476f7-git"; - - description = "Lispy versions of all glsl names as symbols"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; - sha256 = "0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7"; - }; - - packageName = "glsl-symbols"; - - asdFilesToKeep = ["glsl-symbols.asd"]; - overrides = x: x; -} -/* (SYSTEM glsl-symbols DESCRIPTION Lispy versions of all glsl names as symbols - SHA256 0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7 URL - http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz - MD5 52760939a269acce6b2cba8dbde81ef7 NAME glsl-symbols FILENAME - glsl-symbols DEPS NIL DEPENDENCIES NIL VERSION - glsl-spec-release-quicklisp-f04476f7-git SIBLINGS (glsl-docs glsl-spec) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/heap.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/heap.nix deleted file mode 100644 index be000574f9..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/heap.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "heap"; - version = "20181018-git"; - - description = "Binary Heap for Common Lisp."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/heap/2018-10-18/heap-20181018-git.tgz"; - sha256 = "1376i9vq5kcskzhqfxvsfvxz7kwkp6d3bd7rxn94dgnha988fd77"; - }; - - packageName = "heap"; - - asdFilesToKeep = ["heap.asd"]; - overrides = x: x; -} -/* (SYSTEM heap DESCRIPTION Binary Heap for Common Lisp. SHA256 - 1376i9vq5kcskzhqfxvsfvxz7kwkp6d3bd7rxn94dgnha988fd77 URL - http://beta.quicklisp.org/archive/heap/2018-10-18/heap-20181018-git.tgz MD5 - a2355ef9c113a3335919a45195083951 NAME heap FILENAME heap DEPS NIL - DEPENDENCIES NIL VERSION 20181018-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/html-encode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/html-encode.nix deleted file mode 100644 index 2e7553da1e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/html-encode.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "html-encode"; - version = "1.2"; - - description = "A library for encoding text in various web-savvy encodings."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz"; - sha256 = "06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf"; - }; - - packageName = "html-encode"; - - asdFilesToKeep = ["html-encode.asd"]; - overrides = x: x; -} -/* (SYSTEM html-encode DESCRIPTION - A library for encoding text in various web-savvy encodings. SHA256 - 06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf URL - http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz - MD5 67f22483fe6d270b8830f78f285a1016 NAME html-encode FILENAME html-encode - DEPS NIL DEPENDENCIES NIL VERSION 1.2 SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/http-body.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/http-body.nix deleted file mode 100644 index c40df485a1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/http-body.nix +++ /dev/null @@ -1,50 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "http-body"; - version = "20190813-git"; - - description = "HTTP POST data parser for Common Lisp"; - - deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."named-readtables" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."xsubseq" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz"; - sha256 = "1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8"; - }; - - packageName = "http-body"; - - asdFilesToKeep = ["http-body.asd"]; - overrides = x: x; -} -/* (SYSTEM http-body DESCRIPTION HTTP POST data parser for Common Lisp SHA256 - 1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8 URL - http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz - MD5 d46ac52643ae7dc148438f84a8107a79 NAME http-body FILENAME http-body DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME cl-annot FILENAME cl-annot) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-syntax FILENAME cl-syntax) - (NAME cl-syntax-annot FILENAME cl-syntax-annot) - (NAME cl-utilities FILENAME cl-utilities) - (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) - (NAME flexi-streams FILENAME flexi-streams) - (NAME jonathan FILENAME jonathan) - (NAME named-readtables FILENAME named-readtables) - (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) - (NAME smart-buffer FILENAME smart-buffer) - (NAME split-sequence FILENAME split-sequence) - (NAME static-vectors FILENAME static-vectors) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME trivial-types FILENAME trivial-types) - (NAME xsubseq FILENAME xsubseq)) - DEPENDENCIES - (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre - cl-syntax cl-syntax-annot cl-utilities fast-http fast-io flexi-streams - jonathan named-readtables proc-parse quri smart-buffer split-sequence - static-vectors trivial-features trivial-gray-streams trivial-types - xsubseq) - VERSION 20190813-git SIBLINGS (http-body-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix deleted file mode 100644 index ad53cdd1e5..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "hu_dot_dwim_dot_asdf"; - version = "20200925-darcs"; - - description = "Various ASDF extensions such as attached test and documentation system, explicit development support, etc."; - - deps = [ args."asdf" args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz"; - sha256 = "1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h"; - }; - - packageName = "hu.dwim.asdf"; - - asdFilesToKeep = ["hu.dwim.asdf.asd"]; - overrides = x: x; -} -/* (SYSTEM hu.dwim.asdf DESCRIPTION - Various ASDF extensions such as attached test and documentation system, explicit development support, etc. - SHA256 1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h URL - http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz - MD5 feec747077117dd9850db77ed1919c21 NAME hu.dwim.asdf FILENAME - hu_dot_dwim_dot_asdf DEPS - ((NAME asdf FILENAME asdf) (NAME uiop FILENAME uiop)) DEPENDENCIES - (asdf uiop) VERSION 20200925-darcs SIBLINGS (hu.dwim.asdf.documentation) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_common-lisp.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_common-lisp.nix deleted file mode 100644 index 4faa57b5f4..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_common-lisp.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "hu_dot_dwim_dot_common-lisp"; - version = "stable-git"; - - description = "A redefinition of the standard Common Lisp package that includes a number of renames and shadows."; - - deps = [ args."hu_dot_dwim_dot_asdf" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/hu.dwim.common-lisp/2021-02-28/hu.dwim.common-lisp-stable-git.tgz"; - sha256 = "1v111qvpfs0jml54a4qccyicgq4jg3h72z8484wa1x0acc9hgz76"; - }; - - packageName = "hu.dwim.common-lisp"; - - asdFilesToKeep = ["hu.dwim.common-lisp.asd"]; - overrides = x: x; -} -/* (SYSTEM hu.dwim.common-lisp DESCRIPTION - A redefinition of the standard Common Lisp package that includes a number of renames and shadows. - SHA256 1v111qvpfs0jml54a4qccyicgq4jg3h72z8484wa1x0acc9hgz76 URL - http://beta.quicklisp.org/archive/hu.dwim.common-lisp/2021-02-28/hu.dwim.common-lisp-stable-git.tgz - MD5 4f0c7a375cc55381efdbeb17ef17dd7d NAME hu.dwim.common-lisp FILENAME - hu_dot_dwim_dot_common-lisp DEPS - ((NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf)) DEPENDENCIES - (hu.dwim.asdf) VERSION stable-git SIBLINGS - (hu.dwim.common-lisp.documentation) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_common.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_common.nix deleted file mode 100644 index b123762ce0..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_common.nix +++ /dev/null @@ -1,37 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "hu_dot_dwim_dot_common"; - version = "20150709-darcs"; - - description = "An extended Common Lisp package to the general needs of other hu.dwim systems."; - - deps = [ args."alexandria" args."anaphora" args."closer-mop" args."hu_dot_dwim_dot_asdf" args."hu_dot_dwim_dot_common-lisp" args."iterate" args."metabang-bind" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/hu.dwim.common/2015-07-09/hu.dwim.common-20150709-darcs.tgz"; - sha256 = "12l1rr6w9m99w0b5gc6hv58ainjfhbc588kz6vwshn4gqsxyzbhp"; - }; - - packageName = "hu.dwim.common"; - - asdFilesToKeep = ["hu.dwim.common.asd"]; - overrides = x: x; -} -/* (SYSTEM hu.dwim.common DESCRIPTION - An extended Common Lisp package to the general needs of other hu.dwim systems. - SHA256 12l1rr6w9m99w0b5gc6hv58ainjfhbc588kz6vwshn4gqsxyzbhp URL - http://beta.quicklisp.org/archive/hu.dwim.common/2015-07-09/hu.dwim.common-20150709-darcs.tgz - MD5 fff7f05c24e71a0270021909ca86a9ef NAME hu.dwim.common FILENAME - hu_dot_dwim_dot_common DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME closer-mop FILENAME closer-mop) - (NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf) - (NAME hu.dwim.common-lisp FILENAME hu_dot_dwim_dot_common-lisp) - (NAME iterate FILENAME iterate) - (NAME metabang-bind FILENAME metabang-bind)) - DEPENDENCIES - (alexandria anaphora closer-mop hu.dwim.asdf hu.dwim.common-lisp iterate - metabang-bind) - VERSION 20150709-darcs SIBLINGS (hu.dwim.common.documentation) PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix deleted file mode 100644 index 6208aa1cc4..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix +++ /dev/null @@ -1,36 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "hu_dot_dwim_dot_def"; - version = "20201016-darcs"; - - description = "General purpose, homogenous, extensible definer macro."; - - deps = [ args."alexandria" args."anaphora" args."hu_dot_dwim_dot_asdf" args."iterate" args."metabang-bind" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2020-10-16/hu.dwim.def-20201016-darcs.tgz"; - sha256 = "0m9id405f0s1438yr2qppdw5z7xdx3ajaa1frd04pibqgf4db4cj"; - }; - - packageName = "hu.dwim.def"; - - asdFilesToKeep = ["hu.dwim.def.asd"]; - overrides = x: x; -} -/* (SYSTEM hu.dwim.def DESCRIPTION - General purpose, homogenous, extensible definer macro. SHA256 - 0m9id405f0s1438yr2qppdw5z7xdx3ajaa1frd04pibqgf4db4cj URL - http://beta.quicklisp.org/archive/hu.dwim.def/2020-10-16/hu.dwim.def-20201016-darcs.tgz - MD5 c4d7469472f57cd700d8319e35dd5f32 NAME hu.dwim.def FILENAME - hu_dot_dwim_dot_def DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf) - (NAME iterate FILENAME iterate) - (NAME metabang-bind FILENAME metabang-bind)) - DEPENDENCIES (alexandria anaphora hu.dwim.asdf iterate metabang-bind) - VERSION 20201016-darcs SIBLINGS - (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common - hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation - hu.dwim.def.namespace hu.dwim.def.test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_def_plus_swank.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_def_plus_swank.nix deleted file mode 100644 index 852b0c79e1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_def_plus_swank.nix +++ /dev/null @@ -1,37 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "hu_dot_dwim_dot_def_plus_swank"; - version = "hu.dwim.def-20201016-darcs"; - - description = "System lacks description"; - - deps = [ args."alexandria" args."anaphora" args."hu_dot_dwim_dot_asdf" args."hu_dot_dwim_dot_def" args."iterate" args."metabang-bind" args."swank" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/hu.dwim.def/2020-10-16/hu.dwim.def-20201016-darcs.tgz"; - sha256 = "0m9id405f0s1438yr2qppdw5z7xdx3ajaa1frd04pibqgf4db4cj"; - }; - - packageName = "hu.dwim.def+swank"; - - asdFilesToKeep = ["hu.dwim.def+swank.asd"]; - overrides = x: x; -} -/* (SYSTEM hu.dwim.def+swank DESCRIPTION System lacks description SHA256 - 0m9id405f0s1438yr2qppdw5z7xdx3ajaa1frd04pibqgf4db4cj URL - http://beta.quicklisp.org/archive/hu.dwim.def/2020-10-16/hu.dwim.def-20201016-darcs.tgz - MD5 c4d7469472f57cd700d8319e35dd5f32 NAME hu.dwim.def+swank FILENAME - hu_dot_dwim_dot_def_plus_swank DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf) - (NAME hu.dwim.def FILENAME hu_dot_dwim_dot_def) - (NAME iterate FILENAME iterate) - (NAME metabang-bind FILENAME metabang-bind) (NAME swank FILENAME swank)) - DEPENDENCIES - (alexandria anaphora hu.dwim.asdf hu.dwim.def iterate metabang-bind swank) - VERSION hu.dwim.def-20201016-darcs SIBLINGS - (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common - hu.dwim.def+hu.dwim.delico hu.dwim.def hu.dwim.def.documentation - hu.dwim.def.namespace hu.dwim.def.test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix deleted file mode 100644 index dcebc1b13a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix +++ /dev/null @@ -1,37 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "hu_dot_dwim_dot_defclass-star"; - version = "stable-git"; - - parasites = [ "hu.dwim.defclass-star/test" ]; - - description = "Simplify class like definitions with defclass* and friends."; - - deps = [ args."hu_dot_dwim_dot_asdf" args."hu_dot_dwim_dot_common" args."hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-09/hu.dwim.defclass-star-stable-git.tgz"; - sha256 = "0draahmhi5mmrj9aqabqdaipqcb9adxqdypjbdiawg55dw36g0cy"; - }; - - packageName = "hu.dwim.defclass-star"; - - asdFilesToKeep = ["hu.dwim.defclass-star.asd"]; - overrides = x: x; -} -/* (SYSTEM hu.dwim.defclass-star DESCRIPTION - Simplify class like definitions with defclass* and friends. SHA256 - 0draahmhi5mmrj9aqabqdaipqcb9adxqdypjbdiawg55dw36g0cy URL - http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-12-09/hu.dwim.defclass-star-stable-git.tgz - MD5 e35fa9767089eb2fb03befaec18d5081 NAME hu.dwim.defclass-star FILENAME - hu_dot_dwim_dot_defclass-star DEPS - ((NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf) - (NAME hu.dwim.common FILENAME hu_dot_dwim_dot_common) - (NAME hu.dwim.stefil+hu.dwim.def+swank FILENAME - hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank)) - DEPENDENCIES (hu.dwim.asdf hu.dwim.common hu.dwim.stefil+hu.dwim.def+swank) - VERSION stable-git SIBLINGS - (hu.dwim.defclass-star+contextl hu.dwim.defclass-star+hu.dwim.def+contextl - hu.dwim.defclass-star+hu.dwim.def hu.dwim.defclass-star+swank) - PARASITES (hu.dwim.defclass-star/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix deleted file mode 100644 index a6188cd767..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "hu_dot_dwim_dot_stefil"; - version = "20200218-darcs"; - - parasites = [ "hu.dwim.stefil/test" ]; - - description = "A Simple Test Framework In Lisp."; - - deps = [ args."alexandria" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz"; - sha256 = "16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf"; - }; - - packageName = "hu.dwim.stefil"; - - asdFilesToKeep = ["hu.dwim.stefil.asd"]; - overrides = x: x; -} -/* (SYSTEM hu.dwim.stefil DESCRIPTION A Simple Test Framework In Lisp. SHA256 - 16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf URL - http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz - MD5 3e87e0973f8373e342b75b13c802cc53 NAME hu.dwim.stefil FILENAME - hu_dot_dwim_dot_stefil DEPS ((NAME alexandria FILENAME alexandria)) - DEPENDENCIES (alexandria) VERSION 20200218-darcs SIBLINGS - (hu.dwim.stefil+hu.dwim.def+swank hu.dwim.stefil+hu.dwim.def - hu.dwim.stefil+swank) - PARASITES (hu.dwim.stefil/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def.nix deleted file mode 100644 index 2f365dced0..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def.nix +++ /dev/null @@ -1,37 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def"; - version = "hu.dwim.stefil-20200218-darcs"; - - description = "System lacks description"; - - deps = [ args."alexandria" args."anaphora" args."hu_dot_dwim_dot_asdf" args."hu_dot_dwim_dot_def" args."hu_dot_dwim_dot_stefil" args."iterate" args."metabang-bind" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz"; - sha256 = "16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf"; - }; - - packageName = "hu.dwim.stefil+hu.dwim.def"; - - asdFilesToKeep = ["hu.dwim.stefil+hu.dwim.def.asd"]; - overrides = x: x; -} -/* (SYSTEM hu.dwim.stefil+hu.dwim.def DESCRIPTION System lacks description - SHA256 16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf URL - http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz - MD5 3e87e0973f8373e342b75b13c802cc53 NAME hu.dwim.stefil+hu.dwim.def - FILENAME hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf) - (NAME hu.dwim.def FILENAME hu_dot_dwim_dot_def) - (NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil) - (NAME iterate FILENAME iterate) - (NAME metabang-bind FILENAME metabang-bind)) - DEPENDENCIES - (alexandria anaphora hu.dwim.asdf hu.dwim.def hu.dwim.stefil iterate - metabang-bind) - VERSION hu.dwim.stefil-20200218-darcs SIBLINGS - (hu.dwim.stefil+hu.dwim.def+swank hu.dwim.stefil+swank hu.dwim.stefil) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank.nix deleted file mode 100644 index eff179a55e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank.nix +++ /dev/null @@ -1,43 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank"; - version = "hu.dwim.stefil-20200218-darcs"; - - description = "System lacks description"; - - deps = [ args."alexandria" args."anaphora" args."hu_dot_dwim_dot_asdf" args."hu_dot_dwim_dot_def" args."hu_dot_dwim_dot_def_plus_swank" args."hu_dot_dwim_dot_stefil" args."hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def" args."hu_dot_dwim_dot_stefil_plus_swank" args."iterate" args."metabang-bind" args."swank" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz"; - sha256 = "16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf"; - }; - - packageName = "hu.dwim.stefil+hu.dwim.def+swank"; - - asdFilesToKeep = ["hu.dwim.stefil+hu.dwim.def+swank.asd"]; - overrides = x: x; -} -/* (SYSTEM hu.dwim.stefil+hu.dwim.def+swank DESCRIPTION - System lacks description SHA256 - 16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf URL - http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz - MD5 3e87e0973f8373e342b75b13c802cc53 NAME hu.dwim.stefil+hu.dwim.def+swank - FILENAME hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def_plus_swank DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf) - (NAME hu.dwim.def FILENAME hu_dot_dwim_dot_def) - (NAME hu.dwim.def+swank FILENAME hu_dot_dwim_dot_def_plus_swank) - (NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil) - (NAME hu.dwim.stefil+hu.dwim.def FILENAME - hu_dot_dwim_dot_stefil_plus_hu_dot_dwim_dot_def) - (NAME hu.dwim.stefil+swank FILENAME hu_dot_dwim_dot_stefil_plus_swank) - (NAME iterate FILENAME iterate) - (NAME metabang-bind FILENAME metabang-bind) (NAME swank FILENAME swank)) - DEPENDENCIES - (alexandria anaphora hu.dwim.asdf hu.dwim.def hu.dwim.def+swank - hu.dwim.stefil hu.dwim.stefil+hu.dwim.def hu.dwim.stefil+swank iterate - metabang-bind swank) - VERSION hu.dwim.stefil-20200218-darcs SIBLINGS - (hu.dwim.stefil+hu.dwim.def hu.dwim.stefil+swank hu.dwim.stefil) PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil_plus_swank.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil_plus_swank.nix deleted file mode 100644 index 6d9614d2de..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil_plus_swank.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "hu_dot_dwim_dot_stefil_plus_swank"; - version = "hu.dwim.stefil-20200218-darcs"; - - description = "System lacks description"; - - deps = [ args."alexandria" args."hu_dot_dwim_dot_asdf" args."hu_dot_dwim_dot_stefil" args."swank" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz"; - sha256 = "16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf"; - }; - - packageName = "hu.dwim.stefil+swank"; - - asdFilesToKeep = ["hu.dwim.stefil+swank.asd"]; - overrides = x: x; -} -/* (SYSTEM hu.dwim.stefil+swank DESCRIPTION System lacks description SHA256 - 16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf URL - http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz - MD5 3e87e0973f8373e342b75b13c802cc53 NAME hu.dwim.stefil+swank FILENAME - hu_dot_dwim_dot_stefil_plus_swank DEPS - ((NAME alexandria FILENAME alexandria) - (NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf) - (NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil) - (NAME swank FILENAME swank)) - DEPENDENCIES (alexandria hu.dwim.asdf hu.dwim.stefil swank) VERSION - hu.dwim.stefil-20200218-darcs SIBLINGS - (hu.dwim.stefil+hu.dwim.def+swank hu.dwim.stefil+hu.dwim.def - hu.dwim.stefil) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hunchensocket.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hunchensocket.nix deleted file mode 100644 index 0179451ed7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hunchensocket.nix +++ /dev/null @@ -1,48 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "hunchensocket"; - version = "20210531-git"; - - parasites = [ "hunchensocket-tests" ]; - - description = "WebSockets for Hunchentoot"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."fiasco" args."flexi-streams" args."hunchentoot" args."ironclad" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-utf-8" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/hunchensocket/2021-05-31/hunchensocket-20210531-git.tgz"; - sha256 = "18zy11fir6vlg5vh29pr221dydbl9carfj9xkmsnygyzxkl6jghl"; - }; - - packageName = "hunchensocket"; - - asdFilesToKeep = ["hunchensocket.asd"]; - overrides = x: x; -} -/* (SYSTEM hunchensocket DESCRIPTION WebSockets for Hunchentoot SHA256 - 18zy11fir6vlg5vh29pr221dydbl9carfj9xkmsnygyzxkl6jghl URL - http://beta.quicklisp.org/archive/hunchensocket/2021-05-31/hunchensocket-20210531-git.tgz - MD5 a529901753a54eb48c93aa86b0c3747d NAME hunchensocket FILENAME - hunchensocket DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) - (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME fiasco FILENAME fiasco) (NAME flexi-streams FILENAME flexi-streams) - (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad) - (NAME md5 FILENAME md5) (NAME rfc2388 FILENAME rfc2388) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-backtrace FILENAME trivial-backtrace) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME trivial-utf-8 FILENAME trivial-utf-8) - (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi chunga cl+ssl cl-base64 cl-fad - cl-ppcre fiasco flexi-streams hunchentoot ironclad md5 rfc2388 - split-sequence trivial-backtrace trivial-features trivial-garbage - trivial-gray-streams trivial-utf-8 usocket) - VERSION 20210531-git SIBLINGS NIL PARASITES (hunchensocket-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hunchentoot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hunchentoot.nix deleted file mode 100644 index 9bada7ef56..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/hunchentoot.nix +++ /dev/null @@ -1,54 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "hunchentoot"; - version = "v1.3.0"; - - parasites = [ "hunchentoot-dev" "hunchentoot-test" ]; - - description = "Hunchentoot is a HTTP server based on USOCKET and - BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a - simple framework for user-defined handlers and can be extended - through subclassing."; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz"; - sha256 = "08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8"; - }; - - packageName = "hunchentoot"; - - asdFilesToKeep = ["hunchentoot.asd"]; - overrides = x: x; -} -/* (SYSTEM hunchentoot DESCRIPTION - Hunchentoot is a HTTP server based on USOCKET and - BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a - simple framework for user-defined handlers and can be extended - through subclassing. - SHA256 08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8 URL - http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz - MD5 b1bb0c8df41a0ffaba4309e5084930fe NAME hunchentoot FILENAME hunchentoot - DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) - (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-who FILENAME cl-who) (NAME cxml-stp FILENAME cxml-stp) - (NAME drakma FILENAME drakma) (NAME flexi-streams FILENAME flexi-streams) - (NAME md5 FILENAME md5) (NAME rfc2388 FILENAME rfc2388) - (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank) - (NAME trivial-backtrace FILENAME trivial-backtrace) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME usocket FILENAME usocket) (NAME xpath FILENAME xpath)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi chunga cl+ssl cl-base64 cl-fad - cl-ppcre cl-who cxml-stp drakma flexi-streams md5 rfc2388 split-sequence - swank trivial-backtrace trivial-features trivial-garbage - trivial-gray-streams usocket xpath) - VERSION v1.3.0 SIBLINGS NIL PARASITES (hunchentoot-dev hunchentoot-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/idna.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/idna.nix deleted file mode 100644 index 87cef0b0bf..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/idna.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "idna"; - version = "20120107-git"; - - description = "IDNA (international domain names) string encoding and decoding routines"; - - deps = [ args."split-sequence" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz"; - sha256 = "0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c"; - }; - - packageName = "idna"; - - asdFilesToKeep = ["idna.asd"]; - overrides = x: x; -} -/* (SYSTEM idna DESCRIPTION - IDNA (international domain names) string encoding and decoding routines - SHA256 0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c URL - http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz MD5 - 85b91a66efe4381bf116cdb5d2b756b6 NAME idna FILENAME idna DEPS - ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES - (split-sequence) VERSION 20120107-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/ieee-floats.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/ieee-floats.nix deleted file mode 100644 index 4ab0fce5ae..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/ieee-floats.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "ieee-floats"; - version = "20170830-git"; - - parasites = [ "ieee-floats-tests" ]; - - description = "Convert floating point values to IEEE 754 binary representation"; - - deps = [ args."fiveam" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz"; - sha256 = "15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk"; - }; - - packageName = "ieee-floats"; - - asdFilesToKeep = ["ieee-floats.asd"]; - overrides = x: x; -} -/* (SYSTEM ieee-floats DESCRIPTION - Convert floating point values to IEEE 754 binary representation SHA256 - 15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk URL - http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz - MD5 3434b4d91224ca6a817ced9d83f14bb6 NAME ieee-floats FILENAME ieee-floats - DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION - 20170830-git SIBLINGS NIL PARASITES (ieee-floats-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/inferior-shell.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/inferior-shell.nix deleted file mode 100644 index d8e65cbdae..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/inferior-shell.nix +++ /dev/null @@ -1,55 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "inferior-shell"; - version = "20200925-git"; - - parasites = [ "inferior-shell/test" ]; - - description = "spawn local or remote processes and shell pipes"; - - deps = [ args."alexandria" args."asdf" args."closer-mop" args."fare-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."hu_dot_dwim_dot_stefil" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz"; - sha256 = "1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80"; - }; - - packageName = "inferior-shell"; - - asdFilesToKeep = ["inferior-shell.asd"]; - overrides = x: x; -} -/* (SYSTEM inferior-shell DESCRIPTION - spawn local or remote processes and shell pipes SHA256 - 1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80 URL - http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz - MD5 7ca5f15446ef80715758610a930bccba NAME inferior-shell FILENAME - inferior-shell DEPS - ((NAME alexandria FILENAME alexandria) (NAME asdf FILENAME asdf) - (NAME closer-mop FILENAME closer-mop) (NAME fare-mop FILENAME fare-mop) - (NAME fare-quasiquote FILENAME fare-quasiquote) - (NAME fare-quasiquote-extras FILENAME fare-quasiquote-extras) - (NAME fare-quasiquote-optima FILENAME fare-quasiquote-optima) - (NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable) - (NAME fare-utils FILENAME fare-utils) - (NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME named-readtables FILENAME named-readtables) - (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.quasiquote FILENAME trivia_dot_quasiquote) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (alexandria asdf closer-mop fare-mop fare-quasiquote fare-quasiquote-extras - fare-quasiquote-optima fare-quasiquote-readtable fare-utils hu.dwim.stefil - introspect-environment iterate lisp-namespace named-readtables trivia - trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.quasiquote trivia.trivial trivial-cltl2 type-i) - VERSION 20200925-git SIBLINGS NIL PARASITES (inferior-shell/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/introspect-environment.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/introspect-environment.nix deleted file mode 100644 index 6963f286fb..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/introspect-environment.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "introspect-environment"; - version = "20210807-git"; - - description = "Small interface to portable but nonstandard introspection of CL environments."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/introspect-environment/2021-08-07/introspect-environment-20210807-git.tgz"; - sha256 = "124rnbcjygw7wm07bpcibsqkvsqxhr8pq42p7phw39kmcp9hns4j"; - }; - - packageName = "introspect-environment"; - - asdFilesToKeep = ["introspect-environment.asd"]; - overrides = x: x; -} -/* (SYSTEM introspect-environment DESCRIPTION - Small interface to portable but nonstandard introspection of CL environments. - SHA256 124rnbcjygw7wm07bpcibsqkvsqxhr8pq42p7phw39kmcp9hns4j URL - http://beta.quicklisp.org/archive/introspect-environment/2021-08-07/introspect-environment-20210807-git.tgz - MD5 f9d4e1208146e9435c2ce1b82a87a209 NAME introspect-environment FILENAME - introspect-environment DEPS NIL DEPENDENCIES NIL VERSION 20210807-git - SIBLINGS (introspect-environment-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib.nix deleted file mode 100644 index 273d467230..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib.nix +++ /dev/null @@ -1,47 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "iolib"; - version = "v0.8.4"; - - parasites = [ "iolib/multiplex" "iolib/os" "iolib/pathnames" "iolib/sockets" "iolib/streams" "iolib/syscalls" "iolib/tests" "iolib/trivial-sockets" "iolib/zstreams" ]; - - description = "I/O library."; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fiveam" args."idna" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" args."swap-bytes" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "0vahwswwk3rxkr5wcph5n91sgzlm53d53j8m8sxbqixm8j1ff5vq"; - }; - - packageName = "iolib"; - - asdFilesToKeep = ["iolib.asd"]; - overrides = x: x; -} -/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 - 0vahwswwk3rxkr5wcph5n91sgzlm53d53j8m8sxbqixm8j1ff5vq URL - http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz MD5 - 5650165890f8b278b357864f597b377d NAME iolib FILENAME iolib DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME fiveam FILENAME fiveam) (NAME idna FILENAME idna) - (NAME iolib.asdf FILENAME iolib_dot_asdf) - (NAME iolib.base FILENAME iolib_dot_base) - (NAME iolib.common-lisp FILENAME iolib_dot_common-lisp) - (NAME iolib.conf FILENAME iolib_dot_conf) - (NAME split-sequence FILENAME split-sequence) - (NAME swap-bytes FILENAME swap-bytes) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain fiveam - idna iolib.asdf iolib.base iolib.common-lisp iolib.conf split-sequence - swap-bytes trivial-features) - VERSION v0.8.4 SIBLINGS - (iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples) - PARASITES - (iolib/multiplex iolib/os iolib/pathnames iolib/sockets iolib/streams - iolib/syscalls iolib/tests iolib/trivial-sockets iolib/zstreams)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_asdf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_asdf.nix deleted file mode 100644 index 142d990ddf..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_asdf.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "iolib_dot_asdf"; - version = "iolib-v0.8.4"; - - description = "A few ASDF component classes."; - - deps = [ args."alexandria" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "0vahwswwk3rxkr5wcph5n91sgzlm53d53j8m8sxbqixm8j1ff5vq"; - }; - - packageName = "iolib.asdf"; - - asdFilesToKeep = ["iolib.asdf.asd"]; - overrides = x: x; -} -/* (SYSTEM iolib.asdf DESCRIPTION A few ASDF component classes. SHA256 - 0vahwswwk3rxkr5wcph5n91sgzlm53d53j8m8sxbqixm8j1ff5vq URL - http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz MD5 - 5650165890f8b278b357864f597b377d NAME iolib.asdf FILENAME iolib_dot_asdf - DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) - VERSION iolib-v0.8.4 SIBLINGS - (iolib iolib.base iolib.common-lisp iolib.conf iolib.examples) PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_base.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_base.nix deleted file mode 100644 index b2e0886903..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_base.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "iolib_dot_base"; - version = "iolib-v0.8.4"; - - description = "Base IOlib package, used instead of CL."; - - deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "0vahwswwk3rxkr5wcph5n91sgzlm53d53j8m8sxbqixm8j1ff5vq"; - }; - - packageName = "iolib.base"; - - asdFilesToKeep = ["iolib.base.asd"]; - overrides = x: x; -} -/* (SYSTEM iolib.base DESCRIPTION Base IOlib package, used instead of CL. - SHA256 0vahwswwk3rxkr5wcph5n91sgzlm53d53j8m8sxbqixm8j1ff5vq URL - http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz MD5 - 5650165890f8b278b357864f597b377d NAME iolib.base FILENAME iolib_dot_base - DEPS - ((NAME alexandria FILENAME alexandria) - (NAME iolib.asdf FILENAME iolib_dot_asdf) - (NAME iolib.common-lisp FILENAME iolib_dot_common-lisp) - (NAME iolib.conf FILENAME iolib_dot_conf) - (NAME split-sequence FILENAME split-sequence)) - DEPENDENCIES - (alexandria iolib.asdf iolib.common-lisp iolib.conf split-sequence) VERSION - iolib-v0.8.4 SIBLINGS - (iolib iolib.asdf iolib.common-lisp iolib.conf iolib.examples) PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_common-lisp.nix deleted file mode 100644 index 9dcf0781b0..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_common-lisp.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "iolib_dot_common-lisp"; - version = "iolib-v0.8.4"; - - description = "Slightly modified Common Lisp."; - - deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_conf" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "0vahwswwk3rxkr5wcph5n91sgzlm53d53j8m8sxbqixm8j1ff5vq"; - }; - - packageName = "iolib.common-lisp"; - - asdFilesToKeep = ["iolib.common-lisp.asd"]; - overrides = x: x; -} -/* (SYSTEM iolib.common-lisp DESCRIPTION Slightly modified Common Lisp. SHA256 - 0vahwswwk3rxkr5wcph5n91sgzlm53d53j8m8sxbqixm8j1ff5vq URL - http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz MD5 - 5650165890f8b278b357864f597b377d NAME iolib.common-lisp FILENAME - iolib_dot_common-lisp DEPS - ((NAME alexandria FILENAME alexandria) - (NAME iolib.asdf FILENAME iolib_dot_asdf) - (NAME iolib.conf FILENAME iolib_dot_conf)) - DEPENDENCIES (alexandria iolib.asdf iolib.conf) VERSION iolib-v0.8.4 - SIBLINGS (iolib iolib.asdf iolib.base iolib.conf iolib.examples) PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_conf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_conf.nix deleted file mode 100644 index f3e9816441..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_conf.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "iolib_dot_conf"; - version = "iolib-v0.8.4"; - - description = "Compile-time configuration for IOLib."; - - deps = [ args."alexandria" args."iolib_dot_asdf" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz"; - sha256 = "0vahwswwk3rxkr5wcph5n91sgzlm53d53j8m8sxbqixm8j1ff5vq"; - }; - - packageName = "iolib.conf"; - - asdFilesToKeep = ["iolib.conf.asd"]; - overrides = x: x; -} -/* (SYSTEM iolib.conf DESCRIPTION Compile-time configuration for IOLib. SHA256 - 0vahwswwk3rxkr5wcph5n91sgzlm53d53j8m8sxbqixm8j1ff5vq URL - http://beta.quicklisp.org/archive/iolib/2021-06-30/iolib-v0.8.4.tgz MD5 - 5650165890f8b278b357864f597b377d NAME iolib.conf FILENAME iolib_dot_conf - DEPS - ((NAME alexandria FILENAME alexandria) - (NAME iolib.asdf FILENAME iolib_dot_asdf)) - DEPENDENCIES (alexandria iolib.asdf) VERSION iolib-v0.8.4 SIBLINGS - (iolib iolib.asdf iolib.base iolib.common-lisp iolib.examples) PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_grovel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_grovel.nix deleted file mode 100644 index 89f889419f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iolib_dot_grovel.nix +++ /dev/null @@ -1,40 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "iolib_dot_grovel"; - version = "iolib-v0.8.3"; - - description = "The CFFI Groveller"; - - deps = [ args."alexandria" args."babel" args."cffi" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" args."trivial-features" args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz"; - sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c"; - }; - - packageName = "iolib.grovel"; - - asdFilesToKeep = ["iolib.grovel.asd"]; - overrides = x: x; -} -/* (SYSTEM iolib.grovel DESCRIPTION The CFFI Groveller SHA256 - 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL - http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz MD5 - fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.grovel FILENAME - iolib_dot_grovel DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME iolib.asdf FILENAME iolib_dot_asdf) - (NAME iolib.base FILENAME iolib_dot_base) - (NAME iolib.common-lisp FILENAME iolib_dot_common-lisp) - (NAME iolib.conf FILENAME iolib_dot_conf) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features) - (NAME uiop FILENAME uiop)) - DEPENDENCIES - (alexandria babel cffi iolib.asdf iolib.base iolib.common-lisp iolib.conf - split-sequence trivial-features uiop) - VERSION iolib-v0.8.3 SIBLINGS - (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples - iolib.tests) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/ironclad.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/ironclad.nix deleted file mode 100644 index 66d3614a9c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/ironclad.nix +++ /dev/null @@ -1,62 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "ironclad"; - version = "v0.56"; - - parasites = [ "ironclad/aead/eax" "ironclad/aead/etm" "ironclad/aead/gcm" "ironclad/aeads" "ironclad/cipher/aes" "ironclad/cipher/arcfour" "ironclad/cipher/aria" "ironclad/cipher/blowfish" "ironclad/cipher/camellia" "ironclad/cipher/cast5" "ironclad/cipher/chacha" "ironclad/cipher/des" "ironclad/cipher/idea" "ironclad/cipher/kalyna" "ironclad/cipher/keystream" "ironclad/cipher/kuznyechik" "ironclad/cipher/misty1" "ironclad/cipher/rc2" "ironclad/cipher/rc5" "ironclad/cipher/rc6" "ironclad/cipher/salsa20" "ironclad/cipher/seed" "ironclad/cipher/serpent" "ironclad/cipher/sm4" "ironclad/cipher/sosemanuk" "ironclad/cipher/square" "ironclad/cipher/tea" "ironclad/cipher/threefish" "ironclad/cipher/twofish" "ironclad/cipher/xchacha" "ironclad/cipher/xor" "ironclad/cipher/xsalsa20" "ironclad/cipher/xtea" "ironclad/ciphers" "ironclad/core" "ironclad/digest/adler32" "ironclad/digest/blake2" "ironclad/digest/blake2s" "ironclad/digest/crc24" "ironclad/digest/crc32" "ironclad/digest/groestl" "ironclad/digest/jh" "ironclad/digest/kupyna" "ironclad/digest/md2" "ironclad/digest/md4" "ironclad/digest/md5" "ironclad/digest/ripemd-128" "ironclad/digest/ripemd-160" "ironclad/digest/sha1" "ironclad/digest/sha256" "ironclad/digest/sha3" "ironclad/digest/sha512" "ironclad/digest/skein" "ironclad/digest/sm3" "ironclad/digest/streebog" "ironclad/digest/tiger" "ironclad/digest/tree-hash" "ironclad/digest/whirlpool" "ironclad/digests" "ironclad/kdf/argon2" "ironclad/kdf/bcrypt" "ironclad/kdf/hmac" "ironclad/kdf/password-hash" "ironclad/kdf/pkcs5" "ironclad/kdf/scrypt" "ironclad/kdfs" "ironclad/mac/blake2-mac" "ironclad/mac/blake2s-mac" "ironclad/mac/cmac" "ironclad/mac/gmac" "ironclad/mac/hmac" "ironclad/mac/poly1305" "ironclad/mac/siphash" "ironclad/mac/skein-mac" "ironclad/macs" "ironclad/prng/fortuna" "ironclad/prngs" "ironclad/public-key/curve25519" "ironclad/public-key/curve448" "ironclad/public-key/dsa" "ironclad/public-key/ed25519" "ironclad/public-key/ed448" "ironclad/public-key/elgamal" "ironclad/public-key/rsa" "ironclad/public-key/secp256k1" "ironclad/public-key/secp256r1" "ironclad/public-key/secp384r1" "ironclad/public-key/secp521r1" "ironclad/public-keys" "ironclad/tests" ]; - - description = "System lacks description"; - - deps = [ args."alexandria" args."bordeaux-threads" args."rt" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/ironclad/2021-10-20/ironclad-v0.56.tgz"; - sha256 = "06jya7y8xlwak84akhp4qg9x6nyjrnnzqmzdigxc5a3c77mk3p6k"; - }; - - packageName = "ironclad"; - - asdFilesToKeep = ["ironclad.asd"]; - overrides = x: x; -} -/* (SYSTEM ironclad DESCRIPTION System lacks description SHA256 - 06jya7y8xlwak84akhp4qg9x6nyjrnnzqmzdigxc5a3c77mk3p6k URL - http://beta.quicklisp.org/archive/ironclad/2021-10-20/ironclad-v0.56.tgz - MD5 3ea7bf7271864fd960d7e06a4e5aa9b7 NAME ironclad FILENAME ironclad DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME rt FILENAME rt)) - DEPENDENCIES (alexandria bordeaux-threads rt) VERSION v0.56 SIBLINGS - (ironclad-text) PARASITES - (ironclad/aead/eax ironclad/aead/etm ironclad/aead/gcm ironclad/aeads - ironclad/cipher/aes ironclad/cipher/arcfour ironclad/cipher/aria - ironclad/cipher/blowfish ironclad/cipher/camellia ironclad/cipher/cast5 - ironclad/cipher/chacha ironclad/cipher/des ironclad/cipher/idea - ironclad/cipher/kalyna ironclad/cipher/keystream - ironclad/cipher/kuznyechik ironclad/cipher/misty1 ironclad/cipher/rc2 - ironclad/cipher/rc5 ironclad/cipher/rc6 ironclad/cipher/salsa20 - ironclad/cipher/seed ironclad/cipher/serpent ironclad/cipher/sm4 - ironclad/cipher/sosemanuk ironclad/cipher/square ironclad/cipher/tea - ironclad/cipher/threefish ironclad/cipher/twofish ironclad/cipher/xchacha - ironclad/cipher/xor ironclad/cipher/xsalsa20 ironclad/cipher/xtea - ironclad/ciphers ironclad/core ironclad/digest/adler32 - ironclad/digest/blake2 ironclad/digest/blake2s ironclad/digest/crc24 - ironclad/digest/crc32 ironclad/digest/groestl ironclad/digest/jh - ironclad/digest/kupyna ironclad/digest/md2 ironclad/digest/md4 - ironclad/digest/md5 ironclad/digest/ripemd-128 ironclad/digest/ripemd-160 - ironclad/digest/sha1 ironclad/digest/sha256 ironclad/digest/sha3 - ironclad/digest/sha512 ironclad/digest/skein ironclad/digest/sm3 - ironclad/digest/streebog ironclad/digest/tiger ironclad/digest/tree-hash - ironclad/digest/whirlpool ironclad/digests ironclad/kdf/argon2 - ironclad/kdf/bcrypt ironclad/kdf/hmac ironclad/kdf/password-hash - ironclad/kdf/pkcs5 ironclad/kdf/scrypt ironclad/kdfs - ironclad/mac/blake2-mac ironclad/mac/blake2s-mac ironclad/mac/cmac - ironclad/mac/gmac ironclad/mac/hmac ironclad/mac/poly1305 - ironclad/mac/siphash ironclad/mac/skein-mac ironclad/macs - ironclad/prng/fortuna ironclad/prngs ironclad/public-key/curve25519 - ironclad/public-key/curve448 ironclad/public-key/dsa - ironclad/public-key/ed25519 ironclad/public-key/ed448 - ironclad/public-key/elgamal ironclad/public-key/rsa - ironclad/public-key/secp256k1 ironclad/public-key/secp256r1 - ironclad/public-key/secp384r1 ironclad/public-key/secp521r1 - ironclad/public-keys ironclad/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iterate.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iterate.nix deleted file mode 100644 index ac412031af..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/iterate.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "iterate"; - version = "release-b0f9a9c6-git"; - - parasites = [ "iterate/tests" ]; - - description = "Jonathan Amsterdam's iterator/gatherer/accumulator facility"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/iterate/2021-05-31/iterate-release-b0f9a9c6-git.tgz"; - sha256 = "1fqk0iaqg7xjwhdr8q05birlpwh4zvmlranmsmfps3wmldccc4ck"; - }; - - packageName = "iterate"; - - asdFilesToKeep = ["iterate.asd"]; - overrides = x: x; -} -/* (SYSTEM iterate DESCRIPTION - Jonathan Amsterdam's iterator/gatherer/accumulator facility SHA256 - 1fqk0iaqg7xjwhdr8q05birlpwh4zvmlranmsmfps3wmldccc4ck URL - http://beta.quicklisp.org/archive/iterate/2021-05-31/iterate-release-b0f9a9c6-git.tgz - MD5 0b2661e9b8195f3e5891aa14601e5a69 NAME iterate FILENAME iterate DEPS NIL - DEPENDENCIES NIL VERSION release-b0f9a9c6-git SIBLINGS NIL PARASITES - (iterate/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jonathan.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jonathan.nix deleted file mode 100644 index 3e8e74d9e2..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jonathan.nix +++ /dev/null @@ -1,43 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "jonathan"; - version = "20200925-git"; - - description = "High performance JSON encoder and decoder. Currently support: SBCL, CCL."; - - deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz"; - sha256 = "1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx"; - }; - - packageName = "jonathan"; - - asdFilesToKeep = ["jonathan.asd"]; - overrides = x: x; -} -/* (SYSTEM jonathan DESCRIPTION - High performance JSON encoder and decoder. Currently support: SBCL, CCL. - SHA256 1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx URL - http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz - MD5 27cad3c107544f587f9f33295c10d81e NAME jonathan FILENAME jonathan DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME cl-annot FILENAME cl-annot) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-syntax FILENAME cl-syntax) - (NAME cl-syntax-annot FILENAME cl-syntax-annot) - (NAME fast-io FILENAME fast-io) - (NAME named-readtables FILENAME named-readtables) - (NAME proc-parse FILENAME proc-parse) - (NAME static-vectors FILENAME static-vectors) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME trivial-types FILENAME trivial-types)) - DEPENDENCIES - (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre - cl-syntax cl-syntax-annot fast-io named-readtables proc-parse - static-vectors trivial-features trivial-gray-streams trivial-types) - VERSION 20200925-git SIBLINGS (jonathan-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jpl-queues.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jpl-queues.nix deleted file mode 100644 index 0100a58a44..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jpl-queues.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "jpl-queues"; - version = "0.1"; - - description = "A few different kinds of queues, with optional -multithreading synchronization."; - - deps = [ args."alexandria" args."bordeaux-threads" args."jpl-util" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/jpl-queues/2010-10-06/jpl-queues-0.1.tgz"; - sha256 = "1wvvv7j117h9a42qaj1g4fh4mji28xqs7s60rn6d11gk9jl76h96"; - }; - - packageName = "jpl-queues"; - - asdFilesToKeep = ["jpl-queues.asd"]; - overrides = x: x; -} -/* (SYSTEM jpl-queues DESCRIPTION A few different kinds of queues, with optional -multithreading synchronization. - SHA256 1wvvv7j117h9a42qaj1g4fh4mji28xqs7s60rn6d11gk9jl76h96 URL - http://beta.quicklisp.org/archive/jpl-queues/2010-10-06/jpl-queues-0.1.tgz - MD5 7c3d14c955db0a5c8ece2b9409333ce0 NAME jpl-queues FILENAME jpl-queues - DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME jpl-util FILENAME jpl-util)) - DEPENDENCIES (alexandria bordeaux-threads jpl-util) VERSION 0.1 SIBLINGS - NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jpl-util.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jpl-util.nix deleted file mode 100644 index d05ddd8527..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jpl-util.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "jpl-util"; - version = "cl-20151031-git"; - - description = "Sundry utilities for J.P. Larocque."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-jpl-util/2015-10-31/cl-jpl-util-20151031-git.tgz"; - sha256 = "1a3sfamgrqgsf0ql3fkbpmjbs837v1b3nxqxp4mkisp6yxanmhzx"; - }; - - packageName = "jpl-util"; - - asdFilesToKeep = ["jpl-util.asd"]; - overrides = x: x; -} -/* (SYSTEM jpl-util DESCRIPTION Sundry utilities for J.P. Larocque. SHA256 - 1a3sfamgrqgsf0ql3fkbpmjbs837v1b3nxqxp4mkisp6yxanmhzx URL - http://beta.quicklisp.org/archive/cl-jpl-util/2015-10-31/cl-jpl-util-20151031-git.tgz - MD5 e294bedace729724873e7633b8265a00 NAME jpl-util FILENAME jpl-util DEPS - NIL DEPENDENCIES NIL VERSION cl-20151031-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jsown.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jsown.nix deleted file mode 100644 index 08dadf8ea3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/jsown.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "jsown"; - version = "20200218-git"; - - description = "Fast JSON parsing library. Mainly geared torwards fetching only a few keys of many objects, but efficient for other types of content too"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/jsown/2020-02-18/jsown-20200218-git.tgz"; - sha256 = "10cn1fkznyq73vxwy95wsd36yfiiakmk278lv7mzzsyqc1jrn2hj"; - }; - - packageName = "jsown"; - - asdFilesToKeep = ["jsown.asd"]; - overrides = x: x; -} -/* (SYSTEM jsown DESCRIPTION - Fast JSON parsing library. Mainly geared torwards fetching only a few keys of many objects, but efficient for other types of content too - SHA256 10cn1fkznyq73vxwy95wsd36yfiiakmk278lv7mzzsyqc1jrn2hj URL - http://beta.quicklisp.org/archive/jsown/2020-02-18/jsown-20200218-git.tgz - MD5 ecf8bfcc2a2ccbab9baddca6592b34ba NAME jsown FILENAME jsown DEPS NIL - DEPENDENCIES NIL VERSION 20200218-git SIBLINGS (jsown-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/kmrcl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/kmrcl.nix deleted file mode 100644 index 87358d518f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/kmrcl.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "kmrcl"; - version = "20201016-git"; - - parasites = [ "kmrcl/test" ]; - - description = "System lacks description"; - - deps = [ args."rt" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz"; - sha256 = "0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf"; - }; - - packageName = "kmrcl"; - - asdFilesToKeep = ["kmrcl.asd"]; - overrides = x: x; -} -/* (SYSTEM kmrcl DESCRIPTION System lacks description SHA256 - 0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf URL - http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz - MD5 f86bc410907f748c3c453469702755b8 NAME kmrcl FILENAME kmrcl DEPS - ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20201016-git SIBLINGS NIL - PARASITES (kmrcl/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack-component.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack-component.nix deleted file mode 100644 index ce77c0cf8a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack-component.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lack-component"; - version = "lack-20211209-git"; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lack/2021-12-09/lack-20211209-git.tgz"; - sha256 = "0vd36hjcf98s9slkm6rmgsa7r10wvzl9s4xhfmcwh7qv7jxdgkhg"; - }; - - packageName = "lack-component"; - - asdFilesToKeep = ["lack-component.asd"]; - overrides = x: x; -} -/* (SYSTEM lack-component DESCRIPTION System lacks description SHA256 - 0vd36hjcf98s9slkm6rmgsa7r10wvzl9s4xhfmcwh7qv7jxdgkhg URL - http://beta.quicklisp.org/archive/lack/2021-12-09/lack-20211209-git.tgz MD5 - 610b1aea0280193d6f125aa1317a2d79 NAME lack-component FILENAME - lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20211209-git SIBLINGS - (lack-app-directory lack-app-file lack-middleware-accesslog - lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf - lack-middleware-mount lack-middleware-session lack-middleware-static - lack-request lack-response lack-session-store-dbi lack-session-store-redis - lack-test lack-util-writer-stream lack-util lack t-lack-component - t-lack-middleware-accesslog t-lack-middleware-auth-basic - t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount - t-lack-middleware-session t-lack-middleware-static t-lack-request - t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack-middleware-backtrace.nix deleted file mode 100644 index eee9c9430f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ /dev/null @@ -1,36 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lack-middleware-backtrace"; - version = "lack-20211209-git"; - - description = "System lacks description"; - - deps = [ args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lack/2021-12-09/lack-20211209-git.tgz"; - sha256 = "0vd36hjcf98s9slkm6rmgsa7r10wvzl9s4xhfmcwh7qv7jxdgkhg"; - }; - - packageName = "lack-middleware-backtrace"; - - asdFilesToKeep = ["lack-middleware-backtrace.asd"]; - overrides = x: x; -} -/* (SYSTEM lack-middleware-backtrace DESCRIPTION System lacks description - SHA256 0vd36hjcf98s9slkm6rmgsa7r10wvzl9s4xhfmcwh7qv7jxdgkhg URL - http://beta.quicklisp.org/archive/lack/2021-12-09/lack-20211209-git.tgz MD5 - 610b1aea0280193d6f125aa1317a2d79 NAME lack-middleware-backtrace FILENAME - lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES - (uiop) VERSION lack-20211209-git SIBLINGS - (lack-app-directory lack-app-file lack-component lack-middleware-accesslog - lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount - lack-middleware-session lack-middleware-static lack-request lack-response - lack-session-store-dbi lack-session-store-redis lack-test - lack-util-writer-stream lack-util lack t-lack-component - t-lack-middleware-accesslog t-lack-middleware-auth-basic - t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount - t-lack-middleware-session t-lack-middleware-static t-lack-request - t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack-util.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack-util.nix deleted file mode 100644 index 422850c8b3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack-util.nix +++ /dev/null @@ -1,39 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lack-util"; - version = "lack-20211209-git"; - - description = "System lacks description"; - - deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lack/2021-12-09/lack-20211209-git.tgz"; - sha256 = "0vd36hjcf98s9slkm6rmgsa7r10wvzl9s4xhfmcwh7qv7jxdgkhg"; - }; - - packageName = "lack-util"; - - asdFilesToKeep = ["lack-util.asd"]; - overrides = x: x; -} -/* (SYSTEM lack-util DESCRIPTION System lacks description SHA256 - 0vd36hjcf98s9slkm6rmgsa7r10wvzl9s4xhfmcwh7qv7jxdgkhg URL - http://beta.quicklisp.org/archive/lack/2021-12-09/lack-20211209-git.tgz MD5 - 610b1aea0280193d6f125aa1317a2d79 NAME lack-util FILENAME lack-util DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME ironclad FILENAME ironclad)) - DEPENDENCIES (alexandria bordeaux-threads ironclad) VERSION - lack-20211209-git SIBLINGS - (lack-app-directory lack-app-file lack-component lack-middleware-accesslog - lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf - lack-middleware-mount lack-middleware-session lack-middleware-static - lack-request lack-response lack-session-store-dbi lack-session-store-redis - lack-test lack-util-writer-stream lack t-lack-component - t-lack-middleware-accesslog t-lack-middleware-auth-basic - t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount - t-lack-middleware-session t-lack-middleware-static t-lack-request - t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack.nix deleted file mode 100644 index 723bc52d97..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lack.nix +++ /dev/null @@ -1,42 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lack"; - version = "20211209-git"; - - description = "A minimal Clack"; - - deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lack/2021-12-09/lack-20211209-git.tgz"; - sha256 = "0vd36hjcf98s9slkm6rmgsa7r10wvzl9s4xhfmcwh7qv7jxdgkhg"; - }; - - packageName = "lack"; - - asdFilesToKeep = ["lack.asd"]; - overrides = x: x; -} -/* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 - 0vd36hjcf98s9slkm6rmgsa7r10wvzl9s4xhfmcwh7qv7jxdgkhg URL - http://beta.quicklisp.org/archive/lack/2021-12-09/lack-20211209-git.tgz MD5 - 610b1aea0280193d6f125aa1317a2d79 NAME lack FILENAME lack DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME ironclad FILENAME ironclad) - (NAME lack-component FILENAME lack-component) - (NAME lack-util FILENAME lack-util)) - DEPENDENCIES - (alexandria bordeaux-threads ironclad lack-component lack-util) VERSION - 20211209-git SIBLINGS - (lack-app-directory lack-app-file lack-component lack-middleware-accesslog - lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf - lack-middleware-mount lack-middleware-session lack-middleware-static - lack-request lack-response lack-session-store-dbi lack-session-store-redis - lack-test lack-util-writer-stream lack-util t-lack-component - t-lack-middleware-accesslog t-lack-middleware-auth-basic - t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount - t-lack-middleware-session t-lack-middleware-static t-lack-request - t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lambda-fiddle.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lambda-fiddle.nix deleted file mode 100644 index 62adaf2bca..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lambda-fiddle.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lambda-fiddle"; - version = "20190710-git"; - - description = "A collection of functions to process lambda-lists."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lambda-fiddle/2019-07-10/lambda-fiddle-20190710-git.tgz"; - sha256 = "0v4qjpp9fq9rlxhr5f6mjs5f076xrjk19rl6qgp1ap1ykcrx8k4j"; - }; - - packageName = "lambda-fiddle"; - - asdFilesToKeep = ["lambda-fiddle.asd"]; - overrides = x: x; -} -/* (SYSTEM lambda-fiddle DESCRIPTION - A collection of functions to process lambda-lists. SHA256 - 0v4qjpp9fq9rlxhr5f6mjs5f076xrjk19rl6qgp1ap1ykcrx8k4j URL - http://beta.quicklisp.org/archive/lambda-fiddle/2019-07-10/lambda-fiddle-20190710-git.tgz - MD5 78f68f144ace9cb8f634ac14b3414e5e NAME lambda-fiddle FILENAME - lambda-fiddle DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/legit.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/legit.nix deleted file mode 100644 index c986409319..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/legit.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "legit"; - version = "20190710-git"; - - description = "CL interface to the GIT binary."; - - deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."documentation-utils" args."lambda-fiddle" args."simple-inferiors" args."trivial-indent" args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/legit/2019-07-10/legit-20190710-git.tgz"; - sha256 = "0g7cn50qvivsn0w9yszqw2qh22jsj60067pmg5pvwsjm03xdl9s9"; - }; - - packageName = "legit"; - - asdFilesToKeep = ["legit.asd"]; - overrides = x: x; -} -/* (SYSTEM legit DESCRIPTION CL interface to the GIT binary. SHA256 - 0g7cn50qvivsn0w9yszqw2qh22jsj60067pmg5pvwsjm03xdl9s9 URL - http://beta.quicklisp.org/archive/legit/2019-07-10/legit-20190710-git.tgz - MD5 9b380fc23d4bab086df8a0e4a598457a NAME legit FILENAME legit DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-ppcre FILENAME cl-ppcre) - (NAME documentation-utils FILENAME documentation-utils) - (NAME lambda-fiddle FILENAME lambda-fiddle) - (NAME simple-inferiors FILENAME simple-inferiors) - (NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop)) - DEPENDENCIES - (alexandria bordeaux-threads cl-ppcre documentation-utils lambda-fiddle - simple-inferiors trivial-indent uiop) - VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/let-plus.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/let-plus.nix deleted file mode 100644 index d7032122ee..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/let-plus.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "let-plus"; - version = "20191130-git"; - - parasites = [ "let-plus/tests" ]; - - description = "Destructuring extension of LET*."; - - deps = [ args."alexandria" args."anaphora" args."lift" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz"; - sha256 = "0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p"; - }; - - packageName = "let-plus"; - - asdFilesToKeep = ["let-plus.asd"]; - overrides = x: x; -} -/* (SYSTEM let-plus DESCRIPTION Destructuring extension of LET*. SHA256 - 0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p URL - http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz - MD5 1b8d1660ed67852ea31cad44a6fc15d0 NAME let-plus FILENAME let-plus DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME lift FILENAME lift)) - DEPENDENCIES (alexandria anaphora lift) VERSION 20191130-git SIBLINGS NIL - PARASITES (let-plus/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lev.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lev.nix deleted file mode 100644 index 13cb18cfc7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lev.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lev"; - version = "20150505-git"; - - description = "libev bindings for Common Lisp"; - - deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz"; - sha256 = "0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl"; - }; - - packageName = "lev"; - - asdFilesToKeep = ["lev.asd"]; - overrides = x: x; -} -/* (SYSTEM lev DESCRIPTION libev bindings for Common Lisp SHA256 - 0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl URL - http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz MD5 - 10f340f7500beb98b5c0d4a9876131fb NAME lev FILENAME lev DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20150505-git - SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-client.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-client.nix deleted file mode 100644 index 113766e11b..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-client.nix +++ /dev/null @@ -1,42 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lfarm-client"; - version = "lfarm-20150608-git"; - - description = "Client component of lfarm, a library for distributing work across machines."; - - deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."lparallel" args."split-sequence" args."trivial-gray-streams" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; - sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; - }; - - packageName = "lfarm-client"; - - asdFilesToKeep = ["lfarm-client.asd"]; - overrides = x: x; -} -/* (SYSTEM lfarm-client DESCRIPTION - Client component of lfarm, a library for distributing work across machines. - SHA256 1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66 URL - http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz - MD5 4cc91df44a932b3175a1eabf73d6e42d NAME lfarm-client FILENAME - lfarm-client DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-store FILENAME cl-store) - (NAME flexi-streams FILENAME flexi-streams) - (NAME lfarm-common FILENAME lfarm-common) - (NAME lparallel FILENAME lparallel) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria bordeaux-threads cl-store flexi-streams lfarm-common lparallel - split-sequence trivial-gray-streams usocket) - VERSION lfarm-20150608-git SIBLINGS - (lfarm-admin lfarm-common lfarm-gss lfarm-launcher lfarm-server lfarm-ssl - lfarm-test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-common.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-common.nix deleted file mode 100644 index 5e0170a586..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-common.nix +++ /dev/null @@ -1,42 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lfarm-common"; - version = "lfarm-20150608-git"; - - description = "(private) Common components of lfarm, a library for distributing -work across machines."; - - deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; - sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; - }; - - packageName = "lfarm-common"; - - asdFilesToKeep = ["lfarm-common.asd"]; - overrides = x: x; -} -/* (SYSTEM lfarm-common DESCRIPTION - (private) Common components of lfarm, a library for distributing -work across machines. - SHA256 1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66 URL - http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz - MD5 4cc91df44a932b3175a1eabf73d6e42d NAME lfarm-common FILENAME - lfarm-common DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-store FILENAME cl-store) - (NAME flexi-streams FILENAME flexi-streams) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria bordeaux-threads cl-store flexi-streams split-sequence - trivial-gray-streams usocket) - VERSION lfarm-20150608-git SIBLINGS - (lfarm-admin lfarm-client lfarm-gss lfarm-launcher lfarm-server lfarm-ssl - lfarm-test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-server.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-server.nix deleted file mode 100644 index 5bef53f9f8..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-server.nix +++ /dev/null @@ -1,41 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lfarm-server"; - version = "lfarm-20150608-git"; - - description = "Server component of lfarm, a library for distributing work across machines."; - - deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-gray-streams" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; - sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; - }; - - packageName = "lfarm-server"; - - asdFilesToKeep = ["lfarm-server.asd"]; - overrides = x: x; -} -/* (SYSTEM lfarm-server DESCRIPTION - Server component of lfarm, a library for distributing work across machines. - SHA256 1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66 URL - http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz - MD5 4cc91df44a932b3175a1eabf73d6e42d NAME lfarm-server FILENAME - lfarm-server DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-store FILENAME cl-store) - (NAME flexi-streams FILENAME flexi-streams) - (NAME lfarm-common FILENAME lfarm-common) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria bordeaux-threads cl-store flexi-streams lfarm-common - split-sequence trivial-gray-streams usocket) - VERSION lfarm-20150608-git SIBLINGS - (lfarm-admin lfarm-client lfarm-common lfarm-gss lfarm-launcher lfarm-ssl - lfarm-test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-ssl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-ssl.nix deleted file mode 100644 index dbe2b527e3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lfarm-ssl.nix +++ /dev/null @@ -1,43 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lfarm-ssl"; - version = "lfarm-20150608-git"; - - description = "SSL support for lfarm"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz"; - sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66"; - }; - - packageName = "lfarm-ssl"; - - asdFilesToKeep = ["lfarm-ssl.asd"]; - overrides = x: x; -} -/* (SYSTEM lfarm-ssl DESCRIPTION SSL support for lfarm SHA256 - 1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66 URL - http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz - MD5 4cc91df44a932b3175a1eabf73d6e42d NAME lfarm-ssl FILENAME lfarm-ssl DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl_plus_ssl) - (NAME cl-store FILENAME cl-store) - (NAME flexi-streams FILENAME flexi-streams) - (NAME lfarm-common FILENAME lfarm-common) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cl+ssl cl-store flexi-streams - lfarm-common split-sequence trivial-features trivial-garbage - trivial-gray-streams usocket) - VERSION lfarm-20150608-git SIBLINGS - (lfarm-admin lfarm-client lfarm-common lfarm-gss lfarm-launcher - lfarm-server lfarm-test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lift.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lift.nix deleted file mode 100644 index f422f5ec6b..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lift.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lift"; - version = "20211209-git"; - - description = "LIsp Framework for Testing"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lift/2021-12-09/lift-20211209-git.tgz"; - sha256 = "1r3i1gi2kggxbvh6mk58cddp5mi9kh7v23gd3z5q70w7cy69iiy7"; - }; - - packageName = "lift"; - - asdFilesToKeep = ["lift.asd"]; - overrides = x: x; -} -/* (SYSTEM lift DESCRIPTION LIsp Framework for Testing SHA256 - 1r3i1gi2kggxbvh6mk58cddp5mi9kh7v23gd3z5q70w7cy69iiy7 URL - http://beta.quicklisp.org/archive/lift/2021-12-09/lift-20211209-git.tgz MD5 - b98c58658dba0b84a034aa1f0f68dcc9 NAME lift FILENAME lift DEPS NIL - DEPENDENCIES NIL VERSION 20211209-git SIBLINGS - (lift-documentation lift-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-binary.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-binary.nix deleted file mode 100644 index ae18bc99ef..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-binary.nix +++ /dev/null @@ -1,37 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lisp-binary"; - version = "20210411-git"; - - description = "Declare binary formats as structs and then read and write them."; - - deps = [ args."alexandria" args."babel" args."cffi" args."closer-mop" args."flexi-streams" args."iterate" args."moptilities" args."quasiquote-2_dot_0" args."trivial-features" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lisp-binary/2021-04-11/lisp-binary-20210411-git.tgz"; - sha256 = "1sbapl8qla4xb8wcix9yxpijkbk1bpybhay7ncb3z2im7r2kzsnb"; - }; - - packageName = "lisp-binary"; - - asdFilesToKeep = ["lisp-binary.asd"]; - overrides = x: x; -} -/* (SYSTEM lisp-binary DESCRIPTION - Declare binary formats as structs and then read and write them. SHA256 - 1sbapl8qla4xb8wcix9yxpijkbk1bpybhay7ncb3z2im7r2kzsnb URL - http://beta.quicklisp.org/archive/lisp-binary/2021-04-11/lisp-binary-20210411-git.tgz - MD5 29d85f01a1cb17742164bacae940d29c NAME lisp-binary FILENAME lisp-binary - DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME closer-mop FILENAME closer-mop) - (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) (NAME moptilities FILENAME moptilities) - (NAME quasiquote-2.0 FILENAME quasiquote-2_dot_0) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES - (alexandria babel cffi closer-mop flexi-streams iterate moptilities - quasiquote-2.0 trivial-features trivial-gray-streams) - VERSION 20210411-git SIBLINGS (lisp-binary-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-namespace.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-namespace.nix deleted file mode 100644 index 510bf4965b..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-namespace.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lisp-namespace"; - version = "20211020-git"; - - description = "Provides LISP-N --- extensible namespaces in Common Lisp."; - - deps = [ args."alexandria" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lisp-namespace/2021-10-20/lisp-namespace-20211020-git.tgz"; - sha256 = "1vw7zxzhlxqjnas3cxk0f58hxvlvki78vbqsabj6f3n1rq6yx7b7"; - }; - - packageName = "lisp-namespace"; - - asdFilesToKeep = ["lisp-namespace.asd"]; - overrides = x: x; -} -/* (SYSTEM lisp-namespace DESCRIPTION - Provides LISP-N --- extensible namespaces in Common Lisp. SHA256 - 1vw7zxzhlxqjnas3cxk0f58hxvlvki78vbqsabj6f3n1rq6yx7b7 URL - http://beta.quicklisp.org/archive/lisp-namespace/2021-10-20/lisp-namespace-20211020-git.tgz - MD5 71d02a1704c93281028316e96ecaead2 NAME lisp-namespace FILENAME - lisp-namespace DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES - (alexandria) VERSION 20211020-git SIBLINGS (lisp-namespace.test) PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-stat.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-stat.nix deleted file mode 100644 index e7112f4308..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-stat.nix +++ /dev/null @@ -1,49 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lisp-stat"; - version = "20210411-git"; - - parasites = [ "lisp-stat/rdata" ]; - - description = "A statistical computing environment for Common Lisp"; - - deps = [ args."alexandria" args."anaphora" args."array-operations" args."cl-ascii-table" args."cl-csv" args."cl-interpol" args."cl-ppcre" args."cl-semver" args."cl-unicode" args."data-frame" args."dexador" args."dfio" args."esrap" args."flexi-streams" args."iterate" args."let-plus" args."make-hash" args."named-readtables" args."num-utils" args."select" args."split-sequence" args."trivial-with-current-source-form" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lisp-stat/2021-04-11/lisp-stat-20210411-git.tgz"; - sha256 = "110cfj1svn9m9xn6l8p5z88knp0idyf0zcbnwi9rrgxssvaiwncg"; - }; - - packageName = "lisp-stat"; - - asdFilesToKeep = ["lisp-stat.asd"]; - overrides = x: x; -} -/* (SYSTEM lisp-stat DESCRIPTION - A statistical computing environment for Common Lisp SHA256 - 110cfj1svn9m9xn6l8p5z88knp0idyf0zcbnwi9rrgxssvaiwncg URL - http://beta.quicklisp.org/archive/lisp-stat/2021-04-11/lisp-stat-20210411-git.tgz - MD5 766777ed3ba44a0835fc02c5b1f13970 NAME lisp-stat FILENAME lisp-stat DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME array-operations FILENAME array-operations) - (NAME cl-ascii-table FILENAME cl-ascii-table) - (NAME cl-csv FILENAME cl-csv) (NAME cl-interpol FILENAME cl-interpol) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-semver FILENAME cl-semver) - (NAME cl-unicode FILENAME cl-unicode) - (NAME data-frame FILENAME data-frame) (NAME dexador FILENAME dexador) - (NAME dfio FILENAME dfio) (NAME esrap FILENAME esrap) - (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) (NAME let-plus FILENAME let-plus) - (NAME make-hash FILENAME make-hash) - (NAME named-readtables FILENAME named-readtables) - (NAME num-utils FILENAME num-utils) (NAME select FILENAME select) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-with-current-source-form FILENAME - trivial-with-current-source-form)) - DEPENDENCIES - (alexandria anaphora array-operations cl-ascii-table cl-csv cl-interpol - cl-ppcre cl-semver cl-unicode data-frame dexador dfio esrap flexi-streams - iterate let-plus make-hash named-readtables num-utils select - split-sequence trivial-with-current-source-form) - VERSION 20210411-git SIBLINGS NIL PARASITES (lisp-stat/rdata)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-unit.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-unit.nix deleted file mode 100644 index 673ef0ee63..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-unit.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lisp-unit"; - version = "20170124-git"; - - description = "Common Lisp library that supports unit testing."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lisp-unit/2017-01-24/lisp-unit-20170124-git.tgz"; - sha256 = "00bc19r7vr76rpk8lh8z7qln0glpf66mzqxw215488zwz3nwcq4m"; - }; - - packageName = "lisp-unit"; - - asdFilesToKeep = ["lisp-unit.asd"]; - overrides = x: x; -} -/* (SYSTEM lisp-unit DESCRIPTION - Common Lisp library that supports unit testing. SHA256 - 00bc19r7vr76rpk8lh8z7qln0glpf66mzqxw215488zwz3nwcq4m URL - http://beta.quicklisp.org/archive/lisp-unit/2017-01-24/lisp-unit-20170124-git.tgz - MD5 2c55342cb8af18b290bb6a28c75deac5 NAME lisp-unit FILENAME lisp-unit DEPS - NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-unit2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-unit2.nix deleted file mode 100644 index 7f0b22de69..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lisp-unit2.nix +++ /dev/null @@ -1,39 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lisp-unit2"; - version = "20180131-git"; - - parasites = [ "lisp-unit2-test" ]; - - description = "Common Lisp library that supports unit testing."; - - deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."named-readtables" args."symbol-munger" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz"; - sha256 = "04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7"; - }; - - packageName = "lisp-unit2"; - - asdFilesToKeep = ["lisp-unit2.asd"]; - overrides = x: x; -} -/* (SYSTEM lisp-unit2 DESCRIPTION - Common Lisp library that supports unit testing. SHA256 - 04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7 URL - http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz - MD5 d061fa640837441a5d2eecbefd8b2e69 NAME lisp-unit2 FILENAME lisp-unit2 - DEPS - ((NAME alexandria FILENAME alexandria) - (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-unicode FILENAME cl-unicode) - (NAME flexi-streams FILENAME flexi-streams) - (NAME iterate FILENAME iterate) - (NAME named-readtables FILENAME named-readtables) - (NAME symbol-munger FILENAME symbol-munger)) - DEPENDENCIES - (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate - named-readtables symbol-munger) - VERSION 20180131-git SIBLINGS NIL PARASITES (lisp-unit2-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lla.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lla.nix deleted file mode 100644 index a73e28bf3a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lla.nix +++ /dev/null @@ -1,37 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lla"; - version = "20180328-git"; - - parasites = [ "lla-tests" ]; - - description = "Lisp Linear Algebra"; - - deps = [ args."alexandria" args."anaphora" args."array-operations" args."babel" args."cffi" args."cl-num-utils" args."cl-slice" args."clunit" args."let-plus" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lla/2018-03-28/lla-20180328-git.tgz"; - sha256 = "0azljp93ap9lh2gfh1vvl99r18s6a03p880c3wvwpf9valb784hj"; - }; - - packageName = "lla"; - - asdFilesToKeep = ["lla.asd"]; - overrides = x: x; -} -/* (SYSTEM lla DESCRIPTION Lisp Linear Algebra SHA256 - 0azljp93ap9lh2gfh1vvl99r18s6a03p880c3wvwpf9valb784hj URL - http://beta.quicklisp.org/archive/lla/2018-03-28/lla-20180328-git.tgz MD5 - 61d583603d5cacf9d81486a0cfcfaf6a NAME lla FILENAME lla DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME array-operations FILENAME array-operations) - (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) - (NAME cl-num-utils FILENAME cl-num-utils) - (NAME cl-slice FILENAME cl-slice) (NAME clunit FILENAME clunit) - (NAME let-plus FILENAME let-plus) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria anaphora array-operations babel cffi cl-num-utils cl-slice - clunit let-plus trivial-features) - VERSION 20180328-git SIBLINGS NIL PARASITES (lla-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/local-time.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/local-time.nix deleted file mode 100644 index c2788badfc..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/local-time.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "local-time"; - version = "20210124-git"; - - parasites = [ "local-time/test" ]; - - description = "A library for manipulating dates and times, based on a paper by Erik Naggum"; - - deps = [ args."hu_dot_dwim_dot_stefil" args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/local-time/2021-01-24/local-time-20210124-git.tgz"; - sha256 = "0bz5z0rd8gfd22bpqkalaijxlrk806zc010cvgd4qjapbrxzjg3s"; - }; - - packageName = "local-time"; - - asdFilesToKeep = ["local-time.asd"]; - overrides = x: x; -} -/* (SYSTEM local-time DESCRIPTION - A library for manipulating dates and times, based on a paper by Erik Naggum - SHA256 0bz5z0rd8gfd22bpqkalaijxlrk806zc010cvgd4qjapbrxzjg3s URL - http://beta.quicklisp.org/archive/local-time/2021-01-24/local-time-20210124-git.tgz - MD5 631d67bc84ae838792717b256f2cdbaf NAME local-time FILENAME local-time - DEPS - ((NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil) - (NAME uiop FILENAME uiop)) - DEPENDENCIES (hu.dwim.stefil uiop) VERSION 20210124-git SIBLINGS - (cl-postgres+local-time) PARASITES (local-time/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/log4cl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/log4cl.nix deleted file mode 100644 index 84c31acd5e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/log4cl.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "log4cl"; - version = "20211209-git"; - - parasites = [ "log4cl/syslog" "log4cl/test" ]; - - description = "System lacks description"; - - deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/log4cl/2021-12-09/log4cl-20211209-git.tgz"; - sha256 = "17jwxhc2ysh3m3cp7wvh8cy359v7w6kz9vk9f07japzi3krv9iq9"; - }; - - packageName = "log4cl"; - - asdFilesToKeep = ["log4cl.asd"]; - overrides = x: x; -} -/* (SYSTEM log4cl DESCRIPTION System lacks description SHA256 - 17jwxhc2ysh3m3cp7wvh8cy359v7w6kz9vk9f07japzi3krv9iq9 URL - http://beta.quicklisp.org/archive/log4cl/2021-12-09/log4cl-20211209-git.tgz - MD5 569122fed30c089b67527926468dcf44 NAME log4cl FILENAME log4cl DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME stefil FILENAME stefil)) - DEPENDENCIES (alexandria bordeaux-threads stefil) VERSION 20211209-git - SIBLINGS (log4cl-examples log4cl.log4slime log4cl.log4sly) PARASITES - (log4cl/syslog log4cl/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lparallel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lparallel.nix deleted file mode 100644 index accedb38f3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lparallel.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lparallel"; - version = "20160825-git"; - - description = "Parallelism for Common Lisp"; - - deps = [ args."alexandria" args."bordeaux-threads" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz"; - sha256 = "0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1"; - }; - - packageName = "lparallel"; - - asdFilesToKeep = ["lparallel.asd"]; - overrides = x: x; -} -/* (SYSTEM lparallel DESCRIPTION Parallelism for Common Lisp SHA256 - 0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1 URL - http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz - MD5 6393e8d0c0cc9ed1c88b6e7cca8de5df NAME lparallel FILENAME lparallel DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads)) - DEPENDENCIES (alexandria bordeaux-threads) VERSION 20160825-git SIBLINGS - (lparallel-bench lparallel-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lquery.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lquery.nix deleted file mode 100644 index 823ef5bf33..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/lquery.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "lquery"; - version = "20201220-git"; - - description = "A library to allow jQuery-like HTML/DOM manipulation."; - - deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/lquery/2020-12-20/lquery-20201220-git.tgz"; - sha256 = "0mfnk1p73aihraklw802j5mjgc8cjxva0mdf0c4p7b253crf15jx"; - }; - - packageName = "lquery"; - - asdFilesToKeep = ["lquery.asd"]; - overrides = x: x; -} -/* (SYSTEM lquery DESCRIPTION - A library to allow jQuery-like HTML/DOM manipulation. SHA256 - 0mfnk1p73aihraklw802j5mjgc8cjxva0mdf0c4p7b253crf15jx URL - http://beta.quicklisp.org/archive/lquery/2020-12-20/lquery-20201220-git.tgz - MD5 a71685848959cf33cd6963b4a5f9e2ed NAME lquery FILENAME lquery DEPS - ((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss) - (NAME documentation-utils FILENAME documentation-utils) - (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump) - (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES - (array-utils clss documentation-utils form-fiddle plump trivial-indent) - VERSION 20201220-git SIBLINGS (lquery-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/make-hash.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/make-hash.nix deleted file mode 100644 index 57c5f44607..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/make-hash.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "make-hash"; - version = "20130615-git"; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/make-hash/2013-06-15/make-hash-20130615-git.tgz"; - sha256 = "1ghcyqjhizkbfsvx1cih7d665w8yvbs1xv8pfi3hs1ghbn8njbkw"; - }; - - packageName = "make-hash"; - - asdFilesToKeep = ["make-hash.asd"]; - overrides = x: x; -} -/* (SYSTEM make-hash DESCRIPTION System lacks description SHA256 - 1ghcyqjhizkbfsvx1cih7d665w8yvbs1xv8pfi3hs1ghbn8njbkw URL - http://beta.quicklisp.org/archive/make-hash/2013-06-15/make-hash-20130615-git.tgz - MD5 4f612ef068411284c88e0381fa4a0c7f NAME make-hash FILENAME make-hash DEPS - NIL DEPENDENCIES NIL VERSION 20130615-git SIBLINGS (make-hash-tests) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/map-set.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/map-set.nix deleted file mode 100644 index 32d897b330..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/map-set.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "map-set"; - version = "20190307-hg"; - - description = "Set-like data structure."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz"; - sha256 = "1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9"; - }; - - packageName = "map-set"; - - asdFilesToKeep = ["map-set.asd"]; - overrides = x: x; -} -/* (SYSTEM map-set DESCRIPTION Set-like data structure. SHA256 - 1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9 URL - http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz - MD5 866dba36cdf060c943267cb79ccc0532 NAME map-set FILENAME map-set DEPS NIL - DEPENDENCIES NIL VERSION 20190307-hg SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/marshal.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/marshal.nix deleted file mode 100644 index 8c1d9062dd..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/marshal.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "marshal"; - version = "cl-20211020-git"; - - description = "marshal: Simple (de)serialization of Lisp datastructures."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-marshal/2021-10-20/cl-marshal-20211020-git.tgz"; - sha256 = "0zv4bpj352frdrsk7r1yc67385h2n00cy19nz3b72sznsjynqvk8"; - }; - - packageName = "marshal"; - - asdFilesToKeep = ["marshal.asd"]; - overrides = x: x; -} -/* (SYSTEM marshal DESCRIPTION - marshal: Simple (de)serialization of Lisp datastructures. SHA256 - 0zv4bpj352frdrsk7r1yc67385h2n00cy19nz3b72sznsjynqvk8 URL - http://beta.quicklisp.org/archive/cl-marshal/2021-10-20/cl-marshal-20211020-git.tgz - MD5 52eaad7da569610099d15c1d91020e17 NAME marshal FILENAME marshal DEPS NIL - DEPENDENCIES NIL VERSION cl-20211020-git SIBLINGS (marshal-tests) PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/md5.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/md5.nix deleted file mode 100644 index c8ae665086..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/md5.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "md5"; - version = "20210630-git"; - - description = "The MD5 Message-Digest Algorithm RFC 1321"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/md5/2021-06-30/md5-20210630-git.tgz"; - sha256 = "16kilbw3p68xf5fnj00xpvm4l8ylk5k9z6vbnq244ip0sygfizcv"; - }; - - packageName = "md5"; - - asdFilesToKeep = ["md5.asd"]; - overrides = x: x; -} -/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 - 16kilbw3p68xf5fnj00xpvm4l8ylk5k9z6vbnq244ip0sygfizcv URL - http://beta.quicklisp.org/archive/md5/2021-06-30/md5-20210630-git.tgz MD5 - ecb1fa8eea6848c2f14fdfeb03d47056 NAME md5 FILENAME md5 DEPS NIL - DEPENDENCIES NIL VERSION 20210630-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/metabang-bind.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/metabang-bind.nix deleted file mode 100644 index 51c361f112..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/metabang-bind.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "metabang-bind"; - version = "20200218-git"; - - description = "Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz"; - sha256 = "0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq"; - }; - - packageName = "metabang-bind"; - - asdFilesToKeep = ["metabang-bind.asd"]; - overrides = x: x; -} -/* (SYSTEM metabang-bind DESCRIPTION - Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more. - SHA256 0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq URL - http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz - MD5 25ee72526862a9d794f7b0fc1826029e NAME metabang-bind FILENAME - metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20200218-git SIBLINGS - (metabang-bind-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/metatilities-base.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/metatilities-base.nix deleted file mode 100644 index af0e3d8090..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/metatilities-base.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "metatilities-base"; - version = "20191227-git"; - - description = "These are metabang.com's Common Lisp basic utilities."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz"; - sha256 = "1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil"; - }; - - packageName = "metatilities-base"; - - asdFilesToKeep = ["metatilities-base.asd"]; - overrides = x: x; -} -/* (SYSTEM metatilities-base DESCRIPTION - These are metabang.com's Common Lisp basic utilities. SHA256 - 1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil URL - http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz - MD5 7968829ca353c4a42784a151317029f1 NAME metatilities-base FILENAME - metatilities-base DEPS NIL DEPENDENCIES NIL VERSION 20191227-git SIBLINGS - (metatilities-base-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mgl-pax.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mgl-pax.nix deleted file mode 100644 index c0e9819b0e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mgl-pax.nix +++ /dev/null @@ -1,39 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "mgl-pax"; - version = "20211209-git"; - - parasites = [ "mgl-pax/document" "mgl-pax/navigate" ]; - - description = "Exploratory programming tool and documentation - generator."; - - deps = [ args."_3bmd" args."_3bmd-ext-code-blocks" args."alexandria" args."colorize" args."md5" args."named-readtables" args."pythonic-string-reader" args."swank" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/mgl-pax/2021-12-09/mgl-pax-20211209-git.tgz"; - sha256 = "19d47msc8240bldkc0fi60cpzsx1q9392dxhmqn28gn7998pdkgh"; - }; - - packageName = "mgl-pax"; - - asdFilesToKeep = ["mgl-pax.asd"]; - overrides = x: x; -} -/* (SYSTEM mgl-pax DESCRIPTION Exploratory programming tool and documentation - generator. - SHA256 19d47msc8240bldkc0fi60cpzsx1q9392dxhmqn28gn7998pdkgh URL - http://beta.quicklisp.org/archive/mgl-pax/2021-12-09/mgl-pax-20211209-git.tgz - MD5 605583bb2910e0fe2211c8152fe38e0e NAME mgl-pax FILENAME mgl-pax DEPS - ((NAME 3bmd FILENAME _3bmd) - (NAME 3bmd-ext-code-blocks FILENAME _3bmd-ext-code-blocks) - (NAME alexandria FILENAME alexandria) (NAME colorize FILENAME colorize) - (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables) - (NAME pythonic-string-reader FILENAME pythonic-string-reader) - (NAME swank FILENAME swank)) - DEPENDENCIES - (3bmd 3bmd-ext-code-blocks alexandria colorize md5 named-readtables - pythonic-string-reader swank) - VERSION 20211209-git SIBLINGS NIL PARASITES - (mgl-pax/document mgl-pax/navigate)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/minheap.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/minheap.nix deleted file mode 100644 index 2c6df0f066..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/minheap.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "minheap"; - version = "20160628-git"; - - description = "Various heap/priority queue data structures"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/minheap/2016-06-28/minheap-20160628-git.tgz"; - sha256 = "1zjmxivspywf3nr7a5qwih2vf7w62r8pmyq25qhm3a0v2fdaihzz"; - }; - - packageName = "minheap"; - - asdFilesToKeep = ["minheap.asd"]; - overrides = x: x; -} -/* (SYSTEM minheap DESCRIPTION Various heap/priority queue data structures - SHA256 1zjmxivspywf3nr7a5qwih2vf7w62r8pmyq25qhm3a0v2fdaihzz URL - http://beta.quicklisp.org/archive/minheap/2016-06-28/minheap-20160628-git.tgz - MD5 27a57cdd27e91eb767f1377fcbfe2af3 NAME minheap FILENAME minheap DEPS NIL - DEPENDENCIES NIL VERSION 20160628-git SIBLINGS (minheap-tests) PARASITES - NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/misc-extensions.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/misc-extensions.nix deleted file mode 100644 index db7349e4d0..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/misc-extensions.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "misc-extensions"; - version = "20150608-git"; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz"; - sha256 = "0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj"; - }; - - packageName = "misc-extensions"; - - asdFilesToKeep = ["misc-extensions.asd"]; - overrides = x: x; -} -/* (SYSTEM misc-extensions DESCRIPTION System lacks description SHA256 - 0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj URL - http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz - MD5 ef8a05dd4382bb9d1e3960aeb77e332e NAME misc-extensions FILENAME - misc-extensions DEPS NIL DEPENDENCIES NIL VERSION 20150608-git SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mk-string-metrics.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mk-string-metrics.nix deleted file mode 100644 index d150d97cb4..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mk-string-metrics.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "mk-string-metrics"; - version = "20180131-git"; - - description = "efficient implementations of various string metric algorithms"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz"; - sha256 = "10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4"; - }; - - packageName = "mk-string-metrics"; - - asdFilesToKeep = ["mk-string-metrics.asd"]; - overrides = x: x; -} -/* (SYSTEM mk-string-metrics DESCRIPTION - efficient implementations of various string metric algorithms SHA256 - 10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4 URL - http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz - MD5 40f23794a7d841cb178f5951d3992886 NAME mk-string-metrics FILENAME - mk-string-metrics DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS - (mk-string-metrics-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mmap.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mmap.nix deleted file mode 100644 index f5425cf549..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mmap.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "mmap"; - version = "20201220-git"; - - description = "Portable mmap (file memory mapping) utility library."; - - deps = [ args."alexandria" args."babel" args."cffi" args."documentation-utils" args."trivial-features" args."trivial-indent" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz"; - sha256 = "147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij"; - }; - - packageName = "mmap"; - - asdFilesToKeep = ["mmap.asd"]; - overrides = x: x; -} -/* (SYSTEM mmap DESCRIPTION - Portable mmap (file memory mapping) utility library. SHA256 - 147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij URL - http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz MD5 - e2dbeb48b59735bd2ed54ea7f9cdfe0f NAME mmap FILENAME mmap DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) - (NAME documentation-utils FILENAME documentation-utils) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES - (alexandria babel cffi documentation-utils trivial-features trivial-indent) - VERSION 20201220-git SIBLINGS (mmap-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/moptilities.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/moptilities.nix deleted file mode 100644 index 02e8ff0f84..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/moptilities.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "moptilities"; - version = "20170403-git"; - - description = "Common Lisp MOP utilities"; - - deps = [ args."closer-mop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz"; - sha256 = "0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8"; - }; - - packageName = "moptilities"; - - asdFilesToKeep = ["moptilities.asd"]; - overrides = x: x; -} -/* (SYSTEM moptilities DESCRIPTION Common Lisp MOP utilities SHA256 - 0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8 URL - http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz - MD5 b118397be325e60a772ea3631c4f19a4 NAME moptilities FILENAME moptilities - DEPS ((NAME closer-mop FILENAME closer-mop)) DEPENDENCIES (closer-mop) - VERSION 20170403-git SIBLINGS (moptilities-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/more-conditions.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/more-conditions.nix deleted file mode 100644 index 3d2cd35b30..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/more-conditions.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "more-conditions"; - version = "20180831-git"; - - parasites = [ "more-conditions/test" ]; - - description = "This system provides some generic condition classes in - conjunction with support functions and macros."; - - deps = [ args."alexandria" args."closer-mop" args."fiveam" args."let-plus" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz"; - sha256 = "0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x"; - }; - - packageName = "more-conditions"; - - asdFilesToKeep = ["more-conditions.asd"]; - overrides = x: x; -} -/* (SYSTEM more-conditions DESCRIPTION - This system provides some generic condition classes in - conjunction with support functions and macros. - SHA256 0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x URL - http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz - MD5 c4797bd3c6c50fba02a6e8164ddafe28 NAME more-conditions FILENAME - more-conditions DEPS - ((NAME alexandria FILENAME alexandria) - (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam) - (NAME let-plus FILENAME let-plus)) - DEPENDENCIES (alexandria closer-mop fiveam let-plus) VERSION 20180831-git - SIBLINGS NIL PARASITES (more-conditions/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mt19937.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mt19937.nix deleted file mode 100644 index 55451e02e5..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/mt19937.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "mt19937"; - version = "1.1.1"; - - description = "Portable MT19937 Mersenne Twister random number generator"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz"; - sha256 = "1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv"; - }; - - packageName = "mt19937"; - - asdFilesToKeep = ["mt19937.asd"]; - overrides = x: x; -} -/* (SYSTEM mt19937 DESCRIPTION - Portable MT19937 Mersenne Twister random number generator SHA256 - 1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv URL - http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz MD5 - 54c63977b6d77abd66ebe0227b77c143 NAME mt19937 FILENAME mt19937 DEPS NIL - DEPENDENCIES NIL VERSION 1.1.1 SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/myway.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/myway.nix deleted file mode 100644 index 3538b723d1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/myway.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "myway"; - version = "20200325-git"; - - description = "Sinatra-compatible routing library."; - - deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."map-set" args."quri" args."split-sequence" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz"; - sha256 = "07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15"; - }; - - packageName = "myway"; - - asdFilesToKeep = ["myway.asd"]; - overrides = x: x; -} -/* (SYSTEM myway DESCRIPTION Sinatra-compatible routing library. SHA256 - 07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15 URL - http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz - MD5 af1fe34c2106303504c7908b25c3b9ce NAME myway FILENAME myway DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-utilities FILENAME cl-utilities) (NAME map-set FILENAME map-set) - (NAME quri FILENAME quri) (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria babel cl-ppcre cl-utilities map-set quri split-sequence - trivial-features) - VERSION 20200325-git SIBLINGS (myway-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/named-readtables.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/named-readtables.nix deleted file mode 100644 index 198768fe70..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/named-readtables.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "named-readtables"; - version = "20211209-git"; - - parasites = [ "named-readtables/test" ]; - - description = "Library that creates a namespace for named readtable - akin to the namespace of packages."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/named-readtables/2021-12-09/named-readtables-20211209-git.tgz"; - sha256 = "0mlxbs7r6ksjk9ilsgp756qp4jlgplr30kxdn7npq27wg0rpvz2n"; - }; - - packageName = "named-readtables"; - - asdFilesToKeep = ["named-readtables.asd"]; - overrides = x: x; -} -/* (SYSTEM named-readtables DESCRIPTION - Library that creates a namespace for named readtable - akin to the namespace of packages. - SHA256 0mlxbs7r6ksjk9ilsgp756qp4jlgplr30kxdn7npq27wg0rpvz2n URL - http://beta.quicklisp.org/archive/named-readtables/2021-12-09/named-readtables-20211209-git.tgz - MD5 52def9392c93bb9c6da4b957549bcb0b NAME named-readtables FILENAME - named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20211209-git SIBLINGS - NIL PARASITES (named-readtables/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/nbd.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/nbd.nix deleted file mode 100644 index 6387a8345d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/nbd.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "nbd"; - version = "20200925-git"; - - parasites = [ "nbd/simple-in-memory" ]; - - description = "Network Block Device server library."; - - deps = [ args."bordeaux-threads" args."flexi-streams" args."lisp-binary" args."wild-package-inferred-system" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/nbd/2020-09-25/nbd-20200925-git.tgz"; - sha256 = "1npq9a8l3mn67n22ywqm8wh6kr9xv9djla2yj2m535gkysrlvnky"; - }; - - packageName = "nbd"; - - asdFilesToKeep = ["nbd.asd"]; - overrides = x: x; -} -/* (SYSTEM nbd DESCRIPTION Network Block Device server library. SHA256 - 1npq9a8l3mn67n22ywqm8wh6kr9xv9djla2yj2m535gkysrlvnky URL - http://beta.quicklisp.org/archive/nbd/2020-09-25/nbd-20200925-git.tgz MD5 - f32b7a508ac87c1e179c259b171dc837 NAME nbd FILENAME nbd DEPS - ((NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME flexi-streams FILENAME flexi-streams) - (NAME lisp-binary FILENAME lisp-binary) - (NAME wild-package-inferred-system FILENAME wild-package-inferred-system)) - DEPENDENCIES - (bordeaux-threads flexi-streams lisp-binary wild-package-inferred-system) - VERSION 20200925-git SIBLINGS NIL PARASITES (nbd/simple-in-memory)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/net-telent-date.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/net-telent-date.nix deleted file mode 100644 index 77e07108e6..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/net-telent-date.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "net-telent-date"; - version = "net-telent-date_0.42"; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz"; - sha256 = "06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1"; - }; - - packageName = "net-telent-date"; - - asdFilesToKeep = ["net-telent-date.asd"]; - overrides = x: x; -} -/* (SYSTEM net-telent-date DESCRIPTION System lacks description SHA256 - 06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1 URL - http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz - MD5 6fedf40113b2462f7bd273d07950066b NAME net-telent-date FILENAME - net-telent-date DEPS NIL DEPENDENCIES NIL VERSION net-telent-date_0.42 - SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix deleted file mode 100644 index bb64756fec..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "net_dot_didierverna_dot_asdf-flv"; - version = "asdf-flv-version-2.1"; - - description = "ASDF extension to provide support for file-local variables."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz"; - sha256 = "12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc"; - }; - - packageName = "net.didierverna.asdf-flv"; - - asdFilesToKeep = ["net.didierverna.asdf-flv.asd"]; - overrides = x: x; -} -/* (SYSTEM net.didierverna.asdf-flv DESCRIPTION - ASDF extension to provide support for file-local variables. SHA256 - 12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc URL - http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz - MD5 2b74b721b7e5335d2230d6b95fc6be56 NAME net.didierverna.asdf-flv FILENAME - net_dot_didierverna_dot_asdf-flv DEPS NIL DEPENDENCIES NIL VERSION - asdf-flv-version-2.1 SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/nibbles.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/nibbles.nix deleted file mode 100644 index d20890e36c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/nibbles.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "nibbles"; - version = "20211209-git"; - - parasites = [ "nibbles/tests" ]; - - description = "A library for accessing octet-addressed blocks of data in big- and little-endian orders"; - - deps = [ args."rt" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/nibbles/2021-12-09/nibbles-20211209-git.tgz"; - sha256 = "1zkywrhz8p09pwdsa2mklr0yspqvvwa5fi6cz22n1z6fzvxz7m2s"; - }; - - packageName = "nibbles"; - - asdFilesToKeep = ["nibbles.asd"]; - overrides = x: x; -} -/* (SYSTEM nibbles DESCRIPTION - A library for accessing octet-addressed blocks of data in big- and little-endian orders - SHA256 1zkywrhz8p09pwdsa2mklr0yspqvvwa5fi6cz22n1z6fzvxz7m2s URL - http://beta.quicklisp.org/archive/nibbles/2021-12-09/nibbles-20211209-git.tgz - MD5 c6e7348a8a979da7cd4852b5df8a4384 NAME nibbles FILENAME nibbles DEPS - ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20211209-git SIBLINGS NIL - PARASITES (nibbles/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/num-utils.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/num-utils.nix deleted file mode 100644 index 7160524a2f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/num-utils.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "num-utils"; - version = "numerical-utilities-20210411-git"; - - parasites = [ "num-utils/tests" ]; - - description = "Numerical utilities for Common Lisp"; - - deps = [ args."alexandria" args."anaphora" args."array-operations" args."fiveam" args."let-plus" args."select" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/numerical-utilities/2021-04-11/numerical-utilities-20210411-git.tgz"; - sha256 = "19d1vm9hasgba9l2mwby8izd7pzmisckf52h6fmh170lwkqixqxb"; - }; - - packageName = "num-utils"; - - asdFilesToKeep = ["num-utils.asd"]; - overrides = x: x; -} -/* (SYSTEM num-utils DESCRIPTION Numerical utilities for Common Lisp SHA256 - 19d1vm9hasgba9l2mwby8izd7pzmisckf52h6fmh170lwkqixqxb URL - http://beta.quicklisp.org/archive/numerical-utilities/2021-04-11/numerical-utilities-20210411-git.tgz - MD5 87fac84d7897071bfa89fc9aeca7b4d0 NAME num-utils FILENAME num-utils DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME array-operations FILENAME array-operations) - (NAME fiveam FILENAME fiveam) (NAME let-plus FILENAME let-plus) - (NAME select FILENAME select)) - DEPENDENCIES (alexandria anaphora array-operations fiveam let-plus select) - VERSION numerical-utilities-20210411-git SIBLINGS NIL PARASITES - (num-utils/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/optima.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/optima.nix deleted file mode 100644 index 0c4684d050..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/optima.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "optima"; - version = "20150709-git"; - - description = "Optimized Pattern Matching Library"; - - deps = [ args."alexandria" args."closer-mop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz"; - sha256 = "0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc"; - }; - - packageName = "optima"; - - asdFilesToKeep = ["optima.asd"]; - overrides = x: x; -} -/* (SYSTEM optima DESCRIPTION Optimized Pattern Matching Library SHA256 - 0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc URL - http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz - MD5 20523dc3dfc04bb2526008dff0842caa NAME optima FILENAME optima DEPS - ((NAME alexandria FILENAME alexandria) - (NAME closer-mop FILENAME closer-mop)) - DEPENDENCIES (alexandria closer-mop) VERSION 20150709-git SIBLINGS - (optima.ppcre optima.test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/osicat.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/osicat.nix deleted file mode 100644 index a88bc8670e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/osicat.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "osicat"; - version = "20211209-git"; - - parasites = [ "osicat/tests" ]; - - description = "A lightweight operating system interface"; - - deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."rt" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/osicat/2021-12-09/osicat-20211209-git.tgz"; - sha256 = "0c85aapyvr2f5c3lvpfv3hfdghwmsqf40qgyk9hwjva8s9242pgl"; - }; - - packageName = "osicat"; - - asdFilesToKeep = ["osicat.asd"]; - overrides = x: x; -} -/* (SYSTEM osicat DESCRIPTION A lightweight operating system interface SHA256 - 0c85aapyvr2f5c3lvpfv3hfdghwmsqf40qgyk9hwjva8s9242pgl URL - http://beta.quicklisp.org/archive/osicat/2021-12-09/osicat-20211209-git.tgz - MD5 3581652999e0b16c6a1a8295585e7491 NAME osicat FILENAME osicat DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME rt FILENAME rt) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria babel cffi cffi-grovel cffi-toolchain rt trivial-features) - VERSION 20211209-git SIBLINGS NIL PARASITES (osicat/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parachute.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parachute.nix deleted file mode 100644 index e32250d03f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parachute.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "parachute"; - version = "20211020-git"; - - description = "An extensible and cross-compatible testing framework."; - - deps = [ args."documentation-utils" args."form-fiddle" args."trivial-indent" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/parachute/2021-10-20/parachute-20211020-git.tgz"; - sha256 = "1sc63a6z3zwdsc9h3w0dbx7yssvg2zzdyhh81kqc5cx17vcdqyk0"; - }; - - packageName = "parachute"; - - asdFilesToKeep = ["parachute.asd"]; - overrides = x: x; -} -/* (SYSTEM parachute DESCRIPTION - An extensible and cross-compatible testing framework. SHA256 - 1sc63a6z3zwdsc9h3w0dbx7yssvg2zzdyhh81kqc5cx17vcdqyk0 URL - http://beta.quicklisp.org/archive/parachute/2021-10-20/parachute-20211020-git.tgz - MD5 85eba816a1e7a43a154e6a1544e15e52 NAME parachute FILENAME parachute DEPS - ((NAME documentation-utils FILENAME documentation-utils) - (NAME form-fiddle FILENAME form-fiddle) - (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (documentation-utils form-fiddle trivial-indent) VERSION - 20211020-git SIBLINGS - (parachute-fiveam parachute-lisp-unit parachute-prove) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parenscript.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parenscript.nix deleted file mode 100644 index cfe7128da3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parenscript.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "parenscript"; - version = "Parenscript-2.7.1"; - - description = "Lisp to JavaScript transpiler"; - - deps = [ args."anaphora" args."cl-ppcre" args."named-readtables" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz"; - sha256 = "1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f"; - }; - - packageName = "parenscript"; - - asdFilesToKeep = ["parenscript.asd"]; - overrides = x: x; -} -/* (SYSTEM parenscript DESCRIPTION Lisp to JavaScript transpiler SHA256 - 1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f URL - http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz - MD5 047c9a72bd36f1b4a5ec67af9453a0b9 NAME parenscript FILENAME parenscript - DEPS - ((NAME anaphora FILENAME anaphora) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME named-readtables FILENAME named-readtables)) - DEPENDENCIES (anaphora cl-ppcre named-readtables) VERSION Parenscript-2.7.1 - SIBLINGS (parenscript.tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix deleted file mode 100644 index 3d8ae2cf82..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "parse-declarations-1_dot_0"; - version = "parse-declarations-20101006-darcs"; - - description = "Library to parse and rebuild declarations."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz"; - sha256 = "0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd"; - }; - - packageName = "parse-declarations-1.0"; - - asdFilesToKeep = ["parse-declarations-1.0.asd"]; - overrides = x: x; -} -/* (SYSTEM parse-declarations-1.0 DESCRIPTION - Library to parse and rebuild declarations. SHA256 - 0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd URL - http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz - MD5 e49222003e5b59c5c2a0cf58b86cfdcd NAME parse-declarations-1.0 FILENAME - parse-declarations-1_dot_0 DEPS NIL DEPENDENCIES NIL VERSION - parse-declarations-20101006-darcs SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parse-float.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parse-float.nix deleted file mode 100644 index 0ad2062417..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parse-float.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "parse-float"; - version = "20200218-git"; - - parasites = [ "parse-float-tests" ]; - - description = "Parse floating point values in strings."; - - deps = [ args."alexandria" args."lisp-unit" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz"; - sha256 = "02rhgn79hhv0p5ysj4gwk5bhmr2sj6cvkacbqzzw24qrzgcpdnfw"; - }; - - packageName = "parse-float"; - - asdFilesToKeep = ["parse-float.asd"]; - overrides = x: x; -} -/* (SYSTEM parse-float DESCRIPTION Parse floating point values in strings. - SHA256 02rhgn79hhv0p5ysj4gwk5bhmr2sj6cvkacbqzzw24qrzgcpdnfw URL - http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz - MD5 149e40a8c5fd6ab0e43242cb898d66bf NAME parse-float FILENAME parse-float - DEPS - ((NAME alexandria FILENAME alexandria) (NAME lisp-unit FILENAME lisp-unit)) - DEPENDENCIES (alexandria lisp-unit) VERSION 20200218-git SIBLINGS NIL - PARASITES (parse-float-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parse-number.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parse-number.nix deleted file mode 100644 index 44e9366372..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parse-number.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "parse-number"; - version = "v1.7"; - - parasites = [ "parse-number/tests" ]; - - description = "Number parsing library"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz"; - sha256 = "11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha"; - }; - - packageName = "parse-number"; - - asdFilesToKeep = ["parse-number.asd"]; - overrides = x: x; -} -/* (SYSTEM parse-number DESCRIPTION Number parsing library SHA256 - 11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha URL - http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz - MD5 b9ec925018b8f10193d73403873dde8f NAME parse-number FILENAME - parse-number DEPS NIL DEPENDENCIES NIL VERSION v1.7 SIBLINGS NIL PARASITES - (parse-number/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parseq.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parseq.nix deleted file mode 100644 index 12bd80a6eb..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parseq.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "parseq"; - version = "20210531-git"; - - parasites = [ "parseq/test" ]; - - description = "A library for parsing sequences such as strings and lists using parsing expression grammars."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/parseq/2021-05-31/parseq-20210531-git.tgz"; - sha256 = "1jh362avz2bbjrg9wwnjisa3ikxjxcgbddc0gqx65l6h9s87gqrg"; - }; - - packageName = "parseq"; - - asdFilesToKeep = ["parseq.asd"]; - overrides = x: x; -} -/* (SYSTEM parseq DESCRIPTION - A library for parsing sequences such as strings and lists using parsing expression grammars. - SHA256 1jh362avz2bbjrg9wwnjisa3ikxjxcgbddc0gqx65l6h9s87gqrg URL - http://beta.quicklisp.org/archive/parseq/2021-05-31/parseq-20210531-git.tgz - MD5 a62fdb0623450f7ef82297e8b23fd343 NAME parseq FILENAME parseq DEPS NIL - DEPENDENCIES NIL VERSION 20210531-git SIBLINGS NIL PARASITES (parseq/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parser-combinators.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parser-combinators.nix deleted file mode 100644 index ae109ef3dc..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parser-combinators.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "parser-combinators"; - version = "cl-20131111-git"; - - description = "An implementation of parser combinators for Common Lisp"; - - deps = [ args."alexandria" args."iterate" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz"; - sha256 = "0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds"; - }; - - packageName = "parser-combinators"; - - asdFilesToKeep = ["parser-combinators.asd"]; - overrides = x: x; -} -/* (SYSTEM parser-combinators DESCRIPTION - An implementation of parser combinators for Common Lisp SHA256 - 0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds URL - http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz - MD5 25ad9b1459901738a6394422a41b8fec NAME parser-combinators FILENAME - parser-combinators DEPS - ((NAME alexandria FILENAME alexandria) (NAME iterate FILENAME iterate)) - DEPENDENCIES (alexandria iterate) VERSION cl-20131111-git SIBLINGS - (parser-combinators-cl-ppcre parser-combinators-debug - parser-combinators-tests) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parser_dot_common-rules.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parser_dot_common-rules.nix deleted file mode 100644 index 07d600b3a3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/parser_dot_common-rules.nix +++ /dev/null @@ -1,39 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "parser_dot_common-rules"; - version = "20200715-git"; - - parasites = [ "parser.common-rules/test" ]; - - description = "Provides common parsing rules that are useful in many grammars."; - - deps = [ args."alexandria" args."anaphora" args."esrap" args."fiveam" args."let-plus" args."split-sequence" args."trivial-with-current-source-form" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz"; - sha256 = "17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy"; - }; - - packageName = "parser.common-rules"; - - asdFilesToKeep = ["parser.common-rules.asd"]; - overrides = x: x; -} -/* (SYSTEM parser.common-rules DESCRIPTION - Provides common parsing rules that are useful in many grammars. SHA256 - 17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy URL - http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz - MD5 6391d962ae6fc13cc57312de013504c5 NAME parser.common-rules FILENAME - parser_dot_common-rules DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME esrap FILENAME esrap) (NAME fiveam FILENAME fiveam) - (NAME let-plus FILENAME let-plus) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-with-current-source-form FILENAME - trivial-with-current-source-form)) - DEPENDENCIES - (alexandria anaphora esrap fiveam let-plus split-sequence - trivial-with-current-source-form) - VERSION 20200715-git SIBLINGS (parser.common-rules.operators) PARASITES - (parser.common-rules/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/pcall-queue.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/pcall-queue.nix deleted file mode 100644 index 8de944a0c0..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/pcall-queue.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "pcall-queue"; - version = "pcall-0.3"; - - description = "System lacks description"; - - deps = [ args."alexandria" args."bordeaux-threads" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; - sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y"; - }; - - packageName = "pcall-queue"; - - asdFilesToKeep = ["pcall-queue.asd"]; - overrides = x: x; -} -/* (SYSTEM pcall-queue DESCRIPTION System lacks description SHA256 - 02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL - http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5 - 019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall-queue FILENAME pcall-queue DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads)) - DEPENDENCIES (alexandria bordeaux-threads) VERSION pcall-0.3 SIBLINGS - (pcall) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/pcall.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/pcall.nix deleted file mode 100644 index 085d284451..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/pcall.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "pcall"; - version = "0.3"; - - parasites = [ "pcall-tests" ]; - - description = "System lacks description"; - - deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" args."pcall-queue" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz"; - sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y"; - }; - - packageName = "pcall"; - - asdFilesToKeep = ["pcall.asd"]; - overrides = x: x; -} -/* (SYSTEM pcall DESCRIPTION System lacks description SHA256 - 02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL - http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5 - 019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall FILENAME pcall DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME fiveam FILENAME fiveam) (NAME pcall-queue FILENAME pcall-queue)) - DEPENDENCIES (alexandria bordeaux-threads fiveam pcall-queue) VERSION 0.3 - SIBLINGS (pcall-queue) PARASITES (pcall-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/physical-quantities.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/physical-quantities.nix deleted file mode 100644 index 865d4f4791..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/physical-quantities.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "physical-quantities"; - version = "20211020-git"; - - parasites = [ "physical-quantities/test" ]; - - description = "A library that provides a numeric type with optional unit and/or uncertainty for computations with automatic error propagation."; - - deps = [ args."parseq" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/physical-quantities/2021-10-20/physical-quantities-20211020-git.tgz"; - sha256 = "1ix04gjcsjzry5rl1rqsrg1r3hw985gfvl1847va36y03qzbmhgx"; - }; - - packageName = "physical-quantities"; - - asdFilesToKeep = ["physical-quantities.asd"]; - overrides = x: x; -} -/* (SYSTEM physical-quantities DESCRIPTION - A library that provides a numeric type with optional unit and/or uncertainty for computations with automatic error propagation. - SHA256 1ix04gjcsjzry5rl1rqsrg1r3hw985gfvl1847va36y03qzbmhgx URL - http://beta.quicklisp.org/archive/physical-quantities/2021-10-20/physical-quantities-20211020-git.tgz - MD5 a322db845056f78a237630a565b41490 NAME physical-quantities FILENAME - physical-quantities DEPS ((NAME parseq FILENAME parseq)) DEPENDENCIES - (parseq) VERSION 20211020-git SIBLINGS NIL PARASITES - (physical-quantities/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/plump.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/plump.nix deleted file mode 100644 index 51767965a0..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/plump.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "plump"; - version = "20210630-git"; - - description = "An XML / XHTML / HTML parser that aims to be as lenient as possible."; - - deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/plump/2021-06-30/plump-20210630-git.tgz"; - sha256 = "0wx5l2q5hsdshdrmlpnjdlyksw6rl5f2snad18xkmmyiwwn7wv2h"; - }; - - packageName = "plump"; - - asdFilesToKeep = ["plump.asd"]; - overrides = x: x; -} -/* (SYSTEM plump DESCRIPTION - An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 - 0wx5l2q5hsdshdrmlpnjdlyksw6rl5f2snad18xkmmyiwwn7wv2h URL - http://beta.quicklisp.org/archive/plump/2021-06-30/plump-20210630-git.tgz - MD5 b15f7f4f52893ef41ca8a12e6e959dc1 NAME plump FILENAME plump DEPS - ((NAME array-utils FILENAME array-utils) - (NAME documentation-utils FILENAME documentation-utils) - (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION - 20210630-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/postmodern.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/postmodern.nix deleted file mode 100644 index 0fb11190e7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/postmodern.nix +++ /dev/null @@ -1,50 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "postmodern"; - version = "20211209-git"; - - parasites = [ "postmodern/tests" ]; - - description = "PostgreSQL programming API"; - - deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_plus_local-time" args."cl-postgres_slash_tests" args."cl-ppcre" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."local-time" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."uiop" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/postmodern/2021-12-09/postmodern-20211209-git.tgz"; - sha256 = "1qcbg31mz5r7ibmq2y7r3vqvdwpznxvwdnwd94hfil7pg4j119d6"; - }; - - packageName = "postmodern"; - - asdFilesToKeep = ["postmodern.asd"]; - overrides = x: x; -} -/* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256 - 1qcbg31mz5r7ibmq2y7r3vqvdwpznxvwdnwd94hfil7pg4j119d6 URL - http://beta.quicklisp.org/archive/postmodern/2021-12-09/postmodern-20211209-git.tgz - MD5 6d14c4b5fec085594dc66d520174e0e6 NAME postmodern FILENAME postmodern - DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-base64 FILENAME cl-base64) - (NAME cl-postgres FILENAME cl-postgres) - (NAME cl-postgres+local-time FILENAME cl-postgres_plus_local-time) - (NAME cl-postgres/tests FILENAME cl-postgres_slash_tests) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop) - (NAME fiveam FILENAME fiveam) (NAME global-vars FILENAME global-vars) - (NAME ironclad FILENAME ironclad) (NAME local-time FILENAME local-time) - (NAME md5 FILENAME md5) (NAME s-sql FILENAME s-sql) - (NAME s-sql/tests FILENAME s-sql_slash_tests) - (NAME simple-date FILENAME simple-date) - (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) - (NAME split-sequence FILENAME split-sequence) - (NAME uax-15 FILENAME uax-15) (NAME uiop FILENAME uiop) - (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria bordeaux-threads cl-base64 cl-postgres cl-postgres+local-time - cl-postgres/tests cl-ppcre closer-mop fiveam global-vars ironclad - local-time md5 s-sql s-sql/tests simple-date simple-date/postgres-glue - split-sequence uax-15 uiop usocket) - VERSION 20211209-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES - (postmodern/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/proc-parse.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/proc-parse.nix deleted file mode 100644 index cf13ad3e4c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/proc-parse.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "proc-parse"; - version = "20190813-git"; - - description = "Procedural vector parser"; - - deps = [ args."alexandria" args."babel" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz"; - sha256 = "126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j"; - }; - - packageName = "proc-parse"; - - asdFilesToKeep = ["proc-parse.asd"]; - overrides = x: x; -} -/* (SYSTEM proc-parse DESCRIPTION Procedural vector parser SHA256 - 126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j URL - http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz - MD5 99bdce79943071267c6a877d8de246c5 NAME proc-parse FILENAME proc-parse - DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel trivial-features) VERSION 20190813-git - SIBLINGS (proc-parse-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/prove-asdf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/prove-asdf.nix deleted file mode 100644 index 3342d9ac84..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/prove-asdf.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "prove-asdf"; - version = "prove-20200218-git"; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; - sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn"; - }; - - packageName = "prove-asdf"; - - asdFilesToKeep = ["prove-asdf.asd"]; - overrides = x: x; -} -/* (SYSTEM prove-asdf DESCRIPTION System lacks description SHA256 - 1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn URL - http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz - MD5 85780b65e84c17a78d658364b8c4d11b NAME prove-asdf FILENAME prove-asdf - DEPS NIL DEPENDENCIES NIL VERSION prove-20200218-git SIBLINGS - (cl-test-more prove-test prove) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/prove.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/prove.nix deleted file mode 100644 index 5bb82db7a9..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/prove.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "prove"; - version = "20200218-git"; - - description = "System lacks description"; - - deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz"; - sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn"; - }; - - packageName = "prove"; - - asdFilesToKeep = ["prove.asd"]; - overrides = x: x; -} -/* (SYSTEM prove DESCRIPTION System lacks description SHA256 - 1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn URL - http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz - MD5 85780b65e84c17a78d658364b8c4d11b NAME prove FILENAME prove DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME cl-ansi-text FILENAME cl-ansi-text) - (NAME cl-colors FILENAME cl-colors) (NAME cl-colors2 FILENAME cl-colors2) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME let-plus FILENAME let-plus) - (NAME uiop FILENAME uiop)) - DEPENDENCIES - (alexandria anaphora cl-ansi-text cl-colors cl-colors2 cl-ppcre let-plus - uiop) - VERSION 20200218-git SIBLINGS (cl-test-more prove-asdf prove-test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/ptester.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/ptester.nix deleted file mode 100644 index 312da100b9..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/ptester.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "ptester"; - version = "20160929-git"; - - description = "Portable test harness package"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz"; - sha256 = "04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz"; - }; - - packageName = "ptester"; - - asdFilesToKeep = ["ptester.asd"]; - overrides = x: x; -} -/* (SYSTEM ptester DESCRIPTION Portable test harness package SHA256 - 04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz URL - http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz - MD5 938a4366b6608ae5c4a0be9da11a61d4 NAME ptester FILENAME ptester DEPS NIL - DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/puri.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/puri.nix deleted file mode 100644 index fc5b609ba7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/puri.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "puri"; - version = "20201016-git"; - - parasites = [ "puri/test" ]; - - description = "Portable Universal Resource Indentifier Library"; - - deps = [ args."ptester" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz"; - sha256 = "16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx"; - }; - - packageName = "puri"; - - asdFilesToKeep = ["puri.asd"]; - overrides = x: x; -} -/* (SYSTEM puri DESCRIPTION Portable Universal Resource Indentifier Library - SHA256 16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx URL - http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz MD5 - 890c61df1d7204b2d681bf146c43e711 NAME puri FILENAME puri DEPS - ((NAME ptester FILENAME ptester)) DEPENDENCIES (ptester) VERSION - 20201016-git SIBLINGS NIL PARASITES (puri/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/pythonic-string-reader.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/pythonic-string-reader.nix deleted file mode 100644 index 10809743da..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/pythonic-string-reader.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "pythonic-string-reader"; - version = "20180711-git"; - - description = "A simple and unintrusive read table modification that allows for -simple string literal definition that doesn't require escaping characters."; - - deps = [ args."named-readtables" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz"; - sha256 = "0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx"; - }; - - packageName = "pythonic-string-reader"; - - asdFilesToKeep = ["pythonic-string-reader.asd"]; - overrides = x: x; -} -/* (SYSTEM pythonic-string-reader DESCRIPTION - A simple and unintrusive read table modification that allows for -simple string literal definition that doesn't require escaping characters. - SHA256 0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx URL - http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz - MD5 8156636895b1148fad6e7bcedeb6b556 NAME pythonic-string-reader FILENAME - pythonic-string-reader DEPS - ((NAME named-readtables FILENAME named-readtables)) DEPENDENCIES - (named-readtables) VERSION 20180711-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/quasiquote-2_dot_0.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/quasiquote-2_dot_0.nix deleted file mode 100644 index 146d5cf06d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/quasiquote-2_dot_0.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "quasiquote-2_dot_0"; - version = "20150505-git"; - - parasites = [ "quasiquote-2.0-tests" ]; - - description = "Writing macros that write macros. Effortless."; - - deps = [ args."fiveam" args."iterate" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz"; - sha256 = "0bgcqk7wp7qblw7avsawkg24zjiq9vgsbfa0yhk64avhxwjw6974"; - }; - - packageName = "quasiquote-2.0"; - - asdFilesToKeep = ["quasiquote-2.0.asd"]; - overrides = x: x; -} -/* (SYSTEM quasiquote-2.0 DESCRIPTION - Writing macros that write macros. Effortless. SHA256 - 0bgcqk7wp7qblw7avsawkg24zjiq9vgsbfa0yhk64avhxwjw6974 URL - http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz - MD5 7c557e0c10cf7608afa5a20e4a83c778 NAME quasiquote-2.0 FILENAME - quasiquote-2_dot_0 DEPS - ((NAME fiveam FILENAME fiveam) (NAME iterate FILENAME iterate)) - DEPENDENCIES (fiveam iterate) VERSION 20150505-git SIBLINGS NIL PARASITES - (quasiquote-2.0-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/query-fs.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/query-fs.nix deleted file mode 100644 index fca9989ccb..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/query-fs.nix +++ /dev/null @@ -1,44 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "query-fs"; - version = "20200610-git"; - - description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz"; - sha256 = "1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413"; - }; - - packageName = "query-fs"; - - asdFilesToKeep = ["query-fs.asd"]; - overrides = x: x; -} -/* (SYSTEM query-fs DESCRIPTION - High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries - SHA256 1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413 URL - http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz - MD5 d30cbd09a2f326c95057b2c6537d5cdb NAME query-fs FILENAME query-fs DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME cl-fuse FILENAME cl-fuse) - (NAME cl-fuse-meta-fs FILENAME cl-fuse-meta-fs) - (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-utilities FILENAME cl-utilities) - (NAME command-line-arguments FILENAME command-line-arguments) - (NAME iterate FILENAME iterate) (NAME pcall FILENAME pcall) - (NAME pcall-queue FILENAME pcall-queue) - (NAME trivial-backtrace FILENAME trivial-backtrace) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-utf-8 FILENAME trivial-utf-8)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse - cl-fuse-meta-fs cl-ppcre cl-utilities command-line-arguments iterate pcall - pcall-queue trivial-backtrace trivial-features trivial-utf-8) - VERSION 20200610-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/quri.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/quri.nix deleted file mode 100644 index 43f0d75e8b..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/quri.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "quri"; - version = "20210630-git"; - - description = "Yet another URI library for Common Lisp"; - - deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/quri/2021-06-30/quri-20210630-git.tgz"; - sha256 = "0ihgsqdzi9rh8ybc221g46c5h7i4vrz67znwv76rm2z44v8x0wwh"; - }; - - packageName = "quri"; - - asdFilesToKeep = ["quri.asd"]; - overrides = x: x; -} -/* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 - 0ihgsqdzi9rh8ybc221g46c5h7i4vrz67znwv76rm2z44v8x0wwh URL - http://beta.quicklisp.org/archive/quri/2021-06-30/quri-20210630-git.tgz MD5 - 3dcaaa9b94f6e4a0c5f4bd0829a045a7 NAME quri FILENAME quri DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cl-utilities FILENAME cl-utilities) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria babel cl-utilities split-sequence trivial-features) VERSION - 20210630-git SIBLINGS (quri-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/rfc2388.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/rfc2388.nix deleted file mode 100644 index 503136d756..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/rfc2388.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "rfc2388"; - version = "20180831-git"; - - description = "Implementation of RFC 2388"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz"; - sha256 = "1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33"; - }; - - packageName = "rfc2388"; - - asdFilesToKeep = ["rfc2388.asd"]; - overrides = x: x; -} -/* (SYSTEM rfc2388 DESCRIPTION Implementation of RFC 2388 SHA256 - 1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33 URL - http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz - MD5 f57e3c588e5e08210516260e67d69226 NAME rfc2388 FILENAME rfc2388 DEPS NIL - DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/rove.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/rove.nix deleted file mode 100644 index c02f2cd2ed..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/rove.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "rove"; - version = "20211209-git"; - - description = "Yet another testing framework intended to be a successor of Prove"; - - deps = [ args."alexandria" args."bordeaux-threads" args."dissect" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/rove/2021-12-09/rove-20211209-git.tgz"; - sha256 = "1b1fajdxnba743l7mv4nc31az2g7mapalq3z3l57j7r5sximf0qr"; - }; - - packageName = "rove"; - - asdFilesToKeep = ["rove.asd"]; - overrides = x: x; -} -/* (SYSTEM rove DESCRIPTION - Yet another testing framework intended to be a successor of Prove SHA256 - 1b1fajdxnba743l7mv4nc31az2g7mapalq3z3l57j7r5sximf0qr URL - http://beta.quicklisp.org/archive/rove/2021-12-09/rove-20211209-git.tgz MD5 - d9f6cb2e26f06cfbd5c83bf3fa4fc206 NAME rove FILENAME rove DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME dissect FILENAME dissect) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria bordeaux-threads dissect trivial-gray-streams) - VERSION 20211209-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/rt.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/rt.nix deleted file mode 100644 index cfc37364ba..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/rt.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "rt"; - version = "20101006-git"; - - description = "MIT Regression Tester"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz"; - sha256 = "1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v"; - }; - - packageName = "rt"; - - asdFilesToKeep = ["rt.asd"]; - overrides = x: x; -} -/* (SYSTEM rt DESCRIPTION MIT Regression Tester SHA256 - 1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v URL - http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz MD5 - 94a56c473399572ca835ac91c77c04e5 NAME rt FILENAME rt DEPS NIL DEPENDENCIES - NIL VERSION 20101006-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/s-sql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/s-sql.nix deleted file mode 100644 index 510475d89b..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/s-sql.nix +++ /dev/null @@ -1,43 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "s-sql"; - version = "postmodern-20211209-git"; - - parasites = [ "s-sql/tests" ]; - - description = "Lispy DSL for SQL"; - - deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."md5" args."postmodern" args."split-sequence" args."uax-15" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/postmodern/2021-12-09/postmodern-20211209-git.tgz"; - sha256 = "1qcbg31mz5r7ibmq2y7r3vqvdwpznxvwdnwd94hfil7pg4j119d6"; - }; - - packageName = "s-sql"; - - asdFilesToKeep = ["s-sql.asd"]; - overrides = x: x; -} -/* (SYSTEM s-sql DESCRIPTION Lispy DSL for SQL SHA256 - 1qcbg31mz5r7ibmq2y7r3vqvdwpznxvwdnwd94hfil7pg4j119d6 URL - http://beta.quicklisp.org/archive/postmodern/2021-12-09/postmodern-20211209-git.tgz - MD5 6d14c4b5fec085594dc66d520174e0e6 NAME s-sql FILENAME s-sql DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-base64 FILENAME cl-base64) - (NAME cl-postgres FILENAME cl-postgres) - (NAME cl-postgres/tests FILENAME cl-postgres_slash_tests) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop) - (NAME fiveam FILENAME fiveam) (NAME global-vars FILENAME global-vars) - (NAME ironclad FILENAME ironclad) (NAME md5 FILENAME md5) - (NAME postmodern FILENAME postmodern) - (NAME split-sequence FILENAME split-sequence) - (NAME uax-15 FILENAME uax-15) (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria bordeaux-threads cl-base64 cl-postgres cl-postgres/tests - cl-ppcre closer-mop fiveam global-vars ironclad md5 postmodern - split-sequence uax-15 usocket) - VERSION postmodern-20211209-git SIBLINGS - (cl-postgres postmodern simple-date) PARASITES (s-sql/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/s-sysdeps.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/s-sysdeps.nix deleted file mode 100644 index fb69a00154..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/s-sysdeps.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "s-sysdeps"; - version = "20210228-git"; - - description = "An abstraction layer over platform dependent functionality"; - - deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" args."usocket-server" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/s-sysdeps/2021-02-28/s-sysdeps-20210228-git.tgz"; - sha256 = "0pybgicif1qavvix9183g4ahjrgcax3qf2ab523cas8l79lr1xkw"; - }; - - packageName = "s-sysdeps"; - - asdFilesToKeep = ["s-sysdeps.asd"]; - overrides = x: x; -} -/* (SYSTEM s-sysdeps DESCRIPTION - An abstraction layer over platform dependent functionality SHA256 - 0pybgicif1qavvix9183g4ahjrgcax3qf2ab523cas8l79lr1xkw URL - http://beta.quicklisp.org/archive/s-sysdeps/2021-02-28/s-sysdeps-20210228-git.tgz - MD5 25d8c1673457341bf60a20752fe59772 NAME s-sysdeps FILENAME s-sysdeps DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME split-sequence FILENAME split-sequence) - (NAME usocket FILENAME usocket) - (NAME usocket-server FILENAME usocket-server)) - DEPENDENCIES - (alexandria bordeaux-threads split-sequence usocket usocket-server) VERSION - 20210228-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/s-xml.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/s-xml.nix deleted file mode 100644 index 260f5a9ff1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/s-xml.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "s-xml"; - version = "20150608-git"; - - parasites = [ "s-xml.examples" "s-xml.test" ]; - - description = "Simple Common Lisp XML Parser"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz"; - sha256 = "0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq"; - }; - - packageName = "s-xml"; - - asdFilesToKeep = ["s-xml.asd"]; - overrides = x: x; -} -/* (SYSTEM s-xml DESCRIPTION Simple Common Lisp XML Parser SHA256 - 0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq URL - http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz - MD5 9c31c80f0661777c493fab683f776716 NAME s-xml FILENAME s-xml DEPS NIL - DEPENDENCIES NIL VERSION 20150608-git SIBLINGS NIL PARASITES - (s-xml.examples s-xml.test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/salza2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/salza2.nix deleted file mode 100644 index 974597faed..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/salza2.nix +++ /dev/null @@ -1,34 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "salza2"; - version = "2.1"; - - parasites = [ "salza2/test" ]; - - description = "Create compressed data in the ZLIB, DEFLATE, or GZIP - data formats"; - - deps = [ args."chipz" args."flexi-streams" args."parachute" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/salza2/2021-10-20/salza2-2.1.tgz"; - sha256 = "0ymx3bm2a9a3fwxbvcyzfy0cdfl5y0csyw5cybxy0whkwipgra0x"; - }; - - packageName = "salza2"; - - asdFilesToKeep = ["salza2.asd"]; - overrides = x: x; -} -/* (SYSTEM salza2 DESCRIPTION - Create compressed data in the ZLIB, DEFLATE, or GZIP - data formats - SHA256 0ymx3bm2a9a3fwxbvcyzfy0cdfl5y0csyw5cybxy0whkwipgra0x URL - http://beta.quicklisp.org/archive/salza2/2021-10-20/salza2-2.1.tgz MD5 - 867f3e0543a7e34d1be802062cf4893d NAME salza2 FILENAME salza2 DEPS - ((NAME chipz FILENAME chipz) (NAME flexi-streams FILENAME flexi-streams) - (NAME parachute FILENAME parachute) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (chipz flexi-streams parachute trivial-gray-streams) VERSION - 2.1 SIBLINGS NIL PARASITES (salza2/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/select.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/select.nix deleted file mode 100644 index 88faf82d63..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/select.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "select"; - version = "20210411-git"; - - parasites = [ "select/tests" ]; - - description = "DSL for array slices."; - - deps = [ args."alexandria" args."anaphora" args."fiveam" args."let-plus" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/select/2021-04-11/select-20210411-git.tgz"; - sha256 = "02xag0vpnqzfzw2mvrw6nwfhhy0iwq3zcvdh60cvx39labfvfdgb"; - }; - - packageName = "select"; - - asdFilesToKeep = ["select.asd"]; - overrides = x: x; -} -/* (SYSTEM select DESCRIPTION DSL for array slices. SHA256 - 02xag0vpnqzfzw2mvrw6nwfhhy0iwq3zcvdh60cvx39labfvfdgb URL - http://beta.quicklisp.org/archive/select/2021-04-11/select-20210411-git.tgz - MD5 3e9c06e580f9e3a8911317ae8b95d0da NAME select FILENAME select DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME fiveam FILENAME fiveam) (NAME let-plus FILENAME let-plus)) - DEPENDENCIES (alexandria anaphora fiveam let-plus) VERSION 20210411-git - SIBLINGS NIL PARASITES (select/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/serapeum.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/serapeum.nix deleted file mode 100644 index 4500ca4bf5..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/serapeum.nix +++ /dev/null @@ -1,63 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "serapeum"; - version = "20211209-git"; - - description = "Utilities beyond Alexandria."; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."parse-declarations-1_dot_0" args."parse-number" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-features" args."trivial-file-size" args."trivial-garbage" args."trivial-macroexpand-all" args."type-i" args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/serapeum/2021-12-09/serapeum-20211209-git.tgz"; - sha256 = "19ndbi69b60rxh1jvs7jrwg6bgzpkrfd22cnhyd2mir4ybmrdllh"; - }; - - packageName = "serapeum"; - - asdFilesToKeep = ["serapeum.asd"]; - overrides = x: x; -} -/* (SYSTEM serapeum DESCRIPTION Utilities beyond Alexandria. SHA256 - 19ndbi69b60rxh1jvs7jrwg6bgzpkrfd22cnhyd2mir4ybmrdllh URL - http://beta.quicklisp.org/archive/serapeum/2021-12-09/serapeum-20211209-git.tgz - MD5 be358e1693fd0883042d849199ab72d1 NAME serapeum FILENAME serapeum DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME closer-mop FILENAME closer-mop) - (NAME fare-quasiquote FILENAME fare-quasiquote) - (NAME fare-quasiquote-extras FILENAME fare-quasiquote-extras) - (NAME fare-quasiquote-optima FILENAME fare-quasiquote-optima) - (NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable) - (NAME fare-utils FILENAME fare-utils) - (NAME global-vars FILENAME global-vars) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME named-readtables FILENAME named-readtables) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME parse-number FILENAME parse-number) - (NAME split-sequence FILENAME split-sequence) - (NAME string-case FILENAME string-case) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.quasiquote FILENAME trivia_dot_quasiquote) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-file-size FILENAME trivial-file-size) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-macroexpand-all FILENAME trivial-macroexpand-all) - (NAME type-i FILENAME type-i) (NAME uiop FILENAME uiop)) - DEPENDENCIES - (alexandria babel bordeaux-threads closer-mop fare-quasiquote - fare-quasiquote-extras fare-quasiquote-optima fare-quasiquote-readtable - fare-utils global-vars introspect-environment iterate lisp-namespace - named-readtables parse-declarations-1.0 parse-number split-sequence - string-case trivia trivia.balland2006 trivia.level0 trivia.level1 - trivia.level2 trivia.quasiquote trivia.trivial trivial-cltl2 - trivial-features trivial-file-size trivial-garbage trivial-macroexpand-all - type-i uiop) - VERSION 20211209-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-date-time.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-date-time.nix deleted file mode 100644 index 83466bf1d9..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-date-time.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "simple-date-time"; - version = "20160421-git"; - - description = "date and time library for common lisp"; - - deps = [ args."cl-ppcre" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz"; - sha256 = "1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h"; - }; - - packageName = "simple-date-time"; - - asdFilesToKeep = ["simple-date-time.asd"]; - overrides = x: x; -} -/* (SYSTEM simple-date-time DESCRIPTION date and time library for common lisp - SHA256 1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h URL - http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz - MD5 a5b1e4af539646723dafacbc8cf732a0 NAME simple-date-time FILENAME - simple-date-time DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES - (cl-ppcre) VERSION 20160421-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-date.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-date.nix deleted file mode 100644 index b46901bf49..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-date.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "simple-date"; - version = "postmodern-20211209-git"; - - parasites = [ "simple-date/tests" ]; - - description = "Simple date library that can be used with postmodern"; - - deps = [ args."fiveam" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/postmodern/2021-12-09/postmodern-20211209-git.tgz"; - sha256 = "1qcbg31mz5r7ibmq2y7r3vqvdwpznxvwdnwd94hfil7pg4j119d6"; - }; - - packageName = "simple-date"; - - asdFilesToKeep = ["simple-date.asd"]; - overrides = x: x; -} -/* (SYSTEM simple-date DESCRIPTION - Simple date library that can be used with postmodern SHA256 - 1qcbg31mz5r7ibmq2y7r3vqvdwpznxvwdnwd94hfil7pg4j119d6 URL - http://beta.quicklisp.org/archive/postmodern/2021-12-09/postmodern-20211209-git.tgz - MD5 6d14c4b5fec085594dc66d520174e0e6 NAME simple-date FILENAME simple-date - DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION - postmodern-20211209-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES - (simple-date/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-inferiors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-inferiors.nix deleted file mode 100644 index a8dcd973eb..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-inferiors.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "simple-inferiors"; - version = "20200325-git"; - - description = "A very simple library to use inferior processes."; - - deps = [ args."alexandria" args."bordeaux-threads" args."documentation-utils" args."trivial-indent" args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/simple-inferiors/2020-03-25/simple-inferiors-20200325-git.tgz"; - sha256 = "15gjizqrazr0ahdda2l6bkv7ii5ax1wckn9mnj5haiv17jba8pn5"; - }; - - packageName = "simple-inferiors"; - - asdFilesToKeep = ["simple-inferiors.asd"]; - overrides = x: x; -} -/* (SYSTEM simple-inferiors DESCRIPTION - A very simple library to use inferior processes. SHA256 - 15gjizqrazr0ahdda2l6bkv7ii5ax1wckn9mnj5haiv17jba8pn5 URL - http://beta.quicklisp.org/archive/simple-inferiors/2020-03-25/simple-inferiors-20200325-git.tgz - MD5 f90ae807c10d5b3c4b9eef1134a537c8 NAME simple-inferiors FILENAME - simple-inferiors DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME documentation-utils FILENAME documentation-utils) - (NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop)) - DEPENDENCIES - (alexandria bordeaux-threads documentation-utils trivial-indent uiop) - VERSION 20200325-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-tasks.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-tasks.nix deleted file mode 100644 index 0c4f1ac861..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/simple-tasks.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "simple-tasks"; - version = "20190710-git"; - - description = "A very simple task scheduling framework."; - - deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz"; - sha256 = "12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3"; - }; - - packageName = "simple-tasks"; - - asdFilesToKeep = ["simple-tasks.asd"]; - overrides = x: x; -} -/* (SYSTEM simple-tasks DESCRIPTION A very simple task scheduling framework. - SHA256 12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3 URL - http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz - MD5 8e88a9a762bc8691f92217d256baa55e NAME simple-tasks FILENAME - simple-tasks DEPS - ((NAME alexandria FILENAME alexandria) - (NAME array-utils FILENAME array-utils) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME dissect FILENAME dissect)) - DEPENDENCIES (alexandria array-utils bordeaux-threads dissect) VERSION - 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/slynk.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/slynk.nix deleted file mode 100644 index 02b641043e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/slynk.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "slynk"; - version = "sly-20210411-git"; - - parasites = [ "slynk/arglists" "slynk/fancy-inspector" "slynk/indentation" "slynk/mrepl" "slynk/package-fu" "slynk/profiler" "slynk/retro" "slynk/stickers" "slynk/trace-dialog" ]; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz"; - sha256 = "1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks"; - }; - - packageName = "slynk"; - - asdFilesToKeep = ["slynk.asd"]; - overrides = x: x; -} -/* (SYSTEM slynk DESCRIPTION System lacks description SHA256 - 1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks URL - http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz MD5 - 7f0ff6b8a07d23599c77cd33c6d59ea6 NAME slynk FILENAME slynk DEPS NIL - DEPENDENCIES NIL VERSION sly-20210411-git SIBLINGS NIL PARASITES - (slynk/arglists slynk/fancy-inspector slynk/indentation slynk/mrepl - slynk/package-fu slynk/profiler slynk/retro slynk/stickers - slynk/trace-dialog)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/smart-buffer.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/smart-buffer.nix deleted file mode 100644 index 6f0a0cf369..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/smart-buffer.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "smart-buffer"; - version = "20211020-git"; - - description = "Smart octets buffer"; - - deps = [ args."flexi-streams" args."trivial-gray-streams" args."uiop" args."xsubseq" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz"; - sha256 = "0v25s4msnwi9vn0cwfv3kxamj0mr2xdwngwmxmhh93mr4fkqzdnv"; - }; - - packageName = "smart-buffer"; - - asdFilesToKeep = ["smart-buffer.asd"]; - overrides = x: x; -} -/* (SYSTEM smart-buffer DESCRIPTION Smart octets buffer SHA256 - 0v25s4msnwi9vn0cwfv3kxamj0mr2xdwngwmxmhh93mr4fkqzdnv URL - http://beta.quicklisp.org/archive/smart-buffer/2021-10-20/smart-buffer-20211020-git.tgz - MD5 d09d02788667d987b3988b6de09d09c3 NAME smart-buffer FILENAME - smart-buffer DEPS - ((NAME flexi-streams FILENAME flexi-streams) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME uiop FILENAME uiop) (NAME xsubseq FILENAME xsubseq)) - DEPENDENCIES (flexi-streams trivial-gray-streams uiop xsubseq) VERSION - 20211020-git SIBLINGS (smart-buffer-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/smug.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/smug.nix deleted file mode 100644 index 0d7b08355a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/smug.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "smug"; - version = "20160421-git"; - - description = "SMUG: Simple Monadic Uber Go-into, Parsing made easy."; - - deps = [ args."asdf-package-system" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/smug/2016-04-21/smug-20160421-git.tgz"; - sha256 = "0f9ig6r0cm1sbhkasx1v27204rmrjbzgwc49d9hy4zn29ffrg0h2"; - }; - - packageName = "smug"; - - asdFilesToKeep = ["smug.asd"]; - overrides = x: x; -} -/* (SYSTEM smug DESCRIPTION - SMUG: Simple Monadic Uber Go-into, Parsing made easy. SHA256 - 0f9ig6r0cm1sbhkasx1v27204rmrjbzgwc49d9hy4zn29ffrg0h2 URL - http://beta.quicklisp.org/archive/smug/2016-04-21/smug-20160421-git.tgz MD5 - 8139d7813bb3130497b6da3bb4cb8924 NAME smug FILENAME smug DEPS - ((NAME asdf-package-system FILENAME asdf-package-system)) DEPENDENCIES - (asdf-package-system) VERSION 20160421-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/spinneret.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/spinneret.nix deleted file mode 100644 index 8475d80c41..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/spinneret.nix +++ /dev/null @@ -1,67 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "spinneret"; - version = "20211020-git"; - - description = "Common Lisp HTML5 generator."; - - deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cl-ppcre" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."parenscript" args."parse-declarations-1_dot_0" args."parse-number" args."serapeum" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-features" args."trivial-file-size" args."trivial-garbage" args."trivial-gray-streams" args."trivial-macroexpand-all" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/spinneret/2021-10-20/spinneret-20211020-git.tgz"; - sha256 = "1j3z2sr98j7rd8ssxp8r1yxlj8chvldn0k2nh2vf2jaynhwk3slq"; - }; - - packageName = "spinneret"; - - asdFilesToKeep = ["spinneret.asd"]; - overrides = x: x; -} -/* (SYSTEM spinneret DESCRIPTION Common Lisp HTML5 generator. SHA256 - 1j3z2sr98j7rd8ssxp8r1yxlj8chvldn0k2nh2vf2jaynhwk3slq URL - http://beta.quicklisp.org/archive/spinneret/2021-10-20/spinneret-20211020-git.tgz - MD5 f10e1537f3bfd16a0a189d16fd86790b NAME spinneret FILENAME spinneret DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop) - (NAME fare-quasiquote FILENAME fare-quasiquote) - (NAME fare-quasiquote-extras FILENAME fare-quasiquote-extras) - (NAME fare-quasiquote-optima FILENAME fare-quasiquote-optima) - (NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable) - (NAME fare-utils FILENAME fare-utils) - (NAME global-vars FILENAME global-vars) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME named-readtables FILENAME named-readtables) - (NAME parenscript FILENAME parenscript) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME parse-number FILENAME parse-number) - (NAME serapeum FILENAME serapeum) - (NAME split-sequence FILENAME split-sequence) - (NAME string-case FILENAME string-case) (NAME trivia FILENAME trivia) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.quasiquote FILENAME trivia_dot_quasiquote) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-file-size FILENAME trivial-file-size) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME trivial-macroexpand-all FILENAME trivial-macroexpand-all) - (NAME type-i FILENAME type-i)) - DEPENDENCIES - (alexandria anaphora babel bordeaux-threads cl-ppcre closer-mop - fare-quasiquote fare-quasiquote-extras fare-quasiquote-optima - fare-quasiquote-readtable fare-utils global-vars introspect-environment - iterate lisp-namespace named-readtables parenscript parse-declarations-1.0 - parse-number serapeum split-sequence string-case trivia trivia.balland2006 - trivia.level0 trivia.level1 trivia.level2 trivia.quasiquote trivia.trivial - trivial-cltl2 trivial-features trivial-file-size trivial-garbage - trivial-gray-streams trivial-macroexpand-all type-i) - VERSION 20211020-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/split-sequence.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/split-sequence.nix deleted file mode 100644 index d1bb4675ba..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/split-sequence.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "split-sequence"; - version = "v2.0.1"; - - parasites = [ "split-sequence/tests" ]; - - description = "Splits a sequence into a list of subsequences - delimited by objects satisfying a test."; - - deps = [ args."fiveam" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/split-sequence/2021-05-31/split-sequence-v2.0.1.tgz"; - sha256 = "0x6jdpx5nwby0mjhavqzbfr97725jaryvawjj2f5w9z2s4m9ciya"; - }; - - packageName = "split-sequence"; - - asdFilesToKeep = ["split-sequence.asd"]; - overrides = x: x; -} -/* (SYSTEM split-sequence DESCRIPTION - Splits a sequence into a list of subsequences - delimited by objects satisfying a test. - SHA256 0x6jdpx5nwby0mjhavqzbfr97725jaryvawjj2f5w9z2s4m9ciya URL - http://beta.quicklisp.org/archive/split-sequence/2021-05-31/split-sequence-v2.0.1.tgz - MD5 871be321b4dbca0a1f958927e9173795 NAME split-sequence FILENAME - split-sequence DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) - VERSION v2.0.1 SIBLINGS NIL PARASITES (split-sequence/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/sqlite.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/sqlite.nix deleted file mode 100644 index 8c0773cd45..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/sqlite.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "sqlite"; - version = "cl-20190813-git"; - - description = "CL-SQLITE package is an interface to the SQLite embedded relational database engine."; - - deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz"; - sha256 = "07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk"; - }; - - packageName = "sqlite"; - - asdFilesToKeep = ["sqlite.asd"]; - overrides = x: x; -} -/* (SYSTEM sqlite DESCRIPTION - CL-SQLITE package is an interface to the SQLite embedded relational database engine. - SHA256 07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk URL - http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz - MD5 2269773eeb4a101ddd3b33f0f7e05e76 NAME sqlite FILENAME sqlite DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi iterate trivial-features) VERSION - cl-20190813-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/static-dispatch.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/static-dispatch.nix deleted file mode 100644 index 92708af605..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/static-dispatch.nix +++ /dev/null @@ -1,43 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "static-dispatch"; - version = "20211209-git"; - - parasites = [ "static-dispatch/test" ]; - - description = "Static generic function dispatch for Common Lisp."; - - deps = [ args."agutil" args."alexandria" args."anaphora" args."arrows" args."cl-environments" args."cl-form-types" args."closer-mop" args."collectors" args."fiveam" args."introspect-environment" args."iterate" args."optima" args."parse-declarations-1_dot_0" args."symbol-munger" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/static-dispatch/2021-12-09/static-dispatch-20211209-git.tgz"; - sha256 = "04hvwn5fvxlblhicdbj0sbvlgcxsnykak05j3pdv5laic50jz192"; - }; - - packageName = "static-dispatch"; - - asdFilesToKeep = ["static-dispatch.asd"]; - overrides = x: x; -} -/* (SYSTEM static-dispatch DESCRIPTION - Static generic function dispatch for Common Lisp. SHA256 - 04hvwn5fvxlblhicdbj0sbvlgcxsnykak05j3pdv5laic50jz192 URL - http://beta.quicklisp.org/archive/static-dispatch/2021-12-09/static-dispatch-20211209-git.tgz - MD5 f74cb2bd29ef9cfe966f470c7f63420f NAME static-dispatch FILENAME - static-dispatch DEPS - ((NAME agutil FILENAME agutil) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) (NAME arrows FILENAME arrows) - (NAME cl-environments FILENAME cl-environments) - (NAME cl-form-types FILENAME cl-form-types) - (NAME closer-mop FILENAME closer-mop) - (NAME collectors FILENAME collectors) (NAME fiveam FILENAME fiveam) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) (NAME optima FILENAME optima) - (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) - (NAME symbol-munger FILENAME symbol-munger)) - DEPENDENCIES - (agutil alexandria anaphora arrows cl-environments cl-form-types closer-mop - collectors fiveam introspect-environment iterate optima - parse-declarations-1.0 symbol-munger) - VERSION 20211209-git SIBLINGS NIL PARASITES (static-dispatch/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/static-vectors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/static-vectors.nix deleted file mode 100644 index 3a7f1661ad..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/static-vectors.nix +++ /dev/null @@ -1,36 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "static-vectors"; - version = "v1.8.9"; - - parasites = [ "static-vectors/test" ]; - - description = "Create vectors allocated in static memory."; - - deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fiveam" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/static-vectors/2021-06-30/static-vectors-v1.8.9.tgz"; - sha256 = "01n4iz6s4n57gmxscnj9aign60kh6gp7ak5waqz5zwhsdklgj0j4"; - }; - - packageName = "static-vectors"; - - asdFilesToKeep = ["static-vectors.asd"]; - overrides = x: x; -} -/* (SYSTEM static-vectors DESCRIPTION - Create vectors allocated in static memory. SHA256 - 01n4iz6s4n57gmxscnj9aign60kh6gp7ak5waqz5zwhsdklgj0j4 URL - http://beta.quicklisp.org/archive/static-vectors/2021-06-30/static-vectors-v1.8.9.tgz - MD5 f14b819c0d55e7fbd28e9b4a0bb3bfc9 NAME static-vectors FILENAME - static-vectors DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME fiveam FILENAME fiveam) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria babel cffi cffi-grovel cffi-toolchain fiveam trivial-features) - VERSION v1.8.9 SIBLINGS NIL PARASITES (static-vectors/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/stefil.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/stefil.nix deleted file mode 100644 index dca0fc4dd9..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/stefil.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "stefil"; - version = "20181210-git"; - - parasites = [ "stefil-test" ]; - - description = "Stefil - Simple Test Framework In Lisp"; - - deps = [ args."alexandria" args."iterate" args."metabang-bind" args."swank" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz"; - sha256 = "10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g"; - }; - - packageName = "stefil"; - - asdFilesToKeep = ["stefil.asd"]; - overrides = x: x; -} -/* (SYSTEM stefil DESCRIPTION Stefil - Simple Test Framework In Lisp SHA256 - 10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g URL - http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz - MD5 3418bf358366748593f65e4b6e1bb8cf NAME stefil FILENAME stefil DEPS - ((NAME alexandria FILENAME alexandria) (NAME iterate FILENAME iterate) - (NAME metabang-bind FILENAME metabang-bind) (NAME swank FILENAME swank)) - DEPENDENCIES (alexandria iterate metabang-bind swank) VERSION 20181210-git - SIBLINGS NIL PARASITES (stefil-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/str.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/str.nix deleted file mode 100644 index 7c9809cb37..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/str.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "str"; - version = "cl-20210531-git"; - - description = "Modern, consistent and terse Common Lisp string manipulation library."; - - deps = [ args."cl-change-case" args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-str/2021-05-31/cl-str-20210531-git.tgz"; - sha256 = "16z1axfik0s2m74ly4bxlrv4mbd2r923y7nrrrc487fsjs3v23bb"; - }; - - packageName = "str"; - - asdFilesToKeep = ["str.asd"]; - overrides = x: x; -} -/* (SYSTEM str DESCRIPTION - Modern, consistent and terse Common Lisp string manipulation library. - SHA256 16z1axfik0s2m74ly4bxlrv4mbd2r923y7nrrrc487fsjs3v23bb URL - http://beta.quicklisp.org/archive/cl-str/2021-05-31/cl-str-20210531-git.tgz - MD5 05144979ce1bf382fdb0b91db932fe6a NAME str FILENAME str DEPS - ((NAME cl-change-case FILENAME cl-change-case) - (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode) - (NAME cl-unicode FILENAME cl-unicode) - (NAME flexi-streams FILENAME flexi-streams)) - DEPENDENCIES - (cl-change-case cl-ppcre cl-ppcre-unicode cl-unicode flexi-streams) VERSION - cl-20210531-git SIBLINGS (str.test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/string-case.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/string-case.nix deleted file mode 100644 index 05ca089dbf..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/string-case.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "string-case"; - version = "20180711-git"; - - description = "string-case is a macro that generates specialised decision trees to dispatch on string equality"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz"; - sha256 = "1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z"; - }; - - packageName = "string-case"; - - asdFilesToKeep = ["string-case.asd"]; - overrides = x: x; -} -/* (SYSTEM string-case DESCRIPTION - string-case is a macro that generates specialised decision trees to dispatch on string equality - SHA256 1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z URL - http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz - MD5 145c4e13f1e90a070b0a95ca979a9680 NAME string-case FILENAME string-case - DEPS NIL DEPENDENCIES NIL VERSION 20180711-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/stumpwm.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/stumpwm.nix deleted file mode 100644 index d7ea271633..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/stumpwm.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "stumpwm"; - version = "20211209-git"; - - description = "A tiling, keyboard driven window manager"; - - deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/stumpwm/2021-12-09/stumpwm-20211209-git.tgz"; - sha256 = "1n7wj2jn6sydnyrjmic53lqkqigk1cg140b9pcnk09ngsrq3cn60"; - }; - - packageName = "stumpwm"; - - asdFilesToKeep = ["stumpwm.asd"]; - overrides = x: x; -} -/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 - 1n7wj2jn6sydnyrjmic53lqkqigk1cg140b9pcnk09ngsrq3cn60 URL - http://beta.quicklisp.org/archive/stumpwm/2021-12-09/stumpwm-20211209-git.tgz - MD5 a556b95108398e56159bafe31c4dbabf NAME stumpwm FILENAME stumpwm DEPS - ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME clx FILENAME clx)) - DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20211209-git SIBLINGS - (stumpwm-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/swank.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/swank.nix deleted file mode 100644 index a0cb5e362c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/swank.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "swank"; - version = "slime-v2.26.1"; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/slime/2020-12-20/slime-v2.26.1.tgz"; - sha256 = "12q3la9lwzs01x0ii5vss0i8i78lgyjrn3adr3rs027f4b7386ny"; - }; - - packageName = "swank"; - - asdFilesToKeep = ["swank.asd"]; - overrides = x: x; -} -/* (SYSTEM swank DESCRIPTION System lacks description SHA256 - 12q3la9lwzs01x0ii5vss0i8i78lgyjrn3adr3rs027f4b7386ny URL - http://beta.quicklisp.org/archive/slime/2020-12-20/slime-v2.26.1.tgz MD5 - bd91e1fe29a4f7ebf53a0bfecc9e1e36 NAME swank FILENAME swank DEPS NIL - DEPENDENCIES NIL VERSION slime-v2.26.1 SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/swap-bytes.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/swap-bytes.nix deleted file mode 100644 index 3bb8e5fac1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/swap-bytes.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "swap-bytes"; - version = "v1.2"; - - parasites = [ "swap-bytes/test" ]; - - description = "Optimized byte-swapping primitives."; - - deps = [ args."fiveam" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz"; - sha256 = "05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8"; - }; - - packageName = "swap-bytes"; - - asdFilesToKeep = ["swap-bytes.asd"]; - overrides = x: x; -} -/* (SYSTEM swap-bytes DESCRIPTION Optimized byte-swapping primitives. SHA256 - 05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8 URL - http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz - MD5 eea516d7fdbe20bc963a6708c225d719 NAME swap-bytes FILENAME swap-bytes - DEPS - ((NAME fiveam FILENAME fiveam) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (fiveam trivial-features) VERSION v1.2 SIBLINGS NIL PARASITES - (swap-bytes/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/sycamore.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/sycamore.nix deleted file mode 100644 index c4b1a838e3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/sycamore.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "sycamore"; - version = "20211020-git"; - - description = "A fast, purely functional data structure library"; - - deps = [ args."alexandria" args."cl-fuzz" args."cl-ppcre" args."lisp-unit" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/sycamore/2021-10-20/sycamore-20211020-git.tgz"; - sha256 = "1msh2kpd96s7jfm565snf71bbsmnjmsf8b31y1xg9vkk7xp01cf4"; - }; - - packageName = "sycamore"; - - asdFilesToKeep = ["sycamore.asd"]; - overrides = x: x; -} -/* (SYSTEM sycamore DESCRIPTION - A fast, purely functional data structure library SHA256 - 1msh2kpd96s7jfm565snf71bbsmnjmsf8b31y1xg9vkk7xp01cf4 URL - http://beta.quicklisp.org/archive/sycamore/2021-10-20/sycamore-20211020-git.tgz - MD5 0a9f35519b5cb3e5f9467427632ff0f8 NAME sycamore FILENAME sycamore DEPS - ((NAME alexandria FILENAME alexandria) (NAME cl-fuzz FILENAME cl-fuzz) - (NAME cl-ppcre FILENAME cl-ppcre) (NAME lisp-unit FILENAME lisp-unit)) - DEPENDENCIES (alexandria cl-fuzz cl-ppcre lisp-unit) VERSION 20211020-git - SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/symbol-munger.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/symbol-munger.nix deleted file mode 100644 index 51ea4b91e7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/symbol-munger.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "symbol-munger"; - version = "20150407-git"; - - description = "Functions to convert between the spacing and - capitalization conventions of various environments"; - - deps = [ args."alexandria" args."iterate" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz"; - sha256 = "0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6"; - }; - - packageName = "symbol-munger"; - - asdFilesToKeep = ["symbol-munger.asd"]; - overrides = x: x; -} -/* (SYSTEM symbol-munger DESCRIPTION - Functions to convert between the spacing and - capitalization conventions of various environments - SHA256 0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6 URL - http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz - MD5 b1e35b63d7ad1451868d1c40e2fbfab7 NAME symbol-munger FILENAME - symbol-munger DEPS - ((NAME alexandria FILENAME alexandria) (NAME iterate FILENAME iterate)) - DEPENDENCIES (alexandria iterate) VERSION 20150407-git SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trees.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trees.nix deleted file mode 100644 index db500b8eea..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trees.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trees"; - version = "20180131-git"; - - parasites = [ "trees-tests" ]; - - description = "A library for binary trees in normal and balanced flavors"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trees/2018-01-31/trees-20180131-git.tgz"; - sha256 = "1p54j2kav1vggdjw5msdpmfyi7cxh41f4j669rgp0g8fpimmzcfg"; - }; - - packageName = "trees"; - - asdFilesToKeep = ["trees.asd"]; - overrides = x: x; -} -/* (SYSTEM trees DESCRIPTION - A library for binary trees in normal and balanced flavors SHA256 - 1p54j2kav1vggdjw5msdpmfyi7cxh41f4j669rgp0g8fpimmzcfg URL - http://beta.quicklisp.org/archive/trees/2018-01-31/trees-20180131-git.tgz - MD5 a1b156d15d444d114f475f7abc908064 NAME trees FILENAME trees DEPS NIL - DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL PARASITES (trees-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia.nix deleted file mode 100644 index fab5a9192b..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia.nix +++ /dev/null @@ -1,45 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivia"; - version = "20211020-git"; - - description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase"; - - deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz"; - sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g"; - }; - - packageName = "trivia"; - - asdFilesToKeep = ["trivia.asd"]; - overrides = x: x; -} -/* (SYSTEM trivia DESCRIPTION - NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase - SHA256 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL - http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz - MD5 db933e44824514d8ccc9b2a119008051 NAME trivia FILENAME trivia DEPS - ((NAME alexandria FILENAME alexandria) - (NAME closer-mop FILENAME closer-mop) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (alexandria closer-mop introspect-environment iterate lisp-namespace - trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2 type-i) - VERSION 20211020-git SIBLINGS - (trivia.balland2006 trivia.benchmark trivia.cffi trivia.fset trivia.level0 - trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test - trivia.trivial) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_balland2006.nix deleted file mode 100644 index a4ccd03cf4..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_balland2006.nix +++ /dev/null @@ -1,45 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivia_dot_balland2006"; - version = "trivia-20211020-git"; - - description = "Optimizer for Trivia based on (Balland 2006)"; - - deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz"; - sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g"; - }; - - packageName = "trivia.balland2006"; - - asdFilesToKeep = ["trivia.balland2006.asd"]; - overrides = x: x; -} -/* (SYSTEM trivia.balland2006 DESCRIPTION - Optimizer for Trivia based on (Balland 2006) SHA256 - 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL - http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz - MD5 db933e44824514d8ccc9b2a119008051 NAME trivia.balland2006 FILENAME - trivia_dot_balland2006 DEPS - ((NAME alexandria FILENAME alexandria) - (NAME closer-mop FILENAME closer-mop) - (NAME introspect-environment FILENAME introspect-environment) - (NAME iterate FILENAME iterate) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) - DEPENDENCIES - (alexandria closer-mop introspect-environment iterate lisp-namespace - trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2 - type-i) - VERSION trivia-20211020-git SIBLINGS - (trivia trivia.benchmark trivia.cffi trivia.fset trivia.level0 - trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test - trivia.trivial) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_level0.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_level0.nix deleted file mode 100644 index 4011d4f86f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_level0.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivia_dot_level0"; - version = "trivia-20211020-git"; - - description = "Bootstrapping Pattern Matching Library for implementing Trivia"; - - deps = [ args."alexandria" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz"; - sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g"; - }; - - packageName = "trivia.level0"; - - asdFilesToKeep = ["trivia.level0.asd"]; - overrides = x: x; -} -/* (SYSTEM trivia.level0 DESCRIPTION - Bootstrapping Pattern Matching Library for implementing Trivia SHA256 - 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL - http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz - MD5 db933e44824514d8ccc9b2a119008051 NAME trivia.level0 FILENAME - trivia_dot_level0 DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES - (alexandria) VERSION trivia-20211020-git SIBLINGS - (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.fset - trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test - trivia.trivial) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_level1.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_level1.nix deleted file mode 100644 index ad25070a81..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_level1.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivia_dot_level1"; - version = "trivia-20211020-git"; - - description = "Core patterns of Trivia"; - - deps = [ args."alexandria" args."trivia_dot_level0" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz"; - sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g"; - }; - - packageName = "trivia.level1"; - - asdFilesToKeep = ["trivia.level1.asd"]; - overrides = x: x; -} -/* (SYSTEM trivia.level1 DESCRIPTION Core patterns of Trivia SHA256 - 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL - http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz - MD5 db933e44824514d8ccc9b2a119008051 NAME trivia.level1 FILENAME - trivia_dot_level1 DEPS - ((NAME alexandria FILENAME alexandria) - (NAME trivia.level0 FILENAME trivia_dot_level0)) - DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20211020-git - SIBLINGS - (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.fset - trivia.level0 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test - trivia.trivial) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_level2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_level2.nix deleted file mode 100644 index a552646736..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_level2.nix +++ /dev/null @@ -1,40 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivia_dot_level2"; - version = "trivia-20211020-git"; - - description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase"; - - deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz"; - sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g"; - }; - - packageName = "trivia.level2"; - - asdFilesToKeep = ["trivia.level2.asd"]; - overrides = x: x; -} -/* (SYSTEM trivia.level2 DESCRIPTION - NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase - SHA256 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL - http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz - MD5 db933e44824514d8ccc9b2a119008051 NAME trivia.level2 FILENAME - trivia_dot_level2 DEPS - ((NAME alexandria FILENAME alexandria) - (NAME closer-mop FILENAME closer-mop) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivial-cltl2 FILENAME trivial-cltl2)) - DEPENDENCIES - (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1 - trivial-cltl2) - VERSION trivia-20211020-git SIBLINGS - (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.fset - trivia.level0 trivia.level1 trivia.ppcre trivia.quasiquote trivia.test - trivia.trivial) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_quasiquote.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_quasiquote.nix deleted file mode 100644 index 3ab15225d5..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_quasiquote.nix +++ /dev/null @@ -1,46 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivia_dot_quasiquote"; - version = "trivia-20211020-git"; - - description = "fare-quasiquote extension for trivia"; - - deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz"; - sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g"; - }; - - packageName = "trivia.quasiquote"; - - asdFilesToKeep = ["trivia.quasiquote.asd"]; - overrides = x: x; -} -/* (SYSTEM trivia.quasiquote DESCRIPTION fare-quasiquote extension for trivia - SHA256 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL - http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz - MD5 db933e44824514d8ccc9b2a119008051 NAME trivia.quasiquote FILENAME - trivia_dot_quasiquote DEPS - ((NAME alexandria FILENAME alexandria) - (NAME closer-mop FILENAME closer-mop) - (NAME fare-quasiquote FILENAME fare-quasiquote) - (NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable) - (NAME fare-utils FILENAME fare-utils) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME named-readtables FILENAME named-readtables) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2)) - DEPENDENCIES - (alexandria closer-mop fare-quasiquote fare-quasiquote-readtable fare-utils - lisp-namespace named-readtables trivia.level0 trivia.level1 trivia.level2 - trivia.trivial trivial-cltl2) - VERSION trivia-20211020-git SIBLINGS - (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.fset - trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.test - trivia.trivial) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_trivial.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_trivial.nix deleted file mode 100644 index 736d0322d1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivia_dot_trivial.nix +++ /dev/null @@ -1,45 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivia_dot_trivial"; - version = "trivia-20211020-git"; - - description = "Base level system of Trivia with a trivial optimizer. - Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system, - in order to avoid the circular dependency."; - - deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz"; - sha256 = "0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g"; - }; - - packageName = "trivia.trivial"; - - asdFilesToKeep = ["trivia.trivial.asd"]; - overrides = x: x; -} -/* (SYSTEM trivia.trivial DESCRIPTION - Base level system of Trivia with a trivial optimizer. - Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system, - in order to avoid the circular dependency. - SHA256 0gf63v42pq8cxr7an177p2mf25n5jpqxdf0zb4xqlm2sydk7ng1g URL - http://beta.quicklisp.org/archive/trivia/2021-10-20/trivia-20211020-git.tgz - MD5 db933e44824514d8ccc9b2a119008051 NAME trivia.trivial FILENAME - trivia_dot_trivial DEPS - ((NAME alexandria FILENAME alexandria) - (NAME closer-mop FILENAME closer-mop) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivial-cltl2 FILENAME trivial-cltl2)) - DEPENDENCIES - (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1 - trivia.level2 trivial-cltl2) - VERSION trivia-20211020-git SIBLINGS - (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.fset - trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote - trivia.test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-arguments.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-arguments.nix deleted file mode 100644 index 9444b0b690..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-arguments.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-arguments"; - version = "20200925-git"; - - description = "A simple library to retrieve the lambda-list of a function."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-arguments/2020-09-25/trivial-arguments-20200925-git.tgz"; - sha256 = "079xm6f1vmsng7dzgb2x3m7k46jfw19wskwf1l5cid5nm267d295"; - }; - - packageName = "trivial-arguments"; - - asdFilesToKeep = ["trivial-arguments.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-arguments DESCRIPTION - A simple library to retrieve the lambda-list of a function. SHA256 - 079xm6f1vmsng7dzgb2x3m7k46jfw19wskwf1l5cid5nm267d295 URL - http://beta.quicklisp.org/archive/trivial-arguments/2020-09-25/trivial-arguments-20200925-git.tgz - MD5 3d7b76a729b272019c8827e40bfb6db8 NAME trivial-arguments FILENAME - trivial-arguments DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS - NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-backtrace.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-backtrace.nix deleted file mode 100644 index 063551bd79..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-backtrace.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-backtrace"; - version = "20200610-git"; - - description = "trivial-backtrace"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz"; - sha256 = "0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks"; - }; - - packageName = "trivial-backtrace"; - - asdFilesToKeep = ["trivial-backtrace.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-backtrace DESCRIPTION trivial-backtrace SHA256 - 0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks URL - http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz - MD5 1d9a7cc7c5840e4eba84c89648908525 NAME trivial-backtrace FILENAME - trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20200610-git SIBLINGS - (trivial-backtrace-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-clipboard.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-clipboard.nix deleted file mode 100644 index c7831773a9..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-clipboard.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-clipboard"; - version = "20210228-git"; - - description = "trivial-clipboard let access system clipboard."; - - deps = [ args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-clipboard/2021-02-28/trivial-clipboard-20210228-git.tgz"; - sha256 = "1fmxkz97qrjkc320w849r1411f7j2ghf3g9xh5lczcapgjwq8f0l"; - }; - - packageName = "trivial-clipboard"; - - asdFilesToKeep = ["trivial-clipboard.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-clipboard DESCRIPTION - trivial-clipboard let access system clipboard. SHA256 - 1fmxkz97qrjkc320w849r1411f7j2ghf3g9xh5lczcapgjwq8f0l URL - http://beta.quicklisp.org/archive/trivial-clipboard/2021-02-28/trivial-clipboard-20210228-git.tgz - MD5 f147ff33934a3796d89597cea8dbe462 NAME trivial-clipboard FILENAME - trivial-clipboard DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) - VERSION 20210228-git SIBLINGS (trivial-clipboard-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-cltl2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-cltl2.nix deleted file mode 100644 index 3b72629fa3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-cltl2.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-cltl2"; - version = "20200325-git"; - - description = "Compatibility package exporting CLtL2 functionality"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz"; - sha256 = "0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys"; - }; - - packageName = "trivial-cltl2"; - - asdFilesToKeep = ["trivial-cltl2.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-cltl2 DESCRIPTION - Compatibility package exporting CLtL2 functionality SHA256 - 0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys URL - http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz - MD5 aa18140b9840365ceb9a6cddbdbdd67b NAME trivial-cltl2 FILENAME - trivial-cltl2 DEPS NIL DEPENDENCIES NIL VERSION 20200325-git SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-features.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-features.nix deleted file mode 100644 index 46c6b635a6..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-features.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-features"; - version = "20211209-git"; - - description = "Ensures consistent *FEATURES* across multiple CLs."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-features/2021-12-09/trivial-features-20211209-git.tgz"; - sha256 = "1sxblr86hvbb99isr86y08snfpcajd6ra3396ibqkfnw33hhkgql"; - }; - - packageName = "trivial-features"; - - asdFilesToKeep = ["trivial-features.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-features DESCRIPTION - Ensures consistent *FEATURES* across multiple CLs. SHA256 - 1sxblr86hvbb99isr86y08snfpcajd6ra3396ibqkfnw33hhkgql URL - http://beta.quicklisp.org/archive/trivial-features/2021-12-09/trivial-features-20211209-git.tgz - MD5 eca3e353c7d7f100a07a5aeb4de02098 NAME trivial-features FILENAME - trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20211209-git SIBLINGS - (trivial-features-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-file-size.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-file-size.nix deleted file mode 100644 index f37d63b6bb..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-file-size.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-file-size"; - version = "20200427-git"; - - parasites = [ "trivial-file-size/tests" ]; - - description = "Stat a file's size."; - - deps = [ args."fiveam" args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz"; - sha256 = "1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa"; - }; - - packageName = "trivial-file-size"; - - asdFilesToKeep = ["trivial-file-size.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-file-size DESCRIPTION Stat a file's size. SHA256 - 1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa URL - http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz - MD5 1e1952c60c1711869cd6b87b9bc25b52 NAME trivial-file-size FILENAME - trivial-file-size DEPS - ((NAME fiveam FILENAME fiveam) (NAME uiop FILENAME uiop)) DEPENDENCIES - (fiveam uiop) VERSION 20200427-git SIBLINGS NIL PARASITES - (trivial-file-size/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-garbage.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-garbage.nix deleted file mode 100644 index 2a180488da..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-garbage.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-garbage"; - version = "20200925-git"; - - parasites = [ "trivial-garbage/tests" ]; - - description = "Portable finalizers, weak hash-tables and weak pointers."; - - deps = [ args."rt" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz"; - sha256 = "00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83"; - }; - - packageName = "trivial-garbage"; - - asdFilesToKeep = ["trivial-garbage.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-garbage DESCRIPTION - Portable finalizers, weak hash-tables and weak pointers. SHA256 - 00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83 URL - http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz - MD5 9d748d1d549f419ce474f35906707420 NAME trivial-garbage FILENAME - trivial-garbage DEPS ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION - 20200925-git SIBLINGS NIL PARASITES (trivial-garbage/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-gray-streams.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-gray-streams.nix deleted file mode 100644 index 67dba33ed3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-gray-streams.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-gray-streams"; - version = "20210124-git"; - - description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-gray-streams/2021-01-24/trivial-gray-streams-20210124-git.tgz"; - sha256 = "0swqcw3649279qyn5lc42xqgi13jc4kd7hf3iasf4vfli8lhb3n6"; - }; - - packageName = "trivial-gray-streams"; - - asdFilesToKeep = ["trivial-gray-streams.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-gray-streams DESCRIPTION - Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams). - SHA256 0swqcw3649279qyn5lc42xqgi13jc4kd7hf3iasf4vfli8lhb3n6 URL - http://beta.quicklisp.org/archive/trivial-gray-streams/2021-01-24/trivial-gray-streams-20210124-git.tgz - MD5 1b93af1cae9f8465d813964db4d10588 NAME trivial-gray-streams FILENAME - trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20210124-git - SIBLINGS (trivial-gray-streams-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-indent.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-indent.nix deleted file mode 100644 index dc67ca8c71..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-indent.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-indent"; - version = "20210531-git"; - - description = "A very simple library to allow indentation hints for SWANK."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-indent/2021-05-31/trivial-indent-20210531-git.tgz"; - sha256 = "1nqkay4kwy365q1qlba07q9x5ng0sxrcii4fpjqcd8nwbx3kbm8b"; - }; - - packageName = "trivial-indent"; - - asdFilesToKeep = ["trivial-indent.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-indent DESCRIPTION - A very simple library to allow indentation hints for SWANK. SHA256 - 1nqkay4kwy365q1qlba07q9x5ng0sxrcii4fpjqcd8nwbx3kbm8b URL - http://beta.quicklisp.org/archive/trivial-indent/2021-05-31/trivial-indent-20210531-git.tgz - MD5 3bb7d208d9d0614121c1f57fcffe65c7 NAME trivial-indent FILENAME - trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20210531-git SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-macroexpand-all.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-macroexpand-all.nix deleted file mode 100644 index ccf4a4e81a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-macroexpand-all.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-macroexpand-all"; - version = "20171023-git"; - - description = "Call each implementation's macroexpand-all equivalent"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz"; - sha256 = "0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm"; - }; - - packageName = "trivial-macroexpand-all"; - - asdFilesToKeep = ["trivial-macroexpand-all.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-macroexpand-all DESCRIPTION - Call each implementation's macroexpand-all equivalent SHA256 - 0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm URL - http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz - MD5 9cec494869344eb64ebce802c01928c5 NAME trivial-macroexpand-all FILENAME - trivial-macroexpand-all DEPS NIL DEPENDENCIES NIL VERSION 20171023-git - SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-main-thread.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-main-thread.nix deleted file mode 100644 index 8c5b3afd0e..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-main-thread.nix +++ /dev/null @@ -1,35 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-main-thread"; - version = "20190710-git"; - - description = "Compatibility library to run things in the main thread."; - - deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" args."simple-tasks" args."trivial-features" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz"; - sha256 = "1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h"; - }; - - packageName = "trivial-main-thread"; - - asdFilesToKeep = ["trivial-main-thread.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-main-thread DESCRIPTION - Compatibility library to run things in the main thread. SHA256 - 1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h URL - http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz - MD5 ab95906f1831aa5b40f271eebdfe11a3 NAME trivial-main-thread FILENAME - trivial-main-thread DEPS - ((NAME alexandria FILENAME alexandria) - (NAME array-utils FILENAME array-utils) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME dissect FILENAME dissect) (NAME simple-tasks FILENAME simple-tasks) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria array-utils bordeaux-threads dissect simple-tasks - trivial-features) - VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-mimes.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-mimes.nix deleted file mode 100644 index 0d9ae4a6da..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-mimes.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-mimes"; - version = "20200715-git"; - - description = "Tiny library to detect mime types in files."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz"; - sha256 = "10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1"; - }; - - packageName = "trivial-mimes"; - - asdFilesToKeep = ["trivial-mimes.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-mimes DESCRIPTION - Tiny library to detect mime types in files. SHA256 - 10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1 URL - http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz - MD5 6f400805470232e87b3f69b9239b2b55 NAME trivial-mimes FILENAME - trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20200715-git SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-package-local-nicknames.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-package-local-nicknames.nix deleted file mode 100644 index 859f70fe0d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-package-local-nicknames.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-package-local-nicknames"; - version = "20200610-git"; - - description = "Portability library for package-local nicknames"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz"; - sha256 = "1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5"; - }; - - packageName = "trivial-package-local-nicknames"; - - asdFilesToKeep = ["trivial-package-local-nicknames.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-package-local-nicknames DESCRIPTION - Portability library for package-local nicknames SHA256 - 1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5 URL - http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz - MD5 b3620521d3400ad5910878139bc86fcc NAME trivial-package-local-nicknames - FILENAME trivial-package-local-nicknames DEPS NIL DEPENDENCIES NIL VERSION - 20200610-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-shell.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-shell.nix deleted file mode 100644 index d091d3920b..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-shell.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-shell"; - version = "20180228-git"; - - description = "OS and Implementation independent access to the shell"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-shell/2018-02-28/trivial-shell-20180228-git.tgz"; - sha256 = "058gk7fld8v5m84r5fcwl5z8j3pw68xs0jdy9xx6vi1svaxrzngp"; - }; - - packageName = "trivial-shell"; - - asdFilesToKeep = ["trivial-shell.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-shell DESCRIPTION - OS and Implementation independent access to the shell SHA256 - 058gk7fld8v5m84r5fcwl5z8j3pw68xs0jdy9xx6vi1svaxrzngp URL - http://beta.quicklisp.org/archive/trivial-shell/2018-02-28/trivial-shell-20180228-git.tgz - MD5 d7b93648abd06be95148d43d09fa2ed0 NAME trivial-shell FILENAME - trivial-shell DEPS NIL DEPENDENCIES NIL VERSION 20180228-git SIBLINGS - (trivial-shell-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-types.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-types.nix deleted file mode 100644 index 4c3e920468..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-types.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-types"; - version = "20120407-git"; - - description = "Trivial type definitions"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz"; - sha256 = "0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx"; - }; - - packageName = "trivial-types"; - - asdFilesToKeep = ["trivial-types.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-types DESCRIPTION Trivial type definitions SHA256 - 0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx URL - http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz - MD5 b14dbe0564dcea33d8f4e852a612d7db NAME trivial-types FILENAME - trivial-types DEPS NIL DEPENDENCIES NIL VERSION 20120407-git SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-utf-8.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-utf-8.nix deleted file mode 100644 index 67e07fcd9f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-utf-8.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-utf-8"; - version = "20211209-git"; - - parasites = [ "trivial-utf-8/doc" "trivial-utf-8/tests" ]; - - description = "A small library for doing UTF-8-based input and output."; - - deps = [ args."mgl-pax" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-utf-8/2021-12-09/trivial-utf-8-20211209-git.tgz"; - sha256 = "1bis8shbdva1diwms2lvhlbdz9rvazqqxi9h8d33vlbw4xai075y"; - }; - - packageName = "trivial-utf-8"; - - asdFilesToKeep = ["trivial-utf-8.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-utf-8 DESCRIPTION - A small library for doing UTF-8-based input and output. SHA256 - 1bis8shbdva1diwms2lvhlbdz9rvazqqxi9h8d33vlbw4xai075y URL - http://beta.quicklisp.org/archive/trivial-utf-8/2021-12-09/trivial-utf-8-20211209-git.tgz - MD5 65603f3c4421a93d5d8c214bb406988d NAME trivial-utf-8 FILENAME - trivial-utf-8 DEPS ((NAME mgl-pax FILENAME mgl-pax)) DEPENDENCIES (mgl-pax) - VERSION 20211209-git SIBLINGS NIL PARASITES - (trivial-utf-8/doc trivial-utf-8/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-with-current-source-form.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-with-current-source-form.nix deleted file mode 100644 index 5423ac293d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/trivial-with-current-source-form.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "trivial-with-current-source-form"; - version = "20211020-git"; - - description = "Helps macro writers produce better errors for macro users"; - - deps = [ args."alexandria" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/trivial-with-current-source-form/2021-10-20/trivial-with-current-source-form-20211020-git.tgz"; - sha256 = "03x8yx5hqfydxbdy9nxpaqn6yfjv7hvw8idscx66ns4qcpw6p825"; - }; - - packageName = "trivial-with-current-source-form"; - - asdFilesToKeep = ["trivial-with-current-source-form.asd"]; - overrides = x: x; -} -/* (SYSTEM trivial-with-current-source-form DESCRIPTION - Helps macro writers produce better errors for macro users SHA256 - 03x8yx5hqfydxbdy9nxpaqn6yfjv7hvw8idscx66ns4qcpw6p825 URL - http://beta.quicklisp.org/archive/trivial-with-current-source-form/2021-10-20/trivial-with-current-source-form-20211020-git.tgz - MD5 b4a3721cbef6101de1c43c540b446efc NAME trivial-with-current-source-form - FILENAME trivial-with-current-source-form DEPS - ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION - 20211020-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/type-i.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/type-i.nix deleted file mode 100644 index b2effb167c..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/type-i.nix +++ /dev/null @@ -1,38 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "type-i"; - version = "20191227-git"; - - description = "Type Inference Utility on Fundamentally 1-arg Predicates"; - - deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz"; - sha256 = "0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5"; - }; - - packageName = "type-i"; - - asdFilesToKeep = ["type-i.asd"]; - overrides = x: x; -} -/* (SYSTEM type-i DESCRIPTION - Type Inference Utility on Fundamentally 1-arg Predicates SHA256 - 0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5 URL - http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz - MD5 af344179d3f97b836d1e3106f8d1c306 NAME type-i FILENAME type-i DEPS - ((NAME alexandria FILENAME alexandria) - (NAME closer-mop FILENAME closer-mop) - (NAME introspect-environment FILENAME introspect-environment) - (NAME lisp-namespace FILENAME lisp-namespace) - (NAME trivia.level0 FILENAME trivia_dot_level0) - (NAME trivia.level1 FILENAME trivia_dot_level1) - (NAME trivia.level2 FILENAME trivia_dot_level2) - (NAME trivia.trivial FILENAME trivia_dot_trivial) - (NAME trivial-cltl2 FILENAME trivial-cltl2)) - DEPENDENCIES - (alexandria closer-mop introspect-environment lisp-namespace trivia.level0 - trivia.level1 trivia.level2 trivia.trivial trivial-cltl2) - VERSION 20191227-git SIBLINGS (type-i.test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uax-15.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uax-15.nix deleted file mode 100644 index c87e149673..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uax-15.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "uax-15"; - version = "20211209-git"; - - parasites = [ "uax-15/tests" ]; - - description = "Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)"; - - deps = [ args."cl-ppcre" args."parachute" args."split-sequence" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/uax-15/2021-12-09/uax-15-20211209-git.tgz"; - sha256 = "0haqp2vgnwq6p4j44xz0xzz4lcf15pj3pla4ybnpral2218j2cdz"; - }; - - packageName = "uax-15"; - - asdFilesToKeep = ["uax-15.asd"]; - overrides = x: x; -} -/* (SYSTEM uax-15 DESCRIPTION - Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15) - SHA256 0haqp2vgnwq6p4j44xz0xzz4lcf15pj3pla4ybnpral2218j2cdz URL - http://beta.quicklisp.org/archive/uax-15/2021-12-09/uax-15-20211209-git.tgz - MD5 431f4e399305c7ed8d3ce151ea6ff132 NAME uax-15 FILENAME uax-15 DEPS - ((NAME cl-ppcre FILENAME cl-ppcre) (NAME parachute FILENAME parachute) - (NAME split-sequence FILENAME split-sequence)) - DEPENDENCIES (cl-ppcre parachute split-sequence) VERSION 20211209-git - SIBLINGS NIL PARASITES (uax-15/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uffi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uffi.nix deleted file mode 100644 index 222e2634a4..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uffi.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "uffi"; - version = "20180228-git"; - - description = "Universal Foreign Function Library for Common Lisp"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz"; - sha256 = "1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479"; - }; - - packageName = "uffi"; - - asdFilesToKeep = ["uffi.asd"]; - overrides = x: x; -} -/* (SYSTEM uffi DESCRIPTION Universal Foreign Function Library for Common Lisp - SHA256 1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479 URL - http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz MD5 - b0dfb2f966912f4797327948aa7e9119 NAME uffi FILENAME uffi DEPS NIL - DEPENDENCIES NIL VERSION 20180228-git SIBLINGS (uffi-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uiop.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uiop.nix deleted file mode 100644 index fcc02004ea..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uiop.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "uiop"; - version = "3.3.5"; - - description = "System lacks description"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/uiop/2021-08-07/uiop-3.3.5.tgz"; - sha256 = "19bskbcv413ix2rjqlbj9y62qbm6780s5i7h00rvpd488nnrvaqk"; - }; - - packageName = "uiop"; - - asdFilesToKeep = ["uiop.asd"]; - overrides = x: x; -} -/* (SYSTEM uiop DESCRIPTION System lacks description SHA256 - 19bskbcv413ix2rjqlbj9y62qbm6780s5i7h00rvpd488nnrvaqk URL - http://beta.quicklisp.org/archive/uiop/2021-08-07/uiop-3.3.5.tgz MD5 - 831138297c2ac03189d25bb6b03b919c NAME uiop FILENAME uiop DEPS NIL - DEPENDENCIES NIL VERSION 3.3.5 SIBLINGS (asdf-driver) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/unit-test.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/unit-test.nix deleted file mode 100644 index 17ac69cafb..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/unit-test.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "unit-test"; - version = "20120520-git"; - - description = "unit-testing framework for common lisp"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz"; - sha256 = "1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l"; - }; - - packageName = "unit-test"; - - asdFilesToKeep = ["unit-test.asd"]; - overrides = x: x; -} -/* (SYSTEM unit-test DESCRIPTION unit-testing framework for common lisp SHA256 - 1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l URL - http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz - MD5 ffcde1c03dd33862cd4f7288649c3cbc NAME unit-test FILENAME unit-test DEPS - NIL DEPENDENCIES NIL VERSION 20120520-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/unix-options.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/unix-options.nix deleted file mode 100644 index 5cb97238b6..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/unix-options.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "unix-options"; - version = "20151031-git"; - - description = "Easy to use command line option parser"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz"; - sha256 = "0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5"; - }; - - packageName = "unix-options"; - - asdFilesToKeep = ["unix-options.asd"]; - overrides = x: x; -} -/* (SYSTEM unix-options DESCRIPTION Easy to use command line option parser - SHA256 0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5 URL - http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz - MD5 3bbdeafbef3e7a2e94b9756bf173f636 NAME unix-options FILENAME - unix-options DEPS NIL DEPENDENCIES NIL VERSION 20151031-git SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/unix-opts.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/unix-opts.nix deleted file mode 100644 index 759a8f9b31..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/unix-opts.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "unix-opts"; - version = "20210124-git"; - - parasites = [ "unix-opts/tests" ]; - - description = "minimalistic parser of command line arguments"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/unix-opts/2021-01-24/unix-opts-20210124-git.tgz"; - sha256 = "1gjjav035n6297vgc4wi3i64516b8sdyi0d02q0nwicciwg6mwsn"; - }; - - packageName = "unix-opts"; - - asdFilesToKeep = ["unix-opts.asd"]; - overrides = x: x; -} -/* (SYSTEM unix-opts DESCRIPTION minimalistic parser of command line arguments - SHA256 1gjjav035n6297vgc4wi3i64516b8sdyi0d02q0nwicciwg6mwsn URL - http://beta.quicklisp.org/archive/unix-opts/2021-01-24/unix-opts-20210124-git.tgz - MD5 c75d3233c0f2e16793b1ce19bfc83811 NAME unix-opts FILENAME unix-opts DEPS - NIL DEPENDENCIES NIL VERSION 20210124-git SIBLINGS NIL PARASITES - (unix-opts/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/usocket-server.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/usocket-server.nix deleted file mode 100644 index c1b24f691a..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/usocket-server.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "usocket-server"; - version = "usocket-0.8.3"; - - description = "Universal socket library for Common Lisp (server side)"; - - deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz"; - sha256 = "19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7"; - }; - - packageName = "usocket-server"; - - asdFilesToKeep = ["usocket-server.asd"]; - overrides = x: x; -} -/* (SYSTEM usocket-server DESCRIPTION - Universal socket library for Common Lisp (server side) SHA256 - 19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7 URL - http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz MD5 - b1103034f32565487ab3b6eb92c0ca2b NAME usocket-server FILENAME - usocket-server DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME split-sequence FILENAME split-sequence) - (NAME usocket FILENAME usocket)) - DEPENDENCIES (alexandria bordeaux-threads split-sequence usocket) VERSION - usocket-0.8.3 SIBLINGS (usocket-test usocket) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/usocket.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/usocket.nix deleted file mode 100644 index 034f36bda7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/usocket.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "usocket"; - version = "0.8.3"; - - description = "Universal socket library for Common Lisp"; - - deps = [ args."split-sequence" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz"; - sha256 = "19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7"; - }; - - packageName = "usocket"; - - asdFilesToKeep = ["usocket.asd"]; - overrides = x: x; -} -/* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256 - 19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7 URL - http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz MD5 - b1103034f32565487ab3b6eb92c0ca2b NAME usocket FILENAME usocket DEPS - ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES - (split-sequence) VERSION 0.8.3 SIBLINGS (usocket-server usocket-test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/utilities_dot_print-items.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/utilities_dot_print-items.nix deleted file mode 100644 index 1e9decab32..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/utilities_dot_print-items.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "utilities_dot_print-items"; - version = "20210411-git"; - - parasites = [ "utilities.print-items/test" ]; - - description = "A protocol for flexible and composable printing."; - - deps = [ args."alexandria" args."fiveam" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/utilities.print-items/2021-04-11/utilities.print-items-20210411-git.tgz"; - sha256 = "0da2m4b993w31wph2ybdmdd6rycadrp44ccjdba5pygpkf3x00gx"; - }; - - packageName = "utilities.print-items"; - - asdFilesToKeep = ["utilities.print-items.asd"]; - overrides = x: x; -} -/* (SYSTEM utilities.print-items DESCRIPTION - A protocol for flexible and composable printing. SHA256 - 0da2m4b993w31wph2ybdmdd6rycadrp44ccjdba5pygpkf3x00gx URL - http://beta.quicklisp.org/archive/utilities.print-items/2021-04-11/utilities.print-items-20210411-git.tgz - MD5 35be0e5ee4c957699082fb6ae8f14ef2 NAME utilities.print-items FILENAME - utilities_dot_print-items DEPS - ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION 20210411-git SIBLINGS NIL - PARASITES (utilities.print-items/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/utilities_dot_print-tree.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/utilities_dot_print-tree.nix deleted file mode 100644 index ecb9aafbb3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/utilities_dot_print-tree.nix +++ /dev/null @@ -1,32 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "utilities_dot_print-tree"; - version = "20200325-git"; - - parasites = [ "utilities.print-tree/test" ]; - - description = "This system provides simple facilities for printing tree structures."; - - deps = [ args."alexandria" args."fiveam" args."uiop" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz"; - sha256 = "1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww"; - }; - - packageName = "utilities.print-tree"; - - asdFilesToKeep = ["utilities.print-tree.asd"]; - overrides = x: x; -} -/* (SYSTEM utilities.print-tree DESCRIPTION - This system provides simple facilities for printing tree structures. SHA256 - 1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww URL - http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz - MD5 618bf5b42c415a44a1566f4f96a2c69a NAME utilities.print-tree FILENAME - utilities_dot_print-tree DEPS - ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam) - (NAME uiop FILENAME uiop)) - DEPENDENCIES (alexandria fiveam uiop) VERSION 20200325-git SIBLINGS NIL - PARASITES (utilities.print-tree/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uuid.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uuid.nix deleted file mode 100644 index 32142fcb02..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/uuid.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "uuid"; - version = "20200715-git"; - - description = "UUID Generation"; - - deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."trivial-utf-8" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz"; - sha256 = "1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0"; - }; - - packageName = "uuid"; - - asdFilesToKeep = ["uuid.asd"]; - overrides = x: x; -} -/* (SYSTEM uuid DESCRIPTION UUID Generation SHA256 - 1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0 URL - http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz MD5 - e550de5e4e0f8cc9dc92aff0b488a991 NAME uuid FILENAME uuid DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME ironclad FILENAME ironclad) - (NAME trivial-utf-8 FILENAME trivial-utf-8)) - DEPENDENCIES (alexandria bordeaux-threads ironclad trivial-utf-8) VERSION - 20200715-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/varjo.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/varjo.nix deleted file mode 100644 index c69acab7ba..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/varjo.nix +++ /dev/null @@ -1,39 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "varjo"; - version = "release-quicklisp-92f9c75b-git"; - - description = "Common Lisp -> GLSL Compiler"; - - deps = [ args."alexandria" args."cl-ppcre" args."documentation-utils" args."fn" args."glsl-docs" args."glsl-spec" args."glsl-symbols" args."named-readtables" args."parse-float" args."trivial-indent" args."uiop" args."vas-string-metrics" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz"; - sha256 = "0xxi2ivjz3fqgw2nxzshf9m7ppvzv7wdg20lr0krq14i8j5gf5jy"; - }; - - packageName = "varjo"; - - asdFilesToKeep = ["varjo.asd"]; - overrides = x: x; -} -/* (SYSTEM varjo DESCRIPTION Common Lisp -> GLSL Compiler SHA256 - 0xxi2ivjz3fqgw2nxzshf9m7ppvzv7wdg20lr0krq14i8j5gf5jy URL - http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz - MD5 78a3b8021885ebfab4015e20b885cdcf NAME varjo FILENAME varjo DEPS - ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME documentation-utils FILENAME documentation-utils) - (NAME fn FILENAME fn) (NAME glsl-docs FILENAME glsl-docs) - (NAME glsl-spec FILENAME glsl-spec) - (NAME glsl-symbols FILENAME glsl-symbols) - (NAME named-readtables FILENAME named-readtables) - (NAME parse-float FILENAME parse-float) - (NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop) - (NAME vas-string-metrics FILENAME vas-string-metrics)) - DEPENDENCIES - (alexandria cl-ppcre documentation-utils fn glsl-docs glsl-spec - glsl-symbols named-readtables parse-float trivial-indent uiop - vas-string-metrics) - VERSION release-quicklisp-92f9c75b-git SIBLINGS (varjo.import varjo.tests) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/vas-string-metrics.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/vas-string-metrics.nix deleted file mode 100644 index 7b8e125ac9..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/vas-string-metrics.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "vas-string-metrics"; - version = "20211209-git"; - - description = "Jaro-Winkler and Levenshtein string distance algorithms."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/vas-string-metrics/2021-12-09/vas-string-metrics-20211209-git.tgz"; - sha256 = "0q8zzfmwprjw6wmj8aifizx06xw9yrq0c8qhwhrak62cyz9lvf8n"; - }; - - packageName = "vas-string-metrics"; - - asdFilesToKeep = ["vas-string-metrics.asd"]; - overrides = x: x; -} -/* (SYSTEM vas-string-metrics DESCRIPTION - Jaro-Winkler and Levenshtein string distance algorithms. SHA256 - 0q8zzfmwprjw6wmj8aifizx06xw9yrq0c8qhwhrak62cyz9lvf8n URL - http://beta.quicklisp.org/archive/vas-string-metrics/2021-12-09/vas-string-metrics-20211209-git.tgz - MD5 b1264bac0f9516d9617397e1b7a7c20e NAME vas-string-metrics FILENAME - vas-string-metrics DEPS NIL DEPENDENCIES NIL VERSION 20211209-git SIBLINGS - (test.vas-string-metrics) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/vecto.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/vecto.nix deleted file mode 100644 index 2ce2ac8340..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/vecto.nix +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "vecto"; - version = "1.5"; - - description = "Create vector graphics in PNG files."; - - deps = [ args."cl-aa" args."cl-paths" args."cl-vectors" args."salza2" args."trivial-gray-streams" args."zpb-ttf" args."zpng" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/vecto/2017-12-27/vecto-1.5.tgz"; - sha256 = "05pxc6s853f67j57bbzsg2izfl0164bifbvdp2ji870yziz88vls"; - }; - - packageName = "vecto"; - - asdFilesToKeep = ["vecto.asd"]; - overrides = x: x; -} -/* (SYSTEM vecto DESCRIPTION Create vector graphics in PNG files. SHA256 - 05pxc6s853f67j57bbzsg2izfl0164bifbvdp2ji870yziz88vls URL - http://beta.quicklisp.org/archive/vecto/2017-12-27/vecto-1.5.tgz MD5 - 69e6b2f7fa10066d50f9134942afad73 NAME vecto FILENAME vecto DEPS - ((NAME cl-aa FILENAME cl-aa) (NAME cl-paths FILENAME cl-paths) - (NAME cl-vectors FILENAME cl-vectors) (NAME salza2 FILENAME salza2) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME zpb-ttf FILENAME zpb-ttf) (NAME zpng FILENAME zpng)) - DEPENDENCIES - (cl-aa cl-paths cl-vectors salza2 trivial-gray-streams zpb-ttf zpng) - VERSION 1.5 SIBLINGS (vectometry) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/vom.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/vom.nix deleted file mode 100644 index 39165dc955..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/vom.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "vom"; - version = "20160825-git"; - - description = "A tiny logging utility."; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz"; - sha256 = "0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93"; - }; - - packageName = "vom"; - - asdFilesToKeep = ["vom.asd"]; - overrides = x: x; -} -/* (SYSTEM vom DESCRIPTION A tiny logging utility. SHA256 - 0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93 URL - http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz MD5 - ad16bdc0221b08de371be6ce25ce3d47 NAME vom FILENAME vom DEPS NIL - DEPENDENCIES NIL VERSION 20160825-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/wild-package-inferred-system.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/wild-package-inferred-system.nix deleted file mode 100644 index 989c94b265..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/wild-package-inferred-system.nix +++ /dev/null @@ -1,30 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "wild-package-inferred-system"; - version = "20200325-git"; - - parasites = [ "wild-package-inferred-system/test" ]; - - description = "Introduces the wildcards `*' and `**' into package-inferred-system"; - - deps = [ args."fiveam" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/wild-package-inferred-system/2020-03-25/wild-package-inferred-system-20200325-git.tgz"; - sha256 = "1ypnpzy9z4zkna29sgl4afc386ksa61302bm5kznxb3zz2v1sjas"; - }; - - packageName = "wild-package-inferred-system"; - - asdFilesToKeep = ["wild-package-inferred-system.asd"]; - overrides = x: x; -} -/* (SYSTEM wild-package-inferred-system DESCRIPTION - Introduces the wildcards `*' and `**' into package-inferred-system SHA256 - 1ypnpzy9z4zkna29sgl4afc386ksa61302bm5kznxb3zz2v1sjas URL - http://beta.quicklisp.org/archive/wild-package-inferred-system/2020-03-25/wild-package-inferred-system-20200325-git.tgz - MD5 4dfd9f90d780b1e67640543dd4acbf21 NAME wild-package-inferred-system - FILENAME wild-package-inferred-system DEPS ((NAME fiveam FILENAME fiveam)) - DEPENDENCIES (fiveam) VERSION 20200325-git SIBLINGS (foo-wild) PARASITES - (wild-package-inferred-system/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/woo.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/woo.nix deleted file mode 100644 index b502989b51..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/woo.nix +++ /dev/null @@ -1,47 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "woo"; - version = "20211209-git"; - - description = "An asynchronous HTTP server written in Common Lisp"; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/woo/2021-12-09/woo-20211209-git.tgz"; - sha256 = "0pm4l4sp3zgygkhjzd03kjjk032m5cra628fs25lvcshbrpmkcp3"; - }; - - packageName = "woo"; - - asdFilesToKeep = ["woo.asd"]; - overrides = x: x; -} -/* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp - SHA256 0pm4l4sp3zgygkhjzd03kjjk032m5cra628fs25lvcshbrpmkcp3 URL - http://beta.quicklisp.org/archive/woo/2021-12-09/woo-20211209-git.tgz MD5 - 8f4926c010491996b1ffe39882fafb2b NAME woo FILENAME woo DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME cl-utilities FILENAME cl-utilities) - (NAME clack-socket FILENAME clack-socket) - (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) - (NAME flexi-streams FILENAME flexi-streams) (NAME lev FILENAME lev) - (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) - (NAME smart-buffer FILENAME smart-buffer) - (NAME split-sequence FILENAME split-sequence) - (NAME static-vectors FILENAME static-vectors) - (NAME swap-bytes FILENAME swap-bytes) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME vom FILENAME vom) - (NAME xsubseq FILENAME xsubseq)) - DEPENDENCIES - (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain - cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse - quri smart-buffer split-sequence static-vectors swap-bytes - trivial-features trivial-gray-streams trivial-utf-8 vom xsubseq) - VERSION 20211209-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/wookie.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/wookie.nix deleted file mode 100644 index 6e5800d473..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/wookie.nix +++ /dev/null @@ -1,52 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "wookie"; - version = "20191130-git"; - - description = "An evented webserver for Common Lisp."; - - deps = [ args."alexandria" args."babel" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz"; - sha256 = "13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2"; - }; - - packageName = "wookie"; - - asdFilesToKeep = ["wookie.asd"]; - overrides = x: x; -} -/* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256 - 13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2 URL - http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz - MD5 5e5d6537637312919fd528bb1d0c1eba NAME wookie FILENAME wookie DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME blackbird FILENAME blackbird) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) - (NAME cffi-toolchain FILENAME cffi-toolchain) - (NAME chunga FILENAME chunga) (NAME cl-async FILENAME cl-async) - (NAME cl-async-base FILENAME cl-async-base) - (NAME cl-async-ssl FILENAME cl-async-ssl) - (NAME cl-async-util FILENAME cl-async-util) (NAME cl-fad FILENAME cl-fad) - (NAME cl-libuv FILENAME cl-libuv) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-utilities FILENAME cl-utilities) - (NAME do-urlencode FILENAME do-urlencode) - (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) - (NAME flexi-streams FILENAME flexi-streams) - (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) - (NAME smart-buffer FILENAME smart-buffer) - (NAME split-sequence FILENAME split-sequence) - (NAME static-vectors FILENAME static-vectors) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME vom FILENAME vom) (NAME xsubseq FILENAME xsubseq)) - DEPENDENCIES - (alexandria babel blackbird bordeaux-threads cffi cffi-grovel - cffi-toolchain chunga cl-async cl-async-base cl-async-ssl cl-async-util - cl-fad cl-libuv cl-ppcre cl-utilities do-urlencode fast-http fast-io - flexi-streams proc-parse quri smart-buffer split-sequence static-vectors - trivial-features trivial-gray-streams vom xsubseq) - VERSION 20191130-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xembed.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xembed.nix deleted file mode 100644 index f44a128dc3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xembed.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "xembed"; - version = "clx-20191130-git"; - - description = "An implementation of the XEMBED protocol that integrates with CLX."; - - deps = [ args."clx" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz"; - sha256 = "1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd"; - }; - - packageName = "xembed"; - - asdFilesToKeep = ["xembed.asd"]; - overrides = x: x; -} -/* (SYSTEM xembed DESCRIPTION - An implementation of the XEMBED protocol that integrates with CLX. SHA256 - 1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd URL - http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz - MD5 11d35eeb734c0694005a5e5cec4cad22 NAME xembed FILENAME xembed DEPS - ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20191130-git - SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xkeyboard.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xkeyboard.nix deleted file mode 100644 index 34b0476bfb..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xkeyboard.nix +++ /dev/null @@ -1,29 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "xkeyboard"; - version = "clx-20120811-git"; - - parasites = [ "xkeyboard-test" ]; - - description = "XKeyboard is X11 extension for clx of the same name."; - - deps = [ args."clx" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz"; - sha256 = "11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n"; - }; - - packageName = "xkeyboard"; - - asdFilesToKeep = ["xkeyboard.asd"]; - overrides = x: x; -} -/* (SYSTEM xkeyboard DESCRIPTION - XKeyboard is X11 extension for clx of the same name. SHA256 - 11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n URL - http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz - MD5 4e382b34e05d33f5de8e9c9dea33131c NAME xkeyboard FILENAME xkeyboard DEPS - ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20120811-git - SIBLINGS NIL PARASITES (xkeyboard-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xml_dot_location.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xml_dot_location.nix deleted file mode 100644 index a7d23952d8..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xml_dot_location.nix +++ /dev/null @@ -1,48 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "xml_dot_location"; - version = "20200325-git"; - - parasites = [ "xml.location/test" ]; - - description = "This system provides a convenient interface for - manipulating XML data. It is inspired by the xmltio library."; - - deps = [ args."alexandria" args."anaphora" args."babel" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."cxml-stp" args."iterate" args."let-plus" args."lift" args."more-conditions" args."parse-number" args."puri" args."split-sequence" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz"; - sha256 = "0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx"; - }; - - packageName = "xml.location"; - - asdFilesToKeep = ["xml.location.asd"]; - overrides = x: x; -} -/* (SYSTEM xml.location DESCRIPTION - This system provides a convenient interface for - manipulating XML data. It is inspired by the xmltio library. - SHA256 0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx URL - http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz - MD5 90cf4fd2450ba562c7f9657391dacb1d NAME xml.location FILENAME - xml_dot_location DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME closer-mop FILENAME closer-mop) - (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) - (NAME cxml-stp FILENAME cxml-stp) (NAME iterate FILENAME iterate) - (NAME let-plus FILENAME let-plus) (NAME lift FILENAME lift) - (NAME more-conditions FILENAME more-conditions) - (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc)) - DEPENDENCIES - (alexandria anaphora babel cl-ppcre closer-mop closure-common cxml cxml-stp - iterate let-plus lift more-conditions parse-number puri split-sequence - trivial-features trivial-gray-streams xpath yacc) - VERSION 20200325-git SIBLINGS (xml.location-and-local-time) PARASITES - (xml.location/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xmls.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xmls.nix deleted file mode 100644 index 9dec677b6d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xmls.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "xmls"; - version = "3.0.2"; - - parasites = [ "xmls/test" "xmls/unit-test" ]; - - description = "System lacks description"; - - deps = [ args."fiveam" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz"; - sha256 = "1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi"; - }; - - packageName = "xmls"; - - asdFilesToKeep = ["xmls.asd"]; - overrides = x: x; -} -/* (SYSTEM xmls DESCRIPTION System lacks description SHA256 - 1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi URL - http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz MD5 - 2462bab4a5d74e87ef7bdef41cd06dc8 NAME xmls FILENAME xmls DEPS - ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION 3.0.2 - SIBLINGS NIL PARASITES (xmls/test xmls/unit-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xpath.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xpath.nix deleted file mode 100644 index dc47f866e3..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xpath.nix +++ /dev/null @@ -1,38 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "xpath"; - version = "plexippus-20190521-git"; - - parasites = [ "xpath/test" ]; - - description = "An implementation of the XML Path Language (XPath) Version 1.0"; - - deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz"; - sha256 = "15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa"; - }; - - packageName = "xpath"; - - asdFilesToKeep = ["xpath.asd"]; - overrides = x: x; -} -/* (SYSTEM xpath DESCRIPTION - An implementation of the XML Path Language (XPath) Version 1.0 SHA256 - 15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa URL - http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz - MD5 eb9a4c39a7c37aa0338c401713b3f944 NAME xpath FILENAME xpath DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cl-ppcre FILENAME cl-ppcre) - (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) - (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME yacc FILENAME yacc)) - DEPENDENCIES - (alexandria babel cl-ppcre closure-common cxml parse-number puri - trivial-features trivial-gray-streams yacc) - VERSION plexippus-20190521-git SIBLINGS NIL PARASITES (xpath/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xsubseq.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xsubseq.nix deleted file mode 100644 index 364b714433..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/xsubseq.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "xsubseq"; - version = "20170830-git"; - - description = "Efficient way to manage \"subseq\"s in Common Lisp"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz"; - sha256 = "1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml"; - }; - - packageName = "xsubseq"; - - asdFilesToKeep = ["xsubseq.asd"]; - overrides = x: x; -} -/* (SYSTEM xsubseq DESCRIPTION Efficient way to manage "subseq"s in Common Lisp - SHA256 1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml URL - http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz - MD5 960bb8f329649b6e4b820e065e6b38e8 NAME xsubseq FILENAME xsubseq DEPS NIL - DEPENDENCIES NIL VERSION 20170830-git SIBLINGS (xsubseq-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/yacc.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/yacc.nix deleted file mode 100644 index 79b49a86be..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/yacc.nix +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "yacc"; - version = "cl-20101006-darcs"; - - description = "A LALR(1) parser generator for Common Lisp"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz"; - sha256 = "0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7"; - }; - - packageName = "yacc"; - - asdFilesToKeep = ["yacc.asd"]; - overrides = x: x; -} -/* (SYSTEM yacc DESCRIPTION A LALR(1) parser generator for Common Lisp SHA256 - 0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7 URL - http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz - MD5 748b9d59de8be3ccfdf0f001e15972ba NAME yacc FILENAME yacc DEPS NIL - DEPENDENCIES NIL VERSION cl-20101006-darcs SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/yason.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/yason.nix deleted file mode 100644 index aa06097e75..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/yason.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "yason"; - version = "v0.7.8"; - - description = "JSON parser/encoder"; - - deps = [ args."alexandria" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz"; - sha256 = "11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1"; - }; - - packageName = "yason"; - - asdFilesToKeep = ["yason.asd"]; - overrides = x: x; -} -/* (SYSTEM yason DESCRIPTION JSON parser/encoder SHA256 - 11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1 URL - http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz MD5 - 7c3231635aa494f1721273713ea8c56a NAME yason FILENAME yason DEPS - ((NAME alexandria FILENAME alexandria) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria trivial-gray-streams) VERSION v0.7.8 SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/zpb-ttf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/zpb-ttf.nix deleted file mode 100644 index dece0b5126..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/zpb-ttf.nix +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "zpb-ttf"; - version = "release-1.0.4"; - - description = "Access TrueType font metrics and outlines from Common Lisp"; - - deps = [ ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/zpb-ttf/2021-01-24/zpb-ttf-release-1.0.4.tgz"; - sha256 = "186jzhmklby2pkmwv3zxw09qh8023f7w5ng2ql46l6abx146s3ll"; - }; - - packageName = "zpb-ttf"; - - asdFilesToKeep = ["zpb-ttf.asd"]; - overrides = x: x; -} -/* (SYSTEM zpb-ttf DESCRIPTION - Access TrueType font metrics and outlines from Common Lisp SHA256 - 186jzhmklby2pkmwv3zxw09qh8023f7w5ng2ql46l6abx146s3ll URL - http://beta.quicklisp.org/archive/zpb-ttf/2021-01-24/zpb-ttf-release-1.0.4.tgz - MD5 b66f67b0a1fc347657d4d71ddb304920 NAME zpb-ttf FILENAME zpb-ttf DEPS NIL - DEPENDENCIES NIL VERSION release-1.0.4 SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/zpng.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/zpng.nix deleted file mode 100644 index 5b62f74dd8..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-output/zpng.nix +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "zpng"; - version = "1.2.2"; - - description = "Create PNG files"; - - deps = [ args."salza2" args."trivial-gray-streams" ]; - - src = fetchurl { - url = "http://beta.quicklisp.org/archive/zpng/2015-04-07/zpng-1.2.2.tgz"; - sha256 = "0932gq9wncibm1z81gbvdc3ip6n118wwzmjnpxaqdy9hk5bs2w1x"; - }; - - packageName = "zpng"; - - asdFilesToKeep = ["zpng.asd"]; - overrides = x: x; -} -/* (SYSTEM zpng DESCRIPTION Create PNG files SHA256 - 0932gq9wncibm1z81gbvdc3ip6n118wwzmjnpxaqdy9hk5bs2w1x URL - http://beta.quicklisp.org/archive/zpng/2015-04-07/zpng-1.2.2.tgz MD5 - 0a208f4ce0087ef578d477341d5f4078 NAME zpng FILENAME zpng DEPS - ((NAME salza2 FILENAME salza2) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (salza2 trivial-gray-streams) VERSION 1.2.2 SIBLINGS NIL - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-overrides.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-overrides.nix deleted file mode 100644 index 00b094dc9f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix-overrides.nix +++ /dev/null @@ -1,295 +0,0 @@ -{pkgs, clwrapper, quicklisp-to-nix-packages}: -let - addNativeLibs = libs: x: { propagatedBuildInputs = libs; }; - skipBuildPhase = x: { - overrides = y: ((x.overrides y) // { buildPhase = "true"; }); - }; - multiOverride = l: x: pkgs.lib.optionalAttrs (l != []) (((builtins.head l) x) // (multiOverride (builtins.tail l) x)); - lispName = (clwrapper.lisp.pname or (builtins.parseDrvName clwrapper.lisp.name).name); - ifLispIn = l: f: if (pkgs.lib.elem lispName l) then f else (x: {}); - ifLispNotIn = l: f: if ! (pkgs.lib.elem lispName l) then f else (x: {}); - extraLispDeps = l: x: { deps = x.deps ++ l; }; -in -{ - stumpwm = x:{ - overrides = y: (x.overrides y) // { - linkedSystems = []; - preConfigure = '' - export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh"; - ''; - postInstall = '' - export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm \ - '(function stumpwm:stumpwm)' '$linkedSystems'" - "$out/bin/stumpwm-lisp-launcher.sh" - - cp "$out/lib/common-lisp/stumpwm/stumpwm" "$out/bin" - ''; - }; - }; - iterate = multiOverride [ skipBuildPhase - (ifLispNotIn ["sbcl" "gcl"] (x: { parasites=[]; }))]; - cl-fuse = x: { - propagatedBuildInputs = [pkgs.fuse]; - overrides = y : (x.overrides y) // { - configurePhase = '' - export makeFlags="$makeFlags LISP=common-lisp.sh" - ''; - preInstall = '' - type gcc - mkdir -p "$out/lib/common-lisp/" - cp -r . "$out/lib/common-lisp/cl-fuse/" - "gcc" "-x" "c" "$out/lib/common-lisp/cl-fuse/fuse-launcher.c-minus" "-fPIC" "--shared" "-lfuse" "-o" "$out/lib/common-lisp/cl-fuse/libfuse-launcher.so" - ''; - }; - }; - hunchentoot = addNativeLibs [pkgs.openssl]; - iolib = x: { - propagatedBuildInputs = (x.propagatedBuildInputs or []) - ++ (with pkgs; [libfixposix gcc]) - ; - overrides = y: (x.overrides y) // { - prePatch = '' - sed 's|default \"libfixposix\"|default \"${pkgs.libfixposix}/lib/libfixposix\"|' -i src/syscalls/ffi-functions-unix.lisp - # Socket tests don't work because they try to access the internet - sed 's/(:file "sockets" :depends-on ("pkgdcl" "defsuites"))//' -i iolib.asd - ''; - }; - - }; - cxml = skipBuildPhase; - wookie = addNativeLibs (with pkgs; [libuv openssl]); - lev = addNativeLibs [pkgs.libev]; - cl_plus_ssl = x: rec { - propagatedBuildInputs = [pkgs.openssl]; - overrides = y: (x.overrides y) // { - prePatch = '' - sed 's|libssl.so|${pkgs.lib.getLib pkgs.openssl}/lib/libssl.so|' -i src/reload.lisp - ''; - }; - }; - cl-colors = skipBuildPhase; - cl-libuv = addNativeLibs [pkgs.libuv]; - cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)]; - cl-async-test = addNativeLibs [pkgs.openssl]; - clsql = multiOverride [ (x: { - propagatedBuildInputs = with pkgs; [libmysqlclient postgresql sqlite zlib]; - overrides = y: (x.overrides y) // { - preConfigure = ((x.overrides y).preConfigure or "") + '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.libmysqlclient}/include/mysql" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.libmysqlclient}/lib/mysql" - '';};}) - (ifLispIn ["ecl" "clisp"] (x: { - deps = pkgs.lib.filter (x: x.outPath != quicklisp-to-nix-packages.uffi.outPath) - (x.deps ++ (with quicklisp-to-nix-packages; [cffi-uffi-compat])); - overrides = y: (x.overrides y) // { - postUnpack = '' - sed -e '1i(cl:push :clsql-cffi cl:*features*)' -i "$sourceRoot/clsql.asd" - ''; - }; - })) - ]; - clsql-postgresql-socket = ifLispIn ["ecl" "clisp"] (x: { - deps = pkgs.lib.filter (x: x.outPath != quicklisp-to-nix-packages.uffi.outPath) - (x.deps ++ (with quicklisp-to-nix-packages; [cffi-uffi-compat])); - overrides = y: (x.overrides y) // { - postUnpack = '' - sed -e '1i(cl:push :clsql-cffi cl:*features*)' -i "$sourceRoot/clsql-postgresql-socket.asd" - ''; - }; - }); - clx-truetype = skipBuildPhase; - query-fs = x: { - overrides = y: (x.overrides y) // { - linkedSystems = []; - postInstall = ((x.overrides y).postInstall or "") + '' - export NIX_LISP_ASDF_PATHS="$NIX_LISP_ASDF_PATHS -$out/lib/common-lisp/query-fs" - export HOME=$PWD - export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system query-fs \ - '(function query-fs:run-fs-with-cmdline-args)' '$linkedSystems'" - "$out/bin/query-fs-lisp-launcher.sh" - cp "$out/lib/common-lisp/query-fs/query-fs" "$out/bin/" - ''; - }; - }; - cffi = addNativeLibs [pkgs.libffi]; - cl-mysql = x: { - propagatedBuildInputs = [pkgs.libmysqlclient]; - overrides = y: (x.overrides y) // { - prePatch = ((x.overrides y).prePatch or "") + '' - sed -i 's,libmysqlclient_r,${pkgs.libmysqlclient}/lib/mysql/libmysqlclient_r,' system.lisp - ''; - }; - }; - cl-ppcre-template = x: { - overrides = y: (x.overrides y) // { - postPatch = '' - ln -s lib-dependent/*.asd . - ''; - }; - }; - sqlite = x: { - propagatedBuildInputs = [pkgs.sqlite]; - overrides = y: (x.overrides y) // { - prePatch = ((x.overrides y).preConfigure or "") + '' - sed 's|libsqlite3|${pkgs.sqlite.out}/lib/libsqlite3|' -i sqlite-ffi.lisp - ''; - }; - }; - swank = x: { - overrides = y: (x.overrides y) // { - postPatch = '' - patch <" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."<% @var filename %>" or (x: {})) - (import ./quicklisp-to-nix-output/<% @var filename %>.nix { - inherit fetchurl;<% @loop deps %> - "<% @var filename %>" = quicklisp-to-nix-packages."<% @var filename %>";<% @endloop %> - })); diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/nix-package.emb b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/nix-package.emb deleted file mode 100644 index 6b0940ba55..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/nix-package.emb +++ /dev/null @@ -1,23 +0,0 @@ -/* Generated file. */ -args @ { fetchurl, ... }: -rec { - baseName = "<% @var filename %>"; - version = "<% @var version %>";<% @if parasites %> - - parasites = [<% (dolist (p (getf env :parasites)) (format t " \"~A\"" p)) %> ];<% @endif %> - - description = <%= (format nil "~s" (cl-emb::getf-emb "description")) %>; - - deps = [ <% @loop deps %>args."<% @var filename %>" <% @endloop %>]; - - src = fetchurl { - url = "<% @var url %>"; - sha256 = "<% @var sha256 %>"; - }; - - packageName = "<% @var name %>"; - - asdFilesToKeep = ["<% @var name %>.asd"]; - overrides = x: x; -} -/* <%= cl-emb-intern::topenv %> */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/parasitic-invocation.emb b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/parasitic-invocation.emb deleted file mode 100644 index bdee1c6dcf..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/parasitic-invocation.emb +++ /dev/null @@ -1 +0,0 @@ - "<% @var filename %>" = quicklisp-to-nix-packages."<% @var host-filename %>"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/ql-to-nix.lisp b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/ql-to-nix.lisp deleted file mode 100644 index 4a82b6cafa..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/ql-to-nix.lisp +++ /dev/null @@ -1,327 +0,0 @@ -(unless (find-package :ql-to-nix-util) - (load "util.lisp")) -(unless (find-package :ql-to-nix-quicklisp-bootstrap) - (load "quicklisp-bootstrap.lisp")) -(defpackage :ql-to-nix - (:use :common-lisp :ql-to-nix-util :ql-to-nix-quicklisp-bootstrap)) -(in-package :ql-to-nix) - -;; We're going to pull in our dependencies at image dumping time in an -;; isolated quicklisp installation. Unfortunately, that means that we -;; can't yet access the symbols for our dependencies. We can probably -;; do better (by, say, loading these dependencies before this file), -;; but... - -(defvar *required-systems* nil) - -(push :cl-emb *required-systems*) -(wrap :cl-emb register-emb) -(wrap :cl-emb execute-emb) - -(push :external-program *required-systems*) -(wrap :external-program run) - -(push :cl-ppcre *required-systems*) -(wrap :cl-ppcre split) -(wrap :cl-ppcre regex-replace-all) -(wrap :cl-ppcre scan) - -(push :alexandria *required-systems*) -(wrap :alexandria read-file-into-string) -(wrap :alexandria write-string-into-file) - -(push :md5 *required-systems*) -(wrap :md5 md5sum-file) - -(wrap :ql-dist find-system) -(wrap :ql-dist release) -(wrap :ql-dist provided-systems) -(wrap :ql-dist archive-url) -(wrap :ql-dist local-archive-file) -(wrap :ql-dist ensure-local-archive-file) -(wrap :ql-dist archive-md5) -(wrap :ql-dist name) -(wrap :ql-dist short-description) - -(defun escape-filename (s) - (format - nil "~a~{~a~}" - (if (scan "^[a-zA-Z_]" s) "" "_") - (loop - for x in (map 'list 'identity s) - collect - (case x - (#\/ "_slash_") - (#\\ "_backslash_") - (#\_ "__") - (#\. "_dot_") - (#\+ "_plus_") - (t x))))) - -(defvar *system-info-bin* - (let* ((path (uiop:getenv "system-info")) - (path-dir (if (equal #\/ (aref path (1- (length path)))) - path - (concatenate 'string path "/"))) - (pathname (parse-namestring path-dir))) - (merge-pathnames #P"bin/quicklisp-to-nix-system-info" pathname)) - "The path to the quicklisp-to-nix-system-info binary.") - -(defvar *cache-dir* nil - "The folder where fasls will be cached.") - -(defun raw-system-info (system-name) - "Run quicklisp-to-nix-system-info on the given system and return the -form produced by the program." - (when *cache-dir* - (let ((command `(,*system-info-bin* "--cacheDir" ,(namestring *cache-dir*) ,system-name))) - (handler-case - (return-from raw-system-info - (read (make-string-input-stream (uiop:run-program command :output :string)))) - (error (e) - ;; Some systems don't like the funky caching that we're - ;; doing. That's okay. Let's try it uncached before we - ;; give up. - (warn "Unable to use cache for system ~A.~%~A" system-name e))))) - (read (make-string-input-stream (uiop:run-program `(,*system-info-bin* ,system-name) :output :string)))) - -(defvar *system-data-memoization-path* nil - "The path to the folder where fully-resolved system information can -be cached. - -If information for a system is found in this directory, `system-data' -will use it instead of re-computing the system data.") - -(defvar *system-data-in-memory-memoization* - (make-hash-table :test #'equalp)) - -(defun memoized-system-data-path (system) - "Return the path to the file that (if it exists) contains -pre-computed system data." - (when *system-data-memoization-path* - (merge-pathnames - (make-pathname - :name (escape-filename (string system)) - :type "txt") *system-data-memoization-path*))) - -(defun memoized-system-data (system) - "Attempts to locate memoized system data in the path specified by -`*system-data-memoization-path*'." - (multiple-value-bind (value found) (gethash system *system-data-in-memory-memoization*) - (when found - (return-from memoized-system-data (values value found)))) - (let ((path (memoized-system-data-path system))) - (unless path - (return-from memoized-system-data (values nil nil))) - (with-open-file (s path :if-does-not-exist nil :direction :input) - (unless s - (return-from memoized-system-data (values nil nil))) - (return-from memoized-system-data (values (read s) t))))) - -(defun set-memoized-system-data (system data) - "Store system data in the path specified by -`*system-data-memoization-path*'." - (setf (gethash system *system-data-in-memory-memoization*) data) - (let ((path (memoized-system-data-path system))) - (unless path - (return-from set-memoized-system-data data)) - (with-open-file (s path :direction :output :if-exists :supersede) - (format s "~W" data))) - data) - -(defun system-data (system) - "Examine a quicklisp system name and figure out everything that is -required to produce a nix package. - -This function stores results for memoization purposes in files within -`*system-data-memoization-path*'." - (multiple-value-bind (value found) (memoized-system-data system) - (when found - (return-from system-data value))) - (format t "Examining system ~A~%" system) - (let* ((system-info (raw-system-info system)) - (host (getf system-info :host)) - (host-name (getf system-info :host-name)) - (name (getf system-info :name))) - (when host - (return-from system-data - (set-memoized-system-data - system - (list - :system (getf system-info :system) - :host host - :filename (escape-filename name) - :host-filename (escape-filename host-name))))) - - (let* ((url (getf system-info :url)) - (sha256 (getf system-info :sha256)) - (archive-data (nix-prefetch-url url :expected-sha256 sha256)) - (archive-path (getf archive-data :path)) - (archive-md5 (string-downcase - (format nil "~{~16,2,'0r~}" - (map 'list 'identity (md5sum-file archive-path))))) - (stated-md5 (getf system-info :md5)) - (dependencies (getf system-info :dependencies)) - (deps (mapcar (lambda (x) (list :name x :filename (escape-filename x))) - dependencies)) - (description (getf system-info :description)) - (siblings (getf system-info :siblings)) - (release-name (getf system-info :release-name)) - (parasites (getf system-info :parasites)) - (version (regex-replace-all - (format nil "~a-" name) release-name ""))) - (assert (equal archive-md5 stated-md5)) - (set-memoized-system-data - system - (list - :system system - :description description - :sha256 sha256 - :url url - :md5 stated-md5 - :name name - :filename (escape-filename name) - :deps deps - :dependencies dependencies - :version version - :siblings siblings - :parasites parasites))))) - -(defun parasitic-p (data) - (getf data :host)) - -(defvar *loaded-from* (or *compile-file-truename* *load-truename*) - "Where this source file is located.") - -(defun this-file () - "Where this source file is located or an error." - (or *loaded-from* (error "Not sure where this file is located!"))) - -(defun nix-expression (system) - (execute-emb - "nix-package" - :env (system-data system))) - -(defun nix-invocation (system) - (let ((data (system-data system))) - (if (parasitic-p data) - (execute-emb - "parasitic-invocation" - :env data) - (execute-emb - "invocation" - :env data)))) - -(defun systems-closure (systems) - (let* - ((seen (make-hash-table :test 'equal))) - (loop - with queue := systems - with res := nil - while queue - for next := (pop queue) - for old := (gethash next seen) - for data := (unless old (system-data next)) - for deps := (getf data :dependencies) - for siblings := (getf data :siblings) - unless old do - (progn - (push next res) - (setf queue (append queue deps))) - do (setf (gethash next seen) t) - finally (return res)))) - -(defun ql-to-nix (target-directory) - (let* - ((systems - (split - (format nil "~%") - (read-file-into-string - (format nil "~a/quicklisp-to-nix-systems.txt" target-directory)))) - (closure (systems-closure systems)) - (invocations - (loop for s in closure - collect (list :code (nix-invocation s))))) - (loop - for s in closure - do (unless (parasitic-p (system-data s)) - (write-string-into-file - (nix-expression s) - (format nil "~a/quicklisp-to-nix-output/~a.nix" - target-directory (escape-filename s)) - :if-exists :supersede))) - (write-string-into-file - (execute-emb - "top-package" - :env (list :invocations invocations)) - (format nil "~a/quicklisp-to-nix.nix" target-directory) - :if-exists :supersede))) - -(defun print-usage-and-quit () - "Does what it says on the tin." - (format *error-output* "Usage: - ~A [--help] [--cacheSystemInfoDir ] [--cacheFaslDir ] -Arguments: - --cacheSystemInfoDir Store computed system info in the given directory - --cacheFaslDir Store intermediate fast load files in the given directory - --help Print usage and exit - Path to directory with quicklisp-to-nix-systems.txt -" (uiop:argv0)) - (uiop:quit 2)) - -(defun main () - "Make it go" - (let ((argv (uiop:command-line-arguments)) - work-directory - cache-system-info-directory - cache-fasl-directory) - (loop :while argv :for arg = (pop argv) :do - (cond - ((equal arg "--cacheSystemInfoDir") - (unless argv - (format *error-output* "--cacheSystemInfoDir requires an argument~%") - (print-usage-and-quit)) - (setf cache-system-info-directory (pop argv))) - - ((equal arg "--cacheFaslDir") - (unless argv - (format *error-output* "--cacheFaslDir requires an argument~%") - (print-usage-and-quit)) - (setf cache-fasl-directory (pop argv))) - - ((equal arg "--help") - (print-usage-and-quit)) - - (t - (when argv - (format *error-output* "Only one positional argument allowed~%") - (print-usage-and-quit)) - (setf work-directory arg)))) - - (when cache-system-info-directory - (setf cache-system-info-directory (pathname-as-directory (pathname cache-system-info-directory))) - (ensure-directories-exist cache-system-info-directory)) - - (labels - ((make-go (*cache-dir*) - (format t "Caching fasl files in ~A~%" *cache-dir*) - - (let ((*system-data-memoization-path* cache-system-info-directory)) - (ql-to-nix work-directory)))) - (if cache-fasl-directory - (make-go (truename (pathname-as-directory (parse-namestring (ensure-directories-exist cache-fasl-directory))))) - (with-temporary-directory (*cache-dir*) - (make-go *cache-dir*)))))) - -(defun dump-image () - "Make an executable" - (dolist (system *required-systems*) - (asdf:make system)) - (register-emb "nix-package" (merge-pathnames #p"nix-package.emb" (this-file))) - (register-emb "invocation" (merge-pathnames #p"invocation.emb" (this-file))) - (register-emb "parasitic-invocation" (merge-pathnames #p"parasitic-invocation.emb" (this-file))) - (register-emb "top-package" (merge-pathnames #p"top-package.emb" (this-file))) - (setf uiop:*image-entry-point* #'main) - (setf uiop:*lisp-interaction* nil) - (setf *loaded-from* nil) ;; Break the link to our source - (uiop:dump-image "quicklisp-to-nix" :executable t)) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/quicklisp-bootstrap.lisp b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/quicklisp-bootstrap.lisp deleted file mode 100644 index 1c4a682007..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/quicklisp-bootstrap.lisp +++ /dev/null @@ -1,76 +0,0 @@ -(unless (find-package :ql-to-nix-util) - (load "ql-to-nix-util.lisp")) -(defpackage :ql-to-nix-quicklisp-bootstrap - (:use :common-lisp :ql-to-nix-util) - (:export #:with-quicklisp) - (:documentation - "This package provides a way to create a temporary quicklisp installation.")) -(in-package :ql-to-nix-quicklisp-bootstrap) - -(declaim (optimize (debug 3) (speed 0) (space 0) (compilation-speed 0) (safety 3))) - -;; This file cannot have any dependencies beyond quicklisp and asdf. -;; Otherwise, we'll miss some dependencies! - -(defvar *quicklisp* - (namestring (pathname-as-directory (uiop:getenv "quicklisp"))) - "The path to the nix quicklisp package.") - -(defun prepare-quicklisp-dir (target-dir quicklisp-prototype-dir) - "Install quicklisp into the specified `target-dir'. - -`quicklisp-prototype-dir' should be the path to the quicklisp nix -package." - (ensure-directories-exist target-dir) - (dolist (subdir '(#P"dists/quicklisp/" #P"tmp/" #P"local-projects/" #P"quicklisp/")) - (ensure-directories-exist (merge-pathnames subdir target-dir))) - (with-open-file (s (merge-pathnames #P"dists/quicklisp/enabled.txt" target-dir) :direction :output :if-exists :supersede) - (format s "1~%")) - (uiop:copy-file - (merge-pathnames #P"lib/common-lisp/quicklisp/quicklisp-distinfo.txt" quicklisp-prototype-dir) - (merge-pathnames #P"dists/quicklisp/distinfo.txt" target-dir)) - (uiop:copy-file - (merge-pathnames #P"lib/common-lisp/quicklisp/asdf.lisp" quicklisp-prototype-dir) - (merge-pathnames #P"asdf.lisp" target-dir)) - (uiop:copy-file - (merge-pathnames #P"lib/common-lisp/quicklisp/setup.lisp" quicklisp-prototype-dir) - (merge-pathnames #P"setup.lisp" target-dir)) - (copy-directory-tree - (merge-pathnames #P"lib/common-lisp/quicklisp/quicklisp/" quicklisp-prototype-dir) - (merge-pathnames #P"quicklisp/" target-dir))) - -(defun call-with-quicklisp (function &key (target-dir :temp) (cache-dir :temp)) - "Invoke the given function with the path to a quicklisp installation. - -Quicklisp will be loaded before the function is called. `target-dir' -can either be a pathname for the place where quicklisp should be -installed or `:temp' to request installation in a temporary directory. -`cache-dir' can either be a pathname for a place to store fasls or -`:temp' to request caching in a temporary directory." - (when (find-package :ql) - (error "Already loaded quicklisp in this process")) - (labels - ((make-ql (ql-dir) - (prepare-quicklisp-dir ql-dir *quicklisp*) - (with-temporary-asdf-cache (ql-dir) - (load (merge-pathnames #P"setup.lisp" ql-dir)) - (if (eq :temp cache-dir) - (funcall function ql-dir) - (with-asdf-cache (ql-dir cache-dir) - (funcall function ql-dir)))))) - (if (eq :temp target-dir) - (with-temporary-directory (dir) - (make-ql dir)) - (make-ql target-dir)))) - -(defmacro with-quicklisp ((quicklisp-dir) (&key (cache-dir :temp)) &body body) - "Install quicklisp in a temporary directory, load it, bind -`quicklisp-dir' to the path where quicklisp was installed, and then -evaluate `body'. - -`cache-dir' can either be a pathname for a place to store fasls or -`:temp' to request caching in a temporary directory." - `(call-with-quicklisp - (lambda (,quicklisp-dir) - ,@body) - :cache-dir ,cache-dir)) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/system-info.lisp b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/system-info.lisp deleted file mode 100644 index af8d450272..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/system-info.lisp +++ /dev/null @@ -1,493 +0,0 @@ -(unless (find-package :ql-to-nix-util) - (load "util.lisp")) -(unless (find-package :ql-to-nix-quicklisp-bootstrap) - (load "quicklisp-bootstrap.lisp")) -(defpackage :ql-to-nix-system-info - (:use :common-lisp :ql-to-nix-quicklisp-bootstrap :ql-to-nix-util) - (:export #:dump-image)) -(in-package :ql-to-nix-system-info) - -(eval-when (:compile-toplevel :load-toplevel :execute) - (defparameter *implementation-systems* - (append - #+sbcl(list :sb-posix :sb-bsd-sockets :sb-rotate-byte :sb-cltl2 - :sb-introspect :sb-rt :sb-concurrency))) - (mapcar (function require) *implementation-systems*)) - -(declaim (optimize (debug 3) (speed 0) (space 0) (compilation-speed 0) (safety 3))) - -;; This file cannot have any dependencies beyond quicklisp and asdf. -;; Otherwise, we'll miss some dependencies! - -;; (Implementation-provided dependencies are special, though) - -;; We can't load quicklisp until runtime (at which point we'll create -;; an isolated quicklisp installation). These wrapper functions are -;; nicer than funcalling intern'd symbols every time we want to talk -;; to quicklisp. -(wrap :ql apply-load-strategy) -(wrap :ql compute-load-strategy) -(wrap :ql show-load-strategy) -(wrap :ql quicklisp-systems) -(wrap :ql ensure-installed) -(wrap :ql quicklisp-releases) -(wrap :ql-dist archive-md5) -(wrap :ql-dist archive-url) -(wrap :ql-dist ensure-local-archive-file) -(wrap :ql-dist find-system) -(wrap :ql-dist local-archive-file) -(wrap :ql-dist name) -(wrap :ql-dist provided-systems) -(wrap :ql-dist release) -(wrap :ql-dist short-description) -(wrap :ql-dist system-file-name) -(wrap :ql-impl-util call-with-quiet-compilation) - -(defvar *version* (uiop:getenv "version") - "The version number of this program") - -(defvar *main-system* nil - "The name of the system we're trying to extract info from.") - -(defvar *found-parasites* (make-hash-table :test #'equalp) - "Names of systems which have been identified as parasites. - -A system is parasitic if its name doesn't match the name of the file -it is defined in. So, for example, if foo and foo-bar are both -defined in a file named foo.asd, foo would be the host system and -foo-bar would be a parasitic system. - -Parasitic systems are not generally loaded without loading the host -system first. - -Keys are system names. Values are unspecified.") - -(defvar *found-dependencies* (make-hash-table :test #'equalp) - "Hash table containing the set of dependencies discovered while installing a system. - -Keys are system names. Values are unspecified.") - -(defun decode-asdf-dependency (name) - "Translates an asdf system dependency description into a system name. - -For example, translates (:version :foo \"1.0\") into \"foo\"." - (etypecase name - (symbol - (setf name (symbol-name name))) - (string) - (cons - (ecase (first name) - (:version - (warn "Discarding version information ~A" name) - ;; There's nothing we can do about this. If the version we - ;; have around is good enough, then we're golden. If it isn't - ;; good enough, then we'll error out and let a human figure it - ;; out. - (setf name (second name)) - (return-from decode-asdf-dependency - (decode-asdf-dependency name))) - - (:feature - (if (find (second name) *features*) - (return-from decode-asdf-dependency - (decode-asdf-dependency (third name))) - (progn - (warn "Dropping dependency due to missing feature: ~A" name) - (return-from decode-asdf-dependency nil)))) - - (:require - ;; This probably isn't a dependency we can satisfy using - ;; quicklisp, but we might as well try anyway. - (return-from decode-asdf-dependency - (decode-asdf-dependency (second name))))))) - (string-downcase name)) - -(defun found-new-parasite (system-name) - "Record that the given system has been identified as a parasite." - (setf system-name (decode-asdf-dependency system-name)) - (setf (gethash system-name *found-parasites*) t) - (when (nth-value 1 (gethash system-name *found-dependencies*)) - (error "Found dependency on parasite"))) - -(defun known-parasite-p (system-name) - "Have we previously identified this system as a parasite?" - (nth-value 1 (gethash system-name *found-parasites*))) - -(defun found-parasites () - "Return a vector containing all identified parasites." - (let ((systems (make-array (hash-table-size *found-parasites*) :fill-pointer 0))) - (loop :for system :being :the :hash-keys :of *found-parasites* :do - (vector-push system systems)) - systems)) - -(defvar *track-dependencies* nil - "When this variable is nil, found-new-dependency will not record -depdendencies.") - -(defun parasitic-relationship-p (potential-host potential-parasite) - "Returns t if potential-host and potential-parasite have a parasitic relationship. - -See `*found-parasites*'." - (let ((host-ql-system (find-system potential-host)) - (parasite-ql-system (find-system potential-parasite))) - (and host-ql-system parasite-ql-system - (not (equal (name host-ql-system) - (name parasite-ql-system))) - (equal (system-file-name host-ql-system) - (system-file-name parasite-ql-system))))) - -(defun found-new-dependency (name) - "Record that the given system has been identified as a dependency. - -The named system may not be recorded as a dependency. It may be left -out for any number of reasons. For example, if `*track-dependencies*' -is nil then this function does nothing. If the named system isn't a -quicklisp system, this function does nothing." - (setf name (decode-asdf-dependency name)) - (unless name - (return-from found-new-dependency)) - (unless *track-dependencies* - (return-from found-new-dependency)) - (when (known-parasite-p name) - (return-from found-new-dependency)) - (when (parasitic-relationship-p *main-system* name) - (found-new-parasite name) - (return-from found-new-dependency)) - (unless (find-system name) - (return-from found-new-dependency)) - (setf (gethash name *found-dependencies*) t)) - -(defun forget-dependency (name) - "Whoops. Did I say that was a dependency? My bad. - -Be very careful using this function! You can remove a system from the -dependency list, but you can't remove other effects associated with -this system. For example, transitive dependencies might still be in -the dependency list." - (setf name (decode-asdf-dependency name)) - (remhash name *found-dependencies*)) - -(defun found-dependencies () - "Return a vector containing all identified dependencies." - (let ((systems (make-array (hash-table-size *found-dependencies*) :fill-pointer 0))) - (loop :for system :being :the :hash-keys :of *found-dependencies* :do - (vector-push system systems)) - systems)) - -(defun host-system (system-name) - "If the given system is a parasite, return the name of the system that is its host. - -See `*found-parasites*'." - (let* ((system (find-system system-name)) - (host-file (system-file-name system))) - (unless (equalp host-file system-name) - host-file))) - -(defun get-loaded (system) - "Try to load the named system using quicklisp and record any -dependencies quicklisp is aware of. - -Unlike `our-quickload', this function doesn't attempt to install -missing dependencies." - ;; Let's get this party started! - (let* ((strategy (compute-load-strategy system)) - (ql-systems (quicklisp-systems strategy))) - (dolist (dep ql-systems) - (found-new-dependency (name dep))) - (show-load-strategy strategy) - (labels - ((make-go () - (apply-load-strategy strategy))) - (call-with-quiet-compilation #'make-go) - (let ((asdf-system (asdf:find-system system))) - ;; If ASDF says that it needed a system, then we should - ;; probably track that. - (dolist (asdf-dep (asdf:component-sideway-dependencies asdf-system)) - (found-new-dependency asdf-dep)) - (dolist (asdf-dep (asdf:system-defsystem-depends-on asdf-system)) - (found-new-dependency asdf-dep)))))) - -(defun our-quickload (system) - "Attempt to install a package like quicklisp would, but record any -dependencies that are detected during the install." - (setf system (string-downcase system)) - ;; Load it quickly, but do it OUR way. Turns out our way is very - ;; similar to the quicklisp way... - (let ((already-tried (make-hash-table :test #'equalp))) ;; Case insensitive - (tagbody - retry - (handler-case - (get-loaded system) - (asdf/find-component:missing-dependency (e) - (let ((required-by (asdf/find-component:missing-required-by e)) - (missing (asdf/find-component:missing-requires e))) - (unless (typep required-by 'asdf:system) - (error e)) - (when (gethash missing already-tried) - (error "Dependency loop? ~A" missing)) - (setf (gethash missing already-tried) t) - (let ((parasitic-p (parasitic-relationship-p *main-system* missing))) - (if parasitic-p - (found-new-parasite missing) - (found-new-dependency missing)) - ;; We always want to track the dependencies of systems - ;; that share an asd file with the main system. The - ;; whole asd file should be loadable. Otherwise, we - ;; don't want to include transitive dependencies. - (let ((*track-dependencies* parasitic-p)) - (our-quickload missing))) - (format t "Attempting to load ~A again~%" system) - (go retry))))))) - -(defvar *blacklisted-parasites* - #("hu.dwim.stefil/documentation" ;; This system depends on :hu.dwim.stefil.test, but it should depend on hu.dwim.stefil/test - "named-readtables/doc" ;; Dependency cycle between named-readtabes and mgl-pax - "symbol-munger-test" ;; Dependency cycle between lisp-unit2 and symbol-munger - "cl-postgres-simple-date-tests" ;; Dependency cycle between cl-postgres and simple-date - "cl-containers/with-variates" ;; Symbol conflict between cl-variates:next-element, metabang.utilities:next-element - "serapeum/docs" ;; Weird issue with FUN-INFO redefinition - "spinneret/cl-markdown" ;; Weird issue with FUN-INFO redefinition - "spinneret/ps" ;; Weird issue with FUN-INFO redefinition - "spinneret/tests") ;; Weird issue with FUN-INFO redefinition - "A vector of systems that shouldn't be loaded by `quickload-parasitic-systems'. - -These systems are known to be troublemakers. In some sense, all -parasites are troublemakers (you shouldn't define parasitic systems!). -However, these systems prevent us from generating nix packages and are -thus doubly evil.") - -(defvar *blacklisted-parasites-table* - (let ((ht (make-hash-table :test #'equalp))) - (loop :for system :across *blacklisted-parasites* :do - (setf (gethash system ht) t)) - ht) - "A hash table where each entry in `*blacklisted-parasites*' is an -entry in the table.") - -(defun blacklisted-parasite-p (system-name) - "Returns non-nil if the named system is blacklisted" - (nth-value 1 (gethash system-name *blacklisted-parasites-table*))) - -(defun quickload-parasitic-systems (system) - "Attempt to load all the systems defined in the same asd as the named system. - -Blacklisted systems are skipped. Dependencies of the identified -parasitic systems will be tracked." - (let* ((asdf-system (asdf:find-system system)) - (source-file (asdf:system-source-file asdf-system))) - (cond - (source-file - (loop :for system-name :being :the :hash-keys :of asdf/find-system::*registered-systems* :do - ; for an unclear reason, a literal 0 which is not a key in the hash table gets observed - (when (and (gethash system-name asdf/find-system::*registered-systems*) - (parasitic-relationship-p system system-name) - (not (blacklisted-parasite-p system-name))) - (found-new-parasite system-name) - (let ((*track-dependencies* t)) - (our-quickload system-name))))) - (t - (unless (or (equal "uiop" system) - (equal "asdf" system)) - (warn "No source file for system ~A. Can't identify parasites." system)))))) - -(defun determine-dependencies (system) - "Load the named system and return a sorted vector containing all the -quicklisp systems that were loaded to satisfy dependencies. - -This function should probably only be called once per process! -Subsequent calls will miss dependencies identified by earlier calls." - (tagbody - retry - (restart-case - (let ((*standard-output* (make-broadcast-stream)) - (*trace-output* (make-broadcast-stream)) - (*main-system* system) - (*track-dependencies* t)) - (our-quickload system) - (quickload-parasitic-systems system)) - (try-again () - :report "Start the quickload over again" - (go retry)) - (die () - :report "Just give up and die" - (uiop:quit 1)))) - - ;; Systems can't depend on themselves! - (forget-dependency system) - (values)) - -(defun parasitic-system-data (parasite-system) - "Return a plist of information about the given known-parastic system. - -Sometimes we are asked to provide information about a system that is -actually a parasite. The only correct response is to point them -toward the host system. The nix package for the host system should -have all the dependencies for this parasite already recorded. - -The plist is only meant to be consumed by other parts of -quicklisp-to-nix." - (let ((host-system (host-system parasite-system))) - (list - :system parasite-system - :host host-system - :name (string-downcase (format nil "~a" parasite-system)) - :host-name (string-downcase (format nil "~a" host-system))))) - -(defun system-data (system) - "Produce a plist describing a system. - -The plist is only meant to be consumed by other parts of -quicklisp-to-nix." - (when (host-system system) - (return-from system-data - (parasitic-system-data system))) - - (determine-dependencies system) - (let* - ((dependencies (sort (found-dependencies) #'string<)) - (parasites (coerce (sort (found-parasites) #'string<) 'list)) - (ql-system (find-system system)) - (ql-release (release ql-system)) - (ql-sibling-systems (provided-systems ql-release)) - (url (archive-url ql-release)) - (local-archive (local-archive-file ql-release)) - (local-url (format nil "file://~a" (pathname local-archive))) - (archive-data - (progn - (ensure-local-archive-file ql-release) - ;; Stuff this archive into the nix store. It was almost - ;; certainly going to end up there anyway (since it will - ;; probably be fetchurl'd for a nix package). Also, putting - ;; it into the store also gives us the SHA we need. - (nix-prefetch-url local-url))) - (ideal-md5 (archive-md5 ql-release)) - (raw-dependencies (coerce dependencies 'list)) - (name (string-downcase (format nil "~a" system))) - (ql-sibling-names - (remove name (mapcar 'name ql-sibling-systems) - :test 'equal)) - (dependencies raw-dependencies) - (description - (or - (ignore-errors (asdf:system-description (asdf:find-system system))) - "System lacks description")) - (release-name (short-description ql-release))) - (list - :system system - :description description - :sha256 (getf archive-data :sha256) - :url url - :md5 ideal-md5 - :name name - :dependencies dependencies - :siblings ql-sibling-names - :release-name release-name - :parasites parasites))) - -(defvar *error-escape-valve* *error-output* - "When `*error-output*' is rebound to inhibit spew, this stream will -still produce output.") - -(defun print-usage-and-quit () - "Describe how to use this program... and then exit." - (format *error-output* "Usage: - ~A [--cacheDir ] [--silent] [--debug] [--help|-h] -Arguments: - --cacheDir Store (and look for) compiled lisp files in the given directory - --verbose Show compilation output - --debug Enter the debugger when a fatal error is encountered - --help Print usage and exit - The quicklisp system to examine -" (or (uiop:argv0) "quicklisp-to-nix-system-info")) - (uiop:quit 2)) - -(defun main () - "Make it go." - (let ((argv (uiop:command-line-arguments)) - cache-dir - target-system - verbose-p - debug-p) - (handler-bind - ((warning - (lambda (w) - (format *error-escape-valve* "~A~%" w))) - (error - (lambda (e) - (if debug-p - (invoke-debugger e) - (progn - (format *error-escape-valve* "~ -Failed to extract system info. Details are below. ~ -Run with --debug and/or --verbose for more info. -~A~%" e) - (uiop:quit 1)))))) - (loop :while argv :do - (cond - ((equal "--cacheDir" (first argv)) - (pop argv) - (unless argv - (error "--cacheDir expects an argument")) - (setf cache-dir (first argv)) - (pop argv)) - - ((equal "--verbose" (first argv)) - (setf verbose-p t) - (pop argv)) - - ((equal "--debug" (first argv)) - (setf debug-p t) - (pop argv)) - - ((or (equal "--help" (first argv)) - (equal "-h" (first argv))) - (print-usage-and-quit)) - - (t - (setf target-system (pop argv)) - (when argv - (error "Can only operate on one system"))))) - - (unless target-system - (print-usage-and-quit)) - - (when cache-dir - (setf cache-dir (pathname-as-directory (parse-namestring cache-dir)))) - - (mapcar (function require) *implementation-systems*) - - (with-quicklisp (dir) (:cache-dir (or cache-dir :temp)) - (declare (ignore dir)) - - (let (system-data) - (let ((*error-output* (if verbose-p - *error-output* - (make-broadcast-stream))) - (*standard-output* (if verbose-p - *standard-output* - (make-broadcast-stream))) - (*trace-output* (if verbose-p - *trace-output* - (make-broadcast-stream)))) - (format *error-output* - "quicklisp-to-nix-system-info ~A~%ASDF ~A~%Quicklisp ~A~%Compiler ~A ~A~%" - *version* - (asdf:asdf-version) - (funcall (intern "CLIENT-VERSION" :ql)) - (lisp-implementation-type) - (lisp-implementation-version)) - (setf system-data (system-data target-system))) - - (cond - (system-data - (format t "~W~%" system-data) - (uiop:quit 0)) - (t - (format *error-output* "Failed to determine system data~%") - (uiop:quit 1)))))))) - -(defun dump-image () - "Make an executable" - (setf uiop:*image-entry-point* #'main) - (setf uiop:*lisp-interaction* nil) - (uiop:dump-image "quicklisp-to-nix-system-info" :executable t)) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/top-package.emb b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/top-package.emb deleted file mode 100644 index 38b4f67aa1..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/top-package.emb +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, lib, fetchurl, pkgs, clwrapper}: -let quicklisp-to-nix-packages = rec { - inherit stdenv lib fetchurl clwrapper pkgs quicklisp-to-nix-packages; - - callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages; - buildLispPackage = callPackage ./define-package.nix; - qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; -<% @loop invocations %> -<% @var code %> -<% @endloop %> -}; -in - quicklisp-to-nix-packages diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/util.lisp b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/util.lisp deleted file mode 100644 index 7b40430427..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp-to-nix/util.lisp +++ /dev/null @@ -1,178 +0,0 @@ -(defpackage :ql-to-nix-util - (:use :common-lisp) - (:export #:nix-prefetch-url #:wrap #:pathname-as-directory #:copy-directory-tree #:with-temporary-directory #:sym #:with-temporary-asdf-cache #:with-asdf-cache) - (:documentation - "A collection of useful functions and macros that ql-to-nix will use.")) -(in-package :ql-to-nix-util) - -(declaim (optimize (debug 3) (speed 0) (space 0) (compilation-speed 0) (safety 3))) - -;; This file cannot have any dependencies beyond quicklisp and asdf. -;; Otherwise, we'll miss some dependencies! - -(defun pathname-as-directory (pathname) - "Given a pathname, make it into a path to a directory. - -This is sort of like putting a / at the end of the path." - (unless (pathname-name pathname) - (return-from pathname-as-directory pathname)) - (let* ((old-dir (pathname-directory pathname)) - (old-name (pathname-name pathname)) - (old-type (pathname-type pathname)) - (last-dir - (cond - (old-type - (format nil "~A.~A" old-name old-type)) - (t - old-name))) - (new-dir (if old-dir - (concatenate 'list old-dir (list last-dir)) - (list :relative last-dir)))) - - (make-pathname :name nil :directory new-dir :type nil :defaults pathname))) - -(defvar *nix-prefetch-url-bin* - (namestring (merge-pathnames #P"bin/nix-prefetch-url" (pathname-as-directory (uiop:getenv "nix-prefetch-url")))) - "The path to the nix-prefetch-url binary") - -(defun nix-prefetch-url (url &key expected-sha256) - "Invoke the nix-prefetch-url program. - -Returns a plist with two keys. -:sha256 => The sha of the fetched file -:path => The path to the file in the nix store" - (when expected-sha256 - (setf expected-sha256 (list expected-sha256))) - (let* ((stdout - (with-output-to-string (so) - (uiop:run-program - `(,*nix-prefetch-url-bin* "--print-path" ,url ,@expected-sha256) - :output so))) - (stream (make-string-input-stream stdout))) - (list - :sha256 (read-line stream) - :path (read-line stream)))) - -(defmacro wrap (package symbol-name) - "Create a function which looks up the named symbol at runtime and -invokes it with the same arguments. - -If you can't load a system until runtime, this macro gives you an -easier way to write - (funcall (intern \"SYMBOL-NAME\" :package-name) arg) -Instead, you can write - (wrap :package-name symbol-name) - (symbol-name arg)" - (let ((args (gensym "ARGS"))) - `(defun ,symbol-name (&rest ,args) - (apply (sym ',package ',symbol-name) ,args)))) - -(defun copy-directory-tree (src-dir target-dir) - "Recursively copy every file in `src-dir' into `target-dir'. - -This function traverses symlinks." - (when (or (not (pathname-directory target-dir)) - (pathname-name target-dir)) - (error "target-dir must be a dir")) - (when (or (not (pathname-directory src-dir)) - (pathname-name src-dir)) - (error "src-dir must be a dir")) - (let ((src-wild (make-pathname :name :wild :type :wild :defaults src-dir))) - (dolist (entity (uiop:directory* src-wild)) - (if (pathname-name entity) - (uiop:copy-file entity (make-pathname :type (pathname-type entity) :name (pathname-name entity) :defaults target-dir)) - (let ((new-target-dir - (make-pathname - :directory (concatenate 'list (pathname-directory target-dir) (last (pathname-directory entity)))))) - (ensure-directories-exist new-target-dir) - (copy-directory-tree entity new-target-dir)))))) - -(defun call-with-temporary-directory (function) - "Create a temporary directory, invoke the given function by passing -in the pathname for the directory, and then delete the directory." - (let* ((dir (uiop:run-program '("mktemp" "-d") :output :line)) - (parsed (parse-namestring dir)) - (parsed-as-dir (pathname-as-directory parsed))) - (assert (uiop:absolute-pathname-p dir)) - (unwind-protect - (funcall function parsed-as-dir) - (uiop:delete-directory-tree - parsed-as-dir - :validate - (lambda (path) - (and (uiop:absolute-pathname-p path) - (equal (subseq (pathname-directory path) 0 (length (pathname-directory parsed-as-dir))) - (pathname-directory parsed-as-dir)))))))) - -(defmacro with-temporary-directory ((dir-name) &body body) - "See `call-with-temporary-directory'." - `(call-with-temporary-directory (lambda (,dir-name) ,@body))) - -(defun sym (package sym) - "A slightly less picky version of `intern'. - -Unlike `intern', the `sym' argument can be a string or a symbol. If -it is a symbol, then the `symbol-name' is `intern'ed into the -specified package. - -The arguments are also reversed so that the package comes first." - (etypecase sym - (symbol (setf sym (symbol-name sym))) - (string)) - (intern sym package)) - -(defvar *touch-bin* - (namestring (merge-pathnames #P"bin/touch" (pathname-as-directory (uiop:getenv "touch")))) - "Path to the touch binary.") - -(defvar *cache-dir* nil - "When asdf cache remapping is in effect (see `with-asdf-cache'), -this stores the path to the fasl cache directory.") -(defvar *src-dir* nil - "When asdf cache remapping is in effect (see `with-asdf-cache'), -this stores the path to the source directory. - -Only lisp files within the source directory will have their fasls -cached in the cache directory.") - -(defun remap (path prefix) - "Implements the cache policy described in `with-asdf-cache'." - (declare (ignore prefix)) - (let* ((ql-dirs (pathname-directory *src-dir*)) - (ql-dirs-length (length ql-dirs)) - (path-prefix (subseq (pathname-directory path) 0 ql-dirs-length)) - (path-postfix (subseq (pathname-directory path) ql-dirs-length))) - (unless (equal path-prefix ql-dirs) - (return-from remap path)) - (let ((result (make-pathname :directory (concatenate 'list (pathname-directory *cache-dir*) path-postfix) :defaults path))) - (with-open-file (s result :direction :probe :if-does-not-exist nil) - (when s - (uiop:run-program `(,*touch-bin* ,(namestring result))))) - result))) - -(defmacro with-temporary-asdf-cache ((src-dir) &body body) - "Create a temporary directory, and then use it as the ASDF cache -directory for source files in `src-dir'. - -See `with-asdf-cache'." - (let ((tmp-dir (gensym "ORIGINAL-VALUE"))) - `(with-temporary-directory (,tmp-dir) - (with-asdf-cache (,src-dir ,tmp-dir) - ,@body)))) - -(defmacro with-asdf-cache ((src-dir cache-dir) &body body) - "When ASDF compiles a lisp file in `src-dir', store the fasl in `cache-dir'." - (let ((original-value (gensym "ORIGINAL-VALUE"))) - `(let ((,original-value asdf:*output-translations-parameter*) - (*src-dir* ,src-dir) - (*cache-dir* ,cache-dir)) - (unwind-protect - (progn - (asdf:initialize-output-translations - '(:output-translations - :INHERIT-CONFIGURATION - ;; FIXME: Shouldn't we only be remaping things - ;; actually in the src dir? Oh well. - (t (:function remap)))) - ,@body) - (asdf:initialize-output-translations ,original-value))))) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp.sh b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp.sh deleted file mode 100644 index 1d9c3c5bc5..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/quicklisp.sh +++ /dev/null @@ -1,85 +0,0 @@ -#! /usr/bin/env bash - -op= -end_param= -args=() -cmd_args=() - -while let "$#"; do - if test -n "$end_param" || test "$1" = "${1#--}"; then - if test -n "$op"; then - args[${#args[@]}]="$1"; - else - op="$1" - fi - shift - else - case "$1" in - --) - end_param=1; shift; - ;; - --quicklisp-dir) - NIX_QUICKLISP_DIR="$2"; - shift; shift; - ;; - --help) - echo "Operation: init, run, update, install {system-name}" - exit 0; - ;; - *) - echo "Unknown parameter [$1]" >&2 - exit 2; - ;; - esac - fi -done - -NIX_QUICKLISP_DIR="${NIX_QUICKLISP_DIR:-${HOME}/quicklisp}" - -case "$op" in - '') echo "Specify an operation: init, install, run, update" - ;; - install) - NIX_LISP_SKIP_CODE=1 source "@clwrapper@/bin/common-lisp.sh"; - - cmd_args[${#cmd_args[@]}]="$NIX_LISP_EXEC_CODE" - cmd_args[${#cmd_args[@]}]="(load \"$NIX_QUICKLISP_DIR/setup.lisp\")" - for i in "${args[@]}"; do - cmd_args[${#cmd_args[@]}]="$NIX_LISP_EXEC_CODE" - cmd_args[${#cmd_args[@]}]="(ql:quickload :$i)" - done - cmd_args[${#cmd_args[@]}]="$NIX_LISP_EXEC_CODE" - cmd_args[${#cmd_args[@]}]="$NIX_LISP_QUIT" - - "@clwrapper@/bin/common-lisp.sh" "${cmd_args[@]}" - ;; - update) - NIX_LISP_SKIP_CODE=1 source "@clwrapper@/bin/common-lisp.sh" - - ln -sfT "@out@/lib/common-lisp/quicklisp/asdf.lisp" "$NIX_QUICKLISP_DIR/asdf.lisp" - cp -f "@out@/lib/common-lisp/quicklisp/setup.lisp" "$NIX_QUICKLISP_DIR/setup.lisp" - - if test -d "$NIX_QUICKLISP_DIR/quicklisp"; then - mv "$NIX_QUICKLISP_DIR/quicklisp"{,-old-$(date +%Y%m%d-%H%M%S)} - fi - - cp -rfT "@out@/lib/common-lisp/quicklisp/quicklisp" "$NIX_QUICKLISP_DIR/quicklisp" - - "@clwrapper@/bin/common-lisp.sh" "$NIX_LISP_EXEC_CODE" \ - "(load \"$NIX_QUICKLISP_DIR/setup.lisp\")" "$NIX_LISP_EXEC_CODE" \ - "(ql:update-all-dists)" "$NIX_LISP_EXEC_CODE" "$NIX_LISP_QUIT" - ;; - init) - mkdir -p "$NIX_QUICKLISP_DIR"/{dists/quicklisp,tmp,local-projects} - echo 1 > "$NIX_QUICKLISP_DIR/dists/quicklisp/enabled.txt" - cp -f "@out@/lib/common-lisp/quicklisp/quicklisp-distinfo.txt" \ - "$NIX_QUICKLISP_DIR/dists/quicklisp/distinfo.txt" - - NIX_QUICKLISP_DIR="$NIX_QUICKLISP_DIR" "$0" update - ;; - run) - NIX_LISP_SKIP_CODE=1 source "@clwrapper@/bin/common-lisp.sh" - "@clwrapper@/bin/common-lisp.sh" "$NIX_LISP_EXEC_CODE" \ - "(load \"$NIX_QUICKLISP_DIR/setup.lisp\")" "${args[@]}" - ;; -esac diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/shell.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/shell.nix deleted file mode 100644 index 0d1fadf255..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-obsolete/shell.nix +++ /dev/null @@ -1,38 +0,0 @@ -with import ../../../default.nix {}; -let -openssl_lib_marked = import ./openssl-lib-marked.nix; -self = rec { - name = "ql-to-nix"; - env = buildEnv { name = name; paths = buildInputs; }; - buildInputs = [ - gcc - openssl fuse libuv libmysqlclient libfixposix libev sqlite - freetds - lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info - ]; - CPATH = lib.makeSearchPath "include" - [ libfixposix - ]; - LD_LIBRARY_PATH = lib.makeLibraryPath - [ cairo - freetds - fuse - gdk-pixbuf - glib - gobject-introspection - gtk3 - libev - libfixposix - libmysqlclient - libuv - openblas - openssl - openssl_lib_marked - pango - postgresql - sqlite - webkitgtk - ] - + ":${libmysqlclient}/lib/mysql"; -}; -in stdenv.mkDerivation self diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/packages.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/packages.nix index 3866cc7dd2..c93a99e07a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/packages.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/packages.nix @@ -514,7 +514,7 @@ let (asdf:operate :program-op :nyxt/gi-gtk-application) ''; - # TODO(kasper): use wrapGAppsHook + # TODO(kasper): use wrapGAppsHook3 installPhase = '' mkdir -pv $out cp -r * $out @@ -573,6 +573,23 @@ let stumpwm-unwrapped = super.stumpwm; + clfswm = super.clfswm.overrideAttrs (o: rec { + buildScript = pkgs.writeText "build-clfswm.lisp" '' + (load "${o.asdfFasl}/asdf.${o.faslExt}") + (asdf:load-system 'clfswm) + (sb-ext:save-lisp-and-die + "clfswm" + :executable t + #+sb-core-compression :compression + #+sb-core-compression t + :toplevel #'clfswm:main) + ''; + installPhase = o.installPhase + '' + mkdir -p $out/bin + mv $out/clfswm $out/bin + ''; + }); + ltk = super.ltk.overrideLispAttrs (o: { src = pkgs.fetchzip { url = "https://github.com/uthar/ltk/archive/f19162e76d6c7c2f51bd289b811d9ba20dd6555e.tar.gz"; @@ -816,6 +833,66 @@ let lispLibs = oa.lispLibs ++ [ self.sb-cga ]; }); + qlot-cli = build-asdf-system rec { + pname = "qlot"; + version = "1.5.2"; + + src = pkgs.fetchFromGitHub { + owner = "fukamachi"; + repo = "qlot"; + rev = "refs/tags/${version}"; + hash = "sha256-j9iT25Yz9Z6llCKwwiHlVNKLqwuKvY194LrAzXuljsE="; + }; + + lispLibs = with super; [ + archive + deflate + dexador + fuzzy-match + ironclad + lparallel + yason + ]; + + nativeLibs = [ + pkgs.openssl + ]; + + nativeBuildInputs = [ + pkgs.makeWrapper + ]; + + buildScript = pkgs.writeText "build-qlot-cli" '' + (load "${self.qlot-cli.asdfFasl}/asdf.${self.qlot-cli.faslExt}") + (asdf:load-system :qlot/command) + (asdf:load-system :qlot/subcommands) + + ;; Use uiop:dump-image instead of sb-ext:dump-image for the image restore hooks + (setf uiop:*image-entry-point* #'qlot/cli:main) + (uiop:dump-image "qlot" + :executable t + #+sb-core-compression :compression + #+sb-core-compression t) + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp qlot.asd $out + rm *.asd + cp -r * $out + + mv $out/qlot $out/bin + wrapProgram $out/bin/qlot \ + --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH + + runHook postInstall + ''; + + meta.mainProgram = "qlot"; + }; + }); in packages diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index dea99a7a0f..46f0d5310c 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -1,35 +1,27 @@ /* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT! -Regenerate it with: nix run nixpkgs#update-luarocks-packages +Regenerate it with: nix run nixpkgs#luarocks-packages-updater You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ -{ stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: +{ stdenv, lib, fetchurl, fetchgit, callPackage, ... }: final: prev: { -alt-getopt = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: +alt-getopt = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "alt-getopt"; version = "0.8.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/alt-getopt-0.8.0-1.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/alt-getopt-0.8.0-1.rockspec"; sha256 = "17yxi1lsrbkmwzcn1x48x8758d7v1frsz1bmnpqfv4vfnlh0x210"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/cheusov/lua-alt-getopt", - "rev": "f495c21d6a203ab280603aa5799e636fb5651ae7", - "date": "2017-01-06T13:50:55+03:00", - "path": "/nix/store/z72v77cw9188408ynsppwhlzii2dr740-lua-alt-getopt", - "sha256": "1kq7r5668045diavsqd1j6i9hxdpsk99w8q4zr8cby9y3ws4q6rv", - "hash": "sha256-OxtMNB8++cVQ/gQjntLUt3WYopGhYb1VbIUAZEzJB88=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "cheusov"; + repo = "lua-alt-getopt"; + rev = "0.8.0"; + hash = "sha256-OxtMNB8++cVQ/gQjntLUt3WYopGhYb1VbIUAZEzJB88="; + }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.4"; meta = { homepage = "https://github.com/cheusov/lua-alt-getopt"; @@ -39,12 +31,12 @@ buildLuarocksPackage { }; }) {}; -argparse = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: +argparse = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "argparse"; version = "0.7.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/argparse-0.7.1-1.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/argparse-0.7.1-1.rockspec"; sha256 = "116iaczq6glzzin6qqa2zn7i22hdyzzsq6mzjiqnz6x1qmi0hig8"; }).outPath; src = fetchzip { @@ -52,8 +44,7 @@ buildLuarocksPackage { sha256 = "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.5"; meta = { homepage = "https://github.com/luarocks/argparse"; @@ -62,7 +53,7 @@ buildLuarocksPackage { }; }) {}; -basexx = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: +basexx = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: buildLuarocksPackage { pname = "basexx"; version = "0.4.1-1"; @@ -75,8 +66,7 @@ buildLuarocksPackage { sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/aiq/basexx"; @@ -85,7 +75,7 @@ buildLuarocksPackage { }; }) {}; -binaryheap = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: +binaryheap = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: buildLuarocksPackage { pname = "binaryheap"; version = "0.4-1"; @@ -98,8 +88,7 @@ buildLuarocksPackage { sha256 = "0f5l4nb5s7dycbkgh3rrl7pf0npcf9k6m2gr2bsn09fjyb3bdc8h"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/Tieske/binaryheap.lua"; @@ -109,7 +98,7 @@ buildLuarocksPackage { }; }) {}; -bit32 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +bit32 = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "bit32"; version = "5.3.0-1"; @@ -117,22 +106,14 @@ buildLuarocksPackage { url = "mirror://luarocks/bit32-5.3.0-1.rockspec"; sha256 = "1d6xdihpksrj5a3yvsvnmf3vfk15hj6f8n1rrs65m7adh87hc0yd"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/keplerproject/lua-compat-5.2.git", - "rev": "10c7d40943601eb1f80caa9e909688bb203edc4d", - "date": "2015-02-17T10:44:04+01:00", - "path": "/nix/store/9kz7kgjmq0w9plrpha866bmwsgp4rfhn-lua-compat-5.2", - "sha256": "1ipqlbvb5w394qwhm2f3w6pdrgy8v4q8sps5hh3pqz14dcqwakhj", - "hash": "sha256-Ek7FMWskfHwHhEVfjTDZyL/cruHDiQo5Jmnwsvai+MY=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "keplerproject"; + repo = "lua-compat-5.2"; + rev = "bitlib-5.3.0"; + hash = "sha256-Ek7FMWskfHwHhEVfjTDZyL/cruHDiQo5Jmnwsvai+MY="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "http://www.lua.org/manual/5.2/manual.html#6.7"; @@ -142,7 +123,7 @@ buildLuarocksPackage { }; }) {}; -busted = callPackage({ buildLuarocksPackage, dkjson, fetchgit, fetchurl, lua, lua-term, luaOlder, lua_cliargs, luassert, luasystem, mediator_lua, penlight, say }: +busted = callPackage({ buildLuarocksPackage, dkjson, fetchFromGitHub, fetchurl, lua-term, luaOlder, lua_cliargs, luassert, luasystem, mediator_lua, penlight, say }: buildLuarocksPackage { pname = "busted"; version = "2.2.0-1"; @@ -150,22 +131,15 @@ buildLuarocksPackage { url = "mirror://luarocks/busted-2.2.0-1.rockspec"; sha256 = "0h4zk4lcm40wg3l0vgjn6lsyh9yayhljx65a0pz5n99dxal8lgnf"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lunarmodules/busted.git", - "rev": "02f31a9c103a44e166617cfdb6ba1b8994a9c912", - "date": "2023-11-06T14:24:47+03:00", - "path": "/nix/store/59a4spix6yw8lvkxq7q1fkdv0gfqd72k-busted", - "sha256": "0pwyidy7l223ydsfbf5xsjqgyhm73942ks44d3bivh8ldam4zg74", - "hash": "sha256-5LxPqmoUwR3XaIToKUgap0L/sNS9uOV080MIenyLnl8=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "lunarmodules"; + repo = "busted"; + rev = "v2.2.0"; + hash = "sha256-5LxPqmoUwR3XaIToKUgap0L/sNS9uOV080MIenyLnl8="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ dkjson lua lua-term lua_cliargs luassert luasystem mediator_lua penlight say ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ dkjson lua-term lua_cliargs luassert luasystem mediator_lua penlight say ]; meta = { homepage = "https://lunarmodules.github.io/busted/"; @@ -174,7 +148,7 @@ buildLuarocksPackage { }; }) {}; -cassowary = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, penlight }: +cassowary = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, penlight }: buildLuarocksPackage { pname = "cassowary"; version = "2.3.2-1"; @@ -182,32 +156,25 @@ buildLuarocksPackage { url = "mirror://luarocks/cassowary-2.3.2-1.rockspec"; sha256 = "0c6sflm8zpgbcdj47s3rd34h69h3nqcciaaqd1wdx5m0lwc3mii0"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/sile-typesetter/cassowary.lua", - "rev": "e33195f08438c15d725d283979165fda7c6c3321", - "date": "2022-04-22T11:23:46+03:00", - "path": "/nix/store/51mb376xh9pnh2krk08ljmy01zhr9y3z-cassowary.lua", - "sha256": "1lvl40dhzmbqqjrqpjgqlg2kl993fpdy1mpc6d1610zpa9znx1f0", - "hash": "sha256-wIVuf1L3g2BCM+zW4Nt1IyU6xaP4yYuzxHjVDxsgdNM=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "sile-typesetter"; + repo = "cassowary.lua"; + rev = "v2.3.2"; + hash = "sha256-wIVuf1L3g2BCM+zW4Nt1IyU6xaP4yYuzxHjVDxsgdNM="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua penlight ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ penlight ]; meta = { homepage = "https://github.com/sile-typesetter/cassowary.lua"; description = "The cassowary constraint solver"; - maintainers = with lib.maintainers; [ marsam alerque ]; + maintainers = with lib.maintainers; [ alerque ]; license.fullName = "Apache 2"; }; }) {}; -cldr = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, penlight }: +cldr = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, penlight }: buildLuarocksPackage { pname = "cldr"; version = "0.3.0-0"; @@ -215,22 +182,15 @@ buildLuarocksPackage { url = "mirror://luarocks/cldr-0.3.0-0.rockspec"; sha256 = "1fnr8k713w21v7hc64s4w5lgcgnbphq3gm69pisc2s4wq2fkija1"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/alerque/cldr-lua.git", - "rev": "4602a7859535ca198ddfaba73a02f9bce3e81025", - "date": "2022-12-06T12:36:06+03:00", - "path": "/nix/store/3xgwqd2pica8301sbfrw4bmv0xm2wzx5-cldr-lua", - "sha256": "0hlfb115qhamczzskvckxczf9dpp8cv8h6vz7zgdl2n025ik9dp4", - "hash": "sha256-5LY0YxHACtreP38biDZD97bkPuuT7an/Z1VBXEJYjkI=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "alerque"; + repo = "cldr-lua"; + rev = "v0.3.0"; + hash = "sha256-5LY0YxHACtreP38biDZD97bkPuuT7an/Z1VBXEJYjkI="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua penlight ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ penlight ]; meta = { homepage = "https://github.com/alerque/cldr-lua"; @@ -240,21 +200,20 @@ buildLuarocksPackage { }; }) {}; -commons-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: +commons-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "commons.nvim"; - version = "15.0.0-1"; + version = "15.0.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/commons.nvim-15.0.0-1.rockspec"; - sha256 = "1f3izlp5jkr772pfbdm3q6qm5vmqqzdn4pl9qyq9fp9jzxrbv62r"; + url = "mirror://luarocks/commons.nvim-15.0.2-1.rockspec"; + sha256 = "1n78bgp9y2smnhkjkdvn2c6lq6071k9dml4j6r7hk462hxsbjsqn"; }).outPath; src = fetchzip { - url = "https://github.com/linrongbin16/commons.nvim/archive/b50a5a220c25baa5d7568137451bdc8c3c08e80c.zip"; - sha256 = "1ylvrywms5igixmkpgk6kv3a8w6d4c17dzlca9av0xxxj7ny3vgq"; + url = "https://github.com/linrongbin16/commons.nvim/archive/cc17fd28c5f171c5d55f75d668b812e2d70b4cf3.zip"; + sha256 = "0w5z03r59jy3zb653dwp9c6fq8ivjj1j2ksnsx95wlmj1mx04ixi"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://linrongbin16.github.io/commons.nvim/"; @@ -264,21 +223,20 @@ buildLuarocksPackage { }; }) {}; -compat53 = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: +compat53 = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "compat53"; - version = "0.12-1"; + version = "0.13-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/compat53-0.12-1.rockspec"; - sha256 = "0ijp8ch3927rnj872l6cq79fd53dyfc2qg82y9b0g6kqs7cdl348"; + url = "mirror://luarocks/compat53-0.13-1.rockspec"; + sha256 = "10gmhd526a5q0dl4dvjq7a5c7f3i7hcdla8hpygl79dhgbm649i3"; }).outPath; src = fetchzip { - url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.12.zip"; - sha256 = "177zk7rww76wqxqsd2kxwfzb0nd7wfacm81vxwqsc84bfccsl3j4"; + url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.13.zip"; + sha256 = "06kpx5qyk1zki2r2g6z3alwhvmays50670z7mbl55h7s0kff2cpz"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.5"; meta = { homepage = "https://github.com/lunarmodules/lua-compat-5.3"; @@ -288,7 +246,7 @@ buildLuarocksPackage { }; }) {}; -cosmo = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lpeg }: +cosmo = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lpeg }: buildLuarocksPackage { pname = "cosmo"; version = "16.06.04-1"; @@ -296,31 +254,23 @@ buildLuarocksPackage { url = "mirror://luarocks/cosmo-16.06.04-1.rockspec"; sha256 = "0ipv1hrlhvaz1myz6qxabq7b7kb3bz456cya3r292487a3g9h9pb"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/mascarenhas/cosmo.git", - "rev": "e774f08cbf8d271185812a803536af8a8240ac51", - "date": "2016-06-17T05:39:58-07:00", - "path": "/nix/store/k3p4xc4cfihp4h8aj6vacr25rpcsjd96-cosmo", - "sha256": "03b5gwsgxd777970d2h6rx86p7ivqx7bry8xmx2r396g3w85qy2p", - "hash": "sha256-V3hcEB/PpJFFrx35vE7HO55rUM8GigZOOue0/jR/ZQ0=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "mascarenhas"; + repo = "cosmo"; + rev = "v16.06.04"; + hash = "sha256-mJE5GkDnfZ3qAQyyyKj+aXOtlITeYs8lerGJSTzU/Tk="; + }; propagatedBuildInputs = [ lpeg ]; meta = { homepage = "http://cosmo.luaforge.net"; description = "Safe templates for Lua"; - maintainers = with lib.maintainers; [ marsam ]; license.fullName = "MIT/X11"; }; }) {}; -coxpcall = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: +coxpcall = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "coxpcall"; version = "1.17.0-1"; @@ -328,19 +278,12 @@ buildLuarocksPackage { url = "mirror://luarocks/coxpcall-1.17.0-1.rockspec"; sha256 = "0mf0nggg4ajahy5y1q5zh2zx9rmgzw06572bxx6k8b736b8j7gca"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/keplerproject/coxpcall", - "rev": "ea22f44e490430e40217f0792bf82eaeaec51903", - "date": "2018-02-26T19:53:11-03:00", - "path": "/nix/store/1q4p5qvr6rlwisyarlgnmk4dx6vp8xdl-coxpcall", - "sha256": "1k3q1rr2kavkscf99b5njxhibhp6iwhclrjk6nnnp233iwc2jvqi", - "hash": "sha256-EW8pGI9jiGutNVNmyiCP5sIVYZe2rJQc03OrKXIOeMw=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "keplerproject"; + repo = "coxpcall"; + rev = "v1_17_0"; + hash = "sha256-EW8pGI9jiGutNVNmyiCP5sIVYZe2rJQc03OrKXIOeMw="; + }; meta = { @@ -353,18 +296,17 @@ buildLuarocksPackage { cqueues = callPackage({ buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "cqueues"; - version = "20200726.51-0"; + version = "20200726.52-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/cqueues-20200726.51-0.rockspec"; - sha256 = "1y7dqvw75cj9ifn7cyhd98znaga4lksnbddcqmh512crawlf5sxv"; + url = "mirror://luarocks/cqueues-20200726.52-0.rockspec"; + sha256 = "0w2kq9w0wda56k02rjmvmzccz6bc3mn70s9v7npjadh85i5zlhhp"; }).outPath; src = fetchurl { url = "https://github.com/wahern/cqueues/archive/rel-20200726.tar.gz"; sha256 = "0lhd02ag3r1sxr2hx847rdjkddm04l1vf5234v5cz9bd4kfjw4cy"; }; - disabled = (lua.luaversion != "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = lua.luaversion != "5.2"; meta = { homepage = "http://25thandclement.com/~william/projects/cqueues.html"; @@ -374,7 +316,7 @@ buildLuarocksPackage { }; }) {}; -cyan = callPackage({ argparse, buildLuarocksPackage, fetchgit, fetchurl, luafilesystem, tl }: +cyan = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luafilesystem, tl }: buildLuarocksPackage { pname = "cyan"; version = "0.3.0-1"; @@ -382,19 +324,12 @@ buildLuarocksPackage { url = "mirror://luarocks/cyan-0.3.0-1.rockspec"; sha256 = "1bs5gwgdhibj2gm8y3810b0hh6s9n00fgij8nnjag9kpqrd80vsj"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/teal-language/cyan", - "rev": "57650a3a0314a5e894c6ead30a5a52f7825f009c", - "date": "2023-12-07T02:47:54-06:00", - "path": "/nix/store/g3rqlf5cj06y2qqjlhkms51y4l142waf-cyan", - "sha256": "0xww1p3l0rbm7xiyax37524zybgmbrsjkpvgg327w8yndqysidfd", - "hash": "sha256-zbWoPW7WI37EeG/fKXVe9S3/iShndOVjP3VlQMcNnHc=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "teal-language"; + repo = "cyan"; + rev = "51649e4a814c05deaf5dde929ba82803f5170bbc"; + hash = "sha256-83F2hFAXHLg4l5O0+j3zbwTv0TaCWEfWErO9C0V9W04="; + }; propagatedBuildInputs = [ argparse luafilesystem tl ]; @@ -405,27 +340,23 @@ buildLuarocksPackage { }; }) {}; -digestif = callPackage({ buildLuarocksPackage, fetchgit, lpeg, lua, luaOlder, luafilesystem }: +digestif = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lpeg, luaOlder }: buildLuarocksPackage { pname = "digestif"; - version = "dev-1"; + version = "0.5.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/digestif-0.5.1-1.rockspec"; + sha256 = "03hhzpq1szdw43slq38wbndwh8knv71q9pgwd7hvvkp9wykzjhwr"; + }).outPath; + src = fetchFromGitHub { + owner = "astoff"; + repo = "digestif"; + rev = "v0.5.1"; + hash = "sha256-8QTc4IKD1tjRlyrSZy7cyUzRkvm6IHwlOXchPf2BaMk="; + }; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/astoff/digestif", - "rev": "c0199f9cd86021c0a89662002d7a3411d12fb168", - "date": "2023-03-10T15:04:26+01:00", - "path": "/nix/store/3s849fwc80lf7pvgsiavqmvc5538cwwd-digestif", - "sha256": "0xccrrfwvcj03nnrzs3iwig7y2ahl706h413hkywcplyd5407dv9", - "hash": "sha256-abcDSGmeXsb9hCMQaMChUAl/XuRx6J+tHUCyzV3OjHU=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.3"); - propagatedBuildInputs = [ lpeg lua luafilesystem ]; + disabled = luaOlder "5.3"; + propagatedBuildInputs = [ lpeg ]; meta = { homepage = "https://github.com/astoff/digestif/"; @@ -434,21 +365,20 @@ buildLuarocksPackage { }; }) {}; -dkjson = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: +dkjson = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "dkjson"; version = "2.7-1"; knownRockspec = (fetchurl { url = "mirror://luarocks/dkjson-2.7-1.rockspec"; - sha256 = "sha256-rVMDFF/yY7fTlY4Icj4LWt72qmKMCwedbgoigqx/+U0="; + sha256 = "0kgrgyn848hadsfhf2wccamgdpjs1cz7424fjp9vfqzjbwa06lxd"; }).outPath; src = fetchurl { url = "http://dkolf.de/dkjson-lua/dkjson-2.7.tar.gz"; sha256 = "sha256-TFGmIQLy9r23Z3fx23NgUJtKARaANYi06CVfQ1ryOVw="; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.5"; meta = { homepage = "http://dkolf.de/dkjson-lua/"; @@ -457,21 +387,20 @@ buildLuarocksPackage { }; }) {}; -fennel = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: +fennel = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: buildLuarocksPackage { pname = "fennel"; - version = "1.4.0-1"; + version = "1.4.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fennel-1.4.0-1.rockspec"; - sha256 = "1ldbcrzap8ajgwmxf70g0nw7sjdpabba56y2lg3z4hpnxccpb80n"; + url = "mirror://luarocks/fennel-1.4.2-1.rockspec"; + sha256 = "17ygacyqdvplyz3046ay3xr4z83sdjrxkcl21mklpxx29j8p0bv1"; }).outPath; src = fetchurl { - url = "https://fennel-lang.org/downloads/fennel-1.4.0.tar.gz"; - sha256 = "0g1lzkpmzhvhkc08kmn48k3m02pkcwgslz29fb23apbhydkavlx2"; + url = "https://fennel-lang.org/downloads/fennel-1.4.2.tar.gz"; + sha256 = "1inhy8rrywx8svdzhy1yaaa0cfyrmi21ckj7h8xmd7yqaw66ma86"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://fennel-lang.org/"; @@ -481,7 +410,7 @@ buildLuarocksPackage { }; }) {}; -fidget-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: +fidget-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fidget.nvim"; version = "1.1.0-1"; @@ -494,8 +423,7 @@ buildLuarocksPackage { sha256 = "0bwjcqkb735wqnzc8rngvpq1b2rxgc7m0arjypvnvzsxw6wd1f61"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/j-hui/fidget.nvim"; @@ -505,12 +433,12 @@ buildLuarocksPackage { }; }) {}; -fifo = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua }: +fifo = callPackage({ buildLuarocksPackage, fetchurl, fetchzip }: buildLuarocksPackage { pname = "fifo"; version = "0.2-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fifo-0.2-0.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/fifo-0.2-0.rockspec"; sha256 = "0vr9apmai2cyra2n573nr3dyk929gzcs4nm1096jdxcixmvh2ymq"; }).outPath; src = fetchzip { @@ -518,7 +446,6 @@ buildLuarocksPackage { sha256 = "1800k7h5hxsvm05bjdr65djjml678lwb0661cll78z1ys2037nzn"; }; - propagatedBuildInputs = [ lua ]; meta = { homepage = "https://github.com/daurnimator/fifo.lua"; @@ -527,7 +454,7 @@ buildLuarocksPackage { }; }) {}; -fluent = callPackage({ buildLuarocksPackage, cldr, fetchgit, fetchurl, lua, luaOlder, luaepnf, penlight }: +fluent = callPackage({ buildLuarocksPackage, cldr, fetchFromGitHub, fetchurl, luaOlder, luaepnf, penlight }: buildLuarocksPackage { pname = "fluent"; version = "0.2.0-0"; @@ -535,22 +462,15 @@ buildLuarocksPackage { url = "mirror://luarocks/fluent-0.2.0-0.rockspec"; sha256 = "1x3nk8xdf923rvdijr0jx8v6w3wxxfch7ri3kxca0pw80b5bc2fa"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/alerque/fluent-lua.git", - "rev": "e1cd4130e460bcd52f9118b7d9f9a72d2e8b902c", - "date": "2022-04-16T23:08:20+03:00", - "path": "/nix/store/flxlnrzg6rx75qikiggmy494npx59p0b-fluent-lua", - "sha256": "12js8l4hcxhziza0sry0f01kfm8f8m6kx843dmcky36z1y2mccmq", - "hash": "sha256-uDJWhQ/fDD9ZbYOgPk1FDlU3A3DAZw3Ujx92BglFWoo=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "alerque"; + repo = "fluent-lua"; + rev = "v0.2.0"; + hash = "sha256-uDJWhQ/fDD9ZbYOgPk1FDlU3A3DAZw3Ujx92BglFWoo="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ cldr lua luaepnf penlight ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ cldr luaepnf penlight ]; meta = { homepage = "https://github.com/alerque/fluent-lua"; @@ -560,7 +480,7 @@ buildLuarocksPackage { }; }) {}; -funnyfiles-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: +funnyfiles-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "funnyfiles.nvim"; version = "1.0.1-1"; @@ -573,8 +493,7 @@ buildLuarocksPackage { sha256 = "00p026r05gldbf18mmv8da9ap09di8dhy0rrd586pr2s2s36nzpd"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/aikooo7/funnyfiles.nvim"; @@ -584,21 +503,20 @@ buildLuarocksPackage { }; }) {}; -fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: +fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.1195-1"; + version = "0.0.1243-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.1195-1.rockspec"; - sha256 = "1bcjis9mkbzq7178fkpqkafs6656bhvq1wh13vm1r3khbvi0jkp1"; + url = "mirror://luarocks/fzf-lua-0.0.1243-1.rockspec"; + sha256 = "1qg36v2gx36k313jisxyf6yjywzqngak2qcx211hd2wzxdnsaxdb"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/0c884bb24ab0fef204f315f34e711b13ece0ea9f.zip"; - sha256 = "04gif5hyb6qzh649xzcwzx81rlrk2glking05q8wxp2cpa3nifpw"; + url = "https://github.com/ibhagwan/fzf-lua/archive/9a0912d171940e8701d1f65d5ee2b23b810720c1.zip"; + sha256 = "0xzgpng4r9paza87fnxc3cfn331g1pmcayv1vky7jmriy5xsrxh6"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/ibhagwan/fzf-lua"; @@ -608,60 +526,42 @@ buildLuarocksPackage { }; }) {}; -fzy = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +fzy = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fzy"; - version = "1.0-1"; + version = "1.0.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzy-1.0-1.rockspec"; - sha256 = "1v050lm3rn1k5wwi2nimlbp1b7j6b8vkwvhc1npyqzj8jv7w9w9n"; + url = "mirror://luarocks/fzy-1.0.3-1.rockspec"; + sha256 = "07d07afjs73bl5krfbaqx4pw2wpfrkyw2iksamkfa8dlqn9ajn1a"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/swarn/fzy-lua", - "rev": "2d018a56e3a240bca4b3142a723b2f56392f3e4a", - "date": "2023-01-29T07:05:02-06:00", - "path": "/nix/store/nz19glmy52jbz46wl7xf0jd8m441klf0-fzy-lua", - "sha256": "0xknm5513a6nlariwxgqndf3wj8xals26swjsv06hx133ihna01x", - "hash": "sha256-PQBlYRwjdGjA1pJrIzRVHUk+XLP4dR6zotaoEUqpdnY=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchzip { + url = "https://github.com/swarn/fzy-lua/archive/v1.0.3.zip"; + sha256 = "0w3alddhn0jd19vmminbi1b79mzlagyl1lygmfpxhzzccdv4vapm"; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/swarn/fzy-lua"; - description = "A fuzzy string-matching algorithm"; + description = "A lua implementation of the fzy fuzzy matching algorithm"; maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "MIT"; }; }) {}; -gitsigns-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua }: +gitsigns-nvim = callPackage({ buildLuarocksPackage, fetchFromGitHub, lua }: buildLuarocksPackage { pname = "gitsigns.nvim"; version = "scm-1"; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lewis6991/gitsigns.nvim", - "rev": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2", - "date": "2023-11-29T12:07:41+00:00", - "path": "/nix/store/2ihnjknz2xdwsijjimqk8i3pi9cbpvhf-gitsigns.nvim", - "sha256": "086jmhzgpavwjvp7ssd8ga0wxgnz480zzjiv84h4ivva2nv3lnvi", - "hash": "sha256-cVs6thVq70ggQTvK/wEi377OgXqoaX3ulnyr+z6s0iA=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "lewis6991"; + repo = "gitsigns.nvim"; + rev = "035da036e68e509ed158414416c827d022d914bd"; + hash = "sha256-UK3DyvrQ0kLm9wrMQ6tLDoDunoThbY/Yfjn+eCZpuMw="; + }; - disabled = (lua.luaversion != "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = lua.luaversion != "5.1"; meta = { homepage = "http://github.com/lewis6991/gitsigns.nvim"; @@ -670,30 +570,30 @@ buildLuarocksPackage { }; }) {}; -haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: +haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "3.0.2-1"; + version = "3.1.8-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-3.0.2-1.rockspec"; - sha256 = "1gls4dc4b8p0827jsvzf1n3gxfmqn1r7n8hi1rnfxwcragjxxn8x"; + url = "mirror://luarocks/haskell-tools.nvim-3.1.8-1.rockspec"; + sha256 = "1jhms5gpah8lk0mn1gx127afmihyaq1fj8qrd6a8yh3wy12k1qxc"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.0.2.zip"; - sha256 = "1rv1r0laizq866lj06akhy97zr9wdfczp1caql36k2xk4d8sbzx7"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.8.zip"; + sha256 = "14nk6jyq2y4q93ij56bdjy17h3jlmjwsspw3l6ahvjsl6yg1lv75"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/mrcjkb/haskell-tools.nvim"; description = "Supercharge your Haskell experience in neovim!"; + maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "GPL-2.0"; }; }) {}; -http = callPackage({ basexx, binaryheap, bit32, buildLuarocksPackage, compat53, cqueues, fetchurl, fetchzip, fifo, lpeg, lpeg_patterns, lua, luaOlder, luaossl }: +http = callPackage({ basexx, binaryheap, bit32, buildLuarocksPackage, compat53, cqueues, fetchurl, fetchzip, fifo, lpeg, lpeg_patterns, luaOlder, luaossl }: buildLuarocksPackage { pname = "http"; version = "0.3-0"; @@ -706,8 +606,8 @@ buildLuarocksPackage { sha256 = "1pqxxxifl2j1cik3kgayx43v6py5jp6r22myhvxfffysb3b84a2l"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ basexx binaryheap bit32 compat53 cqueues fifo lpeg lpeg_patterns lua luaossl ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ basexx binaryheap bit32 compat53 cqueues fifo lpeg lpeg_patterns luaossl ]; meta = { homepage = "https://github.com/daurnimator/lua-http"; @@ -717,8 +617,7 @@ buildLuarocksPackage { }; }) {}; -image-nvim = callPackage( -{ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, magick }: +image-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, magick }: buildLuarocksPackage { pname = "image.nvim"; version = "1.2.0-1"; @@ -731,17 +630,18 @@ buildLuarocksPackage { sha256 = "1v4db60yykjajabmf12zjcg47bb814scjrig0wvn4yc11isinymg"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua magick ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ magick ]; meta = { homepage = "https://github.com/3rd/image.nvim"; description = "🖼️ Bringing images to Neovim."; + maintainers = with lib.maintainers; [ teto ]; license.fullName = "MIT"; }; }) {}; -inspect = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: +inspect = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: buildLuarocksPackage { pname = "inspect"; version = "3.1.3-0"; @@ -754,8 +654,7 @@ buildLuarocksPackage { sha256 = "1sqylz5hmj5sbv4gi9988j6av3cb5lwkd7wiyim1h5lr7xhnlf23"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/kikito/inspect.lua"; @@ -764,30 +663,22 @@ buildLuarocksPackage { }; }) {}; -jsregexp = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +jsregexp = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "jsregexp"; - version = "0.0.6-1"; + version = "0.0.7-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/jsregexp-0.0.6-1.rockspec"; - sha256 = "1m3vqv1p44akk020c3l3n8pdxs30rl5509gbs3rr13hmqlvil4cs"; + url = "mirror://luarocks/jsregexp-0.0.7-1.rockspec"; + sha256 = "1yx0340h51xk23n0g8irj5c9bs35zy6p1zl5kp7vy2cwxazbipbl"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/kmarius/jsregexp.git", - "rev": "b5a81e21d0875667ba2458ac8ae903afd5568698", - "date": "2023-02-12T14:19:03+01:00", - "path": "/nix/store/aj42wy1yp53w406id33dyxpv1ws23g4b-jsregexp", - "sha256": "0l7hn5f2jl4n2bpikb72szfzgc192jy3ig5pxx9061j44amyq89m", - "hash": "sha256-NSHsqyJEBgNS77e8OLwUKbD33dfirBnvEpZQKVyx8FA=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "kmarius"; + repo = "jsregexp"; + rev = "v0.0.7"; + hash = "sha256-aXRGmo6w7jgKlR2BwKhbFGHC0mOTwHfYsh+lvqNuFtQ="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/kmarius/jsregexp"; @@ -796,7 +687,7 @@ buildLuarocksPackage { }; }) {}; -ldbus = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: +ldbus = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "ldbus"; version = "scm-0"; @@ -804,22 +695,14 @@ buildLuarocksPackage { url = "mirror://luarocks/ldbus-scm-0.rockspec"; sha256 = "1c0h6fx7avzh89hl17v6simy1p4mjg8bimlsbjybks0zxznd8rbm"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/daurnimator/ldbus.git", - "rev": "6d4909c983c8a0e2c7384bac8055c628aa524ea2", - "date": "2021-11-10T23:58:54+11:00", - "path": "/nix/store/j830jk2hkanz7abkdsbvg2warsyr0a2c-ldbus", - "sha256": "18q98b98mfvjzbyssf18bpnlx4hsx4s9lwcwia4z9dxiaiw7b77j", - "hash": "sha256-8px1eFSxt/SJipxxmjTpGpJO7V0oOK39+nK7itJCCaM=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "daurnimator"; + repo = "ldbus"; + rev = "6d4909c983c8a0e2c7384bac8055c628aa524ea2"; + hash = "sha256-8px1eFSxt/SJipxxmjTpGpJO7V0oOK39+nK7itJCCaM="; + }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.5"; meta = { homepage = "https://github.com/daurnimator/ldbus"; @@ -828,7 +711,7 @@ buildLuarocksPackage { }; }) {}; -ldoc = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, markdown, penlight }: +ldoc = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, markdown, penlight }: buildLuarocksPackage { pname = "ldoc"; version = "1.5.0-1"; @@ -836,19 +719,12 @@ buildLuarocksPackage { url = "mirror://luarocks/ldoc-1.5.0-1.rockspec"; sha256 = "1c0yx9j3yqlzxpmspz7n7l1nvh2sww84zhkb1fsbg042sr8h9bxp"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lunarmodules/ldoc.git", - "rev": "09f82c959c50d8c3d5a968c379b1c75de66b002d", - "date": "2023-05-03T00:05:39+03:00", - "path": "/nix/store/7l5xpw1grnwr5m8myll63gyy4311glb1-ldoc", - "sha256": "0g65dd51l42693jr3251p6s40950wcwfr1kspjvc2frkwm7qpv9i", - "hash": "sha256-Me2LT+UzO8G2vHqG7DjjoCRAtLmhiJHlSEYQGkprxTw=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "lunarmodules"; + repo = "ldoc"; + rev = "v1.5.0"; + hash = "sha256-Me2LT+UzO8G2vHqG7DjjoCRAtLmhiJHlSEYQGkprxTw="; + }; propagatedBuildInputs = [ markdown penlight ]; @@ -859,7 +735,7 @@ buildLuarocksPackage { }; }) {}; -lgi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +lgi = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lgi"; version = "0.9.2-1"; @@ -867,22 +743,14 @@ buildLuarocksPackage { url = "mirror://luarocks/lgi-0.9.2-1.rockspec"; sha256 = "1gqi07m4bs7xibsy4vx8qgyp3yb1wnh0gdq1cpwqzv35y6hn5ds3"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/pavouk/lgi.git", - "rev": "0fdcf8c677094d0c109dfb199031fdbc0c9c47ea", - "date": "2017-10-09T20:55:55+02:00", - "path": "/nix/store/vh82n8pc8dy5c8nph0vssk99vv7q4qg2-lgi", - "sha256": "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj", - "hash": "sha256-UpamUbvqzF0JKV3J0wIiJlV6iedwe823vD0EIm3zKw8=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "pavouk"; + repo = "lgi"; + rev = "0.9.2"; + hash = "sha256-UpamUbvqzF0JKV3J0wIiJlV6iedwe823vD0EIm3zKw8="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "http://github.com/pavouk/lgi"; @@ -891,7 +759,7 @@ buildLuarocksPackage { }; }) {}; -linenoise = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: +linenoise = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: buildLuarocksPackage { pname = "linenoise"; version = "0.9-1"; @@ -901,8 +769,7 @@ buildLuarocksPackage { sha256 = "177h6gbq89arwiwxah9943i8hl5gvd9wivnd1nhmdl7d8x0dn76c"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/hoelzro/lua-linenoise"; @@ -924,8 +791,7 @@ buildLuarocksPackage { sha256 = "1w9g36nhxv92cypjia7igg1xpfrn3dbs3hfy6gnnz5mx14v50abf"; }; - disabled = (lua.luaversion != "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = lua.luaversion != "5.1"; meta = { homepage = "http://www.myriabit.com/ljsyscall/"; @@ -935,7 +801,7 @@ buildLuarocksPackage { }; }) {}; -lmathx = callPackage({ buildLuarocksPackage, fetchurl, lua }: +lmathx = callPackage({ buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "lmathx"; version = "20150624-1"; @@ -948,7 +814,6 @@ buildLuarocksPackage { sha256 = "1r0ax3lq4xx6469aqc6qlfl3jynlghzhl5j65mpdj0kyzv4nknzf"; }; - propagatedBuildInputs = [ lua ]; meta = { homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lmathx"; @@ -958,7 +823,7 @@ buildLuarocksPackage { }; }) {}; -lmpfrlib = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: +lmpfrlib = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lmpfrlib"; version = "20170112-2"; @@ -971,8 +836,7 @@ buildLuarocksPackage { sha256 = "1bkfwdacj1drzqsfxf352fjppqqwi5d4j084jr9vj9dvjb31rbc1"; }; - disabled = (luaOlder "5.3") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.3" || luaAtLeast "5.5"; meta = { homepage = "http://www.circuitwizard.de/lmpfrlib/lmpfrlib.html"; @@ -982,7 +846,7 @@ buildLuarocksPackage { }; }) {}; -loadkit = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +loadkit = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "loadkit"; version = "1.1.0-1"; @@ -990,22 +854,14 @@ buildLuarocksPackage { url = "mirror://luarocks/loadkit-1.1.0-1.rockspec"; sha256 = "08fx0xh90r2zvjlfjkyrnw2p95xk1a0qgvlnq4siwdb2mm6fq12l"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/leafo/loadkit.git", - "rev": "95b13a36442f59b41ab52df96d52233c4a725dfd", - "date": "2023-08-17T11:36:25-07:00", - "path": "/nix/store/9xcy2p5pxiq0p17szv8p2lagb6xzb8c8-loadkit", - "sha256": "0hivmn5r1scxv3nckm4hqfplq33wiab3ypjwsfdkmp3bdri0dhxs", - "hash": "sha256-usMGYm5r3Dqb01xeP5aKfAxMr8OQ1Mns2J3pkIutO0I=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "leafo"; + repo = "loadkit"; + rev = "v1.1.0"; + hash = "sha256-fw+aoP9+yDpme4qXupE07cV1QGZjb2aU7IOHapG+ihU="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/leafo/loadkit"; @@ -1015,7 +871,7 @@ buildLuarocksPackage { }; }) {}; -lpeg = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: +lpeg = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lpeg"; version = "1.1.0-1"; @@ -1028,8 +884,7 @@ buildLuarocksPackage { sha256 = "0aimsjpcpkh3kk65f0pg1z2bp6d83rn4dg6pgbx1yv14s9kms5ab"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "http://www.inf.puc-rio.br/~roberto/lpeg.html"; @@ -1039,7 +894,7 @@ buildLuarocksPackage { }; }) {}; -lpeg_patterns = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lpeg, lua }: +lpeg_patterns = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lpeg }: buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; @@ -1052,7 +907,7 @@ buildLuarocksPackage { sha256 = "1s3c179a64r45ffkawv9dnxw4mzwkzj00nr9z2gs5haajgpjivw6"; }; - propagatedBuildInputs = [ lpeg lua ]; + propagatedBuildInputs = [ lpeg ]; meta = { homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; @@ -1061,7 +916,7 @@ buildLuarocksPackage { }; }) {}; -lpeglabel = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: +lpeglabel = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lpeglabel"; version = "1.6.0-1"; @@ -1074,8 +929,7 @@ buildLuarocksPackage { sha256 = "1i02lsxj20iygqm8fy6dih1gh21lqk5qj1mv14wlrkaywnv35wcv"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/sqmedeiros/lpeglabel/"; @@ -1084,7 +938,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-gnu = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +lrexlib-gnu = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.2-1"; @@ -1092,22 +946,14 @@ buildLuarocksPackage { url = "mirror://luarocks/lrexlib-gnu-2.9.2-1.rockspec"; sha256 = "14dp5lzpz2prvimpcbqjygbyh9h791h0ywjknj9wgrjjd62qsy6i"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/rrthomas/lrexlib.git", - "rev": "9aa5e7e9ca47da1bd0e023dfa0b1b2d43aa358f3", - "date": "2023-11-05T17:32:50+00:00", - "path": "/nix/store/z74bw029468iizgrv19wllpzsvazj3bg-lrexlib", - "sha256": "15y9ha28qq08b100a32s72h6rx1bqs7gl5h7j3zacy5ixyyl6cqg", - "hash": "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "rrthomas"; + repo = "lrexlib"; + rev = "rel-2-9-2"; + hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/rrthomas/lrexlib"; @@ -1116,7 +962,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-pcre = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +lrexlib-pcre = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lrexlib-pcre"; version = "2.9.2-1"; @@ -1124,22 +970,14 @@ buildLuarocksPackage { url = "mirror://luarocks/lrexlib-pcre-2.9.2-1.rockspec"; sha256 = "1214ssm6apgprryqvijjjn82ikb27ylq94yijqf7qjyiy6pz7dc1"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/rrthomas/lrexlib.git", - "rev": "9aa5e7e9ca47da1bd0e023dfa0b1b2d43aa358f3", - "date": "2023-11-05T17:32:50+00:00", - "path": "/nix/store/z74bw029468iizgrv19wllpzsvazj3bg-lrexlib", - "sha256": "15y9ha28qq08b100a32s72h6rx1bqs7gl5h7j3zacy5ixyyl6cqg", - "hash": "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "rrthomas"; + repo = "lrexlib"; + rev = "rel-2-9-2"; + hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/rrthomas/lrexlib"; @@ -1149,7 +987,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-posix = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +lrexlib-posix = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lrexlib-posix"; version = "2.9.2-1"; @@ -1157,22 +995,14 @@ buildLuarocksPackage { url = "mirror://luarocks/lrexlib-posix-2.9.2-1.rockspec"; sha256 = "1i11cdvz09a3wjhfjgc88g0mdmdrk13fnhhgskzgm5cmhsdx4s0i"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/rrthomas/lrexlib.git", - "rev": "9aa5e7e9ca47da1bd0e023dfa0b1b2d43aa358f3", - "date": "2023-11-05T17:32:50+00:00", - "path": "/nix/store/z74bw029468iizgrv19wllpzsvazj3bg-lrexlib", - "sha256": "15y9ha28qq08b100a32s72h6rx1bqs7gl5h7j3zacy5ixyyl6cqg", - "hash": "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "rrthomas"; + repo = "lrexlib"; + rev = "rel-2-9-2"; + hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/rrthomas/lrexlib"; @@ -1181,7 +1011,7 @@ buildLuarocksPackage { }; }) {}; -lua-cjson = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +lua-cjson = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-cjson"; version = "2.1.0.10-1"; @@ -1189,22 +1019,14 @@ buildLuarocksPackage { url = "mirror://luarocks/lua-cjson-2.1.0.10-1.rockspec"; sha256 = "05sp7rq72x4kdkyid1ch0yyscwsi5wk85d2hj6xwssz3h8n8drdg"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/openresty/lua-cjson", - "rev": "96e6e0ce67ed070a52223c1e9518c9018b1ce376", - "date": "2021-12-10T20:19:58+08:00", - "path": "/nix/store/1ac8lz6smfa8zqfipqfsg749l9rw4ly9-lua-cjson", - "sha256": "03hdsv7d77mggis58k8fmlpbh1d544m0lfqyl9rpjcqkiqs1qvza", - "hash": "sha256-6m8cNI4TM3lzoh47CiohpQW4Lq0OTVR0fK+e087WDQ4=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "openresty"; + repo = "lua-cjson"; + rev = "2.1.0.10"; + hash = "sha256-/SeQro0FaJn91bAGjsVIin+mJF89VUm/G0KyJkV9Qps="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php"; @@ -1213,7 +1035,7 @@ buildLuarocksPackage { }; }) {}; -lua-cmsgpack = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +lua-cmsgpack = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; @@ -1221,22 +1043,14 @@ buildLuarocksPackage { url = "mirror://luarocks/lua-cmsgpack-0.4.0-0.rockspec"; sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/antirez/lua-cmsgpack.git", - "rev": "dec1810a70d2948725f2e32cc38163de62b9d9a7", - "date": "2015-06-03T08:39:04+02:00", - "path": "/nix/store/ksqvl7hbd5s7nb6hjffyic1shldac4z2-lua-cmsgpack", - "sha256": "0j0ahc9rprgl6dqxybaxggjam2r5i2wqqsd6764n0d7fdpj9fqm0", - "hash": "sha256-oGKX5G3uNGCJOaZpjLmIJYuq5HtdLd9xM/TlmxODCkg=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "antirez"; + repo = "lua-cmsgpack"; + rev = "0.4.0"; + hash = "sha256-oGKX5G3uNGCJOaZpjLmIJYuq5HtdLd9xM/TlmxODCkg="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "http://github.com/antirez/lua-cmsgpack"; @@ -1245,7 +1059,7 @@ buildLuarocksPackage { }; }) {}; -lua-curl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: +lua-curl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lua-curl"; version = "0.3.13-1"; @@ -1258,8 +1072,7 @@ buildLuarocksPackage { sha256 = "0gn59bwrnb2mvl8i0ycr6m3jmlgx86xlr9mwnc85zfhj7zhi5anp"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.5"; meta = { homepage = "https://github.com/Lua-cURL"; @@ -1268,30 +1081,22 @@ buildLuarocksPackage { }; }) {}; -lua-ffi-zlib = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +lua-ffi-zlib = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-ffi-zlib"; version = "0.6-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-ffi-zlib-0.6-0.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-ffi-zlib-0.6-0.rockspec"; sha256 = "060sac715f1ris13fjv6gwqm0lk6by0a2zhldxd8hdrc0jss8p34"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/hamishforbes/lua-ffi-zlib", - "rev": "61e95cb434e4047c8bc65a180c293a05bf754416", - "date": "2023-08-11T09:28:16+12:00", - "path": "/nix/store/gfyr81q84mgpgwyh28xpzlf34ndjkfwc-lua-ffi-zlib", - "sha256": "0r6vima495h0d4f8ibf3fv9b6k7rqnavgvsy78dybslrm7lwsz4p", - "hash": "sha256-l3zN6amZ6uUbOl7vt5XF+Uyz0nbDrYgcaQCWRFSN22Q=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "hamishforbes"; + repo = "lua-ffi-zlib"; + rev = "v0.6"; + hash = "sha256-l3zN6amZ6uUbOl7vt5XF+Uyz0nbDrYgcaQCWRFSN22Q="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/hamishforbes/lua-ffi-zlib"; @@ -1299,7 +1104,7 @@ buildLuarocksPackage { }; }) {}; -lua-iconv = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: +lua-iconv = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-iconv"; version = "7.0.0-4"; @@ -1312,8 +1117,7 @@ buildLuarocksPackage { sha256 = "0arp0h342hpp4kfdxc69yxspziky4v7c13jbf12yrs8f1lnjzr0x"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/lunarmodules/lua-iconv/"; @@ -1322,30 +1126,23 @@ buildLuarocksPackage { }; }) {}; -lua-lsp = callPackage({ buildLuarocksPackage, dkjson, fetchgit, fetchurl, inspect, lpeglabel, lua, luaAtLeast, luaOlder }: +lua-lsp = callPackage({ buildLuarocksPackage, dkjson, fetchFromGitHub, fetchurl, inspect, lpeglabel, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lua-lsp"; version = "0.1.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-lsp-0.1.0-2.rockspec"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-lsp-0.1.0-2.rockspec"; sha256 = "19jsz00qlgbyims6cg8i40la7v8kr7zsxrrr3dg0kdg0i36xqs6c"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/Alloyed/lua-lsp", - "rev": "6afbe53b43d9fb2e70edad50081cc3062ca3d78f", - "date": "2020-10-17T15:07:11-04:00", - "path": "/nix/store/qn9syhm875k1qardhhsp025cm3dbnqvm-lua-lsp", - "sha256": "17k3jq61jz6j9bz4vc3hmsfx1s26cfgq1acja8fqyixljklmsbqp", - "hash": "sha256-Fy9d6ZS0R48dUpKpgJ9jRujQna5wsE3+StJ8GQyWY54=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "Alloyed"; + repo = "lua-lsp"; + rev = "v0.1.0"; + hash = "sha256-Fy9d6ZS0R48dUpKpgJ9jRujQna5wsE3+StJ8GQyWY54="; + }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ dkjson inspect lpeglabel lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.4"; + propagatedBuildInputs = [ dkjson inspect lpeglabel ]; meta = { homepage = "https://github.com/Alloyed/lua-lsp"; @@ -1354,7 +1151,7 @@ buildLuarocksPackage { }; }) {}; -lua-messagepack = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: +lua-messagepack = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-messagepack"; version = "0.5.4-1"; @@ -1367,8 +1164,7 @@ buildLuarocksPackage { sha256 = "0kk1n9kf6wip8k2xx4wjlv7647biji2p86v4jf0h6d6wkaypq0kz"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://fperrad.frama.io/lua-MessagePack/"; @@ -1377,30 +1173,22 @@ buildLuarocksPackage { }; }) {}; -lua-protobuf = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +lua-protobuf = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-protobuf"; - version = "0.5.0-1"; + version = "0.5.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-protobuf-0.5.0-1.rockspec"; - sha256 = "08z73rsqi7ysdyjcwfqyr8z6i5r43kx5fd8l32wlzv6cx6yvlqc9"; + url = "mirror://luarocks/lua-protobuf-0.5.1-1.rockspec"; + sha256 = "1ljn0xwrhcr49k4fzrh0g1q13j16sa6h3wd5q62995q4jlrmnhja"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/starwing/lua-protobuf.git", - "rev": "a256c34e12cad643d6ad189bddcbc314da9b0658", - "date": "2023-04-30T02:11:27+08:00", - "path": "/nix/store/n7ihjh36kp2f80016f9y8xydia2pclzq-lua-protobuf", - "sha256": "1kbanbgvmzcfnxq30f8hmirgc1d768lacpjihis9961pc7w96l9n", - "hash": "sha256-NlGT+GE3mJR0hFFepigypwX2cqwQOTBwt479ut+yas0=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "starwing"; + repo = "lua-protobuf"; + rev = "0.5.1"; + hash = "sha256-Di4fahYlTFfJ2xM6KMs5BY44JV7IKBxxR345uk8X9W8="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/starwing/lua-protobuf"; @@ -1410,30 +1198,22 @@ buildLuarocksPackage { }; }) {}; -lua-resty-http = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +lua-resty-http = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-resty-http"; - version = "0.17.1-0"; + version = "0.17.2-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-http-0.17.1-0.rockspec"; - sha256 = "05gid7c5i459clw707z1jic42s52ap4z66dbr9ims5znaq5s3wdk"; + url = "mirror://luarocks/lua-resty-http-0.17.2-0.rockspec"; + sha256 = "10swbq779d1q794d17269v0ln26hblsk7kvxj9s60rx71skzql6s"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/ledgetech/lua-resty-http", - "rev": "4ab4269cf442ba52507aa2c718f606054452fcad", - "date": "2023-03-22T09:48:56+00:00", - "path": "/nix/store/ykd1d5fa56i1c286k58jm233lqvdv2mi-lua-resty-http", - "sha256": "0xdhygjqjpfkq1bq8b09fichww57q1z694lz16i3hcc3g4sr4hxg", - "hash": "sha256-r0OSNXmDMTiiCZ+SZH7Ap3AOWXQJLIRXwNNdieXzsHU=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "ledgetech"; + repo = "lua-resty-http"; + rev = "v0.17.2"; + hash = "sha256-Ph3PpzQYKYMvPvjYwx4TeZ9RYoryMsO6mLpkAq/qlHY="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/ledgetech/lua-resty-http"; @@ -1442,7 +1222,7 @@ buildLuarocksPackage { }; }) {}; -lua-resty-jwt = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-resty-openssl, luaOlder }: +lua-resty-jwt = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lua-resty-openssl, luaOlder }: buildLuarocksPackage { pname = "lua-resty-jwt"; version = "0.2.3-0"; @@ -1450,22 +1230,15 @@ buildLuarocksPackage { url = "mirror://luarocks/lua-resty-jwt-0.2.3-0.rockspec"; sha256 = "1fxdwfr4pna3fdfm85kin97n53caq73h807wjb59wpqiynbqzc8c"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/cdbattags/lua-resty-jwt", - "rev": "b3d5c085643fa95099e72a609c57095802106ff9", - "date": "2021-01-20T16:53:57-05:00", - "path": "/nix/store/z4a8ffxj2i3gbjp0f8r377cdp88lkzl4-lua-resty-jwt", - "sha256": "07w8r8gqbby06x493qzislig7a3giw0anqr4ivp3g2ms8v9fnng6", - "hash": "sha256-5lnr0ka6ijfujiRjqwCPb6jzItXx45FIN8CvhR/KiB8=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "cdbattags"; + repo = "lua-resty-jwt"; + rev = "v0.2.3"; + hash = "sha256-m8UbvKk2DR8yCYX9Uv5HjXcZDVyVeRlUKp7UiaN/SkA="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua lua-resty-openssl ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ lua-resty-openssl ]; meta = { homepage = "https://github.com/cdbattags/lua-resty-jwt"; @@ -1474,7 +1247,7 @@ buildLuarocksPackage { }; }) {}; -lua-resty-openidc = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-resty-http, lua-resty-jwt, lua-resty-session, luaOlder }: +lua-resty-openidc = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lua-resty-http, lua-resty-jwt, lua-resty-session, luaOlder }: buildLuarocksPackage { pname = "lua-resty-openidc"; version = "1.7.6-3"; @@ -1482,22 +1255,15 @@ buildLuarocksPackage { url = "mirror://luarocks/lua-resty-openidc-1.7.6-3.rockspec"; sha256 = "08nq24kxw51xiyyp5jailyqjfsgz4m4fzy4hb7g3fv76vcsf8msp"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/zmartzone/lua-resty-openidc", - "rev": "5a7b9e2cfe4f5aab7c60032e6ca94d2d534f7d19", - "date": "2023-01-30T19:06:51+01:00", - "path": "/nix/store/nyd2jqhlq8gx4chapqyxk2q4dsxgm8hz-lua-resty-openidc", - "sha256": "15dh9z7y84n840x02xsn2m9h9hdakbbv4p1z7dfz85v5w5i6c86p", - "hash": "sha256-1yBmYuFlF/RdOz9csteaqsEEUxVWdwE6IMgS5M9PsJU=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "zmartzone"; + repo = "lua-resty-openidc"; + rev = "v1.7.6"; + hash = "sha256-1yBmYuFlF/RdOz9csteaqsEEUxVWdwE6IMgS5M9PsJU="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua lua-resty-http lua-resty-jwt lua-resty-session ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ lua-resty-http lua-resty-jwt lua-resty-session ]; meta = { homepage = "https://github.com/zmartzone/lua-resty-openidc"; @@ -1506,27 +1272,20 @@ buildLuarocksPackage { }; }) {}; -lua-resty-openssl = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: +lua-resty-openssl = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "1.0.2-1"; + version = "1.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-1.0.2-1.rockspec"; - sha256 = "000ak4rfm56z7g2b7jr7k2m4hp6kcx970cnv29acjazrz6kr60r2"; + url = "mirror://luarocks/lua-resty-openssl-1.3.1-1.rockspec"; + sha256 = "1rqsmsnnnz78yb0x2xf7764l3rk54ngk3adm6an4g7dm5kryv33f"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/fffonion/lua-resty-openssl.git", - "rev": "5aba923e78ae0f213f3b4719effa879e3971821f", - "date": "2023-11-22T15:44:01+08:00", - "path": "/nix/store/fww02frnja73z8bhxqz5nyji5nam77ab-lua-resty-openssl", - "sha256": "10fxfjafl9wyv2jz7j25xkklx1c2ykvi0yqskyij45d0rzimil5z", - "hash": "sha256-v9BY48+gFSKjnxp7EPf0goVO5+xFyPOl2J4n6pR03YE=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "fffonion"; + repo = "lua-resty-openssl"; + rev = "1.3.1"; + hash = "sha256-4h6oIdiMyW9enJToUBtRuUdnKSyWuFFxIDvj4dFRKDs="; + }; meta = { @@ -1536,7 +1295,7 @@ buildLuarocksPackage { }; }) {}; -lua-resty-session = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-ffi-zlib, lua-resty-openssl, luaOlder }: +lua-resty-session = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lua-ffi-zlib, lua-resty-openssl, luaOlder }: buildLuarocksPackage { pname = "lua-resty-session"; version = "4.0.5-1"; @@ -1544,22 +1303,15 @@ buildLuarocksPackage { url = "mirror://luarocks/lua-resty-session-4.0.5-1.rockspec"; sha256 = "0h0kqwna46mrraq310qjb7yigxwv13n4czk24xnqr21czxsskzkg"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/bungle/lua-resty-session.git", - "rev": "5f2aed616d16fa7ca04dc40e23d6941740cd634d", - "date": "2023-08-16T18:24:43+03:00", - "path": "/nix/store/s6i1idv9lx52x7lcl0kc2c9sm9pic4kq-lua-resty-session", - "sha256": "08pih1baqhlvsqvcr1zzympmn8v7gskmis6ffhigll37hbzvljcz", - "hash": "sha256-n0m6/4JnUPoidM7oWKd+ZyNbb/X/h8w21ptCrFaA8SI=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "bungle"; + repo = "lua-resty-session"; + rev = "v4.0.5"; + hash = "sha256-n0m6/4JnUPoidM7oWKd+ZyNbb/X/h8w21ptCrFaA8SI="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua lua-ffi-zlib lua-resty-openssl ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ lua-ffi-zlib lua-resty-openssl ]; meta = { homepage = "https://github.com/bungle/lua-resty-session"; @@ -1568,27 +1320,20 @@ buildLuarocksPackage { }; }) {}; -lua-rtoml = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder, luarocks-build-rust-mlua }: +lua-rtoml = callPackage({ buildLuarocksPackage, fetchFromGitHub, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "lua-rtoml"; version = "0.2-0"; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lblasc/lua-rtoml.git", - "rev": "c83f56b9519d85968d663308e303f384c55c7b18", - "date": "2023-11-02T14:28:19+01:00", - "path": "/nix/store/x6mm838p27gwk45j23jkd0cpzxncxgci-lua-rtoml", - "sha256": "11i2km1k686nbh2ylfrcn3grd816vdhnigjjaiykkgwj0i8il6ix", - "hash": "sha256-PRoaUQSSvzl9VFK+aGHbJqCW37AsO+oFXNYgM0OdIoY=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "lblasc"; + repo = "lua-rtoml"; + rev = "c83f56b9519d85968d663308e303f384c55c7b18"; + hash = "sha256-PRoaUQSSvzl9VFK+aGHbJqCW37AsO+oFXNYgM0OdIoY="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua luarocks-build-rust-mlua ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ luarocks-build-rust-mlua ]; meta = { homepage = "https://github.com/lblasc/lua-rtoml"; @@ -1598,27 +1343,19 @@ buildLuarocksPackage { }; }) {}; -lua-subprocess = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: +lua-subprocess = callPackage({ buildLuarocksPackage, fetchFromGitHub, luaOlder }: buildLuarocksPackage { pname = "subprocess"; version = "scm-1"; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/0x0ade/lua-subprocess.git", - "rev": "bfa8e97da774141f301cfd1106dca53a30a4de54", - "date": "2021-01-09T22:31:54+01:00", - "path": "/nix/store/3lr7n1k85kbf718wxr51xd40i8dfs5qd-lua-subprocess", - "sha256": "0p91hda0b0hpgdbff5drcyygaizq086gw8vnvzn0y0fg3mc9if70", - "hash": "sha256-4LiYWB3PAQ/s33Yj/gwC+Ef1vGe5FedWexeCBVSDIV0=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "0x0ade"; + repo = "lua-subprocess"; + rev = "bfa8e97da774141f301cfd1106dca53a30a4de54"; + hash = "sha256-4LiYWB3PAQ/s33Yj/gwC+Ef1vGe5FedWexeCBVSDIV0="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/xlq/lua-subprocess"; @@ -1631,14 +1368,14 @@ buildLuarocksPackage { lua-term = callPackage({ buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "lua-term"; - version = "0.7-1"; + version = "0.8-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-term-0.7-1.rockspec"; - sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; + url = "mirror://luarocks/lua-term-0.8-1.rockspec"; + sha256 = "1728lj3x8shc5m1yczrl75szq15rnfpzk36n0m49181ly9wxn7s0"; }).outPath; src = fetchurl { - url = "https://github.com/hoelzro/lua-term/archive/0.07.tar.gz"; - sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; + url = "https://github.com/hoelzro/lua-term/archive/0.08.tar.gz"; + sha256 = "1vfdg5dzqdi3gn6wpc9a3djhsl6fn2ikqdwr8rrqrnd91qwlzycg"; }; @@ -1649,7 +1386,7 @@ buildLuarocksPackage { }; }) {}; -lua-toml = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +lua-toml = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-toml"; version = "2.0-1"; @@ -1657,22 +1394,14 @@ buildLuarocksPackage { url = "mirror://luarocks/lua-toml-2.0-1.rockspec"; sha256 = "0zd3hrj1ifq89rjby3yn9y96vk20ablljvqdap981navzlbb7zvq"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/jonstoler/lua-toml.git", - "rev": "13731a5dd48c8c314d2451760604810bd6221085", - "date": "2017-12-08T16:30:50-08:00", - "path": "/nix/store/cnpflpyj441c65jhb68hjr2bcvnj9han-lua-toml", - "sha256": "0lklhgs4n7gbgva5frs39240da1y4nwlx6yxaj3ix6r5lp9sh07b", - "hash": "sha256-6wCo06Ulmx6HVN2bTrklPqgGiEhDZ1fUfusdS/SDdFI=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "jonstoler"; + repo = "lua-toml"; + rev = "v2.0.1"; + hash = "sha256-6wCo06Ulmx6HVN2bTrklPqgGiEhDZ1fUfusdS/SDdFI="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/jonstoler/lua-toml"; @@ -1681,881 +1410,7 @@ buildLuarocksPackage { }; }) {}; -lua-yajl = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "lua-yajl"; - version = "2.0-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-yajl-2.0-1.rockspec"; - sha256 = "0h600zgq5qc9z3cid1kr35q3qb98alg0m3qf0a3mfj33hya6pcxp"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/brimworks/lua-yajl.git", - "rev": "c0b598a70966b6cabc57a110037faf9091436f30", - "date": "2020-11-12T06:22:23-08:00", - "path": "/nix/store/9acgxpqk52kwn03m5xasn4f6mmsby2r9-lua-yajl", - "sha256": "1frry90y7vqnw1rd1dfnksilynh0n24gfhkmjd6wwba73prrg0pf", - "hash": "sha256-7oKX8x1HLc5Nk3VC94iwAFpPo57WtdBy4Bbv40HyObs=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://github.com/brimworks/lua-yajl"; - description = "Integrate the yajl JSON library with Lua."; - maintainers = with lib.maintainers; [ pstn ]; - license.fullName = "MIT/X11"; - }; -}) {}; - -lua-zlib = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "lua-zlib"; - version = "1.2-2"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-zlib-1.2-2.rockspec"; - sha256 = "1ycjy59w6rkhasqqbiyra0f1sj87fswcz25zwxy4gyv7rrwy5hxd"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/brimworks/lua-zlib.git", - "rev": "a305d98f473d0a253b6fd740ce60d7d5a5f1cda0", - "date": "2017-10-07T08:26:37-07:00", - "path": "/nix/store/6hjfczd3xkilkdxidgqzdrwmaiwnlf05-lua-zlib", - "sha256": "1cv12s5c5lihmf3hb0rz05qf13yihy1bjpb7448v8mkiss6y1s5c", - "hash": "sha256-rOjgjdZxVrQRIWdduYKH0Y/gcAE/gwWHqzDSwooWYbM=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://github.com/brimworks/lua-zlib"; - description = "Simple streaming interface to zlib for Lua."; - maintainers = with lib.maintainers; [ koral ]; - license.fullName = "MIT"; - }; -}) {}; - -lua_cliargs = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "lua_cliargs"; - version = "3.0-2"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/lua_cliargs-3.0-2.rockspec"; - sha256 = "0vlmwrldwlxdfkak9kapydfs4ny4pwg3qpkv5agn6lw6gq0aq5za"; - }).outPath; - src = fetchurl { - url = "https://github.com/amireh/lua_cliargs/archive/v3.0-2.tar.gz"; - sha256 = "0vhpgmy9a8wlxp8a15pnfqfk0aj7pyyb5m41nnfxynx580a6y7cp"; - }; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://github.com/amireh/lua_cliargs"; - description = "A command-line argument parser."; - license.fullName = "MIT "; - }; -}) {}; - -luabitop = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: -buildLuarocksPackage { - pname = "luabitop"; - version = "1.0.2-3"; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/teto/luabitop.git", - "rev": "8d7b674386460ca83e9510b3a8a4481344eb90ad", - "date": "2021-08-30T10:14:03+02:00", - "path": "/nix/store/sdnza0zpmlkz9jppnysasbvqy29f4zia-luabitop", - "sha256": "1b57f99lrjbwsi4m23cq5kpj0dbpxh3xwr0mxs2rzykr2ijpgwrw", - "hash": "sha256-PPN3ZRR5+p+F7hVk3gfsdzUg7yyYDVFJ1HzJTFNyp6w=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://bitop.luajit.org/"; - description = "Lua Bit Operations Module"; - license.fullName = "MIT/X license"; - }; -}) {}; - -luacheck = callPackage({ argparse, buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luafilesystem }: -buildLuarocksPackage { - pname = "luacheck"; - version = "1.1.1-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luacheck-1.1.1-1.rockspec"; - sha256 = "11nrryqff2yis5s7jscbyv221p21i9sh924x7g9l3d6ijns8zmba"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lunarmodules/luacheck.git", - "rev": "ababb6d403d634eb74d2c541035e9ede966e710d", - "date": "2023-06-10T11:27:25+03:00", - "path": "/nix/store/wkrhda7nww45g1waxdv9ghm35mwbvlfq-luacheck", - "sha256": "0abd5rfxv667n8d8v3g9cnkyghiwzhj3yk498gr2agd3mfcni7d7", - "hash": "sha256-p51omaujPSXyQ4lMPyT8PMLnp2XpjY0asseY3V0ubSk=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ argparse lua luafilesystem ]; - - meta = { - homepage = "https://github.com/lunarmodules/luacheck"; - description = "A static analyzer and a linter for Lua"; - license.fullName = "MIT"; - }; -}) {}; - -luacov = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: -buildLuarocksPackage { - pname = "luacov"; - version = "0.15.0-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luacov-0.15.0-1.rockspec"; - sha256 = "18byfl23c73pazi60hsx0vd74hqq80mzixab76j36cyn8k4ni9db"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/keplerproject/luacov.git", - "rev": "19b52ca0298c8942df82dd441d7a4a588db4c413", - "date": "2021-02-15T18:47:58-03:00", - "path": "/nix/store/9vm38il9knzx2m66m250qj1fzdfzqg0y-luacov", - "sha256": "08550nna6qcb5jn6ds1hjm6010y8973wx4qbf9vrvrcn1k2yr6ki", - "hash": "sha256-cZrsxQyW5Z13cguTzsdJyIMATJUw6GasLItho6wFpSA=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://keplerproject.github.io/luacov/"; - description = "Coverage analysis tool for Lua scripts"; - license.fullName = "MIT"; - }; -}) {}; - -luadbi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: -buildLuarocksPackage { - pname = "luadbi"; - version = "0.7.2-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luadbi-0.7.2-1.rockspec"; - sha256 = "0lj1qki20w6bl76cvlcazlmwh170b9wkv5nwlxbrr3cn6w7h370b"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/mwild1/luadbi", - "rev": "73a234c4689e4f87b7520276b6159cc7f6cfd6e0", - "date": "2019-01-14T09:39:17+00:00", - "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", - "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", - "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://github.com/mwild1/luadbi"; - description = "Database abstraction layer"; - license.fullName = "MIT/X11"; - }; -}) {}; - -luadbi-mysql = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: -buildLuarocksPackage { - pname = "luadbi-mysql"; - version = "0.7.2-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luadbi-mysql-0.7.2-1.rockspec"; - sha256 = "0gnyqnvcfif06rzzrdw6w6hchp4jrjiwm0rmfx2r8ljchj2bvml5"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/mwild1/luadbi", - "rev": "73a234c4689e4f87b7520276b6159cc7f6cfd6e0", - "date": "2019-01-14T09:39:17+00:00", - "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", - "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", - "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua luadbi ]; - - meta = { - homepage = "https://github.com/mwild1/luadbi"; - description = "Database abstraction layer"; - license.fullName = "MIT/X11"; - }; -}) {}; - -luadbi-postgresql = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: -buildLuarocksPackage { - pname = "luadbi-postgresql"; - version = "0.7.2-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luadbi-postgresql-0.7.2-1.rockspec"; - sha256 = "07rx4agw4hjyzf8157apdwfqh9s26nqndmkr3wm7v09ygjvdjiix"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/mwild1/luadbi", - "rev": "73a234c4689e4f87b7520276b6159cc7f6cfd6e0", - "date": "2019-01-14T09:39:17+00:00", - "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", - "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", - "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua luadbi ]; - - meta = { - homepage = "https://github.com/mwild1/luadbi"; - description = "Database abstraction layer"; - license.fullName = "MIT/X11"; - }; -}) {}; - -luadbi-sqlite3 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: -buildLuarocksPackage { - pname = "luadbi-sqlite3"; - version = "0.7.2-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luadbi-sqlite3-0.7.2-1.rockspec"; - sha256 = "022iba0jbiafz8iv1h0iv95rhcivbfq5yg341nxk3dm87yf220vh"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/mwild1/luadbi", - "rev": "73a234c4689e4f87b7520276b6159cc7f6cfd6e0", - "date": "2019-01-14T09:39:17+00:00", - "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", - "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", - "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua luadbi ]; - - meta = { - homepage = "https://github.com/mwild1/luadbi"; - description = "Database abstraction layer"; - license.fullName = "MIT/X11"; - }; -}) {}; - -luaepnf = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lpeg, lua, luaAtLeast, luaOlder }: -buildLuarocksPackage { - pname = "luaepnf"; - version = "0.3-2"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luaepnf-0.3-2.rockspec"; - sha256 = "0kqmnj11wmfpc9mz04zzq8ab4mnbkrhcgc525wrq6pgl3p5li8aa"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/siffiejoe/lua-luaepnf.git", - "rev": "4e0a867ff54cf424e1558781f5d2c85d2dc2137c", - "date": "2015-01-15T16:54:10+01:00", - "path": "/nix/store/n7gb0z26sl7dzdyy3bx1y3cz3npsna7d-lua-luaepnf", - "sha256": "1lvsi3fklhvz671jgg0iqn0xbkzn9qjcbf2ks41xxjz3lapjr6c9", - "hash": "sha256-iZksr6Ljy94D0VO4xSRO9s/VgcURvCfDMX9DOt2IetM=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lpeg lua ]; - - meta = { - homepage = "http://siffiejoe.github.io/lua-luaepnf/"; - description = "Extended PEG Notation Format (easy grammars for LPeg)"; - license.fullName = "MIT"; - }; -}) {}; - -luaevent = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "luaevent"; - version = "0.4.6-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luaevent-0.4.6-1.rockspec"; - sha256 = "03zixadhx4a7nh67n0sm6sy97c8i9va1a78hibhrl7cfbqc2zc7f"; - }).outPath; - src = fetchurl { - url = "https://github.com/harningt/luaevent/archive/v0.4.6.tar.gz"; - sha256 = "0pbh315d3p7hxgzmbhphkcldxv2dadbka96131b8j5914nxvl4nx"; - }; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://github.com/harningt/luaevent"; - description = "libevent binding for Lua"; - license.fullName = "MIT"; - }; -}) {}; - -luaexpat = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "luaexpat"; - version = "1.4.1-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luaexpat-1.4.1-1.rockspec"; - sha256 = "1abwd385x7wnza7qqz5s4aj6m2l1c23pjmbgnpq73q0s17pn1h0c"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lunarmodules/luaexpat.git", - "rev": "57f8966088abf8a00f8ab0bf88e1b6deea89c0bb", - "date": "2022-10-04T16:36:23+02:00", - "path": "/nix/store/dgrdkalikpqdap642qhppha1ajdnsvx0-luaexpat", - "sha256": "1b4ck23p01ks3hgayan9n33f2kb6jvv63v4ww2mqczc09rqi0q46", - "hash": "sha256-hmAQcU6AfYar4JzsYfaWZk3hxrDJKq8eHHoGcIeYjKw=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://lunarmodules.github.io/luaexpat"; - description = "XML Expat parsing"; - maintainers = with lib.maintainers; [ arobyn flosse ]; - license.fullName = "MIT/X11"; - }; -}) {}; - -luaffi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "luaffi"; - version = "scm-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luaffi-scm-1.rockspec"; - sha256 = "1nia0g4n1yv1sbv5np572y8yfai56a8bnscir807s5kj5bs0xhxm"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/facebook/luaffifb.git", - "rev": "a1cb731b08c91643b0665935eb5622b3d621211b", - "date": "2021-03-01T11:46:30-05:00", - "path": "/nix/store/6dwfn64p3clcsxkq41b307q8izi0fvji-luaffifb", - "sha256": "0nj76fw3yi57vfn35yvbdmpdbg9gmn5j1gw84ajs9w1j86sc0661", - "hash": "sha256-wRjAtEEy8KSlIoi/IIutL73Vbm1r+zKs26dEP7gzR1o=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://github.com/facebook/luaffifb"; - description = "FFI library for calling C functions from lua"; - license.fullName = "BSD"; - }; -}) {}; - -luafilesystem = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "luafilesystem"; - version = "1.8.0-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luafilesystem-1.8.0-1.rockspec"; - sha256 = "18nkaks0b75dmycljg5vljap5w8d0ysdkg96yl5szgzr7nzrymfa"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/keplerproject/luafilesystem", - "rev": "7c6e1b013caec0602ca4796df3b1d7253a2dd258", - "date": "2020-04-22T22:16:42-03:00", - "path": "/nix/store/qzjav1cmn4zwclpfs0xzykpbv835d84z-luafilesystem", - "sha256": "16hpwhj6zgkjns3zilcg3lxfijm3cl71v39y9n5lbjk4b9kkwh54", - "hash": "sha256-pEA+Z1pkykWLTT6NHQ5lo8roOh2P0fiHtnK+byTkF5o=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://github.com/keplerproject/luafilesystem"; - description = "File System Library for the Lua Programming Language"; - maintainers = with lib.maintainers; [ flosse ]; - license.fullName = "MIT/X11"; - }; -}) {}; - -lualdap = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "lualdap"; - version = "1.4.0-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/lualdap-1.4.0-1.rockspec"; - sha256 = "0n924gxm6ccr9hjk4bi5z70vgh7g75dl7293pab41a2qcrlsj9nk"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lualdap/lualdap", - "rev": "7a73c883012f9d12a05563afbb3481a57055368c", - "date": "2023-11-04T09:38:06+01:00", - "path": "/nix/store/7j6wl1f9qg4kh9zwm8fnc0ky7zhf7qbf-lualdap", - "sha256": "0xq0xi3ymg5lk6dh7782ddjnz5bjycd2xnc5dp1cwssi37nm7pdv", - "hash": "sha256-u91T7RlRa87CbYXZLhrzcpVvZWsCnQObmbS86kfsAHc=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://lualdap.github.io/lualdap/"; - description = "A Lua interface to the OpenLDAP library"; - maintainers = with lib.maintainers; [ aanderse ]; - license.fullName = "MIT"; - }; -}) {}; - -lualogging = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, luasocket }: -buildLuarocksPackage { - pname = "lualogging"; - version = "1.8.2-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/lualogging-1.8.2-1.rockspec"; - sha256 = "164c4xgwkv2ya8fbb22wm48ywc4gx939b574r6bgl8zqayffdqmx"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lunarmodules/lualogging.git", - "rev": "465c994788f1bc18fca950934fa5ec9a909f496c", - "date": "2023-01-27T20:29:41+01:00", - "path": "/nix/store/pvb3yq11xgqhq6559sjd8rkf1x991rrz-lualogging", - "sha256": "1mz5iiv9pfikkm4ay7j0q6mk3bmcxylnlg9piwda47xxc1zyb1j4", - "hash": "sha256-RIblf2C9H6Iajzc9aqnvrK4xq8FAHq9InTO6m3aM5dc=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - propagatedBuildInputs = [ luasocket ]; - - meta = { - homepage = "https://github.com/lunarmodules/lualogging"; - description = "A simple API to use logging features"; - license.fullName = "MIT/X11"; - }; -}) {}; - -luaossl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua }: -buildLuarocksPackage { - pname = "luaossl"; - version = "20220711-0"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luaossl-20220711-0.rockspec"; - sha256 = "0b68kvfz587ilmb5c1p7920kysg9q4m4fl4cz4d93jl3270mzh8y"; - }).outPath; - src = fetchzip { - url = "https://github.com/wahern/luaossl/archive/rel-20220711.zip"; - sha256 = "1a9pgmc6fbhgh1m9ksz9fq057yzz46npqgakcsy9vngg47xacfdb"; - }; - - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://25thandclement.com/~william/projects/luaossl.html"; - description = "Most comprehensive OpenSSL module in the Lua universe."; - license.fullName = "MIT/X11"; - }; -}) {}; - -luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: -buildLuarocksPackage { - pname = "luaposix"; - version = "34.1.1-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luaposix-34.1.1-1.rockspec"; - sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; - }).outPath; - src = fetchzip { - url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; - sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl"; - }; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ bit32 lua ]; - - meta = { - homepage = "http://github.com/luaposix/luaposix/"; - description = "Lua bindings for POSIX"; - maintainers = with lib.maintainers; [ vyp lblasc ]; - license.fullName = "MIT/X11"; - }; -}) {}; - -luarepl = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "luarepl"; - version = "0.10-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luarepl-0.10-1.rockspec"; - sha256 = "12zdljfs4wg55mj7a38iwg7p5i1pmc934v9qlpi61sw4brp6x8d3"; - }).outPath; - src = fetchurl { - url = "https://github.com/hoelzro/lua-repl/archive/0.10.tar.gz"; - sha256 = "0wv37h9w6y5pgr39m7yxbf8imkwvaila6rnwjcp0xsxl5c1rzfjm"; - }; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://github.com/hoelzro/lua-repl"; - description = "A reusable REPL component for Lua, written in Lua"; - license.fullName = "MIT/X11"; - }; -}) {}; - -luarocks-build-rust-mlua = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: -buildLuarocksPackage { - pname = "luarocks-build-rust-mlua"; - version = "0.1.2-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-build-rust-mlua-0.1.2-1.rockspec"; - sha256 = "1sx908fm2ihpxz2mm54xzkfmdzlqdvrqjkh1zz7rcjgmqba4mh1j"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/khvzak/luarocks-build-rust-mlua", - "rev": "c8080aa0832563b7f8b2cb85a195c1598ce312e0", - "date": "2023-06-29T16:47:41+01:00", - "path": "/nix/store/n7id28r1m11xd550hayv99xhz96vpdjq-luarocks-build-rust-mlua", - "sha256": "1zh1p5k7xpczi5db3k0fw0ljw9w0xxk1qjjcfg5rcznqjf48i3x7", - "hash": "sha256-p4+IiJPYfpbLc0xKHGbvgCcuKeAOzLFaiZ/dfma5Af4=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - - meta = { - homepage = "https://github.com/khvzak/luarocks-build-rust-mlua"; - description = "A LuaRocks build backend for Lua modules written in Rust using mlua"; - maintainers = with lib.maintainers; [ mrcjkb ]; - license.fullName = "MIT"; - }; -}) {}; - -luasec = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luasocket }: -buildLuarocksPackage { - pname = "luasec"; - version = "1.3.2-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luasec-1.3.2-1.rockspec"; - sha256 = "09nqs60cmbq1bi70cdh7v5xjnlsm2mrxv9pmbbvczijvz184jh33"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/brunoos/luasec", - "rev": "4c06287052d68fdbe7429b8f967cdc8ee94aa44a", - "date": "2023-08-31T17:09:53-03:00", - "path": "/nix/store/wnl78b5l3dxw52slphmi4rmr1cd8bd3r-luasec", - "sha256": "0rrdfbnkd8pgqwh3f0iyd5cxy7g1h0568a88m3sq1z7715js4yx3", - "hash": "sha256-o3uiZQnn/ID1qAgpZAqA4R3fWWk+Ajcgx++iNu1yLWc=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua luasocket ]; - - meta = { - homepage = "https://github.com/brunoos/luasec/wiki"; - description = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket."; - maintainers = with lib.maintainers; [ flosse ]; - license.fullName = "MIT"; - }; -}) {}; - -luasnip = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, jsregexp, lua, luaOlder }: -buildLuarocksPackage { - pname = "luasnip"; - version = "2.1.1-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luasnip-2.1.1-1.rockspec"; - sha256 = "1jrdai8qsanr6x2vqp70hipsxrxh0abvwr2xwh9p4wr29k4wyycb"; - }).outPath; - src = fetchzip { - url = "https://github.com/L3MON4D3/LuaSnip/archive/v2.1.1.zip"; - sha256 = "0mbpwf3sxfrmrza13d9w0hlcmzlrj551g332syp1qhs94abfnnrd"; - }; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ jsregexp lua ]; - - meta = { - homepage = "https://github.com/L3MON4D3/LuaSnip"; - description = "Snippet Engine for Neovim written in Lua."; - license.fullName = "Apache-2.0"; - }; -}) {}; - -luasocket = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "luasocket"; - version = "3.1.0-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luasocket-3.1.0-1.rockspec"; - sha256 = "0wg9735cyz2gj7r9za8yi83w765g0f4pahnny7h0pdpx58pgfx4r"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lunarmodules/luasocket.git", - "rev": "95b7efa9da506ef968c1347edf3fc56370f0deed", - "date": "2022-07-27T10:07:00+03:00", - "path": "/nix/store/r5pqxqjkdwl80nmjkv400mbls7cfymjc-luasocket", - "sha256": "13hyf9cvny0kxwyg08929kkl31w74j66fj6zg1myyjr9nh5b795h", - "hash": "sha256-sKSzCrQpS+9reN9IZ4wkh4dB50wiIfA87xN4u1lyHo4=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://github.com/lunarmodules/luasocket"; - description = "Network support for the Lua language"; - license.fullName = "MIT"; - }; -}) {}; - -luasql-sqlite3 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "luasql-sqlite3"; - version = "2.6.0-2"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luasql-sqlite3-2.6.0-2.rockspec"; - sha256 = "1xpbcpl4qhnzpyyszhdsrxhx2qc1dmndh926lv91xwphw7inwdwg"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/keplerproject/luasql.git", - "rev": "25bf4ffce9323d28cb6f382f7ec9e8951e3084f9", - "date": "2023-07-19T14:20:27-03:00", - "path": "/nix/store/949886jxp7sx3yx910lc6d1yf3ym9mx5-luasql", - "sha256": "00q73j2nzqsm0vmxjkv83qh1dncmr5dgmkrkyxnb5ggygvcbh7w5", - "hash": "sha256-hR+42H7+vbJs9zPP+lrJldkWIB5oT9nrBlXjb4UcBwM=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://www.keplerproject.org/luasql/"; - description = "Database connectivity for Lua (SQLite3 driver)"; - maintainers = with lib.maintainers; [ vyp ]; - license.fullName = "MIT/X11"; - }; -}) {}; - -luassert = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, say }: -buildLuarocksPackage { - pname = "luassert"; - version = "1.9.0-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luassert-1.9.0-1.rockspec"; - sha256 = "1bkzr03190p33lprgy51nl84aq082fyc3f7s3wkk7zlay4byycxd"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lunarmodules/luassert.git", - "rev": "8d8dc8a54cc468048a128a867f6449a6c3fdd11a", - "date": "2022-08-24T00:00:45+03:00", - "path": "/nix/store/vfcl25wxps5kvh5prjkkjlj1ga3kgw63-luassert", - "sha256": "0wlp6qdm9dkwzs8lvnj7zvmid4y12v717ywlhxn2brkbjpvl2dwf", - "hash": "sha256-jjdB95Vr5iVsh5T7E84WwZMW6/5H2k2R/ny2VBs2l3I=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua say ]; - - meta = { - homepage = "https://lunarmodules.github.io/busted/"; - description = "Lua assertions extension"; - license.fullName = "MIT "; - }; -}) {}; - -luasystem = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "luasystem"; - version = "0.2.1-0"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luasystem-0.2.1-0.rockspec"; - sha256 = "0xj5q7lzsbmlw5d3zbjqf3jpj78wcn348h2jcxn5ph4n4hx73z3n"; - }).outPath; - src = fetchurl { - url = "https://github.com/o-lim/luasystem/archive/v0.2.1.tar.gz"; - sha256 = "150bbklchh02gsvpngv56xrrlxxvwpqwrh0yy6z95fnvks7gd0qb"; - }; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://olivinelabs.com/luasystem/"; - description = "Platform independent system calls for Lua."; - license.fullName = "MIT "; - }; -}) {}; - -luaunbound = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: -buildLuarocksPackage { - pname = "luaunbound"; - version = "1.0.0-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luaunbound-1.0.0-1.rockspec"; - sha256 = "1zlkibdwrj5p97nhs33cz8xx0323z3kiq5x7v0h3i7v6j0h8ppvn"; - }).outPath; - src = fetchurl { - url = "https://code.zash.se/dl/luaunbound/luaunbound-1.0.0.tar.gz"; - sha256 = "1lsh0ylp5xskygxl5qdv6mhkm1x8xp0vfd5prk5hxkr19jk5mr3d"; - }; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://www.zash.se/luaunbound.html"; - description = "A binding to libunbound"; - license.fullName = "MIT"; - }; -}) {}; - -luaunit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: -buildLuarocksPackage { - pname = "luaunit"; - version = "3.4-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luaunit-3.4-1.rockspec"; - sha256 = "111435fa8p2819vcvg76qmknj0wqk01gy9d1nh55c36616xnj54n"; - }).outPath; - src = fetchzip { - url = "https://github.com/bluebird75/luaunit/releases/download/LUAUNIT_V3_4/rock-luaunit-3.4.zip"; - sha256 = "0qf07y3229lq3qq1mfkv83gzbc7dgyr67hysqjb5bbk333flv56r"; - }; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://github.com/bluebird75/luaunit"; - description = "A unit testing framework for Lua"; - maintainers = with lib.maintainers; [ lockejan ]; - license.fullName = "BSD"; - }; -}) {}; - -luautf8 = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "luautf8"; - version = "0.1.5-2"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luautf8-0.1.5-2.rockspec"; - sha256 = "0v788kk1aj7r70w9fgjlp3qrpjbpa9z9l1m7d13csk0pgfkm5iqz"; - }).outPath; - src = fetchurl { - url = "https://github.com/starwing/luautf8/archive/refs/tags/0.1.5.tar.gz"; - sha256 = "077ji840wfmy7hq0y13l01dv6jhasznykf89gk9m672jhz6dxggl"; - }; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://github.com/starwing/luautf8"; - description = "A UTF-8 support module for Lua"; - maintainers = with lib.maintainers; [ pstn ]; - license.fullName = "MIT"; - }; -}) {}; - -lua-utils-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: +lua-utils-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lua-utils.nvim"; version = "1.0.2-1"; @@ -2568,8 +1423,7 @@ buildLuarocksPackage { sha256 = "0bnl2kvxs55l8cjhfpa834bm010n8r4gmsmivjcp548c076msagn"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/nvim-neorg/lua-utils.nvim"; @@ -2579,7 +1433,774 @@ buildLuarocksPackage { }; }) {}; -luazip = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: +lua-yajl = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "lua-yajl"; + version = "2.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lua-yajl-2.0-1.rockspec"; + sha256 = "0h600zgq5qc9z3cid1kr35q3qb98alg0m3qf0a3mfj33hya6pcxp"; + }).outPath; + src = fetchFromGitHub { + owner = "brimworks"; + repo = "lua-yajl"; + rev = "v2.0"; + hash = "sha256-/UhdjTUzd5ZsQG3CaS6i0cYOgkLR4TJCUAcw5yYhYEI="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "http://github.com/brimworks/lua-yajl"; + description = "Integrate the yajl JSON library with Lua."; + maintainers = with lib.maintainers; [ pstn ]; + license.fullName = "MIT/X11"; + }; +}) {}; + +lua-zlib = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "lua-zlib"; + version = "1.2-2"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lua-zlib-1.2-2.rockspec"; + sha256 = "1ycjy59w6rkhasqqbiyra0f1sj87fswcz25zwxy4gyv7rrwy5hxd"; + }).outPath; + src = fetchFromGitHub { + owner = "brimworks"; + repo = "lua-zlib"; + rev = "v1.2"; + hash = "sha256-3gDYO4KcGUmcJFV22NDXWrFDwHNmPvMp++iXrz+QbC0="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/brimworks/lua-zlib"; + description = "Simple streaming interface to zlib for Lua."; + maintainers = with lib.maintainers; [ koral ]; + license.fullName = "MIT"; + }; +}) {}; + +lua_cliargs = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "lua_cliargs"; + version = "3.0.2-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lua_cliargs-3.0.2-1.rockspec"; + sha256 = "1gp3n9ipaqdk59ilqx1ci5faxmx4dh9sgg3279jb8yfa7wg5b8pf"; + }).outPath; + src = fetchFromGitHub { + owner = "lunarmodules"; + repo = "lua_cliargs"; + rev = "v3.0.2"; + hash = "sha256-wL3qBQ8Lu3q8DK2Kaeo1dgzIHd8evaxFYJg47CcQiSg="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/lunarmodules/lua_cliargs.git"; + description = "A command-line argument parsing module for Lua"; + license.fullName = "MIT"; + }; +}) {}; + +luabitop = callPackage({ buildLuarocksPackage, fetchFromGitHub, luaAtLeast, luaOlder }: +buildLuarocksPackage { + pname = "luabitop"; + version = "1.0.2-3"; + + src = fetchFromGitHub { + owner = "teto"; + repo = "luabitop"; + rev = "96f0a3d73ae5183d0a81bc2f29326eaa06becbfd"; + hash = "sha256-PrM8ncb3TaqgVhFdRa+rUsJ5WuIzS4/DRqVqj8tCaeg="; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.3"; + + meta = { + homepage = "http://bitop.luajit.org/"; + description = "Lua Bit Operations Module"; + license.fullName = "MIT/X license"; + }; +}) {}; + +luacheck = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luafilesystem }: +buildLuarocksPackage { + pname = "luacheck"; + version = "1.1.2-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luacheck-1.1.2-1.rockspec"; + sha256 = "11p7kf7v1b5rhi3m57g2zqwzmnnp79v76gh13b0fg2c78ljkq1k9"; + }).outPath; + src = fetchFromGitHub { + owner = "lunarmodules"; + repo = "luacheck"; + rev = "v1.1.2"; + hash = "sha256-AUEHRuldlnuxBWGRzcbjM4zu5IBGfbNEUakPmpS4VIo="; + }; + + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ argparse luafilesystem ]; + + meta = { + homepage = "https://github.com/lunarmodules/luacheck"; + description = "A static analyzer and a linter for Lua"; + license.fullName = "MIT"; + }; +}) {}; + +luacov = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder }: +buildLuarocksPackage { + pname = "luacov"; + version = "0.15.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luacov-0.15.0-1.rockspec"; + sha256 = "18byfl23c73pazi60hsx0vd74hqq80mzixab76j36cyn8k4ni9db"; + }).outPath; + src = fetchFromGitHub { + owner = "keplerproject"; + repo = "luacov"; + rev = "v0.15.0"; + hash = "sha256-cZrsxQyW5Z13cguTzsdJyIMATJUw6GasLItho6wFpSA="; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + + meta = { + homepage = "https://keplerproject.github.io/luacov/"; + description = "Coverage analysis tool for Lua scripts"; + license.fullName = "MIT"; + }; +}) {}; + +luadbi = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder }: +buildLuarocksPackage { + pname = "luadbi"; + version = "0.7.3-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luadbi-0.7.3-1.rockspec"; + sha256 = "0lyiwyg6qnnj7d5rxim6b9p68nbszmwhg57xjlvalbcgwgipk1ns"; + }).outPath; + src = fetchFromGitHub { + owner = "mwild1"; + repo = "luadbi"; + rev = "v0.7.3"; + hash = "sha256-L2i/e44HvPRhGKH4pUE/6QzO8pHYymHdj2SpHf6YO/I="; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + + meta = { + homepage = "https://github.com/mwild1/luadbi"; + description = "Database abstraction layer"; + license.fullName = "MIT/X11"; + }; +}) {}; + +luadbi-mysql = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder, luadbi }: +buildLuarocksPackage { + pname = "luadbi-mysql"; + version = "0.7.3-1"; + knownRockspec = (fetchurl { + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-mysql-0.7.3-1.rockspec"; + sha256 = "1x0pl6qpdi4vmhxs2076kkxmikbv0asndh8lp34r47lym37hcrr3"; + }).outPath; + src = fetchFromGitHub { + owner = "mwild1"; + repo = "luadbi"; + rev = "v0.7.3"; + hash = "sha256-L2i/e44HvPRhGKH4pUE/6QzO8pHYymHdj2SpHf6YO/I="; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + propagatedBuildInputs = [ luadbi ]; + + meta = { + homepage = "https://github.com/mwild1/luadbi"; + description = "Database abstraction layer"; + license.fullName = "MIT/X11"; + }; +}) {}; + +luadbi-postgresql = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder, luadbi }: +buildLuarocksPackage { + pname = "luadbi-postgresql"; + version = "0.7.3-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luadbi-postgresql-0.7.3-1.rockspec"; + sha256 = "1bnjsgk7cl6wmfhmn8b0av49yabf8flhdi1jhczksvvpf32p77bw"; + }).outPath; + src = fetchFromGitHub { + owner = "mwild1"; + repo = "luadbi"; + rev = "v0.7.3"; + hash = "sha256-L2i/e44HvPRhGKH4pUE/6QzO8pHYymHdj2SpHf6YO/I="; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + propagatedBuildInputs = [ luadbi ]; + + meta = { + homepage = "https://github.com/mwild1/luadbi"; + description = "Database abstraction layer"; + license.fullName = "MIT/X11"; + }; +}) {}; + +luadbi-sqlite3 = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder, luadbi }: +buildLuarocksPackage { + pname = "luadbi-sqlite3"; + version = "0.7.3-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luadbi-sqlite3-0.7.3-1.rockspec"; + sha256 = "0ppkk1jkxw2fhc4x26h7h2bks51shl3am552phn7all5h3k7h3by"; + }).outPath; + src = fetchFromGitHub { + owner = "mwild1"; + repo = "luadbi"; + rev = "v0.7.3"; + hash = "sha256-L2i/e44HvPRhGKH4pUE/6QzO8pHYymHdj2SpHf6YO/I="; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + propagatedBuildInputs = [ luadbi ]; + + meta = { + homepage = "https://github.com/mwild1/luadbi"; + description = "Database abstraction layer"; + license.fullName = "MIT/X11"; + }; +}) {}; + +luaepnf = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lpeg, luaAtLeast, luaOlder }: +buildLuarocksPackage { + pname = "luaepnf"; + version = "0.3-2"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaepnf-0.3-2.rockspec"; + sha256 = "0kqmnj11wmfpc9mz04zzq8ab4mnbkrhcgc525wrq6pgl3p5li8aa"; + }).outPath; + src = fetchFromGitHub { + owner = "siffiejoe"; + repo = "lua-luaepnf"; + rev = "v0.3"; + hash = "sha256-iZksr6Ljy94D0VO4xSRO9s/VgcURvCfDMX9DOt2IetM="; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + propagatedBuildInputs = [ lpeg ]; + + meta = { + homepage = "http://siffiejoe.github.io/lua-luaepnf/"; + description = "Extended PEG Notation Format (easy grammars for LPeg)"; + license.fullName = "MIT"; + }; +}) {}; + +luaevent = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "luaevent"; + version = "0.4.6-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaevent-0.4.6-1.rockspec"; + sha256 = "03zixadhx4a7nh67n0sm6sy97c8i9va1a78hibhrl7cfbqc2zc7f"; + }).outPath; + src = fetchurl { + url = "https://github.com/harningt/luaevent/archive/v0.4.6.tar.gz"; + sha256 = "0pbh315d3p7hxgzmbhphkcldxv2dadbka96131b8j5914nxvl4nx"; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/harningt/luaevent"; + description = "libevent binding for Lua"; + license.fullName = "MIT"; + }; +}) {}; + +luaexpat = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "luaexpat"; + version = "1.4.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaexpat-1.4.1-1.rockspec"; + sha256 = "1abwd385x7wnza7qqz5s4aj6m2l1c23pjmbgnpq73q0s17pn1h0c"; + }).outPath; + src = fetchFromGitHub { + owner = "lunarmodules"; + repo = "luaexpat"; + rev = "1.4.1"; + hash = "sha256-SnI+a7555R/EFFdnrvJohP6uzwQiMNQPqgp0jxAI178="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://lunarmodules.github.io/luaexpat"; + description = "XML Expat parsing"; + maintainers = with lib.maintainers; [ arobyn flosse ]; + license.fullName = "MIT/X11"; + }; +}) {}; + +luaffi = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "luaffi"; + version = "scm-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaffi-scm-1.rockspec"; + sha256 = "1nia0g4n1yv1sbv5np572y8yfai56a8bnscir807s5kj5bs0xhxm"; + }).outPath; + src = fetchFromGitHub { + owner = "facebook"; + repo = "luaffifb"; + rev = "a1cb731b08c91643b0665935eb5622b3d621211b"; + hash = "sha256-wRjAtEEy8KSlIoi/IIutL73Vbm1r+zKs26dEP7gzR1o="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/facebook/luaffifb"; + description = "FFI library for calling C functions from lua"; + license.fullName = "BSD"; + }; +}) {}; + +luafilesystem = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "luafilesystem"; + version = "1.8.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luafilesystem-1.8.0-1.rockspec"; + sha256 = "18nkaks0b75dmycljg5vljap5w8d0ysdkg96yl5szgzr7nzrymfa"; + }).outPath; + src = fetchFromGitHub { + owner = "keplerproject"; + repo = "luafilesystem"; + rev = "v1_8_0"; + hash = "sha256-pEA+Z1pkykWLTT6NHQ5lo8roOh2P0fiHtnK+byTkF5o="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/keplerproject/luafilesystem"; + description = "File System Library for the Lua Programming Language"; + maintainers = with lib.maintainers; [ flosse ]; + license.fullName = "MIT/X11"; + }; +}) {}; + +lualdap = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "lualdap"; + version = "1.4.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lualdap-1.4.0-1.rockspec"; + sha256 = "0n924gxm6ccr9hjk4bi5z70vgh7g75dl7293pab41a2qcrlsj9nk"; + }).outPath; + src = fetchFromGitHub { + owner = "lualdap"; + repo = "lualdap"; + rev = "v1.4.0"; + hash = "sha256-u91T7RlRa87CbYXZLhrzcpVvZWsCnQObmbS86kfsAHc="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://lualdap.github.io/lualdap/"; + description = "A Lua interface to the OpenLDAP library"; + maintainers = with lib.maintainers; [ aanderse ]; + license.fullName = "MIT"; + }; +}) {}; + +lualogging = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luasocket }: +buildLuarocksPackage { + pname = "lualogging"; + version = "1.8.2-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lualogging-1.8.2-1.rockspec"; + sha256 = "164c4xgwkv2ya8fbb22wm48ywc4gx939b574r6bgl8zqayffdqmx"; + }).outPath; + src = fetchFromGitHub { + owner = "lunarmodules"; + repo = "lualogging"; + rev = "v1.8.2"; + hash = "sha256-RIblf2C9H6Iajzc9aqnvrK4xq8FAHq9InTO6m3aM5dc="; + }; + + propagatedBuildInputs = [ luasocket ]; + + meta = { + homepage = "https://github.com/lunarmodules/lualogging"; + description = "A simple API to use logging features"; + license.fullName = "MIT/X11"; + }; +}) {}; + +luaossl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip }: +buildLuarocksPackage { + pname = "luaossl"; + version = "20220711-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaossl-20220711-0.rockspec"; + sha256 = "0b68kvfz587ilmb5c1p7920kysg9q4m4fl4cz4d93jl3270mzh8y"; + }).outPath; + src = fetchzip { + url = "https://github.com/wahern/luaossl/archive/rel-20220711.zip"; + sha256 = "1a9pgmc6fbhgh1m9ksz9fq057yzz46npqgakcsy9vngg47xacfdb"; + }; + + + meta = { + homepage = "http://25thandclement.com/~william/projects/luaossl.html"; + description = "Most comprehensive OpenSSL module in the Lua universe."; + license.fullName = "MIT/X11"; + }; +}) {}; + +luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: +buildLuarocksPackage { + pname = "luaposix"; + version = "34.1.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaposix-34.1.1-1.rockspec"; + sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; + }).outPath; + src = fetchzip { + url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; + sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl"; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.4"; + propagatedBuildInputs = [ bit32 ]; + + meta = { + homepage = "http://github.com/luaposix/luaposix/"; + description = "Lua bindings for POSIX"; + maintainers = with lib.maintainers; [ vyp lblasc ]; + license.fullName = "MIT/X11"; + }; +}) {}; + +luarepl = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "luarepl"; + version = "0.10-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luarepl-0.10-1.rockspec"; + sha256 = "12zdljfs4wg55mj7a38iwg7p5i1pmc934v9qlpi61sw4brp6x8d3"; + }).outPath; + src = fetchurl { + url = "https://github.com/hoelzro/lua-repl/archive/0.10.tar.gz"; + sha256 = "0wv37h9w6y5pgr39m7yxbf8imkwvaila6rnwjcp0xsxl5c1rzfjm"; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/hoelzro/lua-repl"; + description = "A reusable REPL component for Lua, written in Lua"; + license.fullName = "MIT/X11"; + }; +}) {}; + +luarocks-build-rust-mlua = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: +buildLuarocksPackage { + pname = "luarocks-build-rust-mlua"; + version = "0.2.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luarocks-build-rust-mlua-0.2.0-1.rockspec"; + sha256 = "0mpxj2wpzgqffic1j6agisaawbfhh16gis29x6y60kyjq446mv0z"; + }).outPath; + src = fetchFromGitHub { + owner = "khvzak"; + repo = "luarocks-build-rust-mlua"; + rev = "0.2.0"; + hash = "sha256-f6trXv2/gzbitLXwHHrZnowEA/V5Yjb3Q9YlYr+9NBw="; + }; + + + meta = { + homepage = "https://github.com/khvzak/luarocks-build-rust-mlua"; + description = "A LuaRocks build backend for Lua modules written in Rust using mlua"; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + +luarocks-build-treesitter-parser = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, luafilesystem }: +buildLuarocksPackage { + pname = "luarocks-build-treesitter-parser"; + version = "2.0.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luarocks-build-treesitter-parser-2.0.0-1.rockspec"; + sha256 = "0ylax1r0yl5k742p8n0fq5irs2r632npigqp1qckfx7kwi89gxhb"; + }).outPath; + src = fetchzip { + url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v2.0.0.zip"; + sha256 = "0gqiwk7dk1xn5n2m0iq5c7xkrgyaxwyd1spb573l289gprvlrbn5"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua luafilesystem ]; + + meta = { + homepage = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser"; + description = "A luarocks build backend for tree-sitter parsers."; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + +luasec = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luasocket }: +buildLuarocksPackage { + pname = "luasec"; + version = "1.3.2-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luasec-1.3.2-1.rockspec"; + sha256 = "09nqs60cmbq1bi70cdh7v5xjnlsm2mrxv9pmbbvczijvz184jh33"; + }).outPath; + src = fetchFromGitHub { + owner = "brunoos"; + repo = "luasec"; + rev = "v1.3.2"; + hash = "sha256-o3uiZQnn/ID1qAgpZAqA4R3fWWk+Ajcgx++iNu1yLWc="; + }; + + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ luasocket ]; + + meta = { + homepage = "https://github.com/brunoos/luasec/wiki"; + description = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket."; + maintainers = with lib.maintainers; [ flosse ]; + license.fullName = "MIT"; + }; +}) {}; + +luasnip = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, jsregexp, luaOlder }: +buildLuarocksPackage { + pname = "luasnip"; + version = "2.3.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luasnip-2.3.0-1.rockspec"; + sha256 = "022srpvwwbms8i97mdhkwq0yg0pfjm7a6673iyf7cr1xj15pq23v"; + }).outPath; + src = fetchzip { + url = "https://github.com/L3MON4D3/LuaSnip/archive/v2.3.0.zip"; + sha256 = "0bbackpym8k11gm32iwwzqjnqanpralanfjkl4lrs33xl7lsylqk"; + }; + + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ jsregexp ]; + + meta = { + homepage = "https://github.com/L3MON4D3/LuaSnip"; + description = "Snippet Engine for Neovim written in Lua."; + license.fullName = "Apache-2.0"; + }; +}) {}; + +luasocket = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "luasocket"; + version = "3.1.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luasocket-3.1.0-1.rockspec"; + sha256 = "0wg9735cyz2gj7r9za8yi83w765g0f4pahnny7h0pdpx58pgfx4r"; + }).outPath; + src = fetchFromGitHub { + owner = "lunarmodules"; + repo = "luasocket"; + rev = "v3.1.0"; + hash = "sha256-sKSzCrQpS+9reN9IZ4wkh4dB50wiIfA87xN4u1lyHo4="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/lunarmodules/luasocket"; + description = "Network support for the Lua language"; + license.fullName = "MIT"; + }; +}) {}; + +luasql-sqlite3 = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "luasql-sqlite3"; + version = "2.6.1-3"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luasql-sqlite3-2.6.1-3.rockspec"; + sha256 = "1qf8cx4cmsngwp65ksdsf5dsv6yhb4qwdrd2lkpyqaq6p55jfkyb"; + }).outPath; + src = fetchFromGitHub { + owner = "lunarmodules"; + repo = "luasql"; + rev = "2.6.0"; + hash = "sha256-bRddE9K9f6TFBD2nY5kkS0BzXilfUP7Z358QLPfna+I="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://lunarmodules.github.io/luasql/"; + description = "Database connectivity for Lua (SQLite3 driver)"; + maintainers = with lib.maintainers; [ vyp ]; + license.fullName = "MIT/X11"; + }; +}) {}; + +luassert = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, say }: +buildLuarocksPackage { + pname = "luassert"; + version = "1.9.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luassert-1.9.0-1.rockspec"; + sha256 = "1bkzr03190p33lprgy51nl84aq082fyc3f7s3wkk7zlay4byycxd"; + }).outPath; + src = fetchFromGitHub { + owner = "lunarmodules"; + repo = "luassert"; + rev = "v1.9.0"; + hash = "sha256-jjdB95Vr5iVsh5T7E84WwZMW6/5H2k2R/ny2VBs2l3I="; + }; + + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ say ]; + + meta = { + homepage = "https://lunarmodules.github.io/busted/"; + description = "Lua assertions extension"; + license.fullName = "MIT "; + }; +}) {}; + +luasystem = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "luasystem"; + version = "0.3.0-2"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luasystem-0.3.0-2.rockspec"; + sha256 = "02kwkcwf81v6ncxl1ng2pxlhalz78q2476snh5xxv3wnwqwbp10a"; + }).outPath; + src = fetchFromGitHub { + owner = "lunarmodules"; + repo = "luasystem"; + rev = "v0.3.0"; + hash = "sha256-oTFH0x94gSo1sqk1GsDheoVrjJHxFWZLtlJ45GwupoU="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/lunarmodules/luasystem"; + description = "Platform independent system calls for Lua."; + license.fullName = "MIT "; + }; +}) {}; + +luatext = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "luatext"; + version = "1.2.1-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luatext-1.2.1-0.rockspec"; + sha256 = "12ia4ibihd537mjmvdasnwgkinaygqwk03bsj3s0qrfhy6yz84ka"; + }).outPath; + src = fetchFromGitHub { + owner = "f4z3r"; + repo = "luatext"; + rev = "v1.2.1"; + hash = "sha256-StxCmjSSy3ok0hNkKTQyq4yS1LfX980R5pULCUjLPek="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/f4z3r/luatext/tree/main"; + description = "A small library to print colored text"; + license.fullName = "MIT"; + }; +}) {}; + +luaunbound = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder }: +buildLuarocksPackage { + pname = "luaunbound"; + version = "1.0.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaunbound-1.0.0-1.rockspec"; + sha256 = "1zlkibdwrj5p97nhs33cz8xx0323z3kiq5x7v0h3i7v6j0h8ppvn"; + }).outPath; + src = fetchurl { + url = "https://code.zash.se/dl/luaunbound/luaunbound-1.0.0.tar.gz"; + sha256 = "1lsh0ylp5xskygxl5qdv6mhkm1x8xp0vfd5prk5hxkr19jk5mr3d"; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + + meta = { + homepage = "https://www.zash.se/luaunbound.html"; + description = "A binding to libunbound"; + license.fullName = "MIT"; + }; +}) {}; + +luaunit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: +buildLuarocksPackage { + pname = "luaunit"; + version = "3.4-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaunit-3.4-1.rockspec"; + sha256 = "111435fa8p2819vcvg76qmknj0wqk01gy9d1nh55c36616xnj54n"; + }).outPath; + src = fetchzip { + url = "https://github.com/bluebird75/luaunit/releases/download/LUAUNIT_V3_4/rock-luaunit-3.4.zip"; + sha256 = "0qf07y3229lq3qq1mfkv83gzbc7dgyr67hysqjb5bbk333flv56r"; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + + meta = { + homepage = "http://github.com/bluebird75/luaunit"; + description = "A unit testing framework for Lua"; + maintainers = with lib.maintainers; [ lockejan ]; + license.fullName = "BSD"; + }; +}) {}; + +luautf8 = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "luautf8"; + version = "0.1.5-2"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luautf8-0.1.5-2.rockspec"; + sha256 = "0v788kk1aj7r70w9fgjlp3qrpjbpa9z9l1m7d13csk0pgfkm5iqz"; + }).outPath; + src = fetchurl { + url = "https://github.com/starwing/luautf8/archive/refs/tags/0.1.5.tar.gz"; + sha256 = "077ji840wfmy7hq0y13l01dv6jhasznykf89gk9m672jhz6dxggl"; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "http://github.com/starwing/luautf8"; + description = "A UTF-8 support module for Lua"; + maintainers = with lib.maintainers; [ pstn ]; + license.fullName = "MIT"; + }; +}) {}; + +luazip = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luazip"; version = "1.2.7-1"; @@ -2587,22 +2208,14 @@ buildLuarocksPackage { url = "mirror://luarocks/luazip-1.2.7-1.rockspec"; sha256 = "1wxy3p2ksaq4s8lg925mi9cvbh875gsapgkzm323dr8qaxxg7mba"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/mpeterv/luazip", - "rev": "e424f667cc5c78dd19bb5eca5a86b3c8698e0ce5", - "date": "2017-09-05T14:02:52+03:00", - "path": "/nix/store/idllj442c0iwnx1cpkrifx2afb7vh821-luazip", - "sha256": "1jlqzqlds3aa3hnp737fm2awcx0hzmwyd87klv0cv13ny5v9f2x4", - "hash": "sha256-pAuXdvF2hM3ApvOg5nn9EHTGlajujHMtHEoN3Sj+mMo=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "mpeterv"; + repo = "luazip"; + rev = "1.2.7"; + hash = "sha256-pAuXdvF2hM3ApvOg5nn9EHTGlajujHMtHEoN3Sj+mMo="; + }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.4"; meta = { homepage = "https://github.com/mpeterv/luazip"; @@ -2611,27 +2224,22 @@ buildLuarocksPackage { }; }) {}; -lush-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: +lush-nvim = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lush.nvim"; version = "scm-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lush.nvim-scm-1.rockspec"; + sha256 = "0ivir5p3mmv051pyya2hj1yrnflrv8bp38dx033i3kzfbpyg23ca"; + }).outPath; + src = fetchFromGitHub { + owner = "rktjmp"; + repo = "lush.nvim"; + rev = "7c0e27f50901481fe83b974493c4ea67a4296aeb"; + hash = "sha256-GVGIZPBrunaWexwdnkbc0LxM3xMHslrwON2FunN3TDE="; + }; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/rktjmp/lush.nvim", - "rev": "f76741886b356586f9dfe8e312fbd1ab0fd1084f", - "date": "2023-12-06T09:56:43+11:00", - "path": "/nix/store/m0zsbahbzqxfzvbgw93qw78g7r4fjhdb-lush.nvim", - "sha256": "1jvfycqg5s72gmib8038kzyy8fyanl06mkz74rjy878zv8r6nf59", - "hash": "sha256-qThrMtofHeRlJufPagC1yjvk/Z9oALRifeLo8jDzbss=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.4"; meta = { homepage = "https://github.com/rktjmp/lush.nvim"; @@ -2641,7 +2249,7 @@ buildLuarocksPackage { }; }) {}; -luuid = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder}: +luuid = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; @@ -2654,8 +2262,7 @@ buildLuarocksPackage { sha256 = "1bfkj613d05yps3fivmz0j1bxf2zkg9g1yl0ifffgw0vy00hpnvm"; }; - disabled = (luaOlder "5.2") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.2" || luaAtLeast "5.4"; meta = { homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"; @@ -2664,7 +2271,7 @@ buildLuarocksPackage { }; }) {}; -luv = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: +luv = callPackage({ buildLuarocksPackage, cmake, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luv"; version = "1.44.2-1"; @@ -2677,8 +2284,8 @@ buildLuarocksPackage { sha256 = "0c2wkszxw6gwa4l6g1d2zzh660j13lif6c7a910vq7zn8jycgd9y"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; + nativeBuildInputs = [ cmake ]; meta = { homepage = "https://github.com/luvit/luv"; @@ -2687,7 +2294,7 @@ buildLuarocksPackage { }; }) {}; -lyaml = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: +lyaml = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lyaml"; version = "6.2.8-1"; @@ -2700,8 +2307,7 @@ buildLuarocksPackage { sha256 = "0r3jjsd8x2fs1aanki0s1mvpznl16f32c1qfgmicy0icgy5xfch0"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.5"; meta = { homepage = "http://github.com/gvvaughan/lyaml"; @@ -2711,7 +2317,7 @@ buildLuarocksPackage { }; }) {}; -magick = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua }: +magick = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lua }: buildLuarocksPackage { pname = "magick"; version = "1.6.0-1"; @@ -2719,22 +2325,14 @@ buildLuarocksPackage { url = "mirror://luarocks/magick-1.6.0-1.rockspec"; sha256 = "1pg150xsxnqvlhxpiy17s9hm4dkc84v46mlwi9rhriynqz8qks9w"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/leafo/magick.git", - "rev": "6971fa700c4d392130492a3925344b51c7cc54aa", - "date": "2022-03-10T20:02:11-08:00", - "path": "/nix/store/fpl99q09zg3qnk4kagxk1djabl1dm47l-magick", - "sha256": "01b9qsz27f929rz5z7vapqhazxak74sichdwkjwb219nlhrwfncm", - "hash": "sha256-lVnHM6Q2BbG4nLxBFjU5U/WvIL5qn19+TiK5I77GaQU=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "leafo"; + repo = "magick"; + rev = "v1.6.0"; + hash = "sha256-gda+vLrWyMQ553jVCIRl1qYTS/rXsGhxrBsrJyI8EN4="; + }; - disabled = (lua.luaversion != "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = lua.luaversion != "5.1"; meta = { homepage = "https://github.com/leafo/magick.git"; @@ -2744,7 +2342,7 @@ buildLuarocksPackage { }; }) {}; -markdown = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: +markdown = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "markdown"; version = "0.33-1"; @@ -2752,22 +2350,14 @@ buildLuarocksPackage { url = "mirror://luarocks/markdown-0.33-1.rockspec"; sha256 = "02sixijfi6av8h59kx3ngrhygjn2sx1c85c0qfy20gxiz72wi1pl"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/mpeterv/markdown", - "rev": "8c09109924b218aaecbfd4d4b1de538269c4d765", - "date": "2015-09-27T17:49:28+03:00", - "path": "/nix/store/akl80hh077hm20bdqj1lksy0fn2285b5-markdown", - "sha256": "019bk2qprszqncnm8zy6ns6709iq1nwkf7i86nr38f035j4lc11y", - "hash": "sha256-PgRGiSwDODSyNSgeN7kNOCZwjLbGf1Qts/jrfLGYKwU=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "mpeterv"; + repo = "markdown"; + rev = "0.33"; + hash = "sha256-PgRGiSwDODSyNSgeN7kNOCZwjLbGf1Qts/jrfLGYKwU="; + }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.4"; meta = { homepage = "https://github.com/mpeterv/markdown"; @@ -2776,7 +2366,7 @@ buildLuarocksPackage { }; }) {}; -mediator_lua = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: +mediator_lua = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: buildLuarocksPackage { pname = "mediator_lua"; version = "1.1.2-0"; @@ -2789,8 +2379,7 @@ buildLuarocksPackage { sha256 = "16zzzhiy3y35v8advmlkzpryzxv5vji7727vwkly86q8sagqbxgs"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "http://olivinelabs.com/mediator_lua/"; @@ -2799,7 +2388,7 @@ buildLuarocksPackage { }; }) {}; -middleclass = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: +middleclass = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: buildLuarocksPackage { pname = "middleclass"; version = "4.1.1-0"; @@ -2812,8 +2401,7 @@ buildLuarocksPackage { sha256 = "11ahv0b9wgqfnabv57rb7ilsvn2vcvxb1czq6faqrsqylvr5l7nh"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/kikito/middleclass"; @@ -2822,7 +2410,7 @@ buildLuarocksPackage { }; }) {}; -mimetypes = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: +mimetypes = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: buildLuarocksPackage { pname = "mimetypes"; version = "1.0.0-3"; @@ -2835,8 +2423,7 @@ buildLuarocksPackage { sha256 = "1rc5lnzvw4cg8wxn4w4sar2xgf5vaivdd2hgpxxcqfzzcmblg1zk"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github/lunarmodules/lua-mimetypes/"; @@ -2845,28 +2432,20 @@ buildLuarocksPackage { }; }) {}; - -moonscript = callPackage({ argparse, buildLuarocksPackage, fetchgit, lpeg, lua, luaOlder, luafilesystem }: +moonscript = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, lpeg, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "moonscript"; version = "dev-1"; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/leafo/moonscript.git", - "rev": "d5341c9093c49d3724072b209cde28b5cb0f47c9", - "date": "2023-11-06T12:54:51-08:00", - "path": "/nix/store/djmh6brp03gy8nyzxjfvzkpy440fj05z-moonscript", - "sha256": "1h65cxh5rhnxx99asdydkc9yf6gnf61m97jvl03g31f65jl22lxi", - "hash": "sha256-sVMhqCzGhfEGoFueVINx9hnnE5vNN61S6t3CXGBnxcA=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "leafo"; + repo = "moonscript"; + rev = "d5341c9093c49d3724072b209cde28b5cb0f47c9"; + hash = "sha256-sVMhqCzGhfEGoFueVINx9hnnE5vNN61S6t3CXGBnxcA="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ argparse lpeg lua luafilesystem ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ argparse lpeg luafilesystem ]; meta = { homepage = "http://moonscript.org"; @@ -2879,14 +2458,14 @@ buildLuarocksPackage { mpack = callPackage({ buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "mpack"; - version = "1.0.11-0"; + version = "1.0.12-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/mpack-1.0.11-0.rockspec"; - sha256 = "0alydkccamxldij7ki42imd37630d9qnqg22pndcgkawfclfqzqa"; + url = "mirror://luarocks/mpack-1.0.12-0.rockspec"; + sha256 = "01jr8vvkqdvadr5kpgsd17gjyz729hbd609qsm682ylggabgqsyy"; }).outPath; src = fetchurl { - url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.11/libmpack-lua-1.0.11.tar.gz"; - sha256 = "15np7603rijavycvrjgjp12y64zs36390lg2hsnr5av790cfrnd2"; + url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.12/libmpack-lua-1.0.12.tar.gz"; + sha256 = "1gzqks9cq3krd9rs3dq9jm1m23pjpqjv9ymkxj9gbyjcy6qn5dh6"; }; @@ -2897,21 +2476,21 @@ buildLuarocksPackage { }; }) {}; -neotest = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, plenary-nvim }: +neotest = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, plenary-nvim }: buildLuarocksPackage { pname = "neotest"; - version = "4.2.0-1"; + version = "5.2.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/neotest-4.2.0-1.rockspec"; - sha256 = "0mkjwag6h7psff6rmsirn945ax38dszag0kwch2az2axk1nl6nj8"; + url = "mirror://luarocks/neotest-5.2.3-1.rockspec"; + sha256 = "16pwkwv2dmi9aqhp6bdbgwhksi891iz73rvksqmv136jx6fi7za1"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/neotest/archive/a2f1cb4072bb29fcc067605fb712bbd83917513e.zip"; - sha256 = "0f8rn9v26v3a6yq0wngdzrgz5rdwlpmnc74b98l1aqb2ikn6gxvd"; + url = "https://github.com/nvim-neotest/neotest/archive/5caac5cc235d495a2382bc2980630ef36ac87032.zip"; + sha256 = "1i1d6m17wf3p76nm75jk4ayd4zyhslmqi2pc7j8qx87391mnz2c4"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua plenary-nvim ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ nvim-nio plenary-nvim ]; meta = { homepage = "https://github.com/nvim-neotest/neotest"; @@ -2921,7 +2500,7 @@ buildLuarocksPackage { }; }) {}; -nlua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: +nlua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "nlua"; version = "0.1.0-1"; @@ -2934,37 +2513,30 @@ buildLuarocksPackage { sha256 = "1x3pbv5ngbk0sjgwfpjsv3x49wzq4x29d9rm0hgyyb2g2mwag3jc"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/mfussenegger/nlua"; description = "Neovim as Lua interpreter"; + maintainers = with lib.maintainers; [ teto ]; license.fullName = "GPL-3.0"; }; }) {}; -nui-nvim = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: +nui-nvim = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "nui.nvim"; - version = "0.2.0-1"; + version = "0.3.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/nui.nvim-0.2.0-1.rockspec"; - sha256 = "0v2z6lgl6hrzcjlzhis8nrkdkh9kvx8zg3q5svi5gyklg7vmcbc2"; + url = "mirror://luarocks/nui.nvim-0.3.0-1.rockspec"; + sha256 = "0ng75wzbc0bn4zgwqk7dx5hazybfqxpjfzp7k2syh7kajmsy8z8b"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/MunifTanjim/nui.nvim.git", - "rev": "9e3916e784660f55f47daa6f26053ad044db5d6a", - "date": "2023-07-20T10:45:09+06:00", - "path": "/nix/store/8zdhjgipjjhi9b1y40r2yk5np4lp39as-nui.nvim", - "sha256": "14a73dwl56kah9h36b40ir6iylvfs261ysz17qvi9vhp63vjq9cx", - "hash": "sha256-nSUs9zAX7hQ3PuFrH4zQblMfTY6ALDNggmqaQnkbR5E=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "MunifTanjim"; + repo = "nui.nvim"; + rev = "0.3.0"; + hash = "sha256-L0ebXtv794357HOAgT17xlEJsmpqIHGqGlYfDB20WTo="; + }; meta = { @@ -2975,27 +2547,19 @@ buildLuarocksPackage { }; }) {}; -nvim-cmp = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: +nvim-cmp = callPackage({ buildLuarocksPackage, fetchFromGitHub, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "nvim-cmp"; version = "scm-1"; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/hrsh7th/nvim-cmp", - "rev": "0b751f6beef40fd47375eaf53d3057e0bfa317e4", - "date": "2023-11-06T17:58:22+09:00", - "path": "/nix/store/4z8lkalcj6sk2s5aw2xcalimh3rcgixj-nvim-cmp", - "sha256": "1qp7s2iam9zzdlw5sgkk6c623z7vjgga0rcg63ja0f836l90grba", - "hash": "sha256-auUHEjUDOaDkMI9loN6T+/whDDNzPl04bf+nqqLQ5+I=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "nvim-cmp"; + rev = "8f3c541407e691af6163e2447f3af1bd6e17f9a3"; + hash = "sha256-rz+JMd/hsUEDNVan2sCuEGtbsOVi6oRmPtps+7qSXQE="; + }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.4"; meta = { homepage = "https://github.com/hrsh7th/nvim-cmp"; @@ -3004,21 +2568,20 @@ buildLuarocksPackage { }; }) {}; -nvim-nio = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: +nvim-nio = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "nvim-nio"; - version = "1.8.1-1"; + version = "1.9.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/nvim-nio-1.8.1-1.rockspec"; - sha256 = "0f9ccrli5jcvcyawkjd99nm6himnnnd6z54938rd0wjp21d8s4s9"; + url = "mirror://luarocks/nvim-nio-1.9.0-1.rockspec"; + sha256 = "0hwjkz0pjd8dfc4l7wk04ddm8qzrv5m15gskhz9gllb4frnk6hik"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/nvim-nio/archive/v1.8.1.zip"; - sha256 = "0zax50chrh7qrgh56avd5ny0lb3i0y906wk13mhbkp9i5d9anw1h"; + url = "https://github.com/nvim-neotest/nvim-nio/archive/v1.9.0.zip"; + sha256 = "0y3afl42z41ymksk29al5knasmm9wmqzby860x8zj0i0mfb1q5k5"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/nvim-neotest/nvim-nio"; @@ -3028,21 +2591,21 @@ buildLuarocksPackage { }; }) {}; -pathlib-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, nvim-nio }: +pathlib-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio }: buildLuarocksPackage { pname = "pathlib.nvim"; - version = "2.2.0-1"; + version = "2.2.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/pathlib.nvim-2.2.0-1.rockspec"; - sha256 = "0zj3psdq06822y8vl117z3y7zlc6jxwqppbv9irgwzr60wdz517n"; + url = "mirror://luarocks/pathlib.nvim-2.2.2-1.rockspec"; + sha256 = "04dklc0ibl6dbfckmkpj2s1gvjfmr0k2hyagw37rxypifncrffkr"; }).outPath; src = fetchzip { - url = "https://github.com/pysan3/pathlib.nvim/archive/v2.2.0.zip"; - sha256 = "1nyl3y0z2rrr35dyk2ypv8xjx43zamqxlpdq468iyyhfvkplz9yw"; + url = "https://github.com/pysan3/pathlib.nvim/archive/v2.2.2.zip"; + sha256 = "10jhbdffaw1rh1qppzllmy96dbsn741bk46mph5kxpjq4ldx27hz"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua nvim-nio ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ nvim-nio ]; meta = { homepage = "https://pysan3.github.io/pathlib.nvim/"; @@ -3051,27 +2614,23 @@ buildLuarocksPackage { }; }) {}; -penlight = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder, luafilesystem }: +penlight = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "penlight"; - version = "dev-1"; + version = "1.14.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/penlight-1.14.0-1.rockspec"; + sha256 = "1zmibf0pgcnf0lj1xmxs0srbyy1cswvb9g1jajy9lhicnpqqlgvh"; + }).outPath; + src = fetchFromGitHub { + owner = "lunarmodules"; + repo = "penlight"; + rev = "1.14.0"; + hash = "sha256-4zAt0GgQEkg9toaUaDn3ST3RvjLUDsuOzrKi9lhq0fQ="; + }; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lunarmodules/penlight.git", - "rev": "dc6d19c5c1e1b4ac55b14df17b7645af6b410140", - "date": "2023-09-21T10:51:09+02:00", - "path": "/nix/store/vbi0d32mbaqcra3jligv8ajq17m1wxa4-penlight", - "sha256": "12ppgby8ldh4zxwcr7cknacbdvk30fi92sgyzh1zbgvym4l44g0c", - "hash": "sha256-DDxCKKl+v/UD/P5pkaIDY+62mLKTncx4/wQ2ivx694o=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua luafilesystem ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ luafilesystem ]; meta = { homepage = "https://lunarmodules.github.io/penlight"; @@ -3081,27 +2640,20 @@ buildLuarocksPackage { }; }) {}; -plenary-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder, luassert }: +plenary-nvim = callPackage({ buildLuarocksPackage, fetchFromGitHub, luaAtLeast, luaOlder, luassert }: buildLuarocksPackage { pname = "plenary.nvim"; version = "scm-1"; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/nvim-lua/plenary.nvim", - "rev": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0", - "date": "2023-11-30T12:17:20+01:00", - "path": "/nix/store/wf35h8i4s3fdskvcy376vvzp5gi6s6mx-plenary.nvim", - "sha256": "1f6vqqafk78njpl47xgsf8p199mmvw4h4b9axab9rl86fdlibikz", - "hash": "sha256-f8YVaXMG0ZyW6iotAgnftaYULnL69UPolRad6RTG27g=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "nvim-lua"; + repo = "plenary.nvim"; + rev = "08e301982b9a057110ede7a735dd1b5285eb341f"; + hash = "sha256-vy0MXEoSM4rvYpfwbc2PnilvMOA30Urv0FAxjXuvqQ8="; + }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua luassert ]; + disabled = luaOlder "5.1" || luaAtLeast "5.4"; + propagatedBuildInputs = [ luassert ]; meta = { homepage = "http://github.com/nvim-lua/plenary.nvim"; @@ -3110,27 +2662,23 @@ buildLuarocksPackage { }; }) {}; -rapidjson = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: +rapidjson = callPackage({ buildLuarocksPackage, cmake, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "rapidjson"; version = "0.7.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/rapidjson-0.7.1-1.rockspec"; + sha256 = "01lbsn9rckdyx0va7nm9dammic9117kxiawp55yg2h5q3p978d41"; + }).outPath; + src = fetchFromGitHub { + owner = "xpol"; + repo = "lua-rapidjson"; + rev = "v0.7.1"; + hash = "sha256-y/czEVPtCt4uN1n49Qi7BrgZmkG+SDXlM5D2GvvO2qg="; + }; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/xpol/lua-rapidjson", - "rev": "242b40c8eaceb0cc43bcab88309736461cac1234", - "date": "2021-04-09T19:59:20+08:00", - "path": "/nix/store/65l71ph27pmipgrq8j4whg6n8h2avvs4-lua-rapidjson", - "sha256": "1a6srvximxlh6gjkaj5y86d1kf06pc4gby2r6wpdw2pdac8k7xyb", - "hash": "sha256-y/czEVPtCt4uN1n49Qi7BrgZmkG+SDXlM5D2GvvO2qg=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; + nativeBuildInputs = [ cmake ]; meta = { homepage = "https://github.com/xpol/lua-rapidjson"; @@ -3139,45 +2687,45 @@ buildLuarocksPackage { }; }) {}; -rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: +rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua-curl, luaOlder, mimetypes, nvim-nio, xml2lua }: buildLuarocksPackage { pname = "rest.nvim"; - version = "0.2-1"; + version = "2.0.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rest.nvim-0.2-1.rockspec"; - sha256 = "1yq8gx585c10j8kybp20swyv9q0i3lm5k0rrv4bgsbwz3ychn0k1"; + url = "mirror://luarocks/rest.nvim-2.0.1-1.rockspec"; + sha256 = "1ra76wnhi4nh56amyd8zqmg0mpsnhp3m41m3iyiq4hp1fah6nbqb"; }).outPath; src = fetchzip { - url = "https://github.com/rest-nvim/rest.nvim/archive/0.2.zip"; - sha256 = "0ycjrrl37z465p71bdkas3q2ky1jmgr2cjnirnskdc6wz14wl09g"; + url = "https://github.com/rest-nvim/rest.nvim/archive/v2.0.1.zip"; + sha256 = "09rs04d5h061zns1kdfycryx4ll8ix15q3ybpmqsdyp2gn8l77df"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ lua-curl mimetypes nvim-nio xml2lua ]; meta = { homepage = "https://github.com/rest-nvim/rest.nvim"; description = "A fast Neovim http client written in Lua"; maintainers = with lib.maintainers; [ teto ]; - license.fullName = "MIT"; + license.fullName = "GPL-3.0"; }; }) {}; -rocks-config-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, rocks-nvim }: +rocks-config-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, rocks-nvim }: buildLuarocksPackage { pname = "rocks-config.nvim"; - version = "1.2.3-1"; + version = "1.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-config.nvim-1.2.3-1.rockspec"; - sha256 = "0lwy0fkmrxbnj46jh35i9l1hmfa88a879spmasmh7kw4vpd1bbpr"; + url = "mirror://luarocks/rocks-config.nvim-1.5.0-1.rockspec"; + sha256 = "14rj1p7grmdhi3xm683c3c441xxcldhi5flh6lg1fab1rm9mij6b"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v1.2.3.zip"; - sha256 = "0byf1q18ykgs3hsz8wyjimkcnq0pl26ikxjlv0ly0acxrg9x9kcp"; + url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v1.5.0.zip"; + sha256 = "0kpvd9ddj1vhkz54ckqsym4fbj1krzpp8cslb20k8qk2n1ccjynv"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua rocks-nvim ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ rocks-nvim ]; meta = { homepage = "https://github.com/nvim-neorocks/rocks-config.nvim"; @@ -3211,21 +2759,21 @@ buildLuarocksPackage { }; }) {}; -rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, nvim-nio, rocks-nvim }: +rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }: buildLuarocksPackage { pname = "rocks-git.nvim"; - version = "1.3.0-1"; + version = "1.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-git.nvim-1.3.0-1.rockspec"; - sha256 = "196wjjdkjgqdx1lj8cxcn1xh6dysn0a0w544yc62vg6h227c6igi"; + url = "mirror://luarocks/rocks-git.nvim-1.4.0-1.rockspec"; + sha256 = "04zx6yvp5pg306wqaw6fymqci5qnzpzg27xjrycflcyxxq4xmnmg"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v1.3.0.zip"; - sha256 = "024zvl91ixb25rkpikwcxb73qfd6wsc2a5qwkwfy6sibkff7jgaq"; + url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v1.4.0.zip"; + sha256 = "0yjigf9pzy53yylznnnb68dwmylx9a3qv84kdc2whsf4cj23m2nj"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua nvim-nio rocks-nvim ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ nvim-nio rocks-nvim ]; meta = { homepage = "https://github.com/nvim-neorocks/rocks-git.nvim"; @@ -3235,45 +2783,67 @@ buildLuarocksPackage { }; }) {}; -rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, lua, luaOlder, nvim-nio, toml, toml-edit }: +rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, nvim-nio, rtp-nvim, toml-edit }: buildLuarocksPackage { pname = "rocks.nvim"; - version = "2.19.1-1"; + version = "2.26.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.19.1-1.rockspec"; - sha256 = "1n712a8wqhli2hbq8s6isa9jaxxvqy20737njakqdkakqp2xsdbs"; + url = "mirror://luarocks/rocks.nvim-2.26.0-1.rockspec"; + sha256 = "1piypyxq1c6l203f3w8z4fhfi649h5ppl58lckvxph9dvidg11lf"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.19.1.zip"; - sha256 = "1n3za055vdi6v1hx72sdrh9dpgs6g58b2haq0ad3q5ncsy951h0q"; + url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.26.0.zip"; + sha256 = "10wck99dfwxv49pkd9pva7lqr4a79zccbqvb75qbxkgnj0yd5awc"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ fidget-nvim fzy lua nvim-nio toml toml-edit ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ fidget-nvim fzy nvim-nio rtp-nvim toml-edit ]; meta = { homepage = "https://github.com/nvim-neorocks/rocks.nvim"; - description = "Neovim plugin management inspired by Cargo."; + description = "Neovim plugin management inspired by Cargo, powered by luarocks"; maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "GPL-3.0"; }; }) {}; -rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: + +rtp-nvim = callPackage ({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { - pname = "rustaceanvim"; - version = "3.9.6-1"; + pname = "rtp.nvim"; + version = "1.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-3.9.6-1.rockspec"; - sha256 = "1wlzqm8x2w9clskj2k9n9i4f0pn17dsp99a3gwwrypdlbvm9x77k"; + url = "mirror://luarocks/rtp.nvim-1.0.0-1.rockspec"; + sha256 = "0ddlwhk62g3yx1ysddsmlggfqv0hj7dljgczfwij1ijbz7qyp3hy"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/3.9.6.zip"; - sha256 = "0qmifxb0xgyym0zbizqds5scy4qrnp0hr17rg0synp2fk5iv6s5b"; + url = "https://github.com/nvim-neorocks/rtp.nvim/archive/v1.0.0.zip"; + sha256 = "1kx7qzdz8rpwsjcp63wwn619nrkxn6xd0nr5pfm3g0z4072nnpzn"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/nvim-neorocks/rtp.nvim"; + description = "Source plugin and ftdetect directories on the Neovim runtimepath."; + license.fullName = "GPL-3.0"; + }; +}) {}; + +rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: +buildLuarocksPackage { + pname = "rustaceanvim"; + version = "4.22.8-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/rustaceanvim-4.22.8-1.rockspec"; + sha256 = "18hghs9v9j3kv3fxwdp7qk9vhbxn4c8xd8pyxwnyjq5ad7ninr82"; + }).outPath; + src = fetchzip { + url = "https://github.com/mrcjkb/rustaceanvim/archive/4.22.8.zip"; + sha256 = "1n9kqr8xdqamc8hd8a155h7rzyda8bz39n0zdgdw0j8hqc214vmm"; + }; + + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/mrcjkb/rustaceanvim"; @@ -3283,27 +2853,22 @@ buildLuarocksPackage { }; }) {}; -say = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: +say = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "say"; - version = "scm-1"; + version = "1.4.1-3"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/say-1.4.1-3.rockspec"; + sha256 = "0iibmq5m5092y168banckgs15ngj2yjx11n40fyk7jly4pbasljq"; + }).outPath; + src = fetchFromGitHub { + owner = "lunarmodules"; + repo = "say"; + rev = "v1.4.1"; + hash = "sha256-IjNkK1leVtYgbEjUqguVMjbdW+0BHAOCE0pazrVuF50="; + }; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lunarmodules/say.git", - "rev": "3e1f783d0aa496eb21d16e85b2235335cb9332df", - "date": "2023-08-13T02:37:27+03:00", - "path": "/nix/store/5biavac0k8z0xg4rr3bm8z3kdi8mm8c0-say", - "sha256": "04dkf0av6n71vmz0h86i5brklvaf9p91lkldn1xldpdr0qqs0x63", - "hash": "sha256-w3SgMQa53UZ7sI1OGtJNTm068yrRIAh+3eFYsxVwsxE=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://lunarmodules.github.io/say"; @@ -3312,30 +2877,22 @@ buildLuarocksPackage { }; }) {}; -serpent = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: +serpent = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "serpent"; version = "0.30-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/serpent-0.30-2.rockspec"; - sha256 = "0v83lr9ars1n0djbh7np8jjqdhhaw0pdy2nkcqzqrhv27rzv494n"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/serpent-0.30-2.rockspec"; + sha256 = "01696wwp1m8jlcj0y1wwscnz3cpcjdvm8pcnc6c6issa2s4544vr"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/pkulchenko/serpent", - "rev": "d78683597606c6e13a1fed039bc91d86eb8f600f", - "date": "2017-09-01T21:35:14-07:00", - "path": "/nix/store/z6df44n3p07n4bia7s514vgngbkbpnap-serpent", - "sha256": "0q80yfrgqgr01qprf0hrp284ngb7fbcq1v9rbzmdkhbm9lpgy8v8", - "hash": "sha256-aCP/Lk11wdnqXzntgNlyZz1LkLgZApcvDiA//LLzAGE=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "pkulchenko"; + repo = "serpent"; + rev = "0.30"; + hash = "sha256-aCP/Lk11wdnqXzntgNlyZz1LkLgZApcvDiA//LLzAGE="; + }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.5"; meta = { homepage = "https://github.com/pkulchenko/serpent"; @@ -3345,7 +2902,7 @@ buildLuarocksPackage { }; }) {}; -sqlite = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, luv }: +sqlite = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luv }: buildLuarocksPackage { pname = "sqlite"; version = "v1.2.2-0"; @@ -3353,19 +2910,12 @@ buildLuarocksPackage { url = "mirror://luarocks/sqlite-v1.2.2-0.rockspec"; sha256 = "0jxsl9lpxsbzc6s5bwmh27mglkqz1299lz68vfxayvailwl3xbxm"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/tami5/sqlite.lua.git", - "rev": "6c00ab414dc1b69621b145908c582b747f24b46e", - "date": "2022-06-17T15:57:13+03:00", - "path": "/nix/store/637s46bsvsxfnzmy6ygig3y0vqmf3r8p-sqlite.lua", - "sha256": "0ckifx6xxrannn9szacgiiqjsp4rswghxscdl3s411dhas8djj1m", - "hash": "sha256-NUjZkFawhUD0oI3pDh/XmVwtcYyPqa+TtVbl3k13cTI=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "tami5"; + repo = "sqlite.lua"; + rev = "v1.2.2"; + hash = "sha256-NUjZkFawhUD0oI3pDh/XmVwtcYyPqa+TtVbl3k13cTI="; + }; propagatedBuildInputs = [ luv ]; @@ -3376,27 +2926,20 @@ buildLuarocksPackage { }; }) {}; -std-_debug = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: +std-_debug = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "std._debug"; - version = "git-1"; + version = "1.0.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/std._debug-1.0.1-1.rockspec"; + sha256 = "0mr9hgzfr9v37da9rfys2wjq48hi3lv27i3g38433dlgbxipsbc4"; + }).outPath; + src = fetchzip { + url = "http://github.com/lua-stdlib/_debug/archive/v1.0.1.zip"; + sha256 = "19vfpv389q79vgxwhhr09l6l6hf6h2yjp09zvnp0l07ar4v660pv"; + }; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lua-stdlib/_debug.git", - "rev": "8b80b14bbbe7259a47c160176546bb152bb2d6f1", - "date": "2023-01-31T16:39:35-07:00", - "path": "/nix/store/i24iz2hvnjp18iz9z8kljsy9iv17m2zl-_debug", - "sha256": "07z5lz3gy8wzzks79r3v68vckj42i3sybhfmqx7h2s58ld2kn5fd", - "hash": "sha256-zRU7RaOoaAFPx9XB5fWIgsjJNjJ75HT0/J8j/8an5R8=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.5"; meta = { homepage = "http://lua-stdlib.github.io/_debug"; @@ -3405,7 +2948,7 @@ buildLuarocksPackage { }; }) {}; -std-normalize = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder, std-_debug }: +std-normalize = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder, std-_debug }: buildLuarocksPackage { pname = "std.normalize"; version = "2.0.3-1"; @@ -3418,8 +2961,8 @@ buildLuarocksPackage { sha256 = "1gyywglxd2y7ck3hk8ap73w0x7hf9irpg6vgs8yc6k9k4c5g3fgi"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua std-_debug ]; + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + propagatedBuildInputs = [ std-_debug ]; meta = { homepage = "https://lua-stdlib.github.io/normalize"; @@ -3428,7 +2971,7 @@ buildLuarocksPackage { }; }) {}; -stdlib = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: +stdlib = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "stdlib"; version = "41.2.2-1"; @@ -3441,8 +2984,7 @@ buildLuarocksPackage { sha256 = "0ry6k0wh4vyar1z68s0qmqzkdkfn9lcznsl8av7x78qz6l16wfw4"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1" || luaAtLeast "5.5"; meta = { homepage = "http://lua-stdlib.github.io/lua-stdlib"; @@ -3452,7 +2994,7 @@ buildLuarocksPackage { }; }) {}; -teal-language-server = callPackage({ buildLuarocksPackage, cyan, dkjson, fetchgit, fetchurl, luafilesystem }: +teal-language-server = callPackage({ buildLuarocksPackage, cyan, dkjson, fetchFromGitHub, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "teal-language-server"; version = "dev-1"; @@ -3460,19 +3002,12 @@ buildLuarocksPackage { url = "mirror://luarocks/teal-language-server-dev-1.rockspec"; sha256 = "01l44c6bknz7ff9xqgich31hlb0yk4ms5k1hs4rhm3cs95s5vlzc"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://git@github.com/teal-language/teal-language-server.git", - "rev": "67b5d7cad60b9df472851a2c61591f2aab97da47", - "date": "2022-12-21T20:33:53-06:00", - "path": "/nix/store/qyaz38njm8qgyfxca6m6f8i4lkfcfdb0-teal-language-server", - "sha256": "12nqarykmdvxxci9l6gq2yhn4pjzzqlxyrl2c8svb97hka68wjvx", - "hash": "sha256-fUuOjJrwpLU1YoJm3yn+X15ioRf4GZoi6323On1W2Io=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "teal-language"; + repo = "teal-language-server"; + rev = "67b5d7cad60b9df472851a2c61591f2aab97da47"; + hash = "sha256-fUuOjJrwpLU1YoJm3yn+X15ioRf4GZoi6323On1W2Io="; + }; propagatedBuildInputs = [ cyan dkjson luafilesystem ]; @@ -3483,21 +3018,21 @@ buildLuarocksPackage { }; }) {}; -telescope-manix = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, telescope-nvim }: +telescope-manix = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, telescope-nvim }: buildLuarocksPackage { pname = "telescope-manix"; - version = "1.0.0-1"; + version = "1.0.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/telescope-manix-1.0.0-1.rockspec"; - sha256 = "0fhcglrnsjyhg1g2ldlb24fck9b5fnzy7kc67yjgkw62d557vjgk"; + url = "mirror://luarocks/telescope-manix-1.0.2-1.rockspec"; + sha256 = "0a5cg3kx2pv8jsr0jdpxd1ahprh55n12ggzlqiailyyskzpx94bl"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/telescope-manix/archive/1.0.0.zip"; - sha256 = "1svw724jlhchsl191bmgr50zbjl9vghkaxk3j8g0nzvrn9677b22"; + url = "https://github.com/mrcjkb/telescope-manix/archive/1.0.2.zip"; + sha256 = "0y3n270zkii123r3987xzvp194dl0q1hy234v95w7l48cf4v495k"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua telescope-nvim ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ telescope-nvim ]; meta = { homepage = "https://github.com/mrcjkb/telescope-manix"; @@ -3506,7 +3041,7 @@ buildLuarocksPackage { }; }) {}; -telescope-nvim = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, plenary-nvim }: +telescope-nvim = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lua, plenary-nvim }: buildLuarocksPackage { pname = "telescope.nvim"; version = "scm-1"; @@ -3514,22 +3049,15 @@ buildLuarocksPackage { url = "mirror://luarocks/telescope.nvim-scm-1.rockspec"; sha256 = "07mjkv1nv9b3ifxk2bbpbhvp0awblyklyz6aaqw418x4gm4q1g35"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/nvim-telescope/telescope.nvim", - "rev": "6213322ab56eb27356fdc09a5078e41e3ea7f3bc", - "date": "2023-12-06T03:50:38+00:00", - "path": "/nix/store/h1v5377aylxb6vq8v7m7wrl585vb1dzi-telescope.nvim", - "sha256": "074bq8p1bkyr12z1wy31bipb97vmqia4lsmdp2aj1v1r5x5ph736", - "hash": "sha256-Zhx4Sy857CCVuK1qSlTEdZ+0blxheB6+CNnPFS7Cixw=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope.nvim"; + rev = "35f94f0ef32d70e3664a703cefbe71bd1456d899"; + hash = "sha256-AtvZ7b2bg+Iaei4rRzTBYf76vHJH2Yq5tJAJZrZw/pk="; + }; - disabled = (lua.luaversion != "5.1"); - propagatedBuildInputs = [ lua plenary-nvim ]; + disabled = lua.luaversion != "5.1"; + propagatedBuildInputs = [ plenary-nvim ]; meta = { homepage = "https://github.com/nvim-telescope/telescope.nvim"; @@ -3538,7 +3066,7 @@ buildLuarocksPackage { }; }) {}; -tiktoken_core = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luarocks-build-rust-mlua }: +tiktoken_core = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "tiktoken_core"; version = "0.2.1-1"; @@ -3546,22 +3074,15 @@ buildLuarocksPackage { url = "mirror://luarocks/tiktoken_core-0.2.1-1.rockspec"; sha256 = "0mdmrpg82vmk0cqiqdayyk4vvl299z0xqrg58q18dfs5nc27wkla"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/gptlang/lua-tiktoken", - "rev": "61d831a81a01ba095f8c94e148b721b3aa7b1e45", - "date": "2024-03-03T23:24:06+00:00", - "path": "/nix/store/5ik17k726wl8hpz295n7dqq3438k8ddj-lua-tiktoken", - "sha256": "11lpzxmmb4zglkp9czlzggd8i46r7whpq021b5d3fx7bc5a81d3n", - "hash": "sha256-drSAVGHrdDdaWUEAfCE/2ZCI2nuffpbupO+TVWv/l4Y=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "gptlang"; + repo = "lua-tiktoken"; + rev = "0.2.1"; + hash = "sha256-drSAVGHrdDdaWUEAfCE/2ZCI2nuffpbupO+TVWv/l4Y="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua luarocks-build-rust-mlua ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ luarocks-build-rust-mlua ]; meta = { homepage = "https://github.com/gptlang/lua-tiktoken"; @@ -3571,7 +3092,7 @@ buildLuarocksPackage { }; }) {}; -tl = callPackage({ argparse, buildLuarocksPackage, compat53, fetchgit, fetchurl, luafilesystem }: +tl = callPackage({ argparse, buildLuarocksPackage, compat53, fetchFromGitHub, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "tl"; version = "0.15.3-1"; @@ -3579,19 +3100,12 @@ buildLuarocksPackage { url = "mirror://luarocks/tl-0.15.3-1.rockspec"; sha256 = "15p67r5bjp997pymjq80yn1gyf7r5g2nwkachkwx88100ihblqrc"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/teal-language/tl", - "rev": "28f8fd9eb1a756267b8cde25990dfae27f8f5bcc", - "date": "2023-11-05T23:31:17-03:00", - "path": "/nix/store/8qbkpkni2ci042ryzjh0nfxnrmmckg3l-tl", - "sha256": "0spr0zajy8i91n0jqmjpgdcsryrlras6fv60np9ml1rfirh0yk4y", - "hash": "sha256-nkwPYI4uB1rTtcBsZ7TKNPusWXtXViyBDSkiL9UH+Wo=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "teal-language"; + repo = "tl"; + rev = "v0.15.3"; + hash = "sha256-nkwPYI4uB1rTtcBsZ7TKNPusWXtXViyBDSkiL9UH+Wo="; + }; propagatedBuildInputs = [ argparse compat53 luafilesystem ]; @@ -3636,7 +3150,7 @@ buildLuarocksPackage { }; }) {}; -toml-edit = callPackage({ buildLuarocksPackage, fetchzip, fetchurl, lua, luaOlder }: +toml-edit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "toml-edit"; version = "0.3.6-1"; @@ -3649,8 +3163,8 @@ buildLuarocksPackage { sha256 = "19v6axraj2n22lmilfr4x9nr40kcjb6wnpsfhf1mh2zy9nsd6ji6"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; + nativeBuildInputs = [ luarocks-build-rust-mlua ]; meta = { homepage = "https://github.com/vhyrro/toml-edit.lua"; @@ -3660,27 +3174,43 @@ buildLuarocksPackage { }; }) {}; -vstruct = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: +tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip }: +buildLuarocksPackage { + pname = "tree-sitter-norg"; + version = "0.2.4-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/tree-sitter-norg-0.2.4-1.rockspec"; + sha256 = "00mgn1kmhhrink64s1yjnz78lc7qbv0f021dsvr6z3b44srhcxb9"; + }).outPath; + src = fetchzip { + url = "https://github.com/nvim-neorg/tree-sitter-norg/archive/v0.2.4.zip"; + sha256 = "08bsk3v61r0xhracanjv25jccqv80ahipx0mv5a1slzhcyymv8kd"; + }; + + + meta = { + homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; + description = "The official tree-sitter parser for Norg documents."; + license.fullName = "MIT"; + }; +}) {}; + +vstruct = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "vstruct"; version = "2.1.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/vstruct-2.1.1-1.rockspec"; + sha256 = "111ff5207hspda9fpj9dqdd699rax0df3abdnfbmdbdy3j07dd04"; + }).outPath; + src = fetchFromGitHub { + owner = "ToxicFrog"; + repo = "vstruct"; + rev = "v2.1.1"; + hash = "sha256-p9yRJ3Kr6WQ4vBSTOVLoX6peNCJW6b6kgXCySg7aiWo="; + }; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/ToxicFrog/vstruct.git", - "rev": "924d3dd63043189e4a7ef6b1b54b19208054cc0f", - "date": "2020-05-06T23:13:06-04:00", - "path": "/nix/store/a4i9k5hx9xiz38bij4hb505dg088jkss-vstruct", - "sha256": "0sl9v874mckhh6jbxsan48s5xajzx193k4qlphw69sdbf8kr3p57", - "hash": "sha256-p9yRJ3Kr6WQ4vBSTOVLoX6peNCJW6b6kgXCySg7aiWo=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/ToxicFrog/vstruct"; @@ -3688,29 +3218,22 @@ buildLuarocksPackage { }; }) {}; -vusted = callPackage({ buildLuarocksPackage, busted, fetchgit, fetchurl }: +vusted = callPackage({ buildLuarocksPackage, busted, fetchFromGitHub, fetchurl, luasystem }: buildLuarocksPackage { pname = "vusted"; - version = "2.3.3-1"; + version = "2.3.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/vusted-2.3.3-1.rockspec"; - sha256 = "0h1v9p327yfqnbwi2rw3k47vwbpqx5rn679rfx5dszn3s6wp5g6p"; + url = "mirror://luarocks/vusted-2.3.4-1.rockspec"; + sha256 = "1yzdr0xgsjfr4a80a2zrj58ls0gmms407q4h1dx75sszppzvm1wc"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/notomo/vusted.git", - "rev": "69a5a5f453cf2fc2984e1ba4eea91384e59f9da1", - "date": "2023-11-06T21:06:04+09:00", - "path": "/nix/store/85m6md82nl3jj853s9mhsc4dy0isws8b-vusted", - "sha256": "012n09hy4q0im2bv0vprkanv6xqdppaz6f7gwp87nxsmk88q8mxv", - "hash": "sha256-u1eEEZpVd3vQ5e8489W9DXezrZr5brCXqBFg4mECVgQ=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "notomo"; + repo = "vusted"; + rev = "v2.3.4"; + hash = "sha256-Zh54mHNrbFH5qygzsXVv+Vc7oUP+RIQXBvK+UvaGvxY="; + }; - propagatedBuildInputs = [ busted ]; + propagatedBuildInputs = [ busted luasystem ]; meta = { homepage = "https://github.com/notomo/vusted"; @@ -3720,7 +3243,7 @@ buildLuarocksPackage { }; }) {}; -xml2lua = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +xml2lua = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "xml2lua"; version = "1.5-2"; @@ -3728,29 +3251,23 @@ buildLuarocksPackage { url = "mirror://luarocks/xml2lua-1.5-2.rockspec"; sha256 = "1h0zszjzi65jc2rmpam7ai38sx2ph09q66jkik5mgzr6cxm1cm4h"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/manoelcampos/xml2lua", - "rev": "b24be89a154d49b33295958584944bfd7ba2b24e", - "date": "2021-07-13T10:22:09-03:00", - "path": "/nix/store/i5dvpc0mhhw7jbrvg4bsz1scs0kvmx5f-xml2lua", - "sha256": "1vk3chcpq8b98dss5kwskbzxig58zar0jgi8mizdccw4rx698c44", - "hash": "sha256-hDCUTM+EM9Z+rCg+CbL6qLzY/5qaz6J1Q2khfBlkY+4=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; + src = fetchFromGitHub { + owner = "manoelcampos"; + repo = "xml2lua"; + rev = "v1.5-2"; + hash = "sha256-hDCUTM+EM9Z+rCg+CbL6qLzY/5qaz6J1Q2khfBlkY+4="; + }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = luaOlder "5.1"; meta = { homepage = "http://manoelcampos.github.io/xml2lua/"; description = "An XML Parser written entirely in Lua that works for Lua 5.1+"; + maintainers = with lib.maintainers; [ teto ]; license.fullName = "MIT"; }; }) {}; + } /* GENERATED - do not edit this file */ diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/nfd/default.nix b/third_party/nixpkgs/pkgs/development/lua-modules/nfd/default.nix index 5c2ffabc9b..1cc8d66044 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/nfd/default.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/nfd/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib -, substituteAll, zenity, AppKit }: +{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua51Packages, lua, pkg-config, lib, substituteAll, zenity, AppKit}: buildLuarocksPackage { pname = "nfd"; @@ -22,15 +21,22 @@ buildLuarocksPackage { ]; knownRockspec = "lua/nfd-scm-1.rockspec"; - luarocksConfig.LUA_LIBDIR = "${lua}/lib"; + luarocksConfig.variables.LUA_LIBDIR = "${lua}/lib"; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; - fixupPhase = '' + postInstall = '' find $out -name nfd_zenity.so -execdir mv {} nfd.so \; ''; + doInstallCheck = true; + installCheckInputs = [ lua.pkgs.busted ]; + installCheckPhase= '' + busted lua/spec/ + ''; + + meta = { description = "A tiny, neat lua library that portably invokes native file open and save dialogs."; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix index 31ff2e6e3c..7eea1ba993 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -6,6 +6,7 @@ # plenary utilities , which , findutils +, clang , coreutils , curl , cyrus_sasl @@ -47,6 +48,7 @@ , sol2 , sqlite , tomlplusplus +, tree-sitter , unbound , vimPlugins , vimUtils @@ -91,7 +93,7 @@ in ]; postConfigure = '' substituteInPlace ''${rockspecFilename} \ - --replace "'lua_cliargs = 3.0-1'," "'lua_cliargs >= 3.0-1'," + --replace-fail "'lua_cliargs = 3.0'," "'lua_cliargs >= 3.0-1'," ''; postInstall = '' installShellCompletion --cmd busted \ @@ -150,9 +152,9 @@ in # we have to invoke busted manually fzy = prev.fzy.overrideAttrs(oa: { doCheck = true; - nativeCheckInputs = [ prev.busted ]; + nativeCheckInputs = [ final.busted ]; checkPhase = '' - busted test/test.lua + busted ''; }); @@ -235,6 +237,10 @@ in preConfigure = '' make rock ''; + + # Lua 5.4 support is experimental at the moment, see + # https://github.com/lgi-devs/lgi/pull/249 + meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; }); lmathx = prev.luaLib.overrideLuarocks prev.lmathx (drv: @@ -427,6 +433,13 @@ in # meta.broken = true; # }); + lua-resty-openidc = prev.lua-resty-openidc.overrideAttrs (_: { + postConfigure = '' + substituteInPlace ''${rockspecFilename} \ + --replace '"lua-resty-session >= 2.8, <= 3.10",' '"lua-resty-session >= 2.8",' + ''; + }); + lua-yajl = prev.lua-yajl.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ yajl @@ -480,6 +493,16 @@ in }; }); + haskell-tools-nvim = prev.haskell-tools-nvim.overrideAttrs(oa: { + doCheck = lua.luaversion == "5.1"; + nativeCheckInputs = [ final.nlua final.busted ]; + checkPhase = '' + runHook preCheck + export HOME=$(mktemp -d) + busted --lua=nlua + runHook postCheck + ''; + }); plenary-nvim = prev.plenary-nvim.overrideAttrs (oa: { postPatch = '' @@ -585,6 +608,15 @@ in }; }); + nlua = prev.nlua.overrideAttrs(oa: { + + # patchShebang removes the nvim in nlua's shebang so we hardcode one + postFixup = '' + sed -i -e "1 s|.*|#\!${coreutils}/bin/env -S ${neovim-unwrapped}/bin/nvim -l|" "$out/bin/nlua" + ''; + dontPatchShebangs = true; + }); + rapidjson = prev.rapidjson.overrideAttrs (oa: { preBuild = '' sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt @@ -617,7 +649,8 @@ in tar xf *.tar.gz ''; - propagatedBuildInputs = [ lua luaposix + propagatedBuildInputs = [ + luaposix readline.out ]; @@ -672,12 +705,15 @@ in toml = prev.toml.overrideAttrs (oa: { patches = [ ./toml.patch ]; - propagatedBuildInputs = oa.propagatedBuildInputs ++ [ magic-enum sol2 ]; + nativeBuildInputs = oa.nativeBuildInputs ++ [ tomlplusplus ]; + propagatedBuildInputs = oa.propagatedBuildInputs ++ [ sol2 ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace \ - "TOML_PLUS_PLUS_SRC" \ - "${tomlplusplus.src}" + substituteInPlace CMakeLists.txt \ + --replace-fail "TOML_PLUS_PLUS_SRC" "${tomlplusplus.src}/include/toml++" \ + --replace-fail "MAGIC_ENUM_SRC" "${magic-enum.src}/include/magic_enum" + + cat CMakeLists.txt ''; }); @@ -688,11 +724,7 @@ in hash = "sha256-2P+mokkjdj2PccQG/kAGnIoUPVnK2FqNfYpHPhsp8kw="; }; - nativeBuildInputs = let - # HACK: luarocks-nix doesn't pick up rockspec build dependencies, - # so we have to pass the correct package in here. - lua = lib.head oa.propagatedBuildInputs; - in oa.nativeBuildInputs ++ [ + nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook lua.pkgs.luarocks-build-rust-mlua @@ -700,11 +732,31 @@ in }); + tree-sitter-norg = prev.tree-sitter-norg.overrideAttrs (oa: { + nativeBuildInputs = let + # HACK: luarocks-nix doesn't pick up rockspec build dependencies, + # so we have to pass the correct package in here. + lua = lib.head oa.propagatedBuildInputs; + in oa.nativeBuildInputs ++ [ + lua.pkgs.luarocks-build-treesitter-parser + ] ++ (lib.optionals stdenv.isDarwin [ + clang + tree-sitter + ]); + meta.broken = (luaOlder "5.1" || stdenv.isDarwin); + }); + vstruct = prev.vstruct.overrideAttrs (_: { meta.broken = (luaOlder "5.1" || luaAtLeast "5.4"); }); vusted = prev.vusted.overrideAttrs (_: { + postConfigure = '' + cat ''${rockspecFilename} + substituteInPlace ''${rockspecFilename} \ + --replace-fail '"luasystem = 0.2.1",' "'luasystem >= 0.2'," + ''; + # make sure vusted_entry.vim doesn't get wrapped postInstall = '' chmod -x $out/bin/vusted_entry.vim diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/toml.patch b/third_party/nixpkgs/pkgs/development/lua-modules/toml.patch index 5f9f57a445..e04fc5d630 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/toml.patch +++ b/third_party/nixpkgs/pkgs/development/lua-modules/toml.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ab3884c..9432df7 100644 +index ab3884c..c0fd356 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -38,26 +38,17 @@ include(FetchContent) +@@ -38,32 +38,23 @@ include(FetchContent) FetchContent_Declare( ${TOML++} @@ -32,12 +32,30 @@ index ab3884c..9432df7 100644 ) FetchContent_GetProperties(${TOML++}) + if(NOT ${TOML++}_POPULATED) + message(STATUS "Cloning ${TOML++}") +- FetchContent_Populate(${TOML++}) ++ FetchContent_Populate(${TOML++}) + FetchContent_MakeAvailable(${TOML++}) + endif() + @@ -113,7 +104,7 @@ if(NOT LUA_INCLUDE_DIR OR (WIN32 AND NOT LUA_LIBRARIES)) find_package(Lua) endif() -include_directories(${LUA_INCLUDE_DIR} src src/include ${${TOML++}_SOURCE_DIR} ${${SOL2}_SOURCE_DIR}/include ${${MAGIC_ENUM}_SOURCE_DIR}/include) -+include_directories(${LUA_INCLUDE_DIR} src src/include TOML_PLUS_PLUS_SRC ${${SOL2}_SOURCE_DIR}/include ${${MAGIC_ENUM}_SOURCE_DIR}/include) ++include_directories(${LUA_INCLUDE_DIR} src src/include TOML_PLUS_PLUS_SRC ${${SOL2}_SOURCE_DIR}/include MAGIC_ENUM_SRC) set(SOURCES src/toml.cpp +@@ -129,8 +120,8 @@ source_group(src FILES ${SOURCES}) + + if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") + target_link_options(toml.lua PUBLIC ${PROJECT_SOURCE_DIR}\\libs\\lua51.lib) +-else() +- target_link_libraries(toml.lua ${LUA_LIBRARIES}) ++else() ++ target_link_libraries(toml.lua ${LUA_LIBRARIES}) + endif() + + if (LINK_FLAGS) diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/updater/.flake8 b/third_party/nixpkgs/pkgs/development/lua-modules/updater/.flake8 index 16f76a4362..7ad3e937c9 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/updater/.flake8 +++ b/third_party/nixpkgs/pkgs/development/lua-modules/updater/.flake8 @@ -4,3 +4,5 @@ # E123 buggy ignore = E501,E265,E402 + +max-line-length = 120 diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/updater/updater.py b/third_party/nixpkgs/pkgs/development/lua-modules/updater/updater.py index 407b4104b7..f0a91a3139 100755 --- a/third_party/nixpkgs/pkgs/development/lua-modules/updater/updater.py +++ b/third_party/nixpkgs/pkgs/development/lua-modules/updater/updater.py @@ -49,8 +49,8 @@ FOOTER = """ class LuaPlugin: name: str """Name of the plugin, as seen on luarocks.org""" - src: str - """address to the git repository""" + rockspec: str + """Full path towards the rockspec""" ref: Optional[str] """git reference (branch name/tag)""" version: Optional[str] @@ -103,7 +103,7 @@ class LuaEditor(pluginupdate.Editor): f.write(HEADER) header2 = textwrap.dedent( """ - { stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: + { stdenv, lib, fetchurl, fetchgit, callPackage, ... }: final: prev: { """ @@ -171,16 +171,17 @@ def generate_pkg_nix(plug: LuaPlugin): if plug.maintainers: cmd.append(f"--maintainers={plug.maintainers}") - if plug.src != "": - if plug.src is None: + if plug.rockspec != "": + if plug.ref or plug.version: msg = ( - "src must be set when 'version' is set to \"src\" for package %s" + "'version' and 'ref' will be ignored as the rockspec is hardcoded for package %s" % plug.name ) - log.error(msg) - raise RuntimeError(msg) - log.debug("Updating from source %s", plug.src) - cmd.append(plug.src) + log.warn(msg) + + log.debug("Updating from rockspec %s", plug.rockspec) + cmd.append(plug.rockspec) + # update the plugin from luarocks else: cmd.append(plug.name) diff --git a/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix b/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix index 146d41321c..812f063a3c 100644 --- a/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.279"; + version = "0.6.284"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jQkaMFTArXPSCm6aBQb/vb4JEkgHtmzJl/Iz/f/pBSY="; + sha256 = "sha256-G70309GQ3C7ZBS4baRKN3Ms4MBvCmLmPorbByZy4Qh4="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/third_party/nixpkgs/pkgs/development/misc/h3/default.nix b/third_party/nixpkgs/pkgs/development/misc/h3/default.nix index a672bf38b0..d30bdbc3e6 100644 --- a/third_party/nixpkgs/pkgs/development/misc/h3/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/h3/default.nix @@ -39,7 +39,7 @@ let license = licenses.asl20; changelog = "https://github.com/uber/h3/raw/v${version}/CHANGELOG.md"; platforms = platforms.all; - maintainers = with maintainers; [ kalbasit marsam ]; + maintainers = with maintainers; [ kalbasit ]; }; }; in diff --git a/third_party/nixpkgs/pkgs/development/misc/loc/default.nix b/third_party/nixpkgs/pkgs/development/misc/loc/default.nix index 405c45cd4a..23453e92e7 100644 --- a/third_party/nixpkgs/pkgs/development/misc/loc/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/loc/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { description = "Count lines of code quickly"; mainProgram = "loc"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/README.md b/third_party/nixpkgs/pkgs/development/misc/resholve/README.md index 734ff26d8c..3d8ae6d966 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/README.md +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/README.md @@ -102,19 +102,19 @@ trivial, so I'll also link to some real-world examples: ```nix { resholvedScript = resholve.writeScript "name" { - inputs = [ file ]; - interpreter = "${bash}/bin/bash"; - } '' - echo "Hello" - file . - ''; + inputs = [ file ]; + interpreter = "${bash}/bin/bash"; + } '' + echo "Hello" + file . + ''; resholvedScriptBin = resholve.writeScriptBin "name" { - inputs = [ file ]; - interpreter = "${bash}/bin/bash"; - } '' - echo "Hello" - file . - ''; + inputs = [ file ]; + interpreter = "${bash}/bin/bash"; + } '' + echo "Hello" + file . + ''; } ``` @@ -230,7 +230,7 @@ from the manpage, and the Nix equivalents: # all single-word directives use `true` as value aliases = true; "$GIT" = [ "gix" ]; - interpreter = "/bin/bash"; + "/bin/bash" = true; }; # --keep 'source:$HOME /etc/bashrc ~/.bashrc' diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/source.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/source.nix index 1492e36857..7d843d61b1 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/source.nix +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/source.nix @@ -3,11 +3,11 @@ }: rec { - version = "0.10.2"; + version = "0.10.5"; rSrc = fetchFromGitHub { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-QXIX3Ai9HUFosvhfYTUJILZ588cvxTzULUUp1LYkQ0A="; + hash = "sha256-SzJbA0wLeSwvXnAE4bTNqh0tnpFPkn6N1hp7sZGAkB4="; }; } diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix index e9551b5be2..887c4e45cd 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix @@ -18,7 +18,6 @@ , gettext , rSrc , runDemo ? false -, fetchpatch , binlore , sqlite , unixtools @@ -26,6 +25,39 @@ , rlwrap , gnutar , bc +# override testing +, esh +, getconf +, libarchive +, locale +, mount +, ncurses +, nixos-install-tools +, nixos-rebuild +, procps +, ps +# known consumers +, aaxtomp3 +, arch-install-scripts +, bashup-events32 +, dgoss +, git-ftp +, ix +, lesspipe +, locate-dominating-file +, mons +, msmtp +, nix-direnv +, pdf2odt +, pdfmm +, rancid +, s0ix-selftest-tool +, unix-privesc-check +, wgnord +, wsl-vpnkit +, xdg-utils +, yadm +, zxfer }: let @@ -123,21 +155,6 @@ rec { name = "resholve-test"; src = rSrc; - # TODO: should be removable on next resholve update--just - # temporarily work around test breaks caused by changes in - # bats 1.10.0. Since this is just about fixing tests, I'm - # patching test source to avoid going through staging. - patches = [ - (fetchpatch { - url = "https://github.com/abathur/resholve/commit/e1d6ccbc9cd5ec26122997610954dcb7d826f652.patch"; - hash = "sha256-XA9KUc/OAD2S8Vpt+C7KcjTP44rnZ4FLdgnnRqVWdWY="; - }) - (fetchpatch { - url = "https://github.com/abathur/resholve/commit/50db1a6a97baa7d7543a8abe33dddda62b487c65.patch"; - hash = "sha256-m1dKaLI02Wag7uacG4BkcdCXw30Kn6J4ydTqPd7bsak="; - }) - ]; - dontBuild = true; installPhase = '' @@ -206,4 +223,71 @@ rec { echo "Hello" file . ''; + # spot-check lore overrides + loreOverrides = resholve.writeScriptBin "verify-overrides" { + inputs = [ + coreutils + esh + getconf + libarchive + locale + mount + ncurses + procps + ps + ] ++ lib.optionals stdenv.isLinux [ + nixos-install-tools + nixos-rebuild + ]; + interpreter = "none"; + execer = [ + "cannot:${esh}/bin/esh" + ]; + fix = { + mount = true; + }; + } ('' + env b2sum fake args + b2sum fake args + esh fake args + getconf fake args + bsdtar fake args + locale fake args + mount fake args + reset fake args + tput fake args + tset fake args + ps fake args + top fake args + '' + lib.optionalString stdenv.isLinux '' + nixos-generate-config fake args + nixos-rebuild fake args + ''); + + # ensure known consumers in nixpkgs keep working + inherit aaxtomp3; + inherit bashup-events32; + inherit bats; + inherit git-ftp; + inherit ix; + inherit lesspipe; + inherit locate-dominating-file; + inherit mons; + inherit msmtp; + inherit nix-direnv; + inherit pdf2odt; + inherit pdfmm; + inherit shunit2; + inherit xdg-utils; + inherit yadm; +} // lib.optionalAttrs stdenv.isLinux { + inherit arch-install-scripts; + inherit dgoss; + inherit rancid; + inherit unix-privesc-check; + inherit wgnord; + inherit wsl-vpnkit; + inherit zxfer; +} // lib.optionalAttrs (stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64)) { + inherit s0ix-selftest-tool; } diff --git a/third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix b/third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix index 088b4ccf48..97ec85f6f2 100644 --- a/third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/yelp-tools/default.nix @@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Yelp/Tools"; + homepage = "https://gitlab.gnome.org/GNOME/yelp-tools"; description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; maintainers = teams.gnome.members ++ (with maintainers; [ domenkozar ]); license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix b/third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix index a70000ca56..a2e81531c1 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix @@ -66,7 +66,8 @@ stdenv.mkDerivation rec { patchInterpreter "$1" wrapProgram "$out/libexec/genymotion/$1" \ --set "LD_LIBRARY_PATH" "${libPath}" \ - --unset "QML2_IMPORT_PATH" + --unset "QML2_IMPORT_PATH" \ + --unset "QT_PLUGIN_PATH" } patchTool() { @@ -77,8 +78,8 @@ stdenv.mkDerivation rec { patchExecutable genymotion patchExecutable player - patchExecutable qemu/x86_64/bin/qemu-img - patchExecutable qemu/x86_64/bin/qemu-system-x86_64 + patchInterpreter qemu/x86_64/bin/qemu-img + patchInterpreter qemu/x86_64/bin/qemu-system-x86_64 patchTool adb patchTool aapt diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/default.nix index 0e459315fa..d8310ce23e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchurl +{ lib, buildDunePackage, fetchurl, fetchpatch , astring, cmdliner, fmt, re, stdlib-shims, uutf, ocaml-syntax-shims }: @@ -6,13 +6,17 @@ buildDunePackage rec { pname = "alcotest"; version = "1.7.0"; - duneVersion = "3"; - src = fetchurl { url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz"; hash = "sha256-gSus2zS0XoiZXgfXMGvasvckee8ZlmN/HV0fQWZ5At8="; }; + # Fix tests with OCaml 5.2 + patches = fetchpatch { + url = "https://github.com/mirage/alcotest/commit/aa437168b258db97680021116af176c55e1bd53b.patch"; + hash = "sha256-cytuJFg4Mft47LsAEcz2zvzyy1wNzMdeLK+cjaFANpo="; + }; + nativeBuildInputs = [ ocaml-syntax-shims ]; propagatedBuildInputs = [ astring cmdliner fmt re stdlib-shims uutf ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix index f1fbd02ba0..559b4fe62c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix @@ -8,13 +8,13 @@ buildDunePackage rec { pname = "awa"; - version = "0.3.0"; + version = "0.3.1"; minimalOCamlVersion = "4.10"; src = fetchurl { url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz"; - hash = "sha256-BtbReSnnAN+u1Vy63afO1yheoDqsIRU2rig0y1QDtuw="; + hash = "sha256-VejHFn07B/zoEG4LjLaen24ig9kAXtERl/pRo6UZCQk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/binning/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/binning/default.nix new file mode 100644 index 0000000000..244b96220f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/binning/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, fetchurl +}: + +buildDunePackage rec { + pname = "binning"; + version = "0.0.0"; + + minimalOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/pveber/binning/releases/download/v${version}/binning-v${version}.tbz"; + hash = "sha256-eG+xctsbc7lQ5pFOUtJ8rjNW/06gygwLADq7yc8Yf/c="; + }; + + meta = { + description = "A datastructure to accumulate values in bins"; + license = lib.licenses.cecill-b; + homepage = "https://github.com/pveber/binning/"; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/biotk/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/biotk/default.nix new file mode 100644 index 0000000000..33a98f71cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/biotk/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildDunePackage +, fetchurl +, angstrom-unix +, binning +, ocaml-crunch +, camlzip +, core_kernel +, core_unix +, csvfields +, fmt +, gsl +, ppx_csv_conv +, ppx_deriving +, rresult +, tyxml +, uri +, vg +}: + +buildDunePackage rec { + pname = "biotk"; + version = "0.2.0"; + + minimalOCamlVersion = "4.13"; + + src = fetchurl { + url = "https://github.com/pveber/biotk/releases/download/v${version}/biotk-${version}.tbz"; + hash = "sha256-FQvbVj5MmraSN6AmOckKgJ/LB14E/pCsPvPvNppcv7A="; + }; + + nativeBuildInputs = [ ocaml-crunch ]; + + buildInputs = [ ppx_csv_conv ]; + + propagatedBuildInputs = [ + angstrom-unix + binning + camlzip + core_kernel + core_unix + csvfields + fmt + gsl + ppx_deriving + rresult + tyxml + uri + vg + ]; + + meta = { + description = "Toolkit for bioinformatics in OCaml"; + license = lib.licenses.cecill-c; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix index 8f3d4fd541..af606763e2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "bwd"; - version = "2.2.0"; + version = "2.3.0"; minimalOCamlVersion = "4.12"; duneVersion = "3"; @@ -11,7 +11,7 @@ buildDunePackage rec { owner = "RedPRL"; repo = "ocaml-bwd"; rev = version; - hash = "sha256-4DttkEPI9yJtMsqzTNSnoDajcvMQPIiJAHk0kJl540Y="; + hash = "sha256-rzn0U/D6kPNsH5hBTElc3d1jfKbgKbjA2JHicpaJtu4="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index 97e899731e..9129ad98ae 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -14,13 +14,13 @@ buildDunePackage rec { pname = "ca-certs-nss"; - version = "3.92"; + version = "3.98"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz"; - hash = "sha256-F6eF5jQO9qJACQldad8va5jXPj05o61L8Bp1SDXHBTg="; + hash = "sha256-N1/cz8e3KB3pBd5+ZV/JbuW6FaaVijNhok7QyMB7ppc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cmarkit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cmarkit/default.nix index 0a36ea196d..e2b6d054db 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cmarkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cmarkit/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://erratique.ch/software/cmarkit"; changelog = "https://github.com/dbuenzli/cmarkit/blob/v${version}/CHANGES.md"; license = licenses.isc; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; inherit (ocaml.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix index e819627807..df0a530e06 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix @@ -20,6 +20,6 @@ buildDunePackage rec { homepage = "https://github.com/ocaml-dune/csexp"; changelog = "https://github.com/ocaml-dune/csexp/raw/${version}/CHANGES.md"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix index 96814ebdc7..1cae0cc3de 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cstruct, sexplib, ppxlib +{ lib, buildDunePackage, ocaml, cstruct, sexplib, ppxlib , ocaml-migrate-parsetree-2 , ounit, cppo, ppx_sexp_conv, cstruct-unix, cstruct-sexp }: @@ -15,7 +15,7 @@ else propagatedBuildInputs = [ cstruct ppxlib sexplib ]; - doCheck = true; + doCheck = !lib.versionAtLeast ocaml.version "5.1"; nativeCheckInputs = [ cppo ]; checkInputs = [ ounit ppx_sexp_conv cstruct-sexp cstruct-unix ocaml-migrate-parsetree-2 ]; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-action-plugin/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-action-plugin/default.nix index 1f101a35a5..18095bee8f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-action-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-action-plugin/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { meta = with lib; { inherit (dune_3.meta) homepage; description = "API for writing dynamic Dune actions"; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix index 3eae198d82..324be14186 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { meta = with lib; { description = "Helper library for gathering system configuration"; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-glob/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-glob/default.nix index 59b78a7b77..474fd4a52c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-glob/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-glob/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { meta = with lib; { inherit (dune_3.meta) homepage; description = "Glob string matching language supported by dune"; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix index ecd8a0016e..4c6092122a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { meta = with lib; { description = "Private libraries of Dune"; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix index 9803a20368..9d6c366482 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "earlybird"; - version = "1.2.1"; + version = "1.3.2"; minimalOCamlVersion = "4.12"; @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "hackwaly"; repo = "ocamlearlybird"; rev = version; - hash = "sha256-p29uTdx8+mZKXUL+ng/FzpKuhnykEe8Sy968Wa/KUn4="; + hash = "sha256-E6ZZRkGO6Bqr6jWlV9fL3ibFwUVChHR17TPGeP94hfk="; }; nativeBuildInputs = [ menhir ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix index 73f7c0aacc..30b955876a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,7 +1,6 @@ { buildDunePackage , lib , fetchFromGitHub -, fetchpatch , which , ocsigen_server , lwt_react @@ -18,19 +17,13 @@ buildDunePackage rec { pname = "eliom"; - version = "10.3.1"; + version = "10.4.1"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; rev = version; - hash = "sha256-REOyxwnQqWOKywVYwN/WP22cNKZv5Nv0OpFVbNBPJN8="; - }; - - # Compatibility with tyxml 4.6.x - patches = fetchpatch { - url = "https://github.com/ocsigen/eliom/commit/9a6adcce3959a37b971890999331335d07f4f732.patch"; - hash = "sha256-rgsqohSAHHljvag3c+HNGEgW9qwmqPq8qfTpX6vVKtg="; + hash = "sha256-j4t6GEd8hYyM87b9XvgcnaV9XMkouz6+v0SYW22/bqg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gen_js_api/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gen_js_api/default.nix index af1078e8fa..1901bfa59b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gen_js_api/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gen_js_api/default.nix @@ -10,13 +10,13 @@ buildDunePackage rec { pname = "gen_js_api"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "LexiFi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0FKKYPbSBza/Q6oZniq/UHi5zBjD/i7j5ds3ZDWkBTs="; + sha256 = "sha256-tplbnQ/1dzZq8m/ibMAkGqY8RHQRmBPHOwh0dGuZCJM="; }; minimalOCamlVersion = "4.11"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix index 8d7b3f6893..54db34bc97 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "iri"; - version = "0.7.0"; + version = "1.0.0"; minimalOCamlVersion = "4.12"; @@ -13,7 +13,7 @@ buildDunePackage rec { owner = "zoggy"; repo = "ocaml-iri"; rev = version; - hash = "sha256-Mkg7kIIVpKbeWUras1RqtJsRx2Q3dBnm4QqSMJFweF8="; + hash = "sha256-6Q7qPezmdcO6JSevWl55XAxFuIROZNDrMkYw8VRR7qg="; }; propagatedBuildInputs = [ sedlex uunf uutf ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix index f64e228a2b..1067536439 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -582,6 +582,13 @@ with self; propagatedBuildInputs = [ ppxlib base ]; }; + ppx_conv_func = janePackage { + pname = "ppx_conv_func"; + hash = "sha256-61jX8yHZYOnMx1Jlqaq9zSOz25HLOa0Wv/iG6Hu82zI="; + meta.description = "Part of the Jane Street's PPX rewriters collection"; + propagatedBuildInputs = [ ppxlib base ]; + }; + ppx_custom_printf = janePackage { pname = "ppx_custom_printf"; hash = "1k8nmq6kwqz2wpkm9ymq749dz1vd8lxrjc711knp1wyz5935hnsv"; @@ -597,6 +604,13 @@ with self; propagatedBuildInputs = [ core_kernel ppxlib js_of_ocaml js_of_ocaml-ppx sedlex ]; }; + ppx_csv_conv = janePackage { + pname = "ppx_csv_conv"; + hash = "sha256-ctwgUs1buBZiNqac4760LhWd2/PMZRuxx8SE5T7yZ+g="; + meta.description = "Generate functions to read/write records in csv format"; + propagatedBuildInputs = [ csvfields ppx_conv_func ]; + }; + ppx_disable_unused_warnings = janePackage { pname = "ppx_disable_unused_warnings"; hash = "0sb5i4v7p9df2bxk66rjs30k9fqdrwsq1jgykjv6wyrx2d9bv955"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix index 35d2895f67..59cd7539d1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix @@ -569,13 +569,17 @@ with self; propagatedBuildInputs = [ base ppx_jane ]; }; - ocaml-compiler-libs = janePackage { + ocaml-compiler-libs = janePackage ({ pname = "ocaml-compiler-libs"; - version = "0.12.4"; - hash = "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv"; minimalOCamlVersion = "4.04.1"; meta.description = "OCaml compiler libraries repackaged"; - }; + } // (if lib.versionAtLeast ocaml.version "5.2" then { + version = "0.17.0"; + hash = "sha256-QaC6BWrpFblra6X1+TrlK+J3vZxLvLJZ2b0427DiQzM="; + } else { + version = "0.12.4"; + hash = "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv"; + })); ocaml-embed-file = janePackage { pname = "ocaml-embed-file"; @@ -698,6 +702,13 @@ with self; propagatedBuildInputs = [ ppxlib base ]; }; + ppx_conv_func = janePackage { + pname = "ppx_conv_func"; + hash = "sha256-HPHSZHdR9ll+7EbWc36shTdRPFYB0lkApidk+XL3clI="; + meta.description = "Part of the Jane Street's PPX rewriters collection"; + propagatedBuildInputs = [ ppxlib base ]; + }; + ppx_custom_printf = janePackage { pname = "ppx_custom_printf"; hash = "sha256-V30ijRgcma/rwysPxNAFnuJIb7XFrfi7mfjJxN+rSak="; @@ -712,6 +723,13 @@ with self; propagatedBuildInputs = [ async async_unix core_kernel core_unix ppxlib js_of_ocaml js_of_ocaml-ppx sedlex virtual_dom ]; }; + ppx_csv_conv = janePackage { + pname = "ppx_csv_conv"; + hash = "sha256-RdPcDPLzoSf45Zeon3f4HcEvlwB6Q6sAINX3LHmjmj8="; + meta.description = "Generate functions to read/write records in csv format"; + propagatedBuildInputs = [ csvfields ppx_conv_func ]; + }; + ppx_demo = janePackage { pname = "ppx_demo"; hash = "sha256-t/jz94YpwmorhWlcuflIZe0l85cESE62L9I7NMASVWM="; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/old.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/old.nix deleted file mode 100644 index 8b4a6ed529..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/old.nix +++ /dev/null @@ -1,639 +0,0 @@ -{ self -, super -, lib -, stdenv -, openssl -}: - -let - inherit (super) - janePackage - ocaml - ocamlbuild - cryptokit - ctypes - magic-mime - ocaml-migrate-parsetree - octavius - ounit - ppx_deriving - re - zarith - num - ; - -in - -with self; - -{ - - # Jane Street packages, up to ppx_core - - sexplib = janePackage { - pname = "sexplib"; - meta.description = "Automated S-expression conversion"; - version = "0.10.0"; - hash = "1agw649n0rnf6h4y2dr1zs1970nncxgjmf90848vbxv8y9im4yy2"; - buildInputs = [ num ]; - }; - - base = janePackage { - pname = "base"; - version = "0.9.4"; - hash = "0x85xi66b4zwlbdwmyc99zcmawgpp75gxqbl55rr67awavw162rw"; - propagatedBuildInputs = [ sexplib ]; - meta.description = "Full standard library replacement for OCaml"; - }; - - ocaml-compiler-libs = janePackage { - pname = "ocaml-compiler-libs"; - hash = "1jz3nfrb6295sj4xj1j0zld8mhfj0xy2k4vlp9yf9sh3748n090l"; - meta.description = "OCaml compiler libraries repackaged"; - }; - - ppx_ast = janePackage ({ - pname = "ppx_ast"; - propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ]; - meta.description = "OCaml AST used by Jane Street ppx rewriters"; - } // (if lib.versionAtLeast ocaml.version "4.06" - then { - version = "0.9.2"; - hash = "1h4qf26rg23z21rrw83fakiavw9km7174p3830pg0gg4bwakvba0"; - } else { - version = "0.9.1"; - hash = "0a9rxwavy2748k0yd4db3hg1ypq7mpqnwq9si5a5qdiclgkhcggw"; - } - )); - - ppx_traverse_builtins = janePackage { - pname = "ppx_traverse_builtins"; - hash = "10ajvz02ka6qimlfrq7py4ljhk8awqkga6240kn8j046b4xfyxzi"; - meta.description = "Builtins for Ppx_traverse"; - }; - - stdio = janePackage { - pname = "stdio"; - version = "0.9.1"; - hash = "13rj3ii0rvmklfim9ild0ib44ssdadig7a9ccjbz22m0pw84a1sx"; - propagatedBuildInputs = [ base ]; - meta.description = "Standard IO library for OCaml"; - }; - - ppx_core = janePackage { - pname = "ppx_core"; - hash = "15400zxxkqdimmjpdjcs36gcbxbrhylmaczlzwd6x65v1h9aydz3"; - propagatedBuildInputs = [ ppx_ast ppx_traverse_builtins stdio ]; - meta.description = "Jane Street's standard library for ppx rewriters"; - }; - - # Jane Street packages, up to ppx_base - - ppx_optcomp = janePackage { - pname = "ppx_optcomp"; - hash = "1wfj6fnh92s81yncq7yyhmax7j6zpjj1sg1f3qa1f9c5kf4kkzrd"; - propagatedBuildInputs = [ ppx_core ]; - meta.description = "Optional compilation for OCaml"; - }; - - ppx_driver = janePackage { - pname = "ppx_driver"; - version = "0.9.1"; - hash = "1amz49x6v4sh1v2my6618cah0zv5i7jmsapbk9ydps6419g5asay"; - buildInputs = [ ocamlbuild ]; - propagatedBuildInputs = [ ppx_optcomp ]; - meta.description = "Feature-full driver for OCaml AST transformers"; - }; - - ppx_metaquot = janePackage { - pname = "ppx_metaquot"; - hash = "15qfd3s4x2pz006nx5316laxd3gqqi472x432qg4rfx4yh3vn31k"; - propagatedBuildInputs = [ ppx_driver ]; - meta.description = "Metaquotations for ppx_ast"; - }; - - ppx_type_conv = janePackage { - pname = "ppx_type_conv"; - hash = "0a0gxjvjiql9vg37k0akn8xr5724nv3xb7v37xpidv7ld927ks7p"; - propagatedBuildInputs = [ ppx_metaquot ppx_deriving ]; - meta.description = "Support Library for type-driven code generators"; - }; - - ppx_sexp_conv = janePackage { - pname = "ppx_sexp_conv"; - hash = "03cg2sym0wvpd5l7q4w9bclp589z5byygwsmnnq9h1ih56cmd55l"; - propagatedBuildInputs = [ ppx_type_conv sexplib ]; - meta.description = "Generation of S-expression conversion functions from type definitions"; - }; - - ppx_compare = janePackage { - pname = "ppx_compare"; - hash = "0wrszpvn1nms5sb5rb29p7z1wmqyd15gfzdj4ax8f843p5ywx3w9"; - propagatedBuildInputs = [ ppx_type_conv ]; - meta.description = "Generation of comparison functions from types"; - }; - - ppx_enumerate = janePackage { - pname = "ppx_enumerate"; - hash = "1dfy86j2z12p5n9yrwaakx1ngphs5246vxy279kz6i6j34cwxm46"; - propagatedBuildInputs = [ ppx_type_conv ]; - meta.description = "Generate a list containing all values of a finite type"; - }; - - ppx_hash = janePackage { - pname = "ppx_hash"; - hash = "1w1riy2sqd9i611sc5f5z2rqqgjl2gvvkzi5xibpv309nacnl01d"; - propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; - meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; - }; - - ppx_js_style = janePackage { - pname = "ppx_js_style"; - hash = "09k02b1l2r7svf9l3ls69h8xydsyiang2ziigxnny2i7gy7b0w59"; - propagatedBuildInputs = [ ppx_metaquot octavius ]; - meta.description = "Code style checker for Jane Street Packages"; - }; - - ppx_base = janePackage { - pname = "ppx_base"; - hash = "0qikfzbkd2wyxfrvizz6rgi6vg4ykvxkivacj4gr178dbgfl5if3"; - propagatedBuildInputs = [ ppx_enumerate ppx_hash ppx_js_style ]; - meta.description = "Base set of ppx rewriters"; - }; - - # Jane Street packages, up to ppx_bin_prot - - fieldslib = janePackage { - pname = "fieldslib"; - hash = "1wxh59888l1bfz9ipnbcas58gwg744icaixzdbsg4v8f7wymc501"; - propagatedBuildInputs = [ ppx_driver ]; - meta.description = "OCaml record fields as first class values"; - }; - - variantslib = janePackage { - pname = "variantslib"; - hash = "0kj53n62193j58q9vip8lfhhyf6w9d25wyvxzc163hx5m68yw0fz"; - propagatedBuildInputs = [ ppx_driver ]; - meta.description = "OCaml variants as first class values"; - }; - - ppx_traverse = janePackage { - pname = "ppx_traverse"; - hash = "1sdqgwyq0w71i03vhc5jq4jk6rsbgwhvain48fnrllpkb5kj2la2"; - propagatedBuildInputs = [ ppx_type_conv ]; - meta.description = "Automatic generation of open recursion classes"; - }; - - ppx_custom_printf = janePackage { - pname = "ppx_custom_printf"; - hash = "0cjy2c2c5g3qxqvwx1yb6p7kbmmpnpb1hll55f7a44x215lg8x19"; - propagatedBuildInputs = [ ppx_sexp_conv ppx_traverse ]; - meta.description = "Printf-style format-strings for user-defined string conversion"; - }; - - ppx_fields_conv = janePackage { - pname = "ppx_fields_conv"; - hash = "0qp8zgmk58iskzrkf4g06i471kg6lrh3wqpy9klrb8pp9mg0xr9z"; - propagatedBuildInputs = [ fieldslib ppx_type_conv ]; - meta.description = "Generation of accessor and iteration functions for OCaml records"; - }; - - ppx_variants_conv = janePackage { - pname = "ppx_variants_conv"; - hash = "1xayhyglgbdjqvb9123kjbwjcv0a3n3302nb0j7g8gmja8w5y834"; - propagatedBuildInputs = [ ppx_type_conv variantslib ]; - meta.description = "Generation of accessor and iteration functions for OCaml variant types"; - }; - - bin_prot = janePackage { - pname = "bin_prot"; - version = "0.9.1"; - hash = "1bgcmkgz6b5i522996x589zsaiy5b3h37887lwbqvpps8by2ayvk"; - propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ]; - meta.description = "Binary protocol generator"; - }; - - ppx_here = janePackage { - pname = "ppx_here"; - hash = "0pjscw5ydxgy4fcxakgsazpp09ka057w5n2fp2dpkv2k5gil6rzh"; - propagatedBuildInputs = [ ppx_driver ]; - meta.description = "Expands [%here] into its location"; - }; - - ppx_bin_prot = janePackage { - pname = "ppx_bin_prot"; - hash = "0qw9zqrc5yngzrzpk9awnlnd68xrb7wz5lq807c80ibxk0xvnqn3"; - propagatedBuildInputs = [ ppx_here bin_prot ]; - meta.description = "Generation of bin_prot readers and writers from types"; - }; - - # Jane Street packages, up to ppx_jane - - ppx_assert = janePackage { - pname = "ppx_assert"; - hash = "1s5c75wkc46nlcwmgic5h7f439s26ssrzrcil501c5kpib2hlv6z"; - propagatedBuildInputs = [ ppx_sexp_conv ppx_here ppx_compare ]; - meta.description = "Assert-like extension nodes that raise useful errors on failure"; - }; - - ppx_inline_test = janePackage { - pname = "ppx_inline_test"; - version = "0.9.2"; - hash = "17j36ihiqprbpa2bk02449k93vaidid2sly5djrk848ccjq8n5aa"; - propagatedBuildInputs = [ ppx_metaquot ]; - meta.description = "Syntax extension for writing in-line tests in OCaml code"; - }; - - typerep = janePackage { - pname = "typerep"; - hash = "0hlc0xiznli1k6azv2mhm1s4xghhxqqd957np7828bfp7r8n2jy3"; - propagatedBuildInputs = [ base ]; - meta.description = "Runtime types for OCaml"; - }; - - ppx_bench = janePackage { - pname = "ppx_bench"; - hash = "1qk4y6c2mpw7bqjppi2nam74vs2sc89wzq162j92wsqxyqsv4p93"; - propagatedBuildInputs = [ ppx_inline_test ]; - meta.description = "Syntax extension for writing in-line benchmarks in OCaml code"; - }; - - ppx_expect = janePackage { - pname = "ppx_expect"; - hash = "1bik53k51wcqv088f0h10n3ms9h51yvg6ha3g1s903i2bxr3xs6b"; - propagatedBuildInputs = [ ppx_inline_test ppx_fields_conv ppx_custom_printf ppx_assert ppx_variants_conv re ]; - meta.description = "Cram like framework for OCaml"; - }; - - ppx_fail = janePackage { - pname = "ppx_fail"; - hash = "0qz0vlazasjyg7cv3iwpzxlvsah3zmn9dzd029xxqr1bji067s32"; - propagatedBuildInputs = [ ppx_here ppx_metaquot ]; - meta.description = "Add location to calls to failwiths"; - }; - - ppx_let = janePackage { - pname = "ppx_let"; - hash = "1b914a5nynwxjvfx42v61yigvjhnd548m4yqjfchf38dmqi1f4nr"; - propagatedBuildInputs = [ ppx_driver ]; - meta.description = "Monadic let-bindings"; - }; - - ppx_optional = janePackage { - pname = "ppx_optional"; - hash = "1vknsarxba0zcp5k2jb31wfpvqrv3bpanxbahfl5s2fwspsfdc82"; - propagatedBuildInputs = [ ppx_metaquot ]; - meta.description = "Pattern matching on flat options"; - }; - - ppx_pipebang = janePackage { - pname = "ppx_pipebang"; - hash = "1wyfyyjvyi94ds1p90l60wdr85q2v3fq1qdf3gnv9zjfy6sb0g9h"; - propagatedBuildInputs = [ ppx_metaquot ]; - meta.description = "A ppx rewriter that inlines reverse application operators |> and |!"; - }; - - ppx_sexp_message = janePackage { - pname = "ppx_sexp_message"; - hash = "0r0skyr1zf2jh48xrxbs45gzywynhlivkq24xwc0qq435fmc2jqv"; - propagatedBuildInputs = [ ppx_sexp_conv ppx_here ]; - meta.description = "A ppx rewriter for easy construction of s-expressions"; - }; - - ppx_sexp_value = janePackage { - pname = "ppx_sexp_value"; - hash = "0hha5mmx700m8fy9g4znb8278l09chgwlpshny83vsmmzgq2jhah"; - propagatedBuildInputs = [ ppx_sexp_conv ppx_here ]; - meta.description = "A ppx rewriter that simplifies building s-expressions from OCaml values"; - }; - - ppx_typerep_conv = janePackage { - pname = "ppx_typerep_conv"; - hash = "0bzgfpbqijwxm8x9jq1zb4xi5sbzymk17lw5rylri3hf84p60aq1"; - propagatedBuildInputs = [ ppx_type_conv typerep ]; - meta.description = "Generation of runtime types from type declarations"; - }; - - ppx_jane = janePackage { - pname = "ppx_jane"; - hash = "16m5iw0qyp452nqj83kd0g0x3rw40lrz7392hwpd4di1wi6v2qzc"; - propagatedBuildInputs = [ ppx_base ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_let ppx_optional ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv ]; - meta.description = "Standard Jane Street ppx rewriters"; - }; - - # Jane Street packages, up to core - - configurator = janePackage { - pname = "configurator"; - version = "0.9.1"; - hash = "1q0s0ghcrcrxdj6zr9zr27g7sr4qr9l14kizjphwqwwvgbzawdix"; - propagatedBuildInputs = [ ppx_base ]; - meta.description = "Helper library for gathering system configuration"; - }; - - jane-street-headers = janePackage { - pname = "jane-street-headers"; - hash = "0cdab6sblsidjbwvyvmspykyhqh44rpsjzi2djbfd5m4vh2h14gy"; - meta.description = "Jane Street header files"; - }; - - core_kernel = janePackage { - pname = "core_kernel"; - hash = "05iwvggx9m81x7ijgv9gcv5znf5rmsmb76dg909bm9gkr3hbh7wh"; - propagatedBuildInputs = [ configurator jane-street-headers ppx_jane ]; - meta.description = "Jane Street's standard library overlay (kernel)"; - }; - - spawn = janePackage { - pname = "spawn"; - hash = "1w53b8ni06ajj62yaqjy0pkbm952l0m5fzr088yk15078qaxsnb5"; - meta.description = "Spawning sub-processes"; - }; - - core = janePackage { - pname = "core"; - version = "0.9.1"; - hash = "1643r0namsgj8xwfr9niimcdwyyq4ddiwd02d73ipb4a8710aqi8"; - propagatedBuildInputs = [ core_kernel spawn ]; - meta.description = "Jane Street's standard library overlay"; - }; - - # Jane Street packages, up to core_extended - - re2 = janePackage { - pname = "re2"; - hash = "1qmhl3yd6y0lq401rz72b1bsbpglb0wighpxn3x8y1ixq415p4xi"; - propagatedBuildInputs = [ core_kernel ]; - meta = { - description = "OCaml bindings for RE2"; - broken = stdenv.isDarwin; - }; - }; - - textutils = janePackage { - pname = "textutils"; - hash = "1y6j2qw7rc8d80343lfv1dygnfrhn2qllz57mx28pl5kan743f6d"; - propagatedBuildInputs = [ core ]; - meta.description = "Text output utilities"; - }; - - core_extended = janePackage { - pname = "core_extended"; - hash = "05cnzzj0kigz9c9gsmd6mfar82wmkbqm9qzrydb80sy2fz5b30rk"; - propagatedBuildInputs = [ core re2 textutils ]; - postPatch = '' - patchShebangs src/discover.sh - ''; - meta = { - description = "Jane Street Capital's standard library overlay"; - }; - }; - - # Jane Street async packages - - async_kernel = janePackage { - pname = "async_kernel"; - hash = "1zwxhzy7f9900rcjls2fql9cpfmwrcah3fazzdz4h2i51f41w62x"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Jane Street Capital's asynchronous execution library (core)"; - }; - - async_rpc_kernel = janePackage { - pname = "async_rpc_kernel"; - hash = "1xk3s6s3xkj182p10kig2cqy8md6znif3v661h9cd02n8s57c40b"; - propagatedBuildInputs = [ core_kernel async_kernel ]; - meta.description = "Platform-independent core of Async RPC library"; - }; - - async_unix = janePackage { - pname = "async_unix"; - hash = "0yd4z28j5vdj2zxqi0fkgh2ic1s9h740is2dk0raga0zr5a1z03d"; - propagatedBuildInputs = [ core async_kernel ]; - meta.description = "Jane Street Capital's asynchronous execution library (unix)"; - }; - - async_extra = janePackage { - pname = "async_extra"; - hash = "0rpy5lc5dh5mir7flq1jrppd8imby8wyw191yg4nmklg28xp5sx0"; - propagatedBuildInputs = [ async_rpc_kernel async_unix ]; - meta.description = "Jane Street's asynchronous execution library (extra)"; - }; - - async = janePackage { - pname = "async"; - hash = "10ykzym19srgdiikj0s74dndx5nk15hjq1r2hc61iz48f6caxkb1"; - propagatedBuildInputs = [ async_extra ]; - meta.description = "Jane Street Capital's asynchronous execution library"; - }; - - async_find = janePackage { - pname = "async_find"; - hash = "11dmhdzgf5kn4m0cm6zr28wpwhi2kr4lak9nmgxbrxsq28bcncxq"; - propagatedBuildInputs = [ async ]; - meta.description = "Directory traversal with Async"; - }; - - async_interactive = janePackage { - pname = "async_interactive"; - hash = "1mmqqp6bi2wg7bmgf0sw34jn3iyl5kbm200dax8yqq6rfprcs49j"; - propagatedBuildInputs = [ async ]; - meta.description = "Utilities for building simple command-line based user interfaces"; - }; - - async_parallel = janePackage { - pname = "async_parallel"; - hash = "0mdprhr1pv4g65g10gr3gaifrzknsdgarwfdbjlvhzfs86075kyn"; - propagatedBuildInputs = [ async ]; - meta.description = "Distributed computing library"; - }; - - async_shell = janePackage { - pname = "async_shell"; - hash = "02clpz3xv3i5avzifwalylb9gfxzpgnr8bnlfsjixxfk2m7kvsj2"; - propagatedBuildInputs = [ core_extended async ]; - meta = { - description = "Shell helpers for Async"; - }; - }; - - async_ssl = janePackage { - pname = "async_ssl"; - hash = "01w3bg38q61lc3hfh8jsr0sy1ylyv0m6g6h9yvsk8ngj6qk70nss"; - propagatedBuildInputs = [ async ctypes openssl ]; - meta.description = "Async wrappers for SSL"; - }; - - # Jane Street packages, up to expect_test_helpers - - sexp_pretty = janePackage { - pname = "sexp_pretty"; - hash = "1bx8va468j5b813m0vsh1jzgb6h2qnnjfmjlf2hb82sarv8lllfx"; - propagatedBuildInputs = [ ppx_base re ]; - meta.description = "S-expression pretty-printer"; - }; - - expect_test_helpers_kernel = janePackage { - pname = "expect_test_helpers_kernel"; - hash = "1ycqir8sqgq5nialnrfg29nqn0cqg6jjpgv24drdycdhqf5r2zg6"; - propagatedBuildInputs = [ core_kernel sexp_pretty ]; - meta.description = "Helpers for writing expectation tests"; - }; - - expect_test_helpers = janePackage { - pname = "expect_test_helpers"; - hash = "0rsh6rwbqfcrqisk8jp7srlnicsadbzrs02ri6zyx0p3lmznw5r2"; - propagatedBuildInputs = [ async expect_test_helpers_kernel ]; - meta.description = "Async helpers for writing expectation tests"; - }; - - # Miscellaneous Jane Street packages - - bignum = janePackage { - pname = "bignum"; - hash = "0g80mzsi7vc1kq4mzha8y9nl95h6cd041vix3wjrqgkdvb1qd4f3"; - propagatedBuildInputs = [ core_kernel zarith ]; - meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; - }; - - cinaps = janePackage { - pname = "cinaps"; - hash = "02fpjiwrygkpx2q4jfldhbqh0mqxmf955wizr8k4vmsq4wsis0p5"; - propagatedBuildInputs = [ re ]; - meta.description = "Trivial Metaprogramming tool using the OCaml toplevel"; - }; - - command_rpc = janePackage { - pname = "command_rpc"; - hash = "0w58z9jkz5qzbvf33wrzhfshzdvnrphj6dq8dmi52ykhfvxm7824"; - propagatedBuildInputs = [ async ]; - meta.description = "Utilities for Versioned RPC communication with a child process over stdin and stdout"; - }; - - core_bench = janePackage { - pname = "core_bench"; - hash = "1m2q7217nmcsck29i59djkm0h6z3aj0i01niijzr5f6ilbnmyd3h"; - propagatedBuildInputs = [ core_extended ]; - meta = { - description = "Micro-benchmarking library for OCaml"; - }; - }; - - core_profiler = janePackage { - pname = "core_profiler"; - hash = "1ir2v3wdfbf5xzqcma16asc73mkx2q6dzq5y1bx6q1rpa7iznx44"; - propagatedBuildInputs = [ core_extended ]; - meta = { - description = "Profiling library"; - }; - }; - - csvfields = janePackage { - pname = "csvfields"; - hash = "0lbvs1kwl22ryxhw6s089f6683hj2920bn518mvr22rnv7qijy0v"; - propagatedBuildInputs = [ core ]; - meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; - }; - - ecaml = janePackage { - pname = "ecaml"; - hash = "1a2534bzbwgpm71aj3sm71sm0lkcjdfjj1mk91p1pg9kxn8c5x4i"; - propagatedBuildInputs = [ async ]; - meta.description = "Writing Emacs plugin in OCaml"; - }; - - email_message = janePackage { - pname = "email_message"; - hash = "0cpaf6wn5g883bxdz029bksvrfzih99m7hzbb30fhqglmpmmkniz"; - propagatedBuildInputs = [ async core_extended cryptokit magic-mime ounit ]; - meta = { - description = "E-mail message parser"; - }; - }; - - incremental_kernel = janePackage { - pname = "incremental_kernel"; - hash = "0zq48wbgqcflh84n10iygi8aa3f0zzmgc7r0jwvsyg7i8zccgvf5"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Library for incremental computations depending only on core_kernel"; - }; - - incremental = janePackage { - pname = "incremental"; - hash = "05sx8ia46v4dlvzcn7xgjcwxvbd0wmvv9r2bpvniapjnwr1nvcfh"; - propagatedBuildInputs = [ core incremental_kernel ]; - meta.description = "Library for incremental computations"; - }; - - incr_map = janePackage { - pname = "incr_map"; - hash = "0358qg9irxbbhn18laqww3mn43mdwvlbr0h2mvg3vdbb2c5jp4fv"; - propagatedBuildInputs = [ incremental_kernel ]; - meta.description = "Helpers for incremental operations on map like data structures"; - }; - - ocaml_plugin = janePackage { - pname = "ocaml_plugin"; - hash = "0q33swnlx9p1gcn1aj95501kapb7cnbzbsavid69csczwmzcxr14"; - buildInputs = [ ocamlbuild ]; - propagatedBuildInputs = [ async ]; - meta.description = "Automatically build and dynlink ocaml source files"; - }; - - parsexp = janePackage { - pname = "parsexp"; - hash = "0brrifvnfqbfk873v6y5b2jixs2d73hpispj9r440kca5cfsv23b"; - propagatedBuildInputs = [ ppx_compare ppx_fields_conv ppx_js_style ppx_sexp_value ]; - meta.description = "S-expression parsing library"; - }; - - parsexp_io = janePackage { - pname = "parsexp_io"; - hash = "0gcmh4dg48xgszladq92yhk1hf492zf0smz462xrwknzlfdkz6a5"; - propagatedBuildInputs = [ parsexp ]; - meta.description = "S-expression parsing library (IO functions)"; - }; - - patience_diff = janePackage { - pname = "patience_diff"; - hash = "0vpx9xj1ich5qmj3m26vlmix3nsdj7pd1xzhqwbc7ad2kqwy3grg"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Tool and library implementing patience diff"; - }; - - posixat = janePackage { - pname = "posixat"; - hash = "0ak93dyzi6sc6gb0j07fj85b24d8bv6g2hm7jj5xwb39kjwh51jl"; - propagatedBuildInputs = [ ppx_sexp_conv ]; - meta.description = "Binding to the posix *at functions"; - meta.broken = lib.versionAtLeast ocaml.version "4.05"; - }; - - rpc_parallel = janePackage { - pname = "rpc_parallel"; - hash = "0s72msl2p27bz0knjlpgy5qwp0w4z76cq801ps0sab35f8jjfs38"; - propagatedBuildInputs = [ async ]; - meta.description = "Type-safe library for building parallel applications"; - }; - - shexp = janePackage { - pname = "shexp"; - hash = "1fkz4l9z4i0fz2kccd5blm2j9x2x4z6y1cn29wjmc3spqfxbq37y"; - propagatedBuildInputs = [ posixat spawn ]; - meta.description = "Process library and s-expression based shell"; - }; - - topological_sort = janePackage { - pname = "topological_sort"; - hash = "1d64fyq0clsgham9p1f5rk01z8pxalglp92xmqw2iznyw0vxhvsy"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Topological sort algorithm"; - }; - - typerep_extended = janePackage { - pname = "typerep_extended"; - hash = "15gq8mrvlipd616rffr3f0wqw5d0ijnnizix610g2d5viirh0j9p"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Runtime types for OCaml (Extended)"; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix index fc2327b736..04880bca3a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix @@ -6,7 +6,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); buildDunePackage rec { pname = "lacaml"; - version = "11.0.8"; + version = "11.0.10"; useDune2 = true; @@ -14,7 +14,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mmottl/lacaml/releases/download/${version}/lacaml-${version}.tbz"; - sha256 = "1i47wqnd9iy6ndbi9zfahpb592gahp6im26rgpwch13vgzk3kifd"; + sha256 = "sha256-Vg6Hl31u1bvh0hfWU9eqoI8pGZt4YhpGRf3ul3h+SJk="; }; buildInputs = [ dune-configurator ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix index 9fdff45b6a..3eb8c2c08b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -21,11 +21,11 @@ buildDunePackage rec { pname = "letsencrypt"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-${version}.tbz"; - hash = "sha256-XGroZiNyP0ItOMrXK07nrVqT4Yz9RKXYvZuRkDp089M="; + hash = "sha256-uQOHpdyPg5kms+negxpQMxfhow6auZ0ipt5ksoXYo1w="; }; minimalOCamlVersion = "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lun/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lun/default.nix index aab83d4c3c..c7303d0a00 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lun/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lun/default.nix @@ -15,6 +15,6 @@ buildDunePackage rec { description = "Optics in OCaml"; homepage = "https://git.robur.coop/robur/lun"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ marsam ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/miou/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/miou/default.nix index fff2d16aaf..909bf019cd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/miou/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/miou/default.nix @@ -16,6 +16,6 @@ buildDunePackage rec { homepage = "https://git.robur.coop/robur/miou"; changelog = "https://git.robur.coop/robur/miou/src/tag/v${version}/CHANGES.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ marsam ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix index b55faf222c..6a74ef4cec 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix @@ -64,6 +64,6 @@ buildDunePackage rec { homepage = "https://github.com/logseq/mldoc"; description = "Another Emacs Org-mode and Markdown parser"; license = licenses.agpl3Only; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/1_x.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/1_x.nix deleted file mode 100644 index e10f2b7d7a..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/1_x.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, mtime }: - -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") - "mtime is not available for OCaml ${ocaml.version}" - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-mtime"; - version = "1.4.0"; - - src = fetchurl { - url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; - sha256 = "VQyYEk8+57Yq8SUuYossaQUHZKqemHDJtf4LK8qjxvc="; - }; - - nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = [ topkg ]; - - strictDeps = true; - - inherit (topkg) buildPhase installPhase; - inherit (mtime) meta; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ninja_utils/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ninja_utils/default.nix new file mode 100644 index 0000000000..2510cc93ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ninja_utils/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchzip, buildDunePackage, re }: + +buildDunePackage rec { + pname = "ninja_utils"; + version = "0.9.0"; + + minimalOCamlVersion = "4.12"; + + src = fetchzip { + url = "https://github.com/CatalaLang/ninja_utils/archive/refs/tags/${version}.tar.gz"; + hash = "sha256-VSj1IXfczoI3lSAtOqQPIqsxX+HgyxKzlssKd7By/Lo="; + }; + + propagatedBuildInputs = [ re ]; + + meta = { + description = "Small library used to generate Ninja build files"; + homepage = "https://github.com/CatalaLang/ninja_utils"; + license = lib.licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index ec4986bb88..aee22a26bd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -73,6 +73,6 @@ buildDunePackage rec { description = "Jsonrpc protocol implementation in OCaml"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix index 6ada93dc02..a60b02e4f3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ocaml-version"; - version = "3.6.5"; + version = "3.6.7"; src = fetchurl { url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz"; - hash = "sha256-hHP2l0Jcz9YalxCY0wcgdH6zTz+OqRD6JOyjB+r539I="; + hash = "sha256-1Q/9W2adM+2w2InEdqcd5IiNkACNWDNgONIQztKPgQw="; }; checkInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix index 9e271fe186..a6607ba83c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix @@ -19,7 +19,7 @@ buildDunePackage { meta = { homepage = "https://github.com/ocaml-ppx/ocamlformat"; description = "Auto-formatter for OCaml code (library)"; - maintainers = with lib.maintainers; [ Zimmi48 marsam Julow ]; + maintainers = with lib.maintainers; [ Zimmi48 Julow ]; license = lib.licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix index e1f5f29aa2..ca78efad37 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix @@ -21,6 +21,6 @@ in buildDunePackage rec { homepage = "https://github.com/ocaml-ppx/ocamlformat"; description = "Auto-formatter for OCaml code (RPC mode)"; license = licenses.mit; - maintainers = with maintainers; [ Zimmi48 marsam Julow ]; + maintainers = with maintainers; [ Zimmi48 Julow ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix index 4c3b660773..7b1faaf3e8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix @@ -31,7 +31,7 @@ buildDunePackage { meta = { homepage = "https://github.com/ocaml-ppx/ocamlformat"; description = "Auto-formatter for OCaml code"; - maintainers = with lib.maintainers; [ Zimmi48 marsam Julow ]; + maintainers = with lib.maintainers; [ Zimmi48 Julow ]; license = lib.licenses.mit; mainProgram = "ocamlformat"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc-parser/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc-parser/default.nix index 1c996973e1..5d22d2d712 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc-parser/default.nix @@ -1,23 +1,22 @@ -{ lib, fetchurl, buildDunePackage, ocaml, astring, result, camlp-streams, version ? "2.0.0" }: +{ lib, fetchurl, buildDunePackage, ocaml, astring, result, camlp-streams, version ? "2.4.2" }: let param = { + "2.4.2" = { + sha256 = "sha256-Vjz9uybsijDnN6nPKFoG4LuulT9I4lu7D2n3qZwrpAs="; + }; "2.0.0" = { sha256 = "sha256-QHkZ+7DrlXYdb8bsZ3dijZSqGQc0O9ymeLGIC6+zOSI="; - extraBuildInputs = [ camlp-streams ]; }; "1.0.1" = { sha256 = "sha256-orvo5CAbYOmAurAeluQfK6CwW6P1C0T3WDfoovuQfSw="; - extraBuildInputs = [ camlp-streams ]; }; "1.0.0" = { sha256 = "sha256-tqoI6nGp662bK+vE2h7aDXE882dObVfRBFnZNChueqE="; max_version = "5.0"; - extraBuildInputs = []; }; "0.9.0" = { sha256 = "sha256-3w2tG605v03mvmZsS2O5c71y66O3W+n3JjFxIbXwvXk="; max_version = "5.0"; - extraBuildInputs = []; }; }."${version}"; in @@ -31,16 +30,19 @@ buildDunePackage rec { minimalOCamlVersion = "4.02"; src = fetchurl { - url = "https://github.com/ocaml-doc/odoc-parser/releases/download/${version}/odoc-parser-${version}.tbz"; + url = if lib.versionAtLeast version "2.4" + then "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz" + else "https://github.com/ocaml-doc/odoc-parser/releases/download/${version}/odoc-parser-${version}.tbz"; inherit (param) sha256; }; - propagatedBuildInputs = [ astring result ] ++ param.extraBuildInputs; + propagatedBuildInputs = [ astring result ] ++ + lib.optional (lib.versionAtLeast version "1.0.1") camlp-streams; meta = { description = "Parser for Ocaml documentation comments"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.marsam ]; + maintainers = [ ]; homepage = "https://github.com/ocaml-doc/odoc-parser"; changelog = "https://github.com/ocaml-doc/odoc-parser/raw/${version}/CHANGES.md"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix index 18be9801a9..92d605be15 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix @@ -1,4 +1,5 @@ { lib, fetchurl, buildDunePackage, ocaml +, ocaml-crunch , astring, cmdliner, cppo, fpath, result, tyxml , markup, yojson, sexplib0, jq , odoc-parser, ppx_expect, bash, fmt @@ -6,14 +7,9 @@ buildDunePackage rec { pname = "odoc"; - version = "2.2.1"; + inherit (odoc-parser) version src; - src = fetchurl { - url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz"; - sha256 = "sha256-F4blO/CCT+HHx7gdKn2EaEal0RZ3lp5jljYfd6OBaAM="; - }; - - nativeBuildInputs = [ cppo ]; + nativeBuildInputs = [ cppo ocaml-crunch ]; buildInputs = [ astring cmdliner fpath result tyxml odoc-parser fmt ]; nativeCheckInputs = [ bash jq ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix index 746c75fccc..66d9e56c6d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix @@ -2,15 +2,13 @@ buildDunePackage rec { pname = "pecu"; - version = "0.6"; - - duneVersion = "3"; + version = "0.7"; minimalOCamlVersion = "4.03"; src = fetchurl { - url = "https://github.com/mirage/pecu/releases/download/v${version}/pecu-v${version}.tbz"; - sha256 = "a9d2b7da444c83b20f879f6c3b7fc911d08ac1e6245ad7105437504f9394e5c7"; + url = "https://github.com/mirage/pecu/releases/download/v${version}/pecu-${version}.tbz"; + hash = "sha256-rXR3tbFkKNM8MkQAZ2hJU9lO+qQ/qvYghXkYus6f13g="; }; # crowbar availability diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix index 7c4f90b6f9..76856024c0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,32 +1,27 @@ { lib -, ocaml , buildDunePackage -, fetchFromGitHub +, fetchurl , ppx_deriving , bppsuite , alcotest , angstrom-unix -, biocaml +, biotk , core , gsl , lacaml , menhir , menhirLib , printbox-text +, yojson }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "phylogenetics is not compatible with OCaml ${ocaml.version}" - buildDunePackage rec { pname = "phylogenetics"; - version = "unstable-2022-05-06"; + version = "0.2.0"; - src = fetchFromGitHub { - owner = "biocaml"; - repo = pname; - rev = "cd7c624d0f98e31b02933ca4511b9809b26d35b5"; - sha256 = "sha256:0w0xyah3hj05hxg1rsa40hhma3dm1cyq0zvnjrihhf22laxap7ga"; + src = fetchurl { + url = "https://github.com/biocaml/phylogenetics/releases/download/v${version}/phylogenetics-${version}.tbz"; + hash = "sha256-JFpYp3pyW7PrBjqCwwDZxkJPA84dp6Qs8rOPvHPY92o="; }; minimalOCamlVersion = "4.08"; @@ -36,13 +31,14 @@ buildDunePackage rec { nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ angstrom-unix - biocaml + biotk core gsl lacaml menhirLib ppx_deriving printbox-text + yojson ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix index 7a07daf8dd..41db9313fe 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,5 +1,9 @@ { lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }: +if lib.versionAtLeast ocaml.version "5.2" +then throw "ppx_tools is not available for OCaml ${ocaml.version}" +else + let param = let v6_6 = { version = "6.6"; @@ -58,7 +62,6 @@ then buildDunePackage { inherit pname src meta; inherit (param) version buildInputs nativeBuildInputs; - duneVersion = "3"; } else stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix index 49a5e15e9e..7ddbc1f5d5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { meta = with lib; { description = "Runtime lib for ppx_yojson_conv"; homepage = "https://github.com/janestreet/ppx_yojson_conv_lib"; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix index ab0e6bd30c..bc849fa1ec 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -3,7 +3,7 @@ if lib.versionAtLeast ocaml.version "4.07" then if lib.versionAtLeast ocaml.version "4.08" then if lib.versionAtLeast ocaml.version "4.11" - then "0.32.0" else "0.24.0" else "0.15.0" else "0.13.0" + then "0.32.1" else "0.24.0" else "0.15.0" else "0.13.0" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio , stdlib-shims, ocaml-migrate-parsetree-2 }: @@ -63,8 +63,8 @@ let param = { sha256 = "sha256-3UpjvenSm0mBDgTXZTk3yTLxd6lByg4ZgratU6xEIRA="; min_version = "4.07"; }; - "0.32.0" = { - sha256 = "sha256-UHzHPM+JXyLutSV6IkODjBijigkQX8/1Xu75FIVVQis="; + "0.32.1" = { + sha256 = "sha256-nbrYvLHItPPfP1i8pgpe0j2GUx8No0tBlshr1YXAnX8="; min_version = "4.07"; }; }."${version}"; in diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/riot/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/riot/default.nix index 81d1a48773..a6f5996391 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/riot/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/riot/default.nix @@ -40,6 +40,6 @@ buildDunePackage rec { homepage = "https://github.com/leostera/riot"; changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ marsam ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix index aaa5a275db..b4147f53c7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix @@ -80,6 +80,6 @@ buildDunePackage rec { changelog = "https://github.com/ocaml-community/sedlex/raw/v${version}/CHANGES"; description = "An OCaml lexer generator for Unicode"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/streaming/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/streaming/default.nix new file mode 100644 index 0000000000..f2a8c883f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/streaming/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildDunePackage +, fetchurl +, stdlib-shims +}: + +buildDunePackage rec { + pname = "streaming"; + version = "0.8.0"; + + minimalOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/odis-labs/streaming/releases/download/${version}/streaming-${version}.tbz"; + hash = "sha256-W+3GYZpsLj1SnQhuSmjXdi/85fMajWpz4b7x5W0bnJs="; + }; + + propagatedBuildInputs = [ stdlib-shims ]; + + meta = { + homepage = "https://odis-labs.github.io/streaming"; + license = lib.licenses.isc; + description = "Fast, safe and composable streaming abstractions"; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/syslog-message/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/syslog-message/default.nix index 73cbba8be3..e331948095 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/syslog-message/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/syslog-message/default.nix @@ -4,20 +4,18 @@ buildDunePackage rec { pname = "syslog-message"; - version = "1.1.0"; + version = "1.2.0"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { url = "https://github.com/verbosemode/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - hash = "sha256:0vy4dkl2q2fa6rzyfsvjyc9r1b9ymfqd6j35z2kp5vdc4r87053g"; + hash = "sha256-+eyiv6JvC0EKs3G1s5qoFtK0bU4Yg41AHg5Nc6xD9w0="; }; propagatedBuildInputs = [ - astring ptime - rresult ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-ttf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-ttf/default.nix index 93bee8f101..086b0789a6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-ttf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-ttf/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { pname = "tsdl-ttf"; - version = "0.5"; + version = "0.6"; duneVersion = "3"; @@ -17,7 +17,7 @@ buildDunePackage rec { owner = "sanette"; repo = pname; rev = version; - hash = "sha256-ai9ChsA3HZzTxT9AuHsY1UIA2Q3U3CcOA7jRSG4MDsQ="; + hash = "sha256-1MGbsekaBoCz4vAwg+Dfzsl0xUKgs8dUEr+OpLopnig="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix index f9e287e216..d1ac4ca9ac 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix @@ -14,15 +14,13 @@ buildDunePackage rec { pname = "unstrctrd"; - version = "0.3"; + version = "0.4"; src = fetchzip { - url = "https://github.com/dinosaure/unstrctrd/releases/download/v${version}/unstrctrd-v${version}.tbz"; - sha256 = "0mjm4v7kk75iwwsfnpmxc3bsl8aisz53y7z21sykdp60f4rxnah7"; + url = "https://github.com/dinosaure/unstrctrd/releases/download/v${version}/unstrctrd-${version}.tbz"; + hash = "sha256-CGcDqEr+VDTbDYkjxeYB6IFWiTkOTLJJl/Y2bHtv19g="; }; - duneVersion = "3"; - propagatedBuildInputs = [ angstrom uutf diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uring/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uring/default.nix index 4940f38f1b..9da63a8cd8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uring/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uring/default.nix @@ -3,6 +3,7 @@ , cstruct , dune-configurator , fetchurl +, fetchpatch , fmt , optint , mdx @@ -10,13 +11,13 @@ buildDunePackage rec { pname = "uring"; - version = "0.8"; + version = "0.9"; minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/ocaml-multicore/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - hash = "sha256-4OGst19vqEzuNVxO5xxtzS+mEilEBFoEc7lC3j3sTk4="; + hash = "sha256-eXWIxfL9UsKKf4sanBjKfr6Od4fPDctVnkU+wjIXW0M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix index d904b92a0a..2187de4c7c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix @@ -23,6 +23,6 @@ buildDunePackage rec { changelog = "https://gitlab.inria.fr/fpottier/visitors/-/raw/${version}/CHANGES.md"; license = licenses.lgpl21; description = "An OCaml syntax extension (technically, a ppx_deriving plugin) which generates object-oriented visitors for traversing and transforming data structures"; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix index b92d8e6cb8..abfe608055 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "zmq"; - version = "5.2.1"; + version = "5.3.0"; src = fetchurl { url = "https://github.com/issuu/ocaml-zmq/releases/download/${version}/zmq-${version}.tbz"; - hash = "sha256-hVKfaTrUFqEBsv5hFB7JwsR630M0DKnqhB0QHpxcHKc="; + hash = "sha256-tetCmVg27/WHZ+HMwKZVHCrHTzWAlKwkAjNDibB1+6g="; }; buildInputs = [ czmq dune-configurator ]; diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/ga/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/ga/default.nix index 83d4449594..6c7f8e0946 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/ga/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/ga/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "ga"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-cbP7ucua7DdxLL422INxjZxz/x1pHoIq+jkjrtfaabE="; + sha256 = "sha256-hsrjh2rZFhP6WA+qaKjiGfJkDtT2nTlXlKr3jAJ5Y44="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/ImageExifTool/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/ImageExifTool/default.nix index 5ca983f32c..b46ddbdc33 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/ImageExifTool/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/ImageExifTool/default.nix @@ -1,23 +1,25 @@ -{ lib -, stdenv -, buildPerlPackage -, exiftool -, fetchurl -, gitUpdater -, shortenPerlShebang -, testers +{ + buildPerlPackage, + exiftool, + fetchurl, + gitUpdater, + lib, + shortenPerlShebang, + stdenv, + testers, }: buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.82"; + version = "12.84"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-1MfWz0AR+SaM2Ar7gAfLs38OJhOnP4cRekpe1uSjDD4="; + hash = "sha256-sfSnx5bS7vI0KIhBOpB5VYzP6g8oi0rR7mUTxxNWEA0="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/exiftool ''; @@ -28,9 +30,7 @@ buildPerlPackage rec { command = "${lib.getExe exiftool} -ver"; package = exiftool; }; - updateScript = gitUpdater { - url = "https://github.com/exiftool/exiftool.git"; - }; + updateScript = gitUpdater { url = "https://github.com/exiftool/exiftool.git"; }; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/amqp/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/amqp/default.nix index 4d19fd7589..8891aba7cd 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/amqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/amqp/default.nix @@ -1,8 +1,14 @@ -{ buildPecl, lib, rabbitmq-c, fetchFromGitHub }: +{ + buildPecl, + lib, + rabbitmq-c, + fetchFromGitHub, +}: let version = "2.1.2"; -in buildPecl { +in +buildPecl { inherit version; pname = "amqp"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/apcu/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/apcu/default.nix index 9aec7d6607..f8b8ff1d83 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/apcu/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/apcu/default.nix @@ -1,8 +1,16 @@ -{ buildPecl, lib, pcre2, fetchFromGitHub, php, fetchpatch }: +{ + buildPecl, + lib, + pcre2, + fetchFromGitHub, + php, + fetchpatch, +}: let version = "5.1.23"; -in buildPecl { +in +buildPecl { inherit version; pname = "apcu"; @@ -16,9 +24,15 @@ in buildPecl { buildInputs = [ pcre2 ]; doCheck = true; checkTarget = "test"; - checkFlagsArray = [ "REPORT_EXIT_STATUS=1" "NO_INTERACTION=1" ]; + checkFlagsArray = [ + "REPORT_EXIT_STATUS=1" + "NO_INTERACTION=1" + ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; meta = with lib; { changelog = "https://github.com/krakjoe/apcu/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/ast/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/ast/default.nix index d04ba25b7f..662588be52 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/ast/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/ast/default.nix @@ -1,8 +1,13 @@ -{ buildPecl, lib, fetchFromGitHub }: +{ + buildPecl, + lib, + fetchFromGitHub, +}: let version = "1.1.1"; -in buildPecl { +in +buildPecl { inherit version; pname = "ast"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/box/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/box/default.nix index f9b77995e5..1407064044 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/box/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/box/default.nix @@ -1,17 +1,21 @@ -{ lib, php82, fetchFromGitHub }: +{ + lib, + php82, + fetchFromGitHub, +}: php82.buildComposerProject (finalAttrs: { pname = "box"; - version = "4.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "box-project"; repo = "box"; rev = finalAttrs.version; - hash = "sha256-58L0eWIuUleb90ICBrmeHEQDVYySX0TdSaJBnBtmBXc="; + hash = "sha256-gYIAP9pTjahNkpNNXx0c8sQm+9Kaq6/IAo/xI5bNy7Y="; }; - vendorHash = "sha256-9kTqU+1i6ICLOlCZe+JCyKn8VN/67Uk9vmn8ng8+HdI="; + vendorHash = "sha256-HCbjW4HdyQNWDEHXj9U1t3S3EKcrPV1z/9I1ClFsMsc="; meta = { changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/castor/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/castor/default.nix index 1b6b3f6be9..c191d7978c 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/castor/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/castor/default.nix @@ -1,10 +1,11 @@ -{ lib -, fetchFromGitHub -, fetchpatch -, installShellFiles -, php -, nix-update-script -, testers +{ + lib, + fetchFromGitHub, + fetchpatch, + installShellFiles, + php, + nix-update-script, + testers, }: php.buildComposerProject (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix index 28606fdfa2..d98c3155bb 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,15 @@ -{ lib -, callPackage -, fetchFromGitHub -, php -, unzip -, _7zz -, xz -, git -, curl -, cacert -, makeBinaryWrapper +{ + lib, + callPackage, + fetchFromGitHub, + php, + unzip, + _7zz, + xz, + git, + curl, + cacert, + makeBinaryWrapper, }: php.buildComposerProject (finalAttrs: { @@ -16,7 +17,7 @@ php.buildComposerProject (finalAttrs: { # use together with the version from this package to keep the # bootstrap phar file up-to-date together with the end user composer # package. - passthru.pharHash = "sha256-/MAv8ES1oE++z/AVjLYEHCXo94rElAmHNv7NK7TzgeQ="; + passthru.pharHash = "sha256-KdyaGe8zU12wYbMRgLKoM6fPjSz0FFszovg1BId7ugg="; composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { inherit (finalAttrs) version; @@ -24,20 +25,29 @@ php.buildComposerProject (finalAttrs: { }; pname = "composer"; - version = "2.7.3"; + version = "2.7.6"; src = fetchFromGitHub { owner = "composer"; repo = "composer"; rev = finalAttrs.version; - hash = "sha256-4cQ/p6lC8qgba/GSKuP2rFc0mZrUc+HuwvBMXnVERoU="; + hash = "sha256-LZwg3PR3zl07Nb6MS8oKkRfjLgqtT/c4sfUOzWE4S+U="; }; nativeBuildInputs = [ makeBinaryWrapper ]; postInstall = '' wrapProgram $out/bin/composer \ - --prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]} + --prefix PATH : ${ + lib.makeBinPath [ + _7zz + cacert + curl + git + unzip + xz + ] + } ''; vendorHash = "sha256-dNNV9fTyGyRoGeDV/vBjn0aMgkaUMsrKQv5AOoiYokQ="; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix index 2ff867348d..e638d4c470 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix @@ -1,4 +1,13 @@ -{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }: +{ + lib, + buildPecl, + fetchFromGitHub, + writeText, + libcouchbase, + zlib, + php, + substituteAll, +}: let pname = "couchbase"; version = "3.2.2"; @@ -15,7 +24,10 @@ buildPecl { configureFlags = [ "--with-couchbase" ]; - buildInputs = [ libcouchbase zlib ]; + buildInputs = [ + libcouchbase + zlib + ]; patches = [ (substituteAll { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/default.nix index 2b8b7ea4fb..15b1658243 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/default.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, buildPecl -, cargo -, rustc -, fetchFromGitHub -, rustPlatform -, curl -, pcre2 -, libiconv -, darwin +{ + lib, + stdenv, + buildPecl, + cargo, + rustc, + fetchFromGitHub, + rustPlatform, + curl, + pcre2, + libiconv, + darwin, }: buildPecl rec { @@ -32,31 +33,39 @@ buildPecl rec { env.NIX_CFLAGS_COMPILE = "-O2"; - nativeBuildInputs = [ - cargo - rustc - ] ++ lib.optionals stdenv.isLinux [ - rustPlatform.bindgenHook - rustPlatform.cargoSetupHook - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.rustPlatform.bindgenHook - darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook - ]; + nativeBuildInputs = + [ + cargo + rustc + ] + ++ lib.optionals stdenv.isLinux [ + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.rustPlatform.bindgenHook + darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook + ]; - buildInputs = [ - curl - pcre2 - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - libiconv - ]; + buildInputs = + [ + curl + pcre2 + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + libiconv + ]; meta = { changelog = "https://github.com/DataDog/dd-trace-php/blob/${src.rev}/CHANGELOG.md"; description = "Datadog Tracing PHP Client"; homepage = "https://github.com/DataDog/dd-trace-php"; - license = with lib.licenses; [ asl20 bsd3 ]; + license = with lib.licenses; [ + asl20 + bsd3 + ]; maintainers = lib.teams.php.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/php-packages/deployer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/deployer/default.nix index 44a2e97f7a..6575338e4d 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/deployer/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/deployer/default.nix @@ -1,22 +1,24 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: php.buildComposerProject (finalAttrs: { pname = "deployer"; - version = "7.3.3"; + version = "7.4.0"; src = fetchFromGitHub { owner = "deployphp"; repo = "deployer"; rev = "v${finalAttrs.version}^"; - hash = "sha256-zvK7NwIACAhWN/7D8lVY1Bv8x6xKAp/L826SovQhDYg="; + hash = "sha256-nSrW4o0Tb8H056AAjjMzbsAVvWY2z1pdWmPFZDpDr1k="; }; vendorHash = "sha256-BDq2uryNWC31AEAEZJL9zGaAPbhXZ6hmfpsnr4wlixE="; meta = { + changelog = "https://github.com/deployphp/deployer/releases/tag/v${finalAttrs.version}"; description = "The PHP deployment tool with support for popular frameworks out of the box"; homepage = "https://deployer.org/"; license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/ds/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/ds/default.nix index 7e37c8a2d3..6d44b0aaab 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/ds/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/ds/default.nix @@ -1,8 +1,15 @@ -{ buildPecl, lib, pcre2, php, fetchFromGitHub }: +{ + buildPecl, + lib, + pcre2, + php, + fetchFromGitHub, +}: let version = "1.5.0"; -in buildPecl { +in +buildPecl { inherit version; pname = "ds"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix index a497d93462..46107a446c 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix @@ -1,4 +1,11 @@ -{ buildPecl, lib, php, pkg-config, openssl, libevent }: +{ + buildPecl, + lib, + php, + pkg-config, + openssl, + libevent, +}: buildPecl { pname = "event"; @@ -19,7 +26,10 @@ buildPecl { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl libevent ]; + buildInputs = [ + openssl + libevent + ]; internalDeps = [ php.extensions.sockets ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/gnupg/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/gnupg/default.nix index 1341ca2d16..7e646e151c 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/gnupg/default.nix @@ -1,8 +1,17 @@ -{ buildPecl, lib, gpgme, file, gnupg, php, fetchFromGitHub }: +{ + buildPecl, + lib, + gpgme, + file, + gnupg, + php, + fetchFromGitHub, +}: let version = "1.5.1"; -in buildPecl { +in +buildPecl { inherit version; pname = "gnupg"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/grpc/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/grpc/default.nix index e70432f37e..5dcd2a4a33 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/grpc/default.nix @@ -1,7 +1,8 @@ -{ buildPecl -, pkg-config -, lib -, grpc +{ + buildPecl, + pkg-config, + lib, + grpc, }: buildPecl { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix index 4d1b243895..5a585bdca7 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix @@ -1,6 +1,7 @@ -{ fetchFromGitHub -, lib -, php +{ + fetchFromGitHub, + lib, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/igbinary/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/igbinary/default.nix index b2f8c270c4..6b8d426c37 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/igbinary/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/igbinary/default.nix @@ -7,7 +7,10 @@ buildPecl { configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; meta = { description = "Binary serialization for PHP"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/imagick/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/imagick/default.nix index 5150833945..d8570ee24b 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/imagick/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/imagick/default.nix @@ -1,4 +1,10 @@ -{ buildPecl, lib, imagemagick, pkg-config, pcre2 }: +{ + buildPecl, + lib, + imagemagick, + pkg-config, + pcre2, +}: buildPecl { pname = "imagick"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/inotify/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/inotify/default.nix index 4296df1d81..b68af7ec6e 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/inotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/inotify/default.nix @@ -1,6 +1,4 @@ -{ buildPecl -, lib -}: +{ buildPecl, lib }: buildPecl { pname = "inotify"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/ioncube-loader/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/ioncube-loader/default.nix index 290abdffbe..4c691a913d 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/ioncube-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/ioncube-loader/default.nix @@ -1,7 +1,8 @@ -{ stdenv -, lib -, fetchzip -, php +{ + stdenv, + lib, + fetchzip, + php, }: let @@ -42,7 +43,9 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/lib/php/extensions - cp $src/ioncube_loader_${variant.${stdenv.hostPlatform.system}.prefix}_${phpVersion}.so $out/lib/php/extensions/ioncube-loader.so + cp $src/ioncube_loader_${ + variant.${stdenv.hostPlatform.system}.prefix + }_${phpVersion}.so $out/lib/php/extensions/ioncube-loader.so ''; meta = with lib; { @@ -52,6 +55,11 @@ stdenv.mkDerivation { sourceProvenance = [ sourceTypes.binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ neverbehave ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/php-packages/mailparse/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/mailparse/default.nix index c6d0975d7b..e0dba768aa 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/mailparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/mailparse/default.nix @@ -1,4 +1,8 @@ -{ buildPecl, lib, php }: +{ + buildPecl, + lib, + php, +}: buildPecl { pname = "mailparse"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix index 80f54c5676..33c9fba690 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix @@ -1,4 +1,9 @@ -{ buildPecl, lib, fetchFromGitHub, libmaxminddb }: +{ + buildPecl, + lib, + fetchFromGitHub, + libmaxminddb, +}: let pname = "maxminddb"; version = "1.11.1"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/memcache/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/memcache/default.nix index 6cb205c61f..30180ed167 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/memcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/memcache/default.nix @@ -1,4 +1,11 @@ -{ buildPecl, lib, fetchFromGitHub, php, zlib, pkg-config }: +{ + buildPecl, + lib, + fetchFromGitHub, + php, + zlib, + pkg-config, +}: buildPecl rec { pname = "memcache"; @@ -11,13 +18,9 @@ buildPecl rec { hash = "sha256-77GvQ59XUpIZmdYZP6IhtjdkYwXKuNBSG+LBScz2BtI="; }; - internalDeps = [ - php.extensions.session - ]; + internalDeps = [ php.extensions.session ]; - configureFlags = [ - "--with-zlib-dir=${zlib.dev}" - ]; + configureFlags = [ "--with-zlib-dir=${zlib.dev}" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/memcached/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/memcached/default.nix index 9724904d52..bbf4f9856f 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/memcached/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/memcached/default.nix @@ -1,4 +1,13 @@ -{ buildPecl, lib, fetchFromGitHub, php, cyrus_sasl, zlib, pkg-config, libmemcached }: +{ + buildPecl, + lib, + fetchFromGitHub, + php, + cyrus_sasl, + zlib, + pkg-config, + libmemcached, +}: buildPecl rec { pname = "memcached"; @@ -11,9 +20,7 @@ buildPecl rec { sha256 = "sha256-g9IzGSZUxLlOE32o9ZJOa3erb5Qs1ntR8nzS3kRd/EU="; }; - internalDeps = [ - php.extensions.session - ]; + internalDeps = [ php.extensions.session ]; configureFlags = [ "--with-zlib-dir=${zlib.dev}" @@ -21,7 +28,10 @@ buildPecl rec { ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cyrus_sasl zlib ]; + buildInputs = [ + cyrus_sasl + zlib + ]; meta = with lib; { description = "PHP extension for interfacing with memcached via libmemcached library"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/meminfo/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/meminfo/default.nix index d170243be2..d7cca10ba3 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/meminfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/meminfo/default.nix @@ -1,4 +1,8 @@ -{ buildPecl, lib, fetchFromGitHub }: +{ + buildPecl, + lib, + fetchFromGitHub, +}: buildPecl rec { version = "unstable-2022-03-25"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/memprof/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/memprof/default.nix index 04ef8e6be5..f5839e9663 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/memprof/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/memprof/default.nix @@ -1,12 +1,14 @@ -{ buildPecl -, lib -, fetchFromGitHub -, judy +{ + buildPecl, + lib, + fetchFromGitHub, + judy, }: let version = "3.0.2"; -in buildPecl { +in +buildPecl { inherit version; pname = "memprof"; @@ -17,9 +19,7 @@ in buildPecl { hash = "sha256-K8YcvCobErBkaWFTkVGLXXguQPOLIgQuRGWJF+HAIRA="; }; - configureFlags = [ - "--with-judy-dir=${judy}" - ]; + configureFlags = [ "--with-judy-dir=${judy}" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix index 02771c9016..8a1b224627 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix @@ -1,43 +1,46 @@ -{ stdenv -, buildPecl -, fetchFromGitHub -, lib -, libiconv -, pcre2 -, pkg-config -, cyrus_sasl -, icu64 -, openssl -, snappy -, zlib -, darwin +{ + stdenv, + buildPecl, + fetchFromGitHub, + lib, + libiconv, + pcre2, + pkg-config, + cyrus_sasl, + icu64, + openssl, + snappy, + zlib, + darwin, }: buildPecl rec { pname = "mongodb"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-GstDJShuwzXZqlzhLWMEkvrNgCdmORAkGncpmPe879Q="; + hash = "sha256-hog6bOKAhLwZMjrUD5yOJ607B1MLYaZJjq6CXIYPlH4="; fetchSubmodules = true; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - cyrus_sasl - icu64 - openssl - snappy - zlib - pcre2 - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.Libsystem - libiconv - ]; + buildInputs = + [ + cyrus_sasl + icu64 + openssl + snappy + zlib + pcre2 + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Security + darwin.apple_sdk_11_0.Libsystem + libiconv + ]; meta = { description = "The Official MongoDB PHP driver"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/oci8/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/oci8/default.nix index 495d511f3a..bd0fe21e24 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/oci8/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/oci8/default.nix @@ -1,16 +1,27 @@ -{ buildPecl, lib, oracle-instantclient, php }: +{ + buildPecl, + lib, + oracle-instantclient, + php, +}: let - versionData = if (lib.versionOlder php.version "8.1") then { - version = "3.0.1"; - sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; - } else if (lib.versionOlder php.version "8.2") then { - version = "3.2.1"; - sha256 = "sha256-zyF703DzRZDBhlNFFt/dknmZ7layqhgjG1/ZDN+PEsg="; - } else { - version = "3.3.0"; - sha256 = "sha256-0y5VnRKspJYE6xWeBcX2OG2pJTNbB+27GMywDv4gzwQ="; - }; + versionData = + if (lib.versionOlder php.version "8.1") then + { + version = "3.0.1"; + sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; + } + else if (lib.versionOlder php.version "8.2") then + { + version = "3.2.1"; + sha256 = "sha256-zyF703DzRZDBhlNFFt/dknmZ7layqhgjG1/ZDN+PEsg="; + } + else + { + version = "3.3.0"; + sha256 = "sha256-0y5VnRKspJYE6xWeBcX2OG2pJTNbB+27GMywDv4gzwQ="; + }; in buildPecl { pname = "oci8"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/openswoole/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/openswoole/default.nix index dd0dd17b24..83c59fb321 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/openswoole/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/openswoole/default.nix @@ -1,8 +1,16 @@ -{ lib, stdenv, buildPecl, valgrind, pcre2, fetchFromGitHub }: +{ + lib, + stdenv, + buildPecl, + valgrind, + pcre2, + fetchFromGitHub, +}: let version = "22.1.2"; -in buildPecl { +in +buildPecl { inherit version; pname = "openswoole"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix index 6770ecb432..044e180607 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix @@ -1,8 +1,13 @@ -{ lib, buildPecl, fetchFromGitHub }: +{ + lib, + buildPecl, + fetchFromGitHub, +}: let - version = "1.0.2"; -in buildPecl rec { + version = "1.0.3"; +in +buildPecl rec { inherit version; pname = "opentelemetry"; @@ -10,7 +15,7 @@ in buildPecl rec { owner = "open-telemetry"; repo = "opentelemetry-php-instrumentation"; rev = version; - hash = "sha256-w6Gkjh9+I6KlQyztv4o1XZ6nJ+Yn4wXXN6nma8/dLTU="; + hash = "sha256-KqLbKnAHxXbldNYVN7eMQ7NdZmPecu0UKHQdlUm7Ur0="; }; sourceRoot = "${src.name}/ext"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/pcov/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/pcov/default.nix index a25479893d..ccce782c16 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/pcov/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/pcov/default.nix @@ -1,8 +1,15 @@ -{ buildPecl, lib, php, pcre2, fetchFromGitHub }: +{ + buildPecl, + lib, + php, + pcre2, + fetchFromGitHub, +}: let version = "1.0.11"; -in buildPecl { +in +buildPecl { inherit version; pname = "pcov"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/pdlib/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/pdlib/default.nix index 19312ef985..b6b86b1339 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/pdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/pdlib/default.nix @@ -1,4 +1,10 @@ -{ buildPecl, fetchFromGitHub, lib, pkg-config, dlib }: +{ + buildPecl, + fetchFromGitHub, + lib, + pkg-config, + dlib, +}: let pname = "pdlib"; version = "1.1.0"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix index c8411a1e8e..7da343ac55 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -1,4 +1,11 @@ -{ stdenv, buildPecl, lib, libiconv, unixODBC, php }: +{ + stdenv, + buildPecl, + lib, + libiconv, + unixODBC, + php, +}: buildPecl { pname = "pdo_sqlsrv"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phalcon/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phalcon/default.nix index 07854fdf3b..a8d19fa96b 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phalcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phalcon/default.nix @@ -1,4 +1,11 @@ -{ buildPecl, lib, pcre2, fetchFromGitHub, php, pkg-config }: +{ + buildPecl, + lib, + pcre2, + fetchFromGitHub, + php, + pkg-config, +}: buildPecl rec { pname = "phalcon"; @@ -11,7 +18,10 @@ buildPecl rec { hash = "sha256-AgyV9pxyXcXuhrRgozN2p67u8xZMepbWrzYaBZMFn6k="; }; - internalDeps = [ php.extensions.session php.extensions.pdo ]; + internalDeps = [ + php.extensions.session + php.extensions.pdo + ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre2 ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phan/default.nix index e390389eef..af95847c37 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phan/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phan/default.nix @@ -1,30 +1,32 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: -(php.withExtensions({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject (finalAttrs: { - pname = "phan"; - version = "5.4.3"; +(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject + (finalAttrs: { + pname = "phan"; + version = "5.4.3"; - src = fetchFromGitHub { - owner = "phan"; - repo = "phan"; - rev = finalAttrs.version; - hash = "sha256-O0dtnDsz6X99B99VbRQf3Wr/xJfsJqd+2l5Z5iWxHyU="; - }; + src = fetchFromGitHub { + owner = "phan"; + repo = "phan"; + rev = finalAttrs.version; + hash = "sha256-O0dtnDsz6X99B99VbRQf3Wr/xJfsJqd+2l5Z5iWxHyU="; + }; - vendorHash = "sha256-yE85MBseJa0VGV5EbjT0te4QT3697YvtumGkMMfZtxI="; + vendorHash = "sha256-yE85MBseJa0VGV5EbjT0te4QT3697YvtumGkMMfZtxI="; - meta = { - description = "Static analyzer for PHP"; - homepage = "https://github.com/phan/phan"; - license = lib.licenses.mit; - longDescription = '' - Phan is a static analyzer for PHP. Phan prefers to avoid false-positives - and attempts to prove incorrectness rather than correctness. - ''; - mainProgram = "phan"; - maintainers = with lib.maintainers; [ apeschar ] ++ lib.teams.php.members; - }; -}) + meta = { + description = "Static analyzer for PHP"; + homepage = "https://github.com/phan/phan"; + license = lib.licenses.mit; + longDescription = '' + Phan is a static analyzer for PHP. Phan prefers to avoid false-positives + and attempts to prove incorrectness rather than correctness. + ''; + mainProgram = "phan"; + maintainers = with lib.maintainers; [ apeschar ] ++ lib.teams.php.members; + }; + }) diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix index 9c0a155ff7..dfda99220f 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix @@ -1,29 +1,31 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: -(php.withExtensions({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject (finalAttrs: { - pname = "phing"; - version = "3.0.0-rc6"; +(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject + (finalAttrs: { + pname = "phing"; + version = "3.0.0-rc6"; - src = fetchFromGitHub { - owner = "phingofficial"; - repo = "phing"; - rev = finalAttrs.version; - hash = "sha256-pOt6uQaz69WuHKYZhq6FFbjyHGrEc+Bf0Sw9uCS3Nrc="; - }; + src = fetchFromGitHub { + owner = "phingofficial"; + repo = "phing"; + rev = finalAttrs.version; + hash = "sha256-pOt6uQaz69WuHKYZhq6FFbjyHGrEc+Bf0Sw9uCS3Nrc="; + }; - # TODO: Open a PR against https://github.com/phingofficial/phing - # Their `composer.lock` is out of date therefore, we need to provide one - composerLock = ./composer.lock; - vendorHash = "sha256-ueTbbz3FGyRcRvlcJNirHdC77Tko4RKtYMFB3+4JdnQ="; + # TODO: Open a PR against https://github.com/phingofficial/phing + # Their `composer.lock` is out of date therefore, we need to provide one + composerLock = ./composer.lock; + vendorHash = "sha256-ueTbbz3FGyRcRvlcJNirHdC77Tko4RKtYMFB3+4JdnQ="; - meta = { - description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant"; - homepage = "https://github.com/phingofficial/phing"; - license = lib.licenses.lgpl3; - mainProgram = "phing"; - maintainers = lib.teams.php.members; - }; -}) + meta = { + description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant"; + homepage = "https://github.com/phingofficial/phing"; + license = lib.licenses.lgpl3; + mainProgram = "phing"; + maintainers = lib.teams.php.members; + }; + }) diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phive/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phive/default.nix index f8efa3621e..82b5681cb1 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phive/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phive/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/php-codesniffer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php-codesniffer/default.nix index 0075c387d6..5ea2977be6 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/php-codesniffer/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/php-codesniffer/default.nix @@ -1,6 +1,7 @@ -{ fetchFromGitHub -, lib -, php +{ + fetchFromGitHub, + lib, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix index 351d2e4d7b..92f61c9616 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix index fbd6e264e1..dc14ac2198 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix @@ -1,6 +1,7 @@ -{ fetchFromGitHub -, lib -, php +{ + fetchFromGitHub, + lib, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpinsights/composer.lock b/third_party/nixpkgs/pkgs/development/php-packages/phpinsights/composer.lock index 8fe99422b5..a068e3a435 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpinsights/composer.lock +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpinsights/composer.lock @@ -73,16 +73,16 @@ }, { "name": "composer/pcre", - "version": "3.1.2", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace" + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4775f35b2d70865807c89d32c8e7385b86eb0ace", - "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace", + "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", "shasum": "" }, "require": { @@ -124,7 +124,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.2" + "source": "https://github.com/composer/pcre/tree/3.1.3" }, "funding": [ { @@ -140,7 +140,7 @@ "type": "tidelift" } ], - "time": "2024-03-07T15:38:35+00:00" + "time": "2024-03-19T10:26:25+00:00" }, { "name": "composer/semver", @@ -225,16 +225,16 @@ }, { "name": "composer/xdebug-handler", - "version": "3.0.3", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ced299686f41dce890debac69273b47ffe98a40c" + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", - "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef", "shasum": "" }, "require": { @@ -245,7 +245,7 @@ "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^6.0" + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" }, "type": "library", "autoload": { @@ -269,9 +269,9 @@ "performance" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.5" }, "funding": [ { @@ -287,7 +287,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T21:32:43+00:00" + "time": "2024-05-06T16:37:16+00:00" }, { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -369,16 +369,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.51.0", + "version": "v3.56.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "127fa74f010da99053e3f5b62672615b72dd6efd" + "reference": "69c6168ae8bc96dc656c7f6c7271120a68ae5903" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/127fa74f010da99053e3f5b62672615b72dd6efd", - "reference": "127fa74f010da99053e3f5b62672615b72dd6efd", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/69c6168ae8bc96dc656c7f6c7271120a68ae5903", + "reference": "69c6168ae8bc96dc656c7f6c7271120a68ae5903", "shasum": "" }, "require": { @@ -402,6 +402,7 @@ }, "require-dev": { "facile-it/paraunit": "^1.3 || ^2.0", + "infection/infection": "^0.27.11", "justinrainbow/json-schema": "^5.2", "keradus/cli-executor": "^2.1", "mikey179/vfsstream": "^1.6.11", @@ -449,7 +450,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.51.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.56.1" }, "funding": [ { @@ -457,7 +458,7 @@ "type": "github" } ], - "time": "2024-02-28T19:50:06+00:00" + "time": "2024-05-10T11:31:15+00:00" }, { "name": "justinrainbow/json-schema", @@ -613,16 +614,16 @@ }, { "name": "php-parallel-lint/php-parallel-lint", - "version": "v1.3.2", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git", - "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de" + "reference": "6db563514f27e19595a19f45a4bf757b6401194e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6483c9832e71973ed29cf71bd6b3f4fde438a9de", - "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6db563514f27e19595a19f45a4bf757b6401194e", + "reference": "6db563514f27e19595a19f45a4bf757b6401194e", "shasum": "" }, "require": { @@ -660,26 +661,30 @@ "email": "ahoj@jakubonderka.cz" } ], - "description": "This tool check syntax of PHP files about 20x faster than serial check.", + "description": "This tool checks the syntax of PHP files about 20x faster than serial check.", "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint", + "keywords": [ + "lint", + "static analysis" + ], "support": { "issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues", - "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.3.2" + "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.4.0" }, - "time": "2022-02-21T12:50:22+00:00" + "time": "2024-03-27T12:14:49+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.26.0", + "version": "1.29.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" + "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/536889f2b340489d328f5ffb7b02bb6b183ddedc", + "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc", "shasum": "" }, "require": { @@ -711,9 +716,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.0" }, - "time": "2024-02-23T16:05:55+00:00" + "time": "2024-05-06T12:04:23+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1220,16 +1225,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.9.0", + "version": "3.9.2", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480", + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480", "shasum": "" }, "require": { @@ -1296,35 +1301,35 @@ "type": "open_collective" } ], - "time": "2024-02-16T15:06:51+00:00" + "time": "2024-04-23T20:25:34+00:00" }, { "name": "symfony/cache", - "version": "v7.0.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "fc822951dd360a593224bb2cef90a087d0dff60f" + "reference": "b9e9b93c9817ec6c789c7943f5e54b57a041c16a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/fc822951dd360a593224bb2cef90a087d0dff60f", - "reference": "fc822951dd360a593224bb2cef90a087d0dff60f", + "url": "https://api.github.com/repos/symfony/cache/zipball/b9e9b93c9817ec6c789c7943f5e54b57a041c16a", + "reference": "b9e9b93c9817ec6c789c7943f5e54b57a041c16a", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "psr/cache": "^2.0|^3.0", "psr/log": "^1.1|^2|^3", "symfony/cache-contracts": "^2.5|^3", "symfony/service-contracts": "^2.5|^3", - "symfony/var-exporter": "^6.4|^7.0" + "symfony/var-exporter": "^6.3.6|^7.0" }, "conflict": { - "doctrine/dbal": "<3.6", - "symfony/dependency-injection": "<6.4", - "symfony/http-kernel": "<6.4", - "symfony/var-dumper": "<6.4" + "doctrine/dbal": "<2.13.1", + "symfony/dependency-injection": "<5.4", + "symfony/http-kernel": "<5.4", + "symfony/var-dumper": "<5.4" }, "provide": { "psr/cache-implementation": "2.0|3.0", @@ -1333,15 +1338,15 @@ }, "require-dev": { "cache/integration-tests": "dev-master", - "doctrine/dbal": "^3.6|^4", + "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1|^2.0", "psr/simple-cache": "^1.0|^2.0|^3.0", - "symfony/config": "^6.4|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/filesystem": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/messenger": "^6.4|^7.0", - "symfony/var-dumper": "^6.4|^7.0" + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -1376,7 +1381,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v7.0.4" + "source": "https://github.com/symfony/cache/tree/v6.4.7" }, "funding": [ { @@ -1392,20 +1397,20 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:20+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/cache-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "1d74b127da04ffa87aa940abe15446fa89653778" + "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/1d74b127da04ffa87aa940abe15446fa89653778", - "reference": "1d74b127da04ffa87aa940abe15446fa89653778", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/df6a1a44c890faded49a5fca33c2d5c5fd3c2197", + "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197", "shasum": "" }, "require": { @@ -1415,7 +1420,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1452,7 +1457,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/cache-contracts/tree/v3.5.0" }, "funding": [ { @@ -1468,20 +1473,20 @@ "type": "tidelift" } ], - "time": "2023-09-25T12:52:38+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/console", - "version": "v6.4.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" + "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", - "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", + "url": "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", + "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", "shasum": "" }, "require": { @@ -1546,7 +1551,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.4" + "source": "https://github.com/symfony/console/tree/v6.4.7" }, "funding": [ { @@ -1562,20 +1567,20 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:10+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", "shasum": "" }, "require": { @@ -1584,7 +1589,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1613,7 +1618,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" }, "funding": [ { @@ -1629,28 +1634,28 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v7.0.3", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "834c28d533dd0636f910909d01b9ff45cc094b5e" + "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/834c28d533dd0636f910909d01b9ff45cc094b5e", - "reference": "834c28d533dd0636f910909d01b9ff45cc094b5e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d84384f3f67de3cb650db64d685d70395dacfc3f", + "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "symfony/event-dispatcher-contracts": "^2.5|^3" }, "conflict": { - "symfony/dependency-injection": "<6.4", + "symfony/dependency-injection": "<5.4", "symfony/service-contracts": "<2.5" }, "provide": { @@ -1659,13 +1664,13 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^6.4|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/error-handler": "^6.4|^7.0", - "symfony/expression-language": "^6.4|^7.0", - "symfony/http-foundation": "^6.4|^7.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", "symfony/service-contracts": "^2.5|^3", - "symfony/stopwatch": "^6.4|^7.0" + "symfony/stopwatch": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -1693,7 +1698,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.3" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.7" }, "funding": [ { @@ -1709,20 +1714,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "a76aed96a42d2b521153fb382d418e30d18b59df" + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df", - "reference": "a76aed96a42d2b521153fb382d418e30d18b59df", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50", + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50", "shasum": "" }, "require": { @@ -1732,7 +1737,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1769,7 +1774,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0" }, "funding": [ { @@ -1785,26 +1790,27 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/filesystem", - "version": "v7.0.3", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12" + "reference": "78dde75f8f6dbbca4ec436a4b0087f7af02076d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/2890e3a825bc0c0558526c04499c13f83e1b6b12", - "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/78dde75f8f6dbbca4ec436a4b0087f7af02076d4", + "reference": "78dde75f8f6dbbca4ec436a4b0087f7af02076d4", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8" + "symfony/polyfill-mbstring": "~1.8", + "symfony/process": "^5.4|^6.4" }, "type": "library", "autoload": { @@ -1832,7 +1838,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.0.3" + "source": "https://github.com/symfony/filesystem/tree/v6.4.7" }, "funding": [ { @@ -1848,27 +1854,27 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/finder", - "version": "v7.0.0", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56" + "reference": "511c48990be17358c23bf45c5d71ab85d40fb764" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/6e5688d69f7cfc4ed4a511e96007e06c2d34ce56", - "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56", + "url": "https://api.github.com/repos/symfony/finder/zipball/511c48990be17358c23bf45c5d71ab85d40fb764", + "reference": "511c48990be17358c23bf45c5d71ab85d40fb764", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.1" }, "require-dev": { - "symfony/filesystem": "^6.4|^7.0" + "symfony/filesystem": "^6.0|^7.0" }, "type": "library", "autoload": { @@ -1896,7 +1902,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.0.0" + "source": "https://github.com/symfony/finder/tree/v6.4.7" }, "funding": [ { @@ -1912,31 +1918,32 @@ "type": "tidelift" } ], - "time": "2023-10-31T17:59:56+00:00" + "time": "2024-04-23T10:36:43+00:00" }, { "name": "symfony/http-client", - "version": "v7.0.5", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "425f462a59d8030703ee04a9e1c666575ed5db3b" + "reference": "3683d8107cf1efdd24795cc5f7482be1eded34ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/425f462a59d8030703ee04a9e1c666575ed5db3b", - "reference": "425f462a59d8030703ee04a9e1c666575ed5db3b", + "url": "https://api.github.com/repos/symfony/http-client/zipball/3683d8107cf1efdd24795cc5f7482be1eded34ac", + "reference": "3683d8107cf1efdd24795cc5f7482be1eded34ac", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "psr/log": "^1|^2|^3", - "symfony/http-client-contracts": "^3", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/http-client-contracts": "^3.4.1", "symfony/service-contracts": "^2.5|^3" }, "conflict": { "php-http/discovery": "<1.15", - "symfony/http-foundation": "<6.4" + "symfony/http-foundation": "<6.3" }, "provide": { "php-http/async-client-implementation": "*", @@ -1949,15 +1956,15 @@ "amphp/http-client": "^4.2.1", "amphp/http-tunnel": "^1.0", "amphp/socket": "^1.1", - "guzzlehttp/promises": "^1.4", + "guzzlehttp/promises": "^1.4|^2.0", "nyholm/psr7": "^1.0", "php-http/httplug": "^1.0|^2.0", "psr/http-client": "^1.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/messenger": "^6.4|^7.0", - "symfony/process": "^6.4|^7.0", - "symfony/stopwatch": "^6.4|^7.0" + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -1988,7 +1995,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v7.0.5" + "source": "https://github.com/symfony/http-client/tree/v6.4.7" }, "funding": [ { @@ -2004,20 +2011,20 @@ "type": "tidelift" } ], - "time": "2024-03-02T12:46:12+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "1ee70e699b41909c209a0c930f11034b93578654" + "reference": "20414d96f391677bf80078aa55baece78b82647d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654", - "reference": "1ee70e699b41909c209a0c930f11034b93578654", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/20414d96f391677bf80078aa55baece78b82647d", + "reference": "20414d96f391677bf80078aa55baece78b82647d", "shasum": "" }, "require": { @@ -2026,7 +2033,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -2066,7 +2073,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.0" }, "funding": [ { @@ -2082,24 +2089,24 @@ "type": "tidelift" } ], - "time": "2023-07-30T20:28:31+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/options-resolver", - "version": "v7.0.0", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "700ff4096e346f54cb628ea650767c8130f1001f" + "reference": "9a3c92b490716ba6771f5beced13c6eda7183eed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/700ff4096e346f54cb628ea650767c8130f1001f", - "reference": "700ff4096e346f54cb628ea650767c8130f1001f", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/9a3c92b490716ba6771f5beced13c6eda7183eed", + "reference": "9a3c92b490716ba6771f5beced13c6eda7183eed", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "symfony/deprecation-contracts": "^2.5|^3" }, "type": "library", @@ -2133,7 +2140,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v7.0.0" + "source": "https://github.com/symfony/options-resolver/tree/v6.4.7" }, "funding": [ { @@ -2149,7 +2156,7 @@ "type": "tidelift" } ], - "time": "2023-08-08T10:20:21+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/polyfill-ctype", @@ -2627,16 +2634,16 @@ }, { "name": "symfony/process", - "version": "v6.4.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "710e27879e9be3395de2b98da3f52a946039f297" + "reference": "cdb1c81c145fd5aa9b0038bab694035020943381" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297", - "reference": "710e27879e9be3395de2b98da3f52a946039f297", + "url": "https://api.github.com/repos/symfony/process/zipball/cdb1c81c145fd5aa9b0038bab694035020943381", + "reference": "cdb1c81c145fd5aa9b0038bab694035020943381", "shasum": "" }, "require": { @@ -2668,7 +2675,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.4" + "source": "https://github.com/symfony/process/tree/v6.4.7" }, "funding": [ { @@ -2684,25 +2691,26 @@ "type": "tidelift" } ], - "time": "2024-02-20T12:31:00+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.4.1", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", "shasum": "" }, "require": { "php": ">=8.1", - "psr/container": "^1.1|^2.0" + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -2710,7 +2718,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -2750,7 +2758,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" }, "funding": [ { @@ -2766,24 +2774,24 @@ "type": "tidelift" } ], - "time": "2023-12-26T14:02:43+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/stopwatch", - "version": "v7.0.3", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "983900d6fddf2b0cbaacacbbad07610854bd8112" + "reference": "ffec95ba269e541eb2232126c0c20f83086b5c68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/983900d6fddf2b0cbaacacbbad07610854bd8112", - "reference": "983900d6fddf2b0cbaacacbbad07610854bd8112", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/ffec95ba269e541eb2232126c0c20f83086b5c68", + "reference": "ffec95ba269e541eb2232126c0c20f83086b5c68", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "symfony/service-contracts": "^2.5|^3" }, "type": "library", @@ -2812,7 +2820,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v7.0.3" + "source": "https://github.com/symfony/stopwatch/tree/v6.4.7" }, "funding": [ { @@ -2828,24 +2836,24 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/string", - "version": "v7.0.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b" + "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f5832521b998b0bec40bee688ad5de98d4cf111b", - "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b", + "url": "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69", + "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", @@ -2855,11 +2863,11 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^6.4|^7.0", - "symfony/http-client": "^6.4|^7.0", - "symfony/intl": "^6.4|^7.0", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^6.4|^7.0" + "symfony/var-exporter": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -2898,7 +2906,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.0.4" + "source": "https://github.com/symfony/string/tree/v6.4.7" }, "funding": [ { @@ -2914,27 +2922,30 @@ "type": "tidelift" } ], - "time": "2024-02-01T13:17:36+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/var-exporter", - "version": "v7.0.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41" + "reference": "825f9b00c37bbe1c1691cc1aff9b5451fc9b4405" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41", - "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/825f9b00c37bbe1c1691cc1aff9b5451fc9b4405", + "reference": "825f9b00c37bbe1c1691cc1aff9b5451fc9b4405", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" }, "require-dev": { - "symfony/var-dumper": "^6.4|^7.0" + "symfony/property-access": "^6.4|^7.0", + "symfony/serializer": "^6.4|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -2972,7 +2983,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v7.0.4" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.7" }, "funding": [ { @@ -2988,7 +2999,7 @@ "type": "tidelift" } ], - "time": "2024-02-26T10:35:24+00:00" + "time": "2024-04-18T09:22:46+00:00" } ], "packages-dev": [ @@ -3281,32 +3292,85 @@ "time": "2020-07-09T08:09:16+00:00" }, { - "name": "illuminate/collections", - "version": "v9.52.16", + "name": "illuminate/bus", + "version": "v10.48.10", "source": { "type": "git", - "url": "https://github.com/illuminate/collections.git", - "reference": "d3710b0b244bfc62c288c1a87eaa62dd28352d1f" + "url": "https://github.com/illuminate/bus.git", + "reference": "33993b8f54e91b03fb5000e55693e146e7370763" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/d3710b0b244bfc62c288c1a87eaa62dd28352d1f", - "reference": "d3710b0b244bfc62c288c1a87eaa62dd28352d1f", + "url": "https://api.github.com/repos/illuminate/bus/zipball/33993b8f54e91b03fb5000e55693e146e7370763", + "reference": "33993b8f54e91b03fb5000e55693e146e7370763", "shasum": "" }, "require": { - "illuminate/conditionable": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "php": "^8.0.2" + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/pipeline": "^10.0", + "illuminate/support": "^10.0", + "php": "^8.1" }, "suggest": { - "symfony/var-dumper": "Required to use the dump method (^6.0)." + "illuminate/queue": "Required to use closures when chaining jobs (^7.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Bus\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Bus package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2024-02-23T15:38:25+00:00" + }, + { + "name": "illuminate/collections", + "version": "v10.48.10", + "source": { + "type": "git", + "url": "https://github.com/illuminate/collections.git", + "reference": "f9589f1063a449111dcaa1d68285b507d9483a95" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/collections/zipball/f9589f1063a449111dcaa1d68285b507d9483a95", + "reference": "f9589f1063a449111dcaa1d68285b507d9483a95", + "shasum": "" + }, + "require": { + "illuminate/conditionable": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "php": "^8.1" + }, + "suggest": { + "symfony/var-dumper": "Required to use the dump method (^6.2)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" } }, "autoload": { @@ -3333,20 +3397,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-06-11T21:17:10+00:00" + "time": "2024-03-20T20:09:13+00:00" }, { "name": "illuminate/conditionable", - "version": "v9.52.16", + "version": "v10.48.10", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", - "reference": "bea24daa0fa84b7e7b0d5b84f62c71b7e2dc3364" + "reference": "d0958e4741fc9d6f516a552060fd1b829a85e009" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/conditionable/zipball/bea24daa0fa84b7e7b0d5b84f62c71b7e2dc3364", - "reference": "bea24daa0fa84b7e7b0d5b84f62c71b7e2dc3364", + "url": "https://api.github.com/repos/illuminate/conditionable/zipball/d0958e4741fc9d6f516a552060fd1b829a85e009", + "reference": "d0958e4741fc9d6f516a552060fd1b829a85e009", "shasum": "" }, "require": { @@ -3355,7 +3419,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "autoload": { @@ -3379,43 +3443,48 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-02-01T21:42:32+00:00" + "time": "2023-02-03T08:06:17+00:00" }, { "name": "illuminate/console", - "version": "v9.20.0", + "version": "v10.48.10", "source": { "type": "git", "url": "https://github.com/illuminate/console.git", - "reference": "5eeadc4fecb6a23c31b705eddf0e7d65d2a8fa38" + "reference": "d001036218ea5fbb382ee5c845292b067ea8b46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/console/zipball/5eeadc4fecb6a23c31b705eddf0e7d65d2a8fa38", - "reference": "5eeadc4fecb6a23c31b705eddf0e7d65d2a8fa38", + "url": "https://api.github.com/repos/illuminate/console/zipball/d001036218ea5fbb382ee5c845292b067ea8b46f", + "reference": "d001036218ea5fbb382ee5c845292b067ea8b46f", "shasum": "" }, "require": { - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/support": "^9.0", - "php": "^8.0.2", - "symfony/console": "^6.0", - "symfony/process": "^6.0" + "ext-mbstring": "*", + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", + "illuminate/view": "^10.0", + "laravel/prompts": "^0.1.9", + "nunomaduro/termwind": "^1.13", + "php": "^8.1", + "symfony/console": "^6.2", + "symfony/process": "^6.2" }, "suggest": { - "dragonmantank/cron-expression": "Required to use scheduler (^3.1).", - "guzzlehttp/guzzle": "Required to use the ping methods on schedules (^7.2).", - "illuminate/bus": "Required to use the scheduled job dispatcher (^9.0).", - "illuminate/container": "Required to use the scheduler (^9.0).", - "illuminate/filesystem": "Required to use the generator command (^9.0).", - "illuminate/queue": "Required to use closures for scheduled jobs (^9.0)." + "dragonmantank/cron-expression": "Required to use scheduler (^3.3.2).", + "ext-pcntl": "Required to use signal trapping.", + "guzzlehttp/guzzle": "Required to use the ping methods on schedules (^7.5).", + "illuminate/bus": "Required to use the scheduled job dispatcher (^10.0).", + "illuminate/container": "Required to use the scheduler (^10.0).", + "illuminate/filesystem": "Required to use the generator command (^10.0).", + "illuminate/queue": "Required to use closures for scheduled jobs (^10.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "autoload": { @@ -3439,31 +3508,82 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-07-12T13:39:25+00:00" + "time": "2024-03-21T13:10:17+00:00" }, { - "name": "illuminate/contracts", - "version": "v9.52.16", + "name": "illuminate/container", + "version": "v10.48.10", "source": { "type": "git", - "url": "https://github.com/illuminate/contracts.git", - "reference": "44f65d723b13823baa02ff69751a5948bde60c22" + "url": "https://github.com/illuminate/container.git", + "reference": "ddc26273085fad3c471b2602ad820e0097ff7939" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/44f65d723b13823baa02ff69751a5948bde60c22", - "reference": "44f65d723b13823baa02ff69751a5948bde60c22", + "url": "https://api.github.com/repos/illuminate/container/zipball/ddc26273085fad3c471b2602ad820e0097ff7939", + "reference": "ddc26273085fad3c471b2602ad820e0097ff7939", "shasum": "" }, "require": { - "php": "^8.0.2", + "illuminate/contracts": "^10.0", + "php": "^8.1", + "psr/container": "^1.1.1|^2.0.1" + }, + "provide": { + "psr/container-implementation": "1.1|2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Container\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Container package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2023-06-18T09:12:03+00:00" + }, + { + "name": "illuminate/contracts", + "version": "v10.48.10", + "source": { + "type": "git", + "url": "https://github.com/illuminate/contracts.git", + "reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac", + "reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac", + "shasum": "" + }, + "require": { + "php": "^8.1", "psr/container": "^1.1.1|^2.0.1", "psr/simple-cache": "^1.0|^2.0|^3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "autoload": { @@ -3487,29 +3607,151 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-02-08T14:36:30+00:00" + "time": "2024-01-15T18:52:32+00:00" }, { - "name": "illuminate/macroable", - "version": "v9.52.16", + "name": "illuminate/events", + "version": "v10.48.10", "source": { "type": "git", - "url": "https://github.com/illuminate/macroable.git", - "reference": "e3bfaf6401742a9c6abca61b9b10e998e5b6449a" + "url": "https://github.com/illuminate/events.git", + "reference": "a931bfa88edc6ac52c9abbfd7b769343d321d3eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/macroable/zipball/e3bfaf6401742a9c6abca61b9b10e998e5b6449a", - "reference": "e3bfaf6401742a9c6abca61b9b10e998e5b6449a", + "url": "https://api.github.com/repos/illuminate/events/zipball/a931bfa88edc6ac52c9abbfd7b769343d321d3eb", + "reference": "a931bfa88edc6ac52c9abbfd7b769343d321d3eb", "shasum": "" }, "require": { - "php": "^8.0.2" + "illuminate/bus": "^10.0", + "illuminate/collections": "^10.0", + "illuminate/container": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", + "php": "^8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" + } + }, + "autoload": { + "files": [ + "functions.php" + ], + "psr-4": { + "Illuminate\\Events\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Events package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2024-03-04T14:41:04+00:00" + }, + { + "name": "illuminate/filesystem", + "version": "v10.48.10", + "source": { + "type": "git", + "url": "https://github.com/illuminate/filesystem.git", + "reference": "592fb581a52fba43bf78c2e4b22db540c9f9f149" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/592fb581a52fba43bf78c2e4b22db540c9f9f149", + "reference": "592fb581a52fba43bf78c2e4b22db540c9f9f149", + "shasum": "" + }, + "require": { + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", + "php": "^8.1", + "symfony/finder": "^6.2" + }, + "suggest": { + "ext-fileinfo": "Required to use the Filesystem class.", + "ext-ftp": "Required to use the Flysystem FTP driver.", + "ext-hash": "Required to use the Filesystem class.", + "illuminate/http": "Required for handling uploaded files (^7.0).", + "league/flysystem": "Required to use the Flysystem local driver (^3.0.16).", + "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).", + "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).", + "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).", + "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", + "symfony/filesystem": "Required to enable support for relative symbolic links (^6.2).", + "symfony/mime": "Required to enable support for guessing extensions (^6.2)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "files": [ + "functions.php" + ], + "psr-4": { + "Illuminate\\Filesystem\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Filesystem package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2024-03-11T21:45:53+00:00" + }, + { + "name": "illuminate/macroable", + "version": "v10.48.10", + "source": { + "type": "git", + "url": "https://github.com/illuminate/macroable.git", + "reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/macroable/zipball/dff667a46ac37b634dcf68909d9d41e94dc97c27", + "reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" } }, "autoload": { @@ -3533,20 +3775,68 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-08-09T13:29:29+00:00" + "time": "2023-06-05T12:46:42+00:00" }, { - "name": "illuminate/support", - "version": "v9.52.16", + "name": "illuminate/pipeline", + "version": "v10.48.10", "source": { "type": "git", - "url": "https://github.com/illuminate/support.git", - "reference": "223c608dbca27232df6213f776bfe7bdeec24874" + "url": "https://github.com/illuminate/pipeline.git", + "reference": "f802187e917a171332cc90f8c1a102939c57405d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/223c608dbca27232df6213f776bfe7bdeec24874", - "reference": "223c608dbca27232df6213f776bfe7bdeec24874", + "url": "https://api.github.com/repos/illuminate/pipeline/zipball/f802187e917a171332cc90f8c1a102939c57405d", + "reference": "f802187e917a171332cc90f8c1a102939c57405d", + "shasum": "" + }, + "require": { + "illuminate/contracts": "^10.0", + "illuminate/support": "^10.0", + "php": "^8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Pipeline\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Pipeline package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2023-12-19T14:47:26+00:00" + }, + { + "name": "illuminate/support", + "version": "v10.48.10", + "source": { + "type": "git", + "url": "https://github.com/illuminate/support.git", + "reference": "ee3a1aaed36d916654ce0ae09dfbd38644a4f582" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/support/zipball/ee3a1aaed36d916654ce0ae09dfbd38644a4f582", + "reference": "ee3a1aaed36d916654ce0ae09dfbd38644a4f582", "shasum": "" }, "require": { @@ -3554,30 +3844,30 @@ "ext-ctype": "*", "ext-filter": "*", "ext-mbstring": "*", - "illuminate/collections": "^9.0", - "illuminate/conditionable": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "nesbot/carbon": "^2.62.1", - "php": "^8.0.2", + "illuminate/collections": "^10.0", + "illuminate/conditionable": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "nesbot/carbon": "^2.67", + "php": "^8.1", "voku/portable-ascii": "^2.0" }, "conflict": { "tightenco/collect": "<5.5.33" }, "suggest": { - "illuminate/filesystem": "Required to use the composer class (^9.0).", + "illuminate/filesystem": "Required to use the composer class (^10.0).", "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).", "ramsey/uuid": "Required to use Str::uuid() (^4.7).", - "symfony/process": "Required to use the composer class (^6.0).", - "symfony/uid": "Required to use Str::ulid() (^6.0).", - "symfony/var-dumper": "Required to use the dd function (^6.0).", + "symfony/process": "Required to use the composer class (^6.2).", + "symfony/uid": "Required to use Str::ulid() (^6.2).", + "symfony/var-dumper": "Required to use the dd function (^6.2).", "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.4.1)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "autoload": { @@ -3604,20 +3894,132 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-06-11T21:11:53+00:00" + "time": "2024-04-07T17:47:33+00:00" }, { - "name": "mockery/mockery", - "version": "1.6.9", + "name": "illuminate/view", + "version": "v10.48.10", "source": { "type": "git", - "url": "https://github.com/mockery/mockery.git", - "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06" + "url": "https://github.com/illuminate/view.git", + "reference": "504d55e0f2d90c75588627e6a77a4d1228cf1a02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", - "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", + "url": "https://api.github.com/repos/illuminate/view/zipball/504d55e0f2d90c75588627e6a77a4d1228cf1a02", + "reference": "504d55e0f2d90c75588627e6a77a4d1228cf1a02", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "illuminate/collections": "^10.0", + "illuminate/container": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/events": "^10.0", + "illuminate/filesystem": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", + "php": "^8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\View\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate View package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2024-03-12T16:33:42+00:00" + }, + { + "name": "laravel/prompts", + "version": "v0.1.21", + "source": { + "type": "git", + "url": "https://github.com/laravel/prompts.git", + "reference": "23ea808e8a145653e0ab29e30d4385e49f40a920" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/prompts/zipball/23ea808e8a145653e0ab29e30d4385e49f40a920", + "reference": "23ea808e8a145653e0ab29e30d4385e49f40a920", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "illuminate/collections": "^10.0|^11.0", + "php": "^8.1", + "symfony/console": "^6.2|^7.0" + }, + "conflict": { + "illuminate/console": ">=10.17.0 <10.25.0", + "laravel/framework": ">=10.17.0 <10.25.0" + }, + "require-dev": { + "mockery/mockery": "^1.5", + "pestphp/pest": "^2.3", + "phpstan/phpstan": "^1.11", + "phpstan/phpstan-mockery": "^1.1" + }, + "suggest": { + "ext-pcntl": "Required for the spinner to be animated." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "0.1.x-dev" + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Laravel\\Prompts\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Add beautiful and user-friendly forms to your command-line applications.", + "support": { + "issues": "https://github.com/laravel/prompts/issues", + "source": "https://github.com/laravel/prompts/tree/v0.1.21" + }, + "time": "2024-04-30T12:46:16+00:00" + }, + { + "name": "mockery/mockery", + "version": "1.6.11", + "source": { + "type": "git", + "url": "https://github.com/mockery/mockery.git", + "reference": "81a161d0b135df89951abd52296adf97deb0723d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d", + "reference": "81a161d0b135df89951abd52296adf97deb0723d", "shasum": "" }, "require": { @@ -3629,8 +4031,8 @@ "phpunit/phpunit": "<8.0" }, "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.6.10", - "symplify/easy-coding-standard": "^12.0.8" + "phpunit/phpunit": "^8.5 || ^9.6.17", + "symplify/easy-coding-standard": "^12.1.14" }, "type": "library", "autoload": { @@ -3687,7 +4089,7 @@ "security": "https://github.com/mockery/mockery/security/advisories", "source": "https://github.com/mockery/mockery" }, - "time": "2023-12-10T02:24:34+00:00" + "time": "2024-03-21T18:34:15+00:00" }, { "name": "myclabs/deep-copy", @@ -3911,6 +4313,92 @@ }, "time": "2024-03-17T08:10:35+00:00" }, + { + "name": "nunomaduro/termwind", + "version": "v1.15.1", + "source": { + "type": "git", + "url": "https://github.com/nunomaduro/termwind.git", + "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/8ab0b32c8caa4a2e09700ea32925441385e4a5dc", + "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": "^8.0", + "symfony/console": "^5.3.0|^6.0.0" + }, + "require-dev": { + "ergebnis/phpstan-rules": "^1.0.", + "illuminate/console": "^8.0|^9.0", + "illuminate/support": "^8.0|^9.0", + "laravel/pint": "^1.0.0", + "pestphp/pest": "^1.21.0", + "pestphp/pest-plugin-mock": "^1.0", + "phpstan/phpstan": "^1.4.6", + "phpstan/phpstan-strict-rules": "^1.1.0", + "symfony/var-dumper": "^5.2.7|^6.0.0", + "thecodingmachine/phpstan-strict-rules": "^1.0.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Termwind\\Laravel\\TermwindServiceProvider" + ] + } + }, + "autoload": { + "files": [ + "src/Functions.php" + ], + "psr-4": { + "Termwind\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nuno Maduro", + "email": "enunomaduro@gmail.com" + } + ], + "description": "Its like Tailwind CSS, but for the console.", + "keywords": [ + "cli", + "console", + "css", + "package", + "php", + "style" + ], + "support": { + "issues": "https://github.com/nunomaduro/termwind/issues", + "source": "https://github.com/nunomaduro/termwind/tree/v1.15.1" + }, + "funding": [ + { + "url": "https://www.paypal.com/paypalme/enunomaduro", + "type": "custom" + }, + { + "url": "https://github.com/nunomaduro", + "type": "github" + }, + { + "url": "https://github.com/xiCO2k", + "type": "github" + } + ], + "time": "2023-02-08T01:06:31+00:00" + }, { "name": "phar-io/manifest", "version": "2.0.4", @@ -4405,16 +4893,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.13", + "version": "10.5.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7" + "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20a63fc1c6db29b15da3bd02d4b6cf59900088a7", - "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3", + "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3", "shasum": "" }, "require": { @@ -4486,7 +4974,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.13" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20" }, "funding": [ { @@ -4502,7 +4990,7 @@ "type": "tidelift" } ], - "time": "2024-03-12T15:37:41+00:00" + "time": "2024-04-24T06:32:35+00:00" }, { "name": "psr/clock", @@ -4859,16 +5347,16 @@ }, { "name": "sebastian/environment", - "version": "6.0.1", + "version": "6.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951" + "reference": "8074dbcd93529b357029f5cc5058fd3e43666984" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951", - "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984", + "reference": "8074dbcd93529b357029f5cc5058fd3e43666984", "shasum": "" }, "require": { @@ -4883,7 +5371,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "6.0-dev" + "dev-main": "6.1-dev" } }, "autoload": { @@ -4911,7 +5399,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", "security": "https://github.com/sebastianbergmann/environment/security/policy", - "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1" + "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0" }, "funding": [ { @@ -4919,7 +5407,7 @@ "type": "github" } ], - "time": "2023-04-11T05:39:26+00:00" + "time": "2024-03-23T08:47:14+00:00" }, { "name": "sebastian/exporter", @@ -5405,16 +5893,16 @@ }, { "name": "symfony/translation", - "version": "v6.4.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e" + "reference": "7495687c58bfd88b7883823747b0656d90679123" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/bce6a5a78e94566641b2594d17e48b0da3184a8e", - "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e", + "url": "https://api.github.com/repos/symfony/translation/zipball/7495687c58bfd88b7883823747b0656d90679123", + "reference": "7495687c58bfd88b7883823747b0656d90679123", "shasum": "" }, "require": { @@ -5480,7 +5968,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.4.4" + "source": "https://github.com/symfony/translation/tree/v6.4.7" }, "funding": [ { @@ -5496,20 +5984,20 @@ "type": "tidelift" } ], - "time": "2024-02-20T13:16:58+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.4.1", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "06450585bf65e978026bda220cdebca3f867fde7" + "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7", - "reference": "06450585bf65e978026bda220cdebca3f867fde7", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", "shasum": "" }, "require": { @@ -5518,7 +6006,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -5558,7 +6046,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1" + "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0" }, "funding": [ { @@ -5574,36 +6062,38 @@ "type": "tidelift" } ], - "time": "2023-12-26T14:02:43+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/var-dumper", - "version": "v7.0.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e03ad7c1535e623edbb94c22cc42353e488c6670" + "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e03ad7c1535e623edbb94c22cc42353e488c6670", - "reference": "e03ad7c1535e623edbb94c22cc42353e488c6670", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7a9cd977cd1c5fed3694bee52990866432af07d7", + "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/console": "<6.4" + "symfony/console": "<5.4" }, "require-dev": { "ext-iconv": "*", - "symfony/console": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/process": "^6.4|^7.0", - "symfony/uid": "^6.4|^7.0", - "twig/twig": "^3.0.4" + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^6.3|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", + "twig/twig": "^2.13|^3.0.4" }, "bin": [ "Resources/bin/var-dump-server" @@ -5641,7 +6131,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.0.4" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.7" }, "funding": [ { @@ -5657,7 +6147,7 @@ "type": "tidelift" } ], - "time": "2024-02-15T11:33:06+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "thecodingmachine/phpstan-strict-rules", diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpinsights/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpinsights/default.nix index 64e3fc59b5..621ac9de0b 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpinsights/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpinsights/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: php.buildComposerProject (finalAttrs: { @@ -14,7 +15,7 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-7ATlfAlCFv78JSKg5cD/VcYoq/EAM/6/GjH3lkfVCJ8="; }; - vendorHash = "sha256-ykAv7laYMvzd+uD6raMRQiZmCEa0ELQj1hJPb8UvjCk="; + vendorHash = "sha256-MOq7xmX8wqDk9W3M2gkejyXXPTcVFFgU0ohmDpL0Tvg="; composerLock = ./composer.lock; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpmd/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpmd/default.nix index 4c08728ae7..ae190e9102 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpmd/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpspy/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpspy/default.nix index 4ae9f22c1a..5cc936a63d 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpspy/default.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, php -, testers -, phpPackages +{ + lib, + stdenv, + fetchFromGitHub, + php, + testers, + phpPackages, }: stdenv.mkDerivation (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index c206a881eb..da7d11a870 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -1,17 +1,21 @@ -{ fetchFromGitHub, lib, php }: +{ + fetchFromGitHub, + lib, + php, +}: php.buildComposerProject (finalAttrs: { pname = "phpstan"; - version = "1.10.66"; + version = "1.11.0"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; rev = finalAttrs.version; - hash = "sha256-ZEQ6oP6zyi0cL69J9ck8gAht5taPkzH+iW5ALC4saAQ="; + hash = "sha256-zf6u7fGMMx+DeXcS4SxyK3aQ53jnXzQ8YPrJ89vG65Y="; }; - vendorHash = "sha256-Qp/eMhcKK32N1EMgeIspBDs28Oofwn6n2bEFKqvSx9E="; + vendorHash = "sha256-Uv2BoE/hTK59uxHsdm4M5hfozDw4LwwZH4MHd+vN60Y="; composerStrictValidation = false; meta = { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/pinba/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/pinba/default.nix index 7d4e020f40..759d02b9c3 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/pinba/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/pinba/default.nix @@ -1,4 +1,8 @@ -{ buildPecl, lib, fetchFromGitHub }: +{ + buildPecl, + lib, + fetchFromGitHub, +}: buildPecl rec { pname = "pinba"; @@ -7,7 +11,7 @@ buildPecl rec { src = fetchFromGitHub { owner = "tony2001"; repo = "pinba_extension"; - rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}"; + rev = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "0wqcqq6sb51wiawa37hbd1h9dbvmyyndzdvz87xqji7lpr9vn8jy"; }; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/protobuf/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/protobuf/default.nix index 94c15c9594..4d84d91832 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/protobuf/default.nix @@ -1,4 +1,8 @@ -{ buildPecl, lib, pcre2 }: +{ + buildPecl, + lib, + pcre2, +}: buildPecl { pname = "protobuf"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix index b20bbbf301..842b96a828 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, php +{ + lib, + fetchFromGitHub, + php, }: php.buildComposerProject (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix index 1f443f1365..1e75910a49 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix @@ -1,4 +1,8 @@ -{ fetchFromGitHub, lib, php }: +{ + fetchFromGitHub, + lib, + php, +}: php.buildComposerProject (finalAttrs: { pname = "psysh"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix index f07bc87dd3..71d411b594 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix @@ -1,4 +1,9 @@ -{ buildPecl, lib, rdkafka, pcre2 }: +{ + buildPecl, + lib, + rdkafka, + pcre2, +}: buildPecl { pname = "rdkafka"; @@ -6,7 +11,10 @@ buildPecl { version = "6.0.3"; sha256 = "sha256-Euqrl21JaX4x8WOLR4ietexhrbdYcIlBESsVf47H3Ug="; - buildInputs = [ rdkafka pcre2 ]; + buildInputs = [ + rdkafka + pcre2 + ]; postPhpize = '' substituteInPlace configure \ diff --git a/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix index 4fc9d94647..b5219da07d 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix @@ -1,8 +1,14 @@ -{ buildPecl, lib, php, fetchFromGitHub }: +{ + buildPecl, + lib, + php, + fetchFromGitHub, +}: let version = "6.0.2"; -in buildPecl { +in +buildPecl { inherit version; pname = "redis"; @@ -13,9 +19,7 @@ in buildPecl { hash = "sha256-Ie31zak6Rqxm2+jGXWg6KN4czHe9e+190jZRQ5VoB+M="; }; - internalDeps = with php.extensions; [ - session - ]; + internalDeps = with php.extensions; [ session ]; meta = with lib; { changelog = "https://github.com/phpredis/phpredis/releases/tag/${version}"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/relay/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/relay/default.nix index ee393c91d5..3120607482 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/relay/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/relay/default.nix @@ -1,15 +1,16 @@ -{ stdenv -, lib -, fetchurl -, php -, openssl -, hiredis -, zstd -, lz4 -, autoPatchelfHook -, writeShellScript -, curl -, common-updater-scripts +{ + stdenv, + lib, + fetchurl, + php, + openssl, + hiredis, + zstd, + lz4, + autoPatchelfHook, + writeShellScript, + curl, + common-updater-scripts, }: let @@ -53,11 +54,19 @@ let }; }; - makeSource = { system, phpMajor }: fetchurl { - url = "https://builds.r2.relay.so/v${version}/relay-v${version}-php" - + phpMajor + "-" + hashes.${system}.platform + ".tar.gz"; - sha256 = hashes.${system}.hash.${phpMajor} or (throw "Unsupported PHP version for relay ${phpMajor} on ${system}"); - }; + makeSource = + { system, phpMajor }: + fetchurl { + url = + "https://builds.r2.relay.so/v${version}/relay-v${version}-php" + + phpMajor + + "-" + + hashes.${system}.platform + + ".tar.gz"; + sha256 = + hashes.${system}.hash.${phpMajor} + or (throw "Unsupported PHP version for relay ${phpMajor} on ${system}"); + }; in stdenv.mkDerivation (finalAttrs: { inherit version; @@ -68,50 +77,65 @@ stdenv.mkDerivation (finalAttrs: { system = stdenv.hostPlatform.system; phpMajor = lib.versions.majorMinor php.version; }; - nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [ - autoPatchelfHook - ]; + nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ openssl zstd lz4 ]; - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/php/extensions - cp relay-pkg.so $out/lib/php/extensions/relay.so - chmod +w $out/lib/php/extensions/relay.so - '' + (if stdenv.isDarwin then - let - args = lib.strings.concatMapStrings - (v: " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${builtins.baseNameOf v.name}") - (with lib.attrsets; [ - (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis.1.1.0.dylib" hiredis) - (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" hiredis) - (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib" openssl) - (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib" openssl) - (nameValuePair "/opt/homebrew/opt/zstd/lib/libzstd.1.dylib" zstd) - (nameValuePair "/opt/homebrew/opt/lz4/lib/liblz4.1.dylib" lz4) - ]); - in - # fixDarwinDylibNames can't be used here because we need to completely remap .dylibs, not just add absolute paths + installPhase = '' - install_name_tool${args} $out/lib/php/extensions/relay.so - '' - else - "") + '' - # Random UUID that's required by the extension. Can be anything, but must be different from default. - sed -i "s/00000000-0000-0000-0000-000000000000/aced680f-30e9-40cc-a868-390ead14ba0c/" $out/lib/php/extensions/relay.so - chmod -w $out/lib/php/extensions/relay.so + runHook preInstall - runHook postInstall - ''; + mkdir -p $out/lib/php/extensions + cp relay-pkg.so $out/lib/php/extensions/relay.so + chmod +w $out/lib/php/extensions/relay.so + '' + + ( + if stdenv.isDarwin then + let + args = + lib.strings.concatMapStrings + ( + v: + " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${builtins.baseNameOf v.name}" + ) + ( + with lib.attrsets; + [ + (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis.1.1.0.dylib" hiredis) + (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" hiredis) + (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib" openssl) + (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib" openssl) + (nameValuePair "/opt/homebrew/opt/zstd/lib/libzstd.1.dylib" zstd) + (nameValuePair "/opt/homebrew/opt/lz4/lib/liblz4.1.dylib" lz4) + ] + ); + in + # fixDarwinDylibNames can't be used here because we need to completely remap .dylibs, not just add absolute paths + '' + install_name_tool${args} $out/lib/php/extensions/relay.so + '' + else + "" + ) + + '' + # Random UUID that's required by the extension. Can be anything, but must be different from default. + sed -i "s/00000000-0000-0000-0000-000000000000/aced680f-30e9-40cc-a868-390ead14ba0c/" $out/lib/php/extensions/relay.so + chmod -w $out/lib/php/extensions/relay.so + + runHook postInstall + ''; passthru = { updateScript = writeShellScript "update-${finalAttrs.pname}" '' set -o errexit - export PATH="$PATH:${lib.makeBinPath [ curl common-updater-scripts ]}" + export PATH="$PATH:${ + lib.makeBinPath [ + curl + common-updater-scripts + ] + }" NEW_VERSION=$(curl --silent https://builds.r2.relay.so/meta/builds | tail -n1 | cut -c2-) if [[ "${version}" = "$NEW_VERSION" ]]; then @@ -129,23 +153,22 @@ stdenv.mkDerivation (finalAttrs: { updateables = builtins.listToAttrs # Collect all leaf attributes (containing hashes). - (lib.collect - (attrs: attrs ? name) - # create an attr containing - (lib.mapAttrsRecursive + ( + lib.collect (attrs: attrs ? name) + # create an attr containing ( - path: _value: - lib.nameValuePair - (builtins.replaceStrings [ "." ] [ "_" ] (lib.concatStringsSep "_" path)) - (finalAttrs.finalPackage.overrideAttrs (attrs: { + lib.mapAttrsRecursive ( + path: _value: + lib.nameValuePair (builtins.replaceStrings [ "." ] [ "_" ] (lib.concatStringsSep "_" path)) ( + finalAttrs.finalPackage.overrideAttrs (attrs: { src = makeSource { system = builtins.head path; phpMajor = builtins.head (builtins.tail (builtins.tail path)); }; - })) + }) + ) + ) (lib.filterAttrsRecursive (name: _value: name != "platform") hashes) ) - (lib.filterAttrsRecursive (name: _value: name != "platform") hashes) - ) ); }; @@ -155,7 +178,15 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://relay.so/"; sourceProvenance = [ sourceTypes.binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ tillkruss ostrolucky ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + maintainers = with maintainers; [ + tillkruss + ostrolucky + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; }) diff --git a/third_party/nixpkgs/pkgs/development/php-packages/rrd/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/rrd/default.nix index a89f9a3b71..6df71d4be5 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/rrd/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/rrd/default.nix @@ -1,4 +1,9 @@ -{ buildPecl, lib, pkg-config, rrdtool }: +{ + buildPecl, + lib, + pkg-config, + rrdtool, +}: buildPecl { pname = "rrd"; @@ -6,7 +11,10 @@ buildPecl { version = "2.0.3"; hash = "sha256-pCFh5YzcioU7cs/ymJidy96CsPdkVt1ZzgKFTJK3MPc="; - nativeBuildInputs = [ pkg-config rrdtool ]; + nativeBuildInputs = [ + pkg-config + rrdtool + ]; meta = { description = "PHP bindings to RRD tool system"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix index 65cfad9ea3..0265406866 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix @@ -1,4 +1,9 @@ -{ buildPecl, lib, samba, pkg-config }: +{ + buildPecl, + lib, + samba, + pkg-config, +}: buildPecl { pname = "smbclient"; version = "1.0.6"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix index c3b5d84ff1..aa5faa665a 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, buildPecl -, lib -, libiconv -, php -, fetchFromGitHub -, pcre2 -, darwin +{ + stdenv, + buildPecl, + lib, + libiconv, + php, + fetchFromGitHub, + pcre2, + darwin, }: buildPecl rec { @@ -19,23 +20,19 @@ buildPecl rec { hash = "sha256-NwG8gBaToBaJGrZoCD7bDym7hQidWU0ArckoQCHN81o="; }; - buildInputs = [ - pcre2 - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.Libsystem - libiconv - ]; + buildInputs = + [ pcre2 ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.CoreFoundation + darwin.apple_sdk_11_0.Libsystem + libiconv + ]; - internalDeps = with php.extensions; [ - session - ]; + internalDeps = with php.extensions; [ session ]; sourceRoot = "${src.name}/src"; - configureFlags = [ - "--enable-snuffleupagus" - ]; + configureFlags = [ "--enable-snuffleupagus" ]; postPhpize = '' ./configure --enable-snuffleupagus diff --git a/third_party/nixpkgs/pkgs/development/php-packages/spx/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/spx/default.nix index b6f7598ffe..10bf662726 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/spx/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/spx/default.nix @@ -1,8 +1,14 @@ -{ buildPecl, lib, fetchFromGitHub, zlib }: +{ + buildPecl, + lib, + fetchFromGitHub, + zlib, +}: let version = "0.4.15"; -in buildPecl { +in +buildPecl { inherit version; pname = "spx"; @@ -13,9 +19,7 @@ in buildPecl { hash = "sha256-gw6wbPt1Qy0vNfT0flq7bxpnGU3SgJvPVhk8H0Imvx4="; }; - configureFlags = [ - "--with-zlib-dir=${zlib.dev}" - ]; + configureFlags = [ "--with-zlib-dir=${zlib.dev}" ]; preConfigure = '' substituteInPlace Makefile.frag \ diff --git a/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix index 6bbf7cc4f6..303f2327d1 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix @@ -1,4 +1,10 @@ -{ stdenv, buildPecl, lib, unixODBC, libiconv }: +{ + stdenv, + buildPecl, + lib, + unixODBC, + libiconv, +}: buildPecl { pname = "sqlsrv"; @@ -6,9 +12,7 @@ buildPecl { version = "5.10.1"; sha256 = "sha256-XNrttNiihjQ+azuZmS2fy0So+2ndAqpde8IOsupeWdI="; - buildInputs = [ - unixODBC - ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { description = "Microsoft Drivers for PHP for SQL Server"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/ssh2/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/ssh2/default.nix index 058702d65c..d3ff860de3 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/ssh2/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/ssh2/default.nix @@ -1,4 +1,8 @@ -{ buildPecl, lib, libssh2 }: +{ + buildPecl, + lib, + libssh2, +}: buildPecl rec { version = "1.3.1"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix index f9dcb781c0..f519522a83 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix @@ -1,15 +1,17 @@ -{ lib -, stdenv -, buildPecl -, php -, valgrind -, pcre2 -, fetchFromGitHub - }: +{ + lib, + stdenv, + buildPecl, + php, + valgrind, + pcre2, + fetchFromGitHub, +}: let version = "5.1.2"; -in buildPecl { +in +buildPecl { inherit version; pname = "swoole"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/uv/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/uv/default.nix index d681113ec6..1bbc6450d0 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/uv/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/uv/default.nix @@ -1,4 +1,9 @@ -{ buildPecl, lib, fetchFromGitHub, libuv }: +{ + buildPecl, + lib, + fetchFromGitHub, + libuv, +}: buildPecl rec { pname = "uv"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/vld/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/vld/default.nix index 8e5f7dec40..6ae6a60005 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/vld/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/vld/default.nix @@ -1,11 +1,13 @@ -{ lib -, buildPecl -, fetchFromGitHub +{ + lib, + buildPecl, + fetchFromGitHub, }: let version = "0.18.0"; -in buildPecl { +in +buildPecl { inherit version; pname = "vld"; @@ -20,7 +22,7 @@ in buildPecl { # Tests relies on PHP 7.0 doCheck = false; - meta = { + meta = { changelog = "https://github.com/derickr/vld/releases/tag/${version}"; description = "The Vulcan Logic Dumper hooks into the Zend Engine and dumps all the opcodes (execution units) of a script."; homepage = "https://github.com/derickr/vld"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix index 3b5caffb96..83e6950b0f 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix @@ -1,8 +1,13 @@ -{ buildPecl, lib, fetchFromGitHub }: +{ + buildPecl, + lib, + fetchFromGitHub, +}: let version = "3.3.2"; -in buildPecl { +in +buildPecl { inherit version; pname = "xdebug"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/yaml/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/yaml/default.nix index aa82510771..e3fec9a5d8 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/yaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/yaml/default.nix @@ -1,4 +1,9 @@ -{ buildPecl, lib, pkg-config, libyaml }: +{ + buildPecl, + lib, + pkg-config, + libyaml, +}: buildPecl { pname = "yaml"; @@ -8,7 +13,10 @@ buildPecl { configureFlags = [ "--with-yaml=${libyaml.dev}" ]; - nativeBuildInputs = [ pkg-config libyaml ]; + nativeBuildInputs = [ + pkg-config + libyaml + ]; meta = { description = "YAML-1.1 parser and emitter"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/zstd/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/zstd/default.nix index a9428ca477..73334f675c 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/zstd/default.nix @@ -1,8 +1,15 @@ -{ buildPecl, lib, zstd, pkg-config, fetchFromGitHub }: +{ + buildPecl, + lib, + zstd, + pkg-config, + fetchFromGitHub, +}: let version = "0.13.3"; -in buildPecl { +in +buildPecl { inherit version; pname = "zstd"; @@ -13,15 +20,11 @@ in buildPecl { hash = "sha256-jEuL93ScF0/FlfUvib6uZafOkIe0+VkWV/frpSjTkvY="; }; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zstd ]; - configureFlags = [ - "--with-libzstd" - ]; + configureFlags = [ "--with-libzstd" ]; meta = with lib; { description = "Zstd Extension for PHP"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix index eecbd37a90..b32cadab4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix @@ -2,7 +2,9 @@ , lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder +, llvmPackages , pytest7CheckHook , setuptools , numpy @@ -20,21 +22,25 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.27.0"; + version = "0.30.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "huggingface"; - repo = pname; + repo = "accelerate"; rev = "refs/tags/v${version}"; - hash = "sha256-7rnI8UXyAql8fLMKoSRrWzVw5CnyYVE2o6dJOzSgWxw="; + hash = "sha256-E20pI5BrcTrMYrhriuOUl5/liSaQQy6eqRyCoauwb9Q="; }; - nativeBuildInputs = [ setuptools ]; + buildInputs = [ + llvmPackages.openmp + ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy packaging psutil @@ -71,11 +77,20 @@ buildPythonPackage rec { "test_remote_code" "test_transformers_model" + # nondeterministic, tests GC behaviour by thresholding global ram usage + "test_free_memory_dereferences_prepared_components" + # set the environment variable, CC, which conflicts with standard environment "test_patch_environment_key_exists" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # RuntimeError: Dynamo is not supported on Python 3.12+ + "test_convert_to_fp32" + "test_send_to_device_compiles" ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "CheckpointTest" + # TypeError: unsupported operand type(s) for /: 'NoneType' and 'int' (it seems cpuinfo doesn't work here) + "test_mpi_multicpu_config_cmd" ] ++ lib.optionals (!config.cudaSupport) [ # requires ptxas from cudatoolkit, which is unfree "test_dynamo_extract_model" @@ -96,6 +111,8 @@ buildPythonPackage rec { "accelerate" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { homepage = "https://huggingface.co/docs/accelerate"; description = "A simple way to train and use PyTorch models with multi-GPU, TPU, mixed-precision"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accessible-pygments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accessible-pygments/default.nix index 334a4c5f2e..2686ff12ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accessible-pygments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accessible-pygments/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools , pygments }: buildPythonPackage rec { pname = "accessible-pygments"; version = "0.0.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +18,11 @@ buildPythonPackage rec { hash = "sha256-57V6mxWVjpYBx+nrB6RAyBMoNUWiCXPyV0pfRT0OlT4="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ pygments ]; @@ -34,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Quansight-Labs/accessible-pygments"; changelog = "https://github.com/Quansight-Labs/accessible-pygments/raw/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix index 6c2906fcb7..ee8e3c80a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , mpmath , numpy , pybind11 @@ -18,17 +19,19 @@ buildPythonPackage rec { pname = "accupy"; version = "0.3.6"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nschloe"; - repo = pname; + repo = "accupy"; rev = version; - sha256 = "0sxkwpp2xy2jgakhdxr4nh1cspqv8l89kz6s832h05pbpyc0n767"; + hash = "sha256-xxwLmL/rFgDFQNr8mRBFG1/NArQk9wanelL4Lu7ls2s="; }; - nativeBuildInputs = [ + build-system = [ + setuptools pybind11 ]; @@ -36,7 +39,7 @@ buildPythonPackage rec { eigen ]; - propagatedBuildInputs = [ + dependencies = [ mpmath numpy pyfma @@ -51,7 +54,7 @@ buildPythonPackage rec { postConfigure = '' substituteInPlace setup.py \ - --replace "/usr/include/eigen3/" "${eigen}/include/eigen3/" + --replace-fail "/usr/include/eigen3/" "${eigen}/include/eigen3/" ''; preBuild = '' @@ -66,10 +69,12 @@ buildPythonPackage rec { # decouple ourselves from an unnecessary build dep preCheck = '' for f in test/test*.py ; do - substituteInPlace $f --replace 'import perfplot' "" + substituteInPlace $f --replace-quiet 'import perfplot' "" done ''; + disabledTests = [ "test_speed_comparison1" "test_speed_comparison2" ]; + pythonImportsCheck = [ "accupy" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix index 174fd9c223..3f51f03e5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix @@ -53,7 +53,6 @@ buildPythonPackage rec { meta = with lib; { description = "Python package for acousticians"; - maintainers = with maintainers; [ fridh ]; license = with licenses; [ bsd3 ]; homepage = "https://github.com/python-acoustics/python-acoustics"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix index 555a60412b..d03aa8456b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.13"; + version = "3.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,15 +26,15 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-Z85bHM3MtS2MLX9BaKi8VqA13QjO9KdrgqhuyBzjILQ="; + hash = "sha256-QW5+npgjrIzyI2hztFovA5s6TMzgCCEiZx9aZREmYII="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml dissect-cstruct dissect-target diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index bee4d68d5d..3e220a2309 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -1,33 +1,30 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools-scm -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools-scm, + pythonOlder, }: buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.62.0"; + version = "3.63.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "Adafruit-PlatformDetect"; + pname = "adafruit_platformdetect"; inherit version; - hash = "sha256-L2CbqWqyOo4mq+KsO8FYAyHClRKFXMLWWtfYEg0SD34="; + hash = "sha256-bntcP/P0eoQsjIQQcJLtsXsPcSylKVNUp+f/RC/U5m4="; }; - nativeBuildInputs = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; # Project has not published tests yet doCheck = false; - pythonImportsCheck = [ - "adafruit_platformdetect" - ]; + pythonImportsCheck = [ "adafruit_platformdetect" ]; meta = with lib; { description = "Platform detection for use by Adafruit libraries"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix index cbce5d2af1..926f1696df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix @@ -6,12 +6,13 @@ , pytestCheckHook , python-dateutil , requests +, setuptools }: buildPythonPackage rec { pname = "adal"; version = "1.2.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "AzureAD"; @@ -24,7 +25,11 @@ buildPythonPackage rec { sed -i '/cryptography/d' setup.py ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ pyjwt python-dateutil requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adext/default.nix index c5a05d19be..8a7345613d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adext/default.nix @@ -1,40 +1,39 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools-scm -, alarmdecoder -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools-scm, + alarmdecoder, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "adext"; - version = "0.4.2"; - format = "setuptools"; + version = "0.4.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ajschmidt8"; - repo = pname; - rev = "v${version}"; - sha256 = "0h5k9kzms2f0r48pdhsgv8pimk0vsxw8vs0k6880mank8ij914wr"; + repo = "adext"; + rev = "refs/tags/v${version}"; + hash = "sha256-y8BvcSc3vD0FEWiyzW2Oh6PBS2Itjs2sz+9Dzh5yqSg="; }; - nativeBuildInputs = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ - alarmdecoder - ]; + dependencies = [ alarmdecoder ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "adext" ]; meta = with lib; { description = "Python extension for AlarmDecoder"; homepage = "https://github.com/ajschmidt8/adext"; + changelog = "https://github.com/ajschmidt8/adext/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aeppl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aeppl/default.nix index 1633be12bb..514e585d60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aeppl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aeppl/default.nix @@ -1,29 +1,34 @@ { lib -, aesara , buildPythonPackage -, fetchFromGitHub -, numdifftools -, numpy -, pytestCheckHook , pythonOlder +, fetchFromGitHub +, setuptools +, aesara +, numpy , scipy +, numdifftools +, pytestCheckHook }: buildPythonPackage rec { pname = "aeppl"; version = "0.1.5"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aesara-devs"; - repo = pname; + repo = "aeppl"; rev = "refs/tags/v${version}"; hash = "sha256-mqBbXwWJwQA2wSHuEdBeXQMfTIcgwYEjpq8AVmOjmHM="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aesara numpy scipy @@ -47,6 +52,14 @@ buildPythonPackage rec { "test_initial_values" ]; + pytestFlagsArray = [ + # `numpy.distutils` is deprecated since NumPy 1.23.0, as a result of the deprecation of `distutils` itself. + # It will be removed for Python >= 3.12. For older Python versions it will remain present. + "-Wignore::DeprecationWarning" + # Blas cannot be found, allow fallback to the numpy slower implementation + "-Wignore::UserWarning" + ]; + meta = with lib; { description = "Library for an Aesara-based PPL"; homepage = "https://github.com/aesara-devs/aeppl"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix index 589799c1b8..edf3f989ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix @@ -16,6 +16,7 @@ , numba-scipy , numpy , pytestCheckHook +, pythonAtLeast , pythonOlder , scipy , typing-extensions @@ -24,9 +25,10 @@ buildPythonPackage rec { pname = "aesara"; version = "2.9.3"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + # Python 3.12 is not supported: https://github.com/aesara-devs/aesara/issues/1520 + disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "aesara-devs"; @@ -35,13 +37,13 @@ buildPythonPackage rec { hash = "sha256-aO0+O7Ts9phsV4ghunNolxfAruGBbC+tHjVkmFedcCI="; }; - nativeBuildInputs = [ + build-system = [ cython hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ cons etuples filelock @@ -62,7 +64,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "--durations=50" "" + --replace-fail "--durations=50" "" \ + --replace-fail "hatch-vcs >=0.3.0,<0.4.0" "hatch-vcs" ''; preBuild = '' @@ -81,12 +84,23 @@ buildPythonPackage rec { "tests/sparse/sandbox/" # JAX is not available on all platform and often broken "tests/link/jax/" + + # 2024-04-27: The current nixpkgs numba version is too recent and incompatible with aesara 2.9.3 + "tests/link/numba/" ]; disabledTests = [ # Disable all benchmark tests "test_scan_multiple_output" "test_logsumexp_benchmark" + + # TypeError: exceptions must be derived from Warning, not + "test_api_deprecation_warning" + # AssertionError: assert ['Elemwise{Co..._i{0} 0', ...] == ['Elemwise{Co..._i{0} 0', ...] + # At index 3 diff: '| |Gemv{inplace} d={0: [0]} 2' != '| |CGemv{inplace} d={0: [0]} 2' + "test_debugprint" + # ValueError: too many values to unpack (expected 3) + "test_ExternalCOp_c_code_cache_version" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index cef36e2b8a..c64eece601 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.99"; + version = "9.2.102"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-g+PvOnm/cLb2FIW1vVHeFRH7iY60HYzQirnxrIdGlVw="; + hash = "sha256-xHxWP16XbVcsT+UIyouqyhbnxPBNx7oH1unBhJU44fI="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix index c6c6e11e29..63815d39e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.4.7"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-DIWRYGDdK/wq1TrPSo9I1oZv5jX4rY4z+u7CTwJtyts="; + hash = "sha256-L5Gb+V0W+9duGV6lRc01jrAfh4U+MS77Y238EeXe0TU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix index 8bdc72a019..a23d248bbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix @@ -3,23 +3,28 @@ , fetchFromGitHub , pamqp , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aioamqp"; version = "0.15.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Polyconseil"; - repo = pname; - rev = "${pname}-${version}"; + repo = "aioamqp"; + rev = "aioamqp-${version}"; hash = "sha256-fssPknJn1tLtzb+2SFyZjfdhUdD8jqkwlInoi5uaplk="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ pamqp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix index 99d8175b62..9cb79bf9d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioautomower/default.nix @@ -1,21 +1,21 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, freezegun -, mashumaro -, poetry-core -, pyjwt -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools -, syrupy +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + freezegun, + mashumaro, + poetry-core, + pyjwt, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + syrupy, }: buildPythonPackage rec { pname = "aioautomower"; - version = "2024.4.0"; + version = "2024.4.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,21 +24,19 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-W6aZdvg+EZKv0pmIaPOBaJaWipq3AENTVAVon/lFuI4="; + hash = "sha256-/mwKomgY+yifN27bpCK9FjhbZRdllr471Ku+Kn2rUPM="; }; postPatch = '' # Upstream doesn't set a version substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ + --replace-fail "--cov" "" ''; - nativeBuildInputs = [ - poetry-core - setuptools - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp mashumaro pyjwt @@ -51,13 +49,9 @@ buildPythonPackage rec { syrupy ]; - pythonImportsCheck = [ - "aioautomower" - ]; + pythonImportsCheck = [ "aioautomower" ]; - pytestFlagsArray = [ - "--snapshot-update" - ]; + pytestFlagsArray = [ "--snapshot-update" ]; disabledTests = [ # File is missing diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioazuredevops/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioazuredevops/default.nix index 377c967986..aaab9a1a4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioazuredevops/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioazuredevops/default.nix @@ -1,30 +1,56 @@ { lib , buildPythonPackage -, isPy27 -, fetchPypi +, pythonOlder +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies , aiohttp -, click +, incremental + +# tests +, aioresponses +, pytest-aiohttp +, pytest-asyncio +, pytest-socket +, pytestCheckHook +, syrupy }: buildPythonPackage rec { pname = "aioazuredevops"; - version = "1.4.3"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; - disabled = isPy27; + disabled = pythonOlder "3.11"; - src = fetchPypi { - inherit pname version; - hash = "sha256-vNTvSQYjjptdPsHz0zM9paq3iodZrhcEralPm6YRZJE="; + src = fetchFromGitHub { + owner = "timmo001"; + repo = "aioazuredevops"; + rev = "refs/tags/${version}"; + hash = "sha256-QEIVAcBoTvuOeLN2kfDa3uYfrUm5Qu1TLp9C0uU+mW4="; }; - propagatedBuildInputs = [ - aiohttp - click + build-system = [ + incremental + setuptools ]; - # no tests implemented - doCheck = false; + dependencies = [ + aiohttp + incremental + ]; + + nativeCheckInputs = [ + aioresponses + pytest-aiohttp + pytest-asyncio + pytest-socket + pytestCheckHook + syrupy + ]; pythonImportsCheck = [ "aioazuredevops.builds" @@ -33,6 +59,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/timmo001/aioazuredevops/releases/tag/${version}"; description = "Get data from the Azure DevOps API"; mainProgram = "aioazuredevops"; homepage = "https://github.com/timmo001/aioazuredevops"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix index 525e482a42..5c421c99f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.12.1"; + version = "2.12.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiobotocore"; rev = "refs/tags/${version}"; - hash = "sha256-+CXKDk6crCPTVpVfcDWy+1UzS05oTu1RtIvDcVrEmFU="; + hash = "sha256-Us94kT7UhTTwMxF63iLLczXZhfr/Z8cJr12DKEphkog="; }; # Relax version constraints: aiobotocore works with newer botocore versions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocache/default.nix index fd4e5f3a15..5d78252791 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiocache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocache/default.nix @@ -1,8 +1,15 @@ { lib +, aiohttp +, aiomcache , buildPythonPackage , fetchFromGitHub +, marshmallow , msgpack +, pkgs , pythonOlder +, pytest-asyncio +, pytest-mock +, pytestCheckHook , redis , setuptools }: @@ -21,21 +28,60 @@ buildPythonPackage rec { hash = "sha256-yvXDNJL8uxReaU81klVWudJwh1hmvg5GeeILcNpm/YA="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "--cov=aiocache --cov=tests/ --cov-report term" "" + ''; + + build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { redis = [ redis ]; + memcached = [ + aiomcache + ]; msgpack = [ msgpack ]; }; - # aiomcache would be required but last release was in 2017 - doCheck = false; + nativeCheckInputs = [ + aiohttp + marshmallow + pytest-asyncio + pytest-mock + pytestCheckHook + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + # TypeError: object MagicMock can't be used in 'await' expression + "--deselect=tests/ut/backends/test_redis.py::TestRedisBackend::test_close" + ]; + + disabledTests = [ + # calls apache benchmark and fails, no usable output + "test_concurrency_error_rates" + ]; + + preCheck = '' + ${lib.getBin pkgs.redis}/bin/redis-server & + REDIS_PID=$! + + ${lib.getBin pkgs.memcached}/bin/memcached & + MEMCACHED_PID=$! + ''; + + postCheck = '' + kill $REDIS_PID + kill $MEMCACHED_PID + ''; + + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "aiocache" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix index 24f6f1b2e4..d1048db7de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook , pytest-asyncio , isPy27 @@ -9,21 +10,24 @@ buildPythonPackage rec { pname = "aiocontextvars"; version = "0.2.2"; - format = "setuptools"; + pyproject = true; + disabled = isPy27; src = fetchFromGitHub { owner = "fantix"; - repo = pname; + repo = "aiocontextvars"; rev = "v${version}"; - sha256 = "0a2gmrm9csiknc8n3si67sgzffkydplh9d7ga1k87ygk2aj22mmk"; + hash = "sha256-s1YhpBLz+YNmUO+0BOltfjr3nz4m6mERszNqlmquTyg="; }; postPatch = '' substituteInPlace setup.py \ - --replace "'pytest-runner'," "" + --replace-fail "'pytest-runner'," "" ''; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix index 30511eb816..f4697daee6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix @@ -1,17 +1,19 @@ -{ lib -, aiofiles -, buildPythonPackage -, cython -, fetchFromGitHub -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + aiofiles, + buildPythonPackage, + cython, + fetchFromGitHub, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "aiocsv"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,14 +22,16 @@ buildPythonPackage rec { owner = "MKuranowski"; repo = "aiocsv"; rev = "refs/tags/v${version}"; - hash = "sha256-zHU9NfxiRUOAk0kwsKmvxd01UtNXZTnb700Wlm9DUz4="; + hash = "sha256-NnRLBXvQj25dSHc8ZnUaPT8Oiy2EyHLIb8IJPQliyPg="; }; - nativeBuildInputs = [ + build-system = [ cython setuptools ]; + dependencies = [ typing-extensions ]; + nativeCheckInputs = [ aiofiles pytest-asyncio @@ -38,9 +42,7 @@ buildPythonPackage rec { export CYTHONIZE=1 ''; - pythonImportsCheck = [ - "aiocsv" - ]; + pythonImportsCheck = [ "aiocsv" ]; disabledTestPaths = [ # Import issue diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiodhcpwatcher/default.nix index 5c8adc9b4b..1cdc26eead 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiodhcpwatcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiodhcpwatcher/default.nix @@ -52,5 +52,6 @@ buildPythonPackage rec { changelog = "https://github.com/bdraco/aiodhcpwatcher/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ hexa ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix index 3330acf8d5..90dcca8a4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix @@ -1,22 +1,23 @@ -{ lib -, aiodns -, async-timeout -, buildPythonPackage -, cached-ipaddress -, dnspython -, fetchFromGitHub -, ifaddr -, netifaces -, pyroute2 -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + aiodns, + async-timeout, + buildPythonPackage, + cached-ipaddress, + dnspython, + fetchFromGitHub, + ifaddr, + netifaces, + pyroute2, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "aiodiscover"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,12 +26,10 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aiodiscover"; rev = "refs/tags/v${version}"; - hash = "sha256-7oeyuwirQ2mm0UQEOwTkAz126UnxkoMjg+DDu5DWY3E="; + hash = "sha256-+DcROb6jR0veD3oSKgyJHUi1VtCT54yBKvVqir5y+R4="; }; - nativeBuildInputs = [ - setuptools - ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ async-timeout @@ -52,9 +51,7 @@ buildPythonPackage rec { "test_async_discover_hosts" ]; - pythonImportsCheck = [ - "aiodiscover" - ]; + pythonImportsCheck = [ "aiodiscover" ]; meta = with lib; { description = "Python module to discover hosts via ARP and PTR lookup"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiodns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiodns/default.nix index 1da999978b..95b17ac6a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiodns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiodns/default.nix @@ -1,40 +1,34 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pycares -, pythonOlder -, setuptools - +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pycares, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "aiodns"; - version = "3.1.1"; + version = "3.2.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "saghul"; repo = "aiodns"; rev = "refs/tags/v${version}"; - sha256 = "sha256-JZS53kICsrXDot3CKjG30AOjkYycKpMJvC9yS3c1v5Q="; + hash = "sha256-aXae9/x0HVp4KqydCf5/+p5PlSKUQ5cE3iVeD08rtf0="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - pycares - ]; + dependencies = [ pycares ]; # Could not contact DNS servers doCheck = false; - pythonImportsCheck = [ - "aiodns" - ]; + pythonImportsCheck = [ "aiodns" ]; meta = with lib; { description = "Simple DNS resolver for asyncio"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioeagle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioeagle/default.nix index 87f38ec71e..3c931fe69e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioeagle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioeagle/default.nix @@ -1,26 +1,30 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, xmltodict +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + xmltodict, }: buildPythonPackage rec { pname = "aioeagle"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; - rev = version; - sha256 = "117nb50cxwrixif2r6fxmr9v0jxkcamm816v48hbhyc660w6xvk4"; + repo = "aioeagle"; + rev = "refs/tags/${version}"; + hash = "sha256-ZO5uODCGebggItsEVKtis0uwU67dmSxc7DHzzkBZ9oQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp xmltodict ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index 282e27f3f8..fff33bbb6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "23.2.0"; + version = "24.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-GFQ87Ic0xHXs8ZgmzH7kOFbDSNmtj0hx+YHKnrz/sG0="; + hash = "sha256-wQR3dwN5O++TdtQh+Wcj7c7TNMaRj2lMlOuXOAPVU0Q="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix index fe72ff28c7..d3d289204b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix @@ -49,6 +49,5 @@ buildPythonPackage rec { description = "File support for asyncio"; homepage = "https://github.com/Tinche/aiofiles"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix index ed60684b9f..e15d1a993d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix @@ -1,30 +1,31 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pythonRelaxDepsHook -, pytestCheckHook -, aiohttp -, aiohttp-socks -, aiofiles -, aresponses -, babel -, certifi -, magic-filter -, pycryptodomex -, pytest-aiohttp -, pytest-asyncio -, pytest-lazy-fixture -, redis -, hatchling -, pydantic -, pytz -, gitUpdater +{ + lib, + aiofiles, + aiohttp, + aiohttp-socks, + aresponses, + babel, + buildPythonPackage, + certifi, + fetchFromGitHub, + gitUpdater, + hatchling, + magic-filter, + pycryptodomex, + pydantic, + pytest-aiohttp, + pytest-asyncio, + pytest-lazy-fixture, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pytz, + redis, }: buildPythonPackage rec { pname = "aiogram"; - version = "3.4.1"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,19 +34,16 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; rev = "refs/tags/v${version}"; - hash = "sha256-2of4KHdpAATOt0dCqI3AmTJtdeN5SdiWydeGjtagABI="; + hash = "sha256-8hbB6/j9mWONFNpQuC3p91xnHR/74TWA9Cq8E+Gsnlw="; }; - nativeBuildInputs = [ - hatchling - pythonRelaxDepsHook - ]; + build-system = [ hatchling ]; - pythonRelaxDeps = [ - "pydantic" - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "pydantic" ]; + + dependencies = [ aiofiles aiohttp babel @@ -67,15 +65,17 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "-W" "ignore::pluggy.PluggyTeardownRaisedWarning" - "-W" "ignore::pytest.PytestDeprecationWarning" + "-W" + "ignore::pluggy.PluggyTeardownRaisedWarning" + "-W" + "ignore::pytest.PytestDeprecationWarning" + "-W" + "ignore::DeprecationWarning" ]; pythonImportsCheck = [ "aiogram" ]; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = with lib; { description = "Modern and fully asynchronous framework for Telegram Bot API"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-isal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-isal/default.nix new file mode 100644 index 0000000000..dbaac30287 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-isal/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, poetry-core + +# dependencies +, aiohttp +, isal + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aiohttp-isal"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiohttp-isal"; + rev = "v${version}"; + hash = "sha256-rSXV5Z5JdznQGtRI83UIbaSfbIYkUHphJTVK/LM2V4U="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + aiohttp + isal + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + sed -i '/addopts/d' pyproject.toml + ''; + + pythonImportsCheck = [ + "aiohttp_isal" + ]; + + meta = with lib; { + changelog = "https://github.com/bdraco/aiohttp-isal/blob/${src.rev}/CHANGELOG.md"; + description = "Isal support for aiohttp"; + homepage = "https://github.com/bdraco/aiohttp-isal"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 8e78784457..9584316d85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -6,12 +6,13 @@ , pytest-aiohttp , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiohttp-jinja2"; version = "1.6"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +21,11 @@ buildPythonPackage rec { hash = "sha256-o6f/UmTlvKUuiuVHu/0HYbcklSMNQ40FtsCRW+YZsOI="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp jinja2 ]; @@ -31,8 +36,8 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov=aiohttp_jinja2 --cov-report xml --cov-report html --cov-report term" "" + substituteInPlace pytest.ini \ + --replace-fail "--cov=aiohttp_jinja2/ --cov=tests/ --cov-report term" "" ''; pytestFlagsArray = [ @@ -44,10 +49,6 @@ buildPythonPackage rec { "aiohttp_jinja2" ]; - # Tests are outdated (1.5) - # pytest.PytestUnhandledCoroutineWarning: async def functions... - doCheck = false; - meta = with lib; { description = "Jinja2 support for aiohttp"; homepage = "https://github.com/aio-libs/aiohttp_jinja2"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-openmetrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-openmetrics/default.nix index 11b979c4f6..871b9e33bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-openmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-openmetrics/default.nix @@ -4,12 +4,13 @@ , aiohttp , prometheus-client , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiohttp-openmetrics"; version = "0.0.12"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +19,11 @@ buildPythonPackage rec { hash = "sha256-/ZRngcMlroCVTvIl+30DR4SI8LsSnTovuzg3YduWgWA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp prometheus-client ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-session/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-session/default.nix new file mode 100644 index 0000000000..31acba3ebd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-session/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies +, aiohttp + +# optional-dependencies +, aiomcache +, cryptography +, pynacl +, redis +}: + +buildPythonPackage rec { + pname = "aiohttp-session"; + version = "2.12.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "aiohttp-session"; + rev = "v${version}"; + hash = "sha256-7MNah4OIQnoxLoZkLOdeu5uCwSyPMhc6Wsht8dFconc="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + aiohttp + ]; + + optional-dependencies = { + aioredis = [ redis ]; + aiomcache = [ aiomcache ]; + pycrypto = [ cryptography ]; + secure = [ cryptography ]; + pynacl = [ pynacl ]; + }; + + doCheck = false; # runs redis in docker + + pythonImportsCheck = [ + "aiohttp_session" + ]; + + meta = with lib; { + description = "Web sessions for aiohttp.web"; + homepage = "https://github.com/aio-libs/aiohttp-session"; + changelog = "https://github.com/aio-libs/aiohttp-session/blob/${src.rev}/CHANGES.txt"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix index e46b5989dd..a84a54e2c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , substituteAll , llhttp +, python # build_requires , cython , setuptools @@ -29,7 +30,7 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.9.3"; + version = "3.9.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +39,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiohttp"; rev = "refs/tags/v${version}"; - hash = "sha256-dEeMHruFJ1o0J6VUJcpUk7LhEC8sV8hUKXoKcd618lE="; + hash = "sha256-FRtirmwgU8v+ee3db7rOFsmy0rNW8A7+yRZC5d6uYNA="; }; patches = [ @@ -57,7 +58,7 @@ buildPythonPackage rec { touch .git # tools/gen.py uses .git to find the project root ''; - nativeBuildInputs = [ + build-system = [ cython setuptools ]; @@ -66,7 +67,7 @@ buildPythonPackage rec { make cythonize ''; - propagatedBuildInputs = [ + dependencies = [ attrs multidict async-timeout @@ -77,6 +78,11 @@ buildPythonPackage rec { brotli ]; + postInstall = '' + # remove source code file with reference to dev dependencies + rm $out/${python.sitePackages}/aiohttp/_cparser.pxd{,.orig} + ''; + # NOTE: pytest-xdist cannot be added because it is flaky. See https://github.com/NixOS/nixpkgs/issues/230597 for more info. nativeCheckInputs = [ freezegun @@ -96,14 +102,6 @@ buildPythonPackage rec { "test_client_session_timeout_zero" "test_mark_formdata_as_processed" "test_requote_redirect_url_default" - # Disable tests that trigger deprecation warnings in pytest - "test_async_with_session" - "test_session_close_awaitable" - "test_close_run_until_complete_not_deprecated" - # https://github.com/aio-libs/aiohttp/issues/7130 - "test_static_file_if_none_match" - "test_static_file_if_match" - "test_static_file_if_modified_since_past_date" # don't run benchmarks "test_import_time" ] ++ lib.optionals stdenv.is32bit [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix index 45f79d8194..cddfbc9295 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix @@ -9,6 +9,7 @@ , packaging , python-snappy , pythonOlder +, setuptools , zlib , zstandard }: @@ -16,32 +17,33 @@ buildPythonPackage rec { pname = "aiokafka"; version = "0.10.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; + repo = "aiokafka"; rev = "refs/tags/v${version}"; hash = "sha256-G9Q77nWUUW+hG/wm9z/S8gea4U1wHZdj7WdK2LsKBos="; }; - nativeBuildInputs = [ + build-system = [ cython + setuptools ]; buildInputs = [ zlib ]; - propagatedBuildInputs = [ + dependencies = [ async-timeout kafka-python packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { snappy = [ python-snappy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix index 916754dc8c..4411b52a34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix @@ -1,35 +1,38 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pytestCheckHook -, setuptools +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + incremental, + pythonOlder, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "aiolyric"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "timmo001"; repo = "aiolyric"; rev = "refs/tags/${version}"; - hash = "sha256-FZhLjVrLzLv6CZz/ROlvbtBK9XnpO8pG48aSIoBxhCo="; + hash = "sha256-pN/F4Rdov06sm1yfJQEzmWyujWVeVU+bNGGkgnN4jYw="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp + incremental ]; nativeCheckInputs = [ + aioresponses pytestCheckHook ]; @@ -38,9 +41,7 @@ buildPythonPackage rec { "test_priority" ]; - pythonImportsCheck = [ - "aiolyric" - ]; + pythonImportsCheck = [ "aiolyric" ]; meta = with lib; { description = "Python module for the Honeywell Lyric Platform"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomcache/default.nix new file mode 100644 index 0000000000..c5349ce13f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomcache/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build-system +, setuptools + +# dependencies +, python-memcached +, typing-extensions +}: + +buildPythonPackage rec { + pname = "aiomcache"; + version = "0.8.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "aiomcache"; + rev = "v${version}"; + hash = "sha256-+rlKHDop0kNxJ0HoXROs/oyI4zE3MDyxXXhWZtVDMj4="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + python-memcached + ] ++ lib.optionals (pythonOlder "3.11") [ + typing-extensions + ]; + + doCheck = false; # executes memcached in docker + + pythonImportsCheck = [ + "aiomcache" + ]; + + meta = with lib; { + changelog = "https://github.com/aio-libs/aiomcache/blob/${src.rev}/CHANGES.rst"; + description = "Minimal asyncio memcached client"; + homepage = "https://github.com/aio-libs/aiomcache/"; + license = licenses.bsd2; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomisc-pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomisc-pytest/default.nix index 674aef1d02..01230505b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomisc-pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomisc-pytest/default.nix @@ -1,16 +1,17 @@ -{ lib -, aiomisc -, buildPythonPackage -, fetchPypi -, poetry-core -, pytest -, pythonOlder -, pythonRelaxDepsHook +{ + lib, + aiomisc, + buildPythonPackage, + fetchPypi, + poetry-core, + pytest, + pythonOlder, + pythonRelaxDepsHook, }: buildPythonPackage rec { pname = "aiomisc-pytest"; - version = "1.1.2"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,29 +19,20 @@ buildPythonPackage rec { src = fetchPypi { pname = "aiomisc_pytest"; inherit version; - hash = "sha256-Zja0cNFrn6mUFlZOtzAtBJ/Gn27akD59qX6p88ytD6w="; + hash = "sha256-4mWP77R3CoX+XhoT6BbxQtxpINpdmeozjYUsegNfMyU="; }; - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; - pythonRelaxDeps = [ - "pytest" - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - buildInputs = [ - pytest - ]; + pythonRelaxDeps = [ "pytest" ]; - propagatedBuildInputs = [ - aiomisc - ]; + buildInputs = [ pytest ]; - pythonImportsCheck = [ - "aiomisc_pytest" - ]; + dependencies = [ aiomisc ]; + + pythonImportsCheck = [ "aiomisc_pytest" ]; # Module has no tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix index 9182859bb9..47a702ddf0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.5.6"; + version = "17.5.15"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-oq4z+ULN6VYkXX4Oz/JqKZSIh55AHOxFJVLyaNGqaNA="; + hash = "sha256-tfJm0W20UeuWIrihXpEmbiX5+Zs1ASIzJbhjodLdctI="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix index 16450a8758..3a5321198e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiomqtt"; version = "2.0.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,12 +24,12 @@ buildPythonPackage rec { hash = "sha256-bV1elEO1518LVLwNDN5pzjxRgcG34K1XUsK7fTw8h+8="; }; - nativeBuildInputs = [ + build-system = [ poetry-core poetry-dynamic-versioning ]; - propagatedBuildInputs = [ + dependencies = [ paho-mqtt typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix index 579ea497fb..f07b225890 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix @@ -1,25 +1,27 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, flit-core -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "aiomultiprocess"; - version = "0.9.0"; - format = "pyproject"; + version = "0.9.1"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "omnilib"; - repo = pname; - rev = "v${version}"; - hash = "sha256-yOP69FXDb2Grmtszx7oa6uiJGUar8su3KwqQPI+xjrw="; + repo = "aiomultiprocess"; + rev = "refs/tags/v${version}"; + hash = "sha256-LWrAr3i2CgOMZFxWi9B3kiou0UtaHdDbpkr6f9pReRA="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix index 006f108da3..5e3ca5a608 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix @@ -1,21 +1,22 @@ -{ lib -, aiofiles -, asyncio-mqtt -, awesomeversion -, buildPythonPackage -, click -, fetchFromGitHub -, marshmallow -, poetry-core -, pyserial-asyncio -, pytest-asyncio -, pytestCheckHook -, pythonOlder +{ + lib, + aiofiles, + asyncio-mqtt, + awesomeversion, + buildPythonPackage, + click, + fetchFromGitHub, + marshmallow, + poetry-core, + pyserial-asyncio, + pytest-asyncio, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.14"; + version = "0.3.15"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiomysensors"; rev = "refs/tags/v${version}"; - hash = "sha256-7Y7JE/GAX5gQrIGcErZTGQXyaf3QwsTFgviiHLWgGeI="; + hash = "sha256-kgfz8VUTtOFN1hPkNJhPdRUKQn01BJn+92Ez6lgVGbc="; }; postPatch = '' @@ -32,11 +33,9 @@ buildPythonPackage rec { --replace-fail " --cov=src --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles asyncio-mqtt awesomeversion @@ -50,16 +49,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "aiomysensors" - ]; + pythonImportsCheck = [ "aiomysensors" ]; meta = with lib; { description = "Library to connect to MySensors gateways"; - mainProgram = "aiomysensors"; homepage = "https://github.com/MartinHjelmare/aiomysensors"; changelog = "https://github.com/MartinHjelmare/aiomysensors/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "aiomysensors"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix index acd3cc56e4..140ddfd0e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix @@ -4,6 +4,7 @@ , fetchpatch , pymysql , pythonOlder +, setuptools , setuptools-scm , wheel }: @@ -11,13 +12,13 @@ buildPythonPackage rec { pname = "aiomysql"; version = "0.2.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; + repo = "aiomysql"; rev = "refs/tags/v${version}"; hash = "sha256-m/EgoBU3e+s3soXyYtACMDSjJfMLBOk/00qPtgawwQ8="; }; @@ -33,6 +34,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ + setuptools setuptools-scm wheel ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix index cb280b01d2..64d5cd9870 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix @@ -1,17 +1,18 @@ -{ lib -, aiohttp -, aioresponses -, buildPythonPackage -, fetchFromGitHub -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "aiopegelonline"; - version = "0.0.9"; + version = "0.0.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,16 +21,12 @@ buildPythonPackage rec { owner = "mib1185"; repo = "aiopegelonline"; rev = "refs/tags/v${version}"; - hash = "sha256-/k0TR0oUYZigi/2xRVLPFAIMAmXoLnE0NRlvEZrWylo="; + hash = "sha256-nKuqAzT1O5n9X/fEUm+M2RdB4u7moUGQzFA7knSEpBs="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - aiohttp - ]; + dependencies = [ aiohttp ]; nativeCheckInputs = [ aioresponses @@ -37,9 +34,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "aiopegelonline" - ]; + pythonImportsCheck = [ "aiopegelonline" ]; meta = with lib; { description = "Library to retrieve data from PEGELONLINE"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix index 09a2bfb856..5686a7dafd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aiorpcx"; - version = "0.22.1"; + version = "0.23.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "aiorpcX"; - sha256 = "0lx54bcinp44fmr8q4bbffsqbkg8kdcwykf9i5jj0bj3sfzgf9k0"; + sha256 = "sha256-WyMALxpNXTCF4xVVoHUZxe+NTEAHHrSZVW/9qBFIYKI="; }; propagatedBuildInputs = [ attrs ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix index cbd44aa170..9e1384acc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.8.12"; + version = "0.8.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-X7MqBDmVfLy5ajqhFcvA8oCaoxy3zLusXkB659qWR5E="; + hash = "sha256-JoolmxZFN0UG8wAMxMAYL8APFjpEcMECirCKUA/UBlY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix index f0e63e0ae3..1d181dc7cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "aiorun"; version = "2023.7.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cjrh"; - repo = pname; + repo = "aiorun"; rev = "refs/tags/v${version}"; hash = "sha256-3AGsT8IUNi5SZHBsBfd7akj8eQ+xb0mrR7ydIr3T8gs="; }; @@ -31,11 +31,11 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index 55c60d8e92..8011abb188 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix @@ -1,34 +1,33 @@ -{ lib -, aiohttp -, bluetooth-data-tools -, buildPythonPackage -, fetchFromGitHub -, habluetooth -, orjson -, pythonOlder -, setuptools -, yarl +{ + lib, + aiohttp, + bluetooth-data-tools, + buildPythonPackage, + fetchFromGitHub, + habluetooth, + orjson, + pythonOlder, + setuptools, + yarl, }: buildPythonPackage rec { pname = "aioshelly"; - version = "8.2.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; + repo = "aioshelly"; rev = "refs/tags/${version}"; - hash = "sha256-ZJ6lb3pd8DhNagaVq1uFwadtviuHCg44YZkh29ipu5U="; + hash = "sha256-yVjQlP4vIs3Nk94ZcafpLzxVMIJfLsPGee5G5IdnCRs="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp bluetooth-data-tools habluetooth @@ -39,9 +38,7 @@ buildPythonPackage rec { # Project has no test doCheck = false; - pythonImportsCheck = [ - "aioshelly" - ]; + pythonImportsCheck = [ "aioshelly" ]; meta = with lib; { description = "Python library to control Shelly"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix index 2f3c5e3b83..39050153be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix @@ -6,23 +6,28 @@ , pytest-mock , pytestCheckHook , pythonOlder +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "aiosmtpd"; version = "1.4.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; + repo = "aiosmtpd"; rev = "refs/tags/v${version}"; hash = "sha256-8nQ4BVSLYgZHRGkbujy/olV/+GABlkDhe5wef3hyQpQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ atpublic attrs @@ -53,6 +58,7 @@ buildPythonPackage rec { description = "Asyncio based SMTP server"; mainProgram = "aiosmtpd"; homepage = "https://aiosmtpd.readthedocs.io/"; + changelog = "https://github.com/aio-libs/aiosmtpd/releases/tag/v${version}"; longDescription = '' This is a server for SMTP and related protocols, similar in utility to the standard library's smtpd.py module. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index 05784995f7..1bf95b7187 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "75"; + version = "78"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "aiounifi"; rev = "refs/tags/v${version}"; - hash = "sha256-IPm3/i+JJpjVfRFq+Yq1mfajHL/mOARk5koyy/t37NQ="; + hash = "sha256-fY3VsXJfs/uqqQjR6Sp03XlkCOk+8GvXq476dgagJQ8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix index cd19fc8032..5344131279 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix @@ -1,48 +1,43 @@ -{ lib -, aiohttp -, beautifulsoup4 -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pytestCheckHook -, pythonOlder +{ + lib, + aiohttp, + beautifulsoup4, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "aiovodafone"; - version = "0.5.4"; + version = "0.6.0"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-J2VdRxCzIjRUOqQW4YzOC8RRth9tibBS9YuizveqhhI="; + hash = "sha256-sy7/nCthmfI0WdBkwBU83fifcYTe9zUBOpxV7RX9F6w="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=aiovodafone --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=aiovodafone --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp beautifulsoup4 ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "aiovodafone" - ]; + pythonImportsCheck = [ "aiovodafone" ]; meta = with lib; { description = "Library to control Vodafon Station"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiowinreg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiowinreg/default.nix index a24384e3c5..bb6837c3f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiowinreg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiowinreg/default.nix @@ -1,25 +1,29 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, prompt-toolkit -, pythonOlder -, winacl +{ + lib, + buildPythonPackage, + fetchFromGitHub, + prompt-toolkit, + pythonOlder, + setuptools, + winacl, }: buildPythonPackage rec { pname = "aiowinreg"; - version = "0.0.10"; - format = "setuptools"; + version = "0.0.12"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "skelsec"; - repo = pname; + repo = "aiowinreg"; rev = "refs/tags/${version}"; - hash = "sha256-PkrBjH+yeSLpwL9kH242xQKBsjv6a11k2c26qBwR6Fw="; + hash = "sha256-XQDBvBfocz5loUg9eZQz4FKGiCGCaczwhYE/vhy7mC0="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ prompt-toolkit winacl @@ -28,16 +32,14 @@ buildPythonPackage rec { # Project doesn't have tests doCheck = false; - pythonImportsCheck = [ - "aiowinreg" - ]; + pythonImportsCheck = [ "aiowinreg" ]; meta = with lib; { description = "Python module to parse the registry hive"; - mainProgram = "awinreg"; homepage = "https://github.com/skelsec/aiowinreg"; changelog = "https://github.com/skelsec/aiowinreg/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "awinreg"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix index 1f94585410..9e84b10802 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix @@ -1,18 +1,19 @@ -{ lib -, async-interrupt -, async-timeout -, bleak -, bleak-retry-connector -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pytestCheckHook -, pythonOlder +{ + lib, + async-interrupt, + async-timeout, + bleak, + bleak-retry-connector, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "airthings-ble"; - version = "0.7.1"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "vincegio"; repo = "airthings-ble"; rev = "refs/tags/${version}"; - hash = "sha256-BeOrGRVxvfQR1xqIpOp4tOTvlqTKCZHUjVKDqVjVnYM="; + hash = "sha256-920Vgk8kY5NsjYrOGYoRtcdHl4KKO7ytieH8cJ0S3RE="; }; postPatch = '' @@ -29,30 +30,22 @@ buildPythonPackage rec { --replace-fail "-v -Wdefault --cov=airthings_ble --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ async-interrupt bleak bleak-retry-connector - ] ++ lib.optionals (pythonOlder "3.11") [ - async-timeout - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "airthings_ble" - ]; + pythonImportsCheck = [ "airthings_ble" ]; meta = with lib; { description = "Library for Airthings BLE devices"; homepage = "https://github.com/vincegio/airthings-ble"; - changelog = "https://github.com/vincegio/airthings-ble/releases/tag/v${version}"; + changelog = "https://github.com/vincegio/airthings-ble/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/airtouch5py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/airtouch5py/default.nix new file mode 100644 index 0000000000..f474e23457 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/airtouch5py/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + + # build-system + poetry-core, + pythonRelaxDepsHook, + + # dependencies + bitarray, + crc, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "airtouch5py"; + version = "0.2.8"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "danzel"; + repo = "airtouch5py"; + rev = "refs/tags/${version}"; + hash = "sha256-MpwppyAWDiA3CZXCIUQ/vidzcxKXZJSlrFRhmrPMgCE="; + }; + + build-system = [ poetry-core ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + pythonRelaxDeps = [ "crc" ]; + + dependencies = [ + bitarray + crc + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "airtouch5py" ]; + + meta = with lib; { + changelog = "https://github.com/danzel/airtouch5py/releases/tag/${version}"; + description = "Python client for the airtouch 5"; + homepage = "https://github.com/danzel/airtouch5py"; + license = licenses.asl20; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix index 17e9c7fc79..7e15fcf6c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix @@ -1,31 +1,35 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , setuptools +, deepdiff , numpy , opencv4 , pyyaml -, qudida , scikit-image +, scikit-learn , scipy -, deepdiff +, pydantic , pytestCheckHook , pythonOlder , pythonRelaxDepsHook , torch , torchvision +, typing-extensions }: buildPythonPackage rec { pname = "albumentations"; - version = "1.4.2"; + version = "1.4.4"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-lznWLJocXdfwnhAZ33V5ZdlFCAsNa0u/rjfkjmHBQOg="; + src = fetchFromGitHub { + owner = "albumentations-team"; + repo = "albumentations"; + rev = "refs/tags/${version}"; + hash = "sha256-7t1+22zzFtkZaAyOo6xjk+MXT9N44PmQ/NRRfvLeRVk="; }; nativeBuildInputs = [ @@ -34,6 +38,7 @@ buildPythonPackage rec { pythonRemoveDeps = [ "opencv-python" + "pydantic" ]; build-system = [ @@ -43,10 +48,12 @@ buildPythonPackage rec { dependencies = [ numpy opencv4 + pydantic pyyaml - qudida scikit-image + scikit-learn scipy + typing-extensions ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix index cd7b0696af..47c6a22ea1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "alembic"; version = "1.13.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -31,11 +31,11 @@ buildPythonPackage rec { hash = "sha256-STLIVYv2jy7pK5u8uCGGccYnBk1bCJOUN69td9wF5ZU="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ mako sqlalchemy typing-extensions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix index 55288c2b6d..7364654c83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix @@ -1,32 +1,32 @@ -{ lib -, aliyun-python-sdk-core -, buildPythonPackage -, fetchPypi -, pythonOlder +{ + lib, + aliyun-python-sdk-core, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "aliyun-python-sdk-kms"; - version = "2.16.2"; - format = "setuptools"; + version = "2.16.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+HI0qLZNRXyiM4+HZQ2xijzn99vJv+9x7+jyiUre09Y="; + hash = "sha256-wxt9JOFTJxowQ+gB57a2s/DbR+lag8jRDNq4wRZi/Dk="; }; - propagatedBuildInputs = [ - aliyun-python-sdk-core - ]; + build-system = [ setuptools ]; + + dependencies = [ aliyun-python-sdk-core ]; # All components are stored in a mono repo doCheck = false; - pythonImportsCheck = [ - "aliyunsdkkms" - ]; + pythonImportsCheck = [ "aliyunsdkkms" ]; meta = with lib; { description = "KMS module of Aliyun Python SDK"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix index 8f39c1fb62..ef9e8fc2bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "allure-behave"; - version = "2.13.2"; + version = "2.13.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mxXb7+1tvf5EmVbD6eOmGfza9lAjbEVoxWZBSeZmPxQ="; + hash = "sha256-M4yizHOV0e491y9dfZLYkg8a3g4H3evGN7OOYeBtyNw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix index ba86e0723a..504f118bc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "allure-pytest"; - version = "2.13.2"; + version = "2.13.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IiQxWejsgc4rUlS0ATgCGYghsbQvEY9p1KKJOWYHx7M="; + hash = "sha256-DvjheQxEqYjba4PE1PXpFFHixMjqEGAd+ohSjSOvz24="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons-test/default.nix index 4a75e18835..da1d4a3dca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons-test/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons-test/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "allure-python-commons-test"; - version = "2.13.4"; + version = "2.13.5"; format = "setuptools"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - hash = "sha256-WPthxhyKlN6fGdKXJLrjh3nbQ8h6CacYToyadh/p49M="; + hash = "sha256-pWkLVfBrLEhdhuTE95K3aqrhEY2wEyo5uRzuJC3ngjE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons/default.nix index 2e6a38e513..c63466ce8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "allure-python-commons"; - version = "2.13.2"; + version = "2.13.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-igNoEzAjGx3q3Ya5f/aIQcZZEyARSuY4Vw8e1g16IDM="; + hash = "sha256-ojLnlVgR+Yjkmkwd1sFszn6bgdDqBCKx5WVNMlTiyvM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amaranth-boards/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amaranth-boards/default.nix index 01f5dde3b5..2475c93f8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amaranth-boards/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amaranth-boards"; version = "0-unstable-2023-12-13"; - format = "setuptools"; + pyproject = true; # python setup.py --version realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}"; @@ -20,8 +20,8 @@ buildPythonPackage rec { hash = "sha256-dwZCKMJnEY9RjzkcJ9r3TEC7W+Wfi/P7Hjl4/d60/qo="; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ setuptools amaranth ]; + nativeBuildInputs = [ setuptools setuptools-scm ]; + dependencies = [ setuptools amaranth ]; preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amaranth-soc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amaranth-soc/default.nix index b509ec551c..0742055e9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amaranth-soc/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pdm-backend ]; - propagatedBuildInputs = [ amaranth ]; + dependencies = [ amaranth ]; preBuild = '' export PDM_BUILD_SCM_VERSION="${realVersion}" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix index a0e2675a00..5f2f072558 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pdm-backend ]; - propagatedBuildInputs = [ + dependencies = [ jinja2 pyvcd ] ++ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androidtvremote2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androidtvremote2/default.nix index 976ba217ce..df179dab63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/androidtvremote2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/androidtvremote2/default.nix @@ -1,40 +1,37 @@ -{ lib -, aiofiles -, buildPythonPackage -, cryptography -, fetchFromGitHub -, protobuf -, pythonOlder -, setuptools +{ + lib, + aiofiles, + buildPythonPackage, + cryptography, + fetchFromGitHub, + protobuf, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "androidtvremote2"; - version = "0.0.14"; - format = "pyproject"; + version = "0.1.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "tronikos"; repo = "androidtvremote2"; rev = "refs/tags/v${version}"; - hash = "sha256-m53TlNrrCjA4CqvR02Yph7Gr5Dt17VJFBX6MC3arWOI="; + hash = "sha256-Zem2IWBUWmyVdBjqoVKFk+/lg5T7CPXCKFXhFusQFLY="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles cryptography protobuf ]; - pythonImportsCheck = [ - "androidtvremote2" - ]; + pythonImportsCheck = [ "androidtvremote2" ]; # Module only has a dummy test doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index 9aa7984f76..b7f04cace7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.99"; + version = "9.2.102"; pyproject = true; disabled = pythonOlder "3.11"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-R23sMjx7SjwNXGS2DQKoZS6vayuHp7/97uCgKM8yejA="; + hash = "sha256-NZO4aQQfp+P9nbVr+cFd5Z2Ziz9cYzuLUi6nVY+Czr0="; }; pythonRelaxDeps = [ "capstone" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anova-wifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anova-wifi/default.nix index a7cd85ca8b..4f4c00cd7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anova-wifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anova-wifi/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, poetry-core -, aiohttp -, sensor-state-data -, pytestCheckHook -, pytest-asyncio +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + poetry-core, + aiohttp, + sensor-state-data, + pytestCheckHook, + pytest-asyncio, }: buildPythonPackage rec { pname = "anova-wifi"; - version = "0.11.7"; + version = "0.12.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,19 +21,17 @@ buildPythonPackage rec { owner = "Lash-L"; repo = "anova_wifi"; rev = "refs/tags/v${version}"; - hash = "sha256-G87lNPyFnMO0YWKtLv/RgSZ0j0exFro24erwYv87V90="; + hash = "sha256-0RRnQBLglPnPin9/gqWDKIsfi5V7ydrdDKwm93WEnvk="; }; postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--cov=anova_wifi --cov-report=term-missing:skip-covered" "" - ''; + substituteInPlace pyproject.toml \ + --replace-fail "--cov=anova_wifi --cov-report=term-missing:skip-covered" "" + ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp sensor-state-data ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix index b3455fac82..0461bf66d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix @@ -6,6 +6,7 @@ , pytest-mock , pytestCheckHook , pyyaml +, setuptools , setuptools-scm , subprocess-tee , pythonOlder @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "ansible-compat"; version = "4.1.11"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,10 +25,11 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ pyyaml subprocess-tee ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix index dda1fe09fa..4bc9f89aec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , writeText +, setuptools , ipywidgets , six , docopt @@ -25,14 +26,16 @@ in buildPythonPackage rec { pname = "ansible-kernel"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-UJjm9FpmXSznXtaIR2rVv5YJS/H83FvRkNz09vwoe0c="; }; - propagatedBuildInputs = [ ipywidgets six docopt tqdm jupyter psutil pyyaml ansible-runner ansible ]; + build-system = [ setuptools ]; + + dependencies = [ ipywidgets six docopt tqdm jupyter psutil pyyaml ansible-runner ansible ]; postPatch = '' # remove when merged diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index e4cb4c205d..b0145a3113 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -18,13 +18,14 @@ , pythonOlder , python-daemon , pyyaml +, setuptools , six }: buildPythonPackage rec { pname = "ansible-runner"; version = "2.3.6"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -40,13 +41,19 @@ buildPythonPackage rec { hash = "sha256-eTnQkftvjK0YHU+ovotRVSuVlvaVeXp5SvYk1DPCg88="; excludes = [ ".github/workflows/ci.yml" "tox.ini" ]; }) + (fetchpatch { + # python 3.12 compat + url = "https://github.com/ansible/ansible-runner/commit/dc248497bb2375a363222ce755bf3a31f21d5f64.patch"; + hash = "sha256-QT28Iw0uENoO35rqZpYBcmJB/GNDEF4m86SKf6p0XQU="; + }) ]; - nativeBuildInputs = [ + build-system = [ + setuptools pbr ]; - propagatedBuildInputs = [ + dependencies = [ ansible-core psutil pexpect diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix index d4f275184b..dccf9ede22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { packaging passlib pyyaml - resolvelib # This library is a PITA, since ansible requires a very old version of it + resolvelib # optional dependencies junit-xml lxml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix index 0319011567..321cf23c26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix @@ -21,7 +21,7 @@ let pname = "ansible"; - version = "9.4.0"; + version = "9.5.1"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-3UMcYzgOGMP6yjKI696M4vT5kjY6tVijwRyPIDLZCGc="; + hash = "sha256-PCeLyWQrl/yVOyugW5nNgIAedb81Z9+qHLUTH+DsHs0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix index 8dbfa99687..66ff581b9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix @@ -5,38 +5,39 @@ , pytestCheckHook , pythonAtLeast , pythonOlder +, setuptools , textwrap3 }: buildPythonPackage rec { pname = "ansiwrap"; version = "0.8.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7"; + hash = "sha256-ygx0BzTN5Zv5Gfj/LDhvdPmjaYGM3GDv6UiT0B6o2bc="; }; postPatch = '' # https://github.com/jonathaneunice/ansiwrap/issues/18 substituteInPlace test/test_ansiwrap.py \ - --replace "set(range(20, 120)).difference(LINE_LENGTHS)" "sorted(set(range(20, 120)).difference(LINE_LENGTHS))" \ - --replace "set(range(120, 400)).difference(LINE_LENGTHS)" "sorted(set(range(120, 400)).difference(LINE_LENGTHS))" + --replace-fail "set(range(20, 120)).difference(LINE_LENGTHS)" "sorted(set(range(20, 120)).difference(LINE_LENGTHS))" \ + --replace-fail "set(range(120, 400)).difference(LINE_LENGTHS)" "sorted(set(range(120, 400)).difference(LINE_LENGTHS))" ''; - checkInputs = [ + build-system = [ setuptools ]; + + dependencies = [ textwrap3 ]; + + nativeCheckInputs = [ ansicolors pytestCheckHook ]; - propagatedBuildInputs = [ - textwrap3 - ]; - pythonImportsCheck = [ "ansiwrap" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix index 76b852c71f..bfa36713ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix @@ -1,25 +1,27 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, hatchling -, anyio -, distro -, dirty-equals -, httpx -, google-auth -, sniffio -, pydantic -, pytest-asyncio -, respx -, tokenizers -, typing-extensions -, pytestCheckHook -, pythonOlder +{ + lib, + anyio, + buildPythonPackage, + dirty-equals, + distro, + fetchFromGitHub, + google-auth, + hatch-fancy-pypi-readme, + hatchling, + httpx, + pydantic, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + respx, + sniffio, + tokenizers, + typing-extensions, }: buildPythonPackage rec { pname = "anthropic"; - version = "0.19.1"; + version = "0.25.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,14 +30,15 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-D9asbwZ9puOuIK6w7cWJ2HmC3JYjamUZPOxVKWq+Va4="; + hash = "sha256-CBe5rzO2+m1AGfDbAqxCzZ+Rm1Er4e0JuxtFRzgHV/Q="; }; - nativeBuildInputs = [ + build-system = [ hatchling + hatch-fancy-pypi-readme ]; - propagatedBuildInputs = [ + dependencies = [ anyio distro httpx @@ -56,13 +59,21 @@ buildPythonPackage rec { respx ]; + pythonImportsCheck = [ "anthropic" ]; + + disabledTests = [ + # Test require network access + "test_copy_build_request" + ]; + disabledTestPaths = [ - # require network access + # Test require network access "tests/api_resources" ]; - pythonImportsCheck = [ - "anthropic" + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anywidget/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anywidget/default.nix index 69b6416517..767fc77585 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anywidget/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anywidget/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.9.7"; + version = "0.9.10"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mepiQbJVtIHgzEhnjy8MjBOEMYLvlpLJ/wzMSm3+2bE="; + hash = "sha256-OQpigkCYHAmBPHUjJ53cq4L/T9Moet1UM7eLE2kIkGg="; }; # We do not need the jupyterlab build dependency, because we do not need to diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix index b37c1b11fe..7fa8bdf06f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "apipkg"; version = "3.0.2"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "pytest-dev"; - repo = pname; + repo = "apipkg"; rev = "refs/tags/v${version}"; hash = "sha256-ANLD7fUMKN3RmAVjVkcpwUH6U9ASalXdwKtPpoC8Urs="; }; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix index eccee0f3e1..b3df151c0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "apispec"; - version = "6.6.0"; + version = "6.6.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-wIRvjqpRGcRrLs/pvCTtGduohF+GVdALUd3SlqEOpMs="; + hash = "sha256-9cqkfO51/gO5xQtVlASLTAUu7KLCEuDawS27YXXZplk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/app-model/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/app-model/default.nix index 7dc1c65349..bf2130e224 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/app-model/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/app-model/default.nix @@ -1,20 +1,21 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, hatch-vcs -, hatchling -, in-n-out -, psygnal -, pydantic -, pydantic-compat -, pytestCheckHook -, pythonOlder -, typing-extensions +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatch-vcs, + hatchling, + in-n-out, + psygnal, + pydantic, + pydantic-compat, + pytestCheckHook, + pythonOlder, + typing-extensions, }: buildPythonPackage rec { pname = "app-model"; - version = "0.2.6"; + version = "0.2.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,15 +24,15 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "app-model"; rev = "refs/tags/v${version}"; - hash = "sha256-EMlxY9Xna9e3kWJ7X8oRuLHEmivwVFcEXRDvZfN2rNY="; + hash = "sha256-ISMSt7c8CoxffMhg7XC/ebKkgXFTBihDr1fGkqMCBoc="; }; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ psygnal pydantic pydantic-compat @@ -39,13 +40,9 @@ buildPythonPackage rec { typing-extensions ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "app_model" - ]; + pythonImportsCheck = [ "app_model" ]; meta = with lib; { description = "Module to implement generic application schema"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix index 929280a61b..e079703d17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -1,39 +1,44 @@ -{ lib -, babel -, buildPythonPackage -, click -, cryptography -, fetchPypi -, gntp -, installShellFiles -, markdown -, paho-mqtt -, pytest-mock -, pytest-xdist -, pytestCheckHook -, pythonOlder -, pyyaml -, requests -, requests-oauthlib +{ + lib, + babel, + buildPythonPackage, + click, + cryptography, + fetchPypi, + gntp, + installShellFiles, + markdown, + paho-mqtt, + pytest-mock, + pytest-xdist, + pytestCheckHook, + pythonOlder, + pyyaml, + requests, + requests-oauthlib, + setuptools, }: buildPythonPackage rec { pname = "apprise"; - version = "1.7.6"; - format = "setuptools"; + version = "1.8.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-B38JMJzIpskGPb1hSzQ4B9Un1UZpO3/o/FpEM1Av6mw="; + hash = "sha256-6PWM6/6ho09WnLTGiAmjF1voDsBvCi7Ec1IrkgIyEsU="; }; - nativeBuildInputs = [ - installShellFiles + nativeBuildInputs = [ installShellFiles ]; + + build-system = [ + babel + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ click cryptography markdown @@ -43,7 +48,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - babel gntp paho-mqtt pytest-mock @@ -53,7 +57,11 @@ buildPythonPackage rec { disabledTests = [ "test_apprise_cli_nux_env" + # Nondeterministic. Fails with `assert 0 == 1` + "test_notify_emoji_general" "test_plugin_mqtt_general" + # Nondeterministic. Fails with `AssertionError` + "test_plugin_xbmc_kodi_urls" ]; disabledTestPaths = [ @@ -65,16 +73,14 @@ buildPythonPackage rec { installManPage packaging/man/apprise.1 ''; - pythonImportsCheck = [ - "apprise" - ]; + pythonImportsCheck = [ "apprise" ]; meta = with lib; { description = "Push Notifications that work with just about every platform"; homepage = "https://github.com/caronc/apprise"; changelog = "https://github.com/caronc/apprise/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ getchoo ]; mainProgram = "apprise"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix index b396c69a61..9898dffe82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix @@ -5,7 +5,6 @@ , buildPythonPackage , empty-files , fetchFromGitHub -, fetchpatch2 , mock , mrjob , numpy @@ -21,7 +20,7 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "11.1.3"; + version = "11.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,16 +29,9 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-VqE2Oj3b+ZfKT+fhJ9DxBClfa8Wz8w/puAnAotN3eG4="; + hash = "sha256-oG1TH9F8IYDZWLuL2TIesNuZQVzGQRqkGk502HTG+O8="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/approvals/ApprovalTests.Python/commit/dac7c8a8aa62f31dca7a687d4dbf08158351d5e1.patch"; - hash = "sha256-TMyfXNtzpGci6tdFRhxiKJRjCWRD5LkaffPY8EVj53E="; - }) - ]; - build-system = [ setuptools ]; @@ -79,6 +71,6 @@ buildPythonPackage rec { homepage = "https://github.com/approvals/ApprovalTests.Python"; changelog = "https://github.com/approvals/ApprovalTests.Python/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix index 771d9a3d02..7de46a5216 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "apscheduler"; version = "3.10.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -29,11 +29,12 @@ buildPythonPackage rec { hash = "sha256-5t8HGyfZvomOSGvHlAp75QtK8unafAjwdEqW1L1M70o="; }; - buildInputs = [ + build-system = [ + setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ pytz setuptools six @@ -51,7 +52,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ - --replace " --cov --tb=short" "" + --replace-fail " --cov --tb=short" "" ''; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aranet4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aranet4/default.nix index d6fda0fb4f..cc1c93c867 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aranet4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aranet4/default.nix @@ -1,11 +1,12 @@ -{ lib -, bleak -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, requests -, setuptools +{ + lib, + bleak, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { @@ -22,22 +23,16 @@ buildPythonPackage rec { hash = "sha256-j53d2Ki9xVWGHWkAu1wkjYE56Xq7kfMmqQrQiKrBg2I="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ bleak requests ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "aranet4" - ]; + pythonImportsCheck = [ "aranet4" ]; disabledTests = [ # Test compares rendered output @@ -46,9 +41,9 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with Aranet4 devices"; - mainProgram = "aranetctl"; homepage = "https://github.com/Anrijs/Aranet4-Python"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "aranetctl"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 166202355d..47eef407bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.99"; + version = "9.2.102"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-f0dcWNNl8reakQoSUcbi3RziTM17fgGYcAe3Ac9wQsI="; + hash = "sha256-aZwU/i1tBT6M5+PNR77vYzPKklWERXhvG1kknwC0RQQ="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix index 4427e75089..363b07758a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "argcomplete"; - version = "3.2.3"; + version = "3.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kislyuk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sGXHRHmzapJM/c4D4j3QWhkTNzPNZPLO7JOptnTXuR8="; + hash = "sha256-ekTmT6jYkC36X2e0ukwHfDGwdPg3jK8jML2naBCgNI8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argilla/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argilla/default.nix index d3b87ca99f..2d2e25a83e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argilla/default.nix @@ -1,145 +1,98 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pythonRelaxDepsHook -, deprecated -, rich -, backoff -, packaging -, pydantic -, typer -, tqdm -, wrapt -, numpy -, httpx -, pandas -, monotonic -# optional-dependencies -, fastapi -, opensearch-py -, elasticsearch8 -, uvicorn -, smart-open -, brotli-asgi -, alembic -, sqlalchemy -, greenlet -, aiosqlite -, luqum -, scikit-learn -, aiofiles -, pyyaml -, python-multipart -, python-jose -, passlib -, psutil -# , segment-analytics-python -, asyncpg -, psycopg2 -, schedule -, prodict -, cleanlab -, datasets -, huggingface-hub +{ + lib, + aiofiles, + aiosqlite, + alembic, + asyncpg, + backoff, + brotli-asgi, + buildPythonPackage, + cleanlab, + datasets, + deprecated, + elasticsearch8, + evaluate, + factory-boy, + faiss, + fastapi, + fetchFromGitHub, + flyingsquid, + greenlet, + httpx, + huggingface-hub, + luqum, + monotonic, + numpy, + openai, + opensearch-py, + packaging, + pandas, + passlib, + peft, + pgmpy, + plotly, + prodict, + psutil, + psycopg2, + pydantic, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + python-jose, + python-multipart, + pythonOlder, + pythonRelaxDepsHook, + pyyaml, + rich, + schedule, + scikit-learn, + sentence-transformers, + seqeval, + setuptools, + smart-open, + snorkel, + spacy, + spacy-transformers, + sqlalchemy, + tqdm, + transformers, + typer, + uvicorn, + wrapt, # , flair -, faiss -, flyingsquid -, pgmpy -, plotly -, snorkel -, spacy -, transformers -, evaluate -, seqeval # , setfit +# , spacy-huggingface-hub # , span_marker -, openai -, peft -# test dependencies -, pytestCheckHook -, pytest-cov -, pytest-mock -, pytest-asyncio -, factory-boy +# , trl }: -let + +buildPythonPackage rec { pname = "argilla"; - version = "1.27.0"; - optional-dependencies = { - server = [ - fastapi - opensearch-py - elasticsearch8 - uvicorn - smart-open - brotli-asgi - alembic - sqlalchemy - greenlet - aiosqlite - luqum - scikit-learn - aiofiles - pyyaml - python-multipart - python-jose - passlib - psutil - # segment-analytics-python - ] ++ - elasticsearch8.optional-dependencies.async ++ - uvicorn.optional-dependencies.standard ++ - python-jose.optional-dependencies.cryptography ++ - passlib.optional-dependencies.bcrypt; - postgresql = [ asyncpg psycopg2 ]; - listeners = [ schedule prodict ]; - integrations = [ - pyyaml - cleanlab - datasets - huggingface-hub - # flair - faiss - flyingsquid - pgmpy - plotly - snorkel - spacy - transformers - evaluate - seqeval - # setfit - # span_marker - openai - peft - ] ++ transformers.optional-dependencies.torch; - }; -in -buildPythonPackage { - inherit pname version; - format = "setuptools"; + version = "1.28.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "argilla-io"; - repo = pname; + repo = "argilla"; rev = "refs/tags/v${version}"; - hash = "sha256-CBVP/+XFKnJBMcxsDd7lgQ1JFX7zFlHmdBwkAMmq85g="; + hash = "sha256-gQpJ2umi3IE5BhRu3bM7ONPIP0hb2YG37jGvDKQHZWA="; }; pythonRelaxDeps = [ - "typer" - "rich" + "httpx" "numpy" + "rich" + "typer" + "wrapt" ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ httpx deprecated packaging @@ -154,7 +107,67 @@ buildPythonPackage { typer ]; - # still quite a bit of optional dependencies missing + passthru.optional-dependencies = { + server = + [ + aiofiles + aiosqlite + alembic + brotli-asgi + elasticsearch8 + fastapi + greenlet + luqum + opensearch-py + passlib + psutil + python-jose + python-multipart + pyyaml + scikit-learn + smart-open + sqlalchemy + uvicorn + ] + ++ elasticsearch8.optional-dependencies.async + ++ uvicorn.optional-dependencies.standard + ++ python-jose.optional-dependencies.cryptography + ++ passlib.optional-dependencies.bcrypt; + postgresql = [ + asyncpg + psycopg2 + ]; + listeners = [ + schedule + prodict + ]; + integrations = [ + cleanlab + datasets + evaluate + faiss + flyingsquid + huggingface-hub + openai + peft + pgmpy + plotly + pyyaml + sentence-transformers + seqeval + snorkel + spacy + spacy-transformers + transformers + # flair + # setfit + # span_marker + # trl + # spacy-huggingface-hub + ] ++ transformers.optional-dependencies.torch; + }; + + # Still quite a bit of optional dependencies missing doCheck = false; preCheck = '' @@ -163,26 +176,19 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook - pytest-cov pytest-mock pytest-asyncio factory-boy - ] - ++ optional-dependencies.server - ++ optional-dependencies.postgresql - ++ optional-dependencies.listeners - ++ optional-dependencies.integrations; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pytestFlagsArray = [ "--ignore=tests/server/datasets/test_dao.py" ]; - - passthru.optional-dependencies = optional-dependencies; + disabledTestPaths = [ "tests/server/datasets/test_dao.py" ]; meta = with lib; { - description = "Argilla: the open-source data curation platform for LLMs"; - mainProgram = "argilla"; + description = "Open-source data curation platform for LLMs"; homepage = "https://github.com/argilla-io/argilla"; changelog = "https://github.com/argilla-io/argilla/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; + mainProgram = "argilla"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argostranslate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argostranslate/default.nix index 57ea8db15a..f631da6ea8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argostranslate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argostranslate/default.nix @@ -18,13 +18,13 @@ let in buildPythonPackage rec { pname = "argostranslate"; - version = "1.9.3"; + version = "1.9.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N1Dh8238cDKpIMeQT645lDvYMbOWjVqGuWxt37+TQmQ="; + sha256 = "sha256-3YzBMnqmcTIpn5UOFg3SDTFLjPSE9UDw0i8fB8LYh2s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/art/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/art/default.nix index c1fbd475bc..3b64d92732 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/art/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/art/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "art"; - version = "6.1"; + version = "6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "art"; - rev = "v${version}"; - hash = "sha256-RJexYOGWwAwxQ7lWGgXzFSR2aly1twB9pC4QFs5m7k8="; + rev = "refs/tags/v${version}"; + hash = "sha256-lFe6J3R+A1WE+LGywupjOGwhOcrUH5JE26Cit0DaT/4="; }; pythonImportsCheck = [ "art" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix index a37a70844d..bdad7887ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix @@ -1,18 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook , pythonOlder -, requests -, requests-oauthlib -, responses +, setuptools +, certifi , six +, python-dateutil +, urllib3 +, pytestCheckHook }: buildPythonPackage rec { pname = "asana"; version = "5.0.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,15 +24,17 @@ buildPythonPackage rec { hash = "sha256-9F63DvwMh9NwlTqFuhiXfgRRRxAFjjRYmYzsuOhlQJ0="; }; - propagatedBuildInputs = [ - requests - requests-oauthlib + build-system = [ setuptools ]; + + dependencies = [ + certifi six + python-dateutil + urllib3 ]; nativeCheckInputs = [ pytestCheckHook - responses ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asciitree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asciitree/default.nix index 323e1fbf87..2067936536 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asciitree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asciitree/default.nix @@ -1,28 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytest +, setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "asciitree"; version = "0.3.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mbr"; - repo = pname; + repo = "asciitree"; rev = version; - sha256 = "071wlpyi8pa262sj9xdy0zbj163z84dasxad363z3sfndqxw78h1"; + hash = "sha256-AaLDO27W6fGHGU11rRpBf5gg1we+9SS1MEJdFP2lPBw="; }; - nativeCheckInputs = [ - pytest + build-system = [ + setuptools ]; - checkPhase = '' - pytest - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Draws ASCII trees"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix index a6508229a3..43fa7ae2fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix @@ -1,98 +1,73 @@ { lib , asdf-standard , asdf-transform-schemas -, astropy +, attrs , buildPythonPackage , fetchFromGitHub -, fetchpatch -, importlib-resources +, fsspec +, importlib-metadata , jmespath -, jsonschema , lz4 , numpy , packaging -, pytest-astropy +, psutil +, pytest-remotedata , pytestCheckHook , pythonOlder , pyyaml , semantic-version +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "asdf"; - version = "2.13.0"; - format = "pyproject"; + version = "3.2.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "asdf-format/"; - repo = pname; + owner = "asdf-format"; + repo = "asdf"; rev = "refs/tags/${version}"; - hash = "sha256-u8e7ot5NDRqQFH0eLVnGinBQmQD73BlR5K9HVjA7SIg="; + hash = "sha256-r+cEv6g7fq3I/h2mlszzJRQcazy7qP9pg0hfYG/Sa9E="; }; - patches = [ - # Fix default validation, https://github.com/asdf-format/asdf/pull/1203 - (fetchpatch { - name = "default-validation.patch"; - url = "https://github.com/asdf-format/asdf/commit/6f79f620b4632e20178d9bd53528702605d3e976.patch"; - hash = "sha256-h/dYhXRCf5oIIC+u6+8C91mJnmEzuNmlEzqc0UEhLy0="; - excludes = [ - "CHANGES.rst" - ]; - }) - ]; - - postPatch = '' - # https://github.com/asdf-format/asdf/pull/1203 - substituteInPlace pyproject.toml \ - --replace "'jsonschema >=4.0.1, <4.10.0'," "'jsonschema >=4.0.1'," - ''; - - nativeBuildInputs = [ + build-system = [ + setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ asdf-standard asdf-transform-schemas + importlib-metadata jmespath - jsonschema numpy packaging pyyaml semantic-version - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources + attrs ]; nativeCheckInputs = [ - astropy + fsspec lz4 - pytest-astropy + psutil + pytest-remotedata pytestCheckHook ]; - preCheck = '' - export PY_IGNORE_IMPORTMISMATCH=1 - ''; pythonImportsCheck = [ "asdf" ]; - disabledTests = [ - "config.rst" - ]; - meta = with lib; { description = "Python tools to handle ASDF files"; homepage = "https://github.com/asdf-format/asdf"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - # Many tests fail, according to Hydra - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix index ed3c019146..087e7415b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix @@ -2,18 +2,24 @@ , fetchPypi , buildPythonPackage , isPy27 +, pythonAtLeast +, setuptools , numpy , scipy , matplotlib , flask , pillow , psycopg2 +, pytestCheckHook +, pytest-mock +, pytest-xdist }: buildPythonPackage rec { pname = "ase"; version = "3.22.1"; - format = "setuptools"; + pyproject = true; + disabled = isPy27; src = fetchPypi { @@ -21,15 +27,29 @@ buildPythonPackage rec { hash = "sha256-AE32sOoEsRFMeQ+t/kXUEl6w5TElxmqTQlr4U9gqtDI="; }; - propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; + build-system = [ setuptools ]; - checkPhase = '' - $out/bin/ase test + dependencies = [ numpy scipy matplotlib flask pillow psycopg2 ]; + + nativeCheckInputs = [ pytestCheckHook pytest-mock pytest-xdist ]; + + disabledTests = [ + "test_fundamental_params" + "test_ase_bandstructure" + "test_imports" + "test_units" + "test_favicon" + "test_vibrations_methods" # missing attribute + "test_jmol_roundtrip" # missing attribute + ] + ++ lib.optionals (pythonAtLeast "3.12") [ + "test_info_calculators" + ]; + + preCheck = '' + export PATH="$out/bin:$PATH" ''; - # tests just hang most likely due to something with subprocesses and cli - doCheck = false; - pythonImportsCheck = [ "ase" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asgineer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asgineer/default.nix index 9bd266aa19..c1fae6959a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asgineer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asgineer/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "asgineer"; - version = "0.8.1"; + version = "0.8.2"; format = "setuptools"; # PyPI tarball doesn't include tests directory src = fetchFromGitHub { owner = "almarklein"; repo = pname; - rev = "v${version}"; - sha256 = "0hd1i9pc8m7sc8bkn31q4ygkmnl5vklrcziq9zkdiqaqm8clyhcx"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-UYnVlsdEhEAJF21zVmjAXX01K6LQR2I+Dfw5tSsmf5E="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix index 1af34b43fc..1f66b49869 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix @@ -6,12 +6,13 @@ , isPy27 , pytestCheckHook , pythonAtLeast +, setuptools }: buildPythonPackage rec { pname = "aspell-python"; version = "1.15"; - format = "setuptools"; + pyproject = true; disabled = isPy27; @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-IEKRDmQY5fOH9bQk0dkUAy7UzpBOoZW4cNtVvLMcs40="; }; + build-system = [ + setuptools + ]; + buildInputs = [ aspell ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix index 0fc6631dd5..d625dfe344 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix @@ -1,41 +1,36 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools-scm +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools-scm, }: buildPythonPackage rec { pname = "asteval"; - version = "0.9.31"; - format = "setuptools"; + version = "0.9.32"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "newville"; - repo = pname; + owner = "lmfit"; + repo = "asteval"; rev = "refs/tags/${version}"; - hash = "sha256-XIRDm/loZOOPQ7UO/XAo86TzhtHHRrnWFU7MNI4f1vM="; + hash = "sha256-3eML5lEKEUlp3Fwdgvk31an83x8no5ichskKvzYJDsE="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace " --cov=asteval --cov-report xml" "" + --replace-fail " --cov=asteval --cov-report xml" "" ''; - nativeBuildInputs = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "asteval" - ]; + pythonImportsCheck = [ "asteval" ]; disabledTests = [ # AssertionError: 'ImportError' != None @@ -44,8 +39,8 @@ buildPythonPackage rec { meta = with lib; { description = "AST evaluator of Python expression using ast module"; - homepage = "https://github.com/newville/asteval"; - changelog = "https://github.com/newville/asteval/releases/tag/${version}"; + homepage = "https://github.com/lmfit/asteval"; + changelog = "https://github.com/lmfit/asteval/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix index 23db660f95..26be340596 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix @@ -14,17 +14,22 @@ buildPythonPackage rec { pname = "astropy-healpix"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchPypi { inherit version; pname = lib.replaceStrings ["-"] ["_"] pname; - hash = "sha256-BW+m7ZOWvtx3HTdNh3zeg9lGCj9ip4/gXb+boDlAMjo="; + hash = "sha256-3l0qfsl7FnBFBmlx8loVDR5AYfBxWb4jZJY02zbnl0Y="; }; + postPatch = '' + substituteInPlace pyproject.toml --replace "numpy>=2.0.0rc1" "numpy" + ''; + nativeBuildInputs = [ astropy-extension-helpers + numpy setuptools setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix index 610238559a..79bb6b03c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix @@ -10,6 +10,8 @@ , pillow , pytest , pytest-astropy +, pytest-dependency +, pytest-rerunfailures , pytestCheckHook , pyvo , astropy-helpers @@ -19,12 +21,12 @@ buildPythonPackage rec { pname = "astroquery"; - version = "0.4.6"; + version = "0.4.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-MHylVMtzSgypoi+G9e/+fkE6+ROuZeFXiXLYR7H+E+4="; + hash = "sha256-BH+6ywpPrsTNtiZ16RnCRMHDXmYQRPy7bJqTMzF0fsk="; }; disabled = !isPy3k; @@ -46,11 +48,16 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ matplotlib pillow pytest pytest-astropy - pytestCheckHook + pytest-dependency + pytest-rerunfailures ]; pytestFlagsArray = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix index f999cd3b3b..cdd6ac9b97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -1,32 +1,33 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchFromGitHub -, pytest-asyncio -, pytestCheckHook -, pythonOlder +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "asyncio-dgram"; - version = "2.1.2"; - format = "setuptools"; + version = "2.2.0"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jsbronder"; - repo = pname; - rev = "refs/tagsv${version}"; + repo = "asyncio-dgram"; + rev = "refs/tags/v${version}"; hash = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q="; }; - nativeCheckInputs = [ - pytestCheckHook - ]; + build-system = [ setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio + pytestCheckHook ]; # OSError: AF_UNIX path too long @@ -38,9 +39,7 @@ buildPythonPackage rec { "test_from_socket_bad_socket" ]; - pythonImportsCheck = [ - "asyncio_dgram" - ]; + pythonImportsCheck = [ "asyncio_dgram" ]; meta = with lib; { description = "Python support for higher level Datagram"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix index 735e831c03..993947d5d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , bcrypt , buildPythonPackage , cryptography @@ -15,13 +14,14 @@ , pytestCheckHook , python-pkcs11 , pythonOlder +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "asyncssh"; version = "2.14.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -30,14 +30,19 @@ buildPythonPackage rec { hash = "sha256-6Va/iYjQega6MwX2YE4mH0ygFMSiMvCHPxx2kvvjz8I="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cryptography - libsodium nettle typing-extensions ]; - passthru.optional-dependencies = { + buildInputs = [ + libsodium + ]; + + optional-dependencies = { bcrypt = [ bcrypt ]; @@ -64,7 +69,7 @@ buildPythonPackage rec { openssh openssl pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); patches = [ # Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix index 084c9ee8d3..938ff02ce7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix @@ -1,19 +1,20 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, python-socks -, pythonOlder -, setuptools -, tldextract -, whodap +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + python-socks, + pythonOlder, + setuptools, + tldextract, + whodap, }: buildPythonPackage rec { pname = "asyncwhois"; - version = "1.1.0"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,14 +23,17 @@ buildPythonPackage rec { owner = "pogzyb"; repo = "asyncwhois"; rev = "refs/tags/v${version}"; - hash = "sha256-rJwJhSOFrZZ3WXEZmPMfdosBBW/R5/PMqs0QLnsPMoI="; + hash = "sha256-ESVgK4Z26OAamdHPEVxysnlJ0rEUlr8KNd24fawHuEg="; }; - nativeBuildInputs = [ - setuptools - ]; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "python-socks[asyncio]" "python-socks" + ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ python-socks tldextract whodap @@ -41,11 +45,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "python-socks[asyncio]" "python-socks" - ''; - disabledTests = [ # Tests require network access "test_pywhois_aio_get_hostname_from_ip" @@ -63,9 +62,7 @@ buildPythonPackage rec { "test__get_top_level_domain" ]; - pythonImportsCheck = [ - "asyncwhois" - ]; + pythonImportsCheck = [ "asyncwhois" ]; meta = with lib; { description = "Python module for retrieving WHOIS information"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix index a245c93e36..fca4cd88e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix @@ -22,10 +22,10 @@ , pythonRelaxDepsHook }: -buildPythonPackage rec { - version = "unstable-2023-07-28"; +buildPythonPackage { pname = "atomman"; - format = "pyproject"; + version = "1.4.6-unstable-2023-07-28"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -36,14 +36,16 @@ buildPythonPackage rec { hash = "sha256-WfB+OY61IPprT6OCVHl8VA60p7lLVkRGuyYX+nm7bbA="; }; - nativeBuildInputs = [ + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + build-system = [ setuptools wheel - pythonRelaxDepsHook + numpy + cython ]; - propagatedBuildInputs = [ - cython + dependencies = [ datamodeldict matplotlib numericalunits diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix index 41cbe28b8a..616581ffc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix @@ -3,25 +3,25 @@ , fetchPypi , pytestCheckHook , pythonOlder -, pdm-backend +, hatchling , sybil , typing-extensions }: buildPythonPackage rec { pname = "atpublic"; - version = "4.0"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-D0BDMhnhJO3xFcbDY4CMpvDhz6fRYNhrL7lHkwhtEpQ="; + hash = "sha256-0cjNkxr3Rh9tGLxgYzg+hlTZ6e8Z1Y7m3AHoUVu/Vd8="; }; nativeBuildInputs = [ - pdm-backend + hatchling ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atsim-potentials/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atsim-potentials/default.nix index b06ef867c2..d391ef7453 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atsim-potentials/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atsim-potentials/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchFromGitHub +, setuptools , configparser , pyparsing , pytestCheckHook @@ -14,23 +16,22 @@ }: buildPythonPackage rec { - version = "0.4.1"; - format = "setuptools"; pname = "atsim-potentials"; + version = "0.4.1"; + pyproject = true; src = fetchFromGitHub { owner = "mjdrushton"; - repo = pname; + repo = "atsim-potentials"; rev = "refs/tags/${version}"; hash = "sha256-G7lNqwEUwAT0f7M2nUTCxpXOAl6FWKlh7tcsvbur1eM="; }; - postPatch = '' - # Remove conflicting openpyxl dependency version check - sed -i '/openpyxl==2.6.4/d' setup.py - ''; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ cexprtk configparser future @@ -46,10 +47,21 @@ buildPythonPackage rec { pytestCheckHook ]; + # these files try to import `distutils` removed in Python 3.12 + disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [ + "tests/config/test_configuration_eam.py" + "tests/config/test_configuration_eam_fs.py" + "tests/config/test_configuration_pair.py" + "tests/test_dlpoly_writeTABEAM.py" + "tests/test_documentation_examples.py" + "tests/test_eam_adp_writer.py" + "tests/test_gulp_writer.py" + "tests/test_lammpsWriteEAM.py" + ]; + disabledTests = [ # Missing lammps executable "eam_tabulate_example2TestCase" - "test_pymath" ]; pythonImportsCheck = [ "atsim.potentials" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/attacut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/attacut/default.nix new file mode 100644 index 0000000000..70e8a98ccf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/attacut/default.nix @@ -0,0 +1,73 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + + setuptools, + + pytestCheckHook, + + docopt, + fire, + numpy, + python-crfsuite, + pyyaml, + six, + ssg, + torch, +}: + +buildPythonPackage rec { + pname = "attacut"; + version = "1.1.0-dev"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PyThaiNLP"; + repo = "attacut"; + rev = "refs/tags/v${version}"; + hash = "sha256-x3JJC1Xd+tsOAHJEHGzIrhIrNGSvLSanAFc7+uXb2Kk="; + }; + + # no more need, see patch... + postPatch = '' + sed -i "/nptyping>=/d" setup.py + ''; + + patches = [ + (fetchpatch { + name = "fix-nptyping-deprecated-array.patch"; + url = "https://github.com/PyThaiNLP/attacut/commit/a707297b3f08a015d32d8ac241aa8cb11128cbd4.patch"; + includes = [ "attacut/evaluation.py" ]; + hash = "sha256-k2DJPwiH1Fyf5u6+zavx0bankCXsJVZrw1MGcf8ZL+M="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ + docopt + fire + numpy + python-crfsuite + pyyaml + six + ssg + torch + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests/*" ]; + + pythonImportsCheck = [ "attacut" ]; + + meta = with lib; { + description = "A Fast and Accurate Neural Thai Word Segmenter"; + homepage = "https://github.com/PyThaiNLP/attacut"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + mainProgram = "attacut-cli"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix index b810544e40..7ce07795bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , numpy , pytestCheckHook , stdenv @@ -10,18 +11,22 @@ buildPythonPackage rec { pname = "aubio"; version = "0.4.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "aubio"; + repo = "aubio"; rev = version; - sha256 = "0fhxikvlr010nbh02g455d5y8bq6j5yw180cdh4gsd0hb43y3z26"; + hash = "sha256-RvzhB1kQNP0IbAygwH2RBi/kSyuFPAHgsiCATPeMHTo="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Accelerate AudioToolbox CoreVideo CoreGraphics ]); - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix index 427faa4fe3..6d85e2b184 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , stdenv , AudioToolbox , AudioUnit @@ -10,7 +11,9 @@ buildPythonPackage rec { pname = "audiotools"; version = "3.1.1"; - format = "setuptools"; + pyproject = true; + + build-system = [ setuptools ]; buildInputs = lib.optionals stdenv.isDarwin [ AudioToolbox diff --git a/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix index 2ab159cfc6..3be4c47136 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "augmax"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disbaled = pythonOlder "3.6"; @@ -19,14 +19,17 @@ buildPythonPackage rec { owner = "khdlr"; repo = "augmax"; rev = "refs/tags/v${version}"; - hash = "sha256-hDNNoE7KVaH3jrXZA4A8f0UoQJPl6KHA3XwMc3Ccohk="; + hash = "sha256-xz6yJiVZUkRcRa2rKZdytfpP+XCk/QI4xtKlNaS9FYo="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ einops jax ]; + dependencies = [ + einops + jax + ]; # augmax does not have any tests at the time of writing (2022-02-19), but # jaxlib is necessary for the pythonImportsCheckPhase. @@ -37,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Efficiently Composable Data Augmentation on the GPU with Jax"; homepage = "https://github.com/khdlr/augmax"; - changelog = "https://github.com/khdlr/augmax/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/khdlr/augmax/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ samuela ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix index 2bfbc16e8f..238dbd8bba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix @@ -34,6 +34,7 @@ # , pytrie , rlp , service-identity +, setuptools , spake2 , twisted , txaio @@ -49,7 +50,7 @@ buildPythonPackage rec { pname = "autobahn"; version = "23.6.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -60,10 +61,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "pytest>=2.8.6,<3.3.0" "pytest" + --replace-fail "pytest>=2.8.6,<3.3.0" "pytest" ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ cryptography hyperlink pynacl @@ -74,9 +79,9 @@ buildPythonPackage rec { mock pytest-asyncio_0_21 pytestCheckHook - ] ++ passthru.optional-dependencies.scram - ++ passthru.optional-dependencies.serialization - ++ passthru.optional-dependencies.xbr; + ] ++ optional-dependencies.scram + ++ optional-dependencies.serialization + ++ optional-dependencies.xbr; preCheck = '' # Run asyncio tests (requires twisted) @@ -91,7 +96,7 @@ buildPythonPackage rec { "autobahn" ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { all = accelerate ++ compress ++ encryption ++ nvx ++ serialization ++ scram ++ twisted ++ ui ++ xbr; accelerate = [ /* wsaccel */ ]; compress = [ python-snappy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix index b574728670..7d2f6c14a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , cython , fetchFromGitHub +, fetchpatch , ffmpeg_5-headless , numpy , pillow @@ -26,6 +27,15 @@ buildPythonPackage rec { hash = "sha256-pCKP+4ZmZCJcG7/Qy9H6aS4svQdgaRA9S1QVNWFYhSQ="; }; + patches = [ + # merged upstream PR: https://github.com/PyAV-Org/PyAV/pull/1387 + (fetchpatch { + name = "use-pkg-config-env-var-fix-cross.patch"; + url = "https://github.com/PyAV-Org/PyAV/commit/ba7a2c9f716af506838d399e6ed27ed6d64d2435.patch"; + sha256 = "sha256-oH+g8sVoVCQe6DimRN38VT2GdziriwHYRAhldNxz9/E="; + }) + ]; + nativeBuildInputs = [ cython pkg-config diff --git a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix index b023936e43..4b1f85e7d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , pythonOlder +, setuptools , fetchPypi , typing-extensions , pytestCheckHook @@ -9,8 +10,9 @@ buildPythonPackage rec { pname = "avro"; version = "1.11.3"; - format = "setuptools"; + pyproject = true; + # distutils usage: https://github.com/search?q=repo%3Aapache%2Favro%20distutils&type=code disabled = pythonOlder "3.6"; src = fetchPypi { @@ -18,10 +20,19 @@ buildPythonPackage rec { hash = "sha256-M5O7UTn5zweR0gV1bOHjmltYWGr1sVPWo7WhmWEOnRc="; }; + postPatch = lib.optionalString (!pythonOlder "3.12") '' + substituteInPlace avro/test/test_tether_word_count.py \ + --replace-fail 'distutils' 'setuptools._distutils' + ''; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/avwx-engine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/avwx-engine/default.nix new file mode 100644 index 0000000000..ccaaa09e5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/avwx-engine/default.nix @@ -0,0 +1,84 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + geopy, + httpx, + numpy, + poetry-core, + pytestCheckHook, + pytest-asyncio, + python-dateutil, + pythonOlder, + rapidfuzz, + scipy, + shapely, + time-machine, + xmltodict, +}: + +buildPythonPackage rec { + pname = "avwx-engine"; + version = "1.8.28"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "avwx-rest"; + repo = "avwx-engine"; + rev = "refs/tags/${version}"; + hash = "sha256-sxOLhcmTJg/dTrtemr9BcfcBoHTP1eGo8U1ab8iSvUM="; + }; + + postPatch = '' + sed -i -e "/--cov/d" -e "/--no-cov/d" pyproject.toml + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + geopy + httpx + python-dateutil + xmltodict + ]; + + passthru.optional-dependencies = { + all = [ + numpy + rapidfuzz + scipy + shapely + ]; + fuzz = [ rapidfuzz ]; + scipy = [ + numpy + scipy + ]; + shape = [ shapely ]; + }; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + time-machine + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ "avwx" ]; + + disabledTests = [ + # Tests require network access + "fetch" + "test_nbm_all" + "test_station_nearest_ip" + ]; + + meta = with lib; { + description = "Aviation Weather parsing engine"; + homepage = "https://github.com/avwx-rest/avwx-engine"; + changelog = "https://github.com/avwx-rest/avwx-engine/blob/${version}/changelog.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix index bd5c3197a0..e7d43e5cfa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,24 +11,24 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "32"; + version = "33"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-rYxa+GIG+w9DSxZ0nMXMppoVqI4WykPpHlbFzKd0IfA="; + hash = "sha256-VQrevM0ynRjQLpUibQuJaYGI/TPkTwdFCULGkogZJ9g="; }; - nativeBuildInputs = [ + build-system = [ cmake ninja pybind11 scikit-build-core ] ++ scikit-build-core.optional-dependencies.pyproject; - propagatedBuildInputs = [ + dependencies = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix index 41043eef5d..31e9217842 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.6.3"; + version = "2.6.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,15 +33,15 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-zII5TZ0bzVEo5hTrLr45N7oL3lYhkCyNfZif+0vkEo4="; + hash = "sha256-hoNxNxWfoSlBg6CsKvgEknM4vd+rN/9EFD5nC2y45OA="; }; - nativeBuildInputs = [ + build-system = [ hatch-fancy-pypi-readme hatchling ]; - propagatedBuildInputs = [ + dependencies = [ awkward-cpp fsspec importlib-metadata @@ -75,6 +75,9 @@ buildPythonPackage rec { # The following tests have been disabled because they need to be run on a GPU platform. disabledTestPaths = [ "tests-cuda" + # Disable tests dependending on jax on darwin + ] ++ lib.optionals stdenv.isDarwin [ + "tests/test_2603_custom_behaviors_with_jax.py" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index 3343c46241..d5d0cb5891 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.20.6"; + version = "0.20.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4LcUK7Zx1EVE2HlyhUbf1NnH7EYNEyJNXacwvqePkW0="; + hash = "sha256-JDeFrJ7mSUXgR5wjhDJVRfKVl1dXQ86Ew3FVbRAU5j4="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix index ad861143dc..b222c5703c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix @@ -1,32 +1,33 @@ -{ backoff -, sparqlwrapper -, boto3 -, buildPythonPackage -, fetchFromGitHub -, gremlinpython -, jsonpath-ng -, lib -, moto -, openpyxl -, opensearch-py -, pandas -, pg8000 -, poetry-core -, progressbar2 -, pyarrow -, pymysql -, pyodbc -, pyparsing -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, redshift-connector -, requests-aws4auth +{ + backoff, + sparqlwrapper, + boto3, + buildPythonPackage, + fetchFromGitHub, + gremlinpython, + jsonpath-ng, + lib, + moto, + openpyxl, + opensearch-py, + pandas, + pg8000, + poetry-core, + progressbar2, + pyarrow, + pymysql, + pyodbc, + pyparsing, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + redshift-connector, + requests-aws4auth, }: buildPythonPackage rec { pname = "awswrangler"; - version = "3.7.2"; + version = "3.7.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,16 +36,17 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-1eb2oTiRNxA2XTpkScA5WJutN5P6FX96jC4Ra9VdonI="; + hash = "sha256-gm6ieteW+NcY+AOLcMZLUPcSi2Z/Mo27rzd1i9imp5I="; }; + pythonRelaxDeps = [ "packaging" ]; + build-system = [ poetry-core - pythonRelaxDepsHook ]; - pythonRelaxDeps = [ - "packaging" + nativeBuildInputs = [ + pythonRelaxDepsHook ]; dependencies = [ @@ -62,12 +64,21 @@ buildPythonPackage rec { requests-aws4auth ]; + passthru.optional-dependencies = { + sqlserver = [ pyodbc ]; + sparql = [ sparqlwrapper ]; + }; + nativeCheckInputs = [ moto pyparsing pytestCheckHook ]; + pythonImportsCheck = [ + "awswrangler" + ]; + pytestFlagsArray = [ # Subset of tests that run in upstream CI (many others require credentials) # https://github.com/aws/aws-sdk-pandas/blob/20fec775515e9e256e8cee5aee12966516608840/.github/workflows/minimal-tests.yml#L36-L43 @@ -77,15 +88,6 @@ buildPythonPackage rec { "tests/unit/test_moto.py" ]; - passthru.optional-dependencies = { - sqlserver = [ - pyodbc - ]; - sparql = [ - sparqlwrapper - ]; - }; - meta = with lib; { description = "Pandas on AWS"; homepage = "https://github.com/aws/aws-sdk-pandas"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ax/default.nix index f0bba36c3c..91da12fc1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ax/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "ax"; - version = "0.3.7"; + version = "0.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UOX8Q7F5c9J1KSfQUy8aoL5CNb9YmEI4X7Fd5B16UqQ="; + hash = "sha256-dj6Gig8N4oLtcZLwPl4QDHG/FwA2nFBtYxSARnWiJJU="; }; nativeBuildInputs = [ @@ -73,6 +73,8 @@ buildPythonPackage rec { "test_get_standard_plots_moo" # AssertionError: Expected 'warning' to be called once. Called 3 times "test_validate_kwarg_typing" + # uses torch.equal + "test_convert_observations" ]; pythonImportsCheck = [ "ax" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix index 535a466451..df687eb52a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix @@ -1,30 +1,43 @@ -{ buildPythonPackage -, lib -, fetchPypi -, six -, requests +{ + lib, + azure-core, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { - version = "4.6.0"; - format = "setuptools"; pname = "azure-cosmos"; + version = "4.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2uxqwgHGRzsJK2Ku5x44G+62w6jcNhJJgytwSMTwYeI="; + hash = "sha256-2uxqwgHGRzsJK2Ku5x44G+62w6jcNhJJgytwSMTwYeI="; }; - propagatedBuildInputs = [ six requests ]; + build-system = [ setuptools ]; + + dependencies = [ + azure-core + typing-extensions + ]; pythonNamespaces = [ "azure" ]; - # requires an active Azure Cosmos service + # Requires an active Azure Cosmos service doCheck = false; + pythonImportsCheck = [ "azure.cosmos" ]; + meta = with lib; { description = "Azure Cosmos DB API"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/cosmos/azure-cosmos"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-cosmos_${version}/sdk/cosmos/azure-cosmos/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix index add836eee0..18e21134a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.15.0"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-TCj8JGt/kmVhDrUmHWWTEYPQGaI9Sw6ZNX+ssubCJ8g="; + hash = "sha256-b/HWZ83Ngdoc6rQvgKC+Y8qEZin1GKki9zF6fjyEThs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index 3b6c5fd88b..7c53f86ca6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -9,14 +9,15 @@ buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "13.0.0"; + version = "13.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-yJ8jTeT4Gu23YSHl5GZ0+zdlC3s+GIxS4ir8z/HBkA4="; + pname = "azure_mgmt_cdn"; + inherit version; + hash = "sha256-Igpr2snnXkwAyEGlnY3j7JAQ4LnhQS3snmwka2GeO/I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix index c4c4582a0f..27ec12780e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -1,49 +1,49 @@ -{ lib -, azure-mgmt-common -, azure-mgmt-core -, buildPythonPackage -, fetchPypi -, isodate -, pythonOlder -, typing-extensions +{ + lib, + azure-mgmt-common, + azure-mgmt-core, + buildPythonPackage, + fetchPypi, + isodate, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "30.6.0"; - format = "setuptools"; + version = "31.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-TYDXI+xtTLlYNhfr7AcW59dLJzKsuu0CPtLjzHBT0A4="; + hash = "sha256-WlscT8GhnssCKhLe0b6LGxVfaXnQP7nvwEZC9gZkS78="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-mgmt-common azure-mgmt-core isodate - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; - pythonNamespaces = [ - "azure.mgmt" - ]; + pythonNamespaces = [ "azure.mgmt" ]; # Module has no tests doCheck = false; - pythonImportsCheck = [ - "azure.mgmt.compute" - ]; + pythonImportsCheck = [ "azure.mgmt.compute" ]; meta = with lib; { description = "This is the Microsoft Azure Compute Management Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/compute/azure-mgmt-compute"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-compute_${version}/sdk/compute/azure-mgmt-compute/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ olcai maxwilson ]; + maintainers = with maintainers; [ + olcai + maxwilson + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 94417bc47e..c03cf25824 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -1,31 +1,30 @@ -{ lib -, azure-common -, azure-mgmt-core -, azure-mgmt-nspkg -, buildPythonPackage -, fetchPypi -, isodate -, pythonOlder -, setuptools +{ + lib, + azure-common, + azure-mgmt-core, + azure-mgmt-nspkg, + buildPythonPackage, + fetchPypi, + isodate, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "29.1.0"; + version = "30.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-RohxeLsQNZM/BvpjEhwaydTFhx8gKuK4a8Svbh47NU8="; + hash = "sha256-bGLmrFkONP7dc5/iSzGzdQcToBRhZpbqjUTHvMgcBrc="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-common azure-mgmt-core isodate @@ -34,9 +33,7 @@ buildPythonPackage rec { # has no tests doCheck = false; - pythonImportsCheck = [ - "azure.mgmt.containerservice" - ]; + pythonImportsCheck = [ "azure.mgmt.containerservice" ]; meta = with lib; { description = "This is the Microsoft Azure Container Service Management Client Library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 7f760eecf3..9bbf7cec42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "6.1.0"; + version = "7.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-9WMsfVh9ca/nbbTPVuj1BwhIv6kGZlPbTzqzhvadBps="; + hash = "sha256-99uvyPwzRnUxp4ePA5Xa19QVTRvkAjvHDVIGgbcBP7o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix index 2e3c750c3b..1ba6379d88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix @@ -1,38 +1,44 @@ -{ azure-common -, azure-mgmt-core -, buildPythonPackage -, fetchPypi -, lib -, msrest -, msrestazure +{ + lib, + azure-common, + azure-mgmt-core, + buildPythonPackage, + fetchPypi, + isodate, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-frontdoor"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "sha256-GqrJNNcQrNffgqRywgaJ2xkwy+fOJai/RlSVkpw6NWg="; + pname = "azure_mgmt_frontdoor"; + inherit version; + hash = "sha256-DSV/vIE6r0wgPLpHfT4ODqNoxzeCPIlAksmsnEuExSg="; }; - propagatedBuildInputs = [ - msrest - msrestazure + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core + isodate ]; - # has no tests + # Tests are only available in mono repo doCheck = false; pythonImportsCheck = [ "azure.mgmt.frontdoor" ]; meta = with lib; { description = "Microsoft Azure Front Door Service Client Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/network/azure-mgmt-frontdoor"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-frontdoor_${version}/sdk/network/azure-mgmt-frontdoor/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ sephi ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 5f6377d54e..5399eef058 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "2.5.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XxowjEhYx5uD/4vY5hGSCSvcarmdbdc5Y2GLHciEurU="; + hash = "sha256-3yEt+t+8xlnDEjHD4XCqt8IRRNFysPiCaKsPWtjpWII="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 7f8ab5b19a..5504636c04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -1,25 +1,29 @@ -{ lib -, azure-common -, azure-mgmt-core -, buildPythonPackage -, fetchPypi -, isodate -, pythonOlder +{ + lib, + azure-common, + azure-mgmt-core, + buildPythonPackage, + fetchPypi, + isodate, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "9.0.0"; - format = "setuptools"; + version = "9.1.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-H/SsO/DnHXSsSyejYX7BFem1GqPh20DRGecrYVkIu1E="; + hash = "sha256-Hp/UBsDJ7iYn9aNx8BL4dzQvf8bzOyVk/NFNbwZjzQ8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core isodate @@ -28,9 +32,7 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "azure.mgmt.recoveryservicesbackup" - ]; + pythonImportsCheck = [ "azure.mgmt.recoveryservicesbackup" ]; meta = with lib; { description = "This is the Microsoft Azure Recovery Services Backup Management Client Library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix index 9c00f0c49c..aa5fa2e2c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "2.0.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Backblaze"; repo = "b2-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-0/UC4O19oO8SpboiPIhvkWBA8XHpc279fl377MooK54="; + hash = "sha256-ENEAynUd66sjS+/Qoy9qyffPpSvxdnY1Nwdi+JTE96I="; }; build-system = [ pdm-backend ]; @@ -60,6 +60,9 @@ buildPythonPackage rec { # requires aws s3 auth "test/integration/test_download.py" "test/integration/test_upload.py" + + # Requires backblaze auth + "test/integration/test_bucket.py" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-shutil-get-terminal-size/default.nix similarity index 95% rename from third_party/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/backports-shutil-get-terminal-size/default.nix index aec6077dd7..237cde584e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports-shutil-get-terminal-size/default.nix @@ -6,7 +6,7 @@ }: if !(pythonOlder "3.3") then null else buildPythonPackage { - pname = "backports.shutil_get_terminal_size"; + pname = "backports-shutil-get-terminal-size"; version = "unstable-2016-02-21"; # there have been numerous fixes committed since the initial release. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix index 95b47bb602..290e4e2697 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -1,11 +1,12 @@ { lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { - pname = "backports.shutil_which"; + pname = "backports-shutil-which"; version = "3.5.2"; src = fetchPypi { - inherit pname version; + pname = "backports.shutil_which"; + inherit version; sha256 = "fe39f567cbe4fad89e8ac4dbeb23f87ef80f7fe8e829669d0221ecdb0437c133"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/default.nix index c3ab6083ba..57f28860fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/default.nix @@ -6,7 +6,7 @@ , ipykernel , python , pexpect -, bash +, bashInteractive , substituteAll }: @@ -24,7 +24,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./bash-path.patch; - bash = lib.getExe bash; + bash = lib.getExe bashInteractive; }) ]; @@ -45,8 +45,20 @@ buildPythonPackage rec { ${python.pythonOnBuildForHost.interpreter} -m bash_kernel.install --prefix $out ''; - # no tests - doCheck = false; + checkPhase = '' + runHook preCheck + + # Create a JUPYTER_PATH with the kernelspec + export JUPYTER_PATH=$(mktemp -d) + mkdir -p $JUPYTER_PATH/kernels/bash + echo '{ "language": "bash", "argv": [ "${python}/bin/python", "-m", "bash_kernel", "-f", "{connection_file}" ] }' > $JUPYTER_PATH/kernels/bash/kernel.json + + # Evaluate a test notebook with papermill + cd $(mktemp -d) + ${python.withPackages (ps: [ps.papermill])}/bin/papermill --kernel bash ${./test.ipynb} out.ipynb + + runHook postCheck + ''; meta = with lib; { description = "Bash Kernel for Jupyter"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/test.ipynb b/third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/test.ipynb new file mode 100644 index 0000000000..4d061381b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/test.ipynb @@ -0,0 +1,26 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "echo hi" + ] + } + ], + "metadata": { + "kernel_info": { + "display_name": "Unknown", + "name": "bash" + }, + "language_info": { + "file_extension": ".ipynb", + "name": "bash", + "version": "5.0" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix index ef82df7dfb..6c4d629e08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix @@ -1,30 +1,49 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder -, pytestCheckHook, nose, glibcLocales, fetchpatch -, numpy, scipy, matplotlib, h5py }: +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + numpy, + scipy, + h5py, + truncnorm, + pytestCheckHook, +}: buildPythonPackage rec { pname = "bayespy"; version = "0.6.1"; - format = "setuptools"; + pyproject = true; # Python 2 not supported and not some old Python 3 because MPL doesn't support # them properly. disabled = pythonOlder "3.4"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-3N8w/LiTLsDZbHp3z26FvDg3vStB2l3XkIWx+Mma1G0="; + src = fetchFromGitHub { + owner = "bayespy"; + repo = "bayespy"; + rev = "refs/tags/${version}"; + hash = "sha256-X7CwJBrKHlU1jqMkt/7XEzaiwul1Yzkb/V64lXG4Aqo="; }; - nativeCheckInputs = [ pytestCheckHook nose glibcLocales ]; + postPatch = '' + substituteInPlace versioneer.py \ + --replace-fail SafeConfigParser ConfigParser \ + --replace-fail readfp read_file + ''; - propagatedBuildInputs = [ numpy scipy matplotlib h5py ]; + build-system = [ setuptools ]; - disabledTests = [ - # Assertion error - "test_message_to_parents" + dependencies = [ + numpy + scipy + h5py + truncnorm ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "bayespy" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix index df19afca09..7e2a162df5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -1,22 +1,23 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, gibberish-detector -, mock -, pkgs -, pyahocorasick -, pytestCheckHook -, pythonOlder -, pyyaml -, requests -, responses -, setuptools -, unidiff +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gibberish-detector, + mock, + pkgs, + pyahocorasick, + pytestCheckHook, + pythonOlder, + pyyaml, + requests, + responses, + setuptools, + unidiff, }: buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.5.5"; + version = "1.5.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,12 +26,10 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-05hxc34ecSoAp0GBVf9yq2BC928wxZOLZJHAbJ7cdtk="; + hash = "sha256-b0t5xv4fWiErQsYvDKTJuweiGLqS2WpR9ECGo/cpvQ8="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ pyyaml @@ -39,12 +38,8 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - word_list = [ - pyahocorasick - ]; - gibberish = [ - gibberish-detector - ]; + word_list = [ pyahocorasick ]; + gibberish = [ gibberish-detector ]; }; nativeCheckInputs = [ @@ -71,9 +66,7 @@ buildPythonPackage rec { "TestModifiesBaselineFromVersionChange" ]; - pythonImportsCheck = [ - "detect_secrets" - ]; + pythonImportsCheck = [ "detect_secrets" ]; meta = with lib; { description = "Tool to detect secrets in the code"; @@ -82,4 +75,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ fab ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bdffont/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bdffont/default.nix index baa20facc8..29cbe658db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bdffont/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bdffont/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "bdffont"; - version = "0.0.17"; + version = "0.0.24"; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-JBPo5tmwnXRzPpZbBrcW2wEC/XNd8M+mi58CRIpOVL0="; + hash = "sha256-3HJwtBV78zsMUlmwJrPj74Vd5cru1zflvies5mNGcy4="; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix index f1e1ee3a4b..0b4eb2ba69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "beancount-black"; - version = "0.2.1"; + version = "1.0.2"; disabled = pythonOlder "3.9"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beancount-black"; rev = version; - hash = "sha256-wvAQnwnyHn5Koc/UN4zpJ3JDmFbDoUrpCTmJCpSP7Mg="; + hash = "sha256-SoAic9UYKE9lhMpl44VosJmmjKJjDrKOyMeUO931Ztg="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount-parser/default.nix index b7fe986209..f3319a58b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beancount-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount-parser/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "beancount-parser"; - version = "0.2.0"; + version = "1.2.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beancount-parser"; rev = "refs/tags/${version}"; - hash = "sha256-VSl+Jde/mDSUpICXjmPKID6qZiKUUaK8ixztP1qaoDM="; + hash = "sha256-8YcrsLdSRTixKXU/IM821kNcBo0jB/8DXA1/KiedsBY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix index b5091bf519..ac4a0947e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.17.2"; + version = "0.18.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6RHhrn3kvM0VdF92Q2CdhzL2TeXC+4ROicu+0cWo1JU="; + hash = "sha256-Jk3cLx2p7JT/Y5FB++M9IuEqn3WqhjuDtwRv//E4GSc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/before-after/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/before-after/default.nix index cc1164eec5..3dc6c40069 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/before-after/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/before-after/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "sugar over the Mock library to help test race conditions"; homepage = "https://github.com/c-oreills/before_after"; - maintainers = with maintainers; [ yuka ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2Only; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix index 38c938bb74..5d4c388033 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -1,24 +1,24 @@ -{ lib -, async-timeout -, buildPythonPackage -, click -, click-log -, fetchFromGitHub -, fetchpatch2 -, pure-pcapy3 -, pyserial-asyncio -, pytest-asyncio -, pytest-timeout -, pytestCheckHook -, pythonOlder -, setuptools -, voluptuous -, zigpy +{ + lib, + async-timeout, + buildPythonPackage, + click, + click-log, + fetchFromGitHub, + pure-pcapy3, + pyserial-asyncio, + pytest-asyncio, + pytest-timeout, + pytestCheckHook, + pythonOlder, + setuptools, + voluptuous, + zigpy, }: buildPythonPackage rec { pname = "bellows"; - version = "0.38.1"; + version = "0.38.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,25 +27,16 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-oxPzjDb+FdHeHsgeGKH3SVvKb0vCB9dIhT7lGzhDcBw="; + hash = "sha256-IyJQgKTRrff/LqY14IaATrJTkmVDEv0JFHAxCydNk7Y="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/zigpy/bellows/commit/7833647083f27f55b7ad345f4aaa7dffaa369abc.patch"; - hash = "sha256-v+BOPqikWoyNtZ1qRWe3RwraG6nQnfZqoV6yj9PpGX8="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools-git-versioning<2"' "" \ --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ click @@ -54,9 +45,7 @@ buildPythonPackage rec { pyserial-asyncio voluptuous zigpy - ] ++ lib.optionals (pythonOlder "3.11") [ - async-timeout - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; nativeCheckInputs = [ pytestCheckHook @@ -64,9 +53,7 @@ buildPythonPackage rec { pytest-timeout ]; - pythonImportsCheck = [ - "bellows" - ]; + pythonImportsCheck = [ "bellows" ]; meta = with lib; { description = "Python module to implement EZSP for EmberZNet devices"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/betterproto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/betterproto/default.nix index a20daf344f..5f42d46b1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/betterproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/betterproto/default.nix @@ -61,6 +61,7 @@ buildPythonPackage rec { # The tests require the generation of code before execution. This requires # the protoc-gen-python_betterproto script from the package to be on PATH. preCheck = '' + (($(ulimit -n) < 1024)) && ulimit -n 1024 export PATH=$PATH:$out/bin patchShebangs src/betterproto/plugin/main.py ${python.interpreter} -m tests.generate diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix index aef733f938..d6b24f13ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix @@ -36,6 +36,5 @@ buildPythonPackage rec { description = "Bibtex parser for Python"; homepage = "https://github.com/sciunto-org/python-bibtexparser"; license = with licenses; [ lgpl3Only /* or */ bsd3 ]; - maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix index 7512515c70..6779e42c58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "bids-validator"; - version = "1.14.4"; + version = "1.14.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Q0pghEFmK5qJ3sWgrxs4jWUm+Ox7LO5sDR8GUJWBr/o="; + hash = "sha256-TXIb1ff7D6aM+8L5F47O5Dvupp1Sn4Rnl+GQaUdEgno="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix index 48ddcc9e7d..39c8874f7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -18,26 +18,26 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.14.6"; + version = "0.15.2"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-/FL9czp5x/BcKSXXzT19kgGiPFd61BpU7HLtgyyHlIs="; + hash = "sha256-UCzPD+3v74eB32q0/blsyHAsN0yNskGky5nrBKzFFaE="; }; - nativeBuildInputs = [ + build-system = [ pbr setuptools ]; PBR_VERSION = version; - propagatedBuildInputs = [ + dependencies = [ httpx pycryptodome pyjwt diff --git a/third_party/nixpkgs/pkgs/development/python-modules/binance-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binance-connector/default.nix new file mode 100644 index 0000000000..c8d3b044b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/binance-connector/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pycryptodome +, pythonOlder +, requests +, websocket-client +# dependencies for tests +, pytest-cov +, pytest +, sure +, responses +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "binance-connector"; + version = "3.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "binance"; + repo = "${pname}-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-hmn8WKr+krzOzHNJ/aynXAbf+rHxDfyKDgycdQQU3xk="; + }; + + propagatedBuildInputs = [ + requests + pycryptodome + websocket-client + ]; + + nativeCheckInputs = [ + pytest-cov + pytest + sure + responses + pytestCheckHook + ]; + + # pytestCheckHook attempts to run examples directory, which requires + # network access + disabledTestPaths = [ + "examples/" + ]; + + pythonImportsCheck = [ + "binance.spot" + "binance.websocket" + ]; + + meta = with lib; { + description = "Simple connector to Binance Public API"; + homepage = "https://github.com/binance/binance-connector-python"; + license = licenses.mit; + maintainers = with maintainers; [ trishtzy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/biom-format/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/biom-format/default.nix new file mode 100644 index 0000000000..ca5ff3a83f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/biom-format/default.nix @@ -0,0 +1,71 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + setuptools, + cython, + click, + numpy, + scipy, + pandas, + h5py, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "biom-format"; + version = "2.1.15"; + pyproject = true; + + src = fetchFromGitHub { + owner = "biocore"; + repo = "biom-format"; + rev = "refs/tags/${version}"; + hash = "sha256-WRBc+C/UWme7wYogy4gH4KTIdIqU3KmBm2jWzGNxGQg="; + }; + + patches = [ + # fixes a test, can be removed in next version after 2.1.15 + (fetchpatch { + name = "fix-dataframe-comparison.patch"; + url = "https://github.com/biocore/biom-format/commit/5d1c921ca2cde5d7332508503ce990a7209d1fdc.patch"; + hash = "sha256-nyHi469ivjJSQ01yIk/6ZMXFdoo9wVuazJHnFdy2nBg="; + }) + ]; + + build-system = [ + setuptools + cython + numpy + ]; + + dependencies = [ + click + numpy + scipy + pandas + h5py + ]; + + # make pytest resolve the package from $out + # some tests don't work if we change the level of directory nesting + preCheck = '' + mkdir biom_tests + mv biom/tests biom_tests/tests + rm -r biom + ''; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "biom_tests/tests" ]; + + pythonImportsCheck = [ "biom" ]; + + meta = { + homepage = "http://biom-format.org/"; + description = "Biological Observation Matrix (BIOM) format"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/biopython/close_parser_on_time.patch b/third_party/nixpkgs/pkgs/development/python-modules/biopython/close_parser_on_time.patch new file mode 100644 index 0000000000..05d22e22ed --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/biopython/close_parser_on_time.patch @@ -0,0 +1,18 @@ +diff --git a/Bio/SeqIO/SeqXmlIO.py b/Bio/SeqIO/SeqXmlIO.py +index 8fe75ebb728..6758317d05f 100644 +--- a/Bio/SeqIO/SeqXmlIO.py ++++ b/Bio/SeqIO/SeqXmlIO.py +@@ -498,11 +498,12 @@ def iterate(self, handle): + if not text: + break + parser.feed(text) ++ # Closing the parser ensures that all XML data fed into it are processed ++ parser.close() + # We have reached the end of the XML file; + # send out the remaining records + yield from records + records.clear() +- parser.close() + + + class SeqXmlWriter(SequenceWriter): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/biopython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/biopython/default.nix index 2ec814f56a..051f66845d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/biopython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/biopython/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, setuptools -, numpy +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, + numpy, }: buildPythonPackage rec { @@ -18,15 +19,17 @@ buildPythonPackage rec { hash = "sha256-eOa/t43mMDQDev01/nfLbgqeW2Jwa+z3in2SKxbtg/c="; }; - nativeBuildInputs = [ - setuptools + patches = [ + # cherry-picked from https://github.com/biopython/biopython/commit/3f9bda7ef44f533dadbaa0de29ac21929bc0b2f1 + # fixes SeqXMLIO parser to process all data. remove on next update + ./close_parser_on_time.patch ]; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ - "Bio" - ]; + dependencies = [ numpy ]; + + pythonImportsCheck = [ "Bio" ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/birch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/birch/default.nix index 1dd4848427..56c95e415c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/birch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/birch/default.nix @@ -31,20 +31,20 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ - --replace \ + --replace-fail \ "--cov" \ "#--cov" # configure correct version, which fails due to missing .git substituteInPlace versioneer.py birch/_version.py \ - --replace '"0+unknown"' '"${version}"' + --replace-fail '"0+unknown"' '"${version}"' ''; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ strct ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix index 7d6f891756..0217979d31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix @@ -1,29 +1,33 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchPypi -, base58 -, ecdsa -, hidapi -, noiseprotocol -, protobuf -, semver -, typing-extensions +{ + lib, + base58, + buildPythonPackage, + ecdsa, + fetchPypi, + hidapi, + noiseprotocol, + protobuf, + pythonOlder, + semver, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "bitbox02"; - version = "6.2.0"; - format = "setuptools"; + version = "6.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zt4G45nJjtU2/tbYpCEgjaoA+Xtpe9g2OpQaxfMzCb8="; + hash = "sha256-0D+yIovlYw8dfDUeW+vcualbvmLs+IySkTpmHwk2meM="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ base58 ecdsa hidapi @@ -36,9 +40,7 @@ buildPythonPackage rec { # does not contain tests doCheck = false; - pythonImportsCheck = [ - "bitbox02" - ]; + pythonImportsCheck = [ "bitbox02" ]; meta = with lib; { description = "Firmware code of the BitBox02 hardware wallet"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix index ec11de747c..48f1c33055 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "black"; - version = "24.3.0"; + version = "24.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-oMnEoHca/GkZV4zscc6Co+MeBUkE5xl96svJOCZxxB8="; + hash = "sha256-8Htp/aIFeDZ+rrvWcP+PxlOrGB4f+V2ESX+fog59BkE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blackjax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blackjax/default.nix index 7ecc4eda95..4a0807cd7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blackjax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blackjax/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "blackjax"; - version = "1.1.1"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,12 +25,14 @@ buildPythonPackage rec { owner = "blackjax-devs"; repo = "blackjax"; rev = "refs/tags/${version}"; - hash = "sha256-6+ElY1F8oRCtWT4a/LIG6hYMthlq5mDx2baKAc6zIns="; + hash = "sha256-VoWBCjFMyE5LVJyf7du/pKlnvDHj22lguiP6ZUzH9ak="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ fastprogress jax jaxlib @@ -42,10 +45,21 @@ buildPythonPackage rec { pytestCheckHook pytest-xdist ]; - disabledTestPaths = [ "tests/test_benchmarks.py" ]; + + disabledTestPaths = [ + "tests/test_benchmarks.py" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # Assertion errors on numerical values + "tests/mcmc/test_integrators.py" + ]; + disabledTests = [ # too slow "test_adaptive_tempered_smc" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # Numerical test (AssertionError) + # https://github.com/blackjax-devs/blackjax/issues/668 + "test_chees_adaptation" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix index f53f614867..7fad7492d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.21.1"; + version = "0.22.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "hbldh"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-T0im8zKyNLbskAEDeUUFS/daJtvttlHlttjscqP8iSk="; + hash = "sha256-kBKNBVbEq1xHLu/gKUL2SwlA2WKjzqFVC5o4N+qnqLM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bloodyad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bloodyad/default.nix index 11d26f32fb..47ff7565a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bloodyad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bloodyad/default.nix @@ -1,19 +1,23 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchFromGitHub -, gssapi -, hatchling -, ldap3 -, pyasn1 -, pytestCheckHook -, pythonOlder -, winacl +{ + lib, + asn1crypto, + buildPythonPackage, + cryptography, + dnspython, + fetchFromGitHub, + gssapi, + hatchling, + ldap3, + msldap, + pyasn1, + pytestCheckHook, + pythonOlder, + winacl, }: buildPythonPackage rec { pname = "bloodyad"; - version = "1.1.1"; + version = "2.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,28 +26,25 @@ buildPythonPackage rec { owner = "CravateRouge"; repo = "bloodyAD"; rev = "refs/tags/v${version}"; - hash = "sha256-wnq+HTAPnC7pSGI2iytSyHmdqtUq2pUnNwZnsGX8CL4="; + hash = "sha256-+Lw9Apm+zzUlM19fGgxOb2bTmmKQ1Nd7dUjF9rhHXKQ="; }; - nativeBuildInputs = [ - hatchling - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ + asn1crypto cryptography + dnspython gssapi ldap3 + msldap pyasn1 winacl ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "bloodyAD" - ]; + pythonImportsCheck = [ "bloodyAD" ]; disabledTests = [ # Tests require network access diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix index cf6924f2f3..c41d871735 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -13,12 +13,13 @@ , pythonOlder , sphinx-rtd-theme , sphinxHook +, uart-devices , usb-devices }: buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.18.0"; + version = "0.19.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-adapters"; rev = "refs/tags/v${version}"; - hash = "sha256-KPmCOPCK7muT0qptJMKQwWU/6tvepkdHwlNYcrvpRLg="; + hash = "sha256-hPs6YnmndJ2Z5RotcIRIYWPdvMyX56ul84l1Cs8kqH0="; }; postPatch = '' @@ -40,20 +41,21 @@ buildPythonPackage rec { "doc" ]; - nativeBuildInputs = [ + build-system = [ myst-parser poetry-core sphinx-rtd-theme sphinxHook ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aiooui async-timeout bleak dbus-fast mac-vendor-lookup + uart-devices usb-devices ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 9a146770fd..861aaab2d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -1,19 +1,20 @@ -{ lib -, async-timeout -, bluetooth-adapters -, btsocket -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pyric -, pytestCheckHook -, pythonOlder -, usb-devices +{ + lib, + async-timeout, + bluetooth-adapters, + btsocket, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pyric, + pytestCheckHook, + pythonOlder, + usb-devices, }: buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.4.0"; + version = "1.4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-auto-recovery"; rev = "refs/tags/v${version}"; - hash = "sha256-fXR7leW+eXaQZ22IyeVhpS5/MOnuAiunUGMdtfVrlos="; + hash = "sha256-JaFazXjbHohj4+rPkQA/SaBP0irHrre3vaCqz7T2bwE="; }; postPatch = '' @@ -30,11 +31,9 @@ buildPythonPackage rec { --replace-fail " --cov=bluetooth_auto_recovery --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ async-timeout bluetooth-adapters btsocket @@ -42,13 +41,9 @@ buildPythonPackage rec { usb-devices ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "bluetooth_auto_recovery" - ]; + pythonImportsCheck = [ "bluetooth_auto_recovery" ]; meta = with lib; { description = "Library for recovering Bluetooth adapters"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix index 63fa524f9f..8f052c4b5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , fetchFromGitHub @@ -8,7 +7,6 @@ , colorama , contourpy , jinja2 -, mock , numpy , nodejs , packaging @@ -48,14 +46,14 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.3.4"; + version = "3.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-c7eYLcK43xW/Zgzd3I04JegpGVxDgBWl0Jgk8acCg2g="; + hash = "sha256-2CSWHkJlNnsHUM5YsH5WStC4PKZLM1UhzTQh6bnxDYk="; }; src_test = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch index 4ebfc7e3f2..6dcec9ae51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch @@ -1,14 +1,15 @@ -diff -ru a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py +diff --git a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py +index 4f4314ac8..726610f4c 100644 --- a/src/bokeh/util/compiler.py +++ b/src/bokeh/util/compiler.py -@@ -411,8 +411,8 @@ +@@ -411,8 +411,8 @@ def _detect_nodejs() -> Path: raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' + '("conda install nodejs" or follow https://nodejs.org/en/download/)') --_nodejs = None --_npmjs = None +-_nodejs: Path | None = None +-_npmjs: Path | None = None +_nodejs = "@node_bin@" +_npmjs = "@npm_bin@" - def _nodejs_path() -> str: + def _nodejs_path() -> Path: global _nodejs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/borb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/borb/default.nix index f82da30ff5..e1d2211f2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/borb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/borb/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://borbpdf.com/"; changelog = "https://github.com/jorisschellekens/borb/releases/tag/v${version}"; license = licenses.agpl3Only; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix index 7d2776ffe7..d93def6ac9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.88"; + version = "1.34.105"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-I8qeDNDT53AtZjGh6UpCCKJrOfprEsc0Qn5op/pklHc="; + hash = "sha256-auwBMUR4haJNuCJ5YJoIEwxdCw9zjfxwpZ/z9FPASmg="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix index 3b536f1557..4d1960ebe1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.88"; + version = "1.34.94"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-ZW6WbqFSpPKCiJKqepZzvJF5mZj1qO/Y6P45D2HC9PE="; + hash = "sha256-ZNgKNGfjsZk56cJ1CvMzKLMIf49SSZjb337RaCJ/UH0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index f956687016..0c9dfaa792 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.34.58"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.34.87"; # N.B: if you change this, change boto3 and awscli to a matching version pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-11IWlSiG3FE+obXil5pq8I/u0vU34/wQLkoKLq1WOjU="; + hash = "sha256-o6TYV/CUHZih5c6M1kw5BiJx/qC+TZ89DWr/bLWBI7k="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botorch/default.nix index e816099087..bddf584fa9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botorch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botorch/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "botorch"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IaFtQWrgOhVHDOiPQ4oG8l+Q0igWamYVWEReGccbVoI="; + hash = "sha256-eL0buwqrGt4qcwdzCwD85IyiWjAFuP1n8aUb2pvvIKw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boxx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boxx/default.nix index a42cc2c0ee..67d862941c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boxx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.10.13"; + version = "0.10.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Z1mmNTGjK77GNdlYAXQzp+9Z7TeiKZGvio4SXGwgOPk="; + hash = "sha256-unGnmPksEuqFXHTWJkj9Gv2G/qPDgT6AZXYiG2gtkEA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix index 894ee421d2..77f1468960 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "branca"; - version = "0.7.1"; + version = "0.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "python-visualization"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OePOZvqXtsp73HsfFslI6F3kegbdk45lWY1CMQRTcoc="; + hash = "sha256-ipu0JZIx/YgR7F5Z7sl/9YEEHkyiDllR5dHko7AlSe8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix index ca6c662616..35bc0b6986 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, defusedxml , docutils , fetchFromGitHub , fetchpatch @@ -40,6 +41,10 @@ buildPythonPackage rec { pytestCheckHook ]; + checkInputs = [ + defusedxml + ]; + pythonImportsCheck = [ "breathe" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix index 629c99eb12..4972e82b3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix @@ -126,7 +126,7 @@ buildPythonPackage rec { homepage = "https://www.breezy-vcs.org/"; changelog = "https://github.com/breezy-team/breezy/blob/${src.rev}/doc/en/release-notes/brz-${versions.majorMinor version}.txt"; license = licenses.gpl2Only; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "brz"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix index 4edc9e1524..4e617c5469 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix @@ -1,22 +1,30 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pkgs , python +, pythonOlder }: buildPythonPackage rec { pname = "bsddb3"; version = "6.2.9"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "70d05ec8dc568f42e70fc919a442e0daadc2a905a1cfb7ca77f549d49d6e7801"; }; + build-system = [ + setuptools + ]; + buildInputs = [ pkgs.db ]; + doCheck = pythonOlder "3.12"; # distutils usage + checkPhase = '' ${python.interpreter} test.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix index cc99d7696c..f0f92ec119 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix @@ -1,19 +1,20 @@ -{ lib -, bluetooth-data-tools -, bluetooth-sensor-state-data -, buildPythonPackage -, cryptography -, fetchFromGitHub -, poetry-core -, pytestCheckHook -, pythonOlder -, pytz -, sensor-state-data +{ + lib, + bluetooth-data-tools, + bluetooth-sensor-state-data, + buildPythonPackage, + cryptography, + fetchFromGitHub, + poetry-core, + pytestCheckHook, + pythonOlder, + pytz, + sensor-state-data, }: buildPythonPackage rec { pname = "bthome-ble"; - version = "3.8.1"; + version = "3.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,14 +23,17 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-eaRFHrISxYovQLtNUPrgNw3ATClHqpZ+Us+JGmNNbyY="; + hash = "sha256-umRPB0eUdFL4kIvqSfbw/Jzh7NZMY6WR4dK+1cyK3EI="; }; - nativeBuildInputs = [ - poetry-core - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail " --cov=bthome_ble --cov-report=term-missing:skip-covered" "" + ''; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data cryptography @@ -37,18 +41,9 @@ buildPythonPackage rec { pytz ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=bthome_ble --cov-report=term-missing:skip-covered" "" - ''; - - pythonImportsCheck = [ - "bthome_ble" - ]; + pythonImportsCheck = [ "bthome_ble" ]; meta = with lib; { description = "Library for BThome BLE devices"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btrfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btrfs/default.nix index a534257c6d..66a7a05676 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/btrfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/btrfs/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "btrfs"; - version = "13"; + version = "14.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NSyzhpHYDkunuU104XnbVCcVRNDoVBz4KuJRrE7WMO0="; + hash = "sha256-BPKPwT33i8fQYJkUZbnJ8nQNbmKw0Dq6ekb9mr7awEY="; }; # no tests (in v12) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix index a20770673f..c4afcb6935 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.6.2"; + version = "4.7.0"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-UwlT4a0jzp6vo5ZpB/o3MKJAFHpaDJBcaQvFoctS120="; + hash = "sha256-+w0lI2goXYnfX2KB+DNFPXl6UCOhg5o17zggalyYXr8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix index 7d56257a37..4f30c8f186 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "build"; - version = "1.1.1"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "pypa"; repo = "build"; rev = "refs/tags/${version}"; - hash = "sha256-SGWpm+AGIfqKMpDfmz2aMYmcs+XVREbHIXSuU4R7U/k="; + hash = "sha256-G0g+1v19sQMUuQlZKGELZOwwX07i7TIdEdaYzr8bKtI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix index 12f2a88cb2..26b69651ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cachelib"; - version = "0.12.0"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "pallets"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gSBY8zMGVn5Ndu4OexMP1v7bhXAAdl2UcEjjKFa21rE="; + hash = "sha256-8jg+zfdIATvu/GSFvqHl4cNMu+s2IFWC22vPZ7Q3WYI="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachier/default.nix index 037f02b4d3..e8fe51d4de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachier/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ + dependencies = [ watchdog portalocker ]; preCheck = '' substituteInPlace pyproject.toml \ - --replace \ + --replace-fail \ '"--cov' \ '#"--cov' ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix deleted file mode 100644 index 5db0b6ae2c..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ lib -, buildPythonPackage -, toPythonModule -, pythonOlder -, pythonAtLeast -, fetchFromGitHub -, pyparsing -, opencascade-occt -, stdenv -, python -, cmake -, swig -, freetype -, libGL -, libGLU -, libX11 -, six -, pytest -, makeFontsConf -, freefont_ttf -, Cocoa -}: - -let - pythonocc-core-cadquery = toPythonModule (stdenv.mkDerivation { - pname = "pythonocc-core-cadquery"; - version = "0.18.2"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "CadQuery"; - repo = "pythonocc-core"; - # no proper release to to use, this commit copied from the Anaconda receipe - rev = "701e924ae40701cbe6f9992bcbdc2ef22aa9b5ab"; - sha256 = "07zmiiw74dyj4v0ar5vqkvk30wzcpjjzbi04nsdk5mnlzslmyi6c"; - }; - - nativeBuildInputs = [ - cmake - swig - ]; - - buildInputs = [ - python - opencascade-occt - freetype - libGL - libGLU - libX11 - ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - - propagatedBuildInputs = [ - six - ]; - - cmakeFlags = [ - "-Wno-dev" - "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC" - ]; - }); - -in - buildPythonPackage rec { - pname = "cadquery"; - version = "2.0"; - - src = fetchFromGitHub { - owner = "CadQuery"; - repo = pname; - rev = version; - sha256 = "1n63b6cjjrdwdfmwq0zx1xabjnhndk9mgfkm4w7z9ardcfpvg84l"; - }; - - buildInputs = [ - opencascade-occt - ]; - - propagatedBuildInputs = [ - pyparsing - pythonocc-core-cadquery - ]; - - FONTCONFIG_FILE = makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }; - - nativeCheckInputs = [ - pytest - ]; - - disabled = pythonOlder "3.6" || pythonAtLeast "3.8"; - - meta = with lib; { - description = "Parametric scripting language for creating and traversing CAD models"; - homepage = "https://github.com/CadQuery/cadquery"; - license = licenses.asl20; - maintainers = with maintainers; [ marcus7070 ]; - broken = true; - }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix index 05529a9c00..17d6b014ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cartopy"; - version = "0.22.0"; + version = "0.23.0"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Cartopy"; - hash = "sha256-swD5ASCTHUPxHvh8Bk6h2s7BtZpJQKp26/gs8JVIu0k="; + hash = "sha256-Ix83s1cB8rox2UlZzKdebaBMLuo6fxTOHHXuOw6udnY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix index 4e4d10bd27..49f1b18dc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix @@ -1,41 +1,48 @@ -{ lib -, fetchPypi -, buildPythonPackage -, astropy -, dask -, numpy -, oldest-supported-numpy -, setuptools-scm -, wheel +{ + lib, + astropy, + buildPythonPackage, + dask, + fetchPypi, + numpy, + oldest-supported-numpy, + pythonOlder, + setuptools-scm, }: buildPythonPackage rec { pname = "casa-formats-io"; - version = "0.2.2"; - format = "pyproject"; + version = "0.3.0"; + prproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-EOX+tal9nrON2K7mHVYSTTxja6mu2k3Bag8bhL3JHJs="; + pname = "casa_formats_io"; + inherit version; + hash = "sha256-FpQj0XeZ7vvOzUM/+5qG6FRwNXl3gzoUBItYdQ1M4m4="; }; - nativeBuildInputs = [ - oldest-supported-numpy - setuptools-scm - wheel - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ astropy dask numpy ]; + nativeBuildInputs = [ oldest-supported-numpy ]; + + dependencies = [ + astropy + dask + numpy + ]; # Tests require a large (800 Mb) dataset doCheck = false; pythonImportsCheck = [ "casa_formats_io" ]; - meta = { + meta = with lib; { description = "Dask-based reader for CASA data"; homepage = "https://casa-formats-io.readthedocs.io/"; - license = lib.licenses.lgpl2Only; - maintainers = with lib.maintainers; [ smaret ]; + changelog = "https://github.com/radio-astro-tools/casa-formats-io/blob/v${version}/CHANGES.rst"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ smaret ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix index 8c05e5e0bb..ad5364ccd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.28.0"; + version = "3.29.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "datastax"; repo = "python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-5JRbzYl7ftgK6GuvXWdvo52ZlS1th9JyLAYu/UCcPVc="; + hash = "sha256-pnNm5Pd5k4bt+s3GrUUDWRpSdqNSM89GiX8DZKYzW1E="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cbor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cbor/default.nix index 3d33c3ce24..551a0567ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cbor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cbor/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "https://bitbucket.org/bodhisnarkva/cbor"; + homepage = "https://github.com/brianolson/cbor_py"; description = "Concise Binary Object Representation (CBOR) library"; license = licenses.asl20; maintainers = with maintainers; [ oxzi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix index 73f994cce5..c9d2ecbaca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.6.2"; + version = "5.6.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-t1E8LeqIaJkfrX74iZiQ68+LGZubRGHDwR160670gg0="; + hash = "sha256-5vCuJ1HC0zOpYOCAfAYRSU6xJFYxoWeWWsvBAFCUVdM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix index 511a3975d9..38c643cd10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix @@ -1,36 +1,35 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, ipython -, numpy -, pandas -, pytestCheckHook -, pythonOlder -, requests -, responses -, setuptools -, tqdm +{ + lib, + buildPythonPackage, + fetchFromGitHub, + ipython, + numpy, + pandas, + pytestCheckHook, + pythonOlder, + requests, + responses, + setuptools, + tqdm, }: buildPythonPackage rec { pname = "cdcs"; - version = "0.2.2"; - format = "setuptools"; + version = "0.2.3"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "usnistgov"; repo = "pycdcs"; rev = "refs/tags/v${version}"; - hash = "sha256-WiNjMMcpp5K+Re44ryB7LNzr2LnnYzLZ5b0iT7u1ZiA="; + hash = "sha256-HhAzULVWkKOWDJ6IZyBy0MYc/YGAFkSTLIgpdyvw1eI="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ ipython numpy pandas @@ -43,9 +42,7 @@ buildPythonPackage rec { responses ]; - pythonImportsCheck = [ - "cdcs" - ]; + pythonImportsCheck = [ "cdcs" ]; meta = with lib; { description = "Python client for performing REST calls to configurable data curation system (CDCS) databases"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix index a787e1fce4..f628404909 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -1,45 +1,57 @@ { stdenv , lib -, backports-zoneinfo -, billiard -, boto3 , buildPythonPackage -, case +, fetchPypi +, pythonOlder + +# build-system +, setuptools + +# dependencies +, billiard +, kombu +, vine , click , click-didyoumean -, click-plugins , click-repl -, dnspython -, fetchPypi -, kombu +, click-plugins +, tzdata +, python-dateutil + +# optional-dependencies +, google-cloud-storage , moto +, msgpack , pymongo +, pyyaml + +# tests , pytest-celery , pytest-click , pytest-subtests , pytest-timeout , pytest-xdist , pytestCheckHook -, python-dateutil -, pythonOlder -, tzdata -, vine , nixosTests }: buildPythonPackage rec { pname = "celery"; - version = "5.3.6"; - format = "setuptools"; + version = "5.4.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hwzHHXN8AgDDlykNcwNEzJkdE6BXU0NT0STJOAJnqrk="; + hash = "sha256-UEoZFA6NMCnVrK2IMwxUHUw/ZMeJ2F+UdWdi2Lyn5wY="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ billiard click click-didyoumean @@ -49,24 +61,29 @@ buildPythonPackage rec { python-dateutil tzdata vine - ] - ++ lib.optionals (pythonOlder "3.9") [ - backports-zoneinfo ]; + optional-dependencies = { + gcs = [ google-cloud-storage ]; + mongodb = [ pymongo ]; + msgpack = [ msgpack ]; + yaml = [ pyyaml ]; + }; + nativeCheckInputs = [ - boto3 - case - dnspython moto - pymongo pytest-celery pytest-click pytest-subtests pytest-timeout pytest-xdist pytestCheckHook - ]; + ] + # based on https://github.com/celery/celery/blob/main/requirements/test.txt + ++ optional-dependencies.yaml + ++ optional-dependencies.msgpack + ++ optional-dependencies.mongodb + ++ optional-dependencies.gcs; disabledTestPaths = [ # test_eventlet touches network diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix deleted file mode 100644 index 1b12ea1e5e..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, buildPythonPackage -, fetchpatch -, fetchPypi -, python -, mock -}: - -buildPythonPackage rec { - pname = "cepa"; - version = "1.8.4"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-P7xwGsP8ic1/abxYptDXNbAU+kC2Hiwu/Tge0g21ipY="; - }; - - patches = [ - (fetchpatch { - name = "python-3.11-compatibility.patch"; - url = "https://github.com/onionshare/cepa/commit/0bf9aee7151e65594c532826bb04636e1d80fb6f.patch"; - hash = "sha256-roSt9N5OvnOOxKZUee86zGXt0AsZCcbBdV2cLz1MB2k="; - }) - ]; - - postPatch = '' - rm test/unit/installation.py - sed -i "/test.unit.installation/d" test/settings.cfg - # https://github.com/torproject/stem/issues/56 - sed -i '/MOCK_VERSION/d' run_tests.py - ''; - - nativeCheckInputs = [ mock ]; - - checkPhase = '' - touch .gitignore - ${python.interpreter} run_tests.py -u - ''; - - meta = with lib; { - description = "Controller library that allows applications to interact with Tor"; - mainProgram = "tor-prompt"; - homepage = "https://github.com/onionshare/cepa"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ bbjubjub ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cgen/default.nix index 966a6b7ff1..d2a4878f24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cgen/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "C/C++ source generation from an AST"; homepage = "https://github.com/inducer/cgen"; license = licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chai/default.nix index 6146ec692c..7fb8e6d348 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chai/default.nix @@ -10,6 +10,14 @@ buildPythonPackage rec { sha256 = "ff8d2b6855f660cd23cd5ec79bd10264d39f24f6235773331b48e7fcd637d6cc"; }; + postPatch = '' + # python 3.12 compatibility + substituteInPlace tests/*.py \ + --replace "assertEquals" "assertEqual" \ + --replace "assertNotEquals" "assertNotEqual" \ + --replace "assert_equals" "assert_equal" + ''; + meta = with lib; { description = "Mocking, stubbing and spying framework for python"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/character-encoding-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/character-encoding-utils/default.nix index dd0e3b60fe..85e418ca79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/character-encoding-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/character-encoding-utils/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "character-encoding-utils"; - version = "0.0.6"; + version = "0.0.7"; disabled = pythonOlder "3.11"; src = fetchPypi { pname = "character_encoding_utils"; inherit version; - hash = "sha256-ugzWiSpa/xxlraVyVPTSq/uxPg11kOyePgb1cmzX3ug="; + hash = "sha256-cUggyNz5xphDF+7dSrx3vr3v3R8ISryHj9accMJfDbg="; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix index 4f78d87281..b61091ca69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.20.0"; + version = "5.22.0"; pyproject = true; # chart-studio was split from plotly @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - hash = "sha256-i//LKTNmoIrusBnpfSGc9cDijPxg/dY/7fumV3kfTAY="; + hash = "sha256-cEm0vLQ4PAVxvplqK+yayxLpNCvyfZtjZva0Bl2Sdfs="; }; sourceRoot = "${src.name}/packages/python/chart-studio"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix index fe35f5a52b..32bf0a40da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/xenova/chat-downloader"; changelog = "https://github.com/xenova/chat-downloader/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix index 602afd0f75..72a85ffab1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "cheroot"; - version = "10.0.0"; + version = "10.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WcShh3/vmWmzw8CAyqrzd+J4CRlDeFP8DTKp30CzEfA="; + hash = "sha256-4LgveXZY0muGE+yOtWPDsI5r1qeSHp1Qib0Rda0bF0A="; }; # remove setuptools-scm-git-archive dependency diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chromadb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chromadb/default.nix index 6b1ad4dc69..471b6111a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chromadb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chromadb/default.nix @@ -1,55 +1,56 @@ -{ lib -, stdenv -, bcrypt -, build -, buildPythonPackage -, cargo -, chroma-hnswlib -, darwin -, fastapi -, fetchFromGitHub -, grpcio -, hypothesis -, importlib-resources -, kubernetes -, mmh3 -, numpy -, onnxruntime -, openssl -, opentelemetry-api -, opentelemetry-exporter-otlp-proto-grpc -, opentelemetry-instrumentation-fastapi -, opentelemetry-sdk -, orjson -, overrides -, pkg-config -, posthog -, protobuf -, pulsar-client -, pydantic -, pypika -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pyyaml -, requests -, rustc -, rustPlatform -, setuptools -, setuptools-scm -, tenacity -, tokenizers -, tqdm -, typer -, typing-extensions -, uvicorn -, zstd +{ + lib, + stdenv, + bcrypt, + build, + buildPythonPackage, + cargo, + chroma-hnswlib, + darwin, + fastapi, + fetchFromGitHub, + grpcio, + hypothesis, + importlib-resources, + kubernetes, + mmh3, + numpy, + onnxruntime, + openssl, + opentelemetry-api, + opentelemetry-exporter-otlp-proto-grpc, + opentelemetry-instrumentation-fastapi, + opentelemetry-sdk, + orjson, + overrides, + pkg-config, + posthog, + protobuf, + pulsar-client, + pydantic, + pypika, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pyyaml, + requests, + rustc, + rustPlatform, + setuptools, + setuptools-scm, + tenacity, + tokenizers, + tqdm, + typer, + typing-extensions, + uvicorn, + zstd, }: buildPythonPackage rec { pname = "chromadb"; - version = "0.4.23"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -58,18 +59,16 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "chroma"; rev = "refs/tags/${version}"; - hash = "sha256-5gI+FE2jx4G/qahATLcYsONfPZZkk1RFFYK5nrpE0Ug="; + hash = "sha256-gM+fexjwifF3evR8jZvMbIDz655RFKPUizrsB2q5tbw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-glItbT8gg5SAySnfx3A9TaPyFmd1R46JpAB1JnjBE5M="; + hash = "sha256-zyiFv/gswGupm7Y8BhviklqJzM914v0QyUsRwbGKZ48="; }; - pythonRelaxDeps = [ - "orjson" - ]; + pythonRelaxDeps = [ "orjson" ]; nativeBuildInputs = [ cargo @@ -85,9 +84,7 @@ buildPythonPackage rec { buildInputs = [ openssl zstd - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; propagatedBuildInputs = [ bcrypt @@ -126,9 +123,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "chromadb" - ]; + pythonImportsCheck = [ "chromadb" ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; @@ -137,6 +132,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-x" ]; preCheck = '' + (($(ulimit -n) < 1024)) && ulimit -n 1024 export HOME=$(mktemp -d) ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix index ce7929e5a3..dfc183cb1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.3.0"; + version = "10.3.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-JdRqZCDU5ScI3ZUTsWnFHYQ7Zog6V2xcbBDvFcHPnCk="; + hash = "sha256-1Yx00g2Cd9/41DZYK5cRwcFQv2qD6B4cl4cpVZ6slTA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clarifai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clarifai/default.nix index b1085bdc5b..3130098a6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clarifai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clarifai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "10.3.1"; + version = "10.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-KCJ1Ev0fgww0JU1tDp9X/A9EIcXQRaFKeA/MRNnp5ng="; + hash = "sha256-M0OrBqjNjrpxVM/A7NVqarcP8S+VqunYGI4C+Wis6UI="; }; pythonRelaxDeps = [ "clarifai-grpc" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index ee77134497..d7e3079efd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.99"; + version = "9.2.102"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-JUR9fR9zf7OwnXSwfC0x3ti3/5rFkBB105XC5hE3Fw4="; + hash = "sha256-U7aN6MOptGjW61HDfZDM7Vit5G+rm1LujgHoo6oRX3s="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index 31daaae3b1..d1d719e370 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -18,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.99"; + version = "9.2.102"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-2i4l1pm5dtOsd2t1vJS/pdqynH/xuiu69b+qGioKK5c="; + hash = "sha256-6FVxlQ1MiJP2mtu4V/mPAyaeCRdBp/sk+u4fdFqxTyA="; }; in buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-24uTBHjtgoCLUgyWtjNbD6lJZiOqRf5XFQkFgxsl/K8="; + hash = "sha256-BPKNrFBEKV8UuSdrl+HIgBqFClHTvRsGidz+X81bBLI="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix index 8c1bf6f26e..110855c60a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-didyoumean/default.nix @@ -1,18 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, - click +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + click, + pytestCheckHook }: buildPythonPackage rec { pname = "click-didyoumean"; - version = "0.3.0"; - format = "setuptools"; + version = "0.3.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "f184f0d851d96b6d29297354ed981b7dd71df7ff500d82fa6d11f0856bee8035"; + src = fetchFromGitHub { + owner = "click-contrib"; + repo = "click-didyoumean"; + rev = "refs/tags/v${version}"; + hash = "sha256-C8OrJUfBFiDM/Jnf1iJo8pGEd0tUhar1vu4fVIfGzq8="; }; - propagatedBuildInputs = [ click ]; + build-system = [ poetry-core ]; + + dependencies = [ click ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Enable git-like did-you-mean feature in click"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-spinner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-spinner/default.nix index 0c281c29ab..dd9ee1c021 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-spinner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-spinner/default.nix @@ -1,30 +1,48 @@ -{ lib -, buildPythonPackage -, fetchPypi -, click -, six -, pytestCheckHook +{ + lib, + buildPythonPackage, + click, + fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, + six, + versioneer, }: buildPythonPackage rec { pname = "click-spinner"; version = "0.1.10"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "h+rPnXKYlzol12Fe9X1Hgq6/kTpTK7pLKKN+Nm6XXa8="; + hash = "sha256-h+rPnXKYlzol12Fe9X1Hgq6/kTpTK7pLKKN+Nm6XXa8="; }; + postPatch = '' + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + nativeCheckInputs = [ click - six pytestCheckHook + six ]; + pythonImportsCheck = [ "click_spinner" ]; + meta = with lib; { description = "Add support for showwing that command line app is active to Click"; homepage = "https://github.com/click-contrib/click-spinner"; + changelog = "https://github.com/click-contrib/click-spinner/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix index a01ef55fd6..b37c6382a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "clickgen"; - version = "2.2.1"; + version = "2.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "ful1e5"; repo = "clickgen"; rev = "refs/tags/v${version}"; - hash = "sha256-vn30N2BoqqoFjGjWD0KQIuuPoypocIK+R0FI09KwDog="; + hash = "sha256-Lsb0FvJohwsXofpcq7OgWfhl/3qVxAqY0wdvum6ywSQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudevents/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudevents/default.nix new file mode 100644 index 0000000000..d54b20975c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudevents/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, deprecation +, flask +, pydantic +, pytestCheckHook +, requests +, sanic +, sanic-testing +}: + +buildPythonPackage rec { + pname = "cloudevents"; + version = "1.10.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cloudevents"; + repo = "sdk-python"; + rev = "refs/tags/${version}"; + hash = "sha256-YIvEAofWmnUblRd4jV3Zi3VdfocOnD05CMVm/abngyg="; + }; + + build-system = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ "cloudevents" ]; + + nativeCheckInputs = [ + deprecation + flask + pydantic + pytestCheckHook + requests + sanic + sanic-testing + ]; + + disabledTestPaths = [ + "samples/http-image-cloudevents/image_sample_test.py" + ]; + + meta = with lib; { + description = "Python SDK for CloudEvents"; + homepage = "https://github.com/cloudevents/sdk-python"; + changelog = "https://github.com/cloudevents/sdk-python/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix index 1bfdafaba5..34ca3c05bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.19.2"; + version = "2.20.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ENS5ayrd7gffo2meChZ9930qjVq3+G5lkOqm6ofW3Bg="; + hash = "sha256-Rq78Od+qI2XWObQjzsLNU1CuERU8ckfT6zVFvc8Bpoo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix index 3f5de521b0..2f390d3bab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , hatchling , hatch-vcs +, aiohttp , awkward , cachetools , cloudpickle @@ -21,6 +22,7 @@ , packaging , pandas , pyarrow +, requests , scipy , toml , tqdm @@ -32,7 +34,7 @@ buildPythonPackage rec { pname = "coffea"; - version = "2024.2.2"; + version = "2024.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,20 +43,16 @@ buildPythonPackage rec { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-GdoVb9YtlUlrSx7TWWrdHOqOJJ4M+kJspOllv6HgFXk="; + hash = "sha256-FHE7/VL0mnf0eBPzCsrr8ISr7OmfFvI9xuV0CPa7JdU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "numba>=0.58.1" "numba" - ''; - - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ + aiohttp awkward cachetools cloudpickle @@ -72,6 +70,7 @@ buildPythonPackage rec { packaging pandas pyarrow + requests scipy toml tqdm @@ -88,6 +87,14 @@ buildPythonPackage rec { "coffea" ]; + disabledTests = [ + # Requires internet access + # https://github.com/CoffeaTeam/coffea/issues/1094 + "test_lumimask" + ]; + + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Basic tools and wrappers for enabling not-too-alien syntax when running columnar Collider HEP analysis"; homepage = "https://github.com/CoffeaTeam/coffea"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix index 0383e7d0f9..73af79e3c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix @@ -1,40 +1,43 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , poetry-core , pythonOlder -, aiohttp -, backoff , fastavro -, importlib-metadata +, httpx +, httpx-sse +, pydantic , requests -, urllib3 +, tokenizers +, types-requests +, typing-extensions }: buildPythonPackage rec { pname = "cohere"; - version = "4.56"; + version = "5.3.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rOAQzT1A/q74WnfazCMDtou7SnP0h+UGCyBxihqLmzc="; + hash = "sha256-tFoshbAl3RU2fWm/knSN5KMOyCq7Swj6UwG3LokFH+I="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - aiohttp - backoff + dependencies = [ fastavro - importlib-metadata + httpx + httpx-sse + pydantic requests - urllib3 + tokenizers + types-requests + typing-extensions ]; # tests require CO_API_KEY @@ -47,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simplify interfacing with the Cohere API"; homepage = "https://docs.cohere.com/docs"; - changelog = "https://github.com/cohere-ai/cohere-python/blob/main/CHANGELOG.md#${builtins.replaceStrings ["."] [""] version}"; + changelog = "https://github.com/cohere-ai/cohere-python/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/comicon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/comicon/default.nix index 04382d3ee3..72d89533e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/comicon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/comicon/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , poetry-core , pythonRelaxDepsHook +, pythonOlder , ebooklib , lxml , pillow @@ -13,6 +14,7 @@ buildPythonPackage rec { pname = "comicon"; version = "1.0.1"; pyproject = true; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "potatoeggy"; @@ -27,8 +29,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "lxml" - "pillow" + "pypdf" ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/command-runner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/command-runner/default.nix index fb8fd94f80..f50e32abd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/command-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/command-runner/default.nix @@ -1,17 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, psutil }: +{ + lib, + buildPythonPackage, + fetchFromGitHub, + psutil, + pytestCheckHook, + pythonOlder, + setuptools, +}: buildPythonPackage rec { pname = "command-runner"; version = "1.6.0"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - pname = "command_runner"; - inherit version; - sha256 = "sha256-lzt1UhhrPqQrBKsRmPhqhtOIfFlCteQqo6sZ6rOut0A="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "netinvent"; + repo = "command_runner"; + rev = "refs/tags/v${version}"; + hash = "sha256-QzqkcF2/YExK/dz+b0Uk0Af/rAXRMuRIeEynyFgDql8="; }; - propagatedBuildInputs = [ psutil ]; + build-system = [ setuptools ]; + + dependencies = [ psutil ]; + + # Tests are execute ping + # ping: socket: Operation not permitted + doCheck = false; + + pythonImportsCheck = [ "command_runner" ]; meta = with lib; { homepage = "https://github.com/netinvent/command_runner"; @@ -19,6 +38,7 @@ buildPythonPackage rec { Platform agnostic command execution, timed background jobs with live stdout/stderr output capture, and UAC/sudo elevation ''; + changelog = "https://github.com/netinvent/command_runner/releases/tag/v${version}"; license = licenses.bsd3; maintainers = teams.wdz.members; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/conda-libmamba-solver/default.nix new file mode 100644 index 0000000000..050b99fe83 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + pythonRelaxDepsHook, + fetchFromGitHub, + libmambapy, + hatchling, + hatch-vcs, + boltons, +}: +buildPythonPackage rec { + pname = "conda-libmamba-solver"; + version = "24.1.0"; + pyproject = true; + + src = fetchFromGitHub { + inherit pname version; + owner = "conda"; + repo = "conda-libmamba-solver"; + rev = version; + hash = "sha256-vsUYrDVNMKHd3mlaAFYCP4uPQ9HxeKsose5O8InaMcE="; + }; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ + boltons + libmambapy + ]; + + # this package depends on conda for the import to run succesfully, but conda depends on this package to execute. + # pythonImportsCheck = [ "conda_libmamba_solver" ]; + + pythonRemoveDeps = [ "conda" ]; + + meta = { + description = "The libmamba based solver for conda."; + homepage = "https://github.com/conda/conda-libmamba-solver"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.ericthemagician ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/conda-package-handling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/conda-package-handling/default.nix new file mode 100644 index 0000000000..5973672457 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/conda-package-handling/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + conda-package-streaming, +}: +buildPythonPackage rec { + pname = "conda-package-handling"; + version = "2.2.0"; + src = fetchFromGitHub { + owner = "conda"; + repo = "conda-package-handling"; + rev = version; + hash = "sha256-WeGfmT6lLwcwhheLBPMFcVMudY+zPsvTuXuOsiEAorQ="; + }; + + pyproject = true; + build-system = [ setuptools ]; + dependencies = [ conda-package-streaming ]; + + pythonImportsCheck = [ "conda_package_handling" ]; + + meta = { + description = "Create and extract conda packages of various formats"; + homepage = "https://github.com/conda/conda-package-handling"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.ericthemagician ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/conda-package-streaming/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/conda-package-streaming/default.nix new file mode 100644 index 0000000000..e849195f84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/conda-package-streaming/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + requests, + zstandard, +}: +buildPythonPackage rec { + pname = "conda-package-streaming"; + version = "0.9.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "conda"; + repo = "conda-package-streaming"; + rev = "v${version}"; + hash = "sha256-UTql2M+9eFDuHOwLYYKJ751wEcOfLJYzfU6+WF8Je2g="; + }; + + build-system = [ flit-core ]; + dependencies = [ + requests + zstandard + ]; + + pythonImportsCheck = [ "conda_package_streaming" ]; + + meta = { + description = "An efficient library to read from new and old format .conda and .tar.bz2 conda packages."; + homepage = "https://github.com/conda/conda-package-streaming"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.ericthemagician ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/conda/0001-conda_exe.patch b/third_party/nixpkgs/pkgs/development/python-modules/conda/0001-conda_exe.patch new file mode 100644 index 0000000000..12ea4bc5ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/conda/0001-conda_exe.patch @@ -0,0 +1,51 @@ +--- a/conda/base/context.py ++++ b/conda/base/context.py +@@ -754,7 +754,7 @@ + + @property + def conda_prefix(self): +- return abspath(sys.prefix) ++ return expand("~/.conda") + + @property + @deprecated( +@@ -787,28 +787,17 @@ + The vars can refer to each other if necessary since the dict is ordered. + None means unset it. + """ +- if context.dev: +- return { +- "CONDA_EXE": sys.executable, +- # do not confuse with os.path.join, we are joining paths with ; or : delimiters +- "PYTHONPATH": os.pathsep.join( +- (CONDA_SOURCE_ROOT, os.environ.get("PYTHONPATH", "")) +- ), +- "_CE_M": "-m", +- "_CE_CONDA": "conda", +- "CONDA_PYTHON_EXE": sys.executable, +- } +- else: +- bin_dir = "Scripts" if on_win else "bin" +- exe = "conda.exe" if on_win else "conda" +- # I was going to use None to indicate a variable to unset, but that gets tricky with +- # error-on-undefined. +- return { +- "CONDA_EXE": os.path.join(sys.prefix, bin_dir, exe), +- "_CE_M": "", +- "_CE_CONDA": "", +- "CONDA_PYTHON_EXE": sys.executable, +- } ++ import sys ++ return { ++ "CONDA_EXE": sys.executable, ++ # do not confuse with os.path.join, we are joining paths with ; or : delimiters ++ "PYTHONPATH": os.pathsep.join( ++ [CONDA_SOURCE_ROOT, os.environ.get("PYTHONPATH", "")] + [path for path in sys.path if "site-packages" in path] ++ ), ++ "_CE_M": "-m", ++ "_CE_CONDA": "conda", ++ "CONDA_PYTHON_EXE": sys.executable, ++ } + + @memoizedproperty + def channel_alias(self): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/conda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/conda/default.nix index e6dbe10914..adebce0b23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/conda/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/conda/default.nix @@ -1,38 +1,83 @@ -{ lib -, buildPythonPackage -, pythonAtLeast -, fetchPypi -, pycosat -, requests -, ruamel-yaml -, isPy3k -, enum34 +{ + lib, + buildPythonPackage, + pythonRelaxDepsHook, + hostPlatform, + fetchFromGitHub, + # build dependencies + hatchling, + hatch-vcs, + # runtime dependencies + archspec, + conda-libmamba-solver, + conda-package-handling, + distro, + jsonpatch, + packaging, + platformdirs, + pluggy, + pycosat, + requests, + ruamel-yaml, + tqdm, + truststore, + # runtime options + defaultEnvPath ? "~/.conda/envs", # default path to store conda environments + defaultPkgPath ? "~/.conda/pkgs", # default path to store download conda packages }: - -# Note: this installs conda as a library. The application cannot be used. -# This is likely therefore NOT what you're looking for. - buildPythonPackage rec { pname = "conda"; - version = "4.3.16"; - format = "setuptools"; + version = "24.4.0"; + pyproject = true; - # this is a very outdated version of conda that isn't compatible with python 3.10+ - disabled = pythonAtLeast "3.10"; - - src = fetchPypi { + src = fetchFromGitHub { inherit pname version; - sha256 = "a91ef821343dea3ba9670f3d10b36c1ace4f4c36d70c175d8fc8886e94285953"; + owner = "conda"; + repo = "conda"; + rev = "refs/tags/${version}"; + hash = "sha256-LdoBlR5EFYd2mQIjOgp1MH3w6osfRfurPq+N5Y1iaFw="; }; - propagatedBuildInputs = [ pycosat requests ruamel-yaml ] ++ lib.optional (!isPy3k) enum34; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - # No tests - doCheck = false; + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ + archspec + conda-libmamba-solver + conda-package-handling + distro + jsonpatch + packaging + platformdirs + pluggy + pycosat + requests + ruamel-yaml + tqdm + truststore + ]; + + patches = [ ./0001-conda_exe.patch ]; + + makeWrapperArgs = [ + "--set CONDA_EXE ${placeholder "out"}/bin/conda" + ''--set-default CONDA_ENVS_PATH "${defaultEnvPath}"'' + ''--set-default CONDA_PKGS_DIRS "${defaultPkgPath}"'' + ]; + + pythonImportsCheck = [ "conda" ]; + + # menuinst is currently not packaged + pythonRemoveDeps = lib.optionals (!hostPlatform.isWindows) [ "menuinst" ]; meta = { description = "OS-agnostic, system-level binary package manager"; homepage = "https://github.com/conda/conda"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.ericthemagician ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/contexttimer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/contexttimer/default.nix index f908783fb0..422ac17fb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/contexttimer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/contexttimer/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchFromGitHub , mock , fetchpatch @@ -11,6 +12,8 @@ buildPythonPackage rec { version = "unstable-2019-03-30"; format = "setuptools"; + disabled = pythonAtLeast "3.12"; + src = fetchFromGitHub { owner = "brouberol"; repo = "contexttimer"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix index 5e12a4531b..1f606a932d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix @@ -23,7 +23,7 @@ , pytestCheckHook }: -let countourpy = buildPythonPackage rec { +let contourpy = buildPythonPackage rec { pname = "contourpy"; version = "1.2.0"; format = "pyproject"; @@ -61,7 +61,7 @@ let countourpy = buildPythonPackage rec { ]; passthru.tests = { - check = countourpy.overridePythonAttrs (_: { doCheck = true; }); + check = contourpy.overridePythonAttrs (_: { doCheck = true; }); }; pythonImportsCheck = [ @@ -76,4 +76,4 @@ let countourpy = buildPythonPackage rec { maintainers = with maintainers; [ ]; }; }; -in countourpy +in contourpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/controku/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/controku/default.nix index e2dd1d32b7..80c4505175 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/controku/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/controku/default.nix @@ -8,7 +8,7 @@ , pygobject3 , gobject-introspection , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , buildApplication ? false }: @@ -28,7 +28,7 @@ python3Packages.buildPythonPackage rec { setuptools ] ++ lib.optionals buildApplication [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coordinates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coordinates/default.nix index e699e1b9a0..454a2b7083 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coordinates/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coordinates/default.nix @@ -1,33 +1,37 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytest +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "coordinates"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "clbarnes"; repo = "coordinates"; - rev = "v${version}"; - sha256 = "1zha594rshjg3qjq9mrai2hfldya282ihasp2i3km7b2j4gjdw2b"; + rev = "refs/tags/v${version}"; + hash = "sha256-S/AmH5FinTpHFFcrGAUSyjfqoIgq14QlHk9CnUkqCv4="; }; - nativeCheckInputs = [ pytest ]; + build-system = [ setuptools ]; - checkPhase = '' - runHook preCheck - pytest tests/ - runHook postCheck - ''; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "coordinates" ]; meta = with lib; { description = "Convenience class for doing maths with explicit coordinates"; homepage = "https://github.com/clbarnes/coordinates"; + changelog = "https://github.com/clbarnes/coordinates/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coredis/default.nix index 79faced6c3..75626ecc07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coredis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "coredis"; - version = "4.16.0"; + version = "4.17.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7qpoNc5/z8/EKtGWULrPPwfH9swYe9TqqUL+zxrFQSk="; + hash = "sha256-HfGmsIi8PnYbnC2020x474gtq0eqHjF7mSmRSHb0QxY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix index ff6ede5dcf..6484e549da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix @@ -1,26 +1,42 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools +, setuptools-scm , pyramid -, simplejson -, six -, venusian +, pytestCheckHook +, pytest-cache +, webtest +, marshmallow +, colander }: buildPythonPackage rec { pname = "cornice"; version = "6.1.0"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-v9G2wqmRp8yxsggrbenjuPGYtqK0oHqwgA4F3wWkU2E="; + src = fetchFromGitHub { + owner = "Cornices"; + repo = "cornice"; + rev = version; + hash = "sha256-jAf8unDPpr/ZAWkb9LhOW4URjwcRnaYVUKmfnYBStTg="; }; - propagatedBuildInputs = [ pyramid simplejson six venusian ]; + build-system = [ + setuptools + setuptools-scm + ]; - # tests not packaged with pypi release - doCheck = false; + dependencies = [ pyramid ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cache + webtest + marshmallow + colander + ]; pythonImportsCheck = [ "cornice" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/courlan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/courlan/default.nix index bd73aad197..fd2cfc01b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/courlan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/courlan/default.nix @@ -1,56 +1,58 @@ -{ lib -, buildPythonPackage -, fetchPypi -, langcodes -, pytestCheckHook -, tld -, urllib3 -, pythonOlder +{ + lib, + babel, + buildPythonPackage, + fetchPypi, + langcodes, + pytestCheckHook, + pythonOlder, + setuptools, + tld, + urllib3, }: buildPythonPackage rec { pname = "courlan"; - version = "1.0.0"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-PDVRHDZSXLL5Qc1nCbejp0LtlfC55WyX7sDBb9wDUYM="; + hash = "sha256-1wZoQzTxi+StofvVfyaArfADZkj22ECFL3pIItOt/Y0="; }; - propagatedBuildInputs = [ + # Tests try to write to /tmp directly. use $TMPDIR instead. + postPatch = '' + substituteInPlace tests/unit_tests.py \ + --replace-fail "\"courlan --help\"" "\"$out/bin/courlan --help\"" \ + --replace-fail "courlan_bin = \"courlan\"" "courlan_bin = \"$out/bin/courlan\"" \ + --replace-fail "/tmp" "$TMPDIR" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + babel langcodes tld urllib3 ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; # disable tests that require an internet connection - disabledTests = [ - "test_urlcheck" - ]; - - # tests try to write to /tmp directly. use $TMPDIR instead. - postPatch = '' - substituteInPlace tests/unit_tests.py \ - --replace "\"courlan --help\"" "\"$out/bin/courlan --help\"" \ - --replace "courlan_bin = \"courlan\"" "courlan_bin = \"$out/bin/courlan\"" \ - --replace "/tmp" "$TMPDIR" - ''; + disabledTests = [ "test_urlcheck" ]; pythonImportsCheck = [ "courlan" ]; meta = with lib; { description = "Clean, filter and sample URLs to optimize data collection"; - mainProgram = "courlan"; homepage = "https://github.com/adbar/courlan"; changelog = "https://github.com/adbar/courlan/blob/v${version}/HISTORY.md"; license = licenses.asl20; maintainers = with maintainers; [ jokatzke ]; + mainProgram = "courlan"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix index 4e4c86ae10..43919f97fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.4.3"; + version = "7.4.4"; pyproject = true; # uses f strings @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-J29gd6XGFEekjRM+0T51nAnmKv8NyEJ0po3BhmAQTVI="; + hash = "sha256-yQHfg9CXZJ4lfoA74iWSrt/VGC8Hs8yH1kC7ua/VD0k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/craft-application/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/craft-application/default.nix index 0b90ccdff0..998be770d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/craft-application/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/craft-application/default.nix @@ -1,40 +1,42 @@ { lib, + stdenv, buildPythonPackage, - fetchFromGitHub, - nix-update-script, - git, craft-archives, craft-cli, craft-grammar, craft-parts, craft-providers, + fetchFromGitHub, + git, + hypothesis, + nix-update-script, pydantic-yaml-0, - pyyaml, - setuptools, - setuptools-scm, - snap-helpers, - stdenv, - pygit2, pyfakefs, - pytestCheckHook, + pygit2, pytest-check, pytest-mock, + pytestCheckHook, + pythonOlder, + pyyaml, responses, - hypothesis, + setuptools-scm, + setuptools, + snap-helpers, }: buildPythonPackage rec { pname = "craft-application"; - version = "2.5.0"; - + version = "2.6.3"; pyproject = true; + disabled = pythonOlder "3.10"; + src = fetchFromGitHub { owner = "canonical"; repo = "craft-application"; rev = "refs/tags/${version}"; - hash = "sha256-66Ldo88DJ6v0+ekvDl++eDzhdn95yxq0SMdzQxTGl5k="; + hash = "sha256-ZhZoR8O5oxcF8+zzihiIbiC/j3AkDL7AjaJSlZ0N48s="; }; postPatch = '' @@ -45,12 +47,12 @@ buildPythonPackage rec { --replace-fail "setuptools==69.4.0" "setuptools" ''; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ craft-archives craft-cli craft-grammar @@ -62,8 +64,6 @@ buildPythonPackage rec { snap-helpers ]; - pythonImportsCheck = [ "craft_application" ]; - nativeCheckInputs = [ git hypothesis @@ -88,6 +88,8 @@ buildPythonPackage rec { --replace-fail "os_utils.OsRelease()" "os_utils.OsRelease(os_release_file='$HOME/os-release')" ''; + pythonImportsCheck = [ "craft_application" ]; + pytestFlagsArray = [ "tests/unit" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix index 7a79942990..da4fec24f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix @@ -1,30 +1,31 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, rustPlatform -, stdenv -, libiconv -, hypothesis -, numpy -, pytest-xdist -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + stdenv, + libiconv, + hypothesis, + numpy, + pytest-xdist, + pytestCheckHook, }: buildPythonPackage rec { pname = "cramjam"; - version = "2.8.2"; + version = "2.8.3"; pyproject = true; src = fetchFromGitHub { owner = "milesgranger"; repo = "pyrus-cramjam"; rev = "refs/tags/v${version}"; - hash = "sha256-BO35s7qOW4+l968I9qn9L1m2BtgRFNYUNlA7W1sctT8="; + hash = "sha256-1KD5/oZjfdXav1ZByQoyyiDSzbmY4VJsSJg/FtUFdDE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-YWXf+ZDJLq6VxI5sa9G63fCPz2377BVSTmPM0mQSu8M="; + hash = "sha256-Bp7EtyuLdLUfU3yvouNVE42klfqYt9QOwt+iGe521yI="; }; buildAndTestSubdir = "cramjam-python"; @@ -43,17 +44,11 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "cramjam-python/tests" - ]; + pytestFlagsArray = [ "cramjam-python/tests" ]; - disabledTestPaths = [ - "cramjam-python/benchmarks/test_bench.py" - ]; + disabledTestPaths = [ "cramjam-python/benchmarks/test_bench.py" ]; - pythonImportsCheck = [ - "cramjam" - ]; + pythonImportsCheck = [ "cramjam" ]; meta = with lib; { description = "Thin Python bindings to de/compression algorithms in Rust"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crc/default.nix index 9540e9d315..41452149ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crc/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "crc"; - version = "6.1.2"; + version = "7.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,31 +18,23 @@ buildPythonPackage rec { owner = "Nicoretti"; repo = "crc"; rev = "refs/tags/${version}"; - hash = "sha256-d946yBMrOIgMXGOr2ej5bvn59D5iAGMese24qdv8l/Y="; + hash = "sha256-y30tnGG+G9dWBO8MUFYm2IGHiGIPbv4kB2VwhV0/C74="; }; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "crc" - ]; + pythonImportsCheck = [ "crc" ]; - disabledTestPaths = [ - "test/bench" - ]; + disabledTestPaths = [ "test/bench" ]; meta = with lib; { - changelog = "https://github.com/Nicoretti/crc/releases/tag/${version}"; description = "Python module for calculating and verifying predefined & custom CRC's"; - mainProgram = "crc"; homepage = "https://nicoretti.github.io/crc/"; + changelog = "https://github.com/Nicoretti/crc/releases/tag/${version}"; license = licenses.bsd2; maintainers = with maintainers; [ jleightcap ]; + mainProgram = "crc"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix index 8db83b6199..86786baa2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "croniter"; - version = "2.0.3"; + version = "2.0.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KHY605xAThWRQIdPCAEM/YoY9MKnzqHOc+lQakOAz8E="; + hash = "sha256-8fjKCvZCEvvpmxvuEl7lobU6nBtDOWjYvKiBe3nSN/M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix deleted file mode 100644 index 977de2396f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast -, coverage, nose, pbkdf2 }: - -buildPythonPackage rec { - pname = "cryptacular"; - version = "1.6.2"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "7b529cb2b8a3c7e5be77921bf1ebc653d4d3a8f791375cc6f971b20db2404176"; - }; - - buildInputs = [ coverage nose ]; - propagatedBuildInputs = [ pbkdf2 ]; - - # TODO: tests fail: TypeError: object of type 'NoneType' has no len() - doCheck = false; - - # Python >=2.7.15, >=3.6.5 are incompatible: - # https://bitbucket.org/dholth/cryptacular/issues/11 - disabled = isPy27 || pythonAtLeast "3.6"; - - meta = with lib; { - maintainers = with maintainers; [ domenkozar ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix index e19a4137e4..0a42e56d40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cryptodatahub"; - version = "0.12.2"; + version = "0.12.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,19 +25,19 @@ buildPythonPackage rec { owner = "coroner"; repo = "cryptodatahub"; rev = "refs/tags/v${version}"; - hash = "sha256-zVHHBQYcl26zTtXPAs/AgKOojKQORu08rpkfY0l1zjM="; + hash = "sha256-+IGzXYSaeZjN5AxBu7jXgrnGtrtaSveFiVeNQRBZMNg="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace-warn "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" + --replace-fail "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ asn1crypto attrs pathlib2 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix index fc18fadc3a..61efe59f06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix @@ -1,36 +1,38 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools -, attrs -, asn1crypto -, cryptodatahub -, python-dateutil -, urllib3 -, pytestCheckHook +{ + lib, + asn1crypto, + attrs, + buildPythonPackage, + cryptodatahub, + fetchPypi, + pytestCheckHook, + python-dateutil, + pythonOlder, + setuptools, + unittestCheckHook, + urllib3, }: buildPythonPackage rec { pname = "cryptoparser"; - version = "0.12.3"; + version = "0.12.4"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { - pname = "CryptoParser"; - inherit version; - hash = "sha256-1A0VEpUPsYtEu2aT+ldt/Z/PtV8lvD+9jSx75yGB6Ao="; + inherit pname version; + hash = "sha256-y5rpc0tn5JJQr4xdRUJbsq8XT/YqqJqZr3CXjqN7k7I="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace-warn "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" + --replace-fail "attrs>=20.3.0,<22.0.1" "attrs>=20.3.0" ''; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ asn1crypto attrs cryptodatahub @@ -38,9 +40,7 @@ buildPythonPackage rec { urllib3 ]; - pythonImportsCheck = [ - "cryptoparser" - ]; + pythonImportsCheck = [ "cryptoparser" ]; meta = with lib; { description = "Security protocol parser and generator"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/css-inline/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/css-inline/Cargo.lock index 429622a63c..cbd1794e69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/css-inline/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/python-modules/css-inline/Cargo.lock @@ -17,6 +17,24 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -34,15 +52,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -55,27 +73,21 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "built" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" +checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16" dependencies = [ "cargo-lock", "chrono", @@ -83,9 +95,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -95,9 +107,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cargo-lock" @@ -113,12 +125,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" [[package]] name = "cfg-if" @@ -128,24 +137,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets 0.52.0", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", + "windows-targets 0.52.5", ] [[package]] @@ -181,11 +180,12 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "css-inline" -version = "0.13.0" +version = "0.14.1" dependencies = [ "cssparser", "html5ever", "indexmap", + "lru", "reqwest", "rustc-hash", "selectors", @@ -195,7 +195,7 @@ dependencies = [ [[package]] name = "css-inline-python" -version = "0.13.0" +version = "0.14.1" dependencies = [ "built", "css-inline", @@ -225,7 +225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.49", + "syn 2.0.60", ] [[package]] @@ -256,18 +256,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "equivalent" @@ -307,6 +298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -341,6 +333,7 @@ checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-io", + "futures-sink", "futures-task", "memchr", "pin-project-lite", @@ -359,9 +352,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", @@ -374,30 +367,15 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" -[[package]] -name = "h2" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] [[package]] name = "heck" @@ -407,29 +385,29 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "html5ever" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" dependencies = [ "log", "mac", "markup5ever", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.60", ] [[package]] name = "http" -version = "0.2.11" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -438,12 +416,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", "pin-project-lite", ] @@ -453,48 +443,60 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - [[package]] name = "hyper" -version = "0.14.28" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", "http", "hyper", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -532,9 +534,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.3" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -542,9 +544,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "ipnet" @@ -554,30 +556,30 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -585,9 +587,18 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown", +] [[package]] name = "mac" @@ -597,13 +608,13 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "markup5ever" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" dependencies = [ "log", - "phf 0.10.1", - "phf_codegen", + "phf 0.11.2", + "phf_codegen 0.11.2", "string_cache", "string_cache_codegen", "tendril", @@ -611,15 +622,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -641,26 +652,26 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[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 = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -692,9 +703,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -702,15 +713,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -748,6 +759,16 @@ dependencies = [ "phf_shared 0.10.0", ] +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", +] + [[package]] name = "phf_generator" version = "0.10.0" @@ -778,7 +799,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.60", ] [[package]] @@ -800,10 +821,30 @@ dependencies = [ ] [[package]] -name = "pin-project-lite" -version = "0.2.13" +name = "pin-project" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -811,6 +852,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -825,24 +872,25 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.20.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", "parking_lot", + "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -851,9 +899,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" dependencies = [ "once_cell", "target-lexicon", @@ -861,15 +909,15 @@ dependencies = [ [[package]] name = "pyo3-built" -version = "0.4.7" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be6d574e0f8cab2cdd1eeeb640cbf845c974519fa9e9b62fa9c08ecece0ca5de" +checksum = "35ee655adc94166665a1d714b439e27857dd199b947076891d6a17d32d396cde" [[package]] name = "pyo3-ffi" -version = "0.20.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" dependencies = [ "libc", "pyo3-build-config", @@ -877,33 +925,34 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.49", + "syn 2.0.60", ] [[package]] name = "pyo3-macros-backend" -version = "0.20.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" dependencies = [ "heck", "proc-macro2", + "pyo3-build-config", "quote", - "syn 2.0.49", + "syn 2.0.60", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -940,9 +989,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -960,29 +1009,30 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] name = "reqwest" -version = "0.11.24" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "base64", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-rustls", + "hyper-util", "ipnet", "js-sys", "log", @@ -992,11 +1042,11 @@ dependencies = [ "pin-project-lite", "rustls", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", "tokio-rustls", "tower-service", @@ -1010,16 +1060,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1036,40 +1087,50 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustls" -version = "0.21.10" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ "base64", + "rustls-pki-types", ] [[package]] -name = "rustls-webpki" -version = "0.101.7" +name = "rustls-pki-types" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" + +[[package]] +name = "rustls-webpki" +version = "0.102.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "scopeguard" @@ -1077,30 +1138,20 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "selectors" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" dependencies = [ - "bitflags 2.4.2", + "bitflags", "cssparser", "derive_more", "fxhash", "log", "new_debug_unreachable", "phf 0.10.1", - "phf_codegen", + "phf_codegen 0.10.0", "precomputed-hash", "servo_arc", "smallvec", @@ -1108,38 +1159,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.196" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -1193,18 +1244,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1245,6 +1296,12 @@ dependencies = [ "quote", ] +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + [[package]] name = "syn" version = "1.0.109" @@ -1258,9 +1315,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.49" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -1273,32 +1330,11 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "target-lexicon" -version = "0.12.13" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tendril" @@ -1328,9 +1364,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -1339,33 +1375,20 @@ dependencies = [ "num_cpus", "pin-project-lite", "socket2", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - [[package]] name = "toml" version = "0.7.8" @@ -1400,6 +1423,28 @@ dependencies = [ "winnow", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -1412,6 +1457,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-core", ] @@ -1445,9 +1491,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -1481,6 +1527,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + [[package]] name = "want" version = "0.3.1" @@ -1498,9 +1550,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1508,24 +1560,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.60", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -1535,9 +1587,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1545,28 +1597,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.49", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -1574,9 +1626,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "windows-core" @@ -1584,7 +1639,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -1596,6 +1651,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -1613,17 +1677,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -1634,9 +1699,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -1646,9 +1711,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -1658,9 +1723,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -1670,9 +1741,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -1682,9 +1753,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -1694,9 +1765,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -1706,9 +1777,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -1721,10 +1792,36 @@ dependencies = [ [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] + +[[package]] +name = "zerocopy" +version = "0.7.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/css-inline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/css-inline/default.nix index 41caa34ded..a265fcafeb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/css-inline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/css-inline/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "css-inline"; - version = "0.13.0"; + version = "0.14.1"; pyproject = true; src = fetchFromGitHub { owner = "Stranger6667"; repo = "css-inline"; rev = "python-v${version}"; - hash = "sha256-hhjeOr7EJc4Tmn/eQ1vF0xChSIlgfSmtqi6s7WCUq00="; + hash = "sha256-+hX05y+ii2/wAbcc3SPK3ns4slUKFGqHURb3Z08yhVw="; }; postPatch = '' @@ -42,7 +42,7 @@ buildPythonPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; name = "${pname}-${version}"; - hash = "sha256-noYBSwCfdpuwb55toyx4K/16Z4A0NWjnMuzwTi5g8AU="; + hash = "sha256-ogzj8JxiFX2VWEeEnKACycd2Bud9VUpLuF4h35eUls0="; }; nativeBuildInputs = [ @@ -67,6 +67,7 @@ buildPythonPackage rec { disabledTests = [ # fails to connect to local server + "test_cache" "test_remote_stylesheet" ] ++ lib.optionals (stdenv.isDarwin) [ # pyo3_runtime.PanicException: event loop thread panicked diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix index 0c006b281e..27bcf024aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/dabeaz/curio"; changelog = "https://github.com/dabeaz/curio/raw/${version}/CHANGES"; license = licenses.bsd3; - maintainers = [ maintainers.marsam ]; + maintainers = [ maintainers.pbsds ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curl-cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/curl-cffi/default.nix new file mode 100644 index 0000000000..3f752f703b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/curl-cffi/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, curl-impersonate-chrome +, cffi +, certifi +}: + +buildPythonPackage rec { + pname = "curl-cffi"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "yifeikong"; + repo = "curl_cffi"; + rev = "v${version}"; + hash = "sha256-VeBh5wp/VEMDGR2YK06w34hBv9qHIyA+EiZHrhEhAGw="; + }; + + patches = [ + ./use-system-libs.patch + ]; + buildInputs = [ + curl-impersonate-chrome + ]; + + format = "pyproject"; + build-system = [ + setuptools + ]; + + nativeBuildInputs = [ + cffi + ]; + propagatedBuildInputs = [ + cffi + certifi + ]; + + pythonImportsCheck = [ "curl_cffi" ]; + + meta = with lib; { + description = "Python binding for curl-impersonate via cffi"; + homepage = "https://curl-cffi.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ chuangzhu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curl-cffi/use-system-libs.patch b/third_party/nixpkgs/pkgs/development/python-modules/curl-cffi/use-system-libs.patch new file mode 100644 index 0000000000..1d044873e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/curl-cffi/use-system-libs.patch @@ -0,0 +1,23 @@ +diff --git a/scripts/build.py b/scripts/build.py +index b705a0d..9bfcaab 100644 +--- a/scripts/build.py ++++ b/scripts/build.py +@@ -105,7 +105,6 @@ def get_curl_libraries(): + ffibuilder = FFI() + system = platform.system() + root_dir = Path(__file__).parent.parent +-download_libcurl() + + + ffibuilder.set_source( +@@ -114,9 +113,7 @@ ffibuilder.set_source( + #include "shim.h" + """, + # FIXME from `curl-impersonate` +- libraries=get_curl_libraries(), +- extra_objects=get_curl_archives(), +- library_dirs=[arch["libdir"]], ++ libraries=["curl-impersonate-chrome"], + source_extension=".c", + include_dirs=[ + str(root_dir / "include"), diff --git a/third_party/nixpkgs/pkgs/development/python-modules/customtkinter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/customtkinter/default.nix new file mode 100644 index 0000000000..2aa4364816 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/customtkinter/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + setuptools, + wheel, + tkinter, + darkdetect, +}: +let + pname = "customtkinter"; + version = "5.2.2"; +in +buildPythonPackage { + inherit pname version; + pyproject = true; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-/Y2zuvqWHJgu5gMNuoC0wuJYWGMHVrUTmG2xkRPY0gc="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + buildInputs = [ tkinter ]; + propagatedBuildInputs = [ darkdetect ]; + + # No tests + doCheck = false; + pythonImportsCheck = [ "customtkinter" ]; + + meta = { + description = "A modern and customizable python UI-library based on Tkinter"; + homepage = "https://github.com/TomSchimansky/CustomTkinter"; + license = lib.licenses.mit; + longDescription = '' + CustomTkinter is a python UI-library based on Tkinter, which provides + new, modern and fully customizable widgets. They are created and + used like normal Tkinter widgets and can also be used in combination + with normal Tkinter elements. The widgets and the window colors + either adapt to the system appearance or the manually set mode + ('light', 'dark'), and all CustomTkinter widgets and windows support + HighDPI scaling (Windows, macOS). With CustomTkinter you'll get + a consistent and modern look across all desktop platforms + (Windows, macOS, Linux). + ''; + maintainers = with lib.maintainers; [ donteatoreo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix index 16a5adbf15..d3b057401e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildPythonPackage -, fetchpatch , clarabel , cvxopt , ecos @@ -20,26 +19,16 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.4.2"; + version = "1.4.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CjhqV4jb14t7IN0HFSTsY2yPpys2KOafGrxxTI+YEeU="; + hash = "sha256-sbB4yMBZI60Sjn2BSwvhwzesBSYqeLdXqOb5V2SK2VM="; }; - patches = [ - # fix QP tests. remove on next update - # https://github.com/cvxpy/cvxpy/pull/2343 - (fetchpatch { - name = "fix-QP-tests.patch"; - url = "https://github.com/cvxpy/cvxpy/commit/4c8549b9820e64c1b06f5d71c5d3f36528dd4a76.patch"; - hash = "sha256-43zjS1STEBaGgj1jEOlX3XzMsE4wjoKAk8ApJo98AzY="; - }) - ]; - # we need to patch out numpy version caps from upstream postPatch = '' sed -i 's/\(numpy>=[0-9.]*\),<[0-9.]*;/\1;/g' pyproject.toml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cycler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cycler/default.nix index 18e9fa7ed5..d7bfe37562 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cycler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cycler/default.nix @@ -36,6 +36,5 @@ buildPythonPackage rec { description = "Composable style cycles"; homepage = "https://github.com/matplotlib/cycler"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 10cd64f83e..4a2318693b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -1,29 +1,30 @@ -{ lib -, buildPythonPackage -, ddt -, fetchFromGitHub -, importlib-metadata -, jsonschema -, license-expression -, lxml -, packageurl-python -, py-serializable -, pythonRelaxDepsHook -, poetry-core -, pytestCheckHook -, pythonOlder -, requirements-parser -, sortedcontainers -, setuptools -, toml -, types-setuptools -, types-toml -, xmldiff +{ + lib, + buildPythonPackage, + ddt, + fetchFromGitHub, + importlib-metadata, + jsonschema, + license-expression, + lxml, + packageurl-python, + py-serializable, + pythonRelaxDepsHook, + poetry-core, + pytestCheckHook, + pythonOlder, + requirements-parser, + sortedcontainers, + setuptools, + toml, + types-setuptools, + types-toml, + xmldiff, }: buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "6.4.4"; + version = "7.3.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,15 +33,14 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-PNacp16WZHNblFyA117hSL87IKGMrW0OYNXCSoBoO8Q="; + hash = "sha256-rFxCeQTCQSpg0LQYyOxhk150KOUyV9PXdXo1mOA0KPw="; }; - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ importlib-metadata license-expression packageurl-python @@ -61,21 +61,15 @@ buildPythonPackage rec { xmldiff ]; - pythonImportsCheck = [ - "cyclonedx" - ]; + pythonImportsCheck = [ "cyclonedx" ]; - pythonRelaxDeps = [ - "py-serializable" - ]; + pythonRelaxDeps = [ "py-serializable" ]; preCheck = '' export PYTHONPATH=tests''${PYTHONPATH+:$PYTHONPATH} ''; - pytestFlagsArray = [ - "tests/" - ]; + pytestFlagsArray = [ "tests/" ]; disabledTests = [ # These tests require network access diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cymem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cymem/default.nix index f168ea39a3..52e24928ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cymem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cymem/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , cython , pytestCheckHook , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "cymem"; version = "2.0.8"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +21,8 @@ buildPythonPackage rec { hash = "sha256-e4lgV39lwC2Goqmd8Jjra+znuCpxsv2IsRXfFbQkGN8="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools cython ]; @@ -29,13 +31,9 @@ buildPythonPackage rec { ]; preCheck = '' - TEMPDIR=$(mktemp -d) - cp -R cymem/tests $TEMPDIR/ - pushd $TEMPDIR - ''; - - postCheck = '' - popd + # remove src module, so tests use the installed module instead + mv ./cymem/tests ./tests + rm -r ./cymem ''; pythonImportsCheck = [ @@ -47,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/cymem"; changelog = "https://github.com/explosion/cymem/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix index 025692de1f..315492e38e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix @@ -7,6 +7,9 @@ , gmp , cython , cysignals + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -53,6 +56,8 @@ buildPythonPackage rec { make check ''; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Cython bindings for PARI"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix index 9bf5e8fcd8..4f562c00a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { "pypng" "tzlocal" "yoyo-migrations" + "waitress" ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cysignals/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cysignals/default.nix index 62cc3dd30d..fc53c5c9f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cysignals/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cysignals/default.nix @@ -4,6 +4,9 @@ , buildPythonPackage , cython , pariSupport ? true, pari # for interfacing with the PARI/GP signal handler + +# Reverse dependency +, sage }: assert pariSupport -> pari != null; @@ -46,6 +49,8 @@ buildPythonPackage rec { enableParallelBuilding = true; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Interrupt and signal handling for Cython"; mainProgram = "cysignals-CSI"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cython/0.nix b/third_party/nixpkgs/pkgs/development/python-modules/cython/0.nix index 72ba4a68f0..e0b6c02d8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cython/0.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cython/0.nix @@ -86,6 +86,5 @@ in buildPythonPackage rec { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; homepage = "https://cython.org"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cython/default.nix index 4467dc3b45..fecb9cad26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cython/default.nix @@ -8,6 +8,9 @@ , gdb , numpy , ncurses + +# Reverse dependency +, sage }: let @@ -24,13 +27,13 @@ let in buildPythonPackage rec { pname = "cython"; - version = "3.0.9"; + version = "3.0.10"; pyproject = true; src = fetchPypi { pname = "Cython"; inherit version; - hash = "sha256-otNU8FnR8FXTTPqmLFtovHisLOq2QHFI1H+1CM87pPM="; + hash = "sha256-3MlnOTMfuFTc9QP5RgdXbP6EiAZsYcpQ39VYNvEy3pk="; }; build-system = [ @@ -57,6 +60,8 @@ in buildPythonPackage rec { doCheck = false; # doCheck = !stdenv.isDarwin; + passthru.tests = { inherit sage; }; + # force regeneration of generated code in source distributions # https://github.com/cython/cython/issues/5089 setupHook = ./setup-hook.sh; @@ -66,6 +71,5 @@ in buildPythonPackage rec { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; homepage = "https://cython.org"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix index afa9152c9b..ddb7b7df0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix @@ -47,6 +47,5 @@ buildPythonPackage rec { homepage = "https://github.com/pytoolz/cytoolz/"; description = "Cython implementation of Toolz: High performance functional utilities"; license = licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix index e24b06a23b..26f2c2bb51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix @@ -77,6 +77,8 @@ buildPythonPackage rec { "test_basic_root_works" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Native Dask collection for awkward arrays, and the library to use it"; homepage = "https://github.com/dask-contrib/dask-awkward"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix new file mode 100644 index 0000000000..657d588931 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + setuptools, + versioneer, + wheel, + dask, + pandas, + pyarrow, + distributed, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "dask-expr"; + version = "1.1.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "dask"; + repo = "dask-expr"; + rev = "refs/tags/v${version}"; + hash = "sha256-yVwaOOjxHVxAhFlEENnjpX8LbJs9MW0OOmwAH5RhPgE="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "versioneer[toml]==0.28" "versioneer[toml]" + ''; + + nativeBuildInputs = [ + setuptools + versioneer + wheel + ]; + + propagatedBuildInputs = [ + dask + pandas + pyarrow + ]; + + pythonImportsCheck = [ "dask_expr" ]; + + nativeCheckInputs = [ + distributed + pytestCheckHook + ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = ""; + homepage = "https://github.com/dask/dask-expr"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix index dd5cfe0d29..15a7df7fe0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix @@ -59,6 +59,8 @@ buildPythonPackage rec { "test_determinism_distributed" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Generalized Linear Models with Dask"; homepage = "https://github.com/dask/dask-glm/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix index dc668ea263..69ef4a56f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -8,6 +8,7 @@ , fetchPypi , pytest-asyncio , pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -16,7 +17,8 @@ buildPythonPackage rec { version = "0.8.5"; format = "setuptools"; - disabled = pythonOlder "3.8"; + # Python 3.12 support should be added in 0.8.6 + disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix index 3cb7ed9618..9c19a072ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix @@ -1,37 +1,47 @@ { lib , buildPythonPackage +, pythonOlder +, fetchFromGitHub +, hatch-vcs +, hatchling +, setuptools-scm , dask +, dask-expr , dask-glm , distributed -, fetchPypi , multipledispatch , numba , numpy , packaging , pandas -, pythonOlder , scikit-learn , scipy -, setuptools-scm +, pytest-mock +, pytestCheckHook }: buildPythonPackage rec { pname = "dask-ml"; - version = "2023.3.24"; - format = "setuptools"; + version = "2024.4.4"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-lsCQ220yg2U24/Ccpk3rWZ6GRYeqjj1NLGtK9YhzMwc="; + src = fetchFromGitHub { + owner = "dask"; + repo = "dask-ml"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZiBpCk3b4Tk0Hwb4uapJLEx+Nb/qHFROCnkBTNGDzoU="; }; - nativeBuildInputs = [ + build-system = [ + hatch-vcs + hatchling setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ + dask-expr dask-glm distributed multipledispatch @@ -44,9 +54,6 @@ buildPythonPackage rec { ] ++ dask.optional-dependencies.array ++ dask.optional-dependencies.dataframe; - # has non-standard build from source, and pypi doesn't include tests - doCheck = false; - pythonImportsCheck = [ "dask_ml" "dask_ml.naive_bayes" @@ -54,10 +61,17 @@ buildPythonPackage rec { "dask_ml.utils" ]; + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + ]; + + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Scalable Machine Learn with Dask"; homepage = "https://github.com/dask/dask-ml"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ GaetanLepage ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-yarn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-yarn/default.nix index acea511b24..c14f52aa43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-yarn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-yarn/default.nix @@ -1,20 +1,22 @@ { lib -, stdenv , buildPythonPackage -, dask -, distributed +, pythonOlder , fetchFromGitHub , fetchpatch +, setuptools +, versioneer +, dask +, distributed , grpcio -, pytestCheckHook -, pythonOlder , skein +, pytestCheckHook +, stdenv }: buildPythonPackage rec { pname = "dask-yarn"; version = "0.9"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -33,9 +35,18 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ - distributed + postPatch = '' + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ dask + distributed grpcio skein ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix index ee12386ae3..8de709f446 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch # build-system , setuptools @@ -29,6 +28,7 @@ # tests , arrow-cpp +, dask-expr , hypothesis , pytest-asyncio , pytest-rerunfailures @@ -37,9 +37,9 @@ , pythonOlder }: -buildPythonPackage rec { +let self = buildPythonPackage rec { pname = "dask"; - version = "2024.2.1"; + version = "2024.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -48,22 +48,9 @@ buildPythonPackage rec { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-8VFtKPaF0PqCjqFB+plFe1GjUno5j7j86+wxKhzByyw="; + hash = "sha256-2tkY02Inhpo8upTjhen//EvsZwd93roPCID215NOxwQ="; }; - patches = [ - # A pair of fixes with python 3.11.9, merged upstream; - # see https://github.com/dask/dask/issues/11038 - (fetchpatch { - url = "https://github.com/dask/dask/pull/11035.diff"; - hash = "sha256-aQTzas8gn7pCyp7L6VV3NpSYgqC1Ov7YN7YGnX0Vwmo="; - }) - (fetchpatch { - url = "https://github.com/dask/dask/pull/11039.diff"; - hash = "sha256-gvEEvnyhFlhiFvVaB6jwMy4auUOvECf49FbFJyjqQm4="; - }) - ]; - nativeBuildInputs = [ setuptools wheel @@ -93,6 +80,7 @@ buildPythonPackage rec { ++ self.distributed ++ self.diagnostics; dataframe = [ + # dask-expr -> circular dependency with dask-expr numpy pandas ]; @@ -106,6 +94,7 @@ buildPythonPackage rec { }); nativeCheckInputs = [ + dask-expr pytestCheckHook pytest-rerunfailures pytest-xdist @@ -113,6 +102,7 @@ buildPythonPackage rec { hypothesis pytest-asyncio ] + ++ passthru.optional-dependencies.array ++ passthru.optional-dependencies.dataframe ++ lib.optionals (!arrow-cpp.meta.broken) [ # support is sparse on aarch64 pyarrow @@ -172,21 +162,35 @@ buildPythonPackage rec { pythonImportsCheck = [ "dask" - "dask.array" "dask.bag" "dask.bytes" - "dask.dataframe" - "dask.dataframe.io" - "dask.dataframe.tseries" "dask.diagnostics" ]; + doCheck = false; + + # Enable tests via passthru to avoid cyclic dependency with dask-expr. + passthru.tests = { + check = self.overridePythonAttrs (old: { + doCheck = true; + pythonImportsCheck = [ + # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs` + "dask.array" + # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs` + "dask.dataframe" + "dask.dataframe.io" + "dask.dataframe.tseries" + ] ++ old.pythonImportsCheck; + }); + }; + + meta = with lib; { description = "Minimal task scheduling abstraction"; mainProgram = "dask"; homepage = "https://dask.org/"; changelog = "https://docs.dask.org/en/latest/changelog.html"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; + maintainers = with maintainers; [ GaetanLepage ]; }; -} +}; in self diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix index 2e3132fb5b..85e64fea78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "11.3.26"; + version = "11.3.33"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YjUY4i8PtXc+fWcGjvnRbZkiINprKcS1K9HT5+86E8c="; + hash = "sha256-KcqJ2B2df85H/VIx4ToX0pJ7rYbjDRp3eR7jAFW67do="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix index 2718a88379..05f5eb06e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , hypothesis -, marshmallow-enum +, marshmallow , poetry-core , poetry-dynamic-versioning , pytestCheckHook @@ -12,31 +12,31 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.6.4"; - format = "pyproject"; + version = "0.6.5"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "lidatong"; - repo = pname; + repo = "dataclasses-json"; rev = "refs/tags/v${version}"; - hash = "sha256-izNDvljUWw60joi5WfCfoqL5SDM8Jz5Pz+lI/RP35n8="; + hash = "sha256-YkGxUQgnUB7WfpsZz74b3j/TIqJi2ihsk9Ib05S7uPM="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; - nativeBuildInputs = [ + build-system = [ poetry-core poetry-dynamic-versioning ]; - propagatedBuildInputs = [ + dependencies = [ typing-inspect - marshmallow-enum + marshmallow ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix index 3555387b3a..0ff05992b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.18.0"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mLiIE1RYUNUhh8nhG7TBr7XUdWlJzeWDuUNvoBk0eyw="; + hash = "sha256-m3x3/MCezA0WjYKBa2F12emMZdwLKi/9bFBf59A4qs8="; }; # remove pyarrow<14.0.1 vulnerability fix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix index 899da93bfc..87ac07e6a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.16.0"; + version = "0.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7UwRGVdXjcs/z/ly2VT3dYba/XGnNF/VzQadn7BQ0NE="; + hash = "sha256-Wy8d1Eje/OIG7MFumWD+k3jzIwfqH8sMKYwiwU9YyIE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashape/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashape/default.nix index 6736483a8b..459fc54846 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datashape/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datashape/default.nix @@ -46,6 +46,5 @@ in buildPythonPackage rec { homepage = "https://github.com/ContinuumIO/datashape"; description = "A data description language"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix index e440fb6919..db61698ebf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.7.12"; + version = "1.7.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-core"; rev = "refs/tags/v${version}"; - hash = "sha256-mkqtlItr6oRsF5S+CPw4fAP/INJ2yw3vcKxEYeB3ItI="; + hash = "sha256-uai1ihdmJpFkQqpx7edWiwwy0ek4dbclR/2OuiNbaXM="; }; sourceRoot = "${src.name}/core"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix index 7d7f2e3765..ea543b6ee4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.7.6"; + version = "1.7.7"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-redshift"; rev = "refs/tags/v${version}"; - hash = "sha256-p75WEozbkPXBThuW8i1tpJmca1nxBXTlGQR9U976mOs="; + hash = "sha256-DKqJ/8hEPe9O9YrAjrTL2Gh1lj6QrdtHtd7aarZ7GkQ="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix index d4db449041..736605ebec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix @@ -1,44 +1,43 @@ -{ lib -, async-timeout -, buildPythonPackage -, cython -, fetchFromGitHub -, poetry-core -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools -, wheel +{ + lib, + async-timeout, + buildPythonPackage, + cython, + fetchFromGitHub, + poetry-core, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, + wheel, }: buildPythonPackage rec { pname = "dbus-fast"; - version = "2.21.1"; - format = "pyproject"; + version = "2.21.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "dbus-fast"; rev = "refs/tags/v${version}"; - hash = "sha256-L3PZjxbcVfqWktWuN5l8JxfR1GyxuA+1ZtO/W2YqFZA="; + hash = "sha256-CLv8pNs6P2XRNK5wjo2SbRUuasJVXvd9LFABOwjDA9k="; }; # The project can build both an optimized cython version and an unoptimized # python version. This ensures we fail if we build the wrong one. env.REQUIRE_CYTHON = 1; - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools wheel ]; - propagatedBuildInputs = [ - async-timeout - ]; + dependencies = [ async-timeout ]; nativeCheckInputs = [ pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-python/default.nix index be7504e5dc..4e6f67f0a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-python/default.nix @@ -1,47 +1,99 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, python, pkg-config, dbus, dbus-glib, isPyPy -, ncurses, pygobject3, isPy3k, pythonAtLeast }: +{ lib +, fetchPypi +, buildPythonPackage +, fetchpatch +, isPyPy +, python + +# build-system +, meson +, meson-python +, pkg-config + +# native dependencies +, dbus +, dbus-glib +}: buildPythonPackage rec { pname = "dbus-python"; - version = "1.2.18"; + version = "1.3.2"; + pyproject = true; - # ModuleNotFoundError: No module named 'distutils' - disabled = isPyPy || pythonAtLeast "3.12"; - format = "other"; - outputs = [ "out" "dev" ]; + disabled = isPyPy; + + outputs = [ + "out" + "dev" + ]; src = fetchPypi { inherit pname version; - sha256 = "0q3jrw515z98mqdk9x822nd95rky455zz9876f1nqna5igkd3gcj"; + hash = "sha256-rWeBkwhhi1BpU3viN/jmjKHH/Mle5KEh/mhFsUGCSPg="; }; patches = [ - ./fix-includedir.patch + # reduce required dependencies + # https://gitlab.freedesktop.org/dbus/dbus-python/-/merge_requests/23 + (fetchpatch { + url = "https://gitlab.freedesktop.org/dbus/dbus-python/-/commit/d5e19698a8d6e1485f05b67a5b2daa2392819aaf.patch"; + hash = "sha256-Rmj/ByRLiLnIF3JsMBElJugxsG8IARcBdixLhoWgIYU="; + }) ]; - preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) '' - MACOSX_DEPLOYMENT_TARGET=10.16 + postPatch = '' + # we provide patchelf natively, not through the python package + sed -i '/patchelf/d' pyproject.toml + + # dont run autotols configure phase + rm configure.ac configure + + patchShebangs test/*.sh ''; - configureFlags = [ - "PYTHON=${python.pythonOnBuildForHost.interpreter}" + nativeBuildInputs = [ + meson + meson-python + pkg-config ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dbus dbus-glib ] - # My guess why it's sometimes trying to -lncurses. - # It seems not to retain the dependency anyway. - ++ lib.optional (! python ? modules) ncurses; + buildInputs = [ + dbus + dbus-glib + ]; - doCheck = isPy3k; - nativeCheckInputs = [ dbus.out pygobject3 ]; + pypaBuildFlags = [ + # Don't discard meson build directory, still needed for tests! + "-Cbuild-dir=_meson-build" + ]; + # workaround bug in meson-python + # https://github.com/mesonbuild/meson-python/issues/240 postInstall = '' - cp -r dbus_python.egg-info $out/${python.sitePackages}/ + mkdir -p $dev/lib + mv $out/${python.sitePackages}/.dbus_python.mesonpy.libs/pkgconfig/ $dev/lib + ''; + + # make sure the Cflags in the pkgconfig file are correct and make the structure backwards compatible + postFixup = '' + ln -s $dev/include/*/dbus_python/dbus-1.0/ $dev/include/dbus-1.0 + ''; + + nativeCheckInputs = [ + dbus.out + ]; + + checkPhase = '' + runHook preCheck + + meson test -C _meson-build --no-rebuild --print-errorlogs + + runHook postCheck ''; meta = with lib; { description = "Python DBus bindings"; + homepage = "https://gitlab.freedesktop.org/dbus/dbus-python"; license = licenses.mit; platforms = dbus.meta.platforms; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-python/fix-includedir.patch b/third_party/nixpkgs/pkgs/development/python-modules/dbus-python/fix-includedir.patch deleted file mode 100644 index e3bb0682b5..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-python/fix-includedir.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/dbus-python.pc.in -+++ b/dbus-python.pc.in -@@ -9,4 +9,4 @@ - Description: Python bindings for D-Bus - Requires: dbus-1 >= 1.0 - Version: @VERSION@ --Cflags: -I${includedir} -+Cflags: -I${includedir}/dbus-1.0 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix index 570f770e77..49d3d00c11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix @@ -1,23 +1,28 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "dbutils"; - version = "3.0.3"; - format = "setuptools"; + version = "3.1.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "DBUtils"; - hash = "sha256-jkhWWxKtK0sfIU3gKU3utLKFePWyq7QNaMKSS2TX4Ac="; + hash = "sha256-6lKLoRBjJA7qgjRevG98yTJMBuQulCCwC80kWpW/zCQ="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -26,10 +31,11 @@ buildPythonPackage rec { "dbutils" ]; - meta = with lib; { + meta = { description = "Database connections for multi-threaded environments"; homepage = "https://webwareforpython.github.io/DBUtils/"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + changelog = "https://webwareforpython.github.io/DBUtils/changelog.html"; + license = lib.licenses.mit; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix index ef114da4ca..17edaa445d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix @@ -1,43 +1,44 @@ -{ lib -, aiohttp -, aiomqtt -, buildPythonPackage -, cachetools -, defusedxml -, docker -, fetchFromGitHub -, numpy -, pillow -, pycountry -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-scm -, svg-py -, testfixtures +{ + lib, + aiohttp, + aiomqtt, + buildPythonPackage, + cachetools, + defusedxml, + docker, + fetchFromGitHub, + numpy, + pillow, + pycountry, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, + svg-py, + testfixtures, }: buildPythonPackage rec { pname = "deebot-client"; - version = "6.0.2"; + version = "7.2.0"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-PjM2bh79o4bBv3zQyFYehhdlvXKFW8Hk0ZKfZDAuiQU="; + hash = "sha256-5GALvd9p+ksxWqkfkSd07mPNzQSbdeGzrUjQU2nWs3g="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aiomqtt cachetools @@ -55,9 +56,7 @@ buildPythonPackage rec { testfixtures ]; - pythonImportsCheck = [ - "deebot_client" - ]; + pythonImportsCheck = [ "deebot_client" ]; disabledTests = [ # Tests require running container diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepl/default.nix index aa4a0b2ed1..cf934f75b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepl/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "deepl"; - version = "1.17.0"; + version = "1.18.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-IwBKgkfXXYAgat7E4pAS5f9UNOmY9yRj4ZP85wSt4cs="; + hash = "sha256-WuQXY5OUQe28p2QP00QoDL7kfUkGQc41IGkQqLAed44="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix index b56a6b0849..f406bcd4cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/desktop-notifier/default.nix @@ -6,12 +6,13 @@ , packaging , setuptools , dbus-next +, rubicon-objc }: buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.5.6"; - format = "pyproject"; + version = "4.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,17 +20,19 @@ buildPythonPackage rec { owner = "SamSchott"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-txUWRCWLQ6jWrdEJ/D5+CsflNad5Onr/wLycENri1z8="; + hash = "sha256-6FtxfY0vjCbCueeXdAXOy6XSjne4I7brQ5OvJ+Q1KsQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ packaging ] ++ lib.optionals stdenv.isLinux [ dbus-next + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + rubicon-objc ]; # no tests available, do the imports check instead @@ -45,6 +48,5 @@ buildPythonPackage rec { changelog = "https://github.com/samschott/desktop-notifier/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; - platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix index a50b6dbd81..ae0e2c4cda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { description = "An enterprise friendly way of detecting and preventing secrets in code"; homepage = "https://github.com/Yelp/detect-secrets"; license = licenses.asl20; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix index 064899b8e7..719bdf3aaf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix @@ -15,7 +15,6 @@ , nbval , psutil , py-cpuinfo -, pyrevolve , pytest-xdist , pytestCheckHook , pythonOlder @@ -26,7 +25,7 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.3"; + version = "4.8.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +34,7 @@ buildPythonPackage rec { owner = "devitocodes"; repo = "devito"; rev = "refs/tags/v${version}"; - hash = "sha256-g9rRJF1JrZ6+s3tj4RZHuGOjt5LJjtK9I5CJmq4CJL4="; + hash = "sha256-unuJLp+zTyGpOk5O78xYbW6Zrzp60WyqgT9mf2YpTG4="; }; pythonRemoveDeps = [ @@ -51,7 +50,7 @@ buildPythonPackage rec { pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ anytree cached-property cgen @@ -62,7 +61,6 @@ buildPythonPackage rec { multidict psutil py-cpuinfo - pyrevolve scipy sympy ] ++ lib.optionals stdenv.cc.isClang [ @@ -99,6 +97,20 @@ buildPythonPackage rec { "test_setupWOverQ" "test_shortcuts" "test_subdomainset_mpi" + "test_subdomains_mpi" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False + "test_v0" + ] ++ lib.optionals stdenv.isDarwin [ + # FAILED tests/test_caching.py::TestCaching::test_special_symbols - ValueError: not enough values to unpack (expected 3, got 2) + "test_special_symbols" + + # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - codepy.CompileError: module compilation failed + "test_v0" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Numerical tests + "test_lm_fb" + "test_lm_ds" ]; disabledTestPaths = [ @@ -109,6 +121,8 @@ buildPythonPackage rec { "tests/test_data.py" "tests/test_dse.py" "tests/test_gradient.py" + ] ++ lib.optionals ((stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin) [ + "tests/test_dle.py" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diffusers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diffusers/default.nix index 39464efe47..19fe676abb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diffusers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diffusers/default.nix @@ -1,8 +1,9 @@ { lib , stdenv , buildPythonPackage -, fetchFromGitHub , pythonOlder +, fetchFromGitHub +, fetchpatch , writeText , setuptools , wheel @@ -35,6 +36,7 @@ , sentencepiece , torchsde , transformers +, pythonAtLeast }: buildPythonPackage rec { @@ -51,12 +53,26 @@ buildPythonPackage rec { hash = "sha256-aRnbU3jN40xaCsoMFyRt1XB+hyIYMJP2b/T1yZho90c="; }; - nativeBuildInputs = [ + patches = [ + # fix python3.12 build + (fetchpatch { # https://github.com/huggingface/diffusers/pull/7455 + name = "001-remove-distutils.patch"; + url = "https://github.com/huggingface/diffusers/compare/363699044e365ef977a7646b500402fa585e1b6b...3c67864c5acb30413911730b1ed4a9ad47c0a15c.patch"; + hash = "sha256-Qyvyp1GyTVXN+A+lA1r2hf887ubTtaUknbKd4r46NZQ="; + }) + (fetchpatch { # https://github.com/huggingface/diffusers/pull/7461 + name = "002-fix-removed-distutils.patch"; + url = "https://github.com/huggingface/diffusers/commit/efbbbc38e436a1abb1df41a6eccfd6f9f0333f97.patch"; + hash = "sha256-scdtpX1RYFFEDHcaMb+gDZSsPafkvnIO/wQlpzrQhLA="; + }) + ]; + + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ filelock huggingface-hub importlib-metadata @@ -143,6 +159,10 @@ buildPythonPackage rec { "test_model_cpu_offload_forward_pass" # tries to run ruff which we have intentionally removed from nativeCheckInputs "test_is_copy_consistent" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + + # RuntimeError: Dynamo is not supported on Python 3.12+ + "test_from_save_pretrained_dynamo" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dirigera/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dirigera/default.nix index 649c79632a..7b5f5d5366 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dirigera/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dirigera/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dirigera"; - version = "1.1.4"; + version = "1.1.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Leggin"; repo = "dirigera"; rev = "refs/tags/v${version}"; - hash = "sha256-60DLNp3mM4LpnmM98JVcKlOxj20jvtsBnYq7tL4WEW8="; + hash = "sha256-KAwXpcs0EvmaxBVgZ7TlT1hDI0m7f8hJigUTluVATsw="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-archive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-archive/default.nix new file mode 100644 index 0000000000..864e6eb1ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-archive/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + pythonOlder, + setuptools, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "dissect-archive"; + version = "1.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.archive"; + rev = "refs/tags/${version}"; + hash = "sha256-DUAJUbG3k6sbO7mqvNzQQns+4l8XHDUh0xZ/RA5LWEY="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + dissect-cstruct + dissect-util + ]; + + pythonImportsCheck = [ "dissect.archive" ]; + + meta = with lib; { + description = "Dissect module implementing parsers for various archive and backup formats"; + homepage = "https://github.com/fox-it/dissect.archive"; + changelog = "https://github.com/fox-it/dissect.archive/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-btrfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-btrfs/default.nix index 8b492ae667..72f5fd9669 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-btrfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-btrfs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dissect-btrfs"; - version = "1.2"; + version = "1.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.btrfs"; rev = "refs/tags/${version}"; - hash = "sha256-nWgeChHHCAjD5I98h2/1HrO5688aZUM4j2PJiD1xP0g="; + hash = "sha256-Xn7y9om/IuCaPR77lSuC0peF5umIxu2BS9esMPXsv+Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix index c9aef3e961..9073873f14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix @@ -1,45 +1,42 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "dissect-cim"; - version = "3.8"; - format = "pyproject"; + version = "3.9"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cim"; rev = "refs/tags/${version}"; - hash = "sha256-NbGI6d1C3X7PbTsbDSCS4AUK6ueCBOuQDTNhkULrLYc="; + hash = "sha256-UZ4mlshaKqZKoysvnGfcaoMOrMwfsN/qOJ8hrpMcQL0="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.cim" - ]; + pythonImportsCheck = [ "dissect.cim" ]; meta = with lib; { description = "Dissect module implementing a parser for the Windows Common Information Model (CIM) database"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix index 1007dcc07c..287896b244 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "dissect-clfs"; - version = "1.7"; + version = "1.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,25 +20,19 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.clfs"; rev = "refs/tags/${version}"; - hash = "sha256-DBnZlyk7rjuTpOjgFUmSNxqvIZk8OxACNqyFDcENFHM="; + hash = "sha256-C1a85OLMkj0vjnRpenfC/xyxJ1TjYSlHPOq0jIrA/Ng="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ - dissect-cstruct - ]; + dependencies = [ dissect-cstruct ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.clfs" - ]; + pythonImportsCheck = [ "dissect.clfs" ]; meta = with lib; { description = "Dissect module implementing a parser for the CLFS (Common Log File System) file system"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index 7b25a817aa..3924f0c516 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -1,25 +1,26 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, flow-record -, httpx -, lark -, pycryptodome -, pyshark -, pytest-httpserver -, pytestCheckHook -, pythonOlder -, rich -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + flow-record, + httpx, + lark, + pycryptodome, + pyshark, + pytest-httpserver, + pytestCheckHook, + pythonOlder, + rich, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "dissect-cobaltstrike"; version = "1.0.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -30,12 +31,12 @@ buildPythonPackage rec { hash = "sha256-CS50c3r7sdxp3CRS6XJ4QUmUFtmhFg6rSdKfYzJSOV4="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util lark @@ -69,9 +70,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pythonImportsCheck = [ - "dissect.cobaltstrike" - ]; + pythonImportsCheck = [ "dissect.cobaltstrike" ]; meta = with lib; { description = "Dissect module implementing a parser for Cobalt Strike related data"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix index a1ed699aef..04a64d8a9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -1,15 +1,16 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "dissect-cstruct"; - version = "3.13"; + version = "3.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,21 +19,17 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-QfnvWCI67y8GdCfXIRaehzb26IVZ8N0muUnNpr1NGJo="; + hash = "sha256-Et6Pb7iRVlxcrR4gZf+5h7mVikf7CyDd7N+q4TH18vg="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.cstruct" - ]; + pythonImportsCheck = [ "dissect.cstruct" ]; meta = with lib; { description = "Dissect module implementing a parser for C-like structures"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix index 0a6810749b..5784939b2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; - version = "3.12"; + version = "3.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.esedb"; rev = "refs/tags/${version}"; - hash = "sha256-s3ZIK4ZtHU5B3f9ojVTC2Aqn3G7CosTvdV6U3cwEatY="; + hash = "sha256-GdHMKLO44hR+H3fQ9h3t6sL8ACMwIVeg4nrg9brYmsU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix index c7b9236c75..10ceff3e6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "dissect-etl"; - version = "3.8"; + version = "3.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,26 +21,22 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.etl"; rev = "refs/tags/${version}"; - hash = "sha256-yGpDZAaw11Sr5OPWxbY/NpZAV3jJUIgtTgDykCvYDtM="; + hash = "sha256-gLxBVHhtQS4Ep64H4jvndGyjUW1cQ68f346utVI9eC4="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.etl" - ]; + pythonImportsCheck = [ "dissect.etl" ]; meta = with lib; { description = "Dissect module implementing a parser for Event Trace Log (ETL) files"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix index d8ace92854..a57ddd56cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-eventlog"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.eventlog"; rev = "refs/tags/${version}"; - hash = "sha256-YiWW1olaIKoBfiZfr4TfIEsnj/C4cmn6sYosvjeiEfM="; + hash = "sha256-MvCHeeuwwE/EOK5rh5vtwTtMrSO/BtfFenQZn5VTgb0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix index d8f9823634..6f617db679 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "dissect-evidence"; - version = "3.8"; + version = "3.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,26 +21,22 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.evidence"; rev = "refs/tags/${version}"; - hash = "sha256-/zmMPSVR6F6SIU7xuotErmU2SsKEV43rs/4oTVKAWz0="; + hash = "sha256-0WLX5mD+opJoRdnk4w8mMySn41473PcRod4YxEk3S2s="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.evidence" - ]; + pythonImportsCheck = [ "dissect.evidence" ]; meta = with lib; { description = "Dissect module implementing a parsers for various forensic evidence file containers"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-executable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-executable/default.nix index 8511b2df94..c8d9c456fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-executable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-executable/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pythonOlder, }: buildPythonPackage rec { pname = "dissect-executable"; - version = "1.5"; + version = "1.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,22 +20,20 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.executable"; rev = "refs/tags/${version}"; - hash = "sha256-aAalU0TUqXc13WnxJvirG3QzQyMstecOfnXMdFT8IzU="; + hash = "sha256-b8xPOIUMn6JdYlvuoV5UeBdyISh6CC2Gh6E6U5ZZ7qY="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; - pythonImportsCheck = [ - "dissect.executable" - ]; + pythonImportsCheck = [ "dissect.executable" ]; meta = with lib; { description = "Dissect module implementing a parser for various executable formats such as PE, ELF and Macho-O"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix index 6838350cb8..95d31f8f7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-extfs"; - version = "3.9"; + version = "3.10"; format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.extfs"; rev = "refs/tags/${version}"; - hash = "sha256-xZEULUm0I754f9MEIUZEua76SaY/WMFp4Q5BMNZ8fWU="; + hash = "sha256-EIM2kS5V2+e7/bvuB8ezBZQl3XopdlzZ7Cmwr+Ns/Us="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix index 636265f412..6e14afb3f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pythonOlder, }: buildPythonPackage rec { pname = "dissect-fat"; - version = "3.8"; + version = "3.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,15 +20,15 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.fat"; rev = "refs/tags/${version}"; - hash = "sha256-xFfB7QOZ3KjsOPQ1cPTRkqb0hgD4waOq8kkSTJStQ+E="; + hash = "sha256-U7SSLvEK6IYZjjUIGT9n1w7oLdB8Q2/msQ/EBJfatJY="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; @@ -35,9 +36,7 @@ buildPythonPackage rec { # dissect.fat.exceptions.InvalidBPB: Invalid BS_jmpBoot doCheck = false; - pythonImportsCheck = [ - "dissect.fat" - ]; + pythonImportsCheck = [ "dissect.fat" ]; meta = with lib; { description = "Dissect module implementing a parser for the FAT file system"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix index f95319ade1..fac9898633 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix @@ -1,45 +1,42 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "dissect-ffs"; - version = "3.7"; - format = "pyproject"; + version = "3.8"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ffs"; rev = "refs/tags/${version}"; - hash = "sha256-f7lXYJ2U8M+rZXrlbrAXAjizCVz6rAAZbeSg+iOmKdo="; + hash = "sha256-L2LL+Er5nSYpRBW5CO9EBkYY85vnDkuvaOP0kbkH2T4="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.ffs" - ]; + pythonImportsCheck = [ "dissect.ffs" ]; meta = with lib; { description = "Dissect module implementing a parser for the FFS file system"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix index 27bf9056e2..b24f1e69f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -1,20 +1,21 @@ -{ lib -, buildPythonPackage -, defusedxml -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, pycryptodome -, pytestCheckHook -, pythonOlder -, rich -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + defusedxml, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + pycryptodome, + pytestCheckHook, + pythonOlder, + rich, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.12"; + version = "3.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,15 +24,15 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-uQt+oyETjZHPa1QZfswpUX92ZCdzkR5x9deo15J+Fxo="; + hash = "sha256-6sjRkhZOmAckzu/lUA4Sw48cmKfMOGLGgB5dB6M06qQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml dissect-cstruct dissect-util @@ -44,13 +45,9 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.hypervisor" - ]; + pythonImportsCheck = [ "dissect.hypervisor" ]; meta = with lib; { description = "Dissect module implementing parsers for various hypervisor disk, backup and configuration files"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-jffs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-jffs/default.nix index 234f61e007..31edb77712 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-jffs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-jffs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-jffs"; - version = "1.1"; + version = "1.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.jffs"; rev = "refs/tags/${version}"; - hash = "sha256-jzSPR4pkvXRQ3Q/qL7Oa3mLX3hW2IhbXuuO0jTc8Gvg="; + hash = "sha256-aElQR9QDC2110QZdk+PKkBky6FUXz9pSTJV7weTBvAE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix index 61f3eaa645..19c414c74d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.9"; + version = "3.10"; format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ntfs"; rev = "refs/tags/${version}"; - hash = "sha256-gjmxoxz4Qf2FsCP72siEpVLeqlZfvhuFZHSGr1n+cY0="; + hash = "sha256-7D+5Btvm9fWwtVjVpKNc0VU7seyZXFxR7tEh7CAh7io="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-ole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-ole/default.nix index 1d527d33ab..cb84b16aa8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-ole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-ole/default.nix @@ -1,33 +1,34 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pythonOlder, }: buildPythonPackage rec { pname = "dissect-ole"; - version = "3.7"; - format = "pyproject"; + version = "3.8"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ole"; rev = "refs/tags/${version}"; - hash = "sha256-Df6OU1vVsQl7d119W8+8YmUiy2+m6Dw3LpKnMVSRRR4="; + hash = "sha256-VWbgQhKV1vJBRQROrJXbJ7qDIVOfZwvjsRwUbm7q7OQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; @@ -35,9 +36,7 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "dissect.ole" - ]; + pythonImportsCheck = [ "dissect.ole" ]; meta = with lib; { description = "Dissect module implementing a parser for the Object Linking & Embedding (OLE) format"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix index 8f8ae56b38..4e09bfb406 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.9"; + version = "3.10"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.regf"; rev = "refs/tags/${version}"; - hash = "sha256-NLhZnStcJCtXMBkayLjvuG7aK2aN3sWGZaPKVXIoRew="; + hash = "sha256-uMC5av4NAzDF5JRUz4L8/jTLrBv9blNMYtM6dOuHe5s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix index 6ee624cc42..4546141996 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -1,45 +1,42 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "dissect-shellitem"; - version = "3.7"; - format = "pyproject"; + version = "3.8"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.shellitem"; rev = "refs/tags/${version}"; - hash = "sha256-E5v7WuAd47X/1LSeaje4EUv+GuFq5Ksg4ndOScFreYE="; + hash = "sha256-zoq42Au2dNJTryj3GNXJrEGvE0az8psPuMXoJNc74QM="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.shellitem" - ]; + pythonImportsCheck = [ "dissect.shellitem" ]; meta = with lib; { description = "Dissect module implementing a parser for the Shellitem structures"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix index 275e1a2913..6c61796409 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix @@ -1,45 +1,42 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "dissect-sql"; - version = "3.8"; - format = "pyproject"; + version = "3.9"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.sql"; rev = "refs/tags/${version}"; - hash = "sha256-f19l1NxIdkQRaqEAgeTIuloPY079TmnNZ/DLQEXFQIA="; + hash = "sha256-aq/p6oa+6C2BS2TV8YYXwGP580tIHYZqO455bYm0yeo="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.sql" - ]; + pythonImportsCheck = [ "dissect.sql" ]; meta = with lib; { description = "Dissect module implementing a parsers for the SQLite database file format"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-squashfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-squashfs/default.nix index 9deecad417..6303663d2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -1,20 +1,21 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, lz4 -, python-lzo -, pythonOlder -, setuptools -, setuptools-scm -, zstandard +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + lz4, + python-lzo, + pythonOlder, + setuptools, + setuptools-scm, + zstandard, }: buildPythonPackage rec { pname = "dissect-squashfs"; - version = "1.4"; - format = "pyproject"; + version = "1.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,15 +23,15 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.squashfs"; rev = "refs/tags/${version}"; - hash = "sha256-y6RXtHJev83m7mYdNLG640TRUPEGbi6l942zlMWXky0="; + hash = "sha256-eylLBPim3dmo8h95lRmlh8O9m458K07TH2uK+hn3nKs="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; @@ -43,9 +44,7 @@ buildPythonPackage rec { ]; }; - pythonImportsCheck = [ - "dissect.squashfs" - ]; + pythonImportsCheck = [ "dissect.squashfs" ]; meta = with lib; { description = "Dissect module implementing a parser for the SquashFS file system"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix index 0e6e14be72..a8fdd93b87 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix @@ -3,6 +3,7 @@ , asn1crypto , buildPythonPackage , defusedxml +, dissect-btrfs , dissect-cim , dissect-clfs , dissect-cstruct @@ -16,8 +17,8 @@ , dissect-hypervisor , dissect-ntfs , dissect-regf -, dissect-sql , dissect-shellitem +, dissect-sql , dissect-thumbcache , dissect-util , dissect-volume @@ -25,21 +26,24 @@ , fetchFromGitHub , flow-record , fusepy +, impacket , ipython +, paho-mqtt , pycryptodome , pytestCheckHook , pythonOlder -, pyyaml +, ruamel-yaml , setuptools , setuptools-scm , structlog +, tomli , yara-python , zstandard }: buildPythonPackage rec { pname = "dissect-target"; - version = "3.16"; + version = "3.17"; pyproject = true; disabled = pythonOlder "3.9"; @@ -48,20 +52,20 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-2c8OFwbgSc7zwbjQm2g8y1ZyiYM0KPFjTEUrk06c174="; + hash = "sha256-UIgHjSTHaxo8jCqe+R6rRxQXX8RUFKAI5+zscInAtgg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-warn "flow.record~=" "flow.record>=" + --replace-fail "flow.record~=" "flow.record>=" ''; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml dissect-cstruct dissect-eventlog @@ -78,6 +82,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { full = [ asn1crypto + dissect-btrfs dissect-cim dissect-clfs dissect-esedb @@ -92,10 +97,19 @@ buildPythonPackage rec { fusepy ipython pycryptodome - pyyaml + ruamel-yaml yara-python zstandard - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + yara = [ + yara-python + ] ++ passthru.optional-dependencies.full; + smb = [ + impacket + ] ++ passthru.optional-dependencies.full; + mqtt = [ + paho-mqtt + ] ++ passthru.optional-dependencies.full; }; nativeCheckInputs = [ @@ -121,18 +135,34 @@ buildPythonPackage rec { # Tests compare dates and times "yum" # Filesystem access, windows defender tests + "test_config_tree_plugin" "test_defender_quarantine_recovery" + "test_execute_pipeline" + "test_keychain_register_keychain_file" + "test_plugins_child_docker" + "test_plugins_child_wsl" + "test_reg_output" + "test_regflex" + "test_systemd_basic_syntax" + "test_target_cli_unicode_argparse" + "test_target_query" ] ++ # test is broken on Darwin lib.optional stdenv.hostPlatform.isDarwin "test_fs_attrs_no_os_listxattr"; disabledTestPaths = [ - # Tests are using Windows paths - "tests/plugins/apps/browser/" + # Tests are using Windows paths, missing test files + "tests/plugins/apps/" # ValueError: Invalid Locate file magic. Expected /x00LOCATE02/x00 "tests/plugins/os/unix/locate/" # Missing plugin support - "tests/tools/test_reg.py" + "tests/tools/test_dump.py" + "tests/plugins/os/" + "tests/plugins/filesystem/" + "tests/test_registration.py" + "tests/filesystems/" + "tests/test_filesystem.py" + "tests/loaders/" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix index 6c1a68b647..60091bb178 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "dissect-thumbcache"; - version = "1.7"; + version = "1.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,26 +21,22 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.thumbcache"; rev = "refs/tags/${version}"; - hash = "sha256-t5LovLS+YMWQWMCFP6jh3SNiLb/Jy9we4FX6MmsIJmY="; + hash = "sha256-LcuuRVSnZVFtht03MD8qVNNPljVUzGa8vXu9GQPOgjs="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.thumbcache" - ]; + pythonImportsCheck = [ "dissect.thumbcache" ]; disabledTests = [ # Don't run Windows related tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix index d085d842b7..9210cc6ca7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.15"; + version = "3.16"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-JIrk6YRuW5B30d9fNaRFesO01ajcSy8ErkpFtM1Coaw="; + hash = "sha256-OHlWOWB476KERerEo2ZYLMIIO+eIpKlNLOHMCiE5jdE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix index 147b048aee..95775fb18c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-vmfs"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.vmfs"; rev = "refs/tags/${version}"; - hash = "sha256-HJV7cwNMFvHURt2dk/c1YbgFaHXRESREJ5ucmUsuS78="; + hash = "sha256-AcVWKUgykgTgP0haBOtWR+wNWzc/PN9qIwVJMqNg8hg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix index abddcf5d1d..a312667bb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.9"; + version = "3.10"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.volume"; rev = "refs/tags/${version}"; - hash = "sha256-Bhi3p0joTNx1y/yBhehhG06WmM7gUJhIJbmqZY4DzLQ="; + hash = "sha256-tQNmSnQBchj3SUq2XPsK/LWrKiCw4MFKmopHbxnzMxg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix index 1843ff00f8..cc137632f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix @@ -1,45 +1,42 @@ -{ lib -, buildPythonPackage -, dissect-cstruct -, dissect-util -, fetchFromGitHub -, setuptools -, setuptools-scm -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + dissect-cstruct, + dissect-util, + fetchFromGitHub, + setuptools, + setuptools-scm, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "dissect-xfs"; - version = "3.8"; - format = "pyproject"; + version = "3.9"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.xfs"; rev = "refs/tags/${version}"; - hash = "sha256-U/VDFeCyOPlefFL/QVRVknpCBDLuVYvVHI49QSe+QFM="; + hash = "sha256-jUNstyHVPJazf4idXNe9xICpi0MKkz8q0rWUEHjk2ZA="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "dissect.xfs" - ]; + pythonImportsCheck = [ "dissect.xfs" ]; # Archive files seems to be corrupt doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect/default.nix index 6827b7e5f7..73f022e97e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect/default.nix @@ -1,41 +1,43 @@ -{ lib -, buildPythonPackage -, dissect-btrfs -, dissect-cim -, dissect-clfs -, dissect-cobaltstrike -, dissect-cstruct -, dissect-esedb -, dissect-etl -, dissect-eventlog -, dissect-evidence -, dissect-executable -, dissect-extfs -, dissect-fat -, dissect-ffs -, dissect-hypervisor -, dissect-jffs -, dissect-ntfs -, dissect-ole -, dissect-regf -, dissect-shellitem -, dissect-sql -, dissect-squashfs -, dissect-target -, dissect-util -, dissect-vmfs -, dissect-volume -, dissect-xfs -, fetchFromGitHub -, pythonOlder -, pythonRelaxDepsHook -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + dissect-archive, + dissect-btrfs, + dissect-cim, + dissect-clfs, + dissect-cobaltstrike, + dissect-cstruct, + dissect-esedb, + dissect-etl, + dissect-eventlog, + dissect-evidence, + dissect-executable, + dissect-extfs, + dissect-fat, + dissect-ffs, + dissect-hypervisor, + dissect-jffs, + dissect-ntfs, + dissect-ole, + dissect-regf, + dissect-shellitem, + dissect-sql, + dissect-squashfs, + dissect-target, + dissect-util, + dissect-vmfs, + dissect-volume, + dissect-xfs, + fetchFromGitHub, + pythonOlder, + pythonRelaxDepsHook, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "dissect"; - version = "3.13"; + version = "3.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -44,18 +46,20 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-cnNaqXECePP2DmLRAm/Fi9m88rYSsVVMrpcqYd0iL1E="; + hash = "sha256-wHLpysvOkJ1t0KKJXwfeRp/7mSom5WvrJ0lyRGoDwJM="; }; pythonRelaxDeps = true; - nativeBuildInputs = [ - pythonRelaxDepsHook + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ + dissect-archive dissect-btrfs dissect-cim dissect-clfs @@ -87,9 +91,7 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "dissect" - ]; + pythonImportsCheck = [ "dissect" ]; meta = with lib; { description = "Dissect meta module"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix index c5be90d0af..35c1df5742 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2023.12.0"; + version = "2024.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-Zv31BTzY31eXkU7wqa+h33qGrH+OTzKEj6L7Ei/aizk="; + hash = "sha256-9W5BpBQHw1ZXCOWiFPeIlMns/Yys1gtdwQ4Lhd7qjK8="; }; postPatch = '' @@ -43,7 +43,7 @@ buildPythonPackage rec { --replace 'dynamic = ["version"]' 'version = "${version}"' ''; - nativeBuildInputs = [ + build-system = [ pythonRelaxDepsHook setuptools setuptools-scm @@ -54,7 +54,7 @@ buildPythonPackage rec { "dask" ]; - propagatedBuildInputs = [ + dependencies = [ click cloudpickle dask diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix index e415977d86..49e0c49e75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -1,61 +1,46 @@ -{ lib -, buildPythonPackage -, django -, django-allauth -, djangorestframework -, djangorestframework-simplejwt -, fetchFromGitHub -, fetchpatch -, python -, pythonOlder -, responses -, setuptools -, unittest-xml-reporting +{ + lib, + buildPythonPackage, + django, + django-allauth, + djangorestframework, + djangorestframework-simplejwt, + fetchFromGitHub, + python, + pythonOlder, + responses, + setuptools, + unittest-xml-reporting, }: buildPythonPackage rec { pname = "dj-rest-auth"; - version = "5.0.2"; + version = "6.0.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "iMerica"; repo = "dj-rest-auth"; rev = "refs/tags/${version}"; - hash = "sha256-TqeNpxXn+v89fEiJ4AVNhp8blCfYQKFQfYmZ6/QlRbQ="; + hash = "sha256-fNy1uN3oH54Wd9+EqYpiV0ot1MbSSC7TZoAARQeR81s="; }; - patches = [ - # https://github.com/iMerica/dj-rest-auth/pull/597 - (fetchpatch { - name = "disable-email-confirmation-ratelimit-in-tests-to-support-new-allauth.patch"; - url = "https://github.com/iMerica/dj-rest-auth/commit/c8f19e18a93f4959da875f9c5cdd32f7d9363bba.patch"; - hash = "sha256-Y/YBjV+c5Gw1wMR5r/4VnyV/ewUVG0z4pjY/MB4ca9Y="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ - --replace "==" ">=" + --replace-fail "==" ">=" + substituteInPlace dj_rest_auth/tests/test_api.py \ + --replace-fail "assertEquals" "assertEqual" ''; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - buildInputs = [ - django - ]; + buildInputs = [ django ]; - propagatedBuildInputs = [ - djangorestframework - ]; + dependencies = [ djangorestframework ]; - passthru.optional-dependencies.with_social = [ - django-allauth - ]; + passthru.optional-dependencies.with_social = [ django-allauth ]; nativeCheckInputs = [ djangorestframework-simplejwt @@ -66,7 +51,7 @@ buildPythonPackage rec { preCheck = '' # Test connects to graph.facebook.com substituteInPlace dj_rest_auth/tests/test_serializers.py \ - --replace "def test_http_error" "def dont_test_http_error" + --replace-fail "def test_http_error" "def dont_test_http_error" ''; checkPhase = '' @@ -75,9 +60,7 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ - "dj_rest_auth" - ]; + pythonImportsCheck = [ "dj_rest_auth" ]; meta = with lib; { description = "Authentication for Django Rest Framework"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix index 8a1f6dc8ac..51ca1ea02d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix @@ -6,6 +6,9 @@ # build-system , setuptools +# build-time dependencies +, gettext + # dependencies , django , python3-openid @@ -41,6 +44,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + gettext setuptools ]; @@ -52,6 +56,8 @@ buildPythonPackage rec { requests-oauthlib ] ++ pyjwt.optional-dependencies.crypto; + preBuild = "python -m django compilemessages"; + passthru.optional-dependencies = { saml = [ python3-saml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix index 3983cf3f36..b2f5fa74b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "4.7.0"; + version = "4.8.0"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-jeplN2uLL6G+7lI0h2DjCC5kKTmlA4y+iBpeY4G2W4o="; + hash = "sha256-YEJQk43cn9phnyR8elmwsvBuU6fT9GoVbyiqMN1xpzg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-bootstrap3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-bootstrap3/default.nix index 6a29fc7630..4ac4695bd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-bootstrap3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "django-bootstrap3"; - version = "23.6"; + version = "24.2"; format = "pyproject"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap3"; rev = "refs/tags/v${version}"; - hash = "sha256-qqG9w0bQYoQgWXCks/WwwQVoh2DhIMLaFXDQ4z6D84g="; + hash = "sha256-5nBJ5vfsoGoaG1s3K1hCHcSnGf51ZirYYg+uJGsBmG8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-bootstrap4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-bootstrap4/default.nix index b0a11d9044..d148162b9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "django-bootstrap4"; - version = "24.1"; + version = "24.3"; format = "pyproject"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap4"; rev = "refs/tags/v${version}"; - hash = "sha256-TCHie5h/VRJ9NSg7wKnWotFHm328kxIp+xFXEa8wL1c="; + hash = "sha256-sZY/0f1PbYQu9fN65H6H7xLvsdE9AXK0cMt9TyAKuUw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-bootstrap5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-bootstrap5/default.nix index 76405e9e5c..ac983c5ac5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-bootstrap5/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-bootstrap5/default.nix @@ -4,35 +4,53 @@ , pythonOlder # build-system -, hatchling +, setuptools +, setuptools-scm # dependencies +, django + +# tests , beautifulsoup4 , pillow -, django +, pytest-django +, pytestCheckHook }: buildPythonPackage rec { pname = "django-bootstrap5"; - version = "23.3"; - format = "pyproject"; + version = "24.1"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap5"; rev = "v${version}"; - hash = "sha256-FIwDyZ5I/FSaEiQKRfanzAGij86u8y85Wal0B4TrI7c="; + hash = "sha256-JbmwEPkj34tsK3tUtb56FPjU0emwERVXEc4fzlepdXY="; }; - nativeBuildInputs = [ - hatchling + build-system = [ + setuptools + setuptools-scm ]; - propagatedBuildInputs = [ - django + nativeCheckInputs = [ beautifulsoup4 + (django.override { withGdal = true; }) pillow + pytest-django + pytestCheckHook + ]; + + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.app.settings + ''; + + disabledTests = [ + # urllib.error.URLError: + "test_get_bootstrap_setting" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix index 087ffab301..53d75bed9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-configurations"; - version = "2.5"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Y/olLEDciOoXuLkPX0oxonJuWGrLH/Dtx0wijGHxnl0="; + hash = "sha256-blCDdX4rvfm7eFBWdTa5apNRX2sXUD10ko/2KNsuDpQ="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix index 5e77c5bfc5..6581fcfbb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix @@ -1,13 +1,21 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast + +# build-system +, setuptools + +# dependencies , django + +# tests , factory-boy , mock , pip , pygments -, pytest-django , pytestCheckHook +, pytest-django , shortuuid , vobject , werkzeug @@ -16,7 +24,11 @@ buildPythonPackage rec { pname = "django-extensions"; version = "3.2.3"; - format = "setuptools"; + pyproject = true; + + # https://github.com/django-extensions/django-extensions/issues/1831 + # Requires asyncore, which was dropped in 3.12 + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = pname; @@ -30,7 +42,11 @@ buildPythonPackage rec { --replace "--cov=django_extensions --cov-report html --cov-report term" "" ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-hierarkey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-hierarkey/default.nix index 77f33f0b52..7f78dd6040 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-hierarkey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-hierarkey/default.nix @@ -2,6 +2,9 @@ , buildPythonPackage , fetchFromGitHub +# build-system +, setuptools + # propagates , python-dateutil @@ -13,18 +16,21 @@ buildPythonPackage rec { pname = "django-hierarkey"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "raphaelm"; repo = "django-hierarkey"; - # https://github.com/raphaelm/django-hierarkey/commit/c81ace02ca404a8756e2931bb6faf55b6365e140 - rev = "c81ace02ca404a8756e2931bb6faf55b6365e140"; - hash = "sha256-sCARyTjuuAUptlOsFmApnsQpcksP+uYnq0lukXDMcuk="; + rev = "refs/tags/${version}"; + hash = "sha256-1LSH9GwoNF3NrDVNUIHDAVsktyKIprDgB5XlIHeM3fM="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ python-dateutil ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix index 26b4cc7308..1f5c23aa1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-ipware"; - version = "6.0.5"; + version = "7.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s54nQDKH1r6wUT5pQCQBfbpY0Sn9QQoQFKyKFYTnP84="; + hash = "sha256-2exD0r983yFv7Y1JSghN61dhpUhgpTsudDRqTzhM/0c="; }; propagatedBuildInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix index 026788caf6..094ca8a6d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix @@ -2,7 +2,10 @@ , buildPythonPackage , fetchPypi -# propagates +# build-system +, pdm-backend + +# dependencies , django-gravatar2 , django-allauth , mailmanclient @@ -17,20 +20,20 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.11"; - format = "setuptools"; + version = "1.3.12"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-uIjJaZHWL2evj+oISLprvKWT5Sm5f2EKgUD1twL1VbQ="; + pname = "django_mailman3"; + inherit version; + hash = "sha256-MnQlT5ElNnStLUKyOXnI7ZDDaBwfp+h9tbOC+cwB0es="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'django>=3.2,<4.2' 'django>=3.2,<4.3' - ''; + build-system = [ + pdm-backend + ]; - propagatedBuildInputs = [ + dependencies = [ django-allauth django-gravatar2 mailmanclient @@ -43,6 +46,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + export DJANGO_SETTINGS_MODULE=django_mailman3.tests.settings_test + ''; + pythonImportsCheck = [ "django_mailman3" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix index 0e39d901aa..38d03dca20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "django-model-utils"; - version = "4.5.0"; + version = "4.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-model-utils"; rev = "refs/tags/${version}"; - hash = "sha256-ZEnDk4kCXyhLvq3CZTK/zP3IK6BsNRqbkfqKAuU6Mfk="; + hash = "sha256-GaBTCrEwEkJyVeY5YVptPioYcmivyQtBKjs+TgC9IqA="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix index 9db6be33ed..a363bad3b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix @@ -7,7 +7,6 @@ # dependencies , django -, mysqlclient # tests , pytest-django @@ -16,23 +15,22 @@ buildPythonPackage rec { pname = "django-mysql"; - version = "4.12.0"; + version = "4.13.0"; pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; repo = "django-mysql"; rev = "refs/tags/${version}"; - hash = "sha256-AieI6zUPFXQsrvoms5bu/Bb3J+DvfLA4rCCsjhYBEZQ="; + hash = "sha256-hIvkLLv9R23u+JC6t/zwbMvmgLMstYp0ytuSqNiohJg="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - buildInputs = [ + dependencies = [ django - mysqlclient ]; doCheck = false; # requires mysql/mariadb server @@ -44,6 +42,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "django_mysql" + ]; + meta = with lib; { changelog = "https://github.com/adamchainz/django-mysql/blob/${version}/docs/changelog.rst"; description = "Extensions to Django for use with MySQL/MariaD"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix index c1078160b6..dc73a461b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "django-otp"; - version = "1.3.0post1"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "django-otp"; repo = "django-otp"; rev = "v${version}"; - hash = "sha256-Q8YTCYERyoAXenSiDabxuxaWiD6ZeJKKKgaR/Rg3y20="; + hash = "sha256-c0Yr41S1LFBzcDIK2etOP3rYcCPaThDs+XGiw4WP/ks="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-statici18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-statici18n/default.nix index 8ce7bc0340..5638443a2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-statici18n/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-statici18n/default.nix @@ -16,15 +16,14 @@ buildPythonPackage rec { pname = "django-statici18n"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "zyegfryed"; repo = "django-statici18n"; - # https://github.com/zyegfryed/django-statici18n/issues/59 - rev = "9b83a8f0f2e625dd5f56d53cfe4e07aca9479ab6"; - hash = "sha256-KrIlWmN7um9ad2avfANOza579bjYkxTo9F0UFpvLu3A="; + rev = "refs/tags/v${version}"; + hash = "sha256-n6HqHcXvz2ihwN+gJr5P+/Yt4RpuOu2yAjo9fiNZB54="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix index 004773037e..1ed2dbc4fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix @@ -1,26 +1,30 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, python-dateutil -, python-mimeparse -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + python-dateutil, + python-mimeparse, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-tastypie"; - version = "0.14.6"; - format = "setuptools"; + version = "0.14.7"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "django-tastypie"; - repo = pname; + repo = "django-tastypie"; rev = "refs/tags/v${version}"; - hash = "sha256-emZVcycGLa8Z2yMv/NWZi1b5fPk50u841cFfFF3Ke/s="; + hash = "sha256-bQBq5Wk5P9c+/a5B+LnxG8aCrVK1A3jLsLFK69/UYjo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ python-dateutil python-mimeparse ]; @@ -28,9 +32,7 @@ buildPythonPackage rec { # Tests requires a Django instance doCheck = false; - pythonImportsCheck = [ - "tastypie" - ]; + pythonImportsCheck = [ "tastypie" ]; meta = with lib; { description = "Utilities and helpers for writing Pylint plugins"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix index bc1fcbdfe9..4ee0ab7617 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix @@ -1,8 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchPypi -, fetchpatch2 +, fetchFromGitHub , pythonAtLeast , pythonOlder , substituteAll @@ -44,15 +43,16 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.11"; + version = "4.2.12"; format = "pyproject"; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "Django"; - inherit version; - hash = "sha256-bm/z2y2N0MmGtO7IVUyOT5GbXB/2KltDkMF6/y7W5cQ="; + src = fetchFromGitHub { + owner = "django"; + repo = "django"; + rev = "refs/tags/${version}"; + hash = "sha256-n6esWUpZpCP4J4bNckNKJ9E61qFjTPS7XF+WgxNS2JE="; }; patches = [ @@ -64,13 +64,6 @@ buildPythonPackage rec { # and disable failing tests ./django_4_tests.patch - (fetchpatch2 { - # https://github.com/django/django/pull/17979 - name = "django-mime-utf8-surrogates.patch"; - url = "https://github.com/django/django/commit/0d3ddcaf2c74638a32781f361d467af572ced95f.patch"; - hash = "sha256-AoIFvehBsXIrzIlCsqOZ++RqtDFl/H+zXqA25OMQr7g="; - }) - ] ++ lib.optionals withGdal [ (substituteAll { src = ./django_4_set_geos_gdal_lib.patch; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix index fc4ba20245..637bbb6528 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , fetchpatch2 , pythonAtLeast , pythonOlder @@ -44,15 +44,16 @@ buildPythonPackage rec { pname = "django"; - version = "5.0.4"; + version = "5.0.5"; pyproject = true; disabled = pythonOlder "3.10"; - src = fetchPypi { - pname = "Django"; - inherit version; - hash = "sha256-S9AajIMLt3qKOw59iyW4h+U2rReoG6Lc5UdhNcczEr0="; + src = fetchFromGitHub { + owner = "django"; + repo = "django"; + rev = "refs/tags/${version}"; + hash = "sha256-0/AbPmTl38E9BpHVKs0r79fISjEa1d4XO/se1pA7zxg="; }; patches = [ @@ -65,13 +66,6 @@ buildPythonPackage rec { # disable test that excpects timezone issues ./django_5_disable_failing_tests.patch - (fetchpatch2 { - # https://github.com/django/django/pull/17979 - name = "django-mime-utf8-surrogates.patch"; - url = "https://github.com/django/django/commit/b231bcd19e57267ce1fc21d42d46f0b65fdcfcf8.patch"; - hash = "sha256-HhmRwi24VkoPoh+NygAThCoMywoMwrLijU4ZsDfVU34="; - }) - ] ++ lib.optionals withGdal [ (substituteAll { src = ./django_5_set_geos_gdal_lib.patch; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix index 6b639f8cc8..541c3bef56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "1.1.5"; + version = "1.1.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-mmZ/hmS3Lrn4qhJQsHV8w5gqto9wxIrzkxe1jPYvLXU="; + hash = "sha256-DOctlh9EPo+fBWlLNUVC3uU04I4rjFtgxi1drKfB2g8="; }; nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-control/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-control/default.nix new file mode 100644 index 0000000000..6418163b6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-control/default.nix @@ -0,0 +1,98 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, absl-py +, mujoco +, pyparsing +, pythonRelaxDepsHook +, setuptools +, wheel +, dm-env +, dm-tree +, fsspec +, glfw +, h5py +, lxml +, mock +, nose +, nose-xunitmp +, numpy +, pillow +, protobuf +, pyopengl +, requests +, scipy +, tqdm +, etils +}: + +buildPythonPackage rec { + pname = "dm-control"; + version = "1.0.19"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "google-deepmind"; + repo = "dm_control"; + rev = "refs/tags/${version}"; + hash = "sha256-q9hY/icvc1tPI0xBYxExc2a+gv0i6utaB4GBnJwQPCw="; + }; + + build-system = [ + absl-py + mujoco + pyparsing + pythonRelaxDepsHook + setuptools + wheel + ]; + + pythonRemoveDeps = [ + # Unpackaged + "labmaze" + ]; + + dependencies = [ + absl-py + dm-env + dm-tree + fsspec + glfw + h5py + lxml + mock + mujoco + nose + nose-xunitmp + numpy + pillow + protobuf + pyopengl + pyparsing + requests + scipy + setuptools + tqdm + ] ++ etils.optional-dependencies.epath; + + pythonImportsCheck = [ + "dm_control" + ]; + + # The installed library clashes with the `dm_control` directory remaining in the source path. + # Usually, we get around this by `rm -rf` the python source files to ensure that the installed package is used. + # Here, we cannot do that as it would also remove the tests which are also in the `dm_control` directory. + # See https://github.com/google-deepmind/dm_control/issues/6 + doCheck = false; + + meta = { + changelog = "https://github.com/google-deepmind/dm_control/releases/tag/${version}"; + description = "Google DeepMind's software stack for physics-based simulation and Reinforcement Learning environments, using MuJoCo"; + homepage = "https://github.com/google-deepmind/dm_control"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnf-plugins-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnf-plugins-core/default.nix index 7025980415..3a9c062679 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnf-plugins-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -22,7 +22,7 @@ in buildPythonPackage rec { pname = "dnf-plugins-core"; - version = "4.6.0"; + version = "4.7.0"; format = "other"; outputs = [ "out" "man" ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "rpm-software-management"; repo = "dnf-plugins-core"; rev = "refs/tags/${version}"; - hash = "sha256-7LaI5EungJrOPgxDzK/pi4X+D3PPsrbIjYdCknKIiHA="; + hash = "sha256-AQnnXjkUajztbyoKzKhxiKxZsb2o2+7C15fsrxGkWcM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnf4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnf4/default.nix index c05d003be2..31d617d613 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnf4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnf4/default.nix @@ -8,6 +8,7 @@ , python , rpm , sphinx +, nix-update-script }: let @@ -16,7 +17,7 @@ in buildPythonPackage rec { pname = "dnf4"; - version = "4.19.2"; + version = "4.20.0"; format = "other"; outputs = [ "out" "man" "py" ]; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "rpm-software-management"; repo = "dnf"; rev = version; - hash = "sha256-2voBauWXPoHWBt58vZfgpO1oWBDDZ+DvWN6jb5qOzFg="; + hash = "sha256-0BwnUb0ZORjJmB70Jca/CnyysIOGB7azVzUUIGplmso="; }; patches = [ @@ -88,6 +89,8 @@ buildPythonPackage rec { moveToOutput "lib/${python.libPrefix}" "$py" ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Package manager based on libdnf and libsolv. Replaces YUM"; homepage = "https://github.com/rpm-software-management/dnf"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnfile/default.nix index 40b97b6b6d..950f1bb456 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnfile/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to parse .NET executable files"; - homepage = "hhttps://github.com/malwarefrank/dnfile"; + homepage = "https://github.com/malwarefrank/dnfile"; changelog = "https://github.com/malwarefrank/dnfile/blob/v${version}/HISTORY.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix index 64bbe8c0a1..63bf4634cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Simple library to encode/decode DNS wire-format packets"; homepage = "https://github.com/paulc/dnslib"; license = licenses.bsd2; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docformatter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docformatter/default.nix index 517b777735..02b2108541 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docformatter/default.nix @@ -51,6 +51,12 @@ buildPythonPackage rec { pytestCheckHook ]; + # Disable failing tests until https://github.com/PyCQA/docformatter/issues/274 is fixed upstream + disabledTests = [ + "test_do_format_code.py" + "test_docformatter.py" + ]; + pythonImportsCheck = [ "docformatter" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix index 2f5c485cf6..dde6772864 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 +, setuptools , futures ? null , docloud , requests @@ -9,15 +10,24 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.25.236"; - format = "setuptools"; + version = "2.27.239"; + pyproject = true; # No source available from official repo src = fetchPypi { inherit pname version; - hash = "sha256-JWkUtMAROk4cePMuogx9dtyO/ihv6JAnDnXPrVD+UQ8="; + hash = "sha256-Ug5+jDBBbamqd0JebzHvjLZoTRRPYWQiJl6g8BK0aMQ="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools~=68.2.2" "setuptools>=68.2.2" + ''; + + build-system = [ + setuptools + ]; + propagatedBuildInputs = [ docloud requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docstr-coverage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docstr-coverage/default.nix index b9a6080fa7..603e826908 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docstr-coverage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docstr-coverage/default.nix @@ -8,7 +8,7 @@ , pytest-mock }: let - version = "2.3.1"; + version = "2.3.2"; in buildPythonPackage { pname = "docstr-coverage"; @@ -18,7 +18,7 @@ buildPythonPackage { owner = "HunterMcGushion"; repo = "docstr_coverage"; rev = "refs/tags/v${version}"; - hash = "sha256-QmQE6KZ2NdXKQun+uletxYPktWvfkrj6NPAVl/mmpAY="; + hash = "sha256-k1ny4fWS+CmgLNWPlYPsscjei2UZ6h8QJrZSay5abck="; }; propagatedBuildInputs = [ click pyyaml tqdm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix index 136f679fcf..fdf766f37f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix @@ -1,24 +1,39 @@ { stdenv , lib -, fetchPypi +, fetchFromRepoOrCz , buildPythonPackage +, flit-core +, pillow , python , pythonOlder }: -buildPythonPackage rec { +# Note: this package is used to build LLVM’s documentation, which is part of the Darwin stdenv. +# It cannot use `fetchgit` because that would pull curl into the bootstrap, which is disallowed. + +let self = buildPythonPackage rec { pname = "docutils"; - version = "0.20.1"; + version = "0.21.2"; + pyproject = true; disabled = pythonOlder "3.7"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-8IpOJ2w6FYOobc4+NKuj/gTQK7ot1R7RYQYkToqSPjs="; + src = fetchFromRepoOrCz { + repo = "docutils"; + rev = "docutils-${version}"; + hash = "sha256-Q+9yW+BYUEvPYV504368JsAoKKoaTZTeKh4tVeiNv5Y="; }; + build-system = [ flit-core ]; + + # infinite recursion via sphinx and pillow + doCheck = false; + passthru.tests.pytest = self.overridePythonAttrs { doCheck = true; }; + + nativeCheckInputs = [ + pillow + ]; + # Only Darwin needs LANG, but we could set it in general. # It's done here conditionally to prevent mass-rebuilds. checkPhase = lib.optionalString stdenv.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + '' @@ -38,4 +53,5 @@ buildPythonPackage rec { license = with licenses; [ publicDomain bsd2 psfl gpl3Plus ]; maintainers = with maintainers; [ AndersonTorres ]; }; -} +}; +in self diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix index 51d799b90f..e03a72626a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dogpile-cache"; - version = "1.3.2"; + version = "1.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "dogpile.cache"; inherit version; - hash = "sha256-T3HcAzOtNRycb3BPW6Kje/Ucbu0EN9Gt9W4HWVmv5js="; + hash = "sha256-+EuO0LD7KX0VEFVEf6jcr3uuVm1Nve/s3MHzdmKrWIs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix index d0b7e983a0..5186d95670 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix @@ -11,7 +11,7 @@ , fetchurl , dbus , xvfb-run -, wrapGAppsHook +, wrapGAppsHook3 # , fetchPypi }: @@ -36,7 +36,7 @@ buildPythonPackage { ./nix-support.patch ]; - nativeBuildInputs = [ gobject-introspection dbus xvfb-run wrapGAppsHook ]; # for setup hooks + nativeBuildInputs = [ gobject-introspection dbus xvfb-run wrapGAppsHook3 ]; # for setup hooks propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/domeneshop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/domeneshop/default.nix index b266412219..8778dfc6aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/domeneshop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/domeneshop/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools , urllib3 , pyopenssl , cryptography @@ -11,17 +12,21 @@ buildPythonPackage rec { pname = "domeneshop"; - version = "0.4.3"; - format = "setuptools"; + version = "0.4.4"; + pyproject = true; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - hash = "sha256-kL0X1mEsmVWqnq5NgsMBxeAu48zjmi3muhZYryTCOMo="; + hash = "sha256-UCxIDnhIAkxZ1oQXYRyAMdGgUsUZ6AlYXwsxL49TFAg="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ + setuptools + ]; + + dependencies = [ certifi urllib3 ]; @@ -32,6 +37,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "domeneshop" ]; meta = with lib; { + changelog = "https://github.com/domeneshop/python-domeneshop/releases/tag/v${version}"; description = "Python library for working with the Domeneshop API"; homepage = "https://api.domeneshop.no/docs/"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drawsvg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drawsvg/default.nix new file mode 100644 index 0000000000..84fd89373f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/drawsvg/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pythonOlder, + numpy, + imageio, + cairosvg, + imageio-ffmpeg, + pwkit, +}: + +buildPythonPackage rec { + pname = "drawsvg"; + version = "2.3.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "cduck"; + repo = "drawsvg"; + rev = "refs/tags/${version}"; + hash = "sha256-LoA5yYeHO4GqS3dk7EMg1ZC42HBgmM6rSfigWMc4yUQ="; + }; + + build-system = [ setuptools ]; + + passthru.optional-dependencies = { + all = [ + numpy + imageio + cairosvg + imageio-ffmpeg + pwkit + ]; + raster = [ + numpy + imageio + cairosvg + imageio-ffmpeg + ]; + color = [ + pwkit + numpy + ]; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "drawsvg" ]; + + meta = with lib; { + description = "Programmatically generate SVG (vector) images, animations, and interactive Jupyter widgets"; + homepage = "https://github.com/cduck/drawsvg"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix index f38a2fbf86..9b957b53d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix @@ -1,42 +1,47 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, dj-rest-auth -, django -, django-allauth -, django-filter -, django-oauth-toolkit -, django-polymorphic -, django-rest-auth -, django-rest-polymorphic -, djangorestframework -, djangorestframework-camel-case -, djangorestframework-dataclasses -, djangorestframework-recursive -, djangorestframework-simplejwt -, drf-jwt -, drf-nested-routers -, drf-spectacular-sidecar -, inflection -, jsonschema -, psycopg2 -, pytest-django -, pytestCheckHook -, pyyaml -, uritemplate +{ + lib, + buildPythonPackage, + dj-rest-auth, + django, + django-allauth, + django-filter, + django-oauth-toolkit, + django-polymorphic, + django-rest-auth, + django-rest-polymorphic, + djangorestframework, + djangorestframework-camel-case, + djangorestframework-dataclasses, + djangorestframework-recursive, + djangorestframework-simplejwt, + drf-jwt, + drf-nested-routers, + drf-spectacular-sidecar, + fetchFromGitHub, + fetchpatch, + inflection, + jsonschema, + psycopg2, + pytest-django, + pytestCheckHook, + pythonOlder, + pyyaml, + setuptools, + uritemplate, }: buildPythonPackage rec { pname = "drf-spectacular"; - version = "0.27.1"; - format = "setuptools"; + version = "0.27.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular"; rev = "refs/tags/${version}"; - hash = "sha256-R6rxEo9SNNziXRWB+01UUInParpGcFDIkDZtN4k+dFE="; + hash = "sha256-lOgFDkAY+PqSeyLSvWFT7KPVicSJZxd6yl17GAGHbRs="; }; patches = [ @@ -47,7 +52,9 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django djangorestframework inflection @@ -77,10 +84,11 @@ buildPythonPackage rec { ]; disabledTests = [ - # requires django with gdal + # Test requires django with gdal "test_rest_framework_gis" - # outdated test artifact + # Outdated test artifact "test_pydantic_decoration" + "test_knox_auth_token" ]; pythonImportsCheck = [ "drf_spectacular" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix index 762b9b7ff8..b090f81da9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, requests , setuptools +, requests , six , stone , mock @@ -15,9 +15,10 @@ buildPythonPackage rec { pname = "dropbox"; version = "11.36.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; + outputs = ["out" "doc"]; src = fetchFromGitHub { @@ -27,9 +28,12 @@ buildPythonPackage rec { hash = "sha256-d++lxsbwPxnz1JPguWkImHXB+GQpMa9Uo3JNIxIe2ok="; }; - propagatedBuildInputs = [ - requests + build-system = [ setuptools + ]; + + dependencies = [ + requests six stone ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dropmqttapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dropmqttapi/default.nix index 221557de16..84e09ecf91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dropmqttapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dropmqttapi/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "dropmqttapi"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -16,19 +17,15 @@ buildPythonPackage rec { owner = "ChandlerSystems"; repo = "dropmqttapi"; rev = "refs/tags/v${version}"; - hash = "sha256-5UnjIv57b4JV/vFyQpe+AS4e/fiE2y7ynZx5g6+oSyQ="; + hash = "sha256-njReF9Mu5E9o5WcbK60CCBWaIhZ3tpQHHlY/iEyyHGg="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; # Module has no test doCheck = false; - pythonImportsCheck = [ - "dropmqttapi" - ]; + pythonImportsCheck = [ "dropmqttapi" ]; meta = with lib; { description = "Python MQTT API for DROP water management products"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix index f655aebf89..aa44378f6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix @@ -1,9 +1,19 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitLab, pythonOlder, pytestCheckHook, pybind11, numpy }: +{ + stdenv, + lib, + buildPythonPackage, + fetchFromGitLab, + numpy, + pybind11, + pytestCheckHook, + pythonOlder, + setuptools, +}: buildPythonPackage rec { pname = "ducc0"; - version = "0.33.0"; - format = "setuptools"; + version = "0.34.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -11,14 +21,17 @@ buildPythonPackage rec { domain = "gitlab.mpcdf.mpg.de"; owner = "mtr"; repo = "ducc"; - rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-MezcqQRitBkK4/1rRQM2c9w+iZb2kIsDdcNd6I8CPoI="; + rev = "ducc0_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-lxNqB3Lt+n4vIH7cVW4DAwhjuPn49y+/3RLKVO8IuJM="; }; buildInputs = [ pybind11 ]; propagatedBuildInputs = [ numpy ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + setuptools + ]; pytestFlagsArray = [ "python/test" ]; pythonImportsCheck = [ "ducc0" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix index 955334bdf2..be851c7e16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix @@ -6,7 +6,9 @@ , duckdb , hypothesis , ipython-sql +, pandas , poetry-core +, pytest-remotedata , snapshottest , sqlalchemy , typing-extensions @@ -14,20 +16,18 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.11.2"; + version = "0.12.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-yW1gaZ0B6JNX98KzAxf146goniNmWnkMUmJRrScot1w="; + hash = "sha256-cm0vbz0VZ2Ws6FDWJO16q4KZW2obs0CBNrfY9jmR+6A="; }; - patches = [ ./remote_data.patch ]; - nativeBuildInputs = [ poetry-core ]; @@ -42,24 +42,27 @@ buildPythonPackage rec { ''; disabledTests = [ - # this test tries to download the httpfs extension - "test_preload_extension" - "test_motherduck" # test should be skipped based on sqlalchemy version but isn't and fails "test_commit" - # rowcount no longer generates an attribute error. - "test_rowcount" ]; nativeCheckInputs = [ pytestCheckHook + ]; + + checkInputs = [ hypothesis ipython-sql - # TODO(cpcloud): include pandas here when it supports sqlalchemy 2.0 + pandas + pytest-remotedata snapshottest typing-extensions ]; + pytestFlagsArray = [ + "-m" "'not remote_data'" + ]; + pythonImportsCheck = [ "duckdb_engine" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/remote_data.patch b/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/remote_data.patch deleted file mode 100644 index 1c887acf6c..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/remote_data.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/duckdb_engine/tests/test_basic.py b/duckdb_engine/tests/test_basic.py -index 302636f..ed20f12 100644 ---- a/duckdb_engine/tests/test_basic.py -+++ b/duckdb_engine/tests/test_basic.py -@@ -183,7 +183,6 @@ def test_get_views(engine: Engine) -> None: - - - @mark.skipif(os.uname().machine == "aarch64", reason="not supported on aarch64") --@mark.remote_data - def test_preload_extension() -> None: - duckdb.default_connection.execute("INSTALL httpfs") - engine = create_engine( -diff --git a/duckdb_engine/tests/test_integration.py b/duckdb_engine/tests/test_integration.py -index 349c976..bf3dbaa 100644 ---- a/duckdb_engine/tests/test_integration.py -+++ b/duckdb_engine/tests/test_integration.py -@@ -24,7 +24,6 @@ def test_integration(engine: Engine) -> None: - conn.execute(text("select * from test_df")) - - --@mark.remote_data - @mark.skipif( - "dev" in duckdb.__version__, reason="md extension not available for dev builds" # type: ignore[attr-defined] - ) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix index 83fd0bbb69..242502ab1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # 2. default to extension autoload & autoinstall disabled substituteInPlace setup.py \ --replace-fail "ParallelCompile()" 'ParallelCompile("NIX_BUILD_CORES")' \ - --replace-fail "define_macros.extend([('DUCKDB_EXTENSION_AUTOLOAD_DEFAULT', '1'), ('DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT', '1')])" "" + --replace-fail "define_macros.extend([('DUCKDB_EXTENSION_AUTOLOAD_DEFAULT', '1'), ('DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT', '1')])" "pass" ''; env = { @@ -34,8 +34,6 @@ buildPythonPackage rec { OVERRIDE_GIT_DESCRIBE="v${version}-0-g${rev}"; }; - dontPretendSetuptoolsSCMVersion = true; - nativeBuildInputs = [ pybind11 setuptools-scm @@ -71,6 +69,9 @@ buildPythonPackage rec { # tries to make http request "test_install_non_existent_extension" + # test is flaky https://github.com/duckdb/duckdb/issues/11961 + "test_fetchmany" + # https://github.com/duckdb/duckdb/issues/10702 # tests are racy and interrupt can be delivered before or after target point # causing a later test to fail with a spurious KeyboardInterrupt diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix index 708762bb26..a06c16586b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -1,20 +1,52 @@ -{ lib -, aiofiles -, buildPythonPackage -, click -, fetchFromGitHub -, h2 -, httpx -, lxml -, pythonOlder -, requests -, setuptools -, socksio -}: +{ + lib, + buildPythonPackage, + click, + fetchFromGitHub, + pythonOlder, + setuptools, + orjson, + curl-cffi, + # To build orjson + rustPlatform, + + # Optional dependencies + lxml, +}: +let + curl-cffi_0_7_0 = curl-cffi.overrideAttrs ( + final: old: { + version = "0.7.0b4"; + src = fetchFromGitHub { + owner = "yifeikong"; + repo = "curl_cffi"; + rev = "v${final.version}"; + hash = "sha256-txrJNUzswAPeH4Iazn0iKJI0Rqk0HHRoDrtTfDHKMoo="; + }; + } + ); + + orjson_3_10_3 = orjson.overrideAttrs ( + final: old: { + version = "3.10.3"; + src = fetchFromGitHub { + owner = "ijl"; + repo = "orjson"; + rev = "refs/tags/${final.version}"; + hash = "sha256-bK6wA8P/IXEbiuJAx7psd0nUUKjR1jX4scFfJr1MBAk="; + }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (final) src; + name = "${old.pname}-${final.version}"; + hash = "sha256-ilGq+/gPSuNwURUWy2ZxInzmUv+PxYMxd8esxrMpr2o="; + }; + } + ); +in buildPythonPackage rec { pname = "duckduckgo-search"; - version = "5.0"; + version = "v5.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,36 +54,32 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "deedy5"; repo = "duckduckgo_search"; - rev = "refs/tags/v${version}"; - hash = "sha256-OZFkSFyXC2MFP2MbKwF/qR8zvCFzPKgLmX+nuIztOpw="; + rev = version; + hash = "sha256-T7rlB3dU7y+HbHr1Ss9KkejlXFORhnv9Va7cFTRtfQU="; }; - nativeBuildInputs = [ - setuptools - ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - aiofiles click - h2 - httpx - lxml - requests - socksio - ] ++ httpx.optional-dependencies.brotli - ++ httpx.optional-dependencies.http2 - ++ httpx.optional-dependencies.socks; - - pythonImportsCheck = [ - "duckduckgo_search" + orjson_3_10_3 + curl-cffi_0_7_0 ]; - meta = with lib; { + passthru.optional-dependencies = { + lxml = [ lxml ]; + }; + + doCheck = false; # tests require network access + + pythonImportsCheck = [ "duckduckgo_search" ]; + + meta = { description = "Python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine"; mainProgram = "ddgs"; homepage = "https://github.com/deedy5/duckduckgo_search"; - changelog = "https://github.com/deedy5/duckduckgo_search/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + changelog = "https://github.com/deedy5/duckduckgo_search/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drawbu ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix index 97b27d14bd..65a4eb19d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , certifi , fastimport -, fetchPypi +, fetchFromGitHub , gevent , geventhttpclient , git @@ -14,6 +14,8 @@ , pytest-xdist , pytestCheckHook , pythonOlder +, setuptools +, setuptools-rust , urllib3 }: @@ -24,12 +26,17 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-qenGaDPOpYDDrBKSfkuXEZhddq/KmNqXFAXUFN5g6Wg="; + src = fetchFromGitHub { + owner = "jelmer"; + repo = "dulwich"; + rev = "refs/tags/${pname}-${version}"; + hash = "sha256-iP+6KtaQ8tfOobovSLSJZogS/XWW0LuHgE2oV8uQW/8="; }; - LC_ALL = "en_US.UTF-8"; + build-system = [ + setuptools + setuptools-rust + ]; propagatedBuildInputs = [ certifi @@ -69,6 +76,8 @@ buildPythonPackage rec { "test_cyrillic" # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpfseetobk/test/\xc0' "test_commit_no_encode_decode" + # https://github.com/jelmer/dulwich/issues/1279 + "test_init_connector" ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dungeon-eos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dungeon-eos/default.nix index ace614bcae..9f357168b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dungeon-eos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dungeon-eos/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/dungeon-eos"; description = "A package that simulates PMD EoS dungeon generation"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dwdwfsapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dwdwfsapi/default.nix index 58b62032e3..824d23cbe2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dwdwfsapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dwdwfsapi/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, hatchling , requests , ciso8601 , pythonOlder @@ -8,17 +9,21 @@ buildPythonPackage rec { pname = "dwdwfsapi"; - version = "1.0.7"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-7le1F+581JwrBX/C1aaqsDaSpIt0yNsNKiGnJtHUg5s="; + hash = "sha256-7dIVD+4MiYtsjAM5j67MlbiUN2Q5DpK6bUU0ZuHN2rk="; }; - propagatedBuildInputs = [ + build-system = [ + hatchling + ]; + + dependencies = [ requests ciso8601 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix index 2ce07e5b6b..3380d0f096 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ecdsa"; - version = "0.18.0"; + version = "0.19.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GQNIBBVZ4hsiodZc7khSgsoRpvgdUD/duE1QF+ntHkk="; + hash = "sha256-YOqtEZllmQDdCvUh7UYreTu9+GdDKzlI6HQWrkyva/g="; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix index 2f2920eb56..6a87f879db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenpy"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; rev = "v${finalAttrs.version}"; - hash = "sha256-ar7KmlvWD2qoOonaH8YhVssZhpbTdHNvxY7rzvmhzc0="; + hash = "sha256-nTS9FNXGrak5g83BHHNSsk5V5khpOpRz5zWE8D1gDUo="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/einops/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/einops/default.nix index 9c2de1bad9..dc775fcd6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/einops/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/einops/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "einops"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "arogozhnikov"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wCs3rMnYCk07kJ3iPItxwCQATflKBYHk6tfBCjiF+bc="; + hash = "sha256-6x9AttvSvgYrHaS5ESKOwyEnXxD2BitYTGtqqSKur+0="; }; nativeBuildInputs = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elastic-transport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elastic-transport/default.nix index ac2acebc6f..c4f6b0435e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elastic-transport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elastic-transport/default.nix @@ -4,19 +4,24 @@ , certifi , fetchFromGitHub , mock +, opentelemetry-api +, opentelemetry-sdk +, orjson , pytest-asyncio , pytest-httpserver , pytestCheckHook , pythonOlder , requests +, respx +, setuptools , trustme , urllib3 }: buildPythonPackage rec { pname = "elastic-transport"; - version = "8.12.0"; - format = "setuptools"; + version = "8.13.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +29,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "elastic-transport-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ZLzaCiopdkhpqjzZzv/NT1+f5bHZYuqQvSgM5jeMaqg="; + hash = "sha256-KmZCaAbzbfqbPwFuF43ckwgVhZVbPvwjF7uqPKHml9Q="; }; postPatch = '' @@ -32,6 +37,10 @@ buildPythonPackage rec { --replace " --cov-report=term-missing --cov=elastic_transport" "" ''; + build-system = [ + setuptools + ]; + propagatedBuildInputs = [ urllib3 certifi @@ -40,10 +49,14 @@ buildPythonPackage rec { nativeCheckInputs = [ aiohttp mock + opentelemetry-api + opentelemetry-sdk + orjson pytest-asyncio pytest-httpserver pytestCheckHook requests + respx trustme ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix index a89cb3f0a4..12aac19267 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "elasticsearch"; - version = "8.12.1"; + version = "8.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AMmXcg+9Dyr+VBfIGTz2XRFoF6AlDeBSHjDD6B8AuKw="; + sha256 = "sha256-5Ovrsi0J8O+DnCa2qpjhnM1ja8t38IwStWKwLKzV50Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix index c83de92d03..c1fa2c9137 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.12.1"; + version = "8.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RuL1zYmEZEaaXb2LEW+BUmo7TcdGHH/5fjgesxXtbls="; + hash = "sha256-NWg+/dr8jXCCLeXBAXY1yL6/2CB0xCO5tswY4y/5erw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix index f64cbda488..cf8c39c308 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix @@ -1,36 +1,35 @@ -{ lib -, async-timeout -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, poetry-core -, pyserial-asyncio -, pytest-asyncio -, pytestCheckHook -, pythonOlder +{ + lib, + async-timeout, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + poetry-core, + pyserial-asyncio-fast, + pytest-asyncio, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "elkm1-lib"; - version = "2.2.6"; - format = "pyproject"; + version = "2.2.7"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "gwww"; repo = "elkm1"; rev = "refs/tags/${version}"; - hash = "sha256-5Jmn/ywyg6fmp0ZxPf79ET+JWPF4VjDJMwj/qU6ckS0="; + hash = "sha256-5YdmZO/8HimQ9Ft/K/I6xu0Av2SjUBp3+poBe7aVUpM="; }; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ async-timeout - pyserial-asyncio + pyserial-asyncio-fast ]; nativeCheckInputs = [ @@ -38,9 +37,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "elkm1_lib" - ]; + pythonImportsCheck = [ "elkm1_lib" ]; meta = with lib; { description = "Python module for interacting with ElkM1 alarm/automation panel"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emcee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emcee/default.nix index 772fb64d1f..624faffed8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emcee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emcee/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "emcee"; - version = "3.1.4"; + version = "3.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dfm"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-K2cPSbR7jnl9Vzf2sEiPZqk2vTwgChNWAf6CAerhZCg="; + hash = "sha256-83v7O/eo8LQux75IkLWU8moj3rYiyRjZdNeAwtjrJ60="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emv/default.nix index c7be7ba9e7..69d3a9ef91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emv/default.nix @@ -1,58 +1,59 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, click -, pyscard -, pycountry -, terminaltables -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + click, + pyscard, + pycountry, + terminaltables, + pytestCheckHook, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "emv"; version = "1.0.14"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "russss"; repo = "python-emv"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-MnaeQZ0rA3i0CoUA6HgJQpwk5yo4rm9e+pc5XzRd1eg="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace setup.py \ + --replace-fail '"enum-compat==0.0.3",' "" \ + --replace-fail '"argparse==1.4.0",' "" \ + --replace-fail "click==7.1.2" "click" \ + --replace-fail "pyscard==2.0.0" "pyscard" \ + --replace-fail "pycountry==20.7.3" "pycountry" \ + --replace-fail "terminaltables==3.1.0" "terminaltables" + ''; + + build-system = [ setuptools ]; + + dependencies = [ click pyscard pycountry terminaltables ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace '"enum-compat==0.0.3",' "" \ - --replace '"argparse==1.4.0",' "" \ - --replace "click==7.1.2" "click" \ - --replace "pyscard==2.0.0" "pyscard" \ - --replace "pycountry==20.7.3" "pycountry" \ - --replace "terminaltables==3.1.0" "terminaltables" - ''; - - pythonImportsCheck = [ - "emv" - ]; + pythonImportsCheck = [ "emv" ]; meta = with lib; { description = "Implementation of the EMV chip-and-pin smartcard protocol"; - mainProgram = "emvtool"; homepage = "https://github.com/russss/python-emv"; + changelog = "https://github.com/russss/python-emv/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ lukegb ]; + mainProgram = "emvtool"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix index f11b85d8bf..4b0fab97e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix @@ -10,13 +10,14 @@ , pytestCheckHook , python-dateutil , pythonOlder +, setuptools , voluptuous }: buildPythonPackage rec { pname = "env-canada"; - version = "0.6.1"; - format = "setuptools"; + version = "0.6.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,10 +25,14 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-6p4holWMAoaosmTL8AveRGuBS/MymC7usvK3I7CBEKQ="; + hash = "sha256-2lrZpjOdijE/udGRzUXT63xI+f9yI+04arfWdt6fMSA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp geopy imageio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/epitran/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/epitran/default.nix new file mode 100644 index 0000000000..8495d81d97 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/epitran/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + fetchFromGitHub, + + unittestCheckHook, + + setuptools, + + regex, + panphon, + marisa-trie, + requests, +}: + +buildPythonPackage rec { + pname = "epitran"; + version = "1.24"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dmort27"; + repo = "epitran"; + rev = "refs/tags/${version}"; + hash = "sha256-AH4q8J5oMaUVJ559qe/ZlJXlCcGdxWnxMhnZKCH5Rlk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + regex + panphon + marisa-trie + requests + ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + unittestFlagsArray = [ + "-s" + "test" + ]; + + pythonImportsCheck = [ + "epitran" + "epitran.backoff" + "epitran.vector" + ]; + + meta = with lib; { + description = "Tools for transcribing languages into IPA"; + homepage = "https://github.com/dmort27/epitran"; + changelog = "https://github.com/dmort27/epitran/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/equinox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/equinox/default.nix index 976406b399..cd4f60e8ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/equinox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/equinox/default.nix @@ -48,8 +48,21 @@ buildPythonPackage rec { pythonImportsCheck = [ "equinox" ]; disabledTests = [ - # Failed: DID NOT WARN. No warnings of type (,) were emitted. - "test_tracetime" + # For simplicity, JAX has removed its internal frames from the traceback of the following exception. + # https://github.com/patrick-kidger/equinox/issues/716 + "test_abstract" + "test_complicated" + "test_grad" + "test_jvp" + "test_mlp" + "test_num_traces" + "test_pytree_in" + "test_simple" + "test_vmap" + + # AssertionError: assert 'foo:\n pri...pe=float32)\n' == 'foo:\n pri...pe=float32)\n' + # Also reported in patrick-kidger/equinox#716 + "test_backward_nan" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etelemetry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etelemetry/default.nix index 24777c4e9c..a3b9008fc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/etelemetry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/etelemetry/default.nix @@ -1,20 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, ci-info, ci-py, requests }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, ci-info +, ci-py +, requests +, setuptools +}: buildPythonPackage rec { - version = "0.2.1"; - format = "setuptools"; pname = "etelemetry"; - disabled = isPy27; + version = "0.3.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "1rw8im09ppnb7z7p7rx658rp5ib8zca8byxg1kiflqwgx5c8zddz"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "sensein"; + repo = "etelemetry-client"; + rev = "refs/tags/v${version}"; + hash = "sha256-UaE5JQhv2AtzXKY7YD2/g6Kj1igKhmnY3zlf1P9B/iQ="; }; - propagatedBuildInputs = [ ci-info ci-py requests ]; + nativeBuildInputs = [ setuptools ]; - # all 2 of the tests both try to pull down from a url - doCheck = false; + propagatedBuildInputs = [ + ci-info + ci-py + requests + ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "etelemetry" @@ -24,7 +41,8 @@ buildPythonPackage rec { meta = with lib; { description = "Lightweight python client to communicate with the etelemetry server"; - homepage = "https://github.com/mgxd/etelemetry-client"; + homepage = "https://github.com/sensein/etelemetry-client"; + changelog = "https://github.com/sensein/etelemetry-client/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix index 9a9dc6897b..f6ed465c48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eve/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "Open source Python REST API framework designed for human beings"; changelog = "https://github.com/pyeve/eve/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/remove-distutils-usage.patch b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/remove-distutils-usage.patch deleted file mode 100644 index 614a41f0a9..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/remove-distutils-usage.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff --git a/eventlet/hubs/hub.py b/eventlet/hubs/hub.py -index db55958..c27b81f 100644 ---- a/eventlet/hubs/hub.py -+++ b/eventlet/hubs/hub.py -@@ -21,7 +21,7 @@ else: - - import eventlet.hubs - from eventlet.hubs import timer --from eventlet.support import greenlets as greenlet, clear_sys_exc_info -+from eventlet.support import greenlets as greenlet - try: - from monotonic import monotonic - except ImportError: -@@ -309,7 +309,6 @@ class BaseHub(object): - cur.parent = self.greenlet - except ValueError: - pass # gets raised if there is a greenlet parent cycle -- clear_sys_exc_info() - return self.greenlet.switch() - - def squelch_exception(self, fileno, exc_info): -@@ -397,13 +396,11 @@ class BaseHub(object): - if self.debug_exceptions: - traceback.print_exception(*exc_info) - sys.stderr.flush() -- clear_sys_exc_info() - - def squelch_timer_exception(self, timer, exc_info): - if self.debug_exceptions: - traceback.print_exception(*exc_info) - sys.stderr.flush() -- clear_sys_exc_info() - - def add_timer(self, timer): - scheduled_time = self.clock() + timer.seconds -@@ -478,7 +475,6 @@ class BaseHub(object): - raise - except: - self.squelch_timer_exception(timer, sys.exc_info()) -- clear_sys_exc_info() - - # for debugging: - -diff --git a/eventlet/hubs/kqueue.py b/eventlet/hubs/kqueue.py -index bad4a87..8438805 100644 ---- a/eventlet/hubs/kqueue.py -+++ b/eventlet/hubs/kqueue.py -@@ -109,4 +109,3 @@ class Hub(hub.BaseHub): - raise - except: - self.squelch_exception(fileno, sys.exc_info()) -- support.clear_sys_exc_info() -diff --git a/eventlet/hubs/poll.py b/eventlet/hubs/poll.py -index 1bbd401..d3f9c6a 100644 ---- a/eventlet/hubs/poll.py -+++ b/eventlet/hubs/poll.py -@@ -113,7 +113,6 @@ class Hub(hub.BaseHub): - raise - except: - self.squelch_exception(fileno, sys.exc_info()) -- support.clear_sys_exc_info() - - if self.debug_blocking: - self.block_detect_post() -diff --git a/eventlet/hubs/selects.py b/eventlet/hubs/selects.py -index 0ead5b8..0386a1e 100644 ---- a/eventlet/hubs/selects.py -+++ b/eventlet/hubs/selects.py -@@ -61,4 +61,3 @@ class Hub(hub.BaseHub): - raise - except: - self.squelch_exception(fileno, sys.exc_info()) -- support.clear_sys_exc_info() -diff --git a/eventlet/support/__init__.py b/eventlet/support/__init__.py -index 43bac91..b1c1607 100644 ---- a/eventlet/support/__init__.py -+++ b/eventlet/support/__init__.py -@@ -30,15 +30,6 @@ def get_errno(exc): - return None - - --if sys.version_info[0] < 3 and not greenlets.preserves_excinfo: -- from sys import exc_clear as clear_sys_exc_info --else: -- def clear_sys_exc_info(): -- """No-op In py3k. -- Exception information is not visible outside of except statements. -- sys.exc_clear became obsolete and removed.""" -- pass -- - if sys.version_info[0] < 3: - def bytes_to_str(b, encoding='ascii'): - return b -diff --git a/eventlet/support/greenlets.py b/eventlet/support/greenlets.py -index d4e1793..b939328 100644 ---- a/eventlet/support/greenlets.py -+++ b/eventlet/support/greenlets.py -@@ -1,8 +1,4 @@ --import distutils.version -- - import greenlet - getcurrent = greenlet.greenlet.getcurrent - GreenletExit = greenlet.greenlet.GreenletExit --preserves_excinfo = (distutils.version.LooseVersion(greenlet.__version__) -- >= distutils.version.LooseVersion('0.3.2')) - greenlet = greenlet.greenlet -diff --git a/setup.py b/setup.py -index a8f4684..9b927e0 100644 ---- a/setup.py -+++ b/setup.py -@@ -19,7 +19,7 @@ setuptools.setup( - packages=setuptools.find_packages(exclude=['benchmarks', 'tests', 'tests.*']), - install_requires=( - 'dnspython >= 1.15.0', -- 'greenlet >= 0.3', -+ 'greenlet >= 1.0', - 'monotonic >= 1.4;python_version<"3.5"', - 'six >= 1.10.0', - ), -diff --git a/tests/hub_test.py b/tests/hub_test.py -index a531b75..05c0024 100644 ---- a/tests/hub_test.py -+++ b/tests/hub_test.py -@@ -194,7 +194,6 @@ class TestExceptionInMainloop(tests.LimitedTestCase): - - class TestExceptionInGreenthread(tests.LimitedTestCase): - -- @skip_unless(greenlets.preserves_excinfo) - def test_exceptionpreservation(self): - # events for controlling execution order - gt1event = eventlet.Event() -diff --git a/tests/test__refcount.py b/tests/test__refcount.py -index 1090a1f..5c1c002 100644 ---- a/tests/test__refcount.py -+++ b/tests/test__refcount.py -@@ -57,7 +57,6 @@ def run_interaction(run_client): - - def run_and_check(run_client): - w = run_interaction(run_client=run_client) -- # clear_sys_exc_info() - gc.collect() - fd = w() - print('run_and_check: weakref fd:', fd) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix index b61753c6fe..c41a7da3a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "5.2.1"; + version = "5.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = "exchangelib"; rev = "refs/tags/v${version}"; - hash = "sha256-4XcJNbnBCaSrGwfgDAlo4wCOjlwq2rLjSxRXniuzdzk="; + hash = "sha256-rcXQJYjyWLPrlMci/j8IY7EbDEyyc+5uSOOXo0YwjKo="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/execnb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/execnb/default.nix index 56b1bf1388..bd3d91a10e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/execnb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/execnb/default.nix @@ -1,34 +1,45 @@ -{ lib -, buildPythonPackage -, fetchPypi -, fastcore -, traitlets -, ipython -, pythonOlder +{ + lib, + buildPythonPackage, + fastcore, + fetchPypi, + ipython, + pythonOlder, + setuptools, + traitlets, }: buildPythonPackage rec { pname = "execnb"; - version = "0.1.5"; - format = "setuptools"; + version = "0.1.6"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nuAp4OMAfA3u3DJyORjFw7y7ZLsLCKEfxSFIXqNh+k0="; + hash = "sha256-KJ2XEHqFY0SxbAiVPWBFO0cyC0EWgGDso8wt7lBLTgU="; }; - propagatedBuildInputs = [ fastcore traitlets ipython ]; + build-system = [ setuptools ]; + + dependencies = [ + fastcore + ipython + traitlets + ]; # no real tests doCheck = false; + pythonImportsCheck = [ "execnb" ]; meta = with lib; { - homepage = "https://github.com/fastai/execnb"; description = "Execute a jupyter notebook, fast, without needing jupyter"; - mainProgram = "exec_nb"; + homepage = "https://github.com/fastai/execnb"; + changelog = "https://github.com/fastai/execnb/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ rxiao ]; + mainProgram = "exec_nb"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix index eb184c180d..76f9b9b4df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "execnet"; - version = "2.0.2"; + version = "2.1.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-zFm8RCN0L9ca0icSLrDdRNtR77PcQJW0WsmgjHcAlq8="; + hash = "sha256-UYm1LGEhwk/q4ogWarQbMlScfiNIZSc2VAuebn1OcuM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix index 014fa1057d..4adc91b25d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/explorerscript"; description = "A programming language + compiler/decompiler for creating scripts for Pokémon Mystery Dungeon Explorers of Sky"; license = licenses.mit; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eyed3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eyed3/default.nix index 7717ba2601..46678654f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eyed3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eyed3/default.nix @@ -28,13 +28,6 @@ buildPythonPackage rec { six ]; - postInstall = '' - for prog in "$out/bin/"*; do - wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PATH : ${python}/bin - done - ''; - meta = with lib; { description = "A Python module and command line program for processing ID3 tags"; mainProgram = "eyeD3"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix index ec667330a6..c0944e473f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "faker"; - version = "24.0.0"; + version = "24.11.0"; pyproject = true; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-6m94TEBzDeD3cGfknnjN1ZDvsAvsPTP1d0kiYiBsF/w="; + hash = "sha256-NLlHWBwrztNAw5s1+J2/rE81aTLP/4/ok73oVJA/Dm4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix index 45a2a512d5..d3ef95253a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix @@ -1,23 +1,24 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, hypothesis -, jsonpath-ng -, lupa -, poetry-core -, pybloom-live -, pyprobables -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder -, redis -, sortedcontainers +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hypothesis, + jsonpath-ng, + lupa, + poetry-core, + pybloom-live, + pyprobables, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, + redis, + sortedcontainers, }: buildPythonPackage rec { pname = "fakeredis"; - version = "2.21.3"; + version = "2.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,14 +27,12 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-GIg+a8G5S0dmbvMKqS/Vn+wzNM6iNIs3bKPqhecsQt4="; + hash = "sha256-qiqJO8uZ3vy9TpTHmExlUoQ78avPVqlKn0jgvDsKdP0="; }; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ redis sortedcontainers ]; @@ -46,25 +45,18 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - lua = [ - lupa - ]; - json = [ - jsonpath-ng - ]; - bf = [ - pyprobables - ]; - cf = [ - pyprobables - ]; - probabilistic = [ - pyprobables - ]; + lua = [ lupa ]; + json = [ jsonpath-ng ]; + bf = [ pyprobables ]; + cf = [ pyprobables ]; + probabilistic = [ pyprobables ]; }; - pythonImportsCheck = [ - "fakeredis" + pythonImportsCheck = [ "fakeredis" ]; + + disabledTests = [ + # AssertionError + "test_command" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fast-histogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fast-histogram/default.nix index 229e448ea7..d3e4e3eb67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fast-histogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fast-histogram/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "fast-histogram"; - version = "0.12"; + version = "0.14"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astrofrog"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-Cz4BgbtxbUPxL2NSzvZYjbYIN4KUuliUV0bXRRtyvfM="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-vIzDDzz6e7PXArHdZdSSgShuTjy3niVdGtXqgmyJl1w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastai/default.nix index ff8ac701cf..cd4bcc9f4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastai/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "fastai"; - version = "2.7.14"; + version = "2.7.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QiVyYojI/xs7wYl3umhky0j+xzptNS7Fv+fLMRy/4jc="; + hash = "sha256-8swg/RjN9exzjMVtKdVN51iH1IrRX501z1DDjTqFaSM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix index 67193638dd..92850c336b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.110.0"; + version = "0.110.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = "refs/tags/${version}"; - hash = "sha256-OXWJ1PKJSJGzYNT8HHXvxMxjUtI4K6edpI+Z5B3TvhI="; + hash = "sha256-qUh5exkXVRcKIO0t4KIOZhhpsftj3BrWaL2asf8RqUI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastbencode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastbencode/default.nix index 82522db24a..92eb19e0a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastbencode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastbencode/default.nix @@ -1,30 +1,30 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python -, pythonOlder -, cython +{ + lib, + buildPythonPackage, + cython, + fetchPypi, + python, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "fastbencode"; - version = "0.2"; - format = "setuptools"; + version = "0.3.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-V465xHANZwXXH7yNfVe8os2Yfsos7B2ed7ngcC2x5W8="; + hash = "sha256-X+DLfRc2iRr2HSreQM6UiUHUbpCLFvU4P1XxJ4SNoZc="; }; - nativeBuildInputs = [ - cython - ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ - "fastbencode" - ]; + nativeBuildInputs = [ cython ]; + + pythonImportsCheck = [ "fastbencode" ]; checkPhase = '' ${python.interpreter} -m unittest fastbencode.tests.test_suite @@ -33,7 +33,8 @@ buildPythonPackage rec { meta = with lib; { description = "Fast implementation of bencode"; homepage = "https://github.com/breezy-team/fastbencode"; + changelog = "https://github.com/breezy-team/fastbencode/releases/tag/v${version}"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix index 544bb26936..5311a0add5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix @@ -1,35 +1,35 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, packaging -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + packaging, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "fastcore"; - version = "1.5.29"; - format = "setuptools"; + version = "1.5.35"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fastai"; - repo = pname; + repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-yCPOF150TdkPHfLl8Jo2oow+91IzRKgnXo3eQMn5wK0="; + hash = "sha256-dhYmy7dAHmmRfC2mpn49UsE4+hpqMbB1PHGmrowCTIQ="; }; - propagatedBuildInputs = [ - packaging - ]; + build-system = [ setuptools ]; + + dependencies = [ packaging ]; # Module has no tests doCheck = false; - pythonImportsCheck = [ - "fastcore" - ]; + pythonImportsCheck = [ "fastcore" ]; meta = with lib; { description = "Python module for Fast AI"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faster-fifo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faster-fifo/default.nix index 1d77707b6a..a3b8f491a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faster-fifo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faster-fifo/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub +, stdenv +, gcc12Stdenv # build-system , cython @@ -11,11 +13,17 @@ , unittestCheckHook }: +let + stdenv' = if stdenv.isLinux then gcc12Stdenv else stdenv; +in buildPythonPackage rec { pname = "faster-fifo"; version = "1.4.5"; format = "pyproject"; + # https://github.com/alex-petrenko/faster-fifo/issues/47\ + stdenv = stdenv'; + src = fetchFromGitHub { owner = "alex-petrenko"; repo = "faster-fifo"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix index 847afc47a3..4a54757640 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonRelaxDepsHook # build-system , setuptools @@ -18,18 +19,23 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "SYSTRAN"; repo = "faster-whisper"; rev = "refs/tags/v${version}"; - hash = "sha256-b8P9fI32ubOrdayA0vnjLhpZ4qffB6W+8TEOA1YLKqo="; + hash = "sha256-O2RRwb+omgSpfckHh3oPu454g2ULT4gyolrg5olHcRc="; }; build-system = [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "tokenizers" ]; dependencies = [ @@ -56,9 +62,9 @@ buildPythonPackage rec { ''; meta = with lib; { - changelog = "https://github.com/guillaumekln/faster-whisper/releases/tag/${version}"; + changelog = "https://github.com/SYSTRAN/faster-whisper/releases/tag/v${version}"; description = "Faster Whisper transcription with CTranslate2"; - homepage = "https://github.com/guillaumekln/faster-whisper"; + homepage = "https://github.com/SYSTRAN/faster-whisper"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix deleted file mode 100644 index 57be00cb91..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, scipy -, pythonOlder -}: - -buildPythonPackage { - pname = "fastpair"; - version = "unstable-2021-05-19"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "carsonfarmer"; - repo = "fastpair"; - rev = "d3170fd7e4d6e95312e7e1cb02e84077a3f06379"; - hash = "sha256-vSb6o0XvHlzev2+uQKUI66wM39ZNqDsppEc8rlB+H9E="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner",' "" - ''; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - propagatedBuildInputs = [ - scipy - ]; - - meta = with lib; { - description = "Data-structure for the dynamic closest-pair problem"; - homepage = "https://github.com/carsonfarmer/fastpair"; - license = licenses.mit; - maintainers = with maintainers; [ cmcdragonkai rakesh4g ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ffmpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ffmpy/default.nix index 8e00a4678e..880a8f84ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ffmpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ffmpy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -25,7 +26,7 @@ buildPythonPackage rec { postPatch = '' # default to store ffmpeg substituteInPlace ffmpy.py \ - --replace 'executable="ffmpeg",' 'executable="${ffmpeg-headless}/bin/ffmpeg",' + --replace-fail 'executable="ffmpeg",' 'executable="${ffmpeg-headless}/bin/ffmpeg",' # The tests test a mock that does not behave like ffmpeg. If we default to the nix-store ffmpeg they fail. for fname in tests/*.py; do @@ -44,6 +45,11 @@ buildPythonPackage rec { go ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # expects a FFExecutableNotFoundError, gets a NotADirectoryError raised by os + "test_invalid_executable_path" + ]; + # the vendored ffmpeg mock binary assumes FHS preCheck = '' rm -v tests/ffmpeg/ffmpeg diff --git a/third_party/nixpkgs/pkgs/development/python-modules/file-read-backwards/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/file-read-backwards/default.nix index 9317021f45..ddb141b8ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/file-read-backwards/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/file-read-backwards/default.nix @@ -1,22 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, mock }: +{ + lib, + buildPythonPackage, + fetchPypi, + mock, + pythonOlder, + setuptools, + unittestCheckHook, +}: buildPythonPackage rec { pname = "file-read-backwards"; - version = "3.0.0"; - format = "setuptools"; + version = "3.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "file_read_backwards"; inherit version; - sha256 = "sha256-USw+U0BDUnqPrioLcVGqJV8towPnf9QPfc9CoeCRzCY="; + hash = "sha256-vQRZO8GTigAyJL5FHV1zXx9EkOHnClaM6NMwu3ZSpoQ="; }; - nativeCheckInputs = [ mock ]; + build-system = [ setuptools ]; + + nativeCheckInputs = [ + mock + unittestCheckHook + ]; + pythonImportsCheck = [ "file_read_backwards" ]; meta = with lib; { - homepage = "https://github.com/RobinNil/file_read_backwards"; description = "Memory efficient way of reading files line-by-line from the end of file"; + homepage = "https://github.com/RobinNil/file_read_backwards"; + changelog = "https://github.com/RobinNil/file_read_backwards/blob/v${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ j0hax ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filedate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/filedate/default.nix new file mode 100644 index 0000000000..5317169caa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/filedate/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + python-dateutil, + setuptools, +}: +buildPythonPackage rec { + pname = "filedate"; + version = "3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kubinka0505"; + repo = "filedate"; + rev = version; + hash = "sha256-HvuGP+QlUlfAUfFmaVVvtPHGdrbWVxghQipnqTTvAQc="; + }; + + sourceRoot = "${src.name}/Files"; + + # The repo stores everything in "src" and uses setup.py to move "src" -> + # "filedate" before calling setup() and then tries to rename "filedate" back + # to "src" after. + postPatch = '' + mv src filedate + substituteInPlace setup.py \ + --replace-fail "__title__ = os.path.basename(os.path.dirname(os.path.dirname(__file__)))" '__title__ = "filedate"' + substituteInPlace setup.py \ + --replace-fail "cleanup = True" "cleanup = False" + + # Disable renaming "filedate" dir back to "src" + substituteInPlace setup.py \ + --replace-fail "if os.path.exists(__title__):" "" + substituteInPlace setup.py \ + --replace-fail " os.rename(__title__, directory)" "" + ''; + + build-system = [ setuptools ]; + + dependencies = [ python-dateutil ]; + + pythonImportsCheck = [ "filedate" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests/unit.py" ]; + + disabledTests = [ "test_created" ]; + + meta = { + description = "Simple, convenient and cross-platform file date changing library"; + homepage = "https://github.com/kubinka0505/filedate"; + changelog = "https://github.com/kubinka0505/filedate/blob/${src.rev}/Documents/ChangeLog.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ thornycrackers ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix index b32335bb24..5b739bcc8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.13.1"; + version = "3.13.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Uh9fVsUPhCb14DrTsoG0kKh+8VvGxSbxaCkPDHFI1E4="; + hash = "sha256-0T9GZhi/3nK9LBglXiafclQsbnDnusg6AjLWscxcjPQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fitbit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fitbit/default.nix index de678f787c..439d74a26a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fitbit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fitbit/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "Fitbit API Python Client Implementation"; homepage = "https://github.com/orcasgit/python-fitbit"; license = licenses.asl20; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix index 74319971e9..5a6305744d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "24.2.6"; + version = "24.4.26"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9GuHgRCwHD7YP0XdoFip9rWyPtZtVme+c+nHjvBrB8k="; + hash = "sha256-jJ4/l2nzjqJDCe1pFrdkMvB5WJ+GJarOHgGZSzCS6nc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix index 3598500e37..2e7f5fb808 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -15,7 +15,6 @@ , flask-jwt-extended , jsonschema , marshmallow -, marshmallow-enum , marshmallow-sqlalchemy , python-dateutil , pythonOlder @@ -53,7 +52,6 @@ buildPythonPackage rec { flask-jwt-extended jsonschema marshmallow - marshmallow-enum marshmallow-sqlalchemy python-dateutil prison diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix index 1a9a27dc03..052bf4ac5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix @@ -83,6 +83,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-restx/flask-restx"; changelog = "https://github.com/python-restx/flask-restx/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix index 8c60066b19..77d26dc24b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix @@ -31,12 +31,12 @@ buildPythonPackage rec { pname = "flask"; - version = "3.0.2"; + version = "3.0.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-giwD9LeZIEJQp+6Ese3cQGZTlTM5c9+53uv+Ql/vy30="; + hash = "sha256-zrJ7CvOCPqJzeSik2Z0SWgYXW4USxEXL2anOIA73aEI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix index ce41f8e561..6afe4ef9a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "flax"; - version = "0.8.2"; + version = "0.8.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,16 +34,16 @@ buildPythonPackage rec { owner = "google"; repo = "flax"; rev = "refs/tags/v${version}"; - hash = "sha256-UABgJGe1grUSkwOJpjeIoFqhXsqG//HlC1YyYPxXV+g="; + hash = "sha256-uDGTyksUZTTL6FiTJP+qteFLOjr75dcTj9yRJ6Jm8xU="; }; - nativeBuildInputs = [ + build-system = [ jaxlib pythonRelaxDepsHook setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ jax msgpack numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix index 45b2981ba9..7ec46f29da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "flexmock"; - version = "0.12.0"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-YdBvPRRCuBW3qoWh9HvoONBW9fXRTO/teuv7A0c9FKs="; + hash = "sha256-ILaQr6T/jG8xVI2JbW1BzKH8kFCkz2KLll6kNOxUjuM="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix index a2e2ddfcdb..b623d1ec26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix @@ -56,6 +56,5 @@ buildPythonPackage rec { mainProgram = "flit"; homepage = "https://github.com/pypa/flit"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix index 3e836772aa..d9c61a7916 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix @@ -1,21 +1,21 @@ -{ lib -, buildPythonPackage -, elasticsearch -, fastavro -, fetchFromGitHub -, lz4 -, msgpack -, pytest7CheckHook -, pythonOlder -, setuptools -, setuptools-scm -, wheel -, zstandard +{ + lib, + buildPythonPackage, + elasticsearch, + fastavro, + fetchFromGitHub, + lz4, + msgpack, + pytest7CheckHook, + pythonOlder, + setuptools, + setuptools-scm, + zstandard, }: buildPythonPackage rec { pname = "flow-record"; - version = "3.14"; + version = "3.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,48 +24,37 @@ buildPythonPackage rec { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-8XQeXfrgTk+jHR1ABlEEIn3E/MkUkGnvkgzePws4qhQ="; + hash = "sha256-j5N66p7feB9Ae+Fu5RhVzh8XCHiq55jJMg0Fe+C6Jvg="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ - msgpack - ]; + dependencies = [ msgpack ]; passthru.optional-dependencies = { compression = [ lz4 zstandard ]; - elastic = [ - elasticsearch - ]; - avro = [ - fastavro - ] ++ fastavro.optional-dependencies.snappy; + elastic = [ elasticsearch ]; + avro = [ fastavro ] ++ fastavro.optional-dependencies.snappy; }; nativeCheckInputs = [ pytest7CheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pythonImportsCheck = [ - "flow.record" - ]; + pythonImportsCheck = [ "flow.record" ]; disabledTestPaths = [ # Test requires rdump "tests/test_rdump.py" ]; - disabledTests = [ - "test_rdump_fieldtype_path_json" - ]; + disabledTests = [ "test_rdump_fieldtype_path_json" ]; meta = with lib; { description = "Library for defining and creating structured data"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flynt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flynt/default.nix index 0e0b73d20f..24112171ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flynt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flynt/default.nix @@ -1,34 +1,48 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, astor -, pytestCheckHook +{ + astor, + buildPythonPackage, + fetchFromGitHub, + hatchling, + lib, + pytestCheckHook, + pythonOlder, + tomli, }: buildPythonPackage rec { pname = "flynt"; - version = "0.66"; - format = "setuptools"; + version = "1.0.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ikamensh"; repo = "flynt"; - rev = version; - hash = "sha256-DV433wqLjF5k4g8J7rj5gZfaw+Y4/TDOoFKo3eKDjZ4="; + rev = "refs/tags/${version}"; + hash = "sha256-UHY4UDBHcP3ARikktIehSUD3Dx8A0xpOnfKWWrLCsOY="; }; - propagatedBuildInputs = [ astor ]; + build-system = [ hatchling ]; + + propagatedBuildInputs = [ astor ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "flynt" ]; + + disabledTests = [ + # AssertionError + "test_fstringify" + "test_mixed_quote_types_unsafe" + ]; + meta = with lib; { - description = "command line tool to automatically convert a project's Python code from old format style strings into Python 3.6+'s f-strings"; - mainProgram = "flynt"; + description = "Tool to automatically convert old string literal formatting to f-strings"; homepage = "https://github.com/ikamensh/flynt"; + changelog = "https://github.com/ikamensh/flynt/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; + mainProgram = "flynt"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix index 9c2df4de63..1478e274c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix @@ -75,6 +75,5 @@ buildPythonPackage rec { homepage = "https://github.com/python-visualization/folium"; changelog = "https://github.com/python-visualization/folium/blob/v${version}/CHANGES.txt"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontbakery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontbakery/default.nix index 3076e6a4c4..313e6d7c7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontbakery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontbakery/default.nix @@ -47,11 +47,11 @@ buildPythonPackage rec { pname = "fontbakery"; - version = "0.11.2"; + version = "0.12.5"; src = fetchPypi { inherit pname version; - hash = "sha256-61EXlf+d5kJeUF41OEnGNLaOcSvFWUDFgarVvHQZYmw="; + hash = "sha256-DN1v5MQtMhHO12tVPkJUuIfh+X3kb1o71zAwNgtLH+I="; }; pyproject = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontbakery/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontbakery/tests.nix index 4725b1fee3..d968d6ec05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontbakery/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontbakery/tests.nix @@ -10,13 +10,10 @@ runCommand "${pname}-tests" { meta.timeout = 5; } '' # Check the version matches what we packaged. ${fontbakery}/bin/fontbakery --version | grep -q "${version}" - # Can it list its own subcommands? - ${fontbakery}/bin/fontbakery --list-subcommands >>$out - # Unpack src to get some test fonts. tar -xzf ${src} --strip-components=1 ${pname}-${version}/data/test # Run some font checks. - ${fontbakery}/bin/fontbakery check-ufo-sources --no-progress --no-colors data/test/test.ufo >>$out + ${fontbakery}/bin/fontbakery check-ufo --no-progress --no-colors data/test/test.ufo >>$out # TODO add more '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix index 7911750bbe..9ad75847b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "fontmake"; - version = "3.8.1"; - format = "setuptools"; + version = "3.9.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-m0cRLm9Jbqlsf9NwR7Lma2NZYUjy5IDJYOorVbdLDuw="; + hash = "sha256-KrfT0fvE1fhaM2RH4LqRUda7yMHg2T59UdGi3SSZP7s="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix index be573a627e..57e8372efa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.49.0"; + version = "4.51.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8xQVuAnIS/mwYKwI+ow0YArIP8wFTKWGLZ+NCgIFYok="; + hash = "sha256-JUAFGLjyq/2OXlhTB6dIcO3Mq7Rx1HII+sg2TaQfPYU="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fpdf2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fpdf2/default.nix index fdd43f1ca5..b3a764724c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fpdf2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fpdf2/default.nix @@ -57,6 +57,9 @@ buildPythonPackage rec { "test_png_url" # tries to download file "test_page_background" # tries to download file "test_share_images_cache" # uses timing functions + "test_bidi_character" # tries to download file + "test_bidi_conformance" # tries to download file + "test_insert_jpg_jpxdecode" # JPEG2000 is broken ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix index 95358d5f4a..2b4571b53e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix @@ -15,6 +15,9 @@ , fplll , numpy +# Reverse dependency +, sage + # tests , pytestCheckHook }: @@ -72,6 +75,8 @@ buildPythonPackage rec { export PY_IGNORE_IMPORTMISMATCH=1 ''; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "A Python interface for fplll"; changelog = "https://github.com/fplll/fpylll/releases/tag/${version}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix index e1ded2da5f..c3f5d2a560 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook , pythonAtLeast , pythonOlder @@ -8,8 +9,8 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.4.2"; - format = "setuptools"; + version = "2.4.4"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "Marco-Sulla"; repo = "python-frozendict"; rev = "refs/tags/v${version}"; - hash = "sha256-SXUPzFDVw8+CmD/Jxm/EB70UBdOmauQs69hNr0l3l90="; + hash = "sha256-TgXhffUvx74fU2SgDV04R1yS9xGbiP/ksQ+3KGT5bdQ="; }; # build C version if it exists @@ -32,6 +33,10 @@ buildPythonPackage rec { fi ''; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fsspec-xrootd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fsspec-xrootd/default.nix index f601c9b86c..d2d7225710 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fsspec-xrootd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fsspec-xrootd/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "fsspec-xrootd"; - version = "0.2.4"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "CoffeaTeam"; repo = "fsspec-xrootd"; rev = "refs/tags/v${version}"; - hash = "sha256-8TT+49SF/3i2OMIDcDD0AXEn0J9UkNX2q/SBkfoMXso="; + hash = "sha256-fhamfMWlsiiqfU9c9XDfLEEkRbMAqm74rc2bGF3fRaM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fuzzytm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fuzzytm/default.nix index e7dae0d02e..3a86d0c553 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fuzzytm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fuzzytm/default.nix @@ -1,28 +1,32 @@ -{ lib -, buildPythonPackage -, fetchPypi -, gensim -, numpy -, pandas -, pyfume -, scipy -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + gensim, + numpy, + pandas, + pyfume, + setuptools, + scipy, + pythonOlder, }: buildPythonPackage rec { pname = "fuzzytm"; - version = "2.0.5"; - format = "setuptools"; + version = "2.0.9"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "FuzzyTM"; inherit version; - hash = "sha256-IELkjd3/yc2lBYsLP6mms9LEcXOfVtNNooEKCMf9BtU="; + hash = "sha256-z0ESYtB7BqssxIHlrd0F+/qapOM1nrDi3Zih5SvgDGY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ gensim numpy pandas @@ -33,9 +37,7 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "FuzzyTM" - ]; + pythonImportsCheck = [ "FuzzyTM" ]; meta = with lib; { description = "Library for Fuzzy Topic Models"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fyta-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fyta-cli/default.nix index 7e0b2971be..79189827c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fyta-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fyta-cli/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fyta-cli"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dontinelli"; repo = "fyta_cli"; rev = "refs/tags/v${version}"; - hash = "sha256-ThxC+s0vkvFQw9FKMWO+cHJB1ci+USdxQa4PRqHrKLM="; + hash = "sha256-eWuuHIq79n1oFsvBfVySfGCtHz+MlFRR3j8uqtVR+V0="; }; build-system = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gamble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gamble/default.nix index 6cdfc4410b..171eb03a75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gamble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gamble/default.nix @@ -1,22 +1,29 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytestCheckHook , pythonOlder +, poetry-core }: buildPythonPackage rec { pname = "gamble"; - version = "0.11"; - format = "setuptools"; + version = "0.13"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-zsEBqhKidgO1e0lpKhw+LY75I2Df+IefNLaSkBBFKFU="; + src = fetchFromGitHub { + owner = "jpetrucciani"; + repo = "gamble"; + rev = "refs/tags/${version}"; + hash = "sha256-eHosY/JfJr317S7WI8phy7DNHf3cZzs6c5MMfw7yzAE="; }; + build-system = [ + poetry-core + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix index 57d4b58136..8ca9ec7ba7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.16"; + version = "0.2.17"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-mjFDM59fF9HpkO0a8fVW+dXYmjFxu7gn+rOrnTgN39s="; + hash = "sha256-F853wLzcqD+cQdPdvgGcItL+v8nBPoRYSyLgOJ5ld1A="; }; build-system = [ pdm-backend ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix index 7b8b32b2c5..98051cc1a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://www.gcovr.com/"; changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sigmanificient ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix index 1b0b3aa70b..881840e2a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "gdown"; - version = "5.1.0"; + version = "5.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VQpy3FyigZ/kvMFdgNBdfJjAuQ5XJWJUt30CVrnfRoM="; + hash = "sha256-IUUWUGLYVSCjzZizVsntUixeeYTUCFNUCf1G+U3vx4c="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gekko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gekko/default.nix index 24fd7423b8..d62c1f3dbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gekko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gekko/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/BYU-PRISM/GEKKO"; changelog = "https://github.com/BYU-PRISM/GEKKO/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ayes-web ]; + maintainers = with maintainers; [ BatteredBunny ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix index e6b91d24f8..73ef12c749 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix @@ -1,31 +1,38 @@ -{ lib -, fetchPypi -, buildPythonPackage -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, }: + buildPythonPackage rec { pname = "gemfileparser"; version = "0.8.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "839592e49ea3fd985cec003ef58f8e77009a69ed7644a0c0acc94cf6dd9b8d6e"; + hash = "sha256-g5WS5J6j/Zhc7AA+9Y+OdwCaae12RKDArMlM9t2bjW4="; }; - nativeCheckInputs = [ - pytestCheckHook - ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ - "gemfileparser" - ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "gemfileparser" ]; meta = with lib; { description = "A library to parse Ruby Gemfile, .gemspec and Cocoapod .podspec file using Python"; - mainProgram = "parsegemfile"; homepage = "https://github.com/gemfileparser/gemfileparser"; - license = with licenses; [ gpl3Plus /* or */ mit ]; - maintainers = [ ]; + license = with licenses; [ + gpl3Plus + mit + ]; + maintainers = with maintainers; [ ]; + mainProgram = "parsegemfile"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix index f43bfb518c..171c0faabf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , cython , fetchPypi +, fetchpatch , mock , numpy , scipy @@ -24,6 +25,16 @@ buildPythonPackage rec { hash = "sha256-maxq9v/UBoLnAVXtn5Lsv0OE1Z+1CvEg00PqXuGzCKs="; }; + patches = [ + # https://github.com/piskvorky/gensim/pull/3524 + # Import deprecated scipy.linalg.triu from numpy.triu. remove on next update + (fetchpatch { + name = "scipi-linalg-triu-fix.patch"; + url = "https://github.com/piskvorky/gensim/commit/ad68ee3f105fc37cf8db333bfb837fe889ff74ac.patch"; + hash = "sha256-Ij6HvVD8M2amzcjihu5bo8Lk0iCPl3iIq0lcOnI6G2s="; + }) + ]; + nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index a11e659553..df89acd2b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.14.7"; + version = "0.15.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,15 +22,15 @@ buildPythonPackage rec { owner = "geoalchemy"; repo = "geoalchemy2"; rev = "refs/tags/${version}"; - hash = "sha256-QYYYSYApU5WNqnRObhK6zTGVz2HtTQSMGIBwz3z9szQ="; + hash = "sha256-EMsaB6VDDDvXg9LKa9ms0+AfzX1rG+yeR898EK59DDs="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ sqlalchemy packaging ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ alembic pytestCheckHook - ] ++ passthru.optional-dependencies.shapely; + ] ++ optional-dependencies.shapely; disabledTestPaths = [ # tests require live databases @@ -60,7 +60,7 @@ buildPythonPackage rec { "geoalchemy2" ]; - passthru.optional-dependencies = { + optional-dependencies = { shapely = [ shapely ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix index 522e0f6e59..f786d3b252 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix @@ -2,20 +2,22 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools + , fiona , packaging , pandas , pyproj -, pytestCheckHook -, pythonOlder , rtree , shapely }: buildPythonPackage rec { pname = "geopandas"; - version = "0.14.3"; - format = "setuptools"; + version = "0.14.4"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -23,9 +25,13 @@ buildPythonPackage rec { owner = "geopandas"; repo = "geopandas"; rev = "refs/tags/v${version}"; - hash = "sha256-qAINoqnCVfpg2mQhnu0qT/5EjUB+9a3//H8vJJnyj6A="; + hash = "sha256-FBhPcae8bnNnsfr14I1p22VhoOf9USF9DAcrAqx+zso="; }; + build-system = [ + setuptools + ]; + propagatedBuildInputs = [ fiona packaging diff --git a/third_party/nixpkgs/pkgs/development/python-modules/getjump/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/getjump/default.nix index d7a46de903..4d3851c913 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/getjump/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/getjump/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { description = "Get and save images from jump web viewer"; homepage = "https://github.com/eggplants/getjump"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "jget"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix index 1943888df7..d61e390135 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix @@ -3,10 +3,12 @@ , buildPythonPackage , certifi , dpkt -, fetchPypi +, fetchFromGitHub , gevent +, llhttp , pytestCheckHook , pythonOlder +, setuptools , six , stdenv , urllib3 @@ -14,27 +16,34 @@ buildPythonPackage rec { pname = "geventhttpclient"; - version = "2.0.12"; - format = "setuptools"; + version = "2.3.1"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-6+oI55wap9A7Q5NrNHwPhzVub7HGhFc1oR8jyUnGVfc="; + src = fetchFromGitHub { + owner = "geventhttpclient"; + repo = "geventhttpclient"; + rev = "refs/tags/${version}"; + # TODO: unvendor llhttp + fetchSubmodules = true; + hash = "sha256-uOGnwPbvTam14SFTUT0UrwxHfP4a5cn3a7EhLoGBUrA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ brotli certifi gevent - six + urllib3 ]; nativeCheckInputs = [ dpkt pytestCheckHook - urllib3 ]; # lots of: [Errno 48] Address already in use: ('127.0.0.1', 54323) @@ -42,15 +51,12 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - disabledTests = [ - # socket.gaierror: [Errno -3] Temporary failure in name resolution - "test_client_simple" - "test_client_without_leading_slas" - "test_request_with_headers" - "test_response_context_manager" - "test_client_ssl" - "test_ssl_fail_invalid_certificate" - "test_multi_queries_greenlet_safe" + preCheck = '' + rm -rf geventhttpclient + ''; + + pytestFlagsArray = [ + "-m 'not network'" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gflanguages/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gflanguages/default.nix index 9a3f77f957..0a6023a817 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gflanguages/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gflanguages/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "gflanguages"; - version = "0.5.17"; + version = "0.6.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dScgRQ6usjSqV0FqDyP+KGvHL06wlTFVcO+MmZ2NMAs="; + hash = "sha256-kaJZ0STN2U/4vQ7g5VbpPGv64czryK8jXmIJ97bkItA="; }; pyproject = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gguf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gguf/default.nix new file mode 100644 index 0000000000..767a8472ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gguf/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, poetry-core +, pythonOlder +}: +buildPythonPackage rec { + pname = "gguf"; + version = "0.6.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-suIuq6KhBsGtFIGGoUrZ8pxCk1Fob+nXzhbfOaBgfmU="; + }; + + dependencies = [ + numpy + poetry-core + ]; + + doCheck = false; + + meta = with lib; { + description = "A module for writing binary files in the GGUF format"; + homepage = "https://ggml.ai/"; + license = licenses.mit; + maintainers = with maintainers; [ mitchmindtree ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix index 297b6c9865..7a0529cc89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix @@ -1,33 +1,56 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, gevent -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gevent, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "gipc"; - version = "1.4.0"; - format = "setuptools"; + version = "1.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jgehrcke"; repo = "gipc"; rev = "refs/tags/${version}"; - hash = "sha256-T5TqLanODyzJGyjDZz+75bbz3THxoobYnfJFQxAB76E="; + hash = "sha256-eYE7A1VDJ0NSshvdJKxPwGyVdW6BnyWoRSR1i1iTr8Y="; }; postPatch = '' substituteInPlace setup.py \ - --replace "gevent>=1.5,<=21.12.0" "gevent>=1.5" + --replace-fail "gevent>=1.5,<=23.9.1" "gevent>=1.5" ''; - propagatedBuildInputs = [ - gevent - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook + dependencies = [ gevent ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "gipc" ]; + + disabledTests = [ + # AttributeError + "test_all_handles_length" + "test_child" + "test_closeread" + "test_closewrite" + "test_early_readchild_exit" + "test_handlecount" + "test_handler" + "test_onewriter" + "test_readclose" + "test_singlemsg" + "test_twochannels_singlemsg" + "test_twoclose" + "test_twowriters" + "test_write_closewrite_read" ]; meta = with lib; { @@ -41,7 +64,8 @@ buildPythonPackage rec { anywhere within your gevent-powered application. ''; homepage = "http://gehrcke.de/gipc"; + changelog = "https://github.com/jgehrcke/gipc/blob/${version}/CHANGELOG.rst"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/git-versioner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/git-versioner/default.nix new file mode 100644 index 0000000000..564bf1af9f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/git-versioner/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, setuptools-scm +, fetchFromGitLab +}: + +buildPythonPackage rec { + pname = "git-versioner"; + version = "7.1"; + pyproject = true; + + src = fetchFromGitLab { + owner = "alelec"; + repo = "__version__"; + rev = "v${version}"; + hash = "sha256-bnpuFJSd4nBXJA75V61kiB+nU5pUzdEAIScfKx7aaGU="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + pythonImportsCheck = [ + "__version__" + ]; + + meta = with lib; { + description = "Manage current / next version for project"; + homepage = "https://gitlab.com/alelec/__version__"; + license = licenses.mit; + maintainers = with maintainers; [ slotThe ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix index 86a4c6248f..011f63c6fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix @@ -9,13 +9,14 @@ , pytestCheckHook , pythonOlder , pyyaml +, setuptools , setuptools-scm , yamllint }: buildPythonPackage rec { pname = "glean-parser"; - version = "13.0.1"; + version = "14.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-/urUy+xpMO04pI31uunrTuSGu0Am3fLzIGuF+AJ50ec="; + hash = "sha256-bYqUNkB4/0W/+0+1G6/Ur5znDD5IlKFIc4gVNA0vAOg="; }; postPatch = '' @@ -43,6 +44,7 @@ buildPythonPackage rec { jinja2 jsonschema pyyaml + setuptools yamllint ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glob2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glob2/default.nix index 5d75da953e..24658f2f78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glob2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glob2/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Version of the glob module that can capture patterns and supports recursive wildcards"; homepage = "https://github.com/miracle2k/python-glob2/"; license = licenses.bsd3; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/globre/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globre/default.nix deleted file mode 100644 index a270a2b4c4..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/globre/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, pythonAtLeast -, buildPythonPackage -, fetchPypi -, nose -, coverage -}: - -buildPythonPackage rec { - pname = "globre"; - version = "0.1.5"; - format = "setuptools"; - # https://github.com/metagriffin/globre/issues/7 - disabled = pythonAtLeast "3.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "1qhjpg0722871dm5m7mmldf6c7mx58fbdvk1ix5i3s9py82448gf"; - }; - - nativeCheckInputs = [ nose coverage ]; - - meta = with lib; { - homepage = "https://github.com/metagriffin/globre"; - description = "A python glob-like regular expression generation library."; - maintainers = with maintainers; [ glittershark ]; - license = licenses.gpl3; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index cd85281257..5cb49c0e97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -2,18 +2,20 @@ , buildPythonPackage , cryptography , fetchFromGitHub +, flaky , pyjwt , pytestCheckHook , pythonOlder , requests , responses +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "globus-sdk"; version = "3.39.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +26,11 @@ buildPythonPackage rec { hash = "sha256-DjGwwpXzYRq5/hiUs/l8kD/yA58vbhvrKirKDlWoAmY="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ cryptography requests pyjwt @@ -34,17 +40,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - responses ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pyjwt[crypto]>=2.0.0,<3.0.0" "pyjwt[crypto]>=2.0.0,<3.0.0" - ''; - - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" + checkInputs = [ + flaky + responses ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix index 4ff23443e4..0f8ad79c72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix @@ -1,10 +1,13 @@ { lib , stdenv , buildPythonPackage +, substituteAll +, glibc +, libtiff +, openjpeg , fetchFromGitHub , lxml , numpy -, openjpeg , pytestCheckHook , pythonOlder , scikit-image @@ -13,54 +16,66 @@ buildPythonPackage rec { pname = "glymur"; - version = "0.12.5"; - format = "pyproject"; + version = "0.13.2"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "quintusdias"; - repo = pname; + repo = "glymur"; rev = "refs/tags/v${version}"; - hash = "sha256-9NMSAt5yFRnlCUDP37/ozhDsS8FTdRkfjUz8kQwWzVc="; + hash = "sha256-GUqe9mdMm2O/cbZw8Reohh4X1kO+xOMWHb83PjNvdu8="; }; - nativeBuildInputs = [ + patches = [ + (substituteAll { + src = ./set-lib-paths.patch; + openjp2_lib = "${lib.getLib openjpeg}/lib/libopenjp2${stdenv.hostPlatform.extensions.sharedLibrary}"; + tiff_lib = "${lib.getLib libtiff}/lib/libtiff${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace glymur/lib/tiff.py \ + --replace-fail "glymur_config('c')" "ctypes.CDLL('${lib.getLib glibc}/lib/libc.so.6')" + ''; + + __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ + lxml numpy ]; nativeCheckInputs = [ - lxml pytestCheckHook scikit-image ]; - postConfigure = '' - substituteInPlace glymur/config.py \ - --replace "path = read_config_file(libname)" "path = '${openjpeg}/lib/lib' + libname + ${if stdenv.isDarwin then "'.dylib'" else "'.so'"}" + preCheck = '' + export PATH="$out/bin:$PATH" ''; disabledTestPaths = [ # this test involves glymur's different ways of finding the openjpeg path on # fsh systems by reading an .rc file and such, and is obviated by the patch - # in postConfigure "tests/test_config.py" - "tests/test_tiff2jp2.py" ]; pythonImportsCheck = [ "glymur" ]; - meta = with lib; { + meta = { description = "Tools for accessing JPEG2000 files"; homepage = "https://github.com/quintusdias/glymur"; changelog = "https://github.com/quintusdias/glymur/blob/v${version}/CHANGES.txt"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomasajt ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glymur/set-lib-paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/glymur/set-lib-paths.patch new file mode 100644 index 0000000000..4ae7b58b1c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/glymur/set-lib-paths.patch @@ -0,0 +1,16 @@ +diff --git a/glymur/config.py b/glymur/config.py +index 962e299..dab44ba 100644 +--- a/glymur/config.py ++++ b/glymur/config.py +@@ -53,6 +53,11 @@ def _determine_full_path(libname): + if path is not None: + return path + ++ if libname == "openjp2": ++ return "@openjp2_lib@" ++ if libname == "tiff": ++ return "@tiff_lib@" ++ + # No joy on config file. Cygwin? Cygwin is a bit of an odd case. + if platform.system().startswith('CYGWIN'): + g = pathlib.Path('/usr/bin').glob('cygopenjp2*.dll') diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glyphsets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glyphsets/default.nix index f59e7f0960..a686f67a64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glyphsets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glyphsets/default.nix @@ -6,6 +6,7 @@ , gflanguages , glyphslib , pytestCheckHook +, pyyaml , requests , setuptools , setuptools-scm @@ -14,12 +15,12 @@ buildPythonPackage rec { pname = "glyphsets"; - version = "0.6.14"; + version = "1.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lMRgchadgKyfFLw6ZF1sJAKBAK75zmw77L34MW9p7TI="; + hash = "sha256-fa+W1IGIZcn1P1xNKm1Yb/TOuf4QdDVnIvlDkOLOcLY="; }; dependencies = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { fonttools gflanguages glyphslib + pyyaml requests setuptools unicodedata2 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix index 37f527f29e..99e519ef37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.7.0"; + version = "6.7.1"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-Fhp/2nK1LFgpJ3J7ZTxl2jKT6sCDyqT5qlLCtbnUejM="; + hash = "sha256-mUwbUGLhxwoYEwjbT558rTA8dtWxQXyqWYNEVy/WpIU="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix index b5a602d4f2..e3d4118c33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gmpy2/default.nix @@ -5,6 +5,9 @@ , gmp , mpfr , libmpc + +# Reverse dependency +, sage }: let @@ -29,6 +32,8 @@ buildPythonPackage { pythonImportsCheck = [ "gmpy2" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x"; homepage = "https://github.com/aleaxit/gmpy/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix index 8e4eb71a97..31a750c9ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.3.3"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = "goodwe"; rev = "refs/tags/v${version}"; - hash = "sha256-CIEv3srjyVWQ1UGKVRwPXpzrND/8hTbw6HSlko9+AIk="; + hash = "sha256-5Z8eHhCqfCTswS0C56z9TUQfoIdifuqcdWOupVlOJt8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index f19df6658f..37194dc41b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MIeRrDudrQFbNZFylwc5qjdT3VQhQqQW0H+foEfiI4Y="; + hash = "sha256-EKEfHhu4Rw/1ADDBrNcps6unopreLDDPHRyRcpE2bGc="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index b07133350e..e88ee4650f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,33 +1,32 @@ -{ lib -, buildPythonPackage -, fetchPypi -, google-auth -, google-auth-httplib2 -, google-api-core -, httplib2 -, uritemplate -, oauth2client -, setuptools -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + google-auth, + google-auth-httplib2, + google-api-core, + httplib2, + uritemplate, + oauth2client, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.125.0"; + version = "2.126.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UaA4XP9l7BNRBui+YO5xElVzlt3l9EETriORK63doUM="; + hash = "sha256-l8BBBjDivr0ZTZnpG9Yg2rW8a27AvwM/mpEJtwC4Oss="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-auth google-auth-httplib2 google-api-core @@ -39,9 +38,7 @@ buildPythonPackage rec { # No tests included in archive doCheck = false; - pythonImportsCheck = [ - "googleapiclient" - ]; + pythonImportsCheck = [ "googleapiclient" ]; meta = with lib; { description = "The official Python client library for Google's discovery based APIs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix index efe5dcd335..b8ff0805b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.28.1"; + version = "2.29.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NPwwRsJXztzxYi/Esx/Cvnkj2bTUSXPUgRJezFDYOIU="; + hash = "sha256-Zy3/My0HMidVD/x0V4aKxCGNbFALFV/mzBfSsTYCw2A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix index 025237d66f..88ec60d0c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -1,37 +1,36 @@ -{ lib -, buildPythonPackage -, fetchPypi -, google-api-core -, google-cloud-access-context-manager -, google-cloud-org-policy -, google-cloud-os-config -, google-cloud-testutils -, grpc-google-iam-v1 -, libcst -, mock -, proto-plus -, protobuf -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + google-api-core, + google-cloud-access-context-manager, + google-cloud-org-policy, + google-cloud-os-config, + google-cloud-testutils, + grpc-google-iam-v1, + libcst, + mock, + proto-plus, + protobuf, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.26.0"; + version = "3.26.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t10XW0dC5cDR6cKnUiicJdKV+jkScximgL4DCi1iIFY="; + hash = "sha256-5O3ge5/ot0zQoLKKPP6E7M2RVtDxnYfe2J0iYJISWX4="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ grpc-google-iam-v1 @@ -45,9 +44,7 @@ buildPythonPackage rec { ] ++ google-api-core.optional-dependencies.grpc; passthru.optional-dependencies = { - libcst = [ - libcst - ]; + libcst = [ libcst ]; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 1cda61e137..a669bd3641 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.24.0"; + version = "2.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tK9bmqzYOWuEB9G4d2AaN22O6m0ZKCOop4gb0v3Ads4="; + hash = "sha256-GV/9KxgOnqoivqs+QKC2Hs0UbssyZnz0Immo1xEbTUg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index a079fffd25..564ea58c71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.21.0"; + version = "3.22.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YmXDn51b31DxHLganCoGBdKF3zSsE53g0jM7ElCt0P8="; + hash = "sha256-lXWR5vlI18tKoPeo5OR7RhfNfwJp4opxw3lTw5tuikw="; }; build-system = [ setuptools ]; @@ -93,8 +93,10 @@ buildPythonPackage rec { "test_arrow_extension_types_same_for_storage_and_REST_APIs_894" "test_list_rows_empty_table" "test_list_rows_page_size" - "test_list_rows_scalars" + "test_list_rows_range_csv" + "test_list_rows_range" "test_list_rows_scalars_extreme" + "test_list_rows_scalars" "test_dry_run" "test_session" # Mocking of _ensure_bqstorage_client fails diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index f3895b8e3e..52c1ee3e4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.16.0"; + version = "3.17.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DWmh96XviHVsmeVrivTDnq5A0hBog/DieUxcs2QmltU="; + hash = "sha256-YMUEBj8c154KA5Y/cm1gbypDxkfY4ncCq5wbym5rS9s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix index 93c85687dd..c5b192169b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.14.3"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yC6ZP4qSGcW6H84TnDSu1vAZ3V+bRc6VbVQwWD0q8m4="; + hash = "sha256-6TgaGCPlFi9owoBI/xowe6Og5Tja9getfUHP47dWpvA="; }; propagatedBuildInputs = [ @@ -34,6 +34,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths =[ + # unmaintained, reference wrong import path for google.cloud.iam.v1 + "tests/unit/gapic/iam_admin_v1/test_iam.py" + ]; + pythonImportsCheck = [ "google.cloud.iam_credentials" "google.cloud.iam_credentials_v1" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix index 45fd8082d3..2dec1cea50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.21.3"; + version = "2.21.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XofVp7fY9bXJ8PZI81KniGlRqLTHJwPrnOe6gHb8JTM="; + hash = "sha256-AQW8FKOYt/05GUO766/VkY8+NAaCepiXObLcOInMEhg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index f230ac1919..f3cafa489d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -1,44 +1,41 @@ -{ lib -, buildPythonPackage -, fetchPypi -, google-api-core -, google-cloud-testutils -, mock -, pandas -, proto-plus -, protobuf -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + google-api-core, + google-cloud-testutils, + mock, + pandas, + proto-plus, + protobuf, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.19.3"; + version = "2.21.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N2QeU3mG/SIn+HOLh51gWozfTDFc3GDobhCTR6scodc="; + hash = "sha256-57HIdY/DVj/7mjR7xRcuJ4L0TBIbyA/BUoPiic/2db8="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf ] ++ google-api-core.optional-dependencies.grpc; passthru.optional-dependencies = { - pandas = [ - pandas - ]; + pandas = [ pandas ]; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index e3e5939e1b..01a271e84a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -1,31 +1,30 @@ -{ lib -, buildPythonPackage -, fetchPypi -, google-api-core -, grpc-google-iam-v1 -, proto-plus -, protobuf -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + google-api-core, + grpc-google-iam-v1, + proto-plus, + protobuf, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.19.0"; + version = "2.20.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-u5GENYNaFOuUeF9NTZCHvc8bbeMGQy1+2qfWLn94DDA="; + hash = "sha256-oIanQTqvT/+9HE/pIp7wzpvPSPWo31tEnEoy3rWiz94="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ google-api-core diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index c8c055555d..671c5fc37e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -1,40 +1,39 @@ -{ lib -, buildPythonPackage -, deprecated -, fetchPypi -, google-api-core -, google-cloud-core -, google-cloud-testutils -, grpc-google-iam-v1 -, grpc-interceptor -, libcst -, mock -, proto-plus -, protobuf -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, sqlparse -, setuptools +{ + lib, + buildPythonPackage, + deprecated, + fetchPypi, + google-api-core, + google-cloud-core, + google-cloud-testutils, + grpc-google-iam-v1, + grpc-interceptor, + libcst, + mock, + proto-plus, + protobuf, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + sqlparse, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.44.0"; + version = "3.45.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NTzAsG/UVn2BxPwUxE/ZnXqkCA9LwhmDRoq3LdstLIo="; + hash = "sha256-MKtW6krGqnQ3hCmPgh4N5lRAGTe0DGDMegpUUoSpG0M="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ deprecated google-api-core google-cloud-core @@ -46,9 +45,7 @@ buildPythonPackage rec { ] ++ google-api-core.optional-dependencies.grpc; passthru.optional-dependencies = { - libcst = [ - libcst - ]; + libcst = [ libcst ]; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix index 4425966a00..55248f8704 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-R1ndVzGKXWRNkWvvuP4HFBXbuk54bCZZvMJY+yalJGU="; + hash = "sha256-tJ04E69xNhDqxZ/0YVCIDFqWdA73rs57usyh3fDv8Ls="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix index 5499af7a1f..07e60b09b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix @@ -1,18 +1,19 @@ -{ lib -, bluetooth-data-tools -, bluetooth-sensor-state-data -, buildPythonPackage -, fetchFromGitHub -, home-assistant-bluetooth -, poetry-core -, pytestCheckHook -, pythonOlder -, sensor-state-data +{ + lib, + bluetooth-data-tools, + bluetooth-sensor-state-data, + buildPythonPackage, + fetchFromGitHub, + home-assistant-bluetooth, + poetry-core, + pytestCheckHook, + pythonOlder, + sensor-state-data, }: buildPythonPackage rec { pname = "govee-ble"; - version = "0.31.0"; + version = "0.31.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,32 +22,26 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "govee-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-g4tOu4nrJx1DVk2KLfF6HIEM7vTkfBg2fd7R1j+Xwrk="; + hash = "sha256-aWSf80WmVopkvqCzQKHEw9McrfepZcN+fhrUP90gf5U="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=govee_ble --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=govee_ble --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth sensor-state-data ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "govee_ble" - ]; + pythonImportsCheck = [ "govee_ble" ]; meta = with lib; { description = "Library for Govee BLE devices"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/govee-local-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/govee-local-api/default.nix index 03501fa0cb..1b1d8fcde5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/govee-local-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/govee-local-api/default.nix @@ -1,15 +1,16 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, poetry-dynamic-versioning -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch2, + poetry-core, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "govee-local-api"; - version = "1.4.4"; + version = "1.4.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,24 +19,27 @@ buildPythonPackage rec { owner = "Galorhallen"; repo = "govee-local-api"; rev = "refs/tags/v${version}"; - hash = "sha256-J4SG4n6LIZ/G6pEXAzliV7uTWzqsH7rtFe3Y7BJ2dWE="; + hash = "sha256-kmIuo/e3eLJTgmI+2Oq9Y0jov/133jXwgoBayGv33r4="; }; - nativeBuildInputs = [ + patches = [ + (fetchpatch2 { + # configure pep517 build-backend + url = "https://github.com/Galorhallen/govee-local-api/commit/897a21ae723ff94343bbf4ba1541e3a1d3e03c94.patch"; + hash = "sha256-/d5jGKGME768Ar+WWWQUByHJPGB31OHShI4oLjcMUIU="; + }) + ]; + + build-system = [ poetry-core - poetry-dynamic-versioning ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "govee_local_api" - ]; + pythonImportsCheck = [ "govee_local_api" ]; meta = with lib; { - description = ""; + description = "Library to communicate with Govee local API"; homepage = "https://github.com/Galorhallen/govee-local-api"; changelog = "https://github.com/Galorhallen/govee-local-api/releases/tag/v${version}"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradio-pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradio-pdf/default.nix index caa3ddbaa6..4a5128455e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gradio-pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradio-pdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { hatchling ]; - propagatedBuildInputs = [ + dependencies = [ gradio-client ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradio/client.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradio/client.nix index 2c3abd4c0e..bbf4d468ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gradio/client.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradio/client.nix @@ -28,8 +28,8 @@ buildPythonPackage rec { pname = "gradio-client"; - version = "0.14.0"; - format = "pyproject"; + version = "0.16.1"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -37,9 +37,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gradio-app"; repo = "gradio"; - rev = "refs/tags/@gradio/client@${version}"; + rev = "refs/tags/gradio_client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-7oC/Z3YUiOFZdv/60q7PkfluV77broRkHgWiY9Vim9Y="; + hash = "sha256-SVUm9LrjYG0r3U1yOd3rctxVMYlnAOW+Opqy9c3osnw="; }; prePatch = '' cd client/python @@ -52,14 +52,14 @@ buildPythonPackage rec { "websockets" ]; - nativeBuildInputs = [ + build-system = [ hatchling hatch-requirements-txt hatch-fancy-pypi-readme pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ setuptools # needed for 'pkg_resources' fsspec httpx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix index 69e57b821a..d5fc508e16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.22.0"; + version = "4.29.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -71,7 +71,7 @@ buildPythonPackage rec { # and upstream has stopped tagging releases since 3.41.0 src = fetchPypi { inherit pname version; - hash = "sha256-nhrT509xB3+R+HF6TF5AQGnfufT6iNmzjxZgcVL7fBo="; + hash = "sha256-17KT0b9kBO+xLgIgxfpwjETDoRM4aTJPlJv7HjkJXjo="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -99,7 +99,7 @@ buildPythonPackage rec { hatch-fancy-pypi-readme ]; - propagatedBuildInputs = [ + dependencies = [ setuptools # needed for 'pkg_resources' aiofiles altair @@ -202,6 +202,8 @@ buildPythonPackage rec { #"-W" "ignore" # uncomment for debugging help ]; + __darwinAllowLocalNetworking = true; + # check the binary works outside the build env doInstallCheck = true; postInstallCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix index 513e7c8584..9d783b7bde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , substituteAll , graphviz-nox , xdg-utils @@ -18,17 +17,17 @@ buildPythonPackage rec { pname = "graphviz"; - version = "0.20.1"; + version = "0.20.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; # patch does not apply to PyPI tarball due to different line endings src = fetchFromGitHub { owner = "xflr6"; repo = "graphviz"; - rev = version; - hash = "sha256-plhWG9mE9DoTMg7mWCvFLAgtBx01LAgJ0gQ/mqBU3yc="; + rev = "refs/tags/${version}"; + hash = "sha256-IqjqcBEL4BK/VfRjdxJ9t/DkG8OMAoXJxbW5JXpALuw="; }; patches = [ @@ -37,12 +36,6 @@ buildPythonPackage rec { graphviz = graphviz-nox; xdgutils = xdg-utils; }) - # https://github.com/xflr6/graphviz/issues/209 - (fetchpatch { - name = "fix-tests-with-python312.patch"; - url = "https://github.com/xflr6/graphviz/commit/5ce9fc5de4f2284baa27d7a8d68ab0885d032868.patch"; - hash = "sha256-jREPACSc4aoHY3G+39e8Axqajw4eeKkAeVu2s40v1nI="; - }) ]; postPatch = '' @@ -54,7 +47,7 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; @@ -82,5 +75,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphviz/paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/graphviz/paths.patch index f53852544a..2323cd66e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphviz/paths.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphviz/paths.patch @@ -1,5 +1,5 @@ diff --git a/graphviz/backend/dot_command.py b/graphviz/backend/dot_command.py -index 60654bd..2c62b47 100644 +index 3a62a85..a38bb9b 100644 --- a/graphviz/backend/dot_command.py +++ b/graphviz/backend/dot_command.py @@ -9,7 +9,7 @@ from .. import parameters @@ -38,20 +38,20 @@ index fde74a6..6f29b68 100644 kwargs = {'stderr': subprocess.DEVNULL} if quiet else {} subprocess.Popen(cmd, **kwargs) diff --git a/tests/_common.py b/tests/_common.py -index 87b4cbd..4188beb 100644 +index edc1309..42d730c 100644 --- a/tests/_common.py +++ b/tests/_common.py -@@ -14,9 +14,9 @@ __all__ = ['EXPECTED_DOT_BINARY', 'EXPECTED_UNFLATTEN_BINARY', +@@ -14,9 +14,9 @@ __all__ = ['EXPECTED_DOT_BINARY', 'as_cwd', 'check_startupinfo', 'StartupinfoMatcher'] --EXPECTED_DOT_BINARY = _compat.make_subprocess_arg(pathlib.Path('dot')) -+EXPECTED_DOT_BINARY = _compat.make_subprocess_arg(pathlib.Path('@graphviz@/bin/dot')) +-EXPECTED_DOT_BINARY = pathlib.Path('dot') ++EXPECTED_DOT_BINARY = pathlib.Path('@graphviz@/bin/dot') --EXPECTED_UNFLATTEN_BINARY = _compat.make_subprocess_arg(pathlib.Path('unflatten')) -+EXPECTED_UNFLATTEN_BINARY = _compat.make_subprocess_arg(pathlib.Path('@graphviz@/bin/unflatten')) +-EXPECTED_UNFLATTEN_BINARY = pathlib.Path('unflatten') ++EXPECTED_UNFLATTEN_BINARY = pathlib.Path('@graphviz@/bin/unflatten') - EXPECTED_DEFAULT_ENCODING = 'utf-8' + EXPECTED_DEFAULT_ENGINE = 'dot' diff --git a/tests/backend/test_execute.py b/tests/backend/test_execute.py index 2cb853a..8093dfe 100644 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix index 8f6acc289d..c913971f6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.42.2"; + version = "0.45.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-W6aOhz8UxJUc2kNRc4JaCqFgIOXsY8ctyQ3xZ+YaD9k="; + hash = "sha256-nczu6Neh1feSZyyMrXyiXU1aDIjOsX6RKqaH+Qw8yrQ="; }; build-system = [ pdm-backend ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix index ba66ffe4e3..d4af468320 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.62.1"; + version = "1.62.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-e+8XBt/tt4lNbgNGemBjrBCxUAR7aWXi+0gU1MKmQkU="; + hash = "sha256-bkrCxD12skXF9m2Y9SPbCHhrGGEoplXubyCjCn5o5Pk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix index 4fd21a8bf1..033e8ae58a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.62.1"; + version = "1.62.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-NDHIq7qwBUkSxB31xy8D3fO3pnvoooe7PBijRW+W/3c="; + hash = "sha256-YuG/ywICWhzXNzKi0zZy0+nQ300hwSxR4LvK8JurdCo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-testing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-testing/default.nix index c5cdf76a5e..54022a0433 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-testing/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.62.1"; + version = "1.62.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yyaVEAqykAtRz9vbVv4SEA1JWA8QrgZ6LKsRfo/HRu0="; + hash = "sha256-dNGeGQnpQbGmvvf71fnvMwWZ9nb7BrsGB8hFDtVVnfI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix index 4aef9f5fbd..6b5c5cdda9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.62.1"; + version = "1.62.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-pJkeXuipereRKW079+hwCxRFY1zBgozJjflFyhgC1/I="; + hash = "sha256-X9XhWCtnjmuUHuX1gJNAvl4HJGkd9SmaroImZA+U4Y8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix index e890280c67..582314bf10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "grpcio"; format = "setuptools"; - version = "1.62.1"; + version = "1.62.2"; src = fetchPypi { inherit pname version; - hash = "sha256-bEVeAI+obZ6anYW7dtpCd8DX2WaKO/pw2+hunzx1mUc="; + hash = "sha256-x3YYBx2Wt6i+LBBwGphTeCO5xluiVsC5Bn4FlM29lU0="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix index 7b557a605a..8a6ee21ede 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.22.9"; + version = "1.24.2"; format = "other"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-python/${pname}-${version}.tar.xz"; - hash = "sha256-P51cb/79omhwN0S1kqazmDqmcjJzsSIOy8tiwqWAAAk="; + hash = "sha256-vZDzvIrxfc478mtmU377SVGGn/zmQD9ZhGG5heKy144="; }; # Python 2.x is not supported. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gurobipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gurobipy/default.nix index 7793009abe..9dc2cc1067 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gurobipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gurobipy/default.nix @@ -17,14 +17,14 @@ let }; platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); hashes = rec { - cp311-aarch64-darwin = "sha256-pMwq4TXvr0mrKxZppeW2MQE/KrplWWFGmjKRLKwbHCI="; - cp311-aarch64-linux = "sha256-fxJSQUt+nk7JBGtkDi+qTl/js0hnWGZGyht4AqD9g60="; + cp311-aarch64-darwin = "sha256-jODaasqXupII5JDE1QLUK+Jd07WJfAtxB3NIHCeuDa4="; + cp311-aarch64-linux = "sha256-hx6BgCbI8ojXRA/NS4Qr7N8QBvQ0lfxPbj7G2bi6PXo="; cp311-x86_64-darwin = cp311-aarch64-darwin; - cp311-x86_64-linux = "sha256-q1nmuWmlDPeNWWw4bX3KECOChNQkwU+6hItYqWcyY4M="; - cp312-aarch64-darwin = "sha256-5+1QxYOhjbs01S3gqhkQ9Bx/0/NhbXEi710BGpiC5kM="; - cp312-aarch64-linux = "sha256-N7cFtibenj+SrZ7ZtevZtDUdW48DnLC4p5jB9vrWlb8="; + cp311-x86_64-linux = "sha256-hiZbepqPPlMcG77m5hwefQtoJk6XZ5W0z3rsaLnmbrg="; + cp312-aarch64-darwin = "sha256-H5J44n2CUqOo8jzn2G6gZPehWsbPnZtHXi4Iygx2RRM="; + cp312-aarch64-linux = "sha256-xFUR7yizqSsytyfStRigKlZ7q8uY+VgRR/j29DKPWp0="; cp312-x86_64-darwin = cp312-aarch64-darwin; - cp312-x86_64-linux = "sha256-Aw5xxvCwdgfdT7HMrWT/jKWx3RDjs8IuB4in0ZGdqcw="; + cp312-x86_64-linux = "sha256-giNHTNfLX1hIiWOPQlLOnqjrbPWkKQrA4KXug6ujYxI="; }; hash = hashes."${pyShortVersion}-${stdenv.system}" @@ -32,7 +32,7 @@ let in buildPythonPackage rec { pname = "gurobipy"; - version = "11.0.1"; + version = "11.0.2"; inherit format; src = fetchPypi { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix index 4afd562e03..0da90d4ccb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix @@ -2,7 +2,6 @@ , fetchPypi , buildPythonPackage , pythonOlder -, oldest-supported-numpy , setuptools , wheel , numpy @@ -21,21 +20,27 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.10.0"; + version = "3.11.0"; pname = "h5py"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2TrcSM7rMzR+skpjT7eH78euRkTm6kunM9CZYFBFwEk="; + hash = "sha256-e36PeAcqLt7IfJg28l80ID/UkqRHVwmhi0F6M8+yH6k="; }; + patches = [ + # Unlock an overly strict locking of mpi4py version (seems not to be necessary). + # See also: https://github.com/h5py/h5py/pull/2418/files#r1589372479 + ./mpi4py-requirement.patch + ]; + # avoid strict pinning of numpy postPatch = '' - substituteInPlace setup.py \ - --replace "mpi4py ==" "mpi4py >=" + substituteInPlace pyproject.toml \ + --replace-fail "numpy >=2.0.0rc1" "numpy" ''; HDF5_DIR = "${hdf5}"; @@ -51,7 +56,7 @@ in buildPythonPackage rec { nativeBuildInputs = [ cython_0 - oldest-supported-numpy + numpy pkgconfig setuptools wheel diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h5py/mpi4py-requirement.patch b/third_party/nixpkgs/pkgs/development/python-modules/h5py/mpi4py-requirement.patch new file mode 100644 index 0000000000..b32e804ebe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/h5py/mpi4py-requirement.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index b1463422..7f0c7b10 100755 +--- a/setup.py ++++ b/setup.py +@@ -47,7 +47,7 @@ if setup_configure.mpi_enabled(): + # incompatible with newer setuptools. + RUN_REQUIRES.append('mpi4py >=3.1.1') + SETUP_REQUIRES.append("mpi4py ==3.1.1; python_version<'3.11'") +- SETUP_REQUIRES.append("mpi4py ==3.1.4; python_version>='3.11'") ++ SETUP_REQUIRES.append("mpi4py >=3.1.4; python_version>='3.11'") + + # Set the environment variable H5PY_SETUP_REQUIRES=0 if we need to skip + # setup_requires for any reason. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/habluetooth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/habluetooth/default.nix index e84fa94ae0..702ffc3821 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/habluetooth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/habluetooth/default.nix @@ -1,4 +1,5 @@ { lib +, async-interrupt , bleak , bleak-retry-connector , bluetooth-adapters @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "2.4.2"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,22 +26,23 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-IoVXmq9ShwLpGtoxVOtoirSirJJ1DqBI/mP7PmK7OUs="; + hash = "sha256-2QiV32gDaoIBLUv/a3YzosFl6+E/nm0WoSUcTx9ph8s="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=habluetooth --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=habluetooth --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ + async-interrupt bleak bleak-retry-connector bluetooth-adapters diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index dc31b0a9af..be2dcf471e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.4.6"; + version = "2024.4.12"; pyproject = true; disabled = pythonOlder "3.12"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-w+sSaadbbfc1cNCTx5YYIm8eAKRQxyqZZKK2QPFZv7Y="; + hash = "sha256-iWl9kDLRh9CAk0tOibDOHcBV7lwVY/TWKYMBZW9G2k0="; }; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix index 4d5d345d62..fa5f239aca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "hatchling"; - version = "1.22.4"; + version = "1.24.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ii3OyW1/uEg4LvWEjlrEP9rmQfNaCKP6tRFr1JXzQW4="; + hash = "sha256-Qd3CfNsl2573tovvB1+CnITLNJqhv/gkB5fQElEFR7A="; }; # listed in backend/pyproject.toml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix index 9df850b788..b7c6c73820 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix @@ -1,28 +1,45 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, requests -, webob +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + requests, + webob, + unittestCheckHook, }: buildPythonPackage rec { pname = "hawkauthlib"; version = "0.1.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mozilla-services"; - repo = pname; + repo = "hawkauthlib"; rev = "refs/tags/v${version}"; - sha256 = "0mr1mpx4j9q7sch9arwfvpysnpf2p7ijy7072wilxm8pnj0bwvsi"; + hash = "sha256-UW++gLQX1U4jFwccL+O5wl2r/d2OZ5Ug0wcnSfqtIVc="; }; - propagatedBuildInputs = [ requests webob ]; + postPatch = '' + substituteInPlace hawkauthlib/tests/* \ + --replace-warn 'assertEquals' 'assertEqual' + ''; + + build-system = [ setuptools ]; + + dependencies = [ + requests + webob + ]; + + pythonImportsCheck = [ "hawkauthlib" ]; + + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { homepage = "https://github.com/mozilla-services/hawkauthlib"; description = "Hawk Access Authentication protocol"; license = licenses.mpl20; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix index c2cfe5843c..7d4019d28c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-MnqY1PyGzo31H696J9CekiA2rJrUYzUMDC3UJMZaFLA="; }; - propagatedBuildInputs = [ + dependencies = [ h5py ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/heatzypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/heatzypy/default.nix index 9093afc235..843c8cbf13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/heatzypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/heatzypy/default.nix @@ -1,17 +1,17 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, requests -, pytestCheckHook -, pythonOlder -, setuptools -, wheel +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "heatzypy"; - version = "2.2.0"; + version = "2.5.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,30 +20,20 @@ buildPythonPackage rec { owner = "Cyr-ius"; repo = "heatzypy"; rev = "refs/tags/${version}"; - hash = "sha256-Q6v1Ob1PY8tpMnd8hchepq983dsZ6lJPCKz83RRwL3w="; + hash = "sha256-A01e3duNQmVv9vyOs6+gF/BdevLiYi/uXSq5bKmuRao="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "replace_by_workflow" "${version}" - ''; - - nativeBuildInputs = [ + build-system = [ setuptools - wheel + setuptools-scm ]; - propagatedBuildInputs = [ - aiohttp - requests - ]; + dependencies = [ aiohttp ]; # Module has no tests doCheck = false; - pythonImportsCheck = [ - "heatzypy" - ]; + pythonImportsCheck = [ "heatzypy" ]; meta = with lib; { description = "Module to interact with Heatzy devices"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hid/default.nix index deb4006dfe..7c33cb5b9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hid/default.nix @@ -1,30 +1,40 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , hidapi -, nose }: buildPythonPackage rec { pname = "hid"; version = "1.0.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-SNdk166XRroSO5bb9FeJPKgCaLd5HEsdLgUTEO64OGA="; }; - propagatedBuildInputs = [ hidapi ]; - - nativeCheckInputs = [ nose ]; - postPatch = '' - hidapi=${hidapi}/lib/ - test -d $hidapi || { echo "ERROR: $hidapi doesn't exist, please update/fix this build expression."; exit 1; } - sed -i -e "s|libhidapi|$hidapi/libhidapi|" hid/__init__.py + hidapi=${hidapi}/lib/ + test -d $hidapi || { echo "ERROR: $hidapi doesn't exist, please update/fix this build expression."; exit 1; } + sed -i -e "s|libhidapi|$hidapi/libhidapi|" hid/__init__.py ''; + build-system = [ + setuptools + ]; + + dependencies = [ + hidapi + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "hid" + ]; + meta = with lib; { description = "hidapi bindings in ctypes"; homepage = "https://github.com/apmorton/pyhidapi"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hikari-lightbulb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hikari-lightbulb/default.nix new file mode 100644 index 0000000000..3295dd637d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hikari-lightbulb/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, + hikari, + croniter, +}: + +buildPythonPackage rec { + pname = "hikari-lightbulb"; + version = "2.3.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tandemdude"; + repo = "hikari-lightbulb"; + rev = version; + hash = "sha256-gqbbex2xj48LZqW4bVSPDW1UZEFVeOHbNQVM6nhpl1Y="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ hikari ]; + + passthru.optional-dependencies = { + crontrigger = [ croniter ]; + }; + + pythonImportsCheck = [ "lightbulb" ]; + + meta = with lib; { + description = "A command handler for Hikari, the Python Discord API wrapper library"; + longDescription = '' + Lightbulb is designed to be an easy to use command handler library that integrates with the Discord API wrapper library for Python, Hikari. + + This library aims to make it simple for you to make your own Discord bots and provide all the utilities and functions you need to help make this job easier. + ''; + homepage = "https://hikari-lightbulb.readthedocs.io/en/latest/"; + # https://github.com/tandemdude/hikari-lightbulb/blob/d87df463488d1c1d947144ac0bafa4304e12ddfd/setup.py#L68 + license = licenses.lgpl3Only; + maintainers = with maintainers; [ tomodachi94 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hikari/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hikari/default.nix index e76d7780c0..062a6a9ebe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hikari/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hikari/default.nix @@ -17,13 +17,13 @@ }: buildPythonPackage rec { pname = "hikari"; - version = "2.0.0.dev124"; + version = "2.0.0.dev125"; src = fetchFromGitHub { owner = "hikari-py"; repo = "hikari"; rev = version; - hash = "sha256-zDgU3Ol/I3YNnwXm+aBh20KwonW746p5TObuwuWORog="; + hash = "sha256-qxgIYquXUWrm8bS8EamERMHOnjI2aPyK7bQieVG66uA="; # The git commit is part of the `hikari.__git_sha1__` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hikvision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hikvision/default.nix index 23f6387853..354edc5d77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hikvision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hikvision/default.nix @@ -1,35 +1,39 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, requests -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { pname = "hikvision"; version = "2.0.4"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fbradyirl"; - repo = pname; - rev = "v${version}"; - sha256 = "1l0zvir4hf1pcwwcmrhkspbdljzmi4lknxar5bkipdanpsm588mn"; + repo = "hikvision"; + rev = "refs/tags/v${version}"; + hash = "sha256-tiJUqr5WtRvnKll1OymJ9Uva1tUT5so4Zzc4SHLcH9A="; }; - propagatedBuildInputs = [ - requests - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + dependencies = [ requests ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "hikvision.api" ]; meta = with lib; { description = "Python module for interacting with Hikvision IP Cameras"; homepage = "https://github.com/fbradyirl/hikvision"; + changelog = "https://github.com/fbradyirl/hikvision/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hishel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hishel/default.nix index a4ab7b504a..03dfcf4cf8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hishel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hishel/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hishel"; - version = "0.0.25"; + version = "0.0.26"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; rev = "refs/tags/${version}"; - hash = "sha256-vDzXrAGJUqG9+wOUWXeKLYraUrILJFAQXf60iCAHRPo="; + hash = "sha256-+HjVxcTbY9nRj2938fqguOXuTM3XzJWccx0J6RK2h4A="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hjson/default.nix index 44aa789f0d..46ae9f518a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hjson/default.nix @@ -1,25 +1,34 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, python -, makeWrapper +{ + lib, + buildPythonPackage, + fetchFromGitHub, + makeWrapper, + pytestCheckHook, + python, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "hjson"; version = "3.0.2"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.5"; - # N.B. pypi src tarball does not have tests src = fetchFromGitHub { owner = "hjson"; repo = "hjson-py"; - rev = "v${version}"; - sha256 = "1jc7j790rcqnhbrfj4lhnz3f6768dc55aij840wmx16jylfqpc2n"; + rev = "refs/tags/v${version}"; + hash = "sha256-VrCLHfXShF45IEhGVQpryBzjxreQEunyghazDNKRh8k="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ makeWrapper ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "hjson" ]; postInstall = '' @@ -29,11 +38,17 @@ buildPythonPackage rec { --prefix PATH : ${lib.makeBinPath [ python ]} ''; + disabledTestPaths = [ + # AttributeError: b'/build/source/hjson/tool.py:14: Deprecati[151 chars]ools' != b'' + "hjson/tests/test_tool.py" + ]; + meta = with lib; { description = "A user interface for JSON"; - mainProgram = "hjson"; homepage = "https://github.com/hjson/hjson-py"; + changelog = "https://github.com/hjson/hjson-py/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; + mainProgram = "hjson"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix index 82dc5a9882..79e5fc8d52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.47"; + version = "0.48"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-A4viSzUia4QBdD0svkqYtsCq/la7Nrf2xu/fVDZHb00="; + hash = "sha256-PKa4knEUkULeGbwjEViF2J3QyUOOvKHYxy0ChmRQf6A="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix index 34016262e9..f4aa29cfcb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix @@ -1,25 +1,26 @@ -{ lib -, aenum -, aiohttp -, aiohttp-wsgi -, async-timeout -, buildPythonPackage -, fetchFromGitHub -, pytest7CheckHook -, pythonAtLeast -, pythonOlder -, pytest-aiohttp -, pytest-asyncio -, requests -, setuptools -, setuptools-scm -, websocket-client -, websockets +{ + lib, + aenum, + aiohttp, + aiohttp-wsgi, + async-timeout, + buildPythonPackage, + fetchFromGitHub, + pytest7CheckHook, + pythonAtLeast, + pythonOlder, + pytest-aiohttp, + pytest-asyncio, + requests, + setuptools, + setuptools-scm, + websocket-client, + websockets, }: buildPythonPackage rec { pname = "homematicip"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,15 +29,15 @@ buildPythonPackage rec { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-tx7/amXG3rLdUFgRPQcuf57qkBLAPxPWjLGSO7MrcWU="; + hash = "sha256-VMHInAmNO0Nw0ohZnIJ9c77h35YSSNNnPNYaUpBlKOQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ aenum aiohttp async-timeout @@ -52,44 +53,42 @@ buildPythonPackage rec { pytest7CheckHook ]; - pytestFlagsArray = [ - "--asyncio-mode=auto" - ]; + pytestFlagsArray = [ "--asyncio-mode=auto" ]; - disabledTests = [ - # Assert issues with datetime - "test_contact_interface_device" - "test_dimmer" - "test_external_device" - "test_heating_failure_alert_group" - "test_heating" - "test_humidity_warning_rule_group" - "test_meta_group" - "test_pluggable_switch_measuring" - "test_rotary_handle_sensor" - "test_security_group" - "test_security_zone" - "test_shutter_device" - "test_smoke_detector" - "test_switching_group" - "test_temperature_humidity_sensor_outdoor" - "test_wall_mounted_thermostat_pro" - "test_weather_sensor" - # Random failures - "test_home_getSecurityJournal" - "test_home_unknown_types" - # Requires network access - "test_websocket" - ] ++ lib.optionals (pythonAtLeast "3.10") [ - "test_connection_lost" - "test_user_disconnect_and_reconnect" - "test_ws_message" - "test_ws_no_pong" - ]; + disabledTests = + [ + # Assert issues with datetime + "test_contact_interface_device" + "test_dimmer" + "test_external_device" + "test_heating_failure_alert_group" + "test_heating" + "test_humidity_warning_rule_group" + "test_meta_group" + "test_pluggable_switch_measuring" + "test_rotary_handle_sensor" + "test_security_group" + "test_security_zone" + "test_shutter_device" + "test_smoke_detector" + "test_switching_group" + "test_temperature_humidity_sensor_outdoor" + "test_wall_mounted_thermostat_pro" + "test_weather_sensor" + # Random failures + "test_home_getSecurityJournal" + "test_home_unknown_types" + # Requires network access + "test_websocket" + ] + ++ lib.optionals (pythonAtLeast "3.10") [ + "test_connection_lost" + "test_user_disconnect_and_reconnect" + "test_ws_message" + "test_ws_no_pong" + ]; - pythonImportsCheck = [ - "homematicip" - ]; + pythonImportsCheck = [ "homematicip" ]; meta = with lib; { description = "Module for the homematicIP REST API"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix index f8c4e32faf..692cd31354 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "hstspreload"; - version = "2024.4.1"; + version = "2024.5.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -16,19 +17,15 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "hstspreload"; rev = "refs/tags/${version}"; - hash = "sha256-kbcUf06tgVgr5qu5YSCwHtlBVzUEEqF1A/D+4RCnUcc="; + hash = "sha256-Ut2VhU2+o4wm4WY4zz/25EyDLvrYoBu3iVFkx3FZVYo="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; # Tests require network connection doCheck = false; - pythonImportsCheck = [ - "hstspreload" - ]; + pythonImportsCheck = [ "hstspreload" ]; meta = with lib; { description = "Chromium HSTS Preload list as a Python package and updated daily"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/html-text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html-text/default.nix index 00d2fb426d..43d7ca228b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/html-text/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/html-text/default.nix @@ -1,37 +1,43 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, lxml -, six -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + lxml, + lxml-html-clean, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "html-text"; - version = "0.5.2"; - format = "setuptools"; + version = "0.6.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "TeamHG-Memex"; + owner = "zytedata"; repo = "html-text"; - rev = version; - hash = "sha256-jw/hpz0QfcgP5OEJcmre0h1OzOfpPtaROxHm+YUqces="; + rev = "refs/tags/${version}"; + hash = "sha256-e9gkibQv8mn1Jbt77UmpauOeTqhJQhY9R5Sge/iYi+U="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ lxml + lxml-html-clean ]; - nativeCheckInputs = [ - pytestCheckHook - six - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "html_text" ]; meta = with lib; { description = "Extract text from HTML"; - homepage = "https://github.com/TeamHG-Memex/html-text"; + homepage = "https://github.com/zytedata/html-text"; + changelog = "https://github.com/zytedata/html-text/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ ambroisie ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix index bda7879eab..236b312e34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix @@ -1,38 +1,38 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pytestCheckHook -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "html2text"; version = "2024.2.26"; pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Alir3z4"; repo = "html2text"; rev = "refs/tags/${version}"; - sha256 = "sha256-1CLkTFR+/XQ428WjMF7wliyAG6CB+n8JSsLDdLHPO7I="; + hash = "sha256-1CLkTFR+/XQ428WjMF7wliyAG6CB+n8JSsLDdLHPO7I="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "html2text" ]; meta = with lib; { - changelog = "https://github.com/Alir3z4/html2text/blob/${src.rev}/ChangeLog.rst"; description = "Turn HTML into equivalent Markdown-structured text"; homepage = "https://github.com/Alir3z4/html2text/"; + changelog = "https://github.com/Alir3z4/html2text/blob/${src.rev}/ChangeLog.rst"; license = licenses.gpl3Only; + maintainers = with maintainers; [ ]; mainProgram = "html2text"; - maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/htseq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/htseq/default.nix index 9d69a8bfef..caa47f5197 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/htseq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/htseq/default.nix @@ -1,29 +1,79 @@ -{ lib, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }: +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + swig, + cython, + matplotlib, + numpy, + pandas, + pysam, + setuptools, + pytestCheckHook, + nix-update-script, +}: buildPythonPackage rec { - version = "0.12.4"; - format = "setuptools"; pname = "htseq"; + version = "2.0.4"; + pyproject = true; src = fetchFromGitHub { owner = "htseq"; repo = "htseq"; rev = "release_${version}"; - sha256 = "0y7vh249sljqjnv81060w4xkdx6f1y5zdqkh38yk926x6v9riijm"; + hash = "sha256-7ocrmuj9LOtPz9XbI5rKGcdE5JbFz/pZh00Nie65XxE="; }; - nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ numpy pysam matplotlib ]; + patches = [ + # https://github.com/htseq/htseq/pull/84 + (fetchpatch { + name = "replace-distutils-with-sysconfig.patch"; + url = "https://github.com/htseq/htseq/commit/f0f1e464ee9aee56f0b44f905e7b3355b0bb8f29.patch"; + hash = "sha256-yDYkXCPy+YFgnk1rnXwCB998aZwVd5nJeejZIgeEzAo="; + }) + ]; - checkPhase = lib.optionalString isPy27 '' - ${python.interpreter} python2/test/test_general.py - '' + lib.optionalString isPy3k '' - ${python.interpreter} python3/test/test_general.py + nativeBuildInputs = [ swig ]; + + build-system = [ + cython + numpy + pysam + setuptools + ]; + + dependencies = [ + numpy + pysam + ]; + + optional-dependencies = { + htseq-qa = [ matplotlib ]; + }; + + pythonImportsCheck = [ "HTSeq" ]; + + nativeCheckInputs = [ + pandas + pytestCheckHook + ] ++ optional-dependencies.htseq-qa; + + preCheck = '' + rm -r src HTSeq + export PATH=$out/bin:$PATH ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "release_(.+)" + ]; + }; + meta = with lib; { homepage = "https://htseq.readthedocs.io/"; description = "A framework to work with high-throughput sequencing data"; maintainers = with maintainers; [ unode ]; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/http-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/http-parser/default.nix index 05cd4397db..7e53465939 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/http-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/http-parser/default.nix @@ -1,9 +1,11 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, cython -, setuptools -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cython, + setuptools, + pytestCheckHook, + fetchpatch, }: buildPythonPackage rec { @@ -28,18 +30,24 @@ buildPythonPackage rec { make -B ''; - pythonImportsCheck = [ - "http_parser" + pythonImportsCheck = [ "http_parser" ]; + + # The imp module is deprecated since version 3.4, and was removed in 3.12 + # https://docs.python.org/3.11/library/imp.html + # Fix from: https://github.com/benoitc/http-parser/pull/101/ + patches = [ + (fetchpatch { + url = "https://github.com/benoitc/http-parser/commit/4d4984ce129253f9de475bfd3c683301c916e8b1.patch"; + hash = "sha256-d3k1X41/D9PpPWsDety2AiYyLv9LJIhpkOo3a6qKcB8="; + }) ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "HTTP request/response parser for python in C"; homepage = "https://github.com/benoitc/http-parser"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/http-sf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/http-sf/default.nix index f9ebde2b2b..d5695b9699 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/http-sf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/http-sf/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools -, typing-extensions +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "http-sf"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,23 +18,17 @@ buildPythonPackage rec { owner = "mnot"; repo = "http-sf"; rev = "refs/tags/v${version}"; - hash = "sha256-8xK8/IVrhqMDgkxZY10QqSGswCrttc29FZLCntmSUQ4="; + hash = "sha256-p2GTCvuRhQVchFiLzoDYop9TUz/DT7eVY6Zioh+/rE8="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - typing-extensions - ]; + dependencies = [ typing-extensions ]; # Tests require external data (https://github.com/httpwg/structured-field-tests) doCheck = false; - pythonImportsCheck = [ - "http_sf" - ]; + pythonImportsCheck = [ "http_sf" ]; meta = with lib; { description = "Module to parse and serialise HTTP structured field values"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix index 212db973e9..df9ec75435 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix @@ -18,11 +18,12 @@ # for passthru.tests , httpx , httpx-socks +, respx }: buildPythonPackage rec { pname = "httpcore"; - version = "1.0.4"; + version = "1.0.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +32,7 @@ buildPythonPackage rec { owner = "encode"; repo = "httpcore"; rev = "refs/tags/${version}"; - hash = "sha256-DK5avYEtQcTFogpdEjw0NB4qkzDm5cZKPjAE8MC6Sng="; + hash = "sha256-05jYLrBiPRg1qQEz8mRvYJKHFsfneh7z9yHIXuYYa5o="; }; nativeBuildInputs = [ @@ -74,7 +75,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; passthru.tests = { - inherit httpx httpx-socks; + inherit httpx httpx-socks respx; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx-sse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx-sse/default.nix new file mode 100644 index 0000000000..ff0a406909 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx-sse/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + wheel, + httpx, + pytest-asyncio, + pytestCheckHook, + sse-starlette, +}: + +buildPythonPackage rec { + pname = "httpx-sse"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "florimondmanca"; + repo = "httpx-sse"; + rev = "refs/tags/${version}"; + hash = "sha256-nU8vkmV/WynzQrSrq9+FQXtfAJPVLpMsRSuntU0HWrE="; + }; + + # pytest-cov configuration is not necessary for packaging + postPatch = '' + rm setup.cfg + ''; + + build-system = [ + setuptools + setuptools-scm + wheel + ]; + + dependencies = [ httpx ]; + + pythonImportsCheck = [ "httpx_sse" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + sse-starlette + ]; + + meta = with lib; { + description = "Consume Server-Sent Event (SSE) messages with HTTPX"; + homepage = "https://github.com/florimondmanca/httpx-sse"; + changelog = "https://github.com/florimondmanca/httpx-sse/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx-ws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx-ws/default.nix new file mode 100644 index 0000000000..fd02d918f0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx-ws/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + hatchling, + anyio, + httpcore, + httpx, + wsproto, + pytestCheckHook, + starlette, + trio, + uvicorn, +}: + +buildPythonPackage rec { + pname = "httpx-ws"; + version = "0.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "frankie567"; + repo = "httpx-ws"; + rev = "refs/tags/v${version}"; + hash = "sha256-eDc21FiGHi98doS4Zbubb/MVw4IjQ1q496TFHCX4xB4="; + }; + + # we don't need to use the hatch-regex-commit plugin + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'source = "regex_commit"' "" \ + --replace-fail 'commit_extra_args = ["-e"]' "" \ + --replace-fail '"hatch-regex-commit"' "" \ + --replace-fail 'addopts = "--cov=httpx_ws/ --cov-report=term-missing"' "" + ''; + + build-system = [ hatchling ]; + + dependencies = [ + anyio + httpcore + httpx + wsproto + ]; + + pythonImportsCheck = [ "httpx_ws" ]; + + nativeCheckInputs = [ + pytestCheckHook + starlette + trio + uvicorn + ]; + + disabledTestPaths = [ + # hang + "tests/test_api.py" + ]; + + meta = with lib; { + description = "WebSocket support for HTTPX"; + homepage = "https://github.com/frankie567/httpx-ws"; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix index 7717982dd4..91669ec371 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.22.2"; + version = "0.23.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,14 +23,14 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-Y/oUF+d6Oo45x9cufZxjaJCQpoY0acPhetbyAt8M3pQ="; + hash = "sha256-FfevPGec++3auA4Zxu84mhpD0RGatcPgDKi7LkmOVss="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ filelock fsspec packaging @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/huggingface/huggingface_hub"; changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ GaetanLepage ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix index 42f09f7266..f9309dcac3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hvac"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-tIvNoRpKsKe2xHIyx7p8h/2jGK4tSnZigAxGWnh0KJQ="; + hash = "sha256-5LAkjFZyy5pvWXTnyPUnGgnGxmPL+KsRczoifz0tssI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix index 57d56fa417..b7add0e1a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix @@ -2,12 +2,11 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, typing-extensions -, wsproto -, toml +, exceptiongroup +, h11 , h2 , priority -, mock +, wsproto , poetry-core , pytest-asyncio , pytest-trio @@ -16,33 +15,44 @@ buildPythonPackage rec { pname = "hypercorn"; - version = "0.14.3"; - disabled = pythonOlder "3.7"; + version = "0.16.0"; format = "pyproject"; + disabled = pythonOlder "3.11"; # missing taskgroup dependency + src = fetchFromGitHub { owner = "pgjones"; repo = "Hypercorn"; rev = version; - hash = "sha256-ECREs8UwqTWUweUrwnUwpVotCII2v4Bz7ZCk3DSAd8I="; + hash = "sha256-pIUZCQmC3c6FiV0iMMwJGs9TMi6B/YM+vaSx//sAmKE="; }; postPatch = '' sed -i "/^addopts/d" pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ wsproto toml h2 priority ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + dependencies = [ + exceptiongroup + h11 + h2 + priority + wsproto + ]; nativeCheckInputs = [ pytest-asyncio pytest-trio pytestCheckHook - ] ++ lib.optionals (pythonOlder "3.8") [ mock ]; + ]; + + disabledTests = [ + # https://github.com/pgjones/hypercorn/issues/217 + "test_startup_failure" + ]; pythonImportsCheck = [ "hypercorn" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix index 5cf3408c89..09de31843b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.99.12"; + version = "6.100.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-0nzjRDv4L3bxxnC0lBY5S7FP9CFhyzHzNchWXoX91Zg="; + hash = "sha256-3Mwa1nS6rvFBcU5QXLH4/wa38qCvDX9sRina1aJS1Rs="; }; # I tried to package sphinx-selective-exclude, but it throws diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iapws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iapws/default.nix index 8e2e3fd07a..169950593f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iapws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iapws/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "iapws"; - version = "1.5.3"; + version = "1.5.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-QVxbf9EF9YwAVPewAqhc1WZD6jVr/rFXQUw/jJ7kkDU="; + hash = "sha256-nw+qOaln12/F5flfYdki4TVFMZLgK/h10HJC8T1uqlU="; }; propagatedBuildInputs = [ scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix index c6d68d83db..4021eeceb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix @@ -42,6 +42,7 @@ , pytest-mock , pytest-randomly , pytest-snapshot +, pytest-timeout , pytest-xdist , python-dateutil , pytz @@ -65,15 +66,15 @@ let name = "ibis-testing-data"; owner = "ibis-project"; repo = "testing-data"; - # https://github.com/ibis-project/ibis/blob/8.0.0/nix/overlay.nix#L20-L26 - rev = "2c6a4bb5d5d525058d8d5b2312a9fee5dafc5476"; - hash = "sha256-Lq503bqh9ESZJSk6yVq/uZwkAubzmSmoTBZSsqMm0DY="; + # https://github.com/ibis-project/ibis/blob/9.0.0/nix/overlay.nix#L20-L26 + rev = "1922bd4617546b877e66e78bb2b87abeb510cf8e"; + hash = "sha256-l5d7r/6Voy6N2pXq3IivLX3N0tNfKKwsbZXRexzc8Z8="; }; in buildPythonPackage rec { pname = "ibis-framework"; - version = "8.0.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -83,7 +84,7 @@ buildPythonPackage rec { repo = "ibis"; owner = "ibis-project"; rev = "refs/tags/${version}"; - hash = "sha256-KcNZslqmSbu8uPYKpkyvd7d8Fsf0nQt80y0auXsI8fs="; + hash = "sha256-ebTYCBL1zm2Rmwg998x2kYvKhyQDk8Di1pcx5lR37xo="; }; nativeBuildInputs = [ @@ -120,6 +121,7 @@ buildPythonPackage rec { pytest-mock pytest-randomly pytest-snapshot + pytest-timeout pytest-xdist ] ++ lib.concatMap (name: passthru.optional-dependencies.${name}) testBackends; @@ -133,8 +135,11 @@ buildPythonPackage rec { # breakage from sqlalchemy2 truediv changes "test_tpc_h17" # tries to download duckdb extensions - "test_register_sqlite" + "test_attach_sqlite" + "test_connect_extensions" + "test_load_extension" "test_read_sqlite" + "test_register_sqlite" # duckdb does not respect sample_size=2 (reads 3 lines of csv). "test_csv_reregister_schema" # duckdb fails with: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 46a5eb3e36..65ddf3d5c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.19.2"; + version = "3.20.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-qodN9ALyAfzsrCAiPT3t02JJRCBqFCNVWlsQP+4d3do="; + hash = "sha256-CqbZcEP1ianvRRpx527KBjQTjvGBzlSmoKY1Pe5MXRA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix index fa904248f3..2d573dcaea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix @@ -1,22 +1,23 @@ -{ lib -, buildPythonPackage -, emoji -, fetchFromGitHub -, freezegun -, tzdata -, pyparsing -, pydantic -, pytest-benchmark -, pytestCheckHook -, pythonOlder -, python-dateutil -, setuptools -, syrupy +{ + lib, + buildPythonPackage, + emoji, + fetchFromGitHub, + freezegun, + tzdata, + pyparsing, + pydantic, + pytest-benchmark, + pytestCheckHook, + pythonOlder, + python-dateutil, + setuptools, + syrupy, }: buildPythonPackage rec { pname = "ical"; - version = "7.0.3"; + version = "8.0.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,14 +26,12 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; rev = "refs/tags/${version}"; - hash = "sha256-RiwWnRSe0HdeGVo592A+Rk+IvA1Lfp6mY+/ZEyqJBDU="; + hash = "sha256-NrnRId+bgRh31+ocWBjWE2Zo3gOvPJ2fYtOVWOWD5EY="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ python-dateutil tzdata pydantic @@ -47,9 +46,7 @@ buildPythonPackage rec { syrupy ]; - pythonImportsCheck = [ - "ical" - ]; + pythonImportsCheck = [ "ical" ]; meta = with lib; { description = "Library for handling iCalendar"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/id/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/id/default.nix index bf72a46b6f..2845f47ebc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/id/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/id/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, flit-core -, pretend -, pydantic -, pytestCheckHook -, pythonOlder -, requests +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + pretend, + pydantic, + pytestCheckHook, + pythonOlder, + requests, }: buildPythonPackage rec { pname = "id"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,14 +21,12 @@ buildPythonPackage rec { owner = "di"; repo = "id"; rev = "refs/tags/v${version}"; - hash = "sha256-Yq8tlDh27UEd+NeYuxjPSL8Qh1i19BmF2ZTLJTzXt7E="; + hash = "sha256-lmUBy0hJAxfF65RcBP7tTizrg8j2Zypu4sKgOUQCYh8="; }; - nativeBuildInputs = [ - flit-core - ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ pydantic requests ]; @@ -37,9 +36,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "id" - ]; + pythonImportsCheck = [ "id" ]; meta = with lib; { description = "A tool for generating OIDC identities"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index 1a29450f1d..e6e8f306bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, editdistance-s -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools -, ukkonen +{ + lib, + buildPythonPackage, + editdistance-s, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + ukkonen, }: buildPythonPackage rec { pname = "identify"; - version = "2.5.35"; + version = "2.5.36"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,28 +20,24 @@ buildPythonPackage rec { owner = "pre-commit"; repo = "identify"; rev = "refs/tags/v${version}"; - hash = "sha256-kUBAq9ttIdTLApJ0yW8Yk/NIXpmllApQGpR24wm0PHA="; + hash = "sha256-CO+qP0FIUdPFXy6/7FgrKZbUp48XbgqqGV2GAX9ogMY="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ + dependencies = [ editdistance-s pytestCheckHook ukkonen ]; - pythonImportsCheck = [ - "identify" - ]; + pythonImportsCheck = [ "identify" ]; meta = with lib; { description = "File identification library for Python"; - mainProgram = "identify-cli"; homepage = "https://github.com/chriskuehl/identify"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "identify-cli"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix index 77aeb4483d..ec47eb6751 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "idna"; - version = "3.6"; - format = "pyproject"; + version = "3.7"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ns270IOwZ5iuHoaty/6KsUec+GTk7jD+TkagA9Ekkco="; + hash = "sha256-Ao/zqt8GCcH9J42OowiSmUEqeoub0AXdCLn4KFvLXPw="; }; - nativeBuildInputs = [ + build-system = [ flit-core ]; @@ -25,6 +25,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/kjd/idna/"; + changelog = "https://github.com/kjd/idna/releases/tag/v${version}"; description = "Internationalized Domain Names in Applications (IDNA)"; license = lib.licenses.bsd3; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix index 98f38528c1..8aa1583cc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "igraph"; - version = "0.11.4"; + version = "0.11.5"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = "refs/tags/${version}"; - hash = "sha256-sR9OqsBxP2DvcYz1dhIP29rrQ56CRKW02oNAXUNttio="; + hash = "sha256-nfXCAjTKxtslVk17h60+v/JQusQTmaTRCPvvFG4/OPk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ihm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ihm/default.nix index 2cfb69178b..3991ce9a43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ihm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ihm/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ihm"; - version = "1.0"; + version = "1.1"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; rev = "refs/tags/${version}"; - hash = "sha256-a1M3YihN71M9TnkldAzN6N1UuPksDk6SPiBgr4HyC8g="; + hash = "sha256-auzArRwiue2CFo2DNS0NAF+aoZFvadhP6ARM0lRGcSA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imagededup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imagededup/default.nix index 7b5be6e317..a8de28de43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imagededup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imagededup/default.nix @@ -14,6 +14,7 @@ , torch , torchvision , tqdm +, fetchpatch }: let MobileNetV3 = fetchurl { @@ -77,6 +78,15 @@ buildPythonPackage rec { "imagededup" ]; + patches = [ + # https://github.com/idealo/imagededup/pull/217 + (fetchpatch { + name = "pytest-warnings-none.patch"; + url = "https://github.com/idealo/imagededup/commit/e2d7a21568e3115acd0632af569549c511ad5c0d.patch"; + hash = "sha256-AQwJpU3Ag6ONRAw0z8so5icW4fRpMHuBOMT5X+HsQ2w="; + }) + ]; + meta = with lib; { homepage = "https://idealo.github.io/imagededup/"; changelog = "https://github.com/idealo/imagededup/releases/tag/${src.rev}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix index 1817429600..a5a71c38bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.34.0"; + version = "2.34.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "imageio"; repo = "imageio"; rev = "refs/tags/v${version}"; - hash = "sha256-+I5KmKSLi8ARbDH06em71LWhmqziAaDfaBp4hU67/jg="; + hash = "sha256-/VZUifiz8iImq+JLvckFDr7YMIqu0Xro2t3GFj0obg0="; }; patches = lib.optionals (!stdenv.isDarwin) [ @@ -50,11 +50,11 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ numpy pillow ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix index 995d625f56..df3106aac4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix @@ -7,11 +7,14 @@ , typing-extensions , toml , zipp + +# Reverse dependency +, sage }: buildPythonPackage rec { pname = "importlib-metadata"; - version = "7.0.2"; + version = "7.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-GY9WjzIwh4yxtE+9eXX4eQbCIzbbouSn8FJ4woH715I="; + hash = "sha256-t4k4uSbujV8CD8R3LUhwRYBaVd260uzyHG1gk43H/NI="; }; nativeBuildInputs = [ @@ -41,6 +44,8 @@ buildPythonPackage rec { "importlib_metadata" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Read metadata from Python packages"; homepage = "https://importlib-metadata.readthedocs.io/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix index 79012fa967..1f4b01a419 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix @@ -10,6 +10,9 @@ # dependencies , importlib-metadata +# Reverse dependency +, sage + # tests , jaraco-collections , pytestCheckHook @@ -17,7 +20,7 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "6.1.3"; + version = "6.3.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -25,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_resources"; inherit version; - hash = "sha256-VvtFJRl7eFRKM1TqJ3k5UquT+TW7S/dGuEa7EBUCDys="; + hash = "sha256-lj63lkklKwFgwa/P5aHT/jrWbt0KixFL6s/7cMBnQiM="; }; build-system = [ @@ -46,6 +49,8 @@ buildPythonPackage rec { "importlib_resources" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Read resources from Python packages"; homepage = "https://importlib-resources.readthedocs.io/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix index ffd68b29b9..f0fdb5d45f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "in-n-out"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "in_n_out"; inherit version; - hash = "sha256-hKJb2/DKl2Dd+rgndujNJWddriHKDpVuIKwOcwL8oZ8="; + hash = "sha256-Q83it96YHUGm1wYYore9mJSBCVkipT6tTcdfK71d/+o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/indexed-zstd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/indexed-zstd/default.nix index 88cb6f0593..e7980f88a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/indexed-zstd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/indexed-zstd/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "indexed_zstd"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-icCerrv6ihBjSTS4Fsw7qhoA5ha8yegfMVRiIOhTvvY="; + hash = "sha256-i3Q3j5Rh/OqxdSFbZeHEiYZN2zS9gWBYk2pifwzKOos="; }; nativeBuildInputs = [ cython setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix index d6317d0084..35760249f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix @@ -2,25 +2,31 @@ , buildPythonPackage , fetchPypi , isPy27 +, more-itertools , setuptools-scm , pydantic , pytestCheckHook +, typeguard }: buildPythonPackage rec { pname = "inflect"; - version = "7.0.0"; + version = "7.2.0"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Y9qTJa0p2oHsI+BVtBIleVq3k7TstIO+XcH6Nj/UcX4="; + hash = "sha256-Mv6s+s/K4vIub8zeoQ8N3yamOPrENNDd2q+8oANPN4Q="; }; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ pydantic ]; + propagatedBuildInputs = [ + more-itertools + pydantic + typeguard + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix index d95aa2b232..b2480e4684 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.41.0"; + version = "1.42.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-wrgbc8sMISJvXxefGl2PBsJ3d308BXVH7wYIeaFmdZ8="; + hash = "sha256-PY0GpwO1OG4DKutMR3MF9HtTJbLFRCWypeoqVoiRD4o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix index ca962f4e47..1f7e7c0175 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix @@ -1,26 +1,28 @@ -{ lib -, buildPythonPackage -, python-dateutil -, fetchPypi -, mock -, msgpack -, pynose -, pandas -, pytestCheckHook -, pytz -, requests -, requests-mock -, six +{ + lib, + buildPythonPackage, + fetchPypi, + mock, + msgpack, + pandas, + pynose, + pytestCheckHook, + python-dateutil, + pytz, + requests, + requests-mock, + setuptools, + six, }: buildPythonPackage rec { pname = "influxdb"; - version = "5.3.1"; - format = "setuptools"; + version = "5.3.2"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "0ymjv322mv6y424fmpd70f87152w55mbwwj6i7p3sjzf0ixmxy26"; + hash = "sha256-WMZH9gQ3Et2G6a7hLrTM+7tUFUZ7yZEKSKqMdMEQiXA="; }; postPatch = '' @@ -35,25 +37,28 @@ buildPythonPackage rec { done ''; - propagatedBuildInputs = [ - requests + build-system = [ setuptools ]; + + dependencies = [ + msgpack python-dateutil pytz + requests six - msgpack ]; __darwinAllowLocalNetworking = true; nativeCheckInputs = [ + mock + pandas + pynose pytestCheckHook requests-mock - mock - pynose - pandas ]; disabledTests = [ + "socket" # Tests cause FutureWarning due to use of 'record' instead of 'records' in pandas. # https://github.com/influxdata/influxdb-python/pull/845 # Also type mismatches in assertEqual on DataFrame: @@ -78,6 +83,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for InfluxDB"; homepage = "https://github.com/influxdb/influxdb-python"; + changelog = "https://github.com/influxdata/influxdb-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix index a95e9e9cc8..1f57a9add0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "inform"; - version = "1.28"; + version = "1.29"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "inform"; rev = "refs/tags/v${version}"; - hash = "sha256-RA8/or3HTS/rQmG4A/Eg5j24YElaTEpnHa1yksARVMQ="; + hash = "sha256-quJGgXMvVZGqZA6M/AjU/cjYeL0R2nuPDoL0Ji0Ow6I="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/instructor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/instructor/default.nix index 0370c356d9..bb36e7a8ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/instructor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/instructor/default.nix @@ -1,24 +1,50 @@ -{ lib -, python3 -, fetchPypi -, buildPythonPackage +{ + lib, + aiohttp, + anthropic, + buildPythonPackage, + docstring-parser, + fetchFromGitHub, + openai, + poetry-core, + pydantic, + pytest-examples, + pytest-asyncio, + pytestCheckHook, + fastapi, + diskcache, + redis, + pythonOlder, + pythonRelaxDepsHook, + rich, + tenacity, + typer, }: buildPythonPackage rec { pname = "instructor"; - version = "0.6.8"; + version = "1.2.3"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-4mHXPes1NdYu53XEN7gq626cKy9ju1M7U6n6akfbuVo="; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "jxnl"; + repo = "instructor"; + rev = "refs/tags/${version}"; + hash = "sha256-LmorlFKIG7iPAK4pDbQqjxjiwB1md3u52B4u5WlqqTk="; }; - nativeBuildInputs = [ - python3.pkgs.poetry-core + pythonRelaxDeps = [ + "docstring-parser" + "pydantic" ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = [ poetry-core ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ aiohttp docstring-parser openai @@ -28,8 +54,31 @@ buildPythonPackage rec { typer ]; + nativeCheckInputs = [ + anthropic + fastapi + redis + diskcache + pytest-asyncio + pytest-examples + pytestCheckHook + ]; + pythonImportsCheck = [ "instructor" ]; + disabledTests = [ + # Tests require OpenAI API key + "test_partial" + "successfully" + ]; + + disabledTestPaths = [ + # Tests require OpenAI API key + "tests/test_distil.py" + "tests/test_new_client.py" + "tests/llm/" + ]; + meta = with lib; { description = "Structured outputs for llm"; homepage = "https://github.com/jxnl/instructor"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix index 96e1698002..b3e2294f1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix @@ -1,14 +1,16 @@ -{ lib -, fetchPypi -, buildPythonPackage -, pytestCheckHook -, pythonOlder +{ + lib, + fetchPypi, + buildPythonPackage, + pytestCheckHook, + pythonOlder, + setuptools }: buildPythonPackage rec { pname = "intbitset"; version = "3.1.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,19 +19,16 @@ buildPythonPackage rec { hash = "sha256-boPFun/aJSCqhWVCi7r4Qt63KT1mXzzYKByzklTS/3E="; }; - nativeCheckInputs = [ - pytestCheckHook - ]; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "intbitset" - ]; + pythonImportsCheck = [ "intbitset" ]; meta = with lib; { description = "C-based extension implementing fast integer bit sets"; homepage = "https://github.com/inveniosoftware/intbitset"; changelog = "https://github.com/inveniosoftware-contrib/intbitset/blob/v${version}/CHANGELOG.rst"; license = licenses.lgpl3Plus; - maintainers = [ ]; + maintainers = with maintainers; [ sigmanificient ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix index 40f97138bb..5beb0cc44e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "4.0.1"; + version = "4.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jjjake"; repo = "internetarchive"; rev = "refs/tags/v${version}"; - hash = "sha256-U6idxc5U2Bt581c/vnGgIou5+hoEJJZSPCo97MEDaW4="; + hash = "sha256-CqfwAKhrq4VEBU258x19JT8+ay2vOYIzVoFWjAzh3wY="; }; nativeBuildInputs = [ @@ -73,7 +73,7 @@ buildPythonPackage rec { homepage = "https://github.com/jjjake/internetarchive"; changelog = "https://github.com/jjjake/internetarchive/blob/v${version}/HISTORY.rst"; license = licenses.agpl3Plus; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "ia"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipycanvas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipycanvas/default.nix index 85961b450e..2222c0bdad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipycanvas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipycanvas/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder -, jupyter-packaging +, hatchling , ipywidgets , numpy , pillow @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ipycanvas"; - version = "0.13.1"; - format = "pyproject"; + version = "0.13.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+cOUBoG8ODgzkPjEbqXYRF1uEcbaZITDfYnfWuHawTE="; + hash = "sha256-Ujh9nYf2WVXzlVL7eSfEReXl5JN9hTgU2RDL6O+g+3k="; }; # We relax dependencies here instead of pulling in a patch because upstream @@ -26,13 +26,16 @@ buildPythonPackage rec { # postPatch = '' substituteInPlace pyproject.toml \ - --replace '"jupyterlab==3.*",' "" \ - --replace 'jupyter_packaging~=' 'jupyter_packaging>=' + --replace-fail '"jupyterlab>=3,<5",' "" \ ''; - nativeBuildInputs = [ jupyter-packaging ]; + build-system = [ + hatchling + ]; - propagatedBuildInputs = [ ipywidgets numpy pillow ]; + env.HATCH_BUILD_NO_HOOKS = true; + + dependencies = [ ipywidgets numpy pillow ]; doCheck = false; # tests are in Typescript and require `npx` and `chromium` pythonImportsCheck = [ "ipycanvas" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix index 761ab5852a..35cd3bad0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix @@ -18,6 +18,9 @@ , pyzmq , tornado , traitlets + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -63,6 +66,7 @@ buildPythonPackage rec { passthru.tests = { pytest = callPackage ./tests.nix { }; + inherit sage; }; meta = { @@ -70,6 +74,6 @@ buildPythonPackage rec { homepage = "https://ipython.org/"; changelog = "https://github.com/ipython/ipykernel/releases/tag/v${version}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ] ++ lib.teams.jupyter.members; + maintainers = lib.teams.jupyter.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix index f461659c65..b25f5fd58a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix @@ -13,14 +13,16 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.9.3"; + version = "0.9.4"; format = "wheel"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version format; - hash = "sha256-0RPNVYkbr+myfvmbbdERqHvra7KuVQxAQpInIQO+gBM="; + hash = "sha256-WwwIxvT26mVbpYI5NjRXwQ+5IVV/UDjBpG20RX1taw4="; + dist = "py3"; + python = "py3"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipynbname/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipynbname/default.nix index 03a27ec19d..bd158be55f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipynbname/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipynbname/default.nix @@ -1,20 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , ipykernel }: buildPythonPackage rec { pname = "ipynbname"; - version = "2023.2.0.0"; - format = "setuptools"; + version = "2024.1.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Riu915VmJIdtxOqB+nkoRas4cOREyh9res2uo32Mnr8="; + hash = "sha256-HTxpze6Kl4FPRWpyBOnMGVtLu0ueRcvnV3lrFiST9gY="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ ipykernel ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix index c097f2cb40..14667b0942 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix @@ -3,21 +3,21 @@ , fetchPypi , pythonOlder , hatchling -, hatch-jupyter-builder +, hatch-vcs , anywidget , pytestCheckHook }: buildPythonPackage rec { pname = "ipyniivue"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CvMSUvPyXxPexs0/0sa/xt65RFWtvmYZwGSMIQGvLkc="; + hash = "sha256-C0mYkguN4ZfxSLqETH3dUwXeoNcicrmAgp6e9IIT43s="; }; # We do not need the build hooks, because we do not need to @@ -26,7 +26,7 @@ buildPythonPackage rec { build-system = [ hatchling - hatch-jupyter-builder + hatch-vcs ]; dependencies = [ anywidget ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix index b5b2713182..9548ab254b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix @@ -66,6 +66,5 @@ buildPythonPackage rec { homepage = "https://ipyparallel.readthedocs.io/"; changelog = "https://github.com/ipython/ipyparallel/blob/${version}/docs/source/changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython-genutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython-genutils/default.nix index c11c63797f..4e8487f3f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython-genutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython-genutils/default.nix @@ -44,6 +44,5 @@ buildPythonPackage rec { description = "Vestigial utilities from IPython"; homepage = "https://ipython.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix index 09935bb1bc..577b788049 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -29,6 +29,9 @@ , notebook , qtconsole +# Reverse dependency +, sage + # Test dependencies , pickleshare , pytest-asyncio @@ -106,12 +109,14 @@ buildPythonPackage rec { "test_clipboard_get" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "IPython: Productive Interactive Computing"; downloadPage = "https://github.com/ipython/ipython/"; homepage = "https://ipython.org/"; changelog = "https://github.com/ipython/ipython/blob/${version}/docs/source/whatsnew/version${lib.versions.major version}.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor fridh ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix index 2be0ddfe80..a7a49a8d90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix @@ -1,24 +1,26 @@ { lib -, isPy27 , buildPythonPackage , fetchPypi # Python Inputs +, setuptools , ipywidgets }: buildPythonPackage rec { pname = "ipyvue"; - version = "1.11.0"; - format = "setuptools"; - - disabled = isPy27; + version = "1.11.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ez2ygBvgU12FX/+qDkARlizq50rEgZYp4UH5Sx4E2QA="; + hash = "sha256-AwgE/5GgRK0/oHrjTjlSo9IxmDdnhDSqqZrkiLp0mls="; }; - propagatedBuildInputs = [ ipywidgets ]; + build-system = [ + setuptools + ]; + + dependencies = [ ipywidgets ]; doCheck = false; # No tests in package or GitHub pythonImportsCheck = [ "ipyvue" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix index bbc1a102fb..69468ec28f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix @@ -48,6 +48,5 @@ buildPythonPackage rec { description = "IPython HTML widgets for Jupyter"; homepage = "https://github.com/jupyter-widgets/ipywidgets"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isal/default.nix new file mode 100644 index 0000000000..c37d9357ec --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/isal/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools + +# native dependencies +, isa-l + +# tests +, pytest-timeout +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "isal"; + version = "1.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pycompression"; + repo = "python-isal"; + rev = "v${version}"; + hash = "sha256-EhdKT2ftyU2zevFg9Yi3q2FVx0FmKwJMzszsK1NS3Qg="; + }; + + build-system = [ + setuptools + ]; + + buildInputs = [ + isa-l + ]; + + env.PYTHON_ISAL_LINK_DYNAMIC = true; + + nativeCheckInputs = [ + pytest-timeout + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests" + ]; + + disabledTests = [ + # calls `python -m isal` and fails on import + "test_compress_fast_best_are_exclusive" + "test_compress_infile_outfile" + "test_compress_infile_outfile_default" + "test_decompress_cannot_have_flags_compression" + "test_decompress_infile_outfile_error" + ]; + + pythonImportsCheck = [ + "isal" + ]; + + meta = with lib; { + changelog = "https://github.com/pycompression/python-isal/blob/${src.rev}/CHANGELOG.rst"; + description = "Faster zlib and gzip compatible compression and decompression by providing python bindings for the isa-l library"; + homepage = "https://github.com/pycompression/python-isal"; + license = licenses.psfl; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix index ca84beae2e..83f0b26c00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix @@ -1,41 +1,71 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isl -, pybind11 -, pytestCheckHook -, pythonOlder -, six +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + + setuptools, + cmake, + nanobind, + ninja, + pcpp, + scikit-build, + isl, + + pytestCheckHook, }: buildPythonPackage rec { pname = "islpy"; version = "2023.2.5"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-3XQ5i682k4q7fCqdmCjMGi5UnGyASFzsiwaymr+q0Y8="; + src = fetchFromGitHub { + owner = "inducer"; + repo = "islpy"; + rev = "v${version}"; + hash = "sha256-0m41G5HlPrgt4rDY3Y9cKBJGHSnLg/R+IywBO1anRpQ="; }; - postConfigure = '' - substituteInPlace setup.py \ - --replace "\"pytest>=2\"," "" + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools>=42,<64;python_version<'3.12'" "setuptools>=42" ''; - buildInputs = [ isl pybind11 ]; - propagatedBuildInputs = [ six ]; + build-system = [ + setuptools + cmake + nanobind + ninja + pcpp + scikit-build + ]; + + buildInputs = [ isl ]; + + dontUseCmakeConfigure = true; + + preConfigure = '' + python ./configure.py \ + --no-use-shipped-isl \ + --isl-inc-dir=${lib.getDev isl}/include \ + ''; + + # Force resolving the package from $out to make generated ext files usable by tests + preCheck = '' + mv islpy islpy.hidden + ''; - preCheck = "mv islpy islpy.hidden"; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "islpy" ]; - meta = with lib; { + meta = { description = "Python wrapper around isl, an integer set library"; homepage = "https://github.com/inducer/islpy"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomasajt ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix index 75e00b4bbc..0a93eda903 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/scrapy/itemadapter"; changelog = "https://github.com/scrapy/itemadapter/raw/v${version}/Changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix index 73957e6b0a..554882957f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/scrapy/itemloaders"; changelog = "https://github.com/scrapy/itemloaders/raw/v${version}/docs/release-notes.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iterable-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iterable-io/default.nix new file mode 100644 index 0000000000..81799c7aec --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/iterable-io/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "iterable-io"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pR0Ps"; + repo = "iterable-io"; + rev = "refs/tags/v${version}"; + hash = "sha256-+PSINKS7/FeGHYvkOASA5m+1pBpKfURfylZ8CwKijgA="; + }; + + nativeBuildInputs = [ setuptools ]; + + pythonImportsCheck = [ "iterableio" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Library to adapt iterables to a file-like interface"; + homepage = "https://github.com/pR0Ps/iterable-io"; + changelog = "https://github.com/pR0Ps/iterable-io/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.lgpl3Only; + maintainers = [ lib.maintainers.mjoerg ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix index cfc364a4a3..edd1b14990 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix @@ -2,31 +2,32 @@ , buildPythonPackage , pythonOlder , fetchPypi +, flit-core , freezegun , pytestCheckHook }: buildPythonPackage rec { pname = "itsdangerous"; - version = "2.1.2"; - format = "setuptools"; + version = "2.2.0"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-XbvGizF+XkLzJ/kCF2NUXcP8O/4i5t65aq8fw4h0FWo="; + hash = "sha256-4AUMC32h7qU/+vFJwM+7XG4uK2nEvvIsgfputz5fYXM="; }; + build-system = [ flit-core ]; + nativeCheckInputs = [ freezegun pytestCheckHook ]; - pytestFlagsArray = [ - "-W" "ignore::DeprecationWarning" - ]; - meta = with lib; { + changelog = "https://github.com/pallets/itsdangerous/blob/${version}/CHANGES.rst"; description = "Safely pass data to untrusted environments and back"; homepage = "https://itsdangerous.palletsprojects.com"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-collections/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-collections/default.nix index bab89a3f7a..ecef3939c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-collections/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-collections/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "jaraco-collections"; - version = "5.0.0"; + version = "5.0.1"; format = "pyproject"; src = fetchPypi { pname = "jaraco.collections"; inherit version; - hash = "sha256-FoDo0J8pX2Jce6kmiAF1om/b5wkrTHbRmOMEdrIc/mg="; + hash = "sha256-gIYxsXS4Sk4qWSSQ1i9i38FdgEeg9xVyYJjcQ7gabPo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix index 28a7d64e11..d3b8992818 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix @@ -2,21 +2,25 @@ , buildPythonPackage , fetchPypi , more-itertools +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "jaraco-functools"; - version = "4.0.0"; - format = "pyproject"; + version = "4.0.1"; + pyproject = true; src = fetchPypi { - pname = "jaraco.functools"; + pname = "jaraco_functools"; inherit version; - hash = "sha256-wnnLJMk9aU73Jw+XDUmcq004E/TggnP5U5hlGmNPCSU="; + hash = "sha256-0z+nZTdMBhG1L4s6eV+JAIaaqIyEdp1NF0bNaPsow+g="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; propagatedBuildInputs = [ more-itertools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix index e160eec612..80b0276555 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix @@ -29,7 +29,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.4.25"; + version = "0.4.28"; pyproject = true; disabled = pythonOlder "3.9"; @@ -39,7 +39,7 @@ buildPythonPackage rec { repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! rev = "refs/tags/jax-v${version}"; - hash = "sha256-poQQo2ZgEhPYzK3aCs+BjaHTNZbezJAECd+HOdY1Yok="; + hash = "sha256-qSHPwi3is6Ts7pz5s4KzQHBMbcjGp+vAOsejW3o36Ek="; }; nativeBuildInputs = [ @@ -81,6 +81,14 @@ buildPythonPackage rec { "tests/" ]; + # Prevents `tests/export_back_compat_test.py::CompatTest::test_*` tests from failing on darwin with + # PermissionError: [Errno 13] Permission denied: '/tmp/back_compat_testdata/test_*.py' + # See https://github.com/google/jax/blob/jaxlib-v0.4.27/jax/_src/internal_test_util/export_back_compat_test_util.py#L240-L241 + # NOTE: this doesn't seem to be an issue on linux + preCheck = lib.optionalString stdenv.isDarwin '' + export TEST_UNDECLARED_OUTPUTS_DIR=$(mktemp -d) + ''; + disabledTests = [ # Exceeds tolerance when the machine is busy "test_custom_linear_solve_aux" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix index 54abdfe48c..d2bf3604a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix @@ -20,17 +20,17 @@ , stdenv # Options: , cudaSupport ? config.cudaSupport -, cudaPackagesGoogle +, cudaPackages }: let - inherit (cudaPackagesGoogle) cudaVersion; + inherit (cudaPackages) cudaVersion; - version = "0.4.24"; + version = "0.4.28"; inherit (python) pythonVersion; - cudaLibPath = lib.makeLibraryPath (with cudaPackagesGoogle; [ + cudaLibPath = lib.makeLibraryPath (with cudaPackages; [ cuda_cudart.lib # libcudart.so cuda_cupti.lib # libcupti.so cudnn.lib # libcudnn.so @@ -56,65 +56,65 @@ let "3.9-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp39"; - hash = "sha256-6P5ArMoLZiUkHUoQ/mJccbNj5/7el/op+Qo6cGQ33xE="; + hash = "sha256-Slbr8FtKTBeRaZ2HTgcvP4CPCYa0AQsU+1SaackMqdw="; }; "3.9-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp39"; - hash = "sha256-23JQZRwMLtt7sK/JlCBqqRyfTVIAVJFN2sL+nAkQgvU="; + hash = "sha256-sBVi7IrXVxm30DiXUkiel+trTctMjBE75JFjTVKCrTw="; }; "3.9-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp39"; - hash = "sha256-OgMedn9GHGs5THZf3pkP3Aw/jJ0vL5qK1b+Lzf634Ik="; + hash = "sha256-T5jMg3srbG3P4Kt/+esQkxSSCUYRmqOvn6oTlxj/J4c="; }; "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-/VwUIIa7mTs/wLz0ArsEfNrz2pGriVVT5GX9XRFRxfY="; + hash = "sha256-47zcb45g+FVPQVwU2TATTmAuPKM8OOVGJ0/VRfh1dps="; }; "3.10-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp310"; - hash = "sha256-LgICOyDGts840SQQJh+yOMobMASb62llvJjpGvhzrSw="; + hash = "sha256-8Djmi9ENGjVUcisLvjbmpEg4RDenWqnSg/aW8O2fjAk="; }; "3.10-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp310"; - hash = "sha256-vhyULw+zBpz1UEi2tqgBMQEzY9a6YBgEIg6A4PPh3bQ="; + hash = "sha256-pCHSN/jCXShQFm0zRgPGc925tsJvUrxJZwS4eCKXvWY="; }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-VJO/VVwBFkOEtq4y/sLVgAV8Cung01JULiuT6W96E/8="; + hash = "sha256-Rc4PPIQM/4I2z/JsN/Jsn/B4aV+T4MFiwyDCgfUEEnU="; }; "3.11-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp311"; - hash = "sha256-VtuwXxurpSp1KI8ty1bizs5cdy8GEBN2MgS227sOCmE="; + hash = "sha256-eThX+vN/Nxyv51L+pfyBH0NeQ7j7S1AgWERKf17M+Ck="; }; "3.11-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp311"; - hash = "sha256-4Dj5dEGKb9hpg3HlVogNO1Gc9UibJhy1eym2mjivxAQ="; + hash = "sha256-L/gpDtx7ksfq5SUX9lSSYz4mey6QZ7rT5MMj0hPnfPU="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-TlrGVtb3NTLmhnILWPLJR+jISCZ5SUV4wxNFpSfkCBo="; + hash = "sha256-RqGqhX9P7uikP8upXA4Kti1AwmzJcwtsaWVZCLo1n40="; }; "3.12-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp312"; - hash = "sha256-FIwK5CGykQjteuWzLZnbtAggIxLQeGV96bXlZGEytN0="; + hash = "sha256-jdi//jhTcC9jzZJNoO4lc0pNGc1ckmvgM9dyun0cF10="; }; "3.12-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp312"; - hash = "sha256-9/jw/wr6oUD9pOadVAaMRL086iVMUXwVgnUMcG1UNvE="; + hash = "sha256-1sCaVFMpciRhrwVuc1FG0sjHTCKsdCaoRetp8ya096A="; }; }; @@ -130,35 +130,19 @@ let gpuSrcs = { "cuda12.2-3.9" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp39-cp39-manylinux2014_x86_64.whl"; - hash = "sha256-xdJKLPtx+CIza2CrWKM3M0cZJzyNFVTTTsvlgh38bfM="; + hash = "sha256-d8LIl22gIvmWfoyKfXKElZJXicPQIZxdS4HumhwQGCw="; }; "cuda12.2-3.10" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-QCjrOczD2mp+CDwVXBc0/4rJnAizeV62AK0Dpx9X6TE="; + hash = "sha256-PXtWv+UEcMWF8LhWe6Z1UGkf14PG3dkJ0Iop0LiimnQ="; }; "cuda12.2-3.11" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp311-cp311-manylinux2014_x86_64.whl"; - hash = "sha256-Ipy3vk1yUplpNzECAFt63aOIhgEWgXG7hkoeTIk9bQQ="; + hash = "sha256-QO2WSOzmJ48VaCha596mELiOfPsAGLpGctmdzcCHE/o="; }; "cuda12.2-3.12" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp312-cp312-manylinux2014_x86_64.whl"; - hash = "sha256-LSnZHaUga/8Z65iKXWBnZDk4yUpNykFTu3vukCchO6Q="; - }; - "cuda11.8-3.9" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp39-cp39-manylinux2014_x86_64.whl"; - hash = "sha256-UmyugL0VjlXkiD7fuDPWgW8XUpr/QaP5ggp6swoZTzU="; - }; - "cuda11.8-3.10" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-luKULEiV1t/sO6eckDxddJTiOFa0dtJeDlrvp+WYmHk="; - }; - "cuda11.8-3.11" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp311-cp311-manylinux2014_x86_64.whl"; - hash = "sha256-4+uJ8Ij6mFGEmjFEgi3fLnSLZs+v18BRoOt7mZuqydw="; - }; - "cuda11.8-3.12" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp312-cp312-manylinux2014_x86_64.whl"; - hash = "sha256-bUDFb94Ar/65SzzR9RLIs/SL/HdjaPT1Su5whmjkS00="; + hash = "sha256-ixWMaIChy4Ammsn23/3cCoala0lFibuUxyUr3tjfFKU="; }; }; @@ -213,7 +197,7 @@ buildPythonPackage { # for more info. postInstall = lib.optional cudaSupport '' mkdir -p $out/${python.sitePackages}/jaxlib/cuda/bin - ln -s ${lib.getExe' cudaPackagesGoogle.cuda_nvcc "ptxas"} $out/${python.sitePackages}/jaxlib/cuda/bin/ptxas + ln -s ${lib.getExe' cudaPackages.cuda_nvcc "ptxas"} $out/${python.sitePackages}/jaxlib/cuda/bin/ptxas ''; inherit (jaxlib-build) pythonImportsCheck; @@ -227,8 +211,13 @@ buildPythonPackage { platforms = [ "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ]; broken = !(cudaSupport -> lib.versionAtLeast cudaVersion "11.1") - || !(cudaSupport -> lib.versionAtLeast cudaPackagesGoogle.cudnn.version "8.2") + || !(cudaSupport -> lib.versionAtLeast cudaPackages.cudnn.version "8.2") || !(cudaSupport -> stdenv.isLinux) - || !(cudaSupport -> (gpuSrcs ? "cuda${cudaVersion}-${pythonVersion}")); + || !(cudaSupport -> (gpuSrcs ? "cuda${cudaVersion}-${pythonVersion}")) + # Fails at pythonImportsCheckPhase: + # ...-python-imports-check-hook.sh/nix-support/setup-hook: line 10: 28017 Illegal instruction: 4 + # /nix/store/5qpssbvkzfh73xih07xgmpkj5r565975-python3-3.11.9/bin/python3.11 -c + # 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ["pythonImportsCheck"].split()))' + || (stdenv.isDarwin && stdenv.isx86_64); }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix index c95edf66fc..8854d7927e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix @@ -13,7 +13,6 @@ , curl , cython , fetchFromGitHub -, fetchpatch , git , IOKit , jsoncpp @@ -45,22 +44,22 @@ , config # CUDA flags: , cudaSupport ? config.cudaSupport -, cudaPackagesGoogle +, cudaPackages # MKL: , mklSupport ? true }@inputs: let - inherit (cudaPackagesGoogle) cudaFlags cudaVersion cudnn nccl; + inherit (cudaPackages) cudaFlags cudaVersion cudnn nccl; pname = "jaxlib"; - version = "0.4.24"; + version = "0.4.28"; # It's necessary to consistently use backendStdenv when building with CUDA # support, otherwise we get libstdc++ errors downstream stdenv = throw "Use effectiveStdenv instead"; - effectiveStdenv = if cudaSupport then cudaPackagesGoogle.backendStdenv else inputs.stdenv; + effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; @@ -78,7 +77,7 @@ let # These are necessary at build time and run time. cuda_libs_joined = symlinkJoin { name = "cuda-joined"; - paths = with cudaPackagesGoogle; [ + paths = with cudaPackages; [ cuda_cudart.lib # libcudart.so cuda_cudart.static # libcudart_static.a cuda_cupti.lib # libcupti.so @@ -92,11 +91,11 @@ let # These are only necessary at build time. cuda_build_deps_joined = symlinkJoin { name = "cuda-build-deps-joined"; - paths = with cudaPackagesGoogle; [ + paths = with cudaPackages; [ cuda_libs_joined # Binaries - cudaPackagesGoogle.cuda_nvcc.bin # nvcc + cudaPackages.cuda_nvcc.bin # nvcc # Headers cuda_cccl.dev # block_load.cuh @@ -181,19 +180,10 @@ let owner = "openxla"; repo = "xla"; # Update this according to https://github.com/google/jax/blob/jaxlib-v${version}/third_party/xla/workspace.bzl. - rev = "12eee889e1f2ad41e27d7b0e970cb92d282d3ec5"; - hash = "sha256-68kjjgwYjRlcT0TVJo9BN6s+WTkdu5UMJqQcfHpBT90="; + rev = "e8247c3ea1d4d7f31cf27def4c7ac6f2ce64ecd4"; + hash = "sha256-ZhgMIVs3Z4dTrkRWDqaPC/i7yJz2dsYXrZbjzqvPX3E="; }; - patches = [ - # Resolves "could not convert ‘result’ from ‘SmallVector<[...],6>’ to - # ‘SmallVector<[...],4>’" compilation error. See https://github.com/google/jax/issues/19814#issuecomment-1945141259. - (fetchpatch { - url = "https://github.com/openxla/xla/commit/7a614cd346594fc7ea2fe75570c9c53a4a444f60.patch"; - hash = "sha256-RtuQTH8wzNiJcOtISLhf+gMlH1gg8hekvxEB+4wX6BM="; - }) - ]; - dontBuild = true; # This is necessary for patchShebangs to know the right path to use. @@ -220,7 +210,7 @@ let repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jaxlib tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-hmx7eo3pephc6BQfoJ3U0QwWBWmhkAc+7S4QmW32qQs="; + hash = "sha256-qSHPwi3is6Ts7pz5s4KzQHBMbcjGp+vAOsejW3o36Ek="; }; nativeBuildInputs = [ @@ -364,10 +354,10 @@ let ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-IEKoHjCOtKZKvU/DUUjbvXldORFJuyO1R3F6CZZDXxM="; + x86_64-linux = "sha256-VGNMf5/DgXbgsu1w5J1Pmrukw+7UO31BNU+crKVsX5k="; } else { - x86_64-linux = "sha256-IE4+Tk4llo85u3NjakvY04tPw4R1bidyecPpQ4gknR8="; - aarch64-linux = "sha256-NehnpA4m+Fynvh0S6WKy/v9ab81487NE9ahvbS70wjY="; + x86_64-linux = "sha256-uOoAyMBLHPX6jzdN43b5wZV5eW0yI8sCDD7BSX2h4oQ="; + aarch64-linux = "sha256-+SnGKY9LIT1Qhu/x6Uh7sHRaAEjlc//qyKj1m4t16PA="; }).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}"); }; @@ -414,7 +404,7 @@ buildPythonPackage { # for more info. postInstall = lib.optionalString cudaSupport '' mkdir -p $out/bin - ln -s ${cudaPackagesGoogle.cuda_nvcc.bin}/bin/ptxas $out/bin/ptxas + ln -s ${cudaPackages.cuda_nvcc.bin}/bin/ptxas $out/bin/ptxas find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do patchelf --add-rpath "${lib.makeLibraryPath [cuda_libs_joined cudnn nccl]}" "$lib" @@ -423,7 +413,7 @@ buildPythonPackage { nativeBuildInputs = lib.optionals cudaSupport [ autoAddDriverRunpath ]; - propagatedBuildInputs = [ + dependencies = [ absl-py curl double-conversion diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix index af924cea5a..1216b15f83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix @@ -6,6 +6,7 @@ , fetchpatch , pytest-xdist , pytestCheckHook +, setuptools , absl-py , cvxpy , jax @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "jaxopt"; version = "0.8.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +42,11 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ absl-py jax jaxlib @@ -66,11 +71,20 @@ buildPythonPackage rec { "jaxopt.tree_util" ]; - disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + disabledTests = [ + # https://github.com/google/jaxopt/issues/592 + "test_solve_sparse" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ # https://github.com/google/jaxopt/issues/577 "test_binary_logit_log_likelihood" "test_solve_sparse" "test_logreg_with_intercept_manual_loop3" + + # https://github.com/google/jaxopt/issues/593 + # Makes the test suite crash + "test_dtype_consistency" + # AssertionError: Array(0.01411963, dtype=float32) not less than or equal to 0.01 + "test_multiclass_logreg6" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix index 1d6a173e26..0a67730726 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix @@ -11,6 +11,7 @@ , pytestCheckHook , python-lsp-jsonrpc , pythonOlder +, stdenv }: buildPythonPackage rec { @@ -49,6 +50,12 @@ buildPythonPackage rec { HOME="$(mktemp -d)" ''; + disabledTests = lib.optionals stdenv.isDarwin [ + # https://github.com/pappasam/jedi-language-server/issues/313 + "test_publish_diagnostics_on_change" + "test_publish_diagnostics_on_save" + ]; + pythonImportsCheck = [ "jedi_language_server" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix index 852b529e8b..2ed276bfae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "6.2.0"; + version = "6.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-kV2g1qbS5L7bEqfPijj60eK+pbTc8SAs/tctpNv0PFs="; + hash = "sha256-RD9VQFlwLJ3TiReKty+q056CjsOnSD2J2bpASmqHIEM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix index 1c260e37c7..f36f67f1d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix @@ -4,31 +4,33 @@ , buildPythonPackage , pythonOlder , fetchPypi +, flit-core , babel , markupsafe , pytestCheckHook , sphinxHook , pallets-sphinx-themes -, setuptools , sphinxcontrib-log-cabinet , sphinx-issues + +# Reverse dependency +, sage }: buildPythonPackage rec { pname = "jinja2"; - version = "3.1.3"; + version = "3.1.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "Jinja2"; - inherit version; - hash = "sha256-rIvWVE1Lssl5K/OhWegLuo/afwfoG8Ou1WVDLVklupA="; + inherit pname version; + hash = "sha256-Sjruesu+cwOu3o6WSNE7i/iKQpKCqmEiqZPwrIAMs2k="; }; nativeBuildInputs = [ - setuptools + flit-core ]; propagatedBuildInputs = [ @@ -76,6 +78,8 @@ buildPythonPackage rec { inherit meta; }; + passthru.tests = { inherit sage; }; + meta = with lib; { changelog = "https://github.com/pallets/jinja/blob/${version}/CHANGES.rst"; description = "Very fast and expressive template engine"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jiwer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jiwer/default.nix index 2c15663502..66ab13cdd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jiwer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jiwer/default.nix @@ -10,24 +10,24 @@ buildPythonPackage rec { pname = "jiwer"; - version = "3.0.3"; - format = "pyproject"; + version = "3.04"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jitsi"; - repo = pname; + repo = "jiwer"; rev = "refs/tags/v${version}"; - hash = "sha256-32bpSBYl6yxb4lJhHnfnYhtye7DaBZT0VAe9rDcleTc="; + hash = "sha256-2LzAOgABK00Pz3v5WWYUAcZOYcTbRKfgw7U5DOohB/Q="; }; - nativeBuildInputs = [ + build-system = [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ rapidfuzz click ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix index 298a2ce83a..e592c8089f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , pythonAtLeast , stdenv @@ -22,24 +21,16 @@ buildPythonPackage rec { pname = "joblib"; - version = "1.3.2"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kvhl5iHhd4TnlVCAttBCSJ47jilJScxExurDBPWXcrE="; + hash = "sha256-HrDcCRkZzThEkN6JDLXf1ThBCm1LO1Tu8J+4xQtAmxw="; }; - patches = [ - (fetchpatch { - name = "suppress-deprecation-warnings-with-python312.patch"; - url = "https://github.com/joblib/joblib/commit/05caf0772d605799e5d2337018fd32ac829b37aa.patch"; - hash = "sha256-bfqxCLFkCnuWMIkIbcjh+nCTv38A8jxvyCHeJPxoZwg="; - }) - ]; - nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jplephem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jplephem/default.nix index 5a1a8ab3cb..ada4c9552e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jplephem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jplephem/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "jplephem"; - version = "2.21"; + version = "2.22"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NBlLYQaV8huJIXuYUrjautvOgISMs2nZVn7xLcSCjVU="; + hash = "sha256-DZrMche0gG/rqT5yl0zurVYREEvOZ4mvONTyfc96WSw="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix index 64b6163825..0fc6f7cc12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix @@ -17,20 +17,20 @@ let testFiles = fetchFromGitHub { owner = "openpreserve"; repo = "jpylyzer-test-files"; - rev = "146cb0029b5ea9d8ef22dc6683cec8afae1cc63a"; - hash = "sha256-uKUau7mYXqGs4dSnXGPnPsH9k81ZCK0aPj5F9HWBMZ8="; + rev = "0290e98bae9c5480c995954d3f14b4cf0a0395ff"; + hash = "sha256-dr3hC6dGd3HNSE4nRj1xrfFSW9cepQ1mdVH8S3YQdtw="; }; in buildPythonPackage rec { pname = "jpylyzer"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; src = fetchFromGitHub { owner = "openpreserve"; repo = pname; rev = version; - hash = "sha256-SK6Z+JkFBD9V99reRZf+jM8Z2SiDNSG72gusp2FPfmI="; + hash = "sha256-P42qAks8suI/Xknwd8WAkymbGE7RApRa/a11J/V4LA0="; }; propagatedBuildInputs = [ six ]; @@ -40,14 +40,9 @@ in buildPythonPackage rec { # don't depend on testFiles unless doFullCheck as it may not be extractable # on some filesystems due to weird filenames preCheck = lib.optionalString doFullCheck '' - sed -i '/^testFilesDir = /ctestFilesDir = "${testFiles}"' tests/unit/test_testfiles.py + sed -i '/^testFilesDir = /ctestFilesDir = "${testFiles}/files"' tests/unit/test_testfiles.py ''; - disabledTests = [ - # missing file, but newer test files breaks other tests - "test_groundtruth_complete" - ]; - disabledTestPaths = lib.optionals (!doFullCheck) [ "tests/unit/test_testfiles.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-logging/default.nix index 3d22f4e878..f904d6d44a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-logging/default.nix @@ -6,17 +6,18 @@ , httpx , pytestCheckHook , pythonOlder +, pythonAtLeast , quart , requests , sanic +, setuptools , uvicorn -, wheel }: buildPythonPackage rec { pname = "json-logging"; version = "1.5.0-rc0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,16 +28,28 @@ buildPythonPackage rec { hash = "sha256-WOAEY1pONH+Gx1b8zHZDMNgJJSn7jvMO60LYTA8z/dE="; }; - nativeCheckInputs = [ + # The logging module introduced the `taskName` field in Python 3.12, which the tests don't expect + postPatch = lib.optionalString (pythonAtLeast "3.12") '' + substituteInPlace tests/helpers/constants.py \ + --replace-fail '"written_at",' '"taskName", "written_at",' + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ fastapi flask httpx - pytestCheckHook quart requests sanic uvicorn - wheel + ]; + + nativeCheckInputs = [ + pytestCheckHook ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix index f758ae9244..e96a5b37db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -1,25 +1,26 @@ -{ lib -, beautifulsoup4 -, buildPythonPackage -, click -, dataclasses-json -, fetchFromGitHub -, htmlmin -, jinja2 -, markdown2 -, poetry-core -, pygments -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pytz -, pyyaml -, requests +{ + lib, + beautifulsoup4, + buildPythonPackage, + click, + dataclasses-json, + fetchFromGitHub, + htmlmin, + jinja2, + markdown2, + poetry-core, + pygments, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pytz, + pyyaml, + requests, }: buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.47"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,19 +29,16 @@ buildPythonPackage rec { owner = "coveooss"; repo = "json-schema-for-humans"; rev = "refs/tags/v${version}"; - hash = "sha256-yioYsCp+q5YWdIWDlNZkpaLqo++n+dV5jyEeIhUDHr4="; + hash = "sha256-ZlGIttfFOL4uLgzXIFvmyFDGrm8/Vr94QaFSn4/5ITI="; }; - pythonRelaxDeps = [ - "dataclasses-json" - ]; + pythonRelaxDeps = [ "dataclasses-json" ]; - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ click dataclasses-json htmlmin @@ -64,16 +62,14 @@ buildPythonPackage rec { "TestMdGenerate" ]; - pythonImportsCheck = [ - "json_schema_for_humans" - ]; + pythonImportsCheck = [ "json_schema_for_humans" ]; meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; - mainProgram = "generate-schema-doc"; homepage = "https://github.com/coveooss/json-schema-for-humans"; changelog = "https://github.com/coveooss/json-schema-for-humans/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ astro ]; + mainProgram = "generate-schema-doc"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix index 9609d68c69..ce2a48bae9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , cargo -, darwin +, libiconv , fetchFromGitHub , json-stream , json-stream-rs-tokenizer @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; buildInputs = lib.optionals stdenv.isDarwin [ - darwin.libiconv + libiconv ]; # Tests depend on json-stream, which depends on this package. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix index 4e3fd81314..fbe0efd86b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "3.0.3"; + version = "3.0.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-VpH0RJUyeFirOpW5xECnm0HjVCG+Gm4JpHtsm5Qh/QY="; + hash = "sha256-obFMjWIhzY85TyqX5zXqHX7ckn+9E1sm8vhwBlfIxis="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix index bdb7b57729..202c65e42a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { homepage = "https://jupyterbook.org/"; changelog = "https://github.com/executablebooks/jupyter-book/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; mainProgram = "jupyter-book"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-cache/default.nix index 4a7ebfbd83..e2e597dd4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-cache/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/jupyter-cache"; changelog = "https://github.com/executablebooks/jupyter-cache/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix index 5dd708f014..a556885e84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix @@ -48,6 +48,5 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/jupyter_client"; changelog = "https://github.com/jupyter/jupyter_client/blob/v${version}/CHANGELOG.md"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix index 1c01c6d4d1..c4ba4a6f05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "2.0.11"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-K7HN5yzadY5Sb6Sfn/K/QCzu14AcDEGHq+TSHkLhgTY="; + hash = "sha256-T1DCXG2BEmwW3q+S0r14o5svy4ZpDc5pa0AGt0DXHB8="; }; postPatch = '' @@ -71,6 +71,8 @@ buildPythonPackage rec { disabledTests = [ # ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception) "test_dirty" + # causes a hang + "test_rooms" ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix index 799e098920..c1faa97b1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix @@ -7,6 +7,9 @@ , traitlets , pip , pytestCheckHook + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -61,6 +64,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyter_core" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Base package on which Jupyter projects rely"; homepage = "https://jupyter.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix index e51f02bb3b..c782bd7854 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "jupyterhub"; repo = "repo2docker"; rev = "refs/tags/${version}"; - hash = "sha256-U22A1OX83F2OMdS3w0elQpGg1z+ZgOeZLv8XjOK26mg="; + hash = "sha256-D8sgeyfQjEkBYck/CikAVNZzUSl1R9uXSv75DTXT5U0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-server/default.nix index f295ce204a..059cb1c5ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "jupyterlab-server"; - version = "2.26.0"; + version = "2.27.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_server"; inherit version; - hash = "sha256-mzupHPKDf38ST8o21j88qArOK+1ImKY91H5lmMGrAG8="; + hash = "sha256-CXtaxwm2dscoSsnF43PxGTClYfUs1ahuT8flqcioYx0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index dc48c597d5..7b9a17d91e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.1.6"; + version = "4.1.8"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-eTXza6JuthUYOk9cK7yleRtRCM4qALVQX4z9EA1TZI4="; + hash = "sha256-M4St7YaA585QT9Y7i7iaOd8hycdpTZ59xKaHQs2zD5s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix index 699cb58e6c..6935fd46ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix @@ -14,33 +14,34 @@ , pytestCheckHook , pythonOlder , pyyaml -, toml +, tomli }: buildPythonPackage rec { pname = "jupytext"; - version = "1.16.1"; + version = "1.16.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-aMe2hoXocOgOYP2oKG+9Ymnpx03B30MW32/kbqvJTJk="; + hash = "sha256-hifdm+y769ecxKTtRyfYnXjmBrS0ZOq3I1ezsCkCOhQ="; }; - nativeBuildInputs = [ + build-system = [ hatch-jupyter-builder hatchling ]; - propagatedBuildInputs = [ + dependencies = [ markdown-it-py mdit-py-plugins nbformat packaging pyyaml - toml + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix index 2247b2ece9..44d86fc29a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, cython -, poetry-core -, pytestCheckHook -, setuptools -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cython, + poetry-core, + pytestCheckHook, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "kasa-crypt"; - version = "0.4.1"; - format = "pyproject"; + version = "0.4.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,27 +20,23 @@ buildPythonPackage rec { owner = "bdraco"; repo = "kasa-crypt"; rev = "refs/tags/v${version}"; - hash = "sha256-ZAynSL6tIQoe9veYGusel9GQEffeLQ8dBA9HfA6TMzI="; + hash = "sha256-7PLOuWxA5ziOuysSu+nLWNmNA3/sbuUCuZcMRBflf6U="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=kasa_crypt --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=kasa_crypt --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "kasa_crypt" - ]; + pythonImportsCheck = [ "kasa_crypt" ]; meta = with lib; { description = "Fast kasa crypt"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kazoo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kazoo/default.nix index eedbd7da41..73f041f49f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kazoo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kazoo/default.nix @@ -4,7 +4,7 @@ , six , eventlet , gevent -, nose +, pynose , mock , coverage , pkgs @@ -21,7 +21,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ]; - buildInputs = [ eventlet gevent nose mock coverage pkgs.openjdk8 ]; + buildInputs = [ eventlet gevent pynose mock coverage pkgs.openjdk8 ]; # not really needed preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix index 2c14e72bcf..a10b8ddf73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.7.2"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "keboola"; repo = "sapi-python-client"; rev = "refs/tags/${version}"; - hash = "sha256-uZo2kEq7zIMGRlhX36kZyihQPZegw5XgVzgVQQOmpc4="; + hash = "sha256-Xc4VD91Nhnj0UyWHpdwEaETJVH8Ue6/kuiKEMaiSR0g="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix index c745792962..156f8f5c2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix @@ -1,17 +1,17 @@ { lib, buildPythonPackage, fetchPypi , pytest, pytest-cov, pytest-xdist -, six, numpy, scipy, pyyaml, h5py +, six, numpy, scipy, pyyaml, h5py, optree , keras-applications, keras-preprocessing }: buildPythonPackage rec { pname = "keras"; - version = "3.0.5"; + version = "3.2.1"; format = "wheel"; src = fetchPypi { inherit format pname version; - hash = "sha256-SgIvLpfqWj2xLtgJ/8t84e+NNP6urFIxXshVPe0tz5c="; + hash = "sha256-C+HomwQeaXvlYthCLsuVjuVIGs/AiZEyAJJsVh0ligM="; python = "py3"; dist = "py3"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix index f463b18950..2ad45c6e71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , jaraco-classes +, jaraco-context , keyring , pytestCheckHook , pythonOlder @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "keyrings-alt"; - version = "5.0.0"; + version = "5.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "keyrings.alt"; inherit version; - hash = "sha256-nURstHu86pD/ouzD6AA6z0FXP8IBv0S0vxO9DhFISCg="; + hash = "sha256-zTcqHsRGobxakGJKUsiOg7kzAhjjkEemyaSK430RZ0U="; }; nativeBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jaraco-classes + jaraco-context ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix index a6867075d9..c4aad1fab2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.3.5"; + version = "5.3.7"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-MORw8aa0nHDcb20Tw+TMTheKpsRpzra81VZFOF/IS5M="; + hash = "sha256-ARxM2aNVwUod6NNdJXMUodJFbVK3FAOIVhrKw88al78="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kornia-rs/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/kornia-rs/Cargo.lock new file mode 100644 index 0000000000..ce16e71e91 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/kornia-rs/Cargo.lock @@ -0,0 +1,1598 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] +name = "anyhow" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" + +[[package]] +name = "arbitrary" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569" + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +dependencies = [ + "serde", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "serde", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitstream-io" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e445576659fd04a57b44cbd00aa37aaa815ebefa0aa3cb677a6b5e63d883074f" + +[[package]] +name = "bitstream-io" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" + +[[package]] +name = "built" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9c056b9ed43aee5e064b683aa1ec783e19c6acec7559e3ae931b7490472fbe" +dependencies = [ + "cargo-lock", +] + +[[package]] +name = "built" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cargo-lock" +version = "8.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" +dependencies = [ + "semver", + "serde", + "toml 0.5.11", + "url", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cfg-expr" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "exr" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast_image_resize" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d450fac8a334ad72825596173f0f7767ff04dd6e3d59c49c894c4bc2957e8b" +dependencies = [ + "cfg-if", + "num-traits", + "thiserror", +] + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[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 = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b4f005360d32e9325029b38ba47ebd7a56f3316df09249368939562d518645" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "image-webp", + "num-traits", + "png", + "qoi", + "ravif", + "rayon", + "rgb", + "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba6107a25f04af48ceeb4093eebc9b405ee5a1813a0bab5ecf1805d3eabb3337" +dependencies = [ + "byteorder", + "thiserror", +] + +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[package]] +name = "indexmap" +version = "2.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indoc" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kornia-py" +version = "0.1.2" +dependencies = [ + "anyhow", + "kornia-rs", + "numpy", + "pyo3", +] + +[[package]] +name = "kornia-rs" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feee33cc9f9cbe8b17bd9d2151b1bb10a2b61585d961899d4d3164a30bcb08b9" +dependencies = [ + "anyhow", + "fast_image_resize", + "image", + "memmap2", + "ndarray", + "num-traits", + "turbojpeg", +] + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + +[[package]] +name = "libfuzzer-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf184a4b6b274f82a5df6b357da6055d3e82272327bba281c28bbba6f1664ef" +dependencies = [ + "arbitrary 0.4.7", + "cc", +] + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary 1.3.2", + "cc", + "once_cell", +] + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + +[[package]] +name = "matrixmultiply" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +dependencies = [ + "autocfg", + "rawpointer", +] + +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ndarray" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" +dependencies = [ + "matrixmultiply", + "num-complex", + "num-integer", + "num-traits", + "rawpointer", + "rayon", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +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-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "numpy" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef41cbb417ea83b30525259e30ccef6af39b31c240bda578889494c5392d331" +dependencies = [ + "libc", + "ndarray", + "num-complex", + "num-integer", + "num-traits", + "pyo3", + "rustc-hash", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pkg-config" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" + +[[package]] +name = "png" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +dependencies = [ + "bitflags", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pyo3" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rav1e" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16c383692a5e7abd9f6d1eddb1a5e0269f859392387883361bb09e5555852ec1" +dependencies = [ + "arbitrary 0.4.7", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io 1.10.0", + "built 0.5.2", + "cfg-if", + "interpolate_name", + "itertools 0.10.5", + "libc", + "libfuzzer-sys 0.3.5", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive 0.3.3", + "num-traits", + "once_cell", + "paste", + "rand", + "rand_chacha", + "rust_hawktracer", + "rustc_version", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary 1.3.2", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io 2.2.0", + "built 0.7.1", + "cfg-if", + "interpolate_name", + "itertools 0.12.1", + "libc", + "libfuzzer-sys 0.4.7", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive 0.4.2", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", +] + +[[package]] +name = "ravif" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d44feba0b8a381a5efa2c0baf8dace8418904403260233f4a614503b018fc288" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e 0.6.6", + "rav1e 0.7.1", + "rayon", + "rgb", +] + +[[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + +[[package]] +name = "rayon" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "rust_hawktracer" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3480a29b927f66c6e06527be7f49ef4d291a01d694ec1fe85b0de71d6b02ac1" +dependencies = [ + "rust_hawktracer_normal_macro", + "rust_hawktracer_proc_macro", +] + +[[package]] +name = "rust_hawktracer_normal_macro" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a570059949e1dcdc6f35228fa389f54c2c84dfe0c94c05022baacd56eacd2e9" + +[[package]] +name = "rust_hawktracer_proc_macro" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb626abdbed5e93f031baae60d72032f56bc964e11ac2ff65f2ba3ed98d6d3e1" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml 0.8.10", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" + +[[package]] +name = "thiserror" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "turbojpeg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5080f5adaa92c82bf84f825dd092e9692c923ee652f1634835e9a1f372518d" +dependencies = [ + "libc", + "thiserror", + "turbojpeg-sys", +] + +[[package]] +name = "turbojpeg-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fa6daade3b979fb7454cce5ebcb9772ce7a1cf476ea27ed20ed06e13d9bc983" +dependencies = [ + "anyhow", + "cmake", + "libc", + "pkg-config", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kornia-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kornia-rs/default.nix new file mode 100644 index 0000000000..f493d74a6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/kornia-rs/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildPythonPackage +, rustPlatform +, cmake +, nasm +, substituteAll +, libiconv +}: + +buildPythonPackage rec { + pname = "kornia-rs"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kornia"; + repo = "kornia-rs"; + rev = "refs/tags/v${version}"; + hash = "sha256-7toCMaHzFAzm6gThVLBxKLgQVgFJatdJseDlfdeS8RE="; + }; + + nativeBuildInputs = [ + rustPlatform.maturinBuildHook + rustPlatform.cargoSetupHook + cmake # Only for dependencies. + nasm # Only for dependencies. + ]; + + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; + + cargoRoot = "py-kornia"; + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + # The path dependency doesn't vendor the dependencies correctly, so get kornia-rs from crates instead. + patches = [ + (substituteAll { + src = ./kornia-rs-from-crates.patch; + inherit version; + }) + ]; + + prePatch = '' + cp ${./Cargo.lock} py-kornia/Cargo.lock + ''; + + maturinBuildFlags = [ "-m" "py-kornia/Cargo.toml" ]; + + dontUseCmakeConfigure = true; # We only want to use CMake to build some Rust dependencies. + + meta = with lib; { + homepage = "https://github.com/kornia/kornia-rs"; + description = "Python bindings to Low-level Computer Vision library in Rust"; + license = licenses.asl20; + maintainers = with maintainers; [ chpatrick ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kornia-rs/kornia-rs-from-crates.patch b/third_party/nixpkgs/pkgs/development/python-modules/kornia-rs/kornia-rs-from-crates.patch new file mode 100644 index 0000000000..4745f9ab9f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/kornia-rs/kornia-rs-from-crates.patch @@ -0,0 +1,12 @@ +diff --git a/py-kornia/Cargo.toml b/py-kornia/Cargo.toml +index e0563f3..e192654 100644 +--- a/py-kornia/Cargo.toml ++++ b/py-kornia/Cargo.toml +@@ -9,6 +9,6 @@ crate-type = ["cdylib"] + + [dependencies] + anyhow = "1.0.80" +-kornia-rs = { path = ".." } ++kornia-rs = { version = "@version@" } + pyo3 = { version = "0.20", features = ["extension-module"] } + numpy = { version = "0.20.0" } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kornia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kornia/default.nix index a00b3d6487..0663cfecea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kornia/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kornia/default.nix @@ -4,11 +4,12 @@ , pythonOlder , packaging , torch +, kornia-rs }: buildPythonPackage rec { pname = "kornia"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,10 +18,11 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gHMrA4Uzazpw4TdswrXdoZG4+ek5g+wtLXNmhH3SlOM="; + hash = "sha256-DmXttvKoLqny0mt3SUonidNxDkNX7N0LdTxy/H32R/4="; }; propagatedBuildInputs = [ + kornia-rs packaging torch ]; @@ -39,7 +41,6 @@ buildPythonPackage rec { "kornia.metrics" "kornia.morphology" "kornia.tracking" - "kornia.testing" "kornia.utils" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kserve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kserve/default.nix new file mode 100644 index 0000000000..2bbfd3a807 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/kserve/default.nix @@ -0,0 +1,119 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, deprecation +, poetry-core +, pythonRelaxDepsHook +, async-timeout +, cloudevents +, fastapi +, grpcio +, httpx +, kubernetes +, numpy +, orjson +, pandas +, prometheus-client +, protobuf +, psutil +, python-dateutil +, ray +, six +, tabulate +, timing-asgi +, uvicorn +, avro +, azure-storage-blob +, azure-storage-file-share +, boto3 +, botocore +, google-cloud-storage +, pytestCheckHook +, tomlkit +}: + +buildPythonPackage rec { + pname = "kserve"; + version = "0.12.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kserve"; + repo = "kserve"; + rev = "refs/tags/v${version}"; + hash = "sha256-gKJkG8zJY1sGGpI27YZ/QnEPU8J7KHva3nI+JCglQaQ="; + }; + + sourceRoot = "${src.name}/python/kserve"; + + build-system = [ + deprecation + poetry-core + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + dependencies = [ + async-timeout + cloudevents + fastapi + grpcio + httpx + kubernetes + numpy + orjson + pandas + prometheus-client + protobuf + psutil + python-dateutil + ray + six + tabulate + timing-asgi + uvicorn + ] ++ ray.passthru.optional-dependencies.serve-deps; + + pythonRelaxDeps = [ + "fastapi" + "httpx" + "prometheus-client" + "protobuf" + "ray" + "uvicorn" + ]; + + pythonImportsCheck = [ "kserve" ]; + + nativeCheckInputs = [ + avro + azure-storage-blob + azure-storage-file-share + boto3 + botocore + google-cloud-storage + pytestCheckHook + tomlkit + ]; + + disabledTestPaths = [ + # Looks for a config file at the root of the repository + "test/test_inference_service_client.py" + ]; + + disabledTests = [ + # Require network access + "test_health_handler" + "test_infer" + "test_infer_v2" + ]; + + meta = with lib; { + description = "Standardized Serverless ML Inference Platform on Kubernetes"; + homepage = "https://github.com/kserve/kserve/tree/master/python/kserve"; + license = licenses.asl20; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lacuscore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lacuscore/default.nix index 950c215e90..d03376184b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lacuscore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lacuscore/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.9.2"; + version = "1.9.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-vfhRbbutNuZW/oI/eCJUXydCn47ThOlWRz2NJJrE3Tw="; + hash = "sha256-jfbDg74vHwOFvbOETPSaApFCpzw9Khu8PgGpsoAwSGc="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix index 472022947f..e8e028570a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.0.33"; + version = "0.0.38"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_community"; inherit version; - hash = "sha256-u1bbwe8RygnyWEaOETaHga3akhnhRAc+MM2mlJbTQrI="; + hash = "sha256-En/Et1vGe2L+gnxmwC5xWnMP74/mm9ICPUZrqwa1gQ0="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix index 32c0daba43..8cfa8cafd9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.44"; + version = "0.1.52"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_core"; inherit version; - hash = "sha256-4xOXXZrikmNC5vKtdgM40x8YsSI+m4tNxAja7q3kaoM="; + hash = "sha256-CEw/xFL1ppZsKKs+xdvIuNJvw/YzeAc5KPTinZC2OT8="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain/default.nix index 48c2c0db93..804f63a88e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.1.16"; + version = "0.1.52"; pyproject = true; disabled = pythonOlder "3.8"; @@ -59,8 +59,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/v${version}"; - hash = "sha256-Xv8juma/1qGC2Rb659dJBvRzRh5W+zU+O8W6peElFGc="; + rev = "refs/tags/langchain-core==${version}"; + hash = "sha256-H8rtysRIwyuJEUFI93vid3MsqReyRCER88xztsuYpOc="; }; sourceRoot = "${src.name}/libs/langchain"; @@ -158,6 +158,10 @@ buildPythonPackage rec { # AssertionErrors "test_callback_handlers" "test_generic_fake_chat_model" + # Test is outdated + "test_serializable_mapping" + "test_person" + "test_aliases_hidden" ]; pythonImportsCheck = [ "langchain" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix index d77c613384..fe26d306a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix @@ -1,12 +1,14 @@ { lib, stdenv, + anthropic, attr, buildPythonPackage, fastapi, fetchFromGitHub, freezegun, httpx, + instructor, orjson, poetry-core, pydantic, @@ -20,7 +22,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.48"; + version = "0.1.57"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +31,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-n24rlulncJHNyHFqszEbALGfnT7+tTGjLjwR7Fw1smI="; + hash = "sha256-L725AfkmBEe44LkJ0y6PdDvbnbCf31LXL3YdnOshnqE="; }; sourceRoot = "${src.name}/python"; @@ -48,9 +50,11 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + anthropic fastapi freezegun httpx + instructor pytest-asyncio pytestCheckHook uvicorn @@ -81,6 +85,7 @@ buildPythonPackage rec { "tests/unit_tests/test_client.py" # Tests require a Langsmith API key "tests/evaluation/test_evaluation.py" + "tests/external/test_instructor_evals.py" ]; pythonImportsCheck = [ "langsmith" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/language-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/language-data/default.nix index ff04b036dc..da1a354561 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/language-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/language-data/default.nix @@ -1,45 +1,39 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, marisa-trie -, poetry-core -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + marisa-trie, + pythonOlder, + setuptools-scm, }: buildPythonPackage rec { pname = "language-data"; - version = "1.0.1"; - format = "pyproject"; + version = "1.2.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "rspeer"; + owner = "georgkrause"; repo = "language_data"; - rev = "v${version}"; - sha256 = "51TUVHXPHG6ofbnxI6+o5lrtr+QCIpGKu+OjDK3l7Mc="; + rev = "refs/tags/v${version}"; + hash = "sha256-TVWyDEDI6NBioc8DqhXzpLS22EFKsZ/nan2vfgFsieQ="; }; - nativeBuildInputs = [ - poetry-core - setuptools - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ - marisa-trie - ]; + dependencies = [ marisa-trie ]; - # Module has no tests + pythonImportsCheck = [ "language_data" ]; + + # No unittests doCheck = false; - pythonImportsCheck = [ - "language_data" - ]; - meta = with lib; { description = "Supplement module for langcodes"; - homepage = "https://github.com/rspeer/language_data"; + homepage = "https://github.com/georgkrause/language_data"; + changelog = "https://github.com/georgkrause/language_data/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix index 93c900e307..ef25181892 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://lark-parser.readthedocs.io/"; changelog = "https://github.com/lark-parser/lark/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ fridh drewrisinger ]; + maintainers = with maintainers; [ drewrisinger ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/latex2mathml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/latex2mathml/default.nix index 99d9dcc5fb..0cf0276a73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/latex2mathml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/latex2mathml/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "latex2mathml"; version = "3.77.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -21,9 +22,7 @@ buildPythonPackage rec { hash = "sha256-DLdSFMsNA0gD6Iw0kn+0IrbvyI0VEGOpz0ZYD48nRkY="; }; - format = "pyproject"; - - nativeBuildInputs = [ + build-system = [ poetry-core ]; @@ -45,6 +44,7 @@ buildPythonPackage rec { homepage = "https://github.com/roniemartinez/latex2mathml"; changelog = "https://github.com/roniemartinez/latex2mathml/releases/tag/${version}"; license = licenses.mit; + mainProgram = "latex2mathml"; maintainers = with maintainers; [ sfrijters ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix index 02acb86b60..aef2dfb98b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "Script Launchpad through its web services interfaces. Officially supported"; homepage = "https://help.launchpad.net/API/launchpadlib"; license = licenses.lgpl3Only; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix index 99887e4ba8..b8e46b8d1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "A programmable client library that takes advantage of the commonalities among"; homepage = "https://launchpad.net/lazr.restfulclient"; license = licenses.lgpl3; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazr-uri/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazr-uri/default.nix index 4ba3b5d1cd..604086ebca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazr-uri/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazr-uri/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "A self-contained, easily reusable library for parsing, manipulating"; homepage = "https://launchpad.net/lazr.uri"; license = licenses.lgpl3; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ldappool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldappool/default.nix index 2cb2155bfe..3d56668c88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ldappool/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ldappool/default.nix @@ -1,42 +1,56 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pbr -, python-ldap -, prettytable -, six -, fixtures -, testresources -, testtools +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pbr, + python-ldap, + prettytable, + six, + unittestCheckHook, + fixtures, + testresources, + testtools, }: buildPythonPackage rec { pname = "ldappool"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "ldappool"; inherit version; - sha256 = "4bb59b7d6b11407f48ee01a781267e3c8ba98d91f426806ac7208612ae087b86"; + hash = "sha256-S7WbfWsRQH9I7gGngSZ+PIupjZH0JoBqxyCGEq4Ie4Y="; }; - postPatch = '' - # Tests run without most of the dependencies - echo "" > test-requirements.txt - # PrettyTable is now maintained again - substituteInPlace requirements.txt --replace "PrettyTable<0.8,>=0.7.2" "PrettyTable" - ''; + build-system = [ + setuptools + pbr + ]; - nativeBuildInputs = [ pbr ]; + dependencies = [ + python-ldap + prettytable + six + ]; - propagatedBuildInputs = [ python-ldap prettytable six ]; + nativeCheckInputs = [ + unittestCheckHook + fixtures + testresources + testtools + ]; - nativeCheckInputs = [ fixtures testresources testtools ]; + pythonImportsCheck = [ "ldappool" ]; meta = with lib; { description = "A simple connector pool for python-ldap"; homepage = "https://opendev.org/openstack/ldappool/"; - license = with licenses; [ mpl11 lgpl21Plus gpl2Plus ]; + license = with licenses; [ + mpl11 + lgpl21Plus + gpl2Plus + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ldfparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldfparser/default.nix index d012e32da0..c6c83aa64b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ldfparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ldfparser/default.nix @@ -1,18 +1,19 @@ -{ lib -, bitstruct -, buildPythonPackage -, fetchFromGitHub -, jinja2 -, jsonschema -, lark -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + bitstruct, + buildPythonPackage, + fetchFromGitHub, + jinja2, + jsonschema, + lark, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "ldfparser"; - version = "0.24.0"; + version = "0.25.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,14 +22,12 @@ buildPythonPackage rec { owner = "c4deszes"; repo = "ldfparser"; rev = "refs/tags/v${version}"; - hash = "sha256-+7L2WCQEDpWPDBPVt4ddoz0U4YkJ9GqQqp0cKj2fAXM="; + hash = "sha256-SZ9mWV5PjkQ2OiScPSMrunkKQWmuYW2lB2JvpTGNbY4="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ bitstruct jinja2 lark @@ -39,9 +38,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "ldfparser" - ]; + pythonImportsCheck = [ "ldfparser" ]; disabledTestPaths = [ # We don't care about benchmarks @@ -50,10 +47,10 @@ buildPythonPackage rec { meta = with lib; { description = "LIN Description File parser written in Python"; - mainProgram = "ldfparser"; homepage = "https://github.com/c4deszes/ldfparser"; changelog = "https://github.com/c4deszes/ldfparser/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "ldfparser"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix index 9342f8d3b5..4e93a641cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix @@ -12,24 +12,38 @@ , pycrypto , pycryptodomex , pyelftools +, python-gnupg , python-u2flib-host , pythonOlder +, pythonRelaxDepsHook +, setuptools +, setuptools-scm , websocket-client }: buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.48"; - format = "setuptools"; + version = "0.1.53"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LVRNcsTmJOR3zTBhbKV4V0zCQk0sk/Uf6kSmfbAhgfY="; + hash = "sha256-j5FCQnp+MNrJ8zgYeLRuWF+Gdq0FwJeBYyJALb+H8So="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "protobuf" + ]; + + dependencies = [ ecpy future hidapi @@ -39,6 +53,7 @@ buildPythonPackage rec { pycrypto pycryptodomex pyelftools + python-gnupg python-u2flib-host websocket-client ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix index 453ec1be90..a7913fd5b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix @@ -1,19 +1,20 @@ -{ lib -, stdenv -, buildPythonPackage -, cmake -, cython -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, rapidfuzz -, rapidfuzz-cpp -, scikit-build +{ + lib, + stdenv, + buildPythonPackage, + cmake, + cython, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + rapidfuzz, + rapidfuzz-cpp, + scikit-build, }: buildPythonPackage rec { pname = "levenshtein"; - version = "0.25.0"; + version = "0.25.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,8 +23,8 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "refs/tags/v${version}"; - hash = "sha256-MkzIwTZU8hqPDOlfN4qADCKjGJIQrNhhOmVRAnAfNK0="; - fetchSubmodules = true; ## for vendored `rapidfuzz-cpp` + hash = "sha256-ye2XQL/ZQPlA4dy3tlr03WyGhfl7SaOXMt10cWHnW5o="; + fetchSubmodules = true; # # for vendored `rapidfuzz-cpp` }; nativeBuildInputs = [ @@ -34,25 +35,19 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - buildInputs = [ - rapidfuzz-cpp - ]; + buildInputs = [ rapidfuzz-cpp ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ - "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 - ]); + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ + "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 + ] + ); - propagatedBuildInputs = [ - rapidfuzz - ]; + dependencies = [ rapidfuzz ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "Levenshtein" - ]; + pythonImportsCheck = [ "Levenshtein" ]; meta = with lib; { description = "Functions for fast computation of Levenshtein distance and string similarity"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lib4sbom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lib4sbom/default.nix new file mode 100644 index 0000000000..0840b14c70 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/lib4sbom/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyyaml +, semantic-version +, defusedxml +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "lib4sbom"; + version = "0.7.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "anthonyharrison"; + repo = pname; + rev = "v${version}"; + hash = "sha256-UQZZYTRDbUqSH6F8hjhp9L70025cRO3zXQ8Aoznotg4="; + }; + + dependencies = [ + pyyaml + semantic-version + defusedxml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # stub tests that always fail + "TestCycloneDXGenerator" + "TestCcycloneDX_parser" + "TestGenerator" + "TestOutput" + "TestParser" + "TestSPDX_Generator" + "TestSPDX_Parser" + # tests with missing getters + "test_set_downloadlocation" + "test_set_homepage" + "test_set_checksum" + "test_set_externalreference" + # checks for invalid return type + "test_set_type" + # wrong capilatization + "test_set_supplier" + "test_set_originator" + ]; + + pythonImportsCheck = [ "lib4sbom" ]; + + meta = with lib; { + description = "Library to ingest and generate SBOMs"; + homepage = "https://github.com/anthonyharrison/lib4sbom"; + license = licenses.asl20; + maintainers = with maintainers; [ teatwig ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libgravatar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libgravatar/default.nix new file mode 100644 index 0000000000..f246f61a75 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/libgravatar/default.nix @@ -0,0 +1,30 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication rec { + pname = "libgravatar"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "pabluk"; + repo = "libgravatar"; + rev = "refs/tags/${version}"; + hash = "sha256-rJv/jfdT+JldxR0kKtXQLOI5wXQYSQRWJnqwExwWjTA="; + }; + + nativeBuildInputs = with python3Packages; [ setuptools ]; + + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + + pythonImportsCheck = [ "libgravatar" ]; + + meta = with lib; { + homepage = "https://github.com/pabluk/libgravatar"; + description = "A library that provides a Python 3 interface for the Gravatar API"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libmambapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libmambapy/default.nix new file mode 100644 index 0000000000..0466bebfe3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/libmambapy/default.nix @@ -0,0 +1,93 @@ +{ + lib, + fetchFromGitHub, + pythonPackages, + buildPythonPackage, + cmake, + ninja, + libmamba, + pybind11, + setuptools, + fmt, + spdlog, + tl-expected, + nlohmann_json, + yaml-cpp, + reproc, + libsolv, + curl, + zstd, + bzip2, + wheel, +}: +buildPythonPackage rec { + pname = "libmambapy"; + version = "1.5.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mamba-org"; + repo = "mamba"; + rev = "${pname}-${version}"; + hash = "sha256-HfmvLi9IBWlaGAn2Ej4Bnm4b3l19jEXwNl5IUkdVxi0="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + (libmamba.override { python3Packages = pythonPackages; }) + pybind11 + fmt + spdlog + tl-expected + nlohmann_json + yaml-cpp + reproc + libsolv + curl + zstd + bzip2 + ]; + + build-system = [ + setuptools + wheel + ]; + + # patch needed to fix setuptools errors + # see these for reference + # https://stackoverflow.com/questions/72294299/multiple-top-level-packages-discovered-in-a-flat-layout + # https://github.com/pypa/setuptools/issues/3197#issuecomment-1078770109 + postPatch = '' + substituteInPlace libmambapy/setup.py --replace-warn "setuptools.setup()" "setuptools.setup(py_modules=[])" + ''; + + cmakeFlags = [ + "-GNinja" + (lib.cmakeBool "BUILD_LIBMAMBAPY" true) + ]; + + buildPhase = '' + ninjaBuildPhase + cp -r libmambapy ../libmambapy + cd ../libmambapy + pypaBuildPhase + ''; + + pythonRemoveDeps = [ "scikit-build" ]; + + pythonImportsCheck = [ + "libmambapy" + "libmambapy.bindings" + ]; + + meta = { + description = "The python library for the fast Cross-Platform Package Manager"; + homepage = "https://github.com/mamba-org/mamba"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.ericthemagician ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libpcap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libpcap/default.nix index 2da09a58df..54a1306594 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libpcap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libpcap/default.nix @@ -7,11 +7,12 @@ , pkgsLibpcap , pkg-about , setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "libpcap"; - version = "1.11.0b7"; + version = "1.11.0b8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-gEWFqmeOJTVHdjcSOxfVLZtrNSO3CTY1L2VcXOu7q7k="; + hash = "sha256-6XhEVOO2Z2rFZiMz4d32tTR+xUu1KdMdDjChmt2wsQo="; }; nativeBuildInputs = [ @@ -29,7 +30,7 @@ buildPythonPackage rec { # tox is listed in build requirements but not actually used to build # keeping it as a requirement breaks the build unnecessarily postPatch = '' - sed -i "/requires/s/, 'tox>=3.25.1'//" pyproject.toml + sed -i "/requires/s/, 'tox>=[^']*'//" pyproject.toml cat <src/libpcap/libpcap.cfg [libpcap] LIBPCAP = ${pkgsLibpcap}/lib/libpcap${stdenv.hostPlatform.extensions.sharedLibrary} @@ -42,8 +43,15 @@ buildPythonPackage rec { pkg-about ]; - # Project has tests, but I can't get them to run even outside of nix - doCheck = false; + preCheck = '' + pushd tests + ''; + postCheck = '' + popd + ''; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "libpcap" @@ -61,6 +69,7 @@ buildPythonPackage rec { It is fully compliant implementation of the original C libpcap from 1.0.0 up to 1.9.0 API and the WinPcap’s 4.1.3 libpcap (1.0.0rel0b) API by implementing whole its functionality in a clean Python instead of C. ''; homepage = "https://github.com/karpierz/libpcap/"; + changelog = "https://github.com/karpierz/libpcap/blob/${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = teams.ororatech.members; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix index 042fd5d404..c339a77080 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "libretranslate"; - version = "1.5.6"; + version = "1.5.7"; pyproject = true; src = fetchFromGitHub { owner = "LibreTranslate"; repo = "LibreTranslate"; rev = "refs/tags/v${version}"; - hash = "sha256-43VnxgtapMRKyXxqsvBgSMUxvpbLI+iOfW3FA0/POpE="; + hash = "sha256-lOVi/809ig+KtiNwdt9Wovn+2Q8I6amps1sZ5JJy7WE="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix index 62d712aa7b..77bfb6aeca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch # build-system , setuptools @@ -34,7 +33,7 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.10.1"; + version = "0.10.2"; format = "pyproject"; src = fetchFromGitHub { @@ -42,26 +41,16 @@ buildPythonPackage rec { repo = "librosa"; rev = "refs/tags/${version}"; fetchSubmodules = true; # for test data - hash = "sha256-zbmU87hI9A1CVcBZ/5FU8z0t6SS4jfJk9bj9kLe/EHI="; + hash = "sha256-zUKljPKWOhyb3Zv4KEUcvLsVkxVhL+rzErKycAl6jIg="; }; nativeBuildInputs = [ setuptools ]; - patches = [ - (fetchpatch { - # https://github.com/librosa/librosa/issues/1754 - # https://github.com/librosa/librosa/pull/1755 - name = "matplotlib-3.8-compat.patch"; - url = "https://github.com/librosa/librosa/commit/beef47885ce1255b43b65e48ea2054ddace37c6c.patch"; - hash = "sha256-rrnlUHXHY2me4BWGs3wFq8WJmz75CbXTWKFp3VdJKzE="; - }) - ]; - postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov-report term-missing --cov librosa --cov-report=xml " "" + --replace-fail "--cov-report term-missing --cov librosa --cov-report=xml " "" ''; propagatedBuildInputs = [ @@ -107,11 +96,20 @@ buildPythonPackage rec { "test_example" "test_example_info" "test_load_resample" - # does not converge - "test_nnls_vector" + "test_cite_released" + "test_cite_badversion" + "test_cite_unreleased" ] ++ lib.optionals stdenv.isDarwin [ - # https://github.com/librosa/librosa/pull/1808 - "test_pyin_multi_center" + # crashing the python interpreter + "test_unknown_time_unit" + "test_unknown_wavaxis" + "test_waveshow_unknown_wavaxis" + "test_waveshow_bad_maxpoints" + "test_waveshow_deladaptor" + "test_waveshow_disconnect" + "test_unknown_axis" + "test_axis_bound_warning" + "test_auto_aspect" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix index 3af06818b8..7dba0a125f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast # build , setuptools @@ -16,21 +17,21 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.10.1"; - format = "pyproject"; + version = "0.11.2"; + pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-kP7BllA9FR/nMNTxRCxmG6IJYHz/Nxqb1HoF9KxuKl8="; + hash = "sha256-IT9aRAUNc2cP2erLr0MglZSVLfDjOxg8PVIIe9AvO0o="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ packaging typing-extensions ]; @@ -53,6 +54,8 @@ buildPythonPackage rec { # fails another test "lightning_utilities.core.imports.ModuleAvailableCache" "lightning_utilities.core.imports.requires" + # Failed: DID NOT RAISE + "test_no_warning_call" ]; disabledTestPaths = [ @@ -71,6 +74,7 @@ buildPythonPackage rec { description = "Common Python utilities and GitHub Actions in Lightning Ecosystem"; homepage = "https://github.com/Lightning-AI/utilities"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ GaetanLepage ]; + broken = pythonAtLeast "3.12"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/line-profiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/line-profiler/default.nix index f8a3c5378b..73fa920139 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/line-profiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/line-profiler/default.nix @@ -60,6 +60,5 @@ buildPythonPackage rec { homepage = "https://github.com/pyutils/line_profiler"; changelog = "https://github.com/pyutils/line_profiler/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/linknlink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/linknlink/default.nix index 44a2a15a8f..2fd6c15d6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/linknlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/linknlink/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchFromGitHub -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + cryptography, + fetchFromGitHub, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "linknlink"; - version = "0.2.1"; + version = "0.2.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,20 +18,14 @@ buildPythonPackage rec { owner = "xuanxuan000"; repo = "python-linknlink"; rev = "refs/tags/${version}"; - hash = "sha256-MOZw+7oFHeH7Vaj6pylR7wqe3ZyHcsiG+n8jnRAQ8PA="; + hash = "sha256-ObPEcdDHi+SPFjuVKBtu7/5/IgHcam+IWblxxS3+mmI="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - cryptography - ]; + dependencies = [ cryptography ]; - pythonImportsCheck = [ - "linknlink" - ]; + pythonImportsCheck = [ "linknlink" ]; # Module has no test doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/litellm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/litellm/default.nix index 1d69fdd32a..32bf379800 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/litellm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/litellm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.35.15"; + version = "1.36.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-cjOUInHaGD+E31D3BbwfgeA4229drOm69ltjU4x9F9o="; + hash = "sha256-OGu3+E3T8EpKVVqndgmJwTftWcfLbKId/PmVz7dk3x8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-agent-openai/default.nix index 1f8de109b1..09f2d54922 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-agent-openai"; - version = "0.2.2"; + version = "0.2.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_agent_openai"; inherit version; - hash = "sha256-EgY92TLHQBV5b5c5hsxS14P1H9o45OrXKlbQ/RlZJe4="; + hash = "sha256-zUpY+L8jNyjO2lVMuzTeVqK2u7v/bOgBw/j/DIKAv1U="; }; pythonRelaxDeps = [ "llama-index-llms-openai" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix index ee75e7e668..c5043d3d4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix @@ -44,7 +44,7 @@ in buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.30"; + version = "0.10.36"; pyproject = true; disabled = pythonOlder "3.8"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-MM7LKZzKohtKJAdFGgORqvSVFhOscbECYkLrANc4aLk="; + hash = "sha256-yP/60DLg43UOOogxbDvb1p5n8dnfBUjGhcfO5g5g0gA="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix index d15b27e075..22b2b9f675 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchPypi -, llama-index-core -, poetry-core -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + llama-index-core, + poetry-core, + pythonOlder, }: buildPythonPackage rec { pname = "llama-index-embeddings-openai"; - version = "0.1.8"; + version = "0.1.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,23 +17,17 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_openai"; inherit version; - hash = "sha256-quTOPsL+LLYE2URkaYLHFmOouZ7V+MNwgj7oLu9N3Ts="; + hash = "sha256-D9KSsvmgrUU0p5DWN0cmvIhYUxiAh+sBgWfc8jlkOSQ="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; - dependencies = [ - llama-index-core - ]; + dependencies = [ llama-index-core ]; # Tests are only available in the mono repo doCheck = false; - pythonImportsCheck = [ - "llama_index.embeddings.openai" - ]; + pythonImportsCheck = [ "llama_index.embeddings.openai" ]; meta = with lib; { description = "LlamaIndex Embeddings Integration for OpenAI"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index b0bc2e6f2d..f6eb083b39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchPypi -, poetry-core -, llama-index-core -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + llama-index-core, + pythonOlder, }: buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.1.5"; + version = "0.1.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,23 +17,17 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-R83enwa73dUI8O/PQd5CXoUXGsLI/ail+yqJZz4cjHE="; + hash = "sha256-dLOw6ev500jTBU+fwMZXAxrM65NRwxEWrY1aeuRyn1w="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; - dependencies = [ - llama-index-core - ]; + dependencies = [ llama-index-core ]; # Tests are only available in the mono repo doCheck = false; - pythonImportsCheck = [ - "llama_index.indices.managed.llama_cloud" - ]; + pythonImportsCheck = [ "llama_index.indices.managed.llama_cloud" ]; meta = with lib; { description = "LlamaCloud Index and Retriever"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index dd1ccf563b..a96b2f57c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-GexyfQSMhzkV1bA32aL+lWUgwBmxHXq4w8QG3RHzTks="; + hash = "sha256-x5ZlS3PRA/kyTtTFXHbEm3NzirxuUNAllu1eKxxm3sU="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 288fa1d35c..a6987b224f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.1.16"; + version = "0.1.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-MTu8F8JBmSQwpr9oahse3EJ2yCVq1rBVCqG+oeD+0aY="; + hash = "sha256-9htkqZeJLkJPs81UcJDSecWyEO8VthT8Od6FTTzKp+c="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index 389f2c6fe7..76fa73298c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.1.5"; + version = "0.1.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-miN/T4htHiDCfpST6As+H4dThZSB/xtY/iW3qjmxmKI="; + hash = "sha256-EN51qHekRK81MGOF+q2bnwYkOR5VMJlwVkEUoICgV4w="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-program-openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-program-openai/default.nix index 70640d4a4b..4f8ca5ae68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-program-openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-program-openai"; - version = "0.1.5"; + version = "0.1.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_program_openai"; inherit version; - hash = "sha256-wzqi0odq0P8fmip1XU59SRckCEfQF057LQuEdEmbtwA="; + hash = "sha256-xqSYDF6oJgiLKLTe4zZ+2yAiHm0F6w4FAZBJGQEx13I="; }; pythonRelaxDeps = [ @@ -28,6 +28,9 @@ buildPythonPackage rec { build-system = [ poetry-core + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-readers-database/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-readers-database/default.nix index 7b01a5738b..d7aa3bf51e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-readers-database/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-readers-database/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-database"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_database"; inherit version; - hash = "sha256-1J6FE6iID4U9cEcPPUK5CvCTmbgVWxI4AFLrx+gPGWg="; + hash = "sha256-x71+szDNDZNaVc8AMXruKvxSNXg561ibE2+kx53zHfI="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-readers-file/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-readers-file/default.nix index 999fb90408..d0f42bec9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.1.19"; + version = "0.1.22"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-GUwbm4XCZRWbcwLH2ArbqTeqsG8FwXCvf9lcTnqK7DU="; + hash = "sha256-N95UrQz73GB8GVUyuaKSQXpHFPV3c1cLhwJ7jcOB8OI="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index 8c54630743..de65df2055 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.1.6"; + version = "0.1.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-bf89ydecQDn6Rs1Sjl5Lbe1kc+XvYyQkE0SRAH2k69s="; + hash = "sha256-nFdLrzcPr0Vry2e51eonOm+h8rT9IFpZxHtoESNkuec="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index e81dd0ab4d..15fcab2b31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.1.5"; + version = "0.1.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-9jE+1Gbx2y/CSqkpSfuYqgyX49yZwhwmJbiG/EHwTLw="; + hash = "sha256-00ccEfjYY8qrNYymHQ5w43w8zAHUAntO6oiwYUwaOVw="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index 46ba1221f3..0f9459ac2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.2.1"; + version = "0.2.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-begHJBxdu+19LIoNgAd3Gnei2TQqpEU3gd6cVrv0zGw="; + hash = "sha256-qeKV7jlBTujUEYMcPCS+PAD6xRlTBVi/DGJZ/MSN64A="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix index 05a80dcd08..1f6183df9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-1yOvhNah/JnrQxkV0hhl0gt22KJG26oSTR+WyVamRPc="; + hash = "sha256-+gTAlzCxAhVfZQXenPkZmMhtM0WB8PEll8XrR8pduFk="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llamaindex-py-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llamaindex-py-client/default.nix index 46af937a38..65b897bfef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llamaindex-py-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llamaindex-py-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llamaindex-py-client"; - version = "0.1.18"; + version = "0.1.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llamaindex_py_client"; inherit version; - hash = "sha256-CR7kmpJZLjiUd3reElFsITcJP51kQaVJ9AZGGRfOm34="; + hash = "sha256-c/dHkruMCSuubcYmYnoJrBOgmfqNEPj8yD4XorMyzKc="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix index 2184236130..fb48569895 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix @@ -61,6 +61,5 @@ buildPythonPackage rec { downloadPage = "https://github.com/numba/llvmlite"; homepage = "http://llvmlite.pydata.org/"; license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lmfit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lmfit/default.nix index d96eb4d4c9..5df47bc867 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lmfit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lmfit/default.nix @@ -4,6 +4,7 @@ setuptools, setuptools-scm, asteval, + dill, numpy, scipy, uncertainties, @@ -14,17 +15,17 @@ buildPythonPackage rec { pname = "lmfit"; - version = "1.2.2"; + version = "1.3.0"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-BEoFKhGmHaBXYnRQTBfrfigDtBEo4lgh6WYyIH8jyIw="; + hash = "sha256-foI668BSN8qA0z0mDO27peJhkMzsn69ZXmgUOQneDJM="; }; postPatch = '' - substituteInPlace setup.cfg --replace "--cov=lmfit --cov-report html" "" + substituteInPlace pyproject.toml --replace "--cov=lmfit --cov-report html" "" ''; nativeBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ asteval + dill numpy scipy uncertainties @@ -45,13 +47,6 @@ buildPythonPackage rec { matplotlib ]; - disabledTests = [ - # https://github.com/lmfit/lmfit-py/issues/878 - "test_emcee_multiprocessing" - "test_explicit_independent_vars" - "test_result_eval_custom_x" - ]; - meta = with lib; { description = "Least-Squares Minimization with Bounds and Constraints"; homepage = "https://lmfit-py.readthedocs.io/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/loadcredential/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/loadcredential/default.nix new file mode 100644 index 0000000000..b0cc59754b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/loadcredential/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, +}: + +buildPythonPackage rec { + pname = "loadcredential"; + version = "1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Tom-Hubrecht"; + repo = "loadcredential"; + rev = "v${version}"; + hash = "sha256-GXpMqGLDmDnTGa9cBYe0CP3Evm5sQ3AK9u6k3mLAW34="; + }; + + build-system = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ "loadcredential" ]; + + meta = { + description = "A simple python package to read credentials passed through systemd's LoadCredential, with a fallback on env variables "; + homepage = "https://github.com/Tom-Hubrecht/loadcredential"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thubrecht ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix index 23423950c2..90e743f839 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix @@ -1,26 +1,14 @@ { lib , buildPythonPackage , fetchPypi - -# build-system -, setuptools -, plux - -# dependencies -, cachetools -, click -, cryptography , dill , dnslib , dnspython -, psutil -, python-dotenv -, pyyaml +, plux +, pyaes +, python-jose , requests -, rich -, semver -, stevedore -, tailer +, tabulate # Sensitive downstream dependencies , localstack @@ -28,12 +16,12 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "3.2.0"; - pyproject = true; + version = "2.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-53pbt7kNaYQRsLb+OI8gLwR3cBE18ZKLZmG4aP1/93E="; + hash = "sha256-Ex5ZPlteDaiyex90QumucVdTTbpp9uWiBrvw1kMr++8="; }; postPatch = '' @@ -50,27 +38,15 @@ buildPythonPackage rec { --replace "requests>=2.20.0,<2.26" "requests~=2.20" ''; - nativeBuildInputs = [ - plux - setuptools - ]; - propagatedBuildInputs = [ - cachetools - click - cryptography dill dnslib dnspython plux - psutil - python-dotenv - pyyaml - rich + pyaes + python-jose requests - semver - stevedore - tailer + tabulate ]; pythonImportsCheck = [ "localstack_ext" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix index 13a7914822..6a408c9359 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools , apispec , boto3 , cachetools @@ -21,14 +20,14 @@ buildPythonPackage rec { pname = "localstack"; - version = "3.2.0"; - pyproject = true; + version = "3.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; rev = "refs/tags/v${version}"; - hash = "sha256-r0KRPtsLr6Pyn/va93reLdHHKtiOLB1uflAJ2L/uZmU="; + hash = "sha256-N/Mc1bubCcq38VxUqkO9LGG25pEetEyJ+VJMdg/7hrU="; }; postPatch = '' @@ -38,10 +37,6 @@ buildPythonPackage rec { --replace "boto3>=1.20,<1.25.0" "boto3~=1.20" ''; - nativeBuildInputs = [ - setuptools - ]; - propagatedBuildInputs = [ apispec boto3 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix index 0fb64ad0ba..1ee92f4ce3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix @@ -1,25 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pbr -, nose +, pynose }: buildPythonPackage rec { pname = "lockfile"; version = "0.12.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"; }; - buildInputs = [ pbr ]; - nativeCheckInputs = [ nose ]; + build-system = [ + pbr + setuptools + ]; + + nativeCheckInputs = [ pynose ]; checkPhase = '' + runHook preCheck nosetests + runHook postcheck ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix b/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix index b8fadc0832..3e2797b6d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix @@ -1,19 +1,21 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, setuptools -, importlib-metadata -, mypy-extensions -, typing-extensions -, pytestCheckHook -, pytz +{ + lib, + buildPythonPackage, + fetchPypi, + importlib-metadata, + mypy-extensions, + pytestCheckHook, + pythonAtLeast, + pythonOlder, + pytz, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "logilab-common"; version = "2.0.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -22,17 +24,18 @@ buildPythonPackage rec { hash = "sha256-ojvR2k3Wpj5Ej0OS57I4aFX/cGFVeL/PmT7riCTelws="; }; - nativeBuildInputs = [ - setuptools - ]; + postPatch = lib.optionals (pythonAtLeast "3.12") '' + substituteInPlace logilab/common/testlib.py \ + --replace-fail "_TextTestResult" "TextTestResult" + ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ setuptools mypy-extensions typing-extensions - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; + ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; nativeCheckInputs = [ pytestCheckHook @@ -44,10 +47,11 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Python packages and modules used by Logilab "; - mainProgram = "logilab-pytest"; + description = "Python packages and modules used by Logilab"; homepage = "https://logilab-common.readthedocs.io/"; changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/branch/default/CHANGELOG.md"; license = licenses.lgpl21Plus; + maintainers = with maintainers; [ ]; + mainProgram = "logilab-pytest"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix index 7f35845785..b46ff4b134 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix @@ -3,24 +3,38 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder , redis , redis-server +, setuptools }: buildPythonPackage rec { pname = "logutils"; version = "0.3.5"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "bc058a25d5c209461f134e1f03cab637d66a7a5ccc12e593db56fbb279899a82"; + hash = "sha256-vAWKJdXCCUYfE04fA8q2N9ZqelzMEuWT21b7snmJmoI="; }; - nativeCheckInputs = [ + postPatch = '' + substituteInPlace tests/test_dictconfig.py \ + --replace-fail "assertEquals" "assertEqual" + substituteInPlace tests/test_redis.py \ + --replace-fail "'redis-server'" "'${redis-server}/bin/redis-server'" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ pytestCheckHook redis - redis-server ]; disabledTests = [ @@ -33,9 +47,14 @@ buildPythonPackage rec { "tests/test_redis.py" ]; + pythonImportsCheck = [ + "logutils" + ]; + meta = with lib; { description = "Logging utilities"; homepage = "https://bitbucket.org/vinay.sajip/logutils/"; license = licenses.bsd0; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/loopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/loopy/default.nix index 995c99e100..488d055b72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/loopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/loopy/default.nix @@ -1,39 +1,47 @@ -{ lib -, buildPythonPackage -, codepy -, cgen -, colorama -, fetchFromGitHub -, genpy -, islpy -, mako -, numpy -, pymbolic -, pyopencl -, pyrsistent -, pythonOlder -, pytools +{ + lib, + buildPythonPackage, + codepy, + cgen, + colorama, + fetchFromGitHub, + genpy, + immutables, + islpy, + mako, + numpy, + pymbolic, + pyopencl, + pyrsistent, + pythonOlder, + pytools, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "loopy"; version = "2024.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "inducer"; - repo = pname; + repo = "loopy"; rev = "refs/tags/v${version}"; - hash = "sha256-R0Wry4r8Y7VKqsyrZ3odEOUy4T9di9rFQzq7BD0LG58="; + hash = "sha256-mU8vXEPR88QpJpzXZlZdDhMtlwIx5YpeYhXU8Vw2T9g="; + fetchSubmodules = true; # submodule at `loopy/target/c/compyte` }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ codepy cgen colorama genpy + immutables islpy mako numpy @@ -41,15 +49,22 @@ buildPythonPackage rec { pyopencl pyrsistent pytools + typing-extensions ]; + postConfigure = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "loopy" ]; + # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR doCheck = false; - meta = with lib; { + meta = { description = "A code generator for array-based code on CPUs and GPUs"; homepage = "https://github.com/inducer/loopy"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomasajt ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix index 3d14dbf313..21a2857119 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix @@ -1,42 +1,40 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, requests -, requests-mock +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + requests, + requests-mock, + setuptools, }: buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.5"; - format = "setuptools"; + version = "1.19.6"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Losant"; repo = "losant-rest-python"; - rev = "v${version}"; - hash = "sha256-oYwbCpX2mD1RMk/0ymxaA8NF9kaJ+pGQdUKk3l5Jmrs="; + rev = "refs/tags/v${version}"; + hash = "sha256-sbNR95FhcRhgHh/ulLC8lL6EHal0BBK3wP6i29VElmY="; }; - propagatedBuildInputs = [ - requests - ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook requests-mock ]; - pytestFlagsArray = [ - "tests/losantrest_tests.py" - ]; + pytestFlagsArray = [ "tests/platformrest_tests.py" ]; - pythonImportsCheck = [ - "losantrest" - ]; + pythonImportsCheck = [ "platformrest" ]; meta = with lib; { description = "Python module for consuming the Losant IoT Platform API"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix index a36a70f11b..8123a9967e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "lsassy"; - version = "3.1.10"; + version = "3.1.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Hackndo"; repo = "lsassy"; rev = "refs/tags/v${version}"; - hash = "sha256-Eqparqj1O0gK0MvR4BBkGVNji2WXEnMsdWvKiR6XHFk="; + hash = "sha256-boPFrmPqaHpezxXM3VM50i+n+n+gXkuwP4ErpMpN/AI="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix index 48a4cba83d..8b87fc606c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchPypi -, openssl -, parameterized -, pytestCheckHook -, pythonOlder -, swig2 +{ + lib, + stdenv, + buildPythonPackage, + fetchPypi, + openssl, + pytestCheckHook, + pythonOlder, + setuptools, + swig, }: buildPythonPackage rec { pname = "m2crypto"; version = "0.41.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,34 +23,35 @@ buildPythonPackage rec { hash = "sha256-OhNYx+6EkEbZF4Knd/F4a/AnocHVG1+vjxlDW/w/FJU="; }; - nativeBuildInputs = [ - swig2 - openssl - ]; + build-system = [ setuptools ]; - buildInputs = [ - openssl - parameterized - ]; + nativeBuildInputs = [ swig ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ - "-Wno-error=implicit-function-declaration" - "-Wno-error=incompatible-pointer-types" - ]); + buildInputs = [ openssl ]; + + env = + { + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=incompatible-pointer-types" + ]); + } + // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { + CPP = "${stdenv.cc.targetPrefix}cpp"; + }; nativeCheckInputs = [ pytestCheckHook + openssl ]; - pythonImportsCheck = [ - "M2Crypto" - ]; + pythonImportsCheck = [ "M2Crypto" ]; meta = with lib; { description = "A Python crypto and SSL toolkit"; homepage = "https://gitlab.com/m2crypto/m2crypto"; changelog = "https://gitlab.com/m2crypto/m2crypto/-/blob/${version}/CHANGES"; license = licenses.mit; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/macfsevents/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/macfsevents/default.nix index b999706daf..db0750e195 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/macfsevents/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/macfsevents/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { homepage = "https://github.com/malthe/macfsevents"; changelog = "https://github.com/malthe/macfsevents/blob/${version}/CHANGES.rst"; license = licenses.bsd2; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix index 4a733bb60a..885911b181 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , makePythonPath @@ -17,6 +18,7 @@ , pyro5 , requests , rich +, rubicon-objc , setuptools , survey , typing-extensions @@ -28,7 +30,7 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.9.2"; + version = "1.9.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -37,7 +39,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = "maestral"; rev = "refs/tags/v${version}"; - hash = "sha256-Bb0yE2OKdlZd6ZsTEWOD+hMuV41fZanesY49L+v4BBE="; + hash = "sha256-h7RDaCVICi3wl6/b1s01cINhFirDOpOXoxTPZIBH3jE="; }; propagatedBuildInputs = [ @@ -59,6 +61,8 @@ buildPythonPackage rec { typing-extensions watchdog xattr + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + rubicon-objc ]; makeWrapperArgs = [ @@ -71,6 +75,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # ModuleNotFoundError: No module named '_watchdog_fsevents' + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); + preCheck = '' export HOME=$(mktemp -d) ''; @@ -90,6 +97,19 @@ buildPythonPackage rec { "test_locking_multiprocess" # OSError: [Errno 95] Operation not supported "test_move_preserves_xattrs" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # maetral daemon does not start but worked in real environment + "test_catching_non_ignored_events" + "test_connection" + "test_event_handler" + "test_fs_ignore_tree_creation" + "test_lifecycle" + "test_notify_level" + "test_notify_snooze" + "test_receiving_events" + "test_remote_exceptions" + "test_start_already_running" + "test_stop" ]; pythonImportsCheck = [ @@ -104,7 +124,6 @@ buildPythonPackage rec { homepage = "https://maestral.app"; changelog = "https://github.com/samschott/maestral/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg sfrijters ]; - platforms = platforms.unix; + maintainers = with maintainers; [ natsukium peterhoeg sfrijters ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index fc9636c351..d74be9e45f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -3,27 +3,29 @@ , buildPythonPackage , fetchPypi , fetchpatch +, setuptools , six , attrs , twisted -, pyopenssl -, service-identity , autobahn , treq , mock , pythonOlder +, pythonAtLeast +, pytestCheckHook }: buildPythonPackage rec { pname = "magic-wormhole-mailbox-server"; version = "0.4.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + # python 3.12 support: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/issues/41 + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; - sha256 = "1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb"; + hash = "sha256-GvEFkpCcqvUZwA5wbqyELF53+NQ1YhX+nGHHsiWKiPs="; }; patches = [ @@ -35,6 +37,8 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ attrs six @@ -43,27 +47,24 @@ buildPythonPackage rec { ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; + pythonImportsCheck = [ "wormhole_mailbox_server" ]; + nativeCheckInputs = [ + pytestCheckHook treq mock - twisted ]; - # Fails in Darwin's sandbox - postPatch = lib.optionalString stdenv.isDarwin '' - echo 'LogRequests.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py - echo 'WebSocketAPI.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py - ''; + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # these tests fail in Darwin's sandbox + "src/wormhole_mailbox_server/test/test_web.py" + ]; - checkPhase = '' - trial -j$NIX_BUILD_CORES wormhole_mailbox_server - ''; - - meta = with lib; { + meta = { description = "Securely transfer data between computers"; - homepage = "https://github.com/warner/magic-wormhole-mailbox-server"; + homepage = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server"; changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.mjoerg ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index 463b356045..d98080545d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -1,33 +1,40 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , autobahn , mock , twisted +, pythonOlder +, pythonAtLeast +, pytestCheckHook }: buildPythonPackage rec { pname = "magic-wormhole-transit-relay"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; - sha256 = "0ppsx2s1ysikns1h053x67z2zmficbn3y3kf52bzzslhd2s02j6b"; + hash = "sha256-y0gBtGiQ6v+XKG4OP+xi0dUv/jF9FACDtjNqH7To+l4="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ autobahn twisted ]; - nativeCheckInputs = [ mock twisted ]; + pythonImportsCheck = [ "wormhole_transit_relay" ]; - checkPhase = '' - trial -j$NIX_BUILD_CORES wormhole_transit_relay - ''; + nativeCheckInputs = [ pytestCheckHook mock twisted ]; - meta = with lib; { + meta = { description = "Transit Relay server for Magic-Wormhole"; homepage = "https://github.com/magic-wormhole/magic-wormhole-transit-relay"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + changelog = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/blob/${version}/NEWS.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.mjoerg ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix index 353e2c0e05..d1bf85f053 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix @@ -17,7 +17,9 @@ , tqdm , click , humanize +, iterable-io , txtorcon +, zipstream-ng # optional-dependencies , noiseprotocol @@ -33,12 +35,12 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.13.0"; - format = "pyproject"; + version = "0.14.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rDvWgoYnDn8UnAYUmo5Anl+jTX/rDoiESibSnu0tFRY="; + hash = "sha256-AG0jn4i/98N7wu/2CgBOJj+vklj3J5GS0Gugyc7WsIA="; }; nativeBuildInputs = [ @@ -56,7 +58,9 @@ buildPythonPackage rec { tqdm click humanize + iterable-io txtorcon + zipstream-ng ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; @@ -111,12 +115,12 @@ buildPythonPackage rec { install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1 ''; - meta = with lib; { + meta = { changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${version}/NEWS.md"; description = "Securely transfer data between computers"; homepage = "https://github.com/magic-wormhole/magic-wormhole"; - license = licenses.mit; - maintainers = with maintainers; [ asymmetric ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.mjoerg ]; mainProgram = "wormhole"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magika/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magika/default.nix index 6e40990043..f2a7cbd85a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magika/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magika/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "magika"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-r6C7iDCG/o3JEvweQGb4upr+LuHvmNtkwtduZGehCsc="; + hash = "sha256-Q9wRU6FjcyciWmJqFVDAo5Wh1F6jPsH11GubCAI4vuA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix index 6926cc0e69..2c5f449c13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix @@ -6,25 +6,23 @@ , numpy , pytestCheckHook , imread -, freeimage , lib , stdenv }: buildPythonPackage rec { pname = "mahotas"; - version = "1.4.13"; + version = "1.4.14"; format = "setuptools"; src = fetchFromGitHub { owner = "luispedro"; repo = "mahotas"; - rev = "v${version}"; - hash = "sha256-AmctF/9hLgHw6FUm0s61eCdcc12lBa1t0OkXclis//w="; + rev = "refs/tags/v${version}"; + hash = "sha256-9tjk3rhcfAYROZKwmwHzHAN7Ui0EgmxPErQyF//K0r8="; }; propagatedBuildInputs = [ - freeimage imread numpy pillow @@ -33,11 +31,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace mahotas/io/freeimage.py \ - --replace "ctypes.util.find_library('freeimage')" 'True' \ - --replace 'ctypes.CDLL(libname)' 'np.ctypeslib.load_library("libfreeimage", "${freeimage}/lib")' - ''; # mahotas/_morph.cpp:864:10: error: no member named 'random_shuffle' in namespace 'std' env = lib.optionalAttrs stdenv.cc.isClang { @@ -59,7 +52,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "mahotas" - "mahotas.freeimage" ]; disabled = stdenv.isi686; # Failing tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix index 00bb481c16..1f038308a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "6.0.3"; + version = "6.0.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QRysmtKo5KXXAVcyQx2WwuwySUP8vAN/gqXWmgoOPmo="; + hash = "sha256-XtZOk3KgIzu9vwI0HnoklGQVZ42KVOPQBXxJ1fpfJjA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mako/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mako/default.nix index 0f512f8ec3..a1629b4cf3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mako/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mako/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "mako"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Mako"; inherit version; - hash = "sha256-KgyK1/YnQnGzu3Rn3TfPnMbatLwZy2mk7xBmlALeaY4="; + hash = "sha256-4WwB2aucEfcpDu8c/vwJP7WkXuSj2gni/sLk0brlTnM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/malduck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/malduck/default.nix index 0f15b6a106..204003bddd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/malduck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/malduck/default.nix @@ -1,34 +1,38 @@ -{ lib -, buildPythonPackage -, capstone -, click -, cryptography -, dnfile -, fetchFromGitHub -, pefile -, pycryptodomex -, pyelftools -, pythonOlder -, pytestCheckHook -, typing-extensions -, yara-python +{ + lib, + buildPythonPackage, + capstone, + click, + cryptography, + dnfile, + fetchFromGitHub, + pefile, + pycryptodomex, + pyelftools, + pythonOlder, + setuptools, + pytestCheckHook, + typing-extensions, + yara-python, }: buildPythonPackage rec { pname = "malduck"; - version = "4.4.0"; - format = "setuptools"; + version = "4.4.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "CERT-Polska"; - repo = pname; + repo = "malduck"; rev = "refs/tags/v${version}"; - hash = "sha256-CXHbU1AudvOJrG9MKYDQXeEtwrJODRPQtK43dQzZASE="; + hash = "sha256-Btx0HxiZWrb0TDpBokQGtBE2EDK0htONe/DwqlPgAd4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ capstone click cryptography @@ -40,26 +44,16 @@ buildPythonPackage rec { yara-python ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "pefile==2019.4.18" "pefile" \ - --replace "dnfile==0.11.0" "dnfile" - ''; + nativeCheckInputs = [ pytestCheckHook ]; - nativeCheckInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "malduck" - ]; + pythonImportsCheck = [ "malduck" ]; meta = with lib; { description = "Helper for malware analysis"; - mainProgram = "malduck"; homepage = "https://github.com/CERT-Polska/malduck"; changelog = "https://github.com/CERT-Polska/malduck/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "malduck"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mandown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mandown/default.nix index eae43bc8d9..34004e3a9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mandown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mandown/default.nix @@ -9,6 +9,7 @@ , filetype , lxml , natsort +, nix-update-script , pillow , python-slugify , requests @@ -18,14 +19,14 @@ buildPythonPackage rec { pname = "mandown"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "potatoeggy"; repo = "mandown"; rev = "refs/tags/v${version}"; - hash = "sha256-oHa7/2fv+BG5KIKFIICYBqddub5SokDvAI6frbVwGSo="; + hash = "sha256-vzvidtfBwbIV6cIUjQQIezN12VfxsBOKODoSChz2VDA="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ + "lxml" "pillow" "typer" ]; @@ -55,6 +57,7 @@ buildPythonPackage rec { gui = [ pyside6 ]; + updateScript = nix-update-script { }; }; pythonImportsCheck = [ "mandown" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manga-ocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manga-ocr/default.nix new file mode 100644 index 0000000000..7f0371c356 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/manga-ocr/default.nix @@ -0,0 +1,65 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + fire, + fugashi, + jaconv, + loguru, + numpy, + pillow, + pyperclip, + torch, + transformers, + unidic-lite, + pythonOlder, +}: +buildPythonPackage rec { + pname = "manga-ocr"; + version = "0.1.11"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "kha-white"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-cLmgHBt6HvhY6Hb9yQ425Gk181axnMr+Mp2LxSmPoDg="; + }; + + preBuild = '' + # remove subproject dedicated to model training + rm -rf manga_ocr_dev + # copy assets/example.jpg inside the package + # required by https://github.com/kha-white/manga-ocr/blob/ba1b0d94a8ef6676b618ba4e5ffe8ce2ab655270/manga_ocr/ocr.py#L27-L30 + # see also package_data.patch + mkdir manga_ocr/assets + cp assets/example.jpg manga_ocr/assets/example.jpg + ''; + + patches = [ + # instruct setuptool to copy assets/example.jpg to package when building wheel + ./package_data.patch + ]; + + propagatedBuildInputs = [ + # taken from requirements.txt + fire + fugashi + jaconv + loguru + numpy + pillow + pyperclip + torch + transformers + unidic-lite + ]; + + meta = with lib; { + description = "Optical character recognition for Japanese text, with the main focus being Japanese manga"; + homepage = "https://github.com/kha-white/manga-ocr"; + changelog = "https://github.com/kha-white/manga-ocr/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [laurent-f1z1]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manga-ocr/package_data.patch b/third_party/nixpkgs/pkgs/development/python-modules/manga-ocr/package_data.patch new file mode 100644 index 0000000000..6c643f669d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/manga-ocr/package_data.patch @@ -0,0 +1,12 @@ +diff --git a/setup.py b/setup.py +--- a/setup.py ++++ b/setup.py +@@ -18,6 +18,9 @@ setup( + ], + packages=['manga_ocr'], + include_package_data=True, ++ package_data={ ++ 'manga_ocr': ['assets/example.jpg'], ++ }, + install_requires=[ + "fire", \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manim-slides/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manim-slides/default.nix index ec1811d707..f028035d53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/manim-slides/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/manim-slides/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , pythonOlder +, hatchling +, pythonRelaxDepsHook , manim , ffmpeg @@ -27,17 +29,13 @@ # Optional dependencies , ipython - # Hooks -, pdm-backend -, pythonRelaxDepsHook - # As Module or application? , withGui ? false }: buildPythonPackage rec { pname = "manim-slides"; - format = "pyproject"; - version = "5.1.3"; + version = "5.1.6"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -45,16 +43,19 @@ buildPythonPackage rec { owner = "jeertmans"; repo = "manim-slides"; rev = "refs/tags/v${version}"; - hash = "sha256-WZR95swapT2Fbu6mbuHLjMu3Okq/wKFabzN7xpZw0/g="; + hash = "sha256-BFfp/jeKBXr+Ukh0jNEtMPHlstlBjhSnvA803ddYoZE="; }; - nativeBuildInputs = [ pdm-backend pythonRelaxDepsHook ]; + build-system = [ + hatchling + pythonRelaxDepsHook + ]; pythonRemoveDeps = [ "opencv-python" ]; pythonRelaxDeps = [ "rtoml" "qtpy" ]; - propagatedBuildInputs = [ + dependencies = [ av click click-default-group diff --git a/third_party/nixpkgs/pkgs/applications/video/manim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manim/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/applications/video/manim/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/manim/default.nix index 57186eec19..09f2953c36 100644 --- a/third_party/nixpkgs/pkgs/applications/video/manim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/manim/default.nix @@ -1,11 +1,43 @@ { lib +, buildPythonPackage , fetchFromGitHub +, poetry-core +, pytest-xdist +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , cairo , ffmpeg , texliveInfraOnly -, python3 +, click +, click-default-group +, cloup +, colour +, grpcio +, grpcio-tools +, importlib-metadata +, isosurfaces +, jupyterlab +, manimpango +, mapbox-earcut +, moderngl +, moderngl-window +, networkx +, numpy +, pillow +, pycairo +, pydub +, pygments +, rich +, scipy +, screeninfo +, skia-pathops +, srt +, svgelements +, tqdm +, watchdog }: let @@ -42,22 +74,20 @@ let babel-english gnu-freefont mathastext cbfonts-fd ]); - python = python3; - -in python.pkgs.buildPythonApplication rec { +in buildPythonPackage rec { pname = "manim"; pyproject = true; - version = "0.18.0.post0"; - disabled = python3.pythonOlder "3.8"; + version = "0.18.1"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = "manim"; rev = "refs/tags/v${version}"; - hash = "sha256-4HwQ74oHloK+1KOD6SzXCzGIDD+Dc0jDabw6/+cqmos="; + hash = "sha256-o+Wl3NMK6yopcsRVFtZuUE9c1GABa5d8rbQNHDJ4OiQ="; }; - nativeBuildInputs = with python.pkgs; [ + nativeBuildInputs = [ poetry-core pythonRelaxDepsHook ]; @@ -81,7 +111,7 @@ in python.pkgs.buildPythonApplication rec { buildInputs = [ cairo ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = [ click click-default-group cloup @@ -101,7 +131,6 @@ in python.pkgs.buildPythonApplication rec { pycairo pydub pygments - pysrt rich scipy screeninfo @@ -122,10 +151,9 @@ in python.pkgs.buildPythonApplication rec { nativeCheckInputs = [ ffmpeg manim-tinytex - ] ++ (with python.pkgs; [ pytest-xdist pytestCheckHook - ]); + ]; # about 55 of ~600 tests failing mostly due to demand for display disabledTests = import ./failing_tests.nix; diff --git a/third_party/nixpkgs/pkgs/applications/video/manim/failing_tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/manim/failing_tests.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/video/manim/failing_tests.nix rename to third_party/nixpkgs/pkgs/development/python-modules/manim/failing_tests.nix diff --git a/third_party/nixpkgs/pkgs/applications/video/manim/pytest-report-header.patch b/third_party/nixpkgs/pkgs/development/python-modules/manim/pytest-report-header.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/video/manim/pytest-report-header.patch rename to third_party/nixpkgs/pkgs/development/python-modules/manim/pytest-report-header.patch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix index 4031b10f55..54f6fd858e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.4.0"; + version = "0.4.10"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IiM7iJs3CIl6WjstgvtJzIylVL49jRG246GU5G5GEG0="; + hash = "sha256-F6Hf8KPIkXuRhO/1mVHE1wfU6//vbUK1ghoqANmZjag="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix index f31af525f1..70bff8d2c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix @@ -10,28 +10,30 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.5.2"; + version = "3.6"; + pyproject = true; disabled = pythonOlder "3.8"; - pyproject = true; - src = fetchFromGitHub { owner = "Python-Markdown"; repo = "markdown"; rev = "refs/tags/${version}"; - hash = "sha256-YLOLDiS93zpjJWzkWXcutjZw9iB/FfbjxQXjau2B+JQ="; + hash = "sha256-jGo9/ZS2EhMDl/o1ref7Owqckuc7am578Ojmcz2aWIE="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ + dependencies = lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - nativeCheckInputs = [ unittestCheckHook pyyaml ]; + nativeCheckInputs = [ + unittestCheckHook + pyyaml + ]; pythonImportsCheck = [ "markdown" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 7b5b293240..4bb06720ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , marshmallow -, marshmallow-enum , pytestCheckHook , pythonAtLeast , pythonOlder @@ -15,7 +14,7 @@ buildPythonPackage rec { version = "8.6.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "lovasoa"; @@ -30,7 +29,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - marshmallow-enum pytestCheckHook typeguard ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix deleted file mode 100644 index fdf2771dee..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools -, marshmallow -, pytest7CheckHook -}: - -buildPythonPackage rec { - pname = "marshmallow-enum"; - version = "1.5.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "justanr"; - repo = "marshmallow_enum"; - rev = "v${version}"; - sha256 = "1ihrcmyfjabivg6hc44i59hnw5ijlg1byv3zs1rqxfynp8xr7398"; - }; - - postPatch = '' - sed -i '/addopts/d' tox.ini - ''; - - build-system = [ - setuptools - ]; - - dependencies = [ - marshmallow - ]; - - nativeCheckInputs = [ - pytest7CheckHook - ]; - - meta = with lib; { - description = "Enum field for Marshmallow"; - homepage = "https://github.com/justanr/marshmallow_enum"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix index 6cfa517cc3..cf79f268ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mashumaro"; - version = "3.12"; + version = "3.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Fatal1ty"; repo = "mashumaro"; rev = "refs/tags/v${version}"; - hash = "sha256-sSwj/8j+vPX7M8l2h4bPs8WnjzIN2WIpyd7/NcGaExg="; + hash = "sha256-ETK1rHKlByQkqibejiZmXF6c4eIiMazLa8XY2OH30q4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix index 1646d3ac72..fe627c8b99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix @@ -9,7 +9,7 @@ , exiftool , ffmpeg , mailcap -, wrapGAppsHook +, wrapGAppsHook3 , gdk-pixbuf , gobject-introspection , librsvg @@ -66,7 +66,7 @@ buildPythonPackage rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix index 90cbd00dc4..e35111fd19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix @@ -1,4 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools , traitlets # tests @@ -7,15 +11,23 @@ buildPythonPackage rec { pname = "matplotlib-inline"; - version = "0.1.6"; - format = "setuptools"; + version = "0.1.7"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-+Ifl8Qupjo0rFQ3c9HAsHl+LOiAAXrD3S/29Ng7m8wQ="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ipython"; + repo = "matplotlib-inline"; + rev = "refs/tags/${version}"; + hash = "sha256-y7T8BshNa8NVWzH8oLS4dTAyhG+YmkkYQJFAyMXsJFA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ traitlets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index 788df3d945..a23b954053 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -12,7 +12,6 @@ , pybind11 , setuptools , setuptools-scm -, wheel # native libraries , ffmpeg-headless @@ -70,6 +69,9 @@ # required for headless detection , libX11 , wayland + +# Reverse dependency +, sage }: let @@ -77,15 +79,15 @@ let in buildPythonPackage rec { - version = "3.8.3"; + version = "3.8.4"; pname = "matplotlib"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-e0FiOemuOL5UsCirv5BIr/UFSpq6VBa+8L0X+RYs4WE="; + hash = "sha256-iqw5fV6ewViWDjHDgcX/xS3dUr2aR3F+KmlAOBZ9/+o="; }; env.XDG_RUNTIME_DIR = "/tmp"; @@ -100,7 +102,10 @@ buildPythonPackage rec { let tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"''; in - lib.optionalString enableTk '' + '' + substituteInPlace pyproject.toml \ + --replace-fail '"numpy>=2.0.0rc1,<2.3",' "" + '' + lib.optionalString enableTk '' sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py '' + lib.optionalString (stdenv.isLinux && interactive) '' # fix paths to libraries in dlopen calls (headless detection) @@ -110,13 +115,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - certifi - numpy pkg-config - pybind11 - setuptools - setuptools-scm - wheel ] ++ lib.optionals enableGtk3 [ gobject-introspection ]; @@ -143,7 +142,15 @@ buildPythonPackage rec { "strictoverflow" ]; - propagatedBuildInputs = [ + build-system = [ + certifi + numpy + pybind11 + setuptools + setuptools-scm + ]; + + dependencies = [ # explicit contourpy cycler @@ -179,6 +186,8 @@ buildPythonPackage rec { }; }; + passthru.tests = { inherit sage; }; + env.MPLSETUPCFG = writeText "mplsetup.cfg" (lib.generators.toINI {} passthru.config); # Encountering a ModuleNotFoundError, as describved and investigated at: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix index 3f95408364..100191643b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "maxminddb"; - version = "2.5.2"; + version = "2.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s8M+T8eCHubJ9Ag3EW4Wq2F1hj1KZO7gJMW+xoZpCoc="; + hash = "sha256-bF1ZH2JeA7CjTfDH/4FYBnY5e4M14T7OEwxuOeSjr7k="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix index a34f98cdae..ad41d36ee0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix @@ -18,9 +18,11 @@ buildPythonPackage rec { pname = "mayavi"; + # TODO: Remove meta.broken on next release. version = "4.8.1"; format = "setuptools"; - disabled = pythonOlder "3.8" || pythonAtLeast "3.11"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; @@ -85,5 +87,8 @@ buildPythonPackage rec { homepage = "https://github.com/enthought/mayavi"; license = licenses.bsdOriginal; maintainers = with maintainers; [ knedlsepp ]; + # Should be fixed in a version from after March 26, see: + # https://github.com/enthought/mayavi/issues/1284#issuecomment-2020631244 + broken = pythonAtLeast "3.12"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 8bca9230d9..9415fee83d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "2.0.8"; + version = "2.0.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-mkdocs"; rev = "refs/tags/v${version}"; - hash = "sha256-HBRhmCqi13D+y+Vp2F27twU2eaRmJTcAzGOPCWMDtZU="; + hash = "sha256-wx95Lsqgi7fM/1s6fSHxXOs396mIR9S9yCRebC2VFpI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdtraj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdtraj/default.nix index 971688348a..a99b36c787 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdtraj/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdtraj/default.nix @@ -11,6 +11,7 @@ , wheel , astunparse , numpy +, packaging , pyparsing , scipy , gsd @@ -39,9 +40,31 @@ buildPythonPackage rec { url = "https://github.com/mdtraj/mdtraj/commit/81209d00817ab07cfc4668bf5ec88088d16904c0.patch"; hash = "sha256-ttNmij7csxF0Z5wPPwhGumRX055W2IgFjRAe6nI6GNY="; }) + # remove pkg_resources usage + # https://github.com/mdtraj/mdtraj/pull/1837 + (fetchpatch { + name = "fix-runtime-error.patch"; + url = "https://github.com/mdtraj/mdtraj/commit/02d44d4db7039fceb199c85b4f993244804f470d.patch"; + hash = "sha256-nhbi3iOrDSM87DyIp1KVt383Vvb6aYOgkjuYzviqiq8="; + }) + # remove distutils usage + # https://github.com/mdtraj/mdtraj/pull/1834 + (fetchpatch { + name = "python312-compatibility.patch"; + url = "https://github.com/mdtraj/mdtraj/commit/95d79747deef42c976ca362a57806b61933409f3.patch"; + hash = "sha256-Cq7/d745q6ZgAyWGM4ULnSsWezsbnu1CjSz5eqYSb+g="; + }) + # disable intrinsics when SIMD is not available + # TODO: enable SIMD with python3.12 + # https://github.com/mdtraj/mdtraj/pull/1884 + (fetchpatch { + name = "fix-intrinsics-flag.patch"; + url = "https://github.com/mdtraj/mdtraj/commit/d6041c645d51898e2a09030633210213eec7d4c5.patch"; + hash = "sha256-kcnlHMoA/exJzV8iQltH+LWXrvSk7gsUV+yWK6xn0jg="; + }) ]; - nativeBuildInputs = [ + build-system = [ cython_0 oldest-supported-numpy setuptools @@ -54,9 +77,10 @@ buildPythonPackage rec { llvmPackages.openmp ]; - propagatedBuildInputs = [ + dependencies = [ astunparse numpy + packaging pyparsing scipy ]; @@ -87,7 +111,9 @@ buildPythonPackage rec { "test_read_atomindices_2" # flaky test + "test_compare_rdf_t_master" "test_distances_t" + "test_precentered_2" ]; pythonImportsCheck = [ "mdtraj" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix index e347aa107d..f661fad488 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix @@ -9,14 +9,15 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "1.0.8"; + version = "1.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-cJiLqyY2lkVvddPYkQx1rqR3qdCAVK1++FvlRw3T9ls="; + pname = "mecab_python3"; + inherit version; + hash = "sha256-LYkfSgEZ+3Zvp5bijYgaVXk6DDVE5EbP9k3JRq1yJ8w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix index 3724fa64d0..a84fe51da4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix @@ -1,48 +1,32 @@ -{ lib -, buildPythonPackage -, fetchPypi -, fetchpatch2 -, html5lib -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + html5lib, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "mechanize"; - version = "0.4.9"; + version = "0.4.10"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aaXtsJYvkh6LEINzaMIkLYrQSfC5H/aZzn9gG/xDFSE="; + hash = "sha256-HeqUf5vn6gq2EPe7xKTja0XWv9/O6imtPTiaiKGVfd8="; }; - patches = [ - (fetchpatch2 { - # python 3.11+ compat - url = "https://github.com/python-mechanize/mechanize/commit/1324b09b661aaac7d4cdc7e1e9d49e1c3851db2c.patch"; - hash = "sha256-d0Zuz6m2Uv8pnR8TC0L+AStS82rPPTpQrrjkCZnJliE="; - }) - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ - setuptools - ]; + dependencies = [ html5lib ]; - propagatedBuildInputs = [ - html5lib - ]; + nativeCheckInputs = [ pytestCheckHook ]; - nativeCheckInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "mechanize" - ]; + pythonImportsCheck = [ "mechanize" ]; disabledTestPaths = [ # Tests require network access diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix index e5e47b934f..4ad70db328 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix @@ -1,38 +1,35 @@ -{ lib -, buildPythonPackage -, camel-converter -, fetchFromGitHub -, pythonOlder -, setuptools -, requests +{ + lib, + buildPythonPackage, + camel-converter, + fetchFromGitHub, + pythonOlder, + setuptools, + requests, }: buildPythonPackage rec { pname = "meilisearch"; - version = "0.31.0"; + version = "0.31.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-mgslzRd2hvDI0SbQR3eY2vzvaaOVI6mUihdNPKe4jcg="; + hash = "sha256-rD9f0J8Ez+WrpEyDZa3GVuBxj6Kv7McBzIuk9RtsjHk="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ camel-converter requests ] ++ camel-converter.optional-dependencies.pydantic; - pythonImportsCheck = [ - "meilisearch" - ]; + pythonImportsCheck = [ "meilisearch" ]; # Tests spin up a local server and are not mocking the requests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix index c4ddc5d06a..34dd55bb8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix @@ -2,6 +2,9 @@ , fetchPypi , buildPythonPackage , cython + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -19,6 +22,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "memory_allocator" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "An extension class to allocate memory easily with cython"; homepage = "https://github.com/sagemath/memory_allocator/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meraki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meraki/default.nix index f0d0e4087e..1e1d3c3f67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meraki/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meraki/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.45.0"; + version = "1.46.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-PBeeohKNzAMlEdAjzB8fsVPc+ml+mcaWHoVWPeP93Bo="; + hash = "sha256-f3K+59+9NO33GO1SBZhKfqHPO9p5kivDeLNd780cZu8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/merge3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/merge3/default.nix index 906c009117..838bfc6a32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/merge3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/merge3/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { mainProgram = "merge3"; homepage = "https://github.com/breezy-team/merge3"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix index d77237c172..523f034a9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix @@ -1,18 +1,20 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, paho-mqtt -, pytestCheckHook -, pythonOlder -, requests -, retrying -, setuptools +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + paho-mqtt, + pytestCheckHook, + pythonOlder, + pycryptodomex, + requests, + retrying, + setuptools, }: buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.6.2"; + version = "0.4.7.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,16 +23,15 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = "refs/tags/${version}"; - hash = "sha256-fekiN4AHb/RNEMibQqV7By0FAyTcERZmmi0+qCG4NzQ="; + hash = "sha256-BcWluaNyo6G7OuIV6yXzc7xcBgQlRR9HbjbNnLigZcE="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp paho-mqtt + pycryptodomex requests retrying ]; @@ -38,9 +39,7 @@ buildPythonPackage rec { # Test require network access doCheck = false; - pythonImportsCheck = [ - "meross_iot" - ]; + pythonImportsCheck = [ "meross_iot" ]; meta = with lib; { description = "Python library to interact with Meross devices"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mesa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mesa/default.nix index a7a8fa175c..a7664ca704 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mesa/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { disabled = isPy27; src = fetchPypi { - pname = "Mesa"; + pname = "mesa"; inherit version; hash = "sha256-5og3ACS2r36BEGWfqtw6WG6yJwNF5p3M9K25sSmHosM="; }; @@ -47,5 +47,6 @@ buildPythonPackage rec { description = "An agent-based modeling (or ABM) framework in Python"; license = licenses.asl20; maintainers = [ maintainers.dpaetzel ]; + broken = true; # missing dependencies }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix index deaab05a65..c92c0705aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "meson-python"; - version = "0.15.0"; + version = "0.16.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-/dtz7s1J6JwcQch5N82JwtC2WhxjuigjhoHUvZSE0m8="; + hash = "sha256-kGjBfjbInWx/9wn/+yqKmSXozQsCYpco5c6vLsUFy18="; }; nativeBuildInputs = [ @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Meson Python build backend (PEP 517)"; homepage = "https://github.com/mesonbuild/meson-python"; license = [ lib.licenses.mit ]; - maintainers = with lib.maintainers; [ fridh doronbehar ]; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix index 58ddc57bfe..237f7f4876 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix @@ -41,6 +41,5 @@ buildPythonPackage rec { description = "Create pep517 compliant packages from the meson build system"; homepage = "https://gitlab.com/thiblahute/mesonpep517"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/miasm/0001-setup.py-use-valid-semver.patch b/third_party/nixpkgs/pkgs/development/python-modules/miasm/0001-setup.py-use-valid-semver.patch new file mode 100644 index 0000000000..ac98a5fc4d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/miasm/0001-setup.py-use-valid-semver.patch @@ -0,0 +1,26 @@ +From c85780ce97798f332d627bd44cbbfa19c9ea565e Mon Sep 17 00:00:00 2001 +From: Moritz Sanft <58110325+msanft@users.noreply.github.com> +Date: Sat, 11 May 2024 11:03:34 +0200 +Subject: [PATCH] setup.py: use valid semver + +Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index e1e54434..98e29fee 100644 +--- a/setup.py ++++ b/setup.py +@@ -314,7 +314,7 @@ def build_all(): + try: + s = setup( + name = "miasm", +- version = __import__("miasm").VERSION, ++ version = "v0.0.0", + packages = packages, + data_files=[("", ["README.md"])], + package_data = { +-- +2.44.0 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/miasm/0002-core-remove-IDAPython-dependency.patch b/third_party/nixpkgs/pkgs/development/python-modules/miasm/0002-core-remove-IDAPython-dependency.patch new file mode 100644 index 0000000000..20262d8102 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/miasm/0002-core-remove-IDAPython-dependency.patch @@ -0,0 +1,65 @@ +From fd2a6b2899c8b836a086b43ec9ebccf726f71ec4 Mon Sep 17 00:00:00 2001 +From: Moritz Sanft <58110325+msanft@users.noreply.github.com> +Date: Sat, 11 May 2024 11:04:19 +0200 +Subject: [PATCH] core: remove IDAPython dependency + +Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> +--- + miasm/core/bin_stream_ida.py | 45 ------------------------------------ + 1 file changed, 45 deletions(-) + delete mode 100644 miasm/core/bin_stream_ida.py + +diff --git a/miasm/core/bin_stream_ida.py b/miasm/core/bin_stream_ida.py +deleted file mode 100644 +index 15bd9d8b..00000000 +--- a/miasm/core/bin_stream_ida.py ++++ /dev/null +@@ -1,45 +0,0 @@ +-from builtins import range +-from idc import get_wide_byte, get_segm_end +-from idautils import Segments +-from idaapi import is_mapped +- +-from miasm.core.utils import int_to_byte +-from miasm.core.bin_stream import bin_stream_str +- +- +-class bin_stream_ida(bin_stream_str): +- """ +- bin_stream implementation for IDA +- +- Don't generate xrange using address computation: +- It can raise error on overflow 7FFFFFFF with 32 bit python +- """ +- def _getbytes(self, start, l=1): +- out = [] +- for ad in range(l): +- offset = ad + start + self.base_address +- if not is_mapped(offset): +- raise IOError(f"not enough bytes @ offset {offset:x}") +- out.append(int_to_byte(get_wide_byte(offset))) +- return b''.join(out) +- +- def readbs(self, l=1): +- if self.offset + l > self.l: +- raise IOError("not enough bytes") +- content = self.getbytes(self.offset) +- self.offset += l +- return content +- +- def __str__(self): +- raise NotImplementedError('Not fully functional') +- +- def setoffset(self, val): +- self.offset = val +- +- def getlen(self): +- # Lazy version +- if hasattr(self, "_getlen"): +- return self._getlen +- max_addr = get_segm_end(list(Segments())[-1] - (self.offset - self.base_address)) +- self._getlen = max_addr +- return max_addr +-- +2.44.0 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/miasm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/miasm/default.nix new file mode 100644 index 0000000000..4d220bf976 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/miasm/default.nix @@ -0,0 +1,58 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, future +, gcc +, llvmlite +, parameterized +, pycparser +, pyparsing +, z3-solver +, setuptools +}: +let + commit = "90dc1671b59077ee27c3d44d9d536d6659eb3bbe"; +in +buildPythonPackage rec { + pname = "miasm"; + version = "0.1.5-unstable-2024-04-28"; + + pyproject = true; + build-system = [ setuptools ]; + + src = fetchFromGitHub { + owner = "cea-sec"; + repo = "miasm"; + rev = commit; + hash = "sha256-nkRcirJLmTwSL7lwd+Yk6mteU3YPnm5ekJ4eFF5FmYo="; + }; + + patches = [ + # Use a valid semver as now required by setuptools + ./0001-setup.py-use-valid-semver.patch + + # Removes the (unfree) IDAPython dependency + ./0002-core-remove-IDAPython-dependency.patch + ]; + + dependencies = [ + future + llvmlite + parameterized + pycparser + pyparsing + z3-solver + ]; + + buildInputs = [ gcc ]; + + pythonImportsCheck = [ "miasm" ]; + + meta = { + description = "Reverse engineering framework in Python"; + homepage = "https://github.com/cea-sec/miasm"; + changelog = "https://github.com/cea-sec/miasm/blob/${commit}/CHANGELOG.md"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ msanft ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mike/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mike/default.nix index 9a48dca546..da31390805 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mike/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mike/default.nix @@ -56,6 +56,6 @@ buildPythonPackage rec { mainProgram = "mike"; homepage = "https://github.com/jimporter/mike"; license = licenses.bsd3; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/milksnake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/milksnake/default.nix index 72115444ff..567305b194 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/milksnake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/milksnake/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, cffi }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, cffi }: buildPythonPackage rec { pname = "milksnake"; @@ -11,6 +11,14 @@ buildPythonPackage rec { sha256 = "120nprd8lqis7x7zy72536gk2j68f7gxm8gffmx8k4ygifvl7kfz"; }; + patches = [ + (fetchpatch { + name = "fix-regex-python-311.patch"; + url = "https://github.com/getsentry/milksnake/commit/421cc1ffab4d76d01366240c087ffb30d63b744c.diff"; + hash = "sha256-U/C4CCX8SEOzVXNpOf4hVy2V3Lh6fUrFkz5z+h191C8="; + }) + ]; + propagatedBuildInputs = [ cffi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minari/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minari/default.nix new file mode 100644 index 0000000000..45c3f0fc36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/minari/default.nix @@ -0,0 +1,88 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, wheel +, google-cloud-storage +, gymnasium +, h5py +, numpy +, packaging +, portion +, rich +, tqdm +, typer +, typing-extensions +, imageio +, nbmake +, pytest +, pytest-markdown-docs +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "minari"; + version = "0.4.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Farama-Foundation"; + repo = "Minari"; + rev = "refs/tags/v${version}"; + hash = "sha256-DwuANo0PCb2pPTVST8EwuJHe5HKRV8JIpFBpSqoJNh8="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + google-cloud-storage + gymnasium + h5py + numpy + packaging + portion + rich + tqdm + typer + typing-extensions + ]; + + passthru.optional-dependencies = { + testing = [ + # gymnasium-robotics + imageio + nbmake + pytest + pytest-markdown-docs + ]; + }; + + pythonImportsCheck = [ + "minari" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # Require internet access + "tests/dataset/test_dataset_download.py" + "tests/test_cli.py" + ]; + + meta = with lib; { + description = "A standard format for offline reinforcement learning datasets, with popular reference datasets and related utilities"; + homepage = "https://github.com/Farama-Foundation/Minari"; + changelog = "https://github.com/Farama-Foundation/Minari/releases/tag/v${version}"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ GaetanLepage ]; + mainProgram = "minari"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mindsdb-evaluator/default.nix index 9cc654911f..311f8761bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mindsdb-evaluator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mindsdb-evaluator/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mindsdb-evaluator"; - version = "0.0.12"; + version = "0.0.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mindsdb_evaluator"; inherit version; - hash = "sha256-SqcBtoY7WZcorAaoyhqNDscf1MkSz0pE993mz1MRXCU="; + hash = "sha256-SW3GYe9ykbs6ZViScdAgwiBAP9ix4v1VbSm/kJK2jDA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minidb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minidb/default.nix index 8bd0aea36c..20a2eba687 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minidb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minidb/default.nix @@ -1,14 +1,16 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "minidb"; - version = "2.0.7"; - format = "setuptools"; + version = "2.0.8"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,16 +18,14 @@ buildPythonPackage rec { owner = "thp"; repo = "minidb"; rev = "refs/tags/${version}"; - hash = "sha256-0f2usKoHs4NO/Ir8MhyiAVZFYnUkVH5avdh3QdHzY6s="; + hash = "sha256-e7wVR+xr+5phNoRnGIxnmrjB1QU9JmyfQiu88PYapA8="; }; - nativeCheckInputs = [ - pytestCheckHook - ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ - "minidb" - ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "minidb" ]; meta = with lib; { description = "SQLite3-based store for Python objects"; @@ -34,4 +34,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ tv ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix index e86f1ae1d7..de84597491 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.5"; + version = "7.2.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-Xb6XaGI/bwkhp6YKgoqi5Tbs74pSXc6aJpWVUgG5uR4="; + hash = "sha256-zK+D2DNgh1cASdA2gstNW0ODUu7Dn6vMY01mcrdSSo0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix index 1ab85c88c3..c062019814 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.11.1"; + version = "0.11.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,14 +21,14 @@ buildPythonPackage rec { owner = "has2k1"; repo = "mizani"; rev = "refs/tags/v${version}"; - hash = "sha256-rlzMvIQej8d7LCklNNZeIgtrGaB5A6lDd/1iQG+j+X8="; + hash = "sha256-aEataiB432yKnQ80TxJvsU9DO9wI4ZVGq1k73qeuEv0="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ matplotlib palettable pandas diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix index c885727a25..0a76166dd4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocs-git-revision-date-localized-plugin"; - version = "1.2.4"; + version = "1.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "timvink"; repo = "mkdocs-git-revision-date-localized-plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-sN3cuRjB3zkwp0xYoH20IJ8edXqi5rw66e3N4DuNqVU="; + hash = "sha256-cezL65Wsdaa9W4dGLgTz1x3UFrDRDJaGuttr58CBcuw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix index 5328c196c3..a11dd831e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mkdocs-rss-plugin"; - version = "1.12.1"; + version = "1.12.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Guts"; repo = "mkdocs-rss-plugin"; rev = "refs/tags/${version}"; - hash = "sha256-cLQfhMYW/9Eb+IamQIC7fZRTm/ORD8xbcrmKkSkUrMs="; + hash = "sha256-CeVt4Vkr3tGvWsDQtw8eAaRS5jBeDei0TrS5rViSCaI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-simple-hooks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-simple-hooks/default.nix deleted file mode 100644 index c623207d1d..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-simple-hooks/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, buildPythonPackage -, isPy3k -, fetchFromGitHub -, mkdocs -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "mkdocs-simple-hooks"; - version = "0.1.5"; - format = "setuptools"; - - disabled = !isPy3k; - - src = fetchFromGitHub { - owner = "aklajnert"; - repo = "mkdocs-simple-hooks"; - rev = "v${version}"; - hash = "sha256-N6xZjCREjJlhR6f8m65WJswUQv/TTdTbk670+C46UWQ="; - }; - - propagatedBuildInputs = [ - mkdocs - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pytestFlagsArray = [ "tests.py" ]; - - # disable failing tests - disabledTests = [ - "test_no_hooks_defined" - "test_no_attribute" - ]; - - meta = with lib; { - description = "Define your own hooks for mkdocs, without having to create a new package."; - homepage = "https://github.com/aklajnert/mkdocs-simple-hooks"; - license = licenses.mit; - maintainers = with maintainers; [ arjan-s ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index 62f5286747..06fb3a3f02 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.6.9"; + version = "0.6.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Blueswen"; repo = "mkdocs-swagger-ui-tag"; rev = "refs/tags/v${version}"; - hash = "sha256-4cRElwF8AOvTLZJq1NF9Yqa7g44uiT96giyhqKZKp5M="; + hash = "sha256-Wfctu8rqj2HxPgXYMeL5Hovet8yjol7RfLH233Gl+v4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix index 7a57a73338..094713367e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.9.2"; + version = "1.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-UJSDnkdohFn+U7i5fYiRVMLZZ8Nyb0fdihBZl2z2RBc="; + hash = "sha256-sKRheGIR//kmiznHKsVGd35oSvGHgoocsbYCzDRv2Zs="; }; build-system = [ pdm-backend ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix index a8dc02b4a9..011442e70f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.24.3"; + version = "0.25.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "mkdocstrings"; rev = "refs/tags/${version}"; - hash = "sha256-L3QQ2ll2sDbQwrmw88iwTW6WS2SNsiMR2TvuV4P1uj4="; + hash = "sha256-Z4mX6EXEFmNd/CNa39hN9mwJSv9OkqwEmWMzJ9r+EBM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix index 0160b24a56..b58887aea1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ml-dtypes"; - version = "0.3.2"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jax-ml"; repo = "ml_dtypes"; rev = "refs/tags/v${version}"; - hash = "sha256-epWunA5FULmCuTABl3uckFuNaSEpqJxtp0n0loCb6Q0="; + hash = "sha256-3qZ1lS1IdSXNLRNE9tyuO9qauVBDlECZvmmwaOffD30="; # Since this upstream patch (https://github.com/jax-ml/ml_dtypes/commit/1bfd097e794413b0d465fa34f2eff0f3828ff521), # the attempts to use the nixpkgs packaged eigen dependency have failed. # Hence, we rely on the bundled eigen library. @@ -31,6 +31,7 @@ buildPythonPackage rec { --replace "numpy~=1.21.2" "numpy" \ --replace "numpy~=1.23.3" "numpy" \ --replace "numpy~=1.26.0" "numpy" \ + --replace "numpy==2.0.0rc1" "numpy" \ --replace "setuptools~=68.1.0" "setuptools" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix index 5d8c91d8bc..cf1a43e9c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.11.3"; + version = "2.12.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Yht+MR6JC3lxnC53dyhtjgjTjdBNWrCAlmmQvUpV/rs="; + hash = "sha256-1xLxr51E8eueG67oymT3MR4YW3Vy/DweCoOkyM7/aq0="; }; # Remove currently broken dependency `shap`, a model explainability package. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mmengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mmengine/default.nix index 7187fe8098..89992981ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mmengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mmengine/default.nix @@ -15,6 +15,7 @@ pyyaml, rich, setuptools, + stdenv, termcolor, torch, yapf, @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "mmengine"; - version = "0.10.3"; + version = "0.10.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +32,7 @@ buildPythonPackage rec { owner = "open-mmlab"; repo = "mmengine"; rev = "refs/tags/v${version}"; - hash = "sha256-fKtPDdeKB3vX2mD+Tsicq8KOkPDSACzKK1XLyugdPQ4="; + hash = "sha256-+YDtYHp3BwKvzhmHC6hAZ3Qtc9uRZMo/TpWqdpm2hn0="; }; build-system = [ setuptools ]; @@ -99,16 +100,12 @@ buildPythonPackage rec { "test_close" ]; - pytestFlagsArray = [ - "-W" - "ignore::pytest.PytestRemovedIn8Warning" - ]; - meta = with lib; { description = "Library for training deep learning models based on PyTorch"; homepage = "https://github.com/open-mmlab/mmengine"; changelog = "https://github.com/open-mmlab/mmengine/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ rxiao ]; + broken = stdenv.isDarwin || (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix index 2a44707bff..116e85ce2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix @@ -35,12 +35,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.12.4"; + version = "3.12.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-O+IRX59Z4D188XEmiSCT8H3sg1jhtaboHS3QINEnE0s="; + hash = "sha256-6yWo7SBlVldK+AxUBnQOXjQBxz9HbIC+Ch977xiZxek="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix index e4f67df674..91c03c9cb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/kaste/mockito-python"; changelog = "https://github.com/kaste/mockito-python/blob/${version}/CHANGES.txt"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix index a5b38b525f..82b91dd10d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, hatchling -, django -, pytestCheckHook -, pythonOlder -, pytest-django +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + django, + pytestCheckHook, + pythonOlder, + pytest-django, }: buildPythonPackage rec { pname = "model-bakery"; - version = "1.17.0"; - format = "pyproject"; + version = "1.18.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -19,25 +20,19 @@ buildPythonPackage rec { owner = "model-bakers"; repo = "model_bakery"; rev = "refs/tags/${version}"; - hash = "sha256-o3BI2lMwctR9tiGmY07dAOQUfv9K4rWkc/xI6uHnVfs="; + hash = "sha256-mf6NV7r/9kDCRlszx/QGtfEsC1O/SATd6+EX+w7ptEQ="; }; - nativeBuildInputs = [ - hatchling - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ - django - ]; + dependencies = [ django ]; nativeCheckInputs = [ pytest-django pytestCheckHook ]; - pythonImportsCheck = [ - "model_bakery" - ]; + pythonImportsCheck = [ "model_bakery" ]; meta = with lib; { description = "Object factory for Django"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix index a2af96582c..e88b9d585d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "monty"; - version = "2024.3.31"; + version = "2024.4.17"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = "monty"; rev = "refs/tags/v${version}"; - hash = "sha256-Gg9KTsS7Np11jYBA8MgblQM6OmzOM/MPLsVZ6fUKT6g="; + hash = "sha256-UqpRkw6F8RAvchq0HBSfdHHO8Lgg+yLdBku+wsPKg0E="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpegdash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpegdash/default.nix new file mode 100644 index 0000000000..3480c4dcaf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpegdash/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, +}: +buildPythonPackage rec { + pname = "mpegdash"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "sangwonl"; + repo = "python-mpegdash"; + rev = version; + hash = "sha256-eKtJ+QzeoMog5X1r1ix9vrmGTi/9KzdJiu80vrTX14I="; + }; + + nativeBuildInputs = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + # requires network access + "test_xml2mpd_from_url" + ]; + + pythonImportsCheck = [ "mpegdash" ]; + + meta = { + description = "MPEG-DASH MPD(Media Presentation Description) Parser"; + homepage = "https://github.com/sangwonl/python-mpegdash"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drawbu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix index b5f4e403ab..9119db8a20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "mpi4py"; - version = "3.1.5"; + version = "3.1.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-pwbnbbklUTXC+10e9Uy097DkrZ4zy62n3idiYgXyoVM="; + hash = "sha256-yPpiXg+SsILvlVv7UvGfpmkdKSc9fXETXSlaoUPe5ss="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mplhep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mplhep/default.nix index 3988db9a8d..845d9942f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mplhep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mplhep/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.46"; + version = "0.3.48"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-MEYIvKwQLbQPgaEEpSXs6v1MUQ/txzU8D0Ivd/6TlMw="; + hash = "sha256-rAIiaTTSf1xINdadjHk32KOpW4SMg8jdwFt8z1oiLis="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpmath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpmath/default.nix index 1a8e4c0309..20e7049ac3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpmath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpmath/default.nix @@ -5,6 +5,9 @@ , isPyPy , setuptools , pytestCheckHook + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -29,6 +32,8 @@ buildPythonPackage rec { ]; }; + passthru.tests = { inherit sage; }; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix index 93b3b99acc..7dc4e3fd06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.3.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-RdjACxEB4w1Sbdf8lPHd12XcEMXBqaa84mF9XvavyHo="; + hash = "sha256-UaGdusPGWlF7gTzpCq9WrF/evdDSK5srrkH8/Vz9O8M="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix index fd297474eb..830a37164a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -1,57 +1,52 @@ -{ lib -, olefile -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, cryptography -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + olefile, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + cryptography, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "msoffcrypto-tool"; - version = "5.3.1"; - format = "pyproject"; + version = "5.4.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "nolze"; - repo = pname; + repo = "msoffcrypto-tool"; rev = "refs/tags/v${version}"; - hash = "sha256-aQtEJyG0JGe4eSIRI4OUjJZNDBni6FFyJXXkbeiotSY="; + hash = "sha256-1LTFwXTIvFdrYyI1pDUPzQHw3/043+FGHDnKYWaomY0="; }; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ cryptography olefile setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Test fails with AssertionError "test_cli" ]; - pythonImportsCheck = [ - "msoffcrypto" - ]; + pythonImportsCheck = [ "msoffcrypto" ]; meta = with lib; { description = "Python tool and library for decrypting MS Office files with passwords or other keys"; - mainProgram = "msoffcrypto-tool"; homepage = "https://github.com/nolze/msoffcrypto-tool"; changelog = "https://github.com/nolze/msoffcrypto-tool/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "msoffcrypto-tool"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mujoco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mujoco/default.nix index 9237dbb650..3c87874885 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mujoco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mujoco/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mujoco"; - version = "3.1.4"; + version = "3.1.5"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-GdeL1zMri/ArjXyjXTgan48WVPTHDA1/SZxtTYB8QFk="; + hash = "sha256-kJm6YAE0HMnji3uUuO96ZzRsdjj6PpT1IHQ6NXiR8pY="; }; nativeBuildInputs = [ cmake setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multipledispatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multipledispatch/default.nix index 1821bb864b..2fab50a63f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multipledispatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multipledispatch/default.nix @@ -23,6 +23,5 @@ buildPythonPackage rec { homepage = "https://github.com/mrocklin/multipledispatch/"; description = "A relatively sane approach to multiple dispatch in Python"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix index 0010e40800..73e0a33179 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -1,45 +1,59 @@ -{ lib -, fetchPypi -, buildPythonPackage -, protobuf -, types-protobuf -, grpcio-tools -, pytestCheckHook -, pythonOlder +{ + buildPythonPackage, + fetchPypi, + grpcio-tools, + lib, + mypy-protobuf, + protobuf, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + setuptools, + testers, + types-protobuf, }: buildPythonPackage rec { pname = "mypy-protobuf"; - version = "3.5.0"; - format = "pyproject"; + version = "3.6.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IfJw2gqXkqnax2sN9GPAJ+VhZkq2lzxZvk5NBk3+Z9w="; + hash = "sha256-AvJC6zQJ9miJ8rGjqlg1bsTZCc3Q+TEVYi6ecDZuyjw="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "protobuf" ]; + + build-system = [ setuptools ]; + + dependencies = [ + grpcio-tools protobuf types-protobuf - grpcio-tools ]; doCheck = false; # ModuleNotFoundError: No module named 'testproto' - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "mypy_protobuf" - ]; + pythonImportsCheck = [ "mypy_protobuf" ]; - meta = with lib; { + passthru.tests.version = testers.testVersion { + package = mypy-protobuf; + command = "${lib.getExe mypy-protobuf} --version"; + }; + + meta = { + changelog = "https://github.com/nipunn1313/mypy-protobuf/blob/v${version}/CHANGELOG.md"; description = "Generate mypy stub files from protobuf specs"; - homepage = "https://github.com/dropbox/mypy-protobuf"; - license = licenses.asl20; - maintainers = with maintainers; [ lnl7 ]; + homepage = "https://github.com/nipunn1313/mypy-protobuf"; + license = lib.licenses.asl20; + mainProgram = "protoc-gen-mypy"; + maintainers = with lib.maintainers; [ lnl7 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-docutils/default.nix index 66c07489df..8fa7ddd6e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-docutils/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "myst-docutils"; - version = "2.0.0"; + version = "3.0.1"; format = "pyproject"; src = fetchPypi { pname = "myst_docutils"; inherit version; - hash = "sha256-WmmPEg+bINmeId+pjR6bbp8qzjfSXfEel+sQEdPIu8Y="; + hash = "sha256-alQvF0OWNjDck022ORJ1Nl4t1jgzMZKEbJxPHsrmBcI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix index 644724c412..8f23ad5dee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/MyST-NB"; changelog = "https://github.com/executablebooks/MyST-NB/raw/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix index e485b768a7..12ddb2ec76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix @@ -4,6 +4,7 @@ , fetchpatch , flit-core , pythonOlder +, defusedxml , docutils , jinja2 , markdown-it-py @@ -16,6 +17,7 @@ , pytest-regressions , sphinx-pytest , pytestCheckHook +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -40,7 +42,10 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ docutils @@ -54,6 +59,7 @@ buildPythonPackage rec { nativeCheckInputs = [ beautifulsoup4 + defusedxml pytest-param-files pytest-regressions sphinx-pytest @@ -64,6 +70,10 @@ buildPythonPackage rec { "myst_parser" ]; + pythonRelaxDeps = [ + "docutils" + ]; + disabledTests = [ # AssertionError due to different files "test_basic" @@ -72,6 +82,9 @@ buildPythonPackage rec { "test_fieldlist_extension" # docutils 0.19 expectation mismatches "test_docutils_roles" + # sphinx 7.0 expectation mismatches + "test_heading_slug_func" + "test_references_singlehtml" # sphinx 6.0 expectation mismatches "test_sphinx_directives" # sphinx 5.3 expectation mismatches diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nanobind/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nanobind/default.nix new file mode 100644 index 0000000000..9e632ff0f1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nanobind/default.nix @@ -0,0 +1,74 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + cmake, + eigen, + ninja, + scikit-build, + pytestCheckHook, + numpy, + scipy, + torch, + jax, + jaxlib, + tensorflow, + setuptools, +}: +buildPythonPackage rec { + pname = "nanobind"; + version = "1.9.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "wjakob"; + repo = pname; + rev = "v${version}"; + hash = "sha256-6swDqw7sEYOawQbNWD8VfSQoi+9wjhOhOOwPPkahDas="; + fetchSubmodules = true; + }; + + disabled = pythonOlder "3.8"; + + nativeBuildInputs = [ + cmake + ninja + scikit-build + setuptools + ]; + buildInputs = [ eigen ]; + dontUseCmakeBuildDir = true; + + preCheck = '' + # build tests + make -j $NIX_BUILD_CORES + ''; + + nativeCheckInputs = [ + pytestCheckHook + numpy + scipy + torch + tensorflow + # Uncomment at next release (1.9.3) + # See https://github.com/wjakob/nanobind/issues/578 + # jax + # jaxlib + ]; + + meta = with lib; { + homepage = "https://github.com/wjakob/nanobind"; + changelog = "https://github.com/wjakob/nanobind/blob/${src.rev}/docs/changelog.rst"; + description = "Tiny and efficient C++/Python bindings"; + longDescription = '' + nanobind is a small binding library that exposes C++ types in Python and + vice versa. It is reminiscent of Boost.Python and pybind11 and uses + near-identical syntax. In contrast to these existing tools, nanobind is + more efficient: bindings compile in a shorter amount of time, produce + smaller binaries, and have better runtime performance. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ parras ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix index 06b2ed5f63..1125b88c0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nanomsg-python/default.nix @@ -1,22 +1,35 @@ -{ lib, buildPythonPackage, fetchFromGitHub, nanomsg }: +{ + lib, + buildPythonPackage, + fetchFromGitHub, + nanomsg, + setuptools, + pythonOlder, +}: buildPythonPackage { pname = "nanomsg-python"; version = "1.0.20190114"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tonysimpson"; repo = "nanomsg-python"; rev = "3acd9160f90f91034d4a43ce603aaa19fbaf1f2e"; - sha256 = "1qgybcpmm9xxrn39alcgdcpvwphgm1glkbnwx0ljpz4nd1jsnyrl"; + hash = "sha256-NHurZWiW/Csp6NyuSV+oD16+L2uPUZWGzb2nWi9b/uE="; }; + build-system = [ setuptools ]; + buildInputs = [ nanomsg ]; # Tests requires network connections doCheck = false; + pythonImportsCheck = [ "nanomsg" ]; + meta = with lib; { description = "Bindings for nanomsg"; homepage = "https://github.com/tonysimpson/nanomsg-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nanotime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nanotime/default.nix index aeabc540eb..d41126916b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nanotime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nanotime/default.nix @@ -1,24 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi, nose }: +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pythonOlder, +}: buildPythonPackage rec { pname = "nanotime"; version = "0.5.2"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c7cc231fc5f6db401b448d7ab51c96d0a4733f4b69fabe569a576f89ffdf966b"; + hash = "sha256-x8wjH8X220AbRI16tRyW0KRzP0tp+r5Wmldvif/flms="; }; - nativeCheckInputs = [ nose ]; + build-system = [ setuptools ]; - checkPhase = '' - nosetests - ''; - - # tests currently fail + # Tests currently failing + # https://github.com/jbenet/nanotime/issues/2 doCheck = false; + pythonImportsCheck = [ "nanotime" ]; + meta = with lib; { description = "Provides a time object that keeps time as the number of nanoseconds since the UNIX epoch"; homepage = "https://github.com/jbenet/nanotime/tree/master/python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napari-console/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napari-console/default.nix index 9072ada93f..07b8d73573 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napari-console/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napari-console/default.nix @@ -1,47 +1,44 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, imageio -, ipykernel -, ipython -, napari-plugin-engine -, pythonOlder -, qtconsole -, setuptools-scm +{ + lib, + buildPythonPackage, + fetchFromGitHub, + imageio, + ipykernel, + ipython, + napari-plugin-engine, + pythonOlder, + qtconsole, + qtpy, + setuptools-scm, }: buildPythonPackage rec { pname = "napari-console"; - version = "0.0.7"; - format = "pyproject"; + version = "0.0.9"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "napari"; - repo = pname; + repo = "napari-console"; rev = "refs/tags/v${version}"; - hash = "sha256-vHLCVMgrcs54pGb48wQpc0h7QBIfE6r7hCSoDNI3QvA="; + hash = "sha256-3gOfiPx06G5c4eaLQ5kP45hUr6yw91esznJFacpO66Q="; }; - nativeBuildInputs = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ - imageio + dependencies = [ ipykernel ipython - napari-plugin-engine qtconsole + qtpy ]; # Circular dependency: napari doCheck = false; - pythonImportsCheck = [ - "napari_console" - ]; + pythonImportsCheck = [ "napari_console" ]; meta = with lib; { description = "A plugin that adds a console to napari"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napari/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napari/default.nix index 0bccb01657..b5baed96a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napari/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napari/default.nix @@ -1,67 +1,69 @@ -{ lib -, mkDerivationWith -, appdirs -, app-model -, buildPythonPackage -, cachey -, certifi -, dask -, docstring-parser -, fetchFromGitHub -, imageio -, jsonschema -, magicgui -, napari-console -, napari-npe2 -, napari-svg -, numpydoc -, pint -, psutil -, pydantic -, pyopengl -, pillow -, pythonOlder -, pyyaml -, scikit-image -, scipy -, setuptools-scm -, sphinx -, superqt -, tifffile -, toolz -, tqdm -, typing-extensions -, vispy -, wrapQtAppsHook -, wrapt +{ + lib, + app-model, + appdirs, + buildPythonPackage, + cachey, + certifi, + dask, + docstring-parser, + fetchFromGitHub, + imageio, + jsonschema, + magicgui, + mkDerivationWith, + napari-console, + napari-npe2, + napari-svg, + numpydoc, + pandas, + pillow, + pint, + psutil, + pydantic, + pyopengl, + pythonOlder, + pyyaml, + scikit-image, + scipy, + setuptools, + setuptools-scm, + superqt, + tifffile, + toolz, + tqdm, + typing-extensions, + vispy, + wrapQtAppsHook, + wrapt, }: mkDerivationWith buildPythonPackage rec { pname = "napari"; version = "0.4.19.post1"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "napari"; - repo = pname; + repo = "napari"; rev = "refs/tags/v${version}"; hash = "sha256-qw5WdFPySNkmm+dNu+hqsmr+csBpHnSl9bMpb4nKEqI="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace "scikit-image>=0.19.1" "scikit-image" \ - --replace "sphinx<5" "sphinx" \ - --replace "vispy>=0.11.0,<0.12" "vispy" + --replace-fail "scikit-image[data]>=0.19.1" "scikit-image" ''; - nativeBuildInputs = [ + build-system = [ + setuptools setuptools-scm - wrapQtAppsHook ]; + nativeBuildInputs = [ wrapQtAppsHook ]; + propagatedBuildInputs = [ app-model appdirs @@ -76,15 +78,15 @@ mkDerivationWith buildPythonPackage rec { napari-npe2 napari-svg numpydoc - pint + pandas pillow + pint psutil pydantic pyopengl pyyaml scikit-image scipy - sphinx superqt tifffile toolz diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nats-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nats-python/default.nix index 9662dddd5d..f93b2feab6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nats-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nats-python/default.nix @@ -1,41 +1,39 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, poetry-core -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + poetry-core, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "nats-python"; version = "0.8.0"; - disabled = pythonOlder "3.6"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Gr1N"; repo = "nats-python"; - rev = version; - sha256 = "1j7skyxldir3mphvnsyhjxmf3cimv4h7n5v58jl2gff4yd0hdw7g"; + rev = "refs/tags/${version}"; + hash = "sha256-7/AGQfPEuSeoRGUXeyDZNbLhapfQa7vhrSPHRruf+sg="; }; - nativeBuildInputs = [ - poetry-core - ]; - patches = [ # Switch to poetry-core, https://github.com/Gr1N/nats-python/pull/19 (fetchpatch { name = "use-poetry-core.patch"; url = "https://github.com/Gr1N/nats-python/commit/71b25b324212dccd7fc06ba3914491adba22e83f.patch"; - sha256 = "1fip1qpzk2ka7qgkrdpdr6vnrnb1p8cwapa51xp0h26nm7yis1gl"; + hash = "sha256-9AUd/anWCAhuD0VdxRm6Ydlst8nttjwfPmqK+S8ON7o="; }) ]; - propagatedBuildInputs = [ - setuptools - ]; + build-system = [ poetry-core ]; + + dependencies = [ setuptools ]; # Tests require a running NATS server doCheck = false; @@ -45,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for NATS messaging system"; homepage = "https://github.com/Gr1N/nats-python"; + changelog = "https://github.com/Gr1N/nats-python/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/naturalsort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/naturalsort/default.nix index 9d7572fb0f..8be9da8328 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/naturalsort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/naturalsort/default.nix @@ -1,20 +1,36 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: buildPythonPackage rec { pname = "naturalsort"; version = "1.5.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "xolox"; repo = "python-naturalsort"; - rev = version; - sha256 = "0w43vlddzh97hffnvxp2zkrns9qyirx5g8ijxnxkbx1c4b4gq5ih"; + rev = "refs/tags/${version}"; + hash = "sha256-MBb8yCIs9DW77TKiV3qOHidt8/zi9m2dgyfB3xrdg3A="; }; + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "natsort" ]; + meta = with lib; { description = "Simple natural order sorting API for Python that just works"; homepage = "https://github.com/xolox/python-naturalsort"; + changelog = "https://github.com/xolox/python-naturalsort/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix index b80f75dc45..4375b18486 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix @@ -33,14 +33,14 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.16.3"; + version = "7.16.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pnM7eM49R8P4XlBJmElbB+bqnPm/bsHJjdpj7GrRkUI="; + hash = "sha256-hsqRuiZrCkSNyW+mxbnZiv+r3ihns2MlhwNTaAf59/Q="; }; # Add $out/share/jupyter to the list of paths that are used to search for diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix index 8a298ec19f..389f097767 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix @@ -1,40 +1,50 @@ { lib , buildPythonPackage , fetchPypi -, fastprogress +, pythonRelaxDepsHook +, setuptools +, ipywidgets , fastcore -, asttokens , astunparse , watchdog , execnb , ghapi , pyyaml -, quarto , pythonOlder }: buildPythonPackage rec { pname = "nbdev"; - version = "2.3.13"; - format = "setuptools"; + version = "2.3.20"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Umkf3CcRRSS+pK3UKeTg+Ru3TW+qHNoQ2F6nUk8jQUU="; + hash = "sha256-tBrWdG8njNQzQ3kc0ATeu3ToP34gdmOBKj2jcB0X8+8="; }; - propagatedBuildInputs = [ - fastprogress - fastcore - asttokens + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "ipywidgets" + ]; + + build-system = [ + setuptools + ]; + + dependencies = [ astunparse - watchdog execnb + fastcore ghapi + ipywidgets pyyaml - quarto + watchdog ]; # no real tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix index 588c5823ec..9cf0889793 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { mainProgram = "jupyter-trust"; homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh globin ]; + maintainers = with lib.maintainers; [ globin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbmake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbmake/default.nix new file mode 100644 index 0000000000..03606d7b07 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbmake/default.nix @@ -0,0 +1,74 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, pythonRelaxDepsHook +, setuptools +, wheel +, ipykernel +, nbclient +, nbformat +, pygments +, pytest +, pyyaml +, pytest-xdist +, pytestCheckHook +, typing-extensions +}: + +buildPythonPackage rec { + pname = "nbmake"; + version = "1.5.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "treebeardtech"; + repo = "nbmake"; + rev = "refs/tags/v${version}"; + hash = "sha256-sX0YqyBchLlo0QPIpLvl11/gwoiZknG5rBDzmQKiXhs="; + }; + + build-system = [ + poetry-core + pythonRelaxDepsHook + setuptools + wheel + ]; + + dependencies = [ + ipykernel + nbclient + nbformat + pygments + pytest + pyyaml + ]; + + pythonRelaxDeps = [ + "nbclient" + ]; + + pythonImportsCheck = [ + "nbmake" + ]; + + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + typing-extensions + ]; + + __darwinAllowLocalNetworking = true; + + + meta = with lib; { + description = "Pytest plugin for testing notebooks"; + homepage = "https://github.com/treebeardtech/nbmake"; + changelog = "https://github.com/treebeardtech/nbmake/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix index de0d972aa9..8fd5a9ce52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , docutils , jinja2 , nbconvert @@ -12,17 +13,21 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.9.3"; - format = "setuptools"; + version = "0.9.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7DOchpG2iPhnYQSjZ6S4zz6gH9CJ3CjSTewi1WOxFWI="; + hash = "sha256-BCpggG/CPVGbxb71nZVXBxORP+RC/adZ1T46r2IQR5Q="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ docutils jinja2 nbconvert diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ndspy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ndspy/default.nix index dbdce14ae1..c4a7a6bf55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ndspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ndspy/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Python library for many Nintendo DS file formats"; homepage = "https://github.com/RoadrunnerWMC/ndspy"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nebula3-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nebula3-python/default.nix index c352f732ef..fbc52dd1fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nebula3-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nebula3-python/default.nix @@ -1,18 +1,20 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pdm-backend -, future -, httplib2 -, pythonOlder -, pytz -, pytestCheckHook -, six +{ + lib, + buildPythonPackage, + fetchFromGitHub, + future, + httplib2, + httpx, + pdm-backend, + pytestCheckHook, + pythonOlder, + pytz, + six, }: buildPythonPackage rec { pname = "nebula3-python"; - version = "3.5.0"; + version = "3.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,27 +23,22 @@ buildPythonPackage rec { owner = "vesoft-inc"; repo = "nebula-python"; rev = "refs/tags/v${version}"; - hash = "sha256-T9lZVYov6tQ8QRM2QtOGyolHk3O5FSb3xq70nS2Rr6c="; + hash = "sha256-tpMm13iixtg3ZF4g7YgRLyd/VqJba51QPGPmFRpy0wA="; }; - build-system = [ - pdm-backend - ]; + build-system = [ pdm-backend ]; dependencies = [ future httplib2 + httpx pytz six - ]; + ] ++ httpx.optional-dependencies.http2; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "nebula3" - ]; + pythonImportsCheck = [ "nebula3" ]; disabledTestPaths = [ # Tests require a running thrift instance diff --git a/third_party/nixpkgs/pkgs/development/python-modules/neo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/neo/default.nix index d23d2fdc57..d4b5265ba8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/neo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/neo/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "neo"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VnXR+jgaU8LH7ri16SnsA5neILsLUkU+G5nsbWbckfM="; + hash = "sha256-gVhbKLZaTciakucc7TlCxdv9qnG90sw4U3G3ebVlTK0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix index cbe5d8f54f..bb1541fe72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix @@ -1,18 +1,19 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, numpy -, pandas -, pyarrow -, pythonOlder -, pytz -, setuptools -, tomlkit +{ + lib, + buildPythonPackage, + fetchFromGitHub, + numpy, + pandas, + pyarrow, + pythonOlder, + pytz, + setuptools, + tomlkit, }: buildPythonPackage rec { pname = "neo4j"; - version = "5.19.0"; + version = "5.20.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-bI6LIzh2+Kf6IIWEt1vT0E821lAPy/Nj2hkeAnRfV4M="; + hash = "sha256-ebWEtsgVj2NLYAKe8z6ge6TvnPmXh0Mqkx0b+ZcOePY="; }; postPatch = '' @@ -32,9 +33,7 @@ buildPythonPackage rec { --replace-fail '#readme = "README.rst"' 'version = "${version}"' ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ pytz @@ -42,24 +41,18 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - numpy = [ - numpy - ]; + numpy = [ numpy ]; pandas = [ numpy pandas ]; - pyarrow = [ - pyarrow - ]; + pyarrow = [ pyarrow ]; }; # Missing dependencies doCheck = false; - pythonImportsCheck = [ - "neo4j" - ]; + pythonImportsCheck = [ "neo4j" ]; meta = with lib; { description = "Neo4j Bolt Driver for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix index 185fffba41..d0a925859d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nestedtext"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "nestedtext"; rev = "refs/tags/v${version}"; - hash = "sha256-SHY/MTmYbNh3azkyvwEtuvT+V7YzfLi2B3FvBzv6Omo="; + hash = "sha256-lNqSmEmzuRGdXs/4mwKSh7yDGHnAykpIDIR+abbLCns="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix index 39994519db..72b03ef5d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix @@ -7,6 +7,7 @@ , oldest-supported-numpy , setuptools , wheel +, certifi , numpy , zlib , netcdf @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "netcdf4"; - version = "1.6.2"; + version = "1.6.5"; format = "pyproject"; disabled = isPyPy; @@ -27,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "netCDF4"; inherit version; - hash = "sha256-A4KwL/aiiEGfb/7IXexA9FH0G4dVVHFUxXXd2fD0rlM="; + hash = "sha256-gkiB0KrP3lvZgtat7dhXQlnIVVN4HnuD4M6CuJC/oO8="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + certifi cftime numpy zlib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix index a33f9d5286..f450b85abd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "nettigo-air-monitor"; rev = "refs/tags/${version}"; - hash = "sha256-aiJoY+6sNfBmE1057UuMjV80hjVJ29t2X16IIe6dxWs="; + hash = "sha256-Ysvyg2cj09Bb+xpNPapYAQSBDKfGsYZcHj9xxIR8KGw="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix index 93b1d2b2e3..50473f8465 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = "netutils"; rev = "refs/tags/v${version}"; - hash = "sha256-Eqs/YkU2XrjD7x2WgvvR89/Pdi9AW9vhw3alJ8kIDgc="; + hash = "sha256-09SRSzA1RiBhJjq+dlln23myWvXFhr8krsPz7N80JKw="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix index 0c4993cdd6..ac0bd456bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix @@ -19,19 +19,22 @@ # tests , pytest-xdist , pytestCheckHook + +# reverse dependency +, sage }: buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "3.2.1"; + version = "3.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-nxu1zzQJvzJOCnIsIL20wg7jm/HDDOiuSZyFArC14MY="; + hash = "sha256-DBJ9iy9IZfWa6cuKr81gtccPMkHr1m997618SrkBJsk="; }; nativeBuildInputs = [ @@ -53,6 +56,8 @@ buildPythonPackage rec { ]; }; + passthru.tests = { inherit sage; }; + nativeCheckInputs = [ pytest-xdist pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix index 2cbc5c4909..7c010a2243 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix @@ -55,6 +55,5 @@ buildPythonPackage rec { meta = { description = "API for interacting with the NI-DAQmx driver"; license = [ lib.licenses.mit ]; - maintainers = [ lib.maintainers.fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix index ce7cdee635..c4088ca7e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.10.3"; + version = "0.10.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-d4GTMTFMTKXBXAdjT2n4Vfr9+a3QUbGILjpgCtUnV9g="; + hash = "sha256-lFC9Vqd22ZezJPRd0Yv5bom9jYAWCXT8x1kzP7rqNcI="; }; nativeBuildInputs = [ hatch-vcs ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix index 9d727ec0ec..eb9677438e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "nocasedict"; - version = "2.0.1"; + version = "2.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-lgy2mfEgnagKw546tQqnNC/oyp9wYGwjRHpRBVBDXlA="; + hash = "sha256-HJImx/WoqXrVHcsK4xV6cg4/fLnEVo0i6joF4/hWWKk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix index d1cc83e517..8192e2dd4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix @@ -1,18 +1,30 @@ -{ lib, buildPythonPackage, fetchFromGitHub, cryptography, pytestCheckHook }: +{ + lib, + buildPythonPackage, + cryptography, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: buildPythonPackage rec { pname = "noiseprotocol"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "plizonczyk"; repo = "noiseprotocol"; - rev = "v${version}"; - sha256 = "1mk0rqpjifdv3v1cjwkdnjbrfmzzjm9f3qqs1r8vii4j2wvhm6am"; + rev = "refs/tags/v${version}"; + hash = "sha256-VZkKNxeSxLhRDhrj4VKV/1eXl7RtcsnCHru5KC/OYNY="; }; - propagatedBuildInputs = [ cryptography ]; + build-system = [ setuptools ]; + + dependencies = [ cryptography ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -21,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Noise Protocol Framework"; homepage = "https://github.com/plizonczyk/noiseprotocol/"; + changelog = "https://github.com/plizonczyk/noiseprotocol/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/normality/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/normality/default.nix index 862b3af929..966e399b24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/normality/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/normality/default.nix @@ -1,43 +1,48 @@ -{ lib -, fetchFromGitHub -, buildPythonPackage -, text-unidecode -, chardet -, banal -, pyicu -, pytestCheckHook +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools, + setuptools-scm, + text-unidecode, + charset-normalizer, + chardet, + banal, + pyicu, + pytestCheckHook, }: buildPythonPackage rec { pname = "normality"; - version = "2.2.5"; - format = "setuptools"; + version = "2.5.0"; + pyproject = true; src = fetchFromGitHub { owner = "pudo"; repo = "normality"; rev = version; - sha256 = "n8Ycm5DeFItmMJTolazZKGIyN7CTg2ajDCwi/UqzVe8="; + hash = "sha256-cGQpNhUqlT2B9wKDoDeDmyCNQLwWR7rTCLxnPHhMR0w="; }; + buildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ + charset-normalizer text-unidecode chardet banal pyicu ]; - nativeCheckInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "normality" - ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "normality" ]; meta = with lib; { description = "Micro-library to normalize text strings"; homepage = "https://github.com/pudo/normality"; license = licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose-exclude/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose-exclude/default.nix index f584779848..38d6cd3bb7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nose-exclude/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nose-exclude/default.nix @@ -24,6 +24,5 @@ buildPythonPackage rec { license = lib.licenses.lgpl21; description = "Exclude specific directories from nosetests runs"; homepage = "https://github.com/kgrandis/nose-exclude"; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose-xunitmp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose-xunitmp/default.nix new file mode 100644 index 0000000000..ee344b2e07 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nose-xunitmp/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, nose +}: + +buildPythonPackage rec { + pname = "nose-xunitmp"; + version = "0.4.1"; + pyproject = true; + + src = fetchPypi { + pname = "nose_xunitmp"; + inherit version; + hash = "sha256-wt9y9HYHUdMBU9Rzgiqr8afD1GL2ZKp/f9uNxibcfEA="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + nose + ]; + + pythonImportsCheck = [ + "nose_xunitmp" + ]; + + meta = { + description = "Xunit output when running multiprocess tests using nose"; + homepage = "https://pypi.org/project/nose_xunitmp/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix index 51a41bedc9..9d402201dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix @@ -1,29 +1,30 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, paho-mqtt -, poetry-core -, psutil -, pytestCheckHook -, python-gnupg -, pythonOlder -, pythonRelaxDepsHook -, sentry-sdk -, tomli +{ + lib, + buildPythonPackage, + fetchFromGitHub, + paho-mqtt, + poetry-core, + psutil, + pytestCheckHook, + python-gnupg, + pythonOlder, + pythonRelaxDepsHook, + sentry-sdk, + tomli, }: buildPythonPackage rec { pname = "notus-scanner"; - version = "22.6.2"; - format = "pyproject"; + version = "22.6.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "greenbone"; - repo = pname; + repo = "notus-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-V70cFSfQ9SuLhCSUa8DuYA7qaabwiK9IbIkYcQMgVUk="; + hash = "sha256-LYYof/s0OvXMbEH7jyFIymUVrWYUd/6lychIzfPlylc="; }; pythonRelaxDeps = [ @@ -31,27 +32,20 @@ buildPythonPackage rec { "python-gnupg" ]; - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ paho-mqtt psutil python-gnupg sentry-sdk - ] ++ lib.optionals (pythonOlder "3.11") [ - tomli - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "notus.scanner" - ]; + pythonImportsCheck = [ "notus.scanner" ]; meta = with lib; { description = "Helper to create results from local security checks"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix index c4c37b7ad3..22e3db22f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "numba-scipy"; - version = "0.3.1"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-cApTGH5GJZH/RbkRjKhL3injvixD5kvfaS49FjrPA2U="; + hash = "sha256-RDZF1mNcZnrcOzjQpjbZq8yXHnjeLAeAjYmvzXvFhEQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix index 2df58149ba..bc199e2c6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -20,7 +20,7 @@ # CUDA-only dependencies: , addDriverRunpath -, autoAddDriverRunpath ? cudaPackages.autoAddDriverRunpathHook or cudaPackages.autoAddOpenGLRunpathHook +, autoAddDriverRunpath , cudaPackages # CUDA flags: @@ -139,6 +139,5 @@ in buildPythonPackage rec { homepage = "https://numba.pydata.org/"; license = licenses.bsd2; mainProgram = "numba"; - maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix index 4de1e4a7de..ca8e329771 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix @@ -2,30 +2,38 @@ , buildPythonPackage , fetchPypi , numpy -, packaging -, python -, pythonOlder +, pytestCheckHook +, setuptools +, wheel }: buildPythonPackage rec { pname = "numexpr"; - version = "2.9.0"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + version = "2.10.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8h0S9sQyzjSQieuVNCur9mKa67P93xh6RJLTqtqtqvA="; + hash = "sha256-yJ6TB1JjnfBAU5FgMm2PmahBWbvqQZQ6uOlgWR7arvA="; }; - nativeBuildInputs = [ + # patch for compatibility with numpy < 2.0 + # see more details, https://numpy.org/devdocs/numpy_2_0_migration_guide.html#c-api-changes + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0.0rc1" "numpy" + sed -i "1i#define PyDataType_SET_ELSIZE(descr, elsize)" numexpr/interpreter.cpp + sed -i "1i#define PyDataType_ELSIZE(descr) ((descr)->elsize)" numexpr/interpreter.cpp + ''; + + build-system = [ + setuptools + wheel numpy ]; - propagatedBuildInputs = [ + dependencies = [ numpy - packaging ]; preBuild = '' @@ -33,13 +41,25 @@ buildPythonPackage rec { ln -s ${numpy.cfg} site.cfg ''; - checkPhase = '' - runtest="$(pwd)/numexpr/tests/test_numexpr.py" - pushd "$out" - ${python.interpreter} "$runtest" + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + pushd $out + ''; + + postCheck = '' popd ''; + disabledTests = [ + # fails on computers with more than 8 threads + # https://github.com/pydata/numexpr/issues/479 + "test_numexpr_max_threads_empty_string" + "test_omp_num_threads_empty_string" + ]; + pythonImportsCheck = [ "numexpr" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch b/third_party/nixpkgs/pkgs/development/python-modules/numpy/0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch deleted file mode 100644 index b9bc53e0b8..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 0d0476328a1a2e3dd3e96340bd4ddd04d98c067b Mon Sep 17 00:00:00 2001 -From: Ralf Gommers -Date: Thu, 26 Oct 2023 16:57:03 +0200 -Subject: [PATCH] BLD: remove last usage of `distutils` in - `_core/code_generators/` - ---- - numpy/core/code_generators/genapi.py | 9 --------- - numpy/core/code_generators/generate_numpy_api.py | 7 +------ - numpy/core/code_generators/generate_ufunc_api.py | 7 +------ - 3 files changed, 2 insertions(+), 21 deletions(-) - -diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py -index 2cdaba52d..d9d7862b2 100644 ---- a/numpy/core/code_generators/genapi.py -+++ b/numpy/core/code_generators/genapi.py -@@ -304,15 +304,6 @@ def find_functions(filename, tag='API'): - fo.close() - return functions - --def should_rebuild(targets, source_files): -- from distutils.dep_util import newer_group -- for t in targets: -- if not os.path.exists(t): -- return True -- sources = API_FILES + list(source_files) + [__file__] -- if newer_group(sources, targets[0], missing='newer'): -- return True -- return False - - def write_file(filename, data): - """ -diff --git a/numpy/core/code_generators/generate_numpy_api.py b/numpy/core/code_generators/generate_numpy_api.py -index ae38c4efc..640bae9e5 100644 ---- a/numpy/core/code_generators/generate_numpy_api.py -+++ b/numpy/core/code_generators/generate_numpy_api.py -@@ -148,12 +148,7 @@ def generate_api(output_dir, force=False): - targets = (h_file, c_file) - - sources = numpy_api.multiarray_api -- -- if (not force and not genapi.should_rebuild(targets, [numpy_api.__file__, __file__])): -- return targets -- else: -- do_generate_api(targets, sources) -- -+ do_generate_api(targets, sources) - return targets - - def do_generate_api(targets, sources): -diff --git a/numpy/core/code_generators/generate_ufunc_api.py b/numpy/core/code_generators/generate_ufunc_api.py -index e03299a52..3734cbd6a 100644 ---- a/numpy/core/code_generators/generate_ufunc_api.py -+++ b/numpy/core/code_generators/generate_ufunc_api.py -@@ -125,12 +125,7 @@ def generate_api(output_dir, force=False): - targets = (h_file, c_file) - - sources = ['ufunc_api_order.txt'] -- -- if (not force and not genapi.should_rebuild(targets, sources + [__file__])): -- return targets -- else: -- do_generate_api(targets, sources) -- -+ do_generate_api(targets, sources) - return targets - - def do_generate_api(targets, sources): --- -2.42.0 - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix index 7aee840ab9..f0acca333f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -19,6 +19,9 @@ , blas , lapack +# Reverse dependency +, sage + # tests , hypothesis , pytest-xdist @@ -88,6 +91,9 @@ in buildPythonPackage rec { # remove needless reference to full Python path stored in built wheel substituteInPlace numpy/meson.build \ --replace 'py.full_path()' "'python'" + + substituteInPlace pyproject.toml \ + --replace-fail "meson-python>=0.15.0,<0.16.0" "meson-python" ''; nativeBuildInputs = [ @@ -174,6 +180,7 @@ in buildPythonPackage rec { blas = blas.provider; blasImplementation = blas.implementation; inherit cfg; + tests = { inherit sage; }; }; # Disable test @@ -186,6 +193,5 @@ in buildPythonPackage rec { mainProgram = "f2py"; homepage = "https://numpy.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix index a38b43b2d8..857ce48b90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, setuptools , jax , jaxlib , multipledispatch @@ -15,17 +16,21 @@ buildPythonPackage rec { pname = "numpyro"; - version = "0.14.0"; - format = "setuptools"; + version = "0.15.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit version pname; - hash = "sha256-PkPqqchDRz166TnBg+ENsU4ju0KwrR3pCuFaRRF23kg="; + hash = "sha256-4WyfR8wx4qollYSgtslEMSCB0zypJAYCJjKtWEsOYA0="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ jax jaxlib multipledispatch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix index 87f2fcfb43..a9dde5d662 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "2.14"; + version = "2.14.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,15 +30,9 @@ buildPythonPackage rec { owner = "lilydjwg"; repo = "nvchecker"; rev = "v${version}"; - hash = "sha256-QqfF8PGY8sULv1x0blu21ucWxqhOpQ7jyLuRCzDIpco="; + hash = "sha256-V2lTGeaiwUsh8IONbZ5GQrqevJMhjeuFLTDF8UdWg8Q="; }; - postPatch = '' - # Fix try/except syntax. Remove with the next release - substituteInPlace tests/test_jq.py \ - --replace-warn "except jq" "except ImportError" - ''; - nativeBuildInputs = [ setuptools docutils @@ -92,6 +86,6 @@ buildPythonPackage rec { homepage = "https://github.com/lilydjwg/nvchecker"; changelog = "https://github.com/lilydjwg/nvchecker/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix index b5c8f5a53d..b88947b15c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "12.535.133"; + version = "12.550.52"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-sVWa8NV90glVv1jQWv/3sWbd1ElH6zBRyZBWOHmesdw="; + hash = "sha256-3+3XFDNccuZaMshun12xzUlSbUTW2McoCdmWlY9zTAc="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix index 7f2725e9d2..68ef0f4492 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , jax , jaxlib , keras @@ -30,7 +29,12 @@ buildPythonPackage rec { hash = "sha256-WD+pmR8cEay4iziRXqF3sHUzCMBjmLJ3wZ3iYOD+hzk="; }; - nativeBuildInputs = [ + patches = [ + # Issue reported upstream: https://github.com/google/objax/issues/270 + ./replace-deprecated-device_buffers.patch + ]; + + build-system = [ setuptools ]; @@ -40,7 +44,7 @@ buildPythonPackage rec { jaxlib ]; - propagatedBuildInputs = [ + dependencies = [ jax numpy parameterized diff --git a/third_party/nixpkgs/pkgs/development/python-modules/objax/replace-deprecated-device_buffers.patch b/third_party/nixpkgs/pkgs/development/python-modules/objax/replace-deprecated-device_buffers.patch new file mode 100644 index 0000000000..fc0fd50a90 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/objax/replace-deprecated-device_buffers.patch @@ -0,0 +1,14 @@ +diff --git a/objax/util/util.py b/objax/util/util.py +index c31a356..344cf9a 100644 +--- a/objax/util/util.py ++++ b/objax/util/util.py +@@ -117,7 +117,8 @@ def get_local_devices(): + if _local_devices is None: + x = jn.zeros((jax.local_device_count(), 1), dtype=jn.float32) + sharded_x = map_to_device(x) +- _local_devices = [b.device() for b in sharded_x.device_buffers] ++ device_buffers = [buf.data for buf in sharded_x.addressable_shards] ++ _local_devices = [list(b.devices())[0] for b in device_buffers] + return _local_devices + + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix index 6ef9bbd0d5..c0d759db7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.125.3"; + version = "2.126.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-Y36x65O6XHNju/tWN0Qd3HyJ/YXTNe/VO+Z4XDtPPos="; + hash = "sha256-eejIDpKpPekxrm1H9x2skxK67KNUm9mmrGM23hZ6ztM="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix index 3f880f9d5f..eb5cf1ecfe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix @@ -9,6 +9,7 @@ , jbig2enc , packaging , pdfminer-six +, pillow-heif , pikepdf , pillow , pluggy @@ -18,19 +19,17 @@ , pythonOlder , rich , reportlab -, setuptools , setuptools-scm , substituteAll , tesseract , tqdm -, typing-extensions , unpaper , installShellFiles }: buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.1.2"; + version = "16.2.0"; disabled = pythonOlder "3.10"; @@ -46,10 +45,11 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-nZvfkfO5u3iuN0g/KITWbhYCRAJngEOKCW48z6IEPMI="; + hash = "sha256-sqhuQ+no6UymxbVtDtWiYQK8kKpO1y37NxLDmRT1LEQ="; }; patches = [ + ./use-pillow-heif.patch (substituteAll { src = ./paths.patch; gs = lib.getExe ghostscript; @@ -60,30 +60,31 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ - setuptools + build-system = [ setuptools-scm + ]; + + nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ + dependencies = [ deprecation img2pdf packaging pdfminer-six + pillow-heif pikepdf pillow pluggy - reportlab rich - ] ++ lib.optionals (pythonOlder "3.10") [ - typing-extensions ]; nativeCheckInputs = [ hypothesis pytest-xdist pytestCheckHook + reportlab ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch new file mode 100644 index 0000000000..fc464cf71b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch @@ -0,0 +1,26 @@ +diff --git a/pyproject.toml b/pyproject.toml +index d045458f..efa9161d 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -16,7 +16,7 @@ dependencies = [ + "img2pdf>=0.5", + "packaging>=20", + "pdfminer.six>=20220319", +- "pi-heif", # Heif image format - maintainers: if this is removed, it will NOT break ++ "pillow-heif", # Heif image format - maintainers: if this is removed, it will NOT break + "pikepdf>=8.10.1", + "Pillow>=10.0.1", + "pluggy>=1", +diff --git a/src/ocrmypdf/_pipeline.py b/src/ocrmypdf/_pipeline.py +index 043a78a0..522197b1 100644 +--- a/src/ocrmypdf/_pipeline.py ++++ b/src/ocrmypdf/_pipeline.py +@@ -42,7 +42,7 @@ from ocrmypdf.pdfinfo import Colorspace, Encoding, PageInfo, PdfInfo + from ocrmypdf.pluginspec import OrientationConfidence + + try: +- from pi_heif import register_heif_opener ++ from pillow_heif import register_heif_opener + except ImportError: + + def register_heif_opener(): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix index 179ecd1a31..b4df20c9da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.4.1"; + version = "3.5.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-AZkbLTMWSUfrbgXZzvKy+maNaB7AwLPoh3Q8QT4Zq5U="; + hash = "sha256-ep3kU6Rdbev5SKnqQq9t4tC7RWp4b+uaWBWfE2Pydqc="; }; buildInputs = [ pip ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oemthermostat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oemthermostat/default.nix index f40e39f10b..154a3f7f1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oemthermostat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oemthermostat/default.nix @@ -1,45 +1,39 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, requests -, setuptools-scm +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + requests, + setuptools-scm, }: buildPythonPackage rec { pname = "oemthermostat"; version = "1.1.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Cadair"; repo = "openenergymonitor_thermostat"; - rev = "v${version}"; - sha256 = "vrMw3/X8MtejO1WyUA1DOlfVCPTCPgcK5p3+OlTWcM4="; + rev = "refs/tags/v${version}"; + hash = "sha256-vrMw3/X8MtejO1WyUA1DOlfVCPTCPgcK5p3+OlTWcM4="; }; - nativeBuildInputs = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ - requests - ]; + dependencies = [ requests ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "oemthermostat" - ]; + pythonImportsCheck = [ "oemthermostat" ]; meta = with lib; { description = "Python module to interact with OpenEnergyMonitor thermostats"; homepage = "https://github.com/Cadair/openenergymonitor_thermostat"; + changelog = "https://github.com/Cadair/openenergymonitor_thermostat/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/okta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/okta/default.nix index 13218b0d8f..6b4787570c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/okta/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/okta/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "okta"; - version = "2.9.5"; + version = "2.9.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qMcO0TTbMPjc+r2IOlwJqbaSOztat9MmYWH4kgy9vwA="; + hash = "sha256-WRWbS8bYUafnvnTKLHlV7YV5410E0jk2UYos2F20A7k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ollama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ollama/default.nix index 8bc0639b01..299af4e9c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ollama/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ollama/default.nix @@ -1,19 +1,20 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, httpx -, pillow -, poetry-core -, pytest-asyncio -, pytest-httpserver -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + httpx, + pillow, + poetry-core, + pytest-asyncio, + pytest-httpserver, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, }: buildPythonPackage rec { pname = "ollama"; - version = "0.1.8"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "ollama"; repo = "ollama-python"; rev = "refs/tags/v${version}"; - hash = "sha256-hMNoWalUL+5FzmV5ICj7Zl6cTWzE6xGWfTf5++c36+E="; + hash = "sha256-kfotKUUXBekUd0X32BYAjNWvQJO94bdEDCSrBg2yJRQ="; }; postPatch = '' @@ -30,18 +31,13 @@ buildPythonPackage rec { --replace-fail "0.0.0" "${version}" ''; - pythonRelaxDeps = [ - "httpx" - ]; + pythonRelaxDeps = [ "httpx" ]; - build-system = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; - dependencies = [ - httpx - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ httpx ]; nativeCheckInputs = [ pillow @@ -50,9 +46,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "ollama" - ]; + pythonImportsCheck = [ "ollama" ]; meta = with lib; { description = "Ollama Python library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix index 0412a0f807..b87e8f9259 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix @@ -48,6 +48,27 @@ buildPythonPackage rec { "test_s3_info" ]; + pytestFlagsArray = [ + # Fail with RecursionError + # https://github.com/ome/ome-zarr-py/issues/352 + "--deselect=tests/test_cli.py::TestCli::test_astronaut_download" + "--deselect=tests/test_cli.py::TestCli::test_astronaut_info" + "--deselect=tests/test_cli.py::TestCli::test_coins_info" + "--deselect=tests/test_emitter.py::test_close" + "--deselect=tests/test_emitter.py::test_create_wrong_encoding" + "--deselect=tests/test_node.py::TestNode::test_image" + "--deselect=tests/test_node.py::TestNode::test_label" + "--deselect=tests/test_node.py::TestNode::test_labels" + "--deselect=tests/test_ome_zarr.py::TestOmeZarr::test_download" + "--deselect=tests/test_ome_zarr.py::TestOmeZarr::test_info" + "--deselect=tests/test_reader.py::TestReader::test_image" + "--deselect=tests/test_reader.py::TestReader::test_label" + "--deselect=tests/test_reader.py::TestReader::test_labels" + "--deselect=tests/test_starting_points.py::TestStartingPoints::test_label" + "--deselect=tests/test_starting_points.py::TestStartingPoints::test_labels" + "--deselect=tests/test_starting_points.py::TestStartingPoints::test_top_level" + ]; + pythonImportsCheck = [ "ome_zarr" "ome_zarr.cli" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix index 8ee54d3c69..445d15f439 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix @@ -18,11 +18,12 @@ buildPythonPackage rec { pname = "omegaconf"; version = "2.3.0"; pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "omry"; - repo = pname; + repo = "omegaconf"; rev = "refs/tags/v${version}"; hash = "sha256-Qxa4uIiX5TAyQ5rFkizdev60S4iVAJ08ES6FpNqf8zI="; }; @@ -45,12 +46,15 @@ buildPythonPackage rec { sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements/base.txt ''; - nativeBuildInputs = [ + build-system = [ setuptools + ]; + + nativeBuildInputs = [ jre_minimal ]; - propagatedBuildInputs = [ + dependencies = [ antlr4-python3-runtime pyyaml ]; @@ -71,6 +75,10 @@ buildPythonPackage rec { "ignore::DeprecationWarning" ]; + disabledTests = [ + "test_eq" + ]; + meta = with lib; { description = "Framework for configuring complex applications"; homepage = "https://github.com/omry/omegaconf"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onetimepass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onetimepass/default.nix index 3bea443a36..dde4983c2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onetimepass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onetimepass/default.nix @@ -1,23 +1,35 @@ -{ lib, buildPythonPackage, fetchFromGitHub, six, timecop }: +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + six, + timecop, + unittestCheckHook, +}: buildPythonPackage rec { pname = "onetimepass"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tadeck"; - repo = pname; - rev = "v${version}"; - sha256 = "0wmv62l3r8r4428gdzyj80lhgadfqvj220khz1wnm9alyzg60wkh"; + repo = "onetimepass"; + rev = "refs/tags/v${version}"; + hash = "sha256-cHJg3vdUpWp5+HACIeTGrqkHKUDS//aQICSjPKgwu3I="; }; - propagatedBuildInputs = [ - six - ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; nativeCheckInputs = [ timecop + unittestCheckHook ]; pythonImportsCheck = [ "onetimepass" ]; @@ -25,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "One-time password library for HMAC-based (HOTP) and time-based (TOTP) passwords"; homepage = "https://github.com/tadeck/onetimepass"; + changelog = "https://github.com/tadeck/onetimepass/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ zakame ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix index dfe5a03e7c..1da4168d22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix @@ -48,7 +48,6 @@ buildPythonPackage rec { description = "ONNX Converter and Optimization Tools"; homepage = "https://github.com/microsoft/onnxconverter-common"; changelog = "https://github.com/microsoft/onnxconverter-common/releases/tag/v${version}"; - maintainers = with lib.maintainers; [ fridh ]; license = with lib.licenses; [ mit ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix index 0982a12c45..328825698f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix @@ -70,5 +70,5 @@ buildPythonPackage { # sympy ]; - meta = onnxruntime.meta // { maintainers = with lib.maintainers; [ fridh ]; }; + meta = onnxruntime.meta; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix index 6de2c610fb..81b6863328 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix @@ -69,6 +69,8 @@ buildPythonPackage rec { "test_inference_with_data" "test_pretrained_text_encoder" "test_training_mt5" + # fails due to type errors + "test_num_shards" ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ "test_training" "test_training_coca" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/default.nix index 2bdb8d918a..e4679a7bbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/default.nix @@ -189,7 +189,7 @@ buildPythonPackage rec { meta = with lib; { description = "Language and compiler for writing highly efficient custom Deep-Learning primitives"; homepage = "https://github.com/openai/triton"; - platforms = lib.platforms.unix; + platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ SomeoneSerge Madouura ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai-whisper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai-whisper/default.nix index 26c2bbb0a3..88f0ffab5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai-whisper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai-whisper/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , buildPythonPackage , substituteAll @@ -14,14 +15,13 @@ , numba , numpy , openai-triton -, scipy , tiktoken , torch , tqdm -, transformers # tests , pytestCheckHook +, scipy }: buildPythonPackage rec { @@ -51,12 +51,11 @@ buildPythonPackage rec { more-itertools numba numpy - openai-triton - scipy tiktoken torch tqdm - transformers + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform openai-triton) [ + openai-triton ]; preCheck = '' @@ -65,6 +64,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + scipy ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix index 1668cfa9f9..d29d6deec1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.20.0"; + version = "1.28.0"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-aR/OEOz6xUKjsZk3lynx0SZJ4lnWk0uDFioO/NakVl8="; + hash = "sha256-zWvrLCAN/OsSiNLQ2jvEh9anoSpMXgEYhAFwh9btWEM="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix index 317d36b305..aa6055c19c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix @@ -10,7 +10,7 @@ , pyudev , setproctitle , setuptools -, wrapGAppsHook +, wrapGAppsHook3 , notify2 }: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix index 135518ce3f..153400f30a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -9,12 +9,13 @@ , setuptools , pytestCheckHook , pythonRelaxDepsHook +, writeScript }: let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.23.0"; + version = "1.24.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ let owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Ge/DjVG7ajoS0nJLZxtfn4Mmx0SffAE/91dViA5qWAA="; + hash = "sha256-id5cwNl2idgZa1AFfolzEo5vzspv3V2c1Vtzg3EWDZs="; }; sourceRoot = "${src.name}/opentelemetry-api"; @@ -55,8 +56,18 @@ let doCheck = false; - # Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils. - passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; }; + passthru = { + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p nix-update + + set -eu -o pipefail + nix-update --version-regex 'v(.*)' python3Packages.opentelemetry-api + nix-update python3Packages.opentelemetry-instrumentation + ''; + # Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils. + tests.${self.pname} = self.overridePythonAttrs { doCheck = true; }; + }; meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 965276da78..38205814d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "0.44b0"; + version = "0.45b0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-r+k/YdK7YqYme8nKoy3ig3krvZjxYRKgLBkcdEtFy3k="; + hash = "sha256-snpanTREdvfqpqPI8UWzm55pDK8Q77guqgT8kFULRKU="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; @@ -44,6 +44,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation" ]; + passthru.updateScript = opentelemetry-api.updateScript; + meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openusd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openusd/default.nix index bc67c43a6b..4110e887dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openusd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openusd/default.nix @@ -18,6 +18,8 @@ lib, libGL, libX11, + libXt, + materialx, ninja, numpy, opencolorio, @@ -86,6 +88,7 @@ buildPythonPackage rec { (lib.cmakeBool "PXR_BUILD_PYTHON_DOCUMENTATION" withDocs) (lib.cmakeBool "PXR_BUILD_USDVIEW" withUsdView) (lib.cmakeBool "PXR_BUILD_USD_TOOLS" withTools) + (lib.cmakeBool "PXR_ENABLE_MATERIALX_SUPPORT" true) (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.isDarwin && withOsl)) ]; @@ -111,6 +114,7 @@ buildPythonPackage rec { embree flex imath + materialx opencolorio openimageio opensubdiv @@ -120,6 +124,7 @@ buildPythonPackage rec { ++ lib.optionals stdenv.isLinux [ libGL libX11 + libXt ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa ]) ++ lib.optionals withOsl [ osl ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix index c5a5ac35b3..efafabe29d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix @@ -1,34 +1,43 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, requests -, urllib3 +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + requests, + setuptools, + urllib3, }: buildPythonPackage rec { pname = "openwrt-ubus-rpc"; version = "0.0.3"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Noltari"; repo = "python-ubus-rpc"; - rev = version; - sha256 = "19scncc1w9ar3pw4yrw24akjgm74n2m7y308hzl1i360daf5p21k"; + rev = "refs/tags/${version}"; + hash = "sha256-M4hbnGrAjBjohwgMf6qw5NQnpyKCZ0/4HVklHhizTKc="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests urllib3 ]; # Project has no tests doCheck = false; + pythonImportsCheck = [ "openwrt.ubus" ]; meta = with lib; { description = "Python API for OpenWrt ubus RPC"; homepage = "https://github.com/Noltari/python-ubus-rpc"; + changelog = "https://github.com/Noltari/python-ubus-rpc/releases/tag/${version}"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix index fcae2a557c..d889c97c32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.4.3"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-qJMQoc0Bpo1X2jQ23XlmCLE7h8F5IsniQ+Hx9iJ0h6A="; + hash = "sha256-PBxxLbVOvJSFmDXgKeI5sICUR7NJGUEUUahK9eBsvbE="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optimum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optimum/default.nix index 1bdda5a5af..ecc214e105 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optimum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.18.1"; + version = "1.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-Y+KWvpd/ULthCOr18hQjP0REQPcs2Ql2aUi3DIKIOpQ="; + hash = "sha256-GYgLh6vlOoVvTvhNPfBT4YEqRhB7gZMqlOuab6maVGU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optree/default.nix new file mode 100644 index 0000000000..d592c6d51f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/optree/default.nix @@ -0,0 +1,60 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, lib +, cmake +, setuptools +, typing-extensions +, pybind11 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "optree"; + version = "0.11.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "metaopt"; + repo = pname; + rev = "v${version}"; + hash = "sha256-VnnnEoXkYJO+S7baH+JZvsW18Tk3TiY9+Cd230OlZWo="; + }; + + dontUseCmakeConfigure = true; + + propagatedBuildInputs = [ + typing-extensions + ]; + nativeBuildInputs = [ + setuptools + pybind11 + cmake + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + # prevent import failures from pytest + preCheck = '' + rm -r optree + ''; + disabledTests = [ + # Fails because the 'test_treespec' module can't be found + "test_treespec_pickle_missing_registration" + ]; + pythonImportsCheck = [ + "optree" + ]; + + meta = with lib; { + homepage = "https://github.com/metaopt/optree"; + changelog = "https://github.com/metaopt/optree/releases/tag/v${version}"; + description = "Optimized PyTree Utilities"; + maintainers = with maintainers; [ pandapip1 ]; + license = licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opuslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opuslib/default.nix index c30d708511..2f5bbf8b25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opuslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opuslib/default.nix @@ -1,17 +1,20 @@ -{ buildPythonPackage, +{ + buildPythonPackage, fetchFromGitHub, fetchpatch, isPy27, libopus, - nose, - lib, stdenv, + pynose, + lib, + stdenv, substituteAll, + setuptools, }: buildPythonPackage rec { pname = "opuslib"; version = "3.0.3"; - format = "setuptools"; + pyproject = true; disabled = isPy27; @@ -41,7 +44,11 @@ buildPythonPackage rec { }) ]; - nativeCheckInputs = [ nose ]; + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ pynose ]; meta = with lib; { description = "Python bindings to the libopus, IETF low-delay audio codec"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oracledb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oracledb/default.nix index 4434d5a386..356883e2c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oracledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oracledb/default.nix @@ -1,23 +1,24 @@ -{ lib -, buildPythonPackage -, cryptography -, cython -, fetchPypi -, pythonOlder -, setuptools -, wheel +{ + lib, + buildPythonPackage, + cryptography, + cython, + fetchPypi, + pythonOlder, + setuptools, + wheel, }: buildPythonPackage rec { pname = "oracledb"; - version = "2.1.2"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MFS8wpXXN4g0unpazrhlmF6VSRX5sHqEPqhMOCTGoLI="; + hash = "sha256-9Sx984sTJDtc5YNFe4B0ijRoK5u4Nw2iSXhotxl2eYs="; }; build-system = [ @@ -26,22 +27,21 @@ buildPythonPackage rec { wheel ]; - dependencies = [ - cryptography - ]; + dependencies = [ cryptography ]; # Checks need an Oracle database doCheck = false; - pythonImportsCheck = [ - "oracledb" - ]; + pythonImportsCheck = [ "oracledb" ]; meta = with lib; { description = "Python driver for Oracle Database"; homepage = "https://oracle.github.io/python-oracledb"; changelog = "https://github.com/oracle/python-oracledb/blob/v${version}/doc/src/release_notes.rst"; - license = with licenses; [ asl20 /* and or */ upl ]; + license = with licenses; [ + asl20 # and or + upl + ]; maintainers = with maintainers; [ harvidsen ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix index 592aa2afa5..37683a9994 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.2.0"; + version = "0.1.35"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-KMEFZkAZkDhuDPpAts+u825p5pFJZbyrsMW/S1AArp4="; + hash = "sha256-xLCwjeNDx9RqxlNkIWMo0Pcrg7akGuu4Rv9oRDgOK18="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orange-widget-base/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orange-widget-base/default.nix index 95dadbb04d..3a1d5cd6e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orange-widget-base/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orange-widget-base/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "orange-widget-base"; - version = "4.23.0"; + version = "4.22.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-mz+BcZEdg1p9V0ewYRrw3jKBWLMbL9RR6o4hUEUx9DA="; + hash = "sha256-nV2aBPZzn7K+QECtCVoLLh5smG31zE2G9jFTKlxh9qM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orange3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orange3/default.nix index 1c4531254a..a5f9d5f85f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orange3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orange3/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , baycomp , bottleneck , buildPythonPackage @@ -24,12 +25,15 @@ , orange-canvas-core , orange-widget-base , pandas +, pytestCheckHook +, pytest-qt , pyqtgraph , pyqtwebengine , python , python-louvain , pythonOlder , pyyaml +, pip , qt5 , qtconsole , recommonmark @@ -112,6 +116,7 @@ let keyrings-alt pyyaml baycomp + pip ]; # FIXME: ImportError: cannot import name '_variable' from partially initialized module 'Orange.data' (most likely due to a circular import) (/build/source/Orange/data/__init__.py) @@ -146,9 +151,9 @@ let passthru = { updateScript = nix-update-script { }; - tests.unittests = self.overridePythonAttrs (old: { - pname = "${old.pname}-tests"; - format = "other"; + tests.unittests = stdenv.mkDerivation { + name = "${self.name}-tests"; + inherit (self) src; preCheck = '' export HOME=$(mktemp -d) @@ -160,23 +165,32 @@ let cp -r ${self}/${python.sitePackages}/Orange . chmod +w -R . - rm Orange/tests/test_url_reader.py # uses network - rm Orange/tests/test_ada_boost.py # broken: The 'base_estimator' parameter of AdaBoostRegressor must be an object implementing 'fit' and 'predict' or a str among {'deprecated'}. Got None instead. + substituteInPlace Orange/classification/tests/test_xgb_cls.py \ + --replace test_learners mk_test_learners + + substituteInPlace Orange/modelling/tests/test_xgb.py \ + --replace test_learners mk_test_learners + + substituteInPlace Orange/**/tests/*.py \ + --replace test_filename filename_test + + # TODO: debug why orange is crashing on GC, may be a upstream issue + chmod +x Orange/__init__.py + echo "import gc; gc.disable()" | tee -a Orange/__init__.py + ''; - checkPhase = '' - runHook preCheck - ${python.interpreter} -m unittest -b -v ./Orange/**/test*.py - runHook postCheck - ''; + nativeBuildInputs = [ pytestCheckHook pytest-qt ]; - postInstall = ""; + postCheck = '' + touch $out + ''; doBuild = false; doInstall = false; - nativeBuildInputs = [ self ] ++ old.nativeBuildInputs; - }); + buildInputs = [ self ]; + }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix index ede3b10fc7..bd1d06e5c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix @@ -30,22 +30,22 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.9.15"; + version = "3.10.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ijl"; repo = "orjson"; rev = "refs/tags/${version}"; - hash = "sha256-6fcj64d/uFCxaez+xxOdHd+NqILKOPqK+YlxYX7D0DI="; + hash = "sha256-vEJriLd7f+zlYcMIyhDTkq2kmNc5MaNLHo0qMLS5hro="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-/Aa3saUP4QjSBIS9T8Vd0yggiJn2SIk7dYMA5icb1yA="; + hash = "sha256-yQkpjedHwgsZiiZEzYV66aa9RepCFW0PBqtD29tfoMI="; }; maturinBuildFlags = [ "--interpreter ${python.executable}" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osc-sdk-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osc-sdk-python/default.nix index 74d617efe5..2475ef8bc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/osc-sdk-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osc-sdk-python/default.nix @@ -1,23 +1,22 @@ -{ - lib - , buildPythonPackage - , fetchFromGitHub - , pytestCheckHook - , requests - , ruamel-yaml - , setuptools +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, requests +, ruamel-yaml +, setuptools }: buildPythonPackage rec { pname = "osc-sdk-python"; - version = "0.27.0"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "outscale"; repo = "osc-sdk-python"; rev = "v${version}"; - hash = "sha256-dp4yE8cTeXAPoixJ6ZtsvcTSKdYpDIebHkddUiqJe5Q="; + hash = "sha256-WtKG2ujEGUW0nhYWxfYDkxicN/uEqBxKCh9FcCfjmHM="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix index 1aaf947103..c2d2bea352 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix @@ -1,54 +1,48 @@ -{ lib -, aiohttp -, buildPythonPackage -, click -, fetchFromGitHub -, incremental -, pydantic -, pythonOlder -, typer +{ + lib, + aiohttp, + buildPythonPackage, + click, + fetchFromGitHub, + incremental, + pythonOlder, + setuptools, + typer, }: buildPythonPackage rec { pname = "ovoenergy"; - version = "1.3.1"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "timmo001"; - repo = pname; + repo = "ovoenergy"; rev = "refs/tags/${version}"; - hash = "sha256-oeNwBmzlkE8JewSwuFG8OYigyispP4xdwO3s2CAcfW4="; + hash = "sha256-ZcTSf7UejEUqQo0qEXP3fWjZYRx0a3ZBNVkwS2dL3Yk="; }; - nativeBuildInputs = [ - incremental - ]; + build-system = [ setuptools ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "typer==0.6.1" "typer" - ''; + nativeBuildInputs = [ incremental ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp click - pydantic typer ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ - "ovoenergy" - ]; + pythonImportsCheck = [ "ovoenergy" ]; meta = with lib; { description = "Python client for getting data from OVO's API"; homepage = "https://github.com/timmo001/ovoenergy"; + changelog = "https://github.com/timmo001/ovoenergy/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix index 8bf7b8bcbe..efa0a744f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub + , lxml , pyproj , pytestCheckHook @@ -10,12 +11,11 @@ , pytz , pyyaml , requests -, python }: buildPythonPackage rec { pname = "owslib"; - version = "0.30.0"; + version = "0.31.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "geopython"; repo = "OWSLib"; - rev = "refs/tags/${version}"; - hash = "sha256-miKAgZBiqZ6+0qDvlf8+VZ6omH5hlImO0E7AVK7FuD0="; + rev = version; + hash = "sha256-vjJsLavVOqTTrVtYbtA0G+nl0HanKeGtzNFFj92Frw8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paddle2onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paddle2onnx/default.nix index e358c2ec49..0ba25c3046 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paddle2onnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paddle2onnx/default.nix @@ -9,7 +9,7 @@ }: let pname = "paddle2onnx"; - version = "1.1.0"; + version = "1.2.0"; format = "wheel"; pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; src = fetchPypi { @@ -18,7 +18,7 @@ let python = pyShortVersion; abi = pyShortVersion; platform = "manylinux_2_12_x86_64.manylinux2010_x86_64"; - hash = "sha256-HI/lIj9ezdCry5fYDi5Pia6hvOjN6/Slm9BMfLeq8AU="; + hash = "sha256-18eStagm7V4D87fiPoigAyXxVGoo//8UENutSqNfUBI="; }; in buildPythonPackage { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix index e5222cf7ef..de9f285a4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage +, pythonOlder +, pythonAtLeast , fetchPypi -, isPy27 +, setuptools , pandas , lxml , requests @@ -10,20 +12,29 @@ buildPythonPackage rec { pname = "pandas-datareader"; version = "0.10.0"; - format = "setuptools"; - disabled = isPy27; + pyproject = true; + + disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; sha256 = "9fc3c63d39bc0c10c2683f1c6d503ff625020383e38f6cbe14134826b454d5a6"; }; + build-system = [ + setuptools + ]; + + dependencies = [ + pandas + lxml + requests + ]; + # Tests are trying to load data over the network doCheck = false; pythonImportsCheck = [ "pandas_datareader" ]; - propagatedBuildInputs = [ pandas lxml requests ]; - meta = with lib; { description = "Up to date remote data access for pandas, works for multiple versions of pandas"; homepage = "https://github.com/pydata/pandas-datareader"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix index c42472682a..a5bb890a39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -266,7 +266,7 @@ let pandas = buildPythonPackage rec { Python, providing labeled data structures similar to R data.frame objects, statistical functions, and much more. ''; - maintainers = with maintainers; [ raskin fridh knedlsepp ]; + maintainers = with maintainers; [ raskin knedlsepp ]; }; }; in pandas diff --git a/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix index 4a4b93035d..d8e0e071df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "1.3.8"; + version = "1.4.1"; format = "wheel"; @@ -25,7 +25,9 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-Sb85MZhqDd8/e0vaPGXGoxHVJ3UkrNtOC/9py6a/V3U="; + hash = "sha256-x7ywbO2uY1r06bDXV/+X/7cs9f6jFawyDHeo8pLWZVE="; + dist = "py3"; + python = "py3"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/panphon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/panphon/default.nix new file mode 100644 index 0000000000..6ae6291345 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/panphon/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchPypi + +, unittestCheckHook + +, setuptools + +, unicodecsv +, pyyaml +, regex +, numpy +, editdistance +, munkres +, levenshtein +}: + +buildPythonPackage rec { + pname = "panphon"; + version = "0.20.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gio52n1NZWeyCK+eJW/Fp827wjvwnMNDFAR4pKa8VcY="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + setuptools # need for pkg_resources + unicodecsv + pyyaml + regex + numpy + editdistance + munkres + levenshtein # need for align_wordlists.py script + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + unittestFlagsArray = [ "-s" "test" ]; + + pythonImportsCheck = [ + "panphon" + "panphon.segment" + "panphon.distance" + ]; + + meta = with lib; { + description = "Tools for using the International Phonetic Alphabet with phonological features"; + homepage = "https://github.com/dmort27/panphon"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix index b419398eef..743812b84b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix @@ -1,5 +1,7 @@ { lib , stdenv +, aiohttp +, ansicolors , azure-datalake-store , azure-identity , azure-storage-blob @@ -17,8 +19,8 @@ , pygithub , pytest-mock , pytestCheckHook +, pythonAtLeast , pythonOlder -, pythonRelaxDepsHook , pyyaml , requests , setuptools @@ -28,7 +30,7 @@ buildPythonPackage rec { pname = "papermill"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,19 +39,14 @@ buildPythonPackage rec { owner = "nteract"; repo = "papermill"; rev = "refs/tags/${version}"; - hash = "sha256-x6f5hhTdOPDVFiBvRhfrXq1wd5keYiuUshXnT0IkjX0="; + hash = "sha256-NxC5+hRDdMCl/7ZIho5ml4hdENrgO+wzi87GRPeMv8Q="; }; - pythonRelaxDeps = [ - "aiohttp" - ]; - - nativeBuildInputs = [ - pythonRelaxDepsHook + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ click pyyaml nbformat @@ -58,6 +55,9 @@ buildPythonPackage rec { requests entrypoints tenacity + ansicolors + ] ++ lib.optionals (pythonAtLeast "3.12") [ + aiohttp ]; passthru.optional-dependencies = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix index 91f9bf73a8..fe56f71ed4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix @@ -118,6 +118,6 @@ buildPythonPackage rec { homepage = "https://papis.readthedocs.io/"; changelog = "https://github.com/papis/papis/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nico202 teto marsam ]; + maintainers = with maintainers; [ nico202 teto ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix index b6ee36c3dc..2bfd641163 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "parametrize-from-file"; - version = "0.19.0"; + version = "0.20.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "parametrize_from_file"; - hash = "sha256-FPTO2hYZT7bsQyPNcjBEk8SZKp51o/eMV5/U58W5SPI="; + hash = "sha256-t4WLNDkC/ErBnOGK6FoYIfjoL/zF9MxPThJtGM1nUL4="; }; # patch out coveralls since it doesn't provide us value diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parquet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parquet/default.nix index 85eb41fa51..92e5e77647 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parquet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parquet/default.nix @@ -1,31 +1,46 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, python-snappy -, thriftpy2 +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + pytestCheckHook, + python-snappy, + pythonOlder, + setuptools, + thriftpy2, }: buildPythonPackage rec { pname = "parquet"; version = "1.3.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jcrobak"; repo = "parquet-python"; - rev = "v${version}"; - sha256 = "1ahvg4dz9fzi4vdm9jmslq3v3jahjj17fdcc5fljgcw6h9yxyl2r"; + rev = "refs/tags/v${version}"; + hash = "sha256-WVDffYKGsyepK4w1d4KUUMmxB6a6ylTbJvG79Bt5G6o="; }; - propagatedBuildInputs = [ + patches = [ + # Refactor deprecated unittest aliases, https://github.com/jcrobak/parquet-python/pull/83 + (fetchpatch { + name = "unittest-aliases.patch"; + url = "https://github.com/jcrobak/parquet-python/commit/746bebd1e84d8945a3491e1ae5e44102ff534592.patch"; + hash = "sha256-4awxlzman/YMfOz1WYNR+mVn1ixGku9sqlaMJ1QITYs="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ python-snappy thriftpy2 ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Fails with AttributeError @@ -37,9 +52,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the parquet columnar file format"; - mainProgram = "parquet"; homepage = "https://github.com/jcrobak/parquet-python"; + changelog = "https://github.com/jcrobak/parquet-python/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; + mainProgram = "parquet"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix index a5c59338fc..3a2dbe638d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix @@ -24,11 +24,12 @@ , mailsuite , msgraph-core , nixosTests +, opensearch-py , publicsuffixlist , pythonOlder +, pythonRelaxDepsHook , requests , tqdm -, urllib3 , xmltodict }: @@ -40,24 +41,24 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "8.8.0"; + version = "8.11.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tK/cxOw50awcDAGRDTQ+Nxb9aJl2+zLZHuJq88xNmXM="; + hash = "sha256-OBxiaXB8NKNMviRI19rYYJxpnfnaEL3zSPmYB4urIug="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "elasticsearch<7.14.0" "elasticsearch" \ - --replace "elasticsearch-dsl==7.4.0" "elasticsearch-dsl" - ''; - nativeBuildInputs = [ hatchling + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "elasticsearch" + "elasticsearch-dsl" ]; propagatedBuildInputs = [ @@ -84,8 +85,8 @@ buildPythonPackage rec { publicsuffixlist requests tqdm - urllib3 xmltodict + opensearch-py ]; # no tests on PyPI, no tags on GitHub @@ -108,5 +109,7 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ talyz ]; mainProgram = "parsedmarc"; + # https://github.com/domainaware/parsedmarc/issues/464 + broken = lib.versionAtLeast msgraph-core.version "1.0.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsel/default.nix index ee817f7066..639f973e77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsel/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "parsel"; - version = "1.9.0"; + version = "1.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-paa8sMX8dBVAujB1Y2/1y5aIUqeMwWroIlDl1Ib6fUg="; + hash = "sha256-FOANwHcxyQMNtiDBlfyuiEtbSEjp+cUjxhGfcIzPqaw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix index 7d76ef5d80..03b052a46d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "parso"; - version = "0.8.3"; + version = "0.8.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-jAe+KQu1nwNYiRWSHinopQACrK8s3F+g4BFPkXCfr6A="; + hash = "sha256-6zp7WCQPuZCZo0VXHe7MD5VA6l9N0v4UwqmdaygauS0="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix index 9a271ccb55..1b99947b58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "particle"; - version = "0.23.1"; + version = "0.24.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-7uKLDoRr/qTf1w6exf/jJEYT2wi2tqm3c/VaQxB1L6s="; + hash = "sha256-irS13UVHui2ug1SVWkNSEIkqV13/RvMjysbPQGALl2o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix index a13706dacb..47fb42209d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "paste"; - version = "3.9.0"; + version = "3.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdent"; repo = "paste"; rev = "refs/tags/${version}"; - hash = "sha256-HdeShtslnvjmuiUb0W3ASnSWcZnyDJcthsIOjYmuD8I="; + hash = "sha256-gl0+mw0D0iGVmOc5jQP7b3EL1ZmT1lAr9ffx+XegdU0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix index e88a7efd60..3629d8b11d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "path"; - version = "16.10.0"; + version = "16.14.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sysit2/oEKje1tE2JozItmmK58R8KblKnqEmI/MFHkY="; + hash = "sha256-26qn79RgL9a6jYKJDceCPWnl3nQKboQtmRmw+q8rao4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathlib/default.nix deleted file mode 100644 index 1e34b92a43..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathlib/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, unittestCheckHook -, pythonAtLeast -}: - -buildPythonPackage rec { - pname = "pathlib"; - version = "1.0.1"; - format = "setuptools"; - disabled = pythonAtLeast "3.4"; # Was added to std library in Python 3.4 - - src = fetchPypi { - inherit pname version; - sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39"; - }; - - nativeCheckInputs = [ unittestCheckHook ]; - - meta = { - description = "Object-oriented filesystem paths"; - homepage = "https://pathlib.readthedocs.org/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paypalhttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paypalhttp/default.nix index 25c6aa1ba8..ab0228ef06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paypalhttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paypalhttp/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { hash = "sha256-3ihcpYtpcejPkiyf4g4jveyNU6flQB2sv9EZ5Pd7tUc="; }; + postPatch = '' + substituteInPlace tests/http_response_test.py \ + --replace-fail assertEquals assertEqual + ''; + propagatedBuildInputs = [ requests six diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pcffont/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pcffont/default.nix new file mode 100644 index 0000000000..7c4c0ca54d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pcffont/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, bdffont +, pytestCheckHook +, nix-update-script +}: + +buildPythonPackage rec { + pname = "pcffont"; + version = "0.0.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "TakWolf"; + repo = "pcffont"; + rev = "refs/tags/${version}"; + hash = "sha256-gu9niWxYTw3rcA++z8B+MdKp5XaqAGjmvd+PdSDosfg="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + bdffont + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pcffont" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Library for manipulating Portable Compiled Format (PCF) fonts"; + homepage = "https://github.com/TakWolf/pcffont"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfminer-six/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfminer-six/default.nix index bc182442af..f203850469 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdfminer-six/default.nix @@ -71,6 +71,6 @@ buildPythonPackage rec { description = "PDF parser and analyzer"; homepage = "https://github.com/pdfminer/pdfminer.six"; license = licenses.mit; - maintainers = with maintainers; [ psyanticy marsam ]; + maintainers = with maintainers; [ psyanticy ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix index 500db4812f..ba9a0f79bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Extract references (pdf, url, doi, arxiv) and metadata from a PDF"; mainProgram = "pdfx"; license = licenses.asl20; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix index 0e1cc04f92..d2d77f67fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix @@ -9,25 +9,26 @@ # tests , editables , git +, mercurial , pytestCheckHook , setuptools }: buildPythonPackage rec { pname = "pdm-backend"; - version = "2.1.8"; + version = "2.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-d8i+FvxNFPM18W7NmOwh9bqZnMUenF7eCPdcCw4BT7s="; + hash = "sha256-V+NESf7NavR6L6ko4Oh4KhAR2iIN5GiHZPELwvkpr4c="; }; env.PDM_BUILD_SCM_VERSION = version; - propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ + dependencies = lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; @@ -38,12 +39,17 @@ buildPythonPackage rec { nativeCheckInputs = [ editables git + mercurial pytestCheckHook setuptools ]; preCheck = '' unset PDM_BUILD_SCM_VERSION + + # tests require a configured git identity + export HOME=$TMPDIR + git config --global user.email nixbld@localhost ''; setupHook = ./setup-hook.sh; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix index d1356c9a99..c6ebbc72f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ + dependencies = [ jinja2 pygments markupsafe diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index 7f3fdbc7b7..ff4baf1aa2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.9.0"; + version = "19.10.8"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tFbk33SQqCNcUnJ0X+OtJ8XDEpMXWnuxA2L30Prhssc="; + hash = "sha256-H9AJErjJC/zo5Fy1sZFLw6GCMm4YirMzwWbAhzXM7mg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peco/default.nix index 961b0c623d..9b2001789c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peco/default.nix @@ -1,29 +1,28 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchPypi -, pydantic -, pythonOlder -, setuptools +{ + lib, + aiohttp, + buildPythonPackage, + fetchPypi, + pydantic, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "peco"; - version = "0.0.29"; - format = "pyproject"; + version = "0.0.30"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zL0tBTwm+l5eyxlWr2xoE+nLpMfUKri1/yD+WgTUqHQ="; + hash = "sha256-a3MPqtbDftbLGtpJ66CFVC5wJFa9L3dqOKPfBZCaHpM="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp pydantic ]; @@ -31,9 +30,7 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "peco" - ]; + pythonImportsCheck = [ "peco" ]; meta = with lib; { description = "Library for interacting with the PECO outage map"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix index d839ad705e..a99abb7455 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.17.1"; + version = "3.17.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Gob2qBPPxAeIO/I7+9r4dBIxhvKnnZWD2nYcrMANM8U="; + hash = "sha256-F0bv9J2etrVF8wMU3caQ1ZA6TmQQOPTZWFjGsKOEPwo="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pettingzoo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pettingzoo/default.nix new file mode 100644 index 0000000000..389abd5f89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pettingzoo/default.nix @@ -0,0 +1,135 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, wheel +, gymnasium +, numpy +, chess +, pillow +, pybox2d +, pygame +, pymunk +, rlcard +, scipy +, pre-commit +, pynput +, pytest +, pytest-cov +, pytest-markdown-docs +, pytest-xdist +, pytestCheckHook +, stdenv +}: + +buildPythonPackage rec { + pname = "pettingzoo"; + version = "1.24.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Farama-Foundation"; + repo = "PettingZoo"; + rev = "refs/tags/${version}"; + hash = "sha256-TVM4MrA4W6AIWEdBIecI85ahJAAc21f27OzCxSpOoZU="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + gymnasium + numpy + ]; + + passthru.optional-dependencies = { + all = [ + chess + # multi-agent-ale-py + pillow + pybox2d + pygame + pymunk + rlcard + scipy + # shimmy + ]; + atari = [ + # multi-agent-ale-py + pygame + ]; + butterfly = [ + pygame + pymunk + ]; + classic = [ + chess + pygame + rlcard + # shimmy + ]; + mpe = [ + pygame + ]; + other = [ + pillow + ]; + sisl = [ + pybox2d + pygame + pymunk + scipy + ]; + testing = [ + # autorom + pre-commit + pynput + pytest + pytest-cov + pytest-markdown-docs + pytest-xdist + ]; + }; + + pythonImportsCheck = [ + "pettingzoo" + ]; + + nativeCheckInputs = [ + chess + pygame + pymunk + pytest-markdown-docs + pytest-xdist + pytestCheckHook + rlcard + ]; + + disabledTestPaths = [ + # Require unpackaged multi_agent_ale_py + "test/all_parameter_combs_test.py" + "test/pickle_test.py" + "test/unwrapped_test.py" + ]; + + disabledTests = [ + # ImportError: cannot import name 'pytest_plugins' from 'pettingzoo.classic' + "test_chess" + ] ++ lib.optionals stdenv.isDarwin [ + # Crashes on darwin: `Fatal Python error: Aborted` + "test_multi_episode_parallel_env_wrapper" + ]; + + meta = with lib; { + description = "An API standard for multi-agent reinforcement learning environments, with popular reference environments and related utilities"; + homepage = "https://github.com/Farama-Foundation/PettingZoo"; + changelog = "https://github.com/Farama-Foundation/PettingZoo/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pexpect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pexpect/default.nix index e8c5efc3cb..f98e531c0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pexpect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pexpect/default.nix @@ -3,6 +3,9 @@ , fetchPypi , setuptools , ptyprocess + +# Reverse dependency +, sage }: buildPythonPackage (rec { @@ -24,6 +27,8 @@ buildPythonPackage (rec { propagatedBuildInputs = [ ptyprocess ]; + passthru.tests = { inherit sage; }; + meta = with lib; { homepage = "http://www.noah.org/wiki/Pexpect"; description = "Automate interactive console applications such as ssh, ftp, etc"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index 3bd937c6d4..05e5201375 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -6,28 +6,28 @@ , python-dateutil , pythonOlder , scramp -, setuptools +, hatchling , versioningit }: buildPythonPackage rec { pname = "pg8000"; - version = "1.30.5"; - format = "pyproject"; + version = "1.31.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-By960AzXI2lcsun8AsHfuEx4FFXpe43m9MQoHuoIB4w="; + hash = "sha256-sREw1MYV3TBi6o/tgUMGSnl4t/5tRPFLciYdQ8jicIc="; }; - nativeBuildInputs = [ - setuptools + build-system = [ + hatchling versioningit ]; - propagatedBuildInputs = [ + dependencies = [ passlib python-dateutil scramp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix index 4a3e4794bd..7e5208c1bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { description = "PostgreSQL Languages AST and statements prettifier"; changelog = "https://github.com/lelit/pglast/blob/v${version}/CHANGES.rst"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; mainProgram = "pgpp"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phik/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phik/default.nix index b2dae6f29b..bc7dd2a582 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phik/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phik/default.nix @@ -3,20 +3,17 @@ , cmake , fetchFromGitHub , joblib -, jupyter -, jupyter-client , matplotlib -, nbconvert , ninja -, numba , numpy , pandas +, pathspec +, pyproject-metadata , pybind11 , pytestCheckHook , pythonOlder -, scikit-build +, scikit-build-core , scipy -, setuptools }: buildPythonPackage rec { @@ -24,7 +21,7 @@ buildPythonPackage rec { version = "0.12.4"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "KaveIO"; @@ -33,58 +30,39 @@ buildPythonPackage rec { hash = "sha256-YsH7vVn6gzejunUjUY/RIcvWtaQ/W1gbciJWKi5LDTk="; }; - nativeBuildInputs = [ + build-system = [ cmake ninja - scikit-build - setuptools + pathspec + pybind11 + pyproject-metadata + scikit-build-core ]; - propagatedBuildInputs = [ + dependencies = [ joblib - numpy - scipy - pandas matplotlib - numba - pybind11 + numpy + pandas + scipy ]; nativeCheckInputs = [ pytestCheckHook - nbconvert - jupyter - jupyter-client ]; - # Uses setuptools to drive build process + # Uses scikit-build-core to drive build process dontUseCmakeConfigure = true; pythonImportsCheck = [ "phik" ]; - postInstall = '' - rm -r $out/bin - ''; - preCheck = '' # import from $out rm -r phik ''; - disabledTests = [ - # TypeError: 'numpy.float64' object cannot be interpreted as an integer - # https://github.com/KaveIO/PhiK/issues/73 - "test_significance_matrix_hybrid" - "test_significance_matrix_mc" - ]; - - disabledTestPaths = [ - # Don't test integrations - "tests/phik_python/integration/" - ]; - meta = with lib; { description = "Phi_K correlation analyzer library"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index b2bb4cbfd0..85153b6fa9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.31"; + version = "8.13.34"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-J0IHHJ0K8JJ0yKWyom2aNqy/LqXLYpQ8ws6ttcDIdkE="; + hash = "sha256-fCZ2vge30PdEEeJ14GYDgKDsPuDTWfBw1xlCS9LF9i4="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phunspell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phunspell/default.nix new file mode 100644 index 0000000000..c4d8cf4ddc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/phunspell/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + + setuptools, + + spylls, +}: + +buildPythonPackage rec { + pname = "phunspell"; + version = "0.1.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dvwright"; + repo = "phunspell"; + rev = "refs/tags/v${version}"; + hash = "sha256-TlO9Ccr2iRN+s3JV+3P36RF9oFY32fj+24sKslZZCVk="; + }; + + patches = [ + (fetchpatch { + name = "fix-package-data-warning.patch"; + url = "https://github.com/dvwright/phunspell/commit/70a0ee8af8442797e03916cea31637c21e6d32d9.patch"; + hash = "sha256-kSaKHd7dVJM8+2dqxjs26Hv0feNXAXXymUE97DNVBFM="; + }) + (fetchpatch { + name = "replace-description-file-deprecated-option.patch"; + url = "https://github.com/dvwright/phunspell/commit/331c593b486cebe1a9b72befa568de9b51033f15.patch"; + hash = "sha256-gdYfeG1vBtjnDDCjmg+ZSuToqVe0hrzB3RIqBLGNvBQ="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ spylls ]; + + # for tests need lots of RAM, just skip... + doCheck = false; + + pythonImportsCheck = [ "phunspell" ]; + + meta = with lib; { + description = "Pure Python spell checker, wrapping spylls a port of Hunspell"; + homepage = "https://github.com/dvwright/phunspell"; + changelog = "https://github.com/dvwright/phunspell/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix index 9292ffd76f..171c639afe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix @@ -1,36 +1,31 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "pick"; - version = "2.2.0"; - format = "pyproject"; + version = "2.3.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "wong2"; - repo = pname; + repo = "pick"; rev = "refs/tags/v${version}"; - hash = "sha256-Py+D03bXnVsIwvYwjl0IMeH33ZPJW5TuJ3tU79MMsCw="; + hash = "sha256-6bkV9XEum5kbANqv/Xth+taCUl4nmuWskucq4jmV+Lc="; }; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "pick" - ]; + pythonImportsCheck = [ "pick" ]; meta = with lib; { description = "Module to create curses-based interactive selection list in the terminal"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix index 0825380a92..ec3a9f5ec5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "0.10.0"; format = "setuptools"; pname = "piep"; - disabled = isPy3k; + disabled = !isPy3k; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index bfcd4c0589..ba0ce17b0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "8.13.0"; + version = "8.14.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-6HCFPHIQ6+SHt4Zu6CZ0R2Ah+jFnztGOCMhQfvR6FxY="; + hash = "sha256-3ORvbhO3eLu/NIE0Lwdf93QtUHUmyMf7LmdMBJpkYIg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/paths.patch index 1bd030c186..83cebed5cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/paths.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/paths.patch @@ -12,10 +12,10 @@ index da40043f..4f566f01 100644 check=True, ) diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py -index f89b4f90..f187ebdf 100644 +index 901f3b6f..45551820 100644 --- a/src/pikepdf/jbig2.py +++ b/src/pikepdf/jbig2.py -@@ -63,7 +63,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): +@@ -72,7 +72,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): output_path = Path(tmpdir) / "outfile" args = [ @@ -24,12 +24,12 @@ index f89b4f90..f187ebdf 100644 "--embedded", "--format", "png", -@@ -90,7 +90,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): +@@ -101,7 +101,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): def _version(self) -> Version: try: proc = self._run( -- ['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii' -+ ['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii' - ) - except (CalledProcessError, FileNotFoundError) as e: - raise DependencyError("jbig2dec - not installed or not found") from e +- ['jbig2dec', '--version'], ++ ['@jbig2dec@', '--version'], + stdout=PIPE, + check=True, + encoding='ascii', diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix index 6560c63ac2..d91408fc86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix @@ -57,8 +57,12 @@ buildPythonPackage rec { x265 ]; - # clang-16: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + env = { + # clang-16: error: argument unused during compilation: '-fno-strict-overflow' + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + + RELEASE_FULL_FLAG = 1; + }; propagatedBuildInputs = [ pillow diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix index f101d6b361..f320000eec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -7,12 +7,12 @@ , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, numpy, pytestCheckHook, setuptools # for passthru.tests -, imageio, matplotlib, pilkit, pydicom, reportlab +, imageio, matplotlib, pilkit, pydicom, reportlab, sage }@args: import ./generic.nix (rec { pname = "pillow"; - version = "10.2.0"; + version = "10.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,11 +20,11 @@ import ./generic.nix (rec { src = fetchPypi { pname = "pillow"; inherit version; - hash = "sha256-6H8LLHgVfhLXaGsn1jwHD9ZdmU6N2ubzKODc9KDNAH4="; + hash = "sha256-nSRV+/RMkUhAx5PomqgtDhdjoUJToAB0NxmuWUaBSy0="; }; passthru.tests = { - inherit imageio matplotlib pilkit pydicom reportlab; + inherit imageio matplotlib pilkit pydicom reportlab sage; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix index b5c37e37ef..ae21d2042c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pinecone-client"; - version = "3.2.2"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pinecone_client"; inherit version; - hash = "sha256-iHoSQF+QrBHDlkkPYF/EefMc8oI2EDTRrg/MwCrHW+4="; + hash = "sha256-1E2yEuZKo0PRTvybCOnkXZi6e2gfYymLhwM1QuoBfyM="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-system-certs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-system-certs/default.nix new file mode 100644 index 0000000000..5325550ee0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-system-certs/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, wheel +, git-versioner +, wrapt +}: + +buildPythonPackage rec { + pname = "pip-system-certs"; + version = "4.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "pip_system_certs"; + hash = "sha256-245qMTiNl5XskTmVffGon6UnT7ZhZEVv0JGl0+lMNQw="; + }; + + nativeBuildInputs = [ + setuptools-scm + wheel + git-versioner + ]; + + propagatedBuildInputs = [ + wrapt + ]; + + pythonImportsCheck = [ + "pip_system_certs.wrapt_requests" + "pip_system_certs.bootstrap" + ]; + + meta = with lib; { + description = "Live patches pip and requests to use system certs by default"; + homepage = "https://gitlab.com/alelec/pip-system-certs"; + license = licenses.bsd2; + maintainers = with maintainers; [ slotThe ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix index 8052c574d3..ba8747cbe2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix @@ -68,6 +68,9 @@ buildPythonPackage rec { "test_compile_recursive_extras" "test_combine_different_extras_of_the_same_package" "test_diff_should_not_uninstall" + "test_cli_compile_all_extras_with_multiple_packages" + # Deprecations + "test_error_in_pyproject_toml" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/fix-setup-py-bad-syntax-detection.patch b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/fix-setup-py-bad-syntax-detection.patch index 6a88222139..6183ba5f42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/fix-setup-py-bad-syntax-detection.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/fix-setup-py-bad-syntax-detection.patch @@ -1,21 +1,22 @@ -diff --color -ru a/piptools/scripts/compile.py b/piptools/scripts/compile.py ---- a/piptools/scripts/compile.py 2022-06-30 11:24:26.000000000 +0200 -+++ b/piptools/scripts/compile.py 2022-08-01 13:40:58.392515765 +0200 -@@ -6,7 +6,7 @@ - from typing import IO, Any, BinaryIO, List, Optional, Tuple, Union, cast - +diff --git a/piptools/scripts/compile.py b/piptools/scripts/compile.py +index 195faa7..3e69437 100755 +--- a/piptools/scripts/compile.py ++++ b/piptools/scripts/compile.py +@@ -9,7 +9,7 @@ from pathlib import Path + from typing import IO, Any, BinaryIO, cast + import click -from build import BuildBackendException +from build import BuildException - from build.util import project_wheel_metadata from click.utils import LazyFile, safecall - from pip._internal.commands import create_command -@@ -421,7 +421,7 @@ - metadata = project_wheel_metadata( - os.path.dirname(os.path.abspath(src_file)) + from pip._internal.req import InstallRequirement + from pip._internal.req.constructors import install_req_from_line +@@ -369,6 +369,6 @@ def cli( + isolated=build_isolation, + quiet=log.verbosity <= 0, ) - except BuildBackendException as e: -+ except (BuildException,StopIteration) as e: ++ except (BuildException, StopIteration) as e: log.error(str(e)) log.error(f"Failed to parse {os.path.abspath(src_file)}") sys.exit(2) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix index a7b132c230..3aa70970fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix @@ -1,20 +1,22 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, diff-cover -, graphviz -, hatchling -, hatch-vcs -, pytest-mock -, pytestCheckHook -, pip -, virtualenv +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + diff-cover, + graphviz, + hatchling, + hatch-vcs, + packaging, + pytest-mock, + pytestCheckHook, + pip, + virtualenv, }: buildPythonPackage rec { pname = "pipdeptree"; - version = "2.16.2"; + version = "2.20.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +25,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-g0O0ndHd2ehBUmHwb0HoWgCGSsqbjmlPFOd6KrkUv2Y="; + hash = "sha256-Mng5YUM2+T3OFrr4uGVvq5mP0aq10r21pp46tw6lLno="; }; build-system = [ @@ -33,12 +35,11 @@ buildPythonPackage rec { dependencies = [ pip + packaging ]; passthru.optional-dependencies = { - graphviz = [ - graphviz - ]; + graphviz = [ graphviz ]; }; nativeCheckInputs = [ @@ -48,9 +49,7 @@ buildPythonPackage rec { virtualenv ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pythonImportsCheck = [ - "pipdeptree" - ]; + pythonImportsCheck = [ "pipdeptree" ]; disabledTests = [ # Don't run console tests @@ -59,10 +58,10 @@ buildPythonPackage rec { meta = with lib; { description = "Command line utility to show dependency tree of packages"; - mainProgram = "pipdeptree"; homepage = "https://github.com/tox-dev/pipdeptree"; changelog = "https://github.com/tox-dev/pipdeptree/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ charlesbaynham ]; + mainProgram = "pipdeptree"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipe/default.nix new file mode 100644 index 0000000000..b59ea62f92 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipe/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "pipe"; + version = "2.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "JulienPalard"; + repo = "Pipe"; + rev = "refs/tags/v${version}"; + hash = "sha256-/xMhh70g2KPOOivTjpAuyfu+Z44tBE5zAwpSIEKhK6M="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pipe" ]; + + disabledTests = [ + # Test require network access + "test_netcat" + ]; + + meta = with lib; { + description = "Module to use infix notation"; + homepage = "https://github.com/JulienPalard/Pipe"; + changelog = "https://github.com/JulienPalard/Pipe/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 9f04970f96..82707a5d98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.5.5"; + version = "0.5.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-6K8rTfASpK7OvBwUy40X6xzgpfWL7lIJvpfRiGfBK6U="; + hash = "sha256-+OkfuIwbDx6SN5lawDJZYBrjHn9rsT/FT+GQ2MOAtg0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pixel-font-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pixel-font-builder/default.nix index bd67a88905..d8908fe265 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pixel-font-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -10,23 +10,32 @@ , brotli , fonttools , pypng +, pcffont +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "pixel-font-builder"; - version = "0.0.15"; + version = "0.0.24"; + pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { pname = "pixel_font_builder"; inherit version; - hash = "sha256-2QnbnJk3onwxmjZ6aUgXFGsx6GtqJDV9Bgs3p5Czvns="; + hash = "sha256-hBlTTIPx4TRgeXapVnSaKPUwseR3uYT0gcgKLGmmSZI="; }; - format = "pyproject"; + pythonRelaxDeps = [ + "fonttools" + ]; nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + build-system = [ hatch-vcs hatchling ]; @@ -36,10 +45,11 @@ buildPythonPackage rec { pypng ]; - propagatedBuildInputs = [ + dependencies = [ bdffont brotli fonttools + pcffont ]; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index dfc981b615..88df10cfc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "20.0.1"; + version = "21.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-TSydetm05gELugfRr6IGEfSrDhCOHzm73BTqbGkAXpk="; + hash = "sha256-KZGfr60RclPMis3y/XPY+VMQr0IxGXMwI7tPxNOlmhg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix index 50e6bb2cf9..0ec4ad920f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "plantuml-markdown"; - version = "3.9.4"; + version = "3.9.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mikitex70"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DSR4/PEs1uzGHgtw5p3HMlquOIYHPWbTHrw6QGx7t4o="; + hash = "sha256-/lsu7kiUyQ6LUFINX+/aCFSKm1pGyIfUzSuUehwCz7I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix index ff22cdf0cb..c0032e5ebf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "setuptools-scm==8.0.4" "setuptools-scm" \ - --replace "wheel==0.41.2" "wheel" + --replace-fail "wheel==0.42.0" "wheel" substituteInPlace pyproject.toml \ --replace 'requires = ["setuptools==68.2.2", "setuptools-scm==8.0.4", "wheel==0.42.0", "auditwheel==5.4.0"]' \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix index 8acdacb7c9..c13df7c6fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.24.5"; + version = "1.24.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-3xbjcvBx5pHlCwqAVJUpiGsa4s9lScORlEB4YLfkvv4="; + hash = "sha256-91EVR4cW383HiwcAg4BuhuC5jlwLwP1IFodD1iIo1j4="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix index 0bec07c3ba..a0e26e354e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.20.0"; + version = "5.21.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-v5AcgF0iAyz6U0sv98WqawZZ4DfxnsHgzKf1hZGLXIk="; + hash = "sha256-aSQ/jBZdS+JsDfHG8LeyWOLf7v4DJ2NAStfn+318IHM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix index a25dcd9125..6368f8c667 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.13.4"; + version = "0.13.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "has2k1"; repo = "plotnine"; rev = "refs/tags/v${version}"; - hash = "sha256-ylsaV5yWVbxvD74spAI5tDwIjjue7MOMaGgp4Dc8Nhk="; + hash = "sha256-/yxRYK3ZTrYj+l3TQhFllyICnJjCZPd4ebNurCLZAYg="; }; postPatch = '' @@ -57,6 +57,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "plotnine" ]; + disabledTests = [ + # Tries to change locale. The issued warning causes this test to fail. + # UserWarning: Could not set locale to English/United States. Some date-related tests may fail + "test_no_after_scale_warning" + ]; + disabledTestPaths = [ # Assertion Errors: # Generated plot images do not exactly match the expected files. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix index 7fb6a0ec82..0eb7baadcf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.8.2"; + version = "1.8.3"; format = "pyproject"; src = fetchFromGitHub { owner = "tomerfiliba"; repo = "plumbum"; rev = "refs/tags/v${version}"; - hash = "sha256-b8JcGRHiZSv/ViyEogpLgGXOMHHSC+cjWT0FqhkolcA="; + hash = "sha256-k2H/FBQAWrCN1P587s/OhiCGNasMKEFJYIBIU808rlE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pluthon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pluthon/default.nix index 51f73a7381..1ff7d05300 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pluthon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pluthon/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools uplc ordered-set - ] ++ lib.optionals (pythonOlder "3.9") graphlib-backport; + ] ++ lib.optional (pythonOlder "3.9") graphlib-backport; pythonImportsCheck = [ "pluthon" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pmdsky-debug-py/default.nix index 8a8b89e604..17511c8fc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pmdsky-debug-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pmdsky-debug-py/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Autogenerated and statically check-able pmdsky-debug symbol definitions for Python"; homepage = "https://github.com/SkyTemple/pmdsky-debug-py"; license = licenses.mit; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix index 4d1d1c0f14..73edfeadcd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix @@ -11,28 +11,28 @@ , rust-jemalloc-sys , darwin }: + let - pname = "polars"; - version = "0.20.15"; - rootSource = fetchFromGitHub { - owner = "pola-rs"; - repo = "polars"; - rev = "refs/tags/py-${version}"; - hash = "sha256-N/VIi0s5unYWqlR5Mpaq9cqXl2ccbzWPuOtE2UbmQw8="; - }; rust-jemalloc-sys' = rust-jemalloc-sys.override { jemalloc = jemalloc.override { disableInitExecTls = true; }; }; in -buildPythonPackage { - inherit pname version; + +buildPythonPackage rec { + pname = "polars"; + version = "0.20.15"; pyproject = true; disabled = pythonOlder "3.8"; - src = rootSource; + src = fetchFromGitHub { + owner = "pola-rs"; + repo = "polars"; + rev = "refs/tags/py-${version}"; + hash = "sha256-N/VIi0s5unYWqlR5Mpaq9cqXl2ccbzWPuOtE2UbmQw8="; + }; # Cargo.lock file is sometimes behind actual release which throws an error, # thus the `sed` command diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polyswarm-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polyswarm-api/default.nix index c9d851f49a..cde3bcc8ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polyswarm-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polyswarm-api/default.nix @@ -1,21 +1,22 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, future -, jsonschema -, pytestCheckHook -, python-dateutil -, pythonOlder -, pythonRelaxDepsHook -, requests -, responses -, setuptools -, vcrpy +{ + lib, + buildPythonPackage, + fetchFromGitHub, + future, + jsonschema, + pytestCheckHook, + python-dateutil, + pythonOlder, + pythonRelaxDepsHook, + requests, + responses, + setuptools, + vcrpy, }: buildPythonPackage rec { pname = "polyswarm-api"; - version = "3.5.2"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,20 +25,14 @@ buildPythonPackage rec { owner = "polyswarm"; repo = "polyswarm-api"; rev = "refs/tags/${version}"; - hash = "sha256-GMLgph6mjDSDn2CCfeqcqFY2gjtziH4xVHJhYTGRYw8="; + hash = "sha256-iY0I5z+aDLQekjgHT5v/ZprCkCgNPkyImmmaCQgnoYc="; }; - pythonRelaxDeps = [ - "future" - ]; + pythonRelaxDeps = [ "future" ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ future @@ -52,9 +47,7 @@ buildPythonPackage rec { vcrpy ]; - pythonImportsCheck = [ - "polyswarm_api" - ]; + pythonImportsCheck = [ "polyswarm_api" ]; meta = with lib; { description = "Library to interface with the PolySwarm consumer APIs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/portion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portion/default.nix new file mode 100644 index 0000000000..5cba2a5792 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/portion/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, wheel +, sortedcontainers +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "portion"; + version = "2.4.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "AlexandreDecan"; + repo = "portion"; + rev = "refs/tags/${version}"; + hash = "sha256-URoyuE0yivUqPjJZbvATkAnTxicY4F2eiJ16rIUdY3Y="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + sortedcontainers + ]; + + pythonImportsCheck = [ + "portion" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Portion, a Python library providing data structure and operations for intervals"; + homepage = "https://github.com/AlexandreDecan/portion"; + changelog = "https://github.com/AlexandreDecan/portion/blob/${src.rev}/CHANGELOG.md"; + license = licenses.lgpl3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/potentials/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/potentials/default.nix index 4cad316d2a..02da784d42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/potentials/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/potentials/default.nix @@ -1,37 +1,41 @@ -{ lib -, bibtexparser -, buildPythonPackage -, cdcs -, datamodeldict -, fetchPypi -, habanero -, ipywidgets -, lxml -, matplotlib -, numpy -, pandas -, pytestCheckHook -, pythonOlder -, requests -, scipy -, unidecode -, xmltodict -, yabadaba +{ + lib, + bibtexparser, + buildPythonPackage, + cdcs, + datamodeldict, + fetchPypi, + habanero, + ipywidgets, + lxml, + matplotlib, + numpy, + pandas, + pytestCheckHook, + pythonOlder, + requests, + scipy, + setuptools, + unidecode, + xmltodict, + yabadaba, }: buildPythonPackage rec { - version = "0.3.7"; pname = "potentials"; - format = "setuptools"; + version = "0.3.8"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vkrNVRf9ntYSpf8nXmAmGjc+sQ4iFllisYHd9s+uQv0="; + hash = "sha256-ZXsqsqsgWntZUOuW1/2KAhsbnienHu6VFctxYkw+GCU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ bibtexparser cdcs datamodeldict @@ -51,13 +55,12 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "potentials" - ]; + pythonImportsCheck = [ "potentials" ]; meta = with lib; { description = "Python API database tools for accessing the NIST Interatomic Potentials Repository"; homepage = "https://github.com/usnistgov/potentials"; + changelog = "https://github.com/usnistgov/potentials/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pplpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pplpy/default.nix index 641008be07..4a4d97c554 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pplpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pplpy/default.nix @@ -9,6 +9,9 @@ , cysignals , gmpy2 , sphinx + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -54,6 +57,8 @@ buildPythonPackage rec { mv docs/build/html "$doc/share/doc/pplpy" ''; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "A Python wrapper for ppl"; homepage = "https://gitlab.com/videlec/pplpy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pretty-errors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pretty-errors/default.nix new file mode 100644 index 0000000000..ce9b646a54 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pretty-errors/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, colorama +}: + +buildPythonPackage rec { + pname = "pretty-errors"; + version = "1.2.25"; + pyproject = true; + + src = fetchPypi { + pname = "pretty_errors"; + inherit version; + hash = "sha256-oWulx1LIfCY7+S+LS1hiTjseKScak5H1ZPErhuk8Z1U="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + colorama + ]; + + pythonImportsCheck = [ "pretty_errors" ]; + + # No test + doCheck = false; + + meta = with lib; { + description = "Prettifies Python exception output to make it legible"; + homepage = "https://pypi.org/project/pretty-errors/"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/primecountpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/primecountpy/default.nix index 463a0cf50b..60ae77e7dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/primecountpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/primecountpy/default.nix @@ -4,6 +4,9 @@ , primecount , cython , cysignals + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -25,6 +28,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "primecountpy" ]; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "Cython interface for C++ primecount library"; homepage = "https://github.com/dimpase/primecountpy/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/private-gpt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/private-gpt/default.nix new file mode 100644 index 0000000000..226489d046 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/private-gpt/default.nix @@ -0,0 +1,119 @@ +{ lib +, buildPythonPackage +, python +, fetchFromGitHub +, poetry-core +, fastapi +, injector +, llama-index-core +, llama-index-readers-file +, huggingface-hub +, python-multipart +, pyyaml +, transformers +, uvicorn +, watchdog +, gradio +, fetchurl +, fetchpatch +}: + +buildPythonPackage rec { + pname = "private-gpt"; + version = "0.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "zylon-ai"; + repo = "private-gpt"; + rev = "v${version}"; + hash = "sha256-bjydzJhOJjmbflcJbuMyNsmby7HtNPFW3MY2Tw12cHw="; + }; + + patches = [ + # Fix a vulnerability, to be removed in the next bump version + # See https://github.com/zylon-ai/private-gpt/pull/1890 + (fetchpatch { + url = "https://github.com/zylon-ai/private-gpt/commit/86368c61760c9cee5d977131d23ad2a3e063cbe9.patch"; + hash = "sha256-4ysRUuNaHW4bmNzg4fn++89b430LP6AzYDoX2HplVH0="; + }) + ]; + + build-system = [ + poetry-core + ]; + + dependencies = [ + fastapi + injector + llama-index-core + llama-index-readers-file + python-multipart + pyyaml + transformers + uvicorn + watchdog + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + # This is needed for running the tests and the service in offline mode, + # See related issue at https://github.com/zylon-ai/private-gpt/issues/1870 + passthru.cl100k_base.tiktoken = fetchurl { + url = "https://openaipublic.blob.core.windows.net/encodings/cl100k_base.tiktoken"; + hash = "sha256-Ijkht27pm96ZW3/3OFE+7xAPtR0YyTWXoRO8/+hlsqc="; + }; + + passthru.optional-dependencies = with python.pkgs; { + embeddings-huggingface = [ + huggingface-hub + llama-index-embeddings-huggingface + ]; + embeddings-ollama = [ + llama-index-embeddings-ollama + ]; + embeddings-openai = [ + llama-index-embeddings-openai + ]; + embeddings-sagemaker = [ + boto3 + ]; + llms-ollama = [ + llama-index-llms-ollama + ]; + llms-openai = [ + llama-index-llms-openai + ]; + llms-openai-like = [ + llama-index-llms-openai-like + ]; + llms-sagemaker = [ + boto3 + ]; + ui = [ + gradio + ]; + vector-stores-chroma = [ + llama-index-vector-stores-chroma + ]; + vector-stores-postgres = [ + llama-index-vector-stores-postgres + ]; + vector-stores-qdrant = [ + llama-index-vector-stores-qdrant + ]; + }; + + postInstall = '' + cp settings*.yaml $out/${python.sitePackages}/private_gpt/ + ''; + + pythonImportsCheck = [ "private_gpt" ]; + + meta = { + changelog = "https://github.com/zylon-ai/private-gpt/blob/${src.rev}/CHANGELOG.md"; + description = "Interact with your documents using the power of GPT, 100% privately, no data leaks"; + homepage = "https://github.com/zylon-ai/private-gpt"; + license = lib.licenses.asl20; + mainProgram = "private-gpt"; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix index 4374576b8e..bfd17d74dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/scrapy/protego"; changelog = "https://github.com/scrapy/protego/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-core/default.nix index 9623cb0544..07eb0b9fc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-core/default.nix @@ -10,16 +10,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-core"; - version = "0.1.15-unstable-2023-10-24"; + version = "0.1.16"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-core"; - rev = "5e795e04094dff67c03c56f2f3de03ff43514cc4"; - hash = "sha256-hchwrolc65tVmSe2IzxwH2zDU2JZzXrCMzWaETWcMDI="; + rev = "refs/tags/v${version}"; + hash = "sha256-072XuHvgWludlFwp/tqLpuAU89vzifFhwQ01FuiCoL8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix index 78de141dad..db8a0d14cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix @@ -6,16 +6,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-keyring-linux-secretservice"; - version = "0.0.1-unstable-2023-04-14"; + version = "0.0.2"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-keyring-linux-secretservice"; - rev = "973d2646ec4d04bc270df53058df892950244e70"; - hash = "sha256-JlhvJBpbewT2c8k31CPMUlvvo/orWW1qfylFZLnDxeY="; + rev = "refs/tags/v${version}"; + hash = "sha256-IZPT2bL/1YD2TH/djwIQHUE1RRbYMTkQDacjjoqDQWo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux/default.nix index 4dac98134a..231a482658 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -7,16 +7,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-keyring-linux"; - version = "0.0.1-unstable-2023-04-14"; + version = "0.0.2"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-keyring-linux"; - rev = "5ff3c7f9a1a162836649502dd23c2fbe1f487d73"; - hash = "sha256-4d8ZePG8imURhdNtLbraMRisrTLoRvJ+L2UuuOo3MPM="; + rev = "refs/tags/v${version}"; + hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-api-core/default.nix index ba8869e42d..3e602ab839 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -7,20 +7,21 @@ , proton-vpn-logger , proton-vpn-killswitch , proton-vpn-session +, sentry-sdk , distro , pytestCheckHook }: buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "0.20.3"; + version = "0.22.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; rev = "refs/tags/v${version}"; - hash = "sha256-acck0Nc/15soTJBC/4y83ID9fjF/q4vrYr6SsLAAVRY="; + hash = "sha256-BGei6tw6VTKkHmaIWa2VJfKOL5cRUbauOQ7zp1RY9Bo="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { proton-vpn-logger proton-vpn-killswitch proton-vpn-session + sentry-sdk ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-connection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-connection/default.nix index 2257130c20..9fb7250f10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-connection/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-connection/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proton-vpn-connection"; - version = "0.11.3"; + version = "0.14.4"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-connection"; rev = "refs/tags/v${version}"; - hash = "sha256-RuLnc/olI8S09WFG126N2xZgW4gf+DDpRstcelqMhs4="; + hash = "sha256-Ze/te0G0tDzyZPGVVqvuJlZoHWJqJ36LnHO+Cy5nxx8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix index d0f62ac6f9..78e9b29a29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix @@ -11,16 +11,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-vpn-killswitch-network-manager"; - version = "0.2.0-unstable-2023-09-05"; + version = "0.4.3"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-killswitch-network-manager"; - rev = "39d4398f169539e335c1f661e0dfc5551df0e6af"; - hash = "sha256-vmTXMIhXZgRvXeUX/XslT+ShqY60w4P7kJBQzWhA66k="; + rev = "refs/tags/v${version}"; + hash = "sha256-kN41b6OZ2YXoBsmNZD3NrX4uJChSmm6DVP+5LYwiZMw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch/default.nix index d36dedfbd4..912980453a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-killswitch/default.nix @@ -6,16 +6,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-vpn-killswitch"; - version = "0.2.0-unstable-2023-09-05"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-killswitch"; - rev = "6e84588ea6ae0946141d4b44b2cf5df8465d5eba"; - hash = "sha256-eFwWN8E+nIDpbut8tkWqXucLhzm7HaLAMBIbAq/X2eo="; + rev = "v${version}"; + hash = "sha256-XZqjAhxgIiATJd3JcW2WWUMC1b6+cfZRhXlIPyMUFH8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix index 9eca560ac0..57c2615f53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix @@ -8,16 +8,16 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "proton-vpn-network-manager-openvpn"; - version = "0.0.4-unstable-2023-07-05"; + version = "0.0.7"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager-openvpn"; - rev = "b79f6732646378ef1b92696de3665ff9560286d3"; - hash = "sha256-Z5X8RRu+1KaZ0pnH7tzGhfeST2W8bxMZnuryLhFjG/g="; + rev = "refs/tags/v${version}"; + hash = "sha256-AHG4jEEv1ihpboQwz6FmNtlqCE83qyOeGzBDHQcvD6o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index ccd84eda66..0327354e79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "proton-vpn-network-manager"; - version = "0.3.3"; + version = "0.4.2"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-UEXoIFLB3/q3G3ASrgsXxF21iT5rCWm4knGezcmxmnk="; + hash = "sha256-zw6fzay1zCBIrouDg2EMhaxDLKIYV5TKYK5lQ3v8W6o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-session/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-session/default.nix index 38d89bb6d3..6295038b6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-session/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-vpn-session/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "proton-vpn-session"; - version = "0.6.5"; + version = "0.6.7"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-session"; rev = "refs/tags/v${version}"; - hash = "sha256-1oyCxBO9YqMopbw88UJF8k4BJFP4+m23NwSrqTYqcg8="; + hash = "sha256-/5ju/2bxhqK6JWchkxFe3amBKHtO98GCVQWIrUsn+nQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix index 72630b722b..384dd6c1ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "proxy-py"; - version = "2.4.4rc5"; + version = "2.4.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "abhinavsingh"; repo = "proxy.py"; rev = "refs/tags/v${version}"; - hash = "sha256-ngIskWzN6699C0WjSX/ZbHxV3Eb8ikQPNYZFzfzt7xU="; + hash = "sha256-QWwIbNt2MtRfQaX7uZJzYmS++2MH+gTjWO0aEKYSETI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix index 74ca3b2e08..d732d0ce84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.31"; + version = "1.9.32"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HUFJ2FP9WGcG9pkukS2LHIgPYFRAXAneiVK6VfYQ+zU="; + hash = "sha256-H235bZOzTxmmLEFje8hhYxrN4l1S34tD1LMhsymRy9w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psrpcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psrpcore/default.nix index 8608c19c8d..102d9ce9b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psrpcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psrpcore/default.nix @@ -1,38 +1,40 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, xmldiff +{ + lib, + buildPythonPackage, + cryptography, + fetchFromGitHub, + powershell, + pytestCheckHook, + pythonOlder, + setuptools, + xmldiff, }: buildPythonPackage rec { pname = "psrpcore"; - version = "0.2.2"; - format = "pyproject"; + version = "0.3.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jborean93"; - repo = pname; + repo = "psrpcore"; rev = "refs/tags/v${version}"; - hash = "sha256-6d5HQJEH/x+V0rpmQkprMlH1n151KyUF6d4tM9W5TFs="; + hash = "sha256-YThumRHMOTyhP6/EmNEew47v/X4Y1aYg1nvgZJz2XUg="; }; - propagatedBuildInputs = [ - cryptography - ]; + build-system = [ setuptools ]; + + dependencies = [ cryptography ]; nativeCheckInputs = [ + powershell pytestCheckHook xmldiff ]; - pythonImportsCheck = [ - "psrpcore" - ]; + pythonImportsCheck = [ "psrpcore" ]; meta = with lib; { description = "Library for the PowerShell Remoting Protocol (PSRP)"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix index f791f953d3..608bae034e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix @@ -5,35 +5,46 @@ , postgresql , postgresqlTestHook , pytestCheckHook +, setuptools , six +, stdenv }: buildPythonPackage rec { pname = "psycopg2cffi"; - version = "2.8.1"; - format = "setuptools"; + version = "2.9.0"; + pyproject = true; - # NB: This is a fork. - # The original repo exists at https://github.com/chtd/psycopg2cffi, however - # this is mostly unmaintained and does not build for PyPy. Given that the - # whole point of this cffi alternative to psycopg2 is to use it with PyPy, I - # chose to use a working fork instead, which was linked in the relevant issue: - # https://github.com/chtd/psycopg2cffi/issues/113#issuecomment-730548574 - # - # If/when these changes get merged back upstream we should revert to using the - # original source as opposed to the fork. src = fetchFromGitHub { - owner = "Omegapol"; - repo = pname; - rev = "c202b25cd861d5e8f0f55c329764ff1da9f020c0"; - sha256 = "09hsnjkix1c0vlhmfvrp8pchpnz2ya4xrchyq15czj527nx2dmy2"; + owner = "chtd"; + repo = "psycopg2cffi"; + rev = "refs/tags/${version}"; + hash = "sha256-9r5MYxw9cvdbLVj8StmMmn0AKQepOpCc7TIBGXZGWe4="; }; - nativeBuildInputs = [ postgresql ]; + postPatch = '' + substituteInPlace psycopg2cffi/_impl/_build_libpq.py \ + --replace-fail "from distutils import sysconfig" "import sysconfig" \ + --replace-fail "sysconfig.get_python_inc()" "sysconfig.get_path('include')" + ''; - propagatedBuildInputs = [ six cffi ]; + build-system = [ + postgresql + setuptools + ]; - nativeCheckInputs = [ postgresqlTestHook pytestCheckHook ]; + dependencies = [ + cffi + six + ]; + + # FATAL: could not create shared memory segment: Operation not permitted + doCheck = !stdenv.isDarwin; + + nativeCheckInputs = [ + postgresqlTestHook + pytestCheckHook + ]; disabledTests = [ # AssertionError: '{}' != [] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix index a8cd6193d7..615e076cb7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20240420"; + version = "0.10.0.20240512"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s8xPkes/xFlejqfOlMZOPLmNK92e2TLK18UZmv3/a6I="; + hash = "sha256-776icZQcsDEZv0EOeLmLlKmK1tidWi/FQ2SZ/N4Cbqo="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index 58b6bd159d..868926ba95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "7.4.4"; + version = "8.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pubnub"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-4Paodw3t2RvAKrDMcWHIGLs5JNtH/9sP+BTyAm/hj4E="; + hash = "sha256-GKJv/GJ/h/LVbEa8Wz7iXc8J38UTTlNa0/08+p5sYCA="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-protobuf/default.nix index ed413f8d8c..e68746ddd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pure-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-protobuf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pure-protobuf"; - version = "3.0.1"; + version = "3.1.0"; format = "pyproject"; # < 3.10 requires get-annotations which isn't packaged yet @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "eigenein"; repo = "protobuf"; rev = "refs/tags/${version}"; - hash = "sha256-sGKnta+agrpJkQB0twFkqRreD5WB2O/06g75N0ic4mc="; + hash = "sha256-JXC68iEX5VepIe4qpugvY0Qb3JlM5mPGHnUVWvb1TDA="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/puremagic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/puremagic/default.nix index 72f0dfc4dd..fc54dbdaa6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/puremagic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/puremagic/default.nix @@ -1,31 +1,31 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "puremagic"; - version = "1.21"; - format = "setuptools"; + version = "1.23"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cdgriffith"; - repo = pname; + repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-ObJp3+gk1tf1+9wBpvzs0wwP7ptDlfGwX9b4wlCb1RI="; + hash = "sha256-DhOTx4Zpux2IiHkw/0nWwWfpnoqxrqqMJw4hrS4ZNGE="; }; - nativeCheckInputs = [ - pytestCheckHook - ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ - "puremagic" - ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "puremagic" ]; meta = with lib; { description = "Implementation of magic file detection"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pvlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pvlib/default.nix index 986fd4ed8b..4abf6f2874 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pvlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pvlib/default.nix @@ -1,43 +1,42 @@ -{ lib -, buildPythonPackage -, fetchPypi -, h5py -, numpy -, pandas -, pytestCheckHook -, pytest-mock -, pytest-remotedata -, pytest-rerunfailures -, pytest-timeout -, pythonOlder -, pytz -, requests -, requests-mock -, scipy -, setuptools -, setuptools-scm -, wheel +{ + lib, + buildPythonPackage, + fetchPypi, + h5py, + numpy, + pandas, + pytestCheckHook, + pytest-mock, + pytest-remotedata, + pytest-rerunfailures, + pytest-timeout, + pythonOlder, + pytz, + requests, + requests-mock, + scipy, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "pvlib"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi{ + src = fetchPypi { inherit pname version; - hash = "sha256-DF+ov+ixSjmjC/7+WmzwFksuvYKikSbbPZBqhNk5+HI="; + hash = "sha256-I+y59o4L+wLOF+hARLUh+341NYHlOKMfnq0ETs0ZUL0="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ h5py numpy pandas @@ -47,21 +46,19 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook pytest-mock pytest-remotedata pytest-rerunfailures pytest-timeout + pytestCheckHook requests-mock ]; - pythonImportsCheck = [ - "pvlib" - ]; + pythonImportsCheck = [ "pvlib" ]; meta = with lib; { - homepage = "https://pvlib-python.readthedocs.io"; description = "Simulate the performance of photovoltaic energy systems"; + homepage = "https://pvlib-python.readthedocs.io"; changelog = "https://pvlib-python.readthedocs.io/en/v${version}/whatsnew.html"; license = licenses.bsd3; maintainers = with maintainers; [ jluttine ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pwkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pwkit/default.nix new file mode 100644 index 0000000000..f1fe2ad545 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pwkit/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + numpy, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "pwkit"; + version = "1.2.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "pkgw"; + repo = "pwkit"; + rev = "refs/tags/pwkit@${version}"; + hash = "sha256-bQno1SIbxAJ1TL068eshfFgAkRXFmbGu2GTbv1BRGU0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ numpy ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "pwkit" ]; + + meta = with lib; { + description = "Miscellaneous science/astronomy tools"; + homepage = "https://github.com/pkgw/pwkit/"; + changelog = "https://github.com/pkgw/pwkit/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pxml/default.nix deleted file mode 100644 index 360a761d88..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pxml/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, pythonAtLeast -, buildPythonPackage -, fetchPypi -, blessings -, six -, nose -, coverage -}: - -buildPythonPackage rec { - pname = "pxml"; - version = "0.2.13"; - format = "setuptools"; - disabled = pythonAtLeast "3.8"; - - src = fetchPypi { - inherit pname version; - sha256 = "0c9zzfv6ciyf9qm7556wil45xxgykg1cj8isp1b88gimwcb2hxg4"; - }; - - propagatedBuildInputs = [ blessings six ]; - nativeCheckInputs = [ nose coverage ]; - - # test_prefixedWhitespace fails due to a python3 StringIO issue requiring - # bytes rather than str - checkPhase = '' - nosetests -e 'test_prefixedWhitespace' - ''; - - meta = with lib; { - homepage = "https://github.com/metagriffin/pxml"; - description = ''A python library and command-line tool to "prettify" and colorize XML.''; - maintainers = with maintainers; [ glittershark ]; - license = licenses.gpl3; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-desmume/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-desmume/default.nix index 6d63a7db9c..1009a1fbed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-desmume/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-desmume/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { description = "Python library to interface with DeSmuME, the Nintendo DS emulator"; homepage = "https://github.com/SkyTemple/py-desmume"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix index 661a79dd64..c65f50b4e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix @@ -2,22 +2,30 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch2 , cython_0 , zfs }: buildPythonPackage rec { pname = "py-libzfs"; - version = "22.12.4.2"; + version = "24.04.0"; format = "setuptools"; src = fetchFromGitHub { owner = "truenas"; repo = pname; rev = "TS-${version}"; - hash = "sha256-vBLbjP1gQEQNsTLc2W6uRzCFHQXZp+jGiwE0Pe8VTuw="; + hash = "sha256-Uiu0RNE06++iNWUNcKpbZvreT2D7/EqHlFZJXKe3F4A="; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/truenas/py-libzfs/commit/b5ffe1f1d6097df6e2f5cc6dd3c968872ec60804.patch"; + hash = "sha256-6r5hQ/o7c4vq4Tfh0l1WbeK3AuPvi+1wzkwkIn1qEes="; + }) + ]; + nativeBuildInputs = [ cython_0 ]; buildInputs = [ zfs ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-pdf-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-pdf-parser/default.nix index 93ffeacb08..36df1c18f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-pdf-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-pdf-parser/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/jstockwin/py-pdf-parser"; changelog = "https://github.com/jstockwin/py-pdf-parser/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix index 415d95f8b3..1226e25bfa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.4.2"; + version = "2.4.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "py-synologydsm-api"; rev = "refs/tags/v${version}"; - hash = "sha256-uqQY0vt+3JGjciG0t9eh8zK5dnq1QhU6FkzWkKX/+DM="; + hash = "sha256-KhYK72kIPeZ32bdJ+3j8rcq/LIrcuELQD+/OQYhktog="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-zabbix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-zabbix/default.nix index b39a706c65..e9251892bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-zabbix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-zabbix/default.nix @@ -1,15 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + pytestCheckHook, + pythonAtLeast, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "py-zabbix"; version = "1.1.7"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -29,17 +32,21 @@ buildPythonPackage rec { }) ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ - "pyzabbix" + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pyzabbix" ]; + + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # AttributeError: 'RawConfigParser' object has no attribute 'readfp' + "config" ]; meta = with lib; { description = "Python module to interact with Zabbix"; homepage = "https://github.com/adubkov/py-zabbix"; + changelog = "https://github.com/adubkov/py-zabbix/releases/tag/${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py3buddy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py3buddy/default.nix index b8a2548079..2b3f3f48f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py3buddy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py3buddy/default.nix @@ -4,35 +4,38 @@ , pyusb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "py3buddy"; - version = "unstable-2019-09-29"; + version = "1.0"; src = fetchFromGitHub { owner = "armijnhemel"; - repo = pname; - rev = "2b28908454645117368ca56df67548c93f4e0b03"; - sha256 = "12ar4kbplavndarkrbibxi5i607f5sfia5myscvalqy78lc33798"; + repo = "py3buddy"; + rev = finalAttrs.version; + hash = "sha256-KJ0xGEXHY6o2074WFZ0u7gATS+wrrjyzanYretckWYk="; }; propagatedBuildInputs = [ pyusb ]; dontConfigure = true; dontBuild = true; - dontCheck = true; installPhase = '' + runHook preInstall + install -D py3buddy.py $out/${python.sitePackages}/py3buddy.py + + runHook postInstall ''; postInstall = '' install -D 99-ibuddy.rules $out/lib/udev/rules.d/99-ibuddy.rules ''; - meta = with lib; { + meta = { description = "Code to work with the iBuddy MSN figurine"; homepage = "https://github.com/armijnhemel/py3buddy"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ prusnak ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ prusnak ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py65/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py65/default.nix index 3c06f5932f..9f73ed1eb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py65/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py65/default.nix @@ -1,40 +1,42 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + unittestCheckHook, }: buildPythonPackage rec { pname = "py65"; - version = "1.1.0"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + version = "1.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "mnaberez"; repo = "py65"; rev = "refs/tags/${version}"; - hash = "sha256-WLs3TAZovuphWZIvMvM3CZnqg1aZfMF4Yrqw46k+bLA="; + hash = "sha256-BMX+sMPx/YBFA4NFkaY0rl0EPicGHgb6xXVvLEIdllA="; }; - postPatch = '' - substituteInPlace py65/tests/test_monitor.py \ - --replace "test_argv_rom" "dont_test_argv_rom" \ - --replace "test_argv_combination_rom_mpu" "dont_test_argv_combination_rom_mpu" - ''; + build-system = [ setuptools ]; + + nativeCheckInputs = [ unittestCheckHook ]; meta = { - homepage = "https://py65.readthedocs.io/"; + homepage = "https://github.com/mnaberez/py65"; description = "Emulate 6502-based microcomputer systems in Python"; - mainProgram = "py65mon"; longDescription = '' Py65 includes a program called Py65Mon that functions as a machine language monitor. This kind of program is sometimes also called a debugger. Py65Mon provides a command line with many convenient commands for interacting with the simulated 6502-based system. ''; + changelog = "https://github.com/mnaberez/py65/blob/${src.rev}/CHANGES.txt"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ AndersonTorres tomasajt ]; + mainProgram = "py65mon"; + maintainers = with lib.maintainers; [ + AndersonTorres + tomasajt + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix new file mode 100644 index 0000000000..2070b0616c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix @@ -0,0 +1,49 @@ +{ + lib, + attrs, + bitarray, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyais"; + version = "2.6.5"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "M0r13n"; + repo = "pyais"; + rev = "refs/tags/v${version}"; + hash = "sha256-/I/4ATvX/0ya8xtineXyjSFJBGhDNy/tosh2NdnKLK4="; + }; + + nativeBuildInputs = [ setuptools ]; + + dependencies = [ + attrs + bitarray + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pyais" ]; + + disabledTestPaths = [ + # Tests the examples which have additional requirements + "tests/test_examples.py" + ]; + + meta = with lib; { + description = "Module for decoding and encoding AIS messages (AIVDM/AIVDO)"; + homepage = "https://github.com/M0r13n/pyais"; + changelog = "https://github.com/M0r13n/pyais/blob/${version}/CHANGELOG.txt"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix index 7a52c601ef..f9b70e8315 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pyaml"; - version = "23.12.0"; + version = "24.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-zm9kjv37GzpVefjO2wT6zw+h6PZIRrY5MJtYW7MitOU="; + hash = "sha256-Dkg9kokBDnR6Ml3EMXG8w51lYt0d1HGejMfnyWyZ/OY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyannote-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyannote-core/default.nix index 453bb0c4d6..85c01bcee5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyannote-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyannote-core/default.nix @@ -1,12 +1,15 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools -, wheel -, sortedcontainers -, numpy -, scipy -, typing-extensions +{ + lib, + buildPythonPackage, + fetchFromGitHub, + numpy, + pandas, + pytestCheckHook, + scipy, + setuptools, + sortedcontainers, + typing-extensions, + versioneer, }: buildPythonPackage rec { @@ -17,20 +20,30 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyannote"; repo = "pyannote-core"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-XQVEMy60LkfFr2TKXTeg6cGHRx5BUZ5qDgzIdKy/19Y="; }; - propagatedBuildInputs = [ + postPatch = '' + # Remove vendorized versioneer.py + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ sortedcontainers numpy scipy typing-extensions ]; - nativeBuildInputs = [ - setuptools - wheel + nativeCheckInputs = [ + pandas + pytestCheckHook ]; pythonImportsCheck = [ "pyannote.core" ]; @@ -38,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Advanced data structures for handling temporal segments with attached labels"; homepage = "https://github.com/pyannote/pyannote-core"; + changelog = "https://github.com/pyannote/pyannote-core/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyannote-database/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyannote-database/default.nix index e3e3ac56ca..8cb35b2606 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyannote-database/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyannote-database/default.nix @@ -1,12 +1,14 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools -, wheel -, pyannote-core -, pyyaml -, pandas -, typer +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pandas, + pyannote-core, + pythonOlder, + pyyaml, + setuptools, + typer, + versioneer, }: buildPythonPackage rec { @@ -14,32 +16,39 @@ buildPythonPackage rec { version = "5.0.1"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "pyannote"; repo = "pyannote-database"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-A7Xr24O8OvVAlURrR+SDCh8Uv9Yz3AUJSFDyDShVVjA="; }; - propagatedBuildInputs = [ + postPatch = '' + # Remove vendorized versioneer.py + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ pyannote-core pyyaml pandas typer ]; - nativeBuildInputs = [ - setuptools - wheel - ]; - pythonImportsCheck = [ "pyannote.database" ]; meta = with lib; { description = "Reproducible experimental protocols for multimedia (audio, video, text) database"; - mainProgram = "pyannote-database"; homepage = "https://github.com/pyannote/pyannote-database"; license = licenses.mit; maintainers = with maintainers; [ matthewcroughan ]; + mainProgram = "pyannote-database"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyannote-pipeline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyannote-pipeline/default.nix index 00b7eab634..0b85c50474 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyannote-pipeline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyannote-pipeline/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools -, wheel -, pyannote-core -, pyannote-database -, pyyaml -, optuna -, tqdm -, docopt -, filelock -, scikit-learn +{ + lib, + buildPythonPackage, + docopt, + fetchFromGitHub, + filelock, + optuna, + pyannote-core, + pyannote-database, + pyyaml, + scikit-learn, + setuptools, + tqdm, + versioneer, }: buildPythonPackage rec { @@ -21,11 +22,21 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyannote"; repo = "pyannote-pipeline"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-0wSgy6kbKi9Wa5dimOz34IV5/8fSwaHDMUpaBW7tm2Y="; }; - propagatedBuildInputs = [ + postPatch = '' + # Remove vendorized versioeer.py + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ pyannote-core pyannote-database pyyaml @@ -36,18 +47,13 @@ buildPythonPackage rec { scikit-learn ]; - nativeBuildInputs = [ - setuptools - wheel - ]; - pythonImportsCheck = [ "pyannote.pipeline" ]; meta = with lib; { description = "Tunable pipelines"; - mainProgram = "pyannote-pipeline"; homepage = "https://github.com/pyannote/pyannote-pipeline"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "pyannote-pipeline"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix index da50d8f457..d88cd0abeb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix @@ -34,15 +34,6 @@ buildPythonPackage rec { sourceRoot = "apache-arrow-${version}/python"; - postPatch = '' - substituteInPlace pyproject.toml setup.py \ - --replace "setuptools_scm < 8.0.0" "setuptools_scm" - '' + lib.optionalString (pythonAtLeast "3.12") '' - substituteInPlace ./cmake_modules/FindPython3Alt.cmake --replace-fail \ - "from distutils import sysconfig" \ - "import sysconfig" - ''; - nativeBuildInputs = [ cmake cython_0 @@ -78,8 +69,6 @@ buildPythonPackage rec { PYARROW_WITH_HDFS = zero_or_one true; PYARROW_WITH_PARQUET = zero_or_one true; PYARROW_WITH_PARQUET_ENCRYPTION = zero_or_one true; - # Plasma is deprecated since arrow 10.0.0 - PYARROW_WITH_PLASMA = zero_or_one false; PYARROW_WITH_S3 = zero_or_one arrow-cpp.enableS3; PYARROW_WITH_GCS = zero_or_one arrow-cpp.enableGcs; PYARROW_BUNDLE_ARROW_CPP_HEADERS = zero_or_one false; @@ -172,7 +161,6 @@ buildPythonPackage rec { "feather" "flight" "fs" - "hdfs" "json" "parquet" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix index d4fb73d509..c9e542a6e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyasn1"; - version = "0.5.1"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bTkaluWbIxMKXPp01v1/OI274mzI8e3zn93fCNnWZ2w="; + hash = "sha256-OjWrLEte+Y4X397IqwdARvvaduKBxacGzNgjKM/I9kw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix index 3acb1f67f0..036ec8c5e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.6.0"; + version = "3.8.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-2jf7mw/cTS5xW3GLZYk60uULUIIlk01on4942Ow2rwY="; + hash = "sha256-uVYnhxQJy6BvSZ/7JbKZPtE+uJkOtEZrd3uTokfZ3f8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix index cef80bbb1b..7b40a3880e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { homepage = "https://github.com/jabesq/pyatmo"; changelog = "https://github.com/jabesq/pyatmo/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix index 1a4cd7c430..10346ee04c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix @@ -1,24 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi -, requests, mock }: +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + requests, + unittestCheckHook, + mock, +}: buildPythonPackage rec { pname = "pybrowserid"; version = "0.14.0"; + pyproject = true; src = fetchPypi { pname = "PyBrowserID"; inherit version; - sha256 = "1qvi79kfb8x9kxkm5lw2mp42hm82cpps1xknmsb5ghkwx1lpc8kc"; + hash = "sha256-bCJ2aeh8wleWrnb2oO9lAlUoyK2C01Jnn6mj5WY6ceM="; }; - propagatedBuildInputs = [ requests ]; + postPatch = '' + substituteInPlace browserid/tests/* \ + --replace-warn 'assertEquals' 'assertEqual' + ''; - nativeCheckInputs = [ mock ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + pythonImportsCheck = [ "browserid" ]; + + nativeCheckInputs = [ + unittestCheckHook + mock + ]; meta = with lib; { description = "Python library for the BrowserID Protocol"; - homepage = "https://github.com/mozilla/PyBrowserID"; - license = licenses.mpl20; + homepage = "https://github.com/mozilla/PyBrowserID"; + license = licenses.mpl20; maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix index 831b12efa9..832d38d726 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pycec"; - version = "0.5.2"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "konikvranik"; repo = pname; - rev = "v${version}"; - hash = "sha256-H18petSiUdftZN8Q3fPmfSJA3OZks+gI+FAq9LwkRsk="; + rev = "refs/tags/v${version}"; + hash = "sha256-5KQyHjAvHWeHFqcFHFJxDOPwWuVcFAN2wVdz9a77dzU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycomm3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycomm3/default.nix new file mode 100644 index 0000000000..a6d219110b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycomm3/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pycomm3"; + version = "1.2.14"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ottowayi"; + repo = "pycomm3"; + rev = "refs/tags/v${version}"; + hash = "sha256-KdvmISMH2HHU8N665QevVw7q9Qs5CwjXxcWpLoziY/Y="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pycomm3" ]; + + disabledTestPaths = [ + # Don't test examples as some have aditional requirements + "examples/" + # No physical PLC available + "tests/online/" + ]; + + meta = with lib; { + description = "A Python Ethernet/IP library for communicating with Allen-Bradley PLCs"; + homepage = "https://github.com/ottowayi/pycomm3"; + changelog = "https://github.com/ottowayi/pycomm3/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycparser/default.nix index fa0622df9f..4aa2c104d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycparser/default.nix @@ -1,16 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, unittestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, unittestCheckHook, pythonOlder }: buildPythonPackage rec { pname = "pycparser"; - version = "2.21"; + version = "2.22"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"; + sha256 = "sha256-SRyL6cBA9TkPW/RKWwd1K9B/Vu35kjgbBccBQ57sEPY="; }; nativeCheckInputs = [ unittestCheckHook ]; + disabled = pythonOlder "3.8"; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt-websocket/default.nix index 74e3481127..f713b194f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt-websocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -3,19 +3,22 @@ , fetchFromGitHub , pythonOlder , hatchling -, aiosqlite , anyio , channels +, httpx-ws +, hypercorn , pycrdt , pytest-asyncio , pytestCheckHook +, sqlite-anyio +, trio , uvicorn , websockets }: buildPythonPackage rec { pname = "pycrdt-websocket"; - version = "0.12.7"; + version = "0.13.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,20 +27,20 @@ buildPythonPackage rec { owner = "jupyter-server"; repo = "pycrdt-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-e4VEEudsdtfC2ek8wODxxoFuaOwl4GKS1cX3QeshuD8="; + hash = "sha256-nkm1ZQ6bYBRDDoREovhEthDZoHApYxzAnwVgDgpWW/s="; }; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ - aiosqlite + dependencies = [ anyio pycrdt + sqlite-anyio ]; - passthru.optional-dependencies = { + optional-dependencies = { django = [ channels ]; @@ -48,8 +51,11 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + httpx-ws + hypercorn pytest-asyncio pytestCheckHook + trio uvicorn websockets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/Cargo.lock index ac98cbf0d0..a0140aa4c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "arc-swap" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "atomic_refcell" @@ -16,21 +16,21 @@ checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "cfg-if" @@ -40,18 +40,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" dependencies = [ "getrandom", ] [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -68,15 +68,15 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" @@ -89,15 +89,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -111,9 +111,9 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -126,9 +126,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -136,9 +136,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", @@ -155,16 +155,16 @@ checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] [[package]] name = "pycrdt" -version = "0.8.13" +version = "0.8.24" dependencies = [ "pyo3", "yrs", @@ -235,27 +235,27 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ "bitflags", ] [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scopeguard" @@ -265,18 +265,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", @@ -285,9 +285,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -305,15 +305,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.53" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", @@ -328,18 +328,18 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", @@ -420,13 +420,14 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -435,51 +436,57 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "yrs" -version = "0.18.0" +version = "0.18.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad19cd99f9c036345d66331db64c7b2c823ca1ac2c30c5ca26eed149c6b4672" +checksum = "d58fbc807677598fedfab76f99f6e1aa5c644411255002b5438ea0ab14672398" dependencies = [ "arc-swap", "atomic_refcell", diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix index c77c360516..c42fb0723d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix @@ -6,6 +6,7 @@ , cargo , rustPlatform , rustc +, objsize , pydantic , pytestCheckHook , y-py @@ -13,14 +14,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.8.13"; + version = "0.8.24"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; rev = "refs/tags/v${version}"; - hash = "sha256-puYJ0mR1JpwD823P6JrXmNjFvqZUPqEj2T4Wk81oBMU="; + hash = "sha256-3j5OhjeVE42n4EEOOMUGlQGdnQ/xia0KD543uCMFpCo="; }; postPatch = '' @@ -44,13 +45,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pycrdt" ]; - # requires pydantic>=2.5 - doCheck = false; - nativeCheckInputs = [ + objsize + pydantic pytestCheckHook y-py - pydantic ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix index 4897a7e549..7f8f85b1b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix @@ -3,7 +3,7 @@ , fetchPypi , param , pytestCheckHook -, pythonOlder +, pythonAtLeast , pyyaml , requests }: @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "0.5.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycups/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycups/default.nix index 9b4a1a2d0e..12adc1f669 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycups/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycups/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pycups"; - version = "2.0.1"; + version = "2.0.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-V0NM5fYlSOsSlJyoIX8Gb07rIaXWq4sTRx3ONQ44DJA="; + hash = "sha256-hD44XB2/aUmWyoTvAqfzDCg3YDVYj1++rNa64AXPfI0="; }; buildInputs = [ cups ] ++ lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-yaml-0/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-yaml-0/default.nix index bc842e5dc5..74c44b2552 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-yaml-0/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-yaml-0/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "pydantic_yaml-0"; + # nixpkgs-update: no auto update version = "0.11.2"; pyproject = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix index b9ac4770f7..a385b6f431 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix @@ -1,41 +1,38 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, invoke -, mock -, pytest7CheckHook -, pythonOlder -, setuptools -, sphinx-rtd-theme -, typing-extensions +{ + lib, + buildPythonPackage, + fetchFromGitHub, + invoke, + mock, + pytest7CheckHook, + pythonOlder, + setuptools, + sphinx-rtd-theme, + typing-extensions, }: buildPythonPackage rec { pname = "pydash"; - version = "7.0.6"; + version = "8.0.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dgilland"; repo = "pydash"; rev = "refs/tags/v${version}"; - hash = "sha256-zwtUdP2fFFE5X0SDkBDetAQbKnZ1v24DGdzN3fQLa0A="; + hash = "sha256-4zNljz0U/iQd2DMC43qkdOY/mwtPlizgLmoaB7BVmxw="; }; postPatch = '' - sed -i "/--cov/d" setup.cfg - sed -i "/--no-cov/d" setup.cfg + sed -i "/--cov/d" pyproject.toml + sed -i "/--no-cov/d" pyproject.toml ''; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - typing-extensions - ]; + dependencies = [ typing-extensions ]; nativeCheckInputs = [ invoke @@ -44,9 +41,7 @@ buildPythonPackage rec { sphinx-rtd-theme ]; - pythonImportsCheck = [ - "pydash" - ]; + pythonImportsCheck = [ "pydash" ]; disabledTestPaths = [ # Disable mypy testing diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index 337a7a4fca..38509d5ba2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/pydata/pydata-sphinx-theme"; changelog = "https://github.com/pydata/pydata-sphinx-theme/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix index 6edd7a379b..2ea1a86f35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pydeck"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-B+3egz98/O9nSRJDURlap9zSRmPUkJ/XiY29C2+8Aew="; + hash = "sha256-/Yt19hyg1HEtMrTgc0QPHLdPLgwWoLV+V6AOZcVjzFQ="; }; # upstream has an invalid pyproject.toml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix index 25ca54297f..f603e9accf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pydevd"; - version = "2.10.0"; + version = "3.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,15 +23,15 @@ buildPythonPackage rec { owner = "fabioz"; repo = "PyDev.Debugger"; rev = "pydev_debugger_${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-1tWiPj30x/ZXIBu2qzUCpyF1bLsJ0wW1QaxklD3h3A8="; + hash = "sha256-aylmLN7lVUza2lt2K48rJsx3XatXPgPjcmPZ05raLX0="; }; - nativeBuildInputs = [ + __darwinAllowLocalNetworking = true; + + build-system = [ setuptools ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ numpy psutil @@ -55,8 +55,11 @@ buildPythonPackage rec { # https://github.com/fabioz/PyDev.Debugger/issues/227 "test_to_server_and_to_client" # AssertionError pydevd_tracing.set_trace_to_threads(tracing_func) == 0 - "test_tracing_other_threads" + "test_step_next_step_in_multi_threads" "test_tracing_basic" + "test_tracing_other_threads" + # subprocess.CalledProcessError + "test_find_main_thread_id" ] ++ lib.optionals (pythonAtLeast "3.12") [ "test_case_handled_and_unhandled_exception_generator" "test_case_stop_async_iteration_exception" @@ -73,9 +76,9 @@ buildPythonPackage rec { meta = with lib; { description = "PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"; - mainProgram = "pydevd"; homepage = "https://github.com/fabioz/PyDev.Debugger"; license = licenses.epl10; maintainers = with maintainers; [ onny ]; + mainProgram = "pydevd"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix index 2d3d12ca87..6d1f6aff06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix @@ -1,24 +1,25 @@ -{ lib -, aiohttp -, aioresponses -, apischema -, buildPythonPackage -, fetchFromGitHub -, freezegun -, gql -, graphql-core -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, requests -, setuptools -, setuptools-scm +{ + lib, + aiohttp, + aioresponses, + apischema, + buildPythonPackage, + fetchFromGitHub, + freezegun, + gql, + graphql-core, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + requests, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "pydrawise"; - version = "2024.3.0"; - format = "pyproject"; + version = "2024.4.1"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -26,15 +27,15 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-sL0/LZ7ggUg2OGkIauNLHR7i3l3k4NGvyY2ea1O1m3E="; + hash = "sha256-rJul7UAhgB0a6+3buPlfjnhhy2QOo82gvmRtZB+vrko="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp apischema gql @@ -49,9 +50,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "pydrawise" - ]; + pythonImportsCheck = [ "pydrawise" ]; meta = with lib; { description = "Library for interacting with Hydrawise sprinkler controllers through the GraphQL API"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix index 84cdda65f1..85110fdf94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix @@ -4,22 +4,27 @@ , fetchFromGitHub , python , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pyelftools"; - version = "0.30"; - format = "setuptools"; + version = "0.31"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "eliben"; - repo = pname; - rev = "v${version}"; - hash = "sha256-A9etnN7G24/Gu8YlV/YDpxZV+TG2eVXGx2ZjVnA9ZD4="; + repo = "pyelftools"; + rev = "refs/tags/v${version}"; + hash = "sha256-kX89fMXqrEvhMAAjqKHzHmrYizKBt1uCWMOJtFNNhy4="; }; + build-system = [ + setuptools + ]; + doCheck = stdenv.hostPlatform.system == "x86_64-linux" && stdenv.hostPlatform.isGnu; checkPhase = '' @@ -33,12 +38,18 @@ buildPythonPackage rec { "elftools" ]; - meta = with lib; { + meta = { description = "Python library for analyzing ELF files and DWARF debugging information"; - mainProgram = "readelf.py"; homepage = "https://github.com/eliben/pyelftools"; changelog = "https://github.com/eliben/pyelftools/blob/v${version}/CHANGES"; - license = licenses.publicDomain; - maintainers = with maintainers; [ igsha pamplemousse ]; + license = with lib.licenses; [ + # Public domain with Unlicense waiver. + unlicense + # pyelftools bundles construct library that is licensed under MIT license. + # See elftools/construct/{LICENSE,README} in the source code. + mit + ]; + maintainers = with lib.maintainers; [ igsha pamplemousse ]; + mainProgram = "readelf.py"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix index 45e4b014db..3081ed70ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.20.2"; + version = "1.20.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-sjZaLqTYoXJ1cpaSuyLNAsUrACOMVah7DKaKxGkG0zE="; + hash = "sha256-4lMsyzw56gFimUs52mEzy5eKYF9s2ClNi3yfdIBbccY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyerfa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyerfa/default.nix index 8561738f84..fd7348f3ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyerfa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyerfa/default.nix @@ -2,9 +2,8 @@ , buildPythonPackage , fetchPypi , jinja2 -, oldest-supported-numpy +, setuptools , setuptools-scm -, wheel , liberfa , packaging , numpy @@ -14,23 +13,27 @@ buildPythonPackage rec { pname = "pyerfa"; - format = "pyproject"; - version = "2.0.1.1"; + version = "2.0.1.4"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-26x07409Ow8i7wrTu72zCyqeEFcLH6Wpi+NMe+Nsmms="; + hash = "sha256-rLimcTIy6jXAS8bkCsTkYd/MgX05XvKjyAUcGjMkndM="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0.0rc1" "numpy" + ''; + + build-system = [ jinja2 - oldest-supported-numpy packaging + setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ numpy ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix index c59205aa3f..763b5a4a62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix @@ -1,26 +1,30 @@ -{ lib -, buildPythonPackage -, fetchPypi -, gitpython -, pytestCheckHook -, pythonOlder -, requests +{ + lib, + buildPythonPackage, + fetchPypi, + gitpython, + pytestCheckHook, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.9"; - format = "setuptools"; + version = "0.2.17"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-q16YB0lLlw9nXohcT20l41Bv40CqshWzE8nVBBSEppE="; + hash = "sha256-I7uDmKvHVx8mpqlq+kOyp57wCii8fy9ecJTSm7uHbZ0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ gitpython requests ]; @@ -28,14 +32,12 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "pyExploitDb" - ]; + pythonImportsCheck = [ "pyExploitDb" ]; meta = with lib; { description = "Library to fetch the most recent exploit-database"; homepage = "https://github.com/GoVanguard/pyExploitDb"; - changelog = "https://github.com/GoVanguard/pyExploitDb/blob/master/Changelog.txt"; + changelog = "https://github.com/GoVanguard/pyExploitDb/blob/master/ChangeLog.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix index 4999b1dcdd..551814d9fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix @@ -1,39 +1,37 @@ -{ lib -, buildPythonPackage -, fetchPypi -, importlib-metadata -, nose -, numpy -, setuptools -, setuptools-scm -, six -, glibcLocales -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchPypi, + glibcLocales, + importlib-metadata, + numpy, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "pyfaidx"; version = "0.8.1.1"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-bwSCNSYZ8sxWADyiIyG9sNB2S2VnlbweQGKx+psIaGs="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ - importlib-metadata - six - ]; + dependencies = [ importlib-metadata ]; nativeCheckInputs = [ glibcLocales - nose numpy pytestCheckHook ]; @@ -43,15 +41,14 @@ buildPythonPackage rec { "tests/test_Fasta_bgzip.py" ]; - pythonImportsCheck = [ - "pyfaidx" - ]; + pythonImportsCheck = [ "pyfaidx" ]; meta = with lib; { - homepage = "https://github.com/mdshw5/pyfaidx"; description = "Python classes for indexing, retrieval, and in-place modification of FASTA files using a samtools compatible index"; - mainProgram = "faidx"; + homepage = "https://github.com/mdshw5/pyfaidx"; + changelog = "https://github.com/mdshw5/pyfaidx/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ jbedo ]; + mainProgram = "faidx"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix index c588607f5c..6e31c1e2e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix @@ -8,20 +8,21 @@ , setuptools # tests +, pandas , pytestCheckHook , undefined }: buildPythonPackage rec { pname = "pyfakefs"; - version = "5.3.5"; + version = "5.4.1"; pyproject = true; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-fNxQCzWiFMt6YU4ZQFQ6zGZQ5pqUrHbjDzPJNzvZz5A="; + hash = "sha256-IMtR6GDC8/+DhZFirVE0u4sKHnqB3woYz8zEhi0Nncw="; }; postPatch = '' @@ -46,6 +47,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pandas pytestCheckHook undefined ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix index 746377c3c1..cf5573c8c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfftw/default.nix @@ -27,6 +27,5 @@ buildPythonPackage rec { description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; homepage = "http://hgomersall.github.com/pyFFTW/"; license = with licenses; [ bsd2 bsd3 ]; - maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix index 7822fa8da6..1ce5d605f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyfibaro"; - version = "0.7.7"; + version = "0.7.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rappenze"; repo = "pyfibaro"; rev = "refs/tags/${version}"; - hash = "sha256-jsl2Xc6bzN7SVyMnFeCwMpFUEa6xUWGn/T96MrDXlCE="; + hash = "sha256-gid+qbl4RgT47zC5i1Usw2Zco+jb2LJeeMkKvni/aDM="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix index 32450e254e..4118e780d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.6.10"; + version = "0.6.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "hthiery"; repo = "python-fritzhome"; rev = "refs/tags/${version}"; - hash = "sha256-jdv49cpd2ewfrhWzjWM5Uxhaj3UZfOXMMOZeobpXe0E="; + hash = "sha256-YzrRkFa4J3NXdc4W5CHrHvqSVJ8yBGtaf6gRqmiY7gI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix index 5ff81a268f..e154e6f9a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix @@ -1,17 +1,19 @@ -{ lib -, buildPythonPackage -, fetchPypi -, mock -, psutil -, pyopenssl -, pysendfile -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + mock, + psutil, + pyopenssl, + pysendfile, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pyftpdlib"; version = "1.5.9"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,14 +22,12 @@ buildPythonPackage rec { hash = "sha256-Mj1MQvFAau203xj69oD2TzLAgP9m9sJgkLpZL1v8Sg8="; }; - propagatedBuildInputs = [ - pysendfile - ]; + build-system = [ setuptools ]; + + dependencies = [ pysendfile ]; passthru.optional-dependencies = { - ssl = [ - pyopenssl - ]; + ssl = [ pyopenssl ]; }; nativeCheckInputs = [ @@ -39,15 +39,14 @@ buildPythonPackage rec { # on Hydra: https://hydra.nixos.org/build/84374861 doCheck = false; - pythonImportsCheck = [ - "pyftpdlib" - ]; + pythonImportsCheck = [ "pyftpdlib" ]; meta = with lib; { description = "Asynchronous FTP server library"; - mainProgram = "ftpbench"; homepage = "https://github.com/giampaolo/pyftpdlib/"; + changelog = "https://github.com/giampaolo/pyftpdlib/blob/release-${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "ftpbench"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix index 39794d5921..259370299d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyfxa"; version = "0.7.8"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,11 @@ buildPythonPackage rec { hash = "sha256-DMFZl1hbYNaScOTWkAbK2nKti6wD5SS5A30q7TW5vO4="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ cryptography hawkauthlib pybrowserid diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/default.nix new file mode 100644 index 0000000000..a476ecd58b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/default.nix @@ -0,0 +1,123 @@ +{ stdenv +, lib +, substituteAll +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, python +, pkg-config +, setuptools +, cython + +, AppKit +, fontconfig +, freetype +, libjpeg +, libpng +, libX11 +, portmidi +, SDL2 +, SDL2_image +, SDL2_mixer +, SDL2_ttf +}: + +buildPythonPackage rec { + pname = "pygame-ce"; + version = "2.4.1"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "pygame-community"; + repo = "pygame-ce"; + rev = "refs/tags/${version}"; + hash = "sha256-4Ky+QEUsQ0odcwEETk0yGECs7CcJQthhavboOnMDvF8="; + # Unicode file cause different checksums on HFS+ vs. other filesystems + postFetch = "rm -rf $out/docs/reST"; + }; + + patches = [ + (substituteAll { + src = ./fix-dependency-finding.patch; + buildinputs_include = builtins.toJSON (builtins.concatMap (dep: [ + "${lib.getDev dep}/" + "${lib.getDev dep}/include" + "${lib.getDev dep}/include/SDL2" + ]) buildInputs); + buildinputs_lib = builtins.toJSON (builtins.concatMap (dep: [ + "${lib.getLib dep}/" + "${lib.getLib dep}/lib" + ]) buildInputs); + }) + # Skip tests that should be disabled without video driver + ./skip-surface-tests.patch + ]; + + postPatch = '' + substituteInPlace buildconfig/config_{unix,darwin}.py \ + --replace-fail 'from distutils' 'from setuptools._distutils' + substituteInPlace src_py/sysfont.py \ + --replace-fail 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \ + --replace-fail /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list + '' + lib.optionalString stdenv.isDarwin '' + # flaky + rm test/system_test.py + ''; + + nativeBuildInputs = [ + pkg-config + cython + setuptools + ]; + + buildInputs = [ + freetype + libX11 + libjpeg + libpng + portmidi + SDL2 + SDL2_image + SDL2_mixer + SDL2_ttf + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + ]; + + preConfigure = '' + ${python.pythonOnBuildForHost.interpreter} buildconfig/config.py + ''; + + env = { + SDL_CONFIG = "${SDL2.dev}/bin/sdl2-config"; + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + + preCheck = '' + export HOME=$(mktemp -d) + # No audio or video device in test environment + export SDL_VIDEODRIVER=dummy + export SDL_AUDIODRIVER=disk + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m pygame.tests -v --exclude opengl,timing --time_out 300 + runHook postCheck + ''; + + pythonImportsCheck = [ + "pygame" + ]; + + meta = with lib; { + description = "Pygame Community Edition (CE) - library for multimedia application built on SDL"; + homepage = "https://pyga.me/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ pbsds ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/fix-dependency-finding.patch b/third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/fix-dependency-finding.patch new file mode 100644 index 0000000000..5e39dff135 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/fix-dependency-finding.patch @@ -0,0 +1,41 @@ +diff --git a/buildconfig/config_darwin.py b/buildconfig/config_darwin.py +index 9503ea70..d0d3ab6e 100644 +--- a/buildconfig/config_darwin.py ++++ b/buildconfig/config_darwin.py +@@ -140,16 +140,8 @@ def main(auto_config=False): + ]) + + print('Hunting dependencies...') +- incdirs = ['/usr/local/include', '/opt/homebrew/include'] +- incdirs.extend(['/usr/local/include/SDL2', '/opt/homebrew/include/SDL2', '/opt/local/include/SDL2']) +- +- incdirs.extend([ +- #'/usr/X11/include', +- '/opt/local/include', +- '/opt/local/include/freetype2/freetype'] +- ) +- #libdirs = ['/usr/local/lib', '/usr/X11/lib', '/opt/local/lib'] +- libdirs = ['/usr/local/lib', '/opt/local/lib', '/opt/homebrew/lib'] ++ incdirs = @buildinputs_include@ ++ libdirs = @buildinputs_lib@ + + for d in DEPS: + if isinstance(d, (list, tuple)): +diff --git a/buildconfig/config_unix.py b/buildconfig/config_unix.py +index 3eba5b5c..53cc6233 100644 +--- a/buildconfig/config_unix.py ++++ b/buildconfig/config_unix.py +@@ -240,11 +240,8 @@ def main(auto_config=False): + if not DEPS[0].found: + raise RuntimeError('Unable to run "sdl-config". Please make sure a development version of SDL is installed.') + +- incdirs = [] +- libdirs = [] +- for extrabase in extrabases: +- incdirs += [extrabase + d for d in origincdirs] +- libdirs += [extrabase + d for d in origlibdirs] ++ incdirs = @buildinputs_include@ ++ libdirs = @buildinputs_lib@ + + for arg in DEPS[0].cflags.split(): + if arg[:2] == '-I': diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/skip-surface-tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/skip-surface-tests.patch new file mode 100644 index 0000000000..21d9c9060f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame-ce/skip-surface-tests.patch @@ -0,0 +1,26 @@ +diff --git a/test/surface_test.py b/test/surface_test.py +index 5ce78b6e..8b8f7ed5 100644 +--- a/test/surface_test.py ++++ b/test/surface_test.py +@@ -1091,6 +1091,10 @@ class GeneralSurfaceTests(unittest.TestCase): + finally: + pygame.display.quit() + ++ @unittest.skipIf( ++ os.environ.get("SDL_VIDEODRIVER") == "dummy", ++ 'requires a non-"dummy" SDL_VIDEODRIVER', ++ ) + def test_convert_init(self): + """Ensure initialization exceptions are raised + for surf.convert().""" +@@ -1118,6 +1122,10 @@ class GeneralSurfaceTests(unittest.TestCase): + finally: + pygame.display.quit() + ++ @unittest.skipIf( ++ os.environ.get("SDL_VIDEODRIVER") == "dummy", ++ 'requires a non-"dummy" SDL_VIDEODRIVER', ++ ) + def test_convert_alpha_init(self): + """Ensure initialization exceptions are raised + for surf.convert_alpha().""" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix index e2314f9c6e..e74448a307 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix @@ -2,29 +2,37 @@ , pkgs , buildPythonPackage , fetchFromGitHub -, pygame +, setuptools +, pygame-ce , python-i18n , pytestCheckHook }: buildPythonPackage rec { pname = "pygame-gui"; - version = "069"; - format = "setuptools"; + version = "0610"; + pyproject = true; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "MyreMylar"; repo = "pygame_gui"; rev = "refs/tags/v_${version}"; - hash = "sha256-IXU00Us1odbfS7jLPMYuCPv2l/5TUZdYKES7xHs+EWg="; + hash = "sha256-PVNi/I174AyEEjc+N2UGtgOYSGAgVQbqrKkWZnjOxFY="; }; - propagatedBuildInputs = [ pygame python-i18n ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pygame-ce + python-i18n + ]; postPatch = '' substituteInPlace pygame_gui/core/utility.py \ - --replace "xsel" "${pkgs.xsel}/bin/xsel" + --replace-fail "xsel" "${lib.getExe pkgs.xsel}" ''; nativeCheckInputs = [ pytestCheckHook ]; @@ -55,6 +63,6 @@ buildPythonPackage rec { description = "A GUI system for pygame"; homepage = "https://github.com/MyreMylar/pygame_gui"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ emilytrau ]; + maintainers = with maintainers; [ emilytrau pbsds ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame-sdl2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame-sdl2/default.nix index 0201c9cb4a..8d8c5dee83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame-sdl2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame-sdl2/default.nix @@ -1,16 +1,32 @@ -{ lib, buildPythonPackage, fetchurl, isPy27, renpy -, cython_0, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: - -buildPythonPackage rec { +{ + lib, + buildPythonPackage, + fetchurl, + isPy27, + renpy, + cython_0, + SDL2, + SDL2_image, + SDL2_ttf, + SDL2_mixer, + libjpeg, + libpng, + setuptools, +}: +let pname = "pygame-sdl2"; version = "2.1.0"; - format = "setuptools"; renpy_version = renpy.base_version; +in + +buildPythonPackage { + inherit pname version; name = "${pname}-${version}-${renpy_version}"; + pyproject = true; src = fetchurl { url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}+renpy${renpy_version}.tar.gz"; - hash = "sha256-mrfrsRAVEqw7fwtYdeATp/8AtMn74x9pJEXwYZPOl2I="; + hash = "sha256-Zib39NyQ1pGVCWPrK5/Tl3dAylUlmKZKxU8pf+OpAdY="; }; # force rebuild of headers needed for install @@ -24,27 +40,26 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - SDL2.dev cython_0 + SDL2.dev + cython_0 + setuptools ]; buildInputs = [ - SDL2 SDL2_image SDL2_ttf SDL2_mixer - libjpeg libpng + SDL2 + SDL2_image + SDL2_ttf + SDL2_mixer + libjpeg + libpng ]; - doCheck = isPy27; # python3 tests are non-functional - postInstall = '' - ( cd "$out"/include/python*/ ; - ln -s pygame-sdl2 pygame_sdl2 || true ; ) - ''; - - meta = with lib; { + meta = { description = "A reimplementation of parts of pygame API using SDL2"; - homepage = "https://github.com/renpy/pygame_sdl2"; - # Some parts are also available under Zlib License - license = licenses.lgpl2; - maintainers = with maintainers; [ raskin ]; + homepage = "https://github.com/renpy/pygame_sdl2"; + license = with lib.licenses; [ lgpl2 zlib ]; + maintainers = with lib.maintainers; [ raskin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix index a219804f34..fca187c8cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , substituteAll +, fetchpatch , fetchFromGitHub , buildPythonPackage , pythonOlder @@ -61,6 +62,13 @@ buildPythonPackage rec { }) # Skip tests that should be disabled without video driver ./skip-surface-tests.patch + + # removes distutils unbreaking py312, part of https://github.com/pygame/pygame/pull/4211 + (fetchpatch { + name = "remove-distutils.patch"; + url = "https://github.com/pygame/pygame/commit/6038e7d6583a7a25fcc6e15387cf6240e427e5a7.patch"; + hash = "sha256-HxcYjjhsu/Y9HiK9xDvY4X5dgWPP4XFLxdYGXC6tdWM="; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix index 62c8598f59..21ecabb0ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { elif name == 'freetype': path = '${freetype}/lib/libfreetype${ext}' elif name[0:2] == 'av' or name[0:2] == 'sw': - path = '${ffmpeg-full}/lib/lib' + name + '${ext}' + path = '${lib.getLib ffmpeg-full}/lib/lib' + name + '${ext}' elif name == 'openal': path = '${openal}/lib/libopenal${ext}' elif name == 'pulse': diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix index cc2d41147b..f1dff5b24e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygobject"; - version = "3.46.0"; + version = "3.48.2"; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "QmAIstrVSMmvHHsDtZ3wRA/eXDPzj7VAaxA6Q9ZTyvw="; + hash = "sha256-B5SutKm+MaCSrCBiG19U7CgPkYWUPTKLEFza5imK0ac="; }; depsBuildBuild = [ @@ -50,6 +50,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycairo + gobject-introspection # e.g. try building: python3Packages.urwid python3Packages.pydbus ]; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix index 61fee2859d..89d245e6e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pygraphviz"; - version = "1.12"; + version = "1.13"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pygraphviz"; repo = "pygraphviz"; - rev = "pygraphviz-${version}"; - hash = "sha256-XDP77H724eiMa/V18OtLxpUpxlIVDmcFLMYOAbazquo="; + rev = "refs/tags/pygraphviz-${version}"; + hash = "sha256-/H7eHgs3jtbgat8//1Y1S3iV5s0UBKW+J+zK+f8qGqI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygsl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygsl/default.nix index 13a4644962..0880ff1810 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygsl/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , gsl , swig , numpy @@ -9,12 +9,14 @@ buildPythonPackage rec { pname = "pygsl"; - version = "2.3.3"; + version = "2.3.4"; format = "setuptools"; - src = fetchPypi { - inherit pname version; - hash = "sha256-F3m85Bs8sONw0Rv0EAOFK6R1DFHfW4dxuzQmXo4PHfM="; + src = fetchFromGitHub { + owner = "pygsl"; + repo = "pygsl"; + rev = "refs/tags/v.${version}"; + hash = "sha256-2TalLKDDoJdKGZHr7eNNvVW8fL7wQJjnZv34LJokfow="; }; nativeBuildInputs = [ @@ -24,10 +26,14 @@ buildPythonPackage rec { buildInputs = [ gsl ]; - propagatedBuildInputs = [ + dependencies = [ numpy ]; + preBuild = '' + python setup.py build_ext --inplace + ''; + preCheck = '' cd tests ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix index 22b71bdbac..1f9ac10b9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/koehlma/pygtkspellcheck"; description = "A Python spell-checking library for GtkTextViews based on Enchant"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix index 22242ee62b..0f52f3dbf4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix @@ -1,23 +1,24 @@ -{ lib -, aiofiles -, aiohttp -, async-timeout -, async-generator -, buildPythonPackage -, fetchFromGitHub -, pypubsub -, pyserial -, pyserial-asyncio -, pytestCheckHook -, pythonAtLeast -, pythonOlder -, setuptools -, voluptuous +{ + lib, + aiofiles, + aiohttp, + async-timeout, + async-generator, + buildPythonPackage, + fetchFromGitHub, + pypubsub, + pyserial, + pyserial-asyncio, + pytestCheckHook, + pythonAtLeast, + pythonOlder, + setuptools, + voluptuous, }: buildPythonPackage rec { pname = "pyinsteon"; - version = "1.5.3"; + version = "1.6.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,12 +27,10 @@ buildPythonPackage rec { owner = "pyinsteon"; repo = "pyinsteon"; rev = "refs/tags/${version}"; - hash = "sha256-9d6QbekUv63sjKdK+ZogYOkGfFXVW+JB6ITHnehLwtM="; + hash = "sha256-s8YRDu+UpU1sisdscd87CpcLl3csOUDdIuKqx48GZsw="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiofiles @@ -48,14 +47,17 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # RuntimeError: BUG: Dead Listener called, still subscribed! + "test_linking_with_i1_device" + ]; + disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [ # Tests are blocking or failing "tests/test_handlers/" ]; - pythonImportsCheck = [ - "pyinsteon" - ]; + pythonImportsCheck = [ "pyinsteon" ]; meta = with lib; { description = "Python library to support Insteon home automation projects"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix deleted file mode 100644 index ed0a5281e0..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, cython, pytest, importlib-resources, numpy }: - -buildPythonPackage rec { - pname = "pyjet"; - version = "1.9.0"; - format = "setuptools"; - - # tests not included in pypi tarball - src = fetchFromGitHub { - owner = "scikit-hep"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-0g0fCf0FIwde5Vsc/BJxjgMcs5llpD8JqOgFbMjOooc="; - }; - - nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ - numpy - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources - ]; - - nativeCheckInputs = [ pytest ]; - checkPhase = '' - mv pyjet _pyjet - pytest tests/ - ''; - - meta = with lib; { - homepage = "https://github.com/scikit-hep/pyjet"; - description = "The interface between FastJet and NumPy"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjson5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjson5/default.nix new file mode 100644 index 0000000000..19f933ddc3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjson5/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + cython, + fetchFromGitHub, + pythonOlder, + setuptools, + wheel, +}: + +buildPythonPackage rec { + pname = "pyjson5"; + version = "1.6.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Kijewski"; + repo = "pyjson5"; + rev = "refs/tags/v${version}"; + hash = "sha256-LNcz9JEOw6HO9eIf71w4NJdPOB4yixBfBeD7B/NLbfE="; + fetchSubmodules = true; + }; + + build-system = [ + cython + setuptools + wheel + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "pyjson5" ]; + + meta = with lib; { + description = "A JSON5 serializer and parser library"; + homepage = "https://github.com/Kijewski/pyjson5"; + changelog = "https://github.com/Kijewski/pyjson5/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykalman/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykalman/default.nix index 7073e9382d..401ff4fc6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykalman/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykalman/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pykalman"; - version = "0.9.5"; + version = "0.9.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-gWr0dyDZJKTGAW+nS54sjCEWWgjZFpPDIqF0Ho4H+zg="; + hash = "sha256-E1d5IAOTxrNwIhmQ9zFnQEcvVBNG6SEdEWMOLC2PuKA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix index b720f5b838..3418c47175 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix @@ -16,14 +16,19 @@ buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.11"; + version = "1.3.12"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bBI8e65SE68iPFKai0FhwH64VKb+QDizaVK62iEx68s="; + hash = "sha256-zCCypnxkBWSFoxTSwrbbo1SvfuHI+42uG+byk2o3Q0E="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-warn "numpy>=2.0.0rc1,<3" "numpy" + ''; + nativeBuildInputs = [ cython numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix index 899fe46feb..c9e19c4c16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { homepage = "https://www.pykka.org/"; description = "A Python implementation of the actor model"; changelog = "https://github.com/jodal/pykka/releases/tag/v${version}"; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix index 046277a5fa..cfa1b686a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -1,28 +1,29 @@ -{ stdenv -, lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, astroid -, dill -, isort -, mccabe -, platformdirs -, requests -, setuptools -, tomli -, tomlkit -, typing-extensions -, gitpython -, py -, pytest-timeout -, pytest-xdist -, pytest7CheckHook +{ + lib, + stdenv, + astroid, + buildPythonPackage, + dill, + fetchFromGitHub, + gitpython, + isort, + mccabe, + platformdirs, + py, + pytest-timeout, + pytest-xdist, + pytest7CheckHook, + pythonOlder, + requests, + setuptools, + tomli, + tomlkit, + typing-extensions, }: buildPythonPackage rec { pname = "pylint"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,25 +32,22 @@ buildPythonPackage rec { owner = "pylint-dev"; repo = "pylint"; rev = "refs/tags/v${version}"; - hash = "sha256-JHtMaZNwl+yLwEDD4Nl0vOt9NQ9DO7iIy5LR/9ta1Pw="; + hash = "sha256-LmpLt2GCzYU73BUpORHaFbGqkxyYqoPoKZpUJSChqKQ="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - astroid - dill - isort - mccabe - platformdirs - tomlkit - ] ++ lib.optionals (pythonOlder "3.11") [ - tomli - ] ++ lib.optionals (pythonOlder "3.9") [ - typing-extensions - ]; + dependencies = + [ + astroid + dill + isort + mccabe + platformdirs + tomlkit + ] + ++ lib.optionals (pythonOlder "3.11") [ tomli ] + ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; nativeCheckInputs = [ gitpython @@ -67,7 +65,8 @@ buildPythonPackage rec { # displaying implemented interfaces in pylint 3.0. The # implementation relies on the '__implements__' attribute proposed # in PEP 245, which was rejected in 2006. - "-W" "ignore::DeprecationWarning" + "-W" + "ignore::DeprecationWarning" "-v" ]; @@ -84,30 +83,32 @@ buildPythonPackage rec { "tests/pyreverse/test_writer.py" ]; - disabledTests = [ - # AssertionError when self executing and checking output - # expected output looks like it should match though - "test_invocation_of_pylint_config" - "test_generate_rcfile" - "test_generate_toml_config" - "test_help_msg" - "test_output_of_callback_options" - # Failed: DID NOT WARN. No warnings of type (,) were emitted. The list of emitted warnings is: []. - "test_save_and_load_not_a_linter_stats" - # Truncated string expectation mismatch - "test_truncated_compare" - # Probably related to pytest versions, see pylint-dev/pylint#9477 and pylint-dev/pylint#9483 - "test_functional" - # AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')] - "test_functional_relation_extraction" - ] ++ lib.optionals stdenv.isDarwin [ - "test_parallel_execution" - "test_py3k_jobs_option" - ]; + disabledTests = + [ + # AssertionError when self executing and checking output + # expected output looks like it should match though + "test_invocation_of_pylint_config" + "test_generate_rcfile" + "test_generate_toml_config" + "test_help_msg" + "test_output_of_callback_options" + # Failed: DID NOT WARN. No warnings of type (,) were emitted. The list of emitted warnings is: []. + "test_save_and_load_not_a_linter_stats" + # Truncated string expectation mismatch + "test_truncated_compare" + # Probably related to pytest versions, see pylint-dev/pylint#9477 and pylint-dev/pylint#9483 + "test_functional" + # AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')] + "test_functional_relation_extraction" + ] + ++ lib.optionals stdenv.isDarwin [ + "test_parallel_execution" + "test_py3k_jobs_option" + ]; meta = with lib; { - homepage = "https://pylint.readthedocs.io/en/stable/"; description = "A bug and style checker for Python"; + homepage = "https://pylint.readthedocs.io/en/stable/"; changelog = "https://github.com/pylint-dev/pylint/releases/tag/v${version}"; longDescription = '' Pylint is a Python static code analysis tool which looks for programming errors, @@ -118,7 +119,7 @@ buildPythonPackage rec { - symilar: an independent similarities checker - epylint: Emacs and Flymake compatible Pylint ''; - license = licenses.gpl1Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix index 49ee5e2784..f486b45c67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix @@ -1,34 +1,34 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pylutron"; - version = "0.2.12"; + version = "0.2.13"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - hash = "sha256-UTn4HfyiyQAekIZD4I5lacYb7ySRhW8OUgiOg33JZtQ="; + hash = "sha256-s5qprIVPlq495XWKjgIuohDzPV0EfU43zkfQ2DvH04Y="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ - "pylutron" - ]; + pythonImportsCheck = [ "pylutron" ]; meta = with lib; { - changelog = "https://github.com/thecynic/pylutron/releases/tag/${version}"; description = "Python library for controlling a Lutron RadioRA 2 system"; homepage = "https://github.com/thecynic/pylutron"; + changelog = "https://github.com/thecynic/pylutron/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix index cccf04f3a2..59981da7e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix @@ -1,57 +1,61 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchFromGitHub -, ase -, cython -, glibcLocales -, joblib -, matplotlib -, monty -, networkx -, numpy -, palettable -, pandas -, plotly -, pybtex -, pydispatcher -, pytestCheckHook -, pytest-xdist -, pythonOlder -, requests -, ruamel-yaml -, scipy -, seekpath -, spglib -, sympy -, tabulate -, uncertainties +{ + lib, + stdenv, + ase, + buildPythonPackage, + cython, + fetchFromGitHub, + glibcLocales, + joblib, + matplotlib, + monty, + networkx, + oldest-supported-numpy, + palettable, + pandas, + plotly, + pybtex, + pydispatcher, + pytest-xdist, + pytestCheckHook, + pythonOlder, + requests, + ruamel-yaml, + scipy, + seekpath, + setuptools, + spglib, + sympy, + tabulate, + uncertainties, }: buildPythonPackage rec { pname = "pymatgen"; - version = "2024.2.23"; - format = "setuptools"; + version = "2024.4.13"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "materialsproject"; repo = "pymatgen"; - rev= "v${version}"; - hash = "sha256-eswoup9ACj/PHVW3obcnZjD4tWemsmROZFtwGGigEYE="; + rev = "refs/tags/v${version}"; + hash = "sha256-vjasWQgwjtoM/6Y1HwK1otMFejRWEj+YBxaIYDDSeeo="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ cython glibcLocales ]; - propagatedBuildInputs = [ + dependencies = [ matplotlib monty networkx - numpy + oldest-supported-numpy palettable pandas plotly @@ -66,10 +70,17 @@ buildPythonPackage rec { uncertainties ]; + passthru.optional-dependencies = { + ase = [ ase ]; + joblib = [ joblib ]; + seekpath = [ seekpath ]; + }; + nativeCheckInputs = [ pytestCheckHook pytest-xdist ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + preCheck = '' # hide from tests mv pymatgen _pymatgen @@ -78,28 +89,29 @@ buildPythonPackage rec { # some tests cover the command-line scripts export PATH=$out/bin:$PATH ''; + disabledTests = [ # presumably won't work with our dir layouts "test_egg_sources_txt_is_complete" # borderline precision failure "test_thermal_conductivity" + # AssertionError + "test_dict_functionality" + "test_mean_field" + "test_potcar_not_found" + "test_read_write_lobsterin" + "test_snl" + "test_unconverged" ]; - passthru.optional-dependencies = { - ase = [ ase ]; - joblib = [ joblib ]; - seekpath = [ seekpath ]; - }; - - pythonImportsCheck = [ - "pymatgen" - ]; + pythonImportsCheck = [ "pymatgen" ]; meta = with lib; { - broken = stdenv.isDarwin; # tests segfault. that's bad. description = "A robust materials analysis code that defines core object representations for structures and molecules"; homepage = "https://pymatgen.org/"; + changelog = "https://github.com/materialsproject/pymatgen/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; + broken = stdenv.isDarwin; # tests segfault. that's bad. }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix index 16aa22cf7f..3e991423cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix @@ -3,27 +3,29 @@ , buildPythonPackage , cachetools , cloudpickle -, fastprogress , fetchFromGitHub , numpy +, pandas , pytensor , pythonOlder +, rich , scipy +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "pymc"; - version = "5.10.4"; + version = "5.15.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-tiOXbryY2TmeBVrG5cIMeDJ4alolBQ5LosdfH3tpVOA="; + hash = "sha256-KJXQz7LES3AqLkq5FPnaECraYSM4vfuDyfRJSclz1RQ="; }; postPatch = '' @@ -31,13 +33,18 @@ buildPythonPackage rec { --replace-fail ', "pytest-cov"' "" ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ arviz cachetools cloudpickle - fastprogress numpy + pandas pytensor + rich scipy typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix index d760b9cd0d..733f124d36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -63,6 +63,11 @@ buildPythonPackage rec { pyyaml ]; + disabledTests = [ + # test artifact mismatch + "test_toc_tokens" + ]; + pythonImportsCheck = map (ext: "pymdownx.${ext}") extensions; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymilter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymilter/default.nix index be0ee9bd2b..9cefa458d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymilter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymilter/default.nix @@ -1,4 +1,15 @@ -{ lib, python, buildPythonPackage, fetchFromGitHub, libmilter, bsddb3, pydns, iana-etc, libredirect }: +{ lib +, python +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, libmilter +, bsddb3 +, pydns +, iana-etc +, libredirect +, pyasyncore +}: buildPythonPackage rec { pname = "pymilter"; @@ -13,7 +24,14 @@ buildPythonPackage rec { }; buildInputs = [ libmilter ]; + nativeCheckInputs = [ pyasyncore ]; propagatedBuildInputs = [ bsddb3 pydns ]; + patches = [ (fetchpatch { + name = "Remove-calls-to-the-deprecated-method-assertEquals"; + url = "https://github.com/sdgathman/pymilter/pull/57.patch"; + hash = "sha256-/5LlDR15nMR3l7rkVjT3w4FbDTFAAgNdERWlPNL2TVg="; + }) + ]; preBuild = '' sed -i 's/import thread/import _thread as thread/' Milter/greylist.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymongo-inmemory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymongo-inmemory/default.nix index 604f0c1c3c..6447b0a7ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymongo-inmemory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymongo-inmemory/default.nix @@ -25,13 +25,13 @@ buildPythonPackage rec { postPatch = '' # move cache location from nix store to home substituteInPlace pymongo_inmemory/context.py \ - --replace \ + --replace-fail \ 'CACHE_FOLDER = path.join(path.dirname(__file__), "..", ".cache")' \ 'CACHE_FOLDER = os.environ.get("XDG_CACHE_HOME", os.environ["HOME"] + "/.cache") + "/pymongo-inmemory"' # fix a broken assumption arising from the above fix substituteInPlace pymongo_inmemory/_utils.py \ - --replace \ + --replace-fail \ 'os.mkdir(current_path)' \ 'os.makedirs(current_path)' ''; @@ -40,7 +40,7 @@ buildPythonPackage rec { poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ pymongo ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix index 13fbc9ebe7..1ca7ca08ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix @@ -3,18 +3,26 @@ , fetchPypi , pythonOlder , dnspython + +# for passthru.tests +, celery # check-input only +, flask-pymongo +, kombu # check-input only +, mongoengine +, motor +, pymongo-inmemory }: buildPythonPackage rec { pname = "pymongo"; - version = "4.6.2"; + version = "4.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-q30BrIMqFmPa1ZLMvZK7Dwd1vI+YoZI8Xhp9f+rUla8="; + hash = "sha256-QAB0CQuaYx8SC0LGGyIv10NJDBM6XS+ZwCCM78zMlk4="; }; propagatedBuildInputs = [ @@ -26,6 +34,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "pymongo" ]; + passthru.tests = { + inherit + celery + flask-pymongo + kombu + mongoengine + motor + pymongo-inmemory + ; + }; + meta = with lib; { description = "Python driver for MongoDB"; homepage = "https://github.com/mongodb/mongo-python-driver"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymysql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymysql/default.nix index e7711f5902..1b5a00c27a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymysql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymysql/default.nix @@ -1,19 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , cryptography }: buildPythonPackage rec { pname = "pymysql"; - version = "1.0.2"; + version = "1.1.0"; + pyproject = true; src = fetchPypi { pname = "PyMySQL"; inherit version; - sha256 = "816927a350f38d56072aeca5dfb10221fe1dc653745853d30a216637f5d7ad36"; + hash = "sha256-TxOn34vzalHoHdnzYF/t5FpIeP4C+SNjSf2Co/BhL5Y="; }; + build-system = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography ]; # Wants to connect to MySQL diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix index 0a08f4affa..1051764887 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , setuptools-scm +, packaging , requests , six , pytestCheckHook @@ -25,6 +26,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + packaging requests six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynmeagps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynmeagps/default.nix index 7791bb13f3..fa306cf7b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynmeagps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynmeagps/default.nix @@ -1,37 +1,41 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, setuptools -, pytest-cov +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pynmeagps"; - version = "1.0.35"; + version = "1.0.36"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "semuconsulting"; repo = "pynmeagps"; - rev = "v${version}"; - hash = "sha256-ULGBfTHCFGUSF3cmJ4GEUrgGDo4uJwstBj8nZ7tj0AA="; + rev = "refs/tags/v${version}"; + hash = "sha256-n7dCr85TeBLxdrD1ZAA7PGJd9+3+xFJ8gjRU/JOFysY="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov --cov-report html --cov-fail-under 95" "" + ''; - nativeCheckInputs = [ - pytestCheckHook - pytest-cov - ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ - "pynmeagps" - ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pynmeagps" ]; meta = { - homepage = "https://github.com/semuconsulting/pynmeagps"; description = "NMEA protocol parser and generator"; + homepage = "https://github.com/semuconsulting/pynmeagps"; + changelog = "https://github.com/semuconsulting/pynmeagps/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ dylan-gonzalez ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynotifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynotifier/default.nix new file mode 100644 index 0000000000..7968677f1b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynotifier/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, libnotify +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pynotifier"; + version = "0.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "YuriyLisovskiy"; + repo = "pynotifier"; + rev = version; + hash = "sha256-xS3hH3cyqgDD7uoWkIYXpQAh7SN7XJ/qMfB0Vq5bva0="; + }; + + postPatch = '' + substituteInPlace pynotifier/backends/platform/linux.py \ + --replace-fail \ + 'shutil.which("notify-send")' \ + '"${lib.getExe' libnotify "notify-send"}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pynotifier" ]; + + meta = with lib; { + description = "Module for sending notifications"; + homepage = "https://github.com/YuriyLisovskiy/pynotifier"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix index f73f5bd7d5..f84a8e0370 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix @@ -6,6 +6,7 @@ , addOpenGLRunpath , setuptools , pytestCheckHook +, versioneer }: buildPythonPackage rec { @@ -28,8 +29,14 @@ buildPythonPackage rec { }) ]; + # unvendor versioneer + postPatch = '' + rm versioneer.py + ''; + nativeBuildInputs = [ setuptools + versioneer ]; pythonImportsCheck = [ "pynvml" "pynvml.smi" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix index 5c3b5c7c49..5e2dc4547e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix @@ -1,47 +1,60 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, freezegun -, metar -, pytest-aiohttp -, pytest-asyncio -, pytest-cov -, pytestCheckHook -, pythonOlder +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + freezegun, + metar, + pytest-aiohttp, + pytest-asyncio, + pytest-cov, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, + tenacity, }: buildPythonPackage rec { pname = "pynws"; - version = "1.6.0"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "1.8.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "MatthewFlamm"; - repo = pname; + repo = "pynws"; rev = "refs/tags/v${version}"; - hash = "sha256-x56kfnmdVV0Fc7XSI60rrtEl4k3uzpIdZxTofUbkUHU="; + hash = "sha256-KUCylHYng6mn2TWKf8C7k0IoerM22OIQ7pJMKi5SF3A="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ aiohttp metar ]; + optional-dependencies.retry = [ tenacity ]; + nativeCheckInputs = [ freezegun pytest-aiohttp pytest-asyncio pytest-cov pytestCheckHook - ]; + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "pynws" ]; meta = with lib; { description = "Python library to retrieve data from NWS/NOAA"; homepage = "https://github.com/MatthewFlamm/pynws"; + changelog = "https://github.com/MatthewFlamm/pynws/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix index 35ab0ecec5..b96dcac4fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix @@ -1,16 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, parameterized -, ply -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + parameterized, + ply, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pyomo"; - version = "6.7.1"; - format = "setuptools"; + version = "6.7.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -18,21 +20,19 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; rev = "refs/tags/${version}"; - hash = "sha256-eTItw+wYo5lCla4oKSF97N4TFajjFtCMMq4DU9ahi1U="; + hash = "sha256-v3KVb9KZPbUlpRySzJV8dmApScKT06aJc8SULCHcnPI="; }; - propagatedBuildInputs = [ - ply - ]; + build-system = [ setuptools ]; + + dependencies = [ ply ]; nativeCheckInputs = [ parameterized pytestCheckHook ]; - pythonImportsCheck = [ - "pyomo" - ]; + pythonImportsCheck = [ "pyomo" ]; preCheck = '' export HOME=$(mktemp -d); @@ -53,10 +53,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python Optimization Modeling Objects"; - mainProgram = "pyomo"; - homepage = "http://pyomo.org"; + homepage = "http://www.pyomo.org/"; changelog = "https://github.com/Pyomo/pyomo/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; + mainProgram = "pyomo"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix index 99d9a3038b..045229a5a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -69,6 +69,5 @@ in buildPythonPackage rec { description = "Python wrapper for OpenCL"; homepage = "https://github.com/pyopencl/pyopencl"; license = licenses.mit; - maintainers = [ maintainers.fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix index 31e9e810c9..e59a9a4b43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix @@ -9,18 +9,18 @@ , pretend , sphinxHook , sphinx-rtd-theme -, flaky +, pytest-rerunfailures }: buildPythonPackage rec { pname = "pyopenssl"; - version = "24.0.0"; + version = "24.1.0"; pyproject = true; src = fetchPypi { pname = "pyOpenSSL"; inherit version; - hash = "sha256-aqMwOak//6RWPmVbYdETZNASZL6My0mQYQHgKjNFML8="; + hash = "sha256-yr7Uv6pd+fGhbA72Sgy2Uxi1zQd6ftp9aXATHKL0Gm8="; }; outputs = [ @@ -46,8 +46,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - flaky pretend + pytest-rerunfailures pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix index 71ef391cb4..0283116b21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix @@ -1,38 +1,39 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pyserial-asyncio -, pytest-asyncio -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pyserial-asyncio, + pyserial-asyncio-fast, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pyotgw"; - version = "2.1.3"; - format = "setuptools"; + version = "2.2.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mvn23"; - repo = pname; + repo = "pyotgw"; rev = "refs/tags/${version}"; - hash = "sha256-XIwBGjvIulKLmYZIorKIJwoHTNOIYYX8US2Na8MZ2LA="; + hash = "sha256-SowM+glni1PGkM87JT9+QWTD4Tu9XmsfXg99GZzSCJM="; }; - propagatedBuildInputs = [ - pyserial-asyncio - ]; + build-system = [ setuptools ]; + + dependencies = [ pyserial-asyncio-fast ]; nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; - pythonImportsCheck = [ - "pyotgw" - ]; + pythonImportsCheck = [ "pyotgw" ]; meta = with lib; { description = "Python module to interact the OpenTherm Gateway"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix index 15eb634298..6d6830e424 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyphen"; - version = "0.14.0"; + version = "0.15.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WWyLO+HBpwQRul9lF9nM/jCDx1iuK5SkXycHNG2OZvo="; + hash = "sha256-pDBiPeysU9w2kSQSUyY8uja53XpE/9JoC3Bq82jNovI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypresence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypresence/default.nix index 32f8182783..87b32a5907 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypresence/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypresence/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { homepage = "https://qwertyquerty.github.io/pypresence/html/index.html"; description = "Discord RPC client written in Python"; license = licenses.mit; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix index 0111ad3e52..f0bdb9379e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , packaging , pytestCheckHook , pythonOlder @@ -11,22 +12,22 @@ buildPythonPackage rec { pname = "pyproject-metadata"; - version = "0.7.1"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi rec { - inherit pname version; - hash = "sha256-CpTxixCLmyHzomo9VB8FbDTtyxfchyoUShVhj+1672c="; + src = fetchPypi { + pname = "pyproject_metadata"; + inherit version; + hash = "sha256-N21aAHZKwpRApUV5+I5mt9nLfmKdNcNaHHJIv+vJtFU="; }; - nativeBuildInputs = [ - setuptools - wheel + build-system = [ + flit-core ]; - propagatedBuildInputs = [ + dependencies = [ packaging ]; @@ -48,6 +49,5 @@ buildPythonPackage rec { homepage = "https://github.com/FFY00/python-pyproject-metadata"; changelog = "https://github.com/FFY00/python-pyproject-metadata/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix index 1bf96713a4..5bd7cca618 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix @@ -3,23 +3,25 @@ , fetchPypi , packaging , setuptools +, setuptools-scm , sip , wheel }: buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.15.4"; + version = "1.16.0"; format = "pyproject"; src = fetchPypi { pname = "PyQt-builder"; inherit version; - hash = "sha256-OfjHXbF9nOF8trvz3xZQtc68HqTlvXOEPSHMlmErKuE="; + hash = "sha256-R7vSz6VDACAQj59AMB4WbL6pi27z5TlTNQvdTGsxqxg="; }; nativeBuildInputs = [ setuptools + setuptools-scm wheel ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-charts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-charts/default.nix index fd969f6a80..478e1b1e0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-charts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-charts/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyqt6-charts"; - version = "6.6.0"; + version = "6.7.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyQt6_Charts"; inherit version; - sha256 = "sha256-FMxuXRnK6AEpUkpC+mMy0NXa2kKCqUI0Jea5rhtrxW0="; + sha256 = "sha256-xPfPNpko978DLk4z9xjTuP5m2hdtSVn+MHNalw2G81w="; }; # fix include path and increase verbosity diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-webengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-webengine/default.nix index 637a686f00..f227a1469a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-webengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-webengine/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyqt6-webengine"; - version = "6.6.0"; + version = "6.7.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyQt6_WebEngine"; inherit version; - hash = "sha256-1QuYTD+F5AnmkrFWEychUi1OjPm2wl4M+Sfuot+zlIc="; + hash = "sha256-aO3HrbbZ4nX13pVogeecyg1x+tQ5q+qhDYI7/1rFUAE="; }; # fix include path and increase verbosity diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtdarktheme/add-missing-argument-to-the-proxy-style-initializer.patch b/third_party/nixpkgs/pkgs/development/python-modules/pyqtdarktheme/add-missing-argument-to-the-proxy-style-initializer.patch new file mode 100644 index 0000000000..9d77e2901b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtdarktheme/add-missing-argument-to-the-proxy-style-initializer.patch @@ -0,0 +1,25 @@ +From 816afb6a3a6a340ae2a2a06dc054dd8e65ff9d8f Mon Sep 17 00:00:00 2001 +From: Pavel Sobolev +Date: Mon, 30 Oct 2023 20:42:31 +0300 +Subject: [PATCH] Add missing argument to the `proxy_style` initializer. + +--- + qdarktheme/_proxy_style.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qdarktheme/_proxy_style.py b/qdarktheme/_proxy_style.py +index b1fb358..f04f01e 100644 +--- a/qdarktheme/_proxy_style.py ++++ b/qdarktheme/_proxy_style.py +@@ -14,7 +14,7 @@ class QDarkThemeStyle(QProxyStyle): + + def __init__(self): + """Initialize style proxy.""" +- super().__init__() ++ super().__init__(None) + + def standardIcon( # noqa: N802 + self, standard_icon: QStyle.StandardPixmap, option: QStyleOption | None, widget +-- +2.42.0 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtdarktheme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtdarktheme/default.nix new file mode 100644 index 0000000000..0d60c80398 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtdarktheme/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub + +, darkdetect +, poetry-core + +, pyqt5 +, pytest-mock +, pytest-qt +, pytestCheckHook +, qt5 +}: + +buildPythonPackage rec { + pname = "pyqtdarktheme"; + version = "2.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "5yutan5"; + repo = "PyQtDarkTheme"; + rev = "v${version}"; + hash = "sha256-jK+wnIyPE8Bav0pzbvVisYYCzdRshYw1S2t0H3Pro5M="; + }; + + patches = [ + ./add-missing-argument-to-the-proxy-style-initializer.patch + ]; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + darkdetect + ]; + + nativeCheckInputs = [ + pyqt5 + pytest-mock + pytest-qt + pytestCheckHook + ]; + + pythonImportsCheck = [ + "qdarktheme" + ]; + + prePatch = '' + sed -i 's#darkdetect = ".*"#darkdetect = "*"#' pyproject.toml + ''; + + preCheck = '' + export HOME=$(mktemp -d) + export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM_PLUGIN_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins"; + export QT_QPA_PLATFORM=offscreen + ''; + + meta = with lib; { + description = "A flat dark theme for PySide and PyQt"; + homepage = "https://pyqtdarktheme.readthedocs.io/en/stable"; + license = licenses.mit; + maintainers = with maintainers; [ paveloom ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix index e3e96571b1..f09ed4fa0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix @@ -11,6 +11,7 @@ , freefont_ttf , makeFontsConf , setuptools +, python }: let @@ -20,14 +21,14 @@ let in buildPythonPackage rec { pname = "pyqtgraph"; - version = "0.13.4"; + version = "0.13.7"; format = "pyproject"; src = fetchFromGitHub { owner = "pyqtgraph"; repo = "pyqtgraph"; rev = "refs/tags/pyqtgraph-${version}"; - hash = "sha256-KVgsfvaVbR3eMRNqhJSBO4Hfk7KJgMdsZjKffx6vt84="; + hash = "sha256-MUwg1v6oH2TGmJ14Hp9i6KYierJbzPggK59QaHSXHVA="; }; nativeBuildInputs = [ @@ -70,6 +71,7 @@ buildPythonPackage rec { homepage = "https://www.pyqtgraph.org/"; changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG"; license = licenses.mit; + broken = lib.versionAtLeast python.version "3.12"; platforms = platforms.unix; maintainers = with maintainers; [ koral ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix index 8a70748887..9e2cb672d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix @@ -1,60 +1,58 @@ -{ buildPythonPackage -, fetchFromGitHub -, fetchpatch -, lib -, poetry-core -, netaddr -, six -, unittestCheckHook +{ + buildPythonPackage, + fetchFromGitHub, + lib, + poetry-core, + netaddr, + six, + unittestCheckHook, + fetchPypi, }: +let + netaddr_0_8_0 = netaddr.overridePythonAttrs (oldAttrs: rec { + version = "0.8.0"; + + src = fetchPypi { + pname = "netaddr"; + inherit version; + hash = "sha256-1sxXx6B7HZ0ukXqos2rozmHDW6P80bg8oxxaDuK1okM="; + }; + }); +in buildPythonPackage rec { pname = "pyrad"; - version = "2.4"; + version = "2.4-unstable-2023-06-13"; format = "pyproject"; src = fetchFromGitHub { owner = "pyradius"; repo = pname; - rev = version; - hash = "sha256-oqgkE0xG/8cmLeRZdGoHkaHbjtByeJwzBJwEdxH8oNY="; + rev = "dd34c5a29b46d83b0bea841e85fd72b79f315b87"; + hash = "sha256-U4VVGkDDyN4J/tRDaDGSr2TSA4JmqIoQj5qn9qBAvQU="; }; - patches = [ - (fetchpatch { - # Migrate to poetry-core - url = "https://github.com/pyradius/pyrad/commit/a4b70067dd6269e14a2f9530d820390a8a454231.patch"; - hash = "sha256-1We9wrVY3Or3GLIKK6hZvEjVYv6JOaahgP9zOMvgErE="; - }) - ]; - - nativeBuildInputs = [ - poetry-core - ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ - netaddr + netaddr_0_8_0 six ]; preCheck = '' substituteInPlace tests/testServer.py \ - --replace "def testBind(self):" "def dontTestBind(self):" \ - --replace "def testBindv6(self):" "def dontTestBindv6(self):" + --replace-warn "def testBind(self):" "def dontTestBind(self):" \ + --replace-warn "def testBindv6(self):" "def dontTestBindv6(self):" \ ''; - nativeCheckInputs = [ - unittestCheckHook - ]; + nativeCheckInputs = [ unittestCheckHook ]; - pythonImportsCheck = [ - "pyrad" - ]; + pythonImportsCheck = [ "pyrad" ]; - meta = with lib; { + meta = { description = "Python RADIUS Implementation"; homepage = "https://github.com/pyradius/pyrad"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ drawbu ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid-beaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-beaker/default.nix index aad88af5f1..a49e01a378 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid-beaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-beaker/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyramid-beaker"; - version = "0.8"; + version = "0.9"; format = "setuptools"; src = fetchPypi { pname = "pyramid_beaker"; inherit version; - sha256 = "0hflx3qkcdml1mwpq53sz46s7jickpfn0zy0ns2c7j445j66bp3p"; + sha256 = "sha256-zMUT60z7W0Flfym25rKMor17O/n9qRMGoQKa7pLRz6U="; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrender/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrender/default.nix index eb1d5d17ee..41214174ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrender/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrender/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchFromGitHub , fetchpatch +, setuptools , freetype-py , imageio , networkx @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "pyrender"; version = "0.1.45"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -45,12 +46,16 @@ buildPythonPackage rec { # the commit does not apply as a patch when cherry picked, hence the substituteInPlace postPatch = '' substituteInPlace tests/unit/test_meshes.py \ - --replace \ + --replace-fail \ "bm = trimesh.load('tests/data/WaterBottle.glb').dump()[0]" \ 'bm = trimesh.load("tests/data/WaterBottle.glb").geometry["WaterBottle"]' ''; - propagatedBuildInputs = [ + nativeBuildInputs = [ + setuptools + ]; + + dependencies = [ freetype-py imageio networkx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix index a9da74ca7e..e9c1fac671 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -3,21 +3,26 @@ , fetchFromGitHub , pyserial , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "pyrfxtrx"; - version = "0.31.0"; - format = "setuptools"; + version = "0.31.1"; + pyproject = true; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyRFXtrx"; rev = "refs/tags/${version}"; - hash = "sha256-0t5pPBk8Mzdm6STGtqGMljPjDoW2DTT7x21MEnG512w="; + hash = "sha256-Y9UVJZxm5G5ywNLW8nm162cZTs3/mFeI+ZEUGoc9eAs="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ pyserial ]; @@ -25,14 +30,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # https://github.com/Danielhiversen/pyRFXtrx/issues/130 - "tests/test_rollertrol.py" - ]; - meta = with lib; { description = "Library to communicate with the RFXtrx family of devices"; homepage = "https://github.com/Danielhiversen/pyRFXtrx"; + changelog = "https://github.com/Danielhiversen/pyRFXtrx/releases/tag/${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix index 8c9ec56132..ee84881ff5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix @@ -1,14 +1,15 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pyrisco"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,23 +18,17 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pyrisco"; rev = "refs/tags/v${version}"; - hash = "sha256-+qnwJzf4nKio4IJo7NNA19B3tbOd+jhnGryiRMcdi6o="; + hash = "sha256-NviB3C+YApOo3WGQ1L8Qwyh8C9l8sCgaSA+xn2wYhjg="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - aiohttp - ]; + dependencies = [ aiohttp ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ - "pyrisco" - ]; + pythonImportsCheck = [ "pyrisco" ]; meta = with lib; { description = "Python interface to Risco alarm systems through Risco Cloud"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix index 269b224988..dbce429f43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pysam"; - version = "0.22.0"; + version = "0.22.1"; pyproject = true; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "refs/tags/v${version}"; - hash = "sha256-TLqZF5NS9ROH8z7c2ZxfOYNRIe5pabMNBuhQ4azFmDU="; + hash = "sha256-1sivEf8xN4SJPtJiAcBZG1bbgy66yWXzQis1mPeU+sA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix index 5fa9e60ae5..3fd9d3c2fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildPythonPackage -, setuptools -, pkg-config -, swig -, pcsclite -, PCSC -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + PCSC, + pcsclite, + pkg-config, + pytestCheckHook, + setuptools, + stdenv, + swig, }: let @@ -16,8 +17,8 @@ let in buildPythonPackage rec { - version = "2.0.9"; pname = "pyscard"; + version = "2.0.9"; pyproject = true; src = fetchFromGitHub { @@ -27,40 +28,45 @@ buildPythonPackage rec { hash = "sha256-DO4Ea+mlrWPpOLI8Eki+03UnsOXEhN2PAl0+gdN5sTo="; }; - nativeBuildInputs = [ - setuptools - swig - ] ++ lib.optionals (!withApplePCSC) [ - pkg-config - ]; + build-system = [ setuptools ]; + + nativeBuildInputs = [ swig ] ++ lib.optionals (!withApplePCSC) [ pkg-config ]; buildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = - if withApplePCSC then '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ - "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" - '' else '' - substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG" - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "libpcsclite.so.1" \ - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" - ''; + if withApplePCSC then + '' + substituteInPlace smartcard/scard/winscarddll.c \ + --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \ + "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" + '' + else + '' + substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG" + substituteInPlace smartcard/scard/winscarddll.c \ + --replace-fail "libpcsclite.so.1" \ + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + ''; preCheck = '' # remove src module, so tests use the installed module instead rm -r smartcard ''; + disabledTests = [ + # AssertionError + "test_hresult" + "test_low_level" + ]; + meta = with lib; { - homepage = "https://pyscard.sourceforge.io/"; description = "Smartcard library for python"; - license = licenses.lgpl21; + homepage = "https://pyscard.sourceforge.io/"; + changelog = "https://github.com/LudovicRousseau/pyscard/releases/tag/${version}"; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ layus ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix index 912b4acc14..624217eba5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix @@ -3,9 +3,6 @@ , fetchFromGitHub , pytestCheckHook , six -, enum34 -, pathlib -, pythonOlder }: buildPythonPackage rec { @@ -21,8 +18,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ six ] - ++ lib.optionals (pythonOlder "3.4") [ enum34 pathlib ]; + propagatedBuildInputs = [ six ]; # Test suite is broken. # See https://github.com/Kronuz/pyScss/issues/415 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix index af3c07cb85..0edd04ae33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix @@ -1,31 +1,37 @@ -{ stdenv -, lib -, buildPythonPackage -, fetchPypi -, python +{ + lib, + stdenv, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pysendfile"; version = "2.0.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "05qf0m32isflln1zjgxlpw0wf469lj86vdwwqyizp1h94x5l22ji"; + hash = "sha256-UQpBSycJhvujx5y3bZCkyRDHAb+0P/mDpdTpKEYFDhc="; }; - checkPhase = '' - # this test takes too long - sed -i 's/test_big_file/noop/' test/test_sendfile.py - ${python.executable} test/test_sendfile.py - ''; + build-system = [ setuptools ]; + + # Tests depend on asynchat and asyncore + doCheck = false; + + pythonImportsCheck = [ "sendfile" ]; meta = with lib; { - broken = stdenv.isDarwin; - homepage = "https://github.com/giampaolo/pysendfile"; description = "A Python interface to sendfile(2)"; + homepage = "https://github.com/giampaolo/pysendfile"; + changelog = "https://github.com/giampaolo/pysendfile/blob/release-${version}/HISTORY.rst"; license = licenses.mit; + maintainers = with maintainers; [ ]; + broken = stdenv.isDarwin; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index 2a9ae5011d..4fea0395ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pysigma -, pytestCheckHook -, pythonOlder -, requests +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pysigma, + pytestCheckHook, + pythonOlder, + requests, }: buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "1.0.12"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-ibCwTZymgd+VuE4UXbYxUyIbzlpfIdc2zE8Nz/vhBGQ="; + hash = "sha256-1tCn0aPYhjyOQJxN0cqTMDCcE0eZwRtTK6OV3rU1a1E="; }; postPatch = '' @@ -27,22 +28,16 @@ buildPythonPackage rec { --replace-fail " --cov=sigma --cov-report term --cov-report xml:cov.xml" "" ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - pysigma - ]; + dependencies = [ pysigma ]; nativeCheckInputs = [ pytestCheckHook requests ]; - pythonImportsCheck = [ - "sigma.backends.elasticsearch" - ]; + pythonImportsCheck = [ "sigma.backends.elasticsearch" ]; disabledTests = [ # Tests requires network access diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix index 1fef60d8ac..c10bf01087 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-insightidr"; - version = "0.2.2"; + version = "0.2.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-insightidr"; rev = "refs/tags/v${version}"; - hash = "sha256-B42MADteF0+GC/CPJPLaTGdGcQjC8KEsK9u3tBmtObg="; + hash = "sha256-wQMnnJ0KU+53MS3PIBkwIhUiyUdCrDbdUT6upk2Pp/8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index 6668166699..5716a6ebd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -1,18 +1,19 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pysigma -, pysigma-backend-elasticsearch -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, requests +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pysigma, + pysigma-backend-elasticsearch, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + requests, }: buildPythonPackage rec { pname = "pysigma-backend-opensearch"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-opensearch"; rev = "refs/tags/v${version}"; - hash = "sha256-g3kGaNq07yMu3mnRDeZB3Ck8wwzK3HcOIzkl36cNOs8="; + hash = "sha256-VEMt9CKbhPRj1182WcLOqF9JOEzorrz9Yyqp0+FAA88="; }; postPatch = '' @@ -29,16 +30,13 @@ buildPythonPackage rec { --replace-fail " --cov=sigma --cov-report term --cov-report xml:cov.xml" "" ''; - pythonRelaxDeps = [ - "pysigma" - ]; + pythonRelaxDeps = [ "pysigma" ]; - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ pysigma pysigma-backend-elasticsearch ]; @@ -48,9 +46,7 @@ buildPythonPackage rec { requests ]; - pythonImportsCheck = [ - "sigma.backends.opensearch" - ]; + pythonImportsCheck = [ "sigma.backends.opensearch" ]; disabledTests = [ # Tests requires network access diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix index bf7a00dd8f..5816b43926 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix @@ -1,21 +1,22 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, jinja2 -, packaging -, poetry-core -, pyparsing -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pyyaml -, requests +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + jinja2, + packaging, + poetry-core, + pyparsing, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pyyaml, + requests, }: buildPythonPackage rec { pname = "pysigma"; - version = "0.11.4"; + version = "0.11.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-tlFrUAwOTK+O/YJjfA6nwsVAcZrMNXFmCYoxHc2ykVY="; + hash = "sha256-Mr4etI6VNPWDVZj4A9j3Ka9v+BpFC75MLXppYELIWrg="; }; pythonRelaxDeps = [ @@ -32,10 +33,9 @@ buildPythonPackage rec { "packaging" ]; - build-system = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ jinja2 @@ -45,9 +45,7 @@ buildPythonPackage rec { requests ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Tests require network connection @@ -55,9 +53,7 @@ buildPythonPackage rec { "test_sigma_plugin_installation" ]; - pythonImportsCheck = [ - "sigma" - ]; + pythonImportsCheck = [ "sigma" ]; meta = with lib; { description = "Library to parse and convert Sigma rules into queries"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysimplegui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysimplegui/default.nix index 58deefb4f3..71234522f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysimplegui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysimplegui/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysimplegui"; - version = "5.0.3"; + version = "5.0.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PySimpleGUI"; inherit version; - hash = "sha256-bnjPVGMVfma/tn8oCg6FLMI1W+9rtHMKNdarbNg61GM="; + hash = "sha256-pThG6BBWxy98REUae91yBZDKK8Q1Zc1PHpoW7nhdmAw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix index b910da5b69..f65aae69cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix @@ -1,8 +1,8 @@ { lib , pythonOlder , fetchFromGitHub -, fetchpatch , buildPythonPackage +, setuptools , cython , slurm }: @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyslurm"; version = "23.11.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -21,15 +21,16 @@ buildPythonPackage rec { hash = "sha256-Qi0XftneKj7hdDiLY2hoRONRrPv49mfQlvlNkudH54Y="; }; - patches = [ (fetchpatch { - name = "remove-undeclared-KILL_JOB_ARRAY"; - url = "https://github.com/PySlurm/pyslurm/commit/f7a7d8beb8ceb4e4c1b248bab2ebb995dcae77e2.patch"; - hash = "sha256-kQLGiGzAhqP8Z6pObz9vdTRdITd12w7KuUDXsfyLIU8="; - })]; + nativeBuildInputs = [ + setuptools + ]; buildInputs = [ cython slurm ]; - setupPyBuildFlags = [ "--slurm-lib=${lib.getLib slurm}/lib" "--slurm-inc=${lib.getDev slurm}/include" ]; + env = { + SLURM_LIB_DIR = "${lib.getLib slurm}/lib"; + SLURM_INCLUDE_DIR = "${lib.getDev slurm}/include"; + }; # Test cases need /etc/slurm/slurm.conf and require a working slurm installation doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysqlitecipher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysqlitecipher/default.nix index 6eaa1d13eb..34f474c50a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysqlitecipher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysqlitecipher/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "Lightweight and easy to use sqlite wrapper with built-in encryption system"; - homepage = "Ghttps://github.com/harshnative/pysqlitecipher"; + homepage = "https://github.com/harshnative/pysqlitecipher"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix index 43d51869ff..44251a333e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix @@ -25,12 +25,13 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; - nativeCheckInputs = [ lxml mock psutil pytest ]; + propagatedBuildInputs = [ lxml psutil ]; + + nativeCheckInputs = [ mock pytest ]; checkPhase = "pytest tests"; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); 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 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix index d369ace859..f61e7089f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix @@ -1,37 +1,37 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder - -# propagates -, pycryptodome -, requests -, rtp -, urllib3 +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + pycryptodome, + requests, + rtp, + urllib3, + setuptools, }: buildPythonPackage rec { pname = "pytapo"; - version = "3.3.19"; - format = "setuptools"; + version = "3.3.21"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zm/ll6vOFW05euRgJN+SghVmMkSGQc9CVZkRu3h6AQQ="; + hash = "sha256-rc9XhV99vzgoUF5ERFmJHHB9GMwq5Y44CJKg+g5tjOo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pycryptodome requests rtp urllib3 ]; - pythonImportsCheck = [ - "pytapo" - ]; + pythonImportsCheck = [ "pytapo" ]; # Tests require actual hardware doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix index ef05c9e518..5d997cab00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix @@ -19,21 +19,20 @@ , pytestCheckHook , pythonOlder , tensorflow-probability -, stdenv }: buildPythonPackage rec { pname = "pytensor"; - version = "2.18.6"; + version = "2.20.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "pymc-devs"; repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-SMh4wVZwmc87ztFn2OOI234VP3JzmxVMBkn7lYwVu6M="; + hash = "sha256-bvkOMer+zYSsiU4a147eUEZjjUeTVpb9f/hepMZZ3sE="; }; postPatch = '' @@ -41,12 +40,12 @@ buildPythonPackage rec { --replace "versioneer[toml]==0.28" "versioneer[toml]" ''; - nativeBuildInputs = [ + build-system = [ cython versioneer ]; - propagatedBuildInputs = [ + dependencies = [ cons etuples filelock @@ -61,7 +60,6 @@ buildPythonPackage rec { jax jaxlib numba - numba-scipy pytest-mock pytestCheckHook tensorflow-probability @@ -98,6 +96,5 @@ buildPythonPackage rec { changelog = "https://github.com/pymc-devs/pytensor/releases"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ferrine ]; - broken = (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix index b73ae05a8c..4e1a0c1c41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "24.1.2"; + version = "24.1.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ansible"; repo = "pytest-ansible"; rev = "refs/tags/v${version}"; - hash = "sha256-NtGk+azpSZZm9PUf6Q1Qipo/zaUH+bed7k3oFnQyKjw="; + hash = "sha256-pQNm7Q9NAc/jLlR6f0132tpXyBoQaKpm7JoEgqOJL8U="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix index e49f02ce30..7ca70a0f4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { changelog = "https://github.com/RKrahl/pytest-dependency/blob/${version}/CHANGES.rst"; description = "Manage dependencies of tests"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix index 31ab985dbf..5be97cd747 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -1,17 +1,30 @@ -{ lib, buildPythonPackage, fetchPypi -, setuptools-git, pytest }: +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-git, + pytest, +}: buildPythonPackage rec { pname = "pytest-fixture-config"; - version = "1.7.0"; - format = "setuptools"; + version = "1.7.1-unstable-2022-10-03"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "13i1qpz22w3x4dmw8vih5jdnbqfqvl7jiqs0dg764s0zf8bp98a1"; + src = fetchFromGitHub { + owner = "man-group"; + repo = "pytest-plugins"; + rev = "5f9b88a65a8c1e506885352bbd9b2a47900f5014"; + hash = "sha256-huN3RzwtfVf4iMJ96VRP/ldOxTUlUMF1wJIdbcGXHn4="; }; - nativeBuildInputs = [ setuptools-git ]; + sourceRoot = "${src.name}/pytest-fixture-config"; + + nativeBuildInputs = [ + setuptools + setuptools-git + ]; buildInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix index f3b556699e..dce8df48a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytest -, pytest-metadata -, pytest-xdist -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytest, + pytest-metadata, + pytest-xdist, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -23,17 +24,11 @@ buildPythonPackage rec { hash = "sha256-hMB/atDuo7CjwhHFUOxVfgJ7Qp4AA9J428iv7hyQFcs="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - buildInputs = [ - pytest - ]; + buildInputs = [ pytest ]; - propagatedBuildInputs = [ - pytest-metadata - ]; + dependencies = [ pytest-metadata ]; nativeCheckInputs = [ pytest-xdist @@ -44,11 +39,12 @@ buildPythonPackage rec { # pytest-flaky is not available at the moment "test_bug_31" "test_environment_via_metadata_plugin" + # AssertionError + "test_report_collectors" + "test_report_crash_and_traceback" ]; - pythonImportsCheck = [ - "pytest_jsonreport" - ]; + pythonImportsCheck = [ "pytest_jsonreport" ]; meta = with lib; { description = "Pytest plugin to report test results as JSON"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-markdown-docs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-markdown-docs/default.nix new file mode 100644 index 0000000000..46dcd7d940 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-markdown-docs/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, markdown-it-py +, pytest +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-markdown-docs"; + version = "0.5.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "modal-com"; + repo = "pytest-markdown-docs"; + rev = "refs/tags/v${version}"; + hash = "sha256-mclN28tfPcoFxswECjbrkeOI51XXSqUXfbvuSHrd7Sw="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + markdown-it-py + pytest + ]; + + pythonImportsCheck = [ + "pytest_markdown_docs" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Run pytest on markdown code fence blocks"; + homepage = "https://github.com/modal-com/pytest-markdown-docs"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix index f956a62e1a..966304cdc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.12.0"; + version = "3.14.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MaQPA4wiytMih7tDkyBURR/1WD/wlLym9nXfL4vBpuk="; + hash = "sha256-JxklWh7+zq28BW1r8989HFAVUw+0DPNHwPmvrIhBC9A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix index f0ea49d1b7..2399379fdb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix @@ -5,7 +5,7 @@ , pytest , jinja2 , matplotlib -, nose +, pynose , pillow , pytestCheckHook }: @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 matplotlib - nose + pynose pillow ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix index bfe9fb613e..84d12cfd82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Mypy static type checker plugin for Pytest"; homepage = "https://github.com/dbader/pytest-mypy"; license = licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix index 389ce90edd..ebb7bbe09d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-order"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-lE+GttRBqnsdqA+AHGq2W4S766Ry0KehLrQ7omZQEBo="; + hash = "sha256-RFG9iCG6T6IQlFWi/MiCr2DvjlPgnSRNZ2dL4I9W6sM="; }; buildInputs = [ pytest ]; @@ -27,10 +27,12 @@ buildPythonPackage rec { pytest-mock ]; - meta = { + strictDeps = true; + + meta = with lib; { description = "Pytest plugin that allows you to customize the order in which your tests are run"; homepage = "https://github.com/pytest-dev/pytest-order"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.jacg ]; + license = licenses.mit; + maintainers = with maintainers; [ jacg Luflosi ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix index df1045a199..4c52a88298 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytest-playwright"; - version = "0.4.4"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-pytest"; rev = "refs/tags/v${version}"; - hash = "sha256-jCK2i27wRGsv65zfzW+Ef72HNQd4Qu/Mw3HX66ZMQ9Y="; + hash = "sha256-HS0Qpr5R4dAoXe0bpPGU7JABB7CmwugReRD75XeJ8l4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix index 29f26251b0..1466371e1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -1,26 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, pytest-shutil, pytest-fixture-config, psutil -, requests, future, retry }: +{ + lib, + buildPythonPackage, + fetchFromGitHub, + future, + psutil, + pytest, + pytest-shutil, + pytest-fixture-config, + requests, + retry, + six, + setuptools, +}: buildPythonPackage rec { pname = "pytest-server-fixtures"; - version = "1.7.1"; - format = "setuptools"; + inherit (pytest-fixture-config) version src; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-xecz0gqNDnc8pRPjYOS6JkeVLqlCj6K9BVFsYoHqPOc="; - }; + sourceRoot = "${src.name}/pytest-server-fixtures"; + + build-system = [ setuptools ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ pytest-shutil pytest-fixture-config psutil requests future retry ]; - # RuntimeError: Unable to find a free server number to start Xvfb + dependencies = [ + future + psutil + pytest-shutil + pytest-fixture-config + requests + retry + six + ]; + + # Don't run intergration tests doCheck = false; meta = with lib; { description = "Extensible server fixures for py.test"; - homepage = "https://github.com/manahl/pytest-plugins"; + homepage = "https://github.com/manahl/pytest-plugins"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix index 480c15b87c..d9c80a9351 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,13 +1,15 @@ { lib , isPyPy , buildPythonPackage -, fetchPypi +, pytest-fixture-config +, fetchpatch -# build -, pytest +# build-time +, setuptools +, setuptools-git # runtime -, setuptools-git +, pytest , mock , path , execnet @@ -15,32 +17,34 @@ , six # tests -, cmdline , pytestCheckHook }: buildPythonPackage rec { pname = "pytest-shutil"; - version = "1.7.0"; - format = "setuptools"; + inherit (pytest-fixture-config) version src; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-2BZSYd5251CFBcNB2UwCsRPclj8nRUOrynTb+r0CEmE="; - }; + sourceRoot = "${src.name}/pytest-shutil"; - postPatch = '' - substituteInPlace setup.py \ - --replace "contextlib2" 'contextlib2;python_version<"3"' \ - --replace "path.py" "path" - ''; - - buildInputs = [ - pytest + # imp was removed in Python 3.12 + patches = [ + (fetchpatch { + name = "stop-using-imp.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/python-pytest-shutil/stop-using-imp.patch?rev=10"; + hash = "sha256-L8tXoQ9q8o6aP3TpJY/sUVVbUd/ebw0h6de6dBj1WNY="; + stripLen = 1; + }) ]; - propagatedBuildInputs = [ + build-system = [ + setuptools setuptools-git + ]; + + buildInputs = [ pytest ]; + + dependencies = [ mock path execnet @@ -49,7 +53,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - cmdline pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix index 37aaf00380..d83153c54c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-twisted/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "A twisted plugin for py.test"; homepage = "https://github.com/pytest-dev/pytest-twisted"; license = licenses.bsd3; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix index 408430d512..494209517e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -1,21 +1,43 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, pytest-cov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: +{ + lib, + buildPythonPackage, + cmdline, + importlib-metadata, + mock, + pytestCheckHook, + pytest, + pytest-fixture-config, + pytest-shutil, + setuptools, + virtualenv, +}: buildPythonPackage rec { pname = "pytest-virtualenv"; - version = "1.7.0"; - format = "setuptools"; + inherit (pytest-fixture-config) version src; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "03w2zz3crblj1p6i8nq17946hbn3zqp9z7cfnifw47hi4a4fww12"; - }; + sourceRoot = "${src.name}/pytest-virtualenv"; - nativeCheckInputs = [ pytest pytest-cov mock cmdline ]; - propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ]; - checkPhase = "py.test tests/unit "; + build-system = [ setuptools ]; - nativeBuildInputs = [ pytest ]; + buildInputs = [ pytest ]; + + dependencies = [ + importlib-metadata + pytest-fixture-config + pytest-shutil + virtualenv + ]; + + nativeCheckInputs = [ + cmdline + mock + pytestCheckHook + ]; + + # Don't run integration tests + disabledTestPaths = [ "tests/integration/*" ]; meta = with lib; { description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-creole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-creole/default.nix index 7f27466fa2..0291c0473f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-creole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-creole/default.nix @@ -86,6 +86,15 @@ buildPythonPackage rec { "creole/tests/test_rest2html.py" ]; + pytestFlagsArray = [ + # fixture mismatch after docutils update + "--deselect=creole/rest_tools/clean_writer.py::creole.rest_tools.clean_writer.rest2html" + "--deselect=creole/tests/test_cross_compare_all.py::CrossCompareTests::test_link" + "--deselect=creole/tests/test_cross_compare_all.py::CrossCompareTests::test_link_with_at_sign" + "--deselect=creole/tests/test_cross_compare_all.py::CrossCompareTests::test_link_with_unknown_protocol" + "--deselect=creole/tests/test_cross_compare_all.py::CrossCompareTests::test_link_without_title" + ]; + meta = with lib; { description = "Creole markup tools written in Python"; homepage = "https://github.com/jedie/python-creole"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix index 2a676f7283..cec0275dfd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , nose , dbus +, gobject-introspection , dbus-python , pygobject3 , bluez @@ -40,6 +41,7 @@ in buildPythonPackage rec { nativeCheckInputs = [ dbus + gobject-introspection pygobject3 bluez pbap-client diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ecobee-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ecobee-api/default.nix index 4d12ee0c99..ad51ef12d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ecobee-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -1,22 +1,29 @@ -{ lib -, buildPythonPackage -, fetchPypi -, requests +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { pname = "python-ecobee-api"; - version = "0.2.17"; - format = "setuptools"; + version = "0.2.18"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-lJCbNOQJ8xmMa4V+tSFZx4QasK8ZLfsFavMP9Zge4K4="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "nkgilley"; + repo = "python-ecobee-api"; + rev = "refs/tags/${version}"; + hash = "sha256-WBVHlA7cAQGCFRNSANX6PqPQYMRw74GEAlTFwSBxVQU="; }; - propagatedBuildInputs = [ - requests - ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # no tests implemented doCheck = false; @@ -26,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for talking to Ecobee thermostats"; homepage = "https://github.com/nkgilley/python-ecobee-api"; + changelog = "https://github.com/nkgilley/python-ecobee-api/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix index 9fd1f21a08..13ed448938 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix @@ -1,27 +1,42 @@ -{ lib -, buildPythonPackage -, fetchPypi -, coreutils -, pbr -, prettytable -, keystoneauth1 -, requests -, warlock -, oslo-utils -, oslo-i18n -, wrapt -, pyopenssl -, pythonOlder -, stestr -, testscenarios -, ddt -, requests-mock +{ + lib, + buildPythonPackage, + fetchPypi, + coreutils, + setuptools, + pbr, + prettytable, + keystoneauth1, + requests, + warlock, + oslo-utils, + oslo-i18n, + wrapt, + pyopenssl, + pythonOlder, + stestr, + testscenarios, + ddt, + requests-mock, + writeText, }: - -buildPythonPackage rec { +let pname = "python-glanceclient"; version = "4.5.0"; - format = "setuptools"; + + disabledTests = [ + "test_http_chunked_response" + "test_v1_download_has_no_stray_output_to_stdout" + "test_v2_requests_valid_cert_verification" + "test_download_has_no_stray_output_to_stdout" + "test_v2_download_has_no_stray_output_to_stdout" + "test_v2_requests_valid_cert_verification_no_compression" + "test_log_request_id_once" + ]; +in +buildPythonPackage { + inherit pname version; + pyproject = true; disabled = pythonOlder "3.8"; @@ -32,9 +47,11 @@ buildPythonPackage rec { postPatch = '' substituteInPlace glanceclient/tests/unit/v1/test_shell.py \ - --replace "/bin/echo" "${coreutils}/bin/echo" + --replace-fail "/bin/echo" "${lib.getExe' coreutils "echo"}" ''; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ pbr prettytable @@ -55,12 +72,12 @@ buildPythonPackage rec { ]; checkPhase = '' - stestr run + runHook preCheck + stestr run -e ${writeText "disabled-tests" (lib.concatStringsSep "\n" disabledTests)} + runHook postCheck ''; - pythonImportsCheck = [ - "glanceclient" - ]; + pythonImportsCheck = [ "glanceclient" ]; meta = with lib; { description = "Python bindings for the OpenStack Images API"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-homeassistant-analytics/default.nix new file mode 100644 index 0000000000..4af23c95cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-homeassistant-analytics/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + + # build-system + poetry-core, + + # dependencies + aiohttp, + yarl, + mashumaro, + orjson, + + # tests + pytestCheckHook, + aioresponses, + pytest-asyncio, + syrupy, +}: + +buildPythonPackage rec { + pname = "python-homeassistant-analytics"; + version = "0.6.0"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "joostlek"; + repo = "python-homeassistant-analytics"; + rev = "refs/tags/v${version}"; + hash = "sha256-uGi72UCIIvb5XZl7RkiAiR/TS+5VCpyvZfBsmlPzQEs="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov" "" + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + yarl + mashumaro + orjson + ]; + + nativeCheckInputs = [ + pytestCheckHook + aioresponses + pytest-asyncio + syrupy + ]; + + pythonImportsCheck = [ "python_homeassistant_analytics" ]; + + meta = with lib; { + changelog = "https://github.com/joostlek/python-homeassistant-analytics/releases/tag/v${version}"; + description = "Asynchronous Python client for Homeassistant Analytics"; + homepage = "https://github.com/joostlek/python-homeassistant-analytics +"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix index 7452abb860..c866a5fc72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-hosts"; - version = "1.0.5"; + version = "1.0.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xabbGnvzXNiE0koQVq9dmEib5Cv7kg1JjpZAyb7IZM0="; + hash = "sha256-LfWfBzJ3UyArcHxrIUDsIa8pIr1WkUikf6F6v+IVLG4="; }; # win_inet_pton is required for Windows support diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix index 6e3f406fe5..9739e5bf7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix @@ -64,7 +64,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + disabledTests = [ + # https://github.com/mpdavis/python-jose/issues/348 + "TestBackendEcdsaCompatibility" + ]; meta = with lib; { changelog = "https://github.com/mpdavis/python-jose/releases/tag/${version}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix index a4adbf787a..9150b1a240 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix @@ -1,41 +1,40 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, python-jose -, pythonOlder -, requests -, requests-toolbelt -, urllib3 +{ + lib, + buildPythonPackage, + deprecation, + fetchFromGitHub, + jwcrypto, + poetry-core, + pythonOlder, + requests, + requests-toolbelt, }: buildPythonPackage rec { pname = "python-keycloak"; - version = "2.6.0"; - format = "pyproject"; + version = "4.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "marcospereirampj"; repo = "python-keycloak"; - rev = "v${version}"; - hash = "sha256-cuj0gJlZDkbJ2HRSMcQvO4nxpjw65CKGEpWCL5sucvg="; + rev = "refs/tags/v${version}"; + hash = "sha256-ZXS29bND4GsJNhTGiUsLo+4FYd8Tubvg/+PJ33tqovY="; }; postPatch = '' + # Upstream doesn't set version substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace 'requests-toolbelt = "^0.9.1"' 'requests-toolbelt = "*"' + --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; - buildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - python-jose - urllib3 + dependencies = [ + deprecation + jwcrypto requests requests-toolbelt ]; @@ -43,13 +42,12 @@ buildPythonPackage rec { # Test fixtures require a running keycloak instance doCheck = false; - pythonImportsCheck = [ - "keycloak" - ]; + pythonImportsCheck = [ "keycloak" ]; meta = with lib; { description = "Provides access to the Keycloak API"; homepage = "https://github.com/marcospereirampj/python-keycloak"; + changelog = "https://github.com/marcospereirampj/python-keycloak/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix index 5bc9f3fecf..c54395cabe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix @@ -1,22 +1,24 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchFromGitHub -, pythonOlder +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + pythonAtLeast, + pythonOlder, -# build-system -, setuptools + # build-system + setuptools, -# native dependencies -, openldap -, cyrus_sasl + # native dependencies + openldap, + cyrus_sasl, -# dependencies -, pyasn1 -, pyasn1-modules + # dependencies + pyasn1, + pyasn1-modules, -# tests -, pytestCheckHook + # tests + pytestCheckHook, }: buildPythonPackage rec { @@ -24,7 +26,7 @@ buildPythonPackage rec { version = "3.4.4"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; # requires distutils src = fetchFromGitHub { owner = "python-ldap"; @@ -33,23 +35,19 @@ buildPythonPackage rec { hash = "sha256-v1cWoRGxbvvFnHqnwoIfmiQQcxfaA8Bf3+M5bE5PtuU="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; buildInputs = [ openldap cyrus_sasl ]; - propagatedBuildInputs = [ + dependencies = [ pyasn1 pyasn1-modules ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' # Needed by tests to setup a mockup ldap server. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix index 6387e833b7..20828ac3e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix @@ -24,15 +24,20 @@ buildPythonPackage rec { }; patches = - /** fix test failure with black<24.2.0; - remove this patch once python-lsp-black>2.0.0 */ + /** includes a series of patches fixing tests not yet released as 2.0.1+ version + they are meant to keep up to date with black releases */ lib.optional - (with lib; (versionOlder version "2.0.1") && (versionAtLeast black.version "24.2.0")) + (with lib; versionAtLeast black.version "24.2.0") (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/python-lsp/python-lsp-black/pull/56.patch"; + url = "https://github.com/python-lsp/python-lsp-black/commit/d43b41431379f9c9bb05fab158c4d97e6d515f8f.patch"; hash = "sha256-38bYU27+xtA8Kq3appXTkNnkG5/XgrUJ2nQ5+yuSU2U="; }) - ++ [ ]; + ++ lib.optional + (with lib; versionAtLeast black.version "24.3.0") + (fetchpatch { + url = "https://github.com/python-lsp/python-lsp-black/commit/9298585a9d14d25920c33b188d79e820dc98d4a9.patch"; + hash = "sha256-4u0VIS7eidVEiKRW2wc8lJVkJwhzJD/M+uuqmTtiZ7E="; + }); nativeBuildInputs = [ setuptools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-ruff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-ruff/default.nix index 695574698e..3a208e6089 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-ruff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-ruff/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-lsp-ruff"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; - pname = "python-lsp-ruff"; - hash = "sha256-Z8FAZ/drw9Fr1Uc6V04NezvUItcjti0rKoM1borwUds="; + pname = "python_lsp_ruff"; + hash = "sha256-C7OiJ7wTboq4xm6Rcz8mc9wV329/yeuZ1CZ9CZGzJ6U="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix index b157eba228..98c0efd01d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix @@ -55,7 +55,7 @@ in buildPythonPackage rec { pname = "python-matter-server"; - version = "5.9.0"; + version = "5.10.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-O3AJ7vBjuwRGa4AMwWIdxn5m2F45rLCjCHeff18b/5E="; + hash = "sha256-rfpGclSgCBTxlTgVqgNz3ixoldB9M+6mLmogkNDDdWs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-motionmount/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-motionmount/default.nix index be3a439c36..8e1ba0bb64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-motionmount/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-motionmount/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-motionmount"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vogelsproducts"; repo = "python-MotionMount"; rev = "refs/tags/${version}"; - hash = "sha256-GXgshCARH4VPYHIIeWXwOCRmKgCyel4ydj/oKUWuyUM="; + hash = "sha256-F/nFo/PivnIogVwEh6MsQZQWg95kQMr6pZuf0SZa3n4="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-musicpd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-musicpd/default.nix index cc4ab6b722..c105dcea14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-musicpd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-musicpd/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "python-musicpd"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname; inherit version; - sha256 = "sha256-5Br4rZO1c/pPmAZ/UecYjuVLttR8R+xeReKsc/xnaeI="; + sha256 = "sha256-/FdM0UolVqhJNpS60Q/nra1hSHKL/LiSMX7/Hcipwco="; }; format = "setuptools"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix index 8ce053cab3..d3451236d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix @@ -46,6 +46,8 @@ buildPythonPackage rec { checkPhase = '' stestr run -e <(echo " + novaclient.tests.unit.test_shell.ParserTest.test_ambiguous_option + novaclient.tests.unit.test_shell.ParserTest.test_not_really_ambiguous_option novaclient.tests.unit.test_shell.ShellTest.test_osprofiler novaclient.tests.unit.test_shell.ShellTestKeystoneV3.test_osprofiler ") diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix index 49ea2cc277..7d74613163 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.0.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-vtT6hsyiP1FxWo5PezcjJACknCT9JEhqSQ6C4FpU+Jg="; + hash = "sha256-qyaERNaisfDWXW1IeyFMOV6nLqT+0O9QJ4U02LOyiuE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix index a273b33a20..6fb45f4f72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix @@ -1,15 +1,17 @@ -{ buildPythonPackage -, fetchFromGitHub -, lib -, pytestCheckHook -, pythonOlder -, requests +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { pname = "python-tado"; - version = "0.17.5"; - format = "setuptools"; + version = "0.17.6"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -17,23 +19,23 @@ buildPythonPackage rec { owner = "wmalgadey"; repo = "PyTado"; rev = "refs/tags/${version}"; - hash = "sha256-FjdqZc4Zt2sLYJpnD/MAzr8Y9lGHteHB5psQqheS84I="; + hash = "sha256-KcYxUKQuO7TLS4YPg2mrBjP+DMnvZeJokGzwmeM/CvE="; }; - propagatedBuildInputs = [ - requests - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + dependencies = [ requests ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "PyTado" ]; meta = with lib; { description = "Python binding for Tado web API. Pythonize your central heating!"; - mainProgram = "pytado"; homepage = "https://github.com/wmalgadey/PyTado"; changelog = "https://github.com/wmalgadey/PyTado/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jamiemagee ]; + mainProgram = "pytado"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix index adb2fc81c9..a15e31941e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "21.1"; + version = "21.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "python-telegram-bot"; repo = "python-telegram-bot"; rev = "refs/tags/v${version}"; - hash = "sha256-s5C3f17VP5ooH78/4JQMkzuV1byi7rFPTmVr3lZliFc="; + hash = "sha256-BZrcYZxivrZIkHKqi+x9M4A9XE9dD//2PqzRwA3vuGU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix index 646cdaa18e..9266118705 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix @@ -60,6 +60,6 @@ buildPythonPackage rec { description = "Python wrapper around the Twitter API"; homepage = "https://github.com/bear/python-twitter"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-whois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-whois/default.nix index a9bb5cdd8e..be1186c5ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-whois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-whois/default.nix @@ -1,33 +1,31 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pynose -, pytestCheckHook -, python-dateutil -, pythonOlder -, setuptools -, simplejson +{ + lib, + buildPythonPackage, + fetchPypi, + pynose, + pytestCheckHook, + python-dateutil, + pythonOlder, + setuptools, + simplejson, }: buildPythonPackage rec { pname = "python-whois"; - version = "0.9.3"; + version = "0.9.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-jdoscMD4nw+PxIpCNweJMyv/9nm1+kYgSIhBUdJso84="; + pname = "python_whois"; + inherit version; + hash = "sha256-d7xzR7+BXWXM0ZZxHCmDdlLwdYWu2tPDwE3YhWUf16c="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - python-dateutil - ]; + dependencies = [ python-dateutil ]; nativeCheckInputs = [ pynose @@ -45,9 +43,7 @@ buildPythonPackage rec { "test_simple_unicode_domain" ]; - pythonImportsCheck = [ - "whois" - ]; + pythonImportsCheck = [ "whois" ]; meta = with lib; { description = "Python module to produce parsed WHOIS data"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python3-gnutls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python3-gnutls/default.nix index 72f695326d..6adaf3c033 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python3-gnutls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python3-gnutls/default.nix @@ -1,20 +1,22 @@ { lib, fetchFromGitHub, substituteAll, buildPythonPackage, isPy3k, gnutls -, twisted, pyopenssl, service-identity }: +, twisted, pyopenssl, service-identity, setuptools }: buildPythonPackage rec { pname = "python3-gnutls"; - version = "3.1.9"; - format = "setuptools"; + version = "3.1.10"; + pyproject = true; disabled = !isPy3k; src = fetchFromGitHub { owner = "AGProjects"; repo = "python3-gnutls"; - rev = "324b78f7cd3d9fe58c89c7f0b2bf94199bd6a6e5"; # version not tagged - hash = "sha256-18T8bAHlNERHobsspUFvSC6ulN55nrFFb5aqNwU8T00="; + rev = "refs/tags/release-${version}"; + hash = "sha256-AdFRF3ZlkkAoSm5rvf/09FSYIo7SsZ38sD2joOLyukA="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ twisted pyopenssl service-identity ]; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix index e0c55bf0e9..83b1a73820 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix @@ -1,37 +1,35 @@ { lib , aiohttp -, async-timeout , buildPythonPackage , fetchFromGitHub , gql -, graphql-subscription-manager , pytest-asyncio , pytestCheckHook -, python-dateutil , pythonOlder -, pytz +, setuptools }: buildPythonPackage rec { pname = "pytibber"; - version = "0.29.0"; - format = "setuptools"; + version = "0.29.1"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-rj/uIgIDjmEGD6muUllTb0PdLkedarMgVq38qqNoMI4="; + hash = "sha256-fKeNQifSCxsqR2mhK2w5kG669byYNNLkfxAYTUtfWE0="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp - async-timeout gql - graphql-subscription-manager - python-dateutil ] ++ gql.optional-dependencies.websockets; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytikz-allefeld/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytikz-allefeld/default.nix index fe59dc0a52..9dd0bdb2bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytikz-allefeld/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytikz-allefeld/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder +, setuptools , pymupdf , numpy , ipython @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "pytikz-allefeld"; # "pytikz" on pypi is a different module version = "unstable-2022-11-01"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -23,7 +24,11 @@ buildPythonPackage rec { hash = "sha256-G59UUkpjttJKNBN0MB/A9CftO8tO3nv8qlTxt3/fKHk="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ + setuptools + ]; + + dependencies = [ pymupdf numpy ipython diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytm/default.nix index 5f5722159a..8d3d7c9af8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytm/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytm"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "izar"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-R/MDz6lCvUxtn6IJ8STHlWzkSjnUJziO+oPnaYhrr7U="; + sha256 = "sha256-MseV1ucDCzSM36zx04g9v5euDX0t74KqUSB4+brHzt8="; }; propagatedBuildInputs = [ pydal graphviz pandoc plantuml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix index 7689e40c5b..ed4ac27bf6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pytools"; - version = "2024.1.1"; + version = "2024.1.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LIjt+pkMjjJRZ8N2WfseEKPBEz3691K719hFZAK43P8="; + hash = "sha256-CBhx5FFQXEuYbrr6aK7qv9x76z+qG6pQ9yauviHh0Fc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix index f7a50ce337..a09e91fca0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.2.1"; + version = "2.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-H2gbVCvGKbeHZVlvz6SmKI8Gzw649DxcwYgfGcehsmg="; + hash = "sha256-5dz4NQZC0tKIYA9omRZAsSlvH5hpyCSmV0yvoRICcqg="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytrydan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytrydan/default.nix index 5a191bf800..6ee8162b4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytrydan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytrydan/default.nix @@ -1,22 +1,23 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, httpx -, orjson -, poetry-core -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, respx -, rich -, syrupy -, tenacity -, typer +{ + lib, + buildPythonPackage, + fetchFromGitHub, + httpx, + orjson, + poetry-core, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + respx, + rich, + syrupy, + tenacity, + typer, }: buildPythonPackage rec { pname = "pytrydan"; - version = "0.4.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,19 +26,17 @@ buildPythonPackage rec { owner = "dgomes"; repo = "pytrydan"; rev = "refs/tags/v${version}"; - hash = "sha256-9PyRICtZ+0Ezinu28oFgFOSnOyCmD7zZbdc/chN+sCo="; + hash = "sha256-5sTHfxNV4JEonGke8ZZ/pXoLA15iCuJ/iSW1XwFMltg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=pytrydan --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=pytrydan --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ httpx orjson rich @@ -52,16 +51,14 @@ buildPythonPackage rec { syrupy ]; - pythonImportsCheck = [ - "pytrydan" - ]; + pythonImportsCheck = [ "pytrydan" ]; meta = with lib; { description = "Library to interface with V2C EVSE Trydan"; - mainProgram = "pytrydan"; homepage = "https://github.com/dgomes/pytrydan"; changelog = "https://github.com/dgomes/pytrydan/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "pytrydan"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyunpack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyunpack/default.nix index ea7ad7d416..631c9706f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyunpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyunpack/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyunpack/__init__.py \ - --replace \ + --replace-fail \ '_exepath("patool")' \ '"${lib.getBin patool}/bin/.patool-wrapped"' ''; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ easyprocess entrypoint2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index b56d16e9df..d3765866dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.99"; + version = "9.2.102"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-y30IR3L+bgQA2gJkminkIkz1/UH27tuHn0Ekk0mtghk="; + hash = "sha256-P16jsBmFkuzMHcVTvGEK7/SzIkVpFJsUlxFeHCHivig="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix index a9fea2dc68..cb39d67192 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchpatch , buildPythonPackage +, setuptools , networkx , jinja2 , ipython @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "pyvis"; version = "0.3.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "WestHealth"; @@ -22,7 +23,11 @@ buildPythonPackage rec { hash = "sha256-eo9Mk2c0hrBarCrzwmkXha3Qt4Bl1qR7Lhl9EkUx96E="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ + setuptools + ]; + + dependencies = [ jinja2 networkx ipython diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix index c961904a0c..4985df3f9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.43.5"; + version = "0.43.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-twcsOG/iHZGMBrGcpF5jEJB8CoKIBcO711t7sXJT214="; + hash = "sha256-z/IO25hcHv1pimUecIIX5hZPYF2/1QkROqZ2D4Tk7DE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywavefront/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywavefront/default.nix new file mode 100644 index 0000000000..0139f8209f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywavefront/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pyglet +, pytestCheckHook +, mock +}: + +buildPythonPackage rec { + pname = "PyWavefront"; + version = "1.3.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pywavefront"; + repo = "PyWavefront"; + rev = version; + hash = "sha256-ci40L2opJ+NYYtaAeX1Y5pzkdK+loFspTriX/xv4KR8="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + passthru.optional-dependencies.visualization = [ + pyglet + ]; + + nativeCheckInputs = [ + pytestCheckHook + mock + ]; + + + pythonImportsCheck = [ "pywavefront" ]; + + meta = with lib; { + description = "Python library for importing Wavefront .obj files"; + homepage = "https://github.com/pywavefront/PyWavefront"; + changelog = "https://github.com/pywavefront/PyWavefront/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix index a4d8117fc3..af598a1439 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix @@ -1,34 +1,44 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 +, fetchFromGitHub +, pythonOlder +, meson-python , cython -, nose -, pytest +, pytestCheckHook , numpy }: buildPythonPackage rec { pname = "pywavelets"; - version = "1.4.1"; - disabled = isPy27; + version = "1.6.0"; + pyproject = true; - src = fetchPypi { - pname = "PyWavelets"; - inherit version; - hash = "sha256-ZDevPd8IMRjCbY+Xq0OwckuVbJ+Vjp6niGWfaig0upM="; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "PyWavelets"; + repo = "pywt"; + rev = "refs/tags/v${version}"; + hash = "sha256-Dr6LWGVlYGDD21l1RQ7elScovcen5uuFdJJXe3deB5o="; }; - nativeCheckInputs = [ nose pytest ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"numpy>=2.0.0rc1,<2.3",' "" + ''; - buildInputs = [ cython ]; + build-system = [ + meson-python + cython + numpy + ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; - # Somehow nosetests doesn't run the tests, so let's use pytest instead - doCheck = false; # tests use relative paths, which fail to resolve - checkPhase = '' - py.test pywt/tests + nativeCheckInputs = [ pytestCheckHook ]; + + preCheck = '' + cd $out ''; # ensure compiled modules are present @@ -43,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Wavelet transform module"; homepage = "https://github.com/PyWavelets/pywt"; + changelog = "https://github.com/PyWavelets/pywt/releases/tag/v${version}"; license = licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywaze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywaze/default.nix index 70734fd59d..c47817f21b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywaze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywaze/default.nix @@ -1,18 +1,19 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, hatchling -, httpx -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, respx +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + httpx, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + respx, }: buildPythonPackage rec { pname = "pywaze"; - version = "1.0.0"; - format = "pyproject"; + version = "1.0.1"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,21 +21,17 @@ buildPythonPackage rec { owner = "eifinger"; repo = "pywaze"; rev = "refs/tags/v${version}"; - hash = "sha256-n5W8TdZZJmT7SECXE8k6WK2lmCcucA6eLm+LZpojERo="; + hash = "sha256-sWI9kUR0SSqE97an/YfvhQqmrK+OEWXRzG4MBYyp8Jg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov --cov-report term-missing --cov=src/pywaze " "" + --replace-fail "--cov --cov-report term-missing --cov=src/pywaze " "" ''; - nativeBuildInputs = [ - hatchling - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ - httpx - ]; + dependencies = [ httpx ]; nativeCheckInputs = [ pytest-asyncio @@ -42,9 +39,7 @@ buildPythonPackage rec { respx ]; - pythonImportsCheck = [ - "pywaze" - ]; + pythonImportsCheck = [ "pywaze" ]; meta = with lib; { description = "Module for calculating WAZE routes and travel times"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix index bba152dd43..c298c1e512 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "pywbem"; - version = "1.6.3"; + version = "1.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eN8w3umMUIYgtZm4lR8yKoHGwKnXt4/+XgF7lBfNl7k="; + hash = "sha256-6jx5H4FtM93JToXQwq9ihiPfMw7nX4KwFFQzHkAgnP4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix index ec39364573..a3d52e1bbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.16.7"; + version = "0.16.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zfjcXQCXysG+JMw00YES/GQk/yjHH9kCksb9SlZt9wo="; + hash = "sha256-jAkDZKAm75MlAMNuX+21ZV6kHb53zgIOJctJC2bXH1k="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix deleted file mode 100644 index 71418c1607..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, fetchPypi, python, buildPythonPackage, nose, future, coverage }: - -buildPythonPackage rec { - pname = "pyzufall"; - version = "0.13.2"; - - src = fetchPypi { - pname = "PyZufall"; - inherit version; - sha256 = "1jffhi20m82fdf78bjhncbdxkfzcskrlipxlrqq9741xdvrn14b5"; - }; - - # disable tests due to problem with nose - # https://github.com/nose-devs/nose/issues/1037 - doCheck = false; - - nativeCheckInputs = [ nose coverage ]; - propagatedBuildInputs = [ future ]; - - checkPhase = '' - ${python.interpreter} setup.py nosetests - ''; - - meta = with lib; { - homepage = "https://pyzufall.readthedocs.io/de/latest/"; - description = "Library for generating random data and sentences in german language"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ davidak ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix index a5af403d4d..10d05be786 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "qdldl"; - version = "0.1.7.post1"; + version = "0.1.7.post2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-eY2IwW4CU2rmXHHwa2Tj+/MbdNfke8EP+YFnaGMrOmQ="; + hash = "sha256-SxU5pewQzHV6/XFW1960AGAHythtd0yfD9w+NEFVV9M="; }; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix index a2538e32e4..0a6a476979 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.8.2"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "qdrant-client"; rev = "refs/tags/v${version}"; - hash = "sha256-skPBKSqtwMfm5Tvvhg0pSOsnrf0tfvsUgwxjnUbj3NA="; + hash = "sha256-1QYL2othFA/xTgdj549MA1aVDH6jjiuL+aN2Q/supp8="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix index b5c3d2aec6..3d7ad90dba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix @@ -51,6 +51,9 @@ buildPythonPackage rec { disabledTests = lib.optionals (pythonAtLeast "3.12") [ "test_change" + ] ++ [ + # Attempts to open a file which doesn't exist in sandbox + "test_piped" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix index 6228fc088a..43dc6ce2a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix @@ -11,22 +11,27 @@ , pythonOlder , pyzmq , qtpy +, setuptools , traitlets }: buildPythonPackage rec { pname = "qtconsole"; - version = "5.5.1"; - format = "setuptools"; + version = "5.5.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oOgGxpUduUkGKOTfgMrslmm2UUnHukD5vwM8AlpbVrw="; + hash = "sha256-a1+xEnSyl0Y3Bq+E3LvVySJzsfYZ5tJdCIdLCohRaYk="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ ipykernel ipython-genutils jupyter-core @@ -54,7 +59,6 @@ buildPythonPackage rec { mainProgram = "jupyter-qtconsole"; homepage = "https://qtconsole.readthedocs.io/"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtile/default.nix index 3067892e63..a4d8bb91ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtile/default.nix @@ -28,12 +28,13 @@ , xcbutilwm , xcffib , xkbcommon +, nixosTests }: buildPythonPackage rec { pname = "qtile"; version = "0.25.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "qtile"; @@ -58,13 +59,13 @@ buildPythonPackage rec { --replace /usr/include/libdrm ${lib.getDev libdrm}/include/libdrm ''; - nativeBuildInputs = [ - pkg-config + build-system = [ setuptools setuptools-scm + pkg-config ]; - propagatedBuildInputs = [ + dependencies = [ (cairocffi.override { withXcffib = true; }) dbus-next dbus-python @@ -89,7 +90,11 @@ buildPythonPackage rec { xcbutilwm ]; - doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. + doCheck = false; + passthru = { + tests.qtile = nixosTests.qtile; + providedSessions = [ "qtile" ]; + }; meta = with lib; { homepage = "http://www.qtile.org/"; @@ -97,6 +102,6 @@ buildPythonPackage rec { description = "A small, flexible, scriptable tiling window manager written in Python"; mainProgram = "qtile"; platforms = platforms.linux; - maintainers = with maintainers; [ arjan-s ]; + maintainers = with maintainers; [ arjan-s sigmanificient ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quantile-forest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quantile-forest/default.nix new file mode 100644 index 0000000000..0b6d5df933 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/quantile-forest/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + python, + pythonOlder, + + setuptools, + wheel, + cython, + + numpy, + scipy, + scikit-learn, +}: + +buildPythonPackage rec { + pname = "quantile-forest"; + version = "1.3.5"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "zillow"; + repo = "quantile-forest"; + rev = "refs/tags/v${version}"; + hash = "sha256-0zlj9nks5KsgsLSflRW+4uiYlYVQsF0HMkZ3zG3if2E="; + }; + + build-system = [ + setuptools + cython + wheel + numpy + scipy + scikit-learn + ]; + + dependencies = [ + numpy + scipy + scikit-learn + ]; + + postInstall = '' + rm -rf $out/${python.sitePackages}/examples + ''; + + # need network connection + doCheck = false; + + pythonImportsCheck = [ "quantile_forest" ]; + + meta = with lib; { + description = "Quantile Regression Forests compatible with scikit-learn"; + homepage = "https://github.com/zillow/quantile-forest"; + changelog = "https://github.com/zillow/quantile-forest/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quantiphy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quantiphy/default.nix index 57ac30017c..56790351dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quantiphy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quantiphy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "quantiphy"; - version = "2.19"; + version = "2.20"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KenKundert"; repo = "quantiphy"; - rev = "v${version}"; - hash = "sha256-oSWq/D1EX6mxUDElfujyOSEtql0csAm72u2B5RuQddE="; + rev = "refs/tags/v${version}"; + hash = "sha256-QXCs93plNSVNiCLEoXx2raH6EbH1rXyjvpBfl+8eXjc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quixote/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quixote/default.nix new file mode 100644 index 0000000000..557a59390f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/quixote/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "quixote"; + version = "3.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "Quixote"; + inherit version; + hash = "sha256-78t6tznI3+vIRkWNi0HDPGhR8aGaET3IMXQvmAPdSSY="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "quixote" ]; + + disabledTestPaths = [ + # Test has additional requirements + "quixote/ptl/test/test_ptl.py" + ]; + + meta = with lib; { + description = "A small and flexible Python Web application framework"; + homepage = "https://pypi.org/project/Quixote/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rapidgzip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rapidgzip/default.nix index 69f9fb1388..475d5291c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rapidgzip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rapidgzip/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rapidgzip"; - version = "0.13.1"; + version = "0.13.3"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-t6mfOsCg0FoV7N4GfTIs1KwxeGIOORuxbEIEJN52nRw="; + hash = "sha256-3PvBRYswEtnAZerRD18laW6pQ8i6cgRgGZy+bgSOaI0="; }; nativeBuildInputs = [ cython nasm setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix index 4f3cbc28ea..c0c462cb44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix @@ -1,6 +1,14 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27 -# unrar is non-free software -, useUnrar ? false, unrar +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + libarchive, + pythonOlder, + setuptools, + # unrar is non-free software + useUnrar ? false, + unrar, }: assert useUnrar -> unrar != null; @@ -9,35 +17,47 @@ assert !useUnrar -> libarchive != null; buildPythonPackage rec { pname = "rarfile"; version = "4.2"; - format = "setuptools"; - disabled = isPy27; + pyproject = true; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "markokr"; repo = "rarfile"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZiwD2LG25fMd4Z+QWsh/x3ceG5QRBH4s/TZDwMnfpNI="; + hash = "sha256-ZiwD2LG25fMd4Z+QWsh/x3ceG5QRBH4s/TZDwMnfpNI="; }; - nativeCheckInputs = [ pytestCheckHook nose glibcLocales ]; - - prePatch = '' - substituteInPlace rarfile.py \ - '' + (if useUnrar then - ''--replace 'UNRAR_TOOL = "unrar"' "UNRAR_TOOL = \"${unrar}/bin/unrar\"" + prePatch = + '' + substituteInPlace rarfile.py \ + '' + + ( + if useUnrar then '' - else - ''--replace 'ALT_TOOL = "bsdtar"' "ALT_TOOL = \"${libarchive}/bin/bsdtar\"" - '') - + ""; - # the tests only work with the standard unrar package + --replace 'UNRAR_TOOL = "unrar"' "UNRAR_TOOL = \"${unrar}/bin/unrar\"" + '' + else + '' + --replace 'ALT_TOOL = "bsdtar"' "ALT_TOOL = \"${libarchive}/bin/bsdtar\"" + '' + ) + + ""; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # The tests only work with the standard unrar package doCheck = useUnrar; - LC_ALL = "en_US.UTF-8"; + pythonImportsCheck = [ "rarfile" ]; meta = with lib; { description = "RAR archive reader for Python"; homepage = "https://github.com/markokr/rarfile"; + changelog = "https://github.com/markokr/rarfile/releases/tag/v${version}"; license = licenses.isc; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readme-renderer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readme-renderer/default.nix index 13a8074a56..bcc961bc18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readme-renderer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readme-renderer/default.nix @@ -44,17 +44,8 @@ buildPythonPackage rec { ++ optional-dependencies.md; disabledTests = [ - # https://github.com/pypa/readme_renderer/issues/221 - "test_GFM_" - # https://github.com/pypa/readme_renderer/issues/274 - "test_CommonMark_008.md" + "test_rst_fixtures" "test_rst_008.rst" - # Relies on old distutils behaviour removed by setuptools (TypeError: dist must be a Distribution instance) - "test_valid_rst" - "test_invalid_rst" - "test_malicious_rst" - "test_invalid_missing" - "test_invalid_empty" ]; pythonImportsCheck = [ @@ -64,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for rendering readme descriptions"; homepage = "https://github.com/pypa/readme_renderer"; + changelog = "https://github.com/pypa/readme_renderer/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix index 70a852bfb1..4c9ad2d829 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.55.0"; + version = "14.56.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-HjR4Lwlcrpeqv6BXI+aYCL9e7ZTaTa522z0lSW03wW0="; + hash = "sha256-+9oQLCuR+rRCG5tnyofHd8WMkQ5QPsWfLCnwIDU5d9o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix index 3faf849304..b58cf8f280 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix @@ -38,6 +38,5 @@ buildPythonPackage rec { description = "A docutils-compatibility bridge to CommonMark"; homepage = "https://github.com/rtfd/recommonmark"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix index b4f5df6e42..fd5cdb62dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "2.1.3"; + version = "2.2.0"; disabled = pythonOlder "3.7"; @@ -25,14 +25,14 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-K2pflwHpzuYDMNUB7YQu6NX21O0aOwRChBgjdiwFQ+Y="; + hash = "sha256-Njd+sc35jlA96iVf2uuVN2BK92ctwUDfBAUfpgqtPs0="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ icalendar pytz python-dateutil diff --git a/third_party/nixpkgs/pkgs/development/python-modules/redis-om/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/redis-om/default.nix index 1549b89163..4e84e3ea37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/redis-om/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/redis-om/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "redis-om"; - version = "0.2.2"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "redis"; repo = "redis-om-python"; rev = "refs/tags/v${version}"; - hash = "sha256-E11wpTrE+HIT+jgn1zMC8L7RGas83DAJd1R0WWHp7Jc="; + hash = "sha256-jwFtRnj/jhH+AKjExdOCgUfgEWweFCXVuz6F3qQRcs0="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix index d987092e48..9e583447e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "redis"; - version = "5.0.1"; + version = "5.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DatJXNV1MGnTvGUKDd6Kj57d4W/FaRtomlZu2lgQDQ8="; + hash = "sha256-SXO650RMD77WSga4dEb3k2HLfk7BU4wCLWlu16UBVYA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/referencing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/referencing/default.nix index 0113f23e47..3e7063e42e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/referencing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/referencing/default.nix @@ -1,39 +1,39 @@ -{ lib -, attrs -, buildPythonPackage -, fetchFromGitHub -, hatch-vcs -, hatchling -, jsonschema -, pytest-subtests -, pytestCheckHook -, pythonOlder -, rpds-py +{ + lib, + attrs, + buildPythonPackage, + fetchFromGitHub, + hatch-vcs, + hatchling, + jsonschema, + pytest-subtests, + pytestCheckHook, + pythonOlder, + rpds-py, }: - let self = buildPythonPackage rec { pname = "referencing"; - version = "0.33.0"; - format = "pyproject"; + version = "0.34.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-jsonschema"; repo = "referencing"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-QP/F6UNiKHGNMhGphDJgEFZnpGU5izExcI/A9WJjA5Q="; + hash = "sha256-Vx+WVgt09I04Z/sIYsLLtPCwuo5wW0Z2o2OTH2V17UY="; }; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ attrs rpds-py ]; @@ -44,22 +44,20 @@ let pytestCheckHook ]; - # avoid infinite recursion with jsonschema + # Avoid infinite recursion with jsonschema doCheck = false; passthru.tests.referencing = self.overridePythonAttrs { doCheck = true; }; - pythonImportsCheck = [ - "referencing" - ]; + pythonImportsCheck = [ "referencing" ]; meta = with lib; { description = "Cross-specification JSON referencing"; homepage = "https://github.com/python-jsonschema/referencing"; - changelog = "https://github.com/python-jsonschema/referencing/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/python-jsonschema/referencing/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; }; in - self +self diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix index 86a41f4a9f..ad71a2943e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { description = "GPGPU algorithms for PyCUDA and PyOpenCL"; homepage = "https://github.com/fjarri/reikna"; license = licenses.mit; - maintainers = [ maintainers.fridh ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/relatorio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/relatorio/default.nix index 14460fb9b1..23a3a87df7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/relatorio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/relatorio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "relatorio"; - version = "0.10.1"; + version = "0.10.2"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a0c72302d50d5dfa433ddab191672eec1dde1c6ed26330a378b720e5a3012e23"; + sha256 = "sha256-zgCOmcR9FWj0lpi78U0G1CKR5kyNyr541HusIrBpF/Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/remi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/remi/default.nix index b1f28e2690..64b6a70669 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/remi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/remi/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook , matplotlib , python-snap7 @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "remi"; version = "2022.7.27"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "rawpython"; @@ -23,23 +24,27 @@ buildPythonPackage rec { preCheck = '' # for some reason, REMI already deal with these using try blocks, but they fail substituteInPlace test/test_widget.py \ - --replace \ + --replace-fail \ "from html_validator import " \ "from .html_validator import " substituteInPlace test/test_examples_app.py \ - --replace \ + --replace-fail \ "from mock_server_and_request import " \ "from .mock_server_and_request import " \ - --replace \ + --replace-fail \ "from html_validator import " \ "from .html_validator import " # Halves number of warnings substituteInPlace test/test_*.py \ - --replace \ + --replace-quiet \ "self.assertEquals(" \ "self.assertEqual(" ''; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook python-snap7 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reportlab-qrcode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reportlab-qrcode/default.nix new file mode 100644 index 0000000000..97d1e9d137 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/reportlab-qrcode/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, qrcode +, reportlab +, pillow +, pytest +, pyzbar +}: + +buildPythonPackage rec { + pname = "reportlab-qrcode"; + version = "0.1.6"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-m/oeuA797MEBOJBIG157VIa7TbEbRRVK/O8Arz/oO/o="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + qrcode + reportlab + ]; + + passthru.optional-dependencies = { + testing = [ + pillow + pytest + pyzbar + ]; + }; + + pythonImportsCheck = [ "reportlab_qrcode" ]; + + meta = with lib; { + description = "Allows to create QR codes for use with the ReportLab PDF library"; + homepage = "https://pypi.org/project/reportlab-qrcode/"; + license = licenses.mit; + maintainers = with maintainers; [ xanderio ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix index ef0a575789..2024b2835a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix @@ -14,7 +14,7 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit @@ -22,7 +22,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-Opn69BJpEVnAaLP/AcFTB84v0s9rhgGZQ0h04AIECoQ="; + hash = "sha256-R0+yjWNDGl1H11yQ1YA5MFDffUkaCceHffMpGi6fbQo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix index ff6e3070cf..940e2d0daa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix @@ -9,7 +9,6 @@ , fetchPypi , fsspec , numpy -, oldest-supported-numpy , pytest-astropy , pytestCheckHook , pythonOlder @@ -20,26 +19,26 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-lL6MkKVSWmV6KPkG/9fjc2c2dFQ14i9fiJAr3VFfcuI="; + hash = "sha256-Y+Ne7ZUgCieWcC4zqfrqPzmr/kGUdFroGfIPKWACaPY="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "cython==" "cython>=" + --replace "cython==" "cython>=" \ + --replace "numpy>=2.0.0rc1" "numpy" ''; nativeBuildInputs = [ astropy-extension-helpers cython numpy - oldest-supported-numpy setuptools-scm ]; @@ -65,6 +64,8 @@ buildPythonPackage rec { "-p no:warnings" # Uses network "--ignore build/lib*/reproject/interpolation/" + # prevent "'filterwarnings' not found in `markers` configuration option" error + "-o 'markers=filterwarnings'" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix index 3c52cc3f49..a9051dc3eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.18"; + version = "0.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-sojU2Asop0b/b/gfKXoRseuT1zHEO00JNrRWhMYh0Vo="; + hash = "sha256-7ZmMG1Fil8/JAks50baT/p1H7wHjap58+i81/DFlSAk="; }; pythonRelaxDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-download/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-download/default.nix index 0d1a5fb10a..8a09dabbaf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-download/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-download/default.nix @@ -27,6 +27,5 @@ buildPythonPackage rec { description = "Download files using requests and save them to a target path"; homepage = "https://www.github.com/takluyver/requests_download"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix index 4e72ce6736..9273875ab6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix @@ -4,24 +4,31 @@ , fixtures , purl , pytestCheckHook -, python , requests , requests-futures -, six +, setuptools +, setuptools-scm , testtools }: buildPythonPackage rec { pname = "requests-mock"; - version = "1.11.0"; - format = "setuptools"; + version = "1.12.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7xC1crSJpfKOCbcIaXIIxKOyuJ74Cp8BWENA6jV+w8Q="; + hash = "sha256-6eEuMztSUVboKjyFLyIBa5FYIg0vR0VN6crop303FAE="; }; - propagatedBuildInputs = [ requests six ]; + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + requests + ]; nativeCheckInputs = [ fixtures diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix index aab180853d..164500d3e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix @@ -7,7 +7,6 @@ , semver , pytestCheckHook , pythonOlder -, pythonRelaxDepsHook , toml }: @@ -25,16 +24,11 @@ buildPythonPackage rec { hash = "sha256-qmrHFQRypBJOI1N6W/Dtc5ss9JGqoPhFlbqrLHcb6vc="; }; - pythonRelaxDeps = [ - "astroid" - ]; - - nativeBuildInputs = [ + build-system = [ poetry-core - pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ astroid packaging toml @@ -51,10 +45,12 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool to find and list requirements of a Python project"; - mainProgram = "detect-requirements"; homepage = "https://github.com/landscapeio/requirements-detector"; changelog = "https://github.com/landscapeio/requirements-detector/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda ]; + mainProgram = "detect-requirements"; + # https://github.com/landscapeio/requirements-detector/issues/48 + broken = versionAtLeast astroid.version "3"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/resend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/resend/default.nix index 5ce129dd67..a8dca71c52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/resend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/resend/default.nix @@ -1,15 +1,17 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools -, pythonOlder -, pytestCheckHook -, requests +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pythonOlder, + pytestCheckHook, + requests, + typing-extensions, }: buildPythonPackage rec { pname = "resend"; - version = "0.8.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,24 +20,19 @@ buildPythonPackage rec { owner = "resend"; repo = "resend-python"; rev = "refs/tags/v${version}"; - hash = "sha256-6cQtI3it2AS8UdT83fp3y3IcbjSyPmBlQuymN74fBNo="; + hash = "sha256-TuumT77SGVIi/zaWd7FJwTZFiwZcyb1RioMcG7QXxgE="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ requests + typing-extensions ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "resend" - ]; + pythonImportsCheck = [ "resend" ]; meta = with lib; { description = "SDK for Resend"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix index 6b1292c4c7..d6c479fc4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix @@ -1,42 +1,31 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , commentjson , pytestCheckHook }: buildPythonPackage rec { pname = "resolvelib"; - # Currently this package is only used by Ansible and breaking changes - # are frequently introduced, so when upgrading ensure the new version - # is compatible with Ansible - # https://github.com/NixOS/nixpkgs/pull/128636 - # https://github.com/ansible/ansible/blob/devel/requirements.txt - version = "0.5.5"; - format = "setuptools"; + version = "1.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "sarugaku"; repo = "resolvelib"; rev = version; - sha256 = "198vfv78hilpg0d0mjzchzp9zk6239wnra61vlsgwpcgz66d2bgv"; + hash = "sha256-oxyPn3aFPOyx/2aP7Eg2ThtPbyzrFT1JzWqy6GqNbzM="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ commentjson pytestCheckHook ]; - # TODO: reenable after updating to >= 1.0.0 - # https://github.com/sarugaku/resolvelib/issues/114 - disabledTests = [ - "shared_parent_dependency" - "deep_complex_conflict" - "shared_parent_dependency_with_swapping" - "spapping_and_rewinding" - "pruned_unresolved_orphan" - "conflict_common_parent" - "same-package" - ]; pythonImportsCheck = [ "resolvelib" @@ -45,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Resolve abstract dependencies into concrete ones"; homepage = "https://github.com/sarugaku/resolvelib"; + changelog = "https://github.com/sarugaku/resolvelib/blob/${src.rev}/CHANGELOG.rst"; license = licenses.isc; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reuse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reuse/default.nix index b0d9920830..e697d8b262 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reuse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reuse/default.nix @@ -1,19 +1,20 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, binaryornot -, boolean-py -, debian -, jinja2 -, license-expression -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + binaryornot, + boolean-py, + debian, + jinja2, + license-expression, + pytestCheckHook, }: buildPythonPackage rec { pname = "reuse"; version = "3.0.2"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "fsfe"; @@ -22,11 +23,9 @@ buildPythonPackage rec { hash = "sha256-ZYmQtJ503HDmu+Cd6IxOrCcOVH+CcFnFe3oe6PqvcE0="; }; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ binaryornot boolean-py debian @@ -46,8 +45,17 @@ buildPythonPackage rec { meta = with lib; { description = "A tool for compliance with the REUSE Initiative recommendations"; homepage = "https://github.com/fsfe/reuse-tool"; - license = with licenses; [ asl20 cc-by-sa-40 cc0 gpl3Plus ]; - maintainers = with maintainers; [ FlorianFranzen Luflosi ]; + changelog = "https://github.com/fsfe/reuse-tool/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ + asl20 + cc-by-sa-40 + cc0 + gpl3Plus + ]; + maintainers = with maintainers; [ + FlorianFranzen + Luflosi + ]; mainProgram = "reuse"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix index d33d518fce..a3986a490f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Python implementation of the Happy Eyeballs Algorithm"; homepage = "https://github.com/sethmlarson/rfc6555"; license = licenses.asl20; - maintainers = with maintainers; [ endocrimes ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix index 5db47dfc65..ef101fd2fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix @@ -1,31 +1,33 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools -, docutils -, rich +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + docutils, + rich, + pytestCheckHook, }: buildPythonPackage rec { pname = "rich-rst"; - version = "1.2.0"; - format = "pyproject"; + version = "1.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "wasi-master"; - repo = pname; + repo = "rich-rst"; rev = "refs/tags/v${version}"; - hash = "sha256-jFPboZ5/T2I6EuyVM+45lrLWen8Kqf94gWXS1WDf1qU="; + hash = "sha256-A3SPbu1N5X55c32S8z8UPpmniJT+mdqfb1+zQEJMA5k="; }; - nativeBuildInputs = [ - setuptools + build-system = [ setuptools ]; + + dependencies = [ + docutils + rich ]; - propagatedBuildInputs = [ docutils rich ]; - - # Module has no tests - doCheck = false; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "rich_rst" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix index 298772e12c..dbbf8f7b29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "riscv-config"; - version = "3.18.1"; + version = "3.18.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "riscv-software-src"; repo = "riscv-config"; rev = "refs/tags/${version}"; - hash = "sha256-lBjSHfnuNPi4Ks5ZCRLqJx3/l4GMmMEEIud8ZVl/S4Q="; + hash = "sha256-ADmf7EN3D+8isZRFx6WRMYq91YHunGavuwy3a3M3gCc="; }; pythonRelaxDeps = [ "pyyaml" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rlcard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rlcard/default.nix new file mode 100644 index 0000000000..5477a50ba2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rlcard/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, numpy +, pip +, termcolor +, pytestCheckHook +, torch +, pythonAtLeast +}: + +buildPythonPackage rec { + pname = "rlcard"; + version = "1.0.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "datamllab"; + repo = "rlcard"; + rev = "refs/tags/${version}"; + hash = "sha256-SWj6DBItQzSM+nioV54a350Li7tbBaVXsQxNAqVgB0k="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + numpy + # pip is required at runtime (https://github.com/datamllab/rlcard/blob/1.0.7/rlcard/utils/utils.py#L10) + pip + termcolor + ]; + + pythonImportsCheck = [ + "rlcard" + ]; + + nativeCheckInputs = [ + pytestCheckHook + torch + ]; + + disabledTests = [ + # AttributeError: module 'numpy' has no attribute 'int'. + # https://github.com/datamllab/rlcard/issues/266 + "test_decode_action" + "test_get_legal_actions" + "test_get_perfect_information" + "test_get_player_id" + "test_init_game" + "test_is_deterministic" + "test_proceed_game" + "test_reset_and_extract_state" + "test_run" + "test_step" + "test_step" + "test_step_back" + "test_step_back" + + # ValueError: setting an array element with a sequence. The requested array has an inhomogeneous shape after 3 dimensions. The detected shape was (1, 1, 5) + inhomogeneous part. + "test_reorganize" + ]; + + meta = with lib; { + description = "Reinforcement Learning / AI Bots in Card (Poker) Games - Blackjack, Leduc, Texas, DouDizhu, Mahjong, UNO"; + homepage = "https://github.com/datamllab/rlcard"; + changelog = "https://github.com/datamllab/rlcard/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + # Relies on deprecated distutils + broken = pythonAtLeast "3.12"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rnginline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rnginline/default.nix index acea2482f3..7505cfd734 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rnginline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rnginline/default.nix @@ -15,23 +15,28 @@ buildPythonPackage rec { pname = "rnginline"; version = "1.0.0"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-JWqzs+OqOynIAWYVgGrZiuiCqObAgGe6rBt0DcP3U6E="; }; - nativeBuildInputs = [ + pythonRelaxDeps = [ + "docopt-ng" + "importlib-metadata" + "lxml" + ]; + + build-system = [ poetry-core + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ - "docopt-ng" - ]; - - propagatedBuildInputs = [ + dependencies = [ docopt-ng lxml typing-extensions @@ -49,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library and command-line tool for loading multi-file RELAX NG schemas from arbitary URLs, and flattening them into a single RELAX NG schema"; homepage = "https://github.com/h4l/rnginline"; + changelog = "https://github.com/h4l/rnginline/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ lesuisse ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix index 0df16e875c..6c3c582b2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchFromGitHub -, netifaces -, pyserial -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + cryptography, + fetchFromGitHub, + netifaces, + pyserial, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "rns"; - version = "0.7.3"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,14 +20,12 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-QcYjqqeXBKx+Ef00Bw1OJMWDMdQgp/fqh3r5yhsa0Kg="; + hash = "sha256-M6iI554lv6PF5sIdOoaMIlQHP5YU8WM8YxfHMWhLSdE="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cryptography netifaces pyserial @@ -35,9 +34,7 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "RNS" - ]; + pythonImportsCheck = [ "RNS" ]; meta = with lib; { description = "Cryptography-based networking stack for wide-area networks"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/roadlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/roadlib/default.nix index 303024a90f..77c05f8dc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/roadlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/roadlib/default.nix @@ -1,30 +1,29 @@ -{ lib -, adal -, buildPythonPackage -, fetchPypi -, pyjwt -, pythonOlder -, setuptools -, sqlalchemy +{ + lib, + adal, + buildPythonPackage, + fetchPypi, + pyjwt, + pythonOlder, + setuptools, + sqlalchemy, }: buildPythonPackage rec { pname = "roadlib"; - version = "0.23.0"; + version = "0.24.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0hDiuF0dBRyR2B9dp4c7/jsC6li8uOduQBbhs6fFLfU="; + hash = "sha256-+5vR2iTFu50PJIsj4sW6McH1sg3yyEIwk15W8Jk0GKA="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ adal pyjwt sqlalchemy @@ -33,9 +32,7 @@ buildPythonPackage rec { # Module has no test doCheck = false; - pythonImportsCheck = [ - "roadtools.roadlib" - ]; + pythonImportsCheck = [ "roadtools.roadlib" ]; meta = with lib; { description = "ROADtools common components library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/roadtx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/roadtx/default.nix index 4ea50269cd..eca756a0f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/roadtx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/roadtx/default.nix @@ -1,34 +1,33 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pycryptodomex -, pyotp -, pythonOlder -, requests -, roadlib -, selenium -, selenium-wire -, setuptools -, signxml +{ + lib, + buildPythonPackage, + fetchPypi, + pycryptodomex, + pyotp, + pythonOlder, + requests, + roadlib, + selenium, + selenium-wire, + setuptools, + signxml, }: buildPythonPackage rec { pname = "roadtx"; - version = "1.7.0"; + version = "1.8.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qnumJbuBH+ajzfG+bLTrYPvB5uNnL8dJsTZoT2vo6g0="; + hash = "sha256-hhxmwD1+mZtU/VmB8yXeQESh0AGtjhdpDXRG3+mYfEk="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pycryptodomex pyotp requests @@ -38,9 +37,7 @@ buildPythonPackage rec { signxml ]; - pythonImportsCheck = [ - "roadtools.roadtx" - ]; + pythonImportsCheck = [ "roadtools.roadtx" ]; meta = with lib; { description = "ROADtools Token eXchange"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix index 5d88338758..c66d7c6ad6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-selenium2library/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { description = "Web testing library for Robot Framework"; homepage = "https://github.com/robotframework/Selenium2Library"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 961d967b31..a1130eaac6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "robotframework-seleniumlibrary"; - version = "6.2.0"; + version = "6.3.0"; pyproject = true; # no tests included in PyPI tarball @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "refs/tags/v${version}"; - sha256 = "sha256-lvtu6z/PD2Ckj70SgDF69BwrhaoA36SDrAvj0XJsmCc="; + sha256 = "sha256-/bYk8S9fGTsftBokz1FH+7HwdhhtAvZgtQscUESTsjY="; }; nativeBuildInputs = [ @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Web testing library for Robot Framework"; homepage = "https://github.com/robotframework/SeleniumLibrary"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix index fb0d137c9b..949945515c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "A tool for checking that Robot Framework test cases have expected statuses and log messages"; homepage = "https://github.com/robotframework/statuschecker"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix index 0a204c11be..47800983f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix @@ -1,24 +1,25 @@ -{ lib -, aiohttp -, aresponses -, awesomeversion -, backoff -, buildPythonPackage -, cachetools -, fetchFromGitHub -, poetry-core -, pytest-asyncio -, pytest-freezegun -, pytestCheckHook -, pythonOlder -, xmltodict -, yarl +{ + lib, + aiohttp, + aresponses, + awesomeversion, + backoff, + buildPythonPackage, + cachetools, + fetchFromGitHub, + poetry-core, + pytest-asyncio, + pytest-freezegun, + pytestCheckHook, + pythonOlder, + xmltodict, + yarl, }: buildPythonPackage rec { pname = "rokuecp"; - version = "0.19.2"; - format = "pyproject"; + version = "0.19.3"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -26,14 +27,18 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = "refs/tags/${version}"; - hash = "sha256-L6uedckc2lEQ6CUlQGEyDhnuVsxRRgDQJUEsZTfm2sU="; + hash = "sha256-XMJ2V59E4SEVlEhgc1hstLmtzl1gxwCsq+4vmkL3CPM="; }; - nativeBuildInputs = [ - poetry-core - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ + --replace-fail "--cov" "" + ''; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ aiohttp backoff cachetools @@ -49,12 +54,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace "--cov" "" - ''; - disabledTests = [ # Network related tests are having troube in the sandbox "test_resolve_hostname" @@ -66,9 +65,7 @@ buildPythonPackage rec { "test_get_tv_channels_single_channel" ]; - pythonImportsCheck = [ - "rokuecp" - ]; + pythonImportsCheck = [ "rokuecp" ]; meta = with lib; { description = "Asynchronous Python client for Roku (ECP)"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix index c10b23414b..2f3e66b76b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix @@ -25,26 +25,20 @@ }: buildPythonPackage rec { - version = "3.5.15"; + version = "3.5.16"; format = "setuptools"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - hash = "sha256-RE+uSoTcfyM7cOqrCqgTmO4BR8ThrjjdRSTXedbyWys="; + hash = "sha256-g34vdFg2WKXEwzl2GnP5Q08z75ztPjDGTadWIWXCgBs="; }; patches = [ # R_LIBS_SITE is used by the nix r package to point to the installed R libraries. # This patch sets R_LIBS_SITE when rpy2 is imported. ./rpy2-3.x-r-libs-site.patch - - # https://github.com/rpy2/rpy2/pull/1094 - (fetchpatch { - url = "https://github.com/rpy2/rpy2/commit/026d069a008163a62d12567bcb938410d0f9bf7a.diff"; - hash = "sha256-x778upSY3zab5EiRyOcsbDpPj7vN/7XzefEs+wvkNg0="; - }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix index 1b1c35fedb..47a0a7dcfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rq"; - version = "1.16.1"; + version = "1.16.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rq"; repo = "rq"; - rev = "fd261d5d8fc0fe604fa396ee6b9c9b7a7bb4142f"; - hash = "sha256-0pRknrF7dtW7210iS8HDWDRRsSJXzgFZYlPy0eK/Rs4="; + rev = "refs/tags/v${version}"; + hash = "sha256-8uhCV4aJNbY273jOa9D5OlgEG1w3hXVncClKQTO9Pyk="; }; build-system = [ @@ -47,16 +47,22 @@ buildPythonPackage rec { sentry-sdk ]; - preCheck = lib.optionalString stdenv.isLinux '' + preCheck = '' PATH=$out/bin:$PATH ${redis-server}/bin/redis-server & - REDIS_PID=$! ''; - postCheck = lib.optionalString stdenv.isLinux '' - kill $REDIS_PID + postCheck = '' + kill %% ''; + __darwinAllowLocalNetworking = true; + + disabledTests = [ + # https://github.com/rq/rq/commit/fd261d5d8fc0fe604fa396ee6b9c9b7a7bb4142f + "test_clean_large_registry" + ]; + pythonImportsCheck = [ "rq" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix index b2531886ea..956767735c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, installShellFiles , setuptools , setuptools-scm , wheel @@ -31,6 +32,7 @@ buildPythonPackage rec { outputs = [ "out" "man" ]; nativeBuildInputs = [ + installShellFiles setuptools setuptools-scm wheel @@ -62,8 +64,8 @@ buildPythonPackage rec { doCheck = false; postInstall = '' - mkdir -p $man/share/man/man1/ - ${docutils}/bin/rst2man.py doc/rst2pdf.rst $man/share/man/man1/rst2pdf.1 + ${lib.getExe' docutils "rst2man"} doc/rst2pdf.rst rst2pdf.1 + installManPage rst2pdf.1 ''; meta = with lib; { @@ -72,6 +74,6 @@ buildPythonPackage rec { homepage = "https://rst2pdf.org/"; changelog = "https://github.com/rst2pdf/rst2pdf/blob/${version}/CHANGES.rst"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ pyrox0 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtsp-to-webrtc/default.nix index 812a4fc1ba..5686b12f44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rtsp-to-webrtc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -1,42 +1,43 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pytest-aiohttp -, pytestCheckHook -, pythonOlder +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pytest-aiohttp, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "rtsp-to-webrtc"; - version = "0.5.1"; - format = "setuptools"; + version = "0.6.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; repo = "rtsp-to-webrtc-client"; - rev = version; - hash = "sha256-miMBN/8IO4v03mMoclCa3GFl6HCS3Sh6z2HOQ39MRZY="; + rev = "refs/tags/${version}"; + hash = "sha256-D022d2CDKtHTuvEGo8GkOGWHi5sV4g6UwNB9xS2xxIs="; }; - propagatedBuildInputs = [ - aiohttp - ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; - pythonImportsCheck = [ - "rtsp_to_webrtc" - ]; + pythonImportsCheck = [ "rtsp_to_webrtc" ]; meta = with lib; { description = "Module for RTSPtoWeb and RTSPtoWebRTC"; homepage = "https://github.com/allenporter/rtsp-to-webrtc-client"; + changelog = "https://github.com/allenporter/rtsp-to-webrtc-client/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rubicon-objc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rubicon-objc/default.nix new file mode 100644 index 0000000000..f12f08e0ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rubicon-objc/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, darwin +, fetchFromGitHub +, pythonOlder +, setuptools +, setuptools-scm +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "rubicon-objc"; + version = "0.4.8"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "beeware"; + repo = "rubicon-objc"; + rev = "refs/tags/v${version}"; + hash = "sha256-aFKzLeVYn5u8hTEgXCum3XpZxI7C/Wql41jkWkCF0HQ="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools==69.2.0" "setuptools" \ + --replace-fail "setuptools_scm==8.0.4" "setuptools_scm" + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + preCheck = '' + make -C tests/objc + ''; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + checkInputs = [ + darwin.apple_sdk.frameworks.Foundation + ]; + + pythonImportsCheck = [ + "rubicon.objc" + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "A bridge interface between Python and Objective-C"; + homepage = "https://github.com/beeware/rubicon-objc/"; + changelog = "https://github.com/beeware/rubicon-objc/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ natsukium ]; + platforms = lib.platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix index 46c7044759..c267f25310 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , aiobotocore , aiohttp , buildPythonPackage @@ -45,7 +44,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "A Pythonic file interface for S3"; homepage = "https://github.com/fsspec/s3fs"; changelog = "https://github.com/fsspec/s3fs/raw/${version}/docs/source/changelog.rst"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix index 124b44f097..52bf82fc50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.10.0"; + version = "0.10.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "boto"; repo = "s3transfer"; rev = "refs/tags/${version}"; - hash = "sha256-21xycx1+84uY4gFr7N+ra98dpsEwxy9zeSl4QA66nUc="; + hash = "sha256-EHNkYviafnuU8AADp9oyaDuAnoPOdOVNSLCcoONnHPY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix index 609d8969be..f03c7a2632 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "sacn"; - version = "1.9.0"; + version = "1.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LimA0I8y1tdjFk244iWvKJj0Rx3OEaYOSIJtirRHh4o="; + hash = "sha256-ppXWRBZVm4QroxZ19S388sRuI5zpaDgJrJqhnwefr3k="; }; # no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix index 4005a620d8..2b6d9ba0ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "safetensors"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "huggingface"; repo = "safetensors"; rev = "refs/tags/v${version}"; - hash = "sha256-hdPUI8k7CCQwt2C/AsjUHRmAL6ob+yCN97KkWtqOQL8="; + hash = "sha256-Rc+o7epQJ8qEvdgbFnGvXxBr/U4eULZwkKNEaPlJkyU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/bindings/python"; - hash = "sha256-7n9aYlha6IaPsZ2zMfD5EIkrk8ENwMBwj41s6QU7ml0="; + hash = "sha256-tzNEUvWgolSwX0t/JLgYcTEIv3/FiKxoTJ4VjFQs8AY="; }; sourceRoot = "${src.name}/bindings/python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix index 529ed4d8d4..00cd2758f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "safety"; - version = "3.0.1"; + version = "3.2.0"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-HyAA8DZS86C/xn+P0emLxXI8y3bhXLG91oVFw9gD3wE="; + hash = "sha256-i9XKtfPYphzg6m6Y8mfBAG0FYJfEXGRP7nr+/31ZScE="; }; postPatch = '' @@ -89,8 +89,12 @@ buildPythonPackage rec { "test_check_live_cached" "test_get_packages_licenses_without_api_key" "test_validate_with_policy_file_using_invalid_keyword" + "test_validate_with_basic_policy_file" ]; + # ImportError: cannot import name 'get_command_for' from partially initialized module 'safety.cli_util' (most likely due to a circular import) + disabledTestPaths = [ "tests/alerts/test_utils.py" ]; + preCheck = '' export HOME=$(mktemp -d) ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index a8b0d3f07c..49156ec553 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.214.3"; + version = "2.219.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-RE4uyIpFiZNDyS5R6+gMLlj0vcAIiHPattFPTSMGnCI="; + hash = "sha256-TZpRRkoAlXU+Ccgxq49t+Cz0JOIUvYp7ok3x3sphncE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/samplerate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/samplerate/default.nix index 7ac9950a69..0b7d81a94d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/samplerate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/samplerate/default.nix @@ -2,33 +2,56 @@ , stdenv , buildPythonPackage , fetchFromGitHub + +# build-system +, cmake +, setuptools +, setuptools-scm +, pybind11 + +# dependencies , cffi , numpy + +# native dependencies , libsamplerate + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "samplerate"; - version = "0.1.0"; - format = "setuptools"; + version = "0.2.1"; + pyproject = true; src = fetchFromGitHub { owner = "tuxu"; repo = "python-samplerate"; - rev = "refs/tags/${version}"; - hash = "sha256-lHZ9SVnKcsEsnKYXR/QocGbKPEoA7yCZxXvrNPeH1rA="; + rev = "refs/tags/v${version}"; + hash = "sha256-/9NFJcn8R0DFjVhFAIYOtzZM90hjVIfsVXFlS0nHNhA="; }; postPatch = '' - substituteInPlace setup.py \ - --replace ", 'pytest-runner'" "" - - substituteInPlace samplerate/lowlevel.py --replace \ - "lib_filename = _find_library('samplerate')" \ - 'lib_filename = "${libsamplerate.out}/lib/libsamplerate${stdenv.hostPlatform.extensions.sharedLibrary}"' + # unvendor pybind11, libsamplerate + rm -r external + substituteInPlace CMakeLists.txt \ + --replace-fail "add_subdirectory(external)" "find_package(pybind11 REQUIRED)" ''; + build-system = [ + cmake + setuptools + setuptools-scm + pybind11 + ]; + + dontUseCmakeConfigure = true; + + buildInputs = [ + libsamplerate + ]; + propagatedBuildInputs = [ cffi numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanix/default.nix new file mode 100644 index 0000000000..64fd150745 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanix/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "sanix"; + version = "1.0.6"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "tomaszsluszniak"; + repo = "sanix_py"; + rev = "refs/tags/v${version}"; + hash = "sha256-D2w3hmL8ym63liWOYdZS4ry3lJ0utbbYGagWoOTT1TQ="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "sanix" ]; + + meta = with lib; { + description = "Module to get measurements data from Sanix devices"; + homepage = "https://github.com/tomaszsluszniak/sanix_py"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sarif-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sarif-tools/default.nix new file mode 100644 index 0000000000..785c26e345 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sarif-tools/default.nix @@ -0,0 +1,69 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, poetry-core +, jsonpath-ng +, jinja2 +, python +, python-docx +, matplotlib +, pyyaml +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "sarif-tools"; + version = "2.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "sarif-tools"; + rev = "v${version}"; + hash = "sha256-80amYGnf7xZdpxzTjBGwgg39YN/jJsEkTm0uAlVbH0w="; + }; + + disabled = pythonOlder "3.8"; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + jsonpath-ng + jinja2 + python + python-docx + matplotlib + pyyaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonRelaxDeps = [ + "python-docx" + ]; + + disabledTests = [ + # Broken, re-enable once https://github.com/microsoft/sarif-tools/pull/41 is merged + "test_version" + ]; + + pythonImportsCheck = [ + "sarif" + ]; + + meta = { + description = "A set of command line tools and Python library for working with SARIF files"; + homepage = "https://github.com/microsoft/sarif-tools"; + changelog = "https://github.com/microsoft/sarif-tools/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ puzzlewolf ]; + mainProgram = "sarif"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scalene/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scalene/default.nix index 29a51e38b6..69004f67a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scalene/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scalene/default.nix @@ -18,24 +18,15 @@ buildPythonPackage rec { pname = "scalene"; - version = "1.5.38"; + version = "1.5.41"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-LR1evkn2m6FNBmJnUUJubesxIPeHG6RDgLFBHDuxe38="; + hash = "sha256-akjxv9Qot2lGntZxkxfFqz65VboL1qduykfjyEg1Ivg="; }; - patches = [ - # fix scalene_config import. remove on next update - (fetchpatch { - name = "scalene_config-import-fix.patch"; - url = "https://github.com/plasma-umass/scalene/commit/cd437be11f600ac0925ce77efa516e6d83934200.patch"; - hash = "sha256-YjFh+mu5jyIJYUQFhmGqLXhec6lgQAdj4tWxij3NkwU="; - }) - ]; - nativeBuildInputs = [ cython setuptools @@ -61,14 +52,6 @@ buildPythonPackage rec { numpy ]; - disabledTestPaths = [ - # remove on next update - # Failing Darwin-specific tests that were subsequently removed from the source repo. - "tests/test_coverup_35.py" - "tests/test_coverup_42.py" - "tests/test_coverup_43.py" - ]; - # remove scalene directory to prevent pytest import confusion preCheck = '' rm -rf scalene diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schemdraw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schemdraw/default.nix index 441e668f81..08eecb1d8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schemdraw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schemdraw/default.nix @@ -14,8 +14,8 @@ buildPythonPackage rec { pname = "schemdraw"; - version = "0.18"; - format = "pyproject"; + version = "0.19"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,18 +23,18 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-JJc3LA+fqB+2g7pPIZ8YMV921EyYpLZrHSJCYyYThZg="; + hash = "sha256-vqEHcazE5DNHr0FceOWLqq+RZmMK5ovHDVjy/2wbTJU="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyparsing ]; - passthru.optional-dependencies = { + optional-dependencies = { matplotlib = [ matplotlib ]; @@ -59,6 +59,8 @@ buildPythonPackage rec { substituteInPlace test/test_styles.ipynb --replace "font='Times', " "" ''; + preCheck = "rm test/test_pictorial.ipynb"; # Tries to download files + pytestFlagsArray = [ "--nbval-lax" ]; pythonImportsCheck = [ "schemdraw" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix index 1a33c71f7f..6a74fb7415 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix @@ -7,6 +7,7 @@ , hatch-vcs # dependencies +, importlib-resources , iso3166 , pycountry @@ -21,14 +22,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2024.1.1.post0"; - format = "pyproject"; + version = "2024.4.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ZFDu+stuKdsVc8bTuSZ4LZX8BuQhORjyEMosnrk1rX0="; + hash = "sha256-1EV2oi2LBcjw2U7nKqdVUVDlFCzR8RqX5tVIciw1trg="; }; nativeBuildInputs = [ @@ -39,6 +40,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ iso3166 pycountry + ] ++ lib.optionals (pythonOlder "3.12") [ + importlib-resources ]; passthru.optional-dependencies = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix index c08f992f22..7068063a8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix @@ -1,53 +1,64 @@ -{ lib -, buildPythonPackage -, fetchPypi -, cython -, lockfile -, cachecontrol -, decorator -, h5py -, ipython -, matplotlib -, natsort -, numpy -, pandas -, scipy -, hdmedians -, scikit-learn -, coverage -, python -, isPy3k +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cython, + oldest-supported-numpy, + requests, + decorator, + natsort, + numpy, + pandas, + scipy, + h5py, + hdmedians, + biom-format, + python, + pytestCheckHook, }: buildPythonPackage rec { - version = "0.5.9"; - format = "setuptools"; pname = "scikit-bio"; - disabled = !isPy3k; + version = "0.6.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-euBE3IvuIxkAJIrcOoZZB352FA1WrJ9CvQH7eYEBSRA="; + src = fetchFromGitHub { + owner = "scikit-bio"; + repo = "scikit-bio"; + rev = "refs/tags/${version}"; + hash = "sha256-v8/r52pJpMi34SekPQBf7CqRbs+ZEyPR3WO5RBB7uKg="; }; - nativeBuildInputs = [ cython ]; - nativeCheckInputs = [ coverage ]; - propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy h5py hdmedians scikit-learn ]; + build-system = [ + setuptools + cython + oldest-supported-numpy + ]; - # cython package not included for tests - doCheck = false; + dependencies = [ + requests + decorator + natsort + numpy + pandas + scipy + h5py + hdmedians + biom-format + ]; - checkPhase = '' - ${python.interpreter} -m skbio.test - ''; + nativeCheckInputs = [ pytestCheckHook ]; + + # only the $out dir contains the built cython extensions, so we run the tests inside there + pytestFlagsArray = [ "${placeholder "out"}/${python.sitePackages}/skbio" ]; pythonImportsCheck = [ "skbio" ]; - meta = with lib; { + meta = { homepage = "http://scikit-bio.org/"; description = "Data structures, algorithms and educational resources for bioinformatics"; - license = licenses.bsd3; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ tomasajt ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix index acaf74e109..0d35ccf4a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix @@ -92,6 +92,8 @@ buildPythonPackage rec { "test_dual_pep518" # pip exits with code 1 "test_isolated_env_trigger_reconfigure" # Regex pattern 'exit skbuild saving cmake spec' does not match 'exit skbuild running make'. "test_hello_wheel" # [Errno 2] No such file or directory: '_skbuild/linux-x86_64-3.9/setuptools/bdist.linux-x86_64/wheel/helloModule.py' + "test_hello_cython_sdist" # [Errno 2] No such file or directory: 'dist/hello-cython-1.2.3.tar.gz' + "test_hello_pure_sdist" # [Errno 2] No such file or directory: 'dist/hello-pure-1.2.3.tar.gz' # sdist contents differ, contains additional setup.py "test_hello_sdist" "test_manifest_in_sdist" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix index bbcb44de2c..88927aa4f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonPackage , fetchPypi -, fetchpatch # build-system , cython @@ -16,6 +15,7 @@ , glibcLocales , llvmPackages , pytestCheckHook +, pythonRelaxDepsHook , pytest-xdist , pillow , joblib @@ -25,23 +25,21 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.4.1.post1"; + version = "1.4.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-k9PUlv8ZZUcPmXfQXl7DN2+x5jsQ5P2l450jwtiWmjA="; + hash = "sha256-2qHEcdlbrQgMbkS0lGyTkKSEKtwwglcsIOT4iE456Vk="; }; - patches = [ - (fetchpatch { # included in >= 1.4.2 - name = "test_standard_scaler_dtype.patch"; - url = "https://github.com/jeremiedbb/scikit-learn/commit/87c32d35eeb8f6f7fec63dc3d97d9c416545f053.diff"; - hash = "sha256-iOBOoWHuWChCTnZ5go7MobPcHRGMChROpCI7V/5ik1Y="; - }) - ]; + # Avoid build-system requirements causing failure + prePatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy==2.0.0rc1" "numpy" + ''; buildInputs = [ pillow @@ -52,6 +50,7 @@ buildPythonPackage rec { nativeBuildInputs = [ gfortran + pythonRelaxDepsHook ]; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-posthocs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-posthocs/default.nix index e8f3933299..1aba1d935c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-posthocs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-posthocs/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "scikit-posthocs"; version = "0.9.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "maximtrp"; @@ -25,13 +25,6 @@ buildPythonPackage rec { hash = "sha256-sRop5DKakrZEBswzTvumn68wKqU15zM5aCLfZ/PdsFg="; }; - patches = [ - # Fixed on master: https://github.com/maximtrp/scikit-posthocs/commit/02266a00ce0eb6a089e7efe07816da1aa5152fc9 - ./0001-increased-abs-tolerance-for-wilcoxon-test.patch - # Fixed on master: https://github.com/maximtrp/scikit-posthocs/commit/5416ffba3ab01aebab3909400b5a9e847022898e - ./0002-Update-test_posthocs.py.patch - ]; - nativeBuildInputs = [ setuptools wheel diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix index aa49911009..3ee1f89adf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "0.32.0"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,8 +40,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-rf"; repo = pname; - rev = "refs/tags/v.${version}"; - hash = "sha256-J7V4nQ8OxW4w75OyiMdUal8k5oXSn96g4w6k1+KV1Dw="; + rev = "refs/tags/v${version}"; + hash = "sha256-TtRj9pqm5153y78MzhlVpL1EvNiNJyjUH1aOlAWU0WE="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix index 609c595eeb..57769c7f6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -25,6 +25,9 @@ , xsimd , blas , lapack + +# Reverse dependency +, sage }: let @@ -193,6 +196,7 @@ in buildPythonPackage { # Pass it the names of the datasets to update their hashes ++ (builtins.attrNames datasetsHashes) ; + tests = { inherit sage; }; }; SCIPY_USE_G77_ABI_WRAPPER = 1; @@ -203,6 +207,6 @@ in buildPythonPackage { downloadPage = "https://github.com/scipy/scipy"; homepage = "https://www.scipy.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh doronbehar ]; + maintainers = with maintainers; [ doronbehar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scooby/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scooby/default.nix index 869a1a5895..229ba0526a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scooby/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scooby/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "scooby"; - version = "0.9.2"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "banesullivan"; repo = "scooby"; rev = "refs/tags/v${version}"; - hash = "sha256-x6GPRo0OuXJtN41urviY0joZKzq0SQjUdRBpIylgcXY="; + hash = "sha256-KXhLN8KPz61l+4v88+kVSvodT6OXDJ3Pw9A9aFWSqYE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix index 09ed93f848..058f1f8f56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix @@ -5,6 +5,7 @@ , cryptography , cssselect , fetchPypi +, fetchpatch , glibcLocales , installShellFiles , itemadapter @@ -43,6 +44,16 @@ buildPythonPackage rec { hash = "sha256-czoDnHQj5StpvygQtTMgk9TkKoSEYDWcB7Auz/j3Pr4="; }; + patches = [ + # https://github.com/scrapy/scrapy/pull/6316 + # fix test_get_func_args. remove on next update + (fetchpatch { + name = "test_get_func_args.patch"; + url = "https://github.com/scrapy/scrapy/commit/b1fe97dc6c8509d58b29c61cf7801eeee1b409a9.patch"; + hash = "sha256-POlmsuW4SD9baKwZieKfmlp2vtdlb7aKQ62VOmNXsr0="; + }) + ]; + nativeBuildInputs = [ installShellFiles setuptools @@ -151,6 +162,6 @@ buildPythonPackage rec { homepage = "https://scrapy.org/"; changelog = "https://github.com/scrapy/scrapy/raw/${version}/docs/news.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ vinnymeller ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sdkmanager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sdkmanager/default.nix index 2900c012cf..ebace96d13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sdkmanager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sdkmanager/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sdkmanager"; - version = "0.6.6"; + version = "0.6.7"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fdroid"; repo = pname; rev = version; - hash = "sha256-Vuht2gH9ivNG7PgG+XKtkdKoszkkoI91reQKg6D50xs="; + hash = "sha256-8Iq3sVp9/dZi4zNZIgNm38ntoA2koS/Ism+pIVATr4Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix index a296478b17..beaf5d2e10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix @@ -70,6 +70,5 @@ buildPythonPackage rec { homepage = "https://seaborn.pydata.org/"; changelog = "https://github.com/mwaskom/seaborn/blob/master/doc/whatsnew/${src.rev}.rst"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix index d0174236ce..aa68ab9133 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "2.6.1"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "UKPLab"; repo = "sentence-transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-09AAuv/yXTbBvjA4gu5ueZrQkVja0BTIGNLZ2tLSyh8="; + hash = "sha256-xER+WHprW83KWJ0bom+lTn0HNU7PgGROnp/QLG1uUcw="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-dso/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-dso/default.nix index c33a89deab..306d6b794e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-dso/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-dso/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "setuptools extension for building non-Python Dynamic Shared Objects"; homepage = "https://github.com/mdavidsaver/setuptools_dso"; license = licenses.bsd3; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-gettext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-gettext/default.nix index 394f4c4693..31440a40e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-gettext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-gettext/default.nix @@ -1,37 +1,44 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + tomli, + pytestCheckHook, + gettext, }: buildPythonPackage rec { pname = "setuptools-gettext"; - version = "0.1.11"; - format = "setuptools"; + version = "0.1.14"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "breezy-team"; repo = "setuptools-gettext"; rev = "refs/tags/v${version}"; - hash = "sha256-yLKn4wwGgRdlsISAT71lD2vkIefsTJRB+OEA030adZY="; + hash = "sha256-05xKWRxmoI8tnRENuiK3Z3WNMyjgXIX5p3vhzSUeytQ="; }; - propagatedBuildInputs = [ - setuptools + build-system = [ setuptools ]; + + dependencies = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + + pythonImportsCheck = [ "setuptools_gettext" ]; + + nativeCheckInputs = [ + pytestCheckHook + gettext ]; - pythonImportsCheck = [ - "setuptools_gettext" - ]; - - meta = with lib; { + meta = { changelog = "https://github.com/breezy-team/setuptools-gettext/releases/tag/v${version}"; description = "setuptools plugin for building mo files"; homepage = "https://github.com/breezy-team/setuptools-gettext"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ tomasajt ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index c5b9808440..f5f7fcd056 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { description = "setuptools_scm plugin for git archives"; homepage = "https://github.com/Changaco/setuptools_scm_git_archive"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; # https://github.com/Changaco/setuptools_scm_git_archive/pull/22 broken = versionAtLeast setuptools-scm.version "8"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix index 46a2597ed1..c7cfd09dc4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "69.2.0"; + version = "69.5.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; rev = "refs/tags/v${version}"; - hash = "sha256-kll4zYFQn4g/8Fq0Y5vLvDXtotxYMbiNAgGa0sClFQk="; + hash = "sha256-X0ntFlDIhUjxtWzz0LxybQSuxhRpHlMeBYtOGwqDl4A="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch index 399e168235..16dfd34c2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch @@ -1,8 +1,8 @@ diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py -index 47efa377..5cdbbe10 100644 +index 539f09d8f..a3d3020cb 100644 --- a/setuptools/_distutils/cygwinccompiler.py +++ b/setuptools/_distutils/cygwinccompiler.py -@@ -101,14 +101,19 @@ class CygwinCCompiler(UnixCCompiler): +@@ -99,14 +99,19 @@ class CygwinCCompiler(UnixCCompiler): self.cxx = os.environ.get('CXX', 'g++') self.linker_dll = self.cc @@ -12,17 +12,17 @@ index 47efa377..5cdbbe10 100644 self.set_executables( compiler='%s -mcygwin -O -Wall' % self.cc, compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc, - compiler_cxx='%s -mcygwin -O -Wall' % self.cxx, + compiler_so_cxx='%s -mcygwin -mdll -O -Wall' % self.cxx, + compiler_cxx='%s -mcygwin -O -Wall' % self.cxx, linker_exe='%s -mcygwin' % self.cc, - linker_so=('{} -mcygwin {}'.format(self.linker_dll, shared_option)), + linker_so=(f'{self.linker_dll} -mcygwin {shared_option}'), + linker_exe_cxx='%s -mcygwin' % self.cxx, + linker_so_cxx=('%s -mcygwin %s' % + (self.linker_dll_cxx, shared_option)), ) # Include the appropriate MSVC runtime library if Python was built -@@ -140,9 +145,12 @@ class CygwinCCompiler(UnixCCompiler): +@@ -138,9 +143,12 @@ class CygwinCCompiler(UnixCCompiler): raise CompileError(msg) else: # for other files use the C-compiler try: @@ -38,24 +38,24 @@ index 47efa377..5cdbbe10 100644 except DistutilsExecError as msg: raise CompileError(msg) -@@ -278,9 +286,12 @@ class Mingw32CCompiler(CygwinCCompiler): +@@ -276,9 +284,12 @@ class Mingw32CCompiler(CygwinCCompiler): self.set_executables( compiler='%s -O -Wall' % self.cc, compiler_so='%s -mdll -O -Wall' % self.cc, + compiler_so_cxx='%s -mdll -O -Wall' % self.cxx, compiler_cxx='%s -O -Wall' % self.cxx, linker_exe='%s' % self.cc, - linker_so='{} {}'.format(self.linker_dll, shared_option), + linker_so=f'{self.linker_dll} {shared_option}', + linker_exe_cxx='%s' % self.cxx, + linker_so_cxx='%s %s' % (self.linker_dll_cxx, shared_option) ) def runtime_library_dir_option(self, dir): diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py -index a40a7231..e5aad4f4 100644 +index 1a38e9fa7..034ed6566 100644 --- a/setuptools/_distutils/sysconfig.py +++ b/setuptools/_distutils/sysconfig.py -@@ -297,6 +297,7 @@ def customize_compiler(compiler): # noqa: C901 +@@ -300,6 +300,7 @@ def customize_compiler(compiler): # noqa: C901 cflags, ccshared, ldshared, @@ -63,7 +63,7 @@ index a40a7231..e5aad4f4 100644 shlib_suffix, ar, ar_flags, -@@ -306,11 +307,14 @@ def customize_compiler(compiler): # noqa: C901 +@@ -309,11 +310,14 @@ def customize_compiler(compiler): # noqa: C901 'CFLAGS', 'CCSHARED', 'LDSHARED', @@ -78,7 +78,7 @@ index a40a7231..e5aad4f4 100644 if 'CC' in os.environ: newcc = os.environ['CC'] if 'LDSHARED' not in os.environ and ldshared.startswith(cc): -@@ -322,19 +326,27 @@ def customize_compiler(compiler): # noqa: C901 +@@ -325,19 +329,27 @@ def customize_compiler(compiler): # noqa: C901 cxx = os.environ['CXX'] if 'LDSHARED' in os.environ: ldshared = os.environ['LDSHARED'] @@ -107,7 +107,7 @@ index a40a7231..e5aad4f4 100644 if 'AR' in os.environ: ar = os.environ['AR'] if 'ARFLAGS' in os.environ: -@@ -343,13 +355,17 @@ def customize_compiler(compiler): # noqa: C901 +@@ -346,13 +358,17 @@ def customize_compiler(compiler): # noqa: C901 archiver = ar + ' ' + ar_flags cc_cmd = cc + ' ' + cflags @@ -127,10 +127,10 @@ index a40a7231..e5aad4f4 100644 ) diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py -index 6ca2332a..5ac64128 100644 +index 0248bde87..9508e6cff 100644 --- a/setuptools/_distutils/unixccompiler.py +++ b/setuptools/_distutils/unixccompiler.py -@@ -115,9 +115,12 @@ class UnixCCompiler(CCompiler): +@@ -118,9 +118,12 @@ class UnixCCompiler(CCompiler): 'preprocessor': None, 'compiler': ["cc"], 'compiler_so': ["cc"], @@ -144,7 +144,7 @@ index 6ca2332a..5ac64128 100644 'archiver': ["ar", "-cr"], 'ranlib': None, } -@@ -181,8 +184,13 @@ class UnixCCompiler(CCompiler): +@@ -184,8 +187,13 @@ class UnixCCompiler(CCompiler): def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs) @@ -159,7 +159,7 @@ index 6ca2332a..5ac64128 100644 except DistutilsExecError as msg: raise CompileError(msg) -@@ -250,7 +258,8 @@ class UnixCCompiler(CCompiler): +@@ -253,7 +261,8 @@ class UnixCCompiler(CCompiler): # building an executable or linker_so (with shared options) # when building a shared library. building_exe = target_desc == CCompiler.EXECUTABLE diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix index 2bc1a8f5c2..2e0b5c0f81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "shap"; - version = "0.45.0"; + version = "0.45.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "slundberg"; repo = "shap"; rev = "refs/tags/v${version}"; - hash = "sha256-x8845saPoLsWu3Z8Thkhqo3HeLmfAZANj3KE0ftVqZc="; + hash = "sha256-REMAubT9WRe0exfhO4UCLt3FFQHq4HApHnI6i2F/V1o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shimmy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shimmy/default.nix new file mode 100644 index 0000000000..cbe0ca7cc8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/shimmy/default.nix @@ -0,0 +1,92 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, wheel +, gymnasium +, numpy +, ale-py +, bsuite +, dm-control +, gym +, imageio +, pettingzoo +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "shimmy"; + version = "1.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Farama-Foundation"; + repo = "Shimmy"; + rev = "refs/tags/v${version}"; + hash = "sha256-rYBbGyMSFF/iIGruKn2JXKAVIZIfJDEHUEZUESiUg/k="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + gymnasium + numpy + ]; + + pythonImportsCheck = [ "shimmy" ]; + + nativeCheckInputs = [ + ale-py + bsuite + dm-control + gym + imageio + pettingzoo + pytestCheckHook + ]; + + disabledTestPaths = [ + # Requires unpackaged pyspiel + "tests/test_openspiel.py" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = [ + # Require network access + "test_check_env[bsuite/mnist_noise-v0]" + "test_check_env[bsuite/mnist_scale-v0]" + "test_check_env[bsuite/mnist-v0]" + "test_existing_env" + "test_loading_env" + "test_pickle[bsuite/mnist-v0]" + "test_seeding[bsuite/mnist_noise-v0]" + "test_seeding[bsuite/mnist_scale-v0]" + "test_seeding[bsuite/mnist-v0]" + "test_seeding" + + # RuntimeError: std::exception + "test_check_env" + "test_seeding[dm_control/quadruped-escape-v0]" + "test_rendering_camera_id" + "test_rendering_multiple_cameras" + "test_rendering_depth" + "test_render_height_widths" + ]; + + meta = { + changelog = "https://github.com/Farama-Foundation/Shimmy/releases/tag/v${version}"; + description = "An API conversion tool for popular external reinforcement learning environments"; + homepage = "https://github.com/Farama-Foundation/Shimmy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix index a508ee2ec6..d799069324 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "shiv"; - version = "1.0.5"; + version = "1.0.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-3eryU4+4HFfMIrmst1Vlm6GounzvtCfFiAYFhAH/RdU="; + hash = "sha256-4iJ2gTWXe+vftcDRp9/qKVV8VmtY0wDVuMJTXvIj13Y="; }; propagatedBuildInputs = [ click pip setuptools wheel ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix index 5e89670ede..56da9cd5f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sigstore-protobuf-specs"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sigstore_protobuf_specs"; inherit version; - hash = "sha256-MyKttzmSvKDz3G1MLDi6wpCGoR0mMamDrbJ5jljjKlQ="; + hash = "sha256-xAthl1uVeukG6ymlvHBA7AFbaLa0YAXMWAXmKUk+jew="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skein/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skein/default.nix index ff0884330b..738a6b21d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skein/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skein/default.nix @@ -2,6 +2,7 @@ , callPackage , fetchPypi , isPy27 +, pythonOlder , lib , cryptography , grpcio @@ -10,6 +11,8 @@ , hadoop , pytestCheckHook , python +, setuptools +, versioneer }: buildPythonPackage rec { @@ -25,7 +28,8 @@ buildPythonPackage rec { jarHash = "sha256-x2KH6tnoG7sogtjrJvUaxy0PCEA8q/zneuI969oBOKo="; skeinJar = callPackage ./skeinjar.nix { inherit pname version jarHash; }; - propagatedBuildInputs = [ cryptography grpcio pyyaml ]; + propagatedBuildInputs = [ cryptography grpcio pyyaml ] + ++ lib.optionals (!pythonOlder "3.12") [ setuptools ]; buildInputs = [ grpcio-tools ]; preBuild = '' @@ -37,8 +41,17 @@ buildPythonPackage rec { postPatch = '' substituteInPlace skein/core.py --replace "'yarn'" "'${hadoop}/bin/yarn'" \ --replace "else 'java'" "else '${hadoop.jdk}/bin/java'" + # Remove vendorized versioneer + rm versioneer.py + '' + lib.optionalString (!pythonOlder "3.12") '' + substituteInPlace skein/utils.py \ + --replace-fail "distutils" "setuptools._distutils" ''; + build-system = [ + versioneer + ]; + pythonImportsCheck = [ "skein" ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -51,12 +64,12 @@ buildPythonPackage rec { "test_cli" ]; - meta = with lib; { + meta = { homepage = "https://jcristharif.com/skein"; description = "A tool and library for easily deploying applications on Apache YARN"; mainProgram = "skein"; - license = licenses.bsd3; - maintainers = with maintainers; [ alexbiehl illustris ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ alexbiehl illustris ]; # https://github.com/NixOS/nixpkgs/issues/48663#issuecomment-1083031627 # replace with https://github.com/NixOS/nixpkgs/pull/140325 once it is merged broken = lib.traceIf isPy27 "${pname} not supported on ${python.executable}" isPy27; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skl2onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skl2onnx/default.nix index 3cd47324cb..ca3e567b03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skl2onnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skl2onnx/default.nix @@ -51,7 +51,6 @@ buildPythonPackage rec { meta = { description = "Convert scikit-learn models to ONNX"; - maintainers = with lib.maintainers; [ fridh ]; license = with lib.licenses; [ asl20 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix index 989b5711a8..3cd175e518 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.3.10"; + version = "1.3.11"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = "skodaconnect"; rev = "refs/tags/${version}"; - hash = "sha256-H45rL9GFuTnP5VP0cRyqlmWJmX1Zvh7A7JcSKgcZCwA="; + hash = "sha256-Cy2sXj8+t8lIqrKmI9Aa7tNEIvRArynU/02ajJ+tYHg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-dtef/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-dtef/default.nix index 1c1edb663e..92b03f7d35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-dtef/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "A format for standardized rule-based tilesets with 256 adjacency combinations"; homepage = "https://github.com/SkyTemple/skytemple-dtef"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-eventserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-eventserver/default.nix index dc31cbcbd9..94c38cbcf4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-eventserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-eventserver/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-eventserver"; description = "Websocket server that emits SkyTemple UI events"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix index 1b8d744b7d..1f91f3a4be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { description = "Python library to edit the ROM of Pokémon Mystery Dungeon Explorers of Sky"; mainProgram = "skytemple_export_maps"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix marius851000 ]; + maintainers = with maintainers; [ marius851000 ]; broken = stdenv.isDarwin; # pyobjc is missing }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-icons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-icons/default.nix index 34b9dd5cee..b78bc27e3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-icons/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-icons/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-icons"; description = "Icons for SkyTemple"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix index 411aadb9b4..5a604db033 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-rust"; description = "Binary Rust extensions for SkyTemple"; license = licenses.mit; - maintainers = with maintainers; [ xfix marius851000 ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index c378053c20..7b50a7ae6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -17,7 +17,7 @@ , skytemple-files , skytemple-icons , skytemple-ssb-emulator -, wrapGAppsHook +, wrapGAppsHook3 }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { }; buildInputs = [ gtk3 gtksourceview4 ]; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; propagatedBuildInputs = [ explorerscript ndspy @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Script Engine Debugger for Pokémon Mystery Dungeon Explorers of Sky"; mainProgram = "skytemple-ssb-debugger"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix index d3bbb87d6e..39c034e3d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { description = "SkyTemple Script Engine Debugger Emulator Backend"; homepage = "https://github.com/SkyTemple/skytemple-ssb-emulator"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix index 680bb0f6a5..5287d25fb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix @@ -3,15 +3,12 @@ , fetchFromGitHub , boto3 , diskcache -, enum34 , packaging -, pathlib , numpy , requests , scikit-image , six , pytestCheckHook -, isPy27 , tifffile }: @@ -36,7 +33,7 @@ buildPythonPackage rec { scikit-image six tifffile - ] ++ lib.optionals isPy27 [ pathlib enum34 ]; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix index f678dfb2ea..41b3e434bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix @@ -12,47 +12,25 @@ buildPythonPackage rec { pname = "slicer"; - version = "0.0.7"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "0.0.8"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-9dX3tF+Y0VW5wLplVPqXcMaybVeTo+d6EDD7VpEOvuw="; + hash = "sha256-LnVTr3PwwMLTVfSvzD7Pl8byFW/PRZOVXD9Wz2xNbrc="; }; prePatch = '' dos2unix slicer/* ''; - patches = [ - # these patches add support for numpy>=1.24 - (fetchpatch { - url = "https://github.com/interpretml/slicer/commit/028e09e639c4a3c99abe1d537cce30af2eebb081.patch"; - hash = "sha256-jh/cbz7cx2ks6jMNh1gI1n5RS/OHBtSIDZRxUGyrl/I="; - }) - (fetchpatch { - url = "https://github.com/interpretml/slicer/commit/d4bb09f136d7e1f64711633c16a37e7bee738696.patch"; - hash = "sha256-9rh99s4JWF4iKClZ19jvqSeRulL32xB5Use8PGkh/SA="; - }) - (fetchpatch { - url = "https://github.com/interpretml/slicer/commit/74b3683a5a7bd982f9eaaf8d8d665dfdaf2c6604.patch"; - hash = "sha256-R3zsC3udYPFUT93eRhb6wyc9S5n2wceiOunWJ8K+648="; - }) - ]; - nativeBuildInputs = [ dos2unix ]; nativeCheckInputs = [ pytestCheckHook pandas torch scipy ]; - disabledTests = [ - # IndexError: too many indices for array - "test_slicer_sparse" - "test_operations_2d" - ]; - meta = with lib; { description = "Wraps tensor-like objects and provides a uniform slicing interface via __getitem__"; homepage = "https://github.com/interpretml/slicer"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix index 556f978c73..de9f007af7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -5,13 +5,14 @@ , aiohttp , asn1 , python-dateutil +, setuptools , tenacity }: buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.5.3"; - format = "setuptools"; + version = "0.5.5"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -19,15 +20,19 @@ buildPythonPackage rec { owner = "grahamwetzler"; repo = "smart-meter-texas"; rev = "refs/tags/v${version}"; - hash = "sha256-8htd5fLrtkaVlSEm+RB7tWA5YZkcAOjAXVNzZiMwP7k="; + hash = "sha256-dHWcYrBtmKdEIU45rMy4KvoPX88hnRpd4KBlbJaNvgI="; }; postPatch = '' substituteInPlace setup.py \ - --replace "pytest-runner" "" + --replace-fail "pytest-runner" "" ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp asn1 python-dateutil diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix index b9622276bd..470de7e118 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , azure-common , azure-core , azure-storage-blob @@ -31,6 +32,16 @@ buildPythonPackage rec { hash = "sha256-4HOTaF6AKXGlVCvSGKnnaH73aa4IO0aRxz03XQ4gSd8="; }; + patches = [ + # https://github.com/RaRe-Technologies/smart_open/pull/822 + # fix test_smart_open.py on python 3.12 + (fetchpatch { + name = "fix-smart-open-test.patch"; + url = "https://github.com/RaRe-Technologies/smart_open/commit/3d29564ca034a56d343c9d14b178aaa0ff4c937c.patch"; + hash = "sha256-CrAeqaIMM8bctWiFnq9uamnIlkaslDyjaWL6k9wUjT8="; + }) + ]; + build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smtpdfix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smtpdfix/default.nix index 5d34cd6693..3d541263c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smtpdfix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smtpdfix/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "smtpdfix"; - version = "0.5.1"; + version = "0.5.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-882i0T6EySZ6jxOgoM11MU+ha41XfKjDDhUjeX7qvp4="; + hash = "sha256-5NGs6Q83EqGRJ+2IdOaXqGFIwfSNKy2wwHIJaOjj7JU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix index f620cd0c04..6df9688d10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "snakemake-interface-storage-plugins"; - version = "3.2.1"; + version = "3.2.2"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hOZIdYL9YcKmZCTnKA4GbvvvPJ6pUcMLGvU5uYQHokw="; + hash = "sha256-syUjK32RPV9FMV7RSpXy+PJ2AVigGH+ywm6iTjUAuec="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix index 9f194eb253..a029348d4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "snakemake-storage-plugin-s3"; - version = "0.2.10"; + version = "0.2.11"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-k21DRQdSUFkdwNb7MZJmClhIg+pdSc7H6FkDrbf4DT8="; + hash = "sha256-pAMrWJe4+PWHglZ/C83Af+uHBg9wupfSlH4W8CvO9as="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snaptime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snaptime/default.nix index 8555e3640d..8f148eba4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snaptime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snaptime/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , python-dateutil , pytz }: @@ -8,14 +9,18 @@ buildPythonPackage rec { pname = "snaptime"; version = "0.2.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-4/HriQQ9WNMHIauYy2UCPxpMJ0DjsZdwQpixY8ktUIs="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ + setuptools + ]; + + dependencies = [ python-dateutil pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snorkel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snorkel/default.nix index 8da4fd87d7..04e605d145 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snorkel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snorkel/default.nix @@ -16,7 +16,7 @@ , pyspark , dill , dask -, spacy_models +, spacy-models }: let pname = "snorkel"; @@ -56,7 +56,7 @@ buildPythonPackage { pyspark dill dask - spacy_models.en_core_web_sm + spacy-models.en_core_web_sm ] ++ dask.optional-dependencies.distributed; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index d8857b971a..66824e6ccd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.5.1"; + version = "1.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TxODQC/8iTEZdL2BDe4iADrvSvDzEqD9tVd4MzrRq/c="; + hash = "sha256-eRkew/6/syvP/s1m8qfdVhvVcTRepLzL9BzB+1wGgv8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix index a8fd2503db..1806752e60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "social-auth-app-django"; - version = "5.4.0"; + version = "5.4.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "python-social-auth"; repo = "social-app-django"; rev = "refs/tags/${version}"; - hash = "sha256-CZF1DA4UUnmGfdmWlBJ0zJIYx1E03a7Z7Y6WJNFU68M="; + hash = "sha256-BvPQo0pXffGYu0tpy5yHT9lJVwOTewBiX5GLeezBrhE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/social-auth-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-core/default.nix index ecdd7782e4..2417de9daf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/social-auth-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-core/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "social-auth-core"; - version = "4.5.3"; + version = "4.5.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "python-social-auth"; repo = "social-core"; rev = "refs/tags/${version}"; - hash = "sha256-bnPn9roMjOfF2pa1GfCZTnDK0Sfu+umGS0H0PhppKBc="; + hash = "sha256-tFaRvNoO5K7ytqMhL//Ntasc7jb4PYXB1yyjFvFqQH8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix index 8ce880889d..02e38fcc37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.1.11"; + version = "6.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "softlayer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-2iN3T58aICQlGwr10/e/mWE9pA4rbJCBTE1jTu3GeGk="; + hash = "sha256-kOElL6VtHrtbA0lNAnDOC6VPX1mC7Rvk5x6N5x2Z1B0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix index ffba0140be..f63ea26d5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix @@ -13,21 +13,21 @@ buildPythonPackage rec { pname = "solax"; - version = "3.0.5"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-PQ7qJCNfXGNF2RK6pHwf0U1DXgv2j2uQ64Nv/qh8f8s="; + hash = "sha256-vc1NAbcQQxjpXnjZvTsnebzMc/LoMwBveDHBxBbhnEo="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout voluptuous diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soundcloud-v2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soundcloud-v2/default.nix index a5c6a4faa5..d1df08cf90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soundcloud-v2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soundcloud-v2/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Python wrapper for the v2 SoundCloud API"; homepage = "https://github.com/7x11x13/soundcloud.py"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix index 783469c277..34e413c21a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix @@ -38,6 +38,5 @@ buildPythonPackage rec { description = "Play and Record Sound with Python"; homepage = "http://python-sounddevice.rtfd.org/"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix index 01e41ebd2e..3a0193028c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix @@ -37,6 +37,5 @@ buildPythonPackage rec { description = "An audio library based on libsndfile, CFFI and NumPy"; license = lib.licenses.bsd3; homepage = "https://github.com/bastibe/python-soundfile"; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix index c9e1f3400f..f2b4bfb3a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pytest, spacy_models }: +{ stdenv, pytest, spacy-models }: stdenv.mkDerivation { name = "spacy-transformers-annotation-test"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { dontBuild = true; doCheck = true; - nativeCheckInputs = [ pytest spacy_models.en_core_web_trf ]; + nativeCheckInputs = [ pytest spacy-models.en_core_web_trf ]; checkPhase = '' pytest annotate.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix index ea4172d779..bdff12f84e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix @@ -1,42 +1,57 @@ { lib , callPackage -, fetchPypi , buildPythonPackage -, pythonRelaxDepsHook -, torch , pythonOlder +, fetchFromGitHub +, setuptools +, cython +, pythonRelaxDepsHook , spacy -, spacy-alignments -, srsly +, numpy , transformers +, torch +, srsly +, spacy-alignments +, pytestCheckHook }: buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.3.4"; - format = "setuptools"; + version = "1.3.5"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-N2StqGUqOYS9mW/DAeSntNg3kii+UPdTUHDV7g1Hvus="; + src = fetchFromGitHub { + owner = "explosion"; + repo = "spacy-transformers"; + rev = "refs/tags/v${version}"; + hash = "sha256-+KCRbjY4P52SWawU1NoMoe+HOV7iujFkwqVe87fWVTE="; }; + build-system = [ + setuptools + cython + ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - propagatedBuildInputs = [ - torch + dependencies = [ spacy - spacy-alignments - srsly + numpy transformers + torch + srsly + spacy-alignments + ]; + + nativeCheckInputs = [ + pytestCheckHook ]; pythonRelaxDeps = [ - "spacy" "transformers" ]; @@ -54,6 +69,6 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/spacy-transformers"; changelog = "https://github.com/explosion/spacy-transformers/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/default.nix index c7d5efe866..91ab0f33ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pytest, spacy_models }: +{ stdenv, pytest, spacy-models }: stdenv.mkDerivation { name = "spacy-annotation-test"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { dontBuild = true; doCheck = true; - nativeCheckInputs = [ pytest spacy_models.en_core_web_sm ]; + nativeCheckInputs = [ pytest spacy-models.en_core_web_sm ]; checkPhase = '' pytest annotate.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix index fa1c101ecb..32b78f40cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -5,6 +5,7 @@ , callPackage , catalogue , cymem +, cython_0 , fetchPypi , hypothesis , jinja2 @@ -57,6 +58,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook + cython_0 ]; propagatedBuildInputs = [ @@ -123,7 +125,7 @@ buildPythonPackage rec { nix-update python3Packages.spacy # update spacy models as well - echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm + echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy-models.en_core_web_sm ''; tests.annotation = callPackage ./annotation-test { }; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/speechrecognition/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/speechrecognition/default.nix index a6e839ead5..8629af8a07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/speechrecognition/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/speechrecognition/default.nix @@ -1,19 +1,20 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, numpy -, pytestCheckHook -, pythonOlder -, torch -, requests -, setuptools -, soundfile -, typing-extensions +{ + lib, + buildPythonPackage, + fetchFromGitHub, + numpy, + pytestCheckHook, + pythonOlder, + torch, + requests, + setuptools, + soundfile, + typing-extensions, }: buildPythonPackage rec { pname = "speechrecognition"; - version = "3.10.3"; + version = "3.10.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,12 +23,10 @@ buildPythonPackage rec { owner = "Uberi"; repo = "speech_recognition"; rev = "refs/tags/${version}"; - hash = "sha256-g2DE3u2nuJHqWA2X8S6zw5nUVS1yvSqO0VI3zKoIUgg="; + hash = "sha256-icXZUg2lVLo8Z5t9ptDj67BjQLnEgrG8geYZ/lZeJt4="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ requests @@ -41,9 +40,7 @@ buildPythonPackage rec { soundfile ]; - pythonImportsCheck = [ - "speech_recognition" - ]; + pythonImportsCheck = [ "speech_recognition" ]; disabledTests = [ # Test files are missing in source @@ -57,7 +54,11 @@ buildPythonPackage rec { meta = with lib; { description = "Speech recognition module for Python, supporting several engines and APIs, online and offline"; homepage = "https://github.com/Uberi/speech_recognition"; - license = with licenses; [ gpl2Only bsd3 ]; + changelog = "https://github.com/Uberi/speech_recognition/releases/tag/${version}"; + license = with licenses; [ + gpl2Only + bsd3 + ]; maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix index 2939ab5198..5255fedd04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "spglib"; - version = "2.3.1"; + version = "2.4.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-c24l7GfCIMsg+rcBfE/mOC7t7iIwdtV/QEc0KxvGjOM="; + hash = "sha256-bmP57mG3DxU6ItO1ULGD2lMfiQR1kX/OIDutRZeqwkM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autoapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autoapi/default.nix index ca80a717ba..f10e8be83d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -53,6 +53,8 @@ buildPythonPackage rec { # failing typing assertions "test_integration" "test_annotations" + # sphinx.errors.SphinxWarning: cannot cache unpickable configuration value: 'autoapi_prepare_jinja_env' (because it contains a function, class, or module object) + "test_custom_jinja_filters" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix index d4ad4cedab..50189474d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -1,21 +1,32 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub + +# build-system , flit-core + +# dependencies , colorama , sphinx -, livereload +, starlette +, uvicorn +, watchfiles +, websockets + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "sphinx-autobuild"; - version = "2024.2.4"; + version = "2024.04.16"; pyproject = true; - src = fetchPypi { - pname = "sphinx_autobuild"; - inherit version; - hash = "sha256-y50hIaF21i1FRxYkhyr8X613Va1mJzir5ADs9KeVQwM="; + src = fetchFromGitHub { + owner = "sphinx-doc"; + repo = "sphinx-autobuild"; + rev = "refs/tags/${version}"; + hash = "sha256-5HgRqt2ZTGcQ6X2sZN0gRfahmwlqpDbae5gOnGa02L0="; }; build-system = [ @@ -25,11 +36,15 @@ buildPythonPackage rec { dependencies = [ colorama sphinx - livereload + starlette + uvicorn + watchfiles + websockets ]; - # No tests included. - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "sphinx_autobuild" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index e5bba673e4..45ef02367f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "2.0.0"; + version = "2.1.0"; in buildPythonPackage { @@ -22,7 +22,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-fyzawucP2Xh5Jrbp5UHNTe0eg40rRv2iobsKdexbfzo="; + hash = "sha256-Ub+Nx3xPunR+MvBzUAKpFQB0fQVTyuYWhjhI6PXkn+g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix index 7c951f697b..ce8ce4e226 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-book-theme"; changelog = "https://github.com/executablebooks/sphinx-book-theme/raw/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-codeautolink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-codeautolink/default.nix index e7defb682d..6b024d4fd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-codeautolink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-codeautolink/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sphinx-codeautolink"; - version = "0.15.0"; + version = "0.15.1"; format = "pyproject"; outputs = [ "out" "doc" ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "felix-hilden"; repo = "sphinx-codeautolink"; rev = "refs/tags/v${version}"; - hash = "sha256-iXUdOwyTRViDTDRPCcteiJ2Rcdbpiol7JPEzqbUwIPc="; + hash = "sha256-BnGcLAM/KK8Ub+GmRY1oatUCyP4hvY2O1WTjLHBebpw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-comments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-comments/default.nix index 77f5b79519..03a6461174 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-comments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-comments/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Add comments and annotation to your documentation"; homepage = "https://github.com/executablebooks/sphinx-comments"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix index ad109b1d30..49883dc657 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-design"; changelog = "https://github.com/executablebooks/sphinx-design/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-external-toc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-external-toc/default.nix index 724877795f..fa676391da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-external-toc"; changelog = "https://github.com/executablebooks/sphinx-external-toc/raw/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-intl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-intl/default.nix index 1fdf937ae6..0e719aaa6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-intl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-intl/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "sphinx-intl"; - version = "2.1.0"; - format = "setuptools"; + version = "2.2.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "sphinx-doc"; repo = pname; rev = version; - hash = "sha256-U/YCviGrsZNruVzfP0P2dGcB0K0Afh+XUZtp71OeP6c="; + hash = "sha256-4sFKrUSk8DqPbEM+Q3cRijXyxRSIdkIEAI/mAmB0wB0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix index 592151eccc..9918f80f6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix @@ -12,6 +12,7 @@ , sphinx-external-toc , sphinxcontrib-bibtex , texsoup +, defusedxml }: buildPythonPackage rec { @@ -47,6 +48,7 @@ buildPythonPackage rec { sphinx-external-toc sphinxcontrib-bibtex texsoup + defusedxml ]; meta = with lib; { @@ -54,6 +56,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-jupyterbook-latex"; changelog = "https://github.com/executablebooks/sphinx-jupyterbook-latex/raw/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix index 3c2940a0ad..22030c9787 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-multitoc-numbering"; changelog = "https://github.com/executablebooks/sphinx-multitoc-numbering/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix index 7bc41418fe..e89183641e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -4,6 +4,7 @@ , flit-core , pytest , sphinx +, defusedxml , pytestCheckHook }: @@ -36,6 +37,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + defusedxml pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index 1e8e0cd4b1..61e443333b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -40,6 +40,11 @@ buildPythonPackage rec { readthedocs-sphinx-ext ]; + disabledTests = [ + # docutils 0.21 compat + "test_basic" + ]; + pythonRelaxDeps = [ "docutils" "sphinxcontrib-jquery" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix index 9b8e3246af..a9d3f78c06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-thebe"; changelog = "https://github.com/executablebooks/sphinx-thebe/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix index 3b3e146b98..7416e7d15e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Toggle page content and collapse admonitions in Sphinx"; homepage = "https://github.com/executablebooks/sphinx-togglebutton"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix index 43b7ebcd99..6608cbfff5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix @@ -1,14 +1,13 @@ { lib , buildPythonPackage -, pythonAtLeast , pythonOlder , fetchFromGitHub , isPyPy -# nativeBuildInputs +# build-system , flit-core -# propagatedBuildInputs +# dependencies , babel , alabaster , docutils @@ -26,8 +25,10 @@ , sphinxcontrib-qthelp , sphinxcontrib-serializinghtml , sphinxcontrib-websupport +, tomli # check phase +, defusedxml , filelock , html5lib , pytestCheckHook @@ -36,7 +37,7 @@ buildPythonPackage rec { pname = "sphinx"; - version = "7.2.6"; + version = "7.3.7"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -51,14 +52,14 @@ buildPythonPackage rec { mv tests/roots/test-images/{testimäge,testimæge}.png sed -i 's/testimäge/testimæge/g' tests/{test_build*.py,roots/test-images/index.rst} ''; - hash = "sha256-IjpRGeGpGfzrEvwIKtuu2l1S74w8W+AbqDOGnWwtRck="; + hash = "sha256-XGGRWEvd1SbQsK8W5yxDzBd5hlvXcDzr8t5Qa6skH/M="; }; - nativeBuildInputs = [ + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ alabaster babel docutils @@ -76,6 +77,8 @@ buildPythonPackage rec { sphinxcontrib-serializinghtml # extra[docs] sphinxcontrib-websupport + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; @@ -83,6 +86,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ + defusedxml filelock html5lib pytestCheckHook @@ -110,6 +114,8 @@ buildPythonPackage rec { "test_decorators" # requires cython_0, but fails miserably on 3.11 "test_cython" + # Could not fetch remote image: http://localhost:7777/sphinx.png + "test_copy_images" ] ++ lib.optionals isPyPy [ # PyPy has not __builtins__ which get asserted # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous @@ -122,9 +128,6 @@ buildPythonPackage rec { "test_isattributedescriptor" "test_methoddescriptor" "test_partialfunction" - ] ++ lib.optionals (pythonAtLeast "3.12") [ - # https://github.com/sphinx-doc/sphinx/issues/12202 (Fixed in 7.3) - "test_enum_class" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 240e51c724..4d73733104 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.5.1"; + version = "2.5.2"; format = "pyproject"; src = fetchPypi { pname = "sphinxcontrib_confluencebuilder"; inherit version; - hash = "sha256-PQpkwQ95UVJwDGTAq1xdcSvd07FZpZfA/4jq3ywlMas="; + hash = "sha256-FwjjlMTIhAD/v4Ig+uqrJJybdPqpPG+7OMuJwSqWo84="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix index fef662c85d..0ca9fad7b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , flit-core +, defusedxml , pytestCheckHook , sphinx }: @@ -42,6 +43,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + defusedxml pytestCheckHook sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index fb44f8ce34..a52ebdd83d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; - version = "0.4.18"; + version = "0.4.19"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-+IQV2uoKqAGQzq0te6z7vi+NnvQGZ0Sb7XjhdT05Tzo="; + hash = "sha256-gen+bH4NvEbxnxr5HStisB1BqyKIS4n1VoHyAK4mXUk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix index fb28f0bf62..edefde907e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -15,6 +15,7 @@ , nbconvert , numpy , numpydoc +, pickleshare , psutil , pygments , pylint-venv @@ -33,6 +34,7 @@ , rope , rtree , scipy +, setuptools , spyder-kernels , textdistance , three-merge @@ -41,25 +43,26 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.5.3"; - format = "setuptools"; + version = "5.5.4"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-i3OEKbiELfEmgff3EQfr6xGc74f1kMx1e+PbbXprkis="; + hash = "sha256-UiIyoFREfd3gV0uhSgZ8TVFQiP3yprrBZDOm3+8Dge0="; }; patches = [ ./dont-clear-pythonpath.patch ]; - nativeBuildInputs = [ + build-system = [ pyqtwebengine.wrapQtAppsHook + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ atomicwrites chardet cloudpickle @@ -73,6 +76,7 @@ buildPythonPackage rec { nbconvert numpy numpydoc + pickleshare psutil pygments pylint-venv diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spylls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spylls/default.nix new file mode 100644 index 0000000000..99f2a8031e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/spylls/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi + +, pythonOlder + +, poetry-core +}: + +buildPythonPackage rec { + pname = "spylls"; + version = "0.1.7"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-cEWJLcvTJNNoX2nFp2AGPnj7g5kTckzhgHfPCgyT8iA="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail poetry.masonry.api poetry.core.masonry.api \ + --replace-fail "poetry>=" "poetry-core>=" + ''; + + build-system = [ + poetry-core + ]; + + # no unit tests in source distribution... + doCheck = false; + + pythonImportsCheck = [ + "spylls.hunspell" + "spylls.hunspell.readers" + "spylls.hunspell.data" + "spylls.hunspell.algo.capitalization" + "spylls.hunspell.algo.trie" + "spylls.hunspell.algo.ngram_suggest" + "spylls.hunspell.algo.phonet_suggest" + "spylls.hunspell.algo.permutations" + "spylls.hunspell.algo.string_metrics" + ]; + + meta = with lib; { + description = "Pure Python spell-checker, (almost) full port of Hunspell"; + homepage = "https://github.com/zverok/spylls"; + changelog = "https://github.com/zverok/spylls/blob/master/CHANGELOG.rst"; + license = licenses.mpl20; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 1ace2eab95..8b0a1a3747 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -38,23 +38,17 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.41.1"; + version = "0.41.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - hash = "sha256-ohgb/wHuuER544Vx0sBxjrUgQvmv2MGU0NAod+hLfXQ="; + hash = "sha256-vFmcjDszGeU85sXDxHESC9Ml0AcftvOKEOkk49B7mZA="; }; patches = [ ./skip-database-tests.patch - - (fetchpatch { - # sqlalchemy 2.0.22+ compat; https://github.com/kvesteri/sqlalchemy-utils/pull/725 - url = "https://github.com/kvesteri/sqlalchemy-utils/commit/712aabaefc5c8ca3680751c705cf5a5984c74af1.patch"; - hash = "sha256-xBdiUtFWjlUhBzHgGFbaKBt3at6NDo+mv9sd8WwiPOA="; - }) ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index ae1f22b4c2..aa557ca555 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.29"; + version = "2.0.30"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-jEkuvwq/KKjcsREWDvvTFT87kgu3TSBR3JaseOs54qc="; + hash = "sha256-l6VxBK4RT/sAFkz3g633MrfQH9Bvp/JE12mdtqjsxd8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlbag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlbag/default.nix index 8b21d89ad5..8ff8305b4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlbag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlbag/default.nix @@ -1,11 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 , psycopg2 , pymysql , sqlalchemy -, pathlib , six , flask , pendulum @@ -17,7 +15,6 @@ , pytest-sugar , postgresql , postgresqlTestHook -, }: buildPythonPackage rec { pname = "sqlbag"; @@ -46,8 +43,7 @@ buildPythonPackage rec { pymysql setuptools # needed for 'pkg_resources' - ] - ++ lib.optional isPy27 pathlib; + ]; nativeCheckInputs = [ pytestCheckHook @@ -91,5 +87,6 @@ buildPythonPackage rec { homepage = "https://github.com/djrobstep/sqlbag"; license = with licenses; [ unlicense ]; maintainers = with maintainers; [ soispha ]; + broken = true; # Fails to build against the current flask version }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix index 7eb9ee70ec..c25a2c10bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqlglot"; - version = "21.1.1"; + version = "23.12.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "sqlglot"; owner = "tobymao"; rev = "refs/tags/v${version}"; - hash = "sha256-xMKDkhotVBkLzn+f9RMGCPfWTF4Rz9a193nSJv5z+iA="; + hash = "sha256-VUG/l1iZ/8vAJwhktN/tx8U8KVLgaghUPArtxEyIA54="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-anyio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-anyio/default.nix new file mode 100644 index 0000000000..80926de7f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-anyio/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + hatchling, + anyio, + pytestCheckHook, + trio, +}: + +buildPythonPackage rec { + pname = "sqlite-anyio"; + version = "0.2.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "davidbrochart"; + repo = "sqlite-anyio"; + rev = "refs/tags/v${version}"; + hash = "sha256-6khHta7Rzp3g8G/xZnsNZuURFB35JyHz04NTzNJIiBw="; + }; + + build-system = [ hatchling ]; + + dependencies = [ anyio ]; + + pythonImportsCheck = [ "sqlite_anyio" ]; + + nativeCheckInputs = [ + pytestCheckHook + trio + ]; + + meta = with lib; { + description = "Asynchronous client for SQLite using AnyIO"; + homepage = "https://github.com/davidbrochart/sqlite-anyio"; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 9771771c8d..08a23ed4f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.8.4"; + version = "1.8.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zTFdGDzvPlNebsepPxXn2++22YANlDu82yprs7eHfac="; + hash = "sha256-ADs0Tfd8iR1OSGkV7pFdRw0RDHbxk6Ztje1AvSIdWqI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlmodel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlmodel/default.nix index 8e657920df..55bf943264 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlmodel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlmodel/default.nix @@ -1,19 +1,20 @@ -{ lib -, buildPythonPackage -, dirty-equals -, fastapi -, fetchFromGitHub -, poetry-core -, pydantic -, pytest-asyncio -, pytest7CheckHook -, pythonOlder -, sqlalchemy +{ + lib, + buildPythonPackage, + dirty-equals, + fastapi, + fetchFromGitHub, + pdm-backend, + pydantic, + pytest-asyncio, + pytest7CheckHook, + pythonOlder, + sqlalchemy, }: buildPythonPackage rec { pname = "sqlmodel"; - version = "0.0.16"; + version = "0.0.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,12 +23,10 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "sqlmodel"; rev = "refs/tags/${version}"; - hash = "sha256-hDJcekn0ExYUCs8kBZkJzsWqXsB/cI6RbW3EhRCCioM="; + hash = "sha256-2ens+wEFJThccBTBeBy8j1AzKJtebg3dJTGG6+Cpt+Q="; }; - build-system = [ - poetry-core - ]; + build-system = [ pdm-backend ]; dependencies = [ pydantic @@ -41,9 +40,7 @@ buildPythonPackage rec { pytest7CheckHook ]; - pythonImportsCheck = [ - "sqlmodel" - ]; + pythonImportsCheck = [ "sqlmodel" ]; disabledTests = [ # AssertionError: assert 'enum_field VARCHAR(1) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix index c0afa5eeb7..2e63191e03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, flit-core +, hatchling , installShellFiles , pytestCheckHook -, isPy3k +, pythonOlder # for passthru.tests , django @@ -15,18 +15,19 @@ buildPythonPackage rec { pname = "sqlparse"; - version = "0.4.4"; + version = "0.5.0"; + pyproject = true; - disabled = !isPy3k; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-1EYYPoS4NJ+jBh8P5/BsqUumW0JpRv/r5uPoKVMyQgw="; + hash = "sha256-cU0KSTLAWdFhifWO9UEewih6Q2DxfN0O3S0J1MUIfJM="; }; - format = "pyproject"; + build-system = [ hatchling ]; - nativeBuildInputs = [ flit-core installShellFiles ]; + nativeBuildInputs = [ installShellFiles ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -40,11 +41,12 @@ buildPythonPackage rec { meta = with lib; { description = "Non-validating SQL parser for Python"; - mainProgram = "sqlformat"; longDescription = '' Provides support for parsing, splitting and formatting SQL statements. ''; homepage = "https://github.com/andialbrecht/sqlparse"; + changelog = "https://github.com/andialbrecht/sqlparse/blob/${version}/CHANGELOG"; license = licenses.bsd3; + mainProgram = "sqlformat"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix deleted file mode 100644 index d75621cc63..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ buildPythonPackage, fetchPypi, lib, sqlalchemy, nose }: - -buildPythonPackage rec { - pname = "sqlsoup"; - version = "0.9.1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "1mj00fhxj75ac3i8xk9jmm7hvcjz9p4x2r3yndcwsgb659rvgbrg"; - }; - - propagatedBuildInputs = [ sqlalchemy ]; - nativeCheckInputs = [ nose ]; - - meta = with lib; { - description = "A one step database access tool, built on the SQLAlchemy ORM"; - homepage = "https://github.com/zzzeek/sqlsoup"; - license = licenses.mit; - maintainers = []; - broken = true; # incompatible with sqlalchemy>=1.4 and unmaintained since 2016 - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ssg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ssg/default.nix new file mode 100644 index 0000000000..53fbbb0f38 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ssg/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + + python3, + unittestCheckHook, + setuptools, + + fire, + python-crfsuite, + tqdm, +}: + +buildPythonPackage { + pname = "ssg"; + version = "0.0.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ponrawee"; + repo = "ssg"; + rev = "d1b811ef4f8ac08ba1db839f426ba6b6a8e0eb38"; + hash = "sha256-GBZzVDDfKOTnbcrIxhFRiNHXN2pSNU3T9RvUytJ068w="; + }; + + patches = [ + (fetchpatch { + name = "fix-deprecation-warnings-and-bump-version"; + url = "https://patch-diff.githubusercontent.com/raw/ponrawee/ssg/pull/10.patch"; + hash = "sha256-4O1fpI0FBUG/3RN+PAi7I8vpgYmPPL5ZMXhoZUFsQy8="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ + fire + python-crfsuite + tqdm + ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "ssg" ]; + + postInstall = "rm -rf $out/${python3.sitePackages}/scripts"; + + meta = with lib; { + description = "TCRF syllable segmenter for Thai"; + homepage = "https://github.com/ponrawee/ssg"; + license = licenses.asl20; + maintainers = with maintainers; [ vizid ]; + mainProgram = "ssg-cli"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix index 37eb7a94e1..a014d59b38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "sshfs"; - version = "2023.10.0"; + version = "2024.4.1"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "sshfs"; rev = "refs/tags/${version}"; - hash = "sha256-6MueDHR+jZFDZg4zufEVhBtSwcgDd7KnW9gJp2hDu0A="; + hash = "sha256-qkEojf/3YBMoYbRt0Q93MJYXyL9AWR24AEe3/zdn58U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix index d6cbacf3ab..a3fe6964f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix @@ -3,39 +3,33 @@ , cython , executing , fetchFromGitHub -, git , lib , littleutils , pure-eval , pygments , pytestCheckHook , setuptools-scm -, toml , typeguard +, setuptools +, wheel }: buildPythonPackage rec { pname = "stack-data"; - version = "0.2.0"; - format = "setuptools"; + version = "0.6.3"; + pyproject = true; src = fetchFromGitHub { owner = "alexmojaki"; repo = "stack_data"; - rev = "v${version}"; - hash = "sha256-brXFrk1UU5hxCVeRvGK7wzRA0Hoj9fgqoxTIwInPrEc="; + rev = "refs/tags/v${version}"; + hash = "sha256-dmBhfCg60KX3gWp3k1CGRxW14z3BLlair0PjLW9HFYo="; }; - nativeBuildInputs = [ - git + build-system = [ + setuptools setuptools-scm - toml - ]; - - propagatedBuildInputs = [ - asttokens - executing - pure-eval + wheel ]; nativeCheckInputs = [ @@ -46,9 +40,11 @@ buildPythonPackage rec { typeguard ]; - # https://github.com/alexmojaki/stack_data/issues/50 - # incompatible with typeguard>=3 - doCheck = false; + dependencies = [ + asttokens + executing + pure-eval + ]; disabledTests = [ # AssertionError @@ -63,7 +59,9 @@ buildPythonPackage rec { meta = with lib; { description = "Extract data from stack frames and tracebacks"; homepage = "https://github.com/alexmojaki/stack_data/"; + changelog = "https://github.com/alexmojaki/stack_data/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; + mainProgram = "stack-data"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix index def0517d86..0f7d7fddac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "stanza"; - version = "1.8.1"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "stanfordnlp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MO9trPkemVDzlVrO6v6N27RY2SNwflj+XlUrB1NqFGc="; + hash = "sha256-twgMWKWUvhnGNqQ42MOptnikdSBiDFpiMCI2RPo+3XU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/starlette-wtf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/starlette-wtf/default.nix index 3ca744a71f..bacbbb0a1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/starlette-wtf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/starlette-wtf/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "starlette-wtf"; - version = "0.4.3"; + version = "0.4.5"; format = "pyproject"; src = fetchFromGitHub { owner = "muicss"; repo = "starlette-wtf"; - rev = "v${version}"; - hash = "sha256-TSxcIgINRjQwiyhpGOEEpXJKcPlhFCxMQh4/GY1g1lw="; + rev = "refs/tags/${version}"; + hash = "sha256-88zU2NAsdty2OhHauwQ5+6LazuRDYPoqN9IIipI1t2Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix index bab094f39e..24dc020859 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix @@ -3,37 +3,39 @@ , cython , fetchPypi , numpy -, oldest-supported-numpy , packaging , pandas , patsy -, pythonAtLeast , pythonOlder , scipy , setuptools , setuptools-scm +, stdenv }: buildPythonPackage rec { pname = "statsmodels"; - version = "0.14.1"; + version = "0.14.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ImDv3B74nznGcKC9gVGx0IQ1Z3gbyv7GzaBTTrR6lPY="; + hash = "sha256-iQVQFHrTqBzaJPC6GlxAIa3BYBCAvQDhka581v7s1q0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0.0rc1,<3" "numpy" + ''; + build-system = [ cython - oldest-supported-numpy + numpy scipy setuptools setuptools-scm - ] ++ lib.optionals (pythonAtLeast "3.12") [ - numpy ]; dependencies = [ @@ -56,6 +58,7 @@ buildPythonPackage rec { homepage = "https://www.github.com/statsmodels/statsmodels"; changelog = "https://github.com/statsmodels/statsmodels/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; + # Fails at build time + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix index 7d9dc7564a..bebab6f59d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , setuptools , cryptography , mock @@ -23,6 +24,14 @@ buildPythonPackage rec { hash = "sha256-Oc73Jx31SLzuhT9Iym5HHszKfflKZ+3aky5flXudvmI="; }; + patches = [ + # fixes deprecated test assertion, assertRaisesRegexp in python 3 + (fetchpatch { + url = "https://github.com/trishtzy/stem/commit/d5012a1039f05c69ebe832723ce96ecbe8f79fe1.patch"; + hash = "sha256-ozOTx4/c86sW/9Ss5eZ6ZxX63ByJT5x7JF6wBBd+VFY="; + }) + ]; + nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stim/default.nix index 3e95b74ef9..ca76e41880 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stim/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { postPatch = '' # asked to relax this in https://github.com/quantumlib/Stim/issues/623 substituteInPlace pyproject.toml \ - --replace "pybind11==" "pybind11>=" + --replace-quiet "pybind11~=" "pybind11>=" ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stix2-patterns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stix2-patterns/default.nix index b291e2cd72..4ca5ee040a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stix2-patterns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stix2-patterns/default.nix @@ -1,12 +1,12 @@ -{ lib -, antlr4-python3-runtime -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools -, pytestCheckHook -, wheel -, six +{ + lib, + antlr4-python3-runtime, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + six, }: buildPythonPackage rec { @@ -25,26 +25,19 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "antlr4-python3-runtime~=" "antlr4-python3-runtime>=" + --replace-fail "antlr4-python3-runtime~=" "antlr4-python3-runtime>=" ''; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ antlr4-python3-runtime six ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "stix2patterns" - ]; + pythonImportsCheck = [ "stix2patterns" ]; disabledTestPaths = [ # Exception: Could not deserialize ATN with version (expected 4) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix index 888c98cd62..a2053f60ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix @@ -1,36 +1,39 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, mock -, ply -, pytestCheckHook -, six -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + mock, + ply, + pytestCheckHook, + pythonAtLeast, + pythonOlder, + setuptools, + six, }: buildPythonPackage rec { pname = "stone"; - version = "3.3.1"; - format = "setuptools"; + version = "3.3.3"; + pyproject = true; - disabled = pythonOlder "3.7"; + # distutils removal, https://github.com/dropbox/stone/issues/323 + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "dropbox"; - repo = pname; + repo = "stone"; rev = "refs/tags/v${version}"; - hash = "sha256-0FWdYbv+paVU3Wj6g9OrSNUB0pH8fLwTkhVIBPeFB/U="; + hash = "sha256-l86j2fd6x57bKt/TFGiyg+ZFjZFFCo43rE48MoPvXWc="; }; postPatch = '' - # https://github.com/dropbox/stone/issues/288 - substituteInPlace stone/frontend/ir_generator.py \ - --replace "inspect.getargspec" "inspect.getfullargspec" substituteInPlace setup.py \ - --replace "'pytest-runner == 5.2.0'," "" + --replace-fail "'pytest-runner == 5.3.2'," "" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ ply six ]; @@ -40,20 +43,14 @@ buildPythonPackage rec { mock ]; - disabledTests = [ - "test_type_name_with_module" - ]; - - pythonImportsCheck = [ - "stone" - ]; + pythonImportsCheck = [ "stone" ]; meta = with lib; { description = "Official Api Spec Language for Dropbox"; - mainProgram = "stone"; homepage = "https://github.com/dropbox/stone"; changelog = "https://github.com/dropbox/stone/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; + mainProgram = "stone"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/strct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strct/default.nix index 061e2a90c0..5148958b97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/strct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/strct/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , buildPythonPackage , setuptools , pytestCheckHook @@ -9,36 +8,26 @@ buildPythonPackage rec { pname = "strct"; - version = "0.0.32"; + version = "0.0.34"; pyproject = true; src = fetchFromGitHub { owner = "shaypal5"; repo = "strct"; rev = "v${version}"; - hash = "sha256-ctafvdfSOdp7tlCUYg7d5XTXR1qBcWvOVtGtNUnhYIw="; + hash = "sha256-uPM2U+emZUCGqEhIeTBmaOu8eSfK4arqvv9bItBWpUs="; }; - patches = [ - # https://github.com/shaypal5/strct/pull/4 - (fetchpatch { - name = "fix-versioneer-on-python312.patch"; - url = "https://github.com/shaypal5/strct/commit/a1e5b6ca9045b52efdfdbb3c82e12a01e251d41b.patch"; - hash = "sha256-xXADCSIhq1ARny2twzrhR1J8LkMFWFl6tmGxrM8RvkU="; - }) - ]; - postPatch = '' - substituteInPlace pytest.ini \ - --replace \ - "--cov" \ - "#--cov" - - # configure correct version, which fails due to missing .git - substituteInPlace versioneer.py strct/_version.py \ - --replace '"0+unknown"' '"${version}"' + substituteInPlace pyproject.toml \ + --replace-fail \ + '"--cov' \ + '#"--cov' ''; + # don't append .dev0 to version + env.RELEASING_PROCESS = "1"; + nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix index 7dc7395749..4b36ad61fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.33.0"; + version = "1.34.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-qNqP9G9blIxW0tx6ynphz42ZX08hdEz4IliudeYwBLo="; + hash = "sha256-E1o7eaaGsxMrc/IERQrW6IneBPM0nWkpJeCfDiHnS1I="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix index ff12abf47a..87a54da431 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix @@ -1,16 +1,18 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage -, confluent-kafka -, distributed -, fetchpatch +, pythonOlder , fetchPypi +, setuptools +, confluent-kafka +, dask +, dask-expr +, distributed , flaky , graphviz , networkx , pytest-asyncio , pytestCheckHook -, pythonOlder , requests , six , toolz @@ -21,7 +23,7 @@ buildPythonPackage rec { pname = "streamz"; version = "0.6.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +32,11 @@ buildPythonPackage rec { hash = "sha256-VXfWkEwuxInBQVQJV3IQXgGVRkiBmYfUZCBMbjyWNPM="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ networkx six toolz @@ -40,6 +46,8 @@ buildPythonPackage rec { nativeCheckInputs = [ confluent-kafka + dask + dask-expr distributed flaky graphviz diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix index b23e68aa2c..f13eef796b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "8.9.0"; + version = "9.5.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-cffBvdoPPlaKop0nWRChSDQRWliuIesEebOyZ0WHXQ4="; + hash = "sha256-zTg2lkGuYUDhzp7c1UAK7NsaELpwTmU6Lyp1UMuPJ34="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/succulent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/succulent/default.nix index 74d369acef..f3d90ec52a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/succulent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/succulent/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , flask +, lxml , pandas , pyyaml , poetry-core @@ -9,14 +10,15 @@ , pythonRelaxDepsHook , pythonOlder , toml-adapt +, xmltodict }: buildPythonPackage rec { pname = "succulent"; version = "0.3.3"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "firefly-cpp"; @@ -27,7 +29,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "flask" - "pandas" ]; nativeBuildInputs = [ @@ -37,8 +38,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask + lxml pandas pyyaml + xmltodict ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix index 17aa79c340..88a803fa46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "5.1.1"; + version = "5.1.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-k2fsmvKjl/zVljiyAHII1O6vntJOPo3CWWwmsYlsLh8="; + hash = "sha256-1/oz2Ir1K7nR6B2TPZzSjbyiADyQyRlzE9KqTg7EwkA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix index e7c3aaa045..a54f3df4a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix @@ -1,44 +1,66 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools-scm -, pyqt5 -, qtpy -, typing-extensions -, pytestCheckHook -, pygments +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatch-vcs, + hatchling, + pint, + pygments, + pyqt5, + pyqt6, + pyside2, + pyside6, + pytestCheckHook, + pythonOlder, + qtpy, + typing-extensions, }: buildPythonPackage rec { pname = "superqt"; - version = "0.3.8"; - format = "pyproject"; + version = "0.6.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "napari"; - repo = pname; + owner = "pyapp-kit"; + repo = "superqt"; rev = "refs/tags/v${version}"; - hash = "sha256-zEMG2zscGDlRxtLn/lUTEjZBPabcwzMcj/kMcy3yOs8="; + hash = "sha256-AJXX460sm0rrimizkiBIjYFRtWbscEjlwo5ZLcgjzcA="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + hatch-vcs + hatchling + ]; - propagatedBuildInputs = [ + dependencies = [ + pygments pyqt5 qtpy typing-extensions - pygments ]; + passthru.optional-dependencies = { + quantity = [ pint ]; + pyside2 = [ pyside2 ]; + pyside6 = [ pyside6 ]; + pyqt6 = [ pyqt6 ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; - doCheck = false; # Segfaults... + # Segmentation fault + doCheck = false; - pythonImportsCheck = [ "superqt" ]; + # Segmentation fault + # pythonImportsCheck = [ "superqt" ]; meta = with lib; { description = "Missing widgets and components for Qt-python (napari/superqt)"; homepage = "https://github.com/napari/superqt"; + changelog = "https://github.com/pyapp-kit/superqt/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ SomeoneSerge ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix index d2a1049215..1954f8bc59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix @@ -3,6 +3,9 @@ , fetchPypi , glibcLocales , mpmath + +# Reverse dependency +, sage }: buildPythonPackage rec { @@ -27,6 +30,8 @@ buildPythonPackage rec { export LANG="en_US.UTF-8" ''; + passthru.tests = { inherit sage; }; + meta = with lib; { description = "A Python library for symbolic mathematics"; mainProgram = "isympy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix index 679f8df115..66388b2856 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "tablib"; - version = "3.5.0"; + version = "3.6.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9mYd/EXh1PUfqKYjn5yDSTgIWaW/qnMoBkXwRtbJbjM="; + hash = "sha256-BAaF/eEekjdnX0Pphe25S2MlCl6SNvidVhzm+xRluDk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix index bdc31012cf..4556443136 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix @@ -1,20 +1,21 @@ -{ lib -, buildPythonPackage -, distro -, fetchFromGitHub -, jre -, numpy -, pandas -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-scm -, jpype1 +{ + lib, + buildPythonPackage, + distro, + fetchFromGitHub, + jre, + numpy, + pandas, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, + jpype1, }: buildPythonPackage rec { pname = "tabula-py"; - version = "2.9.0"; + version = "2.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,37 +24,31 @@ buildPythonPackage rec { owner = "chezou"; repo = "tabula-py"; rev = "refs/tags/v${version}"; - hash = "sha256-MGv2n8DoSjumD3lRcqwI0sEsaEDgs1n+st8DwZuZauo="; + hash = "sha256-C06du4mhpnF2qxcEMZxp5O/8xpNaj9Jp8LFaxBkGF/Q="; }; postPatch = '' substituteInPlace tabula/backend.py \ - --replace '"java"' '"${lib.getExe jre}"' + --replace-fail '"java"' '"${lib.getExe jre}"' ''; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - buildInputs = [ - jre - ]; + buildInputs = [ jre ]; - propagatedBuildInputs = [ + dependencies = [ distro numpy pandas jpype1 ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "tabula" - ]; + pythonImportsCheck = [ "tabula" ]; disabledTests = [ # Tests require network access diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix index 87644ba519..9b1108481c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix @@ -38,6 +38,5 @@ buildPythonPackage rec { mainProgram = "tabulate"; homepage = "https://github.com/astanin/python-tabulate"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/taskw-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/taskw-ng/default.nix index 28c15922d2..15f6412831 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/taskw-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/taskw-ng/default.nix @@ -1,13 +1,16 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, poetry-dynamic-versioning -, kitchen -, packaging -, python-dateutil -, pytz -, taskwarrior +{ + lib, + buildPythonPackage, + fetchFromGitHub, + kitchen, + packaging, + poetry-core, + poetry-dynamic-versioning, + python-dateutil, + pythonOlder, + pythonRelaxDepsHook, + pytz, + taskwarrior, }: buildPythonPackage rec { @@ -15,23 +18,27 @@ buildPythonPackage rec { version = "0.2.6"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "bergercookie"; repo = "taskw-ng"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-tlidTt0TzWnvfajYiIfvRv7OfakHY6zWAicmAwq/Z8w="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'pytz = "^2023.3.post1"' 'pytz = "*"' - ''; + pythonRelaxDeps = [ + "packaging" + "pytz" + ]; - nativeBuildInputs = [ + build-system = [ poetry-core poetry-dynamic-versioning ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + propagatedBuildInputs = [ kitchen packaging @@ -39,18 +46,16 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ - taskwarrior - ]; + checkInputs = [ taskwarrior ]; # TODO: doesn't pass because `can_use` fails and `task --version` seems not to be answering. # pythonImportsCheck = [ "taskw_ng" ]; meta = with lib; { - description = ""; + description = "Module to interact with the Taskwarrior API"; homepage = "https://github.com/bergercookie/taskw-ng"; changelog = "https://github.com/bergercookie/taskw-ng/blob/${src.rev}/CHANGELOG.rst"; - license = licenses.gpl3Only; + license = licenses.gpl3Plus; maintainers = with maintainers; [ raitobezarius ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 14b7c5c2f8..4e9f41bfaf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1132"; + version = "3.0.1146"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-SMdevyChfbUMIY/KynIUE5T3bQAvD23QTW8lyA87kDE="; + hash = "sha256-4U+nI5DODPLgQXzzgZKVTZdKPVneUQVomsdpoQHRqdE="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensordict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensordict/default.nix index 6c64ca00c5..6dceda4236 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensordict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensordict/default.nix @@ -11,11 +11,12 @@ , h5py , pytestCheckHook , stdenv +, pythonAtLeast }: buildPythonPackage rec { pname = "tensordict"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,17 +25,17 @@ buildPythonPackage rec { owner = "pytorch"; repo = "tensordict"; rev = "refs/tags/v${version}"; - hash = "sha256-eCx1r7goqOdGX/0mSGCiLhdGQTh4Swa5aFiLSsL56p0="; + hash = "sha256-wKEzNaaazGEkoElzp93RIlq/r5uRUdM7UyDy/DygIEc="; }; - nativeBuildInputs = [ + build-system = [ setuptools torch wheel which ]; - propagatedBuildInputs = [ + dependencies = [ cloudpickle numpy torch @@ -72,5 +73,7 @@ buildPythonPackage rec { homepage = "https://github.com/pytorch/tensordict"; license = licenses.mit; maintainers = with maintainers; [ GaetanLepage ]; + # No python 3.12 support yet: https://github.com/pytorch/rl/issues/2035 + broken = pythonAtLeast "3.12"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix index e81e9736c2..769a4969fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -54,7 +54,7 @@ let LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; fetchAttrs = { - sha256 = "sha256-1iO/eXz1wvSIRTmGuGZDF9VeDVTiWYnjw0Cby4n/6HM="; + sha256 = "sha256-TbWcWYidyXuAMgBnO2/k0NKCzc4wThf2uUeC3QxdBJY="; }; buildAttrs = { @@ -75,7 +75,8 @@ let ''; }; }; -in buildPythonPackage { +in +buildPythonPackage { inherit version pname; format = "wheel"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix index 1040023619..65ca45f056 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix @@ -22,7 +22,7 @@ , tensorboard , config , cudaSupport ? config.cudaSupport -, cudaPackagesGoogle +, cudaPackages , zlib , python , keras-applications @@ -43,7 +43,7 @@ assert ! (stdenv.isDarwin && cudaSupport); let packages = import ./binary-hashes.nix; - inherit (cudaPackagesGoogle) cudatoolkit cudnn; + inherit (cudaPackages) cudatoolkit cudnn; in buildPythonPackage { pname = "tensorflow" + lib.optionalString cudaSupport "-gpu"; inherit (packages) version; @@ -199,10 +199,6 @@ in buildPythonPackage { "tensorflow.python.framework" ]; - passthru = { - cudaPackages = cudaPackagesGoogle; - }; - meta = with lib; { description = "Computation using data flow graphs for scalable machine learning"; homepage = "http://tensorflow.org"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index 069b87b76f..2c44b89aef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -1,7 +1,7 @@ { stdenv, bazel_5, buildBazelPackage, lib, fetchFromGitHub, symlinkJoin , addOpenGLRunpath, fetchpatch, fetchzip, linkFarm # Python deps -, buildPythonPackage, pythonOlder, python +, buildPythonPackage, pythonAtLeast, pythonOlder, python # Python libraries , numpy, tensorboard, abseil-cpp, absl-py , packaging, setuptools, wheel, keras-preprocessing, google-pasta @@ -19,8 +19,8 @@ # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 , config , cudaSupport ? config.cudaSupport -, cudaPackagesGoogle -, cudaCapabilities ? cudaPackagesGoogle.cudaFlags.cudaCapabilities +, cudaPackages +, cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities , mklSupport ? false, mkl , tensorboardSupport ? true # XLA without CUDA is broken @@ -50,15 +50,15 @@ let # __ZN4llvm11SmallPtrSetIPKNS_10AllocaInstELj8EED1Ev in any of the # translation units, so the build fails at link time stdenv = - if cudaSupport then cudaPackagesGoogle.backendStdenv + if cudaSupport then cudaPackages.backendStdenv else if originalStdenv.isDarwin then llvmPackages.stdenv else originalStdenv; - inherit (cudaPackagesGoogle) cudatoolkit nccl; + inherit (cudaPackages) cudatoolkit nccl; # use compatible cuDNN (https://www.tensorflow.org/install/source#gpu) # cudaPackages.cudnn led to this: # https://github.com/tensorflow/tensorflow/issues/60398 cudnnAttribute = "cudnn_8_6"; - cudnn = cudaPackagesGoogle.${cudnnAttribute}; + cudnn = cudaPackages.${cudnnAttribute}; gentoo-patches = fetchzip { url = "https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.12.0.tar.bz2"; hash = "sha256-SCRX/5/zML7LmKEPJkcM5Tebez9vv/gmE4xhT/jyqWs="; @@ -490,8 +490,8 @@ let broken = stdenv.isDarwin || !(xlaSupport -> cudaSupport) - || !(cudaSupport -> builtins.hasAttr cudnnAttribute cudaPackagesGoogle) - || !(cudaSupport -> cudaPackagesGoogle ? cudatoolkit); + || !(cudaSupport -> builtins.hasAttr cudnnAttribute cudaPackages) + || !(cudaSupport -> cudaPackages ? cudatoolkit); } // lib.optionalAttrs stdenv.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s @@ -500,7 +500,7 @@ let in buildPythonPackage { inherit version pname; - disabled = pythonOlder "3.8"; + disabled = pythonAtLeast "3.12"; src = bazel-build.python; @@ -594,7 +594,6 @@ in buildPythonPackage { # Regression test for #77626 removed because not more `tensorflow.contrib`. passthru = { - cudaPackages = cudaPackagesGoogle; deps = bazel-build.deps; libtensorflow = bazel-build.out; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix index fad5795a93..31317cd7b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -1,15 +1,16 @@ -{ lib -, aiohttp -, aiolimiter -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools +{ + lib, + aiohttp, + aiolimiter, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.5.6"; + version = "0.5.9"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,12 +19,10 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-dkxKC0WAgfDvUD9YktRrNCgXpw2+6apfsMVqStZICII="; + hash = "sha256-aDejd9UHGXkBa5xyCJaLOkT1A2cWmnx1rKJkXjjw0fc="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp @@ -31,11 +30,9 @@ buildPythonPackage rec { ]; # Module has no tests - doCheck =false; + doCheck = false; - pythonImportsCheck = [ - "tesla_fleet_api" - ]; + pythonImportsCheck = [ "tesla_fleet_api" ]; meta = with lib; { description = "Python library for Tesla Fleet API and Teslemetry"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix index 8b7ceb416b..975537d1fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.3.3"; + version = "4.4.1"; disabled = pythonOlder "3.9"; pyproject = true; @@ -20,14 +20,14 @@ buildPythonPackage rec { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-qb7mOtL+YJI24DOBgrqxc817k4fD2kTOtUNF2X0qEIc="; + hash = "sha256-osWppbptWpBSHcrHlAqNpn6j2n/qQ7iCobH3TVqB2bc="; }; postPatch = '' echo "${version}" > VERSION ''; - nativeBuildInputs = [ + build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textdistance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textdistance/default.nix index c362e936eb..9f386dc2bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textdistance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textdistance/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "textdistance"; - version = "4.6.1"; + version = "4.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JYllgBse+FaGppq/bDzv3F2iHC+9iMkMaHJfV6fUXyE="; + hash = "sha256-AeH7z3uHHrj0GRHZT0YbC5nPgAM4TuDhw0ylwaerLtA="; }; # There aren't tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix index e6a696dec9..4a125dd177 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix @@ -1,32 +1,34 @@ -{ lib -, buildPythonPackage -, cython -, fetchFromGitHub -, ply -, pythonOlder -, six -, tornado +{ + lib, + buildPythonPackage, + cython, + fetchFromGitHub, + ply, + pythonOlder, + six, + setuptools, + tornado, }: buildPythonPackage rec { pname = "thriftpy2"; - version = "0.4.20"; - format = "setuptools"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Thriftpy"; - repo = pname; + repo = "thriftpy2"; rev = "refs/tags/v${version}"; - hash = "sha256-IEYoSLaJUeQdwHaXR0UUlCZg5zBEh5Y2/IwB4RVEAcg="; + hash = "sha256-Pjy9OPwFfKaw+XVl7IbbAKPz050TlqI4+yLqSITOkSY="; }; - nativeBuildInputs = [ - cython - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ cython ]; + + dependencies = [ ply six tornado @@ -35,9 +37,7 @@ buildPythonPackage rec { # Not all needed files seems to be present doCheck = false; - pythonImportsCheck = [ - "thriftpy2" - ]; + pythonImportsCheck = [ "thriftpy2" ]; meta = with lib; { description = "Python module for Apache Thrift"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix index 8c3c2429dc..dcd27bffb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix @@ -1,42 +1,45 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchPypi -, python-dateutil -, poetry-core -, requests +{ + lib, + buildPythonPackage, + fetchPypi, + python-dateutil, + poetry-core, + requests, + isodate, + ratelimit, + typing-extensions, + mpegdash, }: - buildPythonPackage rec { pname = "tidalapi"; - version = "0.7.5"; - format = "pyproject"; + version = "0.7.6"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QzrIWQ7cWpPAu3+/zqAqX9eDWOF8F3Xj8Rt5D8I6h9M="; + hash = "sha256-X6U34T1sM4P+JFpOfcI7CmULcGZ4SCXwP2fFHKi1cWE="; }; - nativeBuildInputs = [ - poetry-core - ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ requests python-dateutil + mpegdash + isodate + ratelimit + typing-extensions ]; doCheck = false; # tests require internet access - pythonImportsCheck = [ - "tidalapi" - ]; + pythonImportsCheck = [ "tidalapi" ]; - meta = with lib; { + meta = { changelog = "https://github.com/tamland/python-tidal/releases/tag/v${version}"; description = "Unofficial Python API for TIDAL music streaming service"; homepage = "https://github.com/tamland/python-tidal"; - license = licenses.gpl3; - maintainers = [ ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ drawbu ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix index 30d99043f0..21931254d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2024.2.12"; + version = "2024.4.18"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-SSCj7I6OAD5nPTxlMYY8me7dVw0bi34UHAcu14/4Aw0="; + hash = "sha256-X/zXe513w6raEnhjGvXIrHiEOEUv2i6xubYNVVPpXII="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix index 2c9fab8200..3231ae8036 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix @@ -78,7 +78,6 @@ buildPythonPackage rec { description = "Python interface to the TileDB storage manager"; homepage = "https://github.com/TileDB-Inc/TileDB-Py"; license = licenses.mit; - maintainers = with maintainers; [ fridh ]; # tiledb/core.cc:556:30: error: ‘struct std::array’ has no member named ‘second’ broken = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tilequant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tilequant/default.nix index c25c9ff265..906f644d89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tilequant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tilequant/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/tilequant"; changelog = "https://github.com/SkyTemple/tilequant/releases/tag/${version}"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ marius851000 xfix ]; + maintainers = with maintainers; [ marius851000 ]; mainProgram = "tilequant"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timecop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timecop/default.nix index fb455d079b..443b609fb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timecop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timecop/default.nix @@ -1,20 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, + unittestCheckHook, +}: buildPythonPackage rec { pname = "timecop"; version = "0.5.0dev"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0zbi58sw2yp1qchzfhyi7bsrwxajiypphg65fir98kvj03g011wd"; + hash = "sha256-jYcA3gByT5RydMU8eK+PUnWe9TrRQ/chw+F6wTUqcX0="; }; + build-system = [ setuptools ]; + + nativeCheckInputs = [ unittestCheckHook ]; + # test_epoch fails, see https://github.com/bluekelp/pytimecop/issues/4 preCheck = '' sed -i 's/test_epoch/_test_epoch/' timecop/tests/test_freeze.py ''; + pythonImportsCheck = [ "timecop" ]; + meta = with lib; { description = "A port of the most excellent TimeCop Ruby Gem for Python"; homepage = "https://github.com/bluekelp/pytimecop"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timing-asgi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timing-asgi/default.nix new file mode 100644 index 0000000000..d1dc1ccc81 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/timing-asgi/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, asynctest +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "timing-asgi"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "steinnes"; + repo = "timing-asgi"; + rev = "refs/tags/v${version}"; + hash = "sha256-oEDesmy9t2m51Zd6Zg87qoYbfbDnejfrbjyBkZ3hF58="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail poetry.masonry.api poetry.core.masonry.api \ + --replace-fail "poetry>=" "poetry-core>=" + ''; + + build-system = [ + poetry-core + ]; + + pythonImportsCheck = [ "timing_asgi" ]; + + # Tests rely on asynctest which is not supported by python 3.11 + doCheck = false; + + nativeCheckInputs = [ + # asynctest-0.13.0 not supported for interpreter python3.11 + # asynctest + pytestCheckHook + ]; + + meta = with lib; { + description = "ASGI middleware to emit timing metrics with something like statsd"; + homepage = "https://pypi.org/project/timing-asgi"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinytuya/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinytuya/default.nix new file mode 100644 index 0000000000..36c15f7982 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tinytuya/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies +, cryptography +, requests +, colorama +}: + +buildPythonPackage rec { + pname = "tinytuya"; + version = "1.13.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jasonacox"; + repo = "tinytuya"; + rev = "refs/tags/v${version}"; + hash = "sha256-44x5P+Ej/d6B5n53iDuLDBzkeZZvArpcgzXLJBcIJe0="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + cryptography + requests + colorama + ]; + + # Tests require real network resources + doCheck = false; + + pythonImportsCheck = [ + "tinytuya" + ]; + + meta = with lib; { + description = "Python API for Tuya WiFi smart devices using a direct local area network (LAN) connection or the cloud (TuyaCloud API)"; + homepage = "https://github.com/jasonacox/tinytuya"; + changelog = "https://github.com/jasonacox/tinytuya/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ pathob ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix index 057190bda9..92d55ef4a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , cargo , datasets +, huggingface-hub , fetchFromGitHub , fetchurl , libiconv @@ -11,6 +12,7 @@ , openssl , pkg-config , pytestCheckHook +, python , pythonOlder , requests , rustPlatform @@ -80,6 +82,7 @@ buildPythonPackage rec { }; sourceRoot = "${src.name}/bindings/python"; + maturinBuildFlags = [ "--interpreter ${python.executable}" ]; nativeBuildInputs = [ pkg-config @@ -105,6 +108,7 @@ buildPythonPackage rec { dependencies = [ numpy + huggingface-hub ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix index 572e09a41f..d11a02a02b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix @@ -25,6 +25,5 @@ buildPythonPackage rec { homepage = "https://github.com/pytoolz/toolz"; description = "List processing tools and functional utilities"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix index d92767b87d..f952351083 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix @@ -25,7 +25,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.2.2"; + version = "2.3.0"; in buildPythonPackage { inherit version; @@ -34,7 +34,7 @@ in buildPythonPackage { format = "wheel"; - disabled = (pythonOlder "3.8") || (pythonAtLeast "3.12"); + disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13"); src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; @@ -109,7 +109,7 @@ in buildPythonPackage { # torch-bin used to vendor CUDA. It still links against CUDA and MKL. license = with licenses; [ bsd3 issl unfreeRedistributable ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-linux" ]; hydraPlatforms = []; # output size 3.2G on 1.11.0 maintainers = with maintainers; [ junjihashimoto ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix index 8cd3bccc12..eb4f9883e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/binary-hashes.nix @@ -6,86 +6,81 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.2.2" = { + "2.3.0" = { x86_64-linux-38 = { - name = "torch-2.2.2-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-wXi+srsB93NgF3e8SBx2Ub5bHxic8YDwwKzqwHiaqaU="; + name = "torch-2.3.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.3.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-lZi5WfVk7j6+NgOwugHSQXTKgBb+ypgQTwMB8UkGF8o="; }; x86_64-linux-39 = { - name = "torch-2.2.2-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-EU6TlYZ+6GAWZWLYzB8oCSJfnil4PdXnIXXZqaeoUFw="; + name = "torch-2.3.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.3.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-PMFeTCaCqFUYEhogUNa+eXbZj8SEO7wTtvW+4nWhtu4="; }; x86_64-linux-310 = { - name = "torch-2.2.2-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-yt5P1sjOfYJtvPq9ZfHVOw7goFjbjBgJ1lv9YFG1VTA="; + name = "torch-2.3.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.3.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-ChKqmqa8RC3/iCOsi0jZkf0HcVYuqjhZP5yBltZfcAc="; }; x86_64-linux-311 = { - name = "torch-2.2.2-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-TJTk0aItcKu9/3Ft7Jm6Xv+UtDQP+nO0+2KflA27inU="; + name = "torch-2.3.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.3.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-XffjyzlhAYqJHk7e8eC8HzMEqNlD+BskqMa/aHykmmc="; }; - x86_64-darwin-38 = { - name = "torch-2.2.2-cp38-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp38-none-macosx_10_9_x86_64.whl"; - hash = "sha256-gVF29iyPN8z7shCBwHaaiLG6pptxaRGapCtl7l8QTi0="; - }; - x86_64-darwin-39 = { - name = "torch-2.2.2-cp39-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-8TdigY3CgP7KfjD2CZWhe6jR0asz/vttB/0sj/FXHqo="; - }; - x86_64-darwin-310 = { - name = "torch-2.2.2-cp310-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp310-none-macosx_10_9_x86_64.whl"; - hash = "sha256-5nfE102wz8KxCSPeG95XXZgculRQXdwIKwUI2WQRmFA="; - }; - x86_64-darwin-311 = { - name = "torch-2.2.2-cp311-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp311-none-macosx_10_9_x86_64.whl"; - hash = "sha256-QwDLu00EKMUbXBlBkBaQGNW4GP2fb6/Ci76P2E3tF0A="; + x86_64-linux-312 = { + name = "torch-2.3.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.3.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-8VtvVJ7rxuayKyZ1Tk8dfkRpvNLUuh6qtXJorYC8ypY="; }; aarch64-darwin-38 = { - name = "torch-2.2.2-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-7RTSpDZEIEkDg9JveQCj99XFDDLlzf3d3/+Dd22eD9Q="; + name = "torch-2.3.0-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-aun2SwlRa6pO+JCvBnLcmBwgsfDYKc4RXUQgokfoj7o="; }; aarch64-darwin-39 = { - name = "torch-2.2.2-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-/q2//ddjTP40Xqh9fuQDGzAPnHZFIFkOA0idZYtpMds="; + name = "torch-2.3.0-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-dg+L7f9QbOnm4QNJj5senhWAngCDaFlMOma/dKilE4A="; }; aarch64-darwin-310 = { - name = "torch-2.2.2-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-tSDRTS8oEK1dp1i+oQyveXjvNkNWW8APkN6JLgDXeSU="; + name = "torch-2.3.0-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-dY75ON6HomU7unS5H3A0WMFVafFWK/S2xjxi2cWgwfU="; }; aarch64-darwin-311 = { - name = "torch-2.2.2-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-gipYlnXLqKzwRX1qTltspEGtO0w6RKHLyPizGueWRF4="; + name = "torch-2.3.0-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-0k4ygibY4q98+A/LHS8dEI4N4yd3+rSqorN7l2XYvnM="; + }; + aarch64-darwin-312 = { + name = "torch-2.3.0-cp312-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp312-none-macosx_11_0_arm64.whl"; + hash = "sha256-3KmGIUJns0Blp5AAzuVCMuYrQd/x7Cyrmrw/yLPe4K0="; }; aarch64-linux-38 = { - name = "torch-2.2.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-mJTc3W71tbYDzYzqPjcR+eJ3CC/3sPFLFSb90ay4JSE="; + name = "torch-2.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-RunxqfQgKcBuY/v5yXE0PYsqCIZyO8T/McZ6m3pHNXM="; }; aarch64-linux-39 = { - name = "torch-2.2.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-1dhev9E/fNA+UGMlP4R57RpXBSZBZtXdH8abS5YjGyA="; + name = "torch-2.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-N7zdkm811ccvGm0oIpczJEuyZTqPp3nEwQ3ZfjMNa6I="; }; aarch64-linux-310 = { - name = "torch-2.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-OiwHUhgIHvnHv4xVxwbyNtrrt1PaQd5JispxYyVzgL0="; + name = "torch-2.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-fiTBOMO6zIxRHGuCEfCcO/VH08vjdWMhrOwb3OQP7Gs="; }; aarch64-linux-311 = { - name = "torch-2.2.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-WUgt9dxA2uEF5z9I3Sk/TMxndkCCLCzjQnOjh1SZA64="; + name = "torch-2.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-FHmS068B4/KncqaId+iTeYnlfEIluCpJidPNlYLIvNE="; + }; + aarch64-linux-312 = { + name = "torch-2.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-bhOCYa8GzZAqgmUmCCreU0tmCTudj2/y1AHOQ5qiNQw="; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix index 3bd0193750..d8d3a6532a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python, +{ stdenv, lib, fetchFromGitHub, buildPythonPackage, python, config, cudaSupport ? config.cudaSupport, cudaPackages, autoAddDriverRunpath, effectiveMagma ? @@ -14,7 +14,7 @@ buildDocs ? false, # Native build inputs - cmake, linkFarm, symlinkJoin, which, pybind11, removeReferencesTo, + cmake, symlinkJoin, which, pybind11, removeReferencesTo, pythonRelaxDepsHook, # Build inputs @@ -130,7 +130,7 @@ let in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.2.2"; + version = "2.3.0"; pyproject = true; disabled = pythonOlder "3.8.0"; @@ -148,7 +148,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-la9wL9pOlgrSfq5V8aRKXt3hjW+Er/6484m0oUujlzk="; + hash = "sha256-UmH4Mv5QL7Mz4Y4pvxn8F1FGBR/UzYZjE2Ys8Oc0FWQ="; }; patches = lib.optionals cudaSupport [ @@ -205,8 +205,8 @@ in buildPythonPackage rec { # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") '' - substituteInPlace third_party/pocketfft/pocketfft_hdronly.h --replace '#if __cplusplus >= 201703L - inline void *aligned_alloc(size_t align, size_t size)' '#if __cplusplus >= 201703L && 0 + substituteInPlace third_party/pocketfft/pocketfft_hdronly.h --replace-fail '#if (__cplusplus >= 201703L) && (!defined(__MINGW32__)) && (!defined(_MSC_VER)) + inline void *aligned_alloc(size_t align, size_t size)' '#if 0 inline void *aligned_alloc(size_t align, size_t size)' ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/prefetch.sh b/third_party/nixpkgs/pkgs/development/python-modules/torch/prefetch.sh index 7b9c26de35..88cbfa2c34 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/prefetch.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/prefetch.sh @@ -15,18 +15,17 @@ url_and_key_list=( "x86_64-linux-39 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl" - "x86_64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_10_9_x86_64.whl torch-${version}-cp38-none-macosx_10_9_x86_64.whl" - "x86_64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_10_9_x86_64.whl torch-${version}-cp39-none-macosx_10_9_x86_64.whl" - "x86_64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_10_9_x86_64.whl torch-${version}-cp310-none-macosx_10_9_x86_64.whl" - "x86_64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_10_9_x86_64.whl torch-${version}-cp311-none-macosx_10_9_x86_64.whl" + "x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torch-${version}-cp312-cp312-linux_x86_64.whl" "aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl" + "aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-none-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl" "aarch64-linux-38 $linux_cpu_bucket/torch-${version}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux-39 $linux_cpu_bucket/torch-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux-310 $linux_cpu_bucket/torch-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux-311 $linux_cpu_bucket/torch-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + "aarch64-linux-312 $linux_cpu_bucket/torch-${version}-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl torch-${version}-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" ) hashfile="binary-hashes-$version.nix" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix index dc69195b69..29b923b928 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.2.2"; + version = "2.3.0"; format = "wheel"; src = @@ -27,9 +27,15 @@ buildPythonPackage rec { in fetchurl srcs; - disabled = (pythonOlder "3.8") || (pythonAtLeast "3.12"); + disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13"); - buildInputs = with cudaPackages; [ + buildInputs = [ + # We need to patch the lib/_torchaudio_ffmpeg[4-6] + ffmpeg_4.dev + ffmpeg_5.dev + ffmpeg_6.dev + sox + ] ++ lib.optionals stdenv.isLinux (with cudaPackages; [ # $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libcudart.so.11.0 but torch/lib only ships # libcudart.$hash.so.11.0 cuda_cudart @@ -37,24 +43,18 @@ buildPythonPackage rec { # $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libnvToolsExt.so.2 but torch/lib only ships # libnvToolsExt-$hash.so.1 cuda_nvtx + ]); - # We need to patch the lib/_torchaudio_ffmpeg[4-6] - ffmpeg_4.dev - ffmpeg_5.dev - ffmpeg_6.dev - sox - ]; - - nativeBuildInputs = [ + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook addOpenGLRunpath ]; - propagatedBuildInputs = [ + dependencies = [ torch-bin ]; - preInstall = '' + preInstall = lib.optionals stdenv.isLinux '' addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch" ''; @@ -72,7 +72,7 @@ buildPythonPackage rec { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; + platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" ]; maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix index a15dffc485..379ea48073 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -6,86 +6,81 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.2.2" = { + "2.3.0" = { x86_64-linux-38 = { - name = "torchaudio-2.2.2-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-KPwkn2+sVuS9GbZdk7f6lSJ956D1WLY2YS7k3qE3tog="; + name = "torchaudio-2.3.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-Q/Iv/36izuH9uzAqE26aC51XFTUXaaYn1JDGfKzsCfQ="; }; x86_64-linux-39 = { - name = "torchaudio-2.2.2-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-YzzBeuAiMH0HPyZhvK/z9Q2bPW99MukXMFRCAybiDRs="; + name = "torchaudio-2.3.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-4n2qE/jPQ8sLyq81TIEj7qlpBsg/FDNCZiCSvMH7atc="; }; x86_64-linux-310 = { - name = "torchaudio-2.2.2-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-/eGFVNhP0AR1iPC87QPXcPZVPxeFGjtEE3kWShPJmwc="; + name = "torchaudio-2.3.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-OLSTk/jDItyqKdGeWsv1oLGXjPG3GURatnDx+0huOqY="; }; x86_64-linux-311 = { - name = "torchaudio-2.2.2-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-DgdNBcIlizAU3aAu7wB60Xq0TP0B2XgMmpFOXZcqwAs="; + name = "torchaudio-2.3.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-jdZpE+ewjGPHayGwcGEwwkruTtStwLwS+NYt+YtcbqA="; }; - x86_64-darwin-38 = { - name = "torchaudio-2.2.2-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-jOTfBlqUmRHStngqpME2h++t6iP/x8em8V9+euXIlSQ="; - }; - x86_64-darwin-39 = { - name = "torchaudio-2.2.2-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-23CxOocaSUh72QQr8EsS90rtd7GofS++to0J2bZLxSg="; - }; - x86_64-darwin-310 = { - name = "torchaudio-2.2.2-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-sdWCAdEI6F2z41uEMZ8ziE9h8yfDjq2GkTIYyMGsw90="; - }; - x86_64-darwin-311 = { - name = "torchaudio-2.2.2-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-8agaUYo+hsAEEl64kfxDPOj7I0MpW11hLQ83sk4THv0="; + x86_64-linux-312 = { + name = "torchaudio-2.3.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-IA7PUlHYPRTook/X9V3odqrSVR/5jqvxzdhCeQXJXFU="; }; aarch64-darwin-38 = { - name = "torchaudio-2.2.2-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-s7ir4msGfpxKbj26FWuR16hSR+iN2nC3xDhZ9VuXjdw="; + name = "torchaudio-2.3.0-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-e6kyZUVdw2M4XpjAz8rrWGt0Aa+KLIJIEe4UZhNKTzA="; }; aarch64-darwin-39 = { - name = "torchaudio-2.2.2-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-S3ioShib89pLlmN1zr3sxYSk3F9g4L3nIdc0Ae1crUU="; + name = "torchaudio-2.3.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-9Lkzd28go2r13cV5aPyz2jTdA4gduNZ2Dz4RdoA7nPg="; }; aarch64-darwin-310 = { - name = "torchaudio-2.2.2-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-pSDhTqC6idncJ5IutGCfnqxcAcJ5gw4PIWucngF9Q4s="; + name = "torchaudio-2.3.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-NCEI2oOqGaRXyaEosSBvrbYDdTtRzKAiufWFqsL0dUw="; }; aarch64-darwin-311 = { - name = "torchaudio-2.2.2-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-AUgvyFEX+F7kT4qo6cEbHAIjJhc+B0h4ntQrIZECk38="; + name = "torchaudio-2.3.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-NByjBIzm7cxzFRmzAYfwsTrLJFxO/hb5JfafnVM1RuE="; + }; + aarch64-darwin-312 = { + name = "torchaudio-2.3.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-U1FEovu6lfuzuIMiT/z0R4jkzsurvknEoa4+enT3FIU="; }; aarch64-linux-38 = { - name = "torchaudio-2.2.2-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-T3VqbmZ92IQb8hoH6tPv7ap6J9VYUnecJm9vKhBkyZQ="; + name = "torchaudio-2.3.0-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-7Rhm9QjcaJxPaC0zCy7UyDEI01hl5PuJQxgZNk2K2e0="; }; aarch64-linux-39 = { - name = "torchaudio-2.2.2-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-cj9OV7XQwSA1fKYM1VtObPrIRbwOzMtLQXpEqk68Ums="; + name = "torchaudio-2.3.0-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-0kO7ih7iY8LNr7n+7RVpw3QtgTVzHo94GN4S9ODIPig="; }; aarch64-linux-310 = { - name = "torchaudio-2.2.2-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-sPOOfTVIkU14qvwn/wD3cBsaUL/N3FiWX1RfySzNSmY="; + name = "torchaudio-2.3.0-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-5btQt6SHTtlwhsnlFt2QsQPZVO3LXtSzb0/CLEAApac="; }; aarch64-linux-311 = { - name = "torchaudio-2.2.2-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-CgOki21V0X1I9Bmn8dDUAY1IoEx2WFwWqbXmkoH5L5Q="; + name = "torchaudio-2.3.0-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-Ye2wKunA7+pDmfnB+JlgETayTzXUMFSChOqOr2zL474="; + }; + aarch64-linux-312 = { + name = "torchaudio-2.3.0-cp312-cp312-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-ZoqLaU5VIs/yjNXgLQGqG3XOlAqp+0BICJK9xiOxc10="; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix index 3ca33cc36b..ff56db53a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.2.2"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; rev = "refs/tags/v${version}"; - hash = "sha256-rW4xLUFTpGpUeMnTBdrI/2OjgZX1ihK0EfcVK6snmpk="; + hash = "sha256-8EPoZ/dfxrQjdtE0rZ+2pOaXxlyhRuweYnVuA9i0Fgc="; }; patches = [ @@ -82,7 +82,7 @@ buildPythonPackage rec { homepage = "https://pytorch.org/"; changelog = "https://github.com/pytorch/audio/releases/tag/v${version}"; license = licenses.bsd2; - platforms = platforms.unix; + platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-linux" ]; maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/prefetch.sh b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/prefetch.sh index 89422ff7c6..e4a9b9c90f 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -15,18 +15,17 @@ url_and_key_list=( "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" - "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_13_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl" - "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_13_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl" - "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_13_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl" - "x86_64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_10_13_x86_64.whl torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl" + "x86_64-linux-312 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torchaudio-${version}-cp312-cp312-linux_x86_64.whl" "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" + "aarch64-darwin-312 $darwin_bucket/torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl" "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-linux_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl" "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-linux_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl" "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-linux_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-linux_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" + "aarch64-linux-312 $linux_cpu_bucket/torchaudio-${version}-cp312-cp312-linux_aarch64.whl torchaudio-${version}-cp312-cp312-manylinux2014_aarch64.whl" ) hashfile=binary-hashes-"$version".nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix index e5c05c6dd4..5cc57ed0be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix @@ -8,6 +8,7 @@ , scikit-learn , scikit-image , packaging +, pretty-errors , psutil , py-deprecate , torch @@ -20,7 +21,7 @@ let pname = "torchmetrics"; - version = "1.3.2"; + version = "1.4.0"; in buildPythonPackage { inherit pname version; @@ -32,13 +33,14 @@ buildPythonPackage { owner = "Lightning-AI"; repo = "torchmetrics"; rev = "refs/tags/v${version}"; - hash = "sha256-0lverGF8HVlnwWmnCjScWoSfWPLZlMF2cHDG+uxNCCQ="; + hash = "sha256-5ANEpUdd5eyzBhhAEHrvHNHMOQuXhkkKuL1t3dJLhdE="; }; - propagatedBuildInputs = [ + dependencies = [ numpy lightning-utilities packaging + pretty-errors py-deprecate ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchrl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchrl/default.nix index 591e59302e..76592f6adf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchrl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchrl/default.nix @@ -12,13 +12,22 @@ , ale-py , gym , pygame +, torchsnapshot , gymnasium , mujoco +, h5py +, huggingface-hub +, minari +, pandas +, pillow +, requests +, scikit-learn +, torchvision +, tqdm , moviepy , git , hydra-core , tensorboard -, tqdm , wandb , packaging , tensordict @@ -27,11 +36,12 @@ , pytestCheckHook , pyyaml , scipy +, stdenv }: buildPythonPackage rec { pname = "torchrl"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,17 +50,17 @@ buildPythonPackage rec { owner = "pytorch"; repo = "rl"; rev = "refs/tags/v${version}"; - hash = "sha256-lETW996IKPUGgZpe+cyzrXvVmDSwj5G4XFreFmGxReQ="; + hash = "sha256-8wSyyErqveP9zZS/UGvWVBYyylu9BuA447GEjXIzBIk="; }; - nativeBuildInputs = [ + build-system = [ ninja setuptools wheel which ]; - propagatedBuildInputs = [ + dependencies = [ cloudpickle numpy packaging @@ -64,10 +74,24 @@ buildPythonPackage rec { gym pygame ]; + checkpointing = [ + torchsnapshot + ]; gym-continuous = [ gymnasium mujoco ]; + offline-data = [ + h5py + huggingface-hub + minari + pandas + pillow + requests + scikit-learn + torchvision + tqdm + ]; rendering = [ moviepy ]; @@ -103,6 +127,7 @@ buildPythonPackage rec { pytestCheckHook pyyaml scipy + torchvision ] ++ passthru.optional-dependencies.atari ++ passthru.optional-dependencies.gym-continuous @@ -137,5 +162,7 @@ buildPythonPackage rec { changelog = "https://github.com/pytorch/rl/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ GaetanLepage ]; + # ~3k tests fail with: RuntimeError: internal error + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchsnapshot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchsnapshot/default.nix new file mode 100644 index 0000000000..62f6fd6b24 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchsnapshot/default.nix @@ -0,0 +1,71 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + setuptools, + wheel, + aiofiles, + aiohttp, + importlib-metadata, + nest-asyncio, + psutil, + pyyaml, + torch, + typing-extensions, + pytest-asyncio, + pytestCheckHook, + pythonAtLeast, + stdenv, +}: + +buildPythonPackage rec { + pname = "torchsnapshot"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = "torchsnapshot"; + rev = "refs/tags/${version}"; + hash = "sha256-F8OaxLH8BL6MPNLFv1hBuVmeEdnEQ5w2Qny6by1wP6k="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + aiofiles + aiohttp + importlib-metadata + nest-asyncio + psutil + pyyaml + torch + typing-extensions + ]; + + pythonImportsCheck = [ "torchsnapshot" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + meta = with lib; { + description = "A performant, memory-efficient checkpointing library for PyTorch applications, designed with large, complex distributed workloads in mind"; + homepage = "https://github.com/pytorch/torchsnapshot/"; + changelog = "https://github.com/pytorch/torchsnapshot/releases/tag/${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + broken = + # https://github.com/pytorch/torchsnapshot/issues/175 + pythonAtLeast "3.12" + # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package + || stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix index 70026bb363..eda64ff4a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix @@ -16,7 +16,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.17.2"; + version = "0.18.0"; in buildPythonPackage { inherit version; @@ -26,7 +26,7 @@ in buildPythonPackage { src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; - disabled = (pythonOlder "3.8") || (pythonAtLeast "3.12"); + disabled = (pythonOlder "3.8") || (pythonAtLeast "3.13"); # Note that we don't rely on config.cudaSupport here, because the Linux wheels all come built with CUDA support. buildInputs = with cudaPackages; lib.optionals stdenv.isLinux [ @@ -63,7 +63,7 @@ in buildPythonPackage { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "aarch64-darwin" "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix index 3a5654b18c..d1dfd0c46e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,66 +6,81 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.17.2" = { + "0.18.0" = { x86_64-linux-38 = { - name = "torchvision-0.17.2-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-3450y7tN4KYPEc18KNggEWAnzTlJiT+XxVtvEjJr168="; + name = "torchvision-0.18.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-wkg7LMYiePuqa2fSqdgI0kUET4tkqCFZbq5o7GoNXtA="; }; x86_64-linux-39 = { - name = "torchvision-0.17.2-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-839ZLjEovz2ZloraWhKPEY+a7R2rYJ4nKscjEUb8aEM="; + name = "torchvision-0.18.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-G/4MZ/1UYaOlk/jxfhVE8Hpr1mhuFVIA3SRJRwdPzVE="; }; x86_64-linux-310 = { - name = "torchvision-0.17.2-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-wPMlY1+INPpV5pq2EHX7K7y7RTlamFu6HbN4sVYnEEs="; + name = "torchvision-0.18.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-E+G0jcXOQcy4EAqz3Sb98x2PHpBOzyhlrFJEkwE9DfU="; }; x86_64-linux-311 = { - name = "torchvision-0.17.2-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-BZ+GocjSsnayZshKj1qSzIQm1DwqLCSNxzwUCrOoIvM="; + name = "torchvision-0.18.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-HlFneVIPySFX1sskWsD9P3mHL+gchLhZOo8umYEG9bE="; }; - x86_64-darwin-38 = { - name = "torchvision-0.17.2-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-uDqsjXj0iYEUbVghaNdbbJR8+wp2k/duIZ8ZJvbllaM="; - }; - x86_64-darwin-39 = { - name = "torchvision-0.17.2-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-SGi7+lV1jIEH5poOfdXne4kFYDXNOLdnrVuYzbccDw0="; - }; - x86_64-darwin-310 = { - name = "torchvision-0.17.2-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-HykQ/jwhrWh1snINRvrYNbLkszbpVT0xyjZNJMkLHU8="; - }; - x86_64-darwin-311 = { - name = "torchvision-0.17.2-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-m4PlXufQoXBPUrnArIc4jnptHZimveews1+atU172lQ="; + x86_64-linux-312 = { + name = "torchvision-0.18.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.0%2Bcu121-cp312-cp312-linux_x86_64.whl"; + hash = "sha256-cA9gGb6+6eDuiwvL2xWIgJyUouuUeh/eLgatw0tg2io="; }; aarch64-darwin-38 = { - name = "torchvision-0.17.2-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-Hs5AVX4SLXmXWGCgBap+Kp4ubDUKA+eKAOwUUAgzEv0="; + name = "torchvision-0.18.0-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-IRWhkGwBX12pzu3ECpgzE7D9biyKFxCKkpkXBvUfaYc="; }; aarch64-darwin-39 = { - name = "torchvision-0.17.2-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-79bQ3QZo4V0Bos/63HQGhDOzLLz1aS4MSqFfxcslDOc="; + name = "torchvision-0.18.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-deIuz0ShO4+VuK1CHAJhKC2FnGGBa62soZWeBzzN1pE="; }; aarch64-darwin-310 = { - name = "torchvision-0.17.2-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-7MHFA/qKVPurd34Gp8IoAyuKt47+vzWyi8jyL1RPUfE="; + name = "torchvision-0.18.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-3WFiij0YnGhSoS3F7UzS7s5m0tZ/Nahmyxbx3LBsjGI="; }; aarch64-darwin-311 = { - name = "torchvision-0.17.2-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-4DEAShvEMsmAp71kL2wYmj78MW5CP8MLVWmDcWak4o0="; + name = "torchvision-0.18.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-aJalIWi+/hEF+zyTNShzkO0ifnHR5OxNaLYuijCZ/Ak="; + }; + aarch64-darwin-312 = { + name = "torchvision-0.18.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-652DwOHbtU7LD7BMh/eGMz46b7i5xACsp8MQgfmqVwc="; + }; + aarch64-linux-38 = { + name = "torchvision-0.18.0-cp38-cp38-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-kl0KgszPb5hsGLKbQ5KpQttly9tzwToSnISTgi65428="; + }; + aarch64-linux-39 = { + name = "torchvision-0.18.0-cp39-cp39-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-Nu/YcAHGvuI4PgQ+RqAlr/sDF5dHyPR3e5kYUn/851Y="; + }; + aarch64-linux-310 = { + name = "torchvision-0.18.0-cp310-cp310-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-Uzf2rPof6VnVyzQNAaAGFNazHOekgkzLlUNahcUnO5U="; + }; + aarch64-linux-311 = { + name = "torchvision-0.18.0-cp311-cp311-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-5aJNYgzqFKS7ifJKorUGIwwKFqOtpX/FOtgM/SVqISg="; + }; + aarch64-linux-312 = { + name = "torchvision-0.18.0-cp312-cp312-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp312-cp312-linux_aarch64.whl"; + hash = "sha256-qWSvvH3fUKRrlBR39sNXKbQW3u3ROXVr79SIJF4uIm0="; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix index 496a8c0871..6ae3118673 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix @@ -17,7 +17,7 @@ let inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.17.2"; + version = "0.18.0"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-Y7TkdbdrdiXQO2pBkUePCLw1EYQjsAqkV2OTMzxbU78="; + hash = "sha256-VWbalbLSV5a+t9eAO7QzQ/e11KkhGg6MHgd5vXcAUXc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh index e80718a505..47ccbd935c 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh @@ -14,14 +14,17 @@ url_and_key_list=( "x86_64-linux-39 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl" - "x86_64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_10_13_x86_64.whl torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl" - "x86_64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_10_13_x86_64.whl torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl" - "x86_64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_10_13_x86_64.whl torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl" - "x86_64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_10_13_x86_64.whl torchvision-${version}-cp311-cp311-macosx_10_9_x86_64.whl" + "x86_64-linux-312 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp312-cp312-linux_x86_64.whl torchvision-${version}-cp312-cp312-linux_x86_64.whl" "aarch64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl" "aarch64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl" + "aarch64-darwin-312 $darwin_bucket/torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl" + "aarch64-linux-38 $darwin_bucket/torchvision-${version}-cp38-cp38-linux_aarch64.whl torchvision-${version}-cp38-cp38-linux_aarch64.whl" + "aarch64-linux-39 $darwin_bucket/torchvision-${version}-cp39-cp39-linux_aarch64.whl torchvision-${version}-cp39-cp39-linux_aarch64.whl" + "aarch64-linux-310 $darwin_bucket/torchvision-${version}-cp310-cp310-linux_aarch64.whl torchvision-${version}-cp310-cp310-linux_aarch64.whl" + "aarch64-linux-311 $darwin_bucket/torchvision-${version}-cp311-cp311-linux_aarch64.whl torchvision-${version}-cp311-cp311-linux_aarch64.whl" + "aarch64-linux-312 $darwin_bucket/torchvision-${version}-cp312-cp312-linux_aarch64.whl torchvision-${version}-cp312-cp312-linux_aarch64.whl" ) hashfile="binary-hashes-$version.nix" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix index f6f3baaefe..6770e65194 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix @@ -1,41 +1,34 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools -, zeep +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + zeep, }: buildPythonPackage rec { pname = "total-connect-client"; - version = "2023.12.1"; - format = "pyproject"; + version = "2024.5"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = "refs/tags/${version}"; - hash = "sha256-iEQC02KuBWtk8yQwM/fU28ilbmCWeAjilvR6fHVexuI="; + hash = "sha256-NGiI4gn59U7NiRYtB6UydxOu+lVtmbl8qF3nbAjiYwk="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - zeep - ]; + dependencies = [ zeep ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "total_connect_client" - ]; + pythonImportsCheck = [ "total_connect_client" ]; meta = with lib; { description = "Interact with Total Connect 2 alarm systems"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix index e130ff0698..b534a4baed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tox"; - version = "4.14.2"; + version = "4.15.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; rev = "refs/tags/${version}"; - hash = "sha256-+ed47GK76Wn8PwXsd0qo1xYWJTcZ5wNXnFEEQEZ7CMM="; + hash = "sha256-aKk3a0RAcLyrHK6I3Q7rcBdZVJGNBXsBqA8N7Kpdrms="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix index 7b5fd56b0a..0346943304 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchurl , substituteAll , buildPythonPackage , fetchPypi @@ -37,6 +38,10 @@ buildPythonPackage rec { patches = [ # Fix hardcoded `fapi-config.json` configuration path ./fapi-config.patch + (fetchurl { + url = "https://github.com/tpm2-software/tpm2-pytss/pull/571/commits/b02fdc8e259fe977c1065389c042be69e2985bdf.patch"; + hash = "sha256-+jZFv+s9p52JxtUcNeJx7ayzKDVtPoQSSGgyZqPDuEc="; + }) ] ++ lib.optionals isCross [ # pytss will regenerate files from headers of tpm2-tss. # Those headers are fed through a compiler via pycparser. pycparser expects `cpp` diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix index 1fcc2b0827..4f3ff0f154 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix @@ -42,9 +42,8 @@ buildPythonPackage rec { numpy rich tkinter - ] ++ - # pandas is not supported on i686 or risc-v - lib.optional (!stdenv.isi686 && !stdenv.hostPlatform.isRiscV) pandas; + pandas + ]; pytestFlagsArray = [ "-W" "ignore::FutureWarning" @@ -67,6 +66,5 @@ buildPythonPackage rec { homepage = "https://github.com/tqdm/tqdm"; changelog = "https://tqdm.github.io/releases/"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trafilatura/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trafilatura/default.nix index 35212c3434..a8183bf3f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trafilatura/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trafilatura/default.nix @@ -1,35 +1,43 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytestCheckHook -, pythonOlder -, certifi -, charset-normalizer -, courlan -, htmldate -, justext -, lxml -, urllib3 -, setuptools +{ + lib, + buildPythonPackage, + certifi, + charset-normalizer, + courlan, + fetchPypi, + htmldate, + justext, + lxml, + pytestCheckHook, + pythonOlder, + setuptools, + urllib3, }: buildPythonPackage rec { pname = "trafilatura"; - version = "1.8.1"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-a4eN/b1cXftV0Pgwfyt9wVrDRYBU90hh/5ihcvXjhyA="; + hash = "sha256-5oM9KauKE+2FOTfXyR5oaLxi774QIUrCsQZDbdI9FBI="; }; - nativeBuildInputs = [ - setuptools - ]; + # Patch out gui cli because it is not supported in this packaging and + # nixify path to the trafilatura binary in the test suite + postPatch = '' + substituteInPlace setup.py \ + --replace-fail '"trafilatura_gui=trafilatura.gui:main",' "" + substituteInPlace tests/cli_tests.py \ + --replace-fail "trafilatura_bin = 'trafilatura'" "trafilatura_bin = '$out/bin/trafilatura'" + ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ certifi charset-normalizer courlan @@ -39,34 +47,22 @@ buildPythonPackage rec { urllib3 ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Disable tests that require an internet connection + "test_cli_pipeline" + "test_crawl_page" "test_download" "test_fetch" - "test_redirection" "test_meta_redirections" - "test_crawl_page" - "test_whole" "test_probing" - "test_cli_pipeline" + "test_queue" + "test_redirection" + "test_whole" ]; - # patch out gui cli because it is not supported in this packaging - # nixify path to the trafilatura binary in the test suite - postPatch = '' - substituteInPlace setup.py \ - --replace-fail '"trafilatura_gui=trafilatura.gui:main",' "" - substituteInPlace tests/cli_tests.py \ - --replace-fail "trafilatura_bin = 'trafilatura'" "trafilatura_bin = '$out/bin/trafilatura'" - ''; - - pythonImportsCheck = [ - "trafilatura" - ]; + pythonImportsCheck = [ "trafilatura" ]; meta = with lib; { description = "Python package and command-line tool designed to gather text on the Web"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix index 68a50d620d..51336a0f91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.14.1"; + version = "5.14.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hYUQWzcaBLgxakPVzinAmFdcLkd4ULYrhIuWTxREUn4="; + hash = "sha256-jN2DwEDat9He6CJnjl9dEAtRT3tysBYVsm/FcYkW/fk="; }; nativeBuildInputs = [ @@ -49,6 +49,5 @@ buildPythonPackage rec { description = "Traitlets Python config system"; homepage = "https://github.com/ipython/traitlets"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix index d261337be2..f7edf239ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.40.0"; + version = "4.40.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -63,7 +63,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-k0AloOG7fRQhTW8IF6uQSfav8p1KC5633SaLNYZrZ2M="; + hash = "sha256-GMoHWJAfQJ3y1DPs9+geNdzD72rwMVEG0GLPYEvbo/E="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix index 9b054c8233..8ed221cd23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix @@ -2,27 +2,32 @@ , stdenv , buildPythonPackage , fetchPypi -, pythonAtLeast -, six +, fontconfig +, graphviz +, mock +, pycodestyle , pygraphviz , pytestCheckHook -, mock -, graphviz -, pycodestyle -, fontconfig +, pythonAtLeast +, setuptools +, six }: buildPythonPackage rec { pname = "transitions"; version = "0.9.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-L1TRG9siV3nX5ykBHpOp+3F2aM49xl+NT1pde6L0jhA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ six pygraphviz # optional ]; @@ -39,12 +44,12 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - # upstream issue https://github.com/pygraphviz/pygraphviz/issues/441 - pytestFlagsArray = lib.optionals stdenv.isDarwin [ - "--deselect=tests/test_pygraphviz.py::PygraphvizTest::test_binary_stream" - "--deselect=tests/test_pygraphviz.py::PygraphvizTest::test_diagram" - "--deselect=tests/test_pygraphviz.py::TestPygraphvizNested::test_binary_stream" - "--deselect=tests/test_pygraphviz.py::TestPygraphvizNested::test_diagram" + disabledTests = [ + "test_diagram" + "test_ordered_with_graph" + ] ++ lib.optionals stdenv.isDarwin [ + # Upstream issue https://github.com/pygraphviz/pygraphviz/issues/441 + "test_binary_stream" ]; pythonImportsCheck = [ @@ -54,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/pytransitions/transitions"; description = "A lightweight, object-oriented finite state machine implementation in Python"; + changelog = "https://github.com/pytransitions/transitions/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index abcc25faaf..bd3a9f8d76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -10,19 +10,19 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.3.1"; + version = "4.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SFD+nZVNb90+UVdWmZwnGEGF21zKhE7mfFPn2HluizE="; + hash = "sha256-FFDb0aro3YJe3dVsWn19GzXK1+/Cxj1TXhlWlXfCWRY="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ lxml pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio-asyncio/default.nix index a74b3889fa..258bb61b66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio-asyncio/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , setuptools , greenlet , trio @@ -14,27 +14,28 @@ buildPythonPackage rec { pname = "trio-asyncio"; - version = "0.14.0"; + version = "0.14.1"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "trio_asyncio"; - inherit version; - hash = "sha256-msSKQ8vhZxtBIh7HNq4M2qc0yKOErGNiCWLBXXse3WQ="; + src = fetchFromGitHub { + owner = "python-trio"; + repo = "trio-asyncio"; + rev = "refs/tags/v${version}"; + hash = "sha256-634fcYAn5J1WW71J/USAMkJaZI8JmKoQneQEhz2gYFc="; }; postPatch = '' substituteInPlace setup.py \ - --replace '"pytest-runner"' "" + --replace-fail '"pytest-runner"' "" ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ greenlet trio outcome @@ -43,18 +44,16 @@ buildPythonPackage rec { exceptiongroup ]; - # RuntimeWarning: Can't run the Python asyncio tests because they're not installed. On a Debian/Ubuntu system, you might need to install the libpython3.11-testsuite package. - doCheck = false; + pytestFlagsArray = [ + # RuntimeWarning: Can't run the Python asyncio tests because they're not installed + "-W" "ignore::RuntimeWarning" + ]; nativeCheckInputs = [ pytest-trio pytestCheckHook ]; - disabledTestPaths = [ - "tests/python" # tries to import internal API test.test_asyncio - ]; - pythonImportsCheck = [ "trio_asyncio" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix index 98fdcfae0c..8ffa3de60f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix @@ -2,6 +2,8 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, pythonOlder +, setuptools , exceptiongroup , pytest-trio , pytestCheckHook @@ -12,20 +14,25 @@ buildPythonPackage rec { pname = "trio-websocket"; - version = "0.10.2"; - format = "setuptools"; + version = "0.11.1"; + pyproject = true; src = fetchFromGitHub { owner = "HyperionGray"; repo = "trio-websocket"; rev = version; - hash = "sha256-djoTxkIKY52l+WnxL1FwlqrU/zvsLVkPUAHn9BxJ45k="; + hash = "sha256-ddLbYkb1m9zRjv3Lb7YwUzj26gYbK4nYN6jN+FAuiOs="; }; - propagatedBuildInputs = [ - exceptiongroup + build-system = [ + setuptools + ]; + + dependencies = [ trio wsproto + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup ]; nativeCheckInputs = [ @@ -34,7 +41,16 @@ buildPythonPackage rec { trustme ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # https://github.com/python-trio/trio-websocket/issues/187 + "test_handshake_exception_before_accept" + "test_reject_handshake" + "test_reject_handshake_invalid_info_status" + "test_client_open_timeout" + "test_client_close_timeout" + "test_client_connect_networking_error" + "test_finalization_dropped_exception" + ] ++ lib.optionals stdenv.isDarwin [ # Failed: DID NOT RAISE "test_finalization_dropped_exception" # Timing related diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix index cc276fef5c..84215b5122 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , stdenv @@ -37,26 +37,23 @@ let in buildPythonPackage rec { pname = "trio"; - version = "0.24.0"; + version = "0.25.0"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-/6CadKa/gbhPhhOQn7C+ruhHV0UBg6ei4LR7RVwMrF0="; + src = fetchFromGitHub { + owner = "python-trio"; + repo = "trio"; + rev = "refs/tags/v${version}"; + hash = "sha256-JQ493U4WINOG6ob4IzfNQt5Lgs3DmEM2BDwbae7Bvsw="; }; - postPatch = '' - substituteInPlace src/trio/_tests/test_subprocess.py \ - --replace "/bin/sleep" "${coreutils}/bin/sleep" - ''; - - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ attrs idna outcome @@ -103,11 +100,8 @@ buildPythonPackage rec { "src/trio/_tests/tools/test_gen_exports.py" ]; - pytestFlagsArray = [ - "-W" "ignore::DeprecationWarning" - ]; - meta = { + changelog = "https://github.com/python-trio/trio/blob/v${version}/docs/source/history.rst"; description = "An async/await-native I/O library for humans and snake people"; homepage = "https://github.com/python-trio/trio"; license = with lib.licenses; [ mit asl20 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix index 64829175c1..61ef9858d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix @@ -10,14 +10,14 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2024.3.3"; + version = "2024.4.10"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-337f+cZ/+GtzNiiZgzCxgOgdElseCWU22DrA/XlnP9w="; + hash = "sha256-SfQLtqdGtyocuk+NVe6CUhac2g9wgC4/0k8Et/slpJI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/truncnorm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/truncnorm/default.nix new file mode 100644 index 0000000000..b9b9d77b22 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/truncnorm/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + numpy, + scipy, +}: + +buildPythonPackage rec { + pname = "truncnorm"; + version = "0.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jluttine"; + repo = "truncnorm"; + rev = "refs/tags/${version}"; + hash = "sha256-F+RBXN/pjxmHf26/Vxptz1NbF58eqU018l3zmepSoJk="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + numpy + scipy + ]; + + # No checks + doCheck = false; + + pythonImportsCheck = [ "truncnorm" ]; + + meta = with lib; { + homepage = "https://pypi.org/project/truncnorm"; + description = "Moments for doubly truncated multivariate normal distributions"; + license = licenses.mit; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix index 5e89da7f35..8660e95508 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.0.9"; + version = "7.0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DlPuIaGTpJu4FyLOTNAy2CAEJHoe7+8e34wacz8C7d8="; + hash = "sha256-N/O27qQBD18lncW0hCfJkUlmCuej8HtV2x/MnRUDGcc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix index aeeee4a81e..463b89017c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/bibanon/tubeup"; changelog = "https://github.com/bibanon/tubeup/releases/tag/${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twill/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twill/default.nix index ddea5117a6..08e8ad74de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twill/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twill/default.nix @@ -1,40 +1,57 @@ -{ lib -, buildPythonPackage -, fetchPypi -, lxml -, requests -, pyparsing -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + httpx, + lxml, + pyparsing, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + quixote, + setuptools, }: buildPythonPackage rec { pname = "twill"; - version = "3.2.3"; - format = "setuptools"; + version = "3.2.4"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-m4jrxx7udWkRXzYS0Yfd14tKVHt8kGYPn2eTa4unOdc="; + hash = "sha256-YlZKvOGxLWwGh+MqCXf8tfruxLK60H73k1VQhGOSTc8="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "lxml" ]; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ + httpx lxml - requests pyparsing ]; - pythonImportsCheck = [ - "twill" + nativeCheckInputs = [ + pytestCheckHook + quixote ]; - # pypi package comes without tests, other homepage does not provide all verisons - doCheck = false; + disabledTestPaths = [ + # pytidylib is abandoned + "tests/test_tidy.py" + ]; + + pythonImportsCheck = [ "twill" ]; meta = with lib; { description = "A simple scripting language for Web browsing"; homepage = "https://twill-tools.github.io/twill/"; + changelog = "https://github.com/twill-tools/twill/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix index 265008731b..e61ae13767 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twine/default.nix @@ -49,6 +49,5 @@ buildPythonPackage rec { mainProgram = "twine"; homepage = "https://github.com/pypa/twine"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix index a42f80b36d..9a578ebeed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Twitch module for Python"; homepage = "https://github.com/PetterKraabol/Twitch-Python"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/type-infer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/type-infer/default.nix index 55af22a1c9..d9b1b0717f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/type-infer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/type-infer/default.nix @@ -10,6 +10,7 @@ , numpy , pandas , psutil +, py3langid , python-dateutil , scipy , toml @@ -24,7 +25,7 @@ let in buildPythonPackage rec { pname = "type-infer"; - version = "0.0.18"; + version = "0.0.20"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +34,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "type_infer"; inherit version; - hash = "sha256-nA5TlyHpCueFWqUggS7T/eKSLlffp0pIyGCouwXPZ28="; + hash = "sha256-F+gfA7ofrbMEE5SrVt9H3s2mZKQLyr6roNUmL4EMJbI="; }; nativeBuildInputs = [ @@ -48,6 +49,7 @@ buildPythonPackage rec { numpy pandas psutil + py3langid python-dateutil scipy toml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix index 4b28386a11..fe2ebd26d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix @@ -1,71 +1,84 @@ -{ lib -, attrs -, buildPythonPackage -, cattrs -, click -, click-option-group -, fetchPypi -, hatchling -, pytestCheckHook -, pythonOlder -, tomli -, typing-extensions +{ + lib, + attrs, + buildPythonPackage, + cattrs, + click, + click-option-group, + fetchPypi, + hatchling, + jinja2, + pydantic, + pytestCheckHook, + pythonOlder, + tomli, + typing-extensions, }: buildPythonPackage rec { pname = "typed-settings"; - version = "24.1.0"; - format = "pyproject"; + version = "24.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "typed_settings"; inherit version; - hash = "sha256-luUfVsN6uNYZkXfcAUc5P6Y+WYpfAdU6D01kgQMNniw="; + hash = "sha256-BuosfIlCgCD+h7eA/6/oE98zdURaT3eik+dysBpJR+Y="; }; - nativeBuildInputs = [ - hatchling - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ - attrs - cattrs - click-option-group - ] ++ lib.optionals (pythonOlder "3.11") [ - tomli - ]; + dependencies = lib.optionals (pythonOlder "3.11") [ tomli ]; passthru.optional-dependencies = { - click = [ + all = [ + attrs + cattrs click + click-option-group + jinja2 + pydantic ]; + attrs = [ attrs ]; + cattrs = [ cattrs ]; + click = [ click ]; + option-groups = [ + click + click-option-group + ]; + jinja = [ jinja2 ]; + pydantic = [ pydantic ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook typing-extensions - ] ++ passthru.optional-dependencies.click; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pytestFlagsArray = [ - "tests" - ]; + pytestFlagsArray = [ "tests" ]; disabledTests = [ # AssertionError: assert [OptionInfo(p... "test_deep_options" + # 1Password CLI is not available + "TestOnePasswordLoader" + "test_handle_op" ]; - pythonImportsCheck = [ - "typed_settings" + disabledTestPaths = [ + # 1Password CLI is not available + "tests/test_onepassword.py" ]; - meta = { + pythonImportsCheck = [ "typed_settings" ]; + + meta = with lib; { description = "Typed settings based on attrs classes"; homepage = "https://gitlab.com/sscherfke/typed-settings"; changelog = "https://gitlab.com/sscherfke/typed-settings/-/blob/${version}/CHANGELOG.rst"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fridh ]; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix index b072f3a6d8..a1f0a9033e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix @@ -4,9 +4,8 @@ , click , colorama , coverage -, fetchpatch , fetchPypi -, flit-core +, pdm-backend , pytest-sugar , pytest-xdist , pytestCheckHook @@ -18,27 +17,18 @@ buildPythonPackage rec { pname = "typer"; - version = "0.9.0"; + version = "0.12.3"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-UJIv15rqL0dRqOBAj/ENJmK9DIu/qEdVppnzutopeLI="; + hash = "sha256-SecxMUgdgEKI72JZjZehzu8wWJBapTahE0+QiRujVII="; }; - patches = [ - # https://github.com/tiangolo/typer/pull/651 - (fetchpatch { - name = "unpin-flit-core-dependency.patch"; - url = "https://github.com/tiangolo/typer/commit/78a0ee2eec9f54ad496420e177fdaad84984def1.patch"; - hash = "sha256-VVUzFvF2KCXXkCfCU5xu9acT6OLr+PlQQPeVGONtU4A="; - }) - ]; - nativeBuildInputs = [ - flit-core + pdm-backend ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 687dadc3eb..57c1f550b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -1,29 +1,29 @@ -{ lib -, buildPythonPackage -, fetchPypi -, types-html5lib +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + types-html5lib, }: buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.20240229"; - format = "setuptools"; + version = "4.12.0.20240511"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-435M+hGwOwF3VzLlbSwBDLJO4Qd4Yne65rwPo+MFtoY="; + hash = "sha256-AE9glv3YOxnNv2yxDk6uV7ECBezMNl0Kadd9qDYBLig="; }; - propagatedBuildInputs = [ - types-html5lib - ]; + build-system = [ setuptools ]; + + dependencies = [ types-html5lib ]; # Module has no tests doCheck = false; - pythonImportsCheck = [ - "bs4-stubs" - ]; + pythonImportsCheck = [ "bs4-stubs" ]; meta = with lib; { description = "Typing stubs for beautifulsoup4"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix index fb1f04123f..fd1d57700d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.20.0.20240406"; + version = "0.21.0.20240423"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-6OxKWhJdBthjK7qsihH76hih7fqU35xRKdxFmAkVuEs="; + hash = "sha256-dxbsbGi1F5t7oXOMrOLxMm5k359Et6sI2ZBNMsI/wV8="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-mock/default.nix index cde1a52b93..11d81aa0e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-mock/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-mock"; - version = "5.1.0.20240311"; + version = "5.1.0.20240425"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-dHJ5eYbYMBb5b95/c1d9EpsM2KjQt4NIenvjMNV7pDE="; + hash = "sha256-UoGmRdcugn1wBD48wUT+M7HAA9sIT3idwgOqkOgSpaQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix index adb92251b8..db173d39e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "10.2.0.20240331"; + version = "10.2.0.20240415"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-xgTjmutwcZ5GPTWRV6Iji/wOgb+cZYN1cD97mM/WB9o="; + hash = "sha256-3WBYAnY5vNxmuniyKMwl/a5CUkwhUMeMgE2kJ+fnbnA="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix index c09cb206cf..6482d4e30b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.24.0.20240311"; + version = "4.25.0.20240417"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-yAQm+fubIa7lFGkelqsypc1pSoLirAeWSzUsPn4Bgrw="; + hash = "sha256-w07/F7mzoK22gwYi8PMCSE5MCJ9TOkbj8UdWgxNUQ1I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-psutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-psutil/default.nix index ed7269e458..dce0292b0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-psutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-psutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-psutil"; - version = "5.9.5.20240316"; + version = "5.9.5.20240423"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Vjb1cUu5MMZLs0xNR6WdyS+dYQt3i1Nkox2qVYSUSEg="; + hash = "sha256-G5ds+GMIMWxawizsaIAVsEJzyE+OaRw9+wwSMY8ypvM="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-psycopg2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-psycopg2/default.nix index 4dce98b9c3..e9901ef667 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-psycopg2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-psycopg2/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-psycopg2"; - version = "2.9.21.20240311"; + version = "2.9.21.20240417"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-cilF3/pqcpvrxmDxQTfzft/OrVosFesjQhKn0BfugHI="; + hash = "sha256-Bdslb0pFn7IaQmuOf8oGVsNTkQX/Agjq9r2vQGo4cIc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix index d7cf53e4ff..586e5138aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pyopenssl"; - version = "24.0.0.20240311"; + version = "24.1.0.20240425"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-e8oAz8Tn75xdJmPGocBow1eY5ZZwWVQ59ilue6PVgIM="; + hash = "sha256-Cn6CYmwZg9yNxZKSvyBlSlHDw4gby7mzN8HabjLwIE4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix index 04f146e40e..0bee1e8ddc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.19.20240106"; + version = "2.9.0.20240316"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-H42yIcO5jmygLqg6WDcbIsN09Crlu98YbbnJp2WBRZ8="; + hash = "sha256-XS8uJAuGkF5AlE3Xh9ttqSY/Deq+8Qdt2u15c1HsAgI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix index bf1b49ccc9..8f86e7be43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2024.1.0.20240203"; + version = "2024.1.0.20240417"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-yTdR7iDfxuBUoBSPj1InuaALeckKTTyfRkcRpzF5yJ4="; + hash = "sha256-aBDIofaPIf3w9PN0pDJIfHdkWgrAsx3kv0aQzyGtOYE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix index c8735dbfe6..35f02941b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pyyaml"; - version = "6.0.12.12"; + version = "6.0.12.20240311"; format = "setuptools"; src = fetchPypi { pname = "types-PyYAML"; inherit version; - hash = "sha256-M0Nz05L94P35WvXD8WYYhfoQxSFnsUWT64ViieGFUGI="; + hash = "sha256-qeDw+I3INXObDBylHukNBMoqiXpxr3nemuxfOMsKU0I="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix index 53d38125f8..79728a451f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.20240409"; + version = "4.6.0.20240425"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ziF8J5WB12nfmSxbdtYcZUJbCmeWJgSOYz5kOGjriBs="; + hash = "sha256-lAKhDukx0kH9/MBFkuv3pmHXu5Ko3qYxJ58NisvPOiI="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-s3transfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-s3transfer/default.nix index eb90a55417..30533010fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-s3transfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-s3transfer/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-s3transfer"; - version = "0.10.0"; + version = "0.10.1"; pyproject = true; src = fetchPypi { pname = "types_s3transfer"; inherit version; - hash = "sha256-NeSZjCXff4mFrWne3I5IYOivO0O3YV6UDVPADUE73Gk="; + hash = "sha256-AhVMzkZSgoetdq0aAVOEDgSSI5oIh+iDNGbsz4S5jaA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix index a2a0a9f125..557a065c68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "69.2.0.20240317"; + version = "69.5.0.20240415"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-tgfExIhC7z7kncDH/pwbrXVwCwceEBi7TX46xJLUcEg="; + hash = "sha256-6mSvCpamdPjEC6NMCcJU88cLw/IYxr/6HQkSvZFYSi8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-toml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-toml/default.nix index 140664989f..db58fbc181 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-toml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.8.7"; + version = "0.10.8.20240310"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-WLB4HGgeZx/wtcAxkwmRBon0q0DookMeIF1wyUu277E="; + hash = "sha256-PUFQEwKXJDamuLI5yFCyZollfiUoG0j/DsBjRbiDAzE="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-tqdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-tqdm/default.nix index 3029545302..339a83f7b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-tqdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-tqdm/default.nix @@ -7,17 +7,17 @@ buildPythonPackage rec { pname = "types-tqdm"; - version = "4.66.0.20240106"; + version = "4.66.0.20240417"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-es9KreW6097XbrgpeD+ZYbHCGHlI6qbdGuhkTf+VqTg="; + hash = "sha256-Ftzp71IuqNQOT1uNhN2KEWbu/BPO7np+FYvw8aFCGjE="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typeshed-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typeshed-client/default.nix index 153f8a79da..196c696ff5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typeshed-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typeshed-client/default.nix @@ -1,10 +1,12 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, importlib-resources -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + importlib-resources, + pytestCheckHook, + pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { @@ -12,7 +14,7 @@ buildPythonPackage rec { version = "2.5.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "JelleZijlstra"; @@ -21,25 +23,18 @@ buildPythonPackage rec { hash = "sha256-lITreXYn/ZOc1fF2Sqcn8UDrZAjWYfjFSEaAxqTHb4s="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ importlib-resources + typing-extensions ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "typeshed_client" - ]; + pythonImportsCheck = [ "typeshed_client" ]; - pytestFlagsArray = [ - "tests/test.py" - ]; + pytestFlagsArray = [ "tests/test.py" ]; meta = with lib; { description = "Retrieve information from typeshed and other typing stubs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix index 67d55e6424..8201e4ba81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix @@ -1,24 +1,26 @@ -{ lib -, buildPythonPackage -, fastjsonschema -, fetchFromGitHub -, future-typing -, inflection -, orjson -, pandas -, pendulum -, poetry-core -, pydantic -, pytestCheckHook -, pythonOlder -, sqlalchemy -, ujson +{ + lib, + buildPythonPackage, + fastjsonschema, + fetchFromGitHub, + future-typing, + inflection, + orjson, + pandas, + pendulum, + poetry-core, + pydantic, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + sqlalchemy, + ujson, }: buildPythonPackage rec { pname = "typical"; version = "2.8.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -29,11 +31,13 @@ buildPythonPackage rec { hash = "sha256-2t9Jhdy9NmYBNzdtjjgUnoK2RDEUsAvDkYMcBRzEcmI="; }; - nativeBuildInputs = [ - poetry-core - ]; + pythonRelaxDeps = [ "pendulum" ]; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ fastjsonschema future-typing inflection @@ -43,10 +47,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook - pydantic - sqlalchemy pandas + pydantic + pytestCheckHook + sqlalchemy ]; disabledTests = [ @@ -54,6 +58,12 @@ buildPythonPackage rec { "test_tagged_union_validate" # TypeError: 'NoneType' object cannot be interpreted as an integer "test_ujson" + # Failed: DID NOT RAISE + "test_invalid_path" + # AssertionError + "test_primitive" + "test_tojson" + "test_transmute_simple" ]; disabledTestPaths = [ @@ -63,9 +73,7 @@ buildPythonPackage rec { "tests/mypy/test_mypy.py" ]; - pythonImportsCheck = [ - "typic" - ]; + pythonImportsCheck = [ "typic" ]; meta = with lib; { description = "Python library for runtime analysis, inference and validation of Python types"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix index eb1c9c58d6..b20fe1a051 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.10.0"; + version = "4.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-sKvXyJ6PuW+Y2xjYYQb/HZCraSAE63Rs9u2iaC+Rs8s="; + hash = "sha256-g/CFvVylnIApX8KoKrXaxnnL4CufM/fYOvaOJBvqUbA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uart-devices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uart-devices/default.nix new file mode 100644 index 0000000000..7859d5ce32 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/uart-devices/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "uart-devices"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "uart-devices"; + rev = "refs/tags/v${version}"; + hash = "sha256-rmOWyTdOwnlr8Rwsvd2oeZq79LuGVJDAkIW2/9gGrKQ="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "-Wdefault --cov=uart_devices --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "uart_devices" ]; + + meta = with lib; { + description = "UART Devices for Linux"; + homepage = "https://github.com/bdraco/uart-devices"; + changelog = "https://github.com/bdraco/uart-devices/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix index 7d285b0628..f2442d2a60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.16"; + version = "0.9.17"; format = "setuptools"; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; rev = "refs/tags/v${version}"; - hash = "sha256-9ksHA8uvBv370/6Umt5iz/4F8VsDDI9X8kVc5Lv0RVk="; + hash = "sha256-Ejn99MArKZjCHsl81WSHfpWV3Kz/mBrItIa0tPVProU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix index 5cbcf13703..d167d66b35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix @@ -6,6 +6,7 @@ , cu2qu , defcon , fetchPypi +, fontmath , fonttools , pytestCheckHook , pythonOlder @@ -17,14 +18,14 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.1.0"; + version = "3.2.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5EUrML1Yd88tVEP+Kd9TmXm+5Ejk/XIH/USYBakK/wQ="; + hash = "sha256-5HWhRxKs4KQdC1v0LaLgndgMwtcGKLVz9tYtesdJ8Oo="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cu2qu + fontmath fonttools defcon compreffor diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix index 9820902a69..fa48931594 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pythonAtLeast +, pythonOlder , spark-parser , xdis , nose @@ -12,18 +12,22 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.9.0"; + version = "3.9.1"; format = "setuptools"; - disabled = pythonAtLeast "3.9"; # See: https://github.com/rocky/python-uncompyle6/issues/331 src = fetchPypi { inherit pname version; - hash = "sha256-HmqQLeYOpcP30q9+J0UAa05Lm97eiIoH+EQcmTjy7n0="; + hash = "sha256-xFHDjrPFzINOuLip5uCwzzIm5NlNCP0nbdA/6RWO2yc="; }; - nativeCheckInputs = [ nose pytest hypothesis six ]; propagatedBuildInputs = [ spark-parser xdis ]; + nativeCheckInputs = [ nose pytest hypothesis six ]; + + # Tests attempt to decompile bytecode of the python version + # that is running the tests - this does not work for versions + # above 3.8, but they decompile older bytecode fine + doCheck = pythonOlder "3.9"; # six import errors (yet it is supplied...) checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unidata-blocks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unidata-blocks/default.nix index 1275543088..93857756bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unidata-blocks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unidata-blocks/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "unidata-blocks"; - version = "0.0.9"; + version = "0.0.10"; disabled = pythonOlder "3.11"; src = fetchPypi { pname = "unidata_blocks"; inherit version; - hash = "sha256-OuIhajgUyO5qdcxJCO06Q1xNbeSNGzlbaWnAqXORm9g="; + hash = "sha256-wwiOjfIAx6AZtK98uuPQ0jwblq+CdnMQp+JkQWh+RgM="; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix index a0c1f24a5c..3519d35c20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { homepage = "https://github.com/matiasb/python-unidiff"; changelog = "https://github.com/matiasb/python-unidiff/raw/v${version}/HISTORY"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ maintainers.pbsds ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/units/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/units/default.nix deleted file mode 100644 index 90e7c73b56..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/units/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "units"; - version = "0.07"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "43eb3e073e1b11289df7b1c3f184b5b917ccad178b717b03933298716f200e14"; - }; - - meta = with lib; { - description = "Python support for quantities with units"; - homepage = "https://bitbucket.org/adonohue/units/"; - license = licenses.psfl; - maintainers = [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix index 36768b0fcc..030ab4337e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -1,44 +1,48 @@ -{ lib -, fetchFromGitHub -, buildPythonPackage -, lxml -, pythonAtLeast -, pythonOlder -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + lxml, + pytestCheckHook, + pythonAtLeast, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "unittest-xml-reporting"; version = "3.2.0"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "xmlrunner"; repo = "unittest-xml-reporting"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-lOJ/+8CVJUXdIaZLLF5PpPkG0DzlNgo46kRZ1Xy7Ju0="; }; - propagatedBuildInputs = [ - lxml - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + dependencies = [ lxml ]; - pytestFlagsArray = lib.optionals (pythonAtLeast "3.11") [ - # AttributeError: 'tuple' object has no attribute 'shortDescription' - "--deselect=tests/testsuite.py::XMLTestRunnerTestCase::test_basic_unittest_constructs" - "--deselect=tests/testsuite.py::XMLTestRunnerTestCase::test_unexpected_success" - ]; + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = + lib.optionals (pythonAtLeast "3.11") [ + # AttributeError: 'tuple' object has no attribute 'shortDescription' + "test_basic_unittest_constructs" + "test_unexpected_success" + ] + ++ lib.optionals (pythonAtLeast "3.12") [ "test_xmlrunner_hold_traceback" ]; pythonImportsCheck = [ "xmlrunner" ]; meta = with lib; { + description = "Unittest-based test runner with Ant/JUnit like XML reporting"; homepage = "https://github.com/xmlrunner/unittest-xml-reporting"; - description = "unittest-based test runner with Ant/JUnit like XML reporting"; + changelog = "https://github.com/xmlrunner/unittest-xml-reporting/releases/tag/${version}"; license = licenses.bsd2; maintainers = with maintainers; [ rprospero ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix index 3b797ed297..a2de522334 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.13.2"; + version = "0.13.4"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-6pR/tewHWstgIqqD8Jwj+AQutdhXU5aufm6RiEpXr9s="; + hash = "sha256-HAZVnyjbeHF6knipTxmmy/BI1wvoJ8c65PiMAIqgJ+0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix index ea00a6c97e..da85053a7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix @@ -1,37 +1,51 @@ { lib , buildPythonPackage +, fetchFromGitHub +, pyserial-asyncio-fast +, pytestCheckHook , pythonOlder -, fetchPypi -, pyserial-asyncio , pytz +, poetry-core }: buildPythonPackage rec { pname = "upb-lib"; - version = "0.5.4"; - format = "setuptools"; + version = "0.5.6"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; - src = fetchPypi { - pname = "upb_lib"; - inherit version; - hash = "sha256-KEnSADj+sQtz37Xbi6fXoe2TN+F5Z9SYnlvCgXtxVnk="; + src = fetchFromGitHub { + owner = "gwww"; + repo = "upb-lib"; + rev = "refs/tags/${version}"; + hash = "sha256-e8LYywKA5lNZ4UYFZTwcfePDWB4cTNz38Tiy4xzOxOs="; }; - propagatedBuildInputs = [ - pyserial-asyncio + build-system = [ + poetry-core + ]; + + dependencies = [ + pyserial-asyncio-fast pytz ]; - # no tests on PyPI, no tags on GitHub - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "upb_lib" ]; + disabledTests = [ + # AssertionError + "test_create_control_word_all" + ]; + meta = with lib; { description = "Library for interacting with UPB PIM"; homepage = "https://github.com/gwww/upb-lib"; + changelog = "https://github.com/gwww/upb-lib/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix index 4fd55870b0..094e118340 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.3.2"; + version = "5.3.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,15 +28,15 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-dq362pevqgLx5KwZ19zQ6aOn5NCyiqynPCF7YdI6tkw="; + hash = "sha256-ptfT31eUNSpVaZfXAyRcIc2T2p82rXmzUyySSVbI9lI="; }; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ awkward cramjam numpy @@ -76,6 +76,7 @@ buildPythonPackage rec { "test_http_size" "test_http_size_port" "test_issue_1054_filename_colons" + "test_multiple_page_lists" "test_no_multipart" "test_open_fsspec_github" "test_open_fsspec_http" @@ -83,6 +84,7 @@ buildPythonPackage rec { "test_pickle_roundtrip_http" "test_split_ranges_if_large_file_in_http" # Cyclic dependency with dask-awkward + "test_dask_duplicated_keys" "test_decompression_executor_for_dask" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uptime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uptime/default.nix index 7dd3710b81..d20bd4dc55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uptime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uptime/default.nix @@ -1,23 +1,34 @@ -{ lib -, buildPythonPackage -, fetchPypi +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "uptime"; version = "3.0.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0wr9jkixprlywz0plyn5p42a5fd31aiwvjrxdvj7r02vfxa04c3w"; + hash = "sha256-fDACVHdbgHzkbj3LzaMKo7miBLnFenrB557m2+OUKXM="; }; + build-system = [ setuptools ]; + + # Tests are not shipped + doCheck = false; + + pythonImportsCheck = [ "uptime" ]; + meta = with lib; { - homepage = "https://github.com/Cairnarvon/uptime"; description = "Cross-platform way to retrieve system uptime and boot time"; + homepage = "https://github.com/Cairnarvon/uptime"; license = licenses.bsd2; maintainers = with maintainers; [ rob ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uqbar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uqbar/default.nix index c7c6e8e2ee..046e3425a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uqbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uqbar/default.nix @@ -4,21 +4,23 @@ , pytestCheckHook , pythonAtLeast , pythonOlder +, defusedxml , setuptools , sphinx +, typing-extensions , unidecode }: buildPythonPackage rec { pname = "uqbar"; - version = "0.7.3"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-9KQmLCsIiHcdiAu4GeEu+wa3lGwEZOO+oHWuhFNosR0="; + hash = "sha256-q4p+ki5wA/gYGWnt2tzCiEakk4fBl9P96ONz2ZxlCCg="; }; postPatch = '' @@ -40,6 +42,11 @@ buildPythonPackage rec { pytestCheckHook ]; + checkInputs = [ + defusedxml + typing-extensions + ]; + disabledTests = [ # UnboundLocalError: local variable 'output_path' referenced before assignment "test_01" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix index 1d9a4bf166..aff9556f04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.6.10"; + version = "2.6.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-myweD5+FHhDpPvS+3sB9vfhsOfPVagtfVF5EY9uIGRo="; + hash = "sha256-EArHHsHqr1z+UhdsUCc4IPZa33sSCaR1sDSr7eCGSOM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix index 6201bb6157..2694880594 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.27.1"; + version = "0.29.0"; disabled = pythonOlder "3.8"; pyproject = true; src = fetchFromGitHub { owner = "encode"; - repo = pname; + repo = "uvicorn"; rev = "refs/tags/${version}"; - hash = "sha256-p0iPQE66RJfd811x6cnv7m3yvD/L9v7evBXlaIQSE0M="; + hash = "sha256-D0FdZxaDB+9N/7p73GF8qw0UwbXTQrKc1WOgy9UltxA="; }; outputs = [ @@ -34,9 +34,9 @@ buildPythonPackage rec { "testsout" ]; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ click h11 ] ++ lib.optionals (pythonOlder "3.11") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uxsim/add-qt-plugin-path-to-env.patch b/third_party/nixpkgs/pkgs/development/python-modules/uxsim/add-qt-plugin-path-to-env.patch new file mode 100644 index 0000000000..42f001085d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/uxsim/add-qt-plugin-path-to-env.patch @@ -0,0 +1,24 @@ +diff --git a/uxsim/__init__.py b/uxsim/__init__.py +index 01e1ad1..de1f0fd 100644 +--- a/uxsim/__init__.py ++++ b/uxsim/__init__.py +@@ -1,8 +1,14 @@ +-from .uxsim import * +-from .utils import * ++import os ++ + from .analyzer import * ++from .utils import * ++from .uxsim import * ++ ++# Only set our own plugin path if it's not already set ++if not os.getenv("QT_PLUGIN_PATH"): ++ os.environ["QT_PLUGIN_PATH"] = "$NIX_QT_PLUGIN_PATH" + + __version__ = "1.1.1" + __author__ = "Toru Seo" + __copyright__ = "Copyright (c) 2023 Toru Seo" +-__license__ = "MIT License" +\ No newline at end of file ++__license__ = "MIT License" + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uxsim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uxsim/default.nix new file mode 100644 index 0000000000..e08eec1d6c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/uxsim/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, + qt5, + hackgen-font, + python3, + matplotlib, + numpy, + pandas, + pillow, + pyqt5, + scipy, + tqdm, +}: +buildPythonPackage rec { + pname = "uxsim"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "toruseo"; + repo = "UXsim"; + rev = "v${version}"; + hash = "sha256-qPAFodvx+Z7RsRhzdTq1TRsbvrUFaqRJZxYg3FM6q8A="; + }; + + patches = [ + ./add-qt-plugin-path-to-env.patch + ]; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + matplotlib + numpy + pandas + pillow + pyqt5 + scipy + tqdm + ]; + + pythonImportsCheck = ["uxsim"]; + + + # QT_PLUGIN_PATH is required to be set for the program to produce its images + # our patch sets it to $NIX_QT_PLUGIN_PATH if QT_PLUGIN_PATH is not set + # and here we replace this string with the actual path to qt plugins + postInstall = '' + substituteInPlace $out/${python3.sitePackages}/uxsim/__init__.py \ + --replace-fail '$NIX_QT_PLUGIN_PATH' '${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}' + + mkdir -p $out/${python3.sitePackages}/uxsim/files + ln -s ${hackgen-font}/share/fonts/hackgen/HackGen-Regular.ttf $out/${python3.sitePackages}/uxsim/files/ + ''; + + meta = with lib; { + description = "Vehicular traffic flow simulator in road network, written in pure Python"; + homepage = "https://github.com/toruseo/UXsim"; + license = licenses.mit; + maintainers = with maintainers; [vinnymeller]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vacuum-map-parser-base/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vacuum-map-parser-base/default.nix index c6656eb979..e27ea9d8b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vacuum-map-parser-base/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vacuum-map-parser-base/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "vacuum-map-parser-base"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "PiotrMachowski"; repo = "Python-package-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-moCWUPzn9stxehVEnjqpx8ILYhxzuy8QG+uxR53rCew="; + hash = "sha256-wX7RsJKSNZmi6uIDqsKxWe8VaYJPg4I3pwHHckMUOw4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix index 1bccdf0af0..68683c1d76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "vacuum-map-parser-roborock"; - version = "0.1.1"; + version = "0.1.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "PiotrMachowski"; repo = "Python-package-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-cZNmoqzU73iF965abFeM6qgEVmg6j2kIQHDhj1MYQpE="; + hash = "sha256-y7Q8C7ZvOn/KSUMJ7A/oH+HZMVBpuPitsXqsqHvvYHE="; }; postPatch = '' @@ -27,9 +27,9 @@ buildPythonPackage rec { --replace "0.0.0" "${version}" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ pillow vacuum-map-parser-base ]; @@ -40,8 +40,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "vacuum_map_parser_roborock" ]; meta = with lib; { - homepage = "https://github.com/PiotrMachowski/Python-package-vacuum-map-parser-roborock"; description = "Functionalities for Roborock vacuum map parsing"; + homepage = "https://github.com/PiotrMachowski/Python-package-vacuum-map-parser-roborock"; changelog = "https://github.com/PiotrMachowski/Python-package-vacuum-map-parser-roborock/releases/tag/v${version}"; maintainers = with maintainers; [ jamiemagee ]; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validator-collection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validator-collection/default.nix index 8625956d77..60cc3c9c6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/validator-collection/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/validator-collection/default.nix @@ -135,6 +135,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "validator_collection" ]; + disabledTests = [ + # Issues with fake filesystem /var/data + "test_writeable" + "test_executable" + "test_readable" + "test_is_readable" + ]; + meta = with lib; { description = "Python library of 60+ commonly-used validator functions"; homepage = "https://github.com/insightindustry/validator-collection/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix index 8e29effda9..4a5e2f7df1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix @@ -1,15 +1,16 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "validators"; - version = "0.22.0"; - format = "pyproject"; + version = "0.28.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -17,26 +18,20 @@ buildPythonPackage rec { owner = "python-validators"; repo = "validators"; rev = "refs/tags/${version}"; - hash = "sha256-Qu6Tu9uIluT1KBJYkFjDFt9AWN2Kez3uCYDQknXqYrU="; + hash = "sha256-r3SQvt96y8e9odWxz0GjVKH3+Pa0Lqs+tbhryeGaZUU="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "validators" - ]; + pythonImportsCheck = [ "validators" ]; meta = with lib; { description = "Python Data Validation for Humans"; homepage = "https://github.com/python-validators/validators"; changelog = "https://github.com/python-validators/validators/blob/${version}/CHANGES.md"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix index b9046f991f..b417245498 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { homepage = "https://github.com/pimutils/vdirsyncer"; changelog = "https://github.com/pimutils/vdirsyncer/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ loewenheim ]; + maintainers = [ ]; mainProgram = "vdirsyncer"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/versioningit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/versioningit/default.nix index a58f2d6133..f5c6180b23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/versioningit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/versioningit/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "versioningit"; - version = "3.0.0"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-TjzkemQk2FCunlXhsTSgIOn8vLiVM48QfytcUdNMnBs="; + hash = "sha256-eqxxPDGlPrNnprvC6LPejMK4bRDUXFEBr9ZRRGyxD9c="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/verspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/verspec/default.nix index 05a6a446c2..d8bd972a99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/verspec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/verspec/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/jimporter/verspec"; changelog = "https://github.com/jimporter/averspec/releases/tag/v${version}"; license = with licenses; [ bsd2 /* and */ asl20 ]; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virt-firmware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virt-firmware/default.nix index 8f2f0c0736..d5da9d57c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virt-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virt-firmware/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "virt-firmware"; - version = "24.2"; + version = "24.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bvk3MIgPY6DJ+y0eKQHLffClNjPAEP7AJ15rFObiMig="; + hash = "sha256-rqhaKDOQEOj6bcRz3qZJ+a4yG1qTC9SUjuxMhZlnmwU="; }; pythonImportsCheck = [ "virt.firmware.efi" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix index 51c1d12b18..2ae7abe457 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tests/__init__.py \ --replace "'virtualenv'" "'${virtualenv}/bin/virtualenv'" \ - --replace "'3.9', '3.10']" "'3.9', '3.10', '3.11']" # if the Python version used isn't in this list, tests fail + --replace "'3.9', '3.10']" "'3.9', '3.10', '3.11', '3.12']" # if the Python version used isn't in this list, tests fail substituteInPlace tests/test_virtualenv_sys.py \ --replace "'virtualenv'" "'${virtualenv}/bin/virtualenv'" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix index 44ca0ff4f4..d2b6033812 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.25.1"; + version = "20.25.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4I4T7NynoL1TeY81bVgxQ0r6Wwe5Pwq98Hl7egb/4Zc="; + hash = "sha256-e7VUu9/qrMM0n6YU6lv/asMA/HwzXp+s86O8/HA/Rb4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix index f8e2a8bd56..adaf1ed7fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.18.1"; + version = "0.18.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "vt-py"; rev = "refs/tags/${version}"; - hash = "sha256-rWzANh7tkayFR6V3JaF3BLhIjUlnrPMmEmI36Ncqz2M="; + hash = "sha256-Uspd422JlBKlsD/K7NciYhYUb12wInN/Z7zTw7aYP28="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wadllib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wadllib/default.nix index c7bc19ee51..9fc8988de7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wadllib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wadllib/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Navigate HTTP resources using WADL files as guides"; homepage = "https://launchpad.net/wadllib"; license = licenses.lgpl3; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix index 947022eab4..0f27482088 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix @@ -1,10 +1,10 @@ { stdenv , lib , rustPlatform -, rustc , callPackage , fetchFromGitHub , buildPythonPackage +, pythonAtLeast , libiconv , libffi , libxml2 @@ -22,7 +22,7 @@ let , extraBuildInputs ? [ ] }: buildPythonPackage rec { inherit pname; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; outputs = [ "out" ] ++ lib.optional (pname == "wasmer") "testsout"; @@ -31,7 +31,7 @@ let owner = "wasmerio"; repo = "wasmer-python"; rev = version; - hash = "sha256-nOeOhQ1XY+9qmLGURrI5xbgBUgWe5XRpV38f73kKX2s="; + hash = "sha256-Iu28LMDNmtL2r7gJV5Vbb8HZj18dlkHe+mw/Y1L8YKE="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -69,6 +69,8 @@ let pythonImportsCheck = [ "${lib.replaceStrings ["-"] ["_"] pname}" ]; meta = with lib; { + # https://github.com/wasmerio/wasmer-python/issues/778 + broken = pythonAtLeast "3.12"; description = "Python extension to run WebAssembly binaries"; homepage = "https://github.com/wasmerio/wasmer-python"; license = licenses.mit; @@ -81,19 +83,19 @@ in wasmer = common { pname = "wasmer"; buildAndTestSubdir = "packages/api"; - cargoHash = "sha256-twoog8LjQtoli+TlDipSuB7yLFkXQJha9BqobqgZW3Y="; + cargoHash = "sha256-vpbwU1HrIQmQkce9SK8UOHrX5tOLv/XKsfJHteqOteA="; }; wasmer-compiler-cranelift = common { pname = "wasmer-compiler-cranelift"; buildAndTestSubdir = "packages/compiler-cranelift"; - cargoHash = "sha256-IqeMOY6emhIC7ekH8kIOZCr3JVkjxUg/lQli+ZZpdq4="; + cargoHash = "sha256-nv4cr52mUIuR3LWRT3eXU5b2LORwuN4iMbLX1efzovI="; }; wasmer-compiler-llvm = common { pname = "wasmer-compiler-llvm"; buildAndTestSubdir = "packages/compiler-llvm"; - cargoHash = "sha256-xawbf5gXXV+7I2F2fDSaMvjtFvGDBtqX7wL3c28TSbA="; + cargoHash = "sha256-FA/xXlPaK8NxZIw7MCm9Fyesgu72Dsxhmb5xzOIINhE="; extraNativeBuildInputs = [ llvm_14 ]; extraBuildInputs = [ libffi libxml2.out ncurses zlib ]; }; @@ -101,6 +103,6 @@ in wasmer-compiler-singlepass = common { pname = "wasmer-compiler-singlepass"; buildAndTestSubdir = "packages/compiler-singlepass"; - cargoHash = "sha256-4nZHMCNumNhdGPOmHXlJ5POYP7K+VPjwhEUMgzGb/Rk="; + cargoHash = "sha256-yew7cB/7RLjW55jZmHFfIvaErgZ6XVxL1ucGGX2Cx18="; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchdog-gevent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchdog-gevent/default.nix index e1b812b961..fb5951a38c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchdog-gevent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchdog-gevent/default.nix @@ -1,25 +1,37 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, gevent -, pytestCheckHook -, watchdog +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + gevent, + pytestCheckHook, + setuptools, + pythonOlder, + watchdog, }: buildPythonPackage rec { pname = "watchdog-gevent"; version = "0.1.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; - # Need to fetch from github because tests are not present in pypi src = fetchFromGitHub { owner = "Bogdanp"; repo = "watchdog_gevent"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-FESm3fNuLmOg2ilI/x8U9LuAimHLnahcTHYzW/nzOVY="; }; - propagatedBuildInputs = [ watchdog gevent ]; + patches = [ + # Add new event_filter argument to GeventEmitter + (fetchpatch { + name = "new-event_filter-argument.patch"; + url = "https://github.com/Bogdanp/watchdog_gevent/commit/a98b6599aefb6f1ea6f9682485ed460c52f6e55f.patch"; + hash = "sha256-lbUtl8IbnJjlsIpbC+wXLvYB+ZtUuHWqFtf31Bfqc2I="; + }) + ]; postPatch = '' sed -i setup.cfg \ @@ -27,6 +39,13 @@ buildPythonPackage rec { -e 's:--cov-report html::' ''; + build-system = [ setuptools ]; + + dependencies = [ + gevent + watchdog + ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "watchdog_gevent" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weasel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weasel/default.nix index 26418749c8..e38c815d7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weasel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weasel/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "cloudpathlib" "smart-open" + "typer" ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix index 5db1981412..9047bc8fb1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix @@ -1,46 +1,57 @@ -{ lib -, authlib -, buildPythonPackage -, fetchPypi -, pythonOlder -, setuptools-scm -, tqdm -, validators +{ + lib, + authlib, + buildPythonPackage, + fetchFromGitHub, + grpcio, + grpcio-health-checking, + grpcio-tools, + httpx, + pydantic, + pythonOlder, + pythonRelaxDepsHook, + setuptools-scm, + tqdm, + validators, }: buildPythonPackage rec { pname = "weaviate-client"; - version = "4.5.1"; - format = "setuptools"; + version = "4.6.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-gElboFIwEMiwN6HhpPPT+tcmh0pMiDjq7R8TG2eMMKI="; + src = fetchFromGitHub { + owner = "weaviate"; + repo = "weaviate-python-client"; + rev = "refs/tags/v${version}"; + hash = "sha256-F4FFG8W8zjEcD1OssioKTik0sy6B/kGITYfW+bqhNkQ="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "validators>=0.18.2,<=0.21.0" "validators>=0.18.2" \ - --replace "requests>=2.28.0,<2.29.0" "requests>=2.28.0" - ''; - - nativeBuildInputs = [ - setuptools-scm + pythonRelaxDeps = [ + "httpx" + "validators" ]; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ authlib + grpcio + grpcio-health-checking + grpcio-tools + httpx + pydantic tqdm validators ]; doCheck = false; - pythonImportsCheck = [ - "weaviate" - ]; + pythonImportsCheck = [ "weaviate" ]; meta = with lib; { description = "Python native client for easy interaction with a Weaviate instance"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix index ad28892290..f1197fe4a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "webauthn"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "duo-labs"; repo = "py_webauthn"; rev = "refs/tags/v${version}"; - hash = "sha256-StqoSrzErV13/OUpSWbI+6N5tSFPEpvnmQcDiZMaXPI="; + hash = "sha256-AfQ3lt0WvoThU5kCE7MzhAXwbqmNaCrUqOMWI937hO4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webdataset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webdataset/default.nix index 5f18d28f9f..1215d5a1c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webdataset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webdataset/default.nix @@ -16,14 +16,14 @@ }: buildPythonPackage rec { pname = "webdataset"; - version = "0.2.86"; + version = "0.2.90"; pyproject = true; src = fetchFromGitHub { owner = "webdataset"; repo = "webdataset"; rev = "refs/tags/${version}"; - hash = "sha256-aTjxoSoQ9LH4gcFmV+7Aj0HNIpvsFHTrxFUpAtB3nkM="; + hash = "sha256-selj7XD7NS831lbPnx/4o46bNpsxuFdSEIIb4S2b7S0="; }; nativeBuildInputs = [ @@ -51,21 +51,26 @@ buildPythonPackage rec { disabledTests = [ # requires network "test_batched" + "test_cache_dir" + "test_concurrent_download_and_open" "test_dataloader" "test_decode_handlers" "test_decoder" - "test_decoder" "test_download" "test_handlers" "test_pipe" + "test_remote_file" "test_shard_syntax" "test_torchvision" - "test_torchvision" "test_unbatched" "test_yaml3" ] ++ lib.optionals stdenv.isDarwin [ # pickling error "test_background_download" + ] ++ lib.optionals (stdenv.isx86_64 && stdenv.isDarwin) [ + "test_concurrent_access" + # fails to patch 'init_process_group' from torch.distributed + "TestDistributedChunkedSampler" ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ # segfaults on aarch64-linux "test_webloader" @@ -78,6 +83,7 @@ buildPythonPackage rec { description = "A high-performance Python-based I/O system for large (and small) deep learning problems, with strong support for PyTorch"; mainProgram = "widsindex"; homepage = "https://github.com/webdataset/webdataset"; + changelog = "https://github.com/webdataset/webdataset/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ iynaix ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webexteamssdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webexteamssdk/default.nix index 1e81e90af9..30eeb64d83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webexteamssdk/default.nix @@ -1,28 +1,41 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, future -, pyjwt -, pythonOlder -, requests -, requests-toolbelt +{ + lib, + buildPythonPackage, + fetchFromGitHub, + future, + pyjwt, + pythonOlder, + requests, + requests-toolbelt, + setuptools, + versioneer, }: buildPythonPackage rec { pname = "webexteamssdk"; version = "1.6.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CiscoDevNet"; - repo = pname; - rev = "v${version}"; + repo = "webexteamssdk"; + rev = "refs/tags/v${version}"; hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; }; - propagatedBuildInputs = [ + postPatch = '' + # Remove vendorized versioneer + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ future pyjwt requests @@ -32,13 +45,12 @@ buildPythonPackage rec { # Tests require a Webex Teams test domain doCheck = false; - pythonImportsCheck = [ - "webexteamssdk" - ]; + pythonImportsCheck = [ "webexteamssdk" ]; meta = with lib; { description = "Python module for Webex Teams APIs"; homepage = "https://github.com/CiscoDevNet/webexteamssdk"; + changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index 51e380ece2..80ed4c5353 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch2 # build-system , flit-core @@ -29,24 +28,16 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "3.0.1"; + version = "3.0.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-UH6BHs6nKxikBJR63tSzOQ4duPgmtJTXZVDvRbs7Hcw="; + hash = "sha256-45tkWmrJKCJYjns5ppLngockzq4LDXAu+WcB+Q5wEo0="; }; - patches = [ - (fetchpatch2 { - name = "werkzeug-pytest8-compat.patch"; - url = "https://github.com/pallets/werkzeug/commit/4e5bdca7f8227d10cae828f8064fb98190ace4aa.patch"; - hash = "sha256-lVknzvC+HIM6TagpyIOhnb+7tx0UXuGw0tINjsujISI="; - }) - ]; - nativeBuildInputs = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wheel-inspect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wheel-inspect/default.nix index bf2ff4ece6..30c8b30a09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wheel-inspect/default.nix @@ -11,6 +11,7 @@ , pytestCheckHook , pythonOlder , readme-renderer +, setuptools , wheel-filename }: @@ -53,10 +54,14 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - jsonschema pytestCheckHook ]; + checkInputs = [ + setuptools + jsonschema + ]; + pythonImportsCheck = [ "wheel_inspect" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix index 14339d2056..6a682fc300 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.42.0"; + version = "0.43.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WML3/gAK1R9DEeRVZWeO0VRFuNVKP52i5I5mYV6vQcI="; + hash = "sha256-cATYN7GtS1l3GxcqBl95RsBTuszWoFB9CtuRgUSL0/A="; postFetch = '' cd $out mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wheezy-template/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wheezy-template/default.nix index 0baba9c564..53a0bf2867 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wheezy-template/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wheezy-template/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "wheezy.template"; - version = "3.1.0"; + version = "3.2.2"; src = fetchPypi { inherit pname version; - hash = "sha256-4RAHysczaNzhKZjjS2bEdgFrtGFHH/weTVboQALslg8="; + hash = "sha256-hknPXHGPPNjRAr0TYVosPaTntsjwQjOKZBCU+qFlIHw="; }; pythonImportsCheck = [ "wheezy.template" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whenever/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whenever/default.nix index d36baeefcb..cb72e8b0aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whenever/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whenever/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ariebovenberg"; repo = "whenever"; rev = "refs/tags/${version}"; - hash = "sha256-RH2614M91zYULNTQsr6JoKfxlnGyAJsCkB7oeiz7urs="; + hash = "sha256-bG8LV+r5MjA1JwBHWy9/Io4daldAlyEGYNLW+5ITuOw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix index 97efa00b97..1e3ab50118 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -30,6 +30,5 @@ buildPythonPackage rec { description = "IPython HTML widgets for Jupyter"; homepage = "https://github.com/jupyter-widgets/ipywidgets/tree/master/python/widgetsnbextension"; license = ipywidgets.meta.license; # Build from same repo - maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wikitextparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wikitextparser/default.nix index 5f4435c916..8b70b6c63e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wikitextparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wikitextparser/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , fetchFromGitHub +, flit-core , lib , setuptools , pytestCheckHook @@ -9,14 +10,14 @@ buildPythonPackage rec { pname = "wikitextparser"; - version = "0.55.5"; + version = "0.55.13"; format = "pyproject"; src = fetchFromGitHub { owner = "5j9"; repo = "wikitextparser"; rev = "v${version}"; - hash = "sha256-cmzyRbq4tCbuyrNnT0UYxoxuwXrFkIcWdrogSTfxSys="; + hash = "sha256-qLctOX0BsKAn2JzfmV2sTLJ/KcNfaJFAjOB3pxd5LQI="; }; nativeBuildInputs = [ @@ -24,6 +25,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + flit-core wcwidth regex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/winacl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/winacl/default.nix index ab27147d65..3ff55cf32a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/winacl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/winacl/default.nix @@ -1,37 +1,32 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchPypi -, pythonOlder +{ + lib, + buildPythonPackage, + cryptography, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "winacl"; - version = "0.1.8"; - format = "setuptools"; + version = "0.1.9"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RCcaMCVi3lFin2jvFUDUDzom57wBc2RrAaZ3nO2tZEw="; + hash = "sha256-r3DC7DAXi/njyKHEjCXoeBI1/iwbMhrbRuLyrh+NSqs="; }; - propagatedBuildInputs = [ - cryptography - ]; + build-system = [ setuptools ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "cryptography>=38.0.1" "cryptography" - ''; + dependencies = [ cryptography ]; # Project doesn't have tests doCheck = false; - pythonImportsCheck = [ - "winacl" - ]; + pythonImportsCheck = [ "winacl" ]; meta = with lib; { description = "Python module for ACL/ACE/Security descriptor manipulation"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wktutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wktutils/default.nix index 549e7f480b..23529f04a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wktutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wktutils/default.nix @@ -1,25 +1,25 @@ -{ lib -, buildPythonPackage -, dateparser -, defusedxml -, fetchFromGitHub -, fiona -, geomet -, geopandas -, kml2geojson -, pyshp -, pythonOlder -, pyyaml -, regex -, requests -, shapely -, scikit-learn +{ + lib, + buildPythonPackage, + dateparser, + defusedxml, + fetchFromGitHub, + geomet, + geopandas, + kml2geojson, + pyshp, + pythonOlder, + pyyaml, + requests, + setuptools-scm, + shapely, + scikit-learn, }: buildPythonPackage rec { pname = "wktutils"; - version = "1.1.6"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,39 +27,43 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-WKTUtils"; rev = "refs/tags/v${version}"; - hash = "sha256-PFeIMIFOff9ztdmIP7jcFzKkmhm01G0QnDm20AafUsg="; + hash = "sha256-mB+joEZq/aFPcRqFAzPgwG26Wi7WiRCeQeFottk+4Ho="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"twine",' "" + ''; + + build-system = [ setuptools-scm ]; + + dependencies = [ dateparser defusedxml - fiona geomet geopandas kml2geojson pyshp pyyaml - regex - requests shapely - scikit-learn ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "sklearn" "scikit-learn" - ''; + passthru.optional-dependencies = { + extras = [ + requests + scikit-learn + ]; + }; # Module doesn't have tests doCheck = false; - pythonImportsCheck = [ - "WKTUtils" - ]; + pythonImportsCheck = [ "WKTUtils" ]; meta = with lib; { description = "Collection of tools for handling WKTs"; homepage = "https://github.com/asfadmin/Discovery-WKTUtils"; + changelog = "https://github.com/asfadmin/Discovery-WKTUtils/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix index abc876b388..96a3f5ebc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix @@ -2,6 +2,7 @@ , babel , buildPythonPackage , fetchFromGitLab +, fetchpatch , pythonRelaxDepsHook , html2text , lxml @@ -11,6 +12,7 @@ , pycountry , pytestCheckHook , python-dateutil +, python-jose , pythonOlder , pyyaml , requests @@ -35,6 +37,14 @@ buildPythonPackage rec { hash = "sha256-M9AjV954H1w64YGCVxDEGGSnoEbmocG3zwltob6IW04="; }; + patches = [ + (fetchpatch { + name = "no-deprecated-pkg_resources.patch"; + url = "https://gitlab.com/woob/woob/-/commit/3283c4c1a935cc71acea98b2d8c88bc4bf28f643.patch"; + hash = "sha256-3bRuv93ivKRxbGr52coO023DlxHZWwUeInXTPqQAeL8="; + }) + ]; + nativeBuildInputs = [ setuptools pythonRelaxDepsHook @@ -47,6 +57,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ babel python-dateutil + python-jose html2text lxml packaging diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wsgidav/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsgidav/default.nix index db7e85e193..c054153230 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wsgidav/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wsgidav/default.nix @@ -1,22 +1,23 @@ -{ lib -, buildPythonPackage -, cheroot -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, defusedxml -, jinja2 -, json5 -, python-pam -, pyyaml -, requests -, setuptools -, webtest +{ + lib, + buildPythonPackage, + cheroot, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + defusedxml, + jinja2, + json5, + python-pam, + pyyaml, + requests, + setuptools, + webtest, }: buildPythonPackage rec { pname = "wsgidav"; - version = "4.3.2"; + version = "4.3.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,12 +26,12 @@ buildPythonPackage rec { owner = "mar10"; repo = "wsgidav"; rev = "refs/tags/v${version}"; - hash = "sha256-93+8h+vRLnspQ/lmdjKYpzSEJSKcqCkB4qRqTuKHNRA="; + hash = "sha256-vUqNC7ixpta0s7wRC5ROSKMa/MsgEBu5rr0XNu69FRw="; }; - build-system = [ - setuptools - ]; + __darwinAllowLocalNetworking = true; + + build-system = [ setuptools ]; dependencies = [ defusedxml @@ -40,8 +41,6 @@ buildPythonPackage rec { pyyaml ]; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ cheroot pytestCheckHook @@ -49,9 +48,7 @@ buildPythonPackage rec { webtest ]; - pythonImportsCheck = [ - "wsgidav" - ]; + pythonImportsCheck = [ "wsgidav" ]; meta = with lib; { description = "Generic and extendable WebDAV server based on WSGI"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wsgitools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsgitools/default.nix index 948f932271..17eb56ec4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wsgitools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wsgitools/default.nix @@ -1,18 +1,32 @@ -{lib -,buildPythonPackage -,fetchPypi +{ + lib, + buildPythonPackage, + pythonAtLeast, + fetchPypi, + setuptools, + pyasyncore, + unittestCheckHook, }: buildPythonPackage rec { pname = "wsgitools"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "0q6kmrkqf02fgww7z1g9cw8f70fimdzs1bvv9inb7fsk0c3pcf1i"; + hash = "sha256-MTh2BwNTu7NsTHuvoH+r0YHjEGfphX84f04Ah2eu02A="; }; + build-system = [ setuptools ]; + + # the built-in asyncore library was removed in python 3.12 + dependencies = lib.optionals (pythonAtLeast "3.12") [ pyasyncore ]; + + pythonImportsCheck = [ "wsgitools" ]; + + nativeCheckInputs = [ unittestCheckHook ]; + meta = with lib; { maintainers = with maintainers; [ clkamp ]; description = "A set of tools working with WSGI"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix index ee93a2c645..a5af618cb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wurlitzer"; - version = "3.0.3"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ik9f5wYYvjhywF393IxFcZHsGHBlRZYnn8we2t6+Pls="; + hash = "sha256-sx07GKtrg5SzrbiyGEGtbUtrsZW5tkKVOHLburTCmyo="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix b/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix index 70175f58c4..c2e4f1b0c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , setuptools -, pythonOlder +, pythonAtLeast , fetchPypi , substituteAll @@ -43,7 +43,7 @@ buildPythonPackage rec { pname = "wxpython"; version = "4.2.1"; format = "other"; - disabled = pythonOlder "3.7"; + disabled = pythonAtLeast "3.12"; src = fetchPypi { pname = "wxPython"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xarray-dataclasses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xarray-dataclasses/default.nix index aae2cdd7f1..44d19a6890 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xarray-dataclasses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xarray-dataclasses/default.nix @@ -4,6 +4,7 @@ , pythonOlder , poetry-core , pytestCheckHook +, pythonRelaxDepsHook , numpy , typing-extensions , xarray @@ -25,6 +26,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "xarray" ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix index e3e3865ce5..ad904dd6e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -52,6 +52,5 @@ buildPythonPackage rec { description = "N-D labeled arrays and datasets in Python"; homepage = "https://github.com/pydata/xarray"; license = licenses.asl20; - maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix index b0b00da0dc..ff5215ccb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix @@ -47,11 +47,15 @@ buildPythonPackage rec { "xcffib" ]; + # Tests use xvfb + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A drop in replacement for xpyb, an XCB python binding"; homepage = "https://github.com/tych0/xcffib"; changelog = "https://github.com/tych0/xcffib/releases/tag/v${version}"; license = licenses.asl20; + platforms = platforms.linux ++ platforms.darwin ++ platforms.windows; maintainers = with maintainers; [ kamilchm ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix index 9f5d40248c..5fda8fce96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix @@ -11,25 +11,18 @@ buildPythonPackage rec { pname = "xdis"; - version = "6.0.5"; + version = "6.1.0"; format = "setuptools"; - # No support for Python 3.11, https://github.com/rocky/python-xdis/issues/98 - disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = "refs/tags/${version}"; - hash = "sha256-3mL0EuPHF/dithovrYvMjweYGwGhrN75N9MRfLjNC34="; + hash = "sha256-KgKTO99T2/be1sBs5rY3Oy7/Yl9WGgdG3hqqkZ7D7ZY="; }; - postPatch = '' - # Our Python release is not in the test matrix - substituteInPlace xdis/magics.py \ - --replace "3.10.4" "3.10.5 3.10.6 3.10.7 3.10.8 3.10.10 3.10.11 3.10.12 3.10.13 3.10.14" - ''; - propagatedBuildInputs = [ click six @@ -43,13 +36,16 @@ buildPythonPackage rec { "xdis" ]; - # import file mismatch: - # imported module 'test_disasm' has this __file__ attribute: - # /build/source/pytest/test_disasm.py - # which is not the same as the test file we want to collect: - # /build/source/test_unit/test_disasm.py disabledTestPaths = [ + # import file mismatch: + # imported module 'test_disasm' has this __file__ attribute: + # /build/source/pytest/test_disasm.py + # which is not the same as the test file we want to collect: + # /build/source/test_unit/test_disasm.py "test_unit/test_disasm.py" + + # Doesn't run on non-2.7 but has global-level mis-import + "test_unit/test_dis27.py" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix index f0bfe71fcb..3cf0564c70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , python , xvfb-run -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , pygobject3 , graphviz @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = [ pygobject3 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix index 221346d2c7..02f6bc25c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -1,23 +1,24 @@ -{ lib -, bleak -, bleak-retry-connector -, bluetooth-data-tools -, bluetooth-sensor-state-data -, buildPythonPackage -, cryptography -, fetchFromGitHub -, home-assistant-bluetooth -, poetry-core -, pycryptodomex -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, sensor-state-data +{ + lib, + bleak, + bleak-retry-connector, + bluetooth-data-tools, + bluetooth-sensor-state-data, + buildPythonPackage, + cryptography, + fetchFromGitHub, + home-assistant-bluetooth, + poetry-core, + pycryptodomex, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + sensor-state-data, }: buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.28.0"; + version = "0.29.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-Va/fzGDjBR/h1lUN47AixZnDYzEPNXQKTVXILKayhBc="; + hash = "sha256-+zMjnLUzI8ctucvxXts7V4lN4Gp0ZQtArhpXUCBvhF0="; }; postPatch = '' @@ -34,14 +35,11 @@ buildPythonPackage rec { --replace-fail " --cov=xiaomi_ble --cov-report=term-missing:skip-covered" "" ''; - build-system = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; - pythonRelaxDeps = [ - "pycryptodomex" - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "pycryptodomex" ]; dependencies = [ bleak @@ -54,13 +52,9 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "xiaomi_ble" - ]; + pythonImportsCheck = [ "xiaomi_ble" ]; meta = with lib; { description = "Library for Xiaomi BLE devices"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix index fd027903d7..7ab5192b6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.20.1"; + version = "3.21.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-JDJZegJR34aaIzMdq/GYzOpIBH7epe9yHnUaI7OzRes="; + hash = "sha256-7lYNEyoLYbxn1ld08eXaN8BumYhN9EftpHQKxdu64MY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmldiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmldiff/default.nix index 6356b9bff3..2fc4a739e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmldiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmldiff/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "xmldiff"; version = "2.6.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,11 @@ buildPythonPackage rec { hash = "sha256-GbAws/o30fC1xa2a2pBZiEw78sdRxd2PHrTtSc/j/GA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ lxml setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix index f03f000686..61bdd69136 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "3.3.0"; + version = "3.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-kqaS6h0bJvJQoVa4L2qhkvuZsK4a6vtqek/wWN22R6I="; + hash = "sha256-Sy70OQvKx0H8vxRFTEkg+QV9eVij5C9dlAwJ2HTFOi8="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix index 94af405e8f..28dfd80dcd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "xmlsec"; - version = "1.3.13"; + version = "1.3.14"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-kW9deOgEH2zZORq7plnajJSk/vcZbRJtQK8f9Bfyz4Y="; + hash = "sha256-k0+ATy+JW824bx6u4ja2YQE1YO5p7BCNKc3W5fKSotk="; }; nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix index bc8146a914..7d5eb445d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix @@ -1,33 +1,37 @@ -{ lib -, buildPythonPackage -, cdcs -, datamodeldict -, fetchFromGitHub -, ipython -, lxml -, numpy -, pandas -, pymongo -, pytestCheckHook -, pythonOlder -, tqdm +{ + lib, + buildPythonPackage, + cdcs, + datamodeldict, + fetchFromGitHub, + ipython, + lxml, + numpy, + pandas, + pymongo, + pytestCheckHook, + pythonOlder, + setuptools, + tqdm, }: buildPythonPackage rec { pname = "yabadaba"; - version = "0.2.1"; - format = "setuptools"; + version = "0.2.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "usnistgov"; - repo = pname; - rev = "v${version}"; - hash = "sha256-D3dzO+vhf1utBMmX2RUgvxuaPneFnXDseqfz6CMDmv4="; + repo = "yabadaba"; + rev = "refs/tags/v${version}"; + hash = "sha256-NfvnUrTnOeNfiTMrcRtWU3a/Wb6qsDeQlk5jwZ1OpgI="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cdcs datamodeldict ipython @@ -38,13 +42,9 @@ buildPythonPackage rec { tqdm ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "yabadaba" - ]; + pythonImportsCheck = [ "yabadaba" ]; preCheck = '' export HOME=$(mktemp -d); @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Abstraction layer allowing for common interactions with databases and records"; homepage = "https://github.com/usnistgov/yabadaba"; + changelog = "https://github.com/usnistgov/yabadaba/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix index 0400906ea8..88b1385945 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-+FdQQzQhKhIOEnOym2DNT9uQL2uAbfE8tUXUHIFFK2I="; + hash = "sha256-+Sn+d6CuxIUEDLkDvcq7OT3AumElJFfWCwM02LPIeyg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix index ae5705d997..b02cec6577 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix @@ -1,44 +1,45 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pytestCheckHook -, pyyaml -, ruamel-yaml +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pytestCheckHook, + pyyaml, + ruamel-yaml, + setuptools, }: buildPythonPackage rec { pname = "yamale"; - version = "5.1.0"; - format = "setuptools"; + version = "5.2.1"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "23andMe"; - repo = pname; + repo = "yamale"; rev = "refs/tags/${version}"; - hash = "sha256-WLI3cL6i7eLfaX1nN8K/fHlrkOm+JdTEscelql6jO44="; + hash = "sha256-iiiQAZ050FintRSV3l2zfikTNmphhJgrn+4tUHORiSk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyyaml ruamel-yaml ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "yamale" - ]; + pythonImportsCheck = [ "yamale" ]; meta = with lib; { description = "A schema and validator for YAML"; - mainProgram = "yamale"; homepage = "https://github.com/23andMe/Yamale"; + changelog = "https://github.com/23andMe/Yamale/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ rtburns-jpl ]; + mainProgram = "yamale"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix index 26b39ed87e..ee3a15d11b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix @@ -6,6 +6,7 @@ , pdm-backend , pytest-freezegun , pytest-xdist +, pytest , pytestCheckHook , pythonOlder , ruyaml @@ -26,12 +27,12 @@ buildPythonPackage rec { hash = "sha256-nadyBIzXHbWm0QvympRaYU38tuPJ3TPJg8EbvVv+4L0="; }; - nativeBuildInputs = [ + build-system = [ setuptools pdm-backend ]; - propagatedBuildInputs = [ + dependencies = [ click maison ruyaml @@ -51,24 +52,9 @@ buildPythonPackage rec { "yamlfix" ]; - disabledTests = [ - # AssertionError: assert ... Fixed in... - "test_check_one_file_no_changes" - "test_config_parsing" - "test_corrects_code_from_stdin" - "test_corrects_one_file" - "test_corrects_three_files" - "test_empty_list_inline_comment_indentation" - "test_find_files" - "test_fix_code_converts_non_valid_false_booleans" - "test_ignores_correct_files" - "test_include_exclude_files" - "test_read_prefixed_environment_variables" - "test_section_whitelines" - "test_whitelines" - "test_sequence_style_env_enum_parsing" - "test_verbose_option" - "test_enforcing_flow_style_together_with_adjustable_newlines" + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ydiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ydiff/default.nix index 04f9be193a..fa91086ed5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ydiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ydiff/default.nix @@ -1,15 +1,15 @@ -{ lib, buildPythonPackage, fetchPypi, docutils, pygments +{ lib, buildPythonPackage, fetchPypi, pygments , gitMinimal, mercurial, subversion, patchutils, less }: buildPythonPackage rec { pname = "ydiff"; - version = "1.2"; + version = "1.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121"; + sha256 = "sha256-ii6EWI7zHT5SVwD6lksfmqth8MnEYoHgU0GlbgHc17g="; }; patchPhase = '' @@ -26,11 +26,11 @@ buildPythonPackage rec { patchShebangs tests/*.sh ''; - nativeCheckInputs = [ docutils pygments ]; + nativeCheckInputs = [ pygments ]; checkPhase = '' runHook preCheck - make doc-check reg # We don't want the linter or coverage check. + make reg # We don't want the linter or coverage check. runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix index c1b4703ea4..8a567cd5a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.4.3"; + version = "0.4.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = "yolink-api"; rev = "refs/tags/v${version}"; - hash = "sha256-cLuto2V5i3au1MRYYbgR2plw9YBpgIAxsG2fu4t37jk="; + hash = "sha256-yRxv3Itj+SkLtj5rErOzJoxj0JhsAWrdi0DucKZKKIU="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/youless-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/youless-api/default.nix index ff10359238..5c923e0bb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/youless-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/youless-api/default.nix @@ -1,48 +1,39 @@ -{ lib -, buildPythonPackage -, fetchFromBitbucket -, pythonOlder -, certifi -, chardet -, idna -, pynose -, requests -, urllib3 +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { pname = "youless-api"; - version = "1.0.1"; - format = "setuptools"; + version = "1.1.1"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchFromBitbucket { - owner = "jongsoftdev"; + src = fetchFromGitHub { + owner = "gjong"; repo = "youless-python-bridge"; - rev = version; - hash = "sha256-49/HmkGr87aDhr8GEtARpXvr2RcgmLdAqhvMLI5x+vQ="; + rev = "refs/tags/${version}"; + hash = "sha256-J3YRRVcA4LYxuJMi//LJO8Qt8hapJruZGzONODE3SsQ="; }; - propagatedBuildInputs = [ - certifi - chardet - idna - requests - urllib3 - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pynose - ]; + dependencies = [ requests ]; - pythonImportsCheck = [ - "youless_api" - ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "youless_api" ]; meta = with lib; { description = "Python library for YouLess sensors"; - homepage = "https://pypi.org/project/youless-api/"; + homepage = "https://github.com/gjong/youless-python-bridge"; + changelog = "https://github.com/gjong/youless-python-bridge/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix index 11da850c99..60ec65467d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Search for YouTube videos, channels & playlists & get video information using link without YouTube Data API"; homepage = "https://github.com/alexmercerind/youtube-search-python"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/youtube-transcript-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/youtube-transcript-api/default.nix index e76038267a..526f7e7611 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/youtube-transcript-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/jdepoix/youtube-transcript-api"; changelog = "https://github.com/jdepoix/youtube-transcript-api/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix index 6a7c58c7d8..febf3aad2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "yq"; - version = "3.4.1"; + version = "3.4.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-tVjatvFcA+JKHESHiVALINbzB+6cpMk2E4fzZYFjAA0="; + hash = "sha256-ulhqGm8wz3BbL5IgZxLfIoHNMgKAIQ57e4Cty48lbjs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index 3807380083..edaae03db7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -1,15 +1,16 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, requests -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + requests, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.6.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,30 +19,26 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-DqTcdWVivE2R51qm3XQ7cDnD1a90AocmX9TG+M5reto="; + hash = "sha256-HMWb9NScT4rRMFsUXw6TW/T0P1eH0a46OegUZ0JceiE="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ - requests - ]; + dependencies = [ requests ]; doCheck = false; # requires network access - pythonImportsCheck = [ - "ytmusicapi" - ]; + pythonImportsCheck = [ "ytmusicapi" ]; meta = with lib; { description = "Python API for YouTube Music"; - mainProgram = "ytmusicapi"; homepage = "https://github.com/sigma67/ytmusicapi"; changelog = "https://github.com/sigma67/ytmusicapi/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "ytmusicapi"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix index fcb57b3731..826a496445 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.17.1"; + version = "2.17.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Vks6oHISJUb+aaD6IXNvRmsg+tQXVDNLYmGfCIzkYmE="; + hash = "sha256-LLqmy040LUUVLUp6SyATwzf806jnvJglNWAYDeYFUs4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix index 54c096b642..4e72500da1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zdaemon/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "zdaemon"; - version = "5.0"; + version = "5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ml7GxRmigLvPqPfnP04Q2AjnuCcQq2COD0Sb88BtQ9U="; + hash = "sha256-Iun+UFDq67ngPZrWTk9jzNheBMOP2zUc8RO+9vaNt6Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zephyr-python-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zephyr-python-api/default.nix index 8ff111b605..c91feacb7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zephyr-python-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zephyr-python-api/default.nix @@ -7,12 +7,13 @@ buildPythonPackage rec { pname = "zephyr-python-api"; - version = "0.0.4"; + version = "0.1.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-GIXxpItbRH31PJ7dX48w92LrYY0axbZQoAFXrRGeLas="; + pname = "zephyr_python_api"; + inherit version; + hash = "sha256-YupGiybfhwb+I4ofr6RNBzS6LQfx5BQD/SU5nYrnqFk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index 03413fc6f1..c512dd55bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.114"; + version = "0.0.115"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-FipD4VCz2/FYlf17+q7LTej9ZtT72/R4ELkAQtw7RvE="; + hash = "sha256-qqPBCLYS6yLpK8PzC3atQ73yi15XE3ywIUBVO7JPYVE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha/default.nix index 6e749edb9f..0987ddfab2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zha/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zha/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.5"; + version = "0.0.8"; pyproject = true; disabled = pythonOlder "3.12"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-47dlWMzY1vPmHIDCy8a0xzk2G+OPq6vEK5OpP1c8vw4="; + hash = "sha256-xOaqwgL8NqB3pHNa6U/wextntI5aMivHLaIhSRqvgRU="; }; postPatch = '' @@ -45,12 +45,11 @@ buildPythonPackage rec { ''; pythonRelaxDeps = [ + "bellows" "universal-silabs-flasher" "zha-quirks" ]; - - nativeBuildInputs = [ pythonRelaxDepsHook ]; @@ -94,6 +93,7 @@ buildPythonPackage rec { "test_check_available_unsuccessful" "test_device_counter_sensors" "test_device_tracker" + "test_device_unavailable_skips_entity_polling" "test_elec_measurement_sensor_polling" "test_electrical_measurement_init" "test_group_member_assume_state" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ziafont/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ziafont/default.nix index 788dda3329..d50e5fdefe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ziafont/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ziafont/default.nix @@ -9,9 +9,8 @@ buildPythonPackage rec { pname = "ziafont"; - version = "0.7"; - - format = "pyproject"; + version = "0.8"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -19,10 +18,10 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-DQEVWYOgiGSP3WlmZzEweyRa0UY7fxjjpbued+5EH5I="; + hash = "sha256-C+dC+mNquDuj6RfJpiEbeuGZOIXcgSrTB4XM21reBPs="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ziamath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ziamath/default.nix index c2d72a25f8..592e486edc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ziamath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ziamath/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { pname = "ziamath"; - version = "0.9"; - format = "pyproject"; + version = "0.10"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,14 +20,14 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-ISd+J7R8qZ0NXdlyHMj+torzr+541UAhNCSaUH8ytSQ="; + hash = "sha256-Drssi+YySh4OhVYAOvgIwzeeu5dQbUUXuhwTedhUUt8="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ ziafont ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index 0a32dea664..a52549728b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , aiohttp , aioresponses , aiosqlite @@ -24,7 +25,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.63.5"; + version = "0.64.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +34,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-iZxHXxheyoA5vo0Pxojs7QE8rSyTpsYpJ6/OzDSZJ20="; + hash = "sha256-4p/CUAZQLiADWzjXMOeYUX0OJgZczHrI2/sVRuXiFSI="; }; postPatch = '' @@ -72,9 +73,9 @@ buildPythonPackage rec { ]; disabledTests = [ - # # Our two manual scans succeeded and the periodic one was attempted - # assert len(mock_scan.mock_calls) == 3 - # AssertionError: assert 4 == 3 + # assert quirked.quirk_metadata.quirk_location.endswith("zigpy/tests/test_quirks_v2.py]-line:104") is False + "test_quirks_v2" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isx86_64) [ "test_periodic_scan_priority" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix index 6555d172ce..9ddbd4b433 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix @@ -9,14 +9,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.17.0"; + version = "3.18.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hOZKHCjPfpHtIHi7jMjCWcsZt2lCCWyNe4SUdpDKuvA="; + hash = "sha256-KITtIufYlh3hyaBRQutpokfxICkbwCBqAKdkLwm1txU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zlib-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zlib-ng/default.nix index 7cb498bbb1..71f2c0b768 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zlib-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zlib-ng/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "zlib-ng"; - version = "0.4.1"; + version = "0.4.3"; pyproject = true; src = fetchFromGitHub { owner = "pycompression"; repo = "python-zlib-ng"; rev = "v${version}"; - hash = "sha256-uK6Md8ZOVUNwXCjzM4zTVr3WBwzLdnvT9n8yBvf968k="; + hash = "sha256-M0R39vUX3JMDEDJfsRzg1ipxbWJ/kl0FzW6ZUMXvGDs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix index 8ebdf0f596..a6c1e50e34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -1,33 +1,32 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pydantic -, pytest-aiohttp -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pydantic, + pytest-aiohttp, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.55.3"; + version = "0.55.4"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; + repo = "zwave-js-server-python"; rev = "refs/tags/${version}"; - hash = "sha256-FTcj0xZnIt0P6J/QRMC0bwcbRIVmpSWTorvE/AV/5PU="; + hash = "sha256-wPvMgQR85yHC0k+ENj+r/ilcxmOipSFGkz8qBRLgPaY="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp pydantic ]; @@ -37,16 +36,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "zwave_js_server" - ]; + pythonImportsCheck = [ "zwave_js_server" ]; meta = with lib; { description = "Python wrapper for zwave-js-server"; - mainProgram = "zwave-js-server-python"; homepage = "https://github.com/home-assistant-libs/zwave-js-server-python"; changelog = "https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "zwave-js-server-python"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix index 91b9d03ccc..34f51ab5b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { mainProgram = "zxcvbn"; homepage = "https://github.com/dwolfhub/zxcvbn-python"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix index ecc3d2d66b..8d4004d758 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix @@ -308,6 +308,7 @@ let FactoMineR = [ self.car ]; pander = [ self.codetools ]; rmsb = [ self.rstantools ]; + gastempt = [ self.rstantools ]; interactiveDisplay = [ self.BiocManager ]; }; @@ -328,11 +329,14 @@ let CellBarcode = [ pkgs.zlib ]; cld3 = [ pkgs.protobuf ]; bnpmr = [ pkgs.gsl ]; + caviarpd = [ pkgs.cargo ]; cairoDevice = [ pkgs.gtk2.dev ]; Cairo = with pkgs; [ libtiff libjpeg cairo.dev xorg.libXt.dev fontconfig.lib ]; Cardinal = [ pkgs.which ]; chebpol = [ pkgs.fftw.dev ]; ChemmineOB = [ pkgs.pkg-config ]; + interpolation = [ pkgs.pkg-config ]; + clarabel = [ pkgs.cargo ]; curl = [ pkgs.curl.dev ]; CytoML = [ pkgs.libxml2.dev ]; data_table = with pkgs; [ pkg-config zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; @@ -357,7 +361,9 @@ let gslnls = [ pkgs.gsl ]; gert = [ pkgs.libgit2 ]; haven = with pkgs; [ zlib.dev ]; + hellorust = [ pkgs.cargo ]; h5vc = with pkgs; [ zlib.dev bzip2.dev xz.dev ]; + yyjsonr = with pkgs; [ zlib.dev ]; highs = [ pkgs.which pkgs.cmake ]; rbedrock = [ pkgs.zlib.dev pkgs.which pkgs.cmake ]; HiCseg = [ pkgs.gsl ]; @@ -374,6 +380,7 @@ let LOMAR = [ pkgs.gmp.dev ]; lpsymphony = with pkgs; [ pkg-config gfortran gettext ]; lwgeom = with pkgs; [ proj geos gdal ]; + rsbml = [ pkgs.pkg-config ]; rvg = [ pkgs.libpng.dev ]; MAGEE = [ pkgs.zlib.dev pkgs.bzip2.dev ]; magick = [ pkgs.imagemagick.dev ]; @@ -408,6 +415,7 @@ let RcppZiggurat = [ pkgs.gsl ]; reprex = [ pkgs.which ]; rgdal = with pkgs; [ proj.dev gdal ]; + Rhisat2 = [ pkgs.which pkgs.hostname ]; gdalcubes = [ pkgs.pkg-config ]; rgeos = [ pkgs.geos ]; Rglpk = [ pkgs.glpk ]; @@ -441,6 +449,8 @@ let clustermq = [ pkgs.zeromq ]; SAVE = with pkgs; [ zlib bzip2 icu xz pcre ]; salso = [ pkgs.cargo ]; + ymd = [ pkgs.cargo ]; + arcpbf = [ pkgs.cargo ]; sdcTable = with pkgs; [ gmp glpk ]; seewave = with pkgs; [ fftw.dev libsndfile.dev ]; seqinr = [ pkgs.zlib.dev ]; @@ -450,6 +460,7 @@ let strawr = with pkgs; [ curl.dev ]; string2path = [ pkgs.cargo ]; terra = with pkgs; [ gdal proj geos ]; + tok = [ pkgs.cargo ]; apcf = with pkgs; [ geos ]; SemiCompRisks = [ pkgs.gsl ]; showtext = with pkgs; [ zlib libpng icu freetype.dev ]; @@ -525,12 +536,14 @@ let Rbwa = [ pkgs.zlib.dev ]; trackViewer = [ pkgs.zlib.dev ]; themetagenomics = [ pkgs.zlib.dev ]; + Rsymphony = [ pkgs.pkg-config ]; NanoMethViz = [ pkgs.zlib.dev ]; RcppMeCab = [ pkgs.pkg-config ]; HilbertVisGUI = with pkgs; [ pkg-config which ]; textshaping = [ pkgs.pkg-config ]; ragg = [ pkgs.pkg-config ]; qqconf = [ pkgs.pkg-config ]; + qspray = [ pkgs.pkg-config ]; vapour = [ pkgs.pkg-config ]; }; @@ -548,14 +561,18 @@ let bayesWatch = [ pkgs.boost.dev ]; clustermq = [ pkgs.pkg-config ]; coga = [ pkgs.gsl.dev ]; + mBvs = [ pkgs.gsl.dev ]; + rcontroll = [ pkgs.gsl.dev ]; deepSNV = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; epialleleR = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; gdalraster = with pkgs; [ gdal proj.dev sqlite.dev ]; + mitoClone2 = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; gpg = [ pkgs.gpgme ]; webp = [ pkgs.libwebp ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; stpphawkes = [ pkgs.gsl ]; + registr = with pkgs; [ icu.dev zlib.dev bzip2.dev xz.dev ]; RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkg-config ]; rDEA = [ pkgs.glpk ]; @@ -568,15 +585,19 @@ let cairoDevice = [ pkgs.pkg-config ]; chebpol = [ pkgs.pkg-config ]; eds = [ pkgs.zlib.dev ]; + pgenlibr = [ pkgs.zlib.dev ]; fftw = [ pkgs.pkg-config ]; gdtools = [ pkgs.pkg-config ]; archive = [ pkgs.libarchive]; gdalcubes = with pkgs; [ proj.dev gdal sqlite.dev netcdf ]; + rsbml = [ pkgs.libsbml ]; SuperGauss = [ pkgs.pkg-config pkgs.fftw.dev]; + specklestar = [ pkgs.fftw.dev ]; cartogramR = [ pkgs.fftw.dev ]; jqr = [ pkgs.jq.lib ]; kza = [ pkgs.pkg-config ]; igraph = with pkgs; [ gmp libxml2.dev glpk ]; + interpolation = [ pkgs.gmp ]; image_textlinedetector = with pkgs; [ pkg-config opencv ]; lwgeom = with pkgs; [ pkg-config proj.dev sqlite.dev ]; magick = [ pkgs.pkg-config ]; @@ -604,12 +625,13 @@ let mashr = [ pkgs.gsl ]; hadron = [ pkgs.gsl ]; AMOUNTAIN = [ pkgs.gsl ]; - Rsymphony = with pkgs; [ pkg-config doxygen graphviz subversion ]; + Rsymphony = with pkgs; [ symphony doxygen graphviz subversion cgl clp]; tcltk2 = with pkgs; [ tcl tk ]; rswipl = with pkgs; [ ncurses.dev libxcrypt zlib.dev ]; tikzDevice = with pkgs; [ which texliveMedium ]; gridGraphics = [ pkgs.which ]; adimpro = with pkgs; [ which xorg.xdpyinfo ]; + tfevents = [ pkgs.protobuf ]; rsvg = [ pkgs.librsvg.dev ]; ssh = with pkgs; [ libssh ]; s2 = [ pkgs.openssl.dev ]; @@ -666,6 +688,7 @@ let seqbias = with pkgs; [ zlib.dev bzip2.dev xz.dev ]; sparkwarc = [ pkgs.zlib.dev ]; RoBMA = [ pkgs.jags ]; + RoBSA = [ pkgs.jags ]; pexm = [ pkgs.jags ]; rGEDI = with pkgs; [ libgeotiff.dev libaec zlib.dev hdf5.dev ]; rawrr = [ pkgs.mono ]; @@ -692,16 +715,20 @@ let RcppCWB = with pkgs; [ pcre.dev glib.dev ]; redux = [ pkgs.hiredis ]; RmecabKo = [ pkgs.mecab ]; + markets = [ pkgs.gsl ]; PoissonBinomial = [ pkgs.fftw.dev ]; poisbinom = [ pkgs.fftw.dev ]; PoissonMultinomial = [ pkgs.fftw.dev ]; + psbcGroup = [ pkgs.gsl.dev ]; rrd = [ pkgs.rrdtool ]; flowWorkspace = [ pkgs.zlib.dev ]; + RITCH = [ pkgs.zlib.dev ]; RcppMeCab = [ pkgs.mecab ]; PING = [ pkgs.gsl ]; RcppAlgos = [ pkgs.gmp.dev ]; RcppBigIntAlgos = [ pkgs.gmp.dev ]; spaMM = [ pkgs.gsl ]; + shrinkTVP = [ pkgs.gsl ]; unigd = with pkgs; [ cairo.dev libpng.dev ]; HilbertVisGUI = [ pkgs.gtkmm2.dev ]; textshaping = with pkgs; [ harfbuzz.dev freetype.dev fribidi libpng ]; @@ -710,7 +737,10 @@ let ijtiff = [ pkgs.libtiff ]; ragg = with pkgs; [ freetype.dev libpng.dev libtiff.dev zlib.dev libjpeg.dev bzip2.dev ] ++ lib.optional stdenv.isDarwin lerc.dev; qqconf = [ pkgs.fftw.dev ]; + spFW = [ pkgs.fftw.dev ]; + qspray = with pkgs; [ gmp.dev mpfr.dev ]; vapour = with pkgs; [ proj.dev gdal ]; + MedianaDesigner = [ pkgs.zlib.dev ]; ChemmineOB = [ pkgs.eigen ]; }; @@ -795,6 +825,7 @@ let "likeLTD" "logmult" "loon" + "loon_ggplot" "LS2Wstat" "MareyMap" "memgene" @@ -832,6 +863,7 @@ let "RandomFields" "rareNMtests" "rAverage" + "rfviz" "RclusTool" "Rcmdr" "RcmdrPlugin_coin" @@ -912,13 +944,17 @@ let "aroma_affymetrix" "aroma_cn" "aroma_core" + "ceramic" "connections" "csodata" "DiceView" + "facmodTS" + "margaret" "MSnID" "OmnipathR" "precommit" "protGear" + "PCRA" "PSCBS" "iemisc" "repmis" @@ -937,10 +973,14 @@ let "ACNE" "APAlyzer" "EstMix" + "Patterns" "PECA" "Quartet" "ShinyQuickStarter" "TIN" + "cfdnakit" + "CaDrA" + "GNOSIS" "TotalCopheneticIndex" "TreeDist" "biocthis" @@ -970,6 +1010,8 @@ let "PhIPData" # tries to download something from a DB "RBioFormats" # tries to download jar during load test "pbdMPI" # tries to run MPI processes + "CTdata" # tries to connect to ExperimentHub + "rfaRm" # tries to connect to Ebi "data_table" # fails to rename shared library before check "coMethDMR" # tries to connect to ExperimentHub "multiMiR" # tries to connect to DB @@ -1055,6 +1097,21 @@ let ]; }); + timeless = old.timeless.overrideAttrs (attrs: { + cargoDeps = pkgs.rustPlatform.fetchCargoTarball { + src = attrs.src; + sourceRoot = "timeless/src/rust"; + hash = "sha256-n0/52CV3NzWe7T3N6VoaURMxWrnqeYaUMPKkUy+LRQs="; + }; + + cargoRoot = "src/rust"; + + nativeBuildInputs = attrs.nativeBuildInputs ++ [ + pkgs.rustPlatform.cargoSetupHook + pkgs.cargo + ]; + }); + stringi = old.stringi.overrideAttrs (attrs: { postInstall = let icuName = "icudt52l"; @@ -1104,10 +1161,19 @@ let postPatch = "patchShebangs configure"; }); + surtvep = old.surtvep.overrideAttrs (attrs: { + postPatch = "patchShebangs configure"; + }); + purrr = old.purrr.overrideAttrs (attrs: { patchPhase = "patchShebangs configure"; }); + luajr = old.luajr.overrideAttrs (attrs: { + hardeningDisable = [ "format" ]; + postPatch = "patchShebangs configure"; + }); + RcppArmadillo = old.RcppArmadillo.overrideAttrs (attrs: { patchPhase = "patchShebangs configure"; }); @@ -1116,6 +1182,20 @@ let postPatch = "patchShebangs configure"; }); + zoomerjoin = old.zoomerjoin.overrideAttrs (attrs: { + nativeBuildInputs = [ pkgs.cargo ] ++ attrs.nativeBuildInputs; + postPatch = "patchShebangs configure"; + }); + + b64 = old.b64.overrideAttrs (attrs: { + nativeBuildInputs = [ pkgs.cargo ] ++ attrs.nativeBuildInputs; + postPatch = "patchShebangs configure"; + }); + + ocf = old.ocf.overrideAttrs (attrs: { + postPatch = "patchShebangs configure"; + }); + data_table = old.data_table.overrideAttrs (attrs: { env = (attrs.env or { }) // { NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -fopenmp"; @@ -1123,6 +1203,15 @@ let patchPhase = "patchShebangs configure"; }); + rsgeo = old.rsgeo.overrideAttrs (attrs: { + nativeBuildInputs = [ pkgs.cargo ] ++ attrs.nativeBuildInputs; + postPatch = "patchShebangs configure"; + }); + + instantiate = old.instantiate.overrideAttrs (attrs: { + postPatch = "patchShebangs configure"; + }); + exifr = old.exifr.overrideAttrs (attrs: { postPatch = '' for f in .onLoad .onAttach ; do @@ -1218,6 +1307,17 @@ let ''; }); + # backported patch from 1.9 + Rhisat2= old.Rhisat2.overrideAttrs (attrs: { + patches = [ (pkgs.fetchpatch { + url = "https://github.com/fmicompbio/Rhisat2/commit/a0f27b018831b39f080f99e6db8a4b876fd56fc3.patch"; + sha256 = "sha256-FbYkP/WFmbfQmxArkHgushgVgY0XSypbK8Z5ivQK8k4="; + }) ]; + env = (attrs.env or { }) // { + NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -w"; + }; + }); + s2 = old.s2.overrideAttrs (attrs: { PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include"; PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -lssl -lcrypto"; @@ -1373,6 +1473,10 @@ let }); OpenMx = old.OpenMx.overrideAttrs (attrs: { + env = (attrs.env or { }) // { + # needed to avoid "log limit exceeded" on Hydra + NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -Wno-ignored-attributes"; + }; preConfigure = '' patchShebangs configure ''; diff --git a/third_party/nixpkgs/pkgs/development/r-modules/generic-builder.nix b/third_party/nixpkgs/pkgs/development/r-modules/generic-builder.nix index 5939a425ae..ecbd78c405 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/generic-builder.nix @@ -10,8 +10,11 @@ stdenv.mkDerivation ({ env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + enableParallelBuilding = true; + configurePhase = '' runHook preConfigure + export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library" runHook postConfigure ''; diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/clr/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/clr/default.nix index 3fcd551cd4..0c702dace2 100644 --- a/third_party/nixpkgs/pkgs/development/rocm-modules/5/clr/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/clr/default.nix @@ -2,6 +2,7 @@ , stdenv , callPackage , fetchFromGitHub +, fetchurl , rocmUpdateScript , makeWrapper , cmake @@ -33,6 +34,16 @@ let "--set HSA_PATH ${rocm-runtime}" "--set ROCM_PATH $out" ]; + + # https://github.com/NixOS/nixpkgs/issues/305641 + # Not needed when 3.29.2 is in unstable + cmake' = cmake.overrideAttrs(old: rec { + version = "3.29.2"; + src = fetchurl { + url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; + hash = "sha256-NttLaSaqt0G6bksuotmckZMiITIwi03IJNQSPLcwNS4="; + }; + }); in stdenv.mkDerivation (finalAttrs: { pname = "clr"; version = "5.7.1"; @@ -51,7 +62,7 @@ in stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper - cmake + cmake' perl python3Packages.python python3Packages.cppheaderparser diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/6/clr/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/6/clr/default.nix index 05acf86478..dedda194c8 100644 --- a/third_party/nixpkgs/pkgs/development/rocm-modules/6/clr/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/6/clr/default.nix @@ -3,6 +3,7 @@ , callPackage , fetchFromGitHub , fetchpatch +, fetchurl , rocmUpdateScript , makeWrapper , cmake @@ -34,6 +35,16 @@ let "--set HSA_PATH ${rocm-runtime}" "--set ROCM_PATH $out" ]; + + # https://github.com/NixOS/nixpkgs/issues/305641 + # Not needed when 3.29.2 is in unstable + cmake' = cmake.overrideAttrs(old: rec { + version = "3.29.2"; + src = fetchurl { + url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; + hash = "sha256-NttLaSaqt0G6bksuotmckZMiITIwi03IJNQSPLcwNS4="; + }; + }); in stdenv.mkDerivation (finalAttrs: { pname = "clr"; version = "6.0.2"; @@ -52,7 +63,7 @@ in stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper - cmake + cmake' perl python3Packages.python python3Packages.cppheaderparser @@ -100,6 +111,16 @@ in stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/clr/commit/77c581a3ebd47b5e2908973b70adea66891159ee.patch"; hash = "sha256-auBedbd7rghlKav7A9V6l64J7VmtE9GizIdi5gWj+fs="; }) + (fetchpatch { + name = "extend-hip-isa-compatibility-check.patch"; + url = "https://salsa.debian.org/rocm-team/rocm-hipamd/-/raw/d6d20142c37e1dff820950b16ff8f0523241d935/debian/patches/0026-extend-hip-isa-compatibility-check.patch"; + hash = "sha256-eG0ALZZQLRzD7zJueJFhi2emontmYy6xx8Rsm346nQI="; + }) + (fetchpatch { + name = "improve-rocclr-isa-compatibility-check.patch"; + url = "https://salsa.debian.org/rocm-team/rocm-hipamd/-/raw/d6d20142c37e1dff820950b16ff8f0523241d935/debian/patches/0025-improve-rocclr-isa-compatibility-check.patch"; + hash = "sha256-8eowuRiOAdd9ucKv4Eg9FPU7c6367H3eP3fRAGfXc6Y="; + }) ]; postPatch = '' @@ -113,6 +134,10 @@ in stdenv.mkDerivation (finalAttrs: { substituteInPlace hipamd/src/hip_embed_pch.sh \ --replace "\''$LLVM_DIR/bin/clang" "${clang}/bin/clang" + + # https://lists.debian.org/debian-ai/2024/02/msg00178.html + substituteInPlace rocclr/utils/flags.hpp \ + --replace-fail "HIP_USE_RUNTIME_UNBUNDLER, false" "HIP_USE_RUNTIME_UNBUNDLER, true" ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/6/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/6/default.nix index 567b5bee4f..e74df33a7b 100644 --- a/third_party/nixpkgs/pkgs/development/rocm-modules/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/6/default.nix @@ -194,7 +194,7 @@ in rec { }; rocblas = callPackage ./rocblas { - inherit rocblas rocmUpdateScript rocm-cmake clr tensile; + inherit rocmUpdateScript rocm-cmake clr tensile; inherit (llvm) openmp; stdenv = llvm.rocmClangStdenv; }; diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/6/miopen/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/6/miopen/default.nix index 09bcf10429..0b57cf6592 100644 --- a/third_party/nixpkgs/pkgs/development/rocm-modules/6/miopen/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/6/miopen/default.nix @@ -116,6 +116,11 @@ in stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/MIOpen/commit/3413d2daaeb44b7d6eadcc03033a5954a118491e.patch"; hash = "sha256-ST4snUcTmmSI1Ogx815KEX9GdMnmubsavDzXCGJkiKs="; }) + (fetchpatch { + name = "Extend-MIOpen-ISA-compatibility.patch"; + url = "https://github.com/GZGavinZhao/MIOpen/commit/416088b534618bd669a765afce59cfc7197064c1.patch"; + hash = "sha256-OwONCA68y8s2GqtQj+OtotXwUXQ5jM8tpeM92iaD4MU="; + }) ]; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/6/rccl/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/6/rccl/default.nix index cdbbd70440..a830883b4f 100644 --- a/third_party/nixpkgs/pkgs/development/rocm-modules/6/rccl/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/6/rccl/default.nix @@ -65,7 +65,9 @@ stdenv.mkDerivation (finalAttrs: { # Really strange behavior, `#!/usr/bin/env perl` should work... substituteInPlace CMakeLists.txt \ - --replace "\''$ \''${hipify-perl_executable}" "${perl}/bin/perl ${hipify}/bin/hipify-perl" + --replace "\''$ \''${hipify-perl_executable}" "${perl}/bin/perl ${hipify}/bin/hipify-perl" \ + --replace-warn "-parallel-jobs=12" "-parallel-jobs=1" \ + --replace-warn "-parallel-jobs=16" "-parallel-jobs=1" ''; postInstall = lib.optionalString buildTests '' diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/6/rocblas/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/6/rocblas/default.nix index 296167bb6f..f93cceddd6 100644 --- a/third_party/nixpkgs/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -1,7 +1,7 @@ -{ rocblas -, lib +{ lib , stdenv , fetchFromGitHub +, fetchpatch , rocmUpdateScript , runCommand , cmake @@ -21,57 +21,26 @@ , buildBenchmarks ? false , tensileLogic ? "asm_full" , tensileCOVersion ? "default" -, tensileSepArch ? true -, tensileLazyLib ? true +# https://github.com/ROCm/Tensile/issues/1757 +# Allows gfx101* users to use rocBLAS normally. +# Turn the below two values to `true` after the fix has been cherry-picked +# into a release. Just backporting that single fix is not enough because it +# depends on some previous commits. +, tensileSepArch ? false +, tensileLazyLib ? false , tensileLibFormat ? "msgpack" -, gpuTargets ? [ "all" ] +# `gfx940`, `gfx941` are not present in this list because they are early +# engineering samples, and all final MI300 hardware are `gfx942`: +# https://github.com/NixOS/nixpkgs/pull/298388#issuecomment-2032791130 +# +# `gfx1012` is not present in this list because the ISA compatibility patches +# would force all `gfx101*` GPUs to run as `gfx1010`, so `gfx101*` GPUs will +# always try to use `gfx1010` code objects, hence building for `gfx1012` is +# useless: https://github.com/NixOS/nixpkgs/pull/298388#issuecomment-2076327152 +, gpuTargets ? [ "gfx900;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx942;gfx1010;gfx1030;gfx1100;gfx1101;gfx1102" ] }: -let - # NOTE: Update the default GPU targets on every update - gfx80 = (rocblas.override { - gpuTargets = [ - "gfx803" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx80"; }; - - gfx90 = (rocblas.override { - gpuTargets = [ - "gfx900" - "gfx906:xnack-" - "gfx908:xnack-" - "gfx90a:xnack+" - "gfx90a:xnack-" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx90"; }; - - gfx94 = (rocblas.override { - gpuTargets = [ - "gfx940" - "gfx941" - "gfx942" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx94"; }; - - gfx10 = (rocblas.override { - gpuTargets = [ - "gfx1010" - "gfx1012" - "gfx1030" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx10"; }; - - gfx11 = (rocblas.override { - gpuTargets = [ - "gfx1100" - "gfx1101" - "gfx1102" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx11"; }; - - # Unfortunately, we have to do two full builds, otherwise we get overlapping _fallback.dat files - fallbacks = rocblas.overrideAttrs { pname = "rocblas-tensile-fallbacks"; }; -in stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "rocblas"; version = "6.0.2"; @@ -94,6 +63,8 @@ in stdenv.mkDerivation (finalAttrs: { cmake rocm-cmake clr + ] ++ lib.optionals buildTensile [ + tensile ]; buildInputs = [ @@ -114,80 +85,41 @@ in stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-Dpython=python3" - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - "-DBUILD_WITH_TENSILE=${if buildTensile then "ON" else "OFF"}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" + (lib.cmakeFeature "CMAKE_C_COMPILER" "hipcc") + (lib.cmakeFeature "CMAKE_CXX_COMPILER" "hipcc") + (lib.cmakeFeature "python" "python3") + (lib.cmakeFeature "AMDGPU_TARGETS" (lib.concatStringsSep ";" gpuTargets)) + (lib.cmakeBool "BUILD_WITH_TENSILE" buildTensile) + (lib.cmakeBool "ROCM_SYMLINK_LIBS" false) + (lib.cmakeFeature "ROCBLAS_TENSILE_LIBRARY_DIR" "lib/rocblas") + (lib.cmakeBool "BUILD_CLIENTS_TESTS" buildTests) + (lib.cmakeBool "BUILD_CLIENTS_BENCHMARKS" buildBenchmarks) + # rocblas header files are not installed unless we set this + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") ] ++ lib.optionals buildTensile [ - "-DVIRTUALENV_HOME_DIR=/build/source/tensile" - "-DTensile_TEST_LOCAL_PATH=/build/source/tensile" - "-DTensile_ROOT=/build/source/tensile/${python3.sitePackages}/Tensile" - "-DTensile_LOGIC=${tensileLogic}" - "-DTensile_CODE_OBJECT_VERSION=${tensileCOVersion}" - "-DTensile_SEPARATE_ARCHITECTURES=${if tensileSepArch then "ON" else "OFF"}" - "-DTensile_LAZY_LIBRARY_LOADING=${if tensileLazyLib then "ON" else "OFF"}" - "-DTensile_LIBRARY_FORMAT=${tensileLibFormat}" - ] ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" + (lib.cmakeBool "BUILD_WITH_PIP" false) + (lib.cmakeFeature "Tensile_LOGIC" tensileLogic) + (lib.cmakeFeature "Tensile_CODE_OBJECT_VERSION" tensileCOVersion) + (lib.cmakeBool "Tensile_SEPARATE_ARCHITECTURES" tensileSepArch) + (lib.cmakeBool "Tensile_LAZY_LIBRARY_LOADING" tensileLazyLib) + (lib.cmakeFeature "Tensile_LIBRARY_FORMAT" tensileLibFormat) + (lib.cmakeBool "Tensile_PRINT_DEBUG" true) ] ++ lib.optionals (buildTests || buildBenchmarks) [ - "-DCMAKE_CXX_FLAGS=-I${amd-blis}/include/blis" + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-I${amd-blis}/include/blis") ]; - postPatch = lib.optionalString (finalAttrs.pname != "rocblas") '' - # Return early and install tensile files manually - substituteInPlace library/src/CMakeLists.txt \ - --replace "set_target_properties( TensileHost PROPERTIES OUTPUT_NAME" "return()''\nset_target_properties( TensileHost PROPERTIES OUTPUT_NAME" - '' + lib.optionalString (buildTensile && finalAttrs.pname == "rocblas") '' - # Link the prebuilt Tensile files - mkdir -p build/Tensile/library + patches = [ + (fetchpatch { + name = "Extend-rocBLAS-HIP-ISA-compatibility.patch"; + url = "https://github.com/GZGavinZhao/rocBLAS/commit/89b75ff9cc731f71f370fad90517395e117b03bb.patch"; + hash = "sha256-W/ohOOyNCcYYLOiQlPzsrTlNtCBdJpKVxO8s+4G7sjo="; + }) + ]; - for path in ${gfx80} ${gfx90} ${gfx94} ${gfx10} ${gfx11} ${fallbacks}; do - ln -s $path/lib/rocblas/library/* build/Tensile/library - done - - unlink build/Tensile/library/TensileManifest.txt - '' + lib.optionalString buildTensile '' - # Tensile REALLY wants to write to the nix directory if we include it normally - cp -a ${tensile} tensile - chmod +w -R tensile - - # Rewrap Tensile - substituteInPlace tensile/bin/{.t*,.T*,*} \ - --replace "${tensile}" "/build/source/tensile" - - substituteInPlace CMakeLists.txt \ - --replace "include(virtualenv)" "" \ - --replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" "" - ''; - - postInstall = lib.optionalString (finalAttrs.pname == "rocblas") '' - ln -sf ${fallbacks}/lib/rocblas/library/TensileManifest.txt $out/lib/rocblas/library - '' + lib.optionalString (finalAttrs.pname != "rocblas") '' - mkdir -p $out/lib/rocblas/library - rm -rf $out/share - '' + lib.optionalString (finalAttrs.pname != "rocblas" && finalAttrs.pname != "rocblas-tensile-fallbacks") '' - rm Tensile/library/{TensileManifest.txt,*_fallback.dat} - mv Tensile/library/* $out/lib/rocblas/library - '' + lib.optionalString (finalAttrs.pname == "rocblas-tensile-fallbacks") '' - mv Tensile/library/{TensileManifest.txt,*_fallback.dat} $out/lib/rocblas/library - '' + lib.optionalString buildTests '' - mkdir -p $test/bin - cp -a $out/bin/* $test/bin - rm $test/bin/*-bench || true - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - cp -a $out/bin/* $benchmark/bin - rm $benchmark/bin/*-test || true - '' + lib.optionalString (buildTests || buildBenchmarks ) '' - rm -rf $out/bin + # Pass $NIX_BUILD_CORES to Tensile + postPatch = '' + substituteInPlace cmake/build-options.cmake \ + --replace-fail 'Tensile_CPU_THREADS ""' 'Tensile_CPU_THREADS "$ENV{NIX_BUILD_CORES}"' ''; passthru.updateScript = rocmUpdateScript { diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/6/rocm-runtime/default.nix index 8c3d0cdc97..f603b70826 100644 --- a/third_party/nixpkgs/pkgs/development/rocm-modules/6/rocm-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/6/rocm-runtime/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , rocmUpdateScript , pkg-config , cmake @@ -42,6 +43,15 @@ stdenv.mkDerivation (finalAttrs: { libxml2 ]; + patches = [ + (fetchpatch { + name = "extend-isa-compatibility-check.patch"; + url = "https://salsa.debian.org/rocm-team/rocr-runtime/-/raw/076026d43bbee7f816b81fea72f984213a9ff961/debian/patches/0004-extend-isa-compatibility-check.patch"; + hash = "sha256-cC030zVGS4kNXwaztv5cwfXfVwOldpLGV9iYgEfPEnY="; + stripLen = 1; + }) + ]; + postPatch = '' patchShebangs image/blit_src/create_hsaco_ascii_file.sh patchShebangs core/runtime/trap_handler/create_trap_handler_header.sh diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/6/rocprim/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/6/rocprim/default.nix index e9996cae61..3e85256551 100644 --- a/third_party/nixpkgs/pkgs/development/rocm-modules/6/rocprim/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/6/rocprim/default.nix @@ -1,4 +1,5 @@ { lib +, fetchpatch , stdenv , fetchFromGitHub , rocmUpdateScript @@ -31,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-nWvq26qRPZ6Au1rc5cR74TKArcdUFg7O9djFi8SvMeM="; }; + patches = [ + (fetchpatch { + name = "arch-conversion-marco.patch"; + url = "https://salsa.debian.org/rocm-team/rocprim/-/raw/70c8aaee3cf545d92685f4ed9bf8f41e3d4d570c/debian/patches/arch-conversion-macro.patch"; + hash = "sha256-oXdmbCArOB5bKE8ozDFrSh4opbO+c4VI6PNhljeUSms="; + }) + ]; + nativeBuildInputs = [ cmake rocm-cmake diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/6/tensile/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/6/tensile/default.nix index af33fd789e..6df403249e 100644 --- a/third_party/nixpkgs/pkgs/development/rocm-modules/6/tensile/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/6/tensile/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , rocmUpdateScript , buildPythonPackage , pytestCheckHook @@ -34,6 +35,19 @@ buildPythonPackage rec { joblib ]; + patches = [ + (fetchpatch { + name = "Extend-Tensile-HIP-ISA-compatibility.patch"; + url = "https://github.com/GZGavinZhao/Tensile/commit/855cb15839849addb0816a6dde45772034a3e41f.patch"; + hash = "sha256-d+fVf/vz+sxGqJ96vuxe0jRMgbC5K6j5FQ5SJ1e3Sl8="; + }) + (fetchpatch { + name = "Don-t-copy-file-twice-in-copyStaticFiles.patch"; + url = "https://github.com/GZGavinZhao/Tensile/commit/9e14d5a00a096bddac605910a0e4dfb4c35bb0d5.patch"; + hash = "sha256-gOzjJyD1K056OFQ+hK5nbUeBhxLTIgQLoT+0K12SypI="; + }) + ]; + doCheck = false; # Too many errors, not sure how to set this up properly nativeCheckInputs = [ @@ -42,9 +56,9 @@ buildPythonPackage rec { rocminfo ]; - preCheck = '' - export ROCM_PATH=${rocminfo} - ''; + env = { + ROCM_PATH = rocminfo; + }; pythonImportsCheck = [ "Tensile" ]; diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix index 784144909a..f324ebecda 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix @@ -43,7 +43,7 @@ buildRubyGem rec { ''; homepage = "https://github.com/nix-community/bundix"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ manveru marsam zimbatm ]; + maintainers = with lib.maintainers; [ manveru zimbatm ]; platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix index e59941e805..b938960367 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.5.7"; - source.sha256 = "sha256-Df4EofDsE828V59yTND3+hdDfbB7iaQfWZfiC/SoNA4="; + version = "2.5.9"; + source.sha256 = "sha256-4rYTJb41m85U6w/tiEBO/mfl4fgAPTSiIYQeO3Za7AY="; dontPatchShebangs = true; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index 45de779fcd..02d014bef8 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -24,7 +24,7 @@ , libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, buildRubyGem , cairo, expat, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz -, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk +, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook3, atk , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libepoxy, libxkbcommon, libmaxminddb, libyaml , cargo, rustc, rustPlatform @@ -50,7 +50,7 @@ in dependencies = attrs.dependencies ++ [ "gobject-introspection" ]; nativeBuildInputs = [ rake bundler pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - propagatedBuildInputs = [ gobject-introspection wrapGAppsHook atk ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 atk ]; }; bundler = attrs: @@ -230,13 +230,13 @@ in gdk_pixbuf2 = attrs: { nativeBuildInputs = [ pkg-config bundler rake ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 gdk-pixbuf ]; }; gdk3 = attrs: { nativeBuildInputs = [ pkg-config bundler rake ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf cairo ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 gdk-pixbuf cairo ]; }; gpgme = attrs: { @@ -395,7 +395,7 @@ in gobject-introspection = attrs: { nativeBuildInputs = [ pkg-config pcre2 ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 glib ]; }; gollum = attrs: { @@ -586,7 +586,7 @@ in ]; }; - nokogiri = attrs: { + nokogiri = attrs: ({ buildFlags = [ "--use-system-libraries" "--with-zlib-lib=${zlib.out}/lib" @@ -601,7 +601,9 @@ in "--with-iconv-dir=${libiconv}" "--with-opt-include=${libiconv}/include" ]; - }; + } // lib.optionalAttrs stdenv.isDarwin { + buildInputs = [ libxml2 ]; + }); openssl = attrs: { # https://github.com/ruby/openssl/issues/369 @@ -633,7 +635,7 @@ in ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; buildInputs = [ libdatrie libthai ] ++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ]; - propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gtk2 ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook3 gtk2 ]; }; patron = attrs: { diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile b/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile index 86b8618c92..9690544d91 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile @@ -138,6 +138,7 @@ gem 'rubyzip' gem 'rugged' gem 'sassc' gem 'scrypt' +gem 'seccomp-tools' gem 'semian' gem 'sequel' gem 'sequel_pg' diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/build-skaware-package.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/build-skaware-package.nix index 56bbe6bec5..4e912e3af2 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/build-skaware-package.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/build-skaware-package.nix @@ -26,7 +26,8 @@ , maintainers ? [ ] # : passthru arguments (e.g. tests) , passthru ? { } - + # : attributes to be merged into meta +, broken ? false }: let @@ -125,7 +126,7 @@ stdenv.mkDerivation { meta = { homepage = "https://skarnet.org/software/${pname}/"; - inherit description platforms; + inherit broken description platforms; license = lib.licenses.isc; maintainers = with lib.maintainers; [ pmahoney Profpatsch qyliss ] ++ maintainers; diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/execline/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/execline/default.nix index 80bef5feb5..fc8dffe32f 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/execline/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/execline/default.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, skawarePackages, skalibs }: let - version = "2.9.4.0"; + version = "2.9.5.1"; in skawarePackages.buildPackage { inherit version; pname = "execline"; # ATTN: also check whether there is a new manpages version - sha256 = "mrVdVhU536dv9Kl5BvqZX8SiiOPeUiXLGp2PqenrxJs="; + sha256 = "33UANdD7IccmW/+37X4bZh3h6EKUSiJSvc3cMtDZchc="; # Maintainer of manpages uses following versioning scheme: for every # upstream $version he tags manpages release as ${version}.1, and, @@ -16,8 +16,8 @@ in skawarePackages.buildPackage { # ${version}.3 and so on are created. manpages = skawarePackages.buildManPages { pname = "execline-man-pages"; - version = "2.9.3.0.5"; - sha256 = "0fcjrj4xp7y7n1c55k45rxr5m7zpv6cbhrkxlxymd4j603i9jh6d"; + version = "2.9.5.1.1"; + sha256 = "hLo0TJJ4F2UQ+NkyO9DvVHO0ec86Eps1z99HthBzoIc="; description = "Port of the documentation for the execline suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; }; diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/s6/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/s6/default.nix index b606595936..761ee34e97 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/s6/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/s6/default.nix @@ -2,13 +2,13 @@ skawarePackages.buildPackage { pname = "s6"; - version = "2.12.0.3"; - sha256 = "gA0xIm9sJc3T7AtlJA+AtWzl7BNzQdCo0VTndjjlgQM="; + version = "2.12.0.4"; + sha256 = "yV1ReHYC4MjI5PkqcQy9qk7nl+6IbnE0Jyfil0+VwGs="; manpages = skawarePackages.buildManPages { pname = "s6-man-pages"; - version = "2.12.0.2.1"; - sha256 = "sha256-fFU+cRwXb4SwHsI/r0ghuzCf6hEK/muPPp2XMvD8VtQ="; + version = "2.12.0.4.1"; + sha256 = "9n4oIGfgcu+Q/UcY1Edr3n09Ecrbg77AI8TRBQoFzs0="; description = "Port of the documentation for the s6 supervision suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; }; diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/tipidee/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/tipidee/default.nix index 342fe27498..8e858c858c 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/tipidee/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/tipidee/default.nix @@ -1,9 +1,9 @@ -{ skawarePackages, skalibs }: +{ skawarePackages, stdenv, skalibs }: skawarePackages.buildPackage { pname = "tipidee"; - version = "0.0.3.0"; - sha256 = "0dk6k86UKgJ2ioX5H2Xoga9S+SwMy9NFrK2KEKoNxCA="; + version = "0.0.4.0"; + sha256 = "sha256-FzZRGg8IBTkzXINb9WCdVukej9KyPFQIUuXfdcLz1RQ="; description = "A HTTP 1.1 webserver, serving static files and CGI/NPH"; @@ -35,4 +35,5 @@ skawarePackages.buildPackage { mv examples $doc/share/doc/tipidee/examples ''; + broken = stdenv.isDarwin; } diff --git a/third_party/nixpkgs/pkgs/development/tools/abuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/abuild/default.nix index dce24f0ad8..42fb141fd7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/abuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/abuild/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, gitUpdater , makeWrapper , pkg-config , file @@ -14,14 +15,14 @@ stdenv.mkDerivation rec { pname = "abuild"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = pname; rev = version; - sha256 = "sha256-p4TohsZZTi4HxtJsyuoE5HDfkGa0pv53saGj3X9bmrI="; + sha256 = "sha256-xVxgcBchGfeVo1cgP9iVsWjZ6SHVN6R8zWaE1k3DcXQ="; }; buildInputs = [ @@ -77,6 +78,8 @@ stdenv.mkDerivation rec { done ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Alpine Linux build tools"; homepage = "https://gitlab.alpinelinux.org/alpine/abuild"; diff --git a/third_party/nixpkgs/pkgs/development/tools/air/default.nix b/third_party/nixpkgs/pkgs/development/tools/air/default.nix index 2ce9e3d06b..467f051506 100644 --- a/third_party/nixpkgs/pkgs/development/tools/air/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/air/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "air"; - version = "1.51.0"; + version = "1.52.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-Vkg3QPUvhJphmZ7Ek3tuFnSEjfSy6LfctGMA07IufUU="; + hash = "sha256-7iqS8p53Pyk2WQVkbTVA7eJNnD2KvO41S+JJBTFOToQ="; }; vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw="; diff --git a/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix index 7ef189b67f..1f2456b8cc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.6.6"; + version = "1.6.9"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-yLsyby3u1oz5fnQ/zQ0sjy2w+Pv0KHySojsDc4vnFF0="; + hash = "sha256-I4aANk/FurYsT2e3YFxRgbfpl7nEXgBwNiQeA2LMdkw="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; @@ -31,6 +31,6 @@ buildGoModule rec { mainProgram = "algolia"; homepage = "https://algolia.com/doc/tools/cli/"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/allure/default.nix b/third_party/nixpkgs/pkgs/development/tools/allure/default.nix index ddae95298e..2d247e3f7d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/allure/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/allure/default.nix @@ -1,40 +1,48 @@ -{ lib, stdenv, makeWrapper, fetchurl, jre }: +{ lib +, stdenv +, makeWrapper +, fetchurl +, jre +}: -let +stdenv.mkDerivation (finalAttrs: { pname = "allure"; - version = "2.28.0"; -in -stdenv.mkDerivation rec { - inherit pname version; - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ jre ]; + version = "2.29.0"; src = fetchurl { - url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-n+wmmY2936PQkHuS9DS7f51n3Eko/OM7nHHFbi85+Lk="; + url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; + hash = "sha256-ohcVXblnCrNs57BWmz+wUwplfIG9fOW8l08LuipNhPs="; }; + dontConfigure = true; dontBuild = true; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; + installPhase = '' - mkdir -p "$out/share" + runHook preInstall + + mkdir -p $out/{bin,share} cd "$out/share" tar xvzf $src - mkdir -p "$out/bin" - makeWrapper $out/share/${pname}-${version}/bin/allure $out/bin/${pname} \ + makeWrapper $out/share/${finalAttrs.meta.mainProgram}-${finalAttrs.version}/bin/allure $out/bin/${finalAttrs.meta.mainProgram} \ --prefix PATH : "${jre}/bin" + + runHook postInstall ''; - dontCheck = true; - - meta = with lib; { + meta = { homepage = "https://docs.qameta.io/allure/"; description = "Allure Report is a flexible, lightweight multi-language test reporting tool."; + longDescription = '' + Allure Report is a flexible, lightweight multi-language test reporting + tool providing clear graphical reports and allowing everyone involved + in the development process to extract the maximum of information from + the everyday testing process. + ''; + license = lib.licenses.asl20; mainProgram = "allure"; - longDescription = "Allure Report is a flexible, lightweight multi-language test reporting tool. It provides clear graphical reports and allows everyone involved in the development process to extract the maximum of information from the everyday testing process"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + maintainers = with lib.maintainers; [ happysalada ]; }; -} - +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix index 3be3625cd6..f49c1cdfcc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "6.4.0"; + version = "7.0.1"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-eUUPfMwCMrMHk2RcLfpI8VuolgI/7geY6/6QrWjkIXg="; + sha256 = "sha256-hcZwGJ409r3XKVScGfj0DonZdClDVvTcIZlmJ1Xd9Mw="; }; appimageContents = appimageTools.extract { inherit pname version src; }; @@ -15,8 +15,6 @@ appimageTools.wrapType2 { inherit src pname version; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/third_party/nixpkgs/pkgs/development/tools/amqpcat/default.nix b/third_party/nixpkgs/pkgs/development/tools/amqpcat/default.nix index 09094fae8e..7672e83790 100644 --- a/third_party/nixpkgs/pkgs/development/tools/amqpcat/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/amqpcat/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "amqpcat"; - version = "0.2.5"; + version = "1.0.0"; src = fetchFromGitHub { owner = "cloudamqp"; repo = "amqpcat"; rev = "v${version}"; - hash = "sha256-AXX4aF5717lSIO0/2jNDPXXLtM/h//BlxO+cX71aWG4="; + hash = "sha256-QLVFAcymj7dERbUiRcseiDuuKgrQ8n4LbkdhUyXPcWw="; }; format = "shards"; diff --git a/third_party/nixpkgs/pkgs/development/tools/amqpcat/shards.nix b/third_party/nixpkgs/pkgs/development/tools/amqpcat/shards.nix index 4cfa4933f1..077c492869 100644 --- a/third_party/nixpkgs/pkgs/development/tools/amqpcat/shards.nix +++ b/third_party/nixpkgs/pkgs/development/tools/amqpcat/shards.nix @@ -1,12 +1,12 @@ { amq-protocol = { url = "https://github.com/cloudamqp/amq-protocol.cr.git"; - rev = "v1.1.4"; - sha256 = "1x10zh371wmwi55rpdymfhf7hbh900zc94b64hkk12pp20mws55r"; + rev = "v1.1.14"; + sha256 = "1pr5h3lxfhjmarfqpvfldn8d6425g3i56k4p4szk2jkffa0z38nz"; }; amqp-client = { url = "https://github.com/cloudamqp/amqp-client.cr.git"; - rev = "v1.0.11"; - sha256 = "0d08k9jjd9jw40slj71wi9p6773d1djva9zjb40pskcgg2wfirx3"; + rev = "v1.2.3"; + sha256 = "1pbiq5srni87hd8q2x3vs4s2hpajlzzlwgalgnmb35dcyih1ff9k"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix index 79cf031d14..a17b62998e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.27"; + version = "1.7.0"; subPackages = [ "cmd/actionlint" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - hash = "sha256-v8RuSsayIVA31ADLiAOcWwXY3HKjG15FZ/PHnY651Ac="; + hash = "sha256-+Mnlqsdk4VzXtdBUtCRvnTJ6EIDPIsBNNQJ30TIO9kQ="; }; - vendorHash = "sha256-DhZHfcnLm700i0M4pcvwlPdynbLRnG5rYsp5CrIDybw="; + vendorHash = "sha256-v0bmugCOP1XUrfe9xqN7gYKFchv6l/WpUK016xfyiCE="; nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; @@ -39,7 +39,7 @@ buildGoModule rec { description = "Static checker for GitHub Actions workflow files"; changelog = "https://github.com/rhysd/actionlint/raw/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "actionlint"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix index 86311a2686..0380524b24 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix @@ -13,7 +13,7 @@ bundlerApp rec { changelog = "https://github.com/presidentbeef/brakeman/blob/v${version}/CHANGES.md"; license = [ licenses.unfreeRedistributable ]; platforms = ruby.meta.platforms; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "brakeman"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 5daedfa2eb..b554353a50 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.28.0"; + version = "0.29.2"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-45jQt5VK7h02Frz5urB6dXap796OTfHsPx/Q1xumM00="; + hash = "sha256-3OLMTiMX5dsW691MX432YUuVqKOtrmS6Tpk96QVEyo8="; }; - cargoHash = "sha256-+AKgEyKer9S2lTUF3VA4UXnbR0nUBErp2OdqFC84W00="; + cargoHash = "sha256-+xCA0LVEHhBGOgMx+/ABZL1I7NSJEWf21p9gmQJNBJo="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index 6d5832f810..b1d98d8344 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -6,23 +6,24 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.72"; + version = "3.2.91"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-DcheCxZ21/wEwC0dYoL546wXyp1yIIfLkWbjkS0iKC0="; + hash = "sha256-lw89E7xD1tSAxgf1bwuPojOikOqIBfisePAtTGHXr4c="; }; patches = [ ./flake8-compat-5.x.patch ]; pythonRelaxDeps = [ - "boto3" - "botocore" "bc-detect-secrets" "bc-python-hcl2" + "boto3" + "botocore" + "cyclonedx-python-lib" "dpath" "igraph" "license-expression" @@ -31,6 +32,7 @@ python3.pkgs.buildPythonApplication rec { "packageurl-python" "packaging" "pycep-parser" + "rustworkx" "termcolor" ]; @@ -121,6 +123,8 @@ python3.pkgs.buildPythonApplication rec { "test_runner" # AssertionError: assert [' lock(g_sleep_state_mutex); +- BAZEL_CHECK_GE(g_sleep_state_stack, 0); +- if (g_sleep_state_stack == 0) { +- BAZEL_CHECK_EQ(g_sleep_state_assertion, kIOPMNullAssertionID); +- CFStringRef reasonForActivity = CFSTR("build.bazel"); +- IOReturn success = IOPMAssertionCreateWithName( +- kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, reasonForActivity, +- &g_sleep_state_assertion); +- BAZEL_CHECK_EQ(success, kIOReturnSuccess); +- } +- g_sleep_state_stack += 1; +- return 0; ++ // Unreliable, disable for now ++ return -1; + } + + int portable_pop_disable_sleep() { +- std::lock_guard lock(g_sleep_state_mutex); +- BAZEL_CHECK_GT(g_sleep_state_stack, 0); +- g_sleep_state_stack -= 1; +- if (g_sleep_state_stack == 0) { +- BAZEL_CHECK_NE(g_sleep_state_assertion, kIOPMNullAssertionID); +- IOReturn success = IOPMAssertionRelease(g_sleep_state_assertion); +- BAZEL_CHECK_EQ(success, kIOReturnSuccess); +- g_sleep_state_assertion = kIOPMNullAssertionID; +- } +- return 0; ++ // Unreliable, disable for now ++ return -1; + } + + } // namespace blaze_jni +diff --git a/src/main/native/darwin/system_suspension_monitor_jni.cc b/src/main/native/darwin/system_suspension_monitor_jni.cc +index 3483aa7935..51782986ec 100644 +--- a/src/main/native/darwin/system_suspension_monitor_jni.cc ++++ b/src/main/native/darwin/system_suspension_monitor_jni.cc +@@ -83,10 +83,7 @@ void portable_start_suspend_monitoring() { + // Register to receive system sleep notifications. + // Testing needs to be done manually. Use the logging to verify + // that sleeps are being caught here. +- suspend_state.connect_port = IORegisterForSystemPower( +- &suspend_state, ¬ifyPortRef, SleepCallBack, ¬ifierObject); +- BAZEL_CHECK_NE(suspend_state.connect_port, MACH_PORT_NULL); +- IONotificationPortSetDispatchQueue(notifyPortRef, queue); ++ // XXX: Unreliable, disable for now + + // Register to deal with SIGCONT. + // We register for SIGCONT because we can't catch SIGSTOP. diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 75c014040e..186d585d62 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -8,7 +8,7 @@ # updater , python3, writeScript # Apple dependencies -, cctools, libcxx, CoreFoundation, CoreServices, Foundation +, cctools, libcxx, CoreFoundation, CoreServices, Foundation, sigtool # Allow to independently override the jdks used to build and run respectively , buildJdk, runJdk , runtimeShell @@ -25,12 +25,12 @@ }: let - version = "6.4.0"; + version = "6.5.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-vYj/YCyLuynugroqaxKtCS1R7GaMZXf5Yo8Y5I/05R4="; + hash = "sha256-/InakZQVKJ8p5P8YpeAScOzppv6Dy2CWchi6xKO7PtI="; }; # Update with @@ -179,7 +179,7 @@ let in stdenv.mkDerivation rec { - pname = "bazel"; + pname = "bazel${ lib.optionalString enableNixHacks "-hacks" }"; inherit version; meta = with lib; { @@ -205,6 +205,27 @@ stdenv.mkDerivation rec { # the prebuilt one does not work in nix world. ./java_toolchain.patch + # Bazel integrates with apple IOKit to inhibit and track system sleep. + # Inside the darwin sandbox, these API calls are blocked, and bazel + # crashes. It seems possible to allow these APIs inside the sandbox, but it + # feels simpler to patch bazel not to use it at all. So our bazel is + # incapable of preventing system sleep, which is a small price to pay to + # guarantee that it will always run in any nix context. + # + # See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses + # NIX_BUILD_TOP env var to conditionnally disable sleep features inside the + # sandbox. + # + # If you want to investigate the sandbox profile path, + # IORegisterForSystemPower can be allowed with + # + # propagatedSandboxProfile = '' + # (allow iokit-open (iokit-user-client-class "RootDomainUserClient")) + # ''; + # + # I do not know yet how to allow IOPMAssertion{CreateWithName,Release} + ./darwin_sleep.patch + # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' # This is breaking the build of any C target. This patch removes the last # argument if it's found to be an empty string. @@ -289,7 +310,11 @@ stdenv.mkDerivation rec { bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }: let be = extracted bazelPkg; - in runLocal name { inherit buildInputs; } ( + in runLocal name { + inherit buildInputs; + # Necessary for the tests to pass on Darwin with sandbox enabled. + __darwinAllowLocalNetworking = true; + } ( # skip extraction caching on Darwin, because nobody knows how Darwin works (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # set up home with pre-unpacked bazel @@ -403,7 +428,10 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE+=" -Wno-deprecated-builtins -Wno-gnu-offsetof-extensions" # don't use system installed Xcode to run clang, use Nix clang instead - sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ + sed -i -E \ + -e "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ + -e "s;/usr/bin/codesign;CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${sigtool}/bin/codesign;" \ + -e "s;env -i codesign;env -i CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${sigtool}/bin/codesign;" \ scripts/bootstrap/compile.sh \ tools/osx/BUILD @@ -557,7 +585,7 @@ stdenv.mkDerivation rec { which zip python3.pkgs.absl-py # Needed to build fish completion - ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx sigtool CoreFoundation CoreServices Foundation ]; # Bazel makes extensive use of symlinks in the WORKSPACE. # This causes problems with infinite symlinks if the build output is in the same location as the @@ -593,7 +621,10 @@ stdenv.mkDerivation rec { ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \ --bazel=./bazel_src/output/bazel \ --output=./bazel_src/output/bazel-complete.fish - + '' + + # disable execlog parser on darwin, since it fails to build + # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055 + lib.optionalString (!stdenv.isDarwin) '' # need to change directory for bazel to find the workspace cd ./bazel_src # build execlog tooling @@ -617,6 +648,10 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath} mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + '' + + # disable execlog parser on darwin, since it fails to build + # see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055 + (lib.optionalString (!stdenv.isDarwin) '' mkdir $out/share cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar cat < $out/bin/bazel-execlog @@ -624,7 +659,7 @@ stdenv.mkDerivation rec { ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@ EOF chmod +x $out/bin/bazel-execlog - + '') + '' # shell completion files installShellCompletion --bash \ --name bazel.bash \ @@ -678,6 +713,13 @@ stdenv.mkDerivation rec { # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch} hello_test + ## Test that the GSON serialisation files are present + gson_classes=$(unzip -l $($out/bin/bazel info install_base)/A-server.jar | grep -F -c _GsonTypeAdapter.class) + if [ "$gson_classes" -lt 10 ]; then + echo "Missing GsonTypeAdapter classes in A-server.jar. Lockfile generation will not work" + exit 1 + fi + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json index c294c1f224..d894a51c5d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json @@ -22,12 +22,11 @@ "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" ] }, - "20211102.0.tar.gz": { - "name": "20211102.0.tar.gz", - "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", + "20230802.0.tar.gz": { + "name": "20230802.0.tar.gz", + "sha256": "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5", "urls": [ - "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" + "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.0.tar.gz" ] }, "2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz": { @@ -365,11 +364,10 @@ "generator_function": "dist_http_archive", "generator_name": "com_google_absl", "name": "com_google_absl", - "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", - "strip_prefix": "abseil-cpp-20211102.0", + "sha256": "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5", + "strip_prefix": "abseil-cpp-20230802.0", "urls": [ - "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" + "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.0.tar.gz" ] }, "com_google_googleapis": { @@ -1149,20 +1147,20 @@ "generator_function": "maybe", "generator_name": "remote_java_tools", "name": "remote_java_tools", - "sha256": "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5", + "sha256": "aa11ecd5fc0af2769f0f2bdd25e2f4de7c1291ed24326fb23fa69bdd5dcae2b5", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools-v12.7.zip" ] }, "remote_java_tools_darwin_arm64": { "generator_function": "maybe", "generator_name": "remote_java_tools_darwin_arm64", "name": "remote_java_tools_darwin_arm64", - "sha256": "c6ffcaf87965c436cc86fc0e9673dafc97c0761efae8225ad2691cf6cfe3d87a", + "sha256": "ecedf6305768dfd51751d0ad732898af092bd7710d497c6c6c3214af7e49395f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_arm64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_arm64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_arm64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_arm64-v12.7.zip" ] }, "remote_java_tools_darwin_arm64_for_testing": { @@ -1187,10 +1185,10 @@ "generator_function": "maybe", "generator_name": "remote_java_tools_darwin_x86_64", "name": "remote_java_tools_darwin_x86_64", - "sha256": "c6545e82e543cb5775d3b8909d6270b5f481864b5ff083d20bfa5dcf77ac3ef7", + "sha256": "e116c649c0355ab57ffcc870ce1139e5e1528cabac458bd50263d2b84ea4ffb2", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_x86_64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_x86_64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_x86_64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_x86_64-v12.7.zip" ] }, "remote_java_tools_darwin_x86_64_for_testing": { @@ -1233,10 +1231,10 @@ "generator_function": "maybe", "generator_name": "remote_java_tools_linux", "name": "remote_java_tools_linux", - "sha256": "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066", + "sha256": "a346b9a291b6db1bb06f7955f267e47522d99963fe14e337da1d75d125a8599f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_linux-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_linux-v12.7.zip" ] }, "remote_java_tools_linux_for_testing": { @@ -1351,10 +1349,10 @@ "generator_function": "maybe", "generator_name": "remote_java_tools_windows", "name": "remote_java_tools_windows", - "sha256": "63f727d44011b8c504bb4e6d89c2cd982278efb34dae8629687e9483d8f7d62d", + "sha256": "bae6a03b5aeead5804ba7bcdcc8b14ec3ed05b37f3db5519f788ab060bc53b05", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_windows-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_windows-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_windows-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_windows-v12.7.zip" ] }, "remote_java_tools_windows_for_testing": { diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/MODULE.bazel.lock b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/MODULE.bazel.lock index fc9d8b7e03..2e380bbea3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/MODULE.bazel.lock +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 3, - "moduleFileHash": "63625ac7809ba5bc83e0814e16f223ac28a98df884897ddd5bfbd69fd4e3ddbf", + "moduleFileHash": "c07897f4cf2ea76f689df2779f50aed06ea638d666542078234ebb0efd3ea5a5", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -13,7 +13,7 @@ "compatibilityMode": "ERROR" }, "localOverrideHashes": { - "bazel_tools": "0cc38516259ab87144b82461dd874e139f093d8e356667c3a3c5a52441ac448f", + "bazel_tools": "922ea6752dc9105de5af957f7a99a6933c0a6a712d23df6aad16a9c399f7e787", "googleapis": "89bad67656f73e953cbf62f12165f56e97cf2cc17d56974c593de76200fa3471", "remoteapis": "3862bfbe3d308e71852b8f025f4b33ea9c0dc8790829eda4a71425c5a2ca814e" }, @@ -27,6 +27,7 @@ "//:default_host_platform" ], "toolchainsToRegister": [ + "@graalvm_toolchains//:gvm", "@bazel_tools//tools/python:autodetecting_toolchain", "@local_config_winsdk//:all", "//src/main/res:empty_rc_toolchain", @@ -39,7 +40,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 65, + "line": 66, "column": 22 }, "imports": { @@ -83,7 +84,7 @@ "com.google.http-client:google-http-client-gson:1.42.0", "com.google.http-client:google-http-client:1.42.0", "com.google.j2objc:j2objc-annotations:1.3", - "com.google.turbine:turbine:0.2", + "com.google.turbine:turbine:0.4.0", "com.ryanharter.auto.value:auto-value-gson-extension:1.3.1", "com.ryanharter.auto.value:auto-value-gson-runtime:1.3.1", "com.ryanharter.auto.value:auto-value-gson-factory:1.3.1", @@ -127,6 +128,7 @@ "io.netty:netty-transport-native-unix-common:jar:osx-x86_64:4.1.93.Final", "io.netty:netty-transport:4.1.93.Final", "io.reactivex.rxjava3:rxjava:3.1.2", + "it.unimi.dsi:fastutil:7.2.1", "javax.activation:javax.activation-api:1.2.0", "javax.annotation:javax.annotation-api:1.3.2", "javax.inject:javax.inject:1", @@ -146,7 +148,7 @@ "org.threeten:threeten-extra:1.5.0", "org.tukaani:xz:1.9", "org.yaml:snakeyaml:1.28", - "tools.profiler:async-profiler:2.9", + "tools.profiler:async-profiler:3.0", "junit:junit:4.13.2", "org.hamcrest:hamcrest-core:1.3" ], @@ -167,7 +169,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 66, + "line": 67, "column": 14 } }, @@ -182,7 +184,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 190, "column": 19 } }, @@ -197,7 +199,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 190, "column": 19 } }, @@ -212,7 +214,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 190, "column": 19 } }, @@ -227,7 +229,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 190, "column": 19 } }, @@ -242,7 +244,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 190, "column": 19 } }, @@ -257,7 +259,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 190, "column": 19 } }, @@ -272,7 +274,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 190, "column": 19 } }, @@ -287,7 +289,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 190, "column": 19 } }, @@ -302,7 +304,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 190, "column": 19 } }, @@ -330,7 +332,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 321, + "line": 333, "column": 22 } } @@ -344,7 +346,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 209, + "line": 211, "column": 32 }, "imports": { @@ -384,7 +386,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 243, + "line": 245, "column": 23 }, "imports": {}, @@ -398,7 +400,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 244, + "line": 246, "column": 17 } } @@ -412,7 +414,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 246, + "line": 248, "column": 20 }, "imports": { @@ -430,7 +432,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 247, + "line": 249, "column": 10 } } @@ -444,7 +446,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 258, + "line": 260, "column": 33 }, "imports": { @@ -475,7 +477,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 279, + "line": 281, "column": 29 }, "imports": { @@ -492,7 +494,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 286, + "line": 288, "column": 32 }, "imports": { @@ -511,7 +513,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 294, + "line": 296, "column": 31 }, "imports": { @@ -528,7 +530,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 297, + "line": 299, "column": 48 }, "imports": { @@ -539,13 +541,46 @@ "hasDevUseExtension": false, "hasNonDevUseExtension": true }, + { + "extensionBzlFile": "@rules_graalvm//:extensions.bzl", + "extensionName": "graalvm", + "usingModule": "", + "location": { + "file": "@@//:MODULE.bazel", + "line": 302, + "column": 20 + }, + "imports": { + "graalvm_toolchains": "graalvm_toolchains" + }, + "devImports": [], + "tags": [ + { + "tagName": "graalvm", + "attributeValues": { + "name": "graalvm", + "distribution": "ce", + "java_version": "20", + "version": "20.0.2" + }, + "devDependency": false, + "location": { + "file": "@@//:MODULE.bazel", + "line": 303, + "column": 12 + } + } + ], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true + }, { "extensionBzlFile": "@io_bazel//:extensions.bzl", "extensionName": "bazel_android_deps", "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 343, + "line": 355, "column": 35 }, "imports": { @@ -562,7 +597,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 346, + "line": 358, "column": 42 }, "imports": { @@ -577,7 +612,7 @@ ], "deps": { "rules_license": "rules_license@0.0.7", - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "com_google_protobuf": "protobuf@21.7", "com_github_grpc_grpc": "grpc@1.48.1.bcr.1", "platforms": "platforms@0.0.8", @@ -587,7 +622,8 @@ "blake3": "blake3@1.3.3.bcr.1", "zlib": "zlib@1.3", "rules_cc": "rules_cc@0.0.9", - "rules_java": "rules_java@7.1.0", + "rules_graalvm": "rules_graalvm@0.10.3", + "rules_java": "rules_java@7.4.0", "rules_proto": "rules_proto@5.3.0-21.7", "rules_jvm_external": "rules_jvm_external@5.2", "rules_python": "rules_python@0.26.0", @@ -595,7 +631,7 @@ "com_google_googletest": "googletest@1.14.0", "remoteapis": "remoteapis@_", "googleapis": "googleapis@_", - "apple_support": "apple_support@1.5.0", + "apple_support": "apple_support@1.8.1", "abseil-cpp": "abseil-cpp@20230125.1", "c-ares": "c-ares@1.15.0", "rules_go": "rules_go@0.39.1", @@ -631,10 +667,10 @@ } } }, - "bazel_skylib@1.4.1": { + "bazel_skylib@1.5.0": { "name": "bazel_skylib", - "version": "1.4.1", - "key": "bazel_skylib@1.4.1", + "version": "1.5.0", + "key": "bazel_skylib@1.5.0", "repoName": "bazel_skylib", "executionPlatformsToRegister": [], "toolchainsToRegister": [ @@ -651,11 +687,11 @@ "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "bazel_skylib~1.4.1", + "name": "bazel_skylib~1.5.0", "urls": [ - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz" + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz" ], - "integrity": "sha256-uKFSeQF3QYCvx5iusoxGNL3M8ZxNmOe90c550f6aqtc=", + "integrity": "sha256-zVWgYudjuTSZIfD124w5MyiNyLpPdt2UFqrGis7jy5Q=", "strip_prefix": "", "remote_patches": {}, "remote_patch_strip": 0 @@ -713,11 +749,11 @@ } ], "deps": { - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "rules_python": "rules_python@0.26.0", "rules_cc": "rules_cc@0.0.9", "rules_proto": "rules_proto@5.3.0-21.7", - "rules_java": "rules_java@7.1.0", + "rules_java": "rules_java@7.4.0", "rules_pkg": "rules_pkg@0.9.1", "com_google_abseil": "abseil-cpp@20230125.1", "zlib": "zlib@1.3", @@ -794,7 +830,7 @@ } ], "deps": { - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "boringssl": "boringssl@0.0.0-20211025-d4f1ab9", "com_github_cares_cares": "c-ares@1.15.0", "com_google_absl": "abseil-cpp@20230125.1", @@ -803,7 +839,7 @@ "rules_proto": "rules_proto@5.3.0-21.7", "upb": "upb@0.0.0-20220923-a547704", "zlib": "zlib@1.3", - "rules_java": "rules_java@7.1.0", + "rules_java": "rules_java@7.4.0", "io_bazel_rules_go": "rules_go@0.39.1", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" @@ -863,7 +899,7 @@ "extensionUsages": [], "deps": { "rules_license": "rules_license@0.0.7", - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "rules_python": "rules_python@0.26.0", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" @@ -892,8 +928,8 @@ "toolchainsToRegister": [], "extensionUsages": [], "deps": { - "bazel_skylib": "bazel_skylib@1.4.1", - "rules_java": "rules_java@7.1.0", + "bazel_skylib": "bazel_skylib@1.5.0", + "rules_java": "rules_java@7.4.0", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" }, @@ -1058,10 +1094,42 @@ } } }, - "rules_java@7.1.0": { + "rules_graalvm@0.10.3": { + "name": "rules_graalvm", + "version": "0.10.3", + "key": "rules_graalvm@0.10.3", + "repoName": "rules_graalvm", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [], + "deps": { + "platforms": "platforms@0.0.8", + "bazel_features": "bazel_features@1.1.0", + "rules_java": "rules_java@7.4.0", + "bazel_skylib": "bazel_skylib@1.5.0", + "build_bazel_apple_support": "apple_support@1.8.1", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_graalvm~0.10.3", + "urls": [ + "https://github.com/sgammon/rules_graalvm/releases/download/v0.10.3/rules_graalvm-0.10.3.zip" + ], + "integrity": "sha256-H0uZeedQMwQt9OlAWgqUmqXdlCfnLIqv2Ikdj2dOdeQ=", + "strip_prefix": "rules_graalvm-0.10.3", + "remote_patches": {}, + "remote_patch_strip": 0 + } + } + }, + "rules_java@7.4.0": { "name": "rules_java", - "version": "7.1.0", - "key": "rules_java@7.1.0", + "version": "7.4.0", + "key": "rules_java@7.4.0", "repoName": "rules_java", "executionPlatformsToRegister": [], "toolchainsToRegister": [ @@ -1094,9 +1162,9 @@ { "extensionBzlFile": "@rules_java//java:extensions.bzl", "extensionName": "toolchains", - "usingModule": "rules_java@7.1.0", + "usingModule": "rules_java@7.4.0", "location": { - "file": "https://bcr.bazel.build/modules/rules_java/7.1.0/MODULE.bazel", + "file": "https://bcr.bazel.build/modules/rules_java/7.4.0/MODULE.bazel", "line": 19, "column": 27 }, @@ -1138,7 +1206,7 @@ "deps": { "platforms": "platforms@0.0.8", "rules_cc": "rules_cc@0.0.9", - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "rules_proto": "rules_proto@5.3.0-21.7", "rules_license": "rules_license@0.0.7", "bazel_tools": "bazel_tools@_", @@ -1148,11 +1216,11 @@ "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0", + "name": "rules_java~7.4.0", "urls": [ - "https://github.com/bazelbuild/rules_java/releases/download/7.1.0/rules_java-7.1.0.tar.gz" + "https://github.com/bazelbuild/rules_java/releases/download/7.4.0/rules_java-7.4.0.tar.gz" ], - "integrity": "sha256-o3pOX2OrgnFuXdau75iO2EYcegC46TYnImKJn1h81OE=", + "integrity": "sha256-l27wi0nJKXQfIBeQ5Z44B8cq2B9CjIvJU82+/1/tFes=", "strip_prefix": "", "remote_patches": {}, "remote_patch_strip": 0 @@ -1168,7 +1236,7 @@ "toolchainsToRegister": [], "extensionUsages": [], "deps": { - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "com_google_protobuf": "protobuf@21.7", "rules_cc": "rules_cc@0.0.9", "bazel_tools": "bazel_tools@_", @@ -1258,7 +1326,7 @@ } ], "deps": { - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "io_bazel_stardoc": "stardoc@0.5.3", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" @@ -1372,7 +1440,7 @@ ], "deps": { "bazel_features": "bazel_features@1.1.0", - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "platforms": "platforms@0.0.8", "rules_proto": "rules_proto@5.3.0-21.7", "com_google_protobuf": "protobuf@21.7", @@ -1405,7 +1473,7 @@ "toolchainsToRegister": [], "extensionUsages": [], "deps": { - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" }, @@ -1467,7 +1535,7 @@ "toolchainsToRegister": [], "extensionUsages": [], "deps": { - "rules_java": "rules_java@7.1.0", + "rules_java": "rules_java@7.4.0", "rules_proto": "rules_proto@5.3.0-21.7", "com_google_protobuf": "protobuf@21.7", "googleapis": "googleapis@_", @@ -1486,7 +1554,7 @@ "extensionUsages": [], "deps": { "rules_license": "rules_license@0.0.7", - "rules_java": "rules_java@7.1.0", + "rules_java": "rules_java@7.4.0", "rules_proto": "rules_proto@5.3.0-21.7", "com_google_protobuf": "protobuf@21.7", "io_bazel": "", @@ -1494,10 +1562,10 @@ "local_config_platform": "local_config_platform@_" } }, - "apple_support@1.5.0": { + "apple_support@1.8.1": { "name": "apple_support", - "version": "1.5.0", - "key": "apple_support@1.5.0", + "version": "1.8.1", + "key": "apple_support@1.8.1", "repoName": "build_bazel_apple_support", "executionPlatformsToRegister": [], "toolchainsToRegister": [ @@ -1507,10 +1575,10 @@ { "extensionBzlFile": "@build_bazel_apple_support//crosstool:setup.bzl", "extensionName": "apple_cc_configure_extension", - "usingModule": "apple_support@1.5.0", + "usingModule": "apple_support@1.8.1", "location": { - "file": "https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel", - "line": 17, + "file": "https://bcr.bazel.build/modules/apple_support/1.8.1/MODULE.bazel", + "line": 14, "column": 35 }, "imports": { @@ -1524,7 +1592,7 @@ } ], "deps": { - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "platforms": "platforms@0.0.8", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" @@ -1533,13 +1601,15 @@ "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "apple_support~1.5.0", + "name": "apple_support~1.8.1", "urls": [ - "https://github.com/bazelbuild/apple_support/releases/download/1.5.0/apple_support.1.5.0.tar.gz" + "https://github.com/bazelbuild/apple_support/releases/download/1.8.1/apple_support.1.8.1.tar.gz" ], - "integrity": "sha256-miM41vja0yRPgj8txghKA+TQ+7J8qJLclw5okNW0gYQ=", + "integrity": "sha256-Rda7rVMWycMAh4v3//xP/eE9YgSEyRhHCMkX4guLY/8=", "strip_prefix": "", - "remote_patches": {}, + "remote_patches": { + "https://bcr.bazel.build/modules/apple_support/1.8.1/patches/module_dot_bazel_version.patch": "sha256-KiC39AC9hYWZhC2sZwZcY46HVerfh2p9pzF9WXqcxAI=" + }, "remote_patch_strip": 0 } } @@ -1555,7 +1625,7 @@ "deps": { "rules_cc": "rules_cc@0.0.9", "platforms": "platforms@0.0.8", - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" }, @@ -1585,7 +1655,7 @@ "toolchainsToRegister": [], "extensionUsages": [], "deps": { - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "com_github_grpc_grpc": "grpc@1.48.1.bcr.1", "platforms": "platforms@0.0.8", "bazel_tools": "bazel_tools@_", @@ -1720,7 +1790,7 @@ } ], "deps": { - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "platforms": "platforms@0.0.8", "rules_proto": "rules_proto@5.3.0-21.7", "com_google_protobuf": "protobuf@21.7", @@ -1752,7 +1822,7 @@ "toolchainsToRegister": [], "extensionUsages": [], "deps": { - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "rules_proto": "rules_proto@5.3.0-21.7", "com_google_protobuf": "protobuf@21.7", "com_google_absl": "abseil-cpp@20230125.1", @@ -1794,7 +1864,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 13, + "line": 17, "column": 29 }, "imports": { @@ -1812,7 +1882,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 17, + "line": 21, "column": 32 }, "imports": { @@ -1829,7 +1899,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 20, + "line": 24, "column": 32 }, "imports": { @@ -1851,7 +1921,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 31, + "line": 35, "column": 39 }, "imports": { @@ -1868,7 +1938,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 35, + "line": 39, "column": 48 }, "imports": { @@ -1885,7 +1955,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 38, + "line": 42, "column": 42 }, "imports": { @@ -1900,13 +1970,14 @@ ], "deps": { "rules_cc": "rules_cc@0.0.9", - "rules_java": "rules_java@7.1.0", + "rules_java": "rules_java@7.4.0", "rules_license": "rules_license@0.0.7", "rules_proto": "rules_proto@5.3.0-21.7", "rules_python": "rules_python@0.26.0", "platforms": "platforms@0.0.8", "com_google_protobuf": "protobuf@21.7", "zlib": "zlib@1.3", + "build_bazel_apple_support": "apple_support@1.8.1", "local_config_platform": "local_config_platform@_" } }, @@ -2132,7 +2203,7 @@ } ], "deps": { - "bazel_skylib": "bazel_skylib@1.4.1", + "bazel_skylib": "bazel_skylib@1.5.0", "com_google_protobuf": "protobuf@21.7", "io_bazel_rules_go": "rules_go@0.39.1", "rules_proto": "rules_proto@5.3.0-21.7", @@ -2158,7 +2229,7 @@ "moduleExtensions": { "//:extensions.bzl%bazel_android_deps": { "general": { - "bzlTransitiveDigest": "rjB9TSLGt3ZwbECWtF/HMgfqMsfEnDLK6fGIe65ZyfE=", + "bzlTransitiveDigest": "MO3e2koSmZi0NExoX7q3lkNlyquuSaUeNAzVxet7a1c=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2172,15 +2243,132 @@ "url": "https://github.com/google/desugar_jdk_libs/archive/24dcd1dead0b64aae3d7c89ca9646b5dc4068009.zip" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "", + "abseil-cpp", + "abseil-cpp~20230125.1" + ], + [ + "", + "apple_support", + "apple_support~1.8.1" + ], + [ + "", + "bazel_skylib", + "bazel_skylib~1.5.0" + ], + [ + "", + "bazel_tools", + "bazel_tools" + ], + [ + "", + "blake3", + "blake3~1.3.3.bcr.1" + ], + [ + "", + "c-ares", + "c-ares~1.15.0" + ], + [ + "", + "com_github_grpc_grpc", + "grpc~1.48.1.bcr.1" + ], + [ + "", + "com_google_protobuf", + "protobuf~21.7" + ], + [ + "", + "io_bazel_skydoc", + "stardoc~0.5.3" + ], + [ + "", + "platforms", + "platforms" + ], + [ + "", + "rules_cc", + "rules_cc~0.0.9" + ], + [ + "", + "rules_go", + "rules_go~0.39.1" + ], + [ + "", + "rules_graalvm", + "rules_graalvm~0.10.3" + ], + [ + "", + "rules_java", + "rules_java~7.4.0" + ], + [ + "", + "rules_jvm_external", + "rules_jvm_external~5.2" + ], + [ + "", + "rules_license", + "rules_license~0.0.7" + ], + [ + "", + "rules_pkg", + "rules_pkg~0.9.1" + ], + [ + "", + "rules_proto", + "rules_proto~5.3.0-21.7" + ], + [ + "", + "rules_python", + "rules_python~0.26.0" + ], + [ + "", + "upb", + "upb~0.0.0-20220923-a547704" + ], + [ + "", + "zlib", + "zlib~1.3" + ], + [ + "", + "zstd-jni", + "zstd-jni~1.5.2-3.bcr.1" + ], + [ + "bazel_tools", + "bazel_tools", + "bazel_tools" + ] + ] } }, "//:extensions.bzl%bazel_build_deps": { "general": { - "bzlTransitiveDigest": "rjB9TSLGt3ZwbECWtF/HMgfqMsfEnDLK6fGIe65ZyfE=", + "bzlTransitiveDigest": "MO3e2koSmZi0NExoX7q3lkNlyquuSaUeNAzVxet7a1c=", "accumulatedFileDigests": { - "@@//src/test/tools/bzlmod:MODULE.bazel.lock": "4e2a1386686aae6d7be071ef615438178fdb93104b5b84cf8a372b6a944b27cd", - "@@//:MODULE.bazel": "63625ac7809ba5bc83e0814e16f223ac28a98df884897ddd5bfbd69fd4e3ddbf" + "@@//src/test/tools/bzlmod:MODULE.bazel.lock": "0cae3b3c6186baa47cd8a48fe55530f613f22016845926e7825dce52dd496540", + "@@//:MODULE.bazel": "c07897f4cf2ea76f689df2779f50aed06ea638d666542078234ebb0efd3ea5a5" }, "envVariables": {}, "generatedRepoSpecs": { @@ -2201,15 +2389,22 @@ "name": "_main~bazel_build_deps~bazel_tools_repo_cache", "repos": [ "rules_cc~0.0.9", - "rules_java~7.1.0", + "rules_java~7.4.0", "rules_license~0.0.7", - "rules_proto~4.0.0", - "rules_python~0.4.0", + "rules_proto~5.3.0-21.7", + "rules_python~0.22.1", + "buildozer~6.4.0.2", "platforms", - "protobuf~3.19.6", + "protobuf~21.7", "zlib~1.3", "apple_support~1.5.0", - "bazel_skylib~1.3.0" + "bazel_skylib~1.3.0", + "rules_pkg~0.7.0", + "abseil-cpp~20211102.0", + "upb~0.0.0-20220923-a547704", + "rules_jvm_external~4.4.2", + "googletest~1.11.0", + "stardoc~0.5.1" ], "lockfile": "@@//src/test/tools/bzlmod:MODULE.bazel.lock" } @@ -2261,8 +2456,8 @@ "name": "_main~bazel_build_deps~bootstrap_repo_cache", "repos": [ "abseil-cpp~20230125.1", - "apple_support~1.5.0", - "bazel_skylib~1.4.1", + "apple_support~1.8.1", + "bazel_skylib~1.5.0", "blake3~1.3.3.bcr.1", "c-ares~1.15.0", "grpc~1.48.1.bcr.1", @@ -2271,8 +2466,9 @@ "platforms", "rules_cc~0.0.9", "rules_go~0.39.1", - "rules_java~7.1.0", + "rules_java~7.4.0", "rules_jvm_external~5.2", + "rules_graalvm~0.10.3", "rules_license~0.0.7", "rules_pkg~0.9.1", "rules_proto~5.3.0-21.7", @@ -2341,9 +2537,9 @@ "name": "_main~bazel_build_deps~workspace_repo_cache", "archives": [ "rules_cc-0.0.9.tar.gz", - "rules_java-7.1.0.tar.gz", + "rules_java-7.4.0.tar.gz", "5.3.0-21.7.tar.gz", - "bazel-skylib-1.4.1.tar.gz", + "bazel-skylib-1.5.0.tar.gz", "rules_license-0.0.7.tar.gz", "rules_python-0.24.0.tar.gz", "rules_pkg-0.9.1.tar.gz", @@ -2352,9 +2548,9 @@ ], "sha256": { "rules_cc-0.0.9.tar.gz": "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf", - "rules_java-7.1.0.tar.gz": "a37a4e5f63ab82716e5dd6aeef988ed8461c7a00b8e936272262899f587cd4e1", + "rules_java-7.4.0.tar.gz": "976ef08b49c929741f201790e59e3807c72ad81f428c8bc953cdbeff5fed15eb", "5.3.0-21.7.tar.gz": "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd", - "bazel-skylib-1.4.1.tar.gz": "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7", + "bazel-skylib-1.5.0.tar.gz": "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94", "rules_license-0.0.7.tar.gz": "4531deccb913639c30e5c7512a054d5d875698daeb75d8cf90f284375fe7c360", "rules_python-0.24.0.tar.gz": "0a8003b044294d7840ac7d9d73eef05d6ceb682d7516781a4ec62eeb34702578", "rules_pkg-0.9.1.tar.gz": "8f9ee2dc10c1ae514ee599a8b42ed99fa262b757058f65ad3c384289ff70c4b8", @@ -2365,14 +2561,14 @@ "rules_cc-0.0.9.tar.gz": [ "https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz" ], - "rules_java-7.1.0.tar.gz": [ - "https://github.com/bazelbuild/rules_java/releases/download/7.1.0/rules_java-7.1.0.tar.gz" + "rules_java-7.4.0.tar.gz": [ + "https://github.com/bazelbuild/rules_java/releases/download/7.4.0/rules_java-7.4.0.tar.gz" ], "5.3.0-21.7.tar.gz": [ "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz" ], - "bazel-skylib-1.4.1.tar.gz": [ - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz" + "bazel-skylib-1.5.0.tar.gz": [ + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz" ], "rules_license-0.0.7.tar.gz": [ "https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz" @@ -2423,12 +2619,129 @@ "build_file": "@@//tools/distributions/debian:debian_proto.BUILD" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "", + "abseil-cpp", + "abseil-cpp~20230125.1" + ], + [ + "", + "apple_support", + "apple_support~1.8.1" + ], + [ + "", + "bazel_skylib", + "bazel_skylib~1.5.0" + ], + [ + "", + "bazel_tools", + "bazel_tools" + ], + [ + "", + "blake3", + "blake3~1.3.3.bcr.1" + ], + [ + "", + "c-ares", + "c-ares~1.15.0" + ], + [ + "", + "com_github_grpc_grpc", + "grpc~1.48.1.bcr.1" + ], + [ + "", + "com_google_protobuf", + "protobuf~21.7" + ], + [ + "", + "io_bazel_skydoc", + "stardoc~0.5.3" + ], + [ + "", + "platforms", + "platforms" + ], + [ + "", + "rules_cc", + "rules_cc~0.0.9" + ], + [ + "", + "rules_go", + "rules_go~0.39.1" + ], + [ + "", + "rules_graalvm", + "rules_graalvm~0.10.3" + ], + [ + "", + "rules_java", + "rules_java~7.4.0" + ], + [ + "", + "rules_jvm_external", + "rules_jvm_external~5.2" + ], + [ + "", + "rules_license", + "rules_license~0.0.7" + ], + [ + "", + "rules_pkg", + "rules_pkg~0.9.1" + ], + [ + "", + "rules_proto", + "rules_proto~5.3.0-21.7" + ], + [ + "", + "rules_python", + "rules_python~0.26.0" + ], + [ + "", + "upb", + "upb~0.0.0-20220923-a547704" + ], + [ + "", + "zlib", + "zlib~1.3" + ], + [ + "", + "zstd-jni", + "zstd-jni~1.5.2-3.bcr.1" + ], + [ + "bazel_tools", + "bazel_tools", + "bazel_tools" + ] + ] } }, "//:extensions.bzl%bazel_test_deps": { "general": { - "bzlTransitiveDigest": "rjB9TSLGt3ZwbECWtF/HMgfqMsfEnDLK6fGIe65ZyfE=", + "bzlTransitiveDigest": "MO3e2koSmZi0NExoX7q3lkNlyquuSaUeNAzVxet7a1c=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2456,7 +2769,124 @@ "url": "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "", + "abseil-cpp", + "abseil-cpp~20230125.1" + ], + [ + "", + "apple_support", + "apple_support~1.8.1" + ], + [ + "", + "bazel_skylib", + "bazel_skylib~1.5.0" + ], + [ + "", + "bazel_tools", + "bazel_tools" + ], + [ + "", + "blake3", + "blake3~1.3.3.bcr.1" + ], + [ + "", + "c-ares", + "c-ares~1.15.0" + ], + [ + "", + "com_github_grpc_grpc", + "grpc~1.48.1.bcr.1" + ], + [ + "", + "com_google_protobuf", + "protobuf~21.7" + ], + [ + "", + "io_bazel_skydoc", + "stardoc~0.5.3" + ], + [ + "", + "platforms", + "platforms" + ], + [ + "", + "rules_cc", + "rules_cc~0.0.9" + ], + [ + "", + "rules_go", + "rules_go~0.39.1" + ], + [ + "", + "rules_graalvm", + "rules_graalvm~0.10.3" + ], + [ + "", + "rules_java", + "rules_java~7.4.0" + ], + [ + "", + "rules_jvm_external", + "rules_jvm_external~5.2" + ], + [ + "", + "rules_license", + "rules_license~0.0.7" + ], + [ + "", + "rules_pkg", + "rules_pkg~0.9.1" + ], + [ + "", + "rules_proto", + "rules_proto~5.3.0-21.7" + ], + [ + "", + "rules_python", + "rules_python~0.26.0" + ], + [ + "", + "upb", + "upb~0.0.0-20220923-a547704" + ], + [ + "", + "zlib", + "zlib~1.3" + ], + [ + "", + "zstd-jni", + "zstd-jni~1.5.2-3.bcr.1" + ], + [ + "bazel_tools", + "bazel_tools", + "bazel_tools" + ] + ] } }, "//:rbe_extension.bzl%bazel_rbe_deps": { @@ -2473,12 +2903,13 @@ "toolchain": "ubuntu2004-bazel-java11" } } - } + }, + "recordedRepoMappingEntries": [] } }, "//tools/android:android_extensions.bzl%remote_android_tools_extensions": { "general": { - "bzlTransitiveDigest": "4x/FXzwoadac6uV9ItZ4eGOyCculGHHrKUhLFNWo3lA=", + "bzlTransitiveDigest": "S0n86BFe4SJ3lRaZiRA5D46oH52UO2hP1T50t/zldOw=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2500,12 +2931,13 @@ "url": "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar" } } - } + }, + "recordedRepoMappingEntries": [] } }, "//tools/test:extensions.bzl%remote_coverage_tools_extension": { "general": { - "bzlTransitiveDigest": "y48q5zUu2oMiYv7yUyi7rFB0wt14eqiF/RQcWT6vP7I=", + "bzlTransitiveDigest": "l5mcjH2gWmbmIycx97bzI2stD0Q0M5gpDc0aLOHKIm8=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2520,33 +2952,41 @@ ] } } - } + }, + "recordedRepoMappingEntries": [] } }, - "@apple_support~1.5.0//crosstool:setup.bzl%apple_cc_configure_extension": { + "@@apple_support~1.8.1//crosstool:setup.bzl%apple_cc_configure_extension": { "general": { - "bzlTransitiveDigest": "jHojdO5WHRVU9tk3Qspqa1HdHApA7p3vMRe5vEKWQkg=", + "bzlTransitiveDigest": "JFciz9+xRmE31CdyrcEUeZSKFxwiLTQ+PNMg6Bcc6s8=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { "local_config_apple_cc": { - "bzlFile": "@@apple_support~1.5.0//crosstool:setup.bzl", + "bzlFile": "@@apple_support~1.8.1//crosstool:setup.bzl", "ruleClassName": "_apple_cc_autoconf", "attributes": { - "name": "apple_support~1.5.0~apple_cc_configure_extension~local_config_apple_cc" + "name": "apple_support~1.8.1~apple_cc_configure_extension~local_config_apple_cc" } }, "local_config_apple_cc_toolchains": { - "bzlFile": "@@apple_support~1.5.0//crosstool:setup.bzl", + "bzlFile": "@@apple_support~1.8.1//crosstool:setup.bzl", "ruleClassName": "_apple_cc_autoconf_toolchains", "attributes": { - "name": "apple_support~1.5.0~apple_cc_configure_extension~local_config_apple_cc_toolchains" + "name": "apple_support~1.8.1~apple_cc_configure_extension~local_config_apple_cc_toolchains" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "apple_support~1.8.1", + "bazel_tools", + "bazel_tools" + ] + ] } }, - "@bazel_features~1.1.0//private:extensions.bzl%version_extension": { + "@@bazel_features~1.1.0//private:extensions.bzl%version_extension": { "general": { "bzlTransitiveDigest": "LKmXjK1avT44pRhO3x6Hplu1mU9qrNOaHP+/tJ0VFfE=", "accumulatedFileDigests": {}, @@ -2571,12 +3011,13 @@ } } } - } + }, + "recordedRepoMappingEntries": [] } }, - "@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": { + "@@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": { "general": { - "bzlTransitiveDigest": "4+Dj2H7maLh8JtpJKiuaI7PSXiIZw6oWX9xsVhnJ5DU=", + "bzlTransitiveDigest": "4x/FXzwoadac6uV9ItZ4eGOyCculGHHrKUhLFNWo3lA=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2585,8 +3026,8 @@ "ruleClassName": "http_archive", "attributes": { "name": "bazel_tools~remote_android_tools_extensions~android_tools", - "sha256": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz" + "sha256": "2b661a761a735b41c41b3a78089f4fc1982626c76ddb944604ae3ff8c545d3c2", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.30.0.tar" } }, "android_gmaven_r8": { @@ -2594,16 +3035,17 @@ "ruleClassName": "http_jar", "attributes": { "name": "bazel_tools~remote_android_tools_extensions~android_gmaven_r8", - "sha256": "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702", - "url": "https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar" + "sha256": "57a696749695a09381a87bc2f08c3a8ed06a717a5caa3ef878a3077e0d3af19d", + "url": "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar" } } - } + }, + "recordedRepoMappingEntries": [] } }, - "@bazel_tools//tools/cpp:cc_configure.bzl%cc_configure_extension": { + "@@bazel_tools//tools/cpp:cc_configure.bzl%cc_configure_extension": { "general": { - "bzlTransitiveDigest": "sftnIlf92nP/IUiWiMkgL9Sh8Drk9kKhTXHvoavVJZg=", + "bzlTransitiveDigest": "mcsWHq3xORJexV5/4eCvNOLxFOQKV6eli3fkr+tEaqE=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2621,12 +3063,19 @@ "name": "bazel_tools~cc_configure_extension~local_config_cc_toolchains" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "bazel_tools", + "bazel_tools", + "bazel_tools" + ] + ] } }, - "@bazel_tools//tools/osx:xcode_configure.bzl%xcode_configure_extension": { + "@@bazel_tools//tools/osx:xcode_configure.bzl%xcode_configure_extension": { "general": { - "bzlTransitiveDigest": "CtmyZVPtInM72JKIFfarSKOF0R/GbDRl8HBuOsRWhRs=", + "bzlTransitiveDigest": "Qh2bWTU6QW6wkrd87qrU4YeY+SG37Nvw3A0PR4Y0L2Y=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2639,10 +3088,11 @@ "remote_xcode": "" } } - } + }, + "recordedRepoMappingEntries": [] } }, - "@bazel_tools//tools/sh:sh_configure.bzl%sh_configure_extension": { + "@@bazel_tools//tools/sh:sh_configure.bzl%sh_configure_extension": { "general": { "bzlTransitiveDigest": "hp4NgmNjEg5+xgvzfh6L83bt9/aiiWETuNpwNuF1MSU=", "accumulatedFileDigests": {}, @@ -2655,12 +3105,13 @@ "name": "bazel_tools~sh_configure_extension~local_config_sh" } } - } + }, + "recordedRepoMappingEntries": [] } }, - "@bazel_tools//tools/test:extensions.bzl%remote_coverage_tools_extension": { + "@@bazel_tools//tools/test:extensions.bzl%remote_coverage_tools_extension": { "general": { - "bzlTransitiveDigest": "IWFtZ+6M0WGmNpfnHZMxnVFSDZ6pRTEWt7jixp7XffQ=", + "bzlTransitiveDigest": "y48q5zUu2oMiYv7yUyi7rFB0wt14eqiF/RQcWT6vP7I=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2675,12 +3126,13 @@ ] } } - } + }, + "recordedRepoMappingEntries": [] } }, - "@gazelle~0.30.0//:extensions.bzl%go_deps": { + "@@gazelle~0.30.0//:extensions.bzl%go_deps": { "general": { - "bzlTransitiveDigest": "BoYvkoiu4JJx2ptGuMiFUuXn9wupdeJIWbn2MXOkBb8=", + "bzlTransitiveDigest": "qA0ex33bTMERZ7C8nXKz92cjvx42TwSWN1J1CSDT0K8=", "accumulatedFileDigests": { "@@rules_go~0.39.1//:go.sum": "022d36c9ebcc7b5dee1e9b85b3da9c9f3a529ee6f979946d66e4955b8d54614a", "@@rules_go~0.39.1//:go.mod": "a7143f329c2a3e0b983ce74a96c0c25b0d0c59d236d75f7e1b069aadd988d55e", @@ -2937,10 +3389,17 @@ "build_directives": [] } } - } + }, + "recordedRepoMappingEntries": [ + [ + "gazelle~0.30.0", + "bazel_tools", + "bazel_tools" + ] + ] } }, - "@gazelle~0.30.0//internal/bzlmod:non_module_deps.bzl%non_module_deps": { + "@@gazelle~0.30.0//internal/bzlmod:non_module_deps.bzl%non_module_deps": { "general": { "bzlTransitiveDigest": "30wev+wJfzc4s72MCfbP9U8W+3Js2b+Xbo5ofgZbHw8=", "accumulatedFileDigests": {}, @@ -2963,12 +3422,13 @@ "go_env": {} } } - } + }, + "recordedRepoMappingEntries": [] } }, - "@grpc~1.48.1.bcr.1//bazel:grpc_deps.bzl%grpc_repo_deps_ext": { + "@@grpc~1.48.1.bcr.1//bazel:grpc_deps.bzl%grpc_repo_deps_ext": { "general": { - "bzlTransitiveDigest": "S5rdtWt3QVZgX2cP/Ot1NLUmlqgtcoz1cPNksEQYtFQ=", + "bzlTransitiveDigest": "Vi/A+pHz0UslIVgXw0k4nRhXybndFcXR259m5TlMQXA=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -3267,12 +3727,24 @@ ] } } - } + }, + "recordedRepoMappingEntries": [ + [ + "grpc~1.48.1.bcr.1", + "bazel_tools", + "bazel_tools" + ], + [ + "grpc~1.48.1.bcr.1", + "com_github_grpc_grpc", + "grpc~1.48.1.bcr.1" + ] + ] } }, - "@grpc~1.48.1.bcr.1//bazel:grpc_extra_deps.bzl%grpc_extra_deps_ext": { + "@@grpc~1.48.1.bcr.1//bazel:grpc_extra_deps.bzl%grpc_extra_deps_ext": { "general": { - "bzlTransitiveDigest": "ALqwntEqKRNf03LlwK9t4Oh/flVzCF6ZWFL9xTX69uI=", + "bzlTransitiveDigest": "a/Diq7iDATaU2rBTMgcQ5R3n2KlPdis6c56UUe28yBU=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -3421,12 +3893,84 @@ } } } - } + }, + "recordedRepoMappingEntries": [ + [ + "grpc~1.48.1.bcr.1", + "com_envoyproxy_protoc_gen_validate", + "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~com_envoyproxy_protoc_gen_validate" + ], + [ + "grpc~1.48.1.bcr.1", + "com_google_googleapis", + "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~com_google_googleapis" + ], + [ + "grpc~1.48.1.bcr.1", + "com_google_protobuf", + "protobuf~21.7" + ], + [ + "grpc~1.48.1.bcr.1", + "envoy_api", + "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~envoy_api" + ], + [ + "grpc~1.48.1.bcr.1", + "io_bazel_rules_go", + "rules_go~0.39.1" + ], + [ + "grpc~1.48.1.bcr.1", + "upb", + "upb~0.0.0-20220923-a547704" + ], + [ + "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~bazel_gazelle", + "bazel_gazelle", + "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~bazel_gazelle" + ], + [ + "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~bazel_gazelle", + "bazel_tools", + "bazel_tools" + ], + [ + "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~com_envoyproxy_protoc_gen_validate", + "bazel_gazelle", + "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~bazel_gazelle" + ], + [ + "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~envoy_api", + "bazel_tools", + "bazel_tools" + ], + [ + "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~envoy_api", + "envoy_api", + "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~envoy_api" + ], + [ + "protobuf~21.7", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_go~0.39.1", + "bazel_tools", + "bazel_tools" + ], + [ + "upb~0.0.0-20220923-a547704", + "bazel_tools", + "bazel_tools" + ] + ] } }, - "@rules_go~0.39.1//go:extensions.bzl%go_sdk": { + "@@rules_go~0.39.1//go:extensions.bzl%go_sdk": { "general": { - "bzlTransitiveDigest": "baCc5Mc6nJAIoj3TovuW1bOINXCqP/9lOv0UCbAkhsk=", + "bzlTransitiveDigest": "cvuDQzKTBy1BBsQPA+7jKTCEaEg3uqu2SQX9x2Z1vz4=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -3469,12 +4013,19 @@ ] } } - } + }, + "recordedRepoMappingEntries": [ + [ + "rules_go~0.39.1", + "bazel_tools", + "bazel_tools" + ] + ] } }, - "@rules_go~0.39.1//go/private:extensions.bzl%non_module_dependencies": { + "@@rules_go~0.39.1//go/private:extensions.bzl%non_module_dependencies": { "general": { - "bzlTransitiveDigest": "lISD5Aqr6V4eTUAf5oZ4MilfT1BSlMybWvnRzRfSmM4=", + "bzlTransitiveDigest": "CamLV5C1Q66aY4Gu2ce5shMFpOJV/A+fmw4qzuGHmJk=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -3694,52 +4245,91 @@ ] } } - } + }, + "recordedRepoMappingEntries": [ + [ + "rules_go~0.39.1", + "bazel_tools", + "bazel_tools" + ] + ] } }, - "@rules_java~7.1.0//java:extensions.bzl%toolchains": { + "@@rules_graalvm~0.10.3//:extensions.bzl%graalvm": { "general": { - "bzlTransitiveDigest": "p7Arq0FCdeuM/UFxax3JGDCetBx8pIqr2m77/MWrf8w=", + "bzlTransitiveDigest": "RNOMan/EiPbz5i2nh2YxhbeTAOvTd9ReDe7arDK0PeY=", + "accumulatedFileDigests": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "graalvm_toolchains": { + "bzlFile": "@@rules_graalvm~0.10.3//internal:graalvm_bindist.bzl", + "ruleClassName": "_toolchain_config", + "attributes": { + "name": "rules_graalvm~0.10.3~graalvm~graalvm_toolchains", + "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"graalvm_20\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"20\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"toolchain_gvm\",\n actual = \"gvm\",\n visibility = [\"//visibility:public\"],\n)\ntoolchain(\n name = \"gvm\",\n exec_compatible_with = [\n \n ],\n target_compatible_with = [\n \n ],\n toolchain = \"@graalvm//:gvm\",\n toolchain_type = \"@rules_graalvm//graalvm/toolchain\",\n visibility = [\"//visibility:public\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@graalvm//:jdk\",\n visibility = [\"//visibility:public\"],\n)\n\n" + } + }, + "graalvm": { + "bzlFile": "@@rules_graalvm~0.10.3//internal:graalvm_bindist.bzl", + "ruleClassName": "_graalvm_bindist_repository", + "attributes": { + "name": "rules_graalvm~0.10.3~graalvm~graalvm", + "version": "20.0.2", + "java_version": "20", + "distribution": "ce", + "components": [], + "setup_actions": [], + "enable_toolchain": true, + "toolchain_config": "graalvm_toolchains" + } + } + }, + "recordedRepoMappingEntries": [] + } + }, + "@@rules_java~7.4.0//java:extensions.bzl%toolchains": { + "general": { + "bzlTransitiveDigest": "aBRZna7UIPTRv5GXYZ2u+AfFtxUOl9IjgmCeWzNSieQ=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { "remotejdk21_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_linux_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk21_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux//:jdk\",\n)\n" } }, "remotejdk17_linux_s390x_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_s390x_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_s390x_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\n" } }, "remotejdk17_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_macos_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk17_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos//:jdk\",\n)\n" } }, "remotejdk21_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_macos_aarch64_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk21_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\n" } }, "remotejdk17_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_aarch64_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\n" } }, @@ -3747,21 +4337,21 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_macos_aarch64", + "name": "rules_java~7.4.0~toolchains~remotejdk21_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "2a7a99a3ea263dbd8d32a67d1e6e363ba8b25c645c826f5e167a02bbafaff1fa", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-macosx_aarch64", + "sha256": "e8260516de8b60661422a725f1df2c36ef888f6fb35393566b00e7325db3d04e", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_aarch64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_aarch64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_aarch64.tar.gz" ] } }, "remotejdk17_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux//:jdk\",\n)\n" } }, @@ -3769,7 +4359,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_macos_aarch64", + "name": "rules_java~7.4.0~toolchains~remotejdk17_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "314b04568ec0ae9b36ba03c9cbd42adc9e1265f74678923b19297d66eb84dcca", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64", @@ -3783,11 +4373,11 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools_windows", - "sha256": "c5c70c214a350f12cbf52da8270fa43ba629b795f3dd328028a38f8f0d39c2a1", + "name": "rules_java~7.4.0~toolchains~remote_java_tools_windows", + "sha256": "fe2f88169696d6c6fc6e90ba61bb46be7d0ae3693cbafdf336041bf56679e8d1", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools_windows-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools_windows-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_windows-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_windows-v13.4.zip" ] } }, @@ -3795,7 +4385,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_win", + "name": "rules_java~7.4.0~toolchains~remotejdk11_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "43408193ce2fa0862819495b5ae8541085b95660153f2adcf91a52d3a1710e83", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-win_x64", @@ -3806,10 +4396,10 @@ } }, "remotejdk11_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_win_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk11_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win//:jdk\",\n)\n" } }, @@ -3817,7 +4407,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_aarch64", + "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "54174439f2b3fddd11f1048c397fe7bb45d4c9d66d452d6889b013d04d21c4de", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_aarch64", @@ -3831,7 +4421,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux", + "name": "rules_java~7.4.0~toolchains~remotejdk17_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "b9482f2304a1a68a614dfacddcf29569a72f0fac32e6c74f83dc1b9a157b8340", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_x64", @@ -3842,18 +4432,18 @@ } }, "remotejdk11_linux_s390x_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_s390x_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_s390x_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\n" } }, "remotejdk11_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux//:jdk\",\n)\n" } }, @@ -3861,7 +4451,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_macos", + "name": "rules_java~7.4.0~toolchains~remotejdk11_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "bcaab11cfe586fae7583c6d9d311c64384354fb2638eb9a012eca4c3f1a1d9fd", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_x64", @@ -3875,7 +4465,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_win_arm64", + "name": "rules_java~7.4.0~toolchains~remotejdk11_win_arm64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", "strip_prefix": "jdk-11.0.13+8", @@ -3888,7 +4478,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_macos", + "name": "rules_java~7.4.0~toolchains~remotejdk17_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "640453e8afe8ffe0fb4dceb4535fb50db9c283c64665eebb0ba68b19e65f4b1f", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_x64", @@ -3902,29 +4492,29 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_macos", + "name": "rules_java~7.4.0~toolchains~remotejdk21_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "9639b87db586d0c89f7a9892ae47f421e442c64b97baebdff31788fbe23265bd", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-macosx_x64", + "sha256": "3ad8fe288eb57d975c2786ae453a036aa46e47ab2ac3d81538ebae2a54d3c025", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_x64.tar.gz" ] } }, "remotejdk21_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_macos_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk21_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos//:jdk\",\n)\n" } }, "remotejdk17_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_macos_aarch64_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk17_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\n" } }, @@ -3932,7 +4522,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_win", + "name": "rules_java~7.4.0~toolchains~remotejdk17_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "192f2afca57701de6ec496234f7e45d971bf623ff66b8ee4a5c81582054e5637", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_x64", @@ -3943,18 +4533,18 @@ } }, "remotejdk11_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_macos_aarch64_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk11_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\n" } }, "remotejdk11_linux_ppc64le_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_ppc64le_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_ppc64le_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\n" } }, @@ -3962,13 +4552,13 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_linux", + "name": "rules_java~7.4.0~toolchains~remotejdk21_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "0c0eadfbdc47a7ca64aeab51b9c061f71b6e4d25d2d87674512e9b6387e9e3a6", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-linux_x64", + "sha256": "5ad730fbee6bb49bfff10bf39e84392e728d89103d3474a7e5def0fd134b300a", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_x64.tar.gz" ] } }, @@ -3976,11 +4566,11 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools_linux", - "sha256": "d134da9b04c9023fb6e56a5d4bffccee73f7bc9572ddc4e747778dacccd7a5a7", + "name": "rules_java~7.4.0~toolchains~remote_java_tools_linux", + "sha256": "ba10f09a138cf185d04cbc807d67a3da42ab13d618c5d1ce20d776e199c33a39", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools_linux-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools_linux-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_linux-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_linux-v13.4.zip" ] } }, @@ -3988,13 +4578,13 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_win", + "name": "rules_java~7.4.0~toolchains~remotejdk21_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "e9959d500a0d9a7694ac243baf657761479da132f0f94720cbffd092150bd802", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-win_x64", + "sha256": "f7cc15ca17295e69c907402dfe8db240db446e75d3b150da7bf67243cded93de", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-win_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-win_x64.zip", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-win_x64.zip" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-win_x64.zip" ] } }, @@ -4002,21 +4592,21 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_linux_aarch64", + "name": "rules_java~7.4.0~toolchains~remotejdk21_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "1fb64b8036c5d463d8ab59af06bf5b6b006811e6012e3b0eb6bccf57f1c55835", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-linux_aarch64", + "sha256": "ce7df1af5d44a9f455617c4b8891443fbe3e4b269c777d8b82ed66f77167cfe0", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_aarch64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_aarch64.tar.gz" + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_aarch64.tar.gz", + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_aarch64.tar.gz" ] } }, "remotejdk11_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_aarch64_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\n" } }, @@ -4024,7 +4614,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_s390x", + "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_s390x", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b", "strip_prefix": "jdk-11.0.15+10", @@ -4038,7 +4628,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_aarch64", + "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "6531cef61e416d5a7b691555c8cf2bdff689201b8a001ff45ab6740062b44313", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64", @@ -4049,10 +4639,10 @@ } }, "remotejdk17_win_arm64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_win_arm64_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk17_win_arm64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\n" } }, @@ -4060,7 +4650,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux", + "name": "rules_java~7.4.0~toolchains~remotejdk11_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a34b404f87a08a61148b38e1416d837189e1df7a040d949e743633daf4695a3c", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_x64", @@ -4071,18 +4661,18 @@ } }, "remotejdk11_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_macos_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk11_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos//:jdk\",\n)\n" } }, "remotejdk17_linux_ppc64le_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_ppc64le_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_ppc64le_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\n" } }, @@ -4090,7 +4680,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_win_arm64", + "name": "rules_java~7.4.0~toolchains~remotejdk17_win_arm64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "6802c99eae0d788e21f52d03cab2e2b3bf42bc334ca03cbf19f71eb70ee19f85", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_aarch64", @@ -4104,11 +4694,11 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools_darwin_arm64", - "sha256": "dab5bb87ec43e980faea6e1cec14bafb217b8e2f5346f53aa784fd715929a930", + "name": "rules_java~7.4.0~toolchains~remote_java_tools_darwin_arm64", + "sha256": "076a7e198ad077f8c7d997986ef5102427fae6bbfce7a7852d2e080ed8767528", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools_darwin_arm64-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools_darwin_arm64-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_arm64-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_darwin_arm64-v13.4.zip" ] } }, @@ -4116,7 +4706,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_ppc64le", + "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_ppc64le", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "00a4c07603d0218cd678461b5b3b7e25b3253102da4022d31fc35907f21a2efd", "strip_prefix": "jdk-17.0.8.1+1", @@ -4127,26 +4717,26 @@ } }, "remotejdk21_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_linux_aarch64_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk21_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\n" } }, "remotejdk11_win_arm64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_win_arm64_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk11_win_arm64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\n" } }, "local_jdk": { - "bzlFile": "@@rules_java~7.1.0//toolchains:local_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:local_java_repository.bzl", "ruleClassName": "_local_java_repository_rule", "attributes": { - "name": "rules_java~7.1.0~toolchains~local_jdk", + "name": "rules_java~7.4.0~toolchains~local_jdk", "java_home": "", "version": "", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = {RUNTIME_VERSION},\n)\n" @@ -4156,11 +4746,11 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools_darwin_x86_64", - "sha256": "0db40d8505a2b65ef0ed46e4256757807db8162f7acff16225be57c1d5726dbc", + "name": "rules_java~7.4.0~toolchains~remote_java_tools_darwin_x86_64", + "sha256": "4523aec4d09c587091a2dae6f5c9bc6922c220f3b6030e5aba9c8f015913cc65", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools_darwin_x86_64-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools_darwin_x86_64-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_x86_64-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_darwin_x86_64-v13.4.zip" ] } }, @@ -4168,11 +4758,11 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools", - "sha256": "286bdbbd66e616fc4ed3f90101418729a73baa7e8c23a98ffbef558f74c0ad14", + "name": "rules_java~7.4.0~toolchains~remote_java_tools", + "sha256": "e025fd260ac39b47c111f5212d64ec0d00d85dec16e49368aae82fc626a940cf", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools-v13.4.zip" ] } }, @@ -4180,7 +4770,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_s390x", + "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_s390x", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "ffacba69c6843d7ca70d572489d6cc7ab7ae52c60f0852cedf4cf0d248b6fc37", "strip_prefix": "jdk-17.0.8.1+1", @@ -4191,10 +4781,10 @@ } }, "remotejdk17_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_win_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk17_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win//:jdk\",\n)\n" } }, @@ -4202,7 +4792,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_ppc64le", + "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_ppc64le", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f", "strip_prefix": "jdk-11.0.15+10", @@ -4216,7 +4806,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_macos_aarch64", + "name": "rules_java~7.4.0~toolchains~remotejdk11_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "7632bc29f8a4b7d492b93f3bc75a7b61630894db85d136456035ab2a24d38885", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_aarch64", @@ -4227,21 +4817,33 @@ } }, "remotejdk21_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_win_toolchain_config_repo", + "name": "rules_java~7.4.0~toolchains~remotejdk21_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\n" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "rules_java~7.4.0", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_java~7.4.0", + "remote_java_tools", + "rules_java~7.4.0~toolchains~remote_java_tools" + ] + ] } }, - "@rules_jvm_external~5.2//:extensions.bzl%maven": { + "@@rules_jvm_external~5.2//:extensions.bzl%maven": { "general": { - "bzlTransitiveDigest": "WAWsskOl4eHIskcL0TuHZGIMjV8sMJaAbAo2luMqofo=", + "bzlTransitiveDigest": "TILQV9AUWIcMmCzpK8EI/A8Y1Nz/OC6X3NPuJDA23kg=", "accumulatedFileDigests": { - "@@//:maven_install.json": "cc2396f3421ceaeca5bf2852dc5aa14b83e5a918f4c3dee5a1214b127214584c", + "@@//:maven_install.json": "8330632656f46859ec2600c18fed75624e2a8f46b81c12db34c8afeba527e5be", "@@rules_jvm_external~5.2//:rules_jvm_external_deps_install.json": "3ab1f67b0de4815df110bc72ccd6c77882b3b21d3d1e0a84445847b6ce3235a3", "@@//src/tools/android:maven_android_install.json": "09bff3e33d291336046f7c9201630fb5e014f0e60b78b6f09b84e4f5f73ed04f" }, @@ -4627,6 +5229,18 @@ "downloaded_file_path": "org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar" } }, + "com_google_turbine_turbine_0_4_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~5.2~maven~com_google_turbine_turbine_0_4_0", + "sha256": "1947490c23263ae1c0a95acceb7cb419724f236d14cfbbe5a558101e79842b28", + "urls": [ + "https://repo1.maven.org/maven2/com/google/turbine/turbine/0.4.0/turbine-0.4.0.jar" + ], + "downloaded_file_path": "com/google/turbine/turbine/0.4.0/turbine-0.4.0.jar" + } + }, "io_netty_netty_handler_proxy_4_1_93_Final": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -4787,7 +5401,7 @@ "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client-gson\", \"version\": \"1.42.0\" }", "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client\", \"version\": \"1.42.0\" }", "{ \"group\": \"com.google.j2objc\", \"artifact\": \"j2objc-annotations\", \"version\": \"1.3\" }", - "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.2\" }", + "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.4.0\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-extension\", \"version\": \"1.3.1\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-runtime\", \"version\": \"1.3.1\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-factory\", \"version\": \"1.3.1\" }", @@ -4831,6 +5445,7 @@ "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-x86_64\" }", "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport\", \"version\": \"4.1.93.Final\" }", "{ \"group\": \"io.reactivex.rxjava3\", \"artifact\": \"rxjava\", \"version\": \"3.1.2\" }", + "{ \"group\": \"it.unimi.dsi\", \"artifact\": \"fastutil\", \"version\": \"7.2.1\" }", "{ \"group\": \"javax.activation\", \"artifact\": \"javax.activation-api\", \"version\": \"1.2.0\" }", "{ \"group\": \"javax.annotation\", \"artifact\": \"javax.annotation-api\", \"version\": \"1.3.2\" }", "{ \"group\": \"javax.inject\", \"artifact\": \"javax.inject\", \"version\": \"1\" }", @@ -4850,7 +5465,7 @@ "{ \"group\": \"org.threeten\", \"artifact\": \"threeten-extra\", \"version\": \"1.5.0\" }", "{ \"group\": \"org.tukaani\", \"artifact\": \"xz\", \"version\": \"1.9\" }", "{ \"group\": \"org.yaml\", \"artifact\": \"snakeyaml\", \"version\": \"1.28\" }", - "{ \"group\": \"tools.profiler\", \"artifact\": \"async-profiler\", \"version\": \"2.9\" }", + "{ \"group\": \"tools.profiler\", \"artifact\": \"async-profiler\", \"version\": \"3.0\" }", "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"4.13.2\" }", "{ \"group\": \"org.hamcrest\", \"artifact\": \"hamcrest-core\", \"version\": \"1.3\" }", "{ \"group\": \"com.google.code.findbugs\", \"artifact\": \"jsr305\", \"version\": \"3.0.2\" }", @@ -6368,6 +6983,18 @@ "downloaded_file_path": "com/beust/jcommander/1.82/jcommander-1.82.jar" } }, + "it_unimi_dsi_fastutil_7_2_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~5.2~maven~it_unimi_dsi_fastutil_7_2_1", + "sha256": "d73dec5ec18f973f380869b6125d60f5cda77cf6e40e321bd06e0308ed0a40b7", + "urls": [ + "https://repo1.maven.org/maven2/it/unimi/dsi/fastutil/7.2.1/fastutil-7.2.1.jar" + ], + "downloaded_file_path": "it/unimi/dsi/fastutil/7.2.1/fastutil-7.2.1.jar" + } + }, "androidx_databinding_databinding_common_3_4_0_alpha10": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -6394,6 +7021,18 @@ "downloaded_file_path": "software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar" } }, + "tools_profiler_async_profiler_3_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~5.2~maven~tools_profiler_async_profiler_3_0", + "sha256": "8f798860049d01f4a2f853596d28c85d2983f0c098f165a32909b7da9c74209f", + "urls": [ + "https://repo1.maven.org/maven2/tools/profiler/async-profiler/3.0/async-profiler-3.0.jar" + ], + "downloaded_file_path": "tools/profiler/async-profiler/3.0/async-profiler-3.0.jar" + } + }, "software_amazon_eventstream_eventstream_1_0_1": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -6456,18 +7095,6 @@ "downloaded_file_path": "io/netty/netty-transport-native-unix-common/4.1.93.Final/netty-transport-native-unix-common-4.1.93.Final-linux-x86_64.jar" } }, - "com_google_turbine_turbine_0_2": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "name": "rules_jvm_external~5.2~maven~com_google_turbine_turbine_0_2", - "sha256": "e9088d5726b06cd6ed7e421f2a0a6bd1e4d3e8b9de1ce53603e5fb0f9ac9e4f2", - "urls": [ - "https://repo1.maven.org/maven2/com/google/turbine/turbine/0.2/turbine-0.2.jar" - ], - "downloaded_file_path": "com/google/turbine/turbine/0.2/turbine-0.2.jar" - } - }, "io_netty_netty_handler_4_1_93_Final": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -7298,7 +7925,7 @@ "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client-gson\", \"version\": \"1.42.0\" }", "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client\", \"version\": \"1.42.0\" }", "{ \"group\": \"com.google.j2objc\", \"artifact\": \"j2objc-annotations\", \"version\": \"1.3\" }", - "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.2\" }", + "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.4.0\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-extension\", \"version\": \"1.3.1\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-runtime\", \"version\": \"1.3.1\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-factory\", \"version\": \"1.3.1\" }", @@ -7342,6 +7969,7 @@ "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-x86_64\" }", "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport\", \"version\": \"4.1.93.Final\" }", "{ \"group\": \"io.reactivex.rxjava3\", \"artifact\": \"rxjava\", \"version\": \"3.1.2\" }", + "{ \"group\": \"it.unimi.dsi\", \"artifact\": \"fastutil\", \"version\": \"7.2.1\" }", "{ \"group\": \"javax.activation\", \"artifact\": \"javax.activation-api\", \"version\": \"1.2.0\" }", "{ \"group\": \"javax.annotation\", \"artifact\": \"javax.annotation-api\", \"version\": \"1.3.2\" }", "{ \"group\": \"javax.inject\", \"artifact\": \"javax.inject\", \"version\": \"1\" }", @@ -7361,7 +7989,7 @@ "{ \"group\": \"org.threeten\", \"artifact\": \"threeten-extra\", \"version\": \"1.5.0\" }", "{ \"group\": \"org.tukaani\", \"artifact\": \"xz\", \"version\": \"1.9\" }", "{ \"group\": \"org.yaml\", \"artifact\": \"snakeyaml\", \"version\": \"1.28\" }", - "{ \"group\": \"tools.profiler\", \"artifact\": \"async-profiler\", \"version\": \"2.9\" }", + "{ \"group\": \"tools.profiler\", \"artifact\": \"async-profiler\", \"version\": \"3.0\" }", "{ \"group\": \"junit\", \"artifact\": \"junit\", \"version\": \"4.13.2\" }", "{ \"group\": \"org.hamcrest\", \"artifact\": \"hamcrest-core\", \"version\": \"1.3\" }", "{ \"group\": \"com.google.code.findbugs\", \"artifact\": \"jsr305\", \"version\": \"3.0.2\" }", @@ -7794,18 +8422,6 @@ "downloaded_file_path": "javax/inject/javax.inject/1/javax.inject-1.jar" } }, - "tools_profiler_async_profiler_2_9": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "name": "rules_jvm_external~5.2~maven~tools_profiler_async_profiler_2_9", - "sha256": "6c4e993c28cf2882964cac82a0f96e81a325840043884526565017b2f62c5ba4", - "urls": [ - "https://repo1.maven.org/maven2/tools/profiler/async-profiler/2.9/async-profiler-2.9.jar" - ], - "downloaded_file_path": "tools/profiler/async-profiler/2.9/async-profiler-2.9.jar" - } - }, "commons_codec_commons_codec_1_11": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -7985,12 +8601,24 @@ "downloaded_file_path": "software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "rules_jvm_external~5.2", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_jvm_external~5.2", + "rules_jvm_external", + "rules_jvm_external~5.2" + ] + ] } }, - "@rules_jvm_external~5.2//:non-module-deps.bzl%non_module_deps": { + "@@rules_jvm_external~5.2//:non-module-deps.bzl%non_module_deps": { "general": { - "bzlTransitiveDigest": "QlnkwH7xmrau2+KLjoV5wWr0r3Ne+JfXhrHUVpwVloQ=", + "bzlTransitiveDigest": "zXwz7xFBNBig3QRyd5WAZU3y/6fZvd6jnP6EkJIutS0=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -8005,12 +8633,19 @@ ] } } - } + }, + "recordedRepoMappingEntries": [ + [ + "rules_jvm_external~5.2", + "bazel_tools", + "bazel_tools" + ] + ] } }, - "@rules_python~0.26.0//python/extensions:pip.bzl%pip": { + "@@rules_python~0.26.0//python/extensions:pip.bzl%pip": { "os:osx,arch:aarch64": { - "bzlTransitiveDigest": "E4QgOqZbBS/oj8Ee3OTJc/aHg+JLL1isQX37e9bF+jc=", + "bzlTransitiveDigest": "2Q6H3h9+kogr9SW/SFMKOX5+pjW4YEdf9qiRMX0IQBw=", "accumulatedFileDigests": { "@@//:requirements.txt": "ff12967a755bb8e9b4c92524f6471a99e14c30474a3d428547c55745ec8f23a0" }, @@ -8050,10 +8685,127 @@ "environment": {} } } - } + }, + "recordedRepoMappingEntries": [ + [ + "bazel_features~1.1.0", + "bazel_features_globals", + "bazel_features~1.1.0~version_extension~bazel_features_globals" + ], + [ + "bazel_features~1.1.0", + "bazel_features_version", + "bazel_features~1.1.0~version_extension~bazel_features_version" + ], + [ + "rules_python~0.26.0", + "bazel_features", + "bazel_features~1.1.0" + ], + [ + "rules_python~0.26.0", + "bazel_skylib", + "bazel_skylib~1.5.0" + ], + [ + "rules_python~0.26.0", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_python~0.26.0", + "pypi__build", + "rules_python~0.26.0~internal_deps~pypi__build" + ], + [ + "rules_python~0.26.0", + "pypi__click", + "rules_python~0.26.0~internal_deps~pypi__click" + ], + [ + "rules_python~0.26.0", + "pypi__colorama", + "rules_python~0.26.0~internal_deps~pypi__colorama" + ], + [ + "rules_python~0.26.0", + "pypi__importlib_metadata", + "rules_python~0.26.0~internal_deps~pypi__importlib_metadata" + ], + [ + "rules_python~0.26.0", + "pypi__installer", + "rules_python~0.26.0~internal_deps~pypi__installer" + ], + [ + "rules_python~0.26.0", + "pypi__more_itertools", + "rules_python~0.26.0~internal_deps~pypi__more_itertools" + ], + [ + "rules_python~0.26.0", + "pypi__packaging", + "rules_python~0.26.0~internal_deps~pypi__packaging" + ], + [ + "rules_python~0.26.0", + "pypi__pep517", + "rules_python~0.26.0~internal_deps~pypi__pep517" + ], + [ + "rules_python~0.26.0", + "pypi__pip", + "rules_python~0.26.0~internal_deps~pypi__pip" + ], + [ + "rules_python~0.26.0", + "pypi__pip_tools", + "rules_python~0.26.0~internal_deps~pypi__pip_tools" + ], + [ + "rules_python~0.26.0", + "pypi__pyproject_hooks", + "rules_python~0.26.0~internal_deps~pypi__pyproject_hooks" + ], + [ + "rules_python~0.26.0", + "pypi__setuptools", + "rules_python~0.26.0~internal_deps~pypi__setuptools" + ], + [ + "rules_python~0.26.0", + "pypi__tomli", + "rules_python~0.26.0~internal_deps~pypi__tomli" + ], + [ + "rules_python~0.26.0", + "pypi__wheel", + "rules_python~0.26.0~internal_deps~pypi__wheel" + ], + [ + "rules_python~0.26.0", + "pypi__zipp", + "rules_python~0.26.0~internal_deps~pypi__zipp" + ], + [ + "rules_python~0.26.0", + "pythons_hub", + "rules_python~0.26.0~python~pythons_hub" + ], + [ + "rules_python~0.26.0~python~pythons_hub", + "python_3_11_aarch64-apple-darwin", + "rules_python~0.26.0~python~python_3_11_aarch64-apple-darwin" + ], + [ + "rules_python~0.26.0~python~pythons_hub", + "python_3_8_aarch64-apple-darwin", + "rules_python~0.26.0~python~python_3_8_aarch64-apple-darwin" + ] + ] }, "os:osx,arch:x86_64": { - "bzlTransitiveDigest": "5EamR6lYbDoZchZjoF0opxKmFTBnPc4IRBqvtfKzQBg=", + "bzlTransitiveDigest": "E9m/UFADncm3CKBrsnAfkVQxBz0IsqZ8jnkRQr/RO40=", "accumulatedFileDigests": { "@@//:requirements.txt": "ff12967a755bb8e9b4c92524f6471a99e14c30474a3d428547c55745ec8f23a0" }, @@ -8093,10 +8845,127 @@ "environment": {} } } - } + }, + "recordedRepoMappingEntries": [ + [ + "bazel_features~1.1.0", + "bazel_features_globals", + "bazel_features~1.1.0~version_extension~bazel_features_globals" + ], + [ + "bazel_features~1.1.0", + "bazel_features_version", + "bazel_features~1.1.0~version_extension~bazel_features_version" + ], + [ + "rules_python~0.26.0", + "bazel_features", + "bazel_features~1.1.0" + ], + [ + "rules_python~0.26.0", + "bazel_skylib", + "bazel_skylib~1.5.0" + ], + [ + "rules_python~0.26.0", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_python~0.26.0", + "pypi__build", + "rules_python~0.26.0~internal_deps~pypi__build" + ], + [ + "rules_python~0.26.0", + "pypi__click", + "rules_python~0.26.0~internal_deps~pypi__click" + ], + [ + "rules_python~0.26.0", + "pypi__colorama", + "rules_python~0.26.0~internal_deps~pypi__colorama" + ], + [ + "rules_python~0.26.0", + "pypi__importlib_metadata", + "rules_python~0.26.0~internal_deps~pypi__importlib_metadata" + ], + [ + "rules_python~0.26.0", + "pypi__installer", + "rules_python~0.26.0~internal_deps~pypi__installer" + ], + [ + "rules_python~0.26.0", + "pypi__more_itertools", + "rules_python~0.26.0~internal_deps~pypi__more_itertools" + ], + [ + "rules_python~0.26.0", + "pypi__packaging", + "rules_python~0.26.0~internal_deps~pypi__packaging" + ], + [ + "rules_python~0.26.0", + "pypi__pep517", + "rules_python~0.26.0~internal_deps~pypi__pep517" + ], + [ + "rules_python~0.26.0", + "pypi__pip", + "rules_python~0.26.0~internal_deps~pypi__pip" + ], + [ + "rules_python~0.26.0", + "pypi__pip_tools", + "rules_python~0.26.0~internal_deps~pypi__pip_tools" + ], + [ + "rules_python~0.26.0", + "pypi__pyproject_hooks", + "rules_python~0.26.0~internal_deps~pypi__pyproject_hooks" + ], + [ + "rules_python~0.26.0", + "pypi__setuptools", + "rules_python~0.26.0~internal_deps~pypi__setuptools" + ], + [ + "rules_python~0.26.0", + "pypi__tomli", + "rules_python~0.26.0~internal_deps~pypi__tomli" + ], + [ + "rules_python~0.26.0", + "pypi__wheel", + "rules_python~0.26.0~internal_deps~pypi__wheel" + ], + [ + "rules_python~0.26.0", + "pypi__zipp", + "rules_python~0.26.0~internal_deps~pypi__zipp" + ], + [ + "rules_python~0.26.0", + "pythons_hub", + "rules_python~0.26.0~python~pythons_hub" + ], + [ + "rules_python~0.26.0~python~pythons_hub", + "python_3_11_x86_64-apple-darwin", + "rules_python~0.26.0~python~python_3_11_x86_64-apple-darwin" + ], + [ + "rules_python~0.26.0~python~pythons_hub", + "python_3_8_x86_64-apple-darwin", + "rules_python~0.26.0~python~python_3_8_x86_64-apple-darwin" + ] + ] }, "os:windows,arch:amd64": { - "bzlTransitiveDigest": "TXSsRggvq8p1Am/XZURcY+/3pp6aMvMI4CIzUjNNoVc=", + "bzlTransitiveDigest": "QSSju3r1BqdiBI2rQ5F0t+LW+/VktSbD2ScOupIGWT4=", "accumulatedFileDigests": { "@@//:requirements.txt": "ff12967a755bb8e9b4c92524f6471a99e14c30474a3d428547c55745ec8f23a0" }, @@ -8136,10 +9005,127 @@ "environment": {} } } - } + }, + "recordedRepoMappingEntries": [ + [ + "bazel_features~1.1.0", + "bazel_features_globals", + "bazel_features~1.1.0~version_extension~bazel_features_globals" + ], + [ + "bazel_features~1.1.0", + "bazel_features_version", + "bazel_features~1.1.0~version_extension~bazel_features_version" + ], + [ + "rules_python~0.26.0", + "bazel_features", + "bazel_features~1.1.0" + ], + [ + "rules_python~0.26.0", + "bazel_skylib", + "bazel_skylib~1.5.0" + ], + [ + "rules_python~0.26.0", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_python~0.26.0", + "pypi__build", + "rules_python~0.26.0~internal_deps~pypi__build" + ], + [ + "rules_python~0.26.0", + "pypi__click", + "rules_python~0.26.0~internal_deps~pypi__click" + ], + [ + "rules_python~0.26.0", + "pypi__colorama", + "rules_python~0.26.0~internal_deps~pypi__colorama" + ], + [ + "rules_python~0.26.0", + "pypi__importlib_metadata", + "rules_python~0.26.0~internal_deps~pypi__importlib_metadata" + ], + [ + "rules_python~0.26.0", + "pypi__installer", + "rules_python~0.26.0~internal_deps~pypi__installer" + ], + [ + "rules_python~0.26.0", + "pypi__more_itertools", + "rules_python~0.26.0~internal_deps~pypi__more_itertools" + ], + [ + "rules_python~0.26.0", + "pypi__packaging", + "rules_python~0.26.0~internal_deps~pypi__packaging" + ], + [ + "rules_python~0.26.0", + "pypi__pep517", + "rules_python~0.26.0~internal_deps~pypi__pep517" + ], + [ + "rules_python~0.26.0", + "pypi__pip", + "rules_python~0.26.0~internal_deps~pypi__pip" + ], + [ + "rules_python~0.26.0", + "pypi__pip_tools", + "rules_python~0.26.0~internal_deps~pypi__pip_tools" + ], + [ + "rules_python~0.26.0", + "pypi__pyproject_hooks", + "rules_python~0.26.0~internal_deps~pypi__pyproject_hooks" + ], + [ + "rules_python~0.26.0", + "pypi__setuptools", + "rules_python~0.26.0~internal_deps~pypi__setuptools" + ], + [ + "rules_python~0.26.0", + "pypi__tomli", + "rules_python~0.26.0~internal_deps~pypi__tomli" + ], + [ + "rules_python~0.26.0", + "pypi__wheel", + "rules_python~0.26.0~internal_deps~pypi__wheel" + ], + [ + "rules_python~0.26.0", + "pypi__zipp", + "rules_python~0.26.0~internal_deps~pypi__zipp" + ], + [ + "rules_python~0.26.0", + "pythons_hub", + "rules_python~0.26.0~python~pythons_hub" + ], + [ + "rules_python~0.26.0~python~pythons_hub", + "python_3_11_x86_64-pc-windows-msvc", + "rules_python~0.26.0~python~python_3_11_x86_64-pc-windows-msvc" + ], + [ + "rules_python~0.26.0~python~pythons_hub", + "python_3_8_x86_64-pc-windows-msvc", + "rules_python~0.26.0~python~python_3_8_x86_64-pc-windows-msvc" + ] + ] }, "os:linux,arch:amd64": { - "bzlTransitiveDigest": "8ozZeXZLMP2XAUvOsoOqqAh+f3capth/BEC9p7XrFHQ=", + "bzlTransitiveDigest": "aOMK5S3yh0GqKqizev0aeyRIiUVXUnJ9qs4MjoGIsmU=", "accumulatedFileDigests": { "@@//:requirements.txt": "ff12967a755bb8e9b4c92524f6471a99e14c30474a3d428547c55745ec8f23a0" }, @@ -8179,12 +9165,129 @@ "environment": {} } } - } + }, + "recordedRepoMappingEntries": [ + [ + "bazel_features~1.1.0", + "bazel_features_globals", + "bazel_features~1.1.0~version_extension~bazel_features_globals" + ], + [ + "bazel_features~1.1.0", + "bazel_features_version", + "bazel_features~1.1.0~version_extension~bazel_features_version" + ], + [ + "rules_python~0.26.0", + "bazel_features", + "bazel_features~1.1.0" + ], + [ + "rules_python~0.26.0", + "bazel_skylib", + "bazel_skylib~1.5.0" + ], + [ + "rules_python~0.26.0", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_python~0.26.0", + "pypi__build", + "rules_python~0.26.0~internal_deps~pypi__build" + ], + [ + "rules_python~0.26.0", + "pypi__click", + "rules_python~0.26.0~internal_deps~pypi__click" + ], + [ + "rules_python~0.26.0", + "pypi__colorama", + "rules_python~0.26.0~internal_deps~pypi__colorama" + ], + [ + "rules_python~0.26.0", + "pypi__importlib_metadata", + "rules_python~0.26.0~internal_deps~pypi__importlib_metadata" + ], + [ + "rules_python~0.26.0", + "pypi__installer", + "rules_python~0.26.0~internal_deps~pypi__installer" + ], + [ + "rules_python~0.26.0", + "pypi__more_itertools", + "rules_python~0.26.0~internal_deps~pypi__more_itertools" + ], + [ + "rules_python~0.26.0", + "pypi__packaging", + "rules_python~0.26.0~internal_deps~pypi__packaging" + ], + [ + "rules_python~0.26.0", + "pypi__pep517", + "rules_python~0.26.0~internal_deps~pypi__pep517" + ], + [ + "rules_python~0.26.0", + "pypi__pip", + "rules_python~0.26.0~internal_deps~pypi__pip" + ], + [ + "rules_python~0.26.0", + "pypi__pip_tools", + "rules_python~0.26.0~internal_deps~pypi__pip_tools" + ], + [ + "rules_python~0.26.0", + "pypi__pyproject_hooks", + "rules_python~0.26.0~internal_deps~pypi__pyproject_hooks" + ], + [ + "rules_python~0.26.0", + "pypi__setuptools", + "rules_python~0.26.0~internal_deps~pypi__setuptools" + ], + [ + "rules_python~0.26.0", + "pypi__tomli", + "rules_python~0.26.0~internal_deps~pypi__tomli" + ], + [ + "rules_python~0.26.0", + "pypi__wheel", + "rules_python~0.26.0~internal_deps~pypi__wheel" + ], + [ + "rules_python~0.26.0", + "pypi__zipp", + "rules_python~0.26.0~internal_deps~pypi__zipp" + ], + [ + "rules_python~0.26.0", + "pythons_hub", + "rules_python~0.26.0~python~pythons_hub" + ], + [ + "rules_python~0.26.0~python~pythons_hub", + "python_3_11_x86_64-unknown-linux-gnu", + "rules_python~0.26.0~python~python_3_11_x86_64-unknown-linux-gnu" + ], + [ + "rules_python~0.26.0~python~pythons_hub", + "python_3_8_x86_64-unknown-linux-gnu", + "rules_python~0.26.0~python~python_3_8_x86_64-unknown-linux-gnu" + ] + ] } }, - "@rules_python~0.26.0//python/extensions:python.bzl%python": { + "@@rules_python~0.26.0//python/extensions:python.bzl%python": { "general": { - "bzlTransitiveDigest": "xlkyXQiU87j2f+jKiO4buHXyNexVt0a6ildROtqkRMA=", + "bzlTransitiveDigest": "8WVQIVnIXBFr70L5lVEwzdfZo6ozRWUK790TujH0YSE=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -8469,12 +9572,19 @@ "ignore_root_user_error": false } } - } + }, + "recordedRepoMappingEntries": [ + [ + "rules_python~0.26.0", + "bazel_tools", + "bazel_tools" + ] + ] } }, - "@rules_python~0.26.0//python/extensions/private:internal_deps.bzl%internal_deps": { + "@@rules_python~0.26.0//python/extensions/private:internal_deps.bzl%internal_deps": { "general": { - "bzlTransitiveDigest": "+RIu4LoHAUtbbEXVX84ChFRN1Rqdyonp+wk0SJE5eHA=", + "bzlTransitiveDigest": "XP8MssHdcgRUzPajlA0Te3SmGmjfmGdDZ8HceIw8FTQ=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -8650,7 +9760,19 @@ "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "rules_python~0.26.0", + "bazel_skylib", + "bazel_skylib~1.5.0" + ], + [ + "rules_python~0.26.0", + "bazel_tools", + "bazel_tools" + ] + ] } } } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel.lock b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel.lock index 8fa5a39777..4112726ac2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel.lock +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel.lock @@ -1,6 +1,6 @@ { - "lockFileVersion": 3, - "moduleFileHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "lockFileVersion": 6, + "moduleFileHash": "80605390be5478a274618e3f8fd7c7a7e1ce3036e086e1e1593ceba1b132b7f2", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -13,7 +13,7 @@ "compatibilityMode": "ERROR" }, "localOverrideHashes": { - "bazel_tools": "f30da6d09c13487d5a03131bccc244a528e780a477b9c4830c12e10f26d0a64f" + "bazel_tools": "1ae69322ac3823527337acf02016e8ee95813d8d356f47060255b8956fa642f0" }, "moduleDepGraph": { "": { @@ -25,10 +25,157 @@ "toolchainsToRegister": [], "extensionUsages": [], "deps": { + "rules_proto": "rules_proto@5.3.0-21.7", + "protobuf": "protobuf@21.7", + "zlib": "zlib@1.3", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" } }, + "rules_proto@5.3.0-21.7": { + "name": "rules_proto", + "version": "5.3.0-21.7", + "key": "rules_proto@5.3.0-21.7", + "repoName": "rules_proto", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [], + "deps": { + "bazel_skylib": "bazel_skylib@1.3.0", + "com_google_protobuf": "protobuf@21.7", + "rules_cc": "rules_cc@0.0.9", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz" + ], + "integrity": "sha256-3D+yBqLLNEG0heseQjFlsjEjWh6psDG0Qzz3vB+kYN0=", + "strip_prefix": "rules_proto-5.3.0-21.7", + "remote_patches": {}, + "remote_patch_strip": 0 + } + } + }, + "protobuf@21.7": { + "name": "protobuf", + "version": "21.7", + "key": "protobuf@21.7", + "repoName": "protobuf", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [ + { + "extensionBzlFile": "@rules_jvm_external//:extensions.bzl", + "extensionName": "maven", + "usingModule": "protobuf@21.7", + "location": { + "file": "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel", + "line": 22, + "column": 22 + }, + "imports": { + "maven": "maven" + }, + "devImports": [], + "tags": [ + { + "tagName": "install", + "attributeValues": { + "name": "maven", + "artifacts": [ + "com.google.code.findbugs:jsr305:3.0.2", + "com.google.code.gson:gson:2.8.9", + "com.google.errorprone:error_prone_annotations:2.3.2", + "com.google.j2objc:j2objc-annotations:1.3", + "com.google.guava:guava:31.1-jre", + "com.google.guava:guava-testlib:31.1-jre", + "com.google.truth:truth:1.1.2", + "junit:junit:4.13.2", + "org.mockito:mockito-core:4.3.1" + ] + }, + "devDependency": false, + "location": { + "file": "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel", + "line": 24, + "column": 14 + } + } + ], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true + } + ], + "deps": { + "bazel_skylib": "bazel_skylib@1.3.0", + "rules_python": "rules_python@0.22.1", + "rules_cc": "rules_cc@0.0.9", + "rules_proto": "rules_proto@5.3.0-21.7", + "rules_java": "rules_java@7.4.0", + "rules_pkg": "rules_pkg@0.7.0", + "com_google_abseil": "abseil-cpp@20211102.0", + "zlib": "zlib@1.3", + "upb": "upb@0.0.0-20220923-a547704", + "rules_jvm_external": "rules_jvm_external@4.4.2", + "com_google_googletest": "googletest@1.11.0", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/protocolbuffers/protobuf/releases/download/v21.7/protobuf-all-21.7.zip" + ], + "integrity": "sha256-VJOiH17T/FAuZv7GuUScBqVRztYwAvpIkDxA36jeeko=", + "strip_prefix": "protobuf-21.7", + "remote_patches": { + "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_module_dot_bazel.patch": "sha256-q3V2+eq0v2XF0z8z+V+QF4cynD6JvHI1y3kI/+rzl5s=", + "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_module_dot_bazel_for_examples.patch": "sha256-O7YP6s3lo/1opUiO0jqXYORNHdZ/2q3hjz1QGy8QdIU=", + "https://bcr.bazel.build/modules/protobuf/21.7/patches/relative_repo_names.patch": "sha256-RK9RjW8T5UJNG7flIrnFiNE9vKwWB+8uWWtJqXYT0w4=", + "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_missing_files.patch": "sha256-Hyne4DG2u5bXcWHNxNMirA2QFAe/2Cl8oMm1XJdkQIY=" + }, + "remote_patch_strip": 1 + } + } + }, + "zlib@1.3": { + "name": "zlib", + "version": "1.3", + "key": "zlib@1.3", + "repoName": "zlib", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [], + "deps": { + "platforms": "platforms@0.0.7", + "rules_cc": "rules_cc@0.0.9", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.gz" + ], + "integrity": "sha256-/wukwpIBPbwnUws6geH5qBPNOd4Byl4Pi/NVcC76WT4=", + "strip_prefix": "zlib-1.3", + "remote_patches": { + "https://bcr.bazel.build/modules/zlib/1.3/patches/add_build_file.patch": "sha256-Ei+FYaaOo7A3jTKunMEodTI0Uw5NXQyZEcboMC8JskY=", + "https://bcr.bazel.build/modules/zlib/1.3/patches/module_dot_bazel.patch": "sha256-fPWLM+2xaF/kuy+kZc1YTfW6hNjrkG400Ho7gckuyJk=" + }, + "remote_patch_strip": 0 + } + } + }, "bazel_tools@_": { "name": "bazel_tools", "version": "", @@ -46,7 +193,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 17, + "line": 18, "column": 29 }, "imports": { @@ -64,7 +211,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 21, + "line": 22, "column": 32 }, "imports": { @@ -81,7 +228,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 24, + "line": 25, "column": 32 }, "imports": { @@ -103,7 +250,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 35, + "line": 36, "column": 39 }, "imports": { @@ -120,7 +267,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 39, + "line": 40, "column": 48 }, "imports": { @@ -137,7 +284,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 42, + "line": 43, "column": 42 }, "imports": { @@ -148,14 +295,32 @@ "tags": [], "hasDevUseExtension": false, "hasNonDevUseExtension": true + }, + { + "extensionBzlFile": "@buildozer//:buildozer_binary.bzl", + "extensionName": "buildozer_binary", + "usingModule": "bazel_tools@_", + "location": { + "file": "@@bazel_tools//:MODULE.bazel", + "line": 47, + "column": 33 + }, + "imports": { + "buildozer_binary": "buildozer_binary" + }, + "devImports": [], + "tags": [], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true } ], "deps": { "rules_cc": "rules_cc@0.0.9", - "rules_java": "rules_java@7.3.2", + "rules_java": "rules_java@7.4.0", "rules_license": "rules_license@0.0.7", "rules_proto": "rules_proto@5.3.0-21.7", "rules_python": "rules_python@0.22.1", + "buildozer": "buildozer@6.4.0.2", "platforms": "platforms@0.0.7", "com_google_protobuf": "protobuf@21.7", "zlib": "zlib@1.3", @@ -176,6 +341,36 @@ "bazel_tools": "bazel_tools@_" } }, + "bazel_skylib@1.3.0": { + "name": "bazel_skylib", + "version": "1.3.0", + "key": "bazel_skylib@1.3.0", + "repoName": "bazel_skylib", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [ + "//toolchains/unittest:cmd_toolchain", + "//toolchains/unittest:bash_toolchain" + ], + "extensionUsages": [], + "deps": { + "platforms": "platforms@0.0.7", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz" + ], + "integrity": "sha256-dNVE2W9KW7Yw1GXKi7z+Ix41lOWq5X4e2/F6brPKJQY=", + "strip_prefix": "", + "remote_patches": {}, + "remote_patch_strip": 0 + } + } + }, "rules_cc@0.0.9": { "name": "rules_cc", "version": "0.0.9", @@ -210,10 +405,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_cc~0.0.9", "urls": [ "https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz" ], @@ -226,164 +420,6 @@ } } }, - "rules_java@7.3.2": { - "name": "rules_java", - "version": "7.3.2", - "key": "rules_java@7.3.2", - "repoName": "rules_java", - "executionPlatformsToRegister": [], - "toolchainsToRegister": [ - "//toolchains:all", - "@local_jdk//:runtime_toolchain_definition", - "@local_jdk//:bootstrap_runtime_toolchain_definition", - "@remotejdk11_linux_toolchain_config_repo//:all", - "@remotejdk11_linux_aarch64_toolchain_config_repo//:all", - "@remotejdk11_linux_ppc64le_toolchain_config_repo//:all", - "@remotejdk11_linux_s390x_toolchain_config_repo//:all", - "@remotejdk11_macos_toolchain_config_repo//:all", - "@remotejdk11_macos_aarch64_toolchain_config_repo//:all", - "@remotejdk11_win_toolchain_config_repo//:all", - "@remotejdk11_win_arm64_toolchain_config_repo//:all", - "@remotejdk17_linux_toolchain_config_repo//:all", - "@remotejdk17_linux_aarch64_toolchain_config_repo//:all", - "@remotejdk17_linux_ppc64le_toolchain_config_repo//:all", - "@remotejdk17_linux_s390x_toolchain_config_repo//:all", - "@remotejdk17_macos_toolchain_config_repo//:all", - "@remotejdk17_macos_aarch64_toolchain_config_repo//:all", - "@remotejdk17_win_toolchain_config_repo//:all", - "@remotejdk17_win_arm64_toolchain_config_repo//:all", - "@remotejdk21_linux_toolchain_config_repo//:all", - "@remotejdk21_linux_aarch64_toolchain_config_repo//:all", - "@remotejdk21_macos_toolchain_config_repo//:all", - "@remotejdk21_macos_aarch64_toolchain_config_repo//:all", - "@remotejdk21_win_toolchain_config_repo//:all" - ], - "extensionUsages": [ - { - "extensionBzlFile": "@rules_java//java:extensions.bzl", - "extensionName": "toolchains", - "usingModule": "rules_java@7.3.2", - "location": { - "file": "https://bcr.bazel.build/modules/rules_java/7.3.2/MODULE.bazel", - "line": 19, - "column": 27 - }, - "imports": { - "remote_java_tools": "remote_java_tools", - "remote_java_tools_linux": "remote_java_tools_linux", - "remote_java_tools_windows": "remote_java_tools_windows", - "remote_java_tools_darwin_x86_64": "remote_java_tools_darwin_x86_64", - "remote_java_tools_darwin_arm64": "remote_java_tools_darwin_arm64", - "local_jdk": "local_jdk", - "remotejdk11_linux_toolchain_config_repo": "remotejdk11_linux_toolchain_config_repo", - "remotejdk11_linux_aarch64_toolchain_config_repo": "remotejdk11_linux_aarch64_toolchain_config_repo", - "remotejdk11_linux_ppc64le_toolchain_config_repo": "remotejdk11_linux_ppc64le_toolchain_config_repo", - "remotejdk11_linux_s390x_toolchain_config_repo": "remotejdk11_linux_s390x_toolchain_config_repo", - "remotejdk11_macos_toolchain_config_repo": "remotejdk11_macos_toolchain_config_repo", - "remotejdk11_macos_aarch64_toolchain_config_repo": "remotejdk11_macos_aarch64_toolchain_config_repo", - "remotejdk11_win_toolchain_config_repo": "remotejdk11_win_toolchain_config_repo", - "remotejdk11_win_arm64_toolchain_config_repo": "remotejdk11_win_arm64_toolchain_config_repo", - "remotejdk17_linux_toolchain_config_repo": "remotejdk17_linux_toolchain_config_repo", - "remotejdk17_linux_aarch64_toolchain_config_repo": "remotejdk17_linux_aarch64_toolchain_config_repo", - "remotejdk17_linux_ppc64le_toolchain_config_repo": "remotejdk17_linux_ppc64le_toolchain_config_repo", - "remotejdk17_linux_s390x_toolchain_config_repo": "remotejdk17_linux_s390x_toolchain_config_repo", - "remotejdk17_macos_toolchain_config_repo": "remotejdk17_macos_toolchain_config_repo", - "remotejdk17_macos_aarch64_toolchain_config_repo": "remotejdk17_macos_aarch64_toolchain_config_repo", - "remotejdk17_win_toolchain_config_repo": "remotejdk17_win_toolchain_config_repo", - "remotejdk17_win_arm64_toolchain_config_repo": "remotejdk17_win_arm64_toolchain_config_repo", - "remotejdk21_linux_toolchain_config_repo": "remotejdk21_linux_toolchain_config_repo", - "remotejdk21_linux_aarch64_toolchain_config_repo": "remotejdk21_linux_aarch64_toolchain_config_repo", - "remotejdk21_macos_toolchain_config_repo": "remotejdk21_macos_toolchain_config_repo", - "remotejdk21_macos_aarch64_toolchain_config_repo": "remotejdk21_macos_aarch64_toolchain_config_repo", - "remotejdk21_win_toolchain_config_repo": "remotejdk21_win_toolchain_config_repo" - }, - "devImports": [], - "tags": [], - "hasDevUseExtension": false, - "hasNonDevUseExtension": true - } - ], - "deps": { - "platforms": "platforms@0.0.7", - "rules_cc": "rules_cc@0.0.9", - "bazel_skylib": "bazel_skylib@1.3.0", - "rules_proto": "rules_proto@5.3.0-21.7", - "rules_license": "rules_license@0.0.7", - "bazel_tools": "bazel_tools@_", - "local_config_platform": "local_config_platform@_" - }, - "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "name": "rules_java~7.3.2", - "urls": [ - "https://github.com/bazelbuild/rules_java/releases/download/7.3.2/rules_java-7.3.2.tar.gz" - ], - "integrity": "sha256-MSGgBYixWBvXwfm1UFmWKeWtzBG6nGX0grvVz+R/3zA=", - "strip_prefix": "", - "remote_patches": {}, - "remote_patch_strip": 0 - } - } - }, - "rules_license@0.0.7": { - "name": "rules_license", - "version": "0.0.7", - "key": "rules_license@0.0.7", - "repoName": "rules_license", - "executionPlatformsToRegister": [], - "toolchainsToRegister": [], - "extensionUsages": [], - "deps": { - "bazel_tools": "bazel_tools@_", - "local_config_platform": "local_config_platform@_" - }, - "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "name": "rules_license~0.0.7", - "urls": [ - "https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz" - ], - "integrity": "sha256-RTHezLkTY5ww5cdRKgVNXYdWmNrrddjPkPKEN1/nw2A=", - "strip_prefix": "", - "remote_patches": {}, - "remote_patch_strip": 0 - } - } - }, - "rules_proto@5.3.0-21.7": { - "name": "rules_proto", - "version": "5.3.0-21.7", - "key": "rules_proto@5.3.0-21.7", - "repoName": "rules_proto", - "executionPlatformsToRegister": [], - "toolchainsToRegister": [], - "extensionUsages": [], - "deps": { - "bazel_skylib": "bazel_skylib@1.3.0", - "com_google_protobuf": "protobuf@21.7", - "rules_cc": "rules_cc@0.0.9", - "bazel_tools": "bazel_tools@_", - "local_config_platform": "local_config_platform@_" - }, - "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "name": "rules_proto~5.3.0-21.7", - "urls": [ - "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz" - ], - "integrity": "sha256-3D+yBqLLNEG0heseQjFlsjEjWh6psDG0Qzz3vB+kYN0=", - "strip_prefix": "rules_proto-5.3.0-21.7", - "remote_patches": {}, - "remote_patch_strip": 0 - } - } - }, "rules_python@0.22.1": { "name": "rules_python", "version": "0.22.1", @@ -477,10 +513,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1", "urls": [ "https://github.com/bazelbuild/rules_python/releases/download/0.22.1/rules_python-0.22.1.tar.gz" ], @@ -493,173 +528,76 @@ } } }, - "platforms@0.0.7": { - "name": "platforms", - "version": "0.0.7", - "key": "platforms@0.0.7", - "repoName": "platforms", - "executionPlatformsToRegister": [], - "toolchainsToRegister": [], - "extensionUsages": [], - "deps": { - "rules_license": "rules_license@0.0.7", - "bazel_tools": "bazel_tools@_", - "local_config_platform": "local_config_platform@_" - }, - "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "name": "platforms", - "urls": [ - "https://github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz" - ], - "integrity": "sha256-OlYcmee9vpFzqmU/1Xn+hJ8djWc5V4CrR3Cx84FDHVE=", - "strip_prefix": "", - "remote_patches": {}, - "remote_patch_strip": 0 - } - } - }, - "protobuf@21.7": { - "name": "protobuf", - "version": "21.7", - "key": "protobuf@21.7", - "repoName": "protobuf", - "executionPlatformsToRegister": [], - "toolchainsToRegister": [], - "extensionUsages": [ - { - "extensionBzlFile": "@rules_jvm_external//:extensions.bzl", - "extensionName": "maven", - "usingModule": "protobuf@21.7", - "location": { - "file": "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel", - "line": 22, - "column": 22 - }, - "imports": { - "maven": "maven" - }, - "devImports": [], - "tags": [ - { - "tagName": "install", - "attributeValues": { - "name": "maven", - "artifacts": [ - "com.google.code.findbugs:jsr305:3.0.2", - "com.google.code.gson:gson:2.8.9", - "com.google.errorprone:error_prone_annotations:2.3.2", - "com.google.j2objc:j2objc-annotations:1.3", - "com.google.guava:guava:31.1-jre", - "com.google.guava:guava-testlib:31.1-jre", - "com.google.truth:truth:1.1.2", - "junit:junit:4.13.2", - "org.mockito:mockito-core:4.3.1" - ] - }, - "devDependency": false, - "location": { - "file": "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel", - "line": 24, - "column": 14 - } - } - ], - "hasDevUseExtension": false, - "hasNonDevUseExtension": true - } - ], - "deps": { - "bazel_skylib": "bazel_skylib@1.3.0", - "rules_python": "rules_python@0.22.1", - "rules_cc": "rules_cc@0.0.9", - "rules_proto": "rules_proto@5.3.0-21.7", - "rules_java": "rules_java@7.3.2", - "rules_pkg": "rules_pkg@0.7.0", - "com_google_abseil": "abseil-cpp@20211102.0", - "zlib": "zlib@1.3", - "upb": "upb@0.0.0-20220923-a547704", - "rules_jvm_external": "rules_jvm_external@4.4.2", - "com_google_googletest": "googletest@1.11.0", - "bazel_tools": "bazel_tools@_", - "local_config_platform": "local_config_platform@_" - }, - "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "name": "protobuf~21.7", - "urls": [ - "https://github.com/protocolbuffers/protobuf/releases/download/v21.7/protobuf-all-21.7.zip" - ], - "integrity": "sha256-VJOiH17T/FAuZv7GuUScBqVRztYwAvpIkDxA36jeeko=", - "strip_prefix": "protobuf-21.7", - "remote_patches": { - "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_module_dot_bazel.patch": "sha256-q3V2+eq0v2XF0z8z+V+QF4cynD6JvHI1y3kI/+rzl5s=", - "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_module_dot_bazel_for_examples.patch": "sha256-O7YP6s3lo/1opUiO0jqXYORNHdZ/2q3hjz1QGy8QdIU=", - "https://bcr.bazel.build/modules/protobuf/21.7/patches/relative_repo_names.patch": "sha256-RK9RjW8T5UJNG7flIrnFiNE9vKwWB+8uWWtJqXYT0w4=", - "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_missing_files.patch": "sha256-Hyne4DG2u5bXcWHNxNMirA2QFAe/2Cl8oMm1XJdkQIY=" - }, - "remote_patch_strip": 1 - } - } - }, - "zlib@1.3": { - "name": "zlib", - "version": "1.3", - "key": "zlib@1.3", - "repoName": "zlib", - "executionPlatformsToRegister": [], - "toolchainsToRegister": [], - "extensionUsages": [], - "deps": { - "platforms": "platforms@0.0.7", - "rules_cc": "rules_cc@0.0.9", - "bazel_tools": "bazel_tools@_", - "local_config_platform": "local_config_platform@_" - }, - "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "name": "zlib~1.3", - "urls": [ - "https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.gz" - ], - "integrity": "sha256-/wukwpIBPbwnUws6geH5qBPNOd4Byl4Pi/NVcC76WT4=", - "strip_prefix": "zlib-1.3", - "remote_patches": { - "https://bcr.bazel.build/modules/zlib/1.3/patches/add_build_file.patch": "sha256-Ei+FYaaOo7A3jTKunMEodTI0Uw5NXQyZEcboMC8JskY=", - "https://bcr.bazel.build/modules/zlib/1.3/patches/module_dot_bazel.patch": "sha256-fPWLM+2xaF/kuy+kZc1YTfW6hNjrkG400Ho7gckuyJk=" - }, - "remote_patch_strip": 0 - } - } - }, - "apple_support@1.5.0": { - "name": "apple_support", - "version": "1.5.0", - "key": "apple_support@1.5.0", - "repoName": "build_bazel_apple_support", + "rules_java@7.4.0": { + "name": "rules_java", + "version": "7.4.0", + "key": "rules_java@7.4.0", + "repoName": "rules_java", "executionPlatformsToRegister": [], "toolchainsToRegister": [ - "@local_config_apple_cc_toolchains//:all" + "//toolchains:all", + "@local_jdk//:runtime_toolchain_definition", + "@local_jdk//:bootstrap_runtime_toolchain_definition", + "@remotejdk11_linux_toolchain_config_repo//:all", + "@remotejdk11_linux_aarch64_toolchain_config_repo//:all", + "@remotejdk11_linux_ppc64le_toolchain_config_repo//:all", + "@remotejdk11_linux_s390x_toolchain_config_repo//:all", + "@remotejdk11_macos_toolchain_config_repo//:all", + "@remotejdk11_macos_aarch64_toolchain_config_repo//:all", + "@remotejdk11_win_toolchain_config_repo//:all", + "@remotejdk11_win_arm64_toolchain_config_repo//:all", + "@remotejdk17_linux_toolchain_config_repo//:all", + "@remotejdk17_linux_aarch64_toolchain_config_repo//:all", + "@remotejdk17_linux_ppc64le_toolchain_config_repo//:all", + "@remotejdk17_linux_s390x_toolchain_config_repo//:all", + "@remotejdk17_macos_toolchain_config_repo//:all", + "@remotejdk17_macos_aarch64_toolchain_config_repo//:all", + "@remotejdk17_win_toolchain_config_repo//:all", + "@remotejdk17_win_arm64_toolchain_config_repo//:all", + "@remotejdk21_linux_toolchain_config_repo//:all", + "@remotejdk21_linux_aarch64_toolchain_config_repo//:all", + "@remotejdk21_macos_toolchain_config_repo//:all", + "@remotejdk21_macos_aarch64_toolchain_config_repo//:all", + "@remotejdk21_win_toolchain_config_repo//:all" ], "extensionUsages": [ { - "extensionBzlFile": "@build_bazel_apple_support//crosstool:setup.bzl", - "extensionName": "apple_cc_configure_extension", - "usingModule": "apple_support@1.5.0", + "extensionBzlFile": "@rules_java//java:extensions.bzl", + "extensionName": "toolchains", + "usingModule": "rules_java@7.4.0", "location": { - "file": "https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel", - "line": 17, - "column": 35 + "file": "https://bcr.bazel.build/modules/rules_java/7.4.0/MODULE.bazel", + "line": 19, + "column": 27 }, "imports": { - "local_config_apple_cc": "local_config_apple_cc", - "local_config_apple_cc_toolchains": "local_config_apple_cc_toolchains" + "remote_java_tools": "remote_java_tools", + "remote_java_tools_linux": "remote_java_tools_linux", + "remote_java_tools_windows": "remote_java_tools_windows", + "remote_java_tools_darwin_x86_64": "remote_java_tools_darwin_x86_64", + "remote_java_tools_darwin_arm64": "remote_java_tools_darwin_arm64", + "local_jdk": "local_jdk", + "remotejdk11_linux_toolchain_config_repo": "remotejdk11_linux_toolchain_config_repo", + "remotejdk11_linux_aarch64_toolchain_config_repo": "remotejdk11_linux_aarch64_toolchain_config_repo", + "remotejdk11_linux_ppc64le_toolchain_config_repo": "remotejdk11_linux_ppc64le_toolchain_config_repo", + "remotejdk11_linux_s390x_toolchain_config_repo": "remotejdk11_linux_s390x_toolchain_config_repo", + "remotejdk11_macos_toolchain_config_repo": "remotejdk11_macos_toolchain_config_repo", + "remotejdk11_macos_aarch64_toolchain_config_repo": "remotejdk11_macos_aarch64_toolchain_config_repo", + "remotejdk11_win_toolchain_config_repo": "remotejdk11_win_toolchain_config_repo", + "remotejdk11_win_arm64_toolchain_config_repo": "remotejdk11_win_arm64_toolchain_config_repo", + "remotejdk17_linux_toolchain_config_repo": "remotejdk17_linux_toolchain_config_repo", + "remotejdk17_linux_aarch64_toolchain_config_repo": "remotejdk17_linux_aarch64_toolchain_config_repo", + "remotejdk17_linux_ppc64le_toolchain_config_repo": "remotejdk17_linux_ppc64le_toolchain_config_repo", + "remotejdk17_linux_s390x_toolchain_config_repo": "remotejdk17_linux_s390x_toolchain_config_repo", + "remotejdk17_macos_toolchain_config_repo": "remotejdk17_macos_toolchain_config_repo", + "remotejdk17_macos_aarch64_toolchain_config_repo": "remotejdk17_macos_aarch64_toolchain_config_repo", + "remotejdk17_win_toolchain_config_repo": "remotejdk17_win_toolchain_config_repo", + "remotejdk17_win_arm64_toolchain_config_repo": "remotejdk17_win_arm64_toolchain_config_repo", + "remotejdk21_linux_toolchain_config_repo": "remotejdk21_linux_toolchain_config_repo", + "remotejdk21_linux_aarch64_toolchain_config_repo": "remotejdk21_linux_aarch64_toolchain_config_repo", + "remotejdk21_macos_toolchain_config_repo": "remotejdk21_macos_toolchain_config_repo", + "remotejdk21_macos_aarch64_toolchain_config_repo": "remotejdk21_macos_aarch64_toolchain_config_repo", + "remotejdk21_win_toolchain_config_repo": "remotejdk21_win_toolchain_config_repo" }, "devImports": [], "tags": [], @@ -668,51 +606,22 @@ } ], "deps": { + "platforms": "platforms@0.0.7", + "rules_cc": "rules_cc@0.0.9", "bazel_skylib": "bazel_skylib@1.3.0", - "platforms": "platforms@0.0.7", + "rules_proto": "rules_proto@5.3.0-21.7", + "rules_license": "rules_license@0.0.7", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "apple_support~1.5.0", "urls": [ - "https://github.com/bazelbuild/apple_support/releases/download/1.5.0/apple_support.1.5.0.tar.gz" + "https://github.com/bazelbuild/rules_java/releases/download/7.4.0/rules_java-7.4.0.tar.gz" ], - "integrity": "sha256-miM41vja0yRPgj8txghKA+TQ+7J8qJLclw5okNW0gYQ=", - "strip_prefix": "", - "remote_patches": {}, - "remote_patch_strip": 0 - } - } - }, - "bazel_skylib@1.3.0": { - "name": "bazel_skylib", - "version": "1.3.0", - "key": "bazel_skylib@1.3.0", - "repoName": "bazel_skylib", - "executionPlatformsToRegister": [], - "toolchainsToRegister": [ - "//toolchains/unittest:cmd_toolchain", - "//toolchains/unittest:bash_toolchain" - ], - "extensionUsages": [], - "deps": { - "platforms": "platforms@0.0.7", - "bazel_tools": "bazel_tools@_", - "local_config_platform": "local_config_platform@_" - }, - "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "name": "bazel_skylib~1.3.0", - "urls": [ - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz" - ], - "integrity": "sha256-dNVE2W9KW7Yw1GXKi7z+Ix41lOWq5X4e2/F6brPKJQY=", + "integrity": "sha256-l27wi0nJKXQfIBeQ5Z44B8cq2B9CjIvJU82+/1/tFes=", "strip_prefix": "", "remote_patches": {}, "remote_patch_strip": 0 @@ -735,10 +644,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_pkg~0.7.0", "urls": [ "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz" ], @@ -766,10 +674,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "abseil-cpp~20211102.0", "urls": [ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" ], @@ -800,10 +707,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "upb~0.0.0-20220923-a547704", "urls": [ "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz" ], @@ -887,10 +793,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_jvm_external~4.4.2", "urls": [ "https://github.com/bazelbuild/rules_jvm_external/archive/refs/tags/4.4.2.zip" ], @@ -917,10 +822,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "googletest~1.11.0", "urls": [ "https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz" ], @@ -933,6 +837,174 @@ } } }, + "platforms@0.0.7": { + "name": "platforms", + "version": "0.0.7", + "key": "platforms@0.0.7", + "repoName": "platforms", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [], + "deps": { + "rules_license": "rules_license@0.0.7", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz" + ], + "integrity": "sha256-OlYcmee9vpFzqmU/1Xn+hJ8djWc5V4CrR3Cx84FDHVE=", + "strip_prefix": "", + "remote_patches": {}, + "remote_patch_strip": 0 + } + } + }, + "rules_license@0.0.7": { + "name": "rules_license", + "version": "0.0.7", + "key": "rules_license@0.0.7", + "repoName": "rules_license", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [], + "deps": { + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz" + ], + "integrity": "sha256-RTHezLkTY5ww5cdRKgVNXYdWmNrrddjPkPKEN1/nw2A=", + "strip_prefix": "", + "remote_patches": {}, + "remote_patch_strip": 0 + } + } + }, + "buildozer@6.4.0.2": { + "name": "buildozer", + "version": "6.4.0.2", + "key": "buildozer@6.4.0.2", + "repoName": "buildozer", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [ + { + "extensionBzlFile": "@buildozer//:buildozer_binary.bzl", + "extensionName": "buildozer_binary", + "usingModule": "buildozer@6.4.0.2", + "location": { + "file": "https://bcr.bazel.build/modules/buildozer/6.4.0.2/MODULE.bazel", + "line": 7, + "column": 33 + }, + "imports": { + "buildozer_binary": "buildozer_binary" + }, + "devImports": [], + "tags": [ + { + "tagName": "buildozer", + "attributeValues": { + "sha256": { + "darwin-amd64": "d29e347ecd6b5673d72cb1a8de05bf1b06178dd229ff5eb67fad5100c840cc8e", + "darwin-arm64": "9b9e71bdbec5e7223871e913b65d12f6d8fa026684daf991f00e52ed36a6978d", + "linux-amd64": "8dfd6345da4e9042daa738d7fdf34f699c5dfce4632f7207956fceedd8494119", + "linux-arm64": "6559558fded658c8fa7432a9d011f7c4dcbac6b738feae73d2d5c352e5f605fa", + "windows-amd64": "e7f05bf847f7c3689dd28926460ce6e1097ae97380ac8e6ae7147b7b706ba19b" + }, + "version": "6.4.0" + }, + "devDependency": false, + "location": { + "file": "https://bcr.bazel.build/modules/buildozer/6.4.0.2/MODULE.bazel", + "line": 8, + "column": 27 + } + } + ], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true + } + ], + "deps": { + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/fmeum/buildozer/releases/download/v6.4.0.2/buildozer-v6.4.0.2.tar.gz" + ], + "integrity": "sha256-k7tFKQMR2AygxpmZfH0yEPnQmF3efFgD9rBPkj+Yz/8=", + "strip_prefix": "buildozer-6.4.0.2", + "remote_patches": { + "https://bcr.bazel.build/modules/buildozer/6.4.0.2/patches/module_dot_bazel_version.patch": "sha256-gKANF2HMilj7bWmuXs4lbBIAAansuWC4IhWGB/CerjU=" + }, + "remote_patch_strip": 1 + } + } + }, + "apple_support@1.5.0": { + "name": "apple_support", + "version": "1.5.0", + "key": "apple_support@1.5.0", + "repoName": "build_bazel_apple_support", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [ + "@local_config_apple_cc_toolchains//:all" + ], + "extensionUsages": [ + { + "extensionBzlFile": "@build_bazel_apple_support//crosstool:setup.bzl", + "extensionName": "apple_cc_configure_extension", + "usingModule": "apple_support@1.5.0", + "location": { + "file": "https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel", + "line": 17, + "column": 35 + }, + "imports": { + "local_config_apple_cc": "local_config_apple_cc", + "local_config_apple_cc_toolchains": "local_config_apple_cc_toolchains" + }, + "devImports": [], + "tags": [], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true + } + ], + "deps": { + "bazel_skylib": "bazel_skylib@1.3.0", + "platforms": "platforms@0.0.7", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/bazelbuild/apple_support/releases/download/1.5.0/apple_support.1.5.0.tar.gz" + ], + "integrity": "sha256-miM41vja0yRPgj8txghKA+TQ+7J8qJLclw5okNW0gYQ=", + "strip_prefix": "", + "remote_patches": {}, + "remote_patch_strip": 0 + } + } + }, "stardoc@0.5.1": { "name": "stardoc", "version": "0.5.1", @@ -943,15 +1015,14 @@ "extensionUsages": [], "deps": { "bazel_skylib": "bazel_skylib@1.3.0", - "rules_java": "rules_java@7.3.2", + "rules_java": "rules_java@7.4.0", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "stardoc~0.5.1", "urls": [ "https://github.com/bazelbuild/stardoc/releases/download/0.5.1/stardoc-0.5.1.tar.gz" ], @@ -966,30 +1037,27 @@ } }, "moduleExtensions": { - "@@apple_support~1.5.0//crosstool:setup.bzl%apple_cc_configure_extension": { + "@@apple_support~//crosstool:setup.bzl%apple_cc_configure_extension": { "general": { "bzlTransitiveDigest": "pMLFCYaRPkgXPQ8vtuNkMfiHfPmRBy6QJfnid4sWfv0=", - "accumulatedFileDigests": {}, + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "local_config_apple_cc": { - "bzlFile": "@@apple_support~1.5.0//crosstool:setup.bzl", + "bzlFile": "@@apple_support~//crosstool:setup.bzl", "ruleClassName": "_apple_cc_autoconf", - "attributes": { - "name": "apple_support~1.5.0~apple_cc_configure_extension~local_config_apple_cc" - } + "attributes": {} }, "local_config_apple_cc_toolchains": { - "bzlFile": "@@apple_support~1.5.0//crosstool:setup.bzl", + "bzlFile": "@@apple_support~//crosstool:setup.bzl", "ruleClassName": "_apple_cc_autoconf_toolchains", - "attributes": { - "name": "apple_support~1.5.0~apple_cc_configure_extension~local_config_apple_cc_toolchains" - } + "attributes": {} } }, "recordedRepoMappingEntries": [ [ - "apple_support~1.5.0", + "apple_support~", "bazel_tools", "bazel_tools" ] @@ -998,15 +1066,15 @@ }, "@@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": { "general": { - "bzlTransitiveDigest": "vsrPPBNf8OgywAYLMcIL1oNm2R8WtbCIL9wgQBUecpA=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "S0n86BFe4SJ3lRaZiRA5D46oH52UO2hP1T50t/zldOw=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "android_tools": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "bazel_tools~remote_android_tools_extensions~android_tools", "sha256": "2b661a761a735b41c41b3a78089f4fc1982626c76ddb944604ae3ff8c545d3c2", "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.30.0.tar" } @@ -1015,9 +1083,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_jar", "attributes": { - "name": "bazel_tools~remote_android_tools_extensions~android_gmaven_r8", - "sha256": "a1d7f902d56cfa8d1e8cd64aa250e63549359fcd096eb793286787b1a1e76db1", - "url": "https://maven.google.com/com/android/tools/r8/8.2.42/r8-8.2.42.jar" + "sha256": "57a696749695a09381a87bc2f08c3a8ed06a717a5caa3ef878a3077e0d3af19d", + "url": "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar" } } }, @@ -1026,23 +1093,20 @@ }, "@@bazel_tools//tools/cpp:cc_configure.bzl%cc_configure_extension": { "general": { - "bzlTransitiveDigest": "2LC5INJ/KSraqEsbNl9rSibnM7ApBho21h1gyUQbjPg=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "PHpT2yqMGms2U4L3E/aZ+WcQalmZWm+ILdP3yiLsDhA=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "local_config_cc": { "bzlFile": "@@bazel_tools//tools/cpp:cc_configure.bzl", "ruleClassName": "cc_autoconf", - "attributes": { - "name": "bazel_tools~cc_configure_extension~local_config_cc" - } + "attributes": {} }, "local_config_cc_toolchains": { "bzlFile": "@@bazel_tools//tools/cpp:cc_configure.bzl", "ruleClassName": "cc_autoconf_toolchains", - "attributes": { - "name": "bazel_tools~cc_configure_extension~local_config_cc_toolchains" - } + "attributes": {} } }, "recordedRepoMappingEntries": [ @@ -1057,14 +1121,14 @@ "@@bazel_tools//tools/osx:xcode_configure.bzl%xcode_configure_extension": { "general": { "bzlTransitiveDigest": "Qh2bWTU6QW6wkrd87qrU4YeY+SG37Nvw3A0PR4Y0L2Y=", - "accumulatedFileDigests": {}, + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "local_config_xcode": { "bzlFile": "@@bazel_tools//tools/osx:xcode_configure.bzl", "ruleClassName": "xcode_autoconf", "attributes": { - "name": "bazel_tools~xcode_configure_extension~local_config_xcode", "xcode_locator": "@bazel_tools//tools/osx:xcode_locator.m", "remote_xcode": "" } @@ -1076,15 +1140,14 @@ "@@bazel_tools//tools/sh:sh_configure.bzl%sh_configure_extension": { "general": { "bzlTransitiveDigest": "hp4NgmNjEg5+xgvzfh6L83bt9/aiiWETuNpwNuF1MSU=", - "accumulatedFileDigests": {}, + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "local_config_sh": { "bzlFile": "@@bazel_tools//tools/sh:sh_configure.bzl", "ruleClassName": "sh_config", - "attributes": { - "name": "bazel_tools~sh_configure_extension~local_config_sh" - } + "attributes": {} } }, "recordedRepoMappingEntries": [] @@ -1092,15 +1155,15 @@ }, "@@bazel_tools//tools/test:extensions.bzl%remote_coverage_tools_extension": { "general": { - "bzlTransitiveDigest": "AL+K5m+GCP3XRzLPqpKAq4GsjIVDXgUveWm8nih4ju0=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "l5mcjH2gWmbmIycx97bzI2stD0Q0M5gpDc0aLOHKIm8=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "remote_coverage_tools": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "bazel_tools~remote_coverage_tools_extension~remote_coverage_tools", "sha256": "7006375f6756819b7013ca875eab70a541cf7d89142d9c511ed78ea4fefa38af", "urls": [ "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.6.zip" @@ -1111,49 +1174,70 @@ "recordedRepoMappingEntries": [] } }, - "@@rules_java~7.3.2//java:extensions.bzl%toolchains": { + "@@buildozer~//:buildozer_binary.bzl%buildozer_binary": { "general": { - "bzlTransitiveDigest": "Bm4ulErUcJjZtKeAt2etkB6sGO8evCgHQxbw4Px8q60=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "EleDU/FQ1+e/RgkW3aIDmdaxZEthvoWQhsqFTxiSgMI=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "buildozer_binary": { + "bzlFile": "@@buildozer~//private:buildozer_binary.bzl", + "ruleClassName": "_buildozer_binary_repo", + "attributes": { + "sha256": { + "darwin-amd64": "d29e347ecd6b5673d72cb1a8de05bf1b06178dd229ff5eb67fad5100c840cc8e", + "darwin-arm64": "9b9e71bdbec5e7223871e913b65d12f6d8fa026684daf991f00e52ed36a6978d", + "linux-amd64": "8dfd6345da4e9042daa738d7fdf34f699c5dfce4632f7207956fceedd8494119", + "linux-arm64": "6559558fded658c8fa7432a9d011f7c4dcbac6b738feae73d2d5c352e5f605fa", + "windows-amd64": "e7f05bf847f7c3689dd28926460ce6e1097ae97380ac8e6ae7147b7b706ba19b" + }, + "version": "6.4.0" + } + } + }, + "recordedRepoMappingEntries": [] + } + }, + "@@rules_java~//java:extensions.bzl%toolchains": { + "general": { + "bzlTransitiveDigest": "tJHbmWnq7m+9eUBnUdv7jZziQ26FmcGL9C5/hU3Q9UQ=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "remotejdk21_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk21_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux//:jdk\",\n)\n" } }, "remotejdk17_linux_s390x_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_s390x_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\n" } }, "remotejdk17_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos//:jdk\",\n)\n" } }, "remotejdk21_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk21_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\n" } }, "remotejdk17_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\n" } }, @@ -1161,21 +1245,19 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk21_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "2a7a99a3ea263dbd8d32a67d1e6e363ba8b25c645c826f5e167a02bbafaff1fa", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-macosx_aarch64", + "sha256": "e8260516de8b60661422a725f1df2c36ef888f6fb35393566b00e7325db3d04e", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_aarch64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_aarch64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_aarch64.tar.gz" ] } }, "remotejdk17_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux//:jdk\",\n)\n" } }, @@ -1183,7 +1265,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "314b04568ec0ae9b36ba03c9cbd42adc9e1265f74678923b19297d66eb84dcca", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64", @@ -1197,11 +1278,10 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remote_java_tools_windows", - "sha256": "8fc29a5e34e91c74815c4089ed0f481a7d728a5e886c4e5e3b9bcd79711fee3d", + "sha256": "fe2f88169696d6c6fc6e90ba61bb46be7d0ae3693cbafdf336041bf56679e8d1", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.3/java_tools_windows-v13.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.3/java_tools_windows-v13.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_windows-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_windows-v13.4.zip" ] } }, @@ -1209,7 +1289,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "43408193ce2fa0862819495b5ae8541085b95660153f2adcf91a52d3a1710e83", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-win_x64", @@ -1220,10 +1299,9 @@ } }, "remotejdk11_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win//:jdk\",\n)\n" } }, @@ -1231,7 +1309,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "54174439f2b3fddd11f1048c397fe7bb45d4c9d66d452d6889b013d04d21c4de", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_aarch64", @@ -1245,7 +1322,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "b9482f2304a1a68a614dfacddcf29569a72f0fac32e6c74f83dc1b9a157b8340", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_x64", @@ -1256,18 +1332,16 @@ } }, "remotejdk11_linux_s390x_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_s390x_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\n" } }, "remotejdk11_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux//:jdk\",\n)\n" } }, @@ -1275,7 +1349,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "bcaab11cfe586fae7583c6d9d311c64384354fb2638eb9a012eca4c3f1a1d9fd", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_x64", @@ -1289,7 +1362,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_win_arm64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", "strip_prefix": "jdk-11.0.13+8", @@ -1302,7 +1374,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "640453e8afe8ffe0fb4dceb4535fb50db9c283c64665eebb0ba68b19e65f4b1f", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_x64", @@ -1316,29 +1387,26 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk21_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "9639b87db586d0c89f7a9892ae47f421e442c64b97baebdff31788fbe23265bd", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-macosx_x64", + "sha256": "3ad8fe288eb57d975c2786ae453a036aa46e47ab2ac3d81538ebae2a54d3c025", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_x64.tar.gz" ] } }, "remotejdk21_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk21_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos//:jdk\",\n)\n" } }, "remotejdk17_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\n" } }, @@ -1346,7 +1414,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "192f2afca57701de6ec496234f7e45d971bf623ff66b8ee4a5c81582054e5637", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_x64", @@ -1357,18 +1424,16 @@ } }, "remotejdk11_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\n" } }, "remotejdk11_linux_ppc64le_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_ppc64le_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\n" } }, @@ -1376,13 +1441,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk21_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "0c0eadfbdc47a7ca64aeab51b9c061f71b6e4d25d2d87674512e9b6387e9e3a6", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-linux_x64", + "sha256": "5ad730fbee6bb49bfff10bf39e84392e728d89103d3474a7e5def0fd134b300a", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_x64.tar.gz" ] } }, @@ -1390,11 +1454,10 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remote_java_tools_linux", - "sha256": "a781eb28bb28d1fd9eee129272f7f2eaf93cd272f974a5b3f6385889538d3408", + "sha256": "ba10f09a138cf185d04cbc807d67a3da42ab13d618c5d1ce20d776e199c33a39", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.3/java_tools_linux-v13.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.3/java_tools_linux-v13.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_linux-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_linux-v13.4.zip" ] } }, @@ -1402,13 +1465,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk21_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "e9959d500a0d9a7694ac243baf657761479da132f0f94720cbffd092150bd802", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-win_x64", + "sha256": "f7cc15ca17295e69c907402dfe8db240db446e75d3b150da7bf67243cded93de", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-win_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-win_x64.zip", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-win_x64.zip" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-win_x64.zip" ] } }, @@ -1416,21 +1478,19 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk21_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "1fb64b8036c5d463d8ab59af06bf5b6b006811e6012e3b0eb6bccf57f1c55835", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-linux_aarch64", + "sha256": "ce7df1af5d44a9f455617c4b8891443fbe3e4b269c777d8b82ed66f77167cfe0", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_aarch64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_aarch64.tar.gz" + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_aarch64.tar.gz", + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_aarch64.tar.gz" ] } }, "remotejdk11_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\n" } }, @@ -1438,7 +1498,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_s390x", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b", "strip_prefix": "jdk-11.0.15+10", @@ -1452,7 +1511,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "6531cef61e416d5a7b691555c8cf2bdff689201b8a001ff45ab6740062b44313", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64", @@ -1463,10 +1521,9 @@ } }, "remotejdk17_win_arm64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_win_arm64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\n" } }, @@ -1474,7 +1531,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a34b404f87a08a61148b38e1416d837189e1df7a040d949e743633daf4695a3c", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_x64", @@ -1485,18 +1541,16 @@ } }, "remotejdk11_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos//:jdk\",\n)\n" } }, "remotejdk17_linux_ppc64le_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_ppc64le_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\n" } }, @@ -1504,7 +1558,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_win_arm64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "6802c99eae0d788e21f52d03cab2e2b3bf42bc334ca03cbf19f71eb70ee19f85", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_aarch64", @@ -1518,11 +1571,10 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remote_java_tools_darwin_arm64", - "sha256": "276bb552ee03341f93c0c218343295f60241fe1d32dccd97df89319c510c19a1", + "sha256": "076a7e198ad077f8c7d997986ef5102427fae6bbfce7a7852d2e080ed8767528", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.3/java_tools_darwin_arm64-v13.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.3/java_tools_darwin_arm64-v13.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_arm64-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_darwin_arm64-v13.4.zip" ] } }, @@ -1530,7 +1582,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_ppc64le", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "00a4c07603d0218cd678461b5b3b7e25b3253102da4022d31fc35907f21a2efd", "strip_prefix": "jdk-17.0.8.1+1", @@ -1541,26 +1592,23 @@ } }, "remotejdk21_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk21_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\n" } }, "remotejdk11_win_arm64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_win_arm64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\n" } }, "local_jdk": { - "bzlFile": "@@rules_java~7.3.2//toolchains:local_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:local_java_repository.bzl", "ruleClassName": "_local_java_repository_rule", "attributes": { - "name": "rules_java~7.3.2~toolchains~local_jdk", "java_home": "", "version": "", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = {RUNTIME_VERSION},\n)\n" @@ -1570,11 +1618,10 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remote_java_tools_darwin_x86_64", - "sha256": "55bd36bf2fad897d9107145f81e20a549a37e4d9d4c447b6915634984aa9f576", + "sha256": "4523aec4d09c587091a2dae6f5c9bc6922c220f3b6030e5aba9c8f015913cc65", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.3/java_tools_darwin_x86_64-v13.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.3/java_tools_darwin_x86_64-v13.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_x86_64-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_darwin_x86_64-v13.4.zip" ] } }, @@ -1582,11 +1629,10 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remote_java_tools", - "sha256": "30a7d845bec3dd054ac45b5546c2fdf1922c0b1040b2a13b261fcc2e2d63a2f4", + "sha256": "e025fd260ac39b47c111f5212d64ec0d00d85dec16e49368aae82fc626a940cf", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.3/java_tools-v13.3.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.3/java_tools-v13.3.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools-v13.4.zip" ] } }, @@ -1594,7 +1640,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_s390x", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "ffacba69c6843d7ca70d572489d6cc7ab7ae52c60f0852cedf4cf0d248b6fc37", "strip_prefix": "jdk-17.0.8.1+1", @@ -1605,10 +1650,9 @@ } }, "remotejdk17_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk17_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win//:jdk\",\n)\n" } }, @@ -1616,7 +1660,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_ppc64le", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f", "strip_prefix": "jdk-11.0.15+10", @@ -1630,7 +1673,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk11_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "7632bc29f8a4b7d492b93f3bc75a7b61630894db85d136456035ab2a24d38885", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_aarch64", @@ -1641,41 +1683,40 @@ } }, "remotejdk21_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.3.2~toolchains~remotejdk21_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\n" } } }, "recordedRepoMappingEntries": [ [ - "rules_java~7.3.2", + "rules_java~", "bazel_tools", "bazel_tools" ], [ - "rules_java~7.3.2", + "rules_java~", "remote_java_tools", - "rules_java~7.3.2~toolchains~remote_java_tools" + "rules_java~~toolchains~remote_java_tools" ] ] } }, - "@@rules_jvm_external~4.4.2//:extensions.bzl%maven": { + "@@rules_jvm_external~//:extensions.bzl%maven": { "general": { - "bzlTransitiveDigest": "yXprMX4LqzJwuZlbtT9WNeu7p2iEYw7j4R1NP9pc4Ow=", - "accumulatedFileDigests": { - "@@rules_jvm_external~4.4.2//:rules_jvm_external_deps_install.json": "10442a5ae27d9ff4c2003e5ab71643bf0d8b48dcf968b4173fa274c3232a8c06" + "bzlTransitiveDigest": "v8HssW6WP6B8s0BwuAMJuQCz6cQ9jlhOfx4dKBtPYB4=", + "recordedFileInputs": { + "@@rules_jvm_external~//rules_jvm_external_deps_install.json": "10442a5ae27d9ff4c2003e5ab71643bf0d8b48dcf968b4173fa274c3232a8c06" }, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "org_slf4j_slf4j_api_1_7_30": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_slf4j_slf4j_api_1_7_30", "sha256": "cdba07964d1bb40a0761485c6b1e8c2f8fd9eb1d19c53928ac0d7f9510105c57", "urls": [ "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar", @@ -1688,7 +1729,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_api_grpc_proto_google_common_protos_2_0_1", "sha256": "5ce71656118618731e34a5d4c61aa3a031be23446dc7de8b5a5e77b66ebcd6ef", "urls": [ "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar", @@ -1701,7 +1741,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_api_gax_1_60_0", "sha256": "02f37d4ff1a7b8d71dff8064cf9568aa4f4b61bcc4485085d16130f32afa5a79", "urls": [ "https://repo1.maven.org/maven2/com/google/api/gax/1.60.0/gax-1.60.0.jar", @@ -1714,7 +1753,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_guava_failureaccess_1_0_1", "sha256": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26", "urls": [ "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar", @@ -1727,7 +1765,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~commons_logging_commons_logging_1_2", "sha256": "daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636", "urls": [ "https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar", @@ -1740,7 +1777,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_http_client_google_http_client_appengine_1_38_0", "sha256": "f97b495fd97ac3a3d59099eb2b55025f4948230da15a076f189b9cff37c6b4d2", "urls": [ "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar", @@ -1753,7 +1789,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_cloud_google_cloud_storage_1_113_4", "sha256": "796833e9bdab80c40bbc820e65087eb8f28c6bfbca194d2e3e00d98cb5bc55d6", "urls": [ "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar", @@ -1766,7 +1801,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_grpc_grpc_context_1_33_1", "sha256": "99b8aea2b614fe0e61c3676e681259dc43c2de7f64620998e1a8435eb2976496", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar", @@ -1779,7 +1813,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_api_grpc_proto_google_iam_v1_1_0_3", "sha256": "64cee7383a97e846da8d8e160e6c8fe30561e507260552c59e6ccfc81301fdc8", "urls": [ "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar", @@ -1792,7 +1825,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_api_api_common_1_10_1", "sha256": "2a033f24bb620383eda440ad307cb8077cfec1c7eadc684d65216123a1b9613a", "urls": [ "https://repo1.maven.org/maven2/com/google/api/api-common/1.10.1/api-common-1.10.1.jar", @@ -1805,7 +1837,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_auth_google_auth_library_oauth2_http_0_22_0", "sha256": "1722d895c42dc42ea1d1f392ddbec1fbb28f7a979022c3a6c29acc39cc777ad1", "urls": [ "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar", @@ -1818,7 +1849,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_typesafe_netty_netty_reactive_streams_2_0_5", "sha256": "f949849fc8ee75fde468ba3a35df2e04577fa31a2940b83b2a7dc9d14dac13d6", "urls": [ "https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar", @@ -1831,7 +1861,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_typesafe_netty_netty_reactive_streams_http_2_0_5", "sha256": "b39224751ad936758176e9d994230380ade5e9079e7c8ad778e3995779bcf303", "urls": [ "https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar", @@ -1844,7 +1873,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~javax_annotation_javax_annotation_api_1_3_2", "sha256": "e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b", "urls": [ "https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar", @@ -1857,7 +1885,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_j2objc_j2objc_annotations_1_3", "sha256": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b", "urls": [ "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar", @@ -1870,7 +1897,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_metrics_spi_2_17_183", "sha256": "08a11dc8c4ba464beafbcc7ac05b8c724c1ccb93da99482e82a68540ac704e4a", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar", @@ -1883,7 +1909,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_reactivestreams_reactive_streams_1_0_3", "sha256": "1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865", "urls": [ "https://repo1.maven.org/maven2/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar", @@ -1896,7 +1921,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_http_client_google_http_client_jackson2_1_38_0", "sha256": "e6504a82425fcc2168a4ca4175138ddcc085168daed8cdedb86d8f6fdc296e1e", "urls": [ "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar", @@ -1909,7 +1933,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_transport_4_1_72_Final", "sha256": "c5fb68e9a65b6e8a516adfcb9fa323479ee7b4d9449d8a529d2ecab3d3711d5a", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar", @@ -1922,7 +1945,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_codec_http2_4_1_72_Final", "sha256": "c89a70500f59e8563e720aaa808263a514bd9e2bd91ba84eab8c2ccb45f234b2", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar", @@ -1935,7 +1957,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_opencensus_opencensus_api_0_24_0", "sha256": "f561b1cc2673844288e596ddf5bb6596868a8472fd2cb8993953fc5c034b2352", "urls": [ "https://repo1.maven.org/maven2/io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar", @@ -1945,10 +1966,9 @@ } }, "rules_jvm_external_deps": { - "bzlFile": "@@rules_jvm_external~4.4.2//:coursier.bzl", + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", "ruleClassName": "pinned_coursier_fetch", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~rules_jvm_external_deps", "repositories": [ "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" ], @@ -1962,7 +1982,7 @@ "fetch_sources": true, "fetch_javadoc": false, "generate_compat_repositories": false, - "maven_install_json": "@@rules_jvm_external~4.4.2//:rules_jvm_external_deps_install.json", + "maven_install_json": "@@rules_jvm_external~//:rules_jvm_external_deps_install.json", "override_targets": {}, "strict_visibility": false, "strict_visibility_value": [ @@ -1983,7 +2003,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_threeten_threetenbp_1_5_0", "sha256": "dcf9c0f940739f2a825cd8626ff27113459a2f6eb18797c7152f93fff69c264f", "urls": [ "https://repo1.maven.org/maven2/org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar", @@ -1996,7 +2015,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_http_client_spi_2_17_183", "sha256": "fe7120f175df9e47ebcc5d946d7f40110faf2ba0a30364f3b935d5b8a5a6c3c6", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar", @@ -2009,7 +2027,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_third_party_jackson_core_2_17_183", "sha256": "1bc27c9960993c20e1ab058012dd1ae04c875eec9f0f08f2b2ca41e578dee9a4", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar", @@ -2022,7 +2039,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_eventstream_eventstream_1_0_1", "sha256": "0c37d8e696117f02c302191b8110b0d0eb20fa412fce34c3a269ec73c16ce822", "urls": [ "https://repo1.maven.org/maven2/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar", @@ -2035,7 +2051,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_oauth_client_google_oauth_client_1_31_1", "sha256": "4ed4e2948251dbda66ce251bd7f3b32cd8570055e5cdb165a3c7aea8f43da0ff", "urls": [ "https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar", @@ -2045,10 +2060,9 @@ } }, "maven": { - "bzlFile": "@@rules_jvm_external~4.4.2//:coursier.bzl", + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", "ruleClassName": "coursier_fetch", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~maven", "repositories": [ "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" ], @@ -2089,7 +2103,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_aws_xml_protocol_2_17_183", "sha256": "566bba05d49256fa6994efd68fa625ae05a62ea45ee74bb9130d20ea20988363", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar", @@ -2102,7 +2115,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_annotations_2_17_183", "sha256": "8e4d72361ca805a0bd8bbd9017cd7ff77c8d170f2dd469c7d52d5653330bb3fd", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar", @@ -2115,7 +2127,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_netty_nio_client_2_17_183", "sha256": "a6d356f364c56d7b90006b0b7e503b8630010993a5587ce42e74b10b8dca2238", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar", @@ -2128,7 +2139,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_auto_value_auto_value_annotations_1_7_4", "sha256": "fedd59b0b4986c342f6ab2d182f2a4ee9fceb2c7e2d5bdc4dc764c92394a23d3", "urls": [ "https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar", @@ -2141,7 +2151,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_transport_native_unix_common_4_1_72_Final", "sha256": "6f8f1cc29b5a234eeee9439a63eb3f03a5994aa540ff555cb0b2c88cefaf6877", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar", @@ -2154,7 +2163,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_opencensus_opencensus_contrib_http_util_0_24_0", "sha256": "7155273bbb1ed3d477ea33cf19d7bbc0b285ff395f43b29ae576722cf247000f", "urls": [ "https://repo1.maven.org/maven2/io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar", @@ -2167,7 +2175,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_fasterxml_jackson_core_jackson_core_2_11_3", "sha256": "78cd0a6b936232e06dd3e38da8a0345348a09cd1ff9c4d844c6ee72c75cfc402", "urls": [ "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar", @@ -2180,7 +2187,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_cloud_google_cloud_core_1_93_10", "sha256": "832d74eca66f4601e162a8460d6f59f50d1d23f93c18b02654423b6b0d67c6ea", "urls": [ "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar", @@ -2193,7 +2199,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_auth_google_auth_library_credentials_0_22_0", "sha256": "42c76031276de5b520909e9faf88c5b3c9a722d69ee9cfdafedb1c52c355dfc5", "urls": [ "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar", @@ -2206,7 +2211,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_guava_guava_30_0_android", "sha256": "3345c82c2cc70a0053e8db9031edc6d71625ef0dea6a2c8f5ebd6cb76d2bf843", "urls": [ "https://repo1.maven.org/maven2/com/google/guava/guava/30.0-android/guava-30.0-android.jar", @@ -2219,7 +2223,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_profiles_2_17_183", "sha256": "78833b32fde3f1c5320373b9ea955c1bbc28f2c904010791c4784e610193ee56", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar", @@ -2232,7 +2235,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_apache_httpcomponents_httpcore_4_4_13", "sha256": "e06e89d40943245fcfa39ec537cdbfce3762aecde8f9c597780d2b00c2b43424", "urls": [ "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar", @@ -2245,7 +2247,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_common_4_1_72_Final", "sha256": "8adb4c291260ceb2859a68c49f0adeed36bf49587608e2b81ecff6aaf06025e9", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar", @@ -2258,7 +2259,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_transport_classes_epoll_4_1_72_Final", "sha256": "e1528a9751c1285aa7beaf3a1eb0597151716426ce38598ac9bc0891209b9e68", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar", @@ -2271,7 +2271,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_cloud_google_cloud_core_http_1_93_10", "sha256": "81ac67c14c7c4244d2b7db2607ad352416aca8d3bb2adf338964e8fea25b1b3c", "urls": [ "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar", @@ -2284,7 +2283,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_utils_2_17_183", "sha256": "7bd849bb5aa71bfdf6b849643736ecab3a7b3f204795804eefe5754104231ec6", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar", @@ -2297,7 +2295,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_apache_commons_commons_lang3_3_8_1", "sha256": "dac807f65b07698ff39b1b07bfef3d87ae3fd46d91bbf8a2bc02b2a831616f68", "urls": [ "https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar", @@ -2310,7 +2307,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_aws_core_2_17_183", "sha256": "bccbdbea689a665a702ff19828662d87fb7fe81529df13f02ef1e4c474ea9f93", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar", @@ -2323,7 +2319,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_api_gax_httpjson_0_77_0", "sha256": "fd4dae47fa016d3b26e8d90b67ddc6c23c4c06e8bcdf085c70310ab7ef324bd6", "urls": [ "https://repo1.maven.org/maven2/com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar", @@ -2333,10 +2328,9 @@ } }, "unpinned_rules_jvm_external_deps": { - "bzlFile": "@@rules_jvm_external~4.4.2//:coursier.bzl", + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", "ruleClassName": "coursier_fetch", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~unpinned_rules_jvm_external_deps", "repositories": [ "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" ], @@ -2359,7 +2353,7 @@ "strict_visibility_value": [ "@@//visibility:private" ], - "maven_install_json": "@@rules_jvm_external~4.4.2//:rules_jvm_external_deps_install.json", + "maven_install_json": "@@rules_jvm_external~//:rules_jvm_external_deps_install.json", "resolve_timeout": 600, "jetify": false, "jetify_include_list": [ @@ -2374,7 +2368,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_regions_2_17_183", "sha256": "d3079395f3ffc07d04ffcce16fca29fb5968197f6e9ea3dbff6be297102b40a5", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar", @@ -2387,7 +2380,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_errorprone_error_prone_annotations_2_4_0", "sha256": "5f2a0648230a662e8be049df308d583d7369f13af683e44ddf5829b6d741a228", "urls": [ "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.jar", @@ -2400,7 +2392,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_handler_4_1_72_Final", "sha256": "9cb6012af7e06361d738ac4e3bdc49a158f8cf87d9dee0f2744056b7d99c28d5", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar", @@ -2413,7 +2404,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_aws_query_protocol_2_17_183", "sha256": "4dace03c76f80f3dec920cb3dedb2a95984c4366ef4fda728660cb90bed74848", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar", @@ -2426,7 +2416,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_codec_http_4_1_72_Final", "sha256": "fa6fec88010bfaf6a7415b5364671b6b18ffb6b35a986ab97b423fd8c3a0174b", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar", @@ -2439,7 +2428,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_resolver_4_1_72_Final", "sha256": "6474598aab7cc9d8d6cfa06c05bd1b19adbf7f8451dbdd73070b33a6c60b1b90", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar", @@ -2452,7 +2440,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_protocol_core_2_17_183", "sha256": "10e7c4faa1f05e2d73055d0390dbd0bb6450e2e6cb85beda051b1e4693c826ce", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar", @@ -2465,7 +2452,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_checkerframework_checker_compat_qual_2_5_5", "sha256": "11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a", "urls": [ "https://repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar", @@ -2478,7 +2464,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_apis_google_api_services_storage_v1_rev20200927_1_30_10", "sha256": "52d26a9d105f8d8a0850807285f307a76cea8f3e0cdb2be4d3b15b1adfa77351", "urls": [ "https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar", @@ -2491,7 +2476,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_api_client_google_api_client_1_30_11", "sha256": "ee6f97865cc7de6c7c80955c3f37372cf3887bd75e4fc06f1058a6b4cd9bf4da", "urls": [ "https://repo1.maven.org/maven2/com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar", @@ -2504,7 +2488,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_s3_2_17_183", "sha256": "ab073b91107a9e4ed9f030314077d137fe627e055ad895fabb036980a050e360", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar", @@ -2517,7 +2500,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_apache_maven_maven_artifact_3_8_6", "sha256": "de22a4c6f54fe31276a823b1bbd3adfd6823529e732f431b5eff0852c2b9252b", "urls": [ "https://repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar", @@ -2530,7 +2512,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_apache_httpcomponents_httpclient_4_5_13", "sha256": "6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743", "urls": [ "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar", @@ -2543,7 +2524,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava", "sha256": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99", "urls": [ "https://repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar", @@ -2556,7 +2536,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_http_client_google_http_client_1_38_0", "sha256": "411f4a42519b6b78bdc0fcfdf74c9edcef0ee97afa4a667abe04045a508d6302", "urls": [ "https://repo1.maven.org/maven2/com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar", @@ -2569,7 +2548,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_apache_client_2_17_183", "sha256": "78ceae502fce6a97bbe5ff8f6a010a52ab7ea3ae66cb1a4122e18185fce45022", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar", @@ -2582,7 +2560,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_arns_2_17_183", "sha256": "659a185e191d66c71de81209490e66abeaccae208ea7b2831a738670823447aa", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar", @@ -2595,7 +2572,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_code_gson_gson_2_9_0", "sha256": "c96d60551331a196dac54b745aa642cd078ef89b6f267146b705f2c2cbef052d", "urls": [ "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar", @@ -2608,7 +2584,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_buffer_4_1_72_Final", "sha256": "568ff7cd9d8e2284ec980730c88924f686642929f8f219a74518b4e64755f3a1", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar", @@ -2621,7 +2596,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_code_findbugs_jsr305_3_0_2", "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", "urls": [ "https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar", @@ -2634,7 +2608,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~commons_codec_commons_codec_1_11", "sha256": "e599d5318e97aa48f42136a2927e6dfa4e8881dff0e6c8e3109ddbbff51d7b7d", "urls": [ "https://repo1.maven.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.jar", @@ -2647,7 +2620,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_auth_2_17_183", "sha256": "8820c6636e5c14efc29399fb5565ce50212b0c1f4ed720a025a2c402d54e0978", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar", @@ -2660,7 +2632,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_json_utils_2_17_183", "sha256": "51ab7f550adc06afcb49f5270cdf690f1bfaaee243abaa5d978095e2a1e4e1a5", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar", @@ -2673,7 +2644,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_codehaus_plexus_plexus_utils_3_3_1", "sha256": "4b570fcdbe5a894f249d2eb9b929358a9c88c3e548d227a80010461930222f2a", "urls": [ "https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar", @@ -2686,7 +2656,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_protobuf_protobuf_java_util_3_13_0", "sha256": "d9de66b8c9445905dfa7064f6d5213d47ce88a20d34e21d83c4a94a229e14e62", "urls": [ "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar", @@ -2699,7 +2668,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_codec_4_1_72_Final", "sha256": "5d8591ca271a1e9c224e8de3873aa9936acb581ee0db514e7dc18523df36d16c", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar", @@ -2712,7 +2680,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_protobuf_protobuf_java_3_13_0", "sha256": "97d5b2758408690c0dc276238707492a0b6a4d71206311b6c442cdc26c5973ff", "urls": [ "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar", @@ -2725,7 +2692,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_tcnative_classes_2_0_46_Final", "sha256": "d3ec888dcc4ac7915bf88b417c5e04fd354f4311032a748a6882df09347eed9a", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar", @@ -2738,7 +2704,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_sdk_core_2_17_183", "sha256": "677e9cc90fdd82c1f40f97b99cb115b13ad6c3f58beeeab1c061af6954d64c77", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar", @@ -2750,29 +2715,29 @@ }, "recordedRepoMappingEntries": [ [ - "rules_jvm_external~4.4.2", + "rules_jvm_external~", "bazel_tools", "bazel_tools" ], [ - "rules_jvm_external~4.4.2", + "rules_jvm_external~", "rules_jvm_external", - "rules_jvm_external~4.4.2" + "rules_jvm_external~" ] ] } }, - "@@rules_jvm_external~4.4.2//:non-module-deps.bzl%non_module_deps": { + "@@rules_jvm_external~//:non-module-deps.bzl%non_module_deps": { "general": { - "bzlTransitiveDigest": "Td87llNSs5GZ/kAxu6pAqfEXBZ3HdkSqRmUzvIfbFWg=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "DqBh3ObkOvjDFKv8VTy6J2qr7hXsJm9/sES7bha7ftA=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "io_bazel_rules_kotlin": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_jvm_external~4.4.2~non_module_deps~io_bazel_rules_kotlin", "sha256": "946747acdbeae799b085d12b240ec346f775ac65236dfcf18aa0cd7300f6de78", "urls": [ "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.7.0-RC-2/rules_kotlin_release.tgz" @@ -2782,59 +2747,59 @@ }, "recordedRepoMappingEntries": [ [ - "rules_jvm_external~4.4.2", + "rules_jvm_external~", "bazel_tools", "bazel_tools" ] ] } }, - "@@rules_python~0.22.1//python/extensions:python.bzl%python": { + "@@rules_python~//python/extensions:python.bzl%python": { "general": { - "bzlTransitiveDigest": "NGtTMUqs2EEJeXu6mXdpmYRrQGZiJV7S3mxeod3Hm7M=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "31xtOi5rmBJ3jSHeziLzV7KKKgCc6tMnRUZ1BQLBeao=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "pythons_hub": { - "bzlFile": "@@rules_python~0.22.1//python/extensions/private:interpreter_hub.bzl", + "bzlFile": "@@rules_python~//python/extensions/private:interpreter_hub.bzl", "ruleClassName": "hub_repo", "attributes": { - "name": "rules_python~0.22.1~python~pythons_hub", "toolchains": [] } } }, "recordedRepoMappingEntries": [ [ - "rules_python~0.22.1", + "rules_python~", "bazel_tools", "bazel_tools" ], [ - "rules_python~0.22.1", + "rules_python~", "rules_python", - "rules_python~0.22.1" + "rules_python~" ] ] } }, - "@@rules_python~0.22.1//python/extensions/private:internal_deps.bzl%internal_deps": { + "@@rules_python~//python/extensions/private:internal_deps.bzl%internal_deps": { "general": { - "bzlTransitiveDigest": "5c1tkdV6L67SQOZWc9MUoS5ZnsSxeDKsh9urs01jZSM=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "fUb5iKCtPgjhclraX+//BnJ+LOcG6I6+O9UUxT+gZ50=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "pypi__coverage_cp39_aarch64-apple-darwin": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp39_aarch64-apple-darwin", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc", "type": "zip", @@ -2847,13 +2812,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp38_aarch64-unknown-linux-gnu", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e", "type": "zip", @@ -2866,7 +2830,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__pip_tools", "url": "https://files.pythonhosted.org/packages/5e/e8/f6d7d1847c7351048da870417724ace5c4506e816b38db02f4d7c675c189/pip_tools-6.12.1-py3-none-any.whl", "sha256": "f0c0c0ec57b58250afce458e2e6058b1f30a4263db895b7d72fd6311bf1dc6f7", "type": "zip", @@ -2877,13 +2840,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp310_x86_64-unknown-linux-gnu", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0", "type": "zip", @@ -2896,13 +2858,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp311_x86_64-apple-darwin", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795", "type": "zip", @@ -2915,13 +2876,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp310_aarch64-unknown-linux-gnu", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4", "type": "zip", @@ -2934,13 +2894,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp39_aarch64-unknown-linux-gnu", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe", "type": "zip", @@ -2953,13 +2912,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp310_aarch64-apple-darwin", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660", "type": "zip", @@ -2972,7 +2930,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__pip", "url": "https://files.pythonhosted.org/packages/09/bd/2410905c76ee14c62baf69e3f4aa780226c1bbfc9485731ad018e35b0cb5/pip-22.3.1-py3-none-any.whl", "sha256": "908c78e6bc29b676ede1c4d57981d490cb892eb45cd8c214ab6298125119e077", "type": "zip", @@ -2983,13 +2940,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp38_x86_64-apple-darwin", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c", "type": "zip", @@ -3002,13 +2958,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp311_x86_64-unknown-linux-gnu", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91", "type": "zip", @@ -3021,7 +2976,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__tomli", "url": "https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl", "sha256": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", "type": "zip", @@ -3032,13 +2986,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp39_x86_64-apple-darwin", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745", "type": "zip", @@ -3051,7 +3004,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__wheel", "url": "https://files.pythonhosted.org/packages/bd/7c/d38a0b30ce22fc26ed7dbc087c6d00851fb3395e9d0dac40bec1f905030c/wheel-0.38.4-py3-none-any.whl", "sha256": "b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8", "type": "zip", @@ -3062,13 +3014,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp311_aarch64-unknown-linux-gnu", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75", "type": "zip", @@ -3081,7 +3032,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__click", "url": "https://files.pythonhosted.org/packages/76/0a/b6c5f311e32aeb3b406e03c079ade51e905ea630fc19d1262a46249c1c86/click-8.0.1-py3-none-any.whl", "sha256": "fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6", "type": "zip", @@ -3092,13 +3042,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp39_x86_64-unknown-linux-gnu", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5", "type": "zip", @@ -3111,7 +3060,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__importlib_metadata", "url": "https://files.pythonhosted.org/packages/d7/31/74dcb59a601b95fce3b0334e8fc9db758f78e43075f22aeb3677dfb19f4c/importlib_metadata-1.4.0-py2.py3-none-any.whl", "sha256": "bdd9b7c397c273bcc9a11d6629a38487cd07154fa255a467bf704cd2c258e359", "type": "zip", @@ -3122,7 +3070,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__pep517", "url": "https://files.pythonhosted.org/packages/ee/2f/ef63e64e9429111e73d3d6cbee80591672d16f2725e648ebc52096f3d323/pep517-0.13.0-py3-none-any.whl", "sha256": "4ba4446d80aed5b5eac6509ade100bff3e7943a8489de249654a5ae9b33ee35b", "type": "zip", @@ -3133,13 +3080,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp38_x86_64-unknown-linux-gnu", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b", "type": "zip", @@ -3152,13 +3098,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp38_aarch64-apple-darwin", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba", "type": "zip", @@ -3171,7 +3116,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__packaging", "url": "https://files.pythonhosted.org/packages/8f/7b/42582927d281d7cb035609cd3a543ffac89b74f3f4ee8e1c50914bcb57eb/packaging-22.0-py3-none-any.whl", "sha256": "957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3", "type": "zip", @@ -3182,7 +3126,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__setuptools", "url": "https://files.pythonhosted.org/packages/7c/5b/3d92b9f0f7ca1645cba48c080b54fe7d8b1033a4e5720091d1631c4266db/setuptools-60.10.0-py3-none-any.whl", "sha256": "782ef48d58982ddb49920c11a0c5c9c0b02e7d7d1c2ad0aa44e1a1e133051c96", "type": "zip", @@ -3193,7 +3136,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__zipp", "url": "https://files.pythonhosted.org/packages/f4/50/cc72c5bcd48f6e98219fc4a88a5227e9e28b81637a99c49feba1d51f4d50/zipp-1.0.0-py2.py3-none-any.whl", "sha256": "8dda78f06bd1674bd8720df8a50bb47b6e1233c503a4eed8e7810686bde37656", "type": "zip", @@ -3204,7 +3146,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__colorama", "url": "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", "sha256": "4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", "type": "zip", @@ -3215,7 +3156,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__build", "url": "https://files.pythonhosted.org/packages/03/97/f58c723ff036a8d8b4d3115377c0a37ed05c1f68dd9a0d66dab5e82c5c1c/build-0.9.0-py3-none-any.whl", "sha256": "38a7a2b7a0bdc61a42a0a67509d88c71ecfc37b393baba770fae34e20929ff69", "type": "zip", @@ -3226,13 +3166,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp310_x86_64-apple-darwin", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.22.1//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53", "type": "zip", @@ -3245,7 +3184,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__installer", "url": "https://files.pythonhosted.org/packages/e5/ca/1172b6638d52f2d6caa2dd262ec4c811ba59eee96d54a7701930726bce18/installer-0.7.0-py3-none-any.whl", "sha256": "05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53", "type": "zip", @@ -3256,7 +3194,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.22.1~internal_deps~pypi__more_itertools", "url": "https://files.pythonhosted.org/packages/bd/3f/c4b3dbd315e248f84c388bd4a72b131a29f123ecacc37ffb2b3834546e42/more_itertools-8.13.0-py3-none-any.whl", "sha256": "c5122bffc5f104d37c1626b8615b511f3427aa5389b94d61e5ef8236bfbc3ddb", "type": "zip", @@ -3266,19 +3203,19 @@ }, "recordedRepoMappingEntries": [ [ - "rules_python~0.22.1", + "rules_python~", "bazel_skylib", - "bazel_skylib~1.3.0" + "bazel_skylib~" ], [ - "rules_python~0.22.1", + "rules_python~", "bazel_tools", "bazel_tools" ], [ - "rules_python~0.22.1", + "rules_python~", "rules_python", - "rules_python~0.22.1" + "rules_python~" ] ] } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 92f4a52e02..ee622ca65c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -43,7 +43,7 @@ # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). , enableNixHacks ? false -, version ? "7.0.2", +, version ? "7.1.0", }: let @@ -51,7 +51,7 @@ let src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-3qK5BXXUPvPkHEAvZMJIGETsvwtA+FSLdaIEpNUE4DU="; + hash = "sha256-HiDQyJ98nRtKOBqMWGtKQ1qWv8Qfu880osKUlOs4Z6E="; }; # Use builtins.fetchurl to avoid IFD, in particular on hydra @@ -213,7 +213,7 @@ stdenv.mkDerivation rec { # # See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses # NIX_BUILD_TOP env var to conditionnally disable sleep features inside the - # sandbox. Oddly, bazel_6 does not need that patch :-/. + # sandbox. # # If you want to investigate the sandbox profile path, # IORegisterForSystemPower can be allowed with diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/nix-hacks.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/nix-hacks.patch index 3c3fc57e0f..07fd098b80 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/nix-hacks.patch +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/nix-hacks.patch @@ -1,25 +1,29 @@ diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java -index 845c8b6aa3..6f07298bd0 100644 +index 4d8c46f8d5..ed311226f0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java -@@ -171,14 +171,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction { +@@ -178,18 +178,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction { + } + } + if (shouldUseCachedRepos(env, handler, repoRoot, rule)) { +- // Make sure marker file is up-to-date; correctly describes the current repository state +- byte[] markerHash = digestWriter.areRepositoryAndMarkerFileConsistent(handler, env); +- if (env.valuesMissing()) { +- return null; +- } +- if (markerHash != null) { // repo exist & up-to-date +- return RepositoryDirectoryValue.builder() +- .setPath(repoRoot) +- .setDigest(markerHash) +- .setExcludeFromVendoring(shouldExcludeRepoFromVendoring(handler, rule)) +- .build(); +- } ++ // Nix hack: Always consider cached dirs as up-to-date ++ return RepositoryDirectoryValue.builder().setPath(repoRoot).setDigest(digestWriter.writeMarkerFile()).build(); + } - DigestWriter digestWriter = new DigestWriter(directories, repositoryName, rule); - if (shouldUseCachedRepos(env, handler, repoRoot, rule)) { -- // Make sure marker file is up-to-date; correctly describes the current repository state -- byte[] markerHash = digestWriter.areRepositoryAndMarkerFileConsistent(handler, env); -- if (env.valuesMissing()) { -- return null; -- } -- if (markerHash != null) { -- return RepositoryDirectoryValue.builder().setPath(repoRoot).setDigest(markerHash).build(); -- } -+ // Nix hack: Always consider cached dirs as up-to-date -+ return RepositoryDirectoryValue.builder().setPath(repoRoot).setDigest(digestWriter.writeMarkerFile()).build(); - } - - /* At this point: This is a force fetch, a local repository, OR The repository cache is old or -@@ -512,11 +506,12 @@ public final class RepositoryDelegatorFunction implements SkyFunction { + /* At this point: This is a force fetch, a local repository, OR The repository cache is old or +@@ -610,11 +600,12 @@ public final class RepositoryDelegatorFunction implements SkyFunction { builder.append(escape(key)).append(" ").append(escape(value)).append("\n"); } String content = builder.toString(); diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.MODULE.bazel.lock b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.MODULE.bazel.lock index 6ceb818302..4112726ac2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.MODULE.bazel.lock +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.MODULE.bazel.lock @@ -1,5 +1,5 @@ { - "lockFileVersion": 3, + "lockFileVersion": 6, "moduleFileHash": "80605390be5478a274618e3f8fd7c7a7e1ce3036e086e1e1593ceba1b132b7f2", "flags": { "cmdRegistries": [ @@ -13,7 +13,7 @@ "compatibilityMode": "ERROR" }, "localOverrideHashes": { - "bazel_tools": "922ea6752dc9105de5af957f7a99a6933c0a6a712d23df6aad16a9c399f7e787" + "bazel_tools": "1ae69322ac3823527337acf02016e8ee95813d8d356f47060255b8956fa642f0" }, "moduleDepGraph": { "": { @@ -48,10 +48,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_proto~5.3.0-21.7", "urls": [ "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz" ], @@ -114,10 +113,10 @@ ], "deps": { "bazel_skylib": "bazel_skylib@1.3.0", - "rules_python": "rules_python@0.10.2", + "rules_python": "rules_python@0.22.1", "rules_cc": "rules_cc@0.0.9", "rules_proto": "rules_proto@5.3.0-21.7", - "rules_java": "rules_java@7.1.0", + "rules_java": "rules_java@7.4.0", "rules_pkg": "rules_pkg@0.7.0", "com_google_abseil": "abseil-cpp@20211102.0", "zlib": "zlib@1.3", @@ -128,10 +127,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "protobuf~21.7", "urls": [ "https://github.com/protocolbuffers/protobuf/releases/download/v21.7/protobuf-all-21.7.zip" ], @@ -162,10 +160,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "zlib~1.3", "urls": [ "https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.gz" ], @@ -196,7 +193,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 17, + "line": 18, "column": 29 }, "imports": { @@ -214,7 +211,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 21, + "line": 22, "column": 32 }, "imports": { @@ -231,7 +228,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 24, + "line": 25, "column": 32 }, "imports": { @@ -253,7 +250,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 35, + "line": 36, "column": 39 }, "imports": { @@ -270,7 +267,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 39, + "line": 40, "column": 48 }, "imports": { @@ -287,7 +284,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 42, + "line": 43, "column": 42 }, "imports": { @@ -298,14 +295,32 @@ "tags": [], "hasDevUseExtension": false, "hasNonDevUseExtension": true + }, + { + "extensionBzlFile": "@buildozer//:buildozer_binary.bzl", + "extensionName": "buildozer_binary", + "usingModule": "bazel_tools@_", + "location": { + "file": "@@bazel_tools//:MODULE.bazel", + "line": 47, + "column": 33 + }, + "imports": { + "buildozer_binary": "buildozer_binary" + }, + "devImports": [], + "tags": [], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true } ], "deps": { "rules_cc": "rules_cc@0.0.9", - "rules_java": "rules_java@7.1.0", + "rules_java": "rules_java@7.4.0", "rules_license": "rules_license@0.0.7", "rules_proto": "rules_proto@5.3.0-21.7", - "rules_python": "rules_python@0.10.2", + "rules_python": "rules_python@0.22.1", + "buildozer": "buildozer@6.4.0.2", "platforms": "platforms@0.0.7", "com_google_protobuf": "protobuf@21.7", "zlib": "zlib@1.3", @@ -343,10 +358,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "bazel_skylib~1.3.0", "urls": [ "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz" ], @@ -391,10 +405,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_cc~0.0.9", "urls": [ "https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz" ], @@ -407,10 +420,10 @@ } } }, - "rules_python@0.10.2": { + "rules_python@0.22.1": { "name": "rules_python", - "version": "0.10.2", - "key": "rules_python@0.10.2", + "version": "0.22.1", + "key": "rules_python@0.22.1", "repoName": "rules_python", "executionPlatformsToRegister": [], "toolchainsToRegister": [ @@ -418,24 +431,72 @@ ], "extensionUsages": [ { - "extensionBzlFile": "@rules_python//python:extensions.bzl", - "extensionName": "pip_install", - "usingModule": "rules_python@0.10.2", + "extensionBzlFile": "@rules_python//python/extensions/private:internal_deps.bzl", + "extensionName": "internal_deps", + "usingModule": "rules_python@0.22.1", "location": { - "file": "https://bcr.bazel.build/modules/rules_python/0.10.2/MODULE.bazel", - "line": 7, - "column": 28 + "file": "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel", + "line": 14, + "column": 30 }, "imports": { + "pypi__build": "pypi__build", "pypi__click": "pypi__click", "pypi__colorama": "pypi__colorama", + "pypi__importlib_metadata": "pypi__importlib_metadata", "pypi__installer": "pypi__installer", + "pypi__more_itertools": "pypi__more_itertools", + "pypi__packaging": "pypi__packaging", "pypi__pep517": "pypi__pep517", "pypi__pip": "pypi__pip", "pypi__pip_tools": "pypi__pip_tools", "pypi__setuptools": "pypi__setuptools", "pypi__tomli": "pypi__tomli", - "pypi__wheel": "pypi__wheel" + "pypi__wheel": "pypi__wheel", + "pypi__zipp": "pypi__zipp", + "pypi__coverage_cp310_aarch64-apple-darwin": "pypi__coverage_cp310_aarch64-apple-darwin", + "pypi__coverage_cp310_aarch64-unknown-linux-gnu": "pypi__coverage_cp310_aarch64-unknown-linux-gnu", + "pypi__coverage_cp310_x86_64-apple-darwin": "pypi__coverage_cp310_x86_64-apple-darwin", + "pypi__coverage_cp310_x86_64-unknown-linux-gnu": "pypi__coverage_cp310_x86_64-unknown-linux-gnu", + "pypi__coverage_cp311_aarch64-unknown-linux-gnu": "pypi__coverage_cp311_aarch64-unknown-linux-gnu", + "pypi__coverage_cp311_x86_64-apple-darwin": "pypi__coverage_cp311_x86_64-apple-darwin", + "pypi__coverage_cp311_x86_64-unknown-linux-gnu": "pypi__coverage_cp311_x86_64-unknown-linux-gnu", + "pypi__coverage_cp38_aarch64-apple-darwin": "pypi__coverage_cp38_aarch64-apple-darwin", + "pypi__coverage_cp38_aarch64-unknown-linux-gnu": "pypi__coverage_cp38_aarch64-unknown-linux-gnu", + "pypi__coverage_cp38_x86_64-apple-darwin": "pypi__coverage_cp38_x86_64-apple-darwin", + "pypi__coverage_cp38_x86_64-unknown-linux-gnu": "pypi__coverage_cp38_x86_64-unknown-linux-gnu", + "pypi__coverage_cp39_aarch64-apple-darwin": "pypi__coverage_cp39_aarch64-apple-darwin", + "pypi__coverage_cp39_aarch64-unknown-linux-gnu": "pypi__coverage_cp39_aarch64-unknown-linux-gnu", + "pypi__coverage_cp39_x86_64-apple-darwin": "pypi__coverage_cp39_x86_64-apple-darwin", + "pypi__coverage_cp39_x86_64-unknown-linux-gnu": "pypi__coverage_cp39_x86_64-unknown-linux-gnu" + }, + "devImports": [], + "tags": [ + { + "tagName": "install", + "attributeValues": {}, + "devDependency": false, + "location": { + "file": "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel", + "line": 15, + "column": 22 + } + } + ], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true + }, + { + "extensionBzlFile": "@rules_python//python/extensions:python.bzl", + "extensionName": "python", + "usingModule": "rules_python@0.22.1", + "location": { + "file": "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel", + "line": 50, + "column": 23 + }, + "imports": { + "pythons_hub": "pythons_hub" }, "devImports": [], "tags": [], @@ -444,30 +505,33 @@ } ], "deps": { + "platforms": "platforms@0.0.7", + "bazel_skylib": "bazel_skylib@1.3.0", + "rules_proto": "rules_proto@5.3.0-21.7", + "com_google_protobuf": "protobuf@21.7", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.10.2", "urls": [ - "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.10.2.tar.gz" + "https://github.com/bazelbuild/rules_python/releases/download/0.22.1/rules_python-0.22.1.tar.gz" ], - "integrity": "sha256-o6bpn0l74In4HsCCiC5AJGv9Q19S9OgvN+iUSbBFc/Y=", - "strip_prefix": "rules_python-0.10.2", + "integrity": "sha256-pWQP3dS+sD6MH95e1xYMC6a9R359BIZhwwwGk2om/WM=", + "strip_prefix": "rules_python-0.22.1", "remote_patches": { - "https://bcr.bazel.build/modules/rules_python/0.10.2/patches/module_dot_bazel.patch": "sha256-TScILAmXmmMtjJIwhLrgNZgqGPs6G3OAzXaLXLDNFrA=" + "https://bcr.bazel.build/modules/rules_python/0.22.1/patches/module_dot_bazel_version.patch": "sha256-3+VLDH9gYDzNI4eOW7mABC/LKxh1xqF6NhacLbNTucs=" }, - "remote_patch_strip": 0 + "remote_patch_strip": 1 } } }, - "rules_java@7.1.0": { + "rules_java@7.4.0": { "name": "rules_java", - "version": "7.1.0", - "key": "rules_java@7.1.0", + "version": "7.4.0", + "key": "rules_java@7.4.0", "repoName": "rules_java", "executionPlatformsToRegister": [], "toolchainsToRegister": [ @@ -500,9 +564,9 @@ { "extensionBzlFile": "@rules_java//java:extensions.bzl", "extensionName": "toolchains", - "usingModule": "rules_java@7.1.0", + "usingModule": "rules_java@7.4.0", "location": { - "file": "https://bcr.bazel.build/modules/rules_java/7.1.0/MODULE.bazel", + "file": "https://bcr.bazel.build/modules/rules_java/7.4.0/MODULE.bazel", "line": 19, "column": 27 }, @@ -551,14 +615,13 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0", "urls": [ - "https://github.com/bazelbuild/rules_java/releases/download/7.1.0/rules_java-7.1.0.tar.gz" + "https://github.com/bazelbuild/rules_java/releases/download/7.4.0/rules_java-7.4.0.tar.gz" ], - "integrity": "sha256-o3pOX2OrgnFuXdau75iO2EYcegC46TYnImKJn1h81OE=", + "integrity": "sha256-l27wi0nJKXQfIBeQ5Z44B8cq2B9CjIvJU82+/1/tFes=", "strip_prefix": "", "remote_patches": {}, "remote_patch_strip": 0 @@ -574,17 +637,16 @@ "toolchainsToRegister": [], "extensionUsages": [], "deps": { - "rules_python": "rules_python@0.10.2", + "rules_python": "rules_python@0.22.1", "bazel_skylib": "bazel_skylib@1.3.0", "rules_license": "rules_license@0.0.7", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_pkg~0.7.0", "urls": [ "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz" ], @@ -612,10 +674,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "abseil-cpp~20211102.0", "urls": [ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" ], @@ -646,10 +707,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "upb~0.0.0-20220923-a547704", "urls": [ "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz" ], @@ -688,7 +748,7 @@ "hasNonDevUseExtension": true }, { - "extensionBzlFile": ":extensions.bzl", + "extensionBzlFile": "@rules_jvm_external//:extensions.bzl", "extensionName": "maven", "usingModule": "rules_jvm_external@4.4.2", "location": { @@ -733,10 +793,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_jvm_external~4.4.2", "urls": [ "https://github.com/bazelbuild/rules_jvm_external/archive/refs/tags/4.4.2.zip" ], @@ -763,10 +822,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "googletest~1.11.0", "urls": [ "https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz" ], @@ -793,10 +851,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "platforms", "urls": [ "https://github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz" ], @@ -820,10 +877,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_license~0.0.7", "urls": [ "https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz" ], @@ -834,6 +890,72 @@ } } }, + "buildozer@6.4.0.2": { + "name": "buildozer", + "version": "6.4.0.2", + "key": "buildozer@6.4.0.2", + "repoName": "buildozer", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [ + { + "extensionBzlFile": "@buildozer//:buildozer_binary.bzl", + "extensionName": "buildozer_binary", + "usingModule": "buildozer@6.4.0.2", + "location": { + "file": "https://bcr.bazel.build/modules/buildozer/6.4.0.2/MODULE.bazel", + "line": 7, + "column": 33 + }, + "imports": { + "buildozer_binary": "buildozer_binary" + }, + "devImports": [], + "tags": [ + { + "tagName": "buildozer", + "attributeValues": { + "sha256": { + "darwin-amd64": "d29e347ecd6b5673d72cb1a8de05bf1b06178dd229ff5eb67fad5100c840cc8e", + "darwin-arm64": "9b9e71bdbec5e7223871e913b65d12f6d8fa026684daf991f00e52ed36a6978d", + "linux-amd64": "8dfd6345da4e9042daa738d7fdf34f699c5dfce4632f7207956fceedd8494119", + "linux-arm64": "6559558fded658c8fa7432a9d011f7c4dcbac6b738feae73d2d5c352e5f605fa", + "windows-amd64": "e7f05bf847f7c3689dd28926460ce6e1097ae97380ac8e6ae7147b7b706ba19b" + }, + "version": "6.4.0" + }, + "devDependency": false, + "location": { + "file": "https://bcr.bazel.build/modules/buildozer/6.4.0.2/MODULE.bazel", + "line": 8, + "column": 27 + } + } + ], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true + } + ], + "deps": { + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/fmeum/buildozer/releases/download/v6.4.0.2/buildozer-v6.4.0.2.tar.gz" + ], + "integrity": "sha256-k7tFKQMR2AygxpmZfH0yEPnQmF3efFgD9rBPkj+Yz/8=", + "strip_prefix": "buildozer-6.4.0.2", + "remote_patches": { + "https://bcr.bazel.build/modules/buildozer/6.4.0.2/patches/module_dot_bazel_version.patch": "sha256-gKANF2HMilj7bWmuXs4lbBIAAansuWC4IhWGB/CerjU=" + }, + "remote_patch_strip": 1 + } + } + }, "apple_support@1.5.0": { "name": "apple_support", "version": "1.5.0", @@ -870,10 +992,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "apple_support~1.5.0", "urls": [ "https://github.com/bazelbuild/apple_support/releases/download/1.5.0/apple_support.1.5.0.tar.gz" ], @@ -894,15 +1015,14 @@ "extensionUsages": [], "deps": { "bazel_skylib": "bazel_skylib@1.3.0", - "rules_java": "rules_java@7.1.0", + "rules_java": "rules_java@7.4.0", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "stardoc~0.5.1", "urls": [ "https://github.com/bazelbuild/stardoc/releases/download/0.5.1/stardoc-0.5.1.tar.gz" ], @@ -917,30 +1037,27 @@ } }, "moduleExtensions": { - "@@apple_support~1.5.0//crosstool:setup.bzl%apple_cc_configure_extension": { + "@@apple_support~//crosstool:setup.bzl%apple_cc_configure_extension": { "general": { "bzlTransitiveDigest": "pMLFCYaRPkgXPQ8vtuNkMfiHfPmRBy6QJfnid4sWfv0=", - "accumulatedFileDigests": {}, + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "local_config_apple_cc": { - "bzlFile": "@@apple_support~1.5.0//crosstool:setup.bzl", + "bzlFile": "@@apple_support~//crosstool:setup.bzl", "ruleClassName": "_apple_cc_autoconf", - "attributes": { - "name": "apple_support~1.5.0~apple_cc_configure_extension~local_config_apple_cc" - } + "attributes": {} }, "local_config_apple_cc_toolchains": { - "bzlFile": "@@apple_support~1.5.0//crosstool:setup.bzl", + "bzlFile": "@@apple_support~//crosstool:setup.bzl", "ruleClassName": "_apple_cc_autoconf_toolchains", - "attributes": { - "name": "apple_support~1.5.0~apple_cc_configure_extension~local_config_apple_cc_toolchains" - } + "attributes": {} } }, "recordedRepoMappingEntries": [ [ - "apple_support~1.5.0", + "apple_support~", "bazel_tools", "bazel_tools" ] @@ -949,15 +1066,15 @@ }, "@@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": { "general": { - "bzlTransitiveDigest": "4x/FXzwoadac6uV9ItZ4eGOyCculGHHrKUhLFNWo3lA=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "S0n86BFe4SJ3lRaZiRA5D46oH52UO2hP1T50t/zldOw=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "android_tools": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "bazel_tools~remote_android_tools_extensions~android_tools", "sha256": "2b661a761a735b41c41b3a78089f4fc1982626c76ddb944604ae3ff8c545d3c2", "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.30.0.tar" } @@ -966,7 +1083,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_jar", "attributes": { - "name": "bazel_tools~remote_android_tools_extensions~android_gmaven_r8", "sha256": "57a696749695a09381a87bc2f08c3a8ed06a717a5caa3ef878a3077e0d3af19d", "url": "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar" } @@ -977,23 +1093,20 @@ }, "@@bazel_tools//tools/cpp:cc_configure.bzl%cc_configure_extension": { "general": { - "bzlTransitiveDigest": "mcsWHq3xORJexV5/4eCvNOLxFOQKV6eli3fkr+tEaqE=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "PHpT2yqMGms2U4L3E/aZ+WcQalmZWm+ILdP3yiLsDhA=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "local_config_cc": { "bzlFile": "@@bazel_tools//tools/cpp:cc_configure.bzl", "ruleClassName": "cc_autoconf", - "attributes": { - "name": "bazel_tools~cc_configure_extension~local_config_cc" - } + "attributes": {} }, "local_config_cc_toolchains": { "bzlFile": "@@bazel_tools//tools/cpp:cc_configure.bzl", "ruleClassName": "cc_autoconf_toolchains", - "attributes": { - "name": "bazel_tools~cc_configure_extension~local_config_cc_toolchains" - } + "attributes": {} } }, "recordedRepoMappingEntries": [ @@ -1008,14 +1121,14 @@ "@@bazel_tools//tools/osx:xcode_configure.bzl%xcode_configure_extension": { "general": { "bzlTransitiveDigest": "Qh2bWTU6QW6wkrd87qrU4YeY+SG37Nvw3A0PR4Y0L2Y=", - "accumulatedFileDigests": {}, + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "local_config_xcode": { "bzlFile": "@@bazel_tools//tools/osx:xcode_configure.bzl", "ruleClassName": "xcode_autoconf", "attributes": { - "name": "bazel_tools~xcode_configure_extension~local_config_xcode", "xcode_locator": "@bazel_tools//tools/osx:xcode_locator.m", "remote_xcode": "" } @@ -1027,15 +1140,14 @@ "@@bazel_tools//tools/sh:sh_configure.bzl%sh_configure_extension": { "general": { "bzlTransitiveDigest": "hp4NgmNjEg5+xgvzfh6L83bt9/aiiWETuNpwNuF1MSU=", - "accumulatedFileDigests": {}, + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "local_config_sh": { "bzlFile": "@@bazel_tools//tools/sh:sh_configure.bzl", "ruleClassName": "sh_config", - "attributes": { - "name": "bazel_tools~sh_configure_extension~local_config_sh" - } + "attributes": {} } }, "recordedRepoMappingEntries": [] @@ -1043,15 +1155,15 @@ }, "@@bazel_tools//tools/test:extensions.bzl%remote_coverage_tools_extension": { "general": { - "bzlTransitiveDigest": "y48q5zUu2oMiYv7yUyi7rFB0wt14eqiF/RQcWT6vP7I=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "l5mcjH2gWmbmIycx97bzI2stD0Q0M5gpDc0aLOHKIm8=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "remote_coverage_tools": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "bazel_tools~remote_coverage_tools_extension~remote_coverage_tools", "sha256": "7006375f6756819b7013ca875eab70a541cf7d89142d9c511ed78ea4fefa38af", "urls": [ "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.6.zip" @@ -1062,49 +1174,70 @@ "recordedRepoMappingEntries": [] } }, - "@@rules_java~7.1.0//java:extensions.bzl%toolchains": { + "@@buildozer~//:buildozer_binary.bzl%buildozer_binary": { "general": { - "bzlTransitiveDigest": "D02GmifxnV/IhYgspsJMDZ/aE8HxAjXgek5gi6FSto4=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "EleDU/FQ1+e/RgkW3aIDmdaxZEthvoWQhsqFTxiSgMI=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "buildozer_binary": { + "bzlFile": "@@buildozer~//private:buildozer_binary.bzl", + "ruleClassName": "_buildozer_binary_repo", + "attributes": { + "sha256": { + "darwin-amd64": "d29e347ecd6b5673d72cb1a8de05bf1b06178dd229ff5eb67fad5100c840cc8e", + "darwin-arm64": "9b9e71bdbec5e7223871e913b65d12f6d8fa026684daf991f00e52ed36a6978d", + "linux-amd64": "8dfd6345da4e9042daa738d7fdf34f699c5dfce4632f7207956fceedd8494119", + "linux-arm64": "6559558fded658c8fa7432a9d011f7c4dcbac6b738feae73d2d5c352e5f605fa", + "windows-amd64": "e7f05bf847f7c3689dd28926460ce6e1097ae97380ac8e6ae7147b7b706ba19b" + }, + "version": "6.4.0" + } + } + }, + "recordedRepoMappingEntries": [] + } + }, + "@@rules_java~//java:extensions.bzl%toolchains": { + "general": { + "bzlTransitiveDigest": "tJHbmWnq7m+9eUBnUdv7jZziQ26FmcGL9C5/hU3Q9UQ=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "remotejdk21_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux//:jdk\",\n)\n" } }, "remotejdk17_linux_s390x_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_s390x_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\n" } }, "remotejdk17_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos//:jdk\",\n)\n" } }, "remotejdk21_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\n" } }, "remotejdk17_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\n" } }, @@ -1112,21 +1245,19 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "2a7a99a3ea263dbd8d32a67d1e6e363ba8b25c645c826f5e167a02bbafaff1fa", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-macosx_aarch64", + "sha256": "e8260516de8b60661422a725f1df2c36ef888f6fb35393566b00e7325db3d04e", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_aarch64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_aarch64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_aarch64.tar.gz" ] } }, "remotejdk17_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux//:jdk\",\n)\n" } }, @@ -1134,7 +1265,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "314b04568ec0ae9b36ba03c9cbd42adc9e1265f74678923b19297d66eb84dcca", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64", @@ -1148,11 +1278,10 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools_windows", - "sha256": "c5c70c214a350f12cbf52da8270fa43ba629b795f3dd328028a38f8f0d39c2a1", + "sha256": "fe2f88169696d6c6fc6e90ba61bb46be7d0ae3693cbafdf336041bf56679e8d1", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools_windows-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools_windows-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_windows-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_windows-v13.4.zip" ] } }, @@ -1160,7 +1289,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "43408193ce2fa0862819495b5ae8541085b95660153f2adcf91a52d3a1710e83", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-win_x64", @@ -1171,10 +1299,9 @@ } }, "remotejdk11_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win//:jdk\",\n)\n" } }, @@ -1182,7 +1309,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "54174439f2b3fddd11f1048c397fe7bb45d4c9d66d452d6889b013d04d21c4de", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_aarch64", @@ -1196,7 +1322,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "b9482f2304a1a68a614dfacddcf29569a72f0fac32e6c74f83dc1b9a157b8340", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_x64", @@ -1207,18 +1332,16 @@ } }, "remotejdk11_linux_s390x_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_s390x_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\n" } }, "remotejdk11_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux//:jdk\",\n)\n" } }, @@ -1226,7 +1349,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "bcaab11cfe586fae7583c6d9d311c64384354fb2638eb9a012eca4c3f1a1d9fd", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_x64", @@ -1240,7 +1362,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_win_arm64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", "strip_prefix": "jdk-11.0.13+8", @@ -1253,7 +1374,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "640453e8afe8ffe0fb4dceb4535fb50db9c283c64665eebb0ba68b19e65f4b1f", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_x64", @@ -1267,29 +1387,26 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "9639b87db586d0c89f7a9892ae47f421e442c64b97baebdff31788fbe23265bd", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-macosx_x64", + "sha256": "3ad8fe288eb57d975c2786ae453a036aa46e47ab2ac3d81538ebae2a54d3c025", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-macosx_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-macosx_x64.tar.gz" ] } }, "remotejdk21_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos//:jdk\",\n)\n" } }, "remotejdk17_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\n" } }, @@ -1297,7 +1414,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "192f2afca57701de6ec496234f7e45d971bf623ff66b8ee4a5c81582054e5637", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_x64", @@ -1308,18 +1424,16 @@ } }, "remotejdk11_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\n" } }, "remotejdk11_linux_ppc64le_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_ppc64le_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\n" } }, @@ -1327,13 +1441,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "0c0eadfbdc47a7ca64aeab51b9c061f71b6e4d25d2d87674512e9b6387e9e3a6", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-linux_x64", + "sha256": "5ad730fbee6bb49bfff10bf39e84392e728d89103d3474a7e5def0fd134b300a", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_x64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_x64.tar.gz" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_x64.tar.gz" ] } }, @@ -1341,11 +1454,10 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools_linux", - "sha256": "d134da9b04c9023fb6e56a5d4bffccee73f7bc9572ddc4e747778dacccd7a5a7", + "sha256": "ba10f09a138cf185d04cbc807d67a3da42ab13d618c5d1ce20d776e199c33a39", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools_linux-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools_linux-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_linux-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_linux-v13.4.zip" ] } }, @@ -1353,13 +1465,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "e9959d500a0d9a7694ac243baf657761479da132f0f94720cbffd092150bd802", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-win_x64", + "sha256": "f7cc15ca17295e69c907402dfe8db240db446e75d3b150da7bf67243cded93de", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-win_x64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-win_x64.zip", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-win_x64.zip" + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-win_x64.zip" ] } }, @@ -1367,21 +1478,19 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", - "sha256": "1fb64b8036c5d463d8ab59af06bf5b6b006811e6012e3b0eb6bccf57f1c55835", - "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-linux_aarch64", + "sha256": "ce7df1af5d44a9f455617c4b8891443fbe3e4b269c777d8b82ed66f77167cfe0", + "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_aarch64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu21.28.85-ca-jdk21.0.0-linux_aarch64.tar.gz" + "https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_aarch64.tar.gz", + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu21.32.17-ca-jdk21.0.2-linux_aarch64.tar.gz" ] } }, "remotejdk11_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\n" } }, @@ -1389,7 +1498,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_s390x", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b", "strip_prefix": "jdk-11.0.15+10", @@ -1403,7 +1511,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "6531cef61e416d5a7b691555c8cf2bdff689201b8a001ff45ab6740062b44313", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64", @@ -1414,10 +1521,9 @@ } }, "remotejdk17_win_arm64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_win_arm64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\n" } }, @@ -1425,7 +1531,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a34b404f87a08a61148b38e1416d837189e1df7a040d949e743633daf4695a3c", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_x64", @@ -1436,18 +1541,16 @@ } }, "remotejdk11_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos//:jdk\",\n)\n" } }, "remotejdk17_linux_ppc64le_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_ppc64le_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\n" } }, @@ -1455,7 +1558,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_win_arm64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "6802c99eae0d788e21f52d03cab2e2b3bf42bc334ca03cbf19f71eb70ee19f85", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_aarch64", @@ -1469,11 +1571,10 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools_darwin_arm64", - "sha256": "dab5bb87ec43e980faea6e1cec14bafb217b8e2f5346f53aa784fd715929a930", + "sha256": "076a7e198ad077f8c7d997986ef5102427fae6bbfce7a7852d2e080ed8767528", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools_darwin_arm64-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools_darwin_arm64-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_arm64-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_darwin_arm64-v13.4.zip" ] } }, @@ -1481,7 +1582,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_ppc64le", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "00a4c07603d0218cd678461b5b3b7e25b3253102da4022d31fc35907f21a2efd", "strip_prefix": "jdk-17.0.8.1+1", @@ -1492,26 +1592,23 @@ } }, "remotejdk21_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\n" } }, "remotejdk11_win_arm64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_win_arm64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\n" } }, "local_jdk": { - "bzlFile": "@@rules_java~7.1.0//toolchains:local_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:local_java_repository.bzl", "ruleClassName": "_local_java_repository_rule", "attributes": { - "name": "rules_java~7.1.0~toolchains~local_jdk", "java_home": "", "version": "", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = {RUNTIME_VERSION},\n)\n" @@ -1521,11 +1618,10 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools_darwin_x86_64", - "sha256": "0db40d8505a2b65ef0ed46e4256757807db8162f7acff16225be57c1d5726dbc", + "sha256": "4523aec4d09c587091a2dae6f5c9bc6922c220f3b6030e5aba9c8f015913cc65", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools_darwin_x86_64-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools_darwin_x86_64-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_x86_64-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools_darwin_x86_64-v13.4.zip" ] } }, @@ -1533,11 +1629,10 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools", - "sha256": "286bdbbd66e616fc4ed3f90101418729a73baa7e8c23a98ffbef558f74c0ad14", + "sha256": "e025fd260ac39b47c111f5212d64ec0d00d85dec16e49368aae82fc626a940cf", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools-v13.4.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.4/java_tools-v13.4.zip" ] } }, @@ -1545,7 +1640,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_s390x", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "ffacba69c6843d7ca70d572489d6cc7ab7ae52c60f0852cedf4cf0d248b6fc37", "strip_prefix": "jdk-17.0.8.1+1", @@ -1556,10 +1650,9 @@ } }, "remotejdk17_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win//:jdk\",\n)\n" } }, @@ -1567,7 +1660,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_ppc64le", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f", "strip_prefix": "jdk-11.0.15+10", @@ -1581,7 +1673,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "7632bc29f8a4b7d492b93f3bc75a7b61630894db85d136456035ab2a24d38885", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_aarch64", @@ -1592,41 +1683,40 @@ } }, "remotejdk21_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\n" } } }, "recordedRepoMappingEntries": [ [ - "rules_java~7.1.0", + "rules_java~", "bazel_tools", "bazel_tools" ], [ - "rules_java~7.1.0", + "rules_java~", "remote_java_tools", - "rules_java~7.1.0~toolchains~remote_java_tools" + "rules_java~~toolchains~remote_java_tools" ] ] } }, - "@@rules_jvm_external~4.4.2//:extensions.bzl%maven": { + "@@rules_jvm_external~//:extensions.bzl%maven": { "general": { - "bzlTransitiveDigest": "vfN15bfa5VcQIt0lp3UZTznETp3NF8xw9pHYN+3Ma6A=", - "accumulatedFileDigests": { - "@@rules_jvm_external~4.4.2//:rules_jvm_external_deps_install.json": "10442a5ae27d9ff4c2003e5ab71643bf0d8b48dcf968b4173fa274c3232a8c06" + "bzlTransitiveDigest": "v8HssW6WP6B8s0BwuAMJuQCz6cQ9jlhOfx4dKBtPYB4=", + "recordedFileInputs": { + "@@rules_jvm_external~//rules_jvm_external_deps_install.json": "10442a5ae27d9ff4c2003e5ab71643bf0d8b48dcf968b4173fa274c3232a8c06" }, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "org_slf4j_slf4j_api_1_7_30": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_slf4j_slf4j_api_1_7_30", "sha256": "cdba07964d1bb40a0761485c6b1e8c2f8fd9eb1d19c53928ac0d7f9510105c57", "urls": [ "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar", @@ -1639,7 +1729,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_api_grpc_proto_google_common_protos_2_0_1", "sha256": "5ce71656118618731e34a5d4c61aa3a031be23446dc7de8b5a5e77b66ebcd6ef", "urls": [ "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar", @@ -1652,7 +1741,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_api_gax_1_60_0", "sha256": "02f37d4ff1a7b8d71dff8064cf9568aa4f4b61bcc4485085d16130f32afa5a79", "urls": [ "https://repo1.maven.org/maven2/com/google/api/gax/1.60.0/gax-1.60.0.jar", @@ -1665,7 +1753,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_guava_failureaccess_1_0_1", "sha256": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26", "urls": [ "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar", @@ -1678,7 +1765,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~commons_logging_commons_logging_1_2", "sha256": "daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636", "urls": [ "https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar", @@ -1691,7 +1777,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_http_client_google_http_client_appengine_1_38_0", "sha256": "f97b495fd97ac3a3d59099eb2b55025f4948230da15a076f189b9cff37c6b4d2", "urls": [ "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar", @@ -1704,7 +1789,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_cloud_google_cloud_storage_1_113_4", "sha256": "796833e9bdab80c40bbc820e65087eb8f28c6bfbca194d2e3e00d98cb5bc55d6", "urls": [ "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar", @@ -1717,7 +1801,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_grpc_grpc_context_1_33_1", "sha256": "99b8aea2b614fe0e61c3676e681259dc43c2de7f64620998e1a8435eb2976496", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar", @@ -1730,7 +1813,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_api_grpc_proto_google_iam_v1_1_0_3", "sha256": "64cee7383a97e846da8d8e160e6c8fe30561e507260552c59e6ccfc81301fdc8", "urls": [ "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar", @@ -1743,7 +1825,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_api_api_common_1_10_1", "sha256": "2a033f24bb620383eda440ad307cb8077cfec1c7eadc684d65216123a1b9613a", "urls": [ "https://repo1.maven.org/maven2/com/google/api/api-common/1.10.1/api-common-1.10.1.jar", @@ -1756,7 +1837,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_auth_google_auth_library_oauth2_http_0_22_0", "sha256": "1722d895c42dc42ea1d1f392ddbec1fbb28f7a979022c3a6c29acc39cc777ad1", "urls": [ "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar", @@ -1769,7 +1849,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_typesafe_netty_netty_reactive_streams_2_0_5", "sha256": "f949849fc8ee75fde468ba3a35df2e04577fa31a2940b83b2a7dc9d14dac13d6", "urls": [ "https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar", @@ -1782,7 +1861,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_typesafe_netty_netty_reactive_streams_http_2_0_5", "sha256": "b39224751ad936758176e9d994230380ade5e9079e7c8ad778e3995779bcf303", "urls": [ "https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar", @@ -1795,7 +1873,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~javax_annotation_javax_annotation_api_1_3_2", "sha256": "e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b", "urls": [ "https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar", @@ -1808,7 +1885,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_j2objc_j2objc_annotations_1_3", "sha256": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b", "urls": [ "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar", @@ -1821,7 +1897,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_metrics_spi_2_17_183", "sha256": "08a11dc8c4ba464beafbcc7ac05b8c724c1ccb93da99482e82a68540ac704e4a", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar", @@ -1834,7 +1909,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_reactivestreams_reactive_streams_1_0_3", "sha256": "1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865", "urls": [ "https://repo1.maven.org/maven2/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar", @@ -1847,7 +1921,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_http_client_google_http_client_jackson2_1_38_0", "sha256": "e6504a82425fcc2168a4ca4175138ddcc085168daed8cdedb86d8f6fdc296e1e", "urls": [ "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar", @@ -1860,7 +1933,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_transport_4_1_72_Final", "sha256": "c5fb68e9a65b6e8a516adfcb9fa323479ee7b4d9449d8a529d2ecab3d3711d5a", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar", @@ -1873,7 +1945,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_codec_http2_4_1_72_Final", "sha256": "c89a70500f59e8563e720aaa808263a514bd9e2bd91ba84eab8c2ccb45f234b2", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar", @@ -1886,7 +1957,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_opencensus_opencensus_api_0_24_0", "sha256": "f561b1cc2673844288e596ddf5bb6596868a8472fd2cb8993953fc5c034b2352", "urls": [ "https://repo1.maven.org/maven2/io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar", @@ -1896,10 +1966,9 @@ } }, "rules_jvm_external_deps": { - "bzlFile": "@@rules_jvm_external~4.4.2//:coursier.bzl", + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", "ruleClassName": "pinned_coursier_fetch", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~rules_jvm_external_deps", "repositories": [ "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" ], @@ -1913,7 +1982,7 @@ "fetch_sources": true, "fetch_javadoc": false, "generate_compat_repositories": false, - "maven_install_json": "@@rules_jvm_external~4.4.2//:rules_jvm_external_deps_install.json", + "maven_install_json": "@@rules_jvm_external~//:rules_jvm_external_deps_install.json", "override_targets": {}, "strict_visibility": false, "strict_visibility_value": [ @@ -1934,7 +2003,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_threeten_threetenbp_1_5_0", "sha256": "dcf9c0f940739f2a825cd8626ff27113459a2f6eb18797c7152f93fff69c264f", "urls": [ "https://repo1.maven.org/maven2/org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar", @@ -1947,7 +2015,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_http_client_spi_2_17_183", "sha256": "fe7120f175df9e47ebcc5d946d7f40110faf2ba0a30364f3b935d5b8a5a6c3c6", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar", @@ -1960,7 +2027,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_third_party_jackson_core_2_17_183", "sha256": "1bc27c9960993c20e1ab058012dd1ae04c875eec9f0f08f2b2ca41e578dee9a4", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar", @@ -1973,7 +2039,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_eventstream_eventstream_1_0_1", "sha256": "0c37d8e696117f02c302191b8110b0d0eb20fa412fce34c3a269ec73c16ce822", "urls": [ "https://repo1.maven.org/maven2/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar", @@ -1986,7 +2051,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_oauth_client_google_oauth_client_1_31_1", "sha256": "4ed4e2948251dbda66ce251bd7f3b32cd8570055e5cdb165a3c7aea8f43da0ff", "urls": [ "https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar", @@ -1996,10 +2060,9 @@ } }, "maven": { - "bzlFile": "@@rules_jvm_external~4.4.2//:coursier.bzl", + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", "ruleClassName": "coursier_fetch", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~maven", "repositories": [ "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" ], @@ -2040,7 +2103,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_aws_xml_protocol_2_17_183", "sha256": "566bba05d49256fa6994efd68fa625ae05a62ea45ee74bb9130d20ea20988363", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar", @@ -2053,7 +2115,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_annotations_2_17_183", "sha256": "8e4d72361ca805a0bd8bbd9017cd7ff77c8d170f2dd469c7d52d5653330bb3fd", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar", @@ -2066,7 +2127,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_netty_nio_client_2_17_183", "sha256": "a6d356f364c56d7b90006b0b7e503b8630010993a5587ce42e74b10b8dca2238", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar", @@ -2079,7 +2139,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_auto_value_auto_value_annotations_1_7_4", "sha256": "fedd59b0b4986c342f6ab2d182f2a4ee9fceb2c7e2d5bdc4dc764c92394a23d3", "urls": [ "https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar", @@ -2092,7 +2151,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_transport_native_unix_common_4_1_72_Final", "sha256": "6f8f1cc29b5a234eeee9439a63eb3f03a5994aa540ff555cb0b2c88cefaf6877", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar", @@ -2105,7 +2163,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_opencensus_opencensus_contrib_http_util_0_24_0", "sha256": "7155273bbb1ed3d477ea33cf19d7bbc0b285ff395f43b29ae576722cf247000f", "urls": [ "https://repo1.maven.org/maven2/io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar", @@ -2118,7 +2175,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_fasterxml_jackson_core_jackson_core_2_11_3", "sha256": "78cd0a6b936232e06dd3e38da8a0345348a09cd1ff9c4d844c6ee72c75cfc402", "urls": [ "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar", @@ -2131,7 +2187,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_cloud_google_cloud_core_1_93_10", "sha256": "832d74eca66f4601e162a8460d6f59f50d1d23f93c18b02654423b6b0d67c6ea", "urls": [ "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar", @@ -2144,7 +2199,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_auth_google_auth_library_credentials_0_22_0", "sha256": "42c76031276de5b520909e9faf88c5b3c9a722d69ee9cfdafedb1c52c355dfc5", "urls": [ "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar", @@ -2157,7 +2211,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_guava_guava_30_0_android", "sha256": "3345c82c2cc70a0053e8db9031edc6d71625ef0dea6a2c8f5ebd6cb76d2bf843", "urls": [ "https://repo1.maven.org/maven2/com/google/guava/guava/30.0-android/guava-30.0-android.jar", @@ -2170,7 +2223,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_profiles_2_17_183", "sha256": "78833b32fde3f1c5320373b9ea955c1bbc28f2c904010791c4784e610193ee56", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar", @@ -2183,7 +2235,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_apache_httpcomponents_httpcore_4_4_13", "sha256": "e06e89d40943245fcfa39ec537cdbfce3762aecde8f9c597780d2b00c2b43424", "urls": [ "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar", @@ -2196,7 +2247,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_common_4_1_72_Final", "sha256": "8adb4c291260ceb2859a68c49f0adeed36bf49587608e2b81ecff6aaf06025e9", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar", @@ -2209,7 +2259,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_transport_classes_epoll_4_1_72_Final", "sha256": "e1528a9751c1285aa7beaf3a1eb0597151716426ce38598ac9bc0891209b9e68", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar", @@ -2222,7 +2271,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_cloud_google_cloud_core_http_1_93_10", "sha256": "81ac67c14c7c4244d2b7db2607ad352416aca8d3bb2adf338964e8fea25b1b3c", "urls": [ "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar", @@ -2235,7 +2283,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_utils_2_17_183", "sha256": "7bd849bb5aa71bfdf6b849643736ecab3a7b3f204795804eefe5754104231ec6", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar", @@ -2248,7 +2295,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_apache_commons_commons_lang3_3_8_1", "sha256": "dac807f65b07698ff39b1b07bfef3d87ae3fd46d91bbf8a2bc02b2a831616f68", "urls": [ "https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar", @@ -2261,7 +2307,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_aws_core_2_17_183", "sha256": "bccbdbea689a665a702ff19828662d87fb7fe81529df13f02ef1e4c474ea9f93", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar", @@ -2274,7 +2319,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_api_gax_httpjson_0_77_0", "sha256": "fd4dae47fa016d3b26e8d90b67ddc6c23c4c06e8bcdf085c70310ab7ef324bd6", "urls": [ "https://repo1.maven.org/maven2/com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar", @@ -2284,10 +2328,9 @@ } }, "unpinned_rules_jvm_external_deps": { - "bzlFile": "@@rules_jvm_external~4.4.2//:coursier.bzl", + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", "ruleClassName": "coursier_fetch", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~unpinned_rules_jvm_external_deps", "repositories": [ "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" ], @@ -2310,7 +2353,7 @@ "strict_visibility_value": [ "@@//visibility:private" ], - "maven_install_json": "@@rules_jvm_external~4.4.2//:rules_jvm_external_deps_install.json", + "maven_install_json": "@@rules_jvm_external~//:rules_jvm_external_deps_install.json", "resolve_timeout": 600, "jetify": false, "jetify_include_list": [ @@ -2325,7 +2368,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_regions_2_17_183", "sha256": "d3079395f3ffc07d04ffcce16fca29fb5968197f6e9ea3dbff6be297102b40a5", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar", @@ -2338,7 +2380,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_errorprone_error_prone_annotations_2_4_0", "sha256": "5f2a0648230a662e8be049df308d583d7369f13af683e44ddf5829b6d741a228", "urls": [ "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.jar", @@ -2351,7 +2392,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_handler_4_1_72_Final", "sha256": "9cb6012af7e06361d738ac4e3bdc49a158f8cf87d9dee0f2744056b7d99c28d5", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar", @@ -2364,7 +2404,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_aws_query_protocol_2_17_183", "sha256": "4dace03c76f80f3dec920cb3dedb2a95984c4366ef4fda728660cb90bed74848", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar", @@ -2377,7 +2416,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_codec_http_4_1_72_Final", "sha256": "fa6fec88010bfaf6a7415b5364671b6b18ffb6b35a986ab97b423fd8c3a0174b", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar", @@ -2390,7 +2428,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_resolver_4_1_72_Final", "sha256": "6474598aab7cc9d8d6cfa06c05bd1b19adbf7f8451dbdd73070b33a6c60b1b90", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar", @@ -2403,7 +2440,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_protocol_core_2_17_183", "sha256": "10e7c4faa1f05e2d73055d0390dbd0bb6450e2e6cb85beda051b1e4693c826ce", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar", @@ -2416,7 +2452,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_checkerframework_checker_compat_qual_2_5_5", "sha256": "11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a", "urls": [ "https://repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar", @@ -2429,7 +2464,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_apis_google_api_services_storage_v1_rev20200927_1_30_10", "sha256": "52d26a9d105f8d8a0850807285f307a76cea8f3e0cdb2be4d3b15b1adfa77351", "urls": [ "https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar", @@ -2442,7 +2476,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_api_client_google_api_client_1_30_11", "sha256": "ee6f97865cc7de6c7c80955c3f37372cf3887bd75e4fc06f1058a6b4cd9bf4da", "urls": [ "https://repo1.maven.org/maven2/com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar", @@ -2455,7 +2488,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_s3_2_17_183", "sha256": "ab073b91107a9e4ed9f030314077d137fe627e055ad895fabb036980a050e360", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar", @@ -2468,7 +2500,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_apache_maven_maven_artifact_3_8_6", "sha256": "de22a4c6f54fe31276a823b1bbd3adfd6823529e732f431b5eff0852c2b9252b", "urls": [ "https://repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar", @@ -2481,7 +2512,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_apache_httpcomponents_httpclient_4_5_13", "sha256": "6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743", "urls": [ "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar", @@ -2494,7 +2524,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava", "sha256": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99", "urls": [ "https://repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar", @@ -2507,7 +2536,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_http_client_google_http_client_1_38_0", "sha256": "411f4a42519b6b78bdc0fcfdf74c9edcef0ee97afa4a667abe04045a508d6302", "urls": [ "https://repo1.maven.org/maven2/com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar", @@ -2520,7 +2548,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_apache_client_2_17_183", "sha256": "78ceae502fce6a97bbe5ff8f6a010a52ab7ea3ae66cb1a4122e18185fce45022", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar", @@ -2533,7 +2560,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_arns_2_17_183", "sha256": "659a185e191d66c71de81209490e66abeaccae208ea7b2831a738670823447aa", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar", @@ -2546,7 +2572,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_code_gson_gson_2_9_0", "sha256": "c96d60551331a196dac54b745aa642cd078ef89b6f267146b705f2c2cbef052d", "urls": [ "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar", @@ -2559,7 +2584,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_buffer_4_1_72_Final", "sha256": "568ff7cd9d8e2284ec980730c88924f686642929f8f219a74518b4e64755f3a1", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar", @@ -2572,7 +2596,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_code_findbugs_jsr305_3_0_2", "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", "urls": [ "https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar", @@ -2585,7 +2608,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~commons_codec_commons_codec_1_11", "sha256": "e599d5318e97aa48f42136a2927e6dfa4e8881dff0e6c8e3109ddbbff51d7b7d", "urls": [ "https://repo1.maven.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.jar", @@ -2598,7 +2620,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_auth_2_17_183", "sha256": "8820c6636e5c14efc29399fb5565ce50212b0c1f4ed720a025a2c402d54e0978", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar", @@ -2611,7 +2632,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_json_utils_2_17_183", "sha256": "51ab7f550adc06afcb49f5270cdf690f1bfaaee243abaa5d978095e2a1e4e1a5", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar", @@ -2624,7 +2644,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~org_codehaus_plexus_plexus_utils_3_3_1", "sha256": "4b570fcdbe5a894f249d2eb9b929358a9c88c3e548d227a80010461930222f2a", "urls": [ "https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar", @@ -2637,7 +2656,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_protobuf_protobuf_java_util_3_13_0", "sha256": "d9de66b8c9445905dfa7064f6d5213d47ce88a20d34e21d83c4a94a229e14e62", "urls": [ "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar", @@ -2650,7 +2668,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_codec_4_1_72_Final", "sha256": "5d8591ca271a1e9c224e8de3873aa9936acb581ee0db514e7dc18523df36d16c", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar", @@ -2663,7 +2680,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~com_google_protobuf_protobuf_java_3_13_0", "sha256": "97d5b2758408690c0dc276238707492a0b6a4d71206311b6c442cdc26c5973ff", "urls": [ "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar", @@ -2676,7 +2692,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_tcnative_classes_2_0_46_Final", "sha256": "d3ec888dcc4ac7915bf88b417c5e04fd354f4311032a748a6882df09347eed9a", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar", @@ -2689,7 +2704,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_sdk_core_2_17_183", "sha256": "677e9cc90fdd82c1f40f97b99cb115b13ad6c3f58beeeab1c061af6954d64c77", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar", @@ -2701,29 +2715,29 @@ }, "recordedRepoMappingEntries": [ [ - "rules_jvm_external~4.4.2", + "rules_jvm_external~", "bazel_tools", "bazel_tools" ], [ - "rules_jvm_external~4.4.2", + "rules_jvm_external~", "rules_jvm_external", - "rules_jvm_external~4.4.2" + "rules_jvm_external~" ] ] } }, - "@@rules_jvm_external~4.4.2//:non-module-deps.bzl%non_module_deps": { + "@@rules_jvm_external~//:non-module-deps.bzl%non_module_deps": { "general": { - "bzlTransitiveDigest": "zXwz7xFBNBig3QRyd5WAZU3y/6fZvd6jnP6EkJIutS0=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "DqBh3ObkOvjDFKv8VTy6J2qr7hXsJm9/sES7bha7ftA=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "io_bazel_rules_kotlin": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_jvm_external~4.4.2~non_module_deps~io_bazel_rules_kotlin", "sha256": "946747acdbeae799b085d12b240ec346f775ac65236dfcf18aa0cd7300f6de78", "urls": [ "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.7.0-RC-2/rules_kotlin_release.tgz" @@ -2733,129 +2747,475 @@ }, "recordedRepoMappingEntries": [ [ - "rules_jvm_external~4.4.2", + "rules_jvm_external~", "bazel_tools", "bazel_tools" ] ] } }, - "@@rules_python~0.10.2//python:extensions.bzl%pip_install": { + "@@rules_python~//python/extensions:python.bzl%python": { "general": { - "bzlTransitiveDigest": "7AvdSiZR6OSZZhgJCJJYhrJbhi7tTP1EGFGu68oep00=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "31xtOi5rmBJ3jSHeziLzV7KKKgCc6tMnRUZ1BQLBeao=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { - "pypi__colorama": { + "pythons_hub": { + "bzlFile": "@@rules_python~//python/extensions/private:interpreter_hub.bzl", + "ruleClassName": "hub_repo", + "attributes": { + "toolchains": [] + } + } + }, + "recordedRepoMappingEntries": [ + [ + "rules_python~", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_python~", + "rules_python", + "rules_python~" + ] + ] + } + }, + "@@rules_python~//python/extensions/private:internal_deps.bzl%internal_deps": { + "general": { + "bzlTransitiveDigest": "fUb5iKCtPgjhclraX+//BnJ+LOcG6I6+O9UUxT+gZ50=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "pypi__coverage_cp39_aarch64-apple-darwin": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.10.2~pip_install~pypi__colorama", - "url": "https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl", - "sha256": "9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc", "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + "urls": [ + "https://files.pythonhosted.org/packages/63/e9/f23e8664ec4032d7802a1cf920853196bcbdce7b56408e3efe1b2da08f3c/coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl" + ] } }, - "pypi__wheel": { + "pypi__coverage_cp38_aarch64-unknown-linux-gnu": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.10.2~pip_install~pypi__wheel", - "url": "https://files.pythonhosted.org/packages/27/d6/003e593296a85fd6ed616ed962795b2f87709c3eee2bca4f6d0fe55c6d00/wheel-0.37.1-py2.py3-none-any.whl", - "sha256": "4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e", "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__click": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "name": "rules_python~0.10.2~pip_install~pypi__click", - "url": "https://files.pythonhosted.org/packages/76/0a/b6c5f311e32aeb3b406e03c079ade51e905ea630fc19d1262a46249c1c86/click-8.0.1-py3-none-any.whl", - "sha256": "fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__pep517": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "name": "rules_python~0.10.2~pip_install~pypi__pep517", - "url": "https://files.pythonhosted.org/packages/f4/67/846c08e18fefb265a66e6fd5a34269d649b779718d9bf59622085dabd370/pep517-0.12.0-py2.py3-none-any.whl", - "sha256": "dd884c326898e2c6e11f9e0b64940606a93eb10ea022a2e067959f3a110cf161", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__pip": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "name": "rules_python~0.10.2~pip_install~pypi__pip", - "url": "https://files.pythonhosted.org/packages/96/2f/caec18213f6a67852f6997fb0673ae08d2e93d1b81573edb93ba4ef06970/pip-22.1.2-py3-none-any.whl", - "sha256": "a3edacb89022ef5258bf61852728bf866632a394da837ca49eb4303635835f17", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" - } - }, - "pypi__installer": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "name": "rules_python~0.10.2~pip_install~pypi__installer", - "url": "https://files.pythonhosted.org/packages/1b/21/3e6ebd12d8dccc55bcb7338db462c75ac86dbd0ac7439ac114616b21667b/installer-0.5.1-py3-none-any.whl", - "sha256": "1d6c8d916ed82771945b9c813699e6f57424ded970c9d8bf16bbc23e1e826ed3", - "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + "urls": [ + "https://files.pythonhosted.org/packages/40/3b/cd68cb278c4966df00158811ec1e357b9a7d132790c240fc65da57e10013/coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + ] } }, "pypi__pip_tools": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.10.2~pip_install~pypi__pip_tools", - "url": "https://files.pythonhosted.org/packages/fe/5c/8995799b0ccf832906b4968b4eb2045beb9b3de79e96e6b1a6e4fc4e6974/pip_tools-6.6.2-py3-none-any.whl", - "sha256": "6b486548e5a139e30e4c4a225b3b7c2d46942a9f6d1a91143c21b1de4d02fd9b", + "url": "https://files.pythonhosted.org/packages/5e/e8/f6d7d1847c7351048da870417724ace5c4506e816b38db02f4d7c675c189/pip_tools-6.12.1-py3-none-any.whl", + "sha256": "f0c0c0ec57b58250afce458e2e6058b1f30a4263db895b7d72fd6311bf1dc6f7", "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "pypi__setuptools": { + "pypi__coverage_cp310_x86_64-unknown-linux-gnu": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.10.2~pip_install~pypi__setuptools", - "url": "https://files.pythonhosted.org/packages/7c/5b/3d92b9f0f7ca1645cba48c080b54fe7d8b1033a4e5720091d1631c4266db/setuptools-60.10.0-py3-none-any.whl", - "sha256": "782ef48d58982ddb49920c11a0c5c9c0b02e7d7d1c2ad0aa44e1a1e133051c96", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0", "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + "urls": [ + "https://files.pythonhosted.org/packages/3c/7d/d5211ea782b193ab8064b06dc0cc042cf1a4ca9c93a530071459172c550f/coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + ] + } + }, + "pypi__coverage_cp311_x86_64-apple-darwin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/50/cf/455930004231fa87efe8be06d13512f34e070ddfee8b8bf5a050cdc47ab3/coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl" + ] + } + }, + "pypi__coverage_cp310_aarch64-unknown-linux-gnu": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/15/b0/3639d84ee8a900da0cf6450ab46e22517e4688b6cec0ba8ab6f8166103a2/coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + ] + } + }, + "pypi__coverage_cp39_aarch64-unknown-linux-gnu": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/18/95/27f80dcd8273171b781a19d109aeaed7f13d78ef6d1e2f7134a5826fd1b4/coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + ] + } + }, + "pypi__coverage_cp310_aarch64-apple-darwin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/89/a2/cbf599e50bb4be416e0408c4cf523c354c51d7da39935461a9687e039481/coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl" + ] + } + }, + "pypi__pip": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/09/bd/2410905c76ee14c62baf69e3f4aa780226c1bbfc9485731ad018e35b0cb5/pip-22.3.1-py3-none-any.whl", + "sha256": "908c78e6bc29b676ede1c4d57981d490cb892eb45cd8c214ab6298125119e077", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__coverage_cp38_x86_64-apple-darwin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/05/63/a789b462075395d34f8152229dccf92b25ca73eac05b3f6cd75fa5017095/coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl" + ] + } + }, + "pypi__coverage_cp311_x86_64-unknown-linux-gnu": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/6a/63/8e82513b7e4a1b8d887b4e85c1c2b6c9b754a581b187c0b084f3330ac479/coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + ] } }, "pypi__tomli": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.10.2~pip_install~pypi__tomli", "url": "https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl", "sha256": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__coverage_cp39_x86_64-apple-darwin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/ea/52/c08080405329326a7ff16c0dfdb4feefaa8edd7446413df67386fe1bbfe0/coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl" + ] + } + }, + "pypi__wheel": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/bd/7c/d38a0b30ce22fc26ed7dbc087c6d00851fb3395e9d0dac40bec1f905030c/wheel-0.38.4-py3-none-any.whl", + "sha256": "b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__coverage_cp311_aarch64-unknown-linux-gnu": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/36/f3/5cbd79cf4cd059c80b59104aca33b8d05af4ad5bf5b1547645ecee716378/coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + ] + } + }, + "pypi__click": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/76/0a/b6c5f311e32aeb3b406e03c079ade51e905ea630fc19d1262a46249c1c86/click-8.0.1-py3-none-any.whl", + "sha256": "fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__coverage_cp39_x86_64-unknown-linux-gnu": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/6b/f2/919f0fdc93d3991ca074894402074d847be8ac1e1d78e7e9e1c371b69a6f/coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + ] + } + }, + "pypi__importlib_metadata": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/d7/31/74dcb59a601b95fce3b0334e8fc9db758f78e43075f22aeb3677dfb19f4c/importlib_metadata-1.4.0-py2.py3-none-any.whl", + "sha256": "bdd9b7c397c273bcc9a11d6629a38487cd07154fa255a467bf704cd2c258e359", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__pep517": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/ee/2f/ef63e64e9429111e73d3d6cbee80591672d16f2725e648ebc52096f3d323/pep517-0.13.0-py3-none-any.whl", + "sha256": "4ba4446d80aed5b5eac6509ade100bff3e7943a8489de249654a5ae9b33ee35b", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__coverage_cp38_x86_64-unknown-linux-gnu": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/bd/a0/e263b115808226fdb2658f1887808c06ac3f1b579ef5dda02309e0d54459/coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + ] + } + }, + "pypi__coverage_cp38_aarch64-apple-darwin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/07/82/79fa21ceca9a9b091eb3c67e27eb648dade27b2c9e1eb23af47232a2a365/coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl" + ] + } + }, + "pypi__packaging": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/8f/7b/42582927d281d7cb035609cd3a543ffac89b74f3f4ee8e1c50914bcb57eb/packaging-22.0-py3-none-any.whl", + "sha256": "957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__setuptools": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/7c/5b/3d92b9f0f7ca1645cba48c080b54fe7d8b1033a4e5720091d1631c4266db/setuptools-60.10.0-py3-none-any.whl", + "sha256": "782ef48d58982ddb49920c11a0c5c9c0b02e7d7d1c2ad0aa44e1a1e133051c96", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__zipp": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/f4/50/cc72c5bcd48f6e98219fc4a88a5227e9e28b81637a99c49feba1d51f4d50/zipp-1.0.0-py2.py3-none-any.whl", + "sha256": "8dda78f06bd1674bd8720df8a50bb47b6e1233c503a4eed8e7810686bde37656", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__colorama": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", + "sha256": "4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__build": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/03/97/f58c723ff036a8d8b4d3115377c0a37ed05c1f68dd9a0d66dab5e82c5c1c/build-0.9.0-py3-none-any.whl", + "sha256": "38a7a2b7a0bdc61a42a0a67509d88c71ecfc37b393baba770fae34e20929ff69", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__coverage_cp310_x86_64-apple-darwin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~//python/private:coverage.patch" + ], + "sha256": "ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/c4/8d/5ec7d08f4601d2d792563fe31db5e9322c306848fec1e65ec8885927f739/coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl" + ] + } + }, + "pypi__installer": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/e5/ca/1172b6638d52f2d6caa2dd262ec4c811ba59eee96d54a7701930726bce18/installer-0.7.0-py3-none-any.whl", + "sha256": "05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__more_itertools": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/bd/3f/c4b3dbd315e248f84c388bd4a72b131a29f123ecacc37ffb2b3834546e42/more_itertools-8.13.0-py3-none-any.whl", + "sha256": "c5122bffc5f104d37c1626b8615b511f3427aa5389b94d61e5ef8236bfbc3ddb", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } } }, "recordedRepoMappingEntries": [ [ - "rules_python~0.10.2", + "rules_python~", + "bazel_skylib", + "bazel_skylib~" + ], + [ + "rules_python~", "bazel_tools", "bazel_tools" ], [ - "rules_python~0.10.2", + "rules_python~", "rules_python", - "rules_python~0.10.2" + "rules_python~" ] ] } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 8469ffd49f..65574129ab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { changelog = "https://github.com/bazelbuild/buildtools/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; - [ elasticdog uri-canva marsam ] + [ elasticdog uri-canva ] ++ lib.teams.bazel.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix index 8129c3235f..7b0e2a5d01 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix @@ -41,7 +41,7 @@ let '')); testBazel = bazelTest { - name = "bazel-test-cpp"; + name = "${bazel.pname}-test-cpp"; inherit workspaceDir; bazelPkg = bazel; bazelScript = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix index 91fade474d..ed4711f402 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -41,7 +41,7 @@ let '')); testBazel = bazelTest { - name = "bazel-test-java"; + name = "${bazel.pname}-test-java"; inherit workspaceDir; bazelPkg = bazel; buildInputs = [ (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless) ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix index cc78fca6a4..963bad679c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix @@ -160,7 +160,7 @@ let '')); testBazel = bazelTest { - name = "bazel-test-protocol-buffers"; + name = "${bazel.pname}-test-protocol-buffers"; inherit workspaceDir; bazelPkg = bazel; buildInputs = [ (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless) ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index bd0f71a5d9..2538a2ae07 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -71,7 +71,7 @@ let '')); testBazel = bazelTest { - name = "bazel-test-builtin-rules"; + name = "${bazel.pname}-test-builtin-rules"; inherit workspaceDir; bazelPkg = bazel; bazelScript = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bob/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bob/default.nix index 6821dc1911..98559d1ca4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bob/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bob/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, installShellFiles +, fetchpatch +}: buildGoModule rec { pname = "bob"; @@ -11,9 +17,18 @@ buildGoModule rec { hash = "sha256-zmWfOLBb+GWw9v6LdCC7/WaP1Wz7UipPwqkmI1+rG8Q="; }; + patches = [ + # Fix vulnerable dependencies + # Backport of https://github.com/benchkram/bob/pull/387 + (fetchpatch { + url = "https://github.com/benchkram/bob/commit/5020e6fafbfbcb1b3add5d936886423ce882793d.patch"; + hash = "sha256-if1ZErI0Un7d26eOkYSkEa87+VTRcEtF6JbsJYOHpHE="; + }) + ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; - vendorHash = "sha256-S1XUgjdSVTWXehOLCxXcvj0SH12cxqvYadVlCw/saF4="; + vendorHash = "sha256-u0nFaTQWU9O7A/RAhGaLcBka+YNGjSlpycDF8TLQALw="; excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix index dff44f4cd2..a21a38839b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://buck.build/"; description = "A high-performance build tool"; mainProgram = "buck"; - maintainers = [ maintainers.jgertm maintainers.marsam ]; + maintainers = [ maintainers.jgertm ]; license = licenses.asl20; platforms = platforms.all; # https://github.com/facebook/buck/issues/2666 diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix index 192c7944fc..5fa78bee1d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.22.10"; + version = "1.24.4"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-BJ3Src412WS1uWt04OaRIjhtZt+8vh15Ve/+c2qZFdU="; + hash = "sha256-LOUACki6uG8jDBI2eOO0C/tQrJ7L3aehwo+4pe9ONgo="; }; - cargoHash = "sha256-G/vZT/iOQtpr0gtT0pjRXIhhpPrjnR/kBg6fVAMuDB0="; + cargoHash = "sha256-kTLWWtAqoSTmVBHYJKMUsV8jtSYzgERkSErLRMmZI7Y="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index 580cf127b3..3596f94b61 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.9.9"; + version = "1.10.0"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-xXyuYMISLKG7p3GE37TQ0l/GwYgFOUqzarYgiwwPJi8="; + hash = "sha256-FUt95sGSB8c9CjBPkByMS26tmpw6mamKnXKsGUGdJkA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json index b3bf504901..aa8a580f45 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.2.2", + "version": "1.3.1", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "103qjwh3lcckbillx9q5pi0s10xp65vygrwlzhnqbczcxrlsa3d1" + "sha256": "04piwgd7jy7m4mx263lmlxfwh839q02b9jzycrr9bydqgfx7i0sk" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "0nnv4b2rlnczhxa46n7cif5pxhqj5djzc1063r37z225wxs6lcqm" + "sha256": "0f01ilxr7zc0p6jcmn034j16ynjv1r2miik25pqlhcafjhv9sp20" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "09iizd55k53wpg13yfm2xr2waan9qdkfn5x5v2f5rr1v4l3cj90i" + "sha256": "1yj49fskajf1fffkxh5hyg3vcrxyhjgcha1hj61dw0iblazfa440" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0jgclzd0b36adj187c9qa2y7mkgwpzb1wy5apssdm49ng6b92lbs" + "sha256": "1kr035l4vwv76041yy82347f01kvbl8n676jd3dayzw48xg6j5l2" } } } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/xmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/xmake/default.nix index 441ed8067c..f0d48ac331 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/xmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/xmake/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmake"; - version = "2.8.9"; + version = "2.9.1"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-X3k8OTNG74Dkfwg63k08L9/ESGWKeRf9o1zNe9K5Ebg="; + hash = "sha256-ox2++MMDrqEmgGi0sawa7BQqxBJMfLfZx+61fEFPjRU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index 7535394a55..d1ba00dc61 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.35.3"; + version = "1.35.4"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-FqgYpCvEEqgnhCHdHN1/inxMJoOjoHLc/xMfhXsA1nc="; + hash = "sha256-lcB23yU7Wn+aILGFLDBnFg30NRDQgJt3J61FmGuQtRo="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix index 325d51e939..e4b9f050d6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-BrLDY3T40ndkjuWCx5kLZvMBp8xI5d3MFg9M3IpafWM="; + hash = "sha256-Kb5p838jezDTJnc2jcKnima1gE7ENMm+4cmN6F6vh+Y="; }; vendorHash = null; @@ -19,12 +19,12 @@ buildGoModule rec { doCheck = false; - meta = with lib; { + meta = { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; homepage = "https://github.com/moby/buildkit"; changelog = "https://github.com/moby/buildkit/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ vdemeester marsam developer-guy ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ developer-guy vdemeester ]; mainProgram = "buildctl"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix index d2eb4cc531..307a5e5849 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix @@ -32,6 +32,6 @@ buildGoModule rec { description = "CLI for building apps using Cloud Native Buildpacks"; mainProgram = "pack"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix b/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix index 46aa9902e7..d6f92f25bd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.15.6"; + version = "1.16.0"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-OK6KELzazvB+zOghEYjFySs3a+lto4/z7h8s9IlbLLg="; + sha256 = "sha256-ggeZb4Oig5r9WtboUy2nSF6gaHS4BiohqUs+Lrl+s5Y="; }; dontUnpack = true; @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://developer.android.com/studio/command-line/bundletool"; changelog = "https://github.com/google/bundletool/releases/tag/${version}"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; platforms = jre_headless.meta.platforms; license = licenses.asl20; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix b/third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix index 757ab10583..66ee1edbd1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix @@ -8,11 +8,11 @@ , gobject-introspection , desktop-file-utils , shared-mime-info -, wrapGAppsHook +, wrapGAppsHook4 , glib , gtk3 , gtk4 -, gtksourceview4 +, gtksourceview5 , libadwaita , libhandy , webkitgtk_4_1 @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { pname = "cambalache"; - version = "0.16.0"; + version = "0.90.2"; format = "other"; @@ -30,9 +30,9 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jpu"; - repo = pname; + repo = "cambalache"; rev = version; - sha256 = "sha256-Ha94Ca5a7EUBYuSJvMrLc5895Q2/01/tbKpwlHLmTDc="; + hash = "sha256-m3rearoCFQUzdZMXY2xyKf4dgdq7G4QlUbetrIqW83U="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection # for setup hook desktop-file-utils # for update-desktop-database shared-mime-info # for update-mime-database - wrapGAppsHook + wrapGAppsHook4 ]; pythonPath = with python3.pkgs; [ @@ -54,7 +54,7 @@ python3.pkgs.buildPythonApplication rec { glib gtk3 gtk4 - gtksourceview4 + gtksourceview5 webkitgtk_4_1 webkitgtk_6_0 # For extra widgets support. @@ -70,8 +70,8 @@ python3.pkgs.buildPythonApplication rec { # those programs are used at runtime not build time # https://gitlab.gnome.org/jpu/cambalache/-/blob/0.12.1/meson.build#L79-80 substituteInPlace ./meson.build \ - --replace "find_program('broadwayd', required: true)" "" \ - --replace "find_program('gtk4-broadwayd', required: true)" "" + --replace-fail "find_program('broadwayd', required: true)" "" \ + --replace-fail "find_program('gtk4-broadwayd', required: true)" "" ''; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/cdecl/default.nix b/third_party/nixpkgs/pkgs/development/tools/cdecl/default.nix deleted file mode 100644 index 48870c7d2d..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/cdecl/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{lib, stdenv, fetchurl, bison, flex, readline, ncurses, gnused}: - -stdenv.mkDerivation rec { - pname = "cdecl"; - version = "2.5"; - src = fetchurl { - url = "https://www.cdecl.org/files/${pname}-blocks-${version}.tar.gz"; - sha256 = "1b7k0ra30hh8mg8fqv0f0yzkaac6lfg6n376drgbpxg4wwml1rly"; - }; - - patches = [ ./cdecl-2.5-lex.patch ]; - preBuild = '' - ${gnused}/bin/sed 's/getline/cdecl_getline/g' -i cdecl.c; - makeFlagsArray=(CFLAGS="-DBSD -DUSE_READLINE -std=gnu89" LIBS=-lreadline); - makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1 CC=$CC"; - mkdir -p $out/bin; - ''; - buildInputs = [bison flex readline ncurses]; - - meta = { - description = "Translator English -- C/C++ declarations"; - license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/changie/default.nix b/third_party/nixpkgs/pkgs/development/tools/changie/default.nix index a4050744f0..b8fc6af576 100644 --- a/third_party/nixpkgs/pkgs/development/tools/changie/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/changie/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "changie"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${version}"; - hash = "sha256-pZe9T/WALFX5xwCiZKbf8fpaG3wmBJbqgM7FTPqlN2k="; + hash = "sha256-3GQ9C9UteJG3LfJmDsBbFJ9hnz7ouQ/6bZkQ/8CZ8PI="; }; - vendorHash = "sha256-SdaDu9LXgelSEXdOCAbtvt1LnrSVpAIoN6MDSjTeEOs="; + vendorHash = "sha256-2SkHId5BDAv525PISLjlrP862Z2fJDN4L839rz8rWaw="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix b/third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix index c75ca6e41b..c4cd5903dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix @@ -4,7 +4,7 @@ with python3.pkgs; buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.28.2"; + version = "0.28.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "python-jsonschema"; repo = "check-jsonschema"; rev = "refs/tags/${version}"; - hash = "sha256-QHcpcpICYqQUUCkLAV4BpDYn7Te/TGbXFPgr8Emp0ew="; + hash = "sha256-1nbaaUr/3yX/ZTTXzlwLKCRsa58UFONQnDWmcvmdhsU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/click/default.nix b/third_party/nixpkgs/pkgs/development/tools/click/default.nix index f8d73eec25..da05368a2c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/click/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/click/default.nix @@ -13,7 +13,7 @@ , getopt , setuptools , pygobject3 -, wrapGAppsHook +, wrapGAppsHook3 }: buildPythonApplication { @@ -57,7 +57,7 @@ buildPythonApplication { gobject-introspection vala getopt - wrapGAppsHook + wrapGAppsHook3 ]; # Tests were omitted for time constraint reasons diff --git a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix index f5d6c1caa7..122a9826d6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix @@ -39,6 +39,6 @@ buildGoModule rec { mainProgram = "cloud-nuke"; changelog = "https://github.com/gruntwork-io/cloud-nuke/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/coder/default.nix b/third_party/nixpkgs/pkgs/development/tools/coder/default.nix index bee71dc2ae..df4522faf2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coder/default.nix @@ -13,21 +13,21 @@ let channels = { stable = { - version = "2.9.3"; + version = "2.10.2"; hash = { - x86_64-linux = "sha256-6VS21x2egWBV6eJqRCBGG7mEGPIDFtY9GN6Ry4ilC70="; - x86_64-darwin = "sha256-UBUGjA+jUkT6p9714l8IvDDI/qhWNctVFOvcA2S5kQU="; - aarch64-linux = "sha256-2QAahqcM2gi3lT+18q2Nm9GNqVsqzX3RajBsTn+KB1c="; - aarch64-darwin = "sha256-uEH7Y7c9BcU/Q/jwx/inFMvUrgm2dUruID+FJL+rA6Y="; + x86_64-linux = "sha256-U3qHEjIKq8JkpDp6TehMs6t5L3GpSGt4D10XSAQ9Ii0="; + x86_64-darwin = "sha256-ibfqqxRRD3IfIN2FqSxk5qd7d87RvBgKKFv9F0hACgo="; + aarch64-linux = "sha256-HdBVnLKen6W1crZfnc2hpA0cAYIYeYFHKvANwnLqkjY="; + aarch64-darwin = "sha256-3sHmR6PTRlBSIdD4rja4y8v0gOY4cbbyhW7qssgpqp8="; }; }; mainline = { - version = "2.10.1"; + version = "2.11.0"; hash = { - x86_64-linux = "sha256-jNPL30e5xvyajlIqivtEpSb3cRhfgFhLFlC+CaLY2IM="; - x86_64-darwin = "sha256-U1eQaYwnm/mdQoZ8YxK/+s3HboVfMIAtdI7aQnCiDM8="; - aarch64-linux = "sha256-YtSyKZYG8vdubZUfo2FjEoVwSF82TXzeLJjPpHqgFDk="; - aarch64-darwin = "sha256-aQSiXK7voP5/mPFIscfTnSc4Ae5/f+WW8MR6ZtuC/eY="; + x86_64-linux = "sha256-aJwL4WCJXxSBrfaUHEECQqedz2lKBOa8sdRItSBpxp4="; + x86_64-darwin = "sha256-4D4MoDrEJtawFeUBG9BiJ6HZ9uqx9uQDIHHNB7m2pp8="; + aarch64-linux = "sha256-2UlCxykSfnK50OPb61YC42MTTlPL1njf0vpwmqaUbI8="; + aarch64-darwin = "sha256-mh0Lr+SH4jZTx1xH7QoqfSLDma5nS61sv31QuOYAgQk="; }; }; }; @@ -100,7 +100,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://coder.com"; license = lib.licenses.agpl3Only; mainProgram = "coder"; - maintainers = with lib.maintainers; [ ghuntley urandom ]; + maintainers = with lib.maintainers; [ ghuntley kylecarbs urandom ]; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/tools/coder/update.sh b/third_party/nixpkgs/pkgs/development/tools/coder/update.sh index ebd40e3d5a..60e9a97af2 100755 --- a/third_party/nixpkgs/pkgs/development/tools/coder/update.sh +++ b/third_party/nixpkgs/pkgs/development/tools/coder/update.sh @@ -5,13 +5,10 @@ set -eu -o pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -# Fetch the latest stable version -LATEST_STABLE_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/coder/coder/releases/latest | jq -r '.tag_name') -LATEST_STABLE_VERSION=$(echo ${LATEST_STABLE_TAG} | sed 's/^v//') - -# Fetch the latest mainline version -LATEST_MAINLINE_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/coder/coder/releases | jq -r '.[0].tag_name') -LATEST_MAINLINE_VERSION=$(echo ${LATEST_MAINLINE_TAG} | sed 's/^v//') +# The released tagged as "latest" is always stable. +LATEST_STABLE_VERSION=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --fail -sSL https://api.github.com/repos/coder/coder/releases/latest | jq -r '.tag_name | sub("^v"; "")') +# The highest version that is not a pre-release is the latest mainline version. +LATEST_MAINLINE_VERSION=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --fail -sSL https://api.github.com/repos/coder/coder/releases | jq -r 'map(select(.prerelease == false)) | sort_by(.tag_name | sub("^v"; "") | split(".") | map(tonumber)) | .[-1].tag_name | sub("^v"; "")') # Define the platforms declare -A ARCHS=(["x86_64-linux"]="linux_amd64.tar.gz" diff --git a/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix index 102ec3d996..e614fe7d94 100644 --- a/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix @@ -2,26 +2,26 @@ stdenv.mkDerivation rec { pname = "confluent-cli"; - version = "3.37.0"; + version = "3.60.0"; # To get the latest version: # curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1 src = { x86_64-linux = fetchurl { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_linux_amd64.tar.gz"; - hash = "sha256-vJB/0odVA86fZtRh/Cg5KPD8q8CQFENlRzjpI41UOc8="; + hash = "sha256-GYA7T2yRcSNStvd9ZqI2iTJC3d6ymH9Dg5FVkIsM1f0="; }; aarch64-linux = fetchurl { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_linux_arm64.tar.gz"; - hash = "sha256-lj7i7oQzX1AfhYfrXDiOjz1/EV4y3/CI4MyPKzNGcss="; + hash = "sha256-BJJaZtRInKT6S0W22f96RCM8H18dIpOTP5lu357zh18="; }; x86_64-darwin = fetchurl { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_darwin_amd64.tar.gz"; - hash = "sha256-gEQBxChsM5CXFRsWBVVcQ88xQ2N4lqkIxHfZKPEMlOY"; + hash = "sha256-94ur/FXxQWL4EOkEI1FSoWduRaMaY7DCNMiucpNC0B0="; }; aarch64-darwin = fetchurl { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_darwin_arm64.tar.gz"; - hash = "sha256-6i5Z3m0gMzPuqWm/SJOuxjO3ioh/Uhk3A9uykksYfPo="; + hash = "sha256-aEIKSrO0/6dJCAyzwBH2ZDAmwvURugx6jTzaepbRvH8="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix index 5fe017565f..d44aedf372 100644 --- a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-1jMVb1Hip7ljmt4WtFg3Qa2/rse2sjISTe3SUS5UCTo="; + hash = "sha256-TjBBKFWyqrqeiddAn5SDiLZ4HirWC4vYwIEA43IFSxY="; }; - vendorHash = "sha256-Yw5p2mTTkYvRjeuF9owirohyClSS3j1gKVg8Ma2NIa8="; + vendorHash = "sha256-wQBeKPT/MSTd89UmtwKH7uX3sv7x1N5MXMKo/DZRmBk="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/agola/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/agola/default.nix index 02cd0f25ac..9022e0b171 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/agola/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/agola/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.8.0"; + version = "0.9.1"; in buildGoModule { @@ -15,10 +15,10 @@ buildGoModule { owner = "agola-io"; repo = "agola"; rev = "v${version}"; - hash = "sha256-nU04MVkUC+m6Ga4qDUH9KrA0zbYmttAicpvdxbaBG0Y="; + hash = "sha256-96D4E4H3JsXCHWUyTKzZxqsqylJdzbnbLi6engNR/Eg="; }; - vendorHash = "sha256-k3Sip9CqTGRTWxr3RzZf0jCrm4AfUrpY/wSTmHy+yik="; + vendorHash = "sha256-Igtccundx/2PHFp8+L44CvOLG+/Ndinhonh/EDcQeoY="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index be2f7f7522..a86db85067 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.116.0"; + version = "0.117.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cij6Yw8UEPDHsm9Oy809PWxfPpbCGXUFRALKFH80pqM="; + sha256 = "sha256-dJq2/XxhSvqlRQwMHX2RHct6KQu9uik3SPeWD2/rwto="; }; - vendorHash = "sha256-tkKxg08uL1vlOyD/tpRLzjHpOVWOmYZxcq8B+Q7/3Zo="; + vendorHash = "sha256-d3cHXO4SFeNybiVDc3dUmd1XzUJ1SlMqSw7KPC3ZrXQ="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix index c9ec0cc84a..63324531f8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix @@ -14,7 +14,10 @@ buildGoModule rec { vendorHash = "sha256-vTYB3ka34VooN2Wh/Rcj+2S1qAsA2a/VtXlILn1W7oU="; - patches = [ ./disable_httptest.patch ]; + postPatch = '' + # disable httptest + rm server/handler/handler_test.go + ''; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch deleted file mode 100644 index 90c815712d..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/server/handler/handler_test.go b/server/handler/handler_test.go -deleted file mode 100644 -index 6521633..0000000 ---- a/server/handler/handler_test.go -+++ /dev/null -@@ -1,52 +0,0 @@ --package handler -- --import ( -- "net/http" -- "net/http/httptest" -- "testing" -- "time" -- -- "codeberg.org/codeberg/pages/server/cache" -- "codeberg.org/codeberg/pages/server/gitea" -- "github.com/rs/zerolog/log" --) -- --func TestHandlerPerformance(t *testing.T) { -- giteaClient, _ := gitea.NewClient("https://codeberg.org", "", cache.NewKeyValueCache(), false, false) -- testHandler := Handler( -- "codeberg.page", "raw.codeberg.org", -- giteaClient, -- "https://docs.codeberg.org/pages/raw-content/", -- []string{"/.well-known/acme-challenge/"}, -- []string{"raw.codeberg.org", "fonts.codeberg.org", "design.codeberg.org"}, -- []string{"pages"}, -- cache.NewKeyValueCache(), -- cache.NewKeyValueCache(), -- cache.NewKeyValueCache(), -- ) -- -- testCase := func(uri string, status int) { -- t.Run(uri, func(t *testing.T) { -- req := httptest.NewRequest("GET", uri, http.NoBody) -- w := httptest.NewRecorder() -- -- log.Printf("Start: %v\n", time.Now()) -- start := time.Now() -- testHandler(w, req) -- end := time.Now() -- log.Printf("Done: %v\n", time.Now()) -- -- resp := w.Result() -- -- if resp.StatusCode != status { -- t.Errorf("request failed with status code %d", resp.StatusCode) -- } else { -- t.Logf("request took %d milliseconds", end.Sub(start).Milliseconds()) -- } -- }) -- } -- -- testCase("https://mondstern.codeberg.page/", 404) // TODO: expect 200 -- testCase("https://codeberg.page/", 404) // TODO: expect 200 -- testCase("https://example.momar.xyz/", 424) --} diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix index e4fc56d74f..e77aecde51 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k="; meta = with lib; { - maintainers = with maintainers; [ endocrimes ]; + maintainers = with maintainers; [ ]; license = licenses.unfreeRedistributable; homepage = "https://github.com/drone-runners/drone-runner-docker"; description = "Drone pipeline runner that executes builds inside Docker containers"; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix index 1c85e501e6..26d98065c8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.22.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-haxxILbM3REdSK4h4LN+HhRvl3VK9Ozf2NfnLTL5T3A="; + sha256 = "sha256-IiSsw0bZDAVuOrm7JBTT14Cf7I/koeS2Yw6vWYBG7kA="; }; vendorHash = "sha256-n4KbKkqAnHDIsXs8A/FE+rCkSKQKr5fv7npJ/X6t0mk="; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix index 68093f39e4..a2ed89e2ca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "gitea-actions-runner"; - version = "0.2.6"; + version = "0.2.10"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "act_runner"; rev = "v${version}"; - hash = "sha256-GE9yqp5zWJ4lL0L/w3oSvU72AiHBNb+yh2qBPKPe9X0="; + hash = "sha256-YRWFBMHw9Fcmzkmglh2I1kXJkAAivqvCBcenLTjE/bI="; }; - vendorHash = "sha256-NoaLq5pCwTuPd9ne5LYcvJsgUXAqcfkcW3Ck2K350JE="; + vendorHash = "sha256-8sdSQhg9DnRLgghDZzWrUMM4vjinhCgu3dTKU7MBVQU="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix index e9aace248d..f93517265e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -1,5 +1,4 @@ -{ autoPatchelfHook -, autoSignDarwinBinariesHook +{ autoSignDarwinBinariesHook , buildDotnetModule , dotnetCorePackages , fetchFromGitHub @@ -23,13 +22,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes; buildDotnetModule rec { pname = "github-runner"; - version = "2.315.0"; + version = "2.316.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-kKfwLZYV4uEkHt82YWNtDehbspgnH8heckVU5aA/YiY="; + hash = "sha256-y7HU71Pk0SrZ+IPaVa/XyMeHylfjUSEju+gp1vyVKtQ="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision @@ -114,8 +113,6 @@ buildDotnetModule rec { nativeBuildInputs = [ which git - ] ++ lib.optionals stdenv.isLinux [ - autoPatchelfHook ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 04d9db9de7..a0e41743b8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.10.0"; + version = "16.11.1"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-ng3ea60qK98nKGmwlSN2hPiE4BF64cgxEYPSeAoeOh0="; + vendorHash = "sha256-ms93Ea2Un/F9TDmNttSxi/CtZGsOnmptCf/hjtgCMB0="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-TN8T/iib7G1NjyHZzZw686KZ3RCwpA1xRli3/0fnLBI="; + sha256 = "sha256-ISL11AvKIy/tW/3MhVZ2/XT5RcaYj+x9rHKWAB/9TdU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix index 7c4c9e936c..3732a1eec5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.9"; + version = "2.1.10"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - hash = "sha256-Zj0nDCpbT7foGdUkxPG/FeljZj1alk/gvE0m/T4WlXE="; + hash = "sha256-fiZwmDDuaafBbYQdOxPpTrleMLOSakCteizpKwcGStk="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix index 9cddbc70c4..98d56d16c1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.38.8"; + version = "0.39.0"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-S1I7XKvpniocI2UAzO8yslju3fYy06MPC2Kl7N7bh8I="; + hash = "sha256-cDFt+fDpb/gDlFx+3C5Hw/ybf4hdjZOrpeNR8yBwd1M="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/atlas/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/atlas/default.nix index b5d0980648..8fc770f92c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/atlas/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/atlas/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "atlas"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-i0nqjlL22sM8eVXCD/SBJyNdy0l0Hq4rjW0Lr3CRZlE="; + hash = "sha256-NsSDNeciHwlc7LZmuTOzoLNVsjAE+4YGThD/omMbjaE="; }; modRoot = "cmd/atlas"; proxyVendor = true; - vendorHash = "sha256-48UmLwp93SjwPPrdySFVApjVf1Rsj3oNhi1lha4ZvyE="; + vendorHash = "sha256-rM2l7U/ZkL0NIGPPbmBQ+P6mzGxdX4aQeS8Hz6EFmQc="; nativeBuildInputs = [ installShellFiles ]; @@ -40,7 +40,7 @@ buildGoModule rec { homepage = "https://atlasgo.io/"; changelog = "https://github.com/ariga/atlas/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "atlas"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix index ca597e47f6..1f4764920c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.4.35"; + version = "2.5.6"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-SE4+NUH1W0YPjx59yjOun1tLbn6Je2nG2wcfb8+YSfw="; + hash = "sha256-tX/ttOud6tSsuKhvfwFP3bav+VzSdfVvAdowomQ1YcY="; }; - vendorHash = "sha256-5da3Tt4rKbzFPwYVhkkxCY/YpJePdE7WLDlTtPI8w1Q="; + vendorHash = "sha256-ybKCD8mZ8MumKsWicS09E/BW0laAPy1iqA6q8lfczHA="; ldflags = [ "-X main.version=${version}" diff --git a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index 922f3c081d..38f5ba2f19 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-jShFLwoxZdUEHA+gd87n3R+faOdC6TboXuPvcZp89+Y="; + hash = "sha256-crn2FSJm7CSBg5TOcB5bJOsWqBrlwDoik7OS3HiCIGw="; }; - vendorHash = "sha256-kBk2KhPDVYBGIUQpXq4ANA7WX+JUOxz7/Ad+4h2CD1c="; + vendorHash = "sha256-eFGQ59fdS+QQounT/byA0w9W+MK2Lhp+mlXAWWAtk6U="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix index 5179d245eb..e629807688 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix @@ -5,12 +5,12 @@ python3Packages.buildPythonApplication rec { pname = "litecli"; - version = "1.10.1"; + version = "1.11.0"; disabled = python3Packages.pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N+aAH2vgDV1YU7iIHbH/276bCBfGxhuy2ceWL2z/oI8="; + sha256 = "sha256-YW3mjYfSuxi/XmaetrWmjVuTfqgaitQ5wfUaJdHIH1Y="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix index b2d8b3fc05..0aac2409c0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/pg_checksums/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Activate/deactivate/verify checksums in offline PostgreSQL clusters"; homepage = "https://github.com/credativ/pg_checksums"; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; mainProgram = "pg_checksums_ext"; platforms = postgresql.meta.platforms; license = licenses.postgresql; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix index 54faf9f993..85be37cb19 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlcheck/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { mainProgram = "sqlcheck"; license = licenses.asl20; platforms = platforms.all; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index 110131532e..7db4d2c7d3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.0.5"; + version = "3.0.6"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; rev = "refs/tags/${version}"; - hash = "sha256-jH6o1moyyugKtIIccp8Tbcg5EAMOxzNco9saUgoDzWY="; + hash = "sha256-VDLUCxDQKWQEeZQkeZP13KNm48GCQ3i4CLOAB/Kermo="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix index a622d3481c..b13255f57a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, cmake -, qtbase, qttools, sqlcipher, wrapGAppsHook, qtmacextras +, qtbase, qttools, sqlcipher, wrapGAppsHook3, qtmacextras }: mkDerivation rec { @@ -19,7 +19,7 @@ mkDerivation rec { # We *really* should get that cleaned up. buildInputs = [ qtbase sqlcipher ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; - nativeBuildInputs = [ cmake qttools wrapGAppsHook ]; + nativeBuildInputs = [ cmake qttools wrapGAppsHook3 ]; cmakeFlags = [ "-Dsqlcipher=1" diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix index b0737ce856..88c1bc0f63 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { mainProgram = "timescaledb-tune"; homepage = "https://github.com/timescale/timescaledb-tune"; license = licenses.asl20; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix index 6ace9ba592..2d107cc562 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vitess"; - version = "19.0.1"; + version = "19.0.3"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-UDqSCAJObKh65/mDupuWzkYfqJyd6XZCi+qA7NwIO9M="; + hash = "sha256-Zy54nZCnwyZ1JNPvaKi0/bRt5g5ucPANwer/3pl4dGU="; }; - vendorHash = "sha256-YrgWrk+67Vx9L+uFLipyuousj5DQIleqyxbUSqalZyw="; + vendorHash = "sha256-QUzBxYEvxVzv4c8tKiFb+4NLy8RsXh0QTn9twfstMtw="; buildInputs = [ sqlite ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix b/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix index fad90ae480..31dcb4b06e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-0Dk3f38kj4bSTffFVhMNwuQXmty7vZMAieKDmkH945Y="; + hash = "sha256-E2kJiWuHY+rHyAR6p/NVbONys8RonpxvDHUTrx6ZSkk="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-WT30up/1Y2ar0pkHOq1s0Sz7qc4b+Yr6gILzDYDo0Uk="; + vendorHash = "sha256-bSCgjSXdPOWgftlInl3MailtiXslLH/TZw95FiEnCxQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix index 66d84e5a3b..ea60c216a8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix @@ -1,37 +1,31 @@ -{ lib -, devpi-server -, git -, glibcLocales -, python3 -, fetchPypi +{ + lib, + devpi-server, + git, + glibcLocales, + python3, + fetchPypi, }: python3.pkgs.buildPythonApplication rec { pname = "devpi-client"; - version = "7.0.2"; + version = "7.0.3"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-oOX5Z8WXgNJYsgXqHE2CsXdDnA3XmDF6axD1D318bPQ="; + pname = "devpi_client"; + inherit version; + hash = "sha256-5aF6EIFnhfywDeAfWSN+eZUpaO6diPCP5QHT11Y/IQI="; }; - postPatch = '' - substituteInPlace tox.ini \ - --replace "--flake8" "" - ''; - - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools setuptools-changelog-shortener - wheel ]; - buildInputs = [ - glibcLocales - ]; + buildInputs = [ glibcLocales ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ build check-manifest devpi-common @@ -41,19 +35,21 @@ python3.pkgs.buildPythonApplication rec { platformdirs ]; - nativeCheckInputs = [ - devpi-server - git - ] ++ (with python3.pkgs; [ - mercurial - mock - pypitoken - pytestCheckHook - sphinx - virtualenv - webtest - wheel - ]); + nativeCheckInputs = + [ + devpi-server + git + ] + ++ (with python3.pkgs; [ + mercurial + mock + pypitoken + pytestCheckHook + sphinx + virtualenv + webtest + wheel + ]); preCheck = '' export HOME=$(mktemp -d); @@ -68,16 +64,17 @@ python3.pkgs.buildPythonApplication rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ - "devpi" - ]; + pythonImportsCheck = [ "devpi" ]; meta = with lib; { description = "Client for devpi, a pypi index server and packaging meta tool"; - mainProgram = "devpi"; homepage = "http://doc.devpi.net"; changelog = "https://github.com/devpi/devpi/blob/client-${version}/client/CHANGELOG"; license = licenses.mit; - maintainers = with maintainers; [ lewo makefu ]; + maintainers = with maintainers; [ + lewo + makefu + ]; + mainProgram = "devpi"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix index 0923182afa..c1dfc48419 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix @@ -23,6 +23,7 @@ , webtest , testers , devpi-server +, nixosTests }: @@ -108,8 +109,11 @@ buildPythonApplication rec { "devpi_server" ]; - passthru.tests.version = testers.testVersion { - package = devpi-server; + passthru.tests = { + devpi-server = nixosTests.devpi-server; + version = testers.testVersion { + package = devpi-server; + }; }; meta = with lib;{ diff --git a/third_party/nixpkgs/pkgs/development/tools/dive/default.nix b/third_party/nixpkgs/pkgs/development/tools/dive/default.nix index 6bba0c97cc..299be547ce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dive/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dive/default.nix @@ -26,6 +26,20 @@ buildGoModule rec { buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; + patches = [ + (fetchpatch { + name = "add-scrolling-layers.patch"; + url = "https://github.com/wagoodman/dive/pull/478/commits/b7da0f90880ce5e9d3bc2d0f269aadac6ee63c49.patch"; + hash = "sha256-dYqg5JpWKOzy3hVjIVCHA2vmKCtCgc8W+oHEzuGpyxc="; + }) + (fetchpatch { + name = "fix-render-update.patch"; + url = "https://github.com/wagoodman/dive/pull/478/commits/326fb0d8c9094ac068a29fecd4f103783199392c.patch"; + hash = "sha256-NC74MqHVChv/Z5hHX8ds3FI+tC+yyBpXvZKSFG3RyC0="; + }) + ]; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { @@ -34,6 +48,6 @@ buildGoModule rec { homepage = "https://github.com/wagoodman/dive"; changelog = "https://github.com/wagoodman/dive/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix index 496d25ca3d..f12baca266 100644 --- a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.105.0"; + version = "1.106.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-b7pks3a2ApR32tc06HZ9hG2MoZKVoWwCBATtcV1+WBo="; + sha256 = "sha256-Un1qBQbrgdudAfnviP8d6A7nNwi1ZGAFPN33NLKXNwI="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix b/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix index 18d53e51da..b21bdfc500 100644 --- a/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gtk-doc"; - version = "1.33.2"; + version = "1.34.0"; outputDevdoc = "out"; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "A6OXpazrJ05SUIO1ZPVN0xHTXOSov8UnPvUolZAv/Iw="; + hash = "sha256-Jt6d5wbhAoSQ2sWyYWW68Y81duc3+QOJK/5JR/lCmnQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix index fc0c7ee573..f762a1e9af 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.45.0"; + version = "0.45.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Vs+LcvGXcFT0kcZHtLv3T+4xV88kP02r9wDC5hBOZCg="; + sha256 = "sha256-dVtUUQ9AUQ85vsFwDb3xnR3UWxvSDMosC8QPW8AGHf4="; }; - cargoHash = "sha256-DbFvsOLJ+diLzQXzl6csuVMqjBbI3z+vO37HQ/WnLR4="; + cargoHash = "sha256-NXofEGJ1Sn7xnn8xxD9ZXBjoG/ZJgWvP0vCAJiwxK38="; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix index 634f03101c..abc665d25c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "earthly"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-nvjoHU+LuyZy8NxMRWYMCQlvq5E6va2x16JRDdFI+70="; + hash = "sha256-bybWd+7+bbzxg2cXvat9lOZm+JNHaB/MsimAgbpLwuE="; }; vendorHash = "sha256-66xN4uUeEFHpI/pAP7akG4YQhbY7ylu8AVOJnx60c7s="; diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/binary/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/binary/default.nix index 41b3f1022e..b884428cf8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/binary/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/binary/default.nix @@ -1,44 +1,11 @@ -{ callPackage }: +{ lib, callPackage }: let mkElectron = callPackage ./generic.nix { }; + infoJson = builtins.fromJSON (builtins.readFile ./info.json); in -rec { - electron-bin = electron_29-bin; - - electron_24-bin = mkElectron "24.8.6" { - armv7l-linux = "8f46901667a904a62df7043991f20dc1c2a00370a42159976855458562cda8fc"; - aarch64-linux = "599e78a3a8127828ea3fa444927e7e51035dba9811ce0d81d59ad9b0bd02b4f6"; - x86_64-linux = "61e87bbd361da101c6a8363cc9c1f8b8b51db61b076cf495d3f4424303265a96"; - x86_64-darwin = "067ce05d628b44e1393369c506268915081ac9d96c0973d367262c71dcd91078"; - aarch64-darwin = "d9093e6928b2247336b3f0811e4f66c4ae50a719ec9399c393ac9556c8e56cee"; - headers = "009p1ffh2cyn98fcmprrjzq79jysp7h565v4f54wvjxjsq2nkr97"; - }; - - electron_27-bin = mkElectron "27.3.11" { - armv7l-linux = "012127a3edf79e0e4623a08e853286e1cba512438a0414b1ab19b75d929c1cf2"; - aarch64-linux = "ddbfcd5e04450178ca4e3113f776893454822af6757761adc792692f7978e0df"; - x86_64-linux = "e3a6f55e54e7a623bba1a15016541248408eef5a19ab82a59d19c807aab14563"; - x86_64-darwin = "357e70a1c8848d4ac7655346bec98dd18a7c0cee82452a7edf76142017779049"; - aarch64-darwin = "a687b199fcb9890f43af90ac8a4d19dc7b15522394de89e42abd5f5c6b735804"; - headers = "0vrjdvqllfyz09sw2y078mds1di219hnmska8bw8ni7j35wxr2br"; - }; - - electron_28-bin = mkElectron "28.3.1" { - armv7l-linux = "2e22fbab2376a9bbeb8cbdd7d9bb3ca69fda6adeafa2b22ffb67157fcfcdb6ff"; - aarch64-linux = "3e46c3076041386213f7b9ebc12335889fbad5822ffc306cf7514abb88de8512"; - x86_64-linux = "e3be93e1a15d61f72e074aee021e12f20465b81f51b8c1170bd9072d7d695c3a"; - x86_64-darwin = "bd8a220fd906625ad4a8edf92e80e8eff89d51f40c22168e05090daa7c12bd66"; - aarch64-darwin = "53fc040cd09e955e013254f784cf51712029ded4a574559cf5fa19c9a911d75d"; - headers = "07iv5fh0yxv17c1akb2j4ab5xhv29d9zsgi6dm2r0n4pnf72wxwr"; - }; - - electron_29-bin = mkElectron "29.3.0" { - armv7l-linux = "51a8b2d67ae58b01919d6eb9e8eef255cd4bb3475b3acaf58ed1b8dc2448f206"; - aarch64-linux = "bd74743eb03a77f40b65739b9ca751af264c6f428e16728d7e0332a4c94789a9"; - x86_64-linux = "7274fe2bbb2e3b71f8fc084921e22d10e529220d380a354827b274f9567261da"; - x86_64-darwin = "88873a315ddd2a70b82e83f2cb7495c0d9d7c7fb5c9ad14fcfee16af4ab89d5e"; - aarch64-darwin = "b3145bbd45007918c2365b1df59a35b4d0636222cd43eea4803580de36b9a17d"; - headers = "1smvjlgdp3ailmh0fvxj96p7cnvls19w7kdwn62v1s3xpl84b915"; - }; -} +lib.mapAttrs' (majorVersion: info: + lib.nameValuePair + "electron_${majorVersion}-bin" + (mkElectron info.version info.hashes) +) infoJson diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/binary/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/binary/generic.nix index fb2fcdd6cb..f9e493e6b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/binary/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/binary/generic.nix @@ -3,7 +3,7 @@ , libXScrnSaver , makeWrapper , fetchurl -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtk3 , unzip @@ -112,7 +112,7 @@ let nativeBuildInputs = [ unzip makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/binary/info.json b/third_party/nixpkgs/pkgs/development/tools/electron/binary/info.json new file mode 100644 index 0000000000..f72fd9479c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/electron/binary/info.json @@ -0,0 +1,57 @@ +{ + "24": { + "hashes": { + "aarch64-darwin": "d9093e6928b2247336b3f0811e4f66c4ae50a719ec9399c393ac9556c8e56cee", + "aarch64-linux": "599e78a3a8127828ea3fa444927e7e51035dba9811ce0d81d59ad9b0bd02b4f6", + "armv7l-linux": "8f46901667a904a62df7043991f20dc1c2a00370a42159976855458562cda8fc", + "headers": "009p1ffh2cyn98fcmprrjzq79jysp7h565v4f54wvjxjsq2nkr97", + "x86_64-darwin": "067ce05d628b44e1393369c506268915081ac9d96c0973d367262c71dcd91078", + "x86_64-linux": "61e87bbd361da101c6a8363cc9c1f8b8b51db61b076cf495d3f4424303265a96" + }, + "version": "24.8.6" + }, + "27": { + "hashes": { + "aarch64-darwin": "a687b199fcb9890f43af90ac8a4d19dc7b15522394de89e42abd5f5c6b735804", + "aarch64-linux": "ddbfcd5e04450178ca4e3113f776893454822af6757761adc792692f7978e0df", + "armv7l-linux": "012127a3edf79e0e4623a08e853286e1cba512438a0414b1ab19b75d929c1cf2", + "headers": "0vrjdvqllfyz09sw2y078mds1di219hnmska8bw8ni7j35wxr2br", + "x86_64-darwin": "357e70a1c8848d4ac7655346bec98dd18a7c0cee82452a7edf76142017779049", + "x86_64-linux": "e3a6f55e54e7a623bba1a15016541248408eef5a19ab82a59d19c807aab14563" + }, + "version": "27.3.11" + }, + "28": { + "hashes": { + "aarch64-darwin": "53fc040cd09e955e013254f784cf51712029ded4a574559cf5fa19c9a911d75d", + "aarch64-linux": "3e46c3076041386213f7b9ebc12335889fbad5822ffc306cf7514abb88de8512", + "armv7l-linux": "2e22fbab2376a9bbeb8cbdd7d9bb3ca69fda6adeafa2b22ffb67157fcfcdb6ff", + "headers": "07iv5fh0yxv17c1akb2j4ab5xhv29d9zsgi6dm2r0n4pnf72wxwr", + "x86_64-darwin": "bd8a220fd906625ad4a8edf92e80e8eff89d51f40c22168e05090daa7c12bd66", + "x86_64-linux": "e3be93e1a15d61f72e074aee021e12f20465b81f51b8c1170bd9072d7d695c3a" + }, + "version": "28.3.1" + }, + "29": { + "hashes": { + "aarch64-darwin": "838cc0f125b3d481c12fc59c37c941b8230770eb2f45529d33718ab2a09b2c51", + "aarch64-linux": "c2216bb8c90b6f971b180f2162a874e8838cc4e4e24cd7444b19ebb091a90222", + "armv7l-linux": "9fc8ddb64c8741cf37eac9a98f32313fa373bf4159ebbb0329c7eb5508863efd", + "headers": "0d4ncjwgi916jzb2cf0wp4hdp5q87bk5jq91s3x3crrcl1i6y1q8", + "x86_64-darwin": "f188f44a9bb900b583afed7de6a9268681f7872e5f0b57991cbfe530deda48d1", + "x86_64-linux": "a9eaa03e9b926938c118fd59c3810531c40bdc0da4582229be1da20f36c161e3" + }, + "version": "29.3.3" + }, + "30": { + "hashes": { + "aarch64-darwin": "e082df9ed071ec82358a805c739ca602de083ea953bedab6af619db6537d0628", + "aarch64-linux": "0275107afdf820309fd9b0fe09a621a7a53266998c123140cab25cb7ba5d5813", + "armv7l-linux": "2bd466054806c67c73774d9b7005b51580b19effcc7e993e53cef2458d0bb0af", + "headers": "0prhxzaaaagbr6bnis38y5iljx7rz24x62wbps1nby96p8gqh4sa", + "x86_64-darwin": "a4d8c8e161d53933fa3a104a0ca8fab3c914b3517114f209d8b927eedd6a7765", + "x86_64-linux": "585cb89f3f11ae11e70d60c47b8ece8833bd176760a3fda47dfa3fe1c4e7c34b" + }, + "version": "30.0.3" + } +} diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/binary/print-hashes.sh b/third_party/nixpkgs/pkgs/development/tools/electron/binary/print-hashes.sh deleted file mode 100755 index 37cd7d3c66..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/electron/binary/print-hashes.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -set -eu -o pipefail - -if [[ $# -lt 1 ]]; then - echo "$0: version" >&2 - exit 1 -fi - -VERSION="$1" - -declare -A SYSTEMS HASHES -SYSTEMS=( - [i686-linux]=linux-ia32 - [x86_64-linux]=linux-x64 - [armv7l-linux]=linux-armv7l - [aarch64-linux]=linux-arm64 - [x86_64-darwin]=darwin-x64 - [aarch64-darwin]=darwin-arm64 -) - -hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" | tail -n1)" -headers="$(nix-prefetch-url "https://artifacts.electronjs.org/headers/dist/v${VERSION}/node-v${VERSION}-headers.tar.gz")" - -# Entry similar to the following goes in default.nix: - -echo " electron_${VERSION%%.*}-bin = mkElectron \"${VERSION}\" {" - -for S in "${!SYSTEMS[@]}"; do - hash="$(grep " *electron-v${VERSION}-${SYSTEMS[$S]}.zip$" "$hashfile"|cut -f1 -d' ' || :)" - if [[ -n $hash ]]; then - echo " $S = \"$hash\";" - fi -done - -echo " headers = \"$headers\";" - -echo " };" diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/common.nix b/third_party/nixpkgs/pkgs/development/tools/electron/common.nix index fd17d7aa35..3ac10225be 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/common.nix @@ -49,7 +49,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { src = null; - patches = base.patches ++ lib.optional (lib.versionAtLeast info.version "29") + patches = base.patches ++ lib.optional (lib.versionAtLeast info.version "29" && lib.versionOlder info.version "30") (substituteAll { # disable a component that requires CIPD blobs name = "disable-screen-ai.patch"; @@ -236,7 +236,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { homepage = "https://github.com/electron/electron"; platforms = lib.platforms.linux; license = licenses.mit; - maintainers = with maintainers; [ yayayayaka yuka ]; + maintainers = with maintainers; [ yayayayaka ]; mainProgram = "electron"; hydraPlatforms = lib.optionals (!(hasInfix "alpha" info.version) && !(hasInfix "beta" info.version)) ["aarch64-linux" "x86_64-linux"]; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/info.json b/third_party/nixpkgs/pkgs/development/tools/electron/info.json index 0304f0bbec..8eeb05107c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/info.json +++ b/third_party/nixpkgs/pkgs/development/tools/electron/info.json @@ -1,898 +1,50 @@ { - "28": { - "deps": { - "src/electron": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-Y0uNoq5LhlFMxQfqrTjzOokbB7Y6UUAlBCj+Nghiz5w=", - "owner": "electron", - "repo": "electron", - "rev": "v28.3.1" + "27": { + "chrome": "118.0.5993.159", + "chromium": { + "deps": { + "gn": { + "hash": "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M=", + "rev": "cc56a0f98bb34accd5323316e0292575ff17a5d4", + "url": "https://gn.googlesource.com/gn", + "version": "2023-08-10" + } }, + "version": "118.0.5993.159" + }, + "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=", + "deps": { "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-g0aRiWCPrXPKBsOsAgtLmRbOeYigtm05MrWH6/fhQs0=", - "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "120.0.6099.291", - "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " - }, - "src/third_party/clang-format/script": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", - "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9" - }, - "src/third_party/libc++/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-DVO15xGxatRbUp13EoNslGEZ2QSHn97VbEBHyfMvKfQ=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "a429c26ae25c26a569ff12390d5f9be70c5e286b" - }, - "src/third_party/libc++abi/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-QjCPRgFU34wZ8GG/dl+6wi2gflje3fG/x+eokb9W02c=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "2ca9f38714b1465b9f55b5fbd0da5e4342811e2b" - }, - "src/third_party/libunwind/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-bQHo8CKDpqvJcVv6OzVO7LOGTqL9qHqD4n9TtRK0v5g=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "7686b5d38c69d14932abfb1c1a66ba56c78791ad" + "hash": "sha256-3yFHjd3LMXVbF4LX6Bi3yJF0CDVug0cDpGFbP8Ibvk4=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "rev": "118.0.5993.159", + "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { "fetcher": "fetchFromGitiles", "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", - "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", - "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732" + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" }, "src/chrome/test/data/perf/frame_rate/content": { "fetcher": "fetchFromGitiles", "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", - "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git", - "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9" + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" }, "src/chrome/test/data/xr/webvr_info": { "fetcher": "fetchFromGitiles", "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", - "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git", - "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248" + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" }, "src/docs/website": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+UawYfW5FAMpv0TbzSR8qITPGUQulLIZ0mUh6ZdnmMI=", - "url": "https://chromium.googlesource.com/website.git", - "rev": "07714da3c28b942dc8522affed4487403e971545" + "hash": "sha256-6/LSJGUVZuJe1WIBJEJO/dXZYnsby+X3EzeBbvWjUZU=", + "rev": "243c1406199960e001e1dceccafc6fc2db6897f9", + "url": "https://chromium.googlesource.com/website.git" }, - "src/media/cdm/api": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", - "url": "https://chromium.googlesource.com/chromium/cdm.git", - "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28" - }, - "src/net/third_party/quiche/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-JXWGEsJrXRXs2BrkWIC8cUBD6uvt8ftb9V5Dy2yLc/w=", - "url": "https://quiche.googlesource.com/quiche.git", - "rev": "a01a131ca6df63e774809d623f47e8cf28c574cc" - }, - "src/third_party/angle": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-aOV7kxrF8FeoHYodZjaUrDDUtpXg2gUiZg6Olv90puk=", - "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "6fff8ebc937f07e31473ac014a55f662248ab39a" - }, - "src/third_party/angle/third_party/glmark2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", - "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", - "rev": "ca8de51fedb70bace5351c6b002eb952c747e889" - }, - "src/third_party/angle/third_party/rapidjson/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", - "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson", - "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f" - }, - "src/third_party/angle/third_party/VK-GL-CTS/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+g1yjF1yETrL1X6Cxu5mhPWXukWygg1dnawU8S9cGkA=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "7d738783bf286e82937e431c295d4682f3767267" - }, - "src/third_party/anonymous_tokens/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-2B0j9vNF8nMhmedk+ghz4JJJiDKN6jnVfdqsa4zRWeU=", - "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", - "rev": "47d423347823088a21b26262ca553eadb8e5b220" - }, - "src/third_party/content_analysis_sdk/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", - "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", - "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc" - }, - "src/third_party/dav1d/libdav1d": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9SrbxiOqXKTFf4qZ4Wqg9aoOMY8zv7NczTqN2+lXwCI=", - "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "47107e384bd1dc25674acf04d000a8cdc6195234" - }, - "src/third_party/dawn": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5srmcwL9Zqv91LwoBf9xuyusq1ghDo30Aj27Xo96yPc=", - "url": "https://dawn.googlesource.com/dawn.git", - "rev": "c7ed440d75861649d8a1ef4b775384f31211d902" - }, - "src/third_party/dawn/third_party/glfw": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", - "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", - "rev": "62e175ef9fae75335575964c845a302447c012c7" - }, - "src/third_party/dawn/third_party/dxc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EAfTm0QZcihcU6ufBHE1QsYRggNWNKHjVZXcrUp/T+c=", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "64030a4e01e27c608b6c5f1ab5add43575e086f9" - }, - "src/third_party/dawn/third_party/dxheaders": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", - "rev": "980971e835876dc0cde415e8f9bc646e64667bf7" - }, - "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry", - "rev": "5bae8738b23d06968e7c3a41308568120943ae77" - }, - "src/third_party/dawn/third_party/khronos/EGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry", - "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071" - }, - "src/third_party/dawn/third_party/webgpu-cts": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-DqQIyZU6kYYRoouIiJnJBit8l38wPu08zbJhM2BQbs4=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "2ef3f322027bec1bb5572f5083d478148d355d79" - }, - "src/third_party/highway/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", - "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", - "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a" - }, - "src/third_party/google_benchmark/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", - "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", - "rev": "b177433f3ee2513b1075140c723d73ab8901790f" - }, - "src/third_party/boringssl/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hxPNJzWS2f4iUsNYwRvxiTL9vRrcZzZT5KpIx3+WuGM=", - "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "c38dc29860a72540eb2c4fdb8a8bfb27ef94ddf3" - }, - "src/third_party/breakpad/breakpad": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A=", - "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "8988364bcddd9b194b0bf931c10bc125987330ed" - }, - "src/third_party/cast_core/public/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", - "url": "https://chromium.googlesource.com/cast_core/public", - "rev": "71f51fd6fa45fac73848f65421081edd723297cd" - }, - "src/third_party/catapult": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-jueHC5YC+WmGRtGZ8yD6QT2pVj21n1THpIz/vI9M334=", - "url": "https://chromium.googlesource.com/catapult.git", - "rev": "47efdb4b1428e549c58a6d6c2fa79c4a8ceaf9b4" - }, - "src/third_party/ced/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", - "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", - "rev": "ba412eaaacd3186085babcd901679a48863c7dd5" - }, - "src/third_party/chromium-variations": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-cRFzDmGoyrxwPDVvatGm3EutOXtWqqlI7v7BeX5d43s=", - "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "cb7fe7e32de8b885ccdd6293444d8e4028b03eca" - }, - "src/third_party/cld_3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", - "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", - "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661" - }, - "src/third_party/colorama/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", - "url": "https://chromium.googlesource.com/external/colorama.git", - "rev": "3de9f013df4b470069d03d250224062e8cf15c49" - }, - "src/third_party/cpu_features/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", - "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git", - "rev": "936b9ab5515dead115606559502e3864958f7f6e" - }, - "src/third_party/cpuinfo/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-BcSG/1aa/cyT8CCd1Qdsm/yXa5bCrmrtaRxnYjwkspY=", - "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "76d5e8f5b563daa65340a60fce0e9aec73a936df" - }, - "src/third_party/crc32c/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", - "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", - "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6" - }, - "src/third_party/cros_system_api": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wI4rx+oQ6i8yIB8NBp/O471O4pVJL3l+ez0t8I5oD/w=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "00c21541508ea2c6863f1cda24ef88ef30309ae8" - }, - "src/third_party/crossbench": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-s/+y5bMj+CRnljFZ5aWKirPCsRUjckLOZ5F65WnPYSY=", - "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "06981428c28d66678ebec13ca1fac3785cf51bb1" - }, - "src/third_party/depot_tools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WtosDcMOV9eh0PhTbB5w3x3AYQs3Ui4h3mV0Ib0CBlc=", - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "9f3b33a275e7a5b19d8ce4aba7960d2a38858681" - }, - "src/third_party/devtools-frontend/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-B/2Qk5LSElBPNImlZHVF3A4g0GFE9OHG/+4QADpK+8w=", - "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "a6c7f00333881a7ecf7044b725052ab0c8776d6f" - }, - "src/third_party/dom_distiller_js/dist": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", - "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", - "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d" - }, - "src/third_party/eigen3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-mfS/l+V0If3fmXvA1p5gtyrNCU6IqWYrBbzm4jkXC3I=", - "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "aa6964bf3a34fd607837dd8123bc42465185c4f8" - }, - "src/third_party/farmhash/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", - "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", - "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45" - }, - "src/third_party/ffmpeg": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-lomUDmbbYW95BHEuYmm0pVqf++nYEa2XxeW4ag36tgc=", - "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "e1ca3f06adec15150a171bc38f550058b4bbb23b" - }, - "src/third_party/flac": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", - "url": "https://chromium.googlesource.com/chromium/deps/flac.git", - "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c" - }, - "src/third_party/flatbuffers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=", - "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", - "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5" - }, - "src/third_party/fontconfig/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=", - "url": "https://chromium.googlesource.com/external/fontconfig.git", - "rev": "2fb3419a92156569bc1ec707401258c922cd0d99" - }, - "src/third_party/fp16/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git", - "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91" - }, - "src/third_party/gemmlowp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", - "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git", - "rev": "13d57703abca3005d97b19df1f2db731607a7dc2" - }, - "src/third_party/grpc/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", - "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git", - "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737" - }, - "src/third_party/freetype/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wyaCNPPL2CTZYY6YUUuGnN3TjHxgKeHAYsw+r88ijMI=", - "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "55d0287cfc31115760cb13caa346b407ef0c0ceb" - }, - "src/third_party/freetype-testing/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", - "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", - "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f" - }, - "src/third_party/fxdiv/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", - "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8" - }, - "src/third_party/harfbuzz-ng/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xCsfgbsWVSiuII5zFspssrqX4NrRuhzufYSq6fdnjKQ=", - "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "f26fd69d858642d76413b8f4068eaf9b57c40a5f" - }, - "src/third_party/emoji-segmenter/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", - "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", - "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e" - }, - "src/third_party/ots/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", - "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git", - "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33" - }, - "src/third_party/libgav1/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-dT8/Mdit3Qc5Sno6DYKv1qSNr+6Lhiy24ZNNBKoVq8I=", - "url": "https://chromium.googlesource.com/codecs/libgav1.git", - "rev": "df0023cc95b8e606a2fd243522d823401ef86637" - }, - "src/third_party/googletest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", - "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "af29db7ec28d6df1c7f0f745186884091e602e07" - }, - "src/third_party/hunspell_dictionaries": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", - "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", - "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e" - }, - "src/third_party/icu": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9yFRBrHdWcYgrZAaigS8XnxNsqJNklGdFkAAgVdHXFU=", - "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed" - }, - "src/third_party/jsoncpp/source": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", - "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448" - }, - "src/third_party/leveldatabase/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", - "url": "https://chromium.googlesource.com/external/leveldb.git", - "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea" - }, - "src/third_party/libFuzzer/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", - "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303" - }, - "src/third_party/fuzztest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wuB/lbkVCbisZvVFuLdE8XNDuiLQcI47/Y0EqvOCytc=", - "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "b5dbc33890d9586e4f6a213f1bf163ad287e6aa4" - }, - "src/third_party/libaddressinput/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", - "url": "https://chromium.googlesource.com/external/libaddressinput.git", - "rev": "e8712e415627f22d0b00ebee8db99547077f39bd" - }, - "src/third_party/libaom/source/libaom": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6oZWYXRTZ1IC5yGvfPI19PwPU9O7mKBsW2wVxBGwU/I=", - "url": "https://aomedia.googlesource.com/aom.git", - "rev": "1dbe1c7fae2456f91ccc79fecb919e9ffea0727a" - }, - "src/third_party/libavif/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Jd/KwJJ1oeQMLg8CShTTDQhCVHEDpXcQHiA4+NXYOIA=", - "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "1a78d970b8315e7cc6a8601861ec75189c50c214" - }, - "src/third_party/libavifinfo/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", - "url": "https://aomedia.googlesource.com/libavifinfo.git", - "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a" - }, - "src/third_party/nearby/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9PT/tuxjREGsvSnYT2wyaL5sB52CcYPpKVKN0ZGldWU=", - "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "629e7ba7c964a62c97f6a882bffaec3c8490bb1e" - }, - "src/third_party/beto-core/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-qgsPK7RyVqGRji0sTcMck1JqX9iCsYIExGoGwNZyVT0=", - "url": "https://beto-core.googlesource.com/beto-core.git", - "rev": "b902b346037ea3f4aadf8177021f6f917b16e648" - }, - "src/third_party/securemessage/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", - "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git", - "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84" - }, - "src/third_party/speedometer/v3.0": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-PqrwtPFU3TI840za3UU8p+t4ZdyX0l79esEA602Mbq0=", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "5107c739c1b2a008e7293e3b489c4f80a8fb2e01" - }, - "src/third_party/ukey2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", - "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", - "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47" - }, - "src/third_party/cros-components/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ZjLMlNDDN08v9SUFAuroPsu/6ADLHZAAFpv+bmaJA2Y=", - "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "25159cae8d540780cbeb994692ce4a3ea14cc094" - }, - "src/third_party/libdrm/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", - "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1" - }, - "src/third_party/expat/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", - "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "441f98d02deafd9b090aea568282b28f66a50e36" - }, - "src/third_party/libipp/libipp": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", - "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f" - }, - "src/third_party/libjpeg_turbo": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", - "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "9b894306ec3b28cea46e84c32b56773a98c483da" - }, - "src/third_party/liblouis/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", - "url": "https://chromium.googlesource.com/external/liblouis-github.git", - "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376" - }, - "src/third_party/libphonenumber/dist": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", - "url": "https://chromium.googlesource.com/external/libphonenumber.git", - "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362" - }, - "src/third_party/libprotobuf-mutator/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", - "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", - "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf" - }, - "src/third_party/libsrtp": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", - "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", - "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a" - }, - "src/third_party/libsync/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", - "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git", - "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6" - }, - "src/third_party/libvpx/source/libvpx": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UA/pf35eWFArRM+QdN6i6LK0ePWzXEsviHlf3WUgMoM=", - "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "424723dc025ce451dab9568239a46b18d0919b4d" - }, - "src/third_party/libwebm/source": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", - "url": "https://chromium.googlesource.com/webm/libwebm.git", - "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da" - }, - "src/third_party/libwebp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=", - "url": "https://chromium.googlesource.com/webm/libwebp.git", - "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760" - }, - "src/third_party/libyuv": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", - "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406" - }, - "src/third_party/lss": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", - "url": "https://chromium.googlesource.com/linux-syscall-support.git", - "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521" - }, - "src/third_party/material_color_utilities/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oi28dWuTd6ijn/RKSPukDr5GSzYiCTM2klFb7WSMDHY=", - "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", - "rev": "234a000e507d586c20df6e3bf5b9e035bc5ce7b1" - }, - "src/third_party/minigbm/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", - "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git", - "rev": "3018207f4d89395cc271278fb9a6558b660885f5" - }, - "src/third_party/nasm": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=", - "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce" - }, - "src/third_party/neon_2_sse/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", - "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", - "rev": "a15b489e1222b2087007546b4912e21293ea86ff" - }, - "src/third_party/openh264/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", - "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", - "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7" - }, - "src/third_party/openscreen/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TyZ/sZ0gnesWjKUnO2RVM2TTdpVIxsBWueHDgix0/wg=", - "url": "https://chromium.googlesource.com/openscreen", - "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665" - }, - "src/third_party/openscreen/src/third_party/tinycbor/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", - "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", - "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7" - }, - "src/third_party/pdfium": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-U1cScrfKN0F+cy307RT2iwB6RYKeCNDRnkYxzamezoY=", - "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "a3895af47f600e3f9677f31fa39e15bd01c18457" - }, - "src/third_party/perfetto": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xLx+dnUysm+HS1esu2hAqBKg/GgTJK4SQu1ZINr2aYc=", - "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "7ce535ddfc62d30166f35a8ed0f121da5eb0437c" - }, - "src/third_party/pthreadpool/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git", - "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8" - }, - "src/third_party/pyelftools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", - "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae" - }, - "src/third_party/quic_trace/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", - "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc" - }, - "src/third_party/pywebsocket3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", - "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2" - }, - "src/third_party/re2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-m3bJlSyyhmj/7jvy7ExNX/gol7yeu1mnmyAc8u8Pr8s=", - "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "3d9bdbd0e208d3274a1cb1275c94d8b7626ddde2" - }, - "src/third_party/ruy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Zi3A49YqDE5S4iSpw9t9kTzitbQbcslm1zsepWX5cbw=", - "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", - "rev": "6ffa93a89376555b09134c59b84d8f5e9cfc6ce6" - }, - "src/third_party/skia": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-CvoJxsBN1Nyh+RPgU+aptZW5WsfGB4hmSlhyma1wO+E=", - "url": "https://skia.googlesource.com/skia.git", - "rev": "349c1179c43ef46f2804404952b9460dc007d76a" - }, - "src/third_party/smhasher/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", - "url": "https://chromium.googlesource.com/external/smhasher.git", - "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f" - }, - "src/third_party/snappy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", - "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git", - "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c" - }, - "src/third_party/sqlite/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wKsfwZpDRQzYQp6qls07uapgy9K3TWLOEUQlhIFpJtw=", - "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "cd9486849ba3c3ec753f556fd29c0aabee122a28" - }, - "src/third_party/swiftshader": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Im4sdDo4b96YQIKDcAmqUk8PiJzejZgSDPur3hqPPRk=", - "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "d9ec9befba05a8dfca09c1e88f3f7be0e4b153c6" - }, - "src/third_party/text-fragments-polyfill/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", - "rev": "c036420683f672d685e27415de0a5f5e85bdc23f" - }, - "src/third_party/tflite/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-119/isDtopnj6MBRr3bzBvIppXw8M/ejcPx0CmIjXZU=", - "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "21e56c30e480ac67bed48335a5d122c59a6a6805" - }, - "src/third_party/vulkan-deps": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-lqCUx70IeHZ7YfE9DXia7dFok/JsFu/HSIv2AGi37YI=", - "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "2b783ed328d3a46e6a7a21218ced6b4dd1684114" - }, - "src/third_party/vulkan-deps/glslang/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+Qs+Q3p11y9oUKyWEbuaQ0vx6hppFZSFbFuU0ve6rRo=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "ebb0a8b28e5ea7a13146a24b3ad87b1966dbdfa3" - }, - "src/third_party/vulkan-deps/spirv-cross/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UIk5hihUPjXNzEeO2laS4dUef/rEExxXAZjMcftx+3A=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", - "rev": "2de1265fca722929785d9acdec4ab728c47a0254" - }, - "src/third_party/vulkan-deps/spirv-headers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-JLFVzFNdXqxyKmg3NymIqqZmf2GAb7tYetQ6HJPsUIQ=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "88bc5e321c2839707df8b1ab534e243e00744177" - }, - "src/third_party/vulkan-deps/spirv-tools/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+HUDsp0COKlPtKidOVvUk7lN1AiFw01i5ANc3MO+qjs=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "5084f58e5d187b16f84d2af936ff94ea2f46a00c" - }, - "src/third_party/vulkan-deps/vulkan-headers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UlaNc1NxTYulrF4Ol0rLysbLwbFR46Evq7WkWncPB8k=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "f4bfcd885214675a6a0d7d4df07f52b511e6ea16" - }, - "src/third_party/vulkan-deps/vulkan-loader/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GbVr8LmwC6r7a13++5cYJXAq+H4P07quEHpTUV1qfqA=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "7b7d15bc9f1d782e4d6ea34e61fd9a36a7952208" - }, - "src/third_party/vulkan-deps/vulkan-tools/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-vnrhYM7tcDTcXH4A+2leio5Wc1+b5H+7CQISEI+SPV8=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "f7017f23337b90a2b2ceb65a4e1050e8ad89e065" - }, - "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-buxOdupK/w1sFGGHrEI+On2/mR0q5whvQNKUI8dxJ60=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "dcfce25b439a2785f2c90b184e1964898070b4f1" - }, - "src/third_party/vulkan-deps/vulkan-validation-layers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LJd7pkcFd8k4npEv8mJy+47xo/5CXMN75ZAtDp+v6FI=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "281e1c1c6b51bb6b33f88c18ed4da58ac3024311" - }, - "src/third_party/vulkan_memory_allocator": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", - "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", - "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21" - }, - "src/third_party/wayland/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0ICSMZhnsLqMNfqSGjqM3p4ssxptkBtt7EMCpxknW4A=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", - "rev": "3fda2fbf51db54398c0155facee82cc9533958a2" - }, - "src/third_party/wayland-protocols/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git", - "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867" - }, - "src/third_party/wayland-protocols/kde": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", - "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git", - "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e" - }, - "src/third_party/wayland-protocols/gtk": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", - "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git", - "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0" - }, - "src/third_party/webdriver/pylib": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", - "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git", - "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04" - }, - "src/third_party/webgl/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=", - "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", - "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed" - }, - "src/third_party/webgpu-cts/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-E39f0wy72TwQ9IM4QquqWxwDiHZOUI8hWkx2QDFcRog=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "3dbe4ce12983ccc1ad42e228057c7d8adc17cb78" - }, - "src/third_party/webrtc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ju7sX1jrzg5BZOqdkcnFymRTqdFi7xkeHznKJQB1+08=", - "url": "https://webrtc.googlesource.com/src.git", - "rev": "5ab829e4ca8f63be6b4ed1d98eee382d7307d34e" - }, - "src/third_party/wuffs/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", - "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", - "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba" - }, - "src/third_party/weston/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git", - "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7" - }, - "src/third_party/xdg-utils": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", - "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", - "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44" - }, - "src/third_party/xnnpack/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-s9Avx9o+1igKulOpKhtbbkoINuh1wNercPszRaA4TZM=", - "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "bbbaa7352a3ea729987d3e654d37be93e8009691" - }, - "src/tools/page_cycler/acid3": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", - "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", - "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba" - }, - "src/third_party/zstd/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-95OOpYKGve+YWzqqguQIg1emTOAuaGyYpWxrWVDOKAQ=", - "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "cdceb0fce59785c841bf697e00067163106064e1" - }, - "src/v8": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GevDXfVX4UxwTbgp2ZQbp3AFOHv5tECmyqLGIyYi5Tw=", - "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "71b6b5a68e0883c155e01368aace6eb6d71b85f3" - }, - "src/third_party/nan": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", - "owner": "nodejs", - "repo": "nan", - "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" - }, - "src/third_party/electron_node": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-yvMU6dXRzHP7l6axo3g4svJ1H2edtFvX2MVMm3K1bEc=", - "owner": "nodejs", - "repo": "node", - "rev": "v18.18.2" - }, - "src/third_party/squirrel.mac": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", - "owner": "Squirrel", - "repo": "Squirrel.Mac", - "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" - }, - "src/third_party/squirrel.mac/vendor/ReactiveObjC": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", - "owner": "ReactiveCocoa", - "repo": "ReactiveObjC", - "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" - }, - "src/third_party/squirrel.mac/vendor/Mantle": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", - "owner": "Mantle", - "repo": "Mantle", - "rev": "78d3966b3c331292ea29ec38661b25df0a245948" - } - }, - "version": "28.3.1", - "modules": "119", - "chrome": "120.0.6099.291", - "node": "18.18.2", - "chromium": { - "version": "120.0.6099.291", - "deps": { - "gn": { - "version": "2023-10-23", - "url": "https://gn.googlesource.com/gn", - "rev": "e4702d7409069c4f12d45ea7b7f0890717ca3f4b", - "hash": "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k=" - } - } - }, - "chromium_npm_hash": "sha256-zexxXAAJDnhMmh7HfBO1V1z1Yds06C3gSpXacsbjUb4=", - "electron_yarn_hash": "117vxam1044yy2akwjfhvb5dpfnv667pwbg92ac43551xfn0slcg" - }, - "27": { - "deps": { "src/electron": { "fetcher": "fetchFromGitHub", "hash": "sha256-DmDAKUUyiDASGGylDVQe2OkDVfiA1ficDG+oaMbKqdo=", @@ -900,841 +52,221 @@ "repo": "electron", "rev": "v27.3.11" }, - "src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3yFHjd3LMXVbF4LX6Bi3yJF0CDVug0cDpGFbP8Ibvk4=", - "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "118.0.5993.159", - "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " - }, - "src/third_party/clang-format/script": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", - "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9" - }, - "src/third_party/libc++/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-YP1LAUaV8epDAsd9LOovdXUyzpaLgffOJcGM6VmTaKc=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "84fb809dd6dae36d556dc0bb702c6cc2ce9d4b80" - }, - "src/third_party/libc++abi/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-CBUw50T/jFMXU0cR+BQH6JyEY3mHamLM6kA8YdvI24Q=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "331847d7a5e6f8706689cf5d468e6e58c868fa10" - }, - "src/third_party/libunwind/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-rqmY4JNm4zuYqXs7o+1QhNnaNX4Cmt7PTJMGploHPnY=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "a321409e66c212098e755cfae1a978bbcff1ccbb" - }, - "src/chrome/test/data/perf/canvas_bench": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", - "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", - "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732" - }, - "src/chrome/test/data/perf/frame_rate/content": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", - "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git", - "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9" - }, - "src/chrome/test/data/xr/webvr_info": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", - "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git", - "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248" - }, - "src/docs/website": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6/LSJGUVZuJe1WIBJEJO/dXZYnsby+X3EzeBbvWjUZU=", - "url": "https://chromium.googlesource.com/website.git", - "rev": "243c1406199960e001e1dceccafc6fc2db6897f9" - }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", - "url": "https://chromium.googlesource.com/chromium/cdm.git", - "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28" + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", + "url": "https://chromium.googlesource.com/chromium/cdm.git" }, "src/net/third_party/quiche/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-hB3gUqi/9SI9PGNkXNpli/TifI1kJEBScqRFIw7hm4c=", - "url": "https://quiche.googlesource.com/quiche.git", - "rev": "7d201495d8a5ef115787765fb12af0d5575281c1" + "rev": "7d201495d8a5ef115787765fb12af0d5575281c1", + "url": "https://quiche.googlesource.com/quiche.git" }, "src/third_party/angle": { "fetcher": "fetchFromGitiles", "hash": "sha256-It05E3+qG17dEbhbaX/VQJaydWOQ1mpsj95dT5IJkgo=", - "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "05f45adc147393562b518ca1f82a3ccba7ee40f7" - }, - "src/third_party/angle/third_party/glmark2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", - "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", - "rev": "ca8de51fedb70bace5351c6b002eb952c747e889" - }, - "src/third_party/angle/third_party/rapidjson/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", - "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson", - "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f" + "rev": "05f45adc147393562b518ca1f82a3ccba7ee40f7", + "url": "https://chromium.googlesource.com/angle/angle.git" }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-LWGll3KiMYndiLZBizhN+mzELjYpSxvtIctH+LO+20Q=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "385ae8bed1f99e497cdf2f3a5640905b90e69292" + "rev": "385ae8bed1f99e497cdf2f3a5640905b90e69292", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" + }, + "src/third_party/angle/third_party/glmark2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" }, "src/third_party/anonymous_tokens/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-TcNIocV0p53NJCudvy8wf+fIPIP2tnkoBf1F7mEBFLs=", - "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", - "rev": "8c8d20953d502db31fec2353b199e6c22ef0236e" - }, - "src/third_party/content_analysis_sdk/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-auHBX00DSvyMyhEsZGkpKh9KOO2RcaeP9PK6kmmMYls=", - "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", - "rev": "8d5118720805fdce0dd3ee2999c964501de4532c" - }, - "src/third_party/dav1d/libdav1d": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-KSo2s3M3S13gY84NlAdnPsjoKfJZy7ipTlWSvUHD9Ak=", - "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "f8ae94eca0f53502a2cddd29a263c1edea4822a0" - }, - "src/third_party/dawn": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7iCJ1h51S/8pxQRMoDtGXzyuP6Dzxnc/1Cu4ALU8NYg=", - "url": "https://dawn.googlesource.com/dawn.git", - "rev": "deb3b674b26854204c8082ed93926207e42d3cf2" - }, - "src/third_party/dawn/third_party/glfw": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", - "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", - "rev": "62e175ef9fae75335575964c845a302447c012c7" - }, - "src/third_party/dawn/third_party/dxc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-u29t+pF7aRfhRmi36YyEPcQU7gIDqsjrf38+C0YIpFk=", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "50c4c887f1ccfa1a4bfb158b7dbc93058659ed01" - }, - "src/third_party/dawn/third_party/dxheaders": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", - "rev": "980971e835876dc0cde415e8f9bc646e64667bf7" - }, - "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry", - "rev": "5bae8738b23d06968e7c3a41308568120943ae77" - }, - "src/third_party/dawn/third_party/khronos/EGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry", - "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071" - }, - "src/third_party/dawn/third_party/webgpu-cts": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gbZpmcbqLisjLb6vnKKvHS6eRqjqvavvTRgxJsaE/RQ=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "5dfa3b88f0863c3949f713804e0461c9cc34a030" - }, - "src/third_party/highway/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", - "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", - "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a" - }, - "src/third_party/google_benchmark/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", - "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", - "rev": "b177433f3ee2513b1075140c723d73ab8901790f" - }, - "src/third_party/boringssl/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-P0Aj2Puy6S1aRIHrAhmokiAmSmHfuWQR6UW/AbQFW+M=", - "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "85081c6b3c0b26129893c1bff6bfa42bc3ba2d2c" - }, - "src/third_party/breakpad/breakpad": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A=", - "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "8988364bcddd9b194b0bf931c10bc125987330ed" - }, - "src/third_party/cast_core/public/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", - "url": "https://chromium.googlesource.com/cast_core/public", - "rev": "71f51fd6fa45fac73848f65421081edd723297cd" - }, - "src/third_party/catapult": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-AK85yVeCR3GKGtdW8G9Of+6UMJirJ9BNVyp9pffft7s=", - "url": "https://chromium.googlesource.com/catapult.git", - "rev": "f16ca3c78e46cefa982100444844da3fcb25390e" - }, - "src/third_party/ced/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", - "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", - "rev": "ba412eaaacd3186085babcd901679a48863c7dd5" - }, - "src/third_party/chromium-variations": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-2lP3uGdqIZY3DpxGzfDhR2dW+o3Arduaeu56Au7h/5Q=", - "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "e0c145ca93c0439a65bcb1607e813edfbc97520b" - }, - "src/third_party/cld_3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", - "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", - "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661" - }, - "src/third_party/colorama/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", - "url": "https://chromium.googlesource.com/external/colorama.git", - "rev": "3de9f013df4b470069d03d250224062e8cf15c49" - }, - "src/third_party/cpu_features/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", - "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git", - "rev": "936b9ab5515dead115606559502e3864958f7f6e" - }, - "src/third_party/cpuinfo/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oZjA2cMQMyhFcI+m6eOmdZ9A1oPAbyISeLxNyaoGivk=", - "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "c13d0bbb266d200a13532b5915d704c30d21081b" - }, - "src/third_party/crc32c/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", - "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", - "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6" - }, - "src/third_party/cros_system_api": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wq7fJVNRSiyaADrCYB0TEmWQ//BJg4GYiHZNtMb1QlI=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "81ac4449008dffea00e4e8f251f87fabc5abe0d3" - }, - "src/third_party/crossbench": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-s/+y5bMj+CRnljFZ5aWKirPCsRUjckLOZ5F65WnPYSY=", - "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "06981428c28d66678ebec13ca1fac3785cf51bb1" - }, - "src/third_party/depot_tools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EXxlQGA7qwjuZ2Qg/rZinkllkdfCbKXz8c4JJEr4mtU=", - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "7e251262409b3401809e57c5314dd158210355b8" - }, - "src/third_party/devtools-frontend/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-D3W8U19i5pHWPLviMKbpzhiDoF6A0+tClYJcZWdbTqk=", - "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "bcf0ed097be848d234fb5290c1e4d69672dc5405" - }, - "src/third_party/dom_distiller_js/dist": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", - "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", - "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d" - }, - "src/third_party/eigen3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-c/4bf5+sJEgsKOJ34wPDNm1+6QUzETZZr/nE4SG5nKA=", - "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "66e8f38891841bf88ee976a316c0c78a52f0cee5" - }, - "src/third_party/farmhash/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", - "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", - "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45" - }, - "src/third_party/ffmpeg": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-uRgHTVaCAEaoqY20SmePQbApPmjimgggm5922KKfnbc=", - "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "0ba37733400593b162e5ae9ff26b384cff49c250" - }, - "src/third_party/flac": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", - "url": "https://chromium.googlesource.com/chromium/deps/flac.git", - "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c" - }, - "src/third_party/flatbuffers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yibx1WMAwNajROMGVqox3naMU09RSayxUaTCJ860euo=", - "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", - "rev": "28861d1d7d5ec6ce34d4bbdc10bec4aace341167" - }, - "src/third_party/fontconfig/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=", - "url": "https://chromium.googlesource.com/external/fontconfig.git", - "rev": "2fb3419a92156569bc1ec707401258c922cd0d99" - }, - "src/third_party/fp16/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git", - "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91" - }, - "src/third_party/gemmlowp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", - "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git", - "rev": "13d57703abca3005d97b19df1f2db731607a7dc2" - }, - "src/third_party/grpc/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", - "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git", - "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737" - }, - "src/third_party/freetype/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-RRieGqEeAk5AYzJqPRpF25FmxMpEYwR7AQWLzXkED50=", - "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "45903920b984540bb629bc89f4c010159c23a89a" - }, - "src/third_party/freetype-testing/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", - "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", - "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f" - }, - "src/third_party/fxdiv/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", - "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8" - }, - "src/third_party/harfbuzz-ng/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+fClyD9Rsge9qdGF8WCv8taLTWNL8iManpXZUzDL2LM=", - "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "db700b5670d9475cc8ed4880cc9447b232c5e432" - }, - "src/third_party/emoji-segmenter/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", - "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", - "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e" - }, - "src/third_party/ots/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", - "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git", - "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33" - }, - "src/third_party/libgav1/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-dT8/Mdit3Qc5Sno6DYKv1qSNr+6Lhiy24ZNNBKoVq8I=", - "url": "https://chromium.googlesource.com/codecs/libgav1.git", - "rev": "df0023cc95b8e606a2fd243522d823401ef86637" - }, - "src/third_party/googletest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", - "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "af29db7ec28d6df1c7f0f745186884091e602e07" - }, - "src/third_party/hunspell_dictionaries": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", - "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", - "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e" - }, - "src/third_party/icu": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9yFRBrHdWcYgrZAaigS8XnxNsqJNklGdFkAAgVdHXFU=", - "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed" - }, - "src/third_party/jsoncpp/source": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", - "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448" - }, - "src/third_party/leveldatabase/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", - "url": "https://chromium.googlesource.com/external/leveldb.git", - "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea" - }, - "src/third_party/libFuzzer/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Zp8Ea/7GwmEl964MEIk3UM6IR5+FtUz8InlqZaOniDA=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", - "rev": "26cc39e59b2bf5cbc20486296248a842c536878d" - }, - "src/third_party/fuzztest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-tVtrSbLxnHrbh027cafNbqkfjq/afQxw57rW9yGsRe0=", - "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "25f44f341f701eccc29d22f69313a54363c6099b" - }, - "src/third_party/libaddressinput/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", - "url": "https://chromium.googlesource.com/external/libaddressinput.git", - "rev": "e8712e415627f22d0b00ebee8db99547077f39bd" - }, - "src/third_party/libaom/source/libaom": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Z8td6FIvHibTQsB6x/A/69xduogj2b2lteiQB6l56vE=", - "url": "https://aomedia.googlesource.com/aom.git", - "rev": "5f8db64abce68a3698fb732697ae50880bc9cac4" - }, - "src/third_party/libavif/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-KfRRGTS8kBwi9Z9wafpSwL29RU38THG2xBCvNBXtZtg=", - "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "b2d36b1c3bfc806694cd4ff0cb188270823fe6d8" - }, - "src/third_party/libavifinfo/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yTv1AGtWfxXcywZycpsQBkBRLwuUJMPFKtpj7nrsc4A=", - "url": "https://aomedia.googlesource.com/libavifinfo.git", - "rev": "707919b2f8ac1920b2f7ae252c233f9c6dcf84e1" - }, - "src/third_party/nearby/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5d7c8WvkjmBuwcwqhxQf0wRE3qaF8fFsiqUE1sHh0nc=", - "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "8725391822b8901784b379a4573ab8828e7091d3" + "rev": "8c8d20953d502db31fec2353b199e6c22ef0236e", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" }, "src/third_party/beto-core/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-qgsPK7RyVqGRji0sTcMck1JqX9iCsYIExGoGwNZyVT0=", - "url": "https://beto-core.googlesource.com/beto-core.git", - "rev": "b902b346037ea3f4aadf8177021f6f917b16e648" + "rev": "b902b346037ea3f4aadf8177021f6f917b16e648", + "url": "https://beto-core.googlesource.com/beto-core.git" }, - "src/third_party/securemessage/src": { + "src/third_party/boringssl/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", - "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git", - "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84" + "hash": "sha256-P0Aj2Puy6S1aRIHrAhmokiAmSmHfuWQR6UW/AbQFW+M=", + "rev": "85081c6b3c0b26129893c1bff6bfa42bc3ba2d2c", + "url": "https://boringssl.googlesource.com/boringssl.git" }, - "src/third_party/speedometer/v3.0": { + "src/third_party/breakpad/breakpad": { "fetcher": "fetchFromGitiles", - "hash": "sha256-PqrwtPFU3TI840za3UU8p+t4ZdyX0l79esEA602Mbq0=", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "5107c739c1b2a008e7293e3b489c4f80a8fb2e01" + "hash": "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A=", + "rev": "8988364bcddd9b194b0bf931c10bc125987330ed", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" }, - "src/third_party/ukey2/src": { + "src/third_party/cast_core/public/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", - "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", - "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47" + "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", + "rev": "71f51fd6fa45fac73848f65421081edd723297cd", + "url": "https://chromium.googlesource.com/cast_core/public" + }, + "src/third_party/catapult": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AK85yVeCR3GKGtdW8G9Of+6UMJirJ9BNVyp9pffft7s=", + "rev": "f16ca3c78e46cefa982100444844da3fcb25390e", + "url": "https://chromium.googlesource.com/catapult.git" + }, + "src/third_party/ced/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" + }, + "src/third_party/chromium-variations": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2lP3uGdqIZY3DpxGzfDhR2dW+o3Arduaeu56Au7h/5Q=", + "rev": "e0c145ca93c0439a65bcb1607e813edfbc97520b", + "url": "https://chromium.googlesource.com/chromium-variations.git" + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", + "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" + }, + "src/third_party/cld_3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" + }, + "src/third_party/colorama/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-auHBX00DSvyMyhEsZGkpKh9KOO2RcaeP9PK6kmmMYls=", + "rev": "8d5118720805fdce0dd3ee2999c964501de4532c", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" + }, + "src/third_party/cpu_features/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" + }, + "src/third_party/cpuinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oZjA2cMQMyhFcI+m6eOmdZ9A1oPAbyISeLxNyaoGivk=", + "rev": "c13d0bbb266d200a13532b5915d704c30d21081b", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" }, "src/third_party/cros-components/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-s8pfcu5SkxXFCat76TJaDi1NTTQckZ1F+T8URCxOUdI=", - "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "bf7aaccb73b26c11e8bf21cb7d90314338e1743f" + "rev": "bf7aaccb73b26c11e8bf21cb7d90314338e1743f", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" }, - "src/third_party/libdrm/src": { + "src/third_party/cros_system_api": { "fetcher": "fetchFromGitiles", - "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", - "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1" + "hash": "sha256-wq7fJVNRSiyaADrCYB0TEmWQ//BJg4GYiHZNtMb1QlI=", + "rev": "81ac4449008dffea00e4e8f251f87fabc5abe0d3", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" }, - "src/third_party/expat/src": { + "src/third_party/crossbench": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", - "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "441f98d02deafd9b090aea568282b28f66a50e36" + "hash": "sha256-s/+y5bMj+CRnljFZ5aWKirPCsRUjckLOZ5F65WnPYSY=", + "rev": "06981428c28d66678ebec13ca1fac3785cf51bb1", + "url": "https://chromium.googlesource.com/crossbench.git" }, - "src/third_party/libipp/libipp": { + "src/third_party/dav1d/libdav1d": { "fetcher": "fetchFromGitiles", - "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", - "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f" + "hash": "sha256-KSo2s3M3S13gY84NlAdnPsjoKfJZy7ipTlWSvUHD9Ak=", + "rev": "f8ae94eca0f53502a2cddd29a263c1edea4822a0", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" }, - "src/third_party/libjpeg_turbo": { + "src/third_party/dawn": { "fetcher": "fetchFromGitiles", - "hash": "sha256-bcmp8RqQYp4lRI9NfdfYgrAJsDLecJEhgRu9oosB9lQ=", - "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "30bdb85e302ecfc52593636b2f44af438e05e784" + "hash": "sha256-7iCJ1h51S/8pxQRMoDtGXzyuP6Dzxnc/1Cu4ALU8NYg=", + "rev": "deb3b674b26854204c8082ed93926207e42d3cf2", + "url": "https://dawn.googlesource.com/dawn.git" }, - "src/third_party/liblouis/src": { + "src/third_party/dawn/third_party/dxc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", - "url": "https://chromium.googlesource.com/external/liblouis-github.git", - "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376" + "hash": "sha256-u29t+pF7aRfhRmi36YyEPcQU7gIDqsjrf38+C0YIpFk=", + "rev": "50c4c887f1ccfa1a4bfb158b7dbc93058659ed01", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" }, - "src/third_party/libphonenumber/dist": { + "src/third_party/dawn/third_party/dxheaders": { "fetcher": "fetchFromGitiles", - "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", - "url": "https://chromium.googlesource.com/external/libphonenumber.git", - "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362" + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" }, - "src/third_party/libprotobuf-mutator/src": { + "src/third_party/dawn/third_party/glfw": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", - "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", - "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf" + "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", + "rev": "62e175ef9fae75335575964c845a302447c012c7", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" }, - "src/third_party/libsrtp": { + "src/third_party/dawn/third_party/khronos/EGL-Registry": { "fetcher": "fetchFromGitiles", - "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", - "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", - "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a" + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" }, - "src/third_party/libsync/src": { + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", - "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git", - "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6" + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" }, - "src/third_party/libvpx/source/libvpx": { + "src/third_party/dawn/third_party/webgpu-cts": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5x0Sk8/DXaTCIydK79vWZgIx3IHeQbLUxoNyE7E+Sdo=", - "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "38a707faef72eeff89d669c553e7bfe9e08dba8f" + "hash": "sha256-gbZpmcbqLisjLb6vnKKvHS6eRqjqvavvTRgxJsaE/RQ=", + "rev": "5dfa3b88f0863c3949f713804e0461c9cc34a030", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" }, - "src/third_party/libwebm/source": { + "src/third_party/depot_tools": { "fetcher": "fetchFromGitiles", - "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", - "url": "https://chromium.googlesource.com/webm/libwebm.git", - "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da" + "hash": "sha256-EXxlQGA7qwjuZ2Qg/rZinkllkdfCbKXz8c4JJEr4mtU=", + "rev": "7e251262409b3401809e57c5314dd158210355b8", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, - "src/third_party/libwebp/src": { + "src/third_party/devtools-frontend/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-79peh0y3eeiW5cVQqVq0mUgDcGZ9BlY+OXkPZylKARY=", - "url": "https://chromium.googlesource.com/webm/libwebp.git", - "rev": "2af26267cdfcb63a88e5c74a85927a12d6ca1d76" + "hash": "sha256-D3W8U19i5pHWPLviMKbpzhiDoF6A0+tClYJcZWdbTqk=", + "rev": "bcf0ed097be848d234fb5290c1e4d69672dc5405", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" }, - "src/third_party/libyuv": { + "src/third_party/dom_distiller_js/dist": { "fetcher": "fetchFromGitiles", - "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", - "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406" + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" }, - "src/third_party/lss": { + "src/third_party/eigen3/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", - "url": "https://chromium.googlesource.com/linux-syscall-support.git", - "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521" - }, - "src/third_party/material_color_utilities/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oi28dWuTd6ijn/RKSPukDr5GSzYiCTM2klFb7WSMDHY=", - "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", - "rev": "234a000e507d586c20df6e3bf5b9e035bc5ce7b1" - }, - "src/third_party/minigbm/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", - "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git", - "rev": "3018207f4d89395cc271278fb9a6558b660885f5" - }, - "src/third_party/nasm": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=", - "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce" - }, - "src/third_party/neon_2_sse/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", - "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", - "rev": "a15b489e1222b2087007546b4912e21293ea86ff" - }, - "src/third_party/openh264/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", - "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", - "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7" - }, - "src/third_party/openscreen/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TyZ/sZ0gnesWjKUnO2RVM2TTdpVIxsBWueHDgix0/wg=", - "url": "https://chromium.googlesource.com/openscreen", - "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665" - }, - "src/third_party/openscreen/src/third_party/tinycbor/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", - "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", - "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7" - }, - "src/third_party/pdfium": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-u+El2jEnvlcQs5j5TthpKj8s255n2AhJPW+Q/s0Ljm0=", - "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "6e55da0c45788fdc22fa3aab7ead414fc42b74c1" - }, - "src/third_party/perfetto": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-/8WQO0r10Hz3yLNh1MtjE8rGfzbpDkUowA2OPwEuRvA=", - "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "43b72e3ce703b676c9c923b04540472d10790f56" - }, - "src/third_party/pthreadpool/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Pfvievhma1rOpbLdSrIX4KaZyRpdvrnjRzzPYl3fDQo=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git", - "rev": "1787867f6183f056420e532eec640cba25efafea" - }, - "src/third_party/pyelftools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", - "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae" - }, - "src/third_party/quic_trace/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", - "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc" - }, - "src/third_party/pywebsocket3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", - "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2" - }, - "src/third_party/re2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9V/Q5o24sL1TJUDNifUqpyrQ2zTSrhU0Bxo9qDwd0+4=", - "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "87d09ef4f0307e53f1d3796843f4b90d41cfccaa" - }, - "src/third_party/ruy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hNco0Jol4vQS1bkYiXaoZ1IPHwoRq3DD3iY0TeLygew=", - "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", - "rev": "c04e5e52ae6b144f74ac032652e3c538bda15c9b" - }, - "src/third_party/skia": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Ck15ddYoo8pVLHcwW5P8Ei1sBQf23EGd/ySGOVSWAFQ=", - "url": "https://skia.googlesource.com/skia.git", - "rev": "b4f0c1163c955e42489f62d842585720cf0df0ea" - }, - "src/third_party/smhasher/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", - "url": "https://chromium.googlesource.com/external/smhasher.git", - "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f" - }, - "src/third_party/snappy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", - "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git", - "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c" - }, - "src/third_party/sqlite/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-35rSG+ptFMC62FsprLvAqfXZknKu40Ee6H2qpAcA3wI=", - "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "b7e480172bb2411f9afedefdcc69a57a12f18b7b" - }, - "src/third_party/swiftshader": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-PCPb5opTATGCCQmw8TGF09TbLL8QES+So+yaL68H//I=", - "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "32f9332d1d7aacbdba7c1aa5df894bb1890bb2cc" - }, - "src/third_party/text-fragments-polyfill/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", - "rev": "c036420683f672d685e27415de0a5f5e85bdc23f" - }, - "src/third_party/tflite/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3gawK1S5+nr5yOAHgYozLWSoT1TbJmB6Md1fID6du9w=", - "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "91946956f81a2d9fd12a6d6baba20c997d3f8890" - }, - "src/third_party/vulkan-deps": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xYX77wsgG+2TzS0AinFJndnID5P3/anY4TPh3cjRaIY=", - "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "4b7a5f2a3522cbc4e4334cdc64bfaf3f832b89c3" - }, - "src/third_party/vulkan-deps/glslang/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Y9AmEtFPj+sp/a5YnHChqlqgW/1kdaJ1CEbBB5r2cuI=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "e3a711b6fc942307be7cb634698015dfd13c37fe" - }, - "src/third_party/vulkan-deps/spirv-cross/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-I8RXVat6//rlpmZuuC99Ar/Rct6MFce4FGKgQA2gBj0=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", - "rev": "54997fb4bc3adeb47b9b9f7bb67f1c25eaca2204" - }, - "src/third_party/vulkan-deps/spirv-headers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-OqLxyrTzg1Q2zmQd0YalWtl7vX5lRJFmE2VH7fHC8/8=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "d790ced752b5bfc06b6988baadef6eb2d16bdf96" - }, - "src/third_party/vulkan-deps/spirv-tools/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wFdAzbOQdOqeuVaWl5036qkli1gkSiL5JHH82Z5cFL4=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "4c16c35b16bbd462a0e89707ebeecc0bce956b2f" - }, - "src/third_party/vulkan-deps/vulkan-headers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9+tHkkHsP5ft6+tbofOYV1yBFDpFlJz4Q6YS8c6T5As=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "2634c969d7dc0e983f005f7f2e665cce8449efe6" - }, - "src/third_party/vulkan-deps/vulkan-loader/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-q7/dYKQ3O0aSs326YbEeLlS+SciFWugBGm/G+b8RNd0=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "d34bfafff23602e857064bea6d99a35eb63f37f2" - }, - "src/third_party/vulkan-deps/vulkan-tools/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-tcaJmosHwTo38keV5qkumkLB1o1qq8v2ZmSsi2zDGoE=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "389110e4600669d82bca042859fddf898387c0d2" - }, - "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7M47ZCbNwIppaotMfJTFTRsYNvSZNc0FUufoyXyUu/g=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "dd26ae7065a9ed60c8ab517ed79bf7935394aec7" - }, - "src/third_party/vulkan-deps/vulkan-validation-layers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-lj6MIQctcK6gsJlLdLwQ9PHbiAtTbNIPinii8vGZdGk=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "b89f48ae89ec064c91e8b77468cebc18c3faa682" - }, - "src/third_party/vulkan_memory_allocator": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-FdRPPdLZHj3RX3YzcmF58JJuIqeWQV3TDiiXPEW2lsc=", - "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", - "rev": "e87036508bb156f9986ea959323de1869e328f58" - }, - "src/third_party/wayland/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-aVcy7bW1cqEKbowlVgfa9FI8/oG7k5CzPZbRl+cPcX8=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", - "rev": "a8c7553ec9af6462474524fd2bb4e9a7dc7217dd" - }, - "src/third_party/wayland-protocols/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git", - "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867" - }, - "src/third_party/wayland-protocols/kde": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", - "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git", - "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e" - }, - "src/third_party/wayland-protocols/gtk": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", - "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git", - "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0" - }, - "src/third_party/webdriver/pylib": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", - "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git", - "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04" - }, - "src/third_party/webgl/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-h4by/1pp9oQGetZNnc1Rt5X5izgQf8ZUZDfsxQacqC0=", - "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", - "rev": "eab0468fc0405b21e59bea30a441d8e38c9db2b7" - }, - "src/third_party/webgpu-cts/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Wch3opAvU/6rJVptOKxOJssev8NhNpbYZddScTlzuMw=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "4c8d2f67ecd03fbd3cb4c517ef8461427b6d635d" - }, - "src/third_party/webrtc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-KpiNGAue945kGCuQYGhxiWVUFTE1tcntSAXBZdkrE9A=", - "url": "https://webrtc.googlesource.com/src.git", - "rev": "d8f2b0380b3ec980af35ce4b92ba6a211ec8c76d" - }, - "src/third_party/wuffs/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", - "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", - "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba" - }, - "src/third_party/weston/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-sfJm1CBGXX13pFcqeOVPqWlXrUfwjRl+rYf2BoT8Bt8=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git", - "rev": "775f8a1edf357f59e6b2e284297f396f4fac95a4" - }, - "src/third_party/xdg-utils": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-t3uV9JkkQQIwmezzSoEdTMLSizZdLQB7eLKTRQGH4kQ=", - "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", - "rev": "d80274d5869b17b8c9067a1022e4416ee7ed5e0d" - }, - "src/third_party/xnnpack/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-vsn3lrog5affus0qxc4TK2Z/tdd/E6hBYeUQRWoDZPQ=", - "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "b9d4073a6913891ce9cbd8965c8d506075d2a45a" - }, - "src/tools/page_cycler/acid3": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", - "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", - "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba" - }, - "src/third_party/zstd/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yzv/R/GnqlXLeAjBEIev+8uM7MC0HeK0MfppnMTJ7Eg=", - "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "25822342be59d831bad65426ae51f5cc22157b09" - }, - "src/v8": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Fn4HoS7O2J3nGXFyq7r7AheRQzKy80USTQnNnC4rWqM=", - "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "36e4828ab658b8ad72f80974883c4c94f6e7012c" - }, - "src/third_party/nan": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-tur5CExvwuSmwqBwH9o8OZWzDuifRybjEb+4/tm6exk=", - "owner": "nodejs", - "repo": "nan", - "rev": "16fa32231e2ccd89d2804b3f765319128b20c4ac" + "hash": "sha256-c/4bf5+sJEgsKOJ34wPDNm1+6QUzETZZr/nE4SG5nKA=", + "rev": "66e8f38891841bf88ee976a316c0c78a52f0cee5", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", @@ -1743,6 +275,415 @@ "repo": "node", "rev": "v18.17.1" }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", + "rev": "441f98d02deafd9b090aea568282b28f66a50e36", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" + }, + "src/third_party/farmhash/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-uRgHTVaCAEaoqY20SmePQbApPmjimgggm5922KKfnbc=", + "rev": "0ba37733400593b162e5ae9ff26b384cff49c250", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" + }, + "src/third_party/flac": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" + }, + "src/third_party/flatbuffers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yibx1WMAwNajROMGVqox3naMU09RSayxUaTCJ860euo=", + "rev": "28861d1d7d5ec6ce34d4bbdc10bec4aace341167", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" + }, + "src/third_party/fontconfig/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=", + "rev": "2fb3419a92156569bc1ec707401258c922cd0d99", + "url": "https://chromium.googlesource.com/external/fontconfig.git" + }, + "src/third_party/fp16/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" + }, + "src/third_party/freetype-testing/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" + }, + "src/third_party/freetype/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RRieGqEeAk5AYzJqPRpF25FmxMpEYwR7AQWLzXkED50=", + "rev": "45903920b984540bb629bc89f4c010159c23a89a", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" + }, + "src/third_party/fuzztest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-tVtrSbLxnHrbh027cafNbqkfjq/afQxw57rW9yGsRe0=", + "rev": "25f44f341f701eccc29d22f69313a54363c6099b", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" + }, + "src/third_party/fxdiv/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" + }, + "src/third_party/gemmlowp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" + }, + "src/third_party/google_benchmark/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", + "rev": "b177433f3ee2513b1075140c723d73ab8901790f", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" + }, + "src/third_party/googletest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", + "rev": "af29db7ec28d6df1c7f0f745186884091e602e07", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" + }, + "src/third_party/grpc/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" + }, + "src/third_party/harfbuzz-ng/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+fClyD9Rsge9qdGF8WCv8taLTWNL8iManpXZUzDL2LM=", + "rev": "db700b5670d9475cc8ed4880cc9447b232c5e432", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", + "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" + }, + "src/third_party/hunspell_dictionaries": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" + }, + "src/third_party/icu": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9yFRBrHdWcYgrZAaigS8XnxNsqJNklGdFkAAgVdHXFU=", + "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" + }, + "src/third_party/jsoncpp/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" + }, + "src/third_party/leveldatabase/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", + "url": "https://chromium.googlesource.com/external/leveldb.git" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Zp8Ea/7GwmEl964MEIk3UM6IR5+FtUz8InlqZaOniDA=", + "rev": "26cc39e59b2bf5cbc20486296248a842c536878d", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" + }, + "src/third_party/libaddressinput/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" + }, + "src/third_party/libaom/source/libaom": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z8td6FIvHibTQsB6x/A/69xduogj2b2lteiQB6l56vE=", + "rev": "5f8db64abce68a3698fb732697ae50880bc9cac4", + "url": "https://aomedia.googlesource.com/aom.git" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-KfRRGTS8kBwi9Z9wafpSwL29RU38THG2xBCvNBXtZtg=", + "rev": "b2d36b1c3bfc806694cd4ff0cb188270823fe6d8", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" + }, + "src/third_party/libavifinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yTv1AGtWfxXcywZycpsQBkBRLwuUJMPFKtpj7nrsc4A=", + "rev": "707919b2f8ac1920b2f7ae252c233f9c6dcf84e1", + "url": "https://aomedia.googlesource.com/libavifinfo.git" + }, + "src/third_party/libc++/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YP1LAUaV8epDAsd9LOovdXUyzpaLgffOJcGM6VmTaKc=", + "rev": "84fb809dd6dae36d556dc0bb702c6cc2ce9d4b80", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" + }, + "src/third_party/libc++abi/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-CBUw50T/jFMXU0cR+BQH6JyEY3mHamLM6kA8YdvI24Q=", + "rev": "331847d7a5e6f8706689cf5d468e6e58c868fa10", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dT8/Mdit3Qc5Sno6DYKv1qSNr+6Lhiy24ZNNBKoVq8I=", + "rev": "df0023cc95b8e606a2fd243522d823401ef86637", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" + }, + "src/third_party/libipp/libipp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" + }, + "src/third_party/libjpeg_turbo": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bcmp8RqQYp4lRI9NfdfYgrAJsDLecJEhgRu9oosB9lQ=", + "rev": "30bdb85e302ecfc52593636b2f44af438e05e784", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" + }, + "src/third_party/liblouis/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" + }, + "src/third_party/libphonenumber/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" + }, + "src/third_party/libprotobuf-mutator/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" + }, + "src/third_party/libsrtp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", + "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" + }, + "src/third_party/libsync/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-rqmY4JNm4zuYqXs7o+1QhNnaNX4Cmt7PTJMGploHPnY=", + "rev": "a321409e66c212098e755cfae1a978bbcff1ccbb", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5x0Sk8/DXaTCIydK79vWZgIx3IHeQbLUxoNyE7E+Sdo=", + "rev": "38a707faef72eeff89d669c553e7bfe9e08dba8f", + "url": "https://chromium.googlesource.com/webm/libvpx.git" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", + "url": "https://chromium.googlesource.com/webm/libwebm.git" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-79peh0y3eeiW5cVQqVq0mUgDcGZ9BlY+OXkPZylKARY=", + "rev": "2af26267cdfcb63a88e5c74a85927a12d6ca1d76", + "url": "https://chromium.googlesource.com/webm/libwebp.git" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", + "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" + }, + "src/third_party/lss": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" + }, + "src/third_party/material_color_utilities/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oi28dWuTd6ijn/RKSPukDr5GSzYiCTM2klFb7WSMDHY=", + "rev": "234a000e507d586c20df6e3bf5b9e035bc5ce7b1", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" + }, + "src/third_party/minigbm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-tur5CExvwuSmwqBwH9o8OZWzDuifRybjEb+4/tm6exk=", + "owner": "nodejs", + "repo": "nan", + "rev": "16fa32231e2ccd89d2804b3f765319128b20c4ac" + }, + "src/third_party/nasm": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=", + "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5d7c8WvkjmBuwcwqhxQf0wRE3qaF8fFsiqUE1sHh0nc=", + "rev": "8725391822b8901784b379a4573ab8828e7091d3", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" + }, + "src/third_party/neon_2_sse/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", + "rev": "a15b489e1222b2087007546b4912e21293ea86ff", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" + }, + "src/third_party/openh264/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TyZ/sZ0gnesWjKUnO2RVM2TTdpVIxsBWueHDgix0/wg=", + "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665", + "url": "https://chromium.googlesource.com/openscreen" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" + }, + "src/third_party/pdfium": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u+El2jEnvlcQs5j5TthpKj8s255n2AhJPW+Q/s0Ljm0=", + "rev": "6e55da0c45788fdc22fa3aab7ead414fc42b74c1", + "url": "https://pdfium.googlesource.com/pdfium.git" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/8WQO0r10Hz3yLNh1MtjE8rGfzbpDkUowA2OPwEuRvA=", + "rev": "43b72e3ce703b676c9c923b04540472d10790f56", + "url": "https://android.googlesource.com/platform/external/perfetto.git" + }, + "src/third_party/pthreadpool/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Pfvievhma1rOpbLdSrIX4KaZyRpdvrnjRzzPYl3fDQo=", + "rev": "1787867f6183f056420e532eec640cba25efafea", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" + }, + "src/third_party/pyelftools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" + }, + "src/third_party/pywebsocket3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" + }, + "src/third_party/re2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9V/Q5o24sL1TJUDNifUqpyrQ2zTSrhU0Bxo9qDwd0+4=", + "rev": "87d09ef4f0307e53f1d3796843f4b90d41cfccaa", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hNco0Jol4vQS1bkYiXaoZ1IPHwoRq3DD3iY0TeLygew=", + "rev": "c04e5e52ae6b144f74ac032652e3c538bda15c9b", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" + }, + "src/third_party/skia": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Ck15ddYoo8pVLHcwW5P8Ei1sBQf23EGd/ySGOVSWAFQ=", + "rev": "b4f0c1163c955e42489f62d842585720cf0df0ea", + "url": "https://skia.googlesource.com/skia.git" + }, + "src/third_party/smhasher/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", + "url": "https://chromium.googlesource.com/external/smhasher.git" + }, + "src/third_party/snappy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PqrwtPFU3TI840za3UU8p+t4ZdyX0l79esEA602Mbq0=", + "rev": "5107c739c1b2a008e7293e3b489c4f80a8fb2e01", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-35rSG+ptFMC62FsprLvAqfXZknKu40Ee6H2qpAcA3wI=", + "rev": "b7e480172bb2411f9afedefdcc69a57a12f18b7b", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" + }, "src/third_party/squirrel.mac": { "fetcher": "fetchFromGitHub", "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", @@ -1750,6 +691,13 @@ "repo": "Squirrel.Mac", "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + }, "src/third_party/squirrel.mac/vendor/ReactiveObjC": { "fetcher": "fetchFromGitHub", "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", @@ -1757,875 +705,743 @@ "repo": "ReactiveObjC", "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" }, - "src/third_party/squirrel.mac/vendor/Mantle": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", - "owner": "Mantle", - "repo": "Mantle", - "rev": "78d3966b3c331292ea29ec38661b25df0a245948" - } - }, - "version": "27.3.11", - "modules": "118", - "chrome": "118.0.5993.159", - "node": "18.17.1", - "chromium": { - "version": "118.0.5993.159", - "deps": { - "gn": { - "version": "2023-08-10", - "url": "https://gn.googlesource.com/gn", - "rev": "cc56a0f98bb34accd5323316e0292575ff17a5d4", - "hash": "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M=" - } - } - }, - "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=", - "electron_yarn_hash": "1yq854829a4q0yqyjyn2lq4l3amsqdhfd7fjcnc3mz8l2ci3n964" - }, - "29": { - "deps": { - "src/electron": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-buW6hC7GIA59MTuyWg9/+EzQlFgJVN2IZrxlfisLemM=", - "owner": "electron", - "repo": "electron", - "rev": "v29.3.0" - }, - "src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5AmRq2pl3p0QtqyIjx4XDVE9Mnps18F9Z9MyH+38a0Y=", - "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "122.0.6261.156", - "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " - }, - "src/third_party/clang-format/script": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", - "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9" - }, - "src/third_party/libc++/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-/3VxptC6qAv9NCt8y1peJKTXTFI7blbvnpZ6D0VYyDk=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "28aa23ffb4c7344914a5b4ac7169f12e5a12333f" - }, - "src/third_party/libc++abi/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-O337gqiB4uiTWUgIfPdEa1Du+/ww+xYpmmZW9Py7uyQ=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "9986707a5f2fc6d5d1ffa7f224a032bdd45c95fd" - }, - "src/third_party/libunwind/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WPd6BlhNNF9n/qFU8atEh1fagbc05dWsFzBugw55boY=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "f400fdb561d4416b59b8f8a33d8ec8b79da60495" - }, - "src/chrome/test/data/perf/canvas_bench": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", - "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", - "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732" - }, - "src/chrome/test/data/perf/frame_rate/content": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", - "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git", - "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9" - }, - "src/chrome/test/data/xr/webvr_info": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", - "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git", - "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248" - }, - "src/docs/website": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-sKbrY/m75LVWjWjhhjaeQnfXQP5AkEsEkZ+GmMNQJVo=", - "url": "https://chromium.googlesource.com/website.git", - "rev": "7474472013397bdb177cda70099f6411a5bd8212" - }, - "src/media/cdm/api": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", - "url": "https://chromium.googlesource.com/chromium/cdm.git", - "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28" - }, - "src/net/third_party/quiche/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-mrnKQh2d6ewg1X8sCx8U4frHXyFKHuIUpvi0WBzg+PU=", - "url": "https://quiche.googlesource.com/quiche.git", - "rev": "0e39ce016ee1ec8271aa7216d547917c239db525" - }, - "src/third_party/angle": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-h2b/f8MmldZSk3c84rvwO5+UZK36BFf/H9BStWFbDoo=", - "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "f9bad5e27d61e2ab6a7504b1793be5aa14eb1414" - }, - "src/third_party/angle/third_party/glmark2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", - "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", - "rev": "ca8de51fedb70bace5351c6b002eb952c747e889" - }, - "src/third_party/angle/third_party/rapidjson/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", - "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson", - "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f" - }, - "src/third_party/angle/third_party/VK-GL-CTS/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-zBY7MY6FXazzTW+nXvknkNar/odL0tzHXxHPmpYuy7E=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "0f6fd3de81102058dc2ae299af1ad5287d2145dd" - }, - "src/third_party/anonymous_tokens/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3+/zvwYAv3OGoKJatg+/c3OM1IyGq2iCyFWgu3b8VoU=", - "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", - "rev": "d024f05b39e21bb2a0b8205a7ce72b1b185b84c2" - }, - "src/third_party/content_analysis_sdk/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", - "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", - "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc" - }, - "src/third_party/dav1d/libdav1d": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9SrbxiOqXKTFf4qZ4Wqg9aoOMY8zv7NczTqN2+lXwCI=", - "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "47107e384bd1dc25674acf04d000a8cdc6195234" - }, - "src/third_party/dawn": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-/lG4wfy5LVCMGuqKRZgf/NoxsAuCvyUdV1Anbzi0q+U=", - "url": "https://dawn.googlesource.com/dawn.git", - "rev": "6a6719ee09f1078356fdd31c69061e07b5c61c2d" - }, - "src/third_party/dawn/third_party/glfw": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", - "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", - "rev": "62e175ef9fae75335575964c845a302447c012c7" - }, - "src/third_party/dawn/third_party/dxc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-PGGwxNYgvZ//k+cr19iTG2QwC9Agu2T9k9QOhnX565s=", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "701a2b1da0387ac6abf73bdbaf7864b9615db033" - }, - "src/third_party/dawn/third_party/dxheaders": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", - "rev": "980971e835876dc0cde415e8f9bc646e64667bf7" - }, - "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry", - "rev": "5bae8738b23d06968e7c3a41308568120943ae77" - }, - "src/third_party/dawn/third_party/khronos/EGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry", - "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071" - }, - "src/third_party/dawn/third_party/webgpu-cts": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-wlneFqVEhM6fe9p10T22dx4dxnZzWwKHw+35eIlDGVM=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "dedb6316202c8c55b898e52248f1345241299125" - }, - "src/third_party/highway/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", - "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", - "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a" - }, - "src/third_party/google_benchmark/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", - "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", - "rev": "b177433f3ee2513b1075140c723d73ab8901790f" - }, - "src/third_party/boringssl/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-shqUB+x7oXgtQqqfhkwXHwLLaJW1/L1vh1O+jvdsDP8=", - "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "414f69504d30d0848b69f6453ea7fb5e88004cb4" - }, - "src/third_party/breakpad/breakpad": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7SmO5e/U2shYVslmCRPVLyfU5N4Rp1mzls8lLqIW8x8=", - "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "62ecd463583d09eb7d15b1d410055f30b2c7bcb4" - }, - "src/third_party/cast_core/public/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", - "url": "https://chromium.googlesource.com/cast_core/public", - "rev": "71f51fd6fa45fac73848f65421081edd723297cd" - }, - "src/third_party/catapult": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ixfmLcWTgVcHi2CXAulMXTaAyPYT42Q8VflStxmNRXc=", - "url": "https://chromium.googlesource.com/catapult.git", - "rev": "ab03292694695864b523636060e2a96b2c9b2df2" - }, - "src/third_party/ced/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", - "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", - "rev": "ba412eaaacd3186085babcd901679a48863c7dd5" - }, - "src/third_party/chromium-variations": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-px8BHI5Cp3vBRyei50dbxCTn/gydLsps1/SmJxxeGKw=", - "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "d0dcd8802c22c1ac4a7d112782a4c75f0c6ca8ee" - }, - "src/third_party/cld_3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", - "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", - "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661" - }, - "src/third_party/colorama/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", - "url": "https://chromium.googlesource.com/external/colorama.git", - "rev": "3de9f013df4b470069d03d250224062e8cf15c49" - }, - "src/third_party/cpu_features/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", - "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git", - "rev": "936b9ab5515dead115606559502e3864958f7f6e" - }, - "src/third_party/cpuinfo/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-56XE95dvaDF8E89V/le19Gk52fR0pqqyE38UgQo+GQM=", - "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "76cc10d627add77922dc24521b332a055a4d6d77" - }, - "src/third_party/crc32c/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", - "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", - "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6" - }, - "src/third_party/cros_system_api": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Tzn7Sx6k7BpH/UqMZHdLTk26FBp5QNcX0xWhztgRKrw=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "12d5e386005a211570cfdf9849d2fa6a3b38594b" - }, - "src/third_party/crossbench": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-VxH1eOsJGQUk93EYexl1QrCpHTpgCOQP7H+oN0MZNpA=", - "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "1983b3f517da56c35c91296467458f71ad5b9340" - }, - "src/third_party/depot_tools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-C1l4piDzNENx6Vvtzu03HsBZTHIavO5AkmO6QXErh3Y=", - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "6fc0c97ab284021b72e3bc962f7fa879ffcad65b" - }, - "src/third_party/devtools-frontend/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Y7XPBkKU8p210dj7ydIDVJgiXx6ZQPP4D5Jfw3t9FCc=", - "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "3fa1fc736f46022f45c7ba7d817d1df1519c55d7" - }, - "src/third_party/dom_distiller_js/dist": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", - "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", - "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d" - }, - "src/third_party/eigen3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-a9QAnv6vIM8a9Bn8ZmfeMT0+kbtb0QGxM0+m5xwIqm8=", - "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3" - }, - "src/third_party/farmhash/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", - "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", - "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45" - }, - "src/third_party/ffmpeg": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-NRyMXRxnHJi5JiEJUxOxJyPGe5BGTxNbNyEOu1GyO8E=", - "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "17525de887d54b970ffdd421a0879c1db1952307" - }, - "src/third_party/flac": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", - "url": "https://chromium.googlesource.com/chromium/deps/flac.git", - "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c" - }, - "src/third_party/flatbuffers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=", - "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", - "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5" - }, - "src/third_party/fontconfig/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=", - "url": "https://chromium.googlesource.com/external/fontconfig.git", - "rev": "2fb3419a92156569bc1ec707401258c922cd0d99" - }, - "src/third_party/fp16/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git", - "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91" - }, - "src/third_party/gemmlowp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", - "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git", - "rev": "13d57703abca3005d97b19df1f2db731607a7dc2" - }, - "src/third_party/grpc/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", - "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git", - "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737" - }, - "src/third_party/freetype/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ogBt+haM+MoETsPIhwPDPZCLwQB9u9+w7OHL4us6kg8=", - "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "57617782464411201ce7bbc93b086c1b4d7d84a5" - }, - "src/third_party/freetype-testing/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", - "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", - "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f" - }, - "src/third_party/fxdiv/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", - "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8" - }, - "src/third_party/harfbuzz-ng/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-VAan6P8PHSq8RsGE4YbI/wCfFAhzl3nJMt0cQBYi5Ls=", - "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "155015f4bec434ecc2f94621665844218f05ce51" - }, - "src/third_party/emoji-segmenter/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", - "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", - "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e" - }, - "src/third_party/ots/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", - "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git", - "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33" - }, - "src/third_party/libgav1/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ySRgjJUYFXTw5kys9WDSuxnmfzj1I4ImvTWi+7q0HXE=", - "url": "https://chromium.googlesource.com/codecs/libgav1.git", - "rev": "35fea10bfdb790cf131ae74a4ee346905f34dc3c" - }, - "src/third_party/googletest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", - "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "af29db7ec28d6df1c7f0f745186884091e602e07" - }, - "src/third_party/hunspell_dictionaries": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", - "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", - "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e" - }, - "src/third_party/icu": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-YYoslfgGfmDpSTxtCOmGGfwQg6mVU1IggzAtWRwwcMc=", - "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "bad7ddbf921358177e56fd723c2f59f8041a370f" - }, - "src/third_party/jsoncpp/source": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", - "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448" - }, - "src/third_party/leveldatabase/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", - "url": "https://chromium.googlesource.com/external/leveldb.git", - "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea" - }, - "src/third_party/libFuzzer/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", - "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303" - }, - "src/third_party/fuzztest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-YEg+/562AX/hK0Adx9bUZqATt+5VDZjn/csWVhRji2M=", - "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "12e7428ab0847b1d1dc6c4b89203adfd1f16a1ad" - }, - "src/third_party/libaddressinput/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", - "url": "https://chromium.googlesource.com/external/libaddressinput.git", - "rev": "e8712e415627f22d0b00ebee8db99547077f39bd" - }, - "src/third_party/libaom/source/libaom": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-f65sdsMAWCWpsdTgyTzx5fwM/2ESm/cBCvU41s2BEV0=", - "url": "https://aomedia.googlesource.com/aom.git", - "rev": "1a72ea323d65e46eb90d08d492c04891abb91926" - }, - "src/third_party/libavif/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-rglws6GR11X8SdpYhK9CoxElWuPFYfp5b+vETjEoJOY=", - "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "e170c9366090cdc389d5f47ee3c2d7db71d263bc" - }, - "src/third_party/libavifinfo/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", - "url": "https://aomedia.googlesource.com/libavifinfo.git", - "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a" - }, - "src/third_party/nearby/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-XsQrfj0R88qf0C/LtRUsset/lnRpBkbpGUr/ZE3qmyk=", - "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "4bdb5000ee7919724530cf89d50969e7b0ed58a7" - }, - "src/third_party/beto-core/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-PkvHqVKjGHxAYntylJxR5xnUVU1o8DJuBmsd9qkl/Yo=", - "url": "https://beto-core.googlesource.com/beto-core.git", - "rev": "4d202dab960a0b6a6e4757ab4393945aca5a09db" - }, - "src/third_party/securemessage/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", - "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git", - "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84" - }, - "src/third_party/speedometer/v3.0": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-FDsK5sNy3YOrmaGpN3AhSExzBY9D8RGwoZKkjg/5vo0=", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "2ee210ca20767c949c4ff29bdffa1138eb0501fe" - }, - "src/third_party/ukey2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", - "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", - "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47" - }, - "src/third_party/cros-components/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-2FuyB/TLKMbqgjvw0q19lcG85fedwlOmKKNlGevEzos=", - "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "ab7bdff32543991f52872c25cecf1f926702dfe3" - }, - "src/third_party/libdrm/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", - "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1" - }, - "src/third_party/expat/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", - "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "441f98d02deafd9b090aea568282b28f66a50e36" - }, - "src/third_party/libipp/libipp": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", - "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f" - }, - "src/third_party/libjpeg_turbo": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", - "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "9b894306ec3b28cea46e84c32b56773a98c483da" - }, - "src/third_party/liblouis/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", - "url": "https://chromium.googlesource.com/external/liblouis-github.git", - "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376" - }, - "src/third_party/libphonenumber/dist": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", - "url": "https://chromium.googlesource.com/external/libphonenumber.git", - "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362" - }, - "src/third_party/libprotobuf-mutator/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", - "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", - "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf" - }, - "src/third_party/libsrtp": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", - "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", - "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a" - }, - "src/third_party/libsync/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", - "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git", - "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6" - }, - "src/third_party/libvpx/source/libvpx": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-AUNWUicLMpEL/+r5c3JVjgZu9URBVsebayMs+ogNN6M=", - "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "893c9f6d070cc3bd8503152480089673f57fdf76" - }, - "src/third_party/libwebm/source": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", - "url": "https://chromium.googlesource.com/webm/libwebm.git", - "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da" - }, - "src/third_party/libwebp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=", - "url": "https://chromium.googlesource.com/webm/libwebp.git", - "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760" - }, - "src/third_party/libyuv": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", - "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406" - }, - "src/third_party/lss": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", - "url": "https://chromium.googlesource.com/linux-syscall-support.git", - "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521" - }, - "src/third_party/material_color_utilities/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-sYLpJbgwR5POWqbUqu7IdWJ2Gibjz1PsMdSK+7yPDt4=", - "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", - "rev": "bec7bab60e6431201a82761ea4482b98b54c2af9" - }, - "src/third_party/minigbm/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", - "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git", - "rev": "3018207f4d89395cc271278fb9a6558b660885f5" - }, - "src/third_party/nasm": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=", - "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "f477acb1049f5e043904b87b825c5915084a9a29" - }, - "src/third_party/neon_2_sse/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", - "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", - "rev": "a15b489e1222b2087007546b4912e21293ea86ff" - }, - "src/third_party/openh264/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", - "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", - "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7" - }, - "src/third_party/openscreen/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-habWfKhK66T537zJb/fm0IWpDbD2xgd9Upg97xRBy/M=", - "url": "https://chromium.googlesource.com/openscreen", - "rev": "b70c552bedf189fc238e98f8f69e6c30e7925207" - }, - "src/third_party/openscreen/src/buildtools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-o974IZvLUG2KlB1pQPYFwnoPGo239CV96pQPoQO7lvM=", - "url": "https://chromium.googlesource.com/chromium/src/buildtools", - "rev": "a9a6f0c49d0e8fa0cda37337430b4736ab3dc944" - }, - "src/third_party/openscreen/src/third_party/tinycbor/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", - "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", - "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7" - }, - "src/third_party/pdfium": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-XJAQBQjM0JzyeNy5ZU1KpfxE1U6lQtTEhg21riHHJ0E=", - "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "4c4f9ab25dab142d7888f3258ab54df24b97b44f" - }, - "src/third_party/perfetto": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-DLu7p6tDImRC7sk+PqIZvyjpOVIZl3I/8rYX498DVTk=", - "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "1e15d01da5d619ca617dcdd870efe3c35046a89c" - }, - "src/third_party/pthreadpool/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git", - "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8" - }, - "src/third_party/pyelftools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", - "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae" - }, - "src/third_party/quic_trace/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", - "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc" - }, - "src/third_party/pywebsocket3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", - "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2" - }, - "src/third_party/re2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3eAhiKUIMnpVCEuLWVCVOK3alVsxAJrEWtHBzvdjZkY=", - "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "826ad10e58a042faf57d7c329b0fd0a04b797e0b" - }, - "src/third_party/ruy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gvzxHQEAK6D9qIr/Wf/s6TfBp9QorHlNi4qzSx5Ih/c=", - "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", - "rev": "cd7b92695b5d3f0c9ff65b865c2a1e19b99d766d" - }, - "src/third_party/skia": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-iJlxnQL0JsDPOFSyD0ubEMWtDJhtbqCsBtaQqWZt8q0=", - "url": "https://skia.googlesource.com/skia.git", - "rev": "8464f41cf051974e499be9caeab3243506e025c2" - }, - "src/third_party/smhasher/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", - "url": "https://chromium.googlesource.com/external/smhasher.git", - "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f" - }, - "src/third_party/snappy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", - "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git", - "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c" - }, - "src/third_party/sqlite/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-brDFYmagGIH7fvRAP/JaCAMyuFLJKrc0jf0106gofiw=", - "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "a5270ae741714a5aad187ba8dcd8bddca39f791f" - }, "src/third_party/swiftshader": { "fetcher": "fetchFromGitiles", - "hash": "sha256-k0WzWDa/+48ogpbmECNDJKIED4wGu/Hm0DyGnCT9xoU=", - "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f" + "hash": "sha256-PCPb5opTATGCCQmw8TGF09TbLL8QES+So+yaL68H//I=", + "rev": "32f9332d1d7aacbdba7c1aa5df894bb1890bb2cc", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" }, "src/third_party/text-fragments-polyfill/src": { "fetcher": "fetchFromGitiles", "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", - "rev": "c036420683f672d685e27415de0a5f5e85bdc23f" + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" }, "src/third_party/tflite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-LOQH+qtltrahcPIutw/zYvEhmvbSjFBWT1mrg/pUD/0=", - "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "296f1e3cce03308c7fd5cdc7a76fbc3e41ec5214" + "hash": "sha256-3gawK1S5+nr5yOAHgYozLWSoT1TbJmB6Md1fID6du9w=", + "rev": "91946956f81a2d9fd12a6d6baba20c997d3f8890", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" }, "src/third_party/vulkan-deps": { "fetcher": "fetchFromGitiles", - "hash": "sha256-bxg82G3dkugLXpTkfk/kNcKHKWn2i8+cCKPgfbaIVZ8=", - "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "c00c99b8e979ca1b1eba221a60cb1e1d3b12f956" + "hash": "sha256-xYX77wsgG+2TzS0AinFJndnID5P3/anY4TPh3cjRaIY=", + "rev": "4b7a5f2a3522cbc4e4334cdc64bfaf3f832b89c3", + "url": "https://chromium.googlesource.com/vulkan-deps" }, "src/third_party/vulkan-deps/glslang/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-QKSPJuIJe44vVNZ8fjqRKc73CZV0fECcnXvY6QRec+0=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "57d86ab763da7b2cd1e00ecec8aa697403a8fd20" + "hash": "sha256-Y9AmEtFPj+sp/a5YnHChqlqgW/1kdaJ1CEbBB5r2cuI=", + "rev": "e3a711b6fc942307be7cb634698015dfd13c37fe", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" }, "src/third_party/vulkan-deps/spirv-cross/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-VxwAs6mNOK/46VIJ0BroR41cNy2ywU+FQCgBatY1sBY=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", - "rev": "b82536766d1b81631b126d1ddbe49baf42929bd3" + "hash": "sha256-I8RXVat6//rlpmZuuC99Ar/Rct6MFce4FGKgQA2gBj0=", + "rev": "54997fb4bc3adeb47b9b9f7bb67f1c25eaca2204", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" }, "src/third_party/vulkan-deps/spirv-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-TVfaGY9YjVHvR38OvuphsS68UIpBF21ghBg/2LL3gmE=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "7b0309708da5126b89e4ce6f19835f36dc912f2f" + "hash": "sha256-OqLxyrTzg1Q2zmQd0YalWtl7vX5lRJFmE2VH7fHC8/8=", + "rev": "d790ced752b5bfc06b6988baadef6eb2d16bdf96", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" }, "src/third_party/vulkan-deps/spirv-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-yUaUBCj3MqBwkGNC8ElJ/uvcm0Pl5BAdiWAw/Pi52Xo=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "c96fe8b943564fbab3424219d924d21cac2e877a" + "hash": "sha256-wFdAzbOQdOqeuVaWl5036qkli1gkSiL5JHH82Z5cFL4=", + "rev": "4c16c35b16bbd462a0e89707ebeecc0bce956b2f", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" }, "src/third_party/vulkan-deps/vulkan-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-kBOkj7mr4stPXUCBhNJpNL3A+9BebEwrIBEIroxdH8Y=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40" + "hash": "sha256-9+tHkkHsP5ft6+tbofOYV1yBFDpFlJz4Q6YS8c6T5As=", + "rev": "2634c969d7dc0e983f005f7f2e665cce8449efe6", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" }, "src/third_party/vulkan-deps/vulkan-loader/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-qvpwu4mmmLAFolLZt5q9XYgZff6BHO2Yapg93JUpBVA=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "0b2b71306aebf1e11304b9f961f9a29ab0234756" + "hash": "sha256-q7/dYKQ3O0aSs326YbEeLlS+SciFWugBGm/G+b8RNd0=", + "rev": "d34bfafff23602e857064bea6d99a35eb63f37f2", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" }, "src/third_party/vulkan-deps/vulkan-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-C4xJwYkMqzmYk6lP7SQNXhCt6FyuH4+pqOHltuxJkOA=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "7c6d640a5ca3ab73c1f42d22312f672b54babfaf" + "hash": "sha256-tcaJmosHwTo38keV5qkumkLB1o1qq8v2ZmSsi2zDGoE=", + "rev": "389110e4600669d82bca042859fddf898387c0d2", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" }, "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-gvia+Xb9BpOjPARKo3Sgp85Bfh1roFZ2PzCtXVFYeIU=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "4cfc176e3242b4dbdfd3f6c5680c5d8f2cb7db45" + "hash": "sha256-7M47ZCbNwIppaotMfJTFTRsYNvSZNc0FUufoyXyUu/g=", + "rev": "dd26ae7065a9ed60c8ab517ed79bf7935394aec7", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" }, "src/third_party/vulkan-deps/vulkan-validation-layers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6YUjvPKjuuZdhBRfM+84btXvAHR2rj7ovocZnLS31JY=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "d26b50b03815ff226e6df478b4ddc4b98d8deaee" + "hash": "sha256-lj6MIQctcK6gsJlLdLwQ9PHbiAtTbNIPinii8vGZdGk=", + "rev": "b89f48ae89ec064c91e8b77468cebc18c3faa682", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" }, "src/third_party/vulkan_memory_allocator": { "fetcher": "fetchFromGitiles", - "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", - "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", - "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21" - }, - "src/third_party/wayland/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-By+3qSfYs4dM4Hcjq2j4ZlSSPhagwqtNl//HKMrc5LY=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", - "rev": "af7f44122127b86a8c74cb7432909180f4899eaa" - }, - "src/third_party/wayland-protocols/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ljMcY59iOdGYeToadCuQ3t0lrBnsBdot+NiT6e+JJ04=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git", - "rev": "681c33c8547d6aefe24455ba2bffe1c5ae11fee5" - }, - "src/third_party/wayland-protocols/kde": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", - "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git", - "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e" + "hash": "sha256-FdRPPdLZHj3RX3YzcmF58JJuIqeWQV3TDiiXPEW2lsc=", + "rev": "e87036508bb156f9986ea959323de1869e328f58", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" }, "src/third_party/wayland-protocols/gtk": { "fetcher": "fetchFromGitiles", "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", - "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git", - "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0" + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" + }, + "src/third_party/wayland-protocols/kde": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" + }, + "src/third_party/wayland-protocols/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", + "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aVcy7bW1cqEKbowlVgfa9FI8/oG7k5CzPZbRl+cPcX8=", + "rev": "a8c7553ec9af6462474524fd2bb4e9a7dc7217dd", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" }, "src/third_party/webdriver/pylib": { "fetcher": "fetchFromGitiles", "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", - "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git", - "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04" + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" }, "src/third_party/webgl/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=", - "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", - "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed" + "hash": "sha256-h4by/1pp9oQGetZNnc1Rt5X5izgQf8ZUZDfsxQacqC0=", + "rev": "eab0468fc0405b21e59bea30a441d8e38c9db2b7", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" }, "src/third_party/webgpu-cts/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-RC2t+H44HyIvHLRcZyebSgVZvbmtw0vsy2KJRUlvTKs=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "e082b08475761a2ba6a3349dfea72f704c8b68d4" + "hash": "sha256-Wch3opAvU/6rJVptOKxOJssev8NhNpbYZddScTlzuMw=", + "rev": "4c8d2f67ecd03fbd3cb4c517ef8461427b6d635d", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" }, "src/third_party/webrtc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-KipyGhohU2fQF67dDm4tPeH9xbFC2FNxhU4yiga5pwg=", - "url": "https://webrtc.googlesource.com/src.git", - "rev": "6b419a0536b1a0ccfff3682f997c6f19bcbd9bd8" - }, - "src/third_party/wuffs/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", - "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", - "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8" + "hash": "sha256-KpiNGAue945kGCuQYGhxiWVUFTE1tcntSAXBZdkrE9A=", + "rev": "d8f2b0380b3ec980af35ce4b92ba6a211ec8c76d", + "url": "https://webrtc.googlesource.com/src.git" }, "src/third_party/weston/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git", - "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7" + "hash": "sha256-sfJm1CBGXX13pFcqeOVPqWlXrUfwjRl+rYf2BoT8Bt8=", + "rev": "775f8a1edf357f59e6b2e284297f396f4fac95a4", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", + "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" }, "src/third_party/xdg-utils": { "fetcher": "fetchFromGitiles", - "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", - "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", - "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44" + "hash": "sha256-t3uV9JkkQQIwmezzSoEdTMLSizZdLQB7eLKTRQGH4kQ=", + "rev": "d80274d5869b17b8c9067a1022e4416ee7ed5e0d", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" }, "src/third_party/xnnpack/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-JE3qg3lTpKTLgnpiNw6+wkhVXGx55MiyVDuvEp7Dk0Y=", - "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "a68aa0a24b0d3e1c75f2f7c0915b70121cee0470" + "hash": "sha256-vsn3lrog5affus0qxc4TK2Z/tdd/E6hBYeUQRWoDZPQ=", + "rev": "b9d4073a6913891ce9cbd8965c8d506075d2a45a", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" + }, + "src/third_party/zstd/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yzv/R/GnqlXLeAjBEIev+8uM7MC0HeK0MfppnMTJ7Eg=", + "rev": "25822342be59d831bad65426ae51f5cc22157b09", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" }, "src/tools/page_cycler/acid3": { "fetcher": "fetchFromGitiles", "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", - "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", - "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba" - }, - "src/third_party/zstd/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9FxRLrcbJoWAd+3Elr9mJ3vG6ilT6ZQZqdY9OiTpcWw=", - "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "050fec5c378d676fede8b2171ec5e84f6afa1504" + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-qDQ1rt/9nfv9L6RJLZDb1KTn9+Z70XDjkTs6gOt3u/Y=", - "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "ddb4756a90fb7d89dc789859f8b2a3639d8de125" + "hash": "sha256-Fn4HoS7O2J3nGXFyq7r7AheRQzKy80USTQnNnC4rWqM=", + "rev": "36e4828ab658b8ad72f80974883c4c94f6e7012c", + "url": "https://chromium.googlesource.com/v8/v8.git" + } + }, + "electron_yarn_hash": "1yq854829a4q0yqyjyn2lq4l3amsqdhfd7fjcnc3mz8l2ci3n964", + "modules": "118", + "node": "18.17.1", + "version": "27.3.11" + }, + "28": { + "chrome": "120.0.6099.291", + "chromium": { + "deps": { + "gn": { + "hash": "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k=", + "rev": "e4702d7409069c4f12d45ea7b7f0890717ca3f4b", + "url": "https://gn.googlesource.com/gn", + "version": "2023-10-23" + } + }, + "version": "120.0.6099.291" + }, + "chromium_npm_hash": "sha256-zexxXAAJDnhMmh7HfBO1V1z1Yds06C3gSpXacsbjUb4=", + "deps": { + "src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-g0aRiWCPrXPKBsOsAgtLmRbOeYigtm05MrWH6/fhQs0=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "rev": "120.0.6099.291", + "url": "https://chromium.googlesource.com/chromium/src.git" + }, + "src/chrome/test/data/perf/canvas_bench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" + }, + "src/chrome/test/data/xr/webvr_info": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" + }, + "src/docs/website": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+UawYfW5FAMpv0TbzSR8qITPGUQulLIZ0mUh6ZdnmMI=", + "rev": "07714da3c28b942dc8522affed4487403e971545", + "url": "https://chromium.googlesource.com/website.git" + }, + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-Y0uNoq5LhlFMxQfqrTjzOokbB7Y6UUAlBCj+Nghiz5w=", + "owner": "electron", + "repo": "electron", + "rev": "v28.3.1" + }, + "src/media/cdm/api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", + "url": "https://chromium.googlesource.com/chromium/cdm.git" + }, + "src/net/third_party/quiche/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-JXWGEsJrXRXs2BrkWIC8cUBD6uvt8ftb9V5Dy2yLc/w=", + "rev": "a01a131ca6df63e774809d623f47e8cf28c574cc", + "url": "https://quiche.googlesource.com/quiche.git" + }, + "src/third_party/angle": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aOV7kxrF8FeoHYodZjaUrDDUtpXg2gUiZg6Olv90puk=", + "rev": "6fff8ebc937f07e31473ac014a55f662248ab39a", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+g1yjF1yETrL1X6Cxu5mhPWXukWygg1dnawU8S9cGkA=", + "rev": "7d738783bf286e82937e431c295d4682f3767267", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" + }, + "src/third_party/angle/third_party/glmark2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" + }, + "src/third_party/anonymous_tokens/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2B0j9vNF8nMhmedk+ghz4JJJiDKN6jnVfdqsa4zRWeU=", + "rev": "47d423347823088a21b26262ca553eadb8e5b220", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" + }, + "src/third_party/beto-core/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qgsPK7RyVqGRji0sTcMck1JqX9iCsYIExGoGwNZyVT0=", + "rev": "b902b346037ea3f4aadf8177021f6f917b16e648", + "url": "https://beto-core.googlesource.com/beto-core.git" + }, + "src/third_party/boringssl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hxPNJzWS2f4iUsNYwRvxiTL9vRrcZzZT5KpIx3+WuGM=", + "rev": "c38dc29860a72540eb2c4fdb8a8bfb27ef94ddf3", + "url": "https://boringssl.googlesource.com/boringssl.git" + }, + "src/third_party/breakpad/breakpad": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A=", + "rev": "8988364bcddd9b194b0bf931c10bc125987330ed", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" + }, + "src/third_party/cast_core/public/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", + "rev": "71f51fd6fa45fac73848f65421081edd723297cd", + "url": "https://chromium.googlesource.com/cast_core/public" + }, + "src/third_party/catapult": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jueHC5YC+WmGRtGZ8yD6QT2pVj21n1THpIz/vI9M334=", + "rev": "47efdb4b1428e549c58a6d6c2fa79c4a8ceaf9b4", + "url": "https://chromium.googlesource.com/catapult.git" + }, + "src/third_party/ced/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" + }, + "src/third_party/chromium-variations": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-cRFzDmGoyrxwPDVvatGm3EutOXtWqqlI7v7BeX5d43s=", + "rev": "cb7fe7e32de8b885ccdd6293444d8e4028b03eca", + "url": "https://chromium.googlesource.com/chromium-variations.git" + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", + "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" + }, + "src/third_party/cld_3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" + }, + "src/third_party/colorama/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", + "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" + }, + "src/third_party/cpu_features/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" + }, + "src/third_party/cpuinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BcSG/1aa/cyT8CCd1Qdsm/yXa5bCrmrtaRxnYjwkspY=", + "rev": "76d5e8f5b563daa65340a60fce0e9aec73a936df", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZjLMlNDDN08v9SUFAuroPsu/6ADLHZAAFpv+bmaJA2Y=", + "rev": "25159cae8d540780cbeb994692ce4a3ea14cc094", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" + }, + "src/third_party/cros_system_api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-wI4rx+oQ6i8yIB8NBp/O471O4pVJL3l+ez0t8I5oD/w=", + "rev": "00c21541508ea2c6863f1cda24ef88ef30309ae8", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" + }, + "src/third_party/crossbench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/+y5bMj+CRnljFZ5aWKirPCsRUjckLOZ5F65WnPYSY=", + "rev": "06981428c28d66678ebec13ca1fac3785cf51bb1", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9SrbxiOqXKTFf4qZ4Wqg9aoOMY8zv7NczTqN2+lXwCI=", + "rev": "47107e384bd1dc25674acf04d000a8cdc6195234", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5srmcwL9Zqv91LwoBf9xuyusq1ghDo30Aj27Xo96yPc=", + "rev": "c7ed440d75861649d8a1ef4b775384f31211d902", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EAfTm0QZcihcU6ufBHE1QsYRggNWNKHjVZXcrUp/T+c=", + "rev": "64030a4e01e27c608b6c5f1ab5add43575e086f9", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" + }, + "src/third_party/dawn/third_party/dxheaders": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", + "rev": "62e175ef9fae75335575964c845a302447c012c7", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-DqQIyZU6kYYRoouIiJnJBit8l38wPu08zbJhM2BQbs4=", + "rev": "2ef3f322027bec1bb5572f5083d478148d355d79", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" + }, + "src/third_party/depot_tools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WtosDcMOV9eh0PhTbB5w3x3AYQs3Ui4h3mV0Ib0CBlc=", + "rev": "9f3b33a275e7a5b19d8ce4aba7960d2a38858681", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + }, + "src/third_party/devtools-frontend/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-B/2Qk5LSElBPNImlZHVF3A4g0GFE9OHG/+4QADpK+8w=", + "rev": "a6c7f00333881a7ecf7044b725052ab0c8776d6f", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" + }, + "src/third_party/dom_distiller_js/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" + }, + "src/third_party/eigen3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mfS/l+V0If3fmXvA1p5gtyrNCU6IqWYrBbzm4jkXC3I=", + "rev": "aa6964bf3a34fd607837dd8123bc42465185c4f8", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-yvMU6dXRzHP7l6axo3g4svJ1H2edtFvX2MVMm3K1bEc=", + "owner": "nodejs", + "repo": "node", + "rev": "v18.18.2" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", + "rev": "441f98d02deafd9b090aea568282b28f66a50e36", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" + }, + "src/third_party/farmhash/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-lomUDmbbYW95BHEuYmm0pVqf++nYEa2XxeW4ag36tgc=", + "rev": "e1ca3f06adec15150a171bc38f550058b4bbb23b", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" + }, + "src/third_party/flac": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" + }, + "src/third_party/flatbuffers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=", + "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" + }, + "src/third_party/fontconfig/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=", + "rev": "2fb3419a92156569bc1ec707401258c922cd0d99", + "url": "https://chromium.googlesource.com/external/fontconfig.git" + }, + "src/third_party/fp16/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" + }, + "src/third_party/freetype-testing/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" + }, + "src/third_party/freetype/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-wyaCNPPL2CTZYY6YUUuGnN3TjHxgKeHAYsw+r88ijMI=", + "rev": "55d0287cfc31115760cb13caa346b407ef0c0ceb", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" + }, + "src/third_party/fuzztest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-wuB/lbkVCbisZvVFuLdE8XNDuiLQcI47/Y0EqvOCytc=", + "rev": "b5dbc33890d9586e4f6a213f1bf163ad287e6aa4", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" + }, + "src/third_party/fxdiv/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" + }, + "src/third_party/gemmlowp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" + }, + "src/third_party/google_benchmark/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", + "rev": "b177433f3ee2513b1075140c723d73ab8901790f", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" + }, + "src/third_party/googletest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", + "rev": "af29db7ec28d6df1c7f0f745186884091e602e07", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" + }, + "src/third_party/grpc/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" + }, + "src/third_party/harfbuzz-ng/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xCsfgbsWVSiuII5zFspssrqX4NrRuhzufYSq6fdnjKQ=", + "rev": "f26fd69d858642d76413b8f4068eaf9b57c40a5f", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", + "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" + }, + "src/third_party/hunspell_dictionaries": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" + }, + "src/third_party/icu": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9yFRBrHdWcYgrZAaigS8XnxNsqJNklGdFkAAgVdHXFU=", + "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" + }, + "src/third_party/jsoncpp/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" + }, + "src/third_party/leveldatabase/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", + "url": "https://chromium.googlesource.com/external/leveldb.git" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", + "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" + }, + "src/third_party/libaddressinput/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" + }, + "src/third_party/libaom/source/libaom": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6oZWYXRTZ1IC5yGvfPI19PwPU9O7mKBsW2wVxBGwU/I=", + "rev": "1dbe1c7fae2456f91ccc79fecb919e9ffea0727a", + "url": "https://aomedia.googlesource.com/aom.git" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Jd/KwJJ1oeQMLg8CShTTDQhCVHEDpXcQHiA4+NXYOIA=", + "rev": "1a78d970b8315e7cc6a8601861ec75189c50c214", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" + }, + "src/third_party/libavifinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", + "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a", + "url": "https://aomedia.googlesource.com/libavifinfo.git" + }, + "src/third_party/libc++/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-DVO15xGxatRbUp13EoNslGEZ2QSHn97VbEBHyfMvKfQ=", + "rev": "a429c26ae25c26a569ff12390d5f9be70c5e286b", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" + }, + "src/third_party/libc++abi/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-QjCPRgFU34wZ8GG/dl+6wi2gflje3fG/x+eokb9W02c=", + "rev": "2ca9f38714b1465b9f55b5fbd0da5e4342811e2b", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dT8/Mdit3Qc5Sno6DYKv1qSNr+6Lhiy24ZNNBKoVq8I=", + "rev": "df0023cc95b8e606a2fd243522d823401ef86637", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" + }, + "src/third_party/libipp/libipp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" + }, + "src/third_party/libjpeg_turbo": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", + "rev": "9b894306ec3b28cea46e84c32b56773a98c483da", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" + }, + "src/third_party/liblouis/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" + }, + "src/third_party/libphonenumber/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" + }, + "src/third_party/libprotobuf-mutator/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" + }, + "src/third_party/libsrtp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", + "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" + }, + "src/third_party/libsync/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bQHo8CKDpqvJcVv6OzVO7LOGTqL9qHqD4n9TtRK0v5g=", + "rev": "7686b5d38c69d14932abfb1c1a66ba56c78791ad", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UA/pf35eWFArRM+QdN6i6LK0ePWzXEsviHlf3WUgMoM=", + "rev": "424723dc025ce451dab9568239a46b18d0919b4d", + "url": "https://chromium.googlesource.com/webm/libvpx.git" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", + "url": "https://chromium.googlesource.com/webm/libwebm.git" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=", + "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760", + "url": "https://chromium.googlesource.com/webm/libwebp.git" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", + "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" + }, + "src/third_party/lss": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" + }, + "src/third_party/material_color_utilities/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oi28dWuTd6ijn/RKSPukDr5GSzYiCTM2klFb7WSMDHY=", + "rev": "234a000e507d586c20df6e3bf5b9e035bc5ce7b1", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" + }, + "src/third_party/minigbm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" }, "src/third_party/nan": { "fetcher": "fetchFromGitHub", @@ -2634,12 +1450,131 @@ "repo": "nan", "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" }, - "src/third_party/electron_node": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-lGNDwe3IiQMLg5o0AMhLfNpyfu4dXVk05YRO0yMzg0I=", - "owner": "nodejs", - "repo": "node", - "rev": "v20.9.0" + "src/third_party/nasm": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=", + "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9PT/tuxjREGsvSnYT2wyaL5sB52CcYPpKVKN0ZGldWU=", + "rev": "629e7ba7c964a62c97f6a882bffaec3c8490bb1e", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" + }, + "src/third_party/neon_2_sse/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", + "rev": "a15b489e1222b2087007546b4912e21293ea86ff", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" + }, + "src/third_party/openh264/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TyZ/sZ0gnesWjKUnO2RVM2TTdpVIxsBWueHDgix0/wg=", + "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665", + "url": "https://chromium.googlesource.com/openscreen" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" + }, + "src/third_party/pdfium": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-U1cScrfKN0F+cy307RT2iwB6RYKeCNDRnkYxzamezoY=", + "rev": "a3895af47f600e3f9677f31fa39e15bd01c18457", + "url": "https://pdfium.googlesource.com/pdfium.git" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xLx+dnUysm+HS1esu2hAqBKg/GgTJK4SQu1ZINr2aYc=", + "rev": "7ce535ddfc62d30166f35a8ed0f121da5eb0437c", + "url": "https://android.googlesource.com/platform/external/perfetto.git" + }, + "src/third_party/pthreadpool/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", + "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" + }, + "src/third_party/pyelftools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" + }, + "src/third_party/pywebsocket3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" + }, + "src/third_party/re2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m3bJlSyyhmj/7jvy7ExNX/gol7yeu1mnmyAc8u8Pr8s=", + "rev": "3d9bdbd0e208d3274a1cb1275c94d8b7626ddde2", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Zi3A49YqDE5S4iSpw9t9kTzitbQbcslm1zsepWX5cbw=", + "rev": "6ffa93a89376555b09134c59b84d8f5e9cfc6ce6", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" + }, + "src/third_party/skia": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-CvoJxsBN1Nyh+RPgU+aptZW5WsfGB4hmSlhyma1wO+E=", + "rev": "349c1179c43ef46f2804404952b9460dc007d76a", + "url": "https://skia.googlesource.com/skia.git" + }, + "src/third_party/smhasher/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", + "url": "https://chromium.googlesource.com/external/smhasher.git" + }, + "src/third_party/snappy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PqrwtPFU3TI840za3UU8p+t4ZdyX0l79esEA602Mbq0=", + "rev": "5107c739c1b2a008e7293e3b489c4f80a8fb2e01", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-wKsfwZpDRQzYQp6qls07uapgy9K3TWLOEUQlhIFpJtw=", + "rev": "cd9486849ba3c3ec753f556fd29c0aabee122a28", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" }, "src/third_party/squirrel.mac": { "fetcher": "fetchFromGitHub", @@ -2648,6 +1583,13 @@ "repo": "Squirrel.Mac", "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + }, "src/third_party/squirrel.mac/vendor/ReactiveObjC": { "fetcher": "fetchFromGitHub", "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", @@ -2655,6 +1597,897 @@ "repo": "ReactiveObjC", "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" }, + "src/third_party/swiftshader": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Im4sdDo4b96YQIKDcAmqUk8PiJzejZgSDPur3hqPPRk=", + "rev": "d9ec9befba05a8dfca09c1e88f3f7be0e4b153c6", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" + }, + "src/third_party/text-fragments-polyfill/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" + }, + "src/third_party/tflite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-119/isDtopnj6MBRr3bzBvIppXw8M/ejcPx0CmIjXZU=", + "rev": "21e56c30e480ac67bed48335a5d122c59a6a6805", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" + }, + "src/third_party/vulkan-deps": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-lqCUx70IeHZ7YfE9DXia7dFok/JsFu/HSIv2AGi37YI=", + "rev": "2b783ed328d3a46e6a7a21218ced6b4dd1684114", + "url": "https://chromium.googlesource.com/vulkan-deps" + }, + "src/third_party/vulkan-deps/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+Qs+Q3p11y9oUKyWEbuaQ0vx6hppFZSFbFuU0ve6rRo=", + "rev": "ebb0a8b28e5ea7a13146a24b3ad87b1966dbdfa3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" + }, + "src/third_party/vulkan-deps/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UIk5hihUPjXNzEeO2laS4dUef/rEExxXAZjMcftx+3A=", + "rev": "2de1265fca722929785d9acdec4ab728c47a0254", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + }, + "src/third_party/vulkan-deps/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-JLFVzFNdXqxyKmg3NymIqqZmf2GAb7tYetQ6HJPsUIQ=", + "rev": "88bc5e321c2839707df8b1ab534e243e00744177", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" + }, + "src/third_party/vulkan-deps/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+HUDsp0COKlPtKidOVvUk7lN1AiFw01i5ANc3MO+qjs=", + "rev": "5084f58e5d187b16f84d2af936ff94ea2f46a00c", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" + }, + "src/third_party/vulkan-deps/vulkan-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UlaNc1NxTYulrF4Ol0rLysbLwbFR46Evq7WkWncPB8k=", + "rev": "f4bfcd885214675a6a0d7d4df07f52b511e6ea16", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + }, + "src/third_party/vulkan-deps/vulkan-loader/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GbVr8LmwC6r7a13++5cYJXAq+H4P07quEHpTUV1qfqA=", + "rev": "7b7d15bc9f1d782e4d6ea34e61fd9a36a7952208", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" + }, + "src/third_party/vulkan-deps/vulkan-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-vnrhYM7tcDTcXH4A+2leio5Wc1+b5H+7CQISEI+SPV8=", + "rev": "f7017f23337b90a2b2ceb65a4e1050e8ad89e065", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + }, + "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-buxOdupK/w1sFGGHrEI+On2/mR0q5whvQNKUI8dxJ60=", + "rev": "dcfce25b439a2785f2c90b184e1964898070b4f1", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" + }, + "src/third_party/vulkan-deps/vulkan-validation-layers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LJd7pkcFd8k4npEv8mJy+47xo/5CXMN75ZAtDp+v6FI=", + "rev": "281e1c1c6b51bb6b33f88c18ed4da58ac3024311", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" + }, + "src/third_party/vulkan_memory_allocator": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", + "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" + }, + "src/third_party/wayland-protocols/gtk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" + }, + "src/third_party/wayland-protocols/kde": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" + }, + "src/third_party/wayland-protocols/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", + "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0ICSMZhnsLqMNfqSGjqM3p4ssxptkBtt7EMCpxknW4A=", + "rev": "3fda2fbf51db54398c0155facee82cc9533958a2", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" + }, + "src/third_party/webdriver/pylib": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" + }, + "src/third_party/webgl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=", + "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" + }, + "src/third_party/webgpu-cts/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E39f0wy72TwQ9IM4QquqWxwDiHZOUI8hWkx2QDFcRog=", + "rev": "3dbe4ce12983ccc1ad42e228057c7d8adc17cb78", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" + }, + "src/third_party/webrtc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ju7sX1jrzg5BZOqdkcnFymRTqdFi7xkeHznKJQB1+08=", + "rev": "5ab829e4ca8f63be6b4ed1d98eee382d7307d34e", + "url": "https://webrtc.googlesource.com/src.git" + }, + "src/third_party/weston/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", + "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", + "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" + }, + "src/third_party/xdg-utils": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", + "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" + }, + "src/third_party/xnnpack/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s9Avx9o+1igKulOpKhtbbkoINuh1wNercPszRaA4TZM=", + "rev": "bbbaa7352a3ea729987d3e654d37be93e8009691", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" + }, + "src/third_party/zstd/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-95OOpYKGve+YWzqqguQIg1emTOAuaGyYpWxrWVDOKAQ=", + "rev": "cdceb0fce59785c841bf697e00067163106064e1", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" + }, + "src/tools/page_cycler/acid3": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" + }, + "src/v8": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GevDXfVX4UxwTbgp2ZQbp3AFOHv5tECmyqLGIyYi5Tw=", + "rev": "71b6b5a68e0883c155e01368aace6eb6d71b85f3", + "url": "https://chromium.googlesource.com/v8/v8.git" + } + }, + "electron_yarn_hash": "117vxam1044yy2akwjfhvb5dpfnv667pwbg92ac43551xfn0slcg", + "modules": "119", + "node": "18.18.2", + "version": "28.3.1" + }, + "29": { + "chrome": "122.0.6261.156", + "chromium": { + "deps": { + "gn": { + "hash": "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY=", + "rev": "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e", + "url": "https://gn.googlesource.com/gn", + "version": "2024-01-22" + } + }, + "version": "122.0.6261.156" + }, + "chromium_npm_hash": "sha256-9eFsK673j3pTDOcsU35RN4hagFygA/v/ahCqVVEV0Rs=", + "deps": { + "src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5AmRq2pl3p0QtqyIjx4XDVE9Mnps18F9Z9MyH+38a0Y=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "rev": "122.0.6261.156", + "url": "https://chromium.googlesource.com/chromium/src.git" + }, + "src/chrome/test/data/perf/canvas_bench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" + }, + "src/chrome/test/data/xr/webvr_info": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" + }, + "src/docs/website": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-sKbrY/m75LVWjWjhhjaeQnfXQP5AkEsEkZ+GmMNQJVo=", + "rev": "7474472013397bdb177cda70099f6411a5bd8212", + "url": "https://chromium.googlesource.com/website.git" + }, + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-u9o+2M3dURfZkKSzb+bjZcvHygXDbt2IjaYLoSjWeBw=", + "owner": "electron", + "repo": "electron", + "rev": "v29.3.3" + }, + "src/media/cdm/api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", + "url": "https://chromium.googlesource.com/chromium/cdm.git" + }, + "src/net/third_party/quiche/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mrnKQh2d6ewg1X8sCx8U4frHXyFKHuIUpvi0WBzg+PU=", + "rev": "0e39ce016ee1ec8271aa7216d547917c239db525", + "url": "https://quiche.googlesource.com/quiche.git" + }, + "src/third_party/angle": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-h2b/f8MmldZSk3c84rvwO5+UZK36BFf/H9BStWFbDoo=", + "rev": "f9bad5e27d61e2ab6a7504b1793be5aa14eb1414", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zBY7MY6FXazzTW+nXvknkNar/odL0tzHXxHPmpYuy7E=", + "rev": "0f6fd3de81102058dc2ae299af1ad5287d2145dd", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" + }, + "src/third_party/angle/third_party/glmark2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" + }, + "src/third_party/anonymous_tokens/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3+/zvwYAv3OGoKJatg+/c3OM1IyGq2iCyFWgu3b8VoU=", + "rev": "d024f05b39e21bb2a0b8205a7ce72b1b185b84c2", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" + }, + "src/third_party/beto-core/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PkvHqVKjGHxAYntylJxR5xnUVU1o8DJuBmsd9qkl/Yo=", + "rev": "4d202dab960a0b6a6e4757ab4393945aca5a09db", + "url": "https://beto-core.googlesource.com/beto-core.git" + }, + "src/third_party/boringssl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-shqUB+x7oXgtQqqfhkwXHwLLaJW1/L1vh1O+jvdsDP8=", + "rev": "414f69504d30d0848b69f6453ea7fb5e88004cb4", + "url": "https://boringssl.googlesource.com/boringssl.git" + }, + "src/third_party/breakpad/breakpad": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7SmO5e/U2shYVslmCRPVLyfU5N4Rp1mzls8lLqIW8x8=", + "rev": "62ecd463583d09eb7d15b1d410055f30b2c7bcb4", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" + }, + "src/third_party/cast_core/public/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", + "rev": "71f51fd6fa45fac73848f65421081edd723297cd", + "url": "https://chromium.googlesource.com/cast_core/public" + }, + "src/third_party/catapult": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ixfmLcWTgVcHi2CXAulMXTaAyPYT42Q8VflStxmNRXc=", + "rev": "ab03292694695864b523636060e2a96b2c9b2df2", + "url": "https://chromium.googlesource.com/catapult.git" + }, + "src/third_party/ced/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" + }, + "src/third_party/chromium-variations": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-px8BHI5Cp3vBRyei50dbxCTn/gydLsps1/SmJxxeGKw=", + "rev": "d0dcd8802c22c1ac4a7d112782a4c75f0c6ca8ee", + "url": "https://chromium.googlesource.com/chromium-variations.git" + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", + "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" + }, + "src/third_party/cld_3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" + }, + "src/third_party/colorama/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", + "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" + }, + "src/third_party/cpu_features/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" + }, + "src/third_party/cpuinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-56XE95dvaDF8E89V/le19Gk52fR0pqqyE38UgQo+GQM=", + "rev": "76cc10d627add77922dc24521b332a055a4d6d77", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2FuyB/TLKMbqgjvw0q19lcG85fedwlOmKKNlGevEzos=", + "rev": "ab7bdff32543991f52872c25cecf1f926702dfe3", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" + }, + "src/third_party/cros_system_api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Tzn7Sx6k7BpH/UqMZHdLTk26FBp5QNcX0xWhztgRKrw=", + "rev": "12d5e386005a211570cfdf9849d2fa6a3b38594b", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" + }, + "src/third_party/crossbench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VxH1eOsJGQUk93EYexl1QrCpHTpgCOQP7H+oN0MZNpA=", + "rev": "1983b3f517da56c35c91296467458f71ad5b9340", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9SrbxiOqXKTFf4qZ4Wqg9aoOMY8zv7NczTqN2+lXwCI=", + "rev": "47107e384bd1dc25674acf04d000a8cdc6195234", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/lG4wfy5LVCMGuqKRZgf/NoxsAuCvyUdV1Anbzi0q+U=", + "rev": "6a6719ee09f1078356fdd31c69061e07b5c61c2d", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PGGwxNYgvZ//k+cr19iTG2QwC9Agu2T9k9QOhnX565s=", + "rev": "701a2b1da0387ac6abf73bdbaf7864b9615db033", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" + }, + "src/third_party/dawn/third_party/dxheaders": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", + "rev": "62e175ef9fae75335575964c845a302447c012c7", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-wlneFqVEhM6fe9p10T22dx4dxnZzWwKHw+35eIlDGVM=", + "rev": "dedb6316202c8c55b898e52248f1345241299125", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" + }, + "src/third_party/depot_tools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C1l4piDzNENx6Vvtzu03HsBZTHIavO5AkmO6QXErh3Y=", + "rev": "6fc0c97ab284021b72e3bc962f7fa879ffcad65b", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + }, + "src/third_party/devtools-frontend/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Y7XPBkKU8p210dj7ydIDVJgiXx6ZQPP4D5Jfw3t9FCc=", + "rev": "3fa1fc736f46022f45c7ba7d817d1df1519c55d7", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" + }, + "src/third_party/dom_distiller_js/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" + }, + "src/third_party/eigen3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-a9QAnv6vIM8a9Bn8ZmfeMT0+kbtb0QGxM0+m5xwIqm8=", + "rev": "454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-lGNDwe3IiQMLg5o0AMhLfNpyfu4dXVk05YRO0yMzg0I=", + "owner": "nodejs", + "repo": "node", + "rev": "v20.9.0" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, + "src/third_party/engflow-reclient-configs": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", + "owner": "EngFlow", + "repo": "reclient-configs", + "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", + "rev": "441f98d02deafd9b090aea568282b28f66a50e36", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" + }, + "src/third_party/farmhash/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NRyMXRxnHJi5JiEJUxOxJyPGe5BGTxNbNyEOu1GyO8E=", + "rev": "17525de887d54b970ffdd421a0879c1db1952307", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" + }, + "src/third_party/flac": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" + }, + "src/third_party/flatbuffers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=", + "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" + }, + "src/third_party/fontconfig/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=", + "rev": "2fb3419a92156569bc1ec707401258c922cd0d99", + "url": "https://chromium.googlesource.com/external/fontconfig.git" + }, + "src/third_party/fp16/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" + }, + "src/third_party/freetype-testing/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" + }, + "src/third_party/freetype/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ogBt+haM+MoETsPIhwPDPZCLwQB9u9+w7OHL4us6kg8=", + "rev": "57617782464411201ce7bbc93b086c1b4d7d84a5", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" + }, + "src/third_party/fuzztest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YEg+/562AX/hK0Adx9bUZqATt+5VDZjn/csWVhRji2M=", + "rev": "12e7428ab0847b1d1dc6c4b89203adfd1f16a1ad", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" + }, + "src/third_party/fxdiv/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" + }, + "src/third_party/gemmlowp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" + }, + "src/third_party/google_benchmark/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", + "rev": "b177433f3ee2513b1075140c723d73ab8901790f", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" + }, + "src/third_party/googletest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", + "rev": "af29db7ec28d6df1c7f0f745186884091e602e07", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" + }, + "src/third_party/grpc/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" + }, + "src/third_party/harfbuzz-ng/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VAan6P8PHSq8RsGE4YbI/wCfFAhzl3nJMt0cQBYi5Ls=", + "rev": "155015f4bec434ecc2f94621665844218f05ce51", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", + "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" + }, + "src/third_party/hunspell_dictionaries": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" + }, + "src/third_party/icu": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YYoslfgGfmDpSTxtCOmGGfwQg6mVU1IggzAtWRwwcMc=", + "rev": "bad7ddbf921358177e56fd723c2f59f8041a370f", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" + }, + "src/third_party/jsoncpp/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" + }, + "src/third_party/leveldatabase/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", + "url": "https://chromium.googlesource.com/external/leveldb.git" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", + "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" + }, + "src/third_party/libaddressinput/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" + }, + "src/third_party/libaom/source/libaom": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-f65sdsMAWCWpsdTgyTzx5fwM/2ESm/cBCvU41s2BEV0=", + "rev": "1a72ea323d65e46eb90d08d492c04891abb91926", + "url": "https://aomedia.googlesource.com/aom.git" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-rglws6GR11X8SdpYhK9CoxElWuPFYfp5b+vETjEoJOY=", + "rev": "e170c9366090cdc389d5f47ee3c2d7db71d263bc", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" + }, + "src/third_party/libavifinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", + "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a", + "url": "https://aomedia.googlesource.com/libavifinfo.git" + }, + "src/third_party/libc++/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/3VxptC6qAv9NCt8y1peJKTXTFI7blbvnpZ6D0VYyDk=", + "rev": "28aa23ffb4c7344914a5b4ac7169f12e5a12333f", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" + }, + "src/third_party/libc++abi/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O337gqiB4uiTWUgIfPdEa1Du+/ww+xYpmmZW9Py7uyQ=", + "rev": "9986707a5f2fc6d5d1ffa7f224a032bdd45c95fd", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySRgjJUYFXTw5kys9WDSuxnmfzj1I4ImvTWi+7q0HXE=", + "rev": "35fea10bfdb790cf131ae74a4ee346905f34dc3c", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" + }, + "src/third_party/libipp/libipp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" + }, + "src/third_party/libjpeg_turbo": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", + "rev": "9b894306ec3b28cea46e84c32b56773a98c483da", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" + }, + "src/third_party/liblouis/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" + }, + "src/third_party/libphonenumber/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" + }, + "src/third_party/libprotobuf-mutator/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" + }, + "src/third_party/libsrtp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", + "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" + }, + "src/third_party/libsync/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WPd6BlhNNF9n/qFU8atEh1fagbc05dWsFzBugw55boY=", + "rev": "f400fdb561d4416b59b8f8a33d8ec8b79da60495", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AUNWUicLMpEL/+r5c3JVjgZu9URBVsebayMs+ogNN6M=", + "rev": "893c9f6d070cc3bd8503152480089673f57fdf76", + "url": "https://chromium.googlesource.com/webm/libvpx.git" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", + "url": "https://chromium.googlesource.com/webm/libwebm.git" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=", + "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760", + "url": "https://chromium.googlesource.com/webm/libwebp.git" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", + "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" + }, + "src/third_party/lss": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" + }, + "src/third_party/material_color_utilities/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-sYLpJbgwR5POWqbUqu7IdWJ2Gibjz1PsMdSK+7yPDt4=", + "rev": "bec7bab60e6431201a82761ea4482b98b54c2af9", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" + }, + "src/third_party/minigbm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", + "owner": "nodejs", + "repo": "nan", + "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" + }, + "src/third_party/nasm": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=", + "rev": "f477acb1049f5e043904b87b825c5915084a9a29", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-XsQrfj0R88qf0C/LtRUsset/lnRpBkbpGUr/ZE3qmyk=", + "rev": "4bdb5000ee7919724530cf89d50969e7b0ed58a7", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" + }, + "src/third_party/neon_2_sse/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", + "rev": "a15b489e1222b2087007546b4912e21293ea86ff", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" + }, + "src/third_party/openh264/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-habWfKhK66T537zJb/fm0IWpDbD2xgd9Upg97xRBy/M=", + "rev": "b70c552bedf189fc238e98f8f69e6c30e7925207", + "url": "https://chromium.googlesource.com/openscreen" + }, + "src/third_party/openscreen/src/buildtools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-o974IZvLUG2KlB1pQPYFwnoPGo239CV96pQPoQO7lvM=", + "rev": "a9a6f0c49d0e8fa0cda37337430b4736ab3dc944", + "url": "https://chromium.googlesource.com/chromium/src/buildtools" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" + }, + "src/third_party/pdfium": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-XJAQBQjM0JzyeNy5ZU1KpfxE1U6lQtTEhg21riHHJ0E=", + "rev": "4c4f9ab25dab142d7888f3258ab54df24b97b44f", + "url": "https://pdfium.googlesource.com/pdfium.git" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-DLu7p6tDImRC7sk+PqIZvyjpOVIZl3I/8rYX498DVTk=", + "rev": "1e15d01da5d619ca617dcdd870efe3c35046a89c", + "url": "https://android.googlesource.com/platform/external/perfetto.git" + }, + "src/third_party/pthreadpool/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", + "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" + }, + "src/third_party/pyelftools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" + }, + "src/third_party/pywebsocket3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" + }, + "src/third_party/re2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3eAhiKUIMnpVCEuLWVCVOK3alVsxAJrEWtHBzvdjZkY=", + "rev": "826ad10e58a042faf57d7c329b0fd0a04b797e0b", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvzxHQEAK6D9qIr/Wf/s6TfBp9QorHlNi4qzSx5Ih/c=", + "rev": "cd7b92695b5d3f0c9ff65b865c2a1e19b99d766d", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" + }, + "src/third_party/skia": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-iJlxnQL0JsDPOFSyD0ubEMWtDJhtbqCsBtaQqWZt8q0=", + "rev": "8464f41cf051974e499be9caeab3243506e025c2", + "url": "https://skia.googlesource.com/skia.git" + }, + "src/third_party/smhasher/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", + "url": "https://chromium.googlesource.com/external/smhasher.git" + }, + "src/third_party/snappy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FDsK5sNy3YOrmaGpN3AhSExzBY9D8RGwoZKkjg/5vo0=", + "rev": "2ee210ca20767c949c4ff29bdffa1138eb0501fe", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-brDFYmagGIH7fvRAP/JaCAMyuFLJKrc0jf0106gofiw=", + "rev": "a5270ae741714a5aad187ba8dcd8bddca39f791f", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" + }, + "src/third_party/squirrel.mac": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, "src/third_party/squirrel.mac/vendor/Mantle": { "fetcher": "fetchFromGitHub", "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", @@ -2662,30 +2495,1114 @@ "repo": "Mantle", "rev": "78d3966b3c331292ea29ec38661b25df0a245948" }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" + }, + "src/third_party/swiftshader": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-k0WzWDa/+48ogpbmECNDJKIED4wGu/Hm0DyGnCT9xoU=", + "rev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" + }, + "src/third_party/text-fragments-polyfill/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" + }, + "src/third_party/tflite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LOQH+qtltrahcPIutw/zYvEhmvbSjFBWT1mrg/pUD/0=", + "rev": "296f1e3cce03308c7fd5cdc7a76fbc3e41ec5214", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" + }, + "src/third_party/vulkan-deps": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bxg82G3dkugLXpTkfk/kNcKHKWn2i8+cCKPgfbaIVZ8=", + "rev": "c00c99b8e979ca1b1eba221a60cb1e1d3b12f956", + "url": "https://chromium.googlesource.com/vulkan-deps" + }, + "src/third_party/vulkan-deps/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-QKSPJuIJe44vVNZ8fjqRKc73CZV0fECcnXvY6QRec+0=", + "rev": "57d86ab763da7b2cd1e00ecec8aa697403a8fd20", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" + }, + "src/third_party/vulkan-deps/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VxwAs6mNOK/46VIJ0BroR41cNy2ywU+FQCgBatY1sBY=", + "rev": "b82536766d1b81631b126d1ddbe49baf42929bd3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + }, + "src/third_party/vulkan-deps/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TVfaGY9YjVHvR38OvuphsS68UIpBF21ghBg/2LL3gmE=", + "rev": "7b0309708da5126b89e4ce6f19835f36dc912f2f", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" + }, + "src/third_party/vulkan-deps/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yUaUBCj3MqBwkGNC8ElJ/uvcm0Pl5BAdiWAw/Pi52Xo=", + "rev": "c96fe8b943564fbab3424219d924d21cac2e877a", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" + }, + "src/third_party/vulkan-deps/vulkan-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kBOkj7mr4stPXUCBhNJpNL3A+9BebEwrIBEIroxdH8Y=", + "rev": "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + }, + "src/third_party/vulkan-deps/vulkan-loader/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qvpwu4mmmLAFolLZt5q9XYgZff6BHO2Yapg93JUpBVA=", + "rev": "0b2b71306aebf1e11304b9f961f9a29ab0234756", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" + }, + "src/third_party/vulkan-deps/vulkan-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C4xJwYkMqzmYk6lP7SQNXhCt6FyuH4+pqOHltuxJkOA=", + "rev": "7c6d640a5ca3ab73c1f42d22312f672b54babfaf", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + }, + "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvia+Xb9BpOjPARKo3Sgp85Bfh1roFZ2PzCtXVFYeIU=", + "rev": "4cfc176e3242b4dbdfd3f6c5680c5d8f2cb7db45", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" + }, + "src/third_party/vulkan-deps/vulkan-validation-layers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6YUjvPKjuuZdhBRfM+84btXvAHR2rj7ovocZnLS31JY=", + "rev": "d26b50b03815ff226e6df478b4ddc4b98d8deaee", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" + }, + "src/third_party/vulkan_memory_allocator": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", + "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" + }, + "src/third_party/wayland-protocols/gtk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" + }, + "src/third_party/wayland-protocols/kde": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" + }, + "src/third_party/wayland-protocols/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ljMcY59iOdGYeToadCuQ3t0lrBnsBdot+NiT6e+JJ04=", + "rev": "681c33c8547d6aefe24455ba2bffe1c5ae11fee5", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-By+3qSfYs4dM4Hcjq2j4ZlSSPhagwqtNl//HKMrc5LY=", + "rev": "af7f44122127b86a8c74cb7432909180f4899eaa", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" + }, + "src/third_party/webdriver/pylib": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" + }, + "src/third_party/webgl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=", + "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" + }, + "src/third_party/webgpu-cts/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RC2t+H44HyIvHLRcZyebSgVZvbmtw0vsy2KJRUlvTKs=", + "rev": "e082b08475761a2ba6a3349dfea72f704c8b68d4", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" + }, + "src/third_party/webrtc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-KipyGhohU2fQF67dDm4tPeH9xbFC2FNxhU4yiga5pwg=", + "rev": "6b419a0536b1a0ccfff3682f997c6f19bcbd9bd8", + "url": "https://webrtc.googlesource.com/src.git" + }, + "src/third_party/weston/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", + "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", + "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" + }, + "src/third_party/xdg-utils": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", + "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" + }, + "src/third_party/xnnpack/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-JE3qg3lTpKTLgnpiNw6+wkhVXGx55MiyVDuvEp7Dk0Y=", + "rev": "a68aa0a24b0d3e1c75f2f7c0915b70121cee0470", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" + }, + "src/third_party/zstd/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9FxRLrcbJoWAd+3Elr9mJ3vG6ilT6ZQZqdY9OiTpcWw=", + "rev": "050fec5c378d676fede8b2171ec5e84f6afa1504", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" + }, + "src/tools/page_cycler/acid3": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" + }, + "src/v8": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qDQ1rt/9nfv9L6RJLZDb1KTn9+Z70XDjkTs6gOt3u/Y=", + "rev": "ddb4756a90fb7d89dc789859f8b2a3639d8de125", + "url": "https://chromium.googlesource.com/v8/v8.git" + } + }, + "electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf", + "modules": "121", + "node": "20.9.0", + "version": "29.3.3" + }, + "30": { + "chrome": "124.0.6367.119", + "chromium": { + "deps": { + "gn": { + "hash": "sha256-aEL1kIhgPAFqdb174dG093HoLhCJ07O1Kpqfu7r14wQ=", + "rev": "22581fb46c0c0c9530caa67149ee4dd8811063cf", + "url": "https://gn.googlesource.com/gn", + "version": "2024-03-14" + } + }, + "version": "124.0.6367.119" + }, + "chromium_npm_hash": "sha256-oILlQlzTcc0YqAvK5htRvG/YXWJTDtJ60Z1EcBEj9dw=", + "deps": { + "src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mhH2pQskQw39PUCociK/g7QLjI/cDh2GXk9PJIeJ7HU=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "rev": "124.0.6367.119", + "url": "https://chromium.googlesource.com/chromium/src.git" + }, + "src/chrome/test/data/perf/canvas_bench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" + }, + "src/chrome/test/data/xr/webvr_info": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" + }, + "src/docs/website": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2WyiSqza9Mp2G8KHUnrzfikC7hGcUTLu4/W9AD6Zdi4=", + "rev": "02057aa20e0dd4598967e3daf2f25c815962ef1c", + "url": "https://chromium.googlesource.com/website.git" + }, + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-tW9LODdKT8W6UYmpqh1bwGTk5wQYJ3TSxSvxfAqc4uQ=", + "owner": "electron", + "repo": "electron", + "rev": "v30.0.3" + }, + "src/media/cdm/api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", + "url": "https://chromium.googlesource.com/chromium/cdm.git" + }, + "src/net/third_party/quiche/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BJ3CCKFHOcIgIqnYxfjfOqbRhnt9ycrZfAFRZOLPYZQ=", + "rev": "9f8738892edd83219d2f83fdd73c7c14d5dbb80d", + "url": "https://quiche.googlesource.com/quiche.git" + }, + "src/third_party/accessibility_test_framework/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=", + "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe", + "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git" + }, + "src/third_party/angle": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O89W5dE97eUKpOnSuoBbl2BCigsDYK609Hq9pqd25CQ=", + "rev": "0b776d32f69a932acb61963d9daad9e13f610944", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-eQvZmm6aAsI+z++SMM9i/SsREjikIjMLpedzw57eKyA=", + "rev": "ec9827528085fcffca353c8d941ec20e3de7aaea", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" + }, + "src/third_party/angle/third_party/glmark2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" + }, + "src/third_party/anonymous_tokens/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZKvfil6V4PexxVl/UCW/mUINlCHBTrZnhTB0UhTW0PQ=", + "rev": "321a40ba18a083feccb8ae2f99a8676bb1702676", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" + }, + "src/third_party/beto-core/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7GkqH4hgTVmISjUy/Km/X28tBSsiMs3JRnDmol1zaag=", + "rev": "8bd72cfb219344308ee857bcbe65a27fe91acfe8", + "url": "https://beto-core.googlesource.com/beto-core.git" + }, + "src/third_party/boringssl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RiDdH26xzoAD2NdTNKDraco9p2jKHXJxbRWI3pUhI78=", + "rev": "4fa4804c8ab4521079af62dba5260a99c34b8a29", + "url": "https://boringssl.googlesource.com/boringssl.git" + }, + "src/third_party/breakpad/breakpad": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qAIXZ1jZous0Un0jVkOQ66nA2525NziV3Lbso2/+Z1Y=", + "rev": "76788faa4ef163081f82273bfca7fae8a734b971", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" + }, + "src/third_party/cast_core/public/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", + "rev": "71f51fd6fa45fac73848f65421081edd723297cd", + "url": "https://chromium.googlesource.com/cast_core/public" + }, + "src/third_party/catapult": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HhpP5OeGF9in2XEoZMfMCIAFHAqlDvJpfSWa8JfGWzM=", + "rev": "9128ec6d34905512199f953bc60ff75ca29d0cf2", + "url": "https://chromium.googlesource.com/catapult.git" + }, + "src/third_party/ced/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" + }, + "src/third_party/chromium-variations": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YwnqJynhunMvIduUcJ1/nBLabe/WS4RDox+XLMYMA2c=", + "rev": "e78e275e34f94fdf333245137878f0f6482db67d", + "url": "https://chromium.googlesource.com/chromium-variations.git" + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", + "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" + }, + "src/third_party/cld_3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" + }, + "src/third_party/colorama/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", + "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" + }, + "src/third_party/cpu_features/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" + }, + "src/third_party/cpuinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9QRj4OA1qWlZujVJ6Z9x3190taVjTCZocM/272eepIs=", + "rev": "aa4b2163b99ac9534194520f70b93eeefb0b3b4e", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-w2VosAdg+GtalFaGxDB8FB2w7498PMudsXxX4SpJqYE=", + "rev": "a254b37189cf97cfc76634644e58be511aefb69a", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" + }, + "src/third_party/cros_system_api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dFp4Hy7fldUjXxUTtcyRXdt7zpIP2lchzDKkk0b+iko=", + "rev": "9a51dc89c4f21362e858b20a6a7cc8adfd7c7238", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" + }, + "src/third_party/crossbench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4gQn5y/Z6ccYA/0VjIQfMpFMkEuPA78jyCgZ+FpmsFs=", + "rev": "acbea986f40578f43c88239c78c797f61842e642", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AA2bcrsW1xFspyl5TqYUJeAwKM06rWTNtXr/uMVIJmw=", + "rev": "006ca01d387ac6652825d6cce1a57b2de67dbf8d", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GUB25IUviLFxGI3UQJS/kf51BZBeoYFqbiaSTSY11qA=", + "rev": "394edde38c9323f7c910e3bdec9b7efc4ee39379", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-wsQtYqH8gFsDmLTUA7SKvTYiGQWX7Vbcz1QtsAg/epY=", + "rev": "bd7aa97798735e1288d36de41dcda75e867550e4", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" + }, + "src/third_party/dawn/third_party/dxheaders": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", + "rev": "62e175ef9fae75335575964c845a302447c012c7", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VTYTdvBNxqRzYjEx5ml4LnkDEUGpyvssSzDOndHyYgU=", + "rev": "3e45aee0b16dc724a79a0feb0490e2ddb06c9f0d", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" + }, + "src/third_party/depot_tools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YmjhwOjqCRxDhC7P+aRoNN+Vokl7hB4s6hDNFS5gLYo=", + "rev": "9c43bc14f1a7404fd4b6f744050d553acca557bf", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + }, + "src/third_party/devtools-frontend/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FVYUoK3KWlIjQTWlNkjmnzJDfpRkEZ9sFWTr4GdOUJw=", + "rev": "694ad4ed3c55195acd701950d2b2528880e9201e", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" + }, + "src/third_party/dom_distiller_js/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" + }, + "src/third_party/eigen3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-tx/XR7xJ7IMh5RMvL8wRo/g+dfD3xcjZkLPSY4D9HaY=", + "rev": "2a9055b50ed22101da7d77e999b90ed50956fe0b", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-9/TPxYbnQPDpWf/Zti8bTh22e/uFRlzs7SCThfx/byQ=", + "owner": "nodejs", + "repo": "node", + "rev": "v20.11.1" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, "src/third_party/engflow-reclient-configs": { "fetcher": "fetchFromGitHub", "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", "owner": "EngFlow", "repo": "reclient-configs", "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" - } - }, - "version": "29.3.0", - "modules": "121", - "chrome": "122.0.6261.156", - "node": "20.9.0", - "chromium": { - "version": "122.0.6261.156", - "deps": { - "gn": { - "version": "2024-01-22", - "url": "https://gn.googlesource.com/gn", - "rev": "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e", - "hash": "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY=" - } + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", + "rev": "441f98d02deafd9b090aea568282b28f66a50e36", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" + }, + "src/third_party/farmhash/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5ynDd2wQ3QtS6SM2X+j3hTKB9aVhGrjoIlGSzy43K8Q=", + "rev": "52d8ef3799b2f16b66351dd0972bb0bcee1648ac", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" + }, + "src/third_party/flac": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" + }, + "src/third_party/flatbuffers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=", + "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" + }, + "src/third_party/fontconfig/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=", + "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267", + "url": "https://chromium.googlesource.com/external/fontconfig.git" + }, + "src/third_party/fp16/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" + }, + "src/third_party/freetype-testing/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" + }, + "src/third_party/freetype/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FtFRJaxyp7vo4EPBiqx05OsKo1UA1g/h+9BjuoijLFA=", + "rev": "f42ce25563b73fed0123d18a2556b9ba01d2c76b", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" + }, + "src/third_party/fuzztest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-utl9uwFqMqDW9ll9/3lh3rfjmPHlv5sx/enQuPffQZ8=", + "rev": "bddcd9f77ba0a81a99ce50bcadf5149efe545df0", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" + }, + "src/third_party/fxdiv/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" + }, + "src/third_party/gemmlowp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" + }, + "src/third_party/google_benchmark/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=", + "rev": "344117638c8ff7e239044fd0fa7085839fc03021", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" + }, + "src/third_party/googletest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mNYS3k2fAc7Q6GlpnO7pkXSkGHfUH1MXuZXkCmwG4q4=", + "rev": "c231e6f5b152029dbd5fa4a9e0c04095035aec3f", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" + }, + "src/third_party/grpc/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" + }, + "src/third_party/harfbuzz-ng/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VAan6P8PHSq8RsGE4YbI/wCfFAhzl3nJMt0cQBYi5Ls=", + "rev": "155015f4bec434ecc2f94621665844218f05ce51", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", + "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" + }, + "src/third_party/hunspell_dictionaries": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" + }, + "src/third_party/icu": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YYoslfgGfmDpSTxtCOmGGfwQg6mVU1IggzAtWRwwcMc=", + "rev": "bad7ddbf921358177e56fd723c2f59f8041a370f", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" + }, + "src/third_party/jsoncpp/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" + }, + "src/third_party/leveldatabase/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", + "url": "https://chromium.googlesource.com/external/leveldb.git" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", + "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" + }, + "src/third_party/libaddressinput/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" + }, + "src/third_party/libaom/source/libaom": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zgtNjrQE+fzr8Aye0rAkQR5enzfacCAsRbC3crUrMQ4=", + "rev": "158761dfb40e77f3a54c3b14a596112837baa24b", + "url": "https://aomedia.googlesource.com/aom.git" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-moVf7i0gZ/KW53ACcVIWKWNL0oAimOSU1m5IdQHz6z8=", + "rev": "43ec9ace31c6ca11efddddb61b94b744450d46e2", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" + }, + "src/third_party/libavifinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", + "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a", + "url": "https://aomedia.googlesource.com/libavifinfo.git" + }, + "src/third_party/libc++/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-k2bSS8OhVyd0/metFpwFvRCWYOaLEU0Md4AW50GpGTM=", + "rev": "80307e66e74bae927fb8709a549859e777e3bf0b", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" + }, + "src/third_party/libc++abi/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AdyX58sg//O2e76HAcRC5DcuiTsd68QS4mNVkPv0Vck=", + "rev": "ec88f0ab262c5f2426dbf138b92ee9ae5961e431", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-tB9Wzjs4Sct7QendDMKkaEE4ddD6ptnNCmj1yYKcQSc=", + "rev": "f9a93151adf7203c6ab90f3c94bbd5972b7967b8", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" + }, + "src/third_party/libipp/libipp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" + }, + "src/third_party/libjpeg_turbo": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", + "rev": "9b894306ec3b28cea46e84c32b56773a98c483da", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" + }, + "src/third_party/liblouis/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" + }, + "src/third_party/libphonenumber/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" + }, + "src/third_party/libprotobuf-mutator/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" + }, + "src/third_party/libsrtp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", + "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" + }, + "src/third_party/libsync/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/4/Trextb4F9UMDVrg4uG9QZl6S0H9FiwnL+2S5+ZpE=", + "rev": "419b03c0b8f20d6da9ddcb0d661a94a97cdd7dad", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5IsUUvhcKKiWJFetS29+S7Wiz5JwqRZGK2t2ehld/M4=", + "rev": "19832b1702d5b0adf616a0e080abd5207c8445b5", + "url": "https://chromium.googlesource.com/webm/libvpx.git" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", + "url": "https://chromium.googlesource.com/webm/libwebm.git" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=", + "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760", + "url": "https://chromium.googlesource.com/webm/libwebp.git" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hD5B9fPNwf8M98iS/PYeUJgJxtBvvf2BrrlnBNYXSg0=", + "rev": "a6a2ec654b1be1166b376476a7555c89eca0c275", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" + }, + "src/third_party/lss": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" + }, + "src/third_party/material_color_utilities/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=", + "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" + }, + "src/third_party/minigbm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", + "owner": "nodejs", + "repo": "nan", + "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" + }, + "src/third_party/nasm": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=", + "rev": "f477acb1049f5e043904b87b825c5915084a9a29", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YotKuKutnjuphwiElfQO6qpoNLhZGP6bqWZnW3Zv6QI=", + "rev": "33e682f24427a0eb634bd3186fe3c6fd96bd6768", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" + }, + "src/third_party/neon_2_sse/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", + "rev": "a15b489e1222b2087007546b4912e21293ea86ff", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" + }, + "src/third_party/openh264/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-wUKhF9sU1HAZvs4fQHxeFfxkpkhBp6nTljJrQ4lH7lA=", + "rev": "a3f9719bed95289c59771d4c4bcb85f5ecacac43", + "url": "https://chromium.googlesource.com/openscreen" + }, + "src/third_party/openscreen/src/buildtools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SBorO59kMSnskcp3oP5lrGQg+9cr/Ymey2aZGlRTgu0=", + "rev": "0ac67b7cef80e421283f633ee9c2ce652f6e42cc", + "url": "https://chromium.googlesource.com/chromium/src/buildtools" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" + }, + "src/third_party/pdfium": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4CPHeZAJM756a2TIxs4ZX0D7j85deDIf/bTGow75m/U=", + "rev": "7b90b15a21cfdd3d74525616b5de04df94fa0583", + "url": "https://pdfium.googlesource.com/pdfium.git" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FeI+nAa5N8mQoA8gDSmWn6nw6TSPhDGwJI8/7r/5z1c=", + "rev": "a66020f87046d8934c22e20acb2bb8a91901ce8e", + "url": "https://android.googlesource.com/platform/external/perfetto.git" + }, + "src/third_party/protobuf-javascript/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=", + "rev": "e34549db516f8712f678fcd4bc411613b5cc5295", + "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" + }, + "src/third_party/pthreadpool/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", + "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" + }, + "src/third_party/pyelftools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" + }, + "src/third_party/pywebsocket3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" + }, + "src/third_party/re2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gB6vW6UJ60LrrGeNP6NKAcirIK6jgZjHRc6TA+pNXAQ=", + "rev": "6598a8ecd57724c8c7d43b2fca8eb9f9969ce57c", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-cwmKQJpR+7lp+dq8fGu6U8A+qmkXz6SlWvAdhBkKZOw=", + "rev": "587c2cf8b11d3c32fa26887063eda3171a3d353e", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" + }, + "src/third_party/skia": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-8C8IMQjfJGeCXCXZyd/eSbDNsdcKI/Bul0m1wrqx1P8=", + "rev": "e2ea2eb3e0d37fff47968dfaaa337debb3b75b1e", + "url": "https://skia.googlesource.com/skia.git" + }, + "src/third_party/smhasher/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", + "url": "https://chromium.googlesource.com/external/smhasher.git" + }, + "src/third_party/snappy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=", + "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TsrSvL76H7SFhJWgHqyl8Y/BhAcnI9oaT2tUT6Ktan4=", + "rev": "f51e3fa404f5853650525549c78d7489a7f457b3", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" + }, + "src/third_party/squirrel.mac": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" + }, + "src/third_party/swiftshader": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-tU0maePvL35JIVKFm+9hmPYDM81szLNYqUJyTKMHT0k=", + "rev": "bbe6452b420c5ddc4b0fd421b0a3ce271262f4ca", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" + }, + "src/third_party/text-fragments-polyfill/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" + }, + "src/third_party/tflite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Iqun3uMTCjGzHxUDeTCrvZufNtobnbqYVPDt7ZJ06wM=", + "rev": "55bc062601e4ee5a4efa834a84ae5c5ec6b28306", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" + }, + "src/third_party/vulkan-deps": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-MokWdjOP8Mc5hmoRrSXHXkobMPWbbmMzAMBOOoKG3gk=", + "rev": "3cebaae6743688201c8aa9b3694bba6948f0fa68", + "url": "https://chromium.googlesource.com/vulkan-deps" + }, + "src/third_party/vulkan-deps/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-lP+N1d6jE+Cj5ofomgMEhbA6VbH5eKw83mY6zNIOfNk=", + "rev": "9f37ad360ea1c32162f0cc1799b1b292594fc771", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" + }, + "src/third_party/vulkan-deps/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", + "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + }, + "src/third_party/vulkan-deps/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kyOAwe4R0FmeA9IIJF2eoZR+7g9LiGKaZ7FuIfkrXJ4=", + "rev": "8b246ff75c6615ba4532fe4fde20f1be090c3764", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" + }, + "src/third_party/vulkan-deps/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/Cldtx75V+z3FuColEqwweyZHEqR2NaIj1Ha/vPoCsc=", + "rev": "c6615779ef8a1eb5ef48fef77bf3eb2cf4f5438d", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" + }, + "src/third_party/vulkan-deps/vulkan-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EnKiCtH6rh3ACQgokSSfp4FPFluMZW0dheP8IEzZtY4=", + "rev": "577baa05033cf1d9236b3d078ca4b3269ed87a2b", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + }, + "src/third_party/vulkan-deps/vulkan-loader/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zkJSPshRaZRDiBvLJbJo8l1MX10KXYZniqtNTNnokT4=", + "rev": "61a9c50248e09f3a0e0be7ce6f8bb1663855f979", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" + }, + "src/third_party/vulkan-deps/vulkan-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9qs0oS6W7x/1Z+wlFt91bqF09oxoloNPtjjH9mECJFk=", + "rev": "733fd2b522918f81f9c4669350dafd066f99c5d5", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + }, + "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mCD9/bpWUXRVJ+OyOqG0tXTgFuptIlcG6UR/RiNV1Z0=", + "rev": "a4140c5fd47dcf3a030726a60b293db61cfb54a3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" + }, + "src/third_party/vulkan-deps/vulkan-validation-layers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Bcm5yMo7JL/E6YZetlabkA0mkEFxbWriYNd8tRtgx5k=", + "rev": "5b8af92af052c83444ac560ff1e28c1c322424ef", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" + }, + "src/third_party/vulkan_memory_allocator": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", + "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" + }, + "src/third_party/wayland-protocols/gtk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" + }, + "src/third_party/wayland-protocols/kde": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" + }, + "src/third_party/wayland-protocols/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ljMcY59iOdGYeToadCuQ3t0lrBnsBdot+NiT6e+JJ04=", + "rev": "681c33c8547d6aefe24455ba2bffe1c5ae11fee5", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YSo1DznmcaYSUcJl/3voVSfZfuLokAFQt6F3M1Iat28=", + "rev": "c35d1a3d1c0a1735afe5eb227cb826faa878ec19", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" + }, + "src/third_party/webdriver/pylib": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" + }, + "src/third_party/webgl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=", + "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" + }, + "src/third_party/webgpu-cts/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/duXwmqanyI2KEnV5izvr0kE8tJNI1F1jMMIY0ylLH8=", + "rev": "addbf812fd750dc8cebbd63732e7ce54a763fbee", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" + }, + "src/third_party/webrtc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-USSfh+vUFrWnXYvZIORRb4AEGNSCPub2cNqEdZD9mKM=", + "rev": "a55ff9e83e4592010969d428bee656bace8cbc3b", + "url": "https://webrtc.googlesource.com/src.git" + }, + "src/third_party/weston/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", + "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", + "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" + }, + "src/third_party/xdg-utils": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", + "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" + }, + "src/third_party/xnnpack/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Cmw+rj805YTnnCwy2Zwzi2ZW4sdX5JWjTnBaUB6+YyU=", + "rev": "7e696d941310a528dd2d6fbee3d499d19b24746d", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" + }, + "src/third_party/zstd/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hWfYKiTzkmeiUTgNrSYXOFauusSVceVhD04Hgk69CK4=", + "rev": "621a263fb2e6c2175fbd489e5d77ee8038baa2b2", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" + }, + "src/tools/page_cycler/acid3": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" + }, + "src/v8": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-rwEdjWYJz7shrwLWRyzOgbRvmIR0C9aZXn0vhcBLF50=", + "rev": "c6b8b43c3042d99f07d5cc0771e58511afaa66a3", + "url": "https://chromium.googlesource.com/v8/v8.git" } }, "electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf", - "chromium_npm_hash": "sha256-9eFsK673j3pTDOcsU35RN4hagFygA/v/ahCqVVEV0Rs=" + "modules": "123", + "node": "20.11.1", + "version": "30.0.3" } } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/update.py b/third_party/nixpkgs/pkgs/development/tools/electron/update.py index 128b1dc050..bf0f7a3a47 100755 --- a/third_party/nixpkgs/pkgs/development/tools/electron/update.py +++ b/third_party/nixpkgs/pkgs/development/tools/electron/update.py @@ -1,81 +1,105 @@ #! /usr/bin/env nix-shell #! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nix-prefetch-git nix-universal-prefetch prefetch-yarn-deps prefetch-npm-deps +""" +electron updater -import logging -import click_log -import click -import random -import traceback -import csv +A script for updating both binary and source hashes. + +It supports the following modes: + +| Mode | Description | +|------------- | ----------------------------------------------- | +| `update` | for updating a specific Electron release | +| `update-all` | for updating all electron releases at once | +| `eval` | just print the necessary sources to fetch | + +The `eval` and `update` commands accept an optional `--version` flag +to restrict the mechanism only to a given major release. + +The `update` and `update-all` commands accept an optional `--commit` +flag to automatically commit the changes for you. + +The `update` and `update-all` commands accept optional `--bin-only` +and `--source-only` flags to restict the update to binary or source +releases. +""" import base64 -import os -import re -import tempfile -import subprocess +import csv import json +import logging +import os +import random +import re +import subprocess import sys -from joblib import Parallel, delayed, Memory +import tempfile +import traceback +import urllib.request + +from abc import ABC from codecs import iterdecode from datetime import datetime +from typing import Iterable, Optional, Tuple from urllib.request import urlopen -os.chdir(os.path.dirname(__file__)) +import click +import click_log + +from joblib import Parallel, delayed, Memory depot_tools_checkout = tempfile.TemporaryDirectory() -subprocess.check_call([ - "nix-prefetch-git", - "--builder", "--quiet", - "--url", "https://chromium.googlesource.com/chromium/tools/depot_tools", - "--out", depot_tools_checkout.name, - "--rev", "7a69b031d58081d51c9e8e89557b343bba8518b1"]) +subprocess.check_call( + [ + "nix-prefetch-git", + "--builder", + "--quiet", + "--url", + "https://chromium.googlesource.com/chromium/tools/depot_tools", + "--out", + depot_tools_checkout.name, + "--rev", + "7a69b031d58081d51c9e8e89557b343bba8518b1", + ] +) sys.path.append(depot_tools_checkout.name) import gclient_eval import gclient_utils -memory = Memory("cache", verbose=0) -@memory.cache -def get_repo_hash(fetcher, args): - cmd = ['nix-universal-prefetch', fetcher] - for arg_name, arg in args.items(): - cmd.append(f'--{arg_name}') - cmd.append(arg) +# Relative path to the electron-source info.json +SOURCE_INFO_JSON = "info.json" - print(" ".join(cmd), file=sys.stderr) - out = subprocess.check_output(cmd) - return out.decode('utf-8').strip() +# Relatice path to the electron-bin info.json +BINARY_INFO_JSON = "binary/info.json" -@memory.cache -def _get_yarn_hash(file): - print(f'prefetch-yarn-deps', file=sys.stderr) - with tempfile.TemporaryDirectory() as tmp_dir: - with open(tmp_dir + '/yarn.lock', 'w') as f: - f.write(file) - return subprocess.check_output(['prefetch-yarn-deps', tmp_dir + '/yarn.lock']).decode('utf-8').strip() -def get_yarn_hash(repo, yarn_lock_path = 'yarn.lock'): - return _get_yarn_hash(repo.get_file(yarn_lock_path)) +# Number of spaces used for each indentation level +JSON_INDENT = 4 + +os.chdir(os.path.dirname(__file__)) + +memory: Memory = Memory("cache", verbose=0) + +logger = logging.getLogger(__name__) +click_log.basic_config(logger) -@memory.cache -def _get_npm_hash(file): - print(f'prefetch-npm-deps', file=sys.stderr) - with tempfile.TemporaryDirectory() as tmp_dir: - with open(tmp_dir + '/package-lock.json', 'w') as f: - f.write(file) - return subprocess.check_output(['prefetch-npm-deps', tmp_dir + '/package-lock.json']).decode('utf-8').strip() -def get_npm_hash(repo, package_lock_path = 'package-lock.json'): - return _get_npm_hash(repo.get_file(package_lock_path)) class Repo: - def __init__(self): - self.deps = {} + fetcher: str + args: dict + + def __init__(self) -> None: + self.deps: dict = {} self.hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" - def get_deps(self, repo_vars, path): - print("evaluating " + json.dumps(self, default = vars), file=sys.stderr) + def get_deps(self, repo_vars: dict, path: str) -> None: + print( + "evaluating " + json.dumps(self, default=vars, sort_keys=True), + file=sys.stderr, + ) deps_file = self.get_file("DEPS") - evaluated = gclient_eval.Parse(deps_file, filename='DEPS') + evaluated = gclient_eval.Parse(deps_file, filename="DEPS") repo_vars = dict(evaluated["vars"]) | repo_vars @@ -84,7 +108,12 @@ class Repo: self.deps = { prefix + dep_name: repo_from_dep(dep) for dep_name, dep in evaluated["deps"].items() - if (gclient_eval.EvaluateCondition(dep["condition"], repo_vars) if "condition" in dep else True) and repo_from_dep(dep) != None + if ( + gclient_eval.EvaluateCondition(dep["condition"], repo_vars) + if "condition" in dep + else True + ) + and repo_from_dep(dep) != None } for key in evaluated.get("recursedeps", []): @@ -92,80 +121,244 @@ class Repo: if dep_path in self.deps and dep_path != "src/third_party/squirrel.mac": self.deps[dep_path].get_deps(repo_vars, dep_path) - def prefetch(self): + def prefetch(self) -> None: self.hash = get_repo_hash(self.fetcher, self.args) - def prefetch_all(self): - return sum([dep.prefetch_all() for [_, dep] in self.deps.items()], [delayed(self.prefetch)()]) + def prefetch_all(self) -> int: + return sum( + [dep.prefetch_all() for [_, dep] in self.deps.items()], + [delayed(self.prefetch)()], + ) - def flatten_repr(self): - return { - "fetcher": self.fetcher, - "hash": self.hash, - **self.args - } + def flatten_repr(self) -> dict: + return {"fetcher": self.fetcher, "hash": self.hash, **self.args} - def flatten(self, path): - out = { - path: self.flatten_repr() - } + def flatten(self, path: str) -> dict: + out = {path: self.flatten_repr()} for dep_path, dep in self.deps.items(): out |= dep.flatten(dep_path) return out + def get_file(self, filepath: str) -> str: + raise NotImplementedError + + class GitRepo(Repo): - def __init__(self, url, rev): + def __init__(self, url: str, rev: str) -> None: super().__init__() - self.fetcher = 'fetchgit' + self.fetcher = "fetchgit" self.args = { "url": url, "rev": rev, } + class GitHubRepo(Repo): - def __init__(self, owner, repo, rev): + def __init__(self, owner: str, repo: str, rev: str) -> None: super().__init__() - self.fetcher = 'fetchFromGitHub' + self.fetcher = "fetchFromGitHub" self.args = { "owner": owner, "repo": repo, "rev": rev, } - def get_file(self, filepath): - return urlopen(f"https://raw.githubusercontent.com/{self.args['owner']}/{self.args['repo']}/{self.args['rev']}/{filepath}").read().decode('utf-8') + def get_file(self, filepath: str) -> str: + return ( + urlopen( + f"https://raw.githubusercontent.com/{self.args['owner']}/{self.args['repo']}/{self.args['rev']}/{filepath}" + ) + .read() + .decode("utf-8") + ) + class GitilesRepo(Repo): - def __init__(self, url, rev): + def __init__(self, url: str, rev: str) -> None: super().__init__() - self.fetcher = 'fetchFromGitiles' - #self.fetcher = 'fetchgit' + self.fetcher = "fetchFromGitiles" + # self.fetcher = 'fetchgit' self.args = { "url": url, "rev": rev, - #"fetchSubmodules": "false", + # "fetchSubmodules": "false", } if url == "https://chromium.googlesource.com/chromium/src.git": - self.args['postFetch'] = "rm -r $out/third_party/blink/web_tests; " - self.args['postFetch'] += "rm -r $out/third_party/hunspell/tests; " - self.args['postFetch'] += "rm -r $out/content/test/data; " - self.args['postFetch'] += "rm -r $out/courgette/testdata; " - self.args['postFetch'] += "rm -r $out/extensions/test/data; " - self.args['postFetch'] += "rm -r $out/media/test/data; " + self.args["postFetch"] = "rm -r $out/third_party/blink/web_tests; " + self.args["postFetch"] += "rm -r $out/third_party/hunspell/tests; " + self.args["postFetch"] += "rm -r $out/content/test/data; " + self.args["postFetch"] += "rm -r $out/courgette/testdata; " + self.args["postFetch"] += "rm -r $out/extensions/test/data; " + self.args["postFetch"] += "rm -r $out/media/test/data; " - def get_file(self, filepath): - return base64.b64decode(urlopen(f"{self.args['url']}/+/{self.args['rev']}/{filepath}?format=TEXT").read()).decode('utf-8') + def get_file(self, filepath: str) -> str: + return base64.b64decode( + urlopen( + f"{self.args['url']}/+/{self.args['rev']}/{filepath}?format=TEXT" + ).read() + ).decode("utf-8") -def repo_from_dep(dep): + +class ElectronBinRepo(GitHubRepo): + def __init__(self, owner: str, repo: str, rev: str) -> None: + super().__init__(owner, repo, rev) + self.systems = { + "i686-linux": "linux-ia32", + "x86_64-linux": "linux-x64", + "armv7l-linux": "linux-armv7l", + "aarch64-linux": "linux-arm64", + "x86_64-darwin": "darwin-x64", + "aarch64-darwin": "darwin-arm64", + } + + def get_shasums256(self, version: str) -> list: + """Returns the contents of SHASUMS256.txt""" + try: + called_process: subprocess.CompletedProcess = subprocess.run( + [ + "nix-prefetch-url", + "--print-path", + f"https://github.com/electron/electron/releases/download/v{version}/SHASUMS256.txt", + ], + capture_output=True, + check=True, + text=True, + ) + + hash_file_path = called_process.stdout.split("\n")[1] + + with open(hash_file_path, "r") as f: + return f.read().split("\n") + + except subprocess.CalledProcessError as err: + print(err.stderr) + sys.exit(1) + + def get_headers(self, version: str) -> str: + """Returns the hash of the release headers tarball""" + try: + called_process: subprocess.CompletedProcess = subprocess.run( + [ + "nix-prefetch-url", + f"https://artifacts.electronjs.org/headers/dist/v{version}/node-v{version}-headers.tar.gz", + ], + capture_output=True, + check=True, + text=True, + ) + return called_process.stdout.split("\n")[0] + except subprocess.CalledProcessError as err: + print(err.stderr) + sys.exit(1) + + def get_hashes(self, major_version: str) -> dict: + """Returns a dictionary of hashes for a given major version""" + m, _ = get_latest_version(major_version) + version: str = m["version"] + + out = {} + out[major_version] = { + "hashes": {}, + "version": version, + } + + hashes: list = self.get_shasums256(version) + + for nix_system, electron_system in self.systems.items(): + filename = f"*electron-v{version}-{electron_system}.zip" + if any([x.endswith(filename) for x in hashes]): + out[major_version]["hashes"][nix_system] = [ + x.split(" ")[0] for x in hashes if x.endswith(filename) + ][0] + out[major_version]["hashes"]["headers"] = self.get_headers(version) + + return out + + +# Releases that have reached end-of-life no longer receive any updates +# and it is rather pointless trying to update those. +# +# https://endoflife.date/electron +@memory.cache +def supported_version_range() -> range: + """Returns a range of electron releases that have not reached end-of-life yet""" + releases_json = json.loads( + urlopen("https://endoflife.date/api/electron.json").read() + ) + supported_releases = [ + int(x["cycle"]) + for x in releases_json + if x["eol"] == False + or datetime.strptime(x["eol"], "%Y-%m-%d") > datetime.today() + ] + + return range( + min(supported_releases), # incl. + # We have also packaged the beta release in nixpkgs, + # but it is not tracked by endoflife.date + max(supported_releases) + 2, # excl. + 1, + ) + + +@memory.cache +def get_repo_hash(fetcher: str, args: dict) -> str: + cmd = ["nix-universal-prefetch", fetcher] + for arg_name, arg in args.items(): + cmd.append(f"--{arg_name}") + cmd.append(arg) + + print(" ".join(cmd), file=sys.stderr) + out = subprocess.check_output(cmd) + return out.decode("utf-8").strip() + + +@memory.cache +def _get_yarn_hash(path: str) -> str: + print(f"prefetch-yarn-deps", file=sys.stderr) + with tempfile.TemporaryDirectory() as tmp_dir: + with open(tmp_dir + "/yarn.lock", "w") as f: + f.write(path) + return ( + subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"]) + .decode("utf-8") + .strip() + ) + + +def get_yarn_hash(repo: Repo, yarn_lock_path: str = "yarn.lock") -> str: + return _get_yarn_hash(repo.get_file(yarn_lock_path)) + + +@memory.cache +def _get_npm_hash(filename: str) -> str: + print(f"prefetch-npm-deps", file=sys.stderr) + with tempfile.TemporaryDirectory() as tmp_dir: + with open(tmp_dir + "/package-lock.json", "w") as f: + f.write(filename) + return ( + subprocess.check_output( + ["prefetch-npm-deps", tmp_dir + "/package-lock.json"] + ) + .decode("utf-8") + .strip() + ) + + +def get_npm_hash(repo: Repo, package_lock_path: str = "package-lock.json") -> str: + return _get_npm_hash(repo.get_file(package_lock_path)) + + +def repo_from_dep(dep: dict) -> Optional[Repo]: if "url" in dep: url, rev = gclient_utils.SplitUrlRevision(dep["url"]) - search_object = re.search(r'https://github.com/(.+)/(.+?)(\.git)?$', url) + search_object = re.search(r"https://github.com/(.+)/(.+?)(\.git)?$", url) if search_object: return GitHubRepo(search_object.group(1), search_object.group(2), rev) - if re.match(r'https://.+.googlesource.com', url): + if re.match(r"https://.+.googlesource.com", url): return GitilesRepo(url, rev) return GitRepo(url, rev) @@ -173,107 +366,404 @@ def repo_from_dep(dep): # Not a git dependency; skip return None -def get_gn_source(repo): + +def get_gn_source(repo: Repo) -> dict: gn_pattern = r"'gn_version': 'git_revision:([0-9a-f]{40})'" gn_commit = re.search(gn_pattern, repo.get_file("DEPS")).group(1) - gn = subprocess.check_output([ - "nix-prefetch-git", - "--quiet", - "https://gn.googlesource.com/gn", - "--rev", gn_commit - ]) - gn = json.loads(gn) + gn_prefetch: bytes = subprocess.check_output( + [ + "nix-prefetch-git", + "--quiet", + "https://gn.googlesource.com/gn", + "--rev", + gn_commit, + ] + ) + gn: dict = json.loads(gn_prefetch) return { "gn": { "version": datetime.fromisoformat(gn["date"]).date().isoformat(), "url": gn["url"], "rev": gn["rev"], - "hash": gn["hash"] + "hash": gn["hash"], } } -def get_electron_info(major_version): - electron_releases = json.loads(urlopen("https://releases.electronjs.org/releases.json").read()) - major_version_releases = filter(lambda item: item["version"].startswith(f"{major_version}."), electron_releases) + +def get_latest_version(major_version: str) -> Tuple[str, str]: + """Returns the latest version for a given major version""" + electron_releases: dict = json.loads( + urlopen("https://releases.electronjs.org/releases.json").read() + ) + major_version_releases = filter( + lambda item: item["version"].startswith(f"{major_version}."), electron_releases + ) m = max(major_version_releases, key=lambda item: item["date"]) - rev=f"v{m['version']}" + rev = f"v{m['version']}" + return (m, rev) - electron_repo = GitHubRepo("electron", "electron", rev) - electron_repo.recurse = True - electron_repo.get_deps({ - f"checkout_{platform}": platform == "linux" - for platform in ["ios", "chromeos", "android", "mac", "win", "linux"] - }, "src/electron") +def get_electron_bin_info(major_version: str) -> Tuple[str, str, ElectronBinRepo]: + m, rev = get_latest_version(major_version) + + electron_repo: ElectronBinRepo = ElectronBinRepo("electron", "electron", rev) + return (major_version, m, electron_repo) + + +def get_electron_info(major_version: str) -> Tuple[str, str, GitHubRepo]: + m, rev = get_latest_version(major_version) + + electron_repo: GitHubRepo = GitHubRepo("electron", "electron", rev) + electron_repo.get_deps( + { + f"checkout_{platform}": platform == "linux" + for platform in ["ios", "chromeos", "android", "mac", "win", "linux"] + }, + "src/electron", + ) return (major_version, m, electron_repo) -logger = logging.getLogger(__name__) -click_log.basic_config(logger) -@click.group() -def cli(): - pass - -@cli.command("eval") -@click.option("--version", help="The major version, e.g. '23'") -def eval(version): - (_, _, repo) = electron_repo = get_electron_info(version) - tree = electron_repo.flatten("src/electron") - print(json.dumps(tree, indent=4, default = vars)) - -def get_update(repo): +def get_update(repo: Tuple[str, str, Repo]) -> Tuple[str, dict]: (major_version, m, electron_repo) = repo tasks = electron_repo.prefetch_all() - a = lambda: ( - ("electron_yarn_hash", get_yarn_hash(electron_repo)) - ) + a = lambda: (("electron_yarn_hash", get_yarn_hash(electron_repo))) tasks.append(delayed(a)()) a = lambda: ( - ("chromium_npm_hash", get_npm_hash(electron_repo.deps["src"], "third_party/node/package-lock.json")) + ( + "chromium_npm_hash", + get_npm_hash( + electron_repo.deps["src"], "third_party/node/package-lock.json" + ), + ) ) tasks.append(delayed(a)()) random.shuffle(tasks) - task_results = {n[0]: n[1] for n in Parallel(n_jobs=3, require='sharedmem', return_as="generator")(tasks) if n != None} + task_results = { + n[0]: n[1] + for n in Parallel(n_jobs=3, require="sharedmem", return_as="generator")(tasks) + if n != None + } tree = electron_repo.flatten("src/electron") - return (f"{major_version}", { - "deps": tree, - **{key: m[key] for key in ["version", "modules", "chrome", "node"]}, - "chromium": { - "version": m['chrome'], - "deps": get_gn_source(electron_repo.deps["src"]) - }, - **task_results - }) + return ( + f"{major_version}", + { + "deps": tree, + **{key: m[key] for key in ["version", "modules", "chrome", "node"]}, + "chromium": { + "version": m["chrome"], + "deps": get_gn_source(electron_repo.deps["src"]), + }, + **task_results, + }, + ) -@cli.command("update") -@click.option("--version", help="The major version, e.g. '23'") -def update(version): + +def load_info_json(path: str) -> dict: + """Load the contents of a JSON file + + Args: + path: The path to the JSON file + + Returns: An empty dict if the path does not exist, otherwise the contents of the JSON file. + """ try: - with open('info.json', 'r') as f: - old_info = json.loads(f.read()) + with open(path, "r") as f: + return json.loads(f.read()) except: - old_info = {} - repo = get_electron_info(version) - update = get_update(repo) - out = old_info | { update[0]: update[1] } - with open('info.json', 'w') as f: - f.write(json.dumps(out, indent=4, default = vars)) - f.write('\n') + return {} -@cli.command("update-all") -def update_all(): - repos = Parallel(n_jobs=2, require='sharedmem')(delayed(get_electron_info)(major_version) for major_version in range(28, 24, -1)) - out = {n[0]: n[1] for n in Parallel(n_jobs=2, require='sharedmem')(delayed(get_update)(repo) for repo in repos)} - with open('info.json', 'w') as f: - f.write(json.dumps(out, indent=4, default = vars)) - f.write('\n') +def save_info_json(path: str, content: dict) -> None: + """Saves the given info to a JSON file + + Args: + path: The path where the info should be saved + content: The content to be saved as JSON. + """ + with open(path, "w") as f: + f.write(json.dumps(content, indent=JSON_INDENT, default=vars, sort_keys=True)) + f.write("\n") + + +def update_bin(major_version: str, commit: bool) -> None: + """Update a given electron-bin release + + Args: + major_version: The major version number, e.g. '27' + commit: Whether the updater should commit the result + """ + package_name = f"electron_{major_version}-bin" + print(f"Updating {package_name}") + + electron_bin_info = get_electron_bin_info(major_version) + (_major_version, _version, repo) = electron_bin_info + + old_info = load_info_json(BINARY_INFO_JSON) + new_info = repo.get_hashes(major_version) + + out = old_info | new_info + + save_info_json(BINARY_INFO_JSON, out) + + old_version = ( + old_info[major_version]["version"] if major_version in old_info else None + ) + new_version = new_info[major_version]["version"] + if old_version == new_version: + print(f"{package_name} is up-to-date") + elif commit: + commit_result(package_name, old_version, new_version, BINARY_INFO_JSON) + + +def update_source(major_version: str, commit: bool) -> None: + """Update a given electron-source release + + Args: + major_version: The major version number, e.g. '27' + commit: Whether the updater should commit the result + """ + package_name = f"electron-source.electron_{major_version}" + print(f"Updating electron-source.electron_{major_version}") + + old_info = load_info_json(SOURCE_INFO_JSON) + old_version = ( + old_info[str(major_version)]["version"] + if str(major_version) in old_info + else None + ) + + electron_source_info = get_electron_info(major_version) + new_info = get_update(electron_source_info) + out = old_info | {new_info[0]: new_info[1]} + + save_info_json(SOURCE_INFO_JSON, out) + + new_version = new_info[1]["version"] + if old_version == new_version: + print(f"{package_name} is up-to-date") + elif commit: + commit_result(package_name, old_version, new_version, SOURCE_INFO_JSON) + + +def non_eol_releases(releases: Iterable[int]) -> Iterable[int]: + """Returns a list of releases that have not reached end-of-life yet.""" + return tuple(filter(lambda x: x in supported_version_range(), releases)) + + +def update_all_source(commit: bool) -> None: + """Update all eletron-source releases at once + + Args: + commit: Whether to commit the result + """ + old_info = load_info_json(SOURCE_INFO_JSON) + + filtered_releases = non_eol_releases(tuple(map(lambda x: int(x), old_info.keys()))) + + # This might take some time + repos = Parallel(n_jobs=2, require="sharedmem")( + delayed(get_electron_info)(major_version) for major_version in filtered_releases + ) + new_info = { + n[0]: n[1] + for n in Parallel(n_jobs=2, require="sharedmem")( + delayed(get_update)(repo) for repo in repos + ) + } + + if commit: + for major_version in filtered_releases: + # Since the sources have been fetched at this point already, + # fetching them again will be much faster. + update_source(str(major_version), commit) + else: + out = old_info | {new_info[0]: new_info[1]} + save_info_json(SOURCE_INFO_JSON, out) + + +def parse_cve_numbers(tag_name: str) -> Iterable[str]: + """Returns mentioned CVE numbers from a given release tag""" + cve_pattern = r"CVE-\d{4}-\d+" + url = f"https://api.github.com/repos/electron/electron/releases/tags/{tag_name}" + headers = { + "Accept": "application/vnd.github+json", + "X-GitHub-Api-Version": "2022-11-28", + } + request = urllib.request.Request(url=url, headers=headers) + release_note = "" + try: + with urlopen(request) as response: + release_note = json.loads(response.read().decode("utf-8"))["body"] + except: + print( + f"WARN: Fetching release note for {tag_name} from GitHub failed!", + file=sys.stderr, + ) + + return sorted(re.findall(cve_pattern, release_note)) + + +def commit_result( + package_name: str, old_version: Optional[str], new_version: str, path: str +) -> None: + """Creates a git commit with a short description of the change + + Args: + package_name: The package name, e.g. `electron-source.electron-{major_version}` + or `electron_{major_version}-bin` + + old_version: Version number before the update. + Can be left empty when initializing a new release. + + new_version: Version number after the update. + + path: Path to the lockfile to be committed + """ + assert ( + isinstance(package_name, str) and len(package_name) > 0 + ), "Argument `package_name` cannot be empty" + assert ( + isinstance(new_version, str) and len(new_version) > 0 + ), "Argument `new_version` cannot be empty" + + if old_version != new_version: + major_version = new_version.split(".")[0] + cve_fixes_text = "\n".join( + list( + map(lambda cve: f"- Fixes {cve}", parse_cve_numbers(f"v{new_version}")) + ) + ) + init_msg = f"init at {new_version}" + update_msg = f"{old_version} -> {new_version}" + diff = f"- Diff: https://github.com/electron/electron/compare/refs/tags/v{old_version}...v{new_version}\n" if old_version != None else "" + commit_message = f"""{package_name}: {update_msg if old_version != None else init_msg} + +- Changelog: https://github.com/electron/electron/releases/tag/v{new_version} +{diff}{cve_fixes_text} +""" + subprocess.run( + [ + "git", + "add", + path, + ] + ) + subprocess.run( + [ + "git", + "commit", + "-m", + commit_message, + ] + ) + + +@click.group() +def cli() -> None: + """A script for updating electron-bin and electron-source hashes""" + pass + + +@cli.command( + "eval", help="Print the necessary sources to fetch for a given major release" +) +@click.option("--version", help="The major version, e.g. '23'") +def eval(version): + (_, _, repo) = electron_repo = get_electron_info(version) + tree = repo.flatten("src/electron") + print(json.dumps(tree, indent=JSON_INDENT, default=vars, sort_keys=True)) + + +@cli.command("update", help="Update a single major release") +@click.option("-v", "--version", help="The major version, e.g. '23'") +@click.option( + "-b", + "--bin-only", + is_flag=True, + default=False, + help="Only update electron-bin packages", +) +@click.option( + "-s", + "--source-only", + is_flag=True, + default=False, + help="Only update electron-source packages", +) +@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result") +def update(version: str, bin_only: bool, source_only: bool, commit: bool) -> None: + assert isinstance(version, str) and len(version) > 0, "version must be non-empty" + + if bin_only and source_only: + print( + "Error: Omit --bin-only and --source-only if you want to update both source and binary packages.", + file=sys.stderr, + ) + sys.exit(1) + + elif bin_only: + update_bin(version, commit) + + elif source_only: + update_source(version, commit) + + else: + update_bin(version, commit) + update_source(version, commit) + + +@cli.command("update-all", help="Update all releases at once") +@click.option( + "-b", + "--bin-only", + is_flag=True, + default=False, + help="Only update electron-bin packages", +) +@click.option( + "-s", + "--source-only", + is_flag=True, + default=False, + help="Only update electron-source packages", +) +@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result") +def update_all(bin_only: bool, source_only: bool, commit: bool) -> None: + # Filter out releases that have reached end-of-life + filtered_bin_info = dict( + filter( + lambda entry: int(entry[0]) in supported_version_range(), + load_info_json(BINARY_INFO_JSON).items(), + ) + ) + + if bin_only and source_only: + print( + "Error: omit --bin-only and --source-only if you want to update both source and binary packages.", + file=sys.stderr, + ) + sys.exit(1) + + elif bin_only: + for major_version, _ in filtered_bin_info.items(): + update_bin(major_version, commit) + + elif source_only: + update_all_source(commit) + + else: + for major_version, _ in filtered_bin_info.items(): + update_bin(major_version, commit) + + update_all_source(commit) + if __name__ == "__main__": cli() diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/wrapper.nix b/third_party/nixpkgs/pkgs/development/tools/electron/wrapper.nix index 5ecb0387b6..c912c059e2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/wrapper.nix @@ -1,6 +1,6 @@ { stdenv , electron-unwrapped -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , gsettings-desktop-schemas , glib @@ -12,7 +12,7 @@ stdenv.mkDerivation { pname = "electron"; inherit (electron-unwrapped) version; - nativeBuildInputs = [ wrapGAppsHook makeWrapper ]; + nativeBuildInputs = [ wrapGAppsHook3 makeWrapper ]; buildInputs = [ # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gtk3 gtk4 diff --git a/third_party/nixpkgs/pkgs/development/tools/ent/default.nix b/third_party/nixpkgs/pkgs/development/tools/ent/default.nix index a1357c8ab2..5848213506 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ent-go"; - version = "0.12.5"; + version = "0.13.1"; src = fetchFromGitHub { owner = "ent"; repo = "ent"; rev = "v${version}"; - sha256 = "sha256-g4n9cOTv/35WkvMjrtP2eEcbiu5kiafVXifz1zlEuCY="; + sha256 = "sha256-OEQWNWGVs0QYhPuCGEFgAVaUnfswmvWVt+e0cAdkBKE="; }; - vendorHash = "sha256-DUi4Ik+qFbx4LIm9MDJ4H9/+sIfCzK8MMGKp0GIGX7w="; + vendorHash = "sha256-9KdSGIyi95EVQq9jGoVqK8aq3JXlQXB+Qwlh/Kfz4Oc="; subPackages = [ "cmd/ent" ]; @@ -29,13 +29,13 @@ buildGoModule rec { --zsh <($out/bin/ent completion zsh) ''; - meta = with lib; { + meta = { description = "An entity framework for Go"; homepage = "https://entgo.io/"; + changelog = "https://github.com/ent/ent/releases/tag/v${version}"; downloadPage = "https://github.com/ent/ent"; - license = licenses.asl20; - maintainers = with maintainers; [ ]; + license = lib.licenses.asl20; + maintainers = [ ]; mainProgram = "ent"; }; } - diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index 49463ccda0..f4d9c8542e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { homepage = "https://esbuild.github.io"; changelog = "https://github.com/evanw/esbuild/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ lucus16 marsam undefined-moe ivan ]; + maintainers = with maintainers; [ lucus16 undefined-moe ivan ]; mainProgram = "esbuild"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/extism-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/extism-cli/default.nix index f683338c69..ebdce3ef60 100644 --- a/third_party/nixpkgs/pkgs/development/tools/extism-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/extism-cli/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "extism-cli"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "extism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-xQtCg1U2wwH2zSWPyIfGLluATi8hYQVWy6lxgD6BDNA="; + hash = "sha256-wHEbTK7bYFOI+I7vQqgku4nkpD87zD7SoU/wpmHqets="; }; modRoot = "./extism"; - vendorHash = "sha256-toDT9zpe/5QOCoPl/DFxdNsQDCkat06T3UHbCY+sW+A="; + vendorHash = "sha256-js8A0AQPpcj1nBNUiSFJ0OlrqDD7AbV/UNHvxBfHG6c="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix index 2149eb50c2..da0151b848 100644 --- a/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.16.26"; + version = "0.16.27"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-eyQpeud0rW07eb6wtcTYem10LWf/g2dxRwQEMH29wL8="; + sha256 = "sha256-CZvIvvkDfpb4YPQIe5i8vZcmhLu7x0zTQGXCL8SxcvM="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/firebase-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/firebase-tools/default.nix index ef1a6e3b25..9c4d321333 100644 --- a/third_party/nixpkgs/pkgs/development/tools/firebase-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.7.2"; + version = "13.7.5"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-KzckVI6eSojnUh+jV1xtKZrwmYfngKk8Ch0cGdTLxMA="; + hash = "sha256-OPpLqXCxEkKOUB0U2gpvGipvRUcF3fM9yopdwkDMqXk="; }; - npmDepsHash = "sha256-X7OScxmDsWnvYTP/GOKZRuq3Bu0ReDDqlIFhEWCeQmY="; + npmDepsHash = "sha256-dmySbwBdOJJ65gj1cBlDIS2o2Tnie6tx8cOyt0FoFyw="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/third_party/nixpkgs/pkgs/development/tools/flock/default.nix b/third_party/nixpkgs/pkgs/development/tools/flock/default.nix index 7b6aadc471..b427a179dc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flock/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform version of flock(1)"; - maintainers = with maintainers; [ matthewbauer msfjarvis ]; + maintainers = with maintainers; [ matthewbauer ]; mainProgram = "flock"; platforms = platforms.all; license = licenses.isc; diff --git a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix index 3dfd54b922..bf83ec753d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.17.11"; + version = "3.17.13"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SCbnLIoHYvbiY2Irx1ufMZTjmUJIucPMgEFobJNor/c="; + sha256 = "sha256-giPlv3pf0hz2zlQ/9o12SGfwFLCtpN96tfQwP9AaPNo="; }; subPackages = [ "." ]; - vendorHash = "sha256-6yKyPocuahr9m5frhbhBlcWd7QZ1rH+f9KhQ83+oadY="; + vendorHash = "sha256-DCSS2kH2yco8cfbQBw3IZHcEE4BP5ir7ikxsIsFDqg0="; meta = with lib; { description = "Thrift improved"; diff --git a/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix b/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix index ac47bdfc20..e5210e7442 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "fsautocomplete"; - version = "0.71.0"; + version = "0.72.3"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - hash = "sha256-WajKmRDCMJ74qT2/NhUWRq+bytxt49vi98bm1QleEKo="; + hash = "sha256-YU2rb1rxlbreSXMO+IGS2BrdfmqntdSlLuxV3zekSaI="; }; nugetDeps = ./deps.nix; @@ -20,8 +20,8 @@ buildDotnetModule rec { --replace TargetFrameworks TargetFramework \ ''; - dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_7_0 ]; - dotnet-runtime = dotnetCorePackages.sdk_7_0; + dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_7_0 sdk_8_0 ]; + dotnet-runtime = dotnetCorePackages.sdk_8_0; projectFile = "src/FsAutoComplete/FsAutoComplete.fsproj"; executables = [ "fsautocomplete" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix b/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix index 1925621460..6dc9faa2b0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix @@ -14,29 +14,15 @@ (fetchNuGet { pname = "DotNet.ReproducibleBuilds"; version = "1.1.1"; sha256 = "0wa0xwbwv1lzjmqwg1vq06vrpb9kkbv3xw5nq50savj0dzhqakzq"; }) (fetchNuGet { pname = "Expecto"; version = "10.1.0"; sha256 = "127yy5i0p2lybhm5xcy2wa6j1rcahk61mb1nbym687b23pgizrq9"; }) (fetchNuGet { pname = "Expecto.Diff"; version = "9.0.4"; sha256 = "06g6nbr5kdr7hyayh24ry6xfghxpcfkqc8kma5qa5lcvhmy56f7j"; }) - (fetchNuGet { pname = "Fake.Core.CommandLineParsing"; version = "6.0.0"; sha256 = "153m18jzji0rar0k1dqj1h90pfny00jyzbmp6vvlc9dcl89xfgvg"; }) - (fetchNuGet { pname = "Fake.Core.Context"; version = "6.0.0"; sha256 = "1pqgc1zq50icw5j375wy9n7749r2rfqakajmdilyaxzczcxs4m2h"; }) - (fetchNuGet { pname = "Fake.Core.Environment"; version = "6.0.0"; sha256 = "1r509s23djb1m62q0hmdgksrx975ksdanhzxzagh3xhmla49icni"; }) - (fetchNuGet { pname = "Fake.Core.FakeVar"; version = "6.0.0"; sha256 = "0rmq31p6p5837q79nff6fmnwrnq4jkfmbq0sp639nzrcw72p9wql"; }) - (fetchNuGet { pname = "Fake.Core.Process"; version = "6.0.0"; sha256 = "15zwgk6b1nk6a515n46x2cjj61hg9h4zq65z98v8amhasdml7vj1"; }) - (fetchNuGet { pname = "Fake.Core.SemVer"; version = "6.0.0"; sha256 = "0j0w1wbg6zv84qn888ygh96saqpsbml7f3r5a9sfryvglxpzm6s3"; }) - (fetchNuGet { pname = "Fake.Core.String"; version = "6.0.0"; sha256 = "05gyzydzvi9dnyzi7yrw9dy8bszikf3y3ayy7sg2zvwcskw65sma"; }) - (fetchNuGet { pname = "Fake.Core.Target"; version = "6.0.0"; sha256 = "0wrf6vfp5yrm2hijdyb4nn9s4ac460m9kmqfnncrbqwdsg4yggpq"; }) - (fetchNuGet { pname = "Fake.Core.Trace"; version = "6.0.0"; sha256 = "0v2m641d8ic04j9i8wrskqa85gpdaxcldg2d4ck4f0fpgb3py205"; }) - (fetchNuGet { pname = "Fake.IO.FileSystem"; version = "6.0.0"; sha256 = "0kjj9ippsbi138kjipl34cx9pajmj71d205y9h5pmj7djilcvq47"; }) - (fetchNuGet { pname = "Fake.Tools.Git"; version = "6.0.0"; sha256 = "18qj5r769r70bygn2si0d5xb921jxfdw6mg4v75i2fj79581bbcz"; }) - (fetchNuGet { pname = "fantomas"; version = "6.2.3"; sha256 = "1x91w4sk402b6ah1y0r0c9rxwbbnjp4x4mr7x4n5zvjhiv97b282"; }) + (fetchNuGet { pname = "fantomas"; version = "6.3.1"; sha256 = "0kkhdwcw0l7pa1hjil2hjpizjbp618ig32wgni5sfaqmxkc9iywq"; }) (fetchNuGet { pname = "Fantomas.Client"; version = "0.9.0"; sha256 = "1zixwk61fyk7y9q6f8266kwxi6byr8fmyp1lf57qhbbvhq2waj9d"; }) - (fetchNuGet { pname = "Fantomas.Core"; version = "6.2.0"; sha256 = "07yl2hr06zk1nl66scm24di3nf1zbrnd6329prwirnv370rz4q92"; }) - (fetchNuGet { pname = "Fantomas.FCS"; version = "6.2.0"; sha256 = "1hhsa7hbxsm2d8ap4sqzwlzjmf4wsgg74i731rprr0nshjvd8ic7"; }) (fetchNuGet { pname = "FParsec"; version = "1.1.1"; sha256 = "01s3zrxl9kfx0264wy0m555pfx0s0z165n4fvpgx63jlqwbd8m04"; }) - (fetchNuGet { pname = "fsharp-analyzers"; version = "0.23.0"; sha256 = "115dqscxx02dss9s1shl6c1x6zc2dgrk9w8bj48cyjnwm79icqq9"; }) + (fetchNuGet { pname = "fsharp-analyzers"; version = "0.25.0"; sha256 = "01i9yhqs7b0p9s1j9m8g3yd8w3a3xp9bp8791zmxp31l5ricjdwy"; }) (fetchNuGet { pname = "FSharp.Analyzers.Build"; version = "0.3.0"; sha256 = "1c9ijc9lvyw4lfnd3m9260c8lwnh6ca91zslr29dpn525z9zgdif"; }) (fetchNuGet { pname = "FSharp.Analyzers.SDK"; version = "0.25.0"; sha256 = "13s2bhizbl2ss9944wk3cka1ri22rs7aqhiiz2i9lyaj9jz863cy"; }) (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.8.200"; sha256 = "1jcp8by02n7vbs11p0gxmb42837l7q841f71ifmrqw7chmg14zik"; }) (fetchNuGet { pname = "FSharp.Control.AsyncSeq"; version = "3.2.1"; sha256 = "02c8d8snd529rrcj6lsmab3wdq2sjh90j8sanx50ck9acfn9jd3v"; }) (fetchNuGet { pname = "FSharp.Control.Reactive"; version = "5.0.5"; sha256 = "0ahvd3s5wfv610ks3b00ya5r71cqm34ap8ywx0pyrzhlsbk1ybqg"; }) - (fetchNuGet { pname = "FSharp.Core"; version = "6.0.5"; sha256 = "07929km96znf6xnqzmxdk3h48kz2rg9msf4c5xxmnjqr0ikfb8c6"; }) (fetchNuGet { pname = "FSharp.Core"; version = "8.0.200"; sha256 = "1v0w8n02wshggymckvy9l343yiznjfmif9nfd35f9a32s5wj4dn2"; }) (fetchNuGet { pname = "FSharp.Data.Adaptive"; version = "1.2.13"; sha256 = "16l1h718h110yl2q83hzy1rpalyqlicdaxln7g0bf8kzq9b2v6rz"; }) (fetchNuGet { pname = "FSharp.Formatting"; version = "14.0.1"; sha256 = "0sx4jlxzmrdcmc937arc9v0r90qkpf2gd1m9ngkpg88qvqcx4xsa"; }) @@ -57,13 +43,13 @@ (fetchNuGet { pname = "Iced"; version = "1.17.0"; sha256 = "1999xavgpy2h83rh4indiq5mx5l509swqdi1raxj3ab6zvk49zpb"; }) (fetchNuGet { pname = "IcedTasks"; version = "0.9.2"; sha256 = "1i4sg398qvxyrprca9jssn4lccwn67zndbg1a3a37cmsms5rlbvj"; }) (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; }) - (fetchNuGet { pname = "Ionide.Analyzers"; version = "0.7.0"; sha256 = "10s4wznblcdazrvghf64y59j1w4bvwar8iznjl0rncbka09ba4q5"; }) + (fetchNuGet { pname = "Ionide.Analyzers"; version = "0.10.0"; sha256 = "1z97m2r6p13yg253zlx89x7fd4zvxmkggilav5h5wf4blsfxvzw1"; }) (fetchNuGet { pname = "Ionide.KeepAChangelog.Tasks"; version = "0.1.8"; sha256 = "066zla2rp1sal6by3h3sg6ibpkk52kbhn30bzk58l6ym7q1kqa6b"; }) - (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.20"; sha256 = "08ym8lljnkqk638f2djw3c0p6h0nzxycifz1dqhzzd2my5ss46zf"; }) - (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.63.0"; sha256 = "1nvnckzr6bnzv5zlw7n8f8hv1a0vl31pv0jw2b0zd72qz1bs1dm4"; }) - (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.63.0"; sha256 = "1viccl54v4ls8mhw4lpmblbyw47sblpzq8fscff06lqngbbqk6pr"; }) - (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.63.0"; sha256 = "1pr95x6hfahcwqgkjnm7zaf43qyw7j9fwbqxvly9wpnz5drnk6yv"; }) - (fetchNuGet { pname = "Ionide.ProjInfo.Sln"; version = "0.63.0"; sha256 = "1wpq3fm52zn7c57pkywadgcfrn072q50nnqvvnr41n6r7qj665gi"; }) + (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.23"; sha256 = "0jfsan2d7aj68xksn1xrdiww1fdz34n7k91r5y4a77jx6h4ngbxq"; }) + (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.64.0"; sha256 = "0sbd392f4fwmq4v652ak39md35vcgxl4q05y5dgrk71kpak6pg2w"; }) + (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.64.0"; sha256 = "0srbqyaivq8i6xl20v5hg7zxkvby06zirmcppv1apwh9p1yvi68k"; }) + (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.64.0"; sha256 = "0rzj97ysw4skavq4amhv5fd0h1dyyqi4rxzxzpd4cd07xc8bnfv6"; }) + (fetchNuGet { pname = "Ionide.ProjInfo.Sln"; version = "0.64.0"; sha256 = "1yd30n5idc5rbqi7lr8gp4hb51l85q3canqinlaxa6raaml0xxsj"; }) (fetchNuGet { pname = "LinkDotNet.StringBuilder"; version = "1.18.0"; sha256 = "0lgh4yjnim9qbqkmkgpx5fi2lha1cgcdbddvbsiw9jzp18fndxly"; }) (fetchNuGet { pname = "McMaster.NETCore.Plugins"; version = "1.4.0"; sha256 = "1k2qz0qnf2b1kfwbzcynivy93jm7dcwl866d0fl7qlgq5vql7niy"; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; sha256 = "0cnaz28lhrdmavnxjkakl9q8p2yv8mricvp1b0wxdfnz8v41gwzs"; }) @@ -106,9 +92,7 @@ (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "7.0.4"; sha256 = "0afmivk3m0hmwsiqnl87frzi7g57aiv5fwnjds0icl66djpb6zsm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.3"; sha256 = "1jcc552rwpaybd2ql0b31063ayj70sd3k6qqpf850xmqbyg2hlmx"; }) (fetchNuGet { pname = "Microsoft.SourceLink.AzureRepos.Git"; version = "1.1.1"; sha256 = "059c8i2vybprn63sw2jr7xma4yyl2syx6hzygfdpr0zd5jlgy9rz"; }) @@ -130,7 +114,7 @@ (fetchNuGet { pname = "OpenTelemetry"; version = "1.3.2"; sha256 = "1v9ipc75ipwjhhz4mkyjygw85i6ba5flcbhyspmf90vfi2nk7b79"; }) (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.3.2"; sha256 = "0fgl99k6nm3n47vv9mx6y36pnljj2b5g641cs2zsw6l86n57qwv1"; }) (fetchNuGet { pname = "OpenTelemetry.Exporter.OpenTelemetryProtocol"; version = "1.3.2"; sha256 = "14p6rn68mqrch3ani17vwyl4ggjz680nxkw1nf65xmf1ljlkb4iq"; }) - (fetchNuGet { pname = "Paket"; version = "8.0.0-alpha002"; sha256 = "1c2kdndyb04plgwvqp78224zwk26dkicjy94pqh7shc9ifskrvsb"; }) + (fetchNuGet { pname = "Paket"; version = "8.0.3"; sha256 = "12xm100rg82p5fvkn63mmjc8i38q8yvk5327snwzqijlfh3k60n0"; }) (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; sha256 = "012aqqi3y3nfikqmn26yajpwd52c04zlzp0p91iyslw7mf26qncy"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix index efe9917a0d..456e5f8ad7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix @@ -2,16 +2,22 @@ buildGoModule rec { pname = "gauge"; - version = "1.6.6"; + version = "1.6.7"; + + patches = [ + # adds a check which adds an error message when trying to + # install plugins imperatively when using the wrapper + ./nix-check.patch + ]; src = fetchFromGitHub { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - hash = "sha256-u64LEDWktnBqGmey1TGdpVerjBsgyyRKJKeAJU3ysZs="; + hash = "sha256-+6b34nCuoBGd9v9eoAgthxYboGWDM8rCU56VXpVKdQc="; }; - vendorHash = "sha256-RC3oS4nD291p8BSiWZUmsej/XuadaR7Xz1+bEfZL3Oc="; + vendorHash = "sha256-VVHsldLfLrdufSBLbgSlniYK1+64651DL8gzw5VHans="; excludedPackages = [ "build" "man" ]; @@ -20,6 +26,6 @@ buildGoModule rec { mainProgram = "gauge"; homepage = "https://gauge.org"; license = licenses.asl20; - maintainers = [ maintainers.vdemeester ]; + maintainers = with maintainers; [ vdemeester marie ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/nix-check.patch b/third_party/nixpkgs/pkgs/development/tools/gauge/nix-check.patch new file mode 100644 index 0000000000..37aec8a51b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/nix-check.patch @@ -0,0 +1,50 @@ +diff --git a/plugin/install/install.go b/plugin/install/install.go +index 60c61550..d7573c2d 100644 +--- a/plugin/install/install.go ++++ b/plugin/install/install.go +@@ -151,6 +151,7 @@ func isOSCompatible(zipfile string) bool { + + // InstallPluginFromZipFile installs plugin from given zip file + func InstallPluginFromZipFile(zipFile string, pluginName string) InstallResult { ++ CheckForNixStore(fmt.Sprintf("Tried to install the plugin `%s`.", pluginName)) + if !isPlatformIndependent(zipFile) && !isOSCompatible(zipFile) { + err := fmt.Errorf("provided plugin is not compatible with OS %s %s", runtime.GOOS, runtime.GOARCH) + return installError(err) +@@ -314,6 +315,7 @@ func runPlatformCommands(commands platformSpecificCommand, workingDir string) er + // UninstallPlugin uninstall the given plugin of the given uninstallVersion + // If uninstallVersion is not specified, it uninstalls all the versions of given plugin + func UninstallPlugin(pluginName string, uninstallVersion string) { ++ CheckForNixStore(fmt.Sprintf("Tried to uninstall the plugin `%s`.", pluginName)) + pluginsHome, err := common.GetPrimaryPluginsInstallDir() + if err != nil { + logger.Fatalf(true, "Failed to uninstall plugin %s. %s", pluginName, err.Error()) +@@ -518,6 +520,7 @@ func AllPlugins(silent, languageOnly bool) { + + // UpdatePlugins updates all the currently installed plugins to its latest version + func UpdatePlugins(silent bool) { ++ CheckForNixStore("Tried to update plugins") + var failedPlugin []string + pluginInfos, err := pluginInfo.GetPluginsInfo() + if err != nil { +@@ -673,3 +676,21 @@ func AddPluginToProject(pluginName string) error { + logger.Infof(true, "Plugin %s was successfully added to the project\n", pluginName) + return nil + } ++ ++func CheckForNixStore(message string) error { ++ installDir, err := common.GetPrimaryPluginsInstallDir() ++ if err != nil { ++ return err ++ } ++ if strings.HasPrefix(installDir, "/nix/store") { ++ ++ // check if we're installing in the sandbox ++ if os.Getenv("NIX_GAUGE_IN_SANDBOX") == "true" { ++ return nil ++ } ++ logger.Errorf(true, "%s\ngauge is installed with nix.\nPlease install plugins using nix or use the `gauge-unwrapped` package.", message) ++ os.Exit(1) ++ ++ } ++ return nil ++} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/default.nix new file mode 100644 index 0000000000..92ee2fca77 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/default.nix @@ -0,0 +1,14 @@ +{ lib, pkgs }: +lib.makeScope pkgs.newScope (final: let + inherit (final) callPackage; +in { + makeGaugePlugin = callPackage ./make-gauge-plugin.nix { }; + dotnet = callPackage ./dotnet { }; + html-report = callPackage ./html-report { }; + java = callPackage ./java { }; + js = callPackage ./js { }; + ruby = callPackage ./ruby { }; + go = callPackage ./go { }; + screenshot = callPackage ./screenshot { }; + xml-report = callPackage ./xml-report { }; +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/dotnet/data.json b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/dotnet/data.json new file mode 100644 index 0000000000..fd2d19ec86 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/dotnet/data.json @@ -0,0 +1,5 @@ +{ + "version": "0.5.7", + "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.5.7/gauge-dotnet-0.5.7.zip", + "hash": "sha256-VKs25WzS0UZAeCg91f/f6ZOGH28PulUvyDSc/dbJeoE=" +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/dotnet/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/dotnet/default.nix new file mode 100644 index 0000000000..7cf99f2e7b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/dotnet/default.nix @@ -0,0 +1,22 @@ +{ lib +, makeGaugePlugin +, gauge-unwrapped +}: + +makeGaugePlugin { + pname = "dotnet"; + data = lib.importJSON ./data.json; + + repo = "getgauge/gauge-dotnet"; + releasePrefix = "gauge-dotnet-"; + isCrossArch = true; + + meta = { + description = "Gauge plugin that lets you write tests in C#"; + homepage = "https://github.com/getgauge/gauge-dotnet/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + inherit (gauge-unwrapped.meta) platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/go/data.json b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/go/data.json new file mode 100644 index 0000000000..b4c9904bbe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/go/data.json @@ -0,0 +1,15 @@ +{ + "version": "0.4.0", + "aarch64-darwin": { + "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.arm64.zip", + "hash": "sha256-tMo3+gQPnldCARm0WB7UYSMwaVpz90N2BiTzmvIFTg0=" + }, + "x86_64-darwin": { + "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.x86_64.zip", + "hash": "sha256-zfrEDRyflvvp4Hf2+42RL+5ooY0iBU0bkO2caOAGp74=" + }, + "x86_64-linux": { + "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-linux.x86_64.zip", + "hash": "sha256-JEHjk51vYCFAcj9xant2vBU3BZI0krYbfZk9ALjdIs0=" + } +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/go/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/go/default.nix new file mode 100644 index 0000000000..c21c517fb7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/go/default.nix @@ -0,0 +1,19 @@ +{ lib +, makeGaugePlugin +}: +makeGaugePlugin { + pname = "go"; + data = lib.importJSON ./data.json; + + repo = "getgauge-contrib/gauge-go"; + releasePrefix = "gauge-go-"; + + meta = { + description = "Gauge plugin that lets you write tests in Go"; + homepage = "https://github.com/getgauge-contrib/gauge-go"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/html-report/data.json b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/html-report/data.json new file mode 100644 index 0000000000..e72be41f92 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/html-report/data.json @@ -0,0 +1,19 @@ +{ + "version": "4.3.1", + "aarch64-darwin": { + "url": "https://github.com/getgauge/html-report/releases/download/v4.3.1/html-report-4.3.1-darwin.arm64.zip", + "hash": "sha256-OovQxwi4NGrdbKYGfMLgqQ9BuT1gvl7NFu5aTrA2HWw=" + }, + "x86_64-darwin": { + "url": "https://github.com/getgauge/html-report/releases/download/v4.3.1/html-report-4.3.1-darwin.x86_64.zip", + "hash": "sha256-oOJE3VJH8Cwbvdc2kTs0dHjNb2r35tXTP18EAts6XYs=" + }, + "aarch64-linux": { + "url": "https://github.com/getgauge/html-report/releases/download/v4.3.1/html-report-4.3.1-linux.arm64.zip", + "hash": "sha256-ZhNPGKuB08V/fxJCOya/uHUNlVT223WEPX6BrOhxPc8=" + }, + "x86_64-linux": { + "url": "https://github.com/getgauge/html-report/releases/download/v4.3.1/html-report-4.3.1-linux.x86_64.zip", + "hash": "sha256-insNiAbJM5Xc/GY6UTgMJgYU6vnBzKC13aBlgq3GBpo=" + } +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/html-report/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/html-report/default.nix new file mode 100644 index 0000000000..33e0eb2722 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/html-report/default.nix @@ -0,0 +1,19 @@ +{ lib +, makeGaugePlugin +}: +makeGaugePlugin { + pname = "html-report"; + data = lib.importJSON ./data.json; + + repo = "getgauge/html-report"; + releasePrefix = "html-report-"; + + meta = { + description = "HTML report generation plugin for Gauge"; + homepage = "https://github.com/getgauge/html-report/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/java/data.json b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/java/data.json new file mode 100644 index 0000000000..96c993e6f3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/java/data.json @@ -0,0 +1,19 @@ +{ + "version": "0.10.3", + "aarch64-darwin": { + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.10.3/gauge-java-0.10.3-darwin.arm64.zip", + "hash": "sha256-Hs9ZNupj0s7YRjRZibphr7m5YjOj3MTgx/hqAbWyY6I=" + }, + "x86_64-darwin": { + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.10.3/gauge-java-0.10.3-darwin.x86_64.zip", + "hash": "sha256-Hj/Lkwsx/RvyMiJO8dI6vFpIvvyhOA2Un5deC1syYY4=" + }, + "aarch64-linux": { + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.10.3/gauge-java-0.10.3-linux.arm64.zip", + "hash": "sha256-XJqP2eew+aI1jFaDzsJhfML8Ft+adFJrHURF8F391Pc=" + }, + "x86_64-linux": { + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.10.3/gauge-java-0.10.3-linux.x86_64.zip", + "hash": "sha256-sMyWhAGo6oa7MsqK8xApdrwhZo8NkSTIRbsCu5LW3ls=" + } +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/java/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/java/default.nix new file mode 100644 index 0000000000..1dafc4a040 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/java/default.nix @@ -0,0 +1,24 @@ +{ lib +, makeGaugePlugin +}: +makeGaugePlugin { + pname = "java"; + data = lib.importJSON ./data.json; + + repo = "getgauge/gauge-java"; + releasePrefix = "gauge-java-"; + + meta = { + description = "Gauge plugin that lets you write tests in Java"; + homepage = "https://github.com/getgauge/gauge-java/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = with lib.sourceTypes; [ + # Native binary written in go + binaryNativeCode + # Jar files + binaryBytecode + ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/js/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/js/default.nix new file mode 100644 index 0000000000..621cbbbc19 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/js/default.nix @@ -0,0 +1,42 @@ +{ lib +, nodejs +, buildNpmPackage +, fetchFromGitHub +, unzip +, gauge-unwrapped +}: +buildNpmPackage rec { + pname = "gauge-plugin-js"; + version = "4.0.1"; + + src = fetchFromGitHub { + owner = "getgauge"; + repo = "gauge-js"; + rev = "v${version}"; + hash = "sha256-qCn4EKndd0eM3X0+aLrCwvmEG5fgUfpVm76cg/n7B84="; + fetchSubmodules = true; + }; + + npmDepsHash = "sha256-5XkFwCFqNMe5xc/Tx69uUV7KMtgY7Z3zE7hbtxYqRf0="; + npmBuildScript = "package"; + + buildInputs = [ nodejs ]; + nativeBuildInputs = [ unzip ]; + + postPatch = '' + patchShebangs index.js + ''; + + installPhase = '' + mkdir -p $out/share/gauge-plugins/js/${version} + unzip deploy/gauge-js-${version}.zip -d $out/share/gauge-plugins/js/${version} + ''; + + meta = { + description = "Gauge plugin that lets you write tests in JavaScript"; + homepage = "https://github.com/getgauge/gauge-js/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marie ]; + inherit (gauge-unwrapped.meta) platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix new file mode 100644 index 0000000000..116effa45b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix @@ -0,0 +1,94 @@ +{ stdenvNoCC +, fetchzip +, lib +, writeScript +}: + +{ pname +, data +, repo +, releasePrefix +, isCrossArch ? false +, meta +, ... +} @ args: +let + otherArgs = lib.attrsets.removeAttrs args [ "pname" "data" "repo" "releasePrefix" "isMultiArch" ]; + inherit (stdenvNoCC.hostPlatform) system; + inherit (if isCrossArch then data else data.${system}) url hash; + # Upstream uses a different naming scheme for platforms + systemMap = { + "x86_64-darwin" = "darwin.x86_64"; + "aarch64-darwin" = "darwin.arm64"; + "aarch64-linux" = "linux.arm64"; + "x86_64-linux" = "linux.x86_64"; + }; +in +stdenvNoCC.mkDerivation (finalAttrs: (lib.recursiveUpdate { + pname = "gauge-plugin-${pname}"; + inherit (data) version; + + src = fetchzip { + inherit url hash; + stripRoot = false; + }; + + installPhase = '' + mkdir -p "$out/share/gauge-plugins/${pname}/${finalAttrs.version}" + cp -r . "$out/share/gauge-plugins/${pname}/${finalAttrs.version}" + ''; + + passthru.updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl nix-prefetch yq-go + + set -e + + dirname="pkgs/development/tools/gauge/plugins/${pname}" + + currentVersion=$(nix eval --raw -f default.nix gaugePlugins.${pname}.version) + + latestTag=$(curl -s ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/${repo}/releases/latest | yq ".tag_name") + latestVersion="$(expr $latestTag : 'v\(.*\)')" + + tempfile=$(mktemp) + + if [[ "$FORCE_UPDATE" != "true" && "$currentVersion" == "$latestVersion" ]]; then + echo "gauge-${pname} is up-to-date: ''${currentVersion}" + exit 0 + fi + + yq -iPoj "{ \"version\": \"$latestVersion\" }" "$tempfile" + + updateSystem() { + system=$1 + url=$2 + + echo "Fetching hash for $system" + hash=$(nix-prefetch-url --type sha256 $url --unpack) + sriHash="$(nix hash to-sri --type sha256 $hash)" + + yq -iPoj '. + { "$system": { "url": "$url", "hash": "$sriHash" } }' "$tempfile" + } + + updateSingle() { + url=$1 + + echo "Fetching hash" + hash=$(nix-prefetch-url --type sha256 $url --unpack) + sriHash="$(nix hash to-sri --type sha256 $hash)" + + yq -iPoj '. + { "url": "$url", "hash": "$sriHash" }' "$tempfile" + } + + baseUrl="https://github.com/${repo}/releases/download/$latestTag/${releasePrefix}$latestVersion" + + ${if isCrossArch then + "updateSingle \${baseUrl}.zip" + else + lib.concatStringsSep "\n" (map (platform: ''updateSystem "${platform}" "''${baseUrl}-${systemMap.${platform}}.zip"'') meta.platforms) + } + + mv "$tempfile" "$dirname/data.json" + ''; +} otherArgs)) diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/ruby/data.json b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/ruby/data.json new file mode 100644 index 0000000000..b7f827cfc5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/ruby/data.json @@ -0,0 +1,19 @@ +{ + "version": "0.8.0", + "aarch64-darwin": { + "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.8.0/gauge-ruby-0.8.0-darwin.arm64.zip", + "hash": "sha256-HQ7reuC7dQUMbhEzUBiEelPmFBsFJBHe42lmFufkZJY=" + }, + "x86_64-darwin": { + "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.8.0/gauge-ruby-0.8.0-darwin.x86_64.zip", + "hash": "sha256-poxT9wYgs21GRx/eVvD7jA1T0VBDEHgH0Zv941pZcKA=" + }, + "aarch64-linux": { + "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.8.0/gauge-ruby-0.8.0-linux.arm64.zip", + "hash": "sha256-SAEHPaWScux6C05jQBfDuLBN2J22Df9eKVM46kWawiU=" + }, + "x86_64-linux": { + "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.8.0/gauge-ruby-0.8.0-linux.x86_64.zip", + "hash": "sha256-aXLDK/7phdsX0CmIuxfK39mdrjGo2IpwYBL7uolP5Mk=" + } +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/ruby/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/ruby/default.nix new file mode 100644 index 0000000000..9a5283b649 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/ruby/default.nix @@ -0,0 +1,19 @@ +{ lib +, makeGaugePlugin +}: +makeGaugePlugin { + pname = "ruby"; + data = lib.importJSON ./data.json; + + repo = "getgauge/gauge-ruby"; + releasePrefix = "gauge-ruby-"; + + meta = { + description = "Gauge plugin that lets you write tests in Ruby"; + homepage = "https://github.com/getgauge/gauge-ruby/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/screenshot/data.json b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/screenshot/data.json new file mode 100644 index 0000000000..c836d5a84a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/screenshot/data.json @@ -0,0 +1,19 @@ +{ + "version": "0.2.0", + "x86_64-darwin": { + "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.2.0/screenshot-0.2.0-darwin.x86_64.zip", + "hash": "sha256-7bFuInEYAQ+fN12HTazQNfqpz5DAkYNCjUJbaj0DYb4=" + }, + "aarch64-darwin": { + "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.2.0/screenshot-0.2.0-darwin.arm64.zip", + "hash": "sha256-Ly6iHBc2PfeFkKkZIkyD2JD5+EpFNL4SDjzG1oMpKfA=" + }, + "aarch64-linux": { + "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.2.0/screenshot-0.2.0-linux.arm64.zip", + "hash": "sha256-Pzfnhs4H0MmeBIhrZElFmvC+PuabLNU/pftVdIu4+LI=" + }, + "x86_64-linux": { + "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.2.0/screenshot-0.2.0-linux.x86_64.zip", + "hash": "sha256-Wpuq3aSgbIhd4WuJx4SMv+NbEZMVIpAOUMdKV2xxd7c=" + } +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/screenshot/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/screenshot/default.nix new file mode 100644 index 0000000000..a394338d7a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/screenshot/default.nix @@ -0,0 +1,19 @@ +{ lib +, makeGaugePlugin +}: +makeGaugePlugin { + pname = "screenshot"; + data = lib.importJSON ./data.json; + + repo = "getgauge/gauge_screenshot"; + releasePrefix = "screenshot-"; + + meta = { + description = "Gauge plugin to take screenshots"; + homepage = "https://github.com/getgauge/gauge_screenshot/"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/xml-report/data.json b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/xml-report/data.json new file mode 100644 index 0000000000..7b1fbf21b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/xml-report/data.json @@ -0,0 +1,19 @@ +{ + "version": "0.5.1", + "x86_64-darwin": { + "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.1/xml-report-0.5.1-darwin.x86_64.zip", + "hash": "sha256-xLz9GFeXeZcLXa5P7DeiBljK3n7HKvsm/eJFEw5w+hU=" + }, + "aarch64-darwin": { + "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.1/xml-report-0.5.1-darwin.arm64.zip", + "hash": "sha256-P8nqS22OibtAOpbn8G8WwfJ0vvAM/3IC6F0Nd/HfO5s=" + }, + "aarch64-linux": { + "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.1/xml-report-0.5.1-linux.arm64.zip", + "hash": "sha256-ORMWXiahT8TAusqIPQSZm5t5r3p5jqLAKNghYw+tOYI=" + }, + "x86_64-linux": { + "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.1/xml-report-0.5.1-linux.x86_64.zip", + "hash": "sha256-y0vpS09GlRKKPr7UwY+YAR8xwjQYnYf6TFkeT3SXwco=" + } +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/xml-report/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/xml-report/default.nix new file mode 100644 index 0000000000..0337ceca06 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/xml-report/default.nix @@ -0,0 +1,19 @@ +{ lib +, makeGaugePlugin +}: +makeGaugePlugin { + pname = "xml-report"; + data = lib.importJSON ./data.json; + + repo = "getgauge/xml-report"; + releasePrefix = "xml-report-"; + + meta = { + description = "XML report generation plugin for Gauge"; + homepage = "https://github.com/getgauge/xml-report/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + platforms = [ "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/wrapper.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/wrapper.nix new file mode 100644 index 0000000000..67b1a8ddc5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/wrapper.nix @@ -0,0 +1,59 @@ +{ gauge-unwrapped +, gauge +, makeWrapper +, stdenvNoCC +, lib +, xorg +, gaugePlugins +, plugins ? [] +}: + +stdenvNoCC.mkDerivation { + pname = "gauge-wrapped"; + inherit (gauge-unwrapped) version; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out{bin,/share/gauge/{plugins,config}} + export NIX_GAUGE_IN_SANDBOX=true + export GAUGE_HOME=$(mktemp -d) + + # run gauge to create config files + cd $(mktemp -d) + gauge init js || true + + mkdir -p "$out/share/gauge/config" + mv "$GAUGE_HOME"/config/{gauge,template}.properties "$out/share/gauge/config" + + export GAUGE_HOME="$out/share/gauge" + + ${lib.concatMapStringsSep "\n" (plugin: '' + for plugin in "$(ls ${plugin}/share/gauge-plugins)"; do + echo Installing gauge plugin $plugin + mkdir -p "$GAUGE_HOME/plugins/$plugin" + # Use lndir here + # gauge checks for a directory, which fails if it's a symlink + # It's easier to link this with lndir, than patching an upstream dependency + lndir "${plugin}/share/gauge-plugins/$plugin" "$GAUGE_HOME/plugins/$plugin" + done + '') plugins} + + makeWrapper ${gauge-unwrapped}/bin/gauge $out/bin/gauge \ + --set GAUGE_HOME "$GAUGE_HOME" + ''; + + nativeBuildInputs = [ gauge-unwrapped makeWrapper xorg.lndir ]; + + passthru = { + withPlugins = f: gauge.override { plugins = f gaugePlugins; }; + fromManifest = path: + let + manifest = lib.importJSON path; + requiredPlugins = with manifest; [ Language ] ++ Plugins; + manifestPlugins = plugins: map (name: plugins.${name} or (throw "Gauge plugin ${name} is not available!")) requiredPlugins; + in gauge.withPlugins manifestPlugins; + }; + + inherit (gauge-unwrapped) meta; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix index 549b0f14c3..1c3355f3ae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.17.1"; + version = "2.17.3"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-fxP4+YqhYPeGVpW6VkSm3+FGnmgbKx77anSYUv41PSE="; + sha256 = "sha256-JIKEuYhzX/gTO2YYI3u1I9YBbXGkdmoQ3kiSfTwu/Qg="; }; - vendorHash = "sha256-XtO7HiaE/xCT3tjVZzzMcO9y8Yk8Wyy1S3S1qioMaQU="; + vendorHash = "sha256-qLyqG7A4TEsZSF8olXWc2BIYZukQx/xHsnbYTfC/w4A="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/third_party/nixpkgs/pkgs/development/tools/git-ps-rs/default.nix b/third_party/nixpkgs/pkgs/development/tools/git-ps-rs/default.nix index 6d4a5be754..b9e4132723 100644 --- a/third_party/nixpkgs/pkgs/development/tools/git-ps-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/git-ps-rs/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "git-ps-rs"; - version = "7.0.0"; + version = "7.1.1"; src = fetchFromGitHub { owner = "uptech"; repo = "git-ps-rs"; rev = version; - hash = "sha256-HPHFjYfug642NXeNmv50UzsdOAlDR9F/MtgYnzwiZP8="; + hash = "sha256-HkiCc/5Xx+1IKMz/vXPXwUp3c8qSjobhQaIJCzq8dqQ="; }; - cargoHash = "sha256-mvRcOwCe5NQ+cJ9brnbZ6HLtLn+fnjYzSBQwA3Qn9PU="; + cargoHash = "sha256-r4cmnLkW8ocTcTECAbCk3S94T09lOUzHLQIGHv97W54="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/glade/default.nix b/third_party/nixpkgs/pkgs/development/tools/glade/default.nix index 97e1cea9c6..84885d9121 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glade/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glade/default.nix @@ -12,7 +12,7 @@ , enableWebkit2gtk ? stdenv.isLinux , webkitgtk_4_1 , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , itstool , libxml2 , docbook-xsl-nons @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pkg-config gettext itstool - wrapGAppsHook + wrapGAppsHook3 docbook-xsl-nons docbook_xml_dtd_42 libxslt @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Glade"; + homepage = "https://gitlab.gnome.org/GNOME/glade"; description = "User interface designer for GTK applications"; maintainers = teams.gnome.members; license = licenses.lgpl2; diff --git a/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix index 3a32bfdadd..fed9323566 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchzip -, wrapGAppsHook +, wrapGAppsHook3 , cairo , dbus , fontconfig @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-GQeYR232zoHLIt1AzznD7rp6u4zMiAdj1+0OfXfT6AQ="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix b/third_party/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix index 51f6eae6f3..1ff42a6f62 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNOME test runner for installed tests"; - homepage = "https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop-testing"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.jtojnar ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix index 7044262373..f459fe371c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.17.0"; + version = "4.17.1"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "sha256-lsqSWhozTdLPwqnwYMLxH3kF62MsUCcjzKJ7qTU79qQ="; + sha256 = "sha256-9PJ3XxEA2PEaPFE3BbZkJB8XdJmm0gZf2Ko5T9DAZBw="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-q8wShIcVHZtpnhvZfsxiI5FLq0xneA8IBMDWd/vpz/0="; + vendorHash = "sha256-03nNN1FkGee01gNOmIASc2B7mMTes1pEDc6Lo08dhcw="; subPackages = [ "cmd/migrate" ]; - tags = [ "cassandra" "clickhouse" "cockroachdb" "crate" "firebird" "mongodb" "multistmt" "mysql" "neo4j" "pgx" "postgres" "ql" "redshift" "rqlite" "shell" "snowflake" "spanner" "sqlite3" "sqlserver" "stub" "testing" "yugabytedb" ]; + tags = [ "cassandra" "clickhouse" "cockroachdb" "crate" "firebird" "mongodb" "multistmt" "mysql" "neo4j" "pgx" "pgx5" "postgres" "ql" "redshift" "rqlite" "shell" "snowflake" "spanner" "sqlite3" "sqlserver" "stub" "testing" "yugabytedb" ]; meta = with lib; { homepage = "https://github.com/golang-migrate/migrate"; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix index 279004b9c8..8a02ab2c82 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "go-minimock"; - version = "3.3.6"; + version = "3.3.8"; src = fetchFromGitHub { owner = "gojuno"; repo = "minimock"; rev = "v${version}"; - sha256 = "sha256-ru3+MJ1GbzVDi6niiz7SpL0qa9mE89uhcH5/PHbVugE="; + sha256 = "sha256-FPp2CunPCVxuz+MUKyy1HQdWc9TeLG7ri5vI7ig/xeM="; }; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - vendorHash = "sha256-eCM/EDdXZSa+pg35V6YiZ5gaC4rj8Wt8HhCgaMPoP+Y="; + vendorHash = "sha256-O1Bp+zuSq3/UULpej4rXxeHcDiNAhECqj9Yh9aGeA0E="; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix index 770f4b5db1..3b86b15aa4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.42.2"; + version = "2.43.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-y0HMoQvv001smvWlK1qN0bYeHgNDLz1uKQCaRmDnoM4="; + sha256 = "sha256-R3J6TZO28x0I6vHjm5X7nMiJBhHuMIYdfp7IUNtu4Do="; }; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix index 5a536db51c..9319bd4997 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-swagger"; - version = "0.30.5"; + version = "0.31.0"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-38Ytv/mQVi0xTydFTPNizJIjYPL+lOws6jHsRjxSC4o="; + hash = "sha256-PeH9bkRObsw4+ttuWhaPfPQQTOAw8pwlgTEtPoUBiIQ="; }; - vendorHash = "sha256-TqoTzxPGF0BBUfLtYWkljRcmr08m4zo5iroWMklxL7U="; + vendorHash = "sha256-PBzJMXPZ2gVdrW3ZeerhR1BeT9vWIIS1vCTjz3UFHes="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix index 510acbbdf0..843241f18a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.36.0"; + version = "3.37.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "refs/tags/v${version}"; - hash = "sha256-09dw6bDEKbgajH+/estVYDkbUdUiUUuqXYQqeOBTeQ0="; + hash = "sha256-h3/quMJ4vdTaR+pY7NRpbNp0o3Wp+3K7kFNACp5Q1Ls="; }; - vendorHash = "sha256-ahBpIPTHByZ5Qnl6PaOeTLNBq2hQ78+dUmaHvkJxkWg="; + vendorHash = "sha256-iugFWBIKt/Rm5ccQnIFR75P1AVZbbFhWN97dvr8DoBs="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix index 22e6f3a015..e2c9cded74 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix @@ -1,14 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +let + version = "2.2.2"; +in +buildGoModule { pname = "go-toml"; - version = "2.2.1"; + inherit version; src = fetchFromGitHub { owner = "pelletier"; - repo = pname; + repo = "go-toml"; rev = "v${version}"; - sha256 = "sha256-DAtp9ovl6cny0rom80aK+bGe9U/p6zmTQo1Z3MscCjg="; + sha256 = "sha256-Z17977v2qMdf/e6iHEuRyCuC//HeFF8tkLt2P8Z/NT4="; }; vendorHash = "sha256-4t/ft3XTfc7yrsFVMSfjdCur8QULho3NI2ym6gqjexI="; @@ -19,13 +25,21 @@ buildGoModule rec { "cmd/tomltestgen" ]; - ldflags = [ "-s" "-w" ]; + # allowGoReference adds the flag `-trimpath` which is also denoted by, go-toml's goreleaser config + # + allowGoReference = true; - meta = with lib; { + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + meta = { description = "Go library for the TOML language"; homepage = "https://github.com/pelletier/go-toml"; changelog = "https://github.com/pelletier/go-toml/releases/tag/v${version}"; - maintainers = [ maintainers.marsam ]; - license = licenses.mit; + maintainers = [ lib.maintainers.isabelroses ]; + license = lib.licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/goconvey/default.nix b/third_party/nixpkgs/pkgs/development/tools/goconvey/default.nix index 0ec9afb610..6717ff777b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/goconvey/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/goconvey/default.nix @@ -17,9 +17,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - preCheck = '' - buildFlagsArray+="-short" - ''; + checkFlags = [ + "-short" + ]; meta = { description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go"; diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix b/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix index 29cc7543e3..b0db2e0b4f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix @@ -22,6 +22,7 @@ , speechd , fontconfig , udev +, withDebug ? false , withPlatform ? "linuxbsd" , withTarget ? "editor" , withPrecision ? "single" @@ -43,14 +44,14 @@ let in stdenv.mkDerivation rec { pname = "godot4"; - version = "4.2.1-stable"; - commitHash = "b09f793f564a6c95dc76acc654b390e68441bd01"; + version = "4.2.2-stable"; + commitHash = "15073afe3856abd2aa1622492fe50026c7d63dc1"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = commitHash; - hash = "sha256-Q6Og1H4H2ygOryMPyjm6kzUB6Su6T9mJIp0alNAxvjQ="; + hash = "sha256-anJgPEeHIW2qIALMfPduBVgbYYyz1PWCmPsZZxS9oHI="; }; nativeBuildInputs = [ @@ -115,6 +116,7 @@ stdenv.mkDerivation rec { platform = withPlatform; target = withTarget; precision = withPrecision; # Floating-point precision level + debug_symbols = withDebug; # Options from 'platform/linuxbsd/detect.py' pulseaudio = withPulseaudio; # Use PulseAudio @@ -125,6 +127,8 @@ stdenv.mkDerivation rec { touch = withTouch; # Enable touch events }; + dontStrip = withDebug; + outputs = [ "out" "man" ]; installPhase = '' @@ -142,12 +146,12 @@ stdenv.mkDerivation rec { cp icon.png "$out/share/icons/godot.png" ''; - meta = with lib; { + meta = { homepage = "https://godotengine.org"; description = "Free and Open Source 2D and 3D game engine"; - license = licenses.mit; + license = lib.licenses.mit; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ shiryel ]; + maintainers = with lib.maintainers; [ shiryel superherointj ]; mainProgram = "godot4"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index e7deb95370..342a2c19e4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.57.2"; + version = "1.58.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-d3U56fRIyntj/uKTOHuKFvOZqh+6VtzYrbKDjcKzhbI="; + hash = "sha256-RnrD1KA0XNdFx5bs2vfCoBEuBjtesyyTXAvIWMeRPVQ="; }; - vendorHash = "sha256-3gS/F1jcjegtkLfmPcBzYqDA4KmwABkKpPAhTxqguYw="; + vendorHash = "sha256-Q3y4yam9gRFopZbAlLzWSFj59j+WwWeflJMdYmmJh7U="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/goperf/default.nix b/third_party/nixpkgs/pkgs/development/tools/goperf/default.nix index ed1a6c1a23..ffb644aaea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/goperf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/goperf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "goperf"; - version = "unstable-2023-11-08"; + version = "0-unstable-2023-11-08"; src = fetchgit { url = "https://go.googlesource.com/perf"; @@ -22,8 +22,8 @@ buildGoModule rec { export UPDATE_NIX_ATTR_PATH=goperf ${lib.escapeShellArgs (unstableGitUpdater { inherit (src) url; })} set -x - oldhash="$(nix-instantiate . --eval --strict -A "goperf.go-modules.drvAttrs.outputHash" | cut -d'"' -f2)" - newhash="$(nix-build -A goperf.go-modules --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" + oldhash="$(nix-instantiate . --eval --strict -A "goperf.goModules.drvAttrs.outputHash" | cut -d'"' -f2)" + newhash="$(nix-build -A goperf.goModules --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" fname="$(nix-instantiate --eval -E 'with import ./. {}; (builtins.unsafeGetAttrPos "version" goperf).file' | cut -d'"' -f2)" ${lib.getExe sd} --string-mode "$oldhash" "$newhash" "$fname" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/goresym/default.nix b/third_party/nixpkgs/pkgs/development/tools/goresym/default.nix index e6a964fa66..d20a9a6c80 100644 --- a/third_party/nixpkgs/pkgs/development/tools/goresym/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/goresym/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "goresym"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "mandiant"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U3AjEKQKPS5ghrmEJTsGRIC2BoPYAWL6RDPhA+eN2hg="; + sha256 = "sha256-qFDacInIiV1thuYMjyzTG7ru5bkd2Af1iao7Oes1mRg="; }; subPackages = [ "." ]; @@ -35,6 +35,6 @@ buildGoModule rec { homepage = "https://github.com/mandiant/GoReSym"; changelog = "https://github.com/mandiant/GoReSym/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ thehedgeh0g ]; + maintainers = with maintainers; [ pyrox0 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix index b5baad2037..5ab4caa621 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -1,16 +1,19 @@ -{ lib -, fetchFromGitHub -, buildGoModule +{ + lib, + fetchFromGitHub, + buildGoModule, }: - -buildGoModule rec { +let + version = "1.11.0"; +in +buildGoModule { pname = "gotestsum"; - version = "1.10.1"; + inherit version; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; - rev = "refs/tags/v${version}"; + rev = "v${version}"; hash = "sha256-Sq0ejnX7AJoPf3deBge8PMOq1NlMbw+Ljn145C5MQ+s="; }; @@ -26,13 +29,13 @@ buildGoModule rec { subPackages = [ "." ]; - meta = with lib; { + meta = { homepage = "https://github.com/gotestyourself/gotestsum"; changelog = "https://github.com/gotestyourself/gotestsum/releases/tag/v${version}"; description = "A human friendly `go test` runner"; mainProgram = "gotestsum"; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.asl20; - maintainers = with maintainers; [ endocrimes ]; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ isabelroses ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/gotools/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotools/default.nix index 0a31db2779..d0affbabdb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotools/default.nix @@ -38,6 +38,6 @@ buildGoModule rec { ''; homepage = "https://go.googlesource.com/tools"; license = licenses.bsd3; - maintainers = with maintainers; [ danderson SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix b/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix index 6b3b8b940e..61a67acb99 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-RniriePoHo608PlT3XrxogWI2oXq0Q48+Jaxz/2xIVo="; + sha256 = "sha256-hGX9DiGpJOOjQEaT9qnpeS1ODfo4pd03WlvT3aaSK2w="; }; excludedPackages = [ "example" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix b/third_party/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix index c4ac76f461..3a6c2619d6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gtk-mac-bundler/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "a helper script that creates application bundles form GTK executables for macOS"; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.darwin; - homepage = "https://wiki.gnome.org/Projects/GTK/OSX/Bundling"; + homepage = "https://gitlab.gnome.org/GNOME/gtk-mac-bundler"; license = licenses.gpl2; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch index 72010f85cd..103871bb65 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch @@ -1,7 +1,7 @@ diff --git a/hadrian/src/Settings/Builders/Haddock.hs b/hadrian/src/Settings/Builders/Haddock.hs index 902b2f85e2..429a441c3b 100644 ---- a/src/Settings/Builders/Haddock.hs -+++ b/src/Settings/Builders/Haddock.hs +--- a/hadrian/src/Settings/Builders/Haddock.hs ++++ b/hadrian/src/Settings/Builders/Haddock.hs @@ -57,7 +57,6 @@ haddockBuilderArgs = mconcat , arg $ "--odir=" ++ takeDirectory output , arg $ "--dump-interface=" ++ output diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch index d813fef31c..eccf1a987d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch @@ -1,7 +1,7 @@ diff --git a/hadrian.cabal b/hadrian.cabal index 70fded11aa..3893537f05 100644 ---- a/hadrian.cabal -+++ b/hadrian.cabal +--- a/hadrian/hadrian.cabal ++++ b/hadrian/hadrian.cabal @@ -150,7 +150,7 @@ executable hadrian , TypeOperators other-extensions: MultiParamTypeClasses diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian.nix index 7a44e2eeff..d1368427f0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian.nix @@ -11,7 +11,6 @@ , ghcVersion # Customization , userSettings ? null -, enableHyperlinkedSource }: mkDerivation { @@ -21,13 +20,6 @@ mkDerivation { postUnpack = '' sourceRoot="$sourceRoot/hadrian" ''; - patches = lib.optionals (!enableHyperlinkedSource) [ - ./disable-hyperlinked-source.patch - ] ++ lib.optionals (lib.elem ghcVersion [ "9.8.1" "9.8.2" ]) [ - # Incorrect bounds on Cabal - # https://gitlab.haskell.org/ghc/ghc/-/issues/24100 - ./hadrian-9.8.1-allow-Cabal-3.10.patch - ]; # Overwrite UserSettings.hs with a provided custom one postPatch = lib.optionalString (userSettings != null) '' install -m644 "${writeText "UserSettings.hs" userSettings}" src/UserSettings.hs diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/make-hadrian.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/make-hadrian.nix index 6aa30cb9e6..fb9ee89f7c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/make-hadrian.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/make-hadrian.nix @@ -32,10 +32,6 @@ # Contents of a non-default UserSettings.hs to use when building hadrian, if any. # Should be a string or null. , userSettings ? null - # Whether to pass --hyperlinked-source to haddock or not. This is a custom - # workaround as we wait for this to be configurable via userSettings or similar. - # https://gitlab.haskell.org/ghc/ghc/-/issues/23625 -, enableHyperlinkedSource ? false }: let @@ -50,7 +46,7 @@ let in callPackage' ./hadrian.nix ({ - inherit userSettings enableHyperlinkedSource; + inherit userSettings; } // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.9") { # Starting with GHC 9.9 development, additional in tree packages are required # to build hadrian. (Hackage-released conditional dependencies are handled diff --git a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix index d5919034ca..f59340ae2e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.43.0"; + version = "1.43.1"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-czuMlnVhUDWGVbIZ0V7vaoOnT84WKPFjhcUvt5BzBXo="; + hash = "sha256-XPDaywSCvXc9jo8bNxaF9Pj6Vs+Hz0MxDPbbnRNW3VI="; }; - vendorHash = "sha256-0XFgi2cPlsL4zCbttGrEsm0j5ftB8MAuphu3YNlPbIs="; + vendorHash = "sha256-pN+HMsZ2FpxwF/yPfYGwJNj9i4fgnE3cKo3mti3KoR0="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix b/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix index 3f14b46921..43be538a61 100644 --- a/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "heroku"; - version = "8.11.2"; + version = "8.11.5"; src = fetchzip { - url = "https://cli-assets.heroku.com/versions/8.11.2/6a1a730/heroku-v8.11.2-6a1a730-linux-x64.tar.xz"; - hash = "sha256-dQNe4zhCp0ouSjKwfccXcODO1ZShFntewmp/jD8l1Fs="; + url = "https://cli-assets.heroku.com/versions/8.11.5/df5cd30/heroku-v8.11.5-df5cd30-linux-x64.tar.xz"; + hash = "sha256-in6VuJmoItXGL85XqN1oItGPkUmDb4n+LzxE5q4ycYc="; }; nativeBuildInputs = [ makeWrapper ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation { homepage = "https://devcenter.heroku.com/articles/heroku-cli"; description = "Everything you need to get started using Heroku"; mainProgram = "heroku"; - maintainers = with lib.maintainers; [ aflatter mirdhyn marsam ]; + maintainers = with lib.maintainers; [ aflatter mirdhyn ]; license = lib.licenses.mit; platforms = with lib.platforms; unix; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix b/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix index 849144616f..e7408f87ef 100644 --- a/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix @@ -15,7 +15,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # the version of infisical - version = "0.21.1"; + version = "0.22.2"; # the platform-specific, statically linked binary src = @@ -76,7 +76,7 @@ stdenv.mkDerivation { changelog = "https://github.com/infisical/infisical/releases/tag/infisical-cli%2Fv${version}"; license = licenses.mit; mainProgram = "infisical"; - maintainers = [ maintainers.ivanmoreau maintainers.jgoux ]; + maintainers = teams.infisical.members; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/third_party/nixpkgs/pkgs/development/tools/infisical/hashes.json b/third_party/nixpkgs/pkgs/development/tools/infisical/hashes.json index 728568f1ee..a044c5f196 100644 --- a/third_party/nixpkgs/pkgs/development/tools/infisical/hashes.json +++ b/third_party/nixpkgs/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" -, "x86_64-linux": "sha256-HdjqoT+iDYwQQlNZIPcC4j76bCh1k1+Axz46Hq2FNoE=" -, "x86_64-darwin": "sha256-X3QXlW0yqYuc3MLYesxNiWGz79r/fHO0mdwyZ3DyPKU=" -, "aarch64-linux": "sha256-osy/9dhSme4dyVeBWGjwfMt0YJVPLwV7rYu6ePkhFOs=" -, "aarch64-darwin": "sha256-O/F2xErHSFfeK6mamjFDstHW1yBpnfl/slWa1hQ159s=" +, "x86_64-linux": "sha256-oRRkv0x43qhRzsTwcP9855kAOigfn13WPAGj7Izcm3Y=" +, "x86_64-darwin": "sha256-G7vokhMq4w781MkxeYTolc2ATFOwGLJeZ4XIS0E1h5s=" +, "aarch64-linux": "sha256-JXzTAfSNFPlxM3/vm+mMd8poT80b6XpZXXLShsGHGnY=" +, "aarch64-darwin": "sha256-bMw39FsL4tjAF/O/Y7Xg2pxVOW64qXLPbDjau8gonY0=" } diff --git a/third_party/nixpkgs/pkgs/development/tools/java/jprofiler/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/jprofiler/default.nix index 3a74e491f0..7f74d8665a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/jprofiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/jprofiler/default.nix @@ -36,7 +36,7 @@ let srcIcon = fetchurl { url = "https://www.ej-technologies.com/assets/content/header-product-jprofiler@2x-24bc4d84bd2a4eb641a5c8531758ff7c.png"; - hash = "sha256-XUmuqhnNv7mZ3Gb4A0HLSlfiJd5xbCExVsw3hmXHeVE="; + hash = "sha256-4T0j2ctHmgWOSCmFG2PZCLJS57nIa5MxmJBpMYzy9FI="; }; desktopItems = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix index 3f4eb952c3..95c0ff65e5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.1.7"; + version = "7.1.8"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-Yl3eWwk5Nc52I3bUjdT6QdwC65cKY0EVKNaDfJenwx0="; + hash = "sha256-TjpbFX7k4coZH8IY4bygLwj8Z4JLQQ9yUqOmmr7NU9s="; }; - cargoHash = "sha256-u0DqjHJv1GyoCIovCUR+gjkb9h48CbJd6saxeQFaL2A="; + cargoHash = "sha256-7mzmaXeYZGtUjefC7Zo8wOArBuus7mfu6AaKE4tS5HE="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/third_party/nixpkgs/pkgs/development/tools/jqp/default.nix b/third_party/nixpkgs/pkgs/development/tools/jqp/default.nix index 9c604d5cab..ab99341c1a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jqp/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jqp"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "noahgorstein"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z2EKtSM+/wWGgwsHKDcxtc/M6UZ01AiTZaaCYCWjU7M="; + sha256 = "sha256-zcv6fYrqPp/IMg4ivqJtlJwOs2M5E8niWoIOXYiEZuA="; }; - vendorHash = "sha256-7UiQjTgcwGOTEJEaWywEdZvpkM/MoXU3d6k8oVmUiW8="; + vendorHash = "sha256-c+TZGLaUomlykIU4aN7awUp4kpIEoGOkkbvIC6ok7h4="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/jtc/default.nix b/third_party/nixpkgs/pkgs/development/tools/jtc/default.nix index 399b9a0f70..f368a46046 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jtc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jtc/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { mainProgram = "jtc"; homepage = "https://github.com/ldn-softdev/jtc"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix index 3d1dfbd2d0..246cccbf3b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.50.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-lR16M8TAP0ilvcrA9YjVoZMrsi+kwEFKx5Fd3birHHM="; + hash = "sha256-NlSb0UNe61AG/BQyUFqZEug3VnGTi0W0o0CblvV+oDg="; }; subPackages = [ "./" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kind/default.nix b/third_party/nixpkgs/pkgs/development/tools/kind/default.nix index 6896e953ab..0d87b23022 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kind/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kind"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - hash = "sha256-DJTsyGEQA36MSmW5eWYTV1Tk6JOBIVJrEARA/x70S0U="; + hash = "sha256-S+kk3g/A1bio1v7zoXmvaTAYd0LBq5uip/9DvhkzZnM="; }; patches = [ @@ -16,7 +16,7 @@ buildGoModule rec { ./kernel-module-path.patch ]; - vendorHash = "sha256-J/sJd2LLMBr53Z3sGrWgnWA8Ry+XqqfCEObqFyUD96g="; + vendorHash = "sha256-YB2/MudoIVtTHU6FtvZOEhhxg5ss6OvENXOykPlQ12Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kubeswitch/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubeswitch/default.nix index 64701124a1..470fdac9b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubeswitch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubeswitch/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kubeswitch"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "danielfoehrKn"; repo = "kubeswitch"; rev = version; - hash = "sha256-0SY7JLFkhLEFcE1veqac9I9DZstXfxtnmSYIdDiVieg="; + hash = "sha256-cvMTuiXSpx+ZicN1P3JjGExzW7d51nN1YIpsGArXHzw="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix index ad1ea3f61a..849c8054b0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "5.3.0"; + version = "5.4.1"; ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ @@ -15,13 +15,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - hash = "sha256-TleO28Q6JaOz1OAJKbvLhN99a841FEhHL15NTMhS1Oc="; + hash = "sha256-zt+/CKIIaZxfjfMu9L4/bDc5MmaqeEp3MI/m++GQoEc="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-inCBDIVdvkEdDJEwX7vdoWANk+f01VxhBGPKxrjR6Ao="; + vendorHash = "sha256-YxkZ2YlkvMihTYi34lfwpUrmGa4LrrWsP2cpJZY/41A="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/csharp-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/csharp-ls/default.nix index ffe6d0cf15..eb8c6cd2bb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/csharp-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/csharp-ls/default.nix @@ -8,9 +8,9 @@ in buildDotnetGlobalTool rec { pname = "csharp-ls"; - version = "0.11.0"; + version = "0.13.0"; - nugetSha256 = "sha256-zB8uJqlf8kL8jh3WNsPQF7EJpONqi23co3O/iBzfEoU="; + nugetSha256 = "sha256-hhgMwDk3mT7E07REqZduTuEnS7D1tCgdxqN+MLNo9EI="; dotnet-sdk = sdk_8_0; dotnet-runtime = sdk_8_0; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/dot-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/dot-language-server/default.nix index 8d25faa611..cdadfd77a2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/dot-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/dot-language-server/default.nix @@ -20,6 +20,6 @@ buildNpmPackage rec { mainProgram = "dot-language-server"; homepage = "https://github.com/nikeee/dot-language-server"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/fortls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/fortls/default.nix index 1fc614150b..ccb70db072 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/fortls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/fortls/default.nix @@ -8,13 +8,13 @@ buildPythonApplication rec { pname = "fortls"; - version = "2.13.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "fortran-lang"; repo = pname; - rev = "v${version}"; - hash = "sha256-kFk2Dlnb0FXM3Ysvsy+g2AAMgpWmwzxuyJPovDm/FJU="; + rev = "refs/tags/v${version}"; + hash = "sha256-kRL4kLX1T2Sontl8f3VO8Hb7uI41JwhZBiH//gdcmNE="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/helm-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/helm-ls/default.nix index 337e45153f..587a209562 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-RRpPmpwEHrORVVXn3mVgGcOAI7nmyrl+gwIuGXAZglY="; + hash = "sha256-y4FYcago8tVK4ru6tLizEgOLsMuryFmJUa2D8fXulDg="; }; - vendorHash = "sha256-pV1FYhBLP0goetSr9v9iqXbeFTUHLdiIQ3ixqOsmp+Q="; + vendorHash = "sha256-ZeJeLpuac8ecKCOv2gXpT/P4GBFstB6lUaKOhQKFRAE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix index 7491968b1b..b69036f2f1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.7.4"; + version = "3.9.0"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = finalAttrs.version; - hash = "sha256-wJOOzKM2pgxfRqx5WZjOcCyRapz0Sub3AYm51LRYpFU="; + hash = "sha256-RINpfVg7TTRjAVFBOXXA7e/BnAvXNe32H0fchS3LMo0="; fetchSubmodules = true; }; @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A language server that offers Lua language support"; homepage = "https://github.com/luals/lua-language-server"; - changelog = "https://github.com/LuaLS/lua-language-server/blob/${version}/changelog.md"; + changelog = "https://github.com/LuaLS/lua-language-server/blob/${finalAttrs.version}/changelog.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda gepbird sei40kr ]; mainProgram = "lua-language-server"; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix index 894b83a72f..5f9d87d839 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.2.2"; + version = "1.3.0"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-xk2ionn/lBV8AR7n7OR03UuRCoP1/K6KuohhpRwFock="; + outputHash = "sha256-otN4sqV2a0itLOoJ7x+VSMe0tl3y4WVovbA1HOpZVDw="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; description = "Language server for Scala"; mainProgram = "metals"; - maintainers = with maintainers; [ fabianhjr tomahna ]; + maintainers = with maintainers; [ fabianhjr jpaju tomahna ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix index e51ab8498c..7de1523491 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/azdavis/millet"; changelog = "https://github.com/azdavis/millet/blob/v${version}/docs/CHANGELOG.md"; license = [ licenses.mit /* or */ licenses.asl20 ]; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; mainProgram = "millet-ls"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix index b2052d66a3..de395b61fb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.6.22"; + version = "0.6.24"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-qc0cWEnMH5S4fr9dMQHSWQ2NsCpfWxGvhkYJF7pgnKI="; + hash = "sha256-Zpaw0LCdluU76epHrRDQJw1cVptjR5IH8Ufy8yLVECo="; }; - cargoHash = "sha256-oPyMHrJTZYavE/M7PrTVv387KShLTg+Kwxg5sRYEkN4="; + cargoHash = "sha256-Z3MdJdgR1oVPwTcq8rihHUXGkP38Ve/C+48NooeAWlo="; meta = with lib; { description = "A cmake lsp based on tower-lsp and treesitter"; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix index 19822d2977..88d4a6fd36 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-lyKPmzuZB9rCBI9JxhxlyDtNHLia8FXGnSgV+D/dwgo="; nativeBuildInputs = [ - (lib.getBin nixVersions.unstable) + (lib.getBin nixVersions.latest) ]; env.CFG_RELEASE = version; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/nixd/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/nixd/default.nix index 601a568554..86325a6815 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/nixd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/nixd/default.nix @@ -15,17 +15,18 @@ , nix , nixpkgs-fmt , pkg-config +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nixd"; - version = "1.2.3"; + version = "2.1.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; - rev = version; - hash = "sha256-i/z5VnsWPWloQfdk48i+a4XaGnTMPJ6QougChkT9IWw="; + rev = finalAttrs.version; + hash = "sha256-A6hoZ4fbWxd7Mx+r3e1HEw2IPaAn4WcMEIocy/ZCz28="; }; mesonBuildType = "release"; @@ -74,19 +75,29 @@ stdenv.mkDerivation rec { # Disable nixd regression tests, because it uses some features provided by # nix, and does not correctly work in the sandbox - meson test --print-errorlogs server regression/nix-ast-dump + meson test --print-errorlogs unit/libnixf/Basic unit/libnixf/Parse unit/libnixt runHook postCheck ''; passthru.updateScript = nix-update-script { }; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "libnixf" "libnixt" ]; + }; + }; + meta = { description = "Nix language server"; homepage = "https://github.com/nix-community/nixd"; - changelog = "https://github.com/nix-community/nixd/releases/tag/${version}"; + changelog = "https://github.com/nix-community/nixd/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ inclyc Ruixi-rebirth marsam ]; + maintainers = with lib.maintainers; [ inclyc Ruixi-rebirth ]; mainProgram = "nixd"; platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/Cargo.lock new file mode 100644 index 0000000000..6127a15eea --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/Cargo.lock @@ -0,0 +1,1021 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "anyhow" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "backtrace-on-stack-overflow" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fd2d70527f3737a1ad17355e260706c1badebabd1fa06a7a053407380df841b" +dependencies = [ + "backtrace", + "libc", + "nix", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cc" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "els" +version = "0.1.48-nightly.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1160cfdc48996a3f0f1e8e5b2d060e48ab7245e3931eef154fe0afc4de6d55e" +dependencies = [ + "erg_common", + "erg_compiler", + "lsp-types", + "molc", + "serde", + "serde_json", +] + +[[package]] +name = "erg_common" +version = "0.6.36-nightly.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f19dd94255e83e016cd6d7cd18e99e9c927e2144cf9d17e759271c40c6cf1dcd" +dependencies = [ + "backtrace-on-stack-overflow", + "erg_proc_macros", + "parking_lot", + "thread_local", +] + +[[package]] +name = "erg_compiler" +version = "0.6.36-nightly.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4712faf4c949016d752e7d697dab1df44043eaf94bea5a2ada73b1ab70dfe0" +dependencies = [ + "erg_common", + "erg_parser", +] + +[[package]] +name = "erg_parser" +version = "0.6.36-nightly.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791e826192978d665e46aa30aa7330ef470b90e6e5ebe38c2b32a2a4141bc919" +dependencies = [ + "erg_common", + "erg_proc_macros", + "unicode-xid", +] + +[[package]] +name = "erg_proc_macros" +version = "0.6.36-nightly.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119857fa1bb184c6b2adba2e3b2a71797f6c7865bc6d4fdddac988fda9e55b77" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "is-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "lalrpop-util" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "lsp-types" +version = "0.93.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51" +dependencies = [ + "bitflags", + "serde", + "serde_json", + "serde_repr", + "url", +] + +[[package]] +name = "malachite" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53ff327de42075f680ba15c5cb3c417687eb7241ce2063a91d0186ce5c5e77ee" +dependencies = [ + "malachite-base", + "malachite-nz", + "malachite-q", +] + +[[package]] +name = "malachite-base" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e960ee0e7e1b8eec9229f5b20d6b191762574225144ea638eb961d065c97b55d" +dependencies = [ + "hashbrown", + "itertools", + "libm", + "ryu", +] + +[[package]] +name = "malachite-bigint" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17703a19c80bbdd0b7919f0f104f3b0597f7de4fc4e90a477c15366a5ba03faa" +dependencies = [ + "derive_more", + "malachite", + "num-integer", + "num-traits", + "paste", +] + +[[package]] +name = "malachite-nz" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770aaf1a4d59a82ed3d8644eb66aff7492a6dd7476def275a922d04d77ca8e57" +dependencies = [ + "itertools", + "libm", + "malachite-base", +] + +[[package]] +name = "malachite-q" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33a9dfca114f6b582595990ccfc287cace633aa95f890ade5b1fc099b7175d3b" +dependencies = [ + "itertools", + "malachite-base", + "malachite-nz", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "molc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4584f5f0dfee2be636c6413e44e0b73e23ea299d212fa7124d4c87696533c8a8" +dependencies = [ + "lsp-types", + "serde", + "serde_json", +] + +[[package]] +name = "nix" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +dependencies = [ + "bitflags", + "cc", + "cfg-if", + "libc", + "memoffset", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "py2erg" +version = "0.0.54" +dependencies = [ + "erg_common", + "erg_compiler", + "rustpython-ast", + "rustpython-parser", +] + +[[package]] +name = "pylyzer" +version = "0.0.54" +dependencies = [ + "els", + "erg_common", + "erg_compiler", + "py2erg", + "rustpython-ast", + "rustpython-parser", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustpython-ast" +version = "0.3.1" +source = "git+https://github.com/RustPython/Parser#9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" +dependencies = [ + "is-macro", + "malachite-bigint", + "rustpython-parser-core", + "static_assertions", +] + +[[package]] +name = "rustpython-parser" +version = "0.3.1" +source = "git+https://github.com/RustPython/Parser#9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" +dependencies = [ + "anyhow", + "is-macro", + "itertools", + "lalrpop-util", + "log", + "malachite-bigint", + "num-traits", + "phf", + "phf_codegen", + "rustc-hash", + "rustpython-ast", + "rustpython-parser-core", + "tiny-keccak", + "unic-emoji-char", + "unic-ucd-ident", + "unicode_names2", +] + +[[package]] +name = "rustpython-parser-core" +version = "0.3.1" +source = "git+https://github.com/RustPython/Parser#9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" +dependencies = [ + "is-macro", + "memchr", + "rustpython-parser-vendored", +] + +[[package]] +name = "rustpython-parser-vendored" +version = "0.3.1" +source = "git+https://github.com/RustPython/Parser#9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" +dependencies = [ + "memchr", + "once_cell", +] + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "serde_json" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-emoji-char" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b07221e68897210270a38bde4babb655869637af0f69407f96053a34f76494d" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-ident" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unicode_names2" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addeebf294df7922a1164f729fb27ebbbcea99cc32b3bf08afab62757f707677" +dependencies = [ + "phf", + "unicode_names2_generator", +] + +[[package]] +name = "unicode_names2_generator" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f444b8bba042fe3c1251ffaca35c603f2dc2ccc08d595c65a8c4f76f3e8426c0" +dependencies = [ + "getopts", + "log", + "phf_codegen", + "rand", +] + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix index 3f48b0b9d8..92607901ca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -12,16 +12,21 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.51"; + version = "0.0.54"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-TKAmIy5dP2m1iokxSqfxTj79UDkW00+se/NDGS3euwA="; + hash = "sha256-GUZMzV0yztlLcxvuTAuRoQ4eQhoMMyqjdu3cfOCJCJE="; }; - cargoHash = "sha256-035ueF42g6By+6TOGEultc8n350g3mRT00raQgWIcUM="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "rustpython-ast-0.3.1" = "sha256-q9N+z3F6YICQuUMp3a10OS792tCq0GiSSlkcaLxi3Gs="; + }; + }; nativeBuildInputs = [ git diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/vhdl-ls/default.nix index 69450e1fca..f879e40089 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/vhdl-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/vhdl-ls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vhdl-ls"; - version = "0.79.0"; + version = "0.80.0"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${version}"; - hash = "sha256-9AcMMT1d4FrTcCN6c2uMa1Xh21e79sM+YsPs+RT892U="; + hash = "sha256-3p6SmmNnuPoHbA0QmfgvO342AhRx5dI9q4YXypi/2k0="; }; - cargoHash = "sha256-Cb4WvOdWtwaC5GCQcnIorAFbkDXliU9w1xDU8g3YlSI="; + cargoHash = "sha256-zAz33P5k6wmQej8u45+lXKHSRVaZhrB5L0jUPjs44W8="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix index aa77056416..2743bdac80 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "vscode-langservers-extracted"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "hrsh7th"; repo = pname; rev = "v${version}"; - hash = "sha256-sGnxmEQ0J74zNbhRpsgF/cYoXwn4jh9yBVjk6UiUdK0="; + hash = "sha256-4qAQa8Pt7Br0T770ck2F912ZddrzgTKEliSAP/qLvgE="; }; - npmDepsHash = "sha256-LFWC87Ahvjf2moijayFze1Jk0TmTc7rOUd/s489PHro="; + npmDepsHash = "sha256-2rRyg+UO3wnq5CuG5q87YOdGng9zBTh9aXueB0xf8ps="; buildPhase = let diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/default.nix index b8ef6ec898..71a9a53a3f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/default.nix @@ -1,24 +1,29 @@ { lib , stdenv , fetchFromGitHub -, zig_0_11 +, fetchurl +, zig_0_12 , callPackage }: stdenv.mkDerivation (finalAttrs: { pname = "zls"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "zigtools"; repo = "zls"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-WrbjJyc4pj7R4qExdzd0DOQ9Tz3TFensAfHdecBA8UI="; + hash = "sha256-2iVDPUj9ExgTooDQmCCtZs3wxBe2be9xjzAk9HedPNY="; }; + zigBuildFlags = [ + "-Dversion_data_path=${zig_0_12.src}/doc/langref.html.in" + ]; + nativeBuildInputs = [ - zig_0_11.hook + zig_0_12.hook ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/deps.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/deps.nix index 5c1b2ce89d..4de50620ef 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/deps.nix @@ -4,24 +4,17 @@ linkFarm "zig-packages" [ { - name = "1220363c7e27b2d3f39de6ff6e90f9537a0634199860fea237a55ddb1e1717f5d6a5"; + name = "12201314cffeb40c5e4e3da166217d2c74628c74486414aaf97422bcd2279915b9fd"; path = fetchzip { - url = "https://gist.github.com/antlilja/8372900fcc09e38d7b0b6bbaddad3904/archive/6c3321e0969ff2463f8335da5601986cf2108690.tar.gz"; - hash = "sha256-m/kr4kmkG2rLkAj5YwvM0HmXTd+chAiQHzYK6ozpWlw="; + url = "https://github.com/ziglibs/known-folders/archive/bf79988adcfce166f848e4b11e718c1966365329.tar.gz"; + hash = "sha256-Q7eMdyScqj8qEiAHg1BnGRTsWSQOKWWTc6hUYHNlgGg="; }; } { - name = "122048992ca58a78318b6eba4f65c692564be5af3b30fbef50cd4abeda981b2e7fa5"; + name = "12200d71e4b7029ea56a429e24260c6c0e85a3069b0d4ba85eace21a0fd75910aa64"; path = fetchzip { - url = "https://github.com/ziglibs/known-folders/archive/fa75e1bc672952efa0cf06160bbd942b47f6d59b.tar.gz"; - hash = "sha256-U/h4bVarq8CFKbFyNXKl3vBRPubYooLxA1xUz3qMGPE="; - }; - } - { - name = "122089a8247a693cad53beb161bde6c30f71376cd4298798d45b32740c3581405864"; - path = fetchzip { - url = "https://github.com/ziglibs/diffz/archive/90353d401c59e2ca5ed0abe5444c29ad3d7489aa.tar.gz"; - hash = "sha256-3CdYo6WevT0alRwKmbABahjhFKz7V9rdkDUZ43VtDeU="; + url = "https://github.com/ziglibs/diffz/archive/e10bf15962e45affb3fcd7d9a950977a69c901b3.tar.gz"; + hash = "sha256-yVFPVn4jGfcoE2V4xdTqdThYPutshL6U4feDzetWgFw="; }; } ] diff --git a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix index 7acf37c5cc..1adea9552b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.3.8"; + version = "4.4.2"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-8sUXJExg1CApMbF95Lx3B/mnOJ5Y6HAck8+0UgF0bdc="; + sha256 = "sha256-5Loc9H5wqafoZYjPGCJ4kTNulS1/Njgn35T74zHr9s4="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix index 2bb9467a41..b4b3d2f1b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.61"; + version = "0.2.62"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-X2Um6z3BXhshNGTwih/mvXigCplzUr+mVOn0SZ7RESA="; + hash = "sha256-zHtRdwBqwQMW/M4TYA609beCrC5B4hyhtcptJSbN6M8="; }; - vendorHash = "sha256-HtCHAMcTFQS8YWjWt9LEHkhZBE8XDF4YOcGBFv0e5l0="; + vendorHash = "sha256-+hK1qG0p7MSYACkvzTnuPvlccbHNJRRZdC/LAM1Cp2k="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix index 6620207ae7..a23e793698 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.4.13"; + version = "3.4.15"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-eKYQq9OelOD5E+nuXNoehbtizWM1U97LngDT2SAQGc4="; + hash = "sha256-BQTHM7v+lmiLZsEHtt8/oFJj3vq7I4WOQsRLpVRYbms="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/awf/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/awf/default.nix index b73f1dc045..79d630d568 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/awf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/awf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config -, wrapGAppsHook }: +, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "awf"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman"; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk2 gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix index 013e517bb5..f8b7125f7f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.26.3"; + version = "2.28.1"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "/U45R5eBRl+uPu7nVj4GYrJERaYEPQtBezTKXn/Np5g="; + sha256 = "n7bNRws6IwTYbWsUAHNtV1hfW+YDygJn/U1U5MaUuew="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "J77nEV6BWgu0SOexsTUN03k2ZKnPSUCFgd8+zHN55E0="; + sha256 = "zH6mEeW0EjYPVSAJ4cL3YpaQPd+h0zxO7qfN43qb67Q="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "Wt5TOKKjGDp8ZUFC9Ml9EeafIVcM3eubbjiRE7A8uns="; + sha256 = "ncX9aHxZJhth3Md591PBhMO3uhsiI03L7M60hOm4uko="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "7Hlw0WvIEBLl7Ft9o7jhbB8Fyi0abymUonMhZAcU0rk="; + sha256 = "OcZ0tyNerGXZKwrJRN4a+1Z51CeHDokYvfA3ve0bNKA="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "Y/2QXiyYnT+uqy8rWGd9BesXft1hjMPlcMpkYw4qO+k="; + sha256 = "ypCC+u6rpGDYkXtw4Q6bBBwLfcmRk4GmmcXHKvmXqFI="; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix index 748a153624..df6e223aeb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -14,47 +14,47 @@ assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions let phpMajor = lib.versions.majorMinor php.version; - version = "1.92.13"; + version = "1.92.15"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-QpvnhIvjhm5tqOP72T2yVxV92M3ty/iDICaWsOVFpNg="; - "8.2" = "sha256-NhNbhOGRlhGvTcG4uZwTASWqLp7PQnfDW48GzROxkII="; - "8.3" = "sha256-Gn3M0ANj05QoAZB6W3HWj4zNCDya7lqa+OTv57fnEQ8="; + "8.1" = "sha256-CTh3HdTZS5tjnSN5JUX55aioFSqs3FQfy7S5ofXlyBs="; + "8.2" = "sha256-q/Zwpvm+pT6JdkC2nX7fEf+eDmWmtLniL+5Cys8kdNI="; + "8.3" = "sha256-8MGY3Spa4cWqUL4S/qHKPJql5DRhtvmYEE3oBLNNm3M="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-zhCjSPTO/RGcc+qvkYlEeV+9ulIXpA0dCMRlSWwj8ys="; - "8.2" = "sha256-J+zdMC4q+MHmwADivqdEfSq8h/KeD5TAanCJKZLuEog="; - "8.3" = "sha256-GGNje7mg1uaLN3zrDXG/igLW9+nhxvPp7nIYW6aJBa4="; + "8.1" = "sha256-mOiBQLXiPYMgHpcPTguEm0hffm+DZnv6MCbFbmRoEdE="; + "8.2" = "sha256-3xPG33DSxnQ9a9rbTov5ILi3hPWsruNZJS1NXttxfxQ="; + "8.3" = "sha256-4Nk+8ZIZ83/oeygDdhHI0mRRCvOEMmdWJoteDVkYuT4="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-C2ie8tp3F0sr+edYbUBVw0b1YJtnjyneC8/+x6LWENg="; - "8.2" = "sha256-Ku1pulSErVMvBtiNvLgRw2NpE/bEOkjZ5TY7F/PYJto="; - "8.3" = "sha256-/U/qf7Aqxssvcnc06+K5JeG96Ab09zRvUYcwhSAW4b8="; + "8.1" = "sha256-5XUk2v65ceHqnfatLq9E1+J5QRgCDpKxR4ZFpCAsfdI="; + "8.2" = "sha256-Lr8wBAXYHXwPokwQMni5tsNncor9ZRjNwtL/5hodUq8="; + "8.3" = "sha256-KZLPFaa5NPksfhA99S8qV3FngJTDonhG+MMPkCwxUys="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-OdqG7G3TzuCVzBA0Xf+It05S6XaVlEd+ugM+gk70OiE="; - "8.2" = "sha256-/nCBQzimhcCrzNuwSVybHBmZZJImm75jKGqh2oXyyZA="; - "8.3" = "sha256-C2SxPYYXewU6PekQ3m1MBiPMPS5tE53gda2Qo7rZ1YQ="; + "8.1" = "sha256-G5wrH9M+b69BLKRI4n9FydGDV/q7Ch7u+Zvol2+ptwI="; + "8.2" = "sha256-zgcYT2oWCa2kc4wLx94nxRjg0sebjdGxuPJNbiBZ/Is="; + "8.3" = "sha256-l1zNH47lNpHj7qRgqoxJisn7dU2VzSGFt0v8/9VpYiI="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-W3reCFcN/bM3hrUeekJLG5qntH/Wvfb+JVly5+g2YEY="; - "8.2" = "sha256-d2YSmyV0mq7KBqoD4Bwdh3izh6hcKTBf6kP+q3QVnfI="; - "8.3" = "sha256-JiCw8Lew2laxOyb+2aSDqlZz2MafFwYwV46dqceEcBk="; + "8.1" = "sha256-mmmzmR4yzwmXAl6YoSOKSivF7uixGZYaFQVIqWd0Ud4="; + "8.2" = "sha256-1jnw3BADm38C1Hi4lBs5B+kJl1karTljVHxHGEfZmtw="; + "8.3" = "sha256-7a2JyeLP4HwyaYsb7zAio2HrUPbBVpVEOUjWKCilkFY="; }; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix index a66ae2aa35..28364b8bee 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix @@ -24,6 +24,9 @@ llvmPackages.stdenv.mkDerivation { passthru.updateScript = unstableGitUpdater { url = "https://github.com/rpav/c2ffi.git"; branch = c2ffiBranch; + # Tags only exist for older LLVM versions, so they would result in nonsense names + # like: c2ffi-llvm-16.0.0-11.0.0.0-unstable-YYYY-MM-DD + hardcodeZeroVersion = true; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix index f3ecd30cd4..5b8cc307cb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { pname = "cmake-language-server"; - version = "0.1.9"; + version = "0.1.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonApplication rec { owner = "regen100"; repo = "cmake-language-server"; rev = "refs/tags/v${version}"; - hash = "sha256-8ypl0YA6ep8/jBL3tsutSgCW13NZTZzaNafaOamcT08="; + hash = "sha256-9fnyDJm8rUl+7g4FrdMykPpQOcww2M6IPWH/3qVeJX4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch index 237558bb66..68d585b02c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch @@ -1,8 +1,8 @@ diff --git a/tests/test_server.py b/tests/test_server.py -index f349329..d130a2e 100644 +index e6cfe6e..3a3ee6a 100644 --- a/tests/test_server.py +++ b/tests/test_server.py -@@ -27,7 +27,7 @@ from pygls.server import LanguageServer +@@ -31,7 +31,7 @@ from pygls.server import LanguageServer from cmake_language_server.server import CMakeLanguageServer @@ -11,3 +11,12 @@ index f349329..d130a2e 100644 def _init(client: LanguageServer, root: Path) -> None: +@@ -115,7 +115,7 @@ def test_workspace_did_change_configuration( + ) + + start = time.monotonic() +- while server._api is old_api and (time.monotonic() - start) < CALL_TIMEOUT: ++ while server._api is old_api: + time.sleep(0.1) + + assert server._api is not None diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cppi/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cppi/default.nix index d8144dd5e9..ef783b748c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cppi/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cppi/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/csmith/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/csmith/default.nix index 0643e81edf..5371f88c0a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/csmith/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/csmith/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ m4 makeWrapper ]; buildInputs = [ libbsd ] ++ (with perlPackages; [ perl SysCPU ]); + CXXFLAGS = "-std=c++98"; + postInstall = '' substituteInPlace $out/bin/compiler_test.pl \ --replace '$CSMITH_HOME/runtime' $out/include/${pname}-${version} \ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix index 055a24f3fe..a5ed3e222a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix @@ -1,9 +1,17 @@ { lib, stdenv, fetchFromGitHub, fetchurl, tie }: +let + cweb = fetchurl { + url = "https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb-3.64ah.tgz"; + sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj"; + }; +in stdenv.mkDerivation rec { pname = "cwebbin"; version = "22p"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "ascherer"; repo = "cwebbin"; @@ -11,10 +19,9 @@ stdenv.mkDerivation rec { sha256 = "0zf93016hm9i74i2v384rwzcw16y3hg5vc2mibzkx1rzvqa50yfr"; }; - cweb = fetchurl { - url = "https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb-3.64ah.tgz"; - sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj"; - }; + prePatch = '' + tar xf ${cweb} + ''; # Remove references to __DATE__ and __TIME__ postPatch = '' @@ -26,6 +33,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ tie ]; + makefile = "Makefile.unix"; + makeFlags = [ "MACROSDIR=$(out)/share/texmf/tex/generic/cweb" "CWEBINPUTS=$(out)/lib/cweb" @@ -35,18 +44,17 @@ stdenv.mkDerivation rec { "CP=cp" "RM=rm" "PDFTEX=echo" - "CC=${stdenv.cc.targetPrefix}c++" + # requires __structuredAttrs = true + "CC=$(CXX) -std=c++14" ]; - buildPhase = '' - zcat ${cweb} | tar -xvpf - - make -f Makefile.unix boot $makeFlags - make -f Makefile.unix cautiously $makeFlags - ''; + buildFlags = [ + "boot" + "cautiously" + ]; - installPhase = '' + preInstall = '' mkdir -p $out/share/man/man1 $out/share/texmf/tex/generic $out/share/emacs $out/lib - make -f Makefile.unix install $makeFlags ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/d-spy/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/d-spy/default.nix index e48a51f487..c2812c2e12 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/d-spy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/d-spy/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "d-spy"; - version = "1.8.0"; + version = "1.10.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/d-spy/${lib.versions.majorMinor version}/d-spy-${version}.tar.xz"; - sha256 = "+J15XQaG2C2h3OsjYUj3zlTVynjwuY4PEzayY6WvzqE="; + hash = "sha256-VVgSucZUBVHaWZ7oFHiArTkVuTyH4XV7bRz9kKDgXlM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix index 6ca7e8f439..6262260326 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix @@ -10,24 +10,24 @@ }: let - embedded-protocol-version = "2.6.0"; + embedded-protocol-version = "2.7.0"; embedded-protocol = fetchFromGitHub { owner = "sass"; repo = "sass"; rev = "refs/tags/embedded-protocol-${embedded-protocol-version}"; - hash = "sha256-pNQnbOKVxRW9AiPteuO2Gq6ejV5Yd9GTuxZSyC/0SlE="; + hash = "sha256-BQCQ4GE85teRkCY2iuvqFT4vyf6RzZ1ztoRhBCAwA4w="; }; in buildDartApplication rec { pname = "dart-sass"; - version = "1.75.0"; + version = "1.77.0"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-nj1CCg/eID5dmW/omIGQYNP/uOKNvMzgo3RLBGLULKI="; + hash = "sha256-x42T8nDmwktfsd89PS8jrSIw2Dc1hKwrZxSn7h7FqAs="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/pubspec.lock.json b/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/pubspec.lock.json index dc96a67bd2..a3f10f435a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/pubspec.lock.json +++ b/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/pubspec.lock.json @@ -24,11 +24,11 @@ "dependency": "direct dev", "description": { "name": "archive", - "sha256": "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d", + "sha256": "ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.10" + "version": "3.5.1" }, "args": { "dependency": "direct main", @@ -134,11 +134,11 @@ "dependency": "transitive", "description": { "name": "coverage", - "sha256": "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76", + "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.7.2" + "version": "1.8.0" }, "crypto": { "dependency": "direct dev", @@ -314,11 +314,11 @@ "dependency": "transitive", "description": { "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.8.1" + "version": "4.9.0" }, "lints": { "dependency": "direct dev", @@ -364,11 +364,11 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.14.0" + "version": "1.15.0" }, "mime": { "dependency": "transitive", @@ -384,11 +384,11 @@ "dependency": "transitive", "description": { "name": "native_stack_traces", - "sha256": "c797830b9910d13b0f4e70ddef15cde034214fe3bdb8092c4ea5ffad2f74013f", + "sha256": "64d2f4bcf3b69326fb9bc91b4dd3a06f94bb5bbc3a65e25ae6467ace0b34bfd3", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.6" + "version": "0.5.7" }, "native_synchronization": { "dependency": "direct main", @@ -460,16 +460,6 @@ "source": "hosted", "version": "6.0.2" }, - "pointycastle": { - "dependency": "transitive", - "description": { - "name": "pointycastle", - "sha256": "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.8.0" - }, "pool": { "dependency": "direct main", "description": { @@ -594,11 +584,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "2.0.0" }, "source_map_stack_trace": { "dependency": "transitive", @@ -684,11 +674,11 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "d87214d19fb311997d8128ec501a980f77cb240ac4e7e219accf452813ff473c", + "sha256": "d11b55850c68c1f6c0cf00eabded4e66c4043feaf6c0d7ce4a36785137df6331", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.3" + "version": "1.25.5" }, "test_api": { "dependency": "transitive", @@ -704,11 +694,11 @@ "dependency": "transitive", "description": { "name": "test_core", - "sha256": "2236f70be1e5ab405c675e88c36935a87dad9e05a506b57dd5c0f617f5aebcb2", + "sha256": "4d070a6bc36c1c4e89f20d353bfd71dc30cdf2bd0e14349090af360a029ab292", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.1" + "version": "0.6.2" }, "test_descriptor": { "dependency": "direct dev", @@ -764,11 +754,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "a75f83f14ad81d5fe4b3319710b90dec37da0e22612326b696c9e1b8f34bbf48", + "sha256": "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.0" + "version": "14.2.2" }, "watcher": { "dependency": "direct main", @@ -790,15 +780,25 @@ "source": "hosted", "version": "0.5.1" }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "bfe704c186c6e32a46f6607f94d079cd0b747b9a489fceeecc93cd3adb98edd5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "sha256": "a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.5" + "version": "3.0.0" }, "webkit_inspection_protocol": { "dependency": "transitive", diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix index 838dfff80f..6de0780d5a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix @@ -77,11 +77,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Backtrace unwinding tests rely on glibc-internal symbol names. - # Musl provides slightly different forms and fails. - # Let's disable tests there until musl support is fully upstreamed. - doCheck = !stdenv.hostPlatform.isMusl; - doInstallCheck = !stdenv.hostPlatform.isMusl; + + doCheck = + # Backtrace unwinding tests rely on glibc-internal symbol names. + # Musl provides slightly different forms and fails. + # Let's disable tests there until musl support is fully upstreamed. + !stdenv.hostPlatform.isMusl + # Test suite tries using `uname` to determine whether certain tests + # can be executed, so we need to match build and host platform exactly. + && (stdenv.hostPlatform == stdenv.buildPlatform); + doInstallCheck = !stdenv.hostPlatform.isMusl + && (stdenv.hostPlatform == stdenv.buildPlatform); passthru.updateScript = gitUpdater { url = "https://sourceware.org/git/elfutils.git"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix index d553f29db0..ad2d36e250 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gpuvis/default.nix @@ -7,7 +7,7 @@ , pkg-config , SDL2 , stdenv -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --replace "libgtk-3.so" "${lib.getLib gtk3}/lib/libgtk-3.so" ''; - nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook3 ]; buildInputs = [ SDL2 gtk3 freetype ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix index 6044aa9921..104f105ac4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix @@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "hydra-cli"; homepage = "https://github.com/nlewo/hydra-cli"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ gilligan lewo ]; + maintainers = with maintainers; [ lewo ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix index 37029689e6..972f137034 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix @@ -43,6 +43,7 @@ , cacert , glibcLocales , fetchFromGitHub +, fetchpatch2 , nixosTests }: @@ -205,6 +206,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ + # https://github.com/NixOS/hydra/security/advisories/GHSA-2p75-6g9f-pqgx + (fetchpatch2 { + name = "CVE-2024-32657.patch"; + url = "https://github.com/NixOS/hydra/commit/b72528be5074f3e62e9ae2c2ae8ef9c07a0b4dd3.patch"; + hash = "sha256-+y27N8AIaHj13mj0LwW7dkpzfzZ4xfjN8Ld23c5mzuU="; + }) + ]; + postPatch = '' # Change 5s timeout for init to 30s substituteInPlace t/lib/HydraTestContext.pm \ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix index c9ba073f6b..189f389587 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { homepage = "https://www.ltrace.org/"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix index 127ab2c4b6..b9ea426641 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.13.12"; + version = "2.13.13"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-4S/lZjyvKtOne2BThRc9Tik33SFm2uecdPBkS/I5mK0="; + sha256 = "sha256-/19PALCB2sZgkq/o5yt8eQZwkxzxwe4N6qf4D7xTiD4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix index b1fb9c83e8..7a0a918db7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "2.13.7"; - sha256 = "sha256-X7TxfDB8jBt5xoVh6JvpVi0H50Jb9A5yjE1mdVNCpes="; + version = "2.13.8"; + sha256 = "sha256-1O+Y2rmjetT1JMyv39UK9PJmA5tSjdWvq8545JAk2Tc="; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix index 49d3eb280a..ce83214070 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix @@ -1,14 +1,11 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , curl , makeWrapper , which , unzip , lua -, file -, nix-prefetch-git # for 'luarocks pack' , zip , nix-update-script @@ -81,8 +78,7 @@ stdenv.mkDerivation (finalAttrs: { --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ --suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \ --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ - --suffix PATH : ${lib.makeBinPath ([ unzip ] ++ - lib.optionals (finalAttrs.pname == "luarocks-nix") [ file nix-prefetch-git ])} + --suffix PATH : ${lib.makeBinPath finalAttrs.propagatedBuildInputs} } done ''; @@ -112,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A package manager for Lua"; license = licenses.mit; maintainers = with maintainers; [ raskin teto ]; + mainProgram = "luarocks"; platforms = platforms.linux ++ platforms.darwin; downloadPage = "http://luarocks.org/releases/"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 20acab5a85..d64e3c91ae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -1,23 +1,38 @@ -{ luarocks, fetchFromGitHub, unstableGitUpdater }: +{ luarocks +, fetchFromGitHub +, unstableGitUpdater +, nurl +, file +}: luarocks.overrideAttrs (old: { pname = "luarocks-nix"; - version = "unstable-2023-10-19"; + version = "0-unstable-2024-04-29"; src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "4240b25b95d7165cde66fc2acaf5a0f9ad40fd0c"; - sha256 = "sha256-dqFFYehBgK0RqH0/1GtZXq7XLGCcc3Kfadq8ICYNCWk="; + rev = "a473a8f479711682f5b97a72362736d96efd463b"; + hash = "sha256-hsjv+jlLsoIDM4gB/0mFeoVu1YZ1I9ELDALLTEnlCF0="; }; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + file + nurl + ]; + patches = [ ]; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + # tags incompletely inherited from regular luarocks + hardcodeZeroVersion = true; + }; }; - meta = old.meta // { + # old.meta // { /* ... */ } doesn't update meta.position, which breaks the updateScript + meta = { + inherit (old.meta) description license maintainers platforms; mainProgram = "luarocks"; }; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix index 8da04668ec..145660e3a5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix @@ -24,6 +24,6 @@ buildGoModule rec { description = "A simple tool for making locally-trusted development certificates"; mainProgram = "mkcert"; license = licenses.bsd3; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix index 66571e887e..0d4d5c2c43 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/msitools/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; - homepage = "https://wiki.gnome.org/msitools"; + homepage = "https://gitlab.gnome.org/GNOME/msitools"; license = with licenses; [ # Library lgpl21Plus diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix index 9cd87a29ec..e0947e8f6f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix @@ -5,16 +5,16 @@ php.buildComposerProject (finalAttrs: { pname = "n98-magerun2"; - version = "7.3.1"; + version = "7.4.0"; src = fetchFromGitHub { owner = "netz98"; repo = "n98-magerun2"; rev = finalAttrs.version; - hash = "sha256-a1T4SmeOEKRW/xS2VBPLZt6r9JdtaJn8YVvfRnzGdb4="; + hash = "sha256-OPvyZ0r7Zt4PC+rmRtBm9EkbaE4PeovnUHrhzXUqT8E="; }; - vendorHash = "sha256-1j0/spum4C9j/HNVlHwUehAFYJOz7YvMVlC6dtbNYK0="; + vendorHash = "sha256-HSkcYbDQPK1ByG8Euq9YqzK0jqjKrWO+0R4ungFDOIY="; meta = { changelog = "https://magerun.net/category/magerun/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nix-bisect/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nix-bisect/default.nix index a4c3179e8e..7c9f474ab5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/nix-bisect/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nix-bisect/default.nix @@ -6,7 +6,7 @@ let pname = "nix-bisect"; - version = "0.4.1"; + version = "0.4.1-unstable-2024-04-19"; in python3.pkgs.buildPythonApplication { inherit pname version; @@ -15,23 +15,10 @@ python3.pkgs.buildPythonApplication { src = fetchFromGitHub { owner = "timokau"; repo = pname; - rev = "v${version}"; - hash = "sha256-01vj35mMakqKi5zbMIPQ+R8xdkOWbzpnigd3/SU+svw="; + rev = "4f26082fec0817acbfa8cc6ca4c25caaf77ddcd2"; + hash = "sha256-zyeE1jYo/9NEG8fB4gQBAR01siP4tyLvjjHN1yUS4Ug="; }; - patches = [ - (fetchpatch { - # Fixes compatibility with recent nix versions - url = "https://github.com/timokau/nix-bisect/commit/01eefe174b740cb90e48b06d67d5582d51786b96.patch"; - hash = "sha256-Gls/NtHH7LujdEgLbcIRZ12KsJDrasXIMcHeeBVns4A="; - }) - (fetchpatch { - # Fixes TypeError crashes associated with drvs_failed inconsistency - url = "https://github.com/timokau/nix-bisect/commit/9f3a17783046baae64c16f9e2be917c2603977fc.patch"; - hash = "sha256-U9NUtgwslcgIf/wvH/WE7t0HGs2OP3wvYDKrb5j+lp0="; - }) - ]; - propagatedBuildInputs = with python3.pkgs; [ appdirs numpy diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/one_gadget/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/misc/one_gadget/Gemfile.lock index 202e17ebdb..0a62128d50 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/one_gadget/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/misc/one_gadget/Gemfile.lock @@ -1,10 +1,10 @@ GEM remote: https://rubygems.org/ specs: - bindata (2.4.15) + bindata (2.5.0) elftools (1.1.3) bindata (~> 2) - one_gadget (1.8.1) + one_gadget (1.9.0) elftools (>= 1.0.2, < 1.2.0) PLATFORMS @@ -14,4 +14,4 @@ DEPENDENCIES one_gadget BUNDLED WITH - 2.4.19 + 2.5.7 diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/one_gadget/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/one_gadget/default.nix index 6ad2c909c3..4bf550cea5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/one_gadget/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/one_gadget/default.nix @@ -18,6 +18,7 @@ bundlerApp { homepage = "https://github.com/david942j/one_gadget"; license = licenses.mit; maintainers = with maintainers; [ artemist nicknovitski ]; + mainProgram = "one_gadget"; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix index 98227bdbe7..c1127a8b6c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/one_gadget/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5"; + sha256 = "08r67nglsqnxrbn803szf5bdnqhchhq8kf2by94f37fcl65wpp19"; type = "gem"; }; - version = "2.4.15"; + version = "2.5.0"; }; elftools = { dependencies = ["bindata"]; @@ -26,9 +26,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dwsmjhr9i8gwwbbpiyddbhcx74cvqqk90a5l8zbsjhjfs679irc"; + sha256 = "1j9478h929jm5hq2fs3v8y37a7y2hhpli90mbps7yvka4ykci7mw"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix b/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix index c2d9b2c0be..212f0b8ceb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "unstable-2024-01-15"; + version = "0.18.0-unstable-2024-01-15"; src = fetchFromGitHub { owner = "NixOS"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix index 90a9505980..f01efc21d6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.17.3"; + version = "0.17.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-9iXQKwzcWATnqsKrDAyLAkuRHUsfxfEpyeCxZ1JUpV8="; + hash = "sha256-G2mN7f5dpE6fF5ti7JJXVk8qBiwKO/yy5cyOYBxDJNo="; }; - vendorHash = "sha256-cq8KD2STIpPSB3RXv9sl8Bty1noUQak5FZfrfq1rj10="; + vendorHash = "sha256-ux3nrQtY1sY4VJIeTSZAipfURspWDqnZ9YfxmFUvElI="; doCheck = false; @@ -24,7 +24,7 @@ buildGoModule rec { mainProgram = "reviewdog"; homepage = "https://github.com/reviewdog/reviewdog"; changelog = "https://github.com/reviewdog/reviewdog/blob/v${version}/CHANGELOG.md"; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix index 1f6e6e7a04..5a99ef9b35 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage rec { - version = "0.7.7"; + version = "0.8.0"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-nWSMWaz1UvjsA2V7q7WKx44G45VVaoQxteZqrKAlxY8="; + sha256 = "sha256-GKJKesvOtnZsLcYQjSsnUcolBIqqiYSX0VSZru416mk="; }; - cargoHash = "sha256-ezub+pOqNjCfH7QgjLBrYtsyYbPM3/SADLpNgPtlG+I="; + cargoHash = "sha256-GacjuBLlVawNRFutsjfywYHo34QKJHCPgi/QCPjcaAA="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/stlink/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/stlink/default.nix index 2255fbfd8d..16785e4d4b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/stlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/stlink/default.nix @@ -5,7 +5,7 @@ , libusb1 , gtk3 , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , withGUI ? false }: @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { cmake ] ++ lib.optionals withGUI [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix index 33371bee93..6256831969 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "strace-analyzer"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "wookietreiber"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wx0/Jb2uaS1qdRQymfE00IEOyfgLtD4lXYasaJgcoxo="; + sha256 = "sha256-KbdQeZoWFz4D5txu/411J0HNnIAs3t5IvO30/34vBek="; }; - cargoHash = "sha256-3OS3LEEk58+IJDQrgwo+BJq6hblojk22QxDtZY5ofA4="; + cargoHash = "sha256-t1BFc5cNOQJIbufFH2hHI4f7SMrZ5mwVODXukdbHf3M="; nativeCheckInputs = [ strace ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix index b01d73ecc1..1084fd9b06 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix @@ -25,6 +25,6 @@ buildGoModule rec { homepage = "https://github.com/cycloidio/terracognita"; changelog = "https://github.com/cycloidio/terracognita/raw/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index b68fc0deaf..24a0df088d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - hash = "sha256-UrymfiuaQ6k2MSwq/ZhtdsaSzc3uRzIsdq/Wepeo5+I="; + hash = "sha256-kVLB1ruWOWGmCyEgHj8wtA7GwbdKiCYo7n4anVyKM5Y="; }; - vendorHash = "sha256-yWRfYzctunXRHN9j3K7KUUAsJhs2bUzgPb+u6SjuAlk="; + vendorHash = "sha256-Vwa3km9CAq3Zik7dXWeHOnkIbL0eAwuKJ+bkw2lDe5k="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix index 74070bd6ea..f336162828 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { mainProgram = "terraform-lsp"; homepage = "https://github.com/juliosueiras/terraform-lsp"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix index dc8ad0644f..e38d753b46 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { mainProgram = "terraformer"; homepage = "https://github.com/GoogleCloudPlatform/terraformer"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix index b6efe2732d..880183c8bd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix @@ -6,22 +6,25 @@ buildGoModule rec { pname = "terramate"; - version = "0.4.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-aOKUC1FtDDhdUbPUSLW6GrSwh6r29Y2ObC6y487W4Zc="; + hash = "sha256-jcmOS81iPzy1ul0Cj/SiJk84AUIq7mLI+CmspuPit+o="; }; - vendorHash = "sha256-gl5xsaSkGXlh+MfieVBPHGAbYZVF3GBbIkmvVhlJvqw="; + vendorHash = "sha256-Na2XDPSwgwWTQrweslAtSOh2+B/ZFaPIdy8ssAFWkGs="; # required for version info nativeBuildInputs = [ git ]; ldflags = [ "-extldflags" "-static" ]; + # Disable failing E2E tests preventing the package from building + excludedPackages = [ "./cmd/terramate/e2etests/cloud" "./cmd/terramate/e2etests/core" ]; + meta = with lib; { description = "Adds code generation, stacks, orchestration, change detection, data sharing and more to Terraform"; homepage = "https://github.com/terramate-io/terramate"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terser/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terser/default.nix index ba30c6a4ff..faffc0c053 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terser/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terser/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "terser"; - version = "5.30.0"; + version = "5.30.4"; src = fetchFromGitHub { owner = "terser"; repo = "terser"; rev = "v${version}"; - hash = "sha256-d3vnCEb9HzydpxsuoX66KqUtgYYt/+L2AcpZNFDleoY="; + hash = "sha256-d0zxwUvXa+Nm9p8QkhBhXl73XfJ+dxxt+GHkFtI8Zuk="; }; - npmDepsHash = "sha256-wrxa6/TKYb/pqT4zjTVbfONSYqko12pVzBQ9Ojm7H2o="; + npmDepsHash = "sha256-7j3hMDVktQxolCMM27SH7y5ZtexnwF//ccilVZ0w5l8="; meta = with lib; { description = "JavaScript parser, mangler and compressor toolkit for ES6+"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix index d8d63088ee..17bb656aac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix @@ -1,7 +1,7 @@ { version, sha256, patches ? [] }: { lib, stdenv, buildPackages, fetchurl, perl, xz, libintl, bash -, gnulib, gawk +, gnulib, gawk, libiconv # we are a dependency of gcc, this simplifies bootstraping , interactive ? false, ncurses, procps @@ -13,11 +13,10 @@ # files. let + inherit (lib) getDev getLib optional optionals optionalString; crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform; in -with lib; - stdenv.mkDerivation { pname = "texinfo${optionalString interactive "-interactive"}"; inherit version; @@ -83,7 +82,7 @@ stdenv.mkDerivation { done ''; - meta = { + meta = with lib; { description = "The GNU documentation system"; homepage = "https://www.gnu.org/software/texinfo/"; changelog = "https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 6c3b1707a4..5505273d85 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.14.1"; + version = "5.16.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-OqnV0ZpriiH69cTlmqPxorCgeO3x5h15e5Crn7DPwBM="; + hash = "sha256-hdco5A6qUUs/kTXdaZKo9WhMq9FcbJyDwUauK4IElIA="; }; - cargoHash = "sha256-V5FP24Cz1umffFD1Am4/IG3c7zKpT7MdghLpKvDxZwA="; + cargoHash = "sha256-MlV6+D6fpuIkLGd2lcFmfIXPtJSr5wV9njlqFoANs8o="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.14.1/.github/workflows/publish.yml#L117-L121 + # https://github.com/latex-lsp/texlab/blob/v5.16.0/.github/workflows/publish.yml#L117-L121 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tie/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/tie/default.nix index 70d64af371..2db093cf01 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/tie/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/tie/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - ${stdenv.cc.targetPrefix}cc tie.c -o tie + ${stdenv.cc.targetPrefix}cc -std=c89 tie.c -o tie ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix index 4f9dbe92d2..8451bead26 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "18wbbxc5cfsmikba0msdvd5qlaga27b32nhrzicyd9mdddp265f2"; }; - patches = [ ./configurable-usb-modeswitch.patch ]; + patches = [ + ./configurable-usb-modeswitch.patch + ./pkg-config.patch + ]; # Remove attempts to write to /etc and /var/lib. postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/pkg-config.patch b/third_party/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/pkg-config.patch new file mode 100644 index 0000000000..052ab7543e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/usb-modeswitch/pkg-config.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 9aa7356..c5f2a87 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,8 @@ PROG = usb_modeswitch + VERS = 2.6.0 + CC ?= gcc + CFLAGS += -Wall -Wno-deprecated-declarations +-LIBS = `pkg-config --libs --cflags libusb-1.0` ++PKG_CONFIG ?= pkg-config ++LIBS = `$(PKG_CONFIG) --libs --cflags libusb-1.0` + RM = /bin/rm -f + OBJS = usb_modeswitch.c + PREFIX = $(DESTDIR)/usr diff --git a/third_party/nixpkgs/pkgs/development/tools/mongosh/package-lock.json b/third_party/nixpkgs/pkgs/development/tools/mongosh/package-lock.json index c222b3c4a8..3cfb31a284 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mongosh/package-lock.json +++ b/third_party/nixpkgs/pkgs/development/tools/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "2.2.4", + "version": "2.2.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "2.2.4", + "version": "2.2.5", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.2.4" + "@mongosh/cli-repl": "2.2.5" }, "bin": { "mongosh": "bin/mongosh.js" @@ -697,6 +697,10 @@ }, "engines": { "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" } }, "node_modules/@babel/core/node_modules/semver": { @@ -1019,6 +1023,9 @@ "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, "node_modules/@isaacs/cliui/node_modules/strip-ansi": { @@ -1030,6 +1037,9 @@ }, "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/@jridgewell/gen-mapping": { @@ -1153,12 +1163,12 @@ } }, "node_modules/@mongosh/arg-parser": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.4.tgz", - "integrity": "sha512-pgLWPGPcYpZT3uZSeFB/HglFUYAsQgaKZTwuc+lQcyZxvrQZ+VeIhB4MREE/sbXpUowKtbfQXghXw09DwDd/uw==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.5.tgz", + "integrity": "sha512-SqScPS3QeG6HuMwvyuvImAQ15jfmQ02TS+a5RdwI5r79XmyRAJ6Jm9df8gms+Eqhzl2lvuXkt00sl23sCi26dA==", "dependencies": { - "@mongosh/errors": "2.2.4", - "@mongosh/i18n": "2.2.4", + "@mongosh/errors": "2.2.5", + "@mongosh/i18n": "2.2.5", "mongodb-connection-string-url": "^3.0.0" }, "engines": { @@ -1166,9 +1176,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.4.tgz", - "integrity": "sha512-CjIZbzu72ai2yby6uymFwO/bgR0Nst3Q8Etfn7dukIDInpD/4OobQZZKY5IVah3BLFHVICJTg9S956EbLlmgbA==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.5.tgz", + "integrity": "sha512-ZS6zw8+TnFxfirXdY/fNtQrB35O//MGfBhuoRFPaaVo551QnQWbSkjef2/aSOu0iDGph/iLo8gbRMFPtfdUtLg==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1185,12 +1195,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.4.tgz", - "integrity": "sha512-ZhfWGe2Vz7AiTnd8LKINeFZj3kc9HiRi9BmXK73zQQkJeV33KmDK7qeBS8kUbGwpZKj1pWtFdrBixpJ2ZivqHw==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.5.tgz", + "integrity": "sha512-ygFpjamjkx5KcRP70iH2IMavGNj19l3nwv8vRXhpC9sdz3hkRcTbl8SjWKWvOSMtm679dYm6ExVgV4f0jqZGFQ==", "dependencies": { "@mongodb-js/mongodb-constants": "^0.8.10", - "@mongosh/shell-api": "2.2.4", + "@mongosh/shell-api": "2.2.5", "semver": "^7.5.4" }, "engines": { @@ -1198,25 +1208,25 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.4.tgz", - "integrity": "sha512-NawHTDmxkQIbhRtS7LZbHX3WLWgHe1ADH+JCiPdSHda39t8XYdIXLys8nBbH7NH6cQqsKXlMRAoggVY2zK1dWQ==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.5.tgz", + "integrity": "sha512-TNIfVUJks7D9psvF/nHD7YifuQ0eYca8R8sKdDCuBu/H8xmbmQmARhHO2tGeaI0osR6HJkUunpYgbXwB4hnmHw==", "dependencies": { - "@mongosh/arg-parser": "2.2.4", - "@mongosh/autocomplete": "2.2.4", - "@mongosh/editor": "2.2.4", - "@mongosh/errors": "2.2.4", - "@mongosh/history": "2.2.4", - "@mongosh/i18n": "2.2.4", - "@mongosh/import-node-fetch": "2.2.4", - "@mongosh/js-multiline-to-singleline": "2.2.4", - "@mongosh/logging": "2.2.4", - "@mongosh/service-provider-core": "2.2.4", - "@mongosh/service-provider-server": "2.2.4", - "@mongosh/shell-api": "2.2.4", - "@mongosh/shell-evaluator": "2.2.4", - "@mongosh/snippet-manager": "2.2.4", - "@mongosh/types": "2.2.4", + "@mongosh/arg-parser": "2.2.5", + "@mongosh/autocomplete": "2.2.5", + "@mongosh/editor": "2.2.5", + "@mongosh/errors": "2.2.5", + "@mongosh/history": "2.2.5", + "@mongosh/i18n": "2.2.5", + "@mongosh/import-node-fetch": "2.2.5", + "@mongosh/js-multiline-to-singleline": "2.2.5", + "@mongosh/logging": "2.2.5", + "@mongosh/service-provider-core": "2.2.5", + "@mongosh/service-provider-server": "2.2.5", + "@mongosh/shell-api": "2.2.5", + "@mongosh/shell-evaluator": "2.2.5", + "@mongosh/snippet-manager": "2.2.5", + "@mongosh/types": "2.2.5", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^1.0.0", @@ -1248,15 +1258,15 @@ } }, "node_modules/@mongosh/editor": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.4.tgz", - "integrity": "sha512-mv00Y2jve+xoGKX4eFMEDi0ts/wMPpy9PpyIP8T2R+/QxK05XvR3+yG+EnENWxbfdgXG0vQplhPmb0kAOYRbOA==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.5.tgz", + "integrity": "sha512-ji7NrcOgTrC9JfDP4QPiB53qPdy9G/Osc01OF3Wm4qS/mFqSB4zgTTV0YLMzYDpG+esIGGhe8yfVrofBj0VX7A==", "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.2.4", - "@mongosh/service-provider-core": "2.2.4", - "@mongosh/shell-api": "2.2.4", - "@mongosh/shell-evaluator": "2.2.4", - "@mongosh/types": "2.2.4", + "@mongosh/js-multiline-to-singleline": "2.2.5", + "@mongosh/service-provider-core": "2.2.5", + "@mongosh/shell-api": "2.2.5", + "@mongosh/shell-evaluator": "2.2.5", + "@mongosh/types": "2.2.5", "js-beautify": "^1.15.1" }, "engines": { @@ -1264,17 +1274,17 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.4.tgz", - "integrity": "sha512-5fjnXLZMFWKQSiPUivNSWLqsZ24GVqOfulAerByjmzRoeOi5hDV3MEvQmQvOxYa9Q65vhH4jEJTlrBlhy7H70Q==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.5.tgz", + "integrity": "sha512-UdTod4Evw/X2XW91FG2DJ5E57J+0GLz4zuGxLdPcRcWSdnqZVgd+lTTPC9uzoMoWCs3bv6y54HmoWbqUEYlpEQ==", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.4.tgz", - "integrity": "sha512-SRsRitYZuRyxVPmpT5AFCiqhcjRrMxCjVOBxu1nzimfaS9B5n10+Lr585uEtY+kUrnqToQ6HTqHRR01lXzrq0g==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.5.tgz", + "integrity": "sha512-LvQQ493B4SFYawf83fE/lfkXtP2o2Y5VKj+tKMiHP1RQqWNxrAPndt3sNHlFpeFGppEzCiXz1mTwu4Lbko0tqA==", "dependencies": { "mongodb-connection-string-url": "^3.0.0", "mongodb-redact": "^0.2.2" @@ -1284,20 +1294,20 @@ } }, "node_modules/@mongosh/i18n": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.4.tgz", - "integrity": "sha512-J93D75B8GD9MVQaTyKiJNcgjsq32DrHCBQ5N/u3E/HusCAR/XJ+9IWGkE8rW1Nnwx8RGvFi12UOxbC6UDkDMlQ==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.5.tgz", + "integrity": "sha512-jjjO6RniNX5jL2tb8HtOGOuZZVnlc3XxKuPUBwQuk6tbxpJEjSIv1D3U+F4eGNGrfD6rVXRrjw+0SrdzizI/EA==", "dependencies": { - "@mongosh/errors": "2.2.4" + "@mongosh/errors": "2.2.5" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/import-node-fetch": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.4.tgz", - "integrity": "sha512-cRTx3OPlvZDwUFziEgJIY/j5sUWykqI3MhFr0grPWK8uyKHjpaM3jPa++KYdPPy/NiE+payZh5XMBBbESmh1mg==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.5.tgz", + "integrity": "sha512-RqwYM32AOwwfyTD02WDOHvN/zKDe+/TYFsgU31c4qle51yvlwRs3LPKzuwTYUPLAXxF8MzlzjvHGQGlemCKTTA==", "dependencies": { "node-fetch": "^3.3.2" }, @@ -1306,9 +1316,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.4.tgz", - "integrity": "sha512-uki9gdwrvwSfSw2QNDqcIKxwDdqp6clbYQhVm8eOnAmEJc9UoiGr8kTvDblQFOjkjbXxhbnvgDaZ8YgcqNFt9w==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.5.tgz", + "integrity": "sha512-20qZfBXIxn2VQv48hMxbQgBdr1lQ+jESSjlsYzMovaaRDxaLu0RBm9Vg0+TUSQKsF/ep2ZG4jTyRS/XfSOm8Iw==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1318,14 +1328,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.4.tgz", - "integrity": "sha512-yzwgpjDSqqiS4wuWROhHsAQiZZimZ0jddlASfeezVz6R+oKgl336W1yafuAbMLJqqSDFEunlaRmbXwkjSfxP8Q==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.5.tgz", + "integrity": "sha512-NneAPHoyMSkY5/BuIbQJOKuldqLA6QtiitmQV00EP2p/nqC9xX+gtU7i9pUxFFR2qlKHeLjJwQVA9R9qGpOPyA==", "dependencies": { "@mongodb-js/devtools-connect": "^2.6.0", - "@mongosh/errors": "2.2.4", - "@mongosh/history": "2.2.4", - "@mongosh/types": "2.2.4", + "@mongosh/errors": "2.2.5", + "@mongosh/history": "2.2.5", + "@mongosh/types": "2.2.5", "mongodb-log-writer": "^1.4.0", "mongodb-redact": "^0.2.2" }, @@ -1334,12 +1344,12 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.4.tgz", - "integrity": "sha512-C8MtEj8ZsgpbBWghzYdSB9dcnTbZz6DE+cmdECHfFVROUGH+ZVoxftOVRq7/lguLjTDQ4hOxcXukh2cF8SvOyg==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.5.tgz", + "integrity": "sha512-NiQJkESYyRiX+zEIGE8gE8RINNSGa5cm07DkLB5DM7ebIMNuPbfU7byvh6AcW8R2QQZ0hEKWf4HosW1hnhFAHg==", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.2.4", + "@mongosh/errors": "2.2.5", "bson": "^6.5.0", "mongodb": "^6.5.0", "mongodb-build-info": "^1.7.1" @@ -1352,15 +1362,15 @@ } }, "node_modules/@mongosh/service-provider-server": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.4.tgz", - "integrity": "sha512-G39TiYp1Fqp97s01PiQyoo6yU//SFpNssKuvf79Y8WmbkvIEtMvW4d1pVrrs5OudgF155clFG/M7d2Tl4S4RUA==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.5.tgz", + "integrity": "sha512-vq6pJ9SqkEnns4hCEYnc2Rva+rnYAd4Vynpj90gKZwW67ApNNo1RpqXGNRgciFgmiWb+gqJVQk8gD+xytAcYxQ==", "dependencies": { "@mongodb-js/devtools-connect": "^2.6.0", "@mongodb-js/oidc-plugin": "^0.4.0", - "@mongosh/errors": "2.2.4", - "@mongosh/service-provider-core": "2.2.4", - "@mongosh/types": "2.2.4", + "@mongosh/errors": "2.2.5", + "@mongosh/service-provider-core": "2.2.5", + "@mongosh/types": "2.2.5", "@types/sinon-chai": "^3.2.4", "aws4": "^1.12.0", "mongodb": "^6.5.0", @@ -1376,15 +1386,15 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.4.tgz", - "integrity": "sha512-KvSpGppwHv6HfV7W4LTRZY1gFK6J/yE0td2E52FW+B/MAnWAAyJz85nWjGEOpT/FnsZrqC7DV+a1JVpXOcvnVA==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.5.tgz", + "integrity": "sha512-FPgzPOudhayvRuD50Hux2Ojs//JhKllOzX4TT3s8qNmcujJpOtQ4BVWTmREEivBSmwkagA2ag374KUlzRlxtTw==", "dependencies": { - "@mongosh/arg-parser": "2.2.4", - "@mongosh/errors": "2.2.4", - "@mongosh/history": "2.2.4", - "@mongosh/i18n": "2.2.4", - "@mongosh/service-provider-core": "2.2.4", + "@mongosh/arg-parser": "2.2.5", + "@mongosh/errors": "2.2.5", + "@mongosh/history": "2.2.5", + "@mongosh/i18n": "2.2.5", + "@mongosh/service-provider-core": "2.2.5", "mongodb-redact": "^0.2.2" }, "engines": { @@ -1392,27 +1402,27 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.4.tgz", - "integrity": "sha512-v5HTxC+0l+msdjNtaS9IiG1zfr/YL7nYBs/Hc4HkpbBa+LrnoorQbfTa0SIB7jBGkc2HnyswkSu5Wc6X0WQxdQ==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.5.tgz", + "integrity": "sha512-2RRHBRrK0izXLnVHtWttrOmYM8aDNhPNfmxuxkd5UFMGDYTAQ7JNmBVlvo0jPsWNZLLMCioVDdvvQY+WuyDgzg==", "dependencies": { - "@mongosh/async-rewriter2": "2.2.4", - "@mongosh/history": "2.2.4", - "@mongosh/shell-api": "2.2.4" + "@mongosh/async-rewriter2": "2.2.5", + "@mongosh/history": "2.2.5", + "@mongosh/shell-api": "2.2.5" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.4.tgz", - "integrity": "sha512-Q043qO5cP3YMv3zpYUYUZCXogUbBioIfgMzOCCYMfWOXntJmPK0AwCZurQVjdA08tsznrYPa3rwX64amTHyj+A==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.5.tgz", + "integrity": "sha512-q9mvh+f7L7QGiCVmIGp7ECmphOCd1jUy0aK2wkbzFl3E6Liwqh0DlJB0Uue2VA72LmJd36kowKFoA8TYo4DgwA==", "dependencies": { - "@mongosh/errors": "2.2.4", - "@mongosh/import-node-fetch": "2.2.4", - "@mongosh/shell-api": "2.2.4", - "@mongosh/types": "2.2.4", + "@mongosh/errors": "2.2.5", + "@mongosh/import-node-fetch": "2.2.5", + "@mongosh/shell-api": "2.2.5", + "@mongosh/types": "2.2.5", "bson": "^6.5.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", @@ -1424,9 +1434,9 @@ } }, "node_modules/@mongosh/types": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.4.tgz", - "integrity": "sha512-FN6VHcmLXPWmE08EAdQOeDhHSZYGP0iVKANOZpI2ncXChEiOVVU2Z8x2fHIXksPsb0gxzv1+NOagpzjg6YuyOg==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.5.tgz", + "integrity": "sha512-wWt1CQiQZylsgseehJ0ODspZ757l8c01VPsDKhUNFwhikhZiG2hlmPT8hR0D78ZkzQbHkC4ajOObsxkWaBCJ7g==", "dependencies": { "@mongodb-js/devtools-connect": "^2.6.0" }, @@ -2312,7 +2322,21 @@ "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] }, "node_modules/big-integer": { "version": "1.6.52", @@ -2346,6 +2370,20 @@ "version": "5.7.1", "resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], "optional": true, "dependencies": { "base64-js": "^1.3.1", @@ -2416,6 +2454,20 @@ "version": "4.23.0", "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.0.tgz", "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "dependencies": { "caniuse-lite": "^1.0.30001587", "electron-to-chromium": "^1.4.668", @@ -2441,6 +2493,20 @@ "version": "6.0.3", "resolved": "https://registry.npmmirror.com/buffer/-/buffer-6.0.3.tgz", "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" @@ -2455,6 +2521,9 @@ }, "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/bytes": { @@ -2478,12 +2547,29 @@ }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001610", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz", - "integrity": "sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA==" + "version": "1.0.30001612", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz", + "integrity": "sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ] }, "node_modules/chalk": { "version": "2.4.2", @@ -2628,6 +2714,9 @@ }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/deep-extend": { @@ -2651,6 +2740,9 @@ }, "engines": { "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/default-browser-id": { @@ -2663,6 +2755,9 @@ }, "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/define-data-property": { @@ -2676,6 +2771,9 @@ }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/define-lazy-prop": { @@ -2684,6 +2782,9 @@ "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/depd": { @@ -2748,9 +2849,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.739", - "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.739.tgz", - "integrity": "sha512-koRkawXOuN9w/ymhTNxGfB8ta4MRKVW0nzifU17G1UwTWlBg0vv7xnz4nxDnRFSBe9nXMGRgICcAzqXc0PmLeA==" + "version": "1.4.748", + "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.748.tgz", + "integrity": "sha512-VWqjOlPZn70UZ8FTKUOkUvBLeTQ0xpty66qV0yJcAGY2/CthI4xyW9aEozRVtuwv3Kpf5xTesmJUcPwuJmgP4A==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -2765,6 +2866,10 @@ "chalk": "^4.0.0", "highlight.js": "~10.4.0", "lowlight": "~1.17.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" } }, "node_modules/emphasize/node_modules/ansi-styles": { @@ -2776,6 +2881,9 @@ }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/emphasize/node_modules/chalk": { @@ -2788,6 +2896,9 @@ }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, "node_modules/emphasize/node_modules/color-convert": { @@ -2880,6 +2991,9 @@ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/etag": { @@ -2915,6 +3029,9 @@ }, "engines": { "node": "^14.18.0 || ^16.14.0 || >=18.0.0" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, "node_modules/execa/node_modules/signal-exit": { @@ -2989,6 +3106,16 @@ "version": "4.2.5", "resolved": "https://registry.npmmirror.com/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz", "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==", + "funding": [ + { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" + }, + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], "dependencies": { "strnum": "^1.0.5" }, @@ -3002,12 +3129,26 @@ "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", "dependencies": { "format": "^0.2.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" } }, "node_modules/fetch-blob": { "version": "3.2.0", "resolved": "https://registry.npmmirror.com/fetch-blob/-/fetch-blob-3.2.0.tgz", "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "paypal", + "url": "https://paypal.me/jimmywarting" + } + ], "dependencies": { "node-domexception": "^1.0.0", "web-streams-polyfill": "^3.0.3" @@ -3062,6 +3203,9 @@ }, "engines": { "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/format": { @@ -3135,7 +3279,10 @@ "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/gensync": { "version": "1.0.0-beta.2", @@ -3172,6 +3319,9 @@ }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/get-stream": { @@ -3180,6 +3330,9 @@ "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/github-from-package": { @@ -3227,6 +3380,9 @@ }, "engines": { "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/globals": { @@ -3243,6 +3399,9 @@ "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "dependencies": { "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/handle-backspaces": { @@ -3264,6 +3423,9 @@ "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/has-proto": { @@ -3272,6 +3434,9 @@ "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/has-symbols": { @@ -3280,6 +3445,9 @@ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/hasown": { @@ -3351,7 +3519,21 @@ "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] }, "node_modules/inherits": { "version": "2.0.4", @@ -3398,6 +3580,9 @@ }, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/is-fullwidth-code-point": { @@ -3420,6 +3605,9 @@ }, "engines": { "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/is-recoverable-error": { @@ -3440,6 +3628,9 @@ "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/is-wsl": { @@ -3462,6 +3653,9 @@ }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/isexe": { @@ -3479,14 +3673,17 @@ "engines": { "node": ">=14" }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, "optionalDependencies": { "@pkgjs/parseargs": "^0.11.0" } }, "node_modules/joi": { - "version": "17.12.3", - "resolved": "https://registry.npmmirror.com/joi/-/joi-17.12.3.tgz", - "integrity": "sha512-2RRziagf555owrm9IRVtdKynOBeITiDpuZqIpgwqXShPncPKNiRQoiGsl/T8SQdq+8ugRzH2LqY67irr2y/d+g==", + "version": "17.13.0", + "resolved": "https://registry.npmmirror.com/joi/-/joi-17.13.0.tgz", + "integrity": "sha512-9qcrTyoBmFZRNHeVP4edKqIUEgFzq7MHvTNSDuHSqkpOPtiBkgNgcmTSqmiw1kw9tdKaiddvIDv/eCJDxmqWCA==", "dependencies": { "@hapi/hoek": "^9.3.0", "@hapi/topo": "^5.1.0", @@ -3498,7 +3695,10 @@ "node_modules/jose": { "version": "4.15.5", "resolved": "https://registry.npmmirror.com/jose/-/jose-4.15.5.tgz", - "integrity": "sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==" + "integrity": "sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==", + "funding": { + "url": "https://github.com/sponsors/panva" + } }, "node_modules/js-beautify": { "version": "1.15.1", @@ -3609,6 +3809,10 @@ "dependencies": { "fault": "^1.0.0", "highlight.js": "~10.4.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" } }, "node_modules/lru-cache": { @@ -3700,6 +3904,9 @@ "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/mimic-response": { @@ -3709,6 +3916,9 @@ "optional": true, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/minimatch": { @@ -3720,13 +3930,19 @@ }, "engines": { "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/minimist": { "version": "1.2.8", "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "optional": true + "optional": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/minipass": { "version": "7.0.4", @@ -3909,9 +4125,9 @@ } }, "node_modules/node-abi": { - "version": "3.59.0", - "resolved": "https://registry.npmmirror.com/node-abi/-/node-abi-3.59.0.tgz", - "integrity": "sha512-HyyfzvTLCE8b1SX2nWimlra8cibEsypcSu/Az4SXMhWhtuctkwAX7qsEYNjUOIoYtPV884oN3wtYTN+iZKBtvw==", + "version": "3.62.0", + "resolved": "https://registry.npmmirror.com/node-abi/-/node-abi-3.62.0.tgz", + "integrity": "sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g==", "optional": true, "dependencies": { "semver": "^7.3.5" @@ -3930,6 +4146,16 @@ "version": "1.0.0", "resolved": "https://registry.npmmirror.com/node-domexception/-/node-domexception-1.0.0.tgz", "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "github", + "url": "https://paypal.me/jimmywarting" + } + ], "engines": { "node": ">=10.5.0" } @@ -3945,6 +4171,10 @@ }, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/node-fetch" } }, "node_modules/node-forge": { @@ -3984,6 +4214,9 @@ }, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/npm-run-path/node_modules/path-key": { @@ -3992,6 +4225,9 @@ "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/numeral": { @@ -4013,7 +4249,10 @@ "node_modules/object-inspect": { "version": "1.13.1", "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==" + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/oidc-token-hash": { "version": "5.0.3", @@ -4052,6 +4291,9 @@ }, "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/open": { @@ -4066,6 +4308,9 @@ }, "engines": { "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/openid-client": { @@ -4077,6 +4322,9 @@ "lru-cache": "^6.0.0", "object-hash": "^2.2.0", "oidc-token-hash": "^5.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/panva" } }, "node_modules/openid-client/node_modules/lru-cache": { @@ -4134,6 +4382,9 @@ }, "engines": { "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/path-scurry/node_modules/lru-cache": { @@ -4203,6 +4454,9 @@ }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/pretty-repl/node_modules/chalk": { @@ -4215,6 +4469,9 @@ }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, "node_modules/pretty-repl/node_modules/color-convert": { @@ -4296,6 +4553,9 @@ }, "engines": { "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/range-parser": { @@ -4370,6 +4630,9 @@ }, "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/run-applescript/node_modules/execa": { @@ -4389,6 +4652,9 @@ }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, "node_modules/run-applescript/node_modules/human-signals": { @@ -4405,6 +4671,9 @@ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/run-applescript/node_modules/mimic-fn": { @@ -4435,6 +4704,9 @@ }, "engines": { "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/run-applescript/node_modules/signal-exit": { @@ -4453,7 +4725,21 @@ "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] }, "node_modules/safer-buffer": { "version": "2.1.2", @@ -4597,6 +4883,9 @@ }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/signal-exit": { @@ -4605,18 +4894,49 @@ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "engines": { "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/simple-concat": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/simple-concat/-/simple-concat-1.0.1.tgz", "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], "optional": true }, "node_modules/simple-get": { "version": "4.0.1", "resolved": "https://registry.npmmirror.com/simple-get/-/simple-get-4.0.1.tgz", "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], "optional": true, "dependencies": { "decompress-response": "^6.0.0", @@ -4687,6 +5007,9 @@ }, "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/string-width-cjs": { @@ -4714,6 +5037,9 @@ "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, "node_modules/string-width/node_modules/strip-ansi": { @@ -4725,6 +5051,9 @@ }, "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/strip-ansi": { @@ -4756,6 +5085,9 @@ "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/strip-json-comments": { @@ -4866,6 +5198,9 @@ "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==", "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/to-fast-properties": { @@ -4944,6 +5279,20 @@ "version": "1.0.13", "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "dependencies": { "escalade": "^3.1.1", "picocolors": "^1.0.0" @@ -4973,6 +5322,10 @@ "version": "9.0.1", "resolved": "https://registry.npmmirror.com/uuid/-/uuid-9.0.1.tgz", "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], "bin": { "uuid": "dist/bin/uuid" } @@ -5053,6 +5406,9 @@ }, "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, "node_modules/wrap-ansi-cjs": { @@ -5067,6 +5423,9 @@ }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { @@ -5078,6 +5437,9 @@ }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/wrap-ansi-cjs/node_modules/color-convert": { @@ -5120,6 +5482,9 @@ "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, "node_modules/wrap-ansi/node_modules/ansi-styles": { @@ -5128,6 +5493,9 @@ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/wrap-ansi/node_modules/strip-ansi": { @@ -5139,6 +5507,9 @@ }, "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/wrappy": { diff --git a/third_party/nixpkgs/pkgs/development/tools/mongosh/source.json b/third_party/nixpkgs/pkgs/development/tools/mongosh/source.json index 0c87fa71e6..c8989a8a2b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mongosh/source.json +++ b/third_party/nixpkgs/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.2.4", - "integrity": "sha512-1T+ZwhdUrB8kk08zbyJr4cengVOyNdgKwRT4JXUvJCn9vvJoVSlAzsttn8Nlmj5IC6R6AijBsFlkF3wnuVKbZQ==", - "filename": "mongosh-2.2.4.tgz", - "deps": "sha256-87LGwA2sdmY/acH6Byziu1/xGV8c5PUZnp7cKVgOf+4=" + "version": "2.2.5", + "integrity": "sha512-kQ9X6xgWgE91whL8JMpLzucSiCFO+eCAH5BRiKJfvZOSUkG3VGc+JvRiffbtqq2KAA5nex4u0xEAl/SwlroPkg==", + "filename": "mongosh-2.2.5.tgz", + "deps": "sha256-PD3H45WEDP/DoCHCQuDNh/5Znca6f3TAOJL4wtQOnXI=" } diff --git a/third_party/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix index a7b3c36d87..5b3bc7b147 100644 --- a/third_party/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/msgpack-tools/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Command-line tools for converting between MessagePack and JSON"; homepage = "https://github.com/ludocode/msgpack-tools"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ alibabzo ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix index fe8ad46fe2..96b51392f1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix @@ -37,16 +37,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell"; - version = "8.0.36"; + version = "8.0.37"; srcs = [ (fetchurl { - url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-9PJwa5WKinOA72yVjdlyMHvb7qRR76/DQuTEbim36d0="; + url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; + hash = "sha256-4GOgkazZ7EC7BfLATfZPiZan5OJuiDu2UChJ1fa0pho="; }) (fetchurl { - url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-s0+7dbcLcgS8u/6p7vpVAV9sR2gf2j9VDnSCJvw77fQ="; + url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-UtZ7/Ip5h9CXKy3lkSt8/TXJgbPPUO73rMSIFPfX0Is="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/nemiver/default.nix b/third_party/nixpkgs/pkgs/development/tools/nemiver/default.nix index af02246582..c63761f23a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nemiver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nemiver/default.nix @@ -17,7 +17,7 @@ , gtksourceview , gsettings-desktop-schemas , gtksourceviewmm -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { intltool itstool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -54,15 +54,15 @@ stdenv.mkDerivation rec { patches = [ # build fixes (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/nemiver/commit/e0e42221ceb77d88be64fac1c09792dc5c9e2f43.patch"; + url = "https://gitlab.gnome.org/Archive/nemiver/-/commit/e0e42221ceb77d88be64fac1c09792dc5c9e2f43.patch"; sha256 = "1g0ixll6yqfj6ysf50p0c7nmh3lgmb6ds15703q7ibnw7dyidvj8"; }) (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/nemiver/commit/7005393a8c4d914eac9705e7f47818d0f4de3578.patch"; + url = "https://gitlab.gnome.org/Archive/nemiver/-/commit/7005393a8c4d914eac9705e7f47818d0f4de3578.patch"; sha256 = "1mxb1sdqdj7dm204gja8cdygx8579bjriqqbb7cna9rj0m9c8pjg"; }) (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch"; + url = "https://gitlab.gnome.org/Archive/nemiver/-/commit/262cf9657f9c2727a816972b348692adcc666008.patch"; sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7"; }) ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Nemiver"; + homepage = "https://gitlab.gnome.org/Archive/nemiver"; description = "Easy to use standalone C/C++ debugger"; mainProgram = "nemiver"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix b/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix index 7ada7365eb..d66197d7f6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nwjs/default.nix @@ -17,6 +17,7 @@ , lib , libcap , libdrm +, libGL , libnotify , libuuid , libxcb @@ -31,7 +32,7 @@ , stdenv , systemd , udev -, wrapGAppsHook +, wrapGAppsHook3 , xorg }: @@ -55,6 +56,7 @@ let gtk3 libcap libdrm + libGL libnotify libxkbcommon mesa @@ -85,7 +87,7 @@ let extraOutputsToInstall = [ "lib" "out" ]; }; - version = "0.85.0"; + version = "0.87.0"; in stdenv.mkDerivation { pname = "nwjs"; @@ -96,16 +98,16 @@ stdenv.mkDerivation { in fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-${flavor}v${version}-linux-${bits}.tar.gz"; hash = { - "sdk-ia32" = "sha256-QcFKX+TLRBYAMt5oUYoVMfBgGFZZ/4pdhhtNI0OxF/M="; - "sdk-x64" = "sha256-Wqq0iI5VLa/hJLTNF10YpFTtLRP6okjCC2EzlXxeuWI="; - "ia32" = "sha256-st/J/Zejo3R0dKxxdM7XBvmAlfsO2+2i5lYlAv9A5lY="; - "x64" = "sha256-hxSyzNEH6UJVejUqoG01vpJxb319wrLgp7uyF6Pt5YQ="; + "sdk-ia32" = "sha256-We4tSI8rQbEIoxNgTP/IkL/sD7GegVQDAtXUSY4AoB0="; + "sdk-x64" = "sha256-pWsNVHNm1gVAy9ofZ6g1Im5TpzxM2bmJ6RENa21N4qM="; + "ia32" = "sha256-ExxzzErT3GBI1yLYycojDkzKZ2VuvsOjaingQiK1Kww="; + "x64" = "sha256-tKm3aTlfPuevdjqFFEVU6nvIixoBDUcnJPFyO1PNRqE="; }."${flavor + bits}"; }; nativeBuildInputs = [ autoPatchelfHook - (wrapGAppsHook.override { inherit makeWrapper; }) + (wrapGAppsHook3.override { inherit makeWrapper; }) ]; buildInputs = [ nwEnv ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix index d6d3863afa..c9f1c6f7eb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://dune.build/"; description = "A composable build system"; - maintainers = [ maintainers.vbgl maintainers.marsam ]; + maintainers = [ maintainers.vbgl ]; license = licenses.mit; inherit (ocaml.meta) platforms; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix index 0d2d3b7d53..ffed78c7a8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "A composable build system"; mainProgram = "dune"; changelog = "https://github.com/ocaml/dune/raw/${version}/CHANGES.md"; - maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ]; + maintainers = [ lib.maintainers.vbgl ]; license = lib.licenses.mit; inherit (ocaml.meta) platforms; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix index 42d13fcbb3..a915829599 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.15.0"; + version = "3.15.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-tcPRD29gSL+vVvxPCULVY4G1WvQofK+CUUh9TE55INc="; + hash = "sha256-+VmYBULKhZCbPz+Om+ZcK4o3XzpOO9g8etegfy4HeTM="; }; nativeBuildInputs = [ ocaml findlib ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "A composable build system"; mainProgram = "dune"; changelog = "https://github.com/ocaml/dune/raw/${version}/CHANGES.md"; - maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ]; + maintainers = [ lib.maintainers.vbgl ]; license = lib.licenses.mit; inherit (ocaml.meta) platforms; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix index 98e8b06e79..1c8897cb3d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "ocp-index"; - version = "1.3.5"; + version = "1.3.6"; minimalOCamlVersion = "4.08"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "OCamlPro"; repo = "ocp-index"; rev = version; - hash = "sha256-Zn3BPaMB68V363OljFFdmLyYf+S0wFJK44L8t1TSG1Q="; + hash = "sha256-EgRpC58NBVFO1w0xx11CnonatU2H7bECsEk6Y4c/odY="; }; nativeBuildInputs = [ cppo ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix index a60b12667f..60360abbed 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix @@ -139,7 +139,7 @@ in stdenv.mkDerivation { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES"; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; license = licenses.lgpl21Only; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl index 412a1a30e7..a3f1bc9219 100755 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -129,7 +129,7 @@ print <<'EOF'; description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES"; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; license = licenses.lgpl21Only; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix index 07354161c1..50789530be 100644 --- a/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.25.4"; + version = "2.26.1"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-F3tvk3vC6h8fJ2hZMKo2eQ0uUj0UsK7MEujo//wXJi0="; + hash = "sha256-bWyerkXmAto0c/LYybUSRctajmL1R0PldfpKsh8crfA="; }; - vendorHash = "sha256-+Adnveutg8soqK2Zwn2SNq7SEHd/Z91diHbPYHrGVrA="; + vendorHash = "sha256-cYiyKNpsMfjqLL+6Q/s3nHRcj2y0DHuOu+S5GndLHxk="; postPatch = '' # Disable some tests that need file system & network access. @@ -33,6 +33,10 @@ buildGoModule rec { export HOME=$(mktemp -d) ''; + checkFlags = [ + "-skip=TestCreateDockerfile" # Skip flaky test + ]; + postInstall = '' installShellCompletion --cmd okteto \ --bash <($out/bin/okteto completion bash) \ @@ -47,9 +51,9 @@ buildGoModule rec { meta = with lib; { description = "Develop your applications directly in your Kubernetes Cluster"; - mainProgram = "okteto"; homepage = "https://okteto.com/"; license = licenses.asl20; maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "okteto"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ols/default.nix b/third_party/nixpkgs/pkgs/development/tools/ols/default.nix index 963fbaef56..d4ad7f36dc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ols/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ols/default.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchFromGitHub, makeBinaryWrapper, odin, lib }: +{ stdenv, fetchFromGitHub, makeBinaryWrapper, unstableGitUpdater, odin, lib }: stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-04-15"; + version = "0-unstable-2024-05-06"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "aa1aabda1cce68a6038c48429cc759f09ad2ebab"; - hash = "sha256-yM+Syx8hWiSZatWfFFGz8lUJTOCozkZWPdPUhRW0/Ow="; + rev = "5c646656e988ddcdaee09f1bea666dc00ea2ea4d"; + hash = "sha256-W8D+szu4+mDYwDLWvGRL3ICZ9Dr93pFweEO2+0awHfo="; + }; + + passthru.updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix b/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix index 568b6a172c..641dd140d8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-3rMSk4oRqPWqJh4o+oGtfqpEz4zkr4CVaIyMvBopN/o="; + sha256 = "sha256-flmTVEEM0vEU4Aul7+PPo0ut1xv63l4HljEPXSPd6SU="; }; - vendorHash = "sha256-ZP4EM7NZwfTLx0e47DikgMI7Y+IYmREdLL/r/CC9P7c="; + vendorHash = "sha256-XmJafFW5Hb8A8mKz/ewJIKMQ5hiZlAJk2yFdTB3VxNg="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index c175d788b3..146a2e0c3b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.63.0"; + version = "0.64.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-yXYyRl0ZDgS6eB2pB0Iqi3DiBGcIO3Vdet9RLSOczkU="; + hash = "sha256-IIW6AXv5x+uQGCZulPPB7IhRlCq7Ww76qUhMHg3Fx7g="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix index 529d9b69ed..b4c2afb080 100644 --- a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "packer"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-/ViyS7srbOoZJDvDCRoNYWkdCYi3F1Pr0gSSFF0M1ak="; + hash = "sha256-oLN7FU7Er0GnfOhoKd0bSsiB7uZsr2BNL3aSDrWJEUw="; }; - vendorHash = "sha256-JNOlMf+PIONokw5t2xhz1Y+b5VwRDG7BKODl8fHCcJY="; + vendorHash = "sha256-2YsFwWalMhbZP4vdEQguCijGC9kCiqDpfZCAKVOk5bs="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index 97554e53de..14f5e32b50 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchgit , fetchFromGitHub +, nix-update-script , runCommand , which , rustPlatform @@ -26,8 +27,8 @@ let # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions) # 4) run the ./result script that is output by that (it updates ./grammars) - version = "0.22.2"; - hash = "sha256-RhM3SgsCb8eLs56cm8/Yo1ptNnFrR21FriHAlMdvdrU="; + version = "0.22.5"; + hash = "sha256-f8bdpiPNo5M8aefTmrQ2MQVg7lS0Yq7j312K1slortA="; src = fetchFromGitHub { owner = "tree-sitter"; @@ -62,6 +63,7 @@ let }; grammars' = import ./grammars { inherit lib; } // extraGrammars; grammars = grammars' // + { tree-sitter-latex = grammars'.tree-sitter-latex // { generate = true; }; } // { tree-sitter-ocaml = grammars'.tree-sitter-ocaml // { location = "grammars/ocaml"; }; } // { tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // { location = "grammars/interface"; }; } // { tree-sitter-org-nvim = grammars'.tree-sitter-org-nvim // { language = "org"; }; } // @@ -110,7 +112,7 @@ rustPlatform.buildRustPackage { pname = "tree-sitter"; inherit src version; - cargoHash = "sha256-QWqg84naOIPhkHj2yLchZVb2gvjL9+AEK2rRK7K8uQY="; + cargoHash = "sha256-Fk6V/kPKc/GL/q6QsaCUrq+ZG0R+N5FLOpIm77Y+n2A="; buildInputs = lib.optionals stdenv.isDarwin [ Security CoreServices ]; @@ -158,6 +160,8 @@ rustPlatform.buildRustPackage { }; inherit grammars buildGrammar builtGrammars withPlugins allGrammars; + updateScript = nix-update-script { }; + tests = { # make sure all grammars build builtGrammars = lib.recurseIntoAttrs builtGrammars; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json index 190dda2ee3..b17e5ca895 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json @@ -1,10 +1,10 @@ { "url": "https://github.com/thehamsta/tree-sitter-commonlisp", - "rev": "cf10fc38bc24faf0549d59217ff37c789973dfdc", - "date": "2023-11-19T14:17:12+01:00", - "path": "/nix/store/91kc23ng7axqzd4xjiwrgij1mpriq459-tree-sitter-commonlisp", - "sha256": "1nq5cvf557w3vwr7rjzdgqcpcs3ikp1x5cs00f8z5n9hgdk1lvry", - "hash": "sha256-Pm8aZnsw2fKRA0Cz0sOdcWh2GX7ty3wy34OfUtxmBds=", + "rev": "25856774aaab983c573bb2f9cc1ebbc97941f7b9", + "date": "2024-04-06T22:22:41+02:00", + "path": "/nix/store/mlji0h6k2x17jni9q3y571dmk5k4xi85-tree-sitter-commonlisp", + "sha256": "12fh2sinasnfp6rfq5d9qq24nfg55bclc5rp8mnw3a2ccyc5icis", + "hash": "sha256-OrJYmGdMqMFtRTcXRtkq5TlLBMapFeyyuc5qZaMW0Ik=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 4ba7b97a57..53a829c4a9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "e0c1678a78731e78655b7d953efb4daecf58be46", - "date": "2024-02-18T08:20:42-05:00", - "path": "/nix/store/dw86n9mqgfn9ymlbr7s7h05dvf8q867i-tree-sitter-cpp", - "sha256": "0fjxjm3gjqvcjqgjyq6lg6sgyy0ly69dinq33rmy56806da45lq9", - "hash": "sha256-CdNCVDMAmeJrHgPb2JLxFHj/tHnUYC8flmxj+UaVXTo=", + "rev": "72fd00128f1c38319670cbf4bcedbba0dc849d96", + "date": "2024-04-14T21:38:58-04:00", + "path": "/nix/store/sy0ln7q947bv9k313q4z6kkibl2zgdi1-tree-sitter-cpp", + "sha256": "0qaa48gq4n3300apwx1mdcwqnfg59q8bdj88c3ssd45pr1n47s88", + "hash": "sha256-COlDbMi3kKb1YAjJthBO5TmLOWs1dH4VAGNYgh8iSmE=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json index 376d5f83bf..54bbe3214f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json @@ -1,10 +1,10 @@ { "url": "https://github.com/thehamsta/tree-sitter-cuda", - "rev": "221179d4287a2c24c08e4c67ff383ef67dc32156", - "date": "2024-02-20T23:55:20+01:00", - "path": "/nix/store/x8sqw6njbai4x9jlx6zn0mamvfjpcxy9-tree-sitter-cuda", - "sha256": "0n4c79iq5izdjrb50f5af02jkzfn6mp3kvr0iajfhxlj3x64ykbv", - "hash": "sha256-e01PTB+SduikiiDvOW411v0pBXCqOFBWlu3HgmM6jFg=", + "rev": "4ec5afdf98041d137c25b555958a1f825c7c1272", + "date": "2024-04-02T22:40:43+02:00", + "path": "/nix/store/2n6dkgdvhfd34qa48b5824qbw1pc7899-tree-sitter-cuda", + "sha256": "1n840xzsx56w3hys263f216ih901jh456yxdmm0i274ijwngn38h", + "hash": "sha256-EA37LJeRHBFBra17UwiUASQYTRBuGKE9HNyUrn8HBNk=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json index 0cf8d54a9f..f492de75ad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json @@ -1,10 +1,10 @@ { "url": "https://github.com/usernobody14/tree-sitter-dart", - "rev": "1a31399a08aefc93bc4cdbfadc0cb619136f86c1", - "date": "2024-02-10T18:16:57-07:00", - "path": "/nix/store/4pdnic3kb0856ajy2xfbxdn84lflvbw1-tree-sitter-dart", - "sha256": "0nx4hvvx239prxckddbcgadvk894lxl4ycmxxg7m30j2sp6a6049", - "hash": "sha256-iQCjzNVCglHP670yT2inJKG5m3pstTZZzzcN0feGpFs=", + "rev": "6da46473ab8accb13da48113f4634e729a71d335", + "date": "2024-04-07T18:27:24-06:00", + "path": "/nix/store/v04h2p45ngm7llrckpkkbnvj9m5763vm-tree-sitter-dart", + "sha256": "1jxz4s0j8pmjxl7cz7s9blzqhr1w5jannxihidqrd6dqxawc6gh1", + "hash": "sha256-AT7DuOq4mZZxizB2a5UsPGSIP11Jn88O7bJeJIEmv8s=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json index 70e129ea41..405fd17482 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json @@ -1,10 +1,10 @@ { "url": "https://github.com/elixir-lang/tree-sitter-elixir", - "rev": "11426c5fd20eef360d5ecaf10729191f6bc5d715", - "date": "2023-12-04T13:06:21+07:00", - "path": "/nix/store/l3868ga8dvvq06k7px3k9i3kpynfjmis-tree-sitter-elixir", - "sha256": "1fqsvqdjscmjj7vaq3mgs6j49m3412g5i9jrm1r61n1d8yrg3mzy", - "hash": "sha256-/tfxskct2GByqFmmWJ4IZNREpNGvDqz2kbIyLRveGrs=", + "rev": "de690fa8a028f122af46d9d2685679fe5f2d7d60", + "date": "2024-04-08T19:02:42+02:00", + "path": "/nix/store/q46fy2kd4gvab4bpfv3zacg4qgkfc6dz-tree-sitter-elixir", + "sha256": "03fg2qj0i3n1dx8abkngg4nxqwpz86m5nr7q70hp5jw5bxccxxkf", + "hash": "sha256-bvbOWF+Fy3IhOPhkW6pB/3LcLXnPzqVQb8GOCCQWzw0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json index a104711755..f1e8bc7cca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json @@ -1,10 +1,10 @@ { "url": "https://github.com/ram02z/tree-sitter-fish", - "rev": "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9", - "date": "2023-02-12T14:42:20+00:00", - "path": "/nix/store/hg229jskwvgmfgi9awznvp9cj5riacay-tree-sitter-fish", - "sha256": "1yxvibmmpkwswwrg1mzvcnfj6y0rpccrwyg27k4wpr2630ma9xcw", - "hash": "sha256-nPWkKhhG5MvJPOJ5nhm7GXgjnWX71/Ay55rPW+uKu/s=", + "rev": "a78aef9abc395c600c38a037ac779afc7e3cc9e0", + "date": "2024-04-02T18:45:18+01:00", + "path": "/nix/store/v0bvl4iadrl1fzr617s72rlk2d214ak9-tree-sitter-fish", + "sha256": "0nmdwxw8wbqc9nm1p30s91p6mh8qp7w5wnw7lpz6fy6hq5k3gfqg", + "hash": "sha256-D7s3ZsHQeGf+pYdbXvi5GMFqbkgajBuqTQwvjnjnrVo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json index 0cf5f37e53..eb12bf0a26 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json @@ -1,10 +1,10 @@ { "url": "https://github.com/thehamsta/tree-sitter-glsl", - "rev": "284bed0e2f1d9f700756b96512baf33483642ff0", - "date": "2024-02-15T22:49:15+01:00", - "path": "/nix/store/vqnsavpda33cbzvfwk28cqz24m5lwrl7-tree-sitter-glsl", - "sha256": "1vcllf58mk1c1fiwh2amcjkgmq5m9dyhawvm744fx9phf0qlqb57", - "hash": "sha256-pyxMMXDwpu4IOXVzBX1LteD6pmRVCcijCyzMioqjlO0=", + "rev": "e7817c982e0e921c5ee89a1e0283121bb5cc5e01", + "date": "2024-04-14T19:48:45+02:00", + "path": "/nix/store/fs5zdqn1lilbd6f0g6kgjjl35dli61fv-tree-sitter-glsl", + "sha256": "1gxg9d3i7iyzxv0sijllbl57dl7ai7z48f1639xd8ljhwl7yyim6", + "hash": "sha256-pkbvD+VQUtR6GiY4RP6J6tB2Cl2UyqjB7t/HE0dLr78=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index a41c8bc056..f0bb177216 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "6b5ec205c9d4f23eb36a163f1edc4f2db8c98e4a", - "date": "2024-02-26T15:02:24+01:00", - "path": "/nix/store/ia666bffpywmack992f64jid4321fvdq-tree-sitter-haskell", - "sha256": "1d3klbflb1xl234s6pw874j1d5r82bkx5jdi7il1irfvhgdkjljc", - "hash": "sha256-TFI524Pb5RhoPLHJ0ucSKJcWJDmIX6PJELSHRd2ic7Q=", + "rev": "95a4f0023741b3bee0cc500f3dab9c5bab2dc2be", + "date": "2024-03-24T15:47:21+01:00", + "path": "/nix/store/ay1m5h51pp7p84hh5mlmxir8fsr68bs5-tree-sitter-haskell", + "sha256": "0kwbknxk8f6824bijqqkmlfg04074v31ava8qsf97bqsgs6039vf", + "hash": "sha256-bqcBjH4ar5OcxkhtFcYmBxDwHK0TYxkXEcg4NLudi08=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 7b03a81327..67e30dd121 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "de1e682289a417354df5b4437a3e4f92e0722a0f", - "date": "2024-03-10T11:12:05-04:00", - "path": "/nix/store/8p9li6jcc247jzpy0x3cr4iskfyhqwmi-tree-sitter-javascript", - "sha256": "1mvvc6cv46zyhxhdjycmj7746hbss7lxcxks61bzrh229nlrh6hy", - "hash": "sha256-HhqYqU1CwPxXMHp21unRekFDzpGVedlgh/4bsplhe9c=", + "rev": "ac10a11e0c8db512f70e6b798260d2516d22454c", + "date": "2024-04-07T02:36:56-04:00", + "path": "/nix/store/b5fahwmcx0riy3bfaarlggncfgfkhx38-tree-sitter-javascript", + "sha256": "1f0k7mk785ijppw1swcrilr5bl2nddi7hifml431y4lsqm7y6kmg", + "hash": "sha256-r07jT8WaEh8GodVFeGJrVtBVMo2ZcR34vTIWdGY9E7g=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json index 00991afc31..3a43b67184 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-json", - "rev": "3b129203f4b72d532f58e72c5310c0a7db3b8e6d", - "date": "2024-02-23T13:05:26-08:00", - "path": "/nix/store/03dv24dlqkds0k1vjchzq6n8v6wys3ix-tree-sitter-json", - "sha256": "0rnfhmhr76fjlc6zzbxzrxrxa1xxpkg1jgq7vdw4630l1cg2nlbm", - "hash": "sha256-dVErHgsUDEN42wc/Gd68vQfVc8+/r/8No9KZk2GFzmY=", + "rev": "80e623c2165887f9829357acfa9c0a0bab34a3cd", + "date": "2024-04-07T15:21:58-04:00", + "path": "/nix/store/9cixfhx0x72pvn0ak349cbbzvhzlvhll-tree-sitter-json", + "sha256": "0mjphf34k5d0h28wwafwljk486h5mzx30dqdxz23lcmvnh0s79y1", + "hash": "sha256-waejAbS7MjrE7w03MPqvBRpEpqTcKc6RgKCVSYaDV1Y=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json index b94837ef46..d55e2ca470 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-julia", - "rev": "e84f10db8eeb8b9807786bfc658808edaa1b4fa2", - "date": "2024-02-14T19:03:11-05:00", - "path": "/nix/store/wv5r1xw2f3bfk4rqg660m6pqkwfdin68-tree-sitter-julia", - "sha256": "1fqirr8yjwmjy5dnfxk0djafq0hnl18mf28i7zg2gsfvy9a27d4f", - "hash": "sha256-jrQjVPLb6SfePxEJV1GgFgLslGxgdmdb8bJy6VHOEbs=", + "rev": "0a80d33aca49dd257625ab25ef3a506e2b99a554", + "date": "2024-04-14T10:47:45-07:00", + "path": "/nix/store/zi4q89960k33nkic7wm19fiq05bhx2bq-tree-sitter-julia", + "sha256": "057hg3v4rzzq19swb2mv2zlxp8zd746zxklxc0vw1i1fkr2x34yi", + "hash": "sha256-0ZPRRZ4uxMA3YJ3O/g057aPb6Re7isV1Cvj/TPZ48BQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json index e1b2ed4e16..8e480f72a4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json @@ -1,10 +1,10 @@ { "url": "https://github.com/IndianBoy42/tree-sitter-just", - "rev": "442538ab5ae0913b05e0269a988b4d452dfa5361", - "date": "2024-03-19T12:21:46-05:00", - "path": "/nix/store/ibqsrr59gr2ww1z5f9vr4q2fdvz9gmmy-tree-sitter-just", - "sha256": "1zcc7qsapcq8rs0myknx8bd8svcb18gwgpcqzh5jw1cf1c45yryr", - "hash": "sha256-2WdfCAuOBS4L/Jjdxx8Ki22N2kLdTl+BzgizqzQ+jP0=", + "rev": "6c2f018ab1d90946c0ce029bb2f7d57f56895dff", + "date": "2024-03-22T16:21:21-05:00", + "path": "/nix/store/8p22m5p2clrcc563v2z6pmhnhh03yyvg-tree-sitter-just", + "sha256": "0752hfkkqk92g0s68b01wf5d5q2y7aw87wsj8kz2vxkbj0i38x8j", + "hash": "sha256-EnU0IpBr9i3+RFLzg7g6XuDSiuMBLGQ0eCJNPKeDohw=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index 1ae0d28cde..9e6eb0167e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -1,10 +1,10 @@ { "url": "https://github.com/latex-lsp/tree-sitter-latex", - "rev": "8c75e93cd08ccb7ce1ccab22c1fbd6360e3bcea6", - "date": "2022-10-26T10:55:26+02:00", - "path": "/nix/store/zhx1vnr3xdrb0ry6kfjsfrzs6c3nf8i9-tree-sitter-latex", - "sha256": "0lc42x604f04x3kkp88vyqa5dx90wqyisiwl7nn861lyxl6phjnf", - "hash": "sha256-zkp4De2eBoOsPZRHHT3mIPVWFPYboTvn6AQ4AkwXhFE=", + "rev": "a834712c5e04029a451a262456bf6290b8ef6f37", + "date": "2024-04-01T14:31:04+02:00", + "path": "/nix/store/kn3vkfnysm170wc1dbjmb5y69hdlmyb4-tree-sitter-latex", + "sha256": "18dyda7299imb6i2jnjpr7z2jdrjn804c3958nkkpxzzfhbq39h7", + "hash": "sha256-B6aBF3T/9zunRSUNRgCyMjcp/slXWimiWTWmJI5qvqE=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json index 68a671d810..6f9a1b4440 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json @@ -1,10 +1,10 @@ { "url": "https://github.com/MDeiml/tree-sitter-markdown", - "rev": "b2f01981a76e3251f5b660378136c248ed106b81", - "date": "2024-03-13T23:51:05+02:00", - "path": "/nix/store/z986603ky7a41d48i0rxkd23y5k1bxc7-tree-sitter-markdown", - "sha256": "183ig6p39wzlmb8vz5hyjr4787s03b8gsw5p210qxkl3xs46s37a", - "hash": "sha256-6gxtiO6Dzo5BELdw/dAaQB90SJYelr/RqvTzNK55caA=", + "rev": "62516e8c78380e3b51d5b55727995d2c511436d8", + "date": "2024-03-22T11:52:05+02:00", + "path": "/nix/store/4hi3bz1ny9dz3yq7mr6d74gsfmcnh9rw-tree-sitter-markdown", + "sha256": "08wl8y8xgrr10m1p6xpmv0jbmnif30wgd2q5m28ghh1v37q2ixfp", + "hash": "sha256-1/Uo8Bk7QPiQqAWL9jgYLtq6JNj1dnNDBSHn15FHlCM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index 9e3a8be40c..91c713dae0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,10 +1,10 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "763168fa916a333a459434f1424b5d30645f015d", - "date": "2023-12-26T15:36:50+13:00", - "path": "/nix/store/wvnrjnrb3dgc5pg5n8nkwxm43478nk2k-tree-sitter-nix", - "sha256": "0nn3ij8k6wkbf3kcvkyyp0vhfjcksi31wyyfwmsbx66maf2xgaii", - "hash": "sha256-MarXhVPVmL505c57HkbUk0kHN7jez83mcGtyM5GMw1o=", + "rev": "b3cda619248e7dd0f216088bd152f59ce0bbe488", + "date": "2024-04-03T09:38:13+02:00", + "path": "/nix/store/5rz41r1yycp0w3s947cjs3m9d9v1082r-tree-sitter-nix", + "sha256": "1xh75z11d1b514qm997br8vmxalir2ah1pk7v3k1ppm28043ggr1", + "hash": "sha256-Ib83CECi3hvm2GfeAJXIkapeN8rrpFQxCWWFFsIvB/Y=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json index 93f8737bb7..968e703cc3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nvim-neorg/tree-sitter-norg-meta", - "rev": "a479d1ca05848d0b51dd25bc9f71a17e0108b240", - "date": "2023-05-28T19:01:42+02:00", - "path": "/nix/store/7yp5rzpmdvyhhl38brhz0vl3gd9qv03y-tree-sitter-norg-meta", - "sha256": "1vvl39m41wgsq7xkfi523zx6nza03dkzgk6izc39igmwx5hsdl7f", - "hash": "sha256-7tCmYem8vpgG+9HM92cbQH1r+h+iRDf7wfrxQGoadO8=", + "rev": "6f0510cc516a3af3396a682fbd6655486c2c9d2d", + "date": "2024-04-13T19:12:46+02:00", + "path": "/nix/store/val14j7fz39yyqzp3xh2r7cbvfd1am4m-tree-sitter-norg-meta", + "sha256": "1vz74wc5yy5fykl9c3b16k6fsvskxp93acsy81p337jzg709v97j", + "hash": "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json index 2fa6470e2a..f9be1d8935 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nvim-neorg/tree-sitter-norg", - "rev": "014073fe8016d1ac440c51d22c77e3765d8f6855", - "date": "2023-10-02T20:20:59+02:00", - "path": "/nix/store/xi96cyvgn1443wf54ykc90y80fqdmgzv-tree-sitter-norg", - "sha256": "05zrcglnpvyqx0gczzkx05qc95y5n3slbhjig7dqjyxvphyzf0nk", - "hash": "sha256-0wL3Pby7e4nbeVHCRfWwxZfEcAF9/s8e6Njva+lj+Rc=", + "rev": "ceb44e4cdb58fbeea52301835bdd461817ddb57e", + "date": "2024-04-14T13:26:39+02:00", + "path": "/nix/store/gmzacfd1sbdbgvc26bnv3cpyl5l3csq9-tree-sitter-norg", + "sha256": "1jzk1wxqah5ajgpxmmbhrjk43hhk9vpg1f7v9wnj1xgp7zv4w6mv", + "hash": "sha256-uxpO9j/39SAtT/u48O5OE8JBpsxw1drvk6pAhTsP88s=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json index 7bb3fd3c6f..8a5f286af0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nushell/tree-sitter-nu", - "rev": "c5b7816043992b1cdc1462a889bc74dc08576fa6", - "date": "2024-03-09T11:27:22-06:00", - "path": "/nix/store/gcmmkjxfhf4y1qc3fvbaww5pfcdbjlhv-tree-sitter-nu", - "sha256": "0g9b7d6306z96x90w9v687nyws5jrh5jy2cm8yxhaz3xgq9v3s1z", - "hash": "sha256-P+ixE359fAW7R5UJLwvMsmju7UFmJw5SN+kbMEw7Kz0=", + "rev": "b090676f0205f52debb93745b9ad788385583276", + "date": "2024-04-14T14:09:50-05:00", + "path": "/nix/store/f8pjwwdy175mayqncxicn47lj7gw4vks-tree-sitter-nu", + "sha256": "10rmw80xzhpqhjhysfx13pkqzfm4a31wvvmq57wvrcrrrlqb982k", + "hash": "sha256-U6C0MM05s7z5KbjuzcNQpLqP5x2hO+2hhPjC3wHiNYM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json index 95e3bed434..d769f351e2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ocaml", - "rev": "dabe60a96553fbbda0a58b6ccda12b7d44047cb5", - "date": "2024-03-17T14:43:34+01:00", - "path": "/nix/store/sv3zz52xfyda4iwjwxfkyadg0bj1d2kj-tree-sitter-ocaml", - "sha256": "0pkw9bclbndcakaywdwj0ffvak78h68fjlbckdainfz99xgvg732", - "hash": "sha256-Ypy3X0/pOxtVm2xR6ZCB6Ey1nQOSN+7VVKzZRdlKfF4=", + "rev": "f7e63111ed1bc1908eacafe6af1ee8d01bfcf7ae", + "date": "2024-03-23T14:49:30+01:00", + "path": "/nix/store/p4awlsbz7b3xlbr9l785l7vi1rnxgxlr-tree-sitter-ocaml", + "sha256": "04vscg6lkhdnzs15r1yqwwmc2lj73x4h3nf4mfpkwq6g870i04wj", + "hash": "sha256-khMQwUHPYD6vq8TZAUkfR1LBKufYh1yC/rbBSc1jehM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json index 025f5005b9..385e00ceb5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json @@ -1,10 +1,10 @@ { "url": "https://github.com/ganezdragon/tree-sitter-perl", - "rev": "a882a928d4930716896039d1c10e91b6d7444c48", - "date": "2024-03-03T23:09:15+05:30", - "path": "/nix/store/6v3jxaiad68k4rak3ihqn1vxqah1pi85-tree-sitter-perl", - "sha256": "0ss26x37ldj4v6pwbijrz0hbnvj8xrm8cj3y1n1f2xanzvcalz15", - "hash": "sha256-JXyq2P5WdeGCDX5IhmruSG67IPhZxsWv2UQ2ekY3Qms=", + "rev": "93bd92a6af01113140f1a0b4c1845d22adae7ab6", + "date": "2024-03-29T09:45:26+05:30", + "path": "/nix/store/v4fhidwmxfihmkkq32a2xj75zs9fs9cd-tree-sitter-perl", + "sha256": "1ldbqjiyc4apls5gfc96lw6l4y53k5adk8knf1pp3ar2x2dl8v6y", + "hash": "sha256-3mxEm+giq3FvcHai2VSZo3hCDacmMfeKplcR5qPEq9E=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 257b3e4053..059ce3aed9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "b8a4c64121ba66b460cb878e934e3157ecbfb124", - "date": "2024-03-12T19:59:41-04:00", - "path": "/nix/store/qyvpyxlyxxmc1rwqvy14j9z1pjnpxbw9-tree-sitter-python", - "sha256": "12bgdbhkxl7lrca4257wnjks1m4z3mv5mzw5cfbyr91ypv59cfk5", - "hash": "sha256-ZTqWyr4+pOyXY4X/WnYdn9Sgp7T8FEEUy/TQPuFqb4k=", + "rev": "a22761025cdac6c314b7e3aa48fb44fa9e594d6a", + "date": "2024-04-05T08:52:41-04:00", + "path": "/nix/store/4zxxl74gpdm4y3dcaxxy831c5zay31bw-tree-sitter-python", + "sha256": "1kr3rj4wszpb1bz7xjn8v5cmkp6817d1iyficpdafglv7rx89a1g", + "hash": "sha256-L6iEej6bPqfaZdH5GNoJyNxZWdnIyn7+Cut+zYnMI88=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json index 80676906d8..b5ce91ba4c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nvim-treesitter/tree-sitter-query", - "rev": "176a380df78800167565118bb0dadfc961abbd43", - "date": "2024-03-07T12:57:53+02:00", - "path": "/nix/store/wa9dwqw4z7gcsnizch00sssjfl35arpf-tree-sitter-query", - "sha256": "0w0f3zymch27s923j4wkxjn2rfgf2qrhsrcrxf56nxmsgbbkdlvg", - "hash": "sha256-b9M213q6dmuK65llDTMW7rksrOyTEzlE0kdAVv0fDnA=", + "rev": "2e31ca2771f6042b0e4e0c41a6290014a9e1face", + "date": "2024-03-26T11:42:51+02:00", + "path": "/nix/store/d80f3x65zd87i9zpi7z2rh28a5f03n1k-tree-sitter-query", + "sha256": "0g8234yicidpjqc1rc7dvpx5ja49g938w451796nnn02chxa204i", + "hash": "sha256-kQChOmQCWGtNOqEQjkZ6iShZ+t3tsBwYlrdFFj0ZAj0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 20b895d5d9..3861a460d1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "3a56481f8d13b6874a28752502a58520b9139dc7", - "date": "2024-03-10T12:55:02-04:00", - "path": "/nix/store/91xc2kv7dql3waccf2ih7k55bjw03n4z-tree-sitter-rust", - "sha256": "12806974pngxqv1brj4r15yqzp2fdvid926n7941nylgmdw9f4z9", - "hash": "sha256-6ROXeKuPehtIOtaI1OJuTtyPfQmZyLzCxv3ZS04yAIk=", + "rev": "b77c0d8ac28a7c143224e6ed9b4f9e4bd044ff5b", + "date": "2024-04-08T18:09:37-04:00", + "path": "/nix/store/mzkmi2d933cn0imzhvfvm43rwzgv624n-tree-sitter-rust", + "sha256": "1i1and7lkrcpxkkm3y8p8v1d6wpb6z3b3vrxk9dlw84mwa03y97d", + "hash": "sha256-7SQ/gOKVIE5bmj3vscY363LTwkYX+VHn7JflSU+zKsQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json index bdb762ed83..7e08f32421 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json @@ -1,10 +1,10 @@ { "url": "https://github.com/6cdh/tree-sitter-scheme", - "rev": "184e7596ee0cbaef79230cae1b4ee5bb4fbad314", - "date": "2024-03-15T19:06:15+08:00", - "path": "/nix/store/wdhalppgf16xgcrm3llj0al5dimya5pc-tree-sitter-scheme", - "sha256": "0sqccw5az31di8jhb88v3afryiz7a4136g9a9xq8qni4znifw7y3", - "hash": "sha256-wx/uov0kWoxwTyo9MwJR50efnRoboQUlii2MrwpnDGs=", + "rev": "8f9dff3d038f09934db5ea113cebc59c74447743", + "date": "2024-04-12T09:33:55+08:00", + "path": "/nix/store/myg0q8bjsdzgq712skhxk1vf2gqqr7b0-tree-sitter-scheme", + "sha256": "1n9f9zala2mv7bllwjb2nsh2xsr56zjh7j09vxzd77jnb10rjh20", + "hash": "sha256-QECZQVhWntN+3wnIA+U3JesuoLZiSU7pOrsKRdVPLtk=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json index f777d50e6d..bc24e7aa10 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json @@ -1,10 +1,10 @@ { "url": "https://github.com/JoranHonig/tree-sitter-solidity", - "rev": "b239a95f94cfcc6e7b3e961bc73a28d55e214f02", - "date": "2024-03-12T10:13:22+00:00", - "path": "/nix/store/8bi3z4l3g890xgb7karzpqfinrcadk26-tree-sitter-solidity", - "sha256": "0kb8d6j81pv5bas7nfvq5wv12paicrv833d7iin5z0zy4y2fvqkg", - "hash": "sha256-b+LthCf+g19sjKeNgXZmUV0RNi94O3u0WmXfgKRpaE0=", + "rev": "c3da7d989747679305ec1c84b68082f01089d49f", + "date": "2024-04-13T15:44:09+02:00", + "path": "/nix/store/a9spnmq129v18p2mwh52ksnq8aj5ag0s-tree-sitter-solidity", + "sha256": "0ha57nxqina9jl2i1b0r38m971wk0lhxrivgb88yii0r07zdmp84", + "hash": "sha256-BN3a/gEZxOgRWm/H3CEFk4eTKhoZrBAFlUnZiLs9RUE=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json index 256888ebf3..9173e9300f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json @@ -1,10 +1,10 @@ { "url": "https://github.com/vrischmann/tree-sitter-templ", - "rev": "592faa3186ef857c92e4bd1c31d73c07a4a334db", - "date": "2024-02-06T21:43:24+01:00", - "path": "/nix/store/nqchnmjz07500x1s9fqrvkzrzvzjls5d-tree-sitter-templ", - "sha256": "1i26q3ci8w14c8z5lsibpbza0xwn7cp6hl46c52c98wvr0zpwzax", - "hash": "sha256-XX1+P8ibo8REYYZQaC47lneg/roralo+YiRwFNnARsQ=", + "rev": "1f9dae9c273136551684cb41461d00e565150e23", + "date": "2024-04-14T01:39:30+02:00", + "path": "/nix/store/swrbx6wrw3k022j2g7vq625zvjbmaxnr-tree-sitter-templ", + "sha256": "0w9kr1awc9f30mvidz4aysqs5wk3v93yam6ybb2d2jmmnv9kx5zj", + "hash": "sha256-8pc+07a1StHEWt5U5UfaY/KisfaK/BZ3BcMlxlXIM3E=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json index e42a0ec6fc..eda4e2a966 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tlaplus-community/tree-sitter-tlaplus", - "rev": "3896a5be761f04ffb22a841b2a0672f7a8a43ef9", - "date": "2024-03-11T11:12:33-04:00", - "path": "/nix/store/7dq157m7v3mq9iscmjbywm3sy1p9hgyh-tree-sitter-tlaplus", - "sha256": "0bjyf470anxialbmphn19r7pdnni181r45zyyfrl9db2fsgz3q0h", - "hash": "sha256-EODxn3ZitUSz8/4XkgMK0dp2T07BwlsXVbFbBQ5xXi4=", + "rev": "3c8ce503563ea04ba1cc07c468ed064b1974c3ba", + "date": "2024-04-12T21:02:56-04:00", + "path": "/nix/store/p9q0v9h09nf49ji1fnl3s87xsda7skmj-tree-sitter-tlaplus", + "sha256": "0vh0kdab362n1cm1nl1klqixshdzjnx5cxynadrmz021x2dx3xl7", + "hash": "sha256-h/bRm+hBgF9zU9Z3VrqVv0HdI6YzUBsqC1aYsVSbAG4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json index 4333285d9e..1a10518cbf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json @@ -1,10 +1,10 @@ { "url": "https://github.com/uben0/tree-sitter-typst", - "rev": "77e23188c3a4287f6ff37f545722ac872a260ee8", - "date": "2023-12-30T18:08:13+01:00", - "path": "/nix/store/0zb749g1r03b3wnzfb3p98y33vyd8ybn-tree-sitter-typst", - "sha256": "02k5y63wh1gsfpfczrc86gkjr9ip4zqn21wbf6mxmm6qhmr5vkvz", - "hash": "sha256-f89dcoXY1NqrcYsHYfEnN6Ys5zOI5c/cdfoFyIfxZQo=", + "rev": "13863ddcbaa7b68ee6221cea2e3143415e64aea4", + "date": "2024-04-09T11:57:57+02:00", + "path": "/nix/store/y02g3bdn5nwqiykfki4fhsxmkp7y9kjm-tree-sitter-typst", + "sha256": "198rn8wdcqq51nz6hj1zxk7mplplr2z8vc36z6h1zpjjq925794z", + "hash": "sha256-n6RTRMJS3h+g+Wawjb7I9NJbz+w/SGi+DQVj1jiyGaU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json index 83c5a7ad66..bb79674690 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json @@ -1,10 +1,10 @@ { "url": "https://github.com/winglang/wing", - "rev": "a43b5524b0adbb553d874a6ea8d08a2d791f56c5", - "date": "2024-03-21T08:10:44+00:00", - "path": "/nix/store/v4qvjygfjjx04c5jn0p96hx5zd3skvsx-wing", - "sha256": "1wqj0ilb9mqbghsby5ls0qm7jf5vi2zsihnwjnksj9lnrng368xh", - "hash": "sha256-sCMzns2WJqmnldzCqL+Iuzh5KgaaFr80fAvXtGgEEvM=", + "rev": "f0b6b11709eb2ed56e5ef76a9b6fcc98615683b8", + "date": "2024-04-15T06:16:09+00:00", + "path": "/nix/store/iz1a2mwxdx9zqgdds0rfy8apq9l36xpb-wing", + "sha256": "105q2w5a3mx8pd0k0jhr6p3fprd85jr7fz3ndkj48yb2m8x2r1is", + "hash": "sha256-OoYsOqpieUTkbHZ8d7IsqOXrxjUZSjBBu6jXoQoXuIA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/pet/default.nix b/third_party/nixpkgs/pkgs/development/tools/pet/default.nix index 3250107cbf..bf4b4f0e63 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pet"; - version = "0.7.0"; + version = "0.8.4"; src = fetchFromGitHub { owner = "knqyf263"; repo = "pet"; rev = "v${version}"; - sha256 = "sha256-2C87oqMyq85cbN2rq8aEkEyFC5IZCw75TMQSjzR+RrY="; + sha256 = "sha256-XFizQxegyMIAUEKT8/kzWyC4TWICMUE7SuHQsTNpK4w="; }; - vendorHash = "sha256-ebdPWKNL9i3sEGpfDCXIfOaFQjV5LXohug2qFXeWenk="; + vendorHash = "sha256-XvSg7EhFdK7wt1Eei56pj/emiE4qsVJkOpgPNsnDNc4="; ldflags = [ "-s" "-w" "-X=github.com/knqyf263/pet/cmd.version=${version}" diff --git a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix index 22e7116fb6..219b8b67d3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix @@ -46,7 +46,7 @@ perlPackages.buildPerlPackage rec { description = "A PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI"; homepage = "https://github.com/darold/pgFormatter"; changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}"; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; license = [ licenses.postgresql licenses.artistic2 ]; mainProgram = "pg_format"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix b/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix index 6adcf5529e..9deb33c757 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix @@ -1,43 +1,43 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; - version = "2.7.2"; + version = "2.7.3"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; - repo = pname; + repo = "pip-audit"; rev = "refs/tags/v${version}"; - hash = "sha256-IlIPLuHGmnmt6FgX+Psw+f6XpkuhP+BZ+e4k4DV8e/U="; + hash = "sha256-MRFfF5OygUCIdUnPvxhYk4IcLSWGgmlw2qgzPoZDniw="; }; - nativeBuildInputs = with python3.pkgs; [ - flit-core - ]; + build-system = with python3.pkgs; [ flit-core ]; - propagatedBuildInputs = with python3.pkgs; [ - cachecontrol - cyclonedx-python-lib - html5lib - packaging - pip-api - pip-requirements-parser - rich - toml - ] ++ cachecontrol.optional-dependencies.filecache; + dependencies = + with python3.pkgs; + [ + cachecontrol + cyclonedx-python-lib + html5lib + packaging + pip-api + pip-requirements-parser + rich + toml + ] + ++ cachecontrol.optional-dependencies.filecache; nativeCheckInputs = with python3.pkgs; [ pretend pytestCheckHook ]; - pythonImportsCheck = [ - "pip_audit" - ]; + pythonImportsCheck = [ "pip_audit" ]; preCheck = '' export HOME=$(mktemp -d); @@ -60,10 +60,10 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool for scanning Python environments for known vulnerabilities"; - mainProgram = "pip-audit"; homepage = "https://github.com/trailofbits/pip-audit"; changelog = "https://github.com/pypa/pip-audit/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "pip-audit"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/poac/default.nix b/third_party/nixpkgs/pkgs/development/tools/poac/default.nix index cb3be4ca90..13562e2672 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poac/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poac/default.nix @@ -95,9 +95,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ ]; platforms = platforms.unix; - # https://github.com/NixOS/nixpkgs/pull/189712#issuecomment-1237791234 - broken = (stdenv.isLinux && stdenv.isAarch64) - # error: excess elements in scalar initializer on std::aligned_alloc - || (stdenv.isDarwin && stdenv.isx86_64); + # error: call to 'format' is ambiguous + broken = true; # last successful build 2023-12-31 }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/prettierd/default.nix b/third_party/nixpkgs/pkgs/development/tools/prettierd/default.nix index 7e55e5be10..bf7ab9e692 100644 --- a/third_party/nixpkgs/pkgs/development/tools/prettierd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/prettierd/default.nix @@ -8,18 +8,18 @@ }: mkYarnPackage rec { pname = "prettierd"; - version = "0.25.1"; + version = "0.25.3"; src = fetchFromGitHub { owner = "fsouza"; repo = "prettierd"; rev = "v${version}"; - hash = "sha256-aoRfZ9SJazz0ir1fyHypn3aYqK9DJOLLVPMuFcOm/20="; + hash = "sha256-3lvFZ5/p+1kPnHIR2PlQtCY3SVo1rs8IuBigLaabxAE="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-HsWsRIONRNY9akZ2LXlWcPhH6N5qCKnesaDX1gQp+NU="; + hash = "sha256-Ti2b102pzUKB6Xy3LwZ7DlrnW0cRscgNLTUIAKz+6Us="; }; packageJSON = ./package.json; diff --git a/third_party/nixpkgs/pkgs/development/tools/prettierd/package.json b/third_party/nixpkgs/pkgs/development/tools/prettierd/package.json index 5ba4d09800..085e4ab73f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/prettierd/package.json +++ b/third_party/nixpkgs/pkgs/development/tools/prettierd/package.json @@ -1,6 +1,6 @@ { "name": "@fsouza/prettierd", - "version": "0.25.1", + "version": "0.25.3", "description": "prettier, as a daemon", "bin": { "prettierd": "./bin/prettierd" @@ -24,13 +24,13 @@ }, "homepage": "https://github.com/fsouza/prettierd", "devDependencies": { - "@types/node": "^20.6.3", + "@types/node": "^20.12.7", "@types/prettier": "^3.0.0", - "typescript": "^5.2.2" + "typescript": "^5.4.5" }, "dependencies": { - "core_d": "^6.0.0", - "prettier": "^3.0.3" + "core_d": "^6.1.0", + "prettier": "^3.2.5" }, "files": [ "bin", @@ -39,7 +39,7 @@ "README.md" ], "optionalDependencies": { - "@babel/parser": "^7.22.16", - "@typescript-eslint/typescript-estree": "^6.7.2" + "@babel/parser": "^7.24.4", + "@typescript-eslint/typescript-estree": "^7.6.0" } } diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix index e81446d7f1..eba53210aa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix @@ -5,20 +5,19 @@ buildGoModule rec { pname = "pprof"; - version = "unstable-2024-02-27"; + version = "0-unstable-2024-05-09"; src = fetchFromGitHub { owner = "google"; repo = "pprof"; - rev = "401108e1b7e7e113ef887df16b6227698eb5bb0f"; - hash = "sha256-TD285HHXkePQA2J9W/dEciK5tOLmvbDPr54KNXeE1b4="; + rev = "723abb6459b72e964cbfb3f7064446bf3bb321dc"; + hash = "sha256-zw9/xp5E5V/0D0pf5diWcx/SHX3ujwBtZNfH9tioiL0="; }; - vendorHash = "sha256-XOcOt+pe1lZj4XHafxROLslhyJk4mTC72yn7R1k2JCk="; + vendorHash = "sha256-bQyloQPfweK4PlrkO1IcCFjyctj99e8C9mQbCj+HCXQ="; meta = with lib; { description = "A tool for visualization and analysis of profiling data"; - mainProgram = "pprof"; homepage = "https://github.com/google/pprof"; license = licenses.asl20; longDescription = '' @@ -41,5 +40,7 @@ buildGoModule rec { This is not an official Google product. ''; + mainProgram = "pprof"; + maintainers = with maintainers; [ hzeller ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix index 96747b52a0..7359fbb136 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "45.1"; + version = "46.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Mju51YVhPWDEOUYDMUUAEfK5Cz1ScmJb2FjaTBnfLPk="; + hash = "sha256-c6p+deurPk4JRqBacj335u5CSeO56ITbo1UAq6Kh0XY="; }; nativeBuildInputs = [ @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "System-wide profiler for Linux"; - homepage = "https://wiki.gnome.org/Apps/Sysprof"; + homepage = "https://gitlab.gnome.org/GNOME/sysprof"; longDescription = '' Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open system call to profile the entire system, not just a single diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix index b5a0e80f0b..516aa5927b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "connectrpc"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-gYaOxUJzGcMKMrDdMou7mb66RVqChzSA1mc69O1zQv0="; + hash = "sha256-Ej8ya2sKtRVRQdMr63YpPbqzwtV0ZsqO+7xiif3gFr0="; }; - vendorHash = "sha256-+bWw4/ZqMeqnkXnV+vwq2mxgvew0KmLwNcu/xA2l4HI="; + vendorHash = "sha256-OKTRxExgJ2V3736fIVvQX3FEa44jGngwCi2D/uk0F58="; subPackages = [ "cmd/protoc-gen-connect-go" diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix index 53d7d43387..3fbd496792 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-entgrpc"; - version = "0.4.5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ent"; repo = "contrib"; rev = "v${version}"; - sha256 = "sha256-bEJjVNWd4NsUdWPqMZQ86U9F32q5M1iBRcS9MYDp9GE="; + sha256 = "sha256-fXvpPH4b1JG++z0KEm9BNu5pGkneefNVvi9R5R3FqB4="; }; - vendorHash = "sha256-DgqCGXqEnLBxyLZJrTRZIeBIrHYA7TNMV4WTk/3IS8Y="; + vendorHash = "sha256-SdUs2alcc4rA6CGIrnaLO7KCseP4a0v6WE58JcRGr0k="; subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix index 626d80eef5..cd2d261aa7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.33.0"; + version = "1.34.1"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - sha256 = "sha256-hA/UweNQSVzMeauIol73p9yYYCvnLcZNTYMrRWk9dBg="; + hash = "sha256-xbfqN/t6q5dFpg1CkxwxAQkUs8obfckMDqytYzuDwF4="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; diff --git a/third_party/nixpkgs/pkgs/development/tools/protolint/default.nix b/third_party/nixpkgs/pkgs/development/tools/protolint/default.nix index 36338a6658..7da6f7851f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protolint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protolint/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "protolint"; - version = "0.49.6"; + version = "0.49.7"; src = fetchFromGitHub { owner = "yoheimuta"; repo = pname; rev = "v${version}"; - hash = "sha256-wGAHc0I2ewXJeHPH2qO6V3ScixUAMIX5U7zCBi4fqew="; + hash = "sha256-XXF37r9p6cAU7q3bOzkwPpy2kKXKhp944d22jtJox7k="; }; - vendorHash = "sha256-0+GaTE/qKfPfZpkzUBglIXQoZD6fYkX6Z3QabkZ+IcE="; + vendorHash = "sha256-JmS80vAFP9tIyGjvASAEEY+0tk3SpNqXdZajvi9mH5E="; # Something about the way we run tests causes issues. It doesn't happen # when using "go test" directly: diff --git a/third_party/nixpkgs/pkgs/development/tools/prototool/default.nix b/third_party/nixpkgs/pkgs/development/tools/prototool/default.nix index d47676fd6f..c65dad2bb7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/prototool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/prototool/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { homepage = "https://github.com/uber/prototool"; description = "Your Swiss Army Knife for Protocol Buffers"; mainProgram = "prototool"; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix index 1255470fb7..45850671be 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.191.0"; + version = "0.197.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-+QGzLPJQbIql5Xomve/v3vGB5kdCDamxkRM6weIZMMw="; + sha256 = "sha256-Yjnq6ALbuvkYIOZ4CdBq1naTPGgT3aX0wRmREZpHo7I="; }; - vendorHash = "sha256-dcMKi12YFTpQShGRm97Zptiw9JK55CAXm0r8UG+c1Dg="; + vendorHash = "sha256-TdRfff342QvwjBC6B6/npbkvaH3o9CBKe2exu6TnT2o="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/default.nix b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/default.nix index 82d3be2fd4..b9d97c351b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/default.nix @@ -1,7 +1,9 @@ { haskell +, haskellPackages , lib # The following are only needed for the passthru.tests: +, spago , cacert , git , nodejs @@ -9,53 +11,47 @@ , runCommand }: -let - spago = - lib.pipe - haskell.packages.ghc90.spago - [ haskell.lib.compose.justStaticExecutables - (haskell.lib.compose.overrideCabal (oldAttrs: { - changelog = "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; - })) - ]; -in +lib.pipe + haskellPackages.spago + [ + haskell.lib.compose.justStaticExecutables -spago.overrideAttrs (oldAttrs: { - passthru = (oldAttrs.passthru or {}) // { - updateScript = ./update.sh; + (haskell.lib.compose.overrideCabal (oldAttrs: { + changelog = "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; - # These tests can be run with the following command. The tests access the - # network, so they cannot be run in the nix sandbox. sudo is needed in - # order to change the sandbox option. - # - # $ sudo nix-build -A spago.passthru.tests --option sandbox relaxed - # - tests = - runCommand - "spago-tests" - { - __noChroot = true; - nativeBuildInputs = [ - cacert - git - nodejs - purescript - spago - ]; - } - '' - # spago expects HOME to be set because it creates a cache file under - # home. - HOME=$(pwd) + passthru = (oldAttrs.passthru or {}) // { + updateScript = ./update.sh; - spago --verbose init - spago --verbose build - spago --verbose test + # These tests can be run with the following command. The tests access the + # network, so they cannot be run in the nix sandbox. sudo is needed in + # order to change the sandbox option. + # + # $ sudo nix-build -A spago.passthru.tests --option sandbox relaxed + # + tests = + runCommand + "spago-tests" + { + __noChroot = true; + nativeBuildInputs = [ + cacert + git + nodejs + purescript + spago + ]; + } + '' + # spago expects HOME to be set because it creates a cache file under + # home. + HOME=$(pwd) - touch $out - ''; - }; - meta = (oldAttrs.meta or {}) // { - mainProgram = "spago"; - }; -}) + spago --verbose init + spago --verbose build + spago --verbose test + + touch $out + ''; + }; + })) + ] diff --git a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix index e3636e16f5..d045508111 100644 --- a/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix +++ b/third_party/nixpkgs/pkgs/development/tools/purescript/spago/spago.nix @@ -9,16 +9,16 @@ , optparse-applicative, prettyprinter, process, QuickCheck, retry , rio, rio-orphans, safe, semver-range, stm, stringsearch, tar , template-haskell, temporary, text, time, transformers, turtle -, unliftio, unordered-containers, utf8-string, versions, with-utf8 -, zlib +, unliftio, unordered-containers, uri-encode, utf8-string, versions +, with-utf8, yaml, zlib }: mkDerivation { pname = "spago"; - version = "0.20.9"; + version = "0.21.0"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "00vdqg7vaw3d9zwh47886lw9fhhlwjagzhaj3aqz4xm92pjavhih"; - rev = "d16d4914200783fbd820ba89dbdf67270454faf5"; + sha256 = "1v5y15nhw6smnir0y7y854pa70iv8asxsqph2y8rz1c9lkz5d41g"; + rev = "c354f4a461f65fcb83aaa843830ea1589f6c7179"; fetchSubmodules = true; }; isLibrary = true; @@ -31,7 +31,7 @@ mkDerivation { optparse-applicative prettyprinter process retry rio rio-orphans safe semver-range stm stringsearch tar template-haskell temporary text time transformers turtle unliftio unordered-containers - utf8-string versions with-utf8 zlib + uri-encode utf8-string versions with-utf8 yaml zlib ]; executableHaskellDepends = [ ansi-terminal base text turtle with-utf8 @@ -43,4 +43,5 @@ mkDerivation { testToolDepends = [ hspec-discover ]; homepage = "https://github.com/purescript/spago#readme"; license = lib.licenses.bsd3; + mainProgram = "spago"; } diff --git a/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix b/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix index f55d7bb8fc..e93cb4cae9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-urF0glUR6W2jtT3Ek3OpbpmImiQrwHGbS1/pGuTcgyA="; + hash = "sha256-dzL0wFAm+wUEWX6a8cgZstgdi9NMmyeDIUI5pPjJpZI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix index 3843a989ec..a76d4e8244 100644 --- a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "13.0.0"; + version = "13.0.1"; src = fetchurl { url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-7BTwXycHFEVaLw1AuKqwLtkkHU+k8D6lOb/sWBnp4DY="; + hash = "sha256-gZAG0ZIfYcxnWYC8ydeVoiSM/XlhFdrUZqRFR1nasy4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix index b3119d83a0..32be89b90d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.5.2"; + version = "3.7.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-QlynZgmDd7m7m17J5lUTmejkKdQlfjiqcXg4ZMFp0vc="; + hash = "sha256-a3d1FtcXSLL8peveBagTEF6EcNADNDhnLAmyCfTW4+4="; }; - cargoHash = "sha256-TOuxJL2UtMA9mZLHZVQDD6lyL9VWy/HBNfezhOGbSG8="; + cargoHash = "sha256-fwraQd7dOamhc3Tp3yLxASWCVhDOxj4vX7oTTOufkeY="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rain/default.nix b/third_party/nixpkgs/pkgs/development/tools/rain/default.nix index 340dc3085a..8132c23704 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rain/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rain/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "rain"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AI7P5X9LNjXUQBkYTE0PCQ0xvK1CscVjnauoNVYp3GY="; + sha256 = "sha256-wQ767MgLSdcNm3Z1HL8VgmUk2tMFmIyACMaMhPr4lmY="; }; - vendorHash = "sha256-CD7W+y/vQwWe7JFTl8+Zl7IKE88+Mu+Vvdr7Q1S+90w="; + vendorHash = "sha256-SXgyxf8pqSZzlMoOissGLBfeXueY4aSkCcd7ahT2KMA="; subPackages = [ "cmd/rain" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix b/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix index 6ae0df2327..2e693c7f44 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "rbspy"; repo = "rbspy"; rev = "refs/tags/v${version}"; - hash = "sha256-2+miC7cp6YbeI7uucFlSdlDpPboJOhhBq7/eqXxZVqs="; + hash = "sha256-Ut/QeckPdgaVPYNWNjo6RCmLOc2EOXfcqRIC14I/Ruk="; }; - cargoHash = "sha256-I+nh6cKniPIG5VYMMsABZNSP/c3DLWswsjenaQBh/X8="; + cargoHash = "sha256-EJ9ij3Q10CehhrJ/nyXOuqVhiVVfHHhyqIcq8fVmzTU="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/redisinsight/default.nix b/third_party/nixpkgs/pkgs/development/tools/redisinsight/default.nix index 5c4609e248..c27cd9b47d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/redisinsight/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/redisinsight/default.nix @@ -1,70 +1,84 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, makeDesktopItem -, fixup_yarn_lock -, yarn -, nodejs_18 -, python3 -, fetchYarnDeps -, electron -, desktopToDarwinBundle -, nest-cli -, libsass -, buildPackages -, pkg-config -, sqlite -, xdg-utils +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + makeDesktopItem, + copyDesktopItems, + fixup-yarn-lock, + yarn, + nodejs_18, + python3, + fetchYarnDeps, + electron, + nest-cli, + libsass, + buildPackages, + pkg-config, + sqlite, + xdg-utils, }: + let nodejs = nodejs_18; in stdenv.mkDerivation (finalAttrs: { - pname = "redisinsight-electron"; - version = "2.32"; + pname = "redisinsight"; + version = "2.48.0"; src = fetchFromGitHub { owner = "RedisInsight"; repo = "RedisInsight"; - rev = "${finalAttrs.version}"; - hash = "sha256-esaH10AyEooym/62F5LJL7oP5UmD6T2UX8g/9QniL9s="; + rev = finalAttrs.version; + hash = "sha256-ek0Fp8v6j+mZPK2cEuFNrBgInXdYIKBBUg0UD1I51Sg="; }; offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - sha256 = "NHKttywAaWAYkciGzYCnm1speHrWsv1t+dxL1DZgM7o="; + hash = "sha256-ohtU1h6wrg7asXDxTt1Jlzx9GaS3zDrGQD9P9tgzCOE="; }; feOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/redisinsight/yarn.lock"; - sha256 = "1S1KNUOtmywQ0eyqVS2oRlhpjcL9eps8CR7AtC9ujSU="; + hash = "sha256-9xbIdDeLUEk4eNeK7RTwidqDGinA8SPfcumqml66kTw="; }; apiOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/redisinsight/api/yarn.lock"; - sha256 = "P99+1Dhdg/vznC2KepPrVGNlrofJFydXkZVxgwprIx4="; + hash = "sha256-4zbffuneTceMEyKb8atTXTFhTv0DhrsRMdepZWgoxMQ="; }; - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper python3 nest-cli libsass pkg-config ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + nativeBuildInputs = [ + yarn + fixup-yarn-lock + nodejs + makeWrapper + python3 + nest-cli + libsass + pkg-config + copyDesktopItems + ]; - buildInputs = [ sqlite xdg-utils ]; + buildInputs = [ + sqlite + xdg-utils + ]; configurePhase = '' runHook preConfigure export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror $offlineCache - fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror ${finalAttrs.offlineCache} + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - yarn config --offline set yarn-offline-mirror $feOfflineCache - fixup_yarn_lock redisinsight/yarn.lock + yarn config --offline set yarn-offline-mirror ${finalAttrs.feOfflineCache} + fixup-yarn-lock redisinsight/yarn.lock yarn --offline --cwd redisinsight/ --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - yarn config --offline set yarn-offline-mirror $apiOfflineCache - fixup_yarn_lock redisinsight/api/yarn.lock + yarn config --offline set yarn-offline-mirror ${finalAttrs.apiOfflineCache} + fixup-yarn-lock redisinsight/api/yarn.lock yarn --offline --cwd redisinsight/api/ --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ @@ -76,29 +90,32 @@ stdenv.mkDerivation (finalAttrs: { ln -sfv "${nodejs}/include" "$HOME/.node-gyp/${nodejs.version}" export npm_config_nodedir=${nodejs} - pushd redisinsight # Build the sqlite3 package. + pushd redisinsight npm_config_node_gyp="${buildPackages.nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" npm rebuild --verbose --sqlite=${sqlite.dev} sqlite3 popd + # Build node-sass + LIBSASS_EXT=auto npm rebuild --verbose node-sass + substituteInPlace redisinsight/api/config/default.ts \ - --replace "process['resourcesPath']" "\"$out/share/redisinsight\"" \ + --replace-fail "process['resourcesPath']" "\"$out/share/redisinsight\"" \ + + # has irrelevant files + rm -r resources/app runHook postConfigure ''; buildPhase = '' runHook preBuild - yarn config --offline set yarn-offline-mirror $offlineCache - pushd node_modules/node-sass - LIBSASS_EXT=auto yarn run build --offline - popd + yarn config --offline set yarn-offline-mirror ${finalAttrs.offlineCache} yarn --offline build:prod yarn --offline electron-builder \ - --dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \ + --dir \ -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} @@ -108,47 +125,47 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - # resources - mkdir -p "$out/share/redisinsight" - mkdir -p "$out/share/redisinsight/static/resources/plugins" - mkdir -p "$out/share/redisinsight/default" + mkdir -p "$out/share/redisinsight"/{app,defaults,static/plugins,static/resources/plugins} - cp -r release/${if stdenv.isDarwin then "darwin-" else "linux-"}${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/{app.asar,app.asar.unpacked} $out/share/redisinsight/ - cp -r resources/ $out/share/redisinsight + cp -r release/*-unpacked/{locales,resources{,.pak}} "$out/share/redisinsight/app" + mv "$out/share/redisinsight/app/resources/resources" "$out/share/redisinsight" # icons - for icon in "$out/resources/icons/*.png"; do + for icon in "$out/share/redisinsight/resources/icons"/*.png; do mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/redisinsight.png" done - ln -s "${finalAttrs.desktopItem}/share/applications" "$out/share/applications" - makeWrapper '${electron}/bin/electron' "$out/bin/redisinsight" \ - --add-flags "$out/share/redisinsight/app.asar" \ + --add-flags "$out/share/redisinsight/app/resources/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --chdir "$out/share/redisinsight" \ - --argv0 "$out/share/redisinsight/app.asar" + --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ + --inherit-argv0 runHook postInstall ''; - desktopItem = makeDesktopItem { - name = "redisinsight"; - exec = "redisinsight %u"; - icon = "redisinsight"; - desktopName = "RedisInsight"; - genericName = "RedisInsight Redis Client"; - comment = finalAttrs.meta.description; - categories = [ "Development" ]; - startupWMClass = "redisinsight"; - }; + desktopItems = [ + (makeDesktopItem { + name = "redisinsight"; + exec = "redisinsight %u"; + icon = "redisinsight"; + desktopName = "RedisInsight"; + genericName = "RedisInsight Redis Client"; + comment = finalAttrs.meta.description; + categories = [ "Development" ]; + startupWMClass = "redisinsight"; + }) + ]; - meta = with lib; { + meta = { description = "RedisInsight Redis client powered by Electron"; homepage = "https://github.com/RedisInsight/RedisInsight"; - license = licenses.sspl; - maintainers = with maintainers; [ gmemstr ]; - platforms = [ "x86_64-linux" ]; + license = lib.licenses.sspl; + maintainers = with lib.maintainers; [ + gmemstr + tomasajt + ]; + platforms = lib.platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix b/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix index 8b6925e860..27e51f1c97 100644 --- a/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2024.03.11.00"; + version = "2024.05.06.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; rev = "refs/tags/v${version}"; - hash = "sha256-cClbSJuEs4yIjx+13GSIevZO2PWEEHVDaMEmf729keA="; + hash = "sha256-p+nnwUzbaAMRDGqFfFJdhsNlz32Ss6oDhBLOcb/pAtI="; }; - cargoHash = "sha256-TtbkzU48j3dmqRocJdY8KJz/3YHYIi3SZYM/eB9zoIg="; + cargoHash = "sha256-/fvmOB0huXUK08IXsLbcF7bIJ4mDywKDjG774wS1qbY="; nativeBuildInputs = [ pkg-config ]; buildInputs = @@ -30,9 +30,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.CoreServices ]; - passthru.updateScript = nix-update-script { - extraArgs = [ "--version" "branch" ]; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Reindeer is a tool which takes Rust Cargo dependencies and generates Buck build rules"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix b/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix index 17e43d5fe5..cc5caf9951 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.4.1"; + version = "0.4.4"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-VTFwuNoqh0RLk0AHTPWEwrja0/aErmUlz82MnCc58jA="; + hash = "sha256-ViXKGcuDla428mI2Am67gtOxfia5VfR+ry2qyczXO/I="; }; - cargoHash = "sha256-COZGGmc6v3WGh8NICoRZ5iYrVs0tML8gG2b1LqWbJs0="; + cargoHash = "sha256-VVdIWUQaquVX/8szJ30qPGtG6rFfRadeIvDONd8swro="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix index 8537cabcac..8ac62bdae1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix @@ -1,10 +1,11 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, zstd -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + zstd, + stdenv, + darwin, }: rustPlatform.buildRustPackage rec { @@ -22,9 +23,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zstd ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = + [ zstd ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; @@ -34,8 +38,15 @@ rustPlatform.buildRustPackage rec { description = "Cargo plugin to generate list of all licenses for a crate"; homepage = "https://github.com/EmbarkStudios/cargo-about"; changelog = "https://github.com/EmbarkStudios/cargo-about/blob/${version}/CHANGELOG.md"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ evanjs figsoda matthiasbeyer ]; + license = with licenses; [ + mit # or + asl20 + ]; + maintainers = with maintainers; [ + evanjs + figsoda + matthiasbeyer + ]; mainProgram = "cargo-about"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix index 8f0ae1b22d..3c7421f841 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.6.4"; + version = "1.6.6"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-xG2eLKqGv+wqpSGBUMoYGSQ22lrMHDpQzrSyxyHMHoc="; + hash = "sha256-o31/cEkQyn89URqmJpOZHG6YII8VOle1X3vwdgJF334="; }; - cargoHash = "sha256-xNTSvJZWX19kmaFoLLHNKIrcsTFYWwN+7Ubym0hCwTA="; + cargoHash = "sha256-kZZ2S3XDdCREuit3RIByLXn/tEiqY+Oap242ZXx6y6s="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix index 5c7d0d57fd..9babac9eba 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix @@ -1,13 +1,14 @@ -{ stdenv -, lib -, fetchFromGitHub -, rustPlatform -, pkg-config -, openssl -, runCommand -, patchelf -, zlib -, Security +{ + stdenv, + lib, + fetchFromGitHub, + darwin, + rustPlatform, + pkg-config, + openssl, + runCommand, + patchelf, + zlib, }: rustPlatform.buildRustPackage rec { @@ -23,41 +24,46 @@ rustPlatform.buildRustPackage rec { patches = let - patchelfPatch = runCommand "0001-dynamically-patchelf-binaries.patch" - { - CC = stdenv.cc; - patchelf = patchelf; - libPath = "$ORIGIN/../lib:${lib.makeLibraryPath [ zlib ]}"; - } - '' - export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) - substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ - --subst-var patchelf \ - --subst-var dynamicLinker \ - --subst-var libPath - ''; + patchelfPatch = + runCommand "0001-dynamically-patchelf-binaries.patch" + { + CC = stdenv.cc; + patchelf = patchelf; + libPath = "$ORIGIN/../lib:${lib.makeLibraryPath [ zlib ]}"; + } + '' + export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) + substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ + --subst-var patchelf \ + --subst-var dynamicLinker \ + --subst-var libPath + ''; in lib.optionals stdenv.isLinux [ patchelfPatch ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - Security - ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; cargoHash = "sha256-CgEs0cejquFRY3VN6CgbE23Gipg+LEuWp/jSIkITrjw="; checkFlags = [ - "--skip test_github" # requires internet + "--skip test_github" # requires internet ]; meta = with lib; { description = "Bisects rustc, either nightlies or CI artifacts"; mainProgram = "cargo-bisect-rustc"; homepage = "https://github.com/rust-lang/cargo-bisect-rustc"; - license = with licenses; [ asl20 mit ]; + license = with licenses; [ + asl20 + mit + ]; maintainers = with maintainers; [ davidtwco ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix index 3356eee034..b370f12992 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.9.29"; + version = "0.9.31"; src = fetchCrate { inherit pname; # this version may need to be updated along with package version - version = "${version}+cargo-0.76.0"; - hash = "sha256-Uy5Bm8WwN3jQO2btnV/ayxTlIJAe5q2FUvhxCCrn9U8="; + version = "${version}+cargo-0.78.0"; + hash = "sha256-RqwUV3e02GykYH/pWHjoent+gix+CD+t3yAQxqUmo54="; }; - cargoHash = "sha256-fkekUCZReiexdtiQcWx+Hqz4XDDbRGa4fGheBCNZ3Qw="; + cargoHash = "sha256-SfKDlcN+PW1twJu3YbmMsQOtFh6JHncAhdrVg+tweAE="; nativeBuildInputs = [ pkg-config (lib.getDev curl) ]; buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [ @@ -55,6 +55,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/lu-zero/cargo-c"; changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ cpu ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-clone/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-clone/default.nix index 4ad07b5793..8ce7e006dc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-clone/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-clone/default.nix @@ -4,6 +4,7 @@ , pkg-config , openssl , stdenv +, CoreServices , Security , SystemConfiguration }: @@ -24,6 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + CoreServices Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix index b70f742772..81f49e6b40 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-LCyTbOSSz3O53hZmOPcK+tB5LNZLE4uwfOZrwJZuebc="; + hash = "sha256-KVHci8h30cAZZffRA3e0gb1uAMv2UDiC9HkiqNaqSS4="; }; - cargoHash = "sha256-apT60W4lUCMsRvuzGkY8AkA8m8e7ESGGnmOpyv5Ca1I="; + cargoHash = "sha256-swRiR+YeQVT7mMzJHQtCI4wcG9z44r34YDv8WmEPr08="; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix index 421559b347..a8ea1cc9c7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.21"; + version = "0.14.23"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-d5qgljNuEfh9kYQU+jP4tgyly6i7hETFC5tEY67Yq8g="; + hash = "sha256-TTBsxb+rC/0SL6pCZkf9HPwzExXb3UIT08cBQ4y855o="; }; - cargoHash = "sha256-u1cayvVatGg03Q3xShC/0ymE8EGHyYFrZD3Q8UD8Mm8="; + cargoHash = "sha256-i1p/k+SGwdxp9RGXfxnJVq+E1pek7RSA50fMgVRJzCQ="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix index d2f3b9c7a0..a22d5239f4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-duplicates/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-duplicates"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Keruspe"; repo = "cargo-duplicates"; rev = "v${version}"; - hash = "sha256-e0cegK4obUVIJyx5XKF+xicvkRvQwuObwB8tprrJnrw="; + hash = "sha256-OwytBecRGizkDC2S92FKAy3/mc4Jg/NwaYIPahfiG6k="; }; - cargoHash = "sha256-i1IyHCa/w4DOGlPWjDE4IbVm3s/40DIwjwUGIMTYH4Y="; + cargoHash = "sha256-LsdzHCQ4uG6+dwiUoC36VPuqUf8oPlcMHxNgdkvYzu8="; nativeBuildInputs = [ curl diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix index dd6630d8d3..a63d82ddf2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-k4bTuTRZMWx8mMi/hdAr4YPCWqe39fG8nkmHH2D80ew="; + sha256 = "sha256-utJYgbmCLi7rWKsRDZqJDCtEbVijAjnMqpYoALKO+Ho="; }; - cargoHash = "sha256-wi1Y1eU+v9Q/4nkLNCUluPlDGfz6ld8nuVWR9orkDV4="; + cargoHash = "sha256-9rgdpoXNKaw850EnK6jDwT+jba/B/66PqQackx2knuk="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index f3fa51fb21..e2ef8df353 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.37"; + version = "0.4.38"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-9l6WkPVcc1BTRjmHa3+2Y1buLdHC5VIvpGys0fDwldY="; + hash = "sha256-9Uxhgm884gguoUJ7TCXFbKB3qBaLTnsIimMKaucpqiM="; }; - cargoHash = "sha256-MbjV3O9yDC8GHWdhWh4/sO+QfAd3kw3K5wLkZ8OlXIU="; + cargoHash = "sha256-NlxkTQRW/GO58GOgxFRvnDwu667cKt5fzpkWKe//G6Q="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix index 33204d80b9..de2166f959 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "24.3.0"; + version = "24.5.0"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-FlD2bSCNToyXLiMb4c2tJYJxHN4QORMJPeFPuFpjMEM="; + hash = "sha256-qKgHlFb7sraXTpqf6QsOspzHGWtVZAUSOl3rl6pqQJk="; }; - cargoHash = "sha256-GJFUSOAY6F0ZmqF/9SHOGMNFssfHUdFIcsgz6JwZuqE="; + cargoHash = "sha256-h9nhE7pSwxE2NKJQtlA6Exwh36pC6Lp0y3u0AEh39N4="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix index 8972fef882..de0af79902 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.68"; + version = "0.9.70"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-LC+0s38ufmMrhNaKSn13jka/M7PG1+gJnqZCXJ7ef6I="; + hash = "sha256-YTeKcdUszI/0RCAq6Gcakl3hfUSUo3CfVCMod/IPYhw="; }; - cargoHash = "sha256-E/bsVbSdFr1LMrIewsh15Vuk4Dt5UwETLCIhE7TT3kA="; + cargoHash = "sha256-FH9ODkK84bPPYyHP4kKcHKWpJ3FV1NC8S/NQFvV63Gw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/0_6_1.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/0_6_1.nix deleted file mode 100644 index 8dbc22cdfd..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/0_6_1.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-pgx"; - version = "0.6.1"; - - src = fetchCrate { - inherit version pname; - sha256 = "sha256-O4eHVbJBudybsPab+zr2eXnfheREMqLAHAKm2GDbfrs="; - }; - - cargoSha256 = "sha256-MucGrA3qXgJOcT2LMNmoNOhQi8QA3LuqgZEHKycLCCo="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; - - meta = with lib; { - description = "Cargo subcommand for ‘pgx’ to make Postgres extension development easy"; - mainProgram = "cargo-pgx"; - homepage = "https://github.com/tcdi/pgx/tree/v${version}/cargo-pgx"; - license = licenses.mit; - maintainers = with maintainers; [ typetetris ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/0_7_1.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/0_7_1.nix deleted file mode 100644 index 6dd8a0661b..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/0_7_1.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-pgx"; - version = "0.7.1"; - - src = fetchCrate { - inherit version pname; - sha256 = "sha256-t/gdlrBeP6KFkBFJiZUa8KKVJVYMf6753vQGKJdytss="; - }; - - cargoSha256 = "sha256-muce9wT4LAJmfNLWWEShARnpZgglXe/KrfxlitmGgXk="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; - - meta = with lib; { - description = "Cargo subcommand for ‘pgx’ to make Postgres extension development easy"; - mainProgram = "cargo-pgx"; - homepage = "https://github.com/tcdi/pgx/tree/v${version}/cargo-pgx"; - license = licenses.mit; - maintainers = with maintainers; [ typetetris ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/0_7_4.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/0_7_4.nix deleted file mode 100644 index 0f2b3ef35c..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/0_7_4.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-pgx"; - version = "0.7.4"; - - src = fetchCrate { - inherit version pname; - sha256 = "sha256-uyMWfxI+A8mws8oZFm2pmvr7hJgSNIb328SrVtIDGdA="; - }; - - cargoSha256 = "sha256-RgpL/hJdfrtLDANs5U53m5a6aEEAhZ9SFOIM7V8xABM="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; - - meta = with lib; { - description = "Cargo subcommand for ‘pgx’ to make Postgres extension development easy"; - mainProgram = "cargo-pgx"; - homepage = "https://github.com/tcdi/pgx/tree/v${version}/cargo-pgx"; - license = licenses.mit; - maintainers = with maintainers; [ typetetris ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/buildPgxExtension.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/buildPgxExtension.nix deleted file mode 100644 index 4b4f7f9d74..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/buildPgxExtension.nix +++ /dev/null @@ -1,160 +0,0 @@ -# preBuildAndTest and some small other bits -# taken from https://github.com/tcdi/pgx/blob/v0.4.5/nix/extension.nix -# (but now heavily modified) -# which uses MIT License with the following license file -# -# MIT License -# -# Portions Copyright 2019-2021 ZomboDB, LLC. -# Portions Copyright 2021-2022 Technology Concepts & Design, Inc. . -# All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -{ lib -, cargo-pgx -, pkg-config -, rustPlatform -, stdenv -, Security -, writeShellScriptBin -}: - -# The idea behind: Use it mostly like rustPlatform.buildRustPackage and so -# we hand most of the arguments down. -# -# Additional arguments are: -# - `postgresql` postgresql package of the version of postgresql this extension should be build for. -# Needs to be the build platform variant. -# - `useFakeRustfmt` Whether to use a noop fake command as rustfmt. cargo-pgx tries to call rustfmt. -# If the generated rust bindings aren't needed to use the extension, its a -# unnecessary and heavy dependency. If you set this to true, you also -# have to add `rustfmt` to `nativeBuildInputs`. - -{ buildAndTestSubdir ? null -, buildType ? "release" -, buildFeatures ? [ ] -, cargoBuildFlags ? [ ] -, postgresql -# cargo-pgx calls rustfmt on generated bindings, this is not strictly necessary, so we avoid the -# dependency here. Set to false and provide rustfmt in nativeBuildInputs, if you need it, e.g. -# if you include the generated code in the output via postInstall. -, useFakeRustfmt ? true -, ... -} @ args: -let - rustfmtInNativeBuildInputs = lib.lists.any (dep: lib.getName dep == "rustfmt") (args.nativeBuildInputs or []); -in - -assert lib.asserts.assertMsg ((args.installPhase or "") == "") - "buildPgxExtensions overwrites the installPhase, so providing one does nothing"; -assert lib.asserts.assertMsg ((args.buildPhase or "") == "") - "buildPgxExtensions overwrites the buildPhase, so providing one does nothing"; -assert lib.asserts.assertMsg (useFakeRustfmt -> !rustfmtInNativeBuildInputs) - "The parameter useFakeRustfmt is set to true, but rustfmt is included in nativeBuildInputs. Either set useFakeRustfmt to false or remove rustfmt from nativeBuildInputs."; -assert lib.asserts.assertMsg (!useFakeRustfmt -> rustfmtInNativeBuildInputs) - "The parameter useFakeRustfmt is set to false, but rustfmt is not included in nativeBuildInputs. Either set useFakeRustfmt to true or add rustfmt from nativeBuildInputs."; - -let - fakeRustfmt = writeShellScriptBin "rustfmt" '' - exit 0 - ''; - maybeDebugFlag = lib.optionalString (buildType != "release") "--debug"; - maybeEnterBuildAndTestSubdir = lib.optionalString (buildAndTestSubdir != null) '' - export CARGO_TARGET_DIR="$(pwd)/target" - pushd "${buildAndTestSubdir}" - ''; - maybeLeaveBuildAndTestSubdir = lib.optionalString (buildAndTestSubdir != null) "popd"; - - pgxPostgresMajor = lib.versions.major postgresql.version; - preBuildAndTest = '' - export PGX_HOME=$(mktemp -d) - export PGDATA="$PGX_HOME/data-${pgxPostgresMajor}/" - cargo-pgx pgx init "--pg${pgxPostgresMajor}" ${postgresql}/bin/pg_config - echo "unix_socket_directories = '$(mktemp -d)'" > "$PGDATA/postgresql.conf" - - # This is primarily for Mac or other Nix systems that don't use the nixbld user. - export USER="$(whoami)" - pg_ctl start - createuser -h localhost --superuser --createdb "$USER" || true - pg_ctl stop - ''; - - argsForBuildRustPackage = builtins.removeAttrs args [ "postgresql" "useFakeRustfmt" ]; - - # so we don't accidentally `(rustPlatform.buildRustPackage argsForBuildRustPackage) // { ... }` because - # we forgot parentheses - finalArgs = argsForBuildRustPackage // { - buildInputs = (args.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ Security ]; - - nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ - cargo-pgx - postgresql - pkg-config - rustPlatform.bindgenHook - ] ++ lib.optionals useFakeRustfmt [ fakeRustfmt ]; - - buildPhase = '' - runHook preBuild - - echo "Executing cargo-pgx buildPhase" - ${preBuildAndTest} - ${maybeEnterBuildAndTestSubdir} - - NIX_PGLIBDIR="${postgresql}/lib" \ - PGX_BUILD_FLAGS="--frozen -j $NIX_BUILD_CORES ${builtins.concatStringsSep " " cargoBuildFlags}" \ - cargo-pgx pgx package \ - --pg-config ${postgresql}/bin/pg_config \ - ${maybeDebugFlag} \ - --features "${builtins.concatStringsSep " " buildFeatures}" \ - --out-dir "$out" - - ${maybeLeaveBuildAndTestSubdir} - - runHook postBuild - ''; - - preCheck = preBuildAndTest + args.preCheck or ""; - - installPhase = '' - runHook preInstall - - echo "Executing buildPgxExtension install" - - ${maybeEnterBuildAndTestSubdir} - - cargo-pgx pgx stop all - - mv $out/${postgresql}/* $out - rm -rf $out/nix - - ${maybeLeaveBuildAndTestSubdir} - - runHook postInstall - ''; - - PGX_PG_SYS_SKIP_BINDING_REWRITE = "1"; - CARGO_BUILD_INCREMENTAL = "false"; - RUST_BACKTRACE = "full"; - - checkNoDefaultFeatures = true; - checkFeatures = (args.checkFeatures or [ ]) ++ [ "pg_test pg${pgxPostgresMajor}" ]; - }; -in -rustPlatform.buildRustPackage finalArgs diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix deleted file mode 100644 index b87d9d4570..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, pkg-config -, curl -, libgit2 -, openssl -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-raze"; - version = "0.16.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = pname; - rev = "v${version}"; - hash = "sha256-ip0WuBn1b7uN/pAhOl5tfmToK73ZSHK7rucdtufsbCQ="; - }; - sourceRoot = "${src.name}/impl"; - - cargoHash = "sha256-hNZgQwhm4UPqmANplZGxG0DYHa31tu06nmqYaCA7Vdg="; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libgit2 - openssl - curl - ] - ++ lib.optional stdenv.isDarwin Security; - - preCheck = lib.optionalString stdenv.isDarwin '' - # Darwin issue: Os { code: 24, kind: Uncategorized, message: "Too many open files" } - # https://github.com/google/cargo-raze/issues/544 - ulimit -n 1024 - ''; - - __darwinAllowLocalNetworking = true; - - meta = with lib; { - description = "Generate Bazel BUILD files from Cargo dependencies"; - homepage = "https://github.com/google/cargo-raze"; - license = licenses.asl20; - maintainers = with maintainers; [ elasticdog ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix index fa6bc5ce36..2c3269681d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-5+UE1Ka2pciuNrkrPDCJMp12+IUbgq7k3cKSP5pahw4="; + hash = "sha256-iumHMVDlgwjjQsn0aoSJUPoOKmLztD47b7he2nJhins="; }; - cargoHash = "sha256-GuajrFdPlgneL95eWT3n2MdzfsbuID/pI9ED8TlVOCo="; + cargoHash = "sha256-/mrVrbPHi4lo2iu/IWwDYIjqWZYNkm/4lWpRMLKBNpA="; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix index bd08268d59..077b776788 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.32"; + version = "0.2.35"; src = fetchCrate { inherit pname version; - hash = "sha256-4pMIL/wru9uE8Uyp/qvmo6IJxFcB0HLUHRSSV6DoI3g="; + hash = "sha256-23G4Re10ksoJSWRmzRjTpSGRLk3LLnkuzTjPOgf4oOk="; }; - cargoHash = "sha256-N1NZONY8y88diAbWn+UaSHGpd4r7naxFWVmCyJkL3tQ="; + cargoHash = "sha256-OcGmlGA0relDY1Tn/edE1pX+vOhKFXJ8YeCdQ5b7ZnQ="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix index f6312ee3f0..aae0be3376 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -8,21 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - hash = "sha256-PgV+sjCf4O24v0i9P7RJIcn28OWMUcPSwy+P5n8RwS4="; + hash = "sha256-NrtPV2bd9BuA1nnniIcth85gJQmFGy9LHdajqmW8j4Q="; }; - cargoHash = "sha256-6dhM+FzuLtKtRp2mpE9nlpT+0PBcgGqvBa9vqs6Rs7s="; - - postPatch = '' - substituteInPlace src/lib.rs \ - --replace "#![deny(dead_code)]" "#![warn(dead_code)]" - ''; + cargoHash = "sha256-mxx4G77ldPfVorNa1LGTcA0Idwmrcl8S/ze+UUoLHhI="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix index d9db7c5369..c51b2e53f5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.43"; + version = "1.0.45"; src = fetchCrate { inherit pname version; - hash = "sha256-LPqoq9iry8nNXphFdmjwepNB1bK8/myOEoT4UM0xF70="; + hash = "sha256-d0v34CUm3r9QScxrc5aKSLpNLPTK+OHAZ7JdS9A4lAw="; }; - cargoHash = "sha256-FU4NYa2S9x0IXhPtWM0PyOBCGCGHj80QR7DRuDgDYJY="; + cargoHash = "sha256-QNVySY5IEGXdRBwJDG2eLZ+u28X/qYcdCkFiBCpgNhE="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix index 02a06edf5d..b90dca46c7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -17,20 +17,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.6.1"; + version = "1.6.5"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - hash = "sha256-P0/c9GTQRdErwE3/uuZpMqiTl/nFGSaHoWGRtBDjc8M="; + hash = "sha256-5Hz6vJaClZ6/6KVN11dSinb4xerf/3Qiq230H8+j5q8="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-+uRjitfaSbjsO1yO5NL3gw+qjx4neiht3BDvWltogX0="; + cargoHash = "sha256-eb33aBG3qcMqBVY9/gzEvodS2w5rqioPAmiEKBEJIEw="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-whatfeatures/default.nix index fdae63bd50..2aa7b4760c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-whatfeatures/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-whatfeatures"; - version = "0.9.10"; + version = "0.9.12"; src = fetchFromGitHub { owner = "museun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-80VbQyOg6jvX98QRcCVN/wwhAm4bO/UfHEIv4gP8IlA="; + sha256 = "sha256-62eEHxX+Gsz+Bif1ev0nTRituRkfqlGYZfa9cFkO26M="; }; - cargoHash = "sha256-mp9KUJuwSwRuxQAEilYwNZwqe3ipN4JzsaO5Pi3V9xg="; + cargoHash = "sha256-bk/mbQu4lzhA9ct7cws70MYuj8oNEBgC+0EjHlaN1lc="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix index ab0c149a09..4e48a4d74c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.18.3"; + version = "0.18.4"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-wL6Rmw5hJI8cJDw2WO9CDOyeOuZv6QoFxrn81JrYBR4="; + hash = "sha256-J9R/cT58wjvDcS5AKhGtbxbFYiNGFBmrLtIF2CfTIaE="; }; - cargoHash = "sha256-uCZYDh4+Pri77DzqZj12cav7o8eDY2+fgwIwVBdcbHg="; + cargoHash = "sha256-F9QOlYpKAQx7xF6yyGa/tOkziEyXCg5LW6gH0X6uXRc="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index f662c89f59..14d3980023 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-04-08"; - cargoSha256 = "sha256-lVVHp8kbi3bnDQ0lCZugGSNznJduXPftGDq7ByxXWgc="; + version = "2024-04-29"; + cargoSha256 = "sha256-OvkaBWkq5c3amvDZj51iOXUrfevBMhbCaKGHmrA/23E="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-St7ZQrkrr5lmQX9wC1ZJAFxL8W7alswnyZk9d1se3Us="; + sha256 = "sha256-zttBYGaoHpZfqWHQ8OI5f9OkGHCHb8tDBMySwsYNa2U="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix index 8891b364b5..b9b76e915b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.33.0"; + version = "0.33.2"; src = fetchCrate { inherit pname version; - hash = "sha256-EdU/Hr1OQ02Jeq4OgJPOS//4wltBPoYdUcFMvlOjIBY="; + hash = "sha256-4qwRBJNbPkqEHrRY67wgxtmVLzaVkCSvvMc8gKPblew="; }; - cargoHash = "sha256-T4QRrSBjf47wGJIVfxZNGig8k7KWvQQIvV8zwRUP/38="; + cargoHash = "sha256-5NGW9uTemoHWvrhz06suVXzjZ48pk+jN6DUkdzIXT5k="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/typeshare/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/typeshare/default.nix index 8f784bc72d..745784fc03 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/typeshare/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/typeshare/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "typeshare"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "1password"; repo = "typeshare"; rev = "v${version}"; - hash = "sha256-20IaTC0fMt6ADSwyQh9yBn3i3z6cmQ1j/wy1KNB3Dog="; + hash = "sha256-ccUeIywOHZYqfo4o0rKKswFmdPcQkwD18OP9v/wkfe0="; }; - cargoHash = "sha256-5jY4GO/EbBokE9p9e68bTKj6nJ0LhtWYHtFGfTIf9Po="; + cargoHash = "sha256-mPA19+8Ti2fluOFn/oDvf62JZTtZNQRggMhf9cem5rU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rye/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/rye/Cargo.lock index 4fa64e7792..9e24440fb0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rye/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/rye/Cargo.lock @@ -29,24 +29,22 @@ dependencies = [ [[package]] name = "age" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d55a4d912c80a92762ffd1c884065f3f9646467d22c95390e824a0ff7def472" +checksum = "edeef7d7b199195a2d7d7a8155d2d04aee736e60c5c7bdd7097d115369a8817d" dependencies = [ "age-core", - "base64 0.13.1", + "base64 0.21.7", "bech32", "chacha20poly1305", "cookie-factory", - "hkdf", "hmac", "i18n-embed", "i18n-embed-fl", "lazy_static", "nom", "pin-project", - "rand 0.7.3", - "rand 0.8.5", + "rand", "rust-embed", "scrypt", "sha2", @@ -57,17 +55,17 @@ dependencies = [ [[package]] name = "age-core" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d2e815ac879dc23c1139e720d21c6cd4d1276345c772587285d965a69b8f32" +checksum = "a5f11899bc2bbddd135edbc30c36b1924fa59d0746bb45beb5933fafe3fe509b" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "chacha20poly1305", "cookie-factory", "hkdf", "io_tee", "nom", - "rand 0.8.5", + "rand", "secrecy", "sha2", ] @@ -233,17 +231,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cfb" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" -dependencies = [ - "byteorder", - "fnv", - "uuid", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -378,12 +365,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - [[package]] name = "cpufeatures" version = "0.2.12" @@ -460,50 +441,29 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "fiat-crypto", + "platforms", + "rustc_version", "subtle", "zeroize", ] [[package]] -name = "darling" -version = "0.14.4" +name = "curve25519-dalek-derive" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", "proc-macro2", "quote", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -525,22 +485,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" -[[package]] -name = "decompress" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67605f4868a37e8a9c50003a866a6896104602d5d7ddf7e8a7f398ec97e44ab3" -dependencies = [ - "derive_builder", - "flate2", - "infer", - "lazy_static", - "regex", - "tar", - "thiserror", - "zstd 0.12.4", -] - [[package]] name = "deranged" version = "0.3.11" @@ -550,37 +494,6 @@ dependencies = [ "powerfmt", ] -[[package]] -name = "derive_builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] - [[package]] name = "deunicode" version = "1.4.2" @@ -599,15 +512,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.7" @@ -688,6 +592,12 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +[[package]] +name = "fiat-crypto" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" + [[package]] name = "filetime" version = "0.2.23" @@ -763,12 +673,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -817,17 +721,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.12" @@ -836,7 +729,7 @@ checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -917,7 +810,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -945,9 +838,9 @@ dependencies = [ [[package]] name = "i18n-embed" -version = "0.13.9" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" +checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" dependencies = [ "arc-swap", "fluent", @@ -966,9 +859,9 @@ dependencies = [ [[package]] name = "i18n-embed-fl" -version = "0.6.7" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395" +checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2" dependencies = [ "dashmap", "find-crate", @@ -998,12 +891,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.5.0" @@ -1037,15 +924,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "infer" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" -dependencies = [ - "cfb", -] - [[package]] name = "inout" version = "0.1.3" @@ -1266,7 +1144,7 @@ dependencies = [ "tracing", "unscanny", "ureq", - "zstd 0.13.0", + "zstd", ] [[package]] @@ -1290,15 +1168,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - [[package]] name = "num-conv" version = "0.1.0" @@ -1391,11 +1260,12 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ - "digest 0.10.7", + "digest", + "hmac", ] [[package]] @@ -1464,6 +1334,12 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +[[package]] +name = "platforms" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" + [[package]] name = "poly1305" version = "0.8.0" @@ -1572,19 +1448,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -1592,18 +1455,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -1613,16 +1466,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -1631,16 +1475,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -1711,7 +1546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.12", + "getrandom", "libc", "spin", "untrusted", @@ -1720,9 +1555,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "6.8.1" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" +checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -1731,9 +1566,9 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "6.8.1" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" +checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" dependencies = [ "proc-macro2", "quote", @@ -1744,9 +1579,9 @@ dependencies = [ [[package]] name = "rust-embed-utils" -version = "7.8.1" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" +checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" dependencies = [ "sha2", "walkdir", @@ -1764,6 +1599,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + [[package]] name = "rustix" version = "0.38.31" @@ -1801,7 +1645,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.31.0" +version = "0.33.0" dependencies = [ "age", "anyhow", @@ -1812,7 +1656,6 @@ dependencies = [ "console", "ctrlc", "curl", - "decompress", "dialoguer", "dotenvy", "flate2", @@ -1826,10 +1669,8 @@ dependencies = [ "insta-cmd", "junction", "license", - "memchr", "minijinja", "monotrail-utils", - "nix", "once_cell", "pathdiff", "pep440_rs", @@ -1844,10 +1685,9 @@ dependencies = [ "shlex", "slug", "static_vcruntime", - "sysinfo", "tar", "tempfile", - "toml_edit", + "toml_edit 0.22.9", "url", "walkdir", "which", @@ -1855,7 +1695,7 @@ dependencies = [ "winreg", "xattr", "zip", - "zstd 0.13.0", + "zstd", ] [[package]] @@ -1899,11 +1739,10 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypt" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" dependencies = [ - "hmac", "pbkdf2", "salsa20", "sha2", @@ -1954,6 +1793,12 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + [[package]] name = "serde" version = "1.0.196" @@ -2002,7 +1847,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -2093,7 +1938,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", - "quote", "unicode-ident", ] @@ -2108,20 +1952,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sysinfo" -version = "0.29.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "winapi", -] - [[package]] name = "tar" version = "0.4.40" @@ -2255,7 +2085,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.21.1", ] [[package]] @@ -2277,7 +2107,18 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.37", +] + +[[package]] +name = "toml_edit" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.6.5", ] [[package]] @@ -2431,12 +2272,6 @@ dependencies = [ "serde", ] -[[package]] -name = "uuid" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" - [[package]] name = "vcpkg" version = "0.2.15" @@ -2459,12 +2294,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2716,6 +2545,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.52.0" @@ -2728,12 +2566,13 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "1.1.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", - "rand_core 0.5.1", + "rand_core", + "serde", "zeroize", ] @@ -2811,32 +2650,13 @@ dependencies = [ "time", ] -[[package]] -name = "zstd" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" -dependencies = [ - "zstd-safe 6.0.6", -] - [[package]] name = "zstd" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ - "zstd-safe 7.0.0", -] - -[[package]] -name = "zstd-safe" -version = "6.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" -dependencies = [ - "libc", - "zstd-sys", + "zstd-safe", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/development/tools/rye/default.nix b/third_party/nixpkgs/pkgs/development/tools/rye/default.nix index ac74851638..a69e96e702 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rye/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rye/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.31.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-hPfMKp5FUbIKKKFfoS/pxseWmhqW8UOts7DOcRzgHWU="; + hash = "sha256-sgA+Tp4Qysd07+1iNDgn9Hw0nDN8l6/fD41rE5QqWzY="; }; cargoLock = { @@ -61,6 +61,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_add_flask" "--skip=test_add_from_find_links" "--skip=test_autosync_remember" + "--skip=test_basic_list" "--skip=test_basic_tool_behavior" "--skip=test_config_empty" "--skip=test_config_get_set_multiple" @@ -74,6 +75,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_init_lib" "--skip=test_init_script" "--skip=test_lint_and_format" + "--skip=test_list_not_rye_managed" "--skip=test_publish_outside_project" "--skip=test_version" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/scalafix/default.nix b/third_party/nixpkgs/pkgs/development/tools/scalafix/default.nix index 4b4f887d4a..aa02fa8f40 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scalafix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scalafix/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation ( passthru.tests = { testVersion = testers.testVersion { - program = "${finalAttrs.pname}"; + package = finalAttrs.finalPackage; version = "${finalAttrs.version}"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix b/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix index e10ebf1e55..14d6c87259 100644 --- a/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/scenebuilder/default.nix @@ -1,80 +1,104 @@ -{ lib, stdenv, fetchFromGitHub, openjdk20, maven, makeDesktopItem, copyDesktopItems, makeWrapper, glib, wrapGAppsHook }: +{ lib +, jdk21 +, maven +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, glib +, makeWrapper +, wrapGAppsHook3 +}: let - jdk = openjdk20.override (lib.optionalAttrs stdenv.isLinux { + jdk = jdk21.override { enableJavaFX = true; - }); + }; maven' = maven.override { inherit jdk; }; - selectSystem = attrs: - attrs.${stdenv.hostPlatform.system} - or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); in maven'.buildMavenPackage rec { pname = "scenebuilder"; - version = "20.0.0"; + version = "21.0.1"; src = fetchFromGitHub { owner = "gluonhq"; - repo = pname; + repo = "scenebuilder"; rev = version; - hash = "sha256-Og+dzkJ6+YH0fD4HJw8gUKGgvQuNw17BxgzZMP/bEA0="; + hash = "sha256-YEcW1yQK6RKDqSstsrpdOqMt972ZagenGDxcJ/gP+SA="; }; - buildDate = "2022-10-07T00:00:00+01:00"; # v20.0.0 release date - mvnParameters = "-Dmaven.test.skip -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}"; - mvnHash = selectSystem { - x86_64-linux = "sha256-QwxA3lKVkRG5CV2GIwfVFPOj112pHr7bDlZJD6KwrHc="; - aarch64-linux = "sha256-cO5nHSvv2saBuAjq47A+GW9vFWEM+ysXyZgI0Oe/F70="; - }; + patches = [ + # makes the mvnHash platform-independent + ./pom-remove-javafx.patch - nativeBuildInputs = [ copyDesktopItems makeWrapper glib wrapGAppsHook ]; + # makes sure that maven upgrades don't change the mvnHash + ./fix-default-maven-plugin-versions.patch + ]; + + postPatch = '' + # set the build timestamp to $SOURCE_DATE_EPOCH + substituteInPlace app/pom.xml \ + --replace-fail "\''${maven.build.timestamp}" "$(date -d "@$SOURCE_DATE_EPOCH" '+%Y-%m-%d %H:%M:%S')" + ''; + + mvnParameters = toString [ + "-Dmaven.test.skip" + "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" + ]; + + mvnHash = "sha256-fS7dS2Q4ORThLBwDOzJJnRboNNRmhp0RG6Dae9fl+pw="; + + nativeBuildInputs = [ + copyDesktopItems + glib + makeWrapper + wrapGAppsHook3 + ]; dontWrapGApps = true; # prevent double wrapping installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/java $out/share/{${pname},icons/hicolor/128x128/apps} - cp app/target/lib/scenebuilder-${version}-SNAPSHOT-all.jar $out/share/java/${pname}.jar - - cp app/src/main/resources/com/oracle/javafx/scenebuilder/app/SB_Logo.png $out/share/icons/hicolor/128x128/apps/scenebuilder.png + install -Dm644 app/target/lib/scenebuilder-${version}-SNAPSHOT-all.jar $out/share/scenebuilder/scenebuilder.jar + install -Dm644 app/src/main/resources/com/oracle/javafx/scenebuilder/app/SB_Logo.png $out/share/icons/hicolor/128x128/apps/scenebuilder.png runHook postInstall ''; postFixup = '' - makeWrapper ${jdk}/bin/java $out/bin/${pname} \ + makeWrapper ${jdk}/bin/java $out/bin/scenebuilder \ --add-flags "--add-modules javafx.web,javafx.fxml,javafx.swing,javafx.media" \ --add-flags "--add-opens=javafx.fxml/javafx.fxml=ALL-UNNAMED" \ - --add-flags "-cp $out/share/java/${pname}.jar" \ - --add-flags "com.oracle.javafx.scenebuilder.app.SceneBuilderApp" \ + --add-flags "-jar $out/share/scenebuilder/scenebuilder.jar" \ "''${gappsWrapperArgs[@]}" - ''; + ''; - desktopItems = [ (makeDesktopItem { - name = "scenebuilder"; - exec = "scenebuilder"; - icon = "scenebuilder"; - comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; - desktopName = "Scene Builder"; - mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; - categories = [ "Development" ]; - }) ]; + desktopItems = [ + (makeDesktopItem { + name = "scenebuilder"; + exec = "scenebuilder"; + icon = "scenebuilder"; + comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; + desktopName = "Scene Builder"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" ]; + }) + ]; meta = with lib; { - broken = stdenv.isDarwin; + changelog = "https://github.com/gluonhq/scenebuilder/releases/tag/${src.rev}"; description = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; - mainProgram = "scenebuilder"; homepage = "https://gluonhq.com/products/scene-builder/"; + license = licenses.bsd3; + mainProgram = "scenebuilder"; + maintainers = with maintainers; [ wirew0rm ]; + platforms = jdk.meta.platforms; sourceProvenance = with sourceTypes; [ fromSource - binaryBytecode # deps + binaryBytecode # deps ]; - license = licenses.bsd3; - maintainers = with maintainers; [ wirew0rm ]; - platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch b/third_party/nixpkgs/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch new file mode 100644 index 0000000000..be5e590694 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch @@ -0,0 +1,60 @@ +diff --git a/pom.xml b/pom.xml +index 193f7ca..45faa1a 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -137,6 +137,55 @@ + + + ++ ++ org.apache.maven.plugins ++ maven-enforcer-plugin ++ 3.3.0 ++ ++ ++ require-all-plugin-versions-to-be-set ++ validate ++ ++ enforce ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ org.apache.maven.plugins ++ maven-clean-plugin ++ 3.3.2 ++ ++ ++ org.apache.maven.plugins ++ maven-install-plugin ++ 3.1.1 ++ ++ ++ org.apache.maven.plugins ++ maven-site-plugin ++ 4.0.0-M13 ++ ++ ++ org.apache.maven.plugins ++ maven-deploy-plugin ++ 3.1.1 ++ ++ ++ org.apache.maven.plugins ++ maven-surefire-plugin ++ 3.2.5 ++ ++ ++ org.apache.maven.plugins ++ maven-jar-plugin ++ 3.3.0 ++ + + org.codehaus.mojo + build-helper-maven-plugin diff --git a/third_party/nixpkgs/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch b/third_party/nixpkgs/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch new file mode 100644 index 0000000000..6c9c9784d0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch @@ -0,0 +1,28 @@ +diff --git a/kit/pom.xml b/kit/pom.xml +index 644d36c..e4d91fb 100644 +--- a/kit/pom.xml ++++ b/kit/pom.xml +@@ -11,23 +11,6 @@ + + + +- +- +- org.openjfx +- javafx-fxml +- ${javafx.version} +- +- +- org.openjfx +- javafx-web +- ${javafx.version} +- +- +- org.openjfx +- javafx-swing +- ${javafx.version} +- +- + + + org.eclipse.aether diff --git a/third_party/nixpkgs/pkgs/development/tools/sea-orm-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/sea-orm-cli/default.nix index a983924c0c..98b52a55af 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sea-orm-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sea-orm-cli/default.nix @@ -8,11 +8,11 @@ }: rustPlatform.buildRustPackage rec { pname = "sea-orm-cli"; - version = "0.12.10"; + version = "0.12.15"; src = fetchCrate { inherit pname version; - hash = "sha256-BVQbzP/+TJFqhnBeerYiLMpJJ8q9x582DR5X10K027U="; + hash = "sha256-eRsWQXaE8zzECPY+xxVIwTylbuSPT6ABamI4WNVkw8M="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; - cargoHash = "sha256-qCcWReo72eHN9MoTVAmSHYVhpqw0kZ9VU/plYRcirVA="; + cargoHash = "sha256-sIyKkTO2DSLkRAlSUSRQYrZb8UtKZrszjn2jELNOSOU="; meta = with lib; { homepage = "https://www.sea-ql.org/SeaORM"; diff --git a/third_party/nixpkgs/pkgs/development/tools/selene/default.nix b/third_party/nixpkgs/pkgs/development/tools/selene/default.nix index b464bee86e..0bd600423b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selene/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.26.1"; + version = "0.27.1"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-0imHwZNyhJXFai1J5tHqnQ6Ta10nETQ5TILGH0bHc8Y="; + sha256 = "sha256-NbVSFYv3nyEjSf0bFajcMaoWP2bS0EfJT8tDddjS7jg="; }; - cargoHash = "sha256-Lm3agCnxDxcj7op17uiokK8Y790oMxwHJStvP/9DsI0="; + cargoHash = "sha256-e3oQUFtgdjqPiB2YpmqnFUG2scmYJhLSpUaw0W6RxIk="; nativeBuildInputs = lib.optionals robloxSupport [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix index c40a32ff30..1cee0603e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { ''; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.bsd3; - maintainers = with maintainers; [ goibhniu marsam primeos ]; + maintainers = with maintainers; [ goibhniu primeos ]; # Note from primeos: By updating Chromium I also update Google Chrome and # ChromeDriver. platforms = attrNames allSpecs; diff --git a/third_party/nixpkgs/pkgs/development/tools/sem/default.nix b/third_party/nixpkgs/pkgs/development/tools/sem/default.nix index 76741e7731..e61abb7ca5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sem/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sem/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sem"; - version = "0.28.6"; + version = "0.29.0"; src = fetchFromGitHub { owner = "semaphoreci"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-8zGgqa0z3KYSYVaYlSnTET7QJ+Mdp+FVJ5MD2pyh7Ns="; + sha256 = "sha256-ZizmDuEu3D8cVOMw0k1yBXlLft+nzOPnqv5Yi6vk5AM="; }; vendorHash = "sha256-p8+M+pRp12P7tYlFpXjU94JcJOugQpD8rFdowhonh74="; diff --git a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix index b9fa98a228..e291ed8eab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.31.0"; + version = "2.31.2"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-2F8f+vw559FI7CCiLkP8WLpLzDYzr3SHf/Ec8yFHu6g="; + sha256 = "sha256-UL8PJnz+fV67F0t24OEReF4tIUa8S2NzICYgUU7fgUo="; }; doCheck = false; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; nativeBuildInputs = [ installShellFiles pkg-config ]; - cargoHash = "sha256-G/c84j9BquLCJcl60H0ZZZDxjTHpaGHflfJL/hzdgYQ="; + cargoHash = "sha256-S1NwnPn3PRL6GoRBFEhhNuy9StrAhG5qCDW2uWNyU4E="; postInstall = '' installShellCompletion --cmd sentry-cli \ @@ -42,6 +42,6 @@ rustPlatform.buildRustPackage rec { description = "A command line utility to work with Sentry"; mainProgram = "sentry-cli"; changelog = "https://github.com/getsentry/sentry-cli/raw/${version}/CHANGELOG.md"; - maintainers = with maintainers; [ rizary loewenheim ]; + maintainers = with maintainers; [ rizary ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix index 1b7d679559..ed67db03e5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.2.4"; + version = "3.2.5"; src = fetchzip { url = "mirror://maven/org/springframework/boot/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}-bin.zip"; - hash = "sha256-rOXQyIdyDT/YRuWgbbObFWnCOI+XEZ4+vGvIxJJ8CC4="; + hash = "sha256-NRJ5vL/tcm/CrNIEUh7gntLsLwWD9bL048Ycx1pRlQU="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix b/third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix index 47f302a2ac..7846d381ae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.17.6"; + version = "0.17.8"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-VgPc78xhafRlEUfNMKiYDyWqZVtYDkqwVDQ3BG9r70w="; + hash = "sha256-60CN+Z5YZemYwn7eN0VZ/S8kAmQv6DBA1tCAhDLDKe0="; }; proxyVendor = true; - vendorHash = "sha256-YmjQj116egYhcpJ9Vps1d30bfCY6pAu/mA9MEzXVJb8="; + vendorHash = "sha256-I1kyXotFYvnL8/FryjKJWGOYSTeXrXNB1+TNgR7q3qo="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix b/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix index 1813ac2165..7a70c6378d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix @@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://squawkhq.com/"; changelog = "https://github.com/sbdchd/squawk/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with lib.maintainers; [ andrewsmith marsam ]; + maintainers = with lib.maintainers; [ andrewsmith ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/supabase-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/supabase-cli/default.nix index 201cc66d21..0ffe6d98e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/supabase-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.162.6"; + version = "1.166.2"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-BCJlYutgfHlJqUR1W/yWHkc/trszUuZZmgMMGd1XdFU="; + hash = "sha256-QytOsrFSRHyYX9nq3pttKwjH7XbRHrzoLO3pJnd0U5Q="; }; - vendorHash = "sha256-n69PwTcjEWqLetcRUM1YFkovYsE90Q3WaoBr4L/IwQU="; + vendorHash = "sha256-6dDI3zFZgjDbbvaAEmjzurJ1obFoxMfakmrOewR4qdo="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/swiftpm2nix/support.nix b/third_party/nixpkgs/pkgs/development/tools/swiftpm2nix/support.nix index dfc2d01a45..3debda233c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/swiftpm2nix/support.nix +++ b/third_party/nixpkgs/pkgs/development/tools/swiftpm2nix/support.nix @@ -1,6 +1,6 @@ { lib, fetchgit, formats }: -with lib; let + inherit (lib) concatStrings listToAttrs makeOverridable mapAttrsToList nameValuePair; json = formats.json { }; in rec { diff --git a/third_party/nixpkgs/pkgs/development/tools/tabnine/sources.json b/third_party/nixpkgs/pkgs/development/tools/tabnine/sources.json index 96a791ff09..8ebec98bfc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tabnine/sources.json +++ b/third_party/nixpkgs/pkgs/development/tools/tabnine/sources.json @@ -1,17 +1,17 @@ { - "version": "4.10.0", + "version": "4.154.0", "platforms": { "x86_64-linux": { "name": "x86_64-unknown-linux-musl", - "hash": "sha256-sVjSrQsdOtWvuYZqLSmlsbu2yKe7MYBOxctrKlltlwY=" + "hash": "sha256-FGhe3ih8WEOW/jfT7t+9IK7f17b4JwCXuQfwxZyOUNU=" }, "aarch64-darwin": { "name": "aarch64-apple-darwin", - "hash": "sha256-HMPK09rOwRbsRwiHwjXZnDt4evEz2CP8zAReg/bhgTg=" + "hash": "sha256-8bwrbMQJkBMLgWt0n6R6uc+s6SxZr8JiGM+2ni5lgqY=" }, "x86_64-darwin": { "name": "x86_64-apple-darwin", - "hash": "sha256-8y96VXWvHYTO+qs8x6ND5tD3Mb4qBXwdcIeYBLOkCdc=" + "hash": "sha256-C0zePvocvgm8gP0C++7xJ5yb8MLb7kY/5HNsbEeZu6Q=" } } } diff --git a/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix b/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix index 39662c40ed..c4ec27393a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix @@ -12,13 +12,13 @@ SystemConfiguration rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.18.8"; + version = "0.20.1"; src = fetchFromGitHub { owner = "trunk-rs"; repo = "trunk"; rev = "v${version}"; - hash = "sha256-cx14IVqsu1SQezs8T1HFZ75+MPWkvf5RcvGCodW5G4A="; + hash = "sha256-VcTlXGfNfkbFoJiNmOp0AS0/NApgTaiZEafZSV2PuTI="; }; nativeBuildInputs = [ pkg-config ]; @@ -28,28 +28,7 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoHash = "sha256-zMkRCNFrfkUvq6oz/7GtaWNw9YS5NygBUYzoOAoQl40="; - - # the dependency css-minify contains both README.md and Readme.md, - # which causes a hash mismatch on systems with a case-insensitive filesystem - # this removes the readme files and updates cargo's checksum file accordingly - depsExtraArgs = { - nativeBuildInputs = [ - jq - moreutils - ]; - - postBuild = '' - pushd $name/css-minify - - rm -f README.md Readme.md - jq 'del(.files."README.md") | del(.files."Readme.md")' \ - .cargo-checksum.json -c \ - | sponge .cargo-checksum.json - - popd - ''; - }; + cargoHash = "sha256-jXp6B9eTYKfDgzzgp1oRMzwVJOzsh9h0+igQLBZmdsk="; meta = with lib; { homepage = "https://github.com/trunk-rs/trunk"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix b/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix index 145144528f..c2c599f32f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "ttfb"; - version = "1.11.0"; + version = "1.12.0"; src = fetchCrate { inherit pname version; - hash = "sha256-38mhwYfWoMZzdbkgv65hBpX23wCpAWwiahuzO5xRpmA="; + hash = "sha256-Cdup65w31wF1RZu0g4/msHfLESrNTcuCU5kxkk0gnW8="; }; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-Gqv4XvG3aYMRdMP1mzUlsCPN+NMLHq2nf283KBQCems=="; + cargoHash = "sha256-U8CG0GqnUwya+ZK0qXtOFZ/MbbqSvB5egX7XJKtl88g="; # The bin feature activates all dependencies of the binary. Otherwise, # only the library is build. diff --git a/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix index 84113832cb..322d46ac2f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.90.7"; + version = "0.93.8"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-+pd2bRyu1BFhzJ1iGDmBv/DR8oZHC0hGZBgZZIxpaYo="; + hash = "sha256-glY1xWu38wZLo9eyPAR4NtGDfLl1BkaN+WICIACHECo="; }; vendorHash = "sha256-2NjdjB09WYzHjQEl2hMUWN1/xsj/Hlr8lVYU/pkxTqQ="; diff --git a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix index 649dd335bd..414a855bea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/twilio/twilio-cli"; changelog = "https://github.com/twilio/twilio-cli/blob/${finalAttrs.version}/CHANGES.md"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; platforms = nodejs-slim.meta.platforms; mainProgram = "twilio"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/txtpbfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/txtpbfmt/default.nix index af69078fe1..d08fe67330 100644 --- a/third_party/nixpkgs/pkgs/development/tools/txtpbfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/txtpbfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule { pname = "txtpbfmt"; - version = "unstable-2023-10-25"; + version = "0-unstable-2024-04-16"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "txtpbfmt"; - rev = "084445ff1adf0d8a27429bba65dbde5663f02d26"; - hash = "sha256-SoU1GON9avesty6FSZ+z6o2JHInUtwv+PVOzqCu+8L8="; + rev = "1e18ef0a7fdc4d28b9223d2d50b4b2be7024519e"; + hash = "sha256-L96aEAlPvdBXxAbH8IszQK0r7ouICmFrkHtTJe/dD+E="; }; vendorHash = "sha256-IdD+R8plU4/e9fQaGSM5hJxyMECb6hED0Qg8afwHKbY="; @@ -17,9 +17,9 @@ buildGoModule { meta = with lib; { description = "Formatter for text proto files"; - mainProgram = "txtpbfmt"; homepage = "https://github.com/protocolbuffers/txtpbfmt"; license = licenses.asl20; maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "txtpbfmt"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix index 1d8c678a7a..37a096c0d7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.20.9"; + version = "1.21.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-p9vw2BDfCb31nsHvkdW75fYgEV0Nd3xd7hibAvqL+MA="; + hash = "sha256-PvMa2hQYDu42ZzwBZrMQZy48RxUzHMvlLYEzPN3sh1w="; }; - cargoHash = "sha256-cLoTMzvJsjFhMZZRp24hacTdPRhWjcM5xc77obp8UGI="; + cargoHash = "sha256-P7pzyfv+0ckzVjC95a+YW6Ni3sLnqgjoZ4JlnfKO17M="; meta = with lib; { description = "Source code spell checker"; diff --git a/third_party/nixpkgs/pkgs/development/tools/uftrace/default.nix b/third_party/nixpkgs/pkgs/development/tools/uftrace/default.nix index 17be739ea0..beb0a511aa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/uftrace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/uftrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uftrace"; - version = "0.15.2"; + version = "0.16"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; rev = "v${version}"; - sha256 = "sha256-FfTt1S7X7FakKXWbmJJ1HMYcu/tG/UFknz8XmEPbPUo="; + sha256 = "sha256-JuBwyE6JH3CpJH863LbnWELUIIEKVaAcz8h8beeABGQ="; }; postUnpack = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix b/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix index 3ef4b44953..84fe6d4359 100644 --- a/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-cFHcfpsHSDlR82PtZ0leRDpvCD6nw0Qdb3PsYKMnosA="; + sha256 = "sha256-TjuOsF4LFqQGx4j5j/Er97MNhVm72qlvGYZvA5vuXs8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix index b3f4987146..8fd63f6e30 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix @@ -9,13 +9,13 @@ , pkg-config , vala , gettext -, wrapGAppsHook +, wrapGAppsHook3 , unstableGitUpdater }: stdenv.mkDerivation rec { pname = "vala-lint"; - version = "unstable-2023-12-05"; + version = "0-unstable-2023-12-05"; src = fetchFromGitHub { owner = "vala-lang"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/vsce/default.nix b/third_party/nixpkgs/pkgs/development/tools/vsce/default.nix index a2be7f3abd..45aa3f6ba5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vsce/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vsce/default.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "vsce"; - version = "2.26.0"; + version = "2.26.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; rev = "v${version}"; - hash = "sha256-ILu09OerH5XNVN4el3R2GH2LtIzXiQ/ONU+W2pomHRg="; + hash = "sha256-VL7OMtboD3rUNWQbb10i1qL7MpuUsM8/DbBKLUl6DSs="; }; npmDepsHash = "sha256-EtzcWeqPy4XVlheBXBpSwxrsHJ678lhTgnYqzIYZn4M="; diff --git a/third_party/nixpkgs/pkgs/development/tools/wails/default.nix b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix index 7ebd579ae2..9a158be022 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wails/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "wails"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - hash = "sha256-yIoCKnYKky+BlMjGBNRk0lKyxr3UWMdRsvyW2KUItBk="; + hash = "sha256-oJ/kxYphBTXxt7Da1x4GW/a78YV+m32iC/4N3MDjU/A="; } + "/v2"; - vendorHash = "sha256-6QFnLuRnSzIqkQkK1qg7VBYxwjK8fSQWz5RxpuyutoY="; + vendorHash = "sha256-15Vo4AKmd9qOF0ea1klTlrXJOUs+IHvsNT2rw4R7ZiU="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix index afc968a386..6fce69be41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -8,9 +8,9 @@ , stdenv , curl , Security -, version ? "0.2.91" -, hash ? "sha256-f/RK6s12ItqKJWJlA2WtOXtwX4Y0qa8bq/JHlLTAS3c=" -, cargoHash ? "sha256-3vxVI0BhNz/9m59b+P2YEIrwGwlp7K3pyPKt4VqQuHE=" +, version ? "0.2.92" +, hash ? "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=" +, cargoHash ? "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0=" }: rustPlatform.buildRustPackage rec { diff --git a/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix index 9733cfd073..863d53bb09 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix @@ -5,7 +5,7 @@ let pname = "wgo"; - version = "0.5.4"; + version = "0.5.6d"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "bokwoon95"; repo = "wgo"; rev = "v${version}"; - hash = "sha256-MPmB6G5JCIEfFYchVmV8sS5Zfzfui9tClDI6RlLdP6U="; + hash = "sha256-PzBje046mS844zpU5X1eoRcULJH8sh49yf8lrxeA764="; }; vendorHash = "sha256-w6UJxZToHbbQmuXkyqFzyssFcE+7uVNqOuIF/XKdEsU="; diff --git a/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix b/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix index d6fce69b43..51e227ad02 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { compositor and back again. ''; homepage = "https://github.com/MirServer/wlcs"; - changelog = "https://github.com/MirServer/wlcs/releases/tag/v${version}"; + changelog = "https://github.com/MirServer/wlcs/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/tools/yamlfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/yamlfmt/default.nix index 5f8c043b19..3b7fbc20ca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yamlfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yamlfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yamlfmt"; - version = "0.11.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7+ui5jEJkjejAZRdM+okoF3Qw8SJSTKJS7LNNnBgz0g="; + sha256 = "sha256-VAXDkD4JLoiTomCNtuex/ZEAZtWDEEg5cxETYemvQW8="; }; - vendorHash = "sha256-JiFVc2+LcCgvnEX6W4XBtIgXcILEO2HZT4DTp62eUJU="; + vendorHash = "sha256-UfULQw7wAEJjTFp6+ACF5Ki04eFKeUEgmbt1c8pUolA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix index 47a539f6d7..b7caeb4f82 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yarn-berry"; - version = "4.1.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "yarnpkg"; repo = "berry"; rev = "@yarnpkg/cli/${finalAttrs.version}"; - hash = "sha256-75bERA1uZeywMjYznFDyk4+AtVDLo7eIajVtWdAD/RA="; + hash = "sha256-dOWcfeWotWgx1ctY/TEuxH1gkgp9Gxou6jaymJMBHLE="; }; buildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://yarnpkg.com/"; description = "Fast, reliable, and secure dependency management."; license = licenses.bsd2; - maintainers = with maintainers; [ ryota-ka thehedgeh0g DimitarNestorov ]; + maintainers = with maintainers; [ ryota-ka pyrox0 DimitarNestorov ]; platforms = platforms.unix; mainProgram = "yarn"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix index 9d95676ec2..e8bf911a70 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix @@ -51,7 +51,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://classic.yarnpkg.com/"; changelog = "https://github.com/yarnpkg/yarn/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.bsd2; - maintainers = with maintainers; [ offline screendriver marsam ]; + maintainers = with maintainers; [ offline screendriver ]; platforms = platforms.all; mainProgram = "yarn"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix index f4d8137c33..f54f77113e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.43.1"; + version = "4.44.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-AQOHVuDREp6OpwlPFwpCUOQACOsDRH0uM6WwKyEK4JI="; + hash = "sha256-5l948J0NTeWOeUMlcoEQZws8viqtARdkJsGch4c6Trw="; }; - vendorHash = "sha256-9GCqZS0fguJo8GkVPMgbstEVzrjIS0kdbNQEaT1HSFI="; + vendorHash = "sha256-j5vcx5wW2v1kNc2QCPR11JEb1fTA9q4E4mbJ2VJC37A="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/zsv/default.nix b/third_party/nixpkgs/pkgs/development/tools/zsv/default.nix index c311a4de9d..3d917e4348 100644 --- a/third_party/nixpkgs/pkgs/development/tools/zsv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/zsv/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/liquidaty/zsv"; changelog = "https://github.com/liquidaty/zsv/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/bloomrpc/default.nix b/third_party/nixpkgs/pkgs/development/web/bloomrpc/default.nix index fc14b131be..b2f3dbae4a 100644 --- a/third_party/nixpkgs/pkgs/development/web/bloomrpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/bloomrpc/default.nix @@ -21,11 +21,7 @@ appimageTools.wrapType2 { export LC_ALL=C.UTF-8 ''; - multiArch = false; # no 32bit needed - extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; - extraInstallCommands = '' - ln -s $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png \ $out/share/icons/hicolor/512x512/apps/${pname}.png diff --git a/third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix b/third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix index 757b9e8c20..14675efdac 100644 --- a/third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix @@ -13,8 +13,6 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/bstudio.desktop -t $out/share/applications substituteInPlace $out/share/applications/bstudio.desktop \ diff --git a/third_party/nixpkgs/pkgs/development/web/bun/default.nix b/third_party/nixpkgs/pkgs/development/web/bun/default.nix index 512bbaa3e8..38f926c22e 100644 --- a/third_party/nixpkgs/pkgs/development/web/bun/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.4"; + version = "1.1.8"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-dBiwVO4WreVyIlbJVEyPZj46Dy/3W49mXdo7CiQWiAo="; + hash = "sha256-n5ElTDuD0fap+llzrXN7de937jYaAG8dpJlKUB0npT4="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-XsyjcqKZ667iVTVsOKjaD9iORze0Zs8ZHiDYvuXQ07A="; + hash = "sha256-4/kEyaF2kmu8MAjlrPgBqKFDId8bBibu3Zll3b0w8Ro="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-M6MoYPNCGBP0KuNnv8cOnm47FJyxI6MXzsX+FvHxAEA="; + hash = "sha256-btyslaKqdk86whAnQV0on7NWTBTRTegFvMsOl0YyloY="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-9H/1qR6ZHHy5/abq2SjoUbUX6Y92/8MQem2inuWhVC8="; + hash = "sha256-JuDT+8FHbamdMVCDeSTGPYOvhPY2EZ9XeD2zjHEj36Y="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/third_party/nixpkgs/pkgs/development/web/cog/default.nix b/third_party/nixpkgs/pkgs/development/web/cog/default.nix index c350149f32..0a9be7e568 100644 --- a/third_party/nixpkgs/pkgs/development/web/cog/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cog/default.nix @@ -10,7 +10,7 @@ , glib-networking , webkitgtk , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , gnome , gdk-pixbuf }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { pkg-config wayland makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; depsBuildsBuild = [ diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix index dedd94230b..8ce3c5aef7 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix @@ -10,7 +10,7 @@ , stdenv , udev , unzip -, wrapGAppsHook +, wrapGAppsHook3 , xorg }: @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook unzip ]; + nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook3 unzip ]; buildInputs = with xorg; [ libXScrnSaver diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index b7c9e3e6ca..068bee73e1 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.42.3"; + version = "1.43.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-mjMpjbQbj0QyvRU4RRL++zvAxU2ZfMDhDauBC+zIH/g="; + hash = "sha256-Y/1c0b7CmT5jzgkRGzEnTNmUiLn5oDf5jTvzU2SU0RA="; }; - cargoHash = "sha256-xuR7XrcI1O8NB6YY0oGFHxv+eUmt3WX1dXBI9aOOw58="; + cargoHash = "sha256-Hoe22bToJ+2nZeq9iy2XXwbXDEbfRjW1g3rhcT3Og04="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix index e0f797b4c6..c4b2d814ef 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix @@ -10,11 +10,11 @@ let }; in fetch_librusty_v8 { - version = "0.89.0"; + version = "0.91.0"; shas = { - x86_64-linux = "sha256-XxX3x3LBiJK768gvzIsV7aKm6Yn5dLS3LINdDOUjDGU="; - aarch64-linux = "sha256-ZetNxahe/XDp6OoGFkZS7VfOPQPbEGUkPNAaSJ0Y90M="; - x86_64-darwin = "sha256-A047aVL2KSNWofPK2eH395iGPcdM+FjSxu5GkW9wJnI="; - aarch64-darwin = "sha256-XN2JFL8Rs9hyTquVx6brjW15H54mhVIHqzkdEy9smqM="; + x86_64-linux = "sha256-xLQnHOUuZq24/LhXJ1PgspI/Mpip3XSLMVQE/nh4chE="; + aarch64-linux = "sha256-zt05idUKlyPuVk8+N219dTfhtlcObO+cBb41Z6TTwfs="; + x86_64-darwin = "sha256-AFEUZO3aKNy4rEk9Mi611cuduE5p5lkE23RzLOTPP4Q="; + aarch64-darwin = "sha256-fldGauOMYSwWWP/kF0Ifp5s20h6akbb5sI8iw1hj/6s="; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index 84caa116ee..8ca6eca526 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGo122Module rec { pname = "flyctl"; - version = "0.2.25"; + version = "0.2.52"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-yMkTLUM/1P9VrsYaF4m9YyRLV6qz6uMiYlhUN5S58uU="; + hash = "sha256-BCnMXyS94tuD+Un1DLqs3mdGi7XrVBoZGJ/XkpACOQI"; }; - vendorHash = "sha256-TMlJbh9tMRNdeZlem27lgknuJ/YNFkVaWS9BNTTuXic="; + vendorHash = "sha256-eTiY65VGFBgGzCOrnp/WbOo9Lbdk4PYwT7CppjsZ4WE="; subPackages = [ "." ]; @@ -52,12 +52,12 @@ buildGo122Module rec { version = "v${flyctl.version}"; }; - meta = with lib; { + meta = { description = "Command line tools for fly.io services"; downloadPage = "https://github.com/superfly/flyctl"; homepage = "https://fly.io/"; - license = licenses.asl20; - maintainers = with maintainers; [ adtya jsierles techknowlogick ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ adtya jsierles techknowlogick ]; mainProgram = "flyctl"; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/ihp-new/default.nix b/third_party/nixpkgs/pkgs/development/web/ihp-new/default.nix index 63cd365810..76e66a7ae4 100644 --- a/third_party/nixpkgs/pkgs/development/web/ihp-new/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/ihp-new/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ihp-new"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "digitallyinduced"; repo = "ihp"; rev = "v${version}"; - sha256 = "sha256-oQz7ZBrHe6WwYMwnxxUgnYM55CuH5Oxjz6mrLnYbB7U="; + sha256 = "sha256-DmaIr9kF+TG24wVNPVufxC74TYMCLziLYS9hCZHBDTc="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix index 422c6b7378..0d9b0e422b 100644 --- a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, makeWrapper, fetchurl, dpkg, alsa-lib, atk, cairo, cups, dbus, expat , fontconfig, freetype, gdk-pixbuf, glib, pango, mesa, nspr, nss, gtk3 -, at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook +, at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook3 , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, nghttp2 , libudev0-shim, glibc, curl, openssl, autoPatchelfHook }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { dpkg makeWrapper gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/node-npm-build-npm-package-logic.patch b/third_party/nixpkgs/pkgs/development/web/nodejs/node-npm-build-npm-package-logic.patch index a9ac6b0589..a24ab07a3d 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/node-npm-build-npm-package-logic.patch +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/node-npm-build-npm-package-logic.patch @@ -49,7 +49,7 @@ index 1fa8b1f96..a026bb50d 100644 + if (process.env['NIX_NODEJS_BUILDNPMPACKAGE']) { + const spawn = require('@npmcli/promise-spawn') + -+ const npmWithNixFlags = (args, cmd) => spawn('bash', ['-c', 'npm ' + args + ` $npm${cmd}Flags "$\{npm${cmd}FlagsArray[@]}" $npmFlags "$\{npmFlagsArray[@]}"`], { cwd: dir, env: { ...process.env, _PACOTE_NO_PREPARE_: noPrepare.join('\n') } }, { message: `\`npm ${args}\` failed` }) ++ const npmWithNixFlags = (args, cmd) => spawn('bash', ['-c', 'npm ' + args + ` $npm${cmd}Flags "$\{npm${cmd}FlagsArray[@]}" $npmFlags "$\{npmFlagsArray[@]}" || [ -n "$forceGitDeps" ]`], { cwd: dir, env: { ...process.env, _PACOTE_NO_PREPARE_: noPrepare.join('\n') } }, { message: `\`npm ${args}\` failed` }) + const patchShebangs = () => spawn('bash', ['-c', 'source $stdenv/setup; patchShebangs node_modules'], { cwd: dir }) + + // the DirFetcher will do its own preparation to run the prepare scripts @@ -57,7 +57,7 @@ index 1fa8b1f96..a026bb50d 100644 + // + // We ignore this.npmConfig to maintain an environment that's as close + // to the rest of the build as possible. -+ return spawn('bash', ['-c', '$prefetchNpmDeps --fixup-lockfile package-lock.json'], { cwd: dir }) ++ return spawn('bash', ['-c', '$prefetchNpmDeps --fixup-lockfile package-lock.json || [ -n "$forceGitDeps" ]'], { cwd: dir }) + .then(() => npmWithNixFlags('ci --ignore-scripts', 'Install')) + .then(patchShebangs) + .then(() => npmWithNixFlags('rebuild', 'Rebuild')) diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix index b1bd0ae912..9103846791 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix @@ -206,7 +206,7 @@ let homepage = "https://nodejs.org"; changelog = "https://github.com/nodejs/node/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu gilligan cko marsam ]; + maintainers = with maintainers; [ goibhniu cko ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "node"; knownVulnerabilities = optional (versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v21.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix similarity index 79% rename from third_party/nixpkgs/pkgs/development/web/nodejs/v21.nix rename to third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix index dedda892a9..a72f22b6f4 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v21.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "21.7.3"; - sha256 = "08csswa1h55l9zvfjc4g1ksicgl42pbz7g1bc9hgy77w3gxjd2v6"; + version = "22.0.0"; + sha256 = "sha256-IuKPv/MfaQc7gCTLQnReUQX4QEHzR1smC5fVoUEDnRo="; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch diff --git a/third_party/nixpkgs/pkgs/development/web/postman/darwin.nix b/third_party/nixpkgs/pkgs/development/web/postman/darwin.nix index 4e47a153fa..79458298dc 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/darwin.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/darwin.nix @@ -11,12 +11,12 @@ let dist = { aarch64-darwin = { arch = "arm64"; - sha256 = "sha256-P7x06KKH0e1Yro93SCEJyiWS/Uv25tWU8A85vxv85hI="; + sha256 = "sha256-V+JLXl12DnwZlPF0qNs2lQqRpWbSDiPXDTtl4FGcZcM="; }; x86_64-darwin = { arch = "64"; - sha256 = "sha256-/jlLU5NKF8sNZ49n90219b/oiVFT8EkFx2oYhIk8Tgw="; + sha256 = "sha256-l7J4Rrq+kUyk+0Chq5qo50K1VXC/7E3FC/hQ1DQ0PGA="; }; }.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); diff --git a/third_party/nixpkgs/pkgs/development/web/postman/default.nix b/third_party/nixpkgs/pkgs/development/web/postman/default.nix index 0765c711e4..f9684f64fe 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/default.nix @@ -2,7 +2,7 @@ let pname = "postman"; - version = "10.23.5"; + version = "11.1.0"; meta = with lib; { homepage = "https://www.getpostman.com"; description = "API Development Environment"; diff --git a/third_party/nixpkgs/pkgs/development/web/postman/linux.nix b/third_party/nixpkgs/pkgs/development/web/postman/linux.nix index 763337fd25..3784cca31a 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/linux.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/linux.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 , atk , at-spi2-atk , at-spi2-core @@ -54,12 +54,12 @@ let dist = { aarch64-linux = { arch = "arm64"; - sha256 = "sha256-esboLFqCziTlCFHyK6GxFq9Rik9jHiqX6ED0D53P1K4="; + sha256 = "sha256-yq2J5KRv/NJDaQG7e7RKyzbJqKWRolSU9X6khHxlrNo="; }; x86_64-linux = { arch = "64"; - sha256 = "sha256-NH5bfz74/WIXbNdYs6Hoh/FF54v2+b4Ci5T7Y095Akw="; + sha256 = "sha256-fAaxrLZSXGBYr4Vu0Cz2pZwXivSTkaIF5wL217cB9qM="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { xorg.libxshmfence ]; - nativeBuildInputs = [ wrapGAppsHook copyDesktopItems ]; + nativeBuildInputs = [ wrapGAppsHook3 copyDesktopItems ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/development/web/publii/default.nix b/third_party/nixpkgs/pkgs/development/web/publii/default.nix index e09e21f174..9792f26864 100644 --- a/third_party/nixpkgs/pkgs/development/web/publii/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/publii/default.nix @@ -3,7 +3,7 @@ , fetchurl , autoPatchelfHook , makeShellWrapper -, wrapGAppsHook +, wrapGAppsHook3 , alsa-lib , at-spi2-atk , at-spi2-core @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeShellWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/1oom/default.nix b/third_party/nixpkgs/pkgs/games/1oom/default.nix index 54bfb4d0b3..487a08f752 100644 --- a/third_party/nixpkgs/pkgs/games/1oom/default.nix +++ b/third_party/nixpkgs/pkgs/games/1oom/default.nix @@ -1,30 +1,34 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, libsamplerate, SDL2, SDL2_mixer, readline }: +{ lib, stdenv, fetchFromGitHub, gitUpdater, autoreconfHook, allegro, libsamplerate, libX11, libXext, SDL, SDL_mixer, SDL2, SDL2_mixer, readline }: stdenv.mkDerivation rec { pname = "1oom"; - version = "1.0"; + version = "1.8.1"; - src = fetchFromGitLab { - owner = "KilgoreTroutMaskReplicant"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-+HwSykSyAGHtITVOu4nIG87kWwVxGyFXb/NRSjhWlvs="; + src = fetchFromGitHub { + owner = "1oom-fork"; + repo = "1oom"; + rev = "refs/tags/f${version}"; + hash = "sha256-sBVcPR4+MDjyOLgrB4VcVy0cDyyG5MVY9vNhWwqAhBA="; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libsamplerate SDL2 SDL2_mixer readline ]; + buildInputs = [ allegro libsamplerate libX11 libXext SDL SDL_mixer SDL2 SDL2_mixer readline ]; outputs = [ "out" "doc" ]; postInstall = '' install -d $doc/share/doc/${pname} install -t $doc/share/doc/${pname} \ - HACKING NEWS PHILOSOPHY README doc/*.txt + HACKING NEWS PHILOSOPHY README.md doc/*.txt ''; + passthru.updateScript = gitUpdater { + rev-prefix = "f"; + }; + meta = with lib; { - homepage = "https://kilgoretroutmaskreplicant.gitlab.io/plain-html/"; - description = "Master of Orion (1993) game engine recreation"; + homepage = "https://github.com/1oom-fork/1oom"; + description = "Master of Orion (1993) game engine recreation; a more updated fork"; license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; diff --git a/third_party/nixpkgs/pkgs/games/abuse/default.nix b/third_party/nixpkgs/pkgs/games/abuse/default.nix index 0a77c842bd..cd3587a244 100644 --- a/third_party/nixpkgs/pkgs/games/abuse/default.nix +++ b/third_party/nixpkgs/pkgs/games/abuse/default.nix @@ -4,14 +4,14 @@ , SDL2, SDL2_mixer, freepats }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "abuse"; version = "0.9.1"; src = fetchFromGitHub { owner = "Xenoveritas"; - repo = pname; - rev = "v${version}"; + repo = "abuse"; + rev = "v${finalAttrs.version}"; hash = "sha256-eneu0HxEoM//Ju2XMHnDMZ/igeVMPSLg7IaxR2cnJrk="; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - cp --reflink=auto -r ${data}/data/sfx ${data}/data/music data/ + cp --reflink=auto -r ${finalAttrs.data}/data/sfx ${finalAttrs.data}/data/music data/ ''; desktopItems = [ (makeDesktopItem { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { substituteAll "${./abuse.sh}" $out/bin/abuse chmod +x $out/bin/abuse - install -Dm644 ${data}/doc/abuse.png $out/share/pixmaps/abuse.png + install -Dm644 ${finalAttrs.data}/doc/abuse.png $out/share/pixmaps/abuse.png ''; env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2"; @@ -49,16 +49,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ copyDesktopItems cmake ]; buildInputs = [ SDL2 SDL2_mixer freepats ]; - meta = with lib; { + meta = { description = "Side-scroller action game that pits you against ruthless alien killers"; homepage = "http://abuse.zoy.org/"; - license = with licenses; [ unfree ]; + license = lib.licenses.unfree; # Most of abuse is free (public domain, GPL2+, WTFPL), however the creator # of its sfx and music only gave Debian permission to redistribute the # files. Our friends from Debian thought about it some more: # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648272 - maintainers = with maintainers; [ iblech ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ iblech ]; + platforms = lib.platforms.unix; broken = stdenv.isDarwin; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/games/anki/Cargo.lock b/third_party/nixpkgs/pkgs/games/anki/Cargo.lock index d5e7ac5c21..0d67118170 100644 --- a/third_party/nixpkgs/pkgs/games/anki/Cargo.lock +++ b/third_party/nixpkgs/pkgs/games/anki/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" dependencies = [ "cfg-if", "once_cell", @@ -126,19 +126,20 @@ dependencies = [ "hyper", "id_tree", "inflections", - "itertools 0.12.0", + "itertools 0.12.1", "lazy_static", "nom", "num_cpus", "num_enum", "once_cell", + "pbkdf2 0.12.2", "percent-encoding-iri", "phf 0.11.2", "pin-project", "prettyplease", "prost", "prost-reflect", - "pulldown-cmark 0.9.3", + "pulldown-cmark 0.9.6", "rand 0.8.5", "regex", "reqwest", @@ -151,8 +152,8 @@ dependencies = [ "serde_tuple", "sha1", "snafu", - "strum", - "syn 2.0.39", + "strum 0.26.1", + "syn 2.0.51", "tempfile", "tokio", "tokio-util", @@ -164,7 +165,7 @@ dependencies = [ "unicase", "unicode-normalization", "utime", - "windows 0.52.0", + "windows 0.54.0", "wiremock", "zip", "zstd 0.13.0", @@ -188,7 +189,7 @@ dependencies = [ "fluent-syntax", "inflections", "intl-memoizer", - "itertools 0.12.0", + "itertools 0.12.1", "num-format", "phf 0.11.2", "serde", @@ -209,7 +210,7 @@ dependencies = [ name = "anki_process" version = "0.0.0" dependencies = [ - "itertools 0.12.0", + "itertools 0.12.1", "snafu", ] @@ -221,14 +222,14 @@ dependencies = [ "anki_proto_gen", "anyhow", "inflections", - "itertools 0.12.0", + "itertools 0.12.1", "prost", "prost-build", "prost-reflect", "prost-types", "serde", "snafu", - "strum", + "strum 0.26.1", ] [[package]] @@ -239,7 +240,7 @@ dependencies = [ "anyhow", "camino", "inflections", - "itertools 0.12.0", + "itertools 0.12.1", "once_cell", "prost-reflect", "prost-types", @@ -249,9 +250,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -263,9 +264,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -278,9 +279,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ "windows-sys 0.52.0", ] @@ -297,9 +298,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "apple-bundles" @@ -357,9 +358,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" dependencies = [ "futures-core", "memchr", @@ -388,18 +389,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -480,7 +481,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -506,9 +507,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -554,9 +555,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "blake3" @@ -597,26 +598,26 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "serde", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "burn" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5008368c07b8ffc5c8bde2ebf31b59bdd263fdd825152bd0a9d333a220ba44f" +checksum = "b6b703e5dae87b2146649b64af54688ff86e16cf69fd19d28c43c8f9656d7d7c" dependencies = [ "burn-core", "burn-train", @@ -624,61 +625,67 @@ dependencies = [ [[package]] name = "burn-autodiff" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176a12ffd413ba2bfafa2b4ed1e2a21d7880b67a1ac3a9bb4919c9c0f102cdd7" +checksum = "f306e1b2e480fa0960c3130a68ca5e0fa54b3e33ed2fda7cf2121434703dd771" dependencies = [ "burn-common", "burn-tensor", - "burn-tensor-testgen", "derive-new", "spin 0.9.8", ] [[package]] name = "burn-candle" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2556eb085f2ef1cd8d0d6d932f8a64f529c5d0487ea7e4a868fe6a65e3d892" +checksum = "fc87b644a2d83cc1b7c05d1176e9e24fb6394272256ab9ab8324ff7c4fe0e6a0" dependencies = [ "burn-tensor", "candle-core", "derive-new", - "half 2.3.1", + "half", ] [[package]] name = "burn-common" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dcb7947986d5420a9126959a5f16675f2d7b822bacc60a966fcfcf5a7dbd247" +checksum = "1267068969f094323b62693df0c3b45d3b08a0568f3c3467e6a5c3207e6807c8" dependencies = [ "async-trait", "derive-new", - "getrandom 0.2.11", + "getrandom 0.2.12", "rand 0.8.5", + "serde", "spin 0.9.8", "uuid", + "web-time", ] [[package]] name = "burn-compute" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08dfd31ce4d27c64358991c23a26d8aaa2d9cb0f8517c7e79d01f2fe8d6c1eb0" +checksum = "a1b51588cf7c84976f6241a9ac5f77857712b8bf443dab77296c260785033fe8" dependencies = [ "burn-common", "derive-new", + "dirs", "hashbrown 0.14.3", "log", + "md5", + "serde", + "serde_json", "spin 0.9.8", + "web-time", ] [[package]] name = "burn-core" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2067024ff50b21e29e6835a7cc8189046024fc7c174f1d2d635a4955c5151fe5" +checksum = "6b11d8fd1e8c656eee1a0bb503b798c4583904dcaf7a369cbb8fdfd3acc3d0ab" dependencies = [ "bincode", "burn-autodiff", @@ -693,7 +700,7 @@ dependencies = [ "burn-wgpu", "derive-new", "flate2", - "half 2.3.1", + "half", "hashbrown 0.14.3", "libm", "log", @@ -706,9 +713,9 @@ dependencies = [ [[package]] name = "burn-dataset" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9f3481ac13ad69279d4922cf17866aa99841b76db49d9a7915a7521d772a345" +checksum = "c6050891281ae38ee9dc24d1d5badd084247717b15e3dcdae562a81456a41c6e" dependencies = [ "csv", "derive-new", @@ -724,42 +731,44 @@ dependencies = [ "serde", "serde_json", "serde_rusqlite", - "strum", - "strum_macros", + "strum 0.25.0", + "strum_macros 0.25.3", "tempfile", "thiserror", ] [[package]] name = "burn-derive" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d44415ff69a525b49272a5ed893655441834f9ee6cac3ffe2b2387326042d8fc" +checksum = "70f149de5f32baa3f2191c374edab71e5a323bade05eb6092c702aed76cdcb7b" dependencies = [ "derive-new", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] name = "burn-fusion" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "821663ff1f79865d6b0e998230683f72ff4351608770c07f91e39953e89fbec6" +checksum = "f512f780beaefca46088c4e4a80595511fbc3b35545118281fbf49f1fca767b4" dependencies = [ "burn-common", "burn-tensor", "derive-new", "hashbrown 0.14.3", + "log", + "serde", "spin 0.9.8", ] [[package]] name = "burn-ndarray" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0448005c7ed6f1636ca0e12a148613fdd4d5739e1db8b241c7940140098f4fe3" +checksum = "1aef9fb0b72a1c0a112ed51e35284fb663d3ba3fd98f3a3bfa32db39fd24ae4d" dependencies = [ "burn-autodiff", "burn-common", @@ -776,12 +785,12 @@ dependencies = [ [[package]] name = "burn-tch" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197d7276dd95abe3872fdbdfedd091730700aef7d83542ecc9d20a015791d968" +checksum = "e3d7aec36d836c5a11714480089738120899e2c91f6fe2e23abd09ec4a68a803" dependencies = [ "burn-tensor", - "half 2.3.1", + "half", "libc", "rand 0.8.5", "tch", @@ -789,14 +798,13 @@ dependencies = [ [[package]] name = "burn-tensor" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60f8cf3d9588047b7d221c718b7208b829fdd1050150a69d069b66e1bb6e6cbb" +checksum = "ad09aeb0f2428a4ee91f9876a7d71cef6feb1fcacdab6389362dd878ec5f9b27" dependencies = [ "burn-common", - "burn-tensor-testgen", "derive-new", - "half 2.3.1", + "half", "hashbrown 0.14.3", "libm", "num-traits", @@ -805,21 +813,11 @@ dependencies = [ "serde", ] -[[package]] -name = "burn-tensor-testgen" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a555a79ab0ab974e61aee15e62e87576ca47e7df768f68145754527d31633f87" -dependencies = [ - "proc-macro2", - "quote", -] - [[package]] name = "burn-train" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7defef4e44f0780d25c0aaf4d55efc96fb726b3f5d60902da682a59692359d" +checksum = "dd5536e98b23dd5047728f288e61e8a4d9fbffef6f55086d3483c2464758508d" dependencies = [ "burn-core", "derive-new", @@ -832,9 +830,9 @@ dependencies = [ [[package]] name = "burn-wgpu" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8676fa583cfa91db6f2ed26d8e42197fd378c15ed1e8a62c07286cb88f1971ec" +checksum = "231d2deb14a02838c29dd5e90d1a87a9578d76bda7b02d5c7a77e5440ef6ae95" dependencies = [ "burn-common", "burn-compute", @@ -855,9 +853,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" dependencies = [ "bytemuck_derive", ] @@ -870,7 +868,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -914,20 +912,20 @@ checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" [[package]] name = "candle-core" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d60d9b91c73bc662dc45aff607f5ffe79724b7cf7d7c8dc12a72b25921683b67" +checksum = "6db8659ea87ee8197d2fc627348916cce0561330ee7ae3874e771691d3cecb2f" dependencies = [ "byteorder", "gemm", - "half 2.3.1", + "half", "memmap2", "num-traits", "num_cpus", "rand 0.8.5", "rand_distr", "rayon", - "safetensors", + "safetensors 0.4.2", "thiserror", "yoke", "zip", @@ -950,11 +948,10 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" dependencies = [ - "jobserver", "libc", ] @@ -966,21 +963,21 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets 0.48.5", + "windows-targets 0.52.3", ] [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -989,18 +986,18 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", - "half 1.8.2", + "half", ] [[package]] @@ -1015,9 +1012,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" dependencies = [ "clap_builder", "clap_derive", @@ -1025,9 +1022,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" dependencies = [ "anstream", "anstyle", @@ -1038,40 +1035,39 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.4" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" +checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "coarsetime" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71367d3385c716342014ad17e3d19f7788ae514885a1f4c24f500260fb365e1a" +checksum = "13b3839cf01bb7960114be3ccf2340f541b6d0c81f8690b007b2b39f750f7e5d" dependencies = [ "libc", - "once_cell", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasix", "wasm-bindgen", ] @@ -1128,7 +1124,7 @@ name = "configure" version = "0.0.0" dependencies = [ "anyhow", - "itertools 0.12.0", + "itertools 0.12.1", "ninja_gen", ] @@ -1182,18 +1178,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -1236,46 +1232,37 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -1320,7 +1307,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libloading 0.8.1", "winapi", ] @@ -1365,22 +1352,22 @@ checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] [[package]] name = "derive-new" -version = "0.5.9" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" +checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.51", ] [[package]] @@ -1438,20 +1425,14 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - [[package]] name = "duct" -version = "0.13.6" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e" +checksum = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" dependencies = [ "libc", "once_cell", @@ -1477,9 +1458,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "elasticlunr-rs" @@ -1503,16 +1484,38 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.10.1" +name = "enum-as-inner" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" dependencies = [ - "humantime", - "is-terminal", "log", "regex", - "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", ] [[package]] @@ -1548,13 +1551,13 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "exr" -version = "1.6.4" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", - "flume 0.10.14", - "half 2.3.1", + "flume", + "half", "lebe", "miniz_oxide", "rayon-core", @@ -1576,9 +1579,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "faster-hex" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a" +checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" dependencies = [ "serde", ] @@ -1600,9 +1603,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -1619,15 +1622,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "find-crate" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" -dependencies = [ - "toml", -] - [[package]] name = "find-winsdk" version = "0.2.0" @@ -1699,19 +1693,6 @@ dependencies = [ "thiserror", ] -[[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 0.9.8", -] - [[package]] name = "flume" version = "0.11.0" @@ -1757,7 +1738,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -1812,11 +1793,12 @@ dependencies = [ [[package]] name = "fsrs" -version = "0.1.0" -source = "git+https://github.com/open-spaced-repetition/fsrs-rs.git?rev=58ca25ed2bc4bb1dc376208bbcaed7f5a501b941#58ca25ed2bc4bb1dc376208bbcaed7f5a501b941" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a04c31041078628c5ce7310be96c987bf7f33a3f8815fa0fcdb084eb31feba" dependencies = [ "burn", - "itertools 0.12.0", + "itertools 0.12.1", "log", "ndarray", "ndarray-rand", @@ -1824,7 +1806,7 @@ dependencies = [ "rayon", "serde", "snafu", - "strum", + "strum 0.26.1", ] [[package]] @@ -1837,7 +1819,7 @@ dependencies = [ "camino", "clap", "fluent-syntax", - "itertools 0.12.0", + "itertools 0.12.1", "lazy_static", "regex", "serde_json", @@ -1857,9 +1839,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1872,9 +1854,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1882,15 +1864,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1910,9 +1892,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -1931,38 +1913,38 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1978,9 +1960,9 @@ dependencies = [ [[package]] name = "gemm" -version = "0.16.15" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3afa707040531a7527477fd63a81ea4f6f3d26037a2f96776e57fb843b258e" +checksum = "6ab24cc62135b40090e31a76a9b2766a501979f3070fa27f689c27ec04377d32" dependencies = [ "dyn-stack", "gemm-c32", @@ -1998,9 +1980,9 @@ dependencies = [ [[package]] name = "gemm-c32" -version = "0.16.15" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cc3973a4c30c73f26a099113953d0c772bb17ee2e07976c0a06b8fe1f38a57d" +checksum = "b9c030d0b983d1e34a546b86e08f600c11696fde16199f971cd46c12e67512c0" dependencies = [ "dyn-stack", "gemm-common", @@ -2013,9 +1995,9 @@ dependencies = [ [[package]] name = "gemm-c64" -version = "0.16.15" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30362894b93dada374442cb2edf4512ddf19513c9bec88e06a445bcb6b22e64f" +checksum = "fbb5f2e79fefb9693d18e1066a557b4546cd334b226beadc68b11a8f9431852a" dependencies = [ "dyn-stack", "gemm-common", @@ -2028,13 +2010,13 @@ dependencies = [ [[package]] name = "gemm-common" -version = "0.16.15" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "988499faa80566b046b4fee2c5f15af55b5a20c1fe8486b112ebb34efa045ad6" +checksum = "a2e7ea062c987abcd8db95db917b4ffb4ecdfd0668471d8dc54734fdff2354e8" dependencies = [ "bytemuck", "dyn-stack", - "half 2.3.1", + "half", "num-complex", "num-traits", "once_cell", @@ -2043,18 +2025,19 @@ dependencies = [ "raw-cpuid", "rayon", "seq-macro", + "sysctl", ] [[package]] name = "gemm-f16" -version = "0.16.15" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6cf2854a12371684c38d9a865063a27661812a3ff5803454c5742e8f5a388ce" +checksum = "7ca4c06b9b11952071d317604acb332e924e817bd891bec8dfb494168c7cedd4" dependencies = [ "dyn-stack", "gemm-common", "gemm-f32", - "half 2.3.1", + "half", "num-complex", "num-traits", "paste", @@ -2065,9 +2048,9 @@ dependencies = [ [[package]] name = "gemm-f32" -version = "0.16.15" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bc84003cf6d950a7c7ca714ad6db281b6cef5c7d462f5cd9ad90ea2409c7227" +checksum = "e9a69f51aaefbd9cf12d18faf273d3e982d9d711f60775645ed5c8047b4ae113" dependencies = [ "dyn-stack", "gemm-common", @@ -2080,9 +2063,9 @@ dependencies = [ [[package]] name = "gemm-f64" -version = "0.16.15" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35187ef101a71eed0ecd26fb4a6255b4192a12f1c5335f3a795698f2d9b6cf33" +checksum = "aa397a48544fadf0b81ec8741e5c0fba0043008113f71f2034def1935645d2b0" dependencies = [ "dyn-stack", "gemm-common", @@ -2125,9 +2108,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", @@ -2138,9 +2121,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -2154,9 +2137,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gix-features" -version = "0.33.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f77decb545f63a52852578ef5f66ecd71017ffc1983d551d5fa2328d6d9817f" +checksum = "4d46a4a5c6bb5bebec9c0d18b65ada20e6517dbd7cf855b87dd4bbdce3a771b2" dependencies = [ "gix-hash", "gix-trace", @@ -2165,18 +2148,18 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.5.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d5089f3338647776733a75a800a664ab046f56f21c515fa4722e395f877ef8" +checksum = "20e86eb040f5776a5ade092282e51cdcad398adb77d948b88d17583c2ae4e107" dependencies = [ "gix-features", ] [[package]] name = "gix-hash" -version = "0.12.0" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d4796bac3aaf0c2f8bea152ca924ae3bdc5f135caefe6431116bcd67e98eab9" +checksum = "1f8cf8c2266f63e582b7eb206799b63aa5fa68ee510ad349f637dfe2d0653de0" dependencies = [ "faster-hex", "thiserror", @@ -2184,9 +2167,9 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "8.0.0" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea558d3daf3b1d0001052b12218c66c8f84788852791333b633d7eeb6999db1" +checksum = "388dd29114a86ec69b28d1e26d6d63a662300ecf61ab3f4cc578f7d7dc9e7e23" dependencies = [ "dashmap", "gix-fs", @@ -2200,9 +2183,9 @@ dependencies = [ [[package]] name = "gix-trace" -version = "0.1.3" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836" +checksum = "02b202d766a7fefc596e2cc6a89cda8ad8ad733aed82da635ac120691112a9b1" [[package]] name = "gl_generator" @@ -2230,15 +2213,15 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] [[package]] name = "glow" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" dependencies = [ "js-sys", "slotmap", @@ -2261,7 +2244,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "gpu-alloc-types", ] @@ -2271,7 +2254,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", ] [[package]] @@ -2294,7 +2277,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "gpu-descriptor-types", "hashbrown 0.14.3", ] @@ -2305,14 +2288,14 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", ] [[package]] name = "h2" -version = "0.3.22" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -2329,15 +2312,9 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "half" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ "bytemuck", "cfg-if", @@ -2350,9 +2327,9 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.5.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225" +checksum = "ab283476b99e66691dee3f1640fea91487a8d81f50fb5ecc75538f8f8879a1e4" dependencies = [ "log", "pest", @@ -2412,7 +2389,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "headers-core", "http", @@ -2438,9 +2415,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "379dada1584ad501b383485dd706b8afb7a70fcbc7f4da7d780638a5a6124a60" [[package]] name = "hex" @@ -2465,11 +2442,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2505,9 +2482,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -2561,9 +2538,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -2576,7 +2553,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -2592,7 +2569,7 @@ dependencies = [ "futures-util", "http", "hyper", - "rustls", + "rustls 0.21.10", "tokio", "tokio-rustls", ] @@ -2612,16 +2589,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.51.1", + "windows-core 0.52.0", ] [[package]] @@ -2654,15 +2631,15 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" dependencies = [ "crossbeam-deque", "globset", "log", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "same-file", "walkdir", "winapi-util", @@ -2670,9 +2647,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", @@ -2680,7 +2657,6 @@ dependencies = [ "exr", "gif", "jpeg-decoder", - "num-rational", "num-traits", "png", "qoi", @@ -2689,9 +2665,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -2781,13 +2757,13 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", - "windows-sys 0.48.0", + "libc", + "windows-sys 0.52.0", ] [[package]] @@ -2810,42 +2786,33 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[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.66" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -2911,9 +2878,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -2947,7 +2914,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall", ] @@ -3002,12 +2969,12 @@ version = "0.0.0" dependencies = [ "anki", "futures", - "itertools 0.12.0", + "itertools 0.12.1", "lazy_static", "linkcheck", "regex", "reqwest", - "strum", + "strum 0.26.1", "tokio", ] @@ -3022,9 +2989,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -3162,10 +3129,16 @@ dependencies = [ ] [[package]] -name = "mdbook" -version = "0.4.36" +name = "md5" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80992cb0e05f22cc052c99f8e883f1593b891014b96a8b4637fd274d7030c85e" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "mdbook" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c33564061c3c640bed5ace7d6a2a1b65f2c64257d1ac930c15e94ed0fb561d3" dependencies = [ "ammonia", "anyhow", @@ -3184,7 +3157,7 @@ dependencies = [ "once_cell", "opener", "pathdiff", - "pulldown-cmark 0.9.3", + "pulldown-cmark 0.10.0", "regex", "serde", "serde_json", @@ -3198,15 +3171,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" -version = "0.7.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", "stable_deref_trait", @@ -3227,7 +3200,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -3273,9 +3246,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", @@ -3283,9 +3256,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -3319,12 +3292,12 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "naga" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cd05939c491da968a42986204b7431678be21fdcd4b10cc84997ba130ada5a4" +checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" dependencies = [ "bit-set", - "bitflags 2.4.1", + "bitflags 2.4.2", "codespan-reporting", "hexf-parse", "indexmap", @@ -3343,7 +3316,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -3404,7 +3377,7 @@ dependencies = [ "camino", "dunce", "globset", - "itertools 0.12.0", + "itertools 0.12.1", "lazy_static", "maplit", "num_cpus", @@ -3430,11 +3403,11 @@ checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" [[package]] name = "normpath" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" +checksum = "5831952a9476f2fed74b77d74182fa5ddc4d21c72ec45a333b250e3ed0272804" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3443,7 +3416,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "crossbeam-channel", "filetime", "fsevent-sys", @@ -3479,14 +3452,20 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "bytemuck", "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-format" version = "0.4.4" @@ -3499,30 +3478,18 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" 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.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -3540,23 +3507,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -3580,18 +3547,18 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -3612,11 +3579,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.61" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cfg-if", "foreign-types 0.3.2", "libc", @@ -3633,7 +3600,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -3644,9 +3611,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.97" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ "cc", "libc", @@ -3662,12 +3629,12 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "os_pipe" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3685,7 +3652,7 @@ dependencies = [ "cbc", "cipher", "des", - "getrandom 0.2.11", + "getrandom 0.2.12", "hmac", "lazy_static", "rc2", @@ -3733,6 +3700,17 @@ dependencies = [ "subtle", ] +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "paste" version = "1.0.14" @@ -3753,7 +3731,19 @@ checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ "digest", "hmac", - "password-hash", + "password-hash 0.4.2", + "sha2", +] + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", + "password-hash 0.5.0", "sha2", ] @@ -3779,9 +3769,9 @@ source = "git+https://github.com/ankitects/rust-url.git?rev=bb930b8d089f4d30d7d1 [[package]] name = "pest" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546" dependencies = [ "memchr", "thiserror", @@ -3790,9 +3780,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "22e1288dbd7786462961e69bfd4df7848c1e37e8b74303dbdab82c3a9cdd2809" dependencies = [ "pest", "pest_generator", @@ -3800,22 +3790,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "d0934d6907f148c22a3acbda520c7eed243ad7487a30f51f6ce52b58b7077a8a" dependencies = [ "once_cell", "pest", @@ -3891,7 +3881,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -3914,22 +3904,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -3946,9 +3936,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" @@ -3956,7 +3946,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "indexmap", "line-wrap", "quick-xml", @@ -3994,9 +3984,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -4011,6 +4001,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + [[package]] name = "powerfmt" version = "0.2.0" @@ -4037,37 +4033,43 @@ checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] name = "proc-macro-crate" -version = "2.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ "toml_edit", ] [[package]] -name = "proc-macro2" -version = "1.0.70" +name = "proc-macro-hack" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "profiling" -version = "1.0.11" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" [[package]] name = "prost" @@ -4096,7 +4098,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.39", + "syn 2.0.51", "tempfile", "which 4.4.2", ] @@ -4111,7 +4113,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -4148,21 +4150,39 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "getopts", "memchr", "unicase", ] [[package]] -name = "pulp" -version = "0.18.6" +name = "pulldown-cmark" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16785ee69419641c75affff7c9fdbdb7c0ab26dc9a5fb5218c2a2e9e4ef2087d" +checksum = "dce76ce678ffc8e5675b22aa1405de0b7037e2fdf8913fea40d1926c6fe1e6e7" +dependencies = [ + "bitflags 2.4.2", + "memchr", + "pulldown-cmark-escape", + "unicase", +] + +[[package]] +name = "pulldown-cmark-escape" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" + +[[package]] +name = "pulp" +version = "0.18.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "091bad01115892393939669b38f88ff2b70838e969a7ac172a9d06d05345a732" dependencies = [ "bytemuck", "libm", @@ -4172,15 +4192,16 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.20.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", "parking_lot", + "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -4189,9 +4210,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" dependencies = [ "once_cell", "target-lexicon", @@ -4199,9 +4220,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" dependencies = [ "libc", "pyo3-build-config", @@ -4209,26 +4230,27 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] name = "pyo3-macros-backend" -version = "0.20.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" dependencies = [ "heck", "proc-macro2", + "pyo3-build-config", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -4251,9 +4273,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -4339,7 +4361,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -4390,9 +4412,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -4400,9 +4422,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -4450,20 +4472,20 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -4478,9 +4500,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -4507,11 +4529,11 @@ checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -4531,12 +4553,13 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.21.10", "rustls-native-certs", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -4549,7 +4572,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", + "webpki-roots 0.25.4", "winreg 0.50.0", ] @@ -4576,16 +4599,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "getrandom 0.2.11", + "cfg-if", + "getrandom 0.2.12", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4646,7 +4670,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4668,11 +4692,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.26" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", @@ -4681,16 +4705,30 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.9" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.17.7", - "rustls-webpki", + "ring 0.17.8", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -4709,16 +4747,33 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] +[[package]] +name = "rustls-pki-types" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" + [[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", + "untrusted 0.9.0", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", "untrusted 0.9.0", ] @@ -4730,9 +4785,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "safemem" @@ -4750,6 +4805,16 @@ dependencies = [ "serde_json", ] +[[package]] +name = "safetensors" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d980e6bfb34436fb0a81e42bc41af43f11805bbbca443e7f68e9faaabe669ed" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "same-file" version = "1.0.6" @@ -4771,11 +4836,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4805,7 +4870,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -4838,20 +4903,20 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" dependencies = [ - "self_cell 1.0.2", + "self_cell 1.0.3", ] [[package]] name = "self_cell" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "seq-macro" @@ -4861,18 +4926,18 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde-aux" -version = "4.3.1" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "184eba62ebddb71658697c8b08822edee89970bf318c5362189f0de27f85b498" +checksum = "0d2e8bfba469d06512e11e3311d4d051a4a387a5b42d010404fecf3200321c95" dependencies = [ "chrono", "serde", @@ -4881,20 +4946,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -4903,9 +4968,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" dependencies = [ "itoa", "serde", @@ -4924,13 +4989,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -5019,9 +5084,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook" @@ -5080,31 +5145,29 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "snafu" -version = "0.7.5" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" +checksum = "5ed22871b3fe6eff9f1b48f6cbd54149ff8e9acd740dea9146092435f9c43bd3" dependencies = [ - "backtrace", - "doc-comment", "snafu-derive", ] [[package]] name = "snafu-derive" -version = "0.7.5" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" +checksum = "4651148226ec36010993fcba6c3381552e8463e9f3e337b75af202b0688b5274" dependencies = [ "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.51", ] [[package]] @@ -5115,22 +5178,12 @@ checksum = "27207bb65232eda1f588cf46db2fee75c0808d557f6b3cf19a75f5d6d7c94df1" [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5198,17 +5251,23 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "strum" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" + +[[package]] +name = "strum" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" dependencies = [ - "strum_macros", + "strum_macros 0.26.1", ] [[package]] @@ -5221,7 +5280,20 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.39", + "syn 2.0.51", +] + +[[package]] +name = "strum_macros" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.51", ] [[package]] @@ -5243,9 +5315,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" dependencies = [ "proc-macro2", "quote", @@ -5260,14 +5332,27 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "synstructure" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", - "unicode-xid", + "syn 2.0.51", +] + +[[package]] +name = "sysctl" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" +dependencies = [ + "bitflags 2.4.2", + "byteorder", + "enum-as-inner", + "libc", + "thiserror", + "walkdir", ] [[package]] @@ -5304,22 +5389,22 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tch" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed5dddab3812892bf5fb567136e372ea49f31672931e21cec967ca68aec03da" +checksum = "7c7cb00bc2770454b515388d45be7097a3ded2eca172f3dcdb7ca4cc06c40bf1" dependencies = [ - "half 2.3.1", + "half", "lazy_static", "libc", "ndarray", "rand 0.8.5", - "safetensors", + "safetensors 0.3.3", "thiserror", "torch-sys", "zip", @@ -5327,15 +5412,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5351,9 +5435,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -5381,22 +5465,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -5410,9 +5494,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -5420,9 +5504,9 @@ dependencies = [ [[package]] name = "tiff" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", "jpeg-decoder", @@ -5431,12 +5515,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -5451,10 +5536,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -5494,9 +5580,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -5505,7 +5591,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -5518,7 +5604,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -5537,7 +5623,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.10", "tokio", ] @@ -5607,9 +5693,9 @@ checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", @@ -5624,9 +5710,9 @@ checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" [[package]] name = "torch-sys" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803446f89fb877a117503dbfb8375b6a29fa8b0e0f44810fac3863c798ecef22" +checksum = "29e0244e5b148a31dd7fe961165037d1927754d024095c1013937532d7e73a22" dependencies = [ "anyhow", "cc", @@ -5659,7 +5745,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "bytes", "futures-core", "futures-util", @@ -5716,7 +5802,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -5760,9 +5846,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tugger-common" @@ -5879,9 +5965,9 @@ checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" [[package]] name = "unic-langid" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887622f8e7b723780c5e64b04dcc0c9b8f426ada7cca6790cd3ea3bf0f08037a" +checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" dependencies = [ "unic-langid-impl", "unic-langid-macros", @@ -5889,19 +5975,20 @@ dependencies = [ [[package]] name = "unic-langid-impl" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5adeb847e35eed4efbffd9fb2e4d078b91ece56e4d6a3c0d2df55b3a1dac07d5" +checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" dependencies = [ "tinystr", ] [[package]] name = "unic-langid-macros" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d4589552627b69df7135a17919dc0b62f320be06988b77fcfc69bc89425600" +checksum = "5c854cefb82ff2816410ce606acbad1b3af065140907b29be9229040752b83ec" dependencies = [ + "proc-macro-hack", "tinystr", "unic-langid-impl", "unic-langid-macros-impl", @@ -5909,14 +5996,13 @@ dependencies = [ [[package]] name = "unic-langid-macros-impl" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb865515362dca12581b9a4b731acdc9015f4b81e1be9b21fa6d9dbbd2598e5e" +checksum = "fea2a4c80deb4fb3ca51f66b5e2dd91e3642bbce52234bcf22e41668281208e4" dependencies = [ - "find-crate", - "proc-macro2", + "proc-macro-hack", "quote", - "syn 2.0.39", + "syn 2.0.51", "unic-langid-impl", ] @@ -5952,9 +6038,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -5964,18 +6050,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -6009,20 +6095,21 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.1" +version = "2.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" +checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "flate2", "log", "once_cell", - "rustls", - "rustls-webpki", + "rustls 0.22.2", + "rustls-pki-types", + "rustls-webpki 0.102.2", "serde", "serde_json", "url", - "webpki-roots", + "webpki-roots 0.26.1", ] [[package]] @@ -6061,11 +6148,11 @@ dependencies = [ [[package]] name = "uuid" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "rand 0.8.5", ] @@ -6155,10 +6242,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.89" +name = "wasix" +version = "0.12.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d" +dependencies = [ + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6166,24 +6262,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if", "js-sys", @@ -6193,9 +6289,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6203,28 +6299,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -6244,16 +6340,35 @@ dependencies = [ ] [[package]] -name = "webpki-roots" -version = "0.25.3" +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" @@ -6263,7 +6378,7 @@ checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24" dependencies = [ "arrayvec", "cfg-if", - "flume 0.11.0", + "flume", "js-sys", "log", "naga", @@ -6288,7 +6403,7 @@ checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.4.1", + "bitflags 2.4.2", "codespan-reporting", "log", "naga", @@ -6313,7 +6428,7 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags 2.4.1", + "bitflags 2.4.2", "block", "core-graphics-types", "d3d12", @@ -6352,7 +6467,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "js-sys", "web-sys", ] @@ -6431,12 +6546,12 @@ dependencies = [ [[package]] name = "windows" -version = "0.52.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.0", + "windows-core 0.54.0", + "windows-targets 0.52.3", ] [[package]] @@ -6454,7 +6569,26 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.3", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.3", +] + +[[package]] +name = "windows-result" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" +dependencies = [ + "windows-targets 0.52.3", ] [[package]] @@ -6472,7 +6606,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.3", ] [[package]] @@ -6492,17 +6626,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.3", + "windows_aarch64_msvc 0.52.3", + "windows_i686_gnu 0.52.3", + "windows_i686_msvc 0.52.3", + "windows_x86_64_gnu 0.52.3", + "windows_x86_64_gnullvm 0.52.3", + "windows_x86_64_msvc 0.52.3", ] [[package]] @@ -6513,9 +6647,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" [[package]] name = "windows_aarch64_msvc" @@ -6525,9 +6659,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" [[package]] name = "windows_i686_gnu" @@ -6537,9 +6671,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" [[package]] name = "windows_i686_msvc" @@ -6549,9 +6683,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" [[package]] name = "windows_x86_64_gnu" @@ -6561,9 +6695,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" [[package]] name = "windows_x86_64_gnullvm" @@ -6573,9 +6707,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" [[package]] name = "windows_x86_64_msvc" @@ -6585,15 +6719,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" [[package]] name = "winnow" -version = "0.5.25" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] @@ -6626,7 +6760,7 @@ checksum = "13a3a53eaf34f390dd30d7b1b078287dd05df2aa2e21a589ccb80f5c7253c2e9" dependencies = [ "assert-json-diff", "async-trait", - "base64 0.21.5", + "base64 0.21.7", "deadpool", "futures", "futures-timer", @@ -6642,11 +6776,13 @@ dependencies = [ [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] @@ -6704,28 +6840,28 @@ checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", ] [[package]] @@ -6745,10 +6881,16 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.51", "synstructure", ] +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + [[package]] name = "zip" version = "0.6.6" @@ -6763,7 +6905,7 @@ dependencies = [ "crossbeam-utils", "flate2", "hmac", - "pbkdf2", + "pbkdf2 0.11.0", "sha1", "time", "zstd 0.11.2+zstd.1.5.2", diff --git a/third_party/nixpkgs/pkgs/games/anki/bin.nix b/third_party/nixpkgs/pkgs/games/anki/bin.nix index 1ffe999c88..6af284843e 100644 --- a/third_party/nixpkgs/pkgs/games/anki/bin.nix +++ b/third_party/nixpkgs/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "24.04"; + version = "24.04.1"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-mIQ448ecBDrMo3qspXVOBJM/0LebJ9lA1JIwz70Uqhc="; + sha256 = "sha256-elUTr0Lumw5bzWbeU74m8e/AxQPNpKXiIOC0Rcgh3AY="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-ab8cc+QMt3ZJp1NZmAwz2VNZwWQK0DBPKnz2fGmC7Fs="; + sha256 = "sha256-LlHbZ8Yw17Ym11L1lqMibAaV8XWB8oiMFGQxE1PvApI="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-bRpPVOXpDRq+EXwW1yWiAgzkcdLhLnMrHo/t9Jgzth0="; + sha256 = "sha256-lMUfIvV4biaOb0ABTZciBP59XY1Ln3tkwphi2oaRu4c="; }; }; @@ -52,7 +52,6 @@ let fhsEnvAnki = buildFHSEnv (appimageTools.defaultFhsEnvArgs // { inherit pname version; - name = null; # Appimage sets it to "appimage-env" profile = '' # anki vendors QT and mixing QT versions usually causes crashes diff --git a/third_party/nixpkgs/pkgs/games/anki/default.nix b/third_party/nixpkgs/pkgs/games/anki/default.nix index e57ee90f63..9247337621 100644 --- a/third_party/nixpkgs/pkgs/games/anki/default.nix +++ b/third_party/nixpkgs/pkgs/games/anki/default.nix @@ -28,21 +28,20 @@ let pname = "anki"; - version = "23.12.1"; - rev = "1a1d4d5419c6b57ef3baf99c9d2d9cf85d36ae0a"; + version = "24.04"; + rev = "429bc9e14cefb597646a0e1beac6ef140f226b6f"; src = fetchFromGitHub { owner = "ankitects"; repo = "anki"; rev = version; - hash = "sha256-K38bhfU1076PxdKJFvnFb2w6Q9Q2MUmL+j8be3RZQYk="; + hash = "sha256-H/Y6ZEJ7meprk4SWIPkoABs6AV1CzbK2l22jEnMSvyk="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "fsrs-0.1.0" = "sha256-KJgT01OmMbqgYFE5Fu8nblZl9rL5QVVMa2DNFsw6cdk="; "linkcheck-0.4.1" = "sha256-S93J1cDzMlzDjcvz/WABmv8CEC6x78E+f7nzhsN7NkE="; "percent-encoding-iri-2.2.0" = "sha256-kCBeS1PNExyJd4jWfDfctxq6iTdAq69jtxFQgCCQ8kQ="; }; @@ -51,7 +50,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-tOl+gLBE6SNPQvVWT/N7RKFaaP9SnpCBJf5dq2wCPuM="; + hash = "sha256-7yBN6si1Q+xvyosP7YnOw9ZfGcLZdy5ukXXFvvI20Js="; }; anki-build-python = python3.withPackages (ps: with ps; [ @@ -155,22 +154,25 @@ python3.pkgs.buildPythonApplication { propagatedBuildInputs = with python3.pkgs; [ # This rather long list came from running: - # grep --no-filename -oE "^[^ =]*" python/{requirements.base.txt,requirements.bundle.txt,requirements.qt6_4.txt} | \ + # grep --no-filename -oE "^[^ =]*" python/{requirements.base.txt,requirements.bundle.txt,requirements.qt6_lin.txt} | \ # sort | uniq | grep -v "^#$" # in their repo at the git tag for this version # There's probably a more elegant way, but the above extracted all the # names, without version numbers, of their python dependencies. The hope is # that nixpkgs versions are "close enough" # I then removed the ones the check phase failed on (pythonCatchConflictsPhase) + attrs beautifulsoup4 + blinker + build certifi charset-normalizer click colorama decorator - distro flask flask-cors + google-api-python-client idna importlib-metadata itsdangerous @@ -179,21 +181,27 @@ python3.pkgs.buildPythonApplication { markdown markupsafe orjson - pep517 - pyparsing + packaging + pip + pip-system-certs + pip-tools + protobuf + pyproject-hooks pyqt6 pyqt6-sip pyqt6-webengine pyrsistent pysocks - python3.pkgs.protobuf requests send2trash - six + setuptools soupsieve + tomli urllib3 waitress werkzeug + wheel + wrapt zipp ] ++ lib.optionals stdenv.isDarwin [ AVKit diff --git a/third_party/nixpkgs/pkgs/games/anki/patches/remove-the-gl-library-workaround.patch b/third_party/nixpkgs/pkgs/games/anki/patches/remove-the-gl-library-workaround.patch index 0a3f94e132..74b223f3bd 100644 --- a/third_party/nixpkgs/pkgs/games/anki/patches/remove-the-gl-library-workaround.patch +++ b/third_party/nixpkgs/pkgs/games/anki/patches/remove-the-gl-library-workaround.patch @@ -1,13 +1,13 @@ diff --git a/qt/aqt/__init__.py b/qt/aqt/__init__.py -index 6f28d2dd0..fcd6a5ee4 100644 +index b6d24080b..5e5faac7b 100644 --- a/qt/aqt/__init__.py +++ b/qt/aqt/__init__.py -@@ -402,12 +402,6 @@ def setupGL(pm: aqt.profiles.ProfileManager) -> None: +@@ -413,11 +413,5 @@ def setupGL(pm: aqt.profiles.ProfileManager) -> None: # RHI errors are emitted multiple times so make sure we only handle them once driver_failed = False - # work around pyqt loading wrong GL library -- if is_lin: +- if is_lin and not sys.platform.startswith("freebsd"): - import ctypes - - ctypes.CDLL("libGL.so.1", ctypes.RTLD_GLOBAL) @@ -15,5 +15,3 @@ index 6f28d2dd0..fcd6a5ee4 100644 # catch opengl errors def msgHandler(category: Any, ctx: Any, msg: Any) -> None: if category == QtMsgType.QtDebugMsg: --- -2.42.0 diff --git a/third_party/nixpkgs/pkgs/games/arena/default.nix b/third_party/nixpkgs/pkgs/games/arena/default.nix index 16553a5f8e..9b31c41ea6 100644 --- a/third_party/nixpkgs/pkgs/games/arena/default.nix +++ b/third_party/nixpkgs/pkgs/games/arena/default.nix @@ -68,8 +68,9 @@ stdenv.mkDerivation rec { chess board & DGT clocks and much more. ''; license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + homepage = "http://www.playwitharena.de"; platforms = ["x86_64-linux"]; - hydraPlatforms = lib.platforms.none; }; } diff --git a/third_party/nixpkgs/pkgs/games/badlion-client/default.nix b/third_party/nixpkgs/pkgs/games/badlion-client/default.nix index 6772557a3e..9900551d8c 100644 --- a/third_party/nixpkgs/pkgs/games/badlion-client/default.nix +++ b/third_party/nixpkgs/pkgs/games/badlion-client/default.nix @@ -15,7 +15,6 @@ in inherit pname version src; extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} install -Dm444 ${appimageContents}/BadlionClient.desktop $out/share/applications/BadlionClient.desktop install -Dm444 ${appimageContents}/BadlionClient.png $out/share/pixmaps/BadlionClient.png substituteInPlace $out/share/applications/BadlionClient.desktop \ diff --git a/third_party/nixpkgs/pkgs/games/chiaki/default.nix b/third_party/nixpkgs/pkgs/games/chiaki/default.nix index e450f472e8..7482a1cd27 100644 --- a/third_party/nixpkgs/pkgs/games/chiaki/default.nix +++ b/third_party/nixpkgs/pkgs/games/chiaki/default.nix @@ -59,7 +59,7 @@ mkDerivation rec { homepage = "https://git.sr.ht/~thestr4ng3r/chiaki"; description = "Free and Open Source PlayStation Remote Play Client"; license = licenses.agpl3Only; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; mainProgram = "chiaki"; }; diff --git a/third_party/nixpkgs/pkgs/games/colobot/default.nix b/third_party/nixpkgs/pkgs/games/colobot/default.nix index e107084381..8ce10380f3 100644 --- a/third_party/nixpkgs/pkgs/games/colobot/default.nix +++ b/third_party/nixpkgs/pkgs/games/colobot/default.nix @@ -9,15 +9,28 @@ stdenv.mkDerivation rec { pname = "colobot"; # Maybe require an update to package colobot-data as well # in file data.nix next to this one - version = "0.2.0-alpha"; + version = "0.2.1-alpha"; src = fetchFromGitHub { owner = "colobot"; repo = pname; rev = "colobot-gold-${version}"; - sha256 = "sha256-Nu7NyicNIk5yza9sXfd4KbGdB65guVuGREd6rwRU3lU="; + hash = "sha256-3iea2+5xCT0//NAjMHrynZKSoiOSgLTNMUQkRhXuXg8="; }; + patches = [ + # https://github.com/colobot/colobot/pull/1559 + # gcc13 fixes. remove on next update + (fetchpatch { + name = "gcc13-fixes.patch"; + url = "https://github.com/colobot/colobot/commit/d47e26586325ec11425cef5c95fc206dc103dbe2.patch"; + hash = "sha256-2DmLkyoyiZSW0yeZDSSWFjCEJos25jPHZQi1yuJGFko="; + excludes = [ + "src/object/task/taskgoto.h" + ]; + }) + ]; + nativeBuildInputs = [ cmake xmlstarlet doxygen python3 ]; buildInputs = [ boost SDL2 SDL2_image SDL2_ttf libpng glew gettext libsndfile libvorbis libogg physfs openal ]; diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/chocolate-doom/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/chocolate-doom/default.nix index 30fe2010b0..4bd3944a42 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/chocolate-doom/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/chocolate-doom/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; hydraPlatforms = lib.platforms.linux; # darwin times out - maintainers = with lib.maintainers; [ MP2E ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/dhewm3/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/dhewm3/default.nix index 9a187c7682..19cf87110c 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/dhewm3/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/dhewm3/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "Doom 3 port to SDL"; mainProgram = "dhewm3"; license = lib.licenses.gpl3; - maintainers = with maintainers; [ MP2E ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/doomretro/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/doomretro/default.nix index 127220603b..4b016d7858 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/doomretro/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/doomretro/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; - version = "5.3"; + version = "5.4"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-LCCBtsDEyjzsPS5ADPzsup714p84MO65FQDVjAHhSts="; + hash = "sha256-IOv58BmJvJtO7MMbrvf52MPYI0zjmPuRK7mcTwmBEY0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/doomrunner/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/doomrunner/default.nix index 72b6ad1551..2db6583763 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/doomrunner/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/doomrunner/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doomrunner"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "Youda008"; repo = "DoomRunner"; rev = "v${finalAttrs.version}"; - hash = "sha256-mUtUXDcQXs5zTh9Msb3dXFicIsfbZpE9M8OPqtajDhw="; + hash = "sha256-IUc7qGW4ni/6IwEfY4wpQxKiR14uzKuvTZvHZ3aF++s="; }; buildInputs = [ qtbase ]; diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/doomseeker/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/doomseeker/default.nix index c3d3db1d25..11aec59bf4 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/doomseeker/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/doomseeker/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { mainProgram = "doomseeker"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.MP2E ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch b/third_party/nixpkgs/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch deleted file mode 100644 index e21b53b3cc..0000000000 --- a/third_party/nixpkgs/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -r c2c7f37b1afb src/core/gui/irc/ircdock.cpp ---- a/src/core/gui/irc/ircdock.cpp Tue Mar 06 00:14:23 2018 +0100 -+++ b/src/core/gui/irc/ircdock.cpp Sat Jul 28 16:53:04 2018 -0700 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - DClass : public Ui::IRCDock - { -diff -r c2c7f37b1afb src/core/gui/logdock.cpp ---- a/src/core/gui/logdock.cpp Tue Mar 06 00:14:23 2018 +0100 -+++ b/src/core/gui/logdock.cpp Sat Jul 28 16:53:04 2018 -0700 -@@ -21,6 +21,8 @@ - // Copyright (C) 2009 "Zalewa" - //------------------------------------------------------------------------------ - -+#include -+ - #include "clipboard.h" - #include "logdock.h" - #include "log.h" -diff -r c2c7f37b1afb src/core/gui/serverdetailsdock.cpp ---- a/src/core/gui/serverdetailsdock.cpp Tue Mar 06 00:14:23 2018 +0100 -+++ b/src/core/gui/serverdetailsdock.cpp Sat Jul 28 16:53:04 2018 -0700 -@@ -21,6 +21,7 @@ - // Copyright (C) 2014 Braden "Blzut3" Obrzut - //------------------------------------------------------------------------------ - -+#include - #include - - #include "serverdetailsdock.h" -diff -r c2c7f37b1afb src/core/gui/serverfilterdock.cpp ---- a/src/core/gui/serverfilterdock.cpp Tue Mar 06 00:14:23 2018 +0100 -+++ b/src/core/gui/serverfilterdock.cpp Sat Jul 28 16:53:04 2018 -0700 -@@ -20,6 +20,9 @@ - //------------------------------------------------------------------------------ - // Copyright (C) 2011 "Zalewa" - //------------------------------------------------------------------------------ -+ -+#include -+ - #include "serverfilterdock.h" - #include "ui_serverfilterdock.h" - diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/eternity-engine/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/eternity-engine/default.nix index 7afef923e0..5239cae4d8 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/eternity-engine/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/eternity-engine/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { mainProgram = "eternity"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ MP2E ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/gzdoom/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/gzdoom/default.nix index d063393210..f34276c778 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/gzdoom/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/gzdoom/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.11.3"; + version = "4.12.2"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; rev = "g${version}"; fetchSubmodules = true; - hash = "sha256-pY+5R3W/9pJGiBoDFkxxpuP0I2ZLb+Q/s5UYU20G748="; + hash = "sha256-taie1Iod3pXvuxxBC7AArmtndkIV0Di9mtJoPvPkioo="; }; outputs = [ "out" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/odamex/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/odamex/default.nix index 5fc1b57be5..cc1862b0b3 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/odamex/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/odamex/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { description = "A client/server port for playing old-school Doom online"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ MP2E ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/slade/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/slade/default.nix index 9ab3d1f458..bae685ccac 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/slade/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/slade/default.nix @@ -15,7 +15,7 @@ , glew , lua , mpg123 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pkg-config which zip - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/slade/git.nix b/third_party/nixpkgs/pkgs/games/doom-ports/slade/git.nix index 7ecc5d5d1b..db85d405f8 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/slade/git.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/slade/git.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "slade"; - version = "unstable-2023-09-30"; + version = "3.2.4-unstable-2023-09-30"; src = fetchFromGitHub { owner = "sirjuddington"; diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/zandronum/alpha/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/zandronum/alpha/default.nix index c5d883fcb5..665bef3bd4 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/zandronum/alpha/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/zandronum/alpha/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://zandronum.com/"; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; - maintainers = with maintainers; [ lassulus MP2E ]; + maintainers = with maintainers; [ lassulus ]; license = licenses.sleepycat; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/zandronum/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/zandronum/default.nix index c8e1927aaf..17c9b47387 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/zandronum/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/zandronum/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { homepage = "https://zandronum.com/"; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; mainProgram = "zandronum-server"; - maintainers = with maintainers; [ lassulus MP2E ]; + maintainers = with maintainers; [ lassulus ]; license = licenses.sleepycat; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/default.nix index ee02364a40..acf50d650c 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/default.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texliveBasic, perlPackages, jdk8, jre8 }: +{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, perlPackages, jdk8, jre8 }: # To whomever it may concern: # @@ -49,7 +49,7 @@ let # The latest Dwarf Fortress version. Maintainers: when a new version comes # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing # this. Note that unfuck and twbt are not required for 50. - latestVersion = "50.12"; + latestVersion = "50.13"; # Converts a version to a package name. versionToName = version: "dwarf-fortress_${replaceStrings ["."] ["_"] version}"; @@ -79,9 +79,7 @@ let dwarf-therapist = libsForQt5.callPackage ./dwarf-therapist/wrapper.nix { inherit dwarf-fortress; - dwarf-therapist = (libsForQt5.callPackage ./dwarf-therapist { - texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]); - }).override (optionalAttrs (!isAtLeast50) { + dwarf-therapist = (libsForQt5.callPackage ./dwarf-therapist {}).override (optionalAttrs (!isAtLeast50) { # 41.2.5 is the last version to support Dwarf Fortress 0.47. version = "41.2.5"; hash = "sha256-xfYBtnO1n6OcliVt07GsQ9alDJIfWdVhtuyWwuvXSZs="; diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix index 156dac32c4..96a5dac525 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -89,6 +89,11 @@ let hash = "sha256-2mO8DpNmZRCV7IRY0arf3SMvlO4Pxs61Kxfh3q3k3HU="; xmlRev = "980b1af13acc31660dce632f913c968f52e2b275"; }; + "50.13" = { + dfHackRelease = "50.13-r1.1"; + hash = "sha256-FiXanXflszTr4ogz+EoDAUxzE2U9ODeZIJJ1u6Xm4Mo="; + xmlRev = "3507715fd07340de5a6c47064220f6e17343e5d5"; + }; }; release = diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index d51c8274bb..52560a0d52 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -4,10 +4,9 @@ , qtbase , qtdeclarative , cmake -, texlive , ninja -, version ? "42.1.5" -, hash ? "sha256-aUakfUjnIZWNDhCkG3A6u7BaaCG8kPMV/Fu2S73CoDg=" +, version ? "42.1.6" +, hash ? "sha256-VjCXT4sl3HsFILrqTc3JJSeRedZaOXUbf4KvSzTo0uc=" }: stdenv.mkDerivation rec { @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { inherit hash; }; - nativeBuildInputs = [ texlive cmake ninja ]; + nativeBuildInputs = [ cmake ninja ]; buildInputs = [ qtbase qtdeclarative ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/game.json b/third_party/nixpkgs/pkgs/games/dwarf-fortress/game.json index c287a4dd84..4fb341c350 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/game.json +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/game.json @@ -144,5 +144,8 @@ }, "50.12": { "linux": "070014fzwszfgjyxjyij0k0hadah6s62lpi91ykp3vs220azya1m" + }, + "50.13": { + "linux": "19wzgsdgv0vq7v2dxhypr9hayky3nm3lbra1kk9vn8ri96jdkfkw" } } diff --git a/third_party/nixpkgs/pkgs/games/eduke32/convert-bmp-to-png.diff b/third_party/nixpkgs/pkgs/games/eduke32/convert-bmp-to-png.diff new file mode 100644 index 0000000000..7d83ce4aab --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/eduke32/convert-bmp-to-png.diff @@ -0,0 +1,23 @@ +diff --git a/GNUmakefile b/GNUmakefile +index f83f04d..25a4fa8 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -798,6 +798,9 @@ libklzw$(DLLSUFFIX): $(engine_src)/klzw.cpp + $(COMPILE_STATUS) + $(RECIPE_IF) $(COMPILER_C) -shared -fPIC $< -o $@ $(RECIPE_RESULT_COMPILE) + ++%.png: %.bmp ++ gm convert $< $@ ++ + # to debug the tools link phase, make a copy of this rule explicitly replacing % with the name of a tool, such as kextract + %$(EXESUFFIX): $(tools_obj)/%.$o $(foreach i,tools $(tools_deps),$(call expandobjs,$i)) + $(LINK_STATUS) +@@ -880,7 +883,7 @@ $$($1_obj)/%.$$o: $$($1_rsrc)/%.c | $$($1_obj) + $$(call MKDIR,$$(dir $$@)) + $$(RECIPE_IF) $$(COMPILER_C) $$($1_cflags) -c $$< -o $$@ $$(RECIPE_RESULT_COMPILE) + +-$$($1_obj)/%_banner.c: $$($1_rsrc)/%.bmp | $$($1_obj) ++$$($1_obj)/%_banner.c: $$($1_rsrc)/%.png | $$($1_obj) + echo "#include \"gtkpixdata_shim.h\"" > $$@ + gdk-pixbuf-csource --extern --struct --raw --name=startbanner_pixdata $$^ | sed 's/load_inc//' >> $$@ + diff --git a/third_party/nixpkgs/pkgs/games/eduke32/default.nix b/third_party/nixpkgs/pkgs/games/eduke32/default.nix index 1ddcccd27f..5bb9966602 100644 --- a/third_party/nixpkgs/pkgs/games/eduke32/default.nix +++ b/third_party/nixpkgs/pkgs/games/eduke32/default.nix @@ -37,6 +37,12 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-dyZ4JtDBxsTDe9uQDWxJe7M74X7m+5wpEHm+i+s9hwo="; }; + patches = [ + # gdk-pixbuf-csource no longer supports bmp so convert to png + # patch GNUMakefile to use graphicsmagick to convert bmp -> png + ./convert-bmp-to-png.diff + ]; + buildInputs = [ flac libvorbis diff --git a/third_party/nixpkgs/pkgs/games/extremetuxracer/default.nix b/third_party/nixpkgs/pkgs/games/extremetuxracer/default.nix index 446c692ad8..a1322499ea 100644 --- a/third_party/nixpkgs/pkgs/games/extremetuxracer/default.nix +++ b/third_party/nixpkgs/pkgs/games/extremetuxracer/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "0.8.3"; + version = "0.8.4"; pname = "extremetuxracer"; src = fetchurl { url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; - sha256 = "sha256-LuQvP1/C+NSap1BW6xFvbKuE1lZBIOaWGuWSc2ckURM="; + sha256 = "sha256-+jKFzAx1Wlr/Up8/LOo1FkgRFMa0uOHsB2n+7/BHc+U="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json index a627e967d1..e32801b769 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/versions.json +++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.104.tar.xz", + "name": "factorio_alpha_x64-1.1.107.tar.xz", "needsAuth": true, - "sha256": "0aizllbfzbn2j0560n4f823jqq7v7qz813an4wlm39rfsfx7b0vq", + "sha256": "16hkyfwp02zcijka4yslifz62ry6hrvk0w9960618kqdw3gr7p82", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.104/alpha/linux64", - "version": "1.1.104" + "url": "https://factorio.com/get-download/1.1.107/alpha/linux64", + "version": "1.1.107" }, "stable": { - "name": "factorio_alpha_x64-1.1.104.tar.xz", + "name": "factorio_alpha_x64-1.1.107.tar.xz", "needsAuth": true, - "sha256": "0aizllbfzbn2j0560n4f823jqq7v7qz813an4wlm39rfsfx7b0vq", + "sha256": "16hkyfwp02zcijka4yslifz62ry6hrvk0w9960618kqdw3gr7p82", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.104/alpha/linux64", - "version": "1.1.104" + "url": "https://factorio.com/get-download/1.1.107/alpha/linux64", + "version": "1.1.107" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.104.tar.xz", + "name": "factorio_demo_x64-1.1.107.tar.xz", "needsAuth": false, - "sha256": "0x08dy6pagfpqc9c2cl239b1f7pf0p4cghzp7avxmbkmbl1fan2l", + "sha256": "0qc36n6h4wcbnj9rnq162bsml4x3ag1dkjmywqz8f4ydaf86gyjw", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.104/demo/linux64", - "version": "1.1.104" + "url": "https://factorio.com/get-download/1.1.107/demo/linux64", + "version": "1.1.107" }, "stable": { - "name": "factorio_demo_x64-1.1.104.tar.xz", + "name": "factorio_demo_x64-1.1.107.tar.xz", "needsAuth": false, - "sha256": "0x08dy6pagfpqc9c2cl239b1f7pf0p4cghzp7avxmbkmbl1fan2l", + "sha256": "0qc36n6h4wcbnj9rnq162bsml4x3ag1dkjmywqz8f4ydaf86gyjw", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.104/demo/linux64", - "version": "1.1.104" + "url": "https://factorio.com/get-download/1.1.107/demo/linux64", + "version": "1.1.107" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.104.tar.xz", + "name": "factorio_headless_x64-1.1.107.tar.xz", "needsAuth": false, - "sha256": "10qmq2mw2j97s64skwr3m7hmv21h3m0r8rdhnyfrhmrxn8x3a4wf", + "sha256": "10ds1nz9sbx9xz1lyypf16wncc6323vpm7l5p11d6iy4cha85wsw", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.104/headless/linux64", - "version": "1.1.104" + "url": "https://factorio.com/get-download/1.1.107/headless/linux64", + "version": "1.1.107" }, "stable": { - "name": "factorio_headless_x64-1.1.104.tar.xz", + "name": "factorio_headless_x64-1.1.107.tar.xz", "needsAuth": false, - "sha256": "10qmq2mw2j97s64skwr3m7hmv21h3m0r8rdhnyfrhmrxn8x3a4wf", + "sha256": "10ds1nz9sbx9xz1lyypf16wncc6323vpm7l5p11d6iy4cha85wsw", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.104/headless/linux64", - "version": "1.1.104" + "url": "https://factorio.com/get-download/1.1.107/headless/linux64", + "version": "1.1.107" } } } diff --git a/third_party/nixpkgs/pkgs/games/fallout-ce/fallout2-ce.nix b/third_party/nixpkgs/pkgs/games/fallout-ce/fallout2-ce.nix index b28a9701c2..6d665c96a0 100644 --- a/third_party/nixpkgs/pkgs/games/fallout-ce/fallout2-ce.nix +++ b/third_party/nixpkgs/pkgs/games/fallout-ce/fallout2-ce.nix @@ -5,13 +5,13 @@ callPackage ./build.nix rec { pname = "fallout2-ce"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "alexbatalov"; repo = "fallout2-ce"; rev = "v${version}"; - hash = "sha256-+N4jhmxBX6z48kaU0jm90OKhguHlggT3OF9uuyY0EV0="; + hash = "sha256-r1pnmyuo3uw2R0x9vGScSHIVNA6t+txxABzgHkUEY5U="; }; extraBuildInputs = [ zlib ]; diff --git a/third_party/nixpkgs/pkgs/games/freeciv/default.nix b/third_party/nixpkgs/pkgs/games/freeciv/default.nix index 6f653c46df..6ecd9fcdad 100644 --- a/third_party/nixpkgs/pkgs/games/freeciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/freeciv/default.nix @@ -2,7 +2,7 @@ , zlib, bzip2, curl, xz, gettext, libiconv, icu , SDL2, SDL2_mixer, SDL2_image, SDL2_ttf, SDL2_gfx, freetype, fluidsynth , sdl2Client ? false -, gtkClient ? true, gtk3, wrapGAppsHook +, gtkClient ? true, gtk3, wrapGAppsHook3 , qtClient ? false, qt5 , server ? true, readline , enableSqlite ? true, sqlite @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "freeciv"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-8cMy0O5VxVi1ffvA/Gz4BnTB0WvJptMSgM7Zu992k5k="; + hash = "sha256-ImjXDJ1Bq85OfUhxGe184cd5eu4a8BrZh+YYhzUdrLo="; }; postPatch = '' @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optionals qtClient [ qt5.wrapQtAppsHook ] - ++ lib.optionals gtkClient [ wrapGAppsHook ]; + ++ lib.optionals gtkClient [ wrapGAppsHook3 ]; buildInputs = [ lua5_3 zlib bzip2 curl xz gettext libiconv icu ] ++ [ SDL2 SDL2_mixer SDL2_image SDL2_ttf SDL2_gfx freetype fluidsynth ] @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Multiplayer (or single player), turn-based strategy game"; longDescription = '' Freeciv is a Free and Open Source empire-building strategy game @@ -79,10 +79,10 @@ stdenv.mkDerivation rec { to the space age... ''; homepage = "http://www.freeciv.org"; # http only - license = licenses.gpl2; - maintainers = with maintainers; [ pierron ]; - platforms = platforms.unix; - hydraPlatforms = platforms.linux; # sdl-config times out on darwin + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ pierron ]; + platforms = lib.platforms.unix; + hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin broken = qtClient && stdenv.isDarwin; # Missing Qt5 development files }; } diff --git a/third_party/nixpkgs/pkgs/games/gamehub/default.nix b/third_party/nixpkgs/pkgs/games/gamehub/default.nix index 87796d58c7..3bfbe71c3c 100644 --- a/third_party/nixpkgs/pkgs/games/gamehub/default.nix +++ b/third_party/nixpkgs/pkgs/games/gamehub/default.nix @@ -16,7 +16,7 @@ , webkitgtk , libmanette , libXtst -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/gnonograms/default.nix b/third_party/nixpkgs/pkgs/games/gnonograms/default.nix index 69d45e32fe..57f38d61bb 100644 --- a/third_party/nixpkgs/pkgs/games/gnonograms/default.nix +++ b/third_party/nixpkgs/pkgs/games/gnonograms/default.nix @@ -9,7 +9,7 @@ , appstream , python3 , shared-mime-info -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , pantheon , libgee @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { appstream python3 shared-mime-info - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/gnuchess/default.nix b/third_party/nixpkgs/pkgs/games/gnuchess/default.nix index 3acf6a8aa6..7e1bdd1d48 100644 --- a/third_party/nixpkgs/pkgs/games/gnuchess/default.nix +++ b/third_party/nixpkgs/pkgs/games/gnuchess/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ makeWrapper ]; + configureFlags = [ + # register keyword is removed in c++17 so stick to c++14 + "CXXFLAGS=-std=c++14" + ]; + postInstall = '' wrapProgram $out/bin/gnuchessx --set PATH "$out/bin" wrapProgram $out/bin/gnuchessu --set PATH "$out/bin" diff --git a/third_party/nixpkgs/pkgs/games/gogui/default.nix b/third_party/nixpkgs/pkgs/games/gogui/default.nix index 43e1f3397b..50cb29ddb4 100644 --- a/third_party/nixpkgs/pkgs/games/gogui/default.nix +++ b/third_party/nixpkgs/pkgs/games/gogui/default.nix @@ -1,48 +1,46 @@ -{ ant +{ lib +, stdenv +, fetchFromGitHub +, ant +, jdk +, jre , docbook-xsl-ns , docbook_xml_dtd_42 -, fetchFromGitHub , imagemagick -, lib , libxslt +, stripJavaArchivesHook , makeWrapper -, openjdk -, stdenv }: -let - version = "1.5.4a"; -in stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "gogui"; - inherit version; + version = "1.5.4a"; src = fetchFromGitHub { owner = "Remi-Coulom"; repo = "gogui"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-UFhOk2mAnTtxfwEOHquN64YDCRq7nNUqZAPQf77MEEw="; }; nativeBuildInputs = [ - makeWrapper ant - ]; - - buildInputs = [ + jdk docbook-xsl-ns imagemagick libxslt - openjdk + stripJavaArchivesHook + makeWrapper ]; buildPhase = '' runHook preBuild substituteInPlace doc/manual/xml/book.xml \ - --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd \ + --replace-fail http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd \ ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd substituteInPlace doc/manual/xml/manpages.xml \ - --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd \ + --replace-fail http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd \ ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd # generate required gui images from svg @@ -75,21 +73,24 @@ in stdenv.mkDerivation { ln -s $out/share/doc/gogui/manual/man $out/share/man/man1 # copy programs - mv -vi {bin,lib} $out/ + mv -vi bin lib $out/ # wrap programs for x in $out/bin/*; do - wrapProgram $x --prefix PATH ":" ${openjdk}/bin --set GOGUI_JAVA_HOME ${openjdk} + wrapProgram $x \ + --prefix PATH : ${jre}/bin \ + --set GOGUI_JAVA_HOME ${jre} done runHook postInstall ''; meta = { - maintainers = [ lib.maintainers.cleverca22 lib.maintainers.omnipotententity]; description = "A graphical user interface to programs that play the board game Go and support the Go Text Protocol such as GNU Go"; homepage = "https://github.com/Remi-Coulom/gogui"; + license = lib.licenses.gpl3Plus; + mainProgram = "gogui"; + maintainers = with lib.maintainers; [ cleverca22 omnipotententity ]; platforms = lib.platforms.unix; - license = lib.licenses.gpl3; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/games/grapejuice/default.nix b/third_party/nixpkgs/pkgs/games/grapejuice/default.nix index c8d1956eb9..9c2c8a5943 100644 --- a/third_party/nixpkgs/pkgs/games/grapejuice/default.nix +++ b/third_party/nixpkgs/pkgs/games/grapejuice/default.nix @@ -4,7 +4,7 @@ , pciutils , python3Packages , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , glib , cairo , desktop-file-utils @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { gobject-introspection desktop-file-utils glib - wrapGAppsHook + wrapGAppsHook3 python3Packages.pip ]; diff --git a/third_party/nixpkgs/pkgs/games/gscrabble/default.nix b/third_party/nixpkgs/pkgs/games/gscrabble/default.nix index 28e2a58b0d..453cbfedba 100644 --- a/third_party/nixpkgs/pkgs/games/gscrabble/default.nix +++ b/third_party/nixpkgs/pkgs/games/gscrabble/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub -, gtk3, wrapGAppsHook, gst_all_1, gobject-introspection +, gtk3, wrapGAppsHook3, gst_all_1, gobject-introspection , python3Packages, gnome }: buildPythonApplication { @@ -15,7 +15,7 @@ buildPythonApplication { doCheck = false; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad diff --git a/third_party/nixpkgs/pkgs/games/gshogi/default.nix b/third_party/nixpkgs/pkgs/games/gshogi/default.nix index 350ab86aa2..a4e9b903dc 100644 --- a/third_party/nixpkgs/pkgs/games/gshogi/default.nix +++ b/third_party/nixpkgs/pkgs/games/gshogi/default.nix @@ -3,7 +3,7 @@ , gobject-introspection , gtk3 , python3 -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 ]; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 diff --git a/third_party/nixpkgs/pkgs/games/gtypist/default.nix b/third_party/nixpkgs/pkgs/games/gtypist/default.nix index 43b95bacef..169b0fa77d 100644 --- a/third_party/nixpkgs/pkgs/games/gtypist/default.nix +++ b/third_party/nixpkgs/pkgs/games/gtypist/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0xzrkkmj0b1dw3yr0m9hml2y634cc4h61im6zwcq57s7285z8fn1"; }; + CFLAGS = "-std=gnu89"; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ ncurses perl fortune ] ++ lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/games/gweled/default.nix b/third_party/nixpkgs/pkgs/games/gweled/default.nix index 484543ad86..b27da3b2f7 100644 --- a/third_party/nixpkgs/pkgs/games/gweled/default.nix +++ b/third_party/nixpkgs/pkgs/games/gweled/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchbzr, gettext -, gtk2, wrapGAppsHook, autoreconfHook, pkg-config +, gtk2, wrapGAppsHook3, autoreconfHook, pkg-config , libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace configure.ac --replace "AM_GNU_GETTEXT_VERSION([0.19.8])" "AM_GNU_GETTEXT_VERSION([${gettext.version}])" ''; - nativeBuildInputs = [ wrapGAppsHook gettext autoreconfHook pkg-config ]; + nativeBuildInputs = [ wrapGAppsHook3 gettext autoreconfHook pkg-config ]; buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ]; diff --git a/third_party/nixpkgs/pkgs/games/hmcl/default.nix b/third_party/nixpkgs/pkgs/games/hmcl/default.nix index 95a40f0a8d..2dd9c7b788 100644 --- a/third_party/nixpkgs/pkgs/games/hmcl/default.nix +++ b/third_party/nixpkgs/pkgs/games/hmcl/default.nix @@ -3,7 +3,7 @@ , fetchurl , makeBinaryWrapper , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 , copyDesktopItems , imagemagick , jre @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems imagemagick ]; diff --git a/third_party/nixpkgs/pkgs/games/instawow/default.nix b/third_party/nixpkgs/pkgs/games/instawow/default.nix index 57e0e5a72b..f451521554 100644 --- a/third_party/nixpkgs/pkgs/games/instawow/default.nix +++ b/third_party/nixpkgs/pkgs/games/instawow/default.nix @@ -2,39 +2,35 @@ python3.pkgs.buildPythonApplication rec { pname = "instawow"; - version = "3.3.0"; + version = "4.3.0"; pyproject = true; src = fetchFromGitHub { owner = "layday"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-eBXUg5qLTmalWbTh5/iJ8yliTgv+HoTuGhGkd3y3CBA="; + sha256 = "sha256-U4Y+P+fSyqxT0oHJXn2gwxPOJtnYBwaq9ca+FvGBUkA="; }; extras = [ ]; # Disable GUI, most dependencies are not packaged. nativeBuildInputs = with python3.pkgs; [ - poetry-core - poetry-dynamic-versioning + hatchling + hatch-vcs ]; propagatedBuildInputs = with python3.pkgs; [ aiohttp aiohttp-client-cache - alembic attrs cattrs click diskcache iso8601 loguru - mako packaging pluggy prompt-toolkit - questionary rapidfuzz - sqlalchemy truststore typing-extensions yarl diff --git a/third_party/nixpkgs/pkgs/games/jfsw/default.nix b/third_party/nixpkgs/pkgs/games/jfsw/default.nix index 9b631551b5..ed82964e4d 100644 --- a/third_party/nixpkgs/pkgs/games/jfsw/default.nix +++ b/third_party/nixpkgs/pkgs/games/jfsw/default.nix @@ -5,7 +5,7 @@ , SDL2 , perl , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 }: @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 perl pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/jumpnbump/default.nix b/third_party/nixpkgs/pkgs/games/jumpnbump/default.nix index 193d4dc0b5..b2f6a646c6 100644 --- a/third_party/nixpkgs/pkgs/games/jumpnbump/default.nix +++ b/third_party/nixpkgs/pkgs/games/jumpnbump/default.nix @@ -4,7 +4,7 @@ , SDL2, SDL2_mixer, SDL2_net , gtk3, gobject-introspection , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 }: let data = fetchzip { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook3 gobject-introspection ]; buildInputs = [ SDL2 SDL2_mixer SDL2_net gtk3 ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/games/katago/default.nix b/third_party/nixpkgs/pkgs/games/katago/default.nix index e9ba507a3c..a633430ee6 100644 --- a/third_party/nixpkgs/pkgs/games/katago/default.nix +++ b/third_party/nixpkgs/pkgs/games/katago/default.nix @@ -28,14 +28,14 @@ assert lib.assertOneOf "backend" backend [ "opencl" "cuda" "tensorrt" "eigen" ]; # of gcc. If you need to use cuda10, please override stdenv with gcc8Stdenv stdenv.mkDerivation rec { pname = "katago"; - version = "1.14.0"; - githash = "c6de1bbda837a0717eaeca46102f7326ed0da0d4"; + version = "1.14.1"; + githash = "f2dc582f98a79fefeb11b2c37de7db0905318f4f"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "sha256-0WB/weQIJkLXedcOJO7D/N85oXTufvbmyfIp8XdrACg="; + hash = "sha256-ZdvHvrtSLwQ5vFMzLdJSJEiGcSent9iskPgpbL1TfhI="; }; fakegit = writeShellScriptBin "git" "echo ${githash}"; diff --git a/third_party/nixpkgs/pkgs/games/liberation-circuit/default.nix b/third_party/nixpkgs/pkgs/games/liberation-circuit/default.nix index 5df48282f2..cfae4282a0 100644 --- a/third_party/nixpkgs/pkgs/games/liberation-circuit/default.nix +++ b/third_party/nixpkgs/pkgs/games/liberation-circuit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, allegro5, libGL, wrapGAppsHook }: +{ stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, allegro5, libGL, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "liberation-circuit"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-zIwjh4CBSmKz7pF7GM5af+VslWho5jHOLsulbW4C8TY="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ allegro5 libGL ]; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/games/linthesia/default.nix b/third_party/nixpkgs/pkgs/games/linthesia/default.nix index 1200afa4f2..e918906af4 100644 --- a/third_party/nixpkgs/pkgs/games/linthesia/default.nix +++ b/third_party/nixpkgs/pkgs/games/linthesia/default.nix @@ -14,7 +14,7 @@ , python3 , sqlite , stdenv -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - nativeBuildInputs = [ meson ninja pkg-config python3 wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config python3 wrapGAppsHook3 ]; buildInputs = [ libGL libGLU diff --git a/third_party/nixpkgs/pkgs/games/maptool/default.nix b/third_party/nixpkgs/pkgs/games/maptool/default.nix index 1e95e37682..775879a957 100644 --- a/third_party/nixpkgs/pkgs/games/maptool/default.nix +++ b/third_party/nixpkgs/pkgs/games/maptool/default.nix @@ -8,7 +8,7 @@ , makeDesktopItem , openjfx , stdenvNoCC -, wrapGAppsHook +, wrapGAppsHook3 }: let pname = "maptool"; @@ -82,7 +82,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ copyDesktopItems libarchive - wrapGAppsHook + wrapGAppsHook3 ]; desktopItems = [ diff --git a/third_party/nixpkgs/pkgs/games/mindustry/default.nix b/third_party/nixpkgs/pkgs/games/mindustry/default.nix index 0562ff40ac..906c6de279 100644 --- a/third_party/nixpkgs/pkgs/games/mindustry/default.nix +++ b/third_party/nixpkgs/pkgs/games/mindustry/default.nix @@ -98,6 +98,7 @@ let desktopName = "Mindustry"; exec = "mindustry"; icon = "mindustry"; + categories = [ "Game" ]; }; cleanupMindustrySrc = '' diff --git a/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json b/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json index 15dbc82c6d..5fece659ca 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json +++ b/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json @@ -1,115 +1,115 @@ { "1.20": { - "sha1": "8dd1a28015f51b1803213892b50b7b4fc76e594d", - "url": "https://piston-data.mojang.com/v1/objects/8dd1a28015f51b1803213892b50b7b4fc76e594d/server.jar", - "version": "1.20.4", - "javaVersion": 17 + "sha1": "145ff0858209bcfc164859ba735d4199aafa1eea", + "url": "https://piston-data.mojang.com/v1/objects/145ff0858209bcfc164859ba735d4199aafa1eea/server.jar", + "version": "1.20.6", + "javaVersion": 21 }, "1.19": { - "url": "https://piston-data.mojang.com/v1/objects/8f3112a1049751cc472ec13e397eade5336ca7ae/server.jar", "sha1": "8f3112a1049751cc472ec13e397eade5336ca7ae", + "url": "https://piston-data.mojang.com/v1/objects/8f3112a1049751cc472ec13e397eade5336ca7ae/server.jar", "version": "1.19.4", "javaVersion": 17 }, "1.18": { - "url": "https://piston-data.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar", "sha1": "c8f83c5655308435b3dcf03c06d9fe8740a77469", + "url": "https://piston-data.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar", "version": "1.18.2", "javaVersion": 17 }, "1.17": { - "url": "https://piston-data.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar", "sha1": "a16d67e5807f57fc4e550299cf20226194497dc2", + "url": "https://piston-data.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar", "version": "1.17.1", "javaVersion": 16 }, "1.16": { - "url": "https://piston-data.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar", "sha1": "1b557e7b033b583cd9f66746b7a9ab1ec1673ced", + "url": "https://piston-data.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar", "version": "1.16.5", "javaVersion": 8 }, "1.15": { - "url": "https://piston-data.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar", "sha1": "bb2b6b1aefcd70dfd1892149ac3a215f6c636b07", + "url": "https://piston-data.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar", "version": "1.15.2", "javaVersion": 8 }, "1.14": { - "url": "https://piston-data.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar", "sha1": "3dc3d84a581f14691199cf6831b71ed1296a9fdf", + "url": "https://piston-data.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar", "version": "1.14.4", "javaVersion": 8 }, "1.13": { - "url": "https://piston-data.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar", "sha1": "3737db93722a9e39eeada7c27e7aca28b144ffa7", + "url": "https://piston-data.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar", "version": "1.13.2", "javaVersion": 8 }, "1.12": { - "url": "https://piston-data.mojang.com/v1/objects/886945bfb2b978778c3a0288fd7fab09d315b25f/server.jar", "sha1": "886945bfb2b978778c3a0288fd7fab09d315b25f", + "url": "https://piston-data.mojang.com/v1/objects/886945bfb2b978778c3a0288fd7fab09d315b25f/server.jar", "version": "1.12.2", "javaVersion": 8 }, "1.11": { - "url": "https://piston-data.mojang.com/v1/objects/f00c294a1576e03fddcac777c3cf4c7d404c4ba4/server.jar", "sha1": "f00c294a1576e03fddcac777c3cf4c7d404c4ba4", + "url": "https://piston-data.mojang.com/v1/objects/f00c294a1576e03fddcac777c3cf4c7d404c4ba4/server.jar", "version": "1.11.2", "javaVersion": 8 }, "1.10": { - "url": "https://piston-data.mojang.com/v1/objects/3d501b23df53c548254f5e3f66492d178a48db63/server.jar", "sha1": "3d501b23df53c548254f5e3f66492d178a48db63", + "url": "https://piston-data.mojang.com/v1/objects/3d501b23df53c548254f5e3f66492d178a48db63/server.jar", "version": "1.10.2", "javaVersion": 8 }, "1.9": { - "url": "https://piston-data.mojang.com/v1/objects/edbb7b1758af33d365bf835eb9d13de005b1e274/server.jar", "sha1": "edbb7b1758af33d365bf835eb9d13de005b1e274", + "url": "https://piston-data.mojang.com/v1/objects/edbb7b1758af33d365bf835eb9d13de005b1e274/server.jar", "version": "1.9.4", "javaVersion": 8 }, "1.8": { - "url": "https://launcher.mojang.com/v1/objects/b58b2ceb36e01bcd8dbf49c8fb66c55a9f0676cd/server.jar", "sha1": "b58b2ceb36e01bcd8dbf49c8fb66c55a9f0676cd", + "url": "https://launcher.mojang.com/v1/objects/b58b2ceb36e01bcd8dbf49c8fb66c55a9f0676cd/server.jar", "version": "1.8.9", "javaVersion": 8 }, "1.7": { - "url": "https://launcher.mojang.com/v1/objects/952438ac4e01b4d115c5fc38f891710c4941df29/server.jar", "sha1": "952438ac4e01b4d115c5fc38f891710c4941df29", + "url": "https://launcher.mojang.com/v1/objects/952438ac4e01b4d115c5fc38f891710c4941df29/server.jar", "version": "1.7.10", "javaVersion": 8 }, "1.6": { - "url": "https://launcher.mojang.com/v1/objects/050f93c1f3fe9e2052398f7bd6aca10c63d64a87/server.jar", "sha1": "050f93c1f3fe9e2052398f7bd6aca10c63d64a87", + "url": "https://launcher.mojang.com/v1/objects/050f93c1f3fe9e2052398f7bd6aca10c63d64a87/server.jar", "version": "1.6.4", "javaVersion": null }, "1.5": { - "url": "https://launcher.mojang.com/v1/objects/f9ae3f651319151ce99a0bfad6b34fa16eb6775f/server.jar", "sha1": "f9ae3f651319151ce99a0bfad6b34fa16eb6775f", + "url": "https://launcher.mojang.com/v1/objects/f9ae3f651319151ce99a0bfad6b34fa16eb6775f/server.jar", "version": "1.5.2", "javaVersion": 8 }, "1.4": { - "url": "https://launcher.mojang.com/v1/objects/2f0ec8efddd2f2c674c77be9ddb370b727dec676/server.jar", "sha1": "2f0ec8efddd2f2c674c77be9ddb370b727dec676", + "url": "https://launcher.mojang.com/v1/objects/2f0ec8efddd2f2c674c77be9ddb370b727dec676/server.jar", "version": "1.4.7", "javaVersion": 8 }, "1.3": { - "url": "https://launcher.mojang.com/v1/objects/3de2ae6c488135596e073a9589842800c9f53bfe/server.jar", "sha1": "3de2ae6c488135596e073a9589842800c9f53bfe", + "url": "https://launcher.mojang.com/v1/objects/3de2ae6c488135596e073a9589842800c9f53bfe/server.jar", "version": "1.3.2", "javaVersion": 8 }, "1.2": { - "url": "https://launcher.mojang.com/v1/objects/d8321edc9470e56b8ad5c67bbd16beba25843336/server.jar", "sha1": "d8321edc9470e56b8ad5c67bbd16beba25843336", + "url": "https://launcher.mojang.com/v1/objects/d8321edc9470e56b8ad5c67bbd16beba25843336/server.jar", "version": "1.2.5", "javaVersion": 8 } diff --git a/third_party/nixpkgs/pkgs/games/minecraft/default.nix b/third_party/nixpkgs/pkgs/games/minecraft/default.nix index c9ce3bfb17..b4a74fecd4 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft/default.nix +++ b/third_party/nixpkgs/pkgs/games/minecraft/default.nix @@ -4,7 +4,7 @@ , copyDesktopItems , makeDesktopItem , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , jre # old or modded versions of the game may require Java 8 (https://aur.archlinux.org/packages/minecraft-launcher/#pinned-674960) , xorg @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim"; }; - nativeBuildInputs = [ makeWrapper wrapGAppsHook copyDesktopItems gobject-introspection ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook3 copyDesktopItems gobject-introspection ]; sourceRoot = "."; @@ -151,6 +151,9 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; + # "minecraft-launcher will fail on NixOS for minecraft versions >1.19 + # try prismlauncher or atlauncher instead" + broken = true; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/games/nanosaur/default.nix b/third_party/nixpkgs/pkgs/games/nanosaur/default.nix index 37a054d951..897847b0f1 100644 --- a/third_party/nixpkgs/pkgs/games/nanosaur/default.nix +++ b/third_party/nixpkgs/pkgs/games/nanosaur/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nanosaur"; - version = "1.4.4-unstable-2023-05-21"; + version = "1.4.4-unstable-2024-04-06"; src = fetchFromGitHub { owner = "jorio"; repo = pname; - rev = "c9753648996b09a17c8bd526d8309b73fb14c435"; - sha256 = "sha256-0xG/HSUF65eV+fSJ2geDv5VUxTeso9dulrLgE1KNDhc="; + rev = "4f2612f81697a0852f63fa2ea1ac80892f8a5a9c"; + hash = "sha256-MQmlZbsQSREAIqKXyIIOF6Psa1rqY/iUsBHpeKGekBI="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/games/nile/default.nix b/third_party/nixpkgs/pkgs/games/nile/default.nix index b83eda87f9..928ba0743d 100644 --- a/third_party/nixpkgs/pkgs/games/nile/default.nix +++ b/third_party/nixpkgs/pkgs/games/nile/default.nix @@ -15,14 +15,14 @@ buildPythonApplication rec { pname = "nile"; - version = "unstable-2024-03-09"; + version = "1.0.3-unstable-2024-05-10"; format = "pyproject"; src = fetchFromGitHub { owner = "imLinguin"; repo = "nile"; - rev = "ae09acfc20fe4e462762666871f78caae70f6c74"; - hash = "sha256-hqhIacsbultY3CvvkYAZHmhCkQLi1mkPQwkztaUOd10="; + rev = "74e3ca979b2a66f9174c04fd0279211e0276ac9c"; + hash = "sha256-ezX9MLQsULRvX+X2NXYBQnKRzBRt9eN9JnJinzysI9o="; }; disabled = pythonOlder "3.8"; @@ -56,5 +56,7 @@ buildPythonApplication rec { maintainers = with maintainers; [ aidalgol ]; }; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; } diff --git a/third_party/nixpkgs/pkgs/games/nxengine-evo/default.nix b/third_party/nixpkgs/pkgs/games/nxengine-evo/default.nix deleted file mode 100644 index ca57d11910..0000000000 --- a/third_party/nixpkgs/pkgs/games/nxengine-evo/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv -, fetchpatch -, fetchurl -, fetchFromGitHub -, cmake -, libpng -, SDL2 -, SDL2_mixer -}: - -stdenv.mkDerivation rec { - pname = "nxengine-evo"; - version = "2.6.4"; - src = fetchFromGitHub { - owner = "nxengine"; - repo = "nxengine-evo"; - rev = "v${version}"; - sha256 = "sha256-krK2b1E5JUMxRoEWmb3HZMNSIHfUUGXSpyb4/Zdp+5A="; - }; - assets = fetchurl { - url = "https://github.com/nxengine/nxengine-evo/releases/download/v${version}/NXEngine-v${version}-Linux.tar.xz"; - sha256 = "1b5hkmsrrhnjjf825ri6n62kb3fldwl7v5f1cqvqyv47zv15g5gy"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/nxengine/nxengine-evo/commit/1890127ec4b4b5f8d6cb0fb30a41868e95659840.patch"; - sha256 = "18j22vzkikcwqd42vlhzd6rjp26dq0zslxw5yyl07flivms0hny2"; - }) - (fetchpatch { - url = "https://github.com/nxengine/nxengine-evo/commit/75b8b8e3b067fd354baa903332f2a3254d1cc017.patch"; - sha256 = "0sjr7z63gp7nfxifxisvp2w664mxxk3xi4a3d86mm0470dj5m5bx"; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - libpng - SDL2 - SDL2_mixer - ]; - - # Allow finding game assets. - postPatch = '' - sed -i -e "s,/usr/share/,$out/share/," src/ResourceManager.cpp - ''; - - installPhase = '' - cd .. - unpackFile ${assets} - mkdir -p $out/bin/ $out/share/nxengine/ - install bin/* $out/bin/ - cp -r NXEngine-evo-${version}-Linux/data/ $out/share/nxengine/data - chmod -R a=r,a+X $out/share/nxengine/data - ''; - - meta = { - description = "A complete open-source clone/rewrite of the masterpiece jump-and-run platformer Doukutsu Monogatari (also known as Cave Story)"; - license = with lib.licenses; [ - gpl3 # Game engine - unfreeRedistributable # Game assets, freeware - ]; - maintainers = [ ]; - homepage = "https://github.com/nxengine/nxengine-evo"; - platforms = lib.platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/games/openclonk/default.nix b/third_party/nixpkgs/pkgs/games/openclonk/default.nix index 2249ab213a..5dd8d8252d 100644 --- a/third_party/nixpkgs/pkgs/games/openclonk/default.nix +++ b/third_party/nixpkgs/pkgs/games/openclonk/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchurl, fetchDebianPatch, fetchpatch, cmake, pkg-config -, SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal +{ lib, stdenv, fetchurl, fetchFromGitHub, fetchDebianPatch, fetchpatch, cmake, pkg-config +, SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal, libepoxy +, curl , freealut, readline, libb2, gcc-unwrapped , enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther }: @@ -10,12 +11,14 @@ let sha256 = "1ckj0dlpp5zsnkbb5qxxfxpkiq76jj2fgj91fyf3ll7n0gbwcgw5"; }; in stdenv.mkDerivation rec { - version = "8.1"; + version = "unstable-2023-10-30"; pname = "openclonk"; - src = fetchurl { - url = "https://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2"; - sha256 = "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik"; + src = fetchFromGitHub { + owner = "openclonk"; + repo = "openclonk"; + rev = "5275334a11ef7c23ce809f35d6b443abd91b415f"; + sha256 = "14x5b2rh739156l4072rbsnv9n862jz1zafi6ng158ja5fwl16l2"; }; patches = [ @@ -26,15 +29,11 @@ in stdenv.mkDerivation rec { patch = "system-libb2.patch"; hash = "sha256-zuH6zxSQXRhnt75092Xwb6XYv8UG391E5Arbnr7ApiI="; }) - (fetchpatch { - name = "fix-gcc-11-build.patch"; - url = "https://github.com/openclonk/openclonk/commit/e304efde2c8643bbc0fc1ad5e85024982744b233.patch"; - hash = "sha256-jfVCgeZuYo4x53zhljKcnMDMIBECTRsUSxkl6JaL6HA="; - }) ]; + enableParallelInstalling = false; + postInstall = '' - mv -v $out/games/openclonk $out/bin/ '' + lib.optionalString enableSoundtrack '' ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg ''; @@ -43,6 +42,7 @@ in stdenv.mkDerivation rec { buildInputs = [ SDL2 libvorbis libogg libjpeg libpng freetype glew tinyxml openal freealut + libepoxy curl readline libb2 ]; diff --git a/third_party/nixpkgs/pkgs/games/openjk/default.nix b/third_party/nixpkgs/pkgs/games/openjk/default.nix index 6e887c3835..b8e80b845c 100644 --- a/third_party/nixpkgs/pkgs/games/openjk/default.nix +++ b/third_party/nixpkgs/pkgs/games/openjk/default.nix @@ -32,13 +32,13 @@ let }; in stdenv.mkDerivation { pname = "openjk"; - version = "0-unstable-2024-03-25"; + version = "0-unstable-2024-04-07"; src = fetchFromGitHub { owner = "JACoders"; repo = "OpenJK"; - rev = "d2afcfefb5eb07d6f3787b48b947482160f27a1d"; - hash = "sha256-dUXrFlzeLfah0xMXKeXHCXnmeTjRAy0/+aDCtPNw8a8="; + rev = "2815211a87ccb8de1b0ee090d429a63f47e0ac7a"; + hash = "sha256-F3JF6jFgyMinIZ7dZAJ0ugGrJFianh2b6dX5A4iEnns="; }; dontAddPrefix = true; diff --git a/third_party/nixpkgs/pkgs/games/openlierox/default.nix b/third_party/nixpkgs/pkgs/games/openlierox/default.nix index 2543d71f0a..f1fa65c403 100644 --- a/third_party/nixpkgs/pkgs/games/openlierox/default.nix +++ b/third_party/nixpkgs/pkgs/games/openlierox/default.nix @@ -1,42 +1,79 @@ -{ lib, stdenv, fetchurl, libX11, xorgproto, gd, SDL, SDL_image, SDL_mixer, zlib -, libxml2, pkg-config, curl, cmake, libzip }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + curl, + gd, + libX11, + libxml2, + libzip, + SDL, + SDL_image, + SDL_mixer, + zlib, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openlierox"; - version = "0.58rc3"; + version = "0.58_rc5"; - src = fetchurl { - url = "mirror://sourceforge/openlierox/OpenLieroX_0.58_rc3.src.tar.bz2"; - sha256 = "1k35xppfqi3qfysv81xq3hj4qdy9j2ciinbkfdcmwclcsf3nh94z"; + src = fetchFromGitHub { + owner = "albertz"; + repo = "openlierox"; + rev = finalAttrs.version; + hash = "sha256-4ofjroEHlfrQitc7M+YTNWut0LGgntgQoOeBWU8nscY="; }; - env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2 -std=c++98 -Wno-error"; - - # The breakpad fails to build on x86_64, and it's only to report bugs upstream - cmakeFlags = [ "-DBREAKPAD=0" ]; - - preConfigure = '' - cmakeFlags="$cmakeFlags -DSYSTEM_DATA_DIR=$out/share" + postPatch = '' + sed 1i'#include ' -i src/common/s*x.cpp + sed 1i'#include ' -i include/XMLutils.h + substituteInPlace src/common/StringUtils.cpp \ + --replace-fail "xmlErrorPtr" "const xmlError*" ''; - patchPhase = '' - sed -i s,curl/types.h,curl/curl.h, include/HTTP.h src/common/HTTP.cpp - ''; + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + SDL + ]; + + buildInputs = [ + curl + gd + libX11 + libxml2 + libzip + SDL + SDL_image + SDL_mixer + zlib + ]; + + cmakeFlags = [ "-DSYSTEM_DATA_DIR=${placeholder "out"}/share" ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev libxml2}/include/libxml2"; installPhase = '' - mkdir -p $out/bin $out/share/OpenLieroX - cp bin/* $out/bin - cp -R ../share/gamedir/* $out/share/OpenLieroX + runHook preInstall + + install -Dm755 bin/* -t $out/bin + + mkdir -p $out/share/OpenLieroX + cp -r ../share/gamedir/* $out/share/OpenLieroX + + runHook postInstall ''; - nativeBuildInputs = [ cmake pkg-config curl ]; - buildInputs = [ libX11 xorgproto gd SDL SDL_image SDL_mixer zlib libxml2 - libzip ]; - meta = { - homepage = "http://openlierox.net"; description = "Real-time game with Worms-like shooting"; + homepage = "http://openlierox.net"; license = lib.licenses.lgpl2Plus; + mainProgram = "openlierox"; + maintainers = with lib.maintainers; [ tomasajt ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/games/openrct2/default.nix b/third_party/nixpkgs/pkgs/games/openrct2/default.nix index 485b7104b2..4a8a1c255e 100644 --- a/third_party/nixpkgs/pkgs/games/openrct2/default.nix +++ b/third_party/nixpkgs/pkgs/games/openrct2/default.nix @@ -30,27 +30,27 @@ }: let - openrct2-version = "0.4.8"; + openrct2-version = "0.4.11"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.3.13"; + objects-version = "1.4.4"; openmsx-version = "1.5"; - opensfx-version = "1.0.3"; + opensfx-version = "1.0.5"; title-sequences-version = "0.4.6"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - hash = "sha256-jSKAgohNMHuyOu4gUHyyZf1I7UrsXGDV5XwwK1DQPyM="; + hash = "sha256-zaaVieU/hulc2G/F19diJug3xuj3ejn5ihnmKfkBDcQ="; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; rev = "v${objects-version}"; - hash = "sha256-7RvRe7skXH5x8RbkQgtKs1YMBwq8dHInVo/4FAJwUD0="; + hash = "sha256-wKxWp/DSKkxCEI0lp4X8F9LxQsUKZfLk2CgajQ+y84k="; }; openmsx-src = fetchFromGitHub { @@ -64,7 +64,7 @@ let owner = "OpenRCT2"; repo = "OpenSoundEffects"; rev = "v${opensfx-version}"; - hash = "sha256-AMuCpq1Hszi2Vikto/cX9g81LwBDskaRMTLxNzU0/Gk="; + hash = "sha256-ucADnMLGm36eAo+NiioxEzeMqtu7YbGF9wsydK1mmoE="; }; title-sequences-src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix b/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix index 74baeb1238..30e302b17f 100644 --- a/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix +++ b/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix @@ -2,13 +2,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.58.1"; + version = "0.58.3"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-6R+biPgQyFPJD6Or6Jhm+7RZ7xe/SC6h83XVZkE+gSk="; + hash = "sha256-NRCdZ7iSeofVjH/kjpnw4zlxXc4ojhF1xfMpAfZuu98="; }; buildInputs = oldAttrs.buildInputs ++ [ zstd ]; diff --git a/third_party/nixpkgs/pkgs/games/openxcom/default.nix b/third_party/nixpkgs/pkgs/games/openxcom/default.nix index 3ae8e23605..25b3bd8116 100644 --- a/third_party/nixpkgs/pkgs/games/openxcom/default.nix +++ b/third_party/nixpkgs/pkgs/games/openxcom/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation { pname = "openxcom"; - version = "1.0.0.2023.08.12"; + version = "1.0.0.2024.02.28"; src = fetchFromGitHub { owner = "OpenXcom"; repo = "OpenXcom"; - rev = "bd632cc8569a57fdc3b68ce53f6ea850422ec5ac"; - hash = "sha256-ouYZ4rAEluqeP+ZUrbEZwCpXCw0cZLWsf1GbIE3jaTc="; + rev = "e2c5a1b45c33957ce7e206207c5fb752c1e79ae1"; + hash = "sha256-2G2dSvoDdacdYsXS51h3aGLCCjbHwcvD4CNnQIH/J6A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/openxray/default.nix b/third_party/nixpkgs/pkgs/games/openxray/default.nix index 961df955ca..8bcedac52a 100644 --- a/third_party/nixpkgs/pkgs/games/openxray/default.nix +++ b/third_party/nixpkgs/pkgs/games/openxray/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World"; homepage = "https://github.com/OpenXRay/xray-16/"; license = licenses.unfree // { - url = "https://github.com/OpenXRay/xray-16/blob/${version}/License.txt"; + url = "https://github.com/OpenXRay/xray-16/blob/${finalAttrs.version}/License.txt"; }; maintainers = with maintainers; [ OPNA2608 ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix index e986278742..945fe4ac91 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix @@ -64,7 +64,7 @@ else appimageTools.wrapType2 { contents = appimageTools.extract { inherit pname version src; }; in '' - mv -v $out/bin/${pname}-${version} $out/bin/osu\! + mv -v $out/bin/${pname} $out/bin/osu\! install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications for i in 16 32 48 64 96 128 256 512 1024; do install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png diff --git a/third_party/nixpkgs/pkgs/games/principia/default.nix b/third_party/nixpkgs/pkgs/games/principia/default.nix index e97fc509c5..0cf659e448 100644 --- a/third_party/nixpkgs/pkgs/games/principia/default.nix +++ b/third_party/nixpkgs/pkgs/games/principia/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , curl , freetype @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix b/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix index 058516cdc9..a2aabb72f0 100644 --- a/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix +++ b/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix @@ -31,13 +31,13 @@ assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is on stdenv.mkDerivation (finalAttrs: { pname = "prismlauncher-unwrapped"; - version = "8.2"; + version = "8.3"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; rev = finalAttrs.version; - hash = "sha256-4VsoxZzi/EfEsnDvvwzg2xhj7j5B+k3gvaSqwJFDweE="; + hash = "sha256-1YGzCgNdzscnOVeNlHMFJa0RbMo6C2qQjtBOeDxHakI="; }; nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja stripJavaArchivesHook ]; @@ -60,7 +60,11 @@ stdenv.mkDerivation (finalAttrs: { "-DLauncher_BUILD_PLATFORM=nixpkgs" ] ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] ++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ] - ++ lib.optionals stdenv.isDarwin [ "-DINSTALL_BUNDLE=nodeps" "-DMACOSX_SPARKLE_UPDATE_FEED_URL=''" ]; + ++ lib.optionals stdenv.isDarwin [ + "-DINSTALL_BUNDLE=nodeps" + "-DMACOSX_SPARKLE_UPDATE_FEED_URL=''" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/Applications/" + ]; postUnpack = '' rm -rf source/libraries/libnbtplusplus diff --git a/third_party/nixpkgs/pkgs/games/prismlauncher/wrapper.nix b/third_party/nixpkgs/pkgs/games/prismlauncher/wrapper.nix index d91b273113..3393ff45ef 100644 --- a/third_party/nixpkgs/pkgs/games/prismlauncher/wrapper.nix +++ b/third_party/nixpkgs/pkgs/games/prismlauncher/wrapper.nix @@ -72,7 +72,7 @@ symlinkJoin { ] ++ lib.optional (lib.versionAtLeast qtbase.version "6" && stdenv.isLinux) qtwayland; - waylandPreExec = '' + waylandPreExec = lib.optionalString withWaylandGLFW '' if [ -n "$WAYLAND_DISPLAY" ]; then export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH" fi diff --git a/third_party/nixpkgs/pkgs/games/rocksndiamonds/default.nix b/third_party/nixpkgs/pkgs/games/rocksndiamonds/default.nix index 6b1d51ab29..65f0dd9392 100644 --- a/third_party/nixpkgs/pkgs/games/rocksndiamonds/default.nix +++ b/third_party/nixpkgs/pkgs/games/rocksndiamonds/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://www.artsoft.org/rocksndiamonds/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ orivej xfix ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix b/third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix index 062a194c83..6bed4908f4 100644 --- a/third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix +++ b/third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix @@ -18,7 +18,7 @@ , openssl_1_1 , pango , SDL2 -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils , xorg , xorg_sys_opengl @@ -40,7 +40,7 @@ let nativeBuildInputs = [ autoPatchelfHook dpkg - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix b/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix index e5be3c4ae7..304c0f9b27 100644 --- a/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix +++ b/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, desktop-file-utils , gtk3, libX11, cmake, imagemagick -, pkg-config, perl, wrapGAppsHook, nixosTests, writeScript +, pkg-config, perl, wrapGAppsHook3, nixosTests, writeScript , isMobile ? false }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { imagemagick perl pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; env.NIX_CFLAGS_COMPILE = lib.optionalString isMobile "-DSTYLUS_BASED"; diff --git a/third_party/nixpkgs/pkgs/games/shipwright/default.nix b/third_party/nixpkgs/pkgs/games/shipwright/default.nix index e8b91a8141..397226fc4b 100644 --- a/third_party/nixpkgs/pkgs/games/shipwright/default.nix +++ b/third_party/nixpkgs/pkgs/games/shipwright/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shipwright"; - version = "8.0.4"; + version = "8.0.5"; src = fetchFromGitHub { owner = "harbourmasters"; repo = "shipwright"; rev = finalAttrs.version; - hash = "sha256-OoDToHCVNzccbKdsmek1kqCsW2HmVzA2vy3BtVW1DuM="; + hash = "sha256-o2VwOF46Iq4pwpumOau3bDXJ/CArx6NWBi00s3E4PnE="; fetchSubmodules = true; }; @@ -42,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/soh/CMakeLists.txt#L736 gamecontrollerdb = fetchurl { name = "gamecontrollerdb.txt"; - url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/81d89fd1e2bd5878e57dfa629abeed3a8feea438/gamecontrollerdb.txt"; - hash = "sha256-m1XzDc2dS0hkBTEGABgW4J/jjIw1TXtvHHtsvui6Bcc="; + url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/b7933e43ca2f8d26d8b668ea8ea52b736221af1e/gamecontrollerdb.txt"; + hash = "sha256-XIuS9BkWkM9d+SgT1OYTfWtcmzqSUDbMrMLoVnPgidE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/third_party/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index 6403602b79..c2071552e4 100644 --- a/third_party/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/third_party/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -2,7 +2,7 @@ , buildDotnetModule , dotnetCorePackages , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , iconConvTools , copyDesktopItems , makeDesktopItem @@ -73,7 +73,7 @@ buildDotnetModule rec { "-nologo" ]; - nativeBuildInputs = [ wrapGAppsHook iconConvTools copyDesktopItems ]; + nativeBuildInputs = [ wrapGAppsHook3 iconConvTools copyDesktopItems ]; runtimeDeps = [ # Required by the game. @@ -137,7 +137,7 @@ buildDotnetModule rec { description = "Launcher for Space Station 14, a multiplayer game about paranoia and disaster"; homepage = "https://spacestation14.io"; license = licenses.mit; - maintainers = [ maintainers.zumorica ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; mainProgram = "SS14.Launcher"; }; diff --git a/third_party/nixpkgs/pkgs/games/starsector/default.nix b/third_party/nixpkgs/pkgs/games/starsector/default.nix index 535039c79f..8e38f232f2 100644 --- a/third_party/nixpkgs/pkgs/games/starsector/default.nix +++ b/third_party/nixpkgs/pkgs/games/starsector/default.nix @@ -62,15 +62,17 @@ stdenv.mkDerivation rec { # it tries to run everything with relative paths, which makes it CWD dependent # also point mod, screenshot, and save directory to $XDG_DATA_HOME - # additionally, add some GC options to improve performance of the game - # and remove flags "PermSize" and "MaxPermSize" that were removed with Java 8 + # additionally, add some GC options to improve performance of the game, + # remove flags "PermSize" and "MaxPermSize" that were removed with Java 8 and + # pass-through CLI args ($@) to the JVM. postPatch = '' substituteInPlace starsector.sh \ --replace-fail "./jre_linux/bin/java" "${openjdk}/bin/java" \ --replace-fail "./native/linux" "$out/share/starsector/native/linux" \ --replace-fail "=." "=\''${XDG_DATA_HOME:-\$HOME/.local/share}/starsector" \ - --replace-warn "-XX:+CompilerThreadHintNoPreempt" "-XX:+UnlockDiagnosticVMOptions -XX:-BytecodeVerificationRemote -XX:+CMSConcurrentMTEnabled -XX:+DisableExplicitGC" \ - --replace-quiet " -XX:PermSize=192m -XX:MaxPermSize=192m" "" + --replace-fail "-XX:+CompilerThreadHintNoPreempt" "-XX:+UnlockDiagnosticVMOptions -XX:-BytecodeVerificationRemote -XX:+CMSConcurrentMTEnabled -XX:+DisableExplicitGC" \ + --replace-quiet " -XX:PermSize=192m -XX:MaxPermSize=192m" "" \ + --replace-fail "com.fs.starfarer.StarfarerLauncher" "\"\$@\" com.fs.starfarer.StarfarerLauncher" ''; passthru.updateScript = writeScript "starsector-update-script" '' diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix index 936a3510b3..95668e1ece 100644 --- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -68,6 +68,10 @@ let envScript = '' # prevents various error messages unset GIO_EXTRA_MODULES + + # This is needed for IME (e.g. iBus, fcitx5) to function correctly on non-CJK locales + # https://github.com/ValveSoftware/steam-for-linux/issues/781#issuecomment-2004757379 + GTK_IM_MODULE='xim' '' + lib.toShellVars extraEnv; in buildFHSEnv rec { diff --git a/third_party/nixpkgs/pkgs/games/steam/runtime.nix b/third_party/nixpkgs/pkgs/games/steam/runtime.nix index 8e0492b69a..563a09d369 100644 --- a/third_party/nixpkgs/pkgs/games/steam/runtime.nix +++ b/third_party/nixpkgs/pkgs/games/steam/runtime.nix @@ -4,16 +4,16 @@ , writeShellScript, curl, nix-update }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt version = "0.20231127.68515"; src = fetchurl { - url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "sha256-invUOdJGNhrswsj9Vj/bSAkEigWtBQ554sBAyvPf0mk="; - name = "scout-runtime-${version}.tar.gz"; + url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${finalAttrs.version}/steam-runtime.tar.xz"; + hash = "sha256-invUOdJGNhrswsj9Vj/bSAkEigWtBQ554sBAyvPf0mk="; + name = "scout-runtime-${finalAttrs.version}.tar.gz"; }; buildCommand = '' @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { ''; }; - meta = with lib; { + meta = { description = "The official runtime used by Steam"; homepage = "https://github.com/ValveSoftware/steam-runtime"; - license = licenses.unfreeRedistributable; # Includes NVIDIA CG toolkit - maintainers = with maintainers; [ hrdinka abbradar ]; + license = lib.licenses.unfreeRedistributable; # Includes NVIDIA CG toolkit + maintainers = with lib.maintainers; [ hrdinka abbradar ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/games/the-powder-toy/default.nix b/third_party/nixpkgs/pkgs/games/the-powder-toy/default.nix deleted file mode 100644 index 2cb972344f..0000000000 --- a/third_party/nixpkgs/pkgs/games/the-powder-toy/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, meson -, ninja -, pkg-config -, python3 -, SDL2 -, bzip2 -, curl -, fftwFloat -, lua -, luajit -, zlib -, jsoncpp -, libpng -, Cocoa }: - -stdenv.mkDerivation rec { - pname = "the-powder-toy"; - version = "97.0.352"; - - src = fetchFromGitHub { - owner = "The-Powder-Toy"; - repo = "The-Powder-Toy"; - rev = "v${version}"; - sha256 = "sha256-LYohsqFU9LBgTXMaV6cf8/zf3fBvT+s5A1JBpPHekH8="; - }; - - patches = [ - # Fix gcc-13 build failure: - # https://github.com/The-Powder-Toy/The-Powder-Toy/pull/898 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/The-Powder-Toy/The-Powder-Toy/commit/162bce9a1036e0c233399941410364c4a4370980.patch"; - hash = "sha256-oQNwKemV3BjMLSUd6zMCKqiClcc3Ouxwn3jagf/Q1/I="; - }) - ]; - - nativeBuildInputs = [ meson ninja pkg-config python3 ]; - - buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib jsoncpp libpng ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - - mesonFlags = [ "-Dworkaround_elusive_bzip2=false" ]; - - installPhase = '' - install -Dm 755 powder $out/bin/powder - - mkdir -p $out/share/applications - mv ../resources $out/share - '' + lib.optionalString stdenv.isLinux '' - mv ./resources/powder.desktop $out/share/applications - ''; - - meta = with lib; { - description = "A free 2D physics sandbox game"; - homepage = "https://powdertoy.co.uk/"; - platforms = platforms.unix; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ abbradar siraben ]; - mainProgram = "powder"; - }; -} diff --git a/third_party/nixpkgs/pkgs/games/unvanquished/default.nix b/third_party/nixpkgs/pkgs/games/unvanquished/default.nix index a8ad86e11a..628c72a24a 100644 --- a/third_party/nixpkgs/pkgs/games/unvanquished/default.nix +++ b/third_party/nixpkgs/pkgs/games/unvanquished/default.nix @@ -33,15 +33,15 @@ }: let - version = "0.54.0"; - binary-deps-version = "8"; + version = "0.54.1"; + binary-deps-version = "10"; src = fetchFromGitHub { owner = "Unvanquished"; repo = "Unvanquished"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-X2c6BHI4W6fOurLiBWIBZzJrZ+7RHMEwN8GJGz6e350="; + sha256 = "sha256-F8U9UBFCe0PcFYZ2DThQwhouO22jKyWb0/ABhprHXCU="; }; unvanquished-binary-deps = stdenv.mkDerivation rec { @@ -51,7 +51,7 @@ let src = fetchzip { url = "https://dl.unvanquished.net/deps/linux-amd64-default_${version}.tar.xz "; - sha256 = "sha256-6r9j0HRMDC/7i8f4f5bBK4NmwsTpSChHrRWwz0ENAZo="; + sha256 = "sha256-5n8gRvTuke4e7EaZ/5G+dtCG6qmnawhtA1IXIFQPkzA="; }; dontPatchELF = true; @@ -119,7 +119,7 @@ let pname = "unvanquished-assets"; inherit version src; - outputHash = "sha256-ua9Q5E5C4t8z/yNQp6qn1i9NNDAk4ohzvgpMbCBxb8Q="; + outputHash = "sha256-xb8gKQHSyscWM29r0BWK0YsALull9uYjX7e+l1DHFPg="; outputHashMode = "recursive"; nativeBuildInputs = [ aria2 cacert ]; diff --git a/third_party/nixpkgs/pkgs/games/vassal/default.nix b/third_party/nixpkgs/pkgs/games/vassal/default.nix index 31996a30c1..1bb5c06ea9 100644 --- a/third_party/nixpkgs/pkgs/games/vassal/default.nix +++ b/third_party/nixpkgs/pkgs/games/vassal/default.nix @@ -4,16 +4,16 @@ , glib , jre , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.7.10"; + version = "3.7.12"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-cQ2tLd3KU46qe/PrMPh3I3+KQxNGBB4WbRfPHpT9IVA="; + sha256 = "sha256-pNpDaGx/h3W+AsX965zu3zZ94kMYvh1pV8C8qYN0imc="; }; buildInputs = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix index 8b9468b81c..7134139c62 100644 --- a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix +++ b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.19.5"; + version = "1.19.7"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-noweIb+lZhme1kEjU2+tIc0E99iShNngxEEyDMKJcpk="; + hash = "sha256-C+vPsoMlo6EKmzf+XkvIhrDGG7EccU8c36GZt0/1r1Q="; }; diff --git a/third_party/nixpkgs/pkgs/games/vitetris/default.nix b/third_party/nixpkgs/pkgs/games/vitetris/default.nix index f7e566b220..67358134e6 100644 --- a/third_party/nixpkgs/pkgs/games/vitetris/default.nix +++ b/third_party/nixpkgs/pkgs/games/vitetris/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - makeFlags = [ "INSTALL=install" ]; + makeFlags = [ "INSTALL=install" "CPPFLAGS=-Wno-implicit-int" ]; meta = { description = "Terminal-based Tetris clone by Victor Nilsson"; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ siers ]; mainProgram = "tetris"; + platforms = lib.platforms.unix; longDescription = '' vitetris is a terminal-based Tetris clone by Victor Nilsson. Gameplay is much diff --git a/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix b/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix index 4b38c86fbd..06f6b71172 100644 --- a/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix +++ b/third_party/nixpkgs/pkgs/games/worldofgoo/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://worldofgoo.com"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ jcumming amaxine ]; + maintainers = with maintainers; [ jcumming ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/xskat/default.nix b/third_party/nixpkgs/pkgs/games/xskat/default.nix index 6f28a6846e..993070c89c 100644 --- a/third_party/nixpkgs/pkgs/games/xskat/default.nix +++ b/third_party/nixpkgs/pkgs/games/xskat/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; }; + env.NIX_CFLAGS_COMPILE = "-Wno-implicit-int"; + preInstall = '' sed -i Makefile \ -e "s|.* BINDIR .*| BINDIR = $out/bin|" \ diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/default.nix index 0a06cf4a87..b7dc85d277 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/default.nix @@ -1,8 +1,16 @@ -{mkKdeDerivation}: +{ mkKdeDerivation +, python3 +}: mkKdeDerivation { pname = "extra-cmake-modules"; - outputs = ["out"]; + outputs = [ "out" ]; + + # Packages that have an Android APK (e.g. KWeather) require Python3 at build time. + # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57 + propagatedNativeBuildInputs = [ + python3 + ]; setupHook = ./ecm-hook.sh; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh b/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh index 8f34f5f732..1f60ba1aed 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh +++ b/third_party/nixpkgs/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh @@ -41,7 +41,7 @@ ecmPostHook() { cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update" cmakeFlags+=" -DKDE_INSTALL_KAPPTEMPLATESDIR=${!outputDev}/share/kdevappwizard/templates" cmakeFlags+=" -DKDE_INSTALL_KFILETEMPLATESDIR=${!outputDev}/share/kdevfiletemplates/templates" - cmakeFlags+=" -DKDE_INSTALL_KXMLGUIDIR=${!outputBin}/share/kxmlgui6" + cmakeFlags+=" -DKDE_INSTALL_KXMLGUIDIR=${!outputBin}/share/kxmlgui5" # Yes, this needs to be 5 and not 6. Don't ask. cmakeFlags+=" -DKDE_INSTALL_KNOTIFYRCDIR=${!outputBin}/share/knotifications6" cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons" cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kdoctools/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kdoctools/default.nix index 8e8341997a..996e75c885 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kdoctools/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kdoctools/default.nix @@ -8,9 +8,6 @@ mkKdeDerivation { pname = "kdoctools"; - # lots of self-references, the output is pretty small (~5MB), not worth trying to untangle - outputs = ["out"]; - # Perl could be used both at build time and at runtime. extraNativeBuildInputs = [perl perlPackages.URI]; extraBuildInputs = [docbook_xml_dtd_45 docbook-xsl-nons]; diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kfilemetadata/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kfilemetadata/default.nix index b6b5f3a7bf..0e9fd5489e 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kfilemetadata/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kfilemetadata/default.nix @@ -5,7 +5,6 @@ ebook_tools, exiv2, ffmpeg, - kcodecs, kconfig, kdegraphics-mobipocket, libappimage, @@ -18,5 +17,5 @@ mkKdeDerivation { patches = [./cmake-install-paths.patch]; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kcodecs kconfig kdegraphics-mobipocket libappimage]; + extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kconfig kdegraphics-mobipocket libappimage]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kguiaddons/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kguiaddons/default.nix index 3c1fb8034a..3aa8bcdf29 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kguiaddons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kguiaddons/default.nix @@ -2,12 +2,11 @@ mkKdeDerivation, qtwayland, pkg-config, - wayland, }: mkKdeDerivation { pname = "kguiaddons"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland wayland]; + extraBuildInputs = [qtwayland]; meta.mainProgram = "kde-geo-uri-handler"; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kidletime/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kidletime/default.nix index 8fd68f04ec..7171822ec1 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kidletime/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kidletime/default.nix @@ -2,12 +2,11 @@ mkKdeDerivation, qtwayland, pkg-config, - wayland-protocols, xorg, }: mkKdeDerivation { pname = "kidletime"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland xorg.libXScrnSaver wayland-protocols]; + extraBuildInputs = [qtwayland xorg.libXScrnSaver]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/kwindowsystem/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kwindowsystem/default.nix index 711638cb10..a5fb8eddb7 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/kwindowsystem/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/kwindowsystem/default.nix @@ -4,11 +4,10 @@ qtdeclarative, qtwayland, pkg-config, - wayland, }: mkKdeDerivation { pname = "kwindowsystem"; extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [qtdeclarative qtwayland wayland]; + extraBuildInputs = [qtdeclarative qtwayland]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/qqc2-desktop-style/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/qqc2-desktop-style/default.nix index d681efd14f..3c756d9b93 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/qqc2-desktop-style/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/qqc2-desktop-style/default.nix @@ -2,12 +2,10 @@ mkKdeDerivation, qtdeclarative, qttools, - sonnet, }: mkKdeDerivation { pname = "qqc2-desktop-style"; extraNativeBuildInputs = [qttools]; extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [sonnet]; } diff --git a/third_party/nixpkgs/pkgs/kde/frameworks/solid/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/solid/default.nix index 08419f4b97..2c628b8dbc 100644 --- a/third_party/nixpkgs/pkgs/kde/frameworks/solid/default.nix +++ b/third_party/nixpkgs/pkgs/kde/frameworks/solid/default.nix @@ -8,8 +8,10 @@ mkKdeDerivation { pname = "solid"; - # Also search /run/wrappers for mount/umount - patches = [./fix-search-path.patch]; + patches = [ + # Also search /run/wrappers for mount/umount + ./fix-search-path.patch + ]; extraNativeBuildInputs = [qttools bison flex]; extraBuildInputs = [libimobiledevice]; diff --git a/third_party/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix b/third_party/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix index 6e89f0b685..416dd91a9e 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix @@ -26,9 +26,8 @@ mkKdeDerivation rec { extraNativeBuildInputs = [ rustPlatform.cargoSetupHook cargo - corrosion rustc ]; - extraBuildInputs = [xapian]; + extraBuildInputs = [corrosion xapian]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/angelfish/default.nix b/third_party/nixpkgs/pkgs/kde/gear/angelfish/default.nix index 2250b5db6a..0d9b4a341f 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/angelfish/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/angelfish/default.nix @@ -25,9 +25,8 @@ mkKdeDerivation rec { extraNativeBuildInputs = [ rustPlatform.cargoSetupHook cargo - corrosion rustc ]; - extraBuildInputs = [qtsvg qtwebengine qcoro]; + extraBuildInputs = [qtsvg qtwebengine corrosion qcoro]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/arianna/default.nix b/third_party/nixpkgs/pkgs/kde/gear/arianna/default.nix index 9e56cfda9e..247da11b6d 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/arianna/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/arianna/default.nix @@ -5,7 +5,6 @@ qtwebchannel, qtwebengine, kitemmodels, - kquickcharts, }: mkKdeDerivation { pname = "arianna"; @@ -16,7 +15,6 @@ mkKdeDerivation { qtwebchannel qtwebengine kitemmodels - kquickcharts ]; meta.mainProgram = "arianna"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/ghostwriter/default.nix b/third_party/nixpkgs/pkgs/kde/gear/ghostwriter/default.nix index f4b4a3cee2..273e805549 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/ghostwriter/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/ghostwriter/default.nix @@ -12,7 +12,7 @@ mkKdeDerivation { pname = "ghostwriter"; - extraNativeBuildInputs = [pkg-config kdoctools]; - extraBuildInputs = [qtsvg qttools qtwebchannel qtwebengine qt5compat hunspell]; + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtsvg qttools qtwebchannel qtwebengine qt5compat kdoctools hunspell]; meta.mainProgram = "ghostwriter"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/gwenview/default.nix b/third_party/nixpkgs/pkgs/kde/gear/gwenview/default.nix index 2788e592ef..4bbb5f98eb 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/gwenview/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/gwenview/default.nix @@ -10,8 +10,6 @@ kimageannotator, lcms2, libtiff, - wayland, - wayland-protocols, }: mkKdeDerivation { pname = "gwenview"; @@ -29,7 +27,5 @@ mkKdeDerivation { kimageannotator lcms2 libtiff - wayland - wayland-protocols ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kasts/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kasts/default.nix index 860af4a1f0..2375bb00af 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kasts/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kasts/default.nix @@ -3,7 +3,6 @@ qtsvg, qtmultimedia, pkg-config, - qqc2-desktop-style, taglib, libvlc, }: @@ -14,7 +13,6 @@ mkKdeDerivation { extraBuildInputs = [ qtsvg qtmultimedia - qqc2-desktop-style taglib libvlc ]; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kcalc/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kcalc/default.nix index fdc55b3532..28f1d314ce 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kcalc/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kcalc/default.nix @@ -8,7 +8,6 @@ mkKdeDerivation { pname = "kcalc"; - extraNativeBuildInputs = [kdoctools]; - extraBuildInputs = [qt5compat gmp mpfr]; + extraBuildInputs = [qt5compat gmp mpfr kdoctools]; meta.mainProgram = "kcalc"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/default.nix index fd8868cf41..2381dd58c8 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/default.nix @@ -1,5 +1,8 @@ { + lib, mkKdeDerivation, + substituteAll, + sshfs, qtconnectivity, qtmultimedia, qtwayland, @@ -11,6 +14,23 @@ mkKdeDerivation { pname = "kdeconnect-kde"; + patches = [ + (substituteAll { + src = ./hardcode-sshfs-path.patch; + sshfs = lib.getExe sshfs; + }) + # We build OpenSSH without ssh-dss support, so sshfs explodes at runtime. + # See: https://github.com/NixOS/nixpkgs/commit/6ee4b8c8bf815567f7d0fa131576d2b8c0a18167 + # FIXME: upstream? + ./remove-ssh-dss.patch + ]; + + # Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically + postFixup = '' + mkdir -p $out/nix-support + echo "${sshfs}" > $out/nix-support/depends + ''; + extraNativeBuildInputs = [pkg-config]; extraBuildInputs = [qtconnectivity qtmultimedia qtwayland wayland wayland-protocols libfakekey]; diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/hardcode-sshfs-path.patch b/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/hardcode-sshfs-path.patch new file mode 100644 index 0000000000..df78f60fcf --- /dev/null +++ b/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/hardcode-sshfs-path.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp +index 29e94f3b..c71e552f 100644 +--- a/plugins/sftp/mounter.cpp ++++ b/plugins/sftp/mounter.cpp +@@ -94,7 +94,7 @@ void Mounter::onPacketReceived(const NetworkPacket &np) + + QDir().mkpath(m_mountPoint); + +- const QString program = QStringLiteral("sshfs"); ++ const QString program = QStringLiteral("@sshfs@"); + + QString path; + if (np.has(QStringLiteral("multiPaths"))) diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/remove-ssh-dss.patch b/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/remove-ssh-dss.patch new file mode 100644 index 0000000000..b404132f4e --- /dev/null +++ b/third_party/nixpkgs/pkgs/kde/gear/kdeconnect-kde/remove-ssh-dss.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp +index 29e94f3b..0f300c63 100644 +--- a/plugins/sftp/mounter.cpp ++++ b/plugins/sftp/mounter.cpp +@@ -122,7 +122,7 @@ void Mounter::onPacketReceived(const NetworkPacket &np) + << QStringLiteral("-o") << QStringLiteral("IdentityFile=") + KdeConnectConfig::instance().privateKeyPath() + << QStringLiteral("-o") << QStringLiteral("StrictHostKeyChecking=no") // Do not ask for confirmation because it is not a known host + << QStringLiteral("-o") << QStringLiteral("UserKnownHostsFile=/dev/null") // Prevent storing as a known host +- << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-dss\\,ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=351725 ++ << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=351725 + << QStringLiteral("-o") << QStringLiteral("PubkeyAcceptedKeyTypes=+ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=443155 + << QStringLiteral("-o") << QStringLiteral("uid=") + QString::number(getuid()) + << QStringLiteral("-o") << QStringLiteral("gid=") + QString::number(getgid()) diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix index e256ee8fdf..fded9e9b02 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix @@ -4,8 +4,8 @@ rustPlatform, cargo, rustc, - corrosion, discount, + corrosion, alpaka, # provided as callPackage input to enable easier overrides through overlays cargoHash ? "sha256-Yt1Gxw9Q1Q108YRJoUIpeNZlGjZ7yabLW3bRO4+x6Vo=", @@ -28,9 +28,8 @@ mkKdeDerivation rec { extraNativeBuildInputs = [ rustPlatform.cargoSetupHook cargo - corrosion rustc ]; - extraBuildInputs = [discount alpaka]; + extraBuildInputs = [discount corrosion alpaka]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kio-extras/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kio-extras/default.nix index b80f9175a5..18cf462941 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kio-extras/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kio-extras/default.nix @@ -3,7 +3,6 @@ qt5compat, qtsvg, pkg-config, - libkexiv2, samba, libssh, libmtp, @@ -24,7 +23,6 @@ mkKdeDerivation { extraBuildInputs = [ qt5compat qtsvg - libkexiv2 samba libssh diff --git a/third_party/nixpkgs/pkgs/kde/gear/koko/default.nix b/third_party/nixpkgs/pkgs/kde/gear/koko/default.nix index faec24560b..1241f68e12 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/koko/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/koko/default.nix @@ -7,7 +7,6 @@ qtsvg, exiv2, kirigami-addons, - kquickimageeditor, }: let # URLs snapshotted through # https://web.archive.org/save/$url @@ -41,7 +40,6 @@ in qtsvg exiv2 kirigami-addons - kquickimageeditor ]; meta.mainProgram = "koko"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/kopeninghours/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kopeninghours/default.nix index b315d765fb..7ba5214ac0 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/kopeninghours/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/kopeninghours/default.nix @@ -16,5 +16,6 @@ mkKdeDerivation { enablePython = true; python = python3; }) + python3 ]; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/plasmatube/default.nix b/third_party/nixpkgs/pkgs/kde/gear/plasmatube/default.nix index 05285f6b6c..63236fe00d 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/plasmatube/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/plasmatube/default.nix @@ -3,18 +3,15 @@ mkKdeDerivation, qtquick3d, qtsvg, - purpose, - qqc2-desktop-style, pkg-config, - mpv, + mpv-unwrapped, yt-dlp, }: mkKdeDerivation { pname = "plasmatube"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtquick3d qtsvg mpv qqc2-desktop-style]; - extraPropagatedBuildInputs = [purpose]; + extraBuildInputs = [qtquick3d qtsvg mpv-unwrapped]; qtWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ yt-dlp ])]; meta.mainProgram = "plasmatube"; diff --git a/third_party/nixpkgs/pkgs/kde/gear/sweeper/default.nix b/third_party/nixpkgs/pkgs/kde/gear/sweeper/default.nix index e2b7fd9344..24e75b7c53 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/sweeper/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/sweeper/default.nix @@ -1,10 +1,6 @@ -{ - mkKdeDerivation, - plasma-activities-stats, -}: +{mkKdeDerivation}: mkKdeDerivation { pname = "sweeper"; - extraBuildInputs = [plasma-activities-stats]; meta.mainProgram = "sweeper"; } diff --git a/third_party/nixpkgs/pkgs/kde/gear/tokodon/default.nix b/third_party/nixpkgs/pkgs/kde/gear/tokodon/default.nix index 1e12163eb9..fd47144eda 100644 --- a/third_party/nixpkgs/pkgs/kde/gear/tokodon/default.nix +++ b/third_party/nixpkgs/pkgs/kde/gear/tokodon/default.nix @@ -5,14 +5,13 @@ qtsvg, qtwebsockets, qtwebview, - mpv, - kitemmodels, + mpv-unwrapped, sonnet, }: mkKdeDerivation { pname = "tokodon"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtmultimedia qtsvg qtwebsockets qtwebview mpv kitemmodels sonnet]; + extraBuildInputs = [qtmultimedia qtsvg qtwebsockets qtwebview mpv-unwrapped sonnet]; meta.mainProgram = "tokodon"; } diff --git a/third_party/nixpkgs/pkgs/kde/generated/dependencies.json b/third_party/nixpkgs/pkgs/kde/generated/dependencies.json index aed3f12814..70f5499bfd 100644 --- a/third_party/nixpkgs/pkgs/kde/generated/dependencies.json +++ b/third_party/nixpkgs/pkgs/kde/generated/dependencies.json @@ -18,7 +18,6 @@ "kcrash", "ki18n", "kiconthemes", - "kio", "kitemmodels", "kwidgetsaddons", "kxmlgui" @@ -70,6 +69,7 @@ "akonadi-mime": [ "akonadi", "extra-cmake-modules", + "kio", "kmime" ], "akonadi-notes": [ @@ -144,6 +144,7 @@ "ki18n", "kirigami", "kirigami-addons", + "qqc2-desktop-style", "syndication" ], "alpaka": [ @@ -275,6 +276,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdbusaddons", "kdoctools", "ki18n", "kiconthemes", @@ -509,7 +511,6 @@ "knotifyconfig", "kparts", "ktextwidgets", - "kwallet", "kwidgetsaddons", "kwindowsystem", "kxmlgui", @@ -704,6 +705,7 @@ "dolphin-plugins": [ "dolphin", "extra-cmake-modules", + "kconfig", "kcoreaddons", "ki18n", "kio", @@ -769,6 +771,7 @@ "kiconthemes", "kio", "kirigami", + "kirigami-addons", "kxmlgui", "qqc2-desktop-style" ], @@ -812,7 +815,8 @@ "kcoreaddons", "kdbusaddons", "ki18n", - "kirigami" + "kirigami", + "kirigami-addons" ], "filelight": [ "extra-cmake-modules", @@ -875,15 +879,6 @@ "kxmlgui", "sonnet" ], - "glaxnimate": [ - "extra-cmake-modules", - "karchive", - "kcompletion", - "kconfigwidgets", - "kcoreaddons", - "kcrash", - "kxmlgui" - ], "granatier": [ "extra-cmake-modules", "kconfig", @@ -952,7 +947,20 @@ "kiconthemes", "kio", "kirigami", - "mpvqt" + "mpvqt", + "qqc2-desktop-style" + ], + "hash-o-matic": [ + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kirigami", + "kwindowsystem", + "libkleo", + "qqc2-desktop-style" ], "heaptrack": [ "extra-cmake-modules", @@ -1117,6 +1125,14 @@ "libkdepim", "pimcommon" ], + "kaidan": [ + "extra-cmake-modules", + "kcoreaddons", + "kio", + "kirigami", + "kirigami-addons", + "kquickimageeditor" + ], "kajongg": [ "extra-cmake-modules", "kdoctools", @@ -1183,7 +1199,8 @@ "kcrash", "ki18n", "kirigami", - "kirigami-addons" + "kirigami-addons", + "qqc2-desktop-style" ], "kalternatives": [ "extra-cmake-modules", @@ -1281,6 +1298,7 @@ "ki18n", "kirigami", "kirigami-addons", + "qqc2-desktop-style", "qtkeychain", "syndication", "threadweaver" @@ -2113,11 +2131,13 @@ "ki18n", "kirigami", "kwidgetsaddons", - "kwindowsystem" + "kwindowsystem", + "qqc2-desktop-style" ], "kfilemetadata": [ "extra-cmake-modules", "karchive", + "kcodecs", "kcoreaddons", "ki18n", "poppler", @@ -2150,6 +2170,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdbusaddons", "kdnssd", "kdoctools", "ki18n", @@ -2332,6 +2353,7 @@ "extra-cmake-modules" ], "kiconthemes": [ + "breeze-icons", "extra-cmake-modules", "karchive", "kcolorscheme", @@ -2574,6 +2596,7 @@ ], "kirigami-addons": [ "extra-cmake-modules", + "kconfig", "ki18n", "kirigami" ], @@ -2898,7 +2921,6 @@ "extra-cmake-modules", "kconfig", "kconfigwidgets", - "kcrash", "kdbusaddons", "kdoctools", "kglobalaccel", @@ -3419,7 +3441,6 @@ "kiconthemes", "kio", "ktextaddons", - "ktexttemplate", "kwidgetsaddons", "kxmlgui", "sonnet", @@ -3496,8 +3517,7 @@ "kcoreaddons", "ki18n", "kirigami", - "kirigami-addons", - "kwindowsystem" + "kirigami-addons" ], "kregexpeditor": [ "extra-cmake-modules", @@ -3506,7 +3526,6 @@ "kdoctools", "ki18n", "kiconthemes", - "kservice", "ktextwidgets", "kwidgetsaddons", "kxmlgui" @@ -3555,7 +3574,6 @@ "extra-cmake-modules", "kconfig", "kcoreaddons", - "kcrash", "kdbusaddons", "kdnssd", "kdoctools", @@ -3633,7 +3651,6 @@ "kconfigwidgets", "kcoreaddons", "kdbusaddons", - "kglobalaccel", "ki18n", "kpackage", "kservice", @@ -3698,6 +3715,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdbusaddons", "kdoctools", "ki18n", "kio", @@ -3761,6 +3779,20 @@ "kwallet", "kwidgetsaddons" ], + "kstars": [ + "breeze-icons", + "extra-cmake-modules", + "kconfig", + "kcrash", + "kdoctools", + "kguiaddons", + "ki18n", + "knewstuff", + "knotifications", + "knotifyconfig", + "kplotting", + "kxmlgui" + ], "kstatusnotifieritem": [ "extra-cmake-modules", "kwindowsystem" @@ -3772,6 +3804,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdbusaddons", "kdoctools", "kguiaddons", "ki18n", @@ -3988,6 +4021,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdbusaddons", "kdoctools", "ki18n", "kwidgetsaddons", @@ -4054,6 +4088,7 @@ "kdoctools", "ki18n", "kio", + "kservice", "kstatusnotifieritem", "kwallet", "kwidgetsaddons", @@ -4198,7 +4233,8 @@ "ktexteditor", "kuserfeedback", "kwidgetsaddons", - "kxmlgui" + "kxmlgui", + "purpose" ], "latte-dock": [ "extra-cmake-modules", @@ -4339,21 +4375,12 @@ "libksysguard": [ "extra-cmake-modules", "kauth", - "kcodecs", - "kcompletion", "kconfig", - "kconfigwidgets", "kcoreaddons", - "kglobalaccel", "ki18n", - "kiconthemes", - "kio", - "kjobwidgets", "knewstuff", "kpackage", "kservice", - "kwidgetsaddons", - "kwindowsystem", "solid" ], "libktorrent": [ @@ -4426,6 +4453,7 @@ "kconfig", "kcoreaddons", "kcrash", + "kdbusaddons", "kdoctools", "kguiaddons", "ki18n", @@ -4469,10 +4497,13 @@ ], "marknote": [ "extra-cmake-modules", + "kcolorscheme", "kconfig", "kcoreaddons", "ki18n", - "kirigami" + "kirigami", + "kirigami-addons", + "kxmlgui" ], "massif-visualizer": [ "extra-cmake-modules", @@ -4598,6 +4629,7 @@ ], "milou": [ "extra-cmake-modules", + "kconfig", "ki18n", "krunner", "libplasma" @@ -4629,6 +4661,7 @@ "kcolorscheme", "kconfig", "kcoreaddons", + "kcrash", "kdbusaddons", "ki18n", "kio", @@ -4642,6 +4675,7 @@ "kwindowsystem", "libquotient", "prison", + "purpose", "qcoro", "qqc2-desktop-style", "qtkeychain", @@ -4687,12 +4721,15 @@ "breeze-icons", "karchive", "kbookmarks", + "kcolorscheme", "kdegraphics-mobipocket", "ki18n", "kio", + "kitemviews", "kparts", "kpty", "ktextwidgets", + "kwidgetsaddons", "kxmlgui", "libkexiv2", "phonon", @@ -4700,6 +4737,15 @@ "purpose", "threadweaver" ], + "optiimage": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kio", + "kirigami", + "kirigami-addons", + "qqc2-desktop-style" + ], "oxygen": [ "extra-cmake-modules", "frameworkintegration", @@ -4731,6 +4777,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdbusaddons", "kdoctools", "ki18n", "kio", @@ -5210,18 +5257,11 @@ ], "plasma-settings": [ "extra-cmake-modules", - "kauth", - "kconfig", + "kcmutils", "kcoreaddons", "kdbusaddons", "ki18n", - "kio", - "kirigami-addons", - "kservice", - "libplasma", - "modemmanager-qt", - "networkmanager-qt", - "solid" + "kirigami-addons" ], "plasma-simplemenu": [ "extra-cmake-modules", @@ -5389,6 +5429,7 @@ "kitemmodels", "mpvqt", "purpose", + "qqc2-desktop-style", "qtkeychain" ], "plymouth-kcm": [ @@ -5486,6 +5527,14 @@ "kirigami", "kservice" ], + "pvfviewer": [ + "extra-cmake-modules", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui" + ], "qmlkonsole": [ "extra-cmake-modules", "kconfig", @@ -5549,6 +5598,21 @@ "messagelib", "pimcommon" ], + "rkward": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "knotifications", + "kparts", + "ktexteditor", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui" + ], "rocs": [ "extra-cmake-modules", "karchive", @@ -5606,7 +5670,6 @@ "prison", "purpose", "qtkeychain", - "selenium-webdriver-at-spi", "sonnet", "syntax-highlighting" ], @@ -5634,7 +5697,6 @@ "extra-cmake-modules", "kpipewire", "kwayland", - "kwin", "kwindowsystem", "wayland" ], @@ -5663,6 +5725,20 @@ "kxmlgui", "purpose" ], + "skladnik": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], "skrooge": [ "extra-cmake-modules", "karchive", @@ -5758,7 +5834,8 @@ "kxmlgui", "layer-shell-qt", "purpose", - "wayland" + "wayland", + "zxing-cpp" ], "step": [ "extra-cmake-modules", @@ -5859,8 +5936,8 @@ ], "tellico": [ "extra-cmake-modules", - "kcoreaddons", - "kcrash", + "kconfig", + "kconfigwidgets", "kdoctools", "kfilemetadata", "ki18n", @@ -5868,9 +5945,7 @@ "kio", "kitemmodels", "knewstuff", - "kparts", - "ktexteditor", - "kxmlgui", + "kwidgetsaddons", "libkcddb", "libksane" ], @@ -5881,7 +5956,8 @@ "kcrash", "ki18n", "kirigami", - "kirigami-addons" + "kirigami-addons", + "qqc2-desktop-style" ], "threadweaver": [ "extra-cmake-modules" @@ -6070,5 +6146,5 @@ "kwindowsystem" ] }, - "version": "c03e6379" + "version": "525ad8d3" } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/kde/generated/projects.json b/third_party/nixpkgs/pkgs/kde/generated/projects.json index 8986f2db08..d798654c27 100644 --- a/third_party/nixpkgs/pkgs/kde/generated/projects.json +++ b/third_party/nixpkgs/pkgs/kde/generated/projects.json @@ -1058,7 +1058,7 @@ "glaxnimate": { "description": "Simple vector animation program.", "name": "glaxnimate", - "project_path": "playground/graphics/glaxnimate", + "project_path": "kdereview/glaxnimate", "repo_path": "graphics/glaxnimate" }, "gluon": { @@ -1920,7 +1920,7 @@ "repo_path": "unmaintained/kdenetwork-strigi-analyzers" }, "kdenlive": { - "description": "Free and open source video editor, based on MLT Framework and KDE Frameworks 5", + "description": "Free and open source video editor, based on MLT Framework and KDE Frameworks", "name": "kdenlive", "project_path": "kde/kdemultimedia/kdenlive", "repo_path": "multimedia/kdenlive" @@ -2808,9 +2808,9 @@ "repo_path": "education/klettres" }, "klevernotes": { - "description": "A convergent markdown note taking application.", + "description": "A note-taking and management application using markdown.", "name": "klevernotes", - "project_path": "playground/office/klevernotes", + "project_path": "kdereview/klevernotes", "repo_path": "office/klevernotes" }, "klickety": { @@ -7037,6 +7037,12 @@ "project_path": "websites/discover-kde-org", "repo_path": "websites/discover-kde-org" }, + "websites-docs-glaxnimate-org": { + "description": "Documentation website for Glaxnimate \u2014 docs.glaxnimate.org", + "name": "websites-docs-glaxnimate-org", + "project_path": "websites/docs-glaxnimate-org", + "repo_path": "websites/docs-glaxnimate-org" + }, "websites-docs-kde-org": { "description": "Scripts and other materials needed to support and operate docs.kde.org", "name": "websites-docs-kde-org", @@ -7163,11 +7169,11 @@ "project_path": "websites/ghostwriter-kde-org", "repo_path": "websites/ghostwriter-kde-org" }, - "websites-glaxnimate-kde-org": { - "description": "Website for Glaxnimate \u2014 glaxnimate.kde.org", - "name": "websites-glaxnimate-kde-org", - "project_path": "websites/glaxnimate-kde-org", - "repo_path": "websites/glaxnimate-kde-org" + "websites-glaxnimate-org": { + "description": "Website for Glaxnimate \u2014 glaxnimate.org", + "name": "websites-glaxnimate-org", + "project_path": "websites/glaxnimate-org", + "repo_path": "websites/glaxnimate-org" }, "websites-go-kde-org": { "description": "Data for the KDE Short URL Redirector Service - go.kde.org", diff --git a/third_party/nixpkgs/pkgs/kde/generated/sources/frameworks.json b/third_party/nixpkgs/pkgs/kde/generated/sources/frameworks.json index a2b93aa050..ed0b7e489a 100644 --- a/third_party/nixpkgs/pkgs/kde/generated/sources/frameworks.json +++ b/third_party/nixpkgs/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/attica-6.1.0.tar.xz", - "hash": "sha256-iz3KyaZ1Op0PeAeCww82ne0/UxxHjpXKHBlThK19taA=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/attica-6.2.0.tar.xz", + "hash": "sha256-J1+wCz9INwTYAEhIg6N4l5ejGYsM5oDYUxPZl3/94vA=" }, "baloo": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/baloo-6.1.0.tar.xz", - "hash": "sha256-VNghxNwSGRs/GutedTwQeMi7RvFRXQIEZ3Bdf3xZzKo=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/baloo-6.2.0.tar.xz", + "hash": "sha256-HqQTudutp9Bkah+Nw/BoiSjCZuY4hSjP0F1MB5p+Iqg=" }, "bluez-qt": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/bluez-qt-6.1.0.tar.xz", - "hash": "sha256-+UJO8V4H+BdPBpEa9GFqBt2Ird2pdflU+W6qqHHNjrs=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/bluez-qt-6.2.0.tar.xz", + "hash": "sha256-lkh09OS0z6Y6lAy9CsIb0NxPwGwU/3qNtU+YEZv4tDA=" }, "breeze-icons": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/breeze-icons-6.1.0.tar.xz", - "hash": "sha256-sbqALQ0NvQ7NeGy9+q9UXy3TwheWa4lLkyGioYQmoWo=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/breeze-icons-6.2.0.tar.xz", + "hash": "sha256-31o7FQdo3Vx4Gmw9GEjXn0sOsvMn4kjFQmoSNKpME1s=" }, "extra-cmake-modules": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/extra-cmake-modules-6.1.0.tar.xz", - "hash": "sha256-dsnt8AgH5s+NSuNfUZW0vD/pRkjZdv71Mr9/l9hjiL0=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/extra-cmake-modules-6.2.0.tar.xz", + "hash": "sha256-Y3S/oN3ti+JlxwKs1d4R7s0oUcYluT4ch9jQ9fGo6+E=" }, "frameworkintegration": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/frameworkintegration-6.1.0.tar.xz", - "hash": "sha256-R7s4p3i5RAW9niUb53S6kQwrhc1qRRK6H26bb4eRROg=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/frameworkintegration-6.2.0.tar.xz", + "hash": "sha256-5B9ksXitna3K1RsUW9WAhoq6Bh+4D/FWFCaNCexODXw=" }, "kapidox": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kapidox-6.1.0.tar.xz", - "hash": "sha256-sSnxafopk6yomOcmGdPbr6Owfom/9L08unNh3QS8XBU=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kapidox-6.2.0.tar.xz", + "hash": "sha256-A6zTkjMxrztOTsJ9MlNfow1lg9LQhh/SgqtjgiOYdas=" }, "karchive": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/karchive-6.1.0.tar.xz", - "hash": "sha256-V2xxM8+5lLUwvXN3AwuSa9oieqKuQg1dhTjyaBkm+Cw=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/karchive-6.2.0.tar.xz", + "hash": "sha256-FDXgnmS/TPJ87r/HZYLkTbnTexRT5Vru4Jd4vM/ZqLI=" }, "kauth": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kauth-6.1.0.tar.xz", - "hash": "sha256-R+eAQCCAUJjMmrNwtsU5mRuwKAQfqvWmGat8srmS8Is=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kauth-6.2.0.tar.xz", + "hash": "sha256-NRHZ2FfA9pYrAFs4HsXi/vne1ZJE2hTjHdBnPgWmmwo=" }, "kbookmarks": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kbookmarks-6.1.0.tar.xz", - "hash": "sha256-t2NWMhfB4+hINLS3d5iRxFEuj9J8srU68Aoqt2EtR0c=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kbookmarks-6.2.0.tar.xz", + "hash": "sha256-GvDWvnxDyxe8movaRkw3K58n+Z083zvpXsXyTjQ2jvs=" }, "kcalendarcore": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcalendarcore-6.1.0.tar.xz", - "hash": "sha256-HP/vMqQHa3nCZwXhIEP8t2y7/K74wSDvQLhYzESiE5s=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcalendarcore-6.2.0.tar.xz", + "hash": "sha256-o+J3wBNqWd5jWmWfcRnXNoUsL/9QCy9f1Dn2kGbz8gk=" }, "kcmutils": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcmutils-6.1.0.tar.xz", - "hash": "sha256-PRebmormY26jNR5b4EFKNJkaeh9RTqSS0ki2gxXsKoY=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcmutils-6.2.0.tar.xz", + "hash": "sha256-jO8UDKnqvynoighInHmQeOhSR5B/1vdBZa6v1O1AwLs=" }, "kcodecs": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcodecs-6.1.0.tar.xz", - "hash": "sha256-8fAHWVWy3WE7XF95mYROofngoJ/z8ssjBlOunL2EOBY=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcodecs-6.2.0.tar.xz", + "hash": "sha256-0ED7A1EMqQlC5UMjsa/SbsANRZsbLFTm7u7OUWaELy8=" }, "kcolorscheme": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcolorscheme-6.1.0.tar.xz", - "hash": "sha256-wwqofzpgaAfEBo2rAIA5K9ykn4++8YVT4afeD3xbA2o=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcolorscheme-6.2.0.tar.xz", + "hash": "sha256-CZDBcsWxKZa3wL48LlNTDO9l6vdtGShUzyB4cvupXxs=" }, "kcompletion": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcompletion-6.1.0.tar.xz", - "hash": "sha256-4eC+vh7diL6gi7D0eEbSNiTjRIbfnDozgGl/xBGEScg=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcompletion-6.2.0.tar.xz", + "hash": "sha256-WMuTjrER6IWd0bqlEGJGfyJrjGfLH9uYdI0+l/q/COk=" }, "kconfig": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kconfig-6.1.0.tar.xz", - "hash": "sha256-L9pfJb6sUmCnDz9ikUS1wim/NSyuIIiT7USpcyxtyvc=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kconfig-6.2.0.tar.xz", + "hash": "sha256-JRK8A2/EDNwjNFy/gDeFPHr9yTt/gVKFR6RR4PjEKek=" }, "kconfigwidgets": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kconfigwidgets-6.1.0.tar.xz", - "hash": "sha256-CyUrLnlv9vBelKuSEw/nOeT+aYwiMjC+k2tXnp350XE=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kconfigwidgets-6.2.0.tar.xz", + "hash": "sha256-O15yxuVee50LPr7g/os5wJjdB6Vt452hVWiRkl632WM=" }, "kcontacts": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcontacts-6.1.0.tar.xz", - "hash": "sha256-vtC+W4MCz010kSAjTJjQ3GKdoEoBI2lBOGgaAiGEJk4=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcontacts-6.2.0.tar.xz", + "hash": "sha256-cJyhnpB2+YdRdk0Cm41kjGphsXJiukghz5f5E8y9G/k=" }, "kcoreaddons": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcoreaddons-6.1.0.tar.xz", - "hash": "sha256-dgjvmiSDsoo6+CowJAVM2zxYzx/fvXkaAvcO/IDqM0M=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcoreaddons-6.2.0.tar.xz", + "hash": "sha256-P5g2o85ecog78DJYe3Rc5VQ1qnYnF0V50uAY2nFzOO0=" }, "kcrash": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcrash-6.1.0.tar.xz", - "hash": "sha256-cn+C6XZ8L2R7fua9edUevUBpEnEyDct4NaMM+IBkee0=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcrash-6.2.0.tar.xz", + "hash": "sha256-ALe0iFyyqS6DKBbpzB2oz1zMxMRILBNkjwIJiMhs9Yg=" }, "kdav": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kdav-6.1.0.tar.xz", - "hash": "sha256-ZETT6lgdUU+4KvlC0JKwvAYToayi+iMTqQAC0UhZTCs=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kdav-6.2.0.tar.xz", + "hash": "sha256-8YJ4z8creo7tSKTUR+rgfkMdFCmNvPWbpFu5NihsZOE=" }, "kdbusaddons": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kdbusaddons-6.1.0.tar.xz", - "hash": "sha256-tCOkyh/KuXO5RUOG77r13CxkLSHukSXXO4/Gf4BGNUE=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kdbusaddons-6.2.0.tar.xz", + "hash": "sha256-vKDfP8c2Hv/Pgf+3ldj/YuIYnqlnJJLWsmweAUT+3Wc=" }, "kdeclarative": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kdeclarative-6.1.0.tar.xz", - "hash": "sha256-+UE41i4XNVgS83YTqpNvrS5RQP5PCankLk2b+piBxwI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kdeclarative-6.2.0.tar.xz", + "hash": "sha256-qFw/FZnSKfBS7jeG6QQazlUQyZhEyO/Hv8ndrtGTbYQ=" }, "kded": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kded-6.1.0.tar.xz", - "hash": "sha256-sY0O8jaZXBnakm5bo/JIaJhQ/95mDrhrGKto6HsRm6E=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kded-6.2.0.tar.xz", + "hash": "sha256-ym1pcbZhtRQu3mq5oay+JNQIXvvJ8TmIwXlkmxJhq08=" }, "kdesu": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kdesu-6.1.0.tar.xz", - "hash": "sha256-pqOX4IzNNTfcmxMp6MwfBcpqzz2cGDluQRjlFEa6gn4=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kdesu-6.2.0.tar.xz", + "hash": "sha256-fGEv6kidnj49PJDKsNMU2YSGvcBgFKYPYJ/f8hUFgi8=" }, "kdnssd": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kdnssd-6.1.0.tar.xz", - "hash": "sha256-O5gfemnyZe0zE0b1bUAw0xu98dk29iwnbH4zOztntxI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kdnssd-6.2.0.tar.xz", + "hash": "sha256-UJARNnwRw7FwNNdD6mk0lRpvxSW5Un0Yw4r4H2Cwj0U=" }, "kdoctools": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kdoctools-6.1.0.tar.xz", - "hash": "sha256-JAJUrbtSGEpXEHIGi/UEu8NXnrmBGYPGo3lVYyYO87U=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kdoctools-6.2.0.tar.xz", + "hash": "sha256-7POFVuxfnZnuLOssKHJ/TIA0IhfLabmqlFpvcC3D/08=" }, "kfilemetadata": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kfilemetadata-6.1.0.tar.xz", - "hash": "sha256-1Sp4LFTq5doykSyodvGXX7fkv/4cseFyJtg2FKs7sco=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kfilemetadata-6.2.0.tar.xz", + "hash": "sha256-EGlBZUAkthZdo/rCYi++vTX/CfCDRa2TorLBq/oXfjA=" }, "kglobalaccel": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kglobalaccel-6.1.0.tar.xz", - "hash": "sha256-iFsT04iO6+WFWJ3CiOOCYESrW/O44qdJuQcNk9MvZPI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kglobalaccel-6.2.0.tar.xz", + "hash": "sha256-x0cn/vSjloDjbF7SfNtMW3VQQ3lfpSd07jvGo7Vo5yQ=" }, "kguiaddons": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kguiaddons-6.1.0.tar.xz", - "hash": "sha256-CNiEUq5LzcBziRSZ2bQUEpzcWYK9O62Icm2+8o7lrFM=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kguiaddons-6.2.0.tar.xz", + "hash": "sha256-ulpeQtW5uUSGQZJjg2B0Qp/T+s/DZP1OOimlS8beXds=" }, "kholidays": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kholidays-6.1.0.tar.xz", - "hash": "sha256-g2YVWatXcM1WGQLuuBvlFxkiQ1tTnZf0vBcnfaS5cwo=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kholidays-6.2.0.tar.xz", + "hash": "sha256-nXqAUofgQoHdWbjMsTAkBqkv4JQeJzysHHJO9hJfrCk=" }, "ki18n": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/ki18n-6.1.0.tar.xz", - "hash": "sha256-FjIZ8bXJ3qeq6m3cSg0oqLnhiE0jnPVjPmhMIUhRdkg=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/ki18n-6.2.0.tar.xz", + "hash": "sha256-iqj0dA2wgPTwws6I0PKJdA1VyqBrf3a/IWPQ+5/TZg8=" }, "kiconthemes": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kiconthemes-6.1.0.tar.xz", - "hash": "sha256-ec53cB1BlHluLCVQCPGQcUYKoD/yCKIRf8TkyTEMNAI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kiconthemes-6.2.0.tar.xz", + "hash": "sha256-wP/mX1P1m3W/BDLE9X99NraEDIf4Dp6luIzrcaKLVkU=" }, "kidletime": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kidletime-6.1.0.tar.xz", - "hash": "sha256-yNhcEp/S6VIL7DqpZwRJtOos8JIGClT9sky6Y0dfrzo=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kidletime-6.2.0.tar.xz", + "hash": "sha256-BpGC5Kv7g/k2YdW7Dq6xS0TjcF+jSS29uOwDv+bj2dw=" }, "kimageformats": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kimageformats-6.1.0.tar.xz", - "hash": "sha256-sDP6BYq0yWV+G81oKonKlKW4geeQTd3uaqtKFLr8yV4=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kimageformats-6.2.0.tar.xz", + "hash": "sha256-mEQhkYXwP+eZCurm/7ql9FKw9sUFPIcovIfpdoJkNWE=" }, "kio": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kio-6.1.0.tar.xz", - "hash": "sha256-R8sAJYyjj5we4qp5KfWxK8fZnLWA2lYK2nEFD6CJ/9I=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kio-6.2.0.tar.xz", + "hash": "sha256-Mx1v9rnLsOZSGl0HRrFSviWI/WMac9DiSbeM0s2mnM8=" }, "kirigami": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kirigami-6.1.0.tar.xz", - "hash": "sha256-KlQ4GGts+IR6V5wDD+03eGOOX7Tl61T3HcJgLaRgcZY=" + "version": "6.2.1", + "url": "mirror://kde/stable/frameworks/6.2/kirigami-6.2.1.tar.xz", + "hash": "sha256-kQQSdw55ucE92sQhmfp1EXcM2Uhbj1omTh72NjozDJk=" }, "kitemmodels": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kitemmodels-6.1.0.tar.xz", - "hash": "sha256-UWfTKvab8A9slTHIlRPVS//hbt00qelI77SekjXj4wI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kitemmodels-6.2.0.tar.xz", + "hash": "sha256-wGaIgxMmDXWiB5OTNLBWtAFLpzZLQ3MlVheQ63s3Qro=" }, "kitemviews": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kitemviews-6.1.0.tar.xz", - "hash": "sha256-6ehsKqSSeMOJWbGAT+HGwgV/PpvolgkfiY+4FpKyCk0=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kitemviews-6.2.0.tar.xz", + "hash": "sha256-c2LZiT0emoY0glc+z8Or3djGNFEtihiE8JSl9UOvSik=" }, "kjobwidgets": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kjobwidgets-6.1.0.tar.xz", - "hash": "sha256-rHndtIs4UnpgWpVkSFrTcMvP20BrleD5JV1VJWRU/bg=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kjobwidgets-6.2.0.tar.xz", + "hash": "sha256-L7dgLyu6gYvP/+GtExDXkAiJ4Q5T44S4dClfs1k/s6E=" }, "knewstuff": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/knewstuff-6.1.0.tar.xz", - "hash": "sha256-HGoHZBBTgIQCHP8e6wK+LzQoAoRxejQpDUKxHf47PT8=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/knewstuff-6.2.0.tar.xz", + "hash": "sha256-9UlidWuOuYxnhANSoe/qRpjxWhfUvIKC9lrbDbCMV4A=" }, "knotifications": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/knotifications-6.1.0.tar.xz", - "hash": "sha256-AvNvS8HS0QlOGwIDo04DfOx4MDxqrZ1p+ayMc4is/Ks=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/knotifications-6.2.0.tar.xz", + "hash": "sha256-lifCAPWN5eXcTnTRoTAFYkEVttI9oDTmSqG/MUPngWQ=" }, "knotifyconfig": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/knotifyconfig-6.1.0.tar.xz", - "hash": "sha256-3+haRVAEcKMG3zF29mWvJYlSHvUJBhLnqC7GGOBh/oc=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/knotifyconfig-6.2.0.tar.xz", + "hash": "sha256-tb/sRYK8IvDIfHD90loF4UX9/l5KYKlj9RJXHgPTfMw=" }, "kpackage": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kpackage-6.1.0.tar.xz", - "hash": "sha256-7XWRK0FlgKT5rNvt7jHlkLGX4VfNod6hOtKHURFrUq8=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kpackage-6.2.0.tar.xz", + "hash": "sha256-eMhGbXIB8qpoCdmFiCQq72MUvkpHFVYXxSnGoFSfOV0=" }, "kparts": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kparts-6.1.0.tar.xz", - "hash": "sha256-38on49T+f6cDjLrT06CpVcVwvXO1vArOs5AOBxSVEB0=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kparts-6.2.0.tar.xz", + "hash": "sha256-BPcIKavHAzMn9C5eXuE2X026mWixhPNCEsVIbjapvrE=" }, "kpeople": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kpeople-6.1.0.tar.xz", - "hash": "sha256-pfouLmexqa1l7JWpUgGvKOINxGLp0xAHA0rU2leOHWI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kpeople-6.2.0.tar.xz", + "hash": "sha256-P1+qSO3h5H7j43R+8K3y8dgyDb76jw7G63X9L0q0WDc=" }, "kplotting": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kplotting-6.1.0.tar.xz", - "hash": "sha256-uyExlyWyA4KkSpvi1wx2petY5sgM8otvMU9J6ctzsfo=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kplotting-6.2.0.tar.xz", + "hash": "sha256-zdx+leM3a+FiGjR/bp/6iK14e0haomx+AmM2wFJ3wW0=" }, "kpty": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kpty-6.1.0.tar.xz", - "hash": "sha256-3yJs2Qum93NWBATHmVYrJ2StOdT0HxUQXy7Z+bLPWd8=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kpty-6.2.0.tar.xz", + "hash": "sha256-92g+i1zV271CV+jVrNJuWGhaO8PxYdwP4Q9ToHUkAmQ=" }, "kquickcharts": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kquickcharts-6.1.0.tar.xz", - "hash": "sha256-dhtXOP8aG7H+aPBCfiiI4lyQG2+tRAFnY4biegbjpMc=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kquickcharts-6.2.0.tar.xz", + "hash": "sha256-/dlr9CGKMJvihSOsMYvXgW6L0f6/DncbEzWc1ljGdWs=" }, "krunner": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/krunner-6.1.0.tar.xz", - "hash": "sha256-+qIfmQ2YhmWe1Ex1PM+Nd86wfflOhMAYk/k7COBnYNQ=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/krunner-6.2.0.tar.xz", + "hash": "sha256-8Y8VeP+MdsRVg3pLyaPnEnO7pKxUr9JOFDqdwgcGBB8=" }, "kservice": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kservice-6.1.0.tar.xz", - "hash": "sha256-7i7n/eLEeVWJCHb4kKDRZ5LymwzHT9KWzKsVPYtc54E=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kservice-6.2.0.tar.xz", + "hash": "sha256-BkbJIZwNfZojcbkNxCfryGzzCtr8sitFjxMPAR3iiII=" }, "kstatusnotifieritem": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kstatusnotifieritem-6.1.0.tar.xz", - "hash": "sha256-k+LJyqcNTM6AWapsuB5bFh1AVwHbGE3f+BMD+iT97xQ=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kstatusnotifieritem-6.2.0.tar.xz", + "hash": "sha256-BLn8CQW2FK/I4K/PVFEBjSoSbxZSIbbbIOQXG+L7H88=" }, "ksvg": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/ksvg-6.1.0.tar.xz", - "hash": "sha256-KGqOHshnjXYZYKPNK0wOncg3716bY5a8jXaw/rcba18=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/ksvg-6.2.0.tar.xz", + "hash": "sha256-Vom/ncPvqyn92uoK8AquyMqDI+ZQT0kMO7O0eoLrdvM=" }, "ktexteditor": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/ktexteditor-6.1.0.tar.xz", - "hash": "sha256-O6GPQe9eV/6GjcKV0BhS0xsVkMC+iTrJfO7ZIpsJqd8=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/ktexteditor-6.2.0.tar.xz", + "hash": "sha256-wQpeTMkhrrUbF+l9TymIOrGGtj0QgZnmoxlECjnx8qA=" }, "ktexttemplate": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/ktexttemplate-6.1.0.tar.xz", - "hash": "sha256-Iib5RyrdGWr9W4t1uVOkLYJJMWQ37QYNAkRid34t83E=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/ktexttemplate-6.2.0.tar.xz", + "hash": "sha256-pZsObjrLlHN7gur6xH0UclJVxsbyHCNxzPnswQYs8so=" }, "ktextwidgets": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/ktextwidgets-6.1.0.tar.xz", - "hash": "sha256-cs1EchySCcwXvz6OHcy6gjvL6BVqo3AgXFzh/3RrZVM=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/ktextwidgets-6.2.0.tar.xz", + "hash": "sha256-RpNow0EmWGXiViq20751TbloligL3KkME0EnsVAate0=" }, "kunitconversion": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kunitconversion-6.1.0.tar.xz", - "hash": "sha256-323m8tQbOUOzHM7AUQE8sNT8bpl5qOUjLmQ245CzMew=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kunitconversion-6.2.0.tar.xz", + "hash": "sha256-5e1gV4ukw3hqEJzh+y5LNuSCWnkzjErKHd3JpJMAboA=" }, "kuserfeedback": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kuserfeedback-6.1.0.tar.xz", - "hash": "sha256-zfpG/QJ3PyWCDVqAF9bKl0bRBUz0TjrjP/9pHrJmvF8=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kuserfeedback-6.2.0.tar.xz", + "hash": "sha256-gpxS2xXWm5Dm0isI3qze3NE0I8kB5Nq2OJPoFLTnaFg=" }, "kwallet": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kwallet-6.1.0.tar.xz", - "hash": "sha256-z5Ktu9/nZDpOD5Oo0ilib7hZ/pA9C0tYQa0RQXW4RhM=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kwallet-6.2.0.tar.xz", + "hash": "sha256-LlgRmmRCywDjAU8BY26HIzfP82LsHvEgyvK6AYE70sE=" }, "kwidgetsaddons": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kwidgetsaddons-6.1.0.tar.xz", - "hash": "sha256-gSJdfsLW6nON7VX+QZeN62OcP3ei2q0OsuVCOqBG5M4=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kwidgetsaddons-6.2.0.tar.xz", + "hash": "sha256-A87y9mrsa397InbEfnIL2rk5sFt3twNF5/B2096tghE=" }, "kwindowsystem": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kwindowsystem-6.1.0.tar.xz", - "hash": "sha256-jAdUOIOqo4sBUI8GtEOVWdiQdwAG+On26OdpxdQiZZU=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kwindowsystem-6.2.0.tar.xz", + "hash": "sha256-D4+xK07qkmp/TPWeyF2VKXqMtn2Ak9xLGUtRocRnHYk=" }, "kxmlgui": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kxmlgui-6.1.0.tar.xz", - "hash": "sha256-glugKq3KvBzhOlWDKVyLEDbC8UvR+kayZDHtxEzGzw0=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kxmlgui-6.2.0.tar.xz", + "hash": "sha256-/yKnn8onN+M8VGPYf60rRpIMjUjGWDJoqa4nCXqKyQI=" }, "modemmanager-qt": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/modemmanager-qt-6.1.0.tar.xz", - "hash": "sha256-hTuu9b2BDIpk1MYPdI7xhCtzaOapUqL5PNSNhetfSXA=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/modemmanager-qt-6.2.0.tar.xz", + "hash": "sha256-89HbmsZKNTM0sHTkXNB/zktArBOIyWT4sml0bcNb7qg=" }, "networkmanager-qt": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/networkmanager-qt-6.1.0.tar.xz", - "hash": "sha256-bkl5tfiJr8/0+MdBfig8Hbnk3zbKBii7Pr7wm2Kr0wI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/networkmanager-qt-6.2.0.tar.xz", + "hash": "sha256-e+Iqa7xYQ7GtoKFw+1bJyWvvZD19SFQT8q95KRTtAtI=" }, "prison": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/prison-6.1.0.tar.xz", - "hash": "sha256-FwhxB2mvGVPn88yhUNQ725YghWT4lHees5e2fPUmHvQ=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/prison-6.2.0.tar.xz", + "hash": "sha256-h3GWdcFlLwdzFJuN44T0BpSabWWr4lptNhHhENEtbKg=" }, "purpose": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/purpose-6.1.0.tar.xz", - "hash": "sha256-RhL/9M5RJ5ZCL0vePvqPX/Y/lri32S5I+H+WyJ4hGY4=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/purpose-6.2.0.tar.xz", + "hash": "sha256-VbAtSTh7dvVOO+xI+CzXjzmLVAO8jRDUgr//fjCgAoo=" }, "qqc2-desktop-style": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/qqc2-desktop-style-6.1.0.tar.xz", - "hash": "sha256-6R2avPkWnso1fn3It/xQSjt+Xv8yT+qm/+zICR4WItk=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/qqc2-desktop-style-6.2.0.tar.xz", + "hash": "sha256-uO0nDZMKrQXq3x7FpUCHDxEo2Mco2GFsQIAdaYCGmxw=" }, "solid": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/solid-6.1.0.tar.xz", - "hash": "sha256-B0qYS1jvUQF+52dUi/zgygC7cQ6IpKsAvJAgpGz6QmI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/solid-6.2.0.tar.xz", + "hash": "sha256-ACoNKydZm+vHIVFmgdMnh2li/cr5lA8DNjT7k6T51yI=" }, "sonnet": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/sonnet-6.1.0.tar.xz", - "hash": "sha256-wTzrSCasT9AnuwhSSqczk82KoMZxmvi2MU0L0YCi6/4=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/sonnet-6.2.0.tar.xz", + "hash": "sha256-hOcSrVa8lP+O/Jvd+rQfbDJxIbPd1pAw6UCsyRM2J+0=" }, "syndication": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/syndication-6.1.0.tar.xz", - "hash": "sha256-CdU5Si4wJMEYi+e2kDR7efwhQabRuDO8W0lL3MMvloM=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/syndication-6.2.0.tar.xz", + "hash": "sha256-UOw4Q6COx7GFNSyUuJvC0nIM6vF+uWGkw9pV+T0Frzw=" }, "syntax-highlighting": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/syntax-highlighting-6.1.0.tar.xz", - "hash": "sha256-HnRJBSsOPpfWFdYVflZHlY6buY+l2PnF1pSCnF1nyrY=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/syntax-highlighting-6.2.0.tar.xz", + "hash": "sha256-Mn7VjSDVJQK7/ZJ4+hyeerSoRhWeXPYw0J++oUTru38=" }, "threadweaver": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/threadweaver-6.1.0.tar.xz", - "hash": "sha256-3aXVUI1hcH60y9BE83HjRID/L0Q4GtxM0bcDz05Fjcg=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/threadweaver-6.2.0.tar.xz", + "hash": "sha256-503i3wu1AUisyKYWH5gJmRrksjNLWKnuCSuh2CcEQzc=" } } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json b/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json index 9af48a23cc..f9818a2e5a 100644 --- a/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json +++ b/third_party/nixpkgs/pkgs/kde/generated/sources/plasma.json @@ -125,9 +125,9 @@ "hash": "sha256-4gPb0gYPoPk0MTb3Y6lV89oQpOpGUEW8ofMEh7CeFeo=" }, "kwin": { - "version": "6.0.4", - "url": "mirror://kde/stable/plasma/6.0.4/kwin-6.0.4.tar.xz", - "hash": "sha256-9VUvjFsXnicv7jOhkkloZXPqv/3dVUG8Mfj9cGm6qCs=" + "version": "6.0.4.1", + "url": "mirror://kde/stable/plasma/6.0.4/kwin-6.0.4.1.tar.xz", + "hash": "sha256-Vv+zf6NuEPBY7FSZxoWPayEQW1asfXBAeSHwY7xLyzY=" }, "kwrited": { "version": "6.0.4", diff --git a/third_party/nixpkgs/pkgs/kde/lib/mk-kde-derivation.nix b/third_party/nixpkgs/pkgs/kde/lib/mk-kde-derivation.nix index 0b2ebd8ace..2a983782a4 100644 --- a/third_party/nixpkgs/pkgs/kde/lib/mk-kde-derivation.nix +++ b/third_party/nixpkgs/pkgs/kde/lib/mk-kde-derivation.nix @@ -88,10 +88,24 @@ in # but cross is currently very broken anyway, so we can figure this out later. deps = map (dep: self.${dep}) filteredDepNames; + traceDuplicateDeps = attrName: attrValue: + let + pretty = lib.generators.toPretty {}; + duplicates = builtins.filter (dep: (builtins.elem (lib.getName dep) filteredDepNames)) attrValue; + in + if duplicates != [] + then lib.warn "Duplicate dependencies in ${attrName} of package ${pname}: ${pretty duplicates}" + else lib.id; + + traceAllDuplicateDeps = lib.flip lib.pipe [ + (traceDuplicateDeps "extraBuildInputs" extraBuildInputs) + (traceDuplicateDeps "extraPropagatedBuildInputs" extraPropagatedBuildInputs) + ]; + defaultArgs = { inherit version src; - outputs = ["out" "dev"]; + outputs = ["out" "dev" "devtools"]; nativeBuildInputs = [cmake qt6.wrapQtAppsHook moveDevHook] ++ extraNativeBuildInputs; buildInputs = [qt6.qtbase] ++ extraBuildInputs; @@ -128,4 +142,4 @@ in pos = builtins.unsafeGetAttrPos "pname" args; in - stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; }) + traceAllDuplicateDeps (stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; })) diff --git a/third_party/nixpkgs/pkgs/kde/lib/move-dev-hook.sh b/third_party/nixpkgs/pkgs/kde/lib/move-dev-hook.sh index da5770e1bb..a49cb91d22 100644 --- a/third_party/nixpkgs/pkgs/kde/lib/move-dev-hook.sh +++ b/third_party/nixpkgs/pkgs/kde/lib/move-dev-hook.sh @@ -2,7 +2,10 @@ # shellcheck disable=SC2154 moveKF6DevTools() { - moveToOutput "${qtPluginPrefix}/designer" "${!outputDev}" + if [ -n "$devtools" ]; then + mkdir -p "$devtools" + moveToOutput "${qtPluginPrefix}/designer" "$devtools" + fi } postInstallHooks+=('moveKF6DevTools') diff --git a/third_party/nixpkgs/pkgs/kde/misc/kirigami-addons/default.nix b/third_party/nixpkgs/pkgs/kde/misc/kirigami-addons/default.nix index 90106d588f..187a5aebe2 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/kirigami-addons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/kirigami-addons/default.nix @@ -7,11 +7,11 @@ }: mkKdeDerivation rec { pname = "kirigami-addons"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz"; - hash = "sha256-jvNSSZE5YWsxQqbXqSqyN0nFaEA+zo2FTwZKlB0IVTY="; + hash = "sha256-j/NkWKqQ/x2YBik1e23fXoira8kXsBGn+fpdXhKs9Ro="; }; extraBuildInputs = [qtdeclarative]; diff --git a/third_party/nixpkgs/pkgs/kde/misc/ktextaddons/default.nix b/third_party/nixpkgs/pkgs/kde/misc/ktextaddons/default.nix index 086608f2b6..ae37770e99 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/ktextaddons/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/ktextaddons/default.nix @@ -8,11 +8,11 @@ }: mkKdeDerivation rec { pname = "ktextaddons"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { url = "mirror://kde/stable/ktextaddons/ktextaddons-${version}.tar.xz"; - hash = "sha256-ilLbir+oqdaNLSkfsPi+IGWf14mZh7Tcr98kaNsJF9w="; + hash = "sha256-ZLgGAuhLJekWRiCvP2NB+oZbhegmq49eAgYa4koneyA="; }; extraBuildInputs = [qtspeech qttools kxmlgui]; diff --git a/third_party/nixpkgs/pkgs/kde/misc/mpvqt/default.nix b/third_party/nixpkgs/pkgs/kde/misc/mpvqt/default.nix index 4ec52aba07..84d78e26bc 100644 --- a/third_party/nixpkgs/pkgs/kde/misc/mpvqt/default.nix +++ b/third_party/nixpkgs/pkgs/kde/misc/mpvqt/default.nix @@ -2,7 +2,7 @@ lib, mkKdeDerivation, fetchFromGitLab, - mpv, + mpv-unwrapped, qtdeclarative, }: mkKdeDerivation rec { @@ -17,7 +17,8 @@ mkKdeDerivation rec { hash = "sha256-XHiCxH7dJxJamloM2SJbiFHDt8j4rVfv/M9PaBzvgM4="; }; - extraBuildInputs = [mpv qtdeclarative]; + extraBuildInputs = [qtdeclarative]; + extraPropagatedBuildInputs = [mpv-unwrapped]; meta.license = with lib.licenses; [bsd2 bsd3 cc-by-sa-40 cc0 lgpl21Only lgpl3Only lgpl3Plus mit]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/breeze-grub/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/breeze-grub/default.nix index a5fe01b4ca..5dd3d199e4 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/breeze-grub/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/breeze-grub/default.nix @@ -6,6 +6,8 @@ mkKdeDerivation { nativeBuildInputs = []; buildInputs = []; + outputs = ["out"]; + installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kde-gtk-config/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kde-gtk-config/default.nix index 0101a56e93..3126e2f8d9 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kde-gtk-config/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kde-gtk-config/default.nix @@ -1,7 +1,7 @@ { mkKdeDerivation, pkg-config, - wrapGAppsHook, + wrapGAppsHook3, sass, qtsvg, gsettings-desktop-schemas, @@ -16,7 +16,7 @@ mkKdeDerivation { NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\"" ''; - extraNativeBuildInputs = [pkg-config wrapGAppsHook sass]; + extraNativeBuildInputs = [pkg-config wrapGAppsHook3 sass]; extraBuildInputs = [qtsvg]; dontWrapGApps = true; # There is nothing to wrap diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kwayland/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kwayland/default.nix index 341fd8d356..86713b834b 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kwayland/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kwayland/default.nix @@ -2,11 +2,10 @@ mkKdeDerivation, pkg-config, qtwayland, - wayland-protocols, }: mkKdeDerivation { pname = "kwayland"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland wayland-protocols]; + extraBuildInputs = [qtwayland]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch b/third_party/nixpkgs/pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch new file mode 100644 index 0000000000..e6408605aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch @@ -0,0 +1,40 @@ +From 232e480ab1303f37d37d295b57fdcbb6b6648bca Mon Sep 17 00:00:00 2001 +From: Alois Wohlschlager +Date: Sun, 7 Aug 2022 16:12:31 +0200 +Subject: [PATCH] Lower CAP_SYS_NICE from the ambient set + +The capabilities wrapper raises CAP_SYS_NICE into the ambient set so it +is inherited by the wrapped program. However, we don't want it to leak +into the entire desktop environment. + +Lower the capability again at startup so that the kernel will clear it +on exec. +--- + src/main_wayland.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp +index 1720e14e7..f2bb446b0 100644 +--- a/src/main_wayland.cpp ++++ b/src/main_wayland.cpp +@@ -39,7 +39,9 @@ + #include + #include + ++#include + #include ++#include + #include + + #include +@@ -285,6 +287,7 @@ static QString automaticBackendSelection() + + int main(int argc, char *argv[]) + { ++ prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_LOWER, CAP_SYS_NICE, 0, 0); + KWin::Application::setupMalloc(); + KWin::Application::setupLocalizedString(); + KWin::gainRealTime(); +-- +2.37.1 + diff --git a/third_party/nixpkgs/pkgs/kde/plasma/kwin/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/kwin/default.nix index fc5f00991d..7c3b0ce2bb 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/kwin/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/kwin/default.nix @@ -26,6 +26,7 @@ mkKdeDerivation { # The rest are NixOS-specific hacks ./0003-plugins-qpa-allow-using-nixos-wrapper.patch ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch + ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/kde/plasma/layer-shell-qt/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/layer-shell-qt/default.nix index 9783220cdd..dd7290379c 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/layer-shell-qt/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/layer-shell-qt/default.nix @@ -2,12 +2,10 @@ mkKdeDerivation, qtwayland, pkg-config, - wayland, - wayland-protocols, }: mkKdeDerivation { pname = "layer-shell-qt"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland wayland wayland-protocols]; + extraBuildInputs = [qtwayland]; } diff --git a/third_party/nixpkgs/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix b/third_party/nixpkgs/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix index 9d5be65fe0..7563e934e5 100644 --- a/third_party/nixpkgs/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix +++ b/third_party/nixpkgs/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix @@ -2,13 +2,11 @@ mkKdeDerivation, pkg-config, qtwayland, - wayland, - wayland-protocols, cups, }: mkKdeDerivation { pname = "xdg-desktop-portal-kde"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland wayland wayland-protocols cups]; + extraBuildInputs = [qtwayland cups]; } diff --git a/third_party/nixpkgs/pkgs/misc/autotiling/default.nix b/third_party/nixpkgs/pkgs/misc/autotiling/default.nix index 7ce870cfce..13b834dcbd 100644 --- a/third_party/nixpkgs/pkgs/misc/autotiling/default.nix +++ b/third_party/nixpkgs/pkgs/misc/autotiling/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "autotiling"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PTMF9w4PMkKuhjLAP7856lOOiuyj5YZOoax0K9bgGgQ="; + hash = "sha256-u+Tvvge/rQvylbZDmCxvoMGjZm2gKsFZEAb9evR/Ckw="; }; propagatedBuildInputs = [ i3ipc importlib-metadata ]; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epsonscan2/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epsonscan2/default.nix index 01d8e5c8f8..6ee092b12e 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epsonscan2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epsonscan2/default.nix @@ -24,25 +24,25 @@ let pname = "epsonscan2"; description = "Epson Scan 2 scanner driver for many modern Epson scanners and multifunction printers"; - version = "6.7.61.0"; + version = "6.7.63.0"; system = stdenv.hostPlatform.system; src = fetchzip { - url = "https://download3.ebz.epson.net/dsc/f/03/00/14/53/67/1a6447b4acc5568dfd970feba0518fabea35bca2/epsonscan2-${version}-1.src.tar.gz"; - hash = "sha256-xwvdgmV6Mrs1RC18U2mA+HlTYybeYb0V5lz5hCvC7+8="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/15/17/69/0ef02802c476a6564f13cac929859c394f40326a/epsonscan2-6.7.63.0-1.src.tar.gz"; + hash = "sha256-ZLnbIk0I7g6ext5anPD+/lD4qNlk6f2fL0xdIWLcfbY="; }; bundle = { "i686-linux" = fetchzip { name = "${pname}-bundle"; - url = "https://download3.ebz.epson.net/dsc/f/03/00/14/53/69/3151031c0fb4deea3f48781fd051411b983ccee4/epsonscan2-bundle-${version}.i686.deb.tar.gz"; - hash = "sha256-nq3Nqunt8aMcCf7U7JBYrVscvrhhcwcn8RlhYXLmC2c="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/15/17/67/ceae6a02aaa81cb61012899987fbb5ab891b6ab2/epsonscan2-bundle-6.7.63.0.i686.deb.tar.gz"; + hash = "sha256-h9beAzNdjOhTlZqW0rJbSQXGOpvFRGvTcWw0ZtOqiYY="; }; "x86_64-linux" = fetchzip { name = "${pname}-bundle"; - url = "https://download3.ebz.epson.net/dsc/f/03/00/14/53/68/a5e06101ba3f328dd747888e3dddebbb677bb8c8/epsonscan2-bundle-${version}.x86_64.deb.tar.gz"; - hash = "sha256-cFx54CKkZtvhZ5ABuBwB8+IzhT2lu8D3+GZFaMuWf3Y="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/15/17/68/050e5a55ed90f4efb4ca3bdd34e5797b149443ca/epsonscan2-bundle-6.7.63.0.x86_64.deb.tar.gz"; + hash = "sha256-+S17FfS2h4zZCvE6W+yZvdJb6+OWYTt0ZWCA+pe1NZc="; }; }."${system}" or (throw "Unsupported system: ${system}"); diff --git a/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix index 48783b4923..1a7fce2701 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook +{ lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook3 , pytestCheckHook , gtk3, gobject-introspection, libappindicator-gtk3, librsvg , evdev, pygobject3, pylibacl, bluez, vdf @@ -17,7 +17,7 @@ buildPythonApplication rec { sha256 = "sha256-vK/5S+GyqVfKTqn5PaPmOV/tXE9PIW57gqYxvhGaJSg="; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ gtk3 libappindicator-gtk3 librsvg ]; diff --git a/third_party/nixpkgs/pkgs/misc/fastly/default.nix b/third_party/nixpkgs/pkgs/misc/fastly/default.nix index 712a28782a..36e24bfe12 100644 --- a/third_party/nixpkgs/pkgs/misc/fastly/default.nix +++ b/third_party/nixpkgs/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.8.10"; + version = "10.9.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-AUseetBbr4phJJZe0qh9vXeNX7IwFGhgm+uGCbVWx5s="; + hash = "sha256-KdgloTp/mlkPJpjqYJk4Wa7fhgIuwFpAkeIKNxwTfFk="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-L9U2MN7b2AU3fQSBKhF2Q6p7eN95bQGV0u9c0C6/yx0="; + vendorHash = "sha256-gjk+igFRVauDRC44YrZUB6uDNAfqnjDcqDPcAWUBhkc="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix b/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix index 01ffc8ebea..d9bcafca3e 100644 --- a/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.7874"; + version = "1.0.7952"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "VI43yeuc1fkKv94A1d7hp4ptATT5XrpLXkTnaBpl7Hc="; + sha256 = "YSRii+oj2dHRJdfUvRmKYwJc+2OiJAumcSjWZ7STZwE="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix b/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix index f500a79713..fd5067b0fa 100644 --- a/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix +++ b/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix @@ -1,10 +1,10 @@ { lib, fetchurl, lilypond }: lilypond.overrideAttrs (oldAttrs: rec { - version = "2.25.14"; + version = "2.25.15"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - hash = "sha256-b0qfNjr5jxEJbCYINX2/JhESMOIf9DefRHI47gn5Zio="; + hash = "sha256-K2CV4sWhUndiglBze44xbfrPe19nU+9qn+WOWLMA0R8="; }; passthru.updateScript = { diff --git a/third_party/nixpkgs/pkgs/misc/plasma-hud/default.nix b/third_party/nixpkgs/pkgs/misc/plasma-hud/default.nix index b0adf0e1ef..e70162b79a 100644 --- a/third_party/nixpkgs/pkgs/misc/plasma-hud/default.nix +++ b/third_party/nixpkgs/pkgs/misc/plasma-hud/default.nix @@ -1,4 +1,4 @@ -{ wrapGAppsHook +{ wrapGAppsHook3 , lib , python3Packages , fetchFromGitHub @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = (with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix index 6f2fde718d..30adbf2c62 100644 --- a/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix +++ b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ]; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ deltaevo msfjarvis ]; + maintainers = with maintainers; [ deltaevo ]; mainProgram = "scrcpy"; }; } diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/alock/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/alock/default.nix index 65a0483909..4fcee6fa9b 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/alock/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/alock/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook +{ lib, stdenv, fetchFromGitHub, gitUpdater, pkg-config, autoreconfHook , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { pname = "alock"; - version = "unstable-2017-07-20"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Arkq"; repo = "alock"; - rev = "2035e1d4a2293432f5503e82d10f899232eb0f38"; - sha256 = "sha256-Rm00ytSfEv5Wljz4f/4bbyrK3sCV/oRUwz4DKx0pya8="; + rev = "refs/tags/v${version}"; + hash = "sha256-xfPhsXZrTlEqea75SvacDfjM9o21MTudrqfNN9xtdcg="; }; PAM_DEFAULT_SERVICE = "login"; @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { pam libgcrypt libXrender imlib2 ]; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "^[^.]+$"; # ignore versions without a dot + }; + meta = with lib; { homepage = "https://github.com/Arkq/alock"; description = "Simple screen lock application for X server"; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix index 33db5825bc..734f3f515d 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix @@ -14,7 +14,7 @@ , libXext , systemd , pantheon -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix index 79b4adae6e..3ecf07d29a 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.76"; + version = "5.77"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-gnn7crvjflmW05+J8EIg0pbK11IGlXz/EbCqc7gFvfM="; + sha256 = "sha256-UrfEE+c3hPxYFcc78SOPWiBd7rt4F6jBnnq/Pvb8LDY="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/third_party/nixpkgs/pkgs/misc/sndio/default.nix b/third_party/nixpkgs/pkgs/misc/sndio/default.nix index a65c0cd7b0..2da49d1f45 100644 --- a/third_party/nixpkgs/pkgs/misc/sndio/default.nix +++ b/third_party/nixpkgs/pkgs/misc/sndio/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, alsa-lib, fixDarwinDylibNames }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sndio"; version = "1.9.0"; src = fetchurl { - url = "https://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "sha256-8wgm/JwH42nTkk1fzt9qClPA30rh9atQ/pzygFQPaZo="; + url = "https://www.sndio.org/sndio-${finalAttrs.version}.tar.gz"; + hash = "sha256-8wgm/JwH42nTkk1fzt9qClPA30rh9atQ/pzygFQPaZo="; }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; - license = licenses.isc; - maintainers = with maintainers; [ Madouura ]; - platforms = platforms.all; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ Madouura ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/misc/solfege/default.nix b/third_party/nixpkgs/pkgs/misc/solfege/default.nix index 63606078ab..09964fd58b 100644 --- a/third_party/nixpkgs/pkgs/misc/solfege/default.nix +++ b/third_party/nixpkgs/pkgs/misc/solfege/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook +{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook3 , buildPythonApplication, pycairo, pygobject3 , gdk-pixbuf, gobject-introspection, gtk3, librsvg , alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond @@ -36,7 +36,7 @@ buildPythonApplication rec { txt2man gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index a742500d03..dbdf6a2495 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -310,12 +310,18 @@ in rec { fzf-tmux-url = mkTmuxPlugin { pluginName = "fzf-tmux-url"; rtpFilePath = "fzf-url.tmux"; - version = "unstable-2021-12-27"; + version = "unstable-2024-04-14"; src = fetchFromGitHub { owner = "wfxr"; repo = "tmux-fzf-url"; - rev = "1241fc5682850fe41812cad81c76541674ee305b"; - sha256 = "1270c5nfvgsdajgfahlacqfb5xwg4hwfrciiy0v03d50vg4h0kdi"; + rev = "28ed7ce3c73a328d8463d4f4aaa6ccb851e520fa"; + hash = "sha256-tl0SjG/CeolrN7OIHj6MgkB9lFmFgEuJevsSuwVs+78="; + }; + meta = with lib; { + homepage = "https://github.com/wfxr/tmux-fzf-url"; + description = "Quickly open urls on your terminal screen!"; + license = licenses.mit; + platforms = platforms.unix; }; }; @@ -397,10 +403,23 @@ in rec { pluginName = "nord"; version = "0.3.0"; src = pkgs.fetchFromGitHub { - owner = "arcticicestudio"; - repo = "nord-tmux"; + owner = "nordtheme"; + repo = "tmux"; rev = "v${version}"; - sha256 = "14xhh49izvjw4ycwq5gx4if7a0bcnvgsf3irywc3qps6jjcf5ymk"; + hash = "sha256-s/rimJRGXzwY9zkOp9+2bAF1XCT9FcyZJ1zuHxOBsJM="; + }; + meta = { + homepage = "https://www.nordtheme.com/ports/tmux"; + description = "Nord Tmux theme with plugin support"; + longDescription = + '' + > An arctic, north-bluish clean and elegant tmux theme. + > Designed for a fluent and clear workflow with support for third-party plugins. + + This plugin requires that tmux be used with a Nord terminal emulator + theme in order to work properly. + ''; + license = lib.licenses.mit; }; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/default.nix index 1f321f0325..c605d9f709 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/default.nix @@ -1,77 +1,64 @@ -{ stdenv, lib, stdenvNoCC -, makeScopeWithSplicing', generateSplicesForMkScope -, buildPackages -, fetchgit, fetchzip +{ + lib, + makeScopeWithSplicing', + generateSplicesForMkScope, + callPackage, + crossLibcStdenv, + attributePathToSplice ? [ "freebsd" ], + branch ? "release/14.0.0", }: let - inherit (buildPackages.buildPackages) rsync; - versions = builtins.fromJSON (builtins.readFile ./versions.json); - version = "13.1.0"; - branch = "release/${version}"; + badBranchError = + branch: + throw '' + Unknown FreeBSD branch ${branch}! + FreeBSD branches normally look like one of: + * `release/..0` for tagged releases without security updates + * `releng/.` for release update branches with security updates + * `stable/` for stable versions working towards the next minor release + * `main` for the latest development version -in makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "freebsd"; - f = (self: lib.packagesFromDirectoryRecursive { - callPackage = self.callPackage; - directory = ./pkgs; - } // { - sourceData = versions.${branch}; + Branches can be selected by overriding the `branch` attribute on the freebsd package set. + ''; - ports = fetchzip { - url = "https://cgit.freebsd.org/ports/snapshot/ports-dde3b2b456c3a4bdd217d0bf3684231cc3724a0a.tar.gz"; - sha256 = "BpHqJfnGOeTE7tkFJBx0Wk8ryalmf4KNTit/Coh026E="; + # `./package-set.nix` should never know the name of the package set we + # are constructing; just this function is allowed to know that. This + # is why we: + # + # - do the splicing for cross compilation here + # + # - construct the *anonymized* `buildFreebsd` attribute to be passed + # to `./package-set.nix`. + callFreeBSDWithAttrs = + extraArgs: + let + # we do not include the branch in the splice here because the branch + # parameter to this file will only ever take on one value - more values + # are provided through overrides. + otherSplices = generateSplicesForMkScope attributePathToSplice; + in + makeScopeWithSplicing' { + inherit otherSplices; + f = + self: + { + inherit branch; + } + // callPackage ./package-set.nix ( + { + sourceData = versions.${self.branch} or (throw (badBranchError self.branch)); + versionData = self.sourceData.version; + buildFreebsd = otherSplices.selfBuildHost; + patchesRoot = ./patches/${self.versionData.revision}; + } + // extraArgs + ) self; }; - - # Why do we have splicing and yet do `nativeBuildInputs = with self; ...`? - # See note in ../netbsd/default.nix. - - compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isFreeBSD) self.compat; - - freebsd-lib = import ./lib { inherit version; }; - - # Overridden arguments avoid cross package-set splicing issues, - # otherwise would just use implicit - # `lib.packagesFromDirectoryRecursive` auto-call. - - compat = self.callPackage ./pkgs/compat/package.nix { - inherit stdenv; - inherit (buildPackages.freebsd) makeMinimal boot-install; - }; - - csu = self.callPackage ./pkgs/csu.nix { - inherit (buildPackages.freebsd) makeMinimal install gencat; - inherit (self) include; - }; - - include = self.callPackage ./pkgs/include/package.nix { - inherit (buildPackages.freebsd) makeMinimal install rpcgen; - }; - - install = self.callPackage ./pkgs/install.nix { - inherit (buildPackages.freebsd) makeMinimal; - inherit (self) mtree libnetbsd; - }; - - libc = self.callPackage ./pkgs/libc/package.nix { - inherit (buildPackages.freebsd) makeMinimal install gencat rpcgen; - inherit (self) csu include; - }; - - libnetbsd = self.callPackage ./pkgs/libnetbsd/package.nix { - inherit (buildPackages.freebsd) makeMinimal; - }; - - mkDerivation = self.callPackage ./pkgs/mkDerivation.nix { - inherit stdenv; - inherit (buildPackages.freebsd) makeMinimal install tsort; - }; - - makeMinimal = self.callPackage ./pkgs/makeMinimal.nix { - inherit (self) make; - }; - - }); +in +{ + freebsd = callFreeBSDWithAttrs { }; + freebsdCross = callFreeBSDWithAttrs { stdenv = crossLibcStdenv; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix index d62c01f5eb..6696d12912 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, linuxHeaders, freebsd, runCommandCC, buildPackages }: +{ + lib, + stdenv, + linuxHeaders, + freebsd, + runCommandCC, + buildPackages, +}: stdenv.mkDerivation { pname = "evdev-proto"; @@ -28,7 +35,7 @@ stdenv.mkDerivation { TOUCH = "touch"; XARGS = "xargs"; - ABI_FILE = runCommandCC "abifile" {} "$CC -shared -o $out"; + ABI_FILE = runCommandCC "abifile" { } "$CC -shared -o $out"; CLEAN_FETCH_ENV = true; INSTALL_AS_USER = true; NO_CHECKSUM = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/lib/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/lib/default.nix index 30fea7e17d..26119a8ba1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/lib/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/lib/default.nix @@ -3,14 +3,16 @@ { inherit version; - mkBsdArch = stdenv': { - x86_64 = "amd64"; - aarch64 = "arm64"; - i486 = "i386"; - i586 = "i386"; - i686 = "i386"; - }.${stdenv'.hostPlatform.parsed.cpu.name} - or stdenv'.hostPlatform.parsed.cpu.name; + mkBsdArch = + stdenv': + { + x86_64 = "amd64"; + aarch64 = "arm64"; + i486 = "i386"; + i586 = "i386"; + i686 = "i386"; + } + .${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; install-wrapper = builtins.readFile ./install-wrapper.sh; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/package-set.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/package-set.nix new file mode 100644 index 0000000000..dfde4a0a31 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/package-set.nix @@ -0,0 +1,96 @@ +{ + stdenv, + lib, + stdenvNoCC, + fetchzip, + sourceData, + versionData, + buildFreebsd, + patchesRoot, +}: + +self: + +lib.packagesFromDirectoryRecursive { + callPackage = self.callPackage; + directory = ./pkgs; +} +// { + inherit sourceData patchesRoot versionData; + patches = ./patches/${self.versionData.revision}; + + # Keep the crawled portion of Nixpkgs finite. + buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd; + + ports = fetchzip { + url = "https://cgit.freebsd.org/ports/snapshot/ports-dde3b2b456c3a4bdd217d0bf3684231cc3724a0a.tar.gz"; + sha256 = "BpHqJfnGOeTE7tkFJBx0Wk8ryalmf4KNTit/Coh026E="; + }; + + compatIsNeeded = !stdenvNoCC.hostPlatform.isFreeBSD; + compatIfNeeded = lib.optional self.compatIsNeeded self.compat; + freebsd-lib = import ./lib { + version = lib.concatStringsSep "." ( + map toString ( + lib.filter (x: x != null) [ + self.versionData.major + self.versionData.minor + self.versionData.patch or null + ] + ) + ); + }; + + # The manual callPackages below should in principle be unnecessary, but are + # necessary. See note in ../netbsd/default.nix + + compat = self.callPackage ./pkgs/compat/package.nix { + inherit stdenv; + inherit (buildFreebsd) makeMinimal; + }; + + csu = self.callPackage ./pkgs/csu.nix { + inherit (buildFreebsd) makeMinimal install gencat; + inherit (self) include; + }; + + include = self.callPackage ./pkgs/include/package.nix { inherit (buildFreebsd) rpcgen mtree; }; + + install = self.callPackage ./pkgs/install.nix { + inherit (buildFreebsd) makeMinimal; + inherit (self) libmd libnetbsd; + }; + + libc = self.callPackage ./pkgs/libc/package.nix { + inherit (buildFreebsd) + makeMinimal + install + gencat + rpcgen + mkcsmapper + mkesdb + ; + inherit (self) csu include; + }; + + libnetbsd = self.callPackage ./pkgs/libnetbsd/package.nix { inherit (buildFreebsd) makeMinimal; }; + + libmd = self.callPackage ./pkgs/libmd.nix { inherit (buildFreebsd) makeMinimal; }; + + mkDerivation = self.callPackage ./pkgs/mkDerivation.nix { + inherit stdenv; + inherit (buildFreebsd) + freebsdSetupHook + makeMinimal + install + tsort + lorder + ; + }; + + makeMinimal = self.callPackage ./pkgs/makeMinimal.nix { inherit (self) make; }; + + mtree = self.callPackage ./pkgs/mtree.nix { inherit (self) libnetbsd libmd; }; + + tsort = self.callPackage ./pkgs/tsort.nix { inherit (buildFreebsd) makeMinimal install; }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/compat/compat-fix-typedefs-locations.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-fix-typedefs-locations.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/compat/compat-fix-typedefs-locations.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-fix-typedefs-locations.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/compat/compat-install-dirs.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-install-dirs.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/compat/compat-install-dirs.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-install-dirs.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libc/libc-msun-arch-subdir.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/libc-msun-arch-subdir.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libc/libc-msun-arch-subdir.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/libc-msun-arch-subdir.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libc/libc-no-force--lcompiler-rt.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/libc-no-force--lcompiler-rt.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libc/libc-no-force--lcompiler-rt.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/libc-no-force--lcompiler-rt.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/libnetbsd-do-install.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/libnetbsd-do-install.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/libnetbsd-do-install.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/libnetbsd-do-install.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libc/librpcsvc-include-subdir.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/librpcsvc-include-subdir.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libc/librpcsvc-include-subdir.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/librpcsvc-include-subdir.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/mtree-Makefile.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/mtree-Makefile.patch new file mode 100644 index 0000000000..2a6e560d1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/mtree-Makefile.patch @@ -0,0 +1,13 @@ +--- a/contrib/mtree/Makefile 2023-12-04 23:02:13.919144141 -0700 ++++ b/contrib/mtree/Makefile 2023-12-04 23:02:58.371810109 -0700 +@@ -10,8 +10,8 @@ + SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c specspec.c \ + verify.c getid.c pack_dev.c only.c + .if (${HOSTPROG:U} == "") +-DPADD+= ${LIBUTIL} +-LDADD+= -lutil ++LIBADD+= ${LIBUTIL} ++#LIBADD+= -lutil + .endif + + CPPFLAGS+= -I${NETBSDSRCDIR}/sbin/mknod diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/include/no-perms-BSD.include.dist.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/no-perms-BSD.include.dist.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/include/no-perms-BSD.include.dist.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/no-perms-BSD.include.dist.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sys/sys-gnu-date.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/sys-gnu-date.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sys/sys-gnu-date.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/sys-gnu-date.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sys/sys-no-explicit-intrinsics-dep.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/sys-no-explicit-intrinsics-dep.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sys/sys-no-explicit-intrinsics-dep.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/13.1/sys-no-explicit-intrinsics-dep.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/bmake-no-compiler-rt.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/bmake-no-compiler-rt.patch new file mode 100644 index 0000000000..f43d87c01e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/bmake-no-compiler-rt.patch @@ -0,0 +1,11 @@ +--- a/share/mk/src.libnames.mk 2023-12-21 23:56:50.767042385 -0800 ++++ b/share/mk/src.libnames.mk 2023-12-21 23:56:39.671089506 -0800 +@@ -392,7 +392,7 @@ + _DP_ztest= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp + # The libc dependencies are not strictly needed but are defined to make the + # assert happy. +-_DP_c= compiler_rt ++_DP_c= + # Use libssp_nonshared only on i386 and power*. Other archs emit direct calls + # to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared. + .if ${MK_SSP} != "no" && \ diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-fix-typedefs-locations.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-fix-typedefs-locations.patch new file mode 100644 index 0000000000..3336a2504e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-fix-typedefs-locations.patch @@ -0,0 +1,32 @@ +--- a/tools/build/cross-build/include/common/sys/_types.h ++++ b/tools/build/cross-build/include/common/sys/_types.h +@@ -47,3 +47,6 @@ + * Neither GLibc nor macOS define __va_list but many FreeBSD headers require it. + */ + typedef __builtin_va_list __va_list; ++ ++typedef __UINTPTR_TYPE__ __uintptr_t; ++typedef __INTPTR_TYPE__ __intptr_t; +--- a/tools/build/cross-build/include/common/sys/types.h ++++ b/tools/build/cross-build/include/common/sys/types.h +@@ -49,9 +49,6 @@ + #include + #endif + +-typedef __UINTPTR_TYPE__ __uintptr_t; +-typedef __INTPTR_TYPE__ __intptr_t; +- + /* needed for gencat */ + typedef int __nl_item; + +--- a/tools/build/cross-build/include/linux/sys/types.h ++++ b/tools/build/cross-build/include/linux/sys/types.h +@@ -39,6 +39,8 @@ + + #include_next + ++#include ++ + #ifndef __size_t + typedef __SIZE_TYPE__ __size_t; + #endif diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-install-dirs.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-install-dirs.patch new file mode 100644 index 0000000000..4bc21cf8eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-install-dirs.patch @@ -0,0 +1,40 @@ +diff --git a/tools/build/Makefile b/tools/build/Makefile +index 948a5f9dfdb..592af84eeae 100644 +--- a/tools/build/Makefile ++++ b/tools/build/Makefile +@@ -327,14 +327,14 @@ host-symlinks: + # and cross-tools stages. We do this here using mkdir since mtree may not exist + # yet (this happens if we are crossbuilding from Linux/Mac). + INSTALLDIR_LIST= \ +- bin \ +- lib/geom \ +- usr/include/casper \ +- usr/include/private/ucl \ +- usr/include/private/zstd \ +- usr/lib \ +- usr/libdata/pkgconfig \ +- usr/libexec ++ ${BINDIR} \ ++ ${LIBDIR}/geom \ ++ ${INCLUDEDIR}/casper \ ++ ${INCLUDEDIR}/private/ucl \ ++ ${INCLUDEDIR}/private/zstd \ ++ ${LIBDIR} \ ++ ${LIBDIR}/libdata/pkgconfig \ ++ ${LIBEXECDIR} + + installdirs: + mkdir -p ${INSTALLDIR_LIST:S,^,${DESTDIR}/,} +@@ -352,9 +352,9 @@ installdirs: + rm -rf "${DESTDIR}/${_dir}"; \ + fi + .endfor +- ln -sfn bin ${DESTDIR}/sbin +- ln -sfn ../bin ${DESTDIR}/usr/bin +- ln -sfn ../bin ${DESTDIR}/usr/sbin ++ ln -sfn bin ${DESTDIR}/${SBINDIR} ++ ln -sfn ../bin ${DESTDIR}/${BINDIR} ++ ln -sfn ../bin ${DESTDIR}/${SBINDIR} + .for _group in ${INCSGROUPS:NINCS} + mkdir -p "${DESTDIR}/${${_group}DIR}" + .endfor diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/install-bootstrap-Makefile.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/install-bootstrap-Makefile.patch new file mode 100644 index 0000000000..a69c5501dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/install-bootstrap-Makefile.patch @@ -0,0 +1,11 @@ +--- a/usr.bin/xinstall/Makefile 2023-09-23 19:18:49.165192183 -0700 ++++ b/usr.bin/xinstall/Makefile 2023-12-06 17:06:57.836888028 -0700 +@@ -14,7 +14,7 @@ + CFLAGS+= -I${SRCTOP}/lib/libnetbsd + + LIBADD= md +-CFLAGS+= -DWITH_MD5 -DWITH_RIPEMD160 ++CFLAGS+= -I${BSDSRCDIR}/contrib/libc-vis -I${BSDSRCDIR}/lib/libnetbsd + + .ifdef BOOTSTRAPPING + # For the bootstrap we disable copy_file_range() diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-msun-arch-subdir.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-msun-arch-subdir.patch new file mode 100644 index 0000000000..4a69e85a98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-msun-arch-subdir.patch @@ -0,0 +1,11 @@ +--- a/lib/libc/Makefile ++++ b/lib/libc/Makefile +@@ -194,7 +194,7 @@ SUBDIR.${MK_TESTS}+= tests + # recording a build dependency + CFLAGS+= -I${SRCTOP}/lib/libutil + # Same issue with libm +-MSUN_ARCH_SUBDIR != ${MAKE} -B -C ${SRCTOP}/lib/msun -V ARCH_SUBDIR ++MSUN_ARCH_SUBDIR = ${MACHINE_CPUARCH:S/i386/i387/} + # unfortunately msun/src contains both private and public headers + CFLAGS+= -I${SRCTOP}/lib/msun/${MSUN_ARCH_SUBDIR} + .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-no-force--lcompiler-rt.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-no-force--lcompiler-rt.patch new file mode 100644 index 0000000000..60176fb73c --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-no-force--lcompiler-rt.patch @@ -0,0 +1,10 @@ +--- a/lib/libc/Makefile ++++ b/lib/libc/Makefile +@@ -58,7 +58,6 @@ CFLAGS+=${CANCELPOINTS_CFLAGS} + # Link with static libcompiler_rt.a. + # + LDFLAGS+= -nodefaultlibs +-LIBADD+= compiler_rt + + .if ${MK_SSP} != "no" && \ + (${LIBC_ARCH} == "i386" || ${MACHINE_ARCH:Mpower*} != "") diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libnetbsd-do-install.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libnetbsd-do-install.patch new file mode 100644 index 0000000000..a7bd032d2b --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libnetbsd-do-install.patch @@ -0,0 +1,32 @@ +diff --git a/Makefile b/Makefile +index 22710f3d933..22effc848cf 100644 +--- a/lib/libnetbsd/Makefile ++++ b/lib/libnetbsd/Makefile +@@ -9,6 +9,26 @@ CFLAGS+= -I${.CURDIR} + + SRCS+= efun.c sockaddr_snprintf.c strsuftoll.c util.c util.h + +-INTERNALLIB= ++INCSGROUPS= INCS SYSINCS NETINETINCS ++ ++INCS+= \ ++ glob.h \ ++ pthread.h \ ++ rmd160.h \ ++ sha1.h \ ++ sha2.h \ ++ stdlib.h \ ++ util.h ++ ++SYSINCSDIR= ${INCLUDEDIR}/sys ++SYSINCS+= \ ++ sys/cdefs.h \ ++ sys/event.h \ ++ sys/types.h \ ++ sys/wait.h ++ ++NETINETINCSDIR= ${INCLUDEDIR}/netinet ++NETINETINCS+= \ ++ netinet/in.h + + .include diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/librpcsvc-include-subdir.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/librpcsvc-include-subdir.patch new file mode 100644 index 0000000000..38e0668286 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/librpcsvc-include-subdir.patch @@ -0,0 +1,11 @@ +--- a/lib/librpcsvc/Makefile ++++ b/lib/librpcsvc/Makefile +@@ -20,7 +20,7 @@ OTHERSRCS+= yp_passwd.c yp_update.c + + RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C + +-INCDIRS= -I${SYSROOT:U${DESTDIR}}/usr/include/rpcsvc ++INCDIRS= -I${INCLUDEDIR}/rpcsvc + + CFLAGS+= -DYP ${INCDIRS} + diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/mtree-Makefile.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/mtree-Makefile.patch new file mode 100644 index 0000000000..2a6e560d1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/mtree-Makefile.patch @@ -0,0 +1,13 @@ +--- a/contrib/mtree/Makefile 2023-12-04 23:02:13.919144141 -0700 ++++ b/contrib/mtree/Makefile 2023-12-04 23:02:58.371810109 -0700 +@@ -10,8 +10,8 @@ + SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c specspec.c \ + verify.c getid.c pack_dev.c only.c + .if (${HOSTPROG:U} == "") +-DPADD+= ${LIBUTIL} +-LDADD+= -lutil ++LIBADD+= ${LIBUTIL} ++#LIBADD+= -lutil + .endif + + CPPFLAGS+= -I${NETBSDSRCDIR}/sbin/mknod diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/no-perms-BSD.include.dist.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/no-perms-BSD.include.dist.patch new file mode 100644 index 0000000000..985617ee0f --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/no-perms-BSD.include.dist.patch @@ -0,0 +1,11 @@ +--- a/etc/mtree/BSD.include.dist ++++ b/etc/mtree/BSD.include.dist +@@ -3,7 +3,7 @@ + # Please see the file src/etc/mtree/README before making changes to this file. + # + +-/set type=dir uname=root gname=wheel mode=0755 ++/set type=dir + . + arpa + .. diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/rtld-no-force--lcompiler-rt.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/rtld-no-force--lcompiler-rt.patch new file mode 100644 index 0000000000..45f0d0c51e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/rtld-no-force--lcompiler-rt.patch @@ -0,0 +1,10 @@ +--- a/libexec/rtld-elf/Makefile ++++ b/libexec/rtld-elf/Makefile +@@ -86,7 +86,6 @@ + + # Some of the required math functions (div & mod) are implemented in + # libcompiler_rt on some architectures. +-LIBADD+= compiler_rt + + .include + ${PROG_FULL}: ${VERSION_MAP} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-gnu-date.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-gnu-date.patch new file mode 100644 index 0000000000..2356446baf --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-gnu-date.patch @@ -0,0 +1,13 @@ +diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh +index c594724d814..d5287c7b992 100644 +--- a/sys/conf/newvers.sh ++++ b/sys/conf/newvers.sh +@@ -177,7 +177,7 @@ u=${USER:-root} + d=$(pwd) + h=${HOSTNAME:-$(hostname)} + if [ -n "$SOURCE_DATE_EPOCH" ]; then +- if ! t=$(date -r $SOURCE_DATE_EPOCH 2>/dev/null); then ++ if ! t=$(date -d @$SOURCE_DATE_EPOCH 2>/dev/null); then + echo "Invalid SOURCE_DATE_EPOCH" >&2 + exit 1 + fi diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-no-explicit-intrinsics-dep.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-no-explicit-intrinsics-dep.patch new file mode 100644 index 0000000000..5cf926d451 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-no-explicit-intrinsics-dep.patch @@ -0,0 +1,42 @@ +--- a/sys/modules/aesni/Makefile 2023-12-16 09:19:28.454892154 -0700 ++++ b/sys/Modules/aesni/Makefile 2023-12-16 09:19:41.975047684 -0700 +@@ -1,6 +1,5 @@ + + .PATH: ${SRCTOP}/sys/crypto/aesni +-.PATH: ${SRCTOP}/contrib/llvm-project/clang/lib/Headers + + KMOD= aesni + SRCS= aesni.c +@@ -39,8 +38,8 @@ + aesni_ghash.o: aesni.h + aesni_wrap.o: aesni.h + aesni_ccm.o: aesni.h +-intel_sha1.o: sha_sse.h immintrin.h shaintrin.h tmmintrin.h xmmintrin.h +-intel_sha256.o: sha_sse.h immintrin.h shaintrin.h tmmintrin.h xmmintrin.h ++intel_sha1.o: sha_sse.h ++intel_sha256.o: sha_sse.h + + .include + +diff --git a/sys/modules/blake2/Makefile b/sys/modules/blake2/Makefile +index e4b3fb9f126..5bfd9c2ae02 100644 +--- a/sys/modules/blake2/Makefile ++++ b/sys/modules/blake2/Makefile +@@ -3,7 +3,6 @@ + .PATH: ${SRCTOP}/sys/contrib/libb2 + .PATH: ${SRCTOP}/sys/crypto/blake2 + .PATH: ${SRCTOP}/sys/opencrypto +-.PATH: ${SRCTOP}/contrib/llvm-project/clang/lib/Headers + + KMOD = blake2 + +@@ -64,8 +63,7 @@ ${src:S/.c/.o/}: ${src} + -D_MM_MALLOC_H_INCLUDED -Wno-unused-function ${.IMPSRC} + ${CTFCONVERT_CMD} + +-${src:S/.c/.o/}: intrin.h emmintrin.h tmmintrin.h smmintrin.h immintrin.h \ +- x86intrin.h ${SRCS:M*.h} ++${src:S/.c/.o/}: ${SRCS:M*.h} + .endfor + + # FreeBSD-specific sources: diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix index 71ecef1bca..966489d9ae 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix @@ -1,7 +1,10 @@ { buildPackages, freebsd-lib }: # Wrap NetBSD's install -buildPackages.writeShellScriptBin "boot-install" (freebsd-lib.install-wrapper + '' +buildPackages.writeShellScriptBin "boot-install" ( + freebsd-lib.install-wrapper + + '' - ${buildPackages.netbsd.install}/bin/xinstall "''${args[@]}" -'') + ${buildPackages.netbsd.install}/bin/xinstall "''${args[@]}" + '' +) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix index 5e4528fbf4..f597d6e370 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix @@ -1,102 +1,129 @@ -{ lib, stdenv, mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal, boot-install -, which -, freebsd-lib -, expat, zlib, +{ + lib, + stdenv, + mkDerivation, + versionData, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + boot-install, + which, + freebsd-lib, + expat, + zlib, }: let inherit (freebsd-lib) mkBsdArch; in -mkDerivation rec { +mkDerivation { pname = "compat"; path = "tools/build"; - extraPaths = [ - "lib/libc/db" - "lib/libc/stdlib" # getopt - "lib/libc/gen" # getcap - "lib/libc/locale" # rpmatch - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "lib/libc/string" # strlcpy - "lib/libutil" - ] ++ [ - "contrib/libc-pwcache" - "contrib/libc-vis" - "sys/libkern" - "sys/kern/subr_capability.c" + extraPaths = + [ + "lib/libc/db" + "lib/libc/stdlib" # getopt + "lib/libc/gen" # getcap + "lib/libc/locale" # rpmatch + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "lib/libc/string" # strlcpy + "lib/libutil" + ] + ++ [ + "contrib/libc-pwcache" + "contrib/libc-vis" + "sys/libkern" + "sys/kern/subr_capability.c" - # Take only individual headers, or else we will clobber native libc, etc. + # Take only individual headers, or else we will clobber native libc, etc. - "sys/rpc/types.h" + "sys/rpc/types.h" + ] + ++ lib.optionals (versionData.major == 14) [ "sys/sys/bitcount.h" ] + ++ [ - # Listed in Makekfile as INC - "include/mpool.h" - "include/ndbm.h" - "include/err.h" - "include/stringlist.h" - "include/a.out.h" - "include/nlist.h" - "include/db.h" - "include/getopt.h" - "include/nl_types.h" - "include/elf.h" - "sys/sys/ctf.h" + # Listed in Makekfile as INC + "include/mpool.h" + "include/ndbm.h" + "include/err.h" + "include/stringlist.h" + "include/a.out.h" + "include/nlist.h" + "include/db.h" + "include/getopt.h" + "include/nl_types.h" + "include/elf.h" + "sys/sys/ctf.h" + ] + ++ lib.optionals (versionData.major == 14) [ + "include/bitstring.h" + "sys/sys/bitstring.h" + "sys/sys/nv_namespace.h" + ] + ++ [ - # Listed in Makekfile as SYSINC + # Listed in Makekfile as SYSINC - "sys/sys/capsicum.h" - "sys/sys/caprights.h" - "sys/sys/imgact_aout.h" - "sys/sys/nlist_aout.h" - "sys/sys/nv.h" - "sys/sys/dnv.h" - "sys/sys/cnv.h" + "sys/sys/capsicum.h" + "sys/sys/caprights.h" + "sys/sys/imgact_aout.h" + "sys/sys/nlist_aout.h" + "sys/sys/nv.h" + "sys/sys/dnv.h" + "sys/sys/cnv.h" - "sys/sys/elf32.h" - "sys/sys/elf64.h" - "sys/sys/elf_common.h" - "sys/sys/elf_generic.h" - "sys/${mkBsdArch stdenv}/include" - ] ++ lib.optionals stdenv.hostPlatform.isx86 [ - "sys/x86/include" - ] ++ [ + "sys/sys/elf32.h" + "sys/sys/elf64.h" + "sys/sys/elf_common.h" + "sys/sys/elf_generic.h" + "sys/${mkBsdArch stdenv}/include" + ] + ++ lib.optionals stdenv.hostPlatform.isx86 [ "sys/x86/include" ] + ++ [ - "sys/sys/queue.h" - "sys/sys/md5.h" - "sys/sys/sbuf.h" - "sys/sys/tree.h" - "sys/sys/font.h" - "sys/sys/consio.h" - "sys/sys/fnv_hash.h" + "sys/sys/queue.h" + "sys/sys/md5.h" + "sys/sys/sbuf.h" + "sys/sys/tree.h" + "sys/sys/font.h" + "sys/sys/consio.h" + "sys/sys/fnv_hash.h" + #"sys/sys/cdefs.h" + #"sys/sys/param.h" + "sys/sys/_null.h" + #"sys/sys/types.h" + "sys/sys/_pthreadtypes.h" + "sys/sys/_stdint.h" - "sys/crypto/chacha20/_chacha.h" - "sys/crypto/chacha20/chacha.h" - # included too, despite ".c" - "sys/crypto/chacha20/chacha.c" + "sys/crypto/chacha20/_chacha.h" + "sys/crypto/chacha20/chacha.h" + # included too, despite ".c" + "sys/crypto/chacha20/chacha.c" - "sys/fs" - "sys/ufs" - "sys/sys/disk" + "sys/fs" + "sys/ufs" + "sys/sys/disk" - "lib/libcapsicum" - "lib/libcasper" - ]; + "lib/libcapsicum" + "lib/libcasper" + "lib/libmd" - patches = [ - ./compat-install-dirs.patch - ./compat-fix-typedefs-locations.patch - ]; + # idk bro + "sys/sys/kbio.h" + ]; - preBuild = '' - NIX_CFLAGS_COMPILE+=' -I../../include -I../../sys' + preBuild = + '' + NIX_CFLAGS_COMPILE+=' -I../../include -I../../sys' - cp ../../sys/${mkBsdArch stdenv}/include/elf.h ../../sys/sys - cp ../../sys/${mkBsdArch stdenv}/include/elf.h ../../sys/sys/${mkBsdArch stdenv} - '' + lib.optionalString stdenv.hostPlatform.isx86 '' - cp ../../sys/x86/include/elf.h ../../sys/x86 - ''; + cp ../../sys/${mkBsdArch stdenv}/include/elf.h ../../sys/sys + cp ../../sys/${mkBsdArch stdenv}/include/elf.h ../../sys/sys/${mkBsdArch stdenv} + '' + + lib.optionalString stdenv.hostPlatform.isx86 '' + cp ../../sys/x86/include/elf.h ../../sys/x86 + ''; setupHooks = [ ../../../../../build-support/setup-hooks/role.bash @@ -109,13 +136,17 @@ mkDerivation rec { ''; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook + bsdSetupHook + freebsdSetupHook makeMinimal boot-install which ]; - buildInputs = [ expat zlib ]; + buildInputs = [ + expat + zlib + ]; makeFlags = [ "STRIP=-s" # flag to install, not command @@ -124,12 +155,20 @@ mkDerivation rec { "INSTALL=boot-install" ]; - preIncludes = '' - mkdir -p $out/{0,1}-include - cp --no-preserve=mode -r cross-build/include/common/* $out/0-include - '' + lib.optionalString stdenv.hostPlatform.isLinux '' - cp --no-preserve=mode -r cross-build/include/linux/* $out/1-include - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - cp --no-preserve=mode -r cross-build/include/darwin/* $out/1-include - ''; + preIncludes = + '' + mkdir -p $out/{0,1}-include + cp --no-preserve=mode -r cross-build/include/common/* $out/0-include + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + cp --no-preserve=mode -r cross-build/include/linux/* $out/1-include + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + cp --no-preserve=mode -r cross-build/include/darwin/* $out/1-include + ''; + + # Compat is for making other platforms look like FreeBSD (e.g. to + # build build-time dependencies for building FreeBSD packages). It is + # not needed when building for FreeBSD. + meta.broken = stdenv.hostPlatform.isFreeBSD; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/config.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/config.nix index 641cfc46b4..f7ba273ed5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/config.nix @@ -1,17 +1,35 @@ -{ mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff -, flex, byacc, file2c -, compatIfNeeded, libnv, libsbuf +{ + mkDerivation, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + flex, + byacc, + file2c, + compatIfNeeded, + libnv, + libsbuf, }: mkDerivation { path = "usr.sbin/config"; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff + bsdSetupHook + freebsdSetupHook + makeMinimal + install + mandoc + groff - flex byacc file2c + flex + byacc + file2c + ]; + buildInputs = compatIfNeeded ++ [ + libnv + libsbuf ]; - buildInputs = compatIfNeeded ++ [ libnv libsbuf ]; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix index 0b17cb1c84..0f74d78b1d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix @@ -1,23 +1,32 @@ -{ lib, mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal -, install -, flex, byacc, gencat -, include +{ + lib, + mkDerivation, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + flex, + byacc, + gencat, + include, }: mkDerivation { + isStatic = true; path = "lib/csu"; extraPaths = [ "lib/Makefile.inc" "lib/libc/include/libc_private.h" ]; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook + bsdSetupHook + freebsdSetupHook makeMinimal install - flex byacc gencat + flex + byacc + gencat ]; buildInputs = [ include ]; MK_TESTS = "no"; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix index 0aebc9b3d0..9e653bb4f5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix @@ -1,7 +1,10 @@ -{ lib, stdenv, mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff -, compatIfNeeded, libelf, libdwarf, zlib, libspl +{ + lib, + mkDerivation, + compatIfNeeded, + libdwarf, + zlib, + libspl, }: mkDerivation { @@ -15,14 +18,18 @@ mkDerivation { ]; OPENSOLARIS_USR_DISTDIR = "$(SRCTOP)/cddl/contrib/opensolaris"; OPENSOLARIS_SYS_DISTDIR = "$(SRCTOP)/sys/cddl/contrib/opensolaris"; - nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff - # flex byacc file2c + makeFlags = [ + "STRIP=-s" + "MK_WERROR=no" + "MK_TESTS=no" ]; + buildInputs = compatIfNeeded ++ [ - libelf libdwarf zlib libspl + libdwarf + zlib + libspl ]; + meta.license = lib.licenses.cddl; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix new file mode 100644 index 0000000000..dc215c18ae --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix @@ -0,0 +1,23 @@ +{ + lib, + pkgsBuildBuild, + runCommand, + writeText, + source, +}: + +{ + pname, + path, + extraPaths ? [ ], +}: + +let + sortedPaths = lib.naturalSort ([ path ] ++ extraPaths); + filterText = writeText "${pname}-src-include" ( + lib.concatMapStringsSep "\n" (path: "/${path}") sortedPaths + ); +in +runCommand "${pname}-filtered-src" { nativeBuildInputs = [ pkgsBuildBuild.rsync ]; } '' + rsync -a -r --files-from=${filterText} ${source}/ $out +'' diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/package.nix index 430c4c5c43..ef4a14ccf4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/package.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/package.nix @@ -1,5 +1,3 @@ { makeSetupHook }: -makeSetupHook { - name = "freebsd-setup-hook"; -} ./setup-hook.sh +makeSetupHook { name = "freebsd-setup-hook"; } ./setup-hook.sh diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh index 929782954b..96a3d14c80 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh @@ -5,7 +5,18 @@ setFreeBSDSrcTop() { addFreeBSDMakeFlags() { makeFlags="SBINDIR=${!outputBin}/bin $makeFlags" makeFlags="LIBEXECDIR=${!outputLib}/libexec $makeFlags" + makeFlags="LIBDATADIR=${!outputLib}/data $makeFlags" makeFlags="INCLUDEDIR=${!outputDev}/include $makeFlags" + makeFlags="CONFDIR=${!outputBin}/etc $makeFlags" + makeFlags="MANDIR=${!outputMan}/share/man/man $makeFlags" + + if [ -n "$debug" ]; then + makeFlags="DEBUGFILEDIR=${debug}/lib/debug $makeFlags" + else + makeFlags="DEBUGFILEDIR=${out}/lib/debug $makeFlags" + fi + + echo $makeFlags } postUnpackHooks+=(setFreeBSDSrcTop) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/gencat.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/gencat.nix index e9ae9f27cc..ea701b6404 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/gencat.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/gencat.nix @@ -1,5 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/gencat"; -} +mkDerivation { path = "usr.bin/gencat"; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix index 73fa887c51..70734226a5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix @@ -1,12 +1,13 @@ -{ lib, mkDerivation -, buildPackages -, bsdSetupHook, freebsdSetupHook -, makeMinimal -, install -, mandoc, groff, rsync /*, nbperf*/, rpcgen +{ + lib, + mkDerivation, + buildPackages, + rpcgen, + mtree, }: mkDerivation { + isStatic = true; path = "include"; extraPaths = [ @@ -15,18 +16,9 @@ mkDerivation { "sys" ]; - nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal - install - mandoc groff rsync /*nbperf*/ rpcgen - - # HACK use NetBSD's for now - buildPackages.netbsd.mtree - ]; - - patches = [ - ./no-perms-BSD.include.dist.patch + extraNativeBuildInputs = [ + rpcgen + mtree ]; # The makefiles define INCSDIR per subdirectory, so we have to set @@ -37,11 +29,10 @@ mkDerivation { sed -i -E \ -e 's_/usr/include_''${INCSDIR0}_' \ {} \; + sed -E -i -e "/_PATH_LOGIN/d" $BSDSRCDIR/include/paths.h ''; - makeFlags = [ - "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" - ]; + makeFlags = [ "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" ]; # multiple header dirs, see above postConfigure = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/install.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/install.nix index 3db6cd3633..b8e59adb09 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/install.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/install.nix @@ -1,41 +1,67 @@ -{ lib, stdenv, mkDerivation, writeShellScript -, freebsd-lib -, mtree -, bsdSetupHook, freebsdSetupHook -, makeMinimal, mandoc, groff -, boot-install, install -, compatIfNeeded, libmd, libnetbsd +{ + lib, + stdenv, + mkDerivation, + writeShellScript, + freebsd-lib, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + mandoc, + groff, + boot-install, + install, + compatIfNeeded, + libmd, + libnetbsd, }: # HACK: to ensure parent directories exist. This emulates GNU # install’s -D option. No alternative seems to exist in BSD install. let - binstall = writeShellScript "binstall" (freebsd-lib.install-wrapper + '' + binstall = writeShellScript "binstall" ( + freebsd-lib.install-wrapper + + '' - @out@/bin/xinstall "''${args[@]}" - ''); -in mkDerivation { + @out@/bin/xinstall "''${args[@]}" + '' + ); +in +mkDerivation { path = "usr.bin/xinstall"; - extraPaths = [ mtree.path ]; + extraPaths = [ "contrib/mtree" ]; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal mandoc groff - (if stdenv.hostPlatform == stdenv.buildPlatform - then boot-install - else install) + bsdSetupHook + freebsdSetupHook + makeMinimal + mandoc + groff + (if stdenv.hostPlatform == stdenv.buildPlatform then boot-install else install) ]; skipIncludesPhase = true; - buildInputs = compatIfNeeded ++ [ libmd libnetbsd ]; - makeFlags = [ - "STRIP=-s" # flag to install, not command - "MK_WERROR=no" - "TESTSDIR=${builtins.placeholder "test"}" - ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "INSTALL=boot-install"; + buildInputs = compatIfNeeded ++ [ + libmd + libnetbsd + ]; + makeFlags = + [ + "STRIP=-s" # flag to install, not command + "MK_WERROR=no" + "TESTSDIR=${builtins.placeholder "test"}" + ] + ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + "BOOTSTRAPPING=1" + "INSTALL=boot-install" + ]; postInstall = '' - install -D -m 0550 ${binstall} $out/bin/binstall + install -C -m 0550 ${binstall} $out/bin/binstall substituteInPlace $out/bin/binstall --subst-var out mv $out/bin/install $out/bin/xinstall ln -s ./binstall $out/bin/install ''; - outputs = [ "out" "man" "test" ]; + outputs = [ + "out" + "man" + "test" + ]; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix index 0225d44be4..8f2cc97646 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix @@ -1,79 +1,145 @@ -{ lib, stdenv, mkDerivation +{ + lib, + buildPackages, + stdenv, + mkDerivation, -, bsdSetupHook, freebsdSetupHook -, makeMinimal -, install -, flex, byacc, gencat, rpcgen + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + flex, + byacc, + gencat, + rpcgen, + mkcsmapper, + mkesdb, -, csu, include + csu, + include, + versionData, }: -mkDerivation rec { +mkDerivation { + isStatic = true; pname = "libc"; path = "lib/libc"; - extraPaths = [ - "etc/group" - "etc/master.passwd" - "etc/shells" - "lib/libmd" - "lib/libutil" - "lib/msun" - "sys/kern" - "sys/libkern" - "sys/sys" - "sys/crypto/chacha20" - "include/rpcsvc" - "contrib/jemalloc" - "contrib/gdtoa" - "contrib/libc-pwcache" - "contrib/libc-vis" - "contrib/tzcode/stdtime" + extraPaths = + [ + "lib/libc_nonshared" + "etc/group" + "etc/master.passwd" + "etc/shells" + "lib/libmd" + "lib/libutil" + "lib/msun" + "sys/kern" + "sys/libkern" + "sys/sys" + "sys/crypto/chacha20" + "include/rpcsvc" + "contrib/jemalloc" + "contrib/gdtoa" + "contrib/libc-pwcache" + "contrib/libc-vis" + ] + ++ lib.optionals (versionData.major == 13) [ "contrib/tzcode/stdtime" ] + ++ lib.optionals (versionData.major == 14) [ "contrib/tzcode" ] + ++ [ - # libthr - "lib/libthr" - "lib/libthread_db" - "libexec/rtld-elf" + # libthr + "lib/libthr" + "lib/libthread_db" + "libexec/rtld-elf" + "lib/csu/common/crtbrand.S" + "lib/csu/common/notes.h" - # librpcsvc - "lib/librpcsvc" + # librpcsvc + "lib/librpcsvc" - # librt - "lib/librt" + # librt + "lib/librt" - # libcrypt - "lib/libcrypt" - "lib/libmd" - "sys/crypto/sha2" - ]; + # libcrypt + "lib/libcrypt" + "lib/libmd" + "sys/crypto/sha2" + "sys/crypto/skein" - patches = [ - # Hack around broken propogating MAKEFLAGS to submake, just inline logic - ./libc-msun-arch-subdir.patch + # libgcc and friends + "lib/libgcc_eh" + "lib/libgcc_s" + "lib/libcompiler_rt" + "contrib/llvm-project/libunwind" + "contrib/llvm-project/compiler-rt" + #"contrib/llvm-project/libcxx" - # Don't force -lcompiler-rt, we don't actually call it that - ./libc-no-force--lcompiler-rt.patch + # terminfo + "lib/ncurses" + "contrib/ncurses" + "lib/Makefile.inc" + ] + ++ lib.optionals (stdenv.hostPlatform.isx86_32) [ "lib/libssp_nonshared" ] + ++ [ + "lib/libexecinfo" + "contrib/libexecinfo" - # Fix extra include dir to get rpcsvc headers. - ./librpcsvc-include-subdir.patch - ]; + "lib/libkvm" + "sys" # ummmmmmmmmm libkvm wants arch-specific headers from the kernel tree + + "lib/libmemstat" + + "lib/libprocstat" + "sys/contrib/openzfs" + "sys/contrib/pcg-c" + "sys/opencrypto" + "sys/contrib/ck" + "sys/crypto" + + "lib/libdevstat" + + "lib/libelf" + "contrib/elftoolchain" + + "lib/libiconv_modules" + "share/i18n" + "include/paths.h" + + "lib/libdl" + ]; postPatch = '' substituteInPlace $COMPONENT_PATH/Makefile --replace '.include ' "" + + substituteInPlace $BSDSRCDIR/include/paths.h \ + --replace '/usr/lib/i18n' '${builtins.placeholder "out"}/lib/i18n' \ + --replace '/usr/share/i18n' '${builtins.placeholder "out"}/share/i18n' ''; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook + bsdSetupHook + freebsdSetupHook makeMinimal install - flex byacc gencat rpcgen + flex + byacc + gencat + rpcgen + mkcsmapper + mkesdb + ]; + buildInputs = [ + include + csu + ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-B${csu}/lib" + # These are supposed to have _RTLD_COMPAT_LIB_SUFFIX so we can get things like "lib32" + # but that's unnecessary + "-DSTANDARD_LIBRARY_PATH=\"${builtins.placeholder "out"}/lib\"" + "-D_PATH_RTLD=\"${builtins.placeholder "out"}/libexec/ld-elf.so.1\"" ]; - buildInputs = [ include csu ]; - env.NIX_CFLAGS_COMPILE = "-B${csu}/lib"; - - # Suppress lld >= 16 undefined version errors - # https://github.com/freebsd/freebsd-src/commit/2ba84b4bcdd6012e8cfbf8a0d060a4438623a638 - env.NIX_LDFLAGS = lib.optionalString (stdenv.targetPlatform.linker == "lld") "--undefined-version"; makeFlags = [ "STRIP=-s" # flag to install, not command @@ -84,7 +150,7 @@ mkDerivation rec { MK_SYMVER = "yes"; MK_SSP = "yes"; MK_NLS = "yes"; - MK_ICONV = "no"; # TODO make srctop + MK_ICONV = "yes"; MK_NS_CACHING = "yes"; MK_INET6_SUPPORT = "yes"; MK_HESIOD = "yes"; @@ -96,44 +162,125 @@ mkDerivation rec { MK_MALLOC_PRODUCTION = "yes"; MK_TESTS = "no"; + MACHINE_ABI = ""; + MK_DETECT_TZ_CHANGES = "no"; + MK_MACHDEP_OPTIMIZATIONS = "yes"; + MK_ASAN = "no"; + MK_UBSAN = "no"; - postInstall = '' - pushd ${include} - find . -type d -exec mkdir -p $out/\{} \; - find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; - popd + NO_FSCHG = "yes"; - pushd ${csu} - find . -type d -exec mkdir -p $out/\{} \; - find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; - popd + preBuild = lib.optionalString (stdenv.hostPlatform.isx86_32) '' + make -C $BSDSRCDIR/lib/libssp_nonshared $makeFlags + make -C $BSDSRCDIR/lib/libssp_nonshared $makeFlags install + ''; - sed -i -e 's| [^ ]*/libc_nonshared.a||' $out/lib/libc.so + postInstall = + '' + pushd ${include} + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; + popd - $CC -nodefaultlibs -lgcc -shared -o $out/lib/libgcc_s.so + pushd ${csu} + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; + popd - NIX_CFLAGS_COMPILE+=" -B$out/lib" - NIX_CFLAGS_COMPILE+=" -I$out/include" - NIX_LDFLAGS+=" -L$out/lib" + mkdir $BSDSRCDIR/lib/libcompiler_rt/i386 + make -C $BSDSRCDIR/lib/libcompiler_rt $makeFlags + make -C $BSDSRCDIR/lib/libcompiler_rt $makeFlags install - make -C $BSDSRCDIR/lib/libthr $makeFlags - make -C $BSDSRCDIR/lib/libthr $makeFlags install + make -C $BSDSRCDIR/lib/libgcc_eh $makeFlags + make -C $BSDSRCDIR/lib/libgcc_eh $makeFlags install - make -C $BSDSRCDIR/lib/msun $makeFlags - make -C $BSDSRCDIR/lib/msun $makeFlags install + ln -s $BSDSRCDIR/lib/libc/libc.so.7 $BSDSRCDIR/lib/libc/libc.so # not sure + mkdir $BSDSRCDIR/lib/libgcc_s/i386 + make -C $BSDSRCDIR/lib/libgcc_s $makeFlags + make -C $BSDSRCDIR/lib/libgcc_s $makeFlags install - make -C $BSDSRCDIR/lib/librpcsvc $makeFlags - make -C $BSDSRCDIR/lib/librpcsvc $makeFlags install + NIX_CFLAGS_COMPILE+=" -B$out/lib" + NIX_CFLAGS_COMPILE+=" -I$out/include" + NIX_LDFLAGS+=" -L$out/lib" - make -C $BSDSRCDIR/lib/libutil $makeFlags - make -C $BSDSRCDIR/lib/libutil $makeFlags install + make -C $BSDSRCDIR/lib/libc_nonshared $makeFlags + make -C $BSDSRCDIR/lib/libc_nonshared $makeFlags install - make -C $BSDSRCDIR/lib/librt $makeFlags - make -C $BSDSRCDIR/lib/librt $makeFlags install + mkdir $BSDSRCDIR/lib/libmd/sys + make -C $BSDSRCDIR/lib/libmd $makeFlags + make -C $BSDSRCDIR/lib/libmd $makeFlags install - make -C $BSDSRCDIR/lib/libcrypt $makeFlags - make -C $BSDSRCDIR/lib/libcrypt $makeFlags install + make -C $BSDSRCDIR/lib/libthr $makeFlags + make -C $BSDSRCDIR/lib/libthr $makeFlags install + + make -C $BSDSRCDIR/lib/msun $makeFlags + make -C $BSDSRCDIR/lib/msun $makeFlags install + + make -C $BSDSRCDIR/lib/librpcsvc $makeFlags + make -C $BSDSRCDIR/lib/librpcsvc $makeFlags install + + make -C $BSDSRCDIR/lib/libutil $makeFlags + make -C $BSDSRCDIR/lib/libutil $makeFlags install + + make -C $BSDSRCDIR/lib/librt $makeFlags + make -C $BSDSRCDIR/lib/librt $makeFlags install + + make -C $BSDSRCDIR/lib/libcrypt $makeFlags + make -C $BSDSRCDIR/lib/libcrypt $makeFlags install + + make -C $BSDSRCDIR/lib/libelf $makeFlags + make -C $BSDSRCDIR/lib/libelf $makeFlags install + + make -C $BSDSRCDIR/lib/libexecinfo $makeFlags + make -C $BSDSRCDIR/lib/libexecinfo $makeFlags install + + make -C $BSDSRCDIR/lib/libkvm $makeFlags + make -C $BSDSRCDIR/lib/libkvm $makeFlags install + + make -C $BSDSRCDIR/lib/libmemstat $makeFlags + make -C $BSDSRCDIR/lib/libmemstat $makeFlags install + + make -C $BSDSRCDIR/lib/libprocstat $makeFlags + make -C $BSDSRCDIR/lib/libprocstat $makeFlags install + + make -C $BSDSRCDIR/lib/libdevstat $makeFlags + make -C $BSDSRCDIR/lib/libdevstat $makeFlags install + + make -C $BSDSRCDIR/lib/libiconv_modules $makeFlags + make -C $BSDSRCDIR/lib/libiconv_modules $makeFlags SHLIBDIR=${builtins.placeholder "out"}/lib/i18n install + + make -C $BSDSRCDIR/lib/libdl $makeFlags + make -C $BSDSRCDIR/lib/libdl $makeFlags install + + make -C $BSDSRCDIR/share/i18n $makeFlags + make -C $BSDSRCDIR/share/i18n $makeFlags ESDBDIR=${builtins.placeholder "out"}/share/i18n/esdb CSMAPPERDIR=${builtins.placeholder "out"}/share/i18n/csmapper install + + '' + + lib.optionalString stdenv.hostPlatform.isx86_32 '' + $CC -c $BSDSRCDIR/contrib/llvm-project/compiler-rt/lib/builtins/udivdi3.c -o $BSDSRCDIR/contrib/llvm-project/compiler-rt/lib/builtins/udivdi3.o + ORIG_NIX_LDFLAGS="$NIX_LDFLAGS" + NIX_LDFLAGS+=" $BSDSRCDIR/contrib/llvm-project/compiler-rt/lib/builtins/udivdi3.o" + '' + + '' + make -C $BSDSRCDIR/libexec/rtld-elf $makeFlags + make -C $BSDSRCDIR/libexec/rtld-elf $makeFlags install + rm -f $out/libexec/ld-elf.so.1 + mv $out/bin/ld-elf.so.1 $out/libexec + ''; + + # libc should not be allowed to refer to anything other than itself + postFixup = '' + find $out -type f | xargs -n1 ${buildPackages.patchelf}/bin/patchelf --shrink-rpath --allowed-rpath-prefixes $out || true ''; meta.platforms = lib.platforms.freebsd; + + # definitely a bad idea to enable stack protection on the stack protection initializers + hardeningDisable = [ "stackprotector" ]; + + outputs = [ + "out" + "man" + "debug" + ]; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix index 9fc8fc5f9a..ee4d57b021 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff -, m4 -, compatIfNeeded, libelf +{ + mkDerivation, + m4, + compatIfNeeded, + zlib, }: mkDerivation { @@ -14,14 +14,7 @@ mkDerivation { "sys/sys/elf64.h" "sys/sys/elf_common.h" ]; - nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff - - m4 - ]; - buildInputs = compatIfNeeded ++ [ - libelf - ]; + extraNativeBuildInputs = [ m4 ]; + buildInputs = compatIfNeeded ++ [ zlib ]; MK_TESTS = "no"; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix deleted file mode 100644 index a44ce1685e..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff -, m4 -}: - -mkDerivation { - path = "lib/libelf"; - extraPaths = [ - "contrib/elftoolchain/libelf" - "contrib/elftoolchain/common" - "sys/sys/elf32.h" - "sys/sys/elf64.h" - "sys/sys/elf_common.h" - ]; - BOOTSTRAPPING = !stdenv.isFreeBSD; - nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff - - m4 - ]; - MK_TESTS = "no"; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix new file mode 100644 index 0000000000..71d0c1e50d --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + mkDerivation, + freebsdSetupHook, + bsdSetupHook, + makeMinimal, +}: +mkDerivation { + path = "lib/libmd"; + extraPaths = [ + "sys/sys/md5.h" + "sys/crypto/sha2" + "sys/crypto/skein" + ]; + nativeBuildInputs = [ + makeMinimal + bsdSetupHook + freebsdSetupHook + ]; + + makeFlags = [ + "STRIP=-s" # flag to install, not command + "RELDIR=." + ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no"; + + preBuild = '' + mkdir sys + ''; + + installPhase = '' + # libmd is used by install. do it yourself! + mkdir -p $out/include $out/lib $man/share/man + cp libmd.a $out/lib/libmd.a + for f in $(make $makeFlags -V INCS); do + if [ -e "$f" ]; then cp "$f" "$out/include/$f"; fi + if [ -e "$BSDSRCDIR/sys/crypto/sha2/$f" ]; then cp "$BSDSRCDIR/sys/crypto/sha2/$f" "$out/include/$f"; fi + if [ -e "$BSDSRCDIR/sys/crypto/skein/$f" ]; then cp "$BSDSRCDIR/sys/crypto/skein/$f" "$out/include/$f"; fi + done + for f in $(make $makeFlags -V MAN); do + cp "$f" "$man/share/man/$f" + done + ''; + + outputs = [ + "out" + "man" + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix index 4011e4d8a6..82a9e14010 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix @@ -1,26 +1,28 @@ -{ lib, stdenv -, mkDerivation -, bsdSetupHook, freebsdSetupHook, makeMinimal, mandoc, groff -, boot-install, install -, compatIfNeeded +{ + lib, + stdenv, + mkDerivation, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + mandoc, + groff, + boot-install, + install, }: mkDerivation { path = "lib/libnetbsd"; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal mandoc groff - (if stdenv.hostPlatform == stdenv.buildPlatform - then boot-install - else install) - ]; - patches = lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ - ./libnetbsd-do-install.patch - #./libnetbsd-define-__va_list.patch + bsdSetupHook + freebsdSetupHook + makeMinimal + mandoc + groff + (if stdenv.hostPlatform == stdenv.buildPlatform then boot-install else install) ]; makeFlags = [ "STRIP=-s" # flag to install, not command "MK_WERROR=no" ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "INSTALL=boot-install"; - buildInputs = compatIfNeeded; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libsbuf.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libsbuf.nix index 719474dbb1..242492a3f2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libsbuf.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libsbuf.nix @@ -2,8 +2,6 @@ mkDerivation { path = "lib/libsbuf"; - extraPaths = [ - "sys/kern" - ]; + extraPaths = [ "sys/kern" ]; MK_TESTS = "no"; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix index da5445a09f..c444975549 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix @@ -3,19 +3,20 @@ mkDerivation { path = "cddl/lib/libspl"; extraPaths = [ - "sys/contrib/openzfs/lib/libspl" - "sys/contrib/openzfs/include" - "cddl/compat/opensolaris/include" + "sys/contrib/openzfs/include" + "sys/contrib/openzfs/lib/libspl" "sys/contrib/openzfs/module/icp/include" - "sys/modules/zfs" + "sys/modules/zfs/zfs_config.h" ]; - # nativeBuildInputs = [ - # bsdSetupHook freebsdSetupHook - # makeMinimal install mandoc groff - # flex byacc file2c - # ]; - # buildInputs = compatIfNeeded ++ [ libnv libsbuf ]; - meta.license = lib.licenses.cddl; + # Without a prefix it will try to put object files in nonexistant directories + preBuild = '' + export MAKEOBJDIRPREFIX=$TMP/obj + ''; + + meta = with lib; { + platform = platforms.freebsd; + license = licenses.cddl; + }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix index c420d0daf8..6df6fa740f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix @@ -1,7 +1,10 @@ -{ mkDerivation, lib, stdenv }: +{ + mkDerivation, + lib, + stdenv, +}: mkDerivation { path = "lib/libutil"; - extraPaths = ["lib/libc/gen"]; - clangFixup = true; + extraPaths = [ "lib/libc/gen" ]; MK_TESTS = "no"; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/lorder.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/lorder.nix index d1fd86ab5e..25e7f491a1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/lorder.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/lorder.nix @@ -1,8 +1,9 @@ -{ mkDerivation -, bsdSetupHook, freebsdSetupHook +{ + mkDerivation, + bsdSetupHook, + freebsdSetupHook, }: - -mkDerivation rec { +mkDerivation { path = "usr.bin/lorder"; noCC = true; dontBuild = true; @@ -13,8 +14,12 @@ mkDerivation rec { mv "lorder.1" "$man/share/man" ''; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook + bsdSetupHook + freebsdSetupHook + ]; + buildInputs = [ ]; + outputs = [ + "out" + "man" ]; - buildInputs = []; - outputs = [ "out" "man" ]; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/make.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/make.nix index fa1722cfec..ecf231c304 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/make.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/make.nix @@ -1,20 +1,25 @@ -{ lib, mkDerivation, stdenv }: +{ + lib, + mkDerivation, + stdenv, +}: mkDerivation { path = "contrib/bmake"; version = "9.2"; - postPatch = '' - # make needs this to pick up our sys make files - export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" + postPatch = + '' + # make needs this to pick up our sys make files + export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \ - --replace '-Wl,--fatal-warnings' "" \ - --replace '-Wl,--warn-shared-textrel' "" - ''; + '' + + lib.optionalString stdenv.isDarwin '' + substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \ + --replace '-Wl,--fatal-warnings' "" \ + --replace '-Wl,--warn-shared-textrel' "" + ''; postInstall = '' make -C $BSDSRCDIR/share/mk FILESDIR=$out/share/mk install ''; - extraPaths = [ "share/mk" ] - ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "tools/build/mk"; + extraPaths = [ "share/mk" ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "tools/build/mk"; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/makeMinimal.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/makeMinimal.nix index e6a8e38a4a..069e744748 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/makeMinimal.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/makeMinimal.nix @@ -1,25 +1,32 @@ -{ lib, stdenv, mkDerivation -, make -, bsdSetupHook, freebsdSetupHook +{ + lib, + stdenv, + mkDerivation, + make, + bsdSetupHook, + freebsdSetupHook, }: -mkDerivation rec { +mkDerivation { inherit (make) path; - buildInputs = []; + buildInputs = [ ]; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook + bsdSetupHook + freebsdSetupHook ]; skipIncludesPhase = true; - makeFlags = []; + makeFlags = [ ]; postPatch = '' patchShebangs configure ${make.postPatch} ''; + configureFlags = [ "--with-filemon=no" ]; + buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index 79428626b8..be195b3bc6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -1,78 +1,164 @@ -{ lib, stdenv, stdenvNoCC -, compatIfNeeded -, runCommand, rsync -, freebsd-lib -, source -, bsdSetupHook, freebsdSetupHook -, makeMinimal -, install, tsort, lorder, mandoc, groff +{ + lib, + stdenv, + stdenvNoCC, + versionData, + writeText, + patches, + compatIfNeeded, + freebsd-lib, + filterSource, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + mandoc, + groff, }: -lib.makeOverridable (attrs: let - stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; -in stdenv'.mkDerivation (rec { - pname = "${attrs.pname or (baseNameOf attrs.path)}-freebsd"; - inherit (freebsd-lib) version; - src = runCommand "${pname}-filtered-src" { - nativeBuildInputs = [ rsync ]; - } '' - for p in ${lib.concatStringsSep " " ([ attrs.path ] ++ attrs.extraPaths or [])}; do - set -x - path="$out/$p" - mkdir -p "$(dirname "$path")" - src_path="${source}/$p" - if [[ -d "$src_path" ]]; then src_path+=/; fi - rsync --chmod="+w" -r "$src_path" "$path" - set +x - done - ''; +lib.makeOverridable ( + attrs: + let + stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; + in + stdenv'.mkDerivation ( + rec { + inherit (freebsd-lib) version; + pname = "${attrs.pname or (baseNameOf attrs.path)}"; + src = filterSource { + inherit pname; + inherit (attrs) path; + extraPaths = attrs.extraPaths or [ ]; + }; - extraPaths = [ ]; + nativeBuildInputs = [ + bsdSetupHook + freebsdSetupHook + makeMinimal + install + tsort + lorder + mandoc + groff + ] ++ attrs.extraNativeBuildInputs or [ ]; + buildInputs = compatIfNeeded; - nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal - install tsort lorder mandoc groff #statHook - ]; - buildInputs = compatIfNeeded; + HOST_SH = stdenv'.shell; - HOST_SH = stdenv'.shell; + # Since STRIP below is the flag + STRIPBIN = "${stdenv.cc.bintools.targetPrefix}strip"; - # Since STRIP below is the flag - STRIPBIN = "${stdenv.cc.bintools.targetPrefix}strip"; + makeFlags = [ + "STRIP=-s" # flag to install, not command + ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no"; - makeFlags = [ - "STRIP=-s" # flag to install, not command - ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no"; + # amd64 not x86_64 for this on unlike NetBSD + MACHINE_ARCH = freebsd-lib.mkBsdArch stdenv'; - # amd64 not x86_64 for this on unlike NetBSD - MACHINE_ARCH = freebsd-lib.mkBsdArch stdenv'; + MACHINE = freebsd-lib.mkBsdArch stdenv'; - MACHINE = freebsd-lib.mkBsdArch stdenv'; + MACHINE_CPUARCH = MACHINE_ARCH; - MACHINE_CPUARCH = MACHINE_ARCH; + COMPONENT_PATH = attrs.path or null; - COMPONENT_PATH = attrs.path or null; + strictDeps = true; - strictDeps = true; - - meta = with lib; { - maintainers = with maintainers; [ ericson2314 ]; - platforms = platforms.unix; - license = licenses.bsd2; - }; -} // lib.optionalAttrs stdenv'.hasCC { - # TODO should CC wrapper set this? - CPP = "${stdenv'.cc.targetPrefix}cpp"; -} // lib.optionalAttrs stdenv'.isDarwin { - MKRELRO = "no"; -} // lib.optionalAttrs (stdenv'.cc.isClang or false) { - HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); -} // lib.optionalAttrs (stdenv'.cc.isGNU or false) { - HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); -} // lib.optionalAttrs (stdenv'.isx86_32) { - USE_SSP = "no"; -} // lib.optionalAttrs (attrs.headersOnly or false) { - installPhase = "includesPhase"; - dontBuild = true; -} // attrs)) + meta = + with lib; + { + maintainers = with maintainers; [ + rhelmot + artemist + ]; + platforms = platforms.unix; + license = licenses.bsd2; + } + // attrs.meta or { }; + } + // lib.optionalAttrs stdenv'.hasCC { + # TODO should CC wrapper set this? + CPP = "${stdenv'.cc.targetPrefix}cpp"; + } + // lib.optionalAttrs stdenv'.isDarwin { MKRELRO = "no"; } + // lib.optionalAttrs (stdenv'.cc.isClang or false) { + HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); + } + // lib.optionalAttrs (stdenv'.cc.isGNU or false) { + HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); + } + // lib.optionalAttrs (stdenv'.isx86_32) { USE_SSP = "no"; } + // lib.optionalAttrs (attrs.headersOnly or false) { + installPhase = "includesPhase"; + dontBuild = true; + } + // attrs + // lib.optionalAttrs (stdenv'.hasCC && stdenv'.cc.isClang or false && attrs.clangFixup or true) { + preBuild = + '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D_VA_LIST -D_VA_LIST_DECLARED -Dva_list=__builtin_va_list -D_SIZE_T_DECLARED -D_SIZE_T -Dsize_t=__SIZE_TYPE__ -D_WCHAR_T" + '' + + lib.optionalString (versionData.major == 13) '' + export NIX_LDFLAGS="$NIX_LDFLAGS --undefined-version" + '' + + (attrs.preBuild or ""); + } + // { + patches = + let + isDir = + file: + let + base = baseNameOf file; + type = (builtins.readDir (dirOf file)).${base} or null; + in + file == /. || type == "directory"; + consolidatePatches = + patches: + if (lib.isDerivation patches) then + [ patches ] + else if (builtins.isPath patches) then + (if (isDir patches) then (lib.filesystem.listFilesRecursive patches) else [ patches ]) + else if (builtins.isList patches) then + (lib.flatten (builtins.map consolidatePatches patches)) + else + throw "Bad patches - must be path or derivation or list thereof"; + consolidated = consolidatePatches patches; + splitPatch = + patchFile: + let + foldFunc = + a: b: + if (lib.strings.hasPrefix "--- " b) then + (a ++ [ [ b ] ]) + else + ((lib.lists.init a) ++ (lib.lists.singleton ((lib.lists.last a) ++ [ b ]))); + partitionedPatches' = lib.lists.foldl foldFunc [ [ ] ] ( + lib.strings.splitString "\n" (builtins.readFile patchFile) + ); + partitionedPatches = + if (builtins.length partitionedPatches' > 1) then + (lib.lists.drop 1 partitionedPatches') + else + (throw "${patchFile} does not seem to be a unified patch (diff -u). this is required for FreeBSD."); + filterFunc = + patchLines: + let + prefixedPath = builtins.elemAt (builtins.split " |\t" (builtins.elemAt patchLines 1)) 2; + unfixedPath = lib.path.subpath.join (lib.lists.drop 1 (lib.path.subpath.components prefixedPath)); + in + lib.lists.any (included: lib.path.hasPrefix (/. + ("/" + included)) (/. + ("/" + unfixedPath))) ( + (attrs.extraPaths or [ ]) ++ [ attrs.path ] + ); + filteredLines = builtins.filter filterFunc partitionedPatches; + derive = patchLines: writeText "freebsd-patch" (lib.concatLines patchLines); + derivedPatches = builtins.map derive filteredLines; + in + derivedPatches; + picked = lib.lists.concatMap splitPatch consolidated; + in + picked ++ attrs.patches or [ ]; + } + ) +) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkcsmapper.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkcsmapper.nix new file mode 100644 index 0000000000..60cef34744 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkcsmapper.nix @@ -0,0 +1,22 @@ +{ + stdenv, + mkDerivation, + byacc, + flex, +}: + +mkDerivation { + path = "usr.bin/mkcsmapper"; + + extraPaths = [ + "lib/libc/iconv" + "lib/libiconv_modules/mapper_std" + ]; + + BOOTSTRAPPING = !stdenv.hostPlatform.isFreeBSD; + + extraNativeBuildInputs = [ + byacc + flex + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkesdb.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkesdb.nix new file mode 100644 index 0000000000..a503af529f --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkesdb.nix @@ -0,0 +1,19 @@ +{ + stdenv, + mkDerivation, + byacc, + flex, +}: + +mkDerivation { + path = "usr.bin/mkesdb"; + + extraPaths = [ "lib/libc/iconv" ]; + + BOOTSTRAPPING = !stdenv.hostPlatform.isFreeBSD; + + extraNativeBuildInputs = [ + byacc + flex + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mknod.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mknod.nix index 56dff7d606..bf7d8b7db6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mknod.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mknod.nix @@ -1,5 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "sbin/mknod"; -} +mkDerivation { path = "sbin/mknod"; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix index 23a4672069..bbcaff3a1c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix @@ -1,6 +1,39 @@ -{ mkDerivation, mknod }: +{ + lib, + stdenv, + mkDerivation, + compatIfNeeded, + compatIsNeeded, + libmd, + libnetbsd, + libutil, +}: mkDerivation { path = "contrib/mtree"; - extraPaths = [ mknod.path ]; + extraPaths = [ "contrib/mknod" ]; + buildInputs = + compatIfNeeded + ++ [ + libmd + libnetbsd + ] + ++ lib.optional (stdenv.isFreeBSD) libutil; + + postPatch = '' + ln -s $BSDSRCDIR/contrib/mknod/*.c $BSDSRCDIR/contrib/mknod/*.h $BSDSRCDIR/contrib/mtree + ''; + + preBuild = '' + export NIX_LDFLAGS="$NIX_LDFLAGS ${ + toString ( + [ + "-lmd" + "-lnetbsd" + ] + ++ lib.optional compatIsNeeded "-legacy" + ++ lib.optional stdenv.isFreeBSD "-lutil" + ) + }" + ''; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix index 56141255af..e187cacbb0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix @@ -1,6 +1,11 @@ -{ lib, mkDerivation, stdenv }: +{ + lib, + mkDerivation, + stdenv, + patchesRoot, +}: -mkDerivation rec { +mkDerivation { path = "usr.bin/rpcgen"; patches = lib.optionals (stdenv.hostPlatform.libc == "glibc") [ # `WUNTRACED` is defined privately `bits/waitflags.h` in glibc. @@ -12,7 +17,7 @@ mkDerivation rec { # those headers ends up included other headers...which ends up # including the other one, this means by the first time we reach # `#include ``, both `_SYS_WAIT_H` and - # `_STDLIB_H` are already defined! Thus, we never ned up including + # `_STDLIB_H` are already defined! Thus, we never end up including # `` and defining `WUNTRACED`. # # This hacks around this by manually including `WUNTRACED` until diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sed.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sed.nix index 07b55afe13..ec5bfee17d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sed.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sed.nix @@ -1,7 +1,6 @@ -{ mkDerivation, source }: +{ mkDerivation }: mkDerivation { path = "usr.bin/sed"; - TESTSRC = "${source}/contrib/netbsd-tests"; MK_TESTS = "no"; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/source.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/source.nix index 5e31f900e8..c14d265590 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/source.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/source.nix @@ -4,7 +4,6 @@ # If you want you could fetchgit from "https://git.FreeBSD.org/src.git" instead. # The update script still pulls directly from git.freebsd.org fetchFromGitHub { - name = "src"; # Want to rename this next rebuild owner = "freebsd"; repo = "freebsd-src"; inherit (sourceData) rev hash; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/stat.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/stat.nix index c730f00869..a801ab8954 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/stat.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/stat.nix @@ -1,13 +1,22 @@ -{ mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff +{ + mkDerivation, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + mandoc, + groff, }: # Don't add this to nativeBuildInputs directly. Use statHook instead. mkDerivation { path = "usr.bin/stat"; nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff + bsdSetupHook + freebsdSetupHook + makeMinimal + install + mandoc + groff ]; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/statHook.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/statHook.nix index 07129938b0..4609c004e6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/statHook.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/statHook.nix @@ -1,12 +1,16 @@ -{ makeSetupHook, writeText, stat }: +{ + makeSetupHook, + writeText, + stat, +}: # stat isn't in POSIX, and NetBSD stat supports a completely # different range of flags than GNU stat, so including it in PATH # breaks stdenv. Work around that with a hook that will point # NetBSD's build system and NetBSD stat without including it in # PATH. -makeSetupHook { - name = "netbsd-stat-hook"; -} (writeText "netbsd-stat-hook-impl" '' - makeFlagsArray+=(TOOL_STAT=${stat}/bin/stat) -'') +makeSetupHook { name = "netbsd-stat-hook"; } ( + writeText "netbsd-stat-hook-impl" '' + makeFlagsArray+=(TOOL_STAT=${stat}/bin/stat) + '' +) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix index 81cf4114e8..86f847cbd4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix @@ -1,67 +1,85 @@ -{ lib, stdenv, mkDerivation, freebsd-lib -, buildPackages -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff -, config, rpcgen, file2c, gawk, uudecode, xargs-j #, ctfconvert +{ + stdenv, + mkDerivation, + freebsd-lib, + buildPackages, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + config, + rpcgen, + file2c, + gawk, + uudecode, + xargs-j, }: -mkDerivation (let - cfg = "MINIMAL"; -in rec { - path = "sys"; +mkDerivation ( + let + cfg = "MINIMAL"; + in + rec { + path = "sys"; - nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff + nativeBuildInputs = [ + bsdSetupHook + freebsdSetupHook + makeMinimal + install + mandoc + groff - config rpcgen file2c gawk uudecode xargs-j - #ctfconvert - ]; + config + rpcgen + file2c + gawk + uudecode + xargs-j + ]; - patches = [ - ./sys-gnu-date.patch - ./sys-no-explicit-intrinsics-dep.patch - ]; + # --dynamic-linker /red/herring is used when building the kernel. + NIX_ENFORCE_PURITY = 0; - # --dynamic-linker /red/herring is used when building the kernel. - NIX_ENFORCE_PURITY = 0; + AWK = "${buildPackages.gawk}/bin/awk"; - AWK = "${buildPackages.gawk}/bin/awk"; + CWARNEXTRA = "-Wno-error=shift-negative-value -Wno-address-of-packed-member"; - CWARNEXTRA = "-Wno-error=shift-negative-value -Wno-address-of-packed-member"; + MK_CTF = "no"; - MK_CTF = "no"; + KODIR = "${builtins.placeholder "out"}/kernel"; + KMODDIR = "${builtins.placeholder "out"}/kernel"; + DTBDIR = "${builtins.placeholder "out"}/dbt"; - KODIR = "${builtins.placeholder "out"}/kernel"; - KMODDIR = "${builtins.placeholder "out"}/kernel"; - DTBDIR = "${builtins.placeholder"out"}/dbt"; + KERN_DEBUGDIR = "${builtins.placeholder "out"}/debug"; + KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel"; + KERN_DEBUGDIR_KMODDIR = "${KERN_DEBUGDIR}/kernel"; - KERN_DEBUGDIR = "${builtins.placeholder "out"}/debug"; - KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel"; - KERN_DEBUGDIR_KMODDIR = "${KERN_DEBUGDIR}/kernel"; + skipIncludesPhase = true; - skipIncludesPhase = true; + configurePhase = '' + runHook preConfigure - configurePhase = '' - runHook preConfigure + for f in conf/kmod.mk contrib/dev/acpica/acpica_prep.sh; do + substituteInPlace "$f" --replace 'xargs -J' 'xargs-j ' + done - for f in conf/kmod.mk contrib/dev/acpica/acpica_prep.sh; do - substituteInPlace "$f" --replace 'xargs -J' 'xargs-j ' - done + for f in conf/*.mk; do + substituteInPlace "$f" --replace 'KERN_DEBUGDIR}''${' 'KERN_DEBUGDIR_' + done - for f in conf/*.mk; do - substituteInPlace "$f" --replace 'KERN_DEBUGDIR}''${' 'KERN_DEBUGDIR_' - done + cd ${freebsd-lib.mkBsdArch stdenv}/conf + sed -i ${cfg} \ + -e 's/WITH_CTF=1/WITH_CTF=0/' \ + -e '/KDTRACE/d' + config ${cfg} - cd ${freebsd-lib.mkBsdArch stdenv}/conf - sed -i ${cfg} \ - -e 's/WITH_CTF=1/WITH_CTF=0/' \ - -e '/KDTRACE/d' - config ${cfg} - - runHook postConfigure - ''; - preBuild = '' - cd ../compile/${cfg} - ''; -}) + runHook postConfigure + ''; + preBuild = '' + cd ../compile/${cfg} + ''; + } +) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix index cdc1b27ce8..04a45ff980 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix @@ -1,12 +1,28 @@ -{ mkDerivation -, bsdSetupHook, freebsdSetupHook -, makeMinimal, install, mandoc, groff +{ + lib, + mkDerivation, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + mandoc, + groff, }: mkDerivation { path = "usr.bin/tsort"; - nativeBuildInputs = [ - bsdSetupHook freebsdSetupHook - makeMinimal install mandoc groff + extraPaths = [ ]; + outputs = [ "out" ]; + MK_TESTS = "no"; + makeFlags = [ + "STRIP=-s" # flag to install, not command + ]; + nativeBuildInputs = [ + bsdSetupHook + freebsdSetupHook + makeMinimal + install + mandoc + groff ]; } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/update.py b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/update.py index cd20f67148..533a871a4b 100755 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/update.py +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/update.py @@ -16,6 +16,7 @@ import typing import urllib.request _QUERY_VERSION_PATTERN = re.compile('^([A-Z]+)="(.+)"$') +_RELEASE_PATCH_PATTERN = re.compile('^RELEASE-p([0-9]+)$') BASE_DIR = os.path.dirname(os.path.abspath(__file__)) MIN_VERSION = packaging.version.Version("13.0.0") MAIN_BRANCH = "main" @@ -60,7 +61,16 @@ def query_version(repo: git.Repo) -> dict[str, typing.Any]: continue fields[m[1].lower()] = m[2] - fields["major"] = packaging.version.parse(fields["revision"]).major + parsed = packaging.version.parse(fields["revision"]) + fields["major"] = parsed.major + fields["minor"] = parsed.minor + + # Extract the patch number from `RELAESE-p`, which is used + # e.g. in the "releng" branches. + m = _RELEASE_PATCH_PATTERN.match(fields["branch"]) + if m is not None: + fields["patch"] = m[1] + return fields @@ -95,7 +105,7 @@ def handle_commit( "ref": ref_name, "refType": ref_type, "supported": ref_name in supported_refs, - "version": query_version(repo), + "version": version, } @@ -151,6 +161,14 @@ def main() -> None: result = handle_commit( repo, tag.commit, tag.name, "tag", supported_refs, old_versions ) + + # Hack in the patch version from parsing the tag, if we didn't + # get one from the "branch" field (from newvers). This is + # probably 0. + versionObj = result["version"] + if "patch" not in versionObj: + versionObj["patch"] = version.micro + versions[tag.name] = result for branch in repo.remote("origin").refs: diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/versions.json b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/versions.json index 736c4c3a3e..3f781b4eea 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/versions.json +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/versions.json @@ -1,14 +1,15 @@ { "main": { - "hash": "sha256-C5ucT9BK/eK8a9HNSDDi8S1uhpPmiqV22XEooxAqbPw=", + "hash": "sha256-3aUsD2yRqVvb12z2XPmhE5/u4d9bqyD2ZHH3xNmwYwU=", "ref": "main", "refType": "branch", - "rev": "125c4560bc70971b950d035cfcd2255b89984011", + "rev": "aa34b1d20e44141749ffdecf16908fc1e5db4db6", "supported": false, "version": { "branch": "CURRENT", "major": 15, - "reldate": "1500017", + "minor": 0, + "reldate": "1500018", "release": "15.0-CURRENT", "revision": "15.0", "type": "FreeBSD", @@ -24,6 +25,8 @@ "version": { "branch": "RELEASE", "major": 13, + "minor": 0, + "patch": 0, "reldate": "1300139", "release": "13.0-RELEASE", "revision": "13.0", @@ -40,6 +43,8 @@ "version": { "branch": "RELEASE", "major": 13, + "minor": 1, + "patch": 0, "reldate": "1301000", "release": "13.1-RELEASE", "revision": "13.1", @@ -56,6 +61,8 @@ "version": { "branch": "RELEASE", "major": 13, + "minor": 2, + "patch": 0, "reldate": "1302001", "release": "13.2-RELEASE", "revision": "13.2", @@ -72,6 +79,8 @@ "version": { "branch": "RELEASE", "major": 13, + "minor": 3, + "patch": 0, "reldate": "1303001", "release": "13.3-RELEASE", "revision": "13.3", @@ -88,6 +97,8 @@ "version": { "branch": "RELEASE", "major": 14, + "minor": 0, + "patch": 0, "reldate": "1400097", "release": "14.0-RELEASE", "revision": "14.0", @@ -104,6 +115,8 @@ "version": { "branch": "RELEASE-p13", "major": 13, + "minor": 0, + "patch": "13", "reldate": "1300139", "release": "13.0-RELEASE-p13", "revision": "13.0", @@ -120,6 +133,8 @@ "version": { "branch": "RELEASE-p9", "major": 13, + "minor": 1, + "patch": "9", "reldate": "1301000", "release": "13.1-RELEASE-p9", "revision": "13.1", @@ -136,6 +151,8 @@ "version": { "branch": "RELEASE-p11", "major": 13, + "minor": 2, + "patch": "11", "reldate": "1302001", "release": "13.2-RELEASE-p11", "revision": "13.2", @@ -144,19 +161,21 @@ } }, "releng/13.3": { - "hash": "sha256-huzUiMZHfyK/mgLD3hW+DaSGgAaTUIuM51xDp+IE3qE=", + "hash": "sha256-g3i9q9XihesdfQxGy3oC7IMGtbWaLNwFlNzbdvS/4ng=", "ref": "releng/13.3", "refType": "branch", - "rev": "7a0d63c9093222938f26cd63ff742e555168de77", + "rev": "be4f1894ef399f421bab451e8cf8557e27e5a948", "supported": true, "version": { - "branch": "RELEASE-p1", + "branch": "RELEASE-p2", "major": 13, + "minor": 3, + "patch": "2", "reldate": "1303001", - "release": "13.3-RELEASE-p1", + "release": "13.3-RELEASE-p2", "revision": "13.3", "type": "FreeBSD", - "version": "FreeBSD 13.3-RELEASE-p1" + "version": "FreeBSD 13.3-RELEASE-p2" } }, "releng/14.0": { @@ -168,6 +187,8 @@ "version": { "branch": "RELEASE-p6", "major": 14, + "minor": 0, + "patch": "6", "reldate": "1400097", "release": "14.0-RELEASE-p6", "revision": "14.0", @@ -176,15 +197,16 @@ } }, "stable/13": { - "hash": "sha256-XateLKKs2A/HCP9Lx/nBm1cybB3otrbeXQvyCL40S0M=", + "hash": "sha256-ItC8haDdxMSZt1thpCrn8p0xxvs7Uqh/uNo1OwMalj8=", "ref": "stable/13", "refType": "branch", - "rev": "e0a58ef24a3baf5ed4cc09a798b9fe2d85408052", + "rev": "825cb4c850f2b97cfd1b24ed421d7938bf37eee7", "supported": true, "version": { "branch": "STABLE", "major": 13, - "reldate": "1303502", + "minor": 3, + "reldate": "1303503", "release": "13.3-STABLE", "revision": "13.3", "type": "FreeBSD", @@ -192,19 +214,20 @@ } }, "stable/14": { - "hash": "sha256-tIKnK/SYBDk9UnE5AfhjeDpqHnzspYbor0678ye/mrs=", + "hash": "sha256-iAj75IXJi4Oium6BqFvsyQipDP2crBZIGg0Dac8Zf1g=", "ref": "stable/14", "refType": "branch", - "rev": "ab872ab0bf195e872ed8d955aab3b2a537a230cd", + "rev": "a3b8266f5420601e231bc08c5402d9a4929fbdc0", "supported": true, "version": { - "branch": "STABLE", + "branch": "PRERELEASE", "major": 14, - "reldate": "1400510", - "release": "14.0-STABLE", - "revision": "14.0", + "minor": 1, + "reldate": "1400511", + "release": "14.1-PRERELEASE", + "revision": "14.1", "type": "FreeBSD", - "version": "FreeBSD 14.0-STABLE" + "version": "FreeBSD 14.1-PRERELEASE" } } } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix index 79d46732bd..e0d0310896 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,1028 +1,187 @@ -{ stdenv, lib, stdenvNoCC -, makeScopeWithSplicing', generateSplicesForMkScope -, buildPackages -, bsdSetupHook, makeSetupHook, fetchcvs, groff, mandoc, byacc, flex -, zlib -, writeShellScript, writeText, runtimeShell, symlinkJoin +{ + stdenv, + lib, + stdenvNoCC, + makeScopeWithSplicing', + generateSplicesForMkScope, + buildPackages, + fetchcvs, }: -let - inherit (buildPackages.buildPackages) rsync; - - fetchNetBSD = path: version: sha256: fetchcvs { - cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; - module = "src/${path}"; - inherit sha256; - tag = "netbsd-${lib.replaceStrings ["."] ["-"] version}-RELEASE"; - }; - - netbsdSetupHook = makeSetupHook { - name = "netbsd-setup-hook"; - } ./setup-hook.sh; - - defaultMakeFlags = [ - "MKSOFTFLOAT=${if stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft" - then "yes" - else "no"}" - ]; - -in makeScopeWithSplicing' { +makeScopeWithSplicing' { otherSplices = generateSplicesForMkScope "netbsd"; - f = (self: let - inherit (self) mkDerivation; - in { - - # Why do we have splicing and yet do `nativeBuildInputs = with self; ...`? - # - # We use `makeScopeWithSplicing'` because this should be used for all - # nested package sets which support cross, so the inner `callPackage` works - # correctly. But for the inline packages we don't bother to use - # `callPackage`. - # - # We still could have tried to `with` a big spliced packages set, but - # splicing is jank and causes a number of bootstrapping infinite recursions - # if one is not careful. Pulling deps out of the right package set directly - # side-steps splicing entirely and avoids those footguns. - # - # For non-bootstrap-critical packages, we might as well use `callPackage` for - # consistency with everything else, and maybe put in separate files too. - - compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isNetBSD) self.compat; - - mkDerivation = lib.makeOverridable (attrs: let - stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; - in stdenv'.mkDerivation ({ - pname = "${attrs.pname or (baseNameOf attrs.path)}-netbsd"; - inherit (attrs) version; - src = fetchNetBSD attrs.path attrs.version attrs.sha256; - - extraPaths = [ ]; - - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal - install tsort lorder buildPackages.mandoc groff statHook rsync - ]; - buildInputs = with self; compatIfNeeded; - - HOST_SH = stdenv'.shell; - - MACHINE_ARCH = { - i486 = "i386"; - i586 = "i386"; - i686 = "i386"; - }.${stdenv'.hostPlatform.parsed.cpu.name} - or stdenv'.hostPlatform.parsed.cpu.name; - - MACHINE = { - x86_64 = "amd64"; - aarch64 = "evbarm64"; - i486 = "i386"; - i586 = "i386"; - i686 = "i386"; - }.${stdenv'.hostPlatform.parsed.cpu.name} - or stdenv'.hostPlatform.parsed.cpu.name; - - COMPONENT_PATH = attrs.path; - - makeFlags = defaultMakeFlags; - - strictDeps = true; - - meta = with lib; { - maintainers = with maintainers; [ matthewbauer qyliss ]; - platforms = platforms.unix; - license = licenses.bsd2; - }; - - } // lib.optionalAttrs stdenv'.hasCC { - # TODO should CC wrapper set this? - CPP = "${stdenv'.cc.targetPrefix}cpp"; - } // lib.optionalAttrs stdenv'.isDarwin { - MKRELRO = "no"; - } // lib.optionalAttrs (stdenv'.cc.isClang or false) { - HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); - } // lib.optionalAttrs (stdenv'.cc.isGNU or false) { - HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); - } // lib.optionalAttrs (stdenv'.isx86_32) { - USE_SSP = "no"; - } // lib.optionalAttrs (attrs.headersOnly or false) { - installPhase = "includesPhase"; - dontBuild = true; - } // attrs // { - # Files that use NetBSD-specific macros need to have nbtool_config.h - # included ahead of them on non-NetBSD platforms. - postPatch = lib.optionalString (!stdenv'.hostPlatform.isNetBSD) '' - set +e - grep -Zlr "^__RCSID - ^__BEGIN_DECLS" $COMPONENT_PATH | xargs -0r grep -FLZ nbtool_config.h | - xargs -0tr sed -i '0,/^#/s//#include \n\0/' - set -e - '' + attrs.postPatch or ""; - })); - - ## - ## START BOOTSTRAPPING - ## - makeMinimal = mkDerivation { - path = "tools/make"; - sha256 = "0fh0nrnk18m613m5blrliq2aydciv51qhc0ihsj4k63incwbk90n"; - version = "9.2"; - - buildInputs = with self; []; - nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook netbsdSetupHook rsync ]; - - skipIncludesPhase = true; - - postPatch = '' - patchShebangs $COMPONENT_PATH/configure - ${self.make.postPatch} - ''; - - buildPhase = '' - runHook preBuild - - sh ./buildmake.sh - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -D nbmake $out/bin/nbmake - ln -s $out/bin/nbmake $out/bin/make - mkdir -p $out/share - cp -r $BSDSRCDIR/share/mk $out/share/mk - - runHook postInstall - ''; - - extraPaths = with self; [ make.src ] ++ make.extraPaths; - }; - - compat = mkDerivation (let - version = "9.2"; - commonDeps = [ zlib ]; - in { - path = "tools/compat"; - sha256 = "1vsxg7136nlhc72vpa664vs22874xh7ila95nkmsd8crn3z3cyn0"; - inherit version; - - setupHooks = [ - ../../../build-support/setup-hooks/role.bash - ./compat-setup-hook.sh - ]; - - preConfigure = '' - make include/.stamp configure nbtool_config.h.in defs.mk.in - ''; - - configurePlatforms = [ "build" "host" ]; - configureFlags = [ - "--cache-file=config.cache" - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - # We include this header in our musl package only for legacy - # compatibility, and compat works fine without it (and having it - # know about sys/cdefs.h breaks packages like glib when built - # statically). - "ac_cv_header_sys_cdefs_h=no" - ]; - - nativeBuildInputs = with buildPackages.netbsd; commonDeps ++ [ - bsdSetupHook netbsdSetupHook - makeMinimal - rsync - ]; - - buildInputs = with self; commonDeps; - - # temporarily use gnuinstall for bootstrapping - # bsdinstall will be built later - makeFlags = defaultMakeFlags ++ [ - "INSTALL=${buildPackages.coreutils}/bin/install" - "DATADIR=$(out)/share" - # Can't sort object files yet - "LORDER=echo" - "TSORT=cat" - # Can't process man pages yet - "MKSHARE=no" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # GNU objcopy produces broken .a libs which won't link into dependers. - # Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here. - "OBJCOPY=${buildPackages.darwin.cctools-port}/bin/strip" - ]; - RENAME = "-D"; - - passthru.tests = { netbsd-install = self.install; }; - - patches = [ - ./compat-cxx-safe-header.patch - ./compat-dont-configure-twice.patch - ./compat-no-force-native.patch - ]; - - preInstall = '' - makeFlagsArray+=('INSTALL_FILE=''${INSTALL} ''${COPY} ''${PRESERVE} ''${RENAME}') - makeFlagsArray+=('INSTALL_DIR=''${INSTALL} -d') - makeFlagsArray+=('INSTALL_SYMLINK=''${INSTALL} ''${SYMLINK} ''${RENAME}') - ''; - - postInstall = '' - # why aren't these installed by netbsd? - install -D compat_defs.h $out/include/compat_defs.h - install -D $BSDSRCDIR/include/cdbw.h $out/include/cdbw.h - install -D $BSDSRCDIR/sys/sys/cdbr.h $out/include/cdbr.h - install -D $BSDSRCDIR/sys/sys/featuretest.h \ - $out/include/sys/featuretest.h - install -D $BSDSRCDIR/sys/sys/md5.h $out/include/md5.h - install -D $BSDSRCDIR/sys/sys/rmd160.h $out/include/rmd160.h - install -D $BSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h - install -D $BSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h - install -D $BSDSRCDIR/sys/sys/queue.h $out/include/sys/queue.h - install -D $BSDSRCDIR/include/vis.h $out/include/vis.h - install -D $BSDSRCDIR/include/db.h $out/include/db.h - install -D $BSDSRCDIR/include/netconfig.h $out/include/netconfig.h - install -D $BSDSRCDIR/include/utmpx.h $out/include/utmpx.h - install -D $BSDSRCDIR/include/tzfile.h $out/include/tzfile.h - install -D $BSDSRCDIR/sys/sys/tree.h $out/include/sys/tree.h - install -D $BSDSRCDIR/include/nl_types.h $out/include/nl_types.h - install -D $BSDSRCDIR/include/stringlist.h $out/include/stringlist.h - - # Collapse includes slightly to fix dangling reference - install -D $BSDSRCDIR/common/include/rpc/types.h $out/include/rpc/types.h - sed -i '1s;^;#include "nbtool_config.h"\n;' $out/include/rpc/types.h - '' + lib.optionalString stdenv.isDarwin '' - mkdir -p $out/include/ssp - touch $out/include/ssp/ssp.h - '' + '' - mkdir -p $out/lib/pkgconfig - substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \ - --subst-var-by out $out \ - --subst-var-by version ${version} - ''; - extraPaths = with self; [ include.src libc.src libutil.src - (fetchNetBSD "external/bsd/flex" "9.2" "0h98jpfj7vx5zh7vd7bk6b1hmzgkcb757a8j6d9zgygxxv13v43m") - (fetchNetBSD "sys/sys" "9.2" "0zawhw51klaigqqwkx0lzrx3mim2jywrc24cm7c66qsf1im9awgd") - (fetchNetBSD "common/include/rpc/types.h" "9.2" "0n2df12mlc3cbc48jxq35yzl1y7ghgpykvy7jnfh898rdhac7m9a") - ] ++ libutil.extraPaths ++ _mainLibcExtraPaths; - }); - - # HACK: to ensure parent directories exist. This emulates GNU - # install’s -D option. No alternative seems to exist in BSD install. - install = let binstall = writeShellScript "binstall" '' - set -eu - for last in "$@"; do true; done - mkdir -p $(dirname $last) - @out@/bin/xinstall "$@" - ''; in mkDerivation { - path = "usr.bin/xinstall"; - version = "9.2"; - sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; - extraPaths = with self; [ mtree.src make.src ]; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal - mandoc groff rsync - ]; - skipIncludesPhase = true; - buildInputs = with self; compatIfNeeded - # fts header is needed. glibc already has this header, but musl doesn't, - # so make sure pkgsMusl.netbsd.install still builds in case you want to - # remove it! - ++ [ fts ]; - installPhase = '' - runHook preInstall - - install -D install.1 $out/share/man/man1/install.1 - install -D xinstall $out/bin/xinstall - install -D -m 0550 ${binstall} $out/bin/binstall - substituteInPlace $out/bin/binstall --subst-var out - ln -s $out/bin/binstall $out/bin/install - - runHook postInstall - ''; - setupHook = ./install-setup-hook.sh; - }; - - fts = mkDerivation { - pname = "fts"; - path = "include/fts.h"; - sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; - version = "9.2"; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook rsync - ]; - propagatedBuildInputs = with self; compatIfNeeded; - extraPaths = with self; [ - (fetchNetBSD "lib/libc/gen/fts.c" "9.2" "1a8hmf26242nmv05ipn3ircxb0jqmmi66rh78kkyi9vjwkfl3qn7") - (fetchNetBSD "lib/libc/include/namespace.h" "9.2" "0kksr3pdwdc1cplqf5z12ih4cml6l11lqrz91f7hjjm64y7785kc") - (fetchNetBSD "lib/libc/gen/fts.3" "9.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") - ]; - skipIncludesPhase = true; - buildPhase = '' - "$CC" -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \ - -o lib/libc/gen/fts.o - "$AR" -rsc libfts.a lib/libc/gen/fts.o - ''; - installPhase = '' - runHook preInstall - - install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3 - install -D include/fts.h $out/include/fts.h - install -D lib/libc/include/namespace.h $out/include/namespace.h - install -D libfts.a $out/lib/libfts.a - - runHook postInstall - ''; - setupHooks = [ - ../../../build-support/setup-hooks/role.bash - ./fts-setup-hook.sh - ]; - }; - - # Don't add this to nativeBuildInputs directly. Use statHook instead. - stat = mkDerivation { - path = "usr.bin/stat"; - version = "9.2"; - sha256 = "18nqwlndfc34qbbgqx5nffil37jfq9aw663ippasfxd2hlyc106x"; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal - install mandoc groff rsync - ]; - }; - - # stat isn't in POSIX, and NetBSD stat supports a completely - # different range of flags than GNU stat, so including it in PATH - # breaks stdenv. Work around that with a hook that will point - # NetBSD's build system and NetBSD stat without including it in - # PATH. - statHook = makeSetupHook { - name = "netbsd-stat-hook"; - } (writeText "netbsd-stat-hook-impl" '' - makeFlagsArray+=(TOOL_STAT=${self.stat}/bin/stat) - ''); - - tsort = mkDerivation { - path = "usr.bin/tsort"; - version = "9.2"; - sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal - install mandoc groff rsync - ]; - }; - - lorder = mkDerivation { - path = "usr.bin/lorder"; - version = "9.2"; - sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal - install mandoc groff rsync - ]; - }; - - ## - ## END BOOTSTRAPPING - ## - - ## - ## START COMMAND LINE TOOLS - ## - make = mkDerivation { - path = "usr.bin/make"; - sha256 = "0vi73yicbmbp522qzqvd979cx6zm5jakhy77xh73c1kygf8klccs"; - version = "9.2"; - - postPatch = '' - substituteInPlace $BSDSRCDIR/share/mk/bsd.doc.mk \ - --replace '-o ''${DOCOWN}' "" \ - --replace '-g ''${DOCGRP}' "" - for mk in $BSDSRCDIR/share/mk/bsd.inc.mk $BSDSRCDIR/share/mk/bsd.kinc.mk; do - substituteInPlace $mk \ - --replace '-o ''${BINOWN}' "" \ - --replace '-g ''${BINGRP}' "" - done - substituteInPlace $BSDSRCDIR/share/mk/bsd.kmodule.mk \ - --replace '-o ''${KMODULEOWN}' "" \ - --replace '-g ''${KMODULEGRP}' "" - substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '-o ''${LIBOWN}' "" \ - --replace '-g ''${LIBGRP}' "" \ - --replace '-o ''${DEBUGOWN}' "" \ - --replace '-g ''${DEBUGGRP}' "" - substituteInPlace $BSDSRCDIR/share/mk/bsd.lua.mk \ - --replace '-o ''${LIBOWN}' "" \ - --replace '-g ''${LIBGRP}' "" - substituteInPlace $BSDSRCDIR/share/mk/bsd.man.mk \ - --replace '-o ''${MANOWN}' "" \ - --replace '-g ''${MANGRP}' "" - substituteInPlace $BSDSRCDIR/share/mk/bsd.nls.mk \ - --replace '-o ''${NLSOWN}' "" \ - --replace '-g ''${NLSGRP}' "" - substituteInPlace $BSDSRCDIR/share/mk/bsd.prog.mk \ - --replace '-o ''${BINOWN}' "" \ - --replace '-g ''${BINGRP}' "" \ - --replace '-o ''${RUMPBINOWN}' "" \ - --replace '-g ''${RUMPBINGRP}' "" \ - --replace '-o ''${DEBUGOWN}' "" \ - --replace '-g ''${DEBUGGRP}' "" - - # make needs this to pick up our sys make files - export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" - - substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' - substituteInPlace $BSDSRCDIR/share/mk/bsd.kinc.mk \ - --replace /bin/rm rm - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \ - --replace '-Wl,--fatal-warnings' "" \ - --replace '-Wl,--warn-shared-textrel' "" - ''; - postInstall = '' - make -C $BSDSRCDIR/share/mk FILESDIR=$out/share/mk install - ''; - extraPaths = [ - (fetchNetBSD "share/mk" "9.2" "0w9x77cfnm6zwy40slradzi0ip9gz80x6lk7pvnlxzsr2m5ra5sy") - ]; - }; - - mtree = mkDerivation { - path = "usr.sbin/mtree"; - version = "9.2"; - sha256 = "04p7w540vz9npvyb8g8hcf2xa05phn1y88hsyrcz3vwanvpc0yv9"; - extraPaths = with self; [ mknod.src ]; - }; - - mknod = mkDerivation { - path = "sbin/mknod"; - version = "9.2"; - sha256 = "1d9369shzwgixz3nph991i8q5vk7hr04py3n9avbfbhzy4gndqs2"; - }; - - getent = mkDerivation { - path = "usr.bin/getent"; - sha256 = "1qngywcmm0y7nl8h3n8brvkxq4jw63szbci3kc1q6a6ndhycbbvr"; - version = "9.2"; - patches = [ ./getent.patch ]; - }; - - getconf = mkDerivation { - path = "usr.bin/getconf"; - sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q"; - version = "9.2"; - }; - - locale = mkDerivation { - path = "usr.bin/locale"; - version = "9.2"; - sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; - patches = [ ./locale.patch ]; - env.NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; - }; - - rpcgen = mkDerivation { - path = "usr.bin/rpcgen"; - version = "9.2"; - sha256 = "1kfgfx54jg98wbg0d95p0rvf4w0302v8fz724b0bdackdsrd4988"; - }; - - genassym = mkDerivation { - path = "usr.bin/genassym"; - version = "9.2"; - sha256 = "1acl1dz5kvh9h5806vkz2ap95rdsz7phmynh5i3x5y7agbki030c"; - }; - - gencat = mkDerivation { - path = "usr.bin/gencat"; - version = "9.2"; - sha256 = "0gd463x1hg36bhr7y0xryb5jyxk0z0g7xvy8rgk82nlbnlnsbbwb"; - }; - - nbperf = mkDerivation { - path = "usr.bin/nbperf"; - version = "9.2"; - sha256 = "1nxc302vgmjhm3yqdivqyfzslrg0vjpbss44s74rcryrl19mma9r"; - }; - - tic = mkDerivation { - path = "tools/tic"; - version = "9.2"; - sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; - HOSTPROG = "tic"; - buildInputs = with self; compatIfNeeded; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal - install mandoc groff nbperf rsync - ]; - makeFlags = defaultMakeFlags ++ [ "TOOLDIR=$(out)" ]; - extraPaths = with self; [ - libterminfo.src - (fetchNetBSD "usr.bin/tic" "9.2" "1mwdfg7yx1g43ss378qsgl5rqhsxskqvsd2mqvrn38qw54i8v5i1") - (fetchNetBSD "tools/Makefile.host" "9.2" "15b4ab0n36lqj00j5lz2xs83g7l8isk3wx1wcapbrn66qmzz2sxy") - ]; - }; - - uudecode = mkDerivation { - path = "usr.bin/uudecode"; - version = "9.2"; - sha256 = "00a3zmh15pg4vx6hz0kaa5mi8d2b1sj4h512d7p6wbvxq6mznwcn"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNO_BASE64"; - NIX_LDFLAGS = lib.optional stdenv.isDarwin "-lresolv"; - }; - - cksum = mkDerivation { - path = "usr.bin/cksum"; - version = "9.2"; - sha256 = "0msfhgyvh5c2jmc6qjnf12c378dhw32ffsl864qz4rdb2b98rfcq"; - meta.platforms = lib.platforms.netbsd; - }; - - config = mkDerivation { - path = "usr.bin/config"; - version = "9.2"; - sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; - env.NIX_CFLAGS_COMPILE = toString [ "-DMAKE_BOOTSTRAP" ]; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal install mandoc byacc flex rsync - ]; - buildInputs = with self; compatIfNeeded; - extraPaths = with self; [ cksum.src ]; - }; - ## - ## END COMMAND LINE TOOLS - ## - - ## - ## START HEADERS - ## - include = mkDerivation { - path = "include"; - version = "9.2"; - sha256 = "0nxnmj4c8s3hb9n3fpcmd0zl3l1nmhivqgi9a35sis943qvpgl9h"; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal - install mandoc groff rsync nbperf rpcgen - ]; - - # The makefiles define INCSDIR per subdirectory, so we have to set - # something else on the command line so those definitions aren't - # overridden. - postPatch = '' - find "$BSDSRCDIR" -name Makefile -exec \ - sed -i -E \ - -e 's_/usr/include_''${INCSDIR0}_' \ - {} \; - ''; - - # multiple header dirs, see above - postConfigure = '' - makeFlags=''${makeFlags/INCSDIR/INCSDIR0} - ''; - - extraPaths = with self; [ common ]; - headersOnly = true; - noCC = true; - meta.platforms = lib.platforms.netbsd; - makeFlags = defaultMakeFlags ++ [ "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" ]; - }; - - common = fetchNetBSD "common" "9.2" "1pfylz9r3ap5wnwwbwczbfjb1m5qdyspzbnmxmcdkpzz2zgj64b9"; - - sys-headers = mkDerivation { - pname = "sys-headers"; - path = "sys"; - version = "9.2"; - sha256 = "03s18q8d9giipf05bx199fajc2qwikji0djz7hw63d2lya6bfnpj"; - - # Make the build ignore linker warnings - prePatch = '' - substituteInPlace sys/conf/Makefile.kern.inc \ - --replace "-Wa,--fatal-warnings" "" - ''; - - patches = [ - # Fix this error when building bootia32.efi and bootx64.efi: - # error: PHDR segment not covered by LOAD segment - ./no-dynamic-linker.patch - - # multiple header dirs, see above - ./sys-headers-incsdir.patch - ]; - - postPatch = - '' - substituteInPlace sys/arch/i386/stand/efiboot/Makefile.efiboot \ - --replace "-nocombreloc" "-z nocombreloc" - '' + - # multiple header dirs, see above - self.include.postPatch; - - CONFIG = "GENERIC"; - - propagatedBuildInputs = with self; [ include ]; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal install tsort lorder statHook rsync uudecode config genassym - ]; - - postConfigure = '' - pushd arch/$MACHINE/conf - config $CONFIG - popd - '' - # multiple header dirs, see above - + self.include.postConfigure; - - makeFlags = defaultMakeFlags ++ [ "FIRMWAREDIR=$(out)/libdata/firmware" ]; - hardeningDisable = [ "pic" ]; - MKKMOD = "no"; - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=array-parameter" - "-Wno-error=array-bounds" - "-Wa,--no-warn" - ]; - - postBuild = '' - make -C arch/$MACHINE/compile/$CONFIG $makeFlags - ''; - - postInstall = '' - cp arch/$MACHINE/compile/$CONFIG/netbsd $out - ''; - - meta.platforms = lib.platforms.netbsd; - extraPaths = with self; [ common ]; - - installPhase = "includesPhase"; - dontBuild = true; - noCC = true; - }; - - # The full kernel. We do the funny thing of overridding the headers to the - # full kernal and not vice versa to avoid infinite recursion -- the headers - # come earlier in the bootstrap. - sys = self.sys-headers.override { - pname = "sys"; - installPhase = null; - noCC = false; - dontBuild = false; - }; - - headers = symlinkJoin { - name = "netbsd-headers-9.2"; - paths = with self; [ - include - sys-headers - libpthread-headers - ]; - meta.platforms = lib.platforms.netbsd; - }; - ## - ## END HEADERS - ## - - ## - ## START LIBRARIES - ## - libarch = mkDerivation { - path = "lib/libarch"; - version = "9.2"; - sha256 = "6ssenRhuSwp0Jn71ErT0PrEoCJ+cIYRztwdL4QTDZsQ="; - meta.platforms = lib.platforms.netbsd; - }; - - libutil = mkDerivation { - path = "lib/libutil"; - version = "9.2"; - sha256 = "02gm5a5zhh8qp5r5q5r7x8x6x50ir1i0ncgsnfwh1vnrz6mxbq7z"; - extraPaths = with self; [ common libc.src sys.src ]; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal - byacc install tsort lorder mandoc statHook rsync - ]; - buildInputs = with self; [ headers ]; - SHLIBINSTALLDIR = "$(out)/lib"; - }; - - libedit = mkDerivation { - path = "lib/libedit"; - version = "9.2"; - sha256 = "1wqhngraxwqk4jgrf5f18jy195yrp7c06n1gf31pbplq79mg1bcj"; - buildInputs = with self; [ libterminfo libcurses ]; - propagatedBuildInputs = with self; compatIfNeeded; - SHLIBINSTALLDIR = "$(out)/lib"; - makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; - postPatch = '' - sed -i '1i #undef bool_t' $COMPONENT_PATH/el.h - substituteInPlace $COMPONENT_PATH/config.h \ - --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" - substituteInPlace $COMPONENT_PATH/readline/Makefile --replace /usr/include "$out/include" - ''; - env.NIX_CFLAGS_COMPILE = toString [ - "-D__noinline=" - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - ]; - }; - - libterminfo = mkDerivation { - path = "lib/libterminfo"; - version = "9.2"; - sha256 = "0pq05k3dj0dfsczv07frnnji92mazmy2qqngqbx2zgqc1x251414"; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal install tsort lorder mandoc statHook nbperf tic rsync - ]; - buildInputs = with self; compatIfNeeded; - SHLIBINSTALLDIR = "$(out)/lib"; - postPatch = '' - substituteInPlace $COMPONENT_PATH/term.c --replace /usr/share $out/share - substituteInPlace $COMPONENT_PATH/setupterm.c \ - --replace '#include ' 'void use_env(bool);' - ''; - postBuild = '' - make -C $BSDSRCDIR/share/terminfo $makeFlags BINDIR=$out/share - ''; - postInstall = '' - make -C $BSDSRCDIR/share/terminfo $makeFlags BINDIR=$out/share install - ''; - extraPaths = with self; [ - (fetchNetBSD "share/terminfo" "9.2" "1vh9rl4w8118a9qdpblfxmv1wkpm83rm9gb4rzz5bpm56i6d7kk7") - ]; - }; - - libcurses = mkDerivation { - path = "lib/libcurses"; - version = "9.2"; - sha256 = "0pd0dggl3w4bv5i5h0s1wrc8hr66n4hkv3zlklarwfdhc692fqal"; - buildInputs = with self; [ libterminfo ]; - env.NIX_CFLAGS_COMPILE = toString ([ - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - "-D__warn_references(a,b)=" - ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="); - propagatedBuildInputs = with self; compatIfNeeded; - MKDOC = "no"; # missing vfontedpr - makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; - postPatch = lib.optionalString (!stdenv.isDarwin) '' - substituteInPlace $COMPONENT_PATH/printw.c \ - --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ - --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' - substituteInPlace $COMPONENT_PATH/scanw.c \ - --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' - ''; - }; - - column = mkDerivation { - path = "usr.bin/column"; - version = "9.2"; - sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl"; - }; - - libossaudio = mkDerivation { - path = "lib/libossaudio"; - version = "9.2"; - sha256 = "16l3bfy6dcwqnklvh3x0ps8ld1y504vf57v9rx8f9adzhb797jh0"; - meta.platforms = lib.platforms.netbsd; - }; - - librpcsvc = mkDerivation { - path = "lib/librpcsvc"; - version = "9.2"; - sha256 = "1q34pfiyjbrgrdqm46jwrsqms49ly6z3b0xh1wg331zga900vq5n"; - makeFlags = defaultMakeFlags ++ [ "INCSDIR=$(out)/include/rpcsvc" ]; - meta.platforms = lib.platforms.netbsd; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal - install tsort lorder rpcgen statHook - ]; - }; - - librt = mkDerivation { - path = "lib/librt"; - version = "9.2"; - sha256 = "07f8mpjcqh5kig5z5sp97fg55mc4dz6aa1x5g01nv2pvbmqczxc6"; - meta.platforms = lib.platforms.netbsd; - extraPaths = with self; [ libc.src ] ++ libc.extraPaths; - postPatch = '' - sed -i 's,/usr\(/include/sys/syscall.h\),${self.headers}\1,g' \ - $BSDSRCDIR/lib/{libc,librt}/sys/Makefile.inc - ''; - }; - - libcrypt = mkDerivation { - path = "lib/libcrypt"; - version = "9.2"; - sha256 = "0siqan1wdqmmhchh2n8w6a8x1abbff8n4yb6jrqxap3hqn8ay54g"; - SHLIBINSTALLDIR = "$(out)/lib"; - meta.platforms = lib.platforms.netbsd; - }; - - libpci = mkDerivation { - pname = "libpci"; - path = "lib/libpci"; - version = "9.2"; - sha256 = "+IOEO1Bw3/H3iCp3uk3bwsFZbvCqN5Ciz70irnPl8E8="; - env.NIX_CFLAGS_COMPILE = toString [ "-I." ]; - meta.platforms = lib.platforms.netbsd; - extraPaths = with self; [ sys.src ]; - }; - - libpthread-headers = mkDerivation { - pname = "libpthread-headers"; - path = "lib/libpthread"; - version = "9.2"; - sha256 = "0mlmc31k509dwfmx5s2x010wxjc44mr6y0cbmk30cfipqh8c962h"; - installPhase = "includesPhase"; - dontBuild = true; - noCC = true; - meta.platforms = lib.platforms.netbsd; - }; - - libpthread = self.libpthread-headers.override { - pname = "libpthread"; - installPhase = null; - noCC = false; - dontBuild = false; - buildInputs = with self; [ headers ]; - SHLIBINSTALLDIR = "$(out)/lib"; - extraPaths = with self; [ common libc.src librt.src sys.src ]; - }; - - libresolv = mkDerivation { - path = "lib/libresolv"; - version = "9.2"; - sha256 = "1am74s74mf1ynwz3p4ncjkg63f78a1zjm983q166x4sgzps15626"; - meta.platforms = lib.platforms.netbsd; - extraPaths = with self; [ libc.src ]; - }; - - libm = mkDerivation { - path = "lib/libm"; - version = "9.2"; - sha256 = "1apwfr26shdmbqqnmg7hxf7bkfxw44ynqnnnghrww9bnhqdnsy92"; - SHLIBINSTALLDIR = "$(out)/lib"; - meta.platforms = lib.platforms.netbsd; - extraPaths = with self; [ sys.src ]; - }; - - i18n_module = mkDerivation { - path = "lib/i18n_module"; - version = "9.2"; - sha256 = "0w6y5v3binm7gf2kn7y9jja8k18rhnyl55cvvfnfipjqdxvxd9jd"; - meta.platforms = lib.platforms.netbsd; - extraPaths = with self; [ libc.src ]; - }; - - csu = mkDerivation { - path = "lib/csu"; - version = "9.2"; - sha256 = "0al5jfazvhlzn9hvmnrbchx4d0gm282hq5gp4xs2zmj9ycmf6d03"; - meta.platforms = lib.platforms.netbsd; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal - install mandoc groff flex - byacc genassym gencat lorder tsort statHook rsync - ]; - buildInputs = with self; [ headers ]; - extraPaths = with self; [ sys.src ld_elf_so.src ]; - }; - - ld_elf_so = mkDerivation { - path = "libexec/ld.elf_so"; - version = "9.2"; - sha256 = "0ia9mqzdljly0vqfwflm5mzz55k7qsr4rw2bzhivky6k30vgirqa"; - meta.platforms = lib.platforms.netbsd; - LIBC_PIC = "${self.libc}/lib/libc_pic.a"; - # Hack to prevent a symlink being installed here for compatibility. - SHLINKINSTALLDIR = "/usr/libexec"; - USE_FORT = "yes"; - makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/libexec" "CLIBOBJ=${self.libc}/lib" ]; - extraPaths = with self; [ libc.src ] ++ libc.extraPaths; - }; - - _mainLibcExtraPaths = with self; [ - common i18n_module.src sys.src - ld_elf_so.src libpthread.src libm.src libresolv.src - librpcsvc.src libutil.src librt.src libcrypt.src - ]; - - libc = mkDerivation { - path = "lib/libc"; - version = "9.2"; - sha256 = "1y9c13igg0kai07sqvf9cm6yqmd8lhfd8hq3q7biilbgs1l99as3"; - USE_FORT = "yes"; - MKPROFILE = "no"; - extraPaths = with self; _mainLibcExtraPaths ++ [ - (fetchNetBSD "external/bsd/jemalloc" "9.2" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb") - ]; - nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook netbsdSetupHook - makeMinimal - install mandoc groff flex - byacc genassym gencat lorder tsort statHook rsync rpcgen - ]; - buildInputs = with self; [ headers csu ]; - env.NIX_CFLAGS_COMPILE = "-B${self.csu}/lib -fcommon"; - meta.platforms = lib.platforms.netbsd; - SHLIBINSTALLDIR = "$(out)/lib"; - MKPICINSTALL = "yes"; - NLSDIR = "$(out)/share/nls"; - makeFlags = defaultMakeFlags ++ [ "FILESDIR=$(out)/var/db"]; - postInstall = '' - pushd ${self.headers} - find . -type d -exec mkdir -p $out/\{} \; - find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; - popd - - pushd ${self.csu} - find . -type d -exec mkdir -p $out/\{} \; - find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; - popd - - NIX_CFLAGS_COMPILE+=" -B$out/lib" - NIX_CFLAGS_COMPILE+=" -I$out/include" - NIX_LDFLAGS+=" -L$out/lib" - - make -C $BSDSRCDIR/lib/libpthread $makeFlags - make -C $BSDSRCDIR/lib/libpthread $makeFlags install - - make -C $BSDSRCDIR/lib/libm $makeFlags - make -C $BSDSRCDIR/lib/libm $makeFlags install - - make -C $BSDSRCDIR/lib/libresolv $makeFlags - make -C $BSDSRCDIR/lib/libresolv $makeFlags install - - make -C $BSDSRCDIR/lib/librpcsvc $makeFlags - make -C $BSDSRCDIR/lib/librpcsvc $makeFlags install - - make -C $BSDSRCDIR/lib/i18n_module $makeFlags - make -C $BSDSRCDIR/lib/i18n_module $makeFlags install - - make -C $BSDSRCDIR/lib/libutil $makeFlags - make -C $BSDSRCDIR/lib/libutil $makeFlags install - - make -C $BSDSRCDIR/lib/librt $makeFlags - make -C $BSDSRCDIR/lib/librt $makeFlags install - - make -C $BSDSRCDIR/lib/libcrypt $makeFlags - make -C $BSDSRCDIR/lib/libcrypt $makeFlags install - ''; - inherit (self.librt) postPatch; - }; - # - # END LIBRARIES - # - - # - # START MISCELLANEOUS - # - dict = mkDerivation { - path = "share/dict"; - noCC = true; - version = "9.2"; - sha256 = "0svfc0byk59ri37pyjslv4c4rc7zw396r73mr593i78d39q5g3ad"; - makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; - }; - - misc = mkDerivation { - path = "share/misc"; - noCC = true; - version = "9.2"; - sha256 = "1j2cdssdx6nncv8ffj7f7ybl7m9hadjj8vm8611skqdvxnjg6nbc"; - makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; - }; - - man = mkDerivation { - path = "share/man"; - noCC = true; - version = "9.2"; - sha256 = "1l4lmj4kmg8dl86x94sr45w0xdnkz8dn4zjx0ipgr9bnq98663zl"; - # man0 generates a man.pdf using ps2pdf, but doesn't install it later, - # so we can avoid the dependency on ghostscript - postPatch = '' - substituteInPlace $COMPONENT_PATH/man0/Makefile --replace "ps2pdf" "echo noop " - ''; - makeFlags = defaultMakeFlags ++ [ - "FILESDIR=$(out)/share" - "MKRUMP=no" # would require to have additional path sys/rump/share/man - ]; - }; - # - # END MISCELLANEOUS - # - -}); + f = ( + self: + lib.packagesFromDirectoryRecursive { + callPackage = self.callPackage; + directory = ./pkgs; + } + // { + + fetchNetBSD = + path: version: sha256: + fetchcvs { + cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; + module = "src/${path}"; + inherit sha256; + tag = "netbsd-${lib.replaceStrings [ "." ] [ "-" ] version}-RELEASE"; + }; + + defaultMakeFlags = [ + "MKSOFTFLOAT=${ + if stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft" then + "yes" + else + "no" + }" + ]; + + compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isNetBSD) self.compat; + + # The manual callPackages below should in principle be unnecessary because + # they're just selecting arguments that would be selected anyway. However, + # if we don't perform these manual calls, we get infinite recursion issues + # because of the splices. + + mkDerivation = self.callPackage ./pkgs/mkDerivation.nix { + inherit stdenv stdenvNoCC; + inherit (buildPackages.netbsd) + netbsdSetupHook + makeMinimal + install + tsort + lorder + ; + inherit (buildPackages) mandoc; + inherit (buildPackages.buildPackages) rsync; + }; + + makeMinimal = self.callPackage ./pkgs/makeMinimal.nix { inherit (self) make; }; + + compat = self.callPackage ./pkgs/compat/package.nix { + inherit (buildPackages) coreutils; + inherit (buildPackages.darwin) cctools-port; + inherit (buildPackages.buildPackages) rsync; + inherit (buildPackages.netbsd) makeMinimal; + inherit (self) + install + include + libc + libutil + ; + }; + + install = self.callPackage ./pkgs/install/package.nix { + inherit (self) + fts + mtree + make + compatIfNeeded + ; + inherit (buildPackages.buildPackages) rsync; + inherit (buildPackages.netbsd) makeMinimal; + }; + + # See note in pkgs/stat/package.nix + stat = self.callPackage ./pkgs/stat/package.nix { + inherit (buildPackages.netbsd) makeMinimal install; + inherit (buildPackages.buildPackages) rsync; + }; + + # See note in pkgs/stat/hook.nix + statHook = self.callPackage ./pkgs/stat/hook.nix { inherit (self) stat; }; + + tsort = self.callPackage ./pkgs/tsort.nix { + inherit (buildPackages.netbsd) makeMinimal install; + inherit (buildPackages.buildPackages) rsync; + }; + + lorder = self.callPackage ./pkgs/lorder.nix { + inherit (buildPackages.netbsd) makeMinimal install; + inherit (buildPackages.buildPackages) rsync; + }; + + config = self.callPackage ./pkgs/config.nix { + inherit (buildPackages.netbsd) makeMinimal install; + inherit (buildPackages.buildPackages) rsync; + inherit (self) cksum; + }; + + include = self.callPackage ./pkgs/include.nix { + inherit (buildPackages.netbsd) + makeMinimal + install + nbperf + rpcgen + ; + inherit (buildPackages) stdenv; + inherit (buildPackages.buildPackages) rsync; + }; + + sys-headers = self.callPackage ./pkgs/sys/headers.nix { + inherit (buildPackages.netbsd) + makeMinimal + install + tsort + lorder + statHook + uudecode + config + genassym + ; + inherit (buildPackages.buildPackages) rsync; + }; + + libutil = self.callPackage ./pkgs/libutil.nix { inherit (self) libc sys; }; + + libpthread-headers = self.callPackage ./pkgs/libpthread/headers.nix { }; + + csu = self.callPackage ./pkgs/csu.nix { + inherit (self) headers sys ld_elf_so; + inherit (buildPackages.netbsd) + netbsdSetupHook + makeMinimal + install + genassym + gencat + lorder + tsort + statHook + ; + inherit (buildPackages.buildPackages) rsync; + }; + + _mainLibcExtraPaths = with self; [ + common + i18n_module.src + sys.src + ld_elf_so.src + libpthread.src + libm.src + libresolv.src + librpcsvc.src + libutil.src + librt.src + libcrypt.src + ]; + + libc = self.callPackage ./pkgs/libc.nix { + inherit (self) headers csu librt; + inherit (buildPackages.netbsd) + netbsdSetupHook + makeMinimal + install + genassym + gencat + lorder + tsort + statHook + rpcgen + ; + inherit (buildPackages.buildPackages) rsync; + }; + + mtree = self.callPackage ./pkgs/mtree.nix { inherit (self) mknod; }; + } + ); } diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix new file mode 100644 index 0000000000..a2ec387501 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix @@ -0,0 +1,8 @@ +{ lib, mkDerivation }: + +mkDerivation { + path = "usr.bin/cksum"; + version = "9.2"; + sha256 = "0msfhgyvh5c2jmc6qjnf12c378dhw32ffsl864qz4rdb2b98rfcq"; + meta.platforms = lib.platforms.netbsd; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/column.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/column.nix new file mode 100644 index 0000000000..f3cebfa9ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/column.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation { + path = "usr.bin/column"; + version = "9.2"; + sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl"; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/common.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/common.nix new file mode 100644 index 0000000000..464fc1c9e0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/common.nix @@ -0,0 +1,3 @@ +{ fetchNetBSD }: + +fetchNetBSD "common" "9.2" "1pfylz9r3ap5wnwwbwczbfjb1m5qdyspzbnmxmcdkpzz2zgj64b9" diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-cxx-safe-header.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/compat-cxx-safe-header.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-cxx-safe-header.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/compat-cxx-safe-header.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-dont-configure-twice.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/compat-dont-configure-twice.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-dont-configure-twice.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/compat-dont-configure-twice.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-no-force-native.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/compat-no-force-native.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-no-force-native.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/compat-no-force-native.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/compat-setup-hook.sh similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh rename to third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/compat-setup-hook.sh diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/libbsd-overlay.pc similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc rename to third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/libbsd-overlay.pc diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix new file mode 100644 index 0000000000..4c149e95c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix @@ -0,0 +1,146 @@ +{ + lib, + mkDerivation, + stdenv, + zlib, + defaultMakeFlags, + coreutils, + cctools-port, + include, + libc, + libutil, + install, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + rsync, + fetchNetBSD, + _mainLibcExtraPaths, +}: + +mkDerivation ( + let + version = "9.2"; + commonDeps = [ zlib ]; + in + { + path = "tools/compat"; + sha256 = "1vsxg7136nlhc72vpa664vs22874xh7ila95nkmsd8crn3z3cyn0"; + inherit version; + + setupHooks = [ + ../../../../../build-support/setup-hooks/role.bash + ./compat-setup-hook.sh + ]; + + preConfigure = '' + make include/.stamp configure nbtool_config.h.in defs.mk.in + ''; + + configurePlatforms = [ + "build" + "host" + ]; + configureFlags = + [ "--cache-file=config.cache" ] + ++ lib.optionals stdenv.hostPlatform.isMusl [ + # We include this header in our musl package only for legacy + # compatibility, and compat works fine without it (and having it + # know about sys/cdefs.h breaks packages like glib when built + # statically). + "ac_cv_header_sys_cdefs_h=no" + ]; + + nativeBuildInputs = commonDeps ++ [ + bsdSetupHook + netbsdSetupHook + makeMinimal + rsync + ]; + + buildInputs = commonDeps; + + # temporarily use gnuinstall for bootstrapping + # bsdinstall will be built later + makeFlags = + defaultMakeFlags + ++ [ + "INSTALL=${coreutils}/bin/install" + "DATADIR=$(out)/share" + # Can't sort object files yet + "LORDER=echo" + "TSORT=cat" + # Can't process man pages yet + "MKSHARE=no" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # GNU objcopy produces broken .a libs which won't link into dependers. + # Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here. + "OBJCOPY=${cctools-port}/bin/strip" + ]; + RENAME = "-D"; + + passthru.tests = { + netbsd-install = install; + }; + + patches = [ + ./compat-cxx-safe-header.patch + ./compat-dont-configure-twice.patch + ./compat-no-force-native.patch + ]; + + preInstall = '' + makeFlagsArray+=('INSTALL_FILE=''${INSTALL} ''${COPY} ''${PRESERVE} ''${RENAME}') + makeFlagsArray+=('INSTALL_DIR=''${INSTALL} -d') + makeFlagsArray+=('INSTALL_SYMLINK=''${INSTALL} ''${SYMLINK} ''${RENAME}') + ''; + + postInstall = + '' + # why aren't these installed by netbsd? + install -D compat_defs.h $out/include/compat_defs.h + install -D $BSDSRCDIR/include/cdbw.h $out/include/cdbw.h + install -D $BSDSRCDIR/sys/sys/cdbr.h $out/include/cdbr.h + install -D $BSDSRCDIR/sys/sys/featuretest.h \ + $out/include/sys/featuretest.h + install -D $BSDSRCDIR/sys/sys/md5.h $out/include/md5.h + install -D $BSDSRCDIR/sys/sys/rmd160.h $out/include/rmd160.h + install -D $BSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h + install -D $BSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h + install -D $BSDSRCDIR/sys/sys/queue.h $out/include/sys/queue.h + install -D $BSDSRCDIR/include/vis.h $out/include/vis.h + install -D $BSDSRCDIR/include/db.h $out/include/db.h + install -D $BSDSRCDIR/include/netconfig.h $out/include/netconfig.h + install -D $BSDSRCDIR/include/utmpx.h $out/include/utmpx.h + install -D $BSDSRCDIR/include/tzfile.h $out/include/tzfile.h + install -D $BSDSRCDIR/sys/sys/tree.h $out/include/sys/tree.h + install -D $BSDSRCDIR/include/nl_types.h $out/include/nl_types.h + install -D $BSDSRCDIR/include/stringlist.h $out/include/stringlist.h + + # Collapse includes slightly to fix dangling reference + install -D $BSDSRCDIR/common/include/rpc/types.h $out/include/rpc/types.h + sed -i '1s;^;#include "nbtool_config.h"\n;' $out/include/rpc/types.h + '' + + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/include/ssp + touch $out/include/ssp/ssp.h + '' + + '' + mkdir -p $out/lib/pkgconfig + substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \ + --subst-var-by out $out \ + --subst-var-by version ${version} + ''; + extraPaths = [ + include.src + libc.src + libutil.src + (fetchNetBSD "external/bsd/flex" "9.2" "0h98jpfj7vx5zh7vd7bk6b1hmzgkcb757a8j6d9zgygxxv13v43m") + (fetchNetBSD "sys/sys" "9.2" "0zawhw51klaigqqwkx0lzrx3mim2jywrc24cm7c66qsf1im9awgd") + (fetchNetBSD "common/include/rpc/types.h" "9.2" + "0n2df12mlc3cbc48jxq35yzl1y7ghgpykvy7jnfh898rdhac7m9a" + ) + ] ++ libutil.extraPaths ++ _mainLibcExtraPaths; + } +) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/config.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/config.nix new file mode 100644 index 0000000000..c423f3ca86 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/config.nix @@ -0,0 +1,31 @@ +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + byacc, + flex, + rsync, + compatIfNeeded, + cksum, +}: +mkDerivation { + path = "usr.bin/config"; + version = "9.2"; + sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; + env.NIX_CFLAGS_COMPILE = toString [ "-DMAKE_BOOTSTRAP" ]; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + install + mandoc + byacc + flex + rsync + ]; + buildInputs = compatIfNeeded; + extraPaths = [ cksum.src ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix new file mode 100644 index 0000000000..6644333149 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix @@ -0,0 +1,49 @@ +{ + lib, + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + flex, + byacc, + genassym, + gencat, + lorder, + tsort, + statHook, + rsync, + headers, + sys, + ld_elf_so, +}: + +mkDerivation { + path = "lib/csu"; + version = "9.2"; + sha256 = "0al5jfazvhlzn9hvmnrbchx4d0gm282hq5gp4xs2zmj9ycmf6d03"; + meta.platforms = lib.platforms.netbsd; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + install + mandoc + groff + flex + byacc + genassym + gencat + lorder + tsort + statHook + rsync + ]; + buildInputs = [ headers ]; + extraPaths = [ + sys.src + ld_elf_so.src + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix new file mode 100644 index 0000000000..0d7d026dd2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix @@ -0,0 +1,9 @@ +{ mkDerivation, defaultMakeFlags }: + +mkDerivation { + path = "share/dict"; + noCC = true; + version = "9.2"; + sha256 = "0svfc0byk59ri37pyjslv4c4rc7zw396r73mr593i78d39q5g3ad"; + makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/fts/fts-setup-hook.sh similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh rename to third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/fts/fts-setup-hook.sh diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix new file mode 100644 index 0000000000..7c64658bf2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix @@ -0,0 +1,48 @@ +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + rsync, + compatIfNeeded, + fetchNetBSD, +}: + +mkDerivation { + pname = "fts"; + path = "include/fts.h"; + sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; + version = "9.2"; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + rsync + ]; + propagatedBuildInputs = compatIfNeeded; + extraPaths = [ + (fetchNetBSD "lib/libc/gen/fts.c" "9.2" "1a8hmf26242nmv05ipn3ircxb0jqmmi66rh78kkyi9vjwkfl3qn7") + (fetchNetBSD "lib/libc/include/namespace.h" "9.2" + "0kksr3pdwdc1cplqf5z12ih4cml6l11lqrz91f7hjjm64y7785kc" + ) + (fetchNetBSD "lib/libc/gen/fts.3" "9.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") + ]; + skipIncludesPhase = true; + buildPhase = '' + "$CC" -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \ + -o lib/libc/gen/fts.o + "$AR" -rsc libfts.a lib/libc/gen/fts.o + ''; + installPhase = '' + runHook preInstall + + install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3 + install -D include/fts.h $out/include/fts.h + install -D lib/libc/include/namespace.h $out/include/namespace.h + install -D libfts.a $out/lib/libfts.a + + runHook postInstall + ''; + setupHooks = [ + ../../../../../build-support/setup-hooks/role.bash + ./fts-setup-hook.sh + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix new file mode 100644 index 0000000000..7f81a77a02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation { + path = "usr.bin/genassym"; + version = "9.2"; + sha256 = "1acl1dz5kvh9h5806vkz2ap95rdsz7phmynh5i3x5y7agbki030c"; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix new file mode 100644 index 0000000000..411be85e91 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation { + path = "usr.bin/gencat"; + version = "9.2"; + sha256 = "0gd463x1hg36bhr7y0xryb5jyxk0z0g7xvy8rgk82nlbnlnsbbwb"; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix new file mode 100644 index 0000000000..c8483d454b --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation { + path = "usr.bin/getconf"; + sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q"; + version = "9.2"; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/getent.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/getent/getent.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/getent.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/getent/getent.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix new file mode 100644 index 0000000000..7a9acb1e0a --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix @@ -0,0 +1,8 @@ +{ mkDerivation }: + +mkDerivation { + path = "usr.bin/getent"; + sha256 = "1qngywcmm0y7nl8h3n8brvkxq4jw63szbci3kc1q6a6ndhycbbvr"; + version = "9.2"; + patches = [ ./getent.patch ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/headers.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/headers.nix new file mode 100644 index 0000000000..40615b2722 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/headers.nix @@ -0,0 +1,17 @@ +{ + lib, + symlinkJoin, + include, + sys-headers, + libpthread-headers, +}: + +symlinkJoin { + name = "netbsd-headers-9.2"; + paths = [ + include + sys-headers + libpthread-headers + ]; + meta.platforms = lib.platforms.netbsd; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix new file mode 100644 index 0000000000..c76ada8657 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix @@ -0,0 +1,13 @@ +{ + lib, + mkDerivation, + libc, +}: + +mkDerivation { + path = "lib/i18n_module"; + version = "9.2"; + sha256 = "0w6y5v3binm7gf2kn7y9jja8k18rhnyl55cvvfnfipjqdxvxd9jd"; + meta.platforms = lib.platforms.netbsd; + extraPaths = [ libc.src ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/include.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/include.nix new file mode 100644 index 0000000000..ec316a6317 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/include.nix @@ -0,0 +1,54 @@ +{ + lib, + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + rsync, + nbperf, + rpcgen, + common, + defaultMakeFlags, + stdenv, +}: + +mkDerivation { + path = "include"; + version = "9.2"; + sha256 = "0nxnmj4c8s3hb9n3fpcmd0zl3l1nmhivqgi9a35sis943qvpgl9h"; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + install + mandoc + groff + rsync + nbperf + rpcgen + ]; + + # The makefiles define INCSDIR per subdirectory, so we have to set + # something else on the command line so those definitions aren't + # overridden. + postPatch = '' + find "$BSDSRCDIR" -name Makefile -exec \ + sed -i -E \ + -e 's_/usr/include_''${INCSDIR0}_' \ + {} \; + ''; + + # multiple header dirs, see above + postConfigure = '' + makeFlags=''${makeFlags/INCSDIR/INCSDIR0} + ''; + + extraPaths = [ common ]; + headersOnly = true; + noCC = true; + meta.platforms = lib.platforms.netbsd; + makeFlags = defaultMakeFlags ++ [ "RPCGEN_CPP=${stdenv.cc.cc}/bin/cpp" ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/install-setup-hook.sh b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/install/install-setup-hook.sh similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/install-setup-hook.sh rename to third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/install/install-setup-hook.sh diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix new file mode 100644 index 0000000000..69b0c07325 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix @@ -0,0 +1,62 @@ +{ + mkDerivation, + writeShellScript, + mtree, + make, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + mandoc, + groff, + rsync, + compatIfNeeded, + fts, + +}: + +# HACK: to ensure parent directories exist. This emulates GNU +# install’s -D option. No alternative seems to exist in BSD install. +let + binstall = writeShellScript "binstall" '' + set -eu + for last in "$@"; do true; done + mkdir -p $(dirname $last) + @out@/bin/xinstall "$@" + ''; +in +mkDerivation { + path = "usr.bin/xinstall"; + version = "9.2"; + sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; + extraPaths = [ + mtree.src + make.src + ]; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + mandoc + groff + rsync + ]; + skipIncludesPhase = true; + buildInputs = + compatIfNeeded + # fts header is needed. glibc already has this header, but musl doesn't, + # so make sure pkgsMusl.netbsd.install still builds in case you want to + # remove it! + ++ [ fts ]; + installPhase = '' + runHook preInstall + + install -D install.1 $out/share/man/man1/install.1 + install -D xinstall $out/bin/xinstall + install -D -m 0550 ${binstall} $out/bin/binstall + substituteInPlace $out/bin/binstall --subst-var out + ln -s $out/bin/binstall $out/bin/install + + runHook postInstall + ''; + setupHook = ./install-setup-hook.sh; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix new file mode 100644 index 0000000000..a350e81d32 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix @@ -0,0 +1,22 @@ +{ + lib, + mkDerivation, + libc, + defaultMakeFlags, +}: + +mkDerivation { + path = "libexec/ld.elf_so"; + version = "9.2"; + sha256 = "0ia9mqzdljly0vqfwflm5mzz55k7qsr4rw2bzhivky6k30vgirqa"; + meta.platforms = lib.platforms.netbsd; + LIBC_PIC = "${libc}/lib/libc_pic.a"; + # Hack to prevent a symlink being installed here for compatibility. + SHLINKINSTALLDIR = "/usr/libexec"; + USE_FORT = "yes"; + makeFlags = defaultMakeFlags ++ [ + "BINDIR=$(out)/libexec" + "CLIBOBJ=${libc}/lib" + ]; + extraPaths = [ libc.src ] ++ libc.extraPaths; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix new file mode 100644 index 0000000000..93ea02f8a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix @@ -0,0 +1,8 @@ +{ lib, mkDerivation }: + +mkDerivation { + path = "lib/libarch"; + version = "9.2"; + sha256 = "6ssenRhuSwp0Jn71ErT0PrEoCJ+cIYRztwdL4QTDZsQ="; + meta.platforms = lib.platforms.netbsd; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix new file mode 100644 index 0000000000..d755e4b687 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix @@ -0,0 +1,103 @@ +{ + lib, + mkDerivation, + defaultMakeFlags, + _mainLibcExtraPaths, + fetchNetBSD, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + flex, + byacc, + genassym, + gencat, + lorder, + tsort, + statHook, + rsync, + rpcgen, + csu, + headers, + librt, +}: + +mkDerivation { + path = "lib/libc"; + version = "9.2"; + sha256 = "1y9c13igg0kai07sqvf9cm6yqmd8lhfd8hq3q7biilbgs1l99as3"; + USE_FORT = "yes"; + MKPROFILE = "no"; + extraPaths = _mainLibcExtraPaths ++ [ + (fetchNetBSD "external/bsd/jemalloc" "9.2" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb") + ]; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + install + mandoc + groff + flex + byacc + genassym + gencat + lorder + tsort + statHook + rsync + rpcgen + ]; + buildInputs = [ + headers + csu + ]; + env.NIX_CFLAGS_COMPILE = "-B${csu}/lib -fcommon"; + meta.platforms = lib.platforms.netbsd; + SHLIBINSTALLDIR = "$(out)/lib"; + MKPICINSTALL = "yes"; + NLSDIR = "$(out)/share/nls"; + makeFlags = defaultMakeFlags ++ [ "FILESDIR=$(out)/var/db" ]; + postInstall = '' + pushd ${headers} + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; + popd + + pushd ${csu} + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; + popd + + NIX_CFLAGS_COMPILE+=" -B$out/lib" + NIX_CFLAGS_COMPILE+=" -I$out/include" + NIX_LDFLAGS+=" -L$out/lib" + + make -C $BSDSRCDIR/lib/libpthread $makeFlags + make -C $BSDSRCDIR/lib/libpthread $makeFlags install + + make -C $BSDSRCDIR/lib/libm $makeFlags + make -C $BSDSRCDIR/lib/libm $makeFlags install + + make -C $BSDSRCDIR/lib/libresolv $makeFlags + make -C $BSDSRCDIR/lib/libresolv $makeFlags install + + make -C $BSDSRCDIR/lib/librpcsvc $makeFlags + make -C $BSDSRCDIR/lib/librpcsvc $makeFlags install + + make -C $BSDSRCDIR/lib/i18n_module $makeFlags + make -C $BSDSRCDIR/lib/i18n_module $makeFlags install + + make -C $BSDSRCDIR/lib/libutil $makeFlags + make -C $BSDSRCDIR/lib/libutil $makeFlags install + + make -C $BSDSRCDIR/lib/librt $makeFlags + make -C $BSDSRCDIR/lib/librt $makeFlags install + + make -C $BSDSRCDIR/lib/libcrypt $makeFlags + make -C $BSDSRCDIR/lib/libcrypt $makeFlags install + ''; + inherit (librt) postPatch; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix new file mode 100644 index 0000000000..c5f9deff58 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix @@ -0,0 +1,9 @@ +{ lib, mkDerivation }: + +mkDerivation { + path = "lib/libcrypt"; + version = "9.2"; + sha256 = "0siqan1wdqmmhchh2n8w6a8x1abbff8n4yb6jrqxap3hqn8ay54g"; + SHLIBINSTALLDIR = "$(out)/lib"; + meta.platforms = lib.platforms.netbsd; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix new file mode 100644 index 0000000000..5072821db9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix @@ -0,0 +1,33 @@ +{ + lib, + mkDerivation, + stdenv, + libterminfo, + compatIfNeeded, + defaultMakeFlags, +}: + +mkDerivation { + path = "lib/libcurses"; + version = "9.2"; + sha256 = "0pd0dggl3w4bv5i5h0s1wrc8hr66n4hkv3zlklarwfdhc692fqal"; + buildInputs = [ libterminfo ]; + env.NIX_CFLAGS_COMPILE = toString ( + [ + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + "-D__warn_references(a,b)=" + ] + ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)=" + ); + propagatedBuildInputs = compatIfNeeded; + MKDOC = "no"; # missing vfontedpr + makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${libterminfo}/lib" ]; + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace $COMPONENT_PATH/printw.c \ + --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ + --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' + substituteInPlace $COMPONENT_PATH/scanw.c \ + --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' + ''; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix new file mode 100644 index 0000000000..ee1e7bf79f --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix @@ -0,0 +1,32 @@ +{ + lib, + mkDerivation, + libterminfo, + libcurses, + compatIfNeeded, + defaultMakeFlags, +}: + +mkDerivation { + path = "lib/libedit"; + version = "9.2"; + sha256 = "1wqhngraxwqk4jgrf5f18jy195yrp7c06n1gf31pbplq79mg1bcj"; + buildInputs = [ + libterminfo + libcurses + ]; + propagatedBuildInputs = compatIfNeeded; + SHLIBINSTALLDIR = "$(out)/lib"; + makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${libterminfo}/lib" ]; + postPatch = '' + sed -i '1i #undef bool_t' $COMPONENT_PATH/el.h + substituteInPlace $COMPONENT_PATH/config.h \ + --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" + substituteInPlace $COMPONENT_PATH/readline/Makefile --replace /usr/include "$out/include" + ''; + env.NIX_CFLAGS_COMPILE = toString [ + "-D__noinline=" + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix new file mode 100644 index 0000000000..f36e97f8e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix @@ -0,0 +1,14 @@ +{ + lib, + mkDerivation, + sys, +}: + +mkDerivation { + path = "lib/libm"; + version = "9.2"; + sha256 = "1apwfr26shdmbqqnmg7hxf7bkfxw44ynqnnnghrww9bnhqdnsy92"; + SHLIBINSTALLDIR = "$(out)/lib"; + meta.platforms = lib.platforms.netbsd; + extraPaths = [ sys.src ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix new file mode 100644 index 0000000000..51bbc216e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix @@ -0,0 +1,8 @@ +{ lib, mkDerivation }: + +mkDerivation { + path = "lib/libossaudio"; + version = "9.2"; + sha256 = "16l3bfy6dcwqnklvh3x0ps8ld1y504vf57v9rx8f9adzhb797jh0"; + meta.platforms = lib.platforms.netbsd; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix new file mode 100644 index 0000000000..b0be4a2da7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix @@ -0,0 +1,15 @@ +{ + lib, + mkDerivation, + sys, +}: + +mkDerivation { + pname = "libpci"; + path = "lib/libpci"; + version = "9.2"; + sha256 = "+IOEO1Bw3/H3iCp3uk3bwsFZbvCqN5Ciz70irnPl8E8="; + env.NIX_CFLAGS_COMPILE = toString [ "-I." ]; + meta.platforms = lib.platforms.netbsd; + extraPaths = [ sys.src ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix new file mode 100644 index 0000000000..d8ea7c553e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix @@ -0,0 +1,5 @@ +{ + path = "lib/libpthread"; + version = "9.2"; + sha256 = "0mlmc31k509dwfmx5s2x010wxjc44mr6y0cbmk30cfipqh8c962h"; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/headers.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/headers.nix new file mode 100644 index 0000000000..c3cc899017 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/headers.nix @@ -0,0 +1,12 @@ +{ lib, mkDerivation }: + +mkDerivation ( + import ./base.nix + // { + pname = "libpthread-headers"; + installPhase = "includesPhase"; + dontBuild = true; + noCC = true; + meta.platforms = lib.platforms.netbsd; + } +) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix new file mode 100644 index 0000000000..88d392e20b --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix @@ -0,0 +1,28 @@ +{ + lib, + mkDerivation, + headers, + common, + libc, + librt, + sys, +}: + +mkDerivation ( + import ./base.nix + // { + pname = "libpthread"; + installPhase = null; + noCC = false; + dontBuild = false; + buildInputs = [ headers ]; + SHLIBINSTALLDIR = "$(out)/lib"; + extraPaths = [ + common + libc.src + librt.src + sys.src + ]; + meta.platforms = lib.platforms.netbsd; + } +) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix new file mode 100644 index 0000000000..24bc4f2f9e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix @@ -0,0 +1,13 @@ +{ + lib, + mkDerivation, + libc, +}: + +mkDerivation { + path = "lib/libresolv"; + version = "9.2"; + sha256 = "1am74s74mf1ynwz3p4ncjkg63f78a1zjm983q166x4sgzps15626"; + meta.platforms = lib.platforms.netbsd; + extraPaths = [ libc.src ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix new file mode 100644 index 0000000000..8d757a8a84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix @@ -0,0 +1,31 @@ +{ + lib, + mkDerivation, + defaultMakeFlags, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + rpcgen, + statHook, +}: + +mkDerivation { + path = "lib/librpcsvc"; + version = "9.2"; + sha256 = "1q34pfiyjbrgrdqm46jwrsqms49ly6z3b0xh1wg331zga900vq5n"; + makeFlags = defaultMakeFlags ++ [ "INCSDIR=$(out)/include/rpcsvc" ]; + meta.platforms = lib.platforms.netbsd; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + install + tsort + lorder + rpcgen + statHook + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix new file mode 100644 index 0000000000..fa0229953b --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix @@ -0,0 +1,18 @@ +{ + lib, + mkDerivation, + libc, + headers, +}: + +mkDerivation { + path = "lib/librt"; + version = "9.2"; + sha256 = "07f8mpjcqh5kig5z5sp97fg55mc4dz6aa1x5g01nv2pvbmqczxc6"; + meta.platforms = lib.platforms.netbsd; + extraPaths = [ libc.src ] ++ libc.extraPaths; + postPatch = '' + sed -i 's,/usr\(/include/sys/syscall.h\),${headers}\1,g' \ + $BSDSRCDIR/lib/{libc,librt}/sys/Makefile.inc + ''; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix new file mode 100644 index 0000000000..6ac573d865 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix @@ -0,0 +1,51 @@ +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + mandoc, + statHook, + nbperf, + tic, + rsync, + compatIfNeeded, + fetchNetBSD, +}: + +mkDerivation { + path = "lib/libterminfo"; + version = "9.2"; + sha256 = "0pq05k3dj0dfsczv07frnnji92mazmy2qqngqbx2zgqc1x251414"; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + install + tsort + lorder + mandoc + statHook + nbperf + tic + rsync + ]; + buildInputs = compatIfNeeded; + SHLIBINSTALLDIR = "$(out)/lib"; + postPatch = '' + substituteInPlace $COMPONENT_PATH/term.c --replace /usr/share $out/share + substituteInPlace $COMPONENT_PATH/setupterm.c \ + --replace '#include ' 'void use_env(bool);' + ''; + postBuild = '' + make -C $BSDSRCDIR/share/terminfo $makeFlags BINDIR=$out/share + ''; + postInstall = '' + make -C $BSDSRCDIR/share/terminfo $makeFlags BINDIR=$out/share install + ''; + extraPaths = [ + (fetchNetBSD "share/terminfo" "9.2" "1vh9rl4w8118a9qdpblfxmv1wkpm83rm9gb4rzz5bpm56i6d7kk7") + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix new file mode 100644 index 0000000000..fdc57df9c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix @@ -0,0 +1,42 @@ +{ + mkDerivation, + common, + libc, + sys, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + byacc, + install, + tsort, + lorder, + mandoc, + statHook, + rsync, + headers, +}: + +mkDerivation { + path = "lib/libutil"; + version = "9.2"; + sha256 = "02gm5a5zhh8qp5r5q5r7x8x6x50ir1i0ncgsnfwh1vnrz6mxbq7z"; + extraPaths = [ + common + libc.src + sys.src + ]; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + byacc + install + tsort + lorder + mandoc + statHook + rsync + ]; + buildInputs = [ headers ]; + SHLIBINSTALLDIR = "$(out)/lib"; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/locale.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/locale/locale.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/locale.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/locale/locale.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix new file mode 100644 index 0000000000..3c61e8517b --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix @@ -0,0 +1,9 @@ +{ mkDerivation }: + +mkDerivation { + path = "usr.bin/locale"; + version = "9.2"; + sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; + patches = [ ./locale.patch ]; + env.NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix new file mode 100644 index 0000000000..0b99a794b0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix @@ -0,0 +1,25 @@ +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + rsync, +}: + +mkDerivation { + path = "usr.bin/lorder"; + version = "9.2"; + sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + install + mandoc + groff + rsync + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/make.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/make.nix new file mode 100644 index 0000000000..381e309164 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/make.nix @@ -0,0 +1,67 @@ +{ + lib, + mkDerivation, + fetchNetBSD, + stdenv, +}: + +mkDerivation { + path = "usr.bin/make"; + sha256 = "0vi73yicbmbp522qzqvd979cx6zm5jakhy77xh73c1kygf8klccs"; + version = "9.2"; + + postPatch = + '' + substituteInPlace $BSDSRCDIR/share/mk/bsd.doc.mk \ + --replace '-o ''${DOCOWN}' "" \ + --replace '-g ''${DOCGRP}' "" + for mk in $BSDSRCDIR/share/mk/bsd.inc.mk $BSDSRCDIR/share/mk/bsd.kinc.mk; do + substituteInPlace $mk \ + --replace '-o ''${BINOWN}' "" \ + --replace '-g ''${BINGRP}' "" + done + substituteInPlace $BSDSRCDIR/share/mk/bsd.kmodule.mk \ + --replace '-o ''${KMODULEOWN}' "" \ + --replace '-g ''${KMODULEGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '-o ''${LIBOWN}' "" \ + --replace '-g ''${LIBGRP}' "" \ + --replace '-o ''${DEBUGOWN}' "" \ + --replace '-g ''${DEBUGGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.lua.mk \ + --replace '-o ''${LIBOWN}' "" \ + --replace '-g ''${LIBGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.man.mk \ + --replace '-o ''${MANOWN}' "" \ + --replace '-g ''${MANGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.nls.mk \ + --replace '-o ''${NLSOWN}' "" \ + --replace '-g ''${NLSGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.prog.mk \ + --replace '-o ''${BINOWN}' "" \ + --replace '-g ''${BINGRP}' "" \ + --replace '-o ''${RUMPBINOWN}' "" \ + --replace '-g ''${RUMPBINGRP}' "" \ + --replace '-o ''${DEBUGOWN}' "" \ + --replace '-g ''${DEBUGGRP}' "" + + # make needs this to pick up our sys make files + export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" + + substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' + substituteInPlace $BSDSRCDIR/share/mk/bsd.kinc.mk \ + --replace /bin/rm rm + '' + + lib.optionalString stdenv.isDarwin '' + substituteInPlace $BSDSRCDIR/share/mk/bsd.sys.mk \ + --replace '-Wl,--fatal-warnings' "" \ + --replace '-Wl,--warn-shared-textrel' "" + ''; + postInstall = '' + make -C $BSDSRCDIR/share/mk FILESDIR=$out/share/mk install + ''; + extraPaths = [ + (fetchNetBSD "share/mk" "9.2" "0w9x77cfnm6zwy40slradzi0ip9gz80x6lk7pvnlxzsr2m5ra5sy") + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix new file mode 100644 index 0000000000..585c72bd17 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix @@ -0,0 +1,48 @@ +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + rsync, + make, +}: + +mkDerivation { + path = "tools/make"; + sha256 = "0fh0nrnk18m613m5blrliq2aydciv51qhc0ihsj4k63incwbk90n"; + version = "9.2"; + + buildInputs = [ ]; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + rsync + ]; + + skipIncludesPhase = true; + + postPatch = '' + patchShebangs $COMPONENT_PATH/configure + ${make.postPatch} + ''; + + buildPhase = '' + runHook preBuild + + sh ./buildmake.sh + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -D nbmake $out/bin/nbmake + ln -s $out/bin/nbmake $out/bin/make + mkdir -p $out/share + cp -r $BSDSRCDIR/share/mk $out/share/mk + + runHook postInstall + ''; + + extraPaths = [ make.src ] ++ make.extraPaths; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/man.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/man.nix new file mode 100644 index 0000000000..bce5bcee66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/man.nix @@ -0,0 +1,17 @@ +{ mkDerivation, defaultMakeFlags }: + +mkDerivation { + path = "share/man"; + noCC = true; + version = "9.2"; + sha256 = "1l4lmj4kmg8dl86x94sr45w0xdnkz8dn4zjx0ipgr9bnq98663zl"; + # man0 generates a man.pdf using ps2pdf, but doesn't install it later, + # so we can avoid the dependency on ghostscript + postPatch = '' + substituteInPlace $COMPONENT_PATH/man0/Makefile --replace "ps2pdf" "echo noop " + ''; + makeFlags = defaultMakeFlags ++ [ + "FILESDIR=$(out)/share" + "MKRUMP=no" # would require to have additional path sys/rump/share/man + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix new file mode 100644 index 0000000000..7f96f4d149 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix @@ -0,0 +1,9 @@ +{ mkDerivation, defaultMakeFlags }: + +mkDerivation { + path = "share/misc"; + noCC = true; + version = "9.2"; + sha256 = "1j2cdssdx6nncv8ffj7f7ybl7m9hadjj8vm8611skqdvxnjg6nbc"; + makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix new file mode 100644 index 0000000000..849d2b1da3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix @@ -0,0 +1,113 @@ +{ + lib, + stdenvNoCC, + stdenv, + fetchNetBSD, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + mandoc, + groff, + statHook, + rsync, + compatIfNeeded, + defaultMakeFlags, +}: + +lib.makeOverridable ( + attrs: + let + stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; + in + stdenv'.mkDerivation ( + { + pname = "${attrs.pname or (baseNameOf attrs.path)}-netbsd"; + inherit (attrs) version; + src = fetchNetBSD attrs.path attrs.version attrs.sha256; + + extraPaths = [ ]; + + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + install + tsort + lorder + mandoc + groff + statHook + rsync + ]; + buildInputs = compatIfNeeded; + + HOST_SH = stdenv'.shell; + + MACHINE_ARCH = + { + i486 = "i386"; + i586 = "i386"; + i686 = "i386"; + } + .${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; + + MACHINE = + { + x86_64 = "amd64"; + aarch64 = "evbarm64"; + i486 = "i386"; + i586 = "i386"; + i686 = "i386"; + } + .${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; + + COMPONENT_PATH = attrs.path; + + makeFlags = defaultMakeFlags; + + strictDeps = true; + + meta = with lib; { + maintainers = with maintainers; [ + matthewbauer + qyliss + ]; + platforms = platforms.unix; + license = licenses.bsd2; + }; + } + // lib.optionalAttrs stdenv'.hasCC { + # TODO should CC wrapper set this? + CPP = "${stdenv'.cc.targetPrefix}cpp"; + } + // lib.optionalAttrs stdenv'.isDarwin { MKRELRO = "no"; } + // lib.optionalAttrs (stdenv'.cc.isClang or false) { + HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); + } + // lib.optionalAttrs (stdenv'.cc.isGNU or false) { + HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); + } + // lib.optionalAttrs (stdenv'.isx86_32) { USE_SSP = "no"; } + // lib.optionalAttrs (attrs.headersOnly or false) { + installPhase = "includesPhase"; + dontBuild = true; + } + // attrs + // { + # Files that use NetBSD-specific macros need to have nbtool_config.h + # included ahead of them on non-NetBSD platforms. + postPatch = + lib.optionalString (!stdenv'.hostPlatform.isNetBSD) '' + set +e + grep -Zlr "^__RCSID + ^__BEGIN_DECLS" $COMPONENT_PATH | xargs -0r grep -FLZ nbtool_config.h | + xargs -0tr sed -i '0,/^#/s//#include \n\0/' + set -e + '' + + attrs.postPatch or ""; + } + ) +) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix new file mode 100644 index 0000000000..5c4c172e40 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation { + path = "sbin/mknod"; + version = "9.2"; + sha256 = "1d9369shzwgixz3nph991i8q5vk7hr04py3n9avbfbhzy4gndqs2"; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix new file mode 100644 index 0000000000..723da3ad89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix @@ -0,0 +1,8 @@ +{ mkDerivation, mknod }: + +mkDerivation { + path = "usr.sbin/mtree"; + version = "9.2"; + sha256 = "04p7w540vz9npvyb8g8hcf2xa05phn1y88hsyrcz3vwanvpc0yv9"; + extraPaths = [ mknod.src ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix new file mode 100644 index 0000000000..a23c5dddfc --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation { + path = "usr.bin/nbperf"; + version = "9.2"; + sha256 = "1nxc302vgmjhm3yqdivqyfzslrg0vjpbss44s74rcryrl19mma9r"; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/package.nix new file mode 100644 index 0000000000..31368523ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/package.nix @@ -0,0 +1,3 @@ +{ makeSetupHook }: + +makeSetupHook { name = "netbsd-setup-hook"; } ./setup-hook.sh diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/setup-hook.sh b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh similarity index 87% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/setup-hook.sh rename to third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh index fa8b19e7d8..ef00ea418e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh @@ -9,6 +9,7 @@ mergeNetBSDSourceDir() { addNetBSDMakeFlags() { makeFlags="INCSDIR=${!outputDev}/include $makeFlags" + makeFlags="MANDIR=${!outputMan}/share/man $makeFlags" } postUnpackHooks+=(mergeNetBSDSourceDir) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix new file mode 100644 index 0000000000..b1482d4dff --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation { + path = "usr.bin/rpcgen"; + version = "9.2"; + sha256 = "1kfgfx54jg98wbg0d95p0rvf4w0302v8fz724b0bdackdsrd4988"; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/stat/hook.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/stat/hook.nix new file mode 100644 index 0000000000..e38c53a3aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/stat/hook.nix @@ -0,0 +1,17 @@ +{ + makeSetupHook, + writeText, + stat, +}: + +# stat isn't in POSIX, and NetBSD stat supports a completely +# different range of flags than GNU stat, so including it in PATH +# breaks stdenv. Work around that with a hook that will point +# NetBSD's build system and NetBSD stat without including it in +# PATH. + +makeSetupHook { name = "netbsd-stat-hook"; } ( + writeText "netbsd-stat-hook-impl" '' + makeFlagsArray+=(TOOL_STAT=${stat}/bin/stat) + '' +) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix new file mode 100644 index 0000000000..397b1f5303 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix @@ -0,0 +1,28 @@ +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + rsync, +}: + +# Don't add this to nativeBuildInputs directly. +# Use statHook instead. See note in stat/hook.nix + +mkDerivation { + path = "usr.bin/stat"; + version = "9.2"; + sha256 = "18nqwlndfc34qbbgqx5nffil37jfq9aw663ippasfxd2hlyc106x"; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + install + mandoc + groff + rsync + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix new file mode 100644 index 0000000000..4c140fa3bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix @@ -0,0 +1,93 @@ +{ + lib, + mkDerivation, + include, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + statHook, + rsync, + uudecode, + config, + genassym, + defaultMakeFlags, + common, +}: +{ + path = "sys"; + version = "9.2"; + sha256 = "03s18q8d9giipf05bx199fajc2qwikji0djz7hw63d2lya6bfnpj"; + + # Make the build ignore linker warnings + prePatch = '' + substituteInPlace sys/conf/Makefile.kern.inc \ + --replace "-Wa,--fatal-warnings" "" + ''; + + patches = [ + # Fix this error when building bootia32.efi and bootx64.efi: + # error: PHDR segment not covered by LOAD segment + ./no-dynamic-linker.patch + + # multiple header dirs, see above + ./sys-headers-incsdir.patch + ]; + + postPatch = + '' + substituteInPlace sys/arch/i386/stand/efiboot/Makefile.efiboot \ + --replace "-nocombreloc" "-z nocombreloc" + '' + + + # multiple header dirs, see above + include.postPatch; + + CONFIG = "GENERIC"; + + propagatedBuildInputs = [ include ]; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + install + tsort + lorder + statHook + rsync + uudecode + config + genassym + ]; + + postConfigure = + '' + pushd arch/$MACHINE/conf + config $CONFIG + popd + '' + # multiple header dirs, see above + + include.postConfigure; + + makeFlags = defaultMakeFlags ++ [ "FIRMWAREDIR=$(out)/libdata/firmware" ]; + hardeningDisable = [ "pic" ]; + MKKMOD = "no"; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=array-parameter" + "-Wno-error=array-bounds" + "-Wa,--no-warn" + ]; + + postBuild = '' + make -C arch/$MACHINE/compile/$CONFIG $makeFlags + ''; + + postInstall = '' + cp arch/$MACHINE/compile/$CONFIG/netbsd $out + ''; + + meta.platforms = lib.platforms.netbsd; + extraPaths = [ common ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix new file mode 100644 index 0000000000..2df35efc19 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix @@ -0,0 +1,49 @@ +{ + lib, + mkDerivation, + include, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + statHook, + rsync, + uudecode, + config, + genassym, + defaultMakeFlags, + common, +}: +let + base = import ./base.nix { + inherit + lib + mkDerivation + include + bsdSetupHook + netbsdSetupHook + makeMinimal + install + tsort + lorder + statHook + rsync + uudecode + config + genassym + defaultMakeFlags + common + ; + }; +in +mkDerivation ( + base + // { + pname = "sys-headers"; + installPhase = "includesPhase"; + dontBuild = true; + noCC = true; + } +) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/no-dynamic-linker.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/no-dynamic-linker.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/no-dynamic-linker.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/no-dynamic-linker.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix new file mode 100644 index 0000000000..c8e6edab5f --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix @@ -0,0 +1,49 @@ +{ + lib, + mkDerivation, + include, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + statHook, + rsync, + uudecode, + config, + genassym, + defaultMakeFlags, + common, +}: +let + base = import ./base.nix { + inherit + lib + mkDerivation + include + bsdSetupHook + netbsdSetupHook + makeMinimal + install + tsort + lorder + statHook + rsync + uudecode + config + genassym + defaultMakeFlags + common + ; + }; +in +mkDerivation ( + base + // { + pname = "sys"; + installPhase = null; + noCC = false; + dontBuild = false; + } +) diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/sys-headers-incsdir.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/sys-headers-incsdir.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/sys-headers-incsdir.patch rename to third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/sys/sys-headers-incsdir.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix new file mode 100644 index 0000000000..e090065210 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix @@ -0,0 +1,39 @@ +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + nbperf, + rsync, + compatIfNeeded, + defaultMakeFlags, + libterminfo, + fetchNetBSD, +}: + +mkDerivation { + path = "tools/tic"; + version = "9.2"; + sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; + HOSTPROG = "tic"; + buildInputs = compatIfNeeded; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + install + mandoc + groff + nbperf + rsync + ]; + makeFlags = defaultMakeFlags ++ [ "TOOLDIR=$(out)" ]; + extraPaths = [ + libterminfo.src + (fetchNetBSD "usr.bin/tic" "9.2" "1mwdfg7yx1g43ss378qsgl5rqhsxskqvsd2mqvrn38qw54i8v5i1") + (fetchNetBSD "tools/Makefile.host" "9.2" "15b4ab0n36lqj00j5lz2xs83g7l8isk3wx1wcapbrn66qmzz2sxy") + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix new file mode 100644 index 0000000000..9200bc57a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix @@ -0,0 +1,25 @@ +{ + mkDerivation, + bsdSetupHook, + netbsdSetupHook, + makeMinimal, + install, + mandoc, + groff, + rsync, +}: + +mkDerivation { + path = "usr.bin/tsort"; + version = "9.2"; + sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; + nativeBuildInputs = [ + bsdSetupHook + netbsdSetupHook + makeMinimal + install + mandoc + groff + rsync + ]; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix new file mode 100644 index 0000000000..7592db3eaf --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix @@ -0,0 +1,13 @@ +{ + lib, + mkDerivation, + stdenv, +}: + +mkDerivation { + path = "usr.bin/uudecode"; + version = "9.2"; + sha256 = "00a3zmh15pg4vx6hz0kaa5mi8d2b1sj4h512d7p6wbvxq6mznwcn"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNO_BASE64"; + NIX_LDFLAGS = lib.optional stdenv.isDarwin "-lresolv"; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh b/third_party/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh index e0afefcd73..f9453708ab 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh @@ -49,7 +49,6 @@ addMakeFlags() { makeFlags="LIBDIR=${!outputLib}/lib $makeFlags" makeFlags="SHLIBDIR=${!outputLib}/lib $makeFlags" makeFlags="SHAREDIR=${!outputLib}/share $makeFlags" - makeFlags="MANDIR=${!outputMan}/share/man $makeFlags" makeFlags="INFODIR=${!outputInfo}/share/info $makeFlags" makeFlags="DOCDIR=${!outputDoc}/share/doc $makeFlags" makeFlags="LOCALEDIR=${!outputLib}/share/locale $makeFlags" diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix index 1bd574fe46..d44e67ac59 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -11,7 +11,6 @@ let }; "osx-10.12.6" = { xnu = "3789.70.16"; - libiconv = "50"; Libnotify = "165.20.1"; objc4 = "709.1"; dyld = "433.5"; @@ -38,7 +37,6 @@ let dtrace = "168"; xnu = "3248.60.10"; libpthread = "138.10.4"; - libiconv = "44"; Libnotify = "150.40.1"; objc4 = "680"; eap8021x = "222.40.1"; @@ -272,7 +270,6 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { }; libclosure = applePackage "libclosure" "osx-10.11.6" "sha256-L5rQ+UBpf3B+W1U+gZKk7fXulslHsc8lxnCsplV+nr0=" {}; libdispatch = applePackage "libdispatch" "osx-10.10.5" "sha256-jfAEk0OLrJa9AIZVikIoHomd+l+4rCfc320Xh50qK5M=" {}; - libiconv = applePackage "libiconv" "osx-10.12.6" "sha256-ZzPFkchK3EU95UQUVVrR0t8iilhi/VnIkjjtP6KT2oI=" {}; Libinfo = applePackage "Libinfo" "osx-10.11.6" "sha256-6F7wiwerv4nz/xXHtp1qCHSaFzZgzcRN+jbmXA5oWOQ=" {}; Libm = applePackage "Libm" "osx-10.7.4" "sha256-KjMETfT4qJm0m0Ux/F6Rq8bI4Q4UVnFx6IKbKxXd+Es=" {}; Libnotify = applePackage "Libnotify" "osx-10.12.6" "sha256-6wvMBxAUfiYcQtmlfYCj1d3kFmFM/jdboTd7hRvi3e4=" {}; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix deleted file mode 100644 index 6a3bddc211..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, appleDerivation, lib -, enableStatic ? stdenv.hostPlatform.isStatic -, enableShared ? !stdenv.hostPlatform.isStatic -}: - -appleDerivation { - postUnpack = "sourceRoot=$sourceRoot/libiconv"; - - preConfigure = lib.optionalString stdenv.hostPlatform.isiOS '' - sed -i 's/darwin\*/ios\*/g' configure libcharset/configure - ''; - - configureFlags = [ - (lib.enableFeature enableStatic "static") - (lib.enableFeature enableShared "shared") - ]; - - postInstall = lib.optionalString enableShared '' - mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib - ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib - - # re-export one useless symbol; ld will reject a dylib that only reexports other dylibs - echo 'void dont_use_this(){}' | ${stdenv.cc.bintools.targetPrefix}clang -dynamiclib -x c - -current_version 2.4.0 \ - -compatibility_version 7.0.0 -current_version 7.0.0 -o $out/lib/libiconv.dylib \ - -Wl,-reexport_library -Wl,$out/lib/libiconv-nocharset.dylib \ - -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib - ''; - - setupHooks = [ - ../../../../build-support/setup-hooks/role.bash - ../../../../development/libraries/libiconv/setup-hook.sh - ]; - - meta = { - mainProgram = "iconv"; - platforms = lib.platforms.darwin; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix index b4a7bbc4df..2de90a0236 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix @@ -27,7 +27,6 @@ file_cmds = applePackage' "file_cmds" "321.40.3" "macos-11.0.1" "0p077lnbcy8266m hfs = applePackage' "hfs" "556.41.1" "macos-11.0.1" "0a0s6b12b0q07wslfifna0bj51dml9v098i4crr2m1vivnx4xj75" {}; libclosure = applePackage' "libclosure" "78" "macos-11.0.1" "0vf9n0k3m8dbprv1bf45zqg0g43bidy2i5z1v9a826bsf8lv7am7" {}; libdispatch = applePackage' "libdispatch" "1271.40.12" "macos-11.0.1" "1ck5srcjapg18vqb8wl08gacs7ndc6xr067qjn3ngx39q1jdcywz" {}; -libiconv = applePackage' "libiconv" "59" "macos-11.0.1" "0lwa4brdwm4lvrdnxylzsn1yph4m7csgri2zkc4xb4xiisz32pwp" {}; libmalloc = applePackage' "libmalloc" "317.40.8" "macos-11.0.1" "sha256-Tdhb0mq3w4Hwvp3xHB79Vr22hCOQK6h28HCsd7jvITI=" {}; libplatform = applePackage' "libplatform" "254.40.4" "macos-11.0.1" "1qf3ri0yd8b1xjln1j1gyx7ks6k3a2jhd63blyvfby75y9s7flky" {}; libpthread = applePackage' "libpthread" "454.40.3" "macos-11.0.1" "0zljbw8mpb80n1if65hhi9lkgwbgjr8vc9wvf7q1nl3mzyl35f8p" {}; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build index de73e88f5d..af08b5074b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build @@ -88,6 +88,7 @@ install_man('accton/accton.8') executable( 'arch', build_by_default : sdk_version.version_compare('>=11'), + dependencies : [ core_foundation ], install : sdk_version.version_compare('>=11'), sources : 'arch/arch.c' ) @@ -145,7 +146,7 @@ install_man('chkpasswd/chkpasswd.8') executable( 'chpass', - dependencies : [ cfopen_directory, directory_service, open_directory ], + dependencies : [ core_foundation, cfopen_directory, directory_service, open_directory ], install : true, sources : [ 'chpass/chpass.c', @@ -358,7 +359,7 @@ install_man( executable( 'nvram', c_args : '-DTARGET_OS_BRIDGE=0', - dependencies : [ iokit, libc_private, xnu_private ], + dependencies : [ core_foundation, iokit, libc_private, xnu_private ], install : true, sources : 'nvram/nvram.c' ) @@ -377,7 +378,7 @@ install_man('pagesize/pagesize.1') executable( 'passwd', - dependencies : [ cfopen_directory, directory_service, open_directory, pam ], + dependencies : [ core_foundation, cfopen_directory, directory_service, open_directory, pam ], install : true, sources : [ 'passwd/file_passwd.c', @@ -521,7 +522,7 @@ executable( 'zlog', build_by_default : sdk_version.version_compare('>=11'), c_args : '-DKERN_NOT_FOUND=56', - dependencies : core_symbolication, + dependencies : [ core_foundation, core_symbolication ], install : sdk_version.version_compare('>=11'), sources : [ 'zlog/SymbolicationHelper.c', diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/noah/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/noah/default.nix index b8cb1424cd..ad63b796f1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/noah/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/noah/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Bash on Ubuntu on macOS"; homepage = "https://github.com/linux-noah/noah"; license = [ licenses.mit licenses.gpl2 ]; - maintainers = [ maintainers.marsam ]; + maintainers = [ ]; platforms = platforms.darwin; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin && stdenv.isAarch64; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix index eb78f7a134..d28ed49428 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/openwith/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, swift, AppKit, Foundation, UniformTypeIdentifiers }: +{ lib, swiftPackages, fetchFromGitHub }: let + inherit (swiftPackages) apple_sdk stdenv swift; arch = if stdenv.isAarch64 then "arm64" else "x86_64"; in stdenv.mkDerivation rec { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ swift ]; - buildInputs = [ AppKit Foundation UniformTypeIdentifiers ]; + buildInputs = with apple_sdk.frameworks; [ AppKit Foundation UniformTypeIdentifiers ]; makeFlags = [ "openwith_${arch}" ]; @@ -32,6 +33,5 @@ stdenv.mkDerivation rec { license = licenses.unlicense; maintainers = with maintainers; [ zowoq ]; platforms = [ "aarch64-darwin" "x86_64-darwin" ]; - broken = stdenv.isx86_64; # https://hydra.nixos.org/build/219354133/nixlog/3 }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix index 9671b5885c..b985668b21 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix @@ -10,12 +10,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.71.3"; + version = "1.73.0"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-jiGo4H38qAiGMh4ckswyeDcijYL2wbcjs+IubDFjobU="; + hash = "sha256-TiHFuU54+IDBrdIMSI397ysm8uOb2/oRhSyoy+5yzTw="; }; dontPatch = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/rectangle/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/rectangle/default.nix index 0ada82d0e7..af7bb58e54 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/rectangle/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/rectangle/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "rectangle"; - version = "0.76"; + version = "0.79"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-oHq5mLMWloi6Tf81rjcmUFGwIggtMdyLPqbD/gOzNHU="; + hash = "sha256-XczwgLONTt7wL+oW1ruw6wBwZTMd5VyN+79xJy0NUIg="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix index 50f84a254d..4915b9b54d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.4.5"; + version = "4.5.2"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - hash = "sha256-FlIPSWqY2V1akd/InS6BPEBfc8pomJ8jgDns7wvaOm8="; + hash = "sha256-pBRmtHXnw9BoFeaCCokk5hulChdEFl9dENbL8zzXMzs="; }; nativeBuildInputs = [ undmg makeWrapper ]; @@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation rec { See https://docs.getutm.app/ for more information. ''; homepage = "https://mac.getutm.app/"; - changelog = "https://github.com/utmapp/${pname}/releases/tag/v${version}"; + changelog = "https://github.com/utmapp/utm/releases/tag/v${version}"; mainProgram = "UTM"; license = licenses.asl20; platforms = platforms.darwin; # 11.3 is the minimum supported version as of UTM 4. diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix index 54250001d9..1b7949dcb1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix @@ -3,7 +3,7 @@ let requireXcode = version: sha256: let xip = "Xcode_" + version + ".xip"; - # TODO(alexfmpe): Find out how to validate the .xip signature in Linux + unxip = if stdenv.buildPlatform.isDarwin then '' open -W ${xip} @@ -14,7 +14,9 @@ let requireXcode = version: sha256: rm -rf ${xip} pbzx -n Content | cpio -i rm Content Metadata + rcodesign verify Xcode.app/Contents/MacOS/Xcode ''; + app = requireFile rec { name = "Xcode.app"; url = "https://developer.apple.com/services-account/download?path=/Developer_Tools/Xcode_${version}/${xip}"; @@ -83,4 +85,3 @@ in lib.makeExtensible (self: { xcode_15_1 = requireXcode "15.1" "sha256-0djqoSamU87rCpjo50Un3cFg9wKf+pSczRko6uumGM0="; xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; }) - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix b/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix index 545285a6cf..6292552dd5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,16 +1,16 @@ { - version = "2024.0"; + version = "2024.1"; # To get these, run: # # ``` # for tool in alfred batctl batman-adv; do - # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.0/$tool-2024.0.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 + # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.1/$tool-2024.1.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 # done # ``` sha256 = { - alfred = "sha256-0CmkNjirFnceX3HhNLyEPRcT10BBxlvNoYox0Y9VMb0="; - batctl = "sha256-doU+hyAa9jxBHbFS/QxiWnKalzMRWJfRMxYE4sWmfH0="; - batman-adv = "sha256-YREGl7V5n2RqKoKk3Pl/rtS7EqfMQ79Gg9LE3k9rQOc="; + alfred = "sha256-Ji2tOcm+EirH8GFwXIo+O21GJ4K74zcubfyazgw4Tbk="; + batctl = "sha256-aD3anWBU6yYKGsACLGQnmP9ASNbFOmcuoLMXjmt1egk="; + batman-adv = "sha256-pxQynGJR9IMOnPA/U8v7IoDwZ4RxtUxdRvrmGngtQyU="; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/below/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/below/default.nix index 3204bd7dcf..5efc80357d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/below/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/below/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "below"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "below"; rev = "v${version}"; - sha256 = "sha256-2mZBpvLPY6yrEAvB1YlFuaXJlmmNuZqhu3xWADNHbx0="; + sha256 = "sha256-87Fdx3Jqi3dNWM5DZl+UYs031qn2DoiiWd3IysT/glQ="; }; - cargoHash = "sha256-cTNxWCd4YH5VuZh0GRfBNtHmLqCQ75uyHqROkv1jbRA="; + cargoHash = "sha256-y2fNypA0MrCdUI/K6QrZWw/5mkYafj2s6jrGHU2zGXw="; prePatch = ''sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix index ffeb82d9b4..33fa7663f4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix @@ -167,6 +167,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ TethysSvensson qyliss ]; platforms = platforms.linux; - priority = 10; + priority = 15; # below systemd (halt, init, poweroff, reboot) and coreutils }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpupower-gui/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cpupower-gui/default.nix index 02a781d1f0..754f8e1396 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cpupower-gui/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cpupower-gui/default.nix @@ -19,7 +19,7 @@ , pygobject3 , pyxdg , systemd -, wrapGAppsHook +, wrapGAppsHook3 }: buildPythonApplication rec { @@ -55,7 +55,7 @@ buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 # Python packages dbus-python diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpupower/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cpupower/default.nix index 13e2fc78b8..7c1b031d83 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cpupower/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cpupower/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation { description = "Tool to examine and tune power saving features"; homepage = "https://www.kernel.org/"; license = licenses.gpl2; + mainProgram = "cpupower"; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix index 5180917623..784024f875 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "dbus-broker"; - version = "35"; + version = "36"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${finalAttrs.version}"; - hash = "sha256-Qwi9X5jXHiQ3TOWefzv/p7x8/JkQW1QgdYji5SpLej0="; + hash = "sha256-5dAMKjybqrHG57vArbtWEPR/svSj2ION75JrjvnnpVM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/disable-test.patch b/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/disable-test.patch index 487967aea8..14faf1907c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/disable-test.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dbus-broker/disable-test.patch @@ -1,11 +1,14 @@ ---- b/src/meson.build -+++ a/src/meson.build -@@ -196,9 +195,6 @@ - test_fdlist = executable('test-fdlist', ['util/test-fdlist.c'], dependencies: dep_bus) - test('Utility File-Desciptor Lists', test_fdlist) - --test_fs = executable('test-fs', ['util/test-fs.c'], dependencies: dep_bus) --test('File System Helpers', test_fs) +diff --git a/src/meson.build b/src/meson.build +index 4b9bc71..221ed5c 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -202,9 +202,6 @@ test('Error Handling', test_error, suite: 'unit') + test_fdlist = executable('test-fdlist', sources: ['util/test-fdlist.c'], kwargs: test_kwargs) + test('Utility File-Desciptor Lists', test_fdlist, suite: 'unit') + +-test_fs = executable('test-fs', sources: ['util/test-fs.c'], kwargs: test_kwargs) +-test('File System Helpers', test_fs, suite: 'unit') - - test_match = executable('test-match', ['bus/test-match.c'], dependencies: dep_bus) - test('D-Bus Match Handling', test_match) + test_match = executable('test-match', sources: ['bus/test-match.c'], kwargs: test_kwargs) + test('D-Bus Match Handling', test_match, suite: 'unit') + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ddcci/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ddcci/default.nix index ce435b3874..4d1c9bd935 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ddcci/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ddcci/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, kernel }: +{ lib, stdenv, fetchFromGitLab, kernel, fetchpatch }: stdenv.mkDerivation rec { pname = "ddcci-driver"; @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { hash = "sha256-4pCfXJcteWwU6cK8OOSph4XlhKTk289QqLxsSWY7cac="; }; + patches = [ + # See https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/merge_requests/15 + (fetchpatch { + name = "fix-build-with-linux68.patch"; + url = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/3eb20df68a545d07b8501f13fa9d20e9c6f577ed.patch"; + hash = "sha256-Y1ktYaJTd9DtT/mwDqtjt/YasW9cVm0wI43wsQhl7Bg="; + }) + ]; + hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -36,7 +45,7 @@ stdenv.mkDerivation rec { description = "Kernel module driver for DDC/CI monitors"; homepage = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kiike ]; platforms = platforms.linux; broken = kernel.kernelOlder "5.1"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix index 1a50d799b4..a15a9e3213 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix @@ -32,7 +32,7 @@ with lib; { in '' mkdir -p $out cd "${base}" - find . -type f -name '*.dtb' -print0 \ + find -L . -type f -name '*.dtb' -print0 \ | xargs -0 cp -v --no-preserve=mode --target-directory "$out" --parents for dtb in $(find "$out" -type f -name '*.dtb'); do diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/digimend/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/digimend/default.nix index 11756dcbe8..a30d7cbe3a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/digimend/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/digimend/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, kernel }: +{ + lib, + stdenv, + fetchFromGitHub, + kernel, +}: stdenv.mkDerivation rec { pname = "digimend"; - version = "unstable-2023-05-03"; + version = "13"; src = fetchFromGitHub { owner = "digimend"; repo = "digimend-kernel-drivers"; - rev = "eca6e1b701bffb80a293234a485ebf6b4bc85562"; - hash = "sha256-0mjIUgHvbNcVQVzU3xzaloe5R41a4eknDhdhruJH+6c="; + rev = "v${version}"; + hash = "sha256-YYCxTyoZGMnqC2nKkRi5Z1uofldGvJDGY2/sO9iMNIo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix index f09dec758f..3bfaad3035 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dmidecode"; - version = "3.5"; + version = "3.6"; src = fetchurl { url = "mirror://savannah/dmidecode/dmidecode-${version}.tar.xz"; - sha256 = "sha256-eddnNe6OJRluKnIpZM+Wg/WglYFQNTeISyVrATicwHM="; + sha256 = "sha256-5Axl8+w9r+Ma2DSaTvGpcSLTj2UATtZldeGo1XXdi64="; }; makeFlags = [ @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "A tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/drbd/driver.nix b/third_party/nixpkgs/pkgs/os-specific/linux/drbd/driver.nix index efc771905e..106bcf71cd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/drbd/driver.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/drbd/driver.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drbd-${version}-${kernel.version}"; - version = "9.2.7"; + version = "9.2.8"; src = fetchurl { url = "https://pkg.linbit.com//downloads/drbd/9/drbd-${version}.tar.gz"; - sha256 = "1355ns10z0fjgqsdpf09qfy01j8lg2n7zy4kclmar3s798n3mh56"; + hash = "sha256-LqK1lPucab7wKvcB4VKGdvBIq+K9XtuO2m0DP5XtK3M="; }; hardeningDisable = [ "pic" ]; @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { # 6.4 and newer provide a in-tree version of the handshake module https://www.kernel.org/doc/html/v6.4/networking/tls-handshake.html installPhase = '' runHook preInstall - install -D drbd/drbd.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd - install -D drbd/drbd_transport_tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd - install -D drbd/drbd_transport_lb-tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd - install -D drbd/drbd_transport_rdma.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd + install -D drbd/drbd.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9 + install -D drbd/drbd_transport_tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9 + install -D drbd/drbd_transport_lb-tcp.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9 + install -D drbd/drbd_transport_rdma.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9 ${lib.optionalString (lib.versionOlder kernel.version "6.4") '' - install -D drbd/drbd-kernel-compat/handshake/handshake.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd + install -D drbd/drbd-kernel-compat/handshake/handshake.ko -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9 ''} runHook postInstall ''; @@ -41,6 +41,16 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace 'SHELL=/bin/bash' 'SHELL=${builtins.getEnv "SHELL"}' ''; + # builder.pl had complained about the same file (drbd.ko.xz) provided by two different packages + # builder.pl also had complained about different permissions between the files from the two packages + # The compression is required because the kernel has the CONFIG_MODULE_COMPRESS_XZ option enabled + postFixup = '' + for ko in $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/block/drbd9/*.ko; do + xz --compress -6 --threads=0 $ko + chmod 0444 $ko.xz + done + ''; + enableParallelBuilding = true; meta = with lib; { @@ -53,5 +63,6 @@ stdenv.mkDerivation rec { DRBD is a software-based, shared-nothing, replicated storage solution mirroring the content of block devices (hard disks, partitions, logical volumes, and so on) between hosts. ''; + broken = lib.versionAtLeast kernel.version "6.8"; # wait until next DRBD release for 6.8 support https://github.com/LINBIT/drbd/issues/87#issuecomment-2059323084 }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix index b340b21c46..9c16a341a4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { changelog = "https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=${version}"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ mic92 dtzWill amaxine ]; + maintainers = with maintainers; [ mic92 dtzWill ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix index b6ed869a71..9ce71745cd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.8.9"; + version = "2.12.0"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - hash = "sha256-9Csrq9wM7Q99qPj7+NlnQgP6KcciNHMbAAb+Wg7eYAU="; + hash = "sha256-Z/eeIUY7Yl2l/IqK3Z2nxPhn+JLvP976IZ9ZXPBqoSo="; }; hardeningDisable = [ "pic" ]; @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { # linux 3.12 env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + patches = [ + # Use kernel version checks instead of API feature detection + # See https://github.com/NixOS/nixpkgs/pull/310680 + ./override-features-api-detection.patch + ]; + configurePhase = '' runHook preConfigure cd kernel/linux/ena diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ena/override-features-api-detection.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ena/override-features-api-detection.patch new file mode 100644 index 0000000000..099530b121 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ena/override-features-api-detection.patch @@ -0,0 +1,55 @@ +diff --git a/kernel/linux/ena/kcompat.h b/kernel/linux/ena/kcompat.h +index 32a9cc5..8d39362 100644 +--- a/kernel/linux/ena/kcompat.h ++++ b/kernel/linux/ena/kcompat.h +@@ -888,21 +888,6 @@ xdp_prepare_buff(struct xdp_buff *xdp, unsigned char *hard_start, + #define ENA_XDP_XMIT_FREES_FAILED_DESCS_INTERNALLY + #endif + +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) && \ +- !(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 188) && \ +- LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) && \ +- !(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 251) && \ +- LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0))) && \ +- !(defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 6)) && \ +- !(defined(SUSE_VERSION) && (SUSE_VERSION == 15 && SUSE_PATCHLEVEL >= 4)) && \ +- !(defined(SUSE_VERSION) && (SUSE_VERSION == 15 && SUSE_PATCHLEVEL == 3) && \ +- ENA_KERNEL_VERSION_GTE(5, 3, 18, 150300, 59, 43)) +-static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr) +-{ +- memcpy(dev->dev_addr, addr, ETH_ALEN); +-} +-#endif +- + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) || \ + (defined(RHEL_RELEASE_CODE) && \ + RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 6) && \ +@@ -1112,7 +1097,7 @@ static inline void ena_dma_unmap_page_attrs(struct device *dev, + #define pci_dev_id(pdev) ((((u16)(pdev->bus->number)) << 8) | (pdev->devfn)) + #endif /* ENA_HAVE_PCI_DEV_ID */ + +-#ifndef ENA_HAVE_XDP_DO_FLUSH ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0) + #define xdp_do_flush xdp_do_flush_map + #endif /* ENA_HAVE_XDP_DO_FLUSH */ + +@@ -1147,15 +1132,15 @@ static inline unsigned int cpumask_local_spread(unsigned int i, int node) + } + #endif /* ENA_HAVE_CPUMASK_LOCAL_SPREAD */ + +-#ifndef ENA_HAVE_UPDATE_AFFINITY_HINT ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) + static inline int irq_update_affinity_hint(unsigned int irq, const struct cpumask *m) + { + return 0; + } +-#endif /* ENA_HAVE_UPDATE_AFFINITY_HINT */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5.17.0) */ + +-#ifndef ENA_HAVE_ETHTOOL_PUTS ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0) + #define ethtool_puts ethtool_sprintf +-#endif /* ENA_HAVE_ETHTOOL_PUTS */ ++#endif + + #endif /* _KCOMPAT_H_ */ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ethq/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ethq/default.nix index 5936447ac9..581382e4fa 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ethq/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ethq/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/isc-projects/ethq"; license = licenses.mpl20; platforms = platforms.linux; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix index 2aec4f6322..25a82b1806 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { broken = kernel.kernelOlder "4.19"; - changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${version}"; + changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${finalAttrs.version}"; description = "Extensible Virtual Display Interface"; homepage = "https://www.displaylink.com/"; license = with licenses; [ lgpl21Only gpl2Only ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ffado/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ffado/default.nix index dfa974e3e6..610f9d3135 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ffado/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ffado/default.nix @@ -8,7 +8,6 @@ , fetchurl , fetchpatch , glibmm -, kernel , libavc1394 , libconfig , libiec61883 @@ -22,7 +21,6 @@ }: let - inherit (python3.pkgs) pyqt5 dbus-python; python = python3.withPackages (pkgs: with pkgs; [ pyqt5 dbus-python ]); in mkDerivation rec { @@ -61,7 +59,7 @@ mkDerivation rec { pkg-config which python - pyqt5 + python3.pkgs.pyqt5 wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index af455e7ef6..57b4207e38 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -8,7 +8,7 @@ , openssl , udev , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { rustc pkg-config rustPlatform.cargoSetupHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix index 98b9ff5d33..952139bb35 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -6,10 +6,16 @@ flutter.buildFlutterApplication rec { pname = "firmware-updater"; - version = "unstable-2023-09-17"; + version = "unstable-2024-18-04"; pubspecLock = lib.importJSON ./pubspec.lock.json; + patches = [ + ./upgrade-file.patch + ]; + + sourceRoot = "./source/packages/firmware_updater"; + gitHashes = { fwupd = "sha256-l/+HrrJk1mE2Mrau+NmoQ7bu9qhHU6wX68+m++9Hjd4="; }; @@ -17,23 +23,10 @@ flutter.buildFlutterApplication rec { src = fetchFromGitHub { owner = "canonical"; repo = "firmware-updater"; - rev = "855999da8d3d0c9930e06f2d296d82b55aeff79e"; - hash = "sha256-tIeEuHl+sCKd756NYPmxXiV1Sg2m9W0eGUtM/Iskeu8="; + rev = "e48bb3f693e5d76656a3e7bbc07be0fcbfa19f23"; + hash = "sha256-SO3sDIsJCK4Sh51pXO4u6WX4zcFa6jQYu9E+WtVrjDE="; }; - postPatch = '' - rm -f pubspec.lock - ln -s "${writeText "${pname}-overrides.yaml" (builtins.toJSON { - dependency_overrides = { - yaru = "^1.1.0"; - yaru_icons = "^2.2.1"; - yaru_widgets = "^3.1.0"; - mockito = "^5.4.2"; - test_api = "^0.6.1"; - }; - })}" pubspec_overrides.yaml - ''; - meta = with lib; { description = "Firmware Updater for Linux"; mainProgram = "firmware-updater"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock.json b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock.json index 0ad3deb239..2212f02278 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock.json @@ -20,25 +20,15 @@ "source": "hosted", "version": "5.13.0" }, - "ansi_styles": { - "dependency": "transitive", - "description": { - "name": "ansi_styles", - "sha256": "9c656cc12b3c27b17dd982b2cc5c0cfdfbdabd7bc8f3ae5e8542d9867b47ce8a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.2+1" - }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.5.0" }, "async": { "dependency": "transitive", @@ -84,31 +74,31 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65", + "sha256": "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.0.1" }, "build_resolvers": { "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.4.2" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b", + "sha256": "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.6" + "version": "2.4.9" }, "build_runner_core": { "dependency": "transitive", @@ -134,11 +124,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "ff627b645b28fb8bdb69e645f910c2458fd6b65f6585c3a53e0626024897dedf", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.6.2" + "version": "8.9.2" }, "characters": { "dependency": "transitive", @@ -150,16 +140,6 @@ "source": "hosted", "version": "1.3.0" }, - "charcode": { - "dependency": "transitive", - "description": { - "name": "charcode", - "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.1" - }, "checked_yaml": { "dependency": "transitive", "description": { @@ -170,26 +150,6 @@ "source": "hosted", "version": "2.0.3" }, - "cli_launcher": { - "dependency": "transitive", - "description": { - "name": "cli_launcher", - "sha256": "5e7e0282b79e8642edd6510ee468ae2976d847a0a29b3916e85f5fa1bfe24005", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.1" - }, - "cli_util": { - "dependency": "transitive", - "description": { - "name": "cli_util", - "sha256": "b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.0" - }, "clock": { "dependency": "transitive", "description": { @@ -204,31 +164,21 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.0" + "version": "4.10.0" }, "collection": { "dependency": "direct main", "description": { "name": "collection", - "sha256": "f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.17.2" - }, - "conventional_commit": { - "dependency": "transitive", - "description": { - "name": "conventional_commit", - "sha256": "dec15ad1118f029c618651a4359eb9135d8b88f761aa24e4016d061cd45948f2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.0+1" + "version": "1.18.0" }, "convert": { "dependency": "transitive", @@ -274,31 +224,31 @@ "dependency": "direct main", "description": { "name": "dbus", - "sha256": "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.8" + "version": "0.7.10" }, "diacritic": { "dependency": "transitive", "description": { "name": "diacritic", - "sha256": "a84e03ec2779375fb86430dbe9d8fba62c68376f2499097a5f6e75556babe706", + "sha256": "96db5db6149cbe4aa3cfcbfd170aca9b7648639be7e48025f9d458517f807fe4", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.4" + "version": "0.1.5" }, "dio": { "dependency": "direct main", "description": { "name": "dio", - "sha256": "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8", + "sha256": "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.6" + "version": "5.4.3+1" }, "fake_async": { "dependency": "transitive", @@ -314,21 +264,21 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878", + "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.2" }, "file": { "dependency": "direct main", "description": { "name": "file", - "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.4" + "version": "7.0.0" }, "fixnum": { "dependency": "transitive", @@ -363,14 +313,14 @@ "version": "3.0.0-beta.2" }, "flutter_lints": { - "dependency": "direct dev", + "dependency": "transitive", "description": { "name": "flutter_lints", - "sha256": "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4", + "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.2" + "version": "3.0.2" }, "flutter_localizations": { "dependency": "direct main", @@ -382,21 +332,21 @@ "dependency": "transitive", "description": { "name": "flutter_markdown", - "sha256": "2b206d397dd7836ea60035b2d43825c8a303a76a5098e66f42d55a753e18d431", + "sha256": "04c4722cc36ec5af38acc38ece70d22d3c2123c61305d555750a091517bbe504", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.17+1" + "version": "0.6.23" }, "flutter_svg": { "dependency": "transitive", "description": { "name": "flutter_svg", - "sha256": "8c5d68a82add3ca76d792f058b186a0599414f279f00ece4830b9b231b570338", + "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.7" + "version": "2.0.10+1" }, "flutter_test": { "dependency": "direct dev", @@ -414,11 +364,11 @@ "dependency": "direct dev", "description": { "name": "freezed", - "sha256": "2df89855fe181baae3b6d714dc3c4317acf4fccd495a6f36e5e00f24144c6c3b", + "sha256": "a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.5.2" }, "freezed_annotation": { "dependency": "direct main", @@ -434,11 +384,11 @@ "dependency": "transitive", "description": { "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "4.0.0" }, "fuchsia_remote_debug_protocol": { "dependency": "transitive", @@ -461,11 +411,11 @@ "dependency": "transitive", "description": { "name": "get_it", - "sha256": "529de303c739fca98cd7ece5fca500d8ff89649f1bb4b4e94fb20954abcd7468", + "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.6.0" + "version": "7.7.0" }, "glob": { "dependency": "transitive", @@ -521,11 +471,11 @@ "dependency": "transitive", "description": { "name": "http", - "sha256": "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525", + "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.2.1" }, "http_multi_server": { "dependency": "transitive", @@ -577,31 +527,61 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.7" + "version": "0.7.1" }, "json_annotation": { "dependency": "transitive", "description": { "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.8.1" + "version": "4.9.0" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.0" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" }, "lints": { "dependency": "transitive", "description": { "name": "lints", - "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452", + "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "3.0.0" }, "list_counter": { "dependency": "transitive", @@ -637,61 +617,51 @@ "dependency": "transitive", "description": { "name": "markdown", - "sha256": "acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd", + "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.1.1" + "version": "7.2.2" }, "matcher": { "dependency": "transitive", "description": { "name": "matcher", - "sha256": "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16" + "version": "0.12.16+1" }, "material_color_utilities": { "dependency": "transitive", "description": { "name": "material_color_utilities", - "sha256": "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41", + "sha256": "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.0" - }, - "melos": { - "dependency": "direct dev", - "description": { - "name": "melos", - "sha256": "3f22f6cc629d72acf3acc8a7f8563384550290fa30790efa328c9cf606aa17d7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.1" + "version": "0.8.0" }, "meta": { "dependency": "direct main", "description": { "name": "meta", - "sha256": "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3", + "sha256": "d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.1" + "version": "1.11.0" }, "mime": { "dependency": "transitive", "description": { "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "mockito": { "dependency": "direct dev", @@ -703,16 +673,6 @@ "source": "hosted", "version": "5.4.2" }, - "mustache_template": { - "dependency": "transitive", - "description": { - "name": "mustache_template", - "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, "nested": { "dependency": "transitive", "description": { @@ -737,11 +697,11 @@ "dependency": "direct main", "description": { "name": "path", - "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.8.3" + "version": "1.9.0" }, "path_parsing": { "dependency": "transitive", @@ -757,31 +717,31 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.4.0" + "version": "6.0.2" }, "platform": { "dependency": "transitive", "description": { "name": "platform", - "sha256": "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76", + "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.4" }, "plugin_platform_interface": { "dependency": "transitive", "description": { "name": "plugin_platform_interface", - "sha256": "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.1.8" }, "pool": { "dependency": "transitive", @@ -797,31 +757,21 @@ "dependency": "transitive", "description": { "name": "process", - "sha256": "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09", + "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.4" - }, - "prompts": { - "dependency": "transitive", - "description": { - "name": "prompts", - "sha256": "3773b845e85a849f01e793c4fc18a45d52d7783b4cb6c0569fad19f9d0a774a1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" + "version": "5.0.2" }, "provider": { "dependency": "direct main", "description": { "name": "provider", - "sha256": "cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f", + "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.5" + "version": "6.1.2" }, "pub_semver": { "dependency": "transitive", @@ -833,26 +783,6 @@ "source": "hosted", "version": "2.1.4" }, - "pub_updater": { - "dependency": "transitive", - "description": { - "name": "pub_updater", - "sha256": "b06600619c8c219065a548f8f7c192b3e080beff95488ed692780f48f69c0625", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.1" - }, - "pubspec": { - "dependency": "transitive", - "description": { - "name": "pubspec", - "sha256": "f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.0" - }, "pubspec_parse": { "dependency": "transitive", "description": { @@ -863,25 +793,15 @@ "source": "hosted", "version": "1.2.3" }, - "quiver": { - "dependency": "transitive", - "description": { - "name": "quiver", - "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, "safe_change_notifier": { "dependency": "direct main", "description": { "name": "safe_change_notifier", - "sha256": "e69034655ea33aa7dce3c5bb33cf12fc7c07a0ce7d59b7291fd030b70d059570", + "sha256": "8d0645ec2706f580912c38de488439ddb491be48247826927b7bc2e54ea8f7af", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.3.2" }, "screen_retriever": { "dependency": "transitive", @@ -923,11 +843,11 @@ "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.5.0" }, "source_span": { "dependency": "transitive", @@ -943,21 +863,31 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.0" + "version": "1.11.1" + }, + "state_notifier": { + "dependency": "transitive", + "description": { + "name": "state_notifier", + "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" }, "stream_channel": { "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "stream_transform": { "dependency": "transitive", @@ -1000,7 +930,7 @@ "version": "1.2.1" }, "test_api": { - "dependency": "direct overridden", + "dependency": "transitive", "description": { "name": "test_api", "sha256": "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b", @@ -1029,55 +959,55 @@ "source": "hosted", "version": "1.3.2" }, + "ubuntu_lints": { + "dependency": "direct dev", + "description": { + "name": "ubuntu_lints", + "sha256": "1c9fd31f3b3e24969f4c5e5ccf19e1665df3e27ce9ff22ca000e4f687c4772c4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.0" + }, "ubuntu_localizations": { "dependency": "transitive", "description": { "name": "ubuntu_localizations", - "sha256": "a75e87b9f1c3dc678f69a943eb4cee8ccbd5b0db64d491750325950e311adab0", + "sha256": "eca4f43453339acca16b4b23a70b93315ab92b1500f98156a8f95af5e5078def", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.4" + "version": "0.3.6" }, "ubuntu_logger": { "dependency": "direct main", "description": { "name": "ubuntu_logger", - "sha256": "f6d663e5b9c33e90a7a77a2f15b7f76e90be1dd98a94b6640d7bd74db262060f", + "sha256": "90de0c496c2c35757e0d6a32d2e3555cb37e9c2d4aab356bad589f64234bcdcc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.3" + "version": "0.1.1" }, "ubuntu_service": { "dependency": "direct main", "description": { "name": "ubuntu_service", - "sha256": "f6ad4dfb099af41e750c59aad00d67a96e22df00f4962d2e25d56ae3db78be49", + "sha256": "b9845f972bcc919df79381b0eb42cceee1834b3232b3f444c0e4943d66d01901", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.4" - }, - "ubuntu_session": { - "dependency": "direct main", - "description": { - "name": "ubuntu_session", - "sha256": "ce79fdd31faf7982b061b2e4a1cdd0815baf3b6b976e9c16c72609749511f3a1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.4" + "version": "0.3.2" }, "ubuntu_test": { "dependency": "direct main", "description": { "name": "ubuntu_test", - "sha256": "2361b741808a11d95c64a50666151d536133e75cade17b8feccca1e67364be88", + "sha256": "ed8e277575e74057e59363eced7c86b5c9cb172b560b7590ab911eed738e32e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.0-beta.6" + "version": "0.1.0-beta.9" }, "upower": { "dependency": "direct main", @@ -1089,45 +1019,35 @@ "source": "hosted", "version": "0.7.0" }, - "uri": { - "dependency": "transitive", - "description": { - "name": "uri", - "sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, "vector_graphics": { "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "670f6e07aca990b4a2bcdc08a784193c4ccdd1932620244c3a86bb72a0eac67f", + "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.7" + "version": "1.1.11+1" }, "vector_graphics_codec": { "dependency": "transitive", "description": { "name": "vector_graphics_codec", - "sha256": "7451721781d967db9933b63f5733b1c4533022c0ba373a01bdd79d1a5457f69f", + "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.7" + "version": "1.1.11+1" }, "vector_graphics_compiler": { "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "80a13c613c8bde758b1464a1755a7b3a8f2b6cec61fbf0f5a53c94c30f03ba2e", + "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.7" + "version": "1.1.11+1" }, "vector_math": { "dependency": "transitive", @@ -1143,11 +1063,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f", + "sha256": "b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.7.1" + "version": "13.0.0" }, "watcher": { "dependency": "transitive", @@ -1163,54 +1083,54 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.4-beta" + "version": "0.5.1" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", + "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.5" }, "webdriver": { "dependency": "transitive", "description": { "name": "webdriver", - "sha256": "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49", + "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "3.0.3" }, "window_manager": { "dependency": "transitive", "description": { "name": "window_manager", - "sha256": "6ee795be9124f90660ea9d05e581a466de19e1c89ee74fc4bf528f60c8600edd", + "sha256": "b3c895bdf936c77b83c5254bec2e6b3f066710c1f89c38b20b8acc382b525494", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.6" + "version": "0.3.8" }, "xml": { "dependency": "transitive", "description": { "name": "xml", - "sha256": "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.0" + "version": "6.5.0" }, "yaml": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "yaml", "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", @@ -1219,25 +1139,15 @@ "source": "hosted", "version": "3.1.2" }, - "yaml_edit": { - "dependency": "transitive", - "description": { - "name": "yaml_edit", - "sha256": "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, "yaru": { "dependency": "direct main", "description": { "name": "yaru", - "sha256": "24047f0de452784840a326874192d26cb5ebd8cf5eac7864086e5bc9272a28db", + "sha256": "e9ccb22cb283ecf3f6b21d64dee9764d4abff65a44f48ce21aa13b9eae3e3be5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.2.2" }, "yaru_color_generator": { "dependency": "transitive", @@ -1263,51 +1173,51 @@ "dependency": "direct main", "description": { "name": "yaru_icons", - "sha256": "cbb0b5945f407116fd8a1fbe7265e7ffa0d568249d496343a69cb5c55360bba1", + "sha256": "2dff89ee31c2dd888e1ce146f0faef1c8de4ffbc90cb6466aacd55c3a9ad0674", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.4.0" }, "yaru_test": { "dependency": "transitive", "description": { "name": "yaru_test", - "sha256": "9396269fbe026bb9c398b9d4308c76982090ddeca102e4846bd4ba595333ff0a", + "sha256": "a62539bd03465065e4067e1c88472d5789a7215bd4a0873f051abb7896ff0934", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.4" + "version": "0.1.5" }, "yaru_widgets": { "dependency": "direct main", "description": { "name": "yaru_widgets", - "sha256": "482a71ef5566c6cb4135272f0041bf8a9c35729bf9079b0d304eedfa2fa0cc0c", + "sha256": "0bade922090f25eedcc88cdc15b8a6adbaba4e4b56d793e999224b22c95a19d2", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.6.0" }, "yaru_window": { "dependency": "transitive", "description": { "name": "yaru_window", - "sha256": "55c8f039d13aaa1b211a8cf0b7731ae2fdcac9b1be1e0994eb14ad1d17fecaf7", + "sha256": "c9d16f78962652ad71aa160ab0a1e2e5924359439303394f980fd00eefc905eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.3" + "version": "0.2.1" }, "yaru_window_linux": { "dependency": "transitive", "description": { "name": "yaru_window_linux", - "sha256": "c45606cf75880ae6427bbe176dc5313356f16c876c7013a19aeee782882c40c2", + "sha256": "3676355492eba0461f03acf1b7420f7885982d1bffe113fccdca9415fbe39f5d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.3" + "version": "0.2.0" }, "yaru_window_manager": { "dependency": "transitive", @@ -1341,7 +1251,7 @@ } }, "sdks": { - "dart": ">=3.1.0-185.0.dev <4.0.0", - "flutter": ">=3.10.0" + "dart": ">=3.3.0 <4.0.0", + "flutter": ">=3.19.0" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/upgrade-file.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/upgrade-file.patch new file mode 100644 index 0000000000..2c82fa8bba --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/upgrade-file.patch @@ -0,0 +1,13 @@ +diff --git a/pubspec.yaml b/pubspec.yaml +index e9dfa1f..ec9f2f2 100644 +--- a/pubspec.yaml ++++ b/pubspec.yaml +@@ -10,7 +10,7 @@ dependencies: + collection: ^1.17.2 + dbus: ^0.7.8 + dio: ^5.3.3 +- file: ^6.1.4 ++ file: ^7.0.0 + flutter: + sdk: flutter + flutter_html: ^3.0.0-beta.2 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix index acbc0d5562..d89c4a7b14 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "fwupd-efi"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://people.freedesktop.org/~hughsient/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-RdKneTGzYkFt7CY22r9O/w0doQvBzMoayYDoMv7buhI="; + url = "https://github.com/fwupd/fwupd-efi/releases/download/${version}/fwupd-efi-${version}.tar.xz"; + hash = "sha256-r9CAWirQgafK/y71vABM46AUe1OAFejsqWY0FxaxJg4="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://fwupd.org/"; - maintainers = with maintainers; [ amaxine ]; + maintainers = with maintainers; [ ]; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix index 71a7cd9e94..31ac23df39 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with sourceTypes; [ binaryFirmware ]; - maintainers = with maintainers; [ - hexa - ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; }) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix index e2f2fd4f9f..3ad52b3145 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix @@ -40,9 +40,7 @@ stdenv.mkDerivation { sourceProvenance = with sourceTypes; [ binaryFirmware ]; - maintainers = with maintainers; [ - hexa - ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index 3739c1dc3e..7098f1f320 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,7 +1,7 @@ # This file is autogenerated! Run ./update.sh to regenerate. { - version = "20240410"; - revision = "20240410"; - sourceHash = "sha256-Qo4f5kdHlBYKlzdFOtoKoCPHXxgDeCawSE3tnRwfC4U="; - outputHash = "sha256-pOYDdb0A1sESiT0kfA4DbWxKJ3+pog54+S3KcQB3BsA="; + version = "20240513"; + revision = "20240513"; + sourceHash = "sha256-8yzs8lgPHG3zbUvlsWSuP1O/4s28dRFbju2c9kbaFsg="; + outputHash = "sha256-LDd6FU1/16X7KoCCDq0yPvwJzK4H9NxHgrEdhEfaUGY="; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix index 8b54a1f9a7..2cf5243422 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "fscrypt"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; rev = "v${version}"; - hash = "sha256-4Im3YWhLs5Q+o4DtpSuSMuKtKqXaICL9/EB0q5um6mQ="; + hash = "sha256-US1jw0XK1BcP037XPhttzBloDU62m4BVSIbsGs9LaJU="; }; postPatch = '' @@ -19,7 +19,7 @@ buildGoModule rec { --replace "/usr/local" "$out" ''; - vendorHash = "sha256-APW0XM6fTQOCw4tE1NA5VNN3fBUmsvn99NqqJnB3Q0s="; + vendorHash = "sha256-FuVWV3Rimhd+Pm9wrKGLWQWtbP1hWvoWa22pQT+m2go="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix index f04b8fcd21..5a06fac5d6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "24.01.00"; + version = "24.03.00"; src = fetchzip { url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "sha256-MXWmKxcxgSVCSeeGlWsa8JTBa5hLyvGPZ0811w+s+yA="; + sha256 = "sha256-UKL5q5sURSVXvEOzoZdG+wWBSS5f9YWo5stViY3F2vg="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/game-devices-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/game-devices-udev-rules/default.nix index daaf23db6c..ca2ef7a449 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/game-devices-udev-rules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/game-devices-udev-rules/default.nix @@ -6,20 +6,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "game-devices-udev-rules"; - version = "0.22"; + version = "0.23"; src = fetchFromGitea { domain = "codeberg.org"; owner = "fabiscafe"; repo = "game-devices-udev"; rev = finalAttrs.version; - hash = "sha256-1aOb8pJxB+/PM7spcvZcy/cwdEolHQ4+lwBLij+6iDk="; + hash = "sha256-dWWo3qXnxdLP68NuFKM4/Cw5yE6uAsWzj0vZa9UTT0U="; }; postInstall = '' install -Dm444 -t "$out/lib/udev/rules.d" *.rules substituteInPlace $out/lib/udev/rules.d/71-powera-controllers.rules \ - --replace "/bin/sh" "${bash}/bin/bash" + --replace-fail "/bin/sh" "${bash}/bin/bash" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix index 02ca3d30d2..11791a664c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "google-authenticator-libpam"; - version = "1.09"; + version = "1.10"; src = fetchFromGitHub { owner = "google"; repo = "google-authenticator-libpam"; rev = version; - hash = "sha256-DS0h6FWMNKnSSj039bH6iyWrERa5M7LBSkbyig6pyxY="; + hash = "sha256-KEfwQeJIuRF+S3gPn+maDb8Fu0FRXLs2/Nlbjj2d3AE="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix index e082038730..d274c375fb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/guvcview/default.nix @@ -21,7 +21,7 @@ # can be turned off if used as a library , useGtk ? true , gtk3 ? null -, wrapGAppsHook ? null +, wrapGAppsHook3 ? null }: assert pulseaudioSupport -> libpulseaudio != null; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { intltool pkg-config ] - ++ lib.optionals (useGtk) [ wrapGAppsHook ] + ++ lib.optionals (useGtk) [ wrapGAppsHook3 ] ++ lib.optionals (useQt) [ wrapQtAppsHook ] ; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix index 83519d7f2a..320f10d551 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.381"; + version = "0.382"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-FD1p4qyO+ZsBdMXRa9u6CpO07RewWH8OxULLxcYAsyk="; + hash = "sha256-j7ITcLilcnV8QCUFC/Ybv1dX6Kl36P0G9vBlrzifhFQ="; }; configureFlags = [ "--datadir=${placeholder "out"}/share" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix index f4a250d4a8..e686e06804 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "24.09.28717.12"; + version = "24.13.29138.7"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - hash = "sha256-RzXV6icenMcQxmOfKA8Tpb6FigLXz3ZyoL0n16+jFRc="; + hash = "sha256-AMIuA1AMrSX0xpdGSfye8iUJTk5s9HDiRy9Yy3kZss8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix index 031dbfa700..597989c5a0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + configureFlags = [ + "--color" "auto" + ]; + makeFlags = [ "PREFIX=$(out)" "SBINDIR=$(out)/sbin" @@ -46,7 +50,9 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; # netem requires $HOSTCC nativeBuildInputs = [ bison flex pkg-config ]; - buildInputs = [ db iptables elfutils libmnl ]; + buildInputs = [ db iptables libmnl ] + # needed to uploaded bpf programs + ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ elfutils ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix index fe9cb1da01..276926fef8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { homepage = "https://github.com/intel/ipu6-drivers"; description = "IPU6 kernel driver"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ hexa ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" ]; # requires 6.1.7 https://github.com/intel/ipu6-drivers/pull/84 broken = kernel.kernelOlder "6.1.7"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix index 72173de49b..5612c9170a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { homepage = "https://github.com/intel/ivsc-driver"; description = "Intel Vision Sensing Controller kernel driver"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ hexa ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" ]; broken = kernel.kernelOlder "5.15"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix index 0a7d23d3d3..5c1d153b83 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { description = "Wireless daemon for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill fpletz amaxine ]; + maintainers = with maintainers; [ dtzWill fpletz ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index c213bd4e6f..84090cba86 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -871,12 +871,14 @@ let }; zram = { - ZRAM = module; - ZRAM_WRITEBACK = option yes; - ZRAM_MULTI_COMP = whenAtLeast "6.2" yes; - ZSWAP = option yes; - ZPOOL = yes; - ZBUD = option yes; + ZRAM = module; + ZRAM_WRITEBACK = option yes; + ZRAM_MULTI_COMP = whenAtLeast "6.2" yes; + ZRAM_DEF_COMP_ZSTD = whenAtLeast "5.11" yes; + ZSWAP = option yes; + ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" (mkOptionDefault yes); + ZPOOL = yes; + ZSMALLOC = option yes; }; brcmfmac = { @@ -948,8 +950,8 @@ let THRUSTMASTER_FF = yes; ZEROPLUS_FF = yes; - MODULE_COMPRESS = whenOlder "5.13" yes; - MODULE_COMPRESS_XZ = yes; + MODULE_COMPRESS = whenOlder "5.13" yes; + MODULE_COMPRESS_XZ = yes; SYSVIPC = yes; # System-V IPC @@ -1124,6 +1126,7 @@ let FW_LOADER_USER_HELPER_FALLBACK = option no; FW_LOADER_COMPRESS = whenAtLeast "5.3" yes; + FW_LOADER_COMPRESS_ZSTD = whenAtLeast "5.19" yes; HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix index 77c6ee0319..37c138402d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix @@ -12,9 +12,13 @@ , rustc , rustPlatform , rust-bindgen +# testing +, emptyFile +, nixos , nixosTests }@args': +let overridableKernel = lib.makeOverridable ({ # The kernel source tarball. src @@ -211,11 +215,15 @@ let }; # end of configfile derivation kernel = (callPackage ./manual-config.nix { inherit lib stdenv buildPackages; }) (basicArgs // { - inherit kernelPatches randstructSeed extraMakeFlags extraMeta configfile; + inherit kernelPatches randstructSeed extraMakeFlags extraMeta configfile modDirVersion; pos = builtins.unsafeGetAttrPos "version" args; - config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; } // lib.optionalAttrs withRust { CONFIG_RUST = "y"; }; - } // lib.optionalAttrs (modDirVersion != null) { inherit modDirVersion; }); + config = { + CONFIG_MODULES = "y"; + CONFIG_FW_LOADER = "m"; + CONFIG_RUST = if withRust then "y" else "n"; + }; + }); in kernel.overrideAttrs (finalAttrs: previousAttrs: { @@ -241,7 +249,41 @@ kernel.overrideAttrs (finalAttrs: previousAttrs: { + toString (lib.attrNames (lib.toFunction args { })) ) overridableKernel; }; - in [ (nixosTests.kernel-generic.passthru.testsForKernel overridableKernel) ] ++ kernelTests; + /* Certain arguments must be evaluated lazily; so that only the output(s) depend on them. + Original reproducer / simplified use case: + */ + versionDoesNotDependOnPatchesEtcNixOS = + builtins.seq + (nixos ({ config, pkgs, ... }: { + boot.kernelPatches = [ + (builtins.seq config.boot.kernelPackages.kernel.version { patch = pkgs.emptyFile; }) + ]; + })).config.boot.kernelPackages.kernel.outPath + emptyFile; + versionDoesNotDependOnPatchesEtc = + builtins.seq + (import ./generic.nix args' (args // ( + let explain = attrName: + '' + The ${attrName} attribute must be able to access the kernel.version attribute without an infinite recursion. + That means that the kernel attrset (attrNames) and the kernel.version attribute must not depend on the ${attrName} argument. + The fact that this exception is raised shows that such a dependency does exist. + This is a problem for the configurability of ${attrName} in version-aware logic such as that in NixOS. + Strictness can creep in through optional attributes, or assertions and warnings that run as part of code that shouldn't access what is checked. + ''; + in { + kernelPatches = throw (explain "kernelPatches"); + structuredExtraConfig = throw (explain "structuredExtraConfig"); + modDirVersion = throw (explain "modDirVersion"); + }))).version + emptyFile; + in [ + (nixosTests.kernel-generic.passthru.testsForKernel overridableKernel) + versionDoesNotDependOnPatchesEtc + # Disabled by default, because the infinite recursion is hard to understand. The other test's error is better and produces a shorter trace. + # versionDoesNotDependOnPatchesEtcNixOS + ] ++ kernelTests; }; -})) +})); +in overridableKernel diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/htmldocs.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/htmldocs.nix index dad377db06..eb22645d2e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/htmldocs.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/htmldocs.nix @@ -6,8 +6,8 @@ , makeFontsConf , perl , python3 -, sphinx , which +, fetchpatch }: stdenv.mkDerivation { @@ -15,6 +15,16 @@ stdenv.mkDerivation { inherit (linux_latest) version src; + patches = [ + # docutils 0.21 has removed nodes.reprunicode + # fixes the `AttributeError` thrown when building docs. + (fetchpatch { + name = "docutils_fix.patch"; + url = "https://lore.kernel.org/linux-doc/faf5fa45-2a9d-4573-9d2e-3930bdc1ed65@gmail.com/raw"; + hash = "sha256-JuV1B/8iDysbH0tl+wr/rdXvoC34uUq25ejMFmD0hio="; + }) + ]; + postPatch = '' patchShebangs \ Documentation/sphinx/parse-headers.pl \ @@ -48,11 +58,11 @@ stdenv.mkDerivation { cp -r Documentation/* $out/share/doc/linux-doc/ ''; - meta = with lib; { + meta = { description = "Linux kernel html documentation"; homepage = "https://www.kernel.org/doc/htmldocs/"; - platforms = platforms.linux; + platforms = lib.platforms.linux; inherit (linux_latest.meta) license; - maintainers = with maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json index 50e6512b15..4e9cde7e4e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,34 +1,38 @@ { "testing": { - "version": "6.9-rc4", - "hash": "sha256:11wpak03nv9cg00jiyfrk21p7mzka553ih2c2dxr0ridig6mj8b3" + "version": "6.9-rc6", + "hash": "sha256:075l5vhk8zmwln4jks7gr5n5k67s65qvs07l2rpbc7a75fdp6c14" }, "6.1": { - "version": "6.1.87", - "hash": "sha256:092iv5w5d6kwgiyzs7zajmhdxc1w03sinvvr1dwy9bp8f9mg2ypw" + "version": "6.1.90", + "hash": "sha256:07cfg0chssvpc4mqls3aln6s4lqjp6k4x2n63wndmkjgfqpdg8w3" }, "5.15": { - "version": "5.15.156", - "hash": "sha256:0y3p7sqr8hsn0v9ybqlcmn1z150zc13yckgrymb10sck9k8na14z" + "version": "5.15.158", + "hash": "sha256:1inmdpif3qf1blmvjj4i7y42bylvhv0wyj3b0apq12zxlj1iq1zr" }, "5.10": { - "version": "5.10.215", - "hash": "sha256:1af6h86flx96pszg006agpak2f9dkk2jqaazfykd7aafqdcs3747" + "version": "5.10.216", + "hash": "sha256:0lg1zfb9y4ps86q85mlnyalb3s90zix003z62jb9bw139f65h473" }, "5.4": { - "version": "5.4.274", - "hash": "sha256:1m4yyyv48mfkzhqms88dv1jf39zsfp88az5zpqynmm1wlhhv9iza" + "version": "5.4.275", + "hash": "sha256:0k1hyknx854k8z27j4rq1gcp8l0xc0bspmrhc41a033gjilb1lns" }, "4.19": { - "version": "4.19.312", - "hash": "sha256:0jppa4p73pssd7m3jpc7i6rgnj9gawjcgk4wmqyy87ijzrgzm553" + "version": "4.19.313", + "hash": "sha256:1j1r4mrdh1ray468jr5i8d2afiswb653bhq0ck8bcdw4rwp5w558" }, "6.6": { - "version": "6.6.28", - "hash": "sha256:151kdpp25fcl5qki138jxl90h9iyk5rk0kp2xamadnz72gnid1w1" + "version": "6.6.30", + "hash": "sha256:1ilwmgpgvddwkd9nx5999cb6z18scjyq7jklid26k1hg7f35nsmn" }, "6.8": { - "version": "6.8.7", - "hash": "sha256:1bigq9my88d9xh647hgsy8gzval7p06hhacpxaqb71sfmwgil799" + "version": "6.8.9", + "hash": "sha256:1dn9bgmf03bdfbmgq98d043702g808rjikxs2i9yia57iqiz21gr" + }, + "6.9": { + "version": "6.9", + "hash": "sha256:0jc14s7z2581qgd82lww25p7c4w72scpf49z8ll3wylwk3xh3yi4" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index 92f71e6496..3344808ca2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19536"; - sha256 = "1lwg4340nga0sn5jcsqrmqskf2cf4vvjhkbdl0h54bj3lcnbxaw4"; + rev = "19546"; + sha256 = "1yyj7pbfs02fki1rdxfj9gcrxdrl26igisy4fji7czcc9xbw03qm"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 337594115f..b013c7f1bf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.213-rt105"; # updated by ./update-rt.sh + version = "5.10.215-rt107"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "105df7w6m5a3fngi6ajqs5qblaq4lbxsgcppllrk7v1r68i31kw4"; + sha256 = "1af6h86flx96pszg006agpak2f9dkk2jqaazfykd7aafqdcs3747"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1q5kz3mfvwb4fd5i2mbklsa6gifb8g3wbq0wi2478q097dvmb6gi"; + sha256 = "0lnnpnfmypafzfzhcmaxqqc18nna4fr236v6hrcyabnxmxam79xj"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix index 5b222c4b45..cab04ad0c7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix @@ -26,7 +26,7 @@ in lib.makeOverridable ({ extraMakeFlags ? [], # The name of the kernel module directory # Needs to be X.Y.Z[-extra], so pad with zeros if needed. - modDirVersion ? lib.versions.pad 3 version, + modDirVersion ? null /* derive from version */, # The kernel source (tarball, git checkout, etc.) src, # a list of { name=..., patch=..., extraConfig=...} patches @@ -54,6 +54,13 @@ in lib.makeOverridable ({ }: let + # Provide defaults. Note that we support `null` so that callers don't need to use optionalAttrs, + # which can lead to unnecessary strictness and infinite recursions. + modDirVersion_ = if modDirVersion == null then lib.versions.pad 3 version else modDirVersion; +in +let + # Shadow the un-defaulted parameter; don't want null. + modDirVersion = modDirVersion_; inherit (lib) hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index e94b74fb00..de33ff75d8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.28"; - hash = "sha256-0ld4pZIddfkGytxzqgC7AGD3gc2H9mhZbhpbFLD3G+s="; + version = "6.6.30"; + hash = "sha256-fQATjYekxV/+24mqyel3bYfgUMN4NhOHR9yyL6L5bl0="; variant = "lts"; }; mainVariant = { - version = "6.8.7"; - hash = "sha256-S9UooZhMtvfyL2BVUfMBxvPLkZvXm37duWSjcpk5dvY="; + version = "6.8.9"; + hash = "sha256-OUlT/fiwLGTPnr/7gneyZBio/l8KAWopcJqTpSjBMl0="; variant = "main"; }; @@ -45,6 +45,9 @@ let HZ = freeform "250"; HZ_250 = yes; HZ_1000 = no; + + # Disable writeback throttling by default + BLK_WBT_MQ = lib.mkOverride 60 no; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix index 1f36e36c23..d2e32e4b09 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -84,8 +84,8 @@ let SCHED_PDS = yes; # Swap storage is compressed with LZ4 using zswap - ZSWAP_COMPRESSOR_DEFAULT_LZ4 = yes; - ZSWAP_COMPRESSOR_DEFAULT = freeform "lz4"; + ZSWAP_COMPRESSOR_DEFAULT_LZ4 = lib.mkOptionDefault yes; + ZSWAP_COMPRESSOR_DEFAULT_ZSTD = lib.mkDefault no; # Fix error: unused option: XXX. CFS_BANDWIDTH = lib.mkForce (option no); diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/default.nix index a77d1290ca..3224fc137d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/default.nix @@ -6,9 +6,6 @@ stdenv.mkDerivation { src = looking-glass-client.src; sourceRoot = "${looking-glass-client.src.name}/module"; - patches = lib.optional (kernel.kernelAtLeast "6.4") [ - ./linux-6-4-compat.patch - ]; hardeningDisable = [ "pic" "format" ]; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/linux-6-4-compat.patch b/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/linux-6-4-compat.patch deleted file mode 100644 index e57d1d27c3..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/linux-6-4-compat.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/kvmfr.c b/kvmfr.c -index 121aae5b..2f4c9e1a 100644 ---- a/kvmfr.c -+++ b/kvmfr.c -@@ -539,7 +539,11 @@ static int __init kvmfr_module_init(void) - if (kvmfr->major < 0) - goto out_free; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0) - kvmfr->pClass = class_create(THIS_MODULE, KVMFR_DEV_NAME); -+#else -+ kvmfr->pClass = class_create(KVMFR_DEV_NAME); -+#endif - if (IS_ERR(kvmfr->pClass)) - goto out_unreg; - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix index 6d6c604b1c..eeccf301ee 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "lenovo-legion-app"; - version = "0.0.9"; + version = "0.0.12"; src = fetchFromGitHub { owner = "johnfanv2"; repo = "LenovoLegionLinux"; rev = "v${version}-prerelease"; - hash = "sha256-PQdxfDfW3sn0wWjmsPoAt3HZ43PS3Tyez3/0KEVVZQg="; + hash = "sha256-BNrRv9EBmNINQbAw+BzVxKl/XoDgH1tsNZHJxfSpNoU="; }; sourceRoot = "${src.name}/python/legion_linux"; @@ -17,6 +17,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pyqt5 + pyqt6 argcomplete pyyaml darkdetect @@ -26,13 +27,13 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace ./setup.cfg \ - --replace "_VERSION" "${version}" + --replace-fail "_VERSION" "${version}" substituteInPlace ../../extra/service/fancurve-set \ - --replace "FOLDER=/etc/legion_linux/" "FOLDER=$out/share/legion_linux" + --replace-fail "FOLDER=/etc/legion_linux/" "FOLDER=$out/share/legion_linux" substituteInPlace ./legion_linux/legion.py \ - --replace "/etc/legion_linux" "$out/share/legion_linux" - substituteInPlace ./legion_linux/legion_gui{,_user}.desktop \ - --replace "Icon=/usr/share/pixmaps/legion_logo.png" "Icon=legion_logo" + --replace-fail "/etc/legion_linux" "$out/share/legion_linux" + substituteInPlace ./legion_linux/legion_gui.desktop \ + --replace-fail "Icon=/usr/share/pixmaps/legion_logo.png" "Icon=legion_logo" ''; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/0.x.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/0.x.nix index 480e78d080..b34cca4a51 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/0.x.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/0.x.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-daVS+TErmDU8ksThOvcepg1A61iD8N8GIkC40cmc9/8="; + sha256 = "sha256-J5cUvfUYc+uLdkFa2jx/2bqBoZg/eSzc6SWlgKqcfIc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix index 99454beb41..e910835ea0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-3TCsIlr28vO6Zu9lDaEq6J4J+D5sHP7SSo1O/M0ZzUo="; + sha256 = "sha256-dAyUBcOItDZNe2xBWoegCAmOnTugc1C7+k/hj20icJA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix index 59aa5bbc0e..478b5fa8ac 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libcap-ng/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libcap-ng"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${version}.tar.gz"; - sha256 = "sha256-aFgdOzjnVTy29t33gTsfyZ5ShW8hQh97R3zlq9JgWoo="; + hash = "sha256-O6UpTRy9+pivqs+8ALavntK4PoohgXGF39hEzIx6xv8="; }; outputs = [ "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix index 34c798ca33..7346e0d67d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C Library for NVM Express on Linux"; homepage = "https://github.com/linux-nvme/libnvme"; - maintainers = with maintainers; [ fogti vifino ]; + maintainers = with maintainers; [ vifino ]; license = with licenses; [ lgpl21Plus ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libzbc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libzbc/default.nix index 94f5c93f94..79a4277a85 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libzbc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libzbc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ZBC device manipulation library"; homepage = "https://github.com/westerndigitalcorporation/libzbc"; - maintainers = [ maintainers.fogti ]; + maintainers = [ ]; license = with licenses; [ bsd2 lgpl3Plus ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libzbd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libzbd/default.nix index 4675a13837..3bc48d0657 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libzbd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libzbd/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Zoned block device manipulation library and tools"; mainProgram = "zbd"; homepage = "https://github.com/westerndigitalcorporation/libzbd"; - maintainers = [ maintainers.fogti ]; + maintainers = [ ]; license = with licenses; [ lgpl3Plus gpl3Plus ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lxc/add-meson-options.patch b/third_party/nixpkgs/pkgs/os-specific/linux/lxc/add-meson-options.patch deleted file mode 100644 index 01aea4df27..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lxc/add-meson-options.patch +++ /dev/null @@ -1,153 +0,0 @@ -diff --git a/meson.build b/meson.build -index 21a8705d0..f12b81442 100644 ---- a/meson.build -+++ b/meson.build -@@ -50,7 +50,7 @@ rootfsmount = get_option('rootfs-mount-path') - user_network_db_opt = get_option('usernet-db-path') - user_network_conf_opt = get_option('usernet-config-path') - --bashcompletiondir = join_paths('/', 'usr', 'share', 'bash-completion', 'completions') -+bashcompletiondir = join_paths(prefixdir, get_option('datadir'), 'bash-completion', 'completions') - bindir = join_paths(prefixdir, get_option('bindir')) - datadir = join_paths(prefixdir, get_option('datadir')) - mandir = join_paths(prefixdir, get_option('mandir')) -@@ -123,22 +123,6 @@ conf.set('PACKAGE_VERSION', meson.project_version()) - conf.set('RUNTIME_PATH', runtimepath) - conf.set('SYSCONFDIR', sysconfdir) - --# Set sysconfdir --fs = import('fs') --distrosysconfdir = get_option('distrosysconfdir') --if distrosysconfdir != '' -- distrosysconfdir = join_paths(sysconfdir, distrosysconfdir) -- conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) --elif fs.is_dir('/etc/sysconfig') -- distrosysconfdir = join_paths(sysconfdir, 'sysconfig') -- conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) --elif fs.is_dir('/etc/default') -- distrosysconfdir = join_paths(sysconfdir, 'default') -- conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) --else -- error('"distrosysconfdir" is not set') --endif -- - # Cross-compile on Android. - srcconf.set10('IS_BIONIC', host_machine.system() == 'android') - -@@ -148,6 +132,7 @@ coverity = get_option('coverity-build') - init_script = get_option('init-script') - sanitize = get_option('b_sanitize') - want_examples = get_option('examples') -+want_install_init = get_option('install-init-files') - want_io_uring = get_option('io-uring-event-loop') - want_pam_cgroup = get_option('pam-cgroup') - want_mans = get_option('man') -@@ -160,10 +145,30 @@ want_openssl = get_option('openssl') - want_selinux = get_option('selinux') - want_oss_fuzz = get_option('oss-fuzz') - want_seccomp = get_option('seccomp') -+want_spec = get_option('specfile') -+want_state_dirs = get_option('install-state-dirs') - want_thread_safety = get_option('thread-safety') - want_memfd_rexec = get_option('memfd-rexec') - want_sd_bus = get_option('sd-bus') - -+# Set sysconfdir -+fs = import('fs') -+if want_install_init -+ distrosysconfdir = get_option('distrosysconfdir') -+ if distrosysconfdir != '' -+ distrosysconfdir = join_paths(sysconfdir, distrosysconfdir) -+ conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) -+ elif fs.is_dir('/etc/sysconfig') -+ distrosysconfdir = join_paths(sysconfdir, 'sysconfig') -+ conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) -+ elif fs.is_dir('/etc/default') -+ distrosysconfdir = join_paths(sysconfdir, 'default') -+ conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) -+ else -+ error('"distrosysconfdir" is not set') -+ endif -+endif -+ - srcconf.set_quoted('DEFAULT_CGROUP_PATTERN', cgrouppattern) - if coverity - srcconf.set('ENABLE_COVERITY_BUILD', 1) -@@ -926,14 +931,16 @@ if want_apparmor - endif - subdir('config/bash') - subdir('config/etc') --subdir('config/init/common') --subdir('config/init/systemd') --subdir('config/init/sysvinit') --subdir('config/init/upstart') -+if want_install_init -+ subdir('config/init/common') -+ subdir('config/init/systemd') -+ subdir('config/init/sysvinit') -+ subdir('config/init/upstart') -+ subdir('config/sysconfig') -+endif - if want_selinux - subdir('config/selinux') - endif --subdir('config/sysconfig') - subdir('config/templates') - subdir('config/templates/common.conf.d') - subdir('config/yum') -@@ -963,21 +970,25 @@ pkg_config_file = pkgconfig.generate(liblxc, - ) - - # Empty dirs. --install_emptydir(join_paths(localstatedir, 'cache', 'lxc')) --install_emptydir(join_paths(localstatedir, 'lib', 'lxc')) -+if want_state_dirs -+ install_emptydir(join_paths(localstatedir, 'cache', 'lxc')) -+ install_emptydir(join_paths(localstatedir, 'lib', 'lxc')) -+endif - - # RPM spec file. --specconf = configuration_data() --specconf.set('LXC_VERSION_BASE', meson.project_version()) --specconf.set('LXC_VERSION_BETA', version_data.get('LXC_VERSION_BETA')) --specconf.set('PACKAGE', meson.project_name()) --specconf.set('LXC_DISTRO_SYSCONF', conf.get('LXC_DISTRO_SYSCONF')) -- --configure_file( -- configuration: specconf, -- input: 'lxc.spec.in', -- output: 'lxc.spec', -- install: false) -+if want_spec -+ specconf = configuration_data() -+ specconf.set('LXC_VERSION_BASE', meson.project_version()) -+ specconf.set('LXC_VERSION_BETA', version_data.get('LXC_VERSION_BETA')) -+ specconf.set('PACKAGE', meson.project_name()) -+ specconf.set('LXC_DISTRO_SYSCONF', conf.get('LXC_DISTRO_SYSCONF')) -+ -+ configure_file( -+ configuration: specconf, -+ input: 'lxc.spec.in', -+ output: 'lxc.spec', -+ install: false) -+endif - - # Build overview. - status = [ -diff --git a/meson_options.txt b/meson_options.txt -index 9803473d2..84a6d45b5 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -120,3 +120,12 @@ option('memfd-rexec', type : 'boolean', value : 'true', - - option('distrosysconfdir', type : 'string', value: '', - description: 'relative path to sysconfdir for distro default configuration') -+ -+option('specfile', type : 'boolean', value: true, -+ description: 'whether to prepare RPM spec') -+ -+option('install-init-files', type : 'boolean', value: true, -+ description: 'whether to install init files for local init (e.g. systemd, sysvinit)') -+ -+option('install-state-dirs', type : 'boolean', value: true, -+ description: 'whether to create state directories on install') diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/vm-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mm-tools/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/os-specific/linux/vm-tools/default.nix rename to third_party/nixpkgs/pkgs/os-specific/linux/mm-tools/default.nix index c5981bfc27..38f16ca4e7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/vm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mm-tools/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, linux }: stdenv.mkDerivation { - pname = "vm-tools"; + pname = "mm-tools"; inherit (linux) version src; makeFlags = [ "sbindir=${placeholder "out"}/bin" ]; - preConfigure = "cd tools/vm"; + preConfigure = "cd tools/mm"; meta = with lib; { inherit (linux.meta) license platforms; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mstflint_access/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mstflint_access/default.nix index 6e29e27ccb..9516824912 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mstflint_access/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mstflint_access/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/kernel-mstflint-${version}.tar.gz"; - hash = "sha256-rfZts0m8x6clVazpbAa2xK+dYgRU9Us5rbcWa0uHJ1M="; + hash = "sha256-bWYglHJUNCPT13N7aBdjbLPMZIk7vjvF+o9W3abDNr0="; }; nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; @@ -18,10 +18,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = lib.optionals (lib.versionAtLeast kernel.version "6.4") '' - sed -i "s/class_create(THIS_MODULE, dev->name)/class_create(dev->name)/g" mst_main.c - ''; - installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix index a90a8716cc..711a14845d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${subVersion}.tar.gz"; - sha256 = "sha256-HOVAR9auc8ulENPLoI0scdCMZoSbDYkTaCLgZoFG7eU="; + sha256 = "sha256-a2cU7PYQh1KR5eeMhMNx2Sc3HHd7QvCG9+BoJyVPp1Y="; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { homepage = "https://www.magewell.com/"; description = "Linux driver for the Magewell Pro Capture family"; license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ flexiondotorg MP2E ]; + maintainers = with maintainers; [ flexiondotorg ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nct6687d/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nct6687d/default.nix index 493d0e6af1..35e77c7922 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nct6687d/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nct6687d/default.nix @@ -2,17 +2,18 @@ , stdenv , fetchFromGitHub , kernel +, nix-update-script }: stdenv.mkDerivation rec { pname = "nct6687d"; - version = "unstable-2023-09-22"; + version = "0-unstable-2024-02-23"; src = fetchFromGitHub { owner = "Fred78290"; repo = "nct6687d"; - rev = "cdfe855342a9383a9c4c918d51576c36d989070d"; - hash = "sha256-iOLWxj4I6oYkNXFSkmw7meTQEnrIfb4Mw+/LkzgzDxM="; + rev = "0ee35ed9541bde22fe219305d1647b51ed010c5e"; + hash = "sha256-g81U+ngnsOslBDCQP51uDDyHPpCv9T/j+KmFUAQfz/M="; }; setSourceRoot = '' @@ -30,6 +31,10 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; installTargets = [ "modules_install" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch=main" ]; + }; + meta = with lib; { description = "Kernel module for the Nuvoton NCT6687-R chipset found on many B550/B650 motherboards from ASUS and MSI"; license = with licenses; [ gpl2Only ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix index 3680cd43ef..95e4183a2f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix @@ -5,7 +5,6 @@ , autoreconfHook , withDebugSymbols ? false , withCli ? true, libedit -, withPython ? false, python3 , withXtables ? true, iptables , nixosTests }: @@ -29,25 +28,12 @@ stdenv.mkDerivation rec { libmnl libnftnl libpcap gmp jansson ] ++ lib.optional withCli libedit - ++ lib.optional withXtables iptables - ++ lib.optionals withPython [ - python3 - python3.pkgs.setuptools - ]; - - patches = [ ./fix-py-libnftables.patch ]; - - postPatch = '' - substituteInPlace "py/src/nftables.py" \ - --subst-var-by "out" "$out" - ''; + ++ lib.optional withXtables iptables; configureFlags = [ "--with-json" (lib.withFeatureAs withCli "cli" "editline") ] ++ lib.optional (!withDebugSymbols) "--disable-debug" - ++ lib.optional (!withPython) "--disable-python" - ++ lib.optional withPython "--enable-python" ++ lib.optional withXtables "--with-xtables"; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nftables/fix-py-libnftables.patch b/third_party/nixpkgs/pkgs/os-specific/linux/nftables/fix-py-libnftables.patch deleted file mode 100644 index 3ab1e53630..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nftables/fix-py-libnftables.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/py/src/nftables.py b/py/src/nftables.py -index f1e43ade..9adcd1be 100644 ---- a/py/src/nftables.py -+++ b/py/src/nftables.py -@@ -69,7 +69,7 @@ class Nftables: - - validator = None - -- def __init__(self, sofile="libnftables.so.1"): -+ def __init__(self, sofile="@out@/lib/libnftables.so.1"): - """Instantiate a new Nftables class object. - - Accepts a shared object file to open, by default standard search path diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nftables/python.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nftables/python.nix new file mode 100644 index 0000000000..7980b8ff6d --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nftables/python.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, setuptools +, nftables +}: + +buildPythonPackage { + pname = "nftables"; + inherit (nftables) version src; + pyproject = true; + + postPatch = '' + substituteInPlace "src/nftables.py" \ + --replace-fail "libnftables.so.1" "${nftables}/lib/libnftables.so.1" + ''; + + setSourceRoot = "sourceRoot=$(echo */py)"; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "nftables" ]; + + meta = { + inherit (nftables.meta) description homepage license platforms maintainers; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 67733922f0..fb7c8b2322 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -50,6 +50,10 @@ while [ "$#" -gt 0 ]; do ;; switch|boot|test|build|edit|repl|dry-build|dry-run|dry-activate|build-vm|build-vm-with-bootloader|list-generations) if [ "$i" = dry-run ]; then i=dry-build; fi + if [ "$i" = list-generations ]; then + buildNix= + fast=1 + fi # exactly one action mandatory, bail out if multiple are given if [ -n "$action" ]; then showSyntax; fi action="$i" @@ -387,7 +391,7 @@ if [[ -n $flake ]]; then flakeAttr="${BASH_REMATCH[2]}" fi if [[ -z $flakeAttr ]]; then - read -r hostname < /proc/sys/kernel/hostname + hostname="$(targetHostCmd cat /proc/sys/kernel/hostname)" if [[ -z $hostname ]]; then hostname=default fi diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nmon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nmon/default.nix index 9e3a6667d7..3de22bfae6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nmon/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nmon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nmon"; - version = "16p"; + version = "16q"; src = fetchurl { url = "mirror://sourceforge/nmon/lmon${version}.c"; - sha256 = "sha256-XcYEX2cl4ySalpkY+uaWY6HWaRYgh3ILq825D86eayo="; + sha256 = "sha256-G3ioFnLBkpGz0RpuMZ3ZsjoCKiYtuh786gCNbfUaylE="; }; buildInputs = [ ncurses ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index 318d2617c8..777e5b6ca4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -33,12 +33,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "550.76"; - sha256_64bit = "sha256-2/wAmBNiePhX74FsV7j21LnCaubxMC/kAYMmf8kQt1s="; - sha256_aarch64 = "sha256-LhiyYCUTFwqzUITK6CKIqxOQp62wG1RuKOuP0fTKoVk="; - openSha256 = "sha256-RWaUXIr/yCRmX4yIyUxvBxrKCLKRKSi4lQJAYvrd2Kg="; - settingsSha256 = "sha256-Lv95+0ahvU1+X/twzWWVqQH4nqq491ALigH9TVBn+YY="; - persistencedSha256 = "sha256-rbgI9kGdVzGlPNEvaoOq2zrAMx+H8D+XEBah2eqZzuI="; + version = "550.78"; + sha256_64bit = "sha256-NAcENFJ+ydV1SD5/EcoHjkZ+c/be/FQ2bs+9z+Sjv3M="; + sha256_aarch64 = "sha256-2POG5RWT2H7Rhs0YNfTGHO64Q8u5lJD9l/sQCGVb+AA="; + openSha256 = "sha256-cF9omNvfHx6gHUj2u99k6OXrHGJRpDQDcBG3jryf41Y="; + settingsSha256 = "sha256-lZiNZw4dJw4DI/6CI0h0AHbreLm825jlufuK9EB08iw="; + persistencedSha256 = "sha256-qDGBAcZEN/ueHqWO2Y6UhhXJiW5625Kzo1m/oJhvbj4="; }; latest = selectHighestVersion production (generic { @@ -64,11 +64,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "550.40.59"; + version = "550.40.61"; persistencedVersion = "550.54.14"; settingsVersion = "550.54.14"; - sha256_64bit = "sha256-hVwYC454vkxcK8I9bj1kp6iFS667em0c+Ral243C0J8="; - openSha256 = "sha256-/v1iVcmHhdvib54LDktNBHkcmgFxZVwQxwPdWSi0l/U="; + sha256_64bit = "sha256-JNVeA5/u5/ictU3QpPnbXIHDKOtwou8wGmMt3We4FJY="; + openSha256 = "sha256-kWGTj3eAvwLTJ7zgzRFvyhXmfpxQbUMmyxWxER9i9m0="; settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix index b11dc06c85..2d9dfd8182 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -16,7 +16,7 @@ nvidia_x11: sha256: , libXxf86vm , libvdpau , librsvg -, wrapGAppsHook +, wrapGAppsHook3 , addOpenGLRunpath , withGtk2 ? false , withGtk3 ? true @@ -96,7 +96,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config m4 addOpenGLRunpath ]; buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] - ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; + ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook3 ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix index 2b0c327fbc..e5f8fec5ac 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, fetchpatch +{ lib, stdenv, buildPackages, fetchurl , flex, cracklib, db4, gettext, audit, libxcrypt , nixosTests , autoreconfHook269, pkg-config-unwrapped @@ -6,31 +6,15 @@ stdenv.mkDerivation rec { pname = "linux-pam"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://github.com/linux-pam/linux-pam/releases/download/v${version}/Linux-PAM-${version}.tar.xz"; - hash = "sha256-//SjTlu+534ujxmS8nYx4jKby/igVj3etcM4m04xaa0="; + hash = "sha256-+JI8dAFZBS1xnb/CovgZQtaN00/K9hxwagLJuA/u744="; }; patches = [ ./suid-wrapper-path.patch - - # Backport fix for missing include breaking musl builds. - (fetchpatch { - name = "pam_namespace-stdint.h.patch"; - url = "https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13.patch"; - hash = "sha256-tCnH2yPO4dBbJOZA0fP2gm1EavHRMEJyfzB5Vy7YjAA="; - }) - - # Resotre handling of empty passwords: - # https://github.com/linux-pam/linux-pam/pull/784 - # TODO: drop upstreamed patch on 1.6.1 update. - (fetchpatch { - name = "revert-unconditional-helper.patch"; - url = "https://github.com/linux-pam/linux-pam/commit/8d0c575336ad301cd14e16ad2fdec6fe621764b8.patch"; - hash = "sha256-z9KfMxxqXQVnmNaixaVjLnQqaGsH8MBHhHbiP/8fvhE="; - }) ]; # Case-insensitivity workaround for https://github.com/linux-pam/linux-pam/issues/569 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix index b1508dcb6a..dcdc7a363e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/piper/default.nix @@ -1,5 +1,5 @@ { lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 -, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome +, wrapGAppsHook3, gtk3, glib, desktop-file-utils, appstream-glib, gnome , gobject-introspection, librsvg }: python3.pkgs.buildPythonApplication rec { @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0jsvfy0ihdcgnqljfgs41lys1nlz18qvsa0a8ndx3pyr41f8w8wf"; }; - nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; + nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook3 desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = [ gtk3 glib gnome.adwaita-icon-theme python3 librsvg ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix index 11f26e5013..f7145bc02e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -11,6 +11,7 @@ , polkit , dbus , gobject-introspection +, wrapGAppsNoGuiHook , gettext , gtk-doc , docbook-xsl-nons @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { libxml2 # for xmllint for stripping GResources libxslt # for xsltproc for building docs gobject-introspection + wrapGAppsNoGuiHook # checkInput but cheked for during the configuring (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ pygobject3 @@ -95,6 +97,9 @@ stdenv.mkDerivation rec { doCheck = true; + # Only need to wrap the Python tool (powerprofilectl) + dontWrapGApps = true; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; postPatch = '' @@ -106,6 +111,10 @@ stdenv.mkDerivation rec { src/powerprofilesctl ''; + postFixup = '' + wrapGApp "$out/bin/powerprofilesctl" + ''; + passthru = { tests = { nixos = nixosTests.power-profiles-daemon; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/r8125/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/r8125/default.nix index 1c26135595..9b5210350b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/r8125/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/r8125/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "r8125"; # On update please verify (using `diff -r`) that the source matches the # realtek version. - version = "9.012.03"; + version = "9.013.02"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "louistakepillz"; repo = "r8125"; rev = version; - sha256 = "sha256-+CrxvKB96QOcOo87McZOt/XUhriTtTV8jTQgpBG3ejs="; + sha256 = "sha256-i45xKF5WVN+nNhpD6HWZHvGgxuaD/YhMHERqW8/bC5Y="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/restool/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/restool/default.nix index 853d9eeb7f..7f7c094007 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/restool/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/restool/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nxp-qoriq/restool"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix index e31a54f56c..553c6a3096 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8189es-${kernel.version}-${version}"; - version = "2023-03-14"; + version = "2024-01-21"; src = fetchFromGitHub { owner = "jwrdegoede"; repo = "rtl8189ES_linux"; - rev = "ae7b31e55526ca0e01d2a3310118530bff4f1055"; - sha256 = "sha256-l/xUxs63Y5LVT6ZafuRc+iaCXCSt2HwysYJLJ5hg3RM="; + rev = "eb51e021b0e1b6f94a4b49da3f4ee5c5fb20b715"; + sha256 = "sha256-n7Bsstr1H1RvguAyJnVqk/JgEx8WEZWaVg7ZfEYykR0="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189fs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189fs/default.nix index 67642f11d3..0405fc8561 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189fs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189fs/default.nix @@ -3,13 +3,13 @@ # rtl8189fs is a branch of the rtl8189es driver rtl8189es.overrideAttrs (drv: rec { name = "rtl8189fs-${kernel.version}-${version}"; - version = "2023-03-27"; + version = "2024-01-22"; src = fetchFromGitHub { owner = "jwrdegoede"; repo = "rtl8189ES_linux"; - rev = "c223a25b1000d64432eca4201a8f012414dfc7ce"; - sha256 = "sha256-5b5IshLbWxvmzcKy/xLsqKa3kZpwDQXTQtjqZLHyOCo="; + rev = "5d523593f41c0b8d723c6aa86b217ee1d0965786"; + sha256 = "sha256-pziaUM6XfF4Tt9yfWUnLUiTw+sw6uZrr1HcaXdRQ31E="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix index 32b97b59c5..529f16fc1d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -4,15 +4,15 @@ with lib; let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtl8192eu"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "rtl8192eu"; - version = "${kernel.version}-4.4.1.20230613"; + version = "${kernel.version}-4.4.1.20240507"; src = fetchFromGitHub { owner = "Mange"; repo = "rtl8192eu-linux-driver"; - rev = "f2fc8af7ab58d2123eed1aa4428e713cdfc27976"; - sha256 = "sha256-OgsxBcXoIP8h9Z0bLsG91/s/+r89Tdn2dPOt4p3sx8k="; + rev = "27410641da6926eb1ac565068ff89d35f7496328"; + sha256 = "sha256-/BztTE3yKw35Oo7KkzHMtD+8qpJNXWiSwR3YjrotR0I="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8723ds/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8723ds/default.nix index be4b954c1b..a9c1f18de0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8723ds/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8723ds/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8723ds"; - version = "${kernel.version}-unstable-2022-12-01"; + version = "${kernel.version}-unstable-2023-11-14"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtl8723ds"; - rev = "a638cc8639015b8b9390af3350fab0366b6c87e7"; - sha256 = "sha256-qfVE7k71NPzw3FwoOaUxH66PnDjbpMAF6CyOyUVdSMA="; + rev = "52e593e8c889b68ba58bd51cbdbcad7fe71362e4"; + sha256 = "sha256-SszvDuWN9opkXyVQAOLjnNtPp93qrKgnGvzK0y7Y9b0="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix index ed330fc246..d9fd92c4a9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8812au"; - version = "${kernel.version}-unstable-2024-01-19"; + version = "${kernel.version}-unstable-2024-03-20"; src = fetchFromGitHub { owner = "morrownr"; repo = "8812au-20210629"; - rev = "3b921c0beda8583c1d2d1b0b7e4692d11e7ea772"; - hash = "sha256-Ji61Y23uGSTyj3Z5ia9iev5rVzSOv7XY/IfAClhz7Q8="; + rev = "8be3a1d7acf60f77c5d9c33b690b8d7301bdf127"; + hash = "sha256-HchnRezJNzimOB72Sv5BwL4oXuxPxloAHVuaL+warj8="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix index 806df9f6dd..9d83d4b4c2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rtl8821cu"; - version = "${kernel.version}-unstable-2023-09-10"; + version = "${kernel.version}-unstable-2024-05-03"; src = fetchFromGitHub { owner = "morrownr"; repo = "8821cu-20210916"; - rev = "f6d4598290c5e9c8e545130e8a31d130f6d135f4"; - hash = "sha256-jpMf8K9diJ3mbEkP9Cp+VwairK+pwiEGU/AtUIouCqM="; + rev = "3eacc28b721950b51b0249508cc31e6e54988a0c"; + hash = "sha256-JP7mvwhnKqmkb/B0l4vhc11TBjjUA1Ubzbj/IVEXvBM="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8852au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8852au/default.nix new file mode 100644 index 0000000000..e7b682893f --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8852au/default.nix @@ -0,0 +1,52 @@ +{ lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: + +stdenv.mkDerivation { + pname = "rtl8852au"; + version = "${kernel.version}-unstable-2024-04-16"; + + src = fetchFromGitHub { + owner = "lwfinger"; + repo = "rtl8852au"; + rev = "5894bc6fed2bcaa525d13fcee1edada8aba67f2b"; + hash = "sha256-R4Yb/jbh3nMgM41ByFjtkCMbsh/mmMRJ7CcvCRUvKu8="; + }; + + nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; + hardeningDisable = [ "pic" "format" ]; + + postPatch = '' + substituteInPlace ./Makefile \ + --replace-fail /sbin/depmod \# \ + --replace-fail '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" \ + --replace-fail '/usr/lib/systemd/system-sleep' "$out/usr/lib/systemd/system-sleep" + substituteInPlace ./platform/i386_pc.mk \ + --replace-fail /lib/modules "${kernel.dev}/lib/modules" + ''; + + makeFlags = [ + "ARCH=${stdenv.hostPlatform.linuxArch}" + ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n")) + ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n")) + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ]; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + mkdir -p "$out/usr/lib/systemd/system-sleep" + ''; + + postInstall = '' + nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Driver for Realtek 802.11ac, rtl8852au, provides the 8852au mod"; + homepage = "https://github.com/lwfinger/rtl8852au"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ lonyelon ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8852bu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8852bu/default.nix new file mode 100644 index 0000000000..cc0f495b81 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8852bu/default.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: + +stdenv.mkDerivation { + pname = "rtl8852bu"; + version = "${kernel.version}-unstable-2024-03-28"; + + src = fetchFromGitHub { + owner = "morrownr"; + repo = "rtl8852bu"; + rev = "f6aaa3c0094c541d9b0347926c76c1e9cc4a49d1"; + hash = "sha256-Jbd6nixo873LU74klhhQU1qD3ahxEnywdqcF89LTRxc="; + }; + + nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; + hardeningDisable = [ "pic" "format" ]; + + postPatch = '' + substituteInPlace ./Makefile \ + --replace-fail /sbin/depmod \# \ + --replace-fail '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + substituteInPlace ./platform/i386_pc.mk \ + --replace-fail /lib/modules "${kernel.dev}/lib/modules" + ''; + + makeFlags = [ + "ARCH=${stdenv.hostPlatform.linuxArch}" + ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n")) + ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n")) + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ]; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + mkdir -p "$out/usr/lib/systemd/system-sleep" + ''; + + postInstall = '' + nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Driver for Realtek rtl8852au and rtl8832bu chipsets, provides the 8852au mod"; + homepage = "https://github.com/morrownr/rtl8852bu"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ lonyelon ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix index 0ee191e868..c21f8ea8a6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "azure-dcap-client"; - version = "1.12.1"; + version = "1.12.3"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = version; - hash = "sha256-q0dI4WdA1ue4sw+QfSherh31Ldf9gnhoft66o3E9gnU="; + hash = "sha256-zTDaICsSPXctgFRCZBiZwXV9dLk2pFL9kp5a8FkiTZA="; }; patches = [ @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Interfaces between SGX SDKs and the Azure Attestation SGX Certification Cache"; homepage = "https://github.com/microsoft/azure-dcap-client"; - maintainers = with maintainers; [ trundle veehaitch ]; + maintainers = with maintainers; [ phlip9 trundle veehaitch ]; platforms = [ "x86_64-linux" ]; license = [ licenses.mit ]; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/psw/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/psw/default.nix index 22e52b6ec9..42e00071d8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/psw/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/psw/default.nix @@ -14,7 +14,7 @@ , debug ? false }: stdenv.mkDerivation rec { - inherit (sgx-sdk) version versionTag src; + inherit (sgx-sdk) patches src version versionTag; pname = "sgx-psw"; postUnpack = @@ -24,16 +24,16 @@ stdenv.mkDerivation rec { # attestation quotes, and do platform certification. ae.prebuilt = fetchurl { url = "https://download.01.org/intel-sgx/sgx-linux/${versionTag}/prebuilt_ae_${versionTag}.tar.gz"; - hash = "sha256-IckW4p1XWkWCDCErXyTtnKYKeAUaCrp5iAMsRBMjLX0="; + hash = "sha256-IGV9VEwY/cQBV4Vz2sps4JgRweWRl/l08ocb9P4SH8Q="; }; # Also include the Data Center Attestation Primitives (DCAP) platform # enclaves. dcap = rec { - version = "1.18"; + version = "1.20"; filename = "prebuilt_dcap_${version}.tar.gz"; prebuilt = fetchurl { url = "https://download.01.org/intel-sgx/sgx-dcap/${version}/linux/${filename}"; - hash = "sha256-9ceys7ozOEienug+9MTZ6dw3nx7VBfxLNiwhZYv4SzY="; + hash = "sha256-nPsI89KSBA3cSNTMWyktZP5dkf+BwL3NZ4MuUf6G98o="; }; }; in @@ -181,7 +181,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Intel SGX Architectural Enclave Service Manager"; homepage = "https://github.com/intel/linux-sgx"; - maintainers = with maintainers; [ veehaitch citadelcore ]; + maintainers = with maintainers; [ phlip9 veehaitch citadelcore ]; platforms = [ "x86_64-linux" ]; license = with licenses; [ bsd3 ]; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/cppmicroservices-no-mtime.patch b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/cppmicroservices-no-mtime.patch new file mode 100644 index 0000000000..019f589271 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/cppmicroservices-no-mtime.patch @@ -0,0 +1,26 @@ +diff --git a/external/CppMicroServices/framework/src/bundle/BundleResourceContainer.cpp b/external/CppMicroServices/framework/src/bundle/BundleResourceContainer.cpp +index aee499e9..13fa89d4 100644 +--- a/external/CppMicroServices/framework/src/bundle/BundleResourceContainer.cpp ++++ b/external/CppMicroServices/framework/src/bundle/BundleResourceContainer.cpp +@@ -105,7 +105,7 @@ bool BundleResourceContainer::GetStat(int index, + const_cast(&m_ZipArchive), index) + ? true + : false; +- stat.modifiedTime = zipStat.m_time; ++ stat.modifiedTime = 0; + stat.crc32 = zipStat.m_crc32; + // This will limit the size info from uint64 to uint32 on 32-bit + // architectures. We don't care because we assume resources > 2GB +diff --git a/external/CppMicroServices/third_party/miniz.c b/external/CppMicroServices/third_party/miniz.c +index 6b0ebd7a..fa2aebca 100644 +--- a/external/CppMicroServices/third_party/miniz.c ++++ b/external/CppMicroServices/third_party/miniz.c +@@ -170,7 +170,7 @@ + // If MINIZ_NO_TIME is specified then the ZIP archive functions will not be able to get the current time, or + // get/set file times, and the C run-time funcs that get/set times won't be called. + // The current downside is the times written to your archives will be from 1979. +-//#define MINIZ_NO_TIME ++#define MINIZ_NO_TIME + + // Define MINIZ_NO_ARCHIVE_APIS to disable all ZIP archive API's. + //#define MINIZ_NO_ARCHIVE_APIS diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/default.nix index 2570406a71..67489ee3c0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoconf , automake , binutils @@ -27,15 +26,15 @@ stdenv.mkDerivation rec { pname = "sgx-sdk"; # Version as given in se_version.h - version = "2.21.100.1"; + version = "2.23.100.2"; # Version as used in the Git tag - versionTag = "2.21"; + versionTag = "2.23"; src = fetchFromGitHub { owner = "intel"; repo = "linux-sgx"; rev = "sgx_${versionTag}"; - hash = "sha256-Yo2G0H0XUI2p9W7lDRLkFHw2t8X1220brGohQJ0r2WY="; + hash = "sha256-i+fE6xKiuljG8LY8TIHgrW15DVpdp46bZdNo/BjgT/I="; fetchSubmodules = true; }; @@ -46,39 +45,28 @@ stdenv.mkDerivation rec { ''; patches = [ - # Fix missing pthread_compat.h, see https://github.com/intel/linux-sgx/pull/784 - (fetchpatch { - url = "https://github.com/intel/linux-sgx/commit/254b58f922a6bd49c308a4f47f05f525305bd760.patch"; - sha256 = "sha256-sHU++K7NJ+PdITx3y0PwstA9MVh10rj2vrLn01N9F4w="; - }) + # There's a `make preparation` step that downloads some prebuilt binaries + # and applies some patches to the in-repo git submodules. This patch removes + # the parts that download things, since we can't do that inside the sandbox. + ./disable-downloads.patch + + # This patch disable mtime in bundled zip file for reproducible builds. + # + # Context: The `aesm_service` binary depends on a vendored library called + # `CppMicroServices`. At build time, this lib creates and then bundles + # service resources into a zip file and then embeds this zip into the + # binary. Without changes, the `aesm_service` will be different after every + # build because the embedded zip file contents have different modified times. + ./cppmicroservices-no-mtime.patch ]; - # There's a `make preparation` step that downloads some prebuilt binaries and - # applies some patches to the in-repo git submodules. We can't just run it, - # since it downloads things, so this step just extracts the patching steps. postPatch = '' patchShebangs linux/installer/bin/build-installpkg.sh \ linux/installer/common/sdk/createTarball.sh \ linux/installer/common/sdk/install.sh \ external/sgx-emm/create_symlink.sh - echo "Running 'make preparation' but without download steps" - - # Seems to download something. Build currently uses ipp-crypto and not - # sgxssl so probably not an issue. - # $ ./external/dcap_source/QuoteVerification/prepare_sgxssl.sh nobuild - - pushd external/openmp/openmp_code - git apply ../0001-Enable-OpenMP-in-SGX.patch >/dev/null 2>&1 \ - || git apply ../0001-Enable-OpenMP-in-SGX.patch --check -R - popd - - pushd external/protobuf/protobuf_code - git apply ../sgx_protobuf.patch >/dev/null 2>&1 \ - || git apply ../sgx_protobuf.patch --check -R - popd - - ./external/sgx-emm/create_symlink.sh + make preparation ''; # We need `cmake` as a build input but don't use it to kick off the build phase @@ -300,7 +288,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Intel SGX SDK for Linux built with IPP Crypto Library"; homepage = "https://github.com/intel/linux-sgx"; - maintainers = with maintainers; [ sbellem arturcygan veehaitch ]; + maintainers = with maintainers; [ phlip9 sbellem arturcygan veehaitch ]; platforms = [ "x86_64-linux" ]; license = with licenses; [ bsd3 ]; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/disable-downloads.patch b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/disable-downloads.patch new file mode 100644 index 0000000000..bdf9b9f913 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/disable-downloads.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile b/Makefile +index 32433051..2e480efb 100644 +--- a/Makefile ++++ b/Makefile +@@ -50,8 +50,8 @@ tips: + preparation: + # As SDK build needs to clone and patch openmp, we cannot support the mode that download the source from github as zip. + # Only enable the download from git +- git submodule update --init --recursive +- ./external/dcap_source/QuoteVerification/prepare_sgxssl.sh nobuild ++ # git submodule update --init --recursive ++ # ./external/dcap_source/QuoteVerification/prepare_sgxssl.sh nobuild + cd external/openmp/openmp_code && git apply ../0001-Enable-OpenMP-in-SGX.patch >/dev/null 2>&1 || git apply ../0001-Enable-OpenMP-in-SGX.patch --check -R + cd external/protobuf/protobuf_code && git apply ../sgx_protobuf.patch >/dev/null 2>&1 || git apply ../sgx_protobuf.patch --check -R + ./external/sgx-emm/create_symlink.sh +@@ -59,8 +59,8 @@ preparation: + cd external/cbor && cp -r libcbor sgx_libcbor + cd external/cbor/libcbor && git apply ../raw_cbor.patch >/dev/null 2>&1 || git apply ../raw_cbor.patch --check -R + cd external/cbor/sgx_libcbor && git apply ../sgx_cbor.patch >/dev/null 2>&1 || git apply ../sgx_cbor.patch --check -R +- ./download_prebuilt.sh +- ./external/dcap_source/QuoteGeneration/download_prebuilt.sh ++ # ./download_prebuilt.sh ++ # ./external/dcap_source/QuoteGeneration/download_prebuilt.sh + + psw: + $(MAKE) -C psw/ USE_OPT_LIBS=$(USE_OPT_LIBS) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix index 5a4c941a22..c72a0c5285 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix @@ -8,13 +8,13 @@ }: gcc11Stdenv.mkDerivation rec { pname = "ipp-crypto"; - version = "2021.9.0"; + version = "2021.10.0"; src = fetchFromGitHub { owner = "intel"; repo = "ipp-crypto"; rev = "ippcp_${version}"; - hash = "sha256-+ITnxyrkDQp4xRa+PVzXdYsSkI5sMNwQGfGU+lFJ6co="; + hash = "sha256-DfXsJ+4XqyjCD+79LUD53Cx8D46o1a4fAZa2UxGI1Xg="; }; cmakeFlags = [ "-DARCH=intel64" ] ++ extraCmakeFlags; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/default.nix index 9d1905e09d..94d7e20b21 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/default.nix @@ -1,8 +1,8 @@ { stdenv +, callPackage , fetchFromGitHub , fetchurl , lib -, openssl , perl , sgx-sdk , which @@ -10,7 +10,7 @@ }: let sgxVersion = sgx-sdk.versionTag; - opensslVersion = "1.1.1u"; + opensslVersion = "3.0.12"; in stdenv.mkDerivation { pname = "sgx-ssl" + lib.optionalString debug "-debug"; @@ -19,15 +19,15 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "intel"; repo = "intel-sgx-ssl"; - rev = "lin_${sgxVersion}_${opensslVersion}"; - hash = "sha256-zbXEQz72VUPqnGrboX6oXliaLpbcos7tV6K9lX+zleg="; + rev = "3.0_Rev2"; + hash = "sha256-dmLyaG6v+skjSa0KxLAfIfSBOxp9grrI7ds6WdGPe0I="; }; postUnpack = let opensslSourceArchive = fetchurl { url = "https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz"; - hash = "sha256-4vjYS1I+7NBse+diaDA3AwD7zBU4a/UULXJ1j2lj68Y="; + hash = "sha256-+Tyejt3l6RZhGd4xdV/Ie0qjSGNmL2fd/LoU0La2m2E="; }; in '' @@ -37,7 +37,7 @@ stdenv.mkDerivation { postPatch = '' patchShebangs Linux/build_openssl.sh - # Run the test in the `installCheckPhase`, not the `buildPhase` + # Skip the tests. Build and run separately (see below). substituteInPlace Linux/sgx/Makefile \ --replace '$(MAKE) -C $(TEST_DIR) all' \ 'bash -c "true"' @@ -46,7 +46,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ perl sgx-sdk - stdenv.cc.libc which ]; @@ -60,21 +59,22 @@ stdenv.mkDerivation { "DESTDIR=$(out)" ]; - # Build the test app - doInstallCheck = true; - installCheckTarget = "test"; - installCheckFlags = [ - "SGX_MODE=SIM" - "-j 1" # Makefile doesn't support multiple jobs - ]; - nativeInstallCheckInputs = [ - openssl - ]; + # These tests build on any x86_64-linux but BOTH SIM and HW will only _run_ on + # real Intel hardware. Split these out so OfBorg doesn't choke on this pkg. + # + # ``` + # nix run .#sgx-ssl.tests.HW + # nix run .#sgx-ssl.tests.SIM + # ``` + passthru.tests = { + HW = callPackage ./tests.nix { sgxMode = "HW"; inherit opensslVersion; }; + SIM = callPackage ./tests.nix { sgxMode = "SIM"; inherit opensslVersion; }; + }; meta = with lib; { description = "Cryptographic library for Intel SGX enclave applications based on OpenSSL"; homepage = "https://github.com/intel/intel-sgx-ssl"; - maintainers = with maintainers; [ trundle veehaitch ]; + maintainers = with maintainers; [ phlip9 trundle veehaitch ]; platforms = [ "x86_64-linux" ]; license = [ licenses.bsd3 licenses.openssl ]; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/tests.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/tests.nix new file mode 100644 index 0000000000..d9357ba043 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/ssl/tests.nix @@ -0,0 +1,95 @@ +# This package _builds_ (but doesn't run!) the sgx-ssl test enclave + harness. +# The whole package effectively does: +# +# ``` +# SGX_MODE=${sgxMode} make -C Linux/sgx/test_app +# cp Linux/sgx/{TestApp,TestEnclave.signed.so} $out/bin +# ``` +# +# OfBorg fails to run these tests since they require real Intel HW. That +# includes the simulation mode! The tests appears to do something fancy with +# cpuid and exception trap handlers that make them very non-portable. +# +# These tests are split out from the parent pkg since recompiling the parent +# takes like 30 min : ) + +{ lib +, openssl +, sgx-psw +, sgx-sdk +, sgx-ssl +, stdenv +, which +, opensslVersion ? throw "required parameter" +, sgxMode ? throw "required parameter" # "SIM" or "HW" +}: +stdenv.mkDerivation { + inherit (sgx-ssl) postPatch src version; + pname = sgx-ssl.pname + "-tests-${sgxMode}"; + + postUnpack = sgx-ssl.postUnpack + '' + sourceRootAbs=$(readlink -e $sourceRoot) + packageDir=$sourceRootAbs/Linux/package + + # Do the inverse of 'make install' and symlink built artifacts back into + # '$src/Linux/package/' to avoid work. + mkdir $packageDir/lib $packageDir/lib64 + ln -s ${lib.getLib sgx-ssl}/lib/* $packageDir/lib/ + ln -s ${lib.getLib sgx-ssl}/lib64/* $packageDir/lib64/ + ln -sf ${lib.getDev sgx-ssl}/include/* $packageDir/include/ + + # test_app needs some internal openssl headers. + # See: tail end of 'Linux/build_openssl.sh' + tar -C $sourceRootAbs/openssl_source -xf $sourceRootAbs/openssl_source/openssl-${opensslVersion}.tar.gz + echo '#define OPENSSL_VERSION_STR "${opensslVersion}"' > $sourceRootAbs/Linux/sgx/osslverstr.h + ln -s $sourceRootAbs/openssl_source/openssl-${opensslVersion}/include/crypto $sourceRootAbs/Linux/sgx/test_app/enclave/ + ln -s $sourceRootAbs/openssl_source/openssl-${opensslVersion}/include/internal $sourceRootAbs/Linux/sgx/test_app/enclave/ + ''; + + nativeBuildInputs = [ + openssl.bin + sgx-sdk + which + ]; + + preBuild = '' + # Need to regerate the edl header + make -C Linux/sgx/libsgx_tsgxssl sgx_tsgxssl_t.c + ''; + + makeFlags = [ + "-C Linux/sgx/test_app" + "SGX_MODE=${sgxMode}" + ]; + + installPhase = '' + runHook preInstall + + # Enclaves can't be stripped after signing. + install -Dm 755 Linux/sgx/test_app/TestEnclave.signed.so -t $TMPDIR/enclaves + + install -Dm 755 Linux/sgx/test_app/TestApp -t $out/bin + + runHook postInstall + ''; + + postFixup = '' + # Move the enclaves where they actually belong. + mv $TMPDIR/enclaves/*.signed.so* $out/bin/ + + # HW SGX must runs against sgx-psw, not sgx-sdk. + if [[ "${sgxMode}" == "HW" ]]; then + patchelf \ + --set-rpath "$( \ + patchelf --print-rpath $out/bin/TestApp \ + | sed 's|${lib.getLib sgx-sdk}|${lib.getLib sgx-psw}|' \ + )" \ + $out/bin/TestApp + fi + ''; + + meta = { + platforms = [ "x86_64-linux" ]; + mainProgram = "TestApp"; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix index 25b788104a..1bf1c10679 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix @@ -3,11 +3,11 @@ , protobuf, grpc, yaml-cpp, nlohmann_json, re2, zstd, uthash }: let - # Compare with https://github.com/draios/sysdig/blob/0.36.0/cmake/modules/falcosecurity-libs.cmake - libsRev = "0.15.1"; - libsHash = "sha256-CsKa5ybRj7Mjb71xNwd8FtDprOMfpJMrm3mvkeqZE3o="; + # Compare with https://github.com/draios/sysdig/blob/0.37.0/cmake/modules/falcosecurity-libs.cmake + libsRev = "0.16.0"; + libsHash = "sha256-aduO2pLj91tRdZ1dW1F1JFEg//SopialXWPd6Oav/u8="; - # Compare with https://github.com/falcosecurity/libs/blob/0.15.1/cmake/modules/valijson.cmake + # Compare with https://github.com/falcosecurity/libs/blob/0.16.0/cmake/modules/valijson.cmake valijson = fetchFromGitHub { owner = "tristanpenman"; repo = "valijson"; @@ -15,22 +15,24 @@ let hash = "sha256-wvFdjsDtKH7CpbEpQjzWtLC4RVOU9+D2rSK0Xo1cJqo="; }; - # https://github.com/draios/sysdig/blob/0.36.0/cmake/modules/driver.cmake + # https://github.com/draios/sysdig/blob/0.37.0/cmake/modules/driver.cmake driver = fetchFromGitHub { owner = "falcosecurity"; repo = "libs"; - rev = "7.0.0+driver"; - hash = "sha256-kXqvfM7HbGh2wEGaO4KBkFDW+m5gpOShJZKJLu9McKk="; + rev = "7.1.0+driver"; + hash = "sha256-FIlnJsNgofGo4HETEEpW28wpC3U9z5AZprwFR5AgFfA="; }; -in stdenv.mkDerivation rec { + + version = "0.37.0"; +in stdenv.mkDerivation { pname = "sysdig"; - version = "0.36.0"; + inherit version; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - hash = "sha256-EQnmtxByTsSawQPFmTe2pBMcv5rFaNtST+2KXZSFuoo="; + hash = "sha256-vEkwh+iSXlIraDzy9+ujr0ijNWX7oB7ZQi7H+jYi688="; }; nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; @@ -73,12 +75,6 @@ in stdenv.mkDerivation rec { cp -r ${driver} driver-src chmod -R +w driver-src - # Hacky but needed until https://github.com/draios/sysdig/issues/2077 is resolved for kernel >= 6.8 as strlcpy got removed and build fails - ${lib.optionalString - (kernel != null && lib.versionAtLeast kernel.version "6.8") '' - substituteInPlace libs/driver/ppm_events.c driver-src/driver/ppm_events.c --replace-fail "strlcpy" "strscpy" - ''} - cmakeFlagsArray+=( "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DDRIVER_SOURCE_DIR=$(pwd)/driver-src/driver" @@ -98,8 +94,6 @@ in stdenv.mkDerivation rec { ] ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF"; env.NIX_CFLAGS_COMPILE = - # needed since luajit-2.1.0-beta3 - "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i)) " + # fix compiler warnings been treated as errors "-Wno-error"; @@ -138,13 +132,13 @@ in stdenv.mkDerivation rec { fi ''; - meta = with lib; { + meta = { description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; - license = with licenses; [ asl20 gpl2 mit ]; - maintainers = [ maintainers.raskin ]; - platforms = [ "x86_64-linux" ] ++ platforms.darwin; - broken = kernel != null && ((versionOlder kernel.version "4.14") || kernel.isHardened || kernel.isZen); + license = with lib.licenses; [ asl20 gpl2 mit ]; + maintainers = with lib.maintainers; [ raskin ]; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; + broken = kernel != null && ((lib.versionOlder kernel.version "4.14") || kernel.isHardened || kernel.isZen); homepage = "https://sysdig.com/opensource/"; downloadPage = "https://github.com/draios/sysdig/releases"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 9cdc5dcd9d..2d1f033920 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -925,8 +925,9 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ flokli kloenk ]; platforms = lib.platforms.linux; priority = 10; - badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; - # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 - broken = stdenv.hostPlatform.isStatic; + badPlatforms = [ + # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 + lib.systems.inspect.platformPatterns.isStatic + ]; }; }) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tbs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tbs/default.nix index 5805a400c1..4d4a1a96ce 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tbs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tbs/default.nix @@ -5,22 +5,22 @@ let name = repo; owner = "tbsdtv"; repo = "linux_media"; - rev = "d0a7e44358f28064697e0eed309db03166dcd83b"; - hash = "sha256-BTHlnta5qv2bdPjD2bButwYGpwR/bq99/AUoZqTHHYw="; + rev = "d8d1ff33c0c47e34fe3e860b52b4d6c457520866"; + hash = "sha256-1Z9itZ5GFpfUeRtp5xTnS+I91LUZLDhsEcF2v8ThaCs="; }; build = fetchFromGitHub rec { name = repo; owner = "tbsdtv"; repo = "media_build"; - rev = "88764363a3e3d36b3c59a0a2bf2244e262035d47"; - hash = "sha256-LFTxYVPudflxqYTSBIDNkTrGs09MOuYBXwpGYqWfEFQ="; + rev = "8cd12a6e90999f3a341018812a5d66d7e6b30913"; + hash = "sha256-+I0NrML54ni37qgDHbRUQiLmmw/UZgXmoFoiDNDeH5A="; }; in stdenv.mkDerivation { pname = "tbs"; - version = "20231210-${kernel.version}"; + version = "20240506-${kernel.version}"; srcs = [ media build ]; sourceRoot = build.name; @@ -66,6 +66,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; priority = -1; - broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.6"; + broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.9"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix index 600655c447..8847a83d53 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix @@ -18,7 +18,7 @@ , glib , gobject-introspection , gst_all_1 -, wrapGAppsHook +, wrapGAppsHook3 # needs pkg_resources , withDoc ? false , sphinx @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ] ++ lib.optionals withDoc [ sphinx @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { # gstreamer tests requires, besides gst-plugins-bad, plugins installed by this expression. checkPhase = "ctest --force-new-ctest-process -E gstreamer"; - # wrapGAppsHook: make sure we add ourselves to the introspection + # wrapGAppsHook3: make sure we add ourselves to the introspection # and gstreamer paths. GI_TYPELIB_PATH = "${placeholder "out"}/lib/girepository-1.0"; GST_PLUGIN_SYSTEM_PATH_1_0 = "${placeholder "out"}/lib/gstreamer-1.0"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tuna/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tuna/default.nix index b57169369c..3b527c8b53 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tuna/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tuna/default.nix @@ -9,7 +9,7 @@ , gtk3 , python-linux-procfs , python-ethtool -, wrapGAppsHook +, wrapGAppsHook3 }: buildPythonApplication rec { @@ -37,7 +37,7 @@ buildPythonApplication rec { glib.dev gobject-introspection gtk3 - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = [ pygobject3 python-linux-procfs python-ethtool ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix index 0d6b3ccd51..553e471faa 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix @@ -12,12 +12,12 @@ let pname = "uhk-agent"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-yx5hOmb1la+vNh8x0PM3edcMn4ojdwzNmGBUg/BH7wE="; + sha256 = "sha256-5VzUSuq+yc8HXSILMg24w/hbwasf4jq0H0wte9Mw+nY="; }; appimageContents = appimageTools.extract { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/waydroid/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/waydroid/default.nix index ae42c20628..5e29b911ca 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/waydroid/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/waydroid/default.nix @@ -12,7 +12,7 @@ , iproute2 , iptables , util-linux -, wrapGAppsHook +, wrapGAppsHook3 , wl-clipboard , runtimeShell }: @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix index e8fce959c8..8101f47c6a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zenmonitor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gtk3, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "zenmonitor"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gtk3 ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/2_2.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/2_2.nix index 455c173836..14c88f195d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/2_2.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/2_2.nix @@ -14,17 +14,17 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_2_2"; # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.8"; + kernelCompatible = kernel.kernelOlder "6.9"; - latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_6; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_8; # this package should point to the latest release. - version = "2.2.3"; + version = "2.2.4"; tests = [ nixosTests.zfs.installer nixosTests.zfs.series_2_2 ]; - hash = "sha256-Bzkow15OitUUQ+mTYhCXgTrQl+ao/B4feleHY/rSSjg="; + hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4="; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/unstable.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/unstable.nix index c8db9c5c5d..1d8ced4dd5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/unstable.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/unstable.nix @@ -16,19 +16,19 @@ callPackage ./generic.nix args { # check the release notes for compatible kernels kernelCompatible = kernel.kernelOlder "6.9"; - latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_6; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_8; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.2.3-unstable-2024-04-09"; - rev = "28520cad2500b60ce8653e431990e33f77ff08f7"; + version = "2.2.4"; + # rev = ""; isUnstable = true; tests = [ nixosTests.zfs.unstable ]; - hash = "sha256-lGoiTmCWOxqACSYY0WA0gN6CN/1FyYhSVHmtYC1Izhg="; + hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4="; } diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix index a47a8d33f4..e854a32266 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix @@ -1,31 +1,31 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-jIrzE1Je2dhMJuq3k8KL1VoHru5qaUAJCR3kumE9aO0="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-97o4rMNwikQZR3DPhhE+OPlY3gA9HqCQxBf+mZSfDMs="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.48/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-9BgGGCP8n+5Op+S1/yT/kdMvmiNgKkkXLQmqF2plJZY="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-ZTGqn6xM9vRHmw2ask5P4vu+5BqkWfGS3ROzTN9VfXM="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.48/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-yPxLYXtH4bwQk2M2VTS5aJWTJciNaeXRRAcMBHuvkcA="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-EbRiiThZsmBD/grtm58Su78OeF/6buwMbx6eBsusgII="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.48/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-sG64t1x70uKk844dT1g9GzJ+DgHuv7sUEBaVqoEmWOw="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-FUnQJ3RRtsWz4DIO8Zi9Y6dO130qTdwj6RhJ6RNpljc="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.48/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-rUSfo1uJGbxx1n/VcLyq5zqiDo4g0caCpVcL2uZUSkE="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-OZDryRiwyM6XgoiOhCsM6AFOE9masnGu2m6sDRUAaeY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.48/AdGuardHome_linux_arm64.tar.gz"; }; armv6l-linux = fetchurl { - sha256 = "sha256-ruICFAGEMXDeLvoOxHg2oEaYDHkoGZI+SozDXmmD9VU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_armv6.tar.gz"; + sha256 = "sha256-aL/wKQ9lbPgaTGCjZAph5iggSTJB1+Rrxbpf6IVgjuU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.48/AdGuardHome_linux_armv6.tar.gz"; }; armv7l-linux = fetchurl { - sha256 = "sha256-mTGufMIKkj2R7QuNWKSKMt9KdwlZe9ORtJK5hIaeH/E="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_armv7.tar.gz"; + sha256 = "sha256-siWf7frIciYGVP7KgqS4Dr7o52y3QqGYvQlxtw2HnEo="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.48/AdGuardHome_linux_armv7.tar.gz"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix index 44940468dc..88163d9935 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.36"; + version = "0.107.48"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = ./update.sh; - schema_version = 24; + schema_version = 28; tests.adguardhome = nixosTests.adguardhome; }; diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/update.sh b/third_party/nixpkgs/pkgs/servers/adguardhome/update.sh index b7defa8113..4e3ecfbfac 100755 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/update.sh +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/update.sh @@ -13,8 +13,8 @@ version=$(jq -r '.tag_name' <<<"$latest_release") echo "got version $version" -schema_version=$(curl --silent "https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/${version}/internal/home/upgrade.go" \ - | grep -Po '(?<=const currentSchemaVersion = )[[:digit:]]+$') +schema_version=$(curl --silent "https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/${version}/internal/configmigrate/configmigrate.go" \ + | grep -Po '(?<=const LastSchemaVersion uint = )[[:digit:]]+$') echo "got schema_version $schema_version" diff --git a/third_party/nixpkgs/pkgs/servers/aeron/default.nix b/third_party/nixpkgs/pkgs/servers/aeron/default.nix index 84e7d44447..2addc87fea 100644 --- a/third_party/nixpkgs/pkgs/servers/aeron/default.nix +++ b/third_party/nixpkgs/pkgs/servers/aeron/default.nix @@ -8,7 +8,7 @@ let pname = "aeron"; - version = "1.43.0"; + version = "1.44.1"; groupId = "io.aeron"; aeronAll_1_40_0 = fetchMavenArtifact { @@ -53,8 +53,22 @@ let hash = "sha512-a/ti4Kd8WwzOzDGMgdYk0pxsu8vRA4kRD9cm4D3S+r6xc/rL8ECHVoogOMDeabDd1EYSIbx/sKE01BJOW7BVsg=="; }; - aeronAll = aeronAll_1_43_0; - aeronSamples = aeronSamples_1_43_0; + aeronAll_1_44_1 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.44.1"; + hash = "sha256-O80bWp7F6mRh3me1znzpfFfFEpvvMVjL4PrAt7+3Fq0="; + }; + + aeronSamples_1_44_1 = fetchMavenArtifact { + inherit groupId; + version = "1.44.1"; + artifactId = "aeron-samples"; + hash = "sha256-ZSuTed45BRzr4JJuGeXghUgEifv/FpnCzTNJWa+nwjo="; + }; + + aeronAll = aeronAll_1_44_1; + aeronSamples = aeronSamples_1_44_1; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix b/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix index c670046f42..5565256756 100644 --- a/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix +++ b/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix @@ -2,26 +2,25 @@ , stdenv , fetchFromGitea, fetchYarnDeps , fixup-yarn-lock, yarn, nodejs +, git , python3, pkg-config, libsass }: stdenv.mkDerivation rec { pname = "admin-fe"; - version = "unstable-2024-02-25"; + version = "unstable-2024-04-27"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "admin-fe"; - rev = "2a1e175f7c2b02e66d728f808cb7e9449231a288"; - hash = "sha256-PLSJ+doZUZ2n4hWUahY299VoCvNq76Tm8qpdvOIHD9c="; + rev = "7e16abcbaab10efa6c2c4589660cf99f820a718d"; + hash = "sha256-W/2Ay2dNeVQk88lgkyTzKwCNw0kLkfI6+Azlbp0oMm4="; }; - patches = [ ./deps.patch ]; - offlineCache = fetchYarnDeps { - yarnLock = ./yarn.lock; - hash = "sha256-h+QUBT2VwPWu2l05Zkcp+0vHN/x40uXxw2KYjq7l/Xk="; + yarnLock = src + "/yarn.lock"; + hash = "sha256-acF+YuWXlMZMipD5+XJS+K9vVFRz3wB2fZqc3Hd0Bjc="; }; nativeBuildInputs = [ @@ -30,13 +29,10 @@ stdenv.mkDerivation rec { nodejs pkg-config python3 + git libsass ]; - postPatch = '' - cp ${./yarn.lock} yarn.lock - ''; - configurePhase = '' runHook preConfigure @@ -44,6 +40,8 @@ stdenv.mkDerivation rec { yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg offlineCache} fixup-yarn-lock yarn.lock + substituteInPlace yarn.lock \ + --replace-fail '"git://github.com/adobe-webplatform/eve.git#eef80ed"' '"https://github.com/adobe-webplatform/eve.git#eef80ed"' yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/cross-env diff --git a/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/deps.patch b/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/deps.patch deleted file mode 100644 index 35e1efdff8..0000000000 --- a/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/deps.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/package.json b/package.json -index f267be19..fb806527 100644 ---- a/package.json -+++ b/package.json -@@ -31,14 +31,12 @@ - "type": "git", - "url": "git+https://akkoma.dev/AkkomaGang/admin-fe.git" - }, -- "resolutions": { -- "prosemirror-model": "1.9.1" -- }, - "bugs": { - "url": "https://akkoma.dev/AkkomaGang/admin-fe/-/issues" - }, - "dependencies": { - "@babel/runtime": "^7.3.4", -+ "@toast-ui/editor": "^3.2.0", - "axios": "0.18.0", - "clipboard": "1.7.1", - "codemirror": "5.39.2", -@@ -65,7 +63,6 @@ - "sortablejs": "1.7.0", - "tiptap": "^1.29.6", - "tiptap-extensions": "^1.32.7", -- "tui-editor": "1.2.7", - "vue": "^2.6.8", - "vue-count-to": "1.0.13", - "vue-i18n": "^8.9.0", -diff --git a/src/components/element-ui/MarkdownEditor/index.vue b/src/components/element-ui/MarkdownEditor/index.vue -index 7ae9fd40..18114701 100644 ---- a/src/components/element-ui/MarkdownEditor/index.vue -+++ b/src/components/element-ui/MarkdownEditor/index.vue -@@ -5,10 +5,10 @@ -